aboutsummaryrefslogtreecommitdiff
path: root/www/apache13-modssl
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache13-modssl')
-rw-r--r--www/apache13-modssl/Makefile437
-rw-r--r--www/apache13-modssl/distinfo12
-rw-r--r--www/apache13-modssl/files/CVE-2010-0010.patch33
-rw-r--r--www/apache13-modssl/files/apache.in189
-rw-r--r--www/apache13-modssl/files/logresolve.c.patch12
-rw-r--r--www/apache13-modssl/files/mod_accel-Makefile.tmpl.patch11
-rw-r--r--www/apache13-modssl/files/mod_accel-ap_ext_accel.patch36
-rw-r--r--www/apache13-modssl/files/mod_accel-preservehost.patch54
-rw-r--r--www/apache13-modssl/files/patch-42137
-rw-r--r--www/apache13-modssl/files/patch-Configure31
-rw-r--r--www/apache13-modssl/files/patch-aa20
-rw-r--r--www/apache13-modssl/files/patch-ab99
-rw-r--r--www/apache13-modssl/files/patch-ac55
-rw-r--r--www/apache13-modssl/files/patch-ad19
-rw-r--r--www/apache13-modssl/files/patch-ae29
-rw-r--r--www/apache13-modssl/files/patch-ah36
-rw-r--r--www/apache13-modssl/files/patch-apachectl45
-rw-r--r--www/apache13-modssl/files/patch-apxs.pl15
-rw-r--r--www/apache13-modssl/files/patch-dbmmanage11
-rw-r--r--www/apache13-modssl/files/patch-http_request.c11
-rw-r--r--www/apache13-modssl/files/patch-ssl_util_ssl.c20
-rw-r--r--www/apache13-modssl/files/rotatelogs.c.patch19
-rw-r--r--www/apache13-modssl/pkg-descr53
-rw-r--r--www/apache13-modssl/pkg-install35
-rw-r--r--www/apache13-modssl/pkg-plist759
25 files changed, 0 insertions, 2178 deletions
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
deleted file mode 100644
index 31f3e231a63b..000000000000
--- a/www/apache13-modssl/Makefile
+++ /dev/null
@@ -1,437 +0,0 @@
-# New ports collection makefile for: Apache + mod_ssl
-# Date created: Sat Aug 22 12:00:00 CDT 1998
-# Whom: rse@engelschall.com
-#
-# $FreeBSD$
-#
-
-PORTNAME= apache+mod_ssl
-PORTVERSION= ${VERSION_APACHE}+${VERSION_MODSSL}
-PORTREVISION?= 4
-CATEGORIES?= www security
-MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \
- ${MASTER_SITES_MODSSL:S/$/:mod_ssl/} \
- http://www.mod-snmp.com/distr/:mod_snmp \
- http://sysoev.ru/mod_accel/:mod_accel \
- http://sysoev.ru/mod_deflate/:mod_deflate
-PKGNAMESUFFIX?= ${MODSNMP_SUFFIX}${MODACCEL_SUFFIX}${MODDEFLATE_SUFFIX}${IPV6_SUFFIX}${PKGNAMESUFFIX2}
-DISTNAME= apache_${VERSION_APACHE}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MODSSL_FILE}:mod_ssl \
- ${MODSNMP_DISTFILE} ${MODACCEL_DISTFILE} ${MODDEFLATE_DISTFILE}
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} ${MODSSL_FILE} \
- ${MODACCEL_FILE} ${MODDEFLATE_FILE}
-
-.if defined(WITH_APACHE_IPV6) || defined(APACHE_WITH_IPV6) || make(makesum) || defined(FETCH_ALL)
-PATCH_SITES+= ftp://ftp.42.org/pub/orphan/ ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= dinoex
-PATCHFILES+= apache-1.3.34modssl-v6-20051019.diff.gz
-.endif
-
-MAINTAINER= dinoex@FreeBSD.org
-COMMENT?= The Apache 1.3 webserver with SSL/TLS functionality
-
-LIB_DEPENDS= mm.14:${PORTSDIR}/devel/mm
-PATCH_DEPENDS= ${BUILD_DEPENDS}
-
-DEPRECATED= apache13 is deprecated, migrate to 2.2.x+ now
-EXPIRATION_DATE= 2012-01-01
-
-LICENSE_COMB= multi
-LICENSE= ASL BSD
-CONFLICTS?= apache+ipv6-1.* apache+ssl-1.* apache-1.* apache-2.* \
- apache_fp-1.* caudium-devel-1.* caudium10-1.* caudium12-* \
- ru-apache+mod_ssl-1.* ru-apache-1.* w3c-httpd-3.*
-
-VERSION_APACHE= 1.3.41
-VERSION_MODSSL= 2.8.31
-VERSION_MODSNMP= 1.3.14.13
-VERSION_MODACCEL= 1.0.34
-VERSION_MODDEFLATE= 1.0.21
-USE_OPENSSL= yes
-HAS_CONFIGURE= yes
-.if defined(WITH_PERL)
-USE_PERL5_RUN= yes
-.else
-USE_PERL5_BUILD= yes
-.endif
-MASTER_SITES_MODSSL= http://www.modssl.org/source/ \
- ftp://ftp.modssl.org/source/ \
- ftp://ftp.blatzheim.com/pub/mod_ssl/ \
- ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \
- ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/mod_ssl/source,}
-MODSSL_FILE= mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}
-MODSNMP_FILE= mod_snmp_${VERSION_MODSNMP}${EXTRACT_SUFX}
-
-USE_RC_SUBR= apache
-
-.include <bsd.port.pre.mk>
-
-DOCSDIR= ${PREFIX}/share/doc/apache
-.if defined(APACHE_DATADIR)
-DATADIR= ${APACHE_DATADIR}
-.else
-DATADIR= ${PREFIX}/www
-.endif
-.if defined(APACHE_DOCUMENT_ROOT)
-DOCUMENT_ROOT= ${APACHE_DOCUMENT_ROOT}
-.else
-DOCUMENT_ROOT= ${DATADIR}/data
-.endif
-.if defined(APACHE_CGIBIN_ROOT)
-CGIBIN_ROOT= ${APACHE_CGIBIN_ROOT}
-.else
-CGIBIN_ROOT=${DATADIR}/cgi-bin
-.endif
-DEFAULT_PATH?= ${PREFIX}/bin:/bin:/usr/bin
-APACHE_LOCALSTATE_DIR?= /var
-APACHE_LOGFILE_DIR?= ${APACHE_LOCALSTATE_DIR}/log
-
-.if exists(${LOCALBASE}/include/fnmatch.h)
-check-depends::
- @${PKG_INFO} -W ${LOCALBASE}/include/fnmatch.h
- @${ECHO_CMD} "Dependency error, please do: pkg_delete " \
- `${PKG_INFO} -q -W ${LOCALBASE}/include/fnmatch.h`
- @${FALSE}
-.endif
-
-.if defined(WITH_APACHE_SUEXEC) && !defined(WITHOUT_APACHE_SUEXEC)
-
-APACHE_SUEXEC_DOCROOT?=${DOCUMENT_ROOT}
-APACHE_SUEXEC_LOG?=/var/log/httpd-suexec.log
-APACHE_SUEXEC_USERDIR?=public_html
-APACHE_SUEXEC_UIDMIN?=1000
-APACHE_SUEXEC_GIDMIN?=1000
-APACHE_SUEXEC_CALLER?=www
-APACHE_SUEXEC_SAFE_PATH?=/bin:/usr/bin:${PREFIX}/bin
-
-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=${APACHE_SUEXEC_SAFE_PATH}
-
-.if defined(APACHE_SUEXEC_UMASK)
-SUEXEC_CONF+= --suexec-umask=${APACHE_SUEXEC_UMASK}
-.endif
-
-PLIST_FILES+= sbin/suexec
-SUEXEC_MAN= suexec.8
-
-.else # !SUEXEC
-
-SUEXEC_CONF=
-SUEXEC_MAN=
-
-.endif # !SUEXEC
-
-CONFIGURE_ARGS+=--prefix=${PREFIX} \
- --server-uid=www \
- --server-gid=www \
- --with-perl=${PERL} \
- --with-layout=FreeBSD \
- --datadir=${DATADIR} \
- --htdocsdir=${DOCUMENT_ROOT} \
- --cgidir=${CGIBIN_ROOT} \
- --localstatedir=${APACHE_LOCALSTATE_DIR} \
- --logfiledir=${APACHE_LOGFILE_DIR} \
- --without-confadjust \
- --enable-module=most \
- --enable-module=auth_db \
- --enable-module=mmap_static \
- --disable-module=auth_dbm \
- --enable-shared=max \
- --enable-module=ssl \
- --enable-module=define \
- --disable-module=proxy \
- ${SUEXEC_CONF}
-
-.if defined(APACHE_RELATIVE_RUNTIMEDIR)
-CONFIGURE_ARGS+= --runtimedir=${APACHE_RELATIVE_RUNTIMEDIR}
-.endif
-
-.if defined(WITHOUT_APACHE_EXPAT) || defined(APACHE_WITHOUT_EXPAT)
-CONFIGURE_ARGS+= --disable-rule=EXPAT
-.else
-.if !defined(WITH_APACHE_INTERNAL_EXPAT)
-LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2
-LDFLAGS+= -L${LOCALBASE}/lib
-.endif
-CONFIGURE_ARGS+= --enable-rule=EXPAT
-.endif
-
-.if defined(APACHE_HARD_SERVER_LIMIT)
-HARD_SERVER_LIMIT=-DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT}
-.else
-HARD_SERVER_LIMIT=-DHARD_SERVER_LIMIT=512
-.endif
-
-OPTIM= ${HARD_SERVER_LIMIT} \
- -DDOCUMENT_LOCATION=\\"${DOCUMENT_ROOT}\\" \
- -DDEFAULT_PATH=\\"${DEFAULT_PATH}\\" \
- -DACCEPT_FILTER_NAME=\\"httpready\\"
-
-.if defined(APACHE_FD_SETSIZE)
-OPTIM+= -DFD_SETSIZE=${APACHE_FD_SETSIZE}
-.else
-OPTIM+= -DFD_SETSIZE=1024
-.endif
-
-.if defined(APACHE_BUFFERED_LOGS)
-OPTIM+= -DBUFFERED_LOGS
-.endif
-
-.if defined(APACHE_PERF_TUNING)
-CFLAGS+= -O3
-.endif
-.if defined(WITH_APACHE_PERF_TUNING) && !defined(WITHOUT_APACHE_PERF_TUNING)
-CFLAGS+= -O3
-.endif
-
-.if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP) || make(makesum) || defined(FETCH_ALL)
-MODSNMP_DISTFILE= ${MODSNMP_FILE}:mod_snmp
-.endif
-.if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP)
-CONFLICTS+= apache+mod_ssl-1.* \
- apache+mod_ssl+ipv6-1.* \
- apache+mod_ssl+mod_accel-1.* \
- apache+mod_ssl+mod_accel+ipv6-1.* \
- apache+mod_ssl+mod_accel+mod_deflate-1.* \
- apache+mod_ssl+mod_accel+mod_deflate+ipv6-1.* \
- apache+mod_ssl+mod_deflate-1.* \
- apache+mod_ssl+mod_deflate+ipv6-1.*
-MODSNMP_SUFFIX= +mod_snmp
-CONFIGURE_ARGS+= --activate-module=src/modules/snmp_agt/libsnmp_agt.a
-CFLAGS+= -DSNMP -DUSE_DB -DSNMP_CONFIG_H -DHARD_VIRTUAL_HOST_MAX=1000 \
- -DSNMPLOCALONLY
-EXTRA_PATCHES+= ${WRKSRC}/src/modules/snmp_agt/mod_snmp.patch
-PLIST_FILES+= %%DOCSDIR%%/mod/mod_snmp.html \
- %%DOCSDIR%%/snmp_agt/index.html \
- %%DOCSDIR%%/snmp_agt/www-mib.txt \
- %%DOCSDIR%%/snmp_agt/snmpv2-mib.txt \
- %%DOCSDIR%%/snmp_agt/rfc2594.txt \
- %%DOCSDIR%%/snmp_agt/apache-scoreboard-mib.txt \
- %%DOCSDIR%%/snmp_agt/apache-config-mib.txt
-PLIST_DIRS+= %%DOCSDIR%%/snmp_agt %%DOCSDIR%% www/buckets www
-.else
-CONFLICTS+= apache+*mod_snmp*-1.*
-.endif
-
-.if defined(WITH_APACHE_MODACCEL) || defined(APACHE_WITH_MODACCEL) || make(makesum) || defined(FETCH_ALL)
-MODACCEL_FILE= mod_accel-${VERSION_MODACCEL}${EXTRACT_SUFX}
-MODACCEL_DISTFILE= ${MODACCEL_FILE}:mod_accel
-.endif
-.if defined(WITH_APACHE_MODACCEL) || defined(APACHE_WITH_MODACCEL)
-CONFLICTS+= apache+mod_ssl-1.* \
- apache+mod_ssl+ipv6-1.* \
- apache+mod_ssl+mod_snmp-1.* \
- apache+mod_ssl+mod_snmp+ipv6-1.* \
- apache+mod_ssl+mod_snmp+mod_deflate-1.* \
- apache+mod_ssl+mod_snmp+mod_deflate+ipv6-1.* \
- apache+mod_ssl+mod_deflate-1.* \
- apache+mod_ssl+mod_deflate+ipv6-1.*
-MODACCEL_SUFFIX= +mod_accel
-CONFIGURE_ARGS+= --activate-module=src/modules/extra/mod_randban.o \
- --enable-shared=randban \
- --activate-module=src/modules/extra/mod_freeze.o \
- --enable-shared=freeze \
- --activate-module=src/modules/accel/libaccel.a \
- --enable-shared=accel
-EXTRA_PATCHES+= ${FILESDIR}/mod_accel-preservehost.patch ${FILESDIR}/mod_accel-Makefile.tmpl.patch
-EXTRA_PATCHES+= ${FILESDIR}/mod_accel-ap_ext_accel.patch
-PLIST_FILES+= libexec/apache/libaccel.so \
- libexec/apache/mod_freeze.so \
- libexec/apache/mod_randban.so \
- %%DOCSDIR%%/mod/mod_accel.html
-.else
-CONFLICTS+= apache+*mod_accel*-1.*
-.endif
-
-.if defined(WITH_APACHE_MODDEFLATE) || defined(APACHE_WITH_MODDEFLATE) || make(makesum) || defined(FETCH_ALL)
-MODDEFLATE_FILE= mod_deflate-${VERSION_MODDEFLATE}${EXTRACT_SUFX}
-MODDEFLATE_DISTFILE= ${MODDEFLATE_FILE}:mod_deflate
-.endif
-.if defined(WITH_APACHE_MODDEFLATE) || defined(APACHE_WITH_MODDEFLATE)
-CONFLICTS+= apache+mod_ssl-1.* \
- apache+mod_ssl+ipv6-1.* \
- apache+mod_ssl+mod_snmp-1.* \
- apache+mod_ssl+mod_snmp+ipv6-1.* \
- apache+mod_ssl+mod_snmp+mod_accel-1.* \
- apache+mod_ssl+mod_snmp+mod_accel+ipv6-1.* \
- apache+mod_ssl+mod_accel-1.* \
- apache+mod_ssl+mod_accel+ipv6-1.*
-MODDEFLATE_SUFFIX= +mod_deflate
-CONFIGURE_ARGS+= --activate-module=src/modules/extra/mod_deflate.o
-PLIST_FILES+= %%DOCSDIR%%/mod/mod_deflate.html
-.else
-CONFLICTS+= apache+*mod_deflate*-1.*
-.endif
-
-.if defined(WITH_APACHE_IPV6) || defined(APACHE_WITH_IPV6)
-.if defined(WITH_APACHE_MODACCEL) || defined(APACHE_WITH_MODACCEL)
-BROKEN= mod_accel and ipv6 don't compile together
-.endif
-
-CONFLICTS+= apache+mod_ssl-1.* \
- apache+mod_ssl+mod_snmp-1.* \
- apache+mod_ssl+mod_snmp+mod_accel-1.* \
- apache+mod_ssl+mod_snmp+mod_accel+mod_deflate-1.* \
- apache+mod_ssl+mod_accel-1.* \
- apache+mod_ssl+mod_accel+mod_deflate-1.* \
- apache+mod_ssl+mod_deflate-1.*
-IPV6_SUFFIX= +ipv6
-CONFIGURE_ARGS+= --enable-rule=INET6
-PLIST_SUB+= WITHIPV6=""
-PLIST_FILES+= include/apache/sa_len.h \
- include/apache/sockaddr_storage.h
-.else
-EXTRA_PATCHES+= ${FILESDIR}/logresolve.c.patch
-.endif
-
-.if defined(WITH_APACHE_LATESTLOG)
-EXTRA_PATCHES+= ${FILESDIR}/rotatelogs.c.patch
-.endif
-
-CONFIGURE_ENV= OPTIM='${OPTIM}' \
- SSL_BASE='${OPENSSLBASE}' \
- EAPI_MM='SYSTEM' \
- PATH="${PREFIX}/bin:${PATH}"
-
-INSTALL_TARGET= install-quiet
-
-MAN1= dbmmanage.1 htdigest.1 htpasswd.1
-MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \
- ${SUEXEC_MAN}
-
-TYPE= test
-CRT=
-KEY=
-
-pre-fetch:
- @${ECHO_MSG} ""
- @${ECHO_MSG} "You may use the following build options:"
- @${ECHO_MSG} ""
- @${ECHO_MSG} " WITH_APACHE_SUEXEC=yes enable the suEXEC feature"
- @${ECHO_MSG} " [default is no]"
- @${ECHO_MSG} " APACHE_SUEXEC_CALLER=user set the suEXEC username of the allowed caller"
- @${ECHO_MSG} " [default is www]"
- @${ECHO_MSG} " APACHE_SUEXEC_DOCROOT=dir set the suEXEC root directory"
- @${ECHO_MSG} " [default is ${DOCUMENT_ROOT}]"
- @${ECHO_MSG} " APACHE_SUEXEC_LOG=file set the suEXEC logfile"
- @${ECHO_MSG} " [default is /var/log/httpd-suexec.log]"
- @${ECHO_MSG} " APACHE_SUEXEC_USERDIR=dir set the suEXEC user subdirectory"
- @${ECHO_MSG} " [default is public_html]"
- @${ECHO_MSG} " APACHE_SUEXEC_UIDMIN=uid set the suEXEC minimal allowed UID"
- @${ECHO_MSG} " [default is 1000]"
- @${ECHO_MSG} " APACHE_SUEXEC_GIDMIN=gid set the suEXEC minimal allowed GID"
- @${ECHO_MSG} " [default is 1000]"
- @${ECHO_MSG} " APACHE_SUEXEC_SAFE_PATH=path set the suEXEC safe PATH"
- @${ECHO_MSG} " [default is /bin:/usr/bin:${PREFIX}/bin]"
- @${ECHO_MSG} " APACHE_SUEXEC_UMASK=umask set the umask for the suEXEC'd script"
- @${ECHO_MSG} " [default is inherited from the Apache process]"
- @${ECHO_MSG} ""
- @${ECHO_MSG} " APACHE_DATADIR=path set data directory PATH"
- @${ECHO_MSG} " [default is ${PREFIX}/www]"
- @${ECHO_MSG} " APACHE_CGIBIN_ROOT=path set CGIBIN directory PATH"
- @${ECHO_MSG} " the default is derived from APACHE_DATADIR"
- @${ECHO_MSG} " [currently the default is ${DATADIR}/cgibin]"
- @${ECHO_MSG} " APACHE_DOCUMENT_ROOT=path set documents directory PATH"
- @${ECHO_MSG} " the default is derived from APACHE_DATADIR"
- @${ECHO_MSG} " [currently the default is ${DATADIR}/data]"
- @${ECHO_MSG} " APACHE_LOCALSTATE_DIR=path set modifiable data PATH"
- @${ECHO_MSG} " [default is /var]"
- @${ECHO_MSG} " APACHE_LOGFILE_DIR=path set logfile directory PATH"
- @${ECHO_MSG} " the default is derived from APACHE_LOCALSTATE_DIR"
- @${ECHO_MSG} " [currently the default is ${APACHE_LOCALSTATE_DIR}/log]"
- @${ECHO_MSG} ""
- @${ECHO_MSG} " APACHE_HARD_SERVER_LIMIT=nr Maximum number of Apache processes."
- @${ECHO_MSG} " [default is 512]"
- @${ECHO_MSG} " APACHE_FD_SETSIZE=nr Maximum number of descriptors."
- @${ECHO_MSG} " [default is 1024]"
- @${ECHO_MSG} ""
- @${ECHO_MSG} " APACHE_BUFFERED_LOGS=yes Log entries are buffered before writing."
- @${ECHO_MSG} " Writes may not be atomic, entries from multiple"
- @${ECHO_MSG} " children could become mixed together and your"
- @${ECHO_MSG} " web stats may be inaccurate."
- @${ECHO_MSG} " [default is no]"
- @${ECHO_MSG} " WITH_APACHE_PERF_TUNING=yes CFLAGS optimization."
- @${ECHO_MSG} " This setting may produce broken code and thus"
- @${ECHO_MSG} " is not recommended for production servers."
- @${ECHO_MSG} " [default is no]"
- @${ECHO_MSG} " WITH_APACHE_LATESTLOG=yes keep a hardlink on the lastest log."
- @${ECHO_MSG} ""
- @${ECHO_MSG} " WITH_APACHE_IPV6=yes IPv6 support."
- @${ECHO_MSG} " This setting turns IPv6 support on."
- @${ECHO_MSG} " [default is no]"
- @${ECHO_MSG} ""
- @${ECHO_MSG} " WITH_APACHE_MODSNMP=yes mod_snmp support."
- @${ECHO_MSG} " This setting turns support for SNMP on."
- @${ECHO_MSG} " [default is no]"
- @${ECHO_MSG} ""
- @${ECHO_MSG} " WITH_APACHE_MODACCEL=yes mod_accel support."
- @${ECHO_MSG} " This setting activates build of mod_accel."
- @${ECHO_MSG} " [default is no]"
- @${ECHO_MSG} ""
- @${ECHO_MSG} " WITH_APACHE_MODDEFLATE=yes mod_deflate support."
- @${ECHO_MSG} " This setting activates build of mod_deflate."
- @${ECHO_MSG} " [default is no]"
- @${ECHO_MSG} ""
- @${ECHO_MSG} " WITHOUT_APACHE_EXPAT=yes don't compile in expat."
- @${ECHO_MSG} " [default is no (expat is included)]"
- @${ECHO_MSG} ""
-
-post-extract:
- @${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
- ${WRKSRC}/src/Configure
-.if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP)
- (cd ${WRKSRC}; ${TAR} xfz ${DISTDIR}/${MODSNMP_FILE})
-.endif
-
-pre-patch:
- @cd ${WRKDIR}/mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE} \
- && ${ECHO_MSG} "===> Applying mod_ssl-${VERSION_MODSSL} extension" \
- && ./configure --with-apache=../${DISTNAME} --expert
-.if defined(WITH_APACHE_MODACCEL) || defined(APACHE_WITH_MODACCEL)
- @cd ${WRKDIR}/mod_accel-${VERSION_MODACCEL} \
- && ${ECHO_MSG} "===> Applying mod_accel-${VERSION_MODACCEL} extension" \
- && ./configure --with-apache=../${DISTNAME} --with-mod_randban --with-mod_freeze \
- && ${MAKE}
-.endif
-.if defined(WITH_APACHE_MODDEFLATE) || defined(APACHE_WITH_MODDEFLATE)
- @cd ${WRKDIR}/mod_deflate-${VERSION_MODDEFLATE} \
- && ${ECHO_MSG} "===> Applying mod_deflate-${VERSION_MODDEFLATE} extension" \
- && ./configure --with-apache=../${DISTNAME} \
- && ${MAKE}
-.endif
-
-post-patch:
- @${PERL} -pi -e 's|-print|-print0|;s|xargs|xargs -0|' \
- ${WRKSRC}/Makefile.tmpl
- @${PERL} -pi -e "s|SSL_LDFLAGS=''|SSL_LDFLAGS='${OPENSSL_LDFLAGS}'|" \
- ${WRKSRC}/src/modules/ssl/libssl.module
- @cd ${WRKSRC} \
- && ${FIND} . -type f -name "*.orig" -print | ${XARGS} ${RM} -f
-
-post-build:
- @cd ${WRKSRC} \
- && ${ECHO_MSG} "===> Creating Dummy Certificate for Server (SnakeOil)" \
- && ${ECHO_MSG} " [use 'make certificate' to create a real one]" \
- && ${MAKE} certificate TYPE=dummy >/dev/null 2>&1
-
-certificate:
- @cd ${WRKSRC} \
- && ${ECHO_MSG} "===> Creating Test Certificate for Server" \
- && ${MAKE} certificate TYPE=${TYPE} CRT=${CRT} KEY=${KEY}
-
-pre-install:
- @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-post-install:
-.if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP)
- @${MKDIR} ${DATADIR}/buckets
- @${CHOWN} www:www ${DATADIR}/buckets
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
deleted file mode 100644
index df7ffc29a75d..000000000000
--- a/www/apache13-modssl/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-SHA256 (apache_1.3.41.tar.gz) = 4b016d3998f822af7a1a515e9626590f5473a4dd5c3e8466f20a6a86a2a63adc
-SIZE (apache_1.3.41.tar.gz) = 2483180
-SHA256 (mod_ssl-2.8.31-1.3.41.tar.gz) = dc3e7fef57e53a9ab8b1a541d712ea94630ffe5f1d1eb291d5fa19a80c71dd4d
-SIZE (mod_ssl-2.8.31-1.3.41.tar.gz) = 820067
-SHA256 (mod_snmp_1.3.14.13.tar.gz) = 49962e8c9455e97dca3bba5f1b84ed97214bf42b5cb27b797dea1b8d931cb8ba
-SIZE (mod_snmp_1.3.14.13.tar.gz) = 91125
-SHA256 (mod_accel-1.0.34.tar.gz) = 2fd19cf00f544814bfd707f17a7939d28d64c697b30a87034f284d8e7143c407
-SIZE (mod_accel-1.0.34.tar.gz) = 85200
-SHA256 (mod_deflate-1.0.21.tar.gz) = 95385dd44bb65308290f3abdef56ef96ba47074bac68be7e3f489e5541669a3b
-SIZE (mod_deflate-1.0.21.tar.gz) = 32505
-SHA256 (apache-1.3.34modssl-v6-20051019.diff.gz) = 4e27a95c25d0f3c73eb6b4de9f2a7314c725f1a8969ceb663cf323b30c876c54
-SIZE (apache-1.3.34modssl-v6-20051019.diff.gz) = 29140
diff --git a/www/apache13-modssl/files/CVE-2010-0010.patch b/www/apache13-modssl/files/CVE-2010-0010.patch
deleted file mode 100644
index c9ea4382bcb2..000000000000
--- a/www/apache13-modssl/files/CVE-2010-0010.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN apache_1.3.41/src/main/buff.c src/main/buff.c
---- apache_1.3.41/src/main/buff.c 2006-07-12 10:16:05.000000000 +0200
-+++ src/main/buff.c 2010-01-07 11:28:00.000000000 +0100
-@@ -737,7 +737,7 @@
- {
- int i, nrd;
-
-- if (fb->flags & B_RDERR)
-+ if (fb->flags & B_RDERR || nbyte < 0)
- return -1;
- if (nbyte == 0)
- return 0;
-@@ -1258,7 +1258,7 @@
- static int csize = 0;
- #endif /*CHARSET_EBCDIC*/
-
-- if (fb->flags & (B_WRERR | B_EOUT))
-+ if (fb->flags & (B_WRERR | B_EOUT) || nbyte < 0)
- return -1;
- if (nbyte == 0)
- return 0;
-diff -urN apache_1.3.41/src/modules/proxy/proxy_util.c src/modules/proxy/proxy_util.c
---- apache_1.3.41/src/modules/proxy/proxy_util.c 2007-10-30 20:17:03.000000000 +0100
-+++ src/modules/proxy/proxy_util.c 2010-01-07 11:28:00.000000000 +0100
-@@ -507,7 +507,7 @@
-
- /* read the chunk */
- if (remaining > 0) {
-- n = ap_bread(f, buf, MIN((int)buf_size, (int)remaining));
-+ n = ap_bread(f, buf, (int) MIN(buf_size, remaining));
- if (n > -1) {
- remaining -= n;
- end_of_chunk = (remaining == 0);
diff --git a/www/apache13-modssl/files/apache.in b/www/apache13-modssl/files/apache.in
deleted file mode 100644
index d971e1d8c573..000000000000
--- a/www/apache13-modssl/files/apache.in
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: apache
-# REQUIRE: LOGIN cleanvar
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable apache:
-# apache_enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable apache
-# apache_profiles (str): Set to "" by default.
-# Define your profiles here.
-# apachelimits_enable (bool):Set to "NO" by default.
-# Set it to yes to run `limits $limits_args`
-# just before apache starts.
-# apache_flags (str): Set to "-DSSL" by default.
-# Extra flags passed to start command.
-# apachelimits_args (str): Default to "-e -C daemon"
-# Arguments of pre-start limits run.
-# apache_http_accept_enable (bool): Set to "NO" by default.
-# Set to yes to check for accf_http kernel
-# module on start up and load if not loaded.
-# apache_fib (str): Set an altered default network view for apache
-
-. /etc/rc.subr
-
-name="apache"
-rcvar=`set_rcvar`
-
-start_precmd="apache_prestart"
-restart_precmd="apache_checkconfig"
-reload_precmd="apache_checkconfig"
-reload_cmd="apache_graceful"
-graceful_cmd="apache_graceful"
-configtest_cmd="apache_checkconfig"
-command="%%PREFIX%%/sbin/httpd"
-_pidprefix="/var/run/httpd"
-pidfile="${_pidprefix}.pid"
-required_files=%%PREFIX%%/etc/apache/httpd.conf
-
-[ -z "$apache_enable" ] && apache_enable="NO"
-[ -z "$apache_flags" ] && apache_flags="-DSSL"
-[ -z "$apachelimits_enable" ] && apachelimits_enable="NO"
-[ -z "$apachelimits_args" ] && apachelimits_args="-e -C daemon"
-[ -z "$apache_http_accept_enable" ] && apache_http_accept_enable="NO"
-[ -z "$apache_fib" ] && apache_fib="NO"
-
-apache_accf() {
- retcode=0
- if checkyesno apache_http_accept_enable
- then
- /sbin/kldstat -v | grep accf_http >/dev/null 2>&1
- retcode=${?}
- if [ ${retcode} -ne 0 ]
- then
- /sbin/kldload accf_http 2> /dev/null
- retcode=${?}
- fi
- else
- apache_flags="${apache_flags} -DNOHTTPACCEPT"
- fi
- [ ${retcode} -ne 0 ] && echo "Unable to load accf_http module"
- return ${retcode}
-}
-
-load_rc_config $name
-
-if [ -n "$2" ]; then
- profile="$2"
- if [ "x${apache_profiles}" != "x" ]; then
- pidfile="${_pidprefix}.${profile}.pid"
- eval apache_configfile="\${apache_${profile}_configfile:-}"
- if [ "x${apache_configfile}" = "x" ]; then
- echo "You must define a configuration file (apache_${profile}_configfile)"
- exit 1
- fi
- required_files="${apache_configfile}"
- eval apache_enable="\${apache_${profile}_enable:-${apache_enable}}"
- eval apache_flags="\${apache_${profile}_flags:-${apache_flags}}"
- eval apache_http_accept_enable="\${apache_${profile}_http_accept_enable:-${apache_http_accept_enable}}"
- eval apachelimits_enable="\${apachelimits_${profile}_enable:-${apachelimits_enable}}"
- eval apachelimits_args="\${apachelimits_${profile}_args:-${apachelimits_args}}"
- eval apache_fib="\${apache_${profile}_fib:-${apache_fib}}"
- apache_flags="-f ${apache_configfile} -c \"PidFile ${pidfile}\" ${apache_flags}"
- else
- echo "$0: extra argument ignored"
- fi
-else
- if [ "x${apache_profiles}" != "x" -a "x$1" != "x" ]; then
- for profile in ${apache_profiles}; do
- eval _enable="\${apache_${profile}_enable}"
- case "x${_enable:-${apache_enable}}" in
- x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee])
- continue
- ;;
- x[Yy][Ee][Ss])
- ;;
- *)
- if test -z "$_enable"; then
- _var=apache_enable
- else
- _var=apache_"${profile}"_enable
- fi
- echo "Bad value" \
- "'${_enable:-${apache_enable}}'" \
- "for ${_var}. " \
- "Profile ${profile} skipped."
- continue
- ;;
- esac
- echo "===> apache profile: ${profile}"
- %%PREFIX%%/etc/rc.d/apache $1 ${profile}
- retcode="$?"
- if [ "0${retcode}" -ne 0 ]; then
- failed="${profile} (${retcode}) ${failed:-}"
- else
- success="${profile} ${success:-}"
- fi
- done
- exit 0
- fi
-fi
-
-if [ "${1}" != "stop" ] ; then \
- apache_accf || apache_flags="${apache_flags} -DNOHTTPACCEPT"
-fi
-
-apache_requirepidfile()
-{
- if [ ! "0`check_pidfile ${pidfile} ${command}`" -gt 1 ]; then
- echo "${name} not running? (check $pidfile)."
- exit 1
- fi
-}
-
-apache_checkconfig()
-{
- if test -f %%PREFIX%%/sbin/envvars
- then
- . %%PREFIX%%/sbin/envvars
- fi
-
- echo "Performing sanity check on apache configuration:"
- eval ${command} ${apache_flags} -t
-}
-
-apache_graceful() {
- apache_requirepidfile
-
- echo "Performing a graceful restart"
- kill -USR1 "`check_pidfile ${pidfile} ${command}`"
-}
-
-apache_precmd()
-{
- apache_checkconfig
-
- if checkyesno apachelimits_enable
- then
- eval `/usr/bin/limits ${apachelimits_args}` 2>/dev/null
- else
- return 0
- fi
-
-}
-
-apache_checkfib () {
- sysctl net.fibs >/dev/null 2>&1
- ret=$?
- [ $ret -gt 0 ] && return 0
- if [ "x$apache_fib" != "xNO" ]
- then
- command="setfib -F ${apache_fib} ${command}"
- else
- return 0
- fi
-}
-
-apache_prestart() {
- apache_checkfib
- apache_precmd
-}
-
-extra_commands="reload graceful configtest"
-run_rc_command "$1"
-# eof
diff --git a/www/apache13-modssl/files/logresolve.c.patch b/www/apache13-modssl/files/logresolve.c.patch
deleted file mode 100644
index 04aaf2e5526e..000000000000
--- a/www/apache13-modssl/files/logresolve.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN apache_1.3.41/src/support/logresolve.c src/support/logresolve.c
---- apache_1.3.41/src/support/logresolve.c 2006-07-12 10:16:05.000000000 +0200
-+++ src/support/logresolve.c 2008-10-06 16:29:12.000000000 +0200
-@@ -165,7 +165,7 @@
-
- hostdata = gethostbyaddr((const char *) &ipnum, sizeof(struct in_addr),
- AF_INET);
-- if (hostdata == NULL) {
-+ if (hostdata == NULL || !hostdata->h_name || !*hostdata->h_name) {
- if (h_errno > MAX_ERR)
- errors[UNKNOWN_ERR]++;
- else
diff --git a/www/apache13-modssl/files/mod_accel-Makefile.tmpl.patch b/www/apache13-modssl/files/mod_accel-Makefile.tmpl.patch
deleted file mode 100644
index c2d12cdac291..000000000000
--- a/www/apache13-modssl/files/mod_accel-Makefile.tmpl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/accel/Makefile.tmpl.orig Wed Jul 27 23:56:21 2005
-+++ src/modules/accel/Makefile.tmpl Wed Jul 27 23:56:28 2005
-@@ -9,7 +9,7 @@
-
- OBJS_PIC=\
- mod_accel.lo accel_cachemgr.lo \
-- accel_backend.o accel_cache.lo accel_gc.lo \
-+ accel_backend.lo accel_cache.lo accel_gc.lo \
- accel_lock.lo accel_http.lo accel_connect.lo accel_util.lo \
- ap_other_child.lo ap_ext_accel.lo
-
diff --git a/www/apache13-modssl/files/mod_accel-ap_ext_accel.patch b/www/apache13-modssl/files/mod_accel-ap_ext_accel.patch
deleted file mode 100644
index 43932fc162aa..000000000000
--- a/www/apache13-modssl/files/mod_accel-ap_ext_accel.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/modules/accel/ap_ext_accel.h~ 2009-10-05 22:57:34.000000000 +0400
-+++ src/modules/accel/ap_ext_accel.h 2009-10-05 22:58:10.000000000 +0400
-@@ -8,10 +8,10 @@
-
-
- API_EXPORT_NONSTD(const char *) ap_set_integer_slot(cmd_parms *cmd,
-- char *struct_ptr, int arg);
-+ char *struct_ptr, const char * arg);
-
- API_EXPORT_NONSTD(const char *) ap_set_kilobytes_slot(cmd_parms *cmd,
-- char *struct_ptr, int arg);
-+ char *struct_ptr, const char * arg);
-
- #ifdef NO_SETPROCTITLE
- #define ap_setproctitle(title)
---- src/modules/accel/ap_ext_accel.c~ 2009-10-05 22:57:33.000000000 +0400
-+++ src/modules/accel/ap_ext_accel.c 2009-10-05 22:58:32.000000000 +0400
-@@ -5,7 +5,7 @@
- #include "ap_ext_accel.h"
-
- API_EXPORT_NONSTD(const char *) ap_set_integer_slot(cmd_parms *cmd,
-- char *struct_ptr, int arg)
-+ char *struct_ptr, const char* arg)
- {
- int offset = (int) (long) cmd->info;
- int size = atoi((char *)arg);
-@@ -19,7 +19,7 @@
- }
-
- API_EXPORT_NONSTD(const char *) ap_set_kilobytes_slot(cmd_parms *cmd,
-- char *struct_ptr, int arg)
-+ char *struct_ptr, const char* arg)
- {
- int offset = (int) (long) cmd->info;
- int size = atoi(arg);
-
diff --git a/www/apache13-modssl/files/mod_accel-preservehost.patch b/www/apache13-modssl/files/mod_accel-preservehost.patch
deleted file mode 100644
index 95298b6c5aa3..000000000000
--- a/www/apache13-modssl/files/mod_accel-preservehost.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/modules/accel/mod_accel.c.orig Mon Mar 22 12:25:54 2004
-+++ src/modules/accel/mod_accel.c Mon Mar 22 12:26:30 2004
-@@ -282,6 +282,17 @@
- a->pass->max_wait = a->pass->max_conn;
-
- a->pass->sum = accel_sum(a->pass->sum_part, a->url, tag);
-+
-+ if (max = ap_table_get(r->notes, "rewrite_ph")) {
-+ char *prefix, *port;
-+ if (!(prefix = strstr(a->url, "://")))
-+ return "Invalid URL prefix";
-+
-+ prefix += 3;
-+
-+ a->pass->port = (port = strchr(prefix, ':')) ? atoi(port + 1) : 80;
-+ a->pass->preserve_host = 1;
-+ }
- #endif
- }
-
---- src/modules/standard/mod_rewrite.c.orig Mon Mar 22 12:25:54 2004
-+++ src/modules/standard/mod_rewrite.c Mon Mar 22 12:26:01 2004
-@@ -947,6 +947,10 @@
- || strcasecmp(key, "MP") == 0 ) {
- cfg->max_part = ap_pstrdup(p, val);
- }
-+ else if ( strcasecmp(key, "preservehost") == 0
-+ || strcasecmp(key, "PH") == 0 ) {
-+ cfg->preserve_host = 1;
-+ }
- #endif
- else if ( strcasecmp(key, "passthrough") == 0
- || strcasecmp(key, "PT") == 0 ) {
-@@ -2128,6 +2132,9 @@
- ap_psprintf(r->pool, "%d", p->max_wait));
- if (p->max_part)
- ap_table_set(r->notes, "rewrite_mp", p->max_part);
-+ if (p->preserve_host)
-+ ap_table_set(r->notes, "rewrite_ph",
-+ ap_psprintf(r->pool, "%d", p->preserve_host));
- #endif
- return 1;
- }
-
---- src/modules/standard/mod_rewrite.h.orig Mon Mar 22 12:25:54 2004
-+++ src/modules/standard/mod_rewrite.h Mon Mar 22 12:26:01 2004
-@@ -298,6 +298,7 @@
- int max_conn;
- int max_wait;
- char *max_part;
-+ unsigned preserve_host:1;
- #endif
- } rewriterule_entry;
-
diff --git a/www/apache13-modssl/files/patch-42 b/www/apache13-modssl/files/patch-42
deleted file mode 100644
index 534bb0cc4e69..000000000000
--- a/www/apache13-modssl/files/patch-42
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -ur apache_1.3.41/src/CHANGES src/CHANGES
---- apache_1.3.41/src/CHANGES 2008-01-09 15:33:07.000000000 +0100
-+++ src/CHANGES 2010-01-07 11:28:00.000000000 +0100
-@@ -1,3 +1,33 @@
-+Changes with Apache 1.3.42
-+
-+ *) SECURITY: CVE-2010-0010 (cve.mitre.org)
-+ mod_proxy: Prevent chunk-size integer overflow on platforms
-+ where sizeof(int) < sizeof(long). Reported by Adam Zabrocki.
-+ [Colm MacCárthaigh]
-+
-+ *) IMPORTANT: This is the final release of Apache httpd 1.3.
-+ Apache httpd 1.3 has reached end of life, as of January 2010.
-+ No further releases of this software will be made, although critical
-+ security updates may be made available as patches from the following
-+ website:
-+
-+ http://www.apache.org/dist/httpd/patches/
-+
-+ Apache 1.3.x users who wish to avail of security releases,
-+ bug-fixes and community support are advised to use Apache 2.2
-+ or higher.
-+
-+ Information on upgrading is available from the following website:
-+
-+ http://httpd.apache.org/docs/2.2/upgrading.html
-+
-+ Thank you to everyone who helped make Apache 1.3.x the most
-+ successful, and most used, webserver software on the planet!
-+ [Apache httpd group]
-+
-+ *) Protect logresolve from mismanaged DNS records that return
-+ blank/null hostnames. [Jim Jagielski]
-+
- Changes with Apache 1.3.41
-
- *) SECURITY: CVE-2007-6388 (cve.mitre.org)
-@@ -233,7 +263,7 @@
-
- *) Some syntax errors in mod_mime_magic's magic file can result
- in a 500 error, which previously was unlogged. Now we log the
-- error. [Jeff Trawick]
-+ error. PR 8329. [Jeff Trawick]
-
- *) Linux 2.4+: If Apache is started as root and you code
- CoreDumpDirectory, coredumps are enabled via the prctl() syscall.
-diff -ur apache_1.3.41/src/Configure src/Configure
---- apache_1.3.41/src/Configure 2008-01-04 15:40:05.000000000 +0100
-+++ src/Configure 2008-01-10 17:22:19.000000000 +0100
-@@ -1936,7 +1936,7 @@
- # select the special subtarget for shared core generation
- SUBTARGET=target_shared
- # determine additional suffixes for libhttpd.so
-- V=1 R=3 P=41
-+ V=1 R=3 P=42
- if [ "x$SHLIB_SUFFIX_DEPTH" = "x0" ]; then
- SHLIB_SUFFIX_LIST=""
- fi
-diff -ur apache_1.3.41/src/ap/ap_snprintf.c src/ap/ap_snprintf.c
---- apache_1.3.41/src/ap/ap_snprintf.c 2006-07-12 10:16:05.000000000 +0200
-+++ src/ap/ap_snprintf.c 2008-05-02 19:31:15.000000000 +0200
-@@ -77,8 +77,8 @@
- #define NUM_BUF_SIZE 512
-
- /*
-- * cvt.c - IEEE floating point formatting routines for FreeBSD
-- * from GNU libc-4.6.27. Modified to be thread safe.
-+ * cvt - IEEE floating point formatting routines.
-+ * Derived from UNIX V7, Copyright(C) Caldera International Inc.
- */
-
- /*
-diff -ur apache_1.3.41/src/include/httpd.h src/include/httpd.h
---- apache_1.3.41/src/include/httpd.h 2008-01-10 17:20:45.000000000 +0100
-+++ src/include/httpd.h 2010-01-08 12:42:57.000000000 +0100
-@@ -389,7 +389,7 @@
-
- #define SERVER_BASEVENDOR "Apache Group"
- #define SERVER_BASEPRODUCT "Apache"
--#define SERVER_BASEREVISION "1.3.41"
-+#define SERVER_BASEREVISION "1.3.42"
- #define SERVER_BASEVERSION SERVER_BASEPRODUCT "/" SERVER_BASEREVISION
-
- #define SERVER_PRODUCT SERVER_BASEPRODUCT
-@@ -410,7 +410,7 @@
- * Always increases along the same track as the source branch.
- * For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '20500007'.
- */
--#define APACHE_RELEASE 10341100
-+#define APACHE_RELEASE 10342100
-
- #define SERVER_PROTOCOL "HTTP/1.1"
- #ifndef SERVER_SUPPORT
-diff -ur apache_1.3.41/src/main/buff.c src/main/buff.c
---- apache_1.3.41/src/main/buff.c 2006-07-12 10:16:05.000000000 +0200
-+++ src/main/buff.c 2010-01-07 11:28:00.000000000 +0100
-@@ -737,7 +737,7 @@
- {
- int i, nrd;
-
-- if (fb->flags & B_RDERR)
-+ if (fb->flags & B_RDERR || nbyte < 0)
- return -1;
- if (nbyte == 0)
- return 0;
-@@ -1258,7 +1258,7 @@
- static int csize = 0;
- #endif /*CHARSET_EBCDIC*/
-
-- if (fb->flags & (B_WRERR | B_EOUT))
-+ if (fb->flags & (B_WRERR | B_EOUT) || nbyte < 0)
- return -1;
- if (nbyte == 0)
- return 0;
-diff -ur apache_1.3.41/src/modules/proxy/proxy_util.c src/modules/proxy/proxy_util.c
---- apache_1.3.41/src/modules/proxy/proxy_util.c 2007-10-30 20:17:03.000000000 +0100
-+++ src/modules/proxy/proxy_util.c 2010-01-07 11:28:00.000000000 +0100
-@@ -507,7 +507,7 @@
-
- /* read the chunk */
- if (remaining > 0) {
-- n = ap_bread(f, buf, MIN((int)buf_size, (int)remaining));
-+ n = ap_bread(f, buf, (int) MIN(buf_size, remaining));
- if (n > -1) {
- remaining -= n;
- end_of_chunk = (remaining == 0);
-@@ -548,8 +548,8 @@
- n = ap_bread(f, buf, buf_size);
- }
- else {
-- n = ap_bread(f, buf, MIN((int)buf_size,
-- (int)(len - total_bytes_rcvd)));
-+ n = ap_bread(f, buf, (int) MIN(buf_size,
-+ (len - total_bytes_rcvd)));
- }
- }
-
diff --git a/www/apache13-modssl/files/patch-Configure b/www/apache13-modssl/files/patch-Configure
deleted file mode 100644
index 3fb094b110ac..000000000000
--- a/www/apache13-modssl/files/patch-Configure
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/Configure.orig Sun Sep 16 21:36:49 2007
-+++ src/Configure Sun Sep 16 21:36:51 2007
-@@ -457,7 +457,7 @@
- PLATOSVERS=`echo $PLAT | sed 's/^.*freebsd//'`
- OS="FreeBSD $PLATOSVERS"
- case "$PLATOSVERS" in
-- [23456]*)
-+ [2-9]*)
- DEF_WANTHSREGEX=no
- CFLAGS="$CFLAGS -funsigned-char"
- ;;
-@@ -968,8 +968,8 @@
-
- for uppercase in "tr [a-z] [A-Z]" "tr [:lower:] [:upper:]" "sed y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/"
- do
-- case `echo Apache | $uppercase` in
-- APACHE) break;;
-+ case `echo abcdefghijklmnopqrstuvwxyz | $uppercase` in
-+ ABCDEFGHIJKLMNOPQRSTUVWXYZ) break;;
- esac
- done
- echo " + using \"$uppercase\" to uppercase"
-@@ -1080,7 +1080,7 @@
- ;;
- *-freebsd[3-9]*)
- LD_SHLIB="gcc"
-- CFLAGS_SHLIB="-fpic"
-+ CFLAGS_SHLIB="-fPIC"
- LDFLAGS_SHLIB="-shared"
- LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
- OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
diff --git a/www/apache13-modssl/files/patch-aa b/www/apache13-modssl/files/patch-aa
deleted file mode 100644
index 78be57c08eed..000000000000
--- a/www/apache13-modssl/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
diff --git a/www/apache13-modssl/files/patch-ab b/www/apache13-modssl/files/patch-ab
deleted file mode 100644
index 1fcc20ce0610..000000000000
--- a/www/apache13-modssl/files/patch-ab
+++ /dev/null
@@ -1,99 +0,0 @@
---- Makefile.tmpl.orig Sat Jun 22 12:55:54 2002
-+++ Makefile.tmpl Sat Jun 22 12:59:10 2002
-@@ -329,10 +329,10 @@
- $(MKDIR) $(root)$(sysconfdir)/ssl.csr
- $(MKDIR) $(root)$(sysconfdir)/ssl.key
- $(MKDIR) $(root)$(sysconfdir)/ssl.prm
-- $(MKDIR) $(root)$(htdocsdir)
-+ $(MKDIR) $(root)$(htdocsdir)-dist
- $(MKDIR) $(root)$(manualdir)
- $(MKDIR) $(root)$(iconsdir)
-- $(MKDIR) $(root)$(cgidir)
-+ $(MKDIR) $(root)$(cgidir)-dist
- $(MKDIR) $(root)$(includedir)
- $(MKDIR) $(root)$(includedir)/xml
- $(MKDIR) $(root)$(runtimedir)
-@@ -533,33 +533,29 @@
- # icons and distributed CGI scripts.
- install-data:
- @echo "===> [data: Installing initial data files]"
-- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
-- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
-- else \
-- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-+ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)-dist/"; \
- (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
-- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
-- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
-- find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
-- fi
-- -@if [ -d $(TOP)/htdocs/manual ]; then \
-+ (cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \
-+ find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \
-+ find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ;
- echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
- (cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
- (cd $(root)$(manualdir)/ && $(TAR) -xf -); \
- find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
-- find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
-+ find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ;
-+ if [ ! -d $(root)$(htdocsdir)/ ]; then \
-+ $(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \
- fi
-- -@if [ -f $(root)$(cgidir)/printenv ]; then \
-- echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
-- else \
- for script in printenv test-cgi; do \
- cat $(TOP)/cgi-bin/$${script} |\
- sed -e 's;^#!/.*perl;#!$(PERL);' \
- > $(TOP)/$(SRC)/.apaci.install.tmp; \
-- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
-- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
-- done; \
-- fi
-+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)-dist/$${script}"; \
-+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)-dist/$${script}; \
-+ done;
-+ if [ ! -d $(root)$(cgidir)/ ]; then \
-+ $(LN) -sf $(root)$(cgidir)-dist $(root)$(cgidir); \
-+ fi
- @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
- (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
- (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
-@@ -607,10 +603,10 @@
- -e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
- -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
- -e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
-- -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
-- -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
-- -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
-- -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
-+ -e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \
-+ -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \
-+ -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \
-+ -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \
- -e 's;conf/magic;$(sysconfdir)/magic;' \
- -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
- -e 's;User nobody;User $(conf_user);' \
-@@ -623,8 +619,8 @@
- -e 's;ServerName new.host.name;ServerName $(conf_servername);' \
- -e 's;VirtualHost _default_:443;VirtualHost _default_:$(conf_port_ssl);' \
- > $(TOP)/$(SRC)/.apaci.install.tmp && \
-- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
-- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
-+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}-dist"; \
-+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}-dist; \
- if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
-@@ -633,8 +629,8 @@
- fi; \
- done
- -@for conf in mime.types magic; do \
-- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
-- $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
-+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist"; \
-+ $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist; \
- if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
- $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
diff --git a/www/apache13-modssl/files/patch-ac b/www/apache13-modssl/files/patch-ac
deleted file mode 100644
index 77973a5fa8e4..000000000000
--- a/www/apache13-modssl/files/patch-ac
+++ /dev/null
@@ -1,55 +0,0 @@
---- conf/httpd.conf-dist.orig Thu Feb 7 23:50:37 2002
-+++ conf/httpd.conf-dist Thu Feb 7 23:50:38 2002
-@@ -92,8 +92,8 @@
- # server ignore these files altogether by using "/dev/null" (for Unix) or
- # "nul" (for Win32) for the arguments to the directives.
- #
--#ResourceConfig conf/srm.conf
--#AccessConfig conf/access.conf
-+ResourceConfig /dev/null
-+AccessConfig /dev/null
-
- #
- # Timeout: The number of seconds before receives and sends time out.
-@@ -367,7 +367,22 @@
- # directory index. Separate multiple entries with spaces.
- #
- <IfModule mod_dir.c>
-- DirectoryIndex index.html
-+ <IfModule mod_php3.c>
-+ <IfModule mod_php4.c>
-+ DirectoryIndex index.php index.php3 index.html
-+ </IfModule>
-+ <IfModule !mod_php4.c>
-+ DirectoryIndex index.php3 index.html
-+ </IfModule>
-+ </IfModule>
-+ <IfModule !mod_php3.c>
-+ <IfModule mod_php4.c>
-+ DirectoryIndex index.php index.html
-+ </IfModule>
-+ <IfModule !mod_php4.c>
-+ DirectoryIndex index.html
-+ </IfModule>
-+ </IfModule>
- </IfModule>
-
- #
-@@ -487,7 +502,7 @@
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
--CustomLog logs/access_log common
-+#CustomLog logs/access_log common
-
- #
- # If you would like to have agent and referer logfiles, uncomment the
-@@ -500,7 +515,7 @@
- # If you prefer a single logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
--#CustomLog logs/access_log combined
-+CustomLog logs/access_log combined
-
- #
- # Optionally add a line containing the server version and virtual host
diff --git a/www/apache13-modssl/files/patch-ad b/www/apache13-modssl/files/patch-ad
deleted file mode 100644
index 5deadd438d9a..000000000000
--- a/www/apache13-modssl/files/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/support/apachectl.orig Wed Mar 24 10:11:39 1999
-+++ src/support/apachectl Wed Mar 24 10:19:09 1999
-@@ -39,6 +39,8 @@
- # -------------------- --------------------
- # |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
-
-+eval `limits -e -C daemon` >/dev/null 2>&1
-+
- ERROR=0
- ARGV="$@"
- if [ "x$ARGV" = "x" ] ; then
-@@ -94,6 +96,7 @@
- fi
- if kill $PID ; then
- echo "$0 $ARG: httpd stopped"
-+ rm -f $PIDFILE
- else
- echo "$0 $ARG: httpd could not be stopped"
- ERROR=4
diff --git a/www/apache13-modssl/files/patch-ae b/www/apache13-modssl/files/patch-ae
deleted file mode 100644
index 4ee89df5c8c8..000000000000
--- a/www/apache13-modssl/files/patch-ae
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/support/log_server_status.orig Tue Jan 16 02:06:38 2001
-+++ src/support/log_server_status Mon Oct 22 20:44:59 2001
-@@ -70,7 +70,7 @@
- #
- require 'sys/socket.ph';
-
--$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312"
-+$wherelog = "/var/log/httpd-status-";
- $server = "localhost"; # Name of server, could be "www.foo.com"
- $port = "80"; # Port on server
- $request = "/status/?auto"; # Request to send
-@@ -96,14 +96,14 @@
- ### Main
-
- {
-- $year=`date +%y`;
-+ $year=`LC_TIME=C date +%y`;
- chomp($year);
- $year += ($year < 70) ? 2000 : 1900;
-- $date = $year . `date +%m%d:%H%M%S`;
-+ $date = $year . `LC_TIME=C date +%m%d:%H%M%S`;
- chomp($date);
- ($day,$time)=split(/:/,$date);
- $res=&tcp_connect($server,$port);
-- open(OUT,">>$wherelog$day");
-+ open(OUT,">>$wherelog$day.log");
- if ($res) {
- print OUT "$time:-1:-1:-1:-1:$res\n";
- exit 1;
diff --git a/www/apache13-modssl/files/patch-ah b/www/apache13-modssl/files/patch-ah
deleted file mode 100644
index 12be4a63bfa4..000000000000
--- a/www/apache13-modssl/files/patch-ah
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/modules/ssl/Makefile.tmpl.orig Mon Jan 1 19:48:52 2001
-+++ src/modules/ssl/Makefile.tmpl Mon Oct 22 20:45:05 2001
-@@ -128,6 +128,11 @@
- ## END-USER AREA
- ##
-
-+# This requires special handling to get the correct versions of include files:
-+# ../../include/fnmatch.h instead of /usr/include/fnmatch.h
-+# /usr/include/openssl/*.h instead of /usr/local/include/openssl.h
-+MY_CFLAGS= $(INCLUDES0) $(SSL_CFLAGS) $(INCLUDES1) $(EXTRA_INCLUDES) $(CFLAGS)
-+
- all: lib
-
- lib: $(LIB)
-@@ -144,10 +149,10 @@
- .SUFFIXES: .o .lo
-
- .c.o:
-- $(CC) -c $(INCLUDES) $(CFLAGS) $(SSL_CFLAGS) $(SSL_VERSION) $<
-+ $(CC) -c $(MY_CFLAGS) $(SSL_VERSION) $<
-
- .c.lo:
-- $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SSL_CFLAGS) $(SSL_VERSION) $< && mv $*.o $*.lo
-+ $(CC) -c $(MY_CFLAGS) $(CFLAGS_SHLIB) $(SSL_VERSION) $< && mv $*.o $*.lo
-
- clean:
- rm -f $(OBJS) $(OBJS_PIC)
-@@ -201,7 +206,7 @@
- depend:
- cp Makefile.tmpl Makefile.tmpl.bak \
- && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
-- && gcc -MM $(INCLUDES) $(CFLAGS) $(SSL_CFLAGS) *.c >> Makefile.new \
-+ && gcc -MM $(MY_CFLAGS) *.c >> Makefile.new \
- && sed -e '1,$$s; $(INCDIR)/; $$(INCDIR)/;g' \
- -e '1,$$s; $(OSDIR)/; $$(OSDIR)/;g' \
- -e '1,$$s;^\([a-z0-9_]*\)\.o:;\1.o \1.lo:;g' Makefile.new \
diff --git a/www/apache13-modssl/files/patch-apachectl b/www/apache13-modssl/files/patch-apachectl
deleted file mode 100644
index 0eb64d59af3c..000000000000
--- a/www/apache13-modssl/files/patch-apachectl
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/support/apachectl.orig Sun Oct 26 20:53:07 2003
-+++ src/support/apachectl Mon Oct 27 22:27:30 2003
-@@ -105,14 +105,14 @@
- restart)
- if [ $RUNNING -eq 0 ]; then
- echo "$0 $ARG: httpd not running, trying to start"
-- if $HTTPD ; then
-+ if $HTTPD -DSSL ; then
- echo "$0 $ARG: httpd started"
- else
- echo "$0 $ARG: httpd could not be started"
- ERROR=5
- fi
- else
-- if $HTTPD -t >/dev/null 2>&1; then
-+ if $HTTPD -DSSL -t >/dev/null 2>&1; then
- if kill -HUP $PID ; then
- echo "$0 $ARG: httpd restarted"
- else
-@@ -129,14 +129,14 @@
- graceful)
- if [ $RUNNING -eq 0 ]; then
- echo "$0 $ARG: httpd not running, trying to start"
-- if $HTTPD ; then
-+ if $HTTPD -DSSL ; then
- echo "$0 $ARG: httpd started"
- else
- echo "$0 $ARG: httpd could not be started"
- ERROR=5
- fi
- else
-- if $HTTPD -t >/dev/null 2>&1; then
-+ if $HTTPD -DSSL -t >/dev/null 2>&1; then
- if kill -USR1 $PID ; then
- echo "$0 $ARG: httpd gracefully restarted"
- else
-@@ -157,7 +157,7 @@
- $LYNX $STATUSURL
- ;;
- configtest)
-- if $HTTPD -t; then
-+ if $HTTPD -DSSL -t; then
- :
- else
- ERROR=8
diff --git a/www/apache13-modssl/files/patch-apxs.pl b/www/apache13-modssl/files/patch-apxs.pl
deleted file mode 100644
index 9c1596e0cb70..000000000000
--- a/www/apache13-modssl/files/patch-apxs.pl
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/support/apxs.pl.orig Mon Nov 29 21:05:12 2004
-+++ src/support/apxs.pl Mon Nov 29 21:05:56 2004
-@@ -604,12 +604,10 @@
- print FP $content;
- close(FP);
- if ($^O ne "MSWin32") {
-- push(@cmds, "cp $cfgbase.conf $cfgbase.conf.bak");
- push(@cmds, "cp $cfgbase.conf.new $cfgbase.conf");
- push(@cmds, "rm $cfgbase.conf.new");
- } else {
- $cfgbase =~ s|/|\\|g;
-- push(@cmds, "copy \"$cfgbase.conf\" \"$cfgbase.conf.bak\"");
- push(@cmds, "copy \"$cfgbase.conf.new\" \"$cfgbase.conf\"");
- push(@cmds, "del \"$cfgbase.conf.new\"");
- }
diff --git a/www/apache13-modssl/files/patch-dbmmanage b/www/apache13-modssl/files/patch-dbmmanage
deleted file mode 100644
index dcce57c1ced4..000000000000
--- a/www/apache13-modssl/files/patch-dbmmanage
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/support/dbmmanage~ Tue Oct 10 06:23:58 2000
-+++ src/support/dbmmanage Sun Dec 3 00:45:08 2000
-@@ -338,7 +338,7 @@
- } elsif (substr($chkpass, 0, 5) eq '{SHA}') {
- need_sha1_crypt;
- $crypt_method = "sha1";
-- } elsif (length($chkpass) == 13 && $chkpass ne $testpass) {
-+ } elsif ((length($chkpass) == 13 && $chkpass ne $testpass) || ($chkpass =~ m/^\$[0-9]\$/)) {
- $crypt_method = "crypt";
- } else {
- $crypt_method = "plain";
diff --git a/www/apache13-modssl/files/patch-http_request.c b/www/apache13-modssl/files/patch-http_request.c
deleted file mode 100644
index e4642e4f2d27..000000000000
--- a/www/apache13-modssl/files/patch-http_request.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main/http_request.c.bak Wed Apr 28 20:58:42 2004
-+++ src/main/http_request.c Mon Jun 14 17:11:06 2004
-@@ -1056,7 +1056,7 @@
- */
- if ((r->status != HTTP_NOT_MODIFIED) && (r->status != HTTP_NO_CONTENT)
- && !ap_status_drops_connection(r->status)
-- && r->connection && (r->connection->keepalive > 0)) {
-+ && r->connection && (r->connection->keepalive != -1)) {
-
- (void) ap_discard_request_body(r);
- }
diff --git a/www/apache13-modssl/files/patch-ssl_util_ssl.c b/www/apache13-modssl/files/patch-ssl_util_ssl.c
deleted file mode 100644
index 7114310c6b86..000000000000
--- a/www/apache13-modssl/files/patch-ssl_util_ssl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/modules/ssl/ssl_util_ssl.c.orig 2006-05-08 09:15:38.000000000 +0200
-+++ src/modules/ssl/ssl_util_ssl.c 2010-04-06 13:36:01.000000000 +0200
-@@ -324,7 +324,7 @@
- {
- X509_EXTENSION *ext;
- int ext_nid;
-- STACK *sk;
-+ STACK_OF(SSL_CIPHER) *sk;
- BOOL is_sgc;
- int idx;
- int i;
-@@ -333,7 +333,7 @@
- idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
- if (idx >= 0) {
- ext = X509_get_ext(cert, idx);
-- if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) {
-+ if ((sk = X509V3_EXT_d2i(ext)) != NULL) {
- for (i = 0; i < sk_num(sk); i++) {
- ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i));
- if (ext_nid == NID_ms_sgc || ext_nid == NID_ns_sgc) {
diff --git a/www/apache13-modssl/files/rotatelogs.c.patch b/www/apache13-modssl/files/rotatelogs.c.patch
deleted file mode 100644
index b2d5c79a92ff..000000000000
--- a/www/apache13-modssl/files/rotatelogs.c.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/support/rotatelogs.c~ Mon Aug 3 11:15:33 1998
-+++ src/support/rotatelogs.c Sun Mar 26 22:42:40 2000
-@@ -11,6 +11,7 @@
- #include <time.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <unistd.h>
-
- #define BUFSIZE 65536
- #define ERRMSGSZ 82
-@@ -95,6 +96,8 @@
- }
- else {
- close(nLogFDprev);
-+ unlink(szLogRoot);
-+ link(buf2, szLogRoot);
- }
- nMessCount = 0;
- }
diff --git a/www/apache13-modssl/pkg-descr b/www/apache13-modssl/pkg-descr
deleted file mode 100644
index 0fe3312f367c..000000000000
--- a/www/apache13-modssl/pkg-descr
+++ /dev/null
@@ -1,53 +0,0 @@
-This is Apache version 1.3 plus mod_ssl which provides strong cryptography
-via the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS
-v1) protocols by the help of the SSL/TLS implementation toolkit OpenSSL which
-is based on SSLeay from Eric A. Young and Tim J. Hudson. The mod_ssl package
-was created in April 1998 by Ralf S. Engelschall and was originally derived
-from software developed by Ben Laurie for use in the Apache-SSL HTTP server
-project.
-
-As a summary, here are its main SSL/TLS-related features:
- o Open-Source software (BSD-style license)
- o Useable for both commercial and non-commercial use
- o Available for both Unix and Win32 (Windows 95/98/NT) platforms
- o 128-bit strong cryptography world-wide
- o Support for SSLv2, SSLv3 and TLSv1 protocols
- o Support for both RSA and Diffie-Hellman ciphers
- o Clean reviewable ANSI C source code
- o Clean Apache module architecture
- o Integrates seamlessly into Apache through an Extended API (EAPI)
- o Full Dynamic Shared Object (DSO) support
- o Advanced pass-phrase handling for private keys
- o X.509 certificate based authentication for both client and server
- o X.509 certificate revocation list (CRL) support
- o Support for per-URL renegotiation of SSL handshake parameters
- o Support for explicit seeding of the PRNG from external sources
- o Additional boolean-expression based access control facility
- o Backward compatibility to other Apache SSL solutions
- o Inter-process SSL session cache (DBM and Shared Memory based)
- o Powerful dedicated SSL engine logging facility
- o Simple and robust application to Apache source trees
- o Fully integrated into the Apache 1.3 configuration mechanism
- o Additional integration into the Apache Autoconf-style Interface (APACI)
- o Assistance in X.509v3 certificate generation (both RSA and DSA)
- o Experimental support for external Crypto Devices (OpenSSL ENGINE)
-
-mod_snmp is a plug-in for apache-1.3.x to take apache status by SNMP
-
-LICENSE: Apache License 2.0
-WWW: http://www.apache.org/
-
-LICENSE: BSD 4-clause
-WWW: http://www.modssl.org/
-"This product includes software developed by
-Ralf S. Engelschall <rse@engelschall.com> for use in the
-mod_ssl project (http://www.modssl.org/)."
-
-LICENSE: BSD 4-clause
-WWW: http://www.openssl.org/
-"This product includes software developed by the OpenSSL Project
-for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-LICENSE: BSD 4-clause
-WWW: http://www.mod-snmp.com/
-"This product includes software developed by Harrie Hazewinkel."
diff --git a/www/apache13-modssl/pkg-install b/www/apache13-modssl/pkg-install
deleted file mode 100644
index a94883a29bd5..000000000000
--- a/www/apache13-modssl/pkg-install
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/www/apache13-modssl/Attic/pkg-install,v 1.2 2004-07-16 06:17:27 dinoex Exp $
-#
-
-if [ "$2" != "PRE-INSTALL" ]; then
- exit 0
-fi
-
-USER=www
-GROUP=${USER}
-UID=80
-GID=${UID}
-
-if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
- if pw groupadd ${GROUP} -g ${GID}; then
- echo "Added group \"${GROUP}\"."
- else
- echo "Adding group \"${GROUP}\" failed..."
- exit 1
- fi
-fi
-
-if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
- nologin=`grep operator /etc/passwd | cut -d : -f 7`
- if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
- -s "${nologin}" -d "/nonexistent" \
- -c "World Wide Web Owner"; \
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- exit 1
- fi
-fi
-exit 0
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
deleted file mode 100644
index 33e2bbebbaca..000000000000
--- a/www/apache13-modssl/pkg-plist
+++ /dev/null
@@ -1,759 +0,0 @@
-bin/checkgid
-bin/dbmmanage
-bin/htdigest
-bin/htpasswd
-@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf-dist; then rm -f %D/etc/apache/access.conf; fi
-etc/apache/access.conf-dist
-@exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf
-@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf-dist; then rm -f %D/etc/apache/httpd.conf; fi
-etc/apache/httpd.conf-dist
-@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
-@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic-dist; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic-dist
-@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
-@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types-dist; then rm -f %D/etc/apache/mime.types; fi
-etc/apache/mime.types-dist
-@exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
-@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf-dist; then rm -f %D/etc/apache/srm.conf; fi
-etc/apache/srm.conf-dist
-@exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf
-etc/apache/ssl.crl/Makefile
-etc/apache/ssl.crl/README.CRL
-etc/apache/ssl.crt/Makefile
-etc/apache/ssl.crt/README.CRT
-etc/apache/ssl.crt/ca-bundle.crt
-etc/apache/ssl.crt/server.crt
-etc/apache/ssl.crt/snakeoil-ca-dsa.crt
-etc/apache/ssl.crt/snakeoil-ca-rsa.crt
-etc/apache/ssl.crt/snakeoil-dsa.crt
-etc/apache/ssl.crt/snakeoil-rsa.crt
-etc/apache/ssl.csr/README.CSR
-etc/apache/ssl.csr/server.csr
-etc/apache/ssl.key/README.KEY
-etc/apache/ssl.key/server.key
-etc/apache/ssl.key/snakeoil-ca-dsa.key
-etc/apache/ssl.key/snakeoil-ca-rsa.key
-etc/apache/ssl.key/snakeoil-dsa.key
-etc/apache/ssl.key/snakeoil-rsa.key
-etc/apache/ssl.prm/README.PRM
-etc/apache/ssl.prm/snakeoil-ca-dsa.prm
-etc/apache/ssl.prm/snakeoil-dsa.prm
-include/apache/ap.h
-include/apache/ap_alloc.h
-include/apache/ap_compat.h
-include/apache/ap_config.h
-include/apache/ap_config_auto.h
-include/apache/ap_ctx.h
-include/apache/ap_ctype.h
-include/apache/ap_ebcdic.h
-include/apache/ap_hook.h
-include/apache/ap_md5.h
-include/apache/ap_mm.h
-include/apache/ap_mmn.h
-include/apache/ap_sha1.h
-include/apache/buff.h
-include/apache/compat.h
-include/apache/conf.h
-include/apache/explain.h
-include/apache/fnmatch.h
-include/apache/hsregex.h
-include/apache/http_conf_globals.h
-include/apache/http_config.h
-include/apache/http_core.h
-include/apache/http_log.h
-include/apache/http_main.h
-include/apache/http_protocol.h
-include/apache/http_request.h
-include/apache/http_vhost.h
-include/apache/httpd.h
-include/apache/multithread.h
-include/apache/os-inline.c
-include/apache/os.h
-include/apache/rfc1413.h
-include/apache/scoreboard.h
-include/apache/util_date.h
-include/apache/util_md5.h
-include/apache/util_script.h
-include/apache/util_uri.h
-include/apache/xml/asciitab.h
-include/apache/xml/hashtable.h
-include/apache/xml/iasciitab.h
-include/apache/xml/latin1tab.h
-include/apache/xml/nametab.h
-include/apache/xml/utf8tab.h
-include/apache/xml/xmldef.h
-include/apache/xml/xmlparse.h
-include/apache/xml/xmlrole.h
-include/apache/xml/xmltok.h
-include/apache/xml/xmltok_impl.h
-libexec/apache/httpd.exp
-libexec/apache/libssl.so
-libexec/apache/mod_access.so
-libexec/apache/mod_actions.so
-libexec/apache/mod_alias.so
-libexec/apache/mod_asis.so
-libexec/apache/mod_auth.so
-libexec/apache/mod_auth_anon.so
-libexec/apache/mod_auth_db.so
-libexec/apache/mod_autoindex.so
-libexec/apache/mod_cern_meta.so
-libexec/apache/mod_cgi.so
-libexec/apache/mod_define.so
-libexec/apache/mod_digest.so
-libexec/apache/mod_dir.so
-libexec/apache/mod_env.so
-libexec/apache/mod_expires.so
-libexec/apache/mod_headers.so
-libexec/apache/mod_imap.so
-libexec/apache/mod_include.so
-libexec/apache/mod_info.so
-libexec/apache/mod_log_config.so
-libexec/apache/mod_log_forensic.so
-libexec/apache/mod_mime.so
-libexec/apache/mod_mime_magic.so
-libexec/apache/mod_mmap_static.so
-libexec/apache/mod_negotiation.so
-libexec/apache/mod_rewrite.so
-libexec/apache/mod_setenvif.so
-libexec/apache/mod_speling.so
-libexec/apache/mod_status.so
-libexec/apache/mod_unique_id.so
-libexec/apache/mod_userdir.so
-libexec/apache/mod_usertrack.so
-libexec/apache/mod_vhost_alias.so
-sbin/ab
-sbin/apachectl
-sbin/apxs
-sbin/httpd
-sbin/logresolve
-sbin/rotatelogs
-www/data-dist/apache_pb.gif
-www/data-dist/index.html.ca
-www/data-dist/index.html.cz
-www/data-dist/index.html.de
-www/data-dist/index.html.dk
-www/data-dist/index.html.ee
-www/data-dist/index.html.el
-www/data-dist/index.html.en
-www/data-dist/index.html.es
-www/data-dist/index.html.fr
-www/data-dist/index.html.he.iso8859-8
-www/data-dist/index.html.hu
-www/data-dist/index.html.it
-www/data-dist/index.html.ja.jis
-www/data-dist/index.html.kr.iso-kr
-www/data-dist/index.html.lb.utf8
-www/data-dist/index.html.nl
-www/data-dist/index.html.nn
-www/data-dist/index.html.no
-www/data-dist/index.html.po.iso-pl
-www/data-dist/index.html.pt
-www/data-dist/index.html.pt-br
-www/data-dist/index.html.ru.cp-1251
-www/data-dist/index.html.ru.cp866
-www/data-dist/index.html.ru.iso-ru
-www/data-dist/index.html.ru.koi8-r
-www/data-dist/index.html.ru.ucs2
-www/data-dist/index.html.ru.ucs4
-www/data-dist/index.html.ru.utf8
-www/data-dist/index.html.se
-www/data-dist/index.html.zh-tw.big5
-%%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/bind.html.en
-%%DOCSDIR%%/bind.html.fr
-%%DOCSDIR%%/bind.html.html
-%%DOCSDIR%%/bind.html.ja.jis
-%%DOCSDIR%%/configuring.html.fr
-%%DOCSDIR%%/configuring.html.en
-%%DOCSDIR%%/configuring.html.ja.jis
-%%DOCSDIR%%/content-negotiation.html.en
-%%DOCSDIR%%/content-negotiation.html.html
-%%DOCSDIR%%/content-negotiation.html.ja.jis
-%%DOCSDIR%%/custom-error.html.en
-%%DOCSDIR%%/custom-error.html.ja.jis
-%%DOCSDIR%%/cygwin.html
-%%DOCSDIR%%/dns-caveats.html.en
-%%DOCSDIR%%/dns-caveats.html.fr
-%%DOCSDIR%%/dns-caveats.html.html
-%%DOCSDIR%%/dns-caveats.html.ja.jis
-%%DOCSDIR%%/dso.html
-%%DOCSDIR%%/ebcdic.html
-%%DOCSDIR%%/env.html.en
-%%DOCSDIR%%/env.html.html
-%%DOCSDIR%%/env.html.ja.jis
-%%DOCSDIR%%/footer.html
-%%DOCSDIR%%/handler.html.en
-%%DOCSDIR%%/handler.html.ja.jis
-%%DOCSDIR%%/header.html
-%%DOCSDIR%%/howto/auth.html
-%%DOCSDIR%%/howto/cgi.html.en
-%%DOCSDIR%%/howto/cgi.html.ja.jis
-%%DOCSDIR%%/howto/footer.html
-%%DOCSDIR%%/howto/header.html
-%%DOCSDIR%%/howto/htaccess.html
-%%DOCSDIR%%/images/apache_pb.gif
-%%DOCSDIR%%/images/apache_header.gif
-%%DOCSDIR%%/images/custom_errordocs.gif
-%%DOCSDIR%%/images/feather.jpg
-%%DOCSDIR%%/images/home.gif
-%%DOCSDIR%%/images/index.gif
-%%DOCSDIR%%/images/mod_rewrite_fig1.fig
-%%DOCSDIR%%/images/mod_rewrite_fig1.gif
-%%DOCSDIR%%/images/mod_rewrite_fig2.fig
-%%DOCSDIR%%/images/mod_rewrite_fig2.gif
-%%DOCSDIR%%/images/mod_ssl_sb.gif
-%%DOCSDIR%%/images/openssl_ics.gif
-%%DOCSDIR%%/images/pixel.gif
-%%DOCSDIR%%/images/sub.gif
-%%DOCSDIR%%/index.html.en
-%%DOCSDIR%%/index.html.ja.jis
-%%DOCSDIR%%/install-tpf.html
-%%DOCSDIR%%/install-ztpf.html
-%%DOCSDIR%%/install.html.es
-%%DOCSDIR%%/install.html.en
-%%DOCSDIR%%/install.html.ja.jis
-%%DOCSDIR%%/invoking.html.en
-%%DOCSDIR%%/invoking.html.html
-%%DOCSDIR%%/invoking.html.ja.jis
-%%DOCSDIR%%/keepalive.html.en
-%%DOCSDIR%%/keepalive.html.html
-%%DOCSDIR%%/keepalive.html.ja.jis
-%%DOCSDIR%%/location.html.en
-%%DOCSDIR%%/location.html.html
-%%DOCSDIR%%/location.html.ja.jis
-%%DOCSDIR%%/logs.html
-%%DOCSDIR%%/man-template.html
-%%DOCSDIR%%/misc/API.html
-%%DOCSDIR%%/misc/FAQ.html
-%%DOCSDIR%%/misc/HTTP_Features.tsv
-%%DOCSDIR%%/misc/client_block_api.html
-%%DOCSDIR%%/misc/compat_notes.html
-%%DOCSDIR%%/misc/custom_errordocs.html
-%%DOCSDIR%%/misc/descriptors.html
-%%DOCSDIR%%/misc/fin_wait_2.html
-%%DOCSDIR%%/misc/footer.html
-%%DOCSDIR%%/misc/header.html
-%%DOCSDIR%%/misc/howto.html
-%%DOCSDIR%%/misc/index.html
-%%DOCSDIR%%/misc/known_client_problems.html
-%%DOCSDIR%%/misc/nopgp.html
-%%DOCSDIR%%/misc/perf-bsd44.html
-%%DOCSDIR%%/misc/perf-dec.html
-%%DOCSDIR%%/misc/perf-hp.html
-%%DOCSDIR%%/misc/perf-tuning.html
-%%DOCSDIR%%/misc/perf.html
-%%DOCSDIR%%/misc/rewriteguide.html
-%%DOCSDIR%%/misc/security_tips.html
-%%DOCSDIR%%/misc/tutorials.html
-%%DOCSDIR%%/misc/vif-info.html
-%%DOCSDIR%%/misc/windoz_keepalive.html
-%%DOCSDIR%%/mod/core.html.en
-%%DOCSDIR%%/mod/core.html.fr
-%%DOCSDIR%%/mod/core.html.html
-%%DOCSDIR%%/mod/core.html.ja.jis
-%%DOCSDIR%%/mod/directive-dict.html.en
-%%DOCSDIR%%/mod/directive-dict.html.fr
-%%DOCSDIR%%/mod/directive-dict.html.ja.jis
-%%DOCSDIR%%/mod/directives.html.de
-%%DOCSDIR%%/mod/directives.html.en
-%%DOCSDIR%%/mod/directives.html.fr
-%%DOCSDIR%%/mod/directives.html.html
-%%DOCSDIR%%/mod/directives.html.ja.jis
-%%DOCSDIR%%/mod/footer.html
-%%DOCSDIR%%/mod/header.html
-%%DOCSDIR%%/mod/index-bytype.html.en
-%%DOCSDIR%%/mod/index-bytype.html.fr
-%%DOCSDIR%%/mod/index-bytype.html.html
-%%DOCSDIR%%/mod/index-bytype.html.ja.jis
-%%DOCSDIR%%/mod/index.html.en
-%%DOCSDIR%%/mod/index.html.fr
-%%DOCSDIR%%/mod/index.html.html
-%%DOCSDIR%%/mod/index.html.ja.jis
-%%DOCSDIR%%/mod/mod_access.html.en
-%%DOCSDIR%%/mod/mod_access.html.html
-%%DOCSDIR%%/mod/mod_access.html.ja.jis
-%%DOCSDIR%%/mod/mod_actions.html.en
-%%DOCSDIR%%/mod/mod_actions.html.html
-%%DOCSDIR%%/mod/mod_actions.html.ja.jis
-%%DOCSDIR%%/mod/mod_alias.html.en
-%%DOCSDIR%%/mod/mod_alias.html.html
-%%DOCSDIR%%/mod/mod_alias.html.ja.jis
-%%DOCSDIR%%/mod/mod_asis.html.en
-%%DOCSDIR%%/mod/mod_asis.html.html
-%%DOCSDIR%%/mod/mod_asis.html.ja.jis
-%%DOCSDIR%%/mod/mod_auth.html.en
-%%DOCSDIR%%/mod/mod_auth.html.html
-%%DOCSDIR%%/mod/mod_auth.html.ja.jis
-%%DOCSDIR%%/mod/mod_auth_anon.html
-%%DOCSDIR%%/mod/mod_auth_db.html
-%%DOCSDIR%%/mod/mod_auth_dbm.html
-%%DOCSDIR%%/mod/mod_auth_digest.html
-%%DOCSDIR%%/mod/mod_autoindex.html.en
-%%DOCSDIR%%/mod/mod_autoindex.html.html
-%%DOCSDIR%%/mod/mod_autoindex.html.ja.jis
-%%DOCSDIR%%/mod/mod_browser.html
-%%DOCSDIR%%/mod/mod_cern_meta.html
-%%DOCSDIR%%/mod/mod_cgi.html.en
-%%DOCSDIR%%/mod/mod_cgi.html.html
-%%DOCSDIR%%/mod/mod_cgi.html.ja.jis
-%%DOCSDIR%%/mod/mod_cookies.html
-%%DOCSDIR%%/mod/mod_define.html
-%%DOCSDIR%%/mod/mod_digest.html
-%%DOCSDIR%%/mod/mod_dir.html.en
-%%DOCSDIR%%/mod/mod_dir.html.html
-%%DOCSDIR%%/mod/mod_dir.html.ja.jis
-%%DOCSDIR%%/mod/mod_dld.html
-%%DOCSDIR%%/mod/mod_env.html.en
-%%DOCSDIR%%/mod/mod_env.html.html
-%%DOCSDIR%%/mod/mod_env.html.ja.jis
-%%DOCSDIR%%/mod/mod_example.html
-%%DOCSDIR%%/mod/mod_expires.html
-%%DOCSDIR%%/mod/mod_headers.html
-%%DOCSDIR%%/mod/mod_imap.html
-%%DOCSDIR%%/mod/mod_include.html
-%%DOCSDIR%%/mod/mod_info.html.en
-%%DOCSDIR%%/mod/mod_info.html.html
-%%DOCSDIR%%/mod/mod_info.html.ja.jis
-%%DOCSDIR%%/mod/mod_isapi.html
-%%DOCSDIR%%/mod/mod_log_agent.html
-%%DOCSDIR%%/mod/mod_log_common.html
-%%DOCSDIR%%/mod/mod_log_config.html.en
-%%DOCSDIR%%/mod/mod_log_config.html.html
-%%DOCSDIR%%/mod/mod_log_config.html.ja.jis
-%%DOCSDIR%%/mod/mod_log_referer.html
-%%DOCSDIR%%/mod/mod_log_forensic.html.en
-%%DOCSDIR%%/mod/mod_log_forensic.html.html
-%%DOCSDIR%%/mod/mod_mime.html.en
-%%DOCSDIR%%/mod/mod_mime.html.html
-%%DOCSDIR%%/mod/mod_mime.html.ja.jis
-%%DOCSDIR%%/mod/mod_mime_magic.html
-%%DOCSDIR%%/mod/mod_mmap_static.html
-%%DOCSDIR%%/mod/mod_negotiation.html.en
-%%DOCSDIR%%/mod/mod_negotiation.html.ja.jis
-%%DOCSDIR%%/mod/mod_proxy.html
-%%DOCSDIR%%/mod/mod_rewrite.html.en
-%%DOCSDIR%%/mod/mod_rewrite.html.html
-%%DOCSDIR%%/mod/mod_rewrite.html.ja.jis
-%%DOCSDIR%%/mod/mod_setenvif.html.en
-%%DOCSDIR%%/mod/mod_setenvif.html.html
-%%DOCSDIR%%/mod/mod_setenvif.html.ja.jis
-%%DOCSDIR%%/mod/mod_so.html.en
-%%DOCSDIR%%/mod/mod_so.html.html
-%%DOCSDIR%%/mod/mod_so.html.ja.jis
-%%DOCSDIR%%/mod/mod_speling.html.en
-%%DOCSDIR%%/mod/mod_speling.html.html
-%%DOCSDIR%%/mod/mod_speling.html.ja.jis
-%%DOCSDIR%%/mod/mod_ssl/index.html
-%%DOCSDIR%%/mod/mod_ssl/ssl_compat.gfont000.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_compat.html
-%%DOCSDIR%%/mod/mod_ssl/ssl_compat.wml
-%%DOCSDIR%%/mod/mod_ssl/ssl_cover.wml
-%%DOCSDIR%%/mod/mod_ssl/ssl_cover_logo.jpg
-%%DOCSDIR%%/mod/mod_ssl/ssl_cover_title.jpg
-%%DOCSDIR%%/mod/mod_ssl/ssl_faq.gfont000.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_faq.html
-%%DOCSDIR%%/mod/mod_ssl/ssl_faq.wml
-%%DOCSDIR%%/mod/mod_ssl/ssl_glossary.html
-%%DOCSDIR%%/mod/mod_ssl/ssl_glossary.wml
-%%DOCSDIR%%/mod/mod_ssl/ssl_howto.gfont000.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_howto.html
-%%DOCSDIR%%/mod/mod_ssl/ssl_howto.wml
-%%DOCSDIR%%/mod/mod_ssl/ssl_intro.gfont000.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_intro.html
-%%DOCSDIR%%/mod/mod_ssl/ssl_intro.wml
-%%DOCSDIR%%/mod/mod_ssl/ssl_intro_fig1.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_intro_fig2.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_intro_fig3.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_overview.gfont000.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_overview.html
-%%DOCSDIR%%/mod/mod_ssl/ssl_overview.wml
-%%DOCSDIR%%/mod/mod_ssl/ssl_overview_fig1.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_reference.gfont000.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_reference.html
-%%DOCSDIR%%/mod/mod_ssl/ssl_reference.wml
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-chapter.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-1.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-2.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-3.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-4.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-5.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-6.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-7.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.inc
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.navbut-next-n.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.navbut-next-s.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.navbut-prev-n.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.navbut-prev-s.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-abstract.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-compat.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-faq.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-gloss.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-howto.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-intro.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-over.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-preface.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-ref.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-toc.gif
-%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-tutor.gif
-%%DOCSDIR%%/mod/mod_status.html
-%%DOCSDIR%%/mod/mod_unique_id.html.en
-%%DOCSDIR%%/mod/mod_unique_id.html.html
-%%DOCSDIR%%/mod/mod_unique_id.html.ja.jis
-%%DOCSDIR%%/mod/mod_userdir.html.en
-%%DOCSDIR%%/mod/mod_userdir.html.html
-%%DOCSDIR%%/mod/mod_userdir.html.ja.jis
-%%DOCSDIR%%/mod/mod_usertrack.html
-%%DOCSDIR%%/mod/mod_vhost_alias.html
-%%DOCSDIR%%/mod/module-dict.html.en
-%%DOCSDIR%%/mod/module-dict.html.ja.jis
-%%DOCSDIR%%/mpeix.html
-%%DOCSDIR%%/multilogs.html
-%%DOCSDIR%%/netware.html
-%%DOCSDIR%%/new_features_1_0.html
-%%DOCSDIR%%/new_features_1_1.html
-%%DOCSDIR%%/new_features_1_2.html
-%%DOCSDIR%%/new_features_1_3.html.en
-%%DOCSDIR%%/new_features_1_3.html.ja.jis
-%%DOCSDIR%%/process-model.html.en
-%%DOCSDIR%%/process-model.html.html
-%%DOCSDIR%%/process-model.html.ja.jis
-%%DOCSDIR%%/programs/ab.html
-%%DOCSDIR%%/programs/apachectl.html.en
-%%DOCSDIR%%/programs/apachectl.html.html
-%%DOCSDIR%%/programs/apachectl.html.ja.jis
-%%DOCSDIR%%/programs/apxs.html
-%%DOCSDIR%%/programs/dbmmanage.html
-%%DOCSDIR%%/programs/footer.html
-%%DOCSDIR%%/programs/header.html
-%%DOCSDIR%%/programs/htdigest.html
-%%DOCSDIR%%/programs/htpasswd.html.en
-%%DOCSDIR%%/programs/htpasswd.html.html
-%%DOCSDIR%%/programs/htpasswd.html.ja.jis
-%%DOCSDIR%%/programs/httpd.html.en
-%%DOCSDIR%%/programs/httpd.html.html
-%%DOCSDIR%%/programs/httpd.html.ja.jis
-%%DOCSDIR%%/programs/index.html.en
-%%DOCSDIR%%/programs/index.html.html
-%%DOCSDIR%%/programs/index.html.ja.jis
-%%DOCSDIR%%/programs/logresolve.html
-%%DOCSDIR%%/programs/other.html
-%%DOCSDIR%%/programs/rotatelogs.html
-%%DOCSDIR%%/programs/suexec.html.en
-%%DOCSDIR%%/programs/suexec.html.html
-%%DOCSDIR%%/programs/suexec.html.ja.jis
-%%DOCSDIR%%/readme-tpf.html
-%%DOCSDIR%%/server-wide.html.en
-%%DOCSDIR%%/server-wide.html.ja.jis
-%%DOCSDIR%%/sections.html.en
-%%DOCSDIR%%/sections.html.html
-%%DOCSDIR%%/sections.html.ja.jis
-%%DOCSDIR%%/sitemap.html
-%%DOCSDIR%%/sourcereorg.html
-%%DOCSDIR%%/stopping.html.en
-%%DOCSDIR%%/stopping.html.fr
-%%DOCSDIR%%/stopping.html.html
-%%DOCSDIR%%/suexec.html.en
-%%DOCSDIR%%/suexec.html.html
-%%DOCSDIR%%/suexec.html.ja.jis
-%%DOCSDIR%%/suexec_1_2.html
-%%DOCSDIR%%/unixware.html
-%%DOCSDIR%%/upgrading_to_1_3.html
-%%DOCSDIR%%/vhosts/details.html
-%%DOCSDIR%%/vhosts/details_1_2.html
-%%DOCSDIR%%/vhosts/examples.html
-%%DOCSDIR%%/vhosts/fd-limits.html.en
-%%DOCSDIR%%/vhosts/fd-limits.html.html
-%%DOCSDIR%%/vhosts/fd-limits.html.ja.jis
-%%DOCSDIR%%/vhosts/footer.html
-%%DOCSDIR%%/vhosts/header.html
-%%DOCSDIR%%/vhosts/host.html
-%%DOCSDIR%%/vhosts/index.html.en
-%%DOCSDIR%%/vhosts/index.html.ja.jis
-%%DOCSDIR%%/vhosts/ip-based.html
-%%DOCSDIR%%/vhosts/mass.html
-%%DOCSDIR%%/vhosts/name-based.html.en
-%%DOCSDIR%%/vhosts/name-based.html.html
-%%DOCSDIR%%/vhosts/name-based.html.ja.jis
-%%DOCSDIR%%/vhosts/vhosts-in-depth.html
-%%DOCSDIR%%/vhosts/virtual-host.html
-%%DOCSDIR%%/win_compiling.html.en
-%%DOCSDIR%%/win_compiling.html.html
-%%DOCSDIR%%/win_compiling.html.ja.jis
-%%DOCSDIR%%/win_service.html.en
-%%DOCSDIR%%/win_service.html.html
-%%DOCSDIR%%/win_service.html.ja.jis
-%%DOCSDIR%%/windows.html.en
-%%DOCSDIR%%/windows.html.html
-%%DOCSDIR%%/windows.html.ja.jis
-%%DOCSDIR%%/mod/directive-dict.html.html
-%%DOCSDIR%%/mod/mod_negotiation.html.html
-%%DOCSDIR%%/mod/module-dict.html.html
-%%DOCSDIR%%/configuring.html.html
-%%DOCSDIR%%/custom-error.html.fr
-%%DOCSDIR%%/custom-error.html.html
-%%DOCSDIR%%/handler.html.html
-%%DOCSDIR%%/index.html.fr
-%%DOCSDIR%%/index.html.html
-%%DOCSDIR%%/install.html.fr
-%%DOCSDIR%%/install.html.html
-%%DOCSDIR%%/invoking.html.fr
-%%DOCSDIR%%/new_features_1_3.html.html
-%%DOCSDIR%%/server-wide.html.fr
-%%DOCSDIR%%/server-wide.html.html
-%%DOCSDIR%%/howto/cgi.html.html
-%%DOCSDIR%%/howto/ssi.html.en
-%%DOCSDIR%%/howto/ssi.html.html
-%%DOCSDIR%%/howto/ssi.html.ja.jis
-%%DOCSDIR%%/urlmapping.html
-%%DOCSDIR%%/vhosts/index.html.html
-www/cgi-bin-dist/printenv
-www/cgi-bin-dist/test-cgi
-www/icons/README
-www/icons/README.html
-www/icons/a.gif
-www/icons/alert.black.gif
-www/icons/alert.red.gif
-www/icons/apache_pb.gif
-www/icons/back.gif
-www/icons/ball.gray.gif
-www/icons/ball.red.gif
-www/icons/binary.gif
-www/icons/binhex.gif
-www/icons/blank.gif
-www/icons/bomb.gif
-www/icons/box1.gif
-www/icons/box2.gif
-www/icons/broken.gif
-www/icons/burst.gif
-www/icons/c.gif
-www/icons/comp.blue.gif
-www/icons/comp.gray.gif
-www/icons/compressed.gif
-www/icons/continued.gif
-www/icons/dir.gif
-www/icons/diskimg.gif
-www/icons/diskimg.png
-www/icons/down.gif
-www/icons/dvi.gif
-www/icons/f.gif
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/folder.sec.gif
-www/icons/forward.gif
-www/icons/generic.gif
-www/icons/generic.red.gif
-www/icons/generic.sec.gif
-www/icons/hand.right.gif
-www/icons/hand.up.gif
-www/icons/icon.sheet.gif
-www/icons/image1.gif
-www/icons/image2.gif
-www/icons/image3.gif
-www/icons/index.gif
-www/icons/layout.gif
-www/icons/left.gif
-www/icons/link.gif
-www/icons/movie.gif
-www/icons/p.gif
-www/icons/patch.gif
-www/icons/pdf.gif
-www/icons/pie0.gif
-www/icons/pie1.gif
-www/icons/pie2.gif
-www/icons/pie3.gif
-www/icons/pie4.gif
-www/icons/pie5.gif
-www/icons/pie6.gif
-www/icons/pie7.gif
-www/icons/pie8.gif
-www/icons/portal.gif
-www/icons/ps.gif
-www/icons/quill.gif
-www/icons/right.gif
-www/icons/screw1.gif
-www/icons/screw2.gif
-www/icons/script.gif
-www/icons/small/back.gif
-www/icons/small/binary.gif
-www/icons/small/binhex.gif
-www/icons/small/blank.gif
-www/icons/small/broken.gif
-www/icons/small/burst.gif
-www/icons/small/comp1.gif
-www/icons/small/comp2.gif
-www/icons/small/compressed.gif
-www/icons/small/continued.gif
-www/icons/small/dir.gif
-www/icons/small/dir2.gif
-www/icons/small/doc.gif
-www/icons/small/forward.gif
-www/icons/small/generic.gif
-www/icons/small/generic2.gif
-www/icons/small/generic3.gif
-www/icons/small/image.gif
-www/icons/small/image2.gif
-www/icons/small/index.gif
-www/icons/small/key.gif
-www/icons/small/movie.gif
-www/icons/small/patch.gif
-www/icons/small/ps.gif
-www/icons/small/rainbow.gif
-www/icons/small/sound.gif
-www/icons/small/sound2.gif
-www/icons/small/tar.gif
-www/icons/small/text.gif
-www/icons/small/transfer.gif
-www/icons/small/unknown.gif
-www/icons/small/uu.gif
-www/icons/sound1.gif
-www/icons/sound2.gif
-www/icons/sphere1.gif
-www/icons/sphere2.gif
-www/icons/tar.gif
-www/icons/tex.gif
-www/icons/text.gif
-www/icons/transfer.gif
-www/icons/unknown.gif
-www/icons/up.gif
-www/icons/uu.gif
-www/icons/uuencoded.gif
-www/icons/world1.gif
-www/icons/world2.gif
-www/icons/a.png
-www/icons/alert.black.png
-www/icons/alert.red.png
-www/icons/apache_pb.png
-www/icons/back.png
-www/icons/ball.gray.png
-www/icons/ball.red.png
-www/icons/binary.png
-www/icons/binhex.png
-www/icons/blank.png
-www/icons/bomb.png
-www/icons/box1.png
-www/icons/box2.png
-www/icons/broken.png
-www/icons/burst.png
-www/icons/c.png
-www/icons/comp.blue.png
-www/icons/comp.gray.png
-www/icons/compressed.png
-www/icons/continued.png
-www/icons/dir.png
-www/icons/down.png
-www/icons/dvi.png
-www/icons/f.png
-www/icons/folder.png
-www/icons/folder.open.png
-www/icons/folder.sec.png
-www/icons/forward.png
-www/icons/generic.png
-www/icons/generic.red.png
-www/icons/generic.sec.png
-www/icons/hand.right.png
-www/icons/hand.up.png
-www/icons/icon.sheet.png
-www/icons/image1.png
-www/icons/image2.png
-www/icons/image3.png
-www/icons/index.png
-www/icons/layout.png
-www/icons/left.png
-www/icons/link.png
-www/icons/movie.png
-www/icons/p.png
-www/icons/patch.png
-www/icons/pdf.png
-www/icons/pie0.png
-www/icons/pie1.png
-www/icons/pie2.png
-www/icons/pie3.png
-www/icons/pie4.png
-www/icons/pie5.png
-www/icons/pie6.png
-www/icons/pie7.png
-www/icons/pie8.png
-www/icons/portal.png
-www/icons/ps.png
-www/icons/quill.png
-www/icons/right.png
-www/icons/screw1.png
-www/icons/screw2.png
-www/icons/script.png
-www/icons/small/back.png
-www/icons/small/binary.png
-www/icons/small/binhex.png
-www/icons/small/blank.png
-www/icons/small/broken.png
-www/icons/small/burst.png
-www/icons/small/comp1.png
-www/icons/small/comp2.png
-www/icons/small/compressed.png
-www/icons/small/continued.png
-www/icons/small/dir.png
-www/icons/small/dir2.png
-www/icons/small/doc.png
-www/icons/small/forward.png
-www/icons/small/generic.png
-www/icons/small/generic2.png
-www/icons/small/generic3.png
-www/icons/small/image.png
-www/icons/small/image2.png
-www/icons/small/index.png
-www/icons/small/key.png
-www/icons/small/movie.png
-www/icons/small/patch.png
-www/icons/small/ps.png
-www/icons/small/rainbow.png
-www/icons/small/sound.png
-www/icons/small/sound2.png
-www/icons/small/tar.png
-www/icons/small/text.png
-www/icons/small/transfer.png
-www/icons/small/unknown.png
-www/icons/small/uu.png
-www/icons/sound1.png
-www/icons/sound2.png
-www/icons/sphere1.png
-www/icons/sphere2.png
-www/icons/tar.png
-www/icons/tex.png
-www/icons/text.png
-www/icons/transfer.png
-www/icons/unknown.png
-www/icons/up.png
-www/icons/uu.png
-www/icons/uuencoded.png
-www/icons/world1.png
-www/icons/world2.png
-@exec mkdir -p %D/www/proxy
-@exec [ -e %D/www/cgi-bin/ ] || ln -s %D/www/cgi-bin-dist %D/www/cgi-bin
-@exec [ -e %D/www/data/ ] || ln -s %D/www/data-dist %D/www/data
-@unexec if [ -L %D/www/cgi-bin ]; then if [ `readlink %D/www/cgi-bin` = %D/www/cgi-bin-dist ]; then rm -f %D/www/cgi-bin; fi; fi
-@unexec if [ -L %D/www/data ]; then if [ `readlink %D/www/data` = %D/www/data-dist ]; then rm -f %D/www/data; fi; fi
-@exec cd %D/etc/apache/ssl.crt && make >/dev/null 2>&1
-@unexec for i in %D/etc/apache/ssl.crt/[0-9a-fA-F]*.[0-9]*; do if [ -L $i ]; then rm -f $i; fi; done
-@dirrm etc/apache/ssl.crt
-@dirrm etc/apache/ssl.crl
-@dirrm etc/apache/ssl.csr
-@dirrm etc/apache/ssl.prm
-@dirrm etc/apache/ssl.key
-@dirrm etc/apache
-@dirrm include/apache/xml
-@dirrm include/apache
-@dirrm libexec/apache
-@dirrm %%DOCSDIR%%/vhosts
-@dirrm %%DOCSDIR%%/mod/mod_ssl
-@dirrm %%DOCSDIR%%/mod
-@dirrm %%DOCSDIR%%/misc
-@dirrm %%DOCSDIR%%/images
-@dirrm %%DOCSDIR%%/howto
-@dirrm %%DOCSDIR%%/programs
-@dirrm %%DOCSDIR%%
-@dirrmtry www/data-dist
-@dirrmtry www/cgi-bin-dist
-@dirrm www/icons/small
-@dirrm www/icons
-@dirrm www/proxy