Version bump.

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

4 files changed, 95 insertions, 6 deletions

diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
index a1f61e3e3343..a595bd2edf7b 100644
--- a/net-firewall/ebtables/ChangeLog
+++ b/net-firewall/ebtables/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/ebtables
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.45 2011/10/20 16:33:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.46 2011/12/17 03:29:13 pva Exp $
+
+*ebtables-2.0.10.4 (17 Dec 2011)
+
+  17 Dec 2011; Peter Volkov <pva@gentoo.org> +ebtables-2.0.10.4.ebuild:
+  Version bump.
 
   20 Oct 2011; Brent Baude <ranger@gentoo.org> ebtables-2.0.9.2-r2.ebuild:
   Marking ebtables-2.0.9.2-r2 ppc for bug 373291
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index 5120ae77ba6c..c644285549be 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ebtables-2.0.8.1-ebt-save.diff 1089 RMD160 d36bd4ee1f9c5640d960e0b537829faade9251c4 SHA1 efad4c40e92b42d59e044c78945aed00ef756ed8 SHA256 b4d7022a616152ca439d2b09f14fda8a3ef479b823c2da44eb0e9e22b256be90
 AUX ebtables-v2.0.8-2-ethertype-DESTDIR-mkdir.patch 1619 RMD160 62f324507577cdcb9390b42fc87dd7f8017bf4e7 SHA1 7a68888f6ac2d2ee55105a957bcdec263992e266 SHA256 56905064c63c582240da2bc21d03ba66fc28716089ba743396fa67e9ea78b7ca
 AUX ebtables-v2.0.9-2-LDFLAGS.diff 2349 RMD160 db15610f89a004adff95cca96b3f0b59c1c79b9a SHA1 0bc0d680a60ce79439573efa78fda696153a8f6a SHA256 55a236e2d10d2ef1dd699d94c6079acd9ae6447b9a462feb3071cdbd7611231b
@@ -5,9 +8,18 @@ AUX ebtables-v2.0.9-2-compilation.patch 1495 RMD160 942d184f2b819d0f5a13b6823822
 AUX ebtables.confd-r1 288 RMD160 97d8fd8a00b48d70881aff05c1fa533e1da7172b SHA1 89b16bf882290bfc31c890948245552da5b26b4d SHA256 c05a6c1ba6add3881068584074681b04bfb2ad43284d7bdd67f47f3da842de58
 AUX ebtables.initd-r1 2071 RMD160 bbc77bbb64a2f73c97647d45e7707ee74da8573e SHA1 72e6b79826d47f7312947e5f2366e9130f690607 SHA256 cef208f784b24abcc7af313355d103ee1c78ade42fb1cee3936b209c012d7a80
 DIST ebtables-v2.0.10-2.tar.gz 104435 RMD160 bdce57aca2712305947f6990cc4a3c3aa43a9fd8 SHA1 352442fa4bc35991c7312e35758cc1ed0ca0b513 SHA256 cc26cc0646c0f6ce6ddd2f29f96d7399d6938f7503f7a8443e959c8ea2d66b61
+DIST ebtables-v2.0.10-4.tar.gz 103764 RMD160 86ecfbb28531add0ee6a1a8f661ba9be891c0cfc SHA1 907d3b82329e8fbb7aaaa98049732bd8dab022f9 SHA256 dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d
 DIST ebtables-v2.0.9-2.tar.gz 101529 RMD160 7dff076ab14dbc2c9e64813c745f1513498fdaa8 SHA1 93b684cf788592f976a12a5f71c3aa9d185a309c SHA256 98855f644d43c615a8e663197978e49c95642f46f2bbf8e6f3213af87f8ad6a3
 EBUILD ebtables-2.0.10.2.ebuild 1988 RMD160 484c20baefd5c31cec5da6733f4a8cd38b3aeaa3 SHA1 a2e020dbec0f428ad92f8149c3f48092e13cf14f SHA256 8356601f3ea11e6a6e399ae5bf5ecb0158521999b29c7a92b064cc1b7be24aca
+EBUILD ebtables-2.0.10.4.ebuild 1989 RMD160 e2660580795ffda5cb1872c78b0e0d06fda0f012 SHA1 06cf37e6f19b15289b02f4b79abbc9bc61cfcd5b SHA256 393292c953d93ba89b4e952898933ecb3228cd730de4affa3e4fa79b52512a4d
 EBUILD ebtables-2.0.9.2-r1.ebuild 1959 RMD160 6ddab669bc1cb64490475bdc5544ce46ccb63e31 SHA1 7f90002f76ac87ff30dea2631aec686ea3b713dd SHA256 e4ec3bda2c6eec70ec889667a98f0bf272bc6a91a2152188e21ee447b509f221
 EBUILD ebtables-2.0.9.2-r2.ebuild 2170 RMD160 18de0c9774c193bf422514de98c0cffc4f87f3af SHA1 4b8bc37f197977c051d6e9480fdddf78ba9109af SHA256 b0fb52759dd046d679acc308a757c2f006c2b626c93f6daf9f2e779c650dce64
