cups-1.4.8-5

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5622 ec354946-7b23-47d6-9f5a-488ba84defc7

c/cups/cups-vl.spec

@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.8
-Release: 2%{?_dist_release}
+Release: 5%{?_dist_release}
 License: GPL
 Group: System Environment/Daemons
 
@@ -36,6 +36,7 @@ Source8: cups.cron
 # Filter and PPD for textonly printing
 Source9: textonly.filter
 Source10: textonly.ppd
+Source11: macros.cups
 
 Source101: http://www.openprinting.org/download/printing/dnssd
 Source102: pstoraster
@@ -87,6 +88,7 @@ Patch33: cups-usb-parallel.patch
 Patch34: cups-str3535.patch
 Patch35: cups-polld-busy-loop.patch
 Patch36: cups-CVE-2011-2896.patch
+Patch37: cups-str3947.patch
 
 Patch40: cups-avahi-1-config.patch
 Patch41: cups-avahi-2-backend.patch
@@ -101,14 +103,12 @@ Patch101: cups-1.4.6-pstext-utf8.patch
 Patch102: cups-serverbin-compat2.patch
 Patch103: cups-serverbin-compat3.patch
 
-# security fix
-Patch1000: cups-str3914.patch
-
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
 Requires(pre): chkconfig initscripts perl alternatives
 Requires: %{name}-libs = %{version}-%{release}
 Requires: tmpwatch
+Requires: ghostscript >= 8.71-4
 %if %use_alternatives
 Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
 Requires(pre): alternatives
@@ -296,6 +296,10 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 %patch34 -p1 -b .str3535
 # Avoid busy loop in cups-polld (bug #720921).
 %patch35 -p1 -b .polld-busy-loop
+# Avoid GIF reader loop (CVE-2011-2896, STR #3914, bug #727800).
+%patch36 -p1 -b .CVE-2011-2896
+# Fixed string manipulation in the dbus notifier (STR #3947, bug #741833).
+%patch37 -p1 -b .str3947
 
 # Avahi support:
 # - discovery in the dnssd backend
@@ -314,9 +318,6 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 %patch102 -p0 -b .serverbin-compat2
 %patch103 -p0 -b .serverbin-compat3
 
-# security fix
-%patch1000 -p0 -b .str3914
-
 # make to use cjktexttops instead texttops.
 perl -pi -e 's/texttops$/cjktexttops/' conf/mime.convs.in
 
@@ -410,6 +411,10 @@ install -c -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/cups/model/textonly.ppd
 
 #install -c -m 644 %{SOURCE105} $RPM_BUILD_ROOT%{_sysconfdir}/cups/pdftops.conf
 
+# Ship an rpm macro for where to put driver executables.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
+install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
+
 # Ship a printers.conf file, and a client.conf file.  That way, they get
 # their SELinux file contexts set correctly.
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/printers.conf
@@ -420,6 +425,10 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/subscriptions.conf
 # This is %%ghost'ed, but needs to be created in %%install anyway.
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/lpoptions
 
+# Tell portreserve which port we want it to protect.
+# mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
+# echo ipp > $RPM_BUILD_ROOT%{_sysconfdir}/portreserve/%{name}
+
 # LSB 3.2 printer driver directory
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ppd
 
@@ -436,6 +445,13 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
 install -m644 %{SOURCE3} \
 	%{buildroot}/lib/udev/rules.d/70-cups-libusb.rules
 
+# install /etc/tmpfiles.d/cups.conf (bug #656566)
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/tmpfiles.d
+cat > ${RPM_BUILD_ROOT}%{_sysconfdir}/tmpfiles.d/cups.conf <<EOF
+d %{_localstatedir}/run/cups 0755 root lp -
+d %{_localstatedir}/run/cups/certs 0511 lp sys -
+EOF
+
 # Ship a PCL XL/PCL 6 filter file from ESP gs-7.07.1
 install -c -m 644 %{SOURCE206} $RPM_BUILD_ROOT%{_datadir}/cups/model
 install -c -m 644 %{SOURCE207} $RPM_BUILD_ROOT%{_datadir}/cups/model
