Update rpcgen ioctl patch to reflect changes in upstream.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

7 files changed, 28 insertions, 23 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 9b79c0b62dfc..96ceca4b9493 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.159 2009/06/02 19:03:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.160 2009/08/25 02:43:17 vapier Exp $
+
+  25 Aug 2009; Mike Frysinger <vapier@gentoo.org>
+  -files/nfs-utils-1.1.2-rpcgen-ioctl.patch, nfs-utils-1.1.4-r1.ebuild,
+  +files/nfs-utils-1.1.4-rpcgen-ioctl.patch, nfs-utils-1.1.5.ebuild,
+  nfs-utils-1.1.6.ebuild, nfs-utils-1.1.6-r1.ebuild:
+  Update rpcgen ioctl patch to reflect changes in upstream.
 
 *nfs-utils-1.2.0 (02 Jun 2009)
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 3d675f5d5339..170d2b3cb8a6 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -2,10 +2,10 @@
 Hash: SHA1
 
 AUX exports 66 RMD160 0a61ad40dc321be39fb54d5b9fe717caa714e878 SHA1 52ed6b74643e084cfc17ff4638c2e06c86602034 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5
-AUX nfs-utils-1.1.2-rpcgen-ioctl.patch 398 RMD160 1ff3225a3d4f3dd3e21a9d34f9839e266ee3a8fa SHA1 2f8da1c38ae4f93c600e0710d002d94f036fa09c SHA256 b769bfe5f47f1556ded750ba3cf4c0ab210d1296ce3f575b69b18b7173f4f298
 AUX nfs-utils-1.1.4-ascii-man.patch 571 RMD160 614759d4a361db8ab6ee8c8ee87fc8a93a5e6052 SHA1 745322de9b26acec667d7acf8764f12388e3a046 SHA256 5f1cd9789b4963df22df914f61a33412d61d3c8fdde9b71b8c9dd4c2506852f7
 AUX nfs-utils-1.1.4-mtab-sym.patch 1020 RMD160 72c6ebb9d02ec544b5b2d7ad3ad0c8035d248eb1 SHA1 50db1976ac25607faf8f003573f9d8529e5b4de6 SHA256 0232799d085151649a1eb1f31644105de7e5cfba888794354005499a0db277c3
 AUX nfs-utils-1.1.4-no-exec.patch 297 RMD160 59e6f4bf2c782c0c107cd135589c4abcba1a5978 SHA1 aa7239b22cf73abb1790bb9a88407cea8fd56779 SHA256 f66af9d046a3524ae8920f8e4b5d0fa206de31d4e7747bfc716a10ac86537b0f
+AUX nfs-utils-1.1.4-rpcgen-ioctl.patch 414 RMD160 f07264e24f374d6a65dbc8c2b1dfed3755099ddc SHA1 c7df5e9b309b389a1b0d85e539771af43d3e8d98 SHA256 78ae8ba33a600e6eb1153521eeb0ec5c3c5c503bd20074b1687703b3f83be678
 AUX nfs.confd 777 RMD160 8c830ee0c1a57e4b2fe35419976b9063080492de SHA1 22e6bf3d6e350b71bed4b827796a36fb964d1455 SHA256 ca1f72dca9934f7bbdd281dde8b1e91c0efad5abf3935dba54cd6ec07e7af315
 AUX nfs.initd 4188 RMD160 37edc15c8ed779a772c1f88c264d3630f61d3eed SHA1 374d2400aa9b24d1397ddb6a95ddb377bc0548cf SHA256 b485797f4ec6f7b89f5c88a2166f069c5030f3ba8ba078180097eb23666f8bfd
 AUX nfsmount.initd 1084 RMD160 7da20dd19d9d6fe8734691eb3219e6bd011737eb SHA1 521a3e95158c76800c396fbe54ef558e01520177 SHA256 f2f5b54fef59f24a1fc6a8b814dfe2cfdeeb02fd0d5041cff31650e626fe4b75
