summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey D2014-11-13 09:43:24 +0300
committerAlexey D2015-06-11 10:07:11 +0300
commitba7001ee84f4aaa62f31a31996afd3bbb3417607 (patch)
tree15748b5f89463d89912b0b62d6ff407f1280d06b
parent5e8f5d82adbac4b8e6cb12288c59063ee390ba79 (diff)
downloadaur-ba7001ee84f4aaa62f31a31996afd3bbb3417607.tar.gz
version 2.0.0-2
-rw-r--r--.AURINFO2
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD73
3 files changed, 38 insertions, 39 deletions
diff --git a/.AURINFO b/.AURINFO
index e5badce9eff..7a1a3bfe352 100644
--- a/.AURINFO
+++ b/.AURINFO
@@ -1,7 +1,7 @@
pkgbase = cups-nosystemd
pkgdesc = The CUPS Printing System - daemon package
pkgver = 2.0.0
- pkgrel = 1
+ pkgrel = 2
url = http://www.cups.org/
install = cups-nosystemd.install
arch = i686
diff --git a/.SRCINFO b/.SRCINFO
index e5badce9eff..7a1a3bfe352 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = cups-nosystemd
pkgdesc = The CUPS Printing System - daemon package
pkgver = 2.0.0
- pkgrel = 1
+ pkgrel = 2
url = http://www.cups.org/
install = cups-nosystemd.install
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index f6f07ea0304..ed24174287c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname="cups-nosystemd"
pkgver=2.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="The CUPS Printing System - daemon package"
arch=('i686' 'x86_64')
license=('GPL')
@@ -58,32 +58,34 @@ prepare() {
# improve build and linking
# Do not export SSL libs in cups-config
- patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
+ patch -Np1 -i "$srcdir"/cups-no-export-ssllibs.patch
# https://www.cups.org/str.php?L4399
- patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
+ patch -Np1 -i "$srcdir"/cups-no-gcrypt.patch
# don't zip man pages in make install, let makepkg do that / Fedora
- patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
+ patch -Np1 -i "$srcdir"/cups-no-gzip-man.patch
# move /var/run -> /run for pid file
- patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
+ patch -Np1 -i "$srcdir"/cups-1.6.2-statedir.patch
# fix permissions on some files (by Gentoo)
- patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch
+ patch -Np0 -i "$srcdir"/cups-1.6.0-fix-install-perms.patch
# bugfixes
# https://bugs.archlinux.org/task/40937 - https://www.cups.org/str.php?L4495
# adds a warning to the config file and honors the FatalErrors directive
- patch -Np0 -i "${srcdir}/str4495.patch"
+ patch -Np0 -i "$srcdir"/str4495.patch
# https://www.cups.org/str.php?L4500
# /etc/cups/ppd/*.ppd not world-readable, cupsGetPPD() returns symlink
- patch -Np1 -i "${srcdir}/str4500.patch"
+ patch -Np1 -i "$srcdir"/str4500.patch
# 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
@@ -115,53 +117,50 @@ build() {
make
}
-#check() {
-# cd "$srcdir/cups-$pkgver"
-#
-# make -k check || /bin/true
-#}
-
package() {
- cd ${srcdir}/cups-${pkgver}
- make BUILDROOT=${pkgdir} install-data install-exec
+ cd "$srcdir"/cups-${pkgver}
+ make BUILDROOT="$pkgdir" install-data install-exec
# this one we ship in the libcups pkg
- rm -f ${pkgdir}/usr/bin/cups-config
+ rm -f "$pkgdir"/usr/bin/cups-config
# kill the sysv stuff
- rm -rf ${pkgdir}/etc/rc*.d
- rm -rf ${pkgdir}/etc/init.d
- install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
- install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
- install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
+ rm -rf "$pkgdir"/etc/rc*.d
+ rm -rf "$pkgdir"/etc/init.d
+ install -D -m755 ../cups "$pkgdir"/etc/rc.d/cupsd
+ install -D -m644 ../cups.logrotate "$pkgdir"/etc/logrotate.d/cups
+ install -D -m644 ../cups.pam "$pkgdir"/etc/pam.d/cups
# fix perms on /var/spool and /etc
- chmod 755 ${pkgdir}/var/spool
- chmod 755 ${pkgdir}/etc
+ chmod 755 "$pkgdir"/var/spool
+ chmod 755 "$pkgdir"/etc
# install ssl directory where to store the certs, solves some samba issues
- install -dm700 -g lp ${pkgdir}/etc/cups/ssl
+ install -dm700 -g lp "$pkgdir"/etc/cups/ssl
# remove directory from package, we create it in cups rc.d file
- rm -rf ${pkgdir}/run
+ rm -rf "$pkgdir"/run
# install some more configuration files that will get filled by cupsd
- touch ${pkgdir}/etc/cups/printers.conf
- touch ${pkgdir}/etc/cups/classes.conf
- touch ${pkgdir}/etc/cups/subscriptions.conf
- chgrp -R lp ${pkgdir}/etc/cups
+ touch "$pkgdir"/etc/cups/printers.conf
+ touch "$pkgdir"/etc/cups/classes.conf
+ touch "$pkgdir"/etc/cups/subscriptions.conf
+ chgrp -R lp "$pkgdir"/etc/cups
# fix .desktop file
- sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
+ sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' "$pkgdir"/usr/share/applications/cups.desktop
# compress some driver files, adopted from Fedora
- find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
+ find "$pkgdir"/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
# remove client.conf man page
- rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
+ rm -f "$pkgdir"/usr/share/man/man5/client.conf.5
# remove files now part of cups-filters
- rm -v ${pkgdir}/usr/share/cups/banners/*
- rm -v ${pkgdir}/usr/share/cups/data/testprint
+ rm -v "$pkgdir"/usr/share/cups/banners/*
+ rm -v "$pkgdir"/usr/share/cups/data/testprint
# 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"
+ perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' "$pkgdir"/usr/share/cups/mime/mime.convs
+
+ # comment out unnecessary PageLogFormat entry
+ sed -i -e 's:PageLogFormat:#PageLogFormat:' "$pkgdir"/etc/cups/cupsd.conf*
}