Browse Source


git-svn-id: ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 11 years ago
1 changed files with 92 additions and 44 deletions
  1. 92 44

+ 92 - 44

@@ -7,8 +7,8 @@
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.4.6
-Release: 2%{?_dist_release}
+Version: 1.4.8
+Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Daemons
@@ -74,25 +74,34 @@ Patch20: cups-res_init.patch
 Patch21: cups-filter-debug.patch
 Patch22: cups-uri-compat.patch
 Patch23: cups-cups-get-classes.patch
-Patch25: cups-str3382.patch
-Patch26: cups-force-gnutls.patch
-Patch27: cups-serialize-gnutls.patch
-Patch29: cups-0755.patch
-Patch31: cups-hostnamelookups.patch
-Patch33: cups-snmp-quirks.patch
-Patch34: cups-hp-deviceid-oid.patch
-Patch35: cups-dnssd-deviceid.patch
-Patch36: cups-ricoh-deviceid-oid.patch
-Patch37: cups-texttops-rotate-page.patch
-Patch38: cups-autotype-crash.patch
-Patch39: cups-str3754.patch
-Patch40: cups-avahi.patch
-Patch41: cups-icc.patch
-Patch42: cups-usb-parallel.patch
-Patch43: cups-job-state-changed.patch
+Patch24: cups-str3382.patch
+Patch25: cups-force-gnutls.patch
+Patch26: cups-serialize-gnutls.patch
+Patch27: cups-0755.patch
+Patch28: cups-snmp-quirks.patch
+Patch29: cups-hp-deviceid-oid.patch
+Patch30: cups-dnssd-deviceid.patch
+Patch31: cups-ricoh-deviceid-oid.patch
+Patch32: cups-texttops-rotate-page.patch
+Patch33: cups-usb-parallel.patch
+Patch34: cups-str3535.patch
+Patch35: cups-polld-busy-loop.patch
+Patch36: cups-CVE-2011-2896.patch
+Patch40: cups-avahi-1-config.patch
+Patch41: cups-avahi-2-backend.patch
+Patch42: cups-avahi-3-timeouts.patch
+Patch43: cups-avahi-4-poll.patch
+Patch44: cups-avahi-5-services.patch
+Patch45: cups-icc.patch
 Patch100: cups-1.4.6-fix-template-ja.patch
 Patch101: cups-1.4.6-pstext-utf8.patch
+Patch102: cups-serverbin-compat2.patch
+# security fix
+Patch1000: cups-str3914.patch
 BuildRoot: %{_tmppath}/%{name}-root
@@ -258,44 +267,53 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 # Fix support for older CUPS servers in cupsGetDests.
 %patch23 -p1 -b .cups-get-classes
 # Fix temporary filename creation.
-%patch25 -p1 -b .str3382
+%patch24 -p1 -b .str3382
 # Force the use of gnutls despite thread-safety concerns (bug #607159).
-%patch26 -p1 -b .force-gnutls
+%patch25 -p1 -b .force-gnutls
 # Perform locking for gnutls and avoid libgcrypt's broken
 # locking (bug #607159).
-%patch27 -p1 -b .serialize-gnutls
+%patch26 -p1 -b .serialize-gnutls
 # Use mode 0755 for binaries and libraries where appropriate.
-%patch29 -p1 -b .0755
-# Use numeric addresses for interfaces unless HostNameLookups are
-# turned on (bug #583054).
-%patch31 -p1 -b .hostnamelookups
+%patch27 -p1 -b .0755
 # Handle SNMP supply level quirks (bug #581825).
-%patch33 -p1 -b .snmp-quirks
+%patch28 -p1 -b .snmp-quirks
 # Add an SNMP query for HP's device ID OID (STR #3552).
-%patch34 -p1 -b .hp-deviceid-oid
+%patch29 -p1 -b .hp-deviceid-oid
 # Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
-%patch35 -p1 -b .dnssd-deviceid
+%patch30 -p1 -b .dnssd-deviceid
 # Add an SNMP query for Ricoh's device ID OID (STR #3552).
