head	1.128;
access;
symbols
	RELEASE_9_0_0:1.127
	RELEASE_7_4_0:1.124
	RELEASE_8_2_0:1.124
	RELEASE_6_EOL:1.124
	RELEASE_8_1_0:1.124
	RELEASE_7_3_0:1.124
	RELEASE_8_0_0:1.124
	RELEASE_7_2_0:1.123
	RELEASE_7_1_0:1.123
	RELEASE_6_4_0:1.123
	RELEASE_5_EOL:1.122
	RELEASE_7_0_0:1.121
	RELEASE_6_3_0:1.121
	PRE_XORG_7:1.120
	RELEASE_4_EOL:1.119
	RELEASE_6_2_0:1.119
	RELEASE_6_1_0:1.118
	RELEASE_5_5_0:1.118
	RELEASE_6_0_0:1.114
	RELEASE_5_4_0:1.111
	RELEASE_4_11_0:1.111
	RELEASE_5_3_0:1.108
	RELEASE_4_10_0:1.106
	RELEASE_5_2_1:1.100
	RELEASE_5_2_0:1.100
	RELEASE_4_9_0:1.93
	RELEASE_5_1_0:1.90
	RELEASE_4_8_0:1.88
	RELEASE_5_0_0:1.84
	RELEASE_4_7_0:1.80
	RELEASE_4_6_2:1.76
	RELEASE_4_6_1:1.76
	RELEASE_4_6_0:1.76
	RELEASE_5_0_DP1:1.76
	RELEASE_4_5_0:1.73
	RELEASE_4_4_0:1.71
	RELEASE_4_3_0:1.71
	RELEASE_4_2_0:1.70
	RELEASE_4_1_1:1.69
	RELEASE_4_1_0:1.66
	RELEASE_3_5_0:1.66
	RELEASE_4_0_0:1.63
	RELEASE_3_4_0:1.62
	RELEASE_3_3_0:1.60
	RELEASE_3_2_0:1.56
	RELEASE_3_1_0:1.53
	RELEASE_2_2_8:1.45
	RELEASE_3_0_0:1.45
	RELEASE_2_2_7:1.45
	RELEASE_2_2_6:1.44
	RELEASE_2_2_5:1.41
	RELEASE_2_2_1:1.28
	RELEASE_2_2_2:1.30
	apache_0_8_11:1.1.1.1
	APACHE:1.1.1;
locks; strict;
comment	@# @;


1.128
date	2012.01.01.19.30.37;	author ohauer;	state dead;
branches;
next	1.127;

1.127
date	2011.11.14.23.50.40;	author ohauer;	state Exp;
branches;
next	1.126;

1.126
date	2011.09.07.03.00.37;	author pgollucci;	state Exp;
branches;
next	1.125;

1.125
date	2011.08.27.09.54.30;	author ohauer;	state Exp;
branches;
next	1.124;

1.124
date	2009.05.17.07.24.24;	author pgollucci;	state Exp;
branches;
next	1.123;

1.123
date	2008.07.13.04.37.41;	author itetcu;	state Exp;
branches;
next	1.122;

1.122
date	2008.04.15.11.50.10;	author dinoex;	state Exp;
branches;
next	1.121;

1.121
date	2007.06.17.16.59.26;	author anders;	state Exp;
branches;
next	1.120;

1.120
date	2007.03.18.17.13.58;	author clement;	state Exp;
branches;
next	1.119;

1.119
date	2006.07.27.20.26.28;	author clement;	state Exp;
branches;
next	1.118;

1.118
date	2006.01.16.10.13.26;	author clement;	state Exp;
branches;
next	1.117;

1.117
date	2006.01.14.13.59.20;	author clement;	state Exp;
branches;
next	1.116;

1.116
date	2005.12.12.20.31.52;	author clement;	state Exp;
branches;
next	1.115;

1.115
date	2005.10.03.06.07.19;	author linimon;	state Exp;
branches;
next	1.114;

1.114
date	2005.07.26.13.57.42;	author clement;	state Exp;
branches;
next	1.113;

1.113
date	2005.06.06.15.16.30;	author clement;	state Exp;
branches;
next	1.112;

1.112
date	2005.06.06.15.09.55;	author clement;	state Exp;
branches;
next	1.111;

1.111
date	2004.12.13.21.06.17;	author clement;	state Exp;
branches;
next	1.110;

1.110
date	2004.12.13.11.16.46;	author clement;	state Exp;
branches;
next	1.109;

1.109
date	2004.11.12.10.40.51;	author clement;	state Exp;
branches;
next	1.108;

1.108
date	2004.07.31.11.56.38;	author clement;	state Exp;
branches;
next	1.107;

1.107
date	2004.06.11.12.19.04;	author clement;	state Exp;
branches;
next	1.106;

1.106
date	2004.04.07.13.47.37;	author clement;	state Exp;
branches;
next	1.105;

1.105
date	2004.03.18.20.50.09;	author dinoex;	state Exp;
branches;
next	1.104;

1.104
date	2004.03.08.13.29.47;	author clement;	state Exp;
branches;
next	1.103;

1.103
date	2004.02.06.22.40.34;	author clement;	state Exp;
branches;
next	1.102;

1.102
date	2004.01.21.09.32.13;	author clement;	state Exp;
branches;
next	1.101;

1.101
date	2004.01.13.15.04.48;	author clement;	state Exp;
branches;
next	1.100;

1.100
date	2003.11.20.11.25.42;	author jeh;	state Exp;
branches;
next	1.99;

1.99
date	2003.11.12.21.09.27;	author jeh;	state Exp;
branches;
next	1.98;

1.98
date	2003.11.09.00.42.20;	author jeh;	state Exp;
branches;
next	1.97;

1.97
date	2003.10.25.20.47.37;	author dinoex;	state Exp;
branches;
next	1.96;

1.96
date	2003.10.14.15.47.28;	author dinoex;	state Exp;
branches;
next	1.95;

1.95
date	2003.09.28.07.19.54;	author dinoex;	state Exp;
branches;
next	1.94;

1.94
date	2003.09.24.17.26.47;	author dinoex;	state Exp;
branches;
next	1.93;

1.93
date	2003.09.06.21.20.44;	author dinoex;	state Exp;
branches;
next	1.92;

1.92
date	2003.08.30.08.02.23;	author dinoex;	state Exp;
branches;
next	1.91;

1.91
date	2003.08.28.15.38.35;	author dinoex;	state Exp;
branches;
next	1.90;

1.90
date	2003.04.05.06.55.55;	author dinoex;	state Exp;
branches;
next	1.89;

1.89
date	2003.04.03.19.39.55;	author dinoex;	state Exp;
branches;
next	1.88;

1.88
date	2003.02.20.19.15.22;	author knu;	state Exp;
branches;
next	1.87;

1.87
date	2003.02.13.15.04.03;	author naddy;	state Exp;
branches;
next	1.86;

1.86
date	2003.01.27.17.05.36;	author dinoex;	state Exp;
branches;
next	1.85;

1.85
date	2003.01.20.18.06.38;	author dinoex;	state Exp;
branches;
next	1.84;

1.84
date	2002.11.10.16.48.20;	author lioux;	state Exp;
branches;
next	1.83;

1.83
date	2002.11.06.22.47.12;	author adamw;	state Exp;
branches;
next	1.82;

1.82
date	2002.11.06.16.01.59;	author joerg;	state Exp;
branches;
next	1.81;

1.81
date	2002.10.12.21.57.11;	author knu;	state Exp;
branches;
next	1.80;

1.80
date	2002.10.05.09.18.45;	author kris;	state Exp;
branches;
next	1.79;

1.79
date	2002.09.15.12.34.16;	author dinoex;	state Exp;
branches;
next	1.78;

1.78
date	2002.09.01.16.07.56;	author dwcjr;	state Exp;
branches;
next	1.77;

1.77
date	2002.06.18.12.33.14;	author nectar;	state Exp;
branches;
next	1.76;

1.76
date	2002.03.28.22.53.08;	author petef;	state Exp;
branches;
next	1.75;

1.75
date	2002.03.23.19.34.51;	author nectar;	state Exp;
branches;
next	1.74;

1.74
date	2002.03.01.19.39.17;	author jedgar;	state Exp;
branches;
next	1.73;

1.73
date	2001.12.21.19.31.33;	author nectar;	state Exp;
branches;
next	1.72;

1.72
date	2001.12.21.19.25.38;	author nectar;	state Exp;
branches;
next	1.71;

1.71
date	2001.01.01.10.15.15;	author will;	state Exp;
branches;
next	1.70;

1.70
date	2000.10.29.22.43.41;	author steve;	state Exp;
branches;
next	1.69;

1.69
date	2000.09.22.01.59.05;	author kris;	state Exp;
branches;
next	1.68;

1.68
date	2000.08.22.03.41.05;	author kuriyama;	state Exp;
branches;
next	1.67;

1.67
date	2000.08.09.17.47.16;	author cpiazza;	state Exp;
branches;
next	1.66;

1.66
date	2000.04.27.16.31.59;	author knu;	state Exp;
branches;
next	1.65;

1.65
date	2000.04.27.15.20.09;	author knu;	state Exp;
branches;
next	1.64;

1.64
date	2000.04.10.00.04.25;	author cpiazza;	state Exp;
branches;
next	1.63;

1.63
date	2000.02.12.09.02.43;	author kris;	state Exp;
branches;
next	1.62;

1.62
date	99.11.07.22.25.32;	author dirk;	state Exp;
branches;
next	1.61;

1.61
date	99.09.27.02.21.28;	author steve;	state Exp;
branches;
next	1.60;

1.60
date	99.08.31.02.42.41;	author peter;	state Exp;
branches;
next	1.59;

1.59
date	99.07.04.18.44.30;	author obrien;	state Exp;
branches;
next	1.58;

1.58
date	99.06.28.09.00.47;	author asami;	state Exp;
branches;
next	1.57;

1.57
date	99.06.02.07.20.36;	author dirk;	state Exp;
branches;
next	1.56;

1.56
date	99.04.10.07.53.03;	author dirk;	state Exp;
branches;
next	1.55;

1.55
date	99.03.26.08.49.50;	author dirk;	state Exp;
branches;
next	1.54;

1.54
date	99.03.13.17.11.04;	author billf;	state Exp;
branches;
next	1.53;

1.53
date	99.01.10.14.11.19;	author dirk;	state Exp;
branches;
next	1.52;

1.52
date	99.01.08.18.25.23;	author fenner;	state Exp;
branches;
next	1.51;

1.51
date	98.12.22.08.40.47;	author asami;	state Exp;
branches;
next	1.50;

1.50
date	98.12.11.22.58.37;	author billf;	state Exp;
branches;
next	1.49;

1.49
date	98.12.11.22.46.14;	author billf;	state Exp;
branches;
next	1.48;

1.48
date	98.12.11.22.37.09;	author billf;	state Exp;
branches;
next	1.47;

