[cpp-sp] 02/07: Imported Upstream version 2.5.2+dfsg
Scott Cantor
cantor.2 at osu.edu
Thu Dec 20 19:46:31 EST 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to annotated tag debian/2.5.2+dfsg-1
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=1554c253a6aae5af7a4a13aae06f858f4c01b32f
commit 1554c253a6aae5af7a4a13aae06f858f4c01b32f
Author: Russ Allbery <rra at debian.org>
AuthorDate: Tue Jun 18 11:13:41 2013 -0700
Imported Upstream version 2.5.2+dfsg
---
Makefile.am | 4 -
Makefile.in | 34 +-
Shibboleth.sln | 1 +
aclocal.m4 | 6 +-
adfs/Makefile.in | 2 +-
adfs/adfs-lite.vcxproj | 4 +-
adfs/adfs.rc | 12 +-
adfs/adfs.vcxproj | 4 +-
apache/Makefile.in | 2 +-
apache/mod_shib.cpp | 99 ++++-
apache/mod_shib13.vcxproj | 4 +-
apache/mod_shib20.vcxproj | 4 +-
apache/mod_shib22.vcxproj | 4 +-
apache/mod_shib24.vcxproj | 4 +-
apache/mod_shib_13.rc | 12 +-
apache/mod_shib_20.rc | 12 +-
apache/mod_shib_22.rc | 12 +-
apache/mod_shib_24.rc | 12 +-
build-aux/depcomp | 11 +-
config.h.in | 3 +
config_win32.h | 6 +-
configs/Makefile.in | 2 +-
configs/apache.config.in | 19 +-
configs/apache2.config.in | 9 +
configs/apache22.config.in | 9 +
configs/apache24.config.in | 18 +-
configs/metagen.sh | 18 +-
configure | 76 +++-
configure.ac | 34 +-
doc/Makefile.in | 2 +-
fastcgi/Makefile.am | 4 +-
fastcgi/Makefile.in | 6 +-
fastcgi/shibauthorizer.rc | 12 +-
fastcgi/shibauthorizer.vcxproj | 4 +-
fastcgi/shibresponder.rc | 12 +-
fastcgi/shibresponder.vcxproj | 4 +-
isapi_shib/isapi_shib.rc | 12 +-
isapi_shib/isapi_shib.vcproj | 400 ---------------------
isapi_shib/isapi_shib.vcxproj | 4 +-
memcache-store/Makefile.am | 7 +-
memcache-store/Makefile.in | 8 +-
memcache-store/memcache-store.rc | 12 +-
memcache-store/memcache-store.vcxproj | 6 +-
msbuild/Includes.props | 68 ----
msbuild/Versions.props | 106 ------
msbuild/build.make | 75 ----
nsapi_shib/Makefile.in | 2 +-
nsapi_shib/nsapi_shib.rc | 12 +-
nsapi_shib/nsapi_shib.vcxproj | 4 +-
odbc-store/Makefile.in | 2 +-
odbc-store/odbc-store.rc | 12 +-
odbc-store/odbc-store.vcxproj | 4 +-
plugins/Makefile.in | 2 +-
plugins/plugins.rc | 12 +-
plugins/plugins.vcxproj | 4 +-
schemas/Makefile.in | 2 +-
selinux/Makefile.in | 2 +-
shibboleth.spec | 10 +-
shibboleth.spec.in | 8 +-
shibd/Makefile.in | 2 +-
shibd/shibd.rc | 12 +-
shibd/shibd.vcxproj | 4 +-
shibsp/Makefile.am | 4 +-
shibsp/Makefile.in | 10 +-
.../resolver/impl/MetadataAttributeExtractor.cpp | 8 +-
shibsp/handler/impl/DiscoveryFeed.cpp | 6 +-
shibsp/handler/impl/SAML2LogoutInitiator.cpp | 2 +-
shibsp/remoting/impl/TCPListener.cpp | 37 +-
shibsp/remoting/impl/UnixListener.cpp | 20 +-
shibsp/shibsp-lite.vcxproj | 4 +-
shibsp/shibsp.rc | 12 +-
shibsp/shibsp.vcxproj | 4 +-
shibsp/version.h | 2 +-
util/Makefile.in | 2 +-
util/mdquery.rc | 12 +-
util/mdquery.vcxproj | 4 +-
util/resolvertest.rc | 12 +-
util/resolvertest.vcxproj | 4 +-
78 files changed, 506 insertions(+), 910 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c5ec833..4fb593f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,6 @@ include doxygen.am
MOSTLYCLEANFILES = $(DX_CLEANFILES)
-dist-hook:
- rm -rf `find $(distdir)/msbuild -name .svn`
-
WANT_SUBDIRS = @WANT_SUBDIRS@
SUBDIRS = $(WANT_SUBDIRS)
@@ -40,6 +37,5 @@ EXTRA_DIST = $(DX_CONFIG) \
isapi_shib \
Shibboleth.sln \
config_win32.h \
- msbuild \
$(GENFILES) \
$(GENFILES:%=%.in)
diff --git a/Makefile.in b/Makefile.in
index 5716bb3..10982dc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -402,7 +402,6 @@ EXTRA_DIST = $(DX_CONFIG) \
isapi_shib \
Shibboleth.sln \
config_win32.h \
- msbuild \
$(GENFILES) \
$(GENFILES:%=%.in)
@@ -665,9 +664,6 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
-test -n "$(am__skip_mode_fix)" \
|| find "$(distdir)" -type d ! -perm -755 \
-exec chmod u+rwx,go+rx {} \; -o \
@@ -906,19 +902,18 @@ uninstall-am:
all all-am all-local am--refresh check check-am clean \
clean-cscope clean-generic clean-libtool cscope cscopelist \
cscopelist-recursive ctags ctags-recursive dist dist-all \
- dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \
- dist-xz dist-zip distcheck distclean distclean-generic \
- distclean-hdr distclean-libtool distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-data install-data-am \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am
+ dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am
@DX_COND_doc_TRUE@@DX_COND_ps_TRUE at doxygen-ps: @DX_DOCDIR@/@PACKAGE_NAME at .ps
@@ -967,9 +962,6 @@ uninstall-am:
@DX_COND_doc_TRUE@ rm -rf @DX_DOCDIR@
@DX_COND_doc_TRUE@ $(DX_ENV) DX_INCLUDE=$(DX_INCLUDE) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
-dist-hook:
- rm -rf `find $(distdir)/msbuild -name .svn`
-
@DX_COND_doc_TRUE at all-local: doxygen-doc
@DX_COND_doc_FALSE at all-local:
diff --git a/Shibboleth.sln b/Shibboleth.sln
index f5d8be1..93a9db4 100644
--- a/Shibboleth.sln
+++ b/Shibboleth.sln
@@ -36,6 +36,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{2543BC
configs\accessError.html = configs\accessError.html
configs\apache.config.in = configs\apache.config.in
configs\apache2.config.in = configs\apache2.config.in
+ configs\apache22.config.in = configs\apache22.config.in
configs\apache24.config.in = configs\apache24.config.in
configs\attrChecker.html = configs\attrChecker.html
configs\attribute-map.xml = configs\attribute-map.xml
diff --git a/aclocal.m4 b/aclocal.m4
index 9941ea1..3ddbea1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.6 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/adfs/Makefile.in b/adfs/Makefile.in
index 9e34838..d2fa4b3 100644
--- a/adfs/Makefile.in
+++ b/adfs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/adfs/adfs-lite.vcxproj b/adfs/adfs-lite.vcxproj
index 97d893f..35761e6 100644
--- a/adfs/adfs-lite.vcxproj
+++ b/adfs/adfs-lite.vcxproj
@@ -59,8 +59,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/adfs/adfs.rc b/adfs/adfs.rc
index 092f1e2..cc00f87 100644
--- a/adfs/adfs.rc
+++ b/adfs/adfs.rc
@@ -54,8 +54,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -73,13 +73,13 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
#ifdef SHIBSP_LITE
VALUE "InternalName", "adfs-lite\0"
#else
VALUE "InternalName", "adfs\0"
#endif
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
#ifdef SHIBSP_LITE
VALUE "OriginalFilename", "adfs-lite.so\0"
@@ -87,8 +87,8 @@ BEGIN
VALUE "OriginalFilename", "adfs.so\0"
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/adfs/adfs.vcxproj b/adfs/adfs.vcxproj
index ad81ea6..e1bf9ff 100644
--- a/adfs/adfs.vcxproj
+++ b/adfs/adfs.vcxproj
@@ -59,8 +59,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
diff --git a/apache/Makefile.in b/apache/Makefile.in
index 4233a9d..d3b8a7a 100644
--- a/apache/Makefile.in
+++ b/apache/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/apache/mod_shib.cpp b/apache/mod_shib.cpp
index 3899db4..fe7d038 100644
--- a/apache/mod_shib.cpp
+++ b/apache/mod_shib.cpp
@@ -136,6 +136,7 @@ namespace {
struct shib_server_config
{
char* szScheme;
+ int bCompatValidUser;
};
// creates the per-server configuration
@@ -143,6 +144,7 @@ extern "C" void* create_shib_server_config(SH_AP_POOL* p, server_rec* s)
{
shib_server_config* sc=(shib_server_config*)ap_pcalloc(p,sizeof(shib_server_config));
sc->szScheme = nullptr;
+ sc->bCompatValidUser = -1;
return sc;
}
@@ -160,6 +162,8 @@ extern "C" void* merge_shib_server_config (SH_AP_POOL* p, void* base, void* sub)
else
sc->szScheme=nullptr;
+ sc->bCompatValidUser = ((child->bCompatValidUser==-1) ? parent->bCompatValidUser : child->bCompatValidUser);
+
return sc;
}
@@ -809,8 +813,9 @@ extern "C" int shib_handler(request_rec* r)
#else
shib_request_config* rc = (shib_request_config*)ap_get_module_config(r->request_config, &mod_shib);
if (!rc || !rc->sta) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "shib_handler found no per-request structure");
- return SERVER_ERROR;
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, SH_AP_R(r), "shib_handler found no per-request structure");
+ shib_post_read(r); // ensures objects are created if post_read hook didn't run
+ rc = (shib_request_config*)ap_get_module_config(r->request_config, &mod_shib);
}
ShibTargetApache* psta = rc->sta;
#endif
@@ -1290,9 +1295,16 @@ AccessControl::aclresult_t htAccessControl::authorized(const SPRequest& request,
request.log(SPRequest::SPDebug, "htaccess: accepting valid-user based on active session");
status = true;
}
+ else if (sta->m_dc->bCompatWith24 == 1 && !strcmp(w,"shib-session") && session) {
+ request.log(SPRequest::SPDebug, "htaccess: accepting shib-session based on active session");
+ status = true;
+ }
else if (!strcmp(w,"user") && !remote_user.empty()) {
status = (doUser(*sta, t) == shib_acl_true);
}
+ else if (sta->m_dc->bCompatWith24 == 1 && !strcmp(w,"shib-user") && !remote_user.empty()) {
+ status = (doUser(*sta, t) == shib_acl_true);
+ }
else if (!strcmp(w,"group") && !remote_user.empty()) {
status = (doGroup(*sta, t) == shib_acl_true);
}
@@ -1578,7 +1590,7 @@ extern "C" authz_status shib_shibboleth_check_authz(request_rec* r, const char*
return AUTHZ_GRANTED;
}
-extern "C" authz_status shib_validuser_check_authz(request_rec* r, const char* require_line, const void*)
+extern "C" authz_status shib_session_check_authz(request_rec* r, const char* require_line, const void*)
{
pair<ShibTargetApache*,authz_status> sta = shib_base_check_authz(r);
if (!sta.first)
@@ -1588,7 +1600,7 @@ extern "C" authz_status shib_validuser_check_authz(request_rec* r, const char* r
Session* session = sta.first->getSession(false, true, false);
Locker slocker(session, false);
if (session) {
- sta.first->log(SPRequest::SPDebug, "htaccess: accepting valid-user based on active session");
+ sta.first->log(SPRequest::SPDebug, "htaccess: accepting shib-session/valid-user based on active session");
return AUTHZ_GRANTED;
}
}
@@ -1596,13 +1608,36 @@ extern "C" authz_status shib_validuser_check_authz(request_rec* r, const char* r
sta.first->log(SPRequest::SPWarn, string("htaccess: unable to obtain session for access control check: ") + e.what());
}
+ sta.first->log(SPRequest::SPDebug, "htaccess: denying shib-access/valid-user rule, no active session");
return AUTHZ_DENIED_NO_USER;
}
-extern "C" authz_status shib_user_check_authz(request_rec* r, const char* require_line, const void*)
+extern "C" authz_status shib_validuser_check_authz(request_rec* r, const char* require_line, const void*)
{
- if (!r->user || !*(r->user))
+ // Shouldn't have actually ever hooked this, and now we're in conflict with mod_authz_user over the meaning.
+ // For now, added a command to restore "normal" semantics for valid-user so that combined deployments can
+ // use valid-user for non-Shibboleth cases and shib-session for the Shibboleth semantic.
+
+ // In future, we may want to expose the AuthType set to honor down at this level so we can differentiate
+ // based on AuthType. Unfortunately we allow overriding the AuthType to honor and we don't have access to
+ // that setting from the ServiceProvider class..
+
+ shib_server_config* sc = (shib_server_config*)ap_get_module_config(r->server->module_config, &mod_shib);
+ if (sc->bCompatValidUser != 1) {
+ return shib_session_check_authz(r, require_line, nullptr);
+ }
+
+ // Reproduce mod_authz_user version...
+
+ if (!r->user) {
return AUTHZ_DENIED_NO_USER;
+ }
+
+ return AUTHZ_GRANTED;
+}
+
+extern "C" authz_status shib_ext_user_check_authz(request_rec* r, const char* require_line, const void*)
+{
pair<ShibTargetApache*,authz_status> sta = shib_base_check_authz(r);
if (!sta.first)
return sta.second;
@@ -1613,6 +1648,43 @@ extern "C" authz_status shib_user_check_authz(request_rec* r, const char* requir
return AUTHZ_DENIED;
}
+extern "C" authz_status shib_user_check_authz(request_rec* r, const char* require_line, const void*)
+{
+ // Shouldn't have actually ever hooked this, and now we're in conflict with mod_authz_user over the meaning.
+ // For now, added a command to restore "normal" semantics for user rules so that combined deployments can
+ // use user for non-Shibboleth cases and shib-user for the Shibboleth semantic.
+
+ // In future, we may want to expose the AuthType set to honor down at this level so we can differentiate
+ // based on AuthType. Unfortunately we allow overriding the AuthType to honor and we don't have access to
+ // that setting from the ServiceProvider class..
+
+ shib_server_config* sc = (shib_server_config*)ap_get_module_config(r->server->module_config, &mod_shib);
+ if (sc->bCompatValidUser != 1) {
+ return shib_ext_user_check_authz(r, require_line, nullptr);
+ }
+
+ // Reproduce mod_authz_user version...
+
+ if (!r->user) {
+ return AUTHZ_DENIED_NO_USER;
+ }
+
+ const char* t = require_line;
+ const char *w;
+ while ((w = ap_getword_conf(r->pool, &t)) && w[0]) {
+ if (!strcmp(r->user, w)) {
+ return AUTHZ_GRANTED;
+ }
+ }
+
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01663)
+ "access to %s failed, reason: user '%s' does not meet "
+ "'require'ments for user to be allowed access",
+ r->uri, r->user);
+
+ return AUTHZ_DENIED;
+}
+
extern "C" authz_status shib_acclass_check_authz(request_rec* r, const char* require_line, const void*)
{
pair<ShibTargetApache*,authz_status> sta = shib_base_check_authz(r);
@@ -1724,6 +1796,14 @@ extern "C" const char* shib_set_server_string_slot(cmd_parms* parms, void*, cons
return nullptr;
}
+extern "C" const char* shib_set_server_flag_slot(cmd_parms* parms, void*, int arg)
+{
+ char* base=(char*)ap_get_module_config(parms->server->module_config,&mod_shib);
+ size_t offset=(size_t)parms->info;
+ *((int*)(base + offset)) = arg;
+ return nullptr;
+}
+
extern "C" const char* shib_ap_set_file_slot(cmd_parms* parms,
#ifdef SHIB_APACHE_13
char* arg1, char* arg2
@@ -2077,7 +2157,9 @@ module MODULE_VAR_EXPORT mod_shib = {
#ifdef SHIB_APACHE_24
extern "C" const authz_provider shib_authz_shibboleth_provider = { &shib_shibboleth_check_authz, nullptr };
extern "C" const authz_provider shib_authz_validuser_provider = { &shib_validuser_check_authz, nullptr };
+extern "C" const authz_provider shib_authz_session_provider = { &shib_session_check_authz, nullptr };
extern "C" const authz_provider shib_authz_user_provider = { &shib_user_check_authz, nullptr };
+extern "C" const authz_provider shib_authz_ext_user_provider = { &shib_ext_user_check_authz, nullptr };
extern "C" const authz_provider shib_authz_acclass_provider = { &shib_acclass_check_authz, nullptr };
extern "C" const authz_provider shib_authz_acdecl_provider = { &shib_acdecl_check_authz, nullptr };
extern "C" const authz_provider shib_authz_attr_provider = { &shib_attr_check_authz, nullptr };
@@ -2121,7 +2203,9 @@ extern "C" void shib_register_hooks (apr_pool_t *p)
#ifdef SHIB_APACHE_24
ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "shibboleth", AUTHZ_PROVIDER_VERSION, &shib_authz_shibboleth_provider, AP_AUTH_INTERNAL_PER_CONF);
ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "valid-user", AUTHZ_PROVIDER_VERSION, &shib_authz_validuser_provider, AP_AUTH_INTERNAL_PER_CONF);
+ ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "shib-session", AUTHZ_PROVIDER_VERSION, &shib_authz_session_provider, AP_AUTH_INTERNAL_PER_CONF);
ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "user", AUTHZ_PROVIDER_VERSION, &shib_authz_user_provider, AP_AUTH_INTERNAL_PER_CONF);
+ ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "shib-user", AUTHZ_PROVIDER_VERSION, &shib_authz_ext_user_provider, AP_AUTH_INTERNAL_PER_CONF);
ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "authnContextClassRef", AUTHZ_PROVIDER_VERSION, &shib_authz_acclass_provider, AP_AUTH_INTERNAL_PER_CONF);
ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "authnContextDeclRef", AUTHZ_PROVIDER_VERSION, &shib_authz_acdecl_provider, AP_AUTH_INTERNAL_PER_CONF);
ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "shib-attr", AUTHZ_PROVIDER_VERSION, &shib_authz_attr_provider, AP_AUTH_INTERNAL_PER_CONF);
@@ -2174,6 +2258,9 @@ static command_rec shib_cmds[] = {
AP_INIT_FLAG("ShibRequestMapperAuthz", (config_fn_t)ap_set_flag_slot,
(void *) offsetof (shib_dir_config, bRequestMapperAuthz),
OR_AUTHCFG, "Support access control via shibboleth2.xml / RequestMapper"),
+ AP_INIT_FLAG("ShibCompatValidUser", (config_fn_t)shib_set_server_flag_slot,
+ (void *) offsetof (shib_server_config, bCompatValidUser),
+ RSRC_CONF, "Handle 'require valid-user' in mod_authz_user-compatible fashion (requiring username)"),
#else
AP_INIT_TAKE1("AuthGroupFile", (config_fn_t)shib_ap_set_file_slot,
(void *) offsetof (shib_dir_config, szAuthGrpFile),
diff --git a/apache/mod_shib13.vcxproj b/apache/mod_shib13.vcxproj
index f1a7f12..ad24e13 100644
--- a/apache/mod_shib13.vcxproj
+++ b/apache/mod_shib13.vcxproj
@@ -62,8 +62,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
diff --git a/apache/mod_shib20.vcxproj b/apache/mod_shib20.vcxproj
index f91fb91..086ad18 100644
--- a/apache/mod_shib20.vcxproj
+++ b/apache/mod_shib20.vcxproj
@@ -62,8 +62,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/apache/mod_shib22.vcxproj b/apache/mod_shib22.vcxproj
index daffc2d..76957fb 100644
--- a/apache/mod_shib22.vcxproj
+++ b/apache/mod_shib22.vcxproj
@@ -62,8 +62,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/apache/mod_shib24.vcxproj b/apache/mod_shib24.vcxproj
index e2222cd..4b05521 100644
--- a/apache/mod_shib24.vcxproj
+++ b/apache/mod_shib24.vcxproj
@@ -62,8 +62,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/apache/mod_shib_13.rc b/apache/mod_shib_13.rc
index 8704a9d..891641d 100644
--- a/apache/mod_shib_13.rc
+++ b/apache/mod_shib_13.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "mod_shib_13\0"
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_13.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc
index 59f3b12..2f30784 100644
--- a/apache/mod_shib_20.rc
+++ b/apache/mod_shib_20.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "mod_shib_20\0"
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_20.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc
index 75cdad6..fdf7150 100644
--- a/apache/mod_shib_22.rc
+++ b/apache/mod_shib_22.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "mod_shib_22\0"
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_22.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/apache/mod_shib_24.rc b/apache/mod_shib_24.rc
index 5d99af0..c296ceb 100644
--- a/apache/mod_shib_24.rc
+++ b/apache/mod_shib_24.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth Apache 2.4 Module\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "mod_shib_24\0"
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_24.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/build-aux/depcomp b/build-aux/depcomp
index 0544c68..e1f51f4 100755
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
@@ -74,6 +74,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
@@ -108,7 +111,7 @@ if test "$depmode" = msvc7msys; then
fi
if test "$depmode" = xlc; then
- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
gccflag=-qmakedep=gcc,-MF
depmode=gcc
fi
@@ -142,13 +145,17 @@ gcc3)
;;
gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
+## -MM, not -M (despite what the docs say). Also, it might not be
+## supported by the other compilers which use the 'gcc' depmode.
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
diff --git a/config.h.in b/config.h.in
index 06dfe86..dc5bb81 100644
--- a/config.h.in
+++ b/config.h.in
@@ -89,6 +89,9 @@
/* Define to 1 if you have the <pwd.h> header file. */
#undef HAVE_PWD_H
+/* Define if the SOCK_CLOEXEC flag is supported */
+#undef HAVE_SOCK_CLOEXEC
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
diff --git a/config_win32.h b/config_win32.h
index 1cb39c1..2741a03 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -135,13 +135,13 @@
#define PACKAGE_NAME "shibboleth"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth 2.5.1"
+#define PACKAGE_STRING "shibboleth 2.5.2"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "shibboleth-sp"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.1"
+#define PACKAGE_VERSION "2.5.2"
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
@@ -154,7 +154,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "2.5.1"
+#define VERSION "2.5.2"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
diff --git a/configs/Makefile.in b/configs/Makefile.in
index 0ad9fd3..d8d3ebe 100644
--- a/configs/Makefile.in
+++ b/configs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/configs/apache.config.in b/configs/apache.config.in
index 54d64b6..ba46f6b 100644
--- a/configs/apache.config.in
+++ b/configs/apache.config.in
@@ -18,21 +18,26 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_13.so
# extension.
#
<Files *.sso>
-SetHandler shib-handler
+ SetHandler shib-handler
</Files>
-# Another way of addressing this is to apply Shibboleth
-# globally to the site in "lazy" session mode:
-# <Location />
-# AuthType shibboleth
-# require shibboleth
-# </Location>
+#
+# Ensures handler will be accessible.
+#
+<Location /Shibboleth.sso>
+ Satisfy Any
+ Allow from all
+</Location>
#
# Used for example style sheet in error templates.
#
<IfModule mod_alias.c>
Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
+ <Location /shibboleth-sp>
+ Satisfy Any
+ Allow from all
+ </Location>
</IfModule>
#
diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index 4232d86..e735d20 100644
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -13,10 +13,19 @@
LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_20.so
#
+# Ensures handler will be accessible.
+#
+<Location /Shibboleth.sso>
+ Satisfy Any
+ Allow from all
+</Location>
+
+#
# Used for example style sheet in error templates.
#
<IfModule mod_alias.c>
<Location /shibboleth-sp>
+ Satisfy Any
Allow from all
</Location>
Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
diff --git a/configs/apache22.config.in b/configs/apache22.config.in
index bdb7414ff..202cebb 100644
--- a/configs/apache22.config.in
+++ b/configs/apache22.config.in
@@ -13,10 +13,19 @@
LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_22.so
#
+# Ensures handler will be accessible.
+#
+<Location /Shibboleth.sso>
+ Satisfy Any
+ Allow from all
+</Location>
+
+#
# Used for example style sheet in error templates.
#
<IfModule mod_alias.c>
<Location /shibboleth-sp>
+ Satisfy Any
Allow from all
</Location>
Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
diff --git a/configs/apache24.config.in b/configs/apache24.config.in
index 2d1a2c2..f1a2122 100644
--- a/configs/apache24.config.in
+++ b/configs/apache24.config.in
@@ -13,11 +13,27 @@
LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_24.so
#
+# Turn this on to support "require valid-user" rules from other
+# mod_authn_* modules, and use "require shib-session" for anonymous
+# session-based authorization in mod_shib.
+#
+ShibCompatValidUser Off
+
+#
+# Ensures handler will be accessible.
+#
+<Location /Shibboleth.sso>
+ AuthType None
+ Require all granted
+</Location>
+
+#
# Used for example style sheet in error templates.
#
<IfModule mod_alias.c>
<Location /shibboleth-sp>
- Allow from all
+ AuthType None
+ Require all granted
</Location>
Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
</IfModule>
diff --git a/configs/metagen.sh b/configs/metagen.sh
index 1761035..d616b1f 100755
--- a/configs/metagen.sh
+++ b/configs/metagen.sh
@@ -74,14 +74,16 @@ if [ -z $ENTITYID ] ; then
fi
fi
-if [ -s $HOSTLIST ] ; then
- while read h
- do
- HOSTS[${#HOSTS[@]}]=$h
- done <$HOSTLIST
-else
- echo File with list of hostnames $l does not exist!
- exit 2
+if [ ! -z $HOSTLIST ] ; then
+ if [ -s $HOSTLIST ] ; then
+ while read h
+ do
+ HOSTS[${#HOSTS[@]}]=$h
+ done <$HOSTLIST
+ else
+ echo File with list of hostnames $l does not exist!
+ exit 2
+ fi
fi
# Establish protocols and bindings.
diff --git a/configure b/configure
index b79a630..1491d72 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for shibboleth 2.5.1.
+# Generated by GNU Autoconf 2.69 for shibboleth 2.5.2.
#
# Report bugs to <https://issues.shibboleth.net/>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='shibboleth'
PACKAGE_TARNAME='shibboleth-sp'
-PACKAGE_VERSION='2.5.1'
-PACKAGE_STRING='shibboleth 2.5.1'
+PACKAGE_VERSION='2.5.2'
+PACKAGE_STRING='shibboleth 2.5.2'
PACKAGE_BUGREPORT='https://issues.shibboleth.net/'
PACKAGE_URL=''
@@ -1460,7 +1460,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures shibboleth 2.5.1 to adapt to many kinds of systems.
+\`configure' configures shibboleth 2.5.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1530,7 +1530,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of shibboleth 2.5.1:";;
+ short | recursive ) echo "Configuration of shibboleth 2.5.2:";;
esac
cat <<\_ACEOF
@@ -1681,7 +1681,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-shibboleth configure 2.5.1
+shibboleth configure 2.5.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2496,7 +2496,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by shibboleth $as_me 2.5.1, which was
+It was created by shibboleth $as_me 2.5.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3322,7 +3322,7 @@ fi
# Define the identity of the package.
PACKAGE='shibboleth-sp'
- VERSION='2.5.1'
+ VERSION='2.5.2'
cat >>confdefs.h <<_ACEOF
@@ -18315,6 +18315,42 @@ _ACEOF
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOCK_CLOEXEC support" >&5
+$as_echo_n "checking for SOCK_CLOEXEC support... " >&6; }
+if ${shib_cv_sock_cloexec+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ shib_cv_sock_cloexec=no
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+int main()
+{
+return socket(AF_INET, SOCK_STREAM|SOCK_CLOEXEC, 0) == -1;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ shib_cv_sock_cloexec=yes
+else
+ shib_cv_sock_cloexec=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $shib_cv_sock_cloexec" >&5
+$as_echo "$shib_cv_sock_cloexec" >&6; }
+
+if test "$shib_cv_sock_cloexec" = "yes"; then
+
+$as_echo "#define HAVE_SOCK_CLOEXEC 1" >>confdefs.h
+
+fi
# checks for pthreads
@@ -19788,7 +19824,7 @@ else
with_saml=/usr
fi
-if test x_$with_xmltooling != x_/usr; then
+if test x_$with_saml != x_/usr; then
CPPFLAGS="-I${with_saml}/include $CPPFLAGS"
DX_INCLUDE="$DX_INCLUDE ${with_saml}/include"
XMLSEC_LIBS="-L${with_saml}/lib -lsaml $XMLSEC_LIBS"
@@ -19994,12 +20030,18 @@ fi
$as_echo "$WANT_FASTCGI" >&6; }
if test "$WANT_FASTCGI" != "no"; then
+
if test "$WANT_FASTCGI" != "yes"; then
if test x_$WANT_FASTCGI != x_/usr; then
FASTCGI_INCLUDE="-I$WANT_FASTCGI/include"
FASTCGI_LDFLAGS="-L$WANT_FASTCGI/lib"
fi
fi
+
+ # save and append master flags
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$FASTCGI_INCLUDE $CPPFLAGS"
+
ac_fn_cxx_check_header_mongrel "$LINENO" "fcgio.h" "ac_cv_header_fcgio_h" "$ac_includes_default"
if test "x$ac_cv_header_fcgio_h" = xyes; then :
@@ -20009,6 +20051,9 @@ fi
FASTCGI_LIBS="-lfcgi -lfcgi++"
+
+ # restore standard flags
+ CPPFLAGS="$save_CPPFLAGS"
fi
@@ -20048,12 +20093,18 @@ fi
$as_echo "$WANT_MEMCACHED" >&6; }
if test "$WANT_MEMCACHED" != "no"; then
+
if test "$WANT_MEMCACHED" != "yes"; then
if test x_$WANT_MEMCACHED != x_/usr; then
MEMCACHED_INCLUDE="-I$WANT_MEMCACHED/include"
MEMCACHED_LDFLAGS="-L$WANT_MEMCACHED/lib"
fi
fi
+
+ # save and append master flags
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$MEMCACHED_INCLUDE $CPPFLAGS"
+
ac_fn_cxx_check_header_mongrel "$LINENO" "libmemcached/memcached.h" "ac_cv_header_libmemcached_memcached_h" "$ac_includes_default"
if test "x$ac_cv_header_libmemcached_memcached_h" = xyes; then :
@@ -20071,6 +20122,9 @@ $as_echo "#define HAVE_MEMCACHED_LAST_ERROR_MESSAGE 1" >>confdefs.h
fi
MEMCACHED_LIBS="-lmemcached"
+
+ # restore standard flags
+ CPPFLAGS="$save_CPPFLAGS"
fi
@@ -22432,7 +22486,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by shibboleth $as_me 2.5.1, which was
+This file was extended by shibboleth $as_me 2.5.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22498,7 +22552,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-shibboleth config.status 2.5.1
+shibboleth config.status 2.5.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 21895ef..fbc4a8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.50])
-AC_INIT([shibboleth],[2.5.1],[https://issues.shibboleth.net/],[shibboleth-sp])
+AC_INIT([shibboleth],[2.5.2],[https://issues.shibboleth.net/],[shibboleth-sp])
AC_CONFIG_SRCDIR(shibsp)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
@@ -81,6 +81,18 @@ AC_CHECK_FUNCS([strchr strdup strstr timegm gmtime_r localtime_r strtok_r strcas
AC_CHECK_TYPES([struct sockaddr_storage], [], [], [[#include <sys/socket.h>]])
AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [[#include <sys/socket.h>]])
+AC_CACHE_CHECK([for SOCK_CLOEXEC support], [shib_cv_sock_cloexec],
+[AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/socket.h>
+int main()
+{
+return socket(AF_INET, SOCK_STREAM|SOCK_CLOEXEC, 0) == -1;
+}], [shib_cv_sock_cloexec=yes], [shib_cv_sock_cloexec=no], [shib_cv_sock_cloexec=no])])
+
+if test "$shib_cv_sock_cloexec" = "yes"; then
+ AC_DEFINE([HAVE_SOCK_CLOEXEC], 1, [Define if the SOCK_CLOEXEC flag is supported])
+fi
# checks for pthreads
ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"])
@@ -346,7 +358,7 @@ AC_SUBST(XMLTOOLINGXMLDIR)
AC_ARG_WITH(saml,
AS_HELP_STRING([--with-saml=PATH],[where opensaml is installed]),,
[with_saml=/usr])
-if test x_$with_xmltooling != x_/usr; then
+if test x_$with_saml != x_/usr; then
CPPFLAGS="-I${with_saml}/include $CPPFLAGS"
DX_INCLUDE="$DX_INCLUDE ${with_saml}/include"
XMLSEC_LIBS="-L${with_saml}/lib -lsaml $XMLSEC_LIBS"
@@ -473,14 +485,23 @@ AC_ARG_WITH(fastcgi,
AC_MSG_RESULT($WANT_FASTCGI)
if test "$WANT_FASTCGI" != "no"; then
+
if test "$WANT_FASTCGI" != "yes"; then
if test x_$WANT_FASTCGI != x_/usr; then
FASTCGI_INCLUDE="-I$WANT_FASTCGI/include"
FASTCGI_LDFLAGS="-L$WANT_FASTCGI/lib"
fi
fi
+
+ # save and append master flags
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$FASTCGI_INCLUDE $CPPFLAGS"
+
AC_CHECK_HEADER([fcgio.h],,AC_MSG_ERROR([unable to find FastCGI header files]))
FASTCGI_LIBS="-lfcgi -lfcgi++"
+
+ # restore standard flags
+ CPPFLAGS="$save_CPPFLAGS"
fi
AC_SUBST(FASTCGI_INCLUDE)
@@ -505,18 +526,27 @@ AC_ARG_WITH(memcached,
AC_MSG_RESULT($WANT_MEMCACHED)
if test "$WANT_MEMCACHED" != "no"; then
+
if test "$WANT_MEMCACHED" != "yes"; then
if test x_$WANT_MEMCACHED != x_/usr; then
MEMCACHED_INCLUDE="-I$WANT_MEMCACHED/include"
MEMCACHED_LDFLAGS="-L$WANT_MEMCACHED/lib"
fi
fi
+
+ # save and append master flags
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$MEMCACHED_INCLUDE $CPPFLAGS"
+
AC_CHECK_HEADER([libmemcached/memcached.h],,
AC_MSG_ERROR([unable to find Memcached header files]))
AC_CHECK_DECL([memcached_last_error_message],
[AC_DEFINE([HAVE_MEMCACHED_LAST_ERROR_MESSAGE],[1],[Define to 1 if libmemcached supports error handling function.])],,
[#include <libmemcached/memcached.h>])
MEMCACHED_LIBS="-lmemcached"
+
+ # restore standard flags
+ CPPFLAGS="$save_CPPFLAGS"
fi
AC_SUBST(MEMCACHED_INCLUDE)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b7ec982..3d298e4 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/fastcgi/Makefile.am b/fastcgi/Makefile.am
index a1df92e..7c7baa3 100644
--- a/fastcgi/Makefile.am
+++ b/fastcgi/Makefile.am
@@ -7,13 +7,13 @@ fastcgidir = $(libdir)/@PACKAGE_NAME@
fastcgi_PROGRAMS = shibauthorizer shibresponder
shibauthorizer_SOURCES = shibauthorizer.cpp
-shibauthorizer_CXXFLAGS = -I$(FASTCGI_INCLUDE)
+shibauthorizer_CXXFLAGS = $(FASTCGI_INCLUDE)
shibauthorizer_LDFLAGS = $(FASTCGI_LDFLAGS)
shibauthorizer_LDADD = $(FASTCGI_LIBS) \
$(top_builddir)/shibsp/libshibsp-lite.la
shibresponder_SOURCES = shibresponder.cpp
-shibresponder_CXXFLAGS = -I$(FASTCGI_INCLUDE)
+shibresponder_CXXFLAGS = $(FASTCGI_INCLUDE)
shibresponder_LDFLAGS = $(FASTCGI_LDFLAGS)
shibresponder_LDADD = $(FASTCGI_LIBS) \
$(top_builddir)/shibsp/libshibsp-lite.la
diff --git a/fastcgi/Makefile.in b/fastcgi/Makefile.in
index e3fcf67..bc71933 100644
--- a/fastcgi/Makefile.in
+++ b/fastcgi/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -304,13 +304,13 @@ xs = @xs@
AUTOMAKE_OPTIONS = foreign
@BUILD_FASTCGI_TRUE at fastcgidir = $(libdir)/@PACKAGE_NAME@
@BUILD_FASTCGI_TRUE at shibauthorizer_SOURCES = shibauthorizer.cpp
- at BUILD_FASTCGI_TRUE@shibauthorizer_CXXFLAGS = -I$(FASTCGI_INCLUDE)
+ at BUILD_FASTCGI_TRUE@shibauthorizer_CXXFLAGS = $(FASTCGI_INCLUDE)
@BUILD_FASTCGI_TRUE at shibauthorizer_LDFLAGS = $(FASTCGI_LDFLAGS)
@BUILD_FASTCGI_TRUE at shibauthorizer_LDADD = $(FASTCGI_LIBS) \
@BUILD_FASTCGI_TRUE@ $(top_builddir)/shibsp/libshibsp-lite.la
@BUILD_FASTCGI_TRUE at shibresponder_SOURCES = shibresponder.cpp
- at BUILD_FASTCGI_TRUE@shibresponder_CXXFLAGS = -I$(FASTCGI_INCLUDE)
+ at BUILD_FASTCGI_TRUE@shibresponder_CXXFLAGS = $(FASTCGI_INCLUDE)
@BUILD_FASTCGI_TRUE at shibresponder_LDFLAGS = $(FASTCGI_LDFLAGS)
@BUILD_FASTCGI_TRUE at shibresponder_LDADD = $(FASTCGI_LIBS) \
@BUILD_FASTCGI_TRUE@ $(top_builddir)/shibsp/libshibsp-lite.la
diff --git a/fastcgi/shibauthorizer.rc b/fastcgi/shibauthorizer.rc
index 0134f31..da6fa24 100644
--- a/fastcgi/shibauthorizer.rc
+++ b/fastcgi/shibauthorizer.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "shibauthorizer\0"
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shibauthorizer.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/fastcgi/shibauthorizer.vcxproj b/fastcgi/shibauthorizer.vcxproj
index d366656..8c60dc3 100644
--- a/fastcgi/shibauthorizer.vcxproj
+++ b/fastcgi/shibauthorizer.vcxproj
@@ -61,8 +61,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/fastcgi/shibresponder.rc b/fastcgi/shibresponder.rc
index 8bd6e2c..e34d65f 100644
--- a/fastcgi/shibresponder.rc
+++ b/fastcgi/shibresponder.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth FastCGI Responder\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "shibresponder\0"
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shibresponder.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/fastcgi/shibresponder.vcxproj b/fastcgi/shibresponder.vcxproj
index a586f24..a16f10b 100644
--- a/fastcgi/shibresponder.vcxproj
+++ b/fastcgi/shibresponder.vcxproj
@@ -62,8 +62,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/isapi_shib/isapi_shib.rc b/isapi_shib/isapi_shib.rc
index e2b2035..a88c168 100644
--- a/isapi_shib/isapi_shib.rc
+++ b/isapi_shib/isapi_shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "isapi_shib\0"
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "isapi_shib.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/isapi_shib/isapi_shib.vcproj b/isapi_shib/isapi_shib.vcproj
deleted file mode 100644
index f82279a..0000000
--- a/isapi_shib/isapi_shib.vcproj
+++ /dev/null
@@ -1,400 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="isapi_shib"
- ProjectGUID="{87C25D4E-8D19-4513-B0BA-BC668BC2DEE3}"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Release/isapi_shib.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".;..;"..\..\cpp-xmltooling""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0400"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc"
- AdditionalDependencies="xerces-c_3.lib xmltooling-lite1.lib"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""..\..\cpp-xmltooling\$(ConfigurationName)""
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="3"
- TypeLibraryName=".\Release/isapi_shib.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".;..;"..\..\cpp-xmltooling""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0400"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc"
- AdditionalDependencies="xerces-c_3.lib xmltooling-lite1.lib"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)""
- ProgramDatabaseFile=".\Release/isapi_shib.pdb"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/isapi_shib.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;..;"..\..\cpp-xmltooling""
- PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0400"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc"
- AdditionalDependencies="xerces-c_3D.lib xmltooling-lite1D.lib"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""..\..\cpp-xmltooling\$(ConfigurationName)""
- GenerateDebugInformation="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="3"
- TypeLibraryName=".\Debug/isapi_shib.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;..;"..\..\cpp-xmltooling""
- PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0400"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc"
- AdditionalDependencies="xerces-c_3D.lib xmltooling-lite1D.lib"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)""
- GenerateDebugInformation="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="isapi_shib.cpp"
- >
- </File>
- <File
- RelativePath="isapi_shib.rc"
- >
- </File>
- <File
- RelativePath="resource.h"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/isapi_shib/isapi_shib.vcxproj b/isapi_shib/isapi_shib.vcxproj
index 2a856fb..b1c52e6 100644
--- a/isapi_shib/isapi_shib.vcxproj
+++ b/isapi_shib/isapi_shib.vcxproj
@@ -59,8 +59,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
diff --git a/memcache-store/Makefile.am b/memcache-store/Makefile.am
index 7928576..9c4cd67 100644
--- a/memcache-store/Makefile.am
+++ b/memcache-store/Makefile.am
@@ -3,16 +3,15 @@ AUTOMAKE_OPTIONS = foreign
plugindir = $(libdir)/@PACKAGE_NAME@
plugin_LTLIBRARIES = memcache-store.la
-AM_CFLAGS = $(MEMCACHED_CFLAGS)
-AM_CXXFLAGS = $(MEMCACHED_CFLAGS)
+AM_CFLAGS = $(MEMCACHED_INCLUDE)
+AM_CXXFLAGS = $(MEMCACHED_INCLUDE)
+memcache_store_la_LDFLAGS = $(MEMCACHED_LDFLAGS) -module -avoid-version
memcache_store_la_LIBADD = $(XMLSEC_LIBS) $(MEMCACHED_LIBS)
memcache_store_la_SOURCES = \
memcache-store.cpp
-memcache_store_la_LDFLAGS = -module -avoid-version
-
install-data-hook:
for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
diff --git a/memcache-store/Makefile.in b/memcache-store/Makefile.in
index 22e2a8e..c9c70e2 100644
--- a/memcache-store/Makefile.in
+++ b/memcache-store/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -314,13 +314,13 @@ xs = @xs@
AUTOMAKE_OPTIONS = foreign
plugindir = $(libdir)/@PACKAGE_NAME@
plugin_LTLIBRARIES = memcache-store.la
-AM_CFLAGS = $(MEMCACHED_CFLAGS)
-AM_CXXFLAGS = $(MEMCACHED_CFLAGS)
+AM_CFLAGS = $(MEMCACHED_INCLUDE)
+AM_CXXFLAGS = $(MEMCACHED_INCLUDE)
+memcache_store_la_LDFLAGS = $(MEMCACHED_LDFLAGS) -module -avoid-version
memcache_store_la_LIBADD = $(XMLSEC_LIBS) $(MEMCACHED_LIBS)
memcache_store_la_SOURCES = \
memcache-store.cpp
-memcache_store_la_LDFLAGS = -module -avoid-version
EXTRA_DIST = memcache-store.vcxproj memcache-store.rc resource.h
all: all-am
diff --git a/memcache-store/memcache-store.rc b/memcache-store/memcache-store.rc
index 331d479..5619196 100644
--- a/memcache-store/memcache-store.rc
+++ b/memcache-store/memcache-store.rc
@@ -53,8 +53,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth Memcache Storage Service Plugin\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "memcache-store\0"
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "OriginalFilename", "memcache-store.so\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/memcache-store/memcache-store.vcxproj b/memcache-store/memcache-store.vcxproj
index 115f528..c6b50c4 100644
--- a/memcache-store/memcache-store.vcxproj
+++ b/memcache-store/memcache-store.vcxproj
@@ -59,8 +59,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\..\cpp-xmltooling\MsBuild\Versions.props" />
- <Import Project="..\..\cpp-xmltooling\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
@@ -193,4 +193,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/msbuild/Includes.props b/msbuild/Includes.props
deleted file mode 100644
index 41f2b2e..0000000
--- a/msbuild/Includes.props
+++ /dev/null
@@ -1,68 +0,0 @@
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Label="Wibble">
- <ExecutablePath>$(ExecutablePath)</ExecutablePath>
- <IncludePath Condition="'$(Platform)'=='Win32'">$(BuildRoot)\$(openssl)\inc32;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\include;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
- <IncludePath Condition="'$(Platform)'=='x64'">$(BuildRoot)\$(openssl)\inc64;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\include;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
- <ReferencePath>$(ReferencePath)</ReferencePath>
- <LibraryPath Condition="'$(Platform)'=='Win32'">$(BuildRoot)\$(openssl)\out32dll;$(BuildRoot)\$(openssl)\out32dll.dbg;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\msvc10\Debug;$(BuildRoot)\$(log4shib)\msvc10\Release;$(BuildRoot)\$(xerces)\lib;$(BuildRoot)\$(xmlsec)\Build\Win32\VC10\Debug No Xalan;$(BuildRoot)\$(xmlsec)\Build\Win32\VC10\Release No Xalan;$(BuildRoot)\nsapi\lib;$(BuildRoot)\$(fcgi)\Win [...]
- <LibraryPath Condition="'$(Platform)'=='x64'">$(BuildRoot)\$(openssl)\out64dll;$(BuildRoot)\$(openssl)\out64dll.dbg;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\msvc10\x64\Debug;$(BuildRoot)\$(log4shib)\msvc10\x64\Release;$(BuildRoot)\$(xerces)\lib;$(BuildRoot)\$(xmlsec)\Build\x64\VC10\Debug No Xalan;$(BuildRoot)\$(xmlsec)\Build\x64\VC10\Release No Xalan;$(BuildRoot)\$(fcgi)\Win32\x64\Debug; [...]
- <SourcePath>$(SourcePath)</SourcePath>
- <ExcludePath>$(ExcludePath)</ExcludePath>
- </PropertyGroup>
- <ItemGroup>
- <BuildMacro Include="BuildRoot">
- <Value>$(BuildRoot)</Value>
- </BuildMacro>
- <BuildMacro Include="CxxTestRoot">
- <Value>$(CxxTestRoot)</Value>
- </BuildMacro>
- <BuildMacro Include="Apache13Root">
- <Value>$(Apache13Root)</Value>
- </BuildMacro>
- <BuildMacro Include="Apache20Root">
- <Value>$(Apache20Root)</Value>
- </BuildMacro>
- <BuildMacro Include="Apache22Root">
- <Value>$(Apache22Root)</Value>
- </BuildMacro>
- <BuildMacro Include="Apache24Root">
- <Value>$(Apache24Root)</Value>
- </BuildMacro>
- <BuildMacro Include="Apache22Root64">
- <Value>$(Apache22Root64)</Value>
- </BuildMacro>
- <BuildMacro Include="Apache24Root64">
- <Value>$(Apache24Root64)</Value>
- </BuildMacro>
- <BuildMacro Include="openssl">
- <Value>$(openssl)</Value>
- </BuildMacro>
- <BuildMacro Include="curl">
- <Value>$(curl)</Value>
- </BuildMacro>
- <BuildMacro Include="xerces">
- <Value>$(xerces)</Value>
- </BuildMacro>
- <BuildMacro Include="xmlsec">
- <Value>$(xmlsec)</Value>
- </BuildMacro>
- <BuildMacro Include="boost">
- <Value>$(boost)</Value>
- </BuildMacro>
- <BuildMacro Include="log4shib">
- <Value>$(log4shib)</Value>
- </BuildMacro>
- <BuildMacro Include="zlib">
- <Value>$(zlib)</Value>
- </BuildMacro>
- <BuildMacro Include="fcgi">
- <Value>$(fcgi)</Value>
- </BuildMacro>
- </ItemGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- </ItemDefinitionGroup>
-</Project>
diff --git a/msbuild/Versions.props b/msbuild/Versions.props
deleted file mode 100644
index 993f32a..0000000
--- a/msbuild/Versions.props
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Label="VersionMacros">
- <CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>
-
- <ShibbolethVersion>2.5.1</ShibbolethVersion>
-
- <!-- Change the Ids below AT LEAST on every change to ShibbolethVersion -->
- <ShibbolethId32>{57622F3F-E505-4E78-B09F-DFEE79B995A1}</ShibbolethId32>
- <ShibbolethId64>{57FAEFB4-9BB8-4CC8-9897-5071E7DBB304}</ShibbolethId64>
- <!-- NEVER CHANGE THE UPGRADE CODE UNLESS YOU REALLY REALLY KNOW WHAT YOU ARE DOING -->
- <ShibbolethUpgradeCode>{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}</ShibbolethUpgradeCode>
-
- <CurlVersion>7.28.1</CurlVersion>
- <curl>curl-$(CurlVersion)</curl>
-
- <boost>boost_1_52_0</boost>
-
- <Log4ShibVersion>1.0.5</Log4ShibVersion>
- <Log4ShibFileVersion>1_0</Log4ShibFileVersion>
- <!-- Change the 4 components below if the Log4ShibFileVersion name changes -->
- <Log4ShibComponent32>{2FDE8ED0-774A-4F44-88D5-C7089350D895}</Log4ShibComponent32>
- <Log4ShibComponent32d>{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}</Log4ShibComponent32d>
- <Log4ShibComponent64>{DA7E5213-363E-4E13-B05D-90905BE9FB94}</Log4ShibComponent64>
- <Log4ShibComponent64d>{792E6762-70FE-418A-9336-39DDF1A6BAE7}</Log4ShibComponent64d>
- <log4shib>log4shib-$(Log4ShibVersion)</log4shib>
-
- <OpenSAMLVersion>2.5.1</OpenSAMLVersion>
- <OpenSAMLFileVersion>2_5</OpenSAMLFileVersion>
- <!-- Change the 4 components below if the OpenSAMLFileVersion name changes -->
- <SamlComponent32>{B52F8C71-2042-4CDF-A250-BD773985A2AB}</SamlComponent32>
- <SamlComponent32d>{7B934257-5F7F-428E-930E-A793A11573D7}</SamlComponent32d>
- <SamlComponent64>{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}</SamlComponent64>
- <SamlComponent64d>{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}</SamlComponent64d>
-
- <XmlToolingVersion>1.5.2</XmlToolingVersion>
- <XmlToolingFileVersion>1_5</XmlToolingFileVersion>
- <!-- Change the 8 components below if the XmlToolingFileVersion name changes -->
- <XMLToolingComponent32>{53533A59-A563-439D-B13D-A4D7090C42D3}</XMLToolingComponent32>
- <XMLToolingLiteComponent32>{5045A722-D6D6-4E55-9196-CB7C50B4446F}</XMLToolingLiteComponent32>
- <XMLToolingComponent32d>{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}</XMLToolingComponent32d>
- <XMLToolingLiteComponent32d>{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}</XMLToolingLiteComponent32d>
- <XMLToolingComponent64>{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}</XMLToolingComponent64>
- <XMLToolingLiteComponent64>{060F61B9-36E9-4F33-9B5B-C59A43709052}</XMLToolingLiteComponent64>
- <XMLToolingComponent64d>{C380627F-9D45-4626-A249-3831FC7C83FC}</XMLToolingComponent64d>
- <XMLToolingLiteComponent64d>{2786A98E-763C-41A1-A6D5-363DB22F17E9}</XMLToolingLiteComponent64d>
-
- <OpenSSLVersion>1.0.1.3</OpenSSLVersion>
- <OpenSSLDirVersion>1.0.1c</OpenSSLDirVersion>
- <openssl>openssl-$(OpenSSLDirVersion)</openssl>
- <OpenSSLFileVersion>1_0</OpenSSLFileVersion>
- <!-- Change the 8 components below if OpenSSLFileVersion changes -->
- <LibEay32Component>{1DE4C235-0F1E-41EF-B7B8-9F3FD03A8F26}</LibEay32Component>
- <SSlEay32Component>{9D0D75C3-69B6-4A29-9890-EF3DD939B6CA}</SSlEay32Component>
- <LibEay32Componentd>{53BCB6F4-77DC-4B6C-9798-EC10796D3C59}</LibEay32Componentd>
- <SSlEay32Componentd>{A9583DF6-F075-4F43-991C-3611B31036DF}</SSlEay32Componentd>
- <LibEay64Component>{DCB83813-11B4-469D-BD26-5DBF9815AC36}</LibEay64Component>
- <SSlEay64Component>{EAC28C6F-C98E-454F-BFE7-076D7C0A5CF1}</SSlEay64Component>
- <LibEay64Componentd>{D6E409C6-2F1C-42BA-8759-CF898C62C9A9}</LibEay64Componentd>
- <SSlEay64Componentd>{8FBB6D41-0044-4969-AA27-813EF2606C7A}</SSlEay64Componentd>
-
- <ShibbolethDllVersion>1.5.1</ShibbolethDllVersion>
- <ShibbolethDllFileVersion>1_5</ShibbolethDllFileVersion>
- <!-- Change the 8 components below if ShibbolethDllFileVersion changes -->
- <ShibDll32Component>{9DE384BF-C286-4A72-AED9-AA34384005C0}</ShibDll32Component>
- <ShibDllLite32Component>{10475E33-434D-4805-B983-195092549BED}</ShibDllLite32Component>
- <ShibDll32Componentd>{4196D799-1162-4D62-9F7A-1F59E90F19F1}</ShibDll32Componentd>
- <ShibDllLite32Componentd>{8E070220-2992-4D45-BF98-459022CD268F}</ShibDllLite32Componentd>
- <ShibDll64Component>{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}</ShibDll64Component>
- <ShibDllLite64Component>{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}</ShibDllLite64Component>
- <ShibDll64Componentd>{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}</ShibDll64Componentd>
- <ShibDllLite64Componentd>{5EF6FF17-0510-484B-9F24-523B29EB416C}</ShibDllLite64Componentd>
-
- <XercesVersion>3.1.1</XercesVersion>
- <xerces Condition="'$(Platform)'=='x64'">xerces-c-$(XercesVersion)-x86_64-windows-vc-10.0</xerces>
- <xerces Condition="'$(Platform)'=='win32'">xerces-c-$(XercesVersion)-x86-windows-vc-10.0</xerces>
- <XercesFileVersion>3_1</XercesFileVersion>
- <!-- Change the 4 components below if XercesFileVersion changes -->
- <Xerces32Component>{64C16FA9-685C-4612-B9C2-0B56C84A69E1}</Xerces32Component>
- <Xerces32Componentd>{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}</Xerces32Componentd>
- <Xerces64Component>{5C2BA2C6-36EC-4EB3-A343-8C1C9D499B9C}</Xerces64Component>
- <Xerces64Componentd>{236B6A7F-73C0-4EBF-9C06-90C1BE160ACE}</Xerces64Componentd>
-
-
- <XmlSecVersion>1.7.0</XmlSecVersion>
- <xmlsec>xml-security-c-$(XmlSecVersion)</xmlsec>
- <XmlSecFileVersion>1_7</XmlSecFileVersion>
- <!-- Change the 4 components below if XmlSecFileVersion changes -->
- <XmlSec32Component>{761CE697-2701-4149-ACD5-A693EBB45B33}</XmlSec32Component>
- <XmlSec32Componentd>{34D437A1-3008-433F-A86F-F69E4852069F}</XmlSec32Componentd>
- <XmlSec64Component>{DF5FEFC9-9B95-42B1-A6BD-053E0D0BD8E8}</XmlSec64Component>
- <XmlSec64Componentd>{D97E1B5C-B020-4621-94CE-F10FCFF765C5}</XmlSec64Componentd>
-
- <ZlibVersion>1.2.7</ZlibVersion>
- <zlib>zlib-$(ZlibVersion)</zlib>
- <ZlibFileVersion>1</ZlibFileVersion>
- <Zlib32Component>{059557A8-7311-47BB-8A5F-CC85F72AE495}</Zlib32Component>
- <Zlib32Componentd>{3DA71CD4-F204-49D5-A689-7B1B4C2D395A}</Zlib32Componentd>
- <Zlib64Component>{792D44C3-3DCE-465D-AAFF-520AB2F20DA2}</Zlib64Component>
- <Zlib64Componentd>{74D67C6F-655E-4E4D-A147-39F32DB6E796}</Zlib64Componentd>
-
- <FastCGIVersion>2.4.0</FastCGIVersion>
- <fcgi>fcgi-$(FastCGIVersion)-VC10</fcgi>
-
- </PropertyGroup>
-</Project>
diff --git a/msbuild/build.make b/msbuild/build.make
deleted file mode 100644
index 9acb917..0000000
--- a/msbuild/build.make
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Short cuts to make things easier
-
-SPROOT=$(MAKEDIR)\..\..\cpp-sp
-XMLROOT=$(MAKEDIR)\..\..\cpp-xmltooling
-SAMLROOT=$(MAKEDIR)\..\..\cpp-opensaml
-
-
-#
-# The targets. We want to build the two installers
-#
-all: msi32 msi64
-
-clean:
- cd $(SPROOT)
- del/s *.dll *.exe *.msm *.lib *.obj
- del/s *.wixobj *.lib *.wixlib *.pdb *.wixpdb *.wixlib *.msi
- cd $(XMLROOT)
- del/s *.dll *.exe *.msm *.lib *.obj
- cd $(SAMLROOT)
- del/s *.dll *.exe *.msm *.lib *.obj
-
-#
-msi32: mergemodules32 exe32
- cd $(SPROOT)
- msbuild /property:Platform=Win32;Configuration=Release /maxcpucount .\shibboleth.sln /t:Installers\MergeModules;Installers\Installer
-
-msi64: mergemodules32 exe32 mergemodules64 exe64
- cd $(SPROOT)
- msbuild /property:Platform=x64;Configuration=Release /maxcpucount .\shibboleth.sln /t:Installers\MergeModules;Installers\Installer
-
-mergemodules32: xmltooling32 saml32 shibsp32
-
-mergemodules64: xmltooling64 saml64 shibsp64
-
-shibsp32:
- cd $(SPROOT)
- msbuild /property:Platform=Win32;Configuration=Release /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
- msbuild /property:Platform=Win32;Configuration=Debug /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
-
-shibsp64:
- cd $(SPROOT)
- msbuild /property:Platform=x64;Configuration=Release /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
- msbuild /property:Platform=x64;Configuration=Debug /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
-
-saml32:
- cd $(SAMLROOT)
- msbuild /property:Platform=Win32;Configuration=Release /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
- msbuild /property:Platform=Win32;Configuration=Debug /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
-
-
-saml64:
- cd $(SAMLROOT)
- msbuild /property:Platform=x64;Configuration=Release /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
- msbuild /property:Platform=x64;Configuration=Debug /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
-
-xmltooling32:
- cd $(XMLROOT)
- msbuild /property:Platform=Win32;Configuration=Release /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
- msbuild /property:Platform=Win32;Configuration=Debug /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
-
-xmltooling64:
- cd $(XMLROOT)
- msbuild /property:Platform=x64;Configuration=Release /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
- msbuild /property:Platform=x64;Configuration=Debug /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
-
-exe32:
- cd $(SPROOT)
- msbuild /property:Platform=Win32;Configuration=Release /maxcpucount .\shibboleth.sln /t:utilities\resolvertest;utilities\mdquery;Extensions\adfs;Extensions\adfs-lite;Extensions\odbc-store;Extensions\plugins;Extensions\plugins-lite;"Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder";shibd;"Server Modules\isapi_shib";"Server Modules\mod_shib_13";"Server Modules\mod_shib_20";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24";"Server Modules\nsapi_shib"
- msbuild /property:Platform=Win32;Configuration=Debug /maxcpucount .\shibboleth.sln /t:utilities\resolvertest;utilities\mdquery;Extensions\adfs;Extensions\adfs-lite;Extensions\odbc-store;Extensions\plugins;Extensions\plugins-lite;"Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder";shibd;"Server Modules\isapi_shib";"Server Modules\mod_shib_13";"Server Modules\mod_shib_20";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24";"Server Modules\nsapi_shib"
-
-exe64:
- cd $(SPROOT)
- msbuild /property:Platform=x64;Configuration=Release /maxcpucount .\shibboleth.sln /t:utilities\resolvertest;utilities\mdquery;Extensions\adfs;Extensions\adfs-lite;Extensions\odbc-store;Extensions\plugins;Extensions\plugins-lite;"Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder";shibd;"Server Modules\isapi_shib";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24"
- msbuild /property:Platform=x64;Configuration=Debug /maxcpucount .\shibboleth.sln /t:utilities\resolvertest;utilities\mdquery;Extensions\adfs;Extensions\adfs-lite;Extensions\odbc-store;Extensions\plugins;Extensions\plugins-lite;"Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder";shibd;"Server Modules\isapi_shib";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24"
diff --git a/nsapi_shib/Makefile.in b/nsapi_shib/Makefile.in
index dde09ec..a6019c3 100644
--- a/nsapi_shib/Makefile.in
+++ b/nsapi_shib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/nsapi_shib/nsapi_shib.rc b/nsapi_shib/nsapi_shib.rc
index fc1fd58..a7fe2dd 100644
--- a/nsapi_shib/nsapi_shib.rc
+++ b/nsapi_shib/nsapi_shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth NSAPI Extension\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "nsapi_shib\0"
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "nsapi_shib.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/nsapi_shib/nsapi_shib.vcxproj b/nsapi_shib/nsapi_shib.vcxproj
index 9ea4de6..67f1197 100644
--- a/nsapi_shib/nsapi_shib.vcxproj
+++ b/nsapi_shib/nsapi_shib.vcxproj
@@ -61,8 +61,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
diff --git a/odbc-store/Makefile.in b/odbc-store/Makefile.in
index 2ef412c..287748c 100644
--- a/odbc-store/Makefile.in
+++ b/odbc-store/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/odbc-store/odbc-store.rc b/odbc-store/odbc-store.rc
index 44cdc39..1cd2579 100644
--- a/odbc-store/odbc-store.rc
+++ b/odbc-store/odbc-store.rc
@@ -53,8 +53,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth ODBC Storage Service Plugin\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "odbc-store\0"
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "OriginalFilename", "odbc-store.so\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/odbc-store/odbc-store.vcxproj b/odbc-store/odbc-store.vcxproj
index f30af70..4fdf91d 100644
--- a/odbc-store/odbc-store.vcxproj
+++ b/odbc-store/odbc-store.vcxproj
@@ -59,8 +59,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
diff --git a/plugins/Makefile.in b/plugins/Makefile.in
index 0bdd9f3..b12e488 100644
--- a/plugins/Makefile.in
+++ b/plugins/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/plugins/plugins.rc b/plugins/plugins.rc
index 3634d46..7b5f7a4 100644
--- a/plugins/plugins.rc
+++ b/plugins/plugins.rc
@@ -54,8 +54,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -73,13 +73,13 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth SP Plugins\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
#ifdef SHIBSP_LITE
VALUE "InternalName", "plugins-lite\0"
#else
VALUE "InternalName", "plugins\0"
#endif
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
#ifdef SHIBSP_LITE
VALUE "OriginalFilename", "plugins-lite.so\0"
@@ -87,8 +87,8 @@ BEGIN
VALUE "OriginalFilename", "plugins.so\0"
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/plugins/plugins.vcxproj b/plugins/plugins.vcxproj
index e77eb3d..136f576 100644
--- a/plugins/plugins.vcxproj
+++ b/plugins/plugins.vcxproj
@@ -61,8 +61,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
diff --git a/schemas/Makefile.in b/schemas/Makefile.in
index c307e22..b4ae175 100644
--- a/schemas/Makefile.in
+++ b/schemas/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/selinux/Makefile.in b/selinux/Makefile.in
index e1a7cbd..929339c 100644
--- a/selinux/Makefile.in
+++ b/selinux/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/shibboleth.spec b/shibboleth.spec
index 699e24d..5917ff5 100644
--- a/shibboleth.spec
+++ b/shibboleth.spec
@@ -1,5 +1,5 @@
Name: shibboleth
-Version: 2.5.1
+Version: 2.5.2
Release: 1
Summary: Open source system for attribute-based Web SSO
Group: Productivity/Networking/Security
@@ -31,6 +31,7 @@ Requires: libcurl-openssl%{?_isa} >= 7.21.7
BuildRequires: chrpath
%endif
BuildRequires: gcc-c++, zlib-devel, boost-devel >= 1.32.0
+%{!?_without_gssapi:BuildRequires: krb5-devel}
%{!?_without_doxygen:BuildRequires: doxygen}
%{!?_without_odbc:BuildRequires:unixODBC-devel}
%{?_with_fastcgi:BuildRequires: fcgi-devel}
@@ -97,9 +98,9 @@ This package includes files needed for development with Shibboleth.
%build
%if 0%{?centos_version} >= 600
- %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_memcached:--with-memcached} %{?shib_options}
+ %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{?shib_options}
%else
- %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{?_with_memcached} %{?shib_options}
+ %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{?shib_options}
%endif
%{__make} pkgdocdir=%{pkgdocdir}
@@ -335,6 +336,9 @@ fi
%doc %{pkgdocdir}/api
%changelog
+* Sat Jun 8 2013 Scott Cantor <cantor.2 at osu.edu> - 2.5.2-1
+- Add --with-gssapi using MIT K5 by default
+
* Tue Sep 25 2012 Scott Cantor <cantor.2 at osu.edu> - 2.5.1-1
- Merge back various changes used in released packages
- Prep for 2.5.1 by pulling extra restart out
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 5e61404..26c3b20 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -31,6 +31,7 @@ Requires: libcurl-openssl%{?_isa} >= 7.21.7
BuildRequires: chrpath
%endif
BuildRequires: gcc-c++, zlib-devel, boost-devel >= 1.32.0
+%{!?_without_gssapi:BuildRequires: krb5-devel}
%{!?_without_doxygen:BuildRequires: doxygen}
%{!?_without_odbc:BuildRequires:unixODBC-devel}
%{?_with_fastcgi:BuildRequires: fcgi-devel}
@@ -97,9 +98,9 @@ This package includes files needed for development with Shibboleth.
%build
%if 0%{?centos_version} >= 600
- %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_memcached:--with-memcached} %{?shib_options}
+ %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{?shib_options}
%else
- %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{?_with_memcached} %{?shib_options}
+ %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{?shib_options}
%endif
%{__make} pkgdocdir=%{pkgdocdir}
@@ -335,6 +336,9 @@ fi
%doc %{pkgdocdir}/api
%changelog
+* Sat Jun 8 2013 Scott Cantor <cantor.2 at osu.edu> - 2.5.2-1
+- Add --with-gssapi using MIT K5 by default
+
* Tue Sep 25 2012 Scott Cantor <cantor.2 at osu.edu> - 2.5.1-1
- Merge back various changes used in released packages
- Prep for 2.5.1 by pulling extra restart out
diff --git a/shibd/Makefile.in b/shibd/Makefile.in
index 794f899..bf21bb7 100644
--- a/shibd/Makefile.in
+++ b/shibd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/shibd/shibd.rc b/shibd/shibd.rc
index e15cd35..0084c80 100644
--- a/shibd/shibd.rc
+++ b/shibd/shibd.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth Daemon Service\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "shibd\0"
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shibd.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/shibd/shibd.vcxproj b/shibd/shibd.vcxproj
index 933bceb..da81db8 100644
--- a/shibd/shibd.vcxproj
+++ b/shibd/shibd.vcxproj
@@ -58,8 +58,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 1b13972..6592e72 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -234,9 +234,9 @@ libshibsp_la_SOURCES = \
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = -version-info 6:1:0
+libshibsp_la_LDFLAGS = -version-info 6:2:0
libshibsp_la_LIBADD = $(XMLSEC_LIBS)
-libshibsp_lite_la_LDFLAGS = -version-info 6:1:0
+libshibsp_lite_la_LDFLAGS = -version-info 6:2:0
libshibsp_lite_la_LIBADD = $(LITE_LIBS)
libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
diff --git a/shibsp/Makefile.in b/shibsp/Makefile.in
index bd65144..ce213ad 100644
--- a/shibsp/Makefile.in
+++ b/shibsp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -673,9 +673,9 @@ libshibsp_la_SOURCES = \
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = -version-info 6:1:0
+libshibsp_la_LDFLAGS = -version-info 6:2:0
libshibsp_la_LIBADD = $(XMLSEC_LIBS)
-libshibsp_lite_la_LDFLAGS = -version-info 6:1:0
+libshibsp_lite_la_LDFLAGS = -version-info 6:2:0
libshibsp_lite_la_LIBADD = $(LITE_LIBS)
libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
@@ -739,10 +739,6 @@ config_pub.h: stamp-h2
stamp-h2: $(srcdir)/config_pub.h.in $(top_builddir)/config.status
@rm -f stamp-h2
cd $(top_builddir) && $(SHELL) ./config.status shibsp/config_pub.h
-$(srcdir)/config_pub.h.in: $(am__configure_deps)
- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- rm -f stamp-h2
- touch $@
distclean-hdr:
-rm -f config_pub.h stamp-h2
diff --git a/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
index 9071521..61742ed 100644
--- a/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
@@ -288,7 +288,7 @@ template <class T> void MetadataExtractor::doLangSensitive(
if (!match)
match = objects.front();
- auto_ptr_char temp(match->getTextContent());
+ auto_arrayptr<char> temp(toUTF8(match->getTextContent()));
if (temp.get() && *temp.get()) {
auto_ptr<SimpleAttribute> attr(new SimpleAttribute(vector<string>(1, id)));
attr->getValues().push_back(temp.get());
@@ -310,11 +310,11 @@ void MetadataExtractor::doLogo(
if (request && request->startLangMatching()) {
do {
for (vector<Logo*>::const_iterator i = logos.begin(); i != logos.end(); ++i) {
- if (request->matchLang((*i)->getLang())) {
+ if (!(*i)->getLang() || request->matchLang((*i)->getLang())) {
sizediff = 0;
if (h > 0) {
dim = (*i)->getHeight();
- sizediff = abs(h - dim.second);
+ sizediff += abs(h - dim.second);
}
if (w > 0) {
dim = (*i)->getWidth();
@@ -337,7 +337,7 @@ void MetadataExtractor::doLogo(
sizediff = 0;
if (h > 0) {
dim = (*i)->getHeight();
- sizediff = abs(h - dim.second);
+ sizediff += abs(h - dim.second);
}
if (w > 0) {
dim = (*i)->getWidth();
diff --git a/shibsp/handler/impl/DiscoveryFeed.cpp b/shibsp/handler/impl/DiscoveryFeed.cpp
index 19aecf3..ad567a1 100644
--- a/shibsp/handler/impl/DiscoveryFeed.cpp
+++ b/shibsp/handler/impl/DiscoveryFeed.cpp
@@ -171,7 +171,7 @@ pair<bool,long> DiscoveryFeed::run(SPRequest& request, bool isHandler) const
string etag = '"' + s + '"';
request.setResponseHeader("ETag", etag.c_str());
}
- request.setContentType("application/json");
+ request.setContentType("application/json; charset=UTF-8");
return make_pair(true, request.sendResponse(buf));
}
}
@@ -197,7 +197,7 @@ pair<bool,long> DiscoveryFeed::run(SPRequest& request, bool isHandler) const
}
if (out["feed"].string()) {
istringstream buf(out["feed"].string());
- request.setContentType("application/json");
+ request.setContentType("application/json; charset=UTF-8");
return make_pair(true, request.sendResponse(buf));
}
throw ConfigurationException("Discovery feed was empty.");
@@ -223,7 +223,7 @@ pair<bool,long> DiscoveryFeed::run(SPRequest& request, bool isHandler) const
string etag = '"' + s + '"';
request.setResponseHeader("ETag", etag.c_str());
}
- request.setContentType("application/json");
+ request.setContentType("application/json; charset=UTF-8");
return make_pair(true, request.sendResponse(feed));
}
catch (std::exception& ex) {
diff --git a/shibsp/handler/impl/SAML2LogoutInitiator.cpp b/shibsp/handler/impl/SAML2LogoutInitiator.cpp
index 74874eb..bb5efd1 100644
--- a/shibsp/handler/impl/SAML2LogoutInitiator.cpp
+++ b/shibsp/handler/impl/SAML2LogoutInitiator.cpp
@@ -87,6 +87,7 @@ namespace shibsp {
) const;
string m_appId;
+ auto_ptr_char m_protocol;
#ifndef SHIBSP_LITE
auto_ptr<LogoutRequest> buildRequest(
const Application& application, const Session& session, const RoleDescriptor& role, const MessageEncoder* encoder=nullptr
@@ -105,7 +106,6 @@ namespace shibsp {
vector<string> m_bindings;
map< string,boost::shared_ptr<MessageEncoder> > m_encoders;
#endif
- auto_ptr_char m_protocol;
};
#if defined (_MSC_VER)
diff --git a/shibsp/remoting/impl/TCPListener.cpp b/shibsp/remoting/impl/TCPListener.cpp
index 5f07611..4d1452a 100644
--- a/shibsp/remoting/impl/TCPListener.cpp
+++ b/shibsp/remoting/impl/TCPListener.cpp
@@ -53,6 +53,7 @@
#include <sys/stat.h> /* for chmod() */
#include <stdio.h>
#include <stdlib.h>
+#include <fcntl.h>
#include <errno.h>
using namespace shibsp;
@@ -88,6 +89,7 @@ namespace shibsp {
string m_address;
unsigned short m_port;
vector<IPRange> m_acl;
+ size_t m_sockaddrlen;
#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
struct sockaddr_storage m_sockaddr;
#else
@@ -157,15 +159,16 @@ bool TCPListener::setup_tcp_sockaddr()
return false;
}
+ m_sockaddrlen = ret->ai_addrlen;
if (ret->ai_family == AF_INET) {
- memcpy(&m_sockaddr, ret->ai_addr, ret->ai_addrlen);
+ memcpy(&m_sockaddr, ret->ai_addr, m_sockaddrlen);
freeaddrinfo(ret);
((struct sockaddr_in*)&m_sockaddr)->sin_port=htons(m_port);
return true;
}
#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_STORAGE)
else if (ret->ai_family == AF_INET6) {
- memcpy(&m_sockaddr, ret->ai_addr, ret->ai_addrlen);
+ memcpy(&m_sockaddr, ret->ai_addr, m_sockaddrlen);
freeaddrinfo(ret);
((struct sockaddr_in6*)&m_sockaddr)->sin6_port=htons(m_port);
return true;
@@ -179,10 +182,15 @@ bool TCPListener::setup_tcp_sockaddr()
bool TCPListener::create(ShibSocket& s) const
{
+ int type = SOCK_STREAM;
+#ifdef HAVE_SOCK_CLOEXEC
+ type |= SOCK_CLOEXEC;
+#endif
+
#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
- s = socket(m_sockaddr.ss_family, SOCK_STREAM, 0);
+ s = socket(m_sockaddr.ss_family, type, 0);
#else
- s = socket(m_sockaddr.sin_family, SOCK_STREAM, 0);
+ s = socket(m_sockaddr.sin_family, type, 0);
#endif
#ifdef WIN32
if(s == INVALID_SOCKET)
@@ -190,6 +198,15 @@ bool TCPListener::create(ShibSocket& s) const
if (s < 0)
#endif
return log_error("socket");
+
+#if !defined(HAVE_SOCK_CLOEXEC) && defined(HAVE_FD_CLOEXEC)
+ int fdflags = fcntl(s, F_GETFD);
+ if (fdflags != -1) {
+ fdflags |= FD_CLOEXEC;
+ fcntl(s, F_SETFD, fdflags);
+ }
+#endif
+
return true;
}
@@ -200,14 +217,14 @@ bool TCPListener::bind(ShibSocket& s, bool force) const
::setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof(opt));
#ifdef WIN32
- if (SOCKET_ERROR==::bind(s, (const struct sockaddr*)&m_sockaddr, sizeof(m_sockaddr)) || SOCKET_ERROR==::listen(s, 3)) {
+ if (SOCKET_ERROR==::bind(s, (const struct sockaddr*)&m_sockaddr, m_sockaddrlen) || SOCKET_ERROR==::listen(s, 3)) {
log_error("bind");
close(s);
return false;
}
#else
- // Newer BSDs require the struct length be passed based on the socket address.
- // Others have no field for that and take the whole struct size like Windows does.
+ // Newer BSDs, and Solaris, require the struct length be passed based on the socket address.
+ // All but Solaris seem to have an ss_len field in the sockaddr_storage struct.
# ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
# ifdef HAVE_STRUCT_SOCKADDR_STORAGE
if (::bind(s, (const struct sockaddr*)&m_sockaddr, m_sockaddr.ss_len) < 0) {
@@ -215,7 +232,7 @@ bool TCPListener::bind(ShibSocket& s, bool force) const
if (::bind(s, (const struct sockaddr*)&m_sockaddr, m_sockaddr.sin_len) < 0) {
# endif
# else
- if (::bind(s, (const struct sockaddr*)&m_sockaddr, sizeof(m_sockaddr)) < 0) {
+ if (::bind(s, (const struct sockaddr*)&m_sockaddr, m_sockaddrlen) < 0) {
# endif
log_error("bind");
close(s);
@@ -229,7 +246,7 @@ bool TCPListener::bind(ShibSocket& s, bool force) const
bool TCPListener::connect(ShibSocket& s) const
{
#ifdef WIN32
- if(SOCKET_ERROR==::connect(s, (const struct sockaddr*)&m_sockaddr, sizeof(m_sockaddr)))
+ if(SOCKET_ERROR==::connect(s, (const struct sockaddr*)&m_sockaddr, m_sockaddrlen))
return log_error("connect");
#else
// Newer BSDs require the struct length be passed based on the socket address.
@@ -241,7 +258,7 @@ bool TCPListener::connect(ShibSocket& s) const
if (::connect(s, (const struct sockaddr*)&m_sockaddr, m_sockaddr.sin_len) < 0)
# endif
# else
- if (::connect(s, (const struct sockaddr*)&m_sockaddr, sizeof(m_sockaddr)) < 0)
+ if (::connect(s, (const struct sockaddr*)&m_sockaddr, m_sockaddrlen) < 0)
# endif
return log_error("connect");
#endif
diff --git a/shibsp/remoting/impl/UnixListener.cpp b/shibsp/remoting/impl/UnixListener.cpp
index 75c5ff7..9fc5408 100644
--- a/shibsp/remoting/impl/UnixListener.cpp
+++ b/shibsp/remoting/impl/UnixListener.cpp
@@ -44,6 +44,7 @@
#include <sys/stat.h> /* for chmod() */
#include <stdio.h>
#include <stdlib.h>
+#include <fcntl.h>
#include <errno.h>
using namespace shibsp;
@@ -98,11 +99,24 @@ UnixListener::UnixListener(const DOMElement* e)
#define UNIX_PATH_MAX 100
#endif
-bool UnixListener::create(ShibSocket& sock) const
+bool UnixListener::create(ShibSocket& s) const
{
- sock = socket(PF_UNIX, SOCK_STREAM, 0);
- if (sock < 0)
+ int type = SOCK_STREAM;
+#ifdef HAVE_SOCK_CLOEXEC
+ type |= SOCK_CLOEXEC;
+#endif
+ s = socket(PF_UNIX, type, 0);
+ if (s < 0)
return log_error("socket");
+
+#if !defined(HAVE_SOCK_CLOEXEC) && defined(HAVE_FD_CLOEXEC)
+ int fdflags = fcntl(s, F_GETFD);
+ if (fdflags != -1) {
+ fdflags |= FD_CLOEXEC;
+ fcntl(s, F_SETFD, fdflags);
+ }
+#endif
+
return true;
}
diff --git a/shibsp/shibsp-lite.vcxproj b/shibsp/shibsp-lite.vcxproj
index 64612c1..b049cbd 100644
--- a/shibsp/shibsp-lite.vcxproj
+++ b/shibsp/shibsp-lite.vcxproj
@@ -59,8 +59,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index 8725a19..36f9aa7 100644
--- a/shibsp/shibsp.rc
+++ b/shibsp/shibsp.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 1,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -51,7 +51,7 @@ BEGIN
#else
VALUE "FileDescription", "Shibboleth SP Library\0"
#endif
- VALUE "FileVersion", "1, 5, 1, 0\0"
+ VALUE "FileVersion", "1, 5, 2, 0\0"
#ifdef SHIBSP_LITE
#ifdef _DEBUG
VALUE "InternalName", "shibsp-lite1_5D\0"
@@ -65,7 +65,7 @@ BEGIN
VALUE "InternalName", "shibsp1_5\0"
#endif
#endif
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
#ifdef SHIBSP_LITE
#ifdef _DEBUG
@@ -81,8 +81,8 @@ BEGIN
#endif
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/shibsp/shibsp.vcxproj b/shibsp/shibsp.vcxproj
index a0c84f8..2a6b2cd 100644
--- a/shibsp/shibsp.vcxproj
+++ b/shibsp/shibsp.vcxproj
@@ -59,8 +59,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
diff --git a/shibsp/version.h b/shibsp/version.h
index 5b55211..193ca5d 100644
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -44,7 +44,7 @@
#define SHIBSP_VERSION_MAJOR 1
#define SHIBSP_VERSION_MINOR 5
-#define SHIBSP_VERSION_REVISION 1
+#define SHIBSP_VERSION_REVISION 2
/** DO NOT MODIFY BELOW THIS LINE */
diff --git a/util/Makefile.in b/util/Makefile.in
index bbf0a54..6e53c5b 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/util/mdquery.rc b/util/mdquery.rc
index 066aebd..028367a 100644
--- a/util/mdquery.rc
+++ b/util/mdquery.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Metadata Query Utility\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "mdquery\0"
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mdquery.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/util/mdquery.vcxproj b/util/mdquery.vcxproj
index c5f7aa3..17e0923 100644
--- a/util/mdquery.vcxproj
+++ b/util/mdquery.vcxproj
@@ -58,8 +58,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
diff --git a/util/resolvertest.rc b/util/resolvertest.rc
index 6e13d70..30a0fe4 100644
--- a/util/resolvertest.rc
+++ b/util/resolvertest.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Attribute Resolver Utility\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "resolvertest\0"
- VALUE "LegalCopyright", "Copyright � 2012 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "resolvertest.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.1\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.2\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/util/resolvertest.vcxproj b/util/resolvertest.vcxproj
index 2e56a3a..bc77413 100644
--- a/util/resolvertest.vcxproj
+++ b/util/resolvertest.vcxproj
@@ -60,8 +60,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\BuildPath.props" />
- <Import Project="..\MsBuild\Versions.props" />
- <Import Project="..\MsBuild\Includes.props" />
+ <Import Project="$(ParentRoot)\Versions.props" />
+ <Import Project="$(ParentRoot)\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list