mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
apache: bump to 2.4.41 & sync with master
This is a squash of the following cherry-picked commits:14f4f0bef04e6bdd8a49c8aba5113b2d188fd37f31e0d618e539e68309e8a1472254dbd6476f30bb258967b0d2e94a08298e6bd63d24f066bb68a7b6d44ad09fcdShort summary: - version is bumped to 2.4.41 - httpd is renamed to apache2 to avoid overwriting of other servers (for instance busybox's httpd) - the name apache2 is now also used for directories, for instance /etc/apache2 instead of /etc/apache - a simple init script it added (/etc/init.d/apache2) - a user "apache" is added upon package installation and used by default - adds the Apache modules (in the main package as well as in additional packages) - Makefile and patches are updated and cleaned - adds myself as maintainer - improves the cross-compile setup (via configure variables, patches & sed scripts) - apxs is fixed up so that external modules can be added easily For more details please check the individual commits provided above. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
@@ -5,10 +5,8 @@ Author: Jean-Michel Vourgère <nirgal@debian.org>
|
||||
Forwarded: no
|
||||
Last-Update: 2015-08-11
|
||||
|
||||
Index: apache2/server/buildmark.c
|
||||
===================================================================
|
||||
--- apache2.orig/server/buildmark.c
|
||||
+++ apache2/server/buildmark.c
|
||||
--- a/server/buildmark.c
|
||||
+++ b/server/buildmark.c
|
||||
@@ -17,11 +17,7 @@
|
||||
#include "ap_config.h"
|
||||
#include "httpd.h"
|
||||
@@ -22,16 +20,14 @@ Index: apache2/server/buildmark.c
|
||||
|
||||
AP_DECLARE(const char *) ap_get_server_built()
|
||||
{
|
||||
Index: apache2/server/Makefile.in
|
||||
===================================================================
|
||||
--- apache2.orig/server/Makefile.in
|
||||
+++ apache2/server/Makefile.in
|
||||
--- a/server/Makefile.in
|
||||
+++ b/server/Makefile.in
|
||||
@@ -1,3 +1,4 @@
|
||||
+export LC_ALL = C
|
||||
|
||||
CLEAN_TARGETS = gen_test_char test_char.h \
|
||||
ApacheCoreOS2.def httpd.exp export_files \
|
||||
@@ -85,8 +86,8 @@ httpd.exp: exports.c export_vars.h
|
||||
@@ -87,8 +88,8 @@ httpd.exp: exports.c export_vars.h
|
||||
@echo "#! ." > $@
|
||||
@echo "* This file was AUTOGENERATED at build time." >> $@
|
||||
@echo "* Please do not edit by hand." >> $@
|
||||
|
||||
Reference in New Issue
Block a user