Enable compile without tcp-wrappers, #178242.

Package-Manager: portage-2.1.2.7

4 files changed, 39 insertions, 20 deletions

diff --git a/net-nds/portmap/ChangeLog b/net-nds/portmap/ChangeLog
index c9c281af7808..95dbf9d92daa 100644
--- a/net-nds/portmap/ChangeLog
+++ b/net-nds/portmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/portmap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.36 2007/05/12 10:57:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.37 2007/05/12 20:41:24 uberlord Exp $
+
+  12 May 2007; Roy Marples <uberlord@gentoo.org>
+  +files/portmap-6.0-tcpd.patch, portmap-6.0.ebuild:
+  Enable compile without tcp-wrappers, #178242.
 
 *portmap-6.0 (12 May 2007)
 
diff --git a/net-nds/portmap/Manifest b/net-nds/portmap/Manifest
index 9a7808307e91..ca41b4c527c2 100644
--- a/net-nds/portmap/Manifest
+++ b/net-nds/portmap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX portmap-4.0-cleanup.patch 2193 RMD160 f4e4008039098ac6757e7e282b5a0267b9ebf680 SHA1 0ec43df5c8efbb23b9df89ebce766aebb82b0071 SHA256 878f0dc9f57e5a868ba0e76d6f7c81ed9a4ea17dcf32ac1a6078762e1b2acf8b
 MD5 c4cab1b374730a709460d95211200852 files/portmap-4.0-cleanup.patch 2193
 RMD160 f4e4008039098ac6757e7e282b5a0267b9ebf680 files/portmap-4.0-cleanup.patch 2193
@@ -33,6 +30,10 @@ AUX portmap-5b-optional-tcpd.patch 1066 RMD160 396ee5135eea281770b4ef250a4f7ae0f
 MD5 8b7fc4f54e294754bbd464ec3b6f919b files/portmap-5b-optional-tcpd.patch 1066
 RMD160 396ee5135eea281770b4ef250a4f7ae0fefe7393 files/portmap-5b-optional-tcpd.patch 1066
 SHA256 9b79bec6abcf16700765380dc4b90c058e7e11df5046e9309e3135bb83571ef8 files/portmap-5b-optional-tcpd.patch 1066
+AUX portmap-6.0-tcpd.patch 415 RMD160 02052276bb1f381683f15e55babb49ea43aa9bb8 SHA1 b58d610d676d5e4366ae9360204c74b43446b440 SHA256 1e94be15c01ddec73c549e376c04ff99cbfee60c44c2b607e4ee99564a2b542d
+MD5 ef74a81907a38d3a834ffb20c7a4050f files/portmap-6.0-tcpd.patch 415
+RMD160 02052276bb1f381683f15e55babb49ea43aa9bb8 files/portmap-6.0-tcpd.patch 415
+SHA256 1e94be15c01ddec73c549e376c04ff99cbfee60c44c2b607e4ee99564a2b542d files/portmap-6.0-tcpd.patch 415
 AUX portmap.confd 146 RMD160 1a8a5f2bfdef1ed1dc5347efb650a7ca6754d9d9 SHA1 e02a445f1d5df3b389044f98bed6bd30e84e6285 SHA256 f4e4bd0ce350ed236cfbe369101b8429f2108a174253daffe783353b416f0120
 MD5 56b0f47cda2003f3394ef7c37ec4cdff files/portmap.confd 146
 RMD160 1a8a5f2bfdef1ed1dc5347efb650a7ca6754d9d9 files/portmap.confd 146
@@ -51,18 +52,18 @@ EBUILD portmap-5b-r9.ebuild 1962 RMD160 eb740f0655d375a29c120b93fd511dc479761d67
 MD5 410753d8ef09a5a27e1599127e73c7f5 portmap-5b-r9.ebuild 1962
 RMD160 eb740f0655d375a29c120b93fd511dc479761d67 portmap-5b-r9.ebuild 1962
 SHA256 a39cc8bd58e66176c35f0907b2d3cb108584411214e1d9974fa0589962970983 portmap-5b-r9.ebuild 1962
