Install dev headers/libs again #203744.

Package-Manager: portage-2.1.4_rc11

5 files changed, 268 insertions, 8 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 9254f0624bb2..c98541f918a7 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.156 2007/12/27 21:48:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.157 2007/12/30 15:00:48 vapier Exp $
+
+*iptables-1.4.0-r1 (30 Dec 2007)
+
+  30 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/iptables-1.4.0-dev-files.patch, +iptables-1.4.0-r1.ebuild:
+  Install dev headers/libs again #203744.
 
   27 Dec 2007; Mike Frysinger <vapier@gentoo.org> iptables-1.4.0.ebuild:
   Punt USE=imq.  Use user-custom patch dir in /etc/.
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index ff0ce65dfd89..7c05e4d886c1 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -57,6 +57,10 @@ AUX iptables-1.3.7-test-dir.patch 890 RMD160 9767d237580dfe162f1377dd65bc928b57d
 MD5 c34afae216a1c394006964f0c5a551bb files/iptables-1.3.7-test-dir.patch 890
 RMD160 9767d237580dfe162f1377dd65bc928b57db8c19 files/iptables-1.3.7-test-dir.patch 890
 SHA256 1ad36b68840396e45ca71fe93984caaaac105fddf102fda92fe24067206bccf1 files/iptables-1.3.7-test-dir.patch 890
+AUX iptables-1.4.0-dev-files.patch 1498 RMD160 2ea5a0b36c1d65ff3a22dae19dfeab67ba3c3604 SHA1 33b4d4d39b687d2709c61ad82bc0f091ddf8a7c5 SHA256 616a48a9559194da74ef7c3ef05d8de11ea38e1c3f2c033d87921fdc870a8118
+MD5 27860b7e64a33585483412d1a9ae58e8 files/iptables-1.4.0-dev-files.patch 1498
+RMD160 2ea5a0b36c1d65ff3a22dae19dfeab67ba3c3604 files/iptables-1.4.0-dev-files.patch 1498
+SHA256 616a48a9559194da74ef7c3ef05d8de11ea38e1c3f2c033d87921fdc870a8118 files/iptables-1.4.0-dev-files.patch 1498
 DIST iptables-1.3.0-imq1.diff 5369 RMD160 8ca1fa3bfea02d27232d8d8cb0a12586dd4537b5 SHA1 bdf665cacc985fceaadf119ae7a756caca1589ad SHA256 0f9d36e48b3f1e83ef9e1d39c19e7271a889a31c65c396c416200eb143f1795b
 DIST iptables-1.3.5.tar.bz2 191820 RMD160 3364e0f37f67ba4aa9ac9caa6f11adb67887e528 SHA1 6dbeeee13517fa02852960b6f6e51115c7548a09 SHA256 1d8ee8634d167b0f1a8872b6547910c11bae676699faf2b4bc2c84a128449c3c
 DIST iptables-1.3.6-imq.diff 5723 RMD160 7158923558f9ad82973cda9dbec2c10b86e13e9c SHA1 1a2d7d9bcb10e7d4e69f445d4882ab598b57855e SHA256 f507319d01dd1810b497e0700a67d8f9668dd1363b1f8e1b09097cf2bbc26ab7
@@ -101,14 +105,18 @@ EBUILD iptables-1.3.8.ebuild 5655 RMD160 54dfc7ce735c4a1c81af1ef1ad71859bc0e478e
 MD5 d6927f7f20594172d561244f46382933 iptables-1.3.8.ebuild 5655
 RMD160 54dfc7ce735c4a1c81af1ef1ad71859bc0e478e0 iptables-1.3.8.ebuild 5655
 SHA256 1674842ce149e1e22c0f91e6348ca8f1369347acf7170b70c83bed5f11bd9289 iptables-1.3.8.ebuild 5655
