Hello community, here is the log from the commit of package cups for openSUSE:Factory checked in at 2015-09-16 10:36:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups (Old) and /work/SRC/openSUSE:Factory/.cups.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups" Changes: -------- --- /work/SRC/openSUSE:Factory/cups/cups.changes 2015-09-03 18:07:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cups.new/cups.changes 2015-09-16 10:36:43.000000000 +0200 @@ -1,0 +2,45 @@ +Tue Sep 1 11:55:07 CEST 2015 - [email protected] + +- Version upgrade to 2.1.0: + CUPS 2.1.0 offers improved support for IPP Everywhere, + adds support for advanced logging using journald on Linux, and + includes new security features for encrypted printing and + reduced network visibility in the default configuration. + A detailed list of changes can be found in the CHANGES.txt file. + Changes include (excerpt): + * Added support for 3D printers (basic types only, + no built-in filters) based on PWG white paper. + * The IPP backend now stops sending print data + if the printer indicates the job has been aborted + or canceled (<rdar://problem/17837631>) + * The IPP backend now sends the job-pages-per-set + attribute when printing multiple copy jobs with + finishings (<rdar://problem/16792757>) + * The IPP backend now updates the cupsMandatory values when the + printer configuration changes (<rdar://problem/18126570>) + * No longer install banner files since third-party banner + filters now supply their own (STR #4518) + * The scheduler no longer listens on the loopback + interface unless the web interface or printer sharing + are enabled (<rdar://problem/9136448>) + * Added a PPD generator for IPP Everywhere printers (STR #4258) + * Now install "default" versions of more configuration + files (<rdar://problem/19024491>) in particular + cups-files.conf.default and snmp.conf.default + * Added SSLOptions values to allow Diffie-Hellman key exchange + and disable TLS/1.0 support. + * Updated the scheduler to support more IPP Everywhere + attributes (STR #4630) + * The scheduler now supports advanced ASL and journald logging + when "syslog" output is configured (STR #4474) + * The scheduler now supports logging to stderr when running + in the foreground (STR #4505) +- Adapted patches so that they apply to CUPS 2.1.0 sources: + * cups-2.1.0-choose-uri-template.patch replaces + cups-1.2rc1-template.patch + * cups-2.1.0-default-webcontent-path.patch replaces + cups-1.4.3-default-webcontent-path.patch + * cups-2.1.0-cups-systemd-socket.patch replaces + cups-systemd-socket.patch + +------------------------------------------------------------------- @@ -4 +49,2 @@ -- Fix bnc#943950, escape the macro call %systemd-tmpfiles in comment +- Fix bnc#943950, escape the macro call %systemd-tmpfiles + in comment. @@ -13,3 +59,6 @@ - * The IPP backend did not respond to side-channel requests (STR #4645) - * The scheduler did not start all pending jobs at once (STR #4646) - * The web search incorrectly searched time-at-xxx values (STR #4652) + * The IPP backend did not respond to side-channel + requests (STR #4645) + * The scheduler did not start all pending jobs + at once (STR #4646) + * The web search incorrectly searched time-at-xxx + values (STR #4652) @@ -17,3 +66,4 @@ - * The scheduler incorrectly started jobs while canceling multiple jobs (STR - #4648) - * Fixed processing of server overrides without port numbers (STR #4675) + * The scheduler incorrectly started jobs while canceling + multiple jobs (STR #4648) + * Fixed processing of server overrides without + port numbers (STR #4675) Old: ---- cups-1.2rc1-template.patch cups-1.4.3-default-webcontent-path.patch cups-2.0.4-source.tar.bz2 cups-2.0.4-source.tar.bz2.sig cups-systemd-socket.patch New: ---- cups-2.1.0-choose-uri-template.patch cups-2.1.0-cups-systemd-socket.patch cups-2.1.0-default-webcontent-path.patch cups-2.1.0-source.tar.bz2 cups-2.1.0-source.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.kLngUA/_old 2015-09-16 10:36:45.000000000 +0200 +++ /var/tmp/diff_new_pack.kLngUA/_new 2015-09-16 10:36:45.000000000 +0200 @@ -19,7 +19,7 @@ # _tmpfilesdir is not defined in systemd macros up to openSUSE 13.2 %{!?_tmpfilesdir: %global _tmpfilesdir %{_libexecdir}/tmpfiles.d } Name: cups -Version: 2.0.4 +Version: 2.1.0 Release: 0 Summary: The Common UNIX Printing System License: GPL-2.0 and LGPL-2.1 @@ -36,15 +36,15 @@ # Patch0...Patch9 is for patches from upstream: # Source10...Source99 is for sources from SUSE which are intended for upstream: # Patch10...Patch99 is for patches from SUSE which are intended for upstream: -# Patch10 cups-1.2rc1-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl: -Patch10: cups-1.2rc1-template.patch -# Patch11 cups-1.4.3-default-webcontent-path.patch changes the default path whereto the +# Patch10 cups-2.1.0-choose-uri-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl: +Patch10: cups-2.1.0-choose-uri-template.patch +# Patch11 cups-2.1.0-default-webcontent-path.patch changes the default path whereto the # web content is installed from /usr/share/doc/cups to /usr/share/cups/webcontent # because the files of the CUPS web content are no documentation, see CUPS STR #3578 # and http://bugzilla.novell.com/show_bug.cgi?id=546023#c6 and subsequent comments: -Patch11: cups-1.4.3-default-webcontent-path.patch -# Patch12 cups-systemd-socket.patch Use systemd socket activation properly: -Patch12: cups-systemd-socket.patch +Patch11: cups-2.1.0-default-webcontent-path.patch +# Patch12 cups-2.1.0-cups-systemd-socket.patch Use systemd socket activation properly: +Patch12: cups-2.1.0-cups-systemd-socket.patch # Patch100...Patch999 is for private patches from SUSE which are not intended for upstream: # Patch100 cups-pam.diff adds conf/pam.suse regarding support for PAM for SUSE: Patch100: cups-pam.diff @@ -245,15 +245,15 @@ %setup -q # Patch0...Patch9 is for patches from upstream: # Patch10...Patch99 is for patches from SUSE which are intended for upstream: -# Patch10 cups-1.2rc1-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl: -%patch10 -p1 -# Patch11 cups-1.4.3-default-webcontent-path.patch changes the default path whereto the +# Patch10 cups-2.1.0-choose-uri-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl: +%patch10 -b choose-uri-template.orig +# Patch11 cups-2.1.0-default-webcontent-path.patch changes the default path whereto the # web content is installed from /usr/share/doc/cups to /usr/share/cups/webcontent # because the files of the CUPS web content are no documentation, see CUPS STR #3578 # and http://bugzilla.novell.com/show_bug.cgi?id=546023#c6 and subsequent comments: -%patch11 -# Patch12 cups-systemd-socket.patch Use systemd socket activation properly: -%patch12 -p1 +%patch11 -b default-webcontent-path.prig +# Patch12 cups-2.1.0-cups-systemd-socket.patch Use systemd socket activation properly: +%patch12 -b cups-systemd-socket.orig # Patch100...Patch999 is for private patches from SUSE which are not intended for upstream: # Patch100 cups-pam.diff adds conf/pam.suse regarding support for PAM for SUSE: %patch100 @@ -283,15 +283,15 @@ export LDFLAGS="-pie" export CXX=c++ export CC=cc -# As long as cups-1.4.3-default-webcontent-path.patch is applied +# As long as cups-2.1.0-default-webcontent-path.patch is applied # configure --with-docdir=... would be no longer needed -# because cups-1.4.3-default-webcontent-path.patch changes the +# because cups-2.1.0-default-webcontent-path.patch changes the # default with-docdir path whereto the web content is installed # from /usr/share/doc/cups to /usr/share/cups/webcontent because the # files of the CUPS web content are no documentation, see CUPS STR #3578 # and http://bugzilla.novell.com/show_bug.cgi?id=546023#c6 and subsequent comments # so that the new default could be used as is but upstream may accept -# cups-1.4.3-default-webcontent-path.patch in general but change its default +# cups-2.1.0-default-webcontent-path.patch in general but change its default # so that with-docdir is explicitly set here to be future proof. # Regarding --with-rundir and --with-domainsocket # see https://www.cups.org/str.php?L4306 and @@ -335,15 +335,6 @@ %install make BUILDROOT=%{buildroot} install -# Remove the CUPS banner files in /usr/share/cups/banners/ and -# the CUPS testpage /usr/share/cups/data/testprint (which is also a CUPS banner file type) -# because they do no longer work since CUPS >= 1.6, see http://www.cups.org/str.php?L4120 -# because there is no longer a filter for Linux that can convert the CUPS banner files. -# Since CUPS >= 1.6 only the banner files and testpage in the cups-filters package work -# via the cups-filters PDF workflow and the cups-filters package also provides -# the matching bannertopdf filter (see https://bugzilla.novell.com/show_bug.cgi?id=873376): -rm -r %{buildroot}%{_datadir}/cups/banners -rm %{buildroot}%{_datadir}/cups/data/testprint # Use CUPS' own fonts (i.e. make CUPS work again in compliance with upstream). # In ancient times (see the RPM changelog entry dated "Thu Aug 16 17:05:19 CEST 2001") # there was the general opinion it would be a great idea to deviate from CUPS upstream @@ -506,6 +497,8 @@ %config %{_sysconfdir}/pam.d/cups %config %{_sysconfdir}/dbus-1/system.d/cups.conf %config %{_sysconfdir}/cups/cupsd.conf.default +%config %{_sysconfdir}/cups/cups-files.conf.default +%config %{_sysconfdir}/cups/snmp.conf.default %dir %attr(755,root,lp) %{_sysconfdir}/cups/interfaces %dir %attr(755,root,lp) %{_sysconfdir}/cups/ppd %dir %attr(700,root,lp) %{_sysconfdir}/cups/ssl ++++++ cups-2.1.0-choose-uri-template.patch ++++++ --- templates/choose-uri.tmpl.orig 2013-10-21 23:41:21.000000000 +0200 +++ templates/choose-uri.tmpl 2015-09-01 11:00:50.000000000 +0200 @@ -23,6 +23,9 @@ lpd://hostname/queue + smb://servername/printer + smb://username:password@workgroup/servername/printer + socket://hostname socket://hostname:9100 </PRE> ++++++ cups-2.1.0-cups-systemd-socket.patch ++++++ --- scheduler/main.c.orig 2015-06-08 20:32:35.000000000 +0200 +++ scheduler/main.c 2015-09-01 11:19:36.000000000 +0200 @@ -656,7 +656,15 @@ main(int argc, /* I - Number of comm #if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD) if (OnDemand) + { cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand."); +# ifdef HAVE_SYSTEMD + sd_notifyf(0, "READY=1\n" + "STATUS=Scheduler is running...\n" + "MAINPID=%lu", + (unsigned long) getpid()); +# endif /* HAVE_SYSTEMD */ + } else #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */ if (fg) --- scheduler/org.cups.cupsd.path.in.orig 2014-03-21 15:50:24.000000000 +0100 +++ scheduler/org.cups.cupsd.path.in 2015-09-01 11:20:37.000000000 +0200 @@ -3,6 +3,7 @@ Description=CUPS Scheduler [Path] PathExists=@CUPS_CACHEDIR@/org.cups.cupsd +PathExistsGlob=@CUPS_REQUESTS@/d* [Install] WantedBy=multi-user.target --- scheduler/org.cups.cupsd.service.in.orig 2014-10-21 13:54:05.000000000 +0200 +++ scheduler/org.cups.cupsd.service.in 2015-09-01 11:22:09.000000000 +0200 @@ -1,10 +1,11 @@ [Unit] Description=CUPS Scheduler Documentation=man:cupsd(8) +After=network.target [Service] ExecStart=@sbindir@/cupsd -l -Type=simple +Type=notify [Install] Also=org.cups.cupsd.socket org.cups.cupsd.path ++++++ cups-1.4.3-default-webcontent-path.patch -> cups-2.1.0-default-webcontent-path.patch ++++++ --- /work/SRC/openSUSE:Factory/cups/cups-1.4.3-default-webcontent-path.patch 2011-09-23 01:54:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cups.new/cups-2.1.0-default-webcontent-path.patch 2015-09-16 10:36:43.000000000 +0200 @@ -1,6 +1,6 @@ ---- config-scripts/cups-directories.m4.orig 2009-04-13 01:04:51.000000000 +0200 -+++ config-scripts/cups-directories.m4 2010-05-06 11:34:04.000000000 +0200 -@@ -323,11 +323,11 @@ fi +--- config-scripts/cups-directories.m4.orig 2014-03-21 17:42:53.000000000 +0100 ++++ config-scripts/cups-directories.m4 2015-09-01 11:08:43.000000000 +0200 +@@ -206,11 +206,11 @@ fi AC_SUBST(MENUDIR) # Documentation files ++++++ cups-2.0.4-source.tar.bz2 -> cups-2.1.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/cups/cups-2.0.4-source.tar.bz2 /work/SRC/openSUSE:Factory/.cups.new/cups-2.1.0-source.tar.bz2 differ: char 11, line 1
