moblock: recompile

3 files changed, 25 insertions, 28 deletions

diff --git a/abs/extra/community/moblock/MoBlock-nfq.sh.patch b/abs/extra/community/moblock/MoBlock-nfq.sh.patch
index 15e742f..f9136c3 100644
--- a/abs/extra/community/moblock/MoBlock-nfq.sh.patch
+++ b/abs/extra/community/moblock/MoBlock-nfq.sh.patch
@@ -28,7 +28,7 @@
 +    iptables -I MOBLOCK_OUT -p all -m iprange --dst-range $IP -j ACCEPT
 +done
 +for IP in $WHITE_IP_IN; do
-+    iptables -I MOBLOCK_IN -p all -m iprange --dst-range $IP -j ACCEPT
++    iptables -I MOBLOCK_IN -p all -m iprange --src-range $IP -j ACCEPT
 +done
 +for IP in $WHITE_IP_FW; do
 +    iptables -I MOBLOCK_FW -p all -m iprange --dst-range $IP -j ACCEPT
diff --git a/abs/extra/community/moblock/PKGBUILD b/abs/extra/community/moblock/PKGBUILD
index f6c7e51..0f3ff26 100755
--- a/abs/extra/community/moblock/PKGBUILD
+++ b/abs/extra/community/moblock/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=moblock
 pkgver=0.9rc2
-pkgrel=8
+pkgrel=9
 pkgdesc="Console application that blocks connections from/to hosts listed in a file in peerguardian format"
 arch=('i686' 'x86_64')
 url="http://moblock.berlios.de/"
@@ -19,17 +19,9 @@ source=(http://download.berlios.de/moblock/MoBlock-0.8-i586.tar.bz2 \
         moblock-update \
         moblock \
         moblock.logrotate)
-md5sums=('199967adb48b153be90db10fe21325c5'
-         'e4e33c515677fa53eaca4616591d4e44'
-         '1193adccce219d31a7c0540807a4a8e8'
-         'b23b5214965df59632de5cec317ddbde'
-         '840bb52a99529305e49212a69c9ced8a'
-         '49a16feb221d4d912cc7200313517f7b'
-         '1bdc949fcff0ce751a5096e489061513'
-         'a8285fd3e68043cd8d21993d3dbbf9d4')
 
 build() {
-    cd $startdir/src/MoBlock-0.8
+    cd ${srcdir}/MoBlock-0.8
     
     # patch to update moblock to the latest cvs version
     patch -Np1 -i ../moblock_0.9_rc2.patch || return 1
@@ -43,14 +35,23 @@ build() {
     
     # build
     make || return 1
-    
-    #move the files
-    install -D -m 755 ./MoBlock-nfq.sh $startdir/pkg/usr/bin/moblock-nfq || return 1
-    install -D -m 744 ./moblock $startdir/pkg/usr/bin/moblock || return 1
-    install -D -m 755 ../moblock-update $startdir/pkg/usr/bin/moblock-update || return 1
-    install -D -m 744 ../moblock $startdir/pkg/etc/rc.d/moblock || return 1
-    install -D -m 644 ../config $startdir/pkg/etc/moblock/config || return 1
-    install -D -m 644 ../moblock.logrotate $startdir/pkg/etc/logrotate.d/moblock || return 1
 }
 
-
+package() {
+    cd ${srcdir}/MoBlock-0.8
+    #move the files
+    install -D -m 755 ./MoBlock-nfq.sh ${pkgdir}/usr/bin/moblock-nfq || return 1
+    install -D -m 744 ./moblock ${pkgdir}/usr/bin/moblock || return 1
+    install -D -m 755 ../moblock-update ${pkgdir}/usr/bin/moblock-update || return 1
+    install -D -m 744 ../moblock ${pkgdir}/etc/rc.d/moblock || return 1
+    install -D -m 644 ../config ${pkgdir}/etc/moblock/config || return 1
+    install -D -m 644 ../moblock.logrotate ${pkgdir}/etc/logrotate.d/moblock || return 1
+}
+md5sums=('199967adb48b153be90db10fe21325c5'
+         'e4e33c515677fa53eaca4616591d4e44'
+         'e9f3c6b09f5e07dee948450780340ea3'
+         'b23b5214965df59632de5cec317ddbde'
+         '840bb52a99529305e49212a69c9ced8a'
+         '49a16feb221d4d912cc7200313517f7b'
+         '1bdc949fcff0ce751a5096e489061513'
+         'a8285fd3e68043cd8d21993d3dbbf9d4')
diff --git a/abs/extra/community/moblock/moblock.install b/abs/extra/community/moblock/moblock.install
index c7715e7..6afe1d5 100644
--- a/abs/extra/community/moblock/moblock.install
+++ b/abs/extra/community/moblock/moblock.install
@@ -7,10 +7,6 @@ post_install() {
     echo ">>> moblock-update script no longer uses /var/spool/moblock"
     echo ">>> as a temporary directory.  You can safely delete it."
     echo ""
-    if [ ! -d /var/spool/moblock/used ]
-    then
-        mkdir -p /var/spool/moblock/used
-    fi
 }
 
 post_upgrade() {
@@ -18,10 +14,10 @@ post_upgrade() {
     if [ -h /usr/lib/libnfnetlink.so.1 ]; then
         rm /usr/lib/libnfnetlink.so.1
     fi
-    if [ ! -d /var/spool/moblock/used ]
-    then
-        mkdir -p /var/spool/moblock/used
-   fi
+    echo ""
+    echo ">>> moblock-update script no longer uses /var/spool/moblock"
+    echo ">>> as a temporary directory.  You can safely delete it."
+    echo ""
 }
 
 op=$1