summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstanze Hausner <constanze@gentoo.org>2013-06-02 10:50:25 +0000
committerConstanze Hausner <constanze@gentoo.org>2013-06-02 10:50:25 +0000
commitfe8fa9e8c427f2b8b8efe634099abf68d8c6ad53 (patch)
tree085130d317cb9251e16222e7355e80bb0a0f114a /net-firewall
parentCleanup; Version bump (diff)
downloadhistorical-fe8fa9e8c427f2b8b8efe634099abf68d8c6ad53.tar.gz
historical-fe8fa9e8c427f2b8b8efe634099abf68d8c6ad53.tar.bz2
historical-fe8fa9e8c427f2b8b8efe634099abf68d8c6ad53.zip
Cleanup; Version bump; Systemd support wrt bug 465950
Package-Manager: portage-2.1.11.62/cvs/Linux x86_64 Manifest-Sign-Key: 0xBB80F419010E3EC3
Diffstat (limited to 'net-firewall')
-rw-r--r--net-firewall/shorewall-lite/ChangeLog9
-rw-r--r--net-firewall/shorewall-lite/Manifest15
-rw-r--r--net-firewall/shorewall-lite/files/shorewall-lite.systemd20
-rw-r--r--net-firewall/shorewall-lite/files/shorewallrc21
-rw-r--r--net-firewall/shorewall-lite/shorewall-lite-4.5.17.ebuild52
-rw-r--r--net-firewall/shorewall/ChangeLog9
-rw-r--r--net-firewall/shorewall/Manifest16
-rw-r--r--net-firewall/shorewall/files/all_zone.patch11
-rw-r--r--net-firewall/shorewall/files/shorewall.systemd20
-rw-r--r--net-firewall/shorewall/files/shorewallrc21
-rw-r--r--net-firewall/shorewall/shorewall-4.5.17.ebuild55
-rw-r--r--net-firewall/shorewall6-lite/ChangeLog9
-rw-r--r--net-firewall/shorewall6-lite/Manifest15
-rw-r--r--net-firewall/shorewall6-lite/files/shorewall6-lite.systemd20
-rw-r--r--net-firewall/shorewall6-lite/files/shorewallrc21
-rw-r--r--net-firewall/shorewall6-lite/shorewall6-lite-4.5.17.ebuild58
-rw-r--r--net-firewall/shorewall6/ChangeLog8
-rw-r--r--net-firewall/shorewall6/Manifest15
-rw-r--r--net-firewall/shorewall6/files/shorewall6.systemd20
-rw-r--r--net-firewall/shorewall6/files/shorewallrc21
-rw-r--r--net-firewall/shorewall6/shorewall6-4.5.17.ebuild62
21 files changed, 378 insertions, 120 deletions
diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index 595805aa8100..df473eba873e 100644
--- a/net-firewall/shorewall-lite/ChangeLog
+++ b/net-firewall/shorewall-lite/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-firewall/shorewall-lite
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.119 2013/05/29 15:24:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.120 2013/06/02 10:48:06 constanze Exp $
+
+*shorewall-lite-4.5.17 (02 Jun 2013)
+
+ 02 Jun 2013; Constanze Hausner <constanze@gentoo.org>
+ +shorewall-lite-4.5.17.ebuild, +files/shorewall-lite.systemd,
+ -files/shorewallrc:
+ Cleanup; Version bump; Systemd support wrt bug #465950
29 May 2013; Jeroen Roovers <jer@gentoo.org> shorewall-lite-4.5.15.ebuild:
Stable for HPPA (bug #470544).
diff --git a/net-firewall/shorewall-lite/Manifest b/net-firewall/shorewall-lite/Manifest
index 0e5664c65a88..ce1da344fa12 100644
--- a/net-firewall/shorewall-lite/Manifest
+++ b/net-firewall/shorewall-lite/Manifest
@@ -3,26 +3,31 @@ Hash: SHA256
AUX shorewall-lite 1627 SHA256 8f905d62e6076a39fbea514eb00275e28f0a02652d25ea2cba01e2dcb7e9f1ba SHA512 bd93cfef2867aab169d9ba90b1a34eea8c23b0acf0c2785491d2f851b45c808a80560326b9226f9f435851edebeb2c574580a47a0e7c6ff52991d6e3f2398872 WHIRLPOOL fc552d28567e42f2a49d0111dfc84305cf5be17dd4e89d2eba8e2624c8e3eeecaf2ec38120f856c19889678574be19baf00296de66ea029e84bf4127d4407c06
AUX shorewall-lite-4.4.20.3_installer-path.patch 482 SHA256 d4de4705cf69deda7506741f172315df6011def858b993e1d30be0691703ecac SHA512 10148f175e09c469359aa31372fadbc16599c4cd673cd0afb7b00450715576c543abc023a7992c31885aefc279e0f02ccb5dac716fe4597802fb88eda5ac0d82 WHIRLPOOL 71161582647edc20c3cfe0c375713aadfebf81dfc7be8c2bedbe548574898f92a9de0cf27891c11d2bc69f2a237e6862fdc6970c7864492bb95726885ab82b02
-AUX shorewallrc 1683 SHA256 914b874771e888f31959ac0fe912490cac03fc669b53afd44388458c58fa252f SHA512 17adf61f0fb906bfb7ee64c090da1f212c6e7c0962a05afcceb3b074375cffcb8c6f41362912e3d9580a75a906d5275dbeaea6d12c896e343fcbf569389034b6 WHIRLPOOL 48413cb257ae80e35064730794a0a263f0f42bb1bd354b6d12b48f7a6acc7d477d9c931db06e65e613d075b249e1f2597ebb3126b4ad477de7bb60defb4d45d2
+AUX shorewall-lite.systemd 472 SHA256 9958fae5cb6b172f764e7cbb91991cb37e608453e161ce9f10ee3e5013932e2f SHA512 219a60a720224ef305eec288032983f68c43aa98528b6d84684fc1907bc97f0b0ded9b3edc16cbab48338b640206fabdac5fa1520d3a0f588d717559dfe6c11f WHIRLPOOL b6a91090d44d05e2b999b0c82b624253a4a67321e96800201733b8aa7a731d5de2a7e63fc378100687560f0ff5526ef91bc5f485049ad006491b074855638f1a
AUX shorewallrc_new 1773 SHA256 24a169e763eea3926b8d1c44d62c52d3e2cad94eccea303376ba3e873e0a8224 SHA512 e080f4bce47fa5482dee46486e358ed17f35edeaf9050126b8c6f009cb29d1ca2ead2821153233e15fc18757f6cb72ff60f72b3f2d65aca32f9a63bc33a31f0e WHIRLPOOL 54311d12f85c1b9791a0e8db32878e7031c846471594400011236c58ef0183d75be960f65ce207d909758107a9bd13aee6fff2fc001b42651397ae877162e654
DIST shorewall-docs-html-4.4.23.2.tar.bz2 3638929 SHA256 8ee6d1250e777c8fcf4afaad4b2a9dc595f07ae0212dc2a0770e3f30dc1fb325 SHA512 0cfe18e2d2502b1275ae1ba08b05591653b9a5cc3d94dc027bbcce974a1863823611925b5d7e783e215b086bc21270ed36f6e7a967f3b23e68bf301e92a43fb7 WHIRLPOOL 11b3ad5dbf70e37585f278c78508e7d68db351dd3b4e5b04351fc42d7ccd1259215b7b0f5dba360eba9dfe4341f4a24209b22d9d3b64ba08a0a235270646d9af
DIST shorewall-docs-html-4.5.11.2.tar.bz2 4019184 SHA256 12fa6c1061f7a4f09dc4e687bcd9e9a46ba822abe815e7b7ba83ddafbb951639 SHA512 c79358f5d77836c5dec291a8521e59634d135987227c9570defbcb22b18576433d2ad58ff28c07f6334cc80bd5f546daabb41ba53f29db83c70e0c6b95fb169b WHIRLPOOL f3b183faa213adff1f48695cf685dee4dd60dea9398f9b1ad817f167dbd85b07b1bf0e6ae24c2f052b22ff73ea7b4a24ca0b6231cc880ddbc7745c231fa36cc2
DIST shorewall-docs-html-4.5.15.tar.bz2 4017169 SHA256 42dcd882d4a6beb9c91c382d9e4b33e93755e85c468b25b78a6e766cf8449be9 SHA512 e8ea003781599ed149eff9598277d0b77db74f3e66cd83d07e01604d160fb6687b74aaf5136af53bd00957aa62049b0e24001e1b56d58678bc1de336bdbc3a04 WHIRLPOOL 73a28b98b8e816159bb967991e3d8b4cbd6b75dfdfcef72089a784d196dc56366e3916e82b50efabeb0895f6cd54c6beffb1144908d706f3ffe97724907e6dce
+DIST shorewall-docs-html-4.5.17.tar.bz2 4022237 SHA256 a3103b221eda242d2d6debdaab743881b63fe158a6c88b69388dcf3b23f87a8a SHA512 c981574ccd2eeed36d1f4c844ce28efb5d6a389497e8ac372c362ea7d02c040fa153723455e4d5bc8b5046f314737d415625c7850fa31872febc73fe839822d4 WHIRLPOOL b9b5fe3a56bb76882fea7c0e21841499ed14878241960a25ca3c0a353fa2fcda59081b518d3c82b0efb419550b9cc09fe5499889b867bee00f9a01481d4a2911
DIST shorewall-docs-html-4.5.8.2.tar.bz2 3901788 SHA256 1f14523b5068c52bce6ad1d4d44b0c4b53a77651aa053db03c96aed756f15a38 SHA512 ee0718ca25ba148786be5d17c7dbf9380ccf96d636021234f95dd12c8e584d3918f8fa7d52dd8fa8a06d287efbbe22d090ae0ba3d622384b9de6235a4603e4ae WHIRLPOOL b83b85b2bb0d5bbab84306c1b84730f3a7100eb2e1bd39d524e16e6d341c5f124c5507b5222e088086300c552b0562d04f0cb5335fe74e04b615a9a9c5872511
DIST shorewall-lite-4.4.23.2.tar.bz2 95382 SHA256 7bf2647c0001b1f01c5661cafa4a4045289988506858234f640ef2d85ae2e50e SHA512 67a10bc19de0a0e98cdd17d8b62b3dc2cca128271e60da07a0b21d05279fa5f0fb85e02f35b9cbba7e9f01d475f7dc3845a58006d56f123266876316fd5215d6 WHIRLPOOL 72b8d3b1fe075d53e50e21c84c4095d160a0d05f4163d5da56b56c71c31b167e21540b2e9f2d063a3d4004658d6820e233c161cabd8ec6e7fc26554c749c2917
DIST shorewall-lite-4.5.11.2.tar.bz2 62990 SHA256 01bae549ba5ec82a9ad8938adcb85fda80d80cfc844c5ebf5005109fceae55bf SHA512 776f3eed3504c42d0729b525d78413808669b666b7a03c4b265bcf4a7bf80860ecccb8c83e2b2df8894e185a3328c70b588f51d5d46d7039f3dd9ec74f9954c4 WHIRLPOOL 335dd8f919c1e020437a69f8cc26764d5c8513bddc2e0210c033a3bad69dd68b5bb71526dbbce9f14a9f394fcd38a19385538d2c410c8c74b2f43368e2ca07e4
DIST shorewall-lite-4.5.15.tar.bz2 69016 SHA256 214abe1adaadb339cca814dcebc1c669d62a105a11ddfdad6706ffd84c62030b SHA512 13b94802419df5026ee0ad940e844c6a5c72278ca926c9c6337b74640bb164eedb422c34ef53340bb5ee428e81c219c7f6f0bd0f86eca707ed452ce1ff4e1668 WHIRLPOOL ec2f3718b47fd78a40697c6dbbfc6bf8531b3fa6bd66aad679bb7fb2265e67651ab0342fbdd032300607f90f59333e3c6f0d548924f3ed07eaad7d2ac69d90ae
+DIST shorewall-lite-4.5.17.tar.bz2 72916 SHA256 bce1debb8255efbb5886e1c99076cba81b21ef29b2063fd0e8408b93d509e069 SHA512 c6865409045b0d4a12b13a05fc57c9ebe1d13d3c0392915674719468f25d7c7de7c362d8b3c5ee54c9f730207a74a564482207b222e9a53835094f5ee3b642b6 WHIRLPOOL 36b4be1e55295acf1e84b6344e2a1062d11de9576107904daa86113d7951b82e7802df41987b134a7bd6460287be1e430846bb704021e3b5cc4592416d3f4733
DIST shorewall-lite-4.5.8.2.tar.bz2 57252 SHA256 0a129226086335d6ab6d39ce05132f845a340d4f3034a5d9d3397703bb735555 SHA512 dacf7e2fca365706448148ee651f4799b13c07c3b3ca1570eb0f739e54c847699478e2264f49f286bbfd46e17d291cc9f992283a0fce3b188239a7676746bd61 WHIRLPOOL 20877265ecbda6953d265452b71eea054b8b6c324de08eeeffd755df2384c0cb5270442097d22e7f7ad0b9753c545482a0938a1139f845e4f0fc6b627ecf13ab
EBUILD shorewall-lite-4.4.23.2.ebuild 1483 SHA256 77c9146219b46f24b7a0ae64e84c37465a4cd4a198159fe8c49f2c21bdc58c71 SHA512 7b3e1e7bdf2f56acfc1b0155737e3529f2fd5c72ddd8a50b97ea92e8e12482cde078da663f3eb7c17ad3ebbc1a2b17ec92395b531d2d1c77b08471a348dfe65b WHIRLPOOL 0a0dba72e163a63db4163dc59b2cec07d7aaa72b77842e6e07e26af65d94e2344d4550e903131c4cc09a656132bf81c2e924c93551e0741bc68c3d47c825b6e5
EBUILD shorewall-lite-4.5.11.2.ebuild 1407 SHA256 a4cc59b7dc00a925c8beae1562145641a70c59b278389ab8b71f9b8fdb004aa4 SHA512 31951b8aea3e70239075cff20782abdaa7f86afc61fa522675256fdc24690aff2d60a5f3656536819e7c2ac1d5f3b7510620acc1dfa2b28172fd5af311986b4d WHIRLPOOL 8e9f2b04dece6a2eeee335a8498577ea5d9214fb790eefe24ccd042b2bc299a8229909a0538d869743fd46cbe7ac22db0e12268143d2371c0d63c1e6807c9ba6
EBUILD shorewall-lite-4.5.15.ebuild 1411 SHA256 0ca20960ca5ab6ea84241c2f1d901c5cfd480e445c03b889596f0d55c892f5c6 SHA512 f06f47adbcabf921e19bfb2ab92e2ae66517409de52f547464ba4a007e56de7fd4e3d5dec9288e55245fc121818cc8a0d5322b8596d1a9d325edf1d9a5196887 WHIRLPOOL a864de2ba9ae5a145eff932227083682a85594d88c4441c1a1c347c81e73b97d5054164887af39e09e9225c96b9b5219bf54ae356f194e13c43fdc540771d125
+EBUILD shorewall-lite-4.5.17.ebuild 1512 SHA256 4a7821117a72919871f9e7aebb713d0efdc1f921373b5a2ba326190818d2f2ea SHA512 28cc6fb4e556980b4e21746ff1e903833b7d7ab2133f07f5608eb4041f3d85b6553f2015598a1305b36dadba0c4ac4ed190d00a11393609be1d29969c7526100 WHIRLPOOL cb643d6fe9ac50a3cb9c8e593a96b90dbe272d77e2bb71caaff77ebc2fcea7aba3a9ca1bb198b5e35ef5c25574312850699d0673328f87590f225c1d5f7f04a6
EBUILD shorewall-lite-4.5.8.2.ebuild 1406 SHA256 e6c45a6cb0cad9e35478e3bcd17d499f84f8152139caf6225217e25791fad0fa SHA512 2805152af5fcaf24e6f4c15f94c0ebb4fbd6cc1af79a32a3ed5459c66cdfbe3f2ac4f64ca10d958d95cd43e111145c0cdce5e8200ce48e527308218a3ef8d0a5 WHIRLPOOL 3aab56cc8b6ea5c238a557dd6ab9d8f49f9b187b2a044e7f7c2dba4c63f5e2405d779028c7d1bb937aad932e0b03e9dff1d4f1b57f829ce81e2d4a7d1f895de8
-MISC ChangeLog 18743 SHA256 3d7d10f18aac334664bce9f3e8d50f02e04eaeddd788d072fd688d8eb02ffd7c SHA512 c15ac2e6e6de1e08291e544e448f939eaa8ab8765d3cb8ec2ce630d2d1ee0ea9637672ede1830bc171152e1bbd5e2700da6756ba975ce21556fd072d60f916c3 WHIRLPOOL 683d379fe9539adf2049cba1d4f84b24c16e9382e7d4eadd21c55aa1c3c5b09a88ed63714b257ae29172482ed424943a3edf7a8f082651fb66fd09e0d002cf71
+MISC ChangeLog 18987 SHA256 2b1cb7ebd256d3edbc3c93ab3594d057526d7b7059ce154224475b1befd3edd1 SHA512 b2b7e28214b506cefeddb361dc561deb62b6fb81eecf4c739d2ea6bd2b40f63a639667758f3636940a6dee9068cdd21c067f0696ef1611113d8bfe02564e8625 WHIRLPOOL 2de173ffae44ccb432bf718e93e02beda026274686e825487724c8c2ccd777191c60c9da799ca3c706b1c51bd1ae0ee1c882910081fccc0ef6c1609167896a43
MISC metadata.xml 249 SHA256 cdf32b905fad83550eb790e99cc420f9d31e5f084687dafef696caa74270f544 SHA512 0f1cd0c406c41d29198618f897793943d21cf001fb9751bceaab6e839b9bf632435498a7552f10420ac01ffb6e3c1c37bdb709d416458c5b2ce80078f88f142a WHIRLPOOL 7c41b0e1fc6e004743781d062b73653c41add99d31604fece37d10f00b91549ad28c1c49689723c3f6668607f8b85847f9b6c671f64961ec9938d8d359ec575b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlGmHcEACgkQVWmRsqeSphNQTACdFdWWcy7M4CNnV70mFCPrpx6J
-uCYAnRRU0nwnHnCMys2V3WUlMwtFP9jS
-=3j0b
+iL4EAREIAGYFAlGrIudfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsP5VwD+KDlIkUZi25xdKqs1ZR/5ZCV9
+N7pvvRcxOT/T0vIYwFAA/jyScd9AenUtQwSLtcQYEJOwVzKioivfXTC4kE3+JvVU
+=vmAv
-----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall-lite/files/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/shorewall-lite.systemd
new file mode 100644
index 000000000000..aeb89b5abccb
--- /dev/null
+++ b/net-firewall/shorewall-lite/files/shorewall-lite.systemd
@@ -0,0 +1,20 @@
+#
+# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
+#
+# Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
+#
+[Unit]
+Description=Shorewall IPv4 firewall (lite)
+After=syslog.target
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/shorewall-lite
+StandardOutput=syslog
+ExecStart=/sbin/shorewall-lite $OPTIONS start
+ExecStop=/sbin/shorewall-lite $OPTIONS stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-lite/files/shorewallrc b/net-firewall/shorewall-lite/files/shorewallrc
deleted file mode 100644
index 4f13769114a4..000000000000
--- a/net-firewall/shorewall-lite/files/shorewallrc
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-HOST=linux #Generic Linux
-BUILD= #Default is to detect the build system
-PREFIX=/usr #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory
-CONFDIR=/etc #Directory where subsystem configurations are installed
-SBINDIR=/sbin #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man #Directory where manpages are installed.
-INITDIR=etc/init.d #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT #Name of the product's installed SysV init script
-INITSOURCE=init.sh #Name of the distributed file to be installed as the SysV init script
-ANNOTATED= #If non-zero, annotated configuration files are installed
-SYSTEMD= #Directory where .service files are installed (systems running systemd only)
-SYSCONFFILE= #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR= #Directory where SysV init parameter files are installed
-SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARDIR=/var/lib #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.17.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.17.ebuild
new file mode 100644
index 000000000000..c5952182ecc1
--- /dev/null
+++ b/net-firewall/shorewall-lite/shorewall-lite-4.5.17.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.17.ebuild,v 1.1 2013/06/02 10:48:06 constanze Exp $
+
+EAPI="4"
+
+inherit systemd versionator
+
+# Select version (stable, RC, Beta):
+MY_PV_TREE=$(get_version_component_range 1-2) # for devel versions use "development/$(get_version_component_range 1-2)"
+MY_PV_BASE=$(get_version_component_range 1-3)
+
+MY_PN="${PN/-lite/}"
+MY_P="${MY_PN}-${MY_PV_BASE}"
+MY_P_DOCS="${MY_PN}-docs-html-${PV}"
+
+DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall."
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
+ doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="net-firewall/iptables
+ sys-apps/iproute2
+ =net-firewall/shorewall-core-${PV}"
+
+src_configure() {
+ :;
+}
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ keepdir /var/lib/shorewall-lite
+
+ cd "${WORKDIR}/${P}"
+ DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
+ newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
+ systemd_newunit "${FILESDIR}"/shorewall-lite.systemd 'shorewall-lite.service' || die
+
+ dodoc changelog.txt releasenotes.txt
+ if use doc; then
+ cd "${WORKDIR}/${MY_P_DOCS}"
+ dohtml -r *
+ fi
+}
diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index d0a3b61828ca..84d62916c193 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-firewall/shorewall
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.227 2013/05/29 15:25:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.228 2013/06/02 10:47:00 constanze Exp $
+
+*shorewall-4.5.17 (02 Jun 2013)
+
+ 02 Jun 2013; Constanze Hausner <constanze@gentoo.org>
+ +shorewall-4.5.17.ebuild, +files/shorewall.systemd, -files/all_zone.patch,
+ -files/shorewallrc:
+ Cleanup; Version bump; Systemd support wrt bug #465950
29 May 2013; Jeroen Roovers <jer@gentoo.org> shorewall-4.5.15.ebuild:
Stable for HPPA (bug #470544).
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 32d9e23d0e80..222cf355043f 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,29 +1,33 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX all_zone.patch 351 SHA256 e631e846762760989b5fa3707c0bb6c4f44f91dc2fc04cfe829ec057880b7793 SHA512 a86dcf3e9191643b839b5b02c05874ae6e0914937c836706e943aa4f107f1064ec3ea86bbed9855c7c59a8fe57b06f85619bc2f5504a3bf5e0b3ce3ba22060b4 WHIRLPOOL a2e9cf07a0be85e68cb152aca93d20bab2d8ed1cd534575a87a8b24d4437955782ff3fa724d8f8440a0a9fdf0a026ab520612abea74a1de9053ca5f3ef1c675a
AUX shorewall.initd 2058 SHA256 ce68533c3ea8ba114f3e5d3a9223e74c44becf56416d6d09fe519a381ec70de6 SHA512 4873f06177c3b4c238088fb7a4df0dd8d2603789cce5d710d3ef0de72a18a16161f1d27d4b8f41ead9ec62d163d272c10fb3c0f210086737a01b1675068abd7b WHIRLPOOL 62075afcefd99f089a1659d6c72316bb5c935a96214b8d6fd4894a2c983d75ca239b4661d4c25078f5659da50c2707107fff57626fc62acc7d269ceaab2036e0
-AUX shorewallrc 1683 SHA256 914b874771e888f31959ac0fe912490cac03fc669b53afd44388458c58fa252f SHA512 17adf61f0fb906bfb7ee64c090da1f212c6e7c0962a05afcceb3b074375cffcb8c6f41362912e3d9580a75a906d5275dbeaea6d12c896e343fcbf569389034b6 WHIRLPOOL 48413cb257ae80e35064730794a0a263f0f42bb1bd354b6d12b48f7a6acc7d477d9c931db06e65e613d075b249e1f2597ebb3126b4ad477de7bb60defb4d45d2
+AUX shorewall.systemd 450 SHA256 7af76981195a12e4cf0181f710d606e53d1964fd5cd033a4db489f8eb98a8495 SHA512 181c701b8aa6a18f21b578a536841616424bff96e220fb06de991d6c7ebd0209ce672d9a1f0b44976c2fe98b5638d0fcc5f6823c6f0bfef81afb2817609a7cc0 WHIRLPOOL af6666199890f43f81a2b67c89e3b06cf081ae4351e24925e92c8f24164be81f5d2fcedaafc262eda672733e809a1a2a4f3042375893eafa0bd58de28c1cb966
AUX shorewallrc_new 1773 SHA256 24a169e763eea3926b8d1c44d62c52d3e2cad94eccea303376ba3e873e0a8224 SHA512 e080f4bce47fa5482dee46486e358ed17f35edeaf9050126b8c6f009cb29d1ca2ead2821153233e15fc18757f6cb72ff60f72b3f2d65aca32f9a63bc33a31f0e WHIRLPOOL 54311d12f85c1b9791a0e8db32878e7031c846471594400011236c58ef0183d75be960f65ce207d909758107a9bd13aee6fff2fc001b42651397ae877162e654
DIST shorewall-4.4.23.2.tar.bz2 401753 SHA256 0b8f77e4477e811718e73492e6264901953d8f70462af634c3c129597b588ff3 SHA512 167a8beac46e5ff634819d10f4d935f6db02f812cda8c975e225555ff82fa39c76706aee6e8fd2ed1113cb5e938d30949a7a5451186390a54d2d38f4d44ab043 WHIRLPOOL 04479ec8a772383938399aa026e100ecf2e0fa32511684dba1f95c2afee9e2105937ebbc272db773f07319ade0727a381f9cf38c1b0ea60ec706ac6a58100a27
DIST shorewall-4.5.11.2.tar.bz2 433099 SHA256 a4020d38c85b1566f795cdcfc3588f385b1fbee53677080cd6c93c29d9ced920 SHA512 573060c19db034193cd3c6b41abc09043569d998f136eee08fa8c898aa334585c22da5787a3e9fea6bf080d59feee57d9fd396f1262649389393d20f76e04003 WHIRLPOOL 2f0590c47d622f3b386d3b260c48bce81660b1ae5f8b5a2c992b3abfc96e3776fd45c75dd622b826bae49a91aa947af1b2e65343c98ef4d14b7762550a66d6fb
DIST shorewall-4.5.15.tar.bz2 447241 SHA256 c93e1cdd37f950256e7ab168f4f3fbf20f7a76fa191ba9003c2a4d94152150c6 SHA512 2e874579ac7b274bebdd1a86bf0c876dbdf8941505d4e25c19bead53548916f866f0ff5f476a417a9c1dccbd0f54516378f0af1f0fce513bd647db51d7db6ec9 WHIRLPOOL 550266e946db82368789aa2dba078e0e2e9022f0aec6361bbb83db6a1f652d24e8f14d0dc98a540c95dc536a66b410fd04e4c778d6dc47d3d4da6278450ac952
+DIST shorewall-4.5.17.tar.bz2 466628 SHA256 d78d4583938357a862d695630041037e35e13b70f031236b8885d23d6a65260e SHA512 64efb7202ed50d240f65977edd1d3d7b7ee487228ab90e1d2b10e58b50e5a91d808ff38e3b7eac332461da30e56652de923a73ad89b2169c9e34f48874ee4407 WHIRLPOOL 72bd0b3735c750aa1ea0c8945c58863bca220c5b600aba55756f73c42f550a3eb15575cd03374d76ae1cde51a0d730bd7599c69d1e5544e8e392f6486fe70542
DIST shorewall-4.5.8.2.tar.bz2 424120 SHA256 2874ce51d5e9070c9fe438b455f98a6f6adcf026bf4da78cc815570db7a36ffe SHA512 0daf5f72fc60f1c0356e077dab6b513d2795d97a0574de253849c2cb5e0024edad0e15db35c9e568229614badc882f03ca64ff12aeb3e898d2210974d9a420f6 WHIRLPOOL 28378ae9be776d9400d4593e54866b3fea984680e10b0a729d92ff717c66681faf45946bd43c5d9b8f4707050876dcf2f3bead0b9b031d04eb366285ab978af4
DIST shorewall-docs-html-4.4.23.2.tar.bz2 3638929 SHA256 8ee6d1250e777c8fcf4afaad4b2a9dc595f07ae0212dc2a0770e3f30dc1fb325 SHA512 0cfe18e2d2502b1275ae1ba08b05591653b9a5cc3d94dc027bbcce974a1863823611925b5d7e783e215b086bc21270ed36f6e7a967f3b23e68bf301e92a43fb7 WHIRLPOOL 11b3ad5dbf70e37585f278c78508e7d68db351dd3b4e5b04351fc42d7ccd1259215b7b0f5dba360eba9dfe4341f4a24209b22d9d3b64ba08a0a235270646d9af
DIST shorewall-docs-html-4.5.11.2.tar.bz2 4019184 SHA256 12fa6c1061f7a4f09dc4e687bcd9e9a46ba822abe815e7b7ba83ddafbb951639 SHA512 c79358f5d77836c5dec291a8521e59634d135987227c9570defbcb22b18576433d2ad58ff28c07f6334cc80bd5f546daabb41ba53f29db83c70e0c6b95fb169b WHIRLPOOL f3b183faa213adff1f48695cf685dee4dd60dea9398f9b1ad817f167dbd85b07b1bf0e6ae24c2f052b22ff73ea7b4a24ca0b6231cc880ddbc7745c231fa36cc2
DIST shorewall-docs-html-4.5.15.tar.bz2 4017169 SHA256 42dcd882d4a6beb9c91c382d9e4b33e93755e85c468b25b78a6e766cf8449be9 SHA512 e8ea003781599ed149eff9598277d0b77db74f3e66cd83d07e01604d160fb6687b74aaf5136af53bd00957aa62049b0e24001e1b56d58678bc1de336bdbc3a04 WHIRLPOOL 73a28b98b8e816159bb967991e3d8b4cbd6b75dfdfcef72089a784d196dc56366e3916e82b50efabeb0895f6cd54c6beffb1144908d706f3ffe97724907e6dce
+DIST shorewall-docs-html-4.5.17.tar.bz2 4022237 SHA256 a3103b221eda242d2d6debdaab743881b63fe158a6c88b69388dcf3b23f87a8a SHA512 c981574ccd2eeed36d1f4c844ce28efb5d6a389497e8ac372c362ea7d02c040fa153723455e4d5bc8b5046f314737d415625c7850fa31872febc73fe839822d4 WHIRLPOOL b9b5fe3a56bb76882fea7c0e21841499ed14878241960a25ca3c0a353fa2fcda59081b518d3c82b0efb419550b9cc09fe5499889b867bee00f9a01481d4a2911
DIST shorewall-docs-html-4.5.8.2.tar.bz2 3901788 SHA256 1f14523b5068c52bce6ad1d4d44b0c4b53a77651aa053db03c96aed756f15a38 SHA512 ee0718ca25ba148786be5d17c7dbf9380ccf96d636021234f95dd12c8e584d3918f8fa7d52dd8fa8a06d287efbbe22d090ae0ba3d622384b9de6235a4603e4ae WHIRLPOOL b83b85b2bb0d5bbab84306c1b84730f3a7100eb2e1bd39d524e16e6d341c5f124c5507b5222e088086300c552b0562d04f0cb5335fe74e04b615a9a9c5872511
EBUILD shorewall-4.4.23.2.ebuild 1919 SHA256 271c0cc319b8e4b23bb90051b7a7f799f4a983062c59edb512803d66ddd720ea SHA512 0b3d9a934224e6f0e2cbc5fa460a5058df6696b219492c8813b2d789f226996e8c2ff222dc7cda8ca62d8cd068b820b563819d3c450f7c9641090f1ac2dcc66b WHIRLPOOL f5127cc639a66df51884b64bdacd4203a05bf66cc4a319296f20061ac0bd535338ce86d400618e542bad2fe4834c2fcbc66bd43f8c50d2b8d87d0f62761ea5c3
EBUILD shorewall-4.5.11.2.ebuild 1914 SHA256 cb28357c0a4e55adb002cb88f22ef29c084743da414c9569b0a30bc030e39b75 SHA512 dcf994269a772d526ee6652248a478dccf53283e0cd5e99ae8575cffd92c96086b8ecb0f86816e55e31c24dc1abfa88d86a8ebaf5a0fb6a98f3454ec5175346f WHIRLPOOL 6551452175ca5ec438a55c078d5657a92c29bdced59361f9fa1df35676ee9bc2bf89feda88e052c2242cbcc5fa88f75e77387eb3a385677e7aaf7b3650387df3
EBUILD shorewall-4.5.15.ebuild 1452 SHA256 1c49c990199fea1eb51e8200f593bd59331485e1745af405d68a39dfa9dd659a SHA512 c700f68cca53c09e04e63630547c8fce5191ebaa46ecb8677d21fbfa2ecd3307a16721fe82f98e670b76cb4ae1f51504e39a350e14e626c2082f460145f451b5 WHIRLPOOL a09f8e7b877a8aa3ab958875a86c2d1f099eddae0ca3d8311694296200ba6e01369f2f320c60afd66f933c8a525691ea12639a399da2d454faf855998e2a6094
+EBUILD shorewall-4.5.17.ebuild 1543 SHA256 e1248a85db4e5e9a5f8660db4d5398d15070fb0f398f393d1a3abf36d700e599 SHA512 ee7e0c27cae3bf6b64909047ba0a9d70bc45af07dde25a31db892abcf8d7090d88f671864a328cee07733fc018390348dcba89bdb2445f96efee8135921f7070 WHIRLPOOL 165246e98d91d65dc45072378a470ca4fdf743038f31a9dc75cc8a64946a45f9ea45acdf9e513b72f9b31bcb803786e7d55812a5dfc35cd66f3ca66e44ed3389
EBUILD shorewall-4.5.8.2-r1.ebuild 1916 SHA256 0a18312379296e2e9f82dab31dffbf9cd3ac6499bc6d338eccb228fc718702ea SHA512 c601127620144f7820bb9da5c5da9129eec6195388962edf0307ab8c4c9ccffdea0b712311c05dc826d92ef0a674fde3697bab57f110d64d7451f52dd403f7d3 WHIRLPOOL e79729c48e12b1dd7c4927a7bc201e371f98e505689b43c7b49ef789ec4e50260aa719325c3b8d5e99bfa2a29ba523ab9ecef72c1bc2ffafcaadfd10d7ab0386
EBUILD shorewall-4.5.8.2.ebuild 1926 SHA256 dbfd74934d68bde10f08b2e5f864a7c32ba4ed9d6f7ba71eceafdfe0c88b28f4 SHA512 a96565aa4e29bc4fbb8bca42864ef18a2eb547b2454eaecad32cec2d34d152ea194d357dc2ed6f1fc779c213616fc4ab2f398e442a2cd3a790e8310e873f9f83 WHIRLPOOL 79fb029d945fe878c2593835a8b72603f54fc78ed251c834cf9a635fcefa7a9ef6ef0d642edcab6964a2f06a6f2cb6ecb345c1913c2dfa39c61581de864126c9
-MISC ChangeLog 32086 SHA256 705f320157c7804ca93f4a35c53ccea0efd91d798373a1f2ff79e93ce20ef5a4 SHA512 3c1b081ab29b7f969e6b5cb7797fa488200089c69e57c22998162be728156ad43424e28e5de36ab1278aef8fdfa545c930f74d1dd8adf75d892eee2b51ac7292 WHIRLPOOL e129018586cc936af78ad8ccaa753f03c00bfdac3b9a2ee394fc5d5f56e94c3f1a0a307cb31e35971f45a9818748fd90cd0001906f6cf6fc60252314ed2347be
+MISC ChangeLog 32338 SHA256 8b20564606ec4f5c8e4815c51587acb6d7f98ee798f8e2e38e3d7ec63da15c93 SHA512 9d53c3d2e32ce9deb5c6309e738bc2b7b4a67fe7a87e6106a48cdc3f34637cffe107372c5d1b8bdc407e4dfec991f3fca62efed5d9a20de3227386eed3aabbbb WHIRLPOOL 09bcd52509a5a09a78c00c80990e95dc77e2d81c1e420ec939e661c3f80b67fe567cdbcee37fd2f1237319063956ba3ec98bade9c4dfc6f6cdc106683e9d5f4a
MISC metadata.xml 275 SHA256 79fdedf162d8e4a13d3bd5b771e926ede25495b51424b45478f9c87a3519b10b SHA512 248a3902e8a5cc9a1a579ffa90e3a6f151b770f46eef21ea09c5b871d76bcf059d3c86cc7da57a5e979db92be0bd64b0f8174bed90a4ef0e98e65d58543ef938 WHIRLPOOL d1179529011fdd06a563d646ffe220b65fd220dd87783c056070de2241e98f1ce9f9fec0846f6ec11043dfe41595a3399966dfdd08d0f0f7118255aee05e67da
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEUEAREIAAYFAlGmHdcACgkQVWmRsqeSphOPKwCeKTRTP49uNcoooaE2tCiLwluQ
-s5oAmLO11GqvCI+naS/nhRY1bTQ0PeU=
-=m0Fz
+iL4EAREIAGYFAlGrIqVfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsM2RgD/VaqGpOsUNWDlZvqWdkCqBsgD
+su6TMIie2MJHM5N15qIBAKH53Y9M2Etg8gmcYmGchtK5JwP9NQZfhc5MEJX76pVM
+=yS/6
-----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/files/all_zone.patch b/net-firewall/shorewall/files/all_zone.patch
deleted file mode 100644
index 09384e19c831..000000000000
--- a/net-firewall/shorewall/files/all_zone.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Perl/Shorewall/Rules_orig.pm 2011-08-06 17:12:13.000000000 +0200
-+++ Perl/Shorewall/Rules.pm 2011-08-06 17:12:39.000000000 +0200
-@@ -1554,7 +1554,7 @@
- #
- # Handle Wildcards
- #
-- if ( $input =~ /^(all[-+]*)(![^:]+)?(:.*)?/ ) {
-+ if ( $input =~ /^(all[-+]*)(![^:]+)?(:.*)?$/ ) {
- $input = $1;
- $exclude = $2;
- $rest = $3;
diff --git a/net-firewall/shorewall/files/shorewall.systemd b/net-firewall/shorewall/files/shorewall.systemd
new file mode 100644
index 000000000000..bd4638d5dfaf
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall.systemd
@@ -0,0 +1,20 @@
+#
+# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
+#
+# Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
+#
+[Unit]
+Description=Shorewall IPv4 firewall
+After=syslog.target
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/shorewall
+StandardOutput=syslog
+ExecStart=/sbin/shorewall $OPTIONS start
+ExecStop=/sbin/shorewall $OPTIONS stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall/files/shorewallrc b/net-firewall/shorewall/files/shorewallrc
deleted file mode 100644
index 4f13769114a4..000000000000
--- a/net-firewall/shorewall/files/shorewallrc
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-HOST=linux #Generic Linux
-BUILD= #Default is to detect the build system
-PREFIX=/usr #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory
-CONFDIR=/etc #Directory where subsystem configurations are installed
-SBINDIR=/sbin #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man #Directory where manpages are installed.
-INITDIR=etc/init.d #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT #Name of the product's installed SysV init script
-INITSOURCE=init.sh #Name of the distributed file to be installed as the SysV init script
-ANNOTATED= #If non-zero, annotated configuration files are installed
-SYSTEMD= #Directory where .service files are installed (systems running systemd only)
-SYSCONFFILE= #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR= #Directory where SysV init parameter files are installed
-SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARDIR=/var/lib #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall/shorewall-4.5.17.ebuild b/net-firewall/shorewall/shorewall-4.5.17.ebuild
new file mode 100644
index 000000000000..e54542841cea
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-4.5.17.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.17.ebuild,v 1.1 2013/06/02 10:47:00 constanze Exp $
+
+EAPI="4"
+
+inherit eutils systemd versionator
+
+# Select version (stable, RC, Beta):
+MY_PV_TREE=$(get_version_component_range 1-2) # for devel versions use "development/$(get_version_component_range 1-2)"
+MY_PV_BASE=$(get_version_component_range 1-3)
+
+MY_P="${PN}-${MY_PV_BASE}"
+MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
+
+DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
+ doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND=">=net-firewall/iptables-1.2.4
+ sys-apps/iproute2[-minimal]
+ dev-lang/perl
+ =net-firewall/shorewall-core-${PV}"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ :;
+}
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ keepdir /var/lib/shorewall
+
+ cd "${WORKDIR}/${P}"
+ DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
+ newinitd "${FILESDIR}"/shorewall.initd shorewall
+ systemd_newunit "${FILESDIR}"/shorewall.systemd 'shorewall.service' || die
+
+ dodoc changelog.txt releasenotes.txt
+ if use doc; then
+ dodoc -r Samples
+ cd "${WORKDIR}/${MY_P_DOCS}"
+ dohtml -r *
+ fi
+ dodir /var/lock/subsys
+}
diff --git a/net-firewall/shorewall6-lite/ChangeLog b/net-firewall/shorewall6-lite/ChangeLog
index 96d0aa77da1f..526c5f80b7e4 100644
--- a/net-firewall/shorewall6-lite/ChangeLog
+++ b/net-firewall/shorewall6-lite/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-firewall/shorewall6-lite
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.50 2013/05/29 15:25:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.51 2013/06/02 10:50:14 constanze Exp $
+
+*shorewall6-lite-4.5.17 (02 Jun 2013)
+
+ 02 Jun 2013; Constanze Hausner <constanze@gentoo.org>
+ +files/shorewall6-lite.systemd, +shorewall6-lite-4.5.17.ebuild,
+ -files/shorewallrc:
+ Cleanup; Version bump; Systemd support wrt bug #465950
29 May 2013; Jeroen Roovers <jer@gentoo.org> shorewall6-lite-4.5.15.ebuild:
Stable for HPPA (bug #470544).
diff --git a/net-firewall/shorewall6-lite/Manifest b/net-firewall/shorewall6-lite/Manifest
index 2eded086eac4..b7e91aa17ed8 100644
--- a/net-firewall/shorewall6-lite/Manifest
+++ b/net-firewall/shorewall6-lite/Manifest
@@ -2,26 +2,31 @@
Hash: SHA256
AUX shorewall6-lite.initd 1643 SHA256 92098c57a35eff951e31f1e7afb1cc5ed25215c9376ad141fc24f2569ea5e9a9 SHA512 a0631c5450a874ecedb08c4ab7b50e274ccc48f10951d12f64eec7c918809a7555fbcb19d1575f79e009167b7666e3d10ed648274674a3f6717c19be076231b0 WHIRLPOOL 02309caba6934d0b1f3b0f8ace37e5c381f52ebfc85d52bfd7ca3b5a242797aeccaeef836502cf9857a4cd035146e88b2be48f90284b5caadc4c3c793eae2e5d
-AUX shorewallrc 1683 SHA256 914b874771e888f31959ac0fe912490cac03fc669b53afd44388458c58fa252f SHA512 17adf61f0fb906bfb7ee64c090da1f212c6e7c0962a05afcceb3b074375cffcb8c6f41362912e3d9580a75a906d5275dbeaea6d12c896e343fcbf569389034b6 WHIRLPOOL 48413cb257ae80e35064730794a0a263f0f42bb1bd354b6d12b48f7a6acc7d477d9c931db06e65e613d075b249e1f2597ebb3126b4ad477de7bb60defb4d45d2
+AUX shorewall6-lite.systemd 475 SHA256 95dec92e61eda3543ada0bc05c9eecf87ca5dcc449448b5c04dbcf72045006cb SHA512 a9a258b0b430a88bcf6d6ccec56ded96422c0c52574cd45b552c04f4c1b5758476ea708d13b517dab686d859f4a503a348de6bd2acb5e60797172e502e387831 WHIRLPOOL c38c053ade59895c5605182241e154ab2624187a8367f7d371111ccdf5f4145d32b3c3bc358fb590d85cd044ad1c76a7f49af57d6ea6ec71fa25f773b644fd0f
AUX shorewallrc_new 1773 SHA256 24a169e763eea3926b8d1c44d62c52d3e2cad94eccea303376ba3e873e0a8224 SHA512 e080f4bce47fa5482dee46486e358ed17f35edeaf9050126b8c6f009cb29d1ca2ead2821153233e15fc18757f6cb72ff60f72b3f2d65aca32f9a63bc33a31f0e WHIRLPOOL 54311d12f85c1b9791a0e8db32878e7031c846471594400011236c58ef0183d75be960f65ce207d909758107a9bd13aee6fff2fc001b42651397ae877162e654
DIST shorewall-docs-html-4.4.23.2.tar.bz2 3638929 SHA256 8ee6d1250e777c8fcf4afaad4b2a9dc595f07ae0212dc2a0770e3f30dc1fb325 SHA512 0cfe18e2d2502b1275ae1ba08b05591653b9a5cc3d94dc027bbcce974a1863823611925b5d7e783e215b086bc21270ed36f6e7a967f3b23e68bf301e92a43fb7 WHIRLPOOL 11b3ad5dbf70e37585f278c78508e7d68db351dd3b4e5b04351fc42d7ccd1259215b7b0f5dba360eba9dfe4341f4a24209b22d9d3b64ba08a0a235270646d9af
DIST shorewall-docs-html-4.5.11.2.tar.bz2 4019184 SHA256 12fa6c1061f7a4f09dc4e687bcd9e9a46ba822abe815e7b7ba83ddafbb951639 SHA512 c79358f5d77836c5dec291a8521e59634d135987227c9570defbcb22b18576433d2ad58ff28c07f6334cc80bd5f546daabb41ba53f29db83c70e0c6b95fb169b WHIRLPOOL f3b183faa213adff1f48695cf685dee4dd60dea9398f9b1ad817f167dbd85b07b1bf0e6ae24c2f052b22ff73ea7b4a24ca0b6231cc880ddbc7745c231fa36cc2
DIST shorewall-docs-html-4.5.15.tar.bz2 4017169 SHA256 42dcd882d4a6beb9c91c382d9e4b33e93755e85c468b25b78a6e766cf8449be9 SHA512 e8ea003781599ed149eff9598277d0b77db74f3e66cd83d07e01604d160fb6687b74aaf5136af53bd00957aa62049b0e24001e1b56d58678bc1de336bdbc3a04 WHIRLPOOL 73a28b98b8e816159bb967991e3d8b4cbd6b75dfdfcef72089a784d196dc56366e3916e82b50efabeb0895f6cd54c6beffb1144908d706f3ffe97724907e6dce
+DIST shorewall-docs-html-4.5.17.tar.bz2 4022237 SHA256 a3103b221eda242d2d6debdaab743881b63fe158a6c88b69388dcf3b23f87a8a SHA512 c981574ccd2eeed36d1f4c844ce28efb5d6a389497e8ac372c362ea7d02c040fa153723455e4d5bc8b5046f314737d415625c7850fa31872febc73fe839822d4 WHIRLPOOL b9b5fe3a56bb76882fea7c0e21841499ed14878241960a25ca3c0a353fa2fcda59081b518d3c82b0efb419550b9cc09fe5499889b867bee00f9a01481d4a2911
DIST shorewall-docs-html-4.5.8.2.tar.bz2 3901788 SHA256 1f14523b5068c52bce6ad1d4d44b0c4b53a77651aa053db03c96aed756f15a38 SHA512 ee0718ca25ba148786be5d17c7dbf9380ccf96d636021234f95dd12c8e584d3918f8fa7d52dd8fa8a06d287efbbe22d090ae0ba3d622384b9de6235a4603e4ae WHIRLPOOL b83b85b2bb0d5bbab84306c1b84730f3a7100eb2e1bd39d524e16e6d341c5f124c5507b5222e088086300c552b0562d04f0cb5335fe74e04b615a9a9c5872511
DIST shorewall6-lite-4.4.23.2.tar.bz2 91907 SHA256 35fdfd2df47a347e5f79c798f3ce30e3dcdc8bfaabc1c3fee98189c0aa2d4e45 SHA512 960dbf0b9cde1330b3a091b7b619c35cda504d233f5d3279f0dbfb01df02291c23ff991a16e3f8e17dfac6250999f60df87dd2e680a257752a64e6b7a3d3ad70 WHIRLPOOL 349fe99860f6ed7b095fcfaeb1a2676882170a86bfa125ca4af3f6cde68d9a66c344935eca3f2be007c956c9fa6fa4d9f8ec08f572658d895951b16fadb16de2
DIST shorewall6-lite-4.5.11.2.tar.bz2 62431 SHA256 1783449b87c28e88323551437d19d2d3395d9bfa48af6a7aec20f5de21397ab0 SHA512 673e4cb0250b089562eb62980147ccca0b197a686d90e43489ca2f843f041092086f5340748cfeae8a803d5b7beee8783eaab4014468d30e61d1679f602d98ce WHIRLPOOL cebf0e33e7900ad877e82c7ad37b709b2296b00e9c1598188ef093502b27e62273bef4dd74e320d120af9acb0e26c582458c45543fcc624f5f0a41547fdb2ac2
DIST shorewall6-lite-4.5.15.tar.bz2 68632 SHA256 f0924b69fd9dec06f43ef1fadc570056bab75fcc148b3affdd0acf62ba9e0c1f SHA512 e1e7df44abc960e3bbd6a558b8b39f01e3c0b5be3a1bab6db97547c6c784f10a985750ba1915493facc426c78da7219bcfaa8675528769c5e40fb29e0aa03e72 WHIRLPOOL 9a85c8a1a30ed439121cc1a7eedcced5fbdfe29d7dc70dc0cf2890bbb6f9f266d380595ddf39580748def47b37e5bac91143a8d79264729a19aba69af6e1e0d8
+DIST shorewall6-lite-4.5.17.tar.bz2 72465 SHA256 0e52a435eb06cb3d32268f9886b52d3841d2d250f0828bc115cb6f9b7f1675b9 SHA512 16247b72163d50b33b920c749bb86b19385adf40a1dde82ec330c85c26bb1aa3ab519c49e0a44da77c2987eadfcdab3feffe12dc09748700221f6f5bb0d46206 WHIRLPOOL 4163a5abec716649b615c266e3d210f58c7c64d4bfd64236a63e9193a1675d475e7c0e3dd167bcd47c30a5bef8524a0c3d175c8a4943771a82d8fa8fd97ca50f
DIST shorewall6-lite-4.5.8.2.tar.bz2 56684 SHA256 7b3aa533583b957d8dc58c2c8fe07757347c9336603c171cef24223b31d6cba3 SHA512 1001100bca6837376fbd052b7a003808b74cbb6e2147c29f714e4bc32a38fdac6d2c84ea068b34501b357aeedfb46515a24f833b67d5508bc947f17082c89cda WHIRLPOOL 0045aa6b8b6c26c40c8836fac31d2890fadf538dc21937e63e3bad1e540253351db04db3ce73dfd1759f691742d05294ed61174b9c09b8b20bbd381f43b84f79
EBUILD shorewall6-lite-4.4.23.2.ebuild 1414 SHA256 b152680986f69edd4ddca3f071bf918c7792fe9e265334880ca9d01b20217b85 SHA512 b1f8112352fafb00fcf3f6913931e9137350557840576585e804e4d49a233658b183e1998178ee0098066b255c92a65b996a89dc1da0960175ea5a3c641ab3c9 WHIRLPOOL 84cbbb2a58758e9e463fd856036fac56cb4447e60d6d70af1174e4500a3547ee66c72fc2161b015ef7073ebac9fe849433af6915d9835c973e6c258fead71de2
EBUILD shorewall6-lite-4.5.11.2.ebuild 1511 SHA256 8667ec69c0cf67262c0f5b115c1aa7d621acfecb639167a9b4434e843178b416 SHA512 f19e34b46d9fc9b6203a785651a234383facf1ff565f366e010a687e9aee14b67eacb391f82c23e2edb16489d7be2f662a362f1177e895c20a5f13b1f78dc1ba WHIRLPOOL 3c0684f46076dfaba940ad7010607992dbc45e6b1628fe5bf427f7f478cb3a2536bfc8365ce4a209911c66e4968ae342a813f928bd4c11b9255107eaf35e238f
EBUILD shorewall6-lite-4.5.15.ebuild 1502 SHA256 7f931d99ae6a9f90d152865b987da940a88a29c6b709ffcd0e4a91c6fb5b6b14 SHA512 998c37ece0f1ba8a12bc5eaa468a5cccac7f7f75d44532170fece61cb21b47cc845271b6e751f4ab15fe4f01fbc1c910bebe6023b077bd0ba987a3078e24979f WHIRLPOOL c4c488f857360d38c02b314a6d420fa784d926eaf2298ca2be681459d01dcaa689e1bb887d2c9572f385de3404dbdb9000278477a4537b9a03294c616f0c4abc
+EBUILD shorewall6-lite-4.5.17.ebuild 1605 SHA256 33dda1bfd9571c2104bb6674a7a72aed955087f9bf63879d11b9e1be5bef7202 SHA512 e19cec661d682b7dee3c897bffafdcae2fd72287d29a54301bf76f6f45076844fcb280748c50fda612076da918042703a00149f92edce3ca9d3fa1e02fc80e58 WHIRLPOOL 2a84bf27b55ee147974388ab711d56b2cb092ddf1db8ac71b1fcad1eb5122c5bfba26eb37fcc4c5c1747f1a0c9d161110a08336b2a35befcb4d87bf2185fcc56
EBUILD shorewall6-lite-4.5.8.2.ebuild 1499 SHA256 5da76bc4a775407f51bee84247da055da323ec32c2972bf43fd8696338045f8d SHA512 407e5fdc0371fef124cb029e3a87c5bc21e88c0c97a08382d05ef46956643057b119e1d45ef41fcd83c9b071aa992130c428bc75c5988a08d04db56a4e800a7b WHIRLPOOL 16018555f77b44c78a41abbeb012ed776b4bbaa3e9c6e4663551df472cd564bf0260e2daf74a2b636173742e0f08f522e239b161440f7edd1cf4dad243dd3aca
-MISC ChangeLog 8902 SHA256 d63f2b5bb640c4b537ca1326687e1316f8198ab1943ec0805ecbb32bf5fb795c SHA512 219791010ac841a0cfb621e7448efbf60c68faa38b395b88a86ad5f604974fe8410385fd67ca42ae42aff0791f2ccdb328aa979508d1c72bbfa9fc21a45515d4 WHIRLPOOL 1b7f75688dcb53359c80a470af1154b48a78f1e779a74a6afd26038fa1319790f6bf78f33ef9d427cb9189089215493a765295b1ad13f601c32dafcd8815ba78
+MISC ChangeLog 9149 SHA256 5975971fc436d121d0005606000e2e4e2241aa7e69d68d2f32e836cb3d473f43 SHA512 cb9377eb962a7916bfcba5aade0768e6451ee3ba5797a0fab8752204e90538d622b35e11291a748af92f24a995d8ce78693d4b776d18a991c6c600e21823e705 WHIRLPOOL 66b22cc71c9b3a76c6c68c2e08d84e2ea3d2e0ad13c6c1bac24212da8ecd73f64d34874a120bbd6944de2aab9102a06fa142149edc1f08e595b25e50210913d1
MISC metadata.xml 275 SHA256 79fdedf162d8e4a13d3bd5b771e926ede25495b51424b45478f9c87a3519b10b SHA512 248a3902e8a5cc9a1a579ffa90e3a6f151b770f46eef21ea09c5b871d76bcf059d3c86cc7da57a5e979db92be0bd64b0f8174bed90a4ef0e98e65d58543ef938 WHIRLPOOL d1179529011fdd06a563d646ffe220b65fd220dd87783c056070de2241e98f1ce9f9fec0846f6ec11043dfe41595a3399966dfdd08d0f0f7118255aee05e67da
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlGmHgYACgkQVWmRsqeSphMl9gCdHaMFbSDpI5AId0P8b6E2W2P8
-mRQAmQE5M7Db2C+4PiUdDlvx06nj1xIr
-=xf+h
+iL4EAREIAGYFAlGrI2dfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsMaTAD+IA4JpynBttiY1Q1Bd9FRQX/V
+B5n1pSgf5Y2/bsFWd1sA/AyKqvr3vPxSrgeWYCX9r9L4Msi2CiZ5BBdrfro6/X+j
+=7uxT
-----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall6-lite/files/shorewall6-lite.systemd b/net-firewall/shorewall6-lite/files/shorewall6-lite.systemd
new file mode 100644
index 000000000000..c34c688b137d
--- /dev/null
+++ b/net-firewall/shorewall6-lite/files/shorewall6-lite.systemd
@@ -0,0 +1,20 @@
+#
+# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
+#
+# Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
+#
+[Unit]
+Description=Shorewall IPv6 firewall (lite)
+After=syslog.target
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/shorewall6-lite
+StandardOutput=syslog
+ExecStart=/sbin/shorewall6-lite $OPTIONS start
+ExecStop=/sbin/shorewall6-lite $OPTIONS stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6-lite/files/shorewallrc b/net-firewall/shorewall6-lite/files/shorewallrc
deleted file mode 100644
index 4f13769114a4..000000000000
--- a/net-firewall/shorewall6-lite/files/shorewallrc
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-HOST=linux #Generic Linux
-BUILD= #Default is to detect the build system
-PREFIX=/usr #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory
-CONFDIR=/etc #Directory where subsystem configurations are installed
-SBINDIR=/sbin #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man #Directory where manpages are installed.
-INITDIR=etc/init.d #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT #Name of the product's installed SysV init script
-INITSOURCE=init.sh #Name of the distributed file to be installed as the SysV init script
-ANNOTATED= #If non-zero, annotated configuration files are installed
-SYSTEMD= #Directory where .service files are installed (systems running systemd only)
-SYSCONFFILE= #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR= #Directory where SysV init parameter files are installed
-SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARDIR=/var/lib #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.17.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.17.ebuild
new file mode 100644
index 000000000000..6a215e6a4f07
--- /dev/null
+++ b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.17.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.5.17.ebuild,v 1.1 2013/06/02 10:50:14 constanze Exp $
+
+EAPI="4"
+
+inherit linux-info systemd versionator
+
+# Select version (stable, RC, Beta):
+MY_PV_TREE=$(get_version_component_range 1-2) # for devel versions use "development/$(get_version_component_range 1-2)"
+MY_PV_BASE=$(get_version_component_range 1-3)
+
+MY_PN="${PN/6-lite/}"
+MY_P="${MY_PN}-${MY_PV_BASE}"
+MY_P_DOCS="${MY_PN}-docs-html-${PV}"
+
+DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6."
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
+ doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=net-firewall/iptables-1.4.0
+ sys-apps/iproute2
+ =net-firewall/shorewall-core-${PV}"
+
+pkg_pretend() {
+ if kernel_is lt 2 6 25 ; then
+ die "${PN} requires at least kernel 2.6.25."
+ fi
+}
+
+src_configure() {
+ :;
+}
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ keepdir /var/lib/${PN}
+
+ cd "${WORKDIR}/${P}"
+ DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ systemd_newunit "${FILESDIR}"/shorewall6-lite.systemd 'shorewall6-lite.service' || die
+
+ dodoc changelog.txt releasenotes.txt
+ if use doc; then
+ cd "${WORKDIR}/${MY_P_DOCS}"
+ dohtml -r *
+ fi
+}
diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index acc1652d8020..476fb7bf19e0 100644
--- a/net-firewall/shorewall6/ChangeLog
+++ b/net-firewall/shorewall6/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-firewall/shorewall6
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.67 2013/05/29 15:25:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.68 2013/06/02 10:49:07 constanze Exp $
+
+*shorewall6-4.5.17 (02 Jun 2013)
+
+ 02 Jun 2013; Constanze Hausner <constanze@gentoo.org>
+ +files/shorewall6.systemd, +shorewall6-4.5.17.ebuild, -files/shorewallrc:
+ Cleanup; Version bump; Systemd support wrt bug #465950
29 May 2013; Jeroen Roovers <jer@gentoo.org> shorewall6-4.5.15.ebuild:
Stable for HPPA (bug #470544).
diff --git a/net-firewall/shorewall6/Manifest b/net-firewall/shorewall6/Manifest
index 99a408b27792..91eeb575d9a4 100644
--- a/net-firewall/shorewall6/Manifest
+++ b/net-firewall/shorewall6/Manifest
@@ -2,28 +2,33 @@
Hash: SHA256
AUX shorewall6.initd 2070 SHA256 7d71536f017e16f51fd796548d1c1d1c3f30c340cd1506c5db609b3a3e9cede5 SHA512 dca84358f889fe6ca40f44a8fa499a93487a4a596612cc24604c7ca114a52b7d1c5b3c88fec1f48269ef08b67c9cdc6547a9899c7153800083d4ea26d03f61c8 WHIRLPOOL 32aaff95ba26fe0674390742212a25ac1b249123405c99330bd31e4e0bccd1199ebf75cff45cf706e267c1a92ccbc524c9a58332b4a8007dd000c3faf6eb1738
-AUX shorewallrc 1683 SHA256 914b874771e888f31959ac0fe912490cac03fc669b53afd44388458c58fa252f SHA512 17adf61f0fb906bfb7ee64c090da1f212c6e7c0962a05afcceb3b074375cffcb8c6f41362912e3d9580a75a906d5275dbeaea6d12c896e343fcbf569389034b6 WHIRLPOOL 48413cb257ae80e35064730794a0a263f0f42bb1bd354b6d12b48f7a6acc7d477d9c931db06e65e613d075b249e1f2597ebb3126b4ad477de7bb60defb4d45d2
+AUX shorewall6.systemd 453 SHA256 9e1e5d7657591a395b3f66849f323e00226c0bf739e7c875b9787b43cc64d11c SHA512 a7cfe34c106bdc2d50cceb607d92888f4c6b0d618d5dfa96f0c3a78689ab1f2092db609427393718495ed6753f89a4279e6883d44743da6bdeb1da3a111b1da3 WHIRLPOOL bd4253a8b58975674bd40b0606efcbcbdc6facf8ecb48e9c14792f96fa1fe49eb84fb05f89e7a54b1cd01d7f9b4463894670738b3b0b0ad2b7a01fbadc64ade6
AUX shorewallrc_new 1773 SHA256 24a169e763eea3926b8d1c44d62c52d3e2cad94eccea303376ba3e873e0a8224 SHA512 e080f4bce47fa5482dee46486e358ed17f35edeaf9050126b8c6f009cb29d1ca2ead2821153233e15fc18757f6cb72ff60f72b3f2d65aca32f9a63bc33a31f0e WHIRLPOOL 54311d12f85c1b9791a0e8db32878e7031c846471594400011236c58ef0183d75be960f65ce207d909758107a9bd13aee6fff2fc001b42651397ae877162e654
DIST shorewall-docs-html-4.4.23.2.tar.bz2 3638929 SHA256 8ee6d1250e777c8fcf4afaad4b2a9dc595f07ae0212dc2a0770e3f30dc1fb325 SHA512 0cfe18e2d2502b1275ae1ba08b05591653b9a5cc3d94dc027bbcce974a1863823611925b5d7e783e215b086bc21270ed36f6e7a967f3b23e68bf301e92a43fb7 WHIRLPOOL 11b3ad5dbf70e37585f278c78508e7d68db351dd3b4e5b04351fc42d7ccd1259215b7b0f5dba360eba9dfe4341f4a24209b22d9d3b64ba08a0a235270646d9af
DIST shorewall-docs-html-4.5.11.2.tar.bz2 4019184 SHA256 12fa6c1061f7a4f09dc4e687bcd9e9a46ba822abe815e7b7ba83ddafbb951639 SHA512 c79358f5d77836c5dec291a8521e59634d135987227c9570defbcb22b18576433d2ad58ff28c07f6334cc80bd5f546daabb41ba53f29db83c70e0c6b95fb169b WHIRLPOOL f3b183faa213adff1f48695cf685dee4dd60dea9398f9b1ad817f167dbd85b07b1bf0e6ae24c2f052b22ff73ea7b4a24ca0b6231cc880ddbc7745c231fa36cc2
DIST shorewall-docs-html-4.5.15.tar.bz2 4017169 SHA256 42dcd882d4a6beb9c91c382d9e4b33e93755e85c468b25b78a6e766cf8449be9 SHA512 e8ea003781599ed149eff9598277d0b77db74f3e66cd83d07e01604d160fb6687b74aaf5136af53bd00957aa62049b0e24001e1b56d58678bc1de336bdbc3a04 WHIRLPOOL 73a28b98b8e816159bb967991e3d8b4cbd6b75dfdfcef72089a784d196dc56366e3916e82b50efabeb0895f6cd54c6beffb1144908d706f3ffe97724907e6dce
+DIST shorewall-docs-html-4.5.17.tar.bz2 4022237 SHA256 a3103b221eda242d2d6debdaab743881b63fe158a6c88b69388dcf3b23f87a8a SHA512 c981574ccd2eeed36d1f4c844ce28efb5d6a389497e8ac372c362ea7d02c040fa153723455e4d5bc8b5046f314737d415625c7850fa31872febc73fe839822d4 WHIRLPOOL b9b5fe3a56bb76882fea7c0e21841499ed14878241960a25ca3c0a353fa2fcda59081b518d3c82b0efb419550b9cc09fe5499889b867bee00f9a01481d4a2911
DIST shorewall-docs-html-4.5.8.2.tar.bz2 3901788 SHA256 1f14523b5068c52bce6ad1d4d44b0c4b53a77651aa053db03c96aed756f15a38 SHA512 ee0718ca25ba148786be5d17c7dbf9380ccf96d636021234f95dd12c8e584d3918f8fa7d52dd8fa8a06d287efbbe22d090ae0ba3d622384b9de6235a4603e4ae WHIRLPOOL b83b85b2bb0d5bbab84306c1b84730f3a7100eb2e1bd39d524e16e6d341c5f124c5507b5222e088086300c552b0562d04f0cb5335fe74e04b615a9a9c5872511
DIST shorewall6-4.4.23.2.tar.bz2 217934 SHA256 ecf8339cafbc8e2b98c647e95b6876191147a54e22d51f55356fc7fa6aa4089c SHA512 ab877e4c78620f7de9490a30c8993715d0548bf3a6a8b834f6183221e0a8dd997f88faca3780cf0de66e4ae17936f3fdad0d5662f147ad62f5362723be4268e8 WHIRLPOOL 406edba6b2f9e262f76fe85e24d45467b849fd5b8d70db186ec80792fdac51bbba961b68807975b45e2f5608b1f3ced330a4ffcb2d00b27b27c943c335cbd2df
DIST shorewall6-4.5.11.2.tar.bz2 220837 SHA256 63151c7cd2ad2cb3daa7cf16384d86492f6d2b288104cfe61da03941bbdb6e5c SHA512 3060a8a70cd98f1b81f3c70ae0fd3c6d990a017b9b75f1126dc5a7ec37dcab7223e2ae2c8e6a3284f5bac14574183ce8beab3d67cb070a37bc7f42a105942f91 WHIRLPOOL e0f35f01cddbf307bdaa7fba74d1ec4fa3fa02d8be5c7688dab9bb5b8fd9b03be1c33f13d381970124bd3d3d00e04569581d6c725c3c739e712586a8834cd725
DIST shorewall6-4.5.15.tar.bz2 236074 SHA256 0b8229255c93860f70efaa6698276521290bd22abb4905fdfc1d03828ce9a56f SHA512 6a138aab3ea6f8191f5a7d457504d9776d193e4cd03e2ad580c0e4de4b646773c381f265c6ba59cbc6d83b74e4f422556b001f9ec8e98e39a0e1b1a1dccd4797 WHIRLPOOL 6a87765a077d2699c0e5670ff3bc52d49371c656d77cd0e82c966f003c3992ea05f3c367f15fd4296c07b4845dcb34225b1f0435ad7949bff6f0b670c367de37
+DIST shorewall6-4.5.17.tar.bz2 243900 SHA256 3ed035858161a44bb68025a27adb986ff76607b0f991054b159d3d246a792ad0 SHA512 c24e95a66396971ccc433ced9ffe01e43d59786c8eb162d218970765a03c6255633ac9bfd1d44428243e2bcbb4f5bfdda751f6f17bf0a4b035d47d4786e60cfe WHIRLPOOL ad9df6fb64b49c863ed47d7ca99a43451e489f673b20b96ffdb8357ca862496e4a057710f073472db9736ee64ff0ff7e326352d26c0dc3697b18adf0102be102
DIST shorewall6-4.5.8.2.tar.bz2 209021 SHA256 c7262e0f11e7e253d4cc3ed0378d4691155d9d8410491887dc3f3db35d73e23e SHA512 e6d2c73da60695b3e197d82201b0326a88a142e4275f23ed4a3cd546bc15b94383cb093b20fffefba32d9a49aa045db2a116c6286d2a0b405fa8bdc3b2a68676 WHIRLPOOL 52a600e1b03e1cf66893c8e0f92394d8260bb176ad036257c29f07fa65f132d1fcd847efa707a2712acfc250db628847728984c5dc7ea2fd9c8df71a55f05692
EBUILD shorewall6-4.4.23.2.ebuild 1575 SHA256 7a42b9d0d5a27a4ee9888d6eb9326d972c2e905813f0a5630acd7ed4fa731e66 SHA512 19ed4f7d75a48ecd4391acc2e24015c26ef585961d666a95066702794ad7e72a4f9e6d1ac175d46cf5141fc7a5e383a8eec72bc1df0727ab5822b583b16919d1 WHIRLPOOL f7e5779dc2230ba54252b2f1c0f62f3157716eb7c9c808a20d0d914b5df607ec7eeaa56dfdb70ecdd6da9710f8ec03090694f625e26811b1c2c509f5e9d06dd1
EBUILD shorewall6-4.5.11.2-r1.ebuild 1587 SHA256 d86d0d0f3756697bd02525697369d0a7858157e2a084443eced664cd9afea1d5 SHA512 43141dd55c618cf9f309479e6384d344114494a025f4954b3b10e5e5076448f820a014b5b66dca9c4702370fb407887be942dfea038790e00c5e4c9322d23c4a WHIRLPOOL c14230b74c1a521668a80117e86d720a2e404904367cb1aadb63bf8c88ae63914412c60bb0f69d3979fda003bd34036328e451252e246bfc923ca11ec5624eae
EBUILD shorewall6-4.5.11.2.ebuild 1586 SHA256 d70444581b895024f70dc00547fc574757675364f997135e140a38e304011b56 SHA512 c2a25866a49eea0ce4160e4d532edfff5a71e3e634ebb8527c69a216acde0a5c8798999daf1e6c38031b7ba45acf8c0bc4350593cca7d86fca9ae730a1e2b61d WHIRLPOOL 93b4caec5414c61bf3faf378996e995ecd581afb5df649404651b0be2279b27e5672d71ec4b93ef0af199f11c22b5183c5e532298f64972ea0afc06bf48f01b2
EBUILD shorewall6-4.5.15.ebuild 1575 SHA256 648a0469bb30e5282d672d27a2343af5e3fe78af13a81f9ad1ace4996702efea SHA512 bfdc103145aed66fc8d1b6416a44f3250b4f4f3be860650fd65461a5b25bc3d4af35f03c1182e9f9489d2b773f29bdf4478bc386fa8224242f343a8bc10cc1b3 WHIRLPOOL 8880ee0779c5c30b0202b39c5ae39573334b7d33dc7b9f06154fd0c549e860f0802f4d8b9940fd43b40cd9c1b47a559051a54796c35b18bf572d8d962382d640
+EBUILD shorewall6-4.5.17.ebuild 1668 SHA256 daf43b8accbd15401397c2e0338ca7918eaf1866ad0245e4bb6c49251fe8a2fc SHA512 2c387ffcd8c5a2ace2140047afbbc5c99febfd8a23707970a1d3806a4160b522030e33d71fc6c769ab9b4c3713a112c6d0294063ab45783bb408a98a84dc5306 WHIRLPOOL 56bc09fe8238bd3d7884549fcfaf00b1f25ba3157b8d5e5e215824d3cb528169d475b4c7c8ba9abdbc7751f477d8b4d29c59f6b4028d26cbf815fac73e2f0cd6
EBUILD shorewall6-4.5.8.2-r1.ebuild 1575 SHA256 e4fe571dd6feb4bc49cd19994b122a6d695daff1a691c77089579ab295bc43df SHA512 fa293c7c1e3129d5fb40ae82f53df0871606bc697c2d56f45873806e4ea362178dda49eeb9c35c0b4d88efd07ed5cb2cd6731cf88a4b85dd92e01eb3ca0d4f45 WHIRLPOOL 3af8bad253a7b79d6986871d7be9a754a2c896d333d2353be8f3f4d6c2aa59529f0e0cdcb116bc8e555f6b370f25468771cf47d725f6c52472093ee3aaf0423b
EBUILD shorewall6-4.5.8.2.ebuild 1585 SHA256 f5c52303dc914bd415f14acce9f37eef616a746c5d8fa94b04f3c3a627b0ca69 SHA512 736e240bcfefca9643179cf31af051e6375311d1bdd67bd0718ef96ac3d87fb11785e218986ca4b41f3d325f506d9008b05737d32beee0b3b59c858b079e170e WHIRLPOOL 9bb824aac60ba90e3ec67b0e87f5b0abdfc0d94356e1d88ef54f7fffc59009115fb6edd8c7254f8f8daef1f06fa951c3f0d86ab42c3e0920a62d4f3069741b63
-MISC ChangeLog 10714 SHA256 de98afb374f6b68b2aa93c53a5ad8cf6c3881dff644f225335698c2b28a42d07 SHA512 c751cc797ea5c5dff4fbe8909c277dcce1145e413e08aab99a468b01281955167a262654475d06813aaedcb04116b89fa456032e5320e9f692d0285248c42d69 WHIRLPOOL 3e8740aa06054a41782eca5dff09b04efa6623e757f7ca9541dc20ae8c39d920cf7a7dcc856560aebec09de96f357297a5ac8675c8c59f8e18c99011b288aeac
+MISC ChangeLog 10944 SHA256 070bda7c0dbca9802f67161ec21b864ac41f73d9f3ae3dd940c01e90b9d894da SHA512 31fb01d8b5229c3eab36dfce24a8aeb679b491afaf9a86a5a0b8c71d848c970a97c7b6997cb69d7aab639b7578986fdf02e54eff3808aec822119949427710de WHIRLPOOL f9911c2df3a4ce94762d1bc546d2618ab59eb4d774a49c04c9d4749802d5ce8b0f49416f87daa1f7b749daf0b52fd002447fe4d3f28e86872a125b3a1dd7e57d
MISC metadata.xml 275 SHA256 79fdedf162d8e4a13d3bd5b771e926ede25495b51424b45478f9c87a3519b10b SHA512 248a3902e8a5cc9a1a579ffa90e3a6f151b770f46eef21ea09c5b871d76bcf059d3c86cc7da57a5e979db92be0bd64b0f8174bed90a4ef0e98e65d58543ef938 WHIRLPOOL d1179529011fdd06a563d646ffe220b65fd220dd87783c056070de2241e98f1ce9f9fec0846f6ec11043dfe41595a3399966dfdd08d0f0f7118255aee05e67da
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlGmHfAACgkQVWmRsqeSphNtNACeJJLhhpBGxTXffbakWZDyuZSt
-/2sAn0SspoarJD2QFsi8KFqsE3QsOflI
-=rDji
+iL4EAREIAGYFAlGrIyRfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsPNlAD+IeCwbVbYycFocljLkX2Q1xSm
+sN5BtECv1ZaLEZg2VOUA/Rv5bbwoMFc6UmbFHoQBE7qKDx/r51KzwYFNQlWlOGyc
+=ToVM
-----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall6/files/shorewall6.systemd b/net-firewall/shorewall6/files/shorewall6.systemd
new file mode 100644
index 000000000000..1c6e95374a80
--- /dev/null
+++ b/net-firewall/shorewall6/files/shorewall6.systemd
@@ -0,0 +1,20 @@
+#
+# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
+#
+# Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
+#
+[Unit]
+Description=Shorewall IPv6 firewall
+After=syslog.target
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/shorewall6
+StandardOutput=syslog
+ExecStart=/sbin/shorewall6 $OPTIONS start
+ExecStop=/sbin/shorewall6 $OPTIONS stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6/files/shorewallrc b/net-firewall/shorewall6/files/shorewallrc
deleted file mode 100644
index 4f13769114a4..000000000000
--- a/net-firewall/shorewall6/files/shorewallrc
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-HOST=linux #Generic Linux
-BUILD= #Default is to detect the build system
-PREFIX=/usr #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory
-CONFDIR=/etc #Directory where subsystem configurations are installed
-SBINDIR=/sbin #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man #Directory where manpages are installed.
-INITDIR=etc/init.d #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT #Name of the product's installed SysV init script
-INITSOURCE=init.sh #Name of the distributed file to be installed as the SysV init script
-ANNOTATED= #If non-zero, annotated configuration files are installed
-SYSTEMD= #Directory where .service files are installed (systems running systemd only)
-SYSCONFFILE= #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR= #Directory where SysV init parameter files are installed
-SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARDIR=/var/lib #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall6/shorewall6-4.5.17.ebuild b/net-firewall/shorewall6/shorewall6-4.5.17.ebuild
new file mode 100644
index 000000000000..e15f5864c41f
--- /dev/null
+++ b/net-firewall/shorewall6/shorewall6-4.5.17.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.17.ebuild,v 1.1 2013/06/02 10:49:07 constanze Exp $
+
+EAPI="4"
+
+inherit linux-info systemd versionator
+
+# Select version (stable, RC, Beta, upstream patched):
+MY_PV_TREE=$(get_version_component_range 1-2) # for devel versions use "development/$(get_version_component_range 1-2)"
+MY_PV_BASE=$(get_version_component_range 1-3) # which shorewall-common to use
+
+MY_PN="${PN/6/}"
+MY_P="${MY_PN}-${MY_PV_BASE}"
+MY_P_DOCS="${MY_PN}-docs-html-${PV}"
+
+DESCRIPTION="Shoreline Firewall with IPv6 support."
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
+ doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc"
+
+RDEPEND=">=net-firewall/iptables-1.4.0
+ sys-apps/iproute2
+ >=net-firewall/shorewall-${MY_PV_BASE}
+ dev-perl/Socket6"
+
+pkg_pretend() {
+ if kernel_is lt 2 6 25 ; then
+ die "${PN} requires at least kernel 2.6.25."
+ fi
+}
+
+src_configure() {
+ :;
+}
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ keepdir /var/lib/${PN}
+
+ cd "${WORKDIR}/${P}"
+ DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ systemd_newunit "${FILESDIR}"/shorewall6.systemd 'shorewall6.service' || die
+
+ dodoc changelog.txt releasenotes.txt
+ if use doc; then
+ dodoc -r Samples6
+ cd "${WORKDIR}/${MY_P_DOCS}"
+ dohtml -r *
+ fi
+ dodir /var/lock/subsys
+}