rpms/sane-backends/FC-6 sane-backends-1.0.18-glibc-2.7.patch, NONE, 1.1 sane-backends-1.0.18-udev-098.patch, 1.3, 1.4 sane-backends.spec, 1.83, 1.84 sane-backends-1.0.18-udev-new-kernels.patch, 1.4, NONE

Mon Aug 13 07:32:03 UTC 2007

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv24526

Modified Files:
	sane-backends-1.0.18-udev-098.patch sane-backends.spec 
Added Files:
	sane-backends-1.0.18-glibc-2.7.patch 
Removed Files:
	sane-backends-1.0.18-udev-new-kernels.patch 
Log Message:
make udev rules more robust (#243953)
bring code in shape for glibc-2.7


sane-backends-1.0.18-glibc-2.7.patch:
 backend/mustek_pp.c    |    2 +-
 backend/pixma_common.c |    2 +-
 backend/plustek_pp.c   |    2 +-
 sanei/sanei_scsi.c     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE sane-backends-1.0.18-glibc-2.7.patch ---
--- sane-backends-1.0.18/sanei/sanei_scsi.c.glibc-2.7	2005-11-24 23:08:49.000000000 +0100
+++ sane-backends-1.0.18/sanei/sanei_scsi.c	2007-08-08 15:01:07.000000000 +0200
@@ -5028,7 +5028,7 @@ sanei_scsi_find_devices (const char *fin
     (*plugInInterface)->Release (plugInInterface);
     IOObjectRelease (scsiDevice);
 
-    ioReturnValue = (*scsiDeviceInterface)->open (scsiDeviceInterface);
+    ioReturnValue = ((*scsiDeviceInterface)->open) (scsiDeviceInterface);
     if (ioReturnValue != kIOReturnSuccess)
       {
 	DBG (5, "Error opening SCSI interface (0x%08x)\n", ioReturnValue);
--- sane-backends-1.0.18/backend/pixma_common.c.glibc-2.7	2006-06-11 22:53:05.000000000 +0200
+++ sane-backends-1.0.18/backend/pixma_common.c	2007-08-08 15:01:18.000000000 +0200
@@ -449,7 +449,7 @@ pixma_open (unsigned devnr, pixma_t ** h
   strncpy (s->id, pixma_get_device_id (devnr), sizeof (s->id));
   s->ops = s->cfg->ops;
   s->scanning = 0;
-  error = s->ops->open (s);
+  error = (s->ops->open) (s);
   if (error < 0)
     goto rollback;
   *handle = s;
--- sane-backends-1.0.18/backend/plustek_pp.c.glibc-2.7	2006-02-19 12:32:24.000000000 +0100
+++ sane-backends-1.0.18/backend/plustek_pp.c	2007-08-08 14:56:45.000000000 +0200
@@ -258,7 +258,7 @@ static int drvopen(	Plustek_Device *dev 
 
     DBG( _DBG_INFO, "drvopen()\n" );
 
-	handle = dev->open((const char*)dev->name, (void *)dev );
+	handle = (dev->open)((const char*)dev->name, (void *)dev );
 
 	tsecs = 0;
 
--- sane-backends-1.0.18/backend/mustek_pp.c.glibc-2.7	2005-04-16 15:06:37.000000000 +0200
+++ sane-backends-1.0.18/backend/mustek_pp.c	2007-08-08 15:01:30.000000000 +0200
@@ -1152,7 +1152,7 @@ sane_open (SANE_String_Const devicename,
 
 	}
 	
-	if ((status = dev->func->open (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) {
+	if ((status = (dev->func->open) (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) {
 
 		DBG (1, "sane_open: could not open device (%s)\n",
 				sane_strstatus (status));

sane-backends-1.0.18-udev-098.patch:
 sane-desc.c |   50 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 43 insertions(+), 7 deletions(-)

Index: sane-backends-1.0.18-udev-098.patch
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/FC-6/sane-backends-1.0.18-udev-098.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sane-backends-1.0.18-udev-098.patch	22 Jul 2007 21:28:20 -0000	1.3
+++ sane-backends-1.0.18-udev-098.patch	13 Aug 2007 07:32:00 -0000	1.4
@@ -1,11 +1,83 @@
---- sane-backends-1.0.18/tools/sane-desc.c.udev-098	2007-07-22 23:23:51.000000000 +0200
-+++ sane-backends-1.0.18/tools/sane-desc.c	2007-07-22 23:24:37.000000000 +0200
-@@ -3187,7 +3187,7 @@ print_udev (void)
+--- sane-backends-1.0.18/tools/sane-desc.c.udev-098	2007-08-07 14:56:03.000000000 +0200
++++ sane-backends-1.0.18/tools/sane-desc.c	2007-08-08 12:45:27.000000000 +0200
+@@ -3153,14 +3153,14 @@ print_udev_header (void)
+     ("#\n"
+      "# udev rules file for supported USB devices\n"
+      "#\n"
+-     "# To add a USB device, add a rule to the list below between the SUBSYSTEM...\n"
+-     "# and LABEL... lines.\n"
++     "# To add support for a USB device, add rules to the \"usb\" and \"usb_device\"\n"
++     "# lists below between their respective \"# BEGIN ...\" and \"# END ...\" lines.\n"
+      "#\n"
+      "# To run a script when your device is plugged in, add RUN=\"/path/to/script\"\n"
+-     "# to the appropriate rule.\n");
++     "# to the appropriate rules.\n");
+   printf
+     ("#\n"
+-     "# The following list already contains a lot of scanners. If your scanner\n"
++     "# The following lists already contains a lot of scanners. If your scanner\n"
+      "# isn't mentioned there, add it as explained above and mail the entry to\n"
+      "# the sane-devel mailing list (sane-devel at lists.alioth.debian.org).\n"
+      "#\n");
+@@ -3169,11 +3169,44 @@ print_udev_header (void)
+ static void
+ print_udev (void)
+ {
+-  usbid_type *usbid = create_usbids_table ();
++  usbid_type *usbid_first = create_usbids_table ();
++  usbid_type *usbid = usbid_first;
+ 
+   print_udev_header ();
++
+   printf ("\nACTION!=\"add\", GOTO=\"libsane_rules_end\"\n");
+-  printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libsane_rules_end\"\n\n");
++  printf ("\nATTR{dev}!=\"?*\", GOTO=\"libsane_rules_end\"\n");
++  printf ("SUBSYSTEM==\"usb\", GOTO=\"libsane_usb_rules\"\n");
++  printf ("SUBSYSTEM==\"usb_device\", GOTO=\"libsane_usb_device_rules\"\n\n");
++  printf ("GOTO=\"libsane_rules_end\"\n\n");
++
++  /* SUBSYSTEM=="usb" -> ATTR{} */
++  printf ("LABEL=\"libsane_usb_rules\"\n\n");
++  printf ("# BEGIN scanner rules for SUBSYSTEM==\"usb\"\n");
++  while (usbid)
++    {
++      manufacturer_model_type * name = usbid->name;
++
++      printf ("# ");
++      while (name)
++	{
++	  if (name != usbid->name)
++	    printf (" | ");
++	  printf ("%s", name->name);
++	  name = name->next;
++	}
++      printf ("\n");
++      printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", SYMLINK+=\"scanner-%%k\"\n",
++	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2);
++      usbid = usbid->next;
++    }
++  printf ("# END scanner rules for SUBSYSTEM==\"usb\"\n");
++  printf ("GOTO=\"libsane_rules_end\"\n\n");
++
++  /* SUBSYSTEM=="usb_device" -> ATTRS{} */
++  printf ("LABEL=\"libsane_usb_device_rules\"\n\n");
++  printf ("# BEGIN scanner rules for SUBSYSTEM==\"usb_device\"\n");
++  usbid = usbid_first;
+   while (usbid)
+     {
+       manufacturer_model_type * name = usbid->name;
+@@ -3187,10 +3220,13 @@ print_udev (void)
  	  name = name->next;
  	}
        printf ("\n");
 -      printf ("SYSFS{idVendor}==\"%s\", SYSFS{idProduct}==\"%s\", SYMLINK+=\"scanner-%%k\"\n",
-+      printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", SYMLINK+=\"scanner-%%k\"\n",
++      printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", SYMLINK+=\"scanner-%%k\"\n",
  	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2);
        usbid = usbid->next;
      }
++  printf ("# END scanner rules for SUBSYSTEM==\"usb_device\"\n");
++  printf ("GOTO=\"libsane_rules_end\"\n");
++
+   printf ("\nLABEL=\"libsane_rules_end\"\n");
+ }
+ 


Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/FC-6/sane-backends.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sane-backends.spec	24 Jul 2007 17:29:25 -0000	1.83
+++ sane-backends.spec	13 Aug 2007 07:32:00 -0000	1.84
@@ -24,7 +24,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.18
-Release: 12%{?dist}
+Release: 14%{?dist}
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -36,8 +36,8 @@
 Patch5: sane-backends-1.0.18-logical_vs_binary.patch
 Patch6: sane-backends-1.0.18-usb_reset.patch
 Patch7: sane-backends-1.0.18-udev-symlink.patch
-Patch8: sane-backends-1.0.18-udev-new-kernels.patch
-Patch9: sane-backends-1.0.18-udev-098.patch
+Patch8: sane-backends-1.0.18-udev-098.patch
+Patch9: sane-backends-1.0.18-glibc-2.7.patch
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel
@@ -124,12 +124,13 @@
 %patch5 -p1 -b .logical_vs_binary
 %patch6 -p1 -b .usb_reset
 %patch7 -p1 -b .udev-symlink
-%patch8 -p1 -b .udev-new-kernels
 
 %if %udev_098
-%patch9 -p1 -b .udev-098
+%patch8 -p1 -b .udev-098
 %endif
 
+%patch9 -p1 -b .glibc-2.7
+
 for i in agfafocus avision coolscan2 umax_pp; do
 	iconv -f iso-8859-1 -t utf-8 < "doc/sane-$i.man" > "doc/sane-$i.man_"
 	mv "doc/sane-$i.man_" "doc/sane-$i.man"
@@ -248,6 +249,13 @@
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Wed Aug 08 2007 Nils Philippsen <nphilipp at redhat.com> - 1.0.18-14
+- make udev rules more robust (#243953)
+- bring code in shape for glibc-2.7
+
+* Wed Jul 25 2007 Jeremy Katz <katzj at redhat.com> - 1.0.18-13
+- rebuild for toolchain bug
+
 * Tue Jul 24 2007 Nils Philippsen <nphilipp at redhat.com> - 1.0.18-12
 - fix typo in spec file
 


--- sane-backends-1.0.18-udev-new-kernels.patch DELETED ---


