From 33314dba57619ad9bbdd76d1f793f4e6e0b0852b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Mon, 25 Jun 2012 07:32:04 +0000 Subject: [PATCH] Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 2.4.2-1 --- org.glite.lb.logger/configure | 12 +++--------- org.glite.lb.logger/project/ChangeLog | 4 ++++ org.glite.lb.logger/project/version.properties | 2 +- org.glite.lb.server/configure | 12 +++--------- org.glite.lb.server/project/ChangeLog | 7 +++++++ org.glite.lb.server/project/version.properties | 2 +- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/org.glite.lb.logger/configure b/org.glite.lb.logger/configure index 4be8ff9..eba7d34 100755 --- a/org.glite.lb.logger/configure +++ b/org.glite.lb.logger/configure @@ -126,10 +126,6 @@ my %externs = ( gridsite => { prefix => '/opt/glite' }, - lcas => { - prefix => '/opt/glite', - pkg => 'lcas' - }, trustmanager => { prefix => '/opt/glite' }, @@ -600,7 +596,7 @@ BEGIN{ 'lb.logger' => [ qw/cppunit:B libtool:B globus:B pkgconfig:B/ ], 'lb.logger-msg' => [ qw/cppunit:B activemq libtool:B globus:B pkgconfig:B/ ], 'lb.nagios' => [ qw/globus_proxy_utils:R/ ], - 'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql-server:R cppunit:B gsoap:B classads:B voms:B lcas gridsite:B bison:B libtool:B libxml2 flex:B pkgconfig:B/ ], + 'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql-server:R cppunit:B gsoap:B classads:B voms:B gridsite:B bison:B libtool:B libxml2 flex:B pkgconfig:B/ ], 'lb.state-machine' => [ qw/classads:B libtool:B libxslt:B expat:B globus:B pkgconfig:B/ ], 'lb.utils' => [ qw/cppunit:B libtool:B globus:B pkgconfig:B/ ], 'lb.ws-interface' => [ qw/libxslt:B tidy:B/ ], @@ -910,7 +906,6 @@ for my $ext (keys %deps_aux) { glue_schema=>'glue-schema', trustmanager=>'org.glite.security.trustmanager', axis=>'axis', - lcas=>'org.glite.security.lcas', gsoapxx=>'-', jdk=>'jdk', voms=>'org.glite.security.voms-api-cpp', @@ -924,7 +919,7 @@ for my $ext (keys %deps_aux) { }, etics_projects => { vdt=>[qw/globus globus_essentials globus_proxy_utils gpt/], - 'org.glite'=>[qw/voms gridsite lcas gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/], + 'org.glite'=>[qw/voms gridsite gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/], }, etics_locations => { '*' => '', @@ -980,7 +975,6 @@ for my $ext (keys %deps_aux) { trustmanager=>'emi.java-security.trustmanager', trustmanager_axis=>'emi.java-security.trustmanager-axis', axis=>'axis1.4', - lcas=>'emi.sac.lcas', gsoapxx=>'-', jdk=>'java', voms => 'emi.voms.voms-api', @@ -1050,7 +1044,7 @@ for my $ext (keys %deps_aux) { }, }, etics_projects => { - 'emi'=>[qw/voms voms-devel gridsite lcas gip_service bdii glite_version glue_schema yaim_core yaim_bdii trustmanager trustmanager_axis/], + 'emi'=>[qw/voms voms-devel gridsite gip_service bdii glite_version glue_schema yaim_core yaim_bdii trustmanager trustmanager_axis/], }, etics_locations => { axis => 'axis', diff --git a/org.glite.lb.logger/project/ChangeLog b/org.glite.lb.logger/project/ChangeLog index 84156bf..c63e3b5 100644 --- a/org.glite.lb.logger/project/ChangeLog +++ b/org.glite.lb.logger/project/ChangeLog @@ -210,3 +210,7 @@ 2.4.1-1 - Fixed occasional memory handling errors (SB#95013) +2.4.2-1 +- Support GLITE_GSS_MECH in startup scripts + - using Kerberos environment variables instead of certificates for "krb5" + diff --git a/org.glite.lb.logger/project/version.properties b/org.glite.lb.logger/project/version.properties index c7e8482..0d0584d 100644 --- a/org.glite.lb.logger/project/version.properties +++ b/org.glite.lb.logger/project/version.properties @@ -1,3 +1,3 @@ # $Header$ -module.version=2.4.1 +module.version=2.4.2 module.age=1 diff --git a/org.glite.lb.server/configure b/org.glite.lb.server/configure index 4be8ff9..eba7d34 100755 --- a/org.glite.lb.server/configure +++ b/org.glite.lb.server/configure @@ -126,10 +126,6 @@ my %externs = ( gridsite => { prefix => '/opt/glite' }, - lcas => { - prefix => '/opt/glite', - pkg => 'lcas' - }, trustmanager => { prefix => '/opt/glite' }, @@ -600,7 +596,7 @@ BEGIN{ 'lb.logger' => [ qw/cppunit:B libtool:B globus:B pkgconfig:B/ ], 'lb.logger-msg' => [ qw/cppunit:B activemq libtool:B globus:B pkgconfig:B/ ], 'lb.nagios' => [ qw/globus_proxy_utils:R/ ], - 'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql-server:R cppunit:B gsoap:B classads:B voms:B lcas gridsite:B bison:B libtool:B libxml2 flex:B pkgconfig:B/ ], + 'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql-server:R cppunit:B gsoap:B classads:B voms:B gridsite:B bison:B libtool:B libxml2 flex:B pkgconfig:B/ ], 'lb.state-machine' => [ qw/classads:B libtool:B libxslt:B expat:B globus:B pkgconfig:B/ ], 'lb.utils' => [ qw/cppunit:B libtool:B globus:B pkgconfig:B/ ], 'lb.ws-interface' => [ qw/libxslt:B tidy:B/ ], @@ -910,7 +906,6 @@ for my $ext (keys %deps_aux) { glue_schema=>'glue-schema', trustmanager=>'org.glite.security.trustmanager', axis=>'axis', - lcas=>'org.glite.security.lcas', gsoapxx=>'-', jdk=>'jdk', voms=>'org.glite.security.voms-api-cpp', @@ -924,7 +919,7 @@ for my $ext (keys %deps_aux) { }, etics_projects => { vdt=>[qw/globus globus_essentials globus_proxy_utils gpt/], - 'org.glite'=>[qw/voms gridsite lcas gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/], + 'org.glite'=>[qw/voms gridsite gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/], }, etics_locations => { '*' => '', @@ -980,7 +975,6 @@ for my $ext (keys %deps_aux) { trustmanager=>'emi.java-security.trustmanager', trustmanager_axis=>'emi.java-security.trustmanager-axis', axis=>'axis1.4', - lcas=>'emi.sac.lcas', gsoapxx=>'-', jdk=>'java', voms => 'emi.voms.voms-api', @@ -1050,7 +1044,7 @@ for my $ext (keys %deps_aux) { }, }, etics_projects => { - 'emi'=>[qw/voms voms-devel gridsite lcas gip_service bdii glite_version glue_schema yaim_core yaim_bdii trustmanager trustmanager_axis/], + 'emi'=>[qw/voms voms-devel gridsite gip_service bdii glite_version glue_schema yaim_core yaim_bdii trustmanager trustmanager_axis/], }, etics_locations => { axis => 'axis', diff --git a/org.glite.lb.server/project/ChangeLog b/org.glite.lb.server/project/ChangeLog index 016993d..4862120 100644 --- a/org.glite.lb.server/project/ChangeLog +++ b/org.glite.lb.server/project/ChangeLog @@ -393,3 +393,10 @@ - Support Torque event sources in WS queries - Server's XML unit test fixed +2.4.2-1 +- Using SSL version of gridsite (openssl not bundled in globus anymore) +- Disable the lcas module, unavailable anyway +- Support GLITE_GSS_MECH in startup scripts + - using Kerberos environment variables instead of certificates for "krb5" +- Avoid explicit dependencies on globus GSSAPI + diff --git a/org.glite.lb.server/project/version.properties b/org.glite.lb.server/project/version.properties index fa27a86..12ba79e 100644 --- a/org.glite.lb.server/project/version.properties +++ b/org.glite.lb.server/project/version.properties @@ -1,3 +1,3 @@ # : /cvs/jra1mw/org.glite.lb.server/project/version.properties,v 1.185 2008/06/25 13:12:58 akrenek Exp $ -module.version=2.4.1 +module.version=2.4.2 module.age=1 -- 1.8.2.3