#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. */
/* #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 */
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)
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])])
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
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}
%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.
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1D.lib xerces-c_2D.lib xmltooling-lite1D.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"\r
LinkIncremental="2"\r
AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"\r
GenerateDebugInformation="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1D.lib xerces-c_2D.lib xmltooling-lite1D.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"\r
LinkIncremental="2"\r
AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"\r
GenerateDebugInformation="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1.lib xerces-c_2.lib xmltooling-lite1.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_1.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_2.dll"\r
LinkIncremental="1"\r
AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"\r
SubSystem="2"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1.lib xerces-c_2.lib xmltooling-lite1.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_1.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_2.dll"\r
LinkIncremental="1"\r
AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"\r
GenerateDebugInformation="true"\r
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,1,0,0\r
- PRODUCTVERSION 2,1,0,0\r
+ FILEVERSION 1,2,0,0\r
+ PRODUCTVERSION 2,2,0,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
#else\r
VALUE "FileDescription", "Shibboleth SP Library\0"\r
#endif\r
- VALUE "FileVersion", "1, 1, 0, 0\0"\r
+ VALUE "FileVersion", "1, 2, 0, 0\0"\r
#ifdef SHIBSP_LITE\r
#ifdef _DEBUG\r
- VALUE "InternalName", "shibsp-lite1_1D\0"\r
+ VALUE "InternalName", "shibsp-lite1_2D\0"\r
#else\r
- VALUE "InternalName", "shibsp-lite1_1\0"\r
+ VALUE "InternalName", "shibsp-lite1_2\0"\r
#endif\r
#else\r
#ifdef _DEBUG\r
- VALUE "InternalName", "shibsp1_1D\0"\r
+ VALUE "InternalName", "shibsp1_2D\0"\r
#else\r
- VALUE "InternalName", "shibsp1_1\0"\r
+ VALUE "InternalName", "shibsp1_2\0"\r
#endif\r
#endif\r
VALUE "LegalCopyright", "Copyright © 2008 Internet2\0"\r
VALUE "LegalTrademarks", "\0"\r
#ifdef SHIBSP_LITE\r
#ifdef _DEBUG\r
- VALUE "OriginalFilename", "shibsp-lite1_1D.dll\0"\r
+ VALUE "OriginalFilename", "shibsp-lite1_2D.dll\0"\r
#else\r
- VALUE "OriginalFilename", "shibsp-lite1_1.dll\0"\r
+ VALUE "OriginalFilename", "shibsp-lite1_2.dll\0"\r
#endif\r
#else\r
#ifdef _DEBUG\r
- VALUE "OriginalFilename", "shibsp1_1D.dll\0"\r
+ VALUE "OriginalFilename", "shibsp1_2D.dll\0"\r
#else\r
- VALUE "OriginalFilename", "shibsp1_1.dll\0"\r
+ VALUE "OriginalFilename", "shibsp1_2.dll\0"\r
#endif\r
#endif\r
VALUE "PrivateBuild", "\0"\r
- VALUE "ProductName", "Shibboleth 2.1\0"\r
- VALUE "ProductVersion", "2, 1, 0, 0\0"\r
+ VALUE "ProductName", "Shibboleth 2.2\0"\r
+ VALUE "ProductVersion", "2, 2, 0, 0\0"\r
VALUE "SpecialBuild", "\0"\r
END\r
END\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1D.lib xerces-c_2D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"\r
LinkIncremental="2"\r
AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"\r
GenerateDebugInformation="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1D.lib xerces-c_2D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"\r
LinkIncremental="2"\r
AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(PlatformName)\$(ConfigurationName);..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"\r
GenerateDebugInformation="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1.lib xerces-c_2.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_1.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_2.dll"\r
LinkIncremental="1"\r
AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"\r
SubSystem="2"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1.lib xerces-c_2.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_1.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_2.dll"\r
LinkIncremental="1"\r
AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(PlatformName)\$(ConfigurationName);..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"\r
GenerateDebugInformation="true"\r
/*
* 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
/**
* version.h
- *
- * Library version macros and constants
+ *
+ * Library version macros and constants
*/
#ifndef __shibsp_version_h__
// 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 */