[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5d1e95eb4ab448164889b7eb428ef2cc8bbec76b

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 7601 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  5d1e95eb4ab448164889b7eb428ef2cc8bbec76b (commit)
       via  b63b4814fdba87e9c2bdca5fdc905de737f42a4b (commit)
       via  a41c6c9b483c9d9a6144131e21a593219648b53c (commit)
      from  41388a63395686ab690b4e98e75732f00a2678d3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5d1e95eb4ab448164889b7eb428ef2cc8bbec76b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 9 11:22:40 2018 +0000

    make: Fix SEGV with glibc >= 2.26
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b63b4814fdba87e9c2bdca5fdc905de737f42a4b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Feb 6 21:35:11 2018 +0000

    iproute2: Update to 4.15.0
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit a41c6c9b483c9d9a6144131e21a593219648b53c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Feb 6 21:28:15 2018 +0000

    ccache: Update to version 3.3.6
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 ccache/ccache.nm                             | 10 ++---
 iproute2/iproute2.nm                         | 12 ++---
 make/make.nm                                 | 12 ++++-
 make/patches/make-4.2.1-glob-SEGV.patch      | 67 ++++++++++++++++++++++++++++
 make/patches/make-4.2.1-glob-build-fix.patch | 11 +++++
 5 files changed, 96 insertions(+), 16 deletions(-)
 create mode 100644 make/patches/make-4.2.1-glob-SEGV.patch
 create mode 100644 make/patches/make-4.2.1-glob-build-fix.patch

Difference in files:
diff --git a/ccache/ccache.nm b/ccache/ccache.nm
index e3f72e7cc..2ae7631a0 100644
--- a/ccache/ccache.nm
+++ b/ccache/ccache.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = ccache
-version    = 3.3.3
+version    = 3.3.6
 release    = 1
 
 groups     = Development/Compilers
@@ -31,10 +31,7 @@ build
 		zlib-devel
 	end
 
-	CCACHE_CACHE = /var/cache/ccache
-
-	configure_options += \
-		--mandir=/usr/share/man
+	CCACHE_CACHE = %{localstatedir}/cache/ccache
 
 	prepare_cmds
 		# Disable pch test that fails
@@ -45,8 +42,7 @@ build
 	end
 
 	test
-		# The test suite fails with GCC 6
-		: #SHELL=/bin/bash make check
+		make check
 	end
 
 	install_cmds
diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm
index 7ae96e931..17abdda18 100644
--- a/iproute2/iproute2.nm
+++ b/iproute2/iproute2.nm
@@ -4,11 +4,11 @@
 ###############################################################################
 
 name       = iproute2
-version    = 4.12.0
+version    = 4.15.0
 release    = 1
 
 groups     = Networking/Tools
-url        = http://www.linuxfoundation.org/en/Net:Iproute2
+url        = https://git.kernel.org/pub/scm/network/iproute2/iproute2.git
 license    = GPLv2+
 summary    = Advanced IP routing and network device configuration tools.
 
@@ -18,7 +18,7 @@ description
 	capabilities of the Linux 2.4.x and 2.6.x kernel.
 end
 
-source_dl  = http://kernel.org/pub/linux/utils/net/iproute2/
+source_dl  = https://kernel.org/pub/linux/utils/net/iproute2/
 sources    = %{thisapp}.tar.xz
 
 build
@@ -30,10 +30,6 @@ build
 		linux-atm-devel >= 2.5.1
 	end
 
-	prepare_cmds
-		sed -e "s/^LIBDIR=/LIBDIR?=/" -i Makefile
-	end
-
 	export RPM_OPT_FLAGS = %{CFLAGS} %{LDFLAGS}
 	export LIBDIR = %{libdir}
 	export SBINDIR = %{sbindir}
@@ -45,7 +41,7 @@ build
 		install -v -m 644 lib/libnetlink.a %{BUILDROOT}%{libdir}
 	end
 
-	# Keep libnetlink.a.
+	# Keep libnetlink.a
 	keep_libraries
 		%{libdir}/libnetlink.a
 	end
diff --git a/make/make.nm b/make/make.nm
index 84a60f845..6a684191e 100644
--- a/make/make.nm
+++ b/make/make.nm
@@ -5,7 +5,7 @@
 
 name       = make
 version    = 4.2.1
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = Development/Tools
@@ -25,6 +25,16 @@ end
 source_dl  = http://ftp.gnu.org/gnu/make/
 
 build
+	requires
+		autoconf
+		automake
+		gettext-devel
+	end
+
+	prepare_cmds
+		autoreconf -vfi
+	end
+
 	test
 		make check
 	end
diff --git a/make/patches/make-4.2.1-glob-SEGV.patch b/make/patches/make-4.2.1-glob-SEGV.patch
new file mode 100644
index 000000000..911e3152e
--- /dev/null
+++ b/make/patches/make-4.2.1-glob-SEGV.patch
@@ -0,0 +1,67 @@
+From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert(a)cs.ucla.edu>
+Date: Sun, 24 Sep 2017 09:12:58 -0400
+Subject: 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 adbb8a9..c343e4c 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
+-- 
+cgit v1.0-41-gc330
+
diff --git a/make/patches/make-4.2.1-glob-build-fix.patch b/make/patches/make-4.2.1-glob-build-fix.patch
new file mode 100644
index 000000000..d5303b053
--- /dev/null
+++ b/make/patches/make-4.2.1-glob-build-fix.patch
@@ -0,0 +1,11 @@
+--- make-4.2.1/configure.ac~	2018-02-08 12:31:17.105922978 +0000
++++ make-4.2.1/configure.ac	2018-02-08 12:31:35.249509647 +0000
+@@ -402,7 +402,7 @@ AC_CACHE_CHECK([if system libc has GNU g
+ #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 >= GLOB_INTERFACE_VERSION
+    gnu glob
+ # endif
+ #endif],


hooks/post-receive
--
IPFire 3.x development tree