vars/build.vars: updated apr to v1.6.2 and apr-util to v1.6.0.

patches/apr-1.6.2.local.patch: rediff'd.
patches/apr-util-1.6.0.local.patch: rediff'd.

3 files changed, 56 insertions, 56 deletions

diff --git a/patches/apr-1.5.2.local.patch b/patches/apr-1.6.2.local.patch
index e96002f5..472dbc45 100644
--- a/patches/apr-1.5.2.local.patch
+++ b/patches/apr-1.6.2.local.patch
@@ -1,44 +1,5 @@
-diff -ru --new-file apr-1.5.2.orig/include/private/apr_escape_test_char.h apr-1.5.2/include/private/apr_escape_test_char.h
---- apr-1.5.2.orig/include/private/apr_escape_test_char.h	1970-01-01 01:00:00.000000000 +0100
-+++ apr-1.5.2/include/private/apr_escape_test_char.h	2017-01-26 04:54:14.025668783 +0100
-@@ -0,0 +1,23 @@
-+/* generated natively */
-+#define T_ESCAPE_SHELL_CMD     (1)
-+#define T_ESCAPE_PATH_SEGMENT  (2)
-+#define T_OS_ESCAPE_PATH       (4)
-+#define T_ESCAPE_ECHO          (8)
-+#define T_ESCAPE_URLENCODED    (16)
-+#define T_ESCAPE_XML           (32)
-+
-+static const unsigned char test_char_table[256] = {
-+    32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30,
-+    30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17,
-+    17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23,
-+    55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30,
-+    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
-+    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
-+    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
-+    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
-+    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
-+    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30 
-+};
-diff -ru apr-1.5.2.orig/network_io/unix/sendrecv.c apr-1.5.2/network_io/unix/sendrecv.c
---- apr-1.5.2.orig/network_io/unix/sendrecv.c	2013-10-21 13:57:36.000000000 +0200
-+++ apr-1.5.2/network_io/unix/sendrecv.c	2017-02-02 00:52:39.903022000 +0100
-@@ -252,7 +252,7 @@
- /* Define a structure to pass in when we have a NULL header value */
- static apr_hdtr_t no_hdtr;
- 
--#if (defined(__linux__) || defined(__GNU__)) && defined(HAVE_WRITEV)
-+#if (defined(__linux__) || defined(__GNU__)) || defined(__midipix__) && defined(HAVE_WRITEV)
- 
- apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
-                                  apr_hdtr_t *hdtr, apr_off_t *offset,
---- apr-1.5.2/Makefile.in.orig	2014-04-25 10:51:11.000000000 +0000
-+++ apr-1.5.2/Makefile.in	2017-02-13 09:58:16.230193677 +0000
+--- apr-1.6.2/Makefile.in.orig	2017-05-31 17:04:18.000000000 +0200
++++ apr-1.6.2/Makefile.in	2017-08-03 16:20:20.174740106 +0200
 @@ -46,8 +46,7 @@
  
  CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
