[SCM] BOINC packaging branch, master, updated. debian/6.4.5+dfsg-3-11-gf87328e
rmayorga
rmayorga at debian.org
Fri Nov 6 07:51:07 UTC 2009
The following commit has been merged in the master branch:
commit 7fcb9872f0a0ef2520cd3d4ba47d15ed4cdb6907
Author: rmayorga <rmayorga at debian.org>
Date: Tue Nov 3 23:25:23 2009 -0600
Delete patches applied by upstream
diff --git a/debian/changelog b/debian/changelog
index fc187ad..939f0ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ boinc (6.10.17+dfsg-1) unstable; urgency=low
+ 005_using_hyphen_as_minus.patch removed - Applied upstream
+ 101_check_RSA_returned_values.patch - Removed - Applied upstream
+ 102_gcc4.4_safe.patch Removed - Applied upstram
+ + 006_correct_catalog_path.patch - updated
+ * debian/copyright updated
+ * debian/rules
+ + Adjust fix-perm for catalog files
-- Rene Mayorga <rmayorga at debian.org> Mon, 02 Nov 2009 14:44:14 -0600
diff --git a/debian/patches/005_using_hyphen_as_minus.patch b/debian/patches/005_using_hyphen_as_minus.patch
deleted file mode 100644
index 27e3fb1..0000000
--- a/debian/patches/005_using_hyphen_as_minus.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Rene Mayorga <rmayorga at debian.org.sv>
-Description: Add <option> tag to some options apparently missed.
---- boinc.orig/doc/manpages/boinccmd.xml
-+++ boinc/doc/manpages/boinccmd.xml
-@@ -272,9 +272,9 @@
- <replaceable>URL</replaceable>
- <replaceable>result_name</replaceable>
- {suspend | resume | abort | graphics_window | graphics_fullscreen}
-- <optional>--desktop <replaceable>dt</replaceable> |
-- --window_station <replaceable>ws</replaceable> |
-- --display <replaceable>dp</replaceable></optional>
-+ <optional><option>--desktop</option> <replaceable>dt</replaceable> |
-+ <option>--window_station</option> <replaceable>ws</replaceable> |
-+ <option>--display</option> <replaceable>dp</replaceable></optional>
- </term>
- <listitem>
- <para>Do operation on a result.</para>
-@@ -482,8 +482,8 @@
- <term>
- <option>--set_screensaver_mode</option> {on | off}
- <replaceable>blank_time</replaceable>
-- <optional>--desktop dt | --window_station ws |
-- --display dp</optional>
-+ <optional><option>--desktop</option> dt | <option>--window_station</option> ws |
-+ <option>--display</option> dp</optional>
- </term>
- <listitem>
- <para>Tell the core client to start or stop doing fullscreen
diff --git a/debian/patches/101_check_RSA_returned_values.patch b/debian/patches/101_check_RSA_returned_values.patch
deleted file mode 100644
index 9203595..0000000
--- a/debian/patches/101_check_RSA_returned_values.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Author: davea
-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.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) {
-- int n, modulus_len;
-+ int n, modulus_len, retval;
-
- modulus_len = (key.bits+7)/8;
- n = in.len;
-@@ -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;
-+ }
- 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;
- 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;
-+ }
- out.len = RSA_size(rp);
-+ RSA_free(rp);
- return 0;
- }
-
---- 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.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_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/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/102_gcc4.4_safe.patch b/debian/patches/102_gcc4.4_safe.patch
deleted file mode 100644
index 86f9f7b..0000000
--- a/debian/patches/102_gcc4.4_safe.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Author: René Mayorga
-Description: Pulled from upstream SVN, this patch avoid the
-FTBFS using gcc 4.4
-Debian-Bug: #526666
-
---- boinc.orig/sched/sched_driver.cpp
-+++ boinc/sched/sched_driver.cpp
-@@ -40,6 +40,7 @@
- #define HOSTID "7"
- // ID of a host belonging to that user
-
-+#include <cstdio>
- #include <vector>
- #include "util.h"
-
---- boinc.orig/sched/sched_util.cpp
-+++ boinc/sched/sched_util.cpp
-@@ -104,7 +104,7 @@
- #else
- int try_fopen(const char* path, FCGI_FILE*& f, const char *mode) {
- #endif
-- char* p;
-+ const char* p;
- DIR* d;
- char dirpath[256];
-
---- boinc.orig/clientgui/common/wxFlatNotebook.cpp
-+++ boinc/clientgui/common/wxFlatNotebook.cpp
-@@ -607,7 +607,7 @@
- //
- ///////////////////////////////////////////////////////////////////////////////////////////
-
--BEGIN_EVENT_TABLE(wxPageContainerBase, wxControl)
-+BEGIN_EVENT_TABLE(wxPageContainerBase, wxPanel)
- EVT_PAINT(wxPageContainerBase::OnPaint)
- EVT_SIZE(wxPageContainerBase::OnSize)
- EVT_LEFT_DOWN(wxPageContainerBase::OnLeftDown)
diff --git a/debian/patches/series b/debian/patches/series
index b4e5fb4..9e6633a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,4 @@
#001_dont_install_ca-bundle.crt.patch -- needs to be investigate
#002_remove_hardcoded_optimization.patch -- needs to be investigate
003_use_sensible-browser.patch
-#005_using_hyphen_as_minus.patch Applied upstream
006_correct_catalog_path.patch
-#101_check_RSA_returned_values.patch # Might be applied upstream
-#102_gcc4.4_safe.patch # Applied upstram
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list