[boinc] 01/01: No really need to fix 747964, dropping patch

[Gianfranco Costamagna]

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

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

commit 636f896ba1292d6f382186d761058cea75a317aa
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Jun 24 21:31:10 2014 +0200

    No really need to fix 747964, dropping patch
---
 debian/changelog                |  5 +++++
 debian/patches/fix-747964.patch | 44 -----------------------------------------
 2 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a33f200..115943f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 boinc (7.4.1+dfsg-1exp2) UNRELEASED; urgency=medium
 
+  [ Guo Yixuan (郭溢譞) ]
   * Dropped ticket_1168_verifycerts.patch: the bug was already fixed.
   * Dropped several debugging-only patches:
     - investigate_boinc_api.patch
@@ -8,6 +9,10 @@ boinc (7.4.1+dfsg-1exp2) UNRELEASED; urgency=medium
     - slot_dir_source_trace.patch
     - improve_opendir_warning.patch
 
+  [ Gianfranco Costamagna ]
+  * Dropped fix-747964.patch (Reopen: #747964)
+    Upstream says this is unreachable code, no need to fix.
+
  -- Guo Yixuan (郭溢譞) <culu.gyx at gmail.com>  Mon, 23 Jun 2014 22:00:17 -0400
 
 boinc (7.4.1+dfsg-1exp1) experimental; urgency=medium
diff --git a/debian/patches/fix-747964.patch b/debian/patches/fix-747964.patch
deleted file mode 100644
index fff2021..0000000
--- a/debian/patches/fix-747964.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-Bug-Debian: http://bugs.debian.org/747964
-Forwarded: <yes>
-Last-Update: <2014-05-13>
-
---- a/zip/zip/util.c
-+++ b/zip/zip/util.c
-@@ -802,7 +802,7 @@
-  |     to make the action of the code less obscure.
-  ****************************************************************/
- 
--void envargs(Pargc, Pargv, envstr, envstr2)
-+int envargs(Pargc, Pargv, envstr, envstr2)
-     int *Pargc;
-     char ***Pargv;
-     char *envstr;
-@@ -825,7 +825,7 @@
-             while (isspace((uch)*envptr))
-                 envptr++;
-     if (envptr == NULL || *envptr == '\0')
--        return;
-+        return 2;
- 
-     /* count the args so we can allocate room for them */
-     argc = count_args(envptr);
-@@ -902,6 +902,7 @@
-     /* save the values and return */
-     *Pargv = argvect;
-     *Pargc = argc;
-+    return 0;
- }
- 
- local int count_args(s)
---- a/zip/zip/zip.h
-+++ b/zip/zip/zip.h
-@@ -811,7 +811,7 @@
- 
- zvoid far **search OF((ZCONST zvoid *, ZCONST zvoid far **, extent,
-                        int (*)(ZCONST zvoid *, ZCONST zvoid far *)));
--void envargs       OF((int *, char ***, char *, char *));
-+int  envargs       OF((int *, char ***, char *, char *));
- void expand_args   OF((int *, char ***));
- 
- int  is_text_buf   OF((ZCONST char *buf_ptr, unsigned buf_size));

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