[arch-commits] Commit in postgrey/trunk (PKGBUILD postgrey.rc postgrey.rc.conf)

[Sergej Pupykin]

    Date: Monday, May 13, 2013 @ 16:33:31
  Author: spupykin
Revision: 90702

upgpkg: postgrey 1.34-12

upd

Modified:
  postgrey/trunk/PKGBUILD
Deleted:
  postgrey/trunk/postgrey.rc
  postgrey/trunk/postgrey.rc.conf

------------------+
 PKGBUILD         |    8 -----
 postgrey.rc      |   74 -----------------------------------------------------
 postgrey.rc.conf |   33 -----------------------
 3 files changed, 1 insertion(+), 114 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 14:33:26 UTC (rev 90701)
+++ PKGBUILD	2013-05-13 14:33:31 UTC (rev 90702)
@@ -4,7 +4,7 @@
 
 pkgname=postgrey
 pkgver=1.34
-pkgrel=11
+pkgrel=12
 pkgdesc="a Postfix policy server implementing greylisting"
 arch=('any')
 url="http://postgrey.schweikert.ch/"
@@ -19,13 +19,9 @@
 	etc/conf.d/postgrey)
 install=$pkgname.install
 source=($url/pub/$pkgname-$pkgver.tar.gz
-	postgrey.rc
-	postgrey.rc.conf
 	postgrey.service
 	postgrey.tmpfiles)
 md5sums=('f736a7be1094593f1a66cd13f32b39ef'
-         '44c97de44f1245cafb0cbe2704f65a3d'
-         '93c5b0632a4284ee3c1e0a1e30bf0a6b'
          '4ce8d15d7fdf744567948a47aaf5254a'
          '3236959f435c95db3a13f4c7dd235609')
 
@@ -33,8 +29,6 @@
   cd $srcdir/$pkgname-$pkgver
   chown -R root:root .
   mkdir -p $pkgdir/var/spool/postfix/postgrey
-  install -D -m 0755 $srcdir/postgrey.rc $pkgdir/etc/rc.d/postgrey
-  install -D -m 0644 $srcdir/postgrey.rc.conf $pkgdir/etc/conf.d/postgrey
   install -D -m 0755 postgrey $pkgdir/usr/sbin/postgrey
   install -D -m 0755 contrib/postgreyreport $pkgdir/usr/sbin/postgreyreport
   install -D -m 0644 postgrey_whitelist_recipients $pkgdir/etc/postfix/postgrey_whitelist_recipients

Deleted: postgrey.rc
===================================================================
--- postgrey.rc	2013-05-13 14:33:26 UTC (rev 90701)
+++ postgrey.rc	2013-05-13 14:33:31 UTC (rev 90702)
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-POSTGREY_CONF=/etc/conf.d/postgrey
-[ -f $POSTGREY_CONF ] && . $POSTGREY_CONF
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-GROUP="postgrey"
-USER="postgrey"
-DAEMON_NAME="postgrey"
-POSTGREY_BIN="/usr/sbin/postgrey"
-PIDFILE=/var/run/postgrey/postgrey.pid
-
-mkdir -p /var/run/postgrey
-chown $USER:$GROUP /var/run/postgrey
-
-PID=`cat $PIDFILE 2>/dev/null`
-[ -d /proc/$PID ] || PID=""
-
-checkconfig() {
-	if [ -z $POSTGREY_ADDR ]; then
-		echo "You need to set POSTGREY_ADDR instead of POSTGREY_TYPE parameter bundle"
-		return 1
-	fi
-}
-
-start() {
-	stat_busy "Starting Postgrey"
-	checkconfig || { stat_fail; return 1; }
-
-	[ -z "$PID" ] && $POSTGREY_BIN --daemonize $POSTGREY_ADDR \
-		--group=$GROUP --user=$USER $POSTGREY_OPTS --pidfile=$PIDFILE \
-		--greylist-text="$POSTGREY_TEXT" > /dev/null
-
-	if [ $? -gt 0 ]
-       	then
-		stat_fail
-	else
-		add_daemon postgrey
-		stat_done
-	fi
-}
-
-stop() {
-	stat_busy "Stopping Postgrey"
-	[ ! -z "$PID" ]  && kill -9 $PID &> /dev/null
-	if [ $? -gt 0 ]
-	then
-		stat_fail
-	else
-		rm_daemon postgrey
-		rm -f $PIDFILE
-		stat_done
-	fi
-}
-
-case "$1" in
-	start)
-		start
-	;;
-	stop)
-		stop
-	;;
-	restart)
-		# calling 'stop' and 'start' without the $0 fails...
-		$0 stop
-		$0 start
-	;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-	esac
-exit 0

Deleted: postgrey.rc.conf
===================================================================
--- postgrey.rc.conf	2013-05-13 14:33:26 UTC (rev 90701)
+++ postgrey.rc.conf	2013-05-13 14:33:31 UTC (rev 90702)
@@ -1,33 +0,0 @@
-# Config file for /etc/rc.d/postgrey
-
-# Bind address: unix or inet socket
-# inet
-#POSTGREY_ADDR="--inet=127.0.0.1:10030"
-# unix
-#POSTGREY_ADDR="--unix=/var/spool/postfix/private/postgrey"
-
-# TEXT
-#  response when a mail is greylisted
-POSTGREY_TEXT="Greylisted for %s seconds"
-
-# Additional Postgrey options
-#
-# -v, --verbose			increase verbosity level
-# --delay=N			greylist for N seconds (default: 300)
-# --max-age=N			delete entries older than N days since the last time
-#				that they have been seen (default: 30)
-# --retry-window=N		allow only N days for the first retrial (default: 2)
-#				append 'h' if you want to specify it in hours
-# --greylist-action=A		if greylisted, return A to Postfix (default: DEFER_IF_PERMIT)
-# --greylist-text=TXT		response when a mail is greylisted
-#				(default: Greylisted for %s seconds)
-# --lookup-by-subnet		strip the last 8 bits from IP addresses (default)
-# --lookup-by-host		do not strip the last 8 bits from IP addresses
-# --whitelist-clients=FILE	default: /etc/postfix/postgrey_whitelist_clients
-# --whitelist-recipients=FILE	default: /etc/postfix/postgrey_whitelist_recipients
-#
-# Note that the --whitelist-x options can be specified multiple times, and that
-# per default /etc/postfix/postgrey_whitelist_clients.local is also read, so
-# that you can put there local entries.
-#
-POSTGREY_OPTS=""