Bump version.

diff --git a/Portfile b/Portfile
index b392b12..acd459e 100644 (file)
--- a/Portfile
+++ b/Portfile
@@ -1,8 +1,7 @@
 PortSystem 1.0
 
 name               shibboleth
-version            2.2
-revision           1
+version            2.2.1
 categories         shibboleth
 maintainers        cantor.2@osu.edu
 description        Shibboleth Native Service Provider
@@ -30,18 +29,6 @@ variant odbc {
     configure.args-append --enable-odbc
 }
 
-platform darwin 8 {
-       configure.env-append MACOSX_DEPLOYMENT_TARGET=10.4
-       build.env-append MACOSX_DEPLOYMENT_TARGET=10.4
-       destroot.env-append MACOSX_DEPLOYMENT_TARGET=10.4
-}
-
-platform darwin 9 {
-       configure.env-append MACOSX_DEPLOYMENT_TARGET=10.4
-       build.env-append MACOSX_DEPLOYMENT_TARGET=10.4
-       destroot.env-append MACOSX_DEPLOYMENT_TARGET=10.4
-}
-
 destroot.keepdirs ${destroot}${prefix}/var/log/shibboleth ${destroot}${prefix}/var/log/httpd ${destroot}${prefix}/var/run/shibboleth
 
 destroot.args  NOKEYGEN=1

diff --git a/adfs/adfs.rc b/adfs/adfs.rc
index b7548e4..7db3d05 100644 (file)
--- a/adfs/adfs.rc
+++ b/adfs/adfs.rc
@@ -54,8 +54,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,2,0,0\r
- PRODUCTVERSION 2,2,0,0\r
+ FILEVERSION 2,2,1,0\r
+ PRODUCTVERSION 2,2,1,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -73,7 +73,7 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
             VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0"\r
-            VALUE "FileVersion", "2, 2, 0, 0\0"\r
+            VALUE "FileVersion", "2, 2, 1, 0\0"\r
 #ifdef SHIBSP_LITE\r
             VALUE "InternalName", "adfs-lite\0"\r
 #else\r
@@ -87,8 +87,8 @@ BEGIN
             VALUE "OriginalFilename", "adfs.so\0"\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.2\0"\r
-            VALUE "ProductVersion", "2, 2, 0, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.2.1\0"\r
+            VALUE "ProductVersion", "2, 2, 1, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/apache/mod_shib_13.rc b/apache/mod_shib_13.rc
index a707e64..503cf30 100644 (file)
--- 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,2,0,0
- PRODUCTVERSION 2,2,0,0
+ FILEVERSION 2,2,1,0
+ PRODUCTVERSION 2,2,1,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, 2, 0, 0\0"
+            VALUE "FileVersion", "2, 2, 1, 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.2\0"
-            VALUE "ProductVersion", "2, 2, 0, 0\0"
+            VALUE "ProductName", "Shibboleth 2.2.1\0"
+            VALUE "ProductVersion", "2, 2, 1, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc
index 8c5467c..d3e619e 100644 (file)
--- 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,2,0,0
- PRODUCTVERSION 2,2,0,0
+ FILEVERSION 2,2,1,0
+ PRODUCTVERSION 2,2,1,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, 2, 0, 0\0"
+            VALUE "FileVersion", "2, 2, 1, 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.2\0"
-            VALUE "ProductVersion", "2, 2, 0, 0\0"
+            VALUE "ProductName", "Shibboleth 2.2.1\0"
+            VALUE "ProductVersion", "2, 2, 1, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc
index 6b1fd9f..5f92326 100644 (file)
--- 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,2,0,0
- PRODUCTVERSION 2,2,0,0
+ FILEVERSION 2,2,1,0
+ PRODUCTVERSION 2,2,1,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, 2, 0, 0\0"
+            VALUE "FileVersion", "2, 2, 1, 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.2\0"
-            VALUE "ProductVersion", "2, 2, 0, 0\0"
+            VALUE "ProductName", "Shibboleth 2.2.1\0"
+            VALUE "ProductVersion", "2, 2, 1, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/configure.ac b/configure.ac
index 6a8ef69..b033a36 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.50])
-AC_INIT([shibboleth], [2.2], [shibboleth-users@internet2.edu], [shibboleth])
+AC_INIT([shibboleth], [2.2.1], [shibboleth-users@internet2.edu], [shibboleth])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([shibboleth],[2.2])
+AM_INIT_AUTOMAKE([shibboleth],[2.2.1])
 
 sinclude(doxygen.m4)
 sinclude(acx_pthread.m4)

