rpms/sane-backends
7
0
Fork 0
Code Issues Pull Requests Releases Activity

apply format-security patch, drop format-security2 patch

Browse Source
This commit is contained in:
Nils Philippsen 2015-06-08 14:43:15 +02:00
parent 1b00eee0c3
commit c8f2d1fb7b
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sane-backends-1.0.24-format-security2.patch
View File

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

10
sane-backends.spec
View File

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