From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Sun, 20 Jan 2013 08:35:10 +0000 (+0000)
Subject: Updating version, ChangeLog and copying the most recent configure from ./org.glite... 
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=c731938bce2e28dc74de1fb72399abea37967bf2;p=jra1mw.git

Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 2.0.4-1
---

diff --git a/emi.canl.canl-c/configure b/emi.canl.canl-c/configure
index 848c2be..b6b28e5 100755
--- a/emi.canl.canl-c/configure
+++ b/emi.canl.canl-c/configure
@@ -2003,12 +2003,12 @@ $output};
 	close C;
 
 	for $file ("$cvs_module/project/debian.rules", "$cvs_module/project/$packageName.spec") {
-		my $lib;
+		my ($lib, $pkg_prefix);
 		my $main_module;
 		@copts = ();
 
-		if ($file =~ /debian\.rules$/) { $lib = 'lib'; }
-		else { $lib = '%{_lib}'; }
+		if ($file =~ /debian\.rules$/) { $lib = 'lib'; $pkg_prefix = "$project{local_prefix}"; }
+		else { $lib = '%{_lib}'; $pkg_prefix = '%{_prefix}'; }
 
 		my $main_module = "$subsys.$module";
 		if (exists $subpackages{$main_module}) { $main_module = $subpackages{$main_module}; }
@@ -2027,7 +2027,7 @@ $output};
 			while (<SRC>) {
 				if (/^(\s*).+\/configure\s/) {
 					printf DST "%s", "$1";
-					printf DST "/usr/bin/perl $confdir/configure $project{flavours} --root=/ --prefix=$project{local_prefix} --libdir=$lib --project=$project --module $main_module@copts\n";
+					printf DST "/usr/bin/perl $confdir/configure $project{flavours} --root=/ --prefix=$pkg_prefix --libdir=$lib --project=$project --module $main_module@copts\n";
 				} else {
 					printf DST "%s", "$_";
 				}
@@ -2177,13 +2177,10 @@ sub os_type {
 	close FH;
 
 	if (/Debian|Ubuntu/i) { return "debian"; }
-	elsif (/Scientific|Redhat|Centos/i) { return "redhat"; }
-	elsif (/Fedora/i) {
-		$ver = `rpm -q --queryformat '%{version}' fedora-release 2>/dev/null`;
-		if ($ver and $ver >= 15) { return "fedora"; }
+	elsif (/Scientific|Redhat|Centos|Fedora/i) {
+		`pkg-config --exists systemd`;
+		if ($? == 0) { return "fedora"; }
 		else { return "redhat"; }
-	} else {
-		return "redhat";
 	}
 }
 
diff --git a/emi.canl.canl-c/project/ChangeLog b/emi.canl.canl-c/project/ChangeLog
index fa9b47c..6155601 100644
--- a/emi.canl.canl-c/project/ChangeLog
+++ b/emi.canl.canl-c/project/ChangeLog
@@ -63,3 +63,9 @@
 - New error codes added
 - Older error descriptions revised
 
+2.0.4-1
+- Changes based on Fedora reviews
+- More than one return code from newer c-ares handled (fixes possible problem for IPv6 only machines)
+- fixed vulnerability reported in EGI RT ticket #4781 1)
+  - SSL_CTX_set_cipher_list(ssl_ctx, "ALL") set to chosen ciphers
+
diff --git a/emi.canl.canl-c/project/version.properties b/emi.canl.canl-c/project/version.properties
index 1b06638..679b306 100644
--- a/emi.canl.canl-c/project/version.properties
+++ b/emi.canl.canl-c/project/version.properties
@@ -1,3 +1,3 @@
 # $Header:
-module.version=2.0.3
+module.version=2.0.4
 module.age=1