[cups/f19: 2/2] Merge branch 'f18' into f19

Tim Waugh twaugh at fedoraproject.org
Thu Nov 14 21:21:46 UTC 2013


commit 7e2a5812e715234a4585766cd09d3694fbc423c7
Merge: 77e3fed c994ebe
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Nov 14 18:09:23 2013 +0000

    Merge branch 'f18' into f19
    
    Conflicts:
    	cups.spec

 cups-dbus-notifier.patch |  103 ++++++++++++++++++++++++++++++++++++++++++++++
 cups.spec                |    8 +++-
 2 files changed, 110 insertions(+), 1 deletions(-)
---
diff --cc cups-dbus-notifier.patch
index 0000000,676d3cb..f550888
mode 000000,100644..100644
--- a/cups-dbus-notifier.patch
+++ b/cups-dbus-notifier.patch
@@@ -1,0 -1,103 +1,103 @@@
 -diff -up cups-1.5.4/notifier/dbus.c.dbus-notifier cups-1.5.4/notifier/dbus.c
 ---- cups-1.5.4/notifier/dbus.c.dbus-notifier	2013-11-14 17:56:35.585486017 +0000
 -+++ cups-1.5.4/notifier/dbus.c	2013-11-14 17:58:09.964108754 +0000
++diff -up cups-1.6.4/notifier/dbus.c.dbus-notifier cups-1.6.4/notifier/dbus.c
++--- cups-1.6.4/notifier/dbus.c.dbus-notifier	2013-11-14 18:05:25.840670705 +0000
+++++ cups-1.6.4/notifier/dbus.c	2013-11-14 18:05:56.361814538 +0000
+ @@ -4,7 +4,7 @@
+   *   D-Bus notifier for CUPS.
+   *
+   *   Copyright 2008-2011 by Apple Inc.
+ - *   Copyright (C) 2011 Red Hat, Inc.
+ + *   Copyright (C) 2011, 2013 Red Hat, Inc.
+   *   Copyright (C) 2007 Tim Waugh <twaugh at redhat.com>
+   *   Copyright 1997-2005 by Easy Software Products.
+   *
 -@@ -156,9 +156,16 @@ enum