@@ -70,10 +31,10 @@ diff -ru apr-1.5.2.orig/network_io/unix/sendrecv.c apr-1.5.2/network_io/unix/sen
 -	    $(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
 -	done
 -	$(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
+ 	$(INSTALL_DATA) $(top_srcdir)/build/apr_common.m4 $(DESTDIR)$(installbuilddir)
+ 	$(INSTALL_DATA) $(top_srcdir)/build/find_apr.m4 $(DESTDIR)$(installbuilddir)
  	$(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
- 	@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
-             for i in $(INSTALL_SUBDIRS); do \
-@@ -129,18 +120,6 @@
+@@ -131,18 +122,6 @@
  etags:
  	etags `find . -name '*.[ch]'`
  
@@ -92,3 +53,42 @@ diff -ru apr-1.5.2.orig/network_io/unix/sendrecv.c apr-1.5.2/network_io/unix/sen
  LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
  	    @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
  
+--- apr-1.6.2/network_io/unix/sendrecv.c.orig	2013-10-21 13:57:36.000000000 +0200
++++ apr-1.6.2/network_io/unix/sendrecv.c	2017-08-03 16:18:08.681830961 +0200
+@@ -252,7 +252,7 @@
+ /* Define a structure to pass in when we have a NULL header value */
+ static apr_hdtr_t no_hdtr;
+ 
+-#if (defined(__linux__) || defined(__GNU__)) && defined(HAVE_WRITEV)
++#if (defined(__linux__) || defined(__GNU__)) || defined(__midipix__) && defined(HAVE_WRITEV)
+ 
+ apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
+                                  apr_hdtr_t *hdtr, apr_off_t *offset,
+--- apr-1.6.2/include/private/apr_escape_test_char.h.orig	2017-08-03 16:23:34.315833536 +0200
++++ apr-1.6.2/include/private/apr_escape_test_char.h	2017-08-03 16:26:23.512610809 +0200
+@@ -0,0 +1,25 @@
++/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */
++#define T_ESCAPE_SHELL_CMD     (1)
++#define T_ESCAPE_PATH_SEGMENT  (2)
++#define T_OS_ESCAPE_PATH       (4)
++#define T_ESCAPE_ECHO          (8)
++#define T_ESCAPE_URLENCODED    (16)
++#define T_ESCAPE_XML           (32)
++#define T_ESCAPE_LDAP_DN       (64)
++#define T_ESCAPE_LDAP_FILTER   (128)
++
++static const unsigned char test_char_table[256] = {
++    224,222,222,222,222,222,222,222,222,222,223,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,6,16,127,22,17,22,49,17,
++    145,145,129,80,80,0,0,18,0,0,0,0,0,0,0,0,0,0,16,87,
++    119,16,119,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++    0,0,0,0,0,0,0,0,0,0,0,23,223,23,23,0,23,0,0,0,
++    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++    0,0,0,23,23,23,17,222,222,222,222,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222 
++};
diff --git a/patches/apr-util-1.5.4.local.patch b/patches/apr-util-1.6.0.local.patch
index b9fc8a12..0326dfdc 100644
--- a/patches/apr-util-1.5.4.local.patch
+++ b/patches/apr-util-1.6.0.local.patch
@@ -1,6 +1,6 @@
---- apr-util-1.5.4/configure.orig	2014-09-16 23:30:58.000000000 +0000
-+++ apr-util-1.5.4/configure	2017-02-02 19:13:14.380272997 +0000
-@@ -20614,10 +20614,10 @@
+--- apr-util-1.6.0/configure.orig	2017-05-04 01:16:59.000000000 +0200
++++ apr-util-1.6.0/configure	2017-08-03 16:28:21.653082936 +0200
+@@ -20794,10 +20794,10 @@
        if test "$apu_have_sqlite3" = "1"; then
  
    if test "x$LDADD_dbd_sqlite3" = "x"; then
@@ -14,8 +14,8 @@
      for i in $apr_addto_bugger; do
        apr_addto_duplicate="0"
        for j in $LDADD_dbd_sqlite3; do
---- apr-util-1.5.4/Makefile.in.orig	2008-11-21 06:30:43.000000000 +0000
-+++ apr-util-1.5.4/Makefile.in	2017-02-02 19:18:54.417141284 +0000
+--- apr-util-1.6.0/Makefile.in.orig	2017-05-04 01:18:52.000000000 +0200
++++ apr-util-1.6.0/Makefile.in	2017-08-03 16:28:21.653082936 +0200
 @@ -23,7 +23,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  
diff --git a/vars/build.vars b/vars/build.vars
index 16137fbf..27601c57 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -267,14 +267,14 @@ LIB_PACKAGES_PACKAGES="
 	${LIB_PACKAGES_PACKAGES_X11}
 	${LIB_PACKAGES_PACKAGES_LIBS}";
 LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
-: ${PKG_APR_SHA256SUM:=7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a};
-: ${PKG_APR_VERSION:=1.5.2};
-: ${PKG_APR_URL:=http://mirror.yannic-bonenberger.com/apache//apr/apr-${PKG_APR_VERSION}.tar.bz2};
-: ${PKG_APR_UTIL_SHA256SUM:=a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e};
-: ${PKG_APR_UTIL_VERSION:=1.5.4};
-: ${PKG_APR_UTIL_URL:=http://apache.lauf-forum.at//apr/apr-util-${PKG_APR_UTIL_VERSION}.tar.bz2};
+: ${PKG_APR_SHA256SUM:=09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd};
+: ${PKG_APR_VERSION:=1.6.2};
+: ${PKG_APR_URL:=http://mirror.yannic-bonenberger.com/apache/apr/apr-${PKG_APR_VERSION}.tar.bz2};
+: ${PKG_APR_UTIL_SHA256SUM:=8474c93fa74b56ac6ca87449abe3e155723d5f534727f3f33283f6631a48ca4c};
+: ${PKG_APR_UTIL_VERSION:=1.6.0};
+: ${PKG_APR_UTIL_URL:=http://apache.lauf-forum.at/apr/apr-util-${PKG_APR_UTIL_VERSION}.tar.bz2};
 : ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-apr=${WORKDIR}/apr-${PKG_APR_VERSION}-native-${TARGET}"};
-: ${PKG_APR_UTIL_SUBDIR:=apr-util-1.5.4};
+: ${PKG_APR_UTIL_SUBDIR:=apr-util-${PKG_APR_UTIL_VERSION}};
 : ${PKG_APR_UTIL_BUILD_DIR:=${PKG_APR_UTIL_SUBDIR}};
 : ${PKG_BZIP2_SHA256SUM:=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd};
 : ${PKG_BZIP2_VERSION:=1.0.6};