pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print {cups,cups-base,libcups}: update to 2.4.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/ada0d6d9efd1
branches: trunk
changeset: 379024:ada0d6d9efd1
user: markd <markd%pkgsrc.org@localhost>
date: Tue May 10 20:47:37 2022 +0000
description:
{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.
diffstat:
print/cups-base/Makefile | 6 +-
print/cups-base/PLIST | 78 ++++-
print/cups-base/distinfo | 24 +-
print/cups-base/options.mk | 10 +-
print/cups-base/patches/patch-airprint-conf_mime.convs.in | 37 --
print/cups-base/patches/patch-airprint-scheduler_conf.c | 36 --
print/cups-base/patches/patch-airprint-scheduler_dirsvc.c | 40 --
print/cups-base/patches/patch-airprint-scheduler_printers.c | 36 --
print/cups-base/patches/patch-config-scripts_cups-compiler.m4 | 65 +--
print/cups-base/patches/patch-config-scripts_cups-directories.m4 | 168 ++++-----
print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 | 75 ++-
print/cups-base/patches/patch-config-scripts_cups-libtool.m4 | 15 -
print/cups-base/patches/patch-cups_http-addrlist.c | 28 +-
print/cups-base/patches/patch-cups_versioning.h | 14 -
print/cups-base/patches/patch-scheduler-conf.c | 12 +-
print/cups/Makefile | 3 +-
print/cups/Makefile.common | 4 +-
print/libcups/Makefile | 9 +-
print/libcups/PLIST | 4 +-
print/libcups/options.mk | 10 +-
20 files changed, 266 insertions(+), 408 deletions(-)
diffs (truncated from 1038 to 300 lines):
diff -r 87c5eb49cbaf -r ada0d6d9efd1 print/cups-base/Makefile
--- a/print/cups-base/Makefile Tue May 10 18:21:45 2022 +0000
+++ b/print/cups-base/Makefile Tue May 10 20:47:37 2022 +0000
@@ -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-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 -r 87c5eb49cbaf -r ada0d6d9efd1 print/cups-base/PLIST
--- a/print/cups-base/PLIST Tue May 10 18:21:45 2022 +0000
+++ b/print/cups-base/PLIST Tue May 10 20:47:37 2022 +0000
@@ -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-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/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/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-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 -r 87c5eb49cbaf -r ada0d6d9efd1 print/cups-base/distinfo
--- a/print/cups-base/distinfo Tue May 10 18:21:45 2022 +0000
+++ b/print/cups-base/distinfo Tue May 10 20:47:37 2022 +0000
@@ -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 -r 87c5eb49cbaf -r ada0d6d9efd1 print/cups-base/options.mk
--- a/print/cups-base/options.mk Tue May 10 18:21:45 2022 +0000
+++ b/print/cups-base/options.mk Tue May 10 20:47:37 2022 +0000
@@ -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 @@
.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 @@
.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 -r 87c5eb49cbaf -r ada0d6d9efd1 print/cups-base/patches/patch-airprint-conf_mime.convs.in
--- a/print/cups-base/patches/patch-airprint-conf_mime.convs.in Tue May 10 18:21:45 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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@localhost>
-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 -r 87c5eb49cbaf -r ada0d6d9efd1 print/cups-base/patches/patch-airprint-scheduler_conf.c
--- a/print/cups-base/patches/patch-airprint-scheduler_conf.c Tue May 10 18:21:45 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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@localhost>
-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)
Home |
Main Index |
Thread Index |
Old Index