version bump as per bug #161806

Package-Manager: portage-2.1.2_rc4-r6

4 files changed, 194 insertions, 9 deletions

diff --git a/net-misc/l7-filter/ChangeLog b/net-misc/l7-filter/ChangeLog
index 199cc254e1f0..987d6b7ba8eb 100644
--- a/net-misc/l7-filter/ChangeLog
+++ b/net-misc/l7-filter/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/l7-filter
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.41 2007/01/11 17:38:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.42 2007/01/20 22:27:27 dragonheart Exp $
+
+*l7-filter-2.9 (20 Jan 2007)
+
+  20 Jan 2007; Daniel Black <dragonheart@gentoo.org> +l7-filter-2.9.ebuild:
+  version bump as per bug #161806 thanks cilly
 
   11 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> l7-filter-2.8.ebuild:
   Stable on sparc wrt #150343
diff --git a/net-misc/l7-filter/Manifest b/net-misc/l7-filter/Manifest
index 1feb2cc7ec09..b779a85f209c 100644
--- a/net-misc/l7-filter/Manifest
+++ b/net-misc/l7-filter/Manifest
@@ -5,6 +5,7 @@ DIST additional_patch_for_2.6.13.diff 4962 RMD160 8faa60214d5695c797b24a11fe9585
 DIST netfilter-layer7-v2.3.tar.gz 105587 RMD160 4c5c5315cf1f193c9ceb605d8d9d9328b515c64d SHA1 cfbe80a6c5725732e4935692e4b0cf5b42abd4f0 SHA256 4a5e4475d05c8d0998e56d12e8e27eb9acf23ce80a53000783b2f609a6bb33aa
 DIST netfilter-layer7-v2.6.tar.gz 122514 RMD160 31b68ae3baa0a340f2e4a555fd5124c3b977629d SHA1 6120eae8bd405d35d079774d191830d137643147 SHA256 c5a842c037e915eb72576e5861f0b048837719f1edf448775d9218b42c48e0aa
 DIST netfilter-layer7-v2.8.tar.gz 122377 RMD160 cd70ce6c0631d5099d44f52a06414562552fb546 SHA1 6f2cdcb69bd61b2971603cb7ed5f4da16df79d7e SHA256 09ecd9a000ab7595694b85f2bc9fa2b2f5bd8debd36c78fe5564fd23bdbbe9f3
+DIST netfilter-layer7-v2.9.tar.gz 122497 RMD160 0398b8b61b24eb5d28309a53af0279e9f201318d SHA1 c4a1d92855ad51413fbd7229fe9decfe45aac084 SHA256 7db0e22297f7ecec41bb973733d6970bab922b4c54f779239616fa26a2315969
 EBUILD l7-filter-2.3.ebuild 4096 RMD160 a41469d3766af4f310880c4e2d0df0397b960852 SHA1 e4c66c625669a9b34f9a3a4b768c4a62832abeb7 SHA256 f79dd18aabe2aafeeb20dbe4cb4f6e56757c6a00ddbd6a439b1c630b3713b1d0
 MD5 68318fdbd8b2583ef27bec229ca9be3e l7-filter-2.3.ebuild 4096
 RMD160 a41469d3766af4f310880c4e2d0df0397b960852 l7-filter-2.3.ebuild 4096
@@ -17,10 +18,14 @@ EBUILD l7-filter-2.8.ebuild 4302 RMD160 efdb0eea001563561e7728a9c69e48ca24ff817a
 MD5 9a315f85fefc761841106f39a6d2a7ff l7-filter-2.8.ebuild 4302
 RMD160 efdb0eea001563561e7728a9c69e48ca24ff817a l7-filter-2.8.ebuild 4302
 SHA256 2a3ff612ea4aec786b4f25fb6923f8ded5747ff71bef347c28d332d897f60c42 l7-filter-2.8.ebuild 4302
