[shibboleth-sp2] 04/04: Don't use pkg-config for GSSAPI
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 3 12:47:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
edm-guest pushed a commit to branch edm/debian/wheezy-backports-sloppy
in repository shibboleth-sp2.
commit 290e87d8d74ce316cfd929c4a017c6978d3eacd6
Author: Etienne Dysli Metref <etienne.dysli-metref at switch.ch>
Date: Thu Nov 3 11:34:29 2016 +0100
Don't use pkg-config for GSSAPI
libkrb5-dev and its dependencies in wheezy do not install pkg-config
files.
Deleted patches:
- The-plugins-use-GSSAPI-only-if-the-naming-extensions.patch
- Use-pkg-config-for-GSSAPI.patch
---
...-use-GSSAPI-only-if-the-naming-extensions.patch | 78 -----
debian/patches/Use-pkg-config-for-GSSAPI.patch | 386 ---------------------
debian/patches/series | 2 -
3 files changed, 466 deletions(-)
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
deleted file mode 100644
index 43374ef..0000000
--- a/debian/patches/The-plugins-use-GSSAPI-only-if-the-naming-extensions.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-Date: Tue, 19 Jul 2016 23:52:25 +0200
-Subject: The plugins use GSSAPI only if the naming extensions are available
-
----
- configure.ac | 1 +
- plugins/GSSAPIAttributeExtractor.cpp | 4 ----
- plugins/Makefile.am | 9 ++++++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c2d2c07..9234503 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -971,6 +971,7 @@ AS_IF([test "x$with_gssapi" != xno],
- #endif
- ]])
- ])
-+AM_CONDITIONAL([GSSAPI_NAMINGEXTS],[test "x$ac_cv_have_decl_gss_get_name_attribute" = xyes])
-
- AC_SUBST(WANT_SUBDIRS)
-
-diff --git a/plugins/GSSAPIAttributeExtractor.cpp b/plugins/GSSAPIAttributeExtractor.cpp
-index 1706baf..3c1ce9d 100644
---- a/plugins/GSSAPIAttributeExtractor.cpp
-+++ b/plugins/GSSAPIAttributeExtractor.cpp
-@@ -26,8 +26,6 @@
-
- #include "internal.h"
-
--#if HAVE_DECL_GSS_GET_NAME_ATTRIBUTE
--
- #include <shibsp/exceptions.h>
- #include <shibsp/Application.h>
- #include <shibsp/SPConfig.h>
-@@ -423,5 +421,3 @@ pair<bool,DOMElement*> GSSAPIExtractor::background_load()
-
- return make_pair(false,(DOMElement*)nullptr);
- }
--
--#endif
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index a5e9112..2a2fdcd 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -14,7 +14,6 @@ common_sources = \
- plugins_la_SOURCES = \
- ${common_sources} \
- CaseFoldingAttributeResolver.cpp \
-- GSSAPIAttributeExtractor.cpp \
- TemplateAttributeResolver.cpp \
- TransformAttributeResolver.cpp
-
-@@ -23,18 +22,22 @@ plugins_lite_la_SOURCES = \
-
- plugins_la_CPPFLAGS = \
- $(PTHREAD_CFLAGS) \
-- $(gss_CFLAGS) $(gnu_gss_CFLAGS) \
- $(opensaml_CFLAGS) \
- $(xerces_CFLAGS) \
- $(xmltooling_CFLAGS)
- plugins_la_LIBADD = \
- $(top_builddir)/shibsp/libshibsp.la \
- $(PTHREAD_LIBS) \
-- $(gss_LIBS) $(gnu_gss_LIBS) \
- $(opensaml_LIBS) \
- $(xerces_LIBS) \
- $(xmltooling_LIBS)
-
-+if GSSAPI_NAMINGEXTS
-+plugins_la_SOURCES += GSSAPIAttributeExtractor.cpp
-+plugins_la_CPPFLAGS += $(gss_CFLAGS) $(gnu_gss_CFLAGS)
-+plugins_la_LIBADD += $(gss_LIBS) $(gnu_gss_LIBS)
-+endif
-+
- plugins_lite_la_LIBADD = \
- $(top_builddir)/shibsp/libshibsp-lite.la \
- $(PTHREAD_LIBS) \
diff --git a/debian/patches/Use-pkg-config-for-GSSAPI.patch b/debian/patches/Use-pkg-config-for-GSSAPI.patch
deleted file mode 100644
index 62a355b..0000000
--- a/debian/patches/Use-pkg-config-for-GSSAPI.patch
+++ /dev/null
@@ -1,386 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-Date: Tue, 19 Jul 2016 16:54:35 +0200
-Subject: Use pkg-config for GSSAPI
-
----
- apache/Makefile.am | 6 ++
- configure.ac | 179 ++++-----------------------------
- plugins/GSSAPIAttributeExtractor.cpp | 4 +-
- plugins/Makefile.am | 2 +
- plugins/plugins.cpp | 4 +-
- shibsp/Makefile.am | 4 +
- shibsp/handler/impl/RemotedHandler.cpp | 6 +-
- 7 files changed, 36 insertions(+), 169 deletions(-)
-
-diff --git a/apache/Makefile.am b/apache/Makefile.am
-index 0ac36f7..e54ad86 100644
---- a/apache/Makefile.am
-+++ b/apache/Makefile.am
-@@ -27,11 +27,13 @@ mod_shib_20_la_LDFLAGS = -module -avoid-version
- mod_shib_20_la_CPPFLAGS = \
- $(BOOST_CPPFLAGS) \
- $(PTHREAD_CFLAGS) \
-+ $(gss_CFLAGS) $(gnu_gss_CFLAGS) \
- $(xerces_CFLAGS) \
- $(xmltooling_lite_CFLAGS)
- mod_shib_20_la_LIBADD = \
- $(top_builddir)/shibsp/libshibsp-lite.la \
- $(PTHREAD_LIBS) \
-+ $(gss_LIBS) $(gnu_gss_LIBS) \
- $(xerces_LIBS) \
- $(xmltooling_lite_LIBS)
- endif
-@@ -45,11 +47,13 @@ mod_shib_22_la_LDFLAGS = -module -avoid-version
- mod_shib_22_la_CPPFLAGS = \
- $(BOOST_CPPFLAGS) \
- $(PTHREAD_CFLAGS) \
-+ $(gss_CFLAGS) $(gnu_gss_CFLAGS) \
- $(xerces_CFLAGS) \
- $(xmltooling_lite_CFLAGS)
- mod_shib_22_la_LIBADD = \
- $(top_builddir)/shibsp/libshibsp-lite.la \
- $(PTHREAD_LIBS) \
-+ $(gss_LIBS) $(gnu_gss_LIBS) \
- $(xerces_LIBS) \
- $(xmltooling_lite_LIBS)
- endif
-@@ -63,11 +67,13 @@ mod_shib_24_la_LDFLAGS = -module -avoid-version
- mod_shib_24_la_CPPFLAGS = \
- $(BOOST_CPPFLAGS) \
- $(PTHREAD_CFLAGS) \
-+ $(gss_CFLAGS) $(gnu_gss_CFLAGS) \
- $(xerces_CFLAGS) \
- $(xmltooling_lite_CFLAGS)
- mod_shib_24_la_LIBADD = \
- $(top_builddir)/shibsp/libshibsp-lite.la \
- $(PTHREAD_LIBS) \
-+ $(gss_LIBS) $(gnu_gss_LIBS) \
- $(xerces_LIBS) \
- $(xmltooling_lite_LIBS)
- endif
-diff --git a/configure.ac b/configure.ac
-index 596e801..c2d2c07 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -947,139 +947,20 @@ if test "$have_odbc_libs" = yes ; then
- AC_SUBST(ODBC_LIBS)
- fi
-
--# GSS-API checking
--
--GSSAPI_ROOT="/usr"
--AC_ARG_WITH(gssapi-includes,
-- AS_HELP_STRING([--with-gssapi-includes=DIR],[Specify location of GSSAPI header]),
-- [ GSSAPI_INCS="-I$withval"
-- want_gss="yes" ]
--)
--
--AC_ARG_WITH(gssapi-libs,
-- AS_HELP_STRING([--with-gssapi-libs=DIR],[Specify location of GSSAPI libs]),
-- [ GSSAPI_LIB_DIR="-L$withval"
-- want_gss="yes" ]
--)
--
--AC_ARG_WITH(gssapi,
-- AS_HELP_STRING([--with-gssapi=DIR],[Where to look for GSSAPI]),
-- [ GSSAPI_ROOT="$withval"
-- if test x"$GSSAPI_ROOT" != xno; then
-- want_gss="yes"
-- if test x"$GSSAPI_ROOT" = xyes; then
-- dnl if yes, then use default root
-- GSSAPI_ROOT="/usr"
-- fi
-- fi
--])
--
--save_CPPFLAGS="$CPPFLAGS"
--AC_MSG_CHECKING([if GSSAPI support is requested])
--if test x"$want_gss" = xyes; then
-- AC_MSG_RESULT(yes)
--
-- if test -z "$GSSAPI_INCS"; then
-- if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
-- GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
-- elif test "$GSSAPI_ROOT" != "yes"; then
-- GSSAPI_INCS="-I$GSSAPI_ROOT/include"
-- fi
-- fi
--
-- CPPFLAGS="$CPPFLAGS $GSSAPI_INCS"
--
-- AC_CHECK_HEADER(gss.h,
-- [
-- dnl found in the given dirs
-- AC_DEFINE([SHIBSP_HAVE_GSSGNU],[1],[if you have the GNU gssapi libraries])
-- gnu_gss=yes
-- ],
-- [
-- dnl not found, check Heimdal or MIT
-- AC_CHECK_HEADERS([gssapi/gssapi.h], [], [not_mit=1])
-- AC_CHECK_HEADERS(
-- [gssapi/gssapi_generic.h gssapi/gssapi_krb5.h],
-- [],
-- [not_mit=1],
-- [
--AC_INCLUDES_DEFAULT
--#ifdef HAVE_GSSAPI_GSSAPI_H
--#include <gssapi/gssapi.h>
--#endif
-- ])
-- if test "x$not_mit" = "x1"; then
-- dnl MIT not found, check for Heimdal
-- AC_CHECK_HEADER([gssapi.h],
-- [
-- dnl found
-- AC_DEFINE([SHIBSP_HAVE_GSSHEIMDAL],[1],[if you have the Heimdal gssapi libraries])
-- ],
-- [
-- dnl no header found, disabling GSS
-- want_gss=no
-- AC_MSG_WARN([disabling GSSAPI since no header files was found])
-- ]
-- )
-- else
-- dnl MIT found
-- AC_DEFINE([SHIBSP_HAVE_GSSMIT],[1],[if you have the MIT gssapi libraries])
-- dnl check if we have a really old MIT kerberos (<= 1.2)
-- AC_MSG_CHECKING([if gssapi headers declare GSS_C_NT_HOSTBASED_SERVICE])
-- AC_COMPILE_IFELSE([
-- AC_LANG_PROGRAM([[
--#include <gssapi/gssapi.h>
--#include <gssapi/gssapi_generic.h>
--#include <gssapi/gssapi_krb5.h>
-- ]],[[
-- gss_import_name(
-- (OM_uint32 *)0,
-- (gss_buffer_t)0,
-- GSS_C_NT_HOSTBASED_SERVICE,
-- (gss_name_t *)0);
-- ]])
-- ],[
-- AC_MSG_RESULT([yes])
-- ],[
-- AC_MSG_RESULT([no])
-- AC_DEFINE([HAVE_OLD_GSSMIT],[1],[if you have an old MIT gssapi library, lacking GSS_C_NT_HOSTBASED_SERVICE])
-- ])
-- fi
-- ]
-- )
--else
-- AC_MSG_RESULT(no)
--fi
--if test x"$want_gss" = xyes; then
-- AC_DEFINE([SHIBSP_HAVE_GSSAPI],[1],[if you have the gssapi libraries])
--
-- if test -n "$gnu_gss"; then
-- LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
-- LIBS="$LIBS -lgss"
-- else
-- if test -z "$GSSAPI_LIB_DIR"; then
-- GSSAPI_LIB_DIR="$GSSAPI_ROOT/lib$libsuff"
-- fi
-- if test "$GSSAPI_ROOT" != "yes"; then
-- LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
-- fi
-- if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
-- dnl krb5-config doesn't have --libs-only-L or similar, put everything
-- dnl into LIBS
-- gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
-- else
-- if test "x$not_mit" = "x1"; then
-- gss_libs="-lgssapi"
-- else
-- gss_libs="-lgssapi_krb5"
-- fi
-- fi
-- LIBS="$LIBS $gss_libs"
-- fi
--
-- AC_MSG_CHECKING([whether GSS-API naming extensions are available])
-- AC_COMPILE_IFELSE(
-- [AC_LANG_PROGRAM([[
-+AC_ARG_WITH([gssapi],
-+ [AS_HELP_STRING([--with-gssapi],[include GSSAPI support])],,[with_gssapi=check])
-+AS_IF([test "x$with_gssapi" != xno],
-+ [AX_PKG_CHECK_MODULES([gss],,[krb5-gssapi],
-+ [PKG_CHECK_VAR([GSS_VENDOR],[krb5-gssapi],[vendor])
-+ AS_CASE(["$GSS_VENDOR"],
-+ [Heimdal],[AC_DEFINE([SHIBSP_HAVE_GSSHEIMDAL],[1],[if you have the Heimdal gssapi libraries])],
-+ [MIT],[AC_DEFINE([SHIBSP_HAVE_GSSMIT],[1],[if you have the MIT gssapi libraries])])],
-+ [AX_PKG_CHECK_MODULES([gnu_gss],,[gss],
-+ [AC_DEFINE([SHIBSP_HAVE_GSSGNU],[1],[if you have the GNU gssapi libraries])],,
-+ [SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])],
-+ [SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])
-+ AC_DEFINE([SHIBSP_HAVE_GSSAPI],[1],[if you have the gssapi libraries])
-+ AC_CHECK_DECLS([gss_get_name_attribute,GSS_C_NT_EXPORT_NAME_COMPOSITE],,,[[
- #ifdef SHIBSP_HAVE_GSSGNU
- # include <gss.h>
- #elif defined SHIBSP_HAVE_GSSMIT
-@@ -1087,35 +968,9 @@ if test x"$want_gss" = xyes; then
- # include <gssapi/gssapi_ext.h>
- #else
- # include <gssapi.h>
--#endif]],
-- [[gss_get_name_attribute(NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);]])],
-- [AC_MSG_RESULT([yes])AC_DEFINE([HAVE_GSSAPI_NAMINGEXTS],[1],[Define to 1 if GSS-API naming extensions are available.])],
-- [AC_MSG_RESULT([no])])
--
-- AC_MSG_CHECKING([whether GSS-API composite name import is available])
-- AC_COMPILE_IFELSE(
-- [AC_LANG_PROGRAM([[
--#ifdef SHIBSP_HAVE_GSSGNU
--# include <gss.h>
--#elif defined SHIBSP_HAVE_GSSMIT
--# include <gssapi/gssapi.h>
--# include <gssapi/gssapi_ext.h>
--#else
--# include <gssapi.h>
--#endif]],
-- [[
-- OM_uint32 minor;
-- gss_name_t srcname;
-- gss_buffer_desc importbuf;
-- gss_import_name(&minor, &importbuf, GSS_C_NT_EXPORT_NAME_COMPOSITE, &srcname);
-- ]])],
-- [AC_MSG_RESULT([yes])AC_DEFINE([HAVE_GSSAPI_COMPOSITE_NAME],[1],[Define to 1 if GSS-API composite name import is available.])],
-- [AC_MSG_RESULT([no])])
--
--else
-- CPPFLAGS="$save_CPPFLAGS"
--fi
--
-+#endif
-+]])
-+ ])
-
- AC_SUBST(WANT_SUBDIRS)
-
-diff --git a/plugins/GSSAPIAttributeExtractor.cpp b/plugins/GSSAPIAttributeExtractor.cpp
-index a405eae..1706baf 100644
---- a/plugins/GSSAPIAttributeExtractor.cpp
-+++ b/plugins/GSSAPIAttributeExtractor.cpp
-@@ -26,7 +26,7 @@
-
- #include "internal.h"
-
--#ifdef HAVE_GSSAPI_NAMINGEXTS
-+#if HAVE_DECL_GSS_GET_NAME_ATTRIBUTE
-
- #include <shibsp/exceptions.h>
- #include <shibsp/Application.h>
-@@ -354,7 +354,7 @@ void GSSAPIExtractor::extractAttributes(
- importbuf.length = x;
- importbuf.value = decoded;
- if (XMLString::equals(xmlObject.getElementQName().getLocalPart(), _GSSAPIName)) {
--#ifdef HAVE_GSSAPI_COMPOSITE_NAME
-+#if HAVE_DECL_GSS_C_NT_EXPORT_NAME_COMPOSITE
- major = gss_import_name(&minor, &importbuf, GSS_C_NT_EXPORT_NAME_COMPOSITE, &srcname);
- #else
- major = gss_import_name(&minor, &importbuf, GSS_C_NT_EXPORT_NAME, &srcname);
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 2ff4ab1..a5e9112 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -23,12 +23,14 @@ plugins_lite_la_SOURCES = \
-
- plugins_la_CPPFLAGS = \
- $(PTHREAD_CFLAGS) \
-+ $(gss_CFLAGS) $(gnu_gss_CFLAGS) \
- $(opensaml_CFLAGS) \
- $(xerces_CFLAGS) \
- $(xmltooling_CFLAGS)
- plugins_la_LIBADD = \
- $(top_builddir)/shibsp/libshibsp.la \
- $(PTHREAD_LIBS) \
-+ $(gss_LIBS) $(gnu_gss_LIBS) \
- $(opensaml_LIBS) \
- $(xerces_LIBS) \
- $(xmltooling_LIBS)
-diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
-index e212a3d..5235e4b 100644
---- a/plugins/plugins.cpp
-+++ b/plugins/plugins.cpp
-@@ -45,7 +45,7 @@ namespace shibsp {
- PluginManager< Handler,string,pair<const DOMElement*,const char*> >::Factory AttributeResolverHandlerFactory;
-
- #ifndef SHIBSP_LITE
--# ifdef HAVE_GSSAPI_NAMINGEXTS
-+# if HAVE_DECL_GSS_GET_NAME_ATTRIBUTE
- PluginManager<AttributeExtractor,string,const DOMElement*>::Factory GSSAPIExtractorFactory;
- # endif
- PluginManager<AttributeResolver,string,const DOMElement*>::Factory TemplateAttributeResolverFactory;
-@@ -61,7 +61,7 @@ extern "C" int PLUGINS_EXPORTS xmltooling_extension_init(void*)
- conf.AccessControlManager.registerFactory("Time", TimeAccessControlFactory);
- conf.HandlerManager.registerFactory("AttributeResolver", AttributeResolverHandlerFactory);
- #ifndef SHIBSP_LITE
--# ifdef HAVE_GSSAPI_NAMINGEXTS
-+# if HAVE_DECL_GSS_GET_NAME_ATTRIBUTE
- conf.AttributeExtractorManager.registerFactory("GSSAPI", GSSAPIExtractorFactory);
- 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
---- 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_CPPFLAGS = \
- $(PTHREAD_CFLAGS) \
-+ $(gss_CFLAGS) $(gnu_gss_CFLAGS) \
- $(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
- $(opensaml_CFLAGS) \
- $(xerces_CFLAGS) \
-@@ -246,6 +247,7 @@ libshibsp_la_CPPFLAGS = \
- libshibsp_la_LIBADD = \
- $(BOOST_CPPFLAGS) \
- $(PTHREAD_LIBS) \
-+ $(gss_LIBS) $(gnu_gss_LIBS) \
- $(log4shib_LIBS) $(log4cpp_LIBS) \
- $(opensaml_LIBS) \
- $(xerces_LIBS) \
-@@ -254,12 +256,14 @@ libshibsp_la_LIBADD = \
- libshibsp_lite_la_LDFLAGS = -version-info 7:0:0
- libshibsp_lite_la_LIBADD = \
- $(PTHREAD_LIBS) \
-+ $(gss_LIBS) $(gnu_gss_LIBS) \
- $(log4shib_LIBS) $(log4cpp_LIBS) \
- $(xerces_LIBS) \
- $(xmltooling_lite_LIBS)
- libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE \
- $(BOOST_CPPFLAGS) \
- $(PTHREAD_CFLAGS) \
-+ $(gss_CFLAGS) $(gnu_gss_CFLAGS) \
- $(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
- $(xerces_CFLAGS) \
- $(xmltooling_lite_CFLAGS)
-diff --git a/shibsp/handler/impl/RemotedHandler.cpp b/shibsp/handler/impl/RemotedHandler.cpp
-index 529682a..4d0fa18 100644
---- a/shibsp/handler/impl/RemotedHandler.cpp
-+++ b/shibsp/handler/impl/RemotedHandler.cpp
-@@ -45,7 +45,7 @@
- # include <xsec/framework/XSECProvider.hpp>
- #endif
-
--#ifdef HAVE_GSSAPI_NAMINGEXTS
-+#if HAVE_DECL_GSS_GET_NAME_ATTRIBUTE
- # ifdef SHIBSP_HAVE_GSSMIT
- # include <gssapi/gssapi_ext.h>
- # endif
-@@ -259,7 +259,7 @@ gss_name_t RemotedRequest::getGSSName() const
- importbuf.length = x;
- importbuf.value = decoded;
- OM_uint32 major,minor;
--#ifdef HAVE_GSSAPI_COMPOSITE_NAME
-+#if HAVE_DECL_GSS_C_NT_EXPORT_NAME_COMPOSITE
- major = gss_import_name(&minor, &importbuf, GSS_C_NT_EXPORT_NAME_COMPOSITE, &m_gssname);
- #else
- major = gss_import_name(&minor, &importbuf, GSS_C_NT_EXPORT_NAME, &m_gssname);
-@@ -443,7 +443,7 @@ DDF RemotedHandler::wrap(const SPRequest& request, const vector<string>* headers
- request.log(SPRequest::SPError, "error while exporting GSS context");
- }
- }
--#ifdef HAVE_GSSAPI_NAMINGEXTS
-+#if HAVE_DECL_GSS_GET_NAME_ATTRIBUTE
- else {
- gss_name_t name = gss->getGSSName();
- if (name != GSS_C_NO_NAME) {
diff --git a/debian/patches/series b/debian/patches/series
index 63c8cdd..bbae23f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,8 +18,6 @@ Use-pkg-config-for-Xerces.patch
Use-pkg-config-for-OpenSAML.patch
Use-pkg-config-for-xmlsec.patch
Remove-superfluous-xmlsec-linkages.patch
-Use-pkg-config-for-GSSAPI.patch
-The-plugins-use-GSSAPI-only-if-the-naming-extensions.patch
Enable-the-dot-feature-of-Doxygen.patch
Increase-the-timeouts-in-the-shibd-service-file.patch
Provide-PKG_INSTALLDIR-and-PKG_CHECK_VAR-macros-to-build-.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