+++ /dev/null
-diff -ruN -x Makefile.in -x configure -x *~ -x apache_1.3.22.orig -x ap_ctx.[ch] -x ap_hook.[ch] -x ap_mm.[ch] -x os-inline.c -x os.h apache_1.3.22.orig/src/support/apxs.pl apache_1.3.22/src/support/apxs.pl
---- apache_1.3.22.orig/src/support/apxs.pl Sat Dec 15 22:27:31 2001
-+++ apache_1.3.22/src/support/apxs.pl Sat Dec 15 22:27:14 2001
-@@ -507,7 +507,7 @@
- $filename = "mod_${name}.c";
- }
- my $dir = $CFG_LIBEXECDIR;
-- $dir =~ s|^$CFG_PREFIX/?||;
-+ $dir =~ s|^$CFG_SYSCONFDIR/?||;
- $dir =~ s|(.)$|$1/|;
- push(@lmd, sprintf("LoadModule %-18s %s", "${name}_module", "$dir$t"));
- push(@amd, sprintf("AddModule %s", $filename));
+++ /dev/null
-
-This is the patch posted to Bug #8334 in the Apache BTS.
-
-diff -ruN -x Makefile.in -x configure -x *~ -x apache_1.3.22.orig -x ap_ctx.[ch] -x ap_hook.[ch] -x ap_mm.[ch] -x os-inline.c -x os.h apache_1.3.22.orig/src/main/http_core.c apache_1.3.22/src/main/http_core.c
---- apache_1.3.22.orig/src/main/http_core.c Fri Jan 18 00:15:41 2002
-+++ apache_1.3.22/src/main/http_core.c Fri Jan 18 00:10:45 2002
-@@ -581,9 +581,16 @@
- {
- core_dir_config *conf;
-
-- conf = (core_dir_config *)ap_get_module_config(r->per_dir_config,
-+ /* prefer per-request settings */
-+ conf = (core_dir_config *)ap_get_module_config(r->request_config,
- &core_module);
-
-+ /* but if there aren't any, try the dir config */
-+ if ( conf == NULL ) {
-+ conf = (core_dir_config *) ap_get_module_config(r->per_dir_config,
-+ &core_module);
-+ }
-+
- if (conf->response_code_strings == NULL) {
- return NULL;
- }
-@@ -1169,8 +1176,14 @@
- API_EXPORT(void) ap_custom_response(request_rec *r, int status, char *string)
- {
- core_dir_config *conf =
-- ap_get_module_config(r->per_dir_config, &core_module);
-+ ap_get_module_config(r->request_config, &core_module);
- int idx;
-+
-+ if(conf == NULL) {
-+ /* if this doesn't exist, we'll have to make one */
-+ conf = (core_dir_config*) ap_pcalloc(r->pool, sizeof(core_dir_config));
-+ ap_set_module_config(r->request_config, &core_module, conf);
-+ }
-
- if(conf->response_code_strings == NULL) {
- conf->response_code_strings =
+++ /dev/null
-diff -uNr apache_1.3.26.orig/conf/mime.types apache_1.3.26/conf/mime.types
---- apache_1.3.26.orig/conf/mime.types Sun Apr 14 12:43:08 2002
-+++ apache_1.3.26/conf/mime.types Fri Sep 13 19:54:00 2002
-@@ -285,19 +285,18 @@
- application/x-bcpio bcpio
- application/x-cdlink vcd
- application/x-chess-pgn pgn
--application/x-compress
- application/x-cpio cpio
- application/x-csh csh
- application/x-director dcr dir dxr
- application/x-dvi dvi
- application/x-futuresplash spl
- application/x-gtar gtar
--application/x-gzip
- application/x-hdf hdf
- application/x-javascript js
- application/x-koan skp skd skt skm
- application/x-latex latex
- application/x-netcdf nc cdf
-+application/x-ogg ogg
- application/x-sh sh
- application/x-shar shar
- application/x-shockwave-flash swf
+++ /dev/null
-diff -ruN -x Makefile.in -x configure -x *~ -x apache_1.3.14.orig apache_1.3.14.orig/src/include/hsregex.h apache_1.3.14/src/include/hsregex.h
---- apache_1.3.14.orig/src/include/hsregex.h Mon Sep 25 16:48:24 2000
-+++ apache_1.3.14/src/include/hsregex.h Wed Dec 6 15:20:03 2000
-@@ -24,7 +24,7 @@
- #endif
- #endif
-
--typedef off_t regoff_t;
-+typedef int regoff_t;
- typedef struct {
- int re_magic;
- size_t re_nsub; /* number of parenthesized subexpressions */
+++ /dev/null
---- apache_1.3.22.orig/src/support/suexec.c Thu Mar 8 11:11:43 2001
-+++ apache-1.3.22/src/support/suexec.c Thu Jan 10 21:00:14 2002
-@@ -90,6 +90,7 @@
- #include <sys/types.h>
-
- #include <stdarg.h>
-+#include <strings.h>
-
- #include "suexec.h"
-
-@@ -165,6 +166,8 @@
- "UNIQUE_ID",
- "USER_NAME",
- "TZ",
-+ "HTTPS",
-+ "REDIRECT_HTTPS",
- NULL
- };
-
-@@ -228,7 +231,8 @@
- cidx++;
-
- for (ep = environ; *ep && cidx < AP_ENVBUF-1; ep++) {
-- if (!strncmp(*ep, "HTTP_", 5)) {
-+ if (!strncmp(*ep, "HTTP_", 5) ||
-+ !strncmp(*ep, "SSL_", 4)) {
- cleanenv[cidx] = *ep;
- cidx++;
- }
-@@ -249,6 +253,244 @@
- environ = cleanenv;
- }
-
-+#define MY_STATE_NORMAL 0
-+#define MY_STATE_SPACE 1
-+#define MY_STATE_QUOTES 2
-+#define MY_STATE_APOSTROPHES 3
-+#define MY_STATE_END 4
-+
-+char** param_separate(char* params, int addl_slots) {
-+ int state, actpos, actarg_start, actarg_len, argnum;
-+ char **res=0;
-+ char backslash=0;
-+
-+ if (params==0) return(0);
-+
-+ if (*params==0) {
-+ res=(char**)malloc(sizeof(char*)*(1+addl_slots));
-+ for (actpos=0;actpos<addl_slots+1;++actpos) res[actpos]=0;
-+ return(res);
-+ }
-+ actpos=0;backslash=0;argnum=0;state=MY_STATE_SPACE;
-+ while (state!=MY_STATE_END) {
-+ switch (state) {
-+
-+ case MY_STATE_SPACE:
-+ switch (params[actpos]) {
-+ case 0 :
-+ state=MY_STATE_END;
-+ break;
-+
-+ case ' ' :
-+ case '\t':
-+ break;
-+
-+ case '\'':
-+ state=MY_STATE_APOSTROPHES;
-+ actarg_start=actpos+1;
-+ break;
-+ case '"':
-+ state=MY_STATE_QUOTES;
-+ actarg_start=actpos+1;
-+ break;
-+ default:
-+ state=MY_STATE_NORMAL;
-+ actarg_start=actpos;
-+ }
-+ break;
-+
-+ case MY_STATE_NORMAL:
-+
-+ switch (params[actpos]) {
-+ case 0 :
-+ state=MY_STATE_END;
-+ ++argnum;
-+ actarg_len=actpos-actarg_start;
-+ break;
-+
-+ case ' ':
-+ case '\t':
-+ state=MY_STATE_SPACE;
-+ ++argnum;
-+ actarg_len=actpos-actarg_start;
-+ break;
-+ }
-+ break;
-+
-+ case MY_STATE_APOSTROPHES:
-+
-+ switch (params[actpos]) {
-+ case 0 :
-+ state=MY_STATE_END;
-+ ++argnum;
-+ actarg_len=actpos-actarg_start;
-+ break;
-+
-+ case '\\':
-+ backslash=1-backslash;
-+ break;
-+
-+ case '\'':
-+ if (! backslash) {
-+ state=MY_STATE_SPACE;
-+ ++argnum;
-+ actarg_len=actpos-actarg_start;
-+ }
-+ break;
-+ }
-+ if (params[actpos]!='\\') backslash=0;
-+ break;
-+
-+ case MY_STATE_QUOTES:
-+
-+ switch (params[actpos]) {
-+ case 0 :
-+ state=MY_STATE_END;
-+ ++argnum;
-+ actarg_len=actpos-actarg_start;
-+ break;
-+
-+ case '\\':
-+ backslash=1-backslash;
-+ break;
-+
-+ case '"':
-+ if (! backslash) {
-+ state=MY_STATE_SPACE;
-+ ++argnum;
-+ actarg_len=actpos-actarg_start;
-+ }
-+ break;
-+ }
-+ if (params[actpos]!='\\') backslash=0;
-+ break;
-+ }
-+ actpos++;
-+ }
-+
-+ res=(char**)malloc(sizeof(char*)*(argnum+1+addl_slots));
-+ for (actpos=0;actpos<argnum+addl_slots+1;++actpos) res[actpos]=0;
-+
-+
-+ actpos=0;backslash=0;argnum=0;state=MY_STATE_SPACE;
-+ while (state!=MY_STATE_END) {
-+ switch (state) {
-+
-+ case MY_STATE_SPACE:
-+ switch (params[actpos]) {
-+ case 0 :
-+ state=MY_STATE_END;
-+ break;
-+
-+ case ' ' :
-+ case '\t':
-+ break;
-+
-+ case '\'':
-+ state=MY_STATE_APOSTROPHES;
-+ actarg_start=actpos+1;
-+ break;
-+ case '"':
-+ state=MY_STATE_QUOTES;
-+ actarg_start=actpos+1;
-+ break;
-+ default:
-+ state=MY_STATE_NORMAL;
-+ actarg_start=actpos;
-+ }
-+ break;
-+
-+ case MY_STATE_NORMAL:
-+
-+ switch (params[actpos]) {
-+ case 0 :
-+ state=MY_STATE_END;
-+ actarg_len=actpos-actarg_start;
-+ res[argnum]=(char*)malloc(actarg_len+1);
-+ strncpy(res[argnum],¶ms[actarg_start],actarg_len);
-+ res[argnum][actarg_len]=0;
-+ ++argnum;
-+ break;
-+
-+ case ' ':
-+ case '\t':
-+ state=MY_STATE_SPACE;
-+ actarg_len=actpos-actarg_start;
-+ res[argnum]=(char*)malloc(actarg_len+1);
-+ strncpy(res[argnum],¶ms[actarg_start],actarg_len);
-+ res[argnum][actarg_len]=0;
-+ ++argnum;
-+ break;
-+ }
-+ break;
-+
-+ case MY_STATE_APOSTROPHES:
-+
-+ switch (params[actpos]) {
-+ case 0 :
-+ state=MY_STATE_END;
-+ actarg_len=actpos-actarg_start;
-+ res[argnum]=(char*)malloc(actarg_len+1);
-+ strncpy(res[argnum],¶ms[actarg_start],actarg_len);
-+ res[argnum][actarg_len]=0;
-+ ++argnum;
-+ break;
-+
-+ case '\\':
-+ backslash=1-backslash;
-+ break;
-+
-+ case '\'':
-+ if (! backslash) {
-+ state=MY_STATE_SPACE;
-+ actarg_len=actpos-actarg_start;
-+ res[argnum]=(char*)malloc(actarg_len+1);
-+ strncpy(res[argnum],¶ms[actarg_start],actarg_len);
-+ res[argnum][actarg_len]=0;
-+ ++argnum;
-+ }
-+ break;
-+ }
-+ if (params[actpos]!='\\') backslash=0;
-+ break;
-+
-+ case MY_STATE_QUOTES:
-+
-+ switch (params[actpos]) {
-+ case 0 :
-+ state=MY_STATE_END;
-+ actarg_len=actpos-actarg_start;
-+ res[argnum]=(char*)malloc(actarg_len+1);
-+ strncpy(res[argnum],¶ms[actarg_start],actarg_len);
-+ res[argnum][actarg_len]=0;
-+ ++argnum;
-+ break;
-+
-+ case '\\':
-+ backslash=1-backslash;
-+ break;
-+
-+ case '"':
-+ if (! backslash) {
-+ state=MY_STATE_SPACE;
-+ actarg_len=actpos-actarg_start;
-+ res[argnum]=(char*)malloc(actarg_len+1);
-+ strncpy(res[argnum],¶ms[actarg_start],actarg_len);
-+ res[argnum][actarg_len]=0;
-+ ++argnum;
-+ }
-+ break;
-+ }
-+ if (params[actpos]!='\\') backslash=0;
-+ break;
-+ }
-+ actpos++;
-+ }
-+
-+ return(res);
-+}
-+
-+
- int main(int argc, char *argv[])
- {
- int userdir = 0; /* ~userdir flag */
-@@ -261,6 +503,10 @@
- char *actual_gname; /* actual group name */
- char *prog; /* name of this program */
- char *cmd; /* command to be executed */
-+
-+ int ind, ind2;
-+ char **passedargv = 0;
-+
- char cwd[AP_MAXPATH]; /* current working directory */
- char dwd[AP_MAXPATH]; /* docroot working directory */
- struct passwd *pw; /* password entry holder */
-@@ -534,8 +780,18 @@
- /*
- * Error out if we cannot stat the program.
- */
-- if (((lstat(cmd, &prg_info)) != 0) || (S_ISLNK(prg_info.st_mode))) {
-- log_err("error: cannot stat program: (%s)\n", cmd);
-+ passedargv=param_separate(cmd,argc-4);
-+ for (ind=0; passedargv[ind]; ++ind);
-+ for (ind2=4;ind2<argc;++ind2,++ind) {
-+ if (argv[ind2]!=0) if (argv[ind2][0]!=0) passedargv[ind]=strdup(argv[ind2]);
-+ if (passedargv[ind]==0) {
-+ passedargv[ind]=malloc(1);
-+ passedargv[ind][0]=0;
-+ }
-+ }
-+
-+ if (((lstat(passedargv[0], &prg_info)) != 0) || (S_ISLNK(prg_info.st_mode))) {
-+ log_err("error: cannot stat program: (%s)\n", passedargv[0]);
- exit(117);
- }
-
-@@ -543,7 +799,7 @@
- * Error out if the program is writable by others.
- */
- if ((prg_info.st_mode & S_IWOTH) || (prg_info.st_mode & S_IWGRP)) {
-- log_err("error: file is writable by others: (%s/%s)\n", cwd, cmd);
-+ log_err("error: file is writable by others: (%s/%s)\n", cwd, passedargv[0]);
- exit(118);
- }
-
-@@ -551,7 +807,7 @@
- * Error out if the file is setuid or setgid.
- */
- if ((prg_info.st_mode & S_ISUID) || (prg_info.st_mode & S_ISGID)) {
-- log_err("error: file is either setuid or setgid: (%s/%s)\n", cwd, cmd);
-+ log_err("error: file is either setuid or setgid: (%s/%s)\n", cwd, passedargv[0]);
- exit(119);
- }
-
-@@ -576,7 +832,7 @@
- * "[error] Premature end of script headers: ..."
- */
- if (!(prg_info.st_mode & S_IXUSR)) {
-- log_err("error: file has no execute permission: (%s/%s)\n", cwd, cmd);
-+ log_err("error: file has no execute permission: (%s/%s)\n", cwd, passedargv[0]);
- exit(121);
- }
-
-@@ -609,6 +865,8 @@
- /*
- * Execute the command, replacing our image with its own.
- */
-+ execv(passedargv[0], passedargv);
-+#if 0
- #ifdef NEED_HASHBANG_EMUL
- /* We need the #! emulation when we want to execute scripts */
- {
-@@ -619,7 +877,7 @@
- #else /*NEED_HASHBANG_EMUL*/
- execv(cmd, &argv[3]);
- #endif /*NEED_HASHBANG_EMUL*/
--
-+#endif
- /*
- * (I can't help myself...sorry.)
- *
-@@ -629,5 +887,10 @@
- * Oh well, log the failure and error out.
- */
- log_err("emerg: (%d)%s: exec failed (%s)\n", errno, strerror(errno), cmd);
-+
-+ for (ind=0;passedargv[ind];++ind) free(passedargv[ind]);
-+ free(passedargv);
-+ passedargv=0;
-+
- exit(255);
- }
+++ /dev/null
---- apache-1.3.6.orig/src/main/http_core.c
-+++ apache-1.3.6/src/main/http_core.c
-@@ -1892,8 +1892,9 @@
- else {
- cmd->server->server_uid = ap_user_id;
- fprintf(stderr,
-- "Warning: User directive in <VirtualHost> "
-+ "ERROR: User directive in <VirtualHost> "
- "requires SUEXEC wrapper.\n");
-+ exit (1);
- }
- }
- #if !defined (BIG_SECURITY_HOLE) && !defined (OS2)
-@@ -1933,8 +1934,9 @@
- else {
- cmd->server->server_gid = ap_group_id;
- fprintf(stderr,
-- "Warning: Group directive in <VirtualHost> requires "
-+ "ERROR: Group directive in <VirtualHost> requires "
- "SUEXEC wrapper.\n");
-+ exit (1);
- }
- }
-
+++ /dev/null
-diff --minimal --new-file --recursive --show-c-function --unified=3 apache_1.3.12.old/cgi-bin/printenv apache_1.3.12/cgi-bin/printenv
---- apache_1.3.12.old/cgi-bin/printenv Wed Nov 24 12:10:58 1999
-+++ apache_1.3.12/cgi-bin/printenv Sun Apr 16 09:50:04 2000
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- ##
- ## printenv -- demo CGI program which just prints its environment
- ##
-diff --minimal --new-file --recursive --show-c-function --unified=3 apache_1.3.12.old/cgi-bin/printenv.~1~ apache_1.3.12/cgi-bin/printenv.~1~
---- apache_1.3.12.old/cgi-bin/printenv.~1~ Wed Dec 31 18:00:00 1969
-+++ apache_1.3.12/cgi-bin/printenv.~1~ Sun Apr 16 09:49:43 2000
-@@ -0,0 +1,13 @@
-+#!/usr/local/bin/perl
-+##
-+## printenv -- demo CGI program which just prints its environment
-+##
-+
-+print "Content-type: text/plain\n\n";
-+foreach $var (sort(keys(%ENV))) {
-+ $val = $ENV{$var};
-+ $val =~ s|\n|\\n|g;
-+ $val =~ s|"|\\"|g;
-+ print "${var}=\"${val}\"\n";
-+}
-+
-diff --minimal --new-file --recursive --show-c-function --unified=3 apache_1.3.12.old/src/support/dbmmanage apache_1.3.12/src/support/dbmmanage
---- apache_1.3.12.old/src/support/dbmmanage Sun Nov 28 07:37:53 1999
-+++ apache_1.3.12/src/support/dbmmanage Sun Apr 16 09:49:43 2000
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # ====================================================================
- # Copyright (c) 1995-1999 The Apache Group. All rights reserved.
-diff --minimal --new-file --recursive --show-c-function --unified=3 apache_1.3.12.old/src/support/log_server_status apache_1.3.12/src/support/log_server_status
---- apache_1.3.12.old/src/support/log_server_status Fri Jun 4 10:54:19 1999
-+++ apache_1.3.12/src/support/log_server_status Sun Apr 16 09:49:43 2000
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # ====================================================================
- # Copyright (c) 1995-1999 The Apache Group. All rights reserved.
-diff --minimal --new-file --recursive --show-c-function --unified=3 apache_1.3.12.old/src/support/phf_abuse_log.cgi apache_1.3.12/src/support/phf_abuse_log.cgi
---- apache_1.3.12.old/src/support/phf_abuse_log.cgi Tue Oct 8 16:14:49 1996
-+++ apache_1.3.12/src/support/phf_abuse_log.cgi Sun Apr 16 09:49:43 2000
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # This script can be used to detect people trying to abuse the security hole which
- # existed in A CGI script direstributed with Apache 1.0.3 and earlier versions.
+++ /dev/null
---- ../mod_ssl-2.8.8-1.3.24/pkg.eapi/eapi.patch Wed Mar 27 18:05:04 2002
-+++ ../mod_ssl-2.8.8-1.3.24/pkg.eapi/eapi.patch.new Tue Jun 18 17:37:10 2002
-@@ -1764,10 +1764,10 @@
- Index: src/modules/proxy/proxy_http.c
- --- src/modules/proxy/proxy_http.c 27 Mar 2002 15:23:04 -0000 1.1.1.13
- +++ src/modules/proxy/proxy_http.c 27 Mar 2002 15:30:03 -0000 1.21
--@@ -166,6 +166,9 @@
-- char *destportstr = NULL;
-+@@ -167,6 +167,9 @@
- const char *urlptr = NULL;
- const char *datestr, *urlstr;
-+ const char *content_length;
- +#ifdef EAPI
- + char *peer;
- +#endif
+++ /dev/null
-diff -aur apache_1.3.14/src/support/htdigest.c apache_1.3.14-mkstemp/src/support/htdigest.c
---- apache_1.3.14/src/support/htdigest.c Tue Jan 25 23:36:53 2000
-+++ apache_1.3.14-mkstemp/src/support/htdigest.c Tue Jan 9 20:42:42 2001
-@@ -93,7 +93,7 @@
-
- #define MAX_STRING_LEN 256
-
--char *tn;
-+char tn[MAX_STRING_LEN];
-
-
- static void getword(char *word, char *line, char stop)
-@@ -156,7 +156,7 @@
- ap_getpass("Re-type new password: ", pwv, sizeof(pwv));
- if (strcmp(pwin, pwv) != 0) {
- fprintf(stderr, "They don't match, sorry.\n");
-- if (tn) {
-+ if (strlen(tn)) {
- unlink(tn);
- }
- exit(1);
-@@ -187,7 +187,7 @@
- static void interrupted(void)
- {
- fprintf(stderr, "Interrupted.\n");
-- if (tn)
-+ if (strlen(tn))
- unlink(tn);
- exit(1);
- }
-@@ -215,8 +215,9 @@
- char x[MAX_STRING_LEN];
- char command[MAX_STRING_LEN];
- int found;
-+ int tfd;
-
-- tn = NULL;
-+ strcpy (tn, "/tmp/htdigest-XXXXXX");
- signal(SIGINT, (void (*)(int)) interrupted);
- if (argc == 5) {
- if (strcmp(argv[1], "-c"))
-@@ -235,8 +236,12 @@
- else if (argc != 4)
- usage();
-
-- tn = tmpnam(NULL);
-- if (!(tfp = fopen(tn, "w"))) {
-+ tfd = mkstemp (tn);
-+ if (tfd == -1) {
-+ fprintf(stderr, "Could not open temp file.\n");
-+ exit(1);
-+ }
-+ if (!(tfp = fdopen(tfd, "w"))) {
- fprintf(stderr, "Could not open temp file.\n");
- exit(1);
- }
-diff -aur apache_1.3.14/src/support/htpasswd.c apache_1.3.14-mkstemp/src/support/htpasswd.c
---- apache_1.3.14/src/support/htpasswd.c Thu Jun 1 19:42:33 2000
-+++ apache_1.3.14-mkstemp/src/support/htpasswd.c Tue Jan 9 20:41:36 2001
-@@ -125,7 +125,7 @@
- * This needs to be declared statically so the signal handler can
- * access it.
- */
--static char *tempfilename;
-+static char tempfilename[MAX_STRING_LEN];
- /*
- * If our platform knows about the tmpnam() external buffer size, create
- * a buffer to pass in. This is needed in a threaded environment, or
-@@ -285,7 +285,7 @@
- static void interrupted(void)
- {
- fprintf(stderr, "Interrupted.\n");
-- if (tempfilename != NULL) {
-+ if (strlen(tempfilename) > 0) {
- unlink(tempfilename);
- }
- exit(ERR_INTERRUPTED);
-@@ -377,8 +377,10 @@
- int noninteractive = 0;
- int i;
- int args_left = 2;
-+ int tfd;
-+
-+ memset (tempfilename, 0x00, sizeof(tempfilename));
-
-- tempfilename = NULL;
- signal(SIGINT, (void (*)(int)) interrupted);
-
- /*
-@@ -560,8 +562,9 @@
- * to add or update. Let's do it..
- */
- errno = 0;
-- tempfilename = tmpnam(tname_buf);
-- if ((tempfilename == NULL) || (*tempfilename == '\0')) {
-+ strcpy(tempfilename, "/tmp/htpasswd-XXXXXX");
-+ tfd = mkstemp(tempfilename);
-+ if (tfd == -1) {
- fprintf(stderr, "%s: unable to generate temporary filename\n",
- argv[0]);
- if (errno == 0) {
-@@ -570,7 +573,7 @@
- perror("tmpnam");
- exit(ERR_FILEPERM);
- }
-- ftemp = fopen(tempfilename, "w+");
-+ ftemp = fdopen(tfd, "w+");
- if (ftemp == NULL) {
- fprintf(stderr, "%s: unable to create temporary file '%s'\n", argv[0],
- tempfilename);
+++ /dev/null
---- src/support/httpd.8.mdk Tue Oct 9 16:09:54 2001
-+++ src/support/httpd.8 Tue Oct 9 16:16:11 2001
-@@ -195,21 +195,17 @@
- , and then exit.
- .SH FILES
- .PD 0
--.B /usr/local/apache/conf/httpd.conf
-+.B /etc/apache/conf/apache.conf
- .br
--.B /usr/local/apache/conf/srm.conf
-+.B /etc/apache/conf/apache-mime.types
- .br
--.B /usr/local/apache/conf/access.conf
-+.B /etc/apache/conf/magic
- .br
--.B /usr/local/apache/conf/mime.types
-+.B /var/log/apache/error_log
- .br
--.B /usr/local/apache/conf/magic
-+.B /var/log/apache/access_log
- .br
--.B /usr/local/apache/logs/error_log
--.br
--.B /usr/local/apache/logs/access_log
--.br
--.B /usr/local/apache/logs/httpd.pid
-+.B /var/run/apache.pid
- .PD
- .SH SEE ALSO
- .BR inetd (8).
+++ /dev/null
---- apache_1.3.6/src/support/apxs.pl.apxs Mon Mar 15 17:47:36 1999
-+++ apache_1.3.6/src/support/apxs.pl Wed Mar 24 18:15:01 1999
-@@ -220,15 +220,15 @@
- ## Initial DSO support check
- ##
- if (not -x "$CFG_SBINDIR/$CFG_TARGET") {
-- print STDERR "apxs:Error: $CFG_SBINDIR/$CFG_TARGET not found or not executable\n";
-- exit(1);
-+ print STDERR "apxs:Warning: $CFG_SBINDIR/$CFG_TARGET not found or not executable\n";
-+ print STDERR "apxs:Warning: Continuing anyway...\n";
- }
- if (not grep(/mod_so/, `$CFG_SBINDIR/$CFG_TARGET -l`)) {
-- print STDERR "apxs:Error: Sorry, no DSO support for Apache available\n";
-- print STDERR "apxs:Error: under your platform. Make sure the Apache\n";
-- print STDERR "apxs:Error: module mod_so is compiled into your server\n";
-- print STDERR "apxs:Error: binary `$CFG_SBINDIR/$CFG_TARGET'.\n";
-- exit(1);
-+ print STDERR "apxs:Warning: No shared object support for Apache\n";
-+ print STDERR "apxs:Warning: available under your platform. Make sure\n";
-+ print STDERR "apxs:Warning: the Apache module mod_so is compiled into\n";
-+ print STDERR "apxs:Warning: your server binary `$CFG_SBINDIR/$CFG_TARGET'.\n";
-+ print STDERR "apxs:Warning: Continuing anyway...\n";
- }
-
- ##
+++ /dev/null
---- ./configure.mdk Tue Oct 16 20:07:27 2001
-+++ ./configure Tue Oct 16 20:11:57 2001
-@@ -502,7 +502,7 @@
- for var in prefix exec_prefix bindir sbindir libexecdir mandir \
- sysconfdir datadir iconsdir htdocsdir manualdir cgidir \
- includedir localstatedir runtimedir logfiledir \
-- proxycachedir; do
-+ proxycachedir serverroot; do
- eval "val=\"\$$var\""
- case $val in
- *+ )
-@@ -663,6 +663,9 @@
- sysconfdir="$apc_optarg"
- autosuffix_sysconfdir=no
- ;;
-+ --serverroot=*)
-+ serverroot="$apc_optarg"
-+ ;;
- --datadir=*)
- datadir="$apc_optarg"
- autosuffix_datadir=no
-@@ -1112,7 +1115,7 @@
- for var in prefix exec_prefix bindir sbindir libexecdir mandir \
- sysconfdir datadir iconsdir htdocsdir manualdir cgidir \
- includedir localstatedir runtimedir logfiledir \
-- proxycachedir suexec_docroot suexec_logexec ; do
-+ proxycachedir suexec_docroot suexec_logexec serverroot; do
- eval "val=\"\$$var\"";
- val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
- eval "$var=\"$val\""
-@@ -1217,8 +1220,8 @@
- ## path is just the emtpy one, i.e. ""]
- ##
- runtimedir_relative=`echo $runtimedir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
--logfiledir_relative=`echo $logfiledir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
--sysconfdir_relative=`echo $sysconfdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
-+logfiledir_relative=`echo $logfiledir | sed -e "s:^$serverroot/*::" -e 's:\(.\)$:\1/:'`
-+sysconfdir_relative=`echo $sysconfdir | sed -e "s:^$serverroot/*::" -e 's:\(.\)$:\1/:'`
- libexecdir_relative=`echo $libexecdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
-
- ##
-@@ -1246,7 +1249,7 @@
- echo " proxycachedir: $proxycachedir"
- echo ""
- echo "Compilation paths:"
-- echo " HTTPD_ROOT: $prefix"
-+ echo " HTTPD_ROOT: $serverroot"
- echo " SHARED_CORE_DIR: $libexecdir"
- echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
- echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
-@@ -1306,6 +1309,7 @@
- -e "s%@libexecdir_relative@%$libexecdir_relative%g" \
- -e "s%@mandir@%$mandir%g" \
- -e "s%@sysconfdir@%$sysconfdir%g" \
-+-e "s%@serverroot@%$serverroot%g" \
- -e "s%@datadir@%$datadir%g" \
- -e "s%@iconsdir@%$iconsdir%g" \
- -e "s%@htdocsdir@%$htdocsdir%g" \
-@@ -1344,7 +1348,7 @@
- echo "#!/bin/sh" >$src/apaci
- echo "## USED AS A COMMAND LINE EXPANDER TO OVERRIDE PATHS" >>$src/apaci
- echo "## WITHOUT DISTURBING THE KNOWN MAKE BUILD PROCESS DISPLAY" >>$src/apaci
--echo "echo '-DHTTPD_ROOT=\"$prefix\"'" >>$src/apaci
-+echo "echo '-DHTTPD_ROOT=\"$serverroot\"'" >>$src/apaci
- echo "echo '-DSUEXEC_BIN=\"$sbindir/suexec\"'" >>$src/apaci
- echo "echo '-DSHARED_CORE_DIR=\"$libexecdir\"'" >>$src/apaci
- echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
---- ./config.layout.mdk Tue Oct 16 20:07:38 2001
-+++ ./config.layout Tue Oct 16 20:15:13 2001
-@@ -28,6 +28,7 @@
- runtimedir: $localstatedir/logs
- logfiledir: $localstatedir/logs
- proxycachedir: $localstatedir/proxy
-+ serverroot: $prefix
- </Layout>
-
- # GNU standards conforming path layout.
-@@ -50,6 +51,7 @@
- runtimedir: $localstatedir/run
- logfiledir: $localstatedir/log
- proxycachedir: $localstatedir/proxy
-+ serverroot: $prefix
- </Layout>
-
- # Apache binary distribution path layout
-@@ -92,6 +94,7 @@
- runtimedir: $prefix/Logs
- logfiledir: $prefix/Logs
- proxycachedir: $prefix/ProxyCache
-+ serverroot: $prefix
- </Layout>
-
- # Darwin/Mac OS Layout
-@@ -115,8 +118,8 @@
- proxycachedir: $runtimedir/proxy
- </Layout>
-
--# Red Hat Linux 7.x layout
--<Layout RedHat>
-+# ADVX layout
-+<Layout ADVX>
- prefix: /usr
- exec_prefix: $prefix
- bindir: $prefix/bin
-@@ -134,6 +137,7 @@
- runtimedir: $localstatedir/run
- logfiledir: $localstatedir/log/httpd
- proxycachedir: $localstatedir/cache/httpd
-+ serverroot: /etc/httpd
- </Layout>
-
- # According to the /opt filesystem conventions
projects / gentoo.git / commitdiff