Version bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 40 insertions, 12 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index a2ab82c20b2b..b4ff4cf6d437 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/firehol
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.55 2015/03/05 09:41:39 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.56 2015/04/14 15:19:30 alonbl Exp $
+
+*firehol-2.0.2 (14 Apr 2015)
+
+  14 Apr 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/firehol-2.0.2-autosave.patch, +firehol-2.0.2.ebuild,
+  -firehol-2.0.1.ebuild:
+  Version bump
 
   05 Mar 2015; Alon Bar-Lev <alonbl@gentoo.org> firehol-2.0.1.ebuild:
   fix autosave locations
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 303364752829..bdac5976ae74 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -4,20 +4,21 @@ Hash: SHA256
 AUX RESERVED_IPS 225 SHA256 81d4b0645943ed17215f830c024b11e0d3f74d65d6ee17eea551083c728f607d SHA512 148e523600c4d998da4d6ae7f83e802da47af38afed895d2069d24bcfa6547a0705e7bd280c28e280094a01a3a23a08f632586c36d1c7b144f63fc171dd722aa WHIRLPOOL cb940cd5ed1f63e4a242feecec62b6a30df004ee6e40faf125ba0a0a3d8b265700bb61ec39f064fde20f4e679b674e535a4e85a8c970fc05f6d44e22252669ad
 AUX firehol-1.273-CVE-2008-4953.patch 1734 SHA256 9f14a2bcf92f3a68b63a2506cd75f4cbdacd600e72133b37b439b6e179a2fd9d SHA512 cc5032626577bf853c6688a1cdb30c76eb8f0eb7e8fa241eb54afdb68ea34037271d3a1d1df3b952c6512a8485328bef19f417e2d9b94f3b32ee3ed664f8e13d WHIRLPOOL e92714115c966dc8c18f4dc85cc74f2d0e7fe313df0fad26226536f8adafaf07824022832c7acfaaf6d800b2281edd07d814660e01a33783dd0e7994b611e6f8
 AUX firehol-1.273-log-output.patch 280 SHA256 8685431621fc42d8d6f0a6dee0119743026ead5754ad0f4315ec6c29e8c94da0 SHA512 11122a6df07912a0defd3bdef3c263fde9ce248f059ecde358c2e79a99eaddb9ed986dcea0058cc2e3b94f4a788f56f6ce3e245d744f6f8db5d46077081d97fa WHIRLPOOL 1abd6cbe92aed3c0a744baf0c0ccfd5dbdaad62be2650851ea87b8e23e561a903ab2bffe4c72adeb562ce9dbbd485b7884e5a9f0b4fc6a0df87dd3048a588fb2
+AUX firehol-2.0.2-autosave.patch 769 SHA256 a31010e0c0c448292b5dc496852ffa6bec823b175b8cad061357764a398f68d4 SHA512 c6042c4732f760af8d712e5775e3a839c1675496d3af903a63e125b38e278facf99593780ee7513eabfadc8400fed4e7448ffe0be555026e83ac9a0c5c80e566 WHIRLPOOL 5132d96d342677b581178c9d9af7f0194fb9cdede7c47a569e551e4378b4bb69dd7c7a64546cb94a6840d9993a6223721e92dfbaee3f2721de6d1ccdc9b5ebee
 AUX firehol.conf.d 70 SHA256 0e6bae0a5329d6b527cf0ae7183acf04f0f08f5a931bf5e82a789053faed4e3c SHA512 e6b21b493526770bf5619d09b63f8e6cf7f94fb8059fc8ff2d1f19776cab1320218e103d73219534817464314430faca4e437644befa5330610d948c2ade1a35 WHIRLPOOL f5a4db182e7f04200686a4ab2c2fd76929fed12ba2c7cf36461a5e01ece9d2eaac3caaf98def21dd0a7be4902220f51a82f0281ef0eef3724efc88af4cea4643
 AUX firehol.initrd.1 1261 SHA256 4704db0d00d1326a09a04e867ed3575938d2e41141b245cf543c9265c3ba4ddd SHA512 58aace281b1461c2d8b1cbb9e265a642cbd32d238996322323d931961d2635b3fb111dee8484889e77c95fb0f34a008e1c7320b8065b0bae05009d466d13bc03 WHIRLPOOL bfe42058afd359e4a8fdf9ab9e6d9bbedddd36eba76fab62cd02c08e18a72438a9dffee54faccdb5f5a2e74e11281802e264a0d6ee7cc9a3834cf5d3279dc3c6
 AUX fireqos.conf.d 65 SHA256 c18e2f224ac8e33971c632d7492ed3142059e8fce370713cf72df35cbd0a3b6a SHA512 4dd394f3d896d8bf782cf1157f5bf420ca0e9b2c6238986f3fb17630ec0e12bfcad4ffc6fe2258a7d257e157fed11e01aef26965f3d97c78643c6467639a822c WHIRLPOOL 05cded3032f1db543e1b35eb84963ebadb59a72d3b4cffcf00c31b18346a85795f21bc836eb461688152c8abcd0a221ec46d47dac5302c692c9bb3d67e835d14
 AUX fireqos.initrd 947 SHA256 f5653511645992ae90a592a150b95bef17d3fcff219a7407fcd1bdbd1e58df31 SHA512 821c20a38e26ca908cc0d8a49e77c101117c12de40128c461f86f7142d7206b22a5ef1475df6d6b4c58ef5e0803bd08bfa23bfcc0969bb45b1569b127ff8eff9 WHIRLPOOL 5f5bccee8a40c9e084d295c7bc46ad69cd83ef4772fd7fd2f83cb5ddf5ddb43b8af8875eb1db4e3729838d5ca8bd38f7c1eff57d2adc36807335326f6e7fc704
 DIST firehol-1.273.tar.bz2 128128 SHA256 e8d3b4ac3e54097c0e0f14bfab773a75d43b522fa123a42088b7f23f13495ea2 SHA512 dbb311fb9d4fa8861480bae1fac449ce85f52612264ec21658946d87be02027c37af13b754acd791ad454964c588897f8187ec8ce80de3b3ed8a888429bfd708 WHIRLPOOL 0fa7f7644d7bf0268bfc6e817eeb95e7c1784cefa6d4a930c2fec6644774347c28e7a4d39c55df7a4e0f7a0c4697ce6b3c4bafdf6e2124bd478c097b9a6cfb27
