From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 25 Dec 2009 23:49:31 +0000 (+0000)
Subject: Bump version, version schema directories.
X-Git-Tag: 2.4RC1~152
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=76c21a35bec4106a11c2c960c2492b1ff2740b3c

Bump version, version schema directories.
---

diff --git a/Makefile.am b/Makefile.am
index 96b8823..277ca61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,10 @@ dist-hook:
 	rm -rf `find $(distdir)/isapi_shib -name .svn`
 	rm -rf `find $(distdir)/doc/api -name .svn`
 
-GENFILES = shibboleth.spec pkginfo Portfile
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = @PACKAGE_NAME@.pc
+
+GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile
 
 EXTRA_DIST = $(DX_CONFIG) \
     isapi_shib \
diff --git a/adfs/adfs.rc b/adfs/adfs.rc
index c3a45fe..76029e4 100644
--- a/adfs/adfs.rc
+++ b/adfs/adfs.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,7 +73,7 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0"
-            VALUE "FileVersion", "2, 3, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 0, 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.3.1\0"
-            VALUE "ProductVersion", "2, 3, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4\0"
+            VALUE "ProductVersion", "2, 4, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/apache/mod_shib_13.rc b/apache/mod_shib_13.rc
index 2bff418..9611c7e 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,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0"
-            VALUE "FileVersion", "2, 3, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 0, 0\0"
             VALUE "InternalName", "mod_shib_13\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "mod_shib_13.so\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.3.1\0"
-            VALUE "ProductVersion", "2, 3, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4\0"
+            VALUE "ProductVersion", "2, 4, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc
index bffa8f8..acb87bb 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,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0"
-            VALUE "FileVersion", "2, 3, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 0, 0\0"
             VALUE "InternalName", "mod_shib_20\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "mod_shib_20.so\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.3.1\0"
-            VALUE "ProductVersion", "2, 3, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4\0"
+            VALUE "ProductVersion", "2, 4, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc
index 2864f5c..b8a1419 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,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0"
-            VALUE "FileVersion", "2, 3, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 0, 0\0"
             VALUE "InternalName", "mod_shib_22\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "mod_shib_22.so\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.3.1\0"
-            VALUE "ProductVersion", "2, 3, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4\0"
+            VALUE "ProductVersion", "2, 4, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/config_win32.h b/config_win32.h
index ec6787b..95838b6 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -117,13 +117,13 @@
 #define PACKAGE_NAME "shibboleth"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth 2.3.1"
+#define PACKAGE_STRING "shibboleth 2.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "shibboleth"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.3.1"
+#define PACKAGE_VERSION "2.4"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -136,7 +136,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "2.3.1"
+#define VERSION "2.4"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
diff --git a/configure.ac b/configure.ac
index 819e749b..c6daede 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.50])
-AC_INIT([shibboleth], [2.3.1], [shibboleth-users@internet2.edu], [shibboleth])
+AC_INIT([shibboleth], [2.4], [shibboleth-users@internet2.edu], [shibboleth])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([shibboleth],[2.3.1])
+AM_INIT_AUTOMAKE([shibboleth],[2.4])
 
 sinclude(doxygen.m4)
 sinclude(acx_pthread.m4)
@@ -61,6 +61,7 @@ fi
 
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
+AC_PATH_PROG(PKG_CONFIG, pkg-config)
 
 AC_LANG(C)
 
@@ -93,7 +94,6 @@ AC_ARG_WITH(openssl,
     fi])
 
 if test "x$SSLFLAGS" = "x" ; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config)
     if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then
         if pkg-config openssl ; then
             SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
@@ -253,6 +253,7 @@ AC_ARG_WITH(xmltooling,
             [if test x_$with_xmltooling != x_/usr; then
                 LDFLAGS="-L${with_xmltooling}/lib $LDFLAGS"
                 CPPFLAGS="-I${with_xmltooling}/include $CPPFLAGS"
+                export PKG_CONFIG_PATH="${with_xmltooling}/lib/pkgconfig"
             fi])
 LITE_LIBS="-lxmltooling-lite"
 XMLSEC_LIBS="-lxmltooling"