-MISC ChangeLog 7142 RMD160 1dfb3ec8d566e24ecd7444964f5dc25cf4d86dd3 SHA1 54ccbf903a3614f0bb3af0349f790056a1850a46 SHA256 1752a7915f0129ffbebeb96be976f6060630c50a568a1e791a8ac9433b0fc15e
-MD5 a3129034e19c198d0e4d00308c4ab753 ChangeLog 7142
-RMD160 1dfb3ec8d566e24ecd7444964f5dc25cf4d86dd3 ChangeLog 7142
-SHA256 1752a7915f0129ffbebeb96be976f6060630c50a568a1e791a8ac9433b0fc15e ChangeLog 7142
+EBUILD l7-filter-2.9.ebuild 4308 RMD160 21c12cd9232835f9a5f0229a1f905cbb2761984f SHA1 85fda4fa6eb213061b621dc75ba4311238454f25 SHA256 5e217a65740b8ef435842a52a9dfc2af24418810369d0b7922a1ca8777d89a00
+MD5 1b8bf19080492437c5d34dc997c85b3c l7-filter-2.9.ebuild 4308
+RMD160 21c12cd9232835f9a5f0229a1f905cbb2761984f l7-filter-2.9.ebuild 4308
+SHA256 5e217a65740b8ef435842a52a9dfc2af24418810369d0b7922a1ca8777d89a00 l7-filter-2.9.ebuild 4308
+MISC ChangeLog 7299 RMD160 1660061826ffafc1b19527b09ab138d9e9fe51d6 SHA1 1fb0821d643964062635701711cb7f549a7de96b SHA256 33a9a7797fcb2e263f9b737f825a0672c4b2952378583126430f98633134edfd
+MD5 d976530937af25a5dbae8cec01593c0e ChangeLog 7299
+RMD160 1660061826ffafc1b19527b09ab138d9e9fe51d6 ChangeLog 7299
+SHA256 33a9a7797fcb2e263f9b737f825a0672c4b2952378583126430f98633134edfd ChangeLog 7299
 MISC metadata.xml 374 RMD160 36c7b587b04bba133b9b106083dd7b485d9d2e45 SHA1 1d33c3e413603911ecb01f7a6ac8bb89c544562b SHA256 4638653661df3aa277ddfab4579d87598d17211e8b4d10114d4eeba5ddf2b7f1
 MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
 RMD160 36c7b587b04bba133b9b106083dd7b485d9d2e45 metadata.xml 374
@@ -34,10 +39,13 @@ SHA256 7f84ac7507fda9eaa0fa1755aa43ed81c16d4e3c08e00bf7878e05d4148db924 files/di
 MD5 32db75fde6856c75c1df95a024566b91 files/digest-l7-filter-2.8 536
 RMD160 ed29d4509402b3e2fbd717c18dd84e590358cf30 files/digest-l7-filter-2.8 536
 SHA256 a40c733abadf9477f4219202ff7203babfbd207d3fc95bcc04806c3f65b95621 files/digest-l7-filter-2.8 536
+MD5 7e1cae893882ddd2757b835eb4e6fef3 files/digest-l7-filter-2.9 536
+RMD160 552079d00c5feafe88921d67f54a11f7a2b68b4d files/digest-l7-filter-2.9 536
+SHA256 da2463f85aca9ac4686121300c5163cb8b569cabebe554a59371877dc16461db files/digest-l7-filter-2.9 536
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFpnYIKRy60XGEcJIRAmlPAJwKSEvC/6ZoKOK2RqOkL0xaH771JwCgpQxd
-5JzYJxPL8Uo7nksf2TzYXkg=
-=lc1a
+iD8DBQFFspdumdTrptrqvGERAnUbAKCAQT6v/z6knbDaSD93y0nUgTUoUACePX3w
+OxYMDc2My9u+LHsAHAc8Sus=
+=IKou
 -----END PGP SIGNATURE-----
