[cpp-sp] branch main updated: Bump product and DLL versions.

Wed Dec 2 00:09:33 UTC 2020

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=cbc6eb57ebd53519f972f212f63a056ce5711f27

The following commit(s) were added to refs/heads/main by this push:
       new  cbc6eb57  Bump product and DLL versions.
cbc6eb57 is described below

commit cbc6eb57ebd53519f972f212f63a056ce5711f27
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Dec 1 19:09:28 2020 -0500

    Bump product and DLL versions.
---
 Projects/vc15/shibsp/shibsp-lite.vcxproj |  9 +++++----
 Projects/vc15/shibsp/shibsp.vcxproj      |  9 +++++----
 config_win32.h                           |  6 +++---
 configure.ac                             |  2 +-
 iis7_shib/iis7_shib.rc                   |  4 ++--
 shibboleth.spec.in                       |  3 +++
 shibsp/Makefile.am                       |  4 ++--
 shibsp/shibsp.rc                         | 20 ++++++++++----------
 shibsp/version.h                         |  2 +-
 util/resourceCommon.rci                  |  6 +++---
 10 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/Projects/vc15/shibsp/shibsp-lite.vcxproj b/Projects/vc15/shibsp/shibsp-lite.vcxproj
index 38c01c8f..5a718883 100644
--- a/Projects/vc15/shibsp/shibsp-lite.vcxproj
+++ b/Projects/vc15/shibsp/shibsp-lite.vcxproj
@@ -22,6 +22,7 @@
     <ProjectGuid>{81F0F7A6-DC36-46EF-957F-F9E81D4403F7}</ProjectGuid>
     <RootNamespace>shibsp-lite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -91,10 +92,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_1</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_1</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_1D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_1D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_2</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_2</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_2D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_2D</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/Projects/vc15/shibsp/shibsp.vcxproj b/Projects/vc15/shibsp/shibsp.vcxproj
index 44ef4bdc..35947ad5 100644
--- a/Projects/vc15/shibsp/shibsp.vcxproj
+++ b/Projects/vc15/shibsp/shibsp.vcxproj
@@ -22,6 +22,7 @@
     <ProjectGuid>{81F0F7A6-DC36-46EF-957F-F9E81D4403F6}</ProjectGuid>
     <RootNamespace>shibsp</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -89,10 +90,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_1D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_1D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_1</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_1</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_2D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_2D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_2</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_2</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IntDir>$(SolutionDir)..\..\Build\VC15\$(projectName)\$(Platform)\$(Configuration)\</IntDir>
diff --git a/config_win32.h b/config_win32.h
index c4f371f4..02771cc8 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -121,13 +121,13 @@
 #define PACKAGE_NAME "shibboleth"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth 3.1.0"
