[boinc] 01/01: Add patch for envargs

[Gianfranco Costamagna]

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

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

commit cb7ad0bc28dd2e488382704444d419ba3e713866
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Apr 3 10:42:21 2015 +0200

    Add patch for envargs
---
 debian/changelog             |  3 +++
 debian/patches/envargs.patch | 41 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 45 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4078ebf..72a4ab4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ boinc (7.4.42+dfsg-1exp1) experimental; urgency=medium
   * Make boinc Multi-Arch: same
   [ Vincent Danjean ]
   * fix gpu stuff (Closes: #763655)
+  [ Michael Tautschnig ]
+  * d/p/envargs.patch, fix inconsistencies spot with research compiler.
+    (Closes: #747964)
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 10 Dec 2014 14:00:28 +0100
 
diff --git a/debian/patches/envargs.patch b/debian/patches/envargs.patch
new file mode 100644
index 0000000..78d659b
--- /dev/null
+++ b/debian/patches/envargs.patch
@@ -0,0 +1,41 @@
+diff -urN a/zip/zip/util.c b/zip/zip/util.c
+--- a/zip/zip/util.c	2015-04-02 00:03:00.000000000 +0100
++++ b/zip/zip/util.c	2015-04-02 00:04:10.000000000 +0100
+@@ -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 0;
+ 
+     /* 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)
+diff -urN a/zip/zip/zip.h b/zip/zip/zip.h
+--- a/zip/zip/zip.h	2015-04-02 00:18:02.000000000 +0100
++++ b/zip/zip/zip.h	2015-04-02 00:18:58.000000000 +0100
+@@ -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));
diff --git a/debian/patches/series b/debian/patches/series
index 621a09a..aefc95f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,3 +33,4 @@ AdjustBoincTopdirPython.patch
 file_upload_handler_in_sched_linking.patch
 disable_silent_rules.patch
 coproc.patch
+envargs.patch

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