head	1.10;
access;
symbols
	RELEASE_9_0_0:1.9
	RELEASE_7_4_0:1.9
	RELEASE_8_2_0:1.9
	RELEASE_6_EOL:1.9
	RELEASE_8_1_0:1.9
	RELEASE_7_3_0:1.9
	RELEASE_8_0_0:1.9
	RELEASE_7_2_0:1.9
	RELEASE_7_1_0:1.9
	RELEASE_6_4_0:1.9
	RELEASE_5_EOL:1.9
	RELEASE_7_0_0:1.9
	RELEASE_6_3_0:1.9
	PRE_XORG_7:1.9
	RELEASE_4_EOL:1.9
	RELEASE_6_2_0:1.9
	RELEASE_6_1_0:1.9
	RELEASE_5_5_0:1.9
	RELEASE_6_0_0:1.9
	RELEASE_5_4_0:1.9
	RELEASE_4_11_0:1.9
	RELEASE_5_3_0:1.9
	RELEASE_4_10_0:1.9
	RELEASE_5_2_1:1.9
	RELEASE_5_2_0:1.9
	RELEASE_4_9_0:1.9
	RELEASE_5_1_0:1.9
	RELEASE_4_8_0:1.9
	RELEASE_5_0_0:1.9
	RELEASE_4_7_0:1.9
	RELEASE_4_6_2:1.9
	RELEASE_4_6_1:1.9
	RELEASE_4_6_0:1.8
	RELEASE_5_0_DP1:1.8
	RELEASE_4_5_0:1.8
	RELEASE_4_4_0:1.6
	RELEASE_4_3_0:1.6
	RELEASE_4_2_0:1.6
	RELEASE_4_1_1:1.5
	RELEASE_4_1_0:1.5
	RELEASE_3_5_0:1.5
	RELEASE_4_0_0:1.5
	RELEASE_3_4_0:1.4
	RELEASE_3_3_0:1.4
	RELEASE_3_1_0:1.2
	RELEASE_2_2_8:1.1.1.1
	RELEASE_3_0_0:1.1.1.1
	mod_ssl_2_0_5:1.1.1.1
	RSE:1.1.1;
locks; strict;
comment	@# @;


1.10
date	2012.01.01.19.30.37;	author ohauer;	state dead;
branches;
next	1.9;

1.9
date	2002.06.19.15.13.34;	author nectar;	state Exp;
branches;
next	1.8;

1.8
date	2001.10.22.17.43.30;	author ache;	state Exp;
branches;
next	1.7;

1.7
date	2001.10.22.15.38.49;	author rse;	state Exp;
branches;
next	1.6;

1.6
date	2000.11.15.16.10.38;	author ade;	state Exp;
branches;
next	1.5;

1.5
date	2000.01.22.21.14.01;	author rse;	state Exp;
branches;
next	1.4;

1.4
date	99.08.31.06.55.59;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	99.03.24.09.54.13;	author rse;	state dead;
branches;
next	1.2;

1.2
date	99.01.13.08.03.06;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	98.08.27.16.00.05;	author rse;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	98.08.27.16.00.05;	author rse;	state Exp;
branches;
next	;


desc
@@


1.10
log
@- remove apache13 and ports depending on apache13 from portstree
  ( EXPIRATION_DATE=2012-01-01 )

with hat apache@@
@
text
@--- 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
@


1.9
log
@Update to apache 1.3.26 / mod_ssl 2.8.9.
Fixes chunking vulnerability, so now no longer FORBIDDEN.
@
text
@@


1.8
log
@Sync with main Apache port
@
text
@d1 3
a3 3
--- configure.orig	Mon Oct 22 20:44:08 2001
+++ configure	Mon Oct 22 20:44:42 2001
@@@@ -1263,8 +1263,8 @@@@
a6 1
-    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
a7 1
+    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
d12 1
a12 1
@@@@ -1365,8 +1365,8 @@@@
a15 1
-echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
a16 1
+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
@


1.7
log
@Upgrade to Apache 1.3.22 + mod_ssl 2.8.5

Submitted by: Masahiro TAKEMURA <mastake@@msel.t.u-tokyo.ac.jp>
@
text
@a2 9
@@@@ -1216,7 +1216,7 @@@@
     conf_user="nobody"
 fi
 if [ "x$conf_group" = "x" ]; then
-    conf_group="\\\\#-1"
+    conf_group="nobody"
 fi
 
 ##
@


1.6
log
@Gently persuade apache13-modssl to install in the same filesystem
space as www/apache13 does, so that other apache-dependendent ports
DTRT regardless of which one is installed.

Nothing concrete (other than we're working on a real cleanup of the
apache ports) has been heard from any of the maintainers.  Obviously
that is the best solution, but with 4.2-RELEASE just around the
corner, we have an opportunity here to at least remove a few bogons.

Both times I've raised this issue on -ports, however, there has been
significant interest in the patches, and now plenty of confirmations
that the modifications do not break the port in other ways.
@
text
@d1 3
a3 3
--- configure.orig	Sat Jan 22 21:55:19 2000
+++ configure	Sat Jan 22 21:59:01 2000
@@@@ -1198,7 +1198,7 @@@@
d12 1
a12 1
@@@@ -1232,8 +1232,8 @@@@
d23 1
a23 1
@@@@ -1330,8 +1330,8 @@@@
@


1.5
log
@Upgrade to Apache 1.3.11 + mod_ssl 2.5.0
@
text
@d12 22
@


1.4
log
@Take over fixes from Dirk's apache13-php3 port.
@
text
@d1 10
a10 4
--- configure.orig	Sat Aug 14 10:29:05 1999
+++ configure	Fri Aug 20 19:59:53 1999
@@@@ -1084,7 +1084,7 @@@@
 ##  UID/GID as production oriented as a web server in NIS anyway.
a11 6
 conf_user="nobody"
-conf_group="#-1"
+conf_group="nobody"
 conf_port="80"
 conf_serveradmin="you@@your.address"
 conf_servername="new.host.name"
@


1.3
log
@- Upgraded to Apache 1.3.6 + mod_ssl 2.2.6
- Cleaned up the port
@
text
@d1 11
a11 40
*** configure.orig	Tue Jan 12 13:23:40 1999
--- configure	Tue Jan 12 13:33:38 1999
***************
*** 1024,1031 ****
      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 "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
      echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
--- 1024,1031 ----
      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}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"
***************
*** 1106,1113 ****
  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 '-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
--- 1106,1113 ----
  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}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
  echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
@


1.2
log
@- Upgrade to Apache 1.3.4
- Upgrade to mod_ssl 2.1.7
- Add additional master site
- Add Y2K link
- Make portlint happy
@
text
@@


1.1
log
@Initial revision
@
text
@d1 2
a2 2
*** configure.bak	Sun Jul 12 13:25:46 1998
--- configure	Thu Jul 23 16:52:04 1998
d4 4
a7 4
*** 877,884 ****
      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
d11 1
a11 1
      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
d13 4
a16 4
--- 877,884 ----
      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
d20 1
a20 1
      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
d23 4
a26 4
*** 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
d30 1
a30 1
  echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
d32 4
a35 4
--- 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
d39 1
a39 1
  echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
@


1.1.1.1
log
@Import of a new SSL-aware Apache 1.3, achieved by patching up
the original Apache 1.3.1 with mod_ssl 2.0.5 (the Apache
Interface to SSLeay).
@
text
@@