+EBUILD iptables-1.4.0-r1.ebuild 6022 RMD160 d694275d1973d28d0258c9c87fa6e31b59e3156c SHA1 57adc55f7942dbf9dd10fb0658c06b25d4222ba0 SHA256 ff8f36a5ba56321907812083d991d9dd3d642fdc6fc564996d6bee99e044c5c2
+MD5 cb123337d5d8001294f60e6bf2438d52 iptables-1.4.0-r1.ebuild 6022
+RMD160 d694275d1973d28d0258c9c87fa6e31b59e3156c iptables-1.4.0-r1.ebuild 6022
+SHA256 ff8f36a5ba56321907812083d991d9dd3d642fdc6fc564996d6bee99e044c5c2 iptables-1.4.0-r1.ebuild 6022
 EBUILD iptables-1.4.0.ebuild 5975 RMD160 d48cba33009ae343bbd3e944a4e9c865fce98036 SHA1 606007f2320e7babe6a6ca24206c416711e2287f SHA256 fc6e19e81c5d1c463a2b9d6bfc7f3b79691c1bf410419d1c8c039f6e3a0c2544
 MD5 dfbe605c2ae547732887fb1c5f1743e7 iptables-1.4.0.ebuild 5975
 RMD160 d48cba33009ae343bbd3e944a4e9c865fce98036 iptables-1.4.0.ebuild 5975
 SHA256 fc6e19e81c5d1c463a2b9d6bfc7f3b79691c1bf410419d1c8c039f6e3a0c2544 iptables-1.4.0.ebuild 5975
-MISC ChangeLog 30416 RMD160 3ff4b9eb18107dd347c640725834d767ecbb3329 SHA1 cf99f0ee743705e6e0319c5d0397f34c4dbd555a SHA256 c6dec11794e895b076aaa581709ced5bae5930eee396926c265cc236e417ba7f
-MD5 f11e5eeb49317a5a33597a5e6d056f92 ChangeLog 30416
-RMD160 3ff4b9eb18107dd347c640725834d767ecbb3329 ChangeLog 30416
-SHA256 c6dec11794e895b076aaa581709ced5bae5930eee396926c265cc236e417ba7f ChangeLog 30416
+MISC ChangeLog 30611 RMD160 5b699afad184b16baa56b5c6c0d52a3bcb685f15 SHA1 8f33c352857f4c52ac04db360e53404be67e86db SHA256 e5d243f204866a1c691adb3be7b694fa7aeafc53e99689cb2f901afdbe2f099b
+MD5 b7fdb464230a14f6143a960a324ebbf7 ChangeLog 30611
+RMD160 5b699afad184b16baa56b5c6c0d52a3bcb685f15 ChangeLog 30611
+SHA256 e5d243f204866a1c691adb3be7b694fa7aeafc53e99689cb2f901afdbe2f099b ChangeLog 30611
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -140,10 +148,13 @@ SHA256 31958f9bc65d8bb0aaf1af3d2cf744da7a2b279963085102f432d9a52b5b8e12 files/di
 MD5 279b185fe5ec6129f31f7aca28cd903a files/digest-iptables-1.4.0 515
 RMD160 99f6f29a5d212a3036e147add3e4f044bb1efcbf files/digest-iptables-1.4.0 515
 SHA256 9a53dfb37a3dd566aabfe2b7d3d4186c0f874753b2bcdcecea697d70e0bf4579 files/digest-iptables-1.4.0 515
