diff options
| -rw-r--r-- | www/apache13-ssl/Makefile | 82 | ||||
| -rw-r--r-- | www/apache13-ssl/distinfo | 4 | ||||
| -rw-r--r-- | www/apache13-ssl/pkg-plist | 14 |
3 files changed, 77 insertions, 23 deletions
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile index eb6d58a139f9..2a6c27f69ad7 100644 --- a/www/apache13-ssl/Makefile +++ b/www/apache13-ssl/Makefile @@ -9,7 +9,6 @@ PORTNAME= apache+ssl PORTVERSION= ${APACHE_VERSION}.${APACHE_SSL_VERSION} -PORTREVISION= 3 CATEGORIES= www security MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITES_APACHE_SSL:S/$/:ssl/} @@ -18,16 +17,56 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}:ssl EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Apache-SSL: Apache secure webserver integrating OpenSSL -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 +APACHE_VERSION= 1.3.28 +APACHE_SSL_VERSION= 1.49 +USE_OPENSSL= yes +USE_PERL5= yes +HAS_CONFIGURE= yes + +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/ + +APACHE_HARD_SERVER_LIMIT?= 512 + +.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 @@ -39,7 +78,6 @@ CONFIGURE_ARGS= \ --server-gid=www \ --with-perl=${PERL} \ --with-layout=GNU \ - --suexec-docroot=${PREFIX}/www/data \ --without-confadjust \ --enable-shared=remain \ --enable-module=most \ @@ -50,13 +88,14 @@ CONFIGURE_ARGS= \ --localstatedir=/var \ --datadir=${PREFIX}/www \ --proxycachedir=${PREFIX}/www/proxy \ - --libexecdir=${PREFIX}/libexec/apache + --libexecdir=${PREFIX}/libexec/apache \ + ${SUEXEC_CONF} -OPTIM= -DHARD_SERVER_LIMIT=512 \ +OPTIM= -DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT} \ -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \ -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" -.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES +.if defined(APACHE_PERF_TUNING) OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer .endif @@ -64,11 +103,9 @@ CFLAGS+= -O6 -fomit-frame-pointer CONFIGURE_ENV+= OPTIM='${OPTIM}' CONFIGURE_ENV+= EXTRA_SSL_LIBS="-L${OPENSSLLIB} -L${LOCALBASE}/lib" -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/ +MAN1= dbmmanage.1 htdigest.1 htpasswd.1 +MAN8= ab.8 httpsdctl.8 apxs.8 httpsd.8 logresolve.8 rotatelogs.8 \ + ${SUEXEC_MAN} .include <bsd.port.pre.mk> @@ -78,6 +115,15 @@ post-extract: post-patch: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch ${OPENSSLBASE} +post-install: + @${ECHO_CMD} "" + @${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)" + @${ECHO_CMD} "" + certificate: -${MKDIR} ${PREFIX}/etc/apache/certs @if [ -f ${OPENSSLDIR}/openssl.cnf ]; then \ diff --git a/www/apache13-ssl/distinfo b/www/apache13-ssl/distinfo index ba76255cea61..f76b0d2fe1c9 100644 --- a/www/apache13-ssl/distinfo +++ b/www/apache13-ssl/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa -MD5 (apache_1.3.27+ssl_1.48.tar.gz) = fb23f91fb6c57c60973f009cf49d598c +MD5 (apache_1.3.28.tar.gz) = 2cdece7b4881d541e072de6a2b65db77 +MD5 (apache_1.3.28+ssl_1.49.tar.gz) = ba794a06cdb960959264c49b5fb54815 diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist index a28ac90d6d2e..beb6e741b190 100644 --- a/www/apache13-ssl/pkg-plist +++ b/www/apache13-ssl/pkg-plist @@ -85,6 +85,7 @@ sbin/httpsd sbin/httpsdctl sbin/logresolve sbin/rotatelogs +%%SUB_SUEXEC%%sbin/suexec @exec mkdir -p %D/www @exec ln -fs %B %D/www/data.default @unexec rm -f %D/www/data.default @@ -119,7 +120,7 @@ www/htdocs/index.html.ru.ucs2 www/htdocs/index.html.ru.ucs4 www/htdocs/index.html.ru.utf8 www/htdocs/index.html.se -www/htdocs/index.html.zh +www/htdocs/index.html.zh-tw.big5 www/htdocs/manual/LICENSE www/htdocs/manual/bind.html.en www/htdocs/manual/bind.html.fr @@ -133,7 +134,9 @@ www/htdocs/manual/configuring.html.en www/htdocs/manual/configuring.html.fr www/htdocs/manual/configuring.html.html www/htdocs/manual/configuring.html.ja.jis -www/htdocs/manual/content-negotiation.html +www/htdocs/manual/content-negotiation.html.en +www/htdocs/manual/content-negotiation.html.html +www/htdocs/manual/content-negotiation.html.ja.jis www/htdocs/manual/custom-error.html.en www/htdocs/manual/custom-error.html.fr www/htdocs/manual/custom-error.html.html @@ -217,6 +220,7 @@ www/htdocs/manual/misc/vif-info.html www/htdocs/manual/misc/windoz_keepalive.html www/htdocs/manual/mod/core.html.en www/htdocs/manual/mod/core.html.fr +www/htdocs/manual/mod/core.html.ja.jis www/htdocs/manual/mod/core.html.html www/htdocs/manual/mod/directive-dict.html.en www/htdocs/manual/mod/directive-dict.html.fr @@ -244,11 +248,13 @@ www/htdocs/manual/mod/mod_actions.html.en www/htdocs/manual/mod/mod_actions.html.html www/htdocs/manual/mod/mod_actions.html.ja.jis www/htdocs/manual/mod/mod_alias.html.en +www/htdocs/manual/mod/mod_alias.html.html www/htdocs/manual/mod/mod_alias.html.ja.jis www/htdocs/manual/mod/mod_asis.html.en www/htdocs/manual/mod/mod_asis.html.html www/htdocs/manual/mod/mod_asis.html.ja.jis www/htdocs/manual/mod/mod_auth.html.en +www/htdocs/manual/mod/mod_auth.html.html www/htdocs/manual/mod/mod_auth.html.ja.jis www/htdocs/manual/mod/mod_auth_anon.html www/htdocs/manual/mod/mod_auth_db.html @@ -280,7 +286,9 @@ www/htdocs/manual/mod/mod_info.html.ja.jis www/htdocs/manual/mod/mod_isapi.html www/htdocs/manual/mod/mod_log_agent.html www/htdocs/manual/mod/mod_log_common.html -www/htdocs/manual/mod/mod_log_config.html +www/htdocs/manual/mod/mod_log_config.html.en +www/htdocs/manual/mod/mod_log_config.html.html +www/htdocs/manual/mod/mod_log_config.html.ja.jis www/htdocs/manual/mod/mod_log_referer.html www/htdocs/manual/mod/mod_mime.html.en www/htdocs/manual/mod/mod_mime.html.html |