pool/sane-backends
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checked in

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=10
This commit is contained in:
OBS User autobuild 2009-10-02 23:05:16 +00:00 committed by Git OBS Bridge
parent feb1919389
commit 179ba5c121
4 changed files with 11 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fix-hp3900_sane-string-option-sizes.diff
View File

@ -1,36 +0,0 @@
--- a/backend/hp3900_sane.c
+++ b/backend/hp3900_sane.c
@@ -1189,6 +1189,7 @@ options_init (TScanner * scanner)
scanner->rng_vertical.quant = 1;
/* allocate option lists */
+ bknd_info (scanner);
bknd_colormodes (scanner, RTS_Debug->dev_model);
bknd_depths (scanner, RTS_Debug->dev_model);
bknd_models (scanner);
@@ -1562,6 +1563,7 @@ options_init (TScanner * scanner)
pDesc->constraint_type = SANE_CONSTRAINT_NONE;
pDesc->cap = SANE_CAP_ADVANCED | SANE_CAP_SOFT_DETECT;
pVal->s = strdup (SANE_I18N ("Unknown"));
+ pDesc->size = strlen(pVal->s) + 1;
break;
case opt_chipid:
@@ -1981,7 +1983,8 @@ option_get (TScanner * scanner, SANE_Int optid, void *result)
case opt_scantype:
case opt_model:
case opt_chipname:
- strcpy (result, scanner->aValues[optid].s);
+ strncpy (result, scanner->aValues[optid].s, scanner->aOptions[optid].size);
+ ((char*)result)[scanner->aOptions[optid].size-1] = '\0';
break;
/* scanner buttons */
@@ -2113,6 +2116,7 @@ option_set (TScanner * scanner, SANE_Int optid, void *value, SANE_Int * pInfo)
Load_Config (device);
/* update options according to selected device */
+ bknd_info (scanner);
bknd_colormodes (scanner, model);
bknd_depths (scanner, model);
bknd_resolutions (scanner, model);

11
fix-lexmark_low-memory-leak.patch
View File

@ -1,11 +0,0 @@
--- backend/lexmark_low.c.orig 2009-02-26 17:11:17.000000000 +0100
+++ backend/lexmark_low.c 2009-09-30 12:38:02.000000000 +0200
@@ -2560,6 +2560,8 @@ sanei_lexmark_low_find_start_line (Lexma
}
} /* end for buffer */
+ free (buffer);
+
DBG (2, "sanei_lexmark_low_find_start_line: end.\n");
return whiteLineCount;
}

16
sane-backends.changes
View File

@ -1,13 +1,3 @@
-------------------------------------------------------------------
Wed Sep 30 12:59:12 CEST 2009 - jsmeix@suse.de
- fix-lexmark_low-memory-leak.patch adds a missing call to free
in sanei_lexmark_low_find_start_line in backend/lexmark_low.c
(see Novell/Suse Bugzilla bnc#542341).
- fix-hp3900_sane-string-option-sizes.diff fixes option sizes
because otherwise the frontend (e.g. xsane) may crash
(see Novell/Suse Bugzilla bnc#535752).
-------------------------------------------------------------------
Fri Sep 18 12:53:45 CEST 2009 - jsmeix@suse.de
@ -17,12 +7,6 @@ Fri Sep 18 12:53:45 CEST 2009 - jsmeix@suse.de
which matches to the sacnner models which are supported
by our currently provided HPLIP version.
-------------------------------------------------------------------
Thu Sep 17 01:24:39 CEST 2009 - crrodriguez@suse.de
- use find_lang macro
- run ldconfig correctly
-------------------------------------------------------------------
Thu Aug 13 14:25:00 CEST 2009 - jsmeix@suse.de

28
sane-backends.spec
View File

@ -56,13 +56,14 @@ Source110: models.dat
# Source200 and Source201 generate the 56-sane-backends-autoconfig.rules file
# for automated scanner driver activation via udev ("scanner autoconfiguration").
# Source200 is a copy of /usr/lib/YaST2/bin/create_scanner_database
# to avoid yast2-scanner in BuildRequires which would drag in almost the whole YaST:
# to avoid yast2-scanner in BuildRequires which would drag almost the whole YaST:
Source200: create_scanner_database
# Source201 actually generates the 56-sane-backends-autoconfig.rules file
# by reading scanner.database which was created before by create_scanner_database
# to extract the needed info from which create_sane-backends-autoconfig.rules
# generates the 56-sane-backends-autoconfig.rules file:
Source201: create_sane-backends-autoconfig.rules
# based upon the data which is
# Patch1 does locale rename: no -> nb:
# Patch1 is obsolete since sane-backends-1.0.19 because it uses 'nb'.
# Patch2 fixes too small arrays in backend/niash.c:
@ -91,14 +92,6 @@ 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
# Patch12 adds a missing call to free in backend/lexmark_low.c
# in the sanei_lexmark_low_find_start_line function
# see https://bugzilla.novell.com/show_bug.cgi?id=542341
Patch12: fix-lexmark_low-memory-leak.patch
# Patch13 fixes option sizes in backend/hp3900_sane.c
# because otherwise the frontend (e.g. xsane) may crash
# see https://bugzilla.novell.com/show_bug.cgi?id=535752
Patch13: fix-hp3900_sane-string-option-sizes.diff
# Patch100... is SUSE specific stuff:
# Patch100 lets the "canon" backend do scanner auto-recognition:
Patch100: canon-backend-autoprobing.patch
@ -310,10 +303,6 @@ Authors:
%patch10
# Patch11 adds missing call to closedir to sane-desc.c:
%patch11
# Patch12 adds a missing call to free in backend/lexmark_low.c:
%patch12
# Patch13 fixes option sizes in backend/hp3900_sane.c
%patch13 -p1
# Patch100... is SUSE specific stuff:
# Patch100 lets the "canon" backend do scanner auto-recognition:
%patch100
@ -607,12 +596,16 @@ install -m644 %{SOURCE101} %{buildroot}%{_sysconfdir}/xinetd.d/
# OpenSLP registration stuff:
install -d -m755 %{buildroot}%{_sysconfdir}/slp.reg.d
install -m644 %{SOURCE102} %{buildroot}%{_sysconfdir}/slp.reg.d
%find_lang sane-backends
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%post
/sbin/ldconfig
# exit successfully in any case:
exit 0
%files -f sane-backends.lang
%postun
/sbin/ldconfig
%files
%defattr(-,root,root)
%dir %{_sysconfdir}/sane.d
%config(noreplace) %{_sysconfdir}/sane.d/*.conf
@ -632,6 +625,7 @@ install -m644 %{SOURCE102} %{buildroot}%{_sysconfdir}/slp.reg.d
%{_bindir}/sane-find-scanner
%{_bindir}/gamma4scanimage
%{_bindir}/umax_pp
%{_datadir}/locale/*/LC_MESSAGES/sane-backends.mo
%{_datadir}/sane/
%{_libdir}/libsane*
%{_libdir}/sane/