update

Signed-off-by: Florian Pritz <bluewind@xssn.at>

2 files changed, 20 insertions, 27 deletions

diff --git a/arno-iptables-firewall/PKGBUILD b/arno-iptables-firewall/PKGBUILD
index 23ed3df..c6aa888 100644
--- a/arno-iptables-firewall/PKGBUILD
+++ b/arno-iptables-firewall/PKGBUILD
@@ -2,13 +2,13 @@
 # Contributor: Arto Puranen <purcher@gmail.com>
 
 pkgname=arno-iptables-firewall
-pkgver=1.9.2d
+pkgver=1.9.2k
 pkgrel=1
 pkgdesc="A secure stateful firewall for both single and multi-homed machine"
 arch=('i686' 'x86_64')
 url=("http://rocky.eld.leidenuniv.nl/joomla/")
 license=('GPL')
-depends=('iptables')
+depends=('iptables' 'iproute2')
 makedepends=('patch')
 backup=(etc/${pkgname}/firewall.conf
         etc/${pkgname}/custom-rules
@@ -26,48 +26,42 @@ backup=(etc/${pkgname}/firewall.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
-        etc/${pkgname}/plugins/hfsc.conf
-        etc/${pkgname}/plugins/linuxigd.conf
-        etc/${pkgname}/plugins/racoon-ipsec-vpn.conf
-        etc/${pkgname}/plugins/ssh-brute-force-protection.conf)
-
+        etc/${pkgname}/plugins/transparent-proxy.conf)
 source=(http://rocky.eld.leidenuniv.nl/${pkgname}/${pkgname}_${pkgver}.tar.gz \
         ${pkgname}.script \
         ${pkgname}.patch)
-
-md5sums=('f6a3f1fbc3dac2790fe95f36587d14d8'
+md5sums=('deb2d96773c72667a0279cb1ee3f163c'
          '0c3de10c23359728a3bd90a521d3eebc'
-         'b46d833af9c0870c71ce82ec73dcbab4')
+         '0293d8034bd83cf88bc914f875f7dca6')
 
 build() {
   cd ${srcdir}/${pkgname}_${pkgver}
 
-### patch's
-  patch etc/${pkgname}/firewall.conf ../${pkgname}.patch || return 1
+# patch
+  patch -Np0 -i ${srcdir}/${pkgname}.patch || return 1
 
-### conf files
+# conf files
   install -d -m 0755 etc/${pkgname}/plugins/ ${pkgdir}/etc/${pkgname}/plugins/ || return 1
   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 || return 1
 
-### plugins
+# plugins
   install -d -m 0755 share/${pkgname}/plugins/ ${pkgdir}/usr/share/${pkgname}/plugins/ || return 1
   for i in share/${pkgname}/plugins/*plugin; do install -T -m 0644 $i ${pkgdir}/usr/$i ;done
-
-### binary
-  install -D -m 0744 bin/${pkgname} ${pkgdir}/usr/sbin/${pkgname} || return 1
-  install -D -m 0744 bin/arno-fwfilter ${pkgdir}/usr/sbin/arno-fwfilter || return 1
-  install -D -m 0744 contrib/adsl-failover ${pkgdir}/usr/sbin/adsl-failover || return 1
   install -D -m 0744 share/${pkgname}/plugins/dyndns-host-open-helper ${pkgdir}/usr/share/${pkgname}/plugins/dyndns-host-open-helper || return 1
   install -D -m 0744 share/${pkgname}/plugins/traffic-accounting-helper ${pkgdir}/usr/share/${pkgname}/plugins/traffic-accounting-helper || return 1
   install -D -m 0744 share/${pkgname}/plugins/traffic-accounting-log-rotate ${pkgdir}/usr/share/${pkgname}/plugins/traffic-accounting-log-rotate || return 1
   install -D -m 0744 share/${pkgname}/plugins/traffic-accounting-show ${pkgdir}/usr/share/${pkgname}/plugins/traffic-accounting-show || return 1
 
-### man files
+# binary
+  install -D -m 0744 bin/${pkgname} ${pkgdir}/usr/sbin/${pkgname} || return 1
+  install -D -m 0744 bin/arno-fwfilter ${pkgdir}/usr/sbin/arno-fwfilter || return 1
+  install -D -m 0744 contrib/adsl-failover ${pkgdir}/usr/sbin/adsl-failover || return 1
+
+# man files
   install -D -m 0644 share/man/man1/arno-fwfilter.1 ${pkgdir}/usr/share/man/man1/arno-fwfilter.1 || return 1
   install -D -m 0644 share/man/man8/${pkgname}.8 ${pkgdir}/usr/share/man/man8/${pkgname}.8 || return 1
 
-### daemon script
+# daemon script
   install -D -m 0744 ${srcdir}/${pkgname}.script ${pkgdir}/etc/rc.d/${pkgname} || return 1
-}
\ No newline at end of file
+}
diff --git a/arno-iptables-firewall/arno-iptables-firewall.patch b/arno-iptables-firewall/arno-iptables-firewall.patch
index e045156..6acd49b 100644
--- a/arno-iptables-firewall/arno-iptables-firewall.patch
+++ b/arno-iptables-firewall/arno-iptables-firewall.patch
@@ -1,7 +1,6 @@
-diff -ruN arno-iptables-firewall_1.9.2b-orig/etc/arno-iptables-firewall/firewall.conf arno-iptables-firewall_1.9.2b/etc/arno-iptables-firewall/firewall.conf
---- arno-iptables-firewall_1.9.2b-orig/etc/arno-iptables-firewall/firewall.conf	2009-05-06 15:20:08.000000000 +0200
-+++ arno-iptables-firewall_1.9.2b/etc/arno-iptables-firewall/firewall.conf	2009-08-02 08:58:47.000000000 +0200
-@@ -180,20 +180,20 @@
+--- etc/arno-iptables-firewall/firewall.conf.orig	2010-02-26 08:09:05.000000000 +0100
++++ etc/arno-iptables-firewall/firewall.conf	2010-03-17 14:09:02.000000000 +0100
+@@ -185,20 +185,20 @@
  # (EXPERT SETTING!) Location of the iptables-binary (use 'locate iptables' or
  # 'whereis iptables' to manually locate it), required for (default) IPv4 support
  # -----------------------------------------------------------------------------