summaryrefslogtreecommitdiff
path: root/www/apache13+ipv6/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache13+ipv6/files')
-rw-r--r--www/apache13+ipv6/files/FreeBSD.layout20
-rw-r--r--www/apache13+ipv6/files/apache.sh9
-rw-r--r--www/apache13+ipv6/files/patch-aa12
-rw-r--r--www/apache13+ipv6/files/patch-ab17
-rw-r--r--www/apache13+ipv6/files/patch-ag38
-rw-r--r--www/apache13+ipv6/files/patch-ak2
-rw-r--r--www/apache13+ipv6/files/patch-al8
7 files changed, 32 insertions, 74 deletions
diff --git a/www/apache13+ipv6/files/FreeBSD.layout b/www/apache13+ipv6/files/FreeBSD.layout
deleted file mode 100644
index b73ee2ae1484..000000000000
--- a/www/apache13+ipv6/files/FreeBSD.layout
+++ /dev/null
@@ -1,20 +0,0 @@
-# FreeBSD layout...
-<Layout FreeBSD>
- prefix: /usr/local
- exec_prefix: $prefix
- bindir: $exec_prefix/bin
- sbindir: $exec_prefix/sbin
- libexecdir: $exec_prefix/libexec/apache
- mandir: $prefix/man
- sysconfdir: $prefix/etc/apache
- datadir: $prefix/www
- iconsdir: $datadir/icons
- htdocsdir: $datadir/data
- manualdir: $prefix/share/doc/apache
- cgidir: $datadir/cgi-bin
- includedir: $prefix/include/apache
- localstatedir: /var
- runtimedir: $localstatedir/run
- logfiledir: $localstatedir/log
- proxycachedir: $datadir/proxy
-</Layout>
diff --git a/www/apache13+ipv6/files/apache.sh b/www/apache13+ipv6/files/apache.sh
index ca4321814e5a..da657b5307ba 100644
--- a/www/apache13+ipv6/files/apache.sh
+++ b/www/apache13+ipv6/files/apache.sh
@@ -1,16 +1,11 @@
#!/bin/sh
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
case "$1" in
start)
- [ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'
+ [ -x %%PREFIX%%/sbin/apachectl ] && %%PREFIX%%/sbin/apachectl start > /dev/null && echo -n ' apache'
;;
stop)
- [ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache'
+ [ -r /var/run/httpd.pid ] && %%PREFIX%%/sbin/apachectl stop > /dev/null && echo -n ' apache'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/www/apache13+ipv6/files/patch-aa b/www/apache13+ipv6/files/patch-aa
index 15cd58c27ef2..78be57c08eed 100644
--- a/www/apache13+ipv6/files/patch-aa
+++ b/www/apache13+ipv6/files/patch-aa
@@ -1,23 +1,19 @@
---- configure.orig Tue Jan 18 01:53:17 2000
-+++ configure Mon Jan 24 19:37:21 2000
-@@ -1232,8 +1232,8 @@
+--- configure.orig Tue May 21 16:24:59 2002
++++ configure Wed Jun 19 05:27:31 2002
+@@ -1251,7 +1251,7 @@
echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
-- echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
- echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
-+ 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}${thetarget}.conf"
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1330,8 +1330,8 @@
+@@ -1349,7 +1349,7 @@
echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.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 '-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}${thetarget}.conf\"'" >>$src/apaci
diff --git a/www/apache13+ipv6/files/patch-ab b/www/apache13+ipv6/files/patch-ab
index a6d93e733362..a99bd7305990 100644
--- a/www/apache13+ipv6/files/patch-ab
+++ b/www/apache13+ipv6/files/patch-ab
@@ -1,21 +1,19 @@
---- Makefile.tmpl.orig Sun Oct 7 02:01:09 2001
-+++ Makefile.tmpl Sun Dec 2 11:19:23 2001
-@@ -270,10 +270,12 @@
+--- Makefile.tmpl.orig Thu Mar 14 00:05:27 2002
++++ Makefile.tmpl Thu Jun 20 05:30:58 2002
+@@ -270,10 +270,10 @@
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
- $(MKDIR) $(root)$(htdocsdir)
-+ $(RM) -rf $(root)$(htdocsdir).default
+ $(MKDIR) $(root)$(htdocsdir).default
$(MKDIR) $(root)$(manualdir)
$(MKDIR) $(root)$(iconsdir)
- $(MKDIR) $(root)$(cgidir)
-+ $(RM) -rf $(root)$(cgidir).default
+ $(MKDIR) $(root)$(cgidir).default
$(MKDIR) $(root)$(includedir)
$(MKDIR) $(root)$(includedir)/xml
$(MKDIR) $(root)$(runtimedir)
-@@ -457,33 +459,39 @@
+@@ -459,33 +459,39 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
@@ -70,7 +68,7 @@
@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
-@@ -522,14 +530,14 @@
+@@ -524,10 +530,10 @@
-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
@@ -85,8 +83,3 @@
-e 's;conf/magic;$(sysconfdir)/magic;' \
-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
-e 's;User nobody;User $(conf_user);' \
-- -e 's;Group #-1;Group $(conf_group);' \
-+ -e 's;Group "#-1";Group $(conf_group);' \
- -e 's;Port 80;Port $(conf_port);' \
- -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
- -e 's;ServerName new.host.name;ServerName $(conf_servername);' \
diff --git a/www/apache13+ipv6/files/patch-ag b/www/apache13+ipv6/files/patch-ag
index 80373fbcca63..58c60812aa88 100644
--- a/www/apache13+ipv6/files/patch-ag
+++ b/www/apache13+ipv6/files/patch-ag
@@ -1,6 +1,6 @@
---- conf/httpd.conf-dist.orig Mon Feb 21 08:30:46 2000
-+++ conf/httpd.conf-dist Mon May 29 16:48:49 2000
-@@ -354,7 +354,22 @@
+--- conf/httpd.conf-dist.orig Wed Jan 9 19:05:31 2002
++++ conf/httpd.conf-dist Fri Jan 25 07:59:12 2002
+@@ -356,7 +356,22 @@
# directory index. Separate multiple entries with spaces.
#
<IfModule mod_dir.c>
@@ -24,7 +24,7 @@
</IfModule>
#
-@@ -473,7 +488,7 @@
+@@ -476,7 +491,7 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
@@ -33,7 +33,7 @@
#
# If you would like to have agent and referer logfiles, uncomment the
-@@ -486,7 +501,7 @@
+@@ -489,7 +504,7 @@
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
@@ -42,25 +42,19 @@
#
# Optionally add a line containing the server version and virtual host
-@@ -708,13 +723,17 @@
- # For example, the PHP 3.x module (not part of the Apache distribution - see
- # http://www.php.net) will typically use:
+@@ -759,6 +774,15 @@
#
-- #AddType application/x-httpd-php3 .php3
-- #AddType application/x-httpd-php3-source .phps
+ <IfModule mod_negotiation.c>
+ LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
++ </IfModule>
++
+ <IfModule mod_php3.c>
-+ AddType application/x-httpd-php3 .php3
-+ AddType application/x-httpd-php3-source .php3s
++ AddType application/x-httpd-php3 .php3
++ AddType application/x-httpd-php3-source .php3s
+ </IfModule>
- #
- # And for PHP 4.x, use:
- #
-- #AddType application/x-httpd-php .php
-- #AddType application/x-httpd-php-source .phps
+ <IfModule mod_php4.c>
-+ AddType application/x-httpd-php .php
-+ AddType application/x-httpd-php-source .phps
-+ </IfModule>
-
- AddType application/x-tar .tgz
++ AddType application/x-httpd-php .php
++ AddType application/x-httpd-php-source .phps
+ </IfModule>
+ #
diff --git a/www/apache13+ipv6/files/patch-ak b/www/apache13+ipv6/files/patch-ak
index 486f7ad159cf..9f3163556b4c 100644
--- a/www/apache13+ipv6/files/patch-ak
+++ b/www/apache13+ipv6/files/patch-ak
@@ -4,7 +4,7 @@
# -------------------- --------------------
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
-+eval `limits -e -C daemon` >/dev/null 2>&1
++eval `limits -e -U www` >/dev/null 2>&1
+
ERROR=0
ARGV="$@"
diff --git a/www/apache13+ipv6/files/patch-al b/www/apache13+ipv6/files/patch-al
index b355a697b4ab..bd792616581e 100644
--- a/www/apache13+ipv6/files/patch-al
+++ b/www/apache13+ipv6/files/patch-al
@@ -1,6 +1,6 @@
---- src/support/log_server_status.orig Fri Jun 4 19:54:19 1999
-+++ src/support/log_server_status Fri Sep 3 15:53:16 1999
-@@ -67,10 +67,10 @@
+--- src/support/log_server_status.orig Mon Jan 15 20:06:38 2001
++++ src/support/log_server_status Fri Jan 25 08:03:03 2002
+@@ -70,10 +70,10 @@
#
require 'sys/socket.ph';
@@ -13,7 +13,7 @@
sub tcp_connect
{
-@@ -100,7 +100,7 @@
+@@ -103,7 +103,7 @@
chomp($date);
($day,$time)=split(/:/,$date);
$res=&tcp_connect($server,$port);
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-01 23:59:35 +0000