[singular] 01/01: Imported Debian patch 4.0.2-p2+ds-3

Sat Nov 14 05:09:47 UTC 2015

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

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

commit 3063b3d4405ce7c5ea03d7511e4296cf67f7987b
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Sat Nov 14 05:40:35 2015 +0100

    Imported Debian patch 4.0.2-p2+ds-3
---
 debian/changelog                                   |  8 ++
 .../debianization-rename-pkgconfig_files.patch     |  2 +-
 debian/patches/series                              |  1 +
 .../patches/upstream-tests-omalloc-getlucky.patch  | 10 ++-
 debian/patches/upstream-tests-omalloc-harden.patch | 91 ++++++++++++++++++++++
 5 files changed, 107 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 026ace5..805babd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+singular (4.0.2-p2+ds-3) unstable; urgency=medium
+
+  * FTBFS fix (Closes: #804892), harden omalloc check.
+  * Debianization:
+    - debian/patches/upstream-tests-omalloc-getlucky.patch, harden.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Sat, 14 Nov 2015 04:38:52 +0000
+
 singular (4.0.2-p2+ds-2) unstable; urgency=medium
 
   * FTBFS fix (Closes: #804186), render deterministic an undeterministic check.
diff --git a/debian/patches/debianization-rename-pkgconfig_files.patch b/debian/patches/debianization-rename-pkgconfig_files.patch
index a0a41f6..7b6f423 100644
--- a/debian/patches/debianization-rename-pkgconfig_files.patch
+++ b/debian/patches/debianization-rename-pkgconfig_files.patch
@@ -112,7 +112,7 @@ Last-Update: 2015-08-02
  
 --- a/omalloc/configure.ac
 +++ b/omalloc/configure.ac
-@@ -624,6 +624,6 @@
+@@ -635,6 +635,6 @@
  dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
  dnl wrap it up
  dnl
diff --git a/debian/patches/series b/debian/patches/series
index 845d401..039a208 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream-tests-omalloc-harden.patch
 upstream-tests-omalloc-getlucky.patch
 upstream-neutralize-tests-singular_dm_syzextra.patch
 upstream-autotools-help2man.patch
diff --git a/debian/patches/upstream-tests-omalloc-getlucky.patch b/debian/patches/upstream-tests-omalloc-getlucky.patch
index 0490a81..97a25b6 100644
--- a/debian/patches/upstream-tests-omalloc-getlucky.patch
+++ b/debian/patches/upstream-tests-omalloc-getlucky.patch
@@ -1,4 +1,4 @@
-Description: tests:
+Description: tests: omalloc: multi-running script
  Quoting the upstream maintainer: ``omalloc testing/verification may oversee
  some memory error in some random cases''. This patch introduceds a simple
  wrapper that is meant to work around those unlucky cases by running a few
@@ -7,7 +7,7 @@ Description: tests:
 Origin: debian
 Forwarded: https://github.com/Singular/Sources/pull/733
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-11-05
+Last-Update: 2015-11-14
 
 --- a/omalloc/Makefile.am
 +++ b/omalloc/Makefile.am
@@ -40,7 +40,7 @@ Last-Update: 2015-11-05
 +EXTRA_DIST = getlucky-omtTest-X.sh
 --- /dev/null
 +++ b/omalloc/getlucky-omtTest-X.sh
-@@ -0,0 +1,16 @@
+@@ -0,0 +1,18 @@
 +#!/bin/sh
 +##
 +## comment:
@@ -49,10 +49,12 @@ Last-Update: 2015-11-05
 +##  number of tests instead of just one test.
 +##
 +SCRIPTNAME=${0##*/}
++SCRIPTDIR=${0%/*}
 +CHECK_PROGRAM=${SCRIPTNAME#getlucky-}
 +NUMBEROF_TRIAL=11
 +for idx in $(seq 1 $NUMBEROF_TRIAL); do
-+	./$CHECK_PROGRAM && { echo "$SCRIPTNAME: SUMMARY: $idx trial(s)" ; exit 0 ; }
++	${SCRIPTDIR}/$CHECK_PROGRAM && { echo "$SCRIPTNAME: SUMMARY: $idx trial(s)" ; exit 0 ; }
++	sleep 3
 +done
 +echo "$SCRIPTNAME: SUMMARY: $idx failed trials"
 +exit 1
diff --git a/debian/patches/upstream-tests-omalloc-harden.patch b/debian/patches/upstream-tests-omalloc-harden.patch
new file mode 100644
index 0000000..1a8eba1
--- /dev/null
+++ b/debian/patches/upstream-tests-omalloc-harden.patch
@@ -0,0 +1,91 @@
+Description: tests: omalloc: harden memory backtrace support
+ Fix an weakness revealed on a powerpc machine. Patch extracted from
+ uptream commits 78528ea and 6da2d67, and tested on a powerpc Debian
+ porter by Jerome Benoit <calculus at rezozer.net>.
+Origin: upstream team
+Forwarded: https://github.com/Singular/Sources/pull/732
+Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
+Last-Update: 2015-11-14
+
+--- a/omalloc/configure.ac
++++ b/omalloc/configure.ac
+@@ -71,9 +71,6 @@
+   inline,
+   [ --without-inline   do not inline])
+ AC_ARG_WITH(
+-  debug,
+-  [ --without-debug    disable all debugging facilities])
+-AC_ARG_WITH(
+   track,
+   [ --without-track    disable debug tracking functionality])
+ AC_ARG_WITH(
+@@ -92,6 +89,9 @@
+   internal_debug,
+   [ --with-internal-debug
+                        turn on internal debugging])
++AC_ARG_ENABLE(
++  debug,
++  [ --enable-debug    include backtrace stuff])
+ dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+ dnl compiler/make  config
+ dnl
+@@ -414,7 +414,7 @@
+ dnl
+ save_cflags="$CFLAGS"
+ AC_MSG_CHECKING(whether to disable debugging)
+-if test "$with_debug" != no; then
++if test "$enable_debug" = yes; then
+ AC_MSG_RESULT(no)
+ CFLAGS="$CFLAGS -g"
+ else
+@@ -458,10 +458,12 @@
+ dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+ dnl backtrace business
+ dnl
++if test "x$with_track" != xno; then
+ AC_MSG_CHECKING(whether GET_RET_ADDR works)
+ AC_CACHE_VAL(ac_cv_get_return_addr_works,
+ AC_TRY_RUN([
+ #include <stdlib.h>
++#define OM_GET_RETURN_ADDR_WORKS 1
+ #include "omReturn.h"
+ int test_return_addr()
+ {
+@@ -514,11 +516,20 @@
+ if test "$ac_cv_get_backtrace_works" = yes; then
+ AC_DEFINE(OM_GET_BACKTRACE_WORKS,1,"Whether omInitGetBackTrace () works")
+ fi
++else
++   AC_MSG_CHECKING(whether GET_RET_ADDR works)
++   ac_cv_get_return_addr_works=no
++   AC_MSG_RESULT($ac_cv_get_return_addr_works)
++   AC_MSG_CHECKING(whether omGetBackTrace works)
++   ac_cv_get_backtrace_works=no
++   AC_MSG_RESULT($ac_cv_get_backtrace_works)
++fi
+ 
+ AC_MSG_CHECKING(whether addr2line works)
+ AC_CACHE_VAL(ac_cv_prog_addr2line_works,
+ AC_TRY_RUN([
+ #include <stdlib.h>
++#define OM_GET_RETURN_ADDR_WORKS 1
+ #include "omReturn.h"
+ #include "omStructs.h"
+ /* #include "omGetBackTrace.h" */
+--- a/omalloc/omReturn.h
++++ b/omalloc/omReturn.h
+@@ -51,10 +51,14 @@
+ #ifndef GET_RET_ADDR
+ 
+ #if __GNUC__ > 1
++#ifdef OM_GET_RETURN_ADDR_WORKS
+ #define GET_RET_ADDR(file) (file = __builtin_return_address(0))
+ #else
+ #define GET_RET_ADDR(file)	(file = 0)
+ #endif
++#else
++#define GET_RET_ADDR(file)	(file = 0)
++#endif
+ #endif /* __GNUC__ > 1 */
+ 
+ #endif /* ! __OM_RETURN_H__ */

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

