Bump version to 2.6.0 and adjust soname and DLL name.

diff --git a/.cproject b/.cproject
index e9eec37..fe09313 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -22,8 +22,10 @@
                                        <folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1301536861." name="/" resourcePath="">
                                                <toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1860418070" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolChain">
                                                        <targetPlatform id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.540648186" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform"/>
-                                                       <builder id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.863364880" name="null.Build (GNU)" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/>
-                                                       <tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.1463797656" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure"/>
+                                                       <builder id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.863364880" keepEnvironmentInBuildfile="false" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/>
+                                                       <tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.1463797656" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure">
+                                                               <option id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name.1490081656" name="Name" superClass="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name" value="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1301536861" valueType="string"/>
+                                                       </tool>
                                                        <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen.2032266339" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen"/>
                                                        <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.1463032246" name="GCC C Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc">
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1052808883" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>

diff --git a/Projects/vc10/shibsp/shibsp-lite.vcxproj b/Projects/vc10/shibsp/shibsp-lite.vcxproj
index 890746c..807d3d9 100644 (file)
--- a/Projects/vc10/shibsp/shibsp-lite.vcxproj
+++ b/Projects/vc10/shibsp/shibsp-lite.vcxproj
@@ -88,10 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_5</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_5</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_5D</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_5D</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_6</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_6</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_6D</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_6D</TargetName>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r

diff --git a/Projects/vc10/shibsp/shibsp.vcxproj b/Projects/vc10/shibsp/shibsp.vcxproj
index 8755d1d..19b6392 100644 (file)
--- a/Projects/vc10/shibsp/shibsp.vcxproj
+++ b/Projects/vc10/shibsp/shibsp.vcxproj
@@ -85,10 +85,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_5D</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_5D</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_5</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_5</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_6D</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_6D</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_6</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_6</TargetName>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r

