Update to cups-2.2.2.

This commit is contained in:
ajacoutot 2017-01-19 03:08:52 +00:00
parent 08f6bed16f
commit dc6b5b8dac
4 changed files with 13 additions and 15 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.214 2016/11/11 11:52:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.215 2017/01/19 03:08:52 ajacoutot Exp $
COMMENT-main= Common Unix Printing System
COMMENT-libs= CUPS libraries and headers
VERSION= 2.2.1
VERSION= 2.2.2
GH_ACCOUNT= apple
GH_PROJECT= cups
GH_TAGNAME= v${VERSION}
@ -11,8 +11,6 @@ GH_TAGNAME= v${VERSION}
PKGNAME-main= cups-${VERSION}
PKGNAME-libs= cups-libs-${VERSION}
REVISION-libs= 0
CATEGORIES= print sysutils
# config-scripts/cups-sharedlibs.m4

View File

@ -1,2 +1,2 @@
SHA256 (cups-2.2.1.tar.gz) = 5YZKwvmEoPjcuMHjpxdA+ORyfac5RPk8fvhK3szB2XE=
SIZE (cups-2.2.1.tar.gz) = 9485107
SHA256 (cups-2.2.2.tar.gz) = Xns5a0H1UjHd6N0EZc3YFYPNR+z/5JYMd3Fi++PM4Dw=
SIZE (cups-2.2.2.tar.gz) = 9489493

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-backend_ipp_c,v 1.15 2016/09/19 09:16:51 ajacoutot Exp $
$OpenBSD: patch-backend_ipp_c,v 1.16 2017/01/19 03:08:52 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 Sep 14 01:39:47 2016
+++ backend/ipp.c Sat Sep 17 15:26:03 2016
@@ -686,7 +686,7 @@ main(int argc, /* I - Number of command-line args
--- backend/ipp.c.orig Tue Jan 17 20:27:22 2017
+++ backend/ipp.c Thu Jan 19 04:01:19 2017
@@ -667,7 +667,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.
/*
* See if the printer supports SNMP...
@@ -2373,7 +2373,7 @@ monitor_printer(
@@ -2413,7 +2413,7 @@ monitor_printer(
http = httpConnect2(monitor->hostname, monitor->port, NULL, AF_UNSPEC,
monitor->encryption, 1, 0, NULL);

View File

@ -1,14 +1,14 @@
$OpenBSD: patch-config-scripts_cups-common_m4,v 1.16 2016/09/19 09:16:51 ajacoutot Exp $
$OpenBSD: patch-config-scripts_cups-common_m4,v 1.17 2017/01/19 03:08:52 ajacoutot Exp $
Our <sys/ucred.h> does not provide xucred.
--- config-scripts/cups-common.m4.orig Wed Sep 14 01:39:47 2016
+++ config-scripts/cups-common.m4 Sat Sep 17 15:26:03 2016
--- config-scripts/cups-common.m4.orig Tue Jan 17 20:27:22 2017
+++ config-scripts/cups-common.m4 Thu Jan 19 04:02:41 2017
@@ -128,7 +128,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,