- up to 2.0.1; https/ipps is back (cups 2.0 dropped openssl support; only gnutls...

diff --git a/cups-peercred.patch b/cups-peercred.patch
index 46a8dc2233c820d59e08e1a4d11e105c0445643d..a106abbd05e806ce3a4381598b9e627b88c70b66 100644 (file)
--- a/cups-peercred.patch
+++ b/cups-peercred.patch
@@ -1,6 +1,7 @@
---- cups-1.3.7/scheduler/auth.c.orig   2008-03-20 21:58:16.000000000 +0100
-+++ cups-1.3.7/scheduler/auth.c        2008-07-19 13:13:47.000000000 +0200
-@@ -54,6 +54,7 @@
+diff -up cups-1.5b1/scheduler/auth.c.peercred cups-1.5b1/scheduler/auth.c
+--- cups-1.5b1/scheduler/auth.c.peercred       2011-05-20 05:49:49.000000000 +0200
++++ cups-1.5b1/scheduler/auth.c        2011-05-23 18:00:18.000000000 +0200
+@@ -52,6 +52,7 @@
   * Include necessary headers...
   */
  

diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 619f3af8c73874faa8a74763f4a80d42f99cf220..7f1b0b2b49f6091b981d5126f57404298f05f89e 100644 (file)
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -1,7 +1,7 @@
-diff -up cups-2.0.0/cups/usersys.c.systemd-socket cups-2.0.0/cups/usersys.c
---- cups-2.0.0/cups/usersys.c.systemd-socket   2014-08-28 16:37:22.000000000 +0100
-+++ cups-2.0.0/cups/usersys.c  2014-10-16 14:39:05.839530224 +0100
-@@ -1028,7 +1028,7 @@ cups_read_client_conf(
+diff -up cups-2.0.1/cups/usersys.c.systemd-socket cups-2.0.1/cups/usersys.c
+--- cups-2.0.1/cups/usersys.c.systemd-socket   2014-10-20 20:24:56.000000000 +0200
++++ cups-2.0.1/cups/usersys.c  2014-11-15 15:19:11.108125832 +0100
+@@ -1078,7 +1078,7 @@ cups_read_client_conf(
      struct stat       sockinfo;               /* Domain socket information */
  
      if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
@@ -10,10 +10,10 @@ diff -up cups-2.0.0/cups/usersys.c.systemd-socket cups-2.0.0/cups/usersys.c
        cups_server = CUPS_DEFAULT_DOMAINSOCKET;
      else
  #endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-2.0.0/scheduler/main.c.systemd-socket cups-2.0.0/scheduler/main.c
---- cups-2.0.0/scheduler/main.c.systemd-socket 2014-10-16 14:39:05.811530076 +0100
-+++ cups-2.0.0/scheduler/main.c        2014-10-16 14:39:05.839530224 +0100
-@@ -653,6 +653,12 @@ main(int  argc,                           /* I - Number of comm
+diff -up cups-2.0.1/scheduler/main.c.systemd-socket cups-2.0.1/scheduler/main.c
+--- cups-2.0.1/scheduler/main.c.systemd-socket 2014-11-15 15:19:11.057126510 +0100
++++ cups-2.0.1/scheduler/main.c        2014-11-15 15:19:11.108125832 +0100
+@@ -661,6 +661,12 @@ main(int  argc,                           /* I - Number of comm
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
    else
  #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
@@ -26,9 +26,9 @@ diff -up cups-2.0.0/scheduler/main.c.systemd-socket cups-2.0.0/scheduler/main.c
    if (fg)
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
    else
-diff -up cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.0/scheduler/org.cups.cupsd.path.in
---- cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket 2014-03-21 14:50:24.000000000 +0000
-+++ cups-2.0.0/scheduler/org.cups.cupsd.path.in        2014-10-16 14:39:05.839530224 +0100
+diff -up cups-2.0.1/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.1/scheduler/org.cups.cupsd.path.in
+--- cups-2.0.1/scheduler/org.cups.cupsd.path.in.systemd-socket 2014-03-21 15:50:24.000000000 +0100
++++ cups-2.0.1/scheduler/org.cups.cupsd.path.in        2014-11-15 15:19:11.108125832 +0100
 @@ -2,7 +2,7 @@
  Description=CUPS Scheduler
  
@@ -38,11 +38,13 @@ diff -up cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.0/s
  
  [Install]
  WantedBy=multi-user.target
-diff -up cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.0/scheduler/org.cups.cupsd.service.in
---- cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket      2014-03-21 14:50:24.000000000 +0000
-+++ cups-2.0.0/scheduler/org.cups.cupsd.service.in     2014-10-16 14:39:28.636650224 +0100
-@@ -2,9 +2,10 @@
+diff -up cups-2.0.1/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.1/scheduler/org.cups.cupsd.service.in
+--- cups-2.0.1/scheduler/org.cups.cupsd.service.in.systemd-socket      2014-11-15 15:19:11.109125818 +0100
++++ cups-2.0.1/scheduler/org.cups.cupsd.service.in     2014-11-15 15:19:56.480528155 +0100
+@@ -1,10 +1,11 @@
+ [Unit]
  Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
 +After=network.target
  
  [Service]
@@ -53,4 +55,3 @@ diff -up cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.
  
  [Install]
  Also=org.cups.cupsd.socket org.cups.cupsd.path
- WantedBy=printer.target

diff --git a/cups.spec b/cups.spec
index 496a741023be96d8ff215d89db778adcf53845ef..ff989ee60eab94600ffac5d927f5da33993d91af 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_with    gnutls          # use GNU TLS for SSL/TLS support (instead of OpenSSL)
+%bcond_without gnutls          # use GNU TLS for SSL/TLS support
 %bcond_with    dnssd           # DNS Service Discovery support via dns_sd API (obsoleted by Avahi patch)
 %bcond_without avahi           # DNS Service Discovery support via Avahi
 %bcond_without gssapi          # do not include GSSAPI support
@@ -10,13 +10,13 @@
 Summary(pl.UTF-8):     Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão
 Name:          cups
-Version:       2.0.0
+Version:       2.0.1
 Release:       1
 Epoch:         1
-License:       LGPL v2 (libraries), GPL v2 (the rest) + openssl exception
+License:       LGPL v2 (libraries), GPL v2 (the rest)
 Group:         Applications/Printing
 Source0:       http://www.cups.org/software/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5: 2cdd81fea23e9e29555c24bdfd0d7c89
+# Source0-md5: 7f7c33071035fb20d0879929a42da711
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
@@ -60,7 +60,6 @@ BuildRequires:        libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libusb-devel >= 1.0
-%{!?with_gnutls:BuildRequires: openssl-devel}
 BuildRequires: pam-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.641
@@ -70,7 +69,6 @@ Requires(post,preun): /sbin/chkconfig
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      cups-filters
-Requires:      openssl-tools
 Requires:      pam >= 0.77.3
 Requires:      rc-scripts
 Requires:      systemd-units >= 38
@@ -115,7 +113,7 @@ portável para os sistemas operacionais baseados no UNIX®.
 Summary:       Common Unix Printing System Libraries
 Summary(pl.UTF-8):     Biblioteki dla CUPS
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão - bibliotecas para uso em clientes cups
-License:       LGPL v2 + openssl exception
+License:       LGPL v2
 Group:         Libraries
 Provides:      %{name}-libs = %{epoch}:%{version}-%{release}
 Obsoletes:     cups-libs
@@ -133,7 +131,7 @@ Bibliotecas CUPS requeridas pelos clientes CUPS.
 %package clients
 Summary:       Common Unix Printing System Clients
 Summary(pl.UTF-8):     Aplikacje klienckie dla CUPS
-License:       GPL v2 + openssl exception
+License:       GPL v2
 Group:         Applications/Printing
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Provides:      printingclient
@@ -149,7 +147,7 @@ Aplikacje klienckie dla CUPS.
 Summary:       Common Unix Printing System Libraries - images manipulation
 Summary(pl.UTF-8):     Biblioteki dla CUPS - obsługa formatów graficznych
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão - bibliotecas para uso em clientes cups
-License:       LGPL v2 + openssl exception
+License:       LGPL v2
 Group:         Libraries
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 Obsoletes:     libcups1
@@ -167,14 +165,13 @@ Bibliotecas CUPS requeridas pelos clientes CUPS.
 Summary:       Common Unix Printing System development files
 Summary(pl.UTF-8):     Ogólny system druku dla Uniksa - pliki nagłówkowe
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão - ambiente de desenvolvimento
-License:       LGPL v2 + openssl exception
+License:       LGPL v2
 Group:         Development/Libraries
 Requires:      %{name}-image-lib = %{epoch}:%{version}-%{release}
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 # for libcups
 %{?with_gnutls:Requires:       gnutls-devel}
 %{?with_gssapi:Requires:       heimdal-devel}
-%{!?with_gnutls:Requires:      openssl-devel}
 Requires:      zlib-devel
 # for libcupsimage
 Requires:      libjpeg-devel
@@ -197,7 +194,7 @@ CUPS.
 Summary:       Common Unix Printing System static libraries
 Summary(pl.UTF-8):     Ogólny system druku dla Uniksa - biblioteki statyczne
 Summary(pt_BR.UTF-8):  Common Unix Printing System - bibliotecas estáticas
-License:       LGPL v2 + openssl exception
+License:       LGPL v2
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
@@ -214,7 +211,7 @@ bibliotecas do CUPS.
 %package backend-usb
 Summary:       USB backend for CUPS
 Summary(pl.UTF-8):     Backend USB dla CUPS-a
-License:       GPL v2 + openssl exception
+License:       GPL v2
 Group:         Applications/Printing
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
@@ -227,7 +224,7 @@ Ten pakiet umożliwia drukowanie z poziomu CUPS-a na drukarkach USB.
 %package lpd
 Summary:       LPD compatibility support for CUPS print server
 Summary(pl.UTF-8):     Wsparcie dla LPD w serwerze wydruków CUPS
-License:       GPL v2 + openssl exception
+License:       GPL v2
 Group:         Applications/Printing
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      rc-inetd
@@ -280,7 +277,6 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
        --enable-gssapi%{!?with_gssapi:=no} \
        --enable-libpaper \
        --enable-libusb \
-       --enable-openssl%{?with_gnutls:=no} \
        --enable-shared \
        --enable-ssl \
        %{?with_static_libs:--enable-static} \
@@ -445,8 +441,10 @@ fi
 %attr(755,root,root) %{_ulibdir}/cups/backend/mdns
 %endif
 %attr(755,root,root) %{_ulibdir}/cups/backend/http
+%attr(755,root,root) %{_ulibdir}/cups/backend/https
 %attr(755,root,root) %{_ulibdir}/cups/backend/ipp
 %attr(755,root,root) %{_ulibdir}/cups/backend/ipp14
+%attr(755,root,root) %{_ulibdir}/cups/backend/ipps
 %attr(755,root,root) %{_ulibdir}/cups/backend/lpd
 %attr(755,root,root) %{_ulibdir}/cups/backend/snmp
 %attr(755,root,root) %{_ulibdir}/cups/backend/socket
@@ -658,4 +656,6 @@ fi
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/cups-lpd
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-lpd
+%{systemdunitdir}/org.cups.cups-lpd.socket
+%{systemdunitdir}/org.cups.cups-lpd@.service
 %{_mandir}/man8/cups-lpd.8*