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

Update to cups-2.1.2.

Browse Source
This commit is contained in:
ajacoutot 2015-12-05 07:36:19 +00:00
parent 7c14dd92e6
commit 9a8d8891e6
7 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
print/cups/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.205 2015/12/02 12:37:37 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.206 2015/12/05 07:36:19 ajacoutot Exp $
COMMENT-main= Common Unix Printing System
COMMENT-libs= CUPS libraries and headers
VERSION= 2.1.1
VERSION= 2.1.2
DISTNAME= cups-${VERSION}-source
EXTRACT_SUFX= .tar.bz2

4
print/cups/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cups-2.1.1-source.tar.bz2) = 2VDyXoa4QDgclJSg8rIjWo9my79fm889v/oj8mEAp6A=
SIZE (cups-2.1.1-source.tar.bz2) = 8865800
SHA256 (cups-2.1.2-source.tar.bz2) = urDKO6gOrkgxmzprGaWxT61c4jDzAVGgz6TAJx3yga0=
SIZE (cups-2.1.2-source.tar.bz2) = 8831726

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

@ -1,11 +1,11 @@
$OpenBSD: patch-backend_ipp_c,v 1.13 2015/12/02 12:37:37 ajacoutot Exp $
$OpenBSD: patch-backend_ipp_c,v 1.14 2015/12/05 07:36:20 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 Wed Nov 18 18:22:38 2015
+++ backend/ipp.c Wed Dec 2 13:28:37 2015
@@ -686,7 +686,7 @@ main(int argc, /* I - Number of command-line args
--- backend/ipp.c.orig Fri Oct 9 15:15:22 2015
+++ backend/ipp.c Sat Dec 5 08:29:28 2015
@@ -684,7 +684,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))
{
@@ -2354,7 +2354,7 @@ monitor_printer(
@@ -2314,7 +2314,7 @@ monitor_printer(
http = httpConnect2(monitor->hostname, monitor->port, NULL, AF_UNSPEC,
monitor->encryption, 1, 0, NULL);

8
print/cups/patches/patch-cups_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cups_Makefile,v 1.14 2015/12/02 12:37:37 ajacoutot Exp $
--- cups/Makefile.orig Wed Nov 18 18:22:38 2015
+++ cups/Makefile Wed Dec 2 13:28:37 2015
@@ -307,12 +307,10 @@ uninstall:
$OpenBSD: patch-cups_Makefile,v 1.15 2015/12/05 07:36:20 ajacoutot Exp $
--- cups/Makefile.orig Thu Aug 27 21:29:06 2015
+++ cups/Makefile Sat Dec 5 08:29:28 2015
@@ -306,12 +306,10 @@ uninstall:
# libcups.so.2
#

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

@ -1,7 +1,7 @@
$OpenBSD: patch-scheduler_Makefile,v 1.13 2015/12/02 12:37:37 ajacoutot Exp $
--- scheduler/Makefile.orig Mon Oct 19 20:49:28 2015
+++ scheduler/Makefile Wed Dec 2 13:28:37 2015
@@ -155,21 +155,6 @@ install-data:
$OpenBSD: patch-scheduler_Makefile,v 1.14 2015/12/05 07:36:20 ajacoutot Exp $
--- scheduler/Makefile.orig Tue Feb 17 14:10:19 2015
+++ scheduler/Makefile Sat Dec 5 08:29:28 2015
@@ -157,21 +157,6 @@ install-data:
echo Creating $(SERVERROOT)/ssl...; \
$(INSTALL_DIR) -m 700 -g $(CUPS_GROUP) $(SERVERROOT)/ssl; \
fi
@ -23,7 +23,7 @@ $OpenBSD: patch-scheduler_Makefile,v 1.13 2015/12/02 12:37:37 ajacoutot Exp $
if test "x$(INITDIR)" != x; then \
echo Installing init scripts...; \
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
@@ -448,11 +433,9 @@ cups-lpd: cups-lpd.o ../cups/$(LIBCUPS)
@@ -450,11 +435,9 @@ cups-lpd: cups-lpd.o ../cups/$(LIBCUPS)
# libcupsmime.so.1
#

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

@ -1,11 +1,11 @@
$OpenBSD: patch-scheduler_ipp_c,v 1.19 2015/12/02 12:37:37 ajacoutot Exp $
$OpenBSD: patch-scheduler_ipp_c,v 1.20 2015/12/05 07:36:20 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:25:54 2015
+++ scheduler/ipp.c Wed Dec 2 13:28:37 2015
@@ -4425,7 +4425,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
--- 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
close(temppipe[1]);
/*
@ -14,7 +14,7 @@ on low-end configurations.
*/
total = 0;
@@ -4445,7 +4445,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
@@ -4491,7 +4491,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
FD_SET(temppipe[0], &input);
FD_SET(CGIPipes[0], &input);

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.22 2015/12/02 12:37:37 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.23 2015/12/05 07:36:20 ajacoutot Exp $
@conflict LPRng-*
@pkgpath print/cups
@pkgpath print/cups,ldap
@ -681,6 +681,8 @@ share/examples/cups/empty.conf
@mode 0644
@sample ${SYSCONFDIR}/cups/subscriptions.conf
@mode
share/examples/cups/interfaces/
@sample ${SYSCONFDIR}/cups/interfaces/
share/examples/cups/ppd/
@sample ${SYSCONFDIR}/cups/ppd/
@mode 0640