1.47
date	98.12.11.13.47.06;	author asami;	state Exp;
branches;
next	1.46;

1.46
date	98.12.01.11.14.55;	author obrien;	state Exp;
branches;
next	1.45;

1.45
date	98.04.12.09.53.50;	author markm;	state Exp;
branches;
next	1.44;

1.44
date	98.02.20.00.43.40;	author steve;	state Exp;
branches;
next	1.43;

1.43
date	98.02.17.21.16.02;	author markm;	state Exp;
branches;
next	1.42;

1.42
date	98.02.17.12.52.26;	author markm;	state Exp;
branches;
next	1.41;

1.41
date	97.10.13.15.03.39;	author markm;	state Exp;
branches;
next	1.40;

1.40
date	97.09.22.19.44.48;	author markm;	state Exp;
branches;
next	1.39;

1.39
date	97.08.16.16.01.10;	author andreas;	state Exp;
branches;
next	1.38;

1.38
date	97.08.16.04.45.27;	author peter;	state Exp;
branches;
next	1.37;

1.37
date	97.08.15.15.44.27;	author markm;	state Exp;
branches;
next	1.36;

1.36
date	97.08.12.14.21.12;	author peter;	state Exp;
branches;
next	1.35;

1.35
date	97.07.08.13.04.09;	author ache;	state Exp;
branches;
next	1.34;

1.34
date	97.06.06.13.45.07;	author ache;	state Exp;
branches;
next	1.33;

1.33
date	97.05.31.20.34.09;	author ache;	state Exp;
branches;
next	1.32;

1.32
date	97.05.31.20.26.38;	author ache;	state Exp;
branches;
next	1.31;

1.31
date	97.05.31.20.16.01;	author ache;	state Exp;
branches;
next	1.30;

1.30
date	97.05.02.18.22.03;	author ache;	state Exp;
branches;
next	1.29;

1.29
date	97.04.14.18.54.26;	author ache;	state Exp;
branches;
next	1.28;

1.28
date	97.02.26.01.23.10;	author ache;	state Exp;
branches;
next	1.27;

1.27
date	97.01.28.05.39.31;	author ache;	state Exp;
branches;
next	1.26;

1.26
date	97.01.02.16.39.55;	author ache;	state Exp;
branches;
next	1.25;

1.25
date	96.12.25.22.53.22;	author ache;	state Exp;
branches;
next	1.24;

1.24
date	96.12.11.21.04.21;	author markm;	state Exp;
branches;
next	1.23;

1.23
date	96.12.11.19.09.59;	author ache;	state Exp;
branches;
next	1.22;

1.22
date	96.11.18.11.40.33;	author asami;	state Exp;
branches;
next	1.21;

1.21
date	96.11.07.01.53.14;	author ache;	state Exp;
branches;
next	1.20;

1.20
date	96.11.07.01.49.46;	author ache;	state Exp;
branches;
next	1.19;

1.19
date	96.10.31.17.42.13;	author markm;	state Exp;
branches;
next	1.18;

1.18
date	96.10.26.18.49.52;	author markm;	state Exp;
branches;
next	1.17;

1.17
date	96.08.11.14.49.21;	author markm;	state Exp;
branches;
next	1.16;

1.16
date	96.07.12.10.27.53;	author asami;	state Exp;
branches;
next	1.15;

1.15
date	96.07.12.06.41.05;	author pst;	state Exp;
branches;
next	1.14;

1.14
date	96.07.11.11.03.17;	author ache;	state Exp;
branches;
next	1.13;

1.13
date	96.06.15.17.51.08;	author jkh;	state Exp;
branches;
next	1.12;

1.12
date	96.06.15.16.58.06;	author jkh;	state Exp;
branches;
next	1.11;

1.11
date	96.05.20.07.37.06;	author asami;	state Exp;
branches;
next	1.10;

1.10
date	96.05.19.22.21.42;	author ache;	state Exp;
branches;
next	1.9;

1.9
date	96.04.21.08.54.24;	author pst;	state Exp;
branches;
next	1.8;

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

1.7
date	96.02.07.03.15.26;	author jfieber;	state Exp;
branches;
next	1.6;

1.6
date	95.12.04.12.56.18;	author jfieber;	state Exp;
branches;
next	1.5;

1.5
date	95.12.02.23.07.08;	author jfieber;	state Exp;
branches;
next	1.4;

1.4
date	95.11.27.04.10.09;	author asami;	state Exp;
branches;
next	1.3;

1.3
date	95.09.23.18.47.45;	author pst;	state Exp;
branches;
next	1.2;

1.2
date	95.09.19.07.03.17;	author pst;	state Exp;
branches;
next	1.1;

1.1
date	95.08.28.13.28.45;	author jkh;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	95.08.28.13.28.45;	author jkh;	state Exp;
branches;
next	;


desc
@@


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

with hat apache@@
@
text
@# New ports collection makefile for:    apache-ssl HTTPSD
# Date created:     	8th November, 1998
# Whom:			Adam Laurie <adam@@algroup.co.uk>
#			based on apache port by ache@@nagual.pp.ru
#			and apache-ssl port by Mark Murray <mark@@grondar.za>.
#			Oh, and with a little bit of help from Ben :)
#
# $FreeBSD: ports/www/apache13-ssl/Makefile,v 1.127 2011/11/14 23:50:40 ohauer Exp $

PORTNAME=	apache+ssl
PORTVERSION=	${APACHE_VERSION}.${APACHE_SSL_VERSION}
PORTREVISION=	2
CATEGORIES=	www security
MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
		${MASTER_SITES_APACHE_SSL:S/$/:ssl/}
DISTNAME=	apache_${APACHE_VERSION}
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
		apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}:ssl
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

MAINTAINER=	apache@@FreeBSD.org
COMMENT=	Apache secure webserver integrating OpenSSL

FORBIDDEN=	CVE-2011-3368, no patches against this issue
DEPRECATED=	apache13 is deprecated, migrate to 2.2.x+ now
EXPIRATION_DATE=	2011-11-01

MAKE_JOBS_SAFE=  yes

CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \
		apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
		apache+mod_ssl+mod_snmp+mod_accel-1.* \
		apache+ipv6-1.* apache-1.* apache-2.* apache_fp-1.* \
		caudium-devel-1.* caudium10-1.* caudium12-1.* \
		ru-apache+mod_ssl-1.* ru-apache-1.*

APACHE_VERSION=		1.3.41
APACHE_SSL_VERSION=	1.59
USE_OPENSSL=		yes
USE_PERL5=		yes
HAS_CONFIGURE=		yes
USE_RC_SUBR=		apache
SUB_LIST+=		WWWOWN=${WWWOWN}
MAKE_ENV+=		EXAMPLESDIR=${EXAMPLESDIR}
USE_APACHE=		common13

MASTER_SITES_APACHE_SSL=	\
		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
		ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \
		ftp://opensores.thebunker.net/pub/mirrors/apache-ssl/

APACHE_HARD_SERVER_LIMIT?=	512

CFLAGS+=	-I${OPENSSLINC}/openssl
CONFIGURE_ARGS+=	\
		--prefix=${PREFIX} \
		--server-uid=www \
		--server-gid=www \
		--with-perl=${PERL} \
		--with-layout=FreeBSD \
		--without-confadjust \
		--disable-module=auth_dbm \
		--sysconfdir=${PREFIX}/etc/apache \
		--includedir=${PREFIX}/include/apache \
		--localstatedir=/var \
		--datadir=${PREFIX}/www \
		--proxycachedir=${PREFIX}/www/proxy \
		--libexecdir=${PREFIX}/libexec/apache \
		--target=httpsd

#		--enable-shared=remain \

OPTIM=		-DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT} \
		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"

DOCSDIR=	${PREFIX}/share/doc/apache

.if defined(APACHE_PERF_TUNING)
OPTIM+=		-DBUFFERED_LOGS
CFLAGS+=	-O6 -fomit-frame-pointer
.endif

CONFIGURE_ENV+=	OPTIM='${OPTIM}'
CONFIGURE_ENV+=	EXTRA_SSL_LIBS="-L${OPENSSLLIB} -L${LOCALBASE}/lib"

.if defined(WITH_SUEXEC)
MAN8=		suexec.8
PLIST_SUB+=	SUB_SUEXEC=""
.else
PLIST_SUB+=	SUB_SUEXEC="@@comment "
.endif

MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
MAN8+=		ab.8 httpsdctl.8 apxs.8 httpsd.8 logresolve.8 rotatelogs.8

.include "${.CURDIR}/Makefile.modules"
.include <bsd.port.pre.mk>

post-extract:
	@@cd ${WRKSRC} && ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}

