Fix nowrap patch and tcpd useflag, closes bug 275924.

Package-Manager: portage-2.2_rc67/cvs/FreeBSD i386

5 files changed, 18 insertions, 19 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index bfc3a6f61ff3..9d371969e9a8 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.63 2010/03/23 11:12:17 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.64 2010/04/13 11:50:36 the_paya Exp $
+
+  13 Apr 2010; Javier Villavicencio <the_paya@gentoo.org>
+  files/freebsd-usbin-7.0-nowrap.patch, freebsd-usbin-7.2.ebuild,
+  freebsd-usbin-8.0.ebuild:
+  Fix tcp-wrappers disable patch and respect tcpd useflag, closes bug
+  275924.
 
   23 Mar 2010; Javier Villavicencio <the_paya@gentoo.org>
   freebsd-usbin-8.0.ebuild:
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 3a7f0b0a4c41..f19b2b2890c4 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX freebsd-usbin-7.0-nowrap.patch 1189 RMD160 13c63f33f39bb21982315dd16dd749f3b344cbea SHA1 c43bdb702ab15d5f6f933bb1183193ec1c127fca SHA256 1cca900dad6a8db6f17dc350a572d11d0a29b2752e64e5005707bf8830ba3fff
+AUX freebsd-usbin-6.2_rc2-libedit-netbsd.patch 552 RMD160 71f2acb0c53f1e027b19d9b35f94e502ecbc3d7e SHA1 b8d28fbebe44a0904e8550f38f3ebd2cb7ed0d7b SHA256 1d09fe1ed65aebbb1e48f10231a5da9342ef850a7a13afdaee971e7e70d0d57a
+AUX freebsd-usbin-7.0-nowrap.patch 1185 RMD160 268b102794cf39ce870a7b197d6ad1c03beece94 SHA1 058bffeaf34563fbf825f30a3c8402667ad52068 SHA256 a3c35cd997a22f4d212c3fe08d20fa7552b6de64527fee0166249ae76a3e49c8
 AUX freebsd-usbin-adduser.patch 428 RMD160 fecedb0bad9f29e9f0d889b2fce0edeb9a954d0b SHA1 3407974fcd42701d1587684f14547b5e02b6b342 SHA256 2e91737ffefd3b7ce3b55da4ce98eb0425961bba2d4a7c4e7c7ffabc1d38f2af
 AUX moused.confd 827 RMD160 a9d0822aa3894caed9efa9df93ef25ec6ec6fb8e SHA1 e09f3f44ee29fa75a1ce6fbe9cdbfe503eaa11d6 SHA256 7c15a534c0b10a553848b13e1fccd27fad1684ddc1b252133269257e864d769e
 AUX moused.initd 1783 RMD160 46241b5cf795ad06460e4053f8a76726af70c665 SHA1 02b5c22b7c35439a4c59ddadfd5bb7910cf3cdff SHA256 84f2d221ce16f5ffce43170fdcf86675dae79a776e1f2abf3b1b490b585f6d0e
@@ -39,14 +37,7 @@ DIST freebsd-ubin-7.2.tar.bz2 1851174 RMD160 b56cdc06fe0ce1ea47762a75c33ed9ed6d1
 DIST freebsd-ubin-8.0.tar.bz2 1787358 RMD160 08814da95905ba2cd6037c41507eade30b007e72 SHA1 0de52ddd7522b73c876ed967ac96aa278260f5b6 SHA256 2bd1529107e3b70df64bc4d7d3117122cac03b49b874a6653860b13d567af250
 DIST freebsd-usbin-7.2.tar.bz2 2654480 RMD160 af0a94e0affce332cf30532ea45251563e65632e SHA1 b52db981e0250357b40d10ebc7ffd6ca3ea9cc4c SHA256 56574e81ac4ab54a20d83d9a2d1ba3a42b5677691675f1db162fde161da0907f
 DIST freebsd-usbin-8.0.tar.bz2 2411151 RMD160 f162437ab2e3c89c6635e5c567e39b60974ce3c1 SHA1 be7b4ccd767e64fa0dedced631c18a1c3969b417 SHA256 c38230af5d667a254ddcce0b77100ada2b7af6e17309f033950c2852f70cc1dd
