[singular] 01/01: Imported Debain patch 4.0.3-p1+ds-3: RC #831072 fix

[Jerome Benoit]

This is an automated email from the git hooks/post-receive script.

calculus-guest pushed a commit to branch master
in repository singular.

commit ec84b17dd49ddeda3daa511c3b2e7eb5e6abb780
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Mon Jul 25 18:15:08 2016 +0100

    Imported Debain patch 4.0.3-p1+ds-3: RC #831072 fix
---
 debian/changelog                                   |  6 ++++++
 debian/patches/series                              |  2 ++
 .../upstream-bug-831072-gcc_6_1_1-segfault.patch   | 17 +++++++++++++++
 .../upstream-bug-831072-hidden-segfault.patch      | 24 ++++++++++++++++++++++
 .../upstream-lintian-spelling-error-silence.patch  | 11 ++++++++++
 5 files changed, 60 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9476b3a..4837400 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+singular (4.0.3-p1+ds-3) unstable; urgency=medium
+
+  * RC fix (Closes: #831072), fix gcc-6 transition issue.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Mon, 25 Jul 2016 22:13:13 +0000
+
 singular (4.0.3-p1+ds-2) unstable; urgency=medium
 
   * FTBFS fix (Closes: #806108), fix indep build failure.
diff --git a/debian/patches/series b/debian/patches/series
index eb6b788..9331186 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+upstream-bug-831072-gcc_6_1_1-segfault.patch
+upstream-bug-831072-hidden-segfault.patch
 upstream-lintian-spelling-error-silence.patch
 upstream-reproducible.patch
 upstream-tests-omalloc-getlucky.patch
diff --git a/debian/patches/upstream-bug-831072-gcc_6_1_1-segfault.patch b/debian/patches/upstream-bug-831072-gcc_6_1_1-segfault.patch
new file mode 100644
index 0000000..b79ccc4
--- /dev/null
+++ b/debian/patches/upstream-bug-831072-gcc_6_1_1-segfault.patch
@@ -0,0 +1,17 @@
+Description: upstream -- RC bug fix 831072 -- segfault
+Origin: Singular Team
+Comment: http://www.singular.uni-kl.de:8002/trac/ticket/769
+Author: Hans Schoenemann <notifications at github.com>
+Last-Update: 2016-07-25
+
+--- a/m4/flags.m4
++++ b/m4/flags.m4
+@@ -122,7 +122,7 @@
+  ## for clang: -Wunneeded-internal-declaration
+ 
+  if test "x${ENABLE_OPTIMIZATION}" != xno; then
+-  OPTFLAGS="-O3 -Wno-unused-function -Wno-trigraphs -Wno-unused-parameter -Wunknown-pragmas -Wno-unused-variable -fomit-frame-pointer -fwrapv -fvisibility=default -finline-functions -fno-exceptions -fno-rtti -fno-threadsafe-statics -fno-enforce-eh-specs -fconserve-space -funroll-loops"
++  OPTFLAGS="-O3 -Wno-unused-function -Wno-trigraphs -Wno-unused-parameter -Wunknown-pragmas -Wno-unused-variable -fomit-frame-pointer -fwrapv -fvisibility=default -finline-functions -fno-exceptions -fno-rtti -fno-threadsafe-statics -fno-enforce-eh-specs -fconserve-space -funroll-loops -fno-delete-null-pointer-checks"
+   #  -O3 - crashes gcc???!!!
+   # -fpermissive
+   AC_LANG_PUSH([C])
diff --git a/debian/patches/upstream-bug-831072-hidden-segfault.patch b/debian/patches/upstream-bug-831072-hidden-segfault.patch
new file mode 100644
index 0000000..0f59784
--- /dev/null
+++ b/debian/patches/upstream-bug-831072-hidden-segfault.patch
@@ -0,0 +1,24 @@
+Description: upstream -- RC bug fix 831072 -- hidden bug
+ Correct an segfault revealed while attempting to fix RC bug 831072
+ on a Debian porter machine: the segfault was caused by a faulty
+ fprintf format. Meant to be submitted to the upstream maintainer
+ team.
+Origin: debian
+Forwarded: https://github.com/Singular/Sources/pull/773
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2016-07-25
+
+--- a/Singular/emacs.cc
++++ b/Singular/emacs.cc
+@@ -202,9 +202,9 @@
+   if (emacs == NULL)
+   {
+   #ifdef __CYGWIN__
+-    error( "Error: Can't find rxvt program. \n Expected it at %s or %s\n Specify alternative with --rxvt=PROGRAM option,\n or set RXVT environment variable to the name of the program to use as xterm.\n",
++    error( "Error: Can't find rxvt program. \n Expected it at %s\n Specify alternative with --rxvt=PROGRAM option,\n or set RXVT environment variable to the name of the program to use as rxvt.\n",
+   #else
+-    error( "Error: Can't find xterm program. \n Expected it at %s or %s\n Specify alternative with --xterm=PROGRAM option,\n or set XTERM environment variable to the name of the program to use as xterm.\n",
++    error( "Error: Can't find xterm program. \n Expected it at %s\n Specify alternative with --xterm=PROGRAM option,\n or set XTERM environment variable to the name of the program to use as xterm.\n",
+   #endif
+            feResourceDefault('X'));
+     mainUsage();
diff --git a/debian/patches/upstream-lintian-spelling-error-silence.patch b/debian/patches/upstream-lintian-spelling-error-silence.patch
index c72f176..56cc2e2 100644
--- a/debian/patches/upstream-lintian-spelling-error-silence.patch
+++ b/debian/patches/upstream-lintian-spelling-error-silence.patch
@@ -19,3 +19,14 @@ Last-Update: 2016-04-27
  
    {"MPhost",           required_argument,   LONG_OPTION_RETURN,
     "HOST",     "Use HOST for connections",                             feOptString,    0,   0},
+--- a/kernel/numeric/mpr_base.cc
++++ b/kernel/numeric/mpr_base.cc
+@@ -1355,7 +1355,7 @@
+       if ( !remapXiToPoint( LP->iposv[i+1], pQ, &(optSum[c].set), &(optSum[c].pnt) ) )
+       {
+         Werror(" resMatrixSparse::RC: Found bad solution in LP: %d!",LP->iposv[i+1]);
+-        WerrorS(" resMatrixSparse::RC: remapXiToPoint faild!");
++        WerrorS(" resMatrixSparse::RC: remapXiToPoint failed!");
+         return -1;
+       }
+       bucket[optSum[c].set]++;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/singular.git