[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-49-g1c09225
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Mon Sep 17 19:53:58 UTC 2012
The following commit has been merged in the master branch:
commit 1c09225f41b80f732691493c2eaae989615d93aa
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Mon Sep 17 21:51:23 2012 +0200
Refreshed some patch, warning error fixed
modified: debian/patches/better_makefiles.patch
modified: debian/patches/more_maxpathlen.patch
modified: debian/patches/opendir_error_messages.patch
modified: debian/patches/slot_dir_source_trace.patch
diff --git a/debian/patches/better_makefiles.patch b/debian/patches/better_makefiles.patch
index e305cd3..c58dc93 100644
--- a/debian/patches/better_makefiles.patch
+++ b/debian/patches/better_makefiles.patch
@@ -3,8 +3,8 @@ Description: Better clean target for several Makefiles
This would save some rm's in override_dh_auto_clean.
Index: boinc/samples/sleeper/Makefile
===================================================================
---- boinc.orig/samples/sleeper/Makefile 2012-09-03 23:38:52.540022451 +0800
-+++ boinc/samples/sleeper/Makefile 2012-09-03 23:38:52.760022452 +0800
+--- boinc.orig/samples/sleeper/Makefile 2012-09-17 21:46:22.208746208 +0200
++++ boinc/samples/sleeper/Makefile 2012-09-17 21:46:22.428749121 +0200
@@ -19,11 +19,10 @@
libstdc++.a:
ln -s `g++ -print-file-name=libstdc++.a`
@@ -21,8 +21,8 @@ Index: boinc/samples/sleeper/Makefile
g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
Index: boinc/samples/worker/Makefile
===================================================================
---- boinc.orig/samples/worker/Makefile 2012-09-03 23:38:52.540022451 +0800
-+++ boinc/samples/worker/Makefile 2012-09-03 23:42:40.068022649 +0800
+--- boinc.orig/samples/worker/Makefile 2012-09-17 21:46:22.212746265 +0200
++++ boinc/samples/worker/Makefile 2012-09-17 21:46:22.428749121 +0200
@@ -4,11 +4,10 @@
all: $(PROGS)
@@ -39,8 +39,8 @@ Index: boinc/samples/worker/Makefile
g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o worker worker.o
Index: boinc/samples/wrapper/Makefile
===================================================================
---- boinc.orig/samples/wrapper/Makefile 2012-09-03 23:38:52.540022451 +0800
-+++ boinc/samples/wrapper/Makefile 2012-09-03 23:39:50.908022502 +0800
+--- boinc.orig/samples/wrapper/Makefile 2012-09-17 21:46:22.212746265 +0200
++++ boinc/samples/wrapper/Makefile 2012-09-17 21:46:22.432749185 +0200
@@ -21,11 +21,10 @@
libstdc++.a:
ln -s `g++ -print-file-name=libstdc++.a`
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 6019d5b..58b6d9b 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -62,7 +62,7 @@ Index: boinc/lib/filesys.cpp
===================================================================
--- boinc.orig/lib/filesys.cpp 2012-09-16 21:27:07.901956127 +0200
+++ boinc/lib/filesys.cpp 2012-09-16 21:30:01.147609631 +0200
-@@ -430,7 +430,7 @@
+@@ -426,7 +426,7 @@
while (1) {
retval = dir_scan(filename, dirp, sizeof(filename));
if (retval) break;
@@ -71,7 +71,7 @@ Index: boinc/lib/filesys.cpp
if (is_dir(subdir)) {
if (recurse) {
-@@ -548,8 +548,8 @@
+@@ -544,8 +544,8 @@
}
return 0;
#elif defined(__EMX__)
@@ -82,7 +82,7 @@ Index: boinc/lib/filesys.cpp
return system(cmd);
#else
// POSIX requires that shells run from an application will use the
-@@ -659,11 +659,11 @@
+@@ -655,11 +655,11 @@
// create directories dirpath/a, dirpath/a/b etc.
//
int boinc_make_dirs(const char* dirpath, const char* filepath) {
@@ -96,7 +96,7 @@ Index: boinc/lib/filesys.cpp
strcpy(buf, filepath);
strcpy(oldpath, dirpath);
-@@ -672,7 +672,7 @@
+@@ -668,7 +668,7 @@
p = strchr(q, '/');
if (!p) break;
*p = 0;
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
index 4843c5d..81be230 100644
--- a/debian/patches/opendir_error_messages.patch
+++ b/debian/patches/opendir_error_messages.patch
@@ -1,7 +1,33 @@
+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);
+ // 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 (lstat(orig, &sbuf)) retval=ERR_FWRITE; // Get source file's info
++ 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-09-15 18:20:16.772373551 +0200
-+++ boinc/lib/diagnostics.cpp 2012-09-16 21:27:07.905956075 +0200
+--- 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;
@@ -51,8 +77,8 @@ Index: boinc/lib/diagnostics.cpp
fclose(p);
Index: boinc/client/sandbox.cpp
===================================================================
---- boinc.orig/client/sandbox.cpp 2012-09-15 18:20:12.456431003 +0200
-+++ boinc/client/sandbox.cpp 2012-09-16 21:27:07.909956022 +0200
+--- 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.
//
@@ -71,43 +97,3 @@ Index: boinc/client/sandbox.cpp
if (is_dir(path)) {
retval = client_clean_out_dir(path, NULL);
if (retval) final_retval = retval;
-Index: boinc/lib/filesys.cpp
-===================================================================
---- boinc.orig/lib/filesys.cpp 2012-09-16 21:27:05.345990748 +0200
-+++ boinc/lib/filesys.cpp 2012-09-16 21:30:20.047353633 +0200
-@@ -367,8 +367,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
-+ 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;
-@@ -578,9 +582,9 @@
- fclose(src);
- 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 (lstat(orig, &sbuf)) retval=ERR_FWRITE; // Get source file's info
-+ if (chown(newf, sbuf.st_uid, sbuf.st_gid)) retval=ERR_FWRITE;
-+ if (chmod(newf, sbuf.st_mode)) retval=ERR_FWRITE;
- return retval;
- #endif
- }
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index f13559a..12a427b 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -188,7 +188,7 @@ Index: boinc/lib/filesys.cpp
char filename[MAXPATHLEN], path[MAXPATHLEN];
int retval;
DIRREF dirp;
-@@ -617,7 +619,7 @@
+@@ -613,7 +615,7 @@
// make a dir that's owner and group RWX
//
@@ -197,7 +197,7 @@ Index: boinc/lib/filesys.cpp
if (is_dir(path)) return 0;
#ifdef _WIN32
if (!CreateDirectoryA(path, NULL)) {
-@@ -632,7 +634,7 @@
+@@ -628,7 +630,7 @@
return 0;
}
@@ -206,7 +206,7 @@ Index: boinc/lib/filesys.cpp
#ifdef _WIN32
if (!RemoveDirectoryA(name)) {
return ERR_RMDIR;
-@@ -645,7 +647,7 @@
+@@ -641,7 +643,7 @@
}
#ifndef _WIN32
@@ -215,7 +215,7 @@ Index: boinc/lib/filesys.cpp
if (gid) {
if (chown(path, (uid_t)-1, gid)) {
return ERR_CHOWN;
-@@ -658,7 +660,7 @@
+@@ -654,7 +656,7 @@
// if "filepath" is of the form a/b/c,
// create directories dirpath/a, dirpath/a/b etc.
//
@@ -224,7 +224,7 @@ Index: boinc/lib/filesys.cpp
char buf[MAXPATHLEN*2], oldpath[MAXPATHLEN], newpath[MAXPATHLEN];
int retval;
char *p, *q;
-@@ -725,7 +727,7 @@
+@@ -721,7 +723,7 @@
return 0;
}
@@ -233,7 +233,7 @@ Index: boinc/lib/filesys.cpp
#if defined(_WIN32) && !defined(__CYGWIN32__)
CloseHandle(handle);
#else
-@@ -737,7 +739,7 @@
+@@ -733,7 +735,7 @@
return 0;
}
@@ -242,7 +242,7 @@ Index: boinc/lib/filesys.cpp
#ifdef _WIN32
getcwd(path, MAXPATHLEN);
#else
-@@ -749,7 +751,7 @@
+@@ -745,7 +747,7 @@
#endif
}
@@ -251,7 +251,7 @@ Index: boinc/lib/filesys.cpp
boinc_getcwd(path);
if (strlen(relname)) {
strcat(path, "/");
-@@ -760,7 +762,7 @@
+@@ -756,7 +758,7 @@
// get total and free space on current filesystem (in bytes)
//
#ifdef _WIN32
@@ -260,7 +260,7 @@ Index: boinc/lib/filesys.cpp
char cwd[MAXPATHLEN];
boinc_getcwd(cwd);
FreeFn pGetDiskFreeSpaceEx;
-@@ -793,7 +795,7 @@
+@@ -789,7 +791,7 @@
total_space = (double)dwTotalClusters * dwSectPerClust * dwBytesPerSect;
}
#else
@@ -269,7 +269,7 @@ Index: boinc/lib/filesys.cpp
#ifdef STATFS
struct STATFS fs_info;
-@@ -814,7 +816,7 @@
+@@ -810,7 +812,7 @@
#ifndef _WIN32
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list