Please unblock sane-backends 1.0.18-5
Hi,
An additional bugfix for the microtek2 backend, adding a missing
return status check which could lead to a segfault.
Some fixes for the manpages too, mostly to make lintian happy.
debdiff attached.
Thanks,
JB.
--
Julien BLACHE <jblache@debian.org> | Debian, because code matters more
Debian & GNU/Linux Developer | <http://www.debian.org>
Public key available on <http://www.jblache.org> - KeyID: F5D6 5169
GPG Fingerprint : 935A 79F1 C8B3 3521 FD62 7CC7 CD61 4FD7 F5D6 5169
diff -u sane-backends-1.0.18/debian/patches/00list sane-backends-1.0.18/debian/patches/00list
--- sane-backends-1.0.18/debian/patches/00list
+++ sane-backends-1.0.18/debian/patches/00list
@@ -10,2 +10,4 @@
31_epson_remove_check
+32_microtek2_add_check
+33_manpages_fixes
diff -u sane-backends-1.0.18/debian/changelog sane-backends-1.0.18/debian/changelog
--- sane-backends-1.0.18/debian/changelog
+++ sane-backends-1.0.18/debian/changelog
@@ -1,3 +1,13 @@
+sane-backends (1.0.18-5) unstable; urgency=medium
+
+ * debian/patches/32_microtek2_add_check.dpatch:
+ + Added; Add missing return status check, preventing a segfault later
+ on (closes: #398153).
+ * debian/patches/33_manpages_fixes.dpatch:
+ + Added; fix man warnings in some manpages.
+
+ -- Julien BLACHE <jblache@debian.org> Mon, 8 Jan 2007 19:52:22 +0100
+
sane-backends (1.0.18-4) unstable; urgency=medium
* debian/patches/31_epson_remove_check.dpatch:
only in patch2:
unchanged:
--- sane-backends-1.0.18.orig/debian/patches/32_microtek2_add_check.dpatch
+++ sane-backends-1.0.18/debian/patches/32_microtek2_add_check.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 32_microtek2_add_check.dpatch by <jblache@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add missing return status check, preventing a segfault later on.
+
+@DPATCH@
+diff -urNad sane-backends-1.0.18~/backend/microtek2.c sane-backends-1.0.18/backend/microtek2.c
+--- sane-backends-1.0.18~/backend/microtek2.c 2005-12-28 15:17:57.000000000 +0100
++++ sane-backends-1.0.18/backend/microtek2.c 2007-01-08 19:48:44.659602859 +0100
+@@ -5456,6 +5456,8 @@
+ )
+ )
+ status = read_cx_shading(ms);
++ if ( status != SANE_STATUS_GOOD )
++ goto cleanup;
+
+ if ( ms->lightlid35 )
+ /* hopefully this leads to a switched off flatbed lamp with lightlid */
only in patch2:
unchanged:
--- sane-backends-1.0.18.orig/debian/patches/33_manpages_fixes.dpatch
+++ sane-backends-1.0.18/debian/patches/33_manpages_fixes.dpatch
@@ -0,0 +1,77 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 33_manpages_fixes.dpatch by <jblache@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix man warnings.
+
+@DPATCH@
+diff -urNad sane-backends-1.0.18~/doc/sane-agfafocus.man sane-backends-1.0.18/doc/sane-agfafocus.man
+--- sane-backends-1.0.18~/doc/sane-agfafocus.man 2007-01-08 20:03:53.306813765 +0100
++++ sane-backends-1.0.18/doc/sane-agfafocus.man 2007-01-08 20:03:55.005974816 +0100
+@@ -166,10 +166,10 @@
+
+ The AGFA HORIZON scanners are SCSI-2 scanners, and it would probably
+ be easier to support these scanners in a SCSI-2 compliant backend.
+-.SH "SEE ALSO"
++.SH SEE ALSO
+ sane(7), sane-scsi(5)
+
+ .SH AUTHOR
+
+-Ingo Schneider and Karl Anders Øygard.
++Ingo Schneider and Karl Anders \[/O]ygard.
+
+diff -urNad sane-backends-1.0.18~/doc/sane-avision.man sane-backends-1.0.18/doc/sane-avision.man
+--- sane-backends-1.0.18~/doc/sane-avision.man 2007-01-08 20:03:53.307813860 +0100
++++ sane-backends-1.0.18/doc/sane-avision.man 2007-01-08 20:03:55.005974816 +0100
+@@ -160,4 +160,4 @@
+ http://www.exactcode.de/oss/avision/
+
+ .SH AUTHOR
+-René Rebe and Meino Christian Cramer
++Ren\['e] Rebe and Meino Christian Cramer
+diff -urNad sane-backends-1.0.18~/doc/sane-coolscan2.man sane-backends-1.0.18/doc/sane-coolscan2.man
+--- sane-backends-1.0.18~/doc/sane-coolscan2.man 2007-01-08 20:03:53.330816040 +0100
++++ sane-backends-1.0.18/doc/sane-coolscan2.man 2007-01-08 20:03:55.006974911 +0100
+@@ -178,5 +178,5 @@
+ or the SANE developers' email list.
+
+ .SH AUTHORS
+-The backend is written and maintained by András Major
++The backend is written and maintained by Andr\['a]s Major
+ (andras@users.sourceforge.net).
+diff -urNad sane-backends-1.0.18~/doc/sane-genesys.man sane-backends-1.0.18/doc/sane-genesys.man
+--- sane-backends-1.0.18~/doc/sane-genesys.man 2007-01-08 20:03:53.347817651 +0100
++++ sane-backends-1.0.18/doc/sane-genesys.man 2007-01-08 20:03:55.006974911 +0100
+@@ -121,7 +121,7 @@
+ .br
+ Gerhard Jaeger <gerhard@gjaeger.de>
+ .br
+-Stéphane Voltz <svoltz@numericable.fr>
++St\['e]phane Voltz <svoltz@numericable.fr>
+ .br
+ Philipp Schmid <philipp8288@web.de>
+ .br
+diff -urNad sane-backends-1.0.18~/doc/sane-umax_pp.man sane-backends-1.0.18/doc/sane-umax_pp.man
+--- sane-backends-1.0.18~/doc/sane-umax_pp.man 2007-01-08 20:03:53.381820874 +0100
++++ sane-backends-1.0.18/doc/sane-umax_pp.man 2007-01-08 20:04:18.204173536 +0100
+@@ -169,8 +169,8 @@
+ and 2000. It is usefull only when autodetection fails to detect properly
+ your scanner model. If your scanner work properly but is reported wrongly,
+ let it be that way.
+-The only valid case to change the model is when your scanner produces 'black' or
+-'inverted' scans. In this case you can put the model. Be aware that it will
++The only valid case to change the model is when your scanner produces "black" or
++"inverted" scans. In this case you can put the model. Be aware that it will
+ prevent scanner model autodetection.
+ .PP
+
+@@ -270,7 +270,7 @@
+ .I http://umax1220p.sourceforge.net/
+
+ .SH "AUTHOR"
+-Stéphane VOLTZ <svoltz@wanadoo.fr>
++St\['e]phane VOLTZ <svoltz@wanadoo.fr>
+
+ .SH "CREDITS"
+ Support for the 610P has been made possible thank to an hardware donation
Reply to: