[Pkg-virtualbox-commits] [kbuild] 01/02: Add new patch from make-dfsg

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository kbuild.

commit 285ede6808eb7d4bf5be40db8880cca3a2a89ad9
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date:   Mon Mar 5 16:31:18 2018 +0100

    Add new patch from make-dfsg
---
 debian/patches/make-dfsg-glob-glibc227.diff | 86 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 2 files changed, 87 insertions(+)

diff --git a/debian/patches/make-dfsg-glob-glibc227.diff b/debian/patches/make-dfsg-glob-glibc227.diff
new file mode 100644
index 0000000..e6a944b
--- /dev/null
+++ b/debian/patches/make-dfsg-glob-glibc227.diff
@@ -0,0 +1,86 @@
+commit 48c8a116a914a325a0497721f5d8b58d5bba34d4
+Author: Paul Smith <psmith at gnu.org>
+Date:   Sun Nov 19 15:09:16 2017 -0500
+
+    * configure.ac: Support GLIBC glob interface version 2
+
+commit 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4
+Author: Paul Eggert <eggert at cs.ucla.edu>
+Date:   Sun Sep 24 09:12:58 2017 -0400
+
+    glob: Do not assume glibc glob internals.
+    
+    It has been proposed that glibc glob start using gl_lstat,
+    which the API allows it to do.  GNU 'make' should not get in
+    the way of this.  See:
+    https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
+    
+    * dir.c (local_lstat): New function, like local_stat.
+    (dir_setup_glob): Use it to initialize gl_lstat too, as the API
+    requires.
+
+--- kbuild-0.1.9998svn3127+dfsg.orig/src/kmk/configure.in
++++ kbuild-0.1.9998svn3127+dfsg/src/kmk/configure.in
+@@ -360,10 +360,9 @@ AC_CACHE_VAL(make_cv_sys_gnu_glob, [
+ #include <glob.h>
+ #include <fnmatch.h>
+ 
+-#define GLOB_INTERFACE_VERSION 1
+ #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
+ # include <gnu-versions.h>
+-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
+    gnu glob
+ # endif
+ #endif
+--- kbuild-0.1.9998svn3127+dfsg.orig/src/kmk/dir.c
++++ kbuild-0.1.9998svn3127+dfsg/src/kmk/dir.c
+@@ -1465,12 +1465,39 @@ static int dir_exists_p (const char *dir
+ }
+ #endif
+ 
++/* Similarly for lstat.  */
++#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
++# ifndef VMS
++#  ifndef HAVE_SYS_STAT_H
++int lstat (const char *path, struct stat *sbuf);
++#  endif
++# else
++    /* We are done with the fake lstat.  Go back to the real lstat */
++#   ifdef lstat
++#     undef lstat
++#   endif
++# endif
++# define local_lstat lstat
++#elif defined(WINDOWS32)
++/* Windows doesn't support lstat().  */
++# define local_lstat local_stat
++#else
++static int
++local_lstat (const char *path, struct stat *buf)
++{
++  int e;
++  EINTRLOOP (e, lstat (path, buf));
++  return e;
++}
++#endif
++
+ void
+ dir_setup_glob (glob_t *gl)
+ {
+   gl->gl_opendir = open_dirstream;
+   gl->gl_readdir = read_dirstream;
+   gl->gl_closedir = ansi_free;
++  gl->gl_lstat = local_lstat;
+   gl->gl_stat = local_stat;
+ #ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */
+   gl->gl_lstat = local_stat;
+@@ -1479,8 +1506,6 @@ dir_setup_glob (glob_t *gl)
+   gl->gl_exists = file_exists_p;
+   gl->gl_isdir = dir_exists_p;
+ #endif
+-  /* We don't bother setting gl_lstat, since glob never calls it.
+-     The slot is only there for compatibility with 4.4 BSD.  */
+ }
+ 
+ void
diff --git a/debian/patches/series b/debian/patches/series
index 58ebb3d..827f696 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 07_special-chars-build-path.diff
 09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch
+make-dfsg-glob-glibc227.diff

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