-MISC ChangeLog 7658 RMD160 bfbb4f831e9da68abe08f2586c74bd18e9d0c97c SHA1 4a613661b4ea0d4c2505fe5089a38b44fb5e0214 SHA256 84c11086911983cf544fc5c1e3c71a2afa4a203b391432a76eeaf2e69032e413
+MISC ChangeLog 7778 RMD160 6190fe92f7457eafac2ae5b197d1e79f6bf97fa7 SHA1 575af34fc4a14bfe1f65d86dfddc2b6af65a1400 SHA256 cdf441c4c8ad32b44c44dab19bff2c9fad52fe56201c7549acf4b9b2f32862a7
 MISC metadata.xml 251 RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 SHA1 6bf96c40f48fb4f92026dd80b7b3e1ce7ebdc9d1 SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk7sDIYACgkQGrk+8vGYmwes5AD/WdeXOljrcxcYBDOU7DXIJVJ5
+iyvZTEkm0WVax//iabYA/jh3qhegBHXhhK+sk1FB3e23EZPnp4WE5G4gJfL/8J+c
+=bpM/
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/ebtables/ebtables-2.0.10.4.ebuild b/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
new file mode 100644
index 000000000000..a647bd3f83ef
--- /dev/null
+++ b/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.10.4.ebuild,v 1.1 2011/12/17 03:29:13 pva Exp $
+
+EAPI="4"
+
+inherit versionator eutils toolchain-funcs multilib flag-o-matic
+
+MY_PV=$(replace_version_separator 3 '-' )
+MY_P=${PN}-v${MY_PV}
+
+DESCRIPTION="Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
+HOMEPAGE="http://ebtables.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static"
+LICENSE="GPL-2"
+SLOT="0"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use static; then
+		ewarn "You've chosen static build which is useful for embedded devices."
+		ewarn "It has no init script. Make sure that's really what you want."
+	fi
+}
+
+src_prepare() {
+	# Enhance 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:=.*,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() {
+	# This package uses _init functions to initialise extensions. With
+	# --as-needed this will not work.
+	append-ldflags $(no-as-needed)
+	# This package correctly aliases pointers, but gcc is unable to know that:
+	# unsigned char ip[4];
+	# if (*((uint32_t*)ip) == 0) {
+	#append-cflags -Wno-strict-aliasing
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		$(use static && echo static)
+}
+
+src_install() {
+	if ! use static; then
+		make DESTDIR="${D}" install
+		keepdir /var/lib/ebtables/
+		newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
+		newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
+	else
+		into /
+		newsbin static ebtables
+		insinto /etc
+		doins ethertypes
+	fi
+	dodoc ChangeLog THANKS || die
+}
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 86a86af937c7..0bd076a4ad81 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,22 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ipset.confd 191 RMD160 b05d15226960cfaad609a11433bd5ec47c855681 SHA1 57ca914734177c0247802749896ff5cee2806f4e SHA256 51f976f3c4aedd5cae6c48c62e566527de344cef8eaf8175ce1e631b7b670043
 AUX ipset.initd 1213 RMD160 8633508d05ba592326c2962f1366704c91fd4a3f SHA1 964b5b58461f0f56bc29cc400fb465769ceba115 SHA256 bbc09cd718ad49b2df1a23faeda97d7337e8fd1ebbfdde4286f1d7d6c079528d
 AUX ipset.initd-r1 1219 RMD160 7a9d5c079dd16f48c88e09a682f96fbd5e03476b SHA1 88a808984496ae8e22bb34a3105f965e7bd6dfb8 SHA256 ca7141461964f4e1ab6fd8ca22c2abcf6629b8a635eae9f9fd2e9771716f2f28
+AUX ipset.initd-r2 1467 RMD160 27bb49097821030d66be33b0d7073f1282dfb6f0 SHA1 ed99ee71e1ba9795c84602e1748109d195490f3c SHA256 6cd6a7d414b234c4db7ceb4d76fc4ef99239fd552822177545dae0d6b413bd51
 DIST ipset-4.5.tar.bz2 72428 RMD160 eb986eee5daa5f49be5df0eeb7f09c595b415ee1 SHA1 696a5cd96459c8fb028f0dfb9927a5c4f183d28b SHA256 f94200f39398f90b60633b5fa45f0c327d5915e2c5a68e6c90fcb8ea13be6994
