diff options
| -rw-r--r-- | pcr/arno-iptables-firewall/PKGBUILD | 78 | ||||
| -rw-r--r-- | pcr/arno-iptables-firewall/arno-iptables-firewall.patch | 25 | ||||
| -rw-r--r-- | pcr/arno-iptables-firewall/arno-iptables-firewall.service | 14 |
3 files changed, 49 insertions, 68 deletions
diff --git a/pcr/arno-iptables-firewall/PKGBUILD b/pcr/arno-iptables-firewall/PKGBUILD index 368f5c160..9d154c132 100644 --- a/pcr/arno-iptables-firewall/PKGBUILD +++ b/pcr/arno-iptables-firewall/PKGBUILD @@ -1,13 +1,16 @@ +# Maintainer (AUR): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor (AUR): Arto Puranen <purcher@gmail.com> # Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Arto Puranen <purcher@gmail.com> + +# parabola changes and rationale: +# no changes. pkgname=arno-iptables-firewall -pkgver=2.0.1e +pkgver=2.0.2a pkgrel=1 pkgdesc="A secure stateful firewall for both single and multi-homed machine" arch=('any') -url='http://rocky.eld.leidenuniv.nl/joomla/' +url="https://github.com/arno-iptables-firewall/aif/" license=('GPL') depends=('iptables' 'iproute2') makedepends=('patch') @@ -22,51 +25,60 @@ backup=(etc/${pkgname}/firewall.conf etc/${pkgname}/plugins/linux-upnp-igd.conf etc/${pkgname}/plugins/mac-address-filter.conf etc/${pkgname}/plugins/multiroute.conf + etc/${pkgname}/plugins/nat-loopback.conf + etc/${pkgname}/plugins/outbound-snat.conf + etc/${pkgname}/plugins/parasitic-net.conf + etc/${pkgname}/plugins/pptp-vpn-passthrough.conf + etc/${pkgname}/plugins/pptp-vpn.conf + etc/${pkgname}/plugins/rpc.conf etc/${pkgname}/plugins/sip-voip.conf etc/${pkgname}/plugins/ssh-brute-force-protection.conf etc/${pkgname}/plugins/traffic-accounting.conf etc/${pkgname}/plugins/traffic-shaper.conf etc/${pkgname}/plugins/transparent-dnat.conf etc/${pkgname}/plugins/transparent-proxy.conf) -source=(http://rocky.eld.leidenuniv.nl/${pkgname}/${pkgname}_${pkgver}.tar.gz - ${pkgname}.patch \ - ${pkgname}.service) +source=($pkgname-$pkgver.tar.gz::https://github.com/arno-iptables-firewall/aif/archive/${pkgver}.tar.gz + $pkgname.patch) +sha256sums=('41df5f37d1d9f34398c35be2640355f841ad2902f455b3653119ae23bfb41590' + 'fbac95bced8565b00f5ff7b403579b1aaf7d386deb61c0f4a9acf50408a8200d') -package() { - cd ${srcdir}/${pkgname}_${pkgver} +prepare() { + cd "${srcdir}"/aif-${pkgver} -# patch - patch -Np0 -i ${srcdir}/${pkgname}.patch + patch -Np0 -i "${srcdir}"/${pkgname}.patch +} + +package() { + cd "${srcdir}"/aif-${pkgver} # conf files - install -d -m 0755 etc/${pkgname}/plugins/ ${pkgdir}/etc/${pkgname}/plugins/ - for i in `find etc/${pkgname} -type f`; do install -T -m 0600 $i ${pkgdir}/$i ;done - install -D -m 0644 share/${pkgname}/environment ${pkgdir}/usr/share/${pkgname}/environment + install -d -m 0755 etc/${pkgname}/plugins/ "${pkgdir}"/etc/${pkgname}/plugins/ + for i in `find etc/${pkgname} -type f`; do install -T -m 0600 $i "${pkgdir}"/$i ;done + install -Dm0644 share/${pkgname}/environment "${pkgdir}"/usr/share/${pkgname}/environment # plugins - install -d -m 0755 share/${pkgname}/plugins/ ${pkgdir}/usr/share/${pkgname}/plugins/ - for i in share/${pkgname}/plugins/*plugin; do install -T -m 0644 $i ${pkgdir}/usr/$i ;done - install -D -m 0744 share/${pkgname}/plugins/dyndns-host-open-helper \ - ${pkgdir}/usr/share/${pkgname}/plugins/dyndns-host-open-helper - install -D -m 0744 share/${pkgname}/plugins/traffic-accounting-helper \ - ${pkgdir}/usr/share/${pkgname}/plugins/traffic-accounting-helper - install -D -m 0744 share/${pkgname}/plugins/traffic-accounting-log-rotate \ - ${pkgdir}/usr/share/${pkgname}/plugins/traffic-accounting-log-rotate - install -D -m 0744 share/${pkgname}/plugins/traffic-accounting-show \ - ${pkgdir}/usr/share/${pkgname}/plugins/traffic-accounting-show + install -d -m 0755 share/${pkgname}/plugins/ "${pkgdir}"/usr/share/${pkgname}/plugins/ + for i in share/${pkgname}/plugins/*plugin; do install -T -m 0644 $i "${pkgdir}"/usr/$i ;done + install -Dm0744 share/${pkgname}/plugins/dyndns-host-open-helper \ + "${pkgdir}"/usr/share/${pkgname}/plugins/dyndns-host-open-helper + install -Dm0744 share/${pkgname}/plugins/traffic-accounting-helper \ + "${pkgdir}"/usr/share/${pkgname}/plugins/traffic-accounting-helper + install -Dm0744 share/${pkgname}/plugins/traffic-accounting-log-rotate \ + "${pkgdir}"/usr/share/${pkgname}/plugins/traffic-accounting-log-rotate + install -Dm0744 share/${pkgname}/plugins/traffic-accounting-show \ + "${pkgdir}"/usr/share/${pkgname}/plugins/traffic-accounting-show # binary - install -D -m 0744 bin/${pkgname} ${pkgdir}/usr/bin/${pkgname} - install -D -m 0744 bin/arno-fwfilter ${pkgdir}/usr/bin/arno-fwfilter - install -D -m 0744 contrib/adsl-failover ${pkgdir}/usr/bin/adsl-failover + install -Dm0744 bin/${pkgname} "${pkgdir}"/usr/bin/${pkgname} + install -Dm0744 bin/arno-fwfilter "${pkgdir}"/usr/bin/arno-fwfilter + install -Dm0744 contrib/adsl-failover "${pkgdir}"/usr/bin/adsl-failover # man files - install -D -m 0644 share/man/man1/arno-fwfilter.1 ${pkgdir}/usr/share/man/man1/arno-fwfilter.1 - install -D -m 0644 share/man/man8/${pkgname}.8 ${pkgdir}/usr/share/man/man8/${pkgname}.8 + install -Dm0644 share/man/man1/arno-fwfilter.1 "${pkgdir}"/usr/share/man/man1/arno-fwfilter.1 + install -Dm0644 share/man/man8/${pkgname}.8 "${pkgdir}"/usr/share/man/man8/${pkgname}.8 # systemd script - install -D -m 0644 ${srcdir}/${pkgname}.service ${pkgdir}/usr/lib/systemd/system/${pkgname}.service + install -Dm0644 "${srcdir}"/aif-${pkgver}/lib/systemd/system/${pkgname}.service \ + "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service + sed 's|local/s||g' -i "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service } -md5sums=('8adb951fb5bc40a6dbe57fb1f1f2c4c6' - 'd4c8252c8b8ee53132bffc9b5912f89a' - '7384fbc95f69f10d5d6e4c7ff89b92dc') diff --git a/pcr/arno-iptables-firewall/arno-iptables-firewall.patch b/pcr/arno-iptables-firewall/arno-iptables-firewall.patch index 298d0c0b8..404f4b24a 100644 --- a/pcr/arno-iptables-firewall/arno-iptables-firewall.patch +++ b/pcr/arno-iptables-firewall/arno-iptables-firewall.patch @@ -1,25 +1,8 @@ ---- etc/arno-iptables-firewall/firewall.conf 2010-12-30 13:17:02.000000000 +0100 -+++ etc/arno-iptables-firewall/firewall.conf 2011-01-22 21:10:39.000000000 +0100 -@@ -233,18 +233,18 @@ - # 'whereis iptables' to manually locate it), required for (default) IPv4 support - # ----------------------------------------------------------------------------- --IP4TABLES="/sbin/iptables" -+IP4TABLES="/usr/bin/iptables" - - # (EXPERT SETTING!) Location of the ip6tables-binary (use 'locate ip6tables' or - # 'whereis ip6tables' to manually locate it), required for IPv6 support - # ----------------------------------------------------------------------------- --IP6TABLES="/sbin/ip6tables" -+IP6TABLES="/usr/bin/ip6tables" - - # (EXPERT SETTING!) Location of the environment file - # ----------------------------------------------------------------------------- +--- etc/arno-iptables-firewall/firewall.conf.orig 2015-10-01 16:58:12.000000000 +0200 ++++ etc/arno-iptables-firewall/firewall.conf 2015-11-14 13:05:29.748859879 +0100 +@@ -235 +235 @@ -ENV_FILE="/usr/local/share/arno-iptables-firewall/environment" +ENV_FILE="/usr/share/arno-iptables-firewall/environment" - - # (EXPERT SETTING!) Location of plugin binary & config files - # ----------------------------------------------------------------------------- +@@ -239 +239 @@ -PLUGIN_BIN_PATH="/usr/local/share/arno-iptables-firewall/plugins" +PLUGIN_BIN_PATH="/usr/share/arno-iptables-firewall/plugins" - PLUGIN_CONF_PATH="/etc/arno-iptables-firewall/plugins" - diff --git a/pcr/arno-iptables-firewall/arno-iptables-firewall.service b/pcr/arno-iptables-firewall/arno-iptables-firewall.service deleted file mode 100644 index 2d81c9869..000000000 --- a/pcr/arno-iptables-firewall/arno-iptables-firewall.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=A secure stateful firewall for both single and multi-homed machine -Before=network.target -Wants=network.target - -[Service] -Type=oneshot -ExecStart=/usr/bin/arno-iptables-firewall start -ExecStop=/usr/bin/arno-iptables-firewall stop -ExecReload=/usr/bin/arno-iptables-firewall force-reload -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target |