[arch-commits] Commit in postgrey/trunk (4 files)

[Eli Schwartz]

    Date: Tuesday, January 9, 2018 @ 03:42:18
  Author: eschwartz
Revision: 280617

upgpkg: postgrey 1.37-2

Migrate to systemd-sysusers/systemd-tmpfiles.

Added:
  postgrey/trunk/postgrey.sysusers
Modified:
  postgrey/trunk/PKGBUILD
  postgrey/trunk/postgrey.tmpfiles
Deleted:
  postgrey/trunk/postgrey.install

-------------------+
 PKGBUILD          |   10 +++++-----
 postgrey.install  |   16 ----------------
 postgrey.sysusers |    1 +
 postgrey.tmpfiles |    3 ++-
 4 files changed, 8 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-09 03:42:06 UTC (rev 280616)
+++ PKGBUILD	2018-01-09 03:42:18 UTC (rev 280617)
@@ -4,7 +4,7 @@
 
 pkgname=postgrey
 pkgver=1.37
-pkgrel=1
+pkgrel=2
 pkgdesc="a Postfix policy server implementing greylisting"
 arch=('any')
 url="https://postgrey.schweikert.ch/"
@@ -17,14 +17,15 @@
 	    'perl-net-dns: for postgreyreport tool')
 backup=(etc/postfix/postgrey_whitelist_recipients
 	etc/postfix/postgrey_whitelist_clients)
-install=$pkgname.install
 source=($url/pub/$pkgname-$pkgver.tar.gz
 	postgrey.service
+	postgrey.sysusers
 	postgrey.tmpfiles
 	untaint.patch)
 sha256sums=('ff4d9543f8f5cb0356c30ffe22255d942ac6128da734c376de211c02630fa5f7'
             'd36c73b6a8ba96ba3eaa3e56098afda828ee56ec12000d3392ab450246d38e09'
-            '213e5548c6355a2c57a15919aec6932def611a12cf20855ad6642626cae27f71'
+            '859380a05ca55e1d07e1e38f16244adfa8cde9987414df9785206bddc84137cc'
+            '85c9155ba3bcc55544a362cca7f6ae385f702cc26ea7d3fdafce38d30c297dfb'
             'e5f80653c02681b54f28051104f1ce45991b014a86965610611b1b4921284bd7')
 
 prepare() {
@@ -34,8 +35,6 @@
 
 package() {
   cd "$srcdir"/$pkgname-$pkgver
-  chown -R root:root .
-  mkdir -p "$pkgdir"/var/spool/postfix/postgrey
   install -D -m 0755 postgrey "$pkgdir"/usr/bin/postgrey
   install -D -m 0755 contrib/postgreyreport "$pkgdir"/usr/bin/postgreyreport
   install -D -m 0644 postgrey_whitelist_recipients "$pkgdir"/etc/postfix/postgrey_whitelist_recipients
@@ -42,5 +41,6 @@
   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.sysusers "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf
   install -Dm0644 "$srcdir"/$pkgname.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
 }

Deleted: postgrey.install
===================================================================
--- postgrey.install	2018-01-09 03:42:06 UTC (rev 280616)
+++ postgrey.install	2018-01-09 03:42:18 UTC (rev 280617)
@@ -1,16 +0,0 @@
-post_install() {
-    if [ -z "`grep '^postgrey::' /etc/group`" ]; then
-        groupadd -r postgrey >& /dev/null
-    fi
-    if [ -z "`grep '^postgrey:' /etc/passwd`" ]; then
-        useradd -r -d /var/spool/postfix/postgrey -g postgrey -s /bin/false postgrey
-    fi
-
-    mkdir -p var/run/postgrey
-    chown postgrey:postgrey /var/spool/postfix/postgrey
-    chown postgrey:postgrey var/run/postgrey
-}
-
-post_upgrade() {
-    post_install $1
-}

Added: postgrey.sysusers
===================================================================
--- postgrey.sysusers	                        (rev 0)
+++ postgrey.sysusers	2018-01-09 03:42:18 UTC (rev 280617)
@@ -0,0 +1 @@
+u postgrey - - /var/spool/postfix/postgrey

Modified: postgrey.tmpfiles
===================================================================
--- postgrey.tmpfiles	2018-01-09 03:42:06 UTC (rev 280616)
+++ postgrey.tmpfiles	2018-01-09 03:42:18 UTC (rev 280617)
@@ -1 +1,2 @@
-d /var/run/postgrey 0755 postgrey postgrey -
+d /var/spool/postfix/postgrey/ 0755 postgrey postgrey -
+d /var/run/postgrey            0755 postgrey postgrey -