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

[Antonio Rojas]

    Date: Saturday, July 9, 2016 @ 17:19:04
  Author: arojas
Revision: 182590

Use upstream service file, fix paths in install file (FS#50005)

Modified:
  nullmailer/trunk/PKGBUILD
  nullmailer/trunk/nullmailer.install
Deleted:
  nullmailer/trunk/nullmailer.service

--------------------+
 PKGBUILD           |   17 +++++++----------
 nullmailer.install |    6 +++---
 nullmailer.service |   13 -------------
 3 files changed, 10 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-09 16:20:46 UTC (rev 182589)
+++ PKGBUILD	2016-07-09 17:19:04 UTC (rev 182590)
@@ -5,7 +5,7 @@
 
 pkgname=nullmailer
 pkgver=2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple relay-only mail transport agent."
 arch=('i686' 'x86_64')
 url="http://www.untroubled.org/nullmailer/"
@@ -15,13 +15,11 @@
 depends=('gnutls')
 options=(emptydirs)
 install=nullmailer.install
-source=("http://www.untroubled.org/nullmailer/archive/${pkgname}-${pkgver}.tar.gz"
-        nullmailer.service)
-md5sums=('e35e8248056fd21a2e464d34116c44a2'
-         '300f17c52422d4156583f207f2405930')
+source=("http://www.untroubled.org/nullmailer/archive/${pkgname}-${pkgver}.tar.gz")
+md5sums=('e35e8248056fd21a2e464d34116c44a2')
 
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd ${pkgname}-${pkgver}
     ./configure \
         --prefix=/usr \
         --libexecdir=/usr/lib/${pkgname} \
@@ -33,9 +31,8 @@
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd ${pkgname}-${pkgver}
     make DESTDIR="${pkgdir}" install
-    install -D -m 0644 ../nullmailer.service "${pkgdir}/usr/lib/systemd/system/nullmailer.service"
-    # Remove pipe and create on install to work around makepkg hang on grep -R
-    rm -f "${pkgdir}/var/nullmailer/trigger"
+
+    install -Dm644 scripts/nullmailer.service "$pkgdir"/usr/lib/systemd/system/nullmailer.service
 }

Modified: nullmailer.install
===================================================================
--- nullmailer.install	2016-07-09 16:20:46 UTC (rev 182589)
+++ nullmailer.install	2016-07-09 17:19:04 UTC (rev 182590)
@@ -1,14 +1,14 @@
 post_install() {
     if ! getent passwd nullmail > /dev/null; then
         echo "==> Creating nullmail user"
-        usr/bin/useradd --comment "nullmailer MTA" --shell /bin/sh --home /var/nullmailer --system --user-group nullmail
+        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/nullmailer/trigger && mkfifo -m 600 var/nullmailer/trigger
+    rm -f var/spool/nullmailer/trigger && mkfifo -m 600 var/spool/nullmailer/trigger
 
     echo "==> Fixing permissions"
-    chown nullmail var/nullmailer/*
+    chown nullmail var/spool/nullmailer/*
     chown nullmail usr/bin/nullmailer-queue
     chmod u+s      usr/bin/nullmailer-queue
     chown nullmail usr/bin/mailq

Deleted: nullmailer.service
===================================================================
--- nullmailer.service	2016-07-09 16:20:46 UTC (rev 182589)
+++ nullmailer.service	2016-07-09 17:19:04 UTC (rev 182590)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Nullmailer relay-only MTA
-After=local-fs.target
-ConditionPathExists=/var/nullmailer/queue
-
-[Install]
-WantedBy=multi-user.target
-
-[Service]
-WorkingDirectory=/var/nullmailer
-ExecStart=/usr/bin/nullmailer-send
-User=nullmail
-Restart=always