diff -ru --new-file httpd-2.4.25.orig/build/rules.mk.in httpd-2.4.25/build/rules.mk.in --- httpd-2.4.25.orig/build/rules.mk.in 2012-09-26 16:30:31.000000000 +0200 +++ httpd-2.4.25/build/rules.mk.in 2017-01-27 02:10:20.539967531 +0100 @@ -50,7 +50,7 @@ # Link-related commands LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(PILDFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ -SH_LINK = $(SH_LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@ +SH_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@ MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ # Cross compile commands diff -ru --new-file httpd-2.4.25.orig/configure httpd-2.4.25/configure --- httpd-2.4.25.orig/configure 2016-12-16 19:24:48.000000000 +0100 +++ httpd-2.4.25/configure 2017-01-27 01:11:14.103967531 +0100 @@ -8828,13 +8828,6 @@ CPPFLAGS=$apr_old_cppflags - if test $ac_cv_define_APR_HAS_DSO = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Missing DSO support - building static modules by default." >&5 -$as_echo "$as_me: WARNING: Missing DSO support - building static modules by default." >&2;} - module_default=static - fi - - # Check whether --enable-modules was given. if test "${enable_modules+set}" = set; then : enableval=$enable_modules; @@ -13645,9 +13638,9 @@ case "x$enable_so" in "xyes") - if test $ac_cv_define_APR_HAS_DSO = "no"; then - as_fn_error $? "mod_so has been requested but cannot be built on your system" "$LINENO" 5 - fi + #if test $ac_cv_define_APR_HAS_DSO = "no"; then + # as_fn_error $? "mod_so has been requested but cannot be built on your system" "$LINENO" 5 + #fi ;; "xshared") as_fn_error $? "mod_so can not be built as a shared DSO" "$LINENO" 5 @@ -13693,16 +13686,6 @@ APACHE_VAR_SUBST="$APACHE_VAR_SUBST INSTALL_DSO" - -if test "$sharedobjs" = "yes"; then - if test $ac_cv_define_APR_HAS_DSO = "no"; then - as_fn_error $? "shared objects have been requested but cannot be built since mod_so cannot be built" "$LINENO" 5 - elif test $enable_so = "no"; then - as_fn_error $? "shared objects have been requested but cannot be built since mod_so was disabled" "$LINENO" 5 - fi -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_so" >&5 $as_echo_n "checking whether to enable mod_so... " >&6; } # Check whether --enable-so was given. diff -ru --new-file httpd-2.4.25.orig/server/test_char.h httpd-2.4.25/server/test_char.h --- httpd-2.4.25.orig/server/test_char.h 1970-01-01 01:00:00.000000000 +0100 +++ httpd-2.4.25/server/test_char.h 2017-01-26 20:25:06.654810000 +0100 @@ -0,0 +1,45 @@ +/* generated natively */ +#define T_ESCAPE_SHELL_CMD (1) +#define T_ESCAPE_PATH_SEGMENT (2) +#define T_OS_ESCAPE_PATH (4) +#define T_HTTP_TOKEN_STOP (8) +#define T_ESCAPE_LOGITEM (16) +#define T_ESCAPE_FORENSIC (32) +#define T_ESCAPE_URLENCODED (64) +#define T_HTTP_CTRLS (128) +#define T_VCHAR_OBSTEXT (256) + +static const unsigned short test_char_table[256] = { + 0x0a8,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe, + 0x0fe,0x07e,0x0ff,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe, + 0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe, + 0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe, + 0x00e,0x140,0x15f,0x146,0x141,0x166,0x141,0x141, + 0x149,0x149,0x101,0x140,0x148,0x100,0x100,0x14a, + 0x100,0x100,0x100,0x100,0x100,0x100,0x100,0x100, + 0x100,0x100,0x168,0x14b,0x14f,0x148,0x14f,0x14f, + 0x148,0x100,0x100,0x100,0x100,0x100,0x100,0x100, + 0x100,0x100,0x100,0x100,0x100,0x100,0x100,0x100, + 0x100,0x100,0x100,0x100,0x100,0x100,0x100,0x100, + 0x100,0x100,0x100,0x14f,0x15f,0x14f,0x147,0x100, + 0x147,0x100,0x100,0x100,0x100,0x100,0x100,0x100, + 0x100,0x100,0x100,0x100,0x100,0x100,0x100,0x100, + 0x100,0x100,0x100,0x100,0x100,0x100,0x100,0x100, + 0x100,0x100,0x100,0x14f,0x167,0x14f,0x141,0x0fe, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e, + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e +}; --- httpd-2.4.25/server/Makefile.in.orig 2013-10-02 12:20:14.000000000 +0000 +++ httpd-2.4.25/server/Makefile.in 2017-02-02 23:55:21.521675844 +0000 @@ -23,10 +23,10 @@ include $(top_builddir)/build/rules.mk include $(top_srcdir)/build/library.mk -gen_test_char_OBJECTS = gen_test_char.lo -gen_test_char: $(gen_test_char_OBJECTS) - $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS) +gen_test_char: gen_test_char.o + gcc -I$(shell x86_64-nt64-midipix-apr-1-config --includedir) -o $@ $< +#If this file is missing, you're doing something wrong... test_char.h: gen_test_char ./gen_test_char > test_char.h