Hello community, here is the log from the commit of package remake for openSUSE:Factory checked in at 2018-02-15 19:31:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/remake (Old) and /work/SRC/openSUSE:Factory/.remake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "remake" Thu Feb 15 19:31:45 2018 rev:3 rq:576973 version:4.2.1_1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/remake/remake.changes 2018-02-06 16:47:18.697241336 +0100 +++ /work/SRC/openSUSE:Factory/.remake.new/remake.changes 2018-02-15 19:31:47.182160402 +0100 @@ -1,0 +2,11 @@ +Thu Feb 15 12:06:26 UTC 2018 - aloi...@gmx.com + +- Set license field back to GPL-3.0+ + +------------------------------------------------------------------- +Thu Feb 15 10:29:25 UTC 2018 - sch...@suse.de + +- glob-lstat.patch: Do not assume glibc glob internals +- glob-interface.patch: Support GLIBC glob interface version 2 + +------------------------------------------------------------------- New: ---- glob-interface.patch glob-lstat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ remake.spec ++++++ --- /var/tmp/diff_new_pack.7FcO73/_old 2018-02-15 19:31:47.930133555 +0100 +++ /var/tmp/diff_new_pack.7FcO73/_new 2018-02-15 19:31:47.930133555 +0100 @@ -27,6 +27,8 @@ Summary(de): Eine gnu make Version inklusive Debugger URL: http://bashdb.sourceforge.net/remake/ Source0: https://downloads.sourceforge.net/project/bashdb/remake/%{base_version}/remake-%{pkg_version}.tar.bz2 +Patch1: glob-lstat.patch +Patch2: glob-interface.patch BuildRequires: readline-devel Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} @@ -47,6 +49,8 @@ %prep %setup -q -n "%{name}-%{pkg_version}" +%patch1 -p1 +%patch2 -p1 %build %configure ++++++ glob-interface.patch ++++++ * configure.ac: Support GLIBC glob interface version 2 Index: make-4.2.1/configure =================================================================== --- make-4.2.1.orig/configure +++ make-4.2.1/configure @@ -11481,10 +11481,9 @@ else #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 Index: make-4.2.1/configure.ac =================================================================== --- make-4.2.1.orig/configure.ac +++ make-4.2.1/configure.ac @@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU g #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], ++++++ glob-lstat.patch ++++++ >From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001 From: Paul Eggert <egg...@cs.ucla.edu> Date: Sun, 24 Sep 2017 09:12:58 -0400 Subject: [PATCH] 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. --- dir.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dir.c b/dir.c index adbb8a9b99..c343e4c29c 100644 --- a/dir.c +++ b/dir.c @@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) } #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 = free; + gl->gl_lstat = local_lstat; gl->gl_stat = local_stat; - /* We don't bother setting gl_lstat, since glob never calls it. - The slot is only there for compatibility with 4.4 BSD. */ } void -- 2.15.0
