Sync from SUSE:SLFO:Main cups revision 4073a8689ce4abee6c64401fc3d5fd59

avoid_C99_mode_for_loop_initial_declarations.patch

@@ -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';
- 

cups.changes

@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Wed Oct 16 14:58:07 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Drop rcFOO symlinks for CODE16 (PED-266).
+
+-------------------------------------------------------------------
+Mon Sep 30 12:41:11 UTC 2024 - Johannes Meixner <jsmeix@suse.com>
+
+- 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 <jsmeix@suse.com>
 

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
+# 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.10/cups-2.4.10-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
+# 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.10/cups-2.4.10-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

downgrade-autoconf-requirement.patch

@@ -1,5 +1,5 @@
---- configure.ac.orig	2024-06-18 13:11:05.000000000 +0200
+--- configure.ac.orig	2024-09-30 13:38:35.000000000 +0200
-+++ configure.ac	2024-07-02 13:55:46.880533719 +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])