diff --git a/fastcgi/shibauthorizer.rc b/fastcgi/shibauthorizer.rc
index e543bda..c9b4c1d 100644 (file)
--- a/fastcgi/shibauthorizer.rc
+++ b/fastcgi/shibauthorizer.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,2,0,0\r
- PRODUCTVERSION 2,2,0,0\r
+ FILEVERSION 2,2,1,0\r
+ PRODUCTVERSION 2,2,1,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
             VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0"\r
-            VALUE "FileVersion", "2, 2, 0, 0\0"\r
+            VALUE "FileVersion", "2, 2, 1, 0\0"\r
             VALUE "InternalName", "shibauthorizer\0"\r
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibauthorizer.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.2\0"\r
-            VALUE "ProductVersion", "2, 2, 0, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.2.1\0"\r
+            VALUE "ProductVersion", "2, 2, 1, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/fastcgi/shibresponder.rc b/fastcgi/shibresponder.rc
index c3b3015..4bccb0f 100644 (file)
--- a/fastcgi/shibresponder.rc
+++ b/fastcgi/shibresponder.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,2,0,0\r
- PRODUCTVERSION 2,2,0,0\r
+ FILEVERSION 2,2,1,0\r
+ PRODUCTVERSION 2,2,1,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
             VALUE "FileDescription", "Shibboleth FastCGI Responder\0"\r
-            VALUE "FileVersion", "2, 2, 0, 0\0"\r
+            VALUE "FileVersion", "2, 2, 1, 0\0"\r
             VALUE "InternalName", "shibresponder\0"\r
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibresponder.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.2\0"\r
-            VALUE "ProductVersion", "2, 2, 0, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.2.1\0"\r
+            VALUE "ProductVersion", "2, 2, 1, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/isapi_shib/isapi_shib.rc b/isapi_shib/isapi_shib.rc
index 9fbe076..4a6f709 100644 (file)
--- 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,2,0,0
- PRODUCTVERSION 2,2,0,0
+ FILEVERSION 2,2,1,0
+ PRODUCTVERSION 2,2,1,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, 2, 0, 0\0"
+            VALUE "FileVersion", "2, 2, 1, 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.2\0"
-            VALUE "ProductVersion", "2, 2, 0, 0\0"
+            VALUE "ProductName", "Shibboleth 2.2.1\0"
+            VALUE "ProductVersion", "2, 2, 1, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/memcache-store/memcache-store.rc b/memcache-store/memcache-store.rc
index 066be89..ffd78ff 100644 (file)
--- a/memcache-store/memcache-store.rc
+++ b/memcache-store/memcache-store.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,0,0
- PRODUCTVERSION 2,2,0,0
+ FILEVERSION 2,2,1,0
+ PRODUCTVERSION 2,2,1,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, 2, 0, 0\0"
+            VALUE "FileVersion", "2, 2, 1, 0\0"
             VALUE "InternalName", "memcache-store\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "OriginalFilename", "memcache-store.so\0"
