head 1.8; access; symbols pkgsrc-2023Q4:1.8.0.10 pkgsrc-2023Q4-base:1.8 pkgsrc-2023Q3:1.8.0.8 pkgsrc-2023Q3-base:1.8 pkgsrc-2023Q2:1.8.0.6 pkgsrc-2023Q2-base:1.8 pkgsrc-2023Q1:1.8.0.4 pkgsrc-2023Q1-base:1.8 pkgsrc-2022Q4:1.8.0.2 pkgsrc-2022Q4-base:1.8 pkgsrc-2022Q3:1.6.0.4 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.2 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.5.0.10 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.8 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.6 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.4 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.2 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.4.0.2 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.3.0.20 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.18 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.14 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.16 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.12 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.10 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.8 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.6 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.4 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.2 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.1.0.4 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.2 pkgsrc-2017Q4-base:1.1; locks; strict; comment @# @; 1.8 date 2022.11.16.16.24.36; author hauke; state Exp; branches; next 1.7; commitid isD83C7clK1LGW1E; 1.7 date 2022.11.16.16.08.11; author hauke; state Exp; branches; next 1.6; commitid W2GCREZNVXpVyW1E; 1.6 date 2022.05.10.20.47.37; author markd; state Exp; branches; next 1.5; commitid OLgeWQ7zpYlBcyDD; 1.5 date 2021.01.04.14.32.17; author prlw1; state Exp; branches; next 1.4; commitid dMM3Iwt3QtTAWpCC; 1.4 date 2020.10.16.15.29.25; author prlw1; state Exp; branches; next 1.3; commitid d7y2pEUpQWhqQ8sC; 1.3 date 2018.06.25.10.01.51; author leot; state Exp; branches; next 1.2; commitid JZ9BbmtnCr0g9EHA; 1.2 date 2018.06.24.10.17.42; author bouyer; state Exp; branches; next 1.1; commitid j7hEKMKAAK9khwHA; 1.1 date 2017.11.12.14.10.15; author khorben; state Exp; branches; next ; commitid itF6QcdEeR8hJKeA; desc @@ 1.8 log @Fix tyop pkglint @ text @# $NetBSD: options.mk,v 1.7 2022/11/16 16:08:11 hauke Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cups-base PKG_SUPPORTED_OPTIONS= acl kerberos pam tcpwrappers PKG_SUGGESTED_OPTIONS= dnssd kerberos PKG_OPTIONS_OPTIONAL_GROUPS= mdns PKG_OPTIONS_GROUP.mdns= dnssd PLIST_VARS+= apple dbus dnssd dnssd-backend ippfind libusb pam .if defined(PKG_OPTIONS.cups) PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.cups} PKG_OPTIONS_DEPRECATED_WARNINGS+= \ "Deprecated variable PKG_OPTIONS.cups used, use ${PKG_OPTIONS_VAR} instead." .endif .if ${OPSYS} == "Darwin" PLIST.apple= yes PLIST.ippfind= yes .else # CUPS on Darwin does not support DBus and libusb PKG_SUPPORTED_OPTIONS+= dbus PKG_OPTIONS_GROUP.mdns+= avahi PKG_SUGGESTED_OPTIONS+= dbus # Neither DragonFly nor SunOS can build libusb1 . if ${OPSYS} != "DragonFly" && ${OPSYS} != "SunOS" PKG_SUPPORTED_OPTIONS+= libusb PKG_SUGGESTED_OPTIONS+= libusb . endif .endif .include "../../mk/bsd.options.mk" MESSAGE_SRC= ${PKGDIR}/MESSAGE .if !empty(PKG_OPTIONS:Macl) CONFIGURE_ARGS+= --enable-acl .else CONFIGURE_ARGS+= --disable-acl .endif .if !empty(PKG_OPTIONS:Mavahi) .include "../../net/avahi/buildlink3.mk" CONFIGURE_ARGS+= --with-dnssd=avahi PLIST.ippfind= yes PLIST.dnssd-backend= yes .endif .if !empty(PKG_OPTIONS:Mdnssd) .include "../../net/mDNSResponder/buildlink3.mk" CONFIGURE_ARGS+= --with-dnssd=mdnsresponder PLIST.dnssd= yes PLIST.dnssd-backend= yes PLIST.ippfind= yes .endif .if empty(PKG_OPTIONS:Mavahi) && empty(PKG_OPTIONS:Mdnssd) CONFIGURE_ARGS+= --with-dnssd=no .endif .if !empty(PKG_OPTIONS:Mdbus) . include "../../sysutils/dbus/buildlink3.mk" CONFIGURE_ARGS+= --enable-dbus PLIST.dbus= yes .else CONFIGURE_ARGS+= --disable-dbus .endif .if !empty(PKG_OPTIONS:Mkerberos) .include "../../mk/krb5.buildlink3.mk" CONFIGURE_ARGS+= --enable-gssapi .else CONFIGURE_ARGS+= --disable-gssapi .endif .if !empty(PKG_OPTIONS:Mlibusb) .include "../../devel/libusb1/buildlink3.mk" CONFIGURE_ARGS+= --enable-libusb MESSAGE_SRC+= ${PKGDIR}/MESSAGE.libusb PLIST.libusb= yes .else CONFIGURE_ARGS+= --disable-libusb .endif .if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --enable-pam MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam PLIST.pam= yes .else CONFIGURE_ARGS+= --disable-pam MESSAGE_SRC+= ${.CURDIR}/MESSAGE .endif .if !empty(PKG_OPTIONS:Mtcpwrappers) .include "../../security/tcp_wrappers/buildlink3.mk" CONFIGURE_ARGS+= --enable-tcp-wrappers .else CONFIGURE_ARGS+= --disable-tcp-wrappers .endif @ 1.7 log @When building without any mdns support on NetBSD (at least), configure will still find the base mdnssd, and build and install ippfind support. This will lead to a PLIST error -- as far as pkgsrc is concerned, we did not enable it. Tell configure explicitly to not add mdns support when we don't want any. While here, group mdnssd and avahi as optional and mutually exclusive. @ text @d1 1 a1 1 # $NetBSD: options.mk,v 1.6 2022/05/10 20:47:37 markd Exp $ d4 1 a4 1 PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers d8 1 a8 1 PKG_OPTIONS_GROUP.mdns= mdnssd d19 2 a20 2 PLIST.apple= yes PLIST.ippfind= yes d24 1 a24 1 PKG_OPTIONS_GROUP.mdns+= avahi @ 1.6 log @{cups,cups-base,libcups}: update to 2.4.1 Changes in CUPS v2.4.1 (27th January 2022) ------------------------------------------ - The default color mode now is now configurable and defaults to the printer's reported default mode - Configuration script now checks linking for -Wl,-pie flags - Fixed memory leaks - in testi18n, in `cups_enum_dests()`, in `_cupsEncodeOption()` and `http_tls_upgrade()` - Fixed missing bracket in de/index.html - Fixed typos in configuration scripts - Removed remaining legacy code for `RIP_MAX_CACHE` environment variable - Removed deprecated directives from cupsctl and cups-files.conf - Removed `purge-jobs` legacy code from CGI scripts and templates Changes in CUPS v2.4.0 (29th November 2021) ------------------------------------------- - Added configure option --with-idle-exit-timeout - Added --with-systemd-timeoutstartsec configure option - DigestOptions now are applied for MD5 Digest authentication defined by RFC 2069 as well - Fixed compilation on Solaris - Fixed and improved German translations Changes in CUPS v2.4rc1 (12th November 2021) -------------------------------------------- - Added warning and debug messages when loading printers if the queue is raw or with driver - Compilation now uses -fstack-protector-strong if available Changes in CUPS v2.4b1 (27th October 2021) ------------------------------------------ - Added support for CUPS running in a Snapcraft snap. - Added basic OAuth 2.0 client support - Added support for AirPrint and Mopria clients - Added configure support for specifying systemd dependencies in the CUPS service file - Added a JSON output mode for `ipptool`. - The `ipptool` command now correctly reports an error when a test file cannot be found. - CUPS library now uses thread safe `getpwnam_r` and `getpwuid_r` functions - Fixed Kerberos authentication for the web interface - The ZPL sample driver now supports more "standard" label sizes - Fixed reporting of printer instances when enumerating and when no options are set for the main instance - Reverted USB read limit enforcement change from CUPS 2.2.12 - The IPP backend did not return the correct status code when a job was canceled at the printer/server - The `testlang` unit test program now loops over all of the available locales by default - The `cupsfilter` command now shows error messages when options are used incorrectly - The PPD functions now treat boolean values as case-insensitive - Temporary queue names no longer end with an underscore - The USB backend now runs as root - Added pkg-config file for libcups - Fixed a PPD memory leak caused by emulator definitions - Fixed a `DISPLAY` bug in `ipptool` - The scheduler now includes the `[Job N]` prefix for job log messages, even when using syslog logging - Added support for locales using the GB18030 character set - `httpReconnect2` did not reset the socket file descriptor when the TLS negotiation failed - `httpUpdate` did not reset the socket file descriptor when the TLS negotiation failed - The IPP backend now retries Validate-Job requests - Now show better error messages when a driver interface program fails to provide a PPD file - Added dark mode support to the CUPS web interface - Added a workaround for Solaris in `httpAddrConnect2` - Fixed an interaction between `--remote-admin` and `--remote-any` for the `cupsctl` command - Now use a 60 second timeout for reading USB backchannel data - The USB backend now tries harder to find a serial number - Fixed `@@IF(name)` handling in `cupsd.conf` - Fixed documentation and added examples for CUPS' limited CGI support - Fixed the `lpc` command prompt - Now always pass "localhost" in the `Host:` header when talking over a domain socket or the loopback interface - Fixed a job history update issue in the scheduler - Fixed `job-pages-per-set` value for duplex print jobs. - Fixed an edge case in `ippReadIO` to make sure that only complete attributes and values are retained on an error - Hardened `ippReadIO` to prevent invalid IPP messages from being propagated - The scheduler now supports the "everywhere" model directly - Fixed some IPP Everywhere option mapping problems - Fixed support for "job-hold-until" with the Restart-Job operation - Fixed the default color/grayscale presets for IPP Everywhere PPDs - Fixed support for the 'offline-report' state for all USB backends - Documentation fixes - Localization updates - USB quirk updates - Web interface updates - The `ippeveprinter` tool now automatically uses an available port. - Fixed several Windows TLS and hashing issues. - Deprecated cups-config - Deprecated Kerberos (`AuthType Negotiate`) authentication - Removed support for the (long deprecated and unused) `FontPath`, `ListenBackLog`, `LPDConfigFile`, `KeepAliveTimeout`, `RIPCache`, and `SMBConfigFile` directives in `cupsd.conf` and `cups-files.conf`. - Stubbed out deprecated `httpMD5` functions. - Add test for undefined page ranges during printing. @ text @d1 1 a1 1 # $NetBSD: options.mk,v 1.5 2021/01/04 14:32:17 prlw1 Exp $ d3 3 a5 3 PKG_OPTIONS_VAR= PKG_OPTIONS.cups-base PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers PKG_SUGGESTED_OPTIONS= dnssd kerberos d7 4 a10 1 PLIST_VARS+= apple dbus dnssd dnssd-backend ippfind libusb pam d23 3 a25 2 PKG_SUPPORTED_OPTIONS+= avahi dbus PKG_SUGGESTED_OPTIONS+= dbus d28 2 a29 2 PKG_SUPPORTED_OPTIONS+= libusb PKG_SUGGESTED_OPTIONS+= libusb d50 12 a69 8 .if !empty(PKG_OPTIONS:Mdnssd) .include "../../net/mDNSResponder/buildlink3.mk" CONFIGURE_ARGS+= --with-dnssd=yes PLIST.dnssd= yes PLIST.dnssd-backend= yes PLIST.ippfind= yes .endif @ 1.5 log @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) @ text @d1 1 a1 1 # $NetBSD: options.mk,v 1.4 2020/10/16 15:29:25 prlw1 Exp $ d41 1 a41 1 CONFIGURE_ARGS+= --enable-avahi a43 2 .else CONFIGURE_ARGS+= --disable-avahi d56 1 a56 1 CONFIGURE_ARGS+= --enable-dnssd a59 2 .else CONFIGURE_ARGS+= --disable-dnssd @ 1.4 log @cups-base: build ippfind in the (on by default) dnssd case, not just avahi. missing pieces - thanks wiz! @ text @d1 1 a1 1 # $NetBSD: options.mk,v 1.3 2018/06/25 10:01:51 leot Exp $ a70 6 # https://github.com/apple/cups/issues/4947 SUBST_CLASSES+= nokerb SUBST_STAGE.nokerb= post-build SUBST_SED.nokerb+= -e '\%%,\%%s/^/\#/' SUBST_FILES.nokerb+= conf/cupsd.conf SUBST_MESSAGE.nokerb= Commenting out kerberos section in config. @ 1.3 log @cups-base: Rename PKG_OPTIONS.cups to PKG_OPTIONS.cups-base Using a PKG_OPTIONS_VAR that is different to PKGBASE is problematic when PKG_BUILD_OPTIONS is used. Deprecate the `cups' option (via PKG_LEGACY_OPTIONS so if `cups' is still used everything will continue to work) in favour of `cups-base'. Thanks to for pointing out this problem on tech-pkg@@ ML! @ text @d1 1 a1 1 # $NetBSD: options.mk,v 1.2 2018/06/24 10:17:42 bouyer Exp $ d61 1 @ 1.2 log @Fix PLIST for building with options avahi -dnssd as suggested by leot@@ @ text @d1 1 a1 1 # $NetBSD: options.mk,v 1.1 2017/11/12 14:10:15 khorben Exp $ d3 1 a3 1 PKG_OPTIONS_VAR= PKG_OPTIONS.cups d9 6 @ 1.1 log @Rename print/cups to print/cups-base to depend on cups-filters This change: - renames print/cups to print/cups-base, - lets print/cups-filters depend on print/cups-base instead of cups, - adds a package print/cups depending on print/cups-base and print/cups-filters. This makes sure installing print/cups always installs print/cups-filters, as it is necessary for being able to print outside of Mac OS X since CUPS 1.6.0. You're welcome. I do not think superseding is necessary, since print/cups will also install print/cups-base, which really is the same as before. In practice it is like a new dependency. I do not want to risk a bad "cvs import" either, sorry. Bumps PKGREVISION for print/cups and print/cups-filters, since they have new dependencies now. This is also necessary for everything else currently depending on print/cups; I will try to commit this right after this one. Tested on NetBSD/amd64, as reviewed on tech-pkg@@. No breakage observed, apologies if anything goes wrong. @ text @d1 1 a1 1 # $NetBSD: options.mk,v 1.21 2017/02/17 23:45:48 wiz Exp $ d7 1 a7 1 PLIST_VARS+= apple dbus dnssd ippfind libusb pam d37 1 d54 1 @