[shibboleth-sp2] 09/17: New patch The-plugins-use-GSSAPI-only-if-the-naming-extensions.patch

[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 21b6b888db9fe8ee9426069ac19f8d5ceb3070bf
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Tue Jul 19 23:53:28 2016 +0200

    New patch The-plugins-use-GSSAPI-only-if-the-naming-extensions.patch
    
    The plugins use GSSAPI only if the naming extensions are available
---
 ...-use-GSSAPI-only-if-the-naming-extensions.patch | 78 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 79 insertions(+)

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
new file mode 100644
index 0000000..43374ef
--- /dev/null
+++ b/debian/patches/The-plugins-use-GSSAPI-only-if-the-naming-extensions.patch
@@ -0,0 +1,78 @@
+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/series b/debian/patches/series
index 204e191..d9d2bf5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ 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

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