[SCM] BOINC packaging branch, master, updated. debian/7.0.27+dfsg-3-78-g7a81ff0
Steffen Moeller
steffen_moeller at gmx.de
Sat Aug 18 09:00:02 UTC 2012
The following commit has been merged in the master branch:
commit 7a81ff08cdd83a1aaeb93eee6ed75a252bce0a6c
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Sat Aug 18 10:31:41 2012 +0200
Preparing for upload of 7.0.33
diff --git a/.gitignore b/.gitignore
index c6cdc37..737e427 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,8 @@ client/boinc_client
client/boinccmd
client/switcher
clientgui/boincmgr
+client/scripts/boinc-client
+client/win/boinc_path_config.py
vda/plot
vda/ssim
vda/vda
@@ -125,3 +127,5 @@ doc/manpages/appmgr.8
doc/manpages/boinc.1
doc/manpages/boinccmd.1
doc/manpages/boincmgr.1
+test/version.inc
+py/Boinc/version.py
diff --git a/debian/changelog b/debian/changelog
index 0d78d4d..8b48f9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-boinc (7.0.33+dfsg-1) UNRELEASED; urgency=low
+boinc (7.0.33+dfsg-1) unstable; urgency=low
[ Steffen Moeller ]
* New upstream version
@@ -9,7 +9,7 @@ boinc (7.0.33+dfsg-1) UNRELEASED; urgency=low
- in api/, for SETI to work,
- in clientgui/, as a workaround for #679207.
- -- Steffen Moeller <moeller at debian.org> Sat, 30 Jun 2012 21:59:59 +0200
+ -- Steffen Moeller <moeller at debian.org> Sat, 18 Aug 2012 10:44:10 +0200
boinc (7.0.32+dfsg-1) UNRELEASED; urgency=low
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
new file mode 100644
index 0000000..89478ac
--- /dev/null
+++ b/debian/patches/opendir_error_messages.patch
@@ -0,0 +1,116 @@
+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];
+ 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
++ if (!dirp) {
++ fprintf(stderr,"clean_out_dir: failed dir_open on '%s'\n",dirpath);
++ return 0;
++ }
+ 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
++++ boinc/lib/diagnostics.cpp 2012-08-17 15:54:07.000000000 +0200
+@@ -75,14 +75,14 @@
+
+ static int diagnostics_initialized = false;
+ static int flags;
+-static char stdout_log[256];
+-static char stdout_archive[256];
++static char stdout_log[MAXPATHLEN];
++static char stdout_archive[MAXPATHLEN];
+ static FILE* stdout_file;
+-static char stderr_log[256];
+-static char stderr_archive[256];
++static char stderr_log[MAXPATHLEN];
++static char stderr_archive[MAXPATHLEN];
+ static FILE* stderr_file;
+-static char boinc_dir[256];
+-static char boinc_install_dir[256];
++static char boinc_dir[MAXPATHLEN];
++static char boinc_install_dir[MAXPATHLEN];
+ static int boinc_proxy_enabled;
+ static char boinc_proxy[256];
+ static char symstore[256];
+@@ -306,7 +306,7 @@
+
+ // Store various pieces of inforation for future use.
+ if (flags & BOINC_DIAG_BOINCAPPLICATION) {
+- char buf[256];
++ char buf[MAXPATHLEN];
+ char proxy_address[256];
+ int proxy_port;
+ MIOFILE mf;
+@@ -331,13 +331,13 @@
+ mf.init_file(p);
+ while(mf.fgets(buf, sizeof(buf))) {
+ if (match_tag(buf, "</app_init_data>")) break;
+- else if (parse_str(buf, "<boinc_dir>", boinc_dir, 256)) continue;
+- else if (parse_str(buf, "<symstore>", symstore, 256)) continue;
++ else if (parse_str(buf, "<boinc_dir>", boinc_dir, sizeof(boinc_dir))) continue;
++ else if (parse_str(buf, "<symstore>", symstore, sizeof(symstore))) continue;
+ else if (match_tag(buf, "<use_http_proxy/>")) {
+ boinc_proxy_enabled = true;
+ continue;
+ }
+- else if (parse_str(buf, "<http_server_name>", proxy_address, 256)) continue;
++ else if (parse_str(buf, "<http_server_name>", proxy_address, sizeof(proxy_address))) continue;
+ else if (parse_int(buf, "<http_server_port>", proxy_port)) continue;
+ }
+ fclose(p);
+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));
+ if (retval) break;
+- sprintf(path, "%s/%s", dirpath, filename);
++ snprintf(path, sizeof(path), "%s/%s", dirpath, filename);
+ if (is_dir(path)) {
+ retval = client_clean_out_dir(path, NULL);
+ if (retval) final_retval = retval;
diff --git a/debian/patches/series b/debian/patches/series
index 0f086df..c2d99ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -65,3 +65,4 @@ Missing_libSched.patch
add_hardening_flags.patch
cmath_missing.patch
investigate_boinc_api.patch
+opendir_error_messages.patch
diff --git a/debian/rules b/debian/rules
index b1ff1e8..e97a3b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -269,11 +269,12 @@ override_dh_auto_clean:
rm -fr debian/boinc-amd-opencl debian/boinc-screensaver # for cases when this is not in debian/control
rm -f debian/boinc-screensaver.substvars debian/boinc-amd-opencl.substvars # dito
rm -f \
- lockfile \
+ boinc_lockfile lockfile \
doc/manpages/*.1 \
client/boinc.optimized \
update-boinc-applinks.1 \
aclocal.m4 \
+ config.h \
config.h.in \
configure \
compile \
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list