rpms/sane-frontends/devel sane-frontends-1.0.14-array-out-of-bounds.patch, NONE, 1.1 sane-frontends-1.0.14-sane-backends-1.0.20.patch, NONE, 1.1 sane-frontends.spec, 1.28, 1.29 sane-frontends-1.0.14-badcode.patch, 1.1, NONE

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-frontends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25077

Modified Files:
	sane-frontends.spec 
Added Files:
	sane-frontends-1.0.14-array-out-of-bounds.patch 
	sane-frontends-1.0.14-sane-backends-1.0.20.patch 
Removed Files:
	sane-frontends-1.0.14-badcode.patch 
Log Message:
replace badcode with array-out-of-bounds patch
fix compilation with sane-backends-1.0.20


sane-frontends-1.0.14-array-out-of-bounds.patch:
 xcam.c       |    2 +-
 xscanimage.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sane-frontends-1.0.14-array-out-of-bounds.patch ---
commit c4cb247732767aed76502069d0b3040c4c4e5123
Author: Nils Philippsen <nils at redhat.com>
Date:   Fri Jul 31 16:21:53 2009 +0200

    patch: array-out-of-bounds
    
    Squashed commit of the following:
    
    commit 337bcefaa7a67931095b74317a266a1244978ab6
    Author: Nils Philippsen <nils at redhat.com>
    Date:   Fri Jul 31 16:03:28 2009 +0200
    
        fix array subscript out of bounds errors (#133121)

diff --git a/src/xcam.c b/src/xcam.c
index 2d494a5..f6859b7 100644
--- a/src/xcam.c
+++ b/src/xcam.c
@@ -1289,7 +1289,7 @@ save_frame_button (GtkWidget * widget, gpointer client_data,
 
       /* test for pnm formats */
       strncpy (testfilename, preferences.filename, sizeof (testfilename));
-      testfilename[sizeof (testfilename)] = 0;
+      testfilename[sizeof (testfilename) - 1] = 0;
       g_strreverse (testfilename);
       if (!((!strncmp (testfilename, "mnp.", 4)) ||
 	    (!strncmp (testfilename, "mgp.", 4)) ||
diff --git a/src/xscanimage.c b/src/xscanimage.c
index a36324f..065923d 100644
--- a/src/xscanimage.c
+++ b/src/xscanimage.c
@@ -1284,7 +1284,7 @@ scan_dialog (GtkWidget * widget, gpointer call_data)
     {				/* We are running in standalone mode */
       /* test for pnm formats */
       strncpy (testfilename, preferences.filename, sizeof (testfilename));
-      testfilename[sizeof (testfilename)] = 0;
+      testfilename[sizeof (testfilename) - 1] = 0;
       g_strreverse (testfilename);
       if (!((!strncmp (testfilename, "mnp.", 4)) ||
 	    (!strncmp (testfilename, "mgp.", 4)) ||

sane-frontends-1.0.14-sane-backends-1.0.20.patch:
 gtkglue.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE sane-frontends-1.0.14-sane-backends-1.0.20.patch ---
commit ddd90b1502a263d03938b1e45a57684d576993ba
Author: Nils Philippsen <nils at redhat.com>
Date:   Fri Jul 31 16:25:58 2009 +0200

    patch: sane-backends-1.0.20
    
    Squashed commit of the following:
    
    commit 0c84326fa37bb309481c4d2658ab6cb17c9f0e85
    Author: Nils Philippsen <nils at redhat.com>
    Date:   Fri Jul 31 16:18:59 2009 +0200
    
        use SANE_CAP_ALWAYS_SETTABLE only if available

diff --git a/src/gtkglue.c b/src/gtkglue.c
index ba5cbf5..ec81f45 100644
--- a/src/gtkglue.c
+++ b/src/gtkglue.c
@@ -1476,8 +1476,12 @@ gsg_set_sensitivity (GSGDialog * dialog, int sensitive)
 	  || opt->type == SANE_TYPE_GROUP || !dialog->element[i].widget)
 	continue;
 
+#ifdef SANE_CAP_ALWAYS_SETTABLE
       if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE))
 	gtk_widget_set_sensitive (dialog->element[i].widget, sensitive);
+#else
+	gtk_widget_set_sensitive (dialog->element[i].widget, sensitive);
+#endif
     }
 }
 


Index: sane-frontends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-frontends/devel/sane-frontends.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sane-frontends.spec	27 Jul 2009 03:48:13 -0000	1.28
+++ sane-frontends.spec	31 Jul 2009 14:31:01 -0000	1.29
@@ -1,10 +1,11 @@
 Name: sane-frontends
 Version: 1.0.14
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Graphical frontend to SANE
-URL:       http://www.sane-project.org
-Source0:    ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
-Patch0: sane-frontends-1.0.14-badcode.patch
+URL: http://www.sane-project.org
+Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
+Patch0: sane-frontends-1.0.14-array-out-of-bounds.patch
+Patch1: sane-frontends-1.0.14-sane-backends-1.0.20.patch
 License: GPLv2+
 Group: Applications/System
 BuildRequires: gtk2-devel gimp-devel
@@ -20,7 +21,8 @@ This packages includes the scanadf and x
 
 %prep
 %setup -q
-%patch0 -p1 -b .badcode
+%patch0 -p1 -b .array-out-of-bounds
+%patch1 -p1 -b .sane-backends-1.0.20
 
 %build
 %configure --with-gnu-ld --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir}
@@ -44,6 +46,10 @@ rm -R $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 31 2009 Nils Philippsen <nils at redhat.com> 1.0.14-8
+- replace badcode with array-out-of-bounds patch
+- fix compilation with sane-backends-1.0.20
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.14-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- sane-frontends-1.0.14-badcode.patch DELETED ---