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

Update to cups-2.1.0.

Browse Source
This commit is contained in:
ajacoutot 2015-09-01 16:23:50 +00:00
parent 9d3e863cfe
commit 808587c6f0
9 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
print/cups/Makefile
View File

@ -1,22 +1,20 @@
# $OpenBSD: Makefile,v 1.203 2015/08/27 06:48:30 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.204 2015/09/01 16:23:50 ajacoutot Exp $
COMMENT-main= Common Unix Printing System
COMMENT-libs= CUPS libraries and headers
VERSION= 2.0.4
VERSION= 2.1.0
DISTNAME= cups-${VERSION}-source
EXTRACT_SUFX= .tar.bz2
PKGNAME-main= cups-${VERSION}
PKGNAME-libs= cups-libs-${VERSION}
REVISION-main= 0
CATEGORIES= print sysutils
# config-scripts/cups-sharedlibs.m4
SHARED_LIBS+= cupsimage 5.1 # so.2
SHARED_LIBS+= cups 6.2 # so.2
SHARED_LIBS+= cups 6.3 # so.2
SHARED_LIBS+= cupscgi 1.1 # so.1
SHARED_LIBS+= cupsmime 1.1 # so.1
SHARED_LIBS+= cupsppdc 1.1 # so.1

4
print/cups/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cups-2.0.4-source.tar.bz2) = 4dXmjZ8k+soxeurrwWTDQQKBO8Dx1pwAs6WbScSfSr0=
SIZE (cups-2.0.4-source.tar.bz2) = 8799274
SHA256 (cups-2.1.0-source.tar.bz2) = ugI4QYRCuNhOCahl0N9qcoogOZgmxbRmsUsemrjG0sk=
SIZE (cups-2.1.0-source.tar.bz2) = 8829764

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

