[shibboleth-sp2] 01/01: Remove an incorporated upstream patch, refresh the rest
Ferenc Wágner
wferi at moszumanska.debian.org
Thu Nov 16 16:05:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
wferi pushed a commit to branch debian/master
in repository shibboleth-sp2.
commit a86acfd7066b11bdaee63b7842c185c2867205cf
Author: Ferenc Wágner <wferi at debian.org>
Date: Thu Nov 16 17:01:44 2017 +0100
Remove an incorporated upstream patch, refresh the rest
---
...fig-files-for-libshibsp-and-libshibsp-lit.patch | 2 +-
debian/patches/Avoid-libtool-silent-flag.patch | 2 +-
...k-for-strerror_r-with-C-language-selected.patch | 2 +-
.../Enable-the-dot-feature-of-Doxygen.patch | 2 +-
.../Localize-Boost-preprocessor-flags.patch | 4 ++--
.../patches/Localize-pthread-library-flags.patch | 8 ++++----
...r-libsystemd-instead-of-libsystemd-daemon.patch | 2 +-
...-use-GSSAPI-only-if-the-naming-extensions.patch | 2 +-
debian/patches/Use-pkg-config-for-GSSAPI.patch | 10 ++++-----
debian/patches/Use-pkg-config-for-OpenSAML.patch | 6 +++---
debian/patches/Use-pkg-config-for-Xerces.patch | 8 ++++----
.../Use-pkg-config-for-log4shib-log4cpp.patch | 8 ++++----
debian/patches/Use-pkg-config-for-xmlsec.patch | 6 +++---
debian/patches/Use-pkg-config-for-xmltooling.patch | 8 ++++----
debian/patches/We-don-t-use-OpenSSL-directly.patch | 2 +-
.../Fix-misspelled-error-message.patch | 1 -
.../SSPCPP-704-Fix-assignment-as-boolean.patch | 24 ----------------------
.../patches/keygen-improvements-for-Debian.patch | 2 +-
debian/patches/series | 1 -
19 files changed, 37 insertions(+), 63 deletions(-)
diff --git a/debian/patches/Add-pkg-config-files-for-libshibsp-and-libshibsp-lit.patch b/debian/patches/Add-pkg-config-files-for-libshibsp-and-libshibsp-lit.patch
index 4cb0adf..20d0445 100644
--- a/debian/patches/Add-pkg-config-files-for-libshibsp-and-libshibsp-lit.patch
+++ b/debian/patches/Add-pkg-config-files-for-libshibsp-and-libshibsp-lit.patch
@@ -27,7 +27,7 @@ index 5fa116d..dcf0675 100644
EXTRA_DIST = $(DX_CONFIG) \
diff --git a/configure.ac b/configure.ac
-index cdc9e89..5cc7dd2 100644
+index ad33029..a6726f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_MACRO_DIR(m4)
diff --git a/debian/patches/Avoid-libtool-silent-flag.patch b/debian/patches/Avoid-libtool-silent-flag.patch
index bde6551..d912bb1 100644
--- a/debian/patches/Avoid-libtool-silent-flag.patch
+++ b/debian/patches/Avoid-libtool-silent-flag.patch
@@ -10,7 +10,7 @@ to the libtool flags in configure.ac.
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 563b254..e3ac524 100644
+index 57836b0..8d9695b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1376,6 +1376,7 @@ if test -n "$APXS24_CC" && test "$APXS24_CC" != "$CC" ; then
diff --git a/debian/patches/Check-for-strerror_r-with-C-language-selected.patch b/debian/patches/Check-for-strerror_r-with-C-language-selected.patch
index ed21683..d60960e 100644
--- a/debian/patches/Check-for-strerror_r-with-C-language-selected.patch
+++ b/debian/patches/Check-for-strerror_r-with-C-language-selected.patch
@@ -13,7 +13,7 @@ https://gcc.gnu.org/onlinedocs/libstdc++/faq.html#faq.predefined
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
-index c759a28..cdc9e89 100644
+index 7177f23..ad33029 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,6 @@ AC_STRUCT_TM
diff --git a/debian/patches/Enable-the-dot-feature-of-Doxygen.patch b/debian/patches/Enable-the-dot-feature-of-Doxygen.patch
index 1371380..566c87a 100644
--- a/debian/patches/Enable-the-dot-feature-of-Doxygen.patch
+++ b/debian/patches/Enable-the-dot-feature-of-Doxygen.patch
@@ -7,7 +7,7 @@ Subject: Enable the dot feature of Doxygen
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
-index 9234503..c355dc0 100644
+index 67dcce9..a36ca9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,7 @@ PKG_INSTALLDIR
diff --git a/debian/patches/Localize-Boost-preprocessor-flags.patch b/debian/patches/Localize-Boost-preprocessor-flags.patch
index 7805ece..55ade65 100644
--- a/debian/patches/Localize-Boost-preprocessor-flags.patch
+++ b/debian/patches/Localize-Boost-preprocessor-flags.patch
@@ -49,7 +49,7 @@ index 3255d71..1f0d0f7 100644
$(xmltooling_lite_CFLAGS)
mod_shib_24_la_LIBADD = \
diff --git a/configure.ac b/configure.ac
-index 8ca84a8..f15cef7 100644
+index 4ba0634..01abff1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,7 +137,6 @@ BOOST_POINTER_CONTAINER
@@ -97,7 +97,7 @@ index 73ded4e..c360595 100644
$(xmltooling_lite_CFLAGS)
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
-index 801a849..17d6595 100644
+index a23f378..57ac8b4 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -241,6 +241,7 @@ libshibsp_la_CPPFLAGS = \
diff --git a/debian/patches/Localize-pthread-library-flags.patch b/debian/patches/Localize-pthread-library-flags.patch
index c44c473..94ecb23 100644
--- a/debian/patches/Localize-pthread-library-flags.patch
+++ b/debian/patches/Localize-pthread-library-flags.patch
@@ -66,7 +66,7 @@ index 4f08b32..3255d71 100644
endif
diff --git a/configure.ac b/configure.ac
-index 9faaed5..8ca84a8 100644
+index f6ebe72..4ba0634 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,16 +94,9 @@ if test "$shib_cv_sock_cloexec" = "yes"; then
@@ -179,12 +179,12 @@ index 63bc5bf..87f8eb9 100644
EXTRA_DIST = shibd_win32.cpp resource.h shibd.rc
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
-index 6cd568a..801a849 100644
+index 21cb90b..a23f378 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -237,17 +237,21 @@ libshibsp_la_SOURCES = \
# http://sources.redhat.com/autobook/autobook/autobook_91.html
- libshibsp_la_LDFLAGS = -version-info 7:0:0
+ libshibsp_la_LDFLAGS = -version-info 7:1:0
libshibsp_la_CPPFLAGS = \
+ $(PTHREAD_CFLAGS) \
$(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
@@ -194,7 +194,7 @@ index 6cd568a..801a849 100644
$(log4shib_LIBS) $(log4cpp_LIBS) \
$(xmltooling_LIBS) \
$(XMLSEC_LIBS)
- libshibsp_lite_la_LDFLAGS = -version-info 7:0:0
+ libshibsp_lite_la_LDFLAGS = -version-info 7:1:0
libshibsp_lite_la_LIBADD = \
+ $(PTHREAD_LIBS) \
$(log4shib_LIBS) $(log4cpp_LIBS) \
diff --git a/debian/patches/Search-for-libsystemd-instead-of-libsystemd-daemon.patch b/debian/patches/Search-for-libsystemd-instead-of-libsystemd-daemon.patch
index a5f1fee..1aa83a1 100644
--- a/debian/patches/Search-for-libsystemd-instead-of-libsystemd-daemon.patch
+++ b/debian/patches/Search-for-libsystemd-instead-of-libsystemd-daemon.patch
@@ -9,7 +9,7 @@ version 209.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index e3ac524..c759a28 100644
+index 8d9695b..7177f23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -446,12 +446,12 @@ AC_MSG_CHECKING(whether to build with systemd)
diff --git a/debian/patches/The-plugins-use-GSSAPI-only-if-the-naming-extensions.patch b/debian/patches/The-plugins-use-GSSAPI-only-if-the-naming-extensions.patch
index 43374ef..4fb884a 100644
--- a/debian/patches/The-plugins-use-GSSAPI-only-if-the-naming-extensions.patch
+++ b/debian/patches/The-plugins-use-GSSAPI-only-if-the-naming-extensions.patch
@@ -9,7 +9,7 @@ Subject: The plugins use GSSAPI only if the naming extensions are available
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
-index c2d2c07..9234503 100644
+index 05a4981..67dcce9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -971,6 +971,7 @@ AS_IF([test "x$with_gssapi" != xno],
diff --git a/debian/patches/Use-pkg-config-for-GSSAPI.patch b/debian/patches/Use-pkg-config-for-GSSAPI.patch
index 62a355b..c7a819d 100644
--- a/debian/patches/Use-pkg-config-for-GSSAPI.patch
+++ b/debian/patches/Use-pkg-config-for-GSSAPI.patch
@@ -59,7 +59,7 @@ index 0ac36f7..e54ad86 100644
$(xmltooling_lite_LIBS)
endif
diff --git a/configure.ac b/configure.ac
-index 596e801..c2d2c07 100644
+index ee2f186..05a4981 100644
--- a/configure.ac
+++ b/configure.ac
@@ -947,139 +947,20 @@ if test "$have_odbc_libs" = yes ; then
@@ -319,11 +319,11 @@ index e212a3d..5235e4b 100644
static const XMLCh _GSSAPIName[] = UNICODE_LITERAL_10(G,S,S,A,P,I,N,a,m,e);
static const XMLCh _GSSAPIContext[] = UNICODE_LITERAL_13(G,S,S,A,P,I,C,o,n,t,e,x,t);
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
-index 794fb67..4968c16 100644
+index 7772d67..bad0015 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -238,6 +238,7 @@ libshibsp_la_SOURCES = \
- libshibsp_la_LDFLAGS = -version-info 7:0:0
+ libshibsp_la_LDFLAGS = -version-info 7:1:0
libshibsp_la_CPPFLAGS = \
$(PTHREAD_CFLAGS) \
+ $(gss_CFLAGS) $(gnu_gss_CFLAGS) \
@@ -339,7 +339,7 @@ index 794fb67..4968c16 100644
$(opensaml_LIBS) \
$(xerces_LIBS) \
@@ -254,12 +256,14 @@ libshibsp_la_LIBADD = \
- libshibsp_lite_la_LDFLAGS = -version-info 7:0:0
+ libshibsp_lite_la_LDFLAGS = -version-info 7:1:0
libshibsp_lite_la_LIBADD = \
$(PTHREAD_LIBS) \
+ $(gss_LIBS) $(gnu_gss_LIBS) \
@@ -354,7 +354,7 @@ index 794fb67..4968c16 100644
$(xerces_CFLAGS) \
$(xmltooling_lite_CFLAGS)
diff --git a/shibsp/handler/impl/RemotedHandler.cpp b/shibsp/handler/impl/RemotedHandler.cpp
-index 529682a..4d0fa18 100644
+index d99a20d..286223b 100644
--- a/shibsp/handler/impl/RemotedHandler.cpp
+++ b/shibsp/handler/impl/RemotedHandler.cpp
@@ -45,7 +45,7 @@
diff --git a/debian/patches/Use-pkg-config-for-OpenSAML.patch b/debian/patches/Use-pkg-config-for-OpenSAML.patch
index dd677ec..53339f3 100644
--- a/debian/patches/Use-pkg-config-for-OpenSAML.patch
+++ b/debian/patches/Use-pkg-config-for-OpenSAML.patch
@@ -30,7 +30,7 @@ index 3512c09..2245da7 100644
adfs_la_SOURCES = \
diff --git a/configure.ac b/configure.ac
-index f428783..a8e8832 100644
+index a539dec..c27237c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,56 +221,9 @@ DX_INCLUDE="$DX_INCLUDE $xmltooling_includedir"
@@ -164,10 +164,10 @@ index 8efd00d..5485628 100644
$(xmltooling_LIBS)
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
-index 5767fd0..39e19a4 100644
+index 3cbdda5..4b04f2e 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
-@@ -239,12 +239,14 @@ libshibsp_la_LDFLAGS = -version-info 7:0:0
+@@ -239,12 +239,14 @@ libshibsp_la_LDFLAGS = -version-info 7:1:0
libshibsp_la_CPPFLAGS = \
$(PTHREAD_CFLAGS) \
$(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
diff --git a/debian/patches/Use-pkg-config-for-Xerces.patch b/debian/patches/Use-pkg-config-for-Xerces.patch
index a37eb07..9124891 100644
--- a/debian/patches/Use-pkg-config-for-Xerces.patch
+++ b/debian/patches/Use-pkg-config-for-Xerces.patch
@@ -76,7 +76,7 @@ index 1f0d0f7..0ac36f7 100644
endif
diff --git a/configure.ac b/configure.ac
-index cdc8aa9..f428783 100644
+index b56b4ad..a539dec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,31 +143,12 @@ AX_PKG_CHECK_MODULES([log4shib],,[log4shib],
@@ -386,10 +386,10 @@ index 87f8eb9..8efd00d 100644
EXTRA_DIST = shibd_win32.cpp resource.h shibd.rc
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
-index 17d6595..5767fd0 100644
+index 57ac8b4..3cbdda5 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
-@@ -239,22 +239,26 @@ libshibsp_la_LDFLAGS = -version-info 7:0:0
+@@ -239,22 +239,26 @@ libshibsp_la_LDFLAGS = -version-info 7:1:0
libshibsp_la_CPPFLAGS = \
$(PTHREAD_CFLAGS) \
$(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
@@ -402,7 +402,7 @@ index 17d6595..5767fd0 100644
+ $(xerces_LIBS) \
$(xmltooling_LIBS) \
$(XMLSEC_LIBS)
- libshibsp_lite_la_LDFLAGS = -version-info 7:0:0
+ libshibsp_lite_la_LDFLAGS = -version-info 7:1:0
libshibsp_lite_la_LIBADD = \
$(PTHREAD_LIBS) \
$(log4shib_LIBS) $(log4cpp_LIBS) \
diff --git a/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch b/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch
index d5dc383..0b70a16 100644
--- a/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch
+++ b/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch
@@ -9,7 +9,7 @@ Subject: Use pkg-config for log4shib/log4cpp
3 files changed, 28 insertions(+), 63 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 5cc7dd2..d633bf5 100644
+index a6726f5..eb1d900 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,55 +168,12 @@ else
@@ -75,20 +75,20 @@ index 5cc7dd2..d633bf5 100644
# Xerces settings
AC_ARG_WITH(xerces,
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
-index fb8b6fc..c1d2ff3 100644
+index b96a76f..6bb2b08 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -236,10 +236,17 @@ libshibsp_la_SOURCES = \
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
- libshibsp_la_LDFLAGS = -version-info 7:0:0
+ libshibsp_la_LDFLAGS = -version-info 7:1:0
-libshibsp_la_LIBADD = $(XMLSEC_LIBS)
+libshibsp_la_CPPFLAGS = \
+ $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
+libshibsp_la_LIBADD = \
+ $(log4shib_LIBS) $(log4cpp_LIBS) \
+ $(XMLSEC_LIBS)
- libshibsp_lite_la_LDFLAGS = -version-info 7:0:0
+ libshibsp_lite_la_LDFLAGS = -version-info 7:1:0
-libshibsp_lite_la_LIBADD = $(LITE_LIBS)
-libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
+libshibsp_lite_la_LIBADD = \
diff --git a/debian/patches/Use-pkg-config-for-xmlsec.patch b/debian/patches/Use-pkg-config-for-xmlsec.patch
index 41160c5..703ad1b 100644
--- a/debian/patches/Use-pkg-config-for-xmlsec.patch
+++ b/debian/patches/Use-pkg-config-for-xmlsec.patch
@@ -32,7 +32,7 @@ index 2245da7..dc75203 100644
adfs_la_SOURCES = \
diff --git a/configure.ac b/configure.ac
-index a8e8832..596e801 100644
+index c27237c..ee2f186 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,43 +174,17 @@ AC_COMPILE_IFELSE(
@@ -175,7 +175,7 @@ index 5485628..8597649 100644
EXTRA_DIST = shibd_win32.cpp resource.h shibd.rc
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
-index 39e19a4..794fb67 100644
+index 4b04f2e..7772d67 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -241,6 +241,7 @@ libshibsp_la_CPPFLAGS = \
@@ -194,7 +194,7 @@ index 39e19a4..794fb67 100644
- $(XMLSEC_LIBS)
+ $(xmlsec_LIBS) \
+ $(xmltooling_LIBS)
- libshibsp_lite_la_LDFLAGS = -version-info 7:0:0
+ libshibsp_lite_la_LDFLAGS = -version-info 7:1:0
libshibsp_lite_la_LIBADD = \
$(PTHREAD_LIBS) \
diff --git a/util/Makefile.am b/util/Makefile.am
diff --git a/debian/patches/Use-pkg-config-for-xmltooling.patch b/debian/patches/Use-pkg-config-for-xmltooling.patch
index 79afa78..19a7753 100644
--- a/debian/patches/Use-pkg-config-for-xmltooling.patch
+++ b/debian/patches/Use-pkg-config-for-xmltooling.patch
@@ -111,7 +111,7 @@ index a694c8a..4f08b32 100644
install-data-hook:
diff --git a/configure.ac b/configure.ac
-index d633bf5..9faaed5 100644
+index eb1d900..f6ebe72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -261,56 +261,14 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xsec/framework/XSECAlgorithmMappe
@@ -309,12 +309,12 @@ index 7a7d5de..63bc5bf 100644
EXTRA_DIST = shibd_win32.cpp resource.h shibd.rc
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
-index c1d2ff3..6cd568a 100644
+index 6bb2b08..21cb90b 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -237,16 +237,19 @@ libshibsp_la_SOURCES = \
# http://sources.redhat.com/autobook/autobook/autobook_91.html
- libshibsp_la_LDFLAGS = -version-info 7:0:0
+ libshibsp_la_LDFLAGS = -version-info 7:1:0
libshibsp_la_CPPFLAGS = \
- $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
+ $(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
@@ -323,7 +323,7 @@ index c1d2ff3..6cd568a 100644
$(log4shib_LIBS) $(log4cpp_LIBS) \
+ $(xmltooling_LIBS) \
$(XMLSEC_LIBS)
- libshibsp_lite_la_LDFLAGS = -version-info 7:0:0
+ libshibsp_lite_la_LDFLAGS = -version-info 7:1:0
libshibsp_lite_la_LIBADD = \
$(log4shib_LIBS) $(log4cpp_LIBS) \
- $(LITE_LIBS)
diff --git a/debian/patches/We-don-t-use-OpenSSL-directly.patch b/debian/patches/We-don-t-use-OpenSSL-directly.patch
index 65aadd6..f0ea753 100644
--- a/debian/patches/We-don-t-use-OpenSSL-directly.patch
+++ b/debian/patches/We-don-t-use-OpenSSL-directly.patch
@@ -7,7 +7,7 @@ Subject: We don't use OpenSSL directly
1 file changed, 24 deletions(-)
diff --git a/configure.ac b/configure.ac
-index f15cef7..cdc8aa9 100644
+index 01abff1..b56b4ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,30 +98,6 @@ ACX_PTHREAD(
diff --git a/debian/patches/from-upstream/Fix-misspelled-error-message.patch b/debian/patches/from-upstream/Fix-misspelled-error-message.patch
index 411825c..c125b5f 100644
--- a/debian/patches/from-upstream/Fix-misspelled-error-message.patch
+++ b/debian/patches/from-upstream/Fix-misspelled-error-message.patch
@@ -2,7 +2,6 @@ From: Scott Cantor <cantor.2 at osu.edu>
Date: Mon, 25 Jul 2016 20:03:22 -0400
Subject: Fix misspelled error message.
-Gbp: Topic from-upstream
---
shibsp/remoting/impl/SocketListener.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/from-upstream/SSPCPP-704-Fix-assignment-as-boolean.patch b/debian/patches/from-upstream/SSPCPP-704-Fix-assignment-as-boolean.patch
deleted file mode 100644
index d63f11c..0000000
--- a/debian/patches/from-upstream/SSPCPP-704-Fix-assignment-as-boolean.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Rod Widdowson <rdw at steadingsoftware.com>
-Date: Tue, 5 Jul 2016 09:26:41 +0100
-Subject: SSPCPP-704 Fix 'assignment as boolean'
-
-https://issues.shibboleth.net/jira/browse/SSPCPP-704
-
-Gbp: Topic from-upstream
----
- shibsp/impl/StorageServiceSessionCache.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/shibsp/impl/StorageServiceSessionCache.cpp b/shibsp/impl/StorageServiceSessionCache.cpp
-index b6d6642..4659c4d 100644
---- a/shibsp/impl/StorageServiceSessionCache.cpp
-+++ b/shibsp/impl/StorageServiceSessionCache.cpp
-@@ -1633,7 +1633,7 @@ Session* SSCache::find(const Application& app, const char* key, const char* clie
- if (!ver)
- return nullptr;
-
-- if (lastAccess = 0) {
-+ if (0 == lastAccess) {
- m_log.error("session (ID: %s) did not report time of last access", key);
- throw RetryableProfileException("Your session has expired, and you must re-authenticate.");
- }
diff --git a/debian/patches/keygen-improvements-for-Debian.patch b/debian/patches/keygen-improvements-for-Debian.patch
index 8c6e721..695f19d 100644
--- a/debian/patches/keygen-improvements-for-Debian.patch
+++ b/debian/patches/keygen-improvements-for-Debian.patch
@@ -11,7 +11,7 @@ names.
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/configs/keygen.sh b/configs/keygen.sh
-index 33b6037..0c36122 100755
+index b5378fd..264f568 100755
--- a/configs/keygen.sh
+++ b/configs/keygen.sh
@@ -1,5 +1,11 @@
diff --git a/debian/patches/series b/debian/patches/series
index 9008fc6..a6e187e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-from-upstream/SSPCPP-704-Fix-assignment-as-boolean.patch
from-upstream/Fix-misspelled-error-message.patch
Improve-shibd-init-script.patch
keygen-improvements-for-Debian.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list