Tue Jun 4 00:27:56 PDT 2013

2 files changed, 89 insertions, 5 deletions

diff --git a/extra/sane/1.0.23-hp2400c.patch b/extra/sane/1.0.23-hp2400c.patch
new file mode 100644
index 000000000..8bfd29b66
--- /dev/null
+++ b/extra/sane/1.0.23-hp2400c.patch
@@ -0,0 +1,81 @@
+From 9a8b640d8da2190ff1695169bfa45ce633b5e8c2 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr>
+Date: Mon, 3 Jun 2013 06:33:08 +0200
+Subject: [PATCH] bug 314293 fix
+
+- don't use non-existent end of records
+---
+ ChangeLog               |    3 +++
+ backend/genesys_gl646.c |   14 +++++++-------
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c
+index c6a5af5..2d5cddc 100644
+--- a/backend/genesys_gl646.c
++++ b/backend/genesys_gl646.c
+@@ -550,7 +550,7 @@ get_lowest_resolution (int sensor, SANE_Bool color)
+   i = 0;
+   dpi = 9600;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       /* computes distance and keep mode if it is closer than previous */
+       if (sensor == sensor_master[i].sensor
+@@ -584,7 +584,7 @@ get_closest_resolution (int sensor, int required, SANE_Bool color)
+   dpi = 0;
+   dist = 9600;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       /* exit on perfect match */
+       if (sensor == sensor_master[i].sensor
+@@ -627,7 +627,7 @@ is_half_ccd (int sensor, int required, SANE_Bool color)
+ 
+   i = 0;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       /* exit on perfect match */
+       if (sensor == sensor_master[i].sensor
+@@ -658,7 +658,7 @@ get_cksel (int sensor, int required, SANE_Bool color)
+ 
+   i = 0;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       /* exit on perfect match */
+       if (sensor == sensor_master[i].sensor
+@@ -746,7 +746,7 @@ gl646_setup_registers (Genesys_Device * dev,
+    * sensor mode setting */
+   i = 0;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       if (dev->model->ccd_type == sensor_master[i].sensor
+ 	  && sensor_master[i].dpi == xresolution
+@@ -768,7 +768,7 @@ gl646_setup_registers (Genesys_Device * dev,
+    * motor mode setting */
+   i = 0;
+   nb = sizeof (motor_master) / sizeof (Motor_Master);
+-  while (motor_master[i].motor != -1 && i < nb)
++  while (i < nb)
+     {
+       if (dev->model->motor_type == motor_master[i].motor
+ 	  && motor_master[i].dpi == resolution
+@@ -789,7 +789,7 @@ gl646_setup_registers (Genesys_Device * dev,
+   /* now we can search for the specific sensor settings */
+   i = 0;
+   nb = sizeof (sensor_settings) / sizeof (Sensor_Settings);
+-  while (sensor_settings[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       if (sensor->sensor == sensor_settings[i].sensor
+ 	  && sensor->cksel == sensor_settings[i].cksel)
+-- 
+1.7.2.5
+
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index e43ede0ad..966dccd0c 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186914 2013-05-31 19:37:31Z tpowa $
+# $Id: PKGBUILD 187017 2013-06-03 10:25:11Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.23
-pkgrel=6
+pkgrel=7
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('i686' 'x86_64')
@@ -19,12 +19,14 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
         'saned.socket'
         'saned.service'
         'kodakaio.c.patch'
-        'network.patch')
+        'network.patch'
+        '1.0.23-hp2400c.patch')
 options=(!libtool)
 
 prepare() {
   cd "${srcdir}/${pkgname}-backends-${pkgver}"
-
+   # fix FS#35549
+   patch -Np1 -i ${srcdir}/1.0.23-hp2400c.patch
    # fix FS#33657
    patch -Np0 -i ${srcdir}/kodakaio.c.patch
    # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
@@ -74,4 +76,5 @@ md5sums=('e226a89c54173efea80e91e9a5eb6573'
          'e57e9e15528f47f5f1b3f1411135ed5d'
          '3f9fe36b0c4ff0b01b53b1cffa5d9700'
          'e65dbefb7c3d69955fb6eb3ace14aa12'
-         '44e77692c52db15b0f530a1d9a8e1296')
+         '44e77692c52db15b0f530a1d9a8e1296'
+         '0c8bfabcaa499c4a2583aa2fe53d1686')