[opensaml2] 01/02: Update library version and filenames.
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 23 13:45:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
edm-guest pushed a commit to branch master
in repository opensaml2.
commit 0258016954c0e22dc4470117f7b32ca4819bb858
Author: Scott Cantor <cantor.2 at osu.edu>
Date: Tue Nov 21 14:18:48 2017 -0500
Update library version and filenames.
---
Projects/vc15/cpp-opensaml2.sln | 145 +++++++++++++++++---------------
Projects/vc15/saml/saml.vcxproj | 25 +++---
Projects/vc15/samlsign/samlsign.vcxproj | 9 +-
Projects/vc15/samltest/samltest.vcxproj | 9 +-
config_win32.h | 6 +-
configure.ac | 2 +-
opensaml.spec.in | 32 ++++---
saml/Makefile.am | 2 +-
saml/saml.rc | 18 ++--
saml/version.h | 4 +-
10 files changed, 129 insertions(+), 123 deletions(-)
diff --git a/Projects/vc15/cpp-opensaml2.sln b/Projects/vc15/cpp-opensaml2.sln
index 233b3f3..768b782 100644
--- a/Projects/vc15/cpp-opensaml2.sln
+++ b/Projects/vc15/cpp-opensaml2.sln
@@ -1,85 +1,87 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2015
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2009
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schemas", "Schemas", "{5548F5D2-5FDE-4D58-92E0-7C0BE7526A59}"
ProjectSection(SolutionItems) = preProject
- schemas\cs-sstc-schema-assertion-01.xsd = schemas\cs-sstc-schema-assertion-01.xsd
- schemas\cs-sstc-schema-assertion-1.1.xsd = schemas\cs-sstc-schema-assertion-1.1.xsd
- schemas\cs-sstc-schema-protocol-01.xsd = schemas\cs-sstc-schema-protocol-01.xsd
- schemas\cs-sstc-schema-protocol-1.1.xsd = schemas\cs-sstc-schema-protocol-1.1.xsd
- schemas\Makefile.am = schemas\Makefile.am
- schemas\saml-async-slo-v1.0.xsd = schemas\saml-async-slo-v1.0.xsd
- schemas\saml-metadata-rpi-v1.0.xsd = schemas\saml-metadata-rpi-v1.0.xsd
- schemas\saml-schema-assertion-2.0.xsd = schemas\saml-schema-assertion-2.0.xsd
- schemas\saml-schema-authn-context-2.0.xsd = schemas\saml-schema-authn-context-2.0.xsd
- schemas\saml-schema-authn-context-auth-telephony-2.0.xsd = schemas\saml-schema-authn-context-auth-telephony-2.0.xsd
- schemas\saml-schema-authn-context-ip-2.0.xsd = schemas\saml-schema-authn-context-ip-2.0.xsd
- schemas\saml-schema-authn-context-ippword-2.0.xsd = schemas\saml-schema-authn-context-ippword-2.0.xsd
- schemas\saml-schema-authn-context-kerberos-2.0.xsd = schemas\saml-schema-authn-context-kerberos-2.0.xsd
- schemas\saml-schema-authn-context-mobileonefactor-reg-2.0.xsd = schemas\saml-schema-authn-context-mobileonefactor-reg-2.0.xsd
- schemas\saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd = schemas\saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd
- schemas\saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd = schemas\saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd
- schemas\saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd = schemas\saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd
- schemas\saml-schema-authn-context-nomad-telephony-2.0.xsd = schemas\saml-schema-authn-context-nomad-telephony-2.0.xsd
- schemas\saml-schema-authn-context-personal-telephony-2.0.xsd = schemas\saml-schema-authn-context-personal-telephony-2.0.xsd
- schemas\saml-schema-authn-context-pgp-2.0.xsd = schemas\saml-schema-authn-context-pgp-2.0.xsd
- schemas\saml-schema-authn-context-ppt-2.0.xsd = schemas\saml-schema-authn-context-ppt-2.0.xsd
- schemas\saml-schema-authn-context-pword-2.0.xsd = schemas\saml-schema-authn-context-pword-2.0.xsd
- schemas\saml-schema-authn-context-session-2.0.xsd = schemas\saml-schema-authn-context-session-2.0.xsd
- schemas\saml-schema-authn-context-smartcard-2.0.xsd = schemas\saml-schema-authn-context-smartcard-2.0.xsd
- schemas\saml-schema-authn-context-smartcardpki-2.0.xsd = schemas\saml-schema-authn-context-smartcardpki-2.0.xsd
- schemas\saml-schema-authn-context-softwarepki-2.0.xsd = schemas\saml-schema-authn-context-softwarepki-2.0.xsd
- schemas\saml-schema-authn-context-spki-2.0.xsd = schemas\saml-schema-authn-context-spki-2.0.xsd
- schemas\saml-schema-authn-context-srp-2.0.xsd = schemas\saml-schema-authn-context-srp-2.0.xsd
- schemas\saml-schema-authn-context-sslcert-2.0.xsd = schemas\saml-schema-authn-context-sslcert-2.0.xsd
- schemas\saml-schema-authn-context-telephony-2.0.xsd = schemas\saml-schema-authn-context-telephony-2.0.xsd
- schemas\saml-schema-authn-context-timesync-2.0.xsd = schemas\saml-schema-authn-context-timesync-2.0.xsd
- schemas\saml-schema-authn-context-types-2.0.xsd = schemas\saml-schema-authn-context-types-2.0.xsd
- schemas\saml-schema-authn-context-x509-2.0.xsd = schemas\saml-schema-authn-context-x509-2.0.xsd
- schemas\saml-schema-authn-context-xmldsig-2.0.xsd = schemas\saml-schema-authn-context-xmldsig-2.0.xsd
- schemas\saml-schema-dce-2.0.xsd = schemas\saml-schema-dce-2.0.xsd
- schemas\saml-schema-ecp-2.0.xsd = schemas\saml-schema-ecp-2.0.xsd
- schemas\saml-schema-metadata-2.0.xsd = schemas\saml-schema-metadata-2.0.xsd
- schemas\saml-schema-protocol-2.0.xsd = schemas\saml-schema-protocol-2.0.xsd
- schemas\saml-schema-x500-2.0.xsd = schemas\saml-schema-x500-2.0.xsd
- schemas\saml-schema-xacml-2.0.xsd = schemas\saml-schema-xacml-2.0.xsd
- schemas\saml10-catalog.xml.in = schemas\saml10-catalog.xml.in
- schemas\saml11-catalog.xml.in = schemas\saml11-catalog.xml.in
- schemas\saml20-catalog.xml.in = schemas\saml20-catalog.xml.in
- schemas\sstc-metadata-attr.xsd = schemas\sstc-metadata-attr.xsd
- schemas\sstc-request-initiation.xsd = schemas\sstc-request-initiation.xsd
- schemas\sstc-saml-attribute-ext.xsd = schemas\sstc-saml-attribute-ext.xsd
- schemas\sstc-saml-delegation.xsd = schemas\sstc-saml-delegation.xsd
- schemas\sstc-saml-idp-discovery.xsd = schemas\sstc-saml-idp-discovery.xsd
- schemas\sstc-saml-metadata-algsupport-v1.0.xsd = schemas\sstc-saml-metadata-algsupport-v1.0.xsd
- schemas\sstc-saml-metadata-ext-query.xsd = schemas\sstc-saml-metadata-ext-query.xsd
- schemas\sstc-saml-metadata-ui-v1.0.xsd = schemas\sstc-saml-metadata-ui-v1.0.xsd
- schemas\sstc-saml-protocol-ext-thirdparty.xsd = schemas\sstc-saml-protocol-ext-thirdparty.xsd
- schemas\sstc-saml1x-metadata.xsd = schemas\sstc-saml1x-metadata.xsd
+ ..\..\schemas\cs-sstc-schema-assertion-01.xsd = ..\..\schemas\cs-sstc-schema-assertion-01.xsd
+ ..\..\schemas\cs-sstc-schema-assertion-1.1.xsd = ..\..\schemas\cs-sstc-schema-assertion-1.1.xsd
+ ..\..\schemas\cs-sstc-schema-protocol-01.xsd = ..\..\schemas\cs-sstc-schema-protocol-01.xsd
+ ..\..\schemas\cs-sstc-schema-protocol-1.1.xsd = ..\..\schemas\cs-sstc-schema-protocol-1.1.xsd
+ ..\..\schemas\Makefile.am = ..\..\schemas\Makefile.am
+ ..\..\schemas\saml-async-slo-v1.0.xsd = ..\..\schemas\saml-async-slo-v1.0.xsd
+ ..\..\schemas\saml-metadata-rpi-v1.0.xsd = ..\..\schemas\saml-metadata-rpi-v1.0.xsd
+ ..\..\schemas\saml-schema-assertion-2.0.xsd = ..\..\schemas\saml-schema-assertion-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-2.0.xsd = ..\..\schemas\saml-schema-authn-context-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-auth-telephony-2.0.xsd = ..\..\schemas\saml-schema-authn-context-auth-telephony-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-ip-2.0.xsd = ..\..\schemas\saml-schema-authn-context-ip-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-ippword-2.0.xsd = ..\..\schemas\saml-schema-authn-context-ippword-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-kerberos-2.0.xsd = ..\..\schemas\saml-schema-authn-context-kerberos-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-mobileonefactor-reg-2.0.xsd = ..\..\schemas\saml-schema-authn-context-mobileonefactor-reg-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd = ..\..\schemas\saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd = ..\..\schemas\saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd = ..\..\schemas\saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-nomad-telephony-2.0.xsd = ..\..\schemas\saml-schema-authn-context-nomad-telephony-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-personal-telephony-2.0.xsd = ..\..\schemas\saml-schema-authn-context-personal-telephony-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-pgp-2.0.xsd = ..\..\schemas\saml-schema-authn-context-pgp-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-ppt-2.0.xsd = ..\..\schemas\saml-schema-authn-context-ppt-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-pword-2.0.xsd = ..\..\schemas\saml-schema-authn-context-pword-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-session-2.0.xsd = ..\..\schemas\saml-schema-authn-context-session-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-smartcard-2.0.xsd = ..\..\schemas\saml-schema-authn-context-smartcard-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-smartcardpki-2.0.xsd = ..\..\schemas\saml-schema-authn-context-smartcardpki-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-softwarepki-2.0.xsd = ..\..\schemas\saml-schema-authn-context-softwarepki-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-spki-2.0.xsd = ..\..\schemas\saml-schema-authn-context-spki-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-srp-2.0.xsd = ..\..\schemas\saml-schema-authn-context-srp-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-sslcert-2.0.xsd = ..\..\schemas\saml-schema-authn-context-sslcert-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-telephony-2.0.xsd = ..\..\schemas\saml-schema-authn-context-telephony-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-timesync-2.0.xsd = ..\..\schemas\saml-schema-authn-context-timesync-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-types-2.0.xsd = ..\..\schemas\saml-schema-authn-context-types-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-x509-2.0.xsd = ..\..\schemas\saml-schema-authn-context-x509-2.0.xsd
+ ..\..\schemas\saml-schema-authn-context-xmldsig-2.0.xsd = ..\..\schemas\saml-schema-authn-context-xmldsig-2.0.xsd
+ ..\..\schemas\saml-schema-dce-2.0.xsd = ..\..\schemas\saml-schema-dce-2.0.xsd
+ ..\..\schemas\saml-schema-ecp-2.0.xsd = ..\..\schemas\saml-schema-ecp-2.0.xsd
+ ..\..\schemas\saml-schema-metadata-2.0.xsd = ..\..\schemas\saml-schema-metadata-2.0.xsd
+ ..\..\schemas\saml-schema-protocol-2.0.xsd = ..\..\schemas\saml-schema-protocol-2.0.xsd
+ ..\..\schemas\saml-schema-x500-2.0.xsd = ..\..\schemas\saml-schema-x500-2.0.xsd
+ ..\..\schemas\saml-schema-xacml-2.0.xsd = ..\..\schemas\saml-schema-xacml-2.0.xsd
+ ..\..\schemas\saml10-catalog.xml.in = ..\..\schemas\saml10-catalog.xml.in
+ ..\..\schemas\saml11-catalog.xml.in = ..\..\schemas\saml11-catalog.xml.in
+ ..\..\schemas\saml20-catalog.xml.in = ..\..\schemas\saml20-catalog.xml.in
+ ..\..\schemas\sstc-metadata-attr.xsd = ..\..\schemas\sstc-metadata-attr.xsd
+ ..\..\schemas\sstc-request-initiation.xsd = ..\..\schemas\sstc-request-initiation.xsd
+ ..\..\schemas\sstc-saml-attribute-ext.xsd = ..\..\schemas\sstc-saml-attribute-ext.xsd
+ ..\..\schemas\sstc-saml-delegation.xsd = ..\..\schemas\sstc-saml-delegation.xsd
+ ..\..\schemas\sstc-saml-idp-discovery.xsd = ..\..\schemas\sstc-saml-idp-discovery.xsd
+ ..\..\schemas\sstc-saml-metadata-algsupport-v1.0.xsd = ..\..\schemas\sstc-saml-metadata-algsupport-v1.0.xsd
+ ..\..\schemas\sstc-saml-metadata-ext-query.xsd = ..\..\schemas\sstc-saml-metadata-ext-query.xsd
+ ..\..\schemas\sstc-saml-metadata-ui-v1.0.xsd = ..\..\schemas\sstc-saml-metadata-ui-v1.0.xsd
+ ..\..\schemas\sstc-saml-protocol-ext-thirdparty.xsd = ..\..\schemas\sstc-saml-protocol-ext-thirdparty.xsd
+ ..\..\schemas\sstc-saml1x-metadata.xsd = ..\..\schemas\sstc-saml1x-metadata.xsd
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{08D28DE8-08BB-4C55-98B4-6EAEE1FC9334}"
ProjectSection(SolutionItems) = preProject
- m4\acinclude.m4 = m4\acinclude.m4
- m4\acx_pthread.m4 = m4\acx_pthread.m4
- m4\ax_create_pkgconfig_info.m4 = m4\ax_create_pkgconfig_info.m4
- m4\boost.m4 = m4\boost.m4
- config_win32.h = config_win32.h
- configure.ac = configure.ac
- doxygen.am = doxygen.am
- doxygen.cfg = doxygen.cfg
- m4\doxygen.m4 = m4\doxygen.m4
- Makefile.am = Makefile.am
- opensaml.spec.in = opensaml.spec.in
+ ..\..\m4\acinclude.m4 = ..\..\m4\acinclude.m4
+ ..\..\m4\acx_pthread.m4 = ..\..\m4\acx_pthread.m4
+ ..\..\m4\ax_create_pkgconfig_info.m4 = ..\..\m4\ax_create_pkgconfig_info.m4
+ ..\..\m4\boost.m4 = ..\..\m4\boost.m4
+ ..\..\config_win32.h = ..\..\config_win32.h
+ ..\..\configure.ac = ..\..\configure.ac
+ ..\..\doxygen.am = ..\..\doxygen.am
+ ..\..\doxygen.cfg = ..\..\doxygen.cfg
+ ..\..\m4\doxygen.m4 = ..\..\m4\doxygen.m4
+ ..\..\Makefile.am = ..\..\Makefile.am
+ ..\..\opensaml.spec.in = ..\..\opensaml.spec.in
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{91D9712D-5D39-42BE-A320-4B55A90D9610}"
ProjectSection(SolutionItems) = preProject
- doc\LICENSE.txt = doc\LICENSE.txt
- doc\LOG4CPP.LICENSE = doc\LOG4CPP.LICENSE
- doc\Makefile.am = doc\Makefile.am
- doc\NOTICE.txt = doc\NOTICE.txt
- doc\README.txt = doc\README.txt
+ ..\..\doc\LICENSE.txt = ..\..\doc\LICENSE.txt
+ ..\..\doc\LOG4CPP.LICENSE = ..\..\doc\LOG4CPP.LICENSE
+ ..\..\doc\Makefile.am = ..\..\doc\Makefile.am
+ ..\..\doc\NOTICE.txt = ..\..\doc\NOTICE.txt
+ ..\..\doc\README.txt = ..\..\doc\README.txt
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saml", "saml\saml.vcxproj", "{34DE3EA5-EA05-4261-8B63-A850FFB91768}"
@@ -124,4 +126,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {C81D75BE-90A9-4724-B2D0-FA82E7E4AB1D}
+ EndGlobalSection
EndGlobal
diff --git a/Projects/vc15/saml/saml.vcxproj b/Projects/vc15/saml/saml.vcxproj
index ed2c18d..6d33fa3 100644
--- a/Projects/vc15/saml/saml.vcxproj
+++ b/Projects/vc15/saml/saml.vcxproj
@@ -22,7 +22,6 @@
<ProjectGuid>{34DE3EA5-EA05-4261-8B63-A850FFB91768}</ProjectGuid>
<RootNamespace>saml</RootNamespace>
<Keyword>Win32Proj</Keyword>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -92,10 +91,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)2_7D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)2_7D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)2_7</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)2_7</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)10_0D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)10_0D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)10_0</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)10_0</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -112,12 +111,12 @@
<PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_2D.lib;log4shib1D.lib;zlib1d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Configuration)\xmltooling8D.lib;xerces-c_3D.lib;xsec_2D.lib;log4shib1D.lib;zlib1d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(TargetDir)$(ProjectName)2D.lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)10D.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -138,12 +137,12 @@
<PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Platform)\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_2D.lib;log4shib1D.lib;zlib1d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Platform)\$(Configuration)\xmltooling8D.lib;xerces-c_3D.lib;xsec_2D.lib;log4shib1D.lib;zlib1d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(TargetDir)$(ProjectName)2D.lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)10D.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -155,14 +154,14 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_2.lib;log4shib1.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Configuration)\xmltooling8.lib;xerces-c_3.lib;xsec_2.lib;log4shib1.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(TargetDir)$(ProjectName)2.lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)10.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -177,14 +176,14 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Platform)\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_2.lib;log4shib1.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Platform)\$(Configuration)\xmltooling8.lib;xerces-c_3.lib;xsec_2.lib;log4shib1.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(TargetDir)$(ProjectName)2.lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)10.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/Projects/vc15/samlsign/samlsign.vcxproj b/Projects/vc15/samlsign/samlsign.vcxproj
index 9afa4bd..a413a06 100644
--- a/Projects/vc15/samlsign/samlsign.vcxproj
+++ b/Projects/vc15/samlsign/samlsign.vcxproj
@@ -22,7 +22,6 @@
<ProjectGuid>{C4E58F5A-AF7E-4060-89E7-5F690682E662}</ProjectGuid>
<RootNamespace>samlsign</RootNamespace>
<Keyword>Win32Proj</Keyword>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -107,7 +106,7 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_2D.lib;log4shib1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Configuration)\xmltooling8D.lib;xerces-c_3D.lib;xsec_2D.lib;log4shib1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
@@ -131,7 +130,7 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Platform)\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_2D.lib;log4shib1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Platform)\$(Configuration)\xmltooling8D.lib;xerces-c_3D.lib;xsec_2D.lib;log4shib1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
@@ -148,7 +147,7 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_2.lib;log4shib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Configuration)\xmltooling8.lib;xerces-c_3.lib;xsec_2.lib;log4shib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -170,7 +169,7 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Platform)\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_2.lib;log4shib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Platform)\$(Configuration)\xmltooling8.lib;xerces-c_3.lib;xsec_2.lib;log4shib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
diff --git a/Projects/vc15/samltest/samltest.vcxproj b/Projects/vc15/samltest/samltest.vcxproj
index d44ffb9..8d6112c 100644
--- a/Projects/vc15/samltest/samltest.vcxproj
+++ b/Projects/vc15/samltest/samltest.vcxproj
@@ -23,7 +23,6 @@
<RootNamespace>samltest</RootNamespace>
<Keyword>Win32Proj</Keyword>
<CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -106,7 +105,7 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_2D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Configuration)\xmltooling8D.lib;xerces-c_3D.lib;xsec_2D.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
@@ -128,7 +127,7 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Platform)\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_2D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Platform)\$(Configuration)\xmltooling8D.lib;xerces-c_3D.lib;xsec_2D.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
@@ -143,7 +142,7 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Configuration)\xmltooling8.lib;xerces-c_3.lib;xsec_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -163,7 +162,7 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Platform)\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\vc15\$(Platform)\$(Configuration)\xmltooling8.lib;xerces-c_3.lib;xsec_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
diff --git a/config_win32.h b/config_win32.h
index 7ff1fd9..5735fee 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -87,13 +87,13 @@
#define PACKAGE_NAME "opensaml"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "opensaml 2.6.0"
+#define PACKAGE_STRING "opensaml 3.0.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "opensaml"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.6.0"
+#define PACKAGE_VERSION "3.0.0"
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
@@ -106,7 +106,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "2.6.0"
+#define VERSION "3.0.0"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
diff --git a/configure.ac b/configure.ac
index 958c758..a33c7a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.50])
-AC_INIT([opensaml],[2.6.0],[https://issues.shibboleth.net/],[opensaml])
+AC_INIT([opensaml],[3.0.0],[https://issues.shibboleth.net/],[opensaml])
AC_CONFIG_SRCDIR(saml)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
diff --git a/opensaml.spec.in b/opensaml.spec.in
index bbb621b..4b42f4e 100644
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -9,12 +9,12 @@ URL: http://www.opensaml.org/
Source0: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
-BuildRequires: xerces-c-devel >= 3.1
+BuildRequires: xerces-c-devel >= 3.2
%else
-BuildRequires: libxerces-c-devel >= 3.1
+BuildRequires: libxerces-c-devel >= 3.2
%endif
-BuildRequires: libxml-security-c-devel >= 1.7.3
-BuildRequires: libxmltooling-devel >= 1.6.0
+BuildRequires: libxml-security-c-devel >= 2.0.0
+BuildRequires: libxmltooling-devel >= 3.0.0
%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
BuildRequires: gcc-c++, boost-devel >= 1.32.0
@@ -48,13 +48,13 @@ that support the SAML 1.0, 1.1, and 2.0 specifications.
This package contains the utility programs.
-%package -n libsaml9
+%package -n libsaml10
Summary: OpenSAML SAML library
Group: Development/Libraries/C and C++
Provides: @PACKAGE_NAME@ = %{version}-%{release}
Obsoletes: @PACKAGE_NAME@ < %{version}-%{release}
-%description -n libsaml9
+%description -n libsaml10
OpenSAML is an open source implementation of the OASIS Security Assertion
Markup Language Specification. It contains a set of open source C++ classes
that support the SAML 1.0, 1.1, and 2.0 specifications.
@@ -64,16 +64,16 @@ This package contains just the shared library.
%package -n libsaml-devel
Summary: OpenSAML development Headers
Group: Development/Libraries/C and C++
-Requires: libsaml9 = %{version}-%{release}
+Requires: libsaml10 = %{version}-%{release}
Provides: @PACKAGE_NAME at -devel = %{version}-%{release}
Obsoletes: @PACKAGE_NAME at -devel < %{version}-%{release}
%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
-Requires: xerces-c-devel >= 3.1
+Requires: xerces-c-devel >= 3.2
%else
-Requires: libxerces-c-devel >= 3.1
+Requires: libxerces-c-devel >= 3.2
%endif
-Requires: libxml-security-c-devel >= 1.7.3
-Requires: libxmltooling-devel >= 1.6.0
+Requires: libxml-security-c-devel >= 2.0.0
+Requires: libxmltooling-devel >= 3.0.0
%{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
@@ -114,18 +114,18 @@ This package includes XML schemas and related files.
[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
%ifnos solaris2.8 solaris2.9 solaris2.10
-%post -n libsaml9 -p /sbin/ldconfig
+%post -n libsaml10 -p /sbin/ldconfig
%endif
%ifnos solaris2.8 solaris2.9 solaris2.10
-%postun -n libsaml9 -p /sbin/ldconfig
+%postun -n libsaml10 -p /sbin/ldconfig
%endif
%files -n @PACKAGE_NAME at -bin
%defattr(-,root,root,-)
%{_bindir}/samlsign
-%files -n libsaml9
+%files -n libsaml10
%defattr(-,root,root,-)
%{_libdir}/libsaml.so.*
@@ -142,6 +142,10 @@ This package includes XML schemas and related files.
%doc %{pkgdocdir}
%changelog
+* Tue Nov 21 2017 Scott Cantor <cantor.2 at osu.edu> - 3.0.0-1
+- Update soname
+- Update dependency reqs
+
* Fri Jun 24 2016 Scott Cantor <cantor.2 at osu.edu> - 2.6.0-1
- Fix some nits
- Update soname in package names
diff --git a/saml/Makefile.am b/saml/Makefile.am
index f394aff..44ecab9 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -194,7 +194,7 @@ libsaml_la_SOURCES = \
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
-libsaml_la_LDFLAGS = -version-info 9:0:0
+libsaml_la_LDFLAGS = -version-info 10:0:0
install-exec-hook:
for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
diff --git a/saml/saml.rc b/saml/saml.rc
index 01f51ac..990e4f2 100644
--- a/saml/saml.rc
+++ b/saml/saml.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,7,0,0
- PRODUCTVERSION 2,7,0,0
+ FILEVERSION 3,0,0,0
+ PRODUCTVERSION 3,0,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,22 +47,22 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "OpenSAML Library\0"
- VALUE "FileVersion", "2, 7, 0, 0\0"
+ VALUE "FileVersion", "3, 0, 0, 0\0"
#ifdef _DEBUG
- VALUE "InternalName", "saml2_7D\0"
+ VALUE "InternalName", "saml10_0D\0"
#else
- VALUE "InternalName", "saml2_7\0"
+ VALUE "InternalName", "saml10_0\0"
#endif
VALUE "LegalCopyright", "Copyright � 2017 UCAID\0"
VALUE "LegalTrademarks", "\0"
#ifdef _DEBUG
- VALUE "OriginalFilename", "saml2_7D.dll\0"
+ VALUE "OriginalFilename", "saml10_0D.dll\0"
#else
- VALUE "OriginalFilename", "saml2_7.dll\0"
+ VALUE "OriginalFilename", "saml10_0.dll\0"
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "OpenSAML 2.7.0\0"
- VALUE "ProductVersion", "2, 7, 0, 0\0"
+ VALUE "ProductName", "OpenSAML 3.0.0\0"
+ VALUE "ProductVersion", "3, 0, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/saml/version.h b/saml/version.h
index 28b6f92..f1044bc 100644
--- a/saml/version.h
+++ b/saml/version.h
@@ -42,8 +42,8 @@
* AND DO NOT MODIFY ANYTHING ELSE IN THIS VERSION HEADER FILE
*/
-#define OPENSAML_VERSION_MAJOR 2
-#define OPENSAML_VERSION_MINOR 6
+#define OPENSAML_VERSION_MAJOR 3
+#define OPENSAML_VERSION_MINOR 0
#define OPENSAML_VERSION_REVISION 0
/** DO NOT MODIFY BELOW THIS LINE */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/opensaml2.git
More information about the Pkg-shibboleth-devel
mailing list