@@ -18,17 +18,17 @@ DIST nfs-utils-1.1.4.tar.bz2 588368 RMD160 72d6f9cbadfc30feca9c5fcb8ff8e73145d20
 DIST nfs-utils-1.1.5.tar.bz2 605790 RMD160 9e50867b29184ebe6b6c4fb8fe35b026630d5d73 SHA1 b9d2bfe9045157af78d498ed2292eff976a78127 SHA256 9a5da7cd85dc9087222ab348ce82577c38547177d5d4dc7fccc9e939c97d47dc
 DIST nfs-utils-1.1.6.tar.bz2 598584 RMD160 bb3535325d4a98a7d3b83eb59c3dc9061a4c1457 SHA1 63c0ed078f231a65e3e29a21da094ad2326a0294 SHA256 9c7b4ba94cad4751604c31b9e428b0233b944fcb8ba89eebbd50e78cff73a5d5
 DIST nfs-utils-1.2.0.tar.bz2 609908 RMD160 0a20d86c218a54dd00cadc7a5eca788fb30680e7 SHA1 44edfc809e383bd72d481f1823d138877ff039aa SHA256 cb39468b3acd0bf3870cde4bbb06fe01a88e7cf0c81cff87fa7794cab871a1d1
-EBUILD nfs-utils-1.1.4-r1.ebuild 3156 RMD160 330c1fe7c37bef31fe1c6b9a22318f52bbf345c2 SHA1 5991452fb4cec1a3e7916ea83b417a78c188dcae SHA256 7887a1a2cab72d7831aa8833ef174f08abe2946cb38ca8b7999c3ffe672caa96
-EBUILD nfs-utils-1.1.5.ebuild 3087 RMD160 5467abd9880234bb3910477824bc37c9c192ad86 SHA1 89bbab2a638de77faa61fd858db8212a8b4bc1cc SHA256 e1d88e780252335b92b07887f79064399dbc306ae2bea29fc7e981293c89abdf
-EBUILD nfs-utils-1.1.6-r1.ebuild 3201 RMD160 3aefdfb52668a59ddf4f60a318e9fd1b5ebd4e5b SHA1 c75abd47908fe4c594dabaeb8fe1b2fc4f1bf005 SHA256 8d659904a988ab152d4e22f10d5cf9177ba18b3ff94f6c37277e310635c4f7b8
-EBUILD nfs-utils-1.1.6.ebuild 3087 RMD160 de1cd2012bb0ed960bd9f750026ecf68130ce36b SHA1 44c2f8eb0996b4cafae86310c62c86ef32cb0605 SHA256 e6c4be88d00595818a2a1c3b03e3b8d696cb64c0be267e4e7de584f9ee854599
+EBUILD nfs-utils-1.1.4-r1.ebuild 3155 RMD160 fcdf8feb4bae735c2de197ef9f948cd581e7089f SHA1 cb2afc5b6c17012f904a7dd32c652da53c268a5a SHA256 e9c98edbc79acac767546f13395fe39ddace9395b78804ec7bfc525f48e3d72d
+EBUILD nfs-utils-1.1.5.ebuild 3087 RMD160 c9b2d889aa009de9bd89e149622b32c5342a40ac SHA1 4bbe1ddc0958f31859dfa1892c1f997979549441 SHA256 6dc10d862ad83acf890e05b4fcb59cc563c6b96ce63d37e6e79eaa830d046e20
+EBUILD nfs-utils-1.1.6-r1.ebuild 3201 RMD160 027dca80256777c5972d7eb868639850d71aacdf SHA1 32c7fd588f826bfe0a7e35c1666eb07baa633e7d SHA256 bd7db2fcc15c4db8c46a5864690cbf0326a5c895c15a189a82f7681297ad7c88
+EBUILD nfs-utils-1.1.6.ebuild 3087 RMD160 bd4f1f823763af51d854fc8b66822bed022060ec SHA1 0d351d28c4e3b867a48a84458ca60d11428160c6 SHA256 a0339756c42dff2f5dea6847b6668b8f5791facccb9ffaf204ea1a860779a8cd
 EBUILD nfs-utils-1.2.0.ebuild 3145 RMD160 549e7244f3a9f784a0dd20f59863043f2c505a37 SHA1 2db6b92796894171db517a63153932617713f682 SHA256 a88a28fe6a572b93dbae258ce154a962b8ba5eaa23226a2c3eabc2d4ce4476d1
