[arch-commits] Commit in opensmtpd/trunk (3 files)

[Eli Schwartz]

    Date: Wednesday, January 10, 2018 @ 01:25:20
  Author: eschwartz
Revision: 280800

upgpkg: opensmtpd 6.0.2p1-7

migrate to systemd-sysusers

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

--------------------+
 PKGBUILD           |   10 ++++++----
 opensmtpd.install  |   26 --------------------------
 opensmtpd.sysusers |    4 ++++
 3 files changed, 10 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-10 00:59:57 UTC (rev 280799)
+++ PKGBUILD	2018-01-10 01:25:20 UTC (rev 280800)
@@ -4,10 +4,10 @@
 
 pkgname=opensmtpd
 pkgver=6.0.2p1
-pkgrel=6
+pkgrel=7
 pkgdesc='Free implementation of the server-side SMTP protocol'
 arch=('x86_64')
-url='http://www.opensmtpd.org/'
+url='https://www.opensmtpd.org/'
 license=('custom')
 depends=('libasr' 'libevent' 'openssl-1.0' 'pam')
 provides=('smtp-server' 'smtp-forwarder')
@@ -14,11 +14,12 @@
 conflicts=('smtp-server' 'smtp-forwarder')
 backup=('etc/smtpd/smtpd.conf' 'etc/smtpd/aliases')
 options=('emptydirs')
-install=opensmtpd.install
 source=("https://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz"
+        'opensmtpd.sysusers'
         'smtpd.service'
         'smtpd.socket')
 sha256sums=('2af9b6d08784c7e546bf124bb61e311a6aa0c9835507710a76f5c242383190ac'
+            'b38b64f1457b7227d55585edc711cce525e089516d16b093e6c44387380e6b13'
             'abf5baeb2a87c60d668ad18ea41cc08cab7a4f76339dd6df05de15cdaadaf922'
             '32d46de5562d01de445d04c93bcc9f94bf103539b676e449c32e3603a3866cf8')
 
@@ -58,10 +59,11 @@
   ln -s /usr/bin/smtpctl "$pkgdir/usr/bin/newaliases"
   ln -s /usr/bin/smtpctl "$pkgdir/usr/bin/makemap"
 
-  # install license and systemd unit files
+  # install license, systemd unit files, sysusers
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   install -Dm644 "$srcdir/smtpd.service" "$pkgdir/usr/lib/systemd/system/smtpd.service"
   install -Dm644 "$srcdir/smtpd.socket" "$pkgdir/usr/lib/systemd/system/smtpd.socket"
+  install -Dm644 "$srcdir/opensmtpd.sysusers" "$pkgdir/usr/lib/sysusers.d/opensmtpd.conf"
 
   # install an empty aliases file (used by the default config)
   install -Dm644 /dev/null "$pkgdir/etc/smtpd/aliases"

Deleted: opensmtpd.install
===================================================================
--- opensmtpd.install	2018-01-10 00:59:57 UTC (rev 280799)
+++ opensmtpd.install	2018-01-10 01:25:20 UTC (rev 280800)
@@ -1,26 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  # create users
-  getent group smtpq >/dev/null || groupadd  -r smtpq
-  getent passwd smtpd >/dev/null || useradd -c "SMTP Daemon" -d /var/empty -u 91 -g 1 -s /bin/nologin smtpd
-  getent passwd smtpq >/dev/null || useradd -c "SMTPD Queue" -d /var/empty -u 92 -g smtpq -s/bin/nologin smtpq
-  :
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-  if (( $(vercmp $2 5.3.3p1-1) < 0 )); then
-    echo 'Configuration files have been moved to /etc/smtpd.'
-    echo 'New users have been added.'
-    echo 'Check your configuration!'
-  elif (( $(vercmp $2 5.4) < 0 )); then
-    echo 'User smtpf is no more required. It will be removed!'
-    echo 'Check your configuration!'
-    userdel -f smtpf
-  fi
-  :
-}
-
-# vim:set ts=2 sw=2 et:

Added: opensmtpd.sysusers
===================================================================
--- opensmtpd.sysusers	                        (rev 0)
+++ opensmtpd.sysusers	2018-01-10 01:25:20 UTC (rev 280800)
@@ -0,0 +1,4 @@
+u smtpd 91 "SMTP Daemon" -
+u smtpq 92 "SMTP Queue"  -
+
+m smtpd root