ports/opt (3.1): [notify] cups-filters: update to 1.0.66
commit 98e1a057c86c110fb912b6f365514a3a2142e1c0 Author: Juergen Daubert <jue@jue.li> Date: Sat Feb 28 12:29:14 2015 +0100 [notify] cups-filters: update to 1.0.66 - security fix, see https://bugs.linuxfoundation.org/show_bug.cgi?id=1265 - new rc script diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index 5edaef2..ae2b56f 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -1,3 +1,2 @@ -f182d7717ed0a939a4f50e572939afdd cups-browsed -20dea125408bfebd25a58a884a78a13c cups-filters-1.0.65.tar.xz -9bda1352feb57b1107be202f803d186b cups-filters-poppler_0.31.patch +6ac0b4af2a1c70293588faf12a11b652 cups-browsed +ad594ac06dfbfb02af34deb0805cab00 cups-filters-1.0.66.tar.xz diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index 1e5a5cf..4b55d7d 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -4,16 +4,14 @@ # Depends on: cups ghostscript poppler qpdf name=cups-filters -version=1.0.65 -release=2 +version=1.0.66 +release=1 source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz - cups-browsed cups-filters-poppler_0.31.patch) + cups-browsed) build () { cd $name-$version - patch -p0 -i $SRC/$name-poppler_0.31.patch - ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/man \ diff --git a/cups-filters/cups-browsed b/cups-filters/cups-browsed index d18935e..22cd950 100755 --- a/cups-filters/cups-browsed +++ b/cups-filters/cups-browsed @@ -3,20 +3,32 @@ # /etc/rc.d/cups-browsed: start/stop CUPS browsing daemon # +SSD=/sbin/start-stop-daemon +PROG=/usr/sbin/cups-browsed +PID=/var/run/cups-browsed.pid + case $1 in start) - setsid /usr/sbin/cups-browsed & + $SSD --start -bm --pidfile $PID --exec $PROG ;; stop) - killall -q /usr/sbin/cups-browsed + $SSD --stop --remove-pidfile --retry 10 --pidfile $PID ;; restart) $0 stop - sleep 2 $0 start ;; +status) + $SSD --status --pidfile $PID + case $? in + 0) echo "$PROG is running" ;; + 1) echo "$PROG is not running but the pid file $PID exists" ;; + 3) echo "$PROG is not running" ;; + 4) echo "Unable to determine the program status" ;; + esac + ;; *) - echo "usage: $0 [start|stop]" + echo "usage: $0 [start|stop|restart|status]" ;; esac diff --git a/cups-filters/cups-filters-poppler_0.31.patch b/cups-filters/cups-filters-poppler_0.31.patch deleted file mode 100644 index b582825..0000000 --- a/cups-filters/cups-filters-poppler_0.31.patch +++ /dev/null @@ -1,84 +0,0 @@ -# https://bugs.linuxfoundation.org/show_bug.cgi?id=1254 -# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision... - -=== modified file 'NEWS' ---- NEWS 2015-02-14 00:35:53 +0000 -+++ NEWS 2015-02-18 03:17:28 +0000 -@@ -1,6 +1,12 @@ - NEWS - OpenPrinting CUPS Filters v1.0.65 - 2015-02-13 - ----------------------------------------------------- - -+CHANGES IN V1.0.66 -+ -+ - pdftoopvp: Added conditionals to also build with Poppler 0.31.0 -+ and newer. Thanks to Armin K. (krejzi at email dot com) for the -+ patch (Bug #1254). -+ - CHANGES IN V1.0.65 - - - cups-browsed: Listen for NetworkManager changes (Red Hat bug #975933). - -=== modified file 'filter/pdftoijs.cxx' ---- filter/pdftoijs.cxx 2013-08-02 13:52:04 +0000 -+++ filter/pdftoijs.cxx 2015-02-18 03:17:28 +0000 -@@ -436,7 +436,11 @@ - } - - out = new SplashOutputDev(cmode,rowpad/* row padding */, -- reverseVideo,paperColor,gTrue,gFalse); -+ reverseVideo,paperColor,gTrue -+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30 -+ ,gFalse -+#endif -+ ); - #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 - out->startDoc(doc); - #else - -=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx' ---- filter/pdftoopvp/OPVPOutputDev.cxx 2014-03-10 11:24:29 +0000 -+++ filter/pdftoopvp/OPVPOutputDev.cxx 2015-02-18 03:17:28 +0000 -@@ -278,7 +278,11 @@ - gFalse, - gFalse, - #endif -+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30 - globalParams->getAntialias()); -+#else -+ gFalse); -+#endif - for (i = 0; i < nT3Fonts; ++i) { - delete t3FontCache[i]; - } - -=== modified file 'filter/pdftoopvp/pdftoopvp.cxx' ---- filter/pdftoopvp/pdftoopvp.cxx 2013-08-02 14:46:20 +0000 -+++ filter/pdftoopvp/pdftoopvp.cxx 2015-02-18 03:17:28 +0000 -@@ -614,7 +614,9 @@ - ok = gFalse; - } - } -+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30 - globalParams->setAntialias("no"); -+#endif - if (quiet) { - globalParams->setErrQuiet(quiet); - } - -=== modified file 'filter/pdftoraster.cxx' ---- filter/pdftoraster.cxx 2014-09-26 18:46:49 +0000 -+++ filter/pdftoraster.cxx 2015-02-18 03:17:28 +0000 -@@ -2100,7 +2100,11 @@ - } - - out = new SplashOutputDev(cmode,rowpad/* row padding */, -- gFalse,paperColor,gTrue,gFalse); -+ gFalse,paperColor,gTrue -+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30 -+ ,gFalse -+#endif -+ ); - #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 - out->startDoc(doc); - #else -
participants (1)
-
crux@crux.nu