From 7f81c6bc46167cc63c7cfac4ed67544889ed05d7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 06:11:42 +0000 Subject: import cups-1.6.3-26.el7 --- diff --git a/SOURCES/cups-163-enotif.patch b/SOURCES/cups-163-enotif.patch new file mode 100644 index 0000000..5798135 --- /dev/null +++ b/SOURCES/cups-163-enotif.patch @@ -0,0 +1,14 @@ +diff -up cups-1.6.3/scheduler/subscriptions.c.enotif cups-1.6.3/scheduler/subscriptions.c +--- cups-1.6.3/scheduler/subscriptions.c.enotif 2016-04-20 08:23:22.000000000 +0200 ++++ cups-1.6.3/scheduler/subscriptions.c 2016-04-22 10:35:07.363139391 +0200 +@@ -126,9 +126,7 @@ cupsdAddEvent( + * Check if this subscription requires this event... + */ + +- if ((sub->mask & event) != 0 && +- (sub->dest == dest || !sub->dest) && +- (sub->job == job || !sub->job)) ++ if ((sub->mask & event) != 0 && (sub->dest == dest || !sub->dest || sub->job == job)) + { + /* + * Need this event, so create a new event record... diff --git a/SOURCES/cups-163-fdleak.patch b/SOURCES/cups-163-fdleak.patch new file mode 100644 index 0000000..47d3d91 --- /dev/null +++ b/SOURCES/cups-163-fdleak.patch @@ -0,0 +1,10 @@ +--- cups-1.6.3/cups/usersys.c ++++ cups-1.6.3/cups/usersys.c +@@ -846,6 +846,7 @@ _cupsSetDefaults(void) + #endif /* HAVE_GSSAPI */ + cups_anyroot, cups_expiredroot, + cups_expiredcerts, 1); ++ cupsFileClose(fp); + + /* + * Then user defaults, if it is safe to do so... diff --git a/SOURCES/cups-lpd-manpage.patch b/SOURCES/cups-lpd-manpage.patch index 12cffc1..9a71cc3 100644 --- a/SOURCES/cups-lpd-manpage.patch +++ b/SOURCES/cups-lpd-manpage.patch @@ -1,6 +1,6 @@ -diff -up cups-1.6.2/man/cups-lpd.man.in.lpd-manpage cups-1.6.2/man/cups-lpd.man.in ---- cups-1.6.2/man/cups-lpd.man.in.lpd-manpage 2013-01-10 17:58:21.000000000 +0100 -+++ cups-1.6.2/man/cups-lpd.man.in 2013-03-18 18:59:46.837056613 +0100 +diff -up cups-1.6.3/man/cups-lpd.man.in.lpd-manpage cups-1.6.3/man/cups-lpd.man.in +--- cups-1.6.3/man/cups-lpd.man.in.lpd-manpage 2013-06-07 03:12:52.000000000 +0200 ++++ cups-1.6.3/man/cups-lpd.man.in 2015-10-29 13:37:20.650824688 +0100 @@ -26,39 +26,8 @@ cups-lpd \- receive print jobs and repor \fIcups-lpd\fR is the CUPS Line Printer Daemon ("LPD") mini-server that supports legacy client systems that use the LPD @@ -53,9 +53,20 @@ diff -up cups-1.6.2/man/cups-lpd.man.in.lpd-manpage cups-1.6.2/man/cups-lpd.man. access to only those computers that should be able to print through your server. .LP -@@ -113,9 +81,7 @@ between LPD and IPP Protocols. Since man +@@ -112,10 +80,18 @@ The output of the status requests follow + between LPD and IPP Protocols. Since many LPD implementations stray from this definition, remote status reporting to LPD clients may be unreliable. ++.SH EXAMPLE ++CUPS includes configuration files for ++.BR systemd (8). ++Simply enable the ++.B cups-lpd ++socket using the corresponding control program. ++.nf ++ systemctl enable cups-lpd.socket ++ systemctl start cups-lpd.socket ++.fi .SH SEE ALSO -\fIcups(1)\fR, \fIcupsd(8)\fR, \fIinetconv(1m)\fR, -\fIinetd(8)\fR, \fIxinetd(8)\fR, diff --git a/SPECS/cups.spec b/SPECS/cups.spec index d346be9..85ed7ab 100644 --- a/SPECS/cups.spec +++ b/SPECS/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.6.3 -Release: 22%{?dist} +Release: 26%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -90,6 +90,8 @@ Patch59: cups-str4591.patch Patch60: cups-str4646.patch Patch61: cups-str4648.patch Patch62: cups-start-service.patch +Patch63: cups-163-enotif.patch +Patch64: cups-163-fdleak.patch Patch100: cups-lspp.patch @@ -349,6 +351,10 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %patch61 -p1 -b .str4648 # Start cups.service in multi-user target by default (bug #1236184). %patch62 -p1 -b .start-service +# Email notifications ("lp -m") for printer classes don't work (bug #1257751) +%patch63 -p1 -b .enotif +# Gnome-settings-daemon leaks file descriptors (bug #1297035) +%patch64 -p1 -b .fdleak %if %lspp # LSPP support. @@ -579,12 +585,6 @@ exit 0 %systemd_postun_with_restart cups-lpd.socket exit 0 -%triggerun -- %{name} < 1:1.5.0-22 -# This package is allowed to autostart; however, the upgrade trigger -# in Fedora 16 final failed to actually do this. Do it now as a -# one-off fix for bug #748841. -/bin/systemctl --no-reload enable %{name}.{service,socket,path} >/dev/null 2>&1 || : - %triggerun -- %{name} < 1:1.5-0.9 # Save the current service runlevel info # User must manually run systemd-sysv-convert --apply cups @@ -599,21 +599,13 @@ exit 0 /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : %triggerin -- samba-client -ln -sf ../../../bin/smbspool %{cups_serverbin}/backend/smb || : +ln -sf %{_libexecdir}/samba/cups_backend_smb %{cups_serverbin}/backend/smb || : exit 0 %triggerun -- samba-client [ $2 = 0 ] || exit 0 rm -f %{cups_serverbin}/backend/smb -%triggerin -- samba4-client -ln -sf %{_bindir}/smbspool %{cups_serverbin}/backend/smb || : -exit 0 - -%triggerun -- samba4-client -[ $2 = 0 ] || exit 0 -rm -f %{cups_serverbin}/backend/smb - %files -f %{name}.lang %doc README.txt CREDITS.txt CHANGES.txt %dir %attr(0755,root,lp) %{_sysconfdir}/cups @@ -628,7 +620,7 @@ rm -f %{cups_serverbin}/backend/smb %verify(not md5 size mtime) %config(noreplace) %attr(0600,root,lp) %{_sysconfdir}/cups/classes.conf %verify(not md5 size mtime) %config(noreplace) %attr(0600,root,lp) %{_sysconfdir}/cups/printers.conf %verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/snmp.conf -%verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/subscriptions.conf +%verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/subscriptions.conf %{_sysconfdir}/cups/interfaces %verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/lpoptions %dir %attr(0755,root,lp) %{_sysconfdir}/cups/ppd @@ -759,6 +751,21 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Wed Jun 15 2016 Zdenek Dohnal - 1:1.6.3-26 +- 1302055 - Change symlink for smb backend to /usr/libexec/samba/cups_backend_smb + +* Wed Apr 27 2016 Zdenek Dohnal - 1:1.6.3-25 +- 1297035 - gnome-settings-daemon leaks file descriptors +- 1257751 - Email notifications ("lp -m") for printer classes don't work + +* Tue Apr 19 2016 Zdenek Dohnal - 1:1.6.3-24 +- Fixing once more 1257051, 1259770 + +* Tue Apr 19 2016 Zdenek Dohnal - 1:1.6.3-23 +- 1257051 - cups-lpd man page incomplete +- 1275790 - spec file includes triggers with overlapping version intervals +- 1259770 - permission changed after writing to /etc/cups/subscriptions.conf + * Tue Jul 21 2015 Tim Waugh - 1:1.6.3-22 - Start cups.service in multi-user target by default (bug #1236184), not just cups.socket.