rpms/hplip/devel hplip-device-id.patch, 1.3, 1.4 hplip-disc-media.patch, 1.1, 1.2 hplip-libsane.patch, 1.5, 1.6 hplip-marker-supply.patch, 1.8, 1.9 hplip-segfault.patch, 1.1, 1.2 hplip-strstr-const.patch, 1.1, 1.2 hplip.spec, 1.208, 1.209

Tim Waugh twaugh at fedoraproject.org
Mon Jul 27 17:50:50 UTC 2009 

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7564

Modified Files:
	hplip-device-id.patch hplip-disc-media.patch 
	hplip-libsane.patch hplip-marker-supply.patch 
	hplip-segfault.patch hplip-strstr-const.patch hplip.spec 
Log Message:
* Mon Jul 27 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-1
- 3.9.6b.


hplip-device-id.patch:
 Makefile.am     |    4 -
 Makefile.in     |    4 -
 io/hpmud/musb.c |  151 +++++++++++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 127 insertions(+), 32 deletions(-)

Index: hplip-device-id.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-device-id.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hplip-device-id.patch	23 Jul 2009 17:30:37 -0000	1.3
+++ hplip-device-id.patch	27 Jul 2009 17:50:49 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up hplip-3.9.2/io/hpmud/musb.c.device-id hplip-3.9.2/io/hpmud/musb.c
---- hplip-3.9.2/io/hpmud/musb.c.device-id	2009-02-20 00:36:44.000000000 +0000
-+++ hplip-3.9.2/io/hpmud/musb.c	2009-07-23 18:15:12.923895944 +0100
+diff -up hplip-3.9.6b/io/hpmud/musb.c.device-id hplip-3.9.6b/io/hpmud/musb.c
+--- hplip-3.9.6b/io/hpmud/musb.c.device-id	2009-06-25 20:05:49.000000000 +0100
++++ hplip-3.9.6b/io/hpmud/musb.c	2009-07-27 16:10:28.125542973 +0100
 @@ -26,6 +26,11 @@
  
  #include "hpmud.h"
@@ -13,7 +13,7 @@ diff -up hplip-3.9.2/io/hpmud/musb.c.dev
  
  mud_device_vf __attribute__ ((visibility ("hidden"))) musb_mud_device_vf = 
  {
-@@ -488,7 +493,8 @@ bugout:
+@@ -489,7 +494,8 @@ bugout:
     return -1;  /* no endpoint found */
  }
  
