rpms/cups
5
0
Fork 0
Code Issues Pull Requests Releases Activity

2.2.12

Browse Source
This commit is contained in:
Zdenek Dohnal 2019-08-19 12:34:37 +02:00
parent 9fbbcf38fc
commit 9cdd138e05
6 changed files with 47 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -89,3 +89,4 @@ cups-1.4.4-source.tar.bz2
/cups-2.2.8-source.tar.gz /cups-2.2.8-source.tar.gz
/cups-2.2.10-source.tar.gz /cups-2.2.10-source.tar.gz
/cups-2.2.11-source.tar.gz /cups-2.2.11-source.tar.gz
/cups-2.2.12-source.tar.gz

32
cups-synconclose.patch
View File

@ -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 diff -up cups-2.2.12/conf/cups-files.conf.in.synconclose cups-2.2.12/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.2.12/conf/cups-files.conf.in.synconclose 2019-08-16 00:35:30.000000000 +0200
+++ cups-2.0.2/conf/cups-files.conf.in 2015-02-10 13:52:49.400997262 +0100 +++ cups-2.2.12/conf/cups-files.conf.in 2019-08-19 09:58:14.646567949 +0200
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
#FatalErrors @CUPS_FATAL_ERRORS@ #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 # Default user and group for filters/backends/helper programs; this cannot be
# any user or group that resolves to ID 0 for security reasons... # 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 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.0.2/doc/help/man-cups-files.conf.html.LGOyhq 2015-02-10 13:52:49.400997262 +0100 --- cups-2.2.12/doc/help/man-cups-files.conf.html.synconclose 2019-08-16 00:35:30.000000000 +0200
+++ cups-2.0.2/doc/help/man-cups-files.conf.html 2015-02-10 13:53:07.057747311 +0100 +++ cups-2.2.12/doc/help/man-cups-files.conf.html 2019-08-19 09:58:14.646567949 +0200
@@ -136,7 +136,7 @@ The default is "/etc/cups". @@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/
<dd style="margin-left: 5.0em">Specifies whether the scheduler calls <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
<b>fsync</b>(2) <b>fsync</b>(2)
after writing configuration or state files. 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
<dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ] <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
<dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication. <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
The default contains "admin", "lpadmin", "root", "sys", and/or "system". 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 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.0.2/man/cups-files.conf.man.in.LGOyhq 2015-02-10 13:52:49.400997262 +0100 --- cups-2.2.12/man/cups-files.conf.man.in.synconclose 2019-08-16 00:35:30.000000000 +0200
+++ cups-2.0.2/man/cups-files.conf.man.in 2015-02-10 13:53:23.753510964 +0100 +++ cups-2.2.12/man/cups-files.conf.man.in 2019-08-19 09:58:14.646567949 +0200
@@ -201,7 +201,7 @@ The default is "/etc/cups". @@ -214,7 +214,7 @@ The default is "/var/run/cups" or "/etc/
Specifies whether the scheduler calls Specifies whether the scheduler calls
.BR fsync (2) .BR fsync (2)
after writing configuration or state files. 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 .\"#SystemGroup
.TP 5 .TP 5
\fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ] \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff -up cups-2.0.2/scheduler/conf.c.LGOyhq cups-2.0.2/scheduler/conf.c diff -up cups-2.2.12/scheduler/conf.c.synconclose cups-2.2.12/scheduler/conf.c
--- cups-2.0.2/scheduler/conf.c.LGOyhq 2015-02-10 13:51:24.991192177 +0100 --- cups-2.2.12/scheduler/conf.c.synconclose 2019-08-19 09:58:14.647567941 +0200
+++ cups-2.0.2/scheduler/conf.c 2015-02-10 13:52:49.401997248 +0100 +++ cups-2.2.12/scheduler/conf.c 2019-08-19 09:59:36.066927455 +0200
@@ -717,7 +717,7 @@ cupsdReadConfiguration(void) @@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
RootCertDuration = 300; RootCertDuration = 300;
Sandboxing = CUPSD_SANDBOXING_STRICT; Sandboxing = CUPSD_SANDBOXING_STRICT;
StrictConformance = FALSE; StrictConformance = FALSE;
- SyncOnClose = FALSE; - SyncOnClose = FALSE;
+ SyncOnClose = TRUE; + SyncOnClose = TRUE;
Timeout = DEFAULT_TIMEOUT; Timeout = 900;
WebInterface = CUPS_DEFAULT_WEBIF; WebInterface = CUPS_DEFAULT_WEBIF;

37
cups-systemd-socket.patch
View File

