Merge from bittboy/buildroot@26c91a9

package/apr/0002-sys-param-h.patch

@@ -0,0 +1,39 @@
+Fix PATH_MAX detection by including sys/param.h if available
+
+Patch sent upstream:
+https://bz.apache.org/bugzilla/show_bug.cgi?id=63782
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -uNr apr-1.7.0.orig/configure.in apr-1.7.0/configure.in
+--- apr-1.7.0.orig/configure.in	2019-04-01 19:40:46.000000000 +0200
++++ apr-1.7.0/configure.in	2019-09-29 17:03:41.803326791 +0200
+@@ -1586,6 +1586,7 @@
+ AC_SUBST(stringh)
+ AC_SUBST(stringsh)
+ AC_SUBST(sys_ioctlh)
++AC_SUBST(sys_paramh)
+ AC_SUBST(sys_sendfileh)
+ AC_SUBST(sys_signalh)
+ AC_SUBST(sys_socketh)
+diff -uNr apr-1.7.0.orig/include/apr.h.in apr-1.7.0/include/apr.h.in
+--- apr-1.7.0.orig/include/apr.h.in	2019-03-22 14:30:31.000000000 +0100
++++ apr-1.7.0/include/apr.h.in	2019-09-29 17:04:54.203815469 +0200
+@@ -95,6 +95,7 @@
+ #define APR_HAVE_STRINGS_H       @stringsh@
+ #define APR_HAVE_INTTYPES_H      @inttypesh@
+ #define APR_HAVE_SYS_IOCTL_H     @sys_ioctlh@
++#define APR_HAVE_SYS_PARAM_H     @sys_paramh@
+ #define APR_HAVE_SYS_SENDFILE_H  @sys_sendfileh@
+ #define APR_HAVE_SYS_SIGNAL_H    @sys_signalh@
+ #define APR_HAVE_SYS_SOCKET_H    @sys_socketh@
+@@ -206,6 +207,9 @@
+ #include <sys/syslimits.h>
+ #endif
+ #endif
++#if APR_HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ 
+ /* __APPLE__ is now the official pre-defined macro for macOS */
+ #ifdef __APPLE__

package/apr/apr.hash

@@ -1,4 +1,4 @@
-# From http://www.apache.org/dist/apr/apr-1.6.3.tar.bz2.sha256
-sha256 131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172  apr-1.6.3.tar.bz2
+# From http://archive.apache.org/dist/apr/apr-1.7.0.tar.bz2.sha256
+sha256 e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea  apr-1.7.0.tar.bz2
 # Locally calculated
 sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad  LICENSE

package/apr/apr.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-APR_VERSION = 1.6.3
+APR_VERSION = 1.7.0
 APR_SOURCE = apr-$(APR_VERSION).tar.bz2
 APR_SITE = http://archive.apache.org/dist/apr
 APR_LICENSE = Apache-2.0
@@ -14,9 +14,18 @@ APR_INSTALL_STAGING = YES
 # so we need to autoreconf:
 APR_AUTORECONF = YES
 
+# avoid apr_hints.m4 by setting apr_preload_done=yes and set
+# the needed CFLAGS on our own (avoids '-D_REENTRANT' in case
+# not supported by toolchain and subsequent configure failure)
+APR_CFLAGS = $(TARGET_CFLAGS) -DLINUX -D_GNU_SOURCE
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+APR_CFLAGS += -D_REENTRANT
+endif
+
 APR_CONF_ENV = \
 	CC_FOR_BUILD="$(HOSTCC)" \
 	CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
+	CFLAGS="$(APR_CFLAGS)" \
 	ac_cv_file__dev_zero=yes \
 	ac_cv_func_setpgrp_void=yes \
 	apr_cv_process_shared_works=yes \
@@ -31,7 +40,8 @@ APR_CONF_ENV = \
 	apr_cv_epoll_create1=yes \
 	apr_cv_dup3=yes \
 	apr_cv_sock_cloexec=yes \
-	apr_cv_accept4=yes
+	apr_cv_accept4=yes \
+	apr_preload_done=yes
 APR_CONFIG_SCRIPTS = apr-1-config
 
 # Doesn't even try to guess when cross compiling
@@ -42,15 +52,10 @@ endif
 # Fix lfs detection when cross compiling
 APR_CONF_ENV += apr_cv_use_lfs64=yes
 
-# Use non-portable atomics when available: 8 bytes atomics are used on
-# 64-bits architectures, 4 bytes atomics on 32-bits architectures. We
-# have to override ap_cv_atomic_builtins because the test used to
-# check for atomic builtins uses AC_TRY_RUN, which doesn't work when
-# cross-compiling.
-ifeq ($(BR2_ARCH_IS_64):$(BR2_TOOLCHAIN_HAS_SYNC_8),y:y)
-APR_CONF_OPTS += --enable-nonportable-atomics
-APR_CONF_ENV += ap_cv_atomic_builtins=yes
-else ifeq ($(BR2_ARCH_IS_64):$(BR2_TOOLCHAIN_HAS_SYNC_4),:y)
+# Use non-portable atomics when available. We have to override
+# ap_cv_atomic_builtins because the test used to  check for atomic
+# builtins uses AC_TRY_RUN, which doesn't work when cross-compiling.
+ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8),y)
 APR_CONF_OPTS += --enable-nonportable-atomics
 APR_CONF_ENV += ap_cv_atomic_builtins=yes
 else