diff options
author | wiz <wiz> | 2015-02-17 13:53:48 +0000 |
---|---|---|
committer | wiz <wiz> | 2015-02-17 13:53:48 +0000 |
commit | bfc38bcbcaa0f2b32ca7c0dd7debc7dc7169ba49 (patch) | |
tree | c70787d97897fb8409206d9551fd77a18f798eae /print/cups | |
parent | eb268b5b8efd623efb576fb8de3fc87a0bf7128c (diff) | |
download | pkgsrc-bfc38bcbcaa0f2b32ca7c0dd7debc7dc7169ba49.tar.gz |
Update to 2.0.2:
CHANGES IN CUPS V2.0.2
- Security: cupsRasterReadPixels buffer overflow with invalid page
header and compressed raster data (STR #4551)
- Command-line programs were not localized on Mac OS X
(<rdar://problem/14546232>)
- The scheduler incorrectly cleared the MakeModel string in the
printers.conf file after a restart (<rdar://problem/16827518>)
- CUPS did not compile with older versions of GNU TLS (STR #4527)
- CUPS did not compile without Avahi or mDNSResponder (STR #4523)
- ippLength() did not return the correct length for IPP_TAG_CONST
string values.
- The scheduler incorrectly aborted jobs after a job was restarted
(<rdar://problem/19129387>)
- The cups-files.conf file contained the old ServerCertificate/Key
directives instead of ServerKeychain.
- Fixed builds when no SSL/TLS library is available, or when explicitly
disabled (STR #4531)
- Fixed an OpenBSD charset transcoding issue.
- Fixed USB printing on OpenBSD (STR #4525)
- The --without-xinetd configure option did not work (STR #4542)
- Backends needing to load OS X kernel extensions did not work
(<rdar://problem/19015679>)
- Mapping of PPD keywords to IPP keywords did not work if the PPD
keyword was already an IPP keyword (<rdar://problem/19121005>)
- cupsGetPPD* sent bad requests (STR #4567)
- ippserver used the wrong temporary directory on Windows (STR #4547)
- ippserver did not handle Bonjour registrations properly (STR #4548)
- The scheduler could crash during shutdown if Avahi was shutdown
first (STR #4550)
- Added a USB quirk rule for Intermec printers (STR #4553)
- The scheduler did not always log which configuration file had the
error (STR #4559)
- The ippfind and ipptool programs now correctly match hostnames with
trailing dots (STR #4563)
- The ipptool timeout option did not work (STR #4515)
- Fixed several issues with client.conf, CUPS_SERVER, and the "-h"
option of most commands (STR #4528)
- Another change for OpenBSD (STR #4526)
- Added Japanese localization (STR #4524)
- Documentation changes (STR #4569)
Diffstat (limited to 'print/cups')
-rw-r--r-- | print/cups/Makefile | 6 | ||||
-rw-r--r-- | print/cups/PLIST | 76 | ||||
-rw-r--r-- | print/cups/distinfo | 9 | ||||
-rw-r--r-- | print/cups/patches/patch-config.h.in | 18 |
4 files changed, 80 insertions, 29 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index 1100f9611f9..e9a6dad3279 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.215 2015/01/02 02:03:42 christos Exp $ +# $NetBSD: Makefile,v 1.216 2015/02/17 13:53:48 wiz Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -6,7 +6,7 @@ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${DIST_VERS:S/-/./g} -BASE_VERS= 2.0.1 +BASE_VERS= 2.0.2 DIST_VERS= ${BASE_VERS} CATEGORIES= print MASTER_SITES= http://www.cups.org/software/${BASE_VERS}/ @@ -25,8 +25,6 @@ USE_LANGUAGES= c c++ # pdftops is a C++ application USE_PKGLOCALEDIR= yes USE_TOOLS+= aclocal autoconf automake gmake USE_LIBTOOL= yes -# patch-a[jkl] were added for 2.60 -AUTOCONF_REQD= 2.60 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale diff --git a/print/cups/PLIST b/print/cups/PLIST index a9279a02fe0..d3d0d294ec2 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.46 2015/01/02 09:24:31 wiz Exp $ +@comment $NetBSD: PLIST,v 1.47 2015/02/17 13:53:48 wiz Exp $ bin/cancel bin/cups-config bin/cupstestdsc @@ -281,6 +281,76 @@ share/cups/templates/header.tmpl share/cups/templates/help-header.tmpl share/cups/templates/help-printable.tmpl share/cups/templates/help-trailer.tmpl +share/cups/templates/ja/add-class.tmpl +share/cups/templates/ja/add-printer.tmpl +share/cups/templates/ja/add-rss-subscription.tmpl +share/cups/templates/ja/admin.tmpl +share/cups/templates/ja/choose-device.tmpl +share/cups/templates/ja/choose-make.tmpl +share/cups/templates/ja/choose-model.tmpl +share/cups/templates/ja/choose-serial.tmpl +share/cups/templates/ja/choose-uri.tmpl +share/cups/templates/ja/class-added.tmpl +share/cups/templates/ja/class-confirm.tmpl +share/cups/templates/ja/class-deleted.tmpl +share/cups/templates/ja/class-jobs-header.tmpl +share/cups/templates/ja/class-modified.tmpl +share/cups/templates/ja/class.tmpl +share/cups/templates/ja/classes-header.tmpl +share/cups/templates/ja/classes.tmpl +share/cups/templates/ja/command.tmpl +share/cups/templates/ja/edit-config.tmpl +share/cups/templates/ja/error-op.tmpl +share/cups/templates/ja/error.tmpl +share/cups/templates/ja/header.tmpl +share/cups/templates/ja/help-header.tmpl +share/cups/templates/ja/help-printable.tmpl +share/cups/templates/ja/help-trailer.tmpl +share/cups/templates/ja/job-cancel.tmpl +share/cups/templates/ja/job-hold.tmpl +share/cups/templates/ja/job-move.tmpl +share/cups/templates/ja/job-moved.tmpl +share/cups/templates/ja/job-release.tmpl +share/cups/templates/ja/job-restart.tmpl +share/cups/templates/ja/jobs-header.tmpl +share/cups/templates/ja/jobs.tmpl +share/cups/templates/ja/list-available-printers.tmpl +share/cups/templates/ja/modify-class.tmpl +share/cups/templates/ja/modify-printer.tmpl +share/cups/templates/ja/norestart.tmpl +share/cups/templates/ja/option-boolean.tmpl +share/cups/templates/ja/option-conflict.tmpl +share/cups/templates/ja/option-header.tmpl +share/cups/templates/ja/option-pickmany.tmpl +share/cups/templates/ja/option-pickone.tmpl +share/cups/templates/ja/option-trailer.tmpl +share/cups/templates/ja/pager.tmpl +share/cups/templates/ja/printer-accept.tmpl +share/cups/templates/ja/printer-added.tmpl +share/cups/templates/ja/printer-cancel-jobs.tmpl +share/cups/templates/ja/printer-configured.tmpl +share/cups/templates/ja/printer-confirm.tmpl +share/cups/templates/ja/printer-default.tmpl +share/cups/templates/ja/printer-deleted.tmpl +share/cups/templates/ja/printer-jobs-header.tmpl +share/cups/templates/ja/printer-modified.tmpl +share/cups/templates/ja/printer-reject.tmpl +share/cups/templates/ja/printer-start.tmpl +share/cups/templates/ja/printer-stop.tmpl +share/cups/templates/ja/printer.tmpl +share/cups/templates/ja/printers-header.tmpl +share/cups/templates/ja/printers.tmpl +share/cups/templates/ja/restart.tmpl +share/cups/templates/ja/samba-export.tmpl +share/cups/templates/ja/samba-exported.tmpl +share/cups/templates/ja/search.tmpl +share/cups/templates/ja/set-printer-options-header.tmpl +share/cups/templates/ja/set-printer-options-trailer.tmpl +share/cups/templates/ja/subscription-added.tmpl +share/cups/templates/ja/subscription-canceled.tmpl +share/cups/templates/ja/test-page.tmpl +share/cups/templates/ja/trailer.tmpl +share/cups/templates/ja/users.tmpl share/cups/templates/job-cancel.tmpl share/cups/templates/job-hold.tmpl share/cups/templates/job-move.tmpl @@ -429,10 +499,11 @@ share/doc/cups/images/smiley.jpg share/doc/cups/images/unsel.gif share/doc/cups/images/wait.gif share/doc/cups/index.html +share/doc/cups/ja/index.html share/doc/cups/robots.txt -${PLIST.pam}share/examples/cups/cups.pam share/examples/cups/cups-files.conf share/examples/cups/cupsd.conf +${PLIST.pam}share/examples/cups/cups.pam share/examples/cups/snmp.conf share/locale/ca/cups_ca.po share/locale/cs/cups_cs.po @@ -445,3 +516,4 @@ share/locale/ru/cups_ru.po @pkgdir share/cups/model @pkgdir share/cups/data @pkgdir share/cups/banners +@pkgdir etc/cups diff --git a/print/cups/distinfo b/print/cups/distinfo index 0156711c5a5..6bed22bcb5d 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.108 2015/01/18 17:15:20 wiz Exp $ +$NetBSD: distinfo,v 1.109 2015/02/17 13:53:48 wiz Exp $ -SHA1 (cups-2.0.1-source.tar.bz2) = acbf4f5365b6c2a99d8d05965d168f15915135db -RMD160 (cups-2.0.1-source.tar.bz2) = 977455ee8700a4e6fb40a807474ed8fb8e66945d -Size (cups-2.0.1-source.tar.bz2) = 8738217 bytes +SHA1 (cups-2.0.2-source.tar.bz2) = e42586e4d46e47b85f5f5ba1d3403ecf255d03a1 +RMD160 (cups-2.0.2-source.tar.bz2) = 46f7ce1c31e5d34eff1f5972fd358422b2c09001 +Size (cups-2.0.2-source.tar.bz2) = 8766982 bytes SHA1 (patch-ae) = e8f4bbbbbe43cd5f6f9236e10d7241caeaedc3a3 SHA1 (patch-af) = 1bac8b3ae3c44034be6fa6d2878f10d7f89cd1ce SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6 @@ -13,7 +13,6 @@ SHA1 (patch-config-scripts_cups-directories.m4) = 58c7b5d452c1dd67b754c7dcf0a3b5 SHA1 (patch-config-scripts_cups-gssapi.m4) = 7c8b0dd893b9d21597088062711cc50f13031338 SHA1 (patch-config-scripts_cups-manpages.m4) = fc82b6da8f678359cedf80afff1615669d1b6ac7 SHA1 (patch-config-scripts_cups-sharedlibs.m4) = 2754c4fb4e10ce148785a1c3423fcd981c67b416 -SHA1 (patch-config.h.in) = c18c4afac00eb2c4e03e5886095152091fd217aa SHA1 (patch-configure.ac) = 7bb171c959aa72e92efd04394751460727b0ca7d SHA1 (patch-cups-tls.c) = 055d24956b7ddcd04799642c2893e8e16b70391a SHA1 (patch-data_Makefile) = a35b07ed6b6e6103513efe5e6f5f3a13e449bda1 diff --git a/print/cups/patches/patch-config.h.in b/print/cups/patches/patch-config.h.in deleted file mode 100644 index 584643636d1..00000000000 --- a/print/cups/patches/patch-config.h.in +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-config.h.in,v 1.2 2014/06/07 07:34:05 wiz Exp $ - -* OpenBSD has no arc4random_stir - ---- config.h.in.orig 2014-02-27 15:57:59.000000000 +0000 -+++ config.h.in -@@ -612,7 +612,11 @@ - - #ifdef HAVE_ARC4RANDOM - # define CUPS_RAND() arc4random() -+#if defined(__OpenBSD__) -+# define CUPS_SRAND(v) -+#else - # define CUPS_SRAND(v) arc4random_stir() -+#endif - #elif defined(HAVE_RANDOM) - # define CUPS_RAND() random() - # define CUPS_SRAND(v) srandom(v) |