post-patch:
	@@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch ${OPENSSLBASE}
	@@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/post-patch-conf:httpd.conf-dist
	@@${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
		${WRKSRC}/src/Configure
.if defined(NOPORTDOCS)
	(cd ${WRKSRC} ; ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-noportdocs)
.endif

post-install:
	@@${ECHO_CMD} ""
	@@${ECHO_CMD} "SSL is disabled by default"
	@@${ECHO_CMD} "Please read:"
	@@${ECHO_CMD} "  http://www.apache-ssl.org/docs.html"
	@@${ECHO_CMD} " to know how to configure correctly apache-ssl"
	@@${ECHO_CMD} ""

certificate:
	-${MKDIR} ${PREFIX}/etc/apache/certs
	@@if [ -f ${OPENSSLDIR}/openssl.cnf ]; then \
		cd ${WRKSRC}/src; ${MAKE} ${MAKE_ENV} $@@; \
		${CP} ${WRKSRC}/SSLconf/conf/httpsd.pem \
		${PREFIX}/etc/apache/certs/cert.pem; \
	else \
		${ECHO_CMD} "You must create the file ${OPENSSLDIR}/openssl.cnf first."; \
	fi

.include <bsd.port.post.mk>
@


1.127
log
@- mark apache13 FORBIDDEN (CVE-2011-3368)

  * There are no patches from upstream and already existing
    exploids in the wild.

- ru-apache13 ports have long outstanding issues and are far
  behind last apache13 patches.

with hat apache@@

Feature safe:	yes
@
text
@d8 1
a8 1
# $FreeBSD$
@


1.126
log
@- Set EXPIRATION_DATE to an actual date (9.0 is behind, so guess 2 months from now).
- This can be changed later as needed, if at all, either way we won't remove them
  until after 9.0 is released.

With Hat:   apache@@
Reported by:    dvl via freshports
@
text
@d12 1
a12 1
PORTREVISION=	1
d24 1
@


1.125
log
@- set EXPIRATION_DATE to "one week after FreeBSD 9.0-RELEASE-p0"

with hat apache@@
@
text
@d25 1
a25 1
EXPIRATION_DATE=	one week after FreeBSD 9.0-RELEASE-p0
@


1.124
log
@- Mark SAFE apache@@ ports MAKE_JOBS_SAFE=yes
@
text
@d24 3
@


1.123
log
@- Honor NO* vars (noticed by ionbot)
- Silence some portlint warnings
- USE_RC_SUBR from the rc.d script
- Bump PORTREVISION

PR:		125131
Submitted by:	Philip M. Gollucci
@
text
@d24 2
@


1.122
log
@- Security update to 1.3.41+ssl_1.59
Security: CVE-2008-0555

- fix objformat
PR:		120105
@
text
@d12 1
a20 4
#PATCH_SITES=		${MASTER_SITE_APACHE_HTTPD}
#PATCH_SITE_SUBDIR=	patches/apply_to_${APACHE_VERSION}
#PATCHFILES=

d28 1
a28 1
		caudium-devel-1.* caudium10-1.* caudium12-* \
d36 2
a37 2
USE_RC_SUBR=		yes
RC_SCRIPTS_SUB=		PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} WWWOWN=${WWWOWN}
d41 1
a41 1
MASTER_SITES_APACHE_SSL= \
a99 2
	@@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
		${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
d102 3
a112 1
	@@${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d
@


1.121
log
@Remove thttpd from conflicts list, it has a different name for its
passwd program now.

Approved by:	maintainers/erwin
@
text
@d34 2
a35 2
APACHE_VERSION=		1.3.37
APACHE_SSL_VERSION=	1.57
d105 3
@


1.120
log
@- Update to 1.3.37-1.57
@
text
@d32 1
a32 1
		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
@


1.119
log
@- Fix security issue in mod_rewrite.
All people using mod_rewrite are strongly encouraged to update.

An off-by-one flaw exists in the Rewrite module, mod_rewrite.
Depending on the manner in which Apache httpd was compiled, this
software defect may result in a vulnerability which, in combination
with certain types of Rewrite rules in the web server configuration
files, could be triggered remotely.  For vulnerable builds, the nature
of the vulnerability can be denial of service (crashing of web server
processes) or potentially allow arbitrary code execution.
This issue has been rated as having important security impact
by the Apache HTTP Server Security Team

Updates to latest versions will follow soon.

Notified by:	so@@ (simon)
Obtained from:	Apache Security Team
Security: 	CVE-2006-3747
@
text
@a11 1
PORTREVISION=	2
d34 1
a34 1
APACHE_VERSION=		1.3.34
@


1.118
log
@- Remove duplicated mor_dir entries
- Always build (mod_)apache_ssl statically.
- Fix MAN8 logic [1]

Reported by:	pointyhat via kris [1]
@
text
@d12 1
a12 1
PORTREVISION=	1
@


1.117
log
@- Update to 1.3.34+1.37
- Use new apache framework.
@
text
@d12 1
a44 2
.include "${.CURDIR}/Makefile.modules"

d86 1
a86 1
SUEXEC_MAN=	suexec.8
d93 1
a93 2
MAN8=		ab.8 httpsdctl.8 apxs.8 httpsd.8 logresolve.8 rotatelogs.8 \
		${SUEXEC_MAN}
d95 1
@


1.116
log
@SECURITY: CVE-2005-3352 (cve.mitre.org)
   mod_imap: Escape untrusted referer header before outputting in HTML
   to avoid potential cross-site scripting.  Change also made to
   ap_escape_html so we escape quotes.  Reported by JPCERT.
   [Mark Cox]

Reported by:	simon
@
text
@a11 1
PORTREVISION=	2
d34 2
a35 2
APACHE_VERSION=		1.3.33
APACHE_SSL_VERSION=	1.55
d42 3
a52 37
.if defined(WITH_APACHE_SUEXEC)

APACHE_SUEXEC_DOCROOT?=	${DOCUMENT_ROOT}
APACHE_SUEXEC_LOG?=	/var/log/httpsd-suexec.log
APACHE_SUEXEC_USERDIR?=	public_html
APACHE_SUEXEC_UIDMIN?=	1000
APACHE_SUEXEC_GIDMIN?=	1000
APACHE_SUEXEC_CALLER?=	www

SUEXEC_CONF=\
	--enable-suexec \
	--suexec-docroot=${APACHE_SUEXEC_DOCROOT} \
	--suexec-caller=${APACHE_SUEXEC_CALLER} \
	--suexec-uidmin=${APACHE_SUEXEC_UIDMIN} \
	--suexec-gidmin=${APACHE_SUEXEC_GIDMIN} \
	--suexec-logfile=${APACHE_SUEXEC_LOG} \
	--suexec-userdir=${APACHE_SUEXEC_USERDIR} \
	--suexec-safepath=${DEFAULT_PATH}

.if defined(APACHE_SUEXEC_UMASK)
SUEXEC_CONF+=	--suexec-umask=${APACHE_SUEXEC_UMASK}
.endif

PLIST_SUB+=	SUB_SUEXEC=""
SUEXEC_MAN=	suexec.8

.else	# !SUEXEC

SUEXEC_CONF=
PLIST_SUB+=	SUB_SUEXEC="@@comment "
SUEXEC_MAN=

.endif  # !SUEXEC

#
# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
#
d54 1
a54 1
CONFIGURE_ARGS=	\
a60 3
		--enable-shared=remain \
		--enable-module=most \
		--enable-module=auth_db \
d68 3
a70 2
		--target=httpsd \
		${SUEXEC_CONF}
d86 7
@


1.115
log
@Remove obsolete mastersite.

Source:		distfile survey
@
text
@d12 1
a12 1
PORTREVISION=	1
@


1.114
log
@- Fix CAN-2005-2088

Obtained from:	Apache repository
@
text
@a46 1
		ftp://ftp.sekure.net/pub/apache-ssl/ \
@


1.113
log
@- While I'm here, kick portname from COMMENT
@
text
@d12 1
@


1.112
log
@- En1arge its maintainership
@
text
@d25 1
a25 1
COMMENT=	Apache-SSL: Apache secure webserver integrating OpenSSL
@


1.111
log
@- move default configuration files to ${EXAMPLESDIR} and keep
  ${PREFIX}/etc/apache clean.
@
text
@d24 1
a24 1
MAINTAINER=	clement@@FreeBSD.org
@


1.110
log
@- Xmas for apache13-ssl!
  Give it a rcNG startup script

Also requested by:	sem
@
text
@d41 1
@


1.109
log
@- Update to 1.3.33.1.55
@
text
@d22 1
a22 1
#PATCHFILES=		
d39 2
d134 2
a135 1

d143 1
@


1.108
log
@- update to 1.3.29+1.55
@
text
@d34 1
a34 1
APACHE_VERSION=		1.3.29
@


1.107
log
@- Security Fix
  mod_proxy buffer overflow  CAN-2004-0492

Shamefully stolen from: apache13-mod-ssl port
@
text
@a11 1
PORTREVISION=	2
d35 1
a35 1
APACHE_SSL_VERSION=	1.53
@


1.106
log
@- tar -> ${TAR}
  While I'm here put --target=httpsd at the right place.
@
text
@d12 1
a12 1
PORTREVISION=	1
@


1.105
log
@- CONFLICTS extended
@
text
@d66 1
a66 2
	--suexec-safepath=${DEFAULT_PATH} \
	--target=httpsd
d104 1
d128 1
a128 1
	@@cd ${WRKSRC} && tar xzf ${DISTDIR}/${DIST_SUBDIR}/apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}
@


1.104
log
@Fix a bug in the parsing of Allow/Deny rules using IP addresses.

http://www.vuxml.org/freebsd/09d418db-70fd-11d8-873f-0020ed76ef5a.html

Reported by:        nectar
Obtained from:      Apache CVS
@
text
@d28 4
a31 1
CONFLICTS=	apache+ipv6-1.* apache+mod_ssl-1.* apache-1.* apache-2.* apache_fp-1.* \
@


1.103
log
@- Update to apache 1.3.29
- Update to patchset 1.53

***** SECURITY FIX *****
http://www.apache-ssl.org/advisory-20040206.txt

Time to ask eik how to add it to portaudit
@
text
@d12 1
@


1.102
log
@Rename patch.
post-patch-conf:httpd.conf-dist.orig =>
			post-patch-conf:httpd.conf-dist

Pointed out by:     kris,
                    Koop Mast <kwm@@rainbow-runner.nl>
@
text
@d20 3
a22 3
PATCH_SITES=		${MASTER_SITE_APACHE_HTTPD}
PATCH_SITE_SUBDIR=	patches/apply_to_${APACHE_VERSION}
PATCHFILES=		no_zombies.patch
d31 2
a32 2
APACHE_VERSION=		1.3.28
APACHE_SSL_VERSION=	1.52
@


1.101
log
@- Update my email address

Approved and reviewed by:    erwin (mentor)
@
text
@d128 1
a128 1
	@@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/post-patch-conf:httpd.conf-dist.orig
@


1.100
log
@update apache-ssl patch to 1.52.
apache 1.3.29 is not yet supported.

PR:		59355
Submitted by:	Maintainer
@
text
@d24 1
a24 1
MAINTAINER=	sheepkiller@@cultdeadsheep.org
@


1.99
log
@Here's the patch.
files/patch-FixPatch was missing too.

Submitted by:	MAINTAINER
@
text
@a11 1
PORTREVISION=	1
d22 1
a22 1
PATCHFILES=		no_zombies.patch 
d32 1
a32 1
APACHE_SSL_VERSION=	1.51
@


1.98
log
@Changelog:
	- Sync with apache13 layout (and some patches)
	- use DOCSDIR
	- Add no_zombies.patch
	- use DIST_SUBDIR=apache

Removed files:
	- files/patch-aq
	- files/patch-ar

Added files:
	- files/patch-httpd.conf-dist
	- files/post-patch-conf:httpd.conf-dist.orig
	- files/patch-FixPatch
	- files/patch-SSLpatch
	- files/patch-Makefile.tmpl
	- files/patch-src::modules::standard::mod_auth_db.module
	- files/patch-src::support::dbmanage
	- files/patch-src::support::log_server_status
	- files/patch-configure

PR:		58403
Submitted By:	MAINTAINER
@
text
@d12 1
d63 2
a64 1
	--suexec-safepath=${DEFAULT_PATH}
@


1.97
log
@- fix spelling in CONFLICTS
@
text
@d20 4
d30 1
d32 1
a32 1
APACHE_SSL_VERSION=	1.49
d54 1
a54 1
SUEXEC_CONF= \
d88 1
a88 1
		--with-layout=GNU \
d106 2
d123 1
a123 1
	@@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}
d127 1
d131 4
a134 5
	@@${ECHO_CMD} "                       !!!! WARNING !!!!"
	@@${ECHO_CMD} " Next PORTREVISION will be a complete resync with apache13 ports layout"
	@@${ECHO_CMD} " Will change:"
	@@${ECHO_CMD} "      - Default log file names"
	@@${ECHO_CMD} "      - Default DocumentRoot (${PREFIX}/www/htdocs => ${PREFIX}/www/data)"