@ -1,11 +1,11 @@
$OpenBSD: patch-backend_ipp_c,v 1.11 2015/08/01 07:18:12 ajacoutot Exp $
$OpenBSD: patch-backend_ipp_c,v 1.12 2015/09/01 16:23:51 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 Jun 24 22:06:30 2015
+++ backend/ipp.c Sat Aug 1 09:14:22 2015
@@ -681,7 +681,7 @@ main(int argc, /* I - Number of command-line args
--- backend/ipp.c.orig Wed Jun 24 21:55:31 2015
+++ backend/ipp.c Tue Sep 1 18:13:41 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))
{
@@ -2306,7 +2306,7 @@ monitor_printer(
@@ -2311,7 +2311,7 @@ monitor_printer(
http = httpConnect2(monitor->hostname, monitor->port, NULL, AF_UNSPEC,
monitor->encryption, 1, 0, NULL);

10
print/cups/patches/patch-config-scripts_cups-common_m4
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-config-scripts_cups-common_m4,v 1.14 2015/02/10 08:29:33 ajacoutot Exp $
$OpenBSD: patch-config-scripts_cups-common_m4,v 1.15 2015/09/01 16:23:51 ajacoutot Exp $
Our <sys/ucred.h> does not provide xucred.
--- config-scripts/cups-common.m4.orig Mon Feb 9 20:38:35 2015
+++ config-scripts/cups-common.m4 Tue Feb 10 09:04:12 2015
@@ -136,7 +136,6 @@ AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
--- config-scripts/cups-common.m4.orig Mon Aug 31 17:22:30 2015
+++ config-scripts/cups-common.m4 Tue Sep 1 18:15:27 2015
@@ -144,7 +144,6 @@ AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
AC_CHECK_HEADER(sys/param.h,AC_DEFINE(HAVE_SYS_PARAM_H))
-AC_CHECK_HEADER(sys/ucred.h,AC_DEFINE(HAVE_SYS_UCRED_H))
AC_CHECK_HEADER(asl.h,AC_DEFINE(HAVE_ASL_H))
dnl Checks for iconv.h and iconv_open
AC_CHECK_HEADER(iconv.h,

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

@ -1,7 +1,7 @@
$OpenBSD: patch-cups_Makefile,v 1.12 2014/11/15 10:22:23 ajacoutot Exp $
--- cups/Makefile.orig Tue Jul 15 22:37:32 2014
+++ cups/Makefile Fri Oct 3 16:01:21 2014
@@ -303,12 +303,10 @@ uninstall:
$OpenBSD: patch-cups_Makefile,v 1.13 2015/09/01 16:23:51 ajacoutot Exp $
--- cups/Makefile.orig Thu Aug 27 21:29:06 2015
+++ cups/Makefile Tue Sep 1 18:13:41 2015
@@ -306,12 +306,10 @@ uninstall:
# libcups.so.2
#

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

@ -1,6 +1,6 @@
$OpenBSD: patch-scheduler_Makefile,v 1.11 2014/11/15 10:22:23 ajacoutot Exp $
--- scheduler/Makefile.orig Tue Oct 21 13:55:01 2014
+++ scheduler/Makefile Sat Nov 15 10:09:52 2014
$OpenBSD: patch-scheduler_Makefile,v 1.12 2015/09/01 16:23:51 ajacoutot Exp $
--- scheduler/Makefile.orig Tue Feb 17 14:10:19 2015
+++ scheduler/Makefile Tue Sep 1 18:13:41 2015
@@ -157,21 +157,6 @@ install-data:
echo Creating $(SERVERROOT)/ssl...; \
$(INSTALL_DIR) -m 700 -g $(CUPS_GROUP) $(SERVERROOT)/ssl; \
@ -23,7 +23,7 @@ $OpenBSD: patch-scheduler_Makefile,v 1.11 2014/11/15 10:22:23 ajacoutot Exp $
if test "x$(INITDIR)" != x; then \
echo Installing init scripts...; \
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
@@ -444,11 +429,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.17 2015/08/01 07:18:12 ajacoutot Exp $
$OpenBSD: patch-scheduler_ipp_c,v 1.18 2015/09/01 16:23: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 Jul 7 19:28:51 2015
+++ scheduler/ipp.c Sat Aug 1 09:14:22 2015
@@ -4424,7 +4424,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
--- scheduler/ipp.c.orig Fri Aug 28 15:17:53 2015
+++ scheduler/ipp.c Tue Sep 1 18:13:41 2015
@@ -4451,7 +4451,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
close(temppipe[1]);
/*
@ -14,7 +14,7 @@ on low-end configurations.
*/
total = 0;
@@ -4444,7 +4444,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
@@ -4471,7 +4471,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
FD_SET(temppipe[0], &input);
FD_SET(CGIPipes[0], &input);

8
print/cups/patches/patch-test_run-stp-tests_sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-test_run-stp-tests_sh,v 1.14 2015/02/10 08:29:33 ajacoutot Exp $
--- test/run-stp-tests.sh.orig Fri Dec 19 17:56:15 2014
+++ test/run-stp-tests.sh Tue Feb 10 09:04:12 2015
$OpenBSD: patch-test_run-stp-tests_sh,v 1.15 2015/09/01 16:23:51 ajacoutot Exp $
--- test/run-stp-tests.sh.orig Fri Aug 28 15:38:46 2015
+++ test/run-stp-tests.sh Tue Sep 1 18:13:41 2015
@@ -36,7 +36,7 @@ umask 022
# Make the IPP test program...
#
@ -10,7 +10,7 @@ $OpenBSD: patch-test_run-stp-tests_sh,v 1.14 2015/02/10 08:29:33 ajacoutot Exp $
#
# Solaris has a non-POSIX grep in /bin...
@@ -593,7 +593,7 @@ fi
@@ -594,7 +594,7 @@ fi
export LD_LIBRARY_PATH

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.20 2015/08/27 06:48:30 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.21 2015/09/01 16:23:51 ajacoutot Exp $
@conflict LPRng-*
@pkgpath print/cups
@pkgpath print/cups,ldap
@ -227,6 +227,7 @@ 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/help-trailer.tmpl
share/cups/templates/de/job-cancel.tmpl
share/cups/templates/de/job-hold.tmpl
share/cups/templates/de/job-move.tmpl
@ -481,6 +482,7 @@ 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/help-trailer.tmpl
share/cups/templates/ru/job-cancel.tmpl
share/cups/templates/ru/job-hold.tmpl
share/cups/templates/ru/job-move.tmpl
@ -656,6 +658,7 @@ share/examples/cups/
@mode 0640
share/examples/cups/cups-files.conf
@sample ${SYSCONFDIR}/cups/cups-files.conf
share/examples/cups/cups-files.conf.default
share/examples/cups/cupsd.conf
share/examples/cups/cupsd.conf.default
@sample ${SYSCONFDIR}/cups/cupsd.conf
@ -685,6 +688,7 @@ share/examples/cups/ppd/
@mode 0640
share/examples/cups/snmp.conf
@sample ${SYSCONFDIR}/cups/snmp.conf
share/examples/cups/snmp.conf.default
@mode
share/examples/cups/ssl/
@mode 0700