[shibboleth-sp2] 02/06: Imported Upstream version 2.5.3+dfsg
Russ Allbery
rra at stanford.edu
Sun Dec 8 04:17:13 UTC 2013
This is an automated email from the git hooks/post-receive script.
rra pushed a commit to branch master
in repository shibboleth-sp2.
commit 055935bf0884d07f8a17ebe682e77ed753fadeb0
Author: Russ Allbery <rra at debian.org>
Date: Sat Dec 7 20:01:38 2013 -0800
Imported Upstream version 2.5.3+dfsg
---
adfs/adfs.rc | 10 +++++-----
apache/mod_shib.cpp | 11 ++++++++---
apache/mod_shib_13.rc | 10 +++++-----
apache/mod_shib_20.rc | 10 +++++-----
apache/mod_shib_22.rc | 10 +++++-----
apache/mod_shib_24.rc | 10 +++++-----
build-aux/ltmain.sh | 4 ++--
config_win32.h | 6 +++---
configs/apache.config.in | 3 ++-
configs/apache2.config.in | 3 ++-
configs/apache22.config.in | 3 ++-
configs/apache24.config.in | 2 +-
configs/postTemplate.html | 10 +++-------
configs/shibd-redhat.in | 4 +---
configure | 20 ++++++++++----------
configure.ac | 2 +-
fastcgi/Makefile.am | 6 ++++--
fastcgi/Makefile.in | 12 ++++++++----
fastcgi/shibauthorizer.rc | 10 +++++-----
fastcgi/shibresponder.rc | 10 +++++-----
isapi_shib/isapi_shib.rc | 10 +++++-----
memcache-store/memcache-store.rc | 12 ++++++------
nsapi_shib/nsapi_shib.rc | 10 +++++-----
odbc-store/odbc-store.rc | 12 ++++++------
plugins/plugins.rc | 10 +++++-----
schemas/shibboleth-2.0-native-sp-config.xsd | 3 ++-
shibboleth.spec | 2 +-
shibd/shibd.rc | 10 +++++-----
shibsp/Makefile.am | 8 ++++----
shibsp/Makefile.in | 8 ++++----
shibsp/SPConfig.cpp | 15 ++++++++-------
shibsp/handler/impl/AbstractHandler.cpp | 4 ++--
shibsp/metadata/DynamicMetadataProvider.cpp | 7 +++++++
shibsp/shibsp.rc | 10 +++++-----
shibsp/version.h | 2 +-
util/mdquery.rc | 10 +++++-----
util/resolvertest.rc | 10 +++++-----
37 files changed, 158 insertions(+), 141 deletions(-)
diff --git a/adfs/adfs.rc b/adfs/adfs.rc
index cc00f87..a5d71fc 100644
--- a/adfs/adfs.rc
+++ b/adfs/adfs.rc
@@ -54,8 +54,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -73,7 +73,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0"
- VALUE "FileVersion", "2, 5, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
#ifdef SHIBSP_LITE
VALUE "InternalName", "adfs-lite\0"
#else
@@ -87,8 +87,8 @@ BEGIN
VALUE "OriginalFilename", "adfs.so\0"
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/apache/mod_shib.cpp b/apache/mod_shib.cpp
index fe7d038..311297b 100644
--- a/apache/mod_shib.cpp
+++ b/apache/mod_shib.cpp
@@ -415,7 +415,11 @@ public:
return type ? type : "";
}
long getContentLength() const {
- return m_gotBody ? m_body.length() : m_req->remaining;
+ // Apache won't expose content length until the body's read.
+ if (!m_gotBody) {
+ getRequestBody();
+ }
+ return m_body.length();
}
string getRemoteAddr() const {
string ret = AbstractSPRequest::getRemoteAddr();
@@ -873,8 +877,9 @@ extern "C" int shib_auth_checker(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_auth_checker found no per-request structure");
- return SERVER_ERROR;
+ ap_log_rerror(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, SH_AP_R(r), "shib_auth_checker 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
diff --git a/apache/mod_shib_13.rc b/apache/mod_shib_13.rc
index 891641d..b1edc92 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
VALUE "InternalName", "mod_shib_13\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.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc
index 2f30784..93c346b 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
VALUE "InternalName", "mod_shib_20\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.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc
index fdf7150..43972bc 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
VALUE "InternalName", "mod_shib_22\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.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/apache/mod_shib_24.rc b/apache/mod_shib_24.rc
index c296ceb..fc141ac 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
VALUE "InternalName", "mod_shib_24\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.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
index 16ddbf8..dc8e388 100644
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -1377,8 +1377,8 @@ func_infer_tag ()
$opt_debug
# FreeBSD-specific: where we install compilers with non-standard names
- tag_compilers_CC="*cc cc* *gcc gcc* clang"
- tag_compilers_CXX="*c++ c++* *g++ g++* clang++"
+ tag_compilers_CC="*cc cc* *gcc gcc* clang*"
+ tag_compilers_CXX="*c++ c++* *g++ g++* clang++*"
base_compiler=`set -- "$@"; echo $1`
# If $tagname isn't set, then try to infer if the default "CC" tag applies
diff --git a/config_win32.h b/config_win32.h
index 2741a03..4aed6dc 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.2"
+#define PACKAGE_STRING "shibboleth 2.5.3"
/* 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.2"
+#define PACKAGE_VERSION "2.5.3"
/* 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.2"
+#define VERSION "2.5.3"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
diff --git a/configs/apache.config.in b/configs/apache.config.in
index ba46f6b..7c48397 100644
--- a/configs/apache.config.in
+++ b/configs/apache.config.in
@@ -50,6 +50,7 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_13.so
#
<Location /secure>
AuthType shibboleth
+ ShibCompatWith24 On
ShibRequestSetting requireSession 1
- require valid-user
+ require shib-session
</Location>
diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index e735d20..bb5aaf1 100644
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -41,6 +41,7 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_20.so
#
<Location /secure>
AuthType shibboleth
+ ShibCompatWith24 On
ShibRequestSetting requireSession 1
- require valid-user
+ require shib-session
</Location>
diff --git a/configs/apache22.config.in b/configs/apache22.config.in
index 202cebb..ca3de20 100644
--- a/configs/apache22.config.in
+++ b/configs/apache22.config.in
@@ -41,6 +41,7 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_22.so
#
<Location /secure>
AuthType shibboleth
+ ShibCompatWith24 On
ShibRequestSetting requireSession 1
- require valid-user
+ require shib-session
</Location>
diff --git a/configs/apache24.config.in b/configs/apache24.config.in
index f1a2122..56df498 100644
--- a/configs/apache24.config.in
+++ b/configs/apache24.config.in
@@ -49,5 +49,5 @@ ShibCompatValidUser Off
<Location /secure>
AuthType shibboleth
ShibRequestSetting requireSession 1
- require valid-user
+ require shib-session
</Location>
diff --git a/configs/postTemplate.html b/configs/postTemplate.html
index 4883feb..d8c4728 100644
--- a/configs/postTemplate.html
+++ b/configs/postTemplate.html
@@ -6,14 +6,14 @@
function submitOnce() {
if (location.hash.length>0) {
if (confirm("Are you sure you want to resubmit this form information a second time?")) {
- document.forms[0].submit();
+ document.getElementById("shib_continue").click();
} else {
document.body.innerHTML="<html>Form information was not resubmitted.</html>";
}
} else {
var loc = window.location;
window.location = loc + "#submitted";
- document.forms[0].submit();
+ document.getElementById("shib_continue").click();
}
}
// -->
@@ -31,11 +31,7 @@
<shibmlpfor PostedData>
<input type="hidden" name="<shibmlp $name/>" value="<shibmlp $value/>"/>
</shibmlpfor>
- <noscript>
- <div>
- <input type="submit" name="_shib_continue_" value="Continue"/>
- </div>
- </noscript>
+ <input type="submit" id="shib_continue" name="_shib_continue_" value="Continue"/>
</form>
</body>
</html>
diff --git a/configs/shibd-redhat.in b/configs/shibd-redhat.in
index ee536cb..25ef4a2 100644
--- a/configs/shibd-redhat.in
+++ b/configs/shibd-redhat.in
@@ -51,9 +51,7 @@ start() {
export SHIBD_PID=$pidfile
touch $pidfile
chown $SHIBD_USER:$SHIBD_USER $pidfile
- if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
- /sbin/restorecon $pidfile
- fi
+
# Handle transition from root to non-root packages.
chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ 2>/dev/null || :
daemon --user $SHIBD_USER $shibd -p $pidfile -f -w 30
diff --git a/configure b/configure
index 1491d72..53b90b9 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.2.
+# Generated by GNU Autoconf 2.69 for shibboleth 2.5.3.
#
# 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.2'
-PACKAGE_STRING='shibboleth 2.5.2'
+PACKAGE_VERSION='2.5.3'
+PACKAGE_STRING='shibboleth 2.5.3'
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.2 to adapt to many kinds of systems.
+\`configure' configures shibboleth 2.5.3 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.2:";;
+ short | recursive ) echo "Configuration of shibboleth 2.5.3:";;
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.2
+shibboleth configure 2.5.3
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.2, which was
+It was created by shibboleth $as_me 2.5.3, 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.2'
+ VERSION='2.5.3'
cat >>confdefs.h <<_ACEOF
@@ -22486,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.2, which was
+This file was extended by shibboleth $as_me 2.5.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22552,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.2
+shibboleth config.status 2.5.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index fbc4a8b..6c71412 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.50])
-AC_INIT([shibboleth],[2.5.2],[https://issues.shibboleth.net/],[shibboleth-sp])
+AC_INIT([shibboleth],[2.5.3],[https://issues.shibboleth.net/],[shibboleth-sp])
AC_CONFIG_SRCDIR(shibsp)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
diff --git a/fastcgi/Makefile.am b/fastcgi/Makefile.am
index 7c7baa3..667c6dc 100644
--- a/fastcgi/Makefile.am
+++ b/fastcgi/Makefile.am
@@ -10,13 +10,15 @@ shibauthorizer_SOURCES = shibauthorizer.cpp
shibauthorizer_CXXFLAGS = $(FASTCGI_INCLUDE)
shibauthorizer_LDFLAGS = $(FASTCGI_LDFLAGS)
shibauthorizer_LDADD = $(FASTCGI_LIBS) \
- $(top_builddir)/shibsp/libshibsp-lite.la
+ $(top_builddir)/shibsp/libshibsp-lite.la \
+ $(LITE_LIBS)
shibresponder_SOURCES = shibresponder.cpp
shibresponder_CXXFLAGS = $(FASTCGI_INCLUDE)
shibresponder_LDFLAGS = $(FASTCGI_LDFLAGS)
shibresponder_LDADD = $(FASTCGI_LIBS) \
- $(top_builddir)/shibsp/libshibsp-lite.la
+ $(top_builddir)/shibsp/libshibsp-lite.la \
+ $(LITE_LIBS)
endif
diff --git a/fastcgi/Makefile.in b/fastcgi/Makefile.in
index bc71933..551f462 100644
--- a/fastcgi/Makefile.in
+++ b/fastcgi/Makefile.in
@@ -78,7 +78,8 @@ shibauthorizer_OBJECTS = $(am_shibauthorizer_OBJECTS)
am__DEPENDENCIES_1 =
@BUILD_FASTCGI_TRUE at shibauthorizer_DEPENDENCIES = \
@BUILD_FASTCGI_TRUE@ $(am__DEPENDENCIES_1) \
- at BUILD_FASTCGI_TRUE@ $(top_builddir)/shibsp/libshibsp-lite.la
+ at BUILD_FASTCGI_TRUE@ $(top_builddir)/shibsp/libshibsp-lite.la \
+ at BUILD_FASTCGI_TRUE@ $(am__DEPENDENCIES_1)
shibauthorizer_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(shibauthorizer_CXXFLAGS) $(CXXFLAGS) \
@@ -89,7 +90,8 @@ am__shibresponder_SOURCES_DIST = shibresponder.cpp
shibresponder_OBJECTS = $(am_shibresponder_OBJECTS)
@BUILD_FASTCGI_TRUE at shibresponder_DEPENDENCIES = \
@BUILD_FASTCGI_TRUE@ $(am__DEPENDENCIES_1) \
- at BUILD_FASTCGI_TRUE@ $(top_builddir)/shibsp/libshibsp-lite.la
+ at BUILD_FASTCGI_TRUE@ $(top_builddir)/shibsp/libshibsp-lite.la \
+ at BUILD_FASTCGI_TRUE@ $(am__DEPENDENCIES_1)
shibresponder_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(shibresponder_CXXFLAGS) \
$(CXXFLAGS) $(shibresponder_LDFLAGS) $(LDFLAGS) -o $@
@@ -307,13 +309,15 @@ AUTOMAKE_OPTIONS = foreign
@BUILD_FASTCGI_TRUE at shibauthorizer_CXXFLAGS = $(FASTCGI_INCLUDE)
@BUILD_FASTCGI_TRUE at shibauthorizer_LDFLAGS = $(FASTCGI_LDFLAGS)
@BUILD_FASTCGI_TRUE at shibauthorizer_LDADD = $(FASTCGI_LIBS) \
- at BUILD_FASTCGI_TRUE@ $(top_builddir)/shibsp/libshibsp-lite.la
+ at BUILD_FASTCGI_TRUE@ $(top_builddir)/shibsp/libshibsp-lite.la \
+ at BUILD_FASTCGI_TRUE@ $(LITE_LIBS)
@BUILD_FASTCGI_TRUE at shibresponder_SOURCES = shibresponder.cpp
@BUILD_FASTCGI_TRUE at shibresponder_CXXFLAGS = $(FASTCGI_INCLUDE)
@BUILD_FASTCGI_TRUE at shibresponder_LDFLAGS = $(FASTCGI_LDFLAGS)
@BUILD_FASTCGI_TRUE at shibresponder_LDADD = $(FASTCGI_LIBS) \
- at BUILD_FASTCGI_TRUE@ $(top_builddir)/shibsp/libshibsp-lite.la
+ at BUILD_FASTCGI_TRUE@ $(top_builddir)/shibsp/libshibsp-lite.la \
+ at BUILD_FASTCGI_TRUE@ $(LITE_LIBS)
EXTRA_DIST = \
shibauthorizer.cpp \
diff --git a/fastcgi/shibauthorizer.rc b/fastcgi/shibauthorizer.rc
index da6fa24..45db844 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
VALUE "InternalName", "shibauthorizer\0"
VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shibauthorizer.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/fastcgi/shibresponder.rc b/fastcgi/shibresponder.rc
index e34d65f..51974e5 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
VALUE "InternalName", "shibresponder\0"
VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shibresponder.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/isapi_shib/isapi_shib.rc b/isapi_shib/isapi_shib.rc
index a88c168..5aee75a 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
VALUE "InternalName", "isapi_shib\0"
VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "isapi_shib.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/memcache-store/memcache-store.rc b/memcache-store/memcache-store.rc
index 5619196..fb21242 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
VALUE "InternalName", "memcache-store\0"
VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "OriginalFilename", "memcache-store.so\0"
- VALUE "ProductName", "Shibboleth 2.5.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
END
END
BLOCK "VarFileInfo"
@@ -98,4 +98,4 @@ END
/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
\ No newline at end of file
+#endif // not APSTUDIO_INVOKED
diff --git a/nsapi_shib/nsapi_shib.rc b/nsapi_shib/nsapi_shib.rc
index a7fe2dd..c7c5288 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
VALUE "InternalName", "nsapi_shib\0"
VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "nsapi_shib.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/odbc-store/odbc-store.rc b/odbc-store/odbc-store.rc
index 1cd2579..3bd6ee4 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
VALUE "InternalName", "odbc-store\0"
VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "OriginalFilename", "odbc-store.so\0"
- VALUE "ProductName", "Shibboleth 2.5.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
END
END
BLOCK "VarFileInfo"
@@ -98,4 +98,4 @@ END
/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
\ No newline at end of file
+#endif // not APSTUDIO_INVOKED
diff --git a/plugins/plugins.rc b/plugins/plugins.rc
index 7b5f7a4..e1ce9e2 100644
--- a/plugins/plugins.rc
+++ b/plugins/plugins.rc
@@ -54,8 +54,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -73,7 +73,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "Shibboleth SP Plugins\0"
- VALUE "FileVersion", "2, 5, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
#ifdef SHIBSP_LITE
VALUE "InternalName", "plugins-lite\0"
#else
@@ -87,8 +87,8 @@ BEGIN
VALUE "OriginalFilename", "plugins.so\0"
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/schemas/shibboleth-2.0-native-sp-config.xsd b/schemas/shibboleth-2.0-native-sp-config.xsd
index 846c10b..efc1d94 100644
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -9,7 +9,7 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified"
blockDefault="substitution"
- version="2.5.1">
+ version="2.5.3">
<import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd" />
<import namespace="urn:oasis:names:tc:SAML:2.0:assertion" schemaLocation="saml-schema-assertion-2.0.xsd"/>
@@ -533,6 +533,7 @@
<attribute name="cookieLifetime" type="unsignedInt"/>
<attribute name="idpHistory" type="boolean"/>
<attribute name="idpHistoryDays" type="unsignedInt"/>
+ <attribute name="idpHistoryProps" type="conf:string"/>
<attribute name="lifetime" type="unsignedInt"/>
<attribute name="timeout" type="unsignedInt"/>
<attribute name="maxTimeSinceAuthn" type="unsignedInt"/>
diff --git a/shibboleth.spec b/shibboleth.spec
index 5917ff5..21107d1 100644
--- a/shibboleth.spec
+++ b/shibboleth.spec
@@ -1,5 +1,5 @@
Name: shibboleth
-Version: 2.5.2
+Version: 2.5.3
Release: 1
Summary: Open source system for attribute-based Web SSO
Group: Productivity/Networking/Security
diff --git a/shibd/shibd.rc b/shibd/shibd.rc
index 0084c80..af90ffc 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
VALUE "InternalName", "shibd\0"
VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shibd.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 6592e72..207cf6b 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -215,11 +215,11 @@ libshibsp_la_SOURCES = \
attribute/resolver/impl/ChainingAttributeResolver.cpp \
attribute/resolver/impl/QueryAttributeResolver.cpp \
attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp \
- attribute/resolver/impl/AssertionAttributeExtractor.cpp \
+ attribute/resolver/impl/AssertionAttributeExtractor.cpp \
attribute/resolver/impl/ChainingAttributeExtractor.cpp \
attribute/resolver/impl/DelegationAttributeExtractor.cpp \
attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp \
- attribute/resolver/impl/MetadataAttributeExtractor.cpp \
+ attribute/resolver/impl/MetadataAttributeExtractor.cpp \
attribute/resolver/impl/XMLAttributeExtractor.cpp \
binding/impl/ArtifactResolver.cpp \
binding/impl/SOAPClient.cpp \
@@ -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:2:0
+libshibsp_la_LDFLAGS = -version-info 6:3:0
libshibsp_la_LIBADD = $(XMLSEC_LIBS)
-libshibsp_lite_la_LDFLAGS = -version-info 6:2:0
+libshibsp_lite_la_LDFLAGS = -version-info 6:3:0
libshibsp_lite_la_LIBADD = $(LITE_LIBS)
libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
diff --git a/shibsp/Makefile.in b/shibsp/Makefile.in
index ce213ad..3e5f095 100644
--- a/shibsp/Makefile.in
+++ b/shibsp/Makefile.in
@@ -653,11 +653,11 @@ libshibsp_la_SOURCES = \
attribute/resolver/impl/ChainingAttributeResolver.cpp \
attribute/resolver/impl/QueryAttributeResolver.cpp \
attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp \
- attribute/resolver/impl/AssertionAttributeExtractor.cpp \
+ attribute/resolver/impl/AssertionAttributeExtractor.cpp \
attribute/resolver/impl/ChainingAttributeExtractor.cpp \
attribute/resolver/impl/DelegationAttributeExtractor.cpp \
attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp \
- attribute/resolver/impl/MetadataAttributeExtractor.cpp \
+ attribute/resolver/impl/MetadataAttributeExtractor.cpp \
attribute/resolver/impl/XMLAttributeExtractor.cpp \
binding/impl/ArtifactResolver.cpp \
binding/impl/SOAPClient.cpp \
@@ -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:2:0
+libshibsp_la_LDFLAGS = -version-info 6:3:0
libshibsp_la_LIBADD = $(XMLSEC_LIBS)
-libshibsp_lite_la_LDFLAGS = -version-info 6:2:0
+libshibsp_lite_la_LDFLAGS = -version-info 6:3:0
libshibsp_lite_la_LIBADD = $(LITE_LIBS)
libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp
index 0e42344..695763a 100644
--- a/shibsp/SPConfig.cpp
+++ b/shibsp/SPConfig.cpp
@@ -233,13 +233,6 @@ bool SPConfig::init(const char* catalog_path, const char* inst_prefix)
return false;
}
#endif
- if (!catalog_path)
- catalog_path = getenv("SHIBSP_SCHEMAS");
- if (!catalog_path || !*catalog_path)
- catalog_path = SHIBSP_SCHEMAS;
- if (!XMLToolingConfig::getConfig().getValidatingParser().loadCatalogs(catalog_path)) {
- log.warn("failed to load schema catalogs into validating parser");
- }
PathResolver* pr = XMLToolingConfig::getConfig().getPathResolver();
pr->setDefaultPackageName(PACKAGE_NAME);
@@ -266,6 +259,14 @@ bool SPConfig::init(const char* catalog_path, const char* inst_prefix)
inst_prefix = SHIBSP_XMLDIR;
pr->setXMLDir(inst_prefix);
+ if (!catalog_path)
+ catalog_path = getenv("SHIBSP_SCHEMAS");
+ if (!catalog_path || !*catalog_path)
+ catalog_path = SHIBSP_SCHEMAS;
+ if (!XMLToolingConfig::getConfig().getValidatingParser().loadCatalogs(catalog_path)) {
+ log.warn("failed to load schema catalogs into validating parser");
+ }
+
XMLToolingConfig::getConfig().setTemplateEngine(new TemplateEngine());
XMLToolingConfig::getConfig().getTemplateEngine()->setTagPrefix("shibmlp");
diff --git a/shibsp/handler/impl/AbstractHandler.cpp b/shibsp/handler/impl/AbstractHandler.cpp
index 2b356cd..37db704 100644
--- a/shibsp/handler/impl/AbstractHandler.cpp
+++ b/shibsp/handler/impl/AbstractHandler.cpp
@@ -449,7 +449,7 @@ void AbstractHandler::checkError(const XMLObject* response, const saml2md::RoleD
const saml2p::StatusCode* sc = status->getStatusCode();
const XMLCh* code = sc ? sc->getValue() : nullptr;
if (code && !XMLString::equals(code,saml2p::StatusCode::SUCCESS)) {
- FatalProfileException ex("SAML response contained an error.");
+ FatalProfileException ex("SAML response reported an IdP error.");
annotateException(&ex, role, status); // throws it
}
}
@@ -462,7 +462,7 @@ void AbstractHandler::checkError(const XMLObject* response, const saml2md::RoleD
const saml1p::StatusCode* sc = status->getStatusCode();
const xmltooling::QName* code = sc ? sc->getValue() : nullptr;
if (code && *code != saml1p::StatusCode::SUCCESS) {
- FatalProfileException ex("SAML response contained an error.");
+ FatalProfileException ex("SAML response reported an IdP error.");
annotateException(&ex, role, status); // throws it
}
}
diff --git a/shibsp/metadata/DynamicMetadataProvider.cpp b/shibsp/metadata/DynamicMetadataProvider.cpp
index 9f9079d..da5c808 100644
--- a/shibsp/metadata/DynamicMetadataProvider.cpp
+++ b/shibsp/metadata/DynamicMetadataProvider.cpp
@@ -40,6 +40,7 @@
#include <saml/binding/SAMLArtifact.h>
#include <saml/saml2/metadata/Metadata.h>
#include <saml/saml2/metadata/DynamicMetadataProvider.h>
+
#include <xmltooling/logging.h>
#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/security/Credential.h>
@@ -300,6 +301,12 @@ saml2md::EntityDescriptor* DynamicMetadataProvider::resolve(const saml2md::Metad
// Wrap the document for now.
XercesJanitor<DOMDocument> docjanitor(doc);
+ // Check root element.
+ if (!doc->getDocumentElement() || !XMLHelper::isNodeNamed(doc->getDocumentElement(),
+ samlconstants::SAML20MD_NS, saml2md::EntityDescriptor::LOCAL_NAME)) {
+ throw saml2md::MetadataException("Root of metadata instance was not an EntityDescriptor");
+ }
+
// Unmarshall objects, binding the document.
auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
docjanitor.release();
diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index 36f9aa7..a13719b 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 1,5,3,0
+ PRODUCTVERSION 2,5,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -51,7 +51,7 @@ BEGIN
#else
VALUE "FileDescription", "Shibboleth SP Library\0"
#endif
- VALUE "FileVersion", "1, 5, 2, 0\0"
+ VALUE "FileVersion", "1, 5, 3, 0\0"
#ifdef SHIBSP_LITE
#ifdef _DEBUG
VALUE "InternalName", "shibsp-lite1_5D\0"
@@ -81,8 +81,8 @@ BEGIN
#endif
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/shibsp/version.h b/shibsp/version.h
index 193ca5d..cdd9dfa 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 2
+#define SHIBSP_VERSION_REVISION 3
/** DO NOT MODIFY BELOW THIS LINE */
diff --git a/util/mdquery.rc b/util/mdquery.rc
index 028367a..8efcfab 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
VALUE "InternalName", "mdquery\0"
VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mdquery.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/util/resolvertest.rc b/util/resolvertest.rc
index 30a0fe4..0e1a778 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,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 5, 3, 0\0"
VALUE "InternalName", "resolvertest\0"
VALUE "LegalCopyright", "Copyright � 2013 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "resolvertest.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.5.2\0"
- VALUE "ProductVersion", "2, 5, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.5.3\0"
+ VALUE "ProductVersion", "2, 5, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list