@


1.96
log
@- add CONFLICTS
Submitted by:   eikemeier@@fillmore-labs.com
Approved by:    kris
@
text
@d23 1
a23 1
CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache-1.* apache-2.* apache_fp-1.* \
@


1.95
log
@- Update to 1.3.28.1.49.
- Add suexec support
- Misc changes
- Add a footnote for users, to announce them that next version
  will be a complete resync with apache13 ports layout.

PR:		57300
Submitted by:	sheepkiller@@cultdeadsheep.org
@
text
@d23 3
@


1.94
log
@- change ECHO -> ECHO_CMD
PR:		56847
@
text
@a11 1
PORTREVISION=	3
d20 1
a20 1
MAINTAINER=	ports@@FreeBSD.org
d23 47
a69 7
APACHE_VERSION=		1.3.27
APACHE_SSL_VERSION=	1.48
USE_OPENSSL=	yes
USE_PERL5=	yes
HAS_CONFIGURE=	yes
MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
MAN8=		ab.8 httpsdctl.8 apxs.8 httpsd.8 logresolve.8 rotatelogs.8
a80 1
		--suexec-docroot=${PREFIX}/www/data \
d91 2
a92 1
		--libexecdir=${PREFIX}/libexec/apache
d94 1
a94 1
OPTIM=		-DHARD_SERVER_LIMIT=512 \
d98 1
a98 1
.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
d106 3
a108 5
MASTER_SITES_APACHE_SSL= \
		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
		ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \
		ftp://ftp.sekure.net/pub/apache-ssl/ \
		ftp://opensores.thebunker.net/pub/mirrors/apache-ssl/ 
d117 9
@


1.93
log
@- drop defunctional MASTER_SITES
@
text
@d88 1
a88 1
		${ECHO} "You must create the file ${OPENSSLDIR}/openssl.cnf first."; \
@


1.92
log
@- change YES -> yes
@
text
@a68 6
		ftp://ftp.MASTER.pgp.net/pub/crypto/SSL/Apache-SSL/ \
		ftp://ftp.replay.com/pub/crypto/apache/Apache-SSL/ \
		ftp://ftp.win.ne.jp/pub/network/security/apache-ssl/ \
		ftp://ftp.sage-au.org.au/pub/network/security/apache-ssl/Apache-SSL/ \
		ftp://ftp.vwv.com/pub/crypto/SSL/Apache-SSL/ \
		ftp://mirror.aarnet.edu.au/www/servers/apache-ssl/ \
a69 4
		ftp://ftp.infoscience.co.jp/pub/Crypto/SSL/Apache-SSL/Apache-SSL/ \
		ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.ox.ac.uk/SSL/Apache-SSL/ \
		ftp://apache-ssl.raver.net/pub/ftp.apache-ssl.org/Apache-SSL/ \
		ftp://ftp.pca.dfn.de/pub/tools/net/sslapache/Apache-SSL/ \
d71 1
a71 4
		ftp://ftp.clinet.fi/mirrors/ftp.apache-ssl.org/pub/ \
		ftp://opensores.thebunker.net/pub/mirrors/apache-ssl/ \
		ftp://ftp.gin.cz/pub/MIRRORS/ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
		ftp://ftp.cordef.com.pl/pub/apache-ssl/Apache-SSL/
@


1.91
log
@- use hook for bsd.openssl.mk
- Cleanup Makefile
@
text
@d26 2
a27 2
USE_OPENSSL=	YES
USE_PERL5=	YES
@


1.90
log
@- caption in MAINTAINER
@
text
@d12 1
a12 1
PORTREVISION=	2
d15 1
a15 17
		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/:ssl \
		ftp://ftp.MASTER.pgp.net/pub/crypto/SSL/Apache-SSL/:ssl \
		ftp://ftp.replay.com/pub/crypto/apache/Apache-SSL/:ssl \
		ftp://ftp.win.ne.jp/pub/network/security/apache-ssl/:ssl \
		ftp://ftp.sage-au.org.au/pub/network/security/apache-ssl/Apache-SSL/:ssl \
		ftp://ftp.vwv.com/pub/crypto/SSL/Apache-SSL/:ssl \
		ftp://mirror.aarnet.edu.au/www/servers/apache-ssl/:ssl \
		ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/:ssl \
		ftp://ftp.infoscience.co.jp/pub/Crypto/SSL/Apache-SSL/Apache-SSL/:ssl \
		ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.ox.ac.uk/SSL/Apache-SSL/:ssl \
		ftp://apache-ssl.raver.net/pub/ftp.apache-ssl.org/Apache-SSL/:ssl \
		ftp://ftp.pca.dfn.de/pub/tools/net/sslapache/Apache-SSL/:ssl \
		ftp://ftp.sekure.net/pub/apache-ssl/:ssl \
		ftp://ftp.clinet.fi/mirrors/ftp.apache-ssl.org/pub/:ssl \
		ftp://opensores.thebunker.net/pub/mirrors/apache-ssl/:ssl \
		ftp://ftp.gin.cz/pub/MIRRORS/ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/:ssl \
		ftp://ftp.cordef.com.pl/pub/apache-ssl/Apache-SSL/:ssl
d26 1
a26 1

d28 3
a30 2

.include <bsd.port.pre.mk>
a34 2
.include "${PORTSDIR}/security/openssl/bsd.openssl.mk"

a35 2

HAS_CONFIGURE=	yes
d64 1
a64 1
CONFIGURE_ENV=	OPTIM='${OPTIM}'
d67 20
a86 2
MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
MAN8=		ab.8 httpsdctl.8 apxs.8 httpsd.8 logresolve.8 rotatelogs.8
@


1.89
log
@- use bsd.openssl.mk
@
text
@d37 1
a37 1
MAINTAINER=	ports@@freebsd.org
@


1.88
log
@De-pkg-comment.
@
text
@d50 1
a50 1
.include "${PORTSDIR}/security/openssl/Makefile.ssl"
@


1.87
log
@Use MASTER_SITE_APACHE*.

PR:		47984
Submitted by:	Kimura Fuyuki <fuyuki@@hadaly.org>
@
text
@d38 1
@


1.86
log
@- Use user and group "www"
- fix PLIST
- add patch from ports/36363 (from ryan@@servercity.com)
- verify ports/36361
- fix ports/36364
@
text
@d14 1
a14 6
MASTER_SITES=	http://www.apache.org/dist/httpd/ \
		ftp://src.doc.ic.ac.uk/packages/apache/dist/ \
		ftp://ftp.gbnet.net/pub/apache/dist/ \
		ftp://ftp.flirble.org/pub/web/apache/dist/ \
		ftp://ukug.uk.freebsd.org/pub/mirrors/apache/dist/ \
		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,} \
@


1.85
log
@- update SSL support.
defaults to openssl port (now 0.9.6.h)
New options:
use the lastest version (now 0.9.7)
	USE_OPENSSL_BETA=yes
use the base version with
	USE_OPENSSL_BASE=yes
@
text
@d12 1
a12 1
PORTREVISION=	1
d61 2
a62 1
		--server-gid=nogroup \
d100 1
d103 2
a104 1
		${CP} ${WRKSRC}/SSLconf/conf/httpsd.pem ${PREFIX}/certs/cert.pem; \
@


1.84
log
@o Rollback PORTCOMMENT modifications while this feature's implementation
  is better studied
o Turn PORTCOMMENT variable in Makefile back into pkg-comment files

Approved by:	kris (portmgr hat),
		portmgr, re (silence)
@
text
@a46 1
USE_OPENSSL=	YES
d54 1
@


1.83
log
@Use PORTCOMMENT in the Makefile, and whack the pkg-comment.

Approved by:	pat
@
text
@a43 2
PORTCOMMENT=	Apache-SSL: Apache secure webserver integrating OpenSSL

@


1.82
log
@Unmark this port from being forbidden; the reason by its time was that
the port had been updated to 1.2.27 and ssl-1.48 which simply did not
exist then.

Now they do exist.  Since it builds, installs and runs correctly with
no further changes, and all the other apache-1.2.27-based ports are
back alive again, there's no reason to keep this one forbidden.

Don't be alarmed that the MD5 sum changes: the previous one in
distinfo was actually the checksum from apache_1.3.26+ssl_1.48.tar.gz,
since the last update to that file only changed the name but not the
MD5 sum.  Alas, i could not find any authoritative MD5 on
http://www.apache-ssl.org/ to verify against.
@
text
@d44 2
@


1.81
log
@Add MASTER_SITE_RINGSERVER to MASTER_SITES.

Tag apache-ssl sites with :ssl.
@
text
@a43 2
FORBIDDEN=	"Security vulnerability; new version does not yet exist"

@


1.80
log
@Update to apache 1.3.27 and 2.0.43.  This fixes a security vulnerability.
Mark apache13-ssl FORBIDDEN because the new version does not yet exist.

Partially based on patches submitted by below authors.

Submitted by:	"Sergey A. Osokin" <osa@@freebsd.org.ru>,
		Udo Schweigert <udo.schweigert@@siemens.com>,
		Lev A. Serebryakov <lev@@serebryakov.spb.ru>
PR:		ports/43682, ports/43688, ports/43666, ports/43681
@
text
@a14 1
		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
a16 1
		ftp://ftp.MASTER.pgp.net/pub/crypto/SSL/Apache-SSL/ \
a17 1
		ftp://ftp.replay.com/pub/crypto/apache/Apache-SSL/ \
d19 18
a36 14
		ftp://ftp.win.ne.jp/pub/network/security/apache-ssl/ \
		ftp://ftp.sage-au.org.au/pub/network/security/apache-ssl/Apache-SSL/ \
		ftp://ftp.vwv.com/pub/crypto/SSL/Apache-SSL/ \
		ftp://mirror.aarnet.edu.au/www/servers/apache-ssl/ \
		ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \
		ftp://ftp.infoscience.co.jp/pub/Crypto/SSL/Apache-SSL/Apache-SSL/ \
		ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.ox.ac.uk/SSL/Apache-SSL/ \
		ftp://apache-ssl.raver.net/pub/ftp.apache-ssl.org/Apache-SSL/ \
		ftp://ftp.pca.dfn.de/pub/tools/net/sslapache/Apache-SSL/ \
		ftp://ftp.sekure.net/pub/apache-ssl/ \
		ftp://ftp.clinet.fi/mirrors/ftp.apache-ssl.org/pub/ \
		ftp://opensores.thebunker.net/pub/mirrors/apache-ssl/ \
		ftp://ftp.gin.cz/pub/MIRRORS/ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
		ftp://ftp.cordef.com.pl/pub/apache-ssl/Apache-SSL/
d39 1
a39 1
		apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}
@


1.79
log
@Update to 1.3.26+ssl_1.48
removed FORBIDDEN
@
text
@d43 3
a45 1
APACHE_VERSION=		1.3.26
@


