Updating version, ChangeLog and copying the most recent configure from ./org.glite...

diff --git a/org.glite.lbjp-common.gss/configure b/org.glite.lbjp-common.gss/configure
index f9f51ca..16595a2 100755 (executable)
--- a/org.glite.lbjp-common.gss/configure
+++ b/org.glite.lbjp-common.gss/configure
@@ -138,7 +138,7 @@ my %externs = (
        },
        jdk => {
                prefix=> '/usr/java/latest',
-               locations => [ '/usr/java/latest', '/usr/lib/jvm/java' ],
+               locations => [ '/usr/lib/jvm/java', '/usr/java/latest' ],
        },
        libtar => {
                prefix=> '/usr'
@@ -187,6 +187,7 @@ my %lbmodules = (
        'jp' => [ qw/client doc index primary server-common ws-interface/ ],
        'gridsite' => [ qw/apache shared commands core devel slashgrid services service-clients gsexec/ ],
        'px' => [ qw/proxyrenewal myproxy-yaim/ ],
+       'canl' => [ qw/c/ ],
        );
 
 
@@ -210,6 +211,7 @@ my @opts = (
        'lbjp-common-tag=s' => \$lbjp_tag,
        'jp-tag=s' => \$jp_tag,
        'jobid-tag=s' => \$jobid_tag,
+       'canl-tag=s' => \$canl_tag,
        'help' => \$help,
        'libdir=s' => \$libdir,
        'project=s' => \$project,
@@ -485,7 +487,7 @@ sub mode_checkout() {
                                }
                        }       
                }
