From cdaa46736bfa4cab81fd9fd981138fadeae5d24a Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Sep 25 2014 13:46:51 +0000
Subject: cups-systemd-socket.patch: use upstream version of cupsd.socket


Some time ago we were using the following in cupsd.socket:
ListenStream=631
ListenDatagram=0.0.0.0:631

Then later we removed it due to
https://bugzilla.redhat.com/show_bug.cgi?id=842365

Upstream now (2.0rc1) uses
ListenStream=[::1]:631
ListenStream=127.0.0.1:631
which I think avoids the vulnerability (CVE-2012-6094)
so I guess we can actually go along with it.

---

diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index e04d501..f42cbed 100644
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -52,17 +52,3 @@ diff -up cups-2.0rc1/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0
  
  [Install]
  Also=org.cups.cupsd.socket org.cups.cupsd.path
-diff -up cups-2.0rc1/scheduler/org.cups.cupsd.socket.in.systemd-socket cups-2.0rc1/scheduler/org.cups.cupsd.socket.in
---- cups-2.0rc1/scheduler/org.cups.cupsd.socket.in.systemd-socket	2014-03-21 17:42:53.000000000 +0100
-+++ cups-2.0rc1/scheduler/org.cups.cupsd.socket.in	2014-09-12 14:43:37.510605998 +0200
-@@ -3,10 +3,6 @@ Description=CUPS Scheduler
- 
- [Socket]
- ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
--ListenStream=[::1]:631
--ListenStream=127.0.0.1:631
--BindIPv6Only=ipv6-only
--ReusePort=true
- 
- [Install]
- WantedBy=sockets.target