add fix for kernels >= 2.6.14 (#111396)

Package-Manager: portage-2.0.51.22-r3

5 files changed, 121 insertions, 5 deletions

diff --git a/net-dialup/eagle-usb/ChangeLog b/net-dialup/eagle-usb/ChangeLog
index 8203290fdfd0..1aff11c67a48 100644
--- a/net-dialup/eagle-usb/ChangeLog
+++ b/net-dialup/eagle-usb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/eagle-usb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/ChangeLog,v 1.4 2005/05/03 09:24:56 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/ChangeLog,v 1.5 2005/11/04 05:36:52 mrness Exp $
+
+*eagle-usb-2.3.1-r1 (04 Nov 2005)
+
+  04 Nov 2005; Alin Nastac <mrness@gentoo.org>
+  +files/eagle-usb-2.3.1-kernel-2.6.14.patch, +eagle-usb-2.3.1-r1.ebuild:
+  Add patch for fixing compilation issues on kernels >= 2.6.14 (#111396).
 
 *eagle-usb-2.3.1 (03 May 2005)
 
diff --git a/net-dialup/eagle-usb/Manifest b/net-dialup/eagle-usb/Manifest
index 4ae18623e1de..580664a5bfe5 100644
--- a/net-dialup/eagle-usb/Manifest
+++ b/net-dialup/eagle-usb/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA1
 
 MD5 8bd5affbf916cafa3ee089c1ce8cc54b eagle-usb-2.3.1.ebuild 2372
+MD5 3f943ad547d252ddae938f5e972ab9fb eagle-usb-2.3.1-r1.ebuild 2459
 MD5 ab58f19ab2eb89eda0b06230e27395a2 eagle-usb-2.1.1.ebuild 2376
-MD5 983b5b2d116a5952e4f6aa8ba4a0f416 ChangeLog 810
+MD5 a9076e8b4d38e52554e4a3485a7ca073 ChangeLog 1041
 MD5 784ec6993aa07588926fec5a7fbf2c70 metadata.xml 246
 MD5 9bcb1e4277b2ca63a52b873a3c8b632d files/confd 805
 MD5 e6bb5c4e3d40da64218b22962001d51e files/initd 9194
+MD5 3e4640108bd9d4f20b535eb371e7a38b files/eagle-usb-2.3.1-kernel-2.6.14.patch 1025
 MD5 4062d2a6eb8bbb26c70db6813102e56c files/digest-eagle-usb-2.1.1 68
 MD5 638f7cece06abaad09f9e13f5d2164f8 files/digest-eagle-usb-2.3.1 68
 MD5 a26da8905bd09e0c8d5628c0afd96a8b files/dsl.peer 185
+MD5 638f7cece06abaad09f9e13f5d2164f8 files/digest-eagle-usb-2.3.1-r1 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCd0N+jiC39V7gKu0RAk/SAJ9F3TScHtb20NLihTmxsmdk58EN2gCfXIv/
-J9VHToCL+L9qzDsYC0WL8Ac=
-=PKYX
+iD8DBQFDavOCNSP4Vda7IdsRAg6xAJ9Nd9QsG97cAJfykCC3i0YuKSIAqACeLX8e
+joR1pk0SQ87bfTqz8kOJqQ0=
+=qd9V
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/eagle-usb/eagle-usb-2.3.1-r1.ebuild b/net-dialup/eagle-usb/eagle-usb-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..0e5973ddb82c
--- /dev/null
+++ b/net-dialup/eagle-usb/eagle-usb-2.3.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/eagle-usb-2.3.1-r1.ebuild,v 1.1 2005/11/04 05:36:52 mrness Exp $
+
+inherit linux-mod eutils
+
+DESCRIPTION="GPL Driver for Eagle Chipset powered ADSL modem"
+SRC_URI="http://baud123.free.fr/eagle-usb/${PN}-${PV%.*}/${P}.tar.bz2"
+HOMEPAGE="http://www.eagle-usb.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="net-dialup/ppp"
+
+MODULE_NAMES="${PN}(net:${S}/driver)"
+CONFIG_CHECK="!IPV6 USB"
+BUILD_TARGETS=" "
+BUILD_PARAMS="KERNELSRC=${KV_DIR}"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-kernel-2.6.14.patch
+}
+
+src_compile() {
+	./autogen.sh || die "autogen.sh failed"
+	CONFIG_FILES=Makefile.common econf --with-kernel-src=${KV_DIR} || die "econf failed"
+	for i in pppoa utils/scripts utils/eagleconnect; do
+		emake -C ${i} || die "emake ${i} failed"
+	done
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	for i in driver/firmware driver/user pppoa utils/scripts utils/eagleconnect; do
+		make DESTDIR=${D} -C ${i} install || die "make ${i} install failed"
+	done
+
+	doman doc/man/*
+	dodoc README ChangeLog
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/initd ${PN}
+	insinto /etc/conf.d ; newins ${FILESDIR}/confd ${PN}
+	insopts -m 600 ; insinto /etc/ppp/peers ; doins ${FILESDIR}/dsl.peer
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	ewarn "Please set METHOD in /etc/conf.d/${PN} to the needed value:"
+	ewarn "dhcpip:"
+	einfo "          Make sure you have dhcpcd emerged."
+	ewarn "staticip:"
+	einfo "          Set your static IP in /etc/conf.d/eagle-adsl"
+	ewarn "dhcpip && staticip: You can use the following to set up the eagle conf-files:"
+	echo 'sed -i -e "s/Encapsulation *= *[0-9]\+/Encapsulation=00000004/" /etc/eagle-usb/eagle-usb.conf'
+	echo 'sed -i -e "s/VCI *= *[0-9]\+/VCI=00000024/" /etc/eagle-usb/eagle-usb.conf'
+	ewarn "pppoa:"
+	einfo "          Make sure you have kernel support for HDCL and PPP"
+	einfo "          Edit /etc/ppp/peers/dsl.peer to insert your username as"
+	einfo "          well as /etc/ppp/chap-secrets and /etc/ppp/pap-secrets"
+	einfo
+	einfo "          dsl.peer contains the \"usepeerdns\" option so, you"
+	einfo "          should consider making a symlink named /etc/resolv.conf"
+	einfo "          and pointing to /etc/ppp/resolv.conf:"
+	echo "rm /etc/resolv.conf"
+	echo "ln -s /etc/ppp/resolv.conf /etc/resolv.conf"
+}
diff --git a/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.1-r1 b/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.1-r1
new file mode 100644
index 000000000000..764c6eaad613
--- /dev/null
+++ b/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.1-r1
@@ -0,0 +1 @@
+MD5 6c6b15a8eeff1f51d7bc875c2d3809b6 eagle-usb-2.3.1.tar.bz2 928311
diff --git a/net-dialup/eagle-usb/files/eagle-usb-2.3.1-kernel-2.6.14.patch b/net-dialup/eagle-usb/files/eagle-usb-2.3.1-kernel-2.6.14.patch
new file mode 100644
index 000000000000..5b2c469e1ea0
--- /dev/null
+++ b/net-dialup/eagle-usb/files/eagle-usb-2.3.1-kernel-2.6.14.patch
@@ -0,0 +1,31 @@
+--- eagle-usb-2.3.1/driver/Pipes.c.orig	2005-01-17 21:54:42.000000000 +0100
++++ eagle-usb-2.3.1/driver/Pipes.c	2005-11-03 21:29:53.000000000 +0100
+@@ -919,7 +919,9 @@
+              *  -EINVAL.
+             */
+             urb->status = 0;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+             urb->transfer_flags &= ~URB_ASYNC_UNLINK;
++#endif
+ 	}
+ 	else
+ 	{
+--- eagle-usb-2.3.1/driver/eu_eth.c.orig	2005-01-17 21:54:42.000000000 +0100
++++ eagle-usb-2.3.1/driver/eu_eth.c	2005-11-03 21:33:19.000000000 +0100
+@@ -495,11 +495,16 @@
+      * netif_wakequeue:
+     */
+     
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+     ins->urb_write->transfer_flags |= URB_ASYNC_UNLINK;
+     usb_unlink_urb(ins->urb_write);
+ 
+     ins->urb_oam_write->transfer_flags |= URB_ASYNC_UNLINK;
+     usb_unlink_urb(ins->urb_oam_write);
++#else
++    USB_KILL_URB(ins->urb_write);
++    USB_KILL_URB(ins->urb_oam_write);
++#endif
+     
+     /* We must reset the transaction time to keep the watchdog quiet: */
+     dev->trans_start = jiffies;