From fd40534a44576de539f98c16b10c722c2414cde3 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 11 Dec 2023 15:51:38 +0300 Subject: [PATCH] import cups-2.2.6-51.el8_8.2 --- SPECS/cups.spec | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/SPECS/cups.spec b/SPECS/cups.spec index b3df9e8..1c1c319 100644 --- a/SPECS/cups.spec +++ b/SPECS/cups.spec @@ -9,9 +9,9 @@ # we still need something for python2... %if 0%{?rhel} >= 8 || 0%{?fedora} -%bcond_without python3 +%global __python %{__python3} %else -%bcond_with python3 +%global __python /usr/bin/python2 %endif #%%global prever rc1 @@ -22,7 +22,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 2.2.6 -Release: 51%{?dist}.1 +Release: 51%{?dist}.2 License: GPLv2+ and LGPLv2 with exceptions and AML Url: http://www.cups.org/ Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz @@ -201,11 +201,7 @@ Requires(preun): systemd Requires(postun): systemd # for upgrade-get-document script -%if %{with python3} -Requires(post): python3 -%else -Requires(post): python -%endif +Requires(post): %{__python} # We ship udev rules which use setfacl. Requires: systemd @@ -601,11 +597,7 @@ s:.*\('%{_datadir}'/\)\([^/_]\+\)\(.*\.po$\):%lang(\2) \1\2\3: # install get-document upgrade script install -m 0755 %{SOURCE9} %{buildroot}%{_sbindir}/upgrade_get_document -%if %{with python3} - sed -i 's,@PYTHON_SHEBANG@,#!/usr/bin/python3,' %{buildroot}%{_sbindir}/upgrade_get_document -%else - sed -i 's,@PYTHON_SHEBANG@,#!/usr/bin/python,' %{buildroot}%{_sbindir}/upgrade_get_document -%endif +sed -i 's,@PYTHON_SHEBANG@,#!%{__python},' %{buildroot}%{_sbindir}/upgrade_get_document %post %systemd_post %{name}.path %{name}.socket %{name}.service @@ -879,6 +871,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Mon Sep 11 2023 Zdenek Dohnal - 1:2.2.6-51.2 +- RHEL-2975 - cups pulls an unneeded dependency on python3 + * Tue Aug 15 2023 Zdenek Dohnal - 1:2.2.6-51.1 - CVE-2023-32360 cups: Information leak through Cups-Get-Document operation