++@@ -157,9 +157,16 @@ enum
+  
+  
+  /*
+ + * Global variables...
+ + */
+ +
+ +static char		lock_filename[1024];	/* Lock filename */
+ +
+ +/*
+   * Local functions...
+   */
+  
+ +static void		release_lock(void);
+  static int		acquire_lock(int *fd, char *lockfile, size_t locksize);
+  static const char	*validate_utf8(const char *str);
+  
 -@@ -250,8 +257,6 @@ main(int  argc,				/* I - Number of comm
++@@ -251,8 +258,6 @@ main(int  argc,				/* I - Number of comm
+    DBusMessage		*message;	/* Message to send */
+    DBusMessageIter	iter;		/* Iterator for message data */
+    int			lock_fd = -1;	/* Lock file descriptor */
+ -  char			lock_filename[1024];
+ -					/* Lock filename */
+  
+  
+   /*
 -@@ -628,7 +633,7 @@ main(int  argc,				/* I - Number of comm
++@@ -651,7 +656,7 @@ main(int  argc,				/* I - Number of comm
+    if (lock_fd >= 0)
+    {
+      close(lock_fd);
+ -    unlink(lock_filename);
+ +    release_lock();
+    }
+  
+    return (0);
 -@@ -636,6 +641,26 @@ main(int  argc,				/* I - Number of comm
++@@ -659,6 +664,26 @@ main(int  argc,				/* I - Number of comm
+  
+  
+  /*
+ + * 'release_lock()' - Release the singleton lock.
+ + */
+ +
+ +static void
+ +release_lock(void)
+ +{
+ +  unlink(lock_filename);
+ +}
+ +
+ +
+ +/*
+ + * 'handle_sigterm()' - Handle SIGTERM signal.
+ + */
+ +static void
+ +handle_sigterm(int signum)
+ +{
+ +  release_lock();
+ +}
+ +
+ +/*
+   * 'acquire_lock()' - Acquire a lock so we only have a single notifier running.
+   */
+  
 -@@ -644,7 +669,8 @@ acquire_lock(int    *fd,		/* O - Lock fi
++@@ -667,7 +692,8 @@ acquire_lock(int    *fd,		/* O - Lock fi
+               char   *lockfile,		/* I - Lock filename buffer */
+  	     size_t locksize)		/* I - Size of filename buffer */
+  {
+ -  const char	*tmpdir;		/* Temporary directory */
+ +  const char		*tmpdir;	/* Temporary directory */
+ +  struct sigaction	action;		/* POSIX sigaction data */
+  
+  
+   /*
 -@@ -662,8 +688,16 @@ acquire_lock(int    *fd,		/* O - Lock fi
++@@ -685,8 +711,16 @@ acquire_lock(int    *fd,		/* O - Lock fi
+  
+    if ((*fd = open(lockfile, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR)) < 0)
+      return (-1);
+ -  else
+ -    return (0);
+ +
+ + /*
+ +  * Set a SIGTERM handler to make sure we release the lock if the
+ +  * scheduler decides to stop us.
+ +  */
+ +  memset(&action, 0, sizeof(action));
+ +  action.sa_handler = handle_sigterm;
+ +  sigaction(SIGTERM, &action, NULL);
+ +
+ +  return (0);
+  }
 - 
 - 
++ #else /* !HAVE_DBUS */
++ int
diff --cc cups.spec
index 8d716c6,9d5a3e9..d81e467
--- a/cups.spec
+++ b/cups.spec
@@@ -7,21 -9,19 +7,21 @@@
  # but we use lib for compatibility with 3rd party drivers (at upstream request).
  %global cups_serverbin %{_exec_prefix}/lib/cups
  
 -Summary: Common Unix Printing System
 +Summary: CUPS printing system
  Name: cups
 -Version: 1.5.4
 -Release: 30%{?dist}
 +Epoch: 1
 +Version: 1.6.4
- Release: 2%{?dist}
++Release: 3%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
 -Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
 +Url: http://www.cups.org/
 +Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
  # Pixmap for desktop file
  Source2: cupsprinter.png
 -# LSPP-required ps->pdf filter
 -Source4: pstopdf
 -# xinetd config file for cups-lpd service
 -Source5: cups-lpd
 +# socket unit for cups-lpd service
 +Source3: cups-lpd.socket
 +# cups-lpd service unit configuration
 +Source4: cups-lpd at .service
  # Logrotate configuration
  Source6: cups.logrotate
  # Backend for NCP protocol
@@@ -40,33 -44,49 +40,34 @@@ Patch9: cups-lpr-help.patc
  Patch10: cups-peercred.patch
  Patch11: cups-pid.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-dbus-utf8.patch
 -Patch23: cups-str3382.patch
 -Patch24: cups-usblp-quirks.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
 -
 -Patch30: cups-avahi-1-config.patch
 -Patch31: cups-avahi-2-backend.patch
 -Patch32: cups-avahi-3-timeouts.patch
 -Patch33: cups-avahi-4-poll.patch
 -Patch34: cups-avahi-5-services.patch
 -
 -Patch35: cups-icc.patch
 -Patch36: cups-systemd-socket.patch
 -Patch37: cups-ipp-no-create-job.patch
 -
 -Patch40: cups-r10572.patch
 -Patch41: cups-str4072.patch
 -Patch42: cups-str4124.patch
 -Patch43: cups-str4194.patch
 -Patch44: cups-r10638.patch
 -Patch45: cups-r10642.patch
 -Patch46: cups-str4190.patch
 -Patch47: cups-str4223.patch
 -
 -Patch48: cups-str4125.patch
 -Patch49: cups-str4140.patch
 -Patch50: cups-str4187.patch
 -Patch51: cups-str4205.patch
 -Patch52: cups-stringpool-setprinterattr.patch
 -Patch53: cups-dbus-notifier.patch
 +Patch13: cups-driverd-timeout.patch
 +Patch14: cups-strict-ppd-line-length.patch
 +Patch15: cups-logrotate.patch
 +Patch16: cups-usb-paperout.patch
 +Patch17: cups-res_init.patch
 +Patch18: cups-filter-debug.patch
 +Patch19: cups-uri-compat.patch
 +Patch20: cups-str3382.patch
 +Patch21: cups-0755.patch
 +Patch22: cups-hp-deviceid-oid.patch
 +Patch23: cups-dnssd-deviceid.patch
 +Patch24: cups-ricoh-deviceid-oid.patch
 +Patch25: cups-systemd-socket.patch
 +Patch26: cups-lpd-manpage.patch
 +Patch27: cups-avahi-address.patch
 +Patch28: cups-usblp-quirks.patch
 +Patch29: cups-enum-all.patch
 +Patch30: cups-stringpool-setprinterattr.patch
 +Patch31: cups-dymo-deviceid.patch
 +Patch32: cups-use-ipp1.1.patch
 +Patch33: cups-no-gcry.patch
 +Patch34: cups-avahi-no-threaded.patch
 +Patch35: cups-gz-crc.patch
 +Patch36: cups-ipp-multifile.patch
 +Patch37: cups-full-relro.patch
 +Patch38: cups-web-devices-timeout.patch
 +Patch39: cups-final-content-type.patch
++Patch40: cups-dbus-notifier.patch
  
  Patch100: cups-lspp.patch
  
@@@ -205,62 -258,100 +206,64 @@@ Sends IPP requests to the specified UR
  %patch11 -p1 -b .pid
  # Fix implementation of com.redhat.PrinterSpooler D-Bus object.
  %patch12 -p1 -b .eggcups
 -# More sophisticated implementation of cupsGetPassword than getpass.
 -%patch13 -p1 -b .getpass
  # Increase driverd timeout to 70s to accommodate foomatic (bug #744715).
 -%patch14 -p1 -b .driverd-timeout
 +%patch13 -p1 -b .driverd-timeout
  # Only enforce maximum PPD line length when in strict mode.
 -%patch15 -p1 -b .strict-ppd-line-length
 +%patch14 -p1 -b .strict-ppd-line-length
  # Re-open the log if it has been logrotated under us.
 -%patch16 -p1 -b .logrotate
 +%patch15 -p1 -b .logrotate
  # Support for errno==ENOSPACE-based USB paper-out reporting.
 -%patch17 -p1 -b .usb-paperout
 -# Simplify the DNSSD parts so they can build using the compat library.
 -%patch18 -p1 -b .build
 -# Re-initialise the resolver on failure in httpAddrGetList().
 -%patch19 -p1 -b .res_init
 +%patch16 -p1 -b .usb-paperout
 +# Re-initialise the resolver on failure in httpAddrGetList() (bug #567353).
 +%patch17 -p1 -b .res_init
  # Log extra debugging information if no filters are available.
 -%patch20 -p1 -b .filter-debug
 +%patch18 -p1 -b .filter-debug
  # Allow the usb backend to understand old-style URI formats.
 -%patch21 -p1 -b .uri-compat
 -# Ensure attributes are valid UTF-8 in dbus notifier (bug #863387).
 -%patch22 -p1 -b .dbus-utf8
 +%patch19 -p1 -b .uri-compat
  # Fix temporary filename creation.
 -%patch23 -p1 -b .str3382
 -# Problem is a port reset which is done by the new USB backend of CUPS 1.5.4 and 1.6.x to clean up after the job.
 -# This patch adds a quirk handler for this reset so that it will not be done for all printers.
 -# (bug #847923, STR #4155, STR #4191)
 -# Added usblp quirk for Canon PIXMA MP540 (bug #967873).
 -%patch24 -p1 -b .usblp-quirks
 +%patch20 -p1 -b .str3382
  # Use mode 0755 for binaries and libraries where appropriate.
 -%patch25 -p1 -b .0755
 -# Handle SNMP supply level quirks (bug #581825).
 -%patch26 -p1 -b .snmp-quirks
 +%patch21 -p1 -b .0755
  # Add an SNMP query for HP's device ID OID (STR #3552).
 -%patch27 -p1 -b .hp-deviceid-oid
 +%patch22 -p1 -b .hp-deviceid-oid
  # Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
 -%patch28 -p1 -b .dnssd-deviceid
 +%patch23 -p1 -b .dnssd-deviceid
  # Add an SNMP query for Ricoh's device ID OID (STR #3552).
 -%patch29 -p1 -b .ricoh-deviceid-oid
 -
 -# Avahi support:
 -# - discovery in the dnssd backend
 -# - service announcement in the scheduler
 -%patch30 -p1 -b .avahi-1-config
 -%patch31 -p1 -b .avahi-2-backend
 -%patch32 -p1 -b .avahi-3-timeouts
 -%patch33 -p1 -b .avahi-4-poll
 -%patch34 -p1 -b .avahi-5-services
 -
 -# ICC colord support.
 -%patch35 -p1 -b .icc
 -
 +%patch24 -p1 -b .ricoh-deviceid-oid
  # Add support for systemd socket activation (patch from Lennart
  # Poettering).
 -%patch36 -p1 -b .systemd-socket
 -
 -# Don't use the IPP Create-Job operation, widely implemented
 -# unreliably (bug #854989).
 -%patch37 -p1 -b .ipp-no-create-job
 -
 -# CUPS now includes the port number in the Host: header for HTTP requests. (r10572)
 -%patch40 -p1 -b .r10572
 -# The scheduler no longer allows job-name values
 -# that are not valid network Unicode strings (STR #4072)
 -%patch41 -p1 -b .str4072
 -# cupsBackendReport() now filters out all control characters
 -# from the reported 1284 device IDs (STR #4124)
 -%patch42 -p1 -b .str4124
 -# The IPP backend could get stuck in an endless loop on certain network errors
 -# (STR #4194)
 -%patch43 -p1 -b .str4194
 -# The IPP backend did not send a cancel request to printers when a job was
 -# canceled and the printer did not support Create-Job.
 -%patch44 -p1 -b .r10638
 -# Work around broken 1284 device IDs that use a newline instead of a semicolon.
 -%patch45 -p1 -b .r10642
 -# Apply upstream patch to stop backend spinning on failed auth (bug #873264).
 -%patch46 -p1 -b .str4190
 -
 -# Apply upstream fix for CVE-2012-5519 (STR #4223, bug #875898).
 -%patch47 -p1 -b .str4223
 -
 -# The IPP backend now stops queues when the server
 -# configuration prevents successful job submission (STR #4125)
 -%patch48 -p1 -b .str4125
 -# Fixed a problem with local Kerberos authentication (STR #4140, bug #837602)
 -%patch49 -p1 -b .str4140
 -# The CUPS library did not always detect a timed out connection to the server
 -# which could cause temporary loss of printing from applications (STR #4187)
 -%patch50 -p1 -b .str4187
 -# Don't set auth-info-required all of the time (STR #4205)
 -%patch51 -p1 -b .str4205
 +%patch25 -p1 -b .systemd-socket
 +# Talk about systemd in cups-lpd manpage (part of bug #884641).
 +%patch26 -p1 -b .lpd-manpage
 +# Use IP address when resolving DNSSD URIs (bug #948288).
 +%patch27 -p1 -b .avahi-address
 +# Added usblp quirk for Canon PIXMA MP540 (bug #967873).
 +%patch28 -p1 -b .usblp-quirks
 +# Return from cupsEnumDests() once all records have been returned.
 +%patch29 -p1 -b .enum-all
  # Prevent stringpool damage leading to memory leaks (bug #974048).
 -%patch52 -p1 -b .stringpool-setprinterattr
 +%patch30 -p1 -b .stringpool-setprinterattr
 +# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
 +%patch31 -p1 -b .dymo-deviceid
 +# Default to IPP/1.1 for now (bug #977813).
 +%patch32 -p1 -b .use-ipp1.1
 +# Don't link against libgcrypt needlessly.
 +%patch33 -p1 -b .no-gcry
 +# Don't use D-Bus from two threads (bug #979748).
 +%patch34 -p1 -b .avahi-no-threaded
 +# Avoid sign-extending CRCs for gz decompression (bug #983486).
 +%patch35 -p1 -b .gz-crc
 +# Fixes for jobs with multiple files and multiple formats.
 +%patch36 -p1 -b .ipp-multifile
 +# Full relro (bug #996740).
 +%patch37 -p1 -b .full-relro
 +# Increase web interface get-devices timeout to 10s (bug #996664).
 +%patch38 -p1 -b .web-devices-timeout
 +# Reverted upstream change to FINAL_CONTENT_TYPE in order to fix
 +# printing to remote CUPS servers (bug #1010580).
 +%patch39 -p1 -b .final-content-type
+ # Avoid stale lockfile in dbus notifier (bug #1026949).
 -%patch53 -p1 -b .dbus-notifier
++%patch40 -p1 -b .dbus-notifier
  
  %if %lspp
  # LSPP support.
@@@ -649,132 -769,35 +652,135 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
 -* Thu Nov 14 2013 Tim Waugh <twaugh at redhat.com> - 1:1.5.4-30
++* Thu Nov 14 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.4-3
+ - Avoid stale lockfile in dbus notifier (bug #1026949).
+ 
 -* Tue Jun 25 2013 Tim Waugh <twaugh at redhat.com> 1:1.5.4-29
 +* Fri Sep 27 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.4-2
 +- Reverted upstream change to FINAL_CONTENT_TYPE in order to fix
 +  printing to remote CUPS servers (bug #1010580).
 +
 +* Wed Sep 25 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.4-1
 +- 1.6.4.
 +
 +* Wed Aug 21 2013 Jaromír Končický <jkoncick at redhat.com> - 1:1.6.3-8
 +- Add SyncOnClose option (bug #984883).
 +
 +* Fri Aug 16 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-7
 +- Increase web interface get-devices timeout to 10s (bug #996664).
 +
 +* Thu Aug 15 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-6
 +- Build with full read-only relocations (bug #996740).
 +
 +* Tue Aug  6 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-5
 +- Fixes for jobs with multiple files and multiple formats.
 +
 +* Wed Jul 24 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-4
 +- Fixed cups-config, broken by last change (bug #987660).
 +
 +* Mon Jul 22 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-3
 +- Removed stale comment in spec file.
 +- Link against OpenSSL instead of GnuTLS.
 +
 +* Thu Jul 18 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-2
 +- Fixed downoad URL to point to the actual source, not a download
 +  page.
 +
 +* Fri Jul 12 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.3-1
 +- 1.6.3
 +
 +* Thu Jul 11 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-18
 +- Avoid sign-extending CRCs for gz decompression (bug #983486).
 +
 +* Wed Jul 10 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-17
 +- Fixed download URL.
 +
 +* Wed Jul 10 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-16
 +- Remove pstops cost factor tweak from conf/mime.convs.in
 +
 +* Mon Jul  1 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-15
 +- Don't use D-Bus from two threads (bug #979748).
 +
 +* Fri Jun 28 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-14
 +- Fix for DNSSD name resolution.
 +
 +* Wed Jun 26 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-13
 +- Don't link against libgcrypt needlessly.
 +
 +* Wed Jun 26 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-12
 +- Default to IPP/1.1 for now (bug #977813).
 +
 +* Tue Jun 25 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-11
  - Added usblp quirk for Canon PIXMA MP540 (bug #967873).
  
 -* Thu Jun 13 2013 Tim Waugh <twaugh at redhat.com> 1:1.5.4-28
 +* Tue Jun 18 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-10
 +- Added IEEE 1284 Device ID for a Dymo device (bug #747866).
 +
 +* Thu Jun 13 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-9
  - Prevent stringpool damage leading to memory leaks (bug #974048).
  
 -* Tue Apr 23 2013 Tim Waugh <twaugh at redhat.com> 1:1.5.4-27
 -- dnssd backend: don't crash if avahi gives a callback with no TXT
 -  record (bug #927040).
 +* Tue Jun  4 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.2-8
 +- Return from cupsEnumDests() once all records have been returned.
 +
 +* Thu May 23 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-7
 +- Added more USB quirks for the libusb-based backend (STR #4311)
 +
 +* Thu May 23 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-6
 +- don't ship Russian web templates because they're broken (#960571, STR #4310)
 +
 +* Wed May 15 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-5
 +- move cups/ppdc/ to filesystem subpackage
 +
 +* Wed Apr 10 2013 Tim Waugh <twaugh at redhat.com>
 +- cups-dbus-utf.patch: now that the scheduler only accepts valid UTF-8
 +  strings for job-name, there's no need to validate it as UTF-8 in the
 +  dbus notifier.
 +
 +* Thu Apr  4 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-4
 +- Use IP address when resolving DNSSD URIs (bug #948288).
 +
 +* Thu Mar 28 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-3
 +- Check for cupsd.conf existence prior to grepping it (bug #928816).
 +
 +* Tue Mar 19 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-2
 +- revert previous bug #919489 fix (i.e we don't ship banners now)
 +
 +* Mon Mar 18 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-1
 +- 1.6.2
 +
 +* Wed Mar 13 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.1-26
 +- ship banners again (#919489)
  
 -* Tue Mar  5 2013 Tim Waugh <twaugh at redhat.com> 1:1.5.4-26
 +* Tue Mar  5 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.1-25
 +- Talk about systemd in cups-lpd manpage (part of bug #884641).
 +
 +* Tue Mar  5 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.1-24
  - Documentation fixes from STR #4223 (bug #915981).
  
 -* Fri Feb 15 2013 Jiri Popelka <jpopelka at redhat.com> 1:1.5.4-25
 -- Fixed STR #4232 fix (STR #4276).
 +* Wed Feb 27 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.1-23
 +- Removed obsolete browsing directives from cupsd.conf (bug #880826, STR #4157).
 +- Updated summary and descriptions (#882982).
 +- Fixed bogus dates in changelog.
 +
 +* Fri Feb 15 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.1-22
 +- Applied colorman fix from STR #4232 and STR #4276.
 +
 +* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.6.1-21
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
  
 -* Fri Jan 18 2013 Jiri Popelka <jpopelka at redhat.com> 1:1.5.4-24
 +* Fri Jan 18 2013 Jiri Popelka <jpopelka at redhat.com> 1:1.6.1-20
  - Add quirk rule for Canon MP210 (#847923).
  
 -* Mon Jan 14 2013 Jiri Popelka <jpopelka at redhat.com> 1:1.5.4-23
 +* Mon Jan 14 2013 Jiri Popelka <jpopelka at redhat.com> 1:1.6.1-19
  - Fix unowned directories (#894531).
  
 -* Tue Dec 18 2012 Jiri Popelka <jpopelka at redhat.com> 1:1.5.4-22
 -- backport fixes for STR #4125, STR #4140, STR #4187, STR #4205, STR #4232
 +* Thu Jan 10 2013 Jiri Popelka <jpopelka at redhat.com> 1:1.6.1-18
 +- Clean /var/spool/cups/tmp with tmpfiles.d instead of tmpwatch&cron (#893834).
  
 -* Thu Dec  6 2012 Tim Waugh <twaugh at redhat.com> 1:1.5.4-21
 +* Wed Dec 19 2012 Jiri Popelka <jpopelka at redhat.com> 1:1.6.1-17
 +- Migrate cups-lpd from xinetd to systemd socket activatable service (#884641).
 +- Clean up old Requires/Conflicts/Obsoletes/Provides.
 +
 +* Thu Dec  6 2012 Tim Waugh <twaugh at redhat.com> 1:1.6.1-16
  - Additional fix relating to CVE-2012-5519 to avoid misleading error
    message about actions to take to enable file device URIs.
  


More information about the scm-commits mailing list