Bug#705948: nyquist: diff for NMU version 3.05-2.1

[Mattia Rizzolo]

Control: tags 705588 + pending
Control: tags 705948 + pending
Control: severity 705948 serious

Dear maintainer,

I've prepared an NMU for nyquist (versioned as 3.05-2.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

I can reproduce the i386 FTBFS very reliably, so I'm rasing its severity
to serious.

Regards.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-

diffstat for nyquist-3.05 nyquist-3.05

 changelog                                     |   13 +++++++++++++
 control                                       |    2 +-
 patches/intgen-avoid-overlapping-strcpy.patch |   17 +++++++++++++++++
 patches/series                                |    1 +
 4 files changed, 32 insertions(+), 1 deletion(-)

diff -Nru nyquist-3.05/debian/changelog nyquist-3.05/debian/changelog
--- nyquist-3.05/debian/changelog	2012-07-18 03:57:02.000000000 +0200
+++ nyquist-3.05/debian/changelog	2017-04-02 19:57:10.000000000 +0200
@@ -1,3 +1,16 @@
+nyquist (3.05-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Jonathan Dowland ]
+  * Update Vcs-Browser URL.  Closes: #705588
+
+  [ Andy Whitcroft ]
+  * Add patch to fix FTBFS on i386 due to overlapping use of strcpy().
+    Closes: #705948
+
+ -- Mattia Rizzolo <mat...@debian.org>  Sun, 02 Apr 2017 19:57:10 +0200
+
 nyquist (3.05-2) unstable; urgency=low
 
   * patches/remove-corba-reference.diff: remove unnecessary import.
diff -Nru nyquist-3.05/debian/control nyquist-3.05/debian/control
--- nyquist-3.05/debian/control	2012-07-18 03:34:52.000000000 +0200
+++ nyquist-3.05/debian/control	2017-04-02 19:53:43.000000000 +0200
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 8), javahelper, autoconf, automake1.11, libtool (>= 2.2.6),
  autotools-dev, default-jdk, libsndfile1-dev, liblo-dev, portaudio19-dev
 Build-Conflicts: autoconf2.13, automake1.4
-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/nyquist/trunk/?op=log
+Vcs-Browser: http://anonscm.debian.org/viewvc/collab-maint/deb-maint/nyquist/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/nyquist/trunk
 Standards-Version: 3.9.3
 
diff -Nru nyquist-3.05/debian/patches/intgen-avoid-overlapping-strcpy.patch nyquist-3.05/debian/patches/intgen-avoid-overlapping-strcpy.patch
--- nyquist-3.05/debian/patches/intgen-avoid-overlapping-strcpy.patch	1970-01-01 01:00:00.000000000 +0100
+++ nyquist-3.05/debian/patches/intgen-avoid-overlapping-strcpy.patch	2017-04-02 19:57:10.000000000 +0200
@@ -0,0 +1,17 @@
+Description: intgen avoid overlapping strcpy
+ Lisp intgen is using overlapping strcpy which is not permitted,
+ switch to using memmove.
+Author: Andy Whitcroft <a...@ubuntu.com>
+Last-Update: 2013-04-22
+
+--- nyquist-3.05.orig/misc/intgen.c
++++ nyquist-3.05/misc/intgen.c
+@@ -487,7 +487,7 @@ static void process_file(fname, out)
+     /* strip off leading directory prefix, if any */
+     cp = strrchr(incl_file, FILESEP);	/* find the last slash */
+     if (cp) {
+-        strcpy(incl_file, cp + 1 /* skip the slash */);
++        memmove(incl_file, cp + 1 /* skip the slash */, strlen(cp + 1) + 1);
+     }
+ 
+     if (flag != no_include_prefix) fprintf(out, "#include \"%s\"\n\n", incl_file);
diff -Nru nyquist-3.05/debian/patches/series nyquist-3.05/debian/patches/series
--- nyquist-3.05/debian/patches/series	2012-07-18 03:02:31.000000000 +0200
+++ nyquist-3.05/debian/patches/series	2017-04-02 19:57:10.000000000 +0200
@@ -4,3 +4,4 @@
 use-system-liblo.patch
 use-system-portadio.patch
 fix-term-includes.patch
+intgen-avoid-overlapping-strcpy.patch

signature.asc
Description: PGP signature