Accepting request 330372 from Printing

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/330372
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cups?expand=0&rev=132

cups-2.0.4-source.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e1d5e68d9f24faca317aeaebc164c34102813bc0f1d69c00b3a59b49c49f4abd
-size 8799274

cups-2.1.0-choose-uri-template.patch

@@ -1,6 +1,6 @@
---- cups-1.2rc1/templates/choose-uri.tmpl.orig	2006-03-18 13:56:48.000000000 +0100
+--- templates/choose-uri.tmpl.orig	2013-10-21 23:41:21.000000000 +0200
-+++ cups-1.2rc1/templates/choose-uri.tmpl	2006-03-29 20:03:30.000000000 +0200
++++ templates/choose-uri.tmpl	2015-09-01 11:00:50.000000000 +0200
-@@ -24,6 +24,9 @@
+@@ -23,6 +23,9 @@
  
      lpd://hostname/queue
  

cups-2.1.0-cups-systemd-socket.patch

@@ -0,0 +1,43 @@
+--- 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-2.1.0-default-webcontent-path.patch

@@ -1,6 +1,6 @@
---- config-scripts/cups-directories.m4.orig	2009-04-13 01:04:51.000000000 +0200
+--- config-scripts/cups-directories.m4.orig	2014-03-21 17:42:53.000000000 +0100
-+++ config-scripts/cups-directories.m4	2010-05-06 11:34:04.000000000 +0200
++++ config-scripts/cups-directories.m4	2015-09-01 11:08:43.000000000 +0200
-@@ -323,11 +323,11 @@ fi
+@@ -206,11 +206,11 @@ fi
  AC_SUBST(MENUDIR)
  
  # Documentation files

cups-2.1.0-source.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba0238418442b8d84e09a865d0df6a728a20399826c5b466b14b1e9ab8c6d2c9
+size 8829764

cups-systemd-socket.patch

@@ -1,60 +0,0 @@
-diff -up cups-2.0.2/cups/usersys.c.ustTJg cups-2.0.2/cups/usersys.c
---- cups-2.0.2/cups/usersys.c.ustTJg	2015-02-10 13:40:24.294545077 +0100
-+++ cups-2.0.2/cups/usersys.c	2015-02-10 13:46:56.763989233 +0100
-@@ -1017,7 +1017,7 @@ cups_finalize_client_conf(
-     struct stat	sockinfo;		/* Domain socket information */
- 
-     if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
--	(sockinfo.st_mode & S_IRWXO) == S_IRWXO)
-+	(sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
-       cups_set_server_name(cc, CUPS_DEFAULT_DOMAINSOCKET);
-     else
- #endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
---- cups-2.0.2/scheduler/main.c.ustTJg	2015-02-10 13:40:24.121547526 +0100
-+++ cups-2.0.2/scheduler/main.c	2015-02-10 13:40:24.295545063 +0100
-@@ -658,8 +658,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.");
--  else
-+# 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)
-     cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
-diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.path.in
---- cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg	2014-03-21 15:50:24.000000000 +0100
-+++ cups-2.0.2/scheduler/org.cups.cupsd.path.in	2015-02-10 13:40:24.295545063 +0100
-@@ -2,7 +2,7 @@
- Description=CUPS Scheduler
- 
- [Path]
--PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
-+PathExistsGlob=@CUPS_REQUESTS@/d*
- 
- [Install]
- WantedBy=multi-user.target
-diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.service.in
---- cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg	2014-10-21 13:55:01.000000000 +0200
-+++ cups-2.0.2/scheduler/org.cups.cupsd.service.in	2015-02-10 13:40:24.296545049 +0100
-@@ -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.changes

@@ -1,7 +1,53 @@
+-------------------------------------------------------------------
+Tue Sep  1 11:55:07 CEST 2015 - jsmeix@suse.de
+
+- 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
+
 -------------------------------------------------------------------
 Tue Sep  1 07:36:59 UTC 2015 - tchvatal@suse.com
 
-- Fix bnc#943950, escape the macro call %systemd-tmpfiles in comment
+- Fix bnc#943950, escape the macro call %systemd-tmpfiles
+  in comment.
 
 -------------------------------------------------------------------
 Thu Aug 20 14:07:47 UTC 2015 - tchvatal@suse.com
@@ -10,13 +56,17 @@ Thu Aug 20 14:07:47 UTC 2015 - tchvatal@suse.com
 - Version update to 2.0.4:
   * Fixed a bug in cupsRasterWritePixels (STR #4650)
   * Fixed redirection in the web interface (STR #4538)
-  * The IPP backend did not respond to side-channel requests (STR #4645)
+  * The IPP backend did not respond to side-channel
-  * The scheduler did not start all pending jobs at once (STR #4646)
+    requests (STR #4645)
-  * The web search incorrectly searched time-at-xxx values (STR #4652)
+  * The scheduler did not start all pending jobs
+    at once (STR #4646)
+  * The web search incorrectly searched time-at-xxx
+    values (STR #4652)
   * Fixed an RPM spec file issue (STR #4657)
-  * The scheduler incorrectly started jobs while canceling multiple jobs (STR
+  * The scheduler incorrectly started jobs while canceling
-    #4648)
+    multiple jobs (STR #4648)
-  * Fixed processing of server overrides without port numbers (STR #4675)
+  * Fixed processing of server overrides without
+    port numbers (STR #4675)
   * Documentation changes (STR #4651, STR #4674)
 
 -------------------------------------------------------------------

cups.spec

@@ -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 @@ Source109:      baselibs.conf
 # 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-2.1.0-choose-uri-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl:
-Patch10:        cups-1.2rc1-template.patch
+Patch10:        cups-2.1.0-choose-uri-template.patch
-# Patch11 cups-1.4.3-default-webcontent-path.patch changes the default path whereto the
+# 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
+Patch11:        cups-2.1.0-default-webcontent-path.patch
-# Patch12 cups-systemd-socket.patch Use systemd socket activation properly:
+# Patch12 cups-2.1.0-cups-systemd-socket.patch Use systemd socket activation properly:
-Patch12:        cups-systemd-socket.patch
+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 @@ browsing". This is now handled by cups-browsed service.
 %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 cups-2.1.0-choose-uri-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl:
-%patch10 -p1
+%patch10 -b choose-uri-template.orig
-# Patch11 cups-1.4.3-default-webcontent-path.patch changes the default path whereto the
+# 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
+%patch11 -b default-webcontent-path.prig
-# Patch12 cups-systemd-socket.patch Use systemd socket activation properly:
+# Patch12 cups-2.1.0-cups-systemd-socket.patch Use systemd socket activation properly:
-%patch12 -p1
+%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 CFLAGS="$CFLAGS %{optflags} -fstack-protector -fPIE -fPIC"
 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 @@ make %{?_smp_mflags}
 
 %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 @@ exit 0
 %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