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

[Eli Schwartz]

    Date: Sunday, January 14, 2018 @ 06:33:54
  Author: eschwartz
Revision: 281877

upgpkg: exim 4.90-3

migrate to systemd-sysusers/systemd-tmpfiles

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

---------------+
 PKGBUILD      |   28 ++++++++++++++--------------
 exim.install  |   14 --------------
 exim.sysusers |    1 +
 exim.tmpfiles |    3 +++
 4 files changed, 18 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-14 06:28:37 UTC (rev 281876)
+++ PKGBUILD	2018-01-14 06:33:54 UTC (rev 281877)
@@ -7,13 +7,12 @@
 
 pkgname=exim
 pkgver=4.90
-pkgrel=2
+pkgrel=3
 pkgdesc='Message Transfer Agent'
 arch=('x86_64')
-url='http://www.exim.org/'
+url='https://www.exim.org/'
 license=('GPL')
 backup=('etc/mail/aliases' 'etc/mail/exim.conf' 'etc/logrotate.d/exim')
-install='exim.install'
 depends=('gdbm' 'pcre' 'pam' 'openssl' 'libldap' 'sqlite')
 provides=('smtp-server' 'smtp-forwarder')
 conflicts=('smtp-server' 'smtp-forwarder')
@@ -25,7 +24,9 @@
         exim.service
         exim at .service
         exim.socket
-        exim-submission.socket)
+        exim-submission.socket
+        exim.sysusers
+        exim.tmpfiles)
 sha512sums=('0424d5d4eff28d94ade786402cfece3e2760ff0e44da3be5327b8695e4c3c483ec925ab24e13b1ebe145e204ad02b67ae99ff0992705bd1a3c312ede0464c74b'
             'SKIP'
             'a91c6a9e5b3ac9d143741dba01e11616812ba44c3a8c768c8232364026460f0b8fdeeb120a2f2b86742a6e3ebbfc9d6335b86d108b044e43108b4a6f0374c9ad'
@@ -35,7 +36,9 @@
             'e2fc3966c320460a26fbbf83e98df725587dc126dfe9d7a84c3285eb4b22a061b30499425c70f3d73cf13aa81c194274004efd20ce1316836463b982117909f8'
             '11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a'
             'db621116907ceb573e6f34581f47c91f751bff593054d7ddc32397b34c7f2405bec184bdb0589d2ac457fa3a61bcba072761e3a6293a99c9c764d2d9fd6069ae'
-            '4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d')
+            '4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d'
+            '87a16aa7bd60a8df0da8131bb811825232f25e934b9326460a2f8f0f8e0f44c53d71b1225ecfee8d30c8714f6e9f85f5f0821e346a7751d43683b406376d605b'
+            'f8a34fea0a65d0992732bc444bbb334d060de7d91d9cca6f00bc950ba289afa813783517dd3999437f89bc194290785805df7081606a65abb1db3fd3b3aa94ca')
 validpgpkeys=('C693A034E1ED6EE954CAE2DA13DAD99C7E41519C'  # Phil Pennock <pdp at exim.org>
               'ACBB4324393ADE3515DA2DDA4D1E900E14C1CC04'  # Phil Pennock <phil.pennock at spodhuis.org>
               'E5CA331D44AB8E4C806FDBEE26101B62F69376CE'  # Heiko Schlittermann (Exim MTA Maintainer) <heiko at exim.org>
@@ -54,26 +57,23 @@
   install -Dm0644 ../exim.logrotate "$pkgdir"/etc/logrotate.d/exim
   install -Dm0644 doc/exim.8 "$pkgdir"/usr/share/man/man8/exim.8
 
-  mkdir -p "$pkgdir"/var/spool/exim/db "$pkgdir"/etc/mail \
-    "$pkgdir"/var/log/exim "$pkgdir"/usr/{lib,bin}
+  install -Dm0644 ../exim.sysusers "$pkgdir"/usr/lib/sysusers.d/exim.conf
+  install -Dm0644 ../exim.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/exim.conf
 
-  chmod 770 "$pkgdir"/var/spool/exim{,/db} "$pkgdir"/var/log/exim
-  chown 0:79 "$pkgdir"/var/spool/exim "$pkgdir"/var/log/exim
-  chown 79:79 "$pkgdir"/var/spool/exim/db
-
   cd build-Linux-*
   for i in exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb \
     exipick exiqsumm exigrep exim_dbmbuild exim exim_fixdb eximstats exinext \
     exiqgrep exiwhat; do
-    install -m0755 "$i" "$pkgdir"/usr/bin
+    install -Dm0755 "$i" "$pkgdir"/usr/bin/$i
   done
+  chmod u+s "$pkgdir"/usr/bin/exim
 
   cd ../src
   sed -e "s|/etc/aliases|/etc/mail/aliases|g" \
     -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \
-    configure.default > "$pkgdir"/etc/mail/exim.conf
+    configure.default | install -Dm0644 /dev/stdin "$pkgdir"/etc/mail/exim.conf
 
-  cp "$srcdir"/aliases "$pkgdir"/etc/mail
+  install -Dm0644 "$srcdir"/aliases "$pkgdir"/etc/mail/aliases
 
   cd "$pkgdir"/usr/bin
   for i in mailq newaliases rmail rsmtp runq sendmail; do

Deleted: exim.install
===================================================================
--- exim.install	2018-01-14 06:28:37 UTC (rev 281876)
+++ exim.install	2018-01-14 06:33:54 UTC (rev 281877)
@@ -1,14 +0,0 @@
-post_install() {
-  getent group exim >/dev/null 2>&1 || groupadd -g 79 exim 
-  if getent passwd exim > /dev/null 2>&1; then
-    usr/sbin/usermod -d /var/spool/exim -c 'Exim MTA' -s /sbin/nologin exim > /dev/null 2>&1
-  else
-    usr/sbin/useradd -c 'Exim MTA' -u 79 -g exim -d /var/spool/exim -s /sbin/nologin exim 
-  fi
-  passwd -l exim > /dev/null
-  chmod u+s /usr/bin/exim
-}
-
-post_upgrade() {
-  post_install
-}

Added: exim.sysusers
===================================================================
--- exim.sysusers	                        (rev 0)
+++ exim.sysusers	2018-01-14 06:33:54 UTC (rev 281877)
@@ -0,0 +1 @@
+u exim 79 "Exim MTA" /var/spool/exim

Added: exim.tmpfiles
===================================================================
--- exim.tmpfiles	                        (rev 0)
+++ exim.tmpfiles	2018-01-14 06:33:54 UTC (rev 281877)
@@ -0,0 +1,3 @@
+d /var/spool/exim    0770 root exim - -
+d /var/spool/exim/db 0770 exim exim - -
+d /var/log/exim      0770 root exim - -