diff --git a/adfs/adfs.rc b/adfs/adfs.rc
index 08a6392..5ec2c03 100644 (file)
--- a/adfs/adfs.rc
+++ b/adfs/adfs.rc
@@ -54,8 +54,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -73,7 +73,7 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 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.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 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 32a28d5..2f13146 100644 (file)
--- a/apache/mod_shib_13.rc
+++ b/apache/mod_shib_13.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "mod_shib_13\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "mod_shib_13.so\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc
index f22ea17..c27420e 100644 (file)
--- a/apache/mod_shib_20.rc
+++ b/apache/mod_shib_20.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "mod_shib_20\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "mod_shib_20.so\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc
index b36806b..a8e9123 100644 (file)
--- a/apache/mod_shib_22.rc
+++ b/apache/mod_shib_22.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "mod_shib_22\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "mod_shib_22.so\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/apache/mod_shib_24.rc b/apache/mod_shib_24.rc
index 1270ccc..45f293c 100644 (file)
--- a/apache/mod_shib_24.rc
+++ b/apache/mod_shib_24.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth Apache 2.4 Module\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "mod_shib_24\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "mod_shib_24.so\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/config_win32.h b/config_win32.h
index 93ef9cb..801868a 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.6"
+#define PACKAGE_STRING "shibboleth 2.6.0"
 
 /* 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.6"
+#define PACKAGE_VERSION "2.6.0"
 
 /* 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.6"
+#define VERSION "2.6.0"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/configure.ac b/configure.ac
index d9b563e..563b254 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([shibboleth],[2.5.6],[https://issues.shibboleth.net/],[shibboleth-sp])
+AC_INIT([shibboleth],[2.6.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 0ad49bb..381cfbf 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,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "shibauthorizer\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibauthorizer.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/fastcgi/shibresponder.rc b/fastcgi/shibresponder.rc
index 91804aa..87c7c53 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,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth FastCGI Responder\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "shibresponder\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibresponder.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 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 1336a32..d54ab83 100644 (file)
--- a/isapi_shib/isapi_shib.rc
+++ b/isapi_shib/isapi_shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "isapi_shib\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "isapi_shib.dll\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/memcache-store/memcache-store.rc b/memcache-store/memcache-store.rc
index 0716ee3..c94feb4 100644 (file)
--- a/memcache-store/memcache-store.rc
+++ b/memcache-store/memcache-store.rc
@@ -53,8 +53,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x17L\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -71,12 +71,12 @@ BEGIN
         BEGIN\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth Memcache Storage Service Plugin\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "memcache-store\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "OriginalFilename", "memcache-store.so\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
         END\r
     END\r
     BLOCK "VarFileInfo"\r

diff --git a/nsapi_shib/nsapi_shib.rc b/nsapi_shib/nsapi_shib.rc
index e60bea3..e8e3440 100644 (file)
--- a/nsapi_shib/nsapi_shib.rc
+++ b/nsapi_shib/nsapi_shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth NSAPI Extension\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "nsapi_shib\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "nsapi_shib.dll\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/odbc-store/odbc-store.rc b/odbc-store/odbc-store.rc
index 4e2d780..17d5645 100644 (file)
--- a/odbc-store/odbc-store.rc
+++ b/odbc-store/odbc-store.rc
@@ -53,8 +53,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x17L\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -71,12 +71,12 @@ BEGIN
         BEGIN\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth ODBC Storage Service Plugin\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "odbc-store\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "OriginalFilename", "odbc-store.so\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
         END\r
     END\r
     BLOCK "VarFileInfo"\r

diff --git a/plugins/plugins.rc b/plugins/plugins.rc
index d60041f..dca2b33 100644 (file)
--- a/plugins/plugins.rc
+++ b/plugins/plugins.rc
@@ -54,8 +54,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -73,7 +73,7 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth SP Plugins\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
 #ifdef SHIBSP_LITE\r
             VALUE "InternalName", "plugins-lite\0"\r
 #else\r
@@ -87,8 +87,8 @@ BEGIN
             VALUE "OriginalFilename", "plugins.so\0"\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 234725a..fef3ece 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -11,9 +11,9 @@ BuildRoot:    %{_tmppath}/%{name}-sp-%{version}-root
 Obsoletes:     shibboleth-sp = 2.5.0
 Requires:      openssl
 %if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
-PreReq:                xmltooling-schemas%{?_isa} >= 1.5.5, opensaml-schemas%{?_isa} >= 2.5.5
+PreReq:                xmltooling-schemas%{?_isa} >= 1.5.5, opensaml-schemas%{?_isa} >= 2.6.0
 %else
-PreReq:                xmltooling-schemas >= 1.5.5, opensaml-schemas >= 2.5.5
+PreReq:                xmltooling-schemas >= 1.5.5, opensaml-schemas >= 2.6.0
 %endif
 %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
 PreReq:                %{insserv_prereq} %{fillup_prereq}
@@ -28,7 +28,7 @@ BuildRequires:        libxerces-c-devel >= 3.1
 %endif
 BuildRequires: libxml-security-c-devel >= 1.7.3
 BuildRequires: libxmltooling-devel >= 1.5.5
-BuildRequires: libsaml-devel >= 2.5.5
+BuildRequires: libsaml-devel >= 2.6.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
 %if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
@@ -96,7 +96,7 @@ Requires:     libxerces-c-devel >= 3.1
 %endif
 Requires:      libxml-security-c-devel >= 1.7.3
 Requires:      libxmltooling-devel >= 1.5.5
-Requires:      libsaml-devel >= 2.5.5
+Requires:      libsaml-devel >= 2.6.0
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
 
@@ -471,6 +471,9 @@ exit 0
 %doc %{pkgdocdir}/api
 
 %changelog
+* Tue May 03 2016 Scott Cantor <cantor.2@osu.edu> - 2.6.0-1
+- Bump opensaml dependency version
+
 * Thu Jul 23 2015 Scott Cantor <cantor.2@osu.edu> - 2.5.5-2
 - Fix use of /var/run/shibboleth on newer tmpfs platforms
 

diff --git a/shibd/shibd.rc b/shibd/shibd.rc
index 722c028..6c66a78 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,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Shibboleth Daemon Service\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "shibd\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibd.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 6ed7299..9f76511 100644 (file)
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -234,9 +234,9 @@ libshibsp_la_SOURCES = \
 \r
 # this is different from the project version\r
 # http://sources.redhat.com/autobook/autobook/autobook_91.html\r
-libshibsp_la_LDFLAGS = -version-info 6:6:0\r
+libshibsp_la_LDFLAGS = -version-info 7:0:0\r
 libshibsp_la_LIBADD = $(XMLSEC_LIBS)\r
-libshibsp_lite_la_LDFLAGS = -version-info 6:6:0\r
+libshibsp_lite_la_LDFLAGS = -version-info 7:0:0\r
 libshibsp_lite_la_LIBADD = $(LITE_LIBS)\r
 libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE\r
 \r

diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index e6cb963..5199fc7 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,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 1,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -51,38 +51,38 @@ BEGIN
 #else\r
             VALUE "FileDescription", "Shibboleth SP Library\0"\r
 #endif\r
-            VALUE "FileVersion", "1, 5, 6, 0\0"\r
+            VALUE "FileVersion", "1, 6, 0, 0\0"\r
 #ifdef SHIBSP_LITE\r
 #ifdef _DEBUG\r
-            VALUE "InternalName", "shibsp-lite1_5D\0"\r
+            VALUE "InternalName", "shibsp-lite1_6D\0"\r
 #else\r
-            VALUE "InternalName", "shibsp-lite1_5\0"\r
+            VALUE "InternalName", "shibsp-lite1_6\0"\r
 #endif\r
 #else\r
 #ifdef _DEBUG\r
-            VALUE "InternalName", "shibsp1_5D\0"\r
+            VALUE "InternalName", "shibsp1_6D\0"\r
 #else\r
-            VALUE "InternalName", "shibsp1_5\0"\r
+            VALUE "InternalName", "shibsp1_6\0"\r
 #endif\r
 #endif\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef SHIBSP_LITE\r
 #ifdef _DEBUG\r
-            VALUE "OriginalFilename", "shibsp-lite1_5D.dll\0"\r
+            VALUE "OriginalFilename", "shibsp-lite1_6D.dll\0"\r
 #else\r
-            VALUE "OriginalFilename", "shibsp-lite1_5.dll\0"\r
+            VALUE "OriginalFilename", "shibsp-lite1_6.dll\0"\r
 #endif\r
 #else\r
 #ifdef _DEBUG\r
-            VALUE "OriginalFilename", "shibsp1_5D.dll\0"\r
+            VALUE "OriginalFilename", "shibsp1_6D.dll\0"\r
 #else\r
-            VALUE "OriginalFilename", "shibsp1_5.dll\0"\r
+            VALUE "OriginalFilename", "shibsp1_6.dll\0"\r
 #endif\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/shibsp/version.h b/shibsp/version.h
index 4440a51..4e7a7fb 100644 (file)
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -43,8 +43,8 @@
  */
 
 #define SHIBSP_VERSION_MAJOR 1
-#define SHIBSP_VERSION_MINOR 5
-#define SHIBSP_VERSION_REVISION 6
+#define SHIBSP_VERSION_MINOR 6
+#define SHIBSP_VERSION_REVISION 0
 
 /** DO NOT MODIFY BELOW THIS LINE */
 

diff --git a/util/mdquery.rc b/util/mdquery.rc
index 38c1a2a..8c4a595 100644 (file)
--- a/util/mdquery.rc
+++ b/util/mdquery.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Metadata Query Utility\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "mdquery\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "mdquery.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/util/resolvertest.rc b/util/resolvertest.rc
index 0eb6a70..a13849d 100644 (file)
--- a/util/resolvertest.rc
+++ b/util/resolvertest.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,6,0\r
- PRODUCTVERSION 2,5,6,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "Attribute Resolver Utility\0"\r
-            VALUE "FileVersion", "2, 5, 6, 0\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "resolvertest\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "resolvertest.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.5.6\0"\r
-            VALUE "ProductVersion", "2, 5, 6, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r