-DIST firehol-2.0.1.tar.xz 918040 SHA256 21aa3b200987fdc784c16e6c50b7fb587237cf60278859ea59d5359edcd43796 SHA512 61ecd7881c03e17986a51cb4214159197ce5e0cdf2c1c7e8759903d064e77cd43a49e57e4817e17e059e3bf63a0f6d8774d1f811fc6fc1a5e4b90ddb796cd994 WHIRLPOOL 82423ac7b51777a059cf7232edab6ad07abc8d6fcf8d7485abb0deb72076d9702897e75875eea6d020f3bf20e062290b181301a34e09f3fbfc1cd5f3688b30c1
+DIST firehol-2.0.2.tar.xz 918860 SHA256 8778d0fc891676777b55e68d852a765205a995029f6e9f599c0090a14ca8ee7c SHA512 d125c4ca7d60494afde04f806bb0fc44ebdb12d7bf59e027c441a087082d9c326d009ba568ef640b01409abdecc3c192a9ae6db6c7370ad0221a19cb3a706902 WHIRLPOOL 10b6edee6a4db07a217e7d13eea4dc5ba02d7f3a44ba1955a5b138a09aa41aea6e39acbcdb04e0ee80d22f3f1d9fc1f061d26d7a10a9d1a7f02230ca21efe514
 EBUILD firehol-1.273-r3.ebuild 2235 SHA256 25b1f90baa1b258390029d57aa46b38f19905eae3ecb957aa4ab794c450c3d6a SHA512 0307ab47ed84c847ba9cf5cd3e0e53f8ac3e14f603fc0fa3a1b25e1c81862a4333e45f5bffa8e0b7e8c03b3198fa24d51878613f623a560796922d826a7a23d2 WHIRLPOOL 380df5a7d9b2139cf005c64385d283d3db1c3597e57bfc9ca7aae465c9c191f4052b2cdee706388a46be334206f469a80480eabeff4f08a3f9d58e69bf4671ec
-EBUILD firehol-2.0.1.ebuild 1644 SHA256 3784b1aacdaeac8f00cf99a350efa3d9f61699e072d6c7018cc719d215c521f9 SHA512 03e28941998ad4ab5823a8da37966ac086a4240342d07f57b295a445569c863bd92c8884c8abb10f7c5d7c97bc33136065424da0719c9c1a9275e734ec93e835 WHIRLPOOL cc7ad6ad12a40f8cfa583c4219b985e65631fd0ff17cd2d7820902879983d2a6405d70e3b054117be62da1dbc00316356e0140ebf909f19079721a343e25e82a
-MISC ChangeLog 10045 SHA256 8f1767705237f171ad4108957cee58eddb910493e1199f60f874b707f9b3e0bc SHA512 046ee9c1a9410ecc98c71e4811d72fee3cf62eeb7ebc9d891ec35b9db807767071d498c29710f63e1c058aafad9c549ac21cd2bdc5f028605bf9f96e97990398 WHIRLPOOL ddc9f91575865fa6c0769066a8d9104eff4ba1a6d7435b40db13ccccdd6e5aedd46d1fa415b3aae5544ccf52614bd5e19dfb97bd78dcdc6f5e13df4e0311dc3c
+EBUILD firehol-2.0.2.ebuild 1618 SHA256 9158009d3c27e872de6e068e44b3d720fd2d3d538b0e304ca9cff1b0eb8989d9 SHA512 f4bbd4c7d3c86dea03d7a13ae643a2c0d75e43b87ff5c56ac12e12a59bd2274c8db38c6adf8f5eaec108f06d73e61fcbe8cbf2c5cb404e30933787ead59dd584 WHIRLPOOL f082325547f914dfc5f14ae9956e29a085c24f6d4beb481cb59f324b009c87407a73957cb51ff801357f371c4e70a46f80658e445544d8333c28b92b9809eed4
+MISC ChangeLog 10226 SHA256 fb91f5ab511d8fef9a0fb08d630a5e47c9b1f70507235b5747483acf825aecf9 SHA512 22af372b8ed8076f53bc3d465c92c3c8a18fa11230ca2dd02553613054ffee2d1f10965a70327d2973cf723af13d8c6f51ae7838b078405c67adca3f0398a67d WHIRLPOOL eaba3cdaad9a8a6d4fa316cb261d6dea747d293b5613b6dee26cefdfd9cba0ed1f13c09cd10187a0a0b26798d39544f4f851baec8194708debdd7c1ac69250fd
 MISC metadata.xml 203 SHA256 6457ca6309badbd279e3ab106f60275f4b83ed47897af823830ecfde8dd40c96 SHA512 023202f99e1bf2ae94b35f80fa43d998b583f0eaf52ae2a090e6894e141008065f996c03e004cd6d0cfc124171a1a7f93c9a5ab03043bf04b88e52b0b04a3a74 WHIRLPOOL 21ec04c789baef31a21ac62e83901befa770e65252c1e27151df5b5253184371a948cce4bcf9f9375f87a5c2c88565ff36cdd5cc7f10d848d25024b75b59a162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlT4JNYACgkQXYk9GL8g3FEOdAD/Rpjrz9xKw9jGt79r0MersF9a
