diff -Nru shibboleth-resolver-1.0.0/debian/changelog shibboleth-resolver-1.0.0/debian/changelog --- shibboleth-resolver-1.0.0/debian/changelog 2014-08-29 04:03:21.000000000 +0000 +++ shibboleth-resolver-1.0.0/debian/changelog 2018-11-29 15:26:48.000000000 +0000 @@ -1,3 +1,20 @@ +shibboleth-resolver (1.0.0-1+rpi2) buster-staging; urgency=medium + + * Edit configure.ac to use pkg-config instead of log4shib-config + * Use --with autoreconf for dh so changes in configure.ac are effective. + * Replace xsecsize_t with XMLSize_t + * Add nullptr "request" parameter to createResolutionContext and + extractAttributes calls + + -- Peter Michael Green Thu, 29 Nov 2018 15:26:48 +0000 + +shibboleth-resolver (1.0.0-1+rpi1) buster-staging; urgency=medium + + * Manually specify prefix for liblog4shib, new version doesn't seem + to be autodetected. + + -- Peter Michael Green Thu, 29 Nov 2018 15:16:01 +0000 + shibboleth-resolver (1.0.0-1) unstable; urgency=medium * New upstream version diff -Nru shibboleth-resolver-1.0.0/debian/patches/add-null-request-parameter.patch shibboleth-resolver-1.0.0/debian/patches/add-null-request-parameter.patch --- shibboleth-resolver-1.0.0/debian/patches/add-null-request-parameter.patch 1970-01-01 00:00:00.000000000 +0000 +++ shibboleth-resolver-1.0.0/debian/patches/add-null-request-parameter.patch 2018-11-29 15:26:48.000000000 +0000 @@ -0,0 +1,35 @@ +Description: Add null request parameter createResolutionContext and extractAttributes + The code used deprecated and now removed overloads of createResolutionContext + and extractAttributes. These deprecated overloads were wrappers calling the real + version with the "request" parameter set to nullprt. So I set the "request" + parameter to nullptr in the calls. +Author: Peter Michael Green + +--- shibboleth-resolver-1.0.0.orig/src/shibresolver/resolver.cpp ++++ shibboleth-resolver-1.0.0/src/shibresolver/resolver.cpp +@@ -460,7 +460,7 @@ void RemotedResolver::resolve( + log.debug("extracting metadata-derived attributes..."); + try { + // We pass NULL for "issuer" because the issuer isn't the one asserting metadata-based attributes. +- extractor->extractAttributes(app, NULL, *role, resolvedAttrs); ++ extractor->extractAttributes(app, nullptr, NULL, *role, resolvedAttrs); + for (vector::iterator a = resolvedAttrs.begin(); a != resolvedAttrs.end(); ++a) { + vector& ids = (*a)->getAliases(); + for (vector::iterator id = ids.begin(); id != ids.end(); ++id) +@@ -507,6 +507,7 @@ void RemotedResolver::resolve( + auto_ptr ctx( + resolver->createResolutionContext( + app, ++ nullptr, + role ? dynamic_cast(role->getParent()) : NULL, + protocol ? protocol : samlconstants::SAML20P_NS, + NULL, +@@ -543,7 +544,7 @@ void RemotedResolver::resolve( + { + vector extractedAttrs; + try { +- extractor->extractAttributes(app, issuer, token, extractedAttrs); ++ extractor->extractAttributes(app, nullptr, issuer, token, extractedAttrs); + } + catch (exception& ex) { + Category::getInstance(SHIBRESOLVER_LOGCAT).error("caught exception extracting attributes: %s", ex.what()); diff -Nru shibboleth-resolver-1.0.0/debian/patches/series shibboleth-resolver-1.0.0/debian/patches/series --- shibboleth-resolver-1.0.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ shibboleth-resolver-1.0.0/debian/patches/series 2018-11-29 15:26:48.000000000 +0000 @@ -0,0 +1,3 @@ +use-pkg-config.patch +use-XMLSize_t.patch +add-null-request-parameter.patch diff -Nru shibboleth-resolver-1.0.0/debian/patches/use-pkg-config.patch shibboleth-resolver-1.0.0/debian/patches/use-pkg-config.patch --- shibboleth-resolver-1.0.0/debian/patches/use-pkg-config.patch 1970-01-01 00:00:00.000000000 +0000 +++ shibboleth-resolver-1.0.0/debian/patches/use-pkg-config.patch 2018-11-29 15:26:48.000000000 +0000 @@ -0,0 +1,101 @@ +Description: Edit configure.ac to use pkg-config instead of log4shib-config +Author: Peter Michael Green + +--- shibboleth-resolver-1.0.0.orig/configure.ac ++++ shibboleth-resolver-1.0.0/configure.ac +@@ -93,18 +93,18 @@ AC_COMPILE_IFELSE( + [AC_DEFINE([HAVE_NULLPTR],[1],[Define to 1 if C++ compiler supports nullptr keyword.])]) + + # log4shib settings (favor this version over the log4cpp code) +-AC_PATH_PROG(LOG4SHIB_CONFIG,log4shib-config) +-AC_ARG_WITH(log4shib, +- AS_HELP_STRING([--with-log4shib=PATH],[where log4shib-config is installed]), +- [ +- LOG4SHIB_CONFIG="${with_log4shib}" +- if ! test -f "${LOG4SHIB_CONFIG}" ; then +- LOG4SHIB_CONFIG="${with_log4shib}/bin/log4shib-config" +- fi +- ]) +-if test -f "${LOG4SHIB_CONFIG}"; then +- LIBS="`${LOG4SHIB_CONFIG} --libs` $LIBS" +- CPPFLAGS="`${LOG4SHIB_CONFIG} --cflags` $CPPFLAGS" ++#AC_PATH_PROG(LOG4SHIB_CONFIG,log4shib-config) ++#AC_ARG_WITH(log4shib, ++# AS_HELP_STRING([--with-log4shib=PATH],[where log4shib-config is installed]), ++# [ ++# LOG4SHIB_CONFIG="${with_log4shib}" ++# if ! test -f "${LOG4SHIB_CONFIG}" ; then ++# LOG4SHIB_CONFIG="${with_log4shib}/bin/log4shib-config" ++# fi ++# ]) ++#if test -f "${LOG4SHIB_CONFIG}"; then ++ LIBS="`pkg-config --libs log4shib` $LIBS" ++ CPPFLAGS="`pkg-config --cflags log4shib` $CPPFLAGS" + AC_CHECK_HEADER([log4shib/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4shib header files])) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include +@@ -112,35 +112,35 @@ if test -f "${LOG4SHIB_CONFIG}"; then + [[log4shib::Category::getInstance("foo").errorStream() << log4shib::eol]])], + [AC_DEFINE([SHIBRESOLVER_LOG4SHIB],[1],[Define to 1 if log4shib library is used.])], + [AC_MSG_ERROR([unable to link with log4shib])]) +-else +- AC_MSG_WARN([log4shib-config not found, may need to use --with-log4shib option]) +- AC_MSG_WARN([will look for original log4cpp library]) +- +- # log4cpp settings +- AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config) +- AC_ARG_WITH(log4cpp, +- AS_HELP_STRING([--with-log4cpp=PATH],[where log4cpp-config is installed]), +- [ +- LOG4CPP_CONFIG="${with_log4cpp}" +- if ! test -f "${LOG4CPP_CONFIG}" ; then +- LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config" +- fi +- ]) +- if test -f "${LOG4CPP_CONFIG}"; then +- AC_MSG_WARN([will try to use log4cpp, note that most non-Internet2 supplied versions are not thread-safe]) +- LIBS="`${LOG4CPP_CONFIG} --libs` $LIBS" +- CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS" +- AC_CHECK_HEADER([log4cpp/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files])) +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include +-#include ]], +- [[log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol]])], +- [AC_DEFINE([SHIBRESOLVER_LOG4CPP],[1],[Define to 1 if log4cpp library is used.])], +- [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])]) +- else +- AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option]) +- fi +-fi ++#else ++# AC_MSG_WARN([log4shib-config not found, may need to use --with-log4shib option]) ++# AC_MSG_WARN([will look for original log4cpp library]) ++# ++# # log4cpp settings ++# AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config) ++# AC_ARG_WITH(log4cpp, ++# AS_HELP_STRING([--with-log4cpp=PATH],[where log4cpp-config is installed]), ++# [ ++# LOG4CPP_CONFIG="${with_log4cpp}" ++# if ! test -f "${LOG4CPP_CONFIG}" ; then ++# LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config" ++# fi ++# ]) ++# if test -f "${LOG4CPP_CONFIG}"; then ++# AC_MSG_WARN([will try to use log4cpp, note that most non-Internet2 supplied versions are not thread-safe]) ++# LIBS="`${LOG4CPP_CONFIG} --libs` $LIBS" ++# CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS" ++# AC_CHECK_HEADER([log4cpp/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files])) ++# AC_LINK_IFELSE( ++# [AC_LANG_PROGRAM([[#include ++##include ]], ++# [[log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol]])], ++# [AC_DEFINE([SHIBRESOLVER_LOG4CPP],[1],[Define to 1 if log4cpp library is used.])], ++# [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])]) ++# else ++# AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option]) ++# fi ++#fi + + # Xerces settings + # Xerces settings diff -Nru shibboleth-resolver-1.0.0/debian/patches/use-XMLSize_t.patch shibboleth-resolver-1.0.0/debian/patches/use-XMLSize_t.patch --- shibboleth-resolver-1.0.0/debian/patches/use-XMLSize_t.patch 1970-01-01 00:00:00.000000000 +0000 +++ shibboleth-resolver-1.0.0/debian/patches/use-XMLSize_t.patch 2018-11-29 15:26:48.000000000 +0000 @@ -0,0 +1,23 @@ +Description: Replace xsecsize_t with XMLSize_t +Author: Peter Michael Green + +--- shibboleth-resolver-1.0.0.orig/src/shibresolver/resolver.cpp ++++ shibboleth-resolver-1.0.0/src/shibresolver/resolver.cpp +@@ -199,7 +199,7 @@ void ShibbolethResolver::addToken(gss_ct + gss_buffer_desc contextbuf = GSS_C_EMPTY_BUFFER; + OM_uint32 major = gss_export_sec_context(&minor, ctx, &contextbuf); + if (major == GSS_S_COMPLETE) { +- xsecsize_t len=0; ++ XMLSize_t len=0; + XMLByte* out=Base64::encode(reinterpret_cast(contextbuf.value), contextbuf.length, &len); + if (out) { + string s; +@@ -253,7 +253,7 @@ void ShibbolethResolver::addToken(const + m_gsswrapper = NULL; + } + +- xsecsize_t len=0; ++ XMLSize_t len=0; + XMLByte* out=Base64::encode(reinterpret_cast(contextbuf->value), contextbuf->length, &len); + if (out) { + string s; diff -Nru shibboleth-resolver-1.0.0/debian/rules shibboleth-resolver-1.0.0/debian/rules --- shibboleth-resolver-1.0.0/debian/rules 2014-08-29 04:03:21.000000000 +0000 +++ shibboleth-resolver-1.0.0/debian/rules 2018-11-29 15:26:39.000000000 +0000 @@ -10,7 +10,7 @@ #export DH_VERBOSE=1 %: - dh $@ + dh $@ --with autoreconf override_dh_auto_configure: dh_auto_configure -- --with-gssapi=/usr