blockcontrol: updated to v1.6.9 ; replaces moblockcontrol.

ref 506

6 files changed, 52 insertions, 84 deletions

diff --git a/abs/extra-testing/community/blockcontrol/PKGBUILD b/abs/extra-testing/community/blockcontrol/PKGBUILD
new file mode 100644
index 0000000..2507adc
--- /dev/null
+++ b/abs/extra-testing/community/blockcontrol/PKGBUILD
@@ -0,0 +1,37 @@
+# Contributor: Daniele Marinello <marinz at email dot it>
+
+pkgname=blockcontrol
+pkgver=1.6.9
+pkgrel=3
+pkgdesc="blockcontrol is designed to do all tasks related to IP block daemons (MoBlock or NFBlock). They check internet traffic based on large lists of IP address ranges in order to protect your privacy."
+arch=('i686' 'x86_64')
+url="http://moblock-deb.sourceforge.net/"
+license=('GPL2' 'BSD')
+depends=('moblock' 'wget')
+conflicts=('moblockcontrol')
+source=(http://downloads.sourceforge.net/moblock-deb/$pkgname-$pkgver.tar.gz \
+                 blockcontrol.lib.patch)
+backup=('etc/blockcontrol/blockcontrol.conf' 'etc/blockcontrol/blocklists.list')
+
+build() {  
+  cd "$startdir/src/$pkgname-$pkgver"
+  patch -Np1 -i ../blockcontrol.lib.patch || return 1
+  
+  install -D -m 755 $startdir/src/$pkgname-$pkgver/blockcontrol ${pkgdir}/usr/bin/blockcontrol
+  install -D -m 755 $startdir/src/$pkgname-$pkgver/blockcontrol.main ${pkgdir}/usr/lib/blockcontrol/blockcontrol.main
+  install -D -m 644 $startdir/src/$pkgname-$pkgver/blockcontrol.defaults ${pkgdir}/usr/lib/blockcontrol/blockcontrol.defaults
+  install -D -m 644 $startdir/src/$pkgname-$pkgver/blockcontrol.lib ${pkgdir}/usr/lib/blockcontrol/blockcontrol.lib
+  install -D -m 755 $startdir/src/$pkgname-$pkgver/blockcontrol.wd ${pkgdir}/usr/bin/blockcontrol.wd
+  install -D -m 644 $startdir/src/$pkgname-$pkgver/allow.p2p ${pkgdir}/etc/blockcontrol/allow.p2p
+  install -D -m 644 $startdir/src/$pkgname-$pkgver/blockcontrol.conf ${pkgdir}/etc/blockcontrol/blockcontrol.conf
+  install -D -m 644 $startdir/src/$pkgname-$pkgver/blocklists.list ${pkgdir}/etc/blockcontrol/blocklists.list
+# install -D -m 755 $startdir/src/$pkgname-$pkgver/if-up ${pkgdir}/etc/network/if-up.d/blockcontrol
+  install -D -m 755 $startdir/src/$pkgname-$pkgver/cron.daily ${pkgdir}/etc/cron.daily/blockcontrol
+  install -D -m 755 $startdir/src/$pkgname-$pkgver/init ${pkgdir}/etc/rc.d/blockcontrol
+  install -D -m 644 $startdir/src/$pkgname-$pkgver/logrotate ${pkgdir}/etc/logrotate.d/blockcontrol
+  install -d ${pkgdir}/var/lib/blockcontrol
+  install -d ${pkgdir}/var/spool/blockcontrol
+}
+
+md5sums=('d02002745aacf6100ff9057bdc80adf3'
+         'efcca84e52ea98cc10610830f9c2ba37')
diff --git a/abs/extra-testing/community/blockcontrol/blockcontrol.lib.patch b/abs/extra-testing/community/blockcontrol/blockcontrol.lib.patch
new file mode 100644
index 0000000..4be1c75
--- /dev/null
+++ b/abs/extra-testing/community/blockcontrol/blockcontrol.lib.patch
@@ -0,0 +1,15 @@
+--- blockcontrol/blockcontrol_old.lib	2009-09-14 19:35:24.000000000 +0200
++++ blockcontrol/blockcontrol.lib	2009-11-05 20:29:50.000000000 +0100
+@@ -1344,10 +1344,10 @@
+ 				DAEMON_OPTS="$CUSTOM_DAEMON_OPTS"
+ 			elif [ "$NAME" = moblock ] ; then
+ 				# The options MoBlock is started with
+-				DAEMON_OPTS="-$BLOCKLIST_FORMAT $BLOCKLIST $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT $LOG_TIMESTAMP_OPT $REJECT_OPT $ACCEPT_OPT $DAEMON_LOG"
++				DAEMON_OPTS="-$BLOCKLIST_FORMAT $BLOCKLIST $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT $DAEMON_LOG"
+ 			elif [ "$NAME" = nfblockd ] ; then
+ 				# The options NFBlock is started with
+-				DAEMON_OPTS="-d -f $BLOCKLIST -p $PIDFILE $NFQUEUE_NUMBER_OPT $REJECT_OPT $ACCEPT_OPT $LOG_SYSLOG_OPT"
++				DAEMON_OPTS="-d -f $BLOCKLIST -p $PIDFILE $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT"
+ 			fi
+ 
+ 			# Test NICE_LEVEL setting.
diff --git a/abs/extra-testing/community/moblockcontrol/PKGBUILD b/abs/extra-testing/community/moblockcontrol/PKGBUILD
deleted file mode 100644
index 5a912e2..0000000
--- a/abs/extra-testing/community/moblockcontrol/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: marinz <marinz@email.it>
-
-pkgname=moblockcontrol
-pkgver=1.0
-pkgrel=10
-pkgdesc="moblock-control"
-arch=('i686' 'x86_64')
-url="http://moblock-deb.sourceforge.net/"
-license=('GPL')
-groups=()
-depends=('moblock')
-makedepends=()
-install=moblockcontrol.install
-source=(http://download.sourceforge.net/moblock-deb/moblock-control-1.0.tar.gz \
-		moblock_control.patch moblock-control-update.sh)
-md5sums=('1399e5465028e116e941cd1e01f6f7fc'
-			'dc269c6c47bc423b9093919d52e97d63')
-backup=('etc/moblock/moblock.conf' 'etc/moblock/blocklists.list')
-
-build() {
-  
-  cd $startdir/src/moblock-control-1.0
-  
-  patch -Np1 -i ../moblock_control.patch || return 1
-  
-  install -d ${pkgdir}/usr/bin ${pkgdir}/etc/moblock ${pkgdir}/etc/default ${pkgdir}/var/spool/moblock/user ${pkgdir}/lib/lsb ${pkgdir}/var/log
-  install -m 755 moblock-control ${pkgdir}/usr/bin/moblock-control   
-  install -m 755 blocklists.list ${pkgdir}/etc/moblock/blocklists.list 
-  install -m 755 moblock.conf ${pkgdir}/etc/moblock/moblock.conf 
-  install -m 755 moblock.default ${pkgdir}/etc/default/moblock 
-  install -m 755 init-functions ${pkgdir}/lib/lsb/init-functions 
-  install -m 755 iptables-custom-insert.sh ${pkgdir}/etc/iptables-custom-insert.sh  
-  install -m 755 iptables-custom-remove.sh ${pkgdir}/etc/iptables-custom-remove.sh 
-  
-  touch ${pkgdir}/var/log/moblock-control.log
-  touch ${pkgdir}/etc/moblock/guarding.p2p 
-    
-  cd $startdir/src
-  install -m 755 moblock-control-update.sh ${pkgdir}/usr/bin/moblock-control-update.sh   
-  sed -i "s/config\/templist.gz/config\/badpeers.gz/" $startdir/pkg/etc/moblock/blocklists.list
-}
-
diff --git a/abs/extra-testing/community/moblockcontrol/moblock-control-update.sh b/abs/extra-testing/community/moblockcontrol/moblock-control-update.sh
deleted file mode 100644
index 8da564d..0000000
--- a/abs/extra-testing/community/moblockcontrol/moblock-control-update.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-. /etc/profile
-/usr/bin/moblock-control update
diff --git a/abs/extra-testing/community/moblockcontrol/moblock_control.patch b/abs/extra-testing/community/moblockcontrol/moblock_control.patch
deleted file mode 100644
index db6bbf9..0000000
--- a/abs/extra-testing/community/moblockcontrol/moblock_control.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- moblockcontrol/moblock-control_2	2008-09-25 23:22:39.000000000 +0200
-+++ moblockcontrol/moblock-control	2008-12-28 09:33:51.000000000 +0100
-@@ -954,7 +954,7 @@
- 				else
- 					# The options Moblock is started with
- 					# The same like above, but with a "&" to start moblock in the background
--					DAEMON_OPTS="-$BLOCKLIST_FORMAT $BLOCKLIST $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT $LOG_TIMESTAMP_OPT -r $REJECT_MARK -a $ACCEPT_MARK $DAEMON_LOG &"
-+					DAEMON_OPTS="-$BLOCKLIST_FORMAT $BLOCKLIST $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT $DAEMON_LOG & " 
- 					# Start MoBlock
- 					start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS	# The init-functions provided with moblock-control depend on this syntax!
- 				fi
diff --git a/abs/extra-testing/community/moblockcontrol/moblockcontrol.install b/abs/extra-testing/community/moblockcontrol/moblockcontrol.install
deleted file mode 100644
index 439a3ee..0000000
--- a/abs/extra-testing/community/moblockcontrol/moblockcontrol.install
+++ /dev/null
@@ -1,28 +0,0 @@
-post_install() {
-    if [ ! -d /var/spool/moblock/used ]
-    then
-        mkdir -p /var/spool/moblock/used
-    fi
-
-    if [ ! -e /etc/cron.daily/moblock-control-update.sh ]
-    then
-        ln -s /usr/bin/moblock-control-update.sh /etc/cron.daily/moblock-control-update.sh
-    fi
-}
-
-post_upgrade() {
-    if [ ! -d /var/spool/moblock/used ]
-    then
-        mkdir -p /var/spool/moblock/used
-    fi
-
-    if [ ! -e /etc/cron.daily/moblock-control-update.sh ]
-    then
-        ln -s /usr/bin/moblock-control-update.sh /etc/cron.daily/moblock-control-update.sh
-    fi
-}
-
-op=$1
-shift
-$op $*
-