-EBUILD portmap-6.0.ebuild 1079 RMD160 7d12b8c8a4a0bac247b1e324a00a58cb29ffc018 SHA1 eb4792721f06e7a72b4c4a5f96717ca8cd7665bb SHA256 5648611992b5900920c607da1b71dea8883953b1dbcd9619dfe5a78c0a512b4b
-MD5 30939138f07953d8d330fe1a4dfa92f6 portmap-6.0.ebuild 1079
-RMD160 7d12b8c8a4a0bac247b1e324a00a58cb29ffc018 portmap-6.0.ebuild 1079
-SHA256 5648611992b5900920c607da1b71dea8883953b1dbcd9619dfe5a78c0a512b4b portmap-6.0.ebuild 1079
+EBUILD portmap-6.0.ebuild 1161 RMD160 5cde7cd13347650acdd641c36fdc3a353ea2a8a3 SHA1 9738ad445c9384d86ced1a6bfd2a1cf4b12c26c0 SHA256 409c654a278442cce759d0c64fc08044ed306d31560692b5038b8d82211d78ca
+MD5 d9c427833cad68f2dc922e9130770656 portmap-6.0.ebuild 1161
+RMD160 5cde7cd13347650acdd641c36fdc3a353ea2a8a3 portmap-6.0.ebuild 1161
+SHA256 409c654a278442cce759d0c64fc08044ed306d31560692b5038b8d82211d78ca portmap-6.0.ebuild 1161
 EBUILD portmap-9999.ebuild 958 RMD160 314521143351546f24db3d921c0014380a9a4ccd SHA1 3292cdab23d599e428a97365a98f988603f366a3 SHA256 d72851488a2856dbd2a237312ddd2418acacc6c31f9ddea283cafbd707dc2c17
 MD5 8e179bd2d0df61f23e365a4f3ec6bd75 portmap-9999.ebuild 958
 RMD160 314521143351546f24db3d921c0014380a9a4ccd portmap-9999.ebuild 958
 SHA256 d72851488a2856dbd2a237312ddd2418acacc6c31f9ddea283cafbd707dc2c17 portmap-9999.ebuild 958
-MISC ChangeLog 5030 RMD160 de579edc079c2e1216a5482bbb6f19c65790544b SHA1 6200269452d9576475e82851701c560d3c4b6cc1 SHA256 048e0611a29f83e9d700db09ad4ecbbfaee624480fc5e92e32a03a00efe4b3f1
-MD5 157a6857f48973e06da0689733e84c00 ChangeLog 5030
-RMD160 de579edc079c2e1216a5482bbb6f19c65790544b ChangeLog 5030
-SHA256 048e0611a29f83e9d700db09ad4ecbbfaee624480fc5e92e32a03a00efe4b3f1 ChangeLog 5030
+MISC ChangeLog 5183 RMD160 73e88fc89a389b2354305ddd58d30aaf971b4d26 SHA1 28a6d228c768302a8e8b1ca742f350b2cdea7ac8 SHA256 11e1574c69aa4a32d18cfbaf7e19b47c8a3ced974bd7fbc3146218ff9224fb67
+MD5 80246d1da07ac57e283614460fd72684 ChangeLog 5183
+RMD160 73e88fc89a389b2354305ddd58d30aaf971b4d26 ChangeLog 5183
+SHA256 11e1574c69aa4a32d18cfbaf7e19b47c8a3ced974bd7fbc3146218ff9224fb67 ChangeLog 5183
 MISC metadata.xml 184 RMD160 e04454ac0ce1332b55442f66f80c5b0a1f378d1b SHA1 8b1d8587e1a69023464beadc22574662e5c839b3 SHA256 07152ec8272b393b26f92d7ff6a9a74b0eda6624ab35367ba7670f881c3519d7
 MD5 def1cd0cee829a8caa56efd6a51d937c metadata.xml 184
 RMD160 e04454ac0ce1332b55442f66f80c5b0a1f378d1b metadata.xml 184
@@ -76,10 +77,3 @@ SHA256 285357de7f0220479c48381484672ffef330b77600ba7e20c18967da29d92272 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-portmap-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-portmap-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-portmap-9999 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGRZ3T8bi6rjpTunYRAhQMAJ4/ZvRc1s9/DehgouCyTXMfu8g5owCfZYxy
-J22jvvXgvA3wZrymG/M9q2o=
-=3Elz
------END PGP SIGNATURE-----
diff --git a/net-nds/portmap/files/portmap-6.0-tcpd.patch b/net-nds/portmap/files/portmap-6.0-tcpd.patch
new file mode 100644
index 000000000000..9c74039844ea
--- /dev/null
+++ b/net-nds/portmap/files/portmap-6.0-tcpd.patch
@@ -0,0 +1,15 @@
+Enable compile without tcp-wrappers, #178242.
+
+diff -Nur portmap_6.0.orig/pmap_check.c portmap_6.0/pmap_check.c
+--- portmap_6.0.orig/pmap_check.c	2007-05-12 22:04:31.146962495 +0200
++++ portmap_6.0/pmap_check.c	2007-05-12 22:05:14.938449291 +0200
+@@ -44,7 +44,9 @@
+ #include <netinet/in.h>
+ #include <rpc/rpcent.h>
+ #endif
++#ifdef HOSTS_ACCESS
+ #include <tcpd.h>
++#endif
+ #include <arpa/inet.h>
+ #include <grp.h>
+ 
diff --git a/net-nds/portmap/portmap-6.0.ebuild b/net-nds/portmap/portmap-6.0.ebuild
index ad3435b04cca..d85311039b18 100644
--- a/net-nds/portmap/portmap-6.0.ebuild
+++ b/net-nds/portmap/portmap-6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-6.0.ebuild,v 1.1 2007/05/12 10:57:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-6.0.ebuild,v 1.2 2007/05/12 20:41:24 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -23,6 +23,12 @@ pkg_setup() {
 	enewuser rpc 111 -1 /dev/null rpc
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-tcpd.patch"
+}
+
 src_compile() {
 	tc-export CC
 	emake NO_TCP_WRAPPER="$(use tcpd || echo NO)" || die