[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-424-g3f1714e
Steffen Moeller
moeller at debian.org
Sun Mar 25 11:55:29 UTC 2012
The following commit has been merged in the master branch:
commit b7c5d5a4d4fa50f7f4b4db3b44fc2ccd5b6379b4
Author: Steffen Moeller <moeller at debian.org>
Date: Sat Mar 24 16:16:37 2012 +0100
Adjusted patches to new upstream version.
diff --git a/debian/changelog b/debian/changelog
index 866574c..27a4560 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-boinc (7.0.21+dfsg-1) unstable; urgency=low
+boinc (7.0.23+dfsg-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Steffen Moeller <moeller at debian.org> Sat, 24 Mar 2012 16:05:42 +0100
+
+boinc (7.0.21+dfsg-1) UNRELEASED; urgency=low
* New upstream version.
* Added icons in /usr/share/boinc to boinc-manager package
diff --git a/debian/patches/MoreInformativeAppStartFailure.patch b/debian/patches/MoreInformativeAppStartFailure.patch
index e326ba9..fb0fdd7 100644
--- a/debian/patches/MoreInformativeAppStartFailure.patch
+++ b/debian/patches/MoreInformativeAppStartFailure.patch
@@ -1,7 +1,7 @@
Index: boinc/client/app_start.cpp
===================================================================
---- boinc.orig/client/app_start.cpp 2012-03-12 00:04:53.000000000 +0100
-+++ boinc/client/app_start.cpp 2012-03-12 00:04:54.000000000 +0100
+--- boinc.orig/client/app_start.cpp 2012-03-24 16:09:25.000000000 +0100
++++ boinc/client/app_start.cpp 2012-03-24 16:09:26.000000000 +0100
@@ -320,7 +320,10 @@
strcat(dir_path, "/");
strcat(dir_path, p);
@@ -14,7 +14,7 @@ Index: boinc/client/app_start.cpp
p = q+1;
}
return 0;
-@@ -1003,6 +1006,9 @@
+@@ -1002,6 +1005,9 @@
#endif
}
sprintf(buf, "../../%s", exec_path);
@@ -24,7 +24,7 @@ Index: boinc/client/app_start.cpp
if (g_use_sandbox) {
char switcher_path[100];
sprintf(switcher_path, "../../%s/%s",
-@@ -1020,17 +1026,30 @@
+@@ -1019,17 +1025,30 @@
// so they must be world-readable so BOINC CLient can read them
//
umask(2);
@@ -58,8 +58,8 @@ Index: boinc/client/app_start.cpp
}
Index: boinc/client/client_state.cpp
===================================================================
---- boinc.orig/client/client_state.cpp 2012-03-09 14:16:16.000000000 +0100
-+++ boinc/client/client_state.cpp 2012-03-12 00:18:56.000000000 +0100
+--- boinc.orig/client/client_state.cpp 2012-03-18 14:31:22.000000000 +0100
++++ boinc/client/client_state.cpp 2012-03-24 16:09:26.000000000 +0100
@@ -143,7 +143,7 @@
}
@@ -125,8 +125,8 @@ Index: boinc/client/client_state.cpp
if (p->hostid) {
Index: boinc/client/client_types.h
===================================================================
---- boinc.orig/client/client_types.h 2012-03-03 01:12:22.000000000 +0100
-+++ boinc/client/client_types.h 2012-03-12 00:38:42.000000000 +0100
+--- boinc.orig/client/client_types.h 2012-03-24 16:04:08.000000000 +0100
++++ boinc/client/client_types.h 2012-03-24 16:09:26.000000000 +0100
@@ -813,12 +813,12 @@
int coproc_indices[MAX_COPROCS_PER_JOB];
@@ -144,9 +144,9 @@ Index: boinc/client/client_types.h
// represents an always/auto/never value, possibly temporarily overridden
Index: boinc/client/hostinfo_unix.cpp
===================================================================
---- boinc.orig/client/hostinfo_unix.cpp 2012-03-03 01:12:22.000000000 +0100
-+++ boinc/client/hostinfo_unix.cpp 2012-03-12 00:34:31.000000000 +0100
-@@ -214,7 +214,7 @@
+--- boinc.orig/client/hostinfo_unix.cpp 2012-03-24 16:04:10.000000000 +0100
++++ boinc/client/hostinfo_unix.cpp 2012-03-24 16:09:26.000000000 +0100
+@@ -220,7 +220,7 @@
SysClass,
NoBattery
} method = Detect;
@@ -155,7 +155,7 @@ Index: boinc/client/hostinfo_unix.cpp
if (Detect == method) {
// try APM in ProcFS
-@@ -254,7 +254,7 @@
+@@ -260,7 +260,7 @@
}
if (Detect == method) {
// try SysFS
@@ -164,7 +164,7 @@ Index: boinc/client/hostinfo_unix.cpp
string ps_name;
FILE* fsys;
-@@ -318,7 +318,7 @@
+@@ -324,7 +324,7 @@
FILE *facpi = fopen(path, "r");
if (!facpi) return false;
@@ -173,7 +173,7 @@ Index: boinc/client/hostinfo_unix.cpp
(void) fgets(buf, sizeof(buf), facpi);
fclose(facpi);
-@@ -386,13 +386,13 @@
+@@ -392,13 +392,13 @@
// See http://people.nl.linux.org/~hch/cpuinfo/ for some examples.
//
static void parse_cpuinfo_linux(HOST_INFO& host) {
@@ -189,7 +189,7 @@ Index: boinc/client/hostinfo_unix.cpp
FILE* f = fopen("/proc/cpuinfo", "r");
if (!f) {
-@@ -420,7 +420,7 @@
+@@ -426,7 +426,7 @@
host.m_cache=-1;
strcpy(features, "");
@@ -198,7 +198,7 @@ Index: boinc/client/hostinfo_unix.cpp
strip_whitespace(buf);
if (
/* there might be conflicts if we dont #ifdef */
-@@ -579,7 +579,7 @@
+@@ -585,7 +585,7 @@
void use_cpuid(HOST_INFO& host) {
u_int p[4];
int hasMMX, hasSSE, hasSSE2, hasSSE3, has3DNow, has3DNowExt = 0;
@@ -207,7 +207,7 @@ Index: boinc/client/hostinfo_unix.cpp
do_cpuid(0x0, p);
-@@ -609,7 +609,7 @@
+@@ -615,7 +615,7 @@
if (has3DNowExt) strncat(capabilities, "3dnowext ", 9);
if (hasMMX) strncat(capabilities, "mmx ", 4);
strip_whitespace(capabilities);
@@ -216,7 +216,7 @@ Index: boinc/client/hostinfo_unix.cpp
snprintf(buf, sizeof(buf), "%s [] [%s]",
host.p_model, capabilities
);
-@@ -623,7 +623,7 @@
+@@ -629,7 +629,7 @@
int p_model_size = sizeof(host.p_model);
size_t len;
#if defined(__i386__) || defined(__x86_64__)
@@ -225,7 +225,7 @@ Index: boinc/client/hostinfo_unix.cpp
int family, stepping, model;
len = sizeof(host.p_vendor);
-@@ -650,7 +650,7 @@
+@@ -656,7 +656,7 @@
brand_string, family, model, stepping
);
#else // PowerPC
@@ -234,7 +234,7 @@ Index: boinc/client/hostinfo_unix.cpp
int response = 0;
int retval;
len = sizeof(response);
-@@ -692,7 +692,7 @@
+@@ -698,7 +698,7 @@
int32 maxStandardFunction;
int32 maxExtendedFunction = 0;
@@ -243,7 +243,7 @@ Index: boinc/client/hostinfo_unix.cpp
if (get_system_info(&sys_info) != B_OK) {
msg_printf(NULL, MSG_INTERNAL_ERROR, "Error getting Haiku system information!\n");
-@@ -721,7 +721,7 @@
+@@ -727,7 +727,7 @@
maxExtendedFunction = cpuInfo.eax_0.max_eax & 0xff;
if (maxExtendedFunction >=4 ) {
@@ -252,7 +252,7 @@ Index: boinc/client/hostinfo_unix.cpp
char *name = buffer;
int32 i;
-@@ -788,7 +788,7 @@
+@@ -794,7 +794,7 @@
int32 found = 0;
int32 i;
@@ -261,7 +261,7 @@ Index: boinc/client/hostinfo_unix.cpp
for (i = 0; i < 32; i++) {
if ((cpuInfo.eax_1.features & (1UL << i)) && kFeatures[i] != NULL) {
-@@ -1696,10 +1696,10 @@
+@@ -1702,10 +1702,10 @@
#if LINUX_LIKE_SYSTEM
bool interrupts_idle(time_t t) {
static FILE *ifp = NULL;
@@ -276,8 +276,8 @@ Index: boinc/client/hostinfo_unix.cpp
Index: boinc/lib/hostinfo.cpp
===================================================================
---- boinc.orig/lib/hostinfo.cpp 2012-02-03 21:33:50.000000000 +0100
-+++ boinc/lib/hostinfo.cpp 2012-03-12 00:42:51.000000000 +0100
+--- boinc.orig/lib/hostinfo.cpp 2012-03-18 14:31:22.000000000 +0100
++++ boinc/lib/hostinfo.cpp 2012-03-24 16:09:26.000000000 +0100
@@ -131,7 +131,7 @@
int HOST_INFO::write(
MIOFILE& out, bool include_net_info, bool include_coprocs
@@ -304,8 +304,8 @@ Index: boinc/lib/hostinfo.cpp
else if (parse_double(buf, "<p_fpops>", p_fpops)) continue;
Index: boinc/lib/hostinfo.h
===================================================================
---- boinc.orig/lib/hostinfo.h 2012-03-03 01:12:22.000000000 +0100
-+++ boinc/lib/hostinfo.h 2012-03-12 00:40:24.000000000 +0100
+--- boinc.orig/lib/hostinfo.h 2012-03-18 14:31:22.000000000 +0100
++++ boinc/lib/hostinfo.h 2012-03-24 16:09:26.000000000 +0100
@@ -44,7 +44,7 @@
int p_ncpus;
char p_vendor[256];
diff --git a/debian/patches/cwd_handling.patch b/debian/patches/cwd_handling.patch
index f523451..032ed92 100644
--- a/debian/patches/cwd_handling.patch
+++ b/debian/patches/cwd_handling.patch
@@ -1,7 +1,7 @@
Index: boinc/client/app_start.cpp
===================================================================
---- boinc.orig/client/app_start.cpp 2012-02-15 22:04:05.000000000 +0100
-+++ boinc/client/app_start.cpp 2012-02-16 12:34:22.000000000 +0100
+--- boinc.orig/client/app_start.cpp 2012-03-24 16:04:03.000000000 +0100
++++ boinc/client/app_start.cpp 2012-03-24 16:12:00.000000000 +0100
@@ -122,7 +122,7 @@
static void coproc_cmdline(
int rsc_type, RESULT* rp, double ninstances, char* cmdline
@@ -47,7 +47,7 @@ Index: boinc/client/app_start.cpp
int retval;
PROJECT* project = result->project;
-@@ -439,7 +439,7 @@
+@@ -438,7 +438,7 @@
}
int ACTIVE_TASK::copy_output_files() {
@@ -56,7 +56,7 @@ Index: boinc/client/app_start.cpp
unsigned int i;
for (i=0; i<result->output_files.size(); i++) {
FILE_REF& fref = result->output_files[i];
-@@ -481,7 +481,7 @@
+@@ -480,7 +480,7 @@
// ACTIVE_TASK::task_state is PROCESS_EXECUTING
//
int ACTIVE_TASK::start() {
@@ -65,7 +65,7 @@ Index: boinc/client/app_start.cpp
char cmdline[80000]; // 64KB plus some extra
unsigned int i;
FILE_REF fref;
-@@ -628,7 +628,7 @@
+@@ -627,7 +627,7 @@
PROCESS_INFORMATION process_info;
STARTUPINFO startup_info;
LPVOID environment_block = NULL;
@@ -76,8 +76,8 @@ Index: boinc/client/app_start.cpp
Index: boinc/client/auto_update.cpp
===================================================================
---- boinc.orig/client/auto_update.cpp 2011-07-24 19:39:09.000000000 +0200
-+++ boinc/client/auto_update.cpp 2012-02-16 12:17:38.000000000 +0100
+--- boinc.orig/client/auto_update.cpp 2012-03-18 14:31:22.000000000 +0100
++++ boinc/client/auto_update.cpp 2012-03-24 16:09:25.000000000 +0100
@@ -179,7 +179,7 @@
unsigned int i;
FILE_INFO* fip=0;
diff --git a/debian/patches/fix_realloc_use.patch b/debian/patches/fix_realloc_use.patch
deleted file mode 100644
index 6fba7fd..0000000
--- a/debian/patches/fix_realloc_use.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: boinc/lib/parse.cpp
-===================================================================
---- boinc.orig/lib/parse.cpp 2012-03-18 13:57:51.000000000 +0100
-+++ boinc/lib/parse.cpp 2012-03-18 14:18:55.000000000 +0100
-@@ -179,9 +179,10 @@
- int n = (int)strlen(line);
- if (nused + n >= bufsize) {
- bufsize *= 2;
-- char *b = (char*)realloc(buf, bufsize);
-- if (!b) {
-- free(buf);
-+ char *b = buf;
-+ buf = (char*)realloc(b, bufsize);
-+ if (!buf) {
-+ free(b); // b was buf and was allocated in this fun
- return ERR_XML_PARSE;
- }
- }
diff --git a/debian/patches/parse_issues.patch b/debian/patches/parse_issues.patch
index 63d95ec..558bddc 100644
--- a/debian/patches/parse_issues.patch
+++ b/debian/patches/parse_issues.patch
@@ -1,15 +1,16 @@
Index: boinc/lib/parse.cpp
===================================================================
---- boinc.orig/lib/parse.cpp 2012-02-17 11:32:54.000000000 +0100
-+++ boinc/lib/parse.cpp 2012-03-04 02:36:26.000000000 +0100
-@@ -179,7 +179,11 @@
+--- boinc.orig/lib/parse.cpp 2012-03-18 14:31:22.000000000 +0100
++++ boinc/lib/parse.cpp 2012-03-24 16:13:26.000000000 +0100
+@@ -179,7 +179,12 @@
int n = (int)strlen(line);
if (nused + n >= bufsize) {
bufsize *= 2;
- buf = (char*)realloc(buf, bufsize);
-+ char *b = (char*)realloc(buf, bufsize);
-+ if (!b) {
-+ free(buf);
++ char *b = buf;
++ buf = (char*)realloc(b, bufsize);
++ if (!buf) {
++ free(b); // b was buf and was allocated in this fun
+ return ERR_XML_PARSE;
+ }
}
@@ -17,8 +18,8 @@ Index: boinc/lib/parse.cpp
nused += n;
Index: boinc/lib/procinfo_win.cpp
===================================================================
---- boinc.orig/lib/procinfo_win.cpp 2011-10-30 00:27:06.000000000 +0200
-+++ boinc/lib/procinfo_win.cpp 2012-03-04 02:42:11.000000000 +0100
+--- boinc.orig/lib/procinfo_win.cpp 2012-03-18 14:31:22.000000000 +0100
++++ boinc/lib/procinfo_win.cpp 2012-03-24 16:09:26.000000000 +0100
@@ -24,13 +24,16 @@
tNTQSI pNTQSI = (tNTQSI)GetProcAddress(hNTDllLib, "NtQuerySystemInformation");
ULONG cbBuffer = 0;
diff --git a/debian/patches/series b/debian/patches/series
index bb3b736..dc2bacc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,4 +26,3 @@ client_stream_realloc.patch
MoreInformativeAppStartFailure.patch
MainDocumentWarnings.patch
stream_memory_leak_fix.patch
-fix_realloc_use.patch
diff --git a/debian/rules b/debian/rules
index 0af264b..f2ab61b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,7 +133,7 @@ CFGFLAGS_boinc-client = \
# Default rule
%:
- dh $@ --parallel
+ dh $@ --parallel --with python2,quilt
clean:
dh clean
@@ -220,14 +220,6 @@ BINARIES += samples/worker/worker samples/wrapper/wrapper samples/sleeper/sleepe
override_dh_auto_clean:
dh_auto_clean
- # don't interfere with dpkg-source
- #if [ -d .pc ]; then \
- # quilt pop -a ; \
- # $(RM) -r .pc ; \
- #fi
- #if [ -d debian/patches ]; then \
- # cat debian/patches/*| patch -p1 -R --batch --quiet || true ; \
- #fi
find . -name Makefile.in -o -name "*.a" -o -name "*.o" | xargs -r rm
rm -rf debian/tmp autoreconf-stamp build-*-stamp install-*-stamp lib/crypt_prog
rm -rf py/build py/lib.linux-x86_64-2.6
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list