From ef9c2561d5c38b85d01eae569095e5a0d9b15a2d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 14 Apr 2021 12:30:36 +0200 Subject: [PATCH] 1949054 - Use nss-user-lookup.target instead of sssd.service and ypbind.service --- cups-nssuserlookup-target.patch | 13 +++++++++++++ cups.spec | 7 +++++++ 2 files changed, 20 insertions(+) create mode 100644 cups-nssuserlookup-target.patch diff --git a/cups-nssuserlookup-target.patch b/cups-nssuserlookup-target.patch new file mode 100644 index 0000000..35eff69 --- /dev/null +++ b/cups-nssuserlookup-target.patch @@ -0,0 +1,13 @@ +diff --git a/scheduler/cups.service.in b/scheduler/cups.service.in +index a3fa0e8..baff51b 100644 +--- a/scheduler/cups.service.in ++++ b/scheduler/cups.service.in +@@ -1,7 +1,7 @@ + [Unit] + Description=CUPS Scheduler + Documentation=man:cupsd(8) +-After=network.target sssd.service ypbind.service nslcd.service ++After=network.target nss-user-lookup.target nslcd.service + Requires=cups.socket + + [Service] diff --git a/cups.spec b/cups.spec index 66fcddc..aa75960 100644 --- a/cups.spec +++ b/cups.spec @@ -73,7 +73,11 @@ Patch100: cups-lspp.patch Patch14: cups-logs.patch # 1935318 - old samsung USB devices malfunction with the current # (250ms) timeout for usb bulk transaction +# https://github.com/OpenPrinting/cups/pull/174 Patch15: 0001-backend-usb-libusb.c-Use-60s-timeout-for-reading-at-.patch +# 1949054 - Use nss-user-lookup.target instead of sssd.service and ypbind.service +# https://github.com/OpenPrinting/cups/pull/141 +Patch16: cups-nssuserlookup-target.patch ##### Patches removed because IMHO they aren't no longer needed ##### but still I'll leave them in git in case their removal @@ -279,6 +283,8 @@ to CUPS daemon. This solution will substitute printer drivers and raw queues in # 1935318 - old samsung USB devices malfunction with the current #(250ms) timeout for usb bulk transaction %patch15 -p1 -b .usb-read-timeout +# 1949054 - Use nss-user-lookup.target instead of sssd.service and ypbind.service +%patch16 -p1 -b .nssuserlookup-target %if %{lspp} @@ -678,6 +684,7 @@ rm -f %{cups_serverbin}/backend/smb %changelog * Wed Apr 14 2021 Zdenek Dohnal - 1:2.3.3op2-4 - 1935318 - old samsung USB devices malfunction with the current (250ms) timeout for usb bulk transaction +- 1949054 - Use nss-user-lookup.target instead of sssd.service and ypbind.service * Mon Mar 22 2021 Zdenek Dohnal - 1:2.3.3op2-3 - add [Job N] in logs for better debugging