[boinc] 01/02: Fix 747964

[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 9b04285b60c1d552f7715d5441bbf06427219b7f
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue May 13 15:54:08 2014 +0200

    Fix 747964
---
 debian/changelog                |  8 ++++++++
 debian/patches/fix-747964.patch | 24 ++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a15197b..f1b8e06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+boinc (7.2.47+dfsg-3) UNRELEASED; urgency=medium
+
+  * Add return values to envargs function (Closes: #747964)
+    Note: upstream didn't apply this patch because it seems to be
+    unreachable code.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sun, 18 May 2014 20:58:51 +0200
+
 boinc (7.2.47+dfsg-2exp1) experimental; urgency=medium
 
   * Release to experimental
diff --git a/debian/patches/fix-747964.patch b/debian/patches/fix-747964.patch
new file mode 100644
index 0000000..baeaf4b
--- /dev/null
+++ b/debian/patches/fix-747964.patch
@@ -0,0 +1,24 @@
+Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Bug-Debian: http://bugs.debian.org/747964
+Forwarded: <yes>
+Last-Update: <2014-05-13>
+
+--- boinc-7.2.47+dfsg.orig/zip/zip/util.c
++++ boinc-7.2.47+dfsg/zip/zip/util.c
+@@ -825,7 +825,7 @@ void envargs(Pargc, Pargv, envstr, envst
+             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 @@ void envargs(Pargc, Pargv, envstr, envst
+     /* save the values and return */
+     *Pargv = argvect;
+     *Pargc = argc;
++    return 0;
+ }
+ 
+ local int count_args(s)
diff --git a/debian/patches/series b/debian/patches/series
index 53356eb..7cdfefa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -77,3 +77,4 @@ server_status_php.patch
 #db_interface_use.patch
 fix-lp-1274456.patch
 0001-Client-Unix-attempt-to-fix-freebsd-build-error.patch
+fix-747964.patch

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