+MD5 279b185fe5ec6129f31f7aca28cd903a files/digest-iptables-1.4.0-r1 515
+RMD160 99f6f29a5d212a3036e147add3e4f044bb1efcbf files/digest-iptables-1.4.0-r1 515
+SHA256 9a53dfb37a3dd566aabfe2b7d3d4186c0f874753b2bcdcecea697d70e0bf4579 files/digest-iptables-1.4.0-r1 515
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd0HTkACgkQj9hvisErhMLyKACeKJkEfIRsRPKnxP82Nd2UOYH8
-IgoAnj5iw3ficpN5Em/+I59gweV0q1kX
-=7zzw
+iEYEARECAAYFAkd3sqYACgkQj9hvisErhML56ACgha50XQEWXSdtCYyd95ad49QK
+LyMAoJAw93Uv4WTC7fW5TyhTlBWCLaDy
+=Pu5r
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/digest-iptables-1.4.0-r1 b/net-firewall/iptables/files/digest-iptables-1.4.0-r1
new file mode 100644
index 000000000000..56c018717665
--- /dev/null
+++ b/net-firewall/iptables/files/digest-iptables-1.4.0-r1
@@ -0,0 +1,6 @@
+MD5 90cfa8a554a29b0b859a625e701af2a7 iptables-1.4.0.tar.bz2 181610
+RMD160 6f6a29cbe0e55261607acc1183e04482c444286e iptables-1.4.0.tar.bz2 181610
+SHA256 fd9a978035e6a8f73344f986c84a222dc4ac3706b901e0c1ecae9647db5e5d52 iptables-1.4.0.tar.bz2 181610
+MD5 e153d23a3879f33f4a96ed6b706609e3 netfilter-layer7-v2.17.tar.gz 160408
+RMD160 9823d7b411e18160dc8501a6a5d2129f75e727e1 netfilter-layer7-v2.17.tar.gz 160408
+SHA256 2e2893757a3b22f2786ead2045efae1d6a52942a89d0159c39ba907531b60c01 netfilter-layer7-v2.17.tar.gz 160408
diff --git a/net-firewall/iptables/files/iptables-1.4.0-dev-files.patch b/net-firewall/iptables/files/iptables-1.4.0-dev-files.patch
new file mode 100644
index 000000000000..afb091aeb65f
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.4.0-dev-files.patch
@@ -0,0 +1,46 @@
+install headers and make a small archive for people to use
+
+--- iptables/Makefile
++++ iptables/Makefile
+@@ -102,6 +102,17 @@
+ print-extensions:
+ 	@[ -n "$(OPTIONALS)" ] && echo Extensions found: $(OPTIONALS)
+ 
++EXTRAS+=libiptables.a
++DEVEL_HEADERS+=include/iptables.h include/xtables.h include/libipulog/libipulog.h
++DEVEL_LIBS+=libiptables.a
++ifeq ($(DO_IPV6), 1)
++EXTRAS+=libip6tables.a
++DEVEL_HEADERS+=include/ip6tables.h
++DEVEL_LIBS+=libip6tables.a
++endif
++libiptables.a: libiptables.a(iptables.o)
++libip6tables.a: libip6tables.a(ip6tables.o)
++
+ iptables.o: iptables.c
+ 	$(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
+ 
+@@ -221,7 +232,7 @@
+ .PHONY: install-devel-headers
+ install-devel-headers: $(DEVEL_HEADERS)
+ 	@[ -d $(DESTDIR)$(INCDIR) ] || mkdir -p $(DESTDIR)$(INCDIR)
+-	@cp -v $(DEVEL_HEADERS) $(DESTDIR)$(INCDIR)
++	@cd include && cp -v --parents $(patsubst include/%,%,$(DEVEL_HEADERS)) $(DESTDIR)$(INCDIR)
+ 
+ .PHONY: install-devel-libs
+ install-devel-libs: $(DEVEL_LIBS)
+--- iptables/libiptc/Makefile
++++ iptables/libiptc/Makefile
+@@ -16,8 +16,12 @@
+ ifeq ($(DO_IPV6), 1)
+ EXTRA_DEPENDS+= libiptc/libip6tc.d
+ libiptc/libiptc.a: libiptc/libiptc.a(libiptc/libip6tc.o)
++DEVEL_HEADERS+=include/libiptc/libip6tc.h
+ endif
+ 
++DEVEL_LIBS+=libiptc/libiptc.a
++DEVEL_HEADERS+=include/libiptc/libiptc.h include/libiptc/ipt_kernel_headers.h
++
+ libiptc/libip4tc.d libiptc/libip6tc.d: %.d: %.c
+ 	@-$(CC) -M -MG $(CFLAGS) $< | sed -e 's@^.*\.o:@$*.d libiptc/libiptc.a($*.o):@' > $@
+ endif
diff --git a/net-firewall/iptables/iptables-1.4.0-r1.ebuild b/net-firewall/iptables/iptables-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..02d8a4b48f15
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.4.0-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0-r1.ebuild,v 1.1 2007/12/30 15:00:48 vapier Exp $
+
+inherit eutils toolchain-funcs linux-info
+
+L7_PV=2.17
+L7_P=netfilter-layer7-v${L7_PV}
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="http://www.iptables.org/ http://l7-filter.sf.net/"
+SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2
+	l7filter? ( mirror://sourceforge/l7-filter/${L7_P}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="extensions ipv6 l7filter static"
+
+DEPEND="virtual/os-headers
+	l7filter? ( virtual/linux-sources )"
+RDEPEND=""
+
+pkg_setup() {
+	if use l7filter || use extensions ; then
+		ewarn "WARNING: 3rd party extensions has been enabled."
+		ewarn "This means that iptables will use your currently installed"
+		ewarn "kernel in ${KERNEL_DIR} as headers for iptables."
+		ewarn
+		if use extensions ; then
+			ewarn "You may have to patch your kernel to allow iptables to build."
+			ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches"
+			ewarn "for your kernel."
+			ewarn
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if kernel_is ge 2 6 20
+	then
+		L7FILE=${KERNEL_DIR}/net/netfilter/xt_layer7.c
+	else
+		L7FILE=${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c
+	fi
+	if use l7filter && \
+		[ ! -f "${L7FILE}" ]; then
+		die "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this"
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	if use l7filter
+	then
+		unpack ${L7_P}.tar.gz
+	fi
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-dev-files.patch
+
+	# this provide's grsec's stealth match
+	EPATCH_OPTS="-p0" \
+	epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
+	sed -i \
+		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
+		extensions/Makefile || die "failed to enable stealth extension"
+
+	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
+	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
+		EPATCH_SOURCE=${base}/${CTARGET}/${check}
+		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
+		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
+		if [[ -d ${EPATCH_SOURCE} ]] ; then
+			EPATCH_SUFFIX="patch"
+			EPATCH_FORCE="yes" \
+			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
+			epatch
+			break
+		fi
+	done
+
+	if use l7filter ; then
+		#yes choosing 2.6.20 was deliberate - upstream mistake possibly
+		if kernel_is ge 2 6 20
+		then
+			L7_PATCH=iptables-1.4-for-kernel-2.6.20forward-layer7-${L7_PV}.patch
+		else
+			eerror "Currently there is no l7-filter patch available for this"
+			eerror "kernel iptables-1.4 and kernel version pre 2.6.20."
+			eerror "If you need to compile iptables 1.4.x against Linux 2.6.19.x"
+			eerror "or earlier, with l7-filter patch, please, report upstream."
+			die "No patch available."
+		fi
+		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
+		chmod +x extensions/.layer7-test*
+	fi
+
+	if ! use extensions ; then
+		cat <<-EOF > "${S}"/include/linux/compiler.h
+		#define __user
+		EOF
+	fi
+}
+
+src_defs() {
+	# these are used in both of src_compile and src_install
+	myconf=""
+	myconf="${myconf} PREFIX="
+	myconf="${myconf} LIBDIR=/$(get_libdir)"
+	myconf="${myconf} BINDIR=/sbin"
+	myconf="${myconf} MANDIR=/usr/share/man"
+	myconf="${myconf} INCDIR=/usr/include"
+	# iptables and libraries are now installed to /sbin and /lib, so that
+	# systems with remote network-mounted /usr filesystems can get their
+	# network interfaces up and running correctly without /usr.
+	use ipv6 || myconf="${myconf} DO_IPV6=0"
+	use static && myconf="${myconf} NO_SHARED_LIBS=0"
+	export myconf
+	if ! use l7filter && ! use extensions ; then
+		export KERNEL_DIR=$(
+			# ugh -- iptables has scripts which check for the existence of
+			# files so we need to give it the right path to our toolchains
+			# include dir where the linux headers are.
+			# FYI IPTABLES: YOU FAIL
+			echo '#include <linux/limits.h>' | $(tc-getCPP) - | grep -o '/[^"]*linux/limits.h' | sed s:/include/linux/limits.h::
+		)
+		export KBUILD_OUTPUT=${KERNEL_DIR}
+		diemsg="failure"
+	else
+		diemsg="failure - with l7filter and/or other miscellanious patches added"
+	fi
+	export diemsg
+}
+
+src_compile() {
+	src_defs
+	emake \
+		COPT_FLAGS="${CFLAGS}" ${myconf} \
+		CC="$(tc-getCC)" \
+		|| die "${diemsg}"
+}
+
+src_install() {
+	src_defs
+	emake ${myconf} \
+		DESTDIR="${D}" \
+		KERNEL_DIR="${KERNEL_DIR}" \
+		install install-devel || die "${diemsg}"
+
+	dodir /usr/$(get_libdir)
+	mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)
+
+	keepdir /var/lib/iptables
+	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
+	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
+
+	if use ipv6 ; then
+		keepdir /var/lib/ip6tables
+		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
+		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
+	fi
+}
+
+pkg_postinst() {
+	elog "This package now includes an initscript which loads and saves"
+	elog "rules stored in /var/lib/iptables/rules-save"
+	use ipv6 && elog "and /var/lib/ip6tables/rules-save"
+	elog "This location can be changed in /etc/conf.d/iptables"
+	elog
+	elog "If you are using the iptables initsscript you should save your"
+	elog "rules using the new iptables version before rebooting."
+	elog
+	elog "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
+	elog "iptables."
+	elog
+	ewarn "!!! ipforwarding is not a part of the iptables initscripts."
+	ewarn
+	ewarn "To enable ipforwarding at bootup:"
+	ewarn "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
+	if use ipv6 ; then
+		ewarn "and/or"
+		ewarn "  net.ipv6.ip_forward = 1"
+		ewarn "for ipv6."
+	fi
+	if has_version '=net-firewall/iptables-1.2*' ; then
+		ewarn
+		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
+		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
+		ewarn "http://bugs.gentoo.org/92535"
+	fi
+}