From 1843af4da4906551559f5fad4253dce0abd9b65c Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Thu, 26 Apr 2007 21:13:56 +0000 Subject: [PATCH] remove 1.226, 250 is as stable as 226. Add patch for 'group with', fixes Bug 171719, thanks to Marshal Newrock for the patch. Use newconfd, fixes Bug 174266. Package-Manager: portage-2.1.2.3 --- net-firewall/firehol/ChangeLog | 11 +++++++- net-firewall/firehol/Manifest | 26 ++++++++++-------- ...rehol-1.226-r1 => digest-firehol-1.250-r1} | 0 .../files/firehol-1.250-groupwith.patch | 27 +++++++++++++++++++ ....226-r1.ebuild => firehol-1.250-r1.ebuild} | 21 +++++++++------ 5 files changed, 65 insertions(+), 20 deletions(-) rename net-firewall/firehol/files/{digest-firehol-1.226-r1 => digest-firehol-1.250-r1} (100%) create mode 100644 net-firewall/firehol/files/firehol-1.250-groupwith.patch rename net-firewall/firehol/{firehol-1.226-r1.ebuild => firehol-1.250-r1.ebuild} (77%) diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog index 5c3e67291334..589c22e1b9d5 100644 --- a/net-firewall/firehol/ChangeLog +++ b/net-firewall/firehol/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-firewall/firehol # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.25 2007/02/03 18:17:17 centic Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.26 2007/04/26 21:13:56 centic Exp $ + +*firehol-1.250-r1 (26 Apr 2007) + + 26 Apr 2007; Dominik Stadler + +files/firehol-1.250-groupwith.patch, -firehol-1.226-r1.ebuild, + +firehol-1.250-r1.ebuild: + remove 1.226, 250 is as stable as 226. Add patch for 'group with', fixes Bug + 171719, thanks to Marshal Newrock for the patch. Use newconfd, fixes Bug + 174266. 26 Jan 2007; Dominik Stadler firehol-1.226-r1.ebuild, firehol-1.250.ebuild: diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest index bcd73bd48d76..7a797cb8f7df 100644 --- a/net-firewall/firehol/Manifest +++ b/net-firewall/firehol/Manifest @@ -6,6 +6,10 @@ AUX firehol-1.226-to-250.patch 23787 RMD160 7bce13d4a5b723b3a2cc84d9e9a98b27b5e6 MD5 8ed853939b98c15d4852155c6e8f39ab files/firehol-1.226-to-250.patch 23787 RMD160 7bce13d4a5b723b3a2cc84d9e9a98b27b5e6b7b7 files/firehol-1.226-to-250.patch 23787 SHA256 9f6f7062f46e64b1a49f4e1a3d226af6c493aa433ec20552f1a67cec33671296 files/firehol-1.226-to-250.patch 23787 +AUX firehol-1.250-groupwith.patch 1005 RMD160 ca56cbd4abad50a0203c520ae62b255266aa104e SHA1 061ffcc50dcb605faf882a7cbfb5c59205356e8d SHA256 6d56366f16b53209e9944fffcac65de6300264d6ba35575643af3bcd45522029 +MD5 611208f49aee32d60953baafa22e12cd files/firehol-1.250-groupwith.patch 1005 +RMD160 ca56cbd4abad50a0203c520ae62b255266aa104e files/firehol-1.250-groupwith.patch 1005 +SHA256 6d56366f16b53209e9944fffcac65de6300264d6ba35575643af3bcd45522029 files/firehol-1.250-groupwith.patch 1005 AUX firehol-1.250-printf.patch 1496 RMD160 df025b1bf110ba50b2d8060a145aa79af39a8b26 SHA1 a3450b2b3c94c94be4f64aebdbdbf6a0fc5e3b19 SHA256 35ab81db53612f938ca37f592d85e68260573084c34b598a7c4254b3d3fab071 MD5 bfaa62f4b3eb2956611c1085e61ca673 files/firehol-1.250-printf.patch 1496 RMD160 df025b1bf110ba50b2d8060a145aa79af39a8b26 files/firehol-1.250-printf.patch 1496 @@ -19,25 +23,25 @@ MD5 9217f80319c21b460ace2c676d2a8430 files/firehol.initrd 1212 RMD160 2c683cc4064d5cbc357c7f1a3da10eb7306ed94c files/firehol.initrd 1212 SHA256 dbba1eafc4b3bff40f187eb2f83051529e30a35fd5bc04409278b6d3e8b92015 files/firehol.initrd 1212 DIST firehol-1.226.tar.bz2 118113 RMD160 bff910e8a3a67ce91f0634177b5ee361edc90e96 SHA1 c54496bc0cadb6d9728738e826464cf35cf7b96e SHA256 b434e8142eb4093516794c6f2213d03efa3c08161758ff836dbd266f0a9438cf -EBUILD firehol-1.226-r1.ebuild 2014 RMD160 b8cd5fec5c2e66cc85cc6e34995c5535c5a3c77c SHA1 1ef333a643aa0e69ece2257432936a60a551cda7 SHA256 483726863400b6b61681395a0a2c36a6a8f8b17de6c328891627be1e6c1bb88a -MD5 cba5136997b0b7a1acccdc86964b2be1 firehol-1.226-r1.ebuild 2014 -RMD160 b8cd5fec5c2e66cc85cc6e34995c5535c5a3c77c firehol-1.226-r1.ebuild 2014 -SHA256 483726863400b6b61681395a0a2c36a6a8f8b17de6c328891627be1e6c1bb88a firehol-1.226-r1.ebuild 2014 +EBUILD firehol-1.250-r1.ebuild 2202 RMD160 d5544cf5d0c78cb8afc0e893b7df6189bf5342f6 SHA1 ad175a662cdd008525bdd4efd1b8fcd79bd924c9 SHA256 a03ef7f26e6f8fe5bece839478affcb71fe81cbdee32c8af319ea38deb3e0814 +MD5 8387d363f23d950ffbeec5002de3fd6d firehol-1.250-r1.ebuild 2202 +RMD160 d5544cf5d0c78cb8afc0e893b7df6189bf5342f6 firehol-1.250-r1.ebuild 2202 +SHA256 a03ef7f26e6f8fe5bece839478affcb71fe81cbdee32c8af319ea38deb3e0814 firehol-1.250-r1.ebuild 2202 EBUILD firehol-1.250.ebuild 2189 RMD160 26bc3e9016821f67583a76edd5a72a14f098bd62 SHA1 81b44dcec4b74f0ee095a54d49d99fd1f749558e SHA256 25abfcd5ec4b385f75f9aaf7c67b7c415235a0f9f645fa5a35130ebbf290cc9f MD5 e03abd7543edb480038a7c206e7bd1b1 firehol-1.250.ebuild 2189 RMD160 26bc3e9016821f67583a76edd5a72a14f098bd62 firehol-1.250.ebuild 2189 SHA256 25abfcd5ec4b385f75f9aaf7c67b7c415235a0f9f645fa5a35130ebbf290cc9f firehol-1.250.ebuild 2189 -MISC ChangeLog 4822 RMD160 b9d7f8da9514aeb4cb62c238449a6b2aa3733e96 SHA1 5ac66f71d712e250e0592c4441e136fce015e047 SHA256 de6bffc1fce8317db490ea3f05a8db1df0e8f95aca9ac98d9f2fbc2999181893 -MD5 54f28338281e6b9a04e65153d7bb19d3 ChangeLog 4822 -RMD160 b9d7f8da9514aeb4cb62c238449a6b2aa3733e96 ChangeLog 4822 -SHA256 de6bffc1fce8317db490ea3f05a8db1df0e8f95aca9ac98d9f2fbc2999181893 ChangeLog 4822 +MISC ChangeLog 5165 RMD160 643e7a30ba9a377edf431504e206328458d9bcba SHA1 7de970d2df06817d71502cefbe43c57d1e7e9f47 SHA256 d5aaa0b45a723576cba9fbd8e084fa864f74a54000e066044e521f68c4adc5f8 +MD5 3d5cc58f8c1d4766199527a2c9dc6457 ChangeLog 5165 +RMD160 643e7a30ba9a377edf431504e206328458d9bcba ChangeLog 5165 +SHA256 d5aaa0b45a723576cba9fbd8e084fa864f74a54000e066044e521f68c4adc5f8 ChangeLog 5165 MISC metadata.xml 232 RMD160 d8974ec04155ee7c05c49808735fe6d6cca0a541 SHA1 b417ff2a1791163c7ef78c244c84f4ac0dd28396 SHA256 1ee782bb36d2551c41eb7f4dafc946ea2699771f4ea724cca4363b69eb4e84d4 MD5 4086491e8b7c76b8138dc140f7742978 metadata.xml 232 RMD160 d8974ec04155ee7c05c49808735fe6d6cca0a541 metadata.xml 232 SHA256 1ee782bb36d2551c41eb7f4dafc946ea2699771f4ea724cca4363b69eb4e84d4 metadata.xml 232 -MD5 307ce774f075b24a9f1c58d191f0aa17 files/digest-firehol-1.226-r1 244 -RMD160 46fa3ffb007c7979d8261ed9eb2ba932fd6046bf files/digest-firehol-1.226-r1 244 -SHA256 33e71811998e454a012d49facc452e1abb8b05c90cf563ce8faf583426f04410 files/digest-firehol-1.226-r1 244 MD5 307ce774f075b24a9f1c58d191f0aa17 files/digest-firehol-1.250 244 RMD160 46fa3ffb007c7979d8261ed9eb2ba932fd6046bf files/digest-firehol-1.250 244 SHA256 33e71811998e454a012d49facc452e1abb8b05c90cf563ce8faf583426f04410 files/digest-firehol-1.250 244 +MD5 307ce774f075b24a9f1c58d191f0aa17 files/digest-firehol-1.250-r1 244 +RMD160 46fa3ffb007c7979d8261ed9eb2ba932fd6046bf files/digest-firehol-1.250-r1 244 +SHA256 33e71811998e454a012d49facc452e1abb8b05c90cf563ce8faf583426f04410 files/digest-firehol-1.250-r1 244 diff --git a/net-firewall/firehol/files/digest-firehol-1.226-r1 b/net-firewall/firehol/files/digest-firehol-1.250-r1 similarity index 100% rename from net-firewall/firehol/files/digest-firehol-1.226-r1 rename to net-firewall/firehol/files/digest-firehol-1.250-r1 diff --git a/net-firewall/firehol/files/firehol-1.250-groupwith.patch b/net-firewall/firehol/files/firehol-1.250-groupwith.patch new file mode 100644 index 000000000000..0ab51fb53472 --- /dev/null +++ b/net-firewall/firehol/files/firehol-1.250-groupwith.patch @@ -0,0 +1,27 @@ +--- firehol.sh 2007-02-27 13:17:40.000000000 -0500 ++++ firehol.new 2007-03-21 16:02:34.000000000 -0400 +@@ -3040,6 +3040,7 @@ + + case $type in + with|start|begin) ++ local direction="${1}" + # increase the counter + FIREHOL_GROUP_COUNTER=$[FIREHOL_GROUP_COUNTER + 1] + +@@ -3053,8 +3054,14 @@ + mychain="group${FIREHOL_GROUP_COUNTER}" + + # create the new chain +- create_chain filter "in_${mychain}" "in_${work_name}" in "$@" || return 1 +- create_chain filter "out_${mychain}" "out_${work_name}" out reverse "$@" || return 1 ++ if [ "$direction" = "src" ] ++ then ++ create_chain filter "in_${mychain}" "in_${work_name}" in "$@" || return 1 ++ create_chain filter "out_${mychain}" "out_${work_name}" out reverse "$@" || return 1 ++ else ++ create_chain filter "in_${mychain}" "in_${work_name}" out reverse "$@" || return 1 ++ create_chain filter "out_${mychain}" "out_${work_name}" in "$@" || return 1 ++ fi + + # set a new name for new rules + work_name=${mychain} diff --git a/net-firewall/firehol/firehol-1.226-r1.ebuild b/net-firewall/firehol/firehol-1.250-r1.ebuild similarity index 77% rename from net-firewall/firehol/firehol-1.226-r1.ebuild rename to net-firewall/firehol/firehol-1.250-r1.ebuild index 3f84058f73f4..eeb9c79a88d2 100644 --- a/net-firewall/firehol/firehol-1.226-r1.ebuild +++ b/net-firewall/firehol/firehol-1.250-r1.ebuild @@ -1,18 +1,20 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.226-r1.ebuild,v 1.6 2007/02/03 18:17:17 centic Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250-r1.ebuild,v 1.1 2007/04/26 21:13:56 centic Exp $ inherit eutils DESCRIPTION="iptables firewall generator" HOMEPAGE="http://firehol.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +SRC_URI="mirror://sourceforge/${PN}/${PN}-1.226.tar.bz2" + LICENSE="GPL-2" SLOT="0" IUSE="" KEYWORDS="~amd64 ~ppc ~sparc x86" +DEPEND="sys-apps/iproute2" RDEPEND="net-firewall/iptables sys-apps/iproute2 virtual/modutils @@ -21,6 +23,8 @@ RDEPEND="net-firewall/iptables net-misc/curl )" +S="${WORKDIR}/${PN}-1.226" + pkg_setup() { # Bug 81600 fail if iproute2 is built with minimal if built_with_use sys-apps/iproute2 minimal; then @@ -36,8 +40,11 @@ pkg_setup() { # backport from firehol-CVS. src_unpack() { unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-to-228.patch || die + cd ${S} || die + epatch ${FILESDIR}/firehol-1.226-to-228.patch || die + epatch ${FILESDIR}/firehol-1.226-to-250.patch || die + epatch ${FILESDIR}/${P}-groupwith.patch || die + epatch ${FILESDIR}/${P}-printf.patch || die } src_install() { @@ -47,8 +54,7 @@ src_install() { insinto /etc/firehol/examples doins examples/* || die - insinto /etc/conf.d - newins ${FILESDIR}/firehol.conf.d firehol || die + newconfd ${FILESDIR}/firehol.conf.d firehol || die dodoc ChangeLog README TODO WhatIsNew || die dohtml doc/*.html doc/*.css || die @@ -58,8 +64,7 @@ src_install() { doman man/*.1 man/*.5 || die - exeinto /etc/init.d - newexe ${FILESDIR}/firehol.initrd firehol || die + newinitd ${FILESDIR}/firehol.initrd firehol || die } pkg_postinst() { -- 2.26.2