[shibboleth-sp2] 10/19: Bump version to 2.6.1

Ferenc Wágner wferi at moszumanska.debian.org
Wed Nov 15 22:56:46 UTC 2017 

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

wferi pushed a commit to branch maint-2.6
in repository shibboleth-sp2.

commit c51b3e50f3492f3b40aa34096269a8312fd346f8
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Sun Nov 12 15:56:37 2017 -0500

    Bump version to 2.6.1
---
 Projects/vc10/Shibboleth.sln | 29 +++++++++++++++--------------
 config_win32.h               |  6 +++---
 configure.ac                 |  2 +-
 shibsp/Makefile.am           |  4 ++--
 shibsp/shibsp.rc             |  6 +++---
 shibsp/version.h             |  2 +-
 6 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/Projects/vc10/Shibboleth.sln b/Projects/vc10/Shibboleth.sln
index e47b492..360aef7 100644
--- a/Projects/vc10/Shibboleth.sln
+++ b/Projects/vc10/Shibboleth.sln
@@ -1,5 +1,7 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2010
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2008
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server Modules", "Server Modules", "{26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}"
@@ -331,20 +333,16 @@ Global
 		{A2140D6E-C2C6-4329-84E3-2F530CEBE442}.Release|x64.Build.0 = Release|x64
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Debug|Win32.Build.0 = Debug|Win32
-		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Debug|x64.ActiveCfg = Debug|x64
-		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Debug|x64.Build.0 = Debug|x64
+		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Debug|x64.ActiveCfg = Debug|Win32
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|Win32.ActiveCfg = Release|Win32
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|Win32.Build.0 = Release|Win32
-		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|x64.ActiveCfg = Release|x64
-		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|x64.Build.0 = Release|x64
+		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|x64.ActiveCfg = Release|Win32
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|Win32.Build.0 = Debug|Win32
-		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|x64.ActiveCfg = Debug|x64
-		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|x64.Build.0 = Debug|x64
+		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|x64.ActiveCfg = Debug|Win32
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|Win32.ActiveCfg = Release|Win32
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|Win32.Build.0 = Release|Win32
-		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|x64.ActiveCfg = Release|x64
-		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|x64.Build.0 = Release|x64
+		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|x64.ActiveCfg = Release|Win32
 		{303291A1-C542-49E4-80B3-9304B7B6F8BC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{303291A1-C542-49E4-80B3-9304B7B6F8BC}.Debug|Win32.Build.0 = Debug|Win32
 		{303291A1-C542-49E4-80B3-9304B7B6F8BC}.Debug|x64.ActiveCfg = Debug|x64
@@ -364,19 +362,22 @@ Global
 		{68E9568B-476C-4289-B93C-893432378ADC} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
 		{1396D80A-8672-4224-9B02-95F3F4207CDB} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
 		{B44C0852-83B8-4FB2-A86E-097C9C8256D0} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
-		{B44C0852-83B8-4FB2-A86E-097C9C8256D1} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
 		{666A63A7-983F-4C19-8411-207F24305197} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
 		{26D4FABF-ACDE-4947-9C4A-7AE1B50CD83A} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
 		{26D4FABF-ACDE-4947-9C4A-7AE1B50CD83B} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
-		{666A63A7-983F-4C19-8411-207F24305198} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
-		{A2140D6E-C2C6-4329-84E3-2F530CEBE445} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
-		{A2140D6E-C2C6-4329-84E3-2F530CEBE442} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
 		{F13141B6-6C87-40BB-8D4E-5CC56EBB4C5A} = {FED80230-119E-4B2F-9F53-D2660A5F022B}
 		{F13141B6-6C87-40BB-8D4E-5CC56EBB4C59} = {FED80230-119E-4B2F-9F53-D2660A5F022B}
-		{303291A1-C542-49E4-80B3-9304B7B6F8BC} = {FED80230-119E-4B2F-9F53-D2660A5F022B}
 		{8CF7DDFA-EAA0-416E-853E-3DCB210C4AE0} = {8E1AF2CF-24E1-4983-8681-394D89DF9AD2}
 		{B2423DCE-048D-4BAA-9AB9-F5D1FCDD3D25} = {8E1AF2CF-24E1-4983-8681-394D89DF9AD2}
+		{666A63A7-983F-4C19-8411-207F24305198} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
+		{A2140D6E-C2C6-4329-84E3-2F530CEBE445} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
+		{B44C0852-83B8-4FB2-A86E-097C9C8256D1} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
+		{A2140D6E-C2C6-4329-84E3-2F530CEBE442} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951} = {BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70} = {BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}
+		{303291A1-C542-49E4-80B3-9304B7B6F8BC} = {FED80230-119E-4B2F-9F53-D2660A5F022B}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A9AD8F25-4D2E-418A-94C0-4D5C6AB58E79}
 	EndGlobalSection
 EndGlobal
diff --git a/config_win32.h b/config_win32.h
index 801868a..3f4fb4a 100644
--- 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.6.0"
+#define PACKAGE_STRING "shibboleth 2.6.1"
 
 /* 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.6.0"
+#define PACKAGE_VERSION "2.6.1"
 
 /* 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.6.0"
+#define VERSION "2.6.1"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
diff --git a/configure.ac b/configure.ac
index 563b254..57836b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([shibboleth],[2.6.0],[https://issues.shibboleth.net/],[shibboleth-sp])
+AC_INIT([shibboleth],[2.6.1],[https://issues.shibboleth.net/],[shibboleth-sp])
 AC_CONFIG_SRCDIR(shibsp)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index fb8b6fc..b96a76f 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -235,9 +235,9 @@ libshibsp_la_SOURCES = \
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = -version-info 7:0:0
+libshibsp_la_LDFLAGS = -version-info 7:1:0
 libshibsp_la_LIBADD = $(XMLSEC_LIBS)
-libshibsp_lite_la_LDFLAGS = -version-info 7:0:0
+libshibsp_lite_la_LDFLAGS = -version-info 7:1:0
 libshibsp_lite_la_LIBADD = $(LITE_LIBS)
 libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
 
diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index 5199fc7..405fffb 100644
--- a/shibsp/shibsp.rc
+++ b/shibsp/shibsp.rc
@@ -65,7 +65,7 @@ BEGIN
             VALUE "InternalName", "shibsp1_6\0"
 #endif
 #endif
-            VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
+            VALUE "LegalCopyright", "Copyright � 2017 UCAID\0"
             VALUE "LegalTrademarks", "\0"
 #ifdef SHIBSP_LITE
 #ifdef _DEBUG
@@ -81,8 +81,8 @@ BEGIN
 #endif
 #endif
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.6.0\0"
-            VALUE "ProductVersion", "2, 6, 0, 0\0"
+            VALUE "ProductName", "Shibboleth 2.6.1\0"
+            VALUE "ProductVersion", "2, 6, 1, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/shibsp/version.h b/shibsp/version.h
index 4e7a7fb..5d525a0 100644
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -44,7 +44,7 @@
 
 #define SHIBSP_VERSION_MAJOR 1
 #define SHIBSP_VERSION_MINOR 6
-#define SHIBSP_VERSION_REVISION 0
+#define SHIBSP_VERSION_REVISION 1
 
 /** DO NOT MODIFY BELOW THIS LINE */
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git

More information about the Pkg-shibboleth-devel mailing list