[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-44-g90808b6
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Sat Sep 15 13:12:39 UTC 2012
The following commit has been merged in the master branch:
commit 90808b6eddf175fbce08918863e090396e9df48c
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sat Sep 15 15:11:00 2012 +0200
New upstream version, revised some patches (already partially applied upstream)
modified: debian/changelog
modified: debian/patches/more_maxpathlen.patch
modified: debian/patches/opendir_error_messages.patch
modified: debian/patches/slot_dir_source_trace.patch
modified: debian/patches/ticket_1168_verifycerts.patch
diff --git a/debian/changelog b/debian/changelog
index 43725ec..8903064 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boinc (7.0.36+dfsg-1) UNRELEASED; urgency=low
+
+ [ Gianfranco Costamagna ]
+ * New upstream version
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Sat, 15 Sep 2012 15:10:21 +0200
+
boinc (7.0.34+dfsg-6) UNRELEASED; urgency=low
[ Steffen Moeller ]
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 8ece46f..041daa6 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -60,17 +60,8 @@ Index: boinc/api/graphics2_util.cpp
#endif
Index: boinc/lib/filesys.cpp
===================================================================
---- boinc.orig/lib/filesys.cpp 2012-09-01 19:40:04.725344515 +0800
-+++ boinc/lib/filesys.cpp 2012-09-01 19:40:04.733344515 +0800
-@@ -209,7 +209,7 @@
- }
-
- bool is_dir_empty(const char *p) {
-- char file[256];
-+ char file[MAXPATHLEN];
-
- DIRREF dir = dir_open(p);
- if (!dir) return true;
+--- boinc.orig/lib/filesys.cpp 2012-09-15 12:23:56.681113074 +0200
++++ boinc/lib/filesys.cpp 2012-09-15 12:23:56.681113074 +0200
@@ -430,7 +430,7 @@
while (1) {
retval = dir_scan(filename, dirp, sizeof(filename));
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
index 89478ac..f87cd48 100644
--- a/debian/patches/opendir_error_messages.patch
+++ b/debian/patches/opendir_error_messages.patch
@@ -1,16 +1,11 @@
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
-@@ -363,12 +363,16 @@
- // remove everything from specified directory
- //
- int clean_out_dir(const char* dirpath) {
-- char filename[256], path[MAXPATHLEN];
-+ char filename[MAXPATHLEN], path[MAXPATHLEN];
+--- boinc.orig/lib/filesys.cpp 2012-09-15 12:23:56.681113074 +0200
++++ boinc/lib/filesys.cpp 2012-09-15 12:35:40.833682529 +0200
+@@ -364,8 +364,12 @@
int retval;
DIRREF dirp;
-
+
+ if (!boinc_file_or_symlink_exists(dirpath)) return 0; // if dir doesn't exist, it's empty
dirp = dir_open(dirpath);
- if (!dirp) return 0; // if dir doesn't exist, it's empty
@@ -21,26 +16,6 @@ Index: boinc/lib/filesys.cpp
while (1) {
strcpy(filename, "");
retval = dir_scan(filename, dirp, sizeof(filename));
-@@ -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;
-@@ -579,8 +583,8 @@
- fclose(dst);
- // Copy file's ownership, permissions to the extent we are allowed
- lstat(orig, &sbuf); // Get source file's info
-- chown(newf, sbuf.st_uid, sbuf.st_gid);
-- chmod(newf, sbuf.st_mode);
-+ if (chown(newf, sbuf.st_uid, sbuf.st_gid)) retval=ERR_FWRITE;
-+ if (chmod(newf, sbuf.st_mode)) retval=ERR_FWRITE;
- return retval;
- #endif
- }
Index: boinc/lib/diagnostics.cpp
===================================================================
--- boinc.orig/lib/diagnostics.cpp 2012-08-17 15:47:19.767548254 +0200
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index 9fc7134..da09f9d 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -119,29 +119,11 @@ Index: boinc/client/app.h
void get_memory_usage();
void process_control_poll();
-Index: boinc/lib/crypt.cpp
-===================================================================
---- boinc.orig/lib/crypt.cpp 2012-08-25 22:40:33.319581192 +0200
-+++ boinc/lib/crypt.cpp 2012-08-26 12:04:00.552220560 +0200
-@@ -603,7 +603,7 @@
-
- DIRREF dir = dir_open(certPath);
-
-- char file[256];
-+ char file[MAXPATHLEN];
- while (dir_scan(file, dir, sizeof(file))) {
- char fpath[MAXPATHLEN];
- snprintf(fpath, sizeof(fpath), "%s/%s", certPath, file);
Index: boinc/lib/filesys.cpp
===================================================================
---- boinc.orig/lib/filesys.cpp 2012-08-25 22:40:35.959545606 +0200
-+++ boinc/lib/filesys.cpp 2012-08-26 16:24:13.834254700 +0200
-@@ -82,11 +82,11 @@
-
- using std::string;
-
--char boinc_failed_file[256];
-+char boinc_failed_file[MAXPATHLEN];
+--- boinc.orig/lib/filesys.cpp 2012-09-15 12:23:56.681113074 +0200
++++ boinc/lib/filesys.cpp 2012-09-15 12:35:40.000000000 +0200
+@@ -86,7 +86,7 @@
// routines for enumerating the entries in a directory
@@ -251,22 +233,16 @@ Index: boinc/lib/filesys.cpp
#if defined(_WIN32) && !defined(__CYGWIN32__)
CloseHandle(handle);
#else
-@@ -737,19 +739,19 @@
+@@ -737,7 +739,7 @@
return 0;
}
-
+
-void boinc_getcwd(char* path) {
+void boinc_getcwd(char* const path) {
#ifdef _WIN32
-- getcwd(path, 256);
-+ getcwd(path, MAXPATHLEN);
+ getcwd(path, MAXPATHLEN);
#else
- char* p
- #ifdef __GNUC__
- __attribute__ ((unused))
- #endif
-- = getcwd(path, 256);
-+ = getcwd(path, MAXPATHLEN);
+@@ -749,7 +751,7 @@
#endif
}
@@ -275,14 +251,14 @@ Index: boinc/lib/filesys.cpp
boinc_getcwd(path);
if (strlen(relname)) {
strcat(path, "/");
-@@ -760,7 +762,7 @@
+@@ -762,7 +764,7 @@
// get total and free space on current filesystem (in bytes)
//
#ifdef _WIN32
-int get_filesystem_info(double &total_space, double &free_space, char*) {
+int get_filesystem_info(double &total_space, double &free_space, const char* const) {
- char buf[256];
- boinc_getcwd(buf);
+ char cwd[MAXPATHLEN];
+ boinc_getcwd(cwd);
FreeFn pGetDiskFreeSpaceEx;
@@ -793,7 +795,7 @@
total_space = (double)dwTotalClusters * dwSectPerClust * dwBytesPerSect;
@@ -304,14 +280,14 @@ Index: boinc/lib/filesys.cpp
int retval;
Index: boinc/lib/filesys.h
===================================================================
---- boinc.orig/lib/filesys.h 2012-04-01 20:19:44.949682516 +0200
-+++ boinc/lib/filesys.h 2012-08-26 16:24:00.994429008 +0200
+--- boinc.orig/lib/filesys.h 2012-09-15 12:23:56.677113181 +0200
++++ boinc/lib/filesys.h 2012-09-15 13:54:49.920386693 +0200
@@ -48,19 +48,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);
- extern int boinc_mkdir(const char*);
-+ extern int boinc_mkdir(const char* const );
++ extern int boinc_mkdir(const char* const);
#ifndef _WIN32
- extern int boinc_chown(const char*, gid_t);
+ extern int boinc_chown(const char* const, const gid_t);
@@ -320,16 +296,15 @@ Index: boinc/lib/filesys.h
- extern void boinc_getcwd(char*);
- extern void relative_to_absolute(const char* relname, char* path);
- extern int boinc_make_dirs(const char*, const char*);
-- extern char boinc_failed_file[256];
-- extern int is_file(const char* path);
-- extern int is_dir(const char* path);
-- extern int is_dir_follow_symlinks(const char* path);
-- extern int is_symlink(const char* path);
+ extern int boinc_rmdir(const char* const);
+ extern void boinc_getcwd(/* not const*/ char* const);
+ extern void relative_to_absolute(const char* const relname, char* const path);
+ extern int boinc_make_dirs(const char* const, const char* const);
-+ extern char boinc_failed_file[MAXPATHLEN];
+ extern char boinc_failed_file[MAXPATHLEN];
+- extern int is_file(const char* path);
+- extern int is_dir(const char* path);
+- extern int is_dir_follow_symlinks(const char* path);
+- extern int is_symlink(const char* path);
+ extern int is_file(const char* const path);
+ extern int is_dir(const char* const path);
+ extern int is_dir_follow_symlinks(const char* const path);
diff --git a/debian/patches/ticket_1168_verifycerts.patch b/debian/patches/ticket_1168_verifycerts.patch
index 5454e77..80c392c 100644
--- a/debian/patches/ticket_1168_verifycerts.patch
+++ b/debian/patches/ticket_1168_verifycerts.patch
@@ -1,52 +1,13 @@
-Index: boinc/client/cs_files.cpp
-===================================================================
---- boinc.orig/client/cs_files.cpp 2012-08-30 21:03:35.490956131 +0200
-+++ boinc/client/cs_files.cpp 2012-09-02 10:40:36.478032727 +0200
-@@ -90,12 +90,12 @@
- // Is app signed by one of the Application Certifiers?
- //
- bool FILE_INFO::verify_file_certs() {
-- char file[256];
-+ char file[MAXPATHLEN];
- bool retval = false;
-
- if (!is_dir(CERTIFICATE_DIRECTORY)) return false;
- DIRREF dir = dir_open(CERTIFICATE_DIRECTORY);
-- while (dir_scan(file, dir, sizeof(file))) {
-+ while (!dir_scan(file, dir, sizeof(file))) {
- if (cert_verify_file(cert_sigs, file, CERTIFICATE_DIRECTORY)) {
- msg_printf(project, MSG_INFO,
- "Signature verified using certificate %s", file
-@@ -156,7 +156,7 @@
- int FILE_INFO::verify_file(
- bool verify_contents, bool show_errors, bool allow_async
- ) {
-- char cksum[64], pathname[256];
-+ char cksum[64], pathname[MAXPATHLEN];
- bool verified;
- int retval;
- double size, local_nbytes;
+--- boinc.orig/client/cs_files.cpp 2012-09-15 12:23:56.549116980 +0200
++++ boinc/client/cs_files.cpp 2012-09-15 14:59:54.911398600 +0200
@@ -177,7 +177,9 @@
//
if (download_gzipped && !boinc_file_exists(pathname)) {
char gzpath[MAXPATHLEN];
- sprintf(gzpath, "%s.gz", pathname);
+ snprintf(gzpath, sizeof(gzpath), "%s.gz", pathname);
-+ //FIXME: a distinction is missing for the case that the .gz suffix goes beyond the MAXPATHLEN and is hence not found because
-+ // one should then not reperform the download as intended below
++ //FIXME: a distinction is missing for the case that the .gz suffix goes beyond the MAXPATHLEN and is hence not found because
++ // one should then not reperform the download as intended below
if (boinc_file_exists(gzpath) ) {
if (allow_async && nbytes > ASYNC_FILE_THRESHOLD) {
ASYNC_VERIFY* avp = new ASYNC_VERIFY;
-Index: boinc/lib/crypt.cpp
-===================================================================
---- boinc.orig/lib/crypt.cpp 2012-09-02 10:27:39.420339596 +0200
-+++ boinc/lib/crypt.cpp 2012-09-02 10:42:50.568254414 +0200
-@@ -604,7 +604,7 @@
- DIRREF dir = dir_open(certPath);
-
- char file[MAXPATHLEN];
-- while (dir_scan(file, dir, sizeof(file))) {
-+ while (!dir_scan(file, dir, sizeof(file))) {
- char fpath[MAXPATHLEN];
- snprintf(fpath, sizeof(fpath), "%s/%s", certPath, file);
- // TODO : replace '128'
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list