replace post-install script with tmpfiles.d

4 files changed, 15 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d693a9a7207..9274cea01d68 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = netkit-telnet-ssl
 	pkgdesc = Telnet client and server with TLS support (Debian Netkit version)
 	pkgver = 0.17.41+0.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.hcs.harvard.edu/~dholland/computers/netkit.html
-	install = netkit-telnet-ssl.install
 	arch = i686
 	arch = x86_64
 	license = BSD
@@ -14,6 +13,7 @@ pkgbase = netkit-telnet-ssl
 	source = https://deb.debian.org/debian/pool/main/n/netkit-telnet-ssl/netkit-telnet-ssl_0.17.41+0.2-3.debian.tar.xz
 	source = netkit-telnet-ssl.arch.patch
 	source = netkit-telnet-ssl.sysusers
+	source = netkit-telnet-ssl.tmpfiles
 	source = netkit-telnetd.socket
 	source = netkit-telnetd-ssl.socket
 	source = netkit-telnetd@.service
@@ -23,6 +23,7 @@ pkgbase = netkit-telnet-ssl
 	sha256sums = 3f8b155bc5085e37a0d836867af330f2911953055010e30f30ca46698559a0aa
 	sha256sums = 339308000345e294f0188c232bdb6cf4a22225db2efe188064f14caabd915ed4
 	sha256sums = be6cc69383e1326a9aa49d36bfda856d049f16512655ea83b991910800d540ba
+	sha256sums = 202fbfc51e6f6b92246853342a7ef47a731d64d012c8a8a026f9e9b154b9ade5
 	sha256sums = 25a9cd6c6fd3dd50a20038c05d755c519be1081e42bcb148f71e7a8f182e91a2
 	sha256sums = a9a14476c43d65a57d50eec7e7d773ff1031cf1c13c12e84a9de5eaa14279434
 	sha256sums = 6e45cfed7968af48b59f172523934db421964e58fdb624872a831160e2848284
diff --git a/PKGBUILD b/PKGBUILD
index d253fc109ec4..424567a62297 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=netkit-telnet-ssl
 _debver=0.17.41+0.2
 _debrel=3
 pkgver=$_debver
-pkgrel=2
+pkgrel=3
 pkgdesc="Telnet client and server with TLS support (Debian Netkit version)"
 arch=('i686' 'x86_64')
 depends=('glibc' 'openssl' 'ncurses')
@@ -16,6 +16,7 @@ source=(https://deb.debian.org/debian/pool/main/n/${pkgname}/${pkgname}_${_debve
         https://deb.debian.org/debian/pool/main/n/${pkgname}/${pkgname}_${_debver}-${_debrel}.debian.tar.xz
         netkit-telnet-ssl.arch.patch
         netkit-telnet-ssl.sysusers
+        netkit-telnet-ssl.tmpfiles
         netkit-telnetd{,-ssl}.socket
         netkit-telnetd{,-ssl}@.service
         netkit-telnetd-ssl.acmetool.sh)
@@ -23,12 +24,12 @@ sha256sums=('9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00'
             '3f8b155bc5085e37a0d836867af330f2911953055010e30f30ca46698559a0aa'
             '339308000345e294f0188c232bdb6cf4a22225db2efe188064f14caabd915ed4'
             'be6cc69383e1326a9aa49d36bfda856d049f16512655ea83b991910800d540ba'
+            '202fbfc51e6f6b92246853342a7ef47a731d64d012c8a8a026f9e9b154b9ade5'
             '25a9cd6c6fd3dd50a20038c05d755c519be1081e42bcb148f71e7a8f182e91a2'
             'a9a14476c43d65a57d50eec7e7d773ff1031cf1c13c12e84a9de5eaa14279434'
             '6e45cfed7968af48b59f172523934db421964e58fdb624872a831160e2848284'
             'b4220954373f5431b127509b4344dad32d5c692871c536106507fa8b052ef40a'
             'f59cab8283d1eb5982e74caa8cdb4536621ced36e399e746f6e203de3b60b9bc')
-install=$pkgname.install
 
 prepare() {
   cd netkit-telnet-0.17
@@ -64,6 +65,9 @@ package() {
   install -D -m 644 "$srcdir"/netkit-telnet-ssl.sysusers \
                     "$pkgdir"/usr/lib/sysusers.d/netkit-telnet-ssl.conf
 
+  install -D -m 644 "$srcdir"/netkit-telnet-ssl.tmpfiles \
+                    "$pkgdir"/usr/lib/tmpfiles.d/netkit-telnet-ssl.conf
+
   for unit in netkit-telnetd{,-ssl}{.socket,@.service}; do
     install -D -m 644 "$srcdir"/"$unit" \
                       "$pkgdir"/usr/lib/systemd/system/"$unit"
diff --git a/netkit-telnet-ssl.install b/netkit-telnet-ssl.install
deleted file mode 100644
index 76455d4f131e..000000000000
--- a/netkit-telnet-ssl.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
-  post_upgrade
-}
-
-post_upgrade() {
-  systemd-sysusers netkit-telnet-ssl.conf
-  chown root:_telnetd /usr/lib/telnetlogin
-  chmod 04754 /usr/lib/telnetlogin
-}
diff --git a/netkit-telnet-ssl.tmpfiles b/netkit-telnet-ssl.tmpfiles
new file mode 100644
index 000000000000..30d6962a1c0b
--- /dev/null
+++ b/netkit-telnet-ssl.tmpfiles
@@ -0,0 +1,6 @@
+z /usr/lib/telnetlogin -    root _telnetd
+z /usr/lib/telnetlogin 4754 -    -
+
+# 2018-08-26 grawity: Two steps are needed to make setuid-chmod happen *after* chown,
+#                     otherwise systemd-tmpfiles changes the mode first, owner later
+#                     (and the kernel neutralizes the setuid bit).