From be818af1515172a95971cc8afa68327264837aae Mon Sep 17 00:00:00 2001 From: Juergen Daubert Date: Mon, 20 Oct 2014 18:20:21 +0200 Subject: [PATCH] cups: update to 2.0.0 --- cups/.footprint | 41 +++++++++++++++++++---------------------- cups/.md5sum | 2 +- cups/Pkgfile | 8 ++++---- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/cups/.footprint b/cups/.footprint index 7f22c7b5c..da44b9886 100644 --- a/cups/.footprint +++ b/cups/.footprint @@ -25,7 +25,6 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/ipptool -rwxr-xr-x root/root usr/bin/lp -rwxr-xr-x root/root usr/bin/lpoptions --rwxr-xr-x root/root usr/bin/lppasswd -rwxr-xr-x root/root usr/bin/lpq -rwxr-xr-x root/root usr/bin/lpr -rwxr-xr-x root/root usr/bin/lprm @@ -60,9 +59,7 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/cups/ drwxr-xr-x root/root usr/lib/cups/backend/ lrwxrwxrwx root/root usr/lib/cups/backend/http -> ipp -lrwxrwxrwx root/root usr/lib/cups/backend/https -> ipp -rwx------ root/root usr/lib/cups/backend/ipp -lrwxrwxrwx root/root usr/lib/cups/backend/ipps -> ipp -rwx------ root/root usr/lib/cups/backend/lpd -rwxr-xr-x root/root usr/lib/cups/backend/snmp -rwxr-xr-x root/root usr/lib/cups/backend/socket @@ -108,12 +105,12 @@ drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/cancel.1.gz -rw-r--r-- root/root usr/man/man1/cups-config.1.gz +-rw-r--r-- root/root usr/man/man1/cups.1.gz -rw-r--r-- root/root usr/man/man1/cupstestdsc.1.gz -rw-r--r-- root/root usr/man/man1/cupstestppd.1.gz -rw-r--r-- root/root usr/man/man1/ipptool.1.gz -rw-r--r-- root/root usr/man/man1/lp.1.gz -rw-r--r-- root/root usr/man/man1/lpoptions.1.gz --rw-r--r-- root/root usr/man/man1/lppasswd.1.gz -rw-r--r-- root/root usr/man/man1/lpq.1.gz -rw-r--r-- root/root usr/man/man1/lpr.1.gz -rw-r--r-- root/root usr/man/man1/lprm.1.gz @@ -142,13 +139,16 @@ drwxr-xr-x root/root usr/man/man7/ -rw-r--r-- root/root usr/man/man7/notifier.7.gz drwxr-xr-x root/root usr/man/man8/ lrwxrwxrwx root/root usr/man/man8/accept.8.gz -> cupsaccept.8.gz --rw-r--r-- root/root usr/man/man8/cups-deviced.8.gz --rw-r--r-- root/root usr/man/man8/cups-driverd.8.gz +lrwxrwxrwx root/root usr/man/man8/cups-deviced.8.gz -> cupsd-helper.8.gz +lrwxrwxrwx root/root usr/man/man8/cups-driverd.8.gz -> cupsd-helper.8.gz +lrwxrwxrwx root/root usr/man/man8/cups-exec.8.gz -> cupsd-helper.8.gz -rw-r--r-- root/root usr/man/man8/cups-lpd.8.gz -rw-r--r-- root/root usr/man/man8/cups-snmp.8.gz -rw-r--r-- root/root usr/man/man8/cupsaccept.8.gz -rw-r--r-- root/root usr/man/man8/cupsaddsmb.8.gz -rw-r--r-- root/root usr/man/man8/cupsctl.8.gz +-rw-r--r-- root/root usr/man/man8/cupsd-helper.8.gz +-rw-r--r-- root/root usr/man/man8/cupsd-logs.8.gz -rw-r--r-- root/root usr/man/man8/cupsd.8.gz lrwxrwxrwx root/root usr/man/man8/cupsdisable.8.gz -> cupsenable.8.gz -rw-r--r-- root/root usr/man/man8/cupsenable.8.gz @@ -177,6 +177,7 @@ lrwxrwxrwx root/root usr/sbin/reject -> cupsaccept drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/cups/ drwxr-xr-x root/root usr/share/cups/doc/ +-rw-r--r-- root/root usr/share/cups/doc/apple-touch-icon.png -rw-r--r-- root/root usr/share/cups/doc/cups-printable.css -rw-r--r-- root/root usr/share/cups/doc/cups.css drwxr-xr-x root/root usr/share/cups/doc/help/ @@ -199,11 +200,18 @@ drwxr-xr-x root/root usr/share/cups/doc/help/ -rw-r--r-- root/root usr/share/cups/doc/help/license.html -rw-r--r-- root/root usr/share/cups/doc/help/man-backend.html -rw-r--r-- root/root usr/share/cups/doc/help/man-cancel.html +-rw-r--r-- root/root usr/share/cups/doc/help/man-classes.conf.html +-rw-r--r-- root/root usr/share/cups/doc/help/man-client.conf.html -rw-r--r-- root/root usr/share/cups/doc/help/man-cups-config.html +-rw-r--r-- root/root usr/share/cups/doc/help/man-cups-files.conf.html -rw-r--r-- root/root usr/share/cups/doc/help/man-cups-lpd.html -rw-r--r-- root/root usr/share/cups/doc/help/man-cups-snmp.html +-rw-r--r-- root/root usr/share/cups/doc/help/man-cups.html -rw-r--r-- root/root usr/share/cups/doc/help/man-cupsaccept.html -rw-r--r-- root/root usr/share/cups/doc/help/man-cupsaddsmb.html +-rw-r--r-- root/root usr/share/cups/doc/help/man-cupsd-helper.html +-rw-r--r-- root/root usr/share/cups/doc/help/man-cupsd-logs.html +-rw-r--r-- root/root usr/share/cups/doc/help/man-cupsd.conf.html -rw-r--r-- root/root usr/share/cups/doc/help/man-cupsd.html -rw-r--r-- root/root usr/share/cups/doc/help/man-cupsenable.html -rw-r--r-- root/root usr/share/cups/doc/help/man-cupstestdsc.html @@ -217,7 +225,6 @@ drwxr-xr-x root/root usr/share/cups/doc/help/ -rw-r--r-- root/root usr/share/cups/doc/help/man-lpinfo.html -rw-r--r-- root/root usr/share/cups/doc/help/man-lpmove.html -rw-r--r-- root/root usr/share/cups/doc/help/man-lpoptions.html --rw-r--r-- root/root usr/share/cups/doc/help/man-lppasswd.html -rw-r--r-- root/root usr/share/cups/doc/help/man-lpq.html -rw-r--r-- root/root usr/share/cups/doc/help/man-lpr.html -rw-r--r-- root/root usr/share/cups/doc/help/man-lprm.html @@ -230,6 +237,8 @@ drwxr-xr-x root/root usr/share/cups/doc/help/ -rw-r--r-- root/root usr/share/cups/doc/help/man-ppdi.html -rw-r--r-- root/root usr/share/cups/doc/help/man-ppdmerge.html -rw-r--r-- root/root usr/share/cups/doc/help/man-ppdpo.html +-rw-r--r-- root/root usr/share/cups/doc/help/man-printers.conf.html +-rw-r--r-- root/root usr/share/cups/doc/help/man-subscriptions.conf.html -rw-r--r-- root/root usr/share/cups/doc/help/network.html -rw-r--r-- root/root usr/share/cups/doc/help/options.html -rw-r--r-- root/root usr/share/cups/doc/help/overview.html @@ -237,18 +246,7 @@ drwxr-xr-x root/root usr/share/cups/doc/help/ -rw-r--r-- root/root usr/share/cups/doc/help/postscript-driver.html -rw-r--r-- root/root usr/share/cups/doc/help/ppd-compiler.html -rw-r--r-- root/root usr/share/cups/doc/help/raster-driver.html --rw-r--r-- root/root usr/share/cups/doc/help/ref-access_log.html --rw-r--r-- root/root usr/share/cups/doc/help/ref-classes-conf.html --rw-r--r-- root/root usr/share/cups/doc/help/ref-client-conf.html --rw-r--r-- root/root usr/share/cups/doc/help/ref-cups-files-conf.html --rw-r--r-- root/root usr/share/cups/doc/help/ref-cupsd-conf.html --rw-r--r-- root/root usr/share/cups/doc/help/ref-error_log.html --rw-r--r-- root/root usr/share/cups/doc/help/ref-mailto-conf.html --rw-r--r-- root/root usr/share/cups/doc/help/ref-page_log.html -rw-r--r-- root/root usr/share/cups/doc/help/ref-ppdcfile.html --rw-r--r-- root/root usr/share/cups/doc/help/ref-printers-conf.html --rw-r--r-- root/root usr/share/cups/doc/help/ref-snmp-conf.html --rw-r--r-- root/root usr/share/cups/doc/help/ref-subscriptions-conf.html -rw-r--r-- root/root usr/share/cups/doc/help/security.html -rw-r--r-- root/root usr/share/cups/doc/help/sharing.html -rw-r--r-- root/root usr/share/cups/doc/help/spec-banner.html @@ -262,7 +260,6 @@ drwxr-xr-x root/root usr/share/cups/doc/help/ -rw-r--r-- root/root usr/share/cups/doc/help/spec-raster.html -rw-r--r-- root/root usr/share/cups/doc/help/spec-stp.html -rw-r--r-- root/root usr/share/cups/doc/help/translation.html --rw-r--r-- root/root usr/share/cups/doc/help/whatsnew.html drwxr-xr-x root/root usr/share/cups/doc/images/ -rw-r--r-- root/root usr/share/cups/doc/images/color-wheel.png -rw-r--r-- root/root usr/share/cups/doc/images/cups-block-diagram.png @@ -364,7 +361,7 @@ drwxr-xr-x root/root usr/share/cups/templates/ -rw-r--r-- root/root usr/share/cups/templates/header.tmpl -rw-r--r-- root/root usr/share/cups/templates/help-header.tmpl -rw-r--r-- root/root usr/share/cups/templates/help-printable.tmpl --rw-r--r-- root/root usr/share/cups/templates/help-trailer.tmpl +-rw-r--r-- root/root usr/share/cups/templates/help-trailer.tmpl (EMPTY) -rw-r--r-- root/root usr/share/cups/templates/job-cancel.tmpl -rw-r--r-- root/root usr/share/cups/templates/job-hold.tmpl -rw-r--r-- root/root usr/share/cups/templates/job-move.tmpl @@ -386,13 +383,13 @@ drwxr-xr-x root/root usr/share/cups/templates/ -rw-r--r-- root/root usr/share/cups/templates/pager.tmpl -rw-r--r-- root/root usr/share/cups/templates/printer-accept.tmpl -rw-r--r-- root/root usr/share/cups/templates/printer-added.tmpl +-rw-r--r-- root/root usr/share/cups/templates/printer-cancel-jobs.tmpl -rw-r--r-- root/root usr/share/cups/templates/printer-configured.tmpl -rw-r--r-- root/root usr/share/cups/templates/printer-confirm.tmpl -rw-r--r-- root/root usr/share/cups/templates/printer-default.tmpl -rw-r--r-- root/root usr/share/cups/templates/printer-deleted.tmpl -rw-r--r-- root/root usr/share/cups/templates/printer-jobs-header.tmpl -rw-r--r-- root/root usr/share/cups/templates/printer-modified.tmpl --rw-r--r-- root/root usr/share/cups/templates/printer-purge.tmpl -rw-r--r-- root/root usr/share/cups/templates/printer-reject.tmpl -rw-r--r-- root/root usr/share/cups/templates/printer-start.tmpl -rw-r--r-- root/root usr/share/cups/templates/printer-stop.tmpl @@ -414,7 +411,7 @@ drwxr-xr-x root/root usr/share/cups/usb/ -rw-r--r-- root/root usr/share/cups/usb/org.cups.usb-quirks drwxr-xr-x root/root var/ drwxr-xr-x root/root var/cache/ -drwxrwxr-x root/lp var/cache/cups/ +drwxrwx--- root/lp var/cache/cups/ drwxrwxr-x root/lp var/cache/cups/rss/ drwxr-xr-x root/root var/log/ drwxr-xr-x root/root var/log/cups/ diff --git a/cups/.md5sum b/cups/.md5sum index 082990e85..246608449 100644 --- a/cups/.md5sum +++ b/cups/.md5sum @@ -1,3 +1,3 @@ 01b6a755c5b0fb7df2d2c94571f67e1d cups -5d893edc2957005f78e2b2423fdace2e cups-1.7.5-source.tar.bz2 +2cdd81fea23e9e29555c24bdfd0d7c89 cups-2.0.0-source.tar.bz2 fd78a2c51a2e206ea85d21d2dc9dde69 cups-config.patch diff --git a/cups/Pkgfile b/cups/Pkgfile index b8cb0ece6..acd1ead78 100644 --- a/cups/Pkgfile +++ b/cups/Pkgfile @@ -4,7 +4,7 @@ # Depends on: acl tcp_wrappers libusb openssl zlib name=cups -version=1.7.5 +version=2.0.0 release=1 source=(http://www.cups.org/software/$version/$name-$version-source.tar.bz2 cups-config.patch cups) @@ -25,9 +25,9 @@ build () { --with-cups-group=lp \ --with-languages="" \ --without-{java,perl,php,python} \ - --without-{menu,rc}dir \ + --without-rcdir \ --with-optim="$CFLAGS" \ - --enable-{ssl,openssl} --disable-gnutls \ + --enable-ssl --disable-gnutls \ --enable-tcp-wrappers \ --enable-acl \ --disable-pam \ @@ -40,7 +40,7 @@ build () { rm -r $PKG/usr/share/cups/{banners,data} # cleanup - rm -rf $PKG/usr/share/icons + rm -rf $PKG/usr/share/{applications,icons} chmod 0755 $PKG/var/{cache,spool} chmod -R +w $PKG