diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-04-29 13:53:49 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-04-29 13:53:49 +0000 |
| commit | a54763e07ca782278745d963bc9fc09a39af3f19 (patch) | |
| tree | 71fa94a5dc90e24dce0a8e58220c18369b8b8ca0 /net-dialup | |
| parent | punt, this never worked as it should have (diff) | |
| download | historical-a54763e07ca782278745d963bc9fc09a39af3f19.tar.gz historical-a54763e07ca782278745d963bc9fc09a39af3f19.tar.bz2 historical-a54763e07ca782278745d963bc9fc09a39af3f19.zip | |
punt
Diffstat (limited to 'net-dialup')
100 files changed, 0 insertions, 4801 deletions
diff --git a/net-dialup/e2220pc/ChangeLog b/net-dialup/e2220pc/ChangeLog deleted file mode 100644 index 6c958f926e54..000000000000 --- a/net-dialup/e2220pc/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for net-dialup/e2220pc -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/e2220pc/ChangeLog,v 1.2 2008/01/30 01:19:27 sbriesen Exp $ - -*e2220pc-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +files/e2220pc_kernel-2.6.24.diff, +e2220pc-0.1-r1.ebuild: - fixing string.h problem (see bug #202385) + patches for kernel 2.6.24 - (thanks to Arnd Feldmueller <arnd.feldmueller@web.de>). - -*e2220pc-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +e2220pc-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/e2220pc/Manifest b/net-dialup/e2220pc/Manifest deleted file mode 100644 index d2cd27ecaf52..000000000000 --- a/net-dialup/e2220pc/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX e2220pc_kernel-2.6.24.diff 1629 RMD160 c63334b87f13b8daa8993d0aa618539a055dc17e SHA1 fce7e14ac54bb5bdbaa7d7ca024b9a3cb410681b SHA256 d7eff5d4ca7dbfccb5d72a43187e3c83ab99782418152766b9af40ff50d5d286 -DIST e2220pc-0.1-0.src.rpm 316445 RMD160 9a469e7942256856a928e31802276f34d47fda96 SHA1 40fcfd13f06738bbee1897b03341bd95cc3e6854 SHA256 0ad115ae513f13cad002468924e983271e418f98e16b4762dd62b77030e00ae5 -EBUILD e2220pc-0.1-r1.ebuild 1346 RMD160 dd507a10fc65818108ae5e525be2bc59f6b8ec03 SHA1 62f98b879bd48431456f0d5ac9f4168739d7a277 SHA256 d6a0765fa5fcafd79457fd4f1f338dab2b32f6b083545454dd363e0254559cd5 -EBUILD e2220pc-0.1.ebuild 1097 RMD160 855731621f4600fad228ebb304afb3d66802f855 SHA1 32fcce142fea9cbec0d7740c2379f3dfe021e2e1 SHA256 ef80f96f60ce9c72b7a9932c9df252dd88ece95387762fcb3b89f3b2742914e4 -MISC ChangeLog 676 RMD160 ed62efc42c73b327a5075242c87862fa85506840 SHA1 cb8e28bb294ce655011ea661fd68a523cb828e66 SHA256 c10fbf77b7f4d5ce2b070f97405507a35f2afcdacc023271997bb81ca84b0597 -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/e2220pc/e2220pc-0.1-r1.ebuild b/net-dialup/e2220pc/e2220pc-0.1-r1.ebuild deleted file mode 100644 index a5d060aefb8d..000000000000 --- a/net-dialup/e2220pc/e2220pc-0.1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/e2220pc/e2220pc-0.1-r1.ebuild,v 1.1 2008/01/30 01:19:27 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Eumex 2220 PC" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/${PN}" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack eumex*.tar.bz2 - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - epatch "${FILESDIR}/${PN}_kernel-2.6.24.diff" - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} - -src_install() { - linux-mod_src_install - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/e2220pc/e2220pc-0.1.ebuild b/net-dialup/e2220pc/e2220pc-0.1.ebuild deleted file mode 100644 index d6447998e104..000000000000 --- a/net-dialup/e2220pc/e2220pc-0.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/e2220pc/e2220pc-0.1.ebuild,v 1.1 2008/01/06 01:25:30 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Eumex 2220 PC" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/${PN}" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack eumex*.tar.bz2 - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m "src/Makefile" -} - -src_install() { - linux-mod_src_install - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/e2220pc/files/e2220pc_kernel-2.6.24.diff b/net-dialup/e2220pc/files/e2220pc_kernel-2.6.24.diff deleted file mode 100644 index 6e42ce76f162..000000000000 --- a/net-dialup/e2220pc/files/e2220pc_kernel-2.6.24.diff +++ /dev/null @@ -1,46 +0,0 @@ ---- src/driver.c.orig 2008-01-30 02:03:44.000000000 +0100 -+++ src/driver.c 2008-01-30 02:03:44.000000000 +0100 -@@ -91,8 +91,12 @@ - static DECLARE_WAIT_QUEUE_HEAD(sched_wait); - static DECLARE_WAIT_QUEUE_HEAD(tx_wait); - static DECLARE_WAIT_QUEUE_HEAD(rx_wait); -+static DECLARE_COMPLETION(hotplug); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(notify); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(hotplug); - static DECLARE_MUTEX_LOCKED(notify); -+#endif - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ -@@ -754,7 +758,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker); -+ INIT_WORK (&closing_work, (work_func_t)closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -@@ -1171,7 +1175,10 @@ - } - } - LOG("Scheduler thread stopped.\n"); -+ complete(&hotplug); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - up (&hotplug); -+ #endif - return 0; - } /* scheduler */ - -@@ -1206,7 +1213,10 @@ - wake_up_interruptible (&wait); - } - LOG("Scheduler thread signalled, waiting...\n"); -+ wait_for_completion(&hotplug); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - down (&hotplug); -+ #endif - LOG("Scheduler thread[%d] terminated.\n", thread_pid); - } - thread_pid = -1; diff --git a/net-dialup/e2220pc/metadata.xml b/net-dialup/e2220pc/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/e2220pc/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/e5520pc/ChangeLog b/net-dialup/e5520pc/ChangeLog deleted file mode 100644 index abf20fb80411..000000000000 --- a/net-dialup/e5520pc/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for net-dialup/e5520pc -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/e5520pc/ChangeLog,v 1.2 2008/01/30 01:22:31 sbriesen Exp $ - -*e5520pc-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +files/e5520pc_kernel-2.6.24.diff, +e5520pc-0.1-r1.ebuild: - fixing string.h problem (see bug #202385) + patches for kernel 2.6.24 - (thanks to Arnd Feldmueller <arnd.feldmueller@web.de>). - -*e5520pc-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +e5520pc-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/e5520pc/Manifest b/net-dialup/e5520pc/Manifest deleted file mode 100644 index 0e385e4b0f95..000000000000 --- a/net-dialup/e5520pc/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX e5520pc_kernel-2.6.24.diff 1629 RMD160 979176e0dfa6ef49bb491af9efb536fa92472a7f SHA1 7e255d95d2360cfb3e78b647d2eb86261aa676ed SHA256 6f0b54a7633004ce353d2fc08a80041d2d1f708d766c523d24832a57db01305a -DIST e5520pc-0.1-0.src.rpm 316463 RMD160 3a58aa54c6903929b0f268784a3e0816a9654295 SHA1 a3df8d0ab1c17e556fe49654d548bfad923c6bc9 SHA256 898f5a0a9a14586012ec03a46cbb5d02d4012ed1c1edbcd828f2b975eb1b3438 -EBUILD e5520pc-0.1-r1.ebuild 1346 RMD160 00894072268ac851859eecfa24467a3dc0dba2f7 SHA1 c9482233699a3effd74472b7ae101f4328101b4e SHA256 f78260d7d2db4fe6a704bb1f195f2e00e619791823c4e49d51c178cbadaf9873 -EBUILD e5520pc-0.1.ebuild 1097 RMD160 d6df44346b7f03322c02ae34162ccf87d8089ad6 SHA1 1dc09ad565c82aec4f85b6faeab0e87a1592e0b5 SHA256 1370ad8a9b50e9ebb092bbe1621bedbf48d85a7e6c5990050d2ca4b56b529c1e -MISC ChangeLog 676 RMD160 15ea0d78e498c8a7ad83dec57aa035c1ac715848 SHA1 cf3b6e851b6a9845f5ae10b5b170dc01d96172db SHA256 ee0157c36386d9fa33bd823fb6d3de586b484a97499c79f01bd58ce0f090b946 -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/e5520pc/e5520pc-0.1-r1.ebuild b/net-dialup/e5520pc/e5520pc-0.1-r1.ebuild deleted file mode 100644 index 0c287bf2ea97..000000000000 --- a/net-dialup/e5520pc/e5520pc-0.1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/e5520pc/e5520pc-0.1-r1.ebuild,v 1.1 2008/01/30 01:22:31 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Eumex 5520 PC" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/${PN}" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack eumex*.tar.bz2 - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - epatch "${FILESDIR}/${PN}_kernel-2.6.24.diff" - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} - -src_install() { - linux-mod_src_install - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/e5520pc/e5520pc-0.1.ebuild b/net-dialup/e5520pc/e5520pc-0.1.ebuild deleted file mode 100644 index 65532ebdaafc..000000000000 --- a/net-dialup/e5520pc/e5520pc-0.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/e5520pc/e5520pc-0.1.ebuild,v 1.1 2008/01/06 01:27:58 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Eumex 5520 PC" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/${PN}" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack eumex*.tar.bz2 - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m "src/Makefile" -} - -src_install() { - linux-mod_src_install - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/e5520pc/files/e5520pc_kernel-2.6.24.diff b/net-dialup/e5520pc/files/e5520pc_kernel-2.6.24.diff deleted file mode 100644 index a5f2043682be..000000000000 --- a/net-dialup/e5520pc/files/e5520pc_kernel-2.6.24.diff +++ /dev/null @@ -1,46 +0,0 @@ ---- src/driver.c.orig 2008-01-30 02:07:00.000000000 +0100 -+++ src/driver.c 2008-01-30 02:07:00.000000000 +0100 -@@ -91,8 +91,12 @@ - static DECLARE_WAIT_QUEUE_HEAD(sched_wait); - static DECLARE_WAIT_QUEUE_HEAD(tx_wait); - static DECLARE_WAIT_QUEUE_HEAD(rx_wait); -+static DECLARE_COMPLETION(hotplug); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(notify); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(hotplug); - static DECLARE_MUTEX_LOCKED(notify); -+#endif - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ -@@ -754,7 +758,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker); -+ INIT_WORK (&closing_work, (work_func_t)closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -@@ -1171,7 +1175,10 @@ - } - } - LOG("Scheduler thread stopped.\n"); -+ complete(&hotplug); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - up (&hotplug); -+ #endif - return 0; - } /* scheduler */ - -@@ -1206,7 +1213,10 @@ - wake_up_interruptible (&wait); - } - LOG("Scheduler thread signalled, waiting...\n"); -+ wait_for_completion(&hotplug); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - down (&hotplug); -+ #endif - LOG("Scheduler thread[%d] terminated.\n", thread_pid); - } - thread_pid = -1; diff --git a/net-dialup/e5520pc/metadata.xml b/net-dialup/e5520pc/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/e5520pc/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/fcclassic/ChangeLog b/net-dialup/fcclassic/ChangeLog deleted file mode 100644 index 9999c33804d1..000000000000 --- a/net-dialup/fcclassic/ChangeLog +++ /dev/null @@ -1,16 +0,0 @@ -# ChangeLog for net-dialup/fcclassic -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcclassic/ChangeLog,v 1.2 2008/01/30 01:25:08 sbriesen Exp $ - -*fcclassic-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +fcclassic-0.1-r1.ebuild: - fixing string.h problem (see bug #202385). - -*fcclassic-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +fcclassic-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/fcclassic/Manifest b/net-dialup/fcclassic/Manifest deleted file mode 100644 index 3d5d6271af39..000000000000 --- a/net-dialup/fcclassic/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST fcclassic-0.1-0.src.rpm 279140 RMD160 de91024d8ceafa58732c69c27e403b697eddc17f SHA1 3dcd2a0e33b79bcb5e6c8604535fef272f20a9d7 SHA256 5125202114517b49fd32bf108cbc811438b7791c4da4c6ee13af7b61cd2b6be7 -EBUILD fcclassic-0.1-r1.ebuild 1235 RMD160 b6744820353fd3f2699626629d1b585d52acb6b4 SHA1 7e118bd926d878716b1620a7eaa173868170c6ed SHA256 971bb3b1a4c4499c995794d8277f87ba162d502a21faec3bb302ec927ca352d6 -EBUILD fcclassic-0.1.ebuild 1033 RMD160 c7cbef9e5620910f971c1e2bd70e033a496d2e38 SHA1 6c12f624bc92cbe16b62bacd206953df77055652 SHA256 092068b7b9bec7cd4082afdec9acf49079c520d329ec4886d46763e60a0e468c -MISC ChangeLog 568 RMD160 71b9611696856a308dc09eef92a90b395acf0525 SHA1 a3af2aad0f9cc89a7ce7469c0c77a27b346db000 SHA256 8c7b51a1c8c247e70d2e8c257089c24ec92d796d6f675de8548b4476f82f4dda -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fcclassic/fcclassic-0.1-r1.ebuild b/net-dialup/fcclassic/fcclassic-0.1-r1.ebuild deleted file mode 100644 index 11b0f8b3c9dc..000000000000 --- a/net-dialup/fcclassic/fcclassic-0.1-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcclassic/fcclassic-0.1-r1.ebuild,v 1.1 2008/01/30 01:25:08 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card Classic" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-*.tar.bz2 - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} diff --git a/net-dialup/fcclassic/fcclassic-0.1.ebuild b/net-dialup/fcclassic/fcclassic-0.1.ebuild deleted file mode 100644 index 6d7d7a91d48b..000000000000 --- a/net-dialup/fcclassic/fcclassic-0.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcclassic/fcclassic-0.1.ebuild,v 1.1 2008/01/06 01:30:19 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card Classic" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-*.tar.bz2 - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m "src/Makefile" -} diff --git a/net-dialup/fcclassic/metadata.xml b/net-dialup/fcclassic/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/fcclassic/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog deleted file mode 100644 index 6774298280bd..000000000000 --- a/net-dialup/fcdsl/ChangeLog +++ /dev/null @@ -1,173 +0,0 @@ -# ChangeLog for net-dialup/fcdsl -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.36 2008/01/30 01:27:42 sbriesen Exp $ - -*fcdsl-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +files/fcdsl_kernel-2.6.24.diff, +fcdsl-0.1-r1.ebuild: - fixing string.h problem (see bug #202385) + patches for kernel 2.6.24 - (thanks to Arnd Feldmueller <arnd.feldmueller@web.de>). - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - -files/fcdsl-2.6.20.diff, -files/fcdslslusb-2.6.20.diff, - -files/usb-2.6.20.diff, -files/fcdsl-2.6.22.diff, - -files/fcdsl-2.6.23.diff, -files/fcdsl.diff, -files/fcdsl2.diff, - -files/fcdslsl.diff, -fcdsl-2.6.37.ebuild: - removed old ebuild, all drivers have their own package now - -*fcdsl-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> metadata.xml, - +fcdsl-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - - 25 Dec 2007; Stefan Schweizer <genstef@gentoo.org> fcdsl-2.6.37.ebuild: - fix patch ordering - - 25 Dec 2007; Stefan Schweizer <genstef@gentoo.org> - +files/fcdsl-2.6.23.diff, -files/fcdsl-2.6.24.diff, fcdsl-2.6.37.ebuild: - new patch to also work with 2.6.23 - - 21 Dec 2007; Stefan Schweizer <genstef@gentoo.org> - +files/fcdsl-2.6.24.diff, fcdsl-2.6.37.ebuild: - 2.6.24 patch only for fcdsl version1 thanks to Arnd Feldmueller - - 13 Jul 2007; Stefan Schweizer <genstef@gentoo.org> - +files/fcdsl-2.6.22.diff, fcdsl-2.6.37.ebuild: - Add 2.6.22 patch thanks to André Malo <nd@perlig.de> in bug 185114 - - 27 Jun 2007; Stefan Schweizer <genstef@gentoo.org> +files/usb-2.6.20.diff, - fcdsl-2.6.37.ebuild: - Patch to fix compile errors thanks to Alan Hourihane - <alanh@fairlite.demon.co.uk> in bug 177532 - - 02 May 2007; Marius Mauch <genone@gentoo.org> fcdsl-2.6.37.ebuild: - Replacing einfo with elog - - 22 Feb 2007; <genstef@gentoo.org> +files/fcdslslusb-2.6.20.diff, - fcdsl-2.6.37.ebuild: - fcdslslusb patch thanks to Florian Lederer <Florian2780@gmx.de> in bug 165485 - - 12 Feb 2007; <genstef@gentoo.org> +files/fcdsl-2.6.20.diff, - fcdsl-2.6.37.ebuild: - Fix building with 2.6.19 and 2.6.20 thanks to André Malo <nd@perlig.de> in - bug 165485 - - 21 Sep 2006; Alin Nastac <mrness@gentoo.org> -fcdsl-2.6.20.7-r5.ebuild, - -fcdsl-2.6.30.ebuild: - Remove obsolete versions. - - 27 Apr 2006; Alin Nastac <mrness@gentoo.org> fcdsl-2.6.37.ebuild: - Stable on x86 (#131352). - - 12 Mar 2006; Alin Nastac <mrness@gentoo.org> fcdsl-2.6.37.ebuild: - Quote strings containing env vars. Beautify src_unpack code. - -*fcdsl-2.6.37 (22 Feb 2006) - - 22 Feb 2006; Stefan Schweizer <genstef@gentoo.org> +fcdsl-2.6.37.ebuild: - Version bump, ~amd64 thanks to malc for testing - - 17 Oct 2005; Alin Nastac <mrness@gentoo.org> fcdsl-2.6.20.7-r5.ebuild, - fcdsl-2.6.30.ebuild: - Recommend emerge --config instead ebuild ... config (#109482). - -*fcdsl-2.6.30 (28 Jul 2005) - - 28 Jul 2005; Stefan Briesenick <sbriesen@gentoo.org> +fcdsl-2.6.30.ebuild: - version bump, see bug 99652. - -*fcdsl-2.6.20.7-r5 (02 Jun 2005) - - 02 Jun 2005; Stefan Schweizer <genstef@gentoo.org> -files/fcdslslusb.diff, - -fcdsl-2.6.20.7-r4.ebuild, +fcdsl-2.6.20.7-r5.ebuild: - Removing the fcdslslusb patch as it turned out to be malicious, revision - bump and removing old ebuild. - - 04 May 2005; Stefan Schweizer <genstef@gentoo.org> - fcdsl-2.6.20.7-r4.ebuild: - Change utf8 use-flag to unicode, thanks to SpanKY <vapier@gentoo.org> in bug - 91388 - - 24 Apr 2005; Stefan Schweizer <genstef@gentoo.org> - fcdsl-2.6.20.7-r4.ebuild: - Add USE_EXPAND to avoid downloading unneeded drivers. Thanks to tove for the - idea. - - 15 Apr 2005; Stefan Schweizer <genstef@gentoo.org> - fcdsl-2.6.20.7-r4.ebuild: - Remove drdsl installation in favour of net-dialup/drdsl - - 29 Mar 2005; Stefan Schweizer <genstef@gentoo.org> - fcdsl-2.6.20.7-r4.ebuild: - Add new capi4k-utils notice - - 19 Mar 2005; Stefan Schweizer <genstef@gentoo.org> -files/fcdslusb.diff, - fcdsl-2.6.20.7-r4.ebuild: - Removing fcdslusb patch.. it does not work and is not needed. - - 09 Mar 2005; Alin Nastac <mrness@gentoo.org> -fcdsl-2.6.20.7-r2.ebuild, - -fcdsl-2.6.20.7-r3.ebuild: - Remove obsolete versions. - - 04 Mar 2005; Stefan Schweizer <genstef@gentoo.org> - fcdsl-2.6.20.7-r4.ebuild: - 2.6.20.7-r4 stable because of wolf31o2 for livecd and the severe problems - described in bug 76832 - -*fcdsl-2.6.20.7-r4 (26 Feb 2005) - - 26 Feb 2005; Stefan Schweizer <genstef@gentoo.org> +files/fcdsl.diff, - +files/fcdsl2.diff, +files/fcdslsl.diff, +files/fcdslslusb.diff, - +files/fcdslusb.diff, +fcdsl-2.6.20.7-r4.ebuild: - New ebuild, removing specific capi.conf in favour of capi4k-utils, adding - patches for bug 76832 thanks to MonkeyIsland <parkmann@gmx.net> - - 18 Feb 2005; Alin Nastac <mrness@gentoo.org> fcdsl-2.6.20.7-r2.ebuild, - fcdsl-2.6.20.7-r3.ebuild: - Remove /lib/isdn symlink as is no longer required by the current version of - isdn4k-utils. - - 25 Jan 2005; Stefan Schweizer <genstef@gentoo.org> -fcdsl-2.6.20.7.ebuild: - Remove obsolete kmod-inheriting version - -*fcdsl-2.6.20.7-r3 (25 Jan 2005) - - 25 Jan 2005; Stefan Schweizer <genstef@gentoo.org> - fcdsl-2.6.20.7-r2.ebuild, +fcdsl-2.6.20.7-r3.ebuild: - New version thanks to MonkeyIsland <parkmann@gmx.net> and tuXXer - <bs.net@gmx.de> in bug 76832, version 2.6.20.7-r2 stable on x86 for livecd - -*fcdsl-2.6.20.7-r2 (12 Dec 2004) - - 12 Dec 2004; Alin Nastac <mrness@gentoo.org> -fcdsl-2.6.20.7-r1.ebuild, - +fcdsl-2.6.20.7-r2.ebuild: - Move firmware files to /lib/firmware, the new FHS standard location for - firmware files. - - 22 Nov 2004; Alin Nastac <mrness@gentoo.org> fcdsl-2.6.20.7-r1.ebuild: - Add support for env variable FCDSL_CARDS. If is non-empty, only these modules - will be installed. See #71781 for more details. - - 21 Nov 2004; Alin Nastac <mrness@gentoo.org> fcdsl-2.6.20.7-r1.ebuild: - Install all modules and remove card detection from compile function. See bug - #71781. - -*fcdsl-2.6.20.7-r1 (20 Nov 2004) - - 20 Nov 2004; Alin Nastac <mrness@gentoo.org> +fcdsl-2.6.20.7-r1.ebuild, - fcdsl-2.6.20.7.ebuild: - Improved ebuild, thanks to Stefan Schweizer <genstef@gentoo.org>. Closing - #71781. - - 07 Nov 2004; Daniel Black <dragonheart@gentoo.org> fcdsl-2.6.20.7.ebuild: - removed sys-kernel/config-kernel from dependancies - -*fcdsl-2.6.20.7 (28 Sep 2004) - - 28 Sep 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml, - +fcdsl-2.6.20.7.ebuild: - Initial version from bug #50716 (and dups). Ebuild thanks to tuXXer - <bs.net@gmx.de> - diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest deleted file mode 100644 index 869aa0be1f6d..000000000000 --- a/net-dialup/fcdsl/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX fcdsl_kernel-2.6.24.diff 1235 RMD160 f2ba173d19a6dd7041039c5df4f175babd5b0ec0 SHA1 646ff96e204791be0396ae4942620218ae7693a6 SHA256 5201d26a263a98dee29e2b45d0aa6a5b2ad82d7a61436c995dc41fc431a0167c -DIST fcdsl-0.1-0.src.rpm 1792277 RMD160 16cb511dffe8e9d773b382713da8fcca2b2be0b8 SHA1 1ebf03d2ec7770550a8f41c6efc41ae6f6afc2c5 SHA256 00f2a5b3abb072edc00447308b4680b044efbcbd9d8844060a36509c9cc3064c -EBUILD fcdsl-0.1-r1.ebuild 1390 RMD160 d2ed569671d4033d2e320d36272ace3a803c6ee0 SHA1 f98160f3964ac9cb04a67e338be5ef729605eac1 SHA256 79ed4e0344e7a50f7beae90c31b0424efe7d08fc5b578a91df7456a13f0b4f41 -EBUILD fcdsl-0.1.ebuild 1141 RMD160 beb5a5c8792b6a31194414ac834e957c79aa7ca5 SHA1 d617cda01e35eb94a13ad9a5bcae99059e328f03 SHA256 2e9bc5593cb713cb8ce0bd5e1c11449aef1ac222faa0b08d3cb4e5b56ff13c15 -MISC ChangeLog 6542 RMD160 20eb82599432a1ce0bd97d4a0c7d2e390b4e5db6 SHA1 bc5ed6d6abca7ee192fef1bf9c5faddb9ba45c44 SHA256 75dc3bd7218ab14bb4bfc9441132ed99cd035806e28decabff9e7ff62b83f4a2 -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fcdsl/fcdsl-0.1-r1.ebuild b/net-dialup/fcdsl/fcdsl-0.1-r1.ebuild deleted file mode 100644 index 6da9492f68f2..000000000000 --- a/net-dialup/fcdsl/fcdsl-0.1-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-0.1-r1.ebuild,v 1.1 2008/01/30 01:27:42 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card DSL PCI" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="" -RDEPEND="net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - epatch "${FILESDIR}/${PN}_kernel-2.6.24.diff" - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins *.bin - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcdsl/fcdsl-0.1.ebuild b/net-dialup/fcdsl/fcdsl-0.1.ebuild deleted file mode 100644 index 0edcd25ff206..000000000000 --- a/net-dialup/fcdsl/fcdsl-0.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-0.1.ebuild,v 1.1 2008/01/06 01:33:29 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card DSL PCI" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="" -RDEPEND="net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m "src/Makefile" -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins *.bin - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcdsl/files/fcdsl_kernel-2.6.24.diff b/net-dialup/fcdsl/files/fcdsl_kernel-2.6.24.diff deleted file mode 100644 index 2e619365e360..000000000000 --- a/net-dialup/fcdsl/files/fcdsl_kernel-2.6.24.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- src/driver.c.orig 2008-01-27 05:30:34.000000000 +0100 -+++ src/driver.c 2008-01-27 05:30:34.000000000 +0100 -@@ -111,7 +111,10 @@ - - static DECLARE_WAIT_QUEUE_HEAD(wait); - static DECLARE_WAIT_QUEUE_HEAD(capi_wait); -+static DECLARE_COMPLETION(thread_sync); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(hotplug); -+#endif - - #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } - #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } -@@ -1367,7 +1371,10 @@ - } - } - LOG("Scheduler thread stopped.\n"); -+ complete(&thread_sync); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - up (&hotplug); -+ #endif - return 0; - } /* sched_thread */ - -@@ -1401,7 +1410,10 @@ - SCHED_WAKEUP; - } - LOG("Thread signalled, waiting for termination...\n"); -+ wait_for_completion(&thread_sync); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - down (&hotplug); -+ #endif - LOG("Thread[%d] terminated.\n", thread_pid); - } - thread_pid = -1; diff --git a/net-dialup/fcdsl/metadata.xml b/net-dialup/fcdsl/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/fcdsl/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/fcdsl2/ChangeLog b/net-dialup/fcdsl2/ChangeLog deleted file mode 100644 index 0ddc135e9f30..000000000000 --- a/net-dialup/fcdsl2/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for net-dialup/fcdsl2 -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl2/ChangeLog,v 1.2 2008/01/30 01:29:21 sbriesen Exp $ - -*fcdsl2-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +files/fcdsl2_kernel-2.6.24.diff, +fcdsl2-0.1-r1.ebuild: - fixing string.h problem (see bug #202385) + patches for kernel 2.6.24 - (thanks to Arnd Feldmueller <arnd.feldmueller@web.de>). - -*fcdsl2-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +fcdsl2-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/fcdsl2/Manifest b/net-dialup/fcdsl2/Manifest deleted file mode 100644 index 9affd5d2461e..000000000000 --- a/net-dialup/fcdsl2/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX fcdsl2_kernel-2.6.24.diff 1825 RMD160 f8db1ccfa2221da41a83319b535d755156812f09 SHA1 60fc9eccd70e63069fd3e09423cc7b8556308247 SHA256 09b2458f3e081214c03470d00ca3978b30693a798ea566aa2c101f91b9f565c2 -DIST fcdsl2-0.1-0.src.rpm 2230082 RMD160 b52f28a130b64c243cea7b86d46d5af5ef8b4d3f SHA1 4a0bc2a434a6e1dcfc26d881322336d470065867 SHA256 bda2664a3784311022efe98e975574ffa790d107a2fbee30919d550f4c09bb62 -EBUILD fcdsl2-0.1-r1.ebuild 1491 RMD160 4deab3a056750072f5a0c3902319be12300c602e SHA1 2b47f45baa48be0f83dfbc40036c78288055d86c SHA256 0d899aac3a60a203b70d27180acc49cd76f3903ddcd87ceac89507259e9e451d -EBUILD fcdsl2-0.1.ebuild 1242 RMD160 d5d8282ae2d8fff76cfb7f9c33a9a659595051f2 SHA1 9b369a868b74a26f653d5d80cad11dc966c4af87 SHA256 d048021d3a2f309fca8035bea54c39676e8e8b1ddb390f7588f9fd0b0ab929db -MISC ChangeLog 669 RMD160 bf1ac7401058f60196a762d1a2e3625cc0fdcb94 SHA1 c58717ce237ff1fc1c9528584719f6d9fcc4a008 SHA256 262b3a494e82240a4ee50e5a8ce3f5bb68a4ca0f36c7b2fc780aa284999419da -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fcdsl2/fcdsl2-0.1-r1.ebuild b/net-dialup/fcdsl2/fcdsl2-0.1-r1.ebuild deleted file mode 100644 index 0868de753c43..000000000000 --- a/net-dialup/fcdsl2/fcdsl2-0.1-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl2/fcdsl2-0.1-r1.ebuild,v 1.1 2008/01/30 01:29:21 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card DSL v2.0 PCI" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - local BIT="" PAT="01234" - if use amd64; then - BIT="64bit-" PAT="1234" - fi - - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-${BIT}[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[${PAT}]:\s*\(.*\)|../\1|p" ../${PN}.spec) - epatch "${FILESDIR}/${PN}_kernel-2.6.24.diff" - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins ../*.bin - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcdsl2/fcdsl2-0.1.ebuild b/net-dialup/fcdsl2/fcdsl2-0.1.ebuild deleted file mode 100644 index 0f3c02e2cab6..000000000000 --- a/net-dialup/fcdsl2/fcdsl2-0.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl2/fcdsl2-0.1.ebuild,v 1.1 2008/01/06 01:39:07 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card DSL v2.0 PCI" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - local BIT="" PAT="01234" - if use amd64; then - BIT="64bit-" PAT="1234" - fi - - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-${BIT}[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[${PAT}]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m "src/Makefile" -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins ../*.bin - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcdsl2/files/fcdsl2_kernel-2.6.24.diff b/net-dialup/fcdsl2/files/fcdsl2_kernel-2.6.24.diff deleted file mode 100644 index e9b51ed36a2d..000000000000 --- a/net-dialup/fcdsl2/files/fcdsl2_kernel-2.6.24.diff +++ /dev/null @@ -1,47 +0,0 @@ ---- src/driver.c.orig 2008-01-27 05:38:50.000000000 +0100 -+++ src/driver.c 2008-01-27 05:38:50.000000000 +0100 -@@ -116,7 +116,10 @@ - static DECLARE_WAIT_QUEUE_HEAD(capi_wait); - static DECLARE_WAIT_QUEUE_HEAD(dbg_wait); - -+static DECLARE_COMPLETION(thread_sync); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(thread_sync); -+#endif - - #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } - #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } -@@ -1405,7 +1409,10 @@ - } - } - LOG("Scheduler thread stopped.\n"); -+ complete(&thread_sync); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - up (&thread_sync); -+ #endif - return 0; - } /* sched_thread */ - -@@ -1439,7 +1448,10 @@ - SCHED_WAKEUP; - } - LOG("Thread signalled, waiting for termination...\n"); -+ wait_for_completion(&thread_sync); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - down (&thread_sync); -+ #endif - LOG("Thread[%d] terminated.\n", thread_pid); - } - thread_pid = -1; ---- src/common.h.orig 2005-07-07 00:00:00.000000000 +0200 -+++ src/common.h 2008-01-27 05:38:50.000000000 +0100 -@@ -44,7 +44,9 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - typedef long intptr_t; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - typedef unsigned long uintptr_t; -+#endif - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ diff --git a/net-dialup/fcdsl2/metadata.xml b/net-dialup/fcdsl2/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/fcdsl2/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/fcdslsl/ChangeLog b/net-dialup/fcdslsl/ChangeLog deleted file mode 100644 index c7db0342df44..000000000000 --- a/net-dialup/fcdslsl/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for net-dialup/fcdslsl -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdslsl/ChangeLog,v 1.2 2008/01/30 01:30:55 sbriesen Exp $ - -*fcdslsl-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +files/fcdslsl_kernel-2.6.24.diff, +fcdslsl-0.1-r1.ebuild: - fixing string.h problem (see bug #202385) + patches for kernel 2.6.24 - (thanks to Arnd Feldmueller <arnd.feldmueller@web.de>). - -*fcdslsl-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +fcdslsl-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/fcdslsl/Manifest b/net-dialup/fcdslsl/Manifest deleted file mode 100644 index 32bc83b7f2fe..000000000000 --- a/net-dialup/fcdslsl/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX fcdslsl_kernel-2.6.24.diff 1825 RMD160 f8db1ccfa2221da41a83319b535d755156812f09 SHA1 60fc9eccd70e63069fd3e09423cc7b8556308247 SHA256 09b2458f3e081214c03470d00ca3978b30693a798ea566aa2c101f91b9f565c2 -DIST fcdslsl-0.1-0.src.rpm 2218332 RMD160 b70881f51a0de4e11a5a791a8b5aafc7387fe783 SHA1 bb815f064a213aa986a1d50f9575dc7ab91849c0 SHA256 f9cb5f93bef90f8a4e72cacd7cf77ebd935322a5cf5127a9de808deed32c93d2 -EBUILD fcdslsl-0.1-r1.ebuild 1491 RMD160 5fdc2a3d0f99b3746d5607050b8659b00e51a1da SHA1 c7fa07770f6d5d0a7ea76ec6201a1ed2be84853d SHA256 3cd56c9db90ae3b64f0ee79f6a69a206207178bd49b7f7e04e07d1f48a78a214 -EBUILD fcdslsl-0.1.ebuild 1242 RMD160 cd6159c1b91cc48633c004c7396b816e70a13d71 SHA1 be079df71b62874c3a57d38b1b9f0f0dec9b0302 SHA256 79c55490cacce7b6c64ba58516c24f2e2e2676ea39a03e44fb02c53eafa829ea -MISC ChangeLog 676 RMD160 83d70cb71cf44d031cf4d13cb5086318ccf2b1e0 SHA1 806d03b8afe8e385d5c3454a399b03dc461f9b30 SHA256 735628807309217657044fbf7dd7d31af7a0fcee987a8f02ce2a71741541dc32 -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fcdslsl/fcdslsl-0.1-r1.ebuild b/net-dialup/fcdslsl/fcdslsl-0.1-r1.ebuild deleted file mode 100644 index 645019311123..000000000000 --- a/net-dialup/fcdslsl/fcdslsl-0.1-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdslsl/fcdslsl-0.1-r1.ebuild,v 1.1 2008/01/30 01:30:55 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card DSL SL PCI" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - local BIT="" PAT="01234" - if use amd64; then - BIT="64bit-" PAT="1234" - fi - - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-${BIT}[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[${PAT}]:\s*\(.*\)|../\1|p" ../${PN}.spec) - epatch "${FILESDIR}/${PN}_kernel-2.6.24.diff" - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins ../*.bin - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcdslsl/fcdslsl-0.1.ebuild b/net-dialup/fcdslsl/fcdslsl-0.1.ebuild deleted file mode 100644 index a8a6df0bdccd..000000000000 --- a/net-dialup/fcdslsl/fcdslsl-0.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdslsl/fcdslsl-0.1.ebuild,v 1.1 2008/01/06 01:42:08 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card DSL SL PCI" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - local BIT="" PAT="01234" - if use amd64; then - BIT="64bit-" PAT="1234" - fi - - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-${BIT}[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[${PAT}]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m "src/Makefile" -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins ../*.bin - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcdslsl/files/fcdslsl_kernel-2.6.24.diff b/net-dialup/fcdslsl/files/fcdslsl_kernel-2.6.24.diff deleted file mode 100644 index e9b51ed36a2d..000000000000 --- a/net-dialup/fcdslsl/files/fcdslsl_kernel-2.6.24.diff +++ /dev/null @@ -1,47 +0,0 @@ ---- src/driver.c.orig 2008-01-27 05:38:50.000000000 +0100 -+++ src/driver.c 2008-01-27 05:38:50.000000000 +0100 -@@ -116,7 +116,10 @@ - static DECLARE_WAIT_QUEUE_HEAD(capi_wait); - static DECLARE_WAIT_QUEUE_HEAD(dbg_wait); - -+static DECLARE_COMPLETION(thread_sync); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(thread_sync); -+#endif - - #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } - #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } -@@ -1405,7 +1409,10 @@ - } - } - LOG("Scheduler thread stopped.\n"); -+ complete(&thread_sync); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - up (&thread_sync); -+ #endif - return 0; - } /* sched_thread */ - -@@ -1439,7 +1448,10 @@ - SCHED_WAKEUP; - } - LOG("Thread signalled, waiting for termination...\n"); -+ wait_for_completion(&thread_sync); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - down (&thread_sync); -+ #endif - LOG("Thread[%d] terminated.\n", thread_pid); - } - thread_pid = -1; ---- src/common.h.orig 2005-07-07 00:00:00.000000000 +0200 -+++ src/common.h 2008-01-27 05:38:50.000000000 +0100 -@@ -44,7 +44,9 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - typedef long intptr_t; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - typedef unsigned long uintptr_t; -+#endif - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ diff --git a/net-dialup/fcdslsl/metadata.xml b/net-dialup/fcdslsl/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/fcdslsl/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/fcdslslusb/ChangeLog b/net-dialup/fcdslslusb/ChangeLog deleted file mode 100644 index 7f81d6e978c6..000000000000 --- a/net-dialup/fcdslslusb/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for net-dialup/fcdslslusb -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdslslusb/ChangeLog,v 1.2 2008/01/30 01:32:20 sbriesen Exp $ - -*fcdslslusb-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +files/fcdslslusb_kernel-2.6.24.diff, +fcdslslusb-0.1-r1.ebuild: - fixing string.h problem (see bug #202385) + patches for kernel 2.6.24 - (thanks to Arnd Feldmueller <arnd.feldmueller@web.de>). - -*fcdslslusb-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +fcdslslusb-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/fcdslslusb/Manifest b/net-dialup/fcdslslusb/Manifest deleted file mode 100644 index 97a26d434079..000000000000 --- a/net-dialup/fcdslslusb/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX fcdslslusb_kernel-2.6.24.diff 2591 RMD160 5e984f27ff4f9d978cbd2b7a3b80cf87cc78676f SHA1 a6657c1b820cda7fe85c279bcbf096955175673d SHA256 9da44e272217dc701b817bc264e6927d020387aad64d40ab3264a088bcb0461c -DIST fcdslslusb-0.1-0.src.rpm 2202765 RMD160 9eb1c954103bcbfe7e72ce672280d3e1445532ed SHA1 6c668e2123e26fc6f38245f23f44598af3fd9cfb SHA256 28ac52b546e77ee1c45a6959f88444fa4032dfe4306766e3a291db1d08faf846 -EBUILD fcdslslusb-0.1-r1.ebuild 1499 RMD160 b204d6c01738dc0feecf2055c063d1b7196ed410 SHA1 fd0babfb7225a76817febeb55306e31cf215faa6 SHA256 22d3e88630f398fbafbc64f2fc59ac8ea71cbd2d0b48ff30110f95436137c387 -EBUILD fcdslslusb-0.1.ebuild 1250 RMD160 d7abb075e3cdd4dea235ba6339399a70b8287a13 SHA1 a45814afd6cdc8d94258e8b515bb5d2aeb2e6c65 SHA256 39dea9ae67260ef70cf4458f9637ab72965454de558bf026c2308b009047be1c -MISC ChangeLog 697 RMD160 6e69dfc41a32138f928b21e49e104bd367eb1772 SHA1 e314769b659a8eb98dfa56d794e29f27b72ba5f6 SHA256 8c53a6cad03888d3a5e2d51167bea3edfd82be9fbcdac49ce45d1dfa2087bfb8 -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fcdslslusb/fcdslslusb-0.1-r1.ebuild b/net-dialup/fcdslslusb/fcdslslusb-0.1-r1.ebuild deleted file mode 100644 index 2def94adb01a..000000000000 --- a/net-dialup/fcdslslusb/fcdslslusb-0.1-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdslslusb/fcdslslusb-0.1-r1.ebuild,v 1.1 2008/01/30 01:32:20 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card DSL SL USB" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - local BIT="" PAT="012345" - if use amd64; then - BIT="64bit-" PAT="12345" - fi - - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-${BIT}[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[${PAT}]:\s*\(.*\)|../\1|p" ../${PN}.spec) - epatch "${FILESDIR}/${PN}_kernel-2.6.24.diff" - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins ../*.frm - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcdslslusb/fcdslslusb-0.1.ebuild b/net-dialup/fcdslslusb/fcdslslusb-0.1.ebuild deleted file mode 100644 index c1f692bb9aec..000000000000 --- a/net-dialup/fcdslslusb/fcdslslusb-0.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdslslusb/fcdslslusb-0.1.ebuild,v 1.1 2008/01/06 01:44:18 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card DSL SL USB" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - local BIT="" PAT="012345" - if use amd64; then - BIT="64bit-" PAT="12345" - fi - - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-${BIT}[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[${PAT}]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m "src/Makefile" -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins ../*.frm - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcdslslusb/files/fcdslslusb_kernel-2.6.24.diff b/net-dialup/fcdslslusb/files/fcdslslusb_kernel-2.6.24.diff deleted file mode 100644 index 2999b34e11a9..000000000000 --- a/net-dialup/fcdslslusb/files/fcdslslusb_kernel-2.6.24.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- src/driver.c.orig 2008-01-30 01:03:05.000000000 +0100 -+++ src/driver.c 2008-01-30 01:11:17.000000000 +0100 -@@ -131,12 +131,20 @@ - static DECLARE_TASKLET(rx_tasklet, rx_task, 0); - static DECLARE_WAIT_QUEUE_HEAD(wait); - static DECLARE_WAIT_QUEUE_HEAD(capi_wait); -+static DECLARE_COMPLETION(hotplug); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(config); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(notify); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(hotplug); - static DECLARE_MUTEX_LOCKED(config); - static DECLARE_MUTEX_LOCKED(notify); -+#endif - - static DECLARE_WAIT_QUEUE_HEAD(dbg_wait); -+static DECLARE_COMPLETION(thread_sync); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(thread_sync); -+#endif - - #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } - #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } -@@ -434,7 +442,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker); -+ INIT_WORK (&closing_work, (work_func_t)closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -@@ -1180,7 +1188,10 @@ - } - } - LOG("Scheduler thread stopped.\n"); -+ complete(&thread_sync); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - up (&thread_sync); -+ #endif - return 0; - } /* scheduler */ - -@@ -1214,7 +1225,10 @@ - SCHED_WAKEUP; - } - LOG("Thread signalled, waiting for termination...\n"); -+ wait_for_completion(&thread_sync); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - down (&thread_sync); -+ #endif - LOG("Thread[%d] terminated.\n", thread_pid); - } - thread_pid = -1; ---- src/common.h.orig 2005-07-07 00:00:00.000000000 +0200 -+++ src/common.h 2008-01-30 01:03:05.000000000 +0100 -@@ -51,7 +51,9 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - typedef long intptr_t; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - typedef unsigned long uintptr_t; -+#endif - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ diff --git a/net-dialup/fcdslslusb/metadata.xml b/net-dialup/fcdslslusb/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/fcdslslusb/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/fcdslusb/ChangeLog b/net-dialup/fcdslusb/ChangeLog deleted file mode 100644 index 55f745c06997..000000000000 --- a/net-dialup/fcdslusb/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for net-dialup/fcdslusb -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdslusb/ChangeLog,v 1.2 2008/01/30 01:33:42 sbriesen Exp $ - -*fcdslusb-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +files/fcdslusb_kernel-2.6.24.diff, +fcdslusb-0.1-r1.ebuild: - fixing string.h problem (see bug #202385) + patches for kernel 2.6.24 - (thanks to Arnd Feldmueller <arnd.feldmueller@web.de>). - -*fcdslusb-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +fcdslusb-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/fcdslusb/Manifest b/net-dialup/fcdslusb/Manifest deleted file mode 100644 index 18d88b7f01ed..000000000000 --- a/net-dialup/fcdslusb/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX fcdslusb_kernel-2.6.24.diff 5008 RMD160 ec856d1e856fd367d9fa185c20e99248e22649f6 SHA1 7f8badce37b3f37d963974518caaae58e6022c0b SHA256 b4efee5cb11791ec3695e42bf8632e919da014d9100a70e35f33b6660d444130 -DIST fcdslusb-0.1-0.src.rpm 3853334 RMD160 5202fd73a9a20a072875bc692026aaebd3feb98a SHA1 4a592e9bdcd06ac3c8d49da56b3c0b02348333c8 SHA256 0de19b29e0e3a299427e3de204a1872ba53cc23a4a69f284752d39ad1c21e4e5 -EBUILD fcdslusb-0.1-r1.ebuild 1754 RMD160 db85786a85d8c064fa1a71e04ec50c70cc0a6090 SHA1 56362057b63d1861ec688834a1bee824b01183fd SHA256 725110d33df3c7d2a26254036be490d26ec2b6e9a1fd5a3cd7166d19197a6b10 -EBUILD fcdslusb-0.1.ebuild 1477 RMD160 4dc451370fcac5dd6e4dbca9954392ad93a2e488 SHA1 05d706da3cdd09b0624e8b67b99d99db544e2f93 SHA256 3616782091491d23bf71f08086271a760abfd28612a2981a3b461efbf032ea81 -MISC ChangeLog 683 RMD160 3dcdb47bdc2194c33dd9acf6b644865c31e25518 SHA1 661d8391c7a468a86e70d5b0879da47be9f8317b SHA256 78c1e7cdce92d98f12868ac24937eef7f57d69a72af7b382636014def0aacd38 -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fcdslusb/fcdslusb-0.1-r1.ebuild b/net-dialup/fcdslusb/fcdslusb-0.1-r1.ebuild deleted file mode 100644 index e317bd133dc1..000000000000 --- a/net-dialup/fcdslusb/fcdslusb-0.1-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdslusb/fcdslusb-0.1-r1.ebuild,v 1.1 2008/01/30 01:33:42 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card DSL USB" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/1/fritz/src) ${PN}2(net:${S}/2/fritz/src)" -} - -src_unpack() { - local BIT="" PAT1="012345" PAT2="0123467" - if use amd64; then - BIT="64bit-" PAT1="12345" PAT2="123467" - fi - - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-${BIT}[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}/1/fritz" - epatch $(sed -n "s|^Patch[${PAT1}]:\s*\(.*\)|../../../\1|p" ../../../${PN}.spec) - convert_to_m src/Makefile - - cd "${S}/2/fritz" - epatch $(sed -n "s|^Patch[${PAT2}]:\s*\(.*\)|../../../\1|p" ../../../${PN}.spec) - convert_to_m src/Makefile - - cd "${S}" - epatch "${FILESDIR}/${PN}_kernel-2.6.24.diff" - - for i in "${S}"/[12]/fritz/lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins 1/fritz/*.frm ../*.frm - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcdslusb/fcdslusb-0.1.ebuild b/net-dialup/fcdslusb/fcdslusb-0.1.ebuild deleted file mode 100644 index 3cd055adeb3b..000000000000 --- a/net-dialup/fcdslusb/fcdslusb-0.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdslusb/fcdslusb-0.1.ebuild,v 1.1 2008/01/06 01:47:59 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card DSL USB" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/1/fritz/src) ${PN}2(net:${S}/2/fritz/src)" -} - -src_unpack() { - local BIT="" PAT1="012345" PAT2="0123467" - if use amd64; then - BIT="64bit-" PAT1="12345" PAT2="123467" - fi - - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-${BIT}[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}/1/fritz" - epatch $(sed -n "s|^Patch[${PAT1}]:\s*\(.*\)|../../../\1|p" ../../../${PN}.spec) - convert_to_m "src/Makefile" - - cd "${S}/2/fritz" - epatch $(sed -n "s|^Patch[${PAT2}]:\s*\(.*\)|../../../\1|p" ../../../${PN}.spec) - convert_to_m "src/Makefile" -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins 1/fritz/*.frm ../*.frm - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcdslusb/files/fcdslusb_kernel-2.6.24.diff b/net-dialup/fcdslusb/files/fcdslusb_kernel-2.6.24.diff deleted file mode 100644 index 196f0924e4c9..000000000000 --- a/net-dialup/fcdslusb/files/fcdslusb_kernel-2.6.24.diff +++ /dev/null @@ -1,126 +0,0 @@ ---- 1/fritz/src/driver.c.orig 2008-01-30 01:32:05.000000000 +0100 -+++ 1/fritz/src/driver.c 2008-01-30 01:36:11.000000000 +0100 -@@ -108,9 +108,14 @@ - static DECLARE_TASKLET(rx_tasklet, rx_task, 0); - static DECLARE_WAIT_QUEUE_HEAD(wait); - static DECLARE_WAIT_QUEUE_HEAD(capi_wait); -+static DECLARE_COMPLETION(hotplug); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(config); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(notify); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(hotplug); - static DECLARE_MUTEX_LOCKED(config); - static DECLARE_MUTEX_LOCKED(notify); -+#endif - - #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } - #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } -@@ -785,7 +790,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker); -+ INIT_WORK (&closing_work, (work_func_t)closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -@@ -1349,7 +1354,10 @@ - } - } - LOG("Scheduler thread stopped.\n"); -+ complete(&hotplug); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - up (&hotplug); -+ #endif - return 0; - } /* scheduler */ - -@@ -1392,7 +1400,10 @@ - SCHED_WAKEUP; - } - LOG("Scheduler thread signalled, waiting...\n"); -+ wait_for_completion(&hotplug); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - down (&hotplug); -+ #endif - LOG("Scheduler thread[%d] terminated.\n", thread_pid); - } - thread_pid = -1; ---- 1/fritz/src/driver.h.orig 2008-01-30 01:32:05.000000000 +0100 -+++ 1/fritz/src/driver.h 2008-01-30 01:32:06.000000000 +0100 -@@ -58,7 +58,9 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - typedef long intptr_t; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - typedef unsigned long uintptr_t; -+#endif - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ ---- 2/fritz/src/driver.c.orig 2008-01-30 01:32:06.000000000 +0100 -+++ 2/fritz/src/driver.c 2008-01-30 01:32:06.000000000 +0100 -@@ -131,12 +131,20 @@ - static DECLARE_TASKLET(rx_tasklet, rx_task, 0); - static DECLARE_WAIT_QUEUE_HEAD(wait); - static DECLARE_WAIT_QUEUE_HEAD(capi_wait); -+static DECLARE_COMPLETION(hotplug); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(config); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(notify); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(hotplug); - static DECLARE_MUTEX_LOCKED(config); - static DECLARE_MUTEX_LOCKED(notify); -+#endif - - static DECLARE_WAIT_QUEUE_HEAD(dbg_wait); -+static DECLARE_COMPLETION(thread_sync); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(thread_sync); -+#endif - - #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } - #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } -@@ -434,7 +442,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker); -+ INIT_WORK (&closing_work, (work_func_t)closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -@@ -1180,7 +1188,10 @@ - } - } - LOG("Scheduler thread stopped.\n"); -+ complete(&thread_sync); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - up (&thread_sync); -+ #endif - return 0; - } /* scheduler */ - -@@ -1214,7 +1225,10 @@ - SCHED_WAKEUP; - } - LOG("Thread signalled, waiting for termination...\n"); -+ wait_for_completion(&thread_sync); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - down (&thread_sync); -+ #endif - LOG("Thread[%d] terminated.\n", thread_pid); - } - thread_pid = -1; ---- 2/fritz/src/common.h.orig 2005-08-05 00:00:00.000000000 +0200 -+++ 2/fritz/src/common.h 2008-01-30 01:32:06.000000000 +0100 -@@ -51,7 +51,9 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - typedef long intptr_t; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - typedef unsigned long uintptr_t; -+#endif - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ diff --git a/net-dialup/fcdslusb/metadata.xml b/net-dialup/fcdslusb/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/fcdslusb/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/fcdslusba/ChangeLog b/net-dialup/fcdslusba/ChangeLog deleted file mode 100644 index 7a9f63db874b..000000000000 --- a/net-dialup/fcdslusba/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for net-dialup/fcdslusba -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdslusba/ChangeLog,v 1.2 2008/01/30 01:35:02 sbriesen Exp $ - -*fcdslusba-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +files/fcdslusba_kernel-2.6.24.diff, +fcdslusba-0.1-r1.ebuild: - fixing string.h problem (see bug #202385) + patches for kernel 2.6.24 - (thanks to Arnd Feldmueller <arnd.feldmueller@web.de>). - -*fcdslusba-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +fcdslusba-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/fcdslusba/Manifest b/net-dialup/fcdslusba/Manifest deleted file mode 100644 index 45a5a52302ce..000000000000 --- a/net-dialup/fcdslusba/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX fcdslusba_kernel-2.6.24.diff 2591 RMD160 89cf61a168d1d3ff08189b695b624e547b26867e SHA1 b6abcc3bd3518135fec5cfd3adca2260db6de290 SHA256 9d9125013cba29ce0f0c78a78b7f8159ffc7bf0c1d43a2af660280d82b609292 -DIST fcdslusba-0.1-0.src.rpm 1284862 RMD160 6d55e8fcdc5c647d5acc112d9b4e777a98a706dc SHA1 31fa207ada1231ebcd1178d0eac01debdfeb2ce5 SHA256 b42b744d437beb122aa71eaa8ed2624ad2aaa5765837612cdc853899c308097a -EBUILD fcdslusba-0.1-r1.ebuild 1406 RMD160 ff9d568fa737773443aa5a507ae38a35f18d5b24 SHA1 4afbd11b036e437e3fdcfb0e0225e6daf122651e SHA256 db43fa70731c3d5328c3ae2db99814097674cdc557dd5a34055a4e1e13f177ec -EBUILD fcdslusba-0.1.ebuild 1157 RMD160 8840d25dbc8cd63642b021920ad252eed56fd017 SHA1 41f62190df6de58ef2c6965cf82d89c7252e6ca6 SHA256 c23541f3721251f54709d920844f7fbf763dd16bc1e12ded456b2b59c21dc90e -MISC ChangeLog 690 RMD160 4a5304ab03905e0e8c323168fa613a4804aaa06d SHA1 5fab616d5ab3c55916cf2233c51a1a9d1c7afd83 SHA256 784169e01a3a38d0b6a35fb1c66a0992a4fa3abd230f9dfb11c084e06c15c98d -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fcdslusba/fcdslusba-0.1-r1.ebuild b/net-dialup/fcdslusba/fcdslusba-0.1-r1.ebuild deleted file mode 100644 index 36ea105eb2cd..000000000000 --- a/net-dialup/fcdslusba/fcdslusba-0.1-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdslusba/fcdslusba-0.1-r1.ebuild,v 1.1 2008/01/30 01:35:02 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card DSL USB ANALOG" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="" -RDEPEND="net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[012345]:\s*\(.*\)|../\1|p" ../${PN}.spec) - epatch "${FILESDIR}/${PN}_kernel-2.6.24.diff" - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins *.frm - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcdslusba/fcdslusba-0.1.ebuild b/net-dialup/fcdslusba/fcdslusba-0.1.ebuild deleted file mode 100644 index fd8cdc065622..000000000000 --- a/net-dialup/fcdslusba/fcdslusba-0.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdslusba/fcdslusba-0.1.ebuild,v 1.1 2008/01/06 01:50:23 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card DSL USB ANALOG" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="" -RDEPEND="net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[012345]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m "src/Makefile" -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins *.frm - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcdslusba/files/fcdslusba_kernel-2.6.24.diff b/net-dialup/fcdslusba/files/fcdslusba_kernel-2.6.24.diff deleted file mode 100644 index e5bf525c8946..000000000000 --- a/net-dialup/fcdslusba/files/fcdslusba_kernel-2.6.24.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- src/driver.c.orig 2008-01-30 01:40:21.000000000 +0100 -+++ src/driver.c 2008-01-30 01:43:00.000000000 +0100 -@@ -131,12 +131,20 @@ - static DECLARE_TASKLET(rx_tasklet, rx_task, 0); - static DECLARE_WAIT_QUEUE_HEAD(wait); - static DECLARE_WAIT_QUEUE_HEAD(capi_wait); -+static DECLARE_COMPLETION(hotplug); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(config); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(notify); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(hotplug); - static DECLARE_MUTEX_LOCKED(config); - static DECLARE_MUTEX_LOCKED(notify); -+#endif - - static DECLARE_WAIT_QUEUE_HEAD(dbg_wait); -+static DECLARE_COMPLETION(thread_sync); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(thread_sync); -+#endif - - #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } - #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } -@@ -434,7 +442,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker); -+ INIT_WORK (&closing_work, (work_func_t)closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -@@ -1180,7 +1188,10 @@ - } - } - LOG("Scheduler thread stopped.\n"); -+ complete(&thread_sync); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - up (&thread_sync); -+ #endif - return 0; - } /* scheduler */ - -@@ -1214,7 +1225,10 @@ - SCHED_WAKEUP; - } - LOG("Thread signalled, waiting for termination...\n"); -+ wait_for_completion(&thread_sync); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - down (&thread_sync); -+ #endif - LOG("Thread[%d] terminated.\n", thread_pid); - } - thread_pid = -1; ---- src/common.h.orig 2005-07-07 00:00:00.000000000 +0200 -+++ src/common.h 2008-01-30 01:40:21.000000000 +0100 -@@ -51,7 +51,9 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - typedef long intptr_t; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - typedef unsigned long uintptr_t; -+#endif - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ diff --git a/net-dialup/fcdslusba/metadata.xml b/net-dialup/fcdslusba/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/fcdslusba/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/fcpcmcia/ChangeLog b/net-dialup/fcpcmcia/ChangeLog deleted file mode 100644 index c9c1ed297148..000000000000 --- a/net-dialup/fcpcmcia/ChangeLog +++ /dev/null @@ -1,16 +0,0 @@ -# ChangeLog for net-dialup/fcpcmcia -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcpcmcia/ChangeLog,v 1.2 2008/01/30 01:38:05 sbriesen Exp $ - -*fcpcmcia-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +fcpcmcia-0.1-r1.ebuild: - fixing string.h problem (see bug #202385). - -*fcpcmcia-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +fcpcmcia-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/fcpcmcia/Manifest b/net-dialup/fcpcmcia/Manifest deleted file mode 100644 index a0c280f9f38e..000000000000 --- a/net-dialup/fcpcmcia/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST fcpcmcia-0.1-0.src.rpm 1419843 RMD160 978787c9513e266ac9873ec5a7bedeb68bd11310 SHA1 f97e13e98373e87555e05123e468769080a3426d SHA256 5f29d945d2a8929c3a60662418373397803b80bfab948ec7f01f8ed76fed535e -EBUILD fcpcmcia-0.1-r1.ebuild 1454 RMD160 e9c78e9ec709191f79400f322ca026c5a93c8ff6 SHA1 3f01b4e9288f22cda1d22c0465fd2e2994f89a6b SHA256 509853766a28b22c4c9b777b24c4f40bedb25e6992c59e06216283c94048bc96 -EBUILD fcpcmcia-0.1.ebuild 1252 RMD160 8920b04c47786edf513a6235fc96d5b4b856ca59 SHA1 a5641009b1e54545bc0454641c8aaf6d95911636 SHA256 7f61877de5d3fc2808edcc4479b6b24d682277c6fdd671783ea95e61e771e1c7 -MISC ChangeLog 562 RMD160 c2bbd32fd363404417fac411620b953dfff911ba SHA1 b77d62717343b3c70f12b13eabc87bab273149a3 SHA256 801b4f55ee772e5afd391838f0ba2dfa4fee1a9b8a734b6138226bca93dc11d4 -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fcpcmcia/fcpcmcia-0.1-r1.ebuild b/net-dialup/fcpcmcia/fcpcmcia-0.1-r1.ebuild deleted file mode 100644 index cb72dc898d62..000000000000 --- a/net-dialup/fcpcmcia/fcpcmcia-0.1-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcpcmcia/fcpcmcia-0.1-r1.ebuild,v 1.1 2008/01/30 01:38:05 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card PCMCIA" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src) ${PN}_cs(net:${S}/src)" -} - -src_unpack() { - local BIT="" PAT="012345" - if use amd64; then - BIT="64bit-" PAT="12345" - fi - - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-${BIT}[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[${PAT}]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} - -src_install() { - linux-mod_src_install - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcpcmcia/fcpcmcia-0.1.ebuild b/net-dialup/fcpcmcia/fcpcmcia-0.1.ebuild deleted file mode 100644 index 65e638fdfdc9..000000000000 --- a/net-dialup/fcpcmcia/fcpcmcia-0.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcpcmcia/fcpcmcia-0.1.ebuild,v 1.1 2008/01/06 01:57:50 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card PCMCIA" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src) ${PN}_cs(net:${S}/src)" -} - -src_unpack() { - local BIT="" PAT="012345" - if use amd64; then - BIT="64bit-" PAT="12345" - fi - - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-${BIT}[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[${PAT}]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m "src/Makefile" -} - -src_install() { - linux-mod_src_install - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcpcmcia/metadata.xml b/net-dialup/fcpcmcia/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/fcpcmcia/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/fcpnp/ChangeLog b/net-dialup/fcpnp/ChangeLog deleted file mode 100644 index 492c20f81f88..000000000000 --- a/net-dialup/fcpnp/ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ -# ChangeLog for net-dialup/fcpnp -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcpnp/ChangeLog,v 1.2 2008/01/30 01:39:29 sbriesen Exp $ - -*fcpnp-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +fcpnp-0.1-r1.ebuild: - fixing string.h problem (see bug #202385). - -*fcpnp-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +fcpnp-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/fcpnp/Manifest b/net-dialup/fcpnp/Manifest deleted file mode 100644 index 148df1d4e33d..000000000000 --- a/net-dialup/fcpnp/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST fcpnp-0.1-0.src.rpm 280196 RMD160 3db711b9efb71275863d818b4ebb7a920aa41e62 SHA1 efd84ea91f62227e49b05fbf7772dfdf3f0ae8bc SHA256 8c7d69d5e73bbb016147b05214ad71425fb20b3467342bc1a4d6a5784156821b -EBUILD fcpnp-0.1-r1.ebuild 1223 RMD160 3a09dc237f789bcc5015c94e37a864ba8f9dfcf3 SHA1 953317a2969cd9f11dc6cb60124ab57a9941cdd2 SHA256 ada1a4f9fe4c0bdd8ac8b85085139c774fea84bc67121c2414692b14d801d847 -EBUILD fcpnp-0.1.ebuild 1021 RMD160 ad16efbe2857f333adfc82bc61791947ec68b228 SHA1 102e2cb75d3a150add4f13710642783fe59849da SHA256 6f2892c81a36b838ac972cc616b9b1cd9e07a795d85324959071f4076d1f07a7 -MISC ChangeLog 542 RMD160 1c13509b7028d0adb88ad65afd6c907aec4fb398 SHA1 62a36048818ae1d3502ed547a0b342b595abcd87 SHA256 cc893e968a04e79474ea13376b1b097e18ee3c2889206759a0ac9bc814041204 -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fcpnp/fcpnp-0.1-r1.ebuild b/net-dialup/fcpnp/fcpnp-0.1-r1.ebuild deleted file mode 100644 index 4586a31126cc..000000000000 --- a/net-dialup/fcpnp/fcpnp-0.1-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcpnp/fcpnp-0.1-r1.ebuild,v 1.1 2008/01/30 01:39:29 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card PnP" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-*.tar.bz2 - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} diff --git a/net-dialup/fcpnp/fcpnp-0.1.ebuild b/net-dialup/fcpnp/fcpnp-0.1.ebuild deleted file mode 100644 index 19a61d66ef47..000000000000 --- a/net-dialup/fcpnp/fcpnp-0.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcpnp/fcpnp-0.1.ebuild,v 1.1 2008/01/06 02:00:33 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card PnP" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-*.tar.bz2 - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m "src/Makefile" -} diff --git a/net-dialup/fcpnp/metadata.xml b/net-dialup/fcpnp/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/fcpnp/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/fcusb/ChangeLog b/net-dialup/fcusb/ChangeLog deleted file mode 100644 index afd8c51f6415..000000000000 --- a/net-dialup/fcusb/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for net-dialup/fcusb -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcusb/ChangeLog,v 1.2 2008/01/30 01:40:50 sbriesen Exp $ - -*fcusb-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +files/fcusb_kernel-2.6.24.diff, +fcusb-0.1-r1.ebuild: - fixing string.h problem (see bug #202385) + patches for kernel 2.6.24 - (thanks to Arnd Feldmueller <arnd.feldmueller@web.de>). - -*fcusb-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +fcusb-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/fcusb/Manifest b/net-dialup/fcusb/Manifest deleted file mode 100644 index 4d78a9c6d26e..000000000000 --- a/net-dialup/fcusb/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX fcusb_kernel-2.6.24.diff 1638 RMD160 541c5066b5e2a35a33674d2f6272d5b81e169d80 SHA1 859731bf0d376004074c24a946c2f4653b4a5075 SHA256 2a62e7260abea47a5d7d4dafa7d9b3a85a5d769ca9ccd403b9fad4ad37ee057c -DIST fcusb-0.1-0.src.rpm 806590 RMD160 4d418992ba199349f6868804555e4dbf09c1b0d8 SHA1 38c8b729bc59bbb032704aa192754465368f4e5c SHA256 f5d74c7c0366bb4bb8460fb38ea8ffb538c4092a62018ccbcc8be132ef19cbb0 -EBUILD fcusb-0.1-r1.ebuild 1376 RMD160 592bcb1603b5e675c5c6b7769b9ed59e1e862003 SHA1 30a4fc3a0bf90153482c7d2fd61b5b7fee54ada8 SHA256 4a70bd4a00acdf25ee8e60d97cc1571c69b84cee319524ff367aa73ee4345ec1 -EBUILD fcusb-0.1.ebuild 1127 RMD160 edffc9686de6fb8a8c6d270b0b0603bbf02d3933 SHA1 023f5f7598ac23b38e6ce90c4ee94faecd47d438 SHA256 51e9b135f360037a2ae54c448d408377a64c0e4be60ef055fb0c163cee4ca9ed -MISC ChangeLog 662 RMD160 8093b48c38f33dfbb88a40c74a208aad7859455d SHA1 c4f845644143fe0aa852dd24bb27456303d073c5 SHA256 61bffa845fe92867a22539f28944cbced805c10a4a0e478ef88b3a556deb76c5 -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fcusb/fcusb-0.1-r1.ebuild b/net-dialup/fcusb/fcusb-0.1-r1.ebuild deleted file mode 100644 index f90543d24c90..000000000000 --- a/net-dialup/fcusb/fcusb-0.1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcusb/fcusb-0.1-r1.ebuild,v 1.1 2008/01/30 01:40:50 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card USB" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - epatch "${FILESDIR}/${PN}_kernel-2.6.24.diff" - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} - -src_install() { - linux-mod_src_install - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcusb/fcusb-0.1.ebuild b/net-dialup/fcusb/fcusb-0.1.ebuild deleted file mode 100644 index ef32f798a73b..000000000000 --- a/net-dialup/fcusb/fcusb-0.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcusb/fcusb-0.1.ebuild,v 1.1 2008/01/06 02:02:49 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card USB" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m "src/Makefile" -} - -src_install() { - linux-mod_src_install - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcusb/files/fcusb_kernel-2.6.24.diff b/net-dialup/fcusb/files/fcusb_kernel-2.6.24.diff deleted file mode 100644 index 06e85138e16c..000000000000 --- a/net-dialup/fcusb/files/fcusb_kernel-2.6.24.diff +++ /dev/null @@ -1,46 +0,0 @@ ---- src/driver.c.orig 2008-01-30 01:53:11.000000000 +0100 -+++ src/driver.c 2008-01-30 01:54:06.000000000 +0100 -@@ -92,8 +92,12 @@ - static DECLARE_WAIT_QUEUE_HEAD(capi_wait); - static DECLARE_WAIT_QUEUE_HEAD(tx_wait); - static DECLARE_WAIT_QUEUE_HEAD(rx_wait); -+static DECLARE_COMPLETION(hotplug); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(notify); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(hotplug); - static DECLARE_MUTEX_LOCKED(notify); -+#endif - - #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } - #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } -@@ -787,7 +791,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker); -+ INIT_WORK (&closing_work, (work_func_t)closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -@@ -1211,7 +1215,10 @@ - } - } - LOG("Scheduler thread stopped.\n"); -+ complete(&hotplug); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - up (&hotplug); -+ #endif - return 0; - } /* scheduler */ - -@@ -1246,7 +1253,10 @@ - SCHED_WAKEUP; - } - LOG("Scheduler thread signalled, waiting...\n"); -+ wait_for_completion(&hotplug); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - down (&hotplug); -+ #endif - LOG("Scheduler thread[%d] terminated.\n", thread_pid); - } - thread_pid = -1; diff --git a/net-dialup/fcusb/metadata.xml b/net-dialup/fcusb/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/fcusb/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/fcusb2/ChangeLog b/net-dialup/fcusb2/ChangeLog deleted file mode 100644 index 75ae818cf7fb..000000000000 --- a/net-dialup/fcusb2/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for net-dialup/fcusb2 -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcusb2/ChangeLog,v 1.2 2008/01/30 01:42:36 sbriesen Exp $ - -*fcusb2-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +files/fcusb2_kernel-2.6.24.diff, +fcusb2-0.1-r1.ebuild: - fixing string.h problem (see bug #202385) + patches for kernel 2.6.24 - (thanks to Arnd Feldmueller <arnd.feldmueller@web.de>). - -*fcusb2-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +fcusb2-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/fcusb2/Manifest b/net-dialup/fcusb2/Manifest deleted file mode 100644 index 5fb3046d90e0..000000000000 --- a/net-dialup/fcusb2/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX fcusb2_kernel-2.6.24.diff 1638 RMD160 33284415167de129ba920b72ef730fd7fd387ec3 SHA1 08bb0fcd6705a6833d07c23aa246d26a830827da SHA256 1b425d2dc07f13b67a2507e693c2000374a0c1c4f9ad0d975a983bcdf669913e -DIST fcusb2-0.1-0.src.rpm 1499482 RMD160 ec03b407f955e218807e70c57c849202f5a28baa SHA1 f8b1d78342a1652412602801b08659784120cb4f SHA256 0cf5fabb3bb61647466f32579383bac961ff5c91e0decce91b30d98abaa9e122 -EBUILD fcusb2-0.1-r1.ebuild 1515 RMD160 b92d64f184fb6214ec3fdf52d200fe90405f9c2d SHA1 7bb4f798f911a06f2de25d13927d3f579334286a SHA256 93369ffe5e1fa65a72cd5a135468abb5098653f25a72e8a6648c364ee1b93811 -EBUILD fcusb2-0.1.ebuild 1266 RMD160 7358d248a5f62de3ac757853497ee8a1a92b31a7 SHA1 b5b92b054a8cd4f19226c4569c7f4ce3efe54833 SHA256 d745fb222e076d036394f28a000a349ce779f4219f4d671c8a7bf6b37662be5a -MISC ChangeLog 669 RMD160 06a629f6247f3f152d6f8481120874f864b3e850 SHA1 17027c7866b71df411fb3aebd479e49cc132e62b SHA256 62736ce33eb46212cb817fd410ed43934d716076b9de7458d9cd4d113c9983c8 -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fcusb2/fcusb2-0.1-r1.ebuild b/net-dialup/fcusb2/fcusb2-0.1-r1.ebuild deleted file mode 100644 index dcef83f446c7..000000000000 --- a/net-dialup/fcusb2/fcusb2-0.1-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcusb2/fcusb2-0.1-r1.ebuild,v 1.1 2008/01/30 01:42:36 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card USB v2.0" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - local BIT="" PAT="01234" - if use amd64; then - BIT="64bit-" PAT="1345" - fi - - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-${BIT}[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[${PAT}]:\s*\(.*\)|../\1|p" ../${PN}.spec) - epatch "${FILESDIR}/${PN}_kernel-2.6.24.diff" - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins *.frm - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcusb2/fcusb2-0.1.ebuild b/net-dialup/fcusb2/fcusb2-0.1.ebuild deleted file mode 100644 index 1af2db348de5..000000000000 --- a/net-dialup/fcusb2/fcusb2-0.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcusb2/fcusb2-0.1.ebuild,v 1.1 2008/01/06 02:05:11 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!Card USB v2.0" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - local BIT="" PAT="01234" - if use amd64; then - BIT="64bit-" PAT="1345" - fi - - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-${BIT}[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[${PAT}]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m "src/Makefile" -} - -src_install() { - linux-mod_src_install - insinto /lib/firmware/isdn - doins *.frm - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fcusb2/files/fcusb2_kernel-2.6.24.diff b/net-dialup/fcusb2/files/fcusb2_kernel-2.6.24.diff deleted file mode 100644 index 77cdee14b0ef..000000000000 --- a/net-dialup/fcusb2/files/fcusb2_kernel-2.6.24.diff +++ /dev/null @@ -1,46 +0,0 @@ ---- src/driver.c.orig 2008-01-30 01:56:53.000000000 +0100 -+++ src/driver.c 2008-01-30 01:59:17.000000000 +0100 -@@ -92,8 +92,12 @@ - static DECLARE_WAIT_QUEUE_HEAD(capi_wait); - static DECLARE_WAIT_QUEUE_HEAD(tx_wait); - static DECLARE_WAIT_QUEUE_HEAD(rx_wait); -+static DECLARE_COMPLETION(hotplug); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(notify); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(hotplug); - static DECLARE_MUTEX_LOCKED(notify); -+#endif - - #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } - #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } -@@ -787,7 +791,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker); -+ INIT_WORK (&closing_work, (work_func_t)closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -@@ -1211,7 +1215,10 @@ - } - } - LOG("Scheduler thread stopped.\n"); -+ complete(&hotplug); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - up (&hotplug); -+ #endif - return 0; - } /* scheduler */ - -@@ -1246,7 +1253,10 @@ - SCHED_WAKEUP; - } - LOG("Scheduler thread signalled, waiting...\n"); -+ wait_for_completion(&hotplug); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - down (&hotplug); -+ #endif - LOG("Scheduler thread[%d] terminated.\n", thread_pid); - } - thread_pid = -1; diff --git a/net-dialup/fcusb2/metadata.xml b/net-dialup/fcusb2/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/fcusb2/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog deleted file mode 100644 index ee7df6092c13..000000000000 --- a/net-dialup/fritzcapi/ChangeLog +++ /dev/null @@ -1,170 +0,0 @@ -# ChangeLog for net-dialup/fritzcapi -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.34 2007/08/29 18:45:40 genstef Exp $ - -*fritzcapi-2.6.43.ebuild (29 Aug 2007) - - 29 Aug 2007; Stefan Schweizer <genstef@gentoo.org> - +files/2.6.43-linux-2.6.22-pci_module_init.patch, fritzcapi-2.6.43.ebuild: - Add amd64 patch for 2.6.22 for fcpci only thanks to <apost1@gmx.de>, bug - 190152 and 184903 - - 23 Jul 2007; Stefan Schweizer <genstef@gentoo.org> - fritzcapi-2.6.43.ebuild: - The 2.6.22 works only for x86 thanks Sven M. Höritz - <sven.hoeritz@gmail.com> by mail - - 11 Jul 2007; Stefan Schweizer <genstef@gentoo.org> - +files/fritzcapi-2.6.22.patch, fritzcapi-2.6.43.ebuild: - Add 2.6.22 support thanks to Sven <skoehler@upb.de> in bug 184903 - - 27 Jun 2007; Stefan Schweizer <genstef@gentoo.org> - +files/2.6.43-linux-2.6.19-irq_handler.amd64.patch, - +files/fritzcapi-2.6.20.amd64.patch, +files/2.6.43-fcpcmcia.amd64.patch, - fritzcapi-2.6.43.ebuild: - amd64 later 2.6 kernel fixes thanks to Miroslaw Mieszczak - <mieszcz@zabrze.zigzag.pl> in bug 163366 - - 02 May 2007; Marius Mauch <genone@gentoo.org> fritzcapi-2.6.43.ebuild: - Replacing einfo with elog - - 06 Feb 2007; <genstef@gentoo.org> fritzcapi-2.6.43.ebuild: - comment out 2.6.20 patch for dsd - - 06 Feb 2007; <genstef@gentoo.org> +files/fritzcapi-2.6.20.patch, - fritzcapi-2.6.43.ebuild: - Add patch to fix kernels >= 2.6.20 thanks to Michael Biebl <biebl@teco.edu> - in bug 165536 - - 05 Feb 2007; <genstef@gentoo.org> +files/2.6.43-fcpcmcia.patch, - fritzcapi-2.6.43.ebuild: - Fix fcpcmcia build thanks to Peter Eisenlohr in bug 163366 - - 04 Feb 2007; <genstef@gentoo.org> - +files/2.6.43-linux-2.6.19-irq_handler.patch, fritzcapi-2.6.43.ebuild: - Add patch for 2.6.20 compatibility thanks to Martin von Gagern - <Martin.vGagern@gmx.net> in bug 163366 - - 13 Dec 2006; Stefan Schweizer <genstef@gentoo.org> - +files/fcusb2-2.6.19.patch, fritzcapi-2.6.43.ebuild: - add 2.6.19 fcusb patcht thanks to Michael Biebl <biebl@teco.edu> in bug 156808 - - 01 Dec 2006; Stefan Schweizer <genstef@gentoo.org> - fritzcapi-2.6.43.ebuild: - 2.6.19 fix thanks to Martin von Gagern <Martin.vGagern@gmx.net> in bug 153553 - - 07 Jul 2006; Stefan Schweizer <genstef@gentoo.org> - -files/fritzcapi-fix-for-2.6.10.patch, -fritzcapi-2.6.32.ebuild, - -fritzcapi-2.6.35.ebuild, -fritzcapi-2.6.42.ebuild, - fritzcapi-2.6.43.ebuild: - Add a check for kernel 2.6.17 and disable fcpcmcia there thanks to agaffney - in bug 139502, remove old ebuilds - - 27 Apr 2006; Alin Nastac <mrness@gentoo.org> fritzcapi-2.6.43.ebuild: - Stable on x86 (#131352). - - 12 Mar 2006; Alin Nastac <mrness@gentoo.org> fritzcapi-2.6.43.ebuild: - Beautify src_unpack function. Quote strings containing $WORKDIR, $S or $KV_DIR. - -*fritzcapi-2.6.43 (22 Feb 2006) - - 22 Feb 2006; Stefan Schweizer <genstef@gentoo.org> - +fritzcapi-2.6.43.ebuild: - Version bump thanks to Sven M. Höritz <sven.hoeritz@informatik.uni-ulm.de> - -*fritzcapi-2.6.42 (20 Oct 2005) - - 20 Oct 2005; Stefan Schweizer <genstef@gentoo.org> - +fritzcapi-2.6.42.ebuild: - Version bump including amd64 support thanks to Jochen Klumpp - <jochen.klumpp@online.de> and sbriesen for testing. - - 23 Aug 2005; Stefan Schweizer <genstef@gentoo.org> - fritzcapi-2.6.35.ebuild: - Fix building with KBUILD_OUTPUT - -*fritzcapi-2.6.35 (11 Aug 2005) - - 11 Aug 2005; Stefan Schweizer <genstef@gentoo.org> - +fritzcapi-2.6.35.ebuild: - Version bump thanks to Markus Friedrich <fm12@freenet.de> - and Christoph Dahlen <christoph@dahlen.org> in bug 99650 - - 14 May 2005; Stefan Schweizer <genstef@gentoo.org> - fritzcapi-2.6.32.ebuild: - Fix bug fxusb_CZ not installed, found in - http://forums.gentoo.org/viewtopic-t-332961.html thanks to sprittwicht - - 10 May 2005; Stefan Schweizer <genstef@gentoo.org> - fritzcapi-2.6.32.ebuild: - Fix unpack problem reportet by Lukas Schubert - <lukas.schubert@adviceandact.de> on gentoo-user-de - - 24 Apr 2005; Stefan Schweizer <genstef@gentoo.org> - fritzcapi-2.6.32.ebuild: - Add USE_EXPAND to avoid downloading unneeded drivers. - - 14 Apr 2005; Stefan Schweizer <genstef@gentoo.org> - fritzcapi-2.6.32.ebuild: - Fixes thanks to Martin von Gagern <Martin.vGagern@gmx.net> in bug 89023 - - 26 Feb 2005; Stefan Schweizer <genstef@gentoo.org> - fritzcapi-2.6.32.ebuild: - Fixing firmware unpack, removing capi.conf example in favour of capi4k-utils - - 18 Feb 2005; Alin Nastac <mrness@gentoo.org> fritzcapi-2.6.32.ebuild: - Remove /lib/isdn symlink as is no longer required by the current version of - isdn4k-utils. - - 06 Feb 2005; Alin Nastac <mrness@gentoo.org> metadata.xml, - -files/fritzcapi-2.6.26.7-fix-for-2.6.10.patch, - +files/fritzcapi-fix-for-2.6.10.patch, -fritzcapi-2.6.26.7-r3.ebuild, - fritzcapi-2.6.32.ebuild: - Remove obsolete ebuild. - -*fritzcapi-2.6.32 (29 Jan 2005) - - 29 Jan 2005; Stefan Schweizer <genstef@gentoo.org> - +fritzcapi-2.6.32.ebuild: - New version from SuSE, I also added newer tarballs from AVM for some drivers - - 20 Jan 2005; Stefan Schweizer <genstef@gentoo.org> - fritzcapi-2.6.26.7-r3.ebuild: - x86 stable - - 31 Dec 2004; Alin Nastac <mrness@gentoo.org> - +files/fritzcapi-2.6.26.7-fix-for-2.6.10.patch, - fritzcapi-2.6.26.7-r3.ebuild: - Fix broken build of fcpcmcia module on kernel versions >= 2.6.10 (#75904). - - 23 Dec 2004; Alin Nastac <mrness@gentoo.org> fritzcapi-2.6.26.7-r3.ebuild: - Replace kernel-mod inherit with linux-mod, thanks to Stefan Schweizer - <genstef@gentoo.org> (#75117). - -*fritzcapi-2.6.26.7-r3 (12 Dec 2004) - - 12 Dec 2004; Alin Nastac <mrness@gentoo.org> -fritzcapi-2.6.26.7-r1.ebuild, - -fritzcapi-2.6.26.7-r2.ebuild, +fritzcapi-2.6.26.7-r3.ebuild, - -fritzcapi-2.6.26.7.ebuild: - Add fcusb2 firmware files and hotplug script. See #52984. - -*fritzcapi-2.6.26.7-r2 (05 Dec 2004) - - 05 Dec 2004; Alin Nastac <mrness@gentoo.org> +fritzcapi-2.6.26.7-r2.ebuild: - Put informational messages about env variable FRITZCAPI_CARDS (see #73431). - -*fritzcapi-2.6.26.7-r1 (28 Nov 2004) - - 28 Nov 2004; Alin Nastac <mrness@gentoo.org> +fritzcapi-2.6.26.7-r1.ebuild: - Add support for env variable FRITZCAPI_CARDS. If it is non-empty, only these - modules will be installed. - - 22 Nov 2004; Alin Nastac <mrness@gentoo.org> fritzcapi-2.6.26.7.ebuild: - Add pcmcia and usb flags to IUSE. - -*fritzcapi-2.6.26.7 (20 Nov 2004) - - 20 Nov 2004; Alin Nastac <mrness@gentoo.org> +metadata.xml, - +fritzcapi-2.6.26.7.ebuild: - Initial import, thanks to Stefan Schweizer <genstef@gentoo.org>. Closing #71821 - diff --git a/net-dialup/fritzcapi/Manifest b/net-dialup/fritzcapi/Manifest deleted file mode 100644 index 45007f1bf074..000000000000 --- a/net-dialup/fritzcapi/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -AUX 2.6.43-fcpcmcia.amd64.patch 18215 RMD160 e44a890617a725c5d275359e10d3e54bc0aa73a3 SHA1 986316eaf2ad505489b076f639a022bf69ae0f57 SHA256 336411117944f827439adb6b73a41cbc11ef6d9183f06770e2e5077246bdeb9b -AUX 2.6.43-fcpcmcia.patch 19228 RMD160 635959d15326b93ebc5e84a5696a744f3ea49027 SHA1 97374936d420f4b2ce289f030f7f620af4d8ebb9 SHA256 236d4317ce27c043a0f4ead448fdea3bb506ffbf0e2554453f6937181241eea0 -AUX 2.6.43-linux-2.6.19-irq_handler.amd64.patch 3418 RMD160 8ef21ea3a1d46e56cd711e205849c2491779e6f2 SHA1 b68bd20809939b75628436147aeea713b5a1aea1 SHA256 1084d798c9a54bc5f1f00d746be302cdc5a893db14484c1dce96c0002a393147 -AUX 2.6.43-linux-2.6.19-irq_handler.patch 6472 RMD160 a899fc6f602b0bb988ab68aa82c3947ca3f3b139 SHA1 2d89534668665afc71b0476bd4e4749f4cd80067 SHA256 b9df1c8677a29e25c77b65d0b219b4ddbcc373a9dd628ac0a79dfb3c1c3a57e8 -AUX 2.6.43-linux-2.6.22-pci_module_init.patch 602 RMD160 553a37ebc0889ed396dd2ed7dae700654f8c97b7 SHA1 532f1aff414bb70b48dc93ac52c2f0e686953846 SHA256 4d42f809ff4b5777d867e270ae9e1b34d80d078813d90f2dd40e0a83190f6036 -AUX fcusb2-2.6.19.patch 396 RMD160 923e9cfcc98cca937cb5311db09d8c4b6d913442 SHA1 b8fb157ce239ed250501a1ab093e8dbd51bf97a6 SHA256 67541e2783e105ce1d7ca9f4d76fff7fb1f9cb9acc74a21c9d375b40d5df01b3 -AUX fritzcapi-2.6.20.amd64.patch 586 RMD160 22ffeb87d46a08fec992d19320d474323dce8a30 SHA1 8237450b4224ab105e1b8bc1fe07212a9c3c5326 SHA256 5f42a0366a92d769a0c868e6fe73710fbba3c834a1e744c6bb86cb29f64d5068 -AUX fritzcapi-2.6.20.patch 3500 RMD160 670766ffe9f17e2953c5413163a45158da0f608a SHA1 2bdcf2b28a048d2bd65d3c6a3eec70668559ad1f SHA256 6d919ea803b79caced2bdd0b35efbc739131ceb65904d14e58927d5b7875bc5e -AUX fritzcapi-2.6.22.patch 2428 RMD160 9ceb93eefb5d5bc3a86017edb8b44c0ec6dcd969 SHA1 9afebb93f80195bcfcdb1fdf0bdf42c8aa559f9c SHA256 0999d963f00d20ac7072e5e7e7dda6ca572cdb340e19fc2252b181de27d39908 -DIST km_fritzcapi-2.6-43.i586.rpm 2991322 RMD160 a300b383d474ddf9283c1bd9fae310be196c0199 SHA1 80768055694913b706075fa03f15a7477ef29a3f SHA256 e90827d8c2b53dc475c97be8c8a018777830519592bc9e25ef1a49389d12e475 -DIST km_fritzcapi-2.6-43.x86_64.rpm 1006645 RMD160 7338380933345b211ba92654565c78cf4ad793ca SHA1 f7e5d9cf8c43db73b4e0c4fcb76753af74b6e743 SHA256 506ff28f5fd1d70969378d52d5d48f9937b585556a4a5475bbfd92865b74a860 -EBUILD fritzcapi-2.6.43.ebuild 5707 RMD160 3c08de4ac8499c187226d3529b53755e2b85b995 SHA1 5d96ff6e8384d9bc7b17ff8698321c0aa014c856 SHA256 e3f012e2cc2c4d0c536666f393139cd2176d681a1f00f638e2d5cd18540094bd -MISC ChangeLog 6530 RMD160 1dd0980c7201375851a39cbad02c4d2cf47e77c9 SHA1 5be758f363bed28f2cec6dbb1c7443e86238aa29 SHA256 9fc636f7e819a7267730ba5d620defd0a78ac4f07b7eb7b1cafacbd016dd9b44 -MISC metadata.xml 319 RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 SHA1 bfea39d327ea986c5fc5e31864ce1bfeccb2f4d9 SHA256 ce891f4c7e75069036c8c422a1502ce9bbd4670be2e7f918dfa9da5e917787fc diff --git a/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.amd64.patch b/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.amd64.patch deleted file mode 100644 index 440e036a1510..000000000000 --- a/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.amd64.patch +++ /dev/null @@ -1,599 +0,0 @@ -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h 2005-07-07 00:00:00.000000000 +0200 -+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h 2007-01-25 11:39:11.000000000 +0100 -@@ -23,7 +23,6 @@ - #ifndef __have_driver_h__ - #define __have_driver_h__ - --#include <linux/config.h> - #include <linux/skbuff.h> - #include <linux/capi.h> - #include <linux/list.h> -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c 2006-01-30 17:09:05.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c 2007-02-05 21:43:14.000000000 +0100 -@@ -46,7 +46,6 @@ - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) - #define PCMCIA_IRQ_INFO2 - #endif --#define NEW_PCMCIA_DRV - - /*====================================================================*/ - MODULE_LICENSE("GPL"); -@@ -111,13 +110,9 @@ - handler. - */ - --static void cs_config(dev_link_t *); --static void cs_release(dev_link_t *); --#ifdef NEW_PCMCIA_DRV --static void cs_detach(struct pcmcia_device *p_dev); --static int cs_attach(struct pcmcia_device *p_dev); --#else --static int cs_event(event_t event, int priority, event_callback_args_t *); -+static int cs_config(struct pcmcia_device *link); -+static void cs_release(struct pcmcia_device *link); -+ - - /* - The attach() and detach() entry points are used to create and destroy -@@ -125,48 +120,33 @@ - needed to manage one actual PCMCIA card. - */ - --static dev_link_t * cs_attach(void); --static void cs_detach(dev_link_t *); --/* -- The dev_info variable is the "key" that is used to match up this -- device driver with appropriate cards, through the card configuration -- database. --*/ -+static void cs_detach(struct pcmcia_device *p_dev); - --static dev_info_t dev_info = "fcpcmcia_cs"; - - /* - A linked list of "instances" of the skeleton device. Each actual - PCMCIA card corresponds to one device instance, and is described -- by one dev_link_t structure (defined in ds.h). -+ by one struct pcmcia_device structure (defined in ds.h). - - You may not want to use a linked list for this -- for example, the -- memory card driver uses an array of dev_link_t pointers, where minor -+ memory card driver uses an array of struct pcmcia_device pointers, where minor - device numbers are used to derive the corresponding array index. - */ - --static dev_link_t *dev_list = NULL; - --#endif - /* -- A dev_link_t structure has fields for most things that are needed -- to keep track of a socket, but there will usually be some device -- specific information that also needs to be kept track of. The -- 'priv' pointer in a dev_link_t structure can be used to point to -- a device-specific private data structure, like this. -- - A driver needs to provide a dev_node_t structure for each device - on a card. In some cases, there is only one device per card (for - example, ethernet cards, modems). In other cases, there may be - many actual or logical devices (SCSI adapters, memory cards with - multiple partitions). The dev_node_t structures need to be kept -- in a linked list starting at the 'dev' field of a dev_link_t -+ in a linked list starting at the 'dev' field of a struct pcmcia_device - structure. We allocate them in the card's private data structure, - because they generally can't be allocated dynamically. - */ - - typedef struct local_info_t { -- dev_node_t node; -+ dev_node_t node; - } local_info_t; - - /*====================================================================== -@@ -181,101 +161,52 @@ - - ======================================================================*/ - --#ifdef NEW_PCMCIA_DRV --static int cs_attach(struct pcmcia_device *p_dev) -+static int cs_probe(struct pcmcia_device *p_dev) - { --#else --static dev_link_t *cs_attach(void) --{ -- client_reg_t client_reg; -- int ret; --#endif -- dev_link_t *link; -- local_info_t *local; -+ local_info_t *local; - #if defined (PCMCIA_IRQ_INFO2) -- int i; -+ int i; - #endif - -- NOTE("Attaching device...\n"); -+ NOTE("Attaching device...\n"); - -- /* Initialize the dev_link_t structure */ -- link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL); -- if (!link) -- goto err; -- memset(link, 0, sizeof(struct dev_link_t)); -- -- /* The io structure describes IO port mapping */ -- link->io.NumPorts1 = 16; -- link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; -- link->io.NumPorts2 = 0; -+ /* The io structure describes IO port mapping */ -+ p_dev->io.NumPorts1 = 16; -+ p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; -+ p_dev->io.NumPorts2 = 0; - -- /* Interrupt setup */ -- link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; -+ /* Interrupt setup */ -+ p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; - - #if defined (PCMCIA_IRQ_INFO2) -- link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID; -- if (irq_list_count > 0) { -- for (i = 0; (i < irq_list_count) && (irq_list[i] > 0); i++) -- link->irq.IRQInfo2 |= 1 << irq_list[i]; -- } else { -- for (i = 0; (i < irq_list_count) && (default_irq_list[i] > 0); i++) -- link->irq.IRQInfo2 |= 1 << default_irq_list[i]; -- } -+ p_dev->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID; -+ if (irq_list_count > 0) { -+ for (i = 0; (i < irq_list_count) && (irq_list[i] > 0); i++) -+ p_dev->irq.IRQInfo2 |= 1 << irq_list[i]; -+ } else { -+ for (i = 0; (i < irq_list_count) && (default_irq_list[i] > 0); i++) -+ p_dev->irq.IRQInfo2 |= 1 << default_irq_list[i]; -+ } - #else -- link->irq.IRQInfo1 = IRQ_LEVEL_ID; -+ p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; - #endif - -- /* General socket configuration */ -- link->conf.Attributes = CONF_ENABLE_IRQ; -- link->conf.Vcc = 50; -- link->conf.IntType = INT_MEMORY_AND_IO; -- link->conf.ConfigIndex = 1; -- link->conf.Present = PRESENT_OPTION; -- -- /* Allocate space for private device-specific data */ -- local = kmalloc(sizeof(local_info_t), GFP_KERNEL); -- if (!local) -- goto err_kfree; -- memset(local, 0, sizeof(local_info_t)); -- link->priv = local; -- --#ifdef NEW_PCMCIA_DRV -- link->handle = p_dev; -- p_dev->instance = link; -- link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; -- cs_config(link); -- return 0; --#else -- /* Register with Card Services */ -- link->next = dev_list; -- dev_list = link; -- client_reg.dev_info = &dev_info; --#if 0 -- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE; -- client_reg.EventMask = -- CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | -- CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | -- CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; -- client_reg.event_handler = &cs_event; --#endif -- client_reg.Version = 0x0210; -- client_reg.event_callback_args.client_data = link; -- ret = pcmcia_register_client(&link->handle, &client_reg); -- if (ret != 0) { -- cs_error(link->handle, RegisterClient, ret); -- cs_detach(link); -- goto err; -- } -- return link; --#endif -- err_kfree: -- kfree(link); -- err: --#ifdef NEW_PCMCIA_DRV -- return -EINVAL; --#else -- return NULL; --#endif -+ /* General socket configuration */ -+ p_dev->conf.Attributes = CONF_ENABLE_IRQ; -+ p_dev->conf.IntType = INT_MEMORY_AND_IO; -+ p_dev->conf.ConfigIndex = 1; -+ p_dev->conf.Present = PRESENT_OPTION; -+ -+ /* Allocate space for private device-specific data */ -+ local = kmalloc(sizeof(local_info_t), GFP_KERNEL); -+ if (!local) -+ goto err_kfree; -+ memset(local, 0, sizeof(local_info_t)); -+ p_dev->priv = local; -+ return cs_config(p_dev); -+ -+err_kfree: -+ return -ENOMEM; - } /* cs_attach */ - - /*====================================================================== -@@ -286,47 +217,12 @@ - when the device is released. - - ======================================================================*/ --#ifdef NEW_PCMCIA_DRV --static void cs_detach(struct pcmcia_device *p_dev) --{ -- dev_link_t *link = dev_to_instance(p_dev); - -- if (link->state & DEV_CONFIG) -- cs_release(link); --#else --static void cs_detach(dev_link_t *link) -+static void cs_detach(struct pcmcia_device *link) - { -- dev_link_t **linkp; -- -- NOTE("Detaching device...\n"); -- -- /* Locate device structure */ -- for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next) -- if (*linkp == link) break; -- if (*linkp == NULL) -- return; -- -- /* -- If the device is currently configured and active, we won't -- actually delete it yet. Instead, it is marked so that when -- the release() function is called, that will trigger a proper -- detach(). -- */ -- if (link->state & DEV_CONFIG) { -- link->state |= DEV_STALE_LINK; -- return; -- } -- -- /* Break the link with Card Services */ -- if (link->handle) -- pcmcia_deregister_client(link->handle); -- -- /* Unlink device structure, free pieces */ -- *linkp = link->next; --#endif -- kfree(link->priv); -- kfree(link); --} /* cs_detach */ -+ cs_release(link); -+ kfree(link->priv); -+} - - /*====================================================================== - -@@ -336,14 +232,15 @@ - - ======================================================================*/ - --static int get_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse) -+static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple, -+ cisparse_t *parse) - { - int i = pcmcia_get_tuple_data(handle, tuple); - if (i != CS_SUCCESS) return i; - return pcmcia_parse_tuple(handle, tuple, parse); - } - --static int first_tuple(client_handle_t handle, tuple_t *tuple, -+static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, - cisparse_t *parse) - { - int i = pcmcia_get_first_tuple(handle, tuple); -@@ -351,7 +248,7 @@ - return get_tuple(handle, tuple, parse); - } - --static int next_tuple(client_handle_t handle, tuple_t *tuple, -+static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, - cisparse_t *parse) - { - int i = pcmcia_get_next_tuple(handle, tuple); -@@ -359,9 +256,8 @@ - return get_tuple(handle, tuple, parse); - } - --static void cs_config(dev_link_t *link) -+static int cs_config(struct pcmcia_device *link) - { -- client_handle_t handle; - tuple_t tuple; - cisparse_t parse; - cistpl_cftable_entry_t *cf = &parse.cftable_entry; -@@ -369,7 +265,6 @@ - int i; - u_char buf[64]; - char devname[128]; -- handle = link->handle; - dev = link->priv; - - /* -@@ -378,25 +273,21 @@ - */ - do { - tuple.DesiredTuple = CISTPL_CONFIG; -- i = pcmcia_get_first_tuple(handle, &tuple); -+ i = pcmcia_get_first_tuple(link, &tuple); - if (i != CS_SUCCESS) break; - tuple.TupleData = buf; - tuple.TupleDataMax = 64; - tuple.TupleOffset = 0; -- i = pcmcia_get_tuple_data(handle, &tuple); -+ i = pcmcia_get_tuple_data(link, &tuple); - if (i != CS_SUCCESS) break; -- i = pcmcia_parse_tuple(handle, &tuple, &parse); -+ i = pcmcia_parse_tuple(link, &tuple, &parse); - if (i != CS_SUCCESS) break; - link->conf.ConfigBase = parse.config.base; - } while (0); - if (i != CS_SUCCESS) { -- cs_error(link->handle, ParseTuple, i); -- link->state &= ~DEV_CONFIG_PENDING; -- return; -+ cs_error(link, ParseTuple, i); -+ return -ENODEV; - } -- -- /* Configure card */ -- link->state |= DEV_CONFIG; - - do { - -@@ -407,7 +298,7 @@ - tuple.DesiredTuple = CISTPL_VERS_1; - - devname[0] = 0; -- if( !first_tuple(handle, &tuple, &parse) && parse.version_1.ns > 1 ) { -+ if( !first_tuple(link, &tuple, &parse) && parse.version_1.ns > 1 ) { - strlcpy(devname,parse.version_1.str + parse.version_1.ofs[1], - sizeof(devname)); - } -@@ -418,7 +309,7 @@ - tuple.TupleOffset = 0; tuple.TupleDataMax = 255; - tuple.Attributes = 0; - tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; -- i = first_tuple(handle, &tuple, &parse); -+ i = first_tuple(link, &tuple, &parse); - while (i == CS_SUCCESS) { - if (cf->io.nwin > 0) { - link->conf.ConfigIndex = cf->index; -@@ -428,36 +319,36 @@ - NOTE("testing i/o %#x-%#x\n", - link->io.BasePort1, - link->io.BasePort1+link->io.NumPorts1-1); -- i = pcmcia_request_io(link->handle, &link->io); -+ i = pcmcia_request_io(link, &link->io); - if (i == CS_SUCCESS) goto found_port; - } -- i = next_tuple(handle, &tuple, &parse); -+ i = next_tuple(link, &tuple, &parse); - } - - found_port: - if (i != CS_SUCCESS) { -- cs_error(link->handle, RequestIO, i); -+ cs_error(link, RequestIO, i); - break; - } - - /* - * allocate an interrupt line - */ -- i = pcmcia_request_irq(link->handle, &link->irq); -+ i = pcmcia_request_irq(link, &link->irq); - if (i != CS_SUCCESS) { -- cs_error(link->handle, RequestIRQ, i); -- pcmcia_release_io(link->handle, &link->io); -+ cs_error(link, RequestIRQ, i); -+ /* undo */ -+ pcmcia_disable_device(link); - break; - } - - /* - * configure the PCMCIA socket - */ -- i = pcmcia_request_configuration(link->handle, &link->conf); -+ i = pcmcia_request_configuration(link, &link->conf); - if (i != CS_SUCCESS) { -- cs_error(link->handle, RequestConfiguration, i); -- pcmcia_release_io(link->handle, &link->io); -- pcmcia_release_irq(link->handle, &link->irq); -+ cs_error(link, RequestConfiguration, i); -+ pcmcia_disable_device(link); - break; - } - -@@ -469,14 +360,13 @@ - strcpy(dev->node.dev_name, "A1"); - dev->node.major = 64; - dev->node.minor = 0; -- link->dev = &dev->node; -- -- link->state &= ~DEV_CONFIG_PENDING; -+ -+ link->dev_node = &dev->node; - /* If any step failed, release any partially configured state */ - if (i != 0) { - ERROR("Failed to setup controller, releasing link...\n"); - cs_release(link); -- return; -+ return -ENODEV; - } - NOTE("Ready to call card driver for '%s'...\n", devname); - -@@ -488,7 +378,7 @@ - link->irq.AssignedIRQ - ); - cs_release(link); -- return; -+ return -ENODEV; - } - dev->node.minor = i; - -@@ -498,6 +388,7 @@ - link->io.BasePort1, - link->irq.AssignedIRQ - ); -+ return 0; - } /* cs_config */ - - /*====================================================================== -@@ -508,96 +399,13 @@ - - ======================================================================*/ - --static void cs_release(dev_link_t *link) -+static void cs_release(struct pcmcia_device *link) - { - fcpcmcia_delcard(link->io.BasePort1, link->irq.AssignedIRQ); - -- /* Unlink the device chain */ -- link->dev = NULL; -- -- /* Don't bother checking to see if these succeed or not */ -- pcmcia_release_configuration(link->handle); -- pcmcia_release_io(link->handle, &link->io); -- pcmcia_release_irq(link->handle, &link->irq); -- link->state &= ~DEV_CONFIG; -- --#ifndef NEW_PCMCIA_DRV -- if (link->state & DEV_STALE_LINK) -- cs_detach(link); --#endif -+ pcmcia_disable_device(link); - } /* cs_release */ - --#ifdef NEW_PCMCIA_DRV --static int cs_suspend(struct pcmcia_device *dev) --{ -- dev_link_t *link = dev_to_instance(dev); -- -- link->state |= DEV_SUSPEND; -- if (link->state & DEV_CONFIG) -- pcmcia_release_configuration(link->handle); -- -- return 0; --} -- --static int cs_resume(struct pcmcia_device *dev) --{ -- dev_link_t *link = dev_to_instance(dev); -- -- link->state &= ~DEV_SUSPEND; -- if (link->state & DEV_CONFIG) -- pcmcia_request_configuration(link->handle, &link->conf); -- -- return 0; --} --#else --/*====================================================================== -- -- The card status event handler. Mostly, this schedules other -- stuff to run after an event is received. A CARD_REMOVAL event -- also sets some flags to discourage the net drivers from trying -- to talk to the card any more. -- -- When a CARD_REMOVAL event is received, we immediately set a flag -- to block future accesses to this device. All the functions that -- actually access the device should check this flag to make sure -- the card is still present. -- --======================================================================*/ -- --static int cs_event(event_t event, int priority, event_callback_args_t *args) --{ -- dev_link_t *link = args->client_data; -- -- LOG("Card service event: %x\n", event); -- switch (event) { -- case CS_EVENT_CARD_REMOVAL: -- link->state &= ~DEV_PRESENT; -- if (link->state & DEV_CONFIG) -- cs_release(link); -- break; -- case CS_EVENT_CARD_INSERTION: -- link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; -- cs_config(link); -- break; -- case CS_EVENT_PM_SUSPEND: -- link->state |= DEV_SUSPEND; -- /* Fall through... */ -- case CS_EVENT_RESET_PHYSICAL: -- if (link->state & DEV_CONFIG) -- pcmcia_release_configuration(link->handle); -- break; -- case CS_EVENT_PM_RESUME: -- link->state &= ~DEV_SUSPEND; -- /* Fall through... */ -- case CS_EVENT_CARD_RESET: -- if (link->state & DEV_CONFIG) -- pcmcia_request_configuration(link->handle, &link->conf); -- break; -- } -- return 0; --} /* cs_event */ --#endif -- - static struct pcmcia_device_id fcpcmcia_ids[] = { - PCMCIA_DEVICE_PROD_ID12("AVM", "ISDN A", 0x95d42008, 0xadc9d4bb), - PCMCIA_DEVICE_PROD_ID12("ISDN", "CARD", 0x8d9761c8, 0x01c5aa7b), -@@ -610,17 +418,10 @@ - .drv = { - .name = "fcpcmcia_cs", - }, --#ifdef NEW_PCMCIA_DRV -- .probe = cs_attach, -- .remove = cs_detach, -- .suspend= cs_suspend, -- .resume = cs_resume, --#else -- .attach = cs_attach, -- .detach = cs_detach, -- .event = cs_event, --#endif -- .id_table = fcpcmcia_ids, -+ .probe = cs_probe, -+ .remove = cs_detach, -+ .id_table = fcpcmcia_ids, -+ - }; - - static int __init cs_init(void) -@@ -631,6 +432,7 @@ - static void __exit cs_exit(void) - { - pcmcia_unregister_driver(&cs_driver); -+ - } - - module_init(cs_init); -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c 2005-07-07 00:00:00.000000000 +0200 -+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c 2007-01-25 11:39:11.000000000 +0100 -@@ -22,7 +22,6 @@ - - #include <stdarg.h> - #include <asm/uaccess.h> --#include <linux/config.h> - #include <linux/version.h> - #include <linux/kernel.h> - #include <linux/module.h> diff --git a/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.patch b/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.patch deleted file mode 100644 index aae12b1ff030..000000000000 --- a/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.patch +++ /dev/null @@ -1,621 +0,0 @@ -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h 2005-07-07 00:00:00.000000000 +0200 -+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h 2007-01-25 11:39:11.000000000 +0100 -@@ -23,7 +23,6 @@ - #ifndef __have_driver_h__ - #define __have_driver_h__ - --#include <linux/config.h> - #include <linux/skbuff.h> - #include <linux/capi.h> - #include <linux/list.h> -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c 2006-01-30 17:09:05.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c 2007-02-05 21:43:14.000000000 +0100 -@@ -46,7 +46,6 @@ - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) - #define PCMCIA_IRQ_INFO2 - #endif --#define NEW_PCMCIA_DRV - - /*====================================================================*/ - MODULE_LICENSE("GPL"); -@@ -111,13 +110,9 @@ - handler. - */ - --static void cs_config(dev_link_t *); --static void cs_release(dev_link_t *); --#ifdef NEW_PCMCIA_DRV --static void cs_detach(struct pcmcia_device *p_dev); --static int cs_attach(struct pcmcia_device *p_dev); --#else --static int cs_event(event_t event, int priority, event_callback_args_t *); -+static int cs_config(struct pcmcia_device *link); -+static void cs_release(struct pcmcia_device *link); -+ - - /* - The attach() and detach() entry points are used to create and destroy -@@ -125,48 +120,33 @@ - needed to manage one actual PCMCIA card. - */ - --static dev_link_t * cs_attach(void); --static void cs_detach(dev_link_t *); --/* -- The dev_info variable is the "key" that is used to match up this -- device driver with appropriate cards, through the card configuration -- database. --*/ -+static void cs_detach(struct pcmcia_device *p_dev); - --static dev_info_t dev_info = "fcpcmcia_cs"; - - /* - A linked list of "instances" of the skeleton device. Each actual - PCMCIA card corresponds to one device instance, and is described -- by one dev_link_t structure (defined in ds.h). -+ by one struct pcmcia_device structure (defined in ds.h). - - You may not want to use a linked list for this -- for example, the -- memory card driver uses an array of dev_link_t pointers, where minor -+ memory card driver uses an array of struct pcmcia_device pointers, where minor - device numbers are used to derive the corresponding array index. - */ - --static dev_link_t *dev_list = NULL; - --#endif - /* -- A dev_link_t structure has fields for most things that are needed -- to keep track of a socket, but there will usually be some device -- specific information that also needs to be kept track of. The -- 'priv' pointer in a dev_link_t structure can be used to point to -- a device-specific private data structure, like this. -- - A driver needs to provide a dev_node_t structure for each device - on a card. In some cases, there is only one device per card (for - example, ethernet cards, modems). In other cases, there may be - many actual or logical devices (SCSI adapters, memory cards with - multiple partitions). The dev_node_t structures need to be kept -- in a linked list starting at the 'dev' field of a dev_link_t -+ in a linked list starting at the 'dev' field of a struct pcmcia_device - structure. We allocate them in the card's private data structure, - because they generally can't be allocated dynamically. - */ - - typedef struct local_info_t { -- dev_node_t node; -+ dev_node_t node; - } local_info_t; - - /*====================================================================== -@@ -181,101 +161,52 @@ - - ======================================================================*/ - --#ifdef NEW_PCMCIA_DRV --static int cs_attach(struct pcmcia_device *p_dev) -+static int cs_probe(struct pcmcia_device *p_dev) - { --#else --static dev_link_t *cs_attach(void) --{ -- client_reg_t client_reg; -- int ret; --#endif -- dev_link_t *link; -- local_info_t *local; -+ local_info_t *local; - #if defined (PCMCIA_IRQ_INFO2) -- int i; -+ int i; - #endif - -- NOTE("Attaching device...\n"); -+ NOTE("Attaching device...\n"); - -- /* Initialize the dev_link_t structure */ -- link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL); -- if (!link) -- goto err; -- memset(link, 0, sizeof(struct dev_link_t)); -- -- /* The io structure describes IO port mapping */ -- link->io.NumPorts1 = 16; -- link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; -- link->io.NumPorts2 = 0; -+ /* The io structure describes IO port mapping */ -+ p_dev->io.NumPorts1 = 16; -+ p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; -+ p_dev->io.NumPorts2 = 0; - -- /* Interrupt setup */ -- link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; -+ /* Interrupt setup */ -+ p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; - - #if defined (PCMCIA_IRQ_INFO2) -- link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID; -- if (irq_list_count > 0) { -- for (i = 0; (i < irq_list_count) && (irq_list[i] > 0); i++) -- link->irq.IRQInfo2 |= 1 << irq_list[i]; -- } else { -- for (i = 0; (i < irq_list_count) && (default_irq_list[i] > 0); i++) -- link->irq.IRQInfo2 |= 1 << default_irq_list[i]; -- } -+ p_dev->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID; -+ if (irq_list_count > 0) { -+ for (i = 0; (i < irq_list_count) && (irq_list[i] > 0); i++) -+ p_dev->irq.IRQInfo2 |= 1 << irq_list[i]; -+ } else { -+ for (i = 0; (i < irq_list_count) && (default_irq_list[i] > 0); i++) -+ p_dev->irq.IRQInfo2 |= 1 << default_irq_list[i]; -+ } - #else -- link->irq.IRQInfo1 = IRQ_LEVEL_ID; -+ p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; - #endif - -- /* General socket configuration */ -- link->conf.Attributes = CONF_ENABLE_IRQ; -- link->conf.Vcc = 50; -- link->conf.IntType = INT_MEMORY_AND_IO; -- link->conf.ConfigIndex = 1; -- link->conf.Present = PRESENT_OPTION; -- -- /* Allocate space for private device-specific data */ -- local = kmalloc(sizeof(local_info_t), GFP_KERNEL); -- if (!local) -- goto err_kfree; -- memset(local, 0, sizeof(local_info_t)); -- link->priv = local; -- --#ifdef NEW_PCMCIA_DRV -- link->handle = p_dev; -- p_dev->instance = link; -- link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; -- cs_config(link); -- return 0; --#else -- /* Register with Card Services */ -- link->next = dev_list; -- dev_list = link; -- client_reg.dev_info = &dev_info; --#if 0 -- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE; -- client_reg.EventMask = -- CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | -- CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | -- CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; -- client_reg.event_handler = &cs_event; --#endif -- client_reg.Version = 0x0210; -- client_reg.event_callback_args.client_data = link; -- ret = pcmcia_register_client(&link->handle, &client_reg); -- if (ret != 0) { -- cs_error(link->handle, RegisterClient, ret); -- cs_detach(link); -- goto err; -- } -- return link; --#endif -- err_kfree: -- kfree(link); -- err: --#ifdef NEW_PCMCIA_DRV -- return -EINVAL; --#else -- return NULL; --#endif -+ /* General socket configuration */ -+ p_dev->conf.Attributes = CONF_ENABLE_IRQ; -+ p_dev->conf.IntType = INT_MEMORY_AND_IO; -+ p_dev->conf.ConfigIndex = 1; -+ p_dev->conf.Present = PRESENT_OPTION; -+ -+ /* Allocate space for private device-specific data */ -+ local = kmalloc(sizeof(local_info_t), GFP_KERNEL); -+ if (!local) -+ goto err_kfree; -+ memset(local, 0, sizeof(local_info_t)); -+ p_dev->priv = local; -+ return cs_config(p_dev); -+ -+err_kfree: -+ return -ENOMEM; - } /* cs_attach */ - - /*====================================================================== -@@ -286,47 +217,12 @@ - when the device is released. - - ======================================================================*/ --#ifdef NEW_PCMCIA_DRV --static void cs_detach(struct pcmcia_device *p_dev) --{ -- dev_link_t *link = dev_to_instance(p_dev); - -- if (link->state & DEV_CONFIG) -- cs_release(link); --#else --static void cs_detach(dev_link_t *link) -+static void cs_detach(struct pcmcia_device *link) - { -- dev_link_t **linkp; -- -- NOTE("Detaching device...\n"); -- -- /* Locate device structure */ -- for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next) -- if (*linkp == link) break; -- if (*linkp == NULL) -- return; -- -- /* -- If the device is currently configured and active, we won't -- actually delete it yet. Instead, it is marked so that when -- the release() function is called, that will trigger a proper -- detach(). -- */ -- if (link->state & DEV_CONFIG) { -- link->state |= DEV_STALE_LINK; -- return; -- } -- -- /* Break the link with Card Services */ -- if (link->handle) -- pcmcia_deregister_client(link->handle); -- -- /* Unlink device structure, free pieces */ -- *linkp = link->next; --#endif -- kfree(link->priv); -- kfree(link); --} /* cs_detach */ -+ cs_release(link); -+ kfree(link->priv); -+} - - /*====================================================================== - -@@ -336,14 +232,15 @@ - - ======================================================================*/ - --static int get_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse) -+static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple, -+ cisparse_t *parse) - { - int i = pcmcia_get_tuple_data(handle, tuple); - if (i != CS_SUCCESS) return i; - return pcmcia_parse_tuple(handle, tuple, parse); - } - --static int first_tuple(client_handle_t handle, tuple_t *tuple, -+static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, - cisparse_t *parse) - { - int i = pcmcia_get_first_tuple(handle, tuple); -@@ -351,7 +248,7 @@ - return get_tuple(handle, tuple, parse); - } - --static int next_tuple(client_handle_t handle, tuple_t *tuple, -+static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, - cisparse_t *parse) - { - int i = pcmcia_get_next_tuple(handle, tuple); -@@ -359,9 +256,8 @@ - return get_tuple(handle, tuple, parse); - } - --static void cs_config(dev_link_t *link) -+static int cs_config(struct pcmcia_device *link) - { -- client_handle_t handle; - tuple_t tuple; - cisparse_t parse; - cistpl_cftable_entry_t *cf = &parse.cftable_entry; -@@ -369,7 +265,6 @@ - int i; - u_char buf[64]; - char devname[128]; -- handle = link->handle; - dev = link->priv; - - /* -@@ -378,25 +273,21 @@ - */ - do { - tuple.DesiredTuple = CISTPL_CONFIG; -- i = pcmcia_get_first_tuple(handle, &tuple); -+ i = pcmcia_get_first_tuple(link, &tuple); - if (i != CS_SUCCESS) break; - tuple.TupleData = buf; - tuple.TupleDataMax = 64; - tuple.TupleOffset = 0; -- i = pcmcia_get_tuple_data(handle, &tuple); -+ i = pcmcia_get_tuple_data(link, &tuple); - if (i != CS_SUCCESS) break; -- i = pcmcia_parse_tuple(handle, &tuple, &parse); -+ i = pcmcia_parse_tuple(link, &tuple, &parse); - if (i != CS_SUCCESS) break; - link->conf.ConfigBase = parse.config.base; - } while (0); - if (i != CS_SUCCESS) { -- cs_error(link->handle, ParseTuple, i); -- link->state &= ~DEV_CONFIG_PENDING; -- return; -+ cs_error(link, ParseTuple, i); -+ return -ENODEV; - } -- -- /* Configure card */ -- link->state |= DEV_CONFIG; - - do { - -@@ -407,7 +298,7 @@ - tuple.DesiredTuple = CISTPL_VERS_1; - - devname[0] = 0; -- if( !first_tuple(handle, &tuple, &parse) && parse.version_1.ns > 1 ) { -+ if( !first_tuple(link, &tuple, &parse) && parse.version_1.ns > 1 ) { - strlcpy(devname,parse.version_1.str + parse.version_1.ofs[1], - sizeof(devname)); - } -@@ -418,7 +309,7 @@ - tuple.TupleOffset = 0; tuple.TupleDataMax = 255; - tuple.Attributes = 0; - tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; -- i = first_tuple(handle, &tuple, &parse); -+ i = first_tuple(link, &tuple, &parse); - while (i == CS_SUCCESS) { - if (cf->io.nwin > 0) { - link->conf.ConfigIndex = cf->index; -@@ -428,36 +319,36 @@ - NOTE("testing i/o %#x-%#x\n", - link->io.BasePort1, - link->io.BasePort1+link->io.NumPorts1-1); -- i = pcmcia_request_io(link->handle, &link->io); -+ i = pcmcia_request_io(link, &link->io); - if (i == CS_SUCCESS) goto found_port; - } -- i = next_tuple(handle, &tuple, &parse); -+ i = next_tuple(link, &tuple, &parse); - } - - found_port: - if (i != CS_SUCCESS) { -- cs_error(link->handle, RequestIO, i); -+ cs_error(link, RequestIO, i); - break; - } - - /* - * allocate an interrupt line - */ -- i = pcmcia_request_irq(link->handle, &link->irq); -+ i = pcmcia_request_irq(link, &link->irq); - if (i != CS_SUCCESS) { -- cs_error(link->handle, RequestIRQ, i); -- pcmcia_release_io(link->handle, &link->io); -+ cs_error(link, RequestIRQ, i); -+ /* undo */ -+ pcmcia_disable_device(link); - break; - } - - /* - * configure the PCMCIA socket - */ -- i = pcmcia_request_configuration(link->handle, &link->conf); -+ i = pcmcia_request_configuration(link, &link->conf); - if (i != CS_SUCCESS) { -- cs_error(link->handle, RequestConfiguration, i); -- pcmcia_release_io(link->handle, &link->io); -- pcmcia_release_irq(link->handle, &link->irq); -+ cs_error(link, RequestConfiguration, i); -+ pcmcia_disable_device(link); - break; - } - -@@ -469,14 +360,13 @@ - strcpy(dev->node.dev_name, "A1"); - dev->node.major = 64; - dev->node.minor = 0; -- link->dev = &dev->node; -- -- link->state &= ~DEV_CONFIG_PENDING; -+ -+ link->dev_node = &dev->node; - /* If any step failed, release any partially configured state */ - if (i != 0) { - ERROR("Failed to setup controller, releasing link...\n"); - cs_release(link); -- return; -+ return -ENODEV; - } - NOTE("Ready to call card driver for '%s'...\n", devname); - -@@ -488,7 +378,7 @@ - link->irq.AssignedIRQ - ); - cs_release(link); -- return; -+ return -ENODEV; - } - dev->node.minor = i; - -@@ -498,6 +388,7 @@ - link->io.BasePort1, - link->irq.AssignedIRQ - ); -+ return 0; - } /* cs_config */ - - /*====================================================================== -@@ -508,96 +399,13 @@ - - ======================================================================*/ - --static void cs_release(dev_link_t *link) -+static void cs_release(struct pcmcia_device *link) - { - fcpcmcia_delcard(link->io.BasePort1, link->irq.AssignedIRQ); - -- /* Unlink the device chain */ -- link->dev = NULL; -- -- /* Don't bother checking to see if these succeed or not */ -- pcmcia_release_configuration(link->handle); -- pcmcia_release_io(link->handle, &link->io); -- pcmcia_release_irq(link->handle, &link->irq); -- link->state &= ~DEV_CONFIG; -- --#ifndef NEW_PCMCIA_DRV -- if (link->state & DEV_STALE_LINK) -- cs_detach(link); --#endif -+ pcmcia_disable_device(link); - } /* cs_release */ - --#ifdef NEW_PCMCIA_DRV --static int cs_suspend(struct pcmcia_device *dev) --{ -- dev_link_t *link = dev_to_instance(dev); -- -- link->state |= DEV_SUSPEND; -- if (link->state & DEV_CONFIG) -- pcmcia_release_configuration(link->handle); -- -- return 0; --} -- --static int cs_resume(struct pcmcia_device *dev) --{ -- dev_link_t *link = dev_to_instance(dev); -- -- link->state &= ~DEV_SUSPEND; -- if (link->state & DEV_CONFIG) -- pcmcia_request_configuration(link->handle, &link->conf); -- -- return 0; --} --#else --/*====================================================================== -- -- The card status event handler. Mostly, this schedules other -- stuff to run after an event is received. A CARD_REMOVAL event -- also sets some flags to discourage the net drivers from trying -- to talk to the card any more. -- -- When a CARD_REMOVAL event is received, we immediately set a flag -- to block future accesses to this device. All the functions that -- actually access the device should check this flag to make sure -- the card is still present. -- --======================================================================*/ -- --static int cs_event(event_t event, int priority, event_callback_args_t *args) --{ -- dev_link_t *link = args->client_data; -- -- LOG("Card service event: %x\n", event); -- switch (event) { -- case CS_EVENT_CARD_REMOVAL: -- link->state &= ~DEV_PRESENT; -- if (link->state & DEV_CONFIG) -- cs_release(link); -- break; -- case CS_EVENT_CARD_INSERTION: -- link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; -- cs_config(link); -- break; -- case CS_EVENT_PM_SUSPEND: -- link->state |= DEV_SUSPEND; -- /* Fall through... */ -- case CS_EVENT_RESET_PHYSICAL: -- if (link->state & DEV_CONFIG) -- pcmcia_release_configuration(link->handle); -- break; -- case CS_EVENT_PM_RESUME: -- link->state &= ~DEV_SUSPEND; -- /* Fall through... */ -- case CS_EVENT_CARD_RESET: -- if (link->state & DEV_CONFIG) -- pcmcia_request_configuration(link->handle, &link->conf); -- break; -- } -- return 0; --} /* cs_event */ --#endif -- - static struct pcmcia_device_id fcpcmcia_ids[] = { - PCMCIA_DEVICE_PROD_ID12("AVM", "ISDN A", 0x95d42008, 0xadc9d4bb), - PCMCIA_DEVICE_PROD_ID12("ISDN", "CARD", 0x8d9761c8, 0x01c5aa7b), -@@ -610,17 +418,10 @@ - .drv = { - .name = "fcpcmcia_cs", - }, --#ifdef NEW_PCMCIA_DRV -- .probe = cs_attach, -- .remove = cs_detach, -- .suspend= cs_suspend, -- .resume = cs_resume, --#else -- .attach = cs_attach, -- .detach = cs_detach, -- .event = cs_event, --#endif -- .id_table = fcpcmcia_ids, -+ .probe = cs_probe, -+ .remove = cs_detach, -+ .id_table = fcpcmcia_ids, -+ - }; - - static int __init cs_init(void) -@@ -631,6 +432,7 @@ - static void __exit cs_exit(void) - { - pcmcia_unregister_driver(&cs_driver); -+ - } - - module_init(cs_init); -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c 2005-07-07 00:00:00.000000000 +0200 -+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c 2007-01-25 11:39:11.000000000 +0100 -@@ -22,7 +22,6 @@ - - #include <stdarg.h> - #include <asm/uaccess.h> --#include <linux/config.h> - #include <linux/version.h> - #include <linux/kernel.h> - #include <linux/module.h> -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/tools.h usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/tools.h ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/tools.h 2006-01-30 17:09:05.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/tools.h 2007-01-25 11:38:56.000000000 +0100 -@@ -69,16 +69,8 @@ - extern void lprintf (const char *, const char *, ...); - extern void vlprintf (const char *, const char *, va_list); - --/*---------------------------------------------------------------------------*\ --\*---------------------------------------------------------------------------*/ --#ifndef atomic_xchg --static inline unsigned long atomic_xchg ( -- volatile atomic_t * v, -- unsigned value --) { -- return __xchg (value, &v->counter, sizeof (unsigned)); --} /* atomic_xchg */ --#endif -+ -+ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - #ifndef NDEBUG diff --git a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.amd64.patch b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.amd64.patch deleted file mode 100644 index bec428318a0d..000000000000 --- a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.amd64.patch +++ /dev/null @@ -1,78 +0,0 @@ -irq_handler_t has changed type in 2.6.19 due to commit -7d12e780e003f93433d49ce78cfedf4b4c52adc5 by David Howells, -for details see git diff at http://tinyurl.com/2xpdy7 - -As the third argument was never used by the drivers, I simply wrapped every -occurrence of it in a condition for kernel version prior to 2.6.19. -2007-01-13 Martin von Gagern <Martin.vGagern@gmx.net> - -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c 2007-01-22 23:36:39.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c 2007-01-23 00:07:18.000000000 +0100 -@@ -107,7 +107,11 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - static void scheduler (unsigned long data); --static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs); -+static irqreturn_t irq_handler (int irq, void * args -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -+ , struct pt_regs * regs -+#endif -+ ); - - static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0); - -@@ -836,11 +840,17 @@ - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ --static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) { -+static irqreturn_t irq_handler (int irq, void * args -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -+ , struct pt_regs * regs -+#endif -+ ) { - int res = IRQ_NONE; - - UNUSED_ARG (irq); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) - UNUSED_ARG (regs); -+#endif - if (args != NULL) { - assert (capi_lib->cm_handle_events != NULL); - if (atomic_read (&scheduler_id) == smp_processor_id ()) { -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c 2007-01-22 23:36:39.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c 2007-01-23 00:07:18.000000000 +0100 -@@ -107,7 +107,11 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - static void scheduler (unsigned long data); --static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs); -+static irqreturn_t irq_handler (int irq, void * args -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -+ , struct pt_regs * regs -+#endif -+ ); - - static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0); - -@@ -836,11 +840,17 @@ - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ --static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) { -+static irqreturn_t irq_handler (int irq, void * args -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -+ , struct pt_regs * regs -+#endif -+ ) { - int res = IRQ_NONE; - - UNUSED_ARG (irq); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) - UNUSED_ARG (regs); -+#endif - if (args != NULL) { - assert (capi_lib->cm_handle_events != NULL); - if (atomic_read (&scheduler_id) == smp_processor_id ()) { diff --git a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.patch b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.patch deleted file mode 100644 index 0e203196909a..000000000000 --- a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.patch +++ /dev/null @@ -1,148 +0,0 @@ -irq_handler_t has changed type in 2.6.19 due to commit -7d12e780e003f93433d49ce78cfedf4b4c52adc5 by David Howells, -for details see git diff at http://tinyurl.com/2xpdy7 - -As the third argument was never used by the drivers, I simply wrapped every -occurrence of it in a condition for kernel version prior to 2.6.19. -2007-01-13 Martin von Gagern <Martin.vGagern@gmx.net> - -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c 2007-01-22 23:36:39.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c 2007-01-23 00:04:30.000000000 +0100 -@@ -107,7 +107,11 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - static void scheduler (unsigned long data); --static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs); -+static irqreturn_t irq_handler (int irq, void * args -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -+ , struct pt_regs * regs -+#endif -+ ); - - static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0); - -@@ -805,11 +809,17 @@ - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ --static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) { -+static irqreturn_t irq_handler (int irq, void * args -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -+ , struct pt_regs * regs -+#endif -+ ) { - int res = IRQ_NONE; - - UNUSED_ARG (irq); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) - UNUSED_ARG (regs); -+#endif - if (args != NULL) { - assert (capi_lib->cm_handle_events != NULL); - if (atomic_read (&scheduler_id) == smp_processor_id ()) { -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c 2007-01-22 23:36:39.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c 2007-01-23 00:07:18.000000000 +0100 -@@ -107,7 +107,11 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - static void scheduler (unsigned long data); --static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs); -+static irqreturn_t irq_handler (int irq, void * args -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -+ , struct pt_regs * regs -+#endif -+ ); - - static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0); - -@@ -836,11 +840,17 @@ - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ --static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) { -+static irqreturn_t irq_handler (int irq, void * args -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -+ , struct pt_regs * regs -+#endif -+ ) { - int res = IRQ_NONE; - - UNUSED_ARG (irq); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) - UNUSED_ARG (regs); -+#endif - if (args != NULL) { - assert (capi_lib->cm_handle_events != NULL); - if (atomic_read (&scheduler_id) == smp_processor_id ()) { -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c 2007-01-22 23:36:39.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c 2007-01-23 00:07:18.000000000 +0100 -@@ -107,7 +107,11 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - static void scheduler (unsigned long data); --static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs); -+static irqreturn_t irq_handler (int irq, void * args -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -+ , struct pt_regs * regs -+#endif -+ ); - - static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0); - -@@ -836,11 +840,17 @@ - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ --static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) { -+static irqreturn_t irq_handler (int irq, void * args -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -+ , struct pt_regs * regs -+#endif -+ ) { - int res = IRQ_NONE; - - UNUSED_ARG (irq); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) - UNUSED_ARG (regs); -+#endif - if (args != NULL) { - assert (capi_lib->cm_handle_events != NULL); - if (atomic_read (&scheduler_id) == smp_processor_id ()) { -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c 2007-01-22 23:36:39.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c 2007-01-23 00:04:52.000000000 +0100 -@@ -107,7 +107,11 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - static void scheduler (unsigned long data); --static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs); -+static irqreturn_t irq_handler (int irq, void * args -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -+ , struct pt_regs * regs -+#endif -+ ); - - static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0); - -@@ -805,11 +809,17 @@ - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ --static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) { -+static irqreturn_t irq_handler (int irq, void * args -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -+ , struct pt_regs * regs -+#endif -+ ) { - int res = IRQ_NONE; - - UNUSED_ARG (irq); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) - UNUSED_ARG (regs); -+#endif - if (args != NULL) { - assert (capi_lib->cm_handle_events != NULL); - if (atomic_read (&scheduler_id) == smp_processor_id ()) { diff --git a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.22-pci_module_init.patch b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.22-pci_module_init.patch deleted file mode 100644 index 6624e327ec9f..000000000000 --- a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.22-pci_module_init.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c 2007-08-25 09:54:42.000000000 +0200 -+++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c 2007-08-25 09:55:02.000000000 +0200 -@@ -364,7 +364,7 @@ - #endif - - #if defined (__fcpci__) -- if (0 == (err = pci_module_init (&fcpci_driver))) { -+ if (0 == (err = pci_register_driver (&fcpci_driver))) { - LOG("PCI driver registered.\n"); - register_capi_driver (&fritz_capi_driver); - LOG("CAPI driver registered.\n"); diff --git a/net-dialup/fritzcapi/files/fcusb2-2.6.19.patch b/net-dialup/fritzcapi/files/fcusb2-2.6.19.patch deleted file mode 100644 index 5ab67c105088..000000000000 --- a/net-dialup/fritzcapi/files/fcusb2-2.6.19.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- src/main.c.orig 2006-12-13 15:41:52.000000000 +0100 -+++ src/main.c 2006-12-13 15:43:02.000000000 +0100 -@@ -81,14 +81,7 @@ - } ; - - struct usb_driver usb_driver = { --#ifndef OLD_USB_DRIVER -- .driver = { --#endif -- .owner = THIS_MODULE, -- .name = TARGET, --#ifndef OLD_USB_DRIVER -- }, --#endif -+ .name = TARGET, - .id_table = usb_id_table, - .probe = usb_probe, - .disconnect = usb_disconnect, diff --git a/net-dialup/fritzcapi/files/fritzcapi-2.6.20.amd64.patch b/net-dialup/fritzcapi/files/fritzcapi-2.6.20.amd64.patch deleted file mode 100644 index 14508988b825..000000000000 --- a/net-dialup/fritzcapi/files/fritzcapi-2.6.20.amd64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN usr.orig/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c 2007-02-06 00:41:17.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c 2007-02-06 00:46:06.000000000 +0100 -@@ -789,7 +789,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker, capi_card); -+ INIT_WORK (&closing_work, closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ diff --git a/net-dialup/fritzcapi/files/fritzcapi-2.6.20.patch b/net-dialup/fritzcapi/files/fritzcapi-2.6.20.patch deleted file mode 100644 index 6531099d8cd7..000000000000 --- a/net-dialup/fritzcapi/files/fritzcapi-2.6.20.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -urN usr.orig/src/kernel-modules/fritzcapi/e2220pc/src/driver.c usr/src/kernel-modules/fritzcapi/e2220pc/src/driver.c ---- usr.orig/src/kernel-modules/fritzcapi/e2220pc/src/driver.c 2007-02-06 00:41:17.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/e2220pc/src/driver.c 2007-02-06 00:42:57.000000000 +0100 -@@ -756,7 +756,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker, capi_card); -+ INIT_WORK (&closing_work, closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -diff -urN usr.orig/src/kernel-modules/fritzcapi/e5520pc/src/driver.c usr/src/kernel-modules/fritzcapi/e5520pc/src/driver.c ---- usr.orig/src/kernel-modules/fritzcapi/e5520pc/src/driver.c 2007-02-06 00:41:17.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/e5520pc/src/driver.c 2007-02-06 00:43:12.000000000 +0100 -@@ -756,7 +756,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker, capi_card); -+ INIT_WORK (&closing_work, closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -diff -urN usr.orig/src/kernel-modules/fritzcapi/fritz.usb/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.usb/src/driver.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.usb/src/driver.c 2007-02-06 00:41:17.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.usb/src/driver.c 2007-02-06 00:43:33.000000000 +0100 -@@ -789,7 +789,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker, capi_card); -+ INIT_WORK (&closing_work, closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -diff -urN usr.orig/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c 2007-02-06 00:41:17.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c 2007-02-06 00:46:06.000000000 +0100 -@@ -789,7 +789,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker, capi_card); -+ INIT_WORK (&closing_work, closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -diff -urN usr.orig/src/kernel-modules/fritzcapi/fritz.xusb/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.xusb/src/driver.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.xusb/src/driver.c 2007-02-06 00:41:17.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.xusb/src/driver.c 2007-02-06 00:43:48.000000000 +0100 -@@ -789,7 +789,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker, capi_card); -+ INIT_WORK (&closing_work, closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -diff -urN usr.orig/src/kernel-modules/fritzcapi/fritz.xusb_CZ/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.xusb_CZ/src/driver.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.xusb_CZ/src/driver.c 2007-02-06 00:41:17.000000000 +0100 -+++ usr/src/kernel-modules/fritzcapi/fritz.xusb_CZ/src/driver.c 2007-02-06 00:45:52.000000000 +0100 -@@ -789,7 +789,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker, capi_card); -+ INIT_WORK (&closing_work, closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ diff --git a/net-dialup/fritzcapi/files/fritzcapi-2.6.22.patch b/net-dialup/fritzcapi/files/fritzcapi-2.6.22.patch deleted file mode 100644 index 7ef955ed3aba..000000000000 --- a/net-dialup/fritzcapi/files/fritzcapi-2.6.22.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/main.c usr/src/kernel-modules/fritzcapi/fritz.classic/src/main.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/main.c 2007-07-11 08:09:35.000000000 +0200 -+++ usr/src/kernel-modules/fritzcapi/fritz.classic/src/main.c 2007-07-11 08:18:31.000000000 +0200 -@@ -374,7 +374,7 @@ - } - - #if defined (__fcpci__) -- if (0 == (err = pci_module_init (&fcpci_driver))) { -+ if (0 == (err = pci_register_driver (&fcpci_driver))) { - LOG("PCI driver registered.\n"); - register_capi_driver (&fritz_capi_driver); - LOG("CAPI driver registered.\n"); -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c 2007-07-11 08:09:35.000000000 +0200 -+++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c 2007-07-11 08:18:31.000000000 +0200 -@@ -364,7 +364,7 @@ - #endif - - #if defined (__fcpci__) -- if (0 == (err = pci_module_init (&fcpci_driver))) { -+ if (0 == (err = pci_register_driver (&fcpci_driver))) { - LOG("PCI driver registered.\n"); - register_capi_driver (&fritz_capi_driver); - LOG("CAPI driver registered.\n"); -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c 2007-07-11 08:09:35.000000000 +0200 -+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c 2007-07-11 08:18:31.000000000 +0200 -@@ -363,7 +363,7 @@ - #endif - - #if defined (__fcpci__) -- if (0 == (err = pci_module_init (&fcpci_driver))) { -+ if (0 == (err = pci_register_driver (&fcpci_driver))) { - LOG("PCI driver registered.\n"); - register_capi_driver (&fritz_capi_driver); - LOG("CAPI driver registered.\n"); -diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pnp/src/main.c ---- usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/main.c 2007-07-11 08:09:35.000000000 +0200 -+++ usr/src/kernel-modules/fritzcapi/fritz.pnp/src/main.c 2007-07-11 08:18:31.000000000 +0200 -@@ -375,7 +375,7 @@ - } - - #if defined (__fcpci__) -- if (0 == (err = pci_module_init (&fcpci_driver))) { -+ if (0 == (err = pci_register_driver (&fcpci_driver))) { - LOG("PCI driver registered.\n"); - register_capi_driver (&fritz_capi_driver); - LOG("CAPI driver registered.\n"); diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild deleted file mode 100644 index 85831423322e..000000000000 --- a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.16 2007/08/29 18:45:40 genstef Exp $ - -inherit linux-mod rpm eutils - -DESCRIPTION="SuSE's 2.6 AVM kernel modules for fcclassic, fcpci, fcpcmcia, fcpnp, fcusb, fcusb2, fxusb_CZ, fxusb, e2220pc and e5520pc" -HOMEPAGE="http://www.avm.de/" - -SRC_URI="!amd64? ( ftp://ftp.suse.com/pub/suse/i386/10.1/SUSE-Linux10.1-Beta3-Extra/suse/i586/km_${P/2.6./2.6-}.i586.rpm ) - amd64? ( ftp://ftp.suse.com/pub/suse/i386/10.1/SUSE-Linux10.1-Beta3-Extra/suse/x86_64/km_${P/2.6./2.6-}.x86_64.rpm )" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="pcmcia usb" - -DEPEND="net-dialup/capi4k-utils" - -S="${WORKDIR}/usr/src/kernel-modules/fritzcapi" - -get_card_module_name() { - local CARD=$1 - echo "${FRITZCAPI_MODULES[CARD]}(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)" - if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ]; then - #PCMCIA have also a *_cs module - echo "${FRITZCAPI_MODULES[CARD]}_cs(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)" - fi -} - -pkg_setup() { - linux-mod_pkg_setup - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - if ! linux_chkconfig_present ISDN_CAPI_CAPI20; then - die "For using the driver you need a kernel with enabled CAPI support." - fi - - local USERCARD CARD - FRITZCAPI_BUILD_CARDS="" - FRITZCAPI_BUILD_TARGETS="" - MODULE_NAMES="" - BUILD_PARAMS="KDIR='${KV_DIR}' LIBDIR='${WORKDIR}'/var/lib/fritz" - BUILD_TARGETS="all" - - if ! use amd64; then - FRITZCAPI_MODULES=("fcpci" "fcpcmcia" "fcusb" "fcusb2" "fxusb" "fcclassic" - "fcpnp" "fxusb_CZ" "e2220pc" "e5520pc") - FRITZCAPI_TARGETS=("fritz.pci" "fritz.pcmcia" "fritz.usb" "fritz.usb2" - "fritz.xusb" "fritz.classic" "fritz.pnp" "fritz.xusb_CZ" "e2220pc" "e5520pc") - else - FRITZCAPI_MODULES=("fcpci" "fcpcmcia" "fcusb2") - FRITZCAPI_TARGETS=("fritz.pci" "fritz.pcmcia" "fritz.usb2") - fi - - if [ -n "${FRITZCAPI_CARDS}" ]; then - #Check existence of user selected cards - for USERCARD in ${FRITZCAPI_CARDS} ; do - for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do - if [ "${USERCARD}" = "${FRITZCAPI_MODULES[CARD]}" ]; then - FRITZCAPI_BUILD_CARDS="${FRITZCAPI_BUILD_CARDS} ${FRITZCAPI_MODULES[CARD]}" - FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}" - MODULE_NAMES="${MODULE_NAMES} `get_card_module_name ${CARD}`" - continue 2 - fi - done - die "Module ${USERCARD} not present in ${P}" - done - else - elog - elog "You can control the modules which are built with the variable" - elog "FRITZCAPI_CARDS which should contain a blank separated list" - elog "of a selection from the following cards:" - elog " ${FRITZCAPI_MODULES[*]}" - elog - ewarn "I give you the chance of hitting Ctrl-C and make the necessary" - ewarn "adjustments in /etc/make.conf." - ebeep - - #Filter build targets by USE - for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do - if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ] && (! use pcmcia || kernel_is ge 2 6 17); then - continue - fi - if [ "${FRITZCAPI_MODULES[CARD]/usb/}" != ${FRITZCAPI_MODULES[CARD]} ] && ! use usb; then - continue - fi - FRITZCAPI_BUILD_CARDS="${FRITZCAPI_BUILD_CARDS} ${FRITZCAPI_MODULES[CARD]}" - FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}" - MODULE_NAMES="${MODULE_NAMES} `get_card_module_name ${CARD}`" - done - fi - - elog "Selected cards: ${FRITZCAPI_BUILD_CARDS}" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - - cd "${S}" - mkdir -p "${WORKDIR}/var/lib/fritz" - ln fritz.*/lib/*-lib.o "${WORKDIR}/var/lib/fritz" - for i in $(find . -name Makefile); do - sed -i 's:-C \$(KDIR) SUBDIRS=:-C $(KDIR) $(if $(KBUILD_OUTPUT),O=$(KBUILD_OUTPUT)) SUBDIRS=:' ${i} - sed -i 's:$(PWD)/../lib/$(CARD)-lib.o:$(LIBDIR)/$(CARD)-lib.o:' ${i} - sed -i "s:@cp -f ../lib/\$(CARD)-lib.o \$(LIBDIR)::" ${i} - sed -i "s:\$(PWD)/../lib/driver-lib.o:${S}/e2220pc/lib/driver-lib.o:" ${i} - convert_to_m ${i} - done - if [ -e fritz.usb2 ]; then - cd fritz.usb2; epatch ${FILESDIR}/fcusb2-2.6.19.patch; cd .. - fi - if ! use amd64; then - epatch ${FILESDIR}/2.6.43-linux-2.6.19-irq_handler.patch - kernel_is ge 2 6 17 && epatch ${FILESDIR}/2.6.43-fcpcmcia.patch - kernel_is ge 2 6 20 && epatch ${FILESDIR}/fritzcapi-2.6.20.patch - kernel_is ge 2 6 22 && epatch ${FILESDIR}/fritzcapi-2.6.22.patch - else - epatch ${FILESDIR}/2.6.43-linux-2.6.19-irq_handler.amd64.patch - kernel_is ge 2 6 17 && epatch ${FILESDIR}/2.6.43-fcpcmcia.amd64.patch - kernel_is ge 2 6 20 && epatch ${FILESDIR}/fritzcapi-2.6.20.amd64.patch - kernel_is ge 2 6 22 && epatch ${FILESDIR}/2.6.43-linux-2.6.22-pci_module_init.patch - fi - find -name \*.[hc] -print0 | xargs -0 sed -i ' - s:#include <linux/config\.h>:#include <linux/autoconf.h>:; - s/driver_init/fc_driver_init/g; s/driver_exit/fc_driver_exit/;' -} - -src_install() { - linux-mod_src_install - - keepdir /lib/firmware - - [ "${FRITZCAPI_BUILD_TARGETS/xusb_CZ/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && \ - dodoc "${S}/fritz.xusb_CZ/README.fxusb_CZ" - - [ "${FRITZCAPI_BUILD_TARGETS/usb2/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && ( - insinto /lib/firmware - insopts -m0644 - doins "${S}"/fritz.usb2/*.frm - ) -} - -pkg_postinst() { - linux-mod_pkg_postinst - - elog "If your device needs a firmware, you should edit copy the firmware files" - elog "in /lib/firmware and edit /etc/capi.conf." - elog - [ "${FRITZCAPI_BUILD_TARGETS/usb2/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && ( - elog "Note: This ebuild has already installed firmware files necessary for following modules:" - elog " fcusb2" - ) -} diff --git a/net-dialup/fritzcapi/metadata.xml b/net-dialup/fritzcapi/metadata.xml deleted file mode 100644 index b5b1a576e9ab..000000000000 --- a/net-dialup/fritzcapi/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>net-dialup</herd> -<longdescription>SuSE's 2.6 AVM kernel modules for fcclassic, fcpci, fcpcmcia, fcpnp, fcusb, fcusb2, fxusb_CZ, fxusb, e2220pc and e5520pc</longdescription> -</pkgmetadata> diff --git a/net-dialup/fxusb/ChangeLog b/net-dialup/fxusb/ChangeLog deleted file mode 100644 index fcb9f87a9da0..000000000000 --- a/net-dialup/fxusb/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for net-dialup/fxusb -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fxusb/ChangeLog,v 1.2 2008/01/30 14:34:02 sbriesen Exp $ - -*fxusb-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +files/fxusb_kernel-2.6.24.diff, +fxusb-0.1-r1.ebuild: - fixing string.h problem (see bug #202385) + patches for kernel 2.6.24 - (thanks to Arnd Feldmueller <arnd.feldmueller@web.de>). - -*fxusb-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +fxusb-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/fxusb/Manifest b/net-dialup/fxusb/Manifest deleted file mode 100644 index b7373b79a3d0..000000000000 --- a/net-dialup/fxusb/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX fxusb_kernel-2.6.24.diff 1638 RMD160 f619edc4c8e536028b2079fe242abd44db8c0ff0 SHA1 1791fcf74d4e45b3635df995ee1835391664f028 SHA256 eba19ece50eb49346cace22da40c65137744c08e4db8c1d5b067cf5b0a6fb226 -DIST fxusb-0.1-0.src.rpm 868249 RMD160 c82f20e1e3663df2e942223080a933afb8f11323 SHA1 85e41c03650399e0784bd473d70ca7d0f6878124 SHA256 4fd1c48c7414665a97349819675da4551e6d5e70f4ae6749fbba0cc7cc431be6 -EBUILD fxusb-0.1-r1.ebuild 1380 RMD160 d3aa3113eaa7a5987cab748898b624e7482bd274 SHA1 8d4225c2b2464f54d59a3b42d2ade92e6029022d SHA256 5de73035b91377196eb4f30f2bf8e193e9e56f2d1cfc2a62b17c158cba3d7155 -EBUILD fxusb-0.1.ebuild 1131 RMD160 bf255341040c53440f31a5bf521cce7c00b1e6a5 SHA1 68bfb0623019ca78ebe6298d2a43493149cbf7fa SHA256 cddfd10153051aa51579cb9a3aea654ab8414fbbdc5982a39eb38a7a574cb3df -MISC ChangeLog 662 RMD160 c57eb28fdc375ff2bbcafe938745f5add657e53a SHA1 e066e7e21293f09be430853161976e482ecbbced SHA256 5c8279ee0c9f42dfd8faae9dc6a3812ce8b7a2624ee347d183087b2ee387b288 -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fxusb/files/fxusb_kernel-2.6.24.diff b/net-dialup/fxusb/files/fxusb_kernel-2.6.24.diff deleted file mode 100644 index b4444f2fb670..000000000000 --- a/net-dialup/fxusb/files/fxusb_kernel-2.6.24.diff +++ /dev/null @@ -1,46 +0,0 @@ ---- src/driver.c.orig 2008-01-30 15:23:46.000000000 +0100 -+++ src/driver.c 2008-01-30 15:23:47.000000000 +0100 -@@ -92,8 +92,12 @@ - static DECLARE_WAIT_QUEUE_HEAD(capi_wait); - static DECLARE_WAIT_QUEUE_HEAD(tx_wait); - static DECLARE_WAIT_QUEUE_HEAD(rx_wait); -+static DECLARE_COMPLETION(hotplug); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(notify); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(hotplug); - static DECLARE_MUTEX_LOCKED(notify); -+#endif - - #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } - #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } -@@ -787,7 +791,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker); -+ INIT_WORK (&closing_work, (work_func_t)closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -@@ -1211,7 +1215,10 @@ - } - } - LOG("Scheduler thread stopped.\n"); -+ complete(&hotplug); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - up (&hotplug); -+ #endif - return 0; - } /* scheduler */ - -@@ -1246,7 +1253,10 @@ - SCHED_WAKEUP; - } - LOG("Scheduler thread signalled, waiting...\n"); -+ wait_for_completion(&hotplug); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - down (&hotplug); -+ #endif - LOG("Scheduler thread[%d] terminated.\n", thread_pid); - } - thread_pid = -1; diff --git a/net-dialup/fxusb/fxusb-0.1-r1.ebuild b/net-dialup/fxusb/fxusb-0.1-r1.ebuild deleted file mode 100644 index 206d0e7ea1cd..000000000000 --- a/net-dialup/fxusb/fxusb-0.1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fxusb/fxusb-0.1-r1.ebuild,v 1.1 2008/01/30 14:34:02 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!X USB" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec | uniq) - epatch "${FILESDIR}/${PN}_kernel-2.6.24.diff" - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} - -src_install() { - linux-mod_src_install - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fxusb/fxusb-0.1.ebuild b/net-dialup/fxusb/fxusb-0.1.ebuild deleted file mode 100644 index 4d0da26d744f..000000000000 --- a/net-dialup/fxusb/fxusb-0.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fxusb/fxusb-0.1.ebuild,v 1.1 2008/01/06 02:07:08 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!X USB" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-[0-9].[0-9]*-[0-9]*.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec | uniq) - convert_to_m "src/Makefile" -} - -src_install() { - linux-mod_src_install - dodoc CAPI*.txt - dohtml *.html -} diff --git a/net-dialup/fxusb/metadata.xml b/net-dialup/fxusb/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/fxusb/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> diff --git a/net-dialup/fxusb_CZ/ChangeLog b/net-dialup/fxusb_CZ/ChangeLog deleted file mode 100644 index 2d29c4ee2d49..000000000000 --- a/net-dialup/fxusb_CZ/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for net-dialup/fxusb_CZ -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fxusb_CZ/ChangeLog,v 1.2 2008/01/30 14:35:36 sbriesen Exp $ - -*fxusb_CZ-0.1-r1 (30 Jan 2008) - - 30 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> - +files/fxusb_CZ_kernel-2.6.24.diff, +fxusb_CZ-0.1-r1.ebuild: - fixing string.h problem (see bug #202385) + patches for kernel 2.6.24 - (thanks to Arnd Feldmueller <arnd.feldmueller@web.de>). - -*fxusb_CZ-0.1 (06 Jan 2008) - - 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml, - +fxusb_CZ-0.1.ebuild: - using special openSUSE repository for AVM drivers from now on. - diff --git a/net-dialup/fxusb_CZ/Manifest b/net-dialup/fxusb_CZ/Manifest deleted file mode 100644 index 3558b6a22683..000000000000 --- a/net-dialup/fxusb_CZ/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX fxusb_CZ_kernel-2.6.24.diff 1638 RMD160 ba5efdc3eb8afb89236465a7b46f88d5161e2300 SHA1 1c99a82317e5fd79e03c188fdb2ee9d9706cf505 SHA256 71932431c0f39f489283cc9d451f64a10d257516e9b47649a3bced50382b5af4 -DIST fxusb_CZ-0.1-0.src.rpm 869683 RMD160 065bf490eebe169c0ed9098152471b19dc021876 SHA1 da1bf284a83a7428efd0106e945f88e785539e19 SHA256 10414b666c3f7b59a3ecb405d10428f3be3ca698dbaccfe31711c3a744983fb3 -EBUILD fxusb_CZ-0.1-r1.ebuild 1370 RMD160 8121dc08972a26ff09187bd207489e4aba65182b SHA1 2c5031958a5d938e92ec39a9ef52c1b41897e0c6 SHA256 09f1b4d9b8d93db3f533eeab26a50aa6fcbb8cfadf14d13679f76a558f43686d -EBUILD fxusb_CZ-0.1.ebuild 1121 RMD160 5812a8b991ca36e1c1e01b8f44f54510a0f3de2b SHA1 5ed53557073aa4346146078e8e921c6e98ea19c9 SHA256 db89078ff156d41d120075936c86c74d2aee11959961ce65f2eef68ca0f6cc02 -MISC ChangeLog 683 RMD160 0057ffa5986bd66c93d70e5012100c54efa89c08 SHA1 3223e495fcd320c875aab054c500f0fe799676e9 SHA256 5577a2d37eb90644ee45b0b31d62c2327705324629ce2eae62fab980fc7c50b8 -MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fxusb_CZ/files/fxusb_CZ_kernel-2.6.24.diff b/net-dialup/fxusb_CZ/files/fxusb_CZ_kernel-2.6.24.diff deleted file mode 100644 index ad5e5156306e..000000000000 --- a/net-dialup/fxusb_CZ/files/fxusb_CZ_kernel-2.6.24.diff +++ /dev/null @@ -1,46 +0,0 @@ ---- src/driver.c.orig 2008-01-30 15:27:54.000000000 +0100 -+++ src/driver.c 2008-01-30 15:27:54.000000000 +0100 -@@ -92,8 +92,12 @@ - static DECLARE_WAIT_QUEUE_HEAD(capi_wait); - static DECLARE_WAIT_QUEUE_HEAD(tx_wait); - static DECLARE_WAIT_QUEUE_HEAD(rx_wait); -+static DECLARE_COMPLETION(hotplug); /* New DECLARE, <arnd.feldmueller@web.de> */ -+static DECLARE_COMPLETION(notify); /* New DECLARE, <arnd.feldmueller@web.de> */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - static DECLARE_MUTEX_LOCKED(hotplug); - static DECLARE_MUTEX_LOCKED(notify); -+#endif - - #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } - #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } -@@ -787,7 +791,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker); -+ INIT_WORK (&closing_work, (work_func_t)closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -@@ -1211,7 +1215,10 @@ - } - } - LOG("Scheduler thread stopped.\n"); -+ complete(&hotplug); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - up (&hotplug); -+ #endif - return 0; - } /* scheduler */ - -@@ -1246,7 +1253,10 @@ - SCHED_WAKEUP; - } - LOG("Scheduler thread signalled, waiting...\n"); -+ wait_for_completion(&hotplug); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - down (&hotplug); -+ #endif - LOG("Scheduler thread[%d] terminated.\n", thread_pid); - } - thread_pid = -1; diff --git a/net-dialup/fxusb_CZ/fxusb_CZ-0.1-r1.ebuild b/net-dialup/fxusb_CZ/fxusb_CZ-0.1-r1.ebuild deleted file mode 100644 index 736efde43763..000000000000 --- a/net-dialup/fxusb_CZ/fxusb_CZ-0.1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fxusb_CZ/fxusb_CZ-0.1-r1.ebuild,v 1.1 2008/01/30 14:35:36 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!X USB (Teledat Version)" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack fxusb.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - epatch "${FILESDIR}/${PN}_kernel-2.6.24.diff" - convert_to_m src/Makefile - - for i in lib/*-lib.o; do - einfo "Localize symbols in ${i##*/} ..." - objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \ - -L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}" - done -} - -src_install() { - linux-mod_src_install - dodoc CAPI*.txt README* - dohtml *.html -} diff --git a/net-dialup/fxusb_CZ/fxusb_CZ-0.1.ebuild b/net-dialup/fxusb_CZ/fxusb_CZ-0.1.ebuild deleted file mode 100644 index d5bbd6877e20..000000000000 --- a/net-dialup/fxusb_CZ/fxusb_CZ-0.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fxusb_CZ/fxusb_CZ-0.1.ebuild,v 1.1 2008/01/06 02:09:08 sbriesen Exp $ - -inherit eutils rpm linux-mod - -DESCRIPTION="AVM kernel 2.6 modules for Fritz!X USB (Teledat Version)" -HOMEPAGE="http://opensuse.foehr-it.de/" -SRC_URI="http://opensuse.foehr-it.de/rpms/10_3/src/${P}-0.src.rpm" - -LICENSE="AVM-FC" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="!net-dialup/fritzcapi" -RDEPEND="${DEPEND} net-dialup/capi4k-utils" - -S="${WORKDIR}/fritz" - -pkg_setup() { - linux-mod_pkg_setup - - if ! kernel_is 2 6; then - die "This package works only with 2.6 kernel!" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src" - MODULE_NAMES="${PN}(net:${S}/src)" -} - -src_unpack() { - rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - DISTDIR="${WORKDIR}" unpack fxusb.tar.gz - - cd "${S}" - epatch $(sed -n "s|^Patch[01234]:\s*\(.*\)|../\1|p" ../${PN}.spec) - convert_to_m "src/Makefile" -} - -src_install() { - linux-mod_src_install - dodoc CAPI*.txt README* - dohtml *.html -} diff --git a/net-dialup/fxusb_CZ/metadata.xml b/net-dialup/fxusb_CZ/metadata.xml deleted file mode 100644 index 5c648b8ae7af..000000000000 --- a/net-dialup/fxusb_CZ/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> - <maintainer> - <email>sbriesen@gentoo.org</email> - <name>Stefan Briesenick</name> - </maintainer> -</pkgmetadata> |