@ -1,7 +1,7 @@
diff -up cups-2.2.8/scheduler/main.c.systemd-socket cups-2.2.8/scheduler/main.c diff -up cups-2.2.12/scheduler/main.c.systemd-socket cups-2.2.12/scheduler/main.c
--- cups-2.2.8/scheduler/main.c.systemd-socket 2018-06-05 18:06:54.000000000 +0200 --- cups-2.2.12/scheduler/main.c.systemd-socket 2019-08-16 00:35:30.000000000 +0200
+++ cups-2.2.8/scheduler/main.c 2018-09-19 10:38:09.285892238 +0200 +++ cups-2.2.12/scheduler/main.c 2019-08-19 09:31:09.703370325 +0200
@@ -681,8 +681,16 @@ main(int argc, /* I - Number of comm @@ -674,8 +674,16 @@ main(int argc, /* I - Number of comm
#ifdef HAVE_ONDEMAND #ifdef HAVE_ONDEMAND
if (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 */ #endif /* HAVE_ONDEMAND */
if (fg) if (fg)
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground."); 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 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.8/scheduler/org.cups.cupsd.path.in.systemd-socket 2018-06-05 18:06:54.000000000 +0200 --- cups-2.2.12/scheduler/org.cups.cupsd.path.in.systemd-socket 2019-08-16 00:35:30.000000000 +0200
+++ cups-2.2.8/scheduler/org.cups.cupsd.path.in 2018-09-19 10:46:11.246666713 +0200 +++ cups-2.2.12/scheduler/org.cups.cupsd.path.in 2019-08-19 09:31:09.703370325 +0200
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
[Unit] [Unit]
Description=CUPS Scheduler 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] [Path]
PathExists=@CUPS_CACHEDIR@/org.cups.cupsd 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 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.8/scheduler/org.cups.cupsd.service.in.systemd-socket 2018-06-05 18:06:54.000000000 +0200 --- cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket 2019-08-19 09:31:09.703370325 +0200
+++ cups-2.2.8/scheduler/org.cups.cupsd.service.in 2018-09-19 10:41:11.378295760 +0200 +++ cups-2.2.12/scheduler/org.cups.cupsd.service.in 2019-08-19 09:54:58.890036404 +0200
@@ -1,12 +1,13 @@ @@ -1,13 +1,13 @@
[Unit] [Unit]
Description=CUPS Scheduler Description=CUPS Scheduler
Documentation=man:cupsd(8) Documentation=man:cupsd(8)
+After=network.target -After=sssd.service
+After=sssd.service network.target
[Service] [Service]
ExecStart=@sbindir@/cupsd -l 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=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path +Also=cups.socket cups.path
WantedBy=printer.target 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 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.8/scheduler/org.cups.cupsd.socket.in.systemd-socket 2018-09-19 10:42:21.411681757 +0200 --- cups-2.2.12/scheduler/org.cups.cupsd.socket.in.systemd-socket 2019-08-16 00:35:30.000000000 +0200
+++ cups-2.2.8/scheduler/org.cups.cupsd.socket.in 2018-09-19 10:42:44.819476530 +0200 +++ cups-2.2.12/scheduler/org.cups.cupsd.socket.in 2019-08-19 09:31:09.703370325 +0200
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
[Unit] [Unit]
Description=CUPS Scheduler 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] [Socket]
ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@ 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 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.8/scheduler/org.cups.cups-lpd.socket.systemd-socket 2018-09-19 10:53:59.222563802 +0200 --- cups-2.2.12/scheduler/org.cups.cups-lpd.socket.systemd-socket 2019-08-16 00:35:30.000000000 +0200
+++ cups-2.2.8/scheduler/org.cups.cups-lpd.socket 2018-09-19 10:54:16.483412464 +0200 +++ cups-2.2.12/scheduler/org.cups.cups-lpd.socket 2019-08-19 09:31:09.703370325 +0200
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
[Unit] [Unit]
Description=CUPS LPD Server Socket Description=CUPS LPD Server Socket

10
cups-ypbind.patch
View File

@ -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 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.0/scheduler/org.cups.cupsd.service.in.ypbind 2017-09-22 16:51:39.053585694 +0200 --- cups-2.2.12/scheduler/org.cups.cupsd.service.in.ypbind 2019-08-19 10:00:47.586326493 +0200
+++ cups-2.2.0/scheduler/org.cups.cupsd.service.in 2017-09-22 16:52:02.588403584 +0200 +++ cups-2.2.12/scheduler/org.cups.cupsd.service.in 2019-08-19 10:01:39.295890076 +0200
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
[Unit] [Unit]
Description=CUPS Scheduler Description=CUPS Scheduler
Documentation=man:cupsd(8) Documentation=man:cupsd(8)
-After=network.target -After=sssd.service network.target
+After=network.target ypbind.service +After=sssd.service network.target ypbind.service
[Service] [Service]
ExecStart=@sbindir@/cupsd -l ExecStart=@sbindir@/cupsd -l

17
cups.spec
View File

@ -14,8 +14,8 @@
Summary: CUPS printing system Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 2.2.11 Version: 2.2.12
Release: 4%{?dist} Release: 1%{?dist}
License: GPLv2+ and LGPLv2+ with exceptions and AML License: GPLv2+ and LGPLv2+ with exceptions and AML
Url: http://www.cups.org/ Url: http://www.cups.org/
Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz 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 Patch29: cups-dymo-deviceid.patch
#### UPSTREAM PATCHES #### #### 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 ##### Patches removed because IMHO they aren't no longer needed
##### but still I'll leave them in git in case their removal ##### 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 %endif
#### UPSTREAMED PATCHES #### #### 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 # 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 # 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 %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Mon Aug 19 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.12-1
- 2.2.12
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.11-4 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (cups-2.2.11-source.tar.gz) = 21a6916041b50044d336871f10d1192635458a3d318f19a18ad21d27027dd3839400601019e758424c218225a34aba148ba3a57f0ce3fe14c4df03bd1fde3403 SHA512 (cups-2.2.12-source.tar.gz) = b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6