开源软件构建与测试

_service:extract_file:cups.spec Deleted

@@ -1,528 +0,0 @@
-%global cups_serverbin %{_exec_prefix}/lib/cups
-
-Name:    cups
-Epoch:   1
-Version: 2.4.0
-Release: 3
-Summary: CUPS is the standards-based, open source printing system for linux operating systems.
-License: GPLv2+ and LGPLv2+ with exceptions and AML
-Url:     https://openprinting.github.io/cups/
-# Apple stopped uploading the new versions into github, use OpenPrinting fork
-Source0: https://github.com/OpenPrinting/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz
-
-Source1: cupsprinter.png
-Source2: macros.cups
-
-Patch1:  cups-system-auth.patch
-Patch2:  cups-multilib.patch
-Patch3:  cups-banners.patch
-Patch4:  cups-direct-usb.patch
-Patch5:  cups-driverd-timeout.patch
-Patch6:  cups-usb-paperout.patch
-Patch7:  cups-uri-compat.patch
-Patch8:  cups-freebind.patch
-Patch9:  cups-ipp-multifile.patch
-Patch10: cups-web-devices-timeout.patch
-
-Patch6000: backport-CVE-2022-26691.patch
-
-BuildRequires: pam-devel pkgconf-pkg-config pkgconfig(gnutls) libacl-devel openldap-devel pkgconfig(libusb-1.0)
-BuildRequires: krb5-devel pkgconfig(avahi-client) systemd pkgconfig(libsystemd) pkgconfig(dbus-1) python3-cups
-BuildRequires: automake zlib-devel gcc gcc-c++ libselinux-devel audit-libs-devel make
-Requires: dbus systemd acl cups-filters /usr/sbin/alternatives 
-Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: %{name}-client%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: %{name}-filesystem = %{epoch}:%{version}-%{release}
-
-# Requires working PrivateTmp (bug #807672)
-Requires(pre): systemd
-Requires(post): systemd
-Requires(post): grep, sed
-Requires(preun): systemd
-Requires(postun): systemd
-
-%description
-CUPS is the standards-based, open source printing system developed by Apple Inc.
-for UNIX®-like operating systems. CUPS uses the Internet Printing
-Protocol (IPP) to support printing to local and network printers.
-
-%package client
-Summary: CUPS printing system - client programs
-License: GPLv2
-Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
-Requires: /usr/sbin/alternatives
-Provides: lpr
-
-%description client
-CUPS printing system provides a portable printing layer for
-UNIX® operating systems. This package contains command-line client
-programs.
-
-%package devel
-Summary: CUPS printing system - development environment
-License: LGPLv2
-Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: gnutls-devel krb5-devel zlib-devel
-
-%description devel
-CUPS is the standards-based, open source printing system developed by Apple Inc.
-for macOS® and other UNIX®-like operating systems. Developers can use this development
-package to develop other printer drivers.
-
-%package libs
-Summary: CUPS libs
-License: LGPLv2 and zlib
-
-%description libs
-CUPS printing system provides a portable printing layer for
-UNIX® operating systems. It has been developed by Apple Inc.
-to promote a standard printing solution for all UNIX vendors and users.
-CUPS provides the System V and Berkeley command-line interfaces.
-The cups-libs package provides libraries used by applications to use CUPS
-natively, without needing the lp/lpr commands.
-
-%package filesystem
-Summary: CUPS printing system - directory layout
-BuildArch: noarch
-
-%description filesystem
-CUPS printing system provides a portable printing layer for
-UNIX® operating systems. This package provides some directories which are
-required by other packages that add CUPS drivers (i.e. filters, backends etc.).
-
-%package lpd
-Summary: CUPS printing system - lpd emulation
-Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Provides: lpd
-
-%description lpd
-CUPS printing system provides a portable printing layer for
-UNIX® operating systems. This is the package that provides standard
-lpd emulation.
-
-%package ipptool
-Summary: CUPS printing system - tool for performing IPP requests
-Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: avahi
-
-%description ipptool
-Sends IPP requests to the specified URI and tests and/or displays the results.
-
-%package printerapp
-Summary: CUPS printing system - tools for printer application
-Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: avahi
-
-%description printerapp
-Provides IPP everywhere printer application ippeveprinter and tools for printing
-PostScript and HP PCL document formats - ippevepcl and ippeveps. The printer
-application enables older printers for IPP everywhere standard - so if older printer
-is installed with a printer application, its print queue acts as IPP everywhere printer
-to CUPS daemon. This solution will substitute printer drivers and raw queues in the future.
-
-%package    help
-Summary:    Documents for cups
-Buildarch:  noarch
-
-%description    help
-Man pages and other related documents.
-
-%prep
-%autosetup -n %{name}-%{version} -p1
-
-sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in
-sed -i -e 's,^ErrorLog .*$,ErrorLog syslog,' -i -e 's,^AccessLog .*$,AccessLog syslog,' -i -e 's,^PageLog .*,PageLog syslog,' conf/cups-files.conf.in
-perl -pi -e "s,^.SILENT:,," Makedefs.in
-
-aclocal -I config-scripts
-autoconf -f -I config-scripts
-
-%build
-export DSOFLAGS="$DSOFLAGS -L../cgi-bin -L../filter -L../ppdc -L../scheduler -Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/generic-hardened-ld -Wl,-z,relro,-z,now -fPIE -pie" 
-export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
-# --enable-debug to avoid stripping binaries
-%configure --with-docdir=%{_datadir}/%{name}/www --enable-debug \
-    --enable-lspp \
-    --with-exe-file-perm=0755 \
-    --with-cupsd-file-perm=0755 \
-    --with-log-file-perm=0600 \
-    --enable-relro \
-    --with-dbusdir=%{_sysconfdir}/dbus-1 \
-    --enable-avahi \
-    --enable-threads \
-    --enable-gnutls \
-    --enable-webif \
-    --with-xinetd=no \
-    --with-access-log-level=actions \
-    --enable-page-logging \
-    --with-rundir=%{_rundir}/cups \
-    --enable-sync-on-close \
-    localedir=%{_datadir}/locale
-
-%make_build
-
-%check
-make check
-
-%install
-make BUILDROOT=${RPM_BUILD_ROOT} install
-
-rm -rf  ${RPM_BUILD_ROOT}%{_initddir} ${RPM_BUILD_ROOT}%{_sysconfdir}/{init.d,rc?.d}
-install -d ${RPM_BUILD_ROOT}%{_unitdir}
-
-find ${RPM_BUILD_ROOT}%{_datadir}/cups/model -name "*.ppd" |xargs gzip -n9f
-
-pushd ${RPM_BUILD_ROOT}%{_bindir}
-for file in cancel lp lpq lpr lprm lpstat; do
-    mv $file $file.cups
-done
-
-mv ${RPM_BUILD_ROOT}%{_sbindir}/lpc ${RPM_BUILD_ROOT}%{_sbindir}/lpc.cups
-cd ${RPM_BUILD_ROOT}%{_mandir}/man1
-for file in cancel lp lpq lpr lprm lpstat; do
-    mv $file.1 $file-cups.1
-done
-
-mv ${RPM_BUILD_ROOT}%{_mandir}/man8/lpc.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/lpc-cups.8
-popd
-
-install -d ${RPM_BUILD_ROOT}%{_datadir}/pixmaps ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/sysconfig \
-           ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/applnk/System \
-           ${RPM_BUILD_ROOT}%{_rpmconfigdir}/macros.d
-install -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
-install -m 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_rpmconfigdir}/macros.d
-
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/cups/{printers,classes,client,subscriptions}.conf
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/cups/lpoptions
-

