diff options
Diffstat (limited to 'www/apache13-fp')
| -rw-r--r-- | www/apache13-fp/files/patch-aa | 40 | ||||
| -rw-r--r-- | www/apache13-fp/files/patch-ab | 27 |
2 files changed, 57 insertions, 10 deletions
diff --git a/www/apache13-fp/files/patch-aa b/www/apache13-fp/files/patch-aa index 95661a0..ddf92e7 100644 --- a/www/apache13-fp/files/patch-aa +++ b/www/apache13-fp/files/patch-aa @@ -1,5 +1,27 @@ -*** configure.orig Thu Sep 17 12:07:53 1998 ---- configure Thu Sep 24 03:57:33 1998 +*** configure.orig Thu Sep 17 03:07:53 1998 +--- configure Sat Nov 28 11:33:04 1998 +*************** +*** 810,815 **** +--- 810,816 ---- + ## + ## determine special configuration parameters + ## ++ conf_user="nobody" + conf_group="#-1" + conf_port="80" + conf_serveradmin="you@your.address" +*************** +*** 828,833 **** +--- 829,837 ---- + conf_serveradmin="`$aux/buildinfo.sh -n %u@%h%d`" + conf_servername="`$aux/buildinfo.sh -n %h%d`" + fi ++ if [ ".$suexec" = .1 ]; then ++ conf_user="$suexec_caller" ++ fi + + ## + ## determine prefix-relative paths for directories *************** *** 870,877 **** echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" @@ -10,7 +32,7 @@ echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" ---- 870,877 ---- +--- 874,881 ---- echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" @@ -20,6 +42,16 @@ echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" *************** +*** 912,917 **** +--- 916,922 ---- + -e "s%@suexec_uidmin@%$suexec_uidmin%g" \ + -e "s%@suexec_gidmin@%$suexec_gidmin%g" \ + -e "s%@suexec_safepath@%$suexec_safepath%g" \ ++ -e "s%@conf_user@%$conf_user%g" \ + -e "s%@conf_group@%$conf_group%g" \ + -e "s%@conf_port@%$conf_port%g" \ + -e "s%@conf_serveradmin@%$conf_serveradmin%g" \ +*************** *** 935,942 **** echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci @@ -29,7 +61,7 @@ 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 ---- 935,942 ---- +--- 940,947 ---- 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 diff --git a/www/apache13-fp/files/patch-ab b/www/apache13-fp/files/patch-ab index 9bf6caa..0bc741e 100644 --- a/www/apache13-fp/files/patch-ab +++ b/www/apache13-fp/files/patch-ab @@ -1,5 +1,5 @@ *** Makefile.tmpl.orig Sat Sep 19 07:41:48 1998 ---- Makefile.tmpl Wed Oct 14 19:07:18 1998 +--- Makefile.tmpl Sat Nov 28 10:30:01 1998 *************** *** 107,112 **** --- 107,113 ---- @@ -11,6 +11,16 @@ libexecdir_relative = @libexecdir_relative@ *************** +*** 119,124 **** +--- 120,126 ---- + suexec_safepath = @suexec_safepath@ + + # some substituted configuration parameters ++ conf_user = @conf_user@ + conf_group = @conf_group@ + conf_port = @conf_port@ + conf_serveradmin = @conf_serveradmin@ +*************** *** 166,173 **** -DUID_MIN=$(suexec_uidmin) \ -DGID_MIN=$(suexec_gidmin) \ @@ -20,7 +30,7 @@ -DSAFE_PATH=\"$(suexec_safepath)\" \ ' \ suexec; \ ---- 167,174 ---- +--- 168,175 ---- -DUID_MIN=$(suexec_uidmin) \ -DGID_MIN=$(suexec_gidmin) \ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ @@ -40,7 +50,7 @@ $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) ---- 225,233 ---- +--- 226,234 ---- $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) @@ -77,7 +87,7 @@ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ ---- 341,372 ---- +--- 342,373 ---- # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -111,7 +121,7 @@ @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ *************** -*** 378,395 **** +*** 378,397 **** echo ""; \ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ @@ -130,7 +140,9 @@ -e 's;conf/magic;$(sysconfdir)/magic;' \ -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ -e 's;Group #-1;Group $(conf_group);' \ ---- 386,405 ---- + -e 's;Port 80;Port $(conf_port);' \ + -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \ +--- 387,409 ---- echo ""; \ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ @@ -150,4 +162,7 @@ ! -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ -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;Port 80;Port $(conf_port);' \ + -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \ |
