From 0a2acd71f7b5aef17fc723f90c551186540411bd Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Aug 06 2018 15:21:17 +0000
Subject: 1612935 - cups doesn't restart after cupsctl command


---

diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index a1ee6de..6ffe6a3 100644
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -1,7 +1,7 @@
-diff -up cups-2.2.5/scheduler/main.c.systemd-socket cups-2.2.5/scheduler/main.c
---- cups-2.2.5/scheduler/main.c.systemd-socket	2017-10-17 18:59:53.732431498 +0200
-+++ cups-2.2.5/scheduler/main.c	2017-10-17 19:02:13.132275861 +0200
-@@ -691,8 +691,16 @@ main(int  argc,				/* I - Number of comm
+diff -up cups-2.2.6/scheduler/main.c.systemd-socket cups-2.2.6/scheduler/main.c
+--- cups-2.2.6/scheduler/main.c.systemd-socket	2018-08-06 16:53:50.854184821 +0200
++++ cups-2.2.6/scheduler/main.c	2018-08-06 16:53:50.909184390 +0200
+@@ -691,8 +727,16 @@ main(int  argc,				/* I - Number of comm
  
  #ifdef HAVE_ONDEMAND
    if (OnDemand)
@@ -19,9 +19,9 @@ diff -up cups-2.2.5/scheduler/main.c.systemd-socket cups-2.2.5/scheduler/main.c
  #endif /* HAVE_ONDEMAND */
    if (fg)
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
-diff -up cups-2.2.5/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.5/scheduler/org.cups.cupsd.path.in
---- cups-2.2.5/scheduler/org.cups.cupsd.path.in.systemd-socket	2017-10-13 20:22:26.000000000 +0200
-+++ cups-2.2.5/scheduler/org.cups.cupsd.path.in	2017-10-17 18:59:53.732431498 +0200
+diff -up cups-2.2.6/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.6/scheduler/org.cups.cupsd.path.in
+--- cups-2.2.6/scheduler/org.cups.cupsd.path.in.systemd-socket	2017-11-01 15:57:53.000000000 +0100
++++ cups-2.2.6/scheduler/org.cups.cupsd.path.in	2018-08-06 16:53:50.883184594 +0200
 @@ -3,7 +3,7 @@ Description=CUPS Scheduler
  PartOf=org.cups.cupsd.service
  
@@ -31,10 +31,10 @@ diff -up cups-2.2.5/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.5/s
  
  [Install]
  WantedBy=multi-user.target
-diff -up cups-2.2.5/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.5/scheduler/org.cups.cupsd.service.in
---- cups-2.2.5/scheduler/org.cups.cupsd.service.in.systemd-socket	2017-10-13 20:22:26.000000000 +0200
-+++ cups-2.2.5/scheduler/org.cups.cupsd.service.in	2017-10-17 18:59:53.732431498 +0200
-@@ -1,10 +1,11 @@
+diff -up cups-2.2.6/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.6/scheduler/org.cups.cupsd.service.in
+--- cups-2.2.6/scheduler/org.cups.cupsd.service.in.systemd-socket	2017-11-01 15:57:53.000000000 +0100
++++ cups-2.2.6/scheduler/org.cups.cupsd.service.in	2018-08-06 17:02:28.518106087 +0200
+@@ -1,10 +1,12 @@
  [Unit]
  Description=CUPS Scheduler
  Documentation=man:cupsd(8)
@@ -44,6 +44,7 @@ diff -up cups-2.2.5/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.
  ExecStart=@sbindir@/cupsd -l
 -Type=simple
 +Type=notify
++Restart=on-failure
  
  [Install]
  Also=org.cups.cupsd.socket org.cups.cupsd.path
diff --git a/cups.spec b/cups.spec
index 961a3d6..23341f2 100644
--- a/cups.spec
+++ b/cups.spec
@@ -15,7 +15,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 2.2.6
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
 Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@@ -666,6 +666,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Mon Aug 06 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.6-17
+- 1612935 - cups doesn't restart after cupsctl command
+
 * Mon Jul 23 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.6-16
 - 1607293 - CVE-2018-4180 CVE-2018-4181 CVE-2018-4182 CVE-2018-4183 cups: various flaws [fedora-all]