diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index da5a4efde..27f1f9a4a 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -7,7 +7,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/" @@ -58,7 +58,7 @@ prepare() { # 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 @@ -72,7 +72,9 @@ prepare() { # 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 @@ -187,6 +189,6 @@ optdepends=('xdg-utils: xdg .desktop file support') # 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* }