@@ -23,7 +23,7 @@ diff -up hplip-3.9.2/io/hpmud/musb.c.dev
  {
     int stat=1;
  
-@@ -501,7 +507,8 @@ static int claim_interface(struct usb_de
+@@ -502,7 +508,8 @@ static int claim_interface(struct usb_de
        goto bugout;
     }
  
@@ -33,21 +33,21 @@ diff -up hplip-3.9.2/io/hpmud/musb.c.dev
  
  #if 0   /* hp devices only have one configuration, so far ... */
     if (usb_set_configuration(FD[fd].pHD, dev->config[config].bConfigurationValue))
-@@ -561,7 +568,7 @@ static int release_interface(file_descri
+@@ -562,7 +569,7 @@ static int release_interface(file_descri
  }
  
  /* Claim any open interface which is valid for device_id and device status. */
 -static int claim_id_interface(struct usb_device *dev)
 +static int claim_id_interface(struct usb_device *dev, int flags)
  {
-    int fd[] = {FD_7_1_2, FD_7_1_3, FD_ff_ff_ff, FD_ff_d4_0, FD_ff_1_1, FD_ff_2_1, FD_NA};
-    int i;
+    enum FD_ID i;
+ 
 @@ -570,7 +577,7 @@ static int claim_id_interface(struct usb
     {
-       if (get_interface(dev, fd[i], &fd_table[fd[i]]) == 0)
+       if (get_interface(dev, i, &fd_table[i]) == 0)
        {
--         if (claim_interface(libusb_device, &fd_table[fd[i]]))
-+	 if (claim_interface(libusb_device, &fd_table[fd[i]], flags))
+-         if (claim_interface(libusb_device, &fd_table[i]))
++	  if (claim_interface(libusb_device, &fd_table[i], flags))
              continue;  /* interface is busy, try next interface */
           break;  /* done */
        }
@@ -55,8 +55,8 @@ diff -up hplip-3.9.2/io/hpmud/musb.c.dev
     {
        /* First client. */
  
--      if ((fd = claim_id_interface(libusb_device)) == FD_NA)
-+      if ((fd = claim_id_interface(libusb_device, 0)) == FD_NA)
+-      if ((fd = claim_id_interface(libusb_device)) == MAX_FD)
++      if ((fd = claim_id_interface(libusb_device, 0)) == MAX_FD)
        {
           stat = HPMUD_R_DEVICE_BUSY;
           goto blackout;
@@ -64,30 +64,30 @@ diff -up hplip-3.9.2/io/hpmud/musb.c.dev
        if (fd == FD_NA)
        {
           /* Device not in use. Claim interface, but release for other processes. */
--         if ((fd = claim_id_interface(libusb_device)) != FD_NA)
-+         if ((fd = claim_id_interface(libusb_device, 0)) != FD_NA)
+-         if ((fd = claim_id_interface(libusb_device)) != MAX_FD)
++         if ((fd = claim_id_interface(libusb_device, 0)) != MAX_FD)
           {
              *len = device_id(fd, pd->id, sizeof(pd->id));  /* get new copy and cache it  */ 
              release_interface(&fd_table[fd]);
-@@ -1236,7 +1243,7 @@ enum HPMUD_RESULT __attribute__ ((visibi
+@@ -1239,7 +1246,7 @@ enum HPMUD_RESULT __attribute__ ((visibi
        if (fd == FD_NA)
        {
           /* Device not in use. Claim interface, but release for other processes. */
--         if ((fd = claim_id_interface(libusb_device)) != FD_NA)
-+         if ((fd = claim_id_interface(libusb_device, 0)) != FD_NA)
+-         if ((fd = claim_id_interface(libusb_device)) != MAX_FD)
++         if ((fd = claim_id_interface(libusb_device, 0)) != MAX_FD)
           {
              r = device_status(fd, status);
              release_interface(&fd_table[fd]);
-@@ -1339,7 +1346,7 @@ enum HPMUD_RESULT __attribute__ ((visibi
-    int fd = FD_7_1_2;
-    enum HPMUD_RESULT stat = HPMUD_R_DEVICE_BUSY;
+@@ -1344,7 +1351,7 @@ enum HPMUD_RESULT __attribute__ ((visibi
+ 
+    get_interface(libusb_device, fd, &fd_table[fd]);
  
 -   if (claim_interface(libusb_device, &fd_table[fd]))
 +   if (claim_interface(libusb_device, &fd_table[fd], 0))
        goto bugout;
  
     pc->fd = fd;
-@@ -1470,7 +1477,7 @@ enum HPMUD_RESULT __attribute__ ((visibi
+@@ -1475,7 +1482,7 @@ enum HPMUD_RESULT __attribute__ ((visibi
        goto bugout;
     }
  
@@ -96,25 +96,43 @@ diff -up hplip-3.9.2/io/hpmud/musb.c.dev
        goto bugout;
  
     pc->fd = fd;
-@@ -1504,7 +1511,7 @@ enum HPMUD_RESULT __attribute__ ((visibi
-       else 
+@@ -1499,13 +1506,13 @@ enum HPMUD_RESULT __attribute__ ((visibi
+    /* Initialize MLC transport if this is the first MLC channel. */
+    if (pd->channel_cnt==1)
+    {
+-      if (get_interface(libusb_device, FD_7_1_3, &fd_table[FD_7_1_3]) == 0 && claim_interface(libusb_device, &fd_table[FD_7_1_3]) == 0)
++      if (get_interface(libusb_device, FD_7_1_3, &fd_table[FD_7_1_3]) == 0 && claim_interface(libusb_device, &fd_table[FD_7_1_3], 0) == 0)
+          fd = FD_7_1_3;    /* mlc, dot4 */
+-      else if (get_interface(libusb_device, FD_ff_ff_ff, &fd_table[FD_ff_ff_ff]) == 0 && claim_interface(libusb_device, &fd_table[FD_ff_ff_ff]) == 0)
++      else if (get_interface(libusb_device, FD_ff_ff_ff, &fd_table[FD_ff_ff_ff]) == 0 && claim_interface(libusb_device, &fd_table[FD_ff_ff_ff], 0) == 0)
+          fd = FD_ff_ff_ff;   /* mlc, dot4 */
+-      else if (get_interface(libusb_device, FD_ff_d4_0, &fd_table[FD_ff_d4_0]) == 0 && claim_interface(libusb_device, &fd_table[FD_ff_d4_0]) == 0)
++      else if (get_interface(libusb_device, FD_ff_d4_0, &fd_table[FD_ff_d4_0]) == 0 && claim_interface(libusb_device, &fd_table[FD_ff_d4_0], 0) == 0)
+          fd = FD_ff_d4_0;   /* mlc, dot4 */
+-      else if (get_interface(libusb_device, FD_7_1_2, &fd_table[FD_7_1_2]) == 0 && claim_interface(libusb_device, &fd_table[FD_7_1_2]) == 0)
++      else if (get_interface(libusb_device, FD_7_1_2, &fd_table[FD_7_1_2]) == 0 && claim_interface(libusb_device, &fd_table[FD_7_1_2], 0) == 0)
           fd = FD_7_1_2;    /* raw, mlc, dot4 */
- 
--      if (claim_interface(libusb_device, &fd_table[fd]))
-+      if (claim_interface(libusb_device, &fd_table[fd], 0))
+       else
        {
-          stat = HPMUD_R_DEVICE_BUSY;
-          goto bugout;
-@@ -1726,7 +1733,7 @@ enum HPMUD_RESULT __attribute__ ((visibi
-       else 
+@@ -1719,13 +1726,13 @@ enum HPMUD_RESULT __attribute__ ((visibi
+    /* Initialize MLC transport if this is the first MLC channel. */
+    if (pd->channel_cnt==1)
+    {
+-      if (get_interface(libusb_device, FD_7_1_3, &fd_table[FD_7_1_3]) == 0 && claim_interface(libusb_device, &fd_table[FD_7_1_3]) == 0)
++      if (get_interface(libusb_device, FD_7_1_3, &fd_table[FD_7_1_3]) == 0 && claim_interface(libusb_device, &fd_table[FD_7_1_3], 0) == 0)
+          fd = FD_7_1_3;    /* mlc, dot4 */
+-      else if (get_interface(libusb_device, FD_ff_ff_ff, &fd_table[FD_ff_ff_ff]) == 0 && claim_interface(libusb_device, &fd_table[FD_ff_ff_ff]) == 0)
++      else if (get_interface(libusb_device, FD_ff_ff_ff, &fd_table[FD_ff_ff_ff]) == 0 && claim_interface(libusb_device, &fd_table[FD_ff_ff_ff], 0) == 0)
+          fd = FD_ff_ff_ff;   /* mlc, dot4 */
+-      else if (get_interface(libusb_device, FD_ff_d4_0, &fd_table[FD_ff_d4_0]) == 0 && claim_interface(libusb_device, &fd_table[FD_ff_d4_0]) == 0)
++      else if (get_interface(libusb_device, FD_ff_d4_0, &fd_table[FD_ff_d4_0]) == 0 && claim_interface(libusb_device, &fd_table[FD_ff_d4_0], 0) == 0)
+          fd = FD_ff_d4_0;   /* mlc, dot4 */
+-      else if (get_interface(libusb_device, FD_7_1_2, &fd_table[FD_7_1_2]) == 0 && claim_interface(libusb_device, &fd_table[FD_7_1_2]) == 0)
++      else if (get_interface(libusb_device, FD_7_1_2, &fd_table[FD_7_1_2]) == 0 && claim_interface(libusb_device, &fd_table[FD_7_1_2], 0) == 0)
           fd = FD_7_1_2;    /* raw, mlc, dot4 */
- 
--      if (claim_interface(libusb_device, &fd_table[fd]))
-+      if (claim_interface(libusb_device, &fd_table[fd], 0))
+       else
        {
-          stat = HPMUD_R_DEVICE_BUSY;
-          goto bugout;
-@@ -1959,6 +1966,91 @@ bugout:
+@@ -1960,6 +1967,91 @@ bugout:
   * USB probe devices, walk the USB bus(s) looking for HP products.
   */
  
@@ -131,7 +149,7 @@ diff -up hplip-3.9.2/io/hpmud/musb.c.dev
 +
 +    libusb_device = dev;
 +    fd = claim_id_interface (dev, CLAIM_NO_DETACH);
-+    if (fd == FD_NA)
++    if (fd == MAX_FD)
 +    {
 +       try_usblp = 1;
 +       goto try_usblp_instead;
@@ -206,7 +224,7 @@ diff -up hplip-3.9.2/io/hpmud/musb.c.dev
  int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int lst_size, int *cnt)
  {
     struct usb_bus *bus;
-@@ -2006,6 +2098,7 @@ int __attribute__ ((visibility ("hidden"
+@@ -2007,6 +2099,7 @@ int __attribute__ ((visibility ("hidden"
  
              if (model[0])
              {
@@ -214,7 +232,7 @@ diff -up hplip-3.9.2/io/hpmud/musb.c.dev
                 snprintf(sz, sizeof(sz), "hp:/usb/%s?serial=%s", model, serial);
  
                 /* See if device is supported by hplip. */
-@@ -2016,17 +2109,19 @@ int __attribute__ ((visibility ("hidden"
+@@ -2017,17 +2110,19 @@ int __attribute__ ((visibility ("hidden"
                    continue;           /* ignor, not supported */
                 }
  
@@ -245,32 +263,32 @@ diff -up hplip-3.9.2/io/hpmud/musb.c.dev
                 *cnt+=1;
              }
           }
-diff -up hplip-3.9.2/Makefile.am.device-id hplip-3.9.2/Makefile.am
---- hplip-3.9.2/Makefile.am.device-id	2009-02-20 00:36:58.000000000 +0000
-+++ hplip-3.9.2/Makefile.am	2009-07-23 18:12:15.843895808 +0100
-@@ -218,9 +218,9 @@ libhpmud_la_SOURCES = io/hpmud/hpmud.c i
+diff -up hplip-3.9.6b/Makefile.am.device-id hplip-3.9.6b/Makefile.am
+--- hplip-3.9.6b/Makefile.am.device-id	2009-06-25 20:05:57.000000000 +0100
++++ hplip-3.9.6b/Makefile.am	2009-07-27 16:05:54.700543137 +0100
+@@ -67,9 +67,9 @@ libhpmud_la_SOURCES = io/hpmud/hpmud.c i
  	  io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/musb.h io/hpmud/pml.h io/hpmud/dot4.c \
  	  io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h
  if NETWORK_BUILD
--libhpmud_la_LDFLAGS = -version-info 0:4:0 -lusb -lpthread -lnetsnmp -lcrypto
-+libhpmud_la_LDFLAGS = -version-info 0:4:0 -lusb -ludev -lpthread -lnetsnmp -lcrypto
+-libhpmud_la_LDFLAGS = -version-info 0:5:0 -lusb -lpthread -l$(SNMPLIB) -lcrypto
++libhpmud_la_LDFLAGS = -version-info 0:5:0 -lusb -ludev -lpthread -l$(SNMPLIB) -lcrypto
  else
--libhpmud_la_LDFLAGS = -version-info 0:4:0 -lusb -lpthread
-+libhpmud_la_LDFLAGS = -version-info 0:4:0 -lusb -ludev -lpthread
+-libhpmud_la_LDFLAGS = -version-info 0:5:0 -lusb -lpthread
++libhpmud_la_LDFLAGS = -version-info 0:5:0 -lusb -ludev -lpthread
  endif
  libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
  
-diff -up hplip-3.9.2/Makefile.in.device-id hplip-3.9.2/Makefile.in
---- hplip-3.9.2/Makefile.in.device-id	2009-02-20 00:37:52.000000000 +0000
-+++ hplip-3.9.2/Makefile.in	2009-07-23 18:12:15.850895526 +0100
-@@ -3954,8 +3954,8 @@ dist_unrel_DATA = 
+diff -up hplip-3.9.6b/Makefile.in.device-id hplip-3.9.6b/Makefile.in
+--- hplip-3.9.6b/Makefile.in.device-id	2009-06-25 21:02:19.000000000 +0100
++++ hplip-3.9.6b/Makefile.in	2009-07-27 16:06:31.812417344 +0100
+@@ -3618,8 +3618,8 @@ cups_drv = prnt/drv/hpcups.drv
  @HPLIP_BUILD_TRUE@	  io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/musb.h io/hpmud/pml.h io/hpmud/dot4.c \
  @HPLIP_BUILD_TRUE@	  io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h
  
-- at HPLIP_BUILD_TRUE@@NETWORK_BUILD_FALSE at libhpmud_la_LDFLAGS = -version-info 0:4:0 -lusb -lpthread
-- at HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE at libhpmud_la_LDFLAGS = -version-info 0:4:0 -lusb -lpthread -lnetsnmp -lcrypto
-+ at HPLIP_BUILD_TRUE@@NETWORK_BUILD_FALSE at libhpmud_la_LDFLAGS = -version-info 0:4:0 -lusb -ludev -lpthread
-+ at HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE at libhpmud_la_LDFLAGS = -version-info 0:4:0 -lusb -ludev -lpthread -lnetsnmp -lcrypto
+- at HPLIP_BUILD_TRUE@@NETWORK_BUILD_FALSE at libhpmud_la_LDFLAGS = -version-info 0:5:0 -lusb -lpthread
+- at HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE at libhpmud_la_LDFLAGS = -version-info 0:5:0 -lusb -lpthread -l$(SNMPLIB) -lcrypto
++ at HPLIP_BUILD_TRUE@@NETWORK_BUILD_FALSE at libhpmud_la_LDFLAGS = -version-info 0:5:0 -lusb -ludev -lpthread
++ at HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE at libhpmud_la_LDFLAGS = -version-info 0:5:0 -lusb -ludev -lpthread -l$(SNMPLIB) -lcrypto
  @HPLIP_BUILD_TRUE at libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
- 
- # hpmudext
+ @HPLIP_BUILD_TRUE at libhpip_la_LDFLAGS = -version-info 0:1:0
+ @HPLIP_BUILD_TRUE at libhpip_la_LIBADD = -lm

hplip-disc-media.patch:
 dj9xxvip.cpp |   24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

Index: hplip-disc-media.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-disc-media.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-disc-media.patch	24 Jun 2009 09:21:12 -0000	1.1
+++ hplip-disc-media.patch	27 Jul 2009 17:50:49 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up hplip-3.9.2/prnt/hpijs/dj9xxvip.cpp.disc-media hplip-3.9.2/prnt/hpijs/dj9xxvip.cpp
---- hplip-3.9.2/prnt/hpijs/dj9xxvip.cpp.disc-media	2009-02-20 00:38:04.000000000 +0000
-+++ hplip-3.9.2/prnt/hpijs/dj9xxvip.cpp	2009-06-24 09:54:12.176317380 +0100
+diff -up hplip-3.9.6b/prnt/hpijs/dj9xxvip.cpp.disc-media hplip-3.9.6b/prnt/hpijs/dj9xxvip.cpp
+--- hplip-3.9.6b/prnt/hpijs/dj9xxvip.cpp.disc-media	2009-06-25 21:02:29.000000000 +0100
++++ hplip-3.9.6b/prnt/hpijs/dj9xxvip.cpp	2009-07-27 17:10:55.882543437 +0100
 @@ -500,6 +500,23 @@ DRIVER_ERROR HeaderDJ990::Send()
      QUALITY_MODE    eQualityMode;
      BOOL            bDeviceText;
@@ -22,10 +22,10 @@ diff -up hplip-3.9.2/prnt/hpijs/dj9xxvip
 +       break;
 +    }
 +
-     thePrintContext->GetPrintModeSettings (eQualityMode, eMediaType, eColorMode, bDeviceText);
-     if (eMediaType == MEDIA_CDDVD)
-     {
-@@ -516,7 +533,9 @@ DRIVER_ERROR HeaderDJ990::Send()
+     thePrintContext->GetPrintModeSettings (eQualityMode, eMediaType, eColorMode, bDeviceText);
+ 
+ #ifdef APDK_LINUX
+@@ -511,7 +528,9 @@ DRIVER_ERROR HeaderDJ990::Send()
   *  on what was selected from ppd.
   */
  
@@ -34,9 +34,9 @@ diff -up hplip-3.9.2/prnt/hpijs/dj9xxvip
 +     */
 +    // SetMediaType (MediaTypeToPcl (eMediaType));
  #endif
- 
-     StartSend();
-@@ -733,11 +752,12 @@ void HeaderDJ990::SetMediaSource(MediaSo
+ 
+     if (eMediaType == MEDIA_CDDVD)
+@@ -734,11 +753,12 @@ void HeaderDJ990::SetMediaSource(MediaSo
      msrccount=EscAmplCopy((BYTE*)mediasource,msource,'H');
      if (msource == sourceTrayCDDVD)
      {

hplip-libsane.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: hplip-libsane.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-libsane.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- hplip-libsane.patch	20 Feb 2009 13:13:49 -0000	1.5
+++ hplip-libsane.patch	27 Jul 2009 17:50:49 -0000	1.6
@@ -1,24 +1,24 @@
-diff -up hplip-3.9.2/Makefile.am.libsane hplip-3.9.2/Makefile.am
---- hplip-3.9.2/Makefile.am.libsane	2009-02-20 00:36:58.000000000 +0000
-+++ hplip-3.9.2/Makefile.am	2009-02-20 11:10:19.000000000 +0000
-@@ -195,7 +195,7 @@ else
+diff -up hplip-3.9.6b/Makefile.am.libsane hplip-3.9.6b/Makefile.am
+--- hplip-3.9.6b/Makefile.am.libsane	2009-07-27 16:18:54.166417989 +0100
++++ hplip-3.9.6b/Makefile.am	2009-07-27 16:19:23.487543339 +0100
+@@ -55,7 +55,7 @@ else
  libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
  endif
  # The following is a interlibrary dependency that must be compiled first.
--libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
-+libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lsane
+-libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -ldl
++libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -ldl -lsane
  #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
  libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)
- 
-diff -up hplip-3.9.2/Makefile.in.libsane hplip-3.9.2/Makefile.in
---- hplip-3.9.2/Makefile.in.libsane	2009-02-20 00:37:52.000000000 +0000
-+++ hplip-3.9.2/Makefile.in	2009-02-20 11:10:42.000000000 +0000
-@@ -3933,7 +3933,7 @@ dist_unrel_DATA = 
+ endif # SCAN_BUILD
+diff -up hplip-3.9.6b/Makefile.in.libsane hplip-3.9.6b/Makefile.in
+--- hplip-3.9.6b/Makefile.in.libsane	2009-07-27 16:18:54.174417364 +0100
++++ hplip-3.9.6b/Makefile.in	2009-07-27 16:19:39.431417307 +0100
+@@ -3608,7 +3608,7 @@ cups_drv = prnt/drv/hpcups.drv
  @DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
  @DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
  # The following is a interlibrary dependency that must be compiled first.
-- at HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
-+ at HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lsane
+- at HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -ldl
++ at HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -ldl -lsane
  #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
  @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)
  

hplip-marker-supply.patch:
 hpcups.cpp |    4 ++--
 hpijs.cpp  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: hplip-marker-supply.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-marker-supply.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- hplip-marker-supply.patch	4 Mar 2008 18:02:20 -0000	1.8
+++ hplip-marker-supply.patch	27 Jul 2009 17:50:49 -0000	1.9
@@ -1,17 +1,34 @@
-diff -up hplip-2.8.2/prnt/hpijs/hpijs.cpp.marker-supply hplip-2.8.2/prnt/hpijs/hpijs.cpp
---- hplip-2.8.2/prnt/hpijs/hpijs.cpp.marker-supply	2008-02-08 19:36:38.000000000 +0000
-+++ hplip-2.8.2/prnt/hpijs/hpijs.cpp	2008-03-04 17:51:02.000000000 +0000
-@@ -541,11 +541,11 @@ int main (int argc, char *argv[], char *
+diff -up hplip-3.9.6b/prnt/hpijs/hpcups.cpp.marker-supply hplip-3.9.6b/prnt/hpijs/hpcups.cpp
+--- hplip-3.9.6b/prnt/hpijs/hpcups.cpp.marker-supply	2009-07-27 18:43:01.724542229 +0100
++++ hplip-3.9.6b/prnt/hpijs/hpcups.cpp	2009-07-27 18:43:09.416543072 +0100
+@@ -347,11 +347,11 @@ int HPCups::initContext (char **argv)
+ 	    case WARN_LOW_INK_YELLOW:
+ 	    case WARN_LOW_INK_MULTIPLE_PENS:
+ 	    {
+-	       BUG ("STATE: marker-supply-low-warning\n");
++	       BUG ("STATE: +marker-supply-low-warning\n");
+ 	       break;
+ 	    }
+ 	    default:
+-	       BUG ("STATE: -marker-supply-low-warning");
++	       BUG ("STATE: -marker-supply-low-warning\n");
+ 	}
+     }
+ 
+diff -up hplip-3.9.6b/prnt/hpijs/hpijs.cpp.marker-supply hplip-3.9.6b/prnt/hpijs/hpijs.cpp
+--- hplip-3.9.6b/prnt/hpijs/hpijs.cpp.marker-supply	2009-07-27 18:42:48.290417159 +0100
++++ hplip-3.9.6b/prnt/hpijs/hpijs.cpp	2009-07-27 18:42:48.315417579 +0100
+@@ -630,11 +630,11 @@ int main (int argc, char *argv[], char *
  			case WARN_LOW_INK_YELLOW:
  			case WARN_LOW_INK_MULTIPLE_PENS:
                          {
--			   bug ("STATE: marker-supply-low-warning\n");
-+			   bug ("STATE: +marker-supply-low-warning\n");
+-			   BUG ("STATE: marker-supply-low-warning\n");
++			   BUG ("STATE: +marker-supply-low-warning\n");
                             break;
                          }
  			default:
--			   bug ("STATE: -marker-supply-low-warning");
-+			   bug ("STATE: -marker-supply-low-warning\n");
+-			   BUG ("STATE: -marker-supply-low-warning");
++			   BUG ("STATE: -marker-supply-low-warning\n");
  		}
      }
  

hplip-segfault.patch:
 hpcups.cpp |    9 ++++++---
 hpijs.cpp  |    5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

Index: hplip-segfault.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-segfault.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-segfault.patch	13 Jan 2009 15:20:09 -0000	1.1
+++ hplip-segfault.patch	27 Jul 2009 17:50:49 -0000	1.2
@@ -1,19 +1,35 @@
-diff -up hplip-2.8.12/prnt/hpijs/hpijs.cpp.segfault hplip-2.8.12/prnt/hpijs/hpijs.cpp
---- hplip-2.8.12/prnt/hpijs/hpijs.cpp.segfault	2009-01-13 15:11:55.000000000 +0000
-+++ hplip-2.8.12/prnt/hpijs/hpijs.cpp	2009-01-13 15:13:49.000000000 +0000
-@@ -231,8 +231,14 @@ int hpijs_set_cb (void *set_cb_data, Ijs
+diff -up hplip-3.9.6b/prnt/hpijs/hpcups.cpp.segfault hplip-3.9.6b/prnt/hpijs/hpcups.cpp
+--- hplip-3.9.6b/prnt/hpijs/hpcups.cpp.segfault	2009-06-25 20:04:19.000000000 +0100
++++ hplip-3.9.6b/prnt/hpijs/hpcups.cpp	2009-07-27 18:42:04.561544716 +0100
+@@ -373,9 +373,12 @@ int HPCups::initContext (char **argv)
+     if (err == PLUGIN_LIBRARY_MISSING)
+     {
+         // call dbus here
+-	SendDbusMessage (getenv ("DEVICE_URI"), getenv ("PRINTER"),
+-	                 EVENT_PRINT_FAILED_MISSING_PLUGIN,
+-			 argv[2], atoi (argv[1]), argv[3]);
++	const char *device_uri = getenv ("DEVICE_URI");
++	const char *printer = getenv ("PRINTER");
++	if (device_uri && printer)
++	    SendDbusMessage (device_uri, printer,
++			     EVENT_PRINT_FAILED_MISSING_PLUGIN,
++			     argv[2], atoi (argv[1]), argv[3]);
+ 	BUG ("ERROR: unable to set device = %s, err = %d\n", attr->value, err);
+ 	return 1;
+     }
+diff -up hplip-3.9.6b/prnt/hpijs/hpijs.cpp.segfault hplip-3.9.6b/prnt/hpijs/hpijs.cpp
+--- hplip-3.9.6b/prnt/hpijs/hpijs.cpp.segfault	2009-06-25 20:04:19.000000000 +0100
++++ hplip-3.9.6b/prnt/hpijs/hpijs.cpp	2009-07-27 18:39:46.755417388 +0100
+@@ -253,8 +253,11 @@ int hpijs_set_cb (void *set_cb_data, Ijs
  		// call dbus here
  		const char    *user_name = " ";
  		const char    *title     = " ";
 +		char *device_uri = getenv ("DEVICE_URI");
-+		char *printer = getenv("PRINTER");
++		char *printer = getenv ("PRINTER");
  		int     job_id = 0;
 -                SendDbusMessage (getenv ("DEVICE_URI"), getenv("PRINTER"),
-+		if (!device_uri)
-+		    device_uri = "";
-+		if (!printer)
-+		    printer = "";
-+                SendDbusMessage (device_uri, printer,
++                SendDbusMessage (device_uri ? device_uri : "",
++				 printer ? printer : "",
  	     	                 EVENT_PRINT_FAILED_MISSING_PLUGIN,
  				 user_name, job_id, title);
-                 bug("unable to set device=%s, err=%d\n", svalue, r);
+                 BUG("unable to set device=%s, err=%d\n", svalue, r);

hplip-strstr-const.patch:
 dj3320.cpp   |    2 +-
 registry.cpp |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

Index: hplip-strstr-const.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-strstr-const.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-strstr-const.patch	20 Feb 2009 13:16:54 -0000	1.1
+++ hplip-strstr-const.patch	27 Jul 2009 17:50:50 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up hplip-3.9.2/prnt/hpijs/dj3320.cpp.strstr-const hplip-3.9.2/prnt/hpijs/dj3320.cpp
---- hplip-3.9.2/prnt/hpijs/dj3320.cpp.strstr-const	2009-02-20 00:38:04.000000000 +0000
-+++ hplip-3.9.2/prnt/hpijs/dj3320.cpp	2009-02-20 11:27:51.000000000 +0000
-@@ -403,7 +403,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE 
+diff -up hplip-3.9.6b/prnt/hpijs/dj3320.cpp.strstr-const hplip-3.9.6b/prnt/hpijs/dj3320.cpp
+--- hplip-3.9.6b/prnt/hpijs/dj3320.cpp.strstr-const	2009-06-25 21:02:29.000000000 +0100
++++ hplip-3.9.6b/prnt/hpijs/dj3320.cpp	2009-07-27 16:14:52.868542337 +0100
+@@ -405,7 +405,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE 
  {
      DRIVER_ERROR err = NO_ERROR;
      BYTE byDevIDBuffer[DevIDBuffSize];
@@ -10,18 +10,32 @@ diff -up hplip-3.9.2/prnt/hpijs/dj3320.c
      BYTE byStatus1, byStatus2;
  
      memset(byDevIDBuffer, 0, sizeof(byDevIDBuffer));
-diff -up hplip-3.9.2/prnt/hpijs/registry.cpp.strstr-const hplip-3.9.2/prnt/hpijs/registry.cpp
---- hplip-3.9.2/prnt/hpijs/registry.cpp.strstr-const	2009-02-20 00:38:04.000000000 +0000
-+++ hplip-3.9.2/prnt/hpijs/registry.cpp	2009-02-20 11:27:00.000000000 +0000
-@@ -292,15 +292,15 @@ DRIVER_ERROR DeviceRegistry::SelectDevic
+diff -up hplip-3.9.6b/prnt/hpijs/registry.cpp.strstr-const hplip-3.9.6b/prnt/hpijs/registry.cpp
+--- hplip-3.9.6b/prnt/hpijs/registry.cpp.strstr-const	2009-06-25 21:02:29.000000000 +0100
++++ hplip-3.9.6b/prnt/hpijs/registry.cpp	2009-07-27 16:18:41.583417187 +0100
+@@ -290,14 +290,14 @@ DRIVER_ERROR DeviceRegistry::SelectDevic
+         err = pSS->GetDeviceID(DevIDBuffer, DevIDBuffSize, FALSE);
+         ERRCHECK;   // should be either NO_ERROR or BAD_DEVICE_ID
+ 
+-		char	*cmdStr = (char *) strstr ((const char *) DevIDBuffer+2, "CMD:");
++	char	*cmdStr = strstr ((char *) DevIDBuffer+2, "CMD:");
+         char    *cmdStrEnd;
+         if ((strstr((const char *) DevIDBuffer+2,"CMD:LDL")))
+         {
              device = eDJ3320;
              match = TRUE;
          }
--		char	*cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
-+		const char	*cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
- 		if (!cmdStr)
+-        if (!match && cmdStr && (cmdStrEnd = (char *) strstr (cmdStr, ";")))
++        if (!match && cmdStr && (cmdStrEnd = strstr (cmdStr, ";")))
+         {
+             *cmdStrEnd = '\0';
+             if (strstr (cmdStr, "LDL"))
+@@ -309,12 +309,12 @@ DRIVER_ERROR DeviceRegistry::SelectDevic
+         }
+ 		if (!match && !cmdStr)
  		{
- 			cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:");
+-			cmdStr = (char *) strstr ((const char *) DevIDBuffer+2, "COMMAND SET:");
++			cmdStr = strstr ((char *) DevIDBuffer+2, "COMMAND SET:");
  		}
 -		if (!match && cmdStr && (strstr ((const char *) cmdStr+4, "POSTSCRIPT") || 
 -			                     strstr ((const char *) cmdStr+4, "PostScript") || 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- hplip.spec	25 Jul 2009 02:12:55 -0000	1.208
+++ hplip.spec	27 Jul 2009 17:50:50 -0000	1.209
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.9.2
-Release: 9%{?dist}
+Version: 3.9.6b
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -140,7 +140,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %configure --disable-foomatic-xml-install --disable-cups-install \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
 	--disable-foomatic-rip-hplip-install --enable-dbus \
-	--enable-qt4
+	--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
+	--enable-hpijs-install
+
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
@@ -207,7 +209,7 @@ rm -rf %{buildroot}
 %{_bindir}/hp-align
 %{_bindir}/hp-clean
 %{_bindir}/hp-colorcal
-%{_bindir}/hp-devicesetup
+%{_bindir}/hp-devicesettings
 %{_bindir}/hp-fab
 %{_bindir}/hp-faxsetup
 %{_bindir}/hp-firmware
@@ -217,6 +219,7 @@ rm -rf %{buildroot}
 %{_bindir}/hp-makecopies
 %{_bindir}/hp-makeuri
 %{_bindir}/hp-mkuri
+%{_bindir}/hp-pkservice
 %{_bindir}/hp-plugin
 %{_bindir}/hp-pqdiag
 %{_bindir}/hp-printsettings
@@ -228,6 +231,7 @@ rm -rf %{buildroot}
 %{_bindir}/hp-testpage
 %{_bindir}/hp-timedate
 %{_bindir}/hp-unload
+%{_bindir}/hp-wificonfig
 # Note: this must be /usr/lib not %{_libdir}, since that's the
 # CUPS serverbin directory.
 /usr/lib/cups/backend/hp
@@ -237,7 +241,7 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/align.py*
 %{_datadir}/hplip/clean.py*
 %{_datadir}/hplip/colorcal.py*
-%{_datadir}/hplip/devicesetup.py*
+%{_datadir}/hplip/devicesettings.py*
 %{_datadir}/hplip/fab.py*
 %{_datadir}/hplip/fax
 %{_datadir}/hplip/faxsetup.py*
@@ -250,6 +254,7 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/linefeedcal.py*
 %{_datadir}/hplip/makecopies.py*
 %{_datadir}/hplip/makeuri.py*
+%{_datadir}/hplip/pkservice.py*
 %{_datadir}/hplip/plugin.py*
 %{_datadir}/hplip/pqdiag.py*
 %{_datadir}/hplip/printsettings.py*
@@ -261,6 +266,7 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/testpage.py*
 %{_datadir}/hplip/timedate.py*
 %{_datadir}/hplip/unload.py*
+%{_datadir}/hplip/wificonfig.py*
 # Directories
 %{_datadir}/hplip/base
 %{_datadir}/hplip/copier
@@ -296,8 +302,6 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/toolbox.py*
 # Directories
 %{_datadir}/hplip/data/images
-%{_datadir}/hplip/plugins
-%{_datadir}/hplip/ui
 %{_datadir}/hplip/ui4
 
 %files -n hpijs
@@ -308,6 +312,9 @@ rm -rf %{buildroot}
 %{_datadir}/cups/drv/*
 # Note: this must be /usr/lib not %{_libdir}, since that's the
 # CUPS serverbin directory.
+/usr/lib/cups/filter/hpcac
+/usr/lib/cups/filter/hpcups
+/usr/lib/cups/filter/hpcupsfax
 /usr/lib/cups/filter/hplipjs
 
 %files -n libsane-hpaio
@@ -336,6 +343,9 @@ fi
 exit 0
 
 %changelog
+* Mon Jul 27 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-1
+- 3.9.6b.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.9.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

More information about the fedora-extras-commits mailing list