+#define PACKAGE_STRING "shibboleth 3.2.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 "3.1.0"
+#define PACKAGE_VERSION "3.2.0"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -140,7 +140,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "3.1.0"
+#define VERSION "3.2.0"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
diff --git a/configure.ac b/configure.ac
index 1720a26a..6ea008d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([shibboleth],[3.1.0],[https://issues.shibboleth.net/],[shibboleth-sp])
+AC_INIT([shibboleth],[3.2.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/iis7_shib/iis7_shib.rc b/iis7_shib/iis7_shib.rc
index d6958e9a..dca33d0f 100644
--- a/iis7_shib/iis7_shib.rc
+++ b/iis7_shib/iis7_shib.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION RC_FILE_VERSION, 2
-PRODUCTVERSION RC_PRODUCT_VERSION, 2
+FILEVERSION RC_FILE_VERSION, 0
+PRODUCTVERSION RC_PRODUCT_VERSION, 0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 5a30fc6a..b934bdfc 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -479,6 +479,9 @@ exit 0
 %doc %{pkgdocdir}/api
 
 %changelog
+* Tue Dec 1 2020 Scott Cantor <cantor.2 at osu.edu> - 3.2.0-1
+- Version and lib bump
+
 * Mon Feb 3 2020 Scott Cantor <cantor.2 at osu.edu> - 3.1.0-1
 - Version and lib bump
 - Add hostname dependency for keygen script
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 02f65521..9176c173 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -244,7 +244,7 @@ libshibsp_la_SOURCES = \
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = -version-info 9:0:0
+libshibsp_la_LDFLAGS = -version-info 10:0:0
 libshibsp_la_CXXFLAGS = \
     $(AM_CXXFLAGS) \
     $(BOOST_CPPFLAGS) \
@@ -263,7 +263,7 @@ libshibsp_la_LIBADD = \
     $(xerces_LIBS) \
     $(xmlsec_LIBS) \
     $(xmltooling_LIBS)
-libshibsp_lite_la_LDFLAGS = -version-info 8:5:0
+libshibsp_lite_la_LDFLAGS = -version-info 10:0:0
 libshibsp_lite_la_CXXFLAGS = -DSHIBSP_LITE \
     $(AM_CXXFLAGS) \
     $(BOOST_CPPFLAGS) \
diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index de2445df..b33cd1d6 100644
--- a/shibsp/shibsp.rc
+++ b/shibsp/shibsp.rc
@@ -53,35 +53,35 @@ BEGIN
 #endif
 #ifdef SHIBSP_LITE
 #ifdef _DEBUG
-            VALUE "InternalName", "shibsp-lite3_1D\0"
+            VALUE "InternalName", "shibsp-lite3_2D\0"
 #else
-            VALUE "InternalName", "shibsp-lite3_1\0"
+            VALUE "InternalName", "shibsp-lite3_2\0"
 #endif
 #else
 #ifdef _DEBUG
-            VALUE "InternalName", "shibsp3_1D\0"
+            VALUE "InternalName", "shibsp3_2D\0"
 #else
-            VALUE "InternalName", "shibsp3_1\0"
+            VALUE "InternalName", "shibsp3_2\0"
 #endif
 #endif
             VALUE "LegalCopyright", "Copyright 2020 UCAID\0"
             VALUE "LegalTrademarks", "\0"
 #ifdef SHIBSP_LITE
 #ifdef _DEBUG
-            VALUE "OriginalFilename", "shibsp-lite3_1D.dll\0"
+            VALUE "OriginalFilename", "shibsp-lite3_2D.dll\0"
 #else
-            VALUE "OriginalFilename", "shibsp-lite3_1.dll\0"
+            VALUE "OriginalFilename", "shibsp-lite3_2.dll\0"
 #endif
 #else
 #ifdef _DEBUG
-            VALUE "OriginalFilename", "shibsp3_1D.dll\0"
+            VALUE "OriginalFilename", "shibsp3_2D.dll\0"
 #else
-            VALUE "OriginalFilename", "shibsp3_1.dll\0"
+            VALUE "OriginalFilename", "shibsp3_2.dll\0"
 #endif
 #endif
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 3.1.0\0"
-            VALUE "ProductVersion", "3, 1, 0, 0\0"
+            VALUE "ProductName", "Shibboleth 3.2.0\0"
+            VALUE "ProductVersion", "3, 2, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/shibsp/version.h b/shibsp/version.h
index e9a71d7b..98a27c85 100644
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -43,7 +43,7 @@
  */
 
 #define SHIBSP_VERSION_MAJOR 3
-#define SHIBSP_VERSION_MINOR 1
+#define SHIBSP_VERSION_MINOR 2
 #define SHIBSP_VERSION_REVISION 0
 
 /** DO NOT MODIFY BELOW THIS LINE */
diff --git a/util/resourceCommon.rci b/util/resourceCommon.rci
index e34137ab..43ab262a 100644
--- a/util/resourceCommon.rci
+++ b/util/resourceCommon.rci
@@ -1,10 +1,10 @@
 
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Shibboleth Consortium\0"
-            VALUE "FileVersion", "3,1,0,2\0"
+            VALUE "FileVersion", "3,2,0,0\0"
             VALUE "LegalCopyright", "Copyright 2020 Various\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 3.1.0\0"
-            VALUE "ProductVersion", "3, 1, 0, 2\0"
+            VALUE "ProductName", "Shibboleth 3.2.0\0"
+            VALUE "ProductVersion", "3, 2, 0, 0\0"
             VALUE "SpecialBuild", "\0"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
