From 2ed97ec3e655ee5b7a8dd093bd4aa18152bb83318c08176e3ad3b82e08842bd3 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 13 Aug 2009 16:19:40 +0000
Subject: [PATCH] Accepting request 17700 from graphics

Copy from graphics/sane-backends based on submit request 17700 from user jsmeix

OBS-URL: https://build.opensuse.org/request/show/17700
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=33
---
 sane-backends.changes    |  6 ++++++
 sane-backends.spec       | 11 ++++++++---
 sane-desc_closedir.patch | 15 +++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 sane-desc_closedir.patch

diff --git a/sane-backends.changes b/sane-backends.changes
index 2e76082..3e1cfce 100644
--- a/sane-backends.changes
+++ b/sane-backends.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug 13 14:25:00 CEST 2009 - jsmeix@suse.de
+
+- sane-desc_closedir.patch adds a missing call to closedir
+  to sane-desc.c (see Novell/Suse Bugzilla bnc#530313).
+
 -------------------------------------------------------------------
 Wed Jul 29 16:46:53 CEST 2009 - jsmeix@suse.de
 
diff --git a/sane-backends.spec b/sane-backends.spec
index 029957b..ec701bf 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -20,12 +20,12 @@
 
 Name:           sane-backends
 BuildRequires:  libgphoto2-devel libieee1284 libjpeg-devel net-snmp-devel pkg-config texlive-latex
-License:        GPL v2 only ; GPL v2 or later ; LGPL v2.1 or later ;  Public Domain, Freeware
+License:        GPL v2 only ; GPL v2 or later ; LGPL v2.1 or later ;   Public Domain, Freeware
 Group:          Hardware/Scanner
 AutoReqProv:    on
 Summary:        SANE (Scanner Access Now Easy) Scanner Drivers
 Version:        1.0.20
-Release:        3
+Release:        4
 Url:            http://www.sane-project.org/
 # URL for Source0: http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz
 Source0:        sane-backends-%{version}.tar.bz2
@@ -89,6 +89,9 @@ Patch9:         fix-hp3900_config.c.patch
 # Patch10 fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c
 # see https://bugzilla.novell.com/show_bug.cgi?id=498435
 Patch10:        fix-mustek_pp_ccd300.c.patch
+# Patch11 adds missing call to closedir to sane-desc.c
+# see https://bugzilla.novell.com/show_bug.cgi?id=530313
+Patch11:        sane-desc_closedir.patch
 # Patch100... is SUSE specific stuff:
 # Patch100 lets the "canon" backend do scanner auto-recognition:
 Patch100:       canon-backend-autoprobing.patch
@@ -245,7 +248,7 @@ Authors:
     Wittawat Yamwong <wittawat@web.de>
 
 %package autoconfig
-License:        GPL v2 or later ; LGPL v2.1 or later ;  Public Domain, Freeware
+License:        GPL v2 or later ; LGPL v2.1 or later ;   Public Domain, Freeware
 Group:          Hardware/Scanner
 Summary:        USB Scanner Autoconfiguration
 Requires:       sane-backends
@@ -298,6 +301,8 @@ Authors:
 %patch9
 # Patch10 fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c:
 %patch10
+# Patch11 adds missing call to closedir to sane-desc.c:
+%patch11
 # Patch100... is SUSE specific stuff:
 # Patch100 lets the "canon" backend do scanner auto-recognition:
 %patch100
diff --git a/sane-desc_closedir.patch b/sane-desc_closedir.patch
new file mode 100644
index 0000000..d71fc17
--- /dev/null
+++ b/sane-desc_closedir.patch
@@ -0,0 +1,15 @@
+--- tools/sane-desc.c.orig	2009-04-15 03:47:56.000000000 +0200
++++ tools/sane-desc.c	2009-08-13 13:12:13.000000000 +0200
+@@ -1523,6 +1523,12 @@ read_files (void)
+ 	      fclose (fp);
+ 	    }			/* if (strlen) */
+ 	}			/* while (direntry) */
++      if (closedir(dir) != 0)
++	{
++	  DBG_ERR ("cannot close directory `%s' (%s)\n", search_dir,
++		   strerror (errno));
++	  return SANE_FALSE;
++	}
+       if (end)
+ 	search_dir = end + 1;
+       else