Add patch version

diff --git a/Shibboleth.sln b/Shibboleth.sln
index b7c0145..d36fe87 100644 (file)
--- a/Shibboleth.sln
+++ b/Shibboleth.sln
@@ -74,6 +74,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{31B171C1-E
                m4\acinclude.m4 = m4\acinclude.m4
                m4\acx_pthread.m4 = m4\acx_pthread.m4
                m4\boost.m4 = m4\boost.m4
+               config_win32.h = config_win32.h
                configure.ac = configure.ac
                doxygen.am = doxygen.am
                doxygen.cfg = doxygen.cfg

diff --git a/adfs/adfs.rc b/adfs/adfs.rc
index 97e87d1..c70570d 100644 (file)
--- a/adfs/adfs.rc
+++ b/adfs/adfs.rc
@@ -71,7 +71,7 @@ BEGIN
         BLOCK "040904b0"\r
         BEGIN\r
             VALUE "Comments", "\0"\r
-            VALUE "CompanyName", "Internet2\0"\r
+            VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0"\r
             VALUE "FileVersion", "2, 5, 0, 0\0"\r
 #ifdef SHIBSP_LITE\r
@@ -79,7 +79,7 @@ BEGIN
 #else\r
             VALUE "InternalName", "adfs\0"\r
 #endif\r
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
+            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef SHIBSP_LITE\r
             VALUE "OriginalFilename", "adfs-lite.so\0"\r
@@ -87,7 +87,7 @@ BEGIN
             VALUE "OriginalFilename", "adfs.so\0"\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5\0"\r
+            VALUE "ProductName", "Shibboleth 2.5.0\0"\r
             VALUE "ProductVersion", "2, 5, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r

diff --git a/apache/mod_shib_13.rc b/apache/mod_shib_13.rc
index 52140ef..ade0590 100644 (file)
--- a/apache/mod_shib_13.rc
+++ b/apache/mod_shib_13.rc
@@ -45,15 +45,15 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "Comments", "\0"
-            VALUE "CompanyName", "Internet2\0"
+            VALUE "CompanyName", "Shibboleth Consortium\0"
             VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0"
             VALUE "FileVersion", "2, 5, 0, 0\0"
             VALUE "InternalName", "mod_shib_13\0"
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "mod_shib_13.so\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.5\0"
+            VALUE "ProductName", "Shibboleth 2.5.0\0"
             VALUE "ProductVersion", "2, 5, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END

diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc
index 90449c2..17c91bb 100644 (file)
--- a/apache/mod_shib_20.rc
+++ b/apache/mod_shib_20.rc
@@ -45,15 +45,15 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "Comments", "\0"
-            VALUE "CompanyName", "Internet2\0"
+            VALUE "CompanyName", "Shibboleth Consortium\0"
             VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0"
             VALUE "FileVersion", "2, 5, 0, 0\0"
             VALUE "InternalName", "mod_shib_20\0"
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "mod_shib_20.so\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.5\0"
+            VALUE "ProductName", "Shibboleth 2.5.0\0"
             VALUE "ProductVersion", "2, 5, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END

diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc
index 974b093..86b93f4 100644 (file)
--- a/apache/mod_shib_22.rc
+++ b/apache/mod_shib_22.rc
@@ -45,15 +45,15 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "Comments", "\0"
-            VALUE "CompanyName", "Internet2\0"
+            VALUE "CompanyName", "Shibboleth Consortium\0"
             VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0"
             VALUE "FileVersion", "2, 5, 0, 0\0"
             VALUE "InternalName", "mod_shib_22\0"
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "mod_shib_22.so\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.5\0"
+            VALUE "ProductName", "Shibboleth 2.5.0\0"
             VALUE "ProductVersion", "2, 5, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END

diff --git a/apache/mod_shib_24.rc b/apache/mod_shib_24.rc
index c673701..3ddda07 100644 (file)
--- a/apache/mod_shib_24.rc
+++ b/apache/mod_shib_24.rc
@@ -45,7 +45,7 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "Comments", "\0"
-            VALUE "CompanyName", "Internet2\0"
+            VALUE "CompanyName", "Shibboleth Consortium\0"
             VALUE "FileDescription", "Shibboleth Apache 2.4 Module\0"
             VALUE "FileVersion", "2, 5, 0, 0\0"
             VALUE "InternalName", "mod_shib_22\0"
@@ -53,7 +53,7 @@ BEGIN
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "mod_shib_22.so\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.5\0"
+            VALUE "ProductName", "Shibboleth 2.5.0\0"
             VALUE "ProductVersion", "2, 5, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END

diff --git a/config_win32.h b/config_win32.h
index 8889cde..e678095 100644 (file)
--- 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"
+#define PACKAGE_STRING "shibboleth 2.5.0"
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "shibboleth"
+#define PACKAGE_TARNAME "shibboleth-sp"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5"
+#define PACKAGE_VERSION "2.5.0"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */

diff --git a/configure.ac b/configure.ac
index c6e3922..0eeb4a9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([shibboleth],[2.5],[https://issues.shibboleth.net/],[shibboleth])
+AC_INIT([shibboleth],[2.5.0],[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/shibauthorizer.rc b/fastcgi/shibauthorizer.rc
index f072534..6326273 100644 (file)
--- a/fastcgi/shibauthorizer.rc
+++ b/fastcgi/shibauthorizer.rc
@@ -45,15 +45,15 @@ BEGIN
         BLOCK "040904b0"\r
         BEGIN\r
             VALUE "Comments", "\0"\r
-            VALUE "CompanyName", "Internet2\0"\r
+            VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0"\r
             VALUE "FileVersion", "2, 5, 0, 0\0"\r
             VALUE "InternalName", "shibauthorizer\0"\r
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
+            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibauthorizer.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5\0"\r
+            VALUE "ProductName", "Shibboleth 2.5.0\0"\r
             VALUE "ProductVersion", "2, 5, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r

diff --git a/fastcgi/shibresponder.rc b/fastcgi/shibresponder.rc
index 8ce2569..469d4f1 100644 (file)
--- a/fastcgi/shibresponder.rc
+++ b/fastcgi/shibresponder.rc
@@ -45,15 +45,15 @@ BEGIN
         BLOCK "040904b0"\r
         BEGIN\r
             VALUE "Comments", "\0"\r
-            VALUE "CompanyName", "Internet2\0"\r
+            VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth FastCGI Responder\0"\r
             VALUE "FileVersion", "2, 5, 0, 0\0"\r
             VALUE "InternalName", "shibresponder\0"\r
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
+            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibresponder.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5\0"\r
+            VALUE "ProductName", "Shibboleth 2.5.0\0"\r
             VALUE "ProductVersion", "2, 5, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r

diff --git a/isapi_shib/isapi_shib.rc b/isapi_shib/isapi_shib.rc
index bc63480..b0314d7 100644 (file)
--- a/isapi_shib/isapi_shib.rc
+++ b/isapi_shib/isapi_shib.rc
@@ -45,15 +45,15 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "Comments", "\0"
-            VALUE "CompanyName", "Internet2\0"
+            VALUE "CompanyName", "Shibboleth Consortium\0"
             VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0"
             VALUE "FileVersion", "2, 5, 0, 0\0"
             VALUE "InternalName", "isapi_shib\0"
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "isapi_shib.dll\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.5\0"
+            VALUE "ProductName", "Shibboleth 2.5.0\0"
             VALUE "ProductVersion", "2, 5, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END

diff --git a/memcache-store/memcache-store.rc b/memcache-store/memcache-store.rc
index e0d9c12..3884f11 100644 (file)
--- a/memcache-store/memcache-store.rc
+++ b/memcache-store/memcache-store.rc
@@ -69,13 +69,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "Internet2\0"
+            VALUE "CompanyName", "Shibboleth Consortium\0"
             VALUE "FileDescription", "Shibboleth Memcache Storage Service Plugin\0"
             VALUE "FileVersion", "2, 5, 0, 0\0"
             VALUE "InternalName", "memcache-store\0"
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"
             VALUE "OriginalFilename", "memcache-store.so\0"
-            VALUE "ProductName", "Shibboleth 2.5\0"
+            VALUE "ProductName", "Shibboleth 2.5.0\0"
             VALUE "ProductVersion", "2, 5, 0, 0\0"
         END
     END

diff --git a/nsapi_shib/nsapi_shib.rc b/nsapi_shib/nsapi_shib.rc
index 97e0cc9..567ba08 100644 (file)
--- a/nsapi_shib/nsapi_shib.rc
+++ b/nsapi_shib/nsapi_shib.rc
@@ -45,15 +45,15 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "Comments", "\0"
-            VALUE "CompanyName", "Internet2\0"
+            VALUE "CompanyName", "Shibboleth Consortium\0"
             VALUE "FileDescription", "Shibboleth NSAPI Extension\0"
             VALUE "FileVersion", "2, 5, 0, 0\0"
             VALUE "InternalName", "nsapi_shib\0"
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "nsapi_shib.dll\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.5\0"
+            VALUE "ProductName", "Shibboleth 2.5.0\0"
             VALUE "ProductVersion", "2, 5, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END

diff --git a/odbc-store/odbc-store.rc b/odbc-store/odbc-store.rc
index fdda5c0..8d23b33 100644 (file)
--- a/odbc-store/odbc-store.rc
+++ b/odbc-store/odbc-store.rc
@@ -69,13 +69,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "Internet2\0"
+            VALUE "CompanyName", "Shibboleth Consortium\0"
             VALUE "FileDescription", "Shibboleth ODBC Storage Service Plugin\0"
             VALUE "FileVersion", "2, 5, 0, 0\0"
             VALUE "InternalName", "odbc-store\0"
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"
             VALUE "OriginalFilename", "odbc-store.so\0"
-            VALUE "ProductName", "Shibboleth 2.5\0"
+            VALUE "ProductName", "Shibboleth 2.5.0\0"
             VALUE "ProductVersion", "2, 5, 0, 0\0"
         END
     END

diff --git a/plugins/plugins.rc b/plugins/plugins.rc
index 57cded7..f2ac92c 100644 (file)
--- a/plugins/plugins.rc
+++ b/plugins/plugins.rc
@@ -71,7 +71,7 @@ BEGIN
         BLOCK "040904b0"\r
         BEGIN\r
             VALUE "Comments", "\0"\r
-            VALUE "CompanyName", "Internet2\0"\r
+            VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth SP Plugins\0"\r
             VALUE "FileVersion", "2, 5, 0, 0\0"\r
 #ifdef SHIBSP_LITE\r
@@ -79,7 +79,7 @@ BEGIN
 #else\r
             VALUE "InternalName", "plugins\0"\r
 #endif\r
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
+            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef SHIBSP_LITE\r
             VALUE "OriginalFilename", "plugins-lite.so\0"\r
@@ -87,7 +87,7 @@ BEGIN
             VALUE "OriginalFilename", "plugins.so\0"\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5\0"\r
+            VALUE "ProductName", "Shibboleth 2.5.0\0"\r
             VALUE "ProductVersion", "2, 5, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r

diff --git a/shibd/shibd.rc b/shibd/shibd.rc
index 822415b..93a37f4 100644 (file)
--- a/shibd/shibd.rc
+++ b/shibd/shibd.rc
@@ -45,15 +45,15 @@ BEGIN
         BLOCK "040904b0"\r
         BEGIN\r
             VALUE "Comments", "\0"\r
-            VALUE "CompanyName", "Internet2\0"\r
+            VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth Daemon Service\0"\r
             VALUE "FileVersion", "2, 5, 0, 0\0"\r
             VALUE "InternalName", "shibd\0"\r
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
+            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibd.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5\0"\r
+            VALUE "ProductName", "Shibboleth 2.5.0\0"\r
             VALUE "ProductVersion", "2, 5, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r

diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index d336a70..49026f2 100644 (file)
--- a/shibsp/shibsp.rc
+++ b/shibsp/shibsp.rc
@@ -45,7 +45,7 @@ BEGIN
         BLOCK "040904b0"\r
         BEGIN\r
             VALUE "Comments", "\0"\r
-            VALUE "CompanyName", "Internet2\0"\r
+            VALUE "CompanyName", "Shibboleth Consortium\0"\r
 #ifdef SHIBSP_LITE\r
             VALUE "FileDescription", "Shibboleth SP Lite Library\0"\r
 #else\r
@@ -65,7 +65,7 @@ BEGIN
             VALUE "InternalName", "shibsp1_4\0"\r
 #endif\r
 #endif\r
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
+            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef SHIBSP_LITE\r
 #ifdef _DEBUG\r
@@ -81,7 +81,7 @@ BEGIN
 #endif\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5\0"\r
+            VALUE "ProductName", "Shibboleth 2.5.0\0"\r
             VALUE "ProductVersion", "2, 5, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r