From c8f2d1fb7bb27851a9ae5e08cc7b07b52b4c9580 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Mon, 8 Jun 2015 14:43:15 +0200
Subject: [PATCH] apply format-security patch, drop format-security2 patch

---
 sane-backends-1.0.24-format-security2.patch | 21 ---------------------
 sane-backends.spec                          | 10 ++++++----
 2 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 sane-backends-1.0.24-format-security2.patch

diff --git a/sane-backends-1.0.24-format-security2.patch b/sane-backends-1.0.24-format-security2.patch
deleted file mode 100644
index 0fb859e..0000000
--- a/sane-backends-1.0.24-format-security2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur sane-backends-1.0.24.orig/frontend/scanimage.c sane-backends-1.0.24/frontend/scanimage.c
---- sane-backends-1.0.24.orig/frontend/scanimage.c	2013-08-25 23:22:58.000000000 +0200
-+++ sane-backends-1.0.24/frontend/scanimage.c	2014-04-14 21:04:13.512000000 +0200
-@@ -1894,7 +1894,7 @@
- 				printf (start, int_arg);
- 				break;
- 			      case 0:
--				printf (start);
-+				printf ("%s", start);
- 				break;
- 			      }
- 			    *percent = cc;
-@@ -1908,7 +1908,7 @@
- 			  }
- 		      }
- 		    if (*start)
--		      printf (start);
-+		      printf ("%s", start);
- 		  }
- 	      }
- 	    if (i == 0 && ch != 'f')
diff --git a/sane-backends.spec b/sane-backends.spec
index 1c27c52..1c730f2 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -77,10 +77,9 @@ Patch6: sane-backends-1.0.24-static-code-check.patch
 Patch7: sane-backends-1.0.24-scsi-permissions.patch
 # Upstream commit 8082a42ec4f3b3cf2cffc30a45dda5fc41d55576
 Patch8: sane-backends-1.0.24-format-security.patch
-Patch9: sane-backends-1.0.24-format-security2.patch
 # Update lib/snprintf.c to latest from LPRng to resolve
 # license issue (#1102520)
-Patch10: sane-backends-1.0.24-update-to-current-lprng-plp_snprintf.patch
+Patch9: sane-backends-1.0.24-update-to-current-lprng-plp_snprintf.patch
 
 URL: http://www.sane-project.org
 
@@ -197,8 +196,8 @@ This package contains backend drivers to access digital cameras through SANE.
 %patch5 -p1 -b .pixma_bjnp-crash
 %patch6 -p1 -b .static-code-check
 %patch7 -p1 -b .scsi-permissions
-%patch9 -p1 -b .format-security
-%patch10 -p1 -b .snprintf
+%patch8 -p1 -b .format-security
+%patch9 -p1 -b .snprintf
 
 %build
 CFLAGS="%optflags -fno-strict-aliasing"
@@ -320,6 +319,9 @@ udevadm hwdb --update >/dev/null 2>&1 || :
 %{_libdir}/sane/*gphoto2.so*
 
 %changelog
+* Mon Jun 08 2015 Nils Philippsen <nils@redhat.com>
+- apply format-security patch, drop format-security2 patch
+
 * Tue Jan 20 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.24-13
 - Rebuild (libgphoto2)