diff options
| -rw-r--r-- | network/postgrey/doinst.sh | 1 | ||||
| -rw-r--r-- | network/postgrey/postgrey.SlackBuild | 11 | ||||
| -rw-r--r-- | network/postgrey/postgrey.conf | 10 | ||||
| -rw-r--r-- | network/postgrey/postgrey.info | 6 | ||||
| -rw-r--r-- | network/postgrey/rc.postgrey | 12 |
5 files changed, 26 insertions, 14 deletions
diff --git a/network/postgrey/doinst.sh b/network/postgrey/doinst.sh index e935335cd0..5bf85c6667 100644 --- a/network/postgrey/doinst.sh +++ b/network/postgrey/doinst.sh @@ -21,5 +21,6 @@ preserve_perms() { config etc/postfix/postgrey_whitelist_clients.new config etc/postfix/postgrey_whitelist_recipients.new +config etc/postgrey.conf.new preserve_perms etc/rc.d/rc.postgrey.new diff --git a/network/postgrey/postgrey.SlackBuild b/network/postgrey/postgrey.SlackBuild index 71fa28387f..0c68baf620 100644 --- a/network/postgrey/postgrey.SlackBuild +++ b/network/postgrey/postgrey.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=postgrey -VERSION=${VERSION:-1.34} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.37} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -98,10 +98,13 @@ cp -a policy-test postgrey contrib/postgreyreport $PKG/usr/bin mkdir -p $PKG/etc/rc.d sed -e s/%POSTGREYUSR%/$POSTGREYUSR/g \ -e s/%POSTGREYGRP%/$POSTGREYGRP/g \ + $CWD/postgrey.conf > $PKG/etc/postgrey.conf.new +sed -e s/%POSTGREYUSR%/$POSTGREYUSR/g \ + -e s/%POSTGREYGRP%/$POSTGREYGRP/g \ $CWD/rc.postgrey > $PKG/etc/rc.d/rc.postgrey.new -mkdir -p $PKG/var/{lib,run}/postgrey -chown $POSTGREYUSR.$POSTGREYGRP $PKG/var/lib/postgrey $PKG/var/run/postgrey +mkdir -p $PKG/var/lib/postgrey +chown ${POSTGREYUSR}:${POSTGREYGRP} $PKG/var/lib/postgrey mkdir -p $PKG/etc/postfix cp -a postgrey_whitelist_clients $PKG/etc/postfix/postgrey_whitelist_clients.new diff --git a/network/postgrey/postgrey.conf b/network/postgrey/postgrey.conf new file mode 100644 index 0000000000..db34cb398c --- /dev/null +++ b/network/postgrey/postgrey.conf @@ -0,0 +1,10 @@ +# /etc/postgrey.conf +# +# This file will be sourced from /etc/rc.d/rc.postgrey +# +PORT=10025 +PIDFILE=/var/run/postgrey/postgrey.pid +USER=%POSTGREYUSR% +GROUP=%POSTGREYGRP% +HOST=mail.example.com + diff --git a/network/postgrey/postgrey.info b/network/postgrey/postgrey.info index 802b44f23a..140612fab0 100644 --- a/network/postgrey/postgrey.info +++ b/network/postgrey/postgrey.info @@ -1,8 +1,8 @@ PRGNAM="postgrey" -VERSION="1.34" +VERSION="1.37" HOMEPAGE="http://postgrey.schweikert.ch/" -DOWNLOAD="http://postgrey.schweikert.ch/pub/old/postgrey-1.34.tar.gz" -MD5SUM="f736a7be1094593f1a66cd13f32b39ef" +DOWNLOAD="http://postgrey.schweikert.ch/pub/postgrey-1.37.tar.gz" +MD5SUM="2ef30f42ad84f00caf41c49b593b8e2a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-Net-Server perl-IO-Multiplex perl-BerkeleyDB perl-net-dns" diff --git a/network/postgrey/rc.postgrey b/network/postgrey/rc.postgrey index d763884bfa..5c33151085 100644 --- a/network/postgrey/rc.postgrey +++ b/network/postgrey/rc.postgrey @@ -1,17 +1,15 @@ #!/bin/bash -PORT=10025 -PIDFILE=/var/run/postgrey/postgrey.pid -USER=%POSTGREYUSR% -GROUP=%POSTGREYGRP% -HOST=mail.example.com +. /etc/postgrey.conf || exit 1 postgrey_start() { echo "Starting postgrey milter: /usr/bin/postgrey -d --inet=$PORT --pidfile=$PIDFILE --user=$USER --group=$GROUP --dbdir=/var/lib/postgrey --hostname=$HOST" - mkdir -p /var/run/postgrey + mkdir -p $(dirname $PIDFILE) + chown ${USER}:${GROUP} $(dirname $PIDFILE) + /usr/bin/postgrey -d \ --inet=$PORT \ - --pidfile=/var/run/postgrey/postgrey.pid \ + --pidfile=$PIDFILE \ --user=$USER --group=$GROUP \ --dbdir=/var/lib/postgrey \ --hostname=$HOST |