summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2007-09-28 19:22:14 +0000
committerPeter Volkov <pva@gentoo.org>2007-09-28 19:22:14 +0000
commita021847b8975993912cef575cc3b8aae1c68d3b8 (patch)
tree64bfba5f030daa737d68e037e6875accfd52997c /net-firewall/ebtables
parentRemoved app-cdr/kover from package.mask as it was just removed from the tree. (diff)
downloadhistorical-a021847b8975993912cef575cc3b8aae1c68d3b8.tar.gz
historical-a021847b8975993912cef575cc3b8aae1c68d3b8.tar.bz2
historical-a021847b8975993912cef575cc3b8aae1c68d3b8.zip
Version bump. Finally init script works, thank Lech Perczak <lech.perczak AT multivision.pl>, bug #189315. Remove old.
Package-Manager: portage-2.1.3.10
Diffstat (limited to 'net-firewall/ebtables')
-rw-r--r--net-firewall/ebtables/ChangeLog12
-rw-r--r--net-firewall/ebtables/Manifest73
-rw-r--r--net-firewall/ebtables/ebtables-2.0.6-r1.ebuild40
-rw-r--r--net-firewall/ebtables/ebtables-2.0.8.2.ebuild (renamed from net-firewall/ebtables/ebtables-2.0.8.1-r1.ebuild)28
-rw-r--r--net-firewall/ebtables/files/README.gentoo.init11
-rw-r--r--net-firewall/ebtables/files/digest-ebtables-2.0.6-r13
-rw-r--r--net-firewall/ebtables/files/digest-ebtables-2.0.8.1-r13
-rw-r--r--net-firewall/ebtables/files/digest-ebtables-2.0.8.23
-rw-r--r--net-firewall/ebtables/files/ebtables-2.0.6-gcc34.patch11
-rw-r--r--net-firewall/ebtables/files/ebtables-2.0.6-gcc4.patch116
-rw-r--r--net-firewall/ebtables/files/ebtables-2.0.8.1-ebt-save.diff31
-rw-r--r--net-firewall/ebtables/files/ebtables.confd4
-rw-r--r--net-firewall/ebtables/files/ebtables.initd21
13 files changed, 90 insertions, 266 deletions
diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
index 5599a80e29db..13ff64578c59 100644
--- a/net-firewall/ebtables/ChangeLog
+++ b/net-firewall/ebtables/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for net-firewall/ebtables
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.18 2007/09/10 19:20:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.19 2007/09/28 19:22:13 pva Exp $
+
+*ebtables-2.0.8.2 (28 Sep 2007)
+
+ 28 Sep 2007; <pva@gentoo.org> -files/ebtables-2.0.6-gcc34.patch,
+ -files/ebtables-2.0.6-gcc4.patch, +files/ebtables-2.0.8.1-ebt-save.diff,
+ -files/README.gentoo.init, files/ebtables.confd, files/ebtables.initd,
+ -ebtables-2.0.6-r1.ebuild, -ebtables-2.0.8.1-r1.ebuild,
+ +ebtables-2.0.8.2.ebuild:
+ Version bump. Finally init script works, thank Lech Perczak <lech.perczak AT
+ multivision.pl>, bug #189315. Remove old.
10 Sep 2007; Markus Meier <maekke@gentoo.org> ebtables-2.0.8.1.ebuild:
stable on x86, wrt bug #191127
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index d5f88ff423ce..b4ec16b7d6ef 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX README.gentoo.init 557 RMD160 1ad092791c090b802d7ae11cd473b731a2e7fa0a SHA1 9da25cd4385f1aa37cef8f9c4a4ca82b092ac743 SHA256 c3aea7645393bf1b9891e2dd5fac3131b2092dc961b6cc8c0c5a4e89de13d8ad
-MD5 63d5633cd26f76a6bc61f8ccfd60f7ba files/README.gentoo.init 557
-RMD160 1ad092791c090b802d7ae11cd473b731a2e7fa0a files/README.gentoo.init 557
-SHA256 c3aea7645393bf1b9891e2dd5fac3131b2092dc961b6cc8c0c5a4e89de13d8ad files/README.gentoo.init 557
-AUX ebtables-2.0.6-gcc34.patch 272 RMD160 c8268bc36d0a28cef499007c2b592cfc424a1671 SHA1 be4e49f857b29ed63df495cbafc204ab639f8206 SHA256 22fb00782948060f5350c5a7f0cd0414eb4e47d688e10af93dc7b27cb9f268a4
-MD5 0488ef6b4eb8aa41352527597cb5d2ad files/ebtables-2.0.6-gcc34.patch 272
-RMD160 c8268bc36d0a28cef499007c2b592cfc424a1671 files/ebtables-2.0.6-gcc34.patch 272
-SHA256 22fb00782948060f5350c5a7f0cd0414eb4e47d688e10af93dc7b27cb9f268a4 files/ebtables-2.0.6-gcc34.patch 272
-AUX ebtables-2.0.6-gcc4.patch 3966 RMD160 8df9ff094abcfe3c0c4c03b02997efacb542d6b0 SHA1 7a3db01e5dd7aa39dacf5d069bf7731bbf302bb6 SHA256 cbb3d36e1e2d511696e4ecd9e63450c7e495a3b629f96c62464046750ffaf411
-MD5 49410b65a0fadade808e745f1e309bb9 files/ebtables-2.0.6-gcc4.patch 3966
-RMD160 8df9ff094abcfe3c0c4c03b02997efacb542d6b0 files/ebtables-2.0.6-gcc4.patch 3966
-SHA256 cbb3d36e1e2d511696e4ecd9e63450c7e495a3b629f96c62464046750ffaf411 files/ebtables-2.0.6-gcc4.patch 3966
+AUX ebtables-2.0.8.1-ebt-save.diff 1089 RMD160 d36bd4ee1f9c5640d960e0b537829faade9251c4 SHA1 efad4c40e92b42d59e044c78945aed00ef756ed8 SHA256 b4d7022a616152ca439d2b09f14fda8a3ef479b823c2da44eb0e9e22b256be90
+MD5 705da51523fa0dff11aa654d52b1578d files/ebtables-2.0.8.1-ebt-save.diff 1089
+RMD160 d36bd4ee1f9c5640d960e0b537829faade9251c4 files/ebtables-2.0.8.1-ebt-save.diff 1089
+SHA256 b4d7022a616152ca439d2b09f14fda8a3ef479b823c2da44eb0e9e22b256be90 files/ebtables-2.0.8.1-ebt-save.diff 1089
AUX ebtables-2.0.8.1-fix-textrel.patch 521 RMD160 7beb8cb14452ea33f622337d52dc9be354fb6c33 SHA1 f583e95e28c826d70ded4f96192e49205cab33ea SHA256 5fb4884ea95b5bc03a358eba8500a6c8b3c52b99ebc04e819f6ad925472d6b52
MD5 24865a3af0d70f1ae8092afb436adda1 files/ebtables-2.0.8.1-fix-textrel.patch 521
RMD160 7beb8cb14452ea33f622337d52dc9be354fb6c33 files/ebtables-2.0.8.1-fix-textrel.patch 521
@@ -21,49 +10,35 @@ AUX ebtables-2.0.8.1-scripts-build.patch 2628 RMD160 2d24b35c57231d06856bf6306b6
MD5 8443ec9a3253bae8f2644563e02133d7 files/ebtables-2.0.8.1-scripts-build.patch 2628
RMD160 2d24b35c57231d06856bf6306b642cc8bd1ba298 files/ebtables-2.0.8.1-scripts-build.patch 2628
SHA256 1d915fd72a90af6763009f801c7c4ef42a1deb82cd516cc09dc888b1de3f0916 files/ebtables-2.0.8.1-scripts-build.patch 2628
-AUX ebtables.confd 288 RMD160 97d8fd8a00b48d70881aff05c1fa533e1da7172b SHA1 89b16bf882290bfc31c890948245552da5b26b4d SHA256 c05a6c1ba6add3881068584074681b04bfb2ad43284d7bdd67f47f3da842de58
-MD5 80ef574ef544679290108e73d2f2f377 files/ebtables.confd 288
-RMD160 97d8fd8a00b48d70881aff05c1fa533e1da7172b files/ebtables.confd 288
-SHA256 c05a6c1ba6add3881068584074681b04bfb2ad43284d7bdd67f47f3da842de58 files/ebtables.confd 288
-AUX ebtables.initd 2380 RMD160 9cf91a08f1eeec6107c997751cacc217dc9e1e65 SHA1 f90805820a9774591d32f52e27c0893e6a496dbc SHA256 30d3c07aed4719b6041e2ccc2ba97b41edc6fa3b61b406450b6e70d3a33e922a
-MD5 d8312cb4bb8301b145e0639982e15a05 files/ebtables.initd 2380
-RMD160 9cf91a08f1eeec6107c997751cacc217dc9e1e65 files/ebtables.initd 2380
-SHA256 30d3c07aed4719b6041e2ccc2ba97b41edc6fa3b61b406450b6e70d3a33e922a files/ebtables.initd 2380
-DIST ebtables-v2.0.6.tar.gz 71411 RMD160 832935fbfda5a42382ce0450ac0b1fd964eb1d7a SHA1 6a4e4ea6824440ffc5d052280eb622b5da33a065 SHA256 6b5a71790120977a96d5a468ed69987107c5079f14b0a4081f460b3b14fbf952
+AUX ebtables.confd 466 RMD160 84f7bea9b78ae9fab08cc446c1cd64e74fe4e4f9 SHA1 2bf5e4db2fde07a9791c43cb27575aefe30cc895 SHA256 fa8dedd95f1a6834022e409754e1e41219a7671a1bbb99b2094356239135730d
+MD5 285089ba2d846e72e321a12e3da3cc96 files/ebtables.confd 466
+RMD160 84f7bea9b78ae9fab08cc446c1cd64e74fe4e4f9 files/ebtables.confd 466
+SHA256 fa8dedd95f1a6834022e409754e1e41219a7671a1bbb99b2094356239135730d files/ebtables.confd 466
+AUX ebtables.initd 2078 RMD160 da8ca12a06bf4134436b8c858b022935b95f7ab4 SHA1 d8d3628cbdc251d22558fc5761be95d012586f7f SHA256 14d443045dc1f9a3da84a4dc07040ac8a6d6042a2d87305b9eeca8495703cb53
+MD5 92e13b3bc1d47d7c00636ebb78c905d5 files/ebtables.initd 2078
+RMD160 da8ca12a06bf4134436b8c858b022935b95f7ab4 files/ebtables.initd 2078
+SHA256 14d443045dc1f9a3da84a4dc07040ac8a6d6042a2d87305b9eeca8495703cb53 files/ebtables.initd 2078
DIST ebtables-v2.0.8-1.tar.gz 96681 RMD160 0ff0f5aeaa418157b0e791dfbe93450ef323da51 SHA1 c70f012f274bfc277ee51f98fcffe0bfbbd36725 SHA256 e33edf08d5ae7974d3575f62468a981cc42afb1164bde3f0402e08fcfc404f74
-EBUILD ebtables-2.0.6-r1.ebuild 1078 RMD160 c95ca2a0e2c6ac332fa3acb3a17d859504003ce5 SHA1 f585294c1339baf680ec76315818447746d65913 SHA256 d02473154fe73de3151a305c202a52879d1886148150a92c47464a24cca8c4d9
-MD5 f46853e4836f1ca11777856105da44e8 ebtables-2.0.6-r1.ebuild 1078
-RMD160 c95ca2a0e2c6ac332fa3acb3a17d859504003ce5 ebtables-2.0.6-r1.ebuild 1078
-SHA256 d02473154fe73de3151a305c202a52879d1886148150a92c47464a24cca8c4d9 ebtables-2.0.6-r1.ebuild 1078
-EBUILD ebtables-2.0.8.1-r1.ebuild 1726 RMD160 bad676911536292eeb61a2e6871f4ad7d36e15ca SHA1 9ef6ae687aea232ad080a4f6d4df6ab476b9a689 SHA256 9a9439e0740cde3e0f582cffbd42cf65b854ab829c2a0ba9bcb4b84982ab12cc
-MD5 6ef8eac5573f4142aec434d5691637d1 ebtables-2.0.8.1-r1.ebuild 1726
-RMD160 bad676911536292eeb61a2e6871f4ad7d36e15ca ebtables-2.0.8.1-r1.ebuild 1726
-SHA256 9a9439e0740cde3e0f582cffbd42cf65b854ab829c2a0ba9bcb4b84982ab12cc ebtables-2.0.8.1-r1.ebuild 1726
+DIST ebtables-v2.0.8-2.tar.gz 97065 RMD160 b53fca7e2f34dd23ecb11af3804fa10c1702e815 SHA1 3e9331a55e02f0930047b7198501f380ebf6c2d9 SHA256 dd78c0dfa0dbeb128952dec9e916be948bf561dcb8ba3149ea7ce0166a2caf9b
EBUILD ebtables-2.0.8.1.ebuild 1404 RMD160 29da7f6ec874a262ba0b4438e80f8ab291c95f69 SHA1 5891699d67fe5d8948067796a8444d39757132cd SHA256 13238c274e8ef397c07c9e16230530f62575588f4ecd059705b5ca0a3a0d905c
MD5 1114ca4a5ae8370dbf696b74473fad2a ebtables-2.0.8.1.ebuild 1404
RMD160 29da7f6ec874a262ba0b4438e80f8ab291c95f69 ebtables-2.0.8.1.ebuild 1404
SHA256 13238c274e8ef397c07c9e16230530f62575588f4ecd059705b5ca0a3a0d905c ebtables-2.0.8.1.ebuild 1404
-MISC ChangeLog 2866 RMD160 7a2ad9394deb869d061e3164560e58f89a7b7c33 SHA1 14ddb3a6096aa68bce8b1f8f05ed244c85c11a0c SHA256 7aa6904b8fb16c748800fccc0a0c97a1819f637fa40ebd74cde6c0f5fa2c0fed
-MD5 81a64404bb554068a80a0308076e4398 ChangeLog 2866
-RMD160 7a2ad9394deb869d061e3164560e58f89a7b7c33 ChangeLog 2866
-SHA256 7aa6904b8fb16c748800fccc0a0c97a1819f637fa40ebd74cde6c0f5fa2c0fed ChangeLog 2866
+EBUILD ebtables-2.0.8.2.ebuild 1546 RMD160 1ef2f3bbddeb5d3c8a1aed14df1113295cc21cf9 SHA1 b067a53a73e3087d5cd0c4266f3661127a72e09a SHA256 df2be016cc458ce12377d93efa7862c0a05728c71877a794b9639590504c7120
+MD5 b01dc906e890082e5daff01ee38e634f ebtables-2.0.8.2.ebuild 1546
+RMD160 1ef2f3bbddeb5d3c8a1aed14df1113295cc21cf9 ebtables-2.0.8.2.ebuild 1546
+SHA256 df2be016cc458ce12377d93efa7862c0a05728c71877a794b9639590504c7120 ebtables-2.0.8.2.ebuild 1546
+MISC ChangeLog 3321 RMD160 a7df9942384f91de3fccc52777c36f7a8f762302 SHA1 7bd829c374a21d65f23707535acf9d50cdb4d2d2 SHA256 eef41025f3a6e4c9c239567a3bbaa30d8e841d9366c73f82b5ab804bb97bb79e
+MD5 4e2e843fbbde32f1a1a294e63b759e05 ChangeLog 3321
+RMD160 a7df9942384f91de3fccc52777c36f7a8f762302 ChangeLog 3321
+SHA256 eef41025f3a6e4c9c239567a3bbaa30d8e841d9366c73f82b5ab804bb97bb79e ChangeLog 3321
MISC metadata.xml 251 RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 SHA1 6bf96c40f48fb4f92026dd80b7b3e1ce7ebdc9d1 SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504
MD5 26ae4c6a179a2e2cc5c19c56e978861d metadata.xml 251
RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 metadata.xml 251
SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504 metadata.xml 251
-MD5 10aca2434836b1c3a10c639838101578 files/digest-ebtables-2.0.6-r1 244
-RMD160 6cdb583c3a517500fe78b5911707723091f90090 files/digest-ebtables-2.0.6-r1 244
-SHA256 24df33cfa531bd07d2591bf5e0b08638abeff981c0186557592e12ac33a1e118 files/digest-ebtables-2.0.6-r1 244
MD5 c81b75dddac491771c6b189a3cb7a593 files/digest-ebtables-2.0.8.1 250
RMD160 2fec252859b3a19da36ce94a85ddffe2562c79e0 files/digest-ebtables-2.0.8.1 250
SHA256 cfb0bea2dc82ea6eb4a6f1879d783c62f683350662f4218fa3f592816fbdd630 files/digest-ebtables-2.0.8.1 250
-MD5 c81b75dddac491771c6b189a3cb7a593 files/digest-ebtables-2.0.8.1-r1 250
-RMD160 2fec252859b3a19da36ce94a85ddffe2562c79e0 files/digest-ebtables-2.0.8.1-r1 250
-SHA256 cfb0bea2dc82ea6eb4a6f1879d783c62f683350662f4218fa3f592816fbdd630 files/digest-ebtables-2.0.8.1-r1 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFG5ZlAkKaRLQcq0GIRAkCjAKCR/+ni7TQ1rhvgeOu3XjASo/7mqwCglRFR
-DlCV69YYoDWsQSagZBJqIVo=
-=l+Ew
------END PGP SIGNATURE-----
+MD5 55009e1d06dd9144d2c11561d8f3e65d files/digest-ebtables-2.0.8.2 250
+RMD160 e7d5c170a659005953fdf8a0aae5385da09c5c95 files/digest-ebtables-2.0.8.2 250
+SHA256 4cea6be35b0ecab76f0b4bc36e89e2077e2e5dc24ffad5ef455635f391c7631b files/digest-ebtables-2.0.8.2 250
diff --git a/net-firewall/ebtables/ebtables-2.0.6-r1.ebuild b/net-firewall/ebtables/ebtables-2.0.6-r1.ebuild
deleted file mode 100644
index b98c14884b38..000000000000
--- a/net-firewall/ebtables/ebtables-2.0.6-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.6-r1.ebuild,v 1.3 2006/08/25 18:52:01 wolf31o2 Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://ebtables.sourceforge.net/"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="virtual/libc"
-
-src_compile() {
- emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- # fix "label at end of compound statement" error that
- # prevents ebtables from being compilable with >=gcc-3.4
- epatch ${FILESDIR}/ebtables-2.0.6-gcc34.patch
-
- # ebtables does not build with gcc-4.x; Bug #119489
- epatch ${FILESDIR}/ebtables-2.0.6-gcc4.patch
-}
-
-src_install() {
- dodir /sbin/
- einstall MANDIR=${D}/usr/share/man ETHERTYPESPATH=${D}/etc/ BINPATH=${D}/sbin/ || die
-}
diff --git a/net-firewall/ebtables/ebtables-2.0.8.1-r1.ebuild b/net-firewall/ebtables/ebtables-2.0.8.2.ebuild
index 0edc61c0b328..5a66f25aa48f 100644
--- a/net-firewall/ebtables/ebtables-2.0.8.1-r1.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.8.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.8.1-r1.ebuild,v 1.1 2007/09/02 10:02:35 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.8.2.ebuild,v 1.1 2007/09/28 19:22:13 pva Exp $
inherit versionator eutils toolchain-funcs multilib
@@ -15,25 +15,20 @@ IUSE=""
LICENSE="GPL-2"
SLOT="0"
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="virtual/libc"
+S=${WORKDIR}/${MY_P}
src_unpack() {
unpack ${A}
cd "${S}"
- # Kill two rabits: TEXTREL and compilation on amd64. bug #159371.
- epatch "${FILESDIR}"/${P}-fix-textrel.patch
-
- # Fix scripts to be built during make, thus paths inside are correct.
- epatch "${FILESDIR}"/${P}-scripts-build.patch
+ # Enchance ebtables-save to take table names as parameters bug #189315
+ epatch "${FILESDIR}"/${PN}-2.0.8.1-ebt-save.diff
- sed -i -e "s,MANDIR:=/usr/local/man,MANDIR:=/usr/share/man," \
- -e "s,BINDIR:=/usr/local/sbin,BINDIR:=/sbin," \
- -e "s,INITDIR:=/etc/rc.d/init.d,INITDIR:=/usr/share/doc/${PF}," \
- -e "s,SYSCONFIGDIR:=/etc/sysconfig,SYSCONFIGDIR:=/usr/share/doc/${PF}," \
- -e "s,LIBDIR:=/usr/lib,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile
+ sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \
+ -e "s,^BINDIR:=.*,BINDIR:=/sbin," \
+ -e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/${PF}," \
+ -e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/${PF}," \
+ -e "s,^LIBDIR:=.*,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile
}
src_compile() {
@@ -43,9 +38,10 @@ src_compile() {
src_install() {
dodoc ChangeLog THANKS
make DESTDIR="${D}" install || die
+ keepdir /var/lib/ebtables/
- insinto /usr/share/doc/${PF}/init-scripts
- doins "${FILESDIR}"/{ebtables.confd,ebtables.initd,README.gentoo.init}
+ newinitd "${FILESDIR}"/ebtables.initd ebtables
+ newconfd "${FILESDIR}"/ebtables.confd ebtables
}
pkg_postinst() {
diff --git a/net-firewall/ebtables/files/README.gentoo.init b/net-firewall/ebtables/files/README.gentoo.init
deleted file mode 100644
index 1fc6b180b772..000000000000
--- a/net-firewall/ebtables/files/README.gentoo.init
+++ /dev/null
@@ -1,11 +0,0 @@
-ebtables.initd and ebtables.confd are init script and its configuration file.
-
-If you want to use this run the following commands:
-# cd /usr/share/doc/ebtables*/init-scripts
-# cp ebtables.initd /etc/init.d/ebtables
-# cp ebtables.confd /etc/conf.d/ebtables
-
-Note: we are not suppling them by default and you have to put them into
-/etc/{init.d,conf.d} directories by yourself as they are NOT working in case
-ebtables kernel components are NOT built as modules. If you build ebtables
-kernel components as modules they should work. See bugs.gentoo.org/189315 .
diff --git a/net-firewall/ebtables/files/digest-ebtables-2.0.6-r1 b/net-firewall/ebtables/files/digest-ebtables-2.0.6-r1
deleted file mode 100644
index 295a220302db..000000000000
--- a/net-firewall/ebtables/files/digest-ebtables-2.0.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c4559af2366c764c6c42a3fdd40d60d3 ebtables-v2.0.6.tar.gz 71411
-RMD160 832935fbfda5a42382ce0450ac0b1fd964eb1d7a ebtables-v2.0.6.tar.gz 71411
-SHA256 6b5a71790120977a96d5a468ed69987107c5079f14b0a4081f460b3b14fbf952 ebtables-v2.0.6.tar.gz 71411
diff --git a/net-firewall/ebtables/files/digest-ebtables-2.0.8.1-r1 b/net-firewall/ebtables/files/digest-ebtables-2.0.8.1-r1
deleted file mode 100644
index 1d64e3bc0cbc..000000000000
--- a/net-firewall/ebtables/files/digest-ebtables-2.0.8.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 216e5d20fbd0e56dbe7e56b0d07b1909 ebtables-v2.0.8-1.tar.gz 96681
-RMD160 0ff0f5aeaa418157b0e791dfbe93450ef323da51 ebtables-v2.0.8-1.tar.gz 96681
-SHA256 e33edf08d5ae7974d3575f62468a981cc42afb1164bde3f0402e08fcfc404f74 ebtables-v2.0.8-1.tar.gz 96681
diff --git a/net-firewall/ebtables/files/digest-ebtables-2.0.8.2 b/net-firewall/ebtables/files/digest-ebtables-2.0.8.2
new file mode 100644
index 000000000000..a44dfe6e5173
--- /dev/null
+++ b/net-firewall/ebtables/files/digest-ebtables-2.0.8.2
@@ -0,0 +1,3 @@
+MD5 66bcbcb2dcf3b981ad4e86e1720e796e ebtables-v2.0.8-2.tar.gz 97065
+RMD160 b53fca7e2f34dd23ecb11af3804fa10c1702e815 ebtables-v2.0.8-2.tar.gz 97065
+SHA256 dd78c0dfa0dbeb128952dec9e916be948bf561dcb8ba3149ea7ce0166a2caf9b ebtables-v2.0.8-2.tar.gz 97065
diff --git a/net-firewall/ebtables/files/ebtables-2.0.6-gcc34.patch b/net-firewall/ebtables/files/ebtables-2.0.6-gcc34.patch
deleted file mode 100644
index 33ff9a4e0b03..000000000000
--- a/net-firewall/ebtables/files/ebtables-2.0.6-gcc34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ebtables-v2.0.6.old/ebtables.c 2004-07-19 22:38:16.955817128 -0400
-+++ ebtables-v2.0.6/ebtables.c 2004-07-19 22:38:55.241996744 -0400
-@@ -1170,7 +1170,7 @@
- if (!t->compare(t->t, u_e->t))
- continue;
- return i;
--letscontinue:
-+letscontinue:;
- }
- return -1;
- }
diff --git a/net-firewall/ebtables/files/ebtables-2.0.6-gcc4.patch b/net-firewall/ebtables/files/ebtables-2.0.6-gcc4.patch
deleted file mode 100644
index cf64aed3aa28..000000000000
--- a/net-firewall/ebtables/files/ebtables-2.0.6-gcc4.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../ebtables/gcc4.patch
-# Copyright (C) 2004 - 2005 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
-diff -Nur ebtables-v2.0.6.orig/extensions/ebt_ip.c ebtables-v2.0.6/extensions/ebt_ip.c
---- ebtables-v2.0.6.orig/extensions/ebt_ip.c 2003-11-02 20:22:56.000000000 +0200
-+++ ebtables-v2.0.6/extensions/ebt_ip.c 2005-11-01 18:48:56.000000000 +0200
-@@ -244,6 +244,7 @@
- struct ebt_ip_info *ipinfo = (struct ebt_ip_info *)(*match)->data;
- char *end;
- long int i;
-+ unsigned char j;
-
- switch (c) {
- case IP_SOURCE:
-@@ -313,7 +314,7 @@
- ipinfo->invflags |= EBT_IP_PROTO;
- if (optind > argc)
- print_error("Missing IP protocol argument");
-- (unsigned char) i = strtoul(argv[optind - 1], &end, 10);
-+ j = strtoul(argv[optind - 1], &end, 10);
- if (*end != '\0') {
- struct protoent *pe;
-
-@@ -324,7 +325,7 @@
- argv[optind - 1]);
- ipinfo->protocol = pe->p_proto;
- } else {
-- ipinfo->protocol = (unsigned char) i;
-+ ipinfo->protocol = j;
- }
- ipinfo->bitmask |= EBT_IP_PROTO;
- break;
-diff -Nur ebtables-v2.0.6.orig/extensions/ebt_limit.c ebtables-v2.0.6/extensions/ebt_limit.c
---- ebtables-v2.0.6.orig/extensions/ebt_limit.c 2003-11-02 20:22:56.000000000 +0200
-+++ ebtables-v2.0.6/extensions/ebt_limit.c 2005-11-01 18:48:56.000000000 +0200
-@@ -203,15 +203,15 @@
-
- static struct ebt_u_match limit_match =
- {
-- .name EBT_LIMIT_MATCH,
-- .size sizeof(struct ebt_limit_info),
-- .help print_help,
-- .init init,
-- .parse parse,
-- .final_check final_check,
-- .print print,
-- .compare compare,
-- .extra_ops opts,
-+ .name = EBT_LIMIT_MATCH,
-+ .size = sizeof(struct ebt_limit_info),
-+ .help = print_help,
-+ .init = init,
-+ .parse = parse,
-+ .final_check = final_check,
-+ .print = print,
-+ .compare = compare,
-+ .extra_ops = opts,
- };
-
- static void _init(void) __attribute((constructor));
-diff -Nur ebtables-v2.0.6.orig/extensions/ebt_vlan.c ebtables-v2.0.6/extensions/ebt_vlan.c
---- ebtables-v2.0.6.orig/extensions/ebt_vlan.c 2003-11-02 20:22:56.000000000 +0200
-+++ ebtables-v2.0.6/extensions/ebt_vlan.c 2005-11-01 18:48:56.000000000 +0200
-@@ -135,14 +135,16 @@
- (struct ebt_vlan_info *) (*match)->data;
- char *end;
- struct ebt_vlan_info local;
-+ unsigned short id, encap;
-+ unsigned char prio;
-
- switch (c) {
- case VLAN_ID:
- check_option(flags, OPT_VLAN_ID);
- CHECK_INV_FLAG(EBT_VLAN_ID);
- CHECK_IF_MISSING_VALUE;
-- (unsigned short) local.id =
-- strtoul(argv[optind - 1], &end, 10);
-+ id = strtoul(argv[optind - 1], &end, 10);
-+ local.id = (uint16_t) id;
- CHECK_RANGE(local.id > 4094 || *end != '\0');
- vlaninfo->id = local.id;
- SET_BITMASK(EBT_VLAN_ID);
-@@ -152,8 +154,8 @@
- check_option(flags, OPT_VLAN_PRIO);
- CHECK_INV_FLAG(EBT_VLAN_PRIO);
- CHECK_IF_MISSING_VALUE;
-- (unsigned char) local.prio =
-- strtoul(argv[optind - 1], &end, 10);
-+ prio = strtoul(argv[optind - 1], &end, 10);
-+ local.prio = (uint8_t) prio;
- CHECK_RANGE(local.prio >= 8 || *end != '\0');
- vlaninfo->prio = local.prio;
- SET_BITMASK(EBT_VLAN_PRIO);
-@@ -163,8 +165,8 @@
- check_option(flags, OPT_VLAN_ENCAP);
- CHECK_INV_FLAG(EBT_VLAN_ENCAP);
- CHECK_IF_MISSING_VALUE;
-- (unsigned short) local.encap =
-- strtoul(argv[optind - 1], &end, 16);
-+ encap = strtoul(argv[optind - 1], &end, 16);
-+ local.encap = (uint16_t) encap;
- if (*end != '\0') {
- ethent = getethertypebyname(argv[optind - 1]);
- if (ethent == NULL)
diff --git a/net-firewall/ebtables/files/ebtables-2.0.8.1-ebt-save.diff b/net-firewall/ebtables/files/ebtables-2.0.8.1-ebt-save.diff
new file mode 100644
index 000000000000..cdfd823447ed
--- /dev/null
+++ b/net-firewall/ebtables/files/ebtables-2.0.8.1-ebt-save.diff
@@ -0,0 +1,31 @@
+--- ./ebtables-save.orig 2007-09-28 22:50:35.000000000 +0400
++++ ./ebtables-save 2007-09-28 22:51:22.000000000 +0400
+@@ -12,6 +12,7 @@
+ my $cnt = "";
+ my $version = "1.0";
+ my $table_name;
++my @table_names;
+
+ # ========================================================
+ # Process filter table
+@@ -49,12 +50,19 @@
+ }
+ # ========================================================
+
++if ($#ARGV + 1 == 0) {
++ @table_names =split("\n", `grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//`);
++}
++else {
++ @table_names = @ARGV;
++}
++# ========================================================
+ unless (-x $ebtables) { exit -1 };
+ print "# Generated by ebtables-save v$version on " . `date`;
+ if (defined($ENV{'EBTABLES_SAVE_COUNTER'}) && $ENV{'EBTABLES_SAVE_COUNTER'} eq "yes") {
+ $cnt = "--Lc";
+ }
+-foreach $table_name (split("\n", `grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//`)) {
++foreach $table_name (@table_names) {
+ $table =`$ebtables -t $table_name -L $cnt`;
+ unless ($? == 0) { print $table; exit -1 };
+ &process_table($table);
diff --git a/net-firewall/ebtables/files/ebtables.confd b/net-firewall/ebtables/files/ebtables.confd
index 645b26edae99..db46ffb58793 100644
--- a/net-firewall/ebtables/files/ebtables.confd
+++ b/net-firewall/ebtables/files/ebtables.confd
@@ -9,3 +9,7 @@ SAVE_RESTORE_OPTIONS=""
# Save state on stopping ebtables
SAVE_ON_STOP="yes"
+
+# Tables to be saved and restored. If you have built ebtables as modules, you
+# may leave it blank. Otherwise, you MUST define which to control.
+TABLE_NAMES="filter nat broute"
diff --git a/net-firewall/ebtables/files/ebtables.initd b/net-firewall/ebtables/files/ebtables.initd
index 05ca7dbcaed2..27c743c91014 100644
--- a/net-firewall/ebtables/files/ebtables.initd
+++ b/net-firewall/ebtables/files/ebtables.initd
@@ -1,15 +1,15 @@
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/files/ebtables.initd,v 1.1 2007/09/02 10:02:35 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/files/ebtables.initd,v 1.2 2007/09/28 19:22:14 pva Exp $
opts="save reload panic"
ebtables_bin="/sbin/ebtables"
ebtables_save=${EBTABLES_SAVE}
ebtables_tables=$(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//)
-if [ ebtables_tables == "" ] ; then
- ebtables_tables="filter nat broute"
+if [ "$ebtables_tables" == "" ] ; then
+ ebtables_tables=${TABLE_NAMES}
fi
depend() {
@@ -31,14 +31,6 @@ set_table_policy() {
done
}
-checkkernel() {
- if [ "$(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//)" == "" ] ; then
- eerror "Your kernel lacks ebtables support, please load"
- eerror "appropriate modules and try again."
- return 1
- fi
- return 0
-}
checkconfig() {
if [ ! -f ${ebtables_save} ] ; then
eerror "Not starting ebtables. First create some rules then run:"
@@ -59,7 +51,6 @@ stop() {
if [ "${SAVE_ON_STOP}" = "yes" ] ; then
save || return 1
fi
- checkkernel || return 1
ebegin "Stopping bridge firewall"
local a
for a in ${ebtables_tables}; do
@@ -72,7 +63,6 @@ stop() {
}
reload() {
- checkkernel || return 1
ebegin "Flushing bridge firewall"
local a
for a in ${ebtables_tables}; do
@@ -88,18 +78,17 @@ save() {
ebegin "Saving ebtables state"
touch "${ebtables_save}"
chmod 0600 "${ebtables_save}"
- ${ebtables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}"
+ ${ebtables_bin}-save ${ebtables_tables} ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}"
eend $?
}
panic() {
- checkkernel || return 1
service_started ebtables && svc_stop
local a
ebegin "Dropping all packets forwarded on bridges"
for a in ${ebtables_tables}; do
- ${ebtables_bin} -t $a -X
+ ${ebtables_bin} -t $a -F
${ebtables_bin} -t $a -X
set_table_policy $a DROP