1.78
log
@${PERL} -> ${REINPLACE_CMD}

PR:		40784
Submitted by:	corecode@@corecode.ath.cx
Reviewed by:	flynn@@energyhq.homeip.net
@
text
@d14 1
a14 1
MASTER_SITES=	http://www.apache.org/dist/ \
d43 2
a44 5
FORBIDDEN=	"Vulnerable to denial-of-service.  See" \
		"http://httpd.apache.org/info/security_bulletin_20020617.txt"

APACHE_VERSION=		1.3.12
APACHE_SSL_VERSION=	1.40
@


1.77
log
@Mark FORBIDDEN until an update is available.
See <URL:http://httpd.apache.org/info/security_bulletin_20020617.txt>.
@
text
@d50 1
@


1.76
log
@Fix a master site.

PR:		36409
Submitted by:	Kimura Fuyuki <fuyuki@@mj.0038.net>
@
text
@d43 3
@


1.75
log
@Patch buffer overflow described in
<URL:http://www.apache-ssl.org/advisory-20020301.txt>.
@
text
@d22 1
a22 1
		ftp://ftp.win.or.jp/pub/network/security/apache-ssl/Apache-SSL/ \
@


1.74
log
@Change BROKEN to FORBIDDEN due to security vulnerabilities.
Add SSL vulnerability to the list:
  http://www.apache-ssl.org/advisory-20020301.txt
@
text
@d12 1
a88 3

FORBIDDEN=	contains unpatched vulnerabilities: CAN-2001-0729, 0730, 0731 \
		and SSL vulnerability
@


1.73
log
@Oops, forgot to quote the parens.  Quoting makes the line > 80
characters, so take a slightly different approach.
@
text
@d89 2
a90 1
BROKEN=		contains unpatched vulnerabilities: CAN-2001-0729, 0730, 0731
@


1.72
log
@Set MAINTAINER to freebsd-ports.  Previous maintainer says, ``i no
longer support this port as i got fed up with the port committers
ignoring my updates.''

Mark BROKEN, as this version of Apache contains several minor
vulnerabilities.
@
text
@d89 1
a89 1
BROKEN=		contains unpatched vulnerabilities (CAN-2001-0729, 0730, 0731)
@


1.71
log
@Goodbye, YEAR2000.  Hello, 2001.

Approved by:	asami
@
text
@d8 1
a8 1
# $FreeBSD: ports/www/apache13-ssl/Makefile,v 1.70 2000/10/29 22:43:41 steve Exp $
d40 1
a40 1
MAINTAINER=	adam@@algroup.co.uk
d88 2
@


1.70
log
@Run 'make certificate' from the correct directory.
@
text
@d8 1
a8 1
# $FreeBSD: ports/www/apache13-ssl/Makefile,v 1.69 2000/09/22 01:59:05 kris Exp $
a40 2

Y2K=		http://www.apache-ssl.org/#Y2K
@


1.69
log
@Update all ports using OpenSSL and RSA to work without rsaref since
it is no longer required. Apologies to the various maintainers whom I
did not yet hear back from, but the ports freeze is coming up in a few
hours and I will be verifying all of these ports on a 4.1 machine
myself to catch any problems.
@
text
@d8 1
a8 1
# $FreeBSD: ports/www/apache13-ssl/Makefile,v 1.68 2000/08/22 03:41:05 kuriyama Exp $
d99 1
a99 1
		cd ${WRKSRC}; ${MAKE} ${MAKE_ENV} $@@; \
d103 1
@


1.68
log
@Cosmetic changes to reduce difference between apache13 ports.
(whitespace/tab, re-ordering, same $DISTNAME)

This is preparation for ports/18788 updates.

Approved by:		adam@@algroup.co.uk, sumikawa
No response from:	ache (sorry for stepping on your toes)
@
text
@d8 1
a8 1
# $FreeBSD: ports/www/apache13-ssl/Makefile,v 1.67 2000/08/09 17:47:16 cpiazza Exp $
d47 1
a47 1
USE_OPENSSL=	RSA
a54 3
.if !defined(OPENSSLINC)
OPENSSLINC=	${PREFIX}/ssl/include
.endif
a56 4
.if !defined(OPENSSLLIB)
OPENSSLLIB=	${PREFIX}/ssl/lib
.endif

a85 3
.if defined(OPENSSL_RSAREF)
CONFIGURE_ENV+=	EXTRA_SSL_LIBS="-L${OPENSSLLIB} -lRSAglue -L${LOCALBASE}/lib -lrsaref"
.else
a86 1
.endif
@


1.67
log
@Fix up MASTER_SITES

PR:		20478
Submitted by:	Mario Sergio Fujikawa Ferreira <lioux@@uol.com.br>
@
text
@d8 1
a8 1
# $FreeBSD: ports/www/apache13-ssl/Makefile,v 1.66 2000/04/27 16:31:59 knu Exp $
d51 3
a53 1
HAS_CONFIGURE=	yes
d64 5
a68 1
CONFIGURE_ARGS=	--prefix=${PREFIX} \
d70 6
a79 1
		--suexec-docroot=${PREFIX}/www/data \
d81 1
a81 6
		--libexecdir=${PREFIX}/libexec/apache \
		--without-confadjust \
		--enable-shared=remain \
		--enable-module=most \
		--enable-module=auth_db \
		--disable-module=auth_dbm
@