@@ -273,22 +274,33 @@ AC_TRY_LINK(
 # restore master libs
 LIBS="$save_LIBS"
 
+# Determine xmltooling version.
+XMLTOOLINGVER="1.4"
+AC_ARG_WITH(xmltoolingver,
+    AC_HELP_STRING([--with-xmltoolingver=VERSION], [xmltooling version, normally derived via pkg-config]),
+    [XMLTOOLINGVER="$with_xmltoolingver"],
+    [if test "x$PKG_CONFIG" != "x" && test "x$PKG_CONFIG" != "xno" ; then
+        if pkg-config xmltooling ; then
+            XMLTOOLINGVER="`$PKG_CONFIG --modversion xmltooling`"
+        fi
+    fi])
+
 # Establish location of xmltooling catalog.
 XMLTOOLINGXMLDIR=""
 if test "x$with_xmltooling" = "x" ; then
    with_xmltooling="/usr"
 fi
-if test -f $with_xmltooling/share/xml/xmltooling/catalog.xml ; then
+if test -f $with_xmltooling/share/xml/xmltooling-$XMLTOOLINGVER/catalog.xml ; then
     XMLTOOLINGXMLDIR="$with_xmltooling"
-elif test -f $with_xerces/share/xml/xmltooling/catalog.xml ; then
+elif test -f $with_xerces/share/xml/xmltooling-$XMLTOOLINGVER/catalog.xml ; then
     XMLTOOLINGXMLDIR="$with_xerces"
-elif test -f $with_log4shib/share/xml/xmltooling/catalog.xml ; then
+elif test -f $with_log4shib/share/xml/xmltooling-$XMLTOOLINGVER/catalog.xml ; then
     XMLTOOLINGXMLDIR="$with_log4shib"
 fi
 if test "x$XMLTOOLINGXMLDIR" = "x" ; then
     AC_MSG_ERROR([xmltooling XML catalog not found, may need to use --with-xmltooling option])
 fi
-XMLTOOLINGXMLDIR="$XMLTOOLINGXMLDIR/share/xml/xmltooling"
+XMLTOOLINGXMLDIR="$XMLTOOLINGXMLDIR/share/xml/xmltooling-$XMLTOOLINGVER"
 AC_SUBST(XMLTOOLINGXMLDIR)
 
 # XML-Security settings
@@ -354,24 +366,35 @@ opensaml::SAMLConfig::getConfig();
 # restore master libs
 LIBS="$save_LIBS"
 
+# Determine opensaml version.
+OPENSAMLVER="2.4"
+AC_ARG_WITH(samlver,
+    AC_HELP_STRING([--with-samlver=VERSION], [opensaml version, normally derived via pkg-config]),
+    [OPENSAMLVER="$with_samlver"],
+    [if test "x$PKG_CONFIG" != "x" && test "x$PKG_CONFIG" != "xno" ; then
+        if pkg-config opensaml ; then
+            OPENSAMLVER="`$PKG_CONFIG --modversion opensaml`"
+        fi
+    fi])
+
 # Establish location of opensaml catalogs.
 OPENSAMLXMLDIR=""
 if test "x$with_saml" = "x" ; then
     with_saml="/usr"
 fi
-if test -f $with_saml/share/xml/opensaml/saml20-catalog.xml ; then
+if test -f $with_saml/share/xml/opensaml-$OPENSAMLVER/saml20-catalog.xml ; then
     OPENSAMLXMLDIR="$with_saml"
-elif test -f $with_xmltooling/share/xml/opensaml/saml20-catalog.xml ; then
+elif test -f $with_xmltooling/share/xml/opensaml-$OPENSAMLVER/saml20-catalog.xml ; then
     OPENSAMLXMLDIR="$with_xmltooling"
-elif test -f $with_xerces/share/xml/opensaml/saml20-catalog.xml ; then
+elif test -f $with_xerces/share/xml/opensaml-$OPENSAMLVER/saml20-catalog.xml ; then
     OPENSAMLXMLDIR="$with_xerces"
-elif test -f $with_log4shib/share/xml/opensaml/saml20-catalog.xml ; then
+elif test -f $with_log4shib/share/xml/opensaml-$OPENSAMLVER/saml20-catalog.xml ; then
     OPENSAMLXMLDIR="$with_log4shib"
 fi
 if test "x$OPENSAMLXMLDIR" = "x" ; then
     AC_MSG_ERROR([opensaml XML catalogs not found, may need to use --with-saml option])
 fi
-OPENSAMLXMLDIR="$OPENSAMLXMLDIR/share/xml/opensaml"
+OPENSAMLXMLDIR="$OPENSAMLXMLDIR/share/xml/opensaml-$OPENSAMLVER"
 AC_SUBST(OPENSAMLXMLDIR)
 
 AC_SUBST(LITE_LIBS)
diff --git a/fastcgi/shibauthorizer.rc b/fastcgi/shibauthorizer.rc
index e1f7b95..85da823 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,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0"
-            VALUE "FileVersion", "2, 3, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 0, 0\0"
             VALUE "InternalName", "shibauthorizer\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "shibauthorizer.exe\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.3.1\0"
-            VALUE "ProductVersion", "2, 3, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4\0"
+            VALUE "ProductVersion", "2, 4, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/fastcgi/shibresponder.rc b/fastcgi/shibresponder.rc
index c41b96c..fc75527 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,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth FastCGI Responder\0"
-            VALUE "FileVersion", "2, 3, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 0, 0\0"
             VALUE "InternalName", "shibresponder\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "shibresponder.exe\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.3.1\0"
-            VALUE "ProductVersion", "2, 3, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4\0"
+            VALUE "ProductVersion", "2, 4, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/isapi_shib/isapi_shib.rc b/isapi_shib/isapi_shib.rc
index 63c0d2f..d6a0941 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,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0"
-            VALUE "FileVersion", "2, 3, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 0, 0\0"
             VALUE "InternalName", "isapi_shib\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "isapi_shib.dll\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.3.1\0"
-            VALUE "ProductVersion", "2, 3, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4\0"
+            VALUE "ProductVersion", "2, 4, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/memcache-store/memcache-store.rc b/memcache-store/memcache-store.rc
index fb78af6..0c0f582 100644
--- a/memcache-store/memcache-store.rc
+++ b/memcache-store/memcache-store.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth Memcache Storage Service Plugin\0"
-            VALUE "FileVersion", "2, 3, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 0, 0\0"
             VALUE "InternalName", "memcache-store\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "OriginalFilename", "memcache-store.so\0"
-            VALUE "ProductName", "Shibboleth 2.3.1\0"
-            VALUE "ProductVersion", "2, 3, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4\0"
+            VALUE "ProductVersion", "2, 4, 0, 0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/nsapi_shib/nsapi_shib.rc b/nsapi_shib/nsapi_shib.rc
index c4004f5..ef6b273 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,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth NSAPI Extension\0"
-            VALUE "FileVersion", "2, 3, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 0, 0\0"
             VALUE "InternalName", "nsapi_shib\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "nsapi_shib.dll\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.3.1\0"
-            VALUE "ProductVersion", "2, 3, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4\0"
+            VALUE "ProductVersion", "2, 4, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/odbc-store/odbc-store.rc b/odbc-store/odbc-store.rc
index bfcbae5..628ea0f 100644
--- a/odbc-store/odbc-store.rc
+++ b/odbc-store/odbc-store.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth ODBC Storage Service Plugin\0"
-            VALUE "FileVersion", "2, 3, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 0, 0\0"
             VALUE "InternalName", "odbc-store\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "OriginalFilename", "odbc-store.so\0"
-            VALUE "ProductName", "Shibboleth 2.3.1\0"
-            VALUE "ProductVersion", "2, 3, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4\0"
+            VALUE "ProductVersion", "2, 4, 0, 0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index abc985f..4a1cec5 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-pkgxmldir = $(datadir)/xml/@PACKAGE@
+pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@-@PACKAGE_VERSION@
 
 schemafiles = \
     shibboleth.xsd \
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 21cadbc..c493a6f 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -1,4 +1,4 @@
-Name:		@PACKAGE@
+Name:		@PACKAGE_NAME@
 Version:	@PACKAGE_VERSION@
 Release:	1
 Summary:    Open source system for attribute-based Web SSO
@@ -25,10 +25,9 @@ BuildRequires:  opensaml-devel >= 2.3
 %{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
 %endif
-BuildRequires:  gcc-c++
+BuildRequires:  gcc-c++, pkgconfig, zlib-devel
 %{!?_without_doxygen:BuildRequires: doxygen}
 %{!?_without_odbc:BuildRequires:unixODBC-devel}
-BuildRequires:  zlib-devel
 %{?_with_fastcgi:BuildRequires: fcgi-devel}
 %if "%{_vendor}" == "redhat"
 %{!?_without_builtinapache:BuildRequires: httpd-devel}
@@ -215,8 +214,8 @@ cd /
 %exclude %{_libdir}/%{name}/*.la
 %dir %{_localstatedir}/log/%{name}
 %dir %{_localstatedir}/run/%{name}
-%dir %{_datadir}/xml/%{name}
-%{_datadir}/xml/%{name}/*
+%dir %{_datadir}/xml/%{name}-%{version}
+%{_datadir}/xml/%{name}-%{version}/*
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*.xml
 %config(noreplace) %{_sysconfdir}/%{name}/*.html
@@ -244,6 +243,9 @@ cd /
 %doc %{pkgdocdir}/api
 
 %changelog
+* Fri Dec 25 2009  Scott Cantor  <cantor.2@osu.edu>  - 2.4-1
+- Bump version and version schema folder.
+
 * Mon Nov 23 2009 Scott Cantor  <cantor.2@osu.edu>  - 2.3.1-1
 - Reset revision for 2.3.1 release
 
diff --git a/shibd/shibd.rc b/shibd/shibd.rc
index a2ce8b1..6a3e8c8 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,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth Daemon Service\0"
-            VALUE "FileVersion", "2, 3, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 0, 0\0"
             VALUE "InternalName", "shibd\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "shibd.exe\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.3.1\0"
-            VALUE "ProductVersion", "2, 3, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4\0"
+            VALUE "ProductVersion", "2, 4, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 213f834..0061c00 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -206,12 +206,12 @@ libshibsp_la_SOURCES = \
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 4:1:0
-libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 4:1:0
+libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 5:0:0
+libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 5:0:0
 libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
 
-pkgsysconfdir = $(sysconfdir)/@PACKAGE@
-pkgxmldir = $(datadir)/xml/@PACKAGE@
+pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
+pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@-@PACKAGE_VERSION@
 logdir = ${localstatedir}/log
 rundir = $(localstatedir)/run
 xmldir = $(datadir)/xml
diff --git a/shibsp/shibsp-lite.vcproj b/shibsp/shibsp-lite.vcproj
index a109bb8..1c3c9b0 100644
--- a/shibsp/shibsp-lite.vcproj
+++ b/shibsp/shibsp-lite.vcproj
@@ -67,7 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xmltooling-lite1D.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_4D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"
 				GenerateDebugInformation="true"
@@ -148,7 +148,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xmltooling-lite1D.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_4D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"
 				GenerateDebugInformation="true"
@@ -225,7 +225,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1.lib xerces-c_3.lib xmltooling-lite1.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_3.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_4.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"
 				SubSystem="2"
@@ -304,7 +304,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1.lib xerces-c_3.lib xmltooling-lite1.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_3.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_4.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"
 				GenerateDebugInformation="true"
diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index c503f8b..e4a5b72 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,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -51,38 +51,38 @@ BEGIN
 #else
             VALUE "FileDescription", "Shibboleth SP Library\0"
 #endif
-            VALUE "FileVersion", "1, 3, 0, 0\0"
+            VALUE "FileVersion", "1, 4, 0, 0\0"
 #ifdef SHIBSP_LITE
 #ifdef _DEBUG
-            VALUE "InternalName", "shibsp-lite1_3D\0"
+            VALUE "InternalName", "shibsp-lite1_4D\0"
 #else
-            VALUE "InternalName", "shibsp-lite1_3\0"
+            VALUE "InternalName", "shibsp-lite1_4\0"
 #endif
 #else
 #ifdef _DEBUG
-            VALUE "InternalName", "shibsp1_3D\0"
+            VALUE "InternalName", "shibsp1_4D\0"
 #else
-            VALUE "InternalName", "shibsp1_3\0"
+            VALUE "InternalName", "shibsp1_4\0"
 #endif
 #endif
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
 #ifdef SHIBSP_LITE
 #ifdef _DEBUG
-            VALUE "OriginalFilename", "shibsp-lite1_3D.dll\0"
+            VALUE "OriginalFilename", "shibsp-lite1_4D.dll\0"
 #else
-            VALUE "OriginalFilename", "shibsp-lite1_3.dll\0"
+            VALUE "OriginalFilename", "shibsp-lite1_4.dll\0"
 #endif
 #else
 #ifdef _DEBUG
-            VALUE "OriginalFilename", "shibsp1_3D.dll\0"
+            VALUE "OriginalFilename", "shibsp1_4D.dll\0"
 #else
-            VALUE "OriginalFilename", "shibsp1_3.dll\0"
+            VALUE "OriginalFilename", "shibsp1_4.dll\0"
 #endif
 #endif
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.3.1\0"
-            VALUE "ProductVersion", "2, 3, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4\0"
+            VALUE "ProductVersion", "2, 4, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/shibsp/shibsp.vcproj b/shibsp/shibsp.vcproj
index 72d6861..f4e496c 100644
--- a/shibsp/shibsp.vcproj
+++ b/shibsp/shibsp.vcproj
@@ -67,7 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_4D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"
 				GenerateDebugInformation="true"
@@ -148,7 +148,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_4D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(PlatformName)\$(ConfigurationName);..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"
 				GenerateDebugInformation="true"
@@ -224,7 +224,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1.lib xerces-c_3.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_3.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_4.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"
 				SubSystem="2"
@@ -302,7 +302,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1.lib xerces-c_3.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_3.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_4.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(PlatformName)\$(ConfigurationName);..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"
 				GenerateDebugInformation="true"
diff --git a/shibsp/version.h b/shibsp/version.h
index 80230ba..76aebdc 100644
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -38,8 +38,8 @@
  */
 
 #define SHIBSP_VERSION_MAJOR 1
-#define SHIBSP_VERSION_MINOR 3
-#define SHIBSP_VERSION_REVISION 1
+#define SHIBSP_VERSION_MINOR 4
+#define SHIBSP_VERSION_REVISION 0
 
 /** DO NOT MODIFY BELOW THIS LINE */