From fb15df9a39ca07f4c47320e90522b8d5b01f698b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sat, 29 Sep 2018 05:53:39 +0000
Subject: vars/build.vars: updates apr to v1.6.5.
 patches/apr-1.6.5.local.patch: updated.

---
 patches/apr-1.6.3.local.patch | 96 -------------------------------------------
 patches/apr-1.6.5.local.patch | 96 +++++++++++++++++++++++++++++++++++++++++++
 vars/build.vars               |  4 +-
 3 files changed, 98 insertions(+), 98 deletions(-)
 delete mode 100644 patches/apr-1.6.3.local.patch
 create mode 100644 patches/apr-1.6.5.local.patch

diff --git a/patches/apr-1.6.3.local.patch b/patches/apr-1.6.3.local.patch
deleted file mode 100644
index 0586d3a3..00000000
--- a/patches/apr-1.6.3.local.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- apr-1.6.3/network_io/unix/sendrecv.c.orig	2013-10-21 11:57:36.000000000 +0000
-+++ apr-1.6.3/network_io/unix/sendrecv.c	2017-11-11 18:37:41.568000000 +0000
-@@ -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.3/include/private/apr_escape_test_char.h.orig	2017-11-11 18:37:41.568000000 +0000
-+++ apr-1.6.3/include/private/apr_escape_test_char.h	2017-11-11 18:37:41.568000000 +0000
-@@ -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 
-+};
---- apr-1.6.3/Makefile.in.orig	2017-05-31 15:04:18.000000000 +0000
-+++ apr-1.6.3/Makefile.in	2017-11-11 18:37:41.568000000 +0000
-@@ -46,8 +46,7 @@
- 
- CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
- 	build/apr_rules.out tools/gen_test_char@EXEEXT@ \
--	tools/gen_test_char.o tools/gen_test_char.lo \
--	include/private/apr_escape_test_char.h
-+	tools/gen_test_char.o tools/gen_test_char.lo
- DISTCLEAN_TARGETS = config.cache config.log config.status \
- 	include/apr.h include/arch/unix/apr_private.h \
- 	libtool $(APR_CONFIG) build/apr_rules.mk apr.pc \
-@@ -74,7 +73,7 @@
- 	sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
- 
- install: $(TARGETS)
--	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
-+	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
- 		     $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
- 	$(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir)
- 	for f in $(top_srcdir)/include/apr_*.h; do \
-@@ -83,16 +82,6 @@
- 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
- 	$(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp
- 	$(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
--	for f in libtool shlibtool; do \
--	    if test -f $${f}; then $(INSTALL) -m 755 $${f} $(DESTDIR)$(installbuilddir); fi; \
--	done
--	$(INSTALL) -m 755 $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir)
--	for f in make_exports.awk make_var_export.awk; do \
--	    $(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 \
-@@ -131,18 +120,6 @@
- etags:
- 	etags `find . -name '*.[ch]'`
- 
--OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
--tools/gen_test_char.lo: tools/gen_test_char.c
--	$(APR_MKDIR) tools
--	$(LT_COMPILE)
--
--tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
--	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
--
--include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
--	$(APR_MKDIR) include/private
--	tools/gen_test_char@EXEEXT@ > $@
--
- LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
- 	    @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
- 
diff --git a/patches/apr-1.6.5.local.patch b/patches/apr-1.6.5.local.patch
new file mode 100644
index 00000000..13fb2190
--- /dev/null
+++ b/patches/apr-1.6.5.local.patch
@@ -0,0 +1,96 @@
+--- apr-1.6.5/network_io/unix/sendrecv.c.orig	2013-10-21 11:57:36.000000000 +0000
++++ apr-1.6.5/network_io/unix/sendrecv.c	2017-11-11 18:37:41.568000000 +0000
+@@ -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.5/include/private/apr_escape_test_char.h.orig	2017-11-11 18:37:41.568000000 +0000
++++ apr-1.6.5/include/private/apr_escape_test_char.h	2017-11-11 18:37:41.568000000 +0000
+@@ -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 
++};
+--- apr-1.6.5/Makefile.in.orig	2017-05-31 15:04:18.000000000 +0000
++++ apr-1.6.5/Makefile.in	2017-11-11 18:37:41.568000000 +0000
+@@ -46,8 +46,7 @@
+ 
+ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
+ 	build/apr_rules.out tools/gen_test_char@EXEEXT@ \
+-	tools/gen_test_char.o tools/gen_test_char.lo \
+-	include/private/apr_escape_test_char.h
++	tools/gen_test_char.o tools/gen_test_char.lo
+ DISTCLEAN_TARGETS = config.cache config.log config.status \
+ 	include/apr.h include/arch/unix/apr_private.h \
+ 	libtool $(APR_CONFIG) build/apr_rules.mk apr.pc \
+@@ -74,7 +73,7 @@
+ 	sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
+ 
+ install: $(TARGETS)
+-	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
++	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
+ 		     $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
+ 	$(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir)
+ 	for f in $(top_srcdir)/include/apr_*.h; do \
+@@ -83,16 +82,6 @@
+ 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
+ 	$(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp
+ 	$(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
+-	for f in libtool shlibtool; do \
+-	    if test -f $${f}; then $(INSTALL) -m 755 $${f} $(DESTDIR)$(installbuilddir); fi; \
+-	done
+-	$(INSTALL) -m 755 $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir)
+-	for f in make_exports.awk make_var_export.awk; do \
+-	    $(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 \
+@@ -131,18 +120,6 @@
+ etags:
+ 	etags `find . -name '*.[ch]'`
+ 
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: tools/gen_test_char.c
+-	$(APR_MKDIR) tools
+-	$(LT_COMPILE)
+-
+-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
+-	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
+-
+-include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
+-	$(APR_MKDIR) include/private
+-	tools/gen_test_char@EXEEXT@ > $@
+-
+ LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
+ 	    @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
+ 
diff --git a/vars/build.vars b/vars/build.vars
index 820ee6bd..9982738a 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -424,8 +424,8 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
 : ${PKG_ALSA_LIB_VERSION:=1.1.6};
 : ${PKG_ALSA_LIB_URL:=ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.1.4.1.tar.bz2};
 : ${PKG_ALSA_LIB_CONFIGURE_ARGS_EXTRA:="--disable-python --with-versioned=no"};
-: ${PKG_APR_SHA256SUM:=131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172};
-: ${PKG_APR_VERSION:=1.6.3};
+: ${PKG_APR_SHA256SUM:=a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105};
+: ${PKG_APR_VERSION:=1.6.5};
 : ${PKG_APR_URL:=http://ftp.fau.de/apache/apr/apr-${PKG_APR_VERSION}.tar.bz2};
 : ${PKG_APR_DEPS_BASE:=apr_util};
 : ${PKG_APR_UTIL_SHA256SUM:=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b};
-- 
cgit v1.2.3