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

[Andreas Radke]

    Date: Friday, January 19, 2018 @ 07:10:32
  Author: andyrtr
Revision: 315127

upgpkg: cups 2.2.6-3

use cups user/group - FS#36769 - enable new user/group in cups-files.conf - add update msg

Modified:
  cups/trunk/PKGBUILD
  cups/trunk/cups.install

--------------+
 PKGBUILD     |    9 +++++----
 cups.install |    8 +++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-19 04:30:48 UTC (rev 315126)
+++ PKGBUILD	2018-01-19 07:10:32 UTC (rev 315127)
@@ -4,7 +4,7 @@
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=2.2.6
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('GPL')
 url="https://www.cups.org/"
@@ -132,9 +132,10 @@
   chmod 755 ${pkgdir}/var/spool
   chmod 755 ${pkgdir}/etc
 
-   # use cups group FS#36769
-   install -Dm644 "$srcdir"/cups.sysusers "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf"
- 
+  # use cups group FS#36769
+  install -Dm644 "$srcdir"/cups.sysusers "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf"
+  sed -i "s:#User 209:User 209:" ${pkgdir}/etc/cups/cups-files.conf{,.default}
+  sed -i "s:#Group 209:Group 209:" ${pkgdir}/etc/cups/cups-files.conf{,.default}
 
   # install ssl directory where to store the certs, solves some samba issues
   install -dm700 -g 209 ${pkgdir}/etc/cups/ssl

Modified: cups.install
===================================================================
--- cups.install	2018-01-19 04:30:48 UTC (rev 315126)
+++ cups.install	2018-01-19 07:10:32 UTC (rev 315127)
@@ -7,8 +7,14 @@
 
 post_upgrade() {
   # FS#56818 - make sure we change the ownership to the new cups group
-  if [[ $(vercmp 2.2.6-2 $2) = 1 ]]; then
+  if [[ $(vercmp 2.2.6-3 $2) = 1 ]]; then
     chgrp -R 209 /etc/cups
+    echo "Cups daemon is now running under \"cups\" user+group."
+    echo "Please make sure to enable the new user+group change in"
+    echo "/etc/cups/cups-files.conf or merge changes from"
+    echo "/etc/cups/cups-files.conf.default. After a service restart"
+    echo "make sure /etc/cups and all files within are owned by"
+    echo "cups group - run \"chgrp -R cups /etc/cups\"." 
   fi
 }