[cups: 3/3] Merge branch 'f15'
Tim Waugh
twaugh at fedoraproject.org
Wed Jul 20 14:47:55 UTC 2011
commit 8612dba3d9b4340f3b51dc39f9af362148e1aabf
Merge: 4d5db89 ec3fa10
Author: Tim Waugh <twaugh at redhat.com>
Date: Wed Jul 20 13:26:05 2011 +0100
Merge branch 'f15'
cups-str3880.patch | 34 ++++++++++++++++++++++++++++++++++
cups.spec | 9 ++++++++-
2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --cc cups-str3880.patch
index 0000000,cd4c3fa..514fc84
mode 000000,100644..100644
--- a/cups-str3880.patch
+++ b/cups-str3880.patch
@@@ -1,0 -1,46 +1,34 @@@
-diff -up cups-1.4.7/scheduler/job.c.str3880 cups-1.4.7/scheduler/job.c
---- cups-1.4.7/scheduler/job.c.str3880 2011-07-20 13:19:38.280543190 +0100
-+++ cups-1.4.7/scheduler/job.c 2011-07-20 13:20:01.691126073 +0100
-@@ -291,7 +291,7 @@ cupsdCheckJobs(void)
-
- if (job->kill_time && job->kill_time <= curtime)
- {
-- cupsdLogMessage(CUPSD_LOG_ERROR, "[Job %d] Stopping unresponsive job!",
-+ cupsdLogMessage(CUPSD_LOG_ERROR, "[Job %d] Stopping unresponsive job!",
- job->id);
-
- stop_job(job, CUPSD_JOB_FORCE);
-@@ -1338,14 +1338,19 @@ cupsdDeleteJob(cupsd_job_t *job, /
++diff -up cups-1.5rc1/scheduler/job.c.str3880 cups-1.5rc1/scheduler/job.c
++--- cups-1.5rc1/scheduler/job.c.str3880 2011-07-20 13:25:04.830715537 +0100
+++++ cups-1.5rc1/scheduler/job.c 2011-07-20 13:25:33.637200511 +0100
++@@ -1407,17 +1407,22 @@ cupsdDeleteJob(cupsd_job_t *job, /
+ free(job->compressions);
+ free(job->filetypes);
+
+ - while (job->num_files > 0)
+ + if (action == CUPSD_JOB_PURGE)
+ {
+ - snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot,
+ - job->id, job->num_files);
-- unlink(filename);
++- if (Classification)
++- cupsdRemoveFile(filename);
++- else
++- unlink(filename);
+ + while (job->num_files > 0)
+ + {
+ + snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot,
+ + job->id, job->num_files);
-+ unlink(filename);
+++ if (Classification)
+++ cupsdRemoveFile(filename);
+++ else
+++ unlink(filename);
+
+ - job->num_files --;
+ + job->num_files --;
+ + }
+ }
+ + else
+ + job->num_files = 0;
+ }
+
+ if (job->history)
-@@ -3224,7 +3229,7 @@ get_options(cupsd_job_t *job, /* I - Jo
- IPP_TAG_ZERO)) != NULL &&
- (attr->value_tag == IPP_TAG_KEYWORD ||
- attr->value_tag == IPP_TAG_NAME) &&
-- (ppd = _pwgGetOutputBin(pwg, attr->values[0].string.text)) != NULL)
-+ (ppd = _pwgGetOutputBin(pwg, attr->values[0].string.text)) != NULL)
- {
- /*
- * Map output-bin to OutputBin option...
diff --cc cups.spec
index 2dcc908,465482d..1d8e1c9
--- a/cups.spec
+++ b/cups.spec
@@@ -10,17 -10,19 +10,17 @@@
# but we use lib for compatibility with 3rd party drivers (at upstream request).
%global cups_serverbin %{_exec_prefix}/lib/cups
+%global alphatag rc1
+
Summary: Common Unix Printing System
Name: cups
-Version: 1.4.7
-Release: 9%{?dist}
+Version: 1.5
- Release: 0.15.%{alphatag}%{?dist}
++Release: 0.16.%{alphatag}%{?dist}
License: GPLv2
Group: System Environment/Daemons
-Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
-# Our initscript
-Source1: cups.init
+Source: http://ftp.easysw.com/pub/cups/%{version}%{alphatag}/cups-%{version}%{alphatag}-source.tar.bz2
# Pixmap for desktop file
Source2: cupsprinter.png
-# udev rules for libusb devices
-Source3: cups-libusb.rules
# LSPP-required ps->pdf filter
Source4: pstopdf
# xinetd config file for cups-lpd service
@@@ -46,27 -48,40 +46,28 @@@ Patch8: cups-direct-usb.patc
Patch9: cups-lpr-help.patch
Patch10: cups-peercred.patch
Patch11: cups-pid.patch
-Patch12: cups-page-label.patch
-Patch13: cups-eggcups.patch
-Patch14: cups-getpass.patch
-Patch15: cups-driverd-timeout.patch
-Patch16: cups-strict-ppd-line-length.patch
-Patch17: cups-logrotate.patch
-Patch18: cups-usb-paperout.patch
-Patch19: cups-build.patch
-Patch20: cups-res_init.patch
-Patch21: cups-filter-debug.patch
-Patch22: cups-uri-compat.patch
-Patch23: cups-cups-get-classes.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-str3875.patch
-Patch36: cups-polld-busy-loop.patch
-Patch37: cups-str3880.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
+Patch12: cups-eggcups.patch
+Patch13: cups-getpass.patch
+Patch14: cups-driverd-timeout.patch
+Patch15: cups-strict-ppd-line-length.patch
+Patch16: cups-logrotate.patch
+Patch17: cups-usb-paperout.patch
+Patch18: cups-build.patch
+Patch19: cups-res_init.patch
+Patch20: cups-filter-debug.patch
+Patch21: cups-uri-compat.patch
+Patch22: cups-cups-get-classes.patch
+Patch23: cups-str3382.patch
+Patch25: cups-0755.patch
+Patch26: cups-snmp-quirks.patch
+Patch27: cups-hp-deviceid-oid.patch
+Patch28: cups-dnssd-deviceid.patch
+Patch29: cups-ricoh-deviceid-oid.patch
+
+Patch31: cups-avahi.patch
+Patch32: cups-icc.patch
+Patch33: cups-systemd-socket.patch
++Patch34: cups-str3880.patch
Patch100: cups-lspp.patch
@@@ -235,50 -242,74 +236,53 @@@ Sends IPP requests to the specified UR
%patch10 -p1 -b .peercred
# Maintain a cupsd.pid file.
%patch11 -p1 -b .pid
-# Fix orientation of page labels.
-%patch12 -p1 -b .page-label
# Fix implementation of com.redhat.PrinterSpooler D-Bus object.
-%patch13 -p1 -b .eggcups
+%patch12 -p1 -b .eggcups
# More sophisticated implementation of cupsGetPassword than getpass.
-%patch14 -p1 -b .getpass
+%patch13 -p1 -b .getpass
# Increase driverd timeout to 70s to accommodate foomatic.
-%patch15 -p1 -b .driverd-timeout
+%patch14 -p1 -b .driverd-timeout
# Only enforce maximum PPD line length when in strict mode.
-%patch16 -p1 -b .strict-ppd-line-length
+%patch15 -p1 -b .strict-ppd-line-length
# Re-open the log if it has been logrotated under us.
-%patch17 -p1 -b .logrotate
+%patch16 -p1 -b .logrotate
# Support for errno==ENOSPACE-based USB paper-out reporting.
-%patch18 -p1 -b .usb-paperout
+%patch17 -p1 -b .usb-paperout
# Simplify the DNSSD parts so they can build using the compat library.
-%patch19 -p1 -b .build
+%patch18 -p1 -b .build
# Re-initialise the resolver on failure in httpAddrGetList().
-%patch20 -p1 -b .res_init
+%patch19 -p1 -b .res_init
# Log extra debugging information if no filters are available.
-%patch21 -p1 -b .filter-debug
+%patch20 -p1 -b .filter-debug
# Allow the usb backend to understand old-style URI formats.
-%patch22 -p1 -b .uri-compat
+%patch21 -p1 -b .uri-compat
# Fix support for older CUPS servers in cupsGetDests.
-%patch23 -p1 -b .cups-get-classes
+%patch22 -p1 -b .cups-get-classes
# Fix temporary filename creation.
-%patch24 -p1 -b .str3382
-# Force the use of gnutls despite thread-safety concerns (bug #607159).
-%patch25 -p1 -b .force-gnutls
-# Perform locking for gnutls and avoid libgcrypt's broken
-# locking (bug #607159).
-%patch26 -p1 -b .serialize-gnutls
+%patch23 -p1 -b .str3382
# Use mode 0755 for binaries and libraries where appropriate.
-%patch27 -p1 -b .0755
+%patch25 -p1 -b .0755
# Handle SNMP supply level quirks (bug #581825).
-%patch28 -p1 -b .snmp-quirks
+%patch26 -p1 -b .snmp-quirks
# Add an SNMP query for HP's device ID OID (STR #3552).
-%patch29 -p1 -b .hp-deviceid-oid
+%patch27 -p1 -b .hp-deviceid-oid
# Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
-%patch30 -p1 -b .dnssd-deviceid
+%patch28 -p1 -b .dnssd-deviceid
# Add an SNMP query for Ricoh's device ID OID (STR #3552).
-%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).
-%patch32 -p1 -b .texttops-rotate-page
-# Till's patch to fix USB-Parallel adapter cable problem (bug #624564).
-%patch33 -p1 -b .usb-parallel
-# Set the default RIPCache to 128m (STR #3535, bug #549901).
-%patch34 -p1 -b .str3535
-# Fix SNMP supply level crasher (STR #3875, bug #719057).
-%patch35 -p1 -b .str3875
-# Avoid busy loop in cups-polld (bug #720921).
-%patch36 -p1 -b .polld-busy-loop
-# Don't delete job data files when restarted (STR #3880).
-%patch37 -p1 -b .str3880
-
-# 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
+%patch29 -p1 -b .ricoh-deviceid-oid
+# Avahi support in the dnssd backend.
+#%patch31 -p1 -b .avahi
# ICC colord support.
-%patch45 -p1 -b .icc
+%patch32 -p1 -b .icc
+
+# Add support for systemd socket activation (patch from Lennart
+# Poettering).
+%patch33 -p1 -b .systemd-socket
+
++# Don't delete job data files when restarted (STR #3880).
++%patch34 -p1 -b .str3880
+
%if %lspp
# LSPP support.
%patch100 -p1 -b .lspp
@@@ -608,27 -638,20 +612,30 @@@ rm -rf $RPM_BUILD_ROO
%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini
%{php_extdir}/phpcups.so
+%files ipptool
+%defattr(-,root,root)
+%{_bindir}/ipptool
+%dir %{_datadir}/cups/ipptool
+%{_datadir}/cups/ipptool/create-printer-subscription.test
+%{_datadir}/cups/ipptool/get-completed-jobs.test
+%{_datadir}/cups/ipptool/get-jobs.test
+%{_datadir}/cups/ipptool/ipp-1.1.test
+%{_datadir}/cups/ipptool/ipp-2.0.test
+%{_datadir}/cups/ipptool/ipp-2.1.test
+%{_datadir}/cups/ipptool/testfile.jpg
+%{_datadir}/cups/ipptool/testfile.pdf
+%{_datadir}/cups/ipptool/testfile.ps
+%{_datadir}/cups/ipptool/testfile.txt
+%{_mandir}/man1/ipptool.1.gz
+
%changelog
-* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-9
++* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.16.rc1
+ - Don't delete job data files when restarted (STR #3880).
+
-* Fri Jul 15 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-8
+* Fri Jul 15 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.15.rc1
- Ship an rpm macro for where to put driver executables.
-* Wed Jul 13 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-7
-- Avoid busy loop in cups-polld (bug #720921).
-
-* Thu Jul 7 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.7-6
-- Fix SNMP supply level crasher (STR #3875, bug #719057).
-
-* Thu Jul 7 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-5
+* Thu Jul 7 2011 Tim Waugh <twaugh at redhat.com> 1:1.5-0.14.rc1
- Undo last change which had no effect. We already remove the .SILENT
target from the Makefile as part of the build.
More information about the scm-commits
mailing list