Disable useless rpc services #371395 by Diego Elio Pettenò.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

4 files changed, 44 insertions, 13 deletions

diff --git a/sys-apps/netkit-base/ChangeLog b/sys-apps/netkit-base/ChangeLog
index 480892c5bb46..e2ebd3df45f3 100644
--- a/sys-apps/netkit-base/ChangeLog
+++ b/sys-apps/netkit-base/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/netkit-base
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/ChangeLog,v 1.31 2011/04/16 19:13:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/ChangeLog,v 1.32 2011/06/17 06:04:24 vapier Exp $
+
+  17 Jun 2011; Mike Frysinger <vapier@gentoo.org> netkit-base-0.17-r9.ebuild,
+  +files/005_all_netkit-base-0.17-no-rpc.patch:
+  Disable useless rpc services #371395 by Diego Elio Pettenò.
 
   16 Apr 2011; Ulrich Mueller <ulm@gentoo.org> netkit-base-0.17-r8.ebuild,
   netkit-base-0.17-r9.ebuild:
diff --git a/sys-apps/netkit-base/Manifest b/sys-apps/netkit-base/Manifest
index d2f68d9ecfa4..f1da733f8d5c 100644
--- a/sys-apps/netkit-base/Manifest
+++ b/sys-apps/netkit-base/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 003_all_netkit-base-0.17-gcc4.patch 321 RMD160 27cdb5719874f908a0ad3ef134d711b129ea914b SHA1 b058d3bef814a82787ac1f564bcf7c88c68f67e4 SHA256 8ab9c712ce08fc62591303e54348d9cacd36a6cd5a25b7c002edbdaa16cbba78
 AUX 004_all_netkit-base-0.17-misc-fixes.patch 1601 RMD160 427d6fa945c6bb05c67f8658cfdd536d84c34ca9 SHA1 0231c27ce23a913736fa48ea7e8777a2808d88db SHA256 a820d7daef5b03a821f94f14a2a0998465db579a6abfbad17eece55a1753b1ef
+AUX 005_all_netkit-base-0.17-no-rpc.patch 522 RMD160 15e1b8a36d024889616bff15bb7d7f7de63ef54d SHA1 4e4c9fa3981e39f8f2d9ed713d30b8eb7b4d0025 SHA256 fe76d64667a8ef0633cb4eb2d0cd8eede4732bc84ac79cd2eabf4635d940f9fe
 AUX inetd.rc6 580 RMD160 f1a1907f4780466a3db077d0e7d83d9f5522a4a3 SHA1 c8bd8d7877edc47b426b977ce96bcc04f9079a92 SHA256 beac566412f27c60c315f7c2fbc24fda117be7673c9b0eb8e692441dca79f336
 DIST netkit-base-0.17.tar.gz 56473 RMD160 4b4a3c5b1bcb1be736adf4474a85f2282996f37c SHA1 d1f610efa3320ecac75c2f13df8a45c84fc7d448 SHA256 16dd81625ebfc8f5dcb0dfd2e6bac223aad325a9405d66a556fe349446b3c332
 EBUILD netkit-base-0.17-r8.ebuild 1212 RMD160 1756603f003c3c7b591784eaf22cac7ce4e65799 SHA1 8749474121bc94a595658c008b9fcb25263e025b SHA256 de6ff8f31b35ff3d3c94e41084ff1b17c4373609723ef2c5873f9a7778bf2acd
