summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Villavicencio <the_paya@gentoo.org>2010-04-13 11:50:37 +0000
committerJavier Villavicencio <the_paya@gentoo.org>2010-04-13 11:50:37 +0000
commit663c5c3950dfc1d10123d096f8ad17a357aa4b0b (patch)
tree95054b95b84c7c2218968d8a04d034952d2911e2 /sys-freebsd
parentVersion bump (diff)
downloadgentoo-2-663c5c3950dfc1d10123d096f8ad17a357aa4b0b.tar.gz
gentoo-2-663c5c3950dfc1d10123d096f8ad17a357aa4b0b.tar.bz2
gentoo-2-663c5c3950dfc1d10123d096f8ad17a357aa4b0b.zip
Fix nowrap patch and tcpd useflag, closes bug 275924.
(Portage version: 2.2_rc67/cvs/FreeBSD i386)
Diffstat (limited to 'sys-freebsd')
-rw-r--r--sys-freebsd/freebsd-usbin/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch2
-rw-r--r--sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild5
-rw-r--r--sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild3
4 files changed, 13 insertions, 5 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/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= "
}