From 1fc45600e7b312547e845ccd14410b543d8311d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Thu, 3 Aug 2017 16:30:20 +0200 Subject: 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. --- patches/apr-1.5.2.local.patch | 94 ------------------------------------------- 1 file changed, 94 deletions(-) delete mode 100644 patches/apr-1.5.2.local.patch (limited to 'patches/apr-1.5.2.local.patch') diff --git a/patches/apr-1.5.2.local.patch b/patches/apr-1.5.2.local.patch deleted file mode 100644 index e96002f5..00000000 --- a/patches/apr-1.5.2.local.patch +++ /dev/null @@ -1,94 +0,0 @@ -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 -@@ -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,14 +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) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG) - @if [ $(INSTALL_SUBDIRS) != "none" ]; then \ - for i in $(INSTALL_SUBDIRS); do \ -@@ -129,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 $@ - -- cgit v1.2.3