[arch-commits] Commit in tor/trunk (PKGBUILD tor.install tor.sysusers tor.tmpfiles)

[Eli Schwartz]

    Date: Tuesday, January 16, 2018 @ 04:59:36
  Author: eschwartz
Revision: 282928

upgpkg: tor 0.3.1.9-2

migrate to systemd-sysusers/systemd-tmpfiles

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

--------------+
 PKGBUILD     |   15 +++++++++------
 tor.install  |    4 ----
 tor.sysusers |    1 +
 tor.tmpfiles |    1 +
 4 files changed, 11 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-16 04:58:33 UTC (rev 282927)
+++ PKGBUILD	2018-01-16 04:59:36 UTC (rev 282928)
@@ -5,7 +5,7 @@
 
 pkgname=tor
 pkgver=0.3.1.9
-pkgrel=1
+pkgrel=2
 pkgdesc='Anonymizing overlay network.'
 arch=('x86_64')
 url='https://www.torproject.org/'
@@ -15,14 +15,17 @@
 makedepends=('ca-certificates')
 backup=('etc/tor/torrc'
         'etc/tor/torrc-dist')
-install='tor.install'
 source=("https://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc}
         'torrc'
-        'tor.service')
+        'tor.service'
+        'tor.sysusers'
+        'tor.tmpfiles')
 md5sums=('585e62d086ae7df7cd873f735d726118'
          'SKIP'
          'c1dd4004c63edaeaa829e01be5413cfc'
-         '503cedd9679f9817b2c27916ba989a74')
+         '503cedd9679f9817b2c27916ba989a74'
+         '5de6b0aff2a152a03d8eb7a473edc5ff'
+         '30e307d882c818cb44bcb2d6b81789a3')
 validpgpkeys=('2133BC600AB133E1D826D173FE43009C4607B1FB') # Nick Mathewson
 
 build() {
@@ -37,11 +40,11 @@
 
   make DESTDIR="${pkgdir}" install
 
-  install -dm0700 -o 43 -g 43 "${pkgdir}/var/lib/tor"
-
   mv "${pkgdir}/etc/tor/torrc.sample" "${pkgdir}/etc/tor/torrc-dist"
   install -Dm0644 "${srcdir}/torrc" "${pkgdir}/etc/tor/torrc"
   install -Dm0644 "${srcdir}/tor.service" "${pkgdir}/usr/lib/systemd/system/tor.service"
+  install -Dm0644 "${srcdir}/tor.sysusers" "${pkgdir}/usr/lib/sysusers.d/tor.conf"
+  install -Dm0644 "${srcdir}/tor.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/tor.conf"
 
   install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: tor.install
===================================================================
--- tor.install	2018-01-16 04:58:33 UTC (rev 282927)
+++ tor.install	2018-01-16 04:59:36 UTC (rev 282928)
@@ -1,4 +0,0 @@
-post_install() {
-  groupadd -g 43 tor &>/dev/null
-  useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor &> /dev/null
-}

Added: tor.sysusers
===================================================================
--- tor.sysusers	                        (rev 0)
+++ tor.sysusers	2018-01-16 04:59:36 UTC (rev 282928)
@@ -0,0 +1 @@
+u tor 43 - /var/lib/tor

Added: tor.tmpfiles
===================================================================
--- tor.tmpfiles	                        (rev 0)
+++ tor.tmpfiles	2018-01-16 04:59:36 UTC (rev 282928)
@@ -0,0 +1 @@
+d /var/lib/tor 0700 tor tor - -