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

Maintenance update to cups-2.1.4.

Browse Source
This commit is contained in:
ajacoutot 2016-06-15 06:42:51 +00:00
parent d6bbd7487c
commit 598d174b2c
4 changed files with 82 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
print/cups/Makefile
View File

@ -1,18 +1,14 @@
# $OpenBSD: Makefile,v 1.210 2016/05/22 15:44:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.211 2016/06/15 06:42:51 ajacoutot Exp $
COMMENT-main= Common Unix Printing System
COMMENT-libs= CUPS libraries and headers
VERSION= 2.1.3
VERSION= 2.1.4
DISTNAME= cups-${VERSION}-source
EXTRACT_SUFX= .tar.bz2
PKGNAME-main= cups-${VERSION}
PKGNAME-libs= cups-libs-${VERSION}
REVISION-main= 1
REVISION-libs= 1
CATEGORIES= print sysutils
# config-scripts/cups-sharedlibs.m4
@ -34,7 +30,7 @@ WANTLIB += avahi-client avahi-common gnutls iconv m pthread stdc++ z
WANTLIB-main += ${WANTLIB}
WANTLIB-main += c cups cupscgi cupsimage cupsmime cupsppdc dbus-1 usb-1.0
MASTER_SITES= ${HOMEPAGE}software/${VERSION}/
MASTER_SITES= https://github.com/apple/cups/releases/download/release-${VERSION}/
WRKDIST= ${WRKDIR}/${DISTNAME:S/-source//}

4
print/cups/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cups-2.1.3-source.tar.bz2) = NqcNQ1hK6iYX2pFLkzHiM0HDUBqCVMTS6unBHsAf1NM=
SIZE (cups-2.1.3-source.tar.bz2) = 8832400
SHA256 (cups-2.1.4-source.tar.gz) = SxT9gzGArFKevr6nZqCQlMJWi/hCbiGcs6FxUwTvco0=
SIZE (cups-2.1.4-source.tar.gz) = 9557631

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

