Commit 04033677 authored by Jerome Benoit's avatar Jerome Benoit

Imported Debian patch 0.99~b6+dsx-7: #848131 fix + hardening + refreshment

parent 90592f9f
tachyon (0.99~b6+dsx-7) unstable; urgency=medium
* Serious bug fix release (Closes: #848131) / Debianization:
- d/shlibs.local, indroduce (See: #831442).
* Debianization:
- d/templates/*:
- d/t/control.in (resp., d/control), harden (resp., update);
- d/patches/*:
- d/p/upstream-rationalization-autotools.patch, refresh and harden;
- d/p/debianization-bug-848363-ax_check_gl.patch, introduce;
- Origin field, correct;
- d/rules, harden.
-- Jerome Benoit <calculus@rezozer.net> Fri, 16 Dec 2016 18:23:58 +0000
tachyon (0.99~b6+dsx-6) unstable; urgency=medium
* FTBFS bug fix release (Closes: #837012):
......@@ -95,7 +110,7 @@ tachyon (0.99~b6+dsx-1) unstable; urgency=medium
- merge the installed header into one header;
- script-version, create by hand wrt `tachyon.h';
- autotools build machinery, write from scratch to ease maintenance;
- library versionning, introduce;
- library versioning, introduce;
- manual page generated via help2man;
- debian/README.{source,Debian}, refresh;
- build-arch/build-indep scheme, introduce;
......
......@@ -5,11 +5,10 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.
Uploaders: Jerome Benoit <calculus@rezozer.net>
Build-Depends:
debhelper (>= 9),
autotools-dev, autoconf-archive, dh-autoreconf, libtool, pkg-config, help2man,
mpi-default-dev (>= 1.6),
libmpich-dev,
libjpeg-dev,
libpng-dev,
autotools-dev, autoconf-archive (>= 20160916), gnulib, dh-autoreconf, libtool,
pkg-config, help2man,
mpi-default-dev (>= 1.6), libopenmpi-dev, libmpich-dev,
libjpeg-dev, libpng-dev,
libgl1-mesa-dev | libgl-dev
Build-Conflicts:
glx-diversions
......
This diff is collapsed.
......@@ -2,7 +2,7 @@ Description: debianization -- documentation
Address Debian Policy requirements for documentation;
and silence the composition machinery.
This is a Debian centric patch.
Origin: debian
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-11-06
......
......@@ -2,7 +2,7 @@ Description: debianization
Meant to maintain a minimal debian/rules, to fix warnings,
to address Debian specific stuff in general.
This is a Debian centric patch.
Origin: debian
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-09-13
......@@ -103,7 +103,7 @@ Last-Update: 2014-09-13
EXTRA_DIST =
--- a/configure.ac
+++ b/configure.ac
@@ -58,10 +58,12 @@
@@ -58,9 +58,11 @@
## PNG library
PKG_CHECK_MODULES([LIBPNG],[libpng],[CPPFLAGS="$CPPFLAGS -DUSEPNG"],[AC_MSG_ERROR([unable to find libpng])])
## OpenGL
......@@ -111,8 +111,7 @@ Last-Update: 2014-09-13
-AC_PATH_XTRA
+####AC_PATH_X
+####AC_PATH_XTRA
AX_CHECK_GL
AS_IF([test "x$no_gl" != "xyes"],[],[AC_MSG_ERROR([unable to find an OpenGL implementation])])
AX_CHECK_GL([:],[AC_MSG_ERROR([unable to find an OpenGL implementation])])
+X_LIBS="-lX11"
+AC_SUBST(X_LIBS)
......
......@@ -10,3 +10,4 @@ upstream-rationalization-version_script.patch
upstream-rationalization-autotools.patch
debianization.patch
debianization-documentation.patch
debianization-bug-848363-ax_check_gl.patch
Description: format usages and helps
Attempt to format and harmonize helps of the demonstration programs
wrt UN*X customs in view to employ help2man to generate manpages.
Origin: debian
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-10-21
......
Description: demosrc samples refreshment
Render buildable the demonstration C source samples;
plus minor comestic changes.
Origin: debian
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-11-06
......
......@@ -2,7 +2,7 @@ Description: source typo
Correct spelling error as reported by lintian in some binraries;
meant to silence lintian and eventually to be submitted to the
upstream maintainer.
Origin: debian
Origin: vendor, Debian
Forwarded: by email
Comment: spelling-error-in-binary
Author: Jerome Benoit <calculus@rezozer.net>
......
Description: opengl
Harden separate build either with or without OpenGL support.
Origin: debian
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-10-26
......
Description: parse -- tpoly
Correct the tachyon parser for tpoly data files.
Origin: debian
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-10-26
......
Description: POSIX Threads
Harden POSIX Threads support in GNU environment (Closes: #729182).
Origin: debian
Origin: vendor, Debian
Author: Samuel Thibault <sthibault@debian.org>
Last-Update: 2014-10-26
......
......@@ -2,13 +2,13 @@ Description: rationalization -- autotools machinery
Attempt to autotoolize the upstream package in view to ease
future maintenance on both side.
This patch is meant to be submitted to the upstream maintainer.
Origin: debian
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2015-06-25
Last-Update: 2016-12-16
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,88 @@
@@ -0,0 +1,87 @@
+dnl -*- Autoconf -*-
+dnl Process this file with autoconf to produce a configure script.
+
......@@ -71,8 +71,7 @@ Last-Update: 2015-06-25
+## OpenGL
+AC_PATH_X
+AC_PATH_XTRA
+AX_CHECK_GL
+AS_IF([test "x$no_gl" != "xyes"],[],[AC_MSG_ERROR([unable to find an OpenGL implementation])])
+AX_CHECK_GL([:],[AC_MSG_ERROR([unable to find an OpenGL implementation])])
+
+dnl Checks for header files.
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h])
......@@ -276,62 +275,6 @@ Last-Update: 2015-06-25
+
+EXTRA_DIST =
--- /dev/null
+++ b/m4/ld-version-script.m4
@@ -0,0 +1,53 @@
+# ld-version-script.m4 serial 3
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Simon Josefsson
+
+# FIXME: The test below returns a false positive for mingw
+# cross-compiles, 'local:' statements does not reduce number of
+# exported symbols in a DLL. Use --disable-ld-version-script to work
+# around the problem.
+
+# gl_LD_VERSION_SCRIPT
+# --------------------
+# Check if LD supports linker scripts, and define automake conditional
+# HAVE_LD_VERSION_SCRIPT if so.
+AC_DEFUN([gl_LD_VERSION_SCRIPT],
+[
+ AC_ARG_ENABLE([ld-version-script],
+ AS_HELP_STRING([--enable-ld-version-script],
+ [enable linker version script (default is enabled when possible)]),
+ [have_ld_version_script=$enableval], [])
+ if test -z "$have_ld_version_script"; then
+ AC_MSG_CHECKING([if LD -Wl,--version-script works])
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
+ cat > conftest.map <<EOF
+foo
+EOF
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+ [accepts_syntax_errors=yes], [accepts_syntax_errors=no])
+ if test "$accepts_syntax_errors" = no; then
+ cat > conftest.map <<EOF
+VERS_1 {
+ global: sym;
+};
+
+VERS_2 {
+ global: sym;
+} VERS_1;
+EOF
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+ [have_ld_version_script=yes], [have_ld_version_script=no])
+ else
+ have_ld_version_script=no
+ fi
+ rm -f conftest.map
+ LDFLAGS="$save_LDFLAGS"
+ AC_MSG_RESULT($have_ld_version_script)
+ fi
+ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
+])
--- /dev/null
+++ b/demosrc/Makefile.am
@@ -0,0 +1,85 @@
+bin_PROGRAMS =
......
Description: rationalization -- clean up
Straightforward clean up.
This patch is meant to be submitted to the upstream maintainer.
Origin: debian
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-10-20
......
......@@ -9,7 +9,7 @@ Description: rationalization -- one development header file
wide set up.
This patch is transparent for the final developer, and it is also
meant to be submitted to the upstream maintainer.
Origin: debian
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-10-20
......
......@@ -8,7 +8,7 @@ Description: rationalization -- version_script
This patch is transparent for the final developer, and it is also
meant to be submitted to the upstream maintainer.
[1] https://www.gnu.org/software/gnulib/manual/html_node/LD-Version-Scripts.html
Origin: debian
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-10-20
......
......@@ -38,6 +38,7 @@ DEB_ARCH_REVLISTOF_OPENMPI ?= any
DEB_ARCH_REVLISTOF_MPICH ?= any
endif
export ACLOCAL_PATH=/usr/share/gnulib/m4
## inspired from mpfr material
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
......
libmpich 12 libmpich12
......@@ -5,11 +5,10 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.
Uploaders: Jerome Benoit <calculus@rezozer.net>
Build-Depends:
debhelper (>= 9),
autotools-dev, autoconf-archive, dh-autoreconf, libtool, pkg-config, help2man,
mpi-default-dev (>= 1.6),
libmpich-dev,
libjpeg-dev,
libpng-dev,
autotools-dev, autoconf-archive (>= 20160916), gnulib, dh-autoreconf, libtool,
pkg-config, help2man,
mpi-default-dev (>= 1.6), libopenmpi-dev, libmpich-dev,
libjpeg-dev, libpng-dev,
libgl1-mesa-dev | libgl-dev
Build-Conflicts:
glx-diversions
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment