diff options
| author | markd <markd@pkgsrc.org> | 2022-05-10 20:47:37 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2022-05-10 20:47:37 +0000 |
| commit | 8d4bc36a96566599519ef03fd2b80036090ad7ad (patch) | |
| tree | 8b35e4327153706164445329b8825fdee60b1008 | |
| parent | f2973ac41835d32743e18c2a8a7cecf1246064d4 (diff) | |
| download | pkgsrc-8d4bc36a96566599519ef03fd2b80036090ad7ad.tar.gz | |
{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.
20 files changed, 269 insertions, 411 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index bf1b33f49cf..ddbcf3f5078 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.46 2021/12/08 16:02:31 adam Exp $ +# $NetBSD: Makefile,v 1.47 2022/05/10 20:47:37 markd Exp $ -PKGREVISION= 5 .include "../../print/cups/Makefile.common" PKGNAME= cups-base-${CUPS_VERS} @@ -32,9 +31,6 @@ CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q} CONFIGURE_ARGS+= --with-exe-file-perm=0755 CONFIGURE_ARGS+= --enable-libpaper -CONFIGURE_ARGS+= --enable-ssl -CONFIGURE_ARGS+= --enable-gnutls -CONFIGURE_ARGS+= --disable-cdsassl CONFIGURE_ARGS+= --without-bundledir CONFIGURE_ARGS+= --without-icondir CONFIGURE_ARGS+= --without-menudir diff --git a/print/cups-base/PLIST b/print/cups-base/PLIST index aadbbcf612a..32fbee12c08 100644 --- a/print/cups-base/PLIST +++ b/print/cups-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2020/10/16 15:29:25 prlw1 Exp $ +@comment $NetBSD: PLIST,v 1.7 2022/05/10 20:47:37 markd Exp $ bin/cancel bin/cupstestppd bin/ippeveprinter @@ -184,6 +184,7 @@ share/cups/ipptool/print-job-hold.test share/cups/ipptool/print-job-letter.test share/cups/ipptool/print-job-manual.test share/cups/ipptool/print-job-media-col.test +share/cups/ipptool/print-job-media-needed.test share/cups/ipptool/print-job-password.test share/cups/ipptool/print-job.test share/cups/ipptool/print-uri.test @@ -219,6 +220,71 @@ share/cups/templates/class.tmpl share/cups/templates/classes-header.tmpl share/cups/templates/classes.tmpl share/cups/templates/command.tmpl +share/cups/templates/da/add-class.tmpl +share/cups/templates/da/add-printer.tmpl +share/cups/templates/da/admin.tmpl +share/cups/templates/da/choose-device.tmpl +share/cups/templates/da/choose-make.tmpl +share/cups/templates/da/choose-model.tmpl +share/cups/templates/da/choose-serial.tmpl +share/cups/templates/da/choose-uri.tmpl +share/cups/templates/da/class-added.tmpl +share/cups/templates/da/class-confirm.tmpl +share/cups/templates/da/class-deleted.tmpl +share/cups/templates/da/class-jobs-header.tmpl +share/cups/templates/da/class-modified.tmpl +share/cups/templates/da/class.tmpl +share/cups/templates/da/classes-header.tmpl +share/cups/templates/da/classes.tmpl +share/cups/templates/da/command.tmpl +share/cups/templates/da/edit-config.tmpl +share/cups/templates/da/error-op.tmpl +share/cups/templates/da/error.tmpl +share/cups/templates/da/header.tmpl +share/cups/templates/da/help-header.tmpl +share/cups/templates/da/help-printable.tmpl +share/cups/templates/da/help-trailer.tmpl +share/cups/templates/da/job-cancel.tmpl +share/cups/templates/da/job-hold.tmpl +share/cups/templates/da/job-move.tmpl +share/cups/templates/da/job-moved.tmpl +share/cups/templates/da/job-release.tmpl +share/cups/templates/da/job-restart.tmpl +share/cups/templates/da/jobs-header.tmpl +share/cups/templates/da/jobs.tmpl +share/cups/templates/da/list-available-printers.tmpl +share/cups/templates/da/modify-class.tmpl +share/cups/templates/da/modify-printer.tmpl +share/cups/templates/da/norestart.tmpl +share/cups/templates/da/option-boolean.tmpl +share/cups/templates/da/option-conflict.tmpl +share/cups/templates/da/option-header.tmpl +share/cups/templates/da/option-pickmany.tmpl +share/cups/templates/da/option-pickone.tmpl +share/cups/templates/da/option-trailer.tmpl +share/cups/templates/da/pager.tmpl +share/cups/templates/da/printer-accept.tmpl +share/cups/templates/da/printer-added.tmpl +share/cups/templates/da/printer-cancel-jobs.tmpl +share/cups/templates/da/printer-configured.tmpl +share/cups/templates/da/printer-confirm.tmpl +share/cups/templates/da/printer-default.tmpl +share/cups/templates/da/printer-deleted.tmpl +share/cups/templates/da/printer-jobs-header.tmpl +share/cups/templates/da/printer-modified.tmpl +share/cups/templates/da/printer-reject.tmpl +share/cups/templates/da/printer-start.tmpl +share/cups/templates/da/printer-stop.tmpl +share/cups/templates/da/printer.tmpl +share/cups/templates/da/printers-header.tmpl +share/cups/templates/da/printers.tmpl +share/cups/templates/da/restart.tmpl +share/cups/templates/da/search.tmpl +share/cups/templates/da/set-printer-options-header.tmpl +share/cups/templates/da/set-printer-options-trailer.tmpl +share/cups/templates/da/test-page.tmpl +share/cups/templates/da/trailer.tmpl +share/cups/templates/da/users.tmpl share/cups/templates/de/add-class.tmpl share/cups/templates/de/add-printer.tmpl share/cups/templates/de/admin.tmpl @@ -663,14 +729,15 @@ share/doc/cups/README.md share/doc/cups/apple-touch-icon.png share/doc/cups/cups-printable.css share/doc/cups/cups.css +share/doc/cups/da/index.html share/doc/cups/de/index.html share/doc/cups/es/index.html +share/doc/cups/fr/index.html share/doc/cups/help/accounting.html share/doc/cups/help/admin.html share/doc/cups/help/api-admin.html share/doc/cups/help/api-filter.html share/doc/cups/help/api-ppd.html -share/doc/cups/help/api-raster.html share/doc/cups/help/cgi.html share/doc/cups/help/cupspm.html share/doc/cups/help/encryption.html @@ -738,22 +805,15 @@ share/doc/cups/help/spec-ppd.html share/doc/cups/help/spec-raster.html share/doc/cups/help/spec-stp.html share/doc/cups/help/translation.html -share/doc/cups/images/color-wheel.png share/doc/cups/images/cups-block-diagram.png share/doc/cups/images/cups-command-chain.png -share/doc/cups/images/cups-icon.png share/doc/cups/images/cups-postscript-chain.png share/doc/cups/images/cups-raster-chain.png share/doc/cups/images/cups.png -share/doc/cups/images/generic.png -share/doc/cups/images/left.gif share/doc/cups/images/raster-organization.png share/doc/cups/images/raster.png -share/doc/cups/images/right.gif share/doc/cups/images/sample-image.png -share/doc/cups/images/sel.gif share/doc/cups/images/smiley.jpg -share/doc/cups/images/unsel.gif share/doc/cups/images/wait.gif share/doc/cups/index.html share/doc/cups/ja/index.html diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo index 33a6b723b8d..54cd822bc44 100644 --- a/print/cups-base/distinfo +++ b/print/cups-base/distinfo @@ -1,28 +1,22 @@ -$NetBSD: distinfo,v 1.30 2021/10/26 11:12:04 nia Exp $ +$NetBSD: distinfo,v 1.31 2022/05/10 20:47:37 markd Exp $ -BLAKE2s (cups-2.3.3op2-source.tar.gz) = 7ecaf87824cbc49d092c65530dcb1471ca24322cdfbdb893664d9986faed85dd -SHA512 (cups-2.3.3op2-source.tar.gz) = db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117 -Size (cups-2.3.3op2-source.tar.gz) = 7993205 bytes +BLAKE2s (cups-2.4.1-source.tar.gz) = cb4872d4f7dec1c2cbad871053cc31354769cde1f9b30deb17ec3cb3dd9407b2 +SHA512 (cups-2.4.1-source.tar.gz) = 74e83728fcc3baf709176442b26711250fd4d4ede1e81e35b02a5607711067e28cd5a05d5bc3337953f6b2236c5a429b13f3a7f1218a08a2d3c30a8c9b0d96fd +Size (cups-2.4.1-source.tar.gz) = 8113914 bytes SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881 SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2 -SHA1 (patch-airprint-conf_mime.convs.in) = e0813b7e1da2337191bc6bfc2a6888f4173b8717 -SHA1 (patch-airprint-scheduler_conf.c) = 504e752c1699049cdbe11d8b04814670ddda81d4 -SHA1 (patch-airprint-scheduler_dirsvc.c) = b861ee4cacb110c755e22c8a691b064a6553019d -SHA1 (patch-airprint-scheduler_printers.c) = 027b9b1515ba0fc472f6d3c5308d35849ac5ae3b SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393 SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e -SHA1 (patch-config-scripts_cups-compiler.m4) = 71c706121fdf7db699a9b9365ac63779e3c23f67 -SHA1 (patch-config-scripts_cups-directories.m4) = ccc795b12064e15b8c325ef39e3b4adfabed407a -SHA1 (patch-config-scripts_cups-gssapi.m4) = 965e54194de9f34f0f252f4993dcf8a8db935003 -SHA1 (patch-config-scripts_cups-libtool.m4) = d255bda2b740a04167e20be1662e3b9c242ed8f2 +SHA1 (patch-config-scripts_cups-compiler.m4) = 5446340c9b4976b0814a72e680025f5cab5da54a +SHA1 (patch-config-scripts_cups-directories.m4) = 272a10e2ae70c589a65d73fe788f62fcbb2392b0 +SHA1 (patch-config-scripts_cups-gssapi.m4) = 8ccde86c99ad5ce96c38ec0c2f76a99dc7f29331 SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df -SHA1 (patch-cups_http-addrlist.c) = aa2524ee1c11450cfa3a46b1aa34c12417322241 +SHA1 (patch-cups_http-addrlist.c) = b8558e6c9a646299e16d7d47ab43bc79f1a0baa0 SHA1 (patch-cups_thread.c) = 453f8bd9e13b7b824cc7add75ea9ef49b8e0c991 -SHA1 (patch-cups_versioning.h) = 51bfad8f0d399d5087e05773e002e4ab17f00f1c SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876 SHA1 (patch-man-cups-files.conf.man.in) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821 -SHA1 (patch-scheduler-conf.c) = 1e3e116b6a0b5696656afe259ed48f6274ff6b57 +SHA1 (patch-scheduler-conf.c) = 3e8dda2dc04c31a58a902c70161724a57bdc3e43 SHA1 (patch-scheduler-conf.h) = cd5c49579795c69b50abbff2b0f9604ffe8bfa5a SHA1 (patch-scheduler-main.c) = a5410c7f78756506d23d705dfa93a756fe3e513e SHA1 (patch-scheduler_auth.c) = 686b26286b7ad88363ddc7b394aefbfb3ad26c2d diff --git a/print/cups-base/options.mk b/print/cups-base/options.mk index ebed4ac198a..054a77245ed 100644 --- a/print/cups-base/options.mk +++ b/print/cups-base/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2021/01/04 14:32:17 prlw1 Exp $ +# $NetBSD: options.mk,v 1.6 2022/05/10 20:47:37 markd Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cups-base PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers @@ -38,11 +38,9 @@ CONFIGURE_ARGS+= --disable-acl .if !empty(PKG_OPTIONS:Mavahi) .include "../../net/avahi/buildlink3.mk" -CONFIGURE_ARGS+= --enable-avahi +CONFIGURE_ARGS+= --with-dnssd=avahi PLIST.ippfind= yes PLIST.dnssd-backend= yes -.else -CONFIGURE_ARGS+= --disable-avahi .endif .if !empty(PKG_OPTIONS:Mdbus) @@ -55,12 +53,10 @@ CONFIGURE_ARGS+= --disable-dbus .if !empty(PKG_OPTIONS:Mdnssd) .include "../../net/mDNSResponder/buildlink3.mk" -CONFIGURE_ARGS+= --enable-dnssd +CONFIGURE_ARGS+= --with-dnssd=yes PLIST.dnssd= yes PLIST.dnssd-backend= yes PLIST.ippfind= yes -.else -CONFIGURE_ARGS+= --disable-dnssd .endif .if !empty(PKG_OPTIONS:Mkerberos) diff --git a/print/cups-base/patches/patch-airprint-conf_mime.convs.in b/print/cups-base/patches/patch-airprint-conf_mime.convs.in deleted file mode 100644 index 38d4aba4d42..00000000000 --- a/print/cups-base/patches/patch-airprint-conf_mime.convs.in +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-airprint-conf_mime.convs.in,v 1.2 2020/05/26 08:36:56 triaxx Exp $ - -From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001 -From: Till Kamppeter <till.kamppeter@gmail.com> -Date: Tue, 9 Aug 2016 18:11:29 +0200 -Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod - Touch to a CUPS server) - -Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495 -Bug-Debian: http://bugs.debian.org/700961 -Bug: https://cups.org/str.php?L4341 -Last-Update: 2015-02-10 - -Patch-Name: airprint-support.patch ---- - conf/mime.convs.in | 3 +++ - conf/mime.types | 3 +++ - scheduler/conf.c | 2 +- - scheduler/dirsvc.c | 6 ++++++ - scheduler/printers.c | 4 +++- - 5 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/conf/mime.convs.in b/conf/mime.convs.in -index bffd04f84..33ce812e3 100644 ---- conf/mime.convs.in.orig -+++ conf/mime.convs.in -@@ -44,6 +44,9 @@ application/postscript application/vnd.cups-postscript 66 pstops - application/vnd.cups-raster image/pwg-raster 100 rastertopwg - application/vnd.cups-raster image/urf 100 rastertopwg - -+# Needed for printing from iOS (AirPrint) clients -+image/urf application/pdf 100 - -+ - ######################################################################## - # - # Raw filter... diff --git a/print/cups-base/patches/patch-airprint-scheduler_conf.c b/print/cups-base/patches/patch-airprint-scheduler_conf.c deleted file mode 100644 index d7f7c35a3cb..00000000000 --- a/print/cups-base/patches/patch-airprint-scheduler_conf.c +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-airprint-scheduler_conf.c,v 1.2 2019/11/17 21:22:03 leot Exp $ - -From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001 -From: Till Kamppeter <till.kamppeter@gmail.com> -Date: Tue, 9 Aug 2016 18:11:29 +0200 -Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod - Touch to a CUPS server) - -Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495 -Bug-Debian: http://bugs.debian.org/700961 -Bug: https://cups.org/str.php?L4341 -Last-Update: 2015-02-10 - -Patch-Name: airprint-support.patch ---- - conf/mime.convs.in | 3 +++ - conf/mime.types | 3 +++ - scheduler/conf.c | 2 +- - scheduler/dirsvc.c | 6 ++++++ - scheduler/printers.c | 4 +++- - 5 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/scheduler/conf.c b/scheduler/conf.c -index 9c1be7089..52f2a6d35 100644 ---- scheduler/conf.c.orig -+++ scheduler/conf.c -@@ -745,7 +745,7 @@ cupsdReadConfiguration(void) - DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED; - - #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -- cupsdSetString(&DNSSDSubTypes, "_cups,_print"); -+ cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal"); - cupsdClearString(&DNSSDHostName); - #endif /* HAVE_DNSSD || HAVE_AVAHI */ - diff --git a/print/cups-base/patches/patch-airprint-scheduler_dirsvc.c b/print/cups-base/patches/patch-airprint-scheduler_dirsvc.c deleted file mode 100644 index 8fcc7fa87e7..00000000000 --- a/print/cups-base/patches/patch-airprint-scheduler_dirsvc.c +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-airprint-scheduler_dirsvc.c,v 1.2 2020/05/26 08:36:56 triaxx Exp $ - -From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001 -From: Till Kamppeter <till.kamppeter@gmail.com> -Date: Tue, 9 Aug 2016 18:11:29 +0200 -Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod - Touch to a CUPS server) - -Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495 -Bug-Debian: http://bugs.debian.org/700961 -Bug: https://cups.org/str.php?L4341 -Last-Update: 2015-02-10 - -Patch-Name: airprint-support.patch ---- - conf/mime.convs.in | 3 +++ - conf/mime.types | 3 +++ - scheduler/conf.c | 2 +- - scheduler/dirsvc.c | 6 ++++++ - scheduler/printers.c | 4 +++- - 5 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c -index 3dab90ca9..f21942af3 100644 ---- scheduler/dirsvc.c.orig -+++ scheduler/dirsvc.c -@@ -440,6 +440,12 @@ dnssdBuildTxtRecord( - keyvalue[count ][0] = "pdl"; - keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript"; - -+ /* iOS 6 does not accept this printer as AirPrint printer if there is -+ no URF txt record or "URF=none", "DM3" is the minimum needed found -+ by try and error */ -+ keyvalue[count ][0] = "URF"; -+ keyvalue[count++][1] = "DM3"; -+ - if (get_auth_info_required(p, air_str, sizeof(air_str))) - { - keyvalue[count ][0] = "air"; diff --git a/print/cups-base/patches/patch-airprint-scheduler_printers.c b/print/cups-base/patches/patch-airprint-scheduler_printers.c deleted file mode 100644 index 825ec066327..00000000000 --- a/print/cups-base/patches/patch-airprint-scheduler_printers.c +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-airprint-scheduler_printers.c,v 1.3 2020/01/29 22:56:50 prlw1 Exp $ - -From debian: -From 7147c814439aafb26ff0262a7d6b8ef56d20969f Mon Sep 17 00:00:00 2001 -From: Till Kamppeter <till.kamppeter@gmail.com> -Date: Tue, 9 Aug 2016 18:11:04 +0200 -Subject: For PWG Raster, add required IPP attributes - -Add required by IPP Everywhere for PWG Raster when PWG Raster as input format -is supported - -Bug-Upstream: https://www.cups.org/str.php?L4428 -Last-Update: 2015-02-10 -Patch-Name: pwg-raster-attributes.patch - -First two hunks of that patch are no longer needed: -https://github.com/apple/cups/issues/5641 ---- - scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 76 insertions(+), 1 deletion(-) - -diff --git a/scheduler/printers.c b/scheduler/printers.c -index bb99907ad..a0ebcbd3e 100644 ---- scheduler/printers.c.orig 2019-11-17 12:21:47.966025953 +0000 -+++ scheduler/printers.c -@@ -3731,7 +3806,9 @@ add_printer_formats(cupsd_printer_t *p) - } - else if (!_cups_strcasecmp(type->super, "image")) - { -- if (!_cups_strcasecmp(type->type, "jpeg")) -+ if (!_cups_strcasecmp(type->type, "urf")) -+ strlcat(pdl, "image/urf,", sizeof(pdl)); -+ else if (!_cups_strcasecmp(type->type, "jpeg")) - strlcat(pdl, "image/jpeg,", sizeof(pdl)); - else if (!_cups_strcasecmp(type->type, "png")) - strlcat(pdl, "image/png,", sizeof(pdl)); diff --git a/print/cups-base/patches/patch-config-scripts_cups-compiler.m4 b/print/cups-base/patches/patch-config-scripts_cups-compiler.m4 index 075b2f66d33..16a820a7d87 100644 --- a/print/cups-base/patches/patch-config-scripts_cups-compiler.m4 +++ b/print/cups-base/patches/patch-config-scripts_cups-compiler.m4 @@ -1,42 +1,33 @@ -$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.3 2020/05/26 08:36:56 triaxx Exp $ +$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.4 2022/05/10 20:47:37 markd Exp $ Disable SSP checks, leave pkgsrc to enable/disable it. PIE needs to be tested with linking. ---- config-scripts/cups-compiler.m4.orig 2017-11-01 14:57:53.000000000 +0000 +--- config-scripts/cups-compiler.m4.orig 2022-01-27 11:11:42.000000000 +0000 +++ config-scripts/cups-compiler.m4 -@@ -129,12 +129,13 @@ if test -n "$GCC"; then - AC_MSG_CHECKING(whether compiler supports -fstack-protector) - OLDCFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fstack-protector" -- AC_TRY_LINK(,, -+ AC_TRY_LINK(, [return 0;], - if test "x$LSB_BUILD" = xy; then - # Can't use stack-protector with LSB binaries... -- OPTIM="$OPTIM -fno-stack-protector" -+ : OPTIM="$OPTIM -fno-stack-protector" - else -- OPTIM="$OPTIM -fstack-protector" -+ : OPTIM="$OPTIM -fstack-protector" -+ : LIBS="$LIBS $LIBS_SSP" - fi - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) -@@ -151,7 +152,7 @@ if test -n "$GCC"; then - case "$host_os_name" in - darwin*) - CFLAGS="$CFLAGS -fPIE -Wl,-pie" -- AC_TRY_COMPILE(,,[ -+ AC_TRY_LINK(,,[ - PIEFLAGS="-fPIE -Wl,-pie" - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no)) -@@ -159,7 +160,7 @@ if test -n "$GCC"; then - - *) - CFLAGS="$CFLAGS -fPIE -pie" -- AC_TRY_COMPILE(,,[ -+ AC_TRY_LINK(,,[ - PIEFLAGS="-fPIE -pie" - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no)) +@@ -131,14 +131,14 @@ AS_IF([test -n "$GCC"], [ + OLDCFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fstack-protector-strong" + AC_LINK_IFELSE([AC_LANG_PROGRAM()], [ +- OPTIM="$OPTIM -fstack-protector-strong" ++ : OPTIM="$OPTIM -fstack-protector-strong" + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([no]) + AC_MSG_CHECKING([whether compiler supports -fstack-protector]) + CFLAGS="$OLDCFLAGS -fstack-protector" + AC_LINK_IFELSE([AC_LANG_PROGRAM()], [ +- OPTIM="$OPTIM -fstack-protector" ++ : OPTIM="$OPTIM -fstack-protector" + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([no]) +@@ -164,7 +164,7 @@ AS_IF([test -n "$GCC"], [ + ]) + ], [*], [ + CFLAGS="$CFLAGS -fPIE -pie" +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ ++ AC_LINK_IFELSE([AC_LANG_PROGRAM()], [ + PIEFLAGS="-fPIE -pie" + AC_MSG_RESULT([yes]) + ], [ diff --git a/print/cups-base/patches/patch-config-scripts_cups-directories.m4 b/print/cups-base/patches/patch-config-scripts_cups-directories.m4 index 58064de51b5..94320c9af64 100644 --- a/print/cups-base/patches/patch-config-scripts_cups-directories.m4 +++ b/print/cups-base/patches/patch-config-scripts_cups-directories.m4 @@ -1,4 +1,4 @@ -$NetBSD: patch-config-scripts_cups-directories.m4,v 1.3 2021/03/14 08:43:31 wiz Exp $ +$NetBSD: patch-config-scripts_cups-directories.m4,v 1.4 2022/05/10 20:47:37 markd Exp $ The '$' while loops expand the variables as long as possible so that no references to other variables occur. This is necessary because fontpath @@ -9,22 +9,22 @@ loop. I'm also sure that this is not the Right Way to fix it, but at least it works. ---- config-scripts/cups-directories.m4.orig 2021-02-01 21:10:25.000000000 +0000 +--- config-scripts/cups-directories.m4.orig 2022-01-27 11:11:42.000000000 +0000 +++ config-scripts/cups-directories.m4 -@@ -97,7 +97,7 @@ dnl Fix "libdir" variable... - if test "$libdir" = "\${exec_prefix}/lib"; then - case "$host_os_name" in - linux*) -- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then -+ if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot && false; then - libdir="$exec_prefix/lib64" - fi - ;; -@@ -174,7 +174,15 @@ AC_SUBST(CUPS_CACHEDIR) +@@ -95,7 +95,7 @@ AS_IF([test "$sysconfdir" = "\${prefix}/ + dnl Fix "libdir" variable... + AS_IF([test "$libdir" = "\${exec_prefix}/lib"], [ + AS_CASE(["$host_os_name"], [linux*], [ +- AS_IF([test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot], [ ++ AS_IF([test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot && false], [ + libdir="$exec_prefix/lib64" + ], [ + libdir="$exec_prefix/lib" +@@ -132,7 +132,15 @@ AC_SUBST([CUPS_CACHEDIR]) # Data files CUPS_DATADIR="$datadir/cups" --AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups") +-AC_DEFINE_UNQUOTED([CUPS_DATADIR], ["$datadir/cups"], [Location of data files.]) +done=no +while test $done = no; do + case "$CUPS_DATADIR" in @@ -33,41 +33,40 @@ works. + esac +done + -+AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$CUPS_DATADIR") - AC_SUBST(CUPS_DATADIR) ++AC_DEFINE_UNQUOTED([CUPS_DATADIR], ["$CUPS_DATADIR"], [Location of data files.]) + AC_SUBST([CUPS_DATADIR]) # Icon directory -@@ -183,7 +191,11 @@ AC_ARG_WITH(icondir, [ --with-icondir - if test "x$icondir" = x -a -d /usr/share/icons; then - ICONDIR="/usr/share/icons" - else -- ICONDIR="$icondir" -+ if test "x$icondir" = xno; then -+ ICONDIR="" -+ else -+ ICONDIR="$icondir" -+ fi - fi - - AC_SUBST(ICONDIR) -@@ -194,7 +206,11 @@ AC_ARG_WITH(menudir, [ --with-menudir - if test "x$menudir" = x -a -d /usr/share/applications; then - MENUDIR="/usr/share/applications" - else -- MENUDIR="$menudir" -+ if test "x$menudir" = xno; then -+ MENUDIR="" -+ else -+ MENUDIR="$menudir" -+ fi - fi - - AC_SUBST(MENUDIR) -@@ -209,7 +225,15 @@ else - CUPS_DOCROOT="$docdir" - fi - --AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir") +@@ -145,7 +153,11 @@ AC_ARG_WITH([icondir], AS_HELP_STRING([- + AS_IF([test "x$icondir" = x], [ + ICONDIR="/usr/share/icons" + ], [ +- ICONDIR="$icondir" ++ if test "x$icondir" = xno; then ++ ICONDIR="" ++ else ++ ICONDIR="$icondir" ++ fi + ]) + + AC_SUBST([ICONDIR]) +@@ -160,6 +172,11 @@ AC_ARG_WITH([menudir], AS_HELP_STRING([- + AS_IF([test "x$menudir" = x], [ + MENUDIR="/usr/share/applications" + ], [ ++ if test "x$menudir" = xno; then ++ MENUDIR="" ++ else ++ MENUDIR="$menudir" ++ fi + MENUDIR="$menudir" + ]) + +@@ -179,7 +196,15 @@ AS_IF([test x$docdir = x], [ + CUPS_DOCROOT="$docdir" + ]) + +-AC_DEFINE_UNQUOTED([CUPS_DOCROOT], ["$docdir"], [Location of documentation files.]) +done=no +while test $done = no; do + case "$CUPS_DOCROOT" in @@ -76,31 +75,13 @@ works. + esac +done + -+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$CUPS_DOCROOT") - AC_SUBST(CUPS_DOCROOT) - - # Fonts -@@ -221,8 +245,16 @@ else - CUPS_FONTPATH="$fontpath" - fi - --AC_SUBST(CUPS_FONTPATH) -+done=no -+while test $done = no; do -+ case "$CUPS_FONTPATH" in -+ *'$'*) eval "CUPS_FONTPATH=$CUPS_FONTPATH";; -+ *) done=yes;; -+ esac -+done -+ - AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH") -+AC_SUBST(CUPS_FONTPATH) ++AC_DEFINE_UNQUOTED([CUPS_DOCROOT], ["$CUPS_DOCROOT"], [Location of documentation files.]) + AC_SUBST([CUPS_DOCROOT]) # Locale data - if test "$localedir" = "\${datarootdir}/locale"; then -@@ -240,6 +272,14 @@ else - CUPS_LOCALEDIR="$localedir" - fi +@@ -194,6 +219,14 @@ AS_IF([test "$localedir" = "\${datarootd + CUPS_LOCALEDIR="$localedir" + ]) +done=no +while test $done = no; do @@ -110,49 +91,46 @@ works. + esac +done + - AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR") - AC_SUBST(CUPS_LOCALEDIR) - -@@ -248,7 +288,6 @@ AC_ARG_WITH(logdir, [ --with-logdir + AC_DEFINE_UNQUOTED([CUPS_LOCALEDIR], ["$CUPS_LOCALEDIR"], [Location of localization files.]) + AC_SUBST([CUPS_LOCALEDIR]) - if test x$logdir = x; then - CUPS_LOGDIR="$localstatedir/log/cups" -- AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups") - else - CUPS_LOGDIR="$logdir" - fi -@@ -257,10 +296,13 @@ AC_SUBST(CUPS_LOGDIR) +@@ -232,10 +265,18 @@ AC_SUBST([CUPS_LOGDIR]) # Longer-term spool data CUPS_REQUESTS="$localstatedir/spool/cups" --AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups") -+AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$CUPS_REQUESTS") - AC_SUBST(CUPS_REQUESTS) +-AC_DEFINE_UNQUOTED([CUPS_REQUESTS], ["$localstatedir/spool/cups"], [Location of spool directory.]) ++AC_DEFINE_UNQUOTED([CUPS_REQUESTS], ["$CUPS_REQUESTS"], [Location of spool directory.]) + AC_SUBST([CUPS_REQUESTS]) # Server executables... -+AC_ARG_WITH(serverbindir, [ --with-serverbindir set path for server helper programs],serverbindir="$withval",serverbindir="") ++AC_ARG_WITH([serverbindir], AS_HELP_STRING([--with-serverbindir], [set path for server helper programs]), [ ++ serverbindir="$withval" ++], [ ++ serverbindir="" ++]) + +if test x$serverbindir = x; then - case "$host_os_name" in - *-gnu) - # GNUs -@@ -278,6 +320,10 @@ case "$host_os_name" in - CUPS_SERVERBIN="$exec_prefix/lib/cups" - ;; - esac ++ + AS_CASE(["$host_os_name"], [*-gnu], [ + # GNUs + INSTALL_SYSV="install-sysv" +@@ -250,13 +291,18 @@ AS_CASE(["$host_os_name"], [*-gnu], [ + CUPS_SERVERBIN="$exec_prefix/lib/cups" + ]) + +else + INSTALL_SYSV="" + CUPS_SERVERBIN="$serverbindir" +fi - - AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN") - AC_SUBST(CUPS_SERVERBIN) -@@ -285,7 +331,7 @@ AC_SUBST(INSTALL_SYSV) ++ + AC_DEFINE_UNQUOTED([CUPS_SERVERBIN], ["$CUPS_SERVERBIN"], [Location of server programs.]) + AC_SUBST([CUPS_SERVERBIN]) + AC_SUBST([INSTALL_SYSV]) # Configuration files CUPS_SERVERROOT="$sysconfdir/cups" --AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups") -+AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT") - AC_SUBST(CUPS_SERVERROOT) +-AC_DEFINE_UNQUOTED([CUPS_SERVERROOT], ["$sysconfdir/cups"], [Location of server configuration files.]) ++AC_DEFINE_UNQUOTED([CUPS_SERVERROOT], ["$CUPS_SERVERROOT"], [Location of server configuration files.]) + AC_SUBST([CUPS_SERVERROOT]) # Transient run-time state diff --git a/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 b/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 index 0922db8086d..c96e6e17aba 100644 --- a/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 +++ b/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 @@ -1,36 +1,49 @@ -$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.2 2020/05/26 08:36:56 triaxx Exp $ +$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.3 2022/05/10 20:47:37 markd Exp $ builtin krb5-config in platforms such as solaris do not support the gssapi option, and need an explicit -lgss ---- config-scripts/cups-gssapi.m4.orig 2017-06-30 15:44:38.000000000 +0000 +--- config-scripts/cups-gssapi.m4.orig 2022-01-27 11:11:42.000000000 +0000 +++ config-scripts/cups-gssapi.m4 -@@ -30,19 +30,18 @@ if test x$enable_gssapi != xno; then - AC_MSG_RESULT(no) - fi - ;; -- sunos*) -- # Solaris has a non-standard krb5-config, don't use it! -- AC_CHECK_LIB(gss, gss_display_status, -- AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available]) -+ *) -+ # make sure krb5-config supports gssapi option -+ if $KRB5CONFIG --cflags gssapi 2>&1 | grep "Unknown option" > /dev/null ; then - CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS" - CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS" -- LIBGSSAPI="-lgss `$KRB5CONFIG --libs`") -- ;; -- *) -+ LIBGSSAPI="-lgss `$KRB5CONFIG --libs`" -+ else - # Other platforms just ask for GSSAPI -- CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS" -- CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS" -- LIBGSSAPI="`$KRB5CONFIG --libs gssapi`" -+ CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS" -+ CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS" -+ LIBGSSAPI="`$KRB5CONFIG --libs gssapi`" -+ fi - ;; - esac - AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available]) +@@ -30,31 +30,22 @@ AS_IF([test x$enable_gssapi = xyes], [ + ], [ + AC_MSG_RESULT([no]) + ]) +- ], [sunos*], [ +- # Solaris has a non-standard krb5-config, don't use it! +- SAVELIBS="$LIBS" +- AC_CHECK_LIB([gss], [gss_display_status], [ +- AC_DEFINE([HAVE_GSSAPI], [1], [Is GSSAPI available?]) +- AS_IF([test "x$KRB5CONFIG" != x], [ +- CFLAGS="$($KRB5CONFIG --cflags) $CFLAGS" +- CPPFLAGS="$($KRB5CONFIG --cflags) $CPPFLAGS" +- LIBGSSAPI="-lgss $($KRB5CONFIG --libs)" +- ], [ +- LIBGSSAPI="-lgss" +- ]) +- ], [ +- AC_MSG_ERROR([--enable-gssapi specified but GSSAPI library cannot be found.]) +- ]) +- LIBS="$SAVELIBS" + ], [*], [ + # Other platforms just ask for GSSAPI + AS_IF([test "x$KRB5CONFIG" = x], [ + AC_MSG_ERROR([--enable-gssapi specified but krb5-config cannot be found.]) + ], [ + AC_DEFINE([HAVE_GSSAPI], [1], [Is GSSAPI available?]) +- CFLAGS="$($KRB5CONFIG --cflags gssapi) $CFLAGS" +- CPPFLAGS="$($KRB5CONFIG --cflags gssapi) $CPPFLAGS" +- LIBGSSAPI="$($KRB5CONFIG --libs gssapi)" ++ # make sure krb5-config supports gssapi option ++ AS_IF([$KRB5CONFIG --cflags gssapi 2>&1 | grep "Unknown option" > /dev/null], [ ++ CFLAGS="$($KRB5CONFIG --cflags) $CFLAGS" ++ CPPFLAGS="$($KRB5CONFIG --cflags) $CPPFLAGS" ++ LIBGSSAPI="-lgss $($KRB5CONFIG --libs)" ++ ], [ ++ CFLAGS="$($KRB5CONFIG --cflags gssapi) $CFLAGS" ++ CPPFLAGS="$($KRB5CONFIG --cflags gssapi) $CPPFLAGS" ++ LIBGSSAPI="$($KRB5CONFIG --libs gssapi)" ++ ]) + ]) + ]) + diff --git a/print/cups-base/patches/patch-config-scripts_cups-libtool.m4 b/print/cups-base/patches/patch-config-scripts_cups-libtool.m4 deleted file mode 100644 index 0025f7c072d..00000000000 --- a/print/cups-base/patches/patch-config-scripts_cups-libtool.m4 +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-config-scripts_cups-libtool.m4,v 1.2 2020/05/26 08:36:56 triaxx Exp $ - -Fix non-portable `==' test(1) operator. - ---- config-scripts/cups-libtool.m4.orig 2017-10-13 18:22:26.000000000 +0000 -+++ config-scripts/cups-libtool.m4 -@@ -10,7 +10,7 @@ dnl - AC_ARG_ENABLE(libtool_unsupported, [ --enable-libtool-unsupported=/path/to/libtool - build with libtool (UNSUPPORTED!)], - [if test x$enable_libtool_unsupported != xno; then -- if test x$enable_libtool_unsupported == xyes; then -+ if test x$enable_libtool_unsupported = xyes; then - AC_MSG_ERROR([Use --enable-libtool-unsupported=/path/to/libtool.]) - fi - LIBTOOL="$enable_libtool_unsupported" diff --git a/print/cups-base/patches/patch-cups_http-addrlist.c b/print/cups-base/patches/patch-cups_http-addrlist.c index f7c14199ea8..4130d9e6eb8 100644 --- a/print/cups-base/patches/patch-cups_http-addrlist.c +++ b/print/cups-base/patches/patch-cups_http-addrlist.c @@ -1,4 +1,4 @@ -$NetBSD: patch-cups_http-addrlist.c,v 1.1 2020/05/14 19:45:50 joerg Exp $ +$NetBSD: patch-cups_http-addrlist.c,v 1.2 2022/05/10 20:47:37 markd Exp $ Checkout for non-blocking connect is difficult as systems can't agree on whether it is a write condition or an error. Check for both with @@ -6,9 +6,9 @@ poll/select and if either flag is set, use getpeername to determine if the socket was really connected. If it wasn't, drop it correctly from the poll event list as well as to not check stale event masks. ---- cups/http-addrlist.c.orig 2020-05-09 14:07:20.638266583 +0000 +--- cups/http-addrlist.c.orig 2022-01-27 11:11:42.000000000 +0000 +++ cups/http-addrlist.c -@@ -73,8 +73,7 @@ httpAddrConnect2( +@@ -74,8 +74,7 @@ httpAddrConnect2( # ifdef HAVE_POLL struct pollfd pfds[100]; /* Polled file descriptors */ # else @@ -18,7 +18,7 @@ poll event list as well as to not check stale event masks. error_set; /* select() error set */ struct timeval timeout; /* Timeout */ # endif /* HAVE_POLL */ -@@ -280,16 +279,15 @@ httpAddrConnect2( +@@ -290,16 +289,15 @@ httpAddrConnect2( DEBUG_printf(("1httpAddrConnect2: poll() returned %d (%d)", result, errno)); # else @@ -39,7 +39,7 @@ poll event list as well as to not check stale event masks. DEBUG_printf(("1httpAddrConnect2: select() returned %d (%d)", result, errno)); # endif /* HAVE_POLL */ -@@ -308,38 +306,25 @@ httpAddrConnect2( +@@ -318,43 +316,16 @@ httpAddrConnect2( { # ifdef HAVE_POLL DEBUG_printf(("pfds[%d].revents=%x\n", i, pfds[i].revents)); @@ -67,23 +67,35 @@ poll event list as well as to not check stale event masks. - else if (FD_ISSET(fds[i], &error_set)) -# endif /* HAVE_POLL */ - { +-# ifdef __sun +- // Solaris incorrectly returns errors when you poll() a socket that is +- // still connecting. This check prevents us from removing the socket +- // from the pool if the "error" is EINPROGRESS... +- int sockerr; // Current error on socket +- socklen_t socklen = sizeof(sockerr); +- // Size of error variable +- +- if (!getsockopt(fds[i], SOL_SOCKET, SO_ERROR, &sockerr, &socklen) && (!sockerr || sockerr == EINPROGRESS)) +- continue; // Not an error +-# endif // __sun +- - /* - * Error on socket, remove from the "pool"... - */ -- + if (getpeername(fds[i], NULL, 0) == 0) { + *sock = fds[i]; + connaddr = addrs[i]; + break; + } + httpAddrClose(NULL, fds[i]); nfds --; - if (i < nfds) +@@ -362,6 +333,9 @@ httpAddrConnect2( { memmove(fds + i, fds + i + 1, (size_t)(nfds - i) * (sizeof(fds[0]))); memmove(addrs + i, addrs + i + 1, (size_t)(nfds - i) * (sizeof(addrs[0]))); +# ifdef HAVE_POLL -+ memmove(pfds + i, pfds + i + 1, (size_t)(nfds - i) * (sizeof(pfds[0]))); ++ memmove(pfds + i, pfds + i + 1, (size_t)(nfds - i) * (sizeof(pfds[0]))); +# endif /* HAVE_POLL */ } i --; diff --git a/print/cups-base/patches/patch-cups_versioning.h b/print/cups-base/patches/patch-cups_versioning.h deleted file mode 100644 index c721805a764..00000000000 --- a/print/cups-base/patches/patch-cups_versioning.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cups_versioning.h,v 1.1 2021/04/21 13:18:22 adam Exp $ - -Fix building on Darwin. - ---- cups/versioning.h.orig 2021-02-21 14:28:23.000000000 +0000 -+++ cups/versioning.h -@@ -39,6 +39,7 @@ - - # ifdef __APPLE__ - # include <os/availability.h> -+# include <TargetConditionals.h> - # endif /* __APPLE__ */ - - # ifdef __has_extension /* Clang */ diff --git a/print/cups-base/patches/patch-scheduler-conf.c b/print/cups-base/patches/patch-scheduler-conf.c index 051e502faaf..a3d863a1b8c 100644 --- a/print/cups-base/patches/patch-scheduler-conf.c +++ b/print/cups-base/patches/patch-scheduler-conf.c @@ -1,18 +1,18 @@ -$NetBSD: patch-scheduler-conf.c,v 1.2 2019/11/17 21:22:03 leot Exp $ +$NetBSD: patch-scheduler-conf.c,v 1.3 2022/05/10 20:47:38 markd Exp $ Add a PidFile configuration directive to write a PID file. ---- scheduler/conf.c.orig 2019-11-17 12:21:47.927540703 +0000 +--- scheduler/conf.c.orig 2022-04-29 10:12:16.516789874 +0000 +++ scheduler/conf.c -@@ -142,6 +142,7 @@ static const cupsd_var_t cupsfiles_vars[ +@@ -140,6 +140,7 @@ static const cupsd_var_t cupsfiles_vars[ { "CreateSelfSignedCerts", &CreateSelfSignedCerts, CUPSD_VARTYPE_BOOLEAN }, - #endif /* HAVE_SSL */ + #endif /* HAVE_TLS */ { "DataDir", &DataDir, CUPSD_VARTYPE_STRING }, + { "PidFile", &PidFile, CUPSD_VARTYPE_STRING }, { "DocumentRoot", &DocumentRoot, CUPSD_VARTYPE_STRING }, { "ErrorLog", &ErrorLog, CUPSD_VARTYPE_STRING }, { "FileDevice", &FileDevice, CUPSD_VARTYPE_BOOLEAN }, -@@ -579,6 +580,7 @@ cupsdReadConfiguration(void) +@@ -574,6 +575,7 @@ cupsdReadConfiguration(void) cupsdSetString(&RequestRoot, CUPS_REQUESTS); cupsdSetString(&CacheDir, CUPS_CACHEDIR); cupsdSetString(&DataDir, CUPS_DATADIR); @@ -20,7 +20,7 @@ Add a PidFile configuration directive to write a PID file. cupsdSetString(&DocumentRoot, CUPS_DOCROOT); cupsdSetString(&AccessLog, CUPS_LOGDIR "/access_log"); cupsdClearString(&ErrorLog); -@@ -3375,6 +3377,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - +@@ -3397,6 +3399,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - !_cups_strcasecmp(line, "CacheDir") || !_cups_strcasecmp(line, "ConfigFilePerm") || !_cups_strcasecmp(line, "DataDir") || diff --git a/print/cups/Makefile b/print/cups/Makefile index fe910e1c437..692003d5d53 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.276 2021/12/08 16:06:12 adam Exp $ +# $NetBSD: Makefile,v 1.277 2022/05/10 20:47:37 markd Exp $ -PKGREVISION= 3 .include "../../print/cups/Makefile.common" PKGNAME= cups-${CUPS_VERS} diff --git a/print/cups/Makefile.common b/print/cups/Makefile.common index 7ecde9332fa..e004d5dbe6f 100644 --- a/print/cups/Makefile.common +++ b/print/cups/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.14 2021/03/14 08:43:31 wiz Exp $ +# $NetBSD: Makefile.common,v 1.15 2022/05/10 20:47:37 markd Exp $ # # used by print/cups/Makefile # used by print/cups-base/Makefile # used by print/libcups/Makefile -CUPS_VERS= 2.3.3op2 +CUPS_VERS= 2.4.1 DISTNAME= cups-${CUPS_VERS}-source CATEGORIES= print diff --git a/print/libcups/Makefile b/print/libcups/Makefile index 7fb4513eb04..dc388570394 100644 --- a/print/libcups/Makefile +++ b/print/libcups/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.14 2021/12/08 16:02:32 adam Exp $ +# $NetBSD: Makefile,v 1.15 2022/05/10 20:47:38 markd Exp $ -PKGREVISION= 4 .include "../../print/cups/Makefile.common" PKGNAME= libcups-${CUPS_VERS} @@ -32,9 +31,6 @@ CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups CONFIGURE_ARGS+= --with-components=libcups CONFIGURE_ARGS+= --enable-libpaper -CONFIGURE_ARGS+= --enable-ssl -CONFIGURE_ARGS+= --enable-gnutls -CONFIGURE_ARGS+= --disable-cdsassl CONFIGURE_ARGS+= --with-exe-file-perm=0755 CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} @@ -65,6 +61,9 @@ SUBST_SED.piefix= -e 's|@PIEFLAGS@||g' SUBST_STAGE.piefix= pre-configure .endif +PKGCONFIG_OVERRIDE+= cups.pc +PKGCONFIG_OVERRIDE_STAGE= post-configure + pre-configure: cd ${WRKSRC} && aclocal && autoconf diff --git a/print/libcups/PLIST b/print/libcups/PLIST index 8f536549830..cfce17f8153 100644 --- a/print/libcups/PLIST +++ b/print/libcups/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2020/05/16 18:07:56 maya Exp $ +@comment $NetBSD: PLIST,v 1.2 2022/05/10 20:47:38 markd Exp $ bin/cups-config include/cups/adminutil.h include/cups/array.h @@ -17,8 +17,10 @@ include/cups/transcode.h include/cups/versioning.h lib/libcups.la lib/libcupsimage.la +lib/pkgconfig/cups.pc share/locale/ca/cups_ca.po share/locale/cs/cups_cs.po +share/locale/da/cups_da.po share/locale/de/cups_de.po share/locale/en/cups_en.po share/locale/es/cups_es.po diff --git a/print/libcups/options.mk b/print/libcups/options.mk index 6de5114c505..7b13568887b 100644 --- a/print/libcups/options.mk +++ b/print/libcups/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2021/01/04 14:32:17 prlw1 Exp $ +# $NetBSD: options.mk,v 1.3 2022/05/10 20:47:38 markd Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libcups PKG_SUPPORTED_OPTIONS= acl dnssd kerberos tcpwrappers @@ -26,9 +26,7 @@ CONFIGURE_ARGS+= --disable-acl .if !empty(PKG_OPTIONS:Mavahi) .include "../../net/avahi/buildlink3.mk" -CONFIGURE_ARGS+= --enable-avahi -.else -CONFIGURE_ARGS+= --disable-avahi +CONFIGURE_ARGS+= --with-dnssd=avahi .endif .if !empty(PKG_OPTIONS:Mdbus) @@ -40,9 +38,7 @@ CONFIGURE_ARGS+= --disable-dbus .if !empty(PKG_OPTIONS:Mdnssd) .include "../../net/mDNSResponder/buildlink3.mk" -CONFIGURE_ARGS+= --enable-dnssd -.else -CONFIGURE_ARGS+= --disable-dnssd +CONFIGURE_ARGS+= --with-dnssd=yes .endif .if !empty(PKG_OPTIONS:Mkerberos) |