commit 678f56ae33691f935d052011e59cb4862bc73313 Author: Juergen Daubert <jue@jue.li> Date: Sat Oct 27 16:09:30 2012 +0200 [notify] cups: update to 1.6.1 As of version 1.6 cups no longer includes the various helper programs to convert from and to ps, pdf etc. like pstopdf; they are no available in a separate port opt/cups-filters. diff --git a/cups/.footprint b/cups/.footprint index 06e1060..1b44dbb 100644 --- a/cups/.footprint +++ b/cups/.footprint @@ -42,11 +42,9 @@ drwxr-xr-x root/root usr/include/cups/ -rw-r--r-- root/root usr/include/cups/cgi.h -rw-r--r-- root/root usr/include/cups/cups.h -rw-r--r-- root/root usr/include/cups/dir.h --rw-r--r-- root/root usr/include/cups/driver.h -rw-r--r-- root/root usr/include/cups/file.h -rw-r--r-- root/root usr/include/cups/help-index.h -rw-r--r-- root/root usr/include/cups/http.h --rw-r--r-- root/root usr/include/cups/image.h -rw-r--r-- root/root usr/include/cups/ipp.h -rw-r--r-- root/root usr/include/cups/language.h -rw-r--r-- root/root usr/include/cups/mime.h @@ -64,8 +62,6 @@ 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/parallel --rwxr-xr-x root/root usr/lib/cups/backend/serial -rwxr-xr-x root/root usr/lib/cups/backend/snmp -rwxr-xr-x root/root usr/lib/cups/backend/socket -rwxr-xr-x root/root usr/lib/cups/backend/usb @@ -80,26 +76,16 @@ drwxr-xr-x root/root usr/lib/cups/daemon/ -rwxr-xr-x root/root usr/lib/cups/daemon/cups-driverd -rwxr-xr-x root/root usr/lib/cups/daemon/cups-exec -rwxr-xr-x root/root usr/lib/cups/daemon/cups-lpd --rwxr-xr-x root/root usr/lib/cups/daemon/cups-polld drwxr-xr-x root/root usr/lib/cups/driver/ drwxr-xr-x root/root usr/lib/cups/filter/ --rwxr-xr-x root/root usr/lib/cups/filter/bannertops --rwxr-xr-x root/root usr/lib/cups/filter/commandtoescpx --rwxr-xr-x root/root usr/lib/cups/filter/commandtopclx -rwxr-xr-x root/root usr/lib/cups/filter/commandtops -rwxr-xr-x root/root usr/lib/cups/filter/gziptoany --rwxr-xr-x root/root usr/lib/cups/filter/imagetops --rwxr-xr-x root/root usr/lib/cups/filter/imagetoraster --rwxr-xr-x root/root usr/lib/cups/filter/pdftops -rwxr-xr-x root/root usr/lib/cups/filter/pstops lrwxrwxrwx root/root usr/lib/cups/filter/rastertodymo -> rastertolabel -rwxr-xr-x root/root usr/lib/cups/filter/rastertoepson --rwxr-xr-x root/root usr/lib/cups/filter/rastertoescpx -rwxr-xr-x root/root usr/lib/cups/filter/rastertohp -rwxr-xr-x root/root usr/lib/cups/filter/rastertolabel --rwxr-xr-x root/root usr/lib/cups/filter/rastertopclx -rwxr-xr-x root/root usr/lib/cups/filter/rastertopwg --rwxr-xr-x root/root usr/lib/cups/filter/texttops drwxr-xr-x root/root usr/lib/cups/monitor/ -rwxr-xr-x root/root usr/lib/cups/monitor/bcp -rwxr-xr-x root/root usr/lib/cups/monitor/tbcp @@ -110,8 +96,6 @@ lrwxrwxrwx root/root usr/lib/libcups.so -> libcups.so.2 -rwxr-xr-x root/root usr/lib/libcups.so.2 lrwxrwxrwx root/root usr/lib/libcupscgi.so -> libcupscgi.so.1 -rwxr-xr-x root/root usr/lib/libcupscgi.so.1 -lrwxrwxrwx root/root usr/lib/libcupsdriver.so -> libcupsdriver.so.1 --rwxr-xr-x root/root usr/lib/libcupsdriver.so.1 lrwxrwxrwx root/root usr/lib/libcupsimage.so -> libcupsimage.so.2 -rwxr-xr-x root/root usr/lib/libcupsimage.so.2 lrwxrwxrwx root/root usr/lib/libcupsmime.so -> libcupsmime.so.1 @@ -158,7 +142,7 @@ 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 -rw-r--r-- root/root usr/man/man8/cups-lpd.8.gz --rw-r--r-- root/root usr/man/man8/cups-polld.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 @@ -189,18 +173,6 @@ lrwxrwxrwx root/root usr/sbin/cupsreject -> cupsaccept 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/banners/ --rw-r--r-- root/root usr/share/cups/banners/classified --rw-r--r-- root/root usr/share/cups/banners/confidential --rw-r--r-- root/root usr/share/cups/banners/secret --rw-r--r-- root/root usr/share/cups/banners/standard --rw-r--r-- root/root usr/share/cups/banners/topsecret --rw-r--r-- root/root usr/share/cups/banners/unclassified -drwxr-xr-x root/root usr/share/cups/charsets/ --rw-r--r-- root/root usr/share/cups/charsets/utf-8 -drwxr-xr-x root/root usr/share/cups/data/ --rw-r--r-- root/root usr/share/cups/data/psglyphs --rw-r--r-- root/root usr/share/cups/data/testprint drwxr-xr-x root/root usr/share/cups/doc/ -rw-r--r-- root/root usr/share/cups/doc/cups-printable.css -rw-r--r-- root/root usr/share/cups/doc/cups.css @@ -226,7 +198,7 @@ drwxr-xr-x root/root usr/share/cups/doc/help/ -rw-r--r-- root/root usr/share/cups/doc/help/man-cancel.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-lpd.html --rw-r--r-- root/root usr/share/cups/doc/help/man-cups-polld.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-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.html @@ -323,11 +295,6 @@ drwxr-xr-x root/root usr/share/cups/examples/ -rw-r--r-- root/root usr/share/cups/examples/r300-basic.drv -rw-r--r-- root/root usr/share/cups/examples/r300-colorman.drv -rw-r--r-- root/root usr/share/cups/examples/r300-remote.drv -drwxr-xr-x root/root usr/share/cups/fonts/ --rw-r--r-- root/root usr/share/cups/fonts/Monospace --rw-r--r-- root/root usr/share/cups/fonts/Monospace-Bold --rw-r--r-- root/root usr/share/cups/fonts/Monospace-BoldOblique --rw-r--r-- root/root usr/share/cups/fonts/Monospace-Oblique drwxr-xr-x root/root usr/share/cups/ipptool/ -rw-r--r-- root/root usr/share/cups/ipptool/color.jpg -rw-r--r-- root/root usr/share/cups/ipptool/create-printer-subscription.test @@ -348,6 +315,7 @@ drwxr-xr-x root/root usr/share/cups/ipptool/ -rw-r--r-- root/root usr/share/cups/ipptool/onepage-letter.pdf -rw-r--r-- root/root usr/share/cups/ipptool/onepage-letter.ps -rw-r--r-- root/root usr/share/cups/ipptool/testfile.jpg +-rw-r--r-- root/root usr/share/cups/ipptool/testfile.pcl -rw-r--r-- root/root usr/share/cups/ipptool/testfile.pdf -rw-r--r-- root/root usr/share/cups/ipptool/testfile.ps -rw-r--r-- root/root usr/share/cups/ipptool/testfile.txt @@ -357,12 +325,10 @@ drwxr-xr-x root/root usr/share/cups/mime/ drwxr-xr-x root/root usr/share/cups/model/ drwxr-xr-x root/root usr/share/cups/ppdc/ -rw-r--r-- root/root usr/share/cups/ppdc/epson.h --rw-r--r-- root/root usr/share/cups/ppdc/escp.h -rw-r--r-- root/root usr/share/cups/ppdc/font.defs -rw-r--r-- root/root usr/share/cups/ppdc/hp.h -rw-r--r-- root/root usr/share/cups/ppdc/label.h -rw-r--r-- root/root usr/share/cups/ppdc/media.defs --rw-r--r-- root/root usr/share/cups/ppdc/pcl.h -rw-r--r-- root/root usr/share/cups/ppdc/raster.defs drwxr-xr-x root/root usr/share/cups/profiles/ drwxr-xr-x root/root usr/share/cups/templates/ diff --git a/cups/.md5sum b/cups/.md5sum index 8e0aa9f..27636c5 100644 --- a/cups/.md5sum +++ b/cups/.md5sum @@ -1,3 +1,3 @@ 01b6a755c5b0fb7df2d2c94571f67e1d cups -de3006e5cf1ee78a9c6145ce62c4e982 cups-1.5.4-source.tar.bz2 +87ade07e3d1efd03c9c3add949cf9c00 cups-1.6.1-source.tar.bz2 2220f411940c4f7504ed4457c6304d4a cups-config.patch diff --git a/cups/Pkgfile b/cups/Pkgfile index 921784d..888309a 100644 --- a/cups/Pkgfile +++ b/cups/Pkgfile @@ -1,10 +1,10 @@ # Description: CUPS - Common UNIX Printing System # URL: http://www.cups.org # Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: acl tcp_wrappers libusb libpng libtiff openssl poppler +# Depends on: acl tcp_wrappers libusb openssl name=cups -version=1.5.4 +version=1.6.1 release=1 source=(http://ftp.easysw.com/pub/cups/$version/$name-$version-source.tar.bz2 cups-config.patch cups) @@ -27,7 +27,6 @@ build () { --without-{java,perl,php,python} \ --without-rcdir \ --with-optim="$CFLAGS" \ - --with-pdftops=pdftops \ --enable-{ssl,openssl} --disable-gnutls \ --enable-tcp-wrappers \ --enable-acl \ @@ -35,16 +34,23 @@ build () { --disable-dbus make - make {MENU,ICON}DIR="" BUILDROOT=$PKG install + make BUILDROOT=$PKG install + # conflict with cups-filters + rm -r $PKG/usr/share/cups/{banners,data} + + # cleanup + rm -r $PKG/usr/share/{applications,icons} chmod 0755 $PKG/var/{cache,spool} chmod -R +w $PKG - + + # ssl files install -d $PKG/etc/ssl/{certs,keys} touch $PKG/etc/ssl/certs/cups.crt touch $PKG/etc/ssl/keys/cups.key chmod 0600 $PKG/etc/ssl/{keys/cups.key,certs/cups.crt} + # start script install -D -m 755 $SRC/cups $PKG/etc/rc.d/cups # blacklist usblp kernel module diff --git a/cups/README b/cups/README index 45fb657..64e0782 100644 --- a/cups/README +++ b/cups/README @@ -1,4 +1,4 @@ -README for cups 1.5.x +README for cups 1.6.x REQUIREMENTS @@ -10,8 +10,9 @@ REQUIREMENTS users should install the hpijs driver. 3. Build and install in the following order: - cups - - gutenprint (optionally) - ghostscript + - cups-filters + - gutenprint (optionally) - foomatic-filters (optionally) - hpijs (optionally)