Mon Jan 4 14:32:17 2021 UTC ()
Update cups to v2.3.3op1

Change to the OpenPrinting fork of apple/cups, e.g., that fork already contains

- dnssd patch patch-config-scripts_cups-dnssd.m4
- freebsd patch patch-cups_getifaddrs-internal.h
- libtool patch patch-af

https://github.com/apple/cups/issues/4947 was fixed in both.

Changes in CUPS v2.3.3op1
-------------------------

- The automated test suite can now be activated using `make test` for
  consistency with other projects and CI environments - the old `make check`
  continues to work as well, and the previous test server behavior can be
  accessed by running `make testserver`.
- ippeveprinter now supports multiple icons and strings files.
- ippeveprinter now uses the system's FQDN with Avahi.
- ippeveprinter now supports Get-Printer-Attributes on "/".
- ippeveprinter now uses a deterministic "printer-uuid" value.
- ippeveprinter now uses system sounds on macOS for Identify-Printer.
- Updated ippfind to look for files in "~/Desktop" on Windows.
- Updated ippfind to honor `SKIP-XXX` directives with `PAUSE`.
- Updated IPP Everywhere support to work around printers that only advertise
  color raster support but really also support grayscale (Issue #1)
- ipptool now supports DNS-SD URIs like `ipps://My%20Printer._ipps._tcp.local`
  (Issue #5)
- The scheduler now allows root backends to have world read permissions but not
  world execute permissions (Issue #21)
- Failures to bind IPv6 listener sockets no longer cause errors if IPv6 is
  disabled on the host (Issue #25)
- The SNMP backend now supports the HP and Ricoh vendor MIBs (Issue #28)
- The scheduler no longer includes a timestamp in files it writes (Issue #29)
- The systemd service names are now "cups.service" and "cups-lpd.service"
  (Issue #30, Issue #31)
- The scheduler no longer adds the local hostname to the ServerAlias list
  (Issue #32)
- Added `LogFileGroup` directive in "cups-files.conf" to control the group
  owner of log files (Issue #34)
- Added `--with-max-log-size` configure option (Issue #35)
- Added `--enable-sync-on-close` configure option (Issue #37)
- Added `--with-error-policy` configure option (Issue #38)
- IPP Everywhere PPDs could have an "unknown" default InputSlot (Issue #44)
- The `httpAddrListen` function now uses a listen backlog of 128.
- Added USB quirks (Apple issue #5789, #5823, #5831)
- Fixed IPP Everywhere v1.1 conformance issues in ippeveprinter.
- Fixed DNS-SD name collision support in ippeveprinter.
- Fixed compiler and code analyzer warnings.
- Fixed TLS support on Windows.
- Fixed ippfind sub-type searches with Avahi.
- Fixed the default hostname used by ippeveprinter on macOS.
- Fixed resolution of local IPP-USB printers with Avahi.
- Fixed coverity issues (Issue #2)
- Fixed `httpAddrConnect` issues (Issue #3)
- Fixed web interface device URI issue (Issue #4)
- Fixed lp/lpr "printer/class not found" error reporting (Issue #6)
- Fixed xinetd support for LPD clients (Issue #7)
- Fixed libtool build issue (Issue #11)
- Fixed a memory leak in the scheduler (Issue #12)
- Fixed a potential integer overflow in the PPD hashing code (Issue #13)
- Fixed output-bin and print-quality handling issues (Issue #18)
- Fixed PPD options getting mapped to odd IPP values like "tray---4" (Issue #23)
- Fixed remote access to the cupsd.conf and log files (Issue #24)
- Fixed the automated test suite when running in certain build/CI environments
  (Issue #25)
- Fixed a logging regression caused by a previous change for Apple issue #5604
  (Issue #25)
- Fixed fax phone number handling with GNOME (Issue #40)
- Fixed potential rounding error in rastertopwg filter (Issue #41)
- Fixed the "uri-security-supported" value from the scheduler (Issue #42)
- Fixed IPP backend crash bug with "printer-alert" values (Issue #43)
- Removed old Solaris inetconv(1m) reference in cups-lpd man page (Issue #46)
- Fixed default options that incorrectly use the "custom" prefix (Issue #48)
- Fixed a memory leak when resolving DNS-SD URIs (Issue #49)
- Fixed systemd status reporting by adopting the notify interface (Issue #51)
- Fixed crash in rastertopwg (Apple issue #5773)
- Fixed cupsManualCopies values in IPP Everywhere PPDs (Apple issue #5807)


(prlw1)
diff -r1.272 -r1.273 pkgsrc/print/cups/Makefile
diff -r1.12 -r1.13 pkgsrc/print/cups/Makefile.common
diff -r1.40 -r1.41 pkgsrc/print/cups-base/Makefile
diff -r1.24 -r1.25 pkgsrc/print/cups-base/distinfo
diff -r1.4 -r1.5 pkgsrc/print/cups-base/options.mk
diff -r1.3 -r0 pkgsrc/print/cups-base/patches/patch-af
diff -r1.1 -r0 pkgsrc/print/cups-base/patches/patch-config-scripts_cups-dnssd.m4
diff -r1.1 -r0 pkgsrc/print/cups-base/patches/patch-cups_getifaddrs-internal.h
diff -r1.7 -r1.8 pkgsrc/print/libcups/Makefile
diff -r1.1 -r1.2 pkgsrc/print/libcups/options.mk

cvs diff -r1.272 -r1.273 pkgsrc/print/cups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile 2020/12/04 04:56:09 1.272
+++ pkgsrc/print/cups/Makefile 2021/01/04 14:32:17 1.273
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.272 2020/12/04 04:56:09 riastradh Exp $ 1# $NetBSD: Makefile,v 1.273 2021/01/04 14:32:17 prlw1 Exp $
2 2
3PKGREVISION= 3 
4.include "../../print/cups/Makefile.common" 3.include "../../print/cups/Makefile.common"
5 4
6PKGNAME= cups-${CUPS_VERS} 5PKGNAME= cups-${CUPS_VERS}
7MASTER_SITES= # empty 6MASTER_SITES= # empty
8 7
9MAINTAINER= sbd@NetBSD.org 8MAINTAINER= sbd@NetBSD.org
10COMMENT= Common UNIX Printing System 9COMMENT= Common UNIX Printing System
11 10
12META_PACKAGE= yes 11META_PACKAGE= yes
13 12
14.include "../../print/cups-base/buildlink3.mk" 13.include "../../print/cups-base/buildlink3.mk"
15.include "../../print/cups-filters/buildlink3.mk" 14.include "../../print/cups-filters/buildlink3.mk"
16.include "../../mk/bsd.pkg.mk" 15.include "../../mk/bsd.pkg.mk"

cvs diff -r1.12 -r1.13 pkgsrc/print/cups/Makefile.common (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile.common 2020/05/26 08:37:49 1.12
+++ pkgsrc/print/cups/Makefile.common 2021/01/04 14:32:17 1.13
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: Makefile.common,v 1.12 2020/05/26 08:37:49 triaxx Exp $ 1# $NetBSD: Makefile.common,v 1.13 2021/01/04 14:32:17 prlw1 Exp $
2# 2#
3# used by print/cups/Makefile 3# used by print/cups/Makefile
4# used by print/cups-base/Makefile 4# used by print/cups-base/Makefile
5# used by print/libcups/Makefile 5# used by print/libcups/Makefile
6 6
7CUPS_VERS= 2.3.3 7CUPS_VERS= 2.3.3op1
8DISTNAME= cups-${CUPS_VERS}-source 8DISTNAME= cups-${CUPS_VERS}-source
9CATEGORIES= print 9CATEGORIES= print
10 10
11HOMEPAGE= https://www.cups.org/ 11HOMEPAGE= https://openprinting.github.io/projects/00-cups/
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2

cvs diff -r1.40 -r1.41 pkgsrc/print/cups-base/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups-base/Makefile 2020/12/04 04:56:09 1.40
+++ pkgsrc/print/cups-base/Makefile 2021/01/04 14:32:17 1.41
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.40 2020/12/04 04:56:09 riastradh Exp $ 1# $NetBSD: Makefile,v 1.41 2021/01/04 14:32:17 prlw1 Exp $
2 2
3.include "../../print/cups/Makefile.common" 3.include "../../print/cups/Makefile.common"
4 4
5PKGNAME= cups-base-${CUPS_VERS} 5PKGNAME= cups-base-${CUPS_VERS}
6PKGREVISION= 8 6MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/}
7MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/} 
8 7
9MAINTAINER= sbd@NetBSD.org 8MAINTAINER= sbd@NetBSD.org
10COMMENT= Common UNIX Printing System 9COMMENT= Common UNIX Printing System
11 10
12GITHUB_PROJECT= cups 11GITHUB_PROJECT= cups
13GITHUB_RELEASE= v${PKGVERSION_NOREV} 12GITHUB_RELEASE= v${PKGVERSION_NOREV}
14 13
15CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* 14CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]*
16 15
17WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} 16WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
18UNLIMIT_RESOURCES= datasize memorysize 17UNLIMIT_RESOURCES= datasize memorysize
19USE_LANGUAGES= c c++ # pdftops is a C++ application 18USE_LANGUAGES= c c++ # pdftops is a C++ application
20USE_LIBTOOL= yes 19USE_LIBTOOL= yes

cvs diff -r1.24 -r1.25 pkgsrc/print/cups-base/distinfo (expand / switch to unified diff)

--- pkgsrc/print/cups-base/distinfo 2020/10/27 09:29:11 1.24
+++ pkgsrc/print/cups-base/distinfo 2021/01/04 14:32:17 1.25
@@ -1,33 +1,30 @@ @@ -1,33 +1,30 @@
1$NetBSD: distinfo,v 1.24 2020/10/27 09:29:11 jperkin Exp $ 1$NetBSD: distinfo,v 1.25 2021/01/04 14:32:17 prlw1 Exp $
2 2
3SHA1 (cups-2.3.3-source.tar.gz) = 7a01c9fba5d784eb61eda03fd40e513fd2a1b5b8 3SHA1 (cups-2.3.3op1-source.tar.gz) = a4cdab174881d4e6899fbbef637508bed10c5dc9
4RMD160 (cups-2.3.3-source.tar.gz) = e08afd09666e79d0416f46e14fb8c6b0a6beebd7 4RMD160 (cups-2.3.3op1-source.tar.gz) = 6dab18506dfac295c16e4341eb6257f3c01d951e
5SHA512 (cups-2.3.3-source.tar.gz) = 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d 5SHA512 (cups-2.3.3op1-source.tar.gz) = 89949b4190288d5464f425cbff6b854e9da96ba3071e4e0d595ad581797b2db4724f49d884f3ea43e372ed4d0faec72839b0b7182cdde13b96f2824d619a4843
6Size (cups-2.3.3-source.tar.gz) = 8140741 bytes 6Size (cups-2.3.3op1-source.tar.gz) = 7989156 bytes
7SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881 7SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881
8SHA1 (patch-af) = 7f32b1ddaa18d1e58670e5214b954e3b8476a22b 
9SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2 8SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2
10SHA1 (patch-airprint-conf_mime.convs.in) = e0813b7e1da2337191bc6bfc2a6888f4173b8717 9SHA1 (patch-airprint-conf_mime.convs.in) = e0813b7e1da2337191bc6bfc2a6888f4173b8717
11SHA1 (patch-airprint-scheduler_conf.c) = 504e752c1699049cdbe11d8b04814670ddda81d4 10SHA1 (patch-airprint-scheduler_conf.c) = 504e752c1699049cdbe11d8b04814670ddda81d4
12SHA1 (patch-airprint-scheduler_dirsvc.c) = b861ee4cacb110c755e22c8a691b064a6553019d 11SHA1 (patch-airprint-scheduler_dirsvc.c) = b861ee4cacb110c755e22c8a691b064a6553019d
13SHA1 (patch-airprint-scheduler_printers.c) = 027b9b1515ba0fc472f6d3c5308d35849ac5ae3b 12SHA1 (patch-airprint-scheduler_printers.c) = 027b9b1515ba0fc472f6d3c5308d35849ac5ae3b
14SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393 13SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393
15SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a 14SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a
16SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e 15SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e
17SHA1 (patch-config-scripts_cups-compiler.m4) = 71c706121fdf7db699a9b9365ac63779e3c23f67 16SHA1 (patch-config-scripts_cups-compiler.m4) = 71c706121fdf7db699a9b9365ac63779e3c23f67
18SHA1 (patch-config-scripts_cups-directories.m4) = 68ff0c9ed333d5b00d11694fca7875c83bf9197d 17SHA1 (patch-config-scripts_cups-directories.m4) = 68ff0c9ed333d5b00d11694fca7875c83bf9197d
19SHA1 (patch-config-scripts_cups-dnssd.m4) = 7dd3b0d754e92f3b3f53732163a8001e5fb430c5 
20SHA1 (patch-config-scripts_cups-gssapi.m4) = 965e54194de9f34f0f252f4993dcf8a8db935003 18SHA1 (patch-config-scripts_cups-gssapi.m4) = 965e54194de9f34f0f252f4993dcf8a8db935003
21SHA1 (patch-config-scripts_cups-libtool.m4) = d255bda2b740a04167e20be1662e3b9c242ed8f2 19SHA1 (patch-config-scripts_cups-libtool.m4) = d255bda2b740a04167e20be1662e3b9c242ed8f2
22SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df 20SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df
23SHA1 (patch-cups_getifaddrs-internal.h) = 2e251db9e4d1b01403f3ff8c61a2238a506c12d8 
24SHA1 (patch-cups_http-addrlist.c) = aa2524ee1c11450cfa3a46b1aa34c12417322241 21SHA1 (patch-cups_http-addrlist.c) = aa2524ee1c11450cfa3a46b1aa34c12417322241
25SHA1 (patch-cups_thread.c) = 7ffb9a5835f345b29ad0cc9e253bb1d7ead9a399 22SHA1 (patch-cups_thread.c) = 7ffb9a5835f345b29ad0cc9e253bb1d7ead9a399
26SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876 23SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876
27SHA1 (patch-man-cups-files.conf.man.in) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821 24SHA1 (patch-man-cups-files.conf.man.in) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821
28SHA1 (patch-scheduler-conf.c) = 1e3e116b6a0b5696656afe259ed48f6274ff6b57 25SHA1 (patch-scheduler-conf.c) = 1e3e116b6a0b5696656afe259ed48f6274ff6b57
29SHA1 (patch-scheduler-conf.h) = cd5c49579795c69b50abbff2b0f9604ffe8bfa5a 26SHA1 (patch-scheduler-conf.h) = cd5c49579795c69b50abbff2b0f9604ffe8bfa5a
30SHA1 (patch-scheduler-main.c) = a5410c7f78756506d23d705dfa93a756fe3e513e 27SHA1 (patch-scheduler-main.c) = a5410c7f78756506d23d705dfa93a756fe3e513e
31SHA1 (patch-scheduler_auth.c) = 686b26286b7ad88363ddc7b394aefbfb3ad26c2d 28SHA1 (patch-scheduler_auth.c) = 686b26286b7ad88363ddc7b394aefbfb3ad26c2d
32SHA1 (patch-scheduler_dirsvc.c) = 1dba98dc171df733acb99e5f31ad838845a917bc 29SHA1 (patch-scheduler_dirsvc.c) = 1dba98dc171df733acb99e5f31ad838845a917bc
33SHA1 (patch-tools_ippfind.c) = f0774fcf5ece380fd6fa09adb3c068910ddfa367 30SHA1 (patch-tools_ippfind.c) = f0774fcf5ece380fd6fa09adb3c068910ddfa367

cvs diff -r1.4 -r1.5 pkgsrc/print/cups-base/options.mk (expand / switch to unified diff)

--- pkgsrc/print/cups-base/options.mk 2020/10/16 15:29:25 1.4
+++ pkgsrc/print/cups-base/options.mk 2021/01/04 14:32:17 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.4 2020/10/16 15:29:25 prlw1 Exp $ 1# $NetBSD: options.mk,v 1.5 2021/01/04 14:32:17 prlw1 Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.cups-base 3PKG_OPTIONS_VAR= PKG_OPTIONS.cups-base
4PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers 4PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers
5PKG_SUGGESTED_OPTIONS= dnssd kerberos 5PKG_SUGGESTED_OPTIONS= dnssd kerberos
6 6
7PLIST_VARS+= apple dbus dnssd dnssd-backend ippfind libusb pam 7PLIST_VARS+= apple dbus dnssd dnssd-backend ippfind libusb pam
8 8
9.if defined(PKG_OPTIONS.cups) 9.if defined(PKG_OPTIONS.cups)
10PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.cups} 10PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.cups}
11PKG_OPTIONS_DEPRECATED_WARNINGS+= \ 11PKG_OPTIONS_DEPRECATED_WARNINGS+= \
12 "Deprecated variable PKG_OPTIONS.cups used, use ${PKG_OPTIONS_VAR} instead." 12 "Deprecated variable PKG_OPTIONS.cups used, use ${PKG_OPTIONS_VAR} instead."
13.endif 13.endif
14 14
@@ -58,32 +58,26 @@ CONFIGURE_ARGS+= --disable-dbus @@ -58,32 +58,26 @@ CONFIGURE_ARGS+= --disable-dbus
58CONFIGURE_ARGS+= --enable-dnssd 58CONFIGURE_ARGS+= --enable-dnssd
59PLIST.dnssd= yes 59PLIST.dnssd= yes
60PLIST.dnssd-backend= yes 60PLIST.dnssd-backend= yes
61PLIST.ippfind= yes 61PLIST.ippfind= yes
62.else 62.else
63CONFIGURE_ARGS+= --disable-dnssd 63CONFIGURE_ARGS+= --disable-dnssd
64.endif 64.endif
65 65
66.if !empty(PKG_OPTIONS:Mkerberos) 66.if !empty(PKG_OPTIONS:Mkerberos)
67.include "../../mk/krb5.buildlink3.mk" 67.include "../../mk/krb5.buildlink3.mk"
68CONFIGURE_ARGS+= --enable-gssapi 68CONFIGURE_ARGS+= --enable-gssapi
69.else 69.else
70CONFIGURE_ARGS+= --disable-gssapi 70CONFIGURE_ARGS+= --disable-gssapi
71# https://github.com/apple/cups/issues/4947 
72SUBST_CLASSES+= nokerb 
73SUBST_STAGE.nokerb= post-build 
74SUBST_SED.nokerb+= -e '\%<Policy kerberos>%,\%</Policy>%s/^/\#/' 
75SUBST_FILES.nokerb+= conf/cupsd.conf 
76SUBST_MESSAGE.nokerb= Commenting out kerberos section in config. 
77.endif 71.endif
78 72
79.if !empty(PKG_OPTIONS:Mlibusb) 73.if !empty(PKG_OPTIONS:Mlibusb)
80.include "../../devel/libusb1/buildlink3.mk" 74.include "../../devel/libusb1/buildlink3.mk"
81CONFIGURE_ARGS+= --enable-libusb 75CONFIGURE_ARGS+= --enable-libusb
82MESSAGE_SRC+= ${PKGDIR}/MESSAGE.libusb 76MESSAGE_SRC+= ${PKGDIR}/MESSAGE.libusb
83PLIST.libusb= yes 77PLIST.libusb= yes
84.else 78.else
85CONFIGURE_ARGS+= --disable-libusb 79CONFIGURE_ARGS+= --disable-libusb
86.endif 80.endif
87 81
88.if !empty(PKG_OPTIONS:Mpam) 82.if !empty(PKG_OPTIONS:Mpam)
89. include "../../mk/pam.buildlink3.mk" 83. include "../../mk/pam.buildlink3.mk"

File Deleted: pkgsrc/print/cups-base/patches/Attic/patch-af

File Deleted: pkgsrc/print/cups-base/patches/Attic/patch-config-scripts_cups-dnssd.m4

File Deleted: pkgsrc/print/cups-base/patches/Attic/patch-cups_getifaddrs-internal.h

cvs diff -r1.7 -r1.8 pkgsrc/print/libcups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/libcups/Makefile 2021/01/04 13:08:30 1.7
+++ pkgsrc/print/libcups/Makefile 2021/01/04 14:32:17 1.8
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.7 2021/01/04 13:08:30 wiz Exp $ 1# $NetBSD: Makefile,v 1.8 2021/01/04 14:32:17 prlw1 Exp $
2 2
3.include "../../print/cups/Makefile.common" 3.include "../../print/cups/Makefile.common"
4 4
5PKGNAME= libcups-${CUPS_VERS} 5PKGNAME= libcups-${CUPS_VERS}
6PKGREVISION= 5 6MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/}
7MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/} 
8 7
9MAINTAINER= sbd@NetBSD.org 8MAINTAINER= sbd@NetBSD.org
10COMMENT= Common UNIX Printing System library 9COMMENT= Common UNIX Printing System library
11 10
12DISTINFO_FILE?= ${.CURDIR}/../../print/cups-base/distinfo 11DISTINFO_FILE?= ${.CURDIR}/../../print/cups-base/distinfo
13PATCHDIR?= ${.CURDIR}/../../print/cups-base/patches 12PATCHDIR?= ${.CURDIR}/../../print/cups-base/patches
14 13
15GITHUB_PROJECT= cups 14GITHUB_PROJECT= cups
16GITHUB_RELEASE= v${PKGVERSION_NOREV} 15GITHUB_RELEASE= v${PKGVERSION_NOREV}
17 16
18CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* 17CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]*
19 18
20WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} 19WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}

cvs diff -r1.1 -r1.2 pkgsrc/print/libcups/options.mk (expand / switch to unified diff)

--- pkgsrc/print/libcups/options.mk 2020/05/16 18:07:56 1.1
+++ pkgsrc/print/libcups/options.mk 2021/01/04 14:32:17 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.1 2020/05/16 18:07:56 maya Exp $ 1# $NetBSD: options.mk,v 1.2 2021/01/04 14:32:17 prlw1 Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libcups 3PKG_OPTIONS_VAR= PKG_OPTIONS.libcups
4PKG_SUPPORTED_OPTIONS= acl dnssd kerberos tcpwrappers 4PKG_SUPPORTED_OPTIONS= acl dnssd kerberos tcpwrappers
5PKG_SUGGESTED_OPTIONS= dnssd kerberos 5PKG_SUGGESTED_OPTIONS= dnssd kerberos
6 6
7.if defined(PKG_OPTIONS.cups) 7.if defined(PKG_OPTIONS.cups)
8PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.cups} 8PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.cups}
9PKG_OPTIONS_DEPRECATED_WARNINGS+= \ 9PKG_OPTIONS_DEPRECATED_WARNINGS+= \
10 "Deprecated variable PKG_OPTIONS.cups used, use ${PKG_OPTIONS_VAR} instead." 10 "Deprecated variable PKG_OPTIONS.cups used, use ${PKG_OPTIONS_VAR} instead."
11.endif 11.endif
12 12
13.if ${OPSYS} != "Darwin" 13.if ${OPSYS} != "Darwin"
14# CUPS on Darwin does not support DBus and libusb 14# CUPS on Darwin does not support DBus and libusb
@@ -40,27 +40,21 @@ CONFIGURE_ARGS+= --disable-dbus @@ -40,27 +40,21 @@ CONFIGURE_ARGS+= --disable-dbus
40 40
41.if !empty(PKG_OPTIONS:Mdnssd) 41.if !empty(PKG_OPTIONS:Mdnssd)
42.include "../../net/mDNSResponder/buildlink3.mk" 42.include "../../net/mDNSResponder/buildlink3.mk"
43CONFIGURE_ARGS+= --enable-dnssd 43CONFIGURE_ARGS+= --enable-dnssd
44.else 44.else
45CONFIGURE_ARGS+= --disable-dnssd 45CONFIGURE_ARGS+= --disable-dnssd
46.endif 46.endif
47 47
48.if !empty(PKG_OPTIONS:Mkerberos) 48.if !empty(PKG_OPTIONS:Mkerberos)
49.include "../../mk/krb5.buildlink3.mk" 49.include "../../mk/krb5.buildlink3.mk"
50CONFIGURE_ARGS+= --enable-gssapi 50CONFIGURE_ARGS+= --enable-gssapi
51.else 51.else
52CONFIGURE_ARGS+= --disable-gssapi 52CONFIGURE_ARGS+= --disable-gssapi
53# https://github.com/apple/cups/issues/4947 
54SUBST_CLASSES+= nokerb 
55SUBST_STAGE.nokerb= post-build 
56SUBST_SED.nokerb+= -e '\%<Policy kerberos>%,\%</Policy>%s/^/\#/' 
57SUBST_FILES.nokerb+= conf/cupsd.conf 
58SUBST_MESSAGE.nokerb= Commenting out kerberos section in config. 
59.endif 53.endif
60 54
61.if !empty(PKG_OPTIONS:Mtcpwrappers) 55.if !empty(PKG_OPTIONS:Mtcpwrappers)
62.include "../../security/tcp_wrappers/buildlink3.mk" 56.include "../../security/tcp_wrappers/buildlink3.mk"
63CONFIGURE_ARGS+= --enable-tcp-wrappers 57CONFIGURE_ARGS+= --enable-tcp-wrappers
64.else 58.else
65CONFIGURE_ARGS+= --disable-tcp-wrappers 59CONFIGURE_ARGS+= --disable-tcp-wrappers
66.endif 60.endif