_service:tar_scm:cups.spec Added

@@ -0,0 +1,533 @@
+%global cups_serverbin %{_exec_prefix}/lib/cups
+
+Name:    cups
+Epoch:   1
+Version: 2.4.0
+Release: 4
+Summary: CUPS is the standards-based, open source printing system for linux operating systems.
+License: GPLv2+ and LGPLv2+ with exceptions and AML
+Url:     https://openprinting.github.io/cups/
+# Apple stopped uploading the new versions into github, use OpenPrinting fork
+Source0: https://github.com/OpenPrinting/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz
+
+Source1: cupsprinter.png
+Source2: macros.cups
+
+Patch1:  cups-system-auth.patch
+Patch2:  cups-multilib.patch
+Patch3:  cups-banners.patch
+Patch4:  cups-direct-usb.patch
+Patch5:  cups-driverd-timeout.patch
+Patch6:  cups-usb-paperout.patch
+Patch7:  cups-uri-compat.patch
+Patch8:  cups-freebind.patch
+Patch9:  cups-ipp-multifile.patch
+Patch10: cups-web-devices-timeout.patch
+
+Patch6000: backport-CVE-2022-26691.patch
+Patch6001: backport-Remove-legacy-code-for-RIP_MAX_CACHE-environment-variable.patch
+Patch6002: backport-Also-fix-cupsfilter.patch
+
+BuildRequires: pam-devel pkgconf-pkg-config pkgconfig(gnutls) libacl-devel openldap-devel pkgconfig(libusb-1.0)
+BuildRequires: krb5-devel pkgconfig(avahi-client) systemd pkgconfig(libsystemd) pkgconfig(dbus-1) python3-cups
+BuildRequires: automake zlib-devel gcc gcc-c++ libselinux-devel audit-libs-devel make
+Requires: dbus systemd acl cups-filters /usr/sbin/alternatives 
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-client%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-filesystem = %{epoch}:%{version}-%{release}
+
+# Requires working PrivateTmp (bug #807672)
+Requires(pre): systemd
+Requires(post): systemd
+Requires(post): grep, sed
+Requires(preun): systemd
+Requires(postun): systemd
+
+%description
+CUPS is the standards-based, open source printing system developed by Apple Inc.
+for UNIX®-like operating systems. CUPS uses the Internet Printing
+Protocol (IPP) to support printing to local and network printers.
+
+%package client
+Summary: CUPS printing system - client programs
+License: GPLv2
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
+Requires: /usr/sbin/alternatives
+Provides: lpr
+
+%description client
+CUPS printing system provides a portable printing layer for
+UNIX® operating systems. This package contains command-line client
+programs.
+
+%package devel
+Summary: CUPS printing system - development environment
+License: LGPLv2
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: gnutls-devel krb5-devel zlib-devel
+
+%description devel
+CUPS is the standards-based, open source printing system developed by Apple Inc.
+for macOS® and other UNIX®-like operating systems. Developers can use this development
+package to develop other printer drivers.
+
+%package libs
+Summary: CUPS libs
+License: LGPLv2 and zlib
+
+%description libs
+CUPS printing system provides a portable printing layer for
+UNIX® operating systems. It has been developed by Apple Inc.
+to promote a standard printing solution for all UNIX vendors and users.
+CUPS provides the System V and Berkeley command-line interfaces.
+The cups-libs package provides libraries used by applications to use CUPS
+natively, without needing the lp/lpr commands.
+
+%package filesystem
+Summary: CUPS printing system - directory layout
+BuildArch: noarch
+
+%description filesystem
+CUPS printing system provides a portable printing layer for
+UNIX® operating systems. This package provides some directories which are
+required by other packages that add CUPS drivers (i.e. filters, backends etc.).
+
+%package lpd
+Summary: CUPS printing system - lpd emulation
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Provides: lpd
+
+%description lpd
+CUPS printing system provides a portable printing layer for
+UNIX® operating systems. This is the package that provides standard
+lpd emulation.
+
+%package ipptool
+Summary: CUPS printing system - tool for performing IPP requests
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: avahi
+
+%description ipptool
+Sends IPP requests to the specified URI and tests and/or displays the results.
+
+%package printerapp
+Summary: CUPS printing system - tools for printer application
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: avahi
+
+%description printerapp
+Provides IPP everywhere printer application ippeveprinter and tools for printing
+PostScript and HP PCL document formats - ippevepcl and ippeveps. The printer
+application enables older printers for IPP everywhere standard - so if older printer
+is installed with a printer application, its print queue acts as IPP everywhere printer
+to CUPS daemon. This solution will substitute printer drivers and raw queues in the future.
+
+%package    help
+Summary:    Documents for cups
+Buildarch:  noarch
+
+%description    help
+Man pages and other related documents.
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in
+sed -i -e 's,^ErrorLog .*$,ErrorLog syslog,' -i -e 's,^AccessLog .*$,AccessLog syslog,' -i -e 's,^PageLog .*,PageLog syslog,' conf/cups-files.conf.in
+perl -pi -e "s,^.SILENT:,," Makedefs.in
+
+aclocal -I config-scripts
+autoconf -f -I config-scripts
+
+%build
+export DSOFLAGS="$DSOFLAGS -L../cgi-bin -L../filter -L../ppdc -L../scheduler -Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/generic-hardened-ld -Wl,-z,relro,-z,now -fPIE -pie" 
+export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
+# --enable-debug to avoid stripping binaries
+%configure --with-docdir=%{_datadir}/%{name}/www --enable-debug \
+    --enable-lspp \
+    --with-exe-file-perm=0755 \
+    --with-cupsd-file-perm=0755 \
+    --with-log-file-perm=0600 \
+    --enable-relro \
+    --with-dbusdir=%{_sysconfdir}/dbus-1 \
+    --enable-avahi \
+    --enable-threads \
+    --enable-gnutls \
+    --enable-webif \
+    --with-xinetd=no \
+    --with-access-log-level=actions \
+    --enable-page-logging \
+    --with-rundir=%{_rundir}/cups \
+    --enable-sync-on-close \
+    localedir=%{_datadir}/locale
+
+%make_build
+
+%check
+make check
+
+%install
+make BUILDROOT=${RPM_BUILD_ROOT} install
+
+rm -rf  ${RPM_BUILD_ROOT}%{_initddir} ${RPM_BUILD_ROOT}%{_sysconfdir}/{init.d,rc?.d}
+install -d ${RPM_BUILD_ROOT}%{_unitdir}
+
+find ${RPM_BUILD_ROOT}%{_datadir}/cups/model -name "*.ppd" |xargs gzip -n9f
+
+pushd ${RPM_BUILD_ROOT}%{_bindir}
+for file in cancel lp lpq lpr lprm lpstat; do
+    mv $file $file.cups
+done
+
+mv ${RPM_BUILD_ROOT}%{_sbindir}/lpc ${RPM_BUILD_ROOT}%{_sbindir}/lpc.cups
+cd ${RPM_BUILD_ROOT}%{_mandir}/man1
+for file in cancel lp lpq lpr lprm lpstat; do
+    mv $file.1 $file-cups.1
+done
+
+mv ${RPM_BUILD_ROOT}%{_mandir}/man8/lpc.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/lpc-cups.8
+popd
+
+install -d ${RPM_BUILD_ROOT}%{_datadir}/pixmaps ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/sysconfig \
+           ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/applnk/System \
+           ${RPM_BUILD_ROOT}%{_rpmconfigdir}/macros.d
+install -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
+install -m 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_rpmconfigdir}/macros.d
+
+touch ${RPM_BUILD_ROOT}%{_sysconfdir}/cups/{printers,classes,client,subscriptions}.conf

