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

[Lukas Fleischer]

    Date: Tuesday, April 7, 2015 @ 07:22:49
  Author: lfleischer
Revision: 130857

upgpkg: tor 0.2.5.12-1

* Upstream update.
* Do not remove tor user when removing the package.

Modified:
  tor/trunk/PKGBUILD
  tor/trunk/tor.install

-------------+
 PKGBUILD    |    9 ++++-----
 tor.install |   13 -------------
 2 files changed, 4 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-07 01:14:43 UTC (rev 130856)
+++ PKGBUILD	2015-04-07 05:22:49 UTC (rev 130857)
@@ -5,7 +5,7 @@
 # Contributor: Sid Karunaratne
 
 pkgname=tor
-pkgver=0.2.5.11
+pkgver=0.2.5.12
 pkgrel=1
 pkgdesc='Anonymizing overlay network.'
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@
 source=("https://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc}
         'torrc'
         'tor.service')
-md5sums=('9ca64f76996cb8a750e50c792e2c4c52'
+md5sums=('89745069a7efb7aafd01ae263bd0fe5c'
          'SKIP'
          'c1dd4004c63edaeaa829e01be5413cfc'
          '503cedd9679f9817b2c27916ba989a74')
@@ -38,12 +38,11 @@
 
   make DESTDIR="${pkgdir}" install
 
-  install -dm0700 "${pkgdir}/var/lib/tor"
+  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 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  install -Dm0644 "${srcdir}/tor.service" "${pkgdir}/usr/lib/systemd/system/tor.service"
 }

Modified: tor.install
===================================================================
--- tor.install	2015-04-07 01:14:43 UTC (rev 130856)
+++ tor.install	2015-04-07 05:22:49 UTC (rev 130857)
@@ -1,17 +1,4 @@
 post_install() {
   groupadd -g 43 tor &>/dev/null
   useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor &> /dev/null
-  chown tor:tor var/lib/tor &> /dev/null
-  chmod 700 var/lib/tor &> /dev/null
 }
-
-post_upgrade() {
-  getent group tor &>/dev/null || groupadd -g 43 tor &>/dev/null
-  getent passwd tor &>/dev/null || useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor &> /dev/null
-  chown tor:tor var/lib/tor &> /dev/null
-}
-
-pre_remove() {
-  getent passwd tor &>/dev/null && userdel tor &> /dev/null
-  getent group tor &>/dev/null && groupdel tor &> /dev/null
-}