1.66
log
@This is a null commit with a log message that contains a correction
and a supplement to the previous message.  (For some reason, the
previous message wasn't mailed due to a CVS problem)

		*		*		*

Correction:
- For `update to 1.3.9+1.40' read `update to 1.3.12+1.40'.

Supplement:
- Change the versioning scheme according to the Handbook.  Now
PORTVERSION is described as `1.3.x+1.y', not `1.3.x.1.y'.
@
text
@d8 1
a8 1
# $FreeBSD: ports/www/apache13-ssl/Makefile,v 1.65 2000/04/27 15:20:09 knu Exp $
d13 1
a13 1
MASTER_SITES=	ftp://www.apache.org/dist/ \
@


1.65
log
@- Update to apache 1.3.9 + ssl 1.40.
- Add MASTER_SITES.

PR:		ports/18036
Submitted by:	MAINTAINER

- Add patch-an (back) to correctly build on FreeBSD 5.0+.

PR:		ports/17404
Submitted by:	Khetan H. Gajjar <khetan@@freebsd.os.org.za>

- Portlint in many respects.
  - Mark `WWW:'.
  - Put variables in order.
  - Unexpand. (Change space to tab)
@
text
@d8 1
a8 1
# $FreeBSD: ports/www/apache13-ssl/Makefile,v 1.64 2000/04/10 00:04:25 cpiazza Exp $
@


1.64
log
@Update with the new PORTNAME/PORTVERSION variables
@
text
@d8 1
a8 4
# $FreeBSD: ports/www/apache13-ssl/Makefile,v 1.63 2000/02/12 09:02:43 kris Exp $

APACHE= 	1.3.9
APACHE-SSL=	1.37
d11 1
a11 1
PORTVERSION= 	${APACHE}+${APACHE-SSL}
d13 1
a13 1
MASTER_SITES=   ftp://www.apache.org/dist/ \
d15 1
d28 13
a40 1
		ftp://apache-ssl.raver.net/pub/ftp.apache-ssl.org/Apache-SSL/
a42 3
DISTNAME=	apache_${APACHE}
DISTFILES=      ${DISTNAME}${EXTRACT_SUFX} \
		apache_${APACHE}+ssl_${APACHE-SSL}${EXTRACT_SUFX}
d44 2
a45 1
MAINTAINER=     adam@@algroup.co.uk
d48 1
d52 4
d57 6
a62 2
CONFIGURE_ARGS=	\
		--prefix=${PREFIX} \
d77 3
a79 3
OPTIM=-DHARD_SERVER_LIMIT=512 \
-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
d82 2
a83 2
OPTIM+= -DBUFFERED_LOGS
CFLAGS+= -O6 -fomit-frame-pointer
d86 1
a86 1
CONFIGURE_ENV= OPTIM='${OPTIM}'
d88 3
a90 1
CONFIGURE_ENV+= EXTRA_SSL_LIBS="-L${OPENSSLLIB} -lRSAglue -L${LOCALBASE}/lib -lrsaref"
d93 2
a94 4
EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}

MAN1= 		dbmmanage.1 htdigest.1 htpasswd.1
MAN8= 		ab.8 httpsdctl.8 apxs.8 httpsd.8 logresolve.8 rotatelogs.8
d97 1
a97 1
	@@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_${APACHE}+ssl_${APACHE-SSL}${EXTRACT_SUFX}
@


1.63
log
@USE_OPENSSL

Submitted by:	Jim Bloom <bloom@@acm.org>
@
text
@a1 1
# Version required:     1.2.x+
d8 1
a8 1
# $FreeBSD: ports/www/apache13-ssl/Makefile,v 1.62 1999/11/07 22:25:32 dirk Exp $
d13 2
a14 2
DISTNAME=       apache_${APACHE}
PKGNAME=        apache+ssl-${APACHE}+${APACHE-SSL}
d33 1
a33 1

@


1.62
log
@Change dependencies from static to shared openssl libraries,
because openssl also builds shared libraries, now.
@
text
@d9 1
a9 1
# $FreeBSD: ports/www/apache13-ssl/Makefile,v 1.61 1999/09/27 02:21:28 steve Exp $
d40 2
a41 5
BUILD_DEPENDS=  openssl:${PORTSDIR}/security/openssl

LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl \
		ssl.1:${PORTSDIR}/security/openssl
RUN_DEPENDS=	openssl:${PORTSDIR}/security/openssl
d44 1
a44 1
CFLAGS+=	-I${PREFIX}/include/openssl
d71 2
a72 2
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
MAKE_ENV+=EXTRA_SSL_LIBS="-lRSAglue -lrsaref"
a76 2
RESTRICTED=     "Contains cryptography"

d84 1
a84 12
	@@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch

pre-configure:
.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES
	@@${ECHO}
	@@${ECHO} "*** Warning!"
	@@${ECHO} You must set variable USA_RESIDENT to YES if you are USA
	@@${ECHO} resident and are using RSAREF otherwise package will not link
	@@${ECHO} correctly.
	@@${ECHO} 
	@@${ECHO} 
.endif
d87 1
a87 1
	@@if [ -f ${PREFIX}/lib/openssl.cnf ]; then \
d91 1
a91 1
		${ECHO} "You must create the file ${PREFIX}/lib/openssl.cnf first."; \
d93 1
a93 1
.include <bsd.port.mk>
@


1.61
log
@Update this to version 1.3.9+1.37.

PR:		13804
Submitted by:	maintainer
@
text
@d9 1
a9 1
# $FreeBSD: ports/www/apache13-ssl/Makefile,v 1.60 1999/08/31 02:42:41 peter Exp $
d42 2
a43 2
BUILD_DEPENDS=	${PREFIX}/lib/libcrypto.a:${PORTSDIR}/security/openssl \
		${PREFIX}/lib/libssl.a:${PORTSDIR}/security/openssl
@


1.60
log
@$Id$ -> $FreeBSD$
@
text
@d9 1
a9 1
# $FreeBSD$
d11 2
a12 2
APACHE= 	1.3.6
APACHE-SSL=	1.35
d31 1
a31 4
		ftp://apache-ssl.raver.net/pub/ftp.apache-ssl.org/Apache-SSL/ \
		http://mirror.aarnet.edu.au/www/servers/apache-ssl/ \
		http://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \
		http://www.asap.cs.nott.ac.uk/SSL/
d40 2
d74 3
a99 3
.endif
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
CONFIGURE_ENV=LDFLAGS="${LDFLAGS} -L/usr/local/lib -lRSAglue -lrsaref"
@


1.59
log
@Be noisy at "pre-configure" where it matters, rather than at "pre-fetch".
@
text
@d9 1
a9 1
# $Id: Makefile,v 1.58 1999/06/28 09:00:47 asami Exp $
@


1.58
log
@Change PKGNAMEs to conform to guidelines.

  apache-1.3.6+mod_ssl-2.3.3 -> apache+mod_ssl-1.3.6+2.3.3
  apache-1.3.6+ssl_1.35      -> apache+ssl-1.3.6+1.35

Reviewed by:	maintainers of both ports
@
text
@d9 1
a9 1
# $Id: Makefile,v 1.57 1999/06/02 07:20:36 dirk Exp $
d83 7
a89 1
pre-fetch:
a101 6

post-extract:
	@@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_${APACHE}+ssl_${APACHE-SSL}${EXTRACT_SUFX}

post-patch:
	@@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch
@


1.57
log
@- Upgrade to Apache-SSL 1.35.
- include ${PREFIX}/include/openssl due to openssl upgrade.

Submitted by:	Ralf S. Engelschall <rse@@FreeBSD.org>
@
text
@d9 1
a9 1
# $Id: Makefile,v 1.56 1999/04/10 07:53:03 dirk Exp $
d15 1
a15 1
PKGNAME=        apache-${APACHE}+ssl_${APACHE-SSL}
@


1.56
log
@Upgrade to Apache 1.3.6 and Apache-SSL 1.32.

PR:		ports/10966
Submitted by:	Adam Laurie <adam@@algroup.co.uk>
@
text
@d9 1
a9 1
# $Id: Makefile,v 1.4 1999/04/05 19:19:45 addy Exp $
d12 1
a12 1
APACHE-SSL=	1.32
d48 1
@


1.55
log
@${PREFIX}/bin/ssleay     -> ${PREFIX}/bin/openssl and
${PREFIX}/etc/ssleay.cnf -> ${PREFIX}/lib/openssl.cnf
due to openssl upgrade.

Replaced GNU_CONFIGURE with HAS_CONFIGURE and
CONFIGURE_ARGS+=--prefix=${PREFIX} because GNU_CONFIGURE=yes adds
${CONFIGURE_TARGET} to ${CONFIGURE_ARGS} now.
@
text
@d2 1
a2 1
# Version required:     apache 1.3.3 and ssl 1.28
d9 1
a9 1
# $Id: Makefile,v 1.54 1999/03/13 17:11:04 billf Exp $
d11 2
a12 2
APACHE= 	1.3.3
APACHE-SSL=	1.28
d17 1
a17 1
MASTER_SITES=   http://www.apache.org/dist/ \
d19 1
d21 1
d23 1
a23 2
		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
		ftp://ftp.rge.com/pub/infosystems/apache/dist/ \
a25 2
		ftp://apache.compuex.com/pub/apache/dist/ \
		ftp://apache.arctic.org/pub/apache/dist/ \
a27 2
		ftp://ftp.epix.net/pub/apache/dist/ \
		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \
a29 2
		ftp://ftp.connectnet.com/pub/www/apache/ \
		ftp://apache.technomancer.com/mirrors/apache/dist/ \
a31 2
		ftp://ftp.raver.net/pub/ftp.apache.org/ \
		ftp://www3.service.digital.com/apache/dist/ \
a33 4
		ftp://galileo.galilei.com/pub/apache/ \
		ftp://ftp.mtnranch.net/pub/apache/dist/ \
		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
		ftp://apache.nextpath.com/pub/apache/dist/ \
d36 2
d43 2
a44 1

d47 2
a48 10
EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}

RESTRICTED=     "Contains cryptography"

#
# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
#

HAS_CONFIGURE=  yes
CONFIGURE_ARGS= \
d50 1
d53 1
a53 2
		--logfiledir=/var/log \
		--runtimedir=/var/run \
d55 1
d62 1
a62 1
		--disable-module=auth_dbm \
d73 3
a75 1
CONFIGURE_ENV+= OPTIM='${OPTIM}'
d77 1
a77 1
MAN1=   ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
d79 4
a83 1
pre-fetch:
d100 1
a100 1
	@@cd ${WRKSRC} && ./FixPatch ${PREFIX}
a107 1
	fi
@


1.54
log
@Add the Apache mirror sites. For ports with 'mods' attached to them, the MASTER_SITEs
were alternated so the user does not have to get 10 apache MASTER_SITEs when all
they need is one 'mod' MASTER_SITE, which is what would happen if we used a
MASTER_SITE_APACHE or added all of the mirrors in a row.

Approved By:	apache maintainers, asami
Submitted By: 	Brian Feldman <green@@unixhelp.org>, billf
@
text
@d9 1
a9 1
# $Id: Makefile,v 1.53 1999/01/10 14:11:19 dirk Exp $
d53 1
a53 1
RUN_DEPENDS=	ssleay:${PORTSDIR}/security/openssl
d63 1
a63 1
GNU_CONFIGURE=  yes
d65 1
d110 1
a110 1
	@@cd ${WRKSRC} && ./FixPatch
d113 1
a113 1
	@@if [ -f ${PREFIX}/etc/ssleay.cnf ]; then \
d117 1
a117 1
		${ECHO} "You must create the file ${PREFIX}/etc/ssleay.cnf first."; \
@


1.53
log
@Change dependencies from SSLeay to openssl, the successor of SSLeay.
@
text
@d9 1
a9 1
# $Id: Makefile,v 1.52 1999/01/08 18:25:23 fenner Exp $
d17 1
a17 1
MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
d21 2
d25 2
d29 2
d33 2
d37 2
d41 4
@


1.52
log
@Add missing trailing slash to MASTER_SITES

Found by:	distfile checker
@
text
@d9 1
a9 1
# $Id: Makefile,v 1.51 1998/12/22 08:40:47 asami Exp $
d39 1
a39 1
RUN_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
@


1.51
log
@MAINTAINER should be a simple mail address, otherwise we might confuse
some scripts.
@
text
@d9 1
a9 1
# $Id: Makefile,v 1.50 1998/12/11 22:58:37 billf Exp $
d31 1
a31 1
		http://www.asap.cs.nott.ac.uk/SSL
@


1.50
log
@Fix patches/ and pkg/ due to committer error when committing the new
information.

Screwed Up By:	billf
@
text
@d9 1
a9 1
# $Id: Makefile,v 1.49 1998/12/11 22:46:14 billf Exp $
d36 1
a36 1
MAINTAINER=     Adam Laurie \<adam@@algroup.co.uk\>
@


1.49
log
@This now breaks on the patch stage, which it didn't in my sandbox. I'm
marking it broken until I figure out why.
@
text
@d9 1
a9 1
# $Id: Makefile,v 1.48 1998/12/11 22:37:09 billf Exp $
a39 2

BROKEN=		fails on patch
@


1.48
log
@Retire apache-ssl, activate apache12-ssl and apache13-ssl!

PR:		ports/8448
Submitted By:	Adam Laurie <adam@@algroup.co.uk>, Member of Apache-SSL
@
text
@d9 1
a9 1
# $Id: $
d40 2
@


1.47
log
@Mark these broken until billf can fix them up after a repository copy.
@
text
@d1 7
a7 4
# New ports collection makefile for:    apache HTTPSD
# Version required:     1.2.5
# Date created:     	15th August 1997
# Whom:			Mark Murray <mark@@grondar.za>
d9 1
a9 1
# $Id: Makefile,v 1.46 1998/12/01 11:14:55 obrien Exp $
d11 5
a15 2
DISTNAME=       apache_1.2.6
PKGNAME=        apacheSSL-1.2.6
d18 19
a36 2
		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/
DISTFILES=      ${DISTNAME}${EXTRACT_SUFX} apache_1.2.6+ssl_1.15.tar.gz
a37 1
MAINTAINER=     markm@@freebsd.org
a38 1
BUILD_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
a40 2
BROKEN=		repository copy

d45 3
a47 2
post-extract:
	@@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_1.2.6+ssl_1.15.tar.gz
d49 23
a71 2
pre-patch:
	@@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
d73 1
a73 3
MAN1=		htpasswd.1
MAN8=		httpd.8
DOCDIR=		${PREFIX}/share/doc/apache
d75 1
a75 2
# Set it for local-supplied patch, f.e.
# VERS_ID = mods-1.0/me
d77 1
a77 30
.if defined(VERS_ID)
post-patch:
	@@cd ${WRKSRC}/src && \
	${MV} Configuration Configuration.old && \
	${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
	< Configuration.old > Configuration
.endif

post-install:
	@@if [ ! -f ${PREFIX}/etc/rc.d/apacheSSL.sh ]; then \
		${ECHO} "Installing ${PREFIX}/etc/rc.d/apacheSSL.sh startup file."; \
		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apacheSSL.sh; \
		${ECHO} "[ -x ${PREFIX}/sbin/httpsd ] && ${PREFIX}/sbin/httpsd && ${ECHO} -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apacheSSL.sh; \
		chmod 751 ${PREFIX}/etc/rc.d/apacheSSL.sh; \
	fi
.for i in ${MAN1}
	${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man1
.endfor
.for i in ${MAN8}
	${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man8
.endfor
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCDIR}
.for i in README LICENSE ABOUT_APACHE
	${INSTALL_DATA} ${WRKSRC}/$i ${DOCDIR}
.endfor
	@@cd ${WRKSRC}/htdocs; tar cf - . | (cd ${DOCDIR}; tar xf -)
.endif

.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
d80 1
d82 4
a85 7
	@@${ECHO} resident or to NO if you aren\'t USA resident to build
	@@${ECHO} this package.
	@@false
.elif defined(USA_RESIDENT)
.if ${USA_RESIDENT} == YES
pre-build:
	cd ${WRKSRC} && ${PATCH} -p2 <${FILESDIR}/Makefile.rsa.patch
d87 2
d90 6
@


1.46
log
@ftp.ox.ac.uk reorganized their directory layout.
(this port really needs some extra MASTER_SITES's)
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.45 1998/04/12 09:53:50 markm Exp $
d19 2
@


1.45
log
@Upgrade to Apache1.2.6.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.44 1998/02/20 00:43:40 steve Exp $
d12 1
a12 1
		ftp://ftp.ox.ac.uk/pub/crypto/SSL/
@


1.44
log
@Instead of using ssleay.cnf.sample warn the user that they must
first create ssleay.cnf before 'make certificate' will work.

Suggested by:	Mark Murray <mark@@grondar.za>
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.43 1998/02/17 21:16:02 markm Exp $
d8 2
a9 2
DISTNAME=       apache_1.2.5
PKGNAME=        apacheSSL-1.2.5
d13 1
a13 1
DISTFILES=      ${DISTNAME}${EXTRACT_SUFX} apache_1.2.5+ssl_1.13.tar.gz
d25 1
a25 1
	@@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_1.2.5+ssl_1.13.tar.gz
@


1.43
log
@Fix this port for RSAref. Fix the location of SSLeay config file.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.42 1998/02/17 12:52:26 markm Exp $
d81 6
a86 2
	cd ${WRKSRC}; ${MAKE} ${MAKE_ENV} $@@
	${CP} ${WRKSRC}/SSLconf/conf/httpsd.pem ${PREFIX}/certs/cert.pem
@


1.42
log
@Upgrade to Apache 1.2.5+SSL 1.13.
Lots of bug fixes, plus repair to the "make certificate" target.

NOTE!! NOTE!! NOTE!!

This port is broken for NorteAmericanos. Someone who has the latest
RSAref would make me eternally grateful by fixing this for the
.US/.CA case and sending me patches.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.41 1997/10/13 15:03:39 markm Exp $
d76 1
a76 6
	@@${ECHO} If you are USA resident, then this port is broken for you.
	@@${ECHO} I am unable to get some of the necessary goodies, so
	@@${ECHO} please assist by fixing this and sending me the patches.
	@@${ECHO} Thanks\!
	${PATCH} <${FILESDIR}/Makefile.rsa.patch
BROKEN=     "RSAref code doesn't apply cleanly"
@


1.41
log
@ipdate the SSL/Crypto to v11. Bug fixes.
@
text
@d2 1
a2 1
# Version required:     1.2.4
d4 1
a4 1
# Whom:			Richard Seaman <dick@@tar.com>
d6 1
a6 1
# $Id: Makefile,v 1.40 1997/09/22 19:44:48 markm Exp $
d8 3
a10 3
DISTNAME=       apache_1.2.4
PKGNAME=        apacheSSL-1.2.4
CATEGORIES=	www
d13 1
a13 1
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} apache_1.2.4+ssl_1.11.tar.gz
d15 1
a15 1
MAINTAINER=	markm@@freebsd.org
d17 2
a18 1
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
d20 1
a20 1
BUILD_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
d25 1
a25 1
	@@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_1.2.4+ssl_1.11.tar.gz
d30 15
d46 5
a50 5
	@@if [ ! -f ${PREFIX}/etc/rc.d/apache_ssl.sh ]; then \
		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache_ssl.sh startup file."; \
		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache_ssl.sh; \
		${ECHO} "[ -x ${PREFIX}/sbin/httpsd ] && ${PREFIX}/sbin/httpsd && ${ECHO} -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apache_ssl.sh; \
		chmod 751 ${PREFIX}/etc/rc.d/apache_ssl.sh; \
d52 13
a64 3
	@@${ECHO} "Please note: in order to install a certificate you have to"
	@@${ECHO} "type:"
	@@${ECHO} "    make certificate"
d69 2
a70 2
	@@${ECHO} You must set variable USA_RESIDENT to YES, if you are USA
	@@${ECHO} resident or to NO, if you aren\'t USA resident to build
a71 1
	@@${ECHO} You must also have installed RSAREF if you are USA resident.
d76 4
d81 1
@


1.40
log
@Update to Apache 1.2.4 and SSL patches 1.9
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.39 1997/08/16 16:01:10 andreas Exp $
d13 1
a13 1
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} apache_1.2.4+ssl_1.9.tar.gz
d24 1
a24 1
	@@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_1.2.4+ssl_1.9.tar.gz
@


1.39
log
@target post-install informs now about "make certificate"
make certificate creates an own temporary certificate
	cd ${WRKSRC}; ${MAKE} ${MAKE_ENV} $@@
and installs it into the suitable location:
	cp ${WRKSRC}/SSLconf/conf/httpsd.pem ${PREFIX}/certs/cert.pem
@
text
@d2 1
a2 1
# Version required:     1.2.1
d6 1
a6 1
# $Id: Makefile,v 1.38 1997/08/16 04:45:27 peter Exp $
d8 2
a9 2
DISTNAME=       apache_1.2.1
PKGNAME=        apacheSSL-1.2.1
d13 5
a18 4
MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
SSL_EXTRAS=	apache_1.2.0+ssl_1.8.tar.gz
DISTFILES=	${MAIN_SRC} ${SSL_EXTRAS}
EXTRACT_ONLY=	${MAIN_SRC}
d20 1
a22 2
MAINTAINER=	markm@@freebsd.org

d24 1
a24 1
	@@cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}
a25 3
# SSLpatch from SSL_EXTRAS is for apache_1.2.0 ... if/when it is upgraded
# we can revert to the commented out line.  There are only minor tweaks needed
# to get to SSLpatch-1.2.1 
d27 1
a27 3
#       @@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
	@@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} \
		< ${FILESDIR}/SSLpatch-1.2.1
d31 3
a33 3
		echo "Installing ${PREFIX}/etc/rc.d/apache_ssl.sh startup file."; \
		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache_ssl.sh; \
		echo "[ -x /usr/local/sbin/httpsd ] && /usr/local/sbin/httpsd && echo -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apache_ssl.sh; \
d36 3
a38 2
	@@echo "Please note: in order to install a certificate you have to type:"
	@@echo "    make certificate"
d42 5
a46 4
	@@echo
	@@echo You must set variable USA_RESIDENT to YES, if you are USA resident
	@@echo or to NO, if you aren\'t USA resident to build this package.
	@@echo You must also have installed RSAREF if you are USA resident.
d57 1
a57 1
	cp ${WRKSRC}/SSLconf/conf/httpsd.pem ${PREFIX}/certs/cert.pem
@


1.38
log
@The path to the SSLeay port is "security/SSLeay", not "security/SSLeay-0.8.1"
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.37 1997/08/15 15:44:27 markm Exp $
d41 2
d57 4
@


1.37
log
@Upgrade to Apache 1.2.1 and SSLeay 0.8.1. Add SSL3 and many other features.
Submitted by:	Richard Seaman <dick@@tar.com>
Apologies to:	All the other who sent me helpful comments and tips and
		who I forgot :-)
@
text
@d6 1
a6 1
# $Id$
d18 1
a18 1
BUILD_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay-0.8.1
@


1.36
log
@Revive apache-1.1.1+SSL which doesn't work because it needs SSLeay 0.6.4
and not 0.6.6 as in ports.  There's probably enough code "out there" to
make a 1.2.1+SSL version now.

Yes, the Makefile is a bit of a mess.
@
text
@d2 3
a4 5
# Version required:     1.1.1
# Date created:         Fri Aug 25 16:42:36 CDT 1995
# Whom:                 markm@@FreeBSD.org
#
# $Id: Makefile,v 1.35 1997/07/08 13:04:09 ache Exp $
d6 1
d8 2
a9 2
DISTNAME=       apache_1.1.1
PKGNAME=        apache_SSL-1.1.1
d11 1
a11 1
MASTER_SITES+=  ftp://www.apache.org/apache/dist/old/1.1/ \
d15 1
a15 2
SSL_EXTRAS=	${DISTNAME}+1.3.ssl${EXTRACT_SUFX}

d18 2
a22 4
BROKEN=		"SSLeay has changed, and the patches for apache need more work"

DEPENDS=	${PORTSDIR}/security/SSLeay

d26 3
d30 3
a32 1
	@@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
d41 14
@


1.35
log
@Upgrade to 1.2.1
@
text
@d1 2
a2 2
# New ports collection makefile for:    apache HTTPD and HTTPSD
# Version required:     1.2.1
d4 1
a4 1
# Whom:                 erich@@rrnet.com
d6 1
a6 1
# $Id: Makefile,v 1.34 1997/06/06 13:45:07 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2.1
PKGNAME=        apache-1.2.1
d12 2
a13 1
MASTER_SITES=   ftp://www.apache.org/apache/dist/
d15 2
a16 5
.if !defined(SECURE_SERVER)
MAINTAINER=     ache@@freebsd.org
.else
MAINTAINER=	markm@@freebsd.org
.endif
d18 2
a19 18
# User-controlled variables list
# DIR_ACHE      - add SuppressHTMLPreamble option to directory index
#                 see http://www.nagual.ru/~ache/apache_dir.html
# SECURE_SERVER - build Apache with SSL

.if defined(DIR_ACHE)
PATCH_SITES+=   http://www.nagual.pp.ru/~ache/
PATCHFILES+=    dir.patch
VERS_ID=        dir/ache
.endif

.if defined(VERS_ID)
post-patch:
	@@cd ${WRKSRC}/src && \
	mv Configuration Configuration.old && \
	sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
	< Configuration.old > Configuration
.endif
d21 1
a21 1
.if defined(SECURE_SERVER)
d24 1
a24 10
PKGNAME=        apache_SSL-1.1.1
MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
SSL_EXTRAS=	${DISTNAME}+1.3.ssl${EXTRACT_SUFX}
DISTFILES=	${MAIN_SRC} ${SSL_EXTRAS}
MASTER_SITES+=  ftp://ftp.ox.ac.uk/pub/crypto/SSL/
EXTRACT_ONLY=	${MAIN_SRC}
MD5_FILE=	${FILESDIR}/md5.SSL
PATCHDIR=	${.CURDIR}/patches.SSL
PKGDIR=		${.CURDIR}/pkg.SSL
CONFIGURE_SCRIPT=	configure.SSL
a39 12

.else

post-install:
	@@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
		echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
	fi

.endif
@


1.34
log
@Update to 1.2.0
@
text
@d2 1
a2 1
# Version required:     1.2.0
d6 1
a6 1
# $Id: Makefile,v 1.33 1997/05/31 20:34:09 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2.0
PKGNAME=        apache-1.2.0
@


1.33
log
@More fixing of OPTIM replacement
@
text
@d2 1
a2 1
# Version required:     1.2b11
d6 1
a6 1
# $Id: Makefile,v 1.30 1997/05/02 18:22:03 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b11
PKGNAME=        apache-1.2b11
@


1.32
log
@Fix OPTIM= patching
@
text
@d35 1
a35 1
	sed 's;^#*OPTIM=.*;& -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
@


1.31
log
@Upgrade to 1.2b11
@
text
@d35 1
a35 1
	sed 's;^OPTIM=.*;& -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
@


1.30
log
@Upgrade to 1.2b10
@
text
@d2 1
a2 1
# Version required:     1.2b10
d6 1
a6 1
# $Id: Makefile,v 1.29 1997/04/14 18:54:26 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b10
PKGNAME=        apache-1.2b10
d26 1
a26 1
PATCH_SITES+=   http://www.nagual.ru/~ache/
@


1.29
log
@Upgrade to 1.2b8
@
text
@d2 1
a2 1
# Version required:     1.2b8
d6 1
a6 1
# $Id: Makefile,v 1.28 1997/02/26 01:23:10 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b8
PKGNAME=        apache-1.2b8
@


1.28
log
@Upgrade to 1.2b7
@
text
@d2 1
a2 1
# Version required:     1.2b7
d6 1
a6 1
# $Id: Makefile,v 1.27 1997/01/28 05:39:31 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b7
PKGNAME=        apache-1.2b7
d14 5
a18 1
MAINTAINER=	ache@@freebsd.org
a41 1
MAINTAINER=	markm@@freebsd.org
@


1.27
log
@Upgrade to 1.2b6
@
text
@d2 1
a2 1
# Version required:     1.2b6
d6 1
a6 1
# $Id: Makefile,v 1.26 1997/01/02 16:39:55 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b6
PKGNAME=        apache-1.2b6
@


1.26
log
@Upgrade to 1.2b4
@
text
@d2 1
a2 1
# Version required:     1.2b4
d6 1
a6 1
# $Id: Makefile,v 1.25 1996/12/25 22:53:22 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b4
PKGNAME=        apache-1.2b4
@


1.25
log
@Upgrade to 1.2b3
Submitted by: mostly by peter
@
text
@d2 1
a2 1
# Version required:     1.2b3
d6 1
a6 1
# $Id: Makefile,v 1.24 1996/12/11 21:04:21 markm Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b3
PKGNAME=        apache-1.2b3
@


1.24
log
@Mark the SSL'ed version as BROKEN, until the official patches appear. Also
add myself as maintainer of the SSL version.
@
text
@d2 1
a2 1
# Version required:     1.2b2
d6 1
a6 1
# $Id: Makefile,v 1.23 1996/12/11 19:09:59 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b2
PKGNAME=        apache-1.2b2
d29 4
a32 4
	@@cd ${WRKSRC}/src; \
	mv httpd.h httpd.h.old; \
	sed 's=SERVER_VERSION *"\(.*\)"=SERVER_VERSION "\1 '"${VERS_ID}"'"=' \
	< httpd.h.old > httpd.h
@


1.23
log
@Upgrade to 1.2b2
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.22 1996/11/18 11:40:33 asami Exp $
d37 2
@


1.22
log
@Use MAN? macros.  CATEGORIES+= -> CATEGORIES.
@
text
@d2 1
a2 1
# Version required:     1.1.1
d6 1
a6 1
# $Id: Makefile,v 1.21 1996/11/07 01:53:14 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.1.1
PKGNAME=        apache-1.1.1
a16 2
# CHARSET_ACHE  - add charset negotiation to .var files and charset guessing
#                 see http://www.nagual.ru/~ache/apache_var.html
a18 2
# ALL_ACHE      - both patches from above
#
d21 1
a21 5
.if defined(ALL_ACHE)
CHARSET_ACHE=YES
DIR_ACHE=YES
.endif
.if defined(CHARSET_ACHE) || defined(DIR_ACHE)
a22 6
.endif
.if defined(CHARSET_ACHE)
PATCHFILES+=    mod.patch
VERS_ID1=       charset/
.endif
.if defined(DIR_ACHE)
d24 1
a24 4
VERS_ID2=       dir/
.endif
.if defined(VERS_ID1) || defined(VERS_ID2)
VERS_ID=        ${VERS_ID1}${VERS_ID2}ache
@


1.21
log
@Add information URLs comment
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.20 1996/11/07 01:49:46 ache Exp $
d11 1
a11 1
CATEGORIES+=	www
@


1.20
log
@Conditionalize all my patches
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.19 1996/10/31 17:42:13 markm Exp $
d17 6
a22 3
# CHARSET_ACHE - add charset negotiation to .var files and charset guessing
# DIR_ACHE - add SuppressHTMLPreamble option to directory index
# ALL_ACHE - both patches from above
@


1.19
log
@Uncomment the DEPENDS= line. Sheesh.
Reminded by:	ache
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.18 1996/10/26 18:49:52 markm Exp $
d15 33
@


1.18
log
@FINALLY - commit the SSL'ed version of this. (ye gods, this has been a while
:-) )
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.17 1996/08/11 14:49:21 markm Exp $
d28 1
a28 1
#DEPENDS=	${PORTSDIR}/security/SSLeay
@


1.17
log
@1) Add the ability to build a secure (SSL'ed) server, conditionalised
   on the presence of SECURE_SERVER.

2) Clean up the installation in accordance with BSD religion:
   Now all the configs go in ${PREFIX}/etc/apache and the
   data (documents) stay in ${PREFIX}/www.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.16 1996/07/12 10:27:53 asami Exp $
d17 1
d28 1
a28 1
DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
d35 10
a44 1
.endif
d53 2
@


1.16
log
@Remove unnecessary DISTFILES and EXTRACT_ONLY.

Remove pst's address from MAINTAINER, I don't know if any script
will fail if we have two addresses here so I don't want to risk
breaking something right before the release.
@
text
@d1 1
a1 1
# New ports collection makefile for:    apache HTTPD
d6 1
a6 1
# $Id: Makefile,v 1.15 1996/07/12 06:41:05 pst Exp $
d15 20
@


1.15
log
@...just changed maintainer to match reality
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.14 1996/07/11 11:03:17 ache Exp $
a12 1
DISTFILES=      ${DISTNAME}.tar.gz
d14 1
a14 3
MAINTAINER=	ache@@freebsd.org,pst@@freebsd.org

EXTRACT_ONLY=   ${DISTNAME}.tar.gz
@


1.14
log
@Upgrade to 1.1.1
OK-ed by: gpalmer
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.13 1996/06/15 17:51:08 jkh Exp $
d15 1
a15 1
MAINTAINER=	pst@@freebsd.org
@


1.13
log
@Slight revision:  If startup file already there, leave it alone.
@
text
@d2 1
a2 1
# Version required:     1.0.5
d6 1
a6 1
# $Id: Makefile,v 1.12 1996/06/15 16:58:06 jkh Exp $
d9 2
a10 2
DISTNAME=       apache_1.0.5
PKGNAME=        apache-1.0.5
d12 2
a13 3
MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
		ftp://www.apache.org/apache/dist/contrib/modules/
DISTFILES=      ${DISTNAME}.tar.gz mod_env.c
a17 3

post-extract:
	cp ${DISTDIR}/mod_env.c ${WRKSRC}/src
@


1.12
log
@Install an apache.sh startup file in /usr/local/etc/rc.d/

Now that apache_httpd is gone from /etc/sysconfig, this is the canonical
way to make apache start automatically in a new system installation.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.11 1996/05/20 07:37:06 asami Exp $
d24 6
a29 4
	@@echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."
	@@echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh
	@@echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh
	@@chmod 751 ${PREFIX}/etc/rc.d/apache.sh
@


1.11
log
@Variable reorderization.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.10 1996/05/19 22:21:42 ache Exp $
d22 6
@


1.10
log
@Use mod_env.c to pass environment to CGI instead of local hack
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.9 1996/04/21 08:54:24 pst Exp $
d11 3
a14 4
EXTRACT_ONLY=   ${DISTNAME}.tar.gz
CATEGORIES+=	www
MASTER_SITES=	ftp://www.apache.org/apache/dist/
MASTER_SITES+=  ftp://www.apache.org/apache/dist/contrib/modules/
d17 2
@


1.9
log
@Update to Apache 1.0.5 (security fix)
@
text
@d1 2
a2 2
# New ports collection makefile for:    apache
# Version required:     1.0.3
d6 1
a6 1
# $Id: Makefile,v 1.8 1996/02/22 21:54:58 ache Exp $
d11 2
d15 1
a15 5
MASTER_SITES+=	ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/
MASTER_SITES+=	ftp://ftp.uni-regensburg.de/pub/comp/infosystems/www/daemons/apache/dist/
MASTER_SITES+=	ftp://Bond.edu.au/pub/apache/dist/
MASTER_SITES+=	ftp://sunsite.mff.cuni.cz/Net/Infosystems/WWW/Servers/Apache/dist/
MASTER_SITES+=	ftp://ftp.ast.cam.ac.uk/pub/WWW/apache/
d18 3
@


1.8
log
@Upgrade to 1.0.3
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.7 1996/02/07 03:15:26 jfieber Exp $
d9 2
a10 2
DISTNAME=       apache_1.0.3
PKGNAME=        apache-1.0.3
@


1.7
log
@Upgrade to 1.0.2.
@
text
@d2 1
a2 1
# Version required:     1
d6 1
a6 1
# $Id: Makefile,v 1.6 1995/12/04 12:56:18 jfieber Exp $
d9 2
a10 2
DISTNAME=	apache_1.0.2
PKGNAME=	apache-1.0.2
@


1.6
log
@Fix MASTER_SITES.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.5 1995/12/02 23:07:08 jfieber Exp $
d9 2
a10 2
DISTNAME=	apache_1.0.0
PKGNAME=	apache-1.0.0
@


1.5
log
@Update to 1.0
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.4 1995/11/27 04:10:09 asami Exp $
d12 6
a17 1
MASTER_SITES=	ftp://ftp.ast.cam.ac.uk/pub/WWW/apache/
@


1.4
log
@Change categories to "www".  gn has "net" in there too.
@
text
@d2 1
a2 1
# Version required:     08
d6 1
a6 1
# $Id: Makefile,v 1.3 1995/09/23 18:47:45 pst Exp $
d9 2
a10 2
DISTNAME=	apache_0.8.14
PKGNAME=	apache-0.8.14
@


1.3
log
@Upgrade apache to 0.8.14, completely restructure port, and list myself as
maintainer.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.1.1.1 1995/08/28 13:28:45 jkh Exp $
d11 1
a11 1
CATEGORIES+=	networking
@


1.2
log
@Upgrade apache to 0.8.13
@
text
@d2 1
a2 1
# Version required:     08.13
d9 2
a10 2
DISTNAME=	apache_0.8.13
PKGNAME=	apache-0.8.13
d13 2
@


1.1
log
@Initial revision
@
text
@d2 1
a2 1
# Version required:     08.11
d6 1
a6 1
# $Id$
d9 2
a10 2
DISTNAME=	apache_0.8.11
PKGNAME=	apache-0.8.11
@


1.1.1.1
log
@Port of the APACHE web server.
Submitted by:	"Eric L. Hernes" <erich@@lodgenet.com>
@
text
@@
