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

[Eli Schwartz]

    Date: Wednesday, February 7, 2018 @ 23:06:02
  Author: eschwartz
Revision: 290094

upgpkg: nullmailer 2.0-3

migrate to systemd-sysusers/systemd-tmpfiles

Added:
  nullmailer/trunk/nullmailer.sysusers
  nullmailer/trunk/nullmailer.tmpfiles
Modified:
  nullmailer/trunk/PKGBUILD
  nullmailer/trunk/nullmailer.install

---------------------+
 PKGBUILD            |   19 ++++++++++++++-----
 nullmailer.install  |   30 ------------------------------
 nullmailer.sysusers |    1 +
 nullmailer.tmpfiles |    9 +++++++++
 4 files changed, 24 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-07 22:33:55 UTC (rev 290093)
+++ PKGBUILD	2018-02-07 23:06:02 UTC (rev 290094)
@@ -5,10 +5,10 @@
 
 pkgname=nullmailer
 pkgver=2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple relay-only mail transport agent."
 arch=('x86_64')
-url="http://www.untroubled.org/nullmailer/"
+url="https://www.untroubled.org/nullmailer/"
 license=("GPL")
 provides=('smtp-forwarder')
 conflicts=('smtp-forwarder' 'smtp-server')
@@ -15,8 +15,12 @@
 depends=('gnutls')
 options=(emptydirs)
 install=nullmailer.install
-source=("http://www.untroubled.org/nullmailer/archive/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e35e8248056fd21a2e464d34116c44a2')
+source=("https://www.untroubled.org/nullmailer/archive/${pkgname}-${pkgver}.tar.gz"
+        "nullmailer.sysusers"
+        "nullmailer.tmpfiles")
+md5sums=('e35e8248056fd21a2e464d34116c44a2'
+         'fa9c9f9194d4ffbe0c6cd9e325f0f34a'
+         '52e15c34a0a2187688da1f4d1a9cc784')
 
 build() {
     cd ${pkgname}-${pkgver}
@@ -34,5 +38,10 @@
     cd ${pkgname}-${pkgver}
     make DESTDIR="${pkgdir}" install
 
-    install -Dm644 scripts/nullmailer.service "$pkgdir"/usr/lib/systemd/system/nullmailer.service
+    # covered by tmpfiles with fixed ownership
+    rm -rf "${pkgdir}"/var
+
+    install -Dm644 scripts/nullmailer.service "${pkgdir}"/usr/lib/systemd/system/nullmailer.service
+    install -Dm644 "${srcdir}"/nullmailer.sysusers "${pkgdir}"/usr/lib/sysusers.d/nullmailer.conf
+    install -Dm644 "${srcdir}"/nullmailer.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/nullmailer.conf
 }

Modified: nullmailer.install
===================================================================
--- nullmailer.install	2018-02-07 22:33:55 UTC (rev 290093)
+++ nullmailer.install	2018-02-07 23:06:02 UTC (rev 290094)
@@ -1,33 +1,3 @@
-post_install() {
-    if ! getent passwd nullmail > /dev/null; then
-        echo "==> Creating nullmail user"
-        usr/bin/useradd --comment "nullmailer MTA" --shell /bin/sh --home /var/spool/nullmailer --system --user-group nullmail
-    fi
-
-    echo "==> Creating trigger fifo"
-    rm -f var/spool/nullmailer/trigger && mkfifo -m 600 var/spool/nullmailer/trigger
-
-    echo "==> Fixing permissions"
-    chown nullmail var/spool/nullmailer/*
-    chown nullmail usr/bin/nullmailer-queue
-    chmod u+s      usr/bin/nullmailer-queue
-    chown nullmail usr/bin/mailq
-    chmod u+s      usr/bin/mailq
-    if ! [ -s etc/nullmailer/me ]; then
-        echo "==> Configuring"
-        hostnamectl --static > etc/nullmailer/me
-    fi
-    if ! [ -s etc/nullmailer/remotes ]; then
-        echo "smarthost.example.org smtp --port=25 --auth-login --user=user --pass=pass" > etc/nullmailer/remotes
-        chgrp nullmail etc/nullmailer/remotes
-        chmod 640 etc/nullmailer/remotes
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
 pre_remove() {
     systemctl stop nullmailer
     # Leave the 'queue' directory intact

Added: nullmailer.sysusers
===================================================================
--- nullmailer.sysusers	                        (rev 0)
+++ nullmailer.sysusers	2018-02-07 23:06:02 UTC (rev 290094)
@@ -0,0 +1 @@
+u nullmail - "nullmailer MTA" /var/spool/nullmailer

Added: nullmailer.tmpfiles
===================================================================
--- nullmailer.tmpfiles	                        (rev 0)
+++ nullmailer.tmpfiles	2018-02-07 23:06:02 UTC (rev 290094)
@@ -0,0 +1,9 @@
+d /var/spool/nullmailer         -    nullmail nullmail - -
+d /var/spool/nullmailer/failed  0700 nullmail nullmail - -
+d /var/spool/nullmailer/queue   0700 nullmail nullmail - -
+d /var/spool/nullmailer/tmp     0700 nullmail nullmail - -
+p /var/spool/nullmailer/trigger 0600 nullmail nullmail - -
+z /usr/bin/mailq                4755 nullmail -        - -
+z /usr/bin/nullmailer-queue     4755 nullmail -        - -
+f /etc/nullmailer/me            -    -        -        - %H
+f /etc/nullmailer/remotes       0640 -        nullmail - smarthost.example.org smtp --port=25 --auth-login --user=user --pass=pass