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

[Tobias Powalowski]

    Date: Wednesday, February 4, 2015 @ 10:14:21
  Author: tpowa
Revision: 230733

upgpkg: hylafax 6.0.6-6

remove user and group deletion and move chown to PKGBUILD

Modified:
  hylafax/trunk/PKGBUILD
  hylafax/trunk/hylafax.install

-----------------+
 PKGBUILD        |    9 +++++++--
 hylafax.install |   11 ++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-04 09:13:05 UTC (rev 230732)
+++ PKGBUILD	2015-02-04 09:14:21 UTC (rev 230733)
@@ -2,7 +2,7 @@
 # Maintainer: Paul Mattal <paul at archlinux.org>
 pkgname=hylafax
 pkgver=6.0.6
-pkgrel=5
+pkgrel=6
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64')
 install='hylafax.install'
@@ -46,7 +46,12 @@
   install -D -m644 ${srcdir}/hylafax.timer ${pkgdir}/usr/lib/systemd/system/hylafax.timer
   install -D -m644 ${srcdir}/hylafax.service ${pkgdir}/usr/lib/systemd/system/hylafax.service
   install -d -m755 ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants
-  ln -s ../shadow.timer ${pkgdir}//usr/lib/systemd/system/multi-user.target.wants/hylafax.timer
+  ln -s ../shadow.timer ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants/hylafax.timer
+  # fix permissions
+  chown 10:14 ${pkgdir}/var/spool/hylafax/{,archive,bin,client,config,dev,docq,doneq,etc}
+  chown 10:14 ${pkgdir}/var/spool/hylafax/{FIFO,info,log,pollq,recvq,sendq,status,tmp}
+  chown 10:14 ${pkgdir}/var/spool/hylafax/etc/{hosts.hfaxd,lutRS18.pcf,xferfaxlog}
+  chown 10:14 -R ${pkgdir}/var/spool/hylafax/etc/templates
 }
 md5sums=('d063d45049c8fcbabefe09d662313067'
          '9ef38446d2a2aeac698c4ae178fd5c2b'

Modified: hylafax.install
===================================================================
--- hylafax.install	2015-02-04 09:13:05 UTC (rev 230732)
+++ hylafax.install	2015-02-04 09:14:21 UTC (rev 230733)
@@ -26,17 +26,10 @@
   groupadd -g 14 uucp &>/dev/null
   useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null
   useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null
-  chown uucp /var/spool/hylafax/{,archive,bin,client,config,dev,docq,doneq,etc}
-  chown uucp /var/spool/hylafax/{FIFO,info,log,pollq,recvq,sendq,status,tmp}
-  chown uucp /var/spool/hylafax/etc/{hosts.hfaxd,lutRS18.pcf,xferfaxlog}
-  chown -R uucp /var/spool/hylafax/etc/templates
-  usermod -d '/' uucp &>/dev/null
-  usermod -d '/' fax &>/dev/null
+  usermod -d '/' -u 10 &>/dev/null
+  usermod -d '/' -u 69 &>/dev/null
 }
 
 pre_remove() {
-  userdel uucp &>/dev/null
-  groupdel uucp &>/dev/null
-  userdel fax &>/dev/null
   print_remove
 }