up to 2.3.3 (fixes CVE-2020-3898 CVE-2019-8842)

[packages/cups.git] / cups.spec

diff --git a/cups.spec b/cups.spec
index 656eed637efd2d89909aa3ba2e6f3552dbbc0e16..7d878c4fd8747e8536e4f5800c4dd1e7767eac8e 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -6,19 +6,18 @@
 %bcond_without gssapi          # GSSAPI support
 %bcond_with    lspp            # audit and SELinux label support (lspp patch)
 %bcond_with    tcp_wrappers    # tcp_wrappers/libwrap support
-%bcond_without python          # Python support in web interface
 %bcond_without static_libs     # static library
 
 Summary(pl.UTF-8):     Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão
 Name:          cups
-Version:       2.2.1
+Version:       2.3.3
 Release:       1
 Epoch:         1
 License:       LGPL v2 (libraries), GPL v2 (the rest)
 Group:         Applications/Printing
 Source0:       https://github.com/apple/cups/releases/download/v%{version}/%{name}-%{version}-source.tar.gz
-# Source0-md5: a94da2a1e9dbdccb4f3836a38a431931
+# Source0-md5: 412434ceefbdf3ec71bc9188a035f589
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
@@ -38,7 +37,7 @@ Patch10:      %{name}-peercred.patch
 Patch11:       %{name}-usb.patch
 Patch12:       %{name}-desktop.patch
 Patch13:       %{name}-systemd-socket.patch
-Patch14:       add-ipp-backend-of-cups-1.4.patch
+Patch14:       %{name}-backroot-readable.patch
 Patch15:       reactivate_recommended_driver.patch
 Patch16:       read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
 Patch18:       %{name}-final-content-type.patch
@@ -55,7 +54,7 @@ Patch108:     cups-filter-debug.patch
 Patch109:      cups-hp-deviceid-oid.patch
 Patch110:      cups-dnssd-deviceid.patch
 Patch111:      cups-ricoh-deviceid-oid.patch
-Patch112:      cups-enum-all.patch
+
 Patch113:      cups-dymo-deviceid.patch
 Patch114:      cups-freebind.patch
 Patch115:      cups-ipp-multifile.patch
@@ -85,6 +84,7 @@ BuildRequires:        zlib-devel
 Requires(post,preun):  /sbin/chkconfig
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{name}-ppdc = %{epoch}:%{version}-%{release}
 Requires:      pam >= 0.77.3
 Requires:      rc-scripts
 Requires:      systemd-units >= 38
@@ -126,24 +126,46 @@ drukarek.
 O sistema Unix de impressão (CUPS) fornece uma camada de impressão
 portável para os sistemas operacionais baseados no UNIX®.
 
