Hi,
On Fri, Apr 05, 2013 at 03:14:15PM +0100, Jonathan Wiltshire wrote:
>
> Thanks - it would help to ping this bug when it uploaded too please.
Hereby pinging the bug, package uploaded, debdiff attached to this mail.
> I'm sure you realised but s/uploads/updates/ in your quoted mail
> above (or just testing).
Just used 'testing' as advised.
Hope everything is fine now - feel free to ping me if I can provide more
help on this issue.
Kind regards
Andreas.
--
http://fam-tille.de
diff -Nru scotch-5.1.12b.dfsg/debian/changelog
scotch-5.1.12b.dfsg/debian/changelog
--- scotch-5.1.12b.dfsg/debian/changelog 2012-04-15 14:34:15.000000000
+0200
+++ scotch-5.1.12b.dfsg/debian/changelog 2013-04-05 22:30:34.000000000
+0200
@@ -1,3 +1,17 @@
+scotch (5.1.12b.dfsg-1.2) testing; urgency=low
+
+ * Team upload
+ * Incorporate changes done by Christophe Trophime in 5.1.12b.dfsg-2:
+ Rename gmap to scotch_gmpap to avoid clash with "gmap package"
+ Closes: #680484
+ * debian/patches/format-security.patch:
+ Incorporate patch from 5.1.12b.dfsg-2 to fix a potential security
+ issue which will be necessary when building with hardening flags
+ (-Wformat-security) anyway. Debian release team has confirmed this
+ patch in IRC
+
+ -- Debian Science Maintainers
<debian-science-maintain...@lists.alioth.debian.org> Fri, 05 Apr 2013 15:08:53
+0200
+
scotch (5.1.12b.dfsg-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru scotch-5.1.12b.dfsg/debian/patches/format-security.patch
scotch-5.1.12b.dfsg/debian/patches/format-security.patch
--- scotch-5.1.12b.dfsg/debian/patches/format-security.patch 1970-01-01
01:00:00.000000000 +0100
+++ scotch-5.1.12b.dfsg/debian/patches/format-security.patch 2013-04-06
07:57:13.000000000 +0200
@@ -0,0 +1,26 @@
+Author: Andreas Tille <ti...@debian.org>
+Date: Tue, 17 Jul 2012 10:12:24 +0200
+Description: Fix format security issue which cases an error when using
-Werror=format-security
+
+--- scotch.orig/src/libscotch/parser.c
++++ scotch/src/libscotch/parser.c
+@@ -590,15 +590,15 @@
+ case STRATTESTMUL : /* Multiplication operator
*/
+ case STRATTESTMOD : /* Modulus operator
*/
+ i = (test->data.test[0]->typetest < test->typetest) ? 1 : 0;
+- fprintf (stream, strattestsavepa[i][0]);
++ fputs (strattestsavepa[i][0], stream);
+ o = stratTestSave (test->data.test[0], stream);
+- fprintf (stream, strattestsavepa[i][1]);
++ fputs (strattestsavepa[i][1], stream);
+ if (o == 0) {
+ fprintf (stream, "%c", strattestsaveop[test->typetest]);
+ i = (test->data.test[1]->typetest < test->typetest) ? 1 : 0;
+- fprintf (stream, strattestsavepa[i][0]);
++ fputs (strattestsavepa[i][0], stream);
+ stratTestSave (test->data.test[1], stream);
+- fprintf (stream, strattestsavepa[i][1]);
++ fputs (strattestsavepa[i][1], stream);
+ }
+ break;
+ case STRATTESTVAL : /* Constant value */
diff -Nru scotch-5.1.12b.dfsg/debian/patches/series
scotch-5.1.12b.dfsg/debian/patches/series
--- scotch-5.1.12b.dfsg/debian/patches/series 2011-04-01 17:08:59.000000000
+0200
+++ scotch-5.1.12b.dfsg/debian/patches/series 2013-04-04 08:06:53.000000000
+0200
@@ -1,2 +1,3 @@
build-fixes.patch
metis-header.patch
+format-security.patch
diff -Nru scotch-5.1.12b.dfsg/debian/rules scotch-5.1.12b.dfsg/debian/rules
--- scotch-5.1.12b.dfsg/debian/rules 2012-04-15 14:31:17.000000000 +0200
+++ scotch-5.1.12b.dfsg/debian/rules 2013-04-05 15:21:25.000000000 +0200
@@ -67,6 +67,7 @@
(cd src && $(MAKE) scotch ptscotch prefix=$(CURDIR)/$$v); \
(cd src && $(MAKE) install prefix=$(CURDIR)/$$v); \
mv $$v/bin/gbase $$v/bin/scotch_gbase; \
+ mv $$v/bin/gmap $$v/bin/scotch_gmap; \
rm -rf lib; \
rm -f src/Makefile.inc; \
done
@@ -102,6 +103,8 @@
# Fix lintian warnings for undefined macro in man pages
perl -pi -e 's|\.\"|\.\\\"|' int/share/man/man1/*.1
mv int/share/man/man1/gbase.1 int/share/man/man1/scotch_gbase.1
+# Rename gmap to avoid clash with package gmap
+ mv int/share/man/man1/gmap.1 int/share/man/man1/scotch_gmap.1
# Fix lintian missing man pages
cp debian/scotch_esmumps.1 int/share/man/man1
cp debian/ptscotch_esmumps.1 int/share/man/man1
diff -Nru scotch-5.1.12b.dfsg/debian/scotch.install
scotch-5.1.12b.dfsg/debian/scotch.install
--- scotch-5.1.12b.dfsg/debian/scotch.install 2011-03-27 19:55:30.000000000
+0200
+++ scotch-5.1.12b.dfsg/debian/scotch.install 2013-04-04 08:06:53.000000000
+0200
@@ -8,7 +8,7 @@
int/bin/atst /usr/bin
int/bin/scotch_gbase /usr/bin
int/bin/gcv /usr/bin
-int/bin/gmap /usr/bin
+int/bin/scotch_gmap /usr/bin
int/bin/gmk_hy /usr/bin
int/bin/gmk_m2 /usr/bin
int/bin/gmk_m3 /usr/bin
@@ -36,7 +36,7 @@
int32/bin/atst-int32 /usr/bin
int32/bin/scotch_gbase-int32 /usr/bin
int32/bin/gcv-int32 /usr/bin
-int32/bin/gmap-int32 /usr/bin
+int32/bin/scotch_gmap-int32 /usr/bin
int32/bin/gmk_hy-int32 /usr/bin
int32/bin/gmk_m2-int32 /usr/bin
int32/bin/gmk_m3-int32 /usr/bin
@@ -65,7 +65,7 @@
int64/bin/atst-int64 /usr/bin
int64/bin/scotch_gbase-int64 /usr/bin
int64/bin/gcv-int64 /usr/bin
-int64/bin/gmap-int64 /usr/bin
+int64/bin/scotch_gmap-int64 /usr/bin
int64/bin/gmk_hy-int64 /usr/bin
int64/bin/gmk_m2-int64 /usr/bin
int64/bin/gmk_m3-int64 /usr/bin
@@ -94,7 +94,7 @@
long/bin/atst-long /usr/bin
long/bin/scotch_gbase-long /usr/bin
long/bin/gcv-long /usr/bin
-long/bin/gmap-long /usr/bin
+long/bin/scotch_gmap-long /usr/bin
long/bin/gmk_hy-long /usr/bin
long/bin/gmk_m2-long /usr/bin
long/bin/gmk_m3-long /usr/bin
@@ -126,7 +126,7 @@
int/share/man/man1/atst*.1.gz /usr/share/man/man1
int/share/man/man1/scotch_gbase*.1.gz /usr/share/man/man1
int/share/man/man1/gcv*.1.gz /usr/share/man/man1
-int/share/man/man1/gmap*.1.gz /usr/share/man/man1
+int/share/man/man1/scotch_gmap*.1.gz /usr/share/man/man1
int/share/man/man1/gmk_hy*.1.gz /usr/share/man/man1
int/share/man/man1/gmk_m2*.1.gz /usr/share/man/man1
int/share/man/man1/gmk_m3*.1.gz /usr/share/man/man1
