mirror of
https://github.com/novatiq/packages.git
synced 2026-04-29 23:18:42 +01:00
apache: import from oldpackages, add myself as maintainer, add license
information, update source-url update to v2.2.27 Signed-off-by: Thomas Heil <heil@terminal-consulting.de>
This commit is contained in:
@@ -0,0 +1,14 @@
|
||||
--- a/server/Makefile.in
|
||||
+++ b/server/Makefile.in
|
||||
@@ -26,7 +26,10 @@ gen_test_char: $(gen_test_char_OBJECTS)
|
||||
$(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
|
||||
|
||||
test_char.h: gen_test_char
|
||||
- ./gen_test_char > test_char.h
|
||||
+ true
|
||||
+# ./gen_test_char > test_char.h
|
||||
+# doesn't matter if you run it on the buildhost or on an wl500gd,
|
||||
+# same output on both, so i just patched in the test_char.h :).
|
||||
|
||||
util.lo: test_char.h
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
--- /dev/null
|
||||
+++ b/server/test_char.h
|
||||
@@ -0,0 +1,23 @@
|
||||
+/* this file is automatically generated by gen_test_char, do not edit */
|
||||
+#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)
|
||||
+
|
||||
+static const unsigned char test_char_table[256] = {
|
||||
+ 32,62,62,62,62,62,62,62,62,62,63,62,62,62,62,62,62,62,62,62,
|
||||
+ 62,62,62,62,62,62,62,62,62,62,62,62,14,0,23,6,1,38,1,1,
|
||||
+ 9,9,1,0,8,0,0,10,0,0,0,0,0,0,0,0,0,0,40,15,
|
||||
+ 15,8,15,15,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
+ 0,0,0,0,0,0,0,0,0,0,0,15,31,15,7,0,7,0,0,0,
|
||||
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
+ 0,0,0,15,39,15,1,62,54,54,54,54,54,54,54,54,54,54,54,54,
|
||||
+ 54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,
|
||||
+ 54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,
|
||||
+ 54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,
|
||||
+ 54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,
|
||||
+ 54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,
|
||||
+ 54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54
|
||||
+};
|
||||
@@ -0,0 +1,33 @@
|
||||
--- a/build/mkconfNW.awk
|
||||
+++ b/build/mkconfNW.awk
|
||||
@@ -24,7 +24,7 @@ BEGIN {
|
||||
A["sysconfdir"] = "conf"
|
||||
A["iconsdir"] = "icons"
|
||||
A["manualdir"] = "manual"
|
||||
- A["runtimedir"] = "logs"
|
||||
+ A["runtimedir"] = "log"
|
||||
A["errordir"] = "error"
|
||||
A["proxycachedir"] = "proxy"
|
||||
|
||||
--- a/config.layout
|
||||
+++ b/config.layout
|
||||
@@ -28,8 +28,8 @@
|
||||
cgidir: ${datadir}/cgi-bin
|
||||
includedir: ${prefix}/include
|
||||
localstatedir: ${prefix}
|
||||
- runtimedir: ${localstatedir}/logs
|
||||
- logfiledir: ${localstatedir}/logs
|
||||
+ runtimedir: ${localstatedir}/log
|
||||
+ logfiledir: ${localstatedir}/log
|
||||
proxycachedir: ${localstatedir}/proxy
|
||||
</Layout>
|
||||
|
||||
@@ -150,7 +150,7 @@
|
||||
includedir: ${prefix}/include
|
||||
localstatedir: /var${prefix}
|
||||
runtimedir: ${localstatedir}/run
|
||||
- logfiledir: ${localstatedir}/logs
|
||||
+ logfiledir: ${localstatedir}/log
|
||||
proxycachedir: ${localstatedir}/proxy
|
||||
</Layout>
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/include/scoreboard.h
|
||||
+++ b/include/scoreboard.h
|
||||
@@ -42,7 +42,7 @@ extern "C" {
|
||||
|
||||
/* Scoreboard file, if there is one */
|
||||
#ifndef DEFAULT_SCOREBOARD
|
||||
-#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
|
||||
+#define DEFAULT_SCOREBOARD "log/apache_runtime_status"
|
||||
#endif
|
||||
|
||||
/* Scoreboard info on a process is, for now, kept very brief ---
|
||||
@@ -0,0 +1,60 @@
|
||||
--- a/docs/conf/httpd.conf.in
|
||||
+++ b/docs/conf/httpd.conf.in
|
||||
@@ -51,7 +51,6 @@ Listen @@Port@@
|
||||
# Example:
|
||||
# LoadModule foo_module modules/mod_foo.so
|
||||
#
|
||||
-@@LoadModule@@
|
||||
|
||||
<IfModule !mpm_netware_module>
|
||||
<IfModule !mpm_winnt_module>
|
||||
@@ -63,8 +62,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
|
||||
|
||||
</IfModule>
|
||||
</IfModule>
|
||||
@@ -191,7 +190,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>
|
||||
#
|
||||
@@ -336,7 +335,7 @@ DefaultType text/plain
|
||||
# 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:
|
||||
@@ -358,7 +357,7 @@ DefaultType text/plain
|
||||
# broken on your system.
|
||||
#
|
||||
#EnableMMAP off
|
||||
-#EnableSendfile off
|
||||
+EnableSendfile off
|
||||
|
||||
# Supplemental configuration
|
||||
#
|
||||
@@ -404,7 +403,7 @@ DefaultType text/plain
|
||||
# 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