add new version supporting leaving out tcp-wrappers via USE flag.

4 files changed, 110 insertions, 12 deletions

diff --git a/net-nds/portmap/ChangeLog b/net-nds/portmap/ChangeLog
index 96ce26be8011..a6162d6f5a62 100644
--- a/net-nds/portmap/ChangeLog
+++ b/net-nds/portmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/portmap
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.19 2004/04/06 10:49:55 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.20 2004/04/24 18:45:55 robbat2 Exp $
+
+*portmap-5b-r9 (24 Apr 2004)
+
+  24 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> portmap-5b-r9.ebuild:
+  add new version supporting leaving out tcp-wrappers via USE flag.
 
   06 Apr 2004; Joshua Brindle <method@gentoo.org> portmap-5b-r8.ebuild:
   added selinux policy to rdepend
diff --git a/net-nds/portmap/Manifest b/net-nds/portmap/Manifest
index e59391176de8..695c78e42057 100644
--- a/net-nds/portmap/Manifest
+++ b/net-nds/portmap/Manifest
@@ -1,14 +1,16 @@
-MD5 92839b9866abc5062b1eedbafd53c1c3 ChangeLog 2828
-MD5 c6aa5d1cfa7e894ad56944792557f961 portmap-5b-r6.ebuild 1085
-MD5 53b30de36e7f9872d68e1dc1feaf9d12 portmap-5b-r7.ebuild 1418
-MD5 e30fd70b198f545cb4a941f590dd21d8 portmap-5b-r8.ebuild 1826
-MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r6 64
-MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r7 64
-MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r8 64
-MD5 c4cab1b374730a709460d95211200852 files/portmap-4.0-cleanup.patch 2193
-MD5 7667fe1c5070f9f57c1beb25015bb7be files/portmap-4.0-malloc.patch 9067
+MD5 fab8b8e610602c9f503ee794ababb95f portmap-5b-r7.ebuild 1417
+MD5 5e17a7a52f69d71d52da3f9d39ddb47b portmap-5b-r9.ebuild 2456
+MD5 63a3db68d4e124c630a5cf37b0e577d6 portmap-5b-r6.ebuild 1084
+MD5 1121e01e2194a90583a11fd462d03824 ChangeLog 3002
+MD5 16249cb4ea8a54af41286ef0e32955b2 portmap-5b-r8.ebuild 1825
 MD5 49ef87c468b07ca837a1282faca5647b files/portmap-4.0-rpc_user.patch 1779
+MD5 c4cab1b374730a709460d95211200852 files/portmap-4.0-cleanup.patch 2193
+MD5 0ec47652f96bfda762a2ffc72a78f002 files/portmap_5beta.dif 8871
+MD5 dc99180e9a8176d1dab841446aa5ca35 files/portmap.rc6 1086
 MD5 d0820fd449ae88e56f2a3e78b96bb9d1 files/portmap-4.0-sigpipe.patch 353
+MD5 7667fe1c5070f9f57c1beb25015bb7be files/portmap-4.0-malloc.patch 9067
 MD5 887940376974bf01ecf94fd032f224eb files/portmap-5b-include-errno_h.patch 403
-MD5 56509b397788e8b301b5f9e2f738561f files/portmap.rc6 1087
-MD5 0ec47652f96bfda762a2ffc72a78f002 files/portmap_5beta.dif 8871
+MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r6 64
+MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r7 64
+MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r8 64
+MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r9 64
diff --git a/net-nds/portmap/files/digest-portmap-5b-r9 b/net-nds/portmap/files/digest-portmap-5b-r9
new file mode 100644
index 000000000000..61f9e105bbe8
--- /dev/null
+++ b/net-nds/portmap/files/digest-portmap-5b-r9
@@ -0,0 +1 @@
+MD5 781e16ed4487c4caa082c6fef09ead4f portmap_5beta.tar.gz 18702
diff --git a/net-nds/portmap/portmap-5b-r9.ebuild b/net-nds/portmap/portmap-5b-r9.ebuild
new file mode 100644
index 000000000000..531a7e626d04
--- /dev/null
+++ b/net-nds/portmap/portmap-5b-r9.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-5b-r9.ebuild,v 1.1 2004/04/24 18:45:55 robbat2 Exp $
+
+inherit eutils
+
+MY_P="${PN}_${PV}eta"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Netkit - portmapper"
+SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
+HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="-*"
+#KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
+
+DEPEND="virtual/glibc
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r7 )"
+RDEPEND="selinux? ( sec-policy/selinux-portmap )"
+IUSE="tcpd selinux"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}_5beta.dif
+
+	# Redhat patches
+	epatch ${FILESDIR}/${PN}-4.0-malloc.patch
+	epatch ${FILESDIR}/${PN}-4.0-cleanup.patch
+	epatch ${FILESDIR}/${PN}-4.0-rpc_user.patch
+	epatch ${FILESDIR}/${PN}-4.0-sigpipe.patch
+
+	# Should include errno.h, and not define as external.  Fix
+	# relocation error and build problem with glibc-2.3.2 cvs ...
+	# <azarah@gentoo.org> (31 Dec 2002).
+	epatch ${FILESDIR}/${P}-include-errno_h.patch
+
+	# Get portmap to use our CFLAGS ...
+	sed -e "s:-O2:${CFLAGS}:" -i Makefile || die
+}
+
+src_compile() {
+	local LIBS
+	local WRAP_DIR
+	local HOSTS_ACCESS
+	# libutil static as per -r8
+	#LIBS="-Wl,-Bstatic -lutil -Wl,-Bdynamic -lnsl"
+	# libutil dynamic
+	LIBS="-Wl,-Bdynamic -lutil -Wl,-Bdynamic -lnsl"
+	WRAP_DIR=""
+	HOSTS_ACCESS=""
+	if use tcpd; then
+	        WRAP_DIR="${ROOT}/usr/lib"
+	        [ -f "${ROOT}/lib/libwrap.a" ] && WRAP_DIR="${ROOT}/lib"
+			# static libwrap as per -r8
+	        #LIBS="-Wl,-Bstatic -lwrap ${LIBS}"
+			# libwrap dynamic
+	        LIBS="-Wl,-Bdynamic -lwrap ${LIBS}"
+	        HOSTS_ACCESS="-DHOSTS_ACCESS"
+	else
+	        sed -i -e "s:^WRAP_LIB:\#WRAP_LIB:" \
+	        -e "s:^HOSTS_ACCESS:\#HOSTS_ACCESS:" \
+	        -e 's:$(WRAP_DIR)/libwrap.a::g' \
+	        Makefile
+	fi
+
+	make FACILITY=LOG_AUTH \
+		ZOMBIES='-DIGNORE_SIGCHLD' \
+		HOSTS_ACCESS="${HOSTS_ACCESS}" \
+		WRAP_DIR="${WRAP_DIR}" \
+		LIBS="${LIBS}" \
+		AUX= || die
+}
+
+src_install() {
+	into / ; dosbin portmap
+	into /usr ; dosbin pmap_dump pmap_set
+	doman portmap.8 pmap_dump.8 pmap_set.8
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/portmap.rc6 portmap
+
+	# Is this really the sort of thing we wanna be doing? :)
+	# ln -s ../../init.d/portmap ${D}/etc/runlevels/default/portmap
+
+	dodoc BLURB CHANGES README
+}
+