-ev60fFddvmDNtxjf3+wA/ioKFkhyi4OO6sz5Z0PG0llbJ1JAbM0YmknTRSp2ar3t
-=Ax5j
+iF4EAREIAAYFAlUtMAYACgkQXYk9GL8g3FE0lQD5AYnThpPGnbcMLJKgAYTy5otr
+OUR1enKY3CB2V157YvgA/0t/ju7P2WXBXDTy328cym2IxGkYms12qaJiT0AMEL0C
+=7lUi
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/firehol/files/firehol-2.0.2-autosave.patch b/net-firewall/firehol/files/firehol-2.0.2-autosave.patch
new file mode 100644
index 000000000000..f552b2b167b3
--- /dev/null
+++ b/net-firewall/firehol/files/firehol-2.0.2-autosave.patch
@@ -0,0 +1,18 @@
+diff -urNp firehol-2.0.1/sbin/firehol.in firehol-2.0.1.new/sbin/firehol.in
+--- firehol-2.0.1/sbin/firehol.in	2015-02-15 17:08:03.000000000 +0200
++++ firehol-2.0.1.new/sbin/firehol.in	2015-04-14 18:05:22.262234003 +0300
+@@ -846,12 +846,12 @@ test -z "$FIREHOL_ROUTING" && \
+ # Where /etc/init.d/iptables expects its configuration?
+ # Leave it empty for automatic detection
+ test -z "$FIREHOL_AUTOSAVE" && \
+-	FIREHOL_AUTOSAVE=
++	FIREHOL_AUTOSAVE="@FIREHOL_AUTOSAVE@"
+ 
+ # Where /etc/init.d/ip6tables expects its configuration?
+ # Leave it empty for automatic detection
+ test -z "$FIREHOL_AUTOSAVE6" && \
+-	FIREHOL_AUTOSAVE6=
++	FIREHOL_AUTOSAVE6="@FIREHOL_AUTOSAVE6@"
+ 
+ # Set to non-empty to wait (max 60 seconds) for a network interface
+ test -z "$WAIT_FOR_IFACE" && \
diff --git a/net-firewall/firehol/firehol-2.0.1.ebuild b/net-firewall/firehol/firehol-2.0.2.ebuild
index 4fcf08b93a20..da63e358f2ab 100644
--- a/net-firewall/firehol/firehol-2.0.1.ebuild
+++ b/net-firewall/firehol/firehol-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-2.0.1.ebuild,v 1.2 2015/03/05 09:41:39 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-2.0.2.ebuild,v 1.1 2015/04/14 15:19:30 alonbl Exp $
 
 EAPI=5
 inherit eutils linux-info
@@ -34,11 +34,16 @@ pkg_setup() {
 	linux-info_pkg_setup
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-autosave.patch"
+}
+
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--with-autosave="${EPREFIX}/var/lib/iptables/rules-save" \
-		--with-autosave6="${EPREFIX}/var/lib/ip6tables/rules-save"
+		--with-autosave6="${EPREFIX}/var/lib/ip6tables/rules-save" \
+		$(use_enable doc)
 }
 
 src_install() {
@@ -48,7 +53,4 @@ src_install() {
 	newinitd "${FILESDIR}"/firehol.initrd.1 firehol
 	newconfd "${FILESDIR}"/fireqos.conf.d fireqos
 	newinitd "${FILESDIR}"/fireqos.initrd fireqos
-
-	# no --disable-doc yet
-	use doc || rm -fr "${D}/usr/share/doc/${PF}"/*.pdf "${D}/usr/share/doc/${PF}/html"
 }