Date: Tuesday, March 12, 2013 @ 15:35:37
Author: spupykin
Revision: 86164
archrelease: copy trunk to community-any
Added:
postgrey/repos/community-any/PKGBUILD
(from rev 86163, postgrey/trunk/PKGBUILD)
postgrey/repos/community-any/postgrey.install
(from rev 86163, postgrey/trunk/postgrey.install)
postgrey/repos/community-any/postgrey.rc
(from rev 86163, postgrey/trunk/postgrey.rc)
postgrey/repos/community-any/postgrey.rc.conf
(from rev 86163, postgrey/trunk/postgrey.rc.conf)
postgrey/repos/community-any/postgrey.service
(from rev 86163, postgrey/trunk/postgrey.service)
postgrey/repos/community-any/postgrey.tmpfiles
(from rev 86163, postgrey/trunk/postgrey.tmpfiles)
Deleted:
postgrey/repos/community-any/PKGBUILD
postgrey/repos/community-any/postgrey.install
postgrey/repos/community-any/postgrey.rc
postgrey/repos/community-any/postgrey.rc.conf
postgrey/repos/community-any/postgrey.service
postgrey/repos/community-any/postgrey.tmpfiles
-------------------+
PKGBUILD | 90 +++++++++++++++----------------
postgrey.install | 50 ++++++++---------
postgrey.rc | 148 ++++++++++++++++++++++++++--------------------------
postgrey.rc.conf | 66 +++++++++++------------
postgrey.service | 34 ++++++-----
postgrey.tmpfiles | 2
6 files changed, 196 insertions(+), 194 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-12 14:35:21 UTC (rev 86163)
+++ PKGBUILD 2013-03-12 14:35:37 UTC (rev 86164)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Sean Timothy Noonan <stnoo...@obsolescence.net>
-
-pkgname=postgrey
-pkgver=1.34
-pkgrel=10
-pkgdesc="a Postfix policy server implementing greylisting"
-arch=('any')
-url="http://postgrey.schweikert.ch/";
-options=(emptydirs)
-license=("GPL")
-depends=('perl-net-server' 'perl>=5.6.0' 'perl-berkeleydb' 'perl-io-multiplex'
'db>=4.1')
-optdepends=('postfix: the recommended MTA for use with postgrey'
- 'exim: an alternative MTA'
- 'perl-net-dns: for postgreyreport tool')
-backup=(etc/postfix/postgrey_whitelist_recipients
- etc/postfix/postgrey_whitelist_clients
- 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'
- '3c299f2756d84d7e25d5f52a2e099a43'
- '3236959f435c95db3a13f4c7dd235609')
-
-build() {
- 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
- install -D -m 0644 postgrey_whitelist_clients
$pkgdir/etc/postfix/postgrey_whitelist_clients
-
- install -Dm0644 $srcdir/$pkgname.service
$pkgdir/usr/lib/systemd/system/$pkgname.service
- install -Dm0644 $srcdir/$pkgname.tmpfiles
$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
-}
Copied: postgrey/repos/community-any/PKGBUILD (from rev 86163,
postgrey/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-03-12 14:35:37 UTC (rev 86164)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Sean Timothy Noonan <stnoo...@obsolescence.net>
+
+pkgname=postgrey
+pkgver=1.34
+pkgrel=11
+pkgdesc="a Postfix policy server implementing greylisting"
+arch=('any')
+url="http://postgrey.schweikert.ch/";
+options=(emptydirs)
+license=("GPL")
+depends=('perl-net-server' 'perl>=5.6.0' 'perl-berkeleydb' 'perl-io-multiplex'
'db>=4.1')
+optdepends=('postfix: the recommended MTA for use with postgrey'
+ 'exim: an alternative MTA'
+ 'perl-net-dns: for postgreyreport tool')
+backup=(etc/postfix/postgrey_whitelist_recipients
+ etc/postfix/postgrey_whitelist_clients
+ 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')
+
+package() {
+ 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
+ install -D -m 0644 postgrey_whitelist_clients
$pkgdir/etc/postfix/postgrey_whitelist_clients
+
+ install -Dm0644 $srcdir/$pkgname.service
$pkgdir/usr/lib/systemd/system/$pkgname.service
+ install -Dm0644 $srcdir/$pkgname.tmpfiles
$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
+}
Deleted: postgrey.install
===================================================================
--- postgrey.install 2013-03-12 14:35:21 UTC (rev 86163)
+++ postgrey.install 2013-03-12 14:35:37 UTC (rev 86164)
@@ -1,25 +0,0 @@
-post_install() {
- if [ -z "`grep '^postgrey::' /etc/group`" ]; then
- groupadd -g 314 postgrey >& /dev/null
- fi
- if [ -z "`grep '^postgrey:' /etc/passwd`" ]; then
- useradd -u 314 -d /var/spool/postfix/postgrey -g postgrey -s
/bin/false postgrey
- else
- # (postgrey should have no shell, but may have been added by others in
the past)
- usermod -s /bin/false postgrey
- fi
-
- chown postgrey:postgrey /var/spool/postfix/postgrey
-
- mkdir -p var/run/postgrey
- chown postgrey:postgrey var/run/postgrey
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- userdel postgrey &> /dev/null
- groupdel postgrey &> /dev/null
-}
Copied: postgrey/repos/community-any/postgrey.install (from rev 86163,
postgrey/trunk/postgrey.install)
===================================================================
--- postgrey.install (rev 0)
+++ postgrey.install 2013-03-12 14:35:37 UTC (rev 86164)
@@ -0,0 +1,25 @@
+post_install() {
+ if [ -z "`grep '^postgrey::' /etc/group`" ]; then
+ groupadd -g 314 postgrey >& /dev/null
+ fi
+ if [ -z "`grep '^postgrey:' /etc/passwd`" ]; then
+ useradd -u 314 -d /var/spool/postfix/postgrey -g postgrey -s
/bin/false postgrey
+ else
+ # (postgrey should have no shell, but may have been added by others in
the past)
+ usermod -s /bin/false postgrey
+ fi
+
+ chown postgrey:postgrey /var/spool/postfix/postgrey
+
+ mkdir -p var/run/postgrey
+ chown postgrey:postgrey var/run/postgrey
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ userdel postgrey &> /dev/null
+ groupdel postgrey &> /dev/null
+}
Deleted: postgrey.rc
===================================================================
--- postgrey.rc 2013-03-12 14:35:21 UTC (rev 86163)
+++ postgrey.rc 2013-03-12 14:35:37 UTC (rev 86164)
@@ -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
Copied: postgrey/repos/community-any/postgrey.rc (from rev 86163,
postgrey/trunk/postgrey.rc)
===================================================================
--- postgrey.rc (rev 0)
+++ postgrey.rc 2013-03-12 14:35:37 UTC (rev 86164)
@@ -0,0 +1,74 @@
+#!/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-03-12 14:35:21 UTC (rev 86163)
+++ postgrey.rc.conf 2013-03-12 14:35:37 UTC (rev 86164)
@@ -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=""
Copied: postgrey/repos/community-any/postgrey.rc.conf (from rev 86163,
postgrey/trunk/postgrey.rc.conf)
===================================================================
--- postgrey.rc.conf (rev 0)
+++ postgrey.rc.conf 2013-03-12 14:35:37 UTC (rev 86164)
@@ -0,0 +1,33 @@
+# 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=""
Deleted: postgrey.service
===================================================================
--- postgrey.service 2013-03-12 14:35:21 UTC (rev 86163)
+++ postgrey.service 2013-03-12 14:35:37 UTC (rev 86164)
@@ -1,16 +0,0 @@
-[Unit]
-Description=Postfix Greylisting Service
-Before=postfix.service
-
-[Service]
-Type=simple
-EnvironmentFile=-/etc/conf.d/postgrey
-PIDFile=/var/run/postgrey/postgrey.pid
-ExecStart=/usr/sbin/postgrey --inet=127.0.0.1:10030 \
- --group=postgrey --user=postgrey $POSTGREY_OPTS
--pidfile=/var/run/postgrey/postgrey.pid \
- --greylist-text="${POSTGREY_TEXT}"
-Restart=always
-RestartSec=1
-
-[Install]
-WantedBy=multi-user.target
Copied: postgrey/repos/community-any/postgrey.service (from rev 86163,
postgrey/trunk/postgrey.service)
===================================================================
--- postgrey.service (rev 0)
+++ postgrey.service 2013-03-12 14:35:37 UTC (rev 86164)
@@ -0,0 +1,18 @@
+[Unit]
+Description=Postfix Greylisting Service
+Before=postfix.service
+
+[Service]
+Type=forking
+PIDFile=/run/postgrey/postgrey.pid
+ExecStart=/usr/sbin/postgrey --inet=127.0.0.1:10030 \
+ --pidfile=/run/postgrey/postgrey.pid \
+ --group=postgrey --user=postgrey \
+ --daemonize \
+ --greylist-text="Greylisted for %s seconds"
+Restart=always
+RestartSec=5
+TimeoutSec=10
+
+[Install]
+WantedBy=multi-user.target
Deleted: postgrey.tmpfiles
===================================================================
--- postgrey.tmpfiles 2013-03-12 14:35:21 UTC (rev 86163)
+++ postgrey.tmpfiles 2013-03-12 14:35:37 UTC (rev 86164)
@@ -1 +0,0 @@
-d /var/run/postgrey 0755 postgrey postgrey -
Copied: postgrey/repos/community-any/postgrey.tmpfiles (from rev 86163,
postgrey/trunk/postgrey.tmpfiles)
===================================================================
--- postgrey.tmpfiles (rev 0)
+++ postgrey.tmpfiles 2013-03-12 14:35:37 UTC (rev 86164)
@@ -0,0 +1 @@
+d /var/run/postgrey 0755 postgrey postgrey -
