rpm/sane-backends
SHA256
1
0
Fork 0
forked from pool/sane-backends
Code Pull Requests Activity

Accepting request 17700 from graphics

Browse Source 
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
This commit is contained in:
OBS User autobuild 2009-08-13 16:19:40 +00:00 committed by Git OBS Bridge
parent 06de07b866
commit 2ed97ec3e6
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sane-backends.changes
View File

@ -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

11
sane-backends.spec
View File

@ -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

15
sane-desc_closedir.patch Normal file
View File

@ -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