Commit ab4c4136 authored by Etienne Dysli Metref's avatar Etienne Dysli Metref 🦉
Browse files

Merge branch 'debian/stretch-backports' into switchaai/debian/stretch

parents d83a3c9b 665c690a
log4shib (2.0.0-2~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
-- Etienne Dysli Metref <etienne.dysli-metref@switch.ch> Fri, 14 Dec 2018 10:00:42 +0100
log4shib (2.0.0-2) unstable; urgency=medium
* [0757f12] Switch to watching bzip2 compressed tarballs
* [67ed4d0] Add build system patches for better FLAGS handling
* [c9beebe] Stop fiddling with configure switches
--enable-debug has nothing to do with the optimization level,
and --disable-static is the default with our latest patches.
* [ce131c8] Update Standards-Version to 4.2.1 (no changes required)
* Upload to unstable
-- Ferenc Wágner <wferi@debian.org> Sat, 24 Nov 2018 16:10:58 +0100
log4shib (2.0.0-0switchaai1~stretch1) stretch; urgency=medium
* Rebuild for stretch from Debian experimental.
......
......@@ -9,7 +9,7 @@ Build-Depends:
Build-Depends-Indep:
doxygen,
graphviz,
Standards-Version: 4.1.5
Standards-Version: 4.2.1
Homepage: https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib
Vcs-Git: https://salsa.debian.org/shib-team/log4shib.git
Vcs-Browser: https://salsa.debian.org/shib-team/log4shib
......
From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
Date: Sat, 24 Nov 2018 15:55:43 +0100
Subject: Disable building the static library by default
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 7ef2fb0..c2912a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ else
AM_CXXFLAGS="-O2 -DNDEBUG"
fi
-AM_PROG_LIBTOOL
+LT_INIT([disable-static])
AC_PROG_INSTALL
AC_PROG_MAKE_SET
From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
Date: Sat, 24 Nov 2018 15:57:59 +0100
Subject: Simplify C(XX)FLAGS handling
Leave the default at -g -O2 as AC_PROG_CC sets it; such options are
better customized by setting C(XX)FLAGS on the command line.
Defining NDEBUG is risky, don't do that; use --enable-debug for
producing the debug variant only (which is identical to the normal
variant at the moment).
---
configure.ac | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index c2912a0..49dae10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,15 +31,12 @@ AC_ARG_WITH(idsa, AS_HELP_STRING(--with-idsa, [include idsa support]),)
AC_CANONICAL_HOST
AC_ARG_ENABLE(debug,
- AS_HELP_STRING(--enable-debug, [Have GCC compile with symbols (Default = no)]),
+ AS_HELP_STRING(--enable-debug, [Produce debug variant (Default = no)]),
enable_debug=$enableval, enable_debug=no)
if test "$enable_debug" = "yes" ; then
- AM_CFLAGS="-g -D_DEBUG"
- AM_CXXFLAGS="-g -D_DEBUG"
-else
- AM_CFLAGS="-O2 -DNDEBUG"
- AM_CXXFLAGS="-O2 -DNDEBUG"
+ AM_CFLAGS="-D_DEBUG"
+ AM_CXXFLAGS="-D_DEBUG"
fi
LT_INIT([disable-static])
Disable-building-the-static-library-by-default.patch
Simplify-C-XX-FLAGS-handling.patch
......@@ -7,18 +7,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
# the linkage because it uses -nostdlib. See #468555.
export DEB_LDFLAGS_MAINT_APPEND = -lpthread
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
DEBUG = --enable-debug
else
DEBUG =
endif
%:
dh $@
override_dh_auto_configure:
dh_auto_configure -- --disable-static $(DEBUG)
override_dh_auto_build-indep:
$(MAKE) docs
......
version=3
opts=pgpsigurlmangle=s/$/.asc/ \
https://shibboleth.net/downloads/log4shib/latest/log4shib-(.*)\.tar\.gz
https://shibboleth.net/downloads/log4shib/latest/log4shib-(.*)\.tar\.bz2
Supports Markdown
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