cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SECURITY update to cups-2.0.3 (CERT VU #810572).

Browse Source
This commit is contained in:
ajacoutot 2015-06-09 07:39:14 +00:00
parent d19f0f05a2
commit 9b1ee79cfc
5 changed files with 161 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
print/cups/Makefile
View File

@ -1,17 +1,14 @@
# $OpenBSD: Makefile,v 1.195 2015/04/04 09:21:03 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.196 2015/06/09 07:39:14 ajacoutot Exp $
COMMENT-main= Common Unix Printing System
COMMENT-libs= CUPS libraries and headers
VERSION= 2.0.2
VERSION= 2.0.3
DISTNAME= cups-${VERSION}-source
EXTRACT_SUFX= .tar.bz2
PKGNAME-main= cups-${VERSION}
PKGNAME-libs= cups-libs-${VERSION}
REVISION-libs= 0
REVISION-main= 1
CATEGORIES= print sysutils

4
print/cups/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cups-2.0.2-source.tar.bz2) = hYcg92tm/QRBrioW98q9lVTIxkYH4o/6zxbDbFOjsYs=
SIZE (cups-2.0.2-source.tar.bz2) = 8766982
SHA256 (cups-2.0.3-source.tar.bz2) = vDFnBIaQpzefKaN9n70hQ88MoDO1Tu3ZMz3fxO4liIE=
SIZE (cups-2.0.3-source.tar.bz2) = 8797220

