Updated to 0.8 by ratamahata

2 files changed, 56 insertions, 121 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6884de831e7..cb3afd407da6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Apr 23 21:05:33 UTC 2017
 pkgbase = vuurmuur
 	pkgdesc = powerful front-end for iptables aimed at system-administrators who need a decent firewall, but dont have netfilter specific knowledge
-	pkgver = 0.7
-	pkgrel = 3
+	pkgver = 0.8
+	pkgrel = 1
 	url = http://www.vuurmuur.org
 	install = vuurmuur.install
 	arch = i686
@@ -22,13 +20,12 @@ pkgbase = vuurmuur
 	backup = etc/vuurmuur/modules.conf
 	backup = etc/vuurmuur/vuurmuur_conf.conf
 	backup = etc/vuurmuur/plugins/textdir.conf
-	backup = etc/logrotate.d/vuurmuur
-	source = ftp://ftp.vuurmuur.org/releases/0.7/Vuurmuur-0.7.tar.gz
+	source = ftp://ftp.vuurmuur.org/releases/0.8/vuurmuur-0.8.tar.gz
 	source = modules.conf
 	source = vuurmuur.rc
 	source = vuurmuur.service
 	source = vuurmuur.script
-	sha256sums = 7d4f8245de98f0a362f5ddfdeb672ee887eb54f39056764df98429d6eab4c26b
+	sha256sums = ff44c6be378d629ec3c5637830f87f2a41cff8f679c1f58bad901eebc69f4f1e
 	sha256sums = a18d4093075f8e0a24f902780b04d03116be8c057b139a7502d8517009bd65e0
 	sha256sums = f1b49c9e1480f9d37ef2df779f725f926552f8713f7aacfc49e0b359e10f27a5
 	sha256sums = 1bf559e49ac64cdf6bff9b003adbe97af1b222d59ec49242545cf13daee07a24
diff --git a/PKGBUILD b/PKGBUILD
index 824c7635c50a..98caacbd014a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,148 +3,86 @@
 # Contributor: Valere Monseur <valere_monseur@hotmail.com>
 # Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com>
 # Contributor: (asper, noob
+# Contributor: ratamahata
 
 pkgname=vuurmuur
-_pkgname=Vuurmuur
-pkgver=0.7
-pkgrel=3
+pkgver=0.8
+pkgrel=1
 pkgdesc='powerful front-end for iptables aimed at system-administrators who need a decent firewall, but dont have netfilter specific knowledge'
 arch=('i686' 'x86_64' 'armv7h')
 url='http://www.vuurmuur.org'
 license=('GPL')
 install='vuurmuur.install'
-depends=(
-libnetfilter_log
-iptables
-ncurses
-libjpeg
-)
-optdepends=(
-'conntrack-tools: for connection tracking'
-'iproute2: for traffic shapping'
-'iptrafvol: for traffic volume logging'
-)
+depends=(libnetfilter_log
+         iptables 
+         ncurses 
+         libjpeg)
+optdepends=('conntrack-tools: for connection tracking'
+            'iproute2: for traffic shapping'
+            'iptrafvol: for traffic volume logging')
 conflicts=(vuurmuur-devel)
