haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Apache 2.4.3

Browse Source
This commit is contained in:
Nav
2014-12-15 16:48:43 +02:00
parent 7f69e02634
commit 37601bf0e3
1 changed files with 74 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
www-servers/apache/patches/apache-2.4.3.patch → www-servers/apache/patches/apache-2.4.3.patchset
View File

@@ -1,31 +1,14 @@
diff -urN httpd-2.4.3/modules/proxy/mod_proxy_connect.c httpd-2.4.3-haiku/modules/proxy/mod_proxy_connect.c
--- httpd-2.4.3/modules/proxy/mod_proxy_connect.c 2012-07-28 14:40:23.041680896 +0000
+++ httpd-2.4.3-haiku/modules/proxy/mod_proxy_connect.c 2012-12-02 06:58:17.131072000 +0000
@@ -254,7 +254,7 @@
rv = apr_sockaddr_info_get(&nexthop, connectname, APR_UNSPEC,
connectport, 0, p);
if (rv != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO()
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
"failed to resolve hostname '%s'", connectname);
return ap_proxyerror(r, HTTP_BAD_GATEWAY,
apr_pstrcat(p, "DNS lookup failure for: ",
diff -urN httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c httpd-2.4.3-haiku/modules/slotmem/mod_slotmem_shm.c
--- httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c 2012-04-03 13:36:55.037224448 +0000
+++ httpd-2.4.3-haiku/modules/slotmem/mod_slotmem_shm.c 2012-12-02 06:58:40.734265344 +0000
@@ -33,7 +33,7 @@
#include <unistd.h> /* for getpid() */
#endif
-#if HAVE_SYS_SEM_H
+#if HAVE_SYS_SHM_H
#include <sys/shm.h>
#if !defined(SHM_R)
#define SHM_R 0400
diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
--- httpd-2.4.3/acinclude.m4 2012-07-23 15:20:48.061341696 +0000
+++ httpd-2.4.3-haiku/acinclude.m4 2012-12-02 15:18:03.000000000 +0000
@@ -4,25 +4,25 @@
From 0410108ac91734ad764c0c1a64e3e429ab86b0e6 Mon Sep 17 00:00:00 2001
From: Nav <nav@unlicrea.com>
Date: Tue, 9 Dec 2014 19:29:31 +0000
Subject: Fixing patch
diff --git a/httpd-2.4.3/acinclude.m4 b/httpd-2.4.3/acinclude.m4
index 54defc2..b59b688 100644
--- a/httpd-2.4.3/acinclude.m4
+++ b/httpd-2.4.3/acinclude.m4
@@ -4,25 +4,25 @@ dnl Autoconf 2.50 can not handle substr correctly. It does have
dnl AC_HELP_STRING, so let's try to call it if we can.
dnl Note: this define must be on one line so that it can be properly returned
dnl as the help string.
@@ -55,7 +38,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
APACHE_SUBST(abs_srcdir)
APACHE_SUBST(bindir)
APACHE_SUBST(sbindir)
@@ -112,14 +112,14 @@
@@ -112,14 +112,14 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
dnl APACHE_GEN_MAKEFILES
dnl Creates Makefiles
@@ -72,7 +55,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1"
])
@@ -128,7 +128,7 @@
@@ -128,7 +128,7 @@ dnl APACHE_TYPE_RLIM_T
dnl
dnl If rlim_t is not defined, define it to int
dnl
@@ -81,7 +64,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [
AC_TRY_COMPILE([
#include <sys/types.h>
@@ -146,7 +146,7 @@
@@ -146,7 +146,7 @@ AC_DEFUN(APACHE_TYPE_RLIM_T, [
])
dnl APACHE_MODPATH_INIT(modpath)
@@ -90,7 +73,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
current_dir=$1
modpath_current=modules/$1
modpath_static=
@@ -155,7 +155,7 @@
@@ -155,7 +155,7 @@ AC_DEFUN(APACHE_MODPATH_INIT,[
> $modpath_current/modules.mk
])dnl
dnl
@@ -99,7 +82,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
echo "static = $modpath_static" >> $modpath_current/modules.mk
echo "shared = $modpath_shared" >> $modpath_current/modules.mk
@@ -168,7 +168,7 @@
@@ -168,7 +168,7 @@ AC_DEFUN(APACHE_MODPATH_FINISH,[
])dnl
dnl
dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]])
@@ -108,7 +91,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
if test -z "$3"; then
objects="mod_$1.lo"
else
@@ -214,7 +214,7 @@
@@ -214,7 +214,7 @@ dnl config -- configuration logic to run if the MPM is enabled
dnl path -- relative path to MPM (default: server/mpm/mpmname)
dnl libs -- libs needed by this MPM
dnl
@@ -117,7 +100,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
if ap_mpm_is_enabled $1; then
if test -z "$3"; then
objects="$1.lo"
@@ -291,7 +291,7 @@
@@ -291,7 +291,7 @@ dnl current module.
dnl prereq_module's APACHE_MODULE() statement must have been processed
dnl before the current APACHE_MODULE() statement.
dnl
@@ -126,7 +109,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
AC_MSG_CHECKING(whether to enable mod_$1)
define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl
AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),force_$1=$enableval,enable_$1=ifelse($5,,maybe-all,$5))
@@ -392,7 +392,7 @@
@@ -392,7 +392,7 @@ AC_DEFUN(APACHE_MODULE,[
dnl
dnl APACHE_ENABLE_MODULES
dnl
@@ -135,7 +118,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
module_selection=most
module_default=shared
@@ -452,7 +452,7 @@
@@ -452,7 +452,7 @@ AC_DEFUN(APACHE_ENABLE_MODULES,[
])
])
@@ -144,7 +127,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
if test -z "$apache_cxx_done"; then
AC_PROG_CXX
AC_PROG_CXXCPP
@@ -466,7 +466,7 @@
@@ -466,7 +466,7 @@ dnl
dnl Configure for OpenSSL, giving preference to
dnl "--with-ssl=<path>" if it was specified.
dnl
@@ -153,7 +136,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
AC_CACHE_CHECK([for OpenSSL], [ac_cv_openssl], [
dnl initialise the variables we use
ac_cv_openssl=no
@@ -576,14 +576,14 @@
@@ -576,14 +576,14 @@ dnl Export (via APACHE_SUBST) the various path-related variables that
dnl apache will use while generating scripts like autoconf and apxs and
dnl the default config file.
@@ -170,3 +153,55 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
APACHE_SUBST_EXPANDED_ARG(exec_prefix)
APACHE_SUBST_EXPANDED_ARG(bindir)
APACHE_SUBST_EXPANDED_ARG(sbindir)
diff --git a/httpd-2.4.3/modules/proxy/mod_proxy_connect.c b/httpd-2.4.3/modules/proxy/mod_proxy_connect.c
index 0cf5693..f4e958c 100644
--- a/httpd-2.4.3/modules/proxy/mod_proxy_connect.c
+++ b/httpd-2.4.3/modules/proxy/mod_proxy_connect.c
@@ -254,7 +254,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
rv = apr_sockaddr_info_get(&nexthop, connectname, APR_UNSPEC,
connectport, 0, p);
if (rv != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO()
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
"failed to resolve hostname '%s'", connectname);
return ap_proxyerror(r, HTTP_BAD_GATEWAY,
apr_pstrcat(p, "DNS lookup failure for: ",
diff --git a/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c b/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c
index a9b7ca2..178eea5 100644
--- a/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c
+++ b/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c
@@ -33,7 +33,7 @@
#include <unistd.h> /* for getpid() */
#endif
-#if HAVE_SYS_SEM_H
+#if HAVE_SYS_SHM_H
#include <sys/shm.h>
#if !defined(SHM_R)
#define SHM_R 0400
--
1.8.3.4
From 9ed8aff5487da044a341bde882f1aa3132d5398f Mon Sep 17 00:00:00 2001
From: Nav <nav@unlicrea.com>
Date: Mon, 15 Dec 2014 16:39:31 +0000
Subject: Fixed redefinition error
diff --git a/httpd-2.4.3/server/Makefile.in b/httpd-2.4.3/server/Makefile.in
index 42d1fe5..9418843 100644
--- a/httpd-2.4.3/server/Makefile.in
+++ b/httpd-2.4.3/server/Makefile.in
@@ -32,7 +32,7 @@ test_char.h: gen_test_char
util.lo: test_char.h
EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR)
-EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR)
+EXPORT_DIRS_APR = $(APR_INCLUDEDIR)
# If export_files is a dependency here, but we remove it during this stage,
# when exports.c is generated, make will not detect that export_files is no
--
1.8.3.4