[boinc] 04/07: Update patches
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Tue Feb 23 16:53:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository boinc.
commit ae9678894201ef5e1e5e9517db3f4571e8cc4d86
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Feb 23 17:29:41 2016 +0100
Update patches
---
debian/changelog | 7 ++++
debian/patches/MainDocumentWarnings.patch | 6 +--
debian/patches/disable_new_version_check.patch | 4 +-
debian/patches/filesys_error_message.patch | 4 +-
debian/patches/fopen_closing.patch | 2 +-
debian/patches/more_clang_warnings.patch | 2 +-
debian/patches/more_maxpathlen.patch | 51 ++------------------------
7 files changed, 19 insertions(+), 57 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 392e378..d9181d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boinc (7.6.28+dfsg-1) unstable; urgency=medium
+
+ * Upload to unstable.
+ * New upstream release, patch refresh.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 23 Feb 2016 17:28:44 +0100
+
boinc (7.6.25+dfsg-2exp1) experimental; urgency=medium
* Upload to experimental again, with the boinc-server-* packages.
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index 8801cee..d93eeb4 100644
--- a/debian/patches/MainDocumentWarnings.patch
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -2,7 +2,7 @@ Author: Steffen Moeller <moeller at debian.org>
Description: Nothing in this patch should be functionally relevant, only compile time warnings as by the ambiguity of the result parameter are resolved.
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
-@@ -1666,7 +1666,6 @@
+@@ -1667,7 +1667,6 @@
}
#else
void CMainDocument::KillGraphicsApp(int pid) {
@@ -10,7 +10,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
char currentDir[1024];
char thePIDbuf[20];
int id, iRetVal;
-@@ -1674,12 +1673,13 @@
+@@ -1675,12 +1674,13 @@
if (g_use_sandbox) {
snprintf(thePIDbuf, sizeof(thePIDbuf), "%d", pid);
@@ -30,7 +30,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
iRetVal = run_program(
getcwd(currentDir, sizeof(currentDir)),
-@@ -1689,6 +1689,10 @@
+@@ -1690,6 +1690,10 @@
0,
id
);
diff --git a/debian/patches/disable_new_version_check.patch b/debian/patches/disable_new_version_check.patch
index 1fc26d5..f836c12 100644
--- a/debian/patches/disable_new_version_check.patch
+++ b/debian/patches/disable_new_version_check.patch
@@ -12,7 +12,7 @@ Last-Update: <2013-03-07>
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
-@@ -602,7 +602,7 @@
+@@ -606,7 +606,7 @@
// inform the user if there's a newer version of client
//
@@ -23,7 +23,7 @@ Last-Update: <2013-03-07>
// now that we know the host's venue on each project
--- a/client/scheduler_op.cpp
+++ b/client/scheduler_op.cpp
-@@ -134,7 +134,7 @@
+@@ -138,7 +138,7 @@
// and project list
//
if (!cc_config.no_info_fetch) {
diff --git a/debian/patches/filesys_error_message.patch b/debian/patches/filesys_error_message.patch
index 1eda2de..318289e 100644
--- a/debian/patches/filesys_error_message.patch
+++ b/debian/patches/filesys_error_message.patch
@@ -1,7 +1,7 @@
Description: this patch adds an useful error message in case of dir open failure.
--- a/lib/filesys.cpp
+++ b/lib/filesys.cpp
-@@ -146,7 +146,12 @@ DIRREF dir_open(const char* p) {
+@@ -147,7 +147,12 @@ DIRREF dir_open(const char* p) {
dirp->handle = INVALID_HANDLE_VALUE;
#else
dirp = opendir(p);
@@ -15,7 +15,7 @@ Description: this patch adds an useful error message in case of dir open failure
#endif
return dirp;
}
-@@ -634,7 +639,7 @@ static int boinc_rename_aux(const char*
+@@ -650,7 +655,7 @@ static int boinc_rename_aux(const char*
//
int retval = rename(old, newf);
if (retval) {
diff --git a/debian/patches/fopen_closing.patch b/debian/patches/fopen_closing.patch
index c571da0..65c27d8 100644
--- a/debian/patches/fopen_closing.patch
+++ b/debian/patches/fopen_closing.patch
@@ -63,7 +63,7 @@ Description: this patch makes boinc correctly close the open files.
} else {
--- a/lib/mfile.cpp
+++ b/lib/mfile.cpp
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,7 @@
}
MFILE::~MFILE() {
diff --git a/debian/patches/more_clang_warnings.patch b/debian/patches/more_clang_warnings.patch
index 788a7d8..ad77b6f 100644
--- a/debian/patches/more_clang_warnings.patch
+++ b/debian/patches/more_clang_warnings.patch
@@ -1,7 +1,7 @@
Description: adding another error check.
--- a/lib/shmem.cpp
+++ b/lib/shmem.cpp
-@@ -337,7 +337,10 @@
+@@ -339,7 +339,10 @@
// area to all zeros because they write beyond the old EOF.
// See the lseek man page for details.
lseek(fd, size-1, SEEK_SET);
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 989c6ef..1c945f6 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -21,57 +21,12 @@ Description: use MAXPATHLEN and change sprintf to snprintf
--- a/lib/filesys.cpp
+++ b/lib/filesys.cpp
-@@ -441,7 +441,7 @@
- while (1) {
- retval = dir_scan(filename, dirp, sizeof(filename));
- if (retval) break;
-- sprintf(subdir, "%s/%s", dirpath, filename);
-+ snprintf(subdir, sizeof(subdir), "%s/%s", dirpath, filename);
-
- if (is_dir(subdir)) {
- if (recurse) {
-@@ -567,8 +567,8 @@
+@@ -581,7 +581,7 @@ int boinc_copy(const char* orig, const char* newf) {
}
return 0;
#elif defined(__EMX__)
- 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);
+ snprintf(cmd, sizeof(cmd), "copy \"%s\" \"%s\"", orig, newf);
+ cmd[sizeof(cmd)-1] = 0;
return system(cmd);
- #else
- // POSIX requires that shells run from an application will use the
-@@ -719,7 +719,7 @@
- p = strchr(q, '/');
- if (!p) break;
- *p = 0;
-- sprintf(newpath, "%s/%s", oldpath, q);
-+ snprintf(newpath, sizeof(newpath), "%s/%s", oldpath, q);
- retval = boinc_mkdir(newpath);
- if (retval) return retval;
- safe_strcpy(oldpath, newpath);
---- a/lib/network.cpp
-+++ b/lib/network.cpp
-@@ -73,7 +73,7 @@
- case WSAENOTSOCK:
- return "not a socket";
- }
-- sprintf(buf, "error %d", e);
-+ snprintf(buf, sizeof(buf), "error %d", e);
- return buf;
- #else
- switch (h_errno) {
-@@ -87,11 +87,11 @@
- return "host not found or server failure";
- #ifdef NETDB_INTERNAL
- case NETDB_INTERNAL:
-- sprintf(buf,"network internal error %d",errno);
-+ snprintf(buf, sizeof(buf), "network internal error %d",errno);
- return buf;
- #endif
- }
-- sprintf(buf, "error %d", h_errno);
-+ snprintf(buf, sizeof(buf), "error %d", h_errno);
- return buf;
- #endif
- }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list