@ -1,11 +1,11 @@
$OpenBSD: patch-scheduler_ipp_c,v 1.20 2015/12/05 07:36:20 ajacoutot Exp $
$OpenBSD: patch-scheduler_ipp_c,v 1.21 2016/06/15 06:42:51 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 Tue Nov 17 20:29:52 2015
+++ scheduler/ipp.c Sat Dec 5 08:29:28 2015
@@ -4471,7 +4471,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
--- scheduler/ipp.c.orig Tue Jun 14 19:45:32 2016
+++ scheduler/ipp.c Wed Jun 15 08:05:15 2016
@@ -4488,7 +4488,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
close(temppipe[1]);
/*
@ -14,7 +14,7 @@ on low-end configurations.
*/
total = 0;
@@ -4491,7 +4491,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
@@ -4508,7 +4508,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
FD_SET(temppipe[0], &input);
FD_SET(CGIPipes[0], &input);

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.23 2015/12/05 07:36:20 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.24 2016/06/15 06:42:51 ajacoutot Exp $
@conflict LPRng-*
@pkgpath print/cups
@pkgpath print/cups,ldap
@ -456,6 +456,74 @@ share/cups/templates/printer-stop.tmpl
share/cups/templates/printer.tmpl
share/cups/templates/printers-header.tmpl
share/cups/templates/printers.tmpl
share/cups/templates/pt_BR/
share/cups/templates/pt_BR/add-class.tmpl
share/cups/templates/pt_BR/add-printer.tmpl
share/cups/templates/pt_BR/add-rss-subscription.tmpl
share/cups/templates/pt_BR/admin.tmpl
share/cups/templates/pt_BR/choose-device.tmpl
share/cups/templates/pt_BR/choose-make.tmpl
share/cups/templates/pt_BR/choose-model.tmpl
share/cups/templates/pt_BR/choose-serial.tmpl
share/cups/templates/pt_BR/choose-uri.tmpl
share/cups/templates/pt_BR/class-added.tmpl
share/cups/templates/pt_BR/class-confirm.tmpl
share/cups/templates/pt_BR/class-deleted.tmpl
share/cups/templates/pt_BR/class-jobs-header.tmpl
share/cups/templates/pt_BR/class-modified.tmpl
share/cups/templates/pt_BR/class.tmpl
share/cups/templates/pt_BR/classes-header.tmpl
share/cups/templates/pt_BR/classes.tmpl
share/cups/templates/pt_BR/command.tmpl
share/cups/templates/pt_BR/edit-config.tmpl
share/cups/templates/pt_BR/error-op.tmpl
share/cups/templates/pt_BR/error.tmpl
share/cups/templates/pt_BR/header.tmpl
share/cups/templates/pt_BR/help-header.tmpl
share/cups/templates/pt_BR/job-cancel.tmpl
share/cups/templates/pt_BR/job-hold.tmpl
share/cups/templates/pt_BR/job-move.tmpl
share/cups/templates/pt_BR/job-moved.tmpl
share/cups/templates/pt_BR/job-release.tmpl
share/cups/templates/pt_BR/job-restart.tmpl
share/cups/templates/pt_BR/jobs-header.tmpl
share/cups/templates/pt_BR/jobs.tmpl
share/cups/templates/pt_BR/list-available-printers.tmpl
share/cups/templates/pt_BR/modify-class.tmpl
share/cups/templates/pt_BR/modify-printer.tmpl
share/cups/templates/pt_BR/norestart.tmpl
share/cups/templates/pt_BR/option-boolean.tmpl
share/cups/templates/pt_BR/option-conflict.tmpl
share/cups/templates/pt_BR/option-header.tmpl
share/cups/templates/pt_BR/option-pickmany.tmpl
share/cups/templates/pt_BR/option-pickone.tmpl
share/cups/templates/pt_BR/option-trailer.tmpl
share/cups/templates/pt_BR/pager.tmpl
share/cups/templates/pt_BR/printer-accept.tmpl
share/cups/templates/pt_BR/printer-added.tmpl
share/cups/templates/pt_BR/printer-configured.tmpl
share/cups/templates/pt_BR/printer-confirm.tmpl
share/cups/templates/pt_BR/printer-default.tmpl
share/cups/templates/pt_BR/printer-deleted.tmpl
share/cups/templates/pt_BR/printer-jobs-header.tmpl
share/cups/templates/pt_BR/printer-modified.tmpl
share/cups/templates/pt_BR/printer-reject.tmpl
share/cups/templates/pt_BR/printer-start.tmpl
share/cups/templates/pt_BR/printer-stop.tmpl
share/cups/templates/pt_BR/printer.tmpl
share/cups/templates/pt_BR/printers-header.tmpl
share/cups/templates/pt_BR/printers.tmpl
share/cups/templates/pt_BR/restart.tmpl
share/cups/templates/pt_BR/samba-export.tmpl
share/cups/templates/pt_BR/samba-exported.tmpl
share/cups/templates/pt_BR/search.tmpl
share/cups/templates/pt_BR/set-printer-options-header.tmpl
share/cups/templates/pt_BR/set-printer-options-trailer.tmpl
share/cups/templates/pt_BR/subscription-added.tmpl
share/cups/templates/pt_BR/subscription-canceled.tmpl
share/cups/templates/pt_BR/test-page.tmpl
share/cups/templates/pt_BR/trailer.tmpl
share/cups/templates/pt_BR/users.tmpl
share/cups/templates/restart.tmpl
share/cups/templates/ru/
share/cups/templates/ru/add-class.tmpl
@ -649,6 +717,8 @@ share/doc/cups/images/wait.gif
share/doc/cups/index.html
share/doc/cups/ja/
share/doc/cups/ja/index.html
share/doc/cups/pt_BR/
share/doc/cups/pt_BR/index.html
share/doc/cups/robots.txt
share/doc/cups/ru/
share/doc/cups/ru/index.html
@ -702,6 +772,7 @@ share/locale/es/cups_es.po
share/locale/fr/cups_fr.po
share/locale/it/cups_it.po
share/locale/ja/cups_ja.po
share/locale/pt_BR/cups_pt_BR.po
share/locale/ru/cups_ru.po
@extraunexec rm -rf /var/cache/cups
@extraunexec rm -rf /var/spool/cups