main/postgrey: moved from testing, incl dependencies

Trying to clean up the mess.

4 files changed, 34 insertions, 23 deletions

diff --git a/main/postgrey/APKBUILD b/main/postgrey/APKBUILD
index b7ce04f1c3..83afce3c6f 100644
--- a/main/postgrey/APKBUILD
+++ b/main/postgrey/APKBUILD
@@ -1,30 +1,36 @@
-# Maintainer: Leonardo Arena <rnalrg@gmail.com>
+# Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=postgrey
 pkgver=1.32
-pkgrel=0
-pkgdesc="Postfix Greylisting Policy Server"
+pkgrel=2
+pkgdesc="Postfix policy server implementing greylisting"
 url="http://postgrey.schweikert.ch/"
-license="GPL-2"
-depends="perl-net-server perl-io-multiplex perl-db postfix"
+license="GPL"
+depends="perl perl-db perl-net-dns perl-net-server perl-io-multiplex
+	perl-net-rblclient perl-parse-syslog"
+pkgusers="postgrey"
+pkggroups="postgrey"
 makedepends=""
-install="$pkgname.pre-install"
-subpackages="$pkgname-doc"
-source="http://postgrey.schweikert.ch/pub/$pkgname-$pkgver.tar.gz"
+install=postgrey.pre-install
+subpackages=""
+source="http://postgrey.schweikert.ch/pub/$pkgname-$pkgver.tar.gz
+	postgrey.confd
+	postgrey.initd"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	mkdir -p -m0770 $pkgdir/var/spool/postfix/postgrey
-	chown postgrey.postgrey $pkgdir/var/spool/postfix/postgrey
-	install -m755 -D postgrey $pkgdir/usr/sbin/postgrey
-	install -m755 -D policy-test $pkgdir/usr/bin/policy-test
-	install -m755 -D contrib/postgreyreport $pkgdir/usr/bin/postgreyreport
-	install -m644 -D postgrey_whitelist_recipients $pkgdir/etc/postfix/postgrey_whitelist_recipients
-	install -m644 -D postgrey_whitelist_clients $pkgdir/etc/postfix/postgrey_whitelist_clients
-	install -m644 -D README $pkgdir/usr/share/doc/$pkgname/README
-	install -m644 -D Changes $pkgdir/usr/share/doc/$pkgname/Changes
-	install -m644 -D COPYING $pkgdir/usr/share/doc/$pkgname/COPYING
-	install -m755 -D ../../postgrey.init $pkgdir/etc/init.d/postgrey
-	install -m644 -D ../../postgrey.conf $pkgdir/etc/conf.d/postgrey
+	
+	install -m755 -D $pkgname  "$pkgdir"/usr/sbin/$pkgname
+	mkdir -p "$pkgdir"/var/spool/postfix/$pkgname
+	chown postgrey:postgrey "$pkgdir"/var/spool/postfix/$pkgname
+	chmod 770 "$pkgdir"/var/spool/postfix/$pkgname
+	install -m755 -D contrib/postgreyreport "$pkgdir"/usr/bin/postgreyreport
+	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -m644 -D postgrey_whitelist_clients "$pkgdir"/etc/postfix/postgrey_whitelist_clients
+	install -m644 -D postgrey_whitelist_recipients "$pkgdir"/etc/postfix/postgrey_whitelist_recipients
+	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-md5sums="524a4e165bf997996f3bccade394712f  postgrey-1.32.tar.gz"
+md5sums="524a4e165bf997996f3bccade394712f  postgrey-1.32.tar.gz
+caaad5770ab07fb5af3bbd522a05b84f  postgrey.confd
+d0611b244202c77ad7ad79862721a738  postgrey.initd"
diff --git a/main/postgrey/postgrey.conf b/main/postgrey/postgrey.confd
index 0baa871a8b..7a6deb587f 100644
--- a/main/postgrey/postgrey.conf
+++ b/main/postgrey/postgrey.confd
@@ -29,7 +29,7 @@ POSTGREY_PID="/var/run/postgrey.pid"
 
 # DELAY
 #  How long to delay mail that is greylisted in seconds.
-POSTGREY_DELAY=60
+POSTGREY_DELAY=300
 
 # TEXT
 #  The response we'll send back with delayed mail.
diff --git a/main/postgrey/postgrey.init b/main/postgrey/postgrey.initd
index d38538de17..c9e51ceba9 100644
--- a/main/postgrey/postgrey.init
+++ b/main/postgrey/postgrey.initd
@@ -9,6 +9,7 @@ opts="${opts} reload"
 
 depend() {
 	need net
+	after firewall
 	before postfix
 	provide postfix_greylist
 }
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
index e37a27f7d5..3c34c3fd5f 100755..100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
@@ -1,2 +1,6 @@
 #!/bin/sh
-adduser -h /var/spool/postfix/postgrey -g postgrey -s /bin/false -D postgrey &>/dev/null
+
+addgroup postgrey 2>/dev/null
+adduser -H -h /dev/null -s /bin/false -D postgrey  2>/dev/null
+
+exit 0