Bug#778117: shibboleth-sp2: ftbfs with GCC-5

[Matthias Klose]

Control: tags -1 + pending patch

attaching a patch, uploading to delayed

-------------- next part --------------
diff -Nru shibboleth-sp2-2.5.3+dfsg/debian/changelog shibboleth-sp2-2.5.3+dfsg/debian/changelog
--- shibboleth-sp2-2.5.3+dfsg/debian/changelog	2015-03-24 16:03:24.000000000 +0100
+++ shibboleth-sp2-2.5.3+dfsg/debian/changelog	2015-07-13 15:57:27.000000000 +0200
@@ -1,3 +1,10 @@
+shibboleth-sp2 (2.5.3+dfsg-2.1) unstable; urgency=medium
+
+  * Non maintainer upload.
+  * Call cpp with -P for boost config. Closes: #778117.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 13 Jul 2015 15:56:14 +0200
+
 shibboleth-sp2 (2.5.3+dfsg-2) unstable; urgency=high
 
   * Incorporate security fix from V2.5.4 for CVE-2015-2684: authenticated
diff -Nru shibboleth-sp2-2.5.3+dfsg/debian/patches/gcc5.diff shibboleth-sp2-2.5.3+dfsg/debian/patches/gcc5.diff
--- shibboleth-sp2-2.5.3+dfsg/debian/patches/gcc5.diff	1970-01-01 01:00:00.000000000 +0100
+++ shibboleth-sp2-2.5.3+dfsg/debian/patches/gcc5.diff	2015-07-13 15:56:11.000000000 +0200
@@ -0,0 +1,13 @@
+Index: b/m4/boost.m4
+===================================================================
+--- a/m4/boost.m4
++++ b/m4/boost.m4
+@@ -71,7 +71,7 @@ dnl strip `\n' with backquotes, not the
+ dnl boost_cv_lib_version='1_37\r' for instance, which breaks
+ dnl everything else.
+ dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
+-(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
++(eval "$ac_cpp -P conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+   tr -d '\r' |
+   $SED -n -e "$1" >conftest.i 2>&1],
+   [$3],
diff -Nru shibboleth-sp2-2.5.3+dfsg/debian/patches/series shibboleth-sp2-2.5.3+dfsg/debian/patches/series
--- shibboleth-sp2-2.5.3+dfsg/debian/patches/series	2015-03-24 16:03:24.000000000 +0100
+++ shibboleth-sp2-2.5.3+dfsg/debian/patches/series	2015-07-13 15:55:51.000000000 +0200
@@ -5,3 +5,4 @@
 0005-Default-native-logger-to-syslog.patch
 0006-Remove-WSTrust-schema-references.patch
 0007-Security-fix-from-V2.5.4-for-CVE-2015-2684.patch
+gcc5.diff