From 2645dcc9803934f30da9fcc6089c332c758d8cb9 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Mon, 22 Oct 2012 10:26:23 +0200
Subject: [PATCH] Add quirk rule for Xerox Phaser 3124 (#867392)

---
 cups-usblp-quirks.patch | 14 ++++++++------
 cups.spec               |  5 ++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/cups-usblp-quirks.patch b/cups-usblp-quirks.patch
index 59ec64b..506564c 100644
--- a/cups-usblp-quirks.patch
+++ b/cups-usblp-quirks.patch
@@ -1,6 +1,6 @@
 diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-libusb.c
 --- cups-1.5.4/backend/usb-libusb.c.usblp-quirks	2012-07-16 19:16:46.000000000 +0200
-+++ cups-1.5.4/backend/usb-libusb.c	2012-10-01 12:25:00.971216077 +0200
++++ cups-1.5.4/backend/usb-libusb.c	2012-10-17 16:30:58.571793169 +0200
 @@ -70,7 +70,7 @@ typedef struct usb_printer_s		/**** USB
  			read_endp,	/* Read endpoint */
  			protocol,	/* Protocol: 1 = Uni-di, 2 = Bi-di. */
@@ -19,7 +19,7 @@ diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-lib
  #define USBLP_QUIRK_NO_REATTACH	0x8000	/* After printing we cannot re-attach
  					   the usblp kernel module */
  
-@@ -141,15 +143,41 @@ static const struct quirk_printer_struct
+@@ -141,15 +143,43 @@ static const struct quirk_printer_struct
  	{ 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */
  	{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820,
  						  by zut <kernel@zut.de> */
@@ -54,6 +54,8 @@ diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-lib
 -			  USBLP_QUIRK_NO_REATTACH },
 +			  USBLP_QUIRK_NO_REATTACH |
 +	                  USBLP_QUIRK_RESET },
++	{ 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124
++			  https://bugzilla.redhat.com/show_bug.cgi?id=867392 */
  	/* Prolific Technology, Inc. PL2305 Parallel Port
 -	   (USB -> Parallel adapter) */
 +	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
@@ -64,7 +66,7 @@ diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-lib
  	{ 0, 0 }
  };
  
-@@ -256,7 +284,12 @@ print_device(const char *uri,		/* I - De
+@@ -256,7 +286,12 @@ print_device(const char *uri,		/* I - De
    }
  
    g.print_fd = print_fd;
@@ -78,7 +80,7 @@ diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-lib
  
   /*
    * If we are printing data from a print driver on stdin, ignore SIGTERM
-@@ -772,7 +805,7 @@ close_device(usb_printer_t *printer)	/*
+@@ -772,7 +807,7 @@ close_device(usb_printer_t *printer)	/*
      * Reset the device to clean up after the job
      */
  
@@ -87,7 +89,7 @@ diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-lib
      {
        if ((errcode = libusb_reset_device(printer->handle)) < 0)
  	fprintf(stderr,
-@@ -1288,7 +1321,7 @@ open_device(usb_printer_t *printer,	/* I
+@@ -1288,7 +1323,7 @@ open_device(usb_printer_t *printer,	/* I
    }
  
    printer->usblp_attached = 0;
@@ -96,7 +98,7 @@ diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-lib
  
    if (verbose)
      fputs("STATE: +connecting-to-device\n", stderr);
-@@ -1586,7 +1619,8 @@ static unsigned int quirks(int vendor, i
+@@ -1586,7 +1621,8 @@ static unsigned int quirks(int vendor, i
    for (i = 0; quirk_printers[i].vendorId; i++)
    {
      if (vendor == quirk_printers[i].vendorId &&
diff --git a/cups.spec b/cups.spec
index 556dede..81a05b1 100644
--- a/cups.spec
+++ b/cups.spec
@@ -12,7 +12,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.5.4
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -682,6 +682,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man1/ipptool.1.gz
 
 %changelog
+* Mon Oct 22 2012 Jiri Popelka <jpopelka@redhat.com> 1:1.5.4-11
+- Add quirk rule for Xerox Phaser 3124 (#867392)
+
 * Thu Oct 11 2012 Tim Waugh <twaugh@redhat.com> 1:1.5.4-10
 - Avoid double-free crash in Avahi support (bug #863409).