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

[Andreas Radke]

    Date: Wednesday, November 12, 2014 @ 20:47:18
  Author: andyrtr
Revision: 226137

upgpkg: cups 2.0.0-3

comment out PageLogFormat and add comment about logrotate directive; FS#42670

Modified:
  cups/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-12 19:23:03 UTC (rev 226136)
+++ PKGBUILD	2014-11-12 19:47:18 UTC (rev 226137)
@@ -4,7 +4,7 @@
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=2.0.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -55,7 +55,7 @@
 
   # bug fixes 
   
-    # https://www.cups.org/str.php?L4497 + https://www.cups.org/str.php?L4491
+  # https://www.cups.org/str.php?L4497 + https://www.cups.org/str.php?L4491
   # "Port 631" binds to localhost only (systemd regression)
   patch -Np0 -i ${srcdir}/str4497.patch
 
@@ -69,7 +69,9 @@
   
   
   # set MaxLogSize to 0 to prevent using cups internal log rotation
-  sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in
+  sed -i -e '5i\ ' conf/cupsd.conf.in
+  sed -i -e '6i# Disable cups internal logging - use logrotate instead' conf/cupsd.conf.in
+  sed -i -e '7iMaxLogSize 0' conf/cupsd.conf.in
   
   # Rebuild configure script for not zipping man-pages.
   aclocal -I config-scripts
@@ -184,6 +186,7 @@
   # comment out all conversion rules which use any of the removed filters
   perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' $pkgdir/usr/share/cups/mime/mime.convs
 
-  # Provide native service for arch-daemons generator
-#  ln -s org.cups.cupsd.service "$pkgdir/usr/lib/systemd/system/cupsd.service" # still required?
+  
+  # comment out unnecessary PageLogFormat entry
+  sed -i -e 's:PageLogFormat:#PageLogFormat:' $pkgdir/etc/cups/cupsd.conf*
 }