+DIST ipset-6.10.tar.bz2 123721 RMD160 250f952e94fc687e2b8d7a6b93831e08ac17a06d SHA1 bc8c1195590c0c08308ff7a5e762b698c04413ce SHA256 a2f7e9615d83f60ac915793adf71a29724166152068b19a7a2ff4900b51868e1
 DIST ipset-6.8.tar.bz2 122954 RMD160 94ee3177540743153013b04e560839596dde1aad SHA1 0f4abb79fe8a65088f687e8a274aaddb542bc86a SHA256 d7b499ee961cd92ba5f0f698e5de49909d8b2c6697ff5aea3a1535e183f9b809
 DIST ipset-6.9.1.tar.bz2 123268 RMD160 068e5e37e761374089e53815b0ddca9ffd1894bb SHA1 781d5ad6a9e4d5bf6f8ccad3dfee8a578ed06c2a SHA256 db099044022f767046ec89c77de01ad6f0faf7f50f8f42b886c3c71ac5994abe
 EBUILD ipset-4.5.ebuild 2840 RMD160 bae015ed7f806cee6c6c8cb411815afff8bdfae4 SHA1 94cd6b8724e0f403f5d9969cd2de4a5ac2ab1abf SHA256 96e2d91d9a1f27abe2e44f380705536e4894fd27e4c9a684ebd4540d24da0ca0
+EBUILD ipset-6.10.ebuild 3433 RMD160 12ab1e7e9072e196cb3b27412a2ab5234c211fe5 SHA1 d4c665bd5ea0f9aa244f552e44d9285c6311d3c2 SHA256 3b98a3a484768da20b3659d1255e43a4257c8851eab60fe09999ebf0d3aad92d
 EBUILD ipset-6.8.ebuild 3250 RMD160 6e9ffa7ff745b7a0ae2053222f449d1553cb5f32 SHA1 e8efe33efc46bec20d20cf33b34e9aa124ae0660 SHA256 adc276a151d484a522464376d127cd4437acdef5bd7a871fcea79c65fa7a1c9c
 EBUILD ipset-6.9.1-r1.ebuild 3391 RMD160 be1e553f741c5760279ecd7ab4b6d0f581c8c798 SHA1 1a82ea52d786103142f3e88b73ee55e09ffea9d0 SHA256 1ccf3ae26d73600ebc5e7fe316eb6d3b049887cc64bac078226c0b1e3fe22eac
 EBUILD ipset-6.9.1-r2.ebuild 3397 RMD160 3f19c1bb4a84c0358a275bfdc1b1e3c61e2e31ef SHA1 402ba2f4ccd2ad621fca2fb5c619779b53ae2483 SHA256 349e0b63af1730d016d2963a0e10519d104a33828df1d3079d345462f355427f
 EBUILD ipset-6.9.1.ebuild 3249 RMD160 4a32a1a7ceb39a8a986d4e1f0217799522185ee0 SHA1 e63a469a55f3b60191822e09d21b4def1e16b7c9 SHA256 990e629564a4849fb8aafb3344d11132298d3bb20b0653ff28b2b145dec750c5
-MISC ChangeLog 10117 RMD160 d4b2681c08ef903e1a928908ac8a11e430f94889 SHA1 1155807420a00b132296d9ead0b6b7d63921dec7 SHA256 36274d075b82bcde484348ca2fa7514daf1c05d5f0403748884a6abdedd4c581
+MISC ChangeLog 10380 RMD160 ca511a00580242d02c06a07640939883374f5782 SHA1 8282100f24dbcf611645c85e2e49e9a9fe4b1645 SHA256 e9bd87c12fd1ef3a9c63434dd1245e063892a4c5517065dfcdeb25c3dfece2b4
 MISC metadata.xml 261 RMD160 011c351b20b4b062f3d8018435a1b0b8eb1693ce SHA1 4d43ddf52da446a21a2565ebd52272d19dfaa767 SHA256 66f8679fb88591451a2fb75caa068efe24aa933bdf312ed6337eb74f933ac9a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6VoCUACgkQGrk+8vGYmwfJbAEAsiIbpJkQyexnK9EoBlZwxAbd
-2soXT80pPLOQ2D5qsKEBALuP//DvIobGTaAw/VHyBvrntz0kYixW1tpBld2F2mr1
-=8vEe
+iF4EAREIAAYFAk7sDPAACgkQGrk+8vGYmwdOvQD5AYL3Zv/GZSZyIq06VTZvW7IE
+4mKTniQRiDpVXdyhp4YA+QFhXTBiaAWhntY8fHm9KQ9TGYY9O87A8xZje6LpI4Ph
+=+lSy
 -----END PGP SIGNATURE-----