Update the patch so it works again.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 34 insertions, 44 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 8710b4dabe82..738406cd6e61 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.53 2009/02/16 19:48:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.54 2009/02/17 16:37:53 scarabeus Exp $
+
+  17 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  files/6.4.5-RSA_security.patch:
+  Update the patch so it works again.
 
 *boinc-6.4.5-r1 (16 Feb 2009)
 
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 8da07e6750f5..d90c3b86912f 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,7 +1,7 @@
-AUX 6.4.5-RSA_security.patch 2795 RMD160 d90c13b83d9b3d36d01e31303c241dfed177935a SHA1 7f8ad45e9655414ef53d14a011517bd7361baa8f SHA256 28b56ddb6526d823f7e7e9e413632912b853a0cb05c3372bba90e3cde8e0984d
+AUX 6.4.5-RSA_security.patch 2413 RMD160 8bf2d0573fedbdbc54f0c479747a23f0ff840f22 SHA1 e5fcafdd0da06a8a59350ff85cf3725e9ff8cede SHA256 f21a6904459ffcfd40cc0804d4a7f46e5a9ef013c217f204e100a8adf8cd4f87
 AUX boinc.conf 711 RMD160 b6bb25b9d10cbefd3de5d653e701e056e2de4587 SHA1 570929cb4ed50d4fc4408624c4d0d330e208609c SHA256 032f07145ee230f069ffdc93befe90c047fba4314aedfc8024bdb44c06798e9e
 AUX boinc.init 2959 RMD160 8fd53df3cae632021283be0bc24b7f897994ac57 SHA1 cd66a8fcb46c244d19428f35cc104f6442404eb7 SHA256 9c7c863030b7005d4e62ce49eeea386eccd16f58707674e4c7e4ff1387cf8a95
 DIST boinc-6.4.5.tar.bz2 7639286 RMD160 8f7232a3e7d273076f6b2ae50b565550c03485cc SHA1 24c63d11c8e9ebda17beac359928407ce3b8678d SHA256 f6f1d053f10873ed9b3b6ce8dc4444a49f6c804196a3eb080f574db36e58557a
 EBUILD boinc-6.4.5-r1.ebuild 3805 RMD160 552fac5fc59b87d14d5dd6db9f25bbd587af2c2d SHA1 f3a61f8c8af470f60257b980ad5afb0c5ee758a9 SHA256 8e2e70a510b82dd3692962b3daee44d801a222044112cd6b422926c8c6bcd305
-MISC ChangeLog 10630 RMD160 4bf0658393546c96d476d6426a4e5bd33d404589 SHA1 a5598409efe7812d8c547275eab3dc9c58395681 SHA256 84b73997a505fd726fd52497cbb557512715cb64b58c592bdb3ea7445bb1a158
+MISC ChangeLog 10755 RMD160 b7753ad84f95a60005f4674c46aa827edab3a405 SHA1 38878a9b69f71138185f18ff3755729ea3db39d0 SHA256 72d3c11acec44ff3d350c67b946ece3d5a6495a51ce1d1341f4b750fc3b18179
 MISC metadata.xml 697 RMD160 8cfc36bbae9395d2675629d68af1c6354244bd5f SHA1 bcfd28d367a81a6fa8b6a548703270cb066a9392 SHA256 614f44eeb4b76fccb040b9ab7dee69e50152c930a9224946010f39e7eed6e04c
diff --git a/sci-misc/boinc/files/6.4.5-RSA_security.patch b/sci-misc/boinc/files/6.4.5-RSA_security.patch
index 1f10ae467fe8..0098444ed5e7 100644
--- a/sci-misc/boinc/files/6.4.5-RSA_security.patch
+++ b/sci-misc/boinc/files/6.4.5-RSA_security.patch
@@ -1,5 +1,6 @@
---- boinc-6.4.5/lib/crypt.cpp	2009-02-15 05:27:43.284347370 +0100
-+++ boinc-6.4.5/lib/crypt.cpp	2009-02-15 05:31:25.554348346 +0100
+diff -urN boinc-6.4.5.old/lib/crypt.cpp boinc-6.4.5/lib/crypt.cpp
+--- boinc-6.4.5.old/lib/crypt.cpp	2008-09-26 20:20:24.000000000 +0200
++++ boinc-6.4.5/lib/crypt.cpp	2009-02-17 17:33:10.000000000 +0100
 @@ -243,7 +243,7 @@
  // The output block must be decrypted in its entirety.
  //
