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

Update to cups-2.3.3.1 (2.3.3op1) from the OpenPrinting project.

Browse Source 
Apple seems to have stopped pushing development or pushing new code.
This commit is contained in:
ajacoutot 2021-01-05 07:43:02 +00:00
parent 6dd5bfda0a
commit 9553a98154
6 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
print/cups/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.256 2020/11/14 11:04:04 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.257 2021/01/05 07:43:02 ajacoutot Exp $
COMMENT-main= Common Unix Printing System
COMMENT-libs= CUPS libraries and headers
VERSION= 2.3.3
GH_ACCOUNT= apple
VERSION= ${GH_TAGNAME:S/v//:S/op/./}
GH_ACCOUNT= OpenPrinting
GH_PROJECT= cups
GH_TAGNAME= v${VERSION}
GH_TAGNAME= v2.3.3op1
PKGNAME-main= cups-${VERSION}
PKGNAME-libs= cups-libs-${VERSION}
@ -14,10 +14,8 @@ PKGNAME-libs= cups-libs-${VERSION}
CATEGORIES= print sysutils
# config-scripts/cups-sharedlibs.m4
SHARED_LIBS+= cupsimage 6.1 # 2
SHARED_LIBS+= cups 7.1 # 2
HOMEPAGE= http://www.cups.org/
SHARED_LIBS+= cupsimage 6.2 # 2
SHARED_LIBS+= cups 7.2 # 2
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>

4
print/cups/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cups-2.3.3.tar.gz) = /imHE6rQy7hh3iR2DxQIURIsqunzTUgNv/8L2SEdlho=
SIZE (cups-2.3.3.tar.gz) = 8146552
SHA256 (cups-2.3.3op1.tar.gz) = ZBSMf3wNKycV2xvi+1VwQsywsPGaA0Vqg/v2NTu3PIk=
SIZE (cups-2.3.3op1.tar.gz) = 8246022

4
print/cups/patches/patch-cups_getifaddrs-internal_h
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-cups_getifaddrs-internal_h,v 1.1 2019/08/25 09:59:18 ajacoutot Exp $
$OpenBSD: patch-cups_getifaddrs-internal_h,v 1.2 2021/01/05 07:43:02 ajacoutot Exp $
In file included from getifaddrs.c:15:
In file included from ./getifaddrs-internal.h:42:
@ -8,7 +8,7 @@ In file included from ./getifaddrs-internal.h:42:
Index: cups/getifaddrs-internal.h
--- cups/getifaddrs-internal.h.orig
+++ cups/getifaddrs-internal.h
@@ -38,6 +38,7 @@ typedef int socklen_t;
@@ -39,6 +39,7 @@ typedef int socklen_t;
# endif /* __APPLE__ && !_SOCKLEN_T */
# ifndef _WIN32

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

@ -1,9 +1,9 @@
$OpenBSD: patch-scheduler_Makefile,v 1.17 2019/08/25 09:59:18 ajacoutot Exp $
$OpenBSD: patch-scheduler_Makefile,v 1.18 2021/01/05 07:43:02 ajacoutot Exp $
Index: scheduler/Makefile
--- scheduler/Makefile.orig
+++ scheduler/Makefile
@@ -148,21 +148,6 @@ install-data:
@@ -149,21 +149,6 @@ install-data:
echo Creating $(SERVERROOT)/ssl...; \
$(INSTALL_DIR) -m 700 -g $(CUPS_GROUP) $(SERVERROOT)/ssl; \
fi

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

@ -1,4 +1,4 @@
$OpenBSD: patch-scheduler_ipp_c,v 1.28 2019/08/25 09:59:18 ajacoutot Exp $
$OpenBSD: patch-scheduler_ipp_c,v 1.29 2021/01/05 07:43:02 ajacoutot Exp $
Increase timeout for the PPD file to be copied so that it doesn't fail
on low-end configurations.
@ -6,7 +6,7 @@ on low-end configurations.
Index: scheduler/ipp.c
--- scheduler/ipp.c.orig
+++ scheduler/ipp.c
@@ -4486,7 +4486,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
@@ -4487,7 +4487,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
close(temppipe[1]);
/*
@ -15,7 +15,7 @@ Index: scheduler/ipp.c
*/
total = 0;
@@ -4506,7 +4506,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
@@ -4507,7 +4507,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
FD_SET(temppipe[0], &input);
FD_SET(CGIPipes[0], &input);

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

@ -1,4 +1,4 @@
$OpenBSD: patch-test_run-stp-tests_sh,v 1.23 2019/08/25 09:59:18 ajacoutot Exp $
$OpenBSD: patch-test_run-stp-tests_sh,v 1.24 2021/01/05 07:43:02 ajacoutot Exp $
Index: test/run-stp-tests.sh
--- test/run-stp-tests.sh.orig
@ -12,7 +12,7 @@ Index: test/run-stp-tests.sh
#
# Solaris has a non-POSIX grep in /bin...
@@ -595,7 +595,7 @@ if test -f "$root/cups/libcups.so.2"; then
@@ -592,7 +592,7 @@ if test -f "$root/cups/libcups.so.2"; then
LD_LIBRARY_PATH="$root/cups:$LD_LIBRARY_PATH"
fi