-backup=(
-'etc/vuurmuur/config.conf'
-'etc/vuurmuur/modules.conf'
-'etc/vuurmuur/vuurmuur_conf.conf'
-'etc/vuurmuur/plugins/textdir.conf'
-'etc/logrotate.d/vuurmuur'
-)
-source=(
-ftp://ftp.vuurmuur.org/releases/$pkgver/${_pkgname}-$pkgver.tar.gz
-modules.conf
-vuurmuur.rc
-vuurmuur.service
-vuurmuur.script
+backup=('etc/vuurmuur/config.conf'
+        'etc/vuurmuur/modules.conf'
+        'etc/vuurmuur/vuurmuur_conf.conf'
+        'etc/vuurmuur/plugins/textdir.conf'
 )
-build() {
-    cd ${srcdir}/${_pkgname}-${pkgver}
+source=(ftp://ftp.vuurmuur.org/releases/$pkgver/${pkgname}-$pkgver.tar.gz
+        modules.conf
+        vuurmuur.rc
+        vuurmuur.service
+        vuurmuur.script)
+sha256sums=('ff44c6be378d629ec3c5637830f87f2a41cff8f679c1f58bad901eebc69f4f1e'
+            'a18d4093075f8e0a24f902780b04d03116be8c057b139a7502d8517009bd65e0'
+            'f1b49c9e1480f9d37ef2df779f725f926552f8713f7aacfc49e0b359e10f27a5'
+            '1bf559e49ac64cdf6bff9b003adbe97af1b222d59ec49242545cf13daee07a24'
+            'de4cee0e33d3431c985289d8de2844eeb1b1e614e69b7e3b1d6c99e8cda3aa4f')
 
-    for archive in libvuurmuur vuurmuur vuurmuur_conf; do
-        [[ ! -d "$archive" ]] &&
-            tar xzf ${archive}-${pkgver}.tar.gz
-    done
+build() {
+    cd ${pkgname}-${pkgver}
 
-    msg "building vuurmuur libraries..."
-    pushd libvuurmuur-${pkgver}
     ./configure --prefix=/usr --sysconfdir=/etc
     make
-    popd
-
-    msg "building vuurmuur..."
-    pushd vuurmuur-${pkgver}
-    sed -i 's|-rpath|-rpath-link|' configure
-    LDFLAGS+="-L${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src \
-              -L${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src/.libs \
-              -Wl,-rpath=/usr/lib/${pkgname}/plugins" \
-    ./configure --prefix=/usr --sysconfdir=/etc \
-                --with-libvuurmuur-includes="${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src" \
-                --with-libvuurmuur-libraries="${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src"
-    make
-    popd
-
-    msg "building vuurmuur_conf..."
-    pushd vuurmuur_conf-${pkgver}
-    sed -i 's|-rpath|-rpath-link|' configure
-    LDFLAGS+="-L${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src \
-               -L${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src/.libs \
-               -Wl,-rpath=/usr/lib/${pkgname}/plugins" \
-    ./configure --prefix=/usr --sysconfdir=/etc \
-                --with-libvuurmuur-includes="${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src" \
-                --with-libvuurmuur-libraries="${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src"
-    make
-    popd
 }
-package() {
-    cd ${srcdir}/${_pkgname}-${pkgver}
 
-    pushd libvuurmuur-${pkgver}
-    make DESTDIR=${pkgdir} install
-    popd
-
-    pushd vuurmuur-${pkgver}
-    make DESTDIR=${pkgdir} install
-    popd
+package() {
+    cd ${pkgname}-${pkgver}
 
-    pushd vuurmuur_conf-${pkgver}
-    make DESTDIR=${pkgdir} install
-    popd
+    make DESTDIR="$pkgdir" install
 
     # make directory structure
-    install -dm700 ${pkgdir}/etc/${pkgname}
-    install -dm700 ${pkgdir}/etc/${pkgname}/plugins
-    install -dm700 ${pkgdir}/etc/logrotate.d/
-    install -dm755 ${pkgdir}/usr/share/${pkgname}/textdir/{interfaces,services,zones,rules}
-    install -dm700 ${pkgdir}/var/log/${pkgname}
+    install -dm700 "$pkgdir"/etc/$pkgname
+    install -dm700 "$pkgdir"/etc/${pkgname}/plugins
+    install -dm755 "$pkgdir"/usr/share/$pkgname/textdir/{interfaces,services,zones,rules}
+    install -dm700 "$pkgdir"/var/log/$pkgname
 
     # install daemon and log
-    install -Dm755 ${srcdir}/vuurmuur.rc ${pkgdir}/etc/rc.d/${pkgname}
-    install -Dm644 ${pkgdir}/usr/share/${pkgname}/scripts/vuurmuur-logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
+    install -Dm755 ../vuurmuur.rc "$pkgdir"/etc/rc.d/$pkgname
 
     # install systemd's files
-    install -Dm755 $srcdir/vuurmuur.script $pkgdir/usr/lib/systemd/scripts/vuurmuur
-    install -Dm644 $srcdir/vuurmuur.service $pkgdir/usr/lib/systemd/system/vuurmuur.service
+    install -Dm755 ../vuurmuur.script "$pkgdir"/usr/lib/systemd/scripts/vuurmuur
+    install -Dm644 ../vuurmuur.service "$pkgdir"/usr/lib/systemd/system/vuurmuur.service
 
     # install configuration
-    install -Dm600 ${pkgdir}/usr/share/vuurmuur/config/config.conf.sample \
-                    ${pkgdir}/etc/${pkgname}/config.conf
-    install -Dm600 ${srcdir}/modules.conf ${pkgdir}/etc/${pkgname}/modules.conf
-    install -Dm600 ${pkgdir}/usr/share/vuurmuur/config/vuurmuur_conf.conf.sample \
-                    ${pkgdir}/etc/${pkgname}/${pkgname}_conf.conf
-
-    sed -i ${pkgdir}/etc/${pkgname}/config.conf \
-        -e 's|"/sbin/tc|"/usr/sbin/tc|' \
-        -e 's|"/sbin/ip6tables|"/usr/sbin/ip6tables|' \
-        -e 's|"/sbin/iptables|"/usr/sbin/iptables|' \
-        -e 's|"/sbin/ip6tables-restore|"/usr/sbin/ip6tables-restore|' \
-        -e 's|"/sbin/iptables-restore|"/usr/sbin/iptables-restore|' \
-        -e 's|"/var/log/messages|"/var/log/iptables.log|'
+    install -Dm600 "$pkgdir"/usr/share/vuurmuur/config/config.conf.sample \
+                    "$pkgdir"/etc/${pkgname}/config.conf
+    install -Dm600 ../modules.conf "$pkgdir"/etc/${pkgname}/modules.conf
+    install -Dm600 "$pkgdir"/usr/share/vuurmuur/config/vuurmuur_conf.conf.sample \
+                    "$pkgdir"/etc/${pkgname}/${pkgname}_conf.conf
 
-    sed -i ${pkgdir}/etc/${pkgname}/${pkgname}_conf.conf \
-        -e 's|"/usr/bin/iptrafvol.pl|"/usr/sbin/iptrafvol.pl|'
+    sed -i "$pkgdir"/etc/${pkgname}/config.conf \
+        -e 's|"/sbin/tc|"/usr/bin/tc|' \
+        -e 's|"/sbin/ip6tables|"/usr/bin/ip6tables|' \
+        -e 's|"/sbin/iptables|"/usr/bin/iptables|' \
+        -e 's|"/sbin/ip6tables-restore|"/usr/bin/ip6tables-restore|' \
+        -e 's|"/sbin/iptables-restore|"/usr/bin/iptables-restore|'
 
 
-    echo "LOCATION=\"/etc/${pkgname}/textdir\"" > ${pkgdir}/etc/${pkgname}/plugins/textdir.conf
+    echo "LOCATION=\"/etc/${pkgname}/textdir\"" > "$pkgdir"/etc/${pkgname}/plugins/textdir.conf
 
     # default firewall setup in /usr/share
-    touch ${pkgdir}/usr/share/${pkgname}/textdir/rules/rules.conf
-    touch ${pkgdir}/usr/share/${pkgname}/textdir/rules/blocklist.conf
+    touch "$pkgdir"/usr/share/${pkgname}/textdir/rules/rules.conf
+    touch "$pkgdir"/usr/share/${pkgname}/textdir/rules/blocklist.conf
 
-    cp -R ${srcdir}/${_pkgname}-${pkgver}/zones/*   ${pkgdir}/usr/share/${pkgname}/textdir/zones/
-    mv    ${pkgdir}/usr/share/${pkgname}/services/* ${pkgdir}/usr/share/${pkgname}/textdir/services/
-
-    # install licenses
-    install -Dm644 ${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/COPYING \
-                    ${pkgdir}/usr/share/licenses/lib${pkgname}/COPYING
-    install -Dm644 ${srcdir}/${_pkgname}-${pkgver}/${pkgname}-${pkgver}/COPYING \
-                    ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-    install -Dm644 ${srcdir}/${_pkgname}-${pkgver}/${pkgname}_conf-${pkgver}/COPYING \
-                    ${pkgdir}/usr/share/licenses/${pkgname}_conf/COPYING
+#    cp -R zones/*   "$pkgdir"/usr/share/${pkgname}/textdir/zones/
+    mv    "$pkgdir"/usr/share/${pkgname}/services/* "$pkgdir"/usr/share/${pkgname}/textdir/services/
 }
-sha256sums=('7d4f8245de98f0a362f5ddfdeb672ee887eb54f39056764df98429d6eab4c26b'
-            'a18d4093075f8e0a24f902780b04d03116be8c057b139a7502d8517009bd65e0'
-            'f1b49c9e1480f9d37ef2df779f725f926552f8713f7aacfc49e0b359e10f27a5'
-            '1bf559e49ac64cdf6bff9b003adbe97af1b222d59ec49242545cf13daee07a24'
-            'de4cee0e33d3431c985289d8de2844eeb1b1e614e69b7e3b1d6c99e8cda3aa4f')