midipix / build / midipix_build

Forked from build/midipix_build 4 years ago
Clone

Blame patches/apr-1.5.2.local.patch

Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
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
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
--- apr-1.5.2.orig/include/private/apr_escape_test_char.h	1970-01-01 01:00:00.000000000 +0100
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+++ apr-1.5.2/include/private/apr_escape_test_char.h	2017-01-26 04:54:14.025668783 +0100
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
@@ -0,0 +1,23 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+/* generated natively */
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+#define T_ESCAPE_SHELL_CMD     (1)
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+#define T_ESCAPE_PATH_SEGMENT  (2)
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+#define T_OS_ESCAPE_PATH       (4)
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+#define T_ESCAPE_ECHO          (8)
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+#define T_ESCAPE_URLENCODED    (16)
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+#define T_ESCAPE_XML           (32)
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+static const unsigned char test_char_table[256] = {
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+    32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30,
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+    30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17,
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+    17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23,
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+    55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+    0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0,
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+    0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30,
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30 
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+};
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
diff -ru apr-1.5.2.orig/network_io/unix/sendrecv.c apr-1.5.2/network_io/unix/sendrecv.c
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
--- apr-1.5.2.orig/network_io/unix/sendrecv.c	2013-10-21 13:57:36.000000000 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
+++ apr-1.5.2/network_io/unix/sendrecv.c	2017-02-02 00:52:39.903022000 +0100
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
@@ -252,7 +252,7 @@
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 /* Define a structure to pass in when we have a NULL header value */
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 static apr_hdtr_t no_hdtr;
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
-#if (defined(__linux__) || defined(__GNU__)) && defined(HAVE_WRITEV)
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
+#if (defined(__linux__) || defined(__GNU__)) || defined(__midipix__) && defined(HAVE_WRITEV)
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
                                  apr_hdtr_t *hdtr, apr_off_t *offset,
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
--- apr-1.5.2/Makefile.in.orig	2014-04-25 10:51:11.000000000 +0000
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
+++ apr-1.5.2/Makefile.in	2017-02-13 09:58:16.230193677 +0000
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
@@ -46,8 +46,7 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
 
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
 CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
 	build/apr_rules.out tools/gen_test_char@EXEEXT@ \
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-	tools/gen_test_char.o tools/gen_test_char.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-	include/private/apr_escape_test_char.h
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
+	tools/gen_test_char.o tools/gen_test_char.lo
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
 DISTCLEAN_TARGETS = config.cache config.log config.status \
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
 	include/apr.h include/arch/unix/apr_private.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
 	libtool $(APR_CONFIG) build/apr_rules.mk apr.pc \
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
@@ -74,7 +73,7 @@
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 	sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 install: $(TARGETS)
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
-	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
+	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 		     $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 	$(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir)
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 	for f in $(top_srcdir)/include/apr_*.h; do \
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
@@ -83,14 +82,6 @@
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 	$(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 	$(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
-	for f in libtool shlibtool; do \
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
-	    if test -f $${f}; then $(INSTALL) -m 755 $${f} $(DESTDIR)$(installbuilddir); fi; \
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
-	done
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
-	$(INSTALL) -m 755 $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir)
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
-	for f in make_exports.awk make_var_export.awk; do \
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
-	    $(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
-	done
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
-	$(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 	$(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
 	@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
             for i in $(INSTALL_SUBDIRS); do \
Lucio Andrés Illanes Albornoz (arab, vxp) d5f7ba
@@ -129,18 +120,6 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
 etags:
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
 	etags `find . -name '*.[ch]'`
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
 
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-tools/gen_test_char.lo: tools/gen_test_char.c
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-	$(APR_MKDIR) tools
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-	$(LT_COMPILE)
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-	$(APR_MKDIR) include/private
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-	tools/gen_test_char@EXEEXT@ > $@
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
-
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
 LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2
 	    @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
Lucio Andrés Illanes Albornoz (arab, vxp) 90f8b2