-EBUILD freebsd-usbin-7.2.ebuild 5254 RMD160 3859cc17d82675963b8bdb2d86c8c70e2d01c475 SHA1 7839858eb52a12c0d55bc6eecddaa616449e9779 SHA256 7bf06ad27f7bf3007c82361682f856b7cfc0f3c7b8c275ce92766f2668d4af80
-EBUILD freebsd-usbin-8.0.ebuild 5323 RMD160 922a73e2706ac7059f535bcad10be82a69da4bc6 SHA1 6b7f0763ca4a938d0dec31ab5c0f24a6f67f3aa2 SHA256 e9ae68fe7913b77070851f4ec070163779a47fd32770dba6a19183740a1356f2
-MISC ChangeLog 17403 RMD160 05f8ccf654ec507307a7a6d623b30265c0b283fe SHA1 d06c7d567678b91875d5226ce821dce3e0e4c80e SHA256 f8929be5cd3bfe2da9ef136e396298d8eeae8e8ac8d2ff34048135001de6fda4
+EBUILD freebsd-usbin-7.2.ebuild 5304 RMD160 c40693c242ebdc80cc208b5ec5d0c7de4c1c6f7b SHA1 9f7df5b34a4f5d214c4ff373623d2c8bffcf9cda SHA256 76d572034325281313f5322ce6d01a6201fbebaac31a6718d81fb6d66550d73a
+EBUILD freebsd-usbin-8.0.ebuild 5372 RMD160 404b65e83425d33efdac42a44b4512a08df8451e SHA1 bff1d06a11550e74c90d21ada6d7810f5c9bf962 SHA256 e8639e171e669df20f483cc7af4a95adfd8ab31dc1e16ce6f6cfd620011c428f
+MISC ChangeLog 17636 RMD160 07c3b3015414377a951e4db51f5374bb43e19e52 SHA1 331abb6ba4c2756ec4b51815cc1c6f237e25e0ae SHA256 75faddd4486fbb61a7a0b4628ce747992d993fa9317c45e8332aef1eb2426490
 MISC metadata.xml 511 RMD160 159e8a06a03c2b27a64a3ca54de4373a5aae5c6a SHA1 1d4f7993fe8c31a4f7478c91df9103b69b29148e SHA256 ad3d3afca8e209c42d1767c5d1dab12eef47c9016c0ce9aaa3490942bd185bac
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (FreeBSD)
-
-iEYEARECAAYFAkuooiIACgkQgvV6MZSadQqXFACePsUoiOyL77sAg4VkkiiG2Btc
-/VYAn34gvNEbzywg9O4XbxqsvDmDyj4k
-=BBf0
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch
index 17442eef68c0..9b11104e8337 100644
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch
@@ -18,7 +18,7 @@ diff -ur usr.sbin.orig/rpcbind/Makefile usr.sbin/rpcbind/Makefile
 +LDADD=	-lutil
 +
 +.if !defined(NO_WRAP)
-+CFLAGS+= -DTCP_WRAPPER
++CFLAGS+= -DLIBWRAP
 +DPADD+=         ${LIBWRAP}
 +LDADD+=         -lwrap
 +.endif
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild
index f8b705428b1b..4ac1bb0167f7 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild,v 1.5 2009/10/08 09:05:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild,v 1.6 2010/04/13 11:50:36 the_paya Exp $
 
 EAPI=2
 
@@ -58,6 +58,7 @@ pkg_setup() {
 	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
 	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
 	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use tcpd || mymakeopts="${mymakeopts} NO_WRAP= "
 
 	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
 }
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild
index 0aa447fcf5a2..1295c1463038 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild,v 1.2 2010/03/23 11:12:17 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild,v 1.3 2010/04/13 11:50:36 the_paya Exp $
 
 EAPI=2
 
@@ -60,6 +60,7 @@ pkg_setup() {
 	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
 	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
 	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
+	use tcpd || mymakeopts="${mymakeopts} NO_WRAP="
 
 	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
 }