mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +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:
@@ -1,63 +1,13 @@
|
||||
Index: httpd-2.4.25/docs/conf/httpd.conf.in
|
||||
===================================================================
|
||||
--- httpd-2.4.25.orig/docs/conf/httpd.conf.in
|
||||
+++ httpd-2.4.25/docs/conf/httpd.conf.in
|
||||
@@ -63,7 +63,6 @@ Listen @@Port@@
|
||||
# Example:
|
||||
# LoadModule foo_module modules/mod_foo.so
|
||||
#
|
||||
-@@LoadModule@@
|
||||
|
||||
<IfModule unixd_module>
|
||||
#
|
||||
@@ -74,8 +73,8 @@ Listen @@Port@@
|
||||
--- a/docs/conf/httpd.conf.in
|
||||
+++ b/docs/conf/httpd.conf.in
|
||||
@@ -74,8 +74,8 @@ Listen @@Port@@
|
||||
# It is usually good practice to create a dedicated user and group for
|
||||
# running httpd, as with most system services.
|
||||
#
|
||||
-User daemon
|
||||
-Group daemon
|
||||
+User nobody
|
||||
+Group nogroup
|
||||
+User apache
|
||||
+Group apache
|
||||
|
||||
</IfModule>
|
||||
|
||||
@@ -188,7 +187,7 @@ ErrorLog "@rel_logfiledir@/error_log"
|
||||
# Possible values include: debug, info, notice, warn, error, crit,
|
||||
# alert, emerg.
|
||||
#
|
||||
-LogLevel warn
|
||||
+LogLevel debug
|
||||
|
||||
<IfModule log_config_module>
|
||||
#
|
||||
@@ -330,7 +329,7 @@ LogLevel warn
|
||||
# contents of the file itself to determine its type. The MIMEMagicFile
|
||||
# directive tells the module where the hint definitions are located.
|
||||
#
|
||||
-#MIMEMagicFile @rel_sysconfdir@/magic
|
||||
+MIMEMagicFile @rel_sysconfdir@/magic
|
||||
|
||||
#
|
||||
# Customizable error responses come in three flavors:
|
||||
@@ -360,7 +359,7 @@ LogLevel warn
|
||||
# Defaults: EnableMMAP On, EnableSendfile Off
|
||||
#
|
||||
#EnableMMAP off
|
||||
-#EnableSendfile on
|
||||
+EnableSendfile off
|
||||
|
||||
# Supplemental configuration
|
||||
#
|
||||
@@ -411,8 +410,8 @@ Include @rel_sysconfdir@/extra/proxy-htm
|
||||
# starting without SSL on platforms with no /dev/random equivalent
|
||||
# but a statically compiled-in mod_ssl.
|
||||
#
|
||||
-<IfModule ssl_module>
|
||||
-SSLRandomSeed startup builtin
|
||||
-SSLRandomSeed connect builtin
|
||||
-</IfModule>
|
||||
+#<IfModule ssl_module>
|
||||
+#SSLRandomSeed startup builtin
|
||||
+#SSLRandomSeed connect builtin
|
||||
+#</IfModule>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user