[SCM] BOINC packaging branch, debian/experimental-6.4.5, updated. debian/6.2.18-2-9-gd979a2e

[rmayorga]

The following commit has been merged in the debian/experimental-6.4.5 branch:
commit d979a2ebc894a5c92cd03cda1adcd00fe6c61184
Author: rmayorga <rmayorga at debian.org>
Date:   Sun Feb 22 23:22:58 2009 -0600

    Start integraing Thibaut changes

diff --git a/debian/changelog b/debian/changelog
index ac0ca6c..7390a50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,6 @@ boinc (6.4.5-1) UNRELEASED; urgency=low
     + 002_remove_hardcoded_optimization.patch refreshed
     + 003_use_sensible-browser.patch
     + 004_exclude_sea.patch removed
-    + 101_check_RSA_returned_values.patch removed
-    + 005_disable_client_res.patch added
     + 006_correct_catalog_path.patch added 
   * debian/boinc-dev.install; upstream now calls `boinc' instead
     of `BOINC' the include/ dir
@@ -28,6 +26,7 @@ boinc (6.4.5-1) UNRELEASED; urgency=low
   * debian/rules:
     + don't install .mo files manually
     + correct .mo files perms
+    + copy sea/*png file to clientgui/res and remove they on clean target
   * debian/boinc-manager.install: usr/share/locale/* files added
 
  -- Rene Mayorga <rmayorga at debian.org>  Thu, 29 Jan 2009 13:44:11 -0600
diff --git a/debian/patches/101_check_RSA_returned_values.patch b/debian/patches/101_check_RSA_returned_values.patch
index e5db164..9203595 100644
--- a/debian/patches/101_check_RSA_returned_values.patch
+++ b/debian/patches/101_check_RSA_returned_values.patch
@@ -3,9 +3,9 @@ Description: Check the returned values for RSA_public_decrypt and
 RSA_private_encrypt functions. Change ported by upstream changeset 16883
 (http://boinc.berkeley.edu/trac/changeset/16883) 
 Bug: #511521
---- boinc.orig/lib/crypt.C
-+++ boinc/lib/crypt.C
-@@ -210,7 +210,7 @@
+--- boinc.orig/lib/crypt.cpp	2008-09-26 20:20:24.000000000 +0200
++++ boinc/lib/crypt.cpp	2009-02-21 15:02:51.504265038 +0100
+@@ -243,7 +243,7 @@
  // The output block must be decrypted in its entirety.
  //
  int encrypt_private(R_RSA_PRIVATE_KEY& key, DATA_BLOCK& in, DATA_BLOCK& out) {
@@ -14,15 +14,15 @@ Bug: #511521
  
      modulus_len = (key.bits+7)/8;
      n = in.len;
-@@ -219,17 +219,27 @@
+@@ -252,17 +252,27 @@
      }
      RSA* rp = RSA_new();
      private_to_openssl(key, rp);
 -    RSA_private_encrypt(n, in.data, out.data, rp, RSA_PKCS1_PADDING);
 +    retval = RSA_private_encrypt(n, in.data, out.data, rp, RSA_PKCS1_PADDING);
 +    if (retval < 0) {
-+	    RSA_free(rp);
-+	    return ERR_CRYPTO;
++        RSA_free(rp);
++        return ERR_CRYPTO;
 +    }
      out.len = RSA_size(rp);
      RSA_free(rp);
@@ -37,30 +37,30 @@ Bug: #511521
 +    retval = RSA_public_decrypt(in.len, in.data, out.data, rp, RSA_PKCS1_PADDING);
 +    if (retval < 0) {
 +        RSA_free(rp);
-+	return ERR_CRYPTO;
++        return ERR_CRYPTO;
 +    }
      out.len = RSA_size(rp);
 +    RSA_free(rp);
      return 0;
  }
  
---- boinc.orig/lib/error_numbers.h
-+++ boinc/lib/error_numbers.h
-@@ -187,6 +187,7 @@
- #define ERR_CHILD_FAILED    -228
+--- boinc.orig/lib/error_numbers.h	2008-08-06 20:36:30.000000000 +0200
++++ boinc/lib/error_numbers.h	2009-02-21 15:05:36.564265400 +0100
+@@ -185,6 +185,7 @@
+ #define ERR_RMDIR           -227
  #define ERR_SYMLINK         -229
  #define ERR_DB_CONN_LOST    -230
 +#define ERR_CRYPTO          -231
  
  // PLEASE: add a text description of your error to 
  // the text description function boincerror() in str_util.C.
---- boinc.orig/lib/str_util.C
-+++ boinc/lib/str_util.C
+--- boinc.orig/lib/str_util.cpp	2008-09-26 20:20:24.000000000 +0200
++++ boinc/lib/str_util.cpp	2009-02-21 15:03:57.432264338 +0100
 @@ -735,6 +735,7 @@
-         case ERR_BAD_FILENAME: return "file name is empty or has '..'";
-         case ERR_TOO_MANY_EXITS: return "application exited too many times";
          case ERR_RMDIR: return "rmdir() failed";
-+	case ERR_CRYPTO: return "encryption/decryption error";
+         case ERR_SYMLINK: return "symlink() failed";
+         case ERR_DB_CONN_LOST: return "DB connection lost during enumeration";
++        case ERR_CRYPTO: return "encryption/decryption error";
          case 404: return "HTTP file not found";
          case 407: return "HTTP proxy authentication failure";
          case 416: return "HTTP range request error";
diff --git a/debian/patches/series b/debian/patches/series
index d71cbb9..769fd51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,5 @@
 002_remove_hardcoded_optimization.patch
 003_use_sensible-browser.patch 
 005_using_hyphen_as_minus.patch
-005_disable_client_res.patch
 006_correct_catalog_path.patch
+101_check_RSA_returned_values.patch
diff --git a/debian/rules b/debian/rules
index 756f018..364ce0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,6 +126,7 @@ autoreconf-stamp: patch
 	dh_testdir
 	cp -f /usr/share/misc/config.guess config.guess
 	cp -f /usr/share/misc/config.sub config.sub
+	cp -f sea/*png clientgui/res
 	aclocal-1.9 -I m4 && autoheader && automake-1.9 && autoconf
 	touch $@
 
@@ -167,7 +168,10 @@ clean-patched:
 	  client/scripts/Makefile \
 	  client/scripts/boinc-client \
 	  clientgui/res/Makefile \
-	  sea/Makefile
+	  sea/Makefile \
+	  clientgui/res/boincmgr.16x16.png \
+	  clientgui/res/boincmgr.32x32.png \
+	  clientgui/res/boincmgr.48x48.png
 	debconf-updatepo
 
 install: build install-stamp

-- 
BOINC packaging