[arch-commits] Commit in dkfilter/trunk (PKGBUILD dkfilter-rc)

[Sergej Pupykin]

    Date: Monday, May 13, 2013 @ 16:21:44
  Author: spupykin
Revision: 90658

upgpkg: dkfilter 0.11-10

upd

Modified:
  dkfilter/trunk/PKGBUILD
Deleted:
  dkfilter/trunk/dkfilter-rc

-------------+
 PKGBUILD    |    5 ---
 dkfilter-rc |   76 ----------------------------------------------------------
 2 files changed, 1 insertion(+), 80 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 14:21:37 UTC (rev 90657)
+++ PKGBUILD	2013-05-13 14:21:44 UTC (rev 90658)
@@ -3,7 +3,7 @@
 
 pkgname=dkfilter
 pkgver=0.11
-pkgrel=9
+pkgrel=10
 pkgdesc="Domain key filter"
 arch=('any')
 url="http://jason.long.name/dkfilter/"
@@ -13,12 +13,10 @@
 backup=(etc/conf.d/dkfilter)
 install=dkfilter.install
 source=(http://jason.long.name/dkfilter/dkfilter-$pkgver.tar.gz
-	dkfilter-rc
 	dkfilter-in.service
 	dkfilter-out.service
 	dkfilter.conf.d)
 md5sums=('e295678fc728c139137bfadf4a679262'
-         'cab0ef8fab0dae6f1b85a6facd1b09ae'
          '550ef7abc5dd6a5610dd6ef7f4ab5fee'
          '4baff6ebf7d8da2b390e1ad49fc041b5'
          'a2fb031fa9493ccc082d953cd023a097')
@@ -32,7 +30,6 @@
 package() {
   cd  $srcdir/dkfilter-$pkgver
   make DESTDIR=$pkgdir install
-  install -D -m 0755 $srcdir/dkfilter-rc $pkgdir/etc/rc.d/dkfilter
   install -D -m 0644 $srcdir/dkfilter.conf.d $pkgdir/etc/conf.d/dkfilter
 
   install -Dm0644 $srcdir/$pkgname-in.service $pkgdir/usr/lib/systemd/system/$pkgname-in.service

Deleted: dkfilter-rc
===================================================================
--- dkfilter-rc	2013-05-13 14:21:37 UTC (rev 90657)
+++ dkfilter-rc	2013-05-13 14:21:44 UTC (rev 90658)
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-. /etc/conf.d/dkfilter
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DKFILTER_IN_ARGS="--user=$DKFILTER_USER --group=$DKFILTER_GROUP --hostname=$DKFILTER_HOSTNAME 127.0.0.1:10025 127.0.0.1:10026"
-DKFILTER_OUT_ARGS="--user=$DKFILTER_USER --group=$DKFILTER_GROUP --keyfile=$DKFILTER_PRIVATE_KEY --selector=$DKFILTER_SELECTOR --domain=$DKFILTER_DOMAIN --method=nofws --headers 127.0.0.1:10027 127.0.0.1:10028"
-
-DKFILTER_IN_BIN="/usr/bin/dkfilter.in"
-DKFILTER_OUT_BIN="/usr/bin/dkfilter.out"
-PIDDKFILTER_IN="/var/run/dkfilter.in"
-PIDDKFILTER_OUT="/var/run/dkfilter.out"
-
-get_pid_in() {
-	ps fax | grep dkfilter.in | grep perl | awk -- "{print \$1}"
-}
-
-get_pid_out() {
-	ps fax | grep dkfilter.out | grep perl | awk -- "{print \$1}"
-}
-
-case "$1" in
-	start)
-		stat_busy "Starting inbound DomainKeys-filter (dkfilter.in)..."
-		$DKFILTER_IN_BIN $DKFILTER_IN_ARGS 1>>/var/log/dkfilter.in 2>>/var/log/dkfilter.in &
-		get_pid_in dkfilter.in >$PIDDKFILTER_IN
-		RETVAL=$?
-		if [ $RETVAL -eq 0 ]; then
-			stat_done
-		else
-			stat_fail
-			exit $RETVAL
-		fi
-
-		stat_busy "Starting outbound DomainKeys-filter (dkfilter.out)..."
-		$DKFILTER_OUT_BIN $DKFILTER_OUT_ARGS 1>>/var/log/dkfilter.out 2>>/var/log/dkfilter.out &
-		get_pid_out dkfilter.out >$PIDDKFILTER_OUT
-		RETVAL=$?
-		if [ $RETVAL -eq 0 ]; then
-			stat_done
-		else
-			stat_fail
-			exit $RETVAL
-		fi
-		;;
-
-	stop)
-		stat_busy "Shutting down inbound DomainKeys-filter (dkfilter.in)..."
-		kill `get_pid_in`
-		RETVAL=$?
-		if [ $RETVAL -eq 0 ]; then
-			stat_done
-		else
-			stat_fail
-			exit $RETVAL
-		fi
-		stat_busy "Shutting down outbound DomainKeys-filter (dkfilter.out)..."
-		kill `get_pid_out`
-		RETVAL=$?
-		if [ $RETVAL -eq 0 ]; then
-			stat_done
-		else
-			stat_fail
-			exit $RETVAL
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-		;;
-esac