-EBUILD netkit-base-0.17-r9.ebuild 1236 RMD160 2dde4563c0a439a4cda0659fd413e12c981635bf SHA1 ee403edfe0607429aaa7b3f1e572a20ac1d12bb0 SHA256 464a88f328c7cf6cf9356629811e54d475627464bb2cd621407f4680b4114b94
-MISC ChangeLog 5423 RMD160 36c5a5d8e83f4ef661a2004d4b09606c83955875 SHA1 6376a49f992f1a21563b2d432d91985d383f73eb SHA256 f7fcef47e94061a370db911b67c0aa4f4457798a2a2a15652f8561407b7ad24b
+EBUILD netkit-base-0.17-r9.ebuild 1131 RMD160 2c438d9131fd8ac8d4f43c816e3a65619852cf07 SHA1 664a1b93a0b4a79d7291a5d52f7a6ce26758e5d9 SHA256 f5e20314899c877a45d059a242495730c2b8af769326e7e787cc5a6b22818a8e
+MISC ChangeLog 5616 RMD160 84f9d4690f8f3ec019ef069a93c7f753cfaba5e2 SHA1 377aab06f51ae37d1200847e86e96a57e7a4ff6a SHA256 98642e7e7f94e46c087ecc6fd2e650e5ce2c54f6b14698c47e4474a714b9b95c
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2p6sYACgkQOeoy/oIi7uw1MgCgsX6Ne+xi1BFjQI4/DMdofWNz
-Q2MAoNzxwWCpG3x11/bogg9076AcemBM
-=Pse7
+iF4EAREIAAYFAk367n8ACgkQaC/OocHi7JZ9CwD7BhyN0NUi+rXdivCy45fVVbgY
+afbKCZg+ORwkhh+lMRUA/3h5Zrq25DGUFDZ5+x9vXVGYOIlXH+UdzyexPlWwJH9Q
+=kjB4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/netkit-base/files/005_all_netkit-base-0.17-no-rpc.patch b/sys-apps/netkit-base/files/005_all_netkit-base-0.17-no-rpc.patch
new file mode 100644
index 000000000000..3981b50e76e1
--- /dev/null
+++ b/sys-apps/netkit-base/files/005_all_netkit-base-0.17-no-rpc.patch
@@ -0,0 +1,26 @@
+the rpc logic here isn't terribly useful, so just punt it
+
+http://bugs.gentoo.org/371395
+
+--- a/inetd/inetd.c
++++ b/inetd/inetd.c
+@@ -158,8 +158,8 @@
+ #include <rpc/rpc.h>
+ #include <rpc/pmap_clnt.h>
+ #undef __wait
+-#endif
+ #include <rpc/pmap_clnt.h>
++#endif
+ 
+ #ifndef MIN
+ #define MIN(a, b)	((a) < (b) ? (a) : (b))
+--- a/inetd/inetd.h
++++ b/inetd/inetd.h
+@@ -4,7 +4,6 @@
+ 
+ #define	RETRYTIME	(60*10)		/* retry time after bind/server fail */
+ 
+-#define RPC                             /* Use SunRPC */
+ 
+ 
+ /* globals */
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
index d56165f6d9ef..d8f58e18d66e 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild,v 1.2 2011/04/16 19:13:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild,v 1.3 2011/06/17 06:04:24 vapier Exp $
 
 EAPI=2
 
@@ -23,10 +23,10 @@ PATCHES=( "${FILESDIR}" )
 
 src_configure() {
 	./configure || die
-	sed -e "s:^CFLAGS=.*:CFLAGS=${CFLAGS} -Wall -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline:" \
-		MCONFIG > MCONFIG.new || die "Unable to set CFLAGS for build"
-	sed -e "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" \
-		MCONFIG.new > MCONFIG || die "Unable to set LDFLAGS for build"
+	sed -i \
+		-e "/^CFLAGS=/s:=.*:=${CFLAGS} -Wall -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline:" \
+		-e "/^LDFLAGS=/s:=.*:=${LDFLAGS}:" \
+		MCONFIG || die
 }
 
 src_install() {
@@ -34,7 +34,7 @@ src_install() {
 		-e 's:in\.telnetd$:in.telnetd -L /usr/sbin/telnetlogin:' \
 		etc.sample/inetd.conf
 
-	dosbin inetd/inetd
+	dosbin inetd/inetd || die
 	doman inetd/inetd.8
 	newinitd "${FILESDIR}"/inetd.rc6 inetd