-            VALUE "ProductName", "Shibboleth 2.2\0"
-            VALUE "ProductVersion", "2, 2, 0, 0\0"
+            VALUE "ProductName", "Shibboleth 2.2.1\0"
+            VALUE "ProductVersion", "2, 2, 1, 0\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/nsapi_shib/nsapi_shib.rc b/nsapi_shib/nsapi_shib.rc
index 24d8d86..ba31800 100644 (file)
--- 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,2,0,0
- PRODUCTVERSION 2,2,0,0
+ FILEVERSION 2,2,1,0
+ PRODUCTVERSION 2,2,1,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, 2, 0, 0\0"
+            VALUE "FileVersion", "2, 2, 1, 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.2\0"
-            VALUE "ProductVersion", "2, 2, 0, 0\0"
+            VALUE "ProductName", "Shibboleth 2.2.1\0"
+            VALUE "ProductVersion", "2, 2, 1, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/odbc-store/odbc-store.rc b/odbc-store/odbc-store.rc
index d10dfc9..1a9eb39 100644 (file)
--- a/odbc-store/odbc-store.rc
+++ b/odbc-store/odbc-store.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,0,0
- PRODUCTVERSION 2,2,0,0
+ FILEVERSION 2,2,1,0
+ PRODUCTVERSION 2,2,1,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, 2, 0, 0\0"
+            VALUE "FileVersion", "2, 2, 1, 0\0"
             VALUE "InternalName", "odbc-store\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "OriginalFilename", "odbc-store.so\0"
-            VALUE "ProductName", "Shibboleth 2.2\0"
-            VALUE "ProductVersion", "2, 2, 0, 0\0"
+            VALUE "ProductName", "Shibboleth 2.2.1\0"
+            VALUE "ProductVersion", "2, 2, 1, 0\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/shibd/shibd.rc b/shibd/shibd.rc
index 98fa473..4f11667 100644 (file)
--- a/shibd/shibd.rc
+++ b/shibd/shibd.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,2,0,0\r
- PRODUCTVERSION 2,2,0,0\r
+ FILEVERSION 2,2,1,0\r
+ PRODUCTVERSION 2,2,1,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
             VALUE "FileDescription", "Shibboleth Daemon Service\0"\r
-            VALUE "FileVersion", "2, 2, 0, 0\0"\r
+            VALUE "FileVersion", "2, 2, 1, 0\0"\r
             VALUE "InternalName", "shibd\0"\r
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibd.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.2\0"\r
-            VALUE "ProductVersion", "2, 2, 0, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.2.1\0"\r
+            VALUE "ProductVersion", "2, 2, 1, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 45933ac..811d4ed 100644 (file)
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -200,8 +200,8 @@ 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 3:0:0
-libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 3:0:0
+libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 3:1:0
+libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 3:1:0
 libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
 
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@

diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index f6a0c91..b39d484 100644 (file)
--- a/shibsp/shibsp.rc
+++ b/shibsp/shibsp.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,2,0,0\r
- PRODUCTVERSION 2,2,0,0\r
+ FILEVERSION 1,2,1,0\r
+ PRODUCTVERSION 2,2,1,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -51,7 +51,7 @@ BEGIN
 #else\r
             VALUE "FileDescription", "Shibboleth SP Library\0"\r
 #endif\r
-            VALUE "FileVersion", "1, 2, 0, 0\0"\r
+            VALUE "FileVersion", "1, 2, 1, 0\0"\r
 #ifdef SHIBSP_LITE\r
 #ifdef _DEBUG\r
             VALUE "InternalName", "shibsp-lite1_2D\0"\r
@@ -81,8 +81,8 @@ BEGIN
 #endif\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.2\0"\r
-            VALUE "ProductVersion", "2, 2, 0, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.2.1\0"\r
+            VALUE "ProductVersion", "2, 2, 1, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/shibsp/version.h b/shibsp/version.h
index caf778a..b08f76d 100644 (file)
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2009 Internet2
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
 
 #define SHIBSP_VERSION_MAJOR 1
 #define SHIBSP_VERSION_MINOR 2
-#define SHIBSP_VERSION_REVISION 0
+#define SHIBSP_VERSION_REVISION 1
 
 /** DO NOT MODIFY BELOW THIS LINE */