diff --git a/backport-to-make-sure-service-start-in-the-right-order.patch b/backport-to-make-sure-service-start-in-the-right-order.patch new file mode 100644 index 0000000000000000000000000000000000000000..360faec37a7eb368da3b8e3d0de4ab87beb6eed7 --- /dev/null +++ b/backport-to-make-sure-service-start-in-the-right-order.patch @@ -0,0 +1,28 @@ +From 1157832777d18f614cee9f396d8f34a938adb796 Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Mon, 24 Feb 2020 11:46:49 +0100 +Subject: [PATCH] Add Requires=cups.socket to cups.service, to make sure they + start in the right order + +Conflict:NA +Reference:https://github.com/OpenPrinting/cups/commit/1157832777d18f614cee9f396d8f34a938adb796 + +--- + scheduler/org.cups.cupsd.service.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in +index baa82b7..e71d391 100644 +--- a/scheduler/org.cups.cupsd.service.in ++++ b/scheduler/org.cups.cupsd.service.in +@@ -3,6 +3,7 @@ Description=CUPS Scheduler + Documentation=man:cupsd(8) + After=network.target ypbind.service + After=sssd.service ++Requires=cups.socket + + [Service] + ExecStart=@sbindir@/cupsd -l +-- +2.27.0 + diff --git a/cups.spec b/cups.spec index a67650eeca7aa4f371e83456425aca45ff5f03aa..255af3f10e828de71cb444491968bd5d038f8788 100644 --- a/cups.spec +++ b/cups.spec @@ -1,7 +1,7 @@ Name: cups Epoch: 1 Version: 2.2.13 -Release: 9 +Release: 10 Summary: CUPS is the standards-based, open source printing system for linux operating systems. License: GPLv2+ and LGPLv2+ with exceptions and AML Url: http://www.cups.org/ @@ -34,6 +34,7 @@ Patch20: cups-dymo-deviceid.patch Patch21: custom-option-keywords-did-not.patch Patch22: CVE-2020-3898.patch Patch6000: backport-CVE-2020-10001.patch +Patch6001: backport-to-make-sure-service-start-in-the-right-order.patch Provides: cupsddk cupsddk-drivers cups-filesystem cups-client cups-ipptool cups-lpd Provides: lpd lpr /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat @@ -325,6 +326,9 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb %doc %{_datadir}/%{name}/www/apple-touch-icon.png %changelog +* Sat Nov 27 2021 hanhui 2.2.13-10 +- DESC:fix downgrade err,start cups.socket failure + * Wed Nov 24 2021 hanhui 2.2.13-9 - DESC:fix compile failure,ippfind error