[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-80-ga59efd1
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Sat Nov 3 13:29:24 UTC 2012
The following commit has been merged in the master branch:
commit 959338486551b67520fdec7c280999e38512dc9e
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sat Nov 3 14:19:49 2012 +0100
Revised so many patches already applied/partially applied upstream
diff --git a/debian/changelog b/debian/changelog
index be6b724..f1b005f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc (7.0.38+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream version
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Sat, 03 Nov 2012 13:28:21 +0100
+
boinc (7.0.36+dfsg-3) UNRELEASED; urgency=low
[ Steffen Moeller ]
* Added Gianfranco to uploaders.
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index 0624626..f666548 100644
--- a/debian/patches/MainDocumentWarnings.patch
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -4,38 +4,7 @@ Index: boinc/clientgui/MainDocument.cpp
===================================================================
--- boinc.orig/clientgui/MainDocument.cpp 2012-03-30 23:42:06.944079056 +0200
+++ boinc/clientgui/MainDocument.cpp 2012-03-30 23:47:44.963448069 +0200
-@@ -906,8 +906,8 @@
- pFrame->AddPendingEvent(event);
- CTaskBarIcon* pTaskbar = wxGetApp().GetTaskBarIcon();
- if (pTaskbar) {
-- CTaskbarEvent event(wxEVT_TASKBAR_REFRESH, pTaskbar);
-- pTaskbar->AddPendingEvent(event);
-+ CTaskbarEvent eventTB(wxEVT_TASKBAR_REFRESH, pTaskbar);
-+ pTaskbar->AddPendingEvent(eventTB);
- }
- CDlgEventLog* eventLog = wxGetApp().GetEventLog();
- if (eventLog) {
-@@ -1528,7 +1528,7 @@
- // If the graphics application for the current task is already
- // running, return a pointer to its RUNNING_GFX_APP struct.
- //
--RUNNING_GFX_APP* CMainDocument::GetRunningGraphicsApp(RESULT* result, int slot) {
-+RUNNING_GFX_APP* CMainDocument::GetRunningGraphicsApp(RESULT* resultArg, int slot) {
- bool exited = false;
- std::vector<RUNNING_GFX_APP>::iterator gfx_app_iter;
-
-@@ -1551,8 +1551,8 @@
- }
- #endif
- if (! exited) {
-- if ( (result->name == (*gfx_app_iter).name) &&
-- (result->project_url == (*gfx_app_iter).project_url) ) {
-+ if ( (resultArg->name == (*gfx_app_iter).name) &&
-+ (resultArg->project_url == (*gfx_app_iter).project_url) ) {
- return &(*gfx_app_iter);
- }
-
-@@ -1631,20 +1631,20 @@
+@@ -1634,20 +1634,20 @@
}
#else
void CMainDocument::KillGraphicsApp(int pid) {
@@ -64,7 +33,7 @@ Index: boinc/clientgui/MainDocument.cpp
iRetVal = run_program(
getcwd(currentDir, sizeof(currentDir)),
-@@ -1654,21 +1654,25 @@
+@@ -1657,6 +1657,10 @@
0,
id
);
@@ -75,89 +44,5 @@ Index: boinc/clientgui/MainDocument.cpp
} else {
kill_program(pid);
}
- }
- #endif
-
--int CMainDocument::WorkShowGraphics(RESULT* result) {
-+int CMainDocument::WorkShowGraphics(RESULT* resultArg) {
- int iRetVal = 0;
-
-- if (strlen(result->web_graphics_url)) {
-- wxString url(result->web_graphics_url, wxConvUTF8);
-+ if (strlen(resultArg->web_graphics_url)) {
-+ wxString url(resultArg->web_graphics_url, wxConvUTF8);
- wxLaunchDefaultBrowser(url);
- return 0;
- }
-- if (strlen(result->graphics_exec_path)) {
-+ if (strlen(resultArg->graphics_exec_path)) {
- // V6 Graphics
- RUNNING_GFX_APP gfx_app;
- RUNNING_GFX_APP* previous_gfx_app;
-@@ -1680,12 +1684,12 @@
- int id;
- #endif
-
-- p = strrchr((char*)result->slot_path, '/');
-+ p = strrchr((char*)resultArg->slot_path, '/');
- if (!p) return ERR_INVALID_PARAM;
- slot = atoi(p+1);
-
- // See if we are already running the graphics application for this task
-- previous_gfx_app = GetRunningGraphicsApp(result, slot);
-+ previous_gfx_app = GetRunningGraphicsApp(resultArg, slot);
-
- #ifndef __WXMSW__
- char* argv[4];
-@@ -1709,13 +1713,13 @@
- // exits with "RegisterProcess failed (error = -50)" unless
- // we pass its full path twice in the argument list to execv.
- //
-- argv[1] = (char *)result->graphics_exec_path;
-- argv[2] = (char *)result->graphics_exec_path;
-+ argv[1] = (char *)resultArg->graphics_exec_path;
-+ argv[2] = (char *)resultArg->graphics_exec_path;
- argv[3] = 0;
-
- if (g_use_sandbox) {
- iRetVal = run_program(
-- result->slot_path,
-+ resultArg->slot_path,
- "../../switcher/switcher",
- 3,
- argv,
-@@ -1724,8 +1728,8 @@
- );
- } else {
- iRetVal = run_program(
-- result->slot_path,
-- result->graphics_exec_path,
-+ resultArg->slot_path,
-+ resultArg->graphics_exec_path,
- 1,
- &argv[2],
- 0,
-@@ -1741,8 +1745,8 @@
- argv[0] = 0;
-
- iRetVal = run_program(
-- result->slot_path,
-- result->graphics_exec_path,
-+ resultArg->slot_path,
-+ resultArg->graphics_exec_path,
- 0,
- argv,
- 0,
-@@ -1751,8 +1755,8 @@
- #endif
- if (!iRetVal) {
- gfx_app.slot = slot;
-- gfx_app.project_url = result->project_url;
-- gfx_app.name = result->name;
-+ gfx_app.project_url = resultArg->project_url;
-+ gfx_app.name = resultArg->name;
- gfx_app.pid = id;
- m_running_gfx_apps.push_back(gfx_app);
- }
Index: boinc/lib/util.cpp
===================================================================
diff --git a/debian/patches/clang_incompatibilities.patch b/debian/patches/clang_incompatibilities.patch
index e3458f9..663af72 100644
--- a/debian/patches/clang_incompatibilities.patch
+++ b/debian/patches/clang_incompatibilities.patch
@@ -20,18 +20,31 @@ Index: boinc/lib/Makefile.am
if ENABLE_FCGI
-Index: boinc/lib/util.cpp
-===================================================================
---- boinc.orig/lib/util.cpp 2012-08-01 20:52:04.670985198 +0200
-+++ boinc/lib/util.cpp 2012-08-01 20:52:55.182302347 +0200
-@@ -311,7 +311,7 @@
- #ifdef _WIN32
- DebugBreak();
- #else
-- *(int*)0 = 0;
-+ __builtin_trap();
- #endif
- }
+#FIXME, better abort() or __builtin_trap()?
+#upstream uses abort() now
+#void PERS_FILE_XFER::abort() {
+# if (fxp) {
+# gstate.file_xfers->remove(fxp);
+# delete fxp;
+# fxp = NULL;
+# }
+# fip->status = ERR_ABORTED_VIA_GUI;
+# fip->error_msg = "user requested transfer abort";
+# pers_xfer_done = true;
+#}
+
+#Index: boinc/lib/util.cpp
+#===================================================================
+#--- boinc.orig/lib/util.cpp 2012-08-01 20:52:04.670985198 +0200
+#+++ boinc/lib/util.cpp 2012-08-01 20:52:55.182302347 +0200
+#@@ -311,7 +311,7 @@
+# #ifdef _WIN32
+# DebugBreak();
+# #else
+#- *(int*)0 = 0;
+#+ __builtin_trap();
+# #endif
+# }
Index: boinc/sched/make_work.cpp
===================================================================
diff --git a/debian/patches/client_app_maxpathlen.patch b/debian/patches/client_app_maxpathlen.patch
index ce02050..b682da9 100644
--- a/debian/patches/client_app_maxpathlen.patch
+++ b/debian/patches/client_app_maxpathlen.patch
@@ -1,16 +1,3 @@
-Index: boinc/client/app.cpp
-===================================================================
---- boinc.orig/client/app.cpp
-+++ boinc/client/app.cpp
-@@ -413,7 +413,7 @@
- // Move it from slot dir to project dir
- //
- int ACTIVE_TASK::move_trickle_file() {
-- char project_dir[256], new_path[MAXPATHLEN], old_path[MAXPATHLEN];
-+ char project_dir[MAXPATHLEN], new_path[MAXPATHLEN], old_path[MAXPATHLEN];
- int retval;
-
- get_project_dir(result->project, project_dir, sizeof(project_dir));
Index: boinc/client/app.h
===================================================================
--- boinc.orig/client/app.h
diff --git a/debian/patches/cmath_missing.patch b/debian/patches/cmath_missing.patch
index 328e381..8e4bb28 100644
--- a/debian/patches/cmath_missing.patch
+++ b/debian/patches/cmath_missing.patch
@@ -106,7 +106,7 @@ Index: boinc/lib/boinc_win.h
===================================================================
--- boinc.orig/lib/boinc_win.h 2012-08-17 16:08:20.406578962 +0200
+++ boinc/lib/boinc_win.h 2012-08-18 14:42:31.809110201 +0200
-@@ -200,7 +200,7 @@
+@@ -197,7 +197,7 @@
#include <assert.h>
#include <ctype.h>
#include <errno.h>
diff --git a/debian/patches/cppcheck_avoid_redundant_check.patch b/debian/patches/cppcheck_avoid_redundant_check.patch
index f3aa932..66dfbe8 100644
--- a/debian/patches/cppcheck_avoid_redundant_check.patch
+++ b/debian/patches/cppcheck_avoid_redundant_check.patch
@@ -1,28 +1,3 @@
-Index: boinc/api/gutil.cpp
-===================================================================
---- boinc.orig/api/gutil.cpp
-+++ boinc/api/gutil.cpp
-@@ -737,15 +737,13 @@
- gluBuild2DMipmaps(GL_TEXTURE_2D, 3, pImage->sizeX, pImage->sizeY, GL_RGB, GL_UNSIGNED_BYTE, pImage->data);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR);
-- xsize = pImage->sizeX;
-- ysize = pImage->sizeY;
-+ xsize = pImage->sizeX;
-+ ysize = pImage->sizeY;
-
-- if (pImage) {
-- if (pImage->data) {
-- free(pImage->data);
-- }
-- free(pImage);
-+ if (pImage->data) {
-+ free(pImage->data);
- }
-+ free(pImage);
- return 0;
- }
-
Index: boinc/api/make_app_icon_h.cpp
===================================================================
--- boinc.orig/api/make_app_icon_h.cpp
diff --git a/debian/patches/cppcheck_realloc.patch b/debian/patches/cppcheck_realloc.patch
index 1cd3481..300f2b1 100644
--- a/debian/patches/cppcheck_realloc.patch
+++ b/debian/patches/cppcheck_realloc.patch
@@ -1,26 +1,6 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Initialisation.
-Index: boinc/lib/diagnostics_win.cpp
-===================================================================
---- boinc.orig/lib/diagnostics_win.cpp 2012-05-03 13:41:57.688973563 +0200
-+++ boinc/lib/diagnostics_win.cpp 2012-05-03 13:42:06.408854158 +0200
-@@ -331,6 +331,7 @@
- *ppBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, *pcbBuffer);
- if (*ppBuffer == NULL) {
- retval = ERROR_NOT_ENOUGH_MEMORY;
-+ return retval;
- }
-
- Status = pNTQSI(
-@@ -1630,6 +1631,7 @@
- break;
- case EXCEPTION_ACCESS_VIOLATION:
- strcpy(status, "Access Violation");
-+ substatus[0]=0;
- if (pExPtrs->ExceptionRecord->NumberParameters == 2) {
- switch(pExPtrs->ExceptionRecord->ExceptionInformation[0]) {
- case 0: // read attempt
Index: boinc/lib/crypt.cpp
===================================================================
--- boinc.orig/lib/crypt.cpp 2012-05-03 13:28:56.000000000 +0200
diff --git a/debian/patches/csh2tcsh.patch b/debian/patches/csh2tcsh.patch
index e08fdc4..c2854d5 100644
--- a/debian/patches/csh2tcsh.patch
+++ b/debian/patches/csh2tcsh.patch
@@ -4,7 +4,7 @@ Index: boinc/tools/db_query
--- boinc.orig/tools/db_query 2011-04-27 22:39:13.000000000 +0200
+++ boinc/tools/db_query 2011-04-27 22:45:42.000000000 +0200
@@ -1,4 +1,4 @@
--#! /bin/csh
+-#! /bin/tcsh
+#!/usr/bin/tcsh
set CIVDATE = `date "+%Y:%m:%d:%H:%M"`
diff --git a/debian/patches/investigate_boinc_api.patch b/debian/patches/investigate_boinc_api.patch
index 5543f52..8f5f557 100644
--- a/debian/patches/investigate_boinc_api.patch
+++ b/debian/patches/investigate_boinc_api.patch
@@ -1,7 +1,5 @@
-Index: boinc/api/boinc_api.cpp
-===================================================================
---- boinc.orig/api/boinc_api.cpp 2012-08-12 17:58:16.648464711 +0200
-+++ boinc/api/boinc_api.cpp 2012-08-12 18:12:23.456971462 +0200
+--- a/api/boinc_api.cpp
++++ b/api/boinc_api.cpp
@@ -322,7 +322,7 @@
if (standalone) return true;
diff --git a/debian/patches/missing_libs_wrapper.patch b/debian/patches/missing_libs_wrapper.patch
index f0a4e19..8c28d50 100644
--- a/debian/patches/missing_libs_wrapper.patch
+++ b/debian/patches/missing_libs_wrapper.patch
@@ -5,9 +5,10 @@ Fixed in upstream revision 9223fd2 and 2d0150c
http://boinc.berkeley.edu/trac/changeset/9223fd22e3b6b848cc9e5e151d958542da8fd49d/boinc
http://boinc.berkeley.edu/trac/changeset/2d0150c6872bd3f0489a90a71e2728c3a8e792fb/boinc
---- boinc-7.0.36+dfsg.orig/samples/wrapper/wrapper.cpp
-+++ boinc-7.0.36+dfsg/samples/wrapper/wrapper.cpp
-@@ -29,4 +29,7 @@
+--- a/samples/wrapper/wrapper.cpp
++++ b/samples/wrapper/wrapper.cpp
+@@ -28,6 +28,9 @@
+ // See http://boinc.berkeley.edu/trac/wiki/WrapperApp for details
// Contributor: Andrew J. Younge (ajy4490 at umiacs.umd.edu)
+#ifndef _WIN32
@@ -15,7 +16,9 @@ http://boinc.berkeley.edu/trac/changeset/2d0150c6872bd3f0489a90a71e2728c3a8e792f
+#endif
#include <stdio.h>
#include <vector>
-@@ -36,7 +39,15 @@
+ #include <string>
+@@ -35,9 +38,17 @@
+ #include "boinc_win.h"
#include "win_util.h"
#else
+#ifdef HAVE_SYS_WAIT_H
@@ -31,3 +34,4 @@ http://boinc.berkeley.edu/trac/changeset/2d0150c6872bd3f0489a90a71e2728c3a8e792f
+#endif
#include <unistd.h>
#endif
+
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 58b6d9b..2596ae4 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -2,19 +2,16 @@ Index: boinc/api/graphics2_util.cpp
===================================================================
--- boinc.orig/api/graphics2_util.cpp 2012-09-15 18:20:11.920438137 +0200
+++ boinc/api/graphics2_util.cpp 2012-09-16 21:27:07.961955315 +0200
-@@ -35,9 +35,9 @@
-
- #ifdef __EMX__
+@@ -37,7 +37,7 @@
static key_t get_shmem_name(const char* prog_name) {
-- char cwd[256], path[256];
-+ char cwd[MAXPATHLEN], path[MAXPATHLEN];
+ char cwd[MAXPATHLEN], path[MAXPATHLEN];
boinc_getcwd(cwd);
- sprintf(path, "%s/init_data.xml", cwd);
+ snprintf(path, sizeof(path), "%s/init_data.xml", cwd);
return ftok(path, 2);
}
#else
-@@ -47,14 +47,14 @@
+@@ -47,7 +47,7 @@
APP_INIT_DATA aid;
int retval = boinc_get_init_data(aid);
if (retval) aid.slot = 0;
@@ -23,41 +20,6 @@ Index: boinc/api/graphics2_util.cpp
}
#endif
- void* boinc_graphics_make_shmem(const char* prog_name, int size) {
- #ifdef _WIN32
- HANDLE shmem_handle;
-- char shmem_name[256];
-+ char shmem_name[MAXPATHLEN];
- void* p;
- get_shmem_name(prog_name, shmem_name);
- shmem_handle = create_shmem(shmem_name, size, &p);
-@@ -67,7 +67,7 @@
- int retval = create_shmem(key, size, 0, &p);
- #else
- // V6 Unix/Linux/Mac applications always use mmap() shared memory for graphics communication
-- char shmem_name[256];
-+ char shmem_name[MAXPATHLEN];
- get_shmem_name(prog_name, shmem_name);
- int retval = create_shmem_mmap(shmem_name, size, &p);
- // Graphics app may be run by a different user & group than worker app
-@@ -82,7 +82,7 @@
- #ifdef _WIN32
- void* boinc_graphics_get_shmem(const char* prog_name) {
- HANDLE shmem_handle;
-- char shmem_name[256];
-+ char shmem_name[MAXPATHLEN];
- void* p;
- get_shmem_name(prog_name, shmem_name);
- shmem_handle = attach_shmem(shmem_name, &p);
-@@ -100,7 +100,7 @@
- retval = attach_shmem(key, &p);
- #else
- // V6 Unix/Linux/Mac applications always use mmap() shared memory for graphics communication
-- char shmem_name[256];
-+ char shmem_name[MAXPATHLEN];
- get_shmem_name(prog_name, shmem_name);
- retval = attach_shmem_mmap(shmem_name, &p);
- #endif
Index: boinc/lib/filesys.cpp
===================================================================
--- boinc.orig/lib/filesys.cpp 2012-09-16 21:27:07.901956127 +0200
@@ -75,27 +37,13 @@ Index: boinc/lib/filesys.cpp
}
return 0;
#elif defined(__EMX__)
-- char cmd[1024];
+- char cmd[2*MAXPATHLEN];
- sprintf(cmd, "copy \"%s\" \"%s\"", orig, newf);
+ char cmd[2*MAXPATHLEN+5];
+ snprintf(cmd, sizeof(cmd), "copy \"%s\" \"%s\"", orig, newf);
return system(cmd);
#else
// POSIX requires that shells run from an application will use the
-@@ -655,11 +655,11 @@
- // create directories dirpath/a, dirpath/a/b etc.
- //
- int boinc_make_dirs(const char* dirpath, const char* filepath) {
-- char buf[1024], oldpath[1024], newpath[1024];
-+ char buf[MAXPATHLEN*2], oldpath[MAXPATHLEN], newpath[MAXPATHLEN];
- int retval;
- char *p, *q;
-
-- if (strlen(filepath) + strlen(dirpath) > 1023) return ERR_BUFFER_OVERFLOW;
-+ if (strlen(filepath) + strlen(dirpath) > sizeof(buf)-1) return ERR_BUFFER_OVERFLOW;
- strcpy(buf, filepath);
- strcpy(oldpath, dirpath);
-
@@ -668,7 +668,7 @@
p = strchr(q, '/');
if (!p) break;
diff --git a/debian/patches/opendir_errno.patch b/debian/patches/opendir_errno.patch
index 4a06634..7c31898 100644
--- a/debian/patches/opendir_errno.patch
+++ b/debian/patches/opendir_errno.patch
@@ -1,71 +1,30 @@
-Index: boinc/lib/filesys.cpp
-===================================================================
---- boinc.orig/lib/filesys.cpp 2012-09-02 00:06:37.000000000 +0200
-+++ boinc/lib/filesys.cpp 2012-09-02 00:09:30.054449395 +0200
-@@ -128,7 +128,7 @@
- if (!is_dir(p)) return NULL;
- dirp = (DIR_DESC*) calloc(sizeof(DIR_DESC), 1);
- if (!dirp) {
-- fprintf(stderr, "calloc() failed in dir_open()\n");
-+ fprintf(stderr, "calloc() failed in lib/filesys.cpp: dir_open()\n");
- return NULL;
- }
- dirp->first = true;
-@@ -136,11 +136,12 @@
- strcat(dirp->path, "\\*");
- dirp->handle = INVALID_HANDLE_VALUE;
- #else
-+ errno=0;
- dirp = opendir(p);
- if (!dirp) {
- char whereami[MAXPATHLEN];
- boinc_getcwd(whereami);
-- fprintf(stderr,"dir_open: Could not open directory '%s' from directory '%s'.\n",p,whereami);
-+ fprintf(stderr,"lib/filesys.cpp: Could not open directory '%s' from directory '%s': %s.\n",p,whereami,strerror(errno));
- return NULL;
- }
- #endif
-@@ -230,7 +231,11 @@
- }
- dir = path + "\\*";
- #else
-+ errno=0;
- dirp = opendir(path.c_str());
-+ if (NULL == dirp) {
-+ fprintf(stderr, "opendir() failed in DirScanner::DirScanner. %s\n", strerror(errno));
-+ }
- #endif
- }
-
-Index: boinc/client/check_security.cpp
-===================================================================
---- boinc.orig/client/check_security.cpp 2012-09-02 00:06:07.000000000 +0200
-+++ boinc/client/check_security.cpp 2012-09-02 00:08:05.219581154 +0200
-@@ -39,9 +39,9 @@
- bool IsUserInGroupBM();
+--- boinc-7.0.38+dfsg.orig/client/check_security.cpp
++++ boinc-7.0.38+dfsg/client/check_security.cpp
+@@ -40,9 +40,9 @@ bool IsUserInGroupBM();
#endif
--static int CheckNestedDirectories(char * basepath, int depth,
-+static int CheckNestedDirectories(const char* const basepath, int depth,
- int use_sandbox, int isManager,
-- char * path_to_error
-+ const char* const path_to_error
- );
+ static int CheckNestedDirectories(
+- char * basepath, int depth,
++ const char * const basepath, int depth,
+ int use_sandbox, int isManager,
+- char * path_to_error
++ const char * const path_to_error
+ );
#if (! defined(__WXMAC__) && ! defined(_MAC_INSTALLER))
-@@ -500,9 +500,9 @@
+@@ -501,9 +501,9 @@ saverName[2] = "Progress Thru Processors
}
--static int CheckNestedDirectories(char * basepath, int depth,
-+static int CheckNestedDirectories(const char* const basepath, int depth,
+-static int CheckNestedDirectories(char * basepath, int depth,
++static int CheckNestedDirectories(const char * const basepath, int depth,
int use_sandbox, int isManager,
- char * path_to_error
-+ const char* const path_to_error
++ const char * const path_to_error
) {
int isDirectory;
char full_path[MAXPATHLEN];
-@@ -512,6 +512,7 @@
+@@ -513,6 +513,7 @@ static int CheckNestedDirectories(char *
dirent *dp;
static int errShown = 0;
@@ -73,19 +32,17 @@ Index: boinc/client/check_security.cpp
dirp = opendir(basepath);
if (dirp == NULL) {
// Ideally, all project-created subdirectories under project or slot
-@@ -523,6 +524,7 @@
+@@ -522,6 +523,7 @@ static int CheckNestedDirectories(char *
+ // the subdirectory to check them.
+ strlcpy(full_path, basepath, sizeof(full_path));
if ((depth > 1) && (errno == EACCES)) {
++ fprintf(stderr,"Could not open directory %s in client/check_security.cpp: CheckNestedDirectories: %s\n",full_path,strerror(errno));
return 0;
} else {
-+ fprintf(stderr,"Could not open directory %s in client/check_security.cpp: CheckNestedDirectories: %s\n",full_path,strerror(errno));
retval = -1200;
- }
- }
-Index: boinc/client/cs_platforms.cpp
-===================================================================
---- boinc.orig/client/cs_platforms.cpp 2012-09-02 00:06:07.000000000 +0200
-+++ boinc/client/cs_platforms.cpp 2012-09-02 00:08:05.223581101 +0200
-@@ -45,6 +45,7 @@
+--- boinc-7.0.38+dfsg.orig/client/cs_platforms.cpp
++++ boinc-7.0.38+dfsg/client/cs_platforms.cpp
+@@ -45,6 +45,7 @@ LPFN_ISWOW64PROCESS fnIsWow64Process;
#include <sys/sysctl.h>
#endif
@@ -93,23 +50,23 @@ Index: boinc/client/cs_platforms.cpp
#include "error_numbers.h"
#include "filesys.h"
#include "str_util.h"
-@@ -180,9 +181,17 @@
+@@ -180,9 +181,17 @@ void CLIENT_STATE::detect_platforms() {
int i;
for (i=0; i < nlibdirs; i++) {
struct dirent *entry;
-+ errno=0;
++ errno=0;
DIR *a = opendir(libdir[i]);
- // if dir doesn't exist, do to the next one
- if (a == 0) continue;
+ if (a == 0) {
-+ if (ENOENT==errno) {
++ if (ENOENT==errno) {
+ // if dir doesn't exist, do to the next one
+ }
-+ else {
-+ fprintf(stderr,"Unexpected problem with directory '%s': %s\n",libdir[i],strerror(errno));
-+ }
-+ continue;
-+ }
++ else {
++ fprintf(stderr,"Unexpected problem with directory '%s': %s\n",libdir[i],strerror(errno));
++ }
++ continue;
++ }
// dir exists. read each entry until you find a 32bit lib
while ((support32 == 0) && ((entry=readdir(a)) != 0)) {
strlcpy(cmdline, file[eno], 256);
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
index 81be230..adda253 100644
--- a/debian/patches/opendir_error_messages.patch
+++ b/debian/patches/opendir_error_messages.patch
@@ -2,15 +2,6 @@ Index: boinc/lib/filesys.cpp
===================================================================
--- boinc.orig/lib/filesys.cpp 2012-08-17 15:54:07.000000000 +0200
+++ boinc/lib/filesys.cpp 2012-08-17 16:00:33.580867206 +0200
-@@ -415,7 +419,7 @@
- } while (FindNextFileA(hFind, &findData));
- ::FindClose(hFind);
- #else
-- char filename[1024], subdir[1024];
-+ char filename[MAXPATHLEN], subdir[MAXPATHLEN];
- int retval=0;
- DIRREF dirp;
- double x;
@@ -578,9 +582,9 @@
fclose(src);
fclose(dst);
@@ -79,15 +70,6 @@ Index: boinc/client/sandbox.cpp
===================================================================
--- boinc.orig/client/sandbox.cpp 2012-08-17 15:47:19.771548200 +0200
+++ boinc/client/sandbox.cpp 2012-08-17 15:54:07.000000000 +0200
-@@ -185,7 +185,7 @@
- // If an error occurs, delete as much as possible.
- //
- int client_clean_out_dir(const char* dirpath, const char* reason) {
-- char filename[256], path[MAXPATHLEN];
-+ char filename[MAXPATHLEN], path[MAXPATHLEN];
- int retval, final_retval = 0;
- DIRREF dirp;
-
@@ -207,7 +207,7 @@
strcpy(filename, "");
retval = dir_scan(filename, dirp, sizeof(filename));
diff --git a/debian/patches/sched_driver_char_buffers.patch b/debian/patches/sched_driver_char_buffers.patch
index 772e1cb..5fd74b5 100644
--- a/debian/patches/sched_driver_char_buffers.patch
+++ b/debian/patches/sched_driver_char_buffers.patch
@@ -4,18 +4,13 @@ Index: boinc/sched/sched_driver.cpp
===================================================================
--- boinc.orig/sched/sched_driver.cpp 2012-03-30 19:46:56.436149392 +0200
+++ boinc/sched/sched_driver.cpp 2012-03-30 19:46:57.428135859 +0200
-@@ -46,13 +46,14 @@
- #include "svn_version.h"
- #include "str_replace.h" // strlcpy
- #include "str_util.h" // safe_strcpy
-+#include "str_replace.h" // strlcpy
-
+@@ -50,9 +50,9 @@
using std::vector;
struct HOST_DESC{
-- char os_name[128];
-- char p_vendor[128];
-- char p_model[128];
+- char os_name[256];
+- char p_vendor[256];
+- char p_model[256];
+ char os_name[512];
+ char p_vendor[512];
+ char p_model[512];
diff --git a/debian/patches/series b/debian/patches/series
index 9de52c2..3ba80c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,11 +17,11 @@ stripchart_security.patch
#andYetMorePatches04.patch
#convinceDavid#cwd_handling.patch
parse_issues.patch
-client_stream_realloc.patch
+#client_stream_realloc.patch #stream.cpp has been deleted in .38 release
# --- A
#convinceDavid# bug672328 MoreInformativeAppStartFailure.patch
#send to David#
-stream_memory_leak_fix.patch
+#stream_memory_leak_fix.patch #stream.cpp has been deleted in .38 release
#SETIprobCandidate#app_ipc_uninitialised_A_reorder.patch
#SETIprobCandidate#app_ipc_uninitialised_B_buffer.patch
uninitialised_client_states.patch
@@ -31,7 +31,7 @@ uninitialised_client_states.patch
# --- Z --- Currently not applicable
#Z#no_std_string.patch
clang_incompatibilities.patch
-printf.patch
+#printf.patch #accepted upstream in 7.0.38 release
#either these 3
#convinceDavid# nvidia_detect_buffers.patch
#convinceDavid# nvidia_detect_bugs.patch
@@ -45,19 +45,19 @@ dTotalGlobalMem.patch
nvidia_mem_display_simplification.patch
api_NULL_not_defined.patch
unlink_undefined.patch
-0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch
+#0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch #accepted upstream in 7.0.38 release
#patches partially applied in trunk rev=26133
-0002-re-enable-X11-screensaver-build.patch
+#0002-re-enable-X11-screensaver-build.patch #accepted upstream in 7.0.38 release
cppcheck_realloc.patch
cppcheck_avoid_redundant_check.patch
-upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
+#upstream_sztaki_reduce_accessibility_of_php_inc_file.patch #accepted upstream in 7.0.38 release
MainDocumentWarnings.patch
more_maxpathlen.patch
opendir_error_messages.patch
-redundant_i.patch
-screen_saver_boinc_extra.patch
+#redundant_i.patch #accepted upstream in 7.0.38 release
+#screen_saver_boinc_extra.patch #accepted upstream in 7.0.38 release
sched_driver_char_buffers.patch
csh2tcsh.patch
@@ -78,5 +78,5 @@ boinclib_shared.patch
dynamic_libboinc.patch
Missing_libSched.patch
missing_libs_wrapper.patch
-boinc-ftbfs-hurd.patch
-boinc-ftbfs.patch
+#boinc-ftbfs-hurd.patch
+#boinc-ftbfs.patch
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index 12a427b..17c7e99 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -1,8 +1,6 @@
-Index: boinc/client/app.cpp
-===================================================================
---- boinc.orig/client/app.cpp 2012-09-15 18:20:12.208434304 +0200
-+++ boinc/client/app.cpp 2012-09-16 21:27:08.029954395 +0200
-@@ -417,8 +417,8 @@
+--- a/client/app.cpp
++++ b/client/app.cpp
+@@ -420,8 +420,8 @@
int retval;
get_project_dir(result->project, project_dir, sizeof(project_dir));
@@ -13,7 +11,7 @@ Index: boinc/client/app.cpp
"%s/trickle_up_%s_%d.xml",
project_dir, result->name, (int)time(0)
);
-@@ -453,7 +453,7 @@
+@@ -456,7 +456,7 @@
return 0;
}
@@ -22,7 +20,7 @@ Index: boinc/client/app.cpp
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
if (active_tasks[i]->slot == slot) {
-@@ -463,7 +463,7 @@
+@@ -466,7 +466,7 @@
return false;
}
@@ -31,7 +29,7 @@ Index: boinc/client/app.cpp
char path[MAXPATHLEN];
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
-@@ -504,7 +504,7 @@
+@@ -507,7 +507,7 @@
#endif
}
@@ -40,7 +38,7 @@ Index: boinc/client/app.cpp
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
if (active_tasks[i]->slot == slot) return true;
-@@ -616,7 +616,7 @@
+@@ -619,7 +619,7 @@
#endif
int ACTIVE_TASK::parse(XML_PARSER& xp) {
@@ -49,13 +47,7 @@ Index: boinc/client/app.cpp
int n, dummy;
unsigned int i;
PROJECT* project=0;
-@@ -886,12 +886,12 @@
- //
- int ACTIVE_TASK::handle_upload_files() {
- std::string filename;
-- char buf[256], path[MAXPATHLEN];
-+ char buf[MAXPATHLEN], path[MAXPATHLEN];
- int retval;
+@@ -894,7 +894,7 @@
DirScanner dirscan(slot_dir);
while (dirscan.scan(filename)) {
@@ -64,10 +56,8 @@ Index: boinc/client/app.cpp
if (strstr(buf, UPLOAD_FILE_REQ_PREFIX) == buf) {
char* p = buf+strlen(UPLOAD_FILE_REQ_PREFIX);
FILE_INFO* fip = result->lookup_file_logical(p);
-Index: boinc/client/app.h
-===================================================================
---- boinc.orig/client/app.h 2012-09-15 18:20:12.212434251 +0200
-+++ boinc/client/app.h 2012-09-16 21:27:08.033954342 +0200
+--- a/client/app.h
++++ b/client/app.h
@@ -47,6 +47,7 @@
typedef int PROCESS_ID;
@@ -76,18 +66,15 @@ Index: boinc/client/app.h
// The stderr output of an application is truncated to this length
// before sending to server,
// to protect against apps that write unbounded amounts.
-@@ -110,9 +111,9 @@
+@@ -110,7 +111,7 @@
double bytes_sent;
// reported by the app if it does network I/O
double bytes_received;
- char slot_dir[256];
+ char slot_dir[SLOT_DIR_LEN];
// directory where process runs (relative)
-- char slot_path[512];
-+ char slot_path[MAXPATHLEN];
+ char slot_path[MAXPATHLEN];
// same, absolute
- // This is used only to run graphics apps
- // (that way don't have to worry about top-level dirs
@@ -151,8 +152,8 @@
// but not descendants of the main process
// (e.g. VMs created by vboxwrapper)
@@ -97,9 +84,9 @@ Index: boinc/client/app.h
+ char web_graphics_url[MAXPATHLEN];
+ char remote_desktop_addr[MAXPATHLEN];
ASYNC_COPY* async_copy;
-
- void set_task_state(int, const char*);
-@@ -285,8 +286,8 @@
+ double finish_file_time;
+ // time when we saw finish file in slot dir.
+@@ -288,8 +289,8 @@
bool check_app_exited();
bool check_rsc_limits_exceeded();
bool check_quit_timeout_exceeded();
@@ -110,7 +97,7 @@ Index: boinc/client/app.h
void send_heartbeats();
void send_trickle_downs();
void report_overdue();
-@@ -295,7 +296,7 @@
+@@ -298,7 +299,7 @@
bool want_network(); // does any task want network?
void network_available(); // notify tasks that network is available
void free_mem();
@@ -119,10 +106,8 @@ Index: boinc/client/app.h
void get_memory_usage();
void process_control_poll();
-Index: boinc/lib/filesys.cpp
-===================================================================
---- boinc.orig/lib/filesys.cpp 2012-09-16 21:27:07.969955209 +0200
-+++ boinc/lib/filesys.cpp 2012-09-16 21:27:29.541663047 +0200
+--- a/lib/filesys.cpp
++++ b/lib/filesys.cpp
@@ -86,7 +86,7 @@
// routines for enumerating the entries in a directory
@@ -150,7 +135,7 @@ Index: boinc/lib/filesys.cpp
struct stat sbuf;
int retval = lstat(path, &sbuf);
return (!retval && S_ISLNK(sbuf.st_mode));
-@@ -122,7 +122,7 @@
+@@ -122,13 +122,13 @@
// Open a directory
//
@@ -159,18 +144,28 @@ Index: boinc/lib/filesys.cpp
DIRREF dirp;
#ifdef _WIN32
if (!is_dir(p)) return NULL;
-@@ -138,7 +138,9 @@
+ dirp = (DIR_DESC*) calloc(sizeof(DIR_DESC), 1);
+ if (!dirp) {
+- fprintf(stderr, "calloc() failed in dir_open()\n");
++ fprintf(stderr, "calloc() failed in lib/filesys.cpp: dir_open()\n");
+ return NULL;
+ }
+ dirp->first = true;
+@@ -136,9 +136,12 @@
+ strcat(dirp->path, "\\*");
+ dirp->handle = INVALID_HANDLE_VALUE;
#else
++ errno=0;
dirp = opendir(p);
if (!dirp) {
- fprintf(stderr,"dir_open: Could not open directory '%s'.\n",p);
+ char whereami[MAXPATHLEN];
+ boinc_getcwd(whereami);
-+ fprintf(stderr,"dir_open: Could not open directory '%s' from directory '%s'.\n",p,whereami);
++ fprintf(stderr,"lib/filesys.cpp: Could not open directory '%s' from directory '%s': %s.\n",p,whereami,strerror(errno));
return NULL;
}
#endif
-@@ -208,7 +210,7 @@
+@@ -208,7 +211,7 @@
#endif
}
@@ -179,7 +174,19 @@ Index: boinc/lib/filesys.cpp
char file[MAXPATHLEN];
DIRREF dir = dir_open(p);
-@@ -362,7 +364,7 @@
+@@ -228,7 +231,11 @@
+ }
+ dir = path + "\\*";
+ #else
++ errno=0;
+ dirp = opendir(path.c_str());
++ if (NULL == dirp) {
++ fprintf(stderr, "opendir() failed in DirScanner::DirScanner. %s\n", strerror(errno));
++ }
+ #endif
+ }
+
+@@ -362,7 +369,7 @@
// remove everything from specified directory
//
@@ -188,7 +195,7 @@ Index: boinc/lib/filesys.cpp
char filename[MAXPATHLEN], path[MAXPATHLEN];
int retval;
DIRREF dirp;
-@@ -613,7 +615,7 @@
+@@ -613,7 +620,7 @@
// make a dir that's owner and group RWX
//
@@ -197,7 +204,7 @@ Index: boinc/lib/filesys.cpp
if (is_dir(path)) return 0;
#ifdef _WIN32
if (!CreateDirectoryA(path, NULL)) {
-@@ -628,7 +630,7 @@
+@@ -628,7 +635,7 @@
return 0;
}
@@ -206,7 +213,7 @@ Index: boinc/lib/filesys.cpp
#ifdef _WIN32
if (!RemoveDirectoryA(name)) {
return ERR_RMDIR;
-@@ -641,7 +643,7 @@
+@@ -641,7 +648,7 @@
}
#ifndef _WIN32
@@ -215,16 +222,16 @@ Index: boinc/lib/filesys.cpp
if (gid) {
if (chown(path, (uid_t)-1, gid)) {
return ERR_CHOWN;
-@@ -654,7 +656,7 @@
+@@ -654,7 +661,7 @@
// if "filepath" is of the form a/b/c,
// create directories dirpath/a, dirpath/a/b etc.
//
-int boinc_make_dirs(const char* dirpath, const char* filepath) {
+int boinc_make_dirs(const char* const dirpath, const char* const filepath) {
- char buf[MAXPATHLEN*2], oldpath[MAXPATHLEN], newpath[MAXPATHLEN];
+ char buf[MAXPATHLEN], oldpath[MAXPATHLEN], newpath[MAXPATHLEN];
int retval;
char *p, *q;
-@@ -721,7 +723,7 @@
+@@ -721,7 +728,7 @@
return 0;
}
@@ -233,7 +240,7 @@ Index: boinc/lib/filesys.cpp
#if defined(_WIN32) && !defined(__CYGWIN32__)
CloseHandle(handle);
#else
-@@ -733,7 +735,7 @@
+@@ -733,7 +740,7 @@
return 0;
}
@@ -242,7 +249,7 @@ Index: boinc/lib/filesys.cpp
#ifdef _WIN32
getcwd(path, MAXPATHLEN);
#else
-@@ -745,7 +747,7 @@
+@@ -745,7 +752,7 @@
#endif
}
@@ -251,7 +258,7 @@ Index: boinc/lib/filesys.cpp
boinc_getcwd(path);
if (strlen(relname)) {
strcat(path, "/");
-@@ -756,7 +758,7 @@
+@@ -756,7 +763,7 @@
// get total and free space on current filesystem (in bytes)
//
#ifdef _WIN32
@@ -260,7 +267,7 @@ Index: boinc/lib/filesys.cpp
char cwd[MAXPATHLEN];
boinc_getcwd(cwd);
FreeFn pGetDiskFreeSpaceEx;
-@@ -789,7 +791,7 @@
+@@ -789,7 +796,7 @@
total_space = (double)dwTotalClusters * dwSectPerClust * dwBytesPerSect;
}
#else
@@ -269,20 +276,9 @@ Index: boinc/lib/filesys.cpp
#ifdef STATFS
struct STATFS fs_info;
-@@ -810,7 +812,7 @@
-
- #ifndef _WIN32
-
--int get_file_dir(char* filename, char* dir) {
-+int get_file_dir(const char* const filename, char* dir) {
- char buf[8192], *p, path[MAXPATHLEN];
- struct stat sbuf;
- int retval;
-Index: boinc/lib/filesys.h
-===================================================================
---- boinc.orig/lib/filesys.h 2012-09-15 18:20:16.792373285 +0200
-+++ boinc/lib/filesys.h 2012-09-16 21:27:08.041954235 +0200
-@@ -48,19 +48,19 @@
+--- a/lib/filesys.h
++++ b/lib/filesys.h
+@@ -47,19 +47,19 @@
extern FILE* boinc_fopen(const char* path, const char* mode);
extern int boinc_copy(const char* orig, const char* newf);
extern int boinc_rename(const char* old, const char* newf);
@@ -312,7 +308,7 @@ Index: boinc/lib/filesys.h
extern int boinc_truncate(const char*, double);
extern int boinc_file_exists(const char* path);
extern int boinc_file_or_symlink_exists(const char* path);
-@@ -72,10 +72,10 @@
+@@ -71,10 +71,10 @@
/* C++ specific prototypes/defines follow here */
#ifdef __cplusplus
@@ -327,7 +323,7 @@ Index: boinc/lib/filesys.h
// TODO TODO TODO
// remove this code - the DirScanner class does the same thing.
-@@ -97,7 +97,7 @@
+@@ -96,7 +96,7 @@
extern int dir_scan(std::string&, DIRREF);
extern void dir_close(DIRREF);
diff --git a/debian/patches/some_extra_clang_warnings.patch b/debian/patches/some_extra_clang_warnings.patch
index ef3a04c..70b0fe9 100644
--- a/debian/patches/some_extra_clang_warnings.patch
+++ b/debian/patches/some_extra_clang_warnings.patch
@@ -2,41 +2,37 @@ Index: boinc/tools/dir_hier_path.cpp
===================================================================
--- boinc.orig/tools/dir_hier_path.cpp 2012-05-19 12:21:46.779836547 +0200
+++ boinc/tools/dir_hier_path.cpp 2012-05-19 12:22:34.799171401 +0200
-@@ -42,8 +42,8 @@
+@@ -42,7 +42,7 @@
int retval;
if ( (argc == 1) || !strcmp(argv[1], "-h") || !strcmp(argv[1],"--help") || (argc != 2) ) {
-- printf (usage);
-- exit(1);
-+ fprintf(stderr,"%s",usage);
-+ exit(1);
+- fprintf(stderr, usage);
++ fprintf(stderr,"%s", usage);
+ exit(1);
}
- retval = config.parse_file();
Index: boinc/tools/dir_hier_move.cpp
===================================================================
--- boinc.orig/tools/dir_hier_move.cpp 2012-05-19 12:21:46.779836547 +0200
+++ boinc/tools/dir_hier_move.cpp 2012-05-19 12:22:34.803171345 +0200
-@@ -42,15 +42,15 @@
+@@ -42,7 +42,7 @@
int retval;
if ( (argc == 1) || !strcmp(argv[1], "-h") || !strcmp(argv[1],"--help") || (argc != 4) ) {
-- printf (usage);
-- exit(1);
-+ fprintf(stderr,"%s",usage);
-+ exit(1);
+- fprintf(stderr, usage);
++ fprintf(stderr,"%s", usage);
+ exit(1);
}
src_dir = argv[1];
+@@ -49,7 +49,7 @@
dst_dir = argv[2];
fanout = atoi(argv[3]);
if (!fanout) {
-- printf ( usage );
-- exit(1);
-+ fprintf(stderr,"%s",usage);
-+ exit(1);
+- fprintf(stderr, usage);
++ fprintf(stderr,"%s", usage);
+ exit(1);
}
- DirScanner scanner(src_dir);
Index: boinc/clientgui/sg_ProjectPanel.cpp
===================================================================
--- boinc.orig/clientgui/sg_ProjectPanel.cpp 2012-05-19 12:21:46.779836547 +0200
diff --git a/debian/patches/stripchart_security.patch b/debian/patches/stripchart_security.patch
index 13444c8..ef8593d 100644
--- a/debian/patches/stripchart_security.patch
+++ b/debian/patches/stripchart_security.patch
@@ -2,56 +2,56 @@ Author: Steffen Moeller <moeller at debian.org>
Description: Adjusting paths
Disclaimer: This is mostly dead code of upstream.
-Index: boinc/stripchart/samples/get_load
-===================================================================
---- boinc.orig/stripchart/samples/get_load 2012-01-15 01:31:59.000000000 +0100
-+++ boinc/stripchart/samples/get_load 2012-01-15 02:02:05.000000000 +0100
-@@ -1,11 +1,11 @@
--#! /bin/csh
-+#!/bin/sh
-
--set UPTIME = `/usr/bin/uptime | awk '{print $10}' | sed s/,//`
--if ($UPTIME == "average:") then
-- set UPTIME = `/usr/bin/uptime | awk '{print $11}' | sed s/,//`
--endif
-+UPTIME=`uptime | awk '{print $10}' | sed s/,//`
-+if [ "$UPTIME" = "average:"]; then
-+ UPTIME=`uptime | awk '{print $11}' | sed s/,//`
-+fi
-
--set CIVDATE = `/bin/date "+%Y:%m:%d:%H:%M"`
--set UNIXDATE = `/usr/local/bin/perl -e 'print time()'`
-+CIVDATE=`date "+%Y:%m:%d:%H:%M"`
-+UNIXDATE=`perl -e 'print time()'`
-
- echo $CIVDATE $UNIXDATE $UPTIME
-Index: boinc/stripchart/samples/parse_config
-===================================================================
---- boinc.orig/stripchart/samples/parse_config 2012-01-15 01:31:59.000000000 +0100
-+++ boinc/stripchart/samples/parse_config 2012-01-15 02:02:05.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
-
- # -*- mode: python; python-indent: 4; -*-
-
-Index: boinc/stripchart/samples/dir_size
-===================================================================
---- boinc.orig/stripchart/samples/dir_size 2012-01-15 01:31:59.000000000 +0100
-+++ boinc/stripchart/samples/dir_size 2012-01-15 02:02:05.000000000 +0100
-@@ -1,8 +1,8 @@
--#! /bin/csh
-+#!/bin/sh
-
--set SIZE = `du -sk $1 | awk '{print $1*1024}'`
-+SIZE=`du -sk $1 | awk '{print $1*1024}'`
-
--set CIVDATE = `/bin/date "+%Y:%m:%d:%H:%M"`
--set UNIXDATE = `/usr/local/bin/perl -e 'print time()'`
-+CIVDATE=`date "+%Y:%m:%d:%H:%M"`
-+UNIXDATE=`perl -e 'print time()'`
-
- echo $CIVDATE $UNIXDATE $SIZE
+#Index: boinc/stripchart/samples/get_load
+#===================================================================
+#--- boinc.orig/stripchart/samples/get_load 2012-01-15 01:31:59.000000000 +0100
+#+++ boinc/stripchart/samples/get_load 2012-01-15 02:02:05.000000000 +0100
+#@@ -1,11 +1,11 @@
+#-#! /bin/csh
+#+#!/bin/sh
+#
+#-set UPTIME = `/usr/bin/uptime | awk '{print $10}' | sed s/,//`
+#-if ($UPTIME == "average:") then
+#- set UPTIME = `/usr/bin/uptime | awk '{print $11}' | sed s/,//`
+#-endif
+#+UPTIME=`uptime | awk '{print $10}' | sed s/,//`
+#+if [ "$UPTIME" = "average:"]; then
+#+ UPTIME=`uptime | awk '{print $11}' | sed s/,//`
+#+fi
+#
+#-set CIVDATE = `/bin/date "+%Y:%m:%d:%H:%M"`
+#-set UNIXDATE = `/usr/local/bin/perl -e 'print time()'`
+#+CIVDATE=`date "+%Y:%m:%d:%H:%M"`
+#+UNIXDATE=`perl -e 'print time()'`
+#
+# echo $CIVDATE $UNIXDATE $UPTIME
+#Index: boinc/stripchart/samples/parse_config
+#===================================================================
+#--- boinc.orig/stripchart/samples/parse_config 2012-01-15 01:31:59.000000000 +0100
+#+++ boinc/stripchart/samples/parse_config 2012-01-15 02:02:05.000000000 +0100
+#@@ -1,4 +1,4 @@
+#-#!/usr/bin/env python
+#+#!/usr/bin/python
+#
+# # -*- mode: python; python-indent: 4; -*-
+#
+#Index: boinc/stripchart/samples/dir_size
+#===================================================================
+#--- boinc.orig/stripchart/samples/dir_size 2012-01-15 01:31:59.000000000 +0100
+#+++ boinc/stripchart/samples/dir_size 2012-01-15 02:02:05.000000000 +0100
+#@@ -1,8 +1,8 @@
+#-#! /bin/csh
+#+#!/bin/sh
+#
+#-set SIZE = `du -sk $1 | awk '{print $1*1024}'`
+#+SIZE=`du -sk $1 | awk '{print $1*1024}'`
+#
+#-set CIVDATE = `/bin/date "+%Y:%m:%d:%H:%M"`
+#-set UNIXDATE = `/usr/local/bin/perl -e 'print time()'`
+#+CIVDATE=`date "+%Y:%m:%d:%H:%M"`
+#+UNIXDATE=`perl -e 'print time()'`
+#
+# echo $CIVDATE $UNIXDATE $SIZE
Index: boinc/stripchart/stripchart.cnf
===================================================================
--- boinc.orig/stripchart/stripchart.cnf 2012-01-15 02:02:04.000000000 +0100
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list