Add upstream patch for supporting kernels newer than 2.6.17 (#177553).

Package-Manager: portage-2.1.2.2

5 files changed, 161 insertions, 8 deletions

diff --git a/net-dialup/globespan-adsl/ChangeLog b/net-dialup/globespan-adsl/ChangeLog
index 321520f8a4c3..482037e700ab 100644
--- a/net-dialup/globespan-adsl/ChangeLog
+++ b/net-dialup/globespan-adsl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/globespan-adsl
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/globespan-adsl/ChangeLog,v 1.20 2007/05/02 07:54:52 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/globespan-adsl/ChangeLog,v 1.21 2007/05/19 04:53:29 mrness Exp $
+
+*globespan-adsl-0.11-r1 (19 May 2007)
+
+  19 May 2007; Alin Năstac <mrness@gentoo.org>
+  +files/globespan-adsl-0.11-synch.patch, +globespan-adsl-0.11-r1.ebuild:
+  Add upstream patch for supporting kernels newer than 2.6.17 (#177553).
 
   02 May 2007; Marius Mauch <genone@gentoo.org> globespan-adsl-0.10.ebuild,
   globespan-adsl-0.11.ebuild:
diff --git a/net-dialup/globespan-adsl/Manifest b/net-dialup/globespan-adsl/Manifest
index f7351610a7ed..cb02779e4895 100644
--- a/net-dialup/globespan-adsl/Manifest
+++ b/net-dialup/globespan-adsl/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX globespan-adsl-0.11-synch.patch 2283 RMD160 a0960fe0cb235e74ec342b7d85d3b189fe709554 SHA1 845a2ba3228b7f779690bce165830e3569ad33ad SHA256 77667877afed9bcabe5d45ea460eb7e92d6df92cb77f49799f8817fd4fb3e003
+MD5 fa173268feb2b10d00fcc230d70430a9 files/globespan-adsl-0.11-synch.patch 2283
+RMD160 a0960fe0cb235e74ec342b7d85d3b189fe709554 files/globespan-adsl-0.11-synch.patch 2283
+SHA256 77667877afed9bcabe5d45ea460eb7e92d6df92cb77f49799f8817fd4fb3e003 files/globespan-adsl-0.11-synch.patch 2283
 DIST eciadsl-usermode-0.10.tar.gz 204143 RMD160 de3dcba0d5581418ae4758732876aaac43402a70 SHA1 bad21794caeb0b79a497ea9b18ccf6b29da78e66 SHA256 c108ceab6ffc6a2dff796782a20f8699c80703fcb24bbd38cf3f36ad9ea0107b
 DIST eciadsl-usermode-0.11.tar.gz 323391 RMD160 698730d008857317cc475ef87a9023296b064319 SHA1 6fe75c99a8e9c478de9d68a30d29f1e8709b8b56 SHA256 2382f315fda4241a0043bac1dfc669f006d8e93e87fa382b263b1672972f4077
 EBUILD globespan-adsl-0.10.ebuild 1663 RMD160 51e3201b58f7176fca53a8913c8a3b6f20b4dfce SHA1 a07afa402c6be44a34ca21fc0449cdbe24bf400d SHA256 fd9dce3359179d8096a1895c91141803b8271f1c7f6d44d38384c5734434da41
 MD5 348bde7c011fe0fbe9b8f452ada034be globespan-adsl-0.10.ebuild 1663
 RMD160 51e3201b58f7176fca53a8913c8a3b6f20b4dfce globespan-adsl-0.10.ebuild 1663
 SHA256 fd9dce3359179d8096a1895c91141803b8271f1c7f6d44d38384c5734434da41 globespan-adsl-0.10.ebuild 1663
+EBUILD globespan-adsl-0.11-r1.ebuild 1335 RMD160 ed8c76dabba0cd1d7ca292b1d9142e0a1e871214 SHA1 5ec22fc4c7a3f97a430373eba79d13d59d57395b SHA256 d68ba75f633417bb8d3d4b9ef88ba1d00631e009d1b318c112c7e5afcb3be9ea
+MD5 b101e76904d2163d583f0c0835e6c95e globespan-adsl-0.11-r1.ebuild 1335
+RMD160 ed8c76dabba0cd1d7ca292b1d9142e0a1e871214 globespan-adsl-0.11-r1.ebuild 1335
+SHA256 d68ba75f633417bb8d3d4b9ef88ba1d00631e009d1b318c112c7e5afcb3be9ea globespan-adsl-0.11-r1.ebuild 1335
 EBUILD globespan-adsl-0.11.ebuild 1234 RMD160 bc108587ffd3105a86e99b89a930c1f7a7e79757 SHA1 23ada47f4c0c0829abf9b78411c7f5d610a69a74 SHA256 8fa4d65a4d66add0b720c17dfad7468737deb79dde8d603c031229efe709e295
 MD5 97eb3ad63f10f8ca1b739eadecb03a48 globespan-adsl-0.11.ebuild 1234
 RMD160 bc108587ffd3105a86e99b89a930c1f7a7e79757 globespan-adsl-0.11.ebuild 1234
 SHA256 8fa4d65a4d66add0b720c17dfad7468737deb79dde8d603c031229efe709e295 globespan-adsl-0.11.ebuild 1234
-MISC ChangeLog 2622 RMD160 71c2dccef07a8ffe79d0bcf98d6f9bd72dc90e09 SHA1 451c4fce7ed5c04dfa4ab542a18b3ef619b70ae1 SHA256 4f068f6d1dbca7eaeb1435e07e63ead03a4fb1a6cb944f41162c70695a9b2217
-MD5 30fb857873ccac140b7ac621ba353526 ChangeLog 2622
-RMD160 71c2dccef07a8ffe79d0bcf98d6f9bd72dc90e09 ChangeLog 2622
-SHA256 4f068f6d1dbca7eaeb1435e07e63ead03a4fb1a6cb944f41162c70695a9b2217 ChangeLog 2622
+MISC ChangeLog 2857 RMD160 7c43a5396419a93d1f7d6b8b4fd7dc3d26905573 SHA1 fccf592204a6d7617e2bea17a86de74330899a42 SHA256 9a3c4fb48a7f15cbcc0d8c36343ca0ea6be797aef633c3599c0208aa6c4472f1
+MD5 c4104c92d00d2c67cf2afcaa31933722 ChangeLog 2857
+RMD160 7c43a5396419a93d1f7d6b8b4fd7dc3d26905573 ChangeLog 2857
+SHA256 9a3c4fb48a7f15cbcc0d8c36343ca0ea6be797aef633c3599c0208aa6c4472f1 ChangeLog 2857
 MISC metadata.xml 383 RMD160 45a62717b2e42044b4bb72dc9f687368f603c465 SHA1 1885896e1fb7dfac30b69f47e0b1ca6c8f20f75b SHA256 db0a931d1786eaab3d10178b10dc1107bb4b88b83bd076b774c7f0bbdd7b4da9
 MD5 70ce62627e1d0046ec3ca4082ad0ef16 metadata.xml 383
 RMD160 45a62717b2e42044b4bb72dc9f687368f603c465 metadata.xml 383
@@ -25,10 +33,13 @@ SHA256 d46dfab540d8a57f8265ed1e183a32f0e0046f591577d30bc4eae5198c898480 files/di
 MD5 b1e1cc360b3041e406554438d0dff6f0 files/digest-globespan-adsl-0.11 265
 RMD160 d3ec8cf3ee19bd88bf0c416e9f116bf43a375fbf files/digest-globespan-adsl-0.11 265
 SHA256 ed2c800db1af42f0fc1edcd7acc9b45c680d13a4c0aa80f49682d8169cff0929 files/digest-globespan-adsl-0.11 265
+MD5 b1e1cc360b3041e406554438d0dff6f0 files/digest-globespan-adsl-0.11-r1 265
+RMD160 d3ec8cf3ee19bd88bf0c416e9f116bf43a375fbf files/digest-globespan-adsl-0.11-r1 265
+SHA256 ed2c800db1af42f0fc1edcd7acc9b45c680d13a4c0aa80f49682d8169cff0929 files/digest-globespan-adsl-0.11-r1 265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGOEM+6J2i8a8J4okRAtwbAKCGm0FWCZzsH7mV9kNvswsJCeZqlwCg0A6S
-NyILisUfH7BQib7LpSUE0xE=
-=sxTF
+iD8DBQFGToLUJnxX6mF440QRAgkPAJ9YILojKdnqapzzGcXfB6MIbeXA/wCg0Auf
+uaY+Q96ehnDJ/qNLy79ItZk=
+=3L5u
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/globespan-adsl/files/digest-globespan-adsl-0.11-r1 b/net-dialup/globespan-adsl/files/digest-globespan-adsl-0.11-r1
new file mode 100644
index 000000000000..7cc12ee99fd4
--- /dev/null
+++ b/net-dialup/globespan-adsl/files/digest-globespan-adsl-0.11-r1
@@ -0,0 +1,3 @@
+MD5 c3c60c83f6df30021e11da50a699dec9 eciadsl-usermode-0.11.tar.gz 323391
+RMD160 698730d008857317cc475ef87a9023296b064319 eciadsl-usermode-0.11.tar.gz 323391
+SHA256 2382f315fda4241a0043bac1dfc669f006d8e93e87fa382b263b1672972f4077 eciadsl-usermode-0.11.tar.gz 323391
diff --git a/net-dialup/globespan-adsl/files/globespan-adsl-0.11-synch.patch b/net-dialup/globespan-adsl/files/globespan-adsl-0.11-synch.patch
new file mode 100644
index 000000000000..344ec3ddbd28
--- /dev/null
+++ b/net-dialup/globespan-adsl/files/globespan-adsl-0.11-synch.patch
@@ -0,0 +1,85 @@
+diff --git a/eciadsl-synch.c b/eciadsl-synch.c
+index 27c1f34..31c51dc 100644
+--- a/eciadsl-synch.c
++++ b/eciadsl-synch.c
+@@ -322,7 +322,7 @@ void read_endpoint(pusb_endpoint_t ep_int, int epnum){
+ 		  device. So we revert to the old behaviour : NO TIMEOUTS ...
+ 		*/
+ 
+-		ret = pusb_endpoint_read(ep_int, lbuf, sizeof(lbuf), 0);
++		ret = pusb_endpoint_read_int(ep_int, lbuf, sizeof(lbuf));
+ 		
+ 		if (ret < 0)
+ 		{
+diff --git a/pusb-linux.c b/pusb-linux.c
+index 79b7545..b5bf1dd 100644
+--- a/pusb-linux.c
++++ b/pusb-linux.c
+@@ -340,6 +340,54 @@ int pusb_endpoint_rw_no_timeout(int fd, int ep,
+ 	return(purb->actual_length);
+ }
+ 
++int pusb_endpoint_read_int_no_timeout(int fd, int ep,
++		       unsigned char* buf, int size)
++{
++	struct usbdevfs_urb urb, *purb = &urb;
++	int ret;
++
++	memset(purb, 0, sizeof(urb));
++
++	purb->type = USBDEVFS_URB_TYPE_INTERRUPT;
++	purb->endpoint = ep;
++	purb->flags  = 0;
++	purb->buffer = buf;
++	purb->buffer_length = size;
++	purb->signr = 0;
++
++	do
++	{
++		ret = ioctl(fd, USBDEVFS_SUBMITURB, purb);
++	}
++	while (ret < 0 && errno == EINTR);
++
++	if (ret < 0)
++		return(ret);
++
++	do
++	{
++		ret = ioctl(fd, USBDEVFS_REAPURB, &purb);
++	}
++	while (ret < 0 && errno == EINTR);
++
++	if (ret < 0)
++		return(ret);
++
++	if (purb != &urb)
++		printf("purb=%p, &urb=%p\n", (void*)purb, (void*)&urb);
++
++	if (purb->buffer != buf)
++		printf("purb->buffer=%p, buf=%p\n", (void*)purb->buffer, (void*)buf);
++
++	return(purb->actual_length);
++}
++
++int pusb_endpoint_read_int(pusb_endpoint_t ep, 
++			unsigned char* buf, int size)
++{
++	return(pusb_endpoint_read_int_no_timeout(ep->fd, ep->ep|USB_DIR_IN, buf, size));
++}
++
+ int pusb_endpoint_rw(int fd, int ep, unsigned char* buf, int size, int timeout)
+ {
+ 	struct usbdevfs_bulktransfer bulk;
+diff --git a/pusb.h b/pusb.h
+index 921543b..112e41f 100644
+--- a/pusb.h
++++ b/pusb.h
+@@ -30,6 +30,8 @@ int pusb_release_interface(pusb_device_t dev,int interface);
+ pusb_endpoint_t pusb_endpoint_open(pusb_device_t dev, int epnum, int flags);
+ int pusb_endpoint_read(pusb_endpoint_t ep, 
+ 		       unsigned char *buf, int size, int timeout);
++int pusb_endpoint_read_int(pusb_endpoint_t ep, 
++		       unsigned char *buf, int size);
+ int pusb_endpoint_write(pusb_endpoint_t ep, 
+ 			const unsigned char *buf, int size, int timeout);
+ 
diff --git a/net-dialup/globespan-adsl/globespan-adsl-0.11-r1.ebuild b/net-dialup/globespan-adsl/globespan-adsl-0.11-r1.ebuild
new file mode 100644
index 000000000000..20159cdc09a4
--- /dev/null
+++ b/net-dialup/globespan-adsl/globespan-adsl-0.11-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/globespan-adsl/globespan-adsl-0.11-r1.ebuild,v 1.1 2007/05/19 04:53:29 mrness Exp $
+
+inherit eutils
+
+MY_PN="eciadsl-usermode-${PV}"
+
+DESCRIPTION="Driver for various ADSL modems. Also known as EciAdsl."
+SRC_URI="http://eciadsl.flashtux.org/download/${MY_PN}.tar.gz"
+HOMEPAGE="http://eciadsl.flashtux.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tk"
+
+DEPEND="net-dialup/ppp"
+RDEPEND="${DEPEND}
+	tk? ( >=dev-lang/tk-8.3.4 )"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-synch.patch
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README* TROUBLESHOOTING* ChangeLog || die "failed to install documentation"
+}
+
+pkg_postinst() {
+	elog
+	elog "Package succesfully installed you should now run "
+	elog "eciconf.sh (graphical, requires TCL/TK) or eciconftxt.sh"
+	elog
+	elog "Paquetage installé avec succés vous devriez maintenant"
+	elog "executer eciconf.sh (qui requiert TCL/TK) ou eciconftxt.sh"
+	elog
+	ewarn "Please note that if you're using a 2.6.x kernel you'll"
+	ewarn "probably need to apply a patch to fix a USB bug. See"
+	ewarn "http://eciadsl.flashtux.org/download/beta/"
+	ewarn
+}