From a703331379e59aa44a920136942e5ecb9c12c4ac Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sun, 4 Jun 2006 13:01:26 +0000 Subject: version bump as per bug #133017 thanks Hod. 2.1_p1 used wrong patch name with 2.4 kernels that has been fixed (Portage version: 2.1_rc4) --- net-misc/l7-filter/ChangeLog | 9 +- net-misc/l7-filter/files/digest-l7-filter-2.2 | 6 ++ net-misc/l7-filter/l7-filter-2.1_p1.ebuild | 4 +- net-misc/l7-filter/l7-filter-2.2.ebuild | 133 ++++++++++++++++++++++++++ 4 files changed, 149 insertions(+), 3 deletions(-) create mode 100644 net-misc/l7-filter/files/digest-l7-filter-2.2 create mode 100644 net-misc/l7-filter/l7-filter-2.2.ebuild (limited to 'net-misc') diff --git a/net-misc/l7-filter/ChangeLog b/net-misc/l7-filter/ChangeLog index f270a4323bae..543a0b35502d 100644 --- a/net-misc/l7-filter/ChangeLog +++ b/net-misc/l7-filter/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/l7-filter # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.25 2006/05/02 12:14:54 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.26 2006/06/04 13:01:26 dragonheart Exp $ + +*l7-filter-2.2 (04 Jun 2006) + + 04 Jun 2006; Daniel Black + l7-filter-2.1_p1.ebuild, +l7-filter-2.2.ebuild: + version bump as per bug #133017 thanks Hod. 2.1_p1 used wrong patch name + with 2.4 kernels that has been fixed *l7-filter-2.1_p1 (02 May 2006) diff --git a/net-misc/l7-filter/files/digest-l7-filter-2.2 b/net-misc/l7-filter/files/digest-l7-filter-2.2 new file mode 100644 index 000000000000..b14680a3f2bd --- /dev/null +++ b/net-misc/l7-filter/files/digest-l7-filter-2.2 @@ -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 b590a0f6fe809f8e1852ee96687644f9 netfilter-layer7-v2.2.tar.gz 88944 +RMD160 cf421e6ef4acf5b9107feacaee6566d55ad21683 netfilter-layer7-v2.2.tar.gz 88944 +SHA256 e82cc356ece2bea3da2bb4b467063a96337ced4bde6127a44f0296245e74d57d netfilter-layer7-v2.2.tar.gz 88944 diff --git a/net-misc/l7-filter/l7-filter-2.1_p1.ebuild b/net-misc/l7-filter/l7-filter-2.1_p1.ebuild index a2137b074271..3d69948ef7f6 100644 --- a/net-misc/l7-filter/l7-filter-2.1_p1.ebuild +++ b/net-misc/l7-filter/l7-filter-2.1_p1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.1_p1.ebuild,v 1.1 2006/05/02 12:14:54 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-2.1_p1.ebuild,v 1.2 2006/06/04 13:01:26 dragonheart Exp $ inherit linux-info eutils @@ -33,7 +33,7 @@ which_patch() { PATCH=for_older_kernels/kernel-2.6.9-2.6.10-layer7-1.2.patch elif kernel_is 2 4 then - PATCH=kernel-2.4-layer7-2.0.patch + PATCH=kernel-2.4-layer7-2.1.patch else die "No L7-filter patch for Kernel version ${KV_FULL} - sorry not supported" fi diff --git a/net-misc/l7-filter/l7-filter-2.2.ebuild b/net-misc/l7-filter/l7-filter-2.2.ebuild new file mode 100644 index 000000000000..e7e807dc7304 --- /dev/null +++ b/net-misc/l7-filter/l7-filter-2.2.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2006 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.2.ebuild,v 1.1 2006/06/04 13:01:26 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 ~ppc ~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 13 + then + PATCH=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 2 4 + then + PATCH=kernel-2.4-layer7-2.2.patch + else + die "No L7-filter patch for Kernel version ${KV_FULL} - sorry not supported" + fi +} + +pkg_setup() { + 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 "${KV_DIR}" + doins -r kernel/* + dodoc CHANGELOG README +} + + +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" USE flag' +} + +pkg_prerm() { + if [ -f ${ROOT}/usr/src/linux/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 ${ROOT}/usr/src/linux -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 ${ROOT}/usr/src/linux -R" epatch "${T}/${MY_P}/${PATCH}" + fi +} -- cgit v1.2.3-65-gdbad