summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--patches/apr-1.6.5.local.patch (renamed from patches/apr-1.6.3.local.patch)12
-rw-r--r--vars/build.vars4
2 files changed, 8 insertions, 8 deletions
diff --git a/patches/apr-1.6.3.local.patch b/patches/apr-1.6.5.local.patch
index 0586d3a3..13fb2190 100644
--- a/patches/apr-1.6.3.local.patch
+++ b/patches/apr-1.6.5.local.patch
@@ -1,5 +1,5 @@
---- 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
+--- 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;
@@ -9,8 +9,8 @@
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
+--- 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)
@@ -37,8 +37,8 @@
+ 222,222,222,222,222,222,222,222,222,222,222,222,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
+--- 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 \
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};