-%patch36 -p1 -b .ricoh-deviceid-oid
+%patch31 -p1 -b .ricoh-deviceid-oid
 # Adjust texttops output to be in natural orientation (STR #3563).
 # This fixes page-label orientation when texttops is used in the
 # filter chain (bug #572338).
-%patch37 -p1 -b .texttops-rotate-page
-# Don't crash when MIME database could not be loaded (bug #610088).
-%patch38 -p1 -b .autotype-crash
-# Don't crash when job queued for printer that times out (bug #660604).
-%patch39 -p1 -b .str3754
-# Avahi support in the dnssd backend.
-%patch40 -p1 -b .avahi
-# ICC colord support.
-%patch41 -p1 -b .icc
+%patch32 -p1 -b .texttops-rotate-page
+# Use numeric addresses for interfaces unless HostNameLookups are
+# turned on (bug #583054).
 # Till's patch to fix USB-Parallel adapter cable problem (bug #624564).
-%patch42 -p1 -b .usb-parallel
-# Fixed dbus notifier support for job-state-changed.
-%patch43 -p1 -b .job-state-changed
+%patch33 -p1 -b .usb-parallel
+# Set the default RIPCache to 128m (STR #3535, bug #549901).
+%patch34 -p1 -b .str3535
+# Avoid busy loop in cups-polld (bug #720921).
+%patch35 -p1 -b .polld-busy-loop
+# Avahi support:
+# - discovery in the dnssd backend
+# - service announcement in the scheduler
+%patch40 -p1 -b .avahi-1-config
+%patch41 -p1 -b .avahi-2-backend
+%patch42 -p1 -b .avahi-3-timeouts
+%patch43 -p1 -b .avahi-4-poll
+%patch44 -p1 -b .avahi-5-services
+# ICC colord support.
+%patch45 -p1 -b .icc
 %patch100 -p1 -b .template-ja
 %patch101 -p1 -b .pstext
+%patch102 -p0 -b .serverbin-compat2
+# security fix
+%patch1000 -p0 -b .str3914
 # make to use cjktexttops instead texttops.
 perl -pi -e 's/texttops$/cjktexttops/' conf/
@@ -433,10 +451,34 @@ install -c -m 644 conf/mime.convs $RPM_BUILD_ROOT%{_sysconfdir}/cups/mime.convs
 # create a symlink for 32bit drivers on x86_64.
 %ifarch x86_64
-mkdir -p %{buildroot}/usr/lib
-ln -sf ../%{_lib}/cups %{buildroot}/usr/lib/cups
+mkdir -p %{buildroot}/usr/lib/cups/{backend,cgi-bin,daemon,driver,filter,monitor,notifier}
+%triggerpostun -- cups < 1.4.8
+%ifarch x86_64
+echo "moving 32bit binaries to /usr/lib ..."
+if [ "$1" -gt 1 ]; then
+  for f in `find /usr/lib64/cups/ -type f`; do
+    file $f | grep ' ELF 32-bit ' >/dev/null 2>&1
+    if [ "$?" = "0" ]; then
+      DEST=`echo $f | sed -e 's/^\/usr\/lib64/\/usr\/lib/'`
+      mv -f $f $DEST
+    fi
+  done
+%ifarch x86_64
+if [ -L /usr/lib/cups ]; then
+  rm -f /usr/lib/cups
 /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore
 /sbin/chkconfig --add cups || true
@@ -566,7 +608,8 @@ rm -rf $RPM_BUILD_ROOT
 %ifarch x86_64
+%dir %{_prefix}/lib/cups
+%dir %{_prefix}/lib/cups/*
@@ -624,6 +667,11 @@ rm -rf $RPM_BUILD_ROOT
+* Thu Sep 08 2011 Tomohiro "Tomo-p" KATO <> 1.4.8-1
+- new upstream release (against CVE-2011-2896).
+- added str3914.patch (against CVE-2011-3170).
+- updated patches.
 * Sun May 29 2011 Tomohiro "Tomo-p" KATO <> 1.4.6-2
 - added Patch101.