From: Scott Cantor Date: Sat, 12 Sep 2009 03:03:33 +0000 (+0000) Subject: Bump version. X-Git-Tag: 2.3~55 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=1e3e94d1839445821bb35eaf26d9cf69bc64729f Bump version. --- diff --git a/adfs/adfs.rc b/adfs/adfs.rc index 7db3d05..9e46d04 100644 --- a/adfs/adfs.rc +++ b/adfs/adfs.rc @@ -54,8 +54,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,1,0 - PRODUCTVERSION 2,2,1,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -73,7 +73,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Internet2\0" VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0" - VALUE "FileVersion", "2, 2, 1, 0\0" + VALUE "FileVersion", "2, 3, 0, 0\0" #ifdef SHIBSP_LITE VALUE "InternalName", "adfs-lite\0" #else @@ -87,8 +87,8 @@ BEGIN VALUE "OriginalFilename", "adfs.so\0" #endif VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.2.1\0" - VALUE "ProductVersion", "2, 2, 1, 0\0" + VALUE "ProductName", "Shibboleth 2.3\0" + VALUE "ProductVersion", "2, 3, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/apache/mod_shib_13.rc b/apache/mod_shib_13.rc index 503cf30..1ef85b6 100644 --- a/apache/mod_shib_13.rc +++ b/apache/mod_shib_13.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,1,0 - PRODUCTVERSION 2,2,1,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -47,14 +47,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Internet2\0" VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0" - VALUE "FileVersion", "2, 2, 1, 0\0" + VALUE "FileVersion", "2, 3, 0, 0\0" VALUE "InternalName", "mod_shib_13\0" VALUE "LegalCopyright", "Copyright © 2009 Internet2\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "mod_shib_13.so\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.2.1\0" - VALUE "ProductVersion", "2, 2, 1, 0\0" + VALUE "ProductName", "Shibboleth 2.3\0" + VALUE "ProductVersion", "2, 3, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc index d3e619e..79dd05e 100644 --- a/apache/mod_shib_20.rc +++ b/apache/mod_shib_20.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,1,0 - PRODUCTVERSION 2,2,1,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -47,14 +47,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Internet2\0" VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0" - VALUE "FileVersion", "2, 2, 1, 0\0" + VALUE "FileVersion", "2, 3, 0, 0\0" VALUE "InternalName", "mod_shib_20\0" VALUE "LegalCopyright", "Copyright © 2009 Internet2\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "mod_shib_20.so\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.2.1\0" - VALUE "ProductVersion", "2, 2, 1, 0\0" + VALUE "ProductName", "Shibboleth 2.3\0" + VALUE "ProductVersion", "2, 3, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc index 5f92326..24182bd 100644 --- a/apache/mod_shib_22.rc +++ b/apache/mod_shib_22.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,1,0 - PRODUCTVERSION 2,2,1,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -47,14 +47,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Internet2\0" VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0" - VALUE "FileVersion", "2, 2, 1, 0\0" + VALUE "FileVersion", "2, 3, 0, 0\0" VALUE "InternalName", "mod_shib_22\0" VALUE "LegalCopyright", "Copyright © 2009 Internet2\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "mod_shib_22.so\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.2.1\0" - VALUE "ProductVersion", "2, 2, 1, 0\0" + VALUE "ProductName", "Shibboleth 2.3\0" + VALUE "ProductVersion", "2, 3, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/config_win32.h b/config_win32.h index 04b4dd2..9778d65 100644 --- a/config_win32.h +++ b/config_win32.h @@ -117,13 +117,13 @@ #define PACKAGE_NAME "shibboleth" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "shibboleth 2.2.1" +#define PACKAGE_STRING "shibboleth 2.3" /* 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.2.1" +#define PACKAGE_VERSION "2.3" /* Define to the necessary symbol if this constant uses a non-standard name on your system. */ @@ -136,7 +136,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "2.2.1" +#define VERSION "2.3" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/configure.ac b/configure.ac index fd07125..9a99c3b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.50]) -AC_INIT([shibboleth], [2.2.1], [shibboleth-users@internet2.edu], [shibboleth]) +AC_INIT([shibboleth], [2.3], [shibboleth-users@internet2.edu], [shibboleth]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([shibboleth],[2.2.1]) +AM_INIT_AUTOMAKE([shibboleth],[2.3]) sinclude(doxygen.m4) sinclude(acx_pthread.m4) diff --git a/fastcgi/shibauthorizer.rc b/fastcgi/shibauthorizer.rc index c9b4c1d..37258c9 100644 --- a/fastcgi/shibauthorizer.rc +++ b/fastcgi/shibauthorizer.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,1,0 - PRODUCTVERSION 2,2,1,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -47,14 +47,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Internet2\0" VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0" - VALUE "FileVersion", "2, 2, 1, 0\0" + VALUE "FileVersion", "2, 3, 0, 0\0" VALUE "InternalName", "shibauthorizer\0" VALUE "LegalCopyright", "Copyright © 2009 Internet2\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "shibauthorizer.exe\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.2.1\0" - VALUE "ProductVersion", "2, 2, 1, 0\0" + VALUE "ProductName", "Shibboleth 2.3\0" + VALUE "ProductVersion", "2, 3, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/fastcgi/shibresponder.rc b/fastcgi/shibresponder.rc index 4bccb0f..f95c347 100644 --- a/fastcgi/shibresponder.rc +++ b/fastcgi/shibresponder.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,1,0 - PRODUCTVERSION 2,2,1,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -47,14 +47,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Internet2\0" VALUE "FileDescription", "Shibboleth FastCGI Responder\0" - VALUE "FileVersion", "2, 2, 1, 0\0" + VALUE "FileVersion", "2, 3, 0, 0\0" VALUE "InternalName", "shibresponder\0" VALUE "LegalCopyright", "Copyright © 2009 Internet2\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "shibresponder.exe\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.2.1\0" - VALUE "ProductVersion", "2, 2, 1, 0\0" + VALUE "ProductName", "Shibboleth 2.3\0" + VALUE "ProductVersion", "2, 3, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/isapi_shib/isapi_shib.rc b/isapi_shib/isapi_shib.rc index 4a6f709..116438f 100644 --- a/isapi_shib/isapi_shib.rc +++ b/isapi_shib/isapi_shib.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,1,0 - PRODUCTVERSION 2,2,1,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -47,14 +47,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Internet2\0" VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0" - VALUE "FileVersion", "2, 2, 1, 0\0" + VALUE "FileVersion", "2, 3, 0, 0\0" VALUE "InternalName", "isapi_shib\0" VALUE "LegalCopyright", "Copyright © 2009 Internet2\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "isapi_shib.dll\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.2.1\0" - VALUE "ProductVersion", "2, 2, 1, 0\0" + VALUE "ProductName", "Shibboleth 2.3\0" + VALUE "ProductVersion", "2, 3, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/memcache-store/memcache-store.rc b/memcache-store/memcache-store.rc index ffd78ff..5edb5b1 100644 --- a/memcache-store/memcache-store.rc +++ b/memcache-store/memcache-store.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,1,0 - PRODUCTVERSION 2,2,1,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -71,12 +71,12 @@ BEGIN BEGIN VALUE "CompanyName", "Internet2\0" VALUE "FileDescription", "Shibboleth Memcache Storage Service Plugin\0" - VALUE "FileVersion", "2, 2, 1, 0\0" + VALUE "FileVersion", "2, 3, 0, 0\0" VALUE "InternalName", "memcache-store\0" VALUE "LegalCopyright", "Copyright © 2009 Internet2\0" VALUE "OriginalFilename", "memcache-store.so\0" - VALUE "ProductName", "Shibboleth 2.2.1\0" - VALUE "ProductVersion", "2, 2, 1, 0\0" + VALUE "ProductName", "Shibboleth 2.3\0" + VALUE "ProductVersion", "2, 3, 0, 0\0" END END BLOCK "VarFileInfo" diff --git a/nsapi_shib/nsapi_shib.rc b/nsapi_shib/nsapi_shib.rc index ba31800..a551403 100644 --- a/nsapi_shib/nsapi_shib.rc +++ b/nsapi_shib/nsapi_shib.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,1,0 - PRODUCTVERSION 2,2,1,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -47,14 +47,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Internet2\0" VALUE "FileDescription", "Shibboleth NSAPI Extension\0" - VALUE "FileVersion", "2, 2, 1, 0\0" + VALUE "FileVersion", "2, 3, 0, 0\0" VALUE "InternalName", "nsapi_shib\0" VALUE "LegalCopyright", "Copyright © 2009 Internet2\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "nsapi_shib.dll\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.2.1\0" - VALUE "ProductVersion", "2, 2, 1, 0\0" + VALUE "ProductName", "Shibboleth 2.3\0" + VALUE "ProductVersion", "2, 3, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/odbc-store/odbc-store.rc b/odbc-store/odbc-store.rc index 1a9eb39..0190222 100644 --- a/odbc-store/odbc-store.rc +++ b/odbc-store/odbc-store.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,1,0 - PRODUCTVERSION 2,2,1,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -71,12 +71,12 @@ BEGIN BEGIN VALUE "CompanyName", "Internet2\0" VALUE "FileDescription", "Shibboleth ODBC Storage Service Plugin\0" - VALUE "FileVersion", "2, 2, 1, 0\0" + VALUE "FileVersion", "2, 3, 0, 0\0" VALUE "InternalName", "odbc-store\0" VALUE "LegalCopyright", "Copyright © 2009 Internet2\0" VALUE "OriginalFilename", "odbc-store.so\0" - VALUE "ProductName", "Shibboleth 2.2.1\0" - VALUE "ProductVersion", "2, 2, 1, 0\0" + VALUE "ProductName", "Shibboleth 2.3\0" + VALUE "ProductVersion", "2, 3, 0, 0\0" END END BLOCK "VarFileInfo" diff --git a/shibd/shibd.rc b/shibd/shibd.rc index 4f11667..264fc0c 100644 --- a/shibd/shibd.rc +++ b/shibd/shibd.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,1,0 - PRODUCTVERSION 2,2,1,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -47,14 +47,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Internet2\0" VALUE "FileDescription", "Shibboleth Daemon Service\0" - VALUE "FileVersion", "2, 2, 1, 0\0" + VALUE "FileVersion", "2, 3, 0, 0\0" VALUE "InternalName", "shibd\0" VALUE "LegalCopyright", "Copyright © 2009 Internet2\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "shibd.exe\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.2.1\0" - VALUE "ProductVersion", "2, 2, 1, 0\0" + VALUE "ProductName", "Shibboleth 2.3\0" + VALUE "ProductVersion", "2, 3, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am index 811d4ed..baa88ad 100644 --- a/shibsp/Makefile.am +++ b/shibsp/Makefile.am @@ -200,8 +200,8 @@ libshibsp_la_SOURCES = \ # this is different from the project version # http://sources.redhat.com/autobook/autobook/autobook_91.html -libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 3:1:0 -libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 3:1:0 +libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 4:0:0 +libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 4:0:0 libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE pkgsysconfdir = $(sysconfdir)/@PACKAGE@ diff --git a/shibsp/shibsp-lite.vcproj b/shibsp/shibsp-lite.vcproj index e465154..beccaa1 100644 --- a/shibsp/shibsp-lite.vcproj +++ b/shibsp/shibsp-lite.vcproj @@ -67,7 +67,7 @@