@@ -15,64 +16,49 @@
      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;
-+    }
++	if (retval < 0) {
++		RSA_free(rp);
++		return ERR_CRYPTO;
++	}
      out.len = RSA_size(rp);
      RSA_free(rp);
      return 0;
  }
  
  int decrypt_public(R_RSA_PUBLIC_KEY& key, DATA_BLOCK& in, DATA_BLOCK& out) {
-+    int retval;
++	int retval;
      RSA* rp = RSA_new();
      public_to_openssl(key, rp);
 -    RSA_public_decrypt(in.len, in.data, out.data, rp, RSA_PKCS1_PADDING);
 +    retval = RSA_public_decrypt(in.len, in.data, out.data, rp, RSA_PKCS1_PADDING);
-+    if (retval < 0) {
-+        RSA_free(rp);
-+        return ERR_CRYPTO;
-+    }
++	if (retval < 0) {
++		RSA_free(rp);
++		return ERR_CRYPTO;
++	}
      out.len = RSA_size(rp);
-+    RSA_free(rp);
++	RSA_free(rp);
      return 0;
  }
  
-@@ -684,4 +694,4 @@
-     return verified;
- }
+diff -urN boinc-6.4.5.old/lib/error_numbers.h boinc-6.4.5/lib/error_numbers.h
+--- boinc-6.4.5.old/lib/error_numbers.h	2008-08-06 20:36:30.000000000 +0200
++++ boinc-6.4.5/lib/error_numbers.h	2009-02-17 17:34:17.000000000 +0100
+@@ -185,6 +185,7 @@
+ #define ERR_RMDIR           -227
+ #define ERR_SYMLINK         -229
+ #define ERR_DB_CONN_LOST    -230
++#define ERR_CRYPTO          -231
  
--const char *BOINC_RCSID_4f0c2e42ea = "$Id: 6.4.5-RSA_security.patch,v 1.1 2009/02/16 19:48:26 scarabeus Exp $";
-+const char *BOINC_RCSID_4f0c2e42ea = "$Id: 6.4.5-RSA_security.patch,v 1.1 2009/02/16 19:48:26 scarabeus Exp $";
-
-
---- boinc-6.4.5/lib/str_util.cpp        2009-02-15 05:27:43.292347379 +0100
-+++ boinc-6.4.5/lib/str_util.cpp        2009-02-15 05:31:25.560347422 +0100
+ // PLEASE: add a text description of your error to 
+ // the text description function boincerror() in str_util.C.
+diff -urN boinc-6.4.5.old/lib/str_util.cpp boinc-6.4.5/lib/str_util.cpp
+--- boinc-6.4.5.old/lib/str_util.cpp	2008-09-26 20:20:24.000000000 +0200
++++ boinc-6.4.5/lib/str_util.cpp	2009-02-17 17:33:50.000000000 +0100
 @@ -735,6 +735,7 @@
          case ERR_RMDIR: return "rmdir() failed";
          case ERR_SYMLINK: return "symlink() failed";
          case ERR_DB_CONN_LOST: return "DB connection lost during enumeration";
-+        case ERR_CRYPTO: return "encryption error";
++		case ERR_CRYPTO: return "encryption error";
          case 404: return "HTTP file not found";
          case 407: return "HTTP proxy authentication failure";
          case 416: return "HTTP range request error";
-@@ -876,4 +877,4 @@
-     return retval;
- }
-
--const char *BOINC_RCSID_ab90e1e = "$Id: 6.4.5-RSA_security.patch,v 1.1 2009/02/16 19:48:26 scarabeus Exp $";
-+const char *BOINC_RCSID_ab90e1e = "$Id: 6.4.5-RSA_security.patch,v 1.1 2009/02/16 19:48:26 scarabeus Exp $";
-
-
---- boinc-6.4.5/lib/error_numbers.h     2009-02-15 05:27:43.290347301 +0100
-+++ boinc-6.4.5/lib/error_numbers.h     2009-02-15 05:31:25.558348407 +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.
-