From 92df2df9f9941b09fbb845e5a0b6dbf12bca22e2 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 23 Sep 2008 01:26:40 +0000
Subject: [PATCH] Bump version to 2.2.

---
 config_win32.h            |  6 +++---
 configure.ac              |  8 ++++----
 depend                    |  4 ++--
 shibboleth.spec.in        |  5 ++++-
 shibsp/shibsp-lite.vcproj |  8 ++++----
 shibsp/shibsp.rc          | 26 +++++++++++++-------------
 shibsp/shibsp.vcproj      |  8 ++++----
 shibsp/version.h          | 12 ++++++------
 8 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/config_win32.h b/config_win32.h
index 5f52c89..431f378 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -110,13 +110,13 @@
 #define PACKAGE_NAME "shibboleth"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth 2.1"
+#define PACKAGE_STRING "shibboleth 2.2"
 
 /* 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.1"
+#define PACKAGE_VERSION "2.2"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -129,7 +129,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "2.1"
+#define VERSION "2.2"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
diff --git a/configure.ac b/configure.ac
index 5421411..5651a99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.50])
-AC_INIT([shibboleth], [2.1], [shibboleth-users@internet2.edu], [shibboleth])
+AC_INIT([shibboleth], [2.2], [shibboleth-users@internet2.edu], [shibboleth])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([shibboleth],[2.1])
+AM_INIT_AUTOMAKE([shibboleth],[2.2])
 
 sinclude(doxygen.m4)
 sinclude(acx_pthread.m4)
@@ -305,10 +305,10 @@ AC_CHECK_HEADER([saml/saml2/metadata/Metadata.h],,
 AC_TRY_LINK(
 	[#include <saml/SAMLConfig.h>
 #include <saml/version.h>],
-	[#if _OPENSAML_VERSION >= 20100
+	[#if _OPENSAML_VERSION >= 20200
 opensaml::SAMLConfig::getConfig();
 #else
-#error Need OpenSAML version 2.1 or higher
+#error Need OpenSAML version 2.2 or higher
 #endif],
         [AC_DEFINE(HAVE_SAML,1,[Define if saml library was found])],
         [AC_MSG_ERROR([unable to link with OpenSAML, or version was too old])])
diff --git a/depend b/depend
index 5cd3481..e14a6ee 100644
--- a/depend
+++ b/depend
@@ -5,8 +5,8 @@ P SHIBxerces xerces-c
 P SHIBxmlsec xml-security-c
 	1.4.0
 P SHIBxmltool xmltooling-c
-    1.1
+    1.2
 P SHIBosaml opensaml-c
-	2.1
+	2.2
 P SHIBlog4shib log4shib
     1.0
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index ef250ec..6965a25 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -11,7 +11,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	openssl-devel
 BuildRequires:	xerces%{?xercesver}-c-devel >= 2.8.0
 BuildRequires:  xml-security-c-devel >= 1.4.0
-BuildRequires:	zlib-devel, opensaml-devel >= 2.1
+BuildRequires:	zlib-devel, opensaml-devel >= 2.2
 %{?_with_log4cpp:BuildRequires:	log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
 %{?_with_fastcgi:BuildRequires: fcgi-devel}
@@ -197,6 +197,9 @@ sh ./keygen.sh -b
 %doc %{_datadir}/doc/%{name}/api
 
 %changelog
+* Tue Sep 23 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.2-1
+- Bump minor version.
+
 * Tue Jun 10 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.1-1
 - Change shib.conf handling to treat as config file.
 
diff --git a/shibsp/shibsp-lite.vcproj b/shibsp/shibsp-lite.vcproj
index 48dc6af..092e40f 100644
--- a/shibsp/shibsp-lite.vcproj
+++ b/shibsp/shibsp-lite.vcproj
@@ -66,7 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1D.lib xerces-c_2D.lib xmltooling-lite1D.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"
 				GenerateDebugInformation="true"
@@ -148,7 +148,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1D.lib xerces-c_2D.lib xmltooling-lite1D.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"
 				GenerateDebugInformation="true"
@@ -226,7 +226,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1.lib xerces-c_2.lib xmltooling-lite1.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_1.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_2.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"
 				SubSystem="2"
@@ -306,7 +306,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1.lib xerces-c_2.lib xmltooling-lite1.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_1.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_2.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"
 				GenerateDebugInformation="true"
diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index 5f8cda8..743afe2 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,1,0,0
- PRODUCTVERSION 2,1,0,0
+ FILEVERSION 1,2,0,0
+ PRODUCTVERSION 2,2,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -51,38 +51,38 @@ BEGIN
 #else
             VALUE "FileDescription", "Shibboleth SP Library\0"
 #endif
-            VALUE "FileVersion", "1, 1, 0, 0\0"
+            VALUE "FileVersion", "1, 2, 0, 0\0"
 #ifdef SHIBSP_LITE
 #ifdef _DEBUG
-            VALUE "InternalName", "shibsp-lite1_1D\0"
+            VALUE "InternalName", "shibsp-lite1_2D\0"
 #else
-            VALUE "InternalName", "shibsp-lite1_1\0"
+            VALUE "InternalName", "shibsp-lite1_2\0"
 #endif
 #else
 #ifdef _DEBUG
-            VALUE "InternalName", "shibsp1_1D\0"
+            VALUE "InternalName", "shibsp1_2D\0"
 #else
-            VALUE "InternalName", "shibsp1_1\0"
+            VALUE "InternalName", "shibsp1_2\0"
 #endif
 #endif
             VALUE "LegalCopyright", "Copyright © 2008 Internet2\0"
             VALUE "LegalTrademarks", "\0"
 #ifdef SHIBSP_LITE
 #ifdef _DEBUG
-            VALUE "OriginalFilename", "shibsp-lite1_1D.dll\0"
+            VALUE "OriginalFilename", "shibsp-lite1_2D.dll\0"
 #else
-            VALUE "OriginalFilename", "shibsp-lite1_1.dll\0"
+            VALUE "OriginalFilename", "shibsp-lite1_2.dll\0"
 #endif
 #else
 #ifdef _DEBUG
-            VALUE "OriginalFilename", "shibsp1_1D.dll\0"
+            VALUE "OriginalFilename", "shibsp1_2D.dll\0"
 #else
-            VALUE "OriginalFilename", "shibsp1_1.dll\0"
+            VALUE "OriginalFilename", "shibsp1_2.dll\0"
 #endif
 #endif
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.1\0"
-            VALUE "ProductVersion", "2, 1, 0, 0\0"
+            VALUE "ProductName", "Shibboleth 2.2\0"
+            VALUE "ProductVersion", "2, 2, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/shibsp/shibsp.vcproj b/shibsp/shibsp.vcproj
index bb58f7e..5e50f0d 100644
--- a/shibsp/shibsp.vcproj
+++ b/shibsp/shibsp.vcproj
@@ -66,7 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1D.lib xerces-c_2D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"
 				GenerateDebugInformation="true"
@@ -148,7 +148,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1D.lib xerces-c_2D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(PlatformName)\$(ConfigurationName);..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"
 				GenerateDebugInformation="true"
@@ -225,7 +225,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1.lib xerces-c_2.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_1.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_2.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"
 				SubSystem="2"
@@ -304,7 +304,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="log4shib1.lib xerces-c_2.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_1.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_2.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 8836d4a..caf778a 100644
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2001-2007 Internet2
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -16,8 +16,8 @@
 
 /**
  * version.h
- * 
- * Library version macros and constants 
+ *
+ * Library version macros and constants
  */
 
 #ifndef __shibsp_version_h__
@@ -33,13 +33,13 @@
 // V E R S I O N   S P E C I F I C A T I O N
 
 /**
- * MODIFY THESE NUMERIC VALUES TO COINCIDE WITH OPENSAML VERSION
+ * MODIFY THESE NUMERIC VALUES TO COINCIDE WITH SHIBSP LIBRARY VERSION
  * AND DO NOT MODIFY ANYTHING ELSE IN THIS VERSION HEADER FILE
  */
 
 #define SHIBSP_VERSION_MAJOR 1
-#define SHIBSP_VERSION_MINOR 0
-#define SHIBSP_VERSION_REVISION 1
+#define SHIBSP_VERSION_MINOR 2
+#define SHIBSP_VERSION_REVISION 0
 
 /** DO NOT MODIFY BELOW THIS LINE */
 
-- 
2.1.4