[boinc] 01/03: dropped opendir_errno.patch

[Guo Yixuan]

This is an automated email from the git hooks/post-receive script.

yixuan-guest pushed a commit to branch master
in repository boinc.

commit fa9747203ff6b84fd63cb78d93f14a2a5b78d4da
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Mon Jun 23 23:43:50 2014 -0400

    dropped opendir_errno.patch
---
 debian/changelog                   |  1 +
 debian/patches/opendir_errno.patch | 72 --------------------------------------
 debian/patches/series              |  1 -
 3 files changed, 1 insertion(+), 73 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a64525..fb7ee69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ boinc (7.4.1+dfsg-1exp2) UNRELEASED; urgency=medium
 
   * Dropped ticket_1168_verifycerts.patch: the bug was already fixed.
   * Dropped investigate_boinc_api.patch: it's only for debugging.
+  * Dropped opendir_errno.patch: also only for debugging.
 
  -- Guo Yixuan (郭溢譞) <culu.gyx at gmail.com>  Mon, 23 Jun 2014 22:00:17 -0400
 
diff --git a/debian/patches/opendir_errno.patch b/debian/patches/opendir_errno.patch
deleted file mode 100644
index d62be8b..0000000
--- a/debian/patches/opendir_errno.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/client/check_security.cpp
-+++ b/client/check_security.cpp
-@@ -35,9 +35,9 @@
- #endif
- 
- 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,
-     int len
- );
- 
-@@ -491,9 +491,9 @@
- 
- 
- static int CheckNestedDirectories(
--    char * basepath, int depth,
-+    const char * const basepath, int depth,
-     int use_sandbox, int isManager, 
--    char * path_to_error, int len
-+    const char * const path_to_error, int len
- ) {
-     int             isDirectory;
-     char            full_path[MAXPATHLEN];
-@@ -503,6 +503,7 @@
-     dirent          *dp;
-     static int      errShown = 0;
- 
-+    errno=0;
-     dirp = opendir(basepath);
-     if (dirp == NULL) {
-         // Ideally, all project-created subdirectories under project or slot 
-@@ -512,6 +513,7 @@
-         // 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 {
-             retval = -1200;
---- a/client/cs_platforms.cpp
-+++ b/client/cs_platforms.cpp
-@@ -44,6 +44,7 @@
- #include <sys/sysctl.h>
- #endif
- 
-+#include <cerrno>
- #include "error_numbers.h"
- #include "filesys.h"
- #include "str_util.h"
-@@ -174,9 +175,17 @@
-                 int i;
-                 for (i=0; i < nlibdirs; i++) {
-                     struct dirent *entry;
-+                    errno=0;
-                     DIR *a = opendir(libdir[i]);
--                    // if dir doesn't exist, do the next one
--                    if (a == 0) continue;
-+                    if (a == 0) {
-+                      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;
-+                   }
-                     // 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/series b/debian/patches/series
index 659cbec..a6e9aa6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,7 +18,6 @@ opendir_error_messages.patch
 sched_driver_char_buffers.patch
 csh2tcsh.patch
 slot_dir_source_trace.patch
-opendir_errno.patch
 client_app_maxpathlen.patch
 #debian specific patches
 #boinclib_shared.patch #needed in order to make boinc build correctly otherwise it will FTBFS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git