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)diff -r1.272 -r1.273 pkgsrc/print/cups/Makefile
(prlw1)
@@ -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 | |||
3 | PKGREVISION= 3 | |||
4 | .include "../../print/cups/Makefile.common" | 3 | .include "../../print/cups/Makefile.common" | |
5 | 4 | |||
6 | PKGNAME= cups-${CUPS_VERS} | 5 | PKGNAME= cups-${CUPS_VERS} | |
7 | MASTER_SITES= # empty | 6 | MASTER_SITES= # empty | |
8 | 7 | |||
9 | MAINTAINER= sbd@NetBSD.org | 8 | MAINTAINER= sbd@NetBSD.org | |
10 | COMMENT= Common UNIX Printing System | 9 | COMMENT= Common UNIX Printing System | |
11 | 10 | |||
12 | META_PACKAGE= yes | 11 | META_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" |
@@ -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 | |||
7 | CUPS_VERS= 2.3.3 | 7 | CUPS_VERS= 2.3.3op1 | |
8 | DISTNAME= cups-${CUPS_VERS}-source | 8 | DISTNAME= cups-${CUPS_VERS}-source | |
9 | CATEGORIES= print | 9 | CATEGORIES= print | |
10 | 10 | |||
11 | HOMEPAGE= https://www.cups.org/ | 11 | HOMEPAGE= https://openprinting.github.io/projects/00-cups/ | |
12 | LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 | 12 | LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 |
@@ -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 | |||
5 | PKGNAME= cups-base-${CUPS_VERS} | 5 | PKGNAME= cups-base-${CUPS_VERS} | |
6 | PKGREVISION= 8 | 6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/} | |
7 | MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/} | |||
8 | 7 | |||
9 | MAINTAINER= sbd@NetBSD.org | 8 | MAINTAINER= sbd@NetBSD.org | |
10 | COMMENT= Common UNIX Printing System | 9 | COMMENT= Common UNIX Printing System | |
11 | 10 | |||
12 | GITHUB_PROJECT= cups | 11 | GITHUB_PROJECT= cups | |
13 | GITHUB_RELEASE= v${PKGVERSION_NOREV} | 12 | GITHUB_RELEASE= v${PKGVERSION_NOREV} | |
14 | 13 | |||
15 | CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* | 14 | CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* | |
16 | 15 | |||
17 | WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} | 16 | WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} | |
18 | UNLIMIT_RESOURCES= datasize memorysize | 17 | UNLIMIT_RESOURCES= datasize memorysize | |
19 | USE_LANGUAGES= c c++ # pdftops is a C++ application | 18 | USE_LANGUAGES= c c++ # pdftops is a C++ application | |
20 | USE_LIBTOOL= yes | 19 | USE_LIBTOOL= yes |
@@ -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 | |||
3 | SHA1 (cups-2.3.3-source.tar.gz) = 7a01c9fba5d784eb61eda03fd40e513fd2a1b5b8 | 3 | SHA1 (cups-2.3.3op1-source.tar.gz) = a4cdab174881d4e6899fbbef637508bed10c5dc9 | |
4 | RMD160 (cups-2.3.3-source.tar.gz) = e08afd09666e79d0416f46e14fb8c6b0a6beebd7 | 4 | RMD160 (cups-2.3.3op1-source.tar.gz) = 6dab18506dfac295c16e4341eb6257f3c01d951e | |
5 | SHA512 (cups-2.3.3-source.tar.gz) = 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d | 5 | SHA512 (cups-2.3.3op1-source.tar.gz) = 89949b4190288d5464f425cbff6b854e9da96ba3071e4e0d595ad581797b2db4724f49d884f3ea43e372ed4d0faec72839b0b7182cdde13b96f2824d619a4843 | |
6 | Size (cups-2.3.3-source.tar.gz) = 8140741 bytes | 6 | Size (cups-2.3.3op1-source.tar.gz) = 7989156 bytes | |
7 | SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881 | 7 | SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881 | |
8 | SHA1 (patch-af) = 7f32b1ddaa18d1e58670e5214b954e3b8476a22b | |||
9 | SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2 | 8 | SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2 | |
10 | SHA1 (patch-airprint-conf_mime.convs.in) = e0813b7e1da2337191bc6bfc2a6888f4173b8717 | 9 | SHA1 (patch-airprint-conf_mime.convs.in) = e0813b7e1da2337191bc6bfc2a6888f4173b8717 | |
11 | SHA1 (patch-airprint-scheduler_conf.c) = 504e752c1699049cdbe11d8b04814670ddda81d4 | 10 | SHA1 (patch-airprint-scheduler_conf.c) = 504e752c1699049cdbe11d8b04814670ddda81d4 | |
12 | SHA1 (patch-airprint-scheduler_dirsvc.c) = b861ee4cacb110c755e22c8a691b064a6553019d | 11 | SHA1 (patch-airprint-scheduler_dirsvc.c) = b861ee4cacb110c755e22c8a691b064a6553019d | |
13 | SHA1 (patch-airprint-scheduler_printers.c) = 027b9b1515ba0fc472f6d3c5308d35849ac5ae3b | 12 | SHA1 (patch-airprint-scheduler_printers.c) = 027b9b1515ba0fc472f6d3c5308d35849ac5ae3b | |
14 | SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393 | 13 | SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393 | |
15 | SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a | 14 | SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a | |
16 | SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e | 15 | SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e | |
17 | SHA1 (patch-config-scripts_cups-compiler.m4) = 71c706121fdf7db699a9b9365ac63779e3c23f67 | 16 | SHA1 (patch-config-scripts_cups-compiler.m4) = 71c706121fdf7db699a9b9365ac63779e3c23f67 | |
18 | SHA1 (patch-config-scripts_cups-directories.m4) = 68ff0c9ed333d5b00d11694fca7875c83bf9197d | 17 | SHA1 (patch-config-scripts_cups-directories.m4) = 68ff0c9ed333d5b00d11694fca7875c83bf9197d | |
19 | SHA1 (patch-config-scripts_cups-dnssd.m4) = 7dd3b0d754e92f3b3f53732163a8001e5fb430c5 | |||
20 | SHA1 (patch-config-scripts_cups-gssapi.m4) = 965e54194de9f34f0f252f4993dcf8a8db935003 | 18 | SHA1 (patch-config-scripts_cups-gssapi.m4) = 965e54194de9f34f0f252f4993dcf8a8db935003 | |
21 | SHA1 (patch-config-scripts_cups-libtool.m4) = d255bda2b740a04167e20be1662e3b9c242ed8f2 | 19 | SHA1 (patch-config-scripts_cups-libtool.m4) = d255bda2b740a04167e20be1662e3b9c242ed8f2 | |
22 | SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df | 20 | SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df | |
23 | SHA1 (patch-cups_getifaddrs-internal.h) = 2e251db9e4d1b01403f3ff8c61a2238a506c12d8 | |||
24 | SHA1 (patch-cups_http-addrlist.c) = aa2524ee1c11450cfa3a46b1aa34c12417322241 | 21 | SHA1 (patch-cups_http-addrlist.c) = aa2524ee1c11450cfa3a46b1aa34c12417322241 | |
25 | SHA1 (patch-cups_thread.c) = 7ffb9a5835f345b29ad0cc9e253bb1d7ead9a399 | 22 | SHA1 (patch-cups_thread.c) = 7ffb9a5835f345b29ad0cc9e253bb1d7ead9a399 | |
26 | SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876 | 23 | SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876 | |
27 | SHA1 (patch-man-cups-files.conf.man.in) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821 | 24 | SHA1 (patch-man-cups-files.conf.man.in) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821 | |
28 | SHA1 (patch-scheduler-conf.c) = 1e3e116b6a0b5696656afe259ed48f6274ff6b57 | 25 | SHA1 (patch-scheduler-conf.c) = 1e3e116b6a0b5696656afe259ed48f6274ff6b57 | |
29 | SHA1 (patch-scheduler-conf.h) = cd5c49579795c69b50abbff2b0f9604ffe8bfa5a | 26 | SHA1 (patch-scheduler-conf.h) = cd5c49579795c69b50abbff2b0f9604ffe8bfa5a | |
30 | SHA1 (patch-scheduler-main.c) = a5410c7f78756506d23d705dfa93a756fe3e513e | 27 | SHA1 (patch-scheduler-main.c) = a5410c7f78756506d23d705dfa93a756fe3e513e | |
31 | SHA1 (patch-scheduler_auth.c) = 686b26286b7ad88363ddc7b394aefbfb3ad26c2d | 28 | SHA1 (patch-scheduler_auth.c) = 686b26286b7ad88363ddc7b394aefbfb3ad26c2d | |
32 | SHA1 (patch-scheduler_dirsvc.c) = 1dba98dc171df733acb99e5f31ad838845a917bc | 29 | SHA1 (patch-scheduler_dirsvc.c) = 1dba98dc171df733acb99e5f31ad838845a917bc | |
33 | SHA1 (patch-tools_ippfind.c) = f0774fcf5ece380fd6fa09adb3c068910ddfa367 | 30 | SHA1 (patch-tools_ippfind.c) = f0774fcf5ece380fd6fa09adb3c068910ddfa367 |
@@ -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 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.cups-base | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.cups-base | |
4 | PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers | 4 | PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers | |
5 | PKG_SUGGESTED_OPTIONS= dnssd kerberos | 5 | PKG_SUGGESTED_OPTIONS= dnssd kerberos | |
6 | 6 | |||
7 | PLIST_VARS+= apple dbus dnssd dnssd-backend ippfind libusb pam | 7 | PLIST_VARS+= apple dbus dnssd dnssd-backend ippfind libusb pam | |
8 | 8 | |||
9 | .if defined(PKG_OPTIONS.cups) | 9 | .if defined(PKG_OPTIONS.cups) | |
10 | PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.cups} | 10 | PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.cups} | |
11 | PKG_OPTIONS_DEPRECATED_WARNINGS+= \ | 11 | PKG_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 | |||
58 | CONFIGURE_ARGS+= --enable-dnssd | 58 | CONFIGURE_ARGS+= --enable-dnssd | |
59 | PLIST.dnssd= yes | 59 | PLIST.dnssd= yes | |
60 | PLIST.dnssd-backend= yes | 60 | PLIST.dnssd-backend= yes | |
61 | PLIST.ippfind= yes | 61 | PLIST.ippfind= yes | |
62 | .else | 62 | .else | |
63 | CONFIGURE_ARGS+= --disable-dnssd | 63 | CONFIGURE_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" | |
68 | CONFIGURE_ARGS+= --enable-gssapi | 68 | CONFIGURE_ARGS+= --enable-gssapi | |
69 | .else | 69 | .else | |
70 | CONFIGURE_ARGS+= --disable-gssapi | 70 | CONFIGURE_ARGS+= --disable-gssapi | |
71 | # https://github.com/apple/cups/issues/4947 | |||
72 | SUBST_CLASSES+= nokerb | |||
73 | SUBST_STAGE.nokerb= post-build | |||
74 | SUBST_SED.nokerb+= -e '\%<Policy kerberos>%,\%</Policy>%s/^/\#/' | |||
75 | SUBST_FILES.nokerb+= conf/cupsd.conf | |||
76 | SUBST_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" | |
81 | CONFIGURE_ARGS+= --enable-libusb | 75 | CONFIGURE_ARGS+= --enable-libusb | |
82 | MESSAGE_SRC+= ${PKGDIR}/MESSAGE.libusb | 76 | MESSAGE_SRC+= ${PKGDIR}/MESSAGE.libusb | |
83 | PLIST.libusb= yes | 77 | PLIST.libusb= yes | |
84 | .else | 78 | .else | |
85 | CONFIGURE_ARGS+= --disable-libusb | 79 | CONFIGURE_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" |
@@ -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 | |||
5 | PKGNAME= libcups-${CUPS_VERS} | 5 | PKGNAME= libcups-${CUPS_VERS} | |
6 | PKGREVISION= 5 | 6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/} | |
7 | MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/} | |||
8 | 7 | |||
9 | MAINTAINER= sbd@NetBSD.org | 8 | MAINTAINER= sbd@NetBSD.org | |
10 | COMMENT= Common UNIX Printing System library | 9 | COMMENT= Common UNIX Printing System library | |
11 | 10 | |||
12 | DISTINFO_FILE?= ${.CURDIR}/../../print/cups-base/distinfo | 11 | DISTINFO_FILE?= ${.CURDIR}/../../print/cups-base/distinfo | |
13 | PATCHDIR?= ${.CURDIR}/../../print/cups-base/patches | 12 | PATCHDIR?= ${.CURDIR}/../../print/cups-base/patches | |
14 | 13 | |||
15 | GITHUB_PROJECT= cups | 14 | GITHUB_PROJECT= cups | |
16 | GITHUB_RELEASE= v${PKGVERSION_NOREV} | 15 | GITHUB_RELEASE= v${PKGVERSION_NOREV} | |
17 | 16 | |||
18 | CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* | 17 | CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* | |
19 | 18 | |||
20 | WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} | 19 | WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} |
@@ -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 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.libcups | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.libcups | |
4 | PKG_SUPPORTED_OPTIONS= acl dnssd kerberos tcpwrappers | 4 | PKG_SUPPORTED_OPTIONS= acl dnssd kerberos tcpwrappers | |
5 | PKG_SUGGESTED_OPTIONS= dnssd kerberos | 5 | PKG_SUGGESTED_OPTIONS= dnssd kerberos | |
6 | 6 | |||
7 | .if defined(PKG_OPTIONS.cups) | 7 | .if defined(PKG_OPTIONS.cups) | |
8 | PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.cups} | 8 | PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.cups} | |
9 | PKG_OPTIONS_DEPRECATED_WARNINGS+= \ | 9 | PKG_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" | |
43 | CONFIGURE_ARGS+= --enable-dnssd | 43 | CONFIGURE_ARGS+= --enable-dnssd | |
44 | .else | 44 | .else | |
45 | CONFIGURE_ARGS+= --disable-dnssd | 45 | CONFIGURE_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" | |
50 | CONFIGURE_ARGS+= --enable-gssapi | 50 | CONFIGURE_ARGS+= --enable-gssapi | |
51 | .else | 51 | .else | |
52 | CONFIGURE_ARGS+= --disable-gssapi | 52 | CONFIGURE_ARGS+= --disable-gssapi | |
53 | # https://github.com/apple/cups/issues/4947 | |||
54 | SUBST_CLASSES+= nokerb | |||
55 | SUBST_STAGE.nokerb= post-build | |||
56 | SUBST_SED.nokerb+= -e '\%<Policy kerberos>%,\%</Policy>%s/^/\#/' | |||
57 | SUBST_FILES.nokerb+= conf/cupsd.conf | |||
58 | SUBST_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" | |
63 | CONFIGURE_ARGS+= --enable-tcp-wrappers | 57 | CONFIGURE_ARGS+= --enable-tcp-wrappers | |
64 | .else | 58 | .else | |
65 | CONFIGURE_ARGS+= --disable-tcp-wrappers | 59 | CONFIGURE_ARGS+= --disable-tcp-wrappers | |
66 | .endif | 60 | .endif |