_service:extract_file:backport-CVE-2022-26691.patch Deleted

@@ -1,34 +0,0 @@
-From de4f8c196106033e4c372dce3e91b9d42b0b9444 Mon Sep 17 00:00:00 2001
-From: Zdenek Dohnal <zdohnal@redhat.com>
-Date: Thu, 26 May 2022 06:27:04 +0200
-Subject: PATCH scheduler/cert.c: Fix string comparison (fixes
- CVE-2022-26691)
-
-The previous algorithm didn't expect the strings can have a different
-length, so one string can be a substring of the other and such substring
-was reported as equal to the longer string.
-
-Reference:https://github.com/OpenPrinting/cups/commit/de4f8c196106033e4c372dce3e91b9d42b0b9444
-
----
- scheduler/cert.c | 9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/scheduler/cert.c b/scheduler/cert.c
-index b268bf1b2..9b65b96c9 100644
---- a/scheduler/cert.c
-+++ b/scheduler/cert.c
-@@ -444,5 +444,12 @@ ctcompare(const char *a,		/* I - First string */
-     b ++;
-   }
- 
--  return (result);
-+ /*
-+  * The while loop finishes when *a == '\0' or *b == '\0'
-+  * so after the while loop either both *a and *b == '\0',
-+  * or one points inside a string, so when we apply logical OR on *a,
-+  * *b and result, we get a non-zero return value if the compared strings don't match.
-+  */
-+
-+  return (result | *a | *b);
- }

