diff options
| author | Bertrand Jacquin <beber@meleeweb.net> | 2009-05-14 23:34:15 +0200 |
|---|---|---|
| committer | Bertrand Jacquin <beber@meleeweb.net> | 2009-05-14 23:34:15 +0200 |
| commit | 7a1d7c8fae444925244fb1a598f98bdb49828219 (patch) | |
| tree | d386cea9b6e80d3f76628a8f61f200cb8afa3cd9 | |
| parent | nfs-utils: fix 1.1.4 uclibc build + rpcgen (diff) | |
| download | portage-7a1d7c8fae444925244fb1a598f98bdb49828219.tar.xz | |
nfs-utils: nfs-utils-1.1.2-rpcgen-ioctl.patch was wrong, so
nfs-utils-1.1.4-BJA-rpcgen-ifelse.diff no more needed
http://bugs.gentoo.org/show_bug.cgi?id=144215
| -rw-r--r-- | net-fs/nfs-utils/Manifest | 3 | ||||
| -rw-r--r-- | net-fs/nfs-utils/files/nfs-utils-1.1.2-rpcgen-ioctl.patch | 14 | ||||
| -rw-r--r-- | net-fs/nfs-utils/files/nfs-utils-1.1.4-BJA-rpcgen-ifelse.diff | 12 | ||||
| -rw-r--r-- | net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild | 2 |
4 files changed, 1 insertions, 30 deletions
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index fa63fb5e..f2114dab 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -1,5 +1,4 @@ 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-BJA-rpcgen-ifelse.diff 442 RMD160 f156c20e7de8bf5751f4399d000a9816fba7e2fa SHA1 6e1ab322cc7b7d71c49b5a5aee2a8a02966c859f SHA256 60fd07afa5ff932eebd05abfa42bce65f467b185f2e49db0b8c970d614324218 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 @@ -14,4 +13,4 @@ AUX rpc.pipefs.initd 788 RMD160 9ed8a4511e7ce05c67bc3a4c3c9d81ef0cfb6e45 SHA1 c1 AUX rpc.statd.initd 818 RMD160 d87fc8aed1638955444b587fc5404db671d5a8fb SHA1 bd73058b722d2f51a67bbbdec8ed029094fb9683 SHA256 0c7bd35a14da6c0c2577f09ae82a41ddb693a88157eeaf80684616f79be6c304 AUX rpc.svcgssd.initd 584 RMD160 9488050225453f6b083be78ed3de1b042d02cfb8 SHA1 3dc09a20ca1cefd902b8709b094a4e0c0e9a407c SHA256 f1c460d8b0e91e54a551397d755135d05a3728d81de596535bf8bda074455677 DIST nfs-utils-1.1.4.tar.bz2 588368 RMD160 72d6f9cbadfc30feca9c5fcb8ff8e73145d20e89 SHA1 560a063c681239b022f05e2c815402425ede01a6 SHA256 27704e3637b5e0ae141b56d5395272b685c4ca844ea0a20c777626bbfc52a94f -EBUILD nfs-utils-1.1.4-r1.ebuild 3382 RMD160 472e3ab943125e37147680bcba890e7d6e6870f8 SHA1 8d117120073e6aa3dda93fb41a07375efe3627ea SHA256 8fc2d2460817e7b0f75ee3a481b38ce06ba3218eda0b667b164f7b2abdeb85a9 +EBUILD nfs-utils-1.1.4-r1.ebuild 3384 RMD160 372e9293bbea3d161421346833bf2df081ff565c SHA1 c337060effe115364dc98b48c2adb9c6af73ba82 SHA256 829650e2016f0b0171a6e12dc2e38fb783b5af9601e8993d8870fff6d82f0f82 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.2-rpcgen-ioctl.patch deleted file mode 100644 index 21153457..00000000 --- a/net-fs/nfs-utils/files/nfs-utils-1.1.2-rpcgen-ioctl.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/174393 - ---- tools/rpcgen/rpc_main.c -+++ tools/rpcgen/rpc_main.c -@@ -548,6 +548,9 @@ - #ifndef linux - if( !tirpcflag && inetdflag ) - f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n"); -+#else -+ if( !tirpcflag ) -+ f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n"); - #endif - if( Cflag && (inetdflag || pmflag ) ) { - f_print(fout, "#ifdef __cplusplus\n"); diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.4-BJA-rpcgen-ifelse.diff b/net-fs/nfs-utils/files/nfs-utils-1.1.4-BJA-rpcgen-ifelse.diff deleted file mode 100644 index 2f0b8669..00000000 --- a/net-fs/nfs-utils/files/nfs-utils-1.1.4-BJA-rpcgen-ifelse.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/rpcgen/rpc_main.c.ori 2009-05-14 22:55:21.000000000 +0200 -+++ tools/rpcgen/rpc_main.c 2009-05-14 22:55:52.000000000 +0200 -@@ -550,9 +550,6 @@ - f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n"); - #else - if( !tirpcflag ) -- f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n"); --#else -- if( !tirpcflag ) - 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 d014ff4f..07705772 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 @@ -36,13 +36,11 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${PN}-1.1.2-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 epatch "${FILESDIR}"/${P}-uClibc.diff - epatch "${FILESDIR}"/${P}-BJA-rpcgen-ifelse.diff } src_compile() { |