diff --git a/net-misc/l7-filter/files/digest-l7-filter-2.9 b/net-misc/l7-filter/files/digest-l7-filter-2.9
new file mode 100644
index 000000000000..ce07cd6e4874
--- /dev/null
+++ b/net-misc/l7-filter/files/digest-l7-filter-2.9
@@ -0,0 +1,6 @@
+MD5 6e8ff4d1b7b0281a7596a74789b79f8d additional_patch_for_2.6.13.diff 4962
+RMD160 8faa60214d5695c797b24a11fe95858a785258a3 additional_patch_for_2.6.13.diff 4962
+SHA256 c0e2b7bb7024c8e35b554eb33263b5c34dd2356aaea739b07231f717eae8f58d additional_patch_for_2.6.13.diff 4962
+MD5 ebf9043a5352ebe6dbd721989ef83dee netfilter-layer7-v2.9.tar.gz 122497
+RMD160 0398b8b61b24eb5d28309a53af0279e9f201318d netfilter-layer7-v2.9.tar.gz 122497
+SHA256 7db0e22297f7ecec41bb973733d6970bab922b4c54f779239616fa26a2315969 netfilter-layer7-v2.9.tar.gz 122497
diff --git a/net-misc/l7-filter/l7-filter-2.9.ebuild b/net-misc/l7-filter/l7-filter-2.9.ebuild
new file mode 100644
index 000000000000..22f6631cd13c
--- /dev/null
+++ b/net-misc/l7-filter/l7-filter-2.9.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-2.9.ebuild,v 1.1 2007/01/20 22:27:27 dragonheart Exp $
+
+inherit linux-info eutils
+
+MY_P=netfilter-layer7-v${PV/_/-}
+DESCRIPTION="Kernel modules for layer 7 iptables filtering"
+HOMEPAGE="http://l7-filter.sourceforge.net"
+SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz
+	mirror://gentoo/additional_patch_for_2.6.13.diff"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+#break repoman
+#SLOT="${KV}"
+SLOT="0"
+S=${WORKDIR}/${MY_P}
+RDEPEND="net-misc/l7-protocols"
+
+
+which_patch() {
+	if kernel_is ge 2 6 18
+	then
+		PATCH=kernel-2.6.18-2.6.19-layer7-2.9.patch
+	elif kernel_is ge 2 6 17
+	then
+		PATCH=for_older_kernels/kernel-2.6.17-layer7-2.5.patch
+	elif kernel_is ge 2 6 13
+	then
+		PATCH=for_older_kernels/kernel-2.6.13-2.6.16-layer7-2.2.patch
+	elif kernel_is ge 2 6 11
+	then
+		PATCH=for_older_kernels/kernel-2.6.11-2.6.12-layer7-1.4.patch
+	elif kernel_is ge 2 6 9
+	then
+		PATCH=for_older_kernels/kernel-2.6.9-2.6.10-layer7-1.2.patch
+	elif kernel_is ge 2 6 0
+	then
+		PATCH=for_older_kernels/kernel-2.6.0-2.6.8.1-layer7-0.9.2.patch
+	elif kernel_is 2 4
+	then
+		PATCH=kernel-2.4-layer7-2.9.patch
+	else
+		die "No L7-filter patch for Kernel version ${KV_FULL} - sorry not supported"
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	pkg_preinstall
+	pkg_postinst
+}
+
+src_unpack() {
+
+	which_patch
+
+	if [ -f ${KV_DIR}/include/linux/netfilter_ipv4/ipt_layer7.h ]
+	then
+		ewarn "already installed ${PN} for kernel ${KV_FULL}"
+		ewarn "If this is an upgrade attempt, try unmerging first."
+		ewarn "If this failes remove your kernel source from /usr/src"
+		ewarn "and remerge your kernel sources"
+		die
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	[ ! -f "${S}/${PATCH}" ] && \
+		die "patch ${PATCH} not found. Please enter a bug at bugs.gentoo.org"
+
+
+	cd ${S}
+
+	mkdir  kernel
+	mkdir  kernel/Documentation
+
+
+	# create needed directories
+	mkdir -p ${S}/kernel/net/ipv4/netfilter/regexp/
+	mkdir -p ${S}/kernel/include/linux/netfilter_ipv4/
+
+	cd ${KV_DIR}
+
+	# start to copy needed files, if file not exists create an empty file
+	FILES=$(patch -t --dry-run -p1 < ${S}/${PATCH} | grep "^patching file" | cut -f 3 -d ' ')
+	for F in ${FILES};
+	do
+		if [ -f "${F}" ];
+		then
+			cp -P "${F}" "${S}/kernel/${F}"
+		else
+			touch "${S}/kernel/${F}"
+		fi
+	done
+
+	#patch the copied kernel source
+	cd ${S}/kernel
+	EPATCH_OPTS="-F 3" epatch "${S}/${PATCH}"
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=106009#c5
+	if kernel_is eq 2 6 12
+	then
+		epatch "${DISTDIR}"/additional_patch_for_2.6.13.diff
+	fi
+}
+
+src_compile() {
+	einfo "no compiling - just patching source"
+}
+
+src_install() {
+	insinto "$(/bin/readlink -f ${KV_DIR})"
+	doins -r kernel/*
+	dodoc CHANGELOG README
+}
+
+pkg_preinstall() {
+	if has collision-protect ${FEATURES}; then
+		ewarn
+		ewarn "Collisions are expected as this patches kernel code. Disable"
+		ewarn "FEATURES=collision-protect before use"
+		die 'incompatible FEATURES=collision-protect'
+	fi
+}
+
+pkg_postinst() {
+	ewarn "This may not work with all kernels. If it does not work please enter a bug at bugs.gentoo.org"
+	ewarn "This only patches the current kernel source code. (${KV_DIR})"
+	ewarn "Its up to you to recompile the kernel with the l7 options"
+	ewarn
+	ewarn 'You will also need to emerge iptables with the "extensions" or'
+	ewarn '"l7filter" USE flag (depend which version of iptables you emerge)'
+}
+
+#
+# Unpatching of patched files is required to avoid a broken kernel source tree
+
+pkg_prerm() {
+	# How to determine what version it was installed against? - measily
+	eval $(/bin/fgrep KV=2 ${ROOT}/var/db/pkg/net-misc/${PF}/environment |\
+		/bin/head -1)
+	KV_DIR=/usr/src/linux-"${KV}"
+	if [ -d  ${KV_DIR} ]; then
+		ewarn "${KV_DIR} nolonger exists"
+		return 0;
+	fi
+	echo "KV_DIR=$KV_DIR"
+	if [ -f ${KV_DIR}/include/linux/netfilter_ipv4/ipt_layer7.h ]
+	then
+		einfo 'attempting to unpatch l7-patch from kernel ${KV_FULL}'
+		which_patch
+		if kernel_is eq 2 6 12
+		then
+
+				patch -F 3 -d "${KV_DIR}" -R -p1 \
+					<	"${DISTDIR}"/additional_patch_for_2.6.13.diff
+		fi
+		cd "${T}"
+		unpack ${MY_P}.tar.gz
+		EPATCH_SINGLE_MSG="removing previous patch" \
+			EPATCH_OPTS="-F 3 -d "${KV_DIR}" -R" epatch "${T}/${MY_P}/${PATCH}"
+	fi
+}