@@ -448,10 +464,13 @@ install -c -m 644 %{SOURCE203} $RPM_BUILD_ROOT%{_sysconfdir}/cups
 # Ship a cjktexttops (import from mdv)
 install -c -m 755 %{SOURCE204} $RPM_BUILD_ROOT%{_libdir}/cups/filter/
 
-install -c -m 644 conf/mime.types $RPM_BUILD_ROOT%{_sysconfdir}/cups/mime.types
-install -c -m 644 conf/mime.convs $RPM_BUILD_ROOT%{_sysconfdir}/cups/mime.convs
+# disable imagetoraster.
+perl -pi -e 's/^(image.+imagetoraster)/#$1/g' %{buildroot}/usr/share/cups/mime/mime.convs
 
-# create a symlink for 32bit drivers on x86_64.
+#install -c -m 644 conf/mime.types $RPM_BUILD_ROOT%{_sysconfdir}/cups/mime.types
+#install -c -m 644 conf/mime.convs $RPM_BUILD_ROOT%{_sysconfdir}/cups/mime.convs
+
+# create directories for 32bit drivers on x86_64.
 %ifarch x86_64
 mkdir -p %{buildroot}/usr/lib/cups/{backend,cgi-bin,daemon,driver,filter,monitor,notifier}
 %endif
@@ -547,10 +566,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc LICENSE.txt README.txt CREDITS.txt CHANGES.txt
+%attr(0660,root,lp) %dev(char,6,0) /lib/udev/devices/lp0
+%attr(0660,root,lp) %dev(char,6,1) /lib/udev/devices/lp1
+%attr(0660,root,lp) %dev(char,6,2) /lib/udev/devices/lp2
+%attr(0660,root,lp) %dev(char,6,3) /lib/udev/devices/lp3
 /lib/udev/rules.d/70-cups-libusb.rules
 %dir %attr(0755,root,lp) %{_sysconfdir}/cups
 %dir %attr(0755,root,lp) /var/run/cups
 %dir %attr(0511,lp,sys) /var/run/cups/certs
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/cups.conf
 %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf
 %attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf.default
 %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/client.conf
@@ -560,8 +584,8 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/snmp.conf
 %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/subscriptions.conf
 %{_sysconfdir}/cups/interfaces
-%config(noreplace) %{_sysconfdir}/cups/mime.types
-%config(noreplace) %{_sysconfdir}/cups/mime.convs
+#config(noreplace) %{_sysconfdir}/cups/mime.types
+#config(noreplace) %{_sysconfdir}/cups/mime.convs
 #%config(noreplace) %{_sysconfdir}/cups/pstoraster.convs
 %config(noreplace) %{_sysconfdir}/cups/dvitops.types
 %config(noreplace) %{_sysconfdir}/cups/dvitops.convs
@@ -572,6 +596,11 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/logrotate.d/cups
 %config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd
 %dir %{_datadir}/%{name}/www
+%dir %{_datadir}/%{name}/www/es
+%dir %{_datadir}/%{name}/www/eu
+%dir %{_datadir}/%{name}/www/ja
+%dir %{_datadir}/%{name}/www/pl
+%dir %{_datadir}/%{name}/www/ru
 %{_datadir}/%{name}/www/images
 %{_datadir}/%{name}/www/*.css
 %doc %{_datadir}/%{name}/www/index.html
@@ -656,6 +685,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_includedir}/cups
 %{_mandir}/man1/cups-config.1*
+%{_sysconfdir}/rpm/macros.cups
 
 %if %{build_compat32}
 %files -n compat32-%{name}-devel
@@ -669,6 +699,16 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Feb 12 2012 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.8-5
+- fixed %%changelog.
+
+* Sun Feb 12 2012 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.8-4
+- removed /etc/cups/mime.{convs,types}.
+
+* Fri Feb 10 2012 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.8-3
+- replaced some patches.
+- fixed to print splitted images (BTS:1217).
+
 * Sat Sep 10 2011 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.8-2
 - added Patch103 to detect printers with 32bit drivers.