10
print/cups/patches/patch-backend_ipp_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-backend_ipp_c,v 1.9 2014/11/15 10:22:23 ajacoutot Exp $
$OpenBSD: patch-backend_ipp_c,v 1.10 2015/06/09 07:39:14 ajacoutot Exp $
Increase timeout for the PPD file to be copied so that it doesn't fail
on low-end configurations.
--- backend/ipp.c.orig Fri Jul 18 16:26:14 2014
+++ backend/ipp.c Fri Oct 3 15:35:39 2014
@@ -680,7 +680,7 @@ main(int argc, /* I - Number of command-line args
--- backend/ipp.c.orig Thu May 7 01:50:20 2015
+++ backend/ipp.c Tue Jun 9 09:33:28 2015
@@ -681,7 +681,7 @@ main(int argc, /* I - Number of command-line args
http = httpConnect2(hostname, port, addrlist, AF_UNSPEC, cupsEncryption(), 1,
0, NULL);
@ -14,7 +14,7 @@ on low-end configurations.
if (httpIsEncrypted(http))
{
@@ -2303,7 +2303,7 @@ monitor_printer(
@@ -2305,7 +2305,7 @@ monitor_printer(
http = httpConnect2(monitor->hostname, monitor->port, NULL, AF_UNSPEC,
monitor->encryption, 1, 0, NULL);

10
print/cups/patches/patch-scheduler_ipp_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-scheduler_ipp_c,v 1.15 2014/11/15 10:22:23 ajacoutot Exp $
$OpenBSD: patch-scheduler_ipp_c,v 1.16 2015/06/09 07:39:14 ajacoutot Exp $
Increase timeout for the PPD file to be copied so that it doesn't fail
on low-end configurations.
--- scheduler/ipp.c.orig Thu Aug 28 17:37:22 2014
+++ scheduler/ipp.c Fri Oct 3 15:35:39 2014
@@ -4461,7 +4461,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
--- scheduler/ipp.c.orig Mon Jun 8 20:33:44 2015
+++ scheduler/ipp.c Tue Jun 9 09:33:28 2015
@@ -4422,7 +4422,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
close(temppipe[1]);
/*
@ -14,7 +14,7 @@ on low-end configurations.
*/
total = 0;
@@ -4481,7 +4481,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
@@ -4442,7 +4442,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
FD_SET(temppipe[0], &input);
FD_SET(CGIPipes[0], &input);

148
print/cups/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.17 2015/02/10 08:29:33 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.18 2015/06/09 07:39:14 ajacoutot Exp $
@conflict LPRng-*
@pkgpath print/cups
@pkgpath print/cups,ldap
@ -202,6 +202,76 @@ share/cups/templates/class.tmpl
share/cups/templates/classes-header.tmpl
share/cups/templates/classes.tmpl
share/cups/templates/command.tmpl
share/cups/templates/de/
share/cups/templates/de/add-class.tmpl
share/cups/templates/de/add-printer.tmpl
share/cups/templates/de/add-rss-subscription.tmpl
share/cups/templates/de/admin.tmpl
share/cups/templates/de/choose-device.tmpl
share/cups/templates/de/choose-make.tmpl
share/cups/templates/de/choose-model.tmpl
share/cups/templates/de/choose-serial.tmpl
share/cups/templates/de/choose-uri.tmpl
share/cups/templates/de/class-added.tmpl
share/cups/templates/de/class-confirm.tmpl
share/cups/templates/de/class-deleted.tmpl
share/cups/templates/de/class-jobs-header.tmpl
share/cups/templates/de/class-modified.tmpl
share/cups/templates/de/class.tmpl
share/cups/templates/de/classes-header.tmpl
share/cups/templates/de/classes.tmpl
share/cups/templates/de/command.tmpl
share/cups/templates/de/edit-config.tmpl
share/cups/templates/de/error-op.tmpl
share/cups/templates/de/error.tmpl
share/cups/templates/de/header.tmpl
share/cups/templates/de/help-header.tmpl
share/cups/templates/de/help-printable.tmpl
share/cups/templates/de/job-cancel.tmpl
share/cups/templates/de/job-hold.tmpl
share/cups/templates/de/job-move.tmpl
share/cups/templates/de/job-moved.tmpl
share/cups/templates/de/job-release.tmpl
share/cups/templates/de/job-restart.tmpl
share/cups/templates/de/jobs-header.tmpl
share/cups/templates/de/jobs.tmpl
share/cups/templates/de/list-available-printers.tmpl
share/cups/templates/de/modify-class.tmpl
share/cups/templates/de/modify-printer.tmpl
share/cups/templates/de/norestart.tmpl
share/cups/templates/de/option-boolean.tmpl
share/cups/templates/de/option-conflict.tmpl
share/cups/templates/de/option-header.tmpl
share/cups/templates/de/option-pickmany.tmpl
share/cups/templates/de/option-pickone.tmpl
share/cups/templates/de/option-trailer.tmpl
share/cups/templates/de/pager.tmpl
share/cups/templates/de/printer-accept.tmpl
share/cups/templates/de/printer-added.tmpl
share/cups/templates/de/printer-cancel-jobs.tmpl
share/cups/templates/de/printer-configured.tmpl
share/cups/templates/de/printer-confirm.tmpl
share/cups/templates/de/printer-default.tmpl
share/cups/templates/de/printer-deleted.tmpl
share/cups/templates/de/printer-jobs-header.tmpl
share/cups/templates/de/printer-modified.tmpl
share/cups/templates/de/printer-reject.tmpl
share/cups/templates/de/printer-start.tmpl
share/cups/templates/de/printer-stop.tmpl
share/cups/templates/de/printer.tmpl
share/cups/templates/de/printers-header.tmpl
share/cups/templates/de/printers.tmpl
share/cups/templates/de/restart.tmpl
share/cups/templates/de/samba-export.tmpl
share/cups/templates/de/samba-exported.tmpl
share/cups/templates/de/search.tmpl
share/cups/templates/de/set-printer-options-header.tmpl
share/cups/templates/de/set-printer-options-trailer.tmpl
share/cups/templates/de/subscription-added.tmpl
share/cups/templates/de/subscription-canceled.tmpl
share/cups/templates/de/test-page.tmpl
share/cups/templates/de/trailer.tmpl
share/cups/templates/de/users.tmpl
share/cups/templates/edit-config.tmpl
share/cups/templates/error-op.tmpl
share/cups/templates/error.tmpl
@ -386,6 +456,76 @@ share/cups/templates/printer.tmpl
share/cups/templates/printers-header.tmpl
share/cups/templates/printers.tmpl
share/cups/templates/restart.tmpl
share/cups/templates/ru/
share/cups/templates/ru/add-class.tmpl
share/cups/templates/ru/add-printer.tmpl
share/cups/templates/ru/add-rss-subscription.tmpl
share/cups/templates/ru/admin.tmpl
share/cups/templates/ru/choose-device.tmpl
share/cups/templates/ru/choose-make.tmpl
share/cups/templates/ru/choose-model.tmpl
share/cups/templates/ru/choose-serial.tmpl
share/cups/templates/ru/choose-uri.tmpl
share/cups/templates/ru/class-added.tmpl
share/cups/templates/ru/class-confirm.tmpl
share/cups/templates/ru/class-deleted.tmpl
share/cups/templates/ru/class-jobs-header.tmpl
share/cups/templates/ru/class-modified.tmpl
share/cups/templates/ru/class.tmpl
share/cups/templates/ru/classes-header.tmpl
share/cups/templates/ru/classes.tmpl
share/cups/templates/ru/command.tmpl
share/cups/templates/ru/edit-config.tmpl
share/cups/templates/ru/error-op.tmpl
share/cups/templates/ru/error.tmpl
share/cups/templates/ru/header.tmpl
share/cups/templates/ru/help-header.tmpl
share/cups/templates/ru/help-printable.tmpl
share/cups/templates/ru/job-cancel.tmpl
share/cups/templates/ru/job-hold.tmpl
share/cups/templates/ru/job-move.tmpl
share/cups/templates/ru/job-moved.tmpl
share/cups/templates/ru/job-release.tmpl
share/cups/templates/ru/job-restart.tmpl
share/cups/templates/ru/jobs-header.tmpl
share/cups/templates/ru/jobs.tmpl
share/cups/templates/ru/list-available-printers.tmpl
share/cups/templates/ru/modify-class.tmpl
share/cups/templates/ru/modify-printer.tmpl
share/cups/templates/ru/norestart.tmpl
share/cups/templates/ru/option-boolean.tmpl
share/cups/templates/ru/option-conflict.tmpl
share/cups/templates/ru/option-header.tmpl
share/cups/templates/ru/option-pickmany.tmpl
share/cups/templates/ru/option-pickone.tmpl
share/cups/templates/ru/option-trailer.tmpl
share/cups/templates/ru/pager.tmpl
share/cups/templates/ru/printer-accept.tmpl
share/cups/templates/ru/printer-added.tmpl
share/cups/templates/ru/printer-cancel-jobs.tmpl
share/cups/templates/ru/printer-configured.tmpl
share/cups/templates/ru/printer-confirm.tmpl
share/cups/templates/ru/printer-default.tmpl
share/cups/templates/ru/printer-deleted.tmpl
share/cups/templates/ru/printer-jobs-header.tmpl
share/cups/templates/ru/printer-modified.tmpl
share/cups/templates/ru/printer-reject.tmpl
share/cups/templates/ru/printer-start.tmpl
share/cups/templates/ru/printer-stop.tmpl
share/cups/templates/ru/printer.tmpl
share/cups/templates/ru/printers-header.tmpl
share/cups/templates/ru/printers.tmpl
share/cups/templates/ru/restart.tmpl
share/cups/templates/ru/samba-export.tmpl
share/cups/templates/ru/samba-exported.tmpl
share/cups/templates/ru/search.tmpl
share/cups/templates/ru/set-printer-options-header.tmpl
share/cups/templates/ru/set-printer-options-trailer.tmpl
share/cups/templates/ru/subscription-added.tmpl
share/cups/templates/ru/subscription-canceled.tmpl
share/cups/templates/ru/test-page.tmpl
share/cups/templates/ru/trailer.tmpl
share/cups/templates/ru/users.tmpl
share/cups/templates/samba-export.tmpl
share/cups/templates/samba-exported.tmpl
share/cups/templates/search.tmpl
@ -402,6 +542,8 @@ share/doc/cups/
share/doc/cups/apple-touch-icon.png
share/doc/cups/cups-printable.css
share/doc/cups/cups.css
share/doc/cups/de/
share/doc/cups/de/index.html
share/doc/cups/es/
share/doc/cups/es/index.html
share/doc/cups/help/
@ -492,6 +634,7 @@ share/doc/cups/images/cups-icon.png
share/doc/cups/images/cups-postscript-chain.png
share/doc/cups/images/cups-raster-chain.png
share/doc/cups/images/cups.png
share/doc/cups/images/generic.png
share/doc/cups/images/left.gif
share/doc/cups/images/raster-organization.png
share/doc/cups/images/raster.png
@ -505,6 +648,8 @@ share/doc/cups/index.html
share/doc/cups/ja/
share/doc/cups/ja/index.html
share/doc/cups/robots.txt
share/doc/cups/ru/
share/doc/cups/ru/index.html
share/doc/pkg-readmes/${FULLPKGNAME}
@group _cups
share/examples/cups/
@ -547,6 +692,7 @@ share/examples/cups/ssl/
@group
share/locale/ca/cups_ca.po
share/locale/cs/cups_cs.po
share/locale/de/cups_de.po
share/locale/es/cups_es.po
share/locale/fr/cups_fr.po
share/locale/it/cups_it.po