_service:extract_file:cups-banners.patch Deleted

_service:extract_file:cups-direct-usb.patch Deleted

_service:extract_file:cups-driverd-timeout.patch Deleted

_service:extract_file:cups-freebind.patch Deleted

_service:extract_file:cups-ipp-multifile.patch Deleted

_service:extract_file:cups-multilib.patch Deleted

_service:extract_file:cups-system-auth.patch Deleted

@@ -1,38 +0,0 @@
-diff -up cups-1.5b1/conf/cups.password-auth.system-auth cups-1.5b1/conf/cups.password-auth
---- cups-1.5b1/conf/cups.password-auth.system-auth	2011-05-23 17:27:27.000000000 +0200
-+++ cups-1.5b1/conf/cups.password-auth	2011-05-23 17:27:27.000000000 +0200
-@@ -0,0 +1,4 @@
-+#%PAM-1.0
-+# Use password-auth common PAM configuration for the daemon
-+auth        include     password-auth
-+account     include     password-auth
-diff -up cups-1.5b1/conf/cups.system-auth.system-auth cups-1.5b1/conf/cups.system-auth
---- cups-1.5b1/conf/cups.system-auth.system-auth	2011-05-23 17:27:27.000000000 +0200
-+++ cups-1.5b1/conf/cups.system-auth	2011-05-23 17:27:27.000000000 +0200
-@@ -0,0 +1,3 @@
-+#%PAM-1.0
-+auth	include		system-auth
-+account	include		system-auth
-diff -up cups-1.5b1/conf/Makefile.system-auth cups-1.5b1/conf/Makefile
---- cups-1.5b1/conf/Makefile.system-auth	2011-05-12 07:21:56.000000000 +0200
-+++ cups-1.5b1/conf/Makefile	2011-05-23 17:27:27.000000000 +0200
-@@ -90,10 +90,16 @@ install-data:
- 	done
- 	-if test x$(PAMDIR) != x; then \
- 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
--		if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
--			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
-+		if test -f /etc/pam.d/password-auth; then \
-+			$(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \
-+		elif test -f /etc/pam.d/system-auth; then \
-+			$(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \
- 		else \
--			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
-+			if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
-+				$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
-+			else \
-+				$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
-+			fi ; \
- 		fi ; \
- 	fi
-

_service:extract_file:cups-uri-compat.patch Deleted

@@ -1,51 +0,0 @@
-diff -up cups-1.5b1/backend/usb-unix.c.uri-compat cups-1.5b1/backend/usb-unix.c
---- cups-1.5b1/backend/usb-unix.c.uri-compat	2011-05-24 15:59:05.000000000 +0200
-+++ cups-1.5b1/backend/usb-unix.c	2011-05-24 16:02:03.000000000 +0200
-@@ -63,11 +63,34 @@ print_device(const char *uri,		/* I - De
-   int		device_fd;		/* USB device */
-   ssize_t	tbytes;			/* Total number of bytes written */
-   struct termios opts;			/* Parallel port options */
-+  char		*fixed_uri = strdup (uri);
-+  char		*p;
- 
- 
-   (void)argc;
-   (void)argv;
- 
-+  p = strchr (fixed_uri, ':');
-+  if (p++ != NULL)
-+  {
-+    char *e;
-+    p += strspn (p, "/");
-+    e = strchr (p, '/');
-+    if (e > p)
-+    {
-+      size_t mfrlen = e - p;
-+      e++;
-+      if (!strncasecmp (e, p, mfrlen))
-+      {
-+	char *x = e + mfrlen;
-+	if (!strncmp (x, "%20", 3))
-+	  /* Take mfr name out of mdl name for compatibility with
-+	   * Fedora 11 before bug #507244 was fixed. */
-+	  strcpy (e, x + 3); puts(fixed_uri);
-+      }
-+    }
-+  }
-+
-  /*
-   * Open the USB port device...
-   */
-@@ -107,10 +130,10 @@ print_device(const char *uri,		/* I - De
-              _cups_strncasecmp(hostname, "Minolta", 7);
- #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
- 
--    if (use_bc && !strncmp(uri, "usb:/dev/", 9))
-+    if (use_bc && !strncmp(fixed_uri, "usb:/dev/", 9))
-       use_bc = 0;
- 
--    if ((device_fd = open_device(uri, &use_bc)) == -1)
-+    if ((device_fd = open_device(fixed_uri, &use_bc)) == -1)
-     {
-       if (getenv("CLASS") != NULL)
-       {

_service:extract_file:cups-usb-paperout.patch Deleted

@@ -1,52 +0,0 @@
-diff -up cups-1.5b1/backend/usb-unix.c.usb-paperout cups-1.5b1/backend/usb-unix.c
---- cups-1.5b1/backend/usb-unix.c.usb-paperout	2011-05-24 15:51:39.000000000 +0200
-+++ cups-1.5b1/backend/usb-unix.c	2011-05-24 15:51:39.000000000 +0200
-@@ -30,6 +30,11 @@
- 
- #include <sys/select.h>
- 
-+#ifdef __linux
-+#include <sys/ioctl.h>
-+#include <linux/lp.h>
-+#endif /* __linux */
-+
- 
- /*
-  * Local functions...
-@@ -334,7 +339,19 @@ open_device(const char *uri,		/* I - Dev
-   if (!strncmp(uri, "usb:/dev/", 9))
- #ifdef __linux
-   {
--    return (open(uri + 4, O_RDWR | O_EXCL));
-+    fd = open(uri + 4, O_RDWR | O_EXCL);
-+
-+    if (fd != -1)
-+    {
-+     /*
-+      * Tell the driver to return from write() with errno==ENOSPACE
-+      * on paper-out.
-+      */
-+      unsigned int t = 1;
-+      ioctl (fd, LPABORT, &t);
-+    }
-+
-+    return fd;
-   }
-   else if (!strncmp(uri, "usb://", 6))
-   {
-@@ -400,7 +417,14 @@ open_device(const char *uri,		/* I - Dev
-         if (!strcmp(uri, device_uri))
- 	{
- 	 /*
--	  * Yes, return this file descriptor...
-+	  * Yes, tell the driver to return from write() with
-+	  * errno==ENOSPACE on paper-out.
-+	  */
-+	  unsigned int t = 1;
-+	  ioctl (fd, LPABORT, &t);
-+
-+	 /*
-+	  * Return this file descriptor...
- 	  */
- 
- 	  fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n",

_service:extract_file:cups-web-devices-timeout.patch Deleted

_service:tar_scm:backport-Also-fix-cupsfilter.patch Added

@@ -0,0 +1,31 @@
+From 3a1a81d7b882c06451a39a19a87aca7ec44742e6 Mon Sep 17 00:00:00 2001
+From: Michael R Sweet <michael.r.sweet@gmail.com>
+Date: Wed, 12 Jan 2022 08:33:58 -0500
+Subject: PATCH Also fix cupsfilter (Issue #323)
+
+Reference:https://github.com/OpenPrinting/cups/commit/3a1a81d7b882c06451a39a19a87aca7ec44742e6
+
+---
+ scheduler/cupsfilter.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c
+index c6dbb8debb..a03e77de76 100644
+--- a/scheduler/cupsfilter.c
++++ b/scheduler/cupsfilter.c
+@@ -981,7 +981,6 @@ exec_filters(mime_type_t   *srctype,	/* I - Source type */
+ 		printer_info255,	/* PRINTER_INFO env variable */
+ 		printer_location255,	/* PRINTER_LOCATION env variable */
+ 		printer_name255,	/* PRINTER env variable */
+-		rip_max_cache1024,	/* RIP_MAX_CACHE */
+ 		userenv1024,		/* USER */
+ #if CUPS_SNAP
+ 		fontconfig_file1024,	/* FONTCONFIG_FILE */
+@@ -1133,7 +1132,6 @@ exec_filters(mime_type_t   *srctype,	/* I - Source type */
+   envpi ++ = printer_info;
+   envpi ++ = printer_location;
+   envpi ++ = printer_name;
+-  envpi ++ = rip_max_cache;
+   envpi ++ = userenv;
+   envpi ++ = "CHARSET=utf-8";
+   if (final_content_type0)

_service:tar_scm:backport-CVE-2022-26691.patch Added

@@ -0,0 +1,34 @@
+From de4f8c196106033e4c372dce3e91b9d42b0b9444 Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Thu, 26 May 2022 06:27:04 +0200
+Subject: PATCH scheduler/cert.c: Fix string comparison (fixes
+ CVE-2022-26691)
+
+The previous algorithm didn't expect the strings can have a different
+length, so one string can be a substring of the other and such substring
+was reported as equal to the longer string.
+
+Reference:https://github.com/OpenPrinting/cups/commit/de4f8c196106033e4c372dce3e91b9d42b0b9444
+
+---
+ scheduler/cert.c | 9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/scheduler/cert.c b/scheduler/cert.c
+index b268bf1b2..9b65b96c9 100644
+--- a/scheduler/cert.c
++++ b/scheduler/cert.c
+@@ -444,5 +444,12 @@ ctcompare(const char *a,		/* I - First string */
+     b ++;
+   }
+ 
+-  return (result);
++ /*
++  * The while loop finishes when *a == '\0' or *b == '\0'
++  * so after the while loop either both *a and *b == '\0',
++  * or one points inside a string, so when we apply logical OR on *a,
++  * *b and result, we get a non-zero return value if the compared strings don't match.
++  */
++
++  return (result | *a | *b);
+ }

_service:tar_scm:backport-Remove-legacy-code-for-RIP_MAX_CACHE-environment-variable.patch Added

@@ -0,0 +1,46 @@
+From ee02b74ad03b52a5226f80dd2f551c1b565cdbb2 Mon Sep 17 00:00:00 2001
+From: Michael R Sweet <michael.r.sweet@gmail.com>
+Date: Wed, 12 Jan 2022 08:12:24 -0500
+Subject: PATCH Remove legacy code for RIP_MAX_CACHE environment variable
+ (Issue #323)
+
+Reference:https://github.com/OpenPrinting/cups/commit/ee02b74ad03b52a5226f80dd2f551c1b565cdbb2
+
+---
+ CHANGES.md      | 12 +++++++++---
+ scheduler/job.c |  7 ++-----
+ 2 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/scheduler/job.c b/scheduler/job.c
+index fd69f71c9c..fbacc4cd12 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -541,10 +541,8 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+ 					/* PRINTER_LOCATION env variable */
+ 			printer_name255,
+ 					/* PRINTER env variable */
+-			*printer_state_reasons = NULL,
++			*printer_state_reasons = NULL;
+ 					/* PRINTER_STATE_REASONS env var */
+-			rip_max_cache255;
+-					/* RIP_MAX_CACHE env variable */
+ 
+ 
+   cupsdLogMessage(CUPSD_LOG_DEBUG2,
+@@ -749,7 +747,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+ 
+   raw_file = !strcmp(job->filetypesjob->current_file->super, "application") &&
+     !strcmp(job->filetypesjob->current_file->type, "vnd.cups-raw");
+-  
++
+   if ((job->compressionsjob->current_file && (!job->printer->remote || job->num_files == 1)) ||
+       (!job->printer->remote && (job->printer->raw || raw_file) && job->num_files > 1))
+   {
+@@ -1051,7 +1049,6 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+   envpenvc ++ = apple_language;
+ #endif /* __APPLE__ */
+   envpenvc ++ = ppd;
+-  envpenvc ++ = rip_max_cache;
+   envpenvc ++ = content_type;
+   envpenvc ++ = device_uri;
+   envpenvc ++ = printer_info;

_service:tar_scm:cups-banners.patch Added

_service:tar_scm:cups-direct-usb.patch Added

_service:tar_scm:cups-driverd-timeout.patch Added

_service:tar_scm:cups-freebind.patch Added

_service:tar_scm:cups-ipp-multifile.patch Added

_service:tar_scm:cups-multilib.patch Added

_service:tar_scm:cups-system-auth.patch Added

@@ -0,0 +1,38 @@
+diff -up cups-1.5b1/conf/cups.password-auth.system-auth cups-1.5b1/conf/cups.password-auth
+--- cups-1.5b1/conf/cups.password-auth.system-auth	2011-05-23 17:27:27.000000000 +0200
++++ cups-1.5b1/conf/cups.password-auth	2011-05-23 17:27:27.000000000 +0200
+@@ -0,0 +1,4 @@
++#%PAM-1.0
++# Use password-auth common PAM configuration for the daemon
++auth        include     password-auth
++account     include     password-auth
+diff -up cups-1.5b1/conf/cups.system-auth.system-auth cups-1.5b1/conf/cups.system-auth
+--- cups-1.5b1/conf/cups.system-auth.system-auth	2011-05-23 17:27:27.000000000 +0200
++++ cups-1.5b1/conf/cups.system-auth	2011-05-23 17:27:27.000000000 +0200
+@@ -0,0 +1,3 @@
++#%PAM-1.0
++auth	include		system-auth
++account	include		system-auth
+diff -up cups-1.5b1/conf/Makefile.system-auth cups-1.5b1/conf/Makefile
+--- cups-1.5b1/conf/Makefile.system-auth	2011-05-12 07:21:56.000000000 +0200
++++ cups-1.5b1/conf/Makefile	2011-05-23 17:27:27.000000000 +0200
+@@ -90,10 +90,16 @@ install-data:
+ 	done
+ 	-if test x$(PAMDIR) != x; then \
+ 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
+-		if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
+-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
++		if test -f /etc/pam.d/password-auth; then \
++			$(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \
++		elif test -f /etc/pam.d/system-auth; then \
++			$(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \
+ 		else \
+-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
++			if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
++				$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
++			else \
++				$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
++			fi ; \
+ 		fi ; \
+ 	fi
+

_service:tar_scm:cups-uri-compat.patch Added

@@ -0,0 +1,51 @@
+diff -up cups-1.5b1/backend/usb-unix.c.uri-compat cups-1.5b1/backend/usb-unix.c
+--- cups-1.5b1/backend/usb-unix.c.uri-compat	2011-05-24 15:59:05.000000000 +0200
++++ cups-1.5b1/backend/usb-unix.c	2011-05-24 16:02:03.000000000 +0200
+@@ -63,11 +63,34 @@ print_device(const char *uri,		/* I - De
+   int		device_fd;		/* USB device */
+   ssize_t	tbytes;			/* Total number of bytes written */
+   struct termios opts;			/* Parallel port options */
++  char		*fixed_uri = strdup (uri);
++  char		*p;
+ 
+ 
+   (void)argc;
+   (void)argv;
+ 
++  p = strchr (fixed_uri, ':');
++  if (p++ != NULL)
++  {
++    char *e;
++    p += strspn (p, "/");
++    e = strchr (p, '/');
++    if (e > p)
++    {
++      size_t mfrlen = e - p;
++      e++;
++      if (!strncasecmp (e, p, mfrlen))
++      {
++	char *x = e + mfrlen;
++	if (!strncmp (x, "%20", 3))
++	  /* Take mfr name out of mdl name for compatibility with
++	   * Fedora 11 before bug #507244 was fixed. */
++	  strcpy (e, x + 3); puts(fixed_uri);
++      }
++    }
++  }
++
+  /*
+   * Open the USB port device...
+   */
+@@ -107,10 +130,10 @@ print_device(const char *uri,		/* I - De
+              _cups_strncasecmp(hostname, "Minolta", 7);
+ #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
+ 
+-    if (use_bc && !strncmp(uri, "usb:/dev/", 9))
++    if (use_bc && !strncmp(fixed_uri, "usb:/dev/", 9))
+       use_bc = 0;
+ 
+-    if ((device_fd = open_device(uri, &use_bc)) == -1)
++    if ((device_fd = open_device(fixed_uri, &use_bc)) == -1)
+     {
+       if (getenv("CLASS") != NULL)
+       {

_service:tar_scm:cups-usb-paperout.patch Added

@@ -0,0 +1,52 @@
+diff -up cups-1.5b1/backend/usb-unix.c.usb-paperout cups-1.5b1/backend/usb-unix.c
+--- cups-1.5b1/backend/usb-unix.c.usb-paperout	2011-05-24 15:51:39.000000000 +0200
++++ cups-1.5b1/backend/usb-unix.c	2011-05-24 15:51:39.000000000 +0200
+@@ -30,6 +30,11 @@
+ 
+ #include <sys/select.h>
+ 
++#ifdef __linux
++#include <sys/ioctl.h>
++#include <linux/lp.h>
++#endif /* __linux */
++
+ 
+ /*
+  * Local functions...
+@@ -334,7 +339,19 @@ open_device(const char *uri,		/* I - Dev
+   if (!strncmp(uri, "usb:/dev/", 9))
+ #ifdef __linux
+   {
+-    return (open(uri + 4, O_RDWR | O_EXCL));
++    fd = open(uri + 4, O_RDWR | O_EXCL);
++
++    if (fd != -1)
++    {
++     /*
++      * Tell the driver to return from write() with errno==ENOSPACE
++      * on paper-out.
++      */
++      unsigned int t = 1;
++      ioctl (fd, LPABORT, &t);
++    }
++
++    return fd;
+   }
+   else if (!strncmp(uri, "usb://", 6))
+   {
+@@ -400,7 +417,14 @@ open_device(const char *uri,		/* I - Dev
+         if (!strcmp(uri, device_uri))
+ 	{
+ 	 /*
+-	  * Yes, return this file descriptor...
++	  * Yes, tell the driver to return from write() with
++	  * errno==ENOSPACE on paper-out.
++	  */
++	  unsigned int t = 1;
++	  ioctl (fd, LPABORT, &t);
++
++	 /*
++	  * Return this file descriptor...
+ 	  */
+ 
+ 	  fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n",

_service:tar_scm:cups-web-devices-timeout.patch Added

_service Changed

_service:extract_file:cups-2.4.0-source.tar.gz Deleted

_service:extract_file:cups.yaml Deleted

_service:extract_file:cupsprinter.png Deleted

_service:extract_file:macros.cups Deleted

_service:tar_scm:cups-1654850183.1efd190.tar Deleted

_service:tar_scm:cups-2.4.0-source.tar.gz Added

_service:tar_scm:cups.yaml Added

_service:tar_scm:cupsprinter.png Added

_service:tar_scm:macros.cups Added

Changes of Revision 2