summaryrefslogtreecommitdiff
path: root/www/apache21/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache21/files')
-rw-r--r--www/apache21/files/patch-aa40
-rw-r--r--www/apache21/files/patch-ab57
-rw-r--r--www/apache21/files/patch-ak24
3 files changed, 91 insertions, 30 deletions
diff --git a/www/apache21/files/patch-aa b/www/apache21/files/patch-aa
new file mode 100644
index 000000000000..21ea6449f6ca
--- /dev/null
+++ b/www/apache21/files/patch-aa
@@ -0,0 +1,40 @@
+*** configure.bak Sun Jul 12 13:25:46 1998
+--- configure Thu Jul 23 16:52:04 1998
+***************
+*** 877,884 ****
+ echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
+ echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
+ echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
+! echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
+! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
+ echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
+ echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
+ echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
+--- 877,884 ----
+ echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
+ echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
+ echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
+! echo " DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
+! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
+ echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
+ echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
+ echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
+***************
+*** 942,949 ****
+ echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci
+ echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci
+ echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci
+! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
+! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
+ echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
+ echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
+ echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
+--- 942,949 ----
+ echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci
+ echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci
+ echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci
+! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
+! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
+ echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
+ echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
+ echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
diff --git a/www/apache21/files/patch-ab b/www/apache21/files/patch-ab
index 55c4a50bbd3e..040690f9b1df 100644
--- a/www/apache21/files/patch-ab
+++ b/www/apache21/files/patch-ab
@@ -1,7 +1,17 @@
-*** Makefile.tmpl.orig Tue May 12 15:52:11 1998
---- Makefile.tmpl Fri Jun 5 19:13:32 1998
+*** Makefile.tmpl.orig Wed Jul 15 21:03:25 1998
+--- Makefile.tmpl Thu Jul 23 16:14:15 1998
***************
-*** 161,167 ****
+*** 107,112 ****
+--- 107,113 ----
+ runtimedir = @runtimedir@
+ logfiledir = @logfiledir@
+ proxycachedir = @proxycachedir@
++ doc_prefix = $(prefix)/share/doc/apache
+
+ libexecdir_relative = @libexecdir_relative@
+
+***************
+*** 167,173 ****
-DGID_MIN=$(suexec_gidmin) \
-DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
-DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
@@ -9,7 +19,7 @@
-DSAFE_PATH=\"$(suexec_safepath)\" \
' \
suexec; \
---- 161,167 ----
+--- 168,174 ----
-DGID_MIN=$(suexec_gidmin) \
-DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
-DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
@@ -18,7 +28,7 @@
' \
suexec; \
***************
-*** 216,224 ****
+*** 224,232 ****
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
@@ -28,18 +38,18 @@
$(MKDIR) $(root)$(includedir)
$(MKDIR) $(root)$(runtimedir)
$(MKDIR) $(root)$(logfiledir)
---- 216,224 ----
+--- 225,233 ----
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
-! $(MKDIR) $(root)$(datadir)/data.default
+! $(MKDIR) $(root)$(doc_prefix)
$(MKDIR) $(root)$(datadir)/icons
! $(MKDIR) $(root)$(datadir)/cgi-bin.default
$(MKDIR) $(root)$(includedir)
$(MKDIR) $(root)$(runtimedir)
$(MKDIR) $(root)$(logfiledir)
***************
-*** 330,352 ****
+*** 338,360 ****
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
@@ -63,22 +73,23 @@
fi
@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
(cd $(TOP)/icons/ && $(TAR) cf - *) |\
---- 330,358 ----
+--- 339,368 ----
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
! # else \
-! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/data.default/"; \
+! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
(cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
-! (cd $(root)$(datadir)/data.default/ && $(TAR) xf -); \
-! find $(root)$(datadir)/data.default/ -type d -exec chmod a+rx {} \; ; \
-! find $(root)$(datadir)/data.default/ -type f -exec chmod a+r {} \; ; \
+! (cd $(root)$(doc_prefix)/ && $(TAR) xf -); \
+! find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
! # fi
! if [ ! -d $(root)$(datadir)/data ]; then \
-! $(CP) -Rp $(root)$(datadir)/data.default $(root)$(datadir)/data; \
+! $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data; \
! fi
+! $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default
! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
! # else \
@@ -89,12 +100,12 @@
! find $(root)$(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; ; \
! # fi
! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \
-! $(CP) -Rp $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
+! $(LN) -s $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
fi
@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
(cd $(TOP)/icons/ && $(TAR) cf - *) |\
***************
-*** 366,373 ****
+*** 374,381 ****
echo ""; \
cat $(TOP)/conf/$${conf}-dist ) |\
sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
@@ -103,7 +114,7 @@
-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
---- 372,379 ----
+--- 382,389 ----
echo ""; \
cat $(TOP)/conf/$${conf}-dist ) |\
sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
@@ -113,7 +124,7 @@
-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
***************
-*** 375,384 ****
+*** 383,392 ****
-e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
-e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
-e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
@@ -122,9 +133,9 @@
! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \
! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \
-e 's;conf/magic;$(sysconfdir)/magic;' \
- > $(TOP)/$(SRC)/.apaci.install.tmp && \
- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
---- 381,390 ----
+ -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
+ -e 's;Group #-1;Group $(conf_group);' \
+--- 391,400 ----
-e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
-e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
-e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
@@ -133,5 +144,5 @@
! -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \
! -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \
-e 's;conf/magic;$(sysconfdir)/magic;' \
- > $(TOP)/$(SRC)/.apaci.install.tmp && \
- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
+ -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
+ -e 's;Group #-1;Group $(conf_group);' \
diff --git a/www/apache21/files/patch-ak b/www/apache21/files/patch-ak
index a99c4343151c..e85e920f178e 100644
--- a/www/apache21/files/patch-ak
+++ b/www/apache21/files/patch-ak
@@ -1,13 +1,23 @@
-*** src/support/apachectl.orig Tue Mar 31 16:53:46 1998
---- src/support/apachectl Tue Apr 21 17:15:55 1998
+*** src/support/apachectl.orig Fri Jul 17 01:25:54 1998
+--- src/support/apachectl Thu Jul 23 17:11:38 1998
***************
-*** 37,42 ****
---- 37,44 ----
- #
+*** 39,44 ****
+--- 39,46 ----
# -------------------- --------------------
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
-+
-+ eval `limits -e -C daemon` >/dev/null 2>&1
++ eval `limits -e -C daemon` >/dev/null 2>&1
++
ERROR=0
ARGV="$@"
+ if [ "x$ARGV" = "x" ] ; then
+***************
+*** 82,87 ****
+--- 84,90 ----
+ fi
+ if kill $PID ; then
+ echo "$0 $ARG: httpd stopped"
++ rm $PIDFILE
+ else
+ echo "$0 $ARG: httpd could not be stopped"
+ ERROR=4
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 02:11:01 +0000