[shibboleth-sp2] 10/17: Include some post-2.6 upstream fixes

[Ferenc Wágner]

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

wferi pushed a commit to branch debian/experimental
in repository shibboleth-sp2.

commit c7e8862ae872eb59434203236d34971f05e168fb
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Wed Aug 31 10:17:13 2016 +0200

    Include some post-2.6 upstream fixes
    
    5504c79: SSPCPP-704 Fix 'assignment as boolean'
    b173bb1: Fix misspelled error message.
---
 ...k-for-strerror_r-with-C-language-selected.patch |  2 +-
 .../Fix-misspelled-error-message.patch             | 22 ++++++++++++++++++++
 .../SSPCPP-704-Fix-assignment-as-boolean.patch     | 24 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 4 files changed, 49 insertions(+), 1 deletion(-)

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 96f45d8..ed21683 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
@@ -33,7 +33,7 @@ index c759a28..cdc9e89 100644
  # C++ requirements
  AC_CXX_NAMESPACES
 diff --git a/shibsp/remoting/impl/SocketListener.cpp b/shibsp/remoting/impl/SocketListener.cpp
-index 8951175..e060631 100644
+index 37a6716..c18b9ae 100644
 --- a/shibsp/remoting/impl/SocketListener.cpp
 +++ b/shibsp/remoting/impl/SocketListener.cpp
 @@ -397,9 +397,13 @@ bool SocketListener::log_error(const char* fn) const
diff --git a/debian/patches/from-upstream/Fix-misspelled-error-message.patch b/debian/patches/from-upstream/Fix-misspelled-error-message.patch
new file mode 100644
index 0000000..411825c
--- /dev/null
+++ b/debian/patches/from-upstream/Fix-misspelled-error-message.patch
@@ -0,0 +1,22 @@
+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/shibsp/remoting/impl/SocketListener.cpp b/shibsp/remoting/impl/SocketListener.cpp
+index 8951175..37a6716 100644
+--- a/shibsp/remoting/impl/SocketListener.cpp
++++ b/shibsp/remoting/impl/SocketListener.cpp
+@@ -126,7 +126,7 @@ SocketListener::ShibSocket SocketPool::connect()
+     if (!connected) {
+         m_log.crit("socket server unavailable, failing");
+         m_listener->close(sock);
+-        throw ListenerException("Cannot connect to shibd process, a site adminstrator should be notified.");
++        throw ListenerException("Cannot connect to shibd process, a site administrator should be notified that this web server has malfunctioned.");
+     }
+ 
+     m_log.debug("socket (%u) connected successfully", sock);
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
new file mode 100644
index 0000000..d63f11c
--- /dev/null
+++ b/debian/patches/from-upstream/SSPCPP-704-Fix-assignment-as-boolean.patch
@@ -0,0 +1,24 @@
+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/series b/debian/patches/series
index d9d2bf5..d2c4b31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+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
 Avoid-libtool-silent-flag.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git