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

[Eli Schwartz]

    Date: Wednesday, January 10, 2018 @ 01:28:30
  Author: eschwartz
Revision: 280803

upgpkg: opendkim 2.10.3-5

migrate to systemd-sysusers/systemd-tmpfiles

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

-------------------+
 PKGBUILD          |   15 ++++++++-------
 opendkim.install  |    7 -------
 opendkim.sysusers |    2 ++
 opendkim.tmpfiles |    1 +
 4 files changed, 11 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-10 01:28:05 UTC (rev 280802)
+++ PKGBUILD	2018-01-10 01:28:30 UTC (rev 280803)
@@ -4,7 +4,7 @@
 
 pkgname=opendkim
 pkgver=2.10.3
-pkgrel=4
+pkgrel=5
 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter."
 arch=(x86_64)
 url="http://www.opendkim.org/"
@@ -13,15 +13,18 @@
 makedepends=("libmilter")
 options=(!emptydirs)
 backup=(etc/conf.d/opendkim)
-install=opendkim.install
 validpgpkeys=('5CDD574C22FF4D2480ACABDF5254B96BC608B511')
 source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz{,.asc}
 	opendkim.conf
+	opendkim.sysusers
+	opendkim.tmpfiles
 	opendkim.service
         openssl_1.1.0_compat.patch)
 sha256sums=('43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b'
             'SKIP'
             'a3b5ecf4f4fe4a79392a75f7c4b6cc93a51ef8503215bb0f64d795f8754d4b68'
+            '525ac5df345e753461efa8f6528f5532a00ecf2562f985a3c6c7169235170499'
+            'ab66c9fdcb8913f2a550289dd44d56d17b960cf5275839ffd03cba70a27ab6ed'
             '3e1cb3a3ddb794253d5a1c59673c40687bbc2b1bf878e70ccd03356f6d1e6735'
             '5095a7516493af08396060852851231c9b1cba5ee00493f810f0dfc9a69f8dfe')
 
@@ -47,12 +50,10 @@
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir/" install
+  install -Dm644 "$srcdir/opendkim.sysusers" "$pkgdir/usr/lib/sysusers.d/opendkim.conf"
+  install -Dm644 "$srcdir/opendkim.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/opendkim.conf"
 
-  # Sample configuration
-  mkdir -p "$pkgdir/etc/opendkim"
-  mv "$pkgdir/usr/share/doc/opendkim/opendkim.conf.sample" "$pkgdir/etc/opendkim/opendkim.conf.sample"
-  chmod 0700 "$pkgdir/etc/opendkim"
-  chmod 0600 "$pkgdir/etc/opendkim/opendkim.conf.sample"
+  # configure default configuration
   install -Dm644 "$srcdir/opendkim.conf" "$pkgdir/etc/conf.d/opendkim"
 
   # License

Deleted: opendkim.install
===================================================================
--- opendkim.install	2018-01-10 01:28:05 UTC (rev 280802)
+++ opendkim.install	2018-01-10 01:28:30 UTC (rev 280803)
@@ -1,7 +0,0 @@
-post_install() {
-    useradd -r -g mail -d / -s /sbin/nologin opendkim
-    chown -R opendkim:mail etc/opendkim
-    cat <<EOF
->>>  Check and modify /etc/opendkim/opendkim.conf before starting
-EOF
-}

Added: opendkim.sysusers
===================================================================
--- opendkim.sysusers	                        (rev 0)
+++ opendkim.sysusers	2018-01-10 01:28:30 UTC (rev 280803)
@@ -0,0 +1,2 @@
+u opendkim - - -
+m opendkim mail

Added: opendkim.tmpfiles
===================================================================
--- opendkim.tmpfiles	                        (rev 0)
+++ opendkim.tmpfiles	2018-01-10 01:28:30 UTC (rev 280803)
@@ -0,0 +1 @@
+d /etc/opendkim 0700 opendkim mail - -