From a0b7fda96b5dcf9a1c402a34d4993d5fe6ef4496a5aa58008eab93477695a564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 15 Nov 2024 13:57:19 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main cups revision 4073a8689ce4abee6c64401fc3d5fd59 --- ...9_mode_for_loop_initial_declarations.patch | 24 ----------- cups-2.4.10-source.tar.gz | 3 -- cups-2.4.10-source.tar.gz.sig | Bin 119 -> 0 bytes cups-2.4.11-source.tar.gz | 3 ++ cups-2.4.11-source.tar.gz.sig | Bin 0 -> 119 bytes cups.changes | 40 ++++++++++++++++++ cups.spec | 33 +++++---------- downgrade-autoconf-requirement.patch | 6 +-- 8 files changed, 57 insertions(+), 52 deletions(-) delete mode 100644 avoid_C99_mode_for_loop_initial_declarations.patch delete mode 100644 cups-2.4.10-source.tar.gz delete mode 100644 cups-2.4.10-source.tar.gz.sig create mode 100644 cups-2.4.11-source.tar.gz create mode 100644 cups-2.4.11-source.tar.gz.sig diff --git a/avoid_C99_mode_for_loop_initial_declarations.patch b/avoid_C99_mode_for_loop_initial_declarations.patch deleted file mode 100644 index 579ceb4..0000000 --- a/avoid_C99_mode_for_loop_initial_declarations.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- scheduler/client.c.orig 2024-06-18 13:11:05.000000000 +0200 -+++ scheduler/client.c 2024-07-08 15:44:58.336923944 +0200 -@@ -1145,8 +1145,8 @@ cupsdReadClient(cupsd_client_t *con) /* - { - unsigned int i = 0; // Array index - -- for (char *start = con->uri + 9; *start && *start != '?' && i < sizeof(name);) -- name[i++] = *start++; -+ for (ptr = con->uri + 9; *ptr && *ptr != '?' && i < sizeof(name);) -+ name[i++] = *ptr++; - - name[i] = '\0'; - -@@ -1185,8 +1185,8 @@ cupsdReadClient(cupsd_client_t *con) /* - { - unsigned int i = 0; // Array index - -- for (char *start = con->uri + 10; *start && *start != '?' && i < sizeof(name);) -- name[i++] = *start++; -+ for (ptr = con->uri + 10; *ptr && *ptr != '?' && i < sizeof(name);) -+ name[i++] = *ptr++; - - name[i] = '\0'; - diff --git a/cups-2.4.10-source.tar.gz b/cups-2.4.10-source.tar.gz deleted file mode 100644 index 8e4e0e6..0000000 --- a/cups-2.4.10-source.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d75757c2bc0f7a28b02ee4d52ca9e4b1aa1ba2affe16b985854f5336940e5ad7 -size 8145236 diff --git a/cups-2.4.10-source.tar.gz.sig b/cups-2.4.10-source.tar.gz.sig deleted file mode 100644 index f7caaea05802f5ac1ecb7c7d59a3fabfe902147a33cd641fb9697ebd03937a25..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAuWnmEGVvrS6WGQG`u#`)0QVPFC!-FS5x@Tsq#R39Ct6h@ZnqD60G&bFC>vwpbZo`zRj0{KjGMkl7P;+`E#J%GF%haEa UW}gBUEGfAY`_OylmroxU0faU(#sB~S diff --git a/cups-2.4.11-source.tar.gz b/cups-2.4.11-source.tar.gz new file mode 100644 index 0000000..ff071e2 --- /dev/null +++ b/cups-2.4.11-source.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a88fe1da3a29a917c3fc67ce6eb3178399d68e1a548c6d86c70d9b13651fd71 +size 8147763 diff --git a/cups-2.4.11-source.tar.gz.sig b/cups-2.4.11-source.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..fb259cf2b1d2d993f7145d37ec13ddfd618d9c0656f61f7984a69a9d48a419b5 GIT binary patch literal 119 zcmeAuWnmEGVvrS6WGQG`u#`)0QVPFC!-FS5x@Tsq@~ literal 0 HcmV?d00001 diff --git a/cups.changes b/cups.changes index ebd7e69..f3f40e4 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Wed Oct 16 14:58:07 UTC 2024 - Dominique Leuenberger + +- Drop rcFOO symlinks for CODE16 (PED-266). + +------------------------------------------------------------------- +Mon Sep 30 12:41:11 UTC 2024 - Johannes Meixner + +- Version upgrade to 2.4.11: + See https://github.com/openprinting/cups/releases + CUPS 2.4.11 brings several bug fixes regarding IPP response + validation, processing PPD values, Web UI support + (checkbox support, modifying printers) and others fixes. + Detailed list (from CHANGES.md): + * Updated the maximum file descriptor limit + for `cupsd` to 64k-1 (Issue #989) + * Fixed `lpoptions -d` with a discovered + but not added printer (Issue #833) + * Fixed incorrect error message for HTTP/IPP errors (Issue #893) + * Fixed JobPrivateAccess and SubscriptionPrivateAccess support + for "all" (Issue #990) + * Fixed issues with cupsGetDestMediaByXxx (Issue #993) + * Fixed adding and modifying of printers + via the web interface (Issue #998) + * Fixed HTTP PeerCred authentication + for domain users (Issue #1001) + * Fixed checkbox support (Issue #1008) + * Fixed printer state notifications (Issue #1013) + * Fixed IPP Everywhere printer setup (Issue #1033) + Issues are those at https://github.com/OpenPrinting/cups/issues + In particular CUPS 2.4.11 contains those commit regarding + IPP response validation and processing PPD values: + * "Quote PPD localized strings" + https://github.com/OpenPrinting/cups/commit/1e6ca5913eceee906038bc04cc7ccfbe2923bdfd + plus a cleanup to "Fix warnings for unused vars" + https://github.com/OpenPrinting/cups/commit/2abe1ba8a66864aa82cd9836b37e57103b8e1a3b +- Adapted downgrade-autoconf-requirement.patch for CUPS 2.4.11 +- avoid_C99_mode_for_loop_initial_declarations.patch + is no longer needed because the issue is fixed upstream. + ------------------------------------------------------------------- Mon Jul 8 13:50:50 UTC 2024 - Johannes Meixner diff --git a/cups.spec b/cups.spec index ec9860f..b3ab0fa 100644 --- a/cups.spec +++ b/cups.spec @@ -40,18 +40,18 @@ Name: cups # "zypper vcmp 2.3.b99 2.3.0" shows "2.3.b99 is older than 2.3.0" and # "zypper vcmp 2.2.99 2.3b6" show "2.2.99 is older than 2.3b6" so that # version upgrades from 2.2.x via 2.3.b* to 2.3.0 work: -Version: 2.4.10 +Version: 2.4.11 Release: 0 Summary: The Common UNIX Printing System License: Apache-2.0 Group: Hardware/Printing URL: https://openprinting.github.io/cups # To get Source0 go to https://github.com/OpenPrinting/cups/releases or use e.g. -# wget --no-check-certificate -O cups-2.4.10-source.tar.gz https://github.com/OpenPrinting/cups/releases/download/v2.4.10/cups-2.4.10-source.tar.gz -Source0: https://github.com/OpenPrinting/cups/releases/download/v2.4.10/cups-2.4.10-source.tar.gz +# wget --no-check-certificate -O cups-2.4.11-source.tar.gz https://github.com/OpenPrinting/cups/releases/download/v2.4.11/cups-2.4.11-source.tar.gz +Source0: https://github.com/OpenPrinting/cups/releases/download/v2.4.11/cups-2.4.11-source.tar.gz # To get Source1 go to https://github.com/OpenPrinting/cups/releases or use e.g. -# wget --no-check-certificate -O cups-2.4.10-source.tar.gz.sig https://github.com/OpenPrinting/cups/releases/download/v2.4.10/cups-2.4.10-source.tar.gz.sig -Source1: https://github.com/OpenPrinting/cups/releases/download/v2.4.10/cups-2.4.10-source.tar.gz.sig +# wget --no-check-certificate -O cups-2.4.11-source.tar.gz.sig https://github.com/OpenPrinting/cups/releases/download/v2.4.11/cups-2.4.11-source.tar.gz.sig +Source1: https://github.com/OpenPrinting/cups/releases/download/v2.4.11/cups-2.4.11-source.tar.gz.sig # To make Source2 use e.g. # gpg --keyserver keys.openpgp.org --recv-keys 7082A0A50A2E92640F3880E0E4522DCC9B246FF7 # gpg --export --armor 7082A0A50A2E92640F3880E0E4522DCC9B246FF7 >cups.keyring @@ -61,21 +61,13 @@ Source2: cups.keyring # To manually verify Source0 with Source1 and Source2 do e.g. # gpg --import cups.keyring # gpg --list-keys | grep -1 'Zdenek Dohnal' -# gpg --verify cups-2.4.10-source.tar.gz.sig cups-2.4.10-source.tar.gz +# gpg --verify cups-2.4.11-source.tar.gz.sig cups-2.4.11-source.tar.gz Source102: Postscript.ppd.gz Source105: Postscript-level1.ppd.gz Source106: Postscript-level2.ppd.gz Source108: cups-client.conf Source109: baselibs.conf # Patch0...Patch9 is for patches from upstream: -# Patch1 avoid_C99_mode_for_loop_initial_declarations.patch is -# https://github.com/OpenPrinting/cups/commit/a2b8872ea95564e065e3a08e2aa12a15515bc993 -# to avoid "error: 'for' loop initial declarations are only allowed in C99 mode" -# that happens when building for SLE12 at "for (char *start = ..." since -# https://github.com/OpenPrinting/cups/commit/a7eda84da73126e40400e05dd27d57f8c92d5b0d -# see https://github.com/OpenPrinting/cups/issues/1000 -# and https://github.com/OpenPrinting/cups/pull/1004 -Patch1: avoid_C99_mode_for_loop_initial_declarations.patch # Source10...Source99 is for sources from SUSE which are intended for upstream: # Patch10...Patch99 is for patches from SUSE which are intended for upstream: # Patch10 cups-2.1.0-choose-uri-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl: @@ -305,14 +297,6 @@ printer drivers for CUPS. %prep %setup -q # Patch0...Patch9 is for patches from upstream: -# Patch1 avoid_C99_mode_for_loop_initial_declarations.patch is -# https://github.com/OpenPrinting/cups/commit/a2b8872ea95564e065e3a08e2aa12a15515bc993 -# to avoid "error: 'for' loop initial declarations are only allowed in C99 mode" -# that happens when building for SLE12 at "for (char *start = ..." since -# https://github.com/OpenPrinting/cups/commit/a7eda84da73126e40400e05dd27d57f8c92d5b0d -# see https://github.com/OpenPrinting/cups/issues/1000 -# and https://github.com/OpenPrinting/cups/pull/1004 -%patch -P 1 -b avoid_C99_mode_for_loop_initial_declarations.orig # Patch10...Patch99 is for patches from SUSE which are intended for upstream: # Patch10 cups-2.1.0-choose-uri-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl: %patch -P 10 -b choose-uri-template.orig @@ -456,9 +440,11 @@ rm -rf %{buildroot}%{_datadir}/icons # because if upstream changed it 'sed' would silently no longer change the files: grep -q '^# Configuration ' %{buildroot}/%{_sysconfdir}/cups/cupsd.conf.default sed -i -e 's/^# Configuration /# Default configuration /' %{buildroot}/%{_sysconfdir}/cups/cupsd.conf.default +%if 0%{?suse_version} < 1600 # rcbla aliases: ln -s service %{buildroot}%{_sbindir}/rccups ln -s service %{buildroot}%{_sbindir}/rccups-lpd +%endif # Install /usr/lib/tmpfiles.d/cups.conf # According to # https://developers.redhat.com/blog/2016/09/20/managing-temporary-files-with-systemd-tmpfiles-on-rhel7/ @@ -639,6 +625,7 @@ exit 0 %{_unitdir}/cups.service %{_unitdir}/cups.socket %{_unitdir}/cups.path +%{_unitdir}/system-cups.slice %{_unitdir}/cups-lpd.socket %{_unitdir}/cups-lpd@.service %{_tmpfilesdir}/cups.conf @@ -646,8 +633,10 @@ exit 0 %{_sbindir}/cupsctl %{_sbindir}/cupsd %{_sbindir}/cupsfilter +%if 0%{?suse_version} < 1600 %{_sbindir}/rccups %{_sbindir}/rccups-lpd +%endif %dir /usr/lib/cups %dir /usr/lib/cups/backend /usr/lib/cups/backend/dnssd diff --git a/downgrade-autoconf-requirement.patch b/downgrade-autoconf-requirement.patch index 6bc8d97..d2f123b 100644 --- a/downgrade-autoconf-requirement.patch +++ b/downgrade-autoconf-requirement.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig 2024-06-18 13:11:05.000000000 +0200 -+++ configure.ac 2024-07-02 13:55:46.880533719 +0200 +--- configure.ac.orig 2024-09-30 13:38:35.000000000 +0200 ++++ configure.ac 2024-09-30 15:02:31.994893137 +0200 @@ -9,8 +9,8 @@ dnl Licensed under Apache License v2.0. dnl information. dnl @@ -10,4 +10,4 @@ +AC_PREREQ([2.69]) dnl Package name and version... - AC_INIT([CUPS],[2.4.10],[https://github.com/openprinting/cups/issues],[cups],[https://openprinting.github.io/cups]) + AC_INIT([CUPS],[2.4.11],[https://github.com/openprinting/cups/issues],[cups],[https://openprinting.github.io/cups])