diff options
author | Olli Hauer <ohauer@FreeBSD.org> | 2012-01-01 19:30:58 +0000 |
---|---|---|
committer | Olli Hauer <ohauer@FreeBSD.org> | 2012-01-01 19:30:58 +0000 |
commit | 2c96f26a12ae4d0474c70d61c6cab483c2865f49 (patch) | |
tree | 3d7591c78a947273efae6c582aacdca524e69528 /www/apache13/files | |
parent | d800016e3408fa62b2ffd8ead6e8ab7abb84a0bb (diff) |
Notes
Diffstat (limited to 'www/apache13/files')
-rw-r--r-- | www/apache13/files/apache.in | 33 | ||||
-rw-r--r-- | www/apache13/files/no_port_doc | 22 | ||||
-rw-r--r-- | www/apache13/files/patch-aa | 20 | ||||
-rw-r--r-- | www/apache13/files/patch-ab | 96 | ||||
-rw-r--r-- | www/apache13/files/patch-ac | 31 | ||||
-rw-r--r-- | www/apache13/files/patch-ad | 11 | ||||
-rw-r--r-- | www/apache13/files/patch-ae | 35 | ||||
-rw-r--r-- | www/apache13/files/patch-ag | 64 | ||||
-rw-r--r-- | www/apache13/files/patch-aj | 15 | ||||
-rw-r--r-- | www/apache13/files/patch-ak | 19 | ||||
-rw-r--r-- | www/apache13/files/patch-al | 24 | ||||
-rw-r--r-- | www/apache13/files/patch-apxs | 10 | ||||
-rw-r--r-- | www/apache13/files/patch-ba | 20 | ||||
-rw-r--r-- | www/apache13/files/patch-bb | 60 |
14 files changed, 0 insertions, 460 deletions
diff --git a/www/apache13/files/apache.in b/www/apache13/files/apache.in deleted file mode 100644 index 4d8421e20b5a..000000000000 --- a/www/apache13/files/apache.in +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# PROVIDE: apache -# REQUIRE: LOGIN cleanvar -# KEYWORD: shutdown - -# Define these apache_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/apache -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -# apache_enable="YES" -# apache_flags="<set as needed>" - -apache_enable=${apache_enable-"NO"} -apache_pidfile=${apache_pidfile-"/var/run/httpd.pid"} - -. /etc/rc.subr - -name="apache" -rcvar=`set_rcvar` -command="%%PREFIX%%/sbin/httpd" - -load_rc_config $name - -pidfile="${apache_pidfile}" -start_precmd="`/usr/bin/limits -e -U www`" -start_postcmd="`/usr/bin/limits -e -C daemon`" - -run_rc_command "$1" diff --git a/www/apache13/files/no_port_doc b/www/apache13/files/no_port_doc deleted file mode 100644 index 36190f286bd0..000000000000 --- a/www/apache13/files/no_port_doc +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.tmpl.orig 2007-10-15 23:37:45.000000000 -0400 -+++ Makefile.tmpl 2007-10-15 23:37:59.000000000 -0400 -@@ -229,7 +229,6 @@ - $(MKDIR) $(root)$(sysconfdir) - $(MKDIR) $(root)$(htdocsdir)/ - $(MKDIR) $(root)$(htdocsdir)-dist -- $(MKDIR) $(root)$(manualdir) - $(MKDIR) $(root)$(iconsdir) - $(MKDIR) $(root)$(cgidir)/ - $(MKDIR) $(root)$(cgidir)-dist -@@ -423,11 +422,6 @@ - (cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \ - find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \ - find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ; -- echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \ -- (cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\ -- (cd $(root)$(manualdir)/ && $(TAR) -xf -); \ -- find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ -- find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; - for script in printenv test-cgi; do \ - cat $(TOP)/cgi-bin/$${script} |\ - sed -e 's;^#!/.*perl;#!$(PERL);' \ diff --git a/www/apache13/files/patch-aa b/www/apache13/files/patch-aa deleted file mode 100644 index 78be57c08eed..000000000000 --- a/www/apache13/files/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ ---- 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_ERRORLOG: ${logfiledir_relative}error_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" -@@ -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_ERRORLOG=\"${logfiledir_relative}error_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 - echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab deleted file mode 100644 index 986749781248..000000000000 --- a/www/apache13/files/patch-ab +++ /dev/null @@ -1,96 +0,0 @@ ---- Makefile.tmpl.orig 2006-07-12 12:16:05.000000000 +0400 -+++ Makefile.tmpl 2007-10-01 09:21:04.000000000 +0400 -@@ -227,10 +227,12 @@ - $(MKDIR) $(root)$(mandir)/man1 - $(MKDIR) $(root)$(mandir)/man8 - $(MKDIR) $(root)$(sysconfdir) -- $(MKDIR) $(root)$(htdocsdir) -+ $(MKDIR) $(root)$(htdocsdir)/ -+ $(MKDIR) $(root)$(htdocsdir)-dist - $(MKDIR) $(root)$(manualdir) - $(MKDIR) $(root)$(iconsdir) -- $(MKDIR) $(root)$(cgidir) -+ $(MKDIR) $(root)$(cgidir)/ -+ $(MKDIR) $(root)$(cgidir)-dist - $(MKDIR) $(root)$(includedir) - $(MKDIR) $(root)$(includedir)/xml - $(MKDIR) $(root)$(runtimedir) -@@ -416,33 +418,23 @@ - # icons and distributed CGI scripts. - install-data: - @echo "===> [data: Installing initial data files]" -- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ -- else \ -- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -+ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)-dist/"; \ - (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\ -- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ -- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ -- find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \ -- fi -- -@if [ -d $(TOP)/htdocs/manual ]; then \ -+ (cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \ -+ find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \ -+ find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ; - echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \ - (cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(manualdir)/ && $(TAR) -xf -); \ - find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ -- find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \ -- fi -- -@if [ -f $(root)$(cgidir)/printenv ]; then \ -- echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \ -- else \ -+ find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; - for script in printenv test-cgi; do \ - cat $(TOP)/cgi-bin/$${script} |\ - sed -e 's;^#!/.*perl;#!$(PERL);' \ - > $(TOP)/$(SRC)/.apaci.install.tmp; \ -- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \ -- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \ -- done; \ -- fi -+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)-dist/$${script}"; \ -+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)-dist/$${script}; \ -+ done; - @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ - (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ -@@ -481,10 +473,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;' \ -- -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \ -- -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \ -- -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \ -- -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \ -+ -e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \ -+ -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \ -+ -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \ -+ -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/srm.conf;$(sysconfdir)/srm.conf;' \ - -e 's;conf/access.conf;$(sysconfdir)/access.conf;' \ -@@ -496,8 +488,8 @@ - -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \ - -e 's;ServerName new.host.name;ServerName $(conf_servername);' \ - > $(TOP)/$(SRC)/.apaci.install.tmp && \ -- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \ -- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \ -+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}-dist"; \ -+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}-dist; \ - if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \ - $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \ -@@ -506,8 +498,8 @@ - fi; \ - done - -@for conf in mime.types magic; do \ -- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \ -- $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \ -+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist"; \ -+ $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist; \ - if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \ - $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \ diff --git a/www/apache13/files/patch-ac b/www/apache13/files/patch-ac deleted file mode 100644 index f4f02e80cbc2..000000000000 --- a/www/apache13/files/patch-ac +++ /dev/null @@ -1,31 +0,0 @@ ---- src/modules/standard/mod_auth_db.module.bak Tue Oct 16 13:12:02 2001 -+++ src/modules/standard/mod_auth_db.module Thu Feb 20 12:55:19 2003 -@@ -4,23 +4,23 @@ - DB_LIB='' - if ./helpers/TestCompile func db_create; then - DB_VERSION='Berkeley-DB/3.x' -- elif ./helpers/TestCompile lib db db_create; then -+ elif ./helpers/TestCompile lib dbXXX db_create; then - DB_VERSION='Berkeley-DB/3.x' - DB_LIB='-ldb' - elif ./helpers/TestCompile func db_open; then - DB_VERSION='Berkeley-DB/2.x' -- elif ./helpers/TestCompile lib db db_open; then -+ elif ./helpers/TestCompile lib dbXXX db_open; then - DB_VERSION='Berkeley-DB/2.x' - DB_LIB='-ldb' -- elif ./helpers/TestCompile lib db2 db_open; then -+ elif ./helpers/TestCompile lib db2XXX db_open; then - DB_VERSION='Berkeley-DB/2.x' - DB_LIB='-ldb2' - elif ./helpers/TestCompile func dbopen; then - DB_VERSION='Berkeley-DB/1.x' -- elif ./helpers/TestCompile lib db dbopen; then -+ elif ./helpers/TestCompile lib dbXXX dbopen; then - DB_VERSION='Berkeley-DB/1.x' - DB_LIB='-ldb' -- elif ./helpers/TestCompile lib db1 dbopen; then -+ elif ./helpers/TestCompile lib db1XXX dbopen; then - DB_VERSION='Berkeley-DB/1.x' - DB_LIB='-ldb1' - elif TCADDINCL='#include <db.h>' INCLUDES1="$INCLUDES1 -I/usr/include/db1" TLIB="-ldb1" \ diff --git a/www/apache13/files/patch-ad b/www/apache13/files/patch-ad deleted file mode 100644 index d92d2f447613..000000000000 --- a/www/apache13/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- src/support/dbmmanage.bak Thu Mar 14 00:05:37 2002 -+++ src/support/dbmmanage Mon Jun 2 23:05:27 2003 -@@ -338,6 +338,8 @@ - } elsif (substr($chkpass, 0, 5) eq '{SHA}') { - need_sha1_crypt; - $crypt_method = "sha1"; -+ } elsif (substr($chkpass, 0, 3) eq '$1$') { -+ $crypt_method = "crypt"; - } elsif (length($chkpass) == 13 && $chkpass ne $testpass) { - $crypt_method = "crypt"; - } else { diff --git a/www/apache13/files/patch-ae b/www/apache13/files/patch-ae deleted file mode 100644 index 530af73ee920..000000000000 --- a/www/apache13/files/patch-ae +++ /dev/null @@ -1,35 +0,0 @@ ---- src/Configure.orig 2007-08-10 19:45:50.000000000 +0400 -+++ src/Configure 2007-09-08 04:46:28.000000000 +0400 -@@ -26,7 +26,7 @@ - # fp2rp: - # slo.sh: - --LANG=C; export LANG -+LC_ALL=C; export LC_ALL - exitcode=0 - trap 'rm -f $tmpfile $tmpfile2 $tmpfile3 $tmpconfig $awkfile; exit $exitcode' 0 1 2 3 15 - -@@ -457,7 +457,7 @@ - PLATOSVERS=`echo $PLAT | sed 's/^.*freebsd//'` - OS="FreeBSD $PLATOSVERS" - case "$PLATOSVERS" in -- [23456]*) -+ *) - DEF_WANTHSREGEX=no - CFLAGS="$CFLAGS -funsigned-char" - ;; -@@ -1083,14 +1083,8 @@ - CFLAGS_SHLIB="-fpic" - LDFLAGS_SHLIB="-shared" - LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB -- OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -- if [ "x$OBJFORMAT" = "xelf" ]; then - LDFLAGS_SHLIB_EXPORT="-Wl,-E" - SHLIB_SUFFIX_DEPTH=0 -- else -- LDFLAGS_SHLIB_EXPORT="" -- SHLIB_SUFFIX_DEPTH=2 -- fi - ;; - *-openbsd*) - PLATOSVERS=`echo $PLAT | sed 's/^.*openbsd//'` diff --git a/www/apache13/files/patch-ag b/www/apache13/files/patch-ag deleted file mode 100644 index 58ef46c45c2f..000000000000 --- a/www/apache13/files/patch-ag +++ /dev/null @@ -1,64 +0,0 @@ ---- conf/httpd.conf-dist.old 2004-11-24 22:10:19.000000000 +0300 -+++ conf/httpd.conf-dist 2008-07-19 18:42:27.000000000 +0400 -@@ -356,7 +356,22 @@ - # directory index. Separate multiple entries with spaces. - # - <IfModule mod_dir.c> -- DirectoryIndex index.html -+ <IfModule mod_php3.c> -+ DirectoryIndex index.php3 index.html -+ </IfModule> -+ <IfModule !mod_php3.c> -+ <IfModule mod_php4.c> -+ DirectoryIndex index.php index.html -+ </IfModule> -+ <IfModule !mod_php4.c> -+ <IfModule mod_php5.c> -+ DirectoryIndex index.php index.html -+ </IfModule> -+ <IfModule !mod_php5.c> -+ DirectoryIndex index.html -+ </IfModule> -+ </IfModule> -+ </IfModule> - </IfModule> - - # -@@ -476,7 +491,7 @@ - # define per-<VirtualHost> access logfiles, transactions will be - # logged therein and *not* in this file. - # --CustomLog logs/access_log common -+#CustomLog logs/access_log common - - # - # If you would like to have agent and referer logfiles, uncomment the -@@ -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. - # --#CustomLog logs/access_log combined -+CustomLog logs/access_log combined - - # - # Optionally add a line containing the server version and virtual host -@@ -746,6 +761,19 @@ - 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 -+ </IfModule> -+ <IfModule mod_php4.c> -+ AddType application/x-httpd-php .php -+ AddType application/x-httpd-php-source .phps -+ </IfModule> -+ <IfModule mod_php5.c> -+ AddType application/x-httpd-php .php -+ AddType application/x-httpd-php-source .phps -+ </IfModule> -+ - # - # AddType allows you to tweak mime.types without actually editing it, or to - # make certain files to be certain types. diff --git a/www/apache13/files/patch-aj b/www/apache13/files/patch-aj deleted file mode 100644 index 9c1596e0cb70..000000000000 --- a/www/apache13/files/patch-aj +++ /dev/null @@ -1,15 +0,0 @@ ---- src/support/apxs.pl.orig Mon Nov 29 21:05:12 2004 -+++ src/support/apxs.pl Mon Nov 29 21:05:56 2004 -@@ -604,12 +604,10 @@ - print FP $content; - close(FP); - if ($^O ne "MSWin32") { -- push(@cmds, "cp $cfgbase.conf $cfgbase.conf.bak"); - push(@cmds, "cp $cfgbase.conf.new $cfgbase.conf"); - push(@cmds, "rm $cfgbase.conf.new"); - } else { - $cfgbase =~ s|/|\\|g; -- push(@cmds, "copy \"$cfgbase.conf\" \"$cfgbase.conf.bak\""); - push(@cmds, "copy \"$cfgbase.conf.new\" \"$cfgbase.conf\""); - push(@cmds, "del \"$cfgbase.conf.new\""); - } diff --git a/www/apache13/files/patch-ak b/www/apache13/files/patch-ak deleted file mode 100644 index 9f3163556b4c..000000000000 --- a/www/apache13/files/patch-ak +++ /dev/null @@ -1,19 +0,0 @@ ---- src/support/apachectl.orig Wed Apr 7 00:36:33 1999 -+++ src/support/apachectl Fri Sep 3 15:41:01 1999 -@@ -39,6 +39,8 @@ - # -------------------- -------------------- - # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| - -+eval `limits -e -U www` >/dev/null 2>&1 -+ - ERROR=0 - ARGV="$@" - if [ "x$ARGV" = "x" ] ; then -@@ -82,6 +84,7 @@ - fi - if kill $PID ; then - echo "$0 $ARG: httpd stopped" -+ rm $PIDFILE - else - echo "$0 $ARG: httpd could not be stopped" - ERROR=4 diff --git a/www/apache13/files/patch-al b/www/apache13/files/patch-al deleted file mode 100644 index bd792616581e..000000000000 --- a/www/apache13/files/patch-al +++ /dev/null @@ -1,24 +0,0 @@ ---- 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'; - --$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312" -+$wherelog = "/var/log/httpd-status-"; - $server = "localhost"; # Name of server, could be "www.foo.com" - $port = "80"; # Port on server --$request = "/status/?auto"; # Request to send -+$request = "/server-status/?auto"; # Request to send - - sub tcp_connect - { -@@ -103,7 +103,7 @@ - chomp($date); - ($day,$time)=split(/:/,$date); - $res=&tcp_connect($server,$port); -- open(OUT,">>$wherelog$day"); -+ open(OUT,">>$wherelog$day.log"); - if ($res) { - print OUT "$time:-1:-1:-1:-1:$res\n"; - exit 1; diff --git a/www/apache13/files/patch-apxs b/www/apache13/files/patch-apxs deleted file mode 100644 index 9d8f1116f4ec..000000000000 --- a/www/apache13/files/patch-apxs +++ /dev/null @@ -1,10 +0,0 @@ ---- src/support/apxs.pl -+++ src/support/apxs.pl -@@ -47,6 +47,7 @@ - $CFG_CFLAGS =~ s|^\s+||; - $CFG_CFLAGS =~ s|\s+$||; - $CFG_CFLAGS =~ s|\s+`.+apaci`||; -+$CFG_CFLAGS =~ s|\s+-std=[^\s]+||; - - ## - ## parse argument line diff --git a/www/apache13/files/patch-ba b/www/apache13/files/patch-ba deleted file mode 100644 index 1f92bd360250..000000000000 --- a/www/apache13/files/patch-ba +++ /dev/null @@ -1,20 +0,0 @@ ---- src/support/Makefile.tmpl.orig Sat Mar 2 20:46:23 2002 -+++ src/support/Makefile.tmpl Tue Oct 22 00:31:18 2002 -@@ -7,7 +7,7 @@ - # LIBS=-L$(SSLLOC)/lib -lssl -lcrypto -lm -lap -los $(EXTRA_LIBS) $(LIBS1) - # INCLUDES=-I$(SSLLOC)/include $(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES) - --CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) -+CFLAGS=-DLOGIN_CAP $(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) - LIBS=-lm -lap -los $(EXTRA_LIBS) $(LIBS1) - INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES) - LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L$(OSDIR) -L$(SRCDIR)/ap -@@ -50,7 +50,7 @@ - -e 's%@LIBS_SHLIB@%$(LIBS_SHLIB)%g' && chmod a+x apxs - - suexec: suexec.o -- $(CC) $(CFLAGS) -o suexec $(LDFLAGS) suexec.o $(LIBS) -+ $(CC) $(CFLAGS) -lutil -o suexec $(LDFLAGS) suexec.o $(LIBS) - - clean: - rm -f $(TARGETS) *.o diff --git a/www/apache13/files/patch-bb b/www/apache13/files/patch-bb deleted file mode 100644 index 313c5f515759..000000000000 --- a/www/apache13/files/patch-bb +++ /dev/null @@ -1,60 +0,0 @@ ---- src/support/suexec.c.orig Wed Mar 5 18:50:29 2003 -+++ src/support/suexec.c Fri Jul 18 18:09:56 2003 -@@ -90,6 +90,9 @@ - #include <sys/types.h> - - #include <stdarg.h> -+#ifdef LOGIN_CAP -+#include <login_cap.h> -+#endif - - #include "suexec.h" - -@@ -322,6 +325,9 @@ - #ifdef LOG_EXEC - fprintf(stderr, " -D LOG_EXEC=\"%s\"\n", LOG_EXEC); - #endif -+#ifdef LOGIN_CAP -+ fprintf(stderr, " -D LOGIN_CAP\n"); -+#endif - #ifdef SAFE_PATH - fprintf(stderr, " -D SAFE_PATH=\"%s\"\n", SAFE_PATH); - #endif -@@ -480,7 +486,28 @@ - - /* - * Change UID/GID here so that the following tests work over NFS. -- * -+ */ -+ -+#ifdef LOGIN_CAP -+ /* -+ * Set user context (resources, priority and grouplist). -+ * If unsuccessful, error out. -+ */ -+ if (setusercontext(NULL, pw, uid, LOGIN_SETRESOURCES | LOGIN_SETPRIORITY | -+ LOGIN_SETGROUP | LOGIN_SETLOGIN) == -1) { -+ log_err("emerg: failed to set user context (%ld: %s)\n", uid, cmd); -+ exit(108); -+ } -+ -+ /* -+ * Set gid to the target group. If unsuccessful, error out. -+ */ -+ if ((setgid(gid)) != 0) { -+ log_err("emerg: failed to setgid (%ld: %s)\n", gid, cmd); -+ exit(109); -+ } -+#else /* !LOGIN_CAP */ -+ /* - * Initialize the group access list for the target user, - * and setgid() to the target group. If unsuccessful, error out. - */ -@@ -488,6 +515,7 @@ - log_err("emerg: failed to setgid (%ld: %s)\n", gid, cmd); - exit(109); - } -+#endif /* LOGIN_CAP */ - - /* - * setuid() to the target user. Error out on fail. |