-MISC ChangeLog 24843 RMD160 ca104f815ca4e1fe25922ba846a26d27b38b95df SHA1 a502da08c4b4d1f0a4e15ffcb31412da2b7156bb SHA256 5dee425a05f46aaf8caabc2f4aa3086c3d3071c0ed8a541c186f74df9fab9b1d
+MISC ChangeLog 25148 RMD160 348c92123807fe4257fa7b00e214fd9221ce136a SHA1 6b31fd92926ca1bf5eec43ab002c493ddfb55053 SHA256 0578a8c6763fdbc48483f732b65bbf259d362c2203f0487cf7e6915332cd61f9
 MISC metadata.xml 402 RMD160 10e39caa098663bde1b609727598aefc319eb5c2 SHA1 9180287973e77c950e172f055e19e5f94f446621 SHA256 cf9b23e458d8e57e6b3ec4639d2c486032b3313952da2c92166bc5f40409e3f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkold4gACgkQn/5bYzqsSmE8iACfXDLygcBrCjJeUSa6zynKwIhT
-UzQAoKMP4lUuuyz0DALboFEqL0sTrzej
-=Pb5U
+iEYEARECAAYFAkqTT8wACgkQlPl3HsVfCDooKwCfY//qQcLTS2Gk14XhjsjMrQnn
+zPYAmwZckNIvuy/WxJaPDisGlFJeGN+X
+=RHop
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.2-rpcgen-ioctl.patch b/net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch
index 2115345755ed..176541845ed9 100644
--- a/net-fs/nfs-utils/files/nfs-utils-1.1.2-rpcgen-ioctl.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch
@@ -2,12 +2,11 @@ http://bugs.gentoo.org/174393
 
 --- tools/rpcgen/rpc_main.c
 +++ tools/rpcgen/rpc_main.c
-@@ -548,6 +548,9 @@
- #ifndef linux
- 	if( !tirpcflag && inetdflag )
+@@ -548,7 +548,7 @@
  	  f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
-+#else
-+	if( !tirpcflag )
+ #else
+ 	if( !tirpcflag )
+-	  f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
 +	  f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n");
  #endif
  	if( Cflag && (inetdflag || pmflag ) ) {
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild
index 9fbc7a8f08d8..d6de0c9759d7 100644
--- a/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild,v 1.8 2009/03/25 18:46:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild,v 1.9 2009/08/25 02:43:17 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.1.2-rpcgen-ioctl.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-rpcgen-ioctl.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild
index 306ddebb7eb8..14fba74d53ca 100644
--- a/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild,v 1.2 2009/03/06 09:32:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild,v 1.3 2009/08/25 02:43:17 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.1.2-rpcgen-ioctl.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-rpcgen-ioctl.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild
index 1b27837ea30a..470918ae9644 100644
--- a/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild,v 1.2 2009/05/30 22:01:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild,v 1.3 2009/08/25 02:43:17 vapier Exp $
 
 EAPI="1"
 
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.1.2-rpcgen-ioctl.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-rpcgen-ioctl.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild
index eb99605c5b53..f8974464d49e 100644
--- a/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild,v 1.1 2009/05/09 18:28:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild,v 1.2 2009/08/25 02:43:17 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.1.2-rpcgen-ioctl.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-rpcgen-ioctl.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch