[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.4.3+dfsg-4-4-g881ab42

[Russ Allbery]

The following commit has been merged in the master branch:
commit 7703b3f0178b23dcb40f33bdb590f9e334ce5222
Author: Russ Allbery <rra at debian.org>
Date:   Sat Feb 4 20:55:17 2012 -0800

    Apply patch for libmemcached 1.0 support
    
    * Use memcached_last_error_message instead of the cached_errno member of
      the memcached_st struct, since the latter was removed in 1.0.  Thanks
      to Michael Fladischer for the patch.  Bump Build-Depends to require
      1.0 or later of libmemcached-dev.  (Closes: #658408)

diff --git a/debian/changelog b/debian/changelog
index 19668d4..d8e76de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 shibboleth-sp2 (2.4.3+dfsg-5) UNRELEASED; urgency=low
 
   * Add PIE to the hardening flags for the shibd binary.
+  * Use memcached_last_error_message instead of the cached_errno member of
+    the memcached_st struct, since the latter was removed in 1.0.  Thanks
+    to Michael Fladischer for the patch.  Bump Build-Depends to require
+    1.0 or later of libmemcached-dev.  (Closes: #658408)
 
  -- Russ Allbery <rra at debian.org>  Thu, 02 Feb 2012 16:32:00 -0800
 
diff --git a/debian/control b/debian/control
index d7c7d78..d86a37f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Shib Team <pkg-shibboleth-devel at lists.alioth.debian.org>
 Uploaders: Russ Allbery <rra at debian.org>, Ferenc Wagner <wferi at niif.hu>,
  Faidon Liambotis <paravoid at debian.org>
 Build-Depends: debhelper (>= 9), apache2-threaded-dev, dh-autoreconf,
- doxygen, graphviz, liblog4cpp5-dev, libmemcached-dev,
+ doxygen, graphviz, liblog4cpp5-dev, libmemcached-dev (>= 1.0),
  libsaml2-dev (>= 2.4), libssl-dev, libtool, libxerces-c-dev,
  libxml-security-c-dev (>= 1.6), libxmltooling-dev (>= 1.4),
  opensaml2-schemas, pkg-config, unixodbc-dev, xmltooling-schemas
diff --git a/memcache-store/memcache-store.cpp b/memcache-store/memcache-store.cpp
index dc91999..74c67b5 100644
--- a/memcache-store/memcache-store.cpp
+++ b/memcache-store/memcache-store.cpp
@@ -308,7 +308,7 @@ bool MemcacheBase::deleteMemcache(const char *key,
     success = false;
   } else if (rv == MEMCACHED_ERRNO) {
     // System error
-    string error = string("Memcache::deleteMemcache() SYSTEM ERROR: ") + string(strerror(memc->cached_errno));
+    string error = string("Memcache::deleteMemcache() SYSTEM ERROR: ") + string(memcached_last_error_message(memc));
     log.error(error);
     throw IOException(error);
   } else {
@@ -349,7 +349,7 @@ bool MemcacheBase::getMemcache(const char *key,
     success = false;
   } else if (rv == MEMCACHED_ERRNO) {
     // System error
-    string error = string("Memcache::getMemcache() SYSTEM ERROR: ") + string(strerror(memc->cached_errno));
+    string error = string("Memcache::getMemcache() SYSTEM ERROR: ") + string(memcached_last_error_message(memc));
     log.error(error);
     throw IOException(error);
   } else {
@@ -388,7 +388,7 @@ bool MemcacheBase::addMemcache(const char *key,
     success = false;
   } else if (rv == MEMCACHED_ERRNO) {
     // System error
-    string error = string("Memcache::addMemcache() SYSTEM ERROR: ") + string(strerror(memc->cached_errno));
+    string error = string("Memcache::addMemcache() SYSTEM ERROR: ") + string(memcached_last_error_message(memc));
     log.error(error);
     throw IOException(error);
   } else {
@@ -424,7 +424,7 @@ bool MemcacheBase::setMemcache(const char *key,
     success = true;
   } else if (rv == MEMCACHED_ERRNO) {
     // System error
-    string error = string("Memcache::setMemcache() SYSTEM ERROR: ") + string(strerror(memc->cached_errno));
+    string error = string("Memcache::setMemcache() SYSTEM ERROR: ") + string(memcached_last_error_message(memc));
     log.error(error);
     throw IOException(error);
   } else {
@@ -463,7 +463,7 @@ bool MemcacheBase::replaceMemcache(const char *key,
     success = false;
   } else if (rv == MEMCACHED_ERRNO) {
     // System error
-    string error = string("Memcache::replaceMemcache() SYSTEM ERROR: ") + string(strerror(memc->cached_errno));
+    string error = string("Memcache::replaceMemcache() SYSTEM ERROR: ") + string(memcached_last_error_message(memc));
     log.error(error);
     throw IOException(error);
   } else {

-- 
Debian packaging for the 2.0 Apache Shibboleth SP