[arch-commits] Commit in postfwd/trunk (PKGBUILD install postfwd.sysusers)

[Eli Schwartz]

    Date: Thursday, January 11, 2018 @ 19:20:44
  Author: eschwartz
Revision: 281371

upgpkg: postfwd 1.35-3

migrate to systemd-sysusers
drop unnecessarily-hardcoded uid/gid

Added:
  postfwd/trunk/postfwd.sysusers
Modified:
  postfwd/trunk/PKGBUILD
Deleted:
  postfwd/trunk/install

------------------+
 PKGBUILD         |   15 +++++++++------
 install          |   18 ------------------
 postfwd.sysusers |    1 +
 3 files changed, 10 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-11 19:11:33 UTC (rev 281370)
+++ PKGBUILD	2018-01-11 19:20:44 UTC (rev 281371)
@@ -3,16 +3,17 @@
 
 pkgname=postfwd
 pkgver=1.35
-pkgrel=2
+pkgrel=3
 pkgdesc="Combines complex postfix restrictions in a ruleset similar to those of the most firewalls"
 arch=(any)
 url="http://postfwd.org/"
 license=('bsd')
-install="install"
 depends=('perl' 'perl-io-multiplex' 'perl-net-server' 'perl-net-dns')
 source=("http://postfwd.org/$pkgname-$pkgver.tar.gz"
+        "postfwd.sysusers"
         "service")
 md5sums=('8e01328416c735d55efec90dede8bff2'
+         'e9fab05e2262385b759bd68c580e1f05'
          '1c9295de6da98241eb55e62809746030')
 
 prepare() {
@@ -33,12 +34,14 @@
   cp -ra tools/*  "$pkgdir/usr/share/$pkgname/"
   cp -ra doc/*    "$pkgdir/usr/share/$pkgname/"
 
-  install -Dm644 $srcdir/service "$pkgdir/usr/lib/systemd/system/${pkgname}.service"
-  install -Dm644 $srcdir/service "$pkgdir/usr/lib/systemd/system/${pkgname}2.service"
+  install -Dm644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/${pkgname}.service"
+  install -Dm644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/${pkgname}2.service"
   sed -i 's|/usr/bin/postfwd|/usr/bin/postfwd2|' "$pkgdir/usr/lib/systemd/system/${pkgname}2.service"
 
-  install -dm755 $pkgdir/usr/share/licenses/$pkgname
-  mv $pkgdir/usr/share/$pkgname/LICENSE $pkgdir/usr/share/licenses/$pkgname
+  install -Dm644 "$srcdir/postfwd.sysusers" "$pkgdir/usr/lib/sysusers.d/postfwd.conf"
+
+  install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
+  mv "$pkgdir/usr/share/$pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }
 
 # vim:set ts=2 sw=2 et:

Deleted: install
===================================================================
--- install	2018-01-11 19:11:33 UTC (rev 281370)
+++ install	2018-01-11 19:20:44 UTC (rev 281371)
@@ -1,18 +0,0 @@
-post_install() {
-	getent group postfwd  &>/dev/null || groupadd -g 180 postfwd  >/dev/null
-	getent passwd postfwd &>/dev/null || useradd -u 180 -d /var/empty -g postfwd -s /bin/false postfwd >/dev/null
-	true
-}
-
-post_upgrade() {
-	if  [ "$(vercmp $2 1.35-2)" -lt 0 ]; then
-		echo 'The config file moved to /etc/postfwd/postfwd.cf and postfwd will'
-		echo 'run under the postfwd user. Please make sure to adjust your setup.'
-	fi
-}
-
-pre_remove() {
-	getent passwd postfwd &>/dev/null && userdel  postfwd  >/dev/null
-	getent group postfwd  &>/dev/null && groupdel postfwd  >/dev/null
-	true
-}

Added: postfwd.sysusers
===================================================================
--- postfwd.sysusers	                        (rev 0)
+++ postfwd.sysusers	2018-01-11 19:20:44 UTC (rev 281371)
@@ -0,0 +1 @@
+u postfwd - - -