diff --git a/.gitignore b/.gitignore index f911b33..0f267cb 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ cups-1.4.4-source.tar.bz2 /cups-2.2.8-source.tar.gz /cups-2.2.10-source.tar.gz /cups-2.2.11-source.tar.gz +/cups-2.2.12-source.tar.gz diff --git a/cups-synconclose.patch b/cups-synconclose.patch index 8aee02b..0dc5b53 100644 --- a/cups-synconclose.patch +++ b/cups-synconclose.patch @@ -1,6 +1,6 @@ -diff -up cups-2.0.2/conf/cups-files.conf.in.LGOyhq cups-2.0.2/conf/cups-files.conf.in ---- cups-2.0.2/conf/cups-files.conf.in.LGOyhq 2015-02-10 13:51:24.912193296 +0100 -+++ cups-2.0.2/conf/cups-files.conf.in 2015-02-10 13:52:49.400997262 +0100 +diff -up cups-2.2.12/conf/cups-files.conf.in.synconclose cups-2.2.12/conf/cups-files.conf.in +--- cups-2.2.12/conf/cups-files.conf.in.synconclose 2019-08-16 00:35:30.000000000 +0200 ++++ cups-2.2.12/conf/cups-files.conf.in 2019-08-19 09:58:14.646567949 +0200 @@ -7,7 +7,7 @@ #FatalErrors @CUPS_FATAL_ERRORS@ @@ -10,10 +10,10 @@ diff -up cups-2.0.2/conf/cups-files.conf.in.LGOyhq cups-2.0.2/conf/cups-files.co # Default user and group for filters/backends/helper programs; this cannot be # any user or group that resolves to ID 0 for security reasons... -diff -up cups-2.0.2/doc/help/man-cups-files.conf.html.LGOyhq cups-2.0.2/doc/help/man-cups-files.conf.html ---- cups-2.0.2/doc/help/man-cups-files.conf.html.LGOyhq 2015-02-10 13:52:49.400997262 +0100 -+++ cups-2.0.2/doc/help/man-cups-files.conf.html 2015-02-10 13:53:07.057747311 +0100 -@@ -136,7 +136,7 @@ The default is "/etc/cups". +diff -up cups-2.2.12/doc/help/man-cups-files.conf.html.synconclose cups-2.2.12/doc/help/man-cups-files.conf.html +--- cups-2.2.12/doc/help/man-cups-files.conf.html.synconclose 2019-08-16 00:35:30.000000000 +0200 ++++ cups-2.2.12/doc/help/man-cups-files.conf.html 2019-08-19 09:58:14.646567949 +0200 +@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/
Specifies whether the scheduler calls fsync(2) after writing configuration or state files. @@ -22,10 +22,10 @@ diff -up cups-2.0.2/doc/help/man-cups-files.conf.html.LGOyhq cups-2.0.2/doc/help
SystemGroup group-name [ ... group-name ]
Specifies the group(s) to use for @SYSTEM group authentication. The default contains "admin", "lpadmin", "root", "sys", and/or "system". -diff -up cups-2.0.2/man/cups-files.conf.man.in.LGOyhq cups-2.0.2/man/cups-files.conf.man.in ---- cups-2.0.2/man/cups-files.conf.man.in.LGOyhq 2015-02-10 13:52:49.400997262 +0100 -+++ cups-2.0.2/man/cups-files.conf.man.in 2015-02-10 13:53:23.753510964 +0100 -@@ -201,7 +201,7 @@ The default is "/etc/cups". +diff -up cups-2.2.12/man/cups-files.conf.man.in.synconclose cups-2.2.12/man/cups-files.conf.man.in +--- cups-2.2.12/man/cups-files.conf.man.in.synconclose 2019-08-16 00:35:30.000000000 +0200 ++++ cups-2.2.12/man/cups-files.conf.man.in 2019-08-19 09:58:14.646567949 +0200 +@@ -214,7 +214,7 @@ The default is "/var/run/cups" or "/etc/ Specifies whether the scheduler calls .BR fsync (2) after writing configuration or state files. @@ -34,15 +34,15 @@ diff -up cups-2.0.2/man/cups-files.conf.man.in.LGOyhq cups-2.0.2/man/cups-files. .\"#SystemGroup .TP 5 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ] -diff -up cups-2.0.2/scheduler/conf.c.LGOyhq cups-2.0.2/scheduler/conf.c ---- cups-2.0.2/scheduler/conf.c.LGOyhq 2015-02-10 13:51:24.991192177 +0100 -+++ cups-2.0.2/scheduler/conf.c 2015-02-10 13:52:49.401997248 +0100 -@@ -717,7 +717,7 @@ cupsdReadConfiguration(void) +diff -up cups-2.2.12/scheduler/conf.c.synconclose cups-2.2.12/scheduler/conf.c +--- cups-2.2.12/scheduler/conf.c.synconclose 2019-08-19 09:58:14.647567941 +0200 ++++ cups-2.2.12/scheduler/conf.c 2019-08-19 09:59:36.066927455 +0200 +@@ -735,7 +735,7 @@ cupsdReadConfiguration(void) RootCertDuration = 300; Sandboxing = CUPSD_SANDBOXING_STRICT; StrictConformance = FALSE; - SyncOnClose = FALSE; + SyncOnClose = TRUE; - Timeout = DEFAULT_TIMEOUT; + Timeout = 900; WebInterface = CUPS_DEFAULT_WEBIF; diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch index cacd19f..260ac29 100644 --- a/cups-systemd-socket.patch +++ b/cups-systemd-socket.patch @@ -1,7 +1,7 @@ -diff -up cups-2.2.8/scheduler/main.c.systemd-socket cups-2.2.8/scheduler/main.c ---- cups-2.2.8/scheduler/main.c.systemd-socket 2018-06-05 18:06:54.000000000 +0200 -+++ cups-2.2.8/scheduler/main.c 2018-09-19 10:38:09.285892238 +0200 -@@ -681,8 +681,16 @@ main(int argc, /* I - Number of comm +diff -up cups-2.2.12/scheduler/main.c.systemd-socket cups-2.2.12/scheduler/main.c +--- cups-2.2.12/scheduler/main.c.systemd-socket 2019-08-16 00:35:30.000000000 +0200 ++++ cups-2.2.12/scheduler/main.c 2019-08-19 09:31:09.703370325 +0200 +@@ -674,8 +674,16 @@ main(int argc, /* I - Number of comm #ifdef HAVE_ONDEMAND if (OnDemand) @@ -19,9 +19,9 @@ diff -up cups-2.2.8/scheduler/main.c.systemd-socket cups-2.2.8/scheduler/main.c #endif /* HAVE_ONDEMAND */ if (fg) cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground."); -diff -up cups-2.2.8/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.path.in ---- cups-2.2.8/scheduler/org.cups.cupsd.path.in.systemd-socket 2018-06-05 18:06:54.000000000 +0200 -+++ cups-2.2.8/scheduler/org.cups.cupsd.path.in 2018-09-19 10:46:11.246666713 +0200 +diff -up cups-2.2.12/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.path.in +--- cups-2.2.12/scheduler/org.cups.cupsd.path.in.systemd-socket 2019-08-16 00:35:30.000000000 +0200 ++++ cups-2.2.12/scheduler/org.cups.cupsd.path.in 2019-08-19 09:31:09.703370325 +0200 @@ -1,6 +1,6 @@ [Unit] Description=CUPS Scheduler @@ -30,14 +30,15 @@ diff -up cups-2.2.8/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.8/s [Path] PathExists=@CUPS_CACHEDIR@/org.cups.cupsd -diff -up cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.service.in ---- cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket 2018-06-05 18:06:54.000000000 +0200 -+++ cups-2.2.8/scheduler/org.cups.cupsd.service.in 2018-09-19 10:41:11.378295760 +0200 -@@ -1,12 +1,13 @@ +diff -up cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.service.in +--- cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket 2019-08-19 09:31:09.703370325 +0200 ++++ cups-2.2.12/scheduler/org.cups.cupsd.service.in 2019-08-19 09:54:58.890036404 +0200 +@@ -1,13 +1,13 @@ [Unit] Description=CUPS Scheduler Documentation=man:cupsd(8) -+After=network.target +-After=sssd.service ++After=sssd.service network.target [Service] ExecStart=@sbindir@/cupsd -l @@ -49,9 +50,9 @@ diff -up cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2. -Also=org.cups.cupsd.socket org.cups.cupsd.path +Also=cups.socket cups.path WantedBy=printer.target -diff -up cups-2.2.8/scheduler/org.cups.cupsd.socket.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.socket.in ---- cups-2.2.8/scheduler/org.cups.cupsd.socket.in.systemd-socket 2018-09-19 10:42:21.411681757 +0200 -+++ cups-2.2.8/scheduler/org.cups.cupsd.socket.in 2018-09-19 10:42:44.819476530 +0200 +diff -up cups-2.2.12/scheduler/org.cups.cupsd.socket.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.socket.in +--- cups-2.2.12/scheduler/org.cups.cupsd.socket.in.systemd-socket 2019-08-16 00:35:30.000000000 +0200 ++++ cups-2.2.12/scheduler/org.cups.cupsd.socket.in 2019-08-19 09:31:09.703370325 +0200 @@ -1,6 +1,6 @@ [Unit] Description=CUPS Scheduler @@ -60,9 +61,9 @@ diff -up cups-2.2.8/scheduler/org.cups.cupsd.socket.in.systemd-socket cups-2.2.8 [Socket] ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@ -diff -up cups-2.2.8/scheduler/org.cups.cups-lpd.socket.systemd-socket cups-2.2.8/scheduler/org.cups.cups-lpd.socket ---- cups-2.2.8/scheduler/org.cups.cups-lpd.socket.systemd-socket 2018-09-19 10:53:59.222563802 +0200 -+++ cups-2.2.8/scheduler/org.cups.cups-lpd.socket 2018-09-19 10:54:16.483412464 +0200 +diff -up cups-2.2.12/scheduler/org.cups.cups-lpd.socket.systemd-socket cups-2.2.12/scheduler/org.cups.cups-lpd.socket +--- cups-2.2.12/scheduler/org.cups.cups-lpd.socket.systemd-socket 2019-08-16 00:35:30.000000000 +0200 ++++ cups-2.2.12/scheduler/org.cups.cups-lpd.socket 2019-08-19 09:31:09.703370325 +0200 @@ -1,6 +1,6 @@ [Unit] Description=CUPS LPD Server Socket diff --git a/cups-ypbind.patch b/cups-ypbind.patch index f942708..17e90a5 100644 --- a/cups-ypbind.patch +++ b/cups-ypbind.patch @@ -1,12 +1,12 @@ -diff -up cups-2.2.0/scheduler/org.cups.cupsd.service.in.ypbind cups-2.2.0/scheduler/org.cups.cupsd.service.in ---- cups-2.2.0/scheduler/org.cups.cupsd.service.in.ypbind 2017-09-22 16:51:39.053585694 +0200 -+++ cups-2.2.0/scheduler/org.cups.cupsd.service.in 2017-09-22 16:52:02.588403584 +0200 +diff -up cups-2.2.12/scheduler/org.cups.cupsd.service.in.ypbind cups-2.2.12/scheduler/org.cups.cupsd.service.in +--- cups-2.2.12/scheduler/org.cups.cupsd.service.in.ypbind 2019-08-19 10:00:47.586326493 +0200 ++++ cups-2.2.12/scheduler/org.cups.cupsd.service.in 2019-08-19 10:01:39.295890076 +0200 @@ -1,7 +1,7 @@ [Unit] Description=CUPS Scheduler Documentation=man:cupsd(8) --After=network.target -+After=network.target ypbind.service +-After=sssd.service network.target ++After=sssd.service network.target ypbind.service [Service] ExecStart=@sbindir@/cupsd -l diff --git a/cups.spec b/cups.spec index 98bf7b6..0cdeb29 100644 --- a/cups.spec +++ b/cups.spec @@ -14,8 +14,8 @@ Summary: CUPS printing system Name: cups Epoch: 1 -Version: 2.2.11 -Release: 4%{?dist} +Version: 2.2.12 +Release: 1%{?dist} 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 @@ -96,13 +96,6 @@ Patch18: cups-filter-debug.patch Patch29: cups-dymo-deviceid.patch #### UPSTREAM PATCHES #### -# possible security issue - all answers tell to -# possible attacker supported options, which -# can narrow the attack vector - do not send it -# in regular message -Patch40: cups-dont-send-http-options-field.patch -# support Emulator ppd keyword, because Samsung drivers depend on it -Patch41: 0001-Add-a-workaround-for-old-Samsung-drivers-Issue-5562.patch ##### Patches removed because IMHO they aren't no longer needed ##### but still I'll leave them in git in case their removal @@ -346,9 +339,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %endif #### UPSTREAMED PATCHES #### -%patch40 -p1 -b .dont-send-http-options-field -# Samsung depends on Emulator ppd keyword - this is temporary workaround -%patch41 -p1 -b .samsung-workaround # if cupsd is set to log into /var/log/cups, then 'MaxLogSize 0' needs to be # in cupsd.conf to disable cupsd logrotate functionality and use logrotated @@ -755,6 +745,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Mon Aug 19 2019 Zdenek Dohnal - 1:2.2.12-1 +- 2.2.12 + * Wed Jul 24 2019 Fedora Release Engineering - 1:2.2.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 60d7007..15a1f60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cups-2.2.11-source.tar.gz) = 21a6916041b50044d336871f10d1192635458a3d318f19a18ad21d27027dd3839400601019e758424c218225a34aba148ba3a57f0ce3fe14c4df03bd1fde3403 +SHA512 (cups-2.2.12-source.tar.gz) = b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6