-               if ($lbjp_tag){
+               if ($lbjp_tag) {
                        for (@{$lbmodules{'lbjp-common'}}){
                                if ("lbjp-common.".$_ eq $module){
                                         $tag = '-r '.$lbjp_tag;
@@ -506,6 +508,13 @@ sub mode_checkout() {
                                 }
                        }
                }
+               if ($canl_tag) {
+                       for (@{$lbmodules{'canl'}}){
+                               if ("canl.".$_ eq $module){
+                                        $tag = '-r '.$canl_tag;
+                                }
+                       }
+               }
                #if (grep {"lb.".$_ eq $module} @{$lbmodules{lb}}){
                #       print "found";
                #}
@@ -544,7 +553,7 @@ BEGIN{
        'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite bison:B libtool:B libxml2 flex:B/ ],
        'lb.state-machine' => [ qw/classads libtool:B libxslt:B expat:B/ ],
        'lb.utils' => [ qw/cppunit:B libtool:B/ ],
-       'lb.ws-interface' => [ qw/libxslt:B/ ],
+       'lb.ws-interface' => [ qw/libxslt:B tidy:B/ ],
        'lb.ws-test' => [ qw/gsoap:B libtool:B/ ],
        'lb.types' => [ qw// ],
        'lb.harvester' => [ qw/docbook-utils:B libtool:B/ ],
@@ -577,6 +586,7 @@ BEGIN{
        'gridsite.1.5-compat' => [ qw/httpd-devel:B gsoap:B globus:B curl:B doxygen:B fuse-devel:B libxml2:B openssl:B build_common_cpp:B doxygen:B/ ],
        'px.proxyrenewal' => [ qw/globus:B globus_essentials:R myproxy-devel:B myproxy-libs:R voms libtool:B/ ],
        'px.myproxy-config' => [ qw/myproxy-admin:R/ ], # in myproxy-config.spec
+       'canl.c' => [ qw/cares:B openssl:B libtool:B/ ],
 );
 
 %need_jars = (
@@ -623,7 +633,7 @@ for my $jar (keys %need_jars) {
                lb.utils:R
        / ],
        'lb.server' => [ qw/
-               lb.ws-interface lb.types:B lb.common lb.state-machine
+               lb.ws-interface lb.types:B lb.common lb.state-machine lb.utils:R
                lbjp-common.db lbjp-common.server-bones lbjp-common.trio lbjp-common.maildir lbjp-common.log
                jobid.api-c
                lbjp-common.gsoap-plugin lbjp-common.gss
@@ -705,6 +715,8 @@ for my $jar (keys %need_jars) {
        'px.emi-px' => [qw/px.myproxy-yaim:R/],
        'px.myproxy-yaim' => [ qw// ],
        'px.myproxy-config' => [],
+
+       'canl.c' => [],
 );
 
 for my $ext (keys %deps_aux) {
@@ -717,7 +729,7 @@ for my $ext (keys %deps_aux) {
 }
 
 
-%extrafull = ( gridsite=>'org.gridsite.core');
+%extrafull = ( gridsite=>'org.gridsite.core', 'canl.c' => 'emi.canl.canl-c');
 
 #( java => 'client-java' );
 %extranodmod = (
@@ -727,7 +739,8 @@ for my $ext (keys %deps_aux) {
        jpclient => 'jp.client',
        lb => 'lb.glite-LB',
        px => 'px.glite-PX',
-       proxyrenewal => 'px.proxyrenewal'
+       proxyrenewal => 'px.proxyrenewal',
+       canl => 'canl.c',
 );
 
 %obsoletes = (
@@ -755,6 +768,7 @@ for my $ext (keys %deps_aux) {
        'lbjp-common' => 'org.glite',
        'gridsite' => 'org',
        'px' => 'org.glite',
+       'canl' => 'emi',
 );
 
 %cvs_tag_prefix = (
@@ -764,6 +778,7 @@ for my $ext (keys %deps_aux) {
        'lbjp-common' => 'glite-',
        'gridsite' => '',
        'px' => 'glite-',
+       'canl' => 'emi-',
 );
 
 # ==== projects specification ====
@@ -849,6 +864,7 @@ for my $ext (keys %deps_aux) {
                        'lbjp-common' => 'emi-',
                        'gridsite' => 'emi-',
                        'px' => 'emi-',
+                       'canl' => 'emi-',
                },
                tag_prefix => { %cvs_tag_prefix },
                flavours => '--thrflavour= --nothrflavour=',
@@ -880,23 +896,25 @@ for my $ext (keys %deps_aux) {
                                'myproxy-devel' => 'myproxy-devel.x86_64',
                        },
                        deb6_x86_64_gcc445 => {
-                               globus_essentials => 'libglobus-gssapi-gsi4',
-                               globus => 'libglobus-gssapi-gsi-dev',
-                               axis => 'libaxis-java',
-                               cares => 'libc-ares2',
-                               cppunit => 'libcppunit',
-                               expat => 'libexpat1',
-                               log4c => 'liblog4c3',
-                               curl => 'libcurl3',
-                               'mysql' => 'libmysqlclient6',
-                               'mysql-devel' => 'libmysqlclient-dev',
-                               libxslt => 'xsltproc',
-                               'jakarta-commons-codec' => 'libcommons-codec-java',
-                               'jakarta-commons-lang' => 'libcommons-lang-java',
-                               'tetex-latex' => 'texlive-latex-extra',
-                               'perl-LDAP' => 'libnet-ldap-perl',
-                               'fuse-lib' => 'libfuse2',
-                               'fuse' => 'fuse-utils',
+                               axis => 'axis1.4',
+                               # mappings in ETICS project configuration
+                               #globus_essentials => 'libglobus-gssapi-gsi4',
+                               #globus => 'libglobus-gssapi-gsi-dev',
+                               #axis => 'libaxis-java',
+                               #cares => 'libc-ares2',
+                               #cppunit => 'libcppunit',
+                               #expat => 'libexpat1',
+                               #log4c => 'liblog4c3',
+                               #curl => 'libcurl3',
+                               #'mysql' => 'libmysqlclient16',
+                               #'mysql-devel' => 'libmysqlclient-dev',
+                               #libxslt => 'xsltproc',
+                               #'jakarta-commons-codec' => 'libcommons-codec-java',
+                               #'jakarta-commons-lang' => 'libcommons-lang-java',
+                               #'tetex-latex' => 'texlive-latex-extra',
+                               #'perl-LDAP' => 'libnet-ldap-perl',
+                               #'fuse-lib' => 'libfuse2',
+                               #'fuse' => 'fuse-utils',
                        },
                },
                etics_externs_devel => {
@@ -917,20 +935,21 @@ for my $ext (keys %deps_aux) {
                                jdk=>'java-devel',
                        },
                        deb6_x86_64_gcc445 => {
-                               cares => 'libc-ares-dev',
-                               cppunit => 'libcppunit-dev',
-                               expat => 'libexpat1-dev',
-                               libtar => 'libtar-dev',
-                               log4c => 'liblog4c-dev',
-                               postgresql => 'libpq-dev',
-                               curl => 'libcurl4-openssl-dev',
-                               libxml2 => 'libxml2-dev',
-                               openssl => 'libssl-dev',
-                               'tetex-latex' => 'texlive-latex-extra',
-                               libxslt=>'xsltproc',
-                               'httpd-devel' => 'apache2-prefork-dev',
-                               'fuse-devel' => 'libfuse-dev',
-                               gsoap => 'gsoap',
+                               # mappings in ETICS project configuration
+                               #cares => 'libc-ares-dev',
+                               #cppunit => 'libcppunit-dev',
+                               #expat => 'libexpat1-dev',
+                               #libtar => 'libtar-dev',
+                               #log4c => 'liblog4c-dev',
+                               #postgresql => 'libpq-dev',
+                               #curl => 'libcurl4-openssl-dev',
+                               #libxml2 => 'libxml2-dev',
+                               #openssl => 'libssl-dev',
+                               #'tetex-latex' => 'texlive-latex-extra',
+                               #libxslt=>'xsltproc',
+                               #'httpd-devel' => 'apache2-prefork-dev',
+                               #'fuse-devel' => 'libfuse-dev',
+                               #gsoap => 'gsoap',
                        },
                },
                etics_projects => {
@@ -950,7 +969,7 @@ for my $ext (keys %deps_aux) {
                        sl5_x86_64_gcc412EPEL => 1,
                        sl5_ia32_gcc412EPEL => 1,
                        sl6_x86_64_gcc445EPEL => 1,
-#                      deb6_x86_64_gcc445 => 1,
+                       deb6_x86_64_gcc445 => 1,
                },
                modules => {
                        'lb' => [ qw/emi-lb/ ],
@@ -1014,7 +1033,11 @@ $buildroot{'gridsite.core'} = 'src';
 sub full
 {
        my $short = shift;
-       return $extrafull{$short} ? $extrafull{$short} : 'org.glite.'.$short;
+       my $subsys = $short;
+       $subsys =~ s/\..*//;
+
+       my $cvs_prefix = exists $cvs_prefix{$subsys} ? $cvs_prefix{$subsys} : 'org.glite';
+       return $extrafull{$short} ? $extrafull{$short} : "$cvs_prefix.$short";
 }
 
 sub mkinc
@@ -1029,6 +1052,7 @@ jobid.api-c jobid.api-cpp jobid.api-java
 lbjp-common.db lbjp-common.log lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface lbjp-common.gss lbjp-common.gsoap-plugin
 jp.client jp.doc jp.index jp.primary jp.server-common jp.ws-interface
 px.proxyrenewal px.myproxy-yaim px.glite-PX px.myproxy-config px.emi-px
+canl.c
 /;
        @aux{@m} = (1) x ($#m+1);
 
@@ -1136,12 +1160,13 @@ sub mode_etics {
                ($major,$minor,$rev,$age) = ($1,$2,$3,$4);
        }
        else { 
-               my $path = "$cvs_prefix{$subsys}.$subsys.$module/project";
+               my $full = full "$subsys.$module";
+               my $path = "$full/project";
                if ($subsys eq 'gridsite') {
                        $path = "$cvs_prefix{$subsys}.$subsys.core/project";
                }
                open V,"$path/version.properties"
-                       or die "$cvs_prefix{$subsys}.$subsys.$module/project/version.properties: $!\n";
+                       or die "$path/version.properties: $!\n";
        
                while ($_ = <V>) {
                        chomp;
@@ -1210,8 +1235,10 @@ sub mode_etics {
        my $package_description = "";
        my $package_summary = "";
 
-       if (-e "$cvs_prefix{$subsys}.$subsys.$module/project/package.description") {
-               open V, "$cvs_prefix{$subsys}.$subsys.$module/project/package.description";
+       my $cvs_module = full "$subsys.$module";
+
+       if (-e "$cvs_module/project/package.description") {
+               open V, "$cvs_module/project/package.description";
                $package_description = join ("", <V>);
                close V;
                chomp $package_description;
@@ -1221,8 +1248,8 @@ sub mode_etics {
        else { 
                print STDERR "package.description not found for $subsys.$module!\n"; }
 
-       if (-e "$cvs_prefix{$subsys}.$subsys.$module/project/package.summary") {
-               open V, "$cvs_prefix{$subsys}.$subsys.$module/project/package.summary";
+       if (-e "$cvs_module/project/package.summary") {
+               open V, "$cvs_module/project/package.summary";
                $package_summary = join ("", <V>);
                close V;
                chomp $package_summary;
@@ -1233,10 +1260,10 @@ sub mode_etics {
                print STDERR "package.summary not found for $subsys.$module!\n"; }
 
        my %cmd;
-       $cmd_vcs{checkout} = "cvs -d \${vcsroot} co -d \${moduleName} ".($conftag eq 'HEAD' ? '-A' : '-r ${tag}')." $cvs_prefix{$subsys}.$subsys.$module 2>/dev/null";
-       #$cmd_vcs{checkout} = "(test -d jra1mw/.git && (cd jra1mw; git pull) || git clone http://scientific.zcu.cz/git/jra1mw.git)";
-       #$cmd_vcs{checkout} .= " && (cd jra1mw; git checkout \${tag})" unless ($conftag =~ /HEAD/);
-       #$cmd_vcs{checkout} .= " && ln -s jra1mw/$cvs_prefix{$subsys}.$subsys.$module \${moduleName}";
+       $cmd_vcs{checkout} = "cvs -d \${vcsroot} co -d \${moduleName} ".($conftag eq 'HEAD' ? '-A' : '-r ${tag}')." $cvs_module 2>/dev/null";
+       #$cmd_vcs{checkout} = "((test -d jra1mw/.git && (cd jra1mw; git pull)) || (git clone -q http://scientific.zcu.cz/git/jra1mw.git";
+       #$cmd_vcs{checkout} .= " && (cd jra1mw; git checkout -b \${tag} --track origin/epel)" unless ($conftag =~ /HEAD/);
+       #$cmd_vcs{checkout} .= ")) && (test -d \${moduleName} || ln -s jra1mw/$cvs_module \${moduleName})";
        $cmd_vcs{tag} = "cvs -d \${vcsroot} tag -R \${tag} ${moduleName}";
 
        $cmd{default}{init} = 'None';
@@ -1632,6 +1659,7 @@ What to build:
   --jp-tag=tag                 checkout JP modules with specific tag
   --lbjp-common-tag=tag         checkout lbjp-common modules with specific tag
   --jobid-tag=tag              checkout jobid modules with specific tag
+  --canl-tag=tag               checkout canl modules with specific tag
 
 Dependencies (summary of what will be used is always printed):
   --with-EXTERNAL=PATH         where to look for an external [autodetect]

diff --git a/org.glite.lbjp-common.gss/project/ChangeLog b/org.glite.lbjp-common.gss/project/ChangeLog
index 4252468..a128d02 100644 (file)
--- a/org.glite.lbjp-common.gss/project/ChangeLog
+++ b/org.glite.lbjp-common.gss/project/ChangeLog
@@ -90,3 +90,8 @@
 - LB/GSS rutines try connecting to alternate addresses
 - savannah bug #85224 fixed. DN matches are not case-sensitive anymore.
 
+3.0.6-1
+- Not delete debian/ directory (for new packaging in newer branches)
+- Fix segfault when trying alternative addresses without timeout
+- Specify proper length of strings (GGUS #82746)
+

diff --git a/org.glite.lbjp-common.gss/project/version.properties b/org.glite.lbjp-common.gss/project/version.properties
index 8d96d4c..7e0ff85 100644 (file)
--- a/org.glite.lbjp-common.gss/project/version.properties
+++ b/org.glite.lbjp-common.gss/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
-module.version=3.0.5
+module.version=3.0.6
 module.age=1