-%package lib
-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
-Group:         Libraries
-Provides:      %{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes:     cups-libs
-Obsoletes:     libcups1
+%package backend-usb
+Summary:       USB backend for CUPS
+Summary(pl.UTF-8):     Backend USB dla CUPS-a
+License:       GPL v2
+Group:         Applications/Printing
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
-%description lib
-Common Unix Printing System Libraries.
+%description backend-usb
+This package allow CUPS printing on USB printers.
 
-%description lib -l pl.UTF-8
-Biblioteki dla CUPS.
+%description backend-usb -l pl.UTF-8
+Ten pakiet umożliwia drukowanie z poziomu CUPS-a na drukarkach USB.
 
-%description lib -l pt_BR.UTF-8
-Bibliotecas CUPS requeridas pelos clientes CUPS.
+%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
+Group:         Applications/Printing
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      rc-inetd
+
+%description lpd
+LPD compatibility support for CUPS print server.
+
+%description lpd -l pl.UTF-8
+Wsparcie dla LPD w serwerze wydruków CUPS.
+
+%package ppdc
+Summary:       Common Unix Printing System - PPD manipulation utilities
+Summary(pl.UTF-8):     Narzędzia CUPS do operacji na plikach PPD
+License:       GPL v2
+Group:         Applications/Printing
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+
+%description ppdc
+This package provides utilities to generate and manipulate PPD files.
+
+%description ppdc -l pl.UTF-8
+Ten pakiet zawiera narzędzia do generowania i operowania na plikach
+PPD.
 
 %package clients
 Summary:       Common Unix Printing System Clients
@@ -160,6 +182,25 @@ Common Unix Printing System Clients.
 %description clients -l pl.UTF-8
 Aplikacje klienckie dla CUPS.
 
+%package lib
+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
+Group:         Libraries
+Provides:      %{name}-libs = %{epoch}:%{version}-%{release}
+Obsoletes:     cups-libs
+Obsoletes:     libcups1
+
+%description lib
+Common Unix Printing System Libraries.
+
+%description lib -l pl.UTF-8
+Biblioteki dla CUPS.
+
+%description lib -l pt_BR.UTF-8
+Bibliotecas CUPS requeridas pelos clientes CUPS.
+
 %package image-lib
 Summary:       Common Unix Printing System Libraries - images manipulation
 Summary(pl.UTF-8):     Biblioteki dla CUPS - obsługa formatów graficznych
@@ -225,33 +266,6 @@ Ogólny system druku dla Uniksa - biblioteki statyczne.
 Bibliotecas estáticas para desenvolvimento de programas que usam as
 bibliotecas do CUPS.
 
-%package backend-usb
-Summary:       USB backend for CUPS
-Summary(pl.UTF-8):     Backend USB dla CUPS-a
-License:       GPL v2
-Group:         Applications/Printing
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description backend-usb
-This package allow CUPS printing on USB printers.
-
-%description backend-usb -l pl.UTF-8
-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
-Group:         Applications/Printing
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      rc-inetd
-
-%description lpd
-LPD compatibility support for CUPS print server.
-
-%description lpd -l pl.UTF-8
-Wsparcie dla LPD w serwerze wydruków CUPS.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -288,7 +302,7 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch109 -p1
 %patch110 -p1
 %patch111 -p1
-%patch112 -p1
+
 %patch113 -p1
 %patch114 -p1
 %patch115 -p1
@@ -326,7 +340,6 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
        %{?with_dnssd:--with-dnssd-libs=x} \
        %{?with_dnssd:--with-dnssd-includes=x} \
        --with-optim=-Wno-format-y2k \
-       %{?with_python:--with-python=%{_bindir}/python} \
        --with-systemd=%{systemdunitdir}
 
 %{__make} %{?debug:OPTIONS="-DDEBUG"}
@@ -345,9 +358,9 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,modprobe.d,securit
 
 if [ "%{_lib}" != "lib" ] ; then
        install -d $RPM_BUILD_ROOT%{_libdir}
-       mv $RPM_BUILD_ROOT%{_ulibdir}/*.so* $RPM_BUILD_ROOT%{_libdir}
+       %{__mv} $RPM_BUILD_ROOT%{_ulibdir}/*.so* $RPM_BUILD_ROOT%{_libdir}
 %if %{with static_libs}
-       mv $RPM_BUILD_ROOT%{_ulibdir}/*.a $RPM_BUILD_ROOT%{_libdir}
+       %{__mv} $RPM_BUILD_ROOT%{_ulibdir}/*.a $RPM_BUILD_ROOT%{_libdir}
 %endif
 fi
 
@@ -437,7 +450,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc *.txt
+%doc *.md
 %attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/cups
 %attr(754,root,root) /etc/rc.d/init.d/cups
 /etc/dbus-1/system.d/cups.conf
@@ -458,8 +471,7 @@ fi
 %dir %attr(755,root,lp) %{_sysconfdir}/%{name}/ppd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(755,root,root) %{_bindir}/cupstestppd
-%attr(755,root,root) %{_bindir}/cupstestdsc
-%attr(755,root,root) %{_bindir}/ppd*
+%attr(755,root,root) %{_bindir}/ippeveprinter
 %attr(755,root,root) %{_sbindir}/cupsctl
 %attr(755,root,root) %{_sbindir}/cupsd
 %attr(755,root,root) %{_sbindir}/cupsfilter
@@ -473,7 +485,6 @@ fi
 %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
@@ -493,6 +504,9 @@ fi
 %lang(pt_BR) %{_ulibdir}/cups/cgi-bin/pt_BR
 %lang(ru) %{_ulibdir}/cups/cgi-bin/ru
 
+%dir %{_ulibdir}/cups/command
+%attr(755,root,root) %{_ulibdir}/cups/command/ippevepcl
+%attr(755,root,root) %{_ulibdir}/cups/command/ippeveps
 %dir %{_ulibdir}/cups/daemon
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-deviced
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-driverd
@@ -502,7 +516,6 @@ fi
 %attr(755,root,root) %{_ulibdir}/cups/filter/commandtops
 %attr(755,root,root) %{_ulibdir}/cups/filter/gziptoany
 %attr(755,root,root) %{_ulibdir}/cups/filter/pstops
-%attr(755,root,root) %{_ulibdir}/cups/filter/rastertodymo
 %attr(755,root,root) %{_ulibdir}/cups/filter/rastertoepson
 %attr(755,root,root) %{_ulibdir}/cups/filter/rastertohp
 %attr(755,root,root) %{_ulibdir}/cups/filter/rastertolabel
@@ -518,10 +531,6 @@ fi
 %dir %{_datadir}/cups/banners
 %dir %{_datadir}/cups/data
 %dir %{_datadir}/cups/drivers
-%dir %{_datadir}/cups/drv
-%{_datadir}/cups/drv/sample.drv
-%dir %{_datadir}/cups/examples
-%{_datadir}/cups/examples/*.drv
 %dir %{_datadir}/cups/mime
 %{_datadir}/cups/mime/mime.convs
 %{_datadir}/cups/mime/mime.types
@@ -535,28 +544,17 @@ fi
 %lang(pl) %dir %{_datadir}/cups/model/pl
 %lang(sv) %dir %{_datadir}/cups/model/sv
 
-%dir %{_datadir}/cups/ppdc
-%{_datadir}/cups/ppdc/epson.h
-%{_datadir}/cups/ppdc/hp.h
-%{_datadir}/cups/ppdc/label.h
-%{_datadir}/cups/ppdc/font.defs
-%{_datadir}/cups/ppdc/media.defs
-%{_datadir}/cups/ppdc/raster.defs
-
 %dir %{_datadir}/cups/templates
 %{_datadir}/cups/templates/*.tmpl
 %lang(de) %{_datadir}/cups/templates/de
 %lang(es) %{_datadir}/cups/templates/es
+%lang(fr) %{_datadir}/cups/templates/fr
 %lang(ja) %{_datadir}/cups/templates/ja
 %lang(pt_BR) %{_datadir}/cups/templates/pt_BR
 %lang(ru) %{_datadir}/cups/templates/ru
 %{_mandir}/man1/cups.1*
 %{_mandir}/man1/cupstestppd.1*
-%{_mandir}/man1/cupstestdsc.1*
-%{_mandir}/man1/ppd*.1*
-%{_mandir}/man7/backend.7*
-%{_mandir}/man7/filter.7*
-%{_mandir}/man7/notifier.7*
+%{_mandir}/man1/ippeveprinter.1*
 %{_mandir}/man5/classes.conf.5*
 %{_mandir}/man5/cups-files.conf.5*
 %{_mandir}/man5/cups-snmp.conf.5*
@@ -566,9 +564,13 @@ fi
 %{_mandir}/man5/mailto.conf.5*
 %{_mandir}/man5/mime.convs.5*
 %{_mandir}/man5/mime.types.5*
-%{_mandir}/man5/ppdcfile.5*
 %{_mandir}/man5/printers.conf.5*
 %{_mandir}/man5/subscriptions.conf.5*
+%{_mandir}/man7/backend.7*
+%{_mandir}/man7/filter.7*
+%{_mandir}/man7/ippevepcl.7*
+%{_mandir}/man7/ippeveps.7*
+%{_mandir}/man7/notifier.7*
 %{_mandir}/man8/cups-deviced.8*
 %{_mandir}/man8/cups-driverd.8*
 %{_mandir}/man8/cups-exec.8*
@@ -594,29 +596,42 @@ fi
 %attr(640,root,logs) %ghost /var/log/cups/error_log
 %attr(640,root,logs) %ghost /var/log/cups/page_log
 
-%files lib
+%files backend-usb
 %defattr(644,root,root,755)
-%dir %attr(755,root,lp) %{_sysconfdir}/%{name}
-%attr(755,root,root) %{_libdir}/libcups.so.*
-%attr(755,root,root) %{_libdir}/libcupscgi.so.*
-%attr(755,root,root) %{_libdir}/libcupsmime.so.*
-%attr(755,root,root) %{_libdir}/libcupsppdc.so.*
-%dir %{_datadir}/cups
-%lang(ca) %{_localedir}/ca/cups_ca.po
-%lang(cs) %{_localedir}/cs/cups_cs.po
-%lang(de) %{_localedir}/de/cups_de.po
-%lang(es) %{_localedir}/es/cups_es.po
-%lang(fr) %{_localedir}/fr/cups_fr.po
-%lang(it) %{_localedir}/it/cups_it.po
-%lang(ja) %{_localedir}/ja/cups_ja.po
-%lang(pt_BR) %{_localedir}/pt_BR/cups_pt_BR.po
-%lang(ru) %{_localedir}/ru/cups_ru.po
+%attr(755,root,root) %{_ulibdir}/cups/backend/usb
+%dir %{_datadir}/cups/usb
+%{_datadir}/cups/usb/org.cups.usb-quirks
+
+%files lpd
+%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*
+
+%files ppdc
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ppd*
+%dir %{_datadir}/cups/drv
+%{_datadir}/cups/drv/sample.drv
+%dir %{_datadir}/cups/examples
+%{_datadir}/cups/examples/*.drv
+%dir %{_datadir}/cups/ppdc
+%{_datadir}/cups/ppdc/epson.h
+%{_datadir}/cups/ppdc/hp.h
+%{_datadir}/cups/ppdc/label.h
+%{_datadir}/cups/ppdc/font.defs
+%{_datadir}/cups/ppdc/media.defs
+%{_datadir}/cups/ppdc/raster.defs
+%{_mandir}/man1/ppd*.1*
+%{_mandir}/man5/ppdcfile.5*
 
 %files clients
 %defattr(644,root,root,755)
 %attr(644,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/client.conf
 %attr(755,root,root) %{_bindir}/cancel
-%attr(755,root,root) %{_bindir}/ippfind
+%{?with_avahi:%attr(755,root,root) %{_bindir}/ippfind}
 %attr(755,root,root) %{_bindir}/ipptool
 %attr(755,root,root) %{_bindir}/lp
 %attr(755,root,root) %{_bindir}/lpoptions
@@ -624,9 +639,7 @@ fi
 %attr(755,root,root) %{_bindir}/lpr
 %attr(755,root,root) %{_bindir}/lprm
 %attr(755,root,root) %{_bindir}/lpstat
-%attr(755,root,root) %{_sbindir}/accept
 %attr(755,root,root) %{_sbindir}/cupsaccept
-%attr(755,root,root) %{_sbindir}/cupsaddsmb
 %attr(755,root,root) %{_sbindir}/cupsenable
 %attr(755,root,root) %{_sbindir}/cupsdisable
 %attr(755,root,root) %{_sbindir}/cupsreject
@@ -636,12 +649,11 @@ fi
 %attr(755,root,root) %{_sbindir}/lpc
 %attr(755,root,root) %{_sbindir}/lpinfo
 %attr(755,root,root) %{_sbindir}/lpmove
-%attr(755,root,root) %{_sbindir}/reject
 %{_datadir}/cups/ipptool
 %{_desktopdir}/cups.desktop
 %{_iconsdir}/hicolor/*/apps/cups.png
 %{_mandir}/man1/cancel.1*
-%{_mandir}/man1/ippfind.1*
+%{?with_avahi:%{_mandir}/man1/ippfind.1*}
 %{_mandir}/man1/ipptool.1*
 %{_mandir}/man1/lp.1*
 %{_mandir}/man1/lpoptions.1*
@@ -650,9 +662,7 @@ fi
 %{_mandir}/man1/lprm.1*
 %{_mandir}/man1/lpstat.1*
 %{_mandir}/man5/client.conf.5*
-%{_mandir}/man8/accept.8*
 %{_mandir}/man8/cupsaccept.8*
-%{_mandir}/man8/cupsaddsmb.8*
 %{_mandir}/man8/cupsenable.8*
 %{_mandir}/man8/cupsdisable.8*
 %{_mandir}/man8/cupsreject.8*
@@ -660,7 +670,23 @@ fi
 %{_mandir}/man8/lpc.8*
 %{_mandir}/man8/lpinfo.8*
 %{_mandir}/man8/lpmove.8*
-%{_mandir}/man8/reject.8*
+
+%files lib
+%defattr(644,root,root,755)
+%dir %attr(755,root,lp) %{_sysconfdir}/%{name}
+%attr(755,root,root) %{_libdir}/libcups.so.*
+%dir %{_datadir}/cups
+%lang(ca) %{_localedir}/ca/cups_ca.po
+%lang(cs) %{_localedir}/cs/cups_cs.po
+%lang(de) %{_localedir}/de/cups_de.po
+%{_localedir}/en/cups_en.po
+%lang(es) %{_localedir}/es/cups_es.po
+%lang(fr) %{_localedir}/fr/cups_fr.po
+%lang(it) %{_localedir}/it/cups_it.po
+%lang(ja) %{_localedir}/ja/cups_ja.po
+%lang(pt_BR) %{_localedir}/pt_BR/cups_pt_BR.po
+%lang(ru) %{_localedir}/ru/cups_ru.po
+%lang(zh_CN) %{_localedir}/zh_CN/cups_zh_CN.po
 
 %files image-lib
 %defattr(644,root,root,755)
@@ -670,10 +696,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cups-config
 %attr(755,root,root) %{_libdir}/libcups.so
-%attr(755,root,root) %{_libdir}/libcupscgi.so
 %attr(755,root,root) %{_libdir}/libcupsimage.so
-%attr(755,root,root) %{_libdir}/libcupsmime.so
-%attr(755,root,root) %{_libdir}/libcupsppdc.so
 %{_includedir}/cups
 %{_mandir}/man1/cups-config.1*
 
@@ -681,22 +704,5 @@ fi
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libcups.a
-%{_libdir}/libcupscgi.a
 %{_libdir}/libcupsimage.a
-%{_libdir}/libcupsmime.a
-%{_libdir}/libcupsppdc.a
 %endif
-
-%files backend-usb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_ulibdir}/cups/backend/usb
-%dir %{_datadir}/cups/usb
-%{_datadir}/cups/usb/org.cups.usb-quirks
-
-%files lpd
-%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*