diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2018-04-16 10:44:31 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2018-04-16 10:44:31 +0000 |
| commit | 6b504a6d6f2b8a2d4acfa68ad7953f666abf5efa (patch) | |
| tree | 814be0bf41c1870753bd1fd9a23097ef1f840651 | |
| parent | Update to latest commit. (diff) | |
www/mod_antiloris
www/mod_auth_imap2
www/mod_authn_sasl
www/mod_bw
www/mod_cband
www/mod_clamav
www/mod_extract_forwarded
www/mod_hosts_access
www/mod_log_config-st
www/mod_log_mysql
www/mod_log_sql2-dtc
www/mod_macro22
www/mod_musicindex
www/mod_ntlm2
www/mod_proxy_html
www/mod_remoteip
www/mod_spdy
www/mod_uid
www/mod_vhost_ldap
www/mod_whatkilledus
www/mod_xml2enc
2017-07-01 www/apache22: Upstream propose EoL of apache 2.2.x during the next 12 months
160 files changed, 22 insertions, 7308 deletions
@@ -10150,3 +10150,25 @@ devel/qjson-qt5|devel/qjson@qt5|2018-04-14|Moved to a flavoured version sysutils/polkit-qt5|sysutils/polkit-qt@qt5|2018-04-14|Moved to flavoured version multimedia/gstreamer1-qt4|multimedia/gstreamer1-qt@qt4|2018-04-14|Moved to a flavoured version multimedia/gstreamer1-qt5|multimedia/gstreamer1-qt@qt5|2018-04-14|Moved to a flavoured version +www/mod_antiloris||2018-04-16|Removed +www/mod_auth_imap2||2018-04-16|Removed +www/mod_authn_sasl||2018-04-16|Removed +www/mod_bw||2018-04-16|Removed +www/mod_cband||2018-04-16|Removed +www/mod_clamav||2018-04-16|Removed +www/mod_extract_forwarded||2018-04-16|Removed +www/mod_hosts_access||2018-04-16|Removed +www/mod_log_config-st||2018-04-16|Removed +www/mod_log_mysql||2018-04-16|Removed +www/mod_log_sql2-dtc||2018-04-16|Removed +www/mod_macro22||2018-04-16|Removed +www/mod_musicindex||2018-04-16|Removed +www/mod_ntlm2||2018-04-16|Removed +www/mod_proxy_html||2018-04-16|Removed +www/mod_remoteip||2018-04-16|Removed +www/mod_spdy||2018-04-16|Removed +www/mod_uid||2018-04-16|Removed +www/mod_vhost_ldap||2018-04-16|Removed +www/mod_whatkilledus||2018-04-16|Removed +www/mod_xml2enc||2018-04-16|Removed +www/apache22||2018-04-16|Has expired: Upstream propose EoL of apache 2.2.x during the next 12 months diff --git a/www/Makefile b/www/Makefile index d2581b2033b8..fba48f1f9378 100644 --- a/www/Makefile +++ b/www/Makefile @@ -26,7 +26,6 @@ SUBDIR += anyterm SUBDIR += apache-forrest SUBDIR += apache-mode.el - SUBDIR += apache22 SUBDIR += apache24 SUBDIR += apercu SUBDIR += aria2 @@ -409,13 +408,11 @@ SUBDIR += mknmz-wwwoffle SUBDIR += mnogosearch SUBDIR += mod_amazon_proxy - SUBDIR += mod_antiloris SUBDIR += mod_asn SUBDIR += mod_auth_cas SUBDIR += mod_auth_cookie_mysql2 SUBDIR += mod_auth_external2 SUBDIR += mod_auth_gssapi - SUBDIR += mod_auth_imap2 SUBDIR += mod_auth_kerb2 SUBDIR += mod_auth_mysql2 SUBDIR += mod_auth_mysql_another @@ -426,15 +423,11 @@ SUBDIR += mod_auth_pubtkt SUBDIR += mod_auth_tkt SUBDIR += mod_auth_xradius - SUBDIR += mod_authn_sasl SUBDIR += mod_authnz_crowd SUBDIR += mod_authnz_external24 SUBDIR += mod_backtrace - SUBDIR += mod_bw - SUBDIR += mod_cband SUBDIR += mod_cfg_ldap SUBDIR += mod_chroot - SUBDIR += mod_clamav SUBDIR += mod_cloudflare SUBDIR += mod_cvs2 SUBDIR += mod_dav_svn @@ -442,7 +435,6 @@ SUBDIR += mod_domaintree SUBDIR += mod_encoding SUBDIR += mod_evasive - SUBDIR += mod_extract_forwarded SUBDIR += mod_fastcgi SUBDIR += mod_fcgid SUBDIR += mod_fileiri @@ -451,24 +443,17 @@ SUBDIR += mod_gnutls SUBDIR += mod_gzip2 SUBDIR += mod_h264_streaming - SUBDIR += mod_hosts_access SUBDIR += mod_http2-devel SUBDIR += mod_jk SUBDIR += mod_layout22 SUBDIR += mod_limitipconn2 SUBDIR += mod_line_edit - SUBDIR += mod_log_config-st - SUBDIR += mod_log_mysql SUBDIR += mod_log_sql2 - SUBDIR += mod_log_sql2-dtc - SUBDIR += mod_macro22 SUBDIR += mod_md-devel SUBDIR += mod_memcache SUBDIR += mod_memcache_block SUBDIR += mod_mono SUBDIR += mod_mpm_itk - SUBDIR += mod_musicindex - SUBDIR += mod_ntlm2 SUBDIR += mod_pagespeed SUBDIR += mod_perl2 SUBDIR += mod_php56 @@ -476,14 +461,12 @@ SUBDIR += mod_php71 SUBDIR += mod_php72 SUBDIR += mod_proctitle - SUBDIR += mod_proxy_html SUBDIR += mod_proxy_uwsgi SUBDIR += mod_proxy_xml SUBDIR += mod_python33 SUBDIR += mod_python35 SUBDIR += mod_qos SUBDIR += mod_realdoc - SUBDIR += mod_remoteip SUBDIR += mod_reproxy SUBDIR += mod_rivet SUBDIR += mod_rpaf2 @@ -491,18 +474,13 @@ SUBDIR += mod_security SUBDIR += mod_security3 SUBDIR += mod_setenvifplus - SUBDIR += mod_spdy SUBDIR += mod_tidy SUBDIR += mod_tsa - SUBDIR += mod_uid SUBDIR += mod_umask - SUBDIR += mod_vhost_ldap SUBDIR += mod_vhs SUBDIR += mod_webauth SUBDIR += mod_webkit - SUBDIR += mod_whatkilledus SUBDIR += mod_wsgi4 - SUBDIR += mod_xml2enc SUBDIR += mod_xmlns SUBDIR += mod_xsendfile SUBDIR += mohawk diff --git a/www/apache22/Makefile b/www/apache22/Makefile deleted file mode 100644 index bdabe8aee688..000000000000 --- a/www/apache22/Makefile +++ /dev/null @@ -1,221 +0,0 @@ -# $FreeBSD$ - -PORTNAME= apache22 -PORTVERSION= 2.2.34 -PORTREVISION?= 4 -CATEGORIES= www ipv6 -MASTER_SITES= APACHE_HTTPD -DISTNAME= httpd-${PORTVERSION} -DIST_SUBDIR= apache22 - -MAINTAINER?= apache@FreeBSD.org -COMMENT?= Version 2.2.x of Apache web server with ${WITH_MPM} MPM - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE - -BROKEN_SSL= openssl-devel libressl libressl-devel -BROKEN_SSL_REASON_openssl-devel= configure: Error... SSL/TLS libraries were missing or unusable -BROKEN_SSL_REASON_libressl= error: no member named 'state' in 'struct ssl_st' -BROKEN_SSL_REASON_libressl-devel= ${BROKEN_SSL_REASON_libressl} - -LIB_DEPENDS= libexpat.so:textproc/expat2 \ - libapr-1.so:devel/apr1 \ - libpcre.so:devel/pcre \ - libgdbm.so:databases/gdbm - -CONFLICTS_INSTALL= caudium14-1.* \ - apache-*-2.2.* apache22-*-2.2.* \ - apache-*-2.4.* apache24-*-2.4.* - -DEPRECATED= Upstream propose EoL of apache 2.2.x during the next 12 months -EXPIRATION_DATE= 2017-07-01 - -USES= apache:server,2.2 autoreconf bdb cpe iconv libtool perl5 tar:bzip2 - -USE_PERL5= run -USE_RC_SUBR= apache22 htcacheclean -GNU_CONFIGURE= yes - -CPE_VENDOR= apache -CPE_PRODUCT= http_server - -PORTDOCS= * - -USERS= www -GROUPS= www - -# XXX: before running makepatch please run the command -# `$SED -e 's/PATCH_PATH_SEPARATOR=/PATCH_PATH_SEPARATOR?=/' Mk/bsd.port.mk -PATCH_PATH_SEPARATOR= __ - -# for slave ports -.if !defined(MASTERDIR) -APACHEDIR= ${.CURDIR} -.else -APACHEDIR= ${MASTERDIR} -.endif - -WITH_MPM?= prefork # or worker, event, itk, peruser -WITH_HTTP_PORT?= 80 -WITH_SSL_PORT?= 443 - -#.if !defined(WITH_DEBUG) -#EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c -#.endif - -.include "${APACHEDIR}/Makefile.options" - -AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap - -# http://httpd.apache.org/docs/2.2/bind.html -IPV4_MAPPED_CONFIGURE_ENABLE= v4-mapped - -LDAP_CONFIGURE_ON= --enable-ldap=shared -SSL_CFLAGS= -I${OPENSSLINC} -SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE} -SSL_LDFLAGS= -L${OPENSSLLIB} -SSL_USES= ssl -SSL_CONFIGURE_ENV= HAVE_SSL_SET_STATE=0 - -SUEXEC_RSRCLIMIT_EXTRA_PATCHES= ${FILESDIR}/extra-patch-suexec_rsrclimit -SUEXEC_USERDIR_EXTRA_PATCHES= ${FILESDIR}/extra-patch-suexec_userdir - -.include <bsd.port.options.mk> - -ETC_SUBDIRS= Includes envvars.d extra modules.d - -# PR: 182947 -.if ${WITH_MPM} != "peruser" -SUB_LIST+= RELOAD_CMD=graceful -.else -SUB_LIST+= RELOAD_CMD=hrestart -.endif - -APR_CONFIG?= ${LOCALBASE}/bin/apr-1-config -APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config - -# APU modules used by AUTHN_DBD DBD -APU_DBD_MYSQL?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_mysql.so -APU_DBD_PGSQL?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_pgsql.so -APU_DBD_SQLITE3?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_sqlite3.so -# APU module used by AUTHNZ_LDAP LDAP -APU_LDAP?= ${LOCALBASE}/lib/apr-util-1/apr_ldap.so -# APU module used by SESSION_CRYPTO -APU_CRYPTO_OPENSSL?= ${LOCALBASE}/lib/apr-util-1/apr_crypto_openssl.so -APU_CRYPTO_NSS?= ${LOCALBASE}/lib/apr-util-1/apr_crypto_nss.so - -CONFIGURE_ARGS+=--prefix=${PREFIX} \ - --enable-layout=FreeBSD \ - --with-port=${WITH_HTTP_PORT} \ - --with-sslport=${WITH_SSL_PORT} \ - --with-expat=${LOCALBASE} \ - --with-iconv=${ICONV_PREFIX} \ - --enable-http \ - --with-pcre=${LOCALBASE} \ - --with-apr=${APR_CONFIG} \ - --with-apr-util=${APU_CONFIG} - -CONFIGURE_ENV= CONFIG_SHELL="${SH}" \ - LOCALBASE="${LOCALBASE}" - -MAKE_ENV+= EXPR_COMPAT=yes \ - INSTALL_MAN="${INSTALL_MAN}" \ - DATADIR=${DATADIR} - -#===================================================== -# CONFIGURE_ARGS will be handled in Makefile.modules, -# here we do only OPTIONS fixups - -.if ${PORT_OPTIONS:MSUEXEC_RSRCLIMIT} && !${PORT_OPTIONS:MSUEXEC} -IGNORE= suEXEC resource limit patch requires mod_suexec.\ - Please (re)run 'make config' and choose SUEXEC option also -.endif - -.if ${PORT_OPTIONS:MSUEXEC_USERDIR} && !${PORT_OPTIONS:MSUEXEC} -IGNORE= suEXEC UserDir patch requires mod_suexec.\ - Please (re)run 'make config' and choose SUEXEC option also -.endif - -.include <bsd.port.pre.mk> -.include "${APACHEDIR}/Makefile.modules" - -show-options: - @${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc - -pre-everything:: - @${CAT} ${FILESDIR}/HEADS_UP -.if !defined(BATCH) || !defined(PORT_BUILDING) - @/bin/sleep 5 -.endif - -post-extract: -# remove possible leftover .svn directories in the sources - @${FIND} ${WRKSRC} -type d -name .svn -print | ${XARGS} ${RM} -r -# limit grep results ... - ${FIND} ${WRKSRC} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' -o -name '*.vbs' -o -name '*.wsf' \) -delete -# make sure the configure script contains our patches, -# preserve the original script for comparsion - -${MV} ${WRKSRC}/configure ${WRKSRC}/configure.upstream - -# make stage-qa script happy, it complains on empty dirs even 'PORTDOCS=*' is set -# use RMDIR in case upstream ever place some files into this directories -.for d in xsl/util xsl lang - -${RMDIR} ${WRKSRC}/docs/manual/style/${d} -.endfor - -post-patch: - ${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' ${WRKSRC}/server/core.c - ${REINPLACE_CMD} -e 's|logs/error_log|/var/log/httpd-error.log|' \ - ${WRKSRC}/include/httpd.h - ${REINPLACE_CMD} -e 's|perlbin=.*|perlbin=${PERL}|' \ - ${WRKSRC}/configure.in - ${RM} ${WRKSRC}/docs/docroot/*.bak - ${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual -# we use devel/apr and devel/pcre - ${RM} -r ${WRKSRC}/srclib - ${REINPLACE_CMD} -e 's/srclib//' ${WRKSRC}/Makefile.in - -pre-configure:: - @${ECHO_MSG} "" - @${ECHO_MSG} " You can check your modules configuration by using make show-modules" - @${ECHO_MSG} "" - -pre-configure-SSL-on:: -# Fix build with OpenSSL from ports -.if ${OPSYS} == FreeBSD -. if (defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "") || ${MAKE_ENV:M*${LOCALBASE}/openssl*} - @${ECHO_MSG} "===> apply fix for FreeBSD-${OSREL} (${OSVERSION}) for usage with ${OPENSSL_INSTALLED}" - @${ECHO_MSG} "" - ${REINPLACE_CMD} -e "s|(ALL_CFLAGS)|(ALL_CFLAGS) -L${OPENSSLLIB}|" ${WRKSRC}/build/rules.mk.in -. endif -.endif - -post-configure: - @FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\ - ${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$${FTPUSERS}," ${WRKSRC}/docs/conf/extra/httpd-userdir.conf - ${REINPLACE_CMD} -e "s,%%WWWOWN%%,${WWWOWN}," -e "s,%%WWWGRP%%,${WWWGRP}," ${WRKSRC}/docs/conf/httpd.conf - ${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/support/envvars-std - -post-install: - @${MKDIR} ${ETC_SUBDIRS:S|^|${STAGEDIR}${ETCDIR}/|} - ${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${STAGEDIR}${ETCDIR}/Includes/ -# place for 3rd party module configuration - ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}${ETCDIR}/modules.d/ -# strip returns an error for non binary files, but we have a big mix - -${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* 2>/dev/null - -${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/apache22/mod_*.so - -post-install-LOG_FORENSIC-on: - ${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin - -# maintainer only, check for new modules -modlist: extract - @${AWK} '/: checking whether to enable mod_/ \ - {printf "%%%%%s%%%%libexec/apache22/%s.so\n", \ - toupper($$8), $$8}' ${WRKSRC}/configure \ - | ${TR} -d '"' \ - | ${SORT} -u \ - | ${GREP} -E -v '^%%MOD_(ECHO|EXAMPLE|HTTP|IDENT|ISAPI|SO)%%' - -.include <bsd.port.post.mk> diff --git a/www/apache22/Makefile.doc b/www/apache22/Makefile.doc deleted file mode 100644 index 7b13ab0f5b6a..000000000000 --- a/www/apache22/Makefile.doc +++ /dev/null @@ -1,67 +0,0 @@ -# $FreeBSD$ -# -# Author: Clement Laforet <clement@FreeBSD.org> -# -## -## By default, modules are compiled as dynamically loadable modules (DSO). -## -## Modules knobs philosophy: -## Note: Use this only for special builds, modules should be selected by -## #> make config -## -## Apache-related -## WITH_MPM: prefork (default) -## worker -## event -## itk -## WITH_HTTP_PORT: default: 80 -## -## WITH_STATIC_SUPPORT: Build statically linked support binaries -## WITH_STATIC_APACHE: Build a static version of httpd (implies -## WITH_STATIC_MODULES) -## WITH_ALL_STATIC_MODULES: All modules will be statically linked. -## WITH_STATIC_MODULES (*): List of modules to build modules statics -## (useful for slave ports) -## (They must be already enabled (i.e. -## WITH_MODULES or with default configuration -## use 'make show-modules', to check if they are -## enabled) -## WITH_SUEXEC: Enable suEXEC support -## SUEXEC_DOCROOT: suEXEC root directory -## SUEXEC_USERDIR: User subdirectory (default public_html) -## SUEXEC_SAFEPATH: Set the safepath -## SUEXEC_LOGFILE: Set log file for suEXEC (default: /var/log/httpd-suexec.log) -## SUEXEC_UIDMIN: Minimal allowed UID (default 1000) -## SUEXEC_GIDMIN: Minimal allowed GID (default 1000) -## SUEXEC_CALLER: User allowed to call suEXEC (default -## ${WWWOWN} (www)) -## SUEXEC_UMASK: Defines umask for suEXEC'd process(default: -## unset) -## WITH_DEBUG: Build a debug version of Apache (set CFLAGS -## to "-O0 -g -ggdb3" or ${DEBUG_FLAGS} and -## defines WITH_EXCEPTION_HOOK too) -## WITH_EXCEPTION_HOOK: Enable fatal exception hook -## -## Optional patches without option: -## WITH_ITK_PERDIR_REGEX Add the per-directory setting AssignUserFromPath for mpm-itk -## as described on http://www.pvv.ntnu.no/~knuta/mpm-itk/ -## WITH_ITK_LIMITS Add rlimits based on login class for mpm-itk -## -## Available make targets: -## config: open the configure dialog -## show config: prints configured options -## show-options: prints this message -## show-modules: prints list of available modules -## -## Examples (*): -## make WITH_STATIC_MODULES="SSL REWRITE INCLUDE" -## Note: If you define your custom options in /etc/make.conf, don't forget -## to do not use quotes. -## -## Note about OPTION IPV4_MAPPED -## For security reasons this OPTION is disabled. -## You can find more information about IP binding and configuration -## on the Apache website: http://httpd.apache.org/docs/2.2/bind.html -## To find out which binding was used to build httpd use the command -## $> httpd -V -## diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules deleted file mode 100644 index c82489dfdc36..000000000000 --- a/www/apache22/Makefile.modules +++ /dev/null @@ -1,97 +0,0 @@ -# $FreeBSD$ -# -# Note by Clement Laforet: (to generate PLIST_SUB entries for modules) -# gsed 's/^\(.*\)mod\(.*\)\.so/%%\MOD\U\2%%\L\1mod\2\.so/' pkg-plist > tmp -# mv tmp pkg-plist -# - -# ============================================= -# Maintainer note for OPTION handling: -# To set additional option use -# PORT_OPTIONS+= -# To unset an OPTION, even the OPTION is set in OPTIONS_FILE use -# WITHOUT_MODULES+= -# Using OPTIONS_EXCLUDE and OPTIONS_OVERRIDE do not work as expected -# if the OPTION is enabled by the user, therefore we calculate -# them in bsd.apache.mk with help of WITHOUT_MODULES -# The other methode is to set IGNORE's and force the user to adjust OPTIONS - -.if defined(_PREMKINCLUDED) - -# check if APR-util module exists -.if exists(${APU_CONFIG}) -. if ${PORT_OPTIONS:MLDAP} || ${PORT_OPTIONS:MAUTHNZ_LDAP} -. if !exists(${APU_LDAP}) -IGNORE= LDAP and AUTHNZ_LDAP requires APR-util to have LDAP support built in.\ - Please rebuild APR with LDAP support -. endif -. endif - -. if ${PORT_OPTIONS:MDBD} || ${PORT_OPTIONS:MAUTHN_DBD} -. if !exists(${APU_DBD_MYSQL}) && !exists(${APU_DBD_PGSQL}) && !exists(${APU_DBD_SQLITE3}) -IGNORE= AUTHN_DBD and DBD requires APR-util to have DBD support build in.\ - Please rebuild APR at last with one DBD backend (MYSQL, PGSQL or SQLITE) -. endif -. endif -.endif # exists APU_CONFIG - -# ============================================= -# MPM's: prefork worker event itk peruser -.if ${WITH_MPM} == "prefork" -PLIST_SUB+= WORKER="@comment " EVENT="@comment " -.elif ${WITH_MPM} == "worker" -PLIST_SUB+= WORKER="" EVENT="@comment " -.elif ${WITH_MPM} == "event" -PLIST_SUB+= WORKER="@comment " EVENT="" -.elif ${WITH_MPM} == "peruser" -PLIST_SUB+= WORKER="@comment " EVENT="@comment " -.elif ${WITH_MPM} == "itk" -PLIST_SUB+= WORKER="@comment " EVENT="@comment " -.else -IGNORE= Unknown MPM: ${WITH_MPM} -.endif # MPM prefork - -.if ${WITH_MPM} != "prefork" -PKGNAMESUFFIX= -${WITH_MPM}-mpm -.endif - -.if ${WITH_MPM} == "worker" || ${WITH_MPM} == "event" -PORT_OPTIONS+= CGID -. if ${PORT_OPTIONS:MCGI} -IGNORE= When using a multi-threaded MPM, the module CGID should be used in place CGI. \ - Please de-select CGI and select CGID instead. \ - See http://httpd.apache.org/docs/2.2/mod/mod_cgi.html -. endif -.endif -# ============================================= - -# The next three params are not converted to an option, -# they should be used only for special builds. -.if defined(WITH_STATIC_SUPPORT) -CONFIGURE_ARGS+= --enable-static-support -.endif - -# debug overrides CFLAGS -.if defined(WITH_DEBUG) -DEBUG_FLAGS?= -O0 -g -ggdb3 -CFLAGS= ${DEBUG_FLAGS} -CONFIGURE_ARGS+= --enable-maintainer-mode -WITH_EXCEPTION_HOOK= yes -.endif - -.if defined(WITH_EXCEPTION_HOOK) -CONFIGURE_ARGS+= --enable-exception-hook -.endif - -.if ( ${PORT_OPTIONS:MAUTH_BASIC} || ${PORT_OPTIONS:MAUTH_DIGEST} ) && \ - empty(PORT_OPTIONS:MAUTHN*) -IGNORE= AUTH_BASIC and AUTH_DIGEST need at least one AUTHN provider -.endif - -.if ${PORT_OPTIONS:MAUTH_BASIC} && empty(PORT_OPTIONS:MAUTHZ*) -IGNORE= AUTH_BASIC need at least one AUTHZ provider -.endif - -CONFIGURE_ARGS+= --with-mpm=${WITH_MPM} - -.endif # _PREMKINCLUDED diff --git a/www/apache22/Makefile.options b/www/apache22/Makefile.options deleted file mode 100644 index b3676f79997a..000000000000 --- a/www/apache22/Makefile.options +++ /dev/null @@ -1,256 +0,0 @@ -# $FreeBSD$ - -# XXX The follwing params are used for special buils, -# they will be not converted to an OPTION. -# WITH_MPM # prefork worker event itk peruser -# WITH_STATIC_SUPPORT # used in make.conf -# WITH_DEBUG # used in make.conf or as build param -# WITH_EXCEPTION_HOOK # used in make.conf or as build param -# WITH_ITK_PERDIR_REGEX # => itk-mpm extra patch -# WITH_ITK_LIMITS # => itk-mpm extra patch -# - -AUTH_MODULES= AUTH_BASIC AUTH_DIGEST -AUTHN_MODULES= AUTHN_FILE AUTHN_DBD AUTHN_DBM AUTHN_ANON AUTHN_DEFAULT \ - AUTHN_ALIAS -AUTHZ_MODULES= AUTHZ_HOST AUTHZ_GROUPFILE AUTHZ_USER AUTHZ_DBM \ - AUTHZ_OWNER AUTHZ_DEFAULT -CACHE_MODULES= CACHE DISK_CACHE FILE_CACHE MEM_CACHE -DAV_MODULES= DAV DAV_FS -EXPERIMENTAL_MODULES= BUCKETEER CASE_FILTER CASE_FILTER_IN EXT_FILTER \ - LOG_FORENSIC OPTIONAL_HOOK_EXPORT OPTIONAL_HOOK_IMPORT \ - OPTIONAL_FN_IMPORT OPTIONAL_FN_EXPORT -LDAP_MODULES= LDAP AUTHNZ_LDAP -MISC_MODULES= ACTIONS ALIAS ASIS AUTOINDEX CERN_META \ - CGI CHARSET_LITE DBD DEFLATE DIR DUMPIO ENV EXPIRES \ - HEADERS IMAGEMAP INCLUDE INFO LOG_CONFIG LOGIO MIME \ - MIME_MAGIC NEGOTIATION REWRITE SETENVIF SPELING STATUS SUBSTITUTE \ - UNIQUE_ID USERDIR USERTRACK VHOST_ALIAS FILTER VERSION REQTIMEOUT -MISC_OFF_MODULES= DAV_LOCK -PROXY_MODULES= PROXY PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_FTP PROXY_HTTP \ - PROXY_SCGI -SSL_MODULES= SSL -SUEXEC_MODULES= SUEXEC -THREADS_MODULES= CGID - -DEFAULT_MODULES_CATEGORIES= \ - AUTH AUTHN AUTHZ DAV CACHE MISC - -ALL_MODULES_CATEGORIES= AUTH AUTHN AUTHZ CACHE DAV EXPERIMENTAL LDAP \ - MISC MISC_OFF PROXY SSL SUEXEC THREADS - -NO_OPTIONS_SORT= yes - -OPTIONS_DEFINE= \ - AUTH_BASIC \ - AUTH_DIGEST \ - AUTHN_ALIAS \ - AUTHN_ANON \ - AUTHN_DBD \ - AUTHN_DBM \ - AUTHN_DEFAULT \ - AUTHN_FILE \ - AUTHZ_DBM \ - AUTHZ_DEFAULT \ - AUTHZ_GROUPFILE \ - AUTHZ_HOST \ - AUTHZ_OWNER \ - AUTHZ_USER \ - AUTHNZ_LDAP \ - LDAP \ - DBD \ - CACHE \ - DISK_CACHE \ - FILE_CACHE \ - MEM_CACHE \ - DAV \ - DAV_FS \ - DAV_LOCK \ - ACTIONS \ - ALIAS \ - ASIS \ - AUTOINDEX \ - CERN_META \ - CGI \ - CGID \ - CHARSET_LITE \ - DEFLATE \ - DIR \ - DUMPIO \ - ENV \ - EXPIRES \ - HEADERS \ - IMAGEMAP \ - INCLUDE \ - INFO \ - LOG_CONFIG \ - LOGIO \ - MIME \ - MIME_MAGIC \ - NEGOTIATION \ - REWRITE \ - SETENVIF \ - SPELING \ - STATUS \ - UNIQUE_ID \ - USERDIR \ - USERTRACK \ - VHOST_ALIAS \ - FILTER \ - SUBSTITUTE \ - VERSION \ - SSL \ - SUEXEC \ - SUEXEC_RSRCLIMIT \ - SUEXEC_USERDIR \ - REQTIMEOUT \ - PROXY \ - IPV4_MAPPED \ - BUCKETEER \ - CASE_FILTER \ - CASE_FILTER_IN \ - EXT_FILTER \ - LOG_FORENSIC \ - OPTIONAL_HOOK_EXPORT \ - OPTIONAL_HOOK_IMPORT \ - OPTIONAL_FN_IMPORT \ - OPTIONAL_FN_EXPORT - -OPTIONS_MULTI=PROXY -OPTIONS_MULTI_PROXY=PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_FTP PROXY_HTTP PROXY_SCGI - -# sort list alphanumeric -OPTIONS_DEFAULT= \ - ACTIONS \ - ALIAS \ - ASIS \ - AUTHN_ALIAS \ - AUTHN_ANON \ - AUTHN_DBM \ - AUTHN_DEFAULT \ - AUTHN_FILE \ - AUTHZ_DBM \ - AUTHZ_DEFAULT \ - AUTHZ_GROUPFILE \ - AUTHZ_HOST \ - AUTHZ_OWNER \ - AUTHZ_USER \ - AUTH_BASIC \ - AUTH_DIGEST \ - AUTOINDEX \ - CACHE \ - CERN_META \ - CGI \ - CHARSET_LITE \ - DAV \ - DAV_FS \ - DEFLATE \ - DIR \ - DISK_CACHE \ - DUMPIO \ - ENV \ - EXPIRES \ - FILE_CACHE \ - FILTER \ - HEADERS \ - IMAGEMAP \ - INCLUDE \ - INFO \ - LOGIO \ - LOG_CONFIG \ - MIME \ - MIME_MAGIC \ - NEGOTIATION \ - REQTIMEOUT \ - REWRITE \ - SETENVIF \ - SPELING \ - SSL \ - STATUS \ - UNIQUE_ID \ - USERDIR \ - USERTRACK \ - VERSION \ - VHOST_ALIAS - -# sort list alphanumeric -ACTIONS_DESC= mod_actions -ALIAS_DESC= mod_alias -ASIS_DESC= mod_asis -AUTHNZ_LDAP_DESC= mod_authnz_ldap -AUTHN_ALIAS_DESC= mod_authn_alias -AUTHN_ANON_DESC= mod_authn_anon -AUTHN_DBD_DESC= mod_authn_dbd -AUTHN_DBM_DESC= mod_authn_dbm -AUTHN_DEFAULT_DESC= mod_authn_default -AUTHN_FILE_DESC= mod_authn_file -AUTHZ_DBM_DESC= mod_authz_dbm -AUTHZ_DEFAULT_DESC= mod_authz_default -AUTHZ_GROUPFILE_DESC= mod_authz_groupfile -AUTHZ_HOST_DESC= mod_authz_host -AUTHZ_OWNER_DESC= mod_authz_owner -AUTHZ_USER_DESC= mod_authz_user -AUTH_BASIC_DESC= mod_auth_basic -AUTH_DIGEST_DESC= mod_auth_digest -AUTOINDEX_DESC= mod_autoindex -BUCKETEER_DESC= mod_bucketeer -CACHE_DESC= mod_cache -CASE_FILTER_DESC= mod_case_filter -CASE_FILTER_IN_DESC= mod_case_filter_in -CERN_META_DESC= mod_cern_meta -CGI_DESC= mod_cgi -CGID_DESC= mod_cgid -CHARSET_LITE_DESC= mod_charset_lite -DAV_DESC= mod_dav -DAV_FS_DESC= mod_dav_fs -DAV_LOCK_DESC= mod_dav_lock -DBD_DESC= Manages SQL database connections -DEFLATE_DESC= mod_deflate -DIR_DESC= mod_dir -DISK_CACHE_DESC= mod_disk_cache -DUMPIO_DESC= mod_dumpio -ENV_DESC= mod_env -EXPIRES_DESC= mod_expires -EXT_FILTER_DESC= mod_ext_filter -FILE_CACHE_DESC= mod_file_cache -FILTER_DESC= mod_filter -HEADERS_DESC= mod_headers -IMAGEMAP_DESC= mod_imagemap -INCLUDE_DESC= mod_include -INFO_DESC= mod_info -IPV4_MAPPED_DESC= Allow IPv6 socket to handle IPv4 -LDAP_DESC= connection pooling, result caching -LOGIO_DESC= mod_logio -LOG_CONFIG_DESC= mod_log_config -LOG_FORENSIC_DESC= mod_log_forensic -MEM_CACHE_DESC= mod_mem_cache -MIME_DESC= mod_mime -MIME_MAGIC_DESC= mod_mime_magic -NEGOTIATION_DESC= mod_negotiation -OPTIONAL_FN_EXPORT_DESC= mod_optional_fn_export -OPTIONAL_FN_IMPORT_DESC= mod_optional_fn_import -OPTIONAL_HOOK_EXPORT_DESC= mod_optional_hook_export -OPTIONAL_HOOK_IMPORT_DESC= mod_optional_hook_import -PROXY_DESC= mod_proxy -PROXY_AJP_DESC= mod_proxy_ajp -PROXY_BALANCER_DESC= mod_proxy_balancer -PROXY_CONNECT_DESC= mod_proxy_connect -PROXY_FTP_DESC= mod_proxy_ftp -PROXY_HTTP_DESC= mod_proxy_http -PROXY_SCGI_DESC= mod_proxy_scgi -REQTIMEOUT_DESC= mod_reqtimeout -REWRITE_DESC= mod_rewrite -SETENVIF_DESC= mod_setenvif -SPELING_DESC= mod_speling -SSL_DESC= mod_ssl -STATUS_DESC= mod_status -SUBSTITUTE_DESC= mod_substitute -SUEXEC_DESC= mod_suexec -SUEXEC_RSRCLIMIT_DESC= suEXEC rlimits based on login class -SUEXEC_USERDIR_DESC= suEXEC UserDir support -UNIQUE_ID_DESC= mod_unique_id -USERDIR_DESC= mod_userdir -USERTRACK_DESC= mod_usertrack -VERSION_DESC= mod_version -VHOST_ALIAS_DESC= mod_vhost_alias - diff --git a/www/apache22/distinfo b/www/apache22/distinfo deleted file mode 100644 index 7c5702e27b6d..000000000000 --- a/www/apache22/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1499801614 -SHA256 (apache22/httpd-2.2.34.tar.bz2) = e53183d5dfac5740d768b4c9bea193b1099f4b06b57e5f28d7caaf9ea7498160 -SIZE (apache22/httpd-2.2.34.tar.bz2) = 5779739 diff --git a/www/apache22/files/HEADS_UP b/www/apache22/files/HEADS_UP deleted file mode 100644 index d52744a65e5c..000000000000 --- a/www/apache22/files/HEADS_UP +++ /dev/null @@ -1,13 +0,0 @@ - -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - H E A D S - U P -2014-07-13: - The default version was changed from www/apache22 to www/apache24, - pre-build apache modules will also reflect this! - - In case ports are build by yourself and apache22 is required - use the following command to keep apache22 as default - - echo "DEFAULT_VERSIONS+=apache=2.2" >> /etc/make.conf - -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/www/apache22/files/README_modules.d b/www/apache22/files/README_modules.d deleted file mode 100644 index 2d50ce539aeb..000000000000 --- a/www/apache22/files/README_modules.d +++ /dev/null @@ -1,14 +0,0 @@ -# =================================================== -# Directory for third party module config files. -# -# Modules can be disabled by adding a '#' in front -# of the "LoadModule" line e.g. "#LoadModule" -# -# Files are automatically included if the name -# begins with a three digit number followed by '_' -# and ending in '.conf' e.g. '080_mod_php.conf' -# -# Maintainers can also include instructions how to -# use the module (instead pkg-message). -# - diff --git a/www/apache22/files/apache22.in b/www/apache22/files/apache22.in deleted file mode 100644 index 6c4630bdb53b..000000000000 --- a/www/apache22/files/apache22.in +++ /dev/null @@ -1,204 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: apache22 -# REQUIRE: LOGIN cleanvar sshd -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable apache22: -# apache22_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable apache22 -# apache22_profiles (str): Set to "" by default. -# Define your profiles here. -# apache22limits_enable (bool):Set to "NO" by default. -# Set it to yes to run `limits $limits_args` -# just before apache starts. -# apache22_flags (str): Set to "" by default. -# Extra flags passed to start command. -# apache22limits_args (str): Default to "-e -C daemon" -# Arguments of pre-start limits run. -# apache22_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. -# apache22_fib (str): Set an altered default network view for apache - -. /etc/rc.subr - -name="apache22" -rcvar=apache22_enable - -start_precmd="apache22_prestart" -restart_precmd="apache22_checkconfig" -reload_precmd="apache22_checkconfig" -reload_cmd="apache22_%%RELOAD_CMD%%" -graceful_cmd="apache22_graceful" -gracefulstop_cmd="apache22_gracefulstop" -configtest_cmd="apache22_checkconfig" -command="%%PREFIX%%/sbin/httpd" -_pidprefix="/var/run/httpd" -pidfile="${_pidprefix}.pid" -required_files=%%PREFIX%%/etc/apache22/httpd.conf -envvars="%%PREFIX%%/sbin/envvars" - -[ -z "$apache22_enable" ] && apache22_enable="NO" -[ -z "$apache22limits_enable" ] && apache22limits_enable="NO" -[ -z "$apache22limits_args" ] && apache22limits_args="-e -C daemon" -[ -z "$apache22_http_accept_enable" ] && apache22_http_accept_enable="NO" - -apache22_accf() { - - if checkyesno apache22_http_accept_enable; then - /sbin/kldstat -qm accf_http || /sbin/kldload accf_http || return ${?} - /sbin/kldstat -qm accf_data || /sbin/kldload accf_data || return ${?} - else - apache22_flags="${apache22_flags} -DNOHTTPACCEPT" - fi -} - -load_rc_config $name - -if [ -n "$2" ]; then - profile="$2" - if [ "x${apache22_profiles}" != "x" ]; then - pidfile="${_pidprefix}.${profile}.pid" - eval apache22_configfile="\${apache22_${profile}_configfile:-}" - if [ "x${apache22_configfile}" = "x" ]; then - echo "You must define a configuration file (apache22_${profile}_configfile)" - exit 1 - fi - required_files="${apache22_configfile}" - eval apache22_enable="\${apache22_${profile}_enable:-${apache22_enable}}" - eval apache22_flags="\${apache22_${profile}_flags:-${apache22_flags}}" - eval apache22_http_accept_enable="\${apache22_${profile}_http_accept_enable:-${apache22_http_accept_enable}}" - eval apache22limits_enable="\${apache22limits_${profile}_enable:-${apache22limits_enable}}" - eval apache22limits_args="\${apache22limits_${profile}_args:-${apache22limits_args}}" - eval apache22_fib="\${apache22_${profile}_fib:-${apache22_fib}}" - eval command="\${apache22_${profile}_command:-${command}}" - eval pidfile="\${apache22_${profile}_pidfile:-${pidfile}}" - eval apache22_envvars="\${apache22_${profile}_envvars:-${envvars}}" - apache22_flags="-f ${apache22_configfile} -c \"PidFile ${pidfile}\" ${apache22_flags}" - else - echo "$0: extra argument ignored" - fi -else - eval apache22_envvars=${envvars} - if [ "x${apache22_profiles}" != "x" -a "x$1" != "x" ]; then - for profile in ${apache22_profiles}; do - eval _enable="\${apache22_${profile}_enable}" - case "x${_enable:-${apache22_enable}}" in - x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee]) - continue - ;; - x[Yy][Ee][Ss]) - ;; - *) - if test -z "$_enable"; then - _var=apache22_enable - else - _var=apache22_"${profile}"_enable - fi - echo "Bad value" \ - "'${_enable:-${apache22_enable}}'" \ - "for ${_var}. " \ - "Profile ${profile} skipped." - continue - ;; - esac - echo "===> apache22 profile: ${profile}" - %%PREFIX%%/etc/rc.d/apache22 $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 \ - apache22_accf -fi - -apache22_requirepidfile() -{ - apache22_checkconfig - - if [ ! "0`check_pidfile ${pidfile} ${command}`" -gt 1 ]; then - echo "${name} not running? (check $pidfile)." - exit 1 - fi -} - -apache22_checkconfig() -{ - if test -f ${apache22_envvars} - then - . ${apache22_envvars} - fi - - echo "Performing sanity check on apache22 configuration:" - eval ${command} ${apache22_flags} -t -} - -apache22_graceful() { - apache22_requirepidfile - - echo "Performing a graceful restart" - eval ${command} ${apache22_flags} -k graceful -} - -apache22_hrestart() { - apache22_requirepidfile - - echo "Performing a graceful restart" - eval ${command} ${apache22_flags} -k restart -} - -apache22_gracefulstop() { - apache22_requirepidfile - - echo "Performing a graceful stop" - eval ${command} ${apache22_flags} -k graceful-stop -} - -apache22_precmd() -{ - apache22_checkconfig - - if checkyesno apache22limits_enable - then - eval `/usr/bin/limits ${apache22limits_args}` 2>/dev/null - else - return 0 - fi - -} - -apache22_checkfib () { - if command -v check_namevarlist > /dev/null 2>&1; then - check_namevarlist fib && return 0 - fi - - $SYSCTL net.fibs >/dev/null 2>&1 || return 0 - - apache22_fib=${apache22_fib:-"NONE"} - if [ "x$apache22_fib" != "xNONE" ] - then - command="/usr/sbin/setfib -F ${apache22_fib} ${command}" - else - return 0 - fi -} - -apache22_prestart() { - apache22_checkfib - apache22_precmd -} - -extra_commands="reload graceful gracefulstop configtest" -run_rc_command "$1" diff --git a/www/apache22/files/extra-patch-server_buildmark.c b/www/apache22/files/extra-patch-server_buildmark.c deleted file mode 100644 index c5ad04131f18..000000000000 --- a/www/apache22/files/extra-patch-server_buildmark.c +++ /dev/null @@ -1,12 +0,0 @@ ---- server/buildmark.c.orig 2017-06-09 18:42:01 UTC -+++ server/buildmark.c -@@ -17,6 +17,9 @@ - #include "ap_config.h" - #include "httpd.h" - -+/* Allow Reproducible build, do not include build time information */ -+#undef __DATE__ -+ - #if defined(__DATE__) && defined(__TIME__) - static const char server_built[] = __DATE__ " " __TIME__; - #else diff --git a/www/apache22/files/extra-patch-suexec_rsrclimit b/www/apache22/files/extra-patch-suexec_rsrclimit deleted file mode 100644 index df41fe7f4962..000000000000 --- a/www/apache22/files/extra-patch-suexec_rsrclimit +++ /dev/null @@ -1,49 +0,0 @@ -# http://www.chrishardie.com/tech/apache/suexec_rsrclimit.html ---- support/suexec.c.orig Wed Jul 12 07:38:44 2006 -+++ support/suexec.c Wed Nov 15 23:58:04 2006 -@@ -37,6 +37,7 @@ - #include <sys/param.h> - #include <sys/stat.h> - #include <sys/types.h> -+#include <login_cap.h> - #include <string.h> - #include <time.h> - #if APR_HAVE_UNISTD_H -@@ -259,6 +260,7 @@ - char *cmd; /* command to be executed */ - char cwd[AP_MAXPATH]; /* current working directory */ - char dwd[AP_MAXPATH]; /* docroot working directory */ -+ login_cap_t *lc; /* user resource limits */ - struct passwd *pw; /* password entry holder */ - struct group *gr; /* group entry holder */ - struct stat dir_info; /* directory info holder */ -@@ -463,6 +465,18 @@ - log_err("cannot run as forbidden gid (%d/%s)\n", gid, cmd); - exit(108); - } -+ -+ /* -+ * Apply user resource limits based on login class. -+ */ -+ if ((lc = login_getclassbyname(pw->pw_class, pw)) == NULL) { -+ log_err("failed to login_getclassbyname()\n"); -+ exit(109); -+ } -+ if ((setusercontext(lc, pw, uid, LOGIN_SETRESOURCES)) != 0) { -+ log_err("failed to setusercontext()\n"); -+ exit(109); -+ } - - /* - * Change UID/GID here so that the following tests work over NFS. ---- support/Makefile.in.orig Thu Nov 16 02:20:47 2006 -+++ support/Makefile.in Thu Nov 16 02:11:29 2006 -@@ -65,7 +65,7 @@ - - suexec_OBJECTS = suexec.lo - suexec: $(suexec_OBJECTS) -- $(LINK) $(suexec_OBJECTS) -+ $(LINK) -lutil $(suexec_OBJECTS) - - htcacheclean_OBJECTS = htcacheclean.lo - htcacheclean: $(htcacheclean_OBJECTS) diff --git a/www/apache22/files/extra-patch-suexec_userdir b/www/apache22/files/extra-patch-suexec_userdir deleted file mode 100644 index 623abe277b79..000000000000 --- a/www/apache22/files/extra-patch-suexec_userdir +++ /dev/null @@ -1,55 +0,0 @@ ---- modules/generators/mod_suexec.c.orig 2006-07-11 22:38:44.000000000 -0500 -+++ modules/generators/mod_suexec.c 2010-02-05 23:22:23.000000000 -0600 -@@ -57,10 +57,11 @@ - } - - static const char *set_suexec_ugid(cmd_parms *cmd, void *mconfig, -- const char *uid, const char *gid) -+ const char *uid, const char *gid, -+ int userdir) - { - suexec_config_t *cfg = (suexec_config_t *) mconfig; -- const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT); -+ const char *err = ap_check_cmd_context(cmd, NOT_IN_LOCATION|NOT_IN_FILES|NOT_IN_LIMIT); - - if (err != NULL) { - return err; -@@ -68,7 +69,7 @@ - if (unixd_config.suexec_enabled) { - cfg->ugid.uid = ap_uname2id(uid); - cfg->ugid.gid = ap_gname2id(gid); -- cfg->ugid.userdir = 0; -+ cfg->ugid.userdir = userdir; - cfg->active = 1; - } - else { -@@ -78,6 +79,18 @@ - return NULL; - } - -+static const char *set_suexec_ugid_nouserdir(cmd_parms *cmd, void *mconfig, -+ const char *uid, const char *gid) -+{ -+ return set_suexec_ugid(cmd, mconfig, uid, gid, 0); -+} -+ -+static const char *set_suexec_ugid_userdir(cmd_parms *cmd, void *mconfig, -+ const char *uid, const char *gid) -+{ -+ return set_suexec_ugid(cmd, mconfig, uid, gid, 1); -+} -+ - static ap_unix_identity_t *get_suexec_id_doer(const request_rec *r) - { - suexec_config_t *cfg = -@@ -115,7 +128,9 @@ - { - /* XXX - Another important reason not to allow this in .htaccess is that - * the ap_[ug]name2id() is not thread-safe */ -- AP_INIT_TAKE2("SuexecUserGroup", set_suexec_ugid, NULL, RSRC_CONF, -+ AP_INIT_TAKE2("SuexecUserGroup", set_suexec_ugid_nouserdir, NULL, RSRC_CONF|ACCESS_CONF, -+ "User and group for spawned processes"), -+ AP_INIT_TAKE2("SuexecUserdir", set_suexec_ugid_userdir, NULL, RSRC_CONF|ACCESS_CONF, - "User and group for spawned processes"), - { NULL } - }; diff --git a/www/apache22/files/htcacheclean.in b/www/apache22/files/htcacheclean.in deleted file mode 100644 index 656f75365cfb..000000000000 --- a/www/apache22/files/htcacheclean.in +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ -# -# PROVIDE: htcacheclean -# -# Configuration settings for htcacheclean in /etc/rc.conf -# -# htcacheclean_enable (bool) -# Set to "NO" by default -# Set it to "YES" to enable htcacheclean -# -# htcacheclean_cache (str) Set to "%%PREFIX%%/www/proxy" by default Set the -# location of the mod_disk_cache CacheRoot This should be the same as whats in -# your httpd.conf -# -# htcacheclean_cachelimit (str) Set to "512M" by default Sets the size -# htcacheclean should prune the disk cache to expressed in bytes by default, K -# for kilobytes, M for megabytes. -# -# htcacheclean_interval (num) -# Set to "10" by default -# Sets how frequently in munutes htcacheclean wakes up and prunes the cache -# -# htcacheclean_args (str) -# Set to "-t -n -i" by default -# Sets extra command-line arguments to htcacheclean -# -t Delete all empty directories -# -n Be nice by sleeping occasionally to not saturate the I/O bandwith of the disk -# -i Run only when there was a modification of the disk cache - -. /etc/rc.subr - -name="htcacheclean" -rcvar=htcacheclean_enable - -load_rc_config "${name}" - -htcacheclean_enable="${htcacheclean_enable:-"NO"}" -htcacheclean_cache="${htcacheclean_cache:-"%%PREFIX%%/www/proxy"}" -htcacheclean_cachelimit="${htcacheclean_cachelimit:-"512M"}" -htcacheclean_interval="${htcacheclean_interval:-"60"}" -htcacheclean_args="${htcacheclean_args:-"-t -n -i"}" - -start_precmd="htc_check" -restart_precmd="htc_check" -restart_reload="htc_check" - -command="%%PREFIX%%/sbin/htcacheclean" -flags="-p${htcacheclean_cache} -d${htcacheclean_interval} -l${htcacheclean_cachelimit} ${htcacheclean_args}" -required_dirs="${htcacheclean_cache}" - -htc_check() -{ - [ ! -d ${htcacheclean_cache} ] && { - echo "" - return 1 - } - return 0 -} - -run_rc_command "$1" diff --git a/www/apache22/files/no-accf.conf b/www/apache22/files/no-accf.conf deleted file mode 100644 index 10e51644ce82..000000000000 --- a/www/apache22/files/no-accf.conf +++ /dev/null @@ -1,4 +0,0 @@ -<IfDefine NOHTTPACCEPT> - AcceptFilter http none - AcceptFilter https none -</IfDefine> diff --git a/www/apache22/files/patch-CVE-2017-9798 b/www/apache22/files/patch-CVE-2017-9798 deleted file mode 100644 index c2f9198e8acf..000000000000 --- a/www/apache22/files/patch-CVE-2017-9798 +++ /dev/null @@ -1,21 +0,0 @@ -CVE-2017-9798 - -Backport from https://svn.apache.org/viewvc?view=revision&revision=1807655 - -diff --git a/server/core.c b/server/core.c -index f61699e..d24542e 100644 ---- server/core.c -+++ server/core.c -@@ -1809,6 +1809,12 @@ AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd, - /* method has not been registered yet, but resorce restriction - * is always checked before method handling, so register it. - */ -+ if (cmd->pool == cmd->temp_pool) { -+ /* In .htaccess, we can't globally register new methods. */ -+ return apr_psprintf(cmd->pool, "Could not register method '%s' " -+ "for %s from .htaccess configuration", -+ method, cmd->cmd->name); -+ } - methnum = ap_method_register(cmd->pool, method); - } - diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in deleted file mode 100644 index 63b46484d46c..000000000000 --- a/www/apache22/files/patch-Makefile.in +++ /dev/null @@ -1,125 +0,0 @@ ---- Makefile.in.orig 2008-11-25 20:24:49 UTC -+++ Makefile.in -@@ -31,12 +31,9 @@ include $(top_srcdir)/build/program.mk - install-conf: - @echo Installing configuration files - @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra -- @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra - @cd $(top_srcdir)/docs/conf; \ - for i in mime.types magic; do \ -- if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ -- fi; \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir)/$${i}.sample; \ - done; \ - for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ - cd $$j ; \ -@@ -59,7 +56,17 @@ install-conf: - < $$i; \ - for j in $(DSO_MODULES) "^EOL^"; do \ - if test $$j != "^EOL^"; then \ -- echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ -+ if test $$j == "cgid"; then \ -+ echo "<IfModule !mpm_prefork_module>"; \ -+ echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ -+ echo "</IfModule>"; \ -+ elif test $$j == "cgi"; then \ -+ echo "<IfModule mpm_prefork_module>"; \ -+ echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ -+ echo "</IfModule>"; \ -+ else \ -+ echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ -+ fi; \ - fi; \ - done; \ - sed -e '1,/@@LoadModule@@/d' \ -@@ -69,15 +76,12 @@ install-conf: - -e 's#@@SSLPort@@#$(SSLPORT)#g' \ - < $$i; \ - fi \ -- ) > $(DESTDIR)$(sysconfdir)/original/$$i; \ -- chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \ -+ ) > $(DESTDIR)$(sysconfdir)/$${i}.sample; \ -+ chmod 0644 $(DESTDIR)$(sysconfdir)/$${i}.sample; \ - file=$$i; \ - if [ "$$i" = "httpd.conf" ]; then \ - file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ - fi; \ -- if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ -- $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \ -- fi; \ - fi; \ - done ; \ - done ; \ -@@ -120,48 +124,25 @@ dox: - doxygen $(top_srcdir)/docs/doxygen.conf - - install-htdocs: -- -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \ -- echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \ -- else \ -- echo Installing HTML documents ; \ -+ @echo Installing HTML documents ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \ -- if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ -- $(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \ -- else \ -- test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ -- cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi; \ -- fi -+ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/misc ; \ -+ test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(DATADIR)/misc) || true - - install-error: -- -@if [ -d $(DESTDIR)$(errordir) ]; then \ -- echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \ -- else \ -- echo Installing error documents ; \ -+ @echo Installing error documents ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \ -- cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \ -- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+ cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; - - install-icons: -- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \ -- echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \ -- else \ -- echo Installing icons ; \ -+ @echo Installing icons ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \ -- cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \ -- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+ cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; - - install-cgi: -- -@if [ -d $(DESTDIR)$(cgidir) ];then \ -- echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \ -- else \ -- echo Installing CGIs ; \ -+ @echo Installing CGIs ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ -- cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \ -- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+ cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; - - install-other: - @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) -@@ -210,12 +191,7 @@ install-man: - @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) - @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 - @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 -- @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ -- $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \ -- else \ -- cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \ -- cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+ cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir) - - install-suexec: - @if test -f $(builddir)/support/suexec; then \ diff --git a/www/apache22/files/patch-acinclude.m4 b/www/apache22/files/patch-acinclude.m4 deleted file mode 100644 index 1353a68c379a..000000000000 --- a/www/apache22/files/patch-acinclude.m4 +++ /dev/null @@ -1,140 +0,0 @@ -https://issues.apache.org/bugzilla/show_bug.cgi?id=58126 -============================================================== ---- acinclude.m4.orig 2015-07-11 23:38:52 UTC -+++ acinclude.m4 -@@ -4,25 +4,25 @@ dnl Autoconf 2.50 can not handle substr - dnl AC_HELP_STRING, so let's try to call it if we can. - dnl Note: this define must be on one line so that it can be properly returned - dnl as the help string. --AC_DEFUN(APACHE_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl -+AC_DEFUN([APACHE_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl - - dnl APACHE_SUBST(VARIABLE) - dnl Makes VARIABLE available in generated files - dnl (do not use @variable@ in Makefiles, but $(variable)) --AC_DEFUN(APACHE_SUBST,[ -+AC_DEFUN([APACHE_SUBST],[ - APACHE_VAR_SUBST="$APACHE_VAR_SUBST $1" - AC_SUBST($1) - ]) - - dnl APACHE_FAST_OUTPUT(FILENAME) - dnl Perform substitutions on FILENAME (Makefiles only) --AC_DEFUN(APACHE_FAST_OUTPUT,[ -+AC_DEFUN([APACHE_FAST_OUTPUT],[ - APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1" - ]) - - dnl APACHE_GEN_CONFIG_VARS - dnl Creates config_vars.mk --AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ -+AC_DEFUN([APACHE_GEN_CONFIG_VARS],[ - APACHE_SUBST(abs_srcdir) - APACHE_SUBST(bindir) - APACHE_SUBST(sbindir) -@@ -111,14 +111,14 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ - - dnl APACHE_GEN_MAKEFILES - dnl Creates Makefiles --AC_DEFUN(APACHE_GEN_MAKEFILES,[ -+AC_DEFUN([APACHE_GEN_MAKEFILES],[ - $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES - ]) - - dnl ## APACHE_OUTPUT(file) - dnl ## adds "file" to the list of files generated by AC_OUTPUT - dnl ## This macro can be used several times. --AC_DEFUN(APACHE_OUTPUT, [ -+AC_DEFUN([APACHE_OUTPUT], [ - APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1" - ]) - -@@ -127,7 +127,7 @@ dnl APACHE_TYPE_RLIM_T - dnl - dnl If rlim_t is not defined, define it to int - dnl --AC_DEFUN(APACHE_TYPE_RLIM_T, [ -+AC_DEFUN([APACHE_TYPE_RLIM_T], [ - AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [ - AC_TRY_COMPILE([ - #include <sys/types.h> -@@ -145,7 +145,7 @@ AC_DEFUN(APACHE_TYPE_RLIM_T, [ - ]) - - dnl APACHE_MODPATH_INIT(modpath) --AC_DEFUN(APACHE_MODPATH_INIT,[ -+AC_DEFUN([APACHE_MODPATH_INIT],[ - current_dir=$1 - modpath_current=modules/$1 - modpath_static= -@@ -154,7 +154,7 @@ AC_DEFUN(APACHE_MODPATH_INIT,[ - > $modpath_current/modules.mk - ])dnl - dnl --AC_DEFUN(APACHE_MODPATH_FINISH,[ -+AC_DEFUN([APACHE_MODPATH_FINISH],[ - echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk - echo "static = $modpath_static" >> $modpath_current/modules.mk - echo "shared = $modpath_shared" >> $modpath_current/modules.mk -@@ -167,7 +167,7 @@ AC_DEFUN(APACHE_MODPATH_FINISH,[ - ])dnl - dnl - dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]]) --AC_DEFUN(APACHE_MODPATH_ADD,[ -+AC_DEFUN([APACHE_MODPATH_ADD],[ - if test -z "$3"; then - objects="mod_$1.lo" - else -@@ -211,7 +211,7 @@ dnl basically: yes/no is a hard setting. - dnl setting. otherwise, fall under the "all" setting. - dnl explicit yes/no always overrides. - dnl --AC_DEFUN(APACHE_MODULE,[ -+AC_DEFUN([APACHE_MODULE],[ - AC_MSG_CHECKING(whether to enable mod_$1) - define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl - AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),,enable_$1=ifelse($5,,maybe-all,$5)) -@@ -284,7 +284,7 @@ AC_DEFUN(APACHE_MODULE,[ - dnl - dnl APACHE_ENABLE_MODULES - dnl --AC_DEFUN(APACHE_ENABLE_MODULES,[ -+AC_DEFUN([APACHE_ENABLE_MODULES],[ - module_selection=default - module_default=yes - -@@ -314,7 +314,7 @@ AC_DEFUN(APACHE_ENABLE_MODULES,[ - ]) - ]) - --AC_DEFUN(APACHE_REQUIRE_CXX,[ -+AC_DEFUN([APACHE_REQUIRE_CXX],[ - if test -z "$apache_cxx_done"; then - AC_PROG_CXX - AC_PROG_CXXCPP -@@ -328,7 +328,7 @@ dnl - dnl Configure for the detected openssl/ssl-c toolkit installation, giving - dnl preference to "--with-ssl=<path>" if it was specified. - dnl --AC_DEFUN(APACHE_CHECK_SSL_TOOLKIT,[ -+AC_DEFUN([APACHE_CHECK_SSL_TOOLKIT],[ - if test "x$ap_ssltk_configured" = "x"; then - dnl initialise the variables we use - ap_ssltk_base="" -@@ -486,14 +486,14 @@ dnl Export (via APACHE_SUBST) the variou - dnl apache will use while generating scripts like autoconf and apxs and - dnl the default config file. - --AC_DEFUN(APACHE_SUBST_EXPANDED_ARG,[ -+AC_DEFUN([APACHE_SUBST_EXPANDED_ARG],[ - APR_EXPAND_VAR(exp_$1, [$]$1) - APACHE_SUBST(exp_$1) - APR_PATH_RELATIVE(rel_$1, [$]exp_$1, ${prefix}) - APACHE_SUBST(rel_$1) - ]) - --AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[ -+AC_DEFUN([APACHE_EXPORT_ARGUMENTS],[ - APACHE_SUBST_EXPANDED_ARG(exec_prefix) - APACHE_SUBST_EXPANDED_ARG(bindir) - APACHE_SUBST_EXPANDED_ARG(sbindir) diff --git a/www/apache22/files/patch-config.layout b/www/apache22/files/patch-config.layout deleted file mode 100644 index 9fd056ad82f5..000000000000 --- a/www/apache22/files/patch-config.layout +++ /dev/null @@ -1,26 +0,0 @@ ---- config.layout.orig 2012-02-27 22:57:18 UTC -+++ config.layout -@@ -281,17 +281,17 @@ - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib -- libexecdir: ${exec_prefix}/libexec/apache2 -+ libexecdir: ${exec_prefix}/libexec/apache22 - mandir: ${prefix}/man -- sysconfdir: ${prefix}/etc/apache2 -- datadir: ${prefix}/www -- installbuilddir: ${prefix}/share/apache2/build -+ sysconfdir: ${prefix}/etc/apache22 -+ datadir: ${prefix}/www/apache22 -+ installbuilddir: ${prefix}/share/apache22/build - errordir: ${datadir}/error - iconsdir: ${datadir}/icons - htdocsdir: ${datadir}/data -- manualdir: ${prefix}/share/doc/apache2 -+ manualdir: ${prefix}/share/doc/apache22 - cgidir: ${datadir}/cgi-bin -- includedir: ${prefix}/include/apache2 -+ includedir: ${prefix}/include/apache22 - localstatedir: /var - runtimedir: ${localstatedir}/run - logfiledir: ${localstatedir}/log diff --git a/www/apache22/files/patch-configure.in b/www/apache22/files/patch-configure.in deleted file mode 100644 index 5d751b5bbea1..000000000000 --- a/www/apache22/files/patch-configure.in +++ /dev/null @@ -1,54 +0,0 @@ ---- configure.in.orig 2013-06-27 16:59:04 UTC -+++ configure.in -@@ -87,9 +87,14 @@ if test "$apr_found" = "no"; then - AC_MSG_ERROR([APR not found. Please read the documentation.]) - fi - -+if test "x${USE_BUNDLED_APR}" != "x" ; then -+ apr_found=reconfig -+ apr_config=srclib/apr/apr-1-config -+fi -+ - if test "$apr_found" = "reconfig"; then - APR_SUBDIR_CONFIG(srclib/apr, -- [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir], -+ [$apache_apr_flags --prefix=$prefix], - [--enable-layout=*|\'--enable-layout=*]) - dnl We must be the first to build and the last to be cleaned - AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS" -@@ -123,6 +128,11 @@ if test "$apu_found" = "no"; then - AC_MSG_ERROR([APR-util not found. Please read the documentation.]) - fi - -+if test "x${USE_BUNDLED_APR}" != "x" ; then -+ apu_found=reconfig -+ apu_config=srclib/apr-util/apu-1-config -+fi -+ - # Catch some misconfigurations: - case ${apr_found}.${apu_found} in - reconfig.yes) -@@ -135,7 +145,7 @@ esac - - if test "$apu_found" = "reconfig"; then - APR_SUBDIR_CONFIG(srclib/apr-util, -- [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir], -+ [--with-apr=../apr --prefix=$prefix], - [--enable-layout=*|\'--enable-layout=*]) - dnl We must be the last to build and the first to be cleaned - AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util" -@@ -678,8 +691,14 @@ AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_pre - [Root directory of the Apache install area]) - AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", - [Location of the config file, relative to the Apache root directory]) -+AC_DEFINE_UNQUOTED(DEFAULT_ERRORLOG, "${rel_logfiledir}/httpd-error.log", -+ [Location of error log file]) -+AC_DEFINE_UNQUOTED(DEFAULT_SCOREBOARD, "${rel_runtimedir}/apache_runtime_status", -+ [Location of ScoreBoard file]) - AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", - [Location of the MIME types config file, relative to the Apache root directory]) -+AC_DEFINE_UNQUOTED(DOCUMENT_LOCATION, "${rel_htdocsdir}", -+ [Location of document root]) - AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR", - [Location of the source for the current MPM]) - diff --git a/www/apache22/files/patch-docs__conf__extra__httpd-mpm.conf.in b/www/apache22/files/patch-docs__conf__extra__httpd-mpm.conf.in deleted file mode 100644 index 4ee823a1f30b..000000000000 --- a/www/apache22/files/patch-docs__conf__extra__httpd-mpm.conf.in +++ /dev/null @@ -1,11 +0,0 @@ ---- docs/conf/extra/httpd-mpm.conf.in.orig 2007-12-29 03:08:28 UTC -+++ docs/conf/extra/httpd-mpm.conf.in -@@ -17,7 +17,7 @@ - # - <IfModule !mpm_winnt_module> - <IfModule !mpm_netware_module> --LockFile "@rel_logfiledir@/accept.lock" -+LockFile "@rel_runtimedir@/accept.lock" - </IfModule> - </IfModule> - diff --git a/www/apache22/files/patch-docs__conf__extra__httpd-ssl.conf.in b/www/apache22/files/patch-docs__conf__extra__httpd-ssl.conf.in deleted file mode 100644 index 0f95b9d1b83d..000000000000 --- a/www/apache22/files/patch-docs__conf__extra__httpd-ssl.conf.in +++ /dev/null @@ -1,22 +0,0 @@ ---- docs/conf/extra/httpd-ssl.conf.in.orig 2015-05-27 18:59:59 UTC -+++ docs/conf/extra/httpd-ssl.conf.in -@@ -114,8 +114,8 @@ SSLMutex "file:@exp_runtimedir@/ssl_mut - DocumentRoot "@exp_htdocsdir@" - ServerName www.example.com:@@SSLPort@@ - ServerAdmin you@example.com --ErrorLog "@exp_logfiledir@/error_log" --TransferLog "@exp_logfiledir@/access_log" -+ErrorLog "@exp_logfiledir@/httpd-error.log" -+TransferLog "@exp_logfiledir@/httpd-access.log" - - # SSL Engine Switch: - # Enable/Disable SSL for this virtual host. -@@ -263,7 +263,7 @@ BrowserMatch "MSIE [2-5]" \ - # Per-Server Logging: - # The home of a custom SSL log file. Use this when you want a - # compact non-error SSL logfile on a virtual host basis. --CustomLog "@exp_logfiledir@/ssl_request_log" \ -+CustomLog "@exp_logfiledir@/httpd-ssl_request.log" \ - "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" - - </VirtualHost> diff --git a/www/apache22/files/patch-docs__conf__extra__httpd-userdir.conf.in b/www/apache22/files/patch-docs__conf__extra__httpd-userdir.conf.in deleted file mode 100644 index fbd63ed9b8df..000000000000 --- a/www/apache22/files/patch-docs__conf__extra__httpd-userdir.conf.in +++ /dev/null @@ -1,16 +0,0 @@ ---- docs/conf/extra/httpd-userdir.conf.in.orig 2007-03-07 07:33:58 UTC -+++ docs/conf/extra/httpd-userdir.conf.in -@@ -8,7 +8,7 @@ - # the default access control for these directories, as in the example below. - # - UserDir public_html -- -+UserDir disabled %%FTPUSERS%% - # - # Control access to UserDir directories. The following is an example - # for a site where these directories are restricted to read-only. -@@ -25,4 +25,3 @@ UserDir public_html - Deny from all - </LimitExcept> - </Directory> -- diff --git a/www/apache22/files/patch-docs__conf__httpd.conf.in b/www/apache22/files/patch-docs__conf__httpd.conf.in deleted file mode 100644 index 65eb79db0ed6..000000000000 --- a/www/apache22/files/patch-docs__conf__httpd.conf.in +++ /dev/null @@ -1,62 +0,0 @@ ---- docs/conf/httpd.conf.in.orig 2012-02-06 16:54:24 UTC -+++ docs/conf/httpd.conf.in -@@ -54,6 +54,9 @@ Listen @@Port@@ - # - @@LoadModule@@ - -+# Third party modules -+Include @rel_sysconfdir@/modules.d/[0-9][0-9][0-9]_*.conf -+ - <IfModule !mpm_netware_module> - <IfModule !mpm_winnt_module> - # -@@ -64,8 +67,8 @@ Listen @@Port@@ - # It is usually good practice to create a dedicated user and group for - # running httpd, as with most system services. - # --User daemon --Group daemon -+User %%WWWOWN%% -+Group %%WWWGRP%% - - </IfModule> - </IfModule> -@@ -114,7 +117,6 @@ DocumentRoot "@exp_htdocsdir@" - # features. - # - <Directory /> -- Options FollowSymLinks - AllowOverride None - Order deny,allow - Deny from all -@@ -185,7 +187,7 @@ DocumentRoot "@exp_htdocsdir@" - # logged here. If you *do* define an error logfile for a <VirtualHost> - # container, that host's errors will be logged there and not here. - # --ErrorLog "@rel_logfiledir@/error_log" -+ErrorLog "@rel_logfiledir@/httpd-error.log" - - # - # LogLevel: Control the number of messages logged to the error_log. -@@ -214,13 +216,13 @@ LogLevel warn - # define per-<VirtualHost> access logfiles, transactions will be - # logged therein and *not* in this file. - # -- CustomLog "@rel_logfiledir@/access_log" common -+ #CustomLog "@rel_logfiledir@/httpd-access.log" common - - # - # If you prefer a logfile with access, agent, and referer information - # (Combined Logfile Format) you can use the following directive. - # -- #CustomLog "@rel_logfiledir@/access_log" combined -+ CustomLog "@rel_logfiledir@/httpd-access.log" combined - </IfModule> - - <IfModule alias_module> -@@ -416,3 +418,5 @@ DefaultType text/plain - SSLRandomSeed startup builtin - SSLRandomSeed connect builtin - </IfModule> -+ -+Include @rel_sysconfdir@/Includes/*.conf diff --git a/www/apache22/files/patch-include__ap_config_auto.h.in b/www/apache22/files/patch-include__ap_config_auto.h.in deleted file mode 100644 index 1046824ddea4..000000000000 --- a/www/apache22/files/patch-include__ap_config_auto.h.in +++ /dev/null @@ -1,15 +0,0 @@ ---- include/ap_config_auto.h.in.orig 2014-08-22 17:54:18 UTC -+++ include/ap_config_auto.h.in -@@ -127,6 +127,12 @@ - /* Define to 1 if you have the `SSL_CTX_new' function. */ - #undef HAVE_SSL_CTX_NEW - -+/* Define to 1 if you run LibreSSL which defines SSL_CTX_use_certificate_chain as well */ -+#undef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN -+ -+/* Define to 1 if your OpenSSL library supports RAND_egd */ -+#undef HAVE_SSL_RAND_EGD -+ - /* Define to 1 if you have the `SSL_set_cert_store' function. */ - #undef HAVE_SSL_SET_CERT_STORE - diff --git a/www/apache22/files/patch-include__httpd.h b/www/apache22/files/patch-include__httpd.h deleted file mode 100644 index b7d96113cba6..000000000000 --- a/www/apache22/files/patch-include__httpd.h +++ /dev/null @@ -1,15 +0,0 @@ ---- include/httpd.h.orig 2014-08-21 17:33:48 UTC -+++ include/httpd.h -@@ -1905,12 +1905,6 @@ AP_DECLARE(char *) ap_get_exec_line(apr_ - const char *cmd, - const char * const *argv); - --/** strtoul does not exist on sunos4. */ --#ifdef strtoul --#undef strtoul --#endif --#define strtoul strtoul_is_not_a_portable_function_use_strtol_instead -- - /* The C library has functions that allow const to be silently dropped ... - these macros detect the drop in maintainer mode, but use the native - methods for normal builds diff --git a/www/apache22/files/patch-modules__proxy__mod_proxy_connect.c b/www/apache22/files/patch-modules__proxy__mod_proxy_connect.c deleted file mode 100644 index 7cf415bf8e2a..000000000000 --- a/www/apache22/files/patch-modules__proxy__mod_proxy_connect.c +++ /dev/null @@ -1,334 +0,0 @@ ---- modules/proxy/mod_proxy_connect.c.orig 2010-12-08 19:31:34 UTC -+++ modules/proxy/mod_proxy_connect.c -@@ -21,6 +21,8 @@ - #include "mod_proxy.h" - #include "apr_poll.h" - -+#define CONN_BLKSZ AP_IOBUFSIZE -+ - module AP_MODULE_DECLARE_DATA proxy_connect_module; - - /* -@@ -71,6 +73,50 @@ static int proxy_connect_canon(request_r - return OK; - } - -+/* read available data (in blocks of CONN_BLKSZ) from c_i and copy to c_o */ -+static int proxy_connect_transfer(request_rec *r, conn_rec *c_i, conn_rec *c_o, -+ apr_bucket_brigade *bb, char *name) -+{ -+ int rv; -+#ifdef DEBUGGING -+ apr_off_t len; -+#endif -+ -+ do { -+ apr_brigade_cleanup(bb); -+ rv = ap_get_brigade(c_i->input_filters, bb, AP_MODE_READBYTES, -+ APR_NONBLOCK_READ, CONN_BLKSZ); -+ if (rv == APR_SUCCESS) { -+ if (APR_BRIGADE_EMPTY(bb)) -+ break; -+#ifdef DEBUGGING -+ len = -1; -+ apr_brigade_length(bb, 0, &len); -+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, -+ "proxy: CONNECT: read %" APR_OFF_T_FMT -+ " bytes from %s", len, name); -+#endif -+ rv = ap_pass_brigade(c_o->output_filters, bb); -+ if (rv == APR_SUCCESS) { -+ ap_fflush(c_o->output_filters, bb); -+ } else { -+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, -+ "proxy: CONNECT: error on %s - ap_pass_brigade", -+ name); -+ } -+ } else if (!APR_STATUS_IS_EAGAIN(rv)) { -+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, -+ "proxy: CONNECT: error on %s - ap_get_brigade", -+ name); -+ } -+ } while (rv == APR_SUCCESS); -+ -+ if (APR_STATUS_IS_EAGAIN(rv)) { -+ rv = APR_SUCCESS; -+ } -+ return rv; -+} -+ - /* CONNECT handler */ - static int proxy_connect_handler(request_rec *r, proxy_worker *worker, - proxy_server_conf *conf, -@@ -79,11 +125,15 @@ static int proxy_connect_handler(request - { - apr_pool_t *p = r->pool; - apr_socket_t *sock; -+ conn_rec *c = r->connection; -+ conn_rec *backconn; -+ -+ apr_bucket_brigade *bb = apr_brigade_create(p, c->bucket_alloc); - apr_status_t err, rv; - apr_size_t i, o, nbytes; - char buffer[HUGE_STRING_LEN]; -- apr_socket_t *client_socket = ap_get_module_config(r->connection->conn_config, &core_module); -- int failed; -+ apr_socket_t *client_socket = ap_get_module_config(c->conn_config, &core_module); -+ int failed, rc; - apr_pollset_t *pollset; - apr_pollfd_t pollfd; - const apr_pollfd_t *signalled; -@@ -158,12 +208,10 @@ static int proxy_connect_handler(request - case APR_URI_SNEWS_DEFAULT_PORT: - break; - default: -- /* XXX can we call ap_proxyerror() here to get a nice log message? */ -- return HTTP_FORBIDDEN; -+ return ap_proxyerror(r, HTTP_FORBIDDEN, "Connect to remote machine blocked"); - } - } else if(!allowed_port(conf, uri.port)) { -- /* XXX can we call ap_proxyerror() here to get a nice log message? */ -- return HTTP_FORBIDDEN; -+ return ap_proxyerror(r, HTTP_FORBIDDEN, "Connect to remote machine blocked"); - } - - /* -@@ -205,19 +253,57 @@ static int proxy_connect_handler(request - } - } - -+ /* setup polling for connection */ -+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, -+ "proxy: CONNECT: setting up poll()"); -+ -+ if ((rv = apr_pollset_create(&pollset, 2, r->pool, 0)) != APR_SUCCESS) { -+ apr_socket_close(sock); -+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, -+ "proxy: CONNECT: error apr_pollset_create()"); -+ return HTTP_INTERNAL_SERVER_ERROR; -+ } -+ -+ /* Add client side to the poll */ -+ pollfd.p = r->pool; -+ pollfd.desc_type = APR_POLL_SOCKET; -+ pollfd.reqevents = APR_POLLIN; -+ pollfd.desc.s = client_socket; -+ pollfd.client_data = NULL; -+ apr_pollset_add(pollset, &pollfd); -+ -+ /* Add the server side to the poll */ -+ pollfd.desc.s = sock; -+ apr_pollset_add(pollset, &pollfd); -+ - /* - * Step Three: Send the Request - * - * Send the HTTP/1.1 CONNECT request to the remote server - */ - -- /* we are acting as a tunnel - the output filter stack should -- * be completely empty, because when we are done here we are done completely. -- * We add the NULL filter to the stack to do this... -- */ -- r->output_filters = NULL; -- r->connection->output_filters = NULL; -- -+ backconn = ap_run_create_connection(c->pool, r->server, sock, -+ c->id, c->sbh, c->bucket_alloc); -+ if (!backconn) { -+ /* peer reset */ -+ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, -+ "proxy: an error occurred creating a new connection " -+ "to %pI (%s)", connect_addr, connectname); -+ apr_socket_close(sock); -+ return HTTP_INTERNAL_SERVER_ERROR; -+ } -+ ap_proxy_ssl_disable(backconn); -+ rc = ap_run_pre_connection(backconn, sock); -+ if (rc != OK && rc != DONE) { -+ backconn->aborted = 1; -+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, -+ "proxy: CONNECT: pre_connection setup failed (%d)", rc); -+ return HTTP_INTERNAL_SERVER_ERROR; -+ } -+ -+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, -+ "proxy: CONNECT: connection complete to %pI (%s)", -+ connect_addr, connectname); - - /* If we are connecting through a remote proxy, we need to pass - * the CONNECT request on to it. -@@ -227,12 +313,11 @@ static int proxy_connect_handler(request - */ - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, - "proxy: CONNECT: sending the CONNECT request to the remote proxy"); -- nbytes = apr_snprintf(buffer, sizeof(buffer), -+ ap_fprintf(backconn->output_filters, bb, - "CONNECT %s HTTP/1.0" CRLF, r->uri); -- apr_socket_send(sock, buffer, &nbytes); -- nbytes = apr_snprintf(buffer, sizeof(buffer), -- "Proxy-agent: %s" CRLF CRLF, ap_get_server_banner()); -- apr_socket_send(sock, buffer, &nbytes); -+ ap_fprintf(backconn->output_filters, bb, -+ "Proxy-agent: %s" CRLF CRLF, ap_get_server_version()); -+ ap_fflush(backconn->output_filters, bb); - } - else { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, -@@ -240,11 +325,12 @@ static int proxy_connect_handler(request - nbytes = apr_snprintf(buffer, sizeof(buffer), - "HTTP/1.0 200 Connection Established" CRLF); - ap_xlate_proto_to_ascii(buffer, nbytes); -- apr_socket_send(client_socket, buffer, &nbytes); -+ ap_fwrite(c->output_filters, bb, buffer, nbytes); - nbytes = apr_snprintf(buffer, sizeof(buffer), - "Proxy-agent: %s" CRLF CRLF, ap_get_server_banner()); - ap_xlate_proto_to_ascii(buffer, nbytes); -- apr_socket_send(client_socket, buffer, &nbytes); -+ ap_fwrite(c->output_filters, bb, buffer, nbytes); -+ ap_fflush(c->output_filters, bb); - #if 0 - /* This is safer code, but it doesn't work yet. I'm leaving it - * here so that I can fix it later. -@@ -264,28 +350,16 @@ static int proxy_connect_handler(request - * - * Handle two way transfer of data over the socket (this is a tunnel). - */ -+ /* we are now acting as a tunnel - the input/output filter stacks should -+ * not contain any non-connection filters. -+ */ -+ r->output_filters = c->output_filters; -+ r->proto_output_filters = c->output_filters; -+ r->input_filters = c->input_filters; -+ r->proto_input_filters = c->input_filters; - - /* r->sent_bodyct = 1;*/ - -- if ((rv = apr_pollset_create(&pollset, 2, r->pool, 0)) != APR_SUCCESS) { -- apr_socket_close(sock); -- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, -- "proxy: CONNECT: error apr_pollset_create()"); -- return HTTP_INTERNAL_SERVER_ERROR; -- } -- -- /* Add client side to the poll */ -- pollfd.p = r->pool; -- pollfd.desc_type = APR_POLL_SOCKET; -- pollfd.reqevents = APR_POLLIN; -- pollfd.desc.s = client_socket; -- pollfd.client_data = NULL; -- apr_pollset_add(pollset, &pollfd); -- -- /* Add the server side to the poll */ -- pollfd.desc.s = sock; -- apr_pollset_add(pollset, &pollfd); -- - while (1) { /* Infinite loop until error (one side closes the connection) */ - if ((rv = apr_pollset_poll(pollset, -1, &pollcnt, &signalled)) != APR_SUCCESS) { - if (APR_STATUS_IS_EINTR(rv)) { -@@ -297,7 +371,7 @@ static int proxy_connect_handler(request - } - #ifdef DEBUGGING - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, -- "proxy: CONNECT: woke from select(), i=%d", pollcnt); -+ "proxy: CONNECT: woke from poll(), i=%d", pollcnt); - #endif - - for (pi = 0; pi < pollcnt; pi++) { -@@ -307,72 +381,31 @@ static int proxy_connect_handler(request - pollevent = cur->rtnevents; - if (pollevent & APR_POLLIN) { - #ifdef DEBUGGING -- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, -- "proxy: CONNECT: sock was set"); -+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r, -+ "proxy: CONNECT: sock was readable"); - #endif -- nbytes = sizeof(buffer); -- rv = apr_socket_recv(sock, buffer, &nbytes); -- if (rv == APR_SUCCESS) { -- o = 0; -- i = nbytes; -- while(i > 0) -- { -- nbytes = i; -- /* This is just plain wrong. No module should ever write directly -- * to the client. For now, this works, but this is high on my list of -- * things to fix. The correct line is: -- * if ((nbytes = ap_rwrite(buffer + o, nbytes, r)) < 0) -- * rbb -- */ -- rv = apr_socket_send(client_socket, buffer + o, &nbytes); -- if (rv != APR_SUCCESS) -- break; -- o += nbytes; -- i -= nbytes; -- } -+ rv = proxy_connect_transfer(r, backconn, c, bb, "sock"); - } -- else -- break; -+ else if ((pollevent & APR_POLLERR) || (pollevent & APR_POLLHUP)) { -+ rv = APR_EPIPE; -+ ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, "proxy: CONNECT: err/hup on backconn"); - } -- else if ((pollevent & APR_POLLERR) || (pollevent & APR_POLLHUP)) -- break; - } - else if (cur->desc.s == client_socket) { - pollevent = cur->rtnevents; - if (pollevent & APR_POLLIN) { - #ifdef DEBUGGING -- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, -- "proxy: CONNECT: client was set"); --#endif -- nbytes = sizeof(buffer); -- rv = apr_socket_recv(client_socket, buffer, &nbytes); -- if (rv == APR_SUCCESS) { -- o = 0; -- i = nbytes; --#ifdef DEBUGGING -- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, -- "proxy: CONNECT: read %d from client", i); -+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r, -+ "proxy: CONNECT: client was readable"); - #endif -- while(i > 0) -- { -- nbytes = i; -- rv = apr_socket_send(sock, buffer + o, &nbytes); -- if (rv != APR_SUCCESS) -- break; -- o += nbytes; -- i -= nbytes; -- } -- } -- else -- break; -+ rv = proxy_connect_transfer(r, c, backconn, bb, "client"); - } -- else if ((pollevent & APR_POLLERR) || (pollevent & APR_POLLHUP)) { -- rv = APR_EOF; -- break; - } -+ else { -+ rv = APR_EBADF; -+ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, -+ "proxy: CONNECT: unknown socket in pollset"); - } -- else -- break; - } - if (rv != APR_SUCCESS) { - break; -@@ -388,7 +421,9 @@ static int proxy_connect_handler(request - * Close the socket and clean up - */ - -- apr_socket_close(sock); -+ ap_lingering_close(backconn); -+ -+ c->aborted = 1; - - return OK; - } diff --git a/www/apache22/files/patch-modules__proxy__mod_proxy_util.c b/www/apache22/files/patch-modules__proxy__mod_proxy_util.c deleted file mode 100644 index 31a0c27ea6ad..000000000000 --- a/www/apache22/files/patch-modules__proxy__mod_proxy_util.c +++ /dev/null @@ -1,22 +0,0 @@ -https://www.apache.org/dist/httpd/patches/apply_to_2.2.34/2.2.x-mod_proxy-without-APR_HAS_THREADS.patch - -Index: modules/proxy/proxy_util.c -=================================================================== ---- modules/proxy/proxy_util.c (revision 1821521) -+++ modules/proxy/proxy_util.c (working copy) -@@ -1398,7 +1398,6 @@ PROXY_DECLARE(proxy_worker *) ap_proxy_get_worker( - return max_worker; - } - --#if APR_HAS_THREADS - static void socket_cleanup(proxy_conn_rec *conn) - { - conn->sock = NULL; -@@ -1407,6 +1406,7 @@ static void socket_cleanup(proxy_conn_rec *conn) - apr_pool_clear(conn->scpool); - } - -+#if APR_HAS_THREADS - static apr_status_t conn_pool_cleanup(void *theworker) - { - proxy_worker *worker = (proxy_worker *)theworker; diff --git a/www/apache22/files/patch-modules__ssl__ssl_engine_init.c b/www/apache22/files/patch-modules__ssl__ssl_engine_init.c deleted file mode 100644 index e7a3a131a81f..000000000000 --- a/www/apache22/files/patch-modules__ssl__ssl_engine_init.c +++ /dev/null @@ -1,36 +0,0 @@ ---- modules/ssl/ssl_engine_init.c.orig 2017-01-05 18:57:49 UTC -+++ modules/ssl/ssl_engine_init.c -@@ -251,9 +251,11 @@ void ssl_init_Engine(server_rec *s, apr_ - ssl_die(); - } - -+#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK - if (strEQ(mc->szCryptoDevice, "chil")) { - ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0); - } -+#endif - - if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, -@@ -446,6 +448,9 @@ static void ssl_init_ctx_protocol(server - } - #endif - -+#ifdef SSL_NO_COMP -+#define OPENSSL_NO_COMP -+#endif - - #ifndef OPENSSL_NO_COMP - if (sc->compression != TRUE) { -@@ -708,7 +713,11 @@ static void ssl_init_ctx_cert_chain(serv - } - - ERR_clear_error(); -+#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN - n = SSL_CTX_use_certificate_chain(mctx->ssl_ctx, -+#else -+ n = _SSL_CTX_use_certificate_chain(mctx->ssl_ctx, -+#endif - (char *)chain, - skip_first, NULL); - if (n < 0) { diff --git a/www/apache22/files/patch-modules__ssl__ssl_engine_rand.c b/www/apache22/files/patch-modules__ssl__ssl_engine_rand.c deleted file mode 100644 index 44ad4f7df520..000000000000 --- a/www/apache22/files/patch-modules__ssl__ssl_engine_rand.c +++ /dev/null @@ -1,20 +0,0 @@ ---- modules/ssl/ssl_engine_rand.c.orig 2006-07-12 03:38:44 UTC -+++ modules/ssl/ssl_engine_rand.c -@@ -83,17 +83,6 @@ int ssl_rand_seed(server_rec *s, apr_poo - nDone += ssl_rand_feedfp(p, fp, pRandSeed->nBytes); - ssl_util_ppclose(s, p, fp); - } --#ifdef HAVE_SSL_RAND_EGD -- else if (pRandSeed->nSrc == SSL_RSSRC_EGD) { -- /* -- * seed in contents provided by the external -- * Entropy Gathering Daemon (EGD) -- */ -- if ((n = RAND_egd(pRandSeed->cpPath)) == -1) -- continue; -- nDone += n; -- } --#endif - else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) { - struct { - time_t t; diff --git a/www/apache22/files/patch-modules__ssl__ssl_engine_vars.c b/www/apache22/files/patch-modules__ssl__ssl_engine_vars.c deleted file mode 100644 index 673665651e7e..000000000000 --- a/www/apache22/files/patch-modules__ssl__ssl_engine_vars.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/ssl/ssl_engine_vars.c.orig 2013-02-12 11:51:17 UTC -+++ modules/ssl/ssl_engine_vars.c -@@ -832,7 +832,7 @@ static char *ssl_var_lookup_ssl_compress - { - char *result = "NULL"; - #ifdef OPENSSL_VERSION_NUMBER --#if (OPENSSL_VERSION_NUMBER >= 0x00908000) -+#if (OPENSSL_VERSION_NUMBER >= 0x00908000) && !defined(OPENSSL_NO_COMP) - SSL_SESSION *pSession = SSL_get_session(ssl); - - if (pSession) { diff --git a/www/apache22/files/patch-modules__ssl__ssl_util_ssl.c b/www/apache22/files/patch-modules__ssl__ssl_util_ssl.c deleted file mode 100644 index b3cdaea0f64e..000000000000 --- a/www/apache22/files/patch-modules__ssl__ssl_util_ssl.c +++ /dev/null @@ -1,14 +0,0 @@ ---- modules/ssl/ssl_util_ssl.c.orig 2012-08-17 17:30:46 UTC -+++ modules/ssl/ssl_util_ssl.c -@@ -492,7 +492,11 @@ BOOL SSL_X509_INFO_load_path(apr_pool_t - * format, possibly followed by a sequence of CA certificates that - * should be sent to the peer in the SSL Certificate message. - */ -+#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN - int SSL_CTX_use_certificate_chain( -+#else -+int _SSL_CTX_use_certificate_chain( -+#endif - SSL_CTX *ctx, char *file, int skipfirst, modssl_read_bio_cb_fn *cb) - { - BIO *bio; diff --git a/www/apache22/files/patch-modules__ssl__ssl_util_ssl.h b/www/apache22/files/patch-modules__ssl__ssl_util_ssl.h deleted file mode 100644 index 9a36ee784a6f..000000000000 --- a/www/apache22/files/patch-modules__ssl__ssl_util_ssl.h +++ /dev/null @@ -1,14 +0,0 @@ ---- modules/ssl/ssl_util_ssl.h.orig 2012-08-17 17:30:46 UTC -+++ modules/ssl/ssl_util_ssl.h -@@ -89,7 +89,11 @@ char *SSL_X509_NAME_to_string(apr_ - BOOL SSL_X509_getCN(apr_pool_t *, X509 *, char **); - BOOL SSL_X509_INFO_load_file(apr_pool_t *, STACK_OF(X509_INFO) *, const char *); - BOOL SSL_X509_INFO_load_path(apr_pool_t *, STACK_OF(X509_INFO) *, const char *); -+#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN - int SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, modssl_read_bio_cb_fn *); -+#else -+int _SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, modssl_read_bio_cb_fn *); -+#endif - char *SSL_SESSION_id2sz(unsigned char *, int, char *, int); - - /** util functions for OpenSSL+sslc compat */ diff --git a/www/apache22/files/patch-server__config.c b/www/apache22/files/patch-server__config.c deleted file mode 100644 index 60b76a7103e4..000000000000 --- a/www/apache22/files/patch-server__config.c +++ /dev/null @@ -1,19 +0,0 @@ -Fix for IPv6 only hosts, reported by Curtis Villamizar -http://lists.freebsd.org/pipermail/freebsd-apache/2012-August/002836.html -https://issues.apache.org/bugzilla/show_bug.cgi?id=53823 - -================================================================== ---- server/config.c.orig 2010-10-07 16:56:54 UTC -+++ server/config.c -@@ -1979,6 +1979,11 @@ static server_rec *init_server_config(pr - /* NOT virtual host; don't match any real network interface */ - rv = apr_sockaddr_info_get(&s->addrs->host_addr, - NULL, APR_INET, 0, 0, p); -+#if APR_HAVE_IPV6 -+ if (rv != APR_SUCCESS) -+ rv = apr_sockaddr_info_get(&s->addrs->host_addr, -+ NULL, APR_INET6, 0, 0, p); -+#endif - ap_assert(rv == APR_SUCCESS); /* otherwise: bug or no storage */ - - s->addrs->host_port = 0; /* matches any port */ diff --git a/www/apache22/files/patch-server__core.c b/www/apache22/files/patch-server__core.c deleted file mode 100644 index 3f9f179ac3db..000000000000 --- a/www/apache22/files/patch-server__core.c +++ /dev/null @@ -1,63 +0,0 @@ ---- server/core.c.orig 2014-08-21 17:33:48 UTC -+++ server/core.c -@@ -512,6 +512,7 @@ static void *merge_core_server_configs(a - core_server_config *base = (core_server_config *)basev; - core_server_config *virt = (core_server_config *)virtv; - core_server_config *conf; -+ const char *accfb, *accfc; - - conf = (core_server_config *)apr_pmemdup(p, virt, sizeof(core_server_config)); - -@@ -527,6 +528,25 @@ static void *merge_core_server_configs(a - conf->protocol = base->protocol; - } - -+ /* -+ * bz accept_filter(9) disable fix. -+ * -+ * You can only configure it in the base config but the -+ * values are copied and checked into virtual host configs, -+ * so if you disable it in base it will still be on in virt. -+ * To fix it, we overwrite each virt config if it does not -+ * match what is in base config for the hardcoded http(s). -+ */ -+ accfb = apr_table_get(base->accf_map, "http"); -+ accfc = apr_table_get(conf->accf_map, "http"); -+ if (accfb && accfc && strcmp(accfb, accfc)) -+ apr_table_set(conf->accf_map, "http", accfb); -+ -+ accfb = apr_table_get(base->accf_map, "https"); -+ accfc = apr_table_get(conf->accf_map, "https"); -+ if (accfb && accfc && strcmp(accfb, accfc)) -+ apr_table_set(conf->accf_map, "https", accfb); -+ - conf->sec_dir = apr_array_append(p, base->sec_dir, virt->sec_dir); - conf->sec_url = apr_array_append(p, base->sec_url, virt->sec_url); - -@@ -2778,7 +2798,7 @@ AP_DECLARE(void) ap_get_server_revision( - AP_DECLARE(const char *) ap_get_server_description(void) - { - return server_description ? server_description : -- AP_SERVER_BASEVERSION " (" PLATFORM ")"; -+ AP_SERVER_BASEVERSION " (FreeBSD)"; - } - - AP_DECLARE(const char *) ap_get_server_banner(void) -@@ -2839,7 +2859,7 @@ static void set_banner(apr_pool_t *pconf - ap_add_version_component(pconf, AP_SERVER_BASEPRODUCT "/" AP_SERVER_MAJORVERSION); - } - else { -- ap_add_version_component(pconf, AP_SERVER_BASEVERSION " (" PLATFORM ")"); -+ ap_add_version_component(pconf, AP_SERVER_BASEVERSION " (FreeBSD)"); - } - - /* -@@ -2849,7 +2869,7 @@ static void set_banner(apr_pool_t *pconf - if (ap_server_tokens != SrvTk_FULL) { - banner_locked++; - } -- server_description = AP_SERVER_BASEVERSION " (" PLATFORM ")"; -+ server_description = AP_SERVER_BASEVERSION " (FreeBSD)"; - } - - static const char *set_serv_tokens(cmd_parms *cmd, void *dummy, diff --git a/www/apache22/files/patch-support__Makefile.in b/www/apache22/files/patch-support__Makefile.in deleted file mode 100644 index 72cb36ce3d18..000000000000 --- a/www/apache22/files/patch-support__Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ ---- support/Makefile.in.orig 2011-04-16 19:09:47 UTC -+++ support/Makefile.in -@@ -16,17 +16,14 @@ install: - @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) - @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) - @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir) -- @for i in apxs apachectl dbmmanage; do \ -+ @for i in apxs apachectl dbmmanage split-logfile; do \ - if test -f "$(builddir)/$$i"; then \ - cp -p $$i $(DESTDIR)$(sbindir); \ - chmod 755 $(DESTDIR)$(sbindir)/$$i; \ - fi ; \ - done - @if test -f "$(builddir)/envvars-std"; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir); \ -- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ -- fi ; \ -+ cp -p envvars-std $(DESTDIR)$(sbindir)/envvars; \ - fi - - htpasswd_OBJECTS = htpasswd.lo diff --git a/www/apache22/files/patch-support__ab.c b/www/apache22/files/patch-support__ab.c deleted file mode 100644 index c0bff10de7d3..000000000000 --- a/www/apache22/files/patch-support__ab.c +++ /dev/null @@ -1,1362 +0,0 @@ -Backport ab from apache 2.4.x (r1663405) -============================================================= ---- support/ab.c.orig 2017-01-05 18:57:49 UTC -+++ support/ab.c -@@ -156,25 +156,8 @@ - #include "ap_config_auto.h" - #endif - --#if defined(HAVE_SSLC) -- --/* Libraries for RSA SSL-C */ --#include <rsa.h> --#include <x509.h> --#include <pem.h> --#include <err.h> --#include <ssl.h> --#include <r_rand.h> --#include <sslc.h> --#define USE_SSL --#define RSAREF --#define SK_NUM(x) sk_num(x) --#define SK_VALUE(x,y) sk_value(x,y) --typedef STACK X509_STACK_TYPE; -- --#elif defined(HAVE_OPENSSL) -+#if defined(HAVE_OPENSSL) - --/* Libraries on most systems.. */ - #include <openssl/rsa.h> - #include <openssl/crypto.h> - #include <openssl/x509.h> -@@ -232,19 +215,25 @@ typedef STACK_OF(X509) X509_STACK_TYPE; - /* maximum number of requests on a time limited test */ - #define MAX_REQUESTS (INT_MAX > 50000 ? 50000 : INT_MAX) - --/* good old state hostname */ --#define STATE_UNCONNECTED 0 --#define STATE_CONNECTING 1 /* TCP connect initiated, but we don't -+/* connection state -+ * don't add enums or rearrange or otherwise change values without -+ * visiting set_conn_state() -+ */ -+typedef enum { -+ STATE_UNCONNECTED = 0, -+ STATE_CONNECTING, /* TCP connect initiated, but we don't - * know if it worked yet - */ --#define STATE_CONNECTED 2 /* we know TCP connect completed */ --#define STATE_READ 3 -+ STATE_CONNECTED, /* we know TCP connect completed */ -+ STATE_READ -+} connect_state_e; - --#define CBUFFSIZE (2048) -+#define CBUFFSIZE (8192) - - struct connection { - apr_pool_t *ctx; - apr_socket_t *aprsock; -+ apr_pollfd_t pollfd; - int state; - apr_size_t read; /* amount of bytes read */ - apr_size_t bread; /* amount of body read */ -@@ -275,8 +264,8 @@ struct data { - apr_interval_time_t time; /* time for connection */ - }; - --#define ap_min(a,b) ((a)<(b))?(a):(b) --#define ap_max(a,b) ((a)>(b))?(a):(b) -+#define ap_min(a,b) (((a)<(b))?(a):(b)) -+#define ap_max(a,b) (((a)>(b))?(a):(b)) - #define ap_round_ms(a) ((apr_time_t)((a) + 500)/1000) - #define ap_double_ms(a) ((double)(a)/1000.0) - #define MAX_CONCURRENCY 20000 -@@ -285,35 +274,38 @@ struct data { - - int verbosity = 0; /* no verbosity by default */ - int recverrok = 0; /* ok to proceed after socket receive errors */ --int posting = 0; /* GET by default */ -+enum {NO_METH = 0, GET, HEAD, PUT, POST, CUSTOM_METHOD} method = NO_METH; -+const char *method_str[] = {"bug", "GET", "HEAD", "PUT", "POST", ""}; -+int send_body = 0; /* non-zero if sending body with request */ - int requests = 1; /* Number of requests to make */ - int heartbeatres = 100; /* How often do we say we're alive */ - int concurrency = 1; /* Number of multiple requests to make */ - int percentile = 1; /* Show percentile served */ -+int nolength = 0; /* Accept variable document length */ - int confidence = 1; /* Show confidence estimator and warnings */ - int tlimit = 0; /* time limit in secs */ - int keepalive = 0; /* try and do keepalive connections */ - int windowsize = 0; /* we use the OS default window size */ - char servername[1024]; /* name that server reports */ - char *hostname; /* host name from URL */ --char *host_field; /* value of "Host:" header field */ --char *path; /* path name */ --char postfile[1024]; /* name of file containing post data */ -+const char *host_field; /* value of "Host:" header field */ -+const char *path; /* path name */ - char *postdata; /* *buffer containing data from postfile */ - apr_size_t postlen = 0; /* length of data to be POSTed */ --char content_type[1024];/* content type to put in POST header */ --char *cookie, /* optional cookie line */ -- *auth, /* optional (basic/uuencoded) auhentication */ -- *hdrs; /* optional arbitrary headers */ -+char *content_type = NULL; /* content type to put in POST header */ -+const char *cookie, /* optional cookie line */ -+ *auth, /* optional (basic/uuencoded) auhentication */ -+ *hdrs; /* optional arbitrary headers */ - apr_port_t port; /* port number */ --char proxyhost[1024]; /* proxy host name */ -+char *proxyhost = NULL; /* proxy host name */ - int proxyport = 0; /* proxy port */ --char *connecthost; -+const char *connecthost; -+const char *myhost; - apr_port_t connectport; --char *gnuplot; /* GNUplot file */ --char *csvperc; /* CSV Percentile file */ --char url[1024]; --char * fullurl, * colonhost; -+const char *gnuplot; /* GNUplot file */ -+const char *csvperc; /* CSV Percentile file */ -+const char *fullurl; -+const char *colonhost; - int isproxy = 0; - apr_interval_time_t aprtimeout = apr_time_from_sec(30); /* timeout value */ - -@@ -356,7 +348,7 @@ BIO *bio_out,*bio_err; - apr_time_t start, lasttime, stoptime; - - /* global request (and its length) */ --char _request[2048]; -+char _request[8192]; - char *request = _request; - apr_size_t reqlen; - -@@ -372,6 +364,7 @@ apr_pool_t *cntxt; - - apr_pollset_t *readbits; - -+apr_sockaddr_t *mysa; - apr_sockaddr_t *destsa; - - #ifdef NOT_ASCII -@@ -385,7 +378,7 @@ static void close_connection(struct conn - - /* simple little function to write an error string and exit */ - --static void err(char *s) -+static void err(const char *s) - { - fprintf(stderr, "%s\n", s); - if (done) -@@ -395,7 +388,7 @@ static void err(char *s) - - /* simple little function to write an APR error string and exit */ - --static void apr_err(char *s, apr_status_t rv) -+static void apr_err(const char *s, apr_status_t rv) - { - char buf[120]; - -@@ -407,6 +400,87 @@ static void apr_err(char *s, apr_status_ - exit(rv); - } - -+static void *xmalloc(size_t size) -+{ -+ void *ret = malloc(size); -+ if (ret == NULL) { -+ fprintf(stderr, "Could not allocate memory (%" -+ APR_SIZE_T_FMT" bytes)\n", size); -+ exit(1); -+ } -+ return ret; -+} -+ -+static void *xcalloc(size_t num, size_t size) -+{ -+ void *ret = calloc(num, size); -+ if (ret == NULL) { -+ fprintf(stderr, "Could not allocate memory (%" -+ APR_SIZE_T_FMT" bytes)\n", size*num); -+ exit(1); -+ } -+ return ret; -+} -+ -+static char *xstrdup(const char *s) -+{ -+ char *ret = strdup(s); -+ if (ret == NULL) { -+ fprintf(stderr, "Could not allocate memory (%" -+ APR_SIZE_T_FMT " bytes)\n", strlen(s)); -+ exit(1); -+ } -+ return ret; -+} -+ -+/* pool abort function */ -+static int abort_on_oom(int retcode) -+{ -+ fprintf(stderr, "Could not allocate memory\n"); -+ exit(1); -+ /* not reached */ -+ return retcode; -+} -+ -+static void set_polled_events(struct connection *c, apr_int16_t new_reqevents) -+{ -+ apr_status_t rv; -+ -+ if (c->pollfd.reqevents != new_reqevents) { -+ if (c->pollfd.reqevents != 0) { -+ rv = apr_pollset_remove(readbits, &c->pollfd); -+ if (rv != APR_SUCCESS) { -+ apr_err("apr_pollset_remove()", rv); -+ } -+ } -+ -+ if (new_reqevents != 0) { -+ c->pollfd.reqevents = new_reqevents; -+ rv = apr_pollset_add(readbits, &c->pollfd); -+ if (rv != APR_SUCCESS) { -+ apr_err("apr_pollset_add()", rv); -+ } -+ } -+ } -+} -+ -+static void set_conn_state(struct connection *c, connect_state_e new_state) -+{ -+ apr_int16_t events_by_state[] = { -+ 0, /* for STATE_UNCONNECTED */ -+ APR_POLLOUT, /* for STATE_CONNECTING */ -+ APR_POLLIN, /* for STATE_CONNECTED; we don't poll in this state, -+ * so prepare for polling in the following state -- -+ * STATE_READ -+ */ -+ APR_POLLIN /* for STATE_READ */ -+ }; -+ -+ c->state = new_state; -+ -+ set_polled_events(c, events_by_state[new_state]); -+} -+ - /* --------------------------------------------------------- */ - /* write out request to a connection - assumes we can write - * (small) request out in one go into our new socket buffer -@@ -472,7 +546,6 @@ static int ssl_rand_choosenum(int l, int - - static void ssl_rand_seed(void) - { -- int nDone = 0; - int n, l; - time_t t; - pid_t pid; -@@ -484,7 +557,6 @@ static void ssl_rand_seed(void) - t = time(NULL); - l = sizeof(time_t); - RAND_seed((unsigned char *)&t, l); -- nDone += l; - - /* - * seed in the current process id (usually just 4 bytes) -@@ -492,14 +564,12 @@ static void ssl_rand_seed(void) - pid = getpid(); - l = sizeof(pid_t); - RAND_seed((unsigned char *)&pid, l); -- nDone += l; - - /* - * seed in some current state of the run-time stack (128 bytes) - */ - n = ssl_rand_choosenum(0, sizeof(stackdata)-128-1); - RAND_seed(stackdata+n, 128); -- nDone += 128; - } - - static int ssl_print_connection_info(BIO *bio, SSL *ssl) -@@ -522,6 +592,7 @@ static int ssl_print_connection_info(BIO - static void ssl_print_cert_info(BIO *bio, X509 *cert) - { - X509_NAME *dn; -+ EVP_PKEY *pk; - char buf[1024]; - - BIO_printf(bio, "Certificate version: %ld\n", X509_get_version(cert)+1); -@@ -533,8 +604,10 @@ static void ssl_print_cert_info(BIO *bio - ASN1_UTCTIME_print(bio, X509_get_notAfter(cert)); - BIO_printf(bio,"\n"); - -+ pk = X509_get_pubkey(cert); - BIO_printf(bio,"Public key is %d bits\n", -- EVP_PKEY_bits(X509_get_pubkey(cert))); -+ EVP_PKEY_bits(pk)); -+ EVP_PKEY_free(pk); - - dn = X509_get_issuer_name(cert); - X509_NAME_oneline(dn, buf, sizeof(buf)); -@@ -561,7 +634,6 @@ static void ssl_print_info(struct connec - for (i=1; i<count; i++) { - cert = (X509 *)SK_VALUE(sk, i); - ssl_print_cert_info(bio_out, cert); -- X509_free(cert); - } - } - cert = SSL_get_peer_certificate(c->ssl); -@@ -582,7 +654,6 @@ static void ssl_proceed_handshake(struct - - while (do_next) { - int ret, ecode; -- apr_pollfd_t new_pollfd; - - ret = SSL_do_handshake(c->ssl); - ecode = SSL_get_error(c->ssl, ret); -@@ -604,7 +675,7 @@ static void ssl_proceed_handshake(struct - else - pk_bits = 0; /* Anon DH */ - -- ssl_info = malloc(128); -+ ssl_info = xmalloc(128); - apr_snprintf(ssl_info, 128, "%s,%s,%d,%d", - SSL_get_version(c->ssl), - SSL_CIPHER_get_name(ci), -@@ -614,11 +685,7 @@ static void ssl_proceed_handshake(struct - do_next = 0; - break; - case SSL_ERROR_WANT_READ: -- new_pollfd.desc_type = APR_POLL_SOCKET; -- new_pollfd.reqevents = APR_POLLIN; -- new_pollfd.desc.s = c->aprsock; -- new_pollfd.client_data = c; -- apr_pollset_add(readbits, &new_pollfd); -+ set_polled_events(c, APR_POLLIN); - do_next = 0; - break; - case SSL_ERROR_WANT_WRITE: -@@ -642,6 +709,10 @@ static void ssl_proceed_handshake(struct - - static void write_request(struct connection * c) - { -+ if (started >= requests) { -+ return; -+ } -+ - do { - apr_time_t tnow; - apr_size_t l = c->rwrite; -@@ -657,7 +728,7 @@ static void write_request(struct connect - c->connect = tnow; - c->rwrote = 0; - c->rwrite = reqlen; -- if (posting) -+ if (send_body) - c->rwrite += postlen; - } - else if (tnow > c->connect + aprtimeout) { -@@ -694,16 +765,9 @@ static void write_request(struct connect - c->rwrite -= l; - } while (c->rwrite); - -- c->state = STATE_READ; - c->endwrite = lasttime = apr_time_now(); -- { -- apr_pollfd_t new_pollfd; -- new_pollfd.desc_type = APR_POLL_SOCKET; -- new_pollfd.reqevents = APR_POLLIN; -- new_pollfd.desc.s = c->aprsock; -- new_pollfd.client_data = c; -- apr_pollset_add(readbits, &new_pollfd); -- } -+ started++; -+ set_conn_state(c, STATE_READ); - } - - /* --------------------------------------------------------- */ -@@ -768,7 +832,10 @@ static void output_results(int sig) - #endif - printf("\n"); - printf("Document Path: %s\n", path); -- printf("Document Length: %" APR_SIZE_T_FMT " bytes\n", doclen); -+ if (nolength) -+ printf("Document Length: Variable\n"); -+ else -+ printf("Document Length: %" APR_SIZE_T_FMT " bytes\n", doclen); - printf("\n"); - printf("Concurrency Level: %d\n", concurrency); - printf("Time taken for tests: %.3f seconds\n", timetaken); -@@ -777,16 +844,16 @@ static void output_results(int sig) - if (bad) - printf(" (Connect: %d, Receive: %d, Length: %d, Exceptions: %d)\n", - err_conn, err_recv, err_length, err_except); -- printf("Write errors: %d\n", epipe); -+ if (epipe) -+ printf("Write errors: %d\n", epipe); - if (err_response) - printf("Non-2xx responses: %d\n", err_response); - if (keepalive) - printf("Keep-Alive requests: %d\n", doneka); - printf("Total transferred: %" APR_INT64_T_FMT " bytes\n", totalread); -- if (posting == 1) -- printf("Total POSTed: %" APR_INT64_T_FMT "\n", totalposted); -- if (posting == 2) -- printf("Total PUT: %" APR_INT64_T_FMT "\n", totalposted); -+ if (send_body) -+ printf("Total body sent: %" APR_INT64_T_FMT "\n", -+ totalposted); - printf("HTML transferred: %" APR_INT64_T_FMT " bytes\n", totalbread); - - /* avoid divide by zero */ -@@ -799,11 +866,11 @@ static void output_results(int sig) - (double) timetaken * 1000 / done); - printf("Transfer rate: %.2f [Kbytes/sec] received\n", - (double) totalread / 1024 / timetaken); -- if (posting > 0) { -+ if (send_body) { - printf(" %.2f kb/s sent\n", -- (double) totalposted / timetaken / 1024); -+ (double) totalposted / 1024 / timetaken); - printf(" %.2f kb/s total\n", -- (double) (totalread + totalposted) / timetaken / 1024); -+ (double) (totalread + totalposted) / 1024 / timetaken); - } - } - -@@ -951,9 +1018,8 @@ static void output_results(int sig) - printf(" min avg max\n"); - #define CONF_FMT_STRING "%5" APR_TIME_T_FMT " %5" APR_TIME_T_FMT "%5" APR_TIME_T_FMT "\n" - printf("Connect: " CONF_FMT_STRING, mincon, meancon, maxcon); -- printf("Processing: " CONF_FMT_STRING, mintot - mincon, -- meantot - meancon, -- maxtot - maxcon); -+ printf("Processing: " CONF_FMT_STRING, mind, meand, maxd); -+ printf("Waiting: " CONF_FMT_STRING, minwait, meanwait, maxwait); - printf("Total: " CONF_FMT_STRING, mintot, meantot, maxtot); - #undef CONF_FMT_STRING - } -@@ -980,7 +1046,7 @@ static void output_results(int sig) - exit(1); - } - fprintf(out, "" "Percentage served" "," "Time in ms" "\n"); -- for (i = 0; i < 100; i++) { -+ for (i = 0; i <= 100; i++) { - double t; - if (i == 0) - t = ap_double_ms(stats[0].time); -@@ -1041,9 +1107,14 @@ static void output_html_results(void) - printf("<tr %s><th colspan=2 %s>Document Path:</th>" - "<td colspan=2 %s>%s</td></tr>\n", - trstring, tdstring, tdstring, path); -- printf("<tr %s><th colspan=2 %s>Document Length:</th>" -- "<td colspan=2 %s>%" APR_SIZE_T_FMT " bytes</td></tr>\n", -- trstring, tdstring, tdstring, doclen); -+ if (nolength) -+ printf("<tr %s><th colspan=2 %s>Document Length:</th>" -+ "<td colspan=2 %s>Variable</td></tr>\n", -+ trstring, tdstring, tdstring); -+ else -+ printf("<tr %s><th colspan=2 %s>Document Length:</th>" -+ "<td colspan=2 %s>%" APR_SIZE_T_FMT " bytes</td></tr>\n", -+ trstring, tdstring, tdstring, doclen); - printf("<tr %s><th colspan=2 %s>Concurrency Level:</th>" - "<td colspan=2 %s>%d</td></tr>\n", - trstring, tdstring, tdstring, concurrency); -@@ -1070,14 +1141,11 @@ static void output_html_results(void) - printf("<tr %s><th colspan=2 %s>Total transferred:</th>" - "<td colspan=2 %s>%" APR_INT64_T_FMT " bytes</td></tr>\n", - trstring, tdstring, tdstring, totalread); -- if (posting == 1) -- printf("<tr %s><th colspan=2 %s>Total POSTed:</th>" -- "<td colspan=2 %s>%" APR_INT64_T_FMT "</td></tr>\n", -- trstring, tdstring, tdstring, totalposted); -- if (posting == 2) -- printf("<tr %s><th colspan=2 %s>Total PUT:</th>" -+ if (send_body) -+ printf("<tr %s><th colspan=2 %s>Total body sent:</th>" - "<td colspan=2 %s>%" APR_INT64_T_FMT "</td></tr>\n", -- trstring, tdstring, tdstring, totalposted); -+ trstring, tdstring, -+ tdstring, totalposted); - printf("<tr %s><th colspan=2 %s>HTML transferred:</th>" - "<td colspan=2 %s>%" APR_INT64_T_FMT " bytes</td></tr>\n", - trstring, tdstring, tdstring, totalbread); -@@ -1086,19 +1154,19 @@ static void output_html_results(void) - if (timetaken) { - printf("<tr %s><th colspan=2 %s>Requests per second:</th>" - "<td colspan=2 %s>%.2f</td></tr>\n", -- trstring, tdstring, tdstring, (double) done * 1000 / timetaken); -+ trstring, tdstring, tdstring, (double) done / timetaken); - printf("<tr %s><th colspan=2 %s>Transfer rate:</th>" - "<td colspan=2 %s>%.2f kb/s received</td></tr>\n", -- trstring, tdstring, tdstring, (double) totalread / timetaken); -- if (posting > 0) { -+ trstring, tdstring, tdstring, (double) totalread / 1024 / timetaken); -+ if (send_body) { - printf("<tr %s><td colspan=2 %s> </td>" - "<td colspan=2 %s>%.2f kb/s sent</td></tr>\n", - trstring, tdstring, tdstring, -- (double) totalposted / timetaken); -+ (double) totalposted / 1024 / timetaken); - printf("<tr %s><td colspan=2 %s> </td>" - "<td colspan=2 %s>%.2f kb/s total</td></tr>\n", - trstring, tdstring, tdstring, -- (double) (totalread + totalposted) / timetaken); -+ (double) (totalread + totalposted) / 1024 / timetaken); - } - } - { -@@ -1162,7 +1230,7 @@ static void start_connect(struct connect - apr_status_t rv; - - if (!(started < requests)) -- return; -+ return; - - c->read = 0; - c->bread = 0; -@@ -1179,18 +1247,30 @@ static void start_connect(struct connect - SOCK_STREAM, 0, c->ctx)) != APR_SUCCESS) { - apr_err("socket", rv); - } -+ -+ if (myhost) { -+ if ((rv = apr_socket_bind(c->aprsock, mysa)) != APR_SUCCESS) { -+ apr_err("bind", rv); -+ } -+ } -+ -+ c->pollfd.desc_type = APR_POLL_SOCKET; -+ c->pollfd.desc.s = c->aprsock; -+ c->pollfd.reqevents = 0; -+ c->pollfd.client_data = c; -+ - if ((rv = apr_socket_opt_set(c->aprsock, APR_SO_NONBLOCK, 1)) - != APR_SUCCESS) { - apr_err("socket nonblock", rv); - } - - if (windowsize != 0) { -- rv = apr_socket_opt_set(c->aprsock, APR_SO_SNDBUF, -+ rv = apr_socket_opt_set(c->aprsock, APR_SO_SNDBUF, - windowsize); - if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) { - apr_err("socket send buffer", rv); - } -- rv = apr_socket_opt_set(c->aprsock, APR_SO_RCVBUF, -+ rv = apr_socket_opt_set(c->aprsock, APR_SO_RCVBUF, - windowsize); - if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) { - apr_err("socket receive buffer", rv); -@@ -1223,21 +1303,12 @@ static void start_connect(struct connect - #endif - if ((rv = apr_socket_connect(c->aprsock, destsa)) != APR_SUCCESS) { - if (APR_STATUS_IS_EINPROGRESS(rv)) { -- apr_pollfd_t new_pollfd; -- c->state = STATE_CONNECTING; -+ set_conn_state(c, STATE_CONNECTING); - c->rwrite = 0; -- new_pollfd.desc_type = APR_POLL_SOCKET; -- new_pollfd.reqevents = APR_POLLOUT; -- new_pollfd.desc.s = c->aprsock; -- new_pollfd.client_data = c; -- apr_pollset_add(readbits, &new_pollfd); - return; - } - else { -- apr_pollfd_t remove_pollfd; -- remove_pollfd.desc_type = APR_POLL_SOCKET; -- remove_pollfd.desc.s = c->aprsock; -- apr_pollset_remove(readbits, &remove_pollfd); -+ set_conn_state(c, STATE_UNCONNECTED); - apr_socket_close(c->aprsock); - err_conn++; - if (bad++ > 10) { -@@ -1245,15 +1316,14 @@ static void start_connect(struct connect - "\nTest aborted after 10 failures\n\n"); - apr_err("apr_socket_connect()", rv); - } -- c->state = STATE_UNCONNECTED; -+ - start_connect(c); - return; - } - } - - /* connected first time */ -- c->state = STATE_CONNECTED; -- started++; -+ set_conn_state(c, STATE_CONNECTED); - #ifdef USE_SSL - if (c->ssl) { - ssl_proceed_handshake(c); -@@ -1282,7 +1352,7 @@ static void close_connection(struct conn - /* first time here */ - doclen = c->bread; - } -- else if (c->bread != doclen) { -+ else if ((c->bread != doclen) && !nolength) { - bad++; - err_length++; - } -@@ -1301,21 +1371,15 @@ static void close_connection(struct conn - } - } - -- { -- apr_pollfd_t remove_pollfd; -- remove_pollfd.desc_type = APR_POLL_SOCKET; -- remove_pollfd.desc.s = c->aprsock; -- apr_pollset_remove(readbits, &remove_pollfd); -+ set_conn_state(c, STATE_UNCONNECTED); - #ifdef USE_SSL -- if (c->ssl) { -- SSL_shutdown(c->ssl); -- SSL_free(c->ssl); -- c->ssl = NULL; -- } --#endif -- apr_socket_close(c->aprsock); -+ if (c->ssl) { -+ SSL_shutdown(c->ssl); -+ SSL_free(c->ssl); -+ c->ssl = NULL; - } -- c->state = STATE_UNCONNECTED; -+#endif -+ apr_socket_close(c->aprsock); - - /* connect again */ - start_connect(c); -@@ -1345,11 +1409,21 @@ static void read_connection(struct conne - good++; - close_connection(c); - } -+ else if (scode == SSL_ERROR_SYSCALL -+ && status == 0 -+ && c->read != 0) { -+ /* connection closed, but in violation of the protocol, after -+ * some data has already been read; this commonly happens, so -+ * let the length check catch any response errors -+ */ -+ good++; -+ close_connection(c); -+ } - else if (scode != SSL_ERROR_WANT_WRITE - && scode != SSL_ERROR_WANT_READ) { - /* some fatal error: */ - c->read = 0; -- BIO_printf(bio_err, "SSL read failed - closing connection\n"); -+ BIO_printf(bio_err, "SSL read failed (%d) - closing connection\n", scode); - ERR_print_errors(bio_err); - close_connection(c); - } -@@ -1433,10 +1507,7 @@ static void read_connection(struct conne - } - else { - /* header is in invalid or too big - close connection */ -- apr_pollfd_t remove_pollfd; -- remove_pollfd.desc_type = APR_POLL_SOCKET; -- remove_pollfd.desc.s = c->aprsock; -- apr_pollset_remove(readbits, &remove_pollfd); -+ set_conn_state(c, STATE_UNCONNECTED); - apr_socket_close(c->aprsock); - err_response++; - if (bad++ > 10) { -@@ -1452,12 +1523,14 @@ static void read_connection(struct conne - * this is first time, extract some interesting info - */ - char *p, *q; -+ size_t len = 0; - p = strstr(c->cbuff, "Server:"); - q = servername; - if (p) { - p += 8; -- while (*p > 32) -- *q++ = *p++; -+ /* -1 to not overwrite last '\0' byte */ -+ while (*p > 32 && len++ < sizeof(servername) - 1) -+ *q++ = *p++; - } - *q = 0; - } -@@ -1499,12 +1572,12 @@ static void read_connection(struct conne - if (cl) { - c->keepalive = 1; - /* response to HEAD doesn't have entity body */ -- c->length = posting >= 0 ? atoi(cl + 16) : 0; -+ c->length = method != HEAD ? atoi(cl + 16) : 0; - } - /* The response may not have a Content-Length header */ - if (!cl) { - c->keepalive = 1; -- c->length = 0; -+ c->length = 0; - } - } - c->bread += c->cbx - (s + l - c->cbuff) + r - tocopy; -@@ -1525,7 +1598,7 @@ static void read_connection(struct conne - /* first time here */ - doclen = c->bread; - } -- else if (c->bread != doclen) { -+ else if ((c->bread != doclen) && !nolength) { - bad++; - err_length++; - } -@@ -1560,7 +1633,8 @@ static void read_connection(struct conne - static void test(void) - { - apr_time_t stoptime; -- apr_int16_t rv; -+ apr_int16_t rtnev; -+ apr_status_t rv; - int i; - apr_status_t status; - int snprintf_res = 0; -@@ -1586,11 +1660,16 @@ static void test(void) - fflush(stdout); - } - -- con = calloc(concurrency, sizeof(struct connection)); -+ con = xcalloc(concurrency, sizeof(struct connection)); - -- stats = calloc(requests, sizeof(struct data)); -+ /* -+ * XXX: a way to calculate the stats without requiring O(requests) memory -+ * XXX: would be nice. -+ */ -+ stats = xcalloc(requests, sizeof(struct data)); - -- if ((status = apr_pollset_create(&readbits, concurrency, cntxt, 0)) != APR_SUCCESS) { -+ if ((status = apr_pollset_create(&readbits, concurrency, cntxt, -+ APR_POLLSET_NOCOPY)) != APR_SUCCESS) { - apr_err("apr_pollset_create failed", status); - } - -@@ -1620,12 +1699,12 @@ static void test(void) - } - - /* setup request */ -- if (posting <= 0) { -+ if (!send_body) { - snprintf_res = apr_snprintf(request, sizeof(_request), - "%s %s HTTP/1.0\r\n" - "%s" "%s" "%s" - "%s" "\r\n", -- (posting == 0) ? "GET" : "HEAD", -+ method_str[method], - (isproxy) ? fullurl : path, - keepalive ? "Connection: Keep-Alive\r\n" : "", - cookie, auth, hdrs); -@@ -1638,32 +1717,28 @@ static void test(void) - "Content-type: %s\r\n" - "%s" - "\r\n", -- (posting == 1) ? "POST" : "PUT", -+ method_str[method], - (isproxy) ? fullurl : path, - keepalive ? "Connection: Keep-Alive\r\n" : "", - cookie, auth, - postlen, -- (content_type[0]) ? content_type : "text/plain", hdrs); -+ (content_type != NULL) ? content_type : "text/plain", hdrs); - } - if (snprintf_res >= sizeof(_request)) { - err("Request too long\n"); - } - - if (verbosity >= 2) -- printf("INFO: %s header == \n---\n%s\n---\n", -- (posting == 2) ? "PUT" : "POST", request); -+ printf("INFO: %s header == \n---\n%s\n---\n", -+ method_str[method], request); - - reqlen = strlen(request); - - /* -- * Combine headers and (optional) post file into one contineous buffer -+ * Combine headers and (optional) post file into one continuous buffer - */ -- if (posting >= 1) { -- char *buff = malloc(postlen + reqlen + 1); -- if (!buff) { -- fprintf(stderr, "error creating request buffer: out of memory\n"); -- return; -- } -+ if (send_body) { -+ char *buff = xmalloc(postlen + reqlen + 1); - strcpy(buff, request); - memcpy(buff + reqlen, postdata, postlen); - request = buff; -@@ -1681,8 +1756,20 @@ static void test(void) - } - #endif /* NOT_ASCII */ - -- /* This only needs to be done once */ -- if ((rv = apr_sockaddr_info_get(&destsa, connecthost, APR_UNSPEC, connectport, 0, cntxt)) -+ if (myhost) { -+ /* This only needs to be done once */ -+ if ((rv = apr_sockaddr_info_get(&mysa, myhost, APR_UNSPEC, 0, 0, cntxt)) != APR_SUCCESS) { -+ char buf[120]; -+ apr_snprintf(buf, sizeof(buf), -+ "apr_sockaddr_info_get() for %s", myhost); -+ apr_err(buf, rv); -+ } -+ } -+ -+ /* This too */ -+ if ((rv = apr_sockaddr_info_get(&destsa, connecthost, -+ myhost ? mysa->family : APR_UNSPEC, -+ connectport, 0, cntxt)) - != APR_SUCCESS) { - char buf[120]; - apr_snprintf(buf, sizeof(buf), -@@ -1694,7 +1781,7 @@ static void test(void) - start = lasttime = apr_time_now(); - stoptime = tlimit ? (start + apr_time_from_sec(tlimit)) : AB_MAX; - --#ifdef SIGINT -+#ifdef SIGINT - /* Output the results if the user terminates the run early. */ - apr_signal(SIGINT, output_results); - #endif -@@ -1707,24 +1794,19 @@ static void test(void) - - do { - apr_int32_t n; -- const apr_pollfd_t *pollresults; -+ const apr_pollfd_t *pollresults, *pollfd; - - n = concurrency; - do { -- status = apr_pollset_poll(readbits, aprtimeout, &n, &pollresults); -+ status = apr_pollset_poll(readbits, aprtimeout, &n, &pollresults); - } while (APR_STATUS_IS_EINTR(status)); - if (status != APR_SUCCESS) -- apr_err("apr_poll", status); -- -- if (!n) { -- err("\nServer timed out\n\n"); -- } -+ apr_err("apr_pollset_poll", status); - -- for (i = 0; i < n; i++) { -- const apr_pollfd_t *next_fd = &(pollresults[i]); -+ for (i = 0, pollfd = pollresults; i < n; i++, pollfd++) { - struct connection *c; - -- c = next_fd->client_data; -+ c = pollfd->client_data; - - /* - * If the connection isn't connected how can we check it? -@@ -1732,7 +1814,7 @@ static void test(void) - if (c->state == STATE_UNCONNECTED) - continue; - -- rv = next_fd->rtnevents; -+ rtnev = pollfd->rtnevents; - - #ifdef USE_SSL - if (c->state == STATE_CONNECTED && c->ssl && SSL_in_init(c->ssl)) { -@@ -1753,22 +1835,25 @@ static void test(void) - * connection is done and we loop here endlessly calling - * apr_poll(). - */ -- if ((rv & APR_POLLIN) || (rv & APR_POLLPRI) || (rv & APR_POLLHUP)) -+ if ((rtnev & APR_POLLIN) || (rtnev & APR_POLLPRI) || (rtnev & APR_POLLHUP)) - read_connection(c); -- if ((rv & APR_POLLERR) || (rv & APR_POLLNVAL)) { -+ if ((rtnev & APR_POLLERR) || (rtnev & APR_POLLNVAL)) { - bad++; - err_except++; -- start_connect(c); -+ /* avoid apr_poll/EINPROGRESS loop on HP-UX, let recv discover ECONNREFUSED */ -+ if (c->state == STATE_CONNECTING) { -+ read_connection(c); -+ } -+ else { -+ start_connect(c); -+ } - continue; - } -- if (rv & APR_POLLOUT) { -+ if (rtnev & APR_POLLOUT) { - if (c->state == STATE_CONNECTING) { -- apr_pollfd_t remove_pollfd; - rv = apr_socket_connect(c->aprsock, destsa); -- remove_pollfd.desc_type = APR_POLL_SOCKET; -- remove_pollfd.desc.s = c->aprsock; -- apr_pollset_remove(readbits, &remove_pollfd); - if (rv != APR_SUCCESS) { -+ set_conn_state(c, STATE_UNCONNECTED); - apr_socket_close(c->aprsock); - err_conn++; - if (bad++ > 10) { -@@ -1776,13 +1861,11 @@ static void test(void) - "\nTest aborted after 10 failures\n\n"); - apr_err("apr_socket_connect()", rv); - } -- c->state = STATE_UNCONNECTED; - start_connect(c); - continue; - } - else { -- c->state = STATE_CONNECTED; -- started++; -+ set_conn_state(c, STATE_CONNECTED); - #ifdef USE_SSL - if (c->ssl) - ssl_proceed_handshake(c); -@@ -1795,25 +1878,9 @@ static void test(void) - write_request(c); - } - } -- -- /* -- * When using a select based poll every time we check the bits -- * are reset. In 1.3's ab we copied the FD_SET's each time -- * through, but here we're going to check the state and if the -- * connection is in STATE_READ or STATE_CONNECTING we'll add the -- * socket back in as APR_POLLIN. -- */ -- if (c->state == STATE_READ) { -- apr_pollfd_t new_pollfd; -- new_pollfd.desc_type = APR_POLL_SOCKET; -- new_pollfd.reqevents = APR_POLLIN; -- new_pollfd.desc.s = c->aprsock; -- new_pollfd.client_data = c; -- apr_pollset_add(readbits, &new_pollfd); -- } - } - } while (lasttime < stoptime && done < requests); -- -+ - if (heartbeatres) - fprintf(stderr, "Finished %d requests\n", done); - else -@@ -1831,14 +1898,14 @@ static void test(void) - static void copyright(void) - { - if (!use_html) { -- printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 655654 $>"); -+ printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1706008 $>"); - printf("Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n"); - printf("Licensed to The Apache Software Foundation, http://www.apache.org/\n"); - printf("\n"); - } - else { - printf("<p>\n"); -- printf(" This is ApacheBench, Version %s <i><%s></i><br>\n", AP_AB_BASEREVISION, "$Revision: 655654 $"); -+ printf(" This is ApacheBench, Version %s <i><%s></i><br>\n", AP_AB_BASEREVISION, "$Revision: 1706008 $"); - printf(" Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n"); - printf(" Licensed to The Apache Software Foundation, http://www.apache.org/<br>\n"); - printf("</p>\n<p>\n"); -@@ -1857,12 +1924,16 @@ static void usage(const char *progname) - */ - fprintf(stderr, "Options are:\n"); - fprintf(stderr, " -n requests Number of requests to perform\n"); -- fprintf(stderr, " -c concurrency Number of multiple requests to make\n"); -- fprintf(stderr, " -t timelimit Seconds to max. wait for responses\n"); -+ fprintf(stderr, " -c concurrency Number of multiple requests to make at a time\n"); -+ fprintf(stderr, " -t timelimit Seconds to max. to spend on benchmarking\n"); -+ fprintf(stderr, " This implies -n 50000\n"); -+ fprintf(stderr, " -s timeout Seconds to max. wait for each response\n"); -+ fprintf(stderr, " Default is 30 seconds\n"); - fprintf(stderr, " -b windowsize Size of TCP send/receive buffer, in bytes\n"); -+ fprintf(stderr, " -B address Address to bind to when making outgoing connections\n"); - fprintf(stderr, " -p postfile File containing data to POST. Remember also to set -T\n"); - fprintf(stderr, " -u putfile File containing data to PUT. Remember also to set -T\n"); -- fprintf(stderr, " -T content-type Content-type header for POSTing, eg.\n"); -+ fprintf(stderr, " -T content-type Content-type header to use for POST/PUT data, eg.\n"); - fprintf(stderr, " 'application/x-www-form-urlencoded'\n"); - fprintf(stderr, " Default is 'text/plain'\n"); - fprintf(stderr, " -v verbosity How much troubleshooting info to print\n"); -@@ -1871,7 +1942,7 @@ static void usage(const char *progname) - fprintf(stderr, " -x attributes String to insert as table attributes\n"); - fprintf(stderr, " -y attributes String to insert as tr attributes\n"); - fprintf(stderr, " -z attributes String to insert as td or th attributes\n"); -- fprintf(stderr, " -C attribute Add cookie, eg. 'Apache=1234. (repeatable)\n"); -+ fprintf(stderr, " -C attribute Add cookie, eg. 'Apache=1234'. (repeatable)\n"); - fprintf(stderr, " -H attribute Add Arbitrary header line, eg. 'Accept-Encoding: gzip'\n"); - fprintf(stderr, " Inserted after all normal header lines. (repeatable)\n"); - fprintf(stderr, " -A attribute Add Basic WWW Authentication, the attributes\n"); -@@ -1883,9 +1954,12 @@ static void usage(const char *progname) - fprintf(stderr, " -k Use HTTP KeepAlive feature\n"); - fprintf(stderr, " -d Do not show percentiles served table.\n"); - fprintf(stderr, " -S Do not show confidence estimators and warnings.\n"); -+ fprintf(stderr, " -q Do not show progress when doing more than 150 requests\n"); -+ fprintf(stderr, " -l Accept variable document length (use this for dynamic pages)\n"); - fprintf(stderr, " -g filename Output collected data to gnuplot format file.\n"); - fprintf(stderr, " -e filename Output CSV file with percentages served\n"); - fprintf(stderr, " -r Don't exit on socket receive errors.\n"); -+ fprintf(stderr, " -m method Method name\n"); - fprintf(stderr, " -h Display usage information (this message)\n"); - #ifdef USE_SSL - -@@ -1901,6 +1975,12 @@ static void usage(const char *progname) - #define SSL3_HELP_MSG "" - #endif - -+#ifndef OPENSSL_NO_SSL3 -+#define SSL3_HELP_MSG "SSL3, " -+#else -+#define SSL3_HELP_MSG "" -+#endif -+ - #ifdef HAVE_TLSV1_X - #define TLS1_X_HELP_MSG ", TLS1.1, TLS1.2" - #else -@@ -1918,7 +1998,7 @@ static void usage(const char *progname) - - /* split URL into parts */ - --static int parse_url(char *url) -+static int parse_url(const char *url) - { - char *cp; - char *h; -@@ -1949,9 +2029,7 @@ static int parse_url(char *url) - - if ((cp = strchr(url, '/')) == NULL) - return 1; -- h = apr_palloc(cntxt, cp - url + 1); -- memcpy(h, url, cp - url); -- h[cp - url] = '\0'; -+ h = apr_pstrmemdup(cntxt, url, cp - url); - rv = apr_parse_addr_port(&hostname, &scope_id, &port, h, cntxt); - if (rv != APR_SUCCESS || !hostname || scope_id) { - return 1; -@@ -1988,9 +2066,9 @@ static int parse_url(char *url) - - /* ------------------------------------------------------- */ - --/* read data to POST from file, save contents and length */ -+/* read data to POST/PUT from file, save contents and length */ - --static int open_postfile(const char *pfile) -+static apr_status_t open_postfile(const char *pfile) - { - apr_file_t *postfd; - apr_finfo_t finfo; -@@ -2011,11 +2089,7 @@ static int open_postfile(const char *pfi - return rv; - } - postlen = (apr_size_t)finfo.size; -- postdata = malloc(postlen); -- if (!postdata) { -- fprintf(stderr, "ab: Could not allocate POST data buffer\n"); -- return APR_ENOMEM; -- } -+ postdata = xmalloc(postlen); - rv = apr_file_read_full(postfd, postdata, postlen, NULL); - if (rv != APR_SUCCESS) { - fprintf(stderr, "ab: Could not read POST data file: %s\n", -@@ -2023,7 +2097,7 @@ static int open_postfile(const char *pfi - return rv; - } - apr_file_close(postfd); -- return 0; -+ return APR_SUCCESS; - } - - /* ------------------------------------------------------- */ -@@ -2031,11 +2105,11 @@ static int open_postfile(const char *pfi - /* sort out command-line args and call test */ - int main(int argc, const char * const argv[]) - { -- int r, l; -+ int l; - char tmp[1024]; - apr_status_t status; - apr_getopt_t *opt; -- const char *optarg; -+ const char *opt_arg; - char c; - #ifdef USE_SSL - AB_SSL_METHOD_CONST SSL_METHOD *meth = SSLv23_client_method(); -@@ -2047,12 +2121,13 @@ int main(int argc, const char * const ar - tdstring = "bgcolor=white"; - cookie = ""; - auth = ""; -- proxyhost[0] = '\0'; -+ proxyhost = ""; - hdrs = ""; - - apr_app_initialize(&argc, &argv, NULL); - atexit(apr_terminate); - apr_pool_create(&cntxt, NULL); -+ apr_pool_abort_set(abort_on_oom, cntxt); - - #ifdef NOT_ASCII - status = apr_xlate_open(&to_ascii, "ISO-8859-1", APR_DEFAULT_CHARSET, cntxt); -@@ -2072,15 +2147,17 @@ int main(int argc, const char * const ar - } - #endif - -+ myhost = NULL; /* 0.0.0.0 or :: */ -+ - apr_getopt_init(&opt, cntxt, argc, argv); -- while ((status = apr_getopt(opt, "n:c:t:b:T:p:u:v:rkVhwix:y:z:C:H:P:A:g:X:de:Sq" -+ while ((status = apr_getopt(opt, "n:c:t:s:b:T:p:u:v:lrkVhwix:y:z:C:H:P:A:g:X:de:SqB:m:" - #ifdef USE_SSL - "Z:f:" - #endif -- ,&c, &optarg)) == APR_SUCCESS) { -+ ,&c, &opt_arg)) == APR_SUCCESS) { - switch (c) { - case 'n': -- requests = atoi(optarg); -+ requests = atoi(opt_arg); - if (requests <= 0) { - err("Invalid number of requests\n"); - } -@@ -2092,76 +2169,80 @@ int main(int argc, const char * const ar - heartbeatres = 0; - break; - case 'c': -- concurrency = atoi(optarg); -+ concurrency = atoi(opt_arg); - break; - case 'b': -- windowsize = atoi(optarg); -+ windowsize = atoi(opt_arg); - break; - case 'i': -- if (posting > 0) -- err("Cannot mix POST/PUT and HEAD\n"); -- posting = -1; -+ if (method != NO_METH) -+ err("Cannot mix HEAD with other methods\n"); -+ method = HEAD; - break; - case 'g': -- gnuplot = strdup(optarg); -+ gnuplot = xstrdup(opt_arg); - break; - case 'd': - percentile = 0; - break; - case 'e': -- csvperc = strdup(optarg); -+ csvperc = xstrdup(opt_arg); - break; - case 'S': - confidence = 0; - break; -+ case 's': -+ aprtimeout = apr_time_from_sec(atoi(opt_arg)); /* timeout value */ -+ break; - case 'p': -- if (posting != 0) -- err("Cannot mix POST and HEAD\n"); -- if (0 == (r = open_postfile(optarg))) { -- posting = 1; -- } -- else if (postdata) { -- exit(r); -+ if (method != NO_METH) -+ err("Cannot mix POST with other methods\n"); -+ if (open_postfile(opt_arg) != APR_SUCCESS) { -+ exit(1); - } -+ method = POST; -+ send_body = 1; - break; - case 'u': -- if (posting != 0) -- err("Cannot mix PUT and HEAD\n"); -- if (0 == (r = open_postfile(optarg))) { -- posting = 2; -- } -- else if (postdata) { -- exit(r); -+ if (method != NO_METH) -+ err("Cannot mix PUT with other methods\n"); -+ if (open_postfile(opt_arg) != APR_SUCCESS) { -+ exit(1); - } -+ method = PUT; -+ send_body = 1; -+ break; -+ case 'l': -+ nolength = 1; - break; - case 'r': - recverrok = 1; - break; - case 'v': -- verbosity = atoi(optarg); -+ verbosity = atoi(opt_arg); - break; - case 't': -- tlimit = atoi(optarg); -+ tlimit = atoi(opt_arg); - requests = MAX_REQUESTS; /* need to size data array on - * something */ - break; - case 'T': -- strcpy(content_type, optarg); -+ content_type = apr_pstrdup(cntxt, opt_arg); - break; - case 'C': -- cookie = apr_pstrcat(cntxt, "Cookie: ", optarg, "\r\n", NULL); -+ cookie = apr_pstrcat(cntxt, "Cookie: ", opt_arg, "\r\n", NULL); - break; - case 'A': - /* - * assume username passwd already to be in colon separated form. - * Ready to be uu-encoded. - */ -- while (apr_isspace(*optarg)) -- optarg++; -- if (apr_base64_encode_len(strlen(optarg)) > sizeof(tmp)) { -+ while (apr_isspace(*opt_arg)) -+ opt_arg++; -+ if (apr_base64_encode_len(strlen(opt_arg)) > sizeof(tmp)) { - err("Authentication credentials too long\n"); - } -- l = apr_base64_encode(tmp, optarg, strlen(optarg)); -+ l = apr_base64_encode(tmp, opt_arg, strlen(opt_arg)); - tmp[l] = '\0'; - - auth = apr_pstrcat(cntxt, auth, "Authorization: Basic ", tmp, -@@ -2171,27 +2252,27 @@ int main(int argc, const char * const ar - /* - * assume username passwd already to be in colon separated form. - */ -- while (apr_isspace(*optarg)) -- optarg++; -- if (apr_base64_encode_len(strlen(optarg)) > sizeof(tmp)) { -+ while (apr_isspace(*opt_arg)) -+ opt_arg++; -+ if (apr_base64_encode_len(strlen(opt_arg)) > sizeof(tmp)) { - err("Proxy credentials too long\n"); - } -- l = apr_base64_encode(tmp, optarg, strlen(optarg)); -+ l = apr_base64_encode(tmp, opt_arg, strlen(opt_arg)); - tmp[l] = '\0'; - - auth = apr_pstrcat(cntxt, auth, "Proxy-Authorization: Basic ", - tmp, "\r\n", NULL); - break; - case 'H': -- hdrs = apr_pstrcat(cntxt, hdrs, optarg, "\r\n", NULL); -+ hdrs = apr_pstrcat(cntxt, hdrs, opt_arg, "\r\n", NULL); - /* - * allow override of some of the common headers that ab adds - */ -- if (strncasecmp(optarg, "Host:", 5) == 0) { -+ if (strncasecmp(opt_arg, "Host:", 5) == 0) { - opt_host = 1; -- } else if (strncasecmp(optarg, "Accept:", 7) == 0) { -+ } else if (strncasecmp(opt_arg, "Accept:", 7) == 0) { - opt_accept = 1; -- } else if (strncasecmp(optarg, "User-Agent:", 11) == 0) { -+ } else if (strncasecmp(opt_arg, "User-Agent:", 11) == 0) { - opt_useragent = 1; - } - break; -@@ -2204,7 +2285,7 @@ int main(int argc, const char * const ar - */ - case 'x': - use_html = 1; -- tablestring = optarg; -+ tablestring = opt_arg; - break; - case 'X': - { -@@ -2212,22 +2293,22 @@ int main(int argc, const char * const ar - /* - * assume proxy-name[:port] - */ -- if ((p = strchr(optarg, ':'))) { -+ if ((p = strchr(opt_arg, ':'))) { - *p = '\0'; - p++; - proxyport = atoi(p); - } -- strcpy(proxyhost, optarg); -+ proxyhost = apr_pstrdup(cntxt, opt_arg); - isproxy = 1; - } - break; - case 'y': - use_html = 1; -- trstring = optarg; -+ trstring = opt_arg; - break; - case 'z': - use_html = 1; -- tdstring = optarg; -+ tdstring = opt_arg; - break; - case 'h': - usage(argv[0]); -@@ -2235,28 +2316,34 @@ int main(int argc, const char * const ar - case 'V': - copyright(); - return 0; -+ case 'B': -+ myhost = apr_pstrdup(cntxt, opt_arg); -+ break; - #ifdef USE_SSL - case 'Z': -- ssl_cipher = strdup(optarg); -+ ssl_cipher = strdup(opt_arg); - break; -+ case 'm': -+ method = CUSTOM_METHOD; -+ method_str[CUSTOM_METHOD] = strdup(opt_arg); - case 'f': -- if (strncasecmp(optarg, "ALL", 3) == 0) { -+ if (strncasecmp(opt_arg, "ALL", 3) == 0) { - meth = SSLv23_client_method(); - #ifndef OPENSSL_NO_SSL2 -- } else if (strncasecmp(optarg, "SSL2", 4) == 0) { -+ } else if (strncasecmp(opt_arg, "SSL2", 4) == 0) { - meth = SSLv2_client_method(); - #endif - #ifndef OPENSSL_NO_SSL3 -- } else if (strncasecmp(optarg, "SSL3", 4) == 0) { -+ } else if (strncasecmp(opt_arg, "SSL3", 4) == 0) { - meth = SSLv3_client_method(); - #endif - #ifdef HAVE_TLSV1_X -- } else if (strncasecmp(optarg, "TLS1.1", 6) == 0) { -+ } else if (strncasecmp(opt_arg, "TLS1.1", 6) == 0) { - meth = TLSv1_1_client_method(); -- } else if (strncasecmp(optarg, "TLS1.2", 6) == 0) { -+ } else if (strncasecmp(opt_arg, "TLS1.2", 6) == 0) { - meth = TLSv1_2_client_method(); - #endif -- } else if (strncasecmp(optarg, "TLS1", 4) == 0) { -+ } else if (strncasecmp(opt_arg, "TLS1", 4) == 0) { - meth = TLSv1_client_method(); - } - break; -@@ -2269,6 +2356,10 @@ int main(int argc, const char * const ar - usage(argv[0]); - } - -+ if (method == NO_METH) { -+ method = GET; -+ } -+ - if (parse_url(apr_pstrdup(cntxt, opt->argv[opt->ind++]))) { - fprintf(stderr, "%s: invalid URL\n", argv[0]); - usage(argv[0]); -@@ -2312,6 +2403,10 @@ int main(int argc, const char * const ar - exit(1); - } - SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL); -+#ifdef SSL_MODE_RELEASE_BUFFERS -+ /* Keep memory usage as low as possible */ -+ SSL_CTX_set_mode (ssl_ctx, SSL_MODE_RELEASE_BUFFERS); -+#endif - if (ssl_cipher != NULL) { - if (!SSL_CTX_set_cipher_list(ssl_ctx, ssl_cipher)) { - fprintf(stderr, "error setting cipher list [%s]\n", ssl_cipher); diff --git a/www/apache22/files/patch-support__apachectl.in b/www/apache22/files/patch-support__apachectl.in deleted file mode 100644 index 844f05c1bd10..000000000000 --- a/www/apache22/files/patch-support__apachectl.in +++ /dev/null @@ -1,68 +0,0 @@ ---- support/apachectl.in.orig 2006-07-12 03:38:44 UTC -+++ support/apachectl.in -@@ -35,6 +35,7 @@ - # When multiple arguments are given, only the error from the _last_ - # one is reported. Run "apachectl help" for usage info - # -+ACMD="$1" - ARGV="$@" - # - # |||||||||||||||||||| START CONFIGURATION SECTION |||||||||||||||||||| -@@ -42,6 +43,7 @@ ARGV="$@" - # - # the path to your httpd binary, including options if necessary - HTTPD='@exp_sbindir@/@progname@' -+SERVICE='/usr/sbin/service apache22' - # - # pick up any necessary environment variables - if test -f @exp_sbindir@/envvars; then -@@ -65,19 +67,21 @@ ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@" - # -------------------- -------------------- - # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| - -+eval `limits -e -C daemon` >/dev/null 2>&1 - # Set the maximum number of file descriptors allowed per child process. - if [ "x$ULIMIT_MAX_FILES" != "x" ] ; then - $ULIMIT_MAX_FILES - fi - - ERROR=0 --if [ "x$ARGV" = "x" ] ; then -- ARGV="-h" -+if [ "x$ACMD" = "x" ] ; then -+ ACMD="-h" - fi - --case $ARGV in --start|stop|restart|graceful|graceful-stop) -- $HTTPD -k $ARGV -+case $ACMD in -+start|stop|restart|rcvar|reload|graceful|gracefulstop|graceful-stop) -+# $HTTPD -k $ARGV -+ $SERVICE $( echo $ACMD | tr -d '-' ) - ERROR=$? - ;; - startssl|sslstart|start-SSL) -@@ -87,17 +91,19 @@ startssl|sslstart|start-SSL) - ERROR=2 - ;; - configtest) -- $HTTPD -t -+# $HTTPD -t -+ $SERVICE $ACMD - ERROR=$? - ;; - status) -- $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } ' -+# $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } ' -+ $SERVICE $ACMD - ;; - fullstatus) - $LYNX $STATUSURL - ;; - *) -- $HTTPD $ARGV -+ $HTTPD "$@" - ERROR=$? - esac - diff --git a/www/apache22/files/patch-support__apxs.in b/www/apache22/files/patch-support__apxs.in deleted file mode 100644 index 016be2fdb1cb..000000000000 --- a/www/apache22/files/patch-support__apxs.in +++ /dev/null @@ -1,27 +0,0 @@ ---- support/apxs.in.orig 2010-05-10 20:02:56 UTC -+++ support/apxs.in -@@ -612,7 +612,13 @@ if ($opt_i or $opt_e) { - } - } else { - # replace already existing LoadModule line -- $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s; -+ # Custom FreeBSD mod -+ if ($opt_A) { -+ $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1|s; -+ } -+ else { -+ $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s; -+ } - } - $lmd =~ m|LoadModule\s+(.+?)_module.*|; - notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]"); -@@ -621,8 +627,7 @@ if ($opt_i or $opt_e) { - if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) { - print FP $content; - close(FP); -- system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " . -- "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " . -+ system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " . - "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new"); - } else { - notice("unable to open configuration file"); diff --git a/www/apache22/files/patch-support__envvars-std.in b/www/apache22/files/patch-support__envvars-std.in deleted file mode 100644 index 39fd1bca480e..000000000000 --- a/www/apache22/files/patch-support__envvars-std.in +++ /dev/null @@ -1,13 +0,0 @@ ---- support/envvars-std.in.orig 2012-05-22 21:42:41 UTC -+++ support/envvars-std.in -@@ -26,3 +26,10 @@ fi - export @SHLIBPATH_VAR@ - # - @OS_SPECIFIC_VARS@ -+ -+ENVVARS_DIR=%%PREFIX%%/etc/apache22/envvars.d -+ -+for envvars_file in $(ls ${ENVVARS_DIR}/*.env 2>/dev/null) -+do -+ . ${envvars_file} -+done diff --git a/www/apache22/files/patch-support__log_server_status.in b/www/apache22/files/patch-support__log_server_status.in deleted file mode 100644 index 013cb8b0c8f1..000000000000 --- a/www/apache22/files/patch-support__log_server_status.in +++ /dev/null @@ -1,20 +0,0 @@ ---- support/log_server_status.in.orig 2006-07-12 03:38:44 UTC -+++ support/log_server_status.in -@@ -27,7 +27,7 @@ - # - require 'sys/socket.ph'; - --$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312" -+$wherelog = "@logfiledir@/httpd-status-"; # Logs will be like "/var/log/httpd-status-19960312.log" - $server = "localhost"; # Name of server, could be "www.foo.com" - $port = "80"; # Port on server - $request = "/status/?auto"; # Request to send -@@ -60,7 +60,7 @@ sub tcp_connect - 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/apache22/pkg-descr b/www/apache22/pkg-descr deleted file mode 100644 index 1102fa67e2cb..000000000000 --- a/www/apache22/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -The Apache HTTP Server Project is an effort to develop and maintain an -open-source HTTP server for various modern desktop and server operating -systems, such as UNIX and Windows NT. The goal of this project is to -provide a secure, efficient and extensible server which provides HTTP -services in sync with the current HTTP standards. -The 2.x branch of Apache Web Server includes several improvements like -threading, use of APR, native IPv6 and SSL support, and many more. - -WWW: http://httpd.apache.org/ diff --git a/www/apache22/pkg-message b/www/apache22/pkg-message deleted file mode 100644 index a36bee20ca0c..000000000000 --- a/www/apache22/pkg-message +++ /dev/null @@ -1,19 +0,0 @@ -To run apache www server from startup, add apache22_enable="YES" -in your /etc/rc.conf. Extra options can be found in startup script. - -Your hostname must be resolvable using at least 1 mechanism in -/etc/nsswitch.conf typically DNS or /etc/hosts or apache might -have issues starting depending on the modules you are using. - -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - H E A D S - U P -2014-07-13: - The default version was changed from www/apache22 to www/apache24, - pre-build apache modules will also reflect this! - - In case ports are build by yourself and apache22 is required - use the following command to keep apache22 as default - - echo "DEFAULT_VERSIONS+=apache=2.2" >> /etc/make.conf - -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist deleted file mode 100644 index 6c9f71d9a58a..000000000000 --- a/www/apache22/pkg-plist +++ /dev/null @@ -1,433 +0,0 @@ -%%ETCDIR%%/Includes/no-accf.conf -@sample %%ETCDIR%%/extra/httpd-autoindex.conf.sample -@sample %%ETCDIR%%/extra/httpd-dav.conf.sample -@sample %%ETCDIR%%/extra/httpd-default.conf.sample -@sample %%ETCDIR%%/extra/httpd-info.conf.sample -@sample %%ETCDIR%%/extra/httpd-languages.conf.sample -@sample %%ETCDIR%%/extra/httpd-manual.conf.sample -@sample %%ETCDIR%%/extra/httpd-mpm.conf.sample -@sample %%ETCDIR%%/extra/httpd-multilang-errordoc.conf.sample -@sample %%ETCDIR%%/extra/httpd-ssl.conf.sample -@sample %%ETCDIR%%/extra/httpd-userdir.conf.sample -@sample %%ETCDIR%%/extra/httpd-vhosts.conf.sample -@sample %%ETCDIR%%/httpd.conf.sample -@sample %%ETCDIR%%/magic.sample -@sample %%ETCDIR%%/mime.types.sample -%%ETCDIR%%/modules.d/README_modules.d -include/apache22/ap_compat.h -include/apache22/ap_config.h -include/apache22/ap_config_auto.h -include/apache22/ap_config_layout.h -include/apache22/ap_listen.h -include/apache22/ap_mmn.h -include/apache22/ap_mpm.h -include/apache22/ap_provider.h -include/apache22/ap_regex.h -include/apache22/ap_regkey.h -include/apache22/ap_release.h -%%EVENT%%include/apache22/pod.h -%%EVENT%%include/apache22/fdqueue.h -%%WORKER%%include/apache22/fdqueue.h -include/apache22/http_config.h -include/apache22/http_connection.h -include/apache22/http_core.h -include/apache22/http_log.h -include/apache22/http_main.h -include/apache22/http_protocol.h -include/apache22/http_request.h -include/apache22/http_vhost.h -include/apache22/httpd.h -include/apache22/mod_auth.h -include/apache22/mod_cgi.h -include/apache22/mod_core.h -include/apache22/mod_dav.h -include/apache22/mod_dbd.h -include/apache22/mod_include.h -include/apache22/mod_log_config.h -include/apache22/mod_proxy.h -include/apache22/mod_rewrite.h -include/apache22/mod_ssl.h -include/apache22/mod_status.h -include/apache22/mpm.h -include/apache22/mpm_common.h -include/apache22/mpm_default.h -include/apache22/os.h -%%WORKER%%include/apache22/pod.h -include/apache22/scoreboard.h -include/apache22/unixd.h -include/apache22/util_cfgtree.h -include/apache22/util_charset.h -include/apache22/util_ebcdic.h -include/apache22/util_filter.h -include/apache22/util_ldap.h -include/apache22/util_md5.h -include/apache22/util_script.h -include/apache22/util_time.h -include/apache22/util_xml.h -libexec/apache22/httpd.exp -%%MOD_ACTIONS%%libexec/apache22/mod_actions.so -%%MOD_ALIAS%%libexec/apache22/mod_alias.so -%%MOD_ASIS%%libexec/apache22/mod_asis.so -%%MOD_AUTHNZ_LDAP%%libexec/apache22/mod_authnz_ldap.so -%%MOD_AUTHN_ALIAS%%libexec/apache22/mod_authn_alias.so -%%MOD_AUTHN_ANON%%libexec/apache22/mod_authn_anon.so -%%MOD_AUTHN_DBD%%libexec/apache22/mod_authn_dbd.so -%%MOD_AUTHN_DBM%%libexec/apache22/mod_authn_dbm.so -%%MOD_AUTHN_DEFAULT%%libexec/apache22/mod_authn_default.so -%%MOD_AUTHN_FILE%%libexec/apache22/mod_authn_file.so -%%MOD_AUTHZ_DBM%%libexec/apache22/mod_authz_dbm.so -%%MOD_AUTHZ_DEFAULT%%libexec/apache22/mod_authz_default.so -%%MOD_AUTHZ_GROUPFILE%%libexec/apache22/mod_authz_groupfile.so -%%MOD_AUTHZ_HOST%%libexec/apache22/mod_authz_host.so -%%MOD_AUTHZ_OWNER%%libexec/apache22/mod_authz_owner.so -%%MOD_AUTHZ_USER%%libexec/apache22/mod_authz_user.so -%%MOD_AUTH_BASIC%%libexec/apache22/mod_auth_basic.so -%%MOD_AUTH_DIGEST%%libexec/apache22/mod_auth_digest.so -%%MOD_AUTOINDEX%%libexec/apache22/mod_autoindex.so -%%MOD_BUCKETEER%%libexec/apache22/mod_bucketeer.so -%%MOD_CACHE%%libexec/apache22/mod_cache.so -%%MOD_CASE_FILTER%%libexec/apache22/mod_case_filter.so -%%MOD_CASE_FILTER_IN%%libexec/apache22/mod_case_filter_in.so -%%MOD_CERN_META%%libexec/apache22/mod_cern_meta.so -%%MOD_CGI%%libexec/apache22/mod_cgi.so -%%MOD_CGID%%libexec/apache22/mod_cgid.so -%%MOD_CHARSET_LITE%%libexec/apache22/mod_charset_lite.so -%%MOD_DAV%%libexec/apache22/mod_dav.so -%%MOD_DAV_FS%%libexec/apache22/mod_dav_fs.so -%%MOD_DAV_LOCK%%libexec/apache22/mod_dav_lock.so -%%MOD_DBD%%libexec/apache22/mod_dbd.so -%%MOD_DEFLATE%%libexec/apache22/mod_deflate.so -%%MOD_DIR%%libexec/apache22/mod_dir.so -%%MOD_DISK_CACHE%%libexec/apache22/mod_disk_cache.so -%%MOD_DUMPIO%%libexec/apache22/mod_dumpio.so -%%MOD_ENV%%libexec/apache22/mod_env.so -%%MOD_EXPIRES%%libexec/apache22/mod_expires.so -%%MOD_EXT_FILTER%%libexec/apache22/mod_ext_filter.so -%%MOD_FILE_CACHE%%libexec/apache22/mod_file_cache.so -%%MOD_FILTER%%libexec/apache22/mod_filter.so -%%MOD_HEADERS%%libexec/apache22/mod_headers.so -%%MOD_IMAGEMAP%%libexec/apache22/mod_imagemap.so -%%MOD_INCLUDE%%libexec/apache22/mod_include.so -%%MOD_INFO%%libexec/apache22/mod_info.so -%%MOD_LDAP%%libexec/apache22/mod_ldap.so -%%MOD_LOGIO%%libexec/apache22/mod_logio.so -%%MOD_LOG_CONFIG%%libexec/apache22/mod_log_config.so -%%MOD_LOG_FORENSIC%%libexec/apache22/mod_log_forensic.so -%%MOD_MEM_CACHE%%libexec/apache22/mod_mem_cache.so -%%MOD_MIME%%libexec/apache22/mod_mime.so -%%MOD_MIME_MAGIC%%libexec/apache22/mod_mime_magic.so -%%MOD_NEGOTIATION%%libexec/apache22/mod_negotiation.so -%%MOD_OPTIONAL_FN_EXPORT%%libexec/apache22/mod_optional_fn_export.so -%%MOD_OPTIONAL_FN_IMPORT%%libexec/apache22/mod_optional_fn_import.so -%%MOD_OPTIONAL_HOOK_EXPORT%%libexec/apache22/mod_optional_hook_export.so -%%MOD_OPTIONAL_HOOK_IMPORT%%libexec/apache22/mod_optional_hook_import.so -%%MOD_PROXY%%libexec/apache22/mod_proxy.so -%%MOD_PROXY_AJP%%libexec/apache22/mod_proxy_ajp.so -%%MOD_PROXY_BALANCER%%libexec/apache22/mod_proxy_balancer.so -%%MOD_PROXY_CONNECT%%libexec/apache22/mod_proxy_connect.so -%%MOD_PROXY_FTP%%libexec/apache22/mod_proxy_ftp.so -%%MOD_PROXY_HTTP%%libexec/apache22/mod_proxy_http.so -%%MOD_PROXY_SCGI%%libexec/apache22/mod_proxy_scgi.so -%%MOD_REQTIMEOUT%%libexec/apache22/mod_reqtimeout.so -%%MOD_REWRITE%%libexec/apache22/mod_rewrite.so -%%MOD_SETENVIF%%libexec/apache22/mod_setenvif.so -%%MOD_SPELING%%libexec/apache22/mod_speling.so -%%MOD_SSL%%libexec/apache22/mod_ssl.so -%%MOD_STATUS%%libexec/apache22/mod_status.so -%%MOD_SUBSTITUTE%%libexec/apache22/mod_substitute.so -%%MOD_SUEXEC%%libexec/apache22/mod_suexec.so -%%MOD_UNIQUE_ID%%libexec/apache22/mod_unique_id.so -%%MOD_USERDIR%%libexec/apache22/mod_userdir.so -%%MOD_USERTRACK%%libexec/apache22/mod_usertrack.so -%%MOD_VERSION%%libexec/apache22/mod_version.so -%%MOD_VHOST_ALIAS%%libexec/apache22/mod_vhost_alias.so -man/man1/dbmmanage.1.gz -man/man1/htdbm.1.gz -man/man1/htdigest.1.gz -man/man1/htpasswd.1.gz -man/man1/httxt2dbm.1.gz -man/man8/ab.8.gz -man/man8/apachectl.8.gz -man/man8/apxs.8.gz -man/man8/htcacheclean.8.gz -man/man8/httpd.8.gz -man/man8/logresolve.8.gz -man/man8/rotatelogs.8.gz -man/man8/suexec.8.gz -sbin/ab -sbin/apachectl -sbin/apxs -%%FORENSIC%%sbin/check_forensic -sbin/checkgid -sbin/dbmmanage -sbin/envvars -sbin/htcacheclean -sbin/htdbm -sbin/htdigest -sbin/htpasswd -sbin/httpd -sbin/httxt2dbm -sbin/logresolve -sbin/rotatelogs -sbin/split-logfile -%%SUEXEC%%@(,,4755) sbin/suexec -%%DATADIR%%/build/config.nice -%%DATADIR%%/build/config_vars.mk -%%DATADIR%%/build/instdso.sh -%%DATADIR%%/build/library.mk -%%DATADIR%%/build/ltlib.mk -%%DATADIR%%/build/mkdir.sh -%%DATADIR%%/build/program.mk -%%DATADIR%%/build/rules.mk -%%DATADIR%%/build/special.mk -@preunexec if cmp -s %D/%%WWWDIR%%/data/index.html %D/%%DATADIR%%/misc/index.html; then rm -f %D/%%WWWDIR%%/data/index.html; fi -%%DATADIR%%/misc/index.html -@postexec [ -f %D/%%WWWDIR%%/data/index.html ] || cp %D/%%DATADIR%%/misc/index.html %D/%%WWWDIR%%/data/index.html -@(,,0400) %%WWWDIR%%/cgi-bin/printenv -@(,,0400) %%WWWDIR%%/cgi-bin/test-cgi -%%WWWDIR%%/error/HTTP_BAD_GATEWAY.html.var -%%WWWDIR%%/error/HTTP_BAD_REQUEST.html.var -%%WWWDIR%%/error/HTTP_FORBIDDEN.html.var -%%WWWDIR%%/error/HTTP_GONE.html.var -%%WWWDIR%%/error/HTTP_INTERNAL_SERVER_ERROR.html.var -%%WWWDIR%%/error/HTTP_LENGTH_REQUIRED.html.var -%%WWWDIR%%/error/HTTP_METHOD_NOT_ALLOWED.html.var -%%WWWDIR%%/error/HTTP_NOT_FOUND.html.var -%%WWWDIR%%/error/HTTP_NOT_IMPLEMENTED.html.var -%%WWWDIR%%/error/HTTP_PRECONDITION_FAILED.html.var -%%WWWDIR%%/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var -%%WWWDIR%%/error/HTTP_REQUEST_TIME_OUT.html.var -%%WWWDIR%%/error/HTTP_REQUEST_URI_TOO_LARGE.html.var -%%WWWDIR%%/error/HTTP_SERVICE_UNAVAILABLE.html.var -%%WWWDIR%%/error/HTTP_UNAUTHORIZED.html.var -%%WWWDIR%%/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var -%%WWWDIR%%/error/HTTP_VARIANT_ALSO_VARIES.html.var -%%WWWDIR%%/error/README -%%WWWDIR%%/error/contact.html.var -%%WWWDIR%%/error/include/bottom.html -%%WWWDIR%%/error/include/spacer.html -%%WWWDIR%%/error/include/top.html -%%WWWDIR%%/icons/README -%%WWWDIR%%/icons/README.html -%%WWWDIR%%/icons/a.gif -%%WWWDIR%%/icons/a.png -%%WWWDIR%%/icons/alert.black.gif -%%WWWDIR%%/icons/alert.black.png -%%WWWDIR%%/icons/alert.red.gif -%%WWWDIR%%/icons/alert.red.png -%%WWWDIR%%/icons/apache_pb.gif -%%WWWDIR%%/icons/apache_pb.png -%%WWWDIR%%/icons/apache_pb2.gif -%%WWWDIR%%/icons/apache_pb2.png -%%WWWDIR%%/icons/apache_pb2_ani.gif -%%WWWDIR%%/icons/back.gif -%%WWWDIR%%/icons/back.png -%%WWWDIR%%/icons/ball.gray.gif -%%WWWDIR%%/icons/ball.gray.png -%%WWWDIR%%/icons/ball.red.gif -%%WWWDIR%%/icons/ball.red.png -%%WWWDIR%%/icons/binary.gif -%%WWWDIR%%/icons/binary.png -%%WWWDIR%%/icons/binhex.gif -%%WWWDIR%%/icons/binhex.png -%%WWWDIR%%/icons/blank.gif -%%WWWDIR%%/icons/blank.png -%%WWWDIR%%/icons/bomb.gif -%%WWWDIR%%/icons/bomb.png -%%WWWDIR%%/icons/box1.gif -%%WWWDIR%%/icons/box1.png -%%WWWDIR%%/icons/box2.gif -%%WWWDIR%%/icons/box2.png -%%WWWDIR%%/icons/broken.gif -%%WWWDIR%%/icons/broken.png -%%WWWDIR%%/icons/burst.gif -%%WWWDIR%%/icons/burst.png -%%WWWDIR%%/icons/c.gif -%%WWWDIR%%/icons/c.png -%%WWWDIR%%/icons/comp.blue.gif -%%WWWDIR%%/icons/comp.blue.png -%%WWWDIR%%/icons/comp.gray.gif -%%WWWDIR%%/icons/comp.gray.png -%%WWWDIR%%/icons/compressed.gif -%%WWWDIR%%/icons/compressed.png -%%WWWDIR%%/icons/continued.gif -%%WWWDIR%%/icons/continued.png -%%WWWDIR%%/icons/dir.gif -%%WWWDIR%%/icons/dir.png -%%WWWDIR%%/icons/diskimg.gif -%%WWWDIR%%/icons/diskimg.png -%%WWWDIR%%/icons/down.gif -%%WWWDIR%%/icons/down.png -%%WWWDIR%%/icons/dvi.gif -%%WWWDIR%%/icons/dvi.png -%%WWWDIR%%/icons/f.gif -%%WWWDIR%%/icons/f.png -%%WWWDIR%%/icons/folder.gif -%%WWWDIR%%/icons/folder.open.gif -%%WWWDIR%%/icons/folder.open.png -%%WWWDIR%%/icons/folder.png -%%WWWDIR%%/icons/folder.sec.gif -%%WWWDIR%%/icons/folder.sec.png -%%WWWDIR%%/icons/forward.gif -%%WWWDIR%%/icons/forward.png -%%WWWDIR%%/icons/generic.gif -%%WWWDIR%%/icons/generic.png -%%WWWDIR%%/icons/generic.red.gif -%%WWWDIR%%/icons/generic.red.png -%%WWWDIR%%/icons/generic.sec.gif -%%WWWDIR%%/icons/generic.sec.png -%%WWWDIR%%/icons/hand.right.gif -%%WWWDIR%%/icons/hand.right.png -%%WWWDIR%%/icons/hand.up.gif -%%WWWDIR%%/icons/hand.up.png -%%WWWDIR%%/icons/icon.sheet.gif -%%WWWDIR%%/icons/icon.sheet.png -%%WWWDIR%%/icons/image1.gif -%%WWWDIR%%/icons/image1.png -%%WWWDIR%%/icons/image2.gif -%%WWWDIR%%/icons/image2.png -%%WWWDIR%%/icons/image3.gif -%%WWWDIR%%/icons/image3.png -%%WWWDIR%%/icons/index.gif -%%WWWDIR%%/icons/index.png -%%WWWDIR%%/icons/layout.gif -%%WWWDIR%%/icons/layout.png -%%WWWDIR%%/icons/left.gif -%%WWWDIR%%/icons/left.png -%%WWWDIR%%/icons/link.gif -%%WWWDIR%%/icons/link.png -%%WWWDIR%%/icons/movie.gif -%%WWWDIR%%/icons/movie.png -%%WWWDIR%%/icons/p.gif -%%WWWDIR%%/icons/p.png -%%WWWDIR%%/icons/patch.gif -%%WWWDIR%%/icons/patch.png -%%WWWDIR%%/icons/pdf.gif -%%WWWDIR%%/icons/pdf.png -%%WWWDIR%%/icons/pie0.gif -%%WWWDIR%%/icons/pie0.png -%%WWWDIR%%/icons/pie1.gif -%%WWWDIR%%/icons/pie1.png -%%WWWDIR%%/icons/pie2.gif -%%WWWDIR%%/icons/pie2.png -%%WWWDIR%%/icons/pie3.gif -%%WWWDIR%%/icons/pie3.png -%%WWWDIR%%/icons/pie4.gif -%%WWWDIR%%/icons/pie4.png -%%WWWDIR%%/icons/pie5.gif -%%WWWDIR%%/icons/pie5.png -%%WWWDIR%%/icons/pie6.gif -%%WWWDIR%%/icons/pie6.png -%%WWWDIR%%/icons/pie7.gif -%%WWWDIR%%/icons/pie7.png -%%WWWDIR%%/icons/pie8.gif -%%WWWDIR%%/icons/pie8.png -%%WWWDIR%%/icons/portal.gif -%%WWWDIR%%/icons/portal.png -%%WWWDIR%%/icons/ps.gif -%%WWWDIR%%/icons/ps.png -%%WWWDIR%%/icons/quill.gif -%%WWWDIR%%/icons/quill.png -%%WWWDIR%%/icons/right.gif -%%WWWDIR%%/icons/right.png -%%WWWDIR%%/icons/screw1.gif -%%WWWDIR%%/icons/screw1.png -%%WWWDIR%%/icons/screw2.gif -%%WWWDIR%%/icons/screw2.png -%%WWWDIR%%/icons/script.gif -%%WWWDIR%%/icons/script.png -%%WWWDIR%%/icons/small/back.gif -%%WWWDIR%%/icons/small/back.png -%%WWWDIR%%/icons/small/binary.gif -%%WWWDIR%%/icons/small/binary.png -%%WWWDIR%%/icons/small/binhex.gif -%%WWWDIR%%/icons/small/binhex.png -%%WWWDIR%%/icons/small/blank.gif -%%WWWDIR%%/icons/small/blank.png -%%WWWDIR%%/icons/small/broken.gif -%%WWWDIR%%/icons/small/broken.png -%%WWWDIR%%/icons/small/burst.gif -%%WWWDIR%%/icons/small/burst.png -%%WWWDIR%%/icons/small/comp1.gif -%%WWWDIR%%/icons/small/comp1.png -%%WWWDIR%%/icons/small/comp2.gif -%%WWWDIR%%/icons/small/comp2.png -%%WWWDIR%%/icons/small/compressed.gif -%%WWWDIR%%/icons/small/compressed.png -%%WWWDIR%%/icons/small/continued.gif -%%WWWDIR%%/icons/small/continued.png -%%WWWDIR%%/icons/small/dir.gif -%%WWWDIR%%/icons/small/dir.png -%%WWWDIR%%/icons/small/dir2.gif -%%WWWDIR%%/icons/small/dir2.png -%%WWWDIR%%/icons/small/doc.gif -%%WWWDIR%%/icons/small/doc.png -%%WWWDIR%%/icons/small/forward.gif -%%WWWDIR%%/icons/small/forward.png -%%WWWDIR%%/icons/small/generic.gif -%%WWWDIR%%/icons/small/generic.png -%%WWWDIR%%/icons/small/generic2.gif -%%WWWDIR%%/icons/small/generic2.png -%%WWWDIR%%/icons/small/generic3.gif -%%WWWDIR%%/icons/small/generic3.png -%%WWWDIR%%/icons/small/image.gif -%%WWWDIR%%/icons/small/image.png -%%WWWDIR%%/icons/small/image2.gif -%%WWWDIR%%/icons/small/image2.png -%%WWWDIR%%/icons/small/index.gif -%%WWWDIR%%/icons/small/index.png -%%WWWDIR%%/icons/small/key.gif -%%WWWDIR%%/icons/small/key.png -%%WWWDIR%%/icons/small/movie.gif -%%WWWDIR%%/icons/small/movie.png -%%WWWDIR%%/icons/small/patch.gif -%%WWWDIR%%/icons/small/patch.png -%%WWWDIR%%/icons/small/ps.gif -%%WWWDIR%%/icons/small/ps.png -%%WWWDIR%%/icons/small/rainbow.gif -%%WWWDIR%%/icons/small/rainbow.png -%%WWWDIR%%/icons/small/sound.gif -%%WWWDIR%%/icons/small/sound.png -%%WWWDIR%%/icons/small/sound2.gif -%%WWWDIR%%/icons/small/sound2.png -%%WWWDIR%%/icons/small/tar.gif -%%WWWDIR%%/icons/small/tar.png -%%WWWDIR%%/icons/small/text.gif -%%WWWDIR%%/icons/small/text.png -%%WWWDIR%%/icons/small/transfer.gif -%%WWWDIR%%/icons/small/transfer.png -%%WWWDIR%%/icons/small/unknown.gif -%%WWWDIR%%/icons/small/unknown.png -%%WWWDIR%%/icons/small/uu.gif -%%WWWDIR%%/icons/small/uu.png -%%WWWDIR%%/icons/sound1.gif -%%WWWDIR%%/icons/sound1.png -%%WWWDIR%%/icons/sound2.gif -%%WWWDIR%%/icons/sound2.png -%%WWWDIR%%/icons/sphere1.gif -%%WWWDIR%%/icons/sphere1.png -%%WWWDIR%%/icons/sphere2.gif -%%WWWDIR%%/icons/sphere2.png -%%WWWDIR%%/icons/tar.gif -%%WWWDIR%%/icons/tar.png -%%WWWDIR%%/icons/tex.gif -%%WWWDIR%%/icons/tex.png -%%WWWDIR%%/icons/text.gif -%%WWWDIR%%/icons/text.png -%%WWWDIR%%/icons/transfer.gif -%%WWWDIR%%/icons/transfer.png -%%WWWDIR%%/icons/unknown.gif -%%WWWDIR%%/icons/unknown.png -%%WWWDIR%%/icons/up.gif -%%WWWDIR%%/icons/up.png -%%WWWDIR%%/icons/uu.gif -%%WWWDIR%%/icons/uu.png -%%WWWDIR%%/icons/uuencoded.gif -%%WWWDIR%%/icons/uuencoded.png -%%WWWDIR%%/icons/world1.gif -%%WWWDIR%%/icons/world1.png -%%WWWDIR%%/icons/world2.gif -%%WWWDIR%%/icons/world2.png -@preunexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true -@dir %%ETCDIR%%/envvars.d -@dir %%WWWDIR%%/data diff --git a/www/mod_antiloris/Makefile b/www/mod_antiloris/Makefile deleted file mode 100644 index 25443967b610..000000000000 --- a/www/mod_antiloris/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# Created by: Aleksandar Pejic <alex@vts.su.ac.rs> -# $FreeBSD$ - -PORTNAME= mod_antiloris -PORTVERSION= 0.4 -PORTREVISION= 1 -CATEGORIES= www -MASTER_SITES= ftp://ftp.monshouwer.eu/pub/linux/mod_antiloris/ - -MAINTAINER= alex@vts.su.ac.rs -COMMENT= Protect Apache 2.x against the Slowloris HTTP DoS attack - -LICENSE= APACHE20 - -USES= apache:2.2 tar:bzip2 -AP_FAST_BUILD= yes -AP_GENPLIST= yes -AP_EXTRAS+= -a -MODULENAME= mod_antiloris -SRC_FILE= *.c -SUB_FILES+= mod_antiloris.conf -SUB_LIST+= APACHEETCDIR="${APACHEETCDIR}" - -.if !defined(SKIP_RULES) -PLIST_FILES+= ${APACHEETCDIR}/Includes/mod_antiloris.conf -SUB_FILES+= pkg-message.rules -.endif - -post-install: -.if !defined(SKIP_RULES) - @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes - @${INSTALL_DATA} ${WRKDIR}/mod_antiloris.conf ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes -.endif - -.include <bsd.port.mk> diff --git a/www/mod_antiloris/distinfo b/www/mod_antiloris/distinfo deleted file mode 100644 index 210807374b32..000000000000 --- a/www/mod_antiloris/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mod_antiloris-0.4.tar.bz2) = 0de8ea7221b120ef8cbb75f7ee5fb4f865c2e079527dbeda59b878860855a15c -SIZE (mod_antiloris-0.4.tar.bz2) = 2598 diff --git a/www/mod_antiloris/files/mod_antiloris.conf.in b/www/mod_antiloris/files/mod_antiloris.conf.in deleted file mode 100644 index e8d1ccf00ec7..000000000000 --- a/www/mod_antiloris/files/mod_antiloris.conf.in +++ /dev/null @@ -1,4 +0,0 @@ -<IfModule mod_antiloris.c> - IPReadLimit 5 -</IfModule> - diff --git a/www/mod_antiloris/files/pkg-message.rules.in b/www/mod_antiloris/files/pkg-message.rules.in deleted file mode 100644 index 515272297601..000000000000 --- a/www/mod_antiloris/files/pkg-message.rules.in +++ /dev/null @@ -1,14 +0,0 @@ - -The mod_antiloris configuration file has been installed here: - - %%PREFIX%%/%%APACHEETCDIR%%/Includes/mod_antiloris.conf - -To activate the module: - - 1. find the line bellow in file %%PREFIX%%/%%APACHEETCDIR%%/httpd.conf, - remove the hash sign (#) in front of it and save the file - - #LoadModule antiloris_module libexec/apache2/mod_antiloris.so - - 2. restart your Apache server - diff --git a/www/mod_antiloris/pkg-descr b/www/mod_antiloris/pkg-descr deleted file mode 100644 index 86afa466c962..000000000000 --- a/www/mod_antiloris/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This module protects Apache 2.x from the Slowloris HTTP DoS attack by -limiting the number of allowed connections. - -WWW: http://modules.apache.org/search.php?id=1783 diff --git a/www/mod_auth_imap2/Makefile b/www/mod_auth_imap2/Makefile deleted file mode 100644 index bd741b94f29a..000000000000 --- a/www/mod_auth_imap2/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Created by: Clement Laforet <clement@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= mod_auth_imap -PORTVERSION= 2.2.0 -PORTREVISION= 2 -CATEGORIES= www -MASTER_SITES= http://ben.brillat.net/files/projects/mod_auth_imap2/ -PKGNAMESUFFIX= 2 -DISTNAME= mod_auth_imap2-${PORTVERSION} -DIST_SUBDIR= apache2 - -MAINTAINER= apache@FreeBSD.org -COMMENT= Apache 2 module to provide authentication via an IMAP mail server - -LICENSE= GPLv2 - -WRKSRC= ${WRKDIR}/${PORTNAME}2-${PORTVERSION} -USES= apache:2.2 -AP_FAST_BUILD= yes -AP_GENPLIST= yes - -PORTDOCS= htaccess-example httpd.conf-append-example - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/www/mod_auth_imap2/distinfo b/www/mod_auth_imap2/distinfo deleted file mode 100644 index f4b1ba8af063..000000000000 --- a/www/mod_auth_imap2/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (apache2/mod_auth_imap2-2.2.0.tar.gz) = 9642a13932010b9587d7b2263f21bed29602253bac18cb6c8847385d13d3cce0 -SIZE (apache2/mod_auth_imap2-2.2.0.tar.gz) = 12787 diff --git a/www/mod_auth_imap2/files/patch-mod_auth_imap.c b/www/mod_auth_imap2/files/patch-mod_auth_imap.c deleted file mode 100644 index ba3ed6885f0e..000000000000 --- a/www/mod_auth_imap2/files/patch-mod_auth_imap.c +++ /dev/null @@ -1,23 +0,0 @@ ---- ./mod_auth_imap.c.orig 2006-05-08 01:22:43.000000000 +0200 -+++ ./mod_auth_imap.c 2012-08-25 19:06:59.000000000 +0200 -@@ -170,7 +170,7 @@ - tcp_gets(Sock,result,500); - - //skip lines that start with "*" -- if (strncmp(result,"* ",2 == 0)) { -+ if (strncmp(result,"* ",2) == 0) { - tcp_gets(Sock,result,500); - } - -@@ -188,6 +188,11 @@ - tcp_puts(Sock,buf); - tcp_gets(Sock,result,500); - -+ //skip lines that start with "*" -+ if (strncmp(result,"* ",2) == 0) { -+ tcp_gets(Sock,result,500); -+ } -+ - if (strncmp(result,"A002 OK",7) == 0) { - if (logflag) { - ap_log_rerror(APLOG_MARK,APLOG_WARNING|APLOG_NOERRNO,0,r,"mod_auth_imap: Verified login for user %s.", username); diff --git a/www/mod_auth_imap2/pkg-descr b/www/mod_auth_imap2/pkg-descr deleted file mode 100644 index 7c5a02fcbd56..000000000000 --- a/www/mod_auth_imap2/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -An Apache 2 module to provide authentication via an IMAP mail server. - -WWW: http://ben.brillat.net/projects/mod_auth_imap/ diff --git a/www/mod_authn_sasl/Makefile b/www/mod_authn_sasl/Makefile deleted file mode 100644 index f0162bcbc86f..000000000000 --- a/www/mod_authn_sasl/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# Created by: Joerg Pulz <Joerg.Pulz@frm2.tum.de> -# $FreeBSD$ - -PORTNAME= mod_authn_sasl -PORTVERSION= 1.2 -PORTREVISION= 1 -CATEGORIES= www -MASTER_SITES= SF/mod-authn-sasl/mod-authn-sasl/${PORTVERSION} - -MAINTAINER= apache@FreeBSD.org -COMMENT= Allows user authentication based on libsasl2 mechanisms on apache 2.2 - -LICENSE= APACHE20 - -LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 - -OPTIONS_DEFINE= SASLAUTHD -SASLAUTHD_DESC= cyrus-sasl2-saslauthd support - -SASLAUTHD_RUN_DEPENDS= saslauthd:security/cyrus-sasl2-saslauthd -.include <bsd.port.options.mk> - -USES= apache:2.2 tar:bzip2 -AP_FAST_BUILD= yes -AP_GENPLIST= yes -AP_LIB= ${LOCALBASE}/lib -lsasl2 - -PORTDOCS1= AUTHORS LICENSE -PORTDOCS= * - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS1:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/ - @(cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR} \ - "! ( -name *\.in -o -name *\.am )" ) - -.include <bsd.port.mk> diff --git a/www/mod_authn_sasl/distinfo b/www/mod_authn_sasl/distinfo deleted file mode 100644 index 25153e1c80ca..000000000000 --- a/www/mod_authn_sasl/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mod_authn_sasl-1.2.tar.bz2) = 4329e1f429560041cebe67b74a588330f382759bcbb91d3e4145b18e59734b57 -SIZE (mod_authn_sasl-1.2.tar.bz2) = 274790 diff --git a/www/mod_authn_sasl/pkg-descr b/www/mod_authn_sasl/pkg-descr deleted file mode 100644 index 84a3f8da12c4..000000000000 --- a/www/mod_authn_sasl/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -This module provides the mod_auth_basic authentication front-end a way to -authenticate users by checking credentials via the Cyrus SASL library. -This may be interesting for setups where other daemons (e.g. for SMTP, IMAP or -LDAP) already running at a machine use SASL to authenticate users. - -WWW: http://mod-authn-sasl.sourceforge.net/ diff --git a/www/mod_bw/Makefile b/www/mod_bw/Makefile deleted file mode 100644 index 37803914c67b..000000000000 --- a/www/mod_bw/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Created by: Clement Laforet <clement@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= mod_bw -PORTVERSION= 0.8 -PORTREVISION= 1 -CATEGORIES= www -MASTER_SITES= http://legacy.ivn.cl/files/source/ -EXTRACT_SUFX= .tgz -DIST_SUBDIR= apache2 - -MAINTAINER= apache@FreeBSD.org -COMMENT= Bandwidth and Connection control per Virtual Host or Directory - -LICENSE= APACHE20 - -WRKSRC= ${WRKDIR}/mod_bw -USES= apache:2.2 -AP_FAST_BUILD= yes -AP_GENPLIST= yes - -SRC_FILE= mod_bw.c -PORTDOCS= mod_bw.txt - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/www/mod_bw/distinfo b/www/mod_bw/distinfo deleted file mode 100644 index 7e8d035bca9d..000000000000 --- a/www/mod_bw/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (apache2/mod_bw-0.8.tgz) = 75d43f586b7662ccca7d67bc67c52e25a341c6caef89a4804fedbeaee25a13b3 -SIZE (apache2/mod_bw-0.8.tgz) = 19026 diff --git a/www/mod_bw/pkg-descr b/www/mod_bw/pkg-descr deleted file mode 100644 index 671ffd06e95b..000000000000 --- a/www/mod_bw/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Bandwidth and Connection control per Virtual Host or Directory. -It can: - * Restrict the number of simultaneous connections per vhost/dir - * Limit the bandwidth for files on vhost/dir - -WWW: http://ivn.cl/category/apache/ diff --git a/www/mod_cband/Makefile b/www/mod_cband/Makefile deleted file mode 100644 index baa577e308f3..000000000000 --- a/www/mod_cband/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# Created by: Clement Laforet <clement@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= mod_cband -PORTVERSION= 0.9.7.5 -PORTREVISION= 3 -CATEGORIES= www -MASTER_SITES= http://fossies.org/linux/www/apache_httpd_modules/ -PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} -DISTNAME= ${PORTNAME:C/_/-/}-${PORTVERSION} -DIST_SUBDIR= apache2 - -MAINTAINER= apache@FreeBSD.org -COMMENT= Per-virtualhost bandwidth limiter module for Apache 2 - -LICENSE= GPLv2+ BSD4CLAUSE -LICENSE_COMB= multi -LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENSE -LICENSE_FILE_BSD4CLAUSE= ${WRKSRC}/libpatricia.copyright - -USES= apache:2.2 tar:tgz -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-apxs=${APXS} -ALL_TARGET= # -PORTDOCS= documentation.txt faq.txt - -OPTIONS_DEFINE= DOCS - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/documentation.txt ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/faq.txt ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/www/mod_cband/distinfo b/www/mod_cband/distinfo deleted file mode 100644 index 303159f92e06..000000000000 --- a/www/mod_cband/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (apache2/mod-cband-0.9.7.5.tgz) = 6fd9024354153cc52538c81986afc18c1ff9395523bbe096f1810903fa7528ab -SIZE (apache2/mod-cband-0.9.7.5.tgz) = 70713 diff --git a/www/mod_cband/files/patch-Makefile.in b/www/mod_cband/files/patch-Makefile.in deleted file mode 100644 index 717ca49e2b1e..000000000000 --- a/www/mod_cband/files/patch-Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- ./Makefile.in.orig 2013-12-15 19:48:51.000000000 +0100 -+++ ./Makefile.in 2013-12-15 19:49:40.000000000 +0100 -@@ -33,7 +33,8 @@ - @echo - - install: $(OBJ) -- $(APXS) $(APXS_OPTS) -i -a -n cband src/mod_cband.la -+ /bin/mkdir -p $(DESTDIR)$$($(APXS) -q LIBEXECDIR) -+ $(APXS) $(APXS_OPTS) -i -S LIBEXECDIR=$(DESTDIR)$$($(APXS) -q LIBEXECDIR) -n cband src/mod_cband.la - - clean: - rm -f src/.libs/* diff --git a/www/mod_cband/files/patch-src_mod__cband.c b/www/mod_cband/files/patch-src_mod__cband.c deleted file mode 100644 index 3b86f3fd7e13..000000000000 --- a/www/mod_cband/files/patch-src_mod__cband.c +++ /dev/null @@ -1,27 +0,0 @@ ---- src/mod_cband.c.orig -+++ src/mod_cband.c -@@ -56,6 +56,9 @@ - #include <sys/types.h> - #include <sys/ipc.h> - #include <sys/sem.h> -+#ifdef __FreeBSD__ -+#include <sys/param.h> -+#endif - #include <unistd.h> - - #include "mod_cband.h" -@@ -74,6 +77,14 @@ - } - #endif - -+#if defined(__FreeBSD__) && __FreeBSD_version >= 1200059 -+union semun { -+ int val; /* value for SETVAL */ -+ struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */ -+ u_short *array; /* array for GETALL & SETALL */ -+}; -+#endif -+ - static mod_cband_config_header *config = NULL; - static const char mod_cband_filter_name[] = "CBAND_FILTER"; - ap_filter_rec_t *mod_cband_output_filter_handle; diff --git a/www/mod_cband/pkg-descr b/www/mod_cband/pkg-descr deleted file mode 100644 index 371421ad529e..000000000000 --- a/www/mod_cband/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -mod_cband is an Apache 2 module provided to solve the problem of -limiting virtualhosts bandwidth usage. When the configured -virtualhost's transfer limit is exceeded, mod_cband will redirect all -further requests to a location specified in the configuration file. - -WWW: http://dembol.org/blog/mod_cband/ diff --git a/www/mod_cband/pkg-plist b/www/mod_cband/pkg-plist deleted file mode 100644 index 771a42cfc62c..000000000000 --- a/www/mod_cband/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%% -%%APACHEMODDIR%%/%%AP_MODULE%% -@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F -@unexec echo "Don't forget to remove all mod_cband-related directives in your httpd.conf" diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile deleted file mode 100644 index a1db566b98b7..000000000000 --- a/www/mod_clamav/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# Created by: Clement Laforet <clement@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= mod_clamav -PORTVERSION= 0.23 -PORTREVISION= 6 -CATEGORIES= www security -MASTER_SITES= http://software.othello.ch/mod_clamav/ \ - http://www.kommunity.net/download/mod_clamav/ -PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} - -MAINTAINER= tmueko@kommunity.net -COMMENT= Scans content delivered by the Apache20 proxy module for viruses - -LICENSE= GPLv2 - -USES= apache:2.2 libtool -GNU_CONFIGURE= yes - -.include <bsd.port.options.mk> - -CLAMAV_PORT= security/clamav -LIB_DEPENDS+= libclamav.so:security/clamav - -CONFIGURE_ARGS= --with-apxs=${APXS} \ - --libdir=${PREFIX}/lib/apache2 -CFLAGS+= -I${LOCALBASE}/include -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib \ - -pthread - -post-patch: - @${REINPLACE_CMD} -e 's,REG_EXTENDED,AP_REG_EXTENDED,' \ - ${WRKSRC}/config.c - @${REINPLACE_CMD} -e '/^AC_CHECK_HEADERS/ s,regex.h ,,g' \ - ${WRKSRC}/configure.in - -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} - ${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \ - -i -n 'clamav' ${WRKSRC}/.libs/mod_clamav.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so - -.include <bsd.port.mk> diff --git a/www/mod_clamav/distinfo b/www/mod_clamav/distinfo deleted file mode 100644 index a23d5984c81c..000000000000 --- a/www/mod_clamav/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mod_clamav-0.23.tar.gz) = 42e2e24c2b5dd816c6de72b60a1ad1647f6dc3ceeb400061edeba03ff231c192 -SIZE (mod_clamav-0.23.tar.gz) = 344930 diff --git a/www/mod_clamav/files/patch-mod_clamav.h b/www/mod_clamav/files/patch-mod_clamav.h deleted file mode 100644 index d7658fccc4a2..000000000000 --- a/www/mod_clamav/files/patch-mod_clamav.h +++ /dev/null @@ -1,13 +0,0 @@ ---- mod_clamav.h.orig 2009-04-11 10:31:32.000000000 -0300 -+++ mod_clamav.h 2009-04-11 10:32:11.000000000 -0300 -@@ -70,9 +70,7 @@ - #ifdef HAVE_ALLOCA_H - #include <alloca.h> - #endif /* HAVE_ALLOCA_H */ --#ifdef HAVE_REGEX_H --#include <regex.h> --#endif /* HAVE_REGEX_H */ -+#include <ap_regex.h> - - #ifndef CLAMAV_DEBUG - #define CLAMAV_DEBUG 0 diff --git a/www/mod_clamav/pkg-descr b/www/mod_clamav/pkg-descr deleted file mode 100644 index a5da23e3d54a..000000000000 --- a/www/mod_clamav/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Apache 2 introduces filters, which allow to modify content generated -by some other module. mod_clamav is an Apache 2 filter which scans the -content delivered by the proxy module (mod_proxy) for viruses using the -Clamav virus scanning engine. - -WWW: http://software.othello.ch/mod_clamav/ diff --git a/www/mod_clamav/pkg-message b/www/mod_clamav/pkg-message deleted file mode 100644 index a6e86a83b5bf..000000000000 --- a/www/mod_clamav/pkg-message +++ /dev/null @@ -1,10 +0,0 @@ -###################################################################### -# First you have to make sure, clamav runs in Daemon-Mode: -# Add "ClamavMode daemon" to your httpd.conf -# If clamd run on a local socket, it must have the same userid as the -# webserver add something like "user www" to your clamav.conf -# If you don't want to start clamd as the same user as the Webserver -# you have to start clamd on an inet socket by removing LocalSocket... -# and add the options "TCPSocket ..." and "TCPAddr..." -# later in the clamav.conf -####################################################################### diff --git a/www/mod_clamav/pkg-plist b/www/mod_clamav/pkg-plist deleted file mode 100644 index 90da21dfd03b..000000000000 --- a/www/mod_clamav/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%f -%%APACHEMODDIR%%/%%AP_MODULE%% -@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%f diff --git a/www/mod_extract_forwarded/Makefile b/www/mod_extract_forwarded/Makefile deleted file mode 100644 index dcfe3e17fed4..000000000000 --- a/www/mod_extract_forwarded/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# Created by: Anders Nordby <anders@fix.no> -# $FreeBSD$ - -PORTNAME= mod_extract_forwarded -PORTVERSION= 2.0.2 -PORTREVISION= 4 -CATEGORIES= www -MASTER_SITES= http://www.openinfo.co.uk/apache/ -DISTNAME= extract_forwarded-${DISTVERSION} - -MAINTAINER= kuriyama@FreeBSD.org -COMMENT= Apache module that can make proxied requests appear with client IP - -OPTIONS_DEFINE= YOSHFUJI -YOSHFUJI_DESC= yoshfuji patch (support IPv6 addr in config, etc) -#OPTIONS_DEFAULT= YOSHFUJI - -USES= apache:2.2 -WRKSRC= ${WRKDIR}/extract_forwarded -PORTDOCS= INSTALL README -PATCH_STRIP= -p1 - -AP_FAST_BUILD= yes -AP_GENPLIST= yes - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MYOSHFUJI} -EXTRA_PATCHES= ${FILESDIR}/extra-patch-yoshfuji -.else -EXTRA_PATCHES= ${FILESDIR}/extra-patch-mod_extract_forwarded.c -.endif - -post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR}/ -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ -.endfor - -.include <bsd.port.mk> diff --git a/www/mod_extract_forwarded/distinfo b/www/mod_extract_forwarded/distinfo deleted file mode 100644 index 077358cdb54c..000000000000 --- a/www/mod_extract_forwarded/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (extract_forwarded-2.0.2.tar.gz) = 934e2da02a2a71dd40a6050e884ac034174a1bfee0d0d4aeeeb68b942d94cafb -SIZE (extract_forwarded-2.0.2.tar.gz) = 13812 diff --git a/www/mod_extract_forwarded/files/extra-patch-mod_extract_forwarded.c b/www/mod_extract_forwarded/files/extra-patch-mod_extract_forwarded.c deleted file mode 100644 index e5d78fc4b6d6..000000000000 --- a/www/mod_extract_forwarded/files/extra-patch-mod_extract_forwarded.c +++ /dev/null @@ -1,11 +0,0 @@ ---- mod_extract_forwarded.c.orig 2010-05-24 13:43:06.446992453 +0900 -+++ mod_extract_forwarded.c 2010-06-12 17:46:16.673689346 +0900 -@@ -423,7 +423,7 @@ - { - result = &(conn->remote_addr->sa.sin.sin_addr.s_addr); - } --#if defined(AF_INET6) && defined(IN6_IS_ADDR_V4MAPPED) -+#if defined(AF_INET6) && defined(IN6_IS_ADDR_V4MAPPED) && APR_HAVE_IPV6 == 1 - if (conn->remote_addr->family == AF_INET6 && - IN6_IS_ADDR_V4MAPPED(&conn->remote_addr->sa.sin6.sin6_addr)) - { diff --git a/www/mod_extract_forwarded/files/extra-patch-yoshfuji b/www/mod_extract_forwarded/files/extra-patch-yoshfuji deleted file mode 100644 index 68d30f27f866..000000000000 --- a/www/mod_extract_forwarded/files/extra-patch-yoshfuji +++ /dev/null @@ -1,917 +0,0 @@ -diff --git a/INSTALL b/INSTALL -index fa06d8a..d1f6d56 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -13,11 +13,12 @@ to build and install a DSO version of the module: - - /usr/local/apache2/bin/apxs -c -i -a mod_extract_forwarded.c - --If the Apache instance you are adding mod_extract_forwarded to will not --have mod_proxy and proxy_http loaded then you will get an error when --mod_extract_forwarded is loaded. In that case edit --mod_extract_forwarded.c and comment out the #define for --USING_proxy_http_module or change it to an an #undef. If you --subsequently run Apache with proxy_http do not forget to reinstate the --#define; failure to do so will mean that any X-Fowarded-For header --inserted by proxy_http will use the spoofed IP number in error. -+If the Apache instance you are adding mod_extract_forwarded to will -+have mod_proxy and proxy_http loaded then you need to build and -+install a DSO version of the module: -+ -+/usr/local/apache2/bin/apxs -c -i -a mod_extract_forwarded_proxy.c -+ -+Without this module, any X-Fowarded-For header inserted by proxy_http -+will use the spoofed IP number. -+ -diff --git a/mod_extract_forwarded.c b/mod_extract_forwarded.c -index afecbcf..fa94493 100644 ---- a/mod_extract_forwarded.c -+++ b/mod_extract_forwarded.c -@@ -84,6 +84,9 @@ - * of what is done by the module as an aid to understanding fixing problems - * with this code; this is NOT for production use because of the volume of - * output it will generate and the way it flushes stderr -+ * 8. Support IPv6: If real connection is served by IPv6 socket, both IPv4 and -+ * IPv6 clients are supported. If real connection is served by IPv4 socket, -+ * only IPv4 clients are supported. [yoshfuji] - * - * History of Apache 2 compatible mod_extract_forwarded - * ---------------------------------------------------- -@@ -98,7 +101,8 @@ - * Cleaned up interpretation of per_der_config - * for internal redirect and subrequests and - * other logic tidying -- * -+ * 12 Apr 2009 Apache 2.2 support. [yoshfuji] -+ * 16 Apr 2009 IPv6 support. [yoshfuji] - */ - - #include "httpd.h" -@@ -110,22 +114,13 @@ - #include "http_request.h" - #include "util_script.h" - #include "http_connection.h" --#include "mod_proxy.h" - #include "apr_strings.h" - - #include <netdb.h> - #include <arpa/inet.h> - #include <netinet/in.h> - --/* -- * #define USING_proxy_http_module if proxy_http.c module is either -- * compiled into Apache 2 or it is being loaded as a DSO. If proxy_http.c -- * module is not loaded then this module will generate an error when and -- * if it is loaded as a DSO. In that case comment out the #define, recompile -- * and reinstall this module. BUT do not forget to change things back if -- * proxy_http.c module is reinstated -- */ --#define USING_proxy_http_module 1 -+#include "mod_extract_forwarded.h" - - /*--------------------------------------------------------------------------*/ - /* */ -@@ -139,17 +134,6 @@ - */ - module AP_MODULE_DECLARE_DATA extract_forwarded_module; - --/* -- * Per directory configuration record. -- */ --typedef struct { -- int order; /* order in which the accept and refuse specs are applied */ -- int debug; /* debug output to error log flag */ -- const char *envar; /* name of env var to add */ -- apr_table_t *accept_proxies; /* proxies to trust */ -- apr_table_t *refuse_proxies; /* proxies to distrust */ --} mef_config; -- - /* - * Two possible orders in which the accept and refuse specs are applied - */ -@@ -279,72 +263,41 @@ static const char *mef_debug_control(cmd_parms *cparms, void *mconfig, - } - - /* -- * Given an IP or 'all' as "arg", add it to the accept_proxies table -+ * Given an IP or 'all' as "arg", add it to the accept_proxies/refuse_proxies -+ * table - */ --static const char *mef_accept_proxy(cmd_parms *cparms, void *mconfig, -+static const char *mef_config_proxy(cmd_parms *cparms, void *mconfig, - const char *arg) - { - mef_config *conf = (mef_config *)mconfig; -- struct hostent *hptr = NULL; -- char** haddr; -+ apr_table_t *conf_proxies = cparms->info ? -+ conf->accept_proxies : conf->refuse_proxies; - if (strcasecmp(arg, "all") == 0) - /* "all" keyword replaces everything with just itself */ - { -- apr_table_clear(conf->accept_proxies); -- apr_table_set(conf->accept_proxies, arg, "t"); -+ apr_table_clear(conf_proxies); -+ apr_table_set(conf_proxies, arg, "t"); - } - else -- /* Add IP to list of accepted proxies */ -+ /* Add IP to list of accepted/refuse proxies */ - { -- hptr = gethostbyname(arg); -- if (hptr) -+ apr_sockaddr_t *sa0, *sa; -+ if (apr_sockaddr_info_get(&sa0, arg, APR_UNSPEC, 0, 0, -+ cparms->temp_pool) == APR_SUCCESS) - { -- apr_table_unset(conf->accept_proxies, "all"); -- for (haddr=hptr->h_addr_list; *haddr; haddr++) -+ apr_table_unset(conf_proxies, "all"); -+ for (sa = sa0; sa; sa = sa->next) - { -- apr_table_set(conf->accept_proxies, -- inet_ntoa(*((struct in_addr*)(*haddr))), "t"); -+ char *ipaddr; -+ if (apr_sockaddr_ip_get(&ipaddr, sa) == APR_SUCCESS) -+ { -+ apr_table_set(conf_proxies, ipaddr, "t"); -+ } - } -- } -- else -- { -- return "No 'all' or valid IP identified by MEFaccept"; - } -- } -- return NULL; --} -- --/* -- * Given an IP or 'all' as "arg", add it to the refused_proxies table -- */ --static const char *mef_refuse_proxy(cmd_parms *cparms, void *mconfig, -- const char *arg) --{ -- mef_config *conf = (mef_config *) mconfig; -- struct hostent *hptr = NULL; -- char** haddr; -- if (strcasecmp(arg, "all") == 0) -- /* "all" keyword replaces everything with just itself */ -- { -- apr_table_clear(conf->refuse_proxies); -- apr_table_set(conf->refuse_proxies, arg, "t"); -- } -- else -- /* Add IP to list of refused proxies */ -- { -- hptr = gethostbyname(arg); -- if (hptr) -- { -- apr_table_unset(conf->refuse_proxies, "all"); -- for (haddr=hptr->h_addr_list; *haddr; haddr++) -- { -- apr_table_set(conf->refuse_proxies, -- inet_ntoa(*((struct in_addr*)(*haddr))), "t"); -- } -- } -- else -+ else - { -- return "No 'all' or valid IP identified by MEFrefuse"; -+ return "No 'all' or valid IP identified by MEFaccept / MEFrefuse"; - } - } - return NULL; -@@ -385,54 +338,6 @@ static int acceptable_proxy(mef_config *conf, char *proxy_ip) - return 0; - } - --/* -- * The MEFsave_rec data structure is used to preserve information that -- * this module has modified in the conn_rec associated with a request -- * so that the conn_rec can be restored to its original state as needed. -- * It also carries information between transaction phases and internal -- * redirects and subrequests -- */ --typedef struct MEFsave_rec MEFsave_rec; -- --struct MEFsave_rec { -- conn_rec *connection; /* connection record being used */ -- in_addr_t orig_in_addr; /* original remote in_addr_t */ -- in_addr_t new_in_addr; /* modified remote in_addr_t */ -- char *orig_remote_ip; /* original remote_ip */ -- char *new_remote_ip; /* modified remote_ip */ -- int conn_rec_mod_state; /* conn_rec modification state */ -- int debug; /* are we printing MEF debug */ -- const char *envar; /* name of env var to add */ -- void *per_dir_config; /* per_dir_config applicable */ -- MEFsave_rec *other_saved; /* any preceding req's save_rec */ -- request_rec *other_r; /* any preceding req's request_rec */ --}; -- --#define CONN_REC_MODIFIED 1 --#define CONN_REC_RESTORED 0 -- --/* -- * remote_in_addr returns a pointer to the in_addr_t which specifes -- * the IP of the remote end of the connection supporting the specified -- * request. NULL is returned if this cannot be determined. -- */ --static in_addr_t *get_remote_in_addr(conn_rec *conn) --{ -- in_addr_t *result = NULL; -- if (conn->remote_addr->family == AF_INET) -- { -- result = &(conn->remote_addr->sa.sin.sin_addr.s_addr); -- } --#if defined(AF_INET6) && defined(IN6_IS_ADDR_V4MAPPED) -- if (conn->remote_addr->family == AF_INET6 && -- IN6_IS_ADDR_V4MAPPED(&conn->remote_addr->sa.sin6.sin6_addr)) -- { -- result = &(((uint32_t *)conn->remote_addr->ipaddr_ptr)[3]); -- } --#endif -- return result; --} -- - /* Forward declared for convenience */ - static apr_status_t cleanup_initial(void *data); - static apr_status_t cleanup_not_initial(void *data); -@@ -446,22 +351,12 @@ static apr_status_t cleanup_not_initial(void *data); - */ - static int spoof_initial(request_rec *r, char *spoof_ip, char *phase) - { -- in_addr_t *remote_in_addr; - MEFsave_rec *saved; - mef_config *conf = ap_get_module_config(r->per_dir_config, - &extract_forwarded_module); -- /* Validate and acquire pointer to the remote in_addr_t */ -- if ((remote_in_addr = get_remote_in_addr(r->connection)) == NULL) -- { -- /* Could not get a valid value so give up */ -- if (conf->debug == MEF_DEBUG_ON) -- { -- fprintf(stderr,"MEF: phase:%s, si problem acquiring remote_in_addr\n", -- phase); -- fflush(stderr); -- } -- return DECLINED; -- } -+ apr_sockaddr_t *sa; -+ apr_port_t port; -+ - /* - * We can proceed to do the spoof - * -@@ -470,9 +365,40 @@ static int spoof_initial(request_rec *r, char *spoof_ip, char *phase) - saved = apr_pcalloc(r->pool, sizeof(MEFsave_rec)); - /* Then the saving */ - saved->connection = r->connection; -- saved->orig_in_addr = *remote_in_addr; -+ saved->orig_addr = *r->connection->remote_addr; - saved->orig_remote_ip = r->connection->remote_ip; -- saved->new_in_addr = inet_addr(spoof_ip); -+ -+ /* setup new address -+ * it's easy if address family is not changed. -+ */ -+ port = r->connection->remote_addr->port; -+ if (apr_sockaddr_info_get(&sa, spoof_ip, -+ r->connection->remote_addr->family, port, -+ 0, r->pool) != APR_SUCCESS) -+ { -+#if APR_HAVE_IPV6 -+ /* Try inter-family conversion. -+ * If if the real connection is served via ipv4, it -+ * implies Give up if connection is ipv4 and real client is ipv6. -+ */ -+ char *buf; -+ if (r->connection->remote_addr->family != APR_INET6) -+ { -+ return DECLINED; -+ } -+ buf = apr_palloc(r->pool, strlen(spoof_ip) + sizeof("::ffff:")); -+ sprintf(buf, "::ffff:%s", spoof_ip); -+ if (apr_sockaddr_info_get(&sa, buf, APR_INET6, port, -+ 0, r->pool) != APR_SUCCESS) -+ { -+ return DECLINED; -+ } -+#else -+ return DECLINED; -+#endif -+ } -+ -+ saved->new_addr = *sa; - saved->new_remote_ip = spoof_ip; - saved->per_dir_config = r->per_dir_config; - saved->debug = conf->debug; -@@ -480,7 +406,7 @@ static int spoof_initial(request_rec *r, char *spoof_ip, char *phase) - saved->other_saved = NULL; - saved->other_r = NULL; - /* Then the modifying of the conn_rec */ -- *remote_in_addr = saved->new_in_addr; -+ *saved->connection->remote_addr = saved->new_addr; - saved->connection->remote_ip = saved->new_remote_ip; - saved->conn_rec_mod_state = CONN_REC_MODIFIED; - /* Force re-evaluation of the remote_host value */ -@@ -520,7 +446,6 @@ static int spoof_initial(request_rec *r, char *spoof_ip, char *phase) - static int spoof_not_initial(request_rec *this_r, request_rec *other_r, - char *phase) - { -- in_addr_t *remote_in_addr; - MEFsave_rec *saved; - MEFsave_rec *other_saved; - /* -@@ -540,10 +465,9 @@ static int spoof_not_initial(request_rec *this_r, request_rec *other_r, - saved = apr_pcalloc(this_r->pool, sizeof(MEFsave_rec)); - /* Then the copying */ - saved->connection = other_saved->connection; -- remote_in_addr = get_remote_in_addr(saved->connection); -- saved->orig_in_addr = other_saved->orig_in_addr; -+ saved->orig_addr = other_saved->orig_addr; - saved->orig_remote_ip = other_saved->orig_remote_ip; -- saved->new_in_addr = other_saved->new_in_addr; -+ saved->new_addr = other_saved->new_addr; - saved->new_remote_ip = other_saved->new_remote_ip; - saved->per_dir_config = other_saved->per_dir_config; - saved->debug = other_saved->debug; -@@ -552,7 +476,11 @@ static int spoof_not_initial(request_rec *this_r, request_rec *other_r, - saved->other_saved = other_saved; - saved->other_r = other_r; - /* Ensure the conn_rec is spoofed */ -- *remote_in_addr = saved->new_in_addr; -+ if (saved->connection->remote_addr->family != saved->new_addr.family) -+ { -+ return DECLINED; -+ } -+ *saved->connection->remote_addr = saved->new_addr; - this_r->connection->remote_ip = saved->new_remote_ip; - saved->conn_rec_mod_state = CONN_REC_MODIFIED; - /* Force re-evaluation of the remote_host value */ -@@ -589,16 +517,11 @@ static int spoof_not_initial(request_rec *this_r, request_rec *other_r, - * The undo_spoof() function undoes the changes made to a conn_rec - * by spoof_initial() or spoof_not_initial() - */ --static int undo_spoof(MEFsave_rec *saved, request_rec *r, char *phase) -+int extract_forwarded_undo_spoof(MEFsave_rec *saved, request_rec *r, -+ char *phase) - { -- in_addr_t *remote_in_addr; -- if ((remote_in_addr = get_remote_in_addr(saved->connection)) == NULL) -- { -- /* Could not get a valid value so give up */ -- return DECLINED; -- } - /* Do the restoring */ -- *remote_in_addr = saved->orig_in_addr; -+ *saved->connection->remote_addr = saved->orig_addr; - saved->connection->remote_ip = saved->orig_remote_ip; - saved->connection->remote_host = NULL; - ap_get_remote_host(saved->connection, saved->per_dir_config, -@@ -641,16 +564,11 @@ static int undo_spoof(MEFsave_rec *saved, request_rec *r, char *phase) - * subordinate, request_rec which is (should be) using the same - * conn_rec as the primary request - */ --static int redo_spoof(MEFsave_rec *saved, request_rec *r, char *phase) -+int extract_forwarded_redo_spoof(MEFsave_rec *saved, request_rec *r, -+ char *phase) - { -- in_addr_t *remote_in_addr; -- if ((remote_in_addr = get_remote_in_addr(saved->connection)) == NULL) -- { -- /* Could not get a valid value so give up */ -- return DECLINED; -- } - /* Modify it all again */ -- *remote_in_addr = saved->new_in_addr; -+ *saved->connection->remote_addr = saved->new_addr; - saved->connection->remote_ip = saved->new_remote_ip; - saved->connection->remote_host = NULL; - ap_get_remote_host(saved->connection, saved->per_dir_config, -@@ -704,7 +622,7 @@ static int redo_spoof(MEFsave_rec *saved, request_rec *r, char *phase) - static int cleanup_initial(void *data) - { - MEFsave_rec *saved = (MEFsave_rec *)data; -- return undo_spoof(saved, NULL, "cleanup initial"); -+ return extract_forwarded_undo_spoof(saved, NULL, "cleanup initial"); - } - - static int cleanup_not_initial(void *data) -@@ -712,13 +630,15 @@ static int cleanup_not_initial(void *data) - MEFsave_rec *saved = (MEFsave_rec *)data; - if (saved->other_saved->conn_rec_mod_state == CONN_REC_MODIFIED) - { -- return redo_spoof(saved->other_saved, saved->other_r, -- "cleanup not initial"); -+ return extract_forwarded_redo_spoof(saved->other_saved, -+ saved->other_r, -+ "cleanup not initial"); - } - else - { -- return undo_spoof(saved->other_saved, saved->other_r, -- "cleanup not initial"); -+ return extract_forwarded_undo_spoof(saved->other_saved, -+ saved->other_r, -+ "cleanup not initial"); - } - } - -@@ -758,7 +678,7 @@ static int primary_request(request_rec *r, char *phase) - { - if (conf->debug == MEF_DEBUG_ON) - { -- fprintf(stderr,"MEF: phase:%s, $s not acceptabler proxy, %s\n", -+ fprintf(stderr,"MEF: phase:%s, %s not acceptabler proxy, %s\n", - phase, conn->remote_ip, r->unparsed_uri); - fflush(stderr); - } -@@ -917,66 +837,6 @@ static int mef_access_check(request_rec *r) - return mef_composite(r, "access check"); - } - --/* -- * mef_before_proxy_http() is called if Apache 2's HTTP proxy_http handler -- * is about to act and undoes the spoofing of the conn_rec associated with -- * the incoming request if the proxy is about to add information to the -- * request's X-Forwarded-For header. Without this the wrong IP (the -- * spoof one) is added to the X-Forwarded-For header. -- */ --static int mef_before_proxy_http(request_rec *r, -- proxy_server_conf *pconf, -- char *url, const char *proxyname, -- apr_port_t proxyport) --{ -- MEFsave_rec *saved; -- /* -- * If our post-read-request handler did something we may have to too -- */ -- if ((saved = (MEFsave_rec *)ap_get_module_config(r->request_config, -- &extract_forwarded_module)) != NULL) -- { -- /* -- * If proxy_http is going to add X-Forwarded-For info then we have -- * have to undo the changes we made earlier so proxy_http can get -- * it right -- */ -- if (PROXYREQ_REVERSE == r->proxyreq) -- { -- undo_spoof(saved, r, "before proxy http"); -- } -- } -- return DECLINED; --} -- --/* -- * mef_logging() is used to redo the spoofing of the conn_rec associated -- * with the incoming request if was undone. -- * Redoing the spoof is to ensure that the spoof IP is used for logging -- * information about the request -- */ --static int mef_logging(request_rec *r) --{ -- MEFsave_rec *saved; -- /* -- * If our post-read-request handler did something we may have to too -- */ -- if ((saved = (MEFsave_rec *)ap_get_module_config(r->request_config, -- &extract_forwarded_module)) != NULL) -- { -- /* -- * If we undid the spoof, probably because proxy_http was adding -- * X-Forwarded-For info, then we want to redo the changes we -- * undid so the spook IP is logged -- */ -- if (saved->conn_rec_mod_state == CONN_REC_RESTORED) -- { -- redo_spoof(saved, r, "logging"); -- } -- } -- return DECLINED; --} -- - /*--------------------------------------------------------------------------*/ - /* */ - /* Data structures pulling all the mef module's bits together */ -@@ -996,16 +856,6 @@ static void mef_register_hooks(apr_pool_t *p) - * ap_hook_header_parser(mef_header_parser, NULL, NULL, APR_HOOK_FIRST); - */ - ap_hook_access_checker(mef_access_check, NULL, NULL, APR_HOOK_FIRST); --#ifdef USING_proxy_http_module -- /* -- * Only need to register the following handlers if proxy_http_module -- * is going to be loaded -- */ -- static const char *const mef_proxy_b4[] = { "proxy_http.c", NULL }; -- proxy_hook_scheme_handler(mef_before_proxy_http, NULL, mef_proxy_b4, -- APR_HOOK_FIRST); -- ap_hook_log_transaction(mef_logging, NULL, NULL, APR_HOOK_FIRST); --#endif /* USING_proxy_http_module */ - } - - /* -@@ -1015,6 +865,8 @@ static void mef_register_hooks(apr_pool_t *p) - * translation and hence directory information is unavailable for the - * request. - */ -+static char its_an_accept; -+ - static const command_rec mef_cmds[] = - { - AP_INIT_TAKE1( -@@ -1043,15 +895,15 @@ static const command_rec mef_cmds[] = - ), - AP_INIT_ITERATE( - "MEFaccept", /* directive name */ -- mef_accept_proxy, /* config action routine */ -- NULL, /* argument to include in call */ -+ mef_config_proxy, /* config action routine */ -+ &its_an_accept, /* argument to include in call */ - RSRC_CONF, /* where available */ - /* description */ - "One or more proxy names or IPs to accept, or 'all'" - ), - AP_INIT_ITERATE( - "MEFrefuse", /* directive name */ -- mef_refuse_proxy, /* config action routine */ -+ mef_config_proxy, /* config action routine */ - NULL, /* argument to include in call */ - RSRC_CONF, /* where available */ - /* description */ -diff --git a/mod_extract_forwarded.conf b/mod_extract_forwarded.conf -new file mode 100644 -index 0000000..b5606a5 ---- /dev/null -+++ b/mod_extract_forwarded.conf -@@ -0,0 +1,52 @@ -+<IfModule mod_extract_forwarded.c> -+ # MEForder: -+ # This can have either of two value 'refuse,accept' or -+ # 'accept,refuse' and specifies the order in which the -+ # information in two associated directives, MEFaccept -+ # and MEFrefuse, are intepreted. The MEFaccept and -+ # MEFrefuse directives are each used to spcifiy one or -+ # more IP numbers. -+ MEForder refuse,accept -+ -+ # MEFrefuse: -+ # This can be 'all' OR a space separated list of IP numbers -+ # and/or domain names of trusted proxy servers whose IP number -+ # can be derived by DNS from the domain name. The presence of -+ # 'all' overrides any particular IP numbers and means -+ # that no proxy servers are to be trusted. Individual IP -+ # numbers mean that those the proxy servers having them -+ # are not to be trusted. This defaults to 'all'. -+ MEFrefuse all -+ -+ # MEFaccept: -+ # This can be 'all' OR a space separated list of IP numbers -+ # and/or domain names of trusted proxy servers whose IP number -+ # can be derived by DNS from the domain name. The presence of -+ # 'all' overrides any particular IP numbers and means -+ # that all proxy servers are to be trusted. Individual IP -+ # numbers mean that those the proxy servers having them -+ # are to be trusted. This defaults to an empty list of -+ # trusted IP numbers. -+ # MEFaccept <trusted proxy servers' IP numbers> -+ -+ # MEFaddenv: -+ # This can be 'off', 'on' (the default) or a string. 'off' -+ # means that when spoofing, do not add an environment variable -+ # whose value is the IP number of the connecting machine. -+ # 'on' means that when spoofing, add an environment variable -+ # called 'MEF_RPROXY_ADDR' whose value is the IP number of the -+ # connecting machine. A string means that when spoofing, add -+ # an environment variable named by the string supplied whose -+ # value is the IP number of the connecting machine. -+ -+ # MEFdebug: -+ # This can be 'on' or 'off' (the default). When turned 'on' -+ # information about how the mod_extract_forwarded module is -+ # processing every request to your Apache 2 server, and any -+ # associated internal redirects or subsrequests, is written -+ # to the server's error_log. Thhe amount of output written -+ # and the way it is generated is such that you would never -+ # normally want to turn this feature on. This feature is -+ # intended for debugging operation of the mod_extract_forwarded -+ # mod_module and it is unlikely you will want to do that. -+</IfModule> -diff --git a/mod_extract_forwarded.h b/mod_extract_forwarded.h -new file mode 100644 -index 0000000..96b49a1 ---- /dev/null -+++ b/mod_extract_forwarded.h -@@ -0,0 +1,131 @@ -+/* ==================================================================== -+ * The Apache Software License, Version 1.1 -+ * -+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights -+ * reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. The end-user documentation included with the redistribution, -+ * if any, must include the following acknowledgment: -+ * "This product includes software developed by the -+ * Apache Software Foundation (http://www.apache.org/)." -+ * Alternately, this acknowledgment may appear in the software itself, -+ * if and wherever such third-party acknowledgments normally appear. -+ * -+ * 4. The names "Apache" and "Apache Software Foundation" must -+ * not be used to endorse or promote products derived from this -+ * software without prior written permission. For written -+ * permission, please contact apache@apache.org. -+ * -+ * 5. Products derived from this software may not be called "Apache", -+ * nor may "Apache" appear in their name, without prior written -+ * permission of the Apache Software Foundation. -+ * -+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR -+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * ==================================================================== -+ * -+ * This software consists of voluntary contributions made by many -+ * individuals on behalf of the Apache Software Foundation. For more -+ * information on the Apache Software Foundation, please see -+ * <http://www.apache.org/>. -+ * -+ */ -+ -+#ifndef MOD_EXTRACT_FORWARDED_H -+#define MOD_EXTRACT_FORWARDED_H -+ -+#include "mod_proxy.h" -+#include "mod_extract_forwarded.h" -+ -+extern module AP_MODULE_DECLARE_DATA extract_forwarded_module; -+ -+/* -+ * Per directory configuration record. -+ */ -+typedef struct { -+ int order; /* order in which the accept and refuse specs are applied */ -+ int debug; /* debug output to error log flag */ -+ const char *envar; /* name of env var to add */ -+ apr_table_t *accept_proxies; /* proxies to trust */ -+ apr_table_t *refuse_proxies; /* proxies to distrust */ -+} mef_config; -+ -+/* -+ * Two possible orders in which the accept and refuse specs are applied -+ */ -+#define REFUSE_THEN_ACCEPT 0 -+#define ACCEPT_THEN_REFUSE 1 -+ -+/* -+ * To output debug info to error log or not -+ */ -+#define MEF_DEBUG_OFF 0 -+#define MEF_DEBUG_ON 1 -+ -+/* -+ * Maximum number of IPs in an X-Forwarded-For header of a request before -+ * it is treated a excessive and hence absurd -+ */ -+#define MEF_ABSURD_PROXY_LIMIT 32 -+/* -+ * Default environment variable name -+ */ -+#define MEF_PROXY_ADDR "MEF_PROXY_ADDR" -+ -+/* -+ * The MEFsave_rec data structure is used to preserve information that -+ * this module has modified in the conn_rec associated with a request -+ * so that the conn_rec can be restored to its original state as needed. -+ * It also carries information between transaction phases and internal -+ * redirects and subrequests -+ */ -+typedef struct MEFsave_rec MEFsave_rec; -+ -+struct MEFsave_rec { -+ conn_rec *connection; /* connection record being used */ -+ apr_sockaddr_t orig_addr; /* original remote address */ -+ apr_sockaddr_t new_addr; /* modified remote address */ -+ char *orig_remote_ip; /* original remote_ip */ -+ char *new_remote_ip; /* modified remote_ip */ -+ int conn_rec_mod_state; /* conn_rec modification state */ -+ int debug; /* are we printing MEF debug */ -+ const char *envar; /* name of env var to add */ -+ void *per_dir_config; /* per_dir_config applicable */ -+ MEFsave_rec *other_saved; /* any preceding req's save_rec */ -+ request_rec *other_r; /* any preceding req's request_rec */ -+}; -+ -+#define CONN_REC_MODIFIED 1 -+#define CONN_REC_RESTORED 0 -+ -+/* -+ * Functions provided by mod_extract_forwarded -+ */ -+extern int extract_forwarded_undo_spoof(MEFsave_rec *saved, request_rec *r, -+ char *phase); -+extern int extract_forwarded_redo_spoof(MEFsave_rec *saved, request_rec *r, -+ char *phase); -+ -+#endif -diff --git a/mod_extract_forwarded_proxy.c b/mod_extract_forwarded_proxy.c -new file mode 100644 -index 0000000..1b53d36 ---- /dev/null -+++ b/mod_extract_forwarded_proxy.c -@@ -0,0 +1,175 @@ -+/* ==================================================================== -+ * The Apache Software License, Version 1.1 -+ * -+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights -+ * reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. The end-user documentation included with the redistribution, -+ * if any, must include the following acknowledgment: -+ * "This product includes software developed by the -+ * Apache Software Foundation (http://www.apache.org/)." -+ * Alternately, this acknowledgment may appear in the software itself, -+ * if and wherever such third-party acknowledgments normally appear. -+ * -+ * 4. The names "Apache" and "Apache Software Foundation" must -+ * not be used to endorse or promote products derived from this -+ * software without prior written permission. For written -+ * permission, please contact apache@apache.org. -+ * -+ * 5. Products derived from this software may not be called "Apache", -+ * nor may "Apache" appear in their name, without prior written -+ * permission of the Apache Software Foundation. -+ * -+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR -+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * ==================================================================== -+ * -+ * This software consists of voluntary contributions made by many -+ * individuals on behalf of the Apache Software Foundation. For more -+ * information on the Apache Software Foundation, please see -+ * <http://www.apache.org/>. -+ * -+ */ -+ -+#include "mod_proxy.h" -+ -+#include "mod_extract_forwarded.h" -+ -+/* -+ * The undo_spoof() function undoes the changes made to a conn_rec by -+ * spoof_initial() or spoof_not_initial() -+ */ -+extern int extract_forwarded_undo_spoof(MEFsave_rec *saved, request_rec *r, -+ char *phase); -+ -+/* -+ * The redo_spoof() function reapplies the changes made to a -+ * conn_rec by spoof_initial() or spoof_not_initial(): -+ * -+ * 1. after a prior call to undo_spoof has removed them, typically -+ * because of proxy_http reverse-proxy X-Forwarded-For issue -+ * 2. when an internal redirect or subrequest has generated a new -+ * subordinate, request_rec which is (should be) using the same -+ * conn_rec as the primary request -+ */ -+extern int extract_forwarded_redo_spoof(MEFsave_rec *saved, request_rec *r, -+ char *phase); -+ -+/* -+ * mef_before_proxy_http() is called if Apache 2's HTTP proxy_http handler -+ * is about to act and undoes the spoofing of the conn_rec associated with -+ * the incoming request if the proxy is about to add information to the -+ * request's X-Forwarded-For header. Without this the wrong IP (the -+ * spoof one) is added to the X-Forwarded-For header. -+ */ -+static int mef_before_proxy_http(request_rec *r, -+#if AP_SERVER_MINORVERSION_NUMBER >= 2 -+ proxy_worker *worker, -+#endif -+ proxy_server_conf *pconf, -+ char *url, const char *proxyname, -+ apr_port_t proxyport) -+{ -+ MEFsave_rec *saved; -+ /* -+ * If our post-read-request handler did something we may have to too -+ */ -+ if ((saved = (MEFsave_rec *)ap_get_module_config(r->request_config, -+ &extract_forwarded_module)) != NULL) -+ { -+ /* -+ * If proxy_http is going to add X-Forwarded-For info then we have -+ * have to undo the changes we made earlier so proxy_http can get -+ * it right -+ */ -+ if (PROXYREQ_REVERSE == r->proxyreq) -+ { -+ extract_forwarded_undo_spoof(saved, r, "before proxy http"); -+ } -+ } -+ return DECLINED; -+} -+ -+/* -+ * mef_logging() is used to redo the spoofing of the conn_rec associated -+ * with the incoming request if was undone. -+ * Redoing the spoof is to ensure that the spoof IP is used for logging -+ * information about the request -+ */ -+static int mef_logging(request_rec *r) -+{ -+ MEFsave_rec *saved; -+ /* -+ * If our post-read-request handler did something we may have to too -+ */ -+ if ((saved = (MEFsave_rec *)ap_get_module_config(r->request_config, -+ &extract_forwarded_module)) != NULL) -+ { -+ /* -+ * If we undid the spoof, probably because proxy_http was adding -+ * X-Forwarded-For info, then we want to redo the changes we -+ * undid so the spook IP is logged -+ */ -+ if (saved->conn_rec_mod_state == CONN_REC_RESTORED) -+ { -+ redo_spoof(saved, r, "logging"); -+ } -+ } -+ return DECLINED; -+} -+ -+/*--------------------------------------------------------------------------*/ -+/* */ -+/* Data structures pulling all the mef module's bits together */ -+/* */ -+/*--------------------------------------------------------------------------*/ -+/* -+ * mef module's functions attached to request processing hooks. -+ */ -+static void mef_register_hooks(apr_pool_t *p) -+{ -+ /* -+ * Only need to register the following handlers if proxy_http_module -+ * is going to be loaded -+ */ -+ static const char *const mef_proxy_b4[] = { "proxy_http.c", NULL }; -+ proxy_hook_scheme_handler(mef_before_proxy_http, NULL, mef_proxy_b4, -+ APR_HOOK_FIRST); -+ ap_hook_log_transaction(mef_logging, NULL, NULL, APR_HOOK_FIRST); -+} -+ -+/* -+ * mef module's definition for configuration. -+ */ -+module AP_MODULE_DECLARE_DATA extract_forwarded_module = -+{ -+ STANDARD20_MODULE_STUFF, -+ NULL, /* per-directory config creator */ -+ NULL, /* dir config merger */ -+ NULL, /* server config creator */ -+ NULL, /* server config merger */ -+ NULL, /* command table */ -+ mef_register_hooks, /* set up other request processing hooks */ -+}; diff --git a/www/mod_extract_forwarded/pkg-descr b/www/mod_extract_forwarded/pkg-descr deleted file mode 100644 index e481f9bdbfbc..000000000000 --- a/www/mod_extract_forwarded/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -mod_extract_forwarded hooks itself into Apache's header parsing phase and looks -for the X-Forwarded-For header which some (most?) proxies add to the proxied -HTTP requests. It extracts the IP from the X-Forwarded-For and modifies the -connection data so to the rest of Apache the request looks like it came from -that IP rather than the proxy IP. - -mod_extract_forwarded can be dangerous for host based access control because -X-Forwarded-For is easily spoofed. Because of this you can configure which -proxies you trust or don't trust. - -WWW: http://www.openinfo.co.uk/apache/ diff --git a/www/mod_extract_forwarded/pkg-message b/www/mod_extract_forwarded/pkg-message deleted file mode 100644 index de71faa90343..000000000000 --- a/www/mod_extract_forwarded/pkg-message +++ /dev/null @@ -1,15 +0,0 @@ -************************************************************ -You've installed mod_extract_forward, an Apache module that -can make proxied requests appear with client IPs. - -Edit your apache.conf or httpd.conf to enable and setup this -module. Have a look at the files in -${PREFIX}/share/doc/mod_extract_forward for information on -how to configure it. - -Then do this to make it work effective: - -# apachectl configtest (see if there are any config errors) -# apachectl restart - -************************************************************ diff --git a/www/mod_hosts_access/Makefile b/www/mod_hosts_access/Makefile deleted file mode 100644 index 9a6d4ea450a1..000000000000 --- a/www/mod_hosts_access/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Created by: will -# $FreeBSD$ - -PORTNAME= mod_hosts_access -PORTVERSION= 1.1.0 -PORTREVISION= 1 -CATEGORIES= www -MASTER_SITES= LOCAL/pgollucci - -MAINTAINER= apache@FreeBSD.org -COMMENT= Apache module that makes Apache respect hosts.allow and hosts.deny - -LICENSE= APACHE20 - -USES= apache:2.2 -AP_FAST_BUILD= yes -AP_GENPLIST= yes - -AP_LIB+= ${LOCALBASE}/lib -lwrap - -.include <bsd.port.mk> diff --git a/www/mod_hosts_access/distinfo b/www/mod_hosts_access/distinfo deleted file mode 100644 index 93c50c43786f..000000000000 --- a/www/mod_hosts_access/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mod_hosts_access-1.1.0.tar.gz) = 1b390eccf207c4599481261f2b178e18a1acc9c5191d80139e13391b68563c9c -SIZE (mod_hosts_access-1.1.0.tar.gz) = 8864 diff --git a/www/mod_hosts_access/pkg-descr b/www/mod_hosts_access/pkg-descr deleted file mode 100644 index 51c1f4b9420a..000000000000 --- a/www/mod_hosts_access/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -mod_hosts_access allows you to use the hosts.allow and hosts.deny -files to configure access to your Apache webserver. This is the -stable version 1.0.0. Nothing has changed apart from the homepage -and some documentation glitches. - -WWW: http://www.klomp.org/mod_hosts_access/ diff --git a/www/mod_log_config-st/Makefile b/www/mod_log_config-st/Makefile deleted file mode 100644 index 0f70b8d4b413..000000000000 --- a/www/mod_log_config-st/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Created by: Clement Laforet <clement@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= mod_log_config-st -PORTVERSION= 1.03 -PORTREVISION= 2 -CATEGORIES= www -MASTER_SITES= http://bsdforge.com/projects/source/www/mod_log_mysql/ -DIST_SUBDIR= apache2 - -MAINTAINER= portmaster@bsdforge.com -COMMENT= Modified version of mod_log_config for Apache 2.2.x - -LICENSE= APACHE11 - -USES= apache:2.2 tar:xz -AP_FAST_BUILD= yes -SRC_FILE= mod_log_config.c -SHORTMODNAME= log_config -MODULENAME= mod_log_config-st - -.include <bsd.port.mk> diff --git a/www/mod_log_config-st/distinfo b/www/mod_log_config-st/distinfo deleted file mode 100644 index cebe0c1c7ce8..000000000000 --- a/www/mod_log_config-st/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (apache2/mod_log_config-st-1.03.tar.xz) = 825e949a14a8118600fc98ecee61eaee931c836ec0cc2c923f142f334774e8d0 -SIZE (apache2/mod_log_config-st-1.03.tar.xz) = 14128 diff --git a/www/mod_log_config-st/pkg-descr b/www/mod_log_config-st/pkg-descr deleted file mode 100644 index f536024b2a59..000000000000 --- a/www/mod_log_config-st/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -mod_log_config-st is a patched version of mod_log_config by Sonke -Tesch. It's fully backward-compatible and it adds logic to give -other log writers a more detailed view of the data to be logged. - -WWW: http://bsdforge.com/projects/www/mod_log_mysql/ diff --git a/www/mod_log_config-st/pkg-message b/www/mod_log_config-st/pkg-message deleted file mode 100644 index 34e7b8649264..000000000000 --- a/www/mod_log_config-st/pkg-message +++ /dev/null @@ -1,8 +0,0 @@ - !!!! WARNING !!!! - mod_log_config and mod_log_config-st are conflicting. - -In order to use mod_log_config-st correctly, you have to replace: -LoadModule log_config_module libexec/apache2/mod_log_config.so -by -LoadModule log_config_module libexec/apache2/mod_log_config-st.so -in your httpd.conf. diff --git a/www/mod_log_config-st/pkg-plist b/www/mod_log_config-st/pkg-plist deleted file mode 100644 index e3b67e9e9ae2..000000000000 --- a/www/mod_log_config-st/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -%%APACHEMODDIR%%/%%AP_MODULE%% -@unexec /usr/bin/sed -i '' '/%%AP_NAME%%-st.so/d' %D/%%APACHEETCDIR%%/httpd.conf diff --git a/www/mod_log_mysql/Makefile b/www/mod_log_mysql/Makefile deleted file mode 100644 index f747d9aeb6f5..000000000000 --- a/www/mod_log_mysql/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# Created by: Clement Laforet <clement@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= mod_log_mysql -PORTVERSION= 1.04 -PORTREVISION= 2 -CATEGORIES= www -MASTER_SITES= http://bsdforge.com/projects/source/www/mod_log_mysql/ -DIST_SUBDIR= apache2 - -MAINTAINER= portmaster@bsdforge.com -COMMENT= Allows Apache 2.2.x to log to a MySQL database - -LICENSE= PD APACHE11 -LICENSE_COMB= multi - -USES= apache:2.2 tar:xz -RUN_DEPENDS+= ${LOCALBASE}/${APACHEMODDIR}/mod_log_config-st.so:www/mod_log_config-st - -AP_FAST_BUILD= yes -AP_GENPLIST= yes -USE_MYSQL= yes - -AP_INC+= ${LOCALBASE}/include/mysql -AP_LIB+= ${LOCALBASE}/lib/mysql -lmysqlclient - -.include <bsd.port.mk> diff --git a/www/mod_log_mysql/distinfo b/www/mod_log_mysql/distinfo deleted file mode 100644 index e24edccd12c5..000000000000 --- a/www/mod_log_mysql/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (apache2/mod_log_mysql-1.04.tar.xz) = 1f891699599e2aa7f83a260bf1c613b36c47770507a8e7a330f05db24514f5c4 -SIZE (apache2/mod_log_mysql-1.04.tar.xz) = 7568 diff --git a/www/mod_log_mysql/files/patch-mod_log_mysql.c b/www/mod_log_mysql/files/patch-mod_log_mysql.c deleted file mode 100644 index 4b7df5982c9e..000000000000 --- a/www/mod_log_mysql/files/patch-mod_log_mysql.c +++ /dev/null @@ -1,16 +0,0 @@ ---- mod_log_mysql.c 2014-01-10 13:56:23.777364558 -0800 -+++ mod_log_mysql.c.new 2014-01-10 13:58:54.058985546 -0800 -@@ -142,11 +142,13 @@ - { - mysql_log *l = param; - MYSQL *db; -+ my_bool do_reconnect = 1; - - db = apr_palloc(p, sizeof(MYSQL)); - - mysql_init(db); - mysql_options(db, MYSQL_READ_DEFAULT_GROUP, "mod_log_mysql"); -+ mysql_options(db, MYSQL_OPT_RECONNECT,&do_reconnect); - - if (! mysql_real_connect(db, l->host, l->user, l->passwd, l->database, l->port, l->socket, 0)) { - ap_log_perror(APLOG_MARK, APLOG_CRIT, 0, p, "log database %s: %s", l->uri, mysql_error(db)); diff --git a/www/mod_log_mysql/pkg-descr b/www/mod_log_mysql/pkg-descr deleted file mode 100644 index 00df0187c392..000000000000 --- a/www/mod_log_mysql/pkg-descr +++ /dev/null @@ -1,18 +0,0 @@ -mod_log_mysql is a module for the Apache 2 webserver which permits -request logging into a MySQL database. - -Key features are: - * Seamless integration into the standard Apache logging - configuration. - * Only a single configuration line needed to start logging. - * Free SQL use. - * Multiple databases, database users and/or database servers. - * Connection pooling, only one connection per log target, per - child process. - * Logs data as it is: e.g. times as SQL DATETIME and n/a items - as SQL NULL. - * Won't loose data if the database server is down. - -Note: this module requires mod_log_config-st - -WWW: http://bsdforge.com/projects/www/mod_log_mysql/ diff --git a/www/mod_log_sql2-dtc/Makefile b/www/mod_log_sql2-dtc/Makefile deleted file mode 100644 index 6be5413d7aeb..000000000000 --- a/www/mod_log_sql2-dtc/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# Created by: Marc G. Fournier <scrappy@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= mod_log_sql -PORTVERSION= 1.101 -PORTREVISION= 7 -CATEGORIES= www databases -MASTER_SITES= http://www.outoforder.cc/downloads/${PORTNAME}/ -PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} -PKGNAMESUFFIX= -dtc - -MAINTAINER= apache@FreeBSD.org -COMMENT= Allows Apache to log to a MySQL database - -OPTIONS_DEFINE= DBI -DBI_DESC= depend on databases/libdbi - -OPTIONS_SUB= yes -DBI_CONFIGURE_ON= --with-dbi=${LOCALBASE} -DBI_CONFIGURE_OFF= --without-dbi -DBI_LIB_DEPENDS= libdbi.so:databases/libdbi - -GNU_CONFIGURE= yes -USES= apache:2.2 gmake tar:bzip2 -USE_MYSQL= yes - -CONFIGURE_ARGS+= --with-apxs=${APXS} -LIBS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql - -post-patch: - ${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \ - ${WRKSRC}/Makefile.in - -pre-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} - -.include <bsd.port.mk> diff --git a/www/mod_log_sql2-dtc/distinfo b/www/mod_log_sql2-dtc/distinfo deleted file mode 100644 index 2294e79a9daf..000000000000 --- a/www/mod_log_sql2-dtc/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mod_log_sql-1.101.tar.bz2) = 0907579b0466844f7f1886af92a9ea36b4815ec869929ba577c74d32b6d69a5e -SIZE (mod_log_sql-1.101.tar.bz2) = 127500 diff --git a/www/mod_log_sql2-dtc/files/patch-Makefile.in b/www/mod_log_sql2-dtc/files/patch-Makefile.in deleted file mode 100644 index 1be467baf53a..000000000000 --- a/www/mod_log_sql2-dtc/files/patch-Makefile.in +++ /dev/null @@ -1,50 +0,0 @@ ---- ./Makefile.in.orig 2006-11-05 04:47:23.000000000 +0100 -+++ ./Makefile.in 2014-03-16 15:16:25.000000000 +0100 -@@ -12,6 +12,7 @@ - winconfig.h - - CFLAGS = -Wc,-Wall -Wc,-fno-strict-aliasing -+APX_STAGE= @APXS_STAGE@ - - ifeq (@OOO_MAINTAIN@,1) - CFLAGS += -Wc,-Werror -@@ -151,21 +152,21 @@ - @DEFS@ @AP_DEFS@ $(dbiLDADD) $(dbiSOURCES) - - install: $(TARGETS) install-subdirs -- @@APXS_BIN@ -n $(coreNAME) -i $(coreTARGET); \ -+ @@APXS_BIN@ @APXS_STAGE@ -n $(coreNAME) -i $(coreTARGET); \ - if test @WANT_MYSQL_MOD@ -eq 1; then \ -- @APXS_BIN@ -n $(mysqlNAME) -i $(mysqlTARGET); \ -+ @APXS_BIN@ @APXS_STAGE@ -n $(mysqlNAME) -i $(mysqlTARGET); \ - fi; \ - if test @WANT_PGSQL_MOD@ -eq 1; then \ -- @APXS_BIN@ -n $(pgsqlNAME) -i $(pgsqlTARGET); \ -+ @APXS_BIN@ @APXS_STAGE@ -n $(pgsqlNAME) -i $(pgsqlTARGET); \ - fi; \ - if test @WANT_DBI_MOD@ -eq 1; then \ -- @APXS_BIN@ -n $(dbiNAME) -i $(dbiTARGET); \ -+ @APXS_BIN@ @APXS_STAGE@ -n $(dbiNAME) -i $(dbiTARGET); \ - fi; \ - if test @WANT_SSL_MOD@ -eq 1; then \ -- @APXS_BIN@ -n $(sslNAME) -i $(sslTARGET); \ -+ @APXS_BIN@ @APXS_STAGE@ -n $(sslNAME) -i $(sslTARGET); \ - fi; \ - if test @WANT_LOGIO_MOD@ -eq 1; then \ -- @APXS_BIN@ -n $(logioNAME) -i $(logioTARGET); \ -+ @APXS_BIN@ @APXS_STAGE@ -n $(logioNAME) -i $(logioTARGET); \ - fi; \ - echo "*************************************************************************"; \ - echo "*** The mod_log_sql modules have been installed."; \ -@@ -183,9 +184,9 @@ - echo "*************************************************************************"; - - activate: activate-subdirs -- @@APXS_BIN@ -n $(coreNAME) -i -a $(coreTARGET); \ -+ @@APXS_BIN@ @APXS_STAGE@ -n $(coreNAME) -i $(coreTARGET); \ - if test @WANT_SSL_MOD@ -eq 1; then \ -- @APXS_BIN@ -n $(sslNAME) -i -a $(sslTARGET); \ -+ @APXS_BIN@ @APXS_STAGE@ -n $(sslNAME) -i $(sslTARGET); \ - fi - - clean: clean-subdirs diff --git a/www/mod_log_sql2-dtc/files/patch-functions13.h b/www/mod_log_sql2-dtc/files/patch-functions13.h deleted file mode 100644 index 050882bcd7d0..000000000000 --- a/www/mod_log_sql2-dtc/files/patch-functions13.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./functions13.h.orig 2004-04-29 18:05:24.000000000 +0000 -+++ ./functions13.h 2009-12-27 01:38:18.620401873 +0000 -@@ -37,7 +37,7 @@ - - static const char *extract_request_duration(request_rec *r, char *a) - { -- return ap_psprintf(r->pool, "%ld", time(NULL) - r->request_time); -+ return ap_psprintf(r->pool, "%ld", (long)time(NULL) - r->request_time); - } - - static const char *extract_request_timestamp(request_rec *r, char *a) diff --git a/www/mod_log_sql2-dtc/files/patch-mod_log_sql.c b/www/mod_log_sql2-dtc/files/patch-mod_log_sql.c deleted file mode 100644 index 29769e9d6d8f..000000000000 --- a/www/mod_log_sql2-dtc/files/patch-mod_log_sql.c +++ /dev/null @@ -1,131 +0,0 @@ ---- mod_log_sql.c.orig 2006-11-06 23:43:23.000000000 -0300 -+++ mod_log_sql.c 2010-08-20 17:09:29.000000000 -0300 -@@ -37,6 +37,11 @@ - #define DEFAULT_HOUT_TABLE_NAME "headers_out" - #define DEFAULT_COOKIE_TABLE_NAME "cookies" - #define DEFAULT_PRESERVE_FILE "logs/mod_log_sql-preserve" -+#define DEFAULT_SCOREBOARD_DOMAIN "www" -+#define DEFAULT_SCOREBOARD_SUBDOMAIN "default-domain.tld" -+#define DEFAULT_SCOREBOARD_TABLE_NAME "scoreboard" -+ -+#include <time.h> - - /* -------------* - * DECLARATIONS * -@@ -96,6 +101,9 @@ - logsql_item **parsed_log_format; - const char *preserve_file; - const char *cookie_name; -+ const char *scoreboard_domain; -+ const char *scoreboard_subdomain; -+ const char *scoreboard_table_name; - } logsql_state; - - -@@ -460,6 +468,10 @@ - } - } - -+static char* log_sql_insert_enclose(char* insert_close,request_rec *r) { -+ return global_config.driver->enclose_insert_ignore(insert_close,r); -+} -+ - /* post_config / module_init */ - #if defined(WITH_APACHE20) - static int log_sql_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s) -@@ -648,6 +660,9 @@ - cls->hout_table_name = DEFAULT_HOUT_TABLE_NAME; - cls->cookie_table_name = DEFAULT_COOKIE_TABLE_NAME; - cls->preserve_file = DEFAULT_PRESERVE_FILE; -+ cls->scoreboard_domain = DEFAULT_SCOREBOARD_DOMAIN; -+ cls->scoreboard_subdomain = DEFAULT_SCOREBOARD_SUBDOMAIN; -+ cls->scoreboard_table_name = DEFAULT_SCOREBOARD_TABLE_NAME; - - cls->transfer_ignore_list = apr_array_make(p, 1, sizeof(char *)); - cls->transfer_accept_list = apr_array_make(p, 1, sizeof(char *)); -@@ -759,6 +774,15 @@ - if (child->cookie_table_name == DEFAULT_COOKIE_TABLE_NAME) - child->cookie_table_name = parent->cookie_table_name; - -+ if (child->scoreboard_domain == DEFAULT_SCOREBOARD_DOMAIN) -+ child->scoreboard_domain = parent->scoreboard_domain; -+ -+ if (child->scoreboard_subdomain == DEFAULT_SCOREBOARD_SUBDOMAIN) -+ child->scoreboard_subdomain = parent->scoreboard_subdomain; -+ -+ if (child->scoreboard_table_name == DEFAULT_SCOREBOARD_TABLE_NAME) -+ child->scoreboard_table_name = parent->scoreboard_table_name; -+ - DO_MERGE_ARRAY(parent->transfer_ignore_list, child->transfer_ignore_list, subp); - DO_MERGE_ARRAY(parent->transfer_accept_list, child->transfer_accept_list, subp); - DO_MERGE_ARRAY(parent->remhost_ignore_list, child->remhost_ignore_list, subp); -@@ -790,6 +814,10 @@ - const char *hout_tablename = cls->hout_table_name; - const char *hin_tablename = cls->hin_table_name; - const char *cookie_tablename = cls->cookie_table_name; -+ const char *scoreboard_domain = cls->scoreboard_domain; -+ const char *scoreboard_subdomain = cls->scoreboard_subdomain; -+ const char *scoreboard_table_name = cls->scoreboard_table_name; -+ struct timeval now_time; - if (global_config.driver == NULL) { - return OK; - } -@@ -1110,6 +1138,39 @@ - if (cookie_query) - safe_sql_insert(orig, LOGSQL_TABLE_COOKIES,cookie_tablename,cookie_query); - -+ gettimeofday(&now_time, (struct timeval*)0); -+ -+ { -+ const char *score_query_insert; -+ const char *score_query_update; -+ const char *score_query_insert_ignore; -+ struct tm *ptr; -+ time_t tm; -+ char sql_month[60]; -+ char sql_year[60]; -+ char a[60]; -+ char* bytes_sent; -+ -+ tm = time(NULL); -+ ptr = localtime(&tm); -+ strftime(sql_month ,100 , "\%m",ptr); -+ strftime(sql_year ,100 , "\%Y",ptr); -+ -+ score_query_insert = apr_psprintf(r->pool, " %s (domain,vhost,month,year,count_impressions) values ('%s','%s','%s','%s','0')" -+ ,scoreboard_table_name,scoreboard_domain,scoreboard_subdomain,sql_month,sql_year); -+ // Add insert ignore into ... ; -+ // or begin; insert into ... ; commit; -+ // depending on the drive used -+ score_query_insert_ignore = log_sql_insert_enclose(score_query_insert,r); -+ -+ safe_sql_insert(orig,LOGSQL_TABLE_SCORE,"score_board",score_query_insert_ignore); -+ bytes_sent = extract_bytes_sent(r, a); -+ if (bytes_sent[0] != '-'){ -+ score_query_update = apr_psprintf(r->pool, "update %s SET count_impressions = count_impressions+1, bytes_sent = bytes_sent+%s WHERE domain='%s' AND vhost='%s' AND month='%s' AND year='%s'" -+ ,scoreboard_table_name,extract_bytes_sent(r, a),scoreboard_domain,scoreboard_subdomain,sql_month,sql_year); -+ safe_sql_insert(orig,LOGSQL_TABLE_SCORE,"score_board",score_query_update); -+ } -+ } - return OK; - } - } -@@ -1171,6 +1232,18 @@ - (void *)APR_OFFSETOF(logsql_state, cookie_table_name), RSRC_CONF, - "The database table that holds the cookie info") - , -+ AP_INIT_TAKE1("LogSQLScoreDomain", set_server_nmv_string_slot, -+ (void *)APR_OFFSETOF(logsql_state, scoreboard_domain), RSRC_CONF, -+ "The domain to set in scoreboard") -+ , -+ AP_INIT_TAKE1("LogSQLScoreSubdomain", set_server_nmv_string_slot, -+ (void *)APR_OFFSETOF(logsql_state, scoreboard_subdomain), RSRC_CONF, -+ "The subdomain to set in scoreboard") -+ , -+ AP_INIT_TAKE1("LogSQLScoreTable", set_server_nmv_string_slot, -+ (void *)APR_OFFSETOF(logsql_state, scoreboard_table_name), RSRC_CONF, -+ "The scoreboard to log in") -+ , - /* Log format */ - AP_INIT_TAKE1("LogSQLTransferLogFormat", set_logformat_slot, - NULL, RSRC_CONF, diff --git a/www/mod_log_sql2-dtc/files/patch-mod_log_sql.h b/www/mod_log_sql2-dtc/files/patch-mod_log_sql.h deleted file mode 100644 index 4e5d5b6d9ecf..000000000000 --- a/www/mod_log_sql2-dtc/files/patch-mod_log_sql.h +++ /dev/null @@ -1,21 +0,0 @@ ---- ./mod_log_sql.h.orig 2007-08-06 00:03:47.000000000 +0800 -+++ ./mod_log_sql.h 2007-08-06 00:52:49.000000000 +0800 -@@ -67,7 +67,8 @@ - LOGSQL_TABLE_NOTES, - LOGSQL_TABLE_HEADERSOUT, - LOGSQL_TABLE_HEADERSIN, -- LOGSQL_TABLE_COOKIES -+ LOGSQL_TABLE_COOKIES, -+ LOGSQL_TABLE_SCORE - } logsql_tabletype; - - /* All Tables */ -@@ -96,6 +97,8 @@ - /* create a SQL table named table_name of table_type */ - logsql_table_ret (*create_table)(request_rec *r, logsql_dbconnection *db, - logsql_tabletype table_type, const char *table_name); -+ /* enclose an insert query with parameters to make it an insert ignore */ -+ const char * (*enclose_insert_ignore)(const char* insert_query,request_rec *r); - } logsql_dbdriver; - - LOGSQL_DECLARE(void) log_sql_register_driver(apr_pool_t *p, diff --git a/www/mod_log_sql2-dtc/files/patch-mod_log_sql_mysql.c b/www/mod_log_sql2-dtc/files/patch-mod_log_sql_mysql.c deleted file mode 100644 index cdeccda5dd2e..000000000000 --- a/www/mod_log_sql2-dtc/files/patch-mod_log_sql_mysql.c +++ /dev/null @@ -1,23 +0,0 @@ ---- ./mod_log_sql_mysql.c.orig 2007-08-06 00:55:32.000000000 +0800 -+++ ./mod_log_sql_mysql.c 2007-08-06 00:52:59.000000000 +0800 -@@ -250,6 +250,10 @@ - return LOGSQL_TABLE_SUCCESS; - } - -+static char *make_mysql_ignore_insert(char * insert_query, request_rec *r) { -+ return apr_psprintf(r->pool, "insert ignore into %s ;",insert_query); -+} -+ - static const char *supported_drivers[] = {"mysql",NULL}; - static logsql_dbdriver mysql_driver = { - "mysql", -@@ -258,7 +262,8 @@ - log_sql_mysql_close, /* close DB connection */ - log_sql_mysql_escape, /* escape query */ - log_sql_mysql_query, /* insert query */ -- log_sql_mysql_create /* create table */ -+ log_sql_mysql_create, /* create table */ -+ make_mysql_ignore_insert /* insert ignore */ - }; - - LOGSQL_REGISTER(mysql) { diff --git a/www/mod_log_sql2-dtc/files/patch-mod_log_sql_pgsql.c b/www/mod_log_sql2-dtc/files/patch-mod_log_sql_pgsql.c deleted file mode 100644 index 421b535524e6..000000000000 --- a/www/mod_log_sql2-dtc/files/patch-mod_log_sql_pgsql.c +++ /dev/null @@ -1,23 +0,0 @@ ---- ./mod_log_sql_pgsql.c.orig 2007-08-06 00:55:44.000000000 +0800 -+++ ./mod_log_sql_pgsql.c 2007-08-06 00:52:55.000000000 +0800 -@@ -235,6 +235,10 @@ - return LOGSQL_TABLE_SUCCESS; - } - -+static char *make_pgsql_ignore_insert(char * insert_query, request_rec *r) { -+ return apr_psprintf(r->pool, "begin ; insert into %s ; commit ;",insert_query); -+} -+ - static char *supported_drivers[] = {"pgsql",NULL}; - static logsql_dbdriver pgsql_driver = { - supported_drivers, -@@ -242,7 +246,8 @@ - log_sql_pgsql_close, /* close DB connection */ - log_sql_pgsql_escape, /* escape query */ - log_sql_pgsql_query, /* insert query */ -- log_sql_pgsql_create /* create table */ -+ log_sql_pgsql_create, /* create table */ -+ make_pgsql_ignore_insert /* insert ignore statement */ - }; - - LOGSQL_REGISTER(pgsql) { diff --git a/www/mod_log_sql2-dtc/pkg-descr b/www/mod_log_sql2-dtc/pkg-descr deleted file mode 100644 index cb25b6d20072..000000000000 --- a/www/mod_log_sql2-dtc/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This add-on module allows the apache web server to use a MySQL database for -logging of all operations. - -WWW: http://www.outoforder.cc/projects/apache/mod_log_sql/ diff --git a/www/mod_log_sql2-dtc/pkg-plist b/www/mod_log_sql2-dtc/pkg-plist deleted file mode 100644 index d450643cea4f..000000000000 --- a/www/mod_log_sql2-dtc/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -%%APACHEMODDIR%%/%%AP_MODULE%% -@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F -@unexec /usr/bin/sed -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf -%%APACHEMODDIR%%/mod_log_sql_mysql.so -%%APACHEMODDIR%%/mod_log_sql_logio.so -%%APACHEMODDIR%%/mod_log_sql_ssl.so -@exec %D/sbin/apxs -e -a -n log_sql_ssl %D/%F -@unexec /usr/bin/sed -i '' '/LoadModule log_sql_ssl_module/d' %D/%%APACHEETCDIR%%/httpd.conf -%%DBI%%%%APACHEMODDIR%%/mod_log_sql_dbi.so diff --git a/www/mod_macro22/Makefile b/www/mod_macro22/Makefile deleted file mode 100644 index e3d6fda500b9..000000000000 --- a/www/mod_macro22/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Created by: Lukasz Wasikowski <lukasz@wasikowski.net> -# $FreeBSD$ - -PORTNAME= mod_macro -PORTVERSION= 1.1.11 -CATEGORIES= www -MASTER_SITES= http://www.cri.ensmp.fr/~coelho/mod_macro/ - -MAINTAINER= lukasz@wasikowski.net -COMMENT= Apache 2.2.x module for use macros in config files - -LICENSE= mod_macro -LICENSE_NAME= mod_macro license (apache with postcard request) -LICENSE_FILE= ${WRKSRC}/LICENSE -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept - -OPTIONS_DEFINE= DOCS - -.include <bsd.port.options.mk> - -USES= apache:2.2 -AP_FAST_BUILD= yes -AP_GENPLIST= yes -PORTDOCS= ${PORTNAME}.html - -PORTSCOUT= limit:^1\.1\. - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/www/mod_macro22/distinfo b/www/mod_macro22/distinfo deleted file mode 100644 index ad387c13685a..000000000000 --- a/www/mod_macro22/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mod_macro-1.1.11.tar.gz) = 4f21b84b948eba5ce97b008d68c995d0a002ccc98363bb253a12d6339246ac4c -SIZE (mod_macro-1.1.11.tar.gz) = 14796 diff --git a/www/mod_macro22/pkg-descr b/www/mod_macro22/pkg-descr deleted file mode 100644 index 56b9607f76a5..000000000000 --- a/www/mod_macro22/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -mod_macro is a third-party module to the Apache Http Server, distributed with -a BSD-style license like Apache. It allows the definition and use of macros -within apache runtime configuration files. The syntax is a natural extension -to apache html-like configuration style. - -WWW: http://www.cri.ensmp.fr/~coelho/mod_macro/ diff --git a/www/mod_musicindex/Makefile b/www/mod_musicindex/Makefile deleted file mode 100644 index 055db73bfe5b..000000000000 --- a/www/mod_musicindex/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# Created by: clsung -# $FreeBSD$ - -PORTNAME= mod_musicindex -PORTVERSION= 1.4.1 -PORTREVISION= 4 -CATEGORIES= www audio -MASTER_SITES= http://hacks.slashdirt.org/musicindex/ -PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} - -MAINTAINER= apache@FreeBSD.org -COMMENT= Apache module that allows downloading and streaming of audio - -LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING - -USES= apache:2.2 libarchive localbase:ldflags - -OPTIONS_DEFINE= NLS FLAC MP3 MP4 VORBIS LIBARCHIVE FILECACHE MYSQLCACHE DOCS -OPTIONS_DEFAULT=MP3 LIBARCHIVE FILECACHE - -LIBARCHIVE_DESC= Archive downloading support -FILECACHE_DESC= Flat file caching support -MYSQLCACHE_DESC= MySQL caching support - -OPTIONS_SUB= yes -FILECACHE_CONFIGURE_ENABLE= filecache -FLAC_CONFIGURE_ENABLE= flac -FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -LIBARCHIVE_CONFIGURE_ENABLE= archive -MP3_CONFIGURE_ENABLE= mp3 -MP3_LIB_DEPENDS= libid3tag.so:audio/libid3tag \ - libmad.so:audio/libmad -MP4_CONFIGURE_ENABLE= mp4 -MP4_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2 -MYSQLCACHE_CONFIGURE_ENABLE= mysqlcache -MYSQLCACHE_USE= MYSQL=yes -NLS_CFLAGS= -lintl -NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext -VORBIS_CONFIGURE_ENABLE= vorbis -VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-apxs=${APXS} \ - --disable-libFLACtest --disable-vorbistest - -SUB_FILES= pkg-message -SUB_LIST= PORTNAME=${PORTNAME} - -PORTDOCS= README - -post-patch-NLS-on: - @${RM} ${WRKSRC}/po/*.gmo - -post-build-NLS-on: - @(${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC}/po update-gmo) - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/www/mod_musicindex/distinfo b/www/mod_musicindex/distinfo deleted file mode 100644 index 39b5b7f10fc8..000000000000 --- a/www/mod_musicindex/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mod_musicindex-1.4.1.tar.gz) = 0fb052ebb8fa511467fd21696d798dee35b2e611955572cf746e9712e531a596 -SIZE (mod_musicindex-1.4.1.tar.gz) = 508795 diff --git a/www/mod_musicindex/files/pkg-message.in b/www/mod_musicindex/files/pkg-message.in deleted file mode 100644 index 5b9254de11d5..000000000000 --- a/www/mod_musicindex/files/pkg-message.in +++ /dev/null @@ -1 +0,0 @@ -Read %%DOCSDIR%%/README to find out how to configure apache for %%PORTNAME%%. diff --git a/www/mod_musicindex/pkg-descr b/www/mod_musicindex/pkg-descr deleted file mode 100644 index 1e43c0883179..000000000000 --- a/www/mod_musicindex/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -mod_musicindex is an Apache module aimed at being a C implementation of -the Perl module Apache::MP3. It allows nice displaying of directories -containing several kinds of audio files, including sorting them on various -fields, streaming/downloading them, constructing playlists, and searching. - -WWW: http://hacks.slashdirt.org/musicindex/ diff --git a/www/mod_musicindex/pkg-plist b/www/mod_musicindex/pkg-plist deleted file mode 100644 index 4b11fcde9b3a..000000000000 --- a/www/mod_musicindex/pkg-plist +++ /dev/null @@ -1,19 +0,0 @@ -@unexec /usr/bin/sed -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf -%%APACHEMODDIR%%/%%AP_MODULE%% -@exec %D/sbin/apxs -e %%AP_MOD_EN%% -n %%AP_NAME%% %D/%F -@unexec echo "Don't forget to remove all mod_musicindex-related directives in your httpd.conf" -%%NLS%%share/locale/de/LC_MESSAGES/mod_musicindex.mo -%%NLS%%share/locale/fr/LC_MESSAGES/mod_musicindex.mo -%%NLS%%share/locale/it/LC_MESSAGES/mod_musicindex.mo -%%NLS%%share/locale/nl/LC_MESSAGES/mod_musicindex.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/mod_musicindex.mo -%%DATADIR%%/directory.png -%%DATADIR%%/fetch.png -%%DATADIR%%/fetchok.png -%%DATADIR%%/general.png -%%DATADIR%%/musicindex.css -%%DATADIR%%/right_arrow.gif -%%DATADIR%%/rss.png -%%DATADIR%%/shuffle.png -%%DATADIR%%/sound.png -%%DATADIR%%/soundok.png diff --git a/www/mod_ntlm2/Makefile b/www/mod_ntlm2/Makefile deleted file mode 100644 index a6f8c26e535f..000000000000 --- a/www/mod_ntlm2/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Created by: Alex "lissyara" Keda <admin@lissyara.su> -# $FreeBSD$ - -PORTNAME= mod_ntlm2 -PORTVERSION= 0.1 -PORTREVISION= 4 -CATEGORIES= www -MASTER_SITES= SF/modntlm/modntlm2/${PORTNAME}-${PORTVERSION} -PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} -EXTRACT_SUFX= .tgz - -MAINTAINER= joneum@FreeBSD.org -COMMENT= NTLM authentication module for the Apache2 webserver - -USES= apache:2.2 samba:build -MAKE_ENV= APXS=${APXS} - -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} - ${APXS} -i -n 'ntlm' -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${WRKSRC}/mod_ntlm.la - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_ntlm.so - -.include <bsd.port.mk> diff --git a/www/mod_ntlm2/distinfo b/www/mod_ntlm2/distinfo deleted file mode 100644 index fa30ba03d7f1..000000000000 --- a/www/mod_ntlm2/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mod_ntlm2-0.1.tgz) = 156add771495f0321824c978d8da748de7446687c15a9cd5ba6c88d7a8cf97f6 -SIZE (mod_ntlm2-0.1.tgz) = 41247 diff --git a/www/mod_ntlm2/files/patch-Makefile b/www/mod_ntlm2/files/patch-Makefile deleted file mode 100644 index 9245b0677a3a..000000000000 --- a/www/mod_ntlm2/files/patch-Makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.orig Tue Feb 25 14:25:42 2003 -+++ Makefile Wed Sep 26 13:29:56 2007 -@@ -6,7 +6,7 @@ - - # the used tools - APXS=apxs --APACHECTL=/etc/rc.d/apache -+APACHECTL=${PREFIX}/sbin/apachectl - - # the default target - all: mod_ntlm.so -@@ -17,7 +17,7 @@ - - # install the shared object file into Apache - install: all -- $(APXS) -i -a -n 'ntlm' mod_ntlm.so -+ $(APXS) -i -a -n 'ntlm' .libs/mod_ntlm.so - - # cleanup - clean: diff --git a/www/mod_ntlm2/files/patch-mod_ntlm.c b/www/mod_ntlm2/files/patch-mod_ntlm.c deleted file mode 100644 index 63e7a7d2ef66..000000000000 --- a/www/mod_ntlm2/files/patch-mod_ntlm.c +++ /dev/null @@ -1,11 +0,0 @@ ---- mod_ntlm.c.orig 2003-02-23 17:58:02.000000000 +0200 -+++ mod_ntlm.c 2008-10-06 16:34:55.000000000 +0300 -@@ -587,7 +587,7 @@ - return NULL; - } - -- apr_pool_sub_make(&sp,p,NULL); -+ apr_pool_create_ex(&sp,p,NULL,NULL); - - while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) { - if ((l[0] == '#') || (!l[0])) diff --git a/www/mod_ntlm2/files/patch-smbval-rfcnb-util.inc.c b/www/mod_ntlm2/files/patch-smbval-rfcnb-util.inc.c deleted file mode 100644 index f4add85dc3ba..000000000000 --- a/www/mod_ntlm2/files/patch-smbval-rfcnb-util.inc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- smbval/rfcnb-util.inc.c.orig Wed Sep 26 12:46:02 2007 -+++ smbval/rfcnb-util.inc.c Wed Sep 26 12:47:13 2007 -@@ -21,7 +21,7 @@ - * 675 Mass Ave, Cambridge, MA 02139, USA. */ - - #include <string.h> --#include <malloc.h> -+#include <stdlib.h> - - #include "std-includes.h" - #include "rfcnb-priv.h" diff --git a/www/mod_ntlm2/files/patch-smbval-session.inc.c b/www/mod_ntlm2/files/patch-smbval-session.inc.c deleted file mode 100644 index 71b7d6814c47..000000000000 --- a/www/mod_ntlm2/files/patch-smbval-session.inc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- smbval/session.inc.c.orig Wed Sep 26 12:40:51 2007 -+++ smbval/session.inc.c Wed Sep 26 12:41:45 2007 -@@ -21,7 +21,7 @@ - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. */ - --#include <malloc.h> -+#include <stdlib.h> - #include <string.h> - - static int RFCNB_errno = 0; diff --git a/www/mod_ntlm2/files/patch-smbval-smbencrypt.inc.c b/www/mod_ntlm2/files/patch-smbval-smbencrypt.inc.c deleted file mode 100644 index 195b05a414f7..000000000000 --- a/www/mod_ntlm2/files/patch-smbval-smbencrypt.inc.c +++ /dev/null @@ -1,12 +0,0 @@ ---- smbval/smbencrypt.inc.c.orig Wed Sep 26 12:43:32 2007 -+++ smbval/smbencrypt.inc.c Wed Sep 26 12:45:29 2007 -@@ -19,7 +19,8 @@ - #include <arpa/inet.h> - #include <dirent.h> - #include <string.h> --#include <sys/vfs.h> -+#include <sys/param.h> -+#include <sys/mount.h> - #include <netinet/in.h> - - #include "smblib-priv.h" diff --git a/www/mod_ntlm2/files/patch-smbval-smblib-util.inc.c b/www/mod_ntlm2/files/patch-smbval-smblib-util.inc.c deleted file mode 100644 index dc6a199fdf4f..000000000000 --- a/www/mod_ntlm2/files/patch-smbval-smblib-util.inc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- smbval/smblib-util.inc.c.orig Wed Sep 26 12:47:37 2007 -+++ smbval/smblib-util.inc.c Wed Sep 26 12:47:57 2007 -@@ -21,7 +21,7 @@ - * 675 Mass Ave, Cambridge, MA 02139, USA. */ - - #include "smblib-priv.h" --#include <malloc.h> -+#include <stdlib.h> - - #include "rfcnb.h" - diff --git a/www/mod_ntlm2/files/patch-smbval-smblib.inc.c b/www/mod_ntlm2/files/patch-smbval-smblib.inc.c deleted file mode 100644 index 69b926c42998..000000000000 --- a/www/mod_ntlm2/files/patch-smbval-smblib.inc.c +++ /dev/null @@ -1,25 +0,0 @@ ---- smbval/smblib.inc.c.orig 2008-07-03 01:44:33.000000000 +0400 -+++ smbval/smblib.inc.c 2008-07-03 01:45:18.000000000 +0400 -@@ -20,10 +20,10 @@ - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. */ - #include <stdio.h> --#include <malloc.h> -+#include <stdlib.h> - --static int SMBlib_errno; --static int SMBlib_SMB_Error; -+int SMBlib_errno; -+int SMBlib_SMB_Error; - #define SMBLIB_ERRNO - #define uchar unsigned char - #include "smblib-priv.h" -@@ -32,7 +32,7 @@ - - #include <signal.h> - --static SMB_State_Types SMBlib_State; -+SMB_State_Types SMBlib_State; - - /* Initialize the SMBlib package */ - static int diff --git a/www/mod_ntlm2/pkg-descr b/www/mod_ntlm2/pkg-descr deleted file mode 100644 index 3f27133579c9..000000000000 --- a/www/mod_ntlm2/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -NTLM is an authentication protocol used by Microsoft Internet -Informations Server(tm) and Microsoft Internet Explorer(tm). While it -is not really secure, it offers background authentication (the -workstation logon credentials of users are passed through to the web -server). This feature is widely used in intranets based on these -Microsoft products. - -This module is implementing NTLM authentication for Apache2 on Unix -platforms. - -WWW: http://modntlm.sourceforge.net/ diff --git a/www/mod_ntlm2/pkg-plist b/www/mod_ntlm2/pkg-plist deleted file mode 100644 index 34ccd570d95c..000000000000 --- a/www/mod_ntlm2/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -@unexec %D/sbin/apxs -e -A -n ntlm %D/%%APACHEMODDIR%%/mod_ntlm.so -%%APACHEMODDIR%%/mod_ntlm.so -@exec %D/sbin/apxs -e -a -n ntlm %D/%f diff --git a/www/mod_proxy_html/Makefile b/www/mod_proxy_html/Makefile deleted file mode 100644 index 0aa8b1ed1d5d..000000000000 --- a/www/mod_proxy_html/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# Created by: David Lay <dsl@webize.com.au> -# $FreeBSD$ - -PORTNAME= mod_proxy_html -PORTVERSION= 3.1.2 -PORTREVISION= 2 -CATEGORIES= www -MASTER_SITES= http://apache.webthing.com/${PORTNAME}/ -DISTNAME= ${PORTNAME} -DIST_SUBDIR= mod_proxy_html - -MAINTAINER= apache@FreeBSD.org -COMMENT= Apache module for rewriting HTML links in proxied content - -LICENSE= GPLv2 - -RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_xml2enc.so:www/mod_xml2enc - -SUB_FILES= pkg-message -AP_FAST_BUILD= yes -AP_GENPLIST= yes -SHORTMODNAME= proxy_html -USES= apache:2.2 tar:bzip2 -USE_GNOME= libxml2 - -AP_INC+= ${LOCALBASE}/include/libxml2 -I${WRKSRC} -AP_LIB+= ${LOCALBASE}/lib -AP_EXTRAS+= -lxml2 - -PORTDOCS= README proxy_html.conf - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/www/mod_proxy_html/distinfo b/www/mod_proxy_html/distinfo deleted file mode 100644 index b1f22b0176eb..000000000000 --- a/www/mod_proxy_html/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mod_proxy_html/mod_proxy_html.tar.bz2) = a1aee758bda605e153868b91188ebf2c527b8eeb0f115d11af152078e65895bf -SIZE (mod_proxy_html/mod_proxy_html.tar.bz2) = 23019 diff --git a/www/mod_proxy_html/files/pkg-message.in b/www/mod_proxy_html/files/pkg-message.in deleted file mode 100644 index e26485be5c05..000000000000 --- a/www/mod_proxy_html/files/pkg-message.in +++ /dev/null @@ -1,18 +0,0 @@ -================================================================================ - -If you are upgrading from mod_proxy_html 2.x (or older) you will need to add -some new mod_proxy_html configuration directives to your Apache configuration -file. A sample configuration file that makes mod_proxy_html 3.x operate as a -drop-in replacement for mod_proxy_html 2.x can be found at: - - %%DOCSDIR%%/proxy_html.conf - -For additional documentation, see: - - %%DOCSDIR%%/README - - Configuration guide: http://apache.webthing.com/mod_proxy_html/config.html - - Reverse Proxy Tutorial: http://www.apachetutor.org/admin/reverseproxies - -================================================================================ diff --git a/www/mod_proxy_html/pkg-descr b/www/mod_proxy_html/pkg-descr deleted file mode 100644 index 3360166f7a74..000000000000 --- a/www/mod_proxy_html/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -mod_proxy_html is an output filter to rewrite HTML links in a proxy -situation, to ensure that links work for users outside the proxy. It -serves the same purpose as Apache's ProxyPassReverse directive does for -HTTP headers, and is an essential component of a reverse proxy. - -Note (for apache24 users): -mod_proxy_html has now been relicensed and incorporated into the core -Apache HTTPD distribution at apache.org from HTTPD 2.4. That version is -now likely to be more up-to-date than this one. - -WWW: http://apache.webthing.com/mod_proxy_html/ diff --git a/www/mod_remoteip/Makefile b/www/mod_remoteip/Makefile deleted file mode 100644 index 6a37ae5954ea..000000000000 --- a/www/mod_remoteip/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Created by: Jim Riggs <ports@christianserving.org> -# $FreeBSD$ - -PORTNAME= mod_remoteip -PORTVERSION= 2.3.5.a -PORTREVISION= 1 -CATEGORIES= www -MASTER_SITES= APACHE_HTTPD -DISTNAME= httpd-2.3.5-alpha - -MAINTAINER= ports@christianserving.org -COMMENT= Replaces the client IP address/hostname with that given by a proxy - -USES= apache:2.2 -AP_FAST_BUILD= yes -AP_GENPLIST= yes - -SRC_FILE= modules/metadata/${PORTNAME}.c - -.include <bsd.port.mk> diff --git a/www/mod_remoteip/distinfo b/www/mod_remoteip/distinfo deleted file mode 100644 index 8a84715a958e..000000000000 --- a/www/mod_remoteip/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (httpd-2.3.5-alpha.tar.gz) = f1c1b322342653445db4acf049637997f9a37f478babd0277587fa58b27ae9b8 -SIZE (httpd-2.3.5-alpha.tar.gz) = 5038492 diff --git a/www/mod_remoteip/files/patch-modules__metadata__mod_remoteip.c b/www/mod_remoteip/files/patch-modules__metadata__mod_remoteip.c deleted file mode 100644 index 0dda13878cac..000000000000 --- a/www/mod_remoteip/files/patch-modules__metadata__mod_remoteip.c +++ /dev/null @@ -1,74 +0,0 @@ ---- modules/metadata/mod_remoteip.c.orig 2009-05-05 18:52:59 UTC -+++ modules/metadata/mod_remoteip.c -@@ -127,7 +127,7 @@ static int looks_like_ip(const char *ips - return (*ipstr == '\0'); - } - --static const char *proxies_set(cmd_parms *cmd, void *internal, -+static const char *proxies_set(cmd_parms *cmd, void *cfg, - const char *arg) - { - remoteip_config_t *config = ap_get_module_config(cmd->server->module_config, -@@ -142,7 +142,7 @@ static const char *proxies_set(cmd_parms - if (!config->proxymatch_ip) - config->proxymatch_ip = apr_array_make(cmd->pool, 1, sizeof(*match)); - match = (remoteip_proxymatch_t *) apr_array_push(config->proxymatch_ip); -- match->internal = internal; -+ match->internal = cmd->info; - - if (looks_like_ip(ip)) { - /* Note s may be null, that's fine (explicit host) */ -@@ -168,7 +168,7 @@ static const char *proxies_set(cmd_parms - break; - match = (remoteip_proxymatch_t *) - apr_array_push(config->proxymatch_ip); -- match->internal = internal; -+ match->internal = cmd->info; - } - } - -@@ -182,7 +182,7 @@ static const char *proxies_set(cmd_parms - return NULL; - } - --static const char *proxylist_read(cmd_parms *cmd, void *internal, -+static const char *proxylist_read(cmd_parms *cmd, void *cfg, - const char *filename) - { - char lbuf[MAX_STRING_LEN]; -@@ -205,7 +205,7 @@ static const char *proxylist_read(cmd_pa - while (*(arg = ap_getword_conf(cmd->temp_pool, &args)) != '\0') { - if (*arg == '#' || *arg == '\0') - break; -- errmsg = proxies_set(cmd, internal, arg); -+ errmsg = proxies_set(cmd, cfg, arg); - if (errmsg) { - errmsg = apr_psprintf(cmd->pool, "%s at line %d of %s", - errmsg, cfp->line_number, filename); -@@ -260,7 +260,7 @@ static int remoteip_modify_connection(re - remote = apr_pstrdup(r->pool, remote); - - #ifdef REMOTEIP_OPTIMIZED -- memcpy(&temp_sa, c->remote_addr, sizeof(temp_sa)); -+ memcpy(temp_sa, c->remote_addr, sizeof(*temp_sa)); - temp_sa->pool = r->pool; - #else - temp_sa = c->remote_addr; -@@ -310,7 +310,7 @@ static int remoteip_modify_connection(re - #ifdef REMOTEIP_OPTIMIZED - /* Decode remote_addr - sucks; apr_sockaddr_vars_set isn't 'public' */ - if (inet_pton(AF_INET, parse_remote, -- &temp_sa_buff->sa.sin.sin_addr) > 0) { -+ &temp_sa->sa.sin.sin_addr) > 0) { - apr_sockaddr_vars_set(temp_sa, APR_INET, temp_sa.port); - } - #if APR_HAVE_IPV6 -@@ -409,7 +409,7 @@ static int remoteip_modify_connection(re - */ - c->remote_ip = apr_pstrdup(c->pool, c->remote_ip); - conn->proxied_ip = c->remote_ip; -- memcpy(&conn->proxied_addr, &temp_sa, sizeof(temp_sa)); -+ memcpy(&conn->proxied_addr, temp_sa, sizeof(*temp_sa)); - conn->proxied_addr.pool = c->pool; - c->remote_addr = &conn->proxied_addr; - diff --git a/www/mod_remoteip/pkg-descr b/www/mod_remoteip/pkg-descr deleted file mode 100644 index 0a05b2982f06..000000000000 --- a/www/mod_remoteip/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Backport of the Apache 2.3 module that replaces the apparent client -remote IP address and hostname for the request with the IP address -list presented by a proxy or load balancer via the request headers. - -WWW: http://httpd.apache.org/docs/2.3/mod/mod_remoteip.html diff --git a/www/mod_spdy/Makefile b/www/mod_spdy/Makefile deleted file mode 100644 index c874bfebbd05..000000000000 --- a/www/mod_spdy/Makefile +++ /dev/null @@ -1,150 +0,0 @@ -# Created by: Masaki TAGAWA -# $FreeBSD$ - -PORTNAME= mod_spdy -PORTVERSION= 0.9.4.1 -PORTREVISION= 5 -CATEGORIES= www -MASTER_SITES= http://www.club.kyutech.ac.jp/~masaki/ports/:mod_spdy \ - APACHE_HTTPD:apache22 -DISTFILES= mod_spdy_source_${PORTVERSION}.tar.xz:mod_spdy \ - httpd-2.2.22.tar.gz:apache22 -DIST_SUBDIR= ${PORTNAME} -EXTRACT_ONLY= mod_spdy_source_${PORTVERSION}.tar.xz - -MAINTAINER= masaki@club.kyutech.ac.jp -COMMENT= SPDY module for the Apache HTTP server v2.2 - -LICENSE= APACHE20 - -BUILD_DEPENDS= greadlink:sysutils/coreutils \ - flock:sysutils/flock \ - svn:devel/subversion \ - curl:ftp/curl \ - bash:shells/bash - -ONLY_FOR_ARCHS= amd64 i386 -USES= apache:2.2 compiler gmake python:2.7 ssl tar:xz -REINPLACE_ARGS= -i "" -BINARY_ALIAS= python=${PYTHON_CMD} - -WRKSRC= ${WRKDIR}/${PORTNAME}_source_${PORTVERSION}/mod_spdy/src -CFLAGS+= -fno-stack-protector -Wno-unknown-warning-option -Wno-c++11-extensions -I${OPENSSLINC} -LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} -GYP_DEFINES+= \ - use_system_apache_dev=1 \ - use_system_zlib=1 \ - system_include_path_httpd=${LOCALBASE}/include/apache22 \ - system_include_path_apr=${LOCALBASE}/include/apr-1 \ - system_include_path_aprutil=${LOCALBASE}/include/apr-1 \ - system_include_path_execinfo=/usr/include \ - include_dirs=${LOCALBASE}/include - -SUB_FILES+= mod_spdy.conf -SUB_LIST+= APACHEMODDIR=${APACHEMODDIR} - -OPTIONS_DEFINE= GCC DEBUG - -# workaround for archs with no clang in base, part 1: -# do not include the option to turn GCC off. Instead, force its use. -OPTIONS_EXCLUDE_sparc64= GCC - -.include <bsd.port.options.mk> - -# workaround for archs with no clang in base, part 2 -.if ${PORT_OPTIONS:MGCC} || ${ARCH} == sparc64 -FORCE_GCC= yes -.else -FORCE_GCC= no -.endif - -.if ${FORCE_GCC} == yes -BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils -CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -.endif - -.if ${FORCE_GCC} == yes -USE_GCC?= yes -GYP_DEFINES+= gcc_version=${CXX:S/g++//} -.else -CC= clang -CXX= clang++ -GYP_DEFINES+= clang=1 -.endif - -.if ${PORT_OPTIONS:MDEBUG} -MAKE_ENV+= V=1 -BUILDTYPE= Debug -.else -BUILDTYPE= Release -GYP_DEFINES+= buildtype=Official -.endif - -CONFIGURE_ENV+= CC=${CC} \ - CXX=${CXX} \ - GYP_DEFINES="${GYP_DEFINES}" -# according to portlint the below is passed via bsd.port.mk, -# but 'make -V CONFIGURE_ENV' does not show it: -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" -MAKE_ENV+= BUILDTYPE=${BUILDTYPE} - -BROKEN_SSL= libressl libressl-devel -BROKEN_SSL_REASON= please use www/apache24 with mod_http2 - -.include <bsd.port.pre.mk> - -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36 -CXXFLAGS+= -Wno-unused-local-typedef -.endif - -post-extract: - @${MKDIR} ${WRKSRC}/temp/progress - @${CP} ${DISTDIR}/${DIST_SUBDIR}/httpd-2.2.22.tar.gz ${WRKSRC}/temp/ && \ - ${TOUCH} ${WRKSRC}/temp/progress/httpd-2.2.22.tar.gz.downloaded - -post-patch: - @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ - ${WRKSRC}/base/base.gypi - @${REINPLACE_CMD} -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \ - -e 's,%%FILESDIR%%,${FILESDIR},g' \ - -e 's,%%OPENSSLBASE%%,${OPENSSLBASE},g' \ - ${WRKSRC}/build_modssl_with_npn.sh -.if ${FORCE_GCC} == yes - @${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,-I${LOCALBASE}/lib/gcc${CXX:S/g++//}/include,g' \ - -e 's,%%GCCLDFLAGS%%,-L${LOCALBASE}/lib/gcc${CXX:S/g++//},g' \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,-I${LOCALBASE}/lib/gcc${CXX:S/g++//}/include,g' \ - -e 's,%%GCCLDFLAGS%%,-L${LOCALBASE}/lib/gcc${CXX:S/g++//},g' \ - ${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py -.else - @${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,,g' \ - -e 's,%%GCCLDFLAGS%%,,g' \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,,g' \ - -e 's,%%GCCLDFLAGS%%,,g' \ - ${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py -.endif - -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ - ../../depot_tools/gclient.py runhooks - -pre-build: - cd ${WRKSRC} && CONFIGURE_ENV='${CONFIGURE_ENV}' \ - BUILDROOT=${WRKSRC}/temp ${WRKSRC}/build_modssl_with_npn.sh - -do-install: - ${MKDIR} ${STAGEDIR}/${PREFIX}/${APACHEMODDIR} \ - ${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes - ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libmod_spdy.so \ - ${STAGEDIR}/${PREFIX}/${APACHEMODDIR}/mod_spdy.so - ${INSTALL_LIB} ${WRKSRC}/mod_ssl.so \ - ${STAGEDIR}/${PREFIX}/${APACHEMODDIR}/mod_ssl_with_npn.so - ${INSTALL_DATA} ${WRKDIR}/mod_spdy.conf \ - ${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes/mod_spdy.conf - -.include <bsd.port.post.mk> diff --git a/www/mod_spdy/distinfo b/www/mod_spdy/distinfo deleted file mode 100644 index 1c7a90a6f34e..000000000000 --- a/www/mod_spdy/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (mod_spdy/mod_spdy_source_0.9.4.1.tar.xz) = 832ae76219ca4fe4b10ccb989e5fe53b3e5000f1ea505fda55208bded6e672a9 -SIZE (mod_spdy/mod_spdy_source_0.9.4.1.tar.xz) = 5465256 -SHA256 (mod_spdy/httpd-2.2.22.tar.gz) = 74c1ffffefe1a502339b004ad6488fbd858eb425a05968cd67c05695dbc0fe7c -SIZE (mod_spdy/httpd-2.2.22.tar.gz) = 7200529 diff --git a/www/mod_spdy/files/mod_spdy.conf.in b/www/mod_spdy/files/mod_spdy.conf.in deleted file mode 100644 index a3188b8c2950..000000000000 --- a/www/mod_spdy/files/mod_spdy.conf.in +++ /dev/null @@ -1,24 +0,0 @@ -LoadModule spdy_module %%APACHEMODDIR%%/mod_spdy.so - -<IfModule spdy_module> - # Turn on mod_spdy. To completely disable mod_spdy, you can set - # this to "off". - SpdyEnabled on - - # In order to support concurrent multiplexing of requests over a - # single connection, mod_spdy maintains its own thread pool in - # each Apache child process for processing requests. The default - # size of this thread pool is very conservative; you can override - # it with a larger value (as below) to increase concurrency, at - # the possible cost of increased memory usage. - # - #SpdyMaxThreadsPerProcess 30 - - # Memory usage can also be affected by the maximum number of - # simultaneously open SPDY streams permitted for each client - # connection. Ideally, this limit should be set as high as - # possible, but you can tweak it as necessary to limit memory - # consumption. - # - #SpdyMaxStreamsPerConnection 100 -</IfModule> diff --git a/www/mod_spdy/files/patch-Makefile b/www/mod_spdy/files/patch-Makefile deleted file mode 100644 index 3ec5b0f2e08b..000000000000 --- a/www/mod_spdy/files/patch-Makefile +++ /dev/null @@ -1,33 +0,0 @@ ---- Makefile.orig 2013-10-29 15:19:19.000000000 +0900 -+++ Makefile 2013-10-31 18:45:36.000000000 +0900 -@@ -54,9 +54,9 @@ - CC.target ?= $(CC) - CFLAGS.target ?= $(CFLAGS) - CXX.target ?= $(CXX) --CXXFLAGS.target ?= $(CXXFLAGS) -+CXXFLAGS.target ?= %%GCCCXXFLAGS%% $(CXXFLAGS) - LINK.target ?= $(LINK) --LDFLAGS.target ?= $(LDFLAGS) -+LDFLAGS.target ?= %%GCCLDFLAGS%% $(LDFLAGS) - AR.target ?= $(AR) - ARFLAGS.target ?= crs - -@@ -64,12 +64,12 @@ - # in gyp's make.py where ARFLAGS.host etc. is computed. - # TODO(evan): move all cross-compilation logic to gyp-time so we don't need - # to replicate this environment fallback in make as well. --CC.host ?= gcc --CFLAGS.host ?= --CXX.host ?= g++ --CXXFLAGS.host ?= --LINK.host ?= g++ --LDFLAGS.host ?= -+CC.host ?= $(CC) -+CFLAGS.host ?= $(CFLAGS) -+CXX.host ?= $(CXX) -+CXXFLAGS.host ?= %%GCCCXXFLAGS%% $(CXXFLAGS) -+LINK.host ?= $(LINK) -+LDFLAGS.host ?= %%GCCLDFLAGS%% $(LDFLAGS) - AR.host ?= ar - ARFLAGS.host := crs - diff --git a/www/mod_spdy/files/patch-apache_spdy_session_io.cc b/www/mod_spdy/files/patch-apache_spdy_session_io.cc deleted file mode 100644 index 109bc7da7406..000000000000 --- a/www/mod_spdy/files/patch-apache_spdy_session_io.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- mod_spdy/apache/apache_spdy_session_io.cc.org 2012-03-31 16:28:56.502800000 +0900 -+++ mod_spdy/apache/apache_spdy_session_io.cc 2012-03-31 20:46:33.033900102 +0900 -@@ -15,6 +15,9 @@ - #include "mod_spdy/apache/apache_spdy_session_io.h" - - #include "apr_buckets.h" -+// When HAVE_SYSLOG is defined, apache http_log.h will include syslog.h, which -+// #defined LOG_* as numbers. This conflicts with what we are using those here. -+#undef HAVE_SYSLOG - #include "http_log.h" - #include "util_filter.h" - diff --git a/www/mod_spdy/files/patch-apache_spdy_stream_task_factory.cc b/www/mod_spdy/files/patch-apache_spdy_stream_task_factory.cc deleted file mode 100644 index 23100497de1c..000000000000 --- a/www/mod_spdy/files/patch-apache_spdy_stream_task_factory.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- mod_spdy/apache/apache_spdy_stream_task_factory.cc.org 2012-03-31 16:28:56.491796000 +0900 -+++ mod_spdy/apache/apache_spdy_stream_task_factory.cc 2012-03-31 20:46:51.134788973 +0900 -@@ -25,6 +25,9 @@ - - #include "apr_buckets.h" - #include "apr_network_io.h" -+// When HAVE_SYSLOG is defined, apache http_log.h will include syslog.h, which -+// #defined LOG_* as numbers. This conflicts with what we are using those here. -+#undef HAVE_SYSLOG - #include "http_log.h" - #include "util_filter.h" - diff --git a/www/mod_spdy/files/patch-apr.gyp b/www/mod_spdy/files/patch-apr.gyp deleted file mode 100644 index 99fc403cf297..000000000000 --- a/www/mod_spdy/files/patch-apr.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/apache/apr/apr.gyp.old 2012-05-14 20:42:31.000000000 +0900 -+++ third_party/apache/apr/apr.gyp 2012-05-14 21:46:57.000000000 +0900 -@@ -201,7 +201,7 @@ - }, - { - 'target_name': 'apr', -- 'type': 'settings', -+ 'type': '<(library)', - 'dependencies': [ - 'include', - ], diff --git a/www/mod_spdy/files/patch-aprutil.gyp b/www/mod_spdy/files/patch-aprutil.gyp deleted file mode 100644 index d303ce8e0d49..000000000000 --- a/www/mod_spdy/files/patch-aprutil.gyp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/apache/aprutil/aprutil.gyp.old 2012-05-14 20:42:31.000000000 +0900 -+++ third_party/apache/aprutil/aprutil.gyp 2012-05-14 21:47:36.000000000 +0900 -@@ -142,7 +142,7 @@ - }, - { - 'target_name': 'aprutil', -- 'type': 'settings', -+ 'type': '<(library)', - 'dependencies': [ - 'include', - ], diff --git a/www/mod_spdy/files/patch-base.gypi b/www/mod_spdy/files/patch-base.gypi deleted file mode 100644 index 6ae78a6ca390..000000000000 --- a/www/mod_spdy/files/patch-base.gypi +++ /dev/null @@ -1,20 +0,0 @@ -FIXME: this feels a bit silly now. - ---- base/base.gypi.org 2012-03-31 16:28:56.347804000 +0900 -+++ base/base.gypi 2012-03-31 17:03:22.470770534 +0900 -@@ -7,6 +7,7 @@ - 'variables': { - 'base_target': 0, - 'chromium_root': '<(DEPTH)/third_party/chromium/src', -+ 'system_include_path_execinfo%': '/usr/include', - }, - 'target_conditions': [ - # This part is shared between the targets defined below. Only files and -@@ -107,6 +108,7 @@ - 'include_dirs': [ - '<(chromium_root)', - '<(DEPTH)', -+ '<(system_include_path_execinfo)', - ], - # These warnings are needed for the files in third_party\dmg_fp. - 'msvs_disabled_warnings': [ diff --git a/www/mod_spdy/files/patch-build_modssl_with_npn.sh b/www/mod_spdy/files/patch-build_modssl_with_npn.sh deleted file mode 100644 index 62bdd5ab0180..000000000000 --- a/www/mod_spdy/files/patch-build_modssl_with_npn.sh +++ /dev/null @@ -1,134 +0,0 @@ ---- build_modssl_with_npn.sh.orig 2013-10-29 15:17:22.000000000 +0900 -+++ build_modssl_with_npn.sh 2013-10-30 16:12:09.000000000 +0900 -@@ -33,7 +33,7 @@ - fi - - if [ -z "$BUILDROOT" ]; then -- BUILDROOT=$(mktemp -d) -+ BUILDROOT=$(mktemp -d temp) - REMOVE_BUILDROOT=1 - else - REMOVE_BUILDROOT=0 -@@ -72,7 +72,7 @@ - if [ ! -f "$PROGRESS_DIR/$2.downloaded" ]; then - echo "Downloading $1" - curl -f -# "$1" -o $2 || do_cleanup -- if [[ $(md5sum $2 | cut -d\ -f1) != $3 ]]; then -+ if [[ $(md5 $2 | cut -d\ -f4) != $3 ]]; then - echo "md5sum mismatch for $2" - do_cleanup - fi -@@ -93,31 +93,22 @@ - fi - } - --OPENSSL_SRC_TGZ_URL="http://www.openssl.org/source/openssl-1.0.1c.tar.gz" - APACHE_HTTPD_SRC_TGZ_URL="http://archive.apache.org/dist/httpd/httpd-2.2.22.tar.gz" - APACHE_HTTPD_MODSSL_NPN_PATCH_PATH="$(dirname $0)/scripts/mod_ssl_with_npn.patch" - --OPENSSL_SRC_TGZ=$(basename $OPENSSL_SRC_TGZ_URL) - APACHE_HTTPD_SRC_TGZ=$(basename $APACHE_HTTPD_SRC_TGZ_URL) - APACHE_HTTPD_MODSSL_NPN_PATCH="mod_ssl_npn.patch" - --OPENSSL_SRC_ROOT=${OPENSSL_SRC_TGZ%.tar.gz} --OPENSSL_INST_ROOT=${OPENSSL_SRC_ROOT}_install - APACHE_HTTPD_SRC_ROOT=${APACHE_HTTPD_SRC_TGZ%.tar.gz} - --OPENSSL_BUILDLOG=$(mktemp -p /tmp openssl_buildlog.XXXXXXXXXX) --APACHE_HTTPD_BUILDLOG=$(mktemp -p /tmp httpd_buildlog.XXXXXXXXXX) -- - cp $APACHE_HTTPD_MODSSL_NPN_PATCH_PATH $BUILDROOT/$APACHE_HTTPD_MODSSL_NPN_PATCH - - pushd $BUILDROOT >/dev/null - --download_file $OPENSSL_SRC_TGZ_URL $OPENSSL_SRC_TGZ ae412727c8c15b67880aef7bd2999b2e - download_file $APACHE_HTTPD_SRC_TGZ_URL $APACHE_HTTPD_SRC_TGZ d77fa5af23df96a8af68ea8114fa6ce1 - - echo "" - --uncompress_file $OPENSSL_SRC_TGZ - uncompress_file $APACHE_HTTPD_SRC_TGZ - - if [ ! -f "$PROGRESS_DIR/modssl_patched" ]; then -@@ -137,45 +128,6 @@ - - echo "" - --if [ ! -f "$PROGRESS_DIR/openssl_configured" ]; then -- pushd $OPENSSL_SRC_ROOT >/dev/null -- echo -n "Configuring OpenSSL ... " -- ./config no-shared -fPIC --openssldir=$BUILDROOT/$OPENSSL_INST_ROOT >> $OPENSSL_BUILDLOG -- if [ $? -ne 0 ]; then -- echo "Failed. Build log at $OPENSSL_BUILDLOG." -- do_cleanup -- fi -- echo "done" -- popd >/dev/null # $OPENSSL_SRC_ROOT -- touch "$PROGRESS_DIR/openssl_configured" --else -- echo "Already configured OpenSSL." --fi -- --if [ ! -f "$PROGRESS_DIR/openssl_built" ]; then -- pushd $OPENSSL_SRC_ROOT >/dev/null -- echo -n "Building OpenSSL (this may take a while) ... " -- make install >> $OPENSSL_BUILDLOG 2>&1 -- if [ $? -ne 0 ]; then -- echo "Failed. Build log at $OPENSSL_BUILDLOG." -- do_cleanup -- fi -- # A hacky fix that helps things build on CentOS: -- if grep -q CentOS /etc/issue; then -- sed --in-place 's/^Libs\.private: -ldl$/& -lcrypto/' \ -- $BUILDROOT/$OPENSSL_INST_ROOT/lib/pkgconfig/openssl.pc -- fi -- echo "done" -- popd >/dev/null # $OPENSSL_SRC_ROOT -- touch "$PROGRESS_DIR/openssl_built" --else -- echo "Already built OpenSSL." --fi -- --rm -f "$OPENSSL_BUILDLOG" -- --echo "" -- - if [ ! -f "$PROGRESS_DIR/modssl_configured" ]; then - pushd $APACHE_HTTPD_SRC_ROOT >/dev/null - echo -n "Configuring Apache mod_ssl ... " -@@ -190,11 +142,11 @@ - # not only libraries in Libs, but also those in Libs.private: - mv configure configure.bak - sed 's/--libs-only-l openssl/--libs-only-l --static openssl/' configure.bak > configure -- chmod --reference=configure.bak configure -+ chmod 755 configure - -- ./configure --enable-ssl=shared --with-ssl=$BUILDROOT/$OPENSSL_INST_ROOT >> $APACHE_HTTPD_BUILDLOG -+ eval ${CONFIGURE_ENV} ./configure --enable-ssl=shared --with-ssl=%%OPENSSLBASE%% - if [ $? -ne 0 ]; then -- echo "Failed. Build log at $APACHE_HTTPD_BUILDLOG." -+ echo "Failed at configuring Apache mod_ssl." - do_cleanup - fi - echo "done" -@@ -207,9 +159,9 @@ - if [ ! -f "$PROGRESS_DIR/modssl_built" ]; then - pushd $APACHE_HTTPD_SRC_ROOT >/dev/null - echo -n "Building Apache mod_ssl (this may take a while) ... " -- make >> $APACHE_HTTPD_BUILDLOG 2>&1 -+ make - if [ $? -ne 0 ]; then -- echo "Failed. Build log at $APACHE_HTTPD_BUILDLOG." -+ echo "Failed at building Apache mod_ssl." - do_cleanup - fi - echo "done" -@@ -219,8 +171,6 @@ - echo "Already built Apache mod_ssl." - fi - --rm -f "$APACHE_HTTPD_BUILDLOG" -- - popd >/dev/null # $BUILDROOT - - MODSSL_SO_SRCPATH=$(find $BUILDROOT/$APACHE_HTTPD_SRC_ROOT -name mod_ssl.so) diff --git a/www/mod_spdy/files/patch-common.h b/www/mod_spdy/files/patch-common.h deleted file mode 100644 index 058fbb2b1b97..000000000000 --- a/www/mod_spdy/files/patch-common.h +++ /dev/null @@ -1,13 +0,0 @@ ---- third_party/protobuf/src/google/protobuf/stubs/common.h 2012-03-31 16:29:08.772785000 +0900 -+++ third_party/protobuf/src/google/protobuf/stubs/common.h 2012-03-31 16:59:06.012795843 +0900 -@@ -47,6 +47,10 @@ - #elif !defined(_MSC_VER) - #include <stdint.h> - #endif -+#if defined(__FreeBSD__) -+#undef major -+#undef minor -+#endif - - #if defined(_MSC_VER) && defined(_CPPUNWIND) - #define PROTOBUF_USE_EXCEPTIONS diff --git a/www/mod_spdy/files/patch-gyp_chromium b/www/mod_spdy/files/patch-gyp_chromium deleted file mode 100644 index dde68340971d..000000000000 --- a/www/mod_spdy/files/patch-gyp_chromium +++ /dev/null @@ -1,8 +0,0 @@ ---- build/gyp_chromium.old 2012-05-14 20:42:30.000000000 +0900 -+++ build/gyp_chromium 2012-05-14 22:00:42.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - - # Copyright 2010 Google Inc. - # diff --git a/www/mod_spdy/files/patch-logging.h b/www/mod_spdy/files/patch-logging.h deleted file mode 100644 index 98fc37cc8f88..000000000000 --- a/www/mod_spdy/files/patch-logging.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/chromium/src/base/logging.h.org 2013-10-29 15:17:59.000000000 +0900 -+++ third_party/chromium/src/base/logging.h 2013-10-29 23:39:25.000000000 +0900 -@@ -5,6 +5,8 @@ - #ifndef BASE_LOGGING_H_ - #define BASE_LOGGING_H_ - -+#undef strtoul -+ - #include <cassert> - #include <string> - #include <cstring> diff --git a/www/mod_spdy/files/patch-make.py b/www/mod_spdy/files/patch-make.py deleted file mode 100644 index d4bd87654db2..000000000000 --- a/www/mod_spdy/files/patch-make.py +++ /dev/null @@ -1,51 +0,0 @@ ---- tools/gyp/pylib/gyp/generator/make.py.orig 2013-10-29 15:18:11.000000000 +0900 -+++ tools/gyp/pylib/gyp/generator/make.py 2013-10-31 18:48:40.000000000 +0900 -@@ -86,7 +86,7 @@ - else: - operating_system = flavor - if flavor == 'android': -- operating_system = 'linux' # Keep this legacy behavior for now. -+ operating_system = 'freebsd' # Keep this legacy behavior for now. - default_variables.setdefault('OS', operating_system) - default_variables.setdefault('SHARED_LIB_SUFFIX', '.so') - default_variables.setdefault('SHARED_LIB_DIR','$(builddir)/lib.$(TOOLSET)') -@@ -258,9 +258,9 @@ - CC.target ?= $(CC) - CFLAGS.target ?= $(CFLAGS) - CXX.target ?= $(CXX) --CXXFLAGS.target ?= $(CXXFLAGS) -+CXXFLAGS.target ?= %%GCCCXXFLAGS%% $(CXXFLAGS) - LINK.target ?= $(LINK) --LDFLAGS.target ?= $(LDFLAGS) -+LDFLAGS.target ?= %%GCCLDFLAGS%% $(LDFLAGS) - AR.target ?= $(AR) - ARFLAGS.target ?= %(ARFLAGS.target)s - -@@ -268,12 +268,12 @@ - # in gyp's make.py where ARFLAGS.host etc. is computed. - # TODO(evan): move all cross-compilation logic to gyp-time so we don't need - # to replicate this environment fallback in make as well. --CC.host ?= gcc --CFLAGS.host ?= --CXX.host ?= g++ --CXXFLAGS.host ?= --LINK.host ?= g++ --LDFLAGS.host ?= -+CC.host ?= $(CC) -+CFLAGS.host ?= $(CFLAGS) -+CXX.host ?= $(CXX) -+CXXFLAGS.host ?= %%GCCCXXFLAGS%% $(CXXFLAGS) -+LINK.host ?= $(LINK) -+LDFLAGS.host ?= %%GCCLDFLAGS%% $(LDFLAGS) - AR.host ?= ar - ARFLAGS.host := %(ARFLAGS.host)s - -@@ -1750,7 +1750,7 @@ - return modules - - # Retrieve the default value of 'SHARED_LIB_SUFFIX' -- params = {'flavor': 'linux'} -+ params = {'flavor': 'freebsd'} - default_variables = {} - CalculateVariables(default_variables, params) - diff --git a/www/mod_spdy/files/patch-mod_spdy.cc b/www/mod_spdy/files/patch-mod_spdy.cc deleted file mode 100644 index 8bfe9ece6689..000000000000 --- a/www/mod_spdy/files/patch-mod_spdy.cc +++ /dev/null @@ -1,21 +0,0 @@ ---- mod_spdy/mod_spdy.cc.orig 2012-05-14 20:42:33.000000000 +0900 -+++ mod_spdy/mod_spdy.cc 2012-05-17 23:33:20.000000000 +0900 -@@ -22,6 +22,9 @@ - #include "httpd.h" - #include "http_connection.h" - #include "http_config.h" -+// When HAVE_SYSLOG is defined, apache http_log.h will include syslog.h, which -+// #defined LOG_* as numbers. This conflicts with what we are using those here. -+#undef HAVE_SYSLOG - #include "http_log.h" - #include "http_protocol.h" - #include "http_request.h" -@@ -790,7 +793,7 @@ - - // Declare our module object (note that "module" is a typedef for "struct - // module_struct"; see http_config.h for the definition of module_struct). -- module AP_MODULE_DECLARE_DATA spdy_module = { -+ struct module_struct __attribute__((visibility("default"))) spdy_module = { - // This next macro indicates that this is a (non-MPM) Apache 2.0 module - // (the macro actually expands to multiple comma-separated arguments; see - // http_config.h for the definition): diff --git a/www/mod_spdy/files/patch-pthread_shared_mem.cc b/www/mod_spdy/files/patch-pthread_shared_mem.cc deleted file mode 100644 index a86ed3d0c124..000000000000 --- a/www/mod_spdy/files/patch-pthread_shared_mem.cc +++ /dev/null @@ -1,146 +0,0 @@ ---- net/instaweb/util/pthread_shared_mem.cc.org 2012-03-31 16:29:02.678813000 +0900 -+++ net/instaweb/util/pthread_shared_mem.cc 2012-03-31 16:59:45.750779463 +0900 -@@ -24,6 +24,9 @@ - #include <cstddef> - #include <map> - #include <utility> -+#if defined(__FreeBSD__) -+#include <semaphore.h> -+#endif - #include "net/instaweb/util/public/abstract_shared_mem.h" - #include "net/instaweb/util/public/abstract_mutex.h" - #include "net/instaweb/util/public/basictypes.h" -@@ -70,13 +73,45 @@ - DISALLOW_COPY_AND_ASSIGN(PthreadSharedMemMutex); - }; - -+#if defined(__FreeBSD__) -+// Some OSs does not support PTHREAD_PROCESS_SHARED attribute. (ex. FreeBSD < 9R, MacOS) -+// FreeBSD lacks PTHREAD_PROCESS_SHARED support before 9.0R, so we use a semaphore -+// instead. But nested locking is not supported. -+class SemSharedMemMutex : public AbstractMutex { -+ public: -+ explicit SemSharedMemMutex(sem_t* sem) -+ : sem_(sem) {} -+ -+ virtual void Lock() { -+ sem_wait(sem_); -+ } -+ -+ virtual void Unlock() { -+ sem_post(sem_); -+ } -+ -+private: -+ sem_t* sem_; -+ DISALLOW_COPY_AND_ASSIGN(SemSharedMemMutex); -+}; -+#endif -+ - class PthreadSharedMemSegment : public AbstractSharedMemSegment { - public: - // We will be representing memory mapped in the [base, base + size) range. -+#if defined(__FreeBSD__) -+ PthreadSharedMemSegment(char* base, size_t size, MessageHandler* handler, const char* name) -+ : base_(base), -+ size_(size), -+ sem_(NULL) { -+ std::sprintf(name_, "/%s_sem", name); -+ } -+#else - PthreadSharedMemSegment(char* base, size_t size, MessageHandler* handler) - : base_(base), - size_(size) { - } -+#endif - - virtual ~PthreadSharedMemSegment() { - } -@@ -86,10 +121,18 @@ - } - - virtual size_t SharedMutexSize() const { -+#if defined(__FreeBSD__) -+ return 0; -+#else - return sizeof(pthread_mutex_t); -+#endif - } - - virtual bool InitializeSharedMutex(size_t offset, MessageHandler* handler) { -+#if defined(__FreeBSD__) -+ sem_ = sem_open(name_, O_CREAT, 0755, 1); -+ return sem_ ? true : false; -+#else - pthread_mutexattr_t attr; - if (pthread_mutexattr_init(&attr) != 0) { - handler->Message(kError, "pthread_mutexattr_init failed with errno:%d", -@@ -113,19 +156,32 @@ - - pthread_mutexattr_destroy(&attr); - return true; -+#endif - } - - virtual AbstractMutex* AttachToSharedMutex(size_t offset) { -+#if defined(__FreeBSD__) -+ sem_ = sem_open(name_, O_EXCL); -+ return new SemSharedMemMutex(sem_); -+#else - return new PthreadSharedMemMutex(MutexPtr(offset)); -+#endif - } - - private: -+#if defined(__FreeBSD__) -+#else - pthread_mutex_t* MutexPtr(size_t offset) { - return reinterpret_cast<pthread_mutex_t*>(base_ + offset); - } -+#endif - - char* const base_; - const size_t size_; -+#if defined(__FreeBSD__) -+ char name_[256]; -+ sem_t* sem_; -+#endif - - DISALLOW_COPY_AND_ASSIGN(PthreadSharedMemSegment); - }; -@@ -143,7 +199,11 @@ - } - - size_t PthreadSharedMem::SharedMutexSize() const { -+#if defined(__FreeBSD__) -+ return 0; -+#else - return sizeof(pthread_mutex_t); -+#endif - } - - AbstractSharedMemSegment* PthreadSharedMem::CreateSegment( -@@ -167,7 +227,11 @@ - SegmentBaseMap* bases = AcquireSegmentBases(); - (*bases)[name] = base; - UnlockSegmentBases(); -+#if defined(__FreeBSD__) -+ return new PthreadSharedMemSegment(base, size, handler, name.c_str()); -+#else - return new PthreadSharedMemSegment(base, size, handler); -+#endif - } - - AbstractSharedMemSegment* PthreadSharedMem::AttachToSegment( -@@ -182,7 +246,11 @@ - } - char* base = i->second; - UnlockSegmentBases(); -+#if defined(__FreeBSD__) -+ return new PthreadSharedMemSegment(base, size, handler, name.c_str()); -+#else - return new PthreadSharedMemSegment(base, size, handler); -+#endif - } - - void PthreadSharedMem::DestroySegment(const GoogleString& name, diff --git a/www/mod_spdy/files/patch-python_arch.sh b/www/mod_spdy/files/patch-python_arch.sh deleted file mode 100644 index 222175751c66..000000000000 --- a/www/mod_spdy/files/patch-python_arch.sh +++ /dev/null @@ -1,19 +0,0 @@ ---- build/linux/python_arch.sh.org 2012-03-31 16:29:00.054773000 +0900 -+++ build/linux/python_arch.sh 2012-03-31 17:00:09.262802125 +0900 -@@ -10,7 +10,15 @@ - # python_arch.sh /path/to/sysroot/usr/lib/libpython2.4.so.1.0 - # - --python=$(readlink -f "$1") -+UNAME=`uname` -+ -+# FreeBSD readlink lacks -f support before 9.0 -+if [ ${UNAME} = "FreeBSD" ]; then -+ python=$(greadlink -f "$1") -+else -+ python=$(readlink -f "$1") -+fi -+ - if [ ! -r "$python" ]; then - echo unknown - exit 0 diff --git a/www/mod_spdy/files/patch-python_arch2.sh b/www/mod_spdy/files/patch-python_arch2.sh deleted file mode 100644 index aada6e89ca03..000000000000 --- a/www/mod_spdy/files/patch-python_arch2.sh +++ /dev/null @@ -1,19 +0,0 @@ ---- third_party/chromium/src/build/linux/python_arch.sh.org 2012-03-31 16:29:02.968788000 +0900 -+++ third_party/chromium/src/build/linux/python_arch.sh 2012-03-31 17:00:18.892838462 +0900 -@@ -10,7 +10,15 @@ - # python_arch.sh /path/to/sysroot/usr/lib/libpython2.4.so.1.0 - # - --python=$(readlink -f "$1") -+UNAME=`uname` -+ -+# FreeBSD readlink lacks -f support before 9.0 -+if [ "${UNAME}" = "FreeBSD" ]; then -+ python=$(greadlink -f "$1") -+else -+ python=$(readlink -f "$1") -+fi -+ - if [ ! -r "$python" ]; then - echo unknown - exit 0 diff --git a/www/mod_spdy/files/patch-stack_trace_posix.cc b/www/mod_spdy/files/patch-stack_trace_posix.cc deleted file mode 100644 index 0459d4ccedd0..000000000000 --- a/www/mod_spdy/files/patch-stack_trace_posix.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- third_party/chromium/src/base/debug/stack_trace_posix.cc.org 2012-03-31 16:29:07.080777000 +0900 -+++ third_party/chromium/src/base/debug/stack_trace_posix.cc 2012-03-31 17:00:32.436774287 +0900 -@@ -127,7 +127,7 @@ - trace_strings->push_back(base::StringPrintf("%p", trace[i])); - } - } --#else -+#elif defined(OS_LINUX) - scoped_ptr_malloc<char*> trace_symbols(backtrace_symbols(trace, size)); - if (trace_symbols.get()) { - for (int i = 0; i < size; ++i) { -@@ -156,10 +156,13 @@ - count_ = 0; - return; - } --#endif -+#elif defined(OS_LINUX) - // Though the backtrace API man page does not list any possible negative - // return values, we take no chance. - count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); -+#else -+ count_ = 0; -+#endif - } - - void StackTrace::PrintBacktrace() const { diff --git a/www/mod_spdy/files/patch-sys_byteorder.h b/www/mod_spdy/files/patch-sys_byteorder.h deleted file mode 100644 index ec3a5237b858..000000000000 --- a/www/mod_spdy/files/patch-sys_byteorder.h +++ /dev/null @@ -1,40 +0,0 @@ ---- third_party/chromium/src/base/sys_byteorder.h.org 2012-05-15 13:15:00.000000000 +0900 -+++ third_party/chromium/src/base/sys_byteorder.h 2012-05-15 13:32:03.000000000 +0900 -@@ -25,7 +25,7 @@ - #include <stdlib.h> - #elif defined(OS_MACOSX) - #include <libkern/OSByteOrder.h> --#elif defined(OS_OPENBSD) -+#elif defined(OS_OPENBSD) || defined(OS_FREEBSD) - #include <sys/endian.h> - #else - #include <byteswap.h> -@@ -42,6 +42,8 @@ - return OSSwapInt16(x); - #elif defined(OS_OPENBSD) - return swap16(x); -+#elif defined(OS_FREEBSD) -+ return bswap16(x); - #else - return bswap_16(x); - #endif -@@ -53,6 +55,8 @@ - return OSSwapInt32(x); - #elif defined(OS_OPENBSD) - return swap32(x); -+#elif defined(OS_FREEBSD) -+ return bswap32(x); - #else - return bswap_32(x); - #endif -@@ -63,7 +67,9 @@ - #elif defined(OS_MACOSX) - return OSSwapInt64(x); - #elif defined(OS_OPENBSD) -- return swap64(x); -+ return swap64(x); -+#elif defined(OS_FREEBSD) -+ return bswap64(x); - #else - return bswap_64(x); - #endif diff --git a/www/mod_spdy/pkg-descr b/www/mod_spdy/pkg-descr deleted file mode 100644 index eb1851cf4a21..000000000000 --- a/www/mod_spdy/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -mod_spdy is an Apache 2.x filter module that provides SPDY support in the -Apache HTTPD web server. Because mod_spdy is an Apache module, it can be -loaded into currently deployed Apache HTTPD 2.x web servers using mod_so. - - -WWW: https://developers.google.com/speed/spdy/mod_spdy/ diff --git a/www/mod_spdy/pkg-plist b/www/mod_spdy/pkg-plist deleted file mode 100644 index 2cc0546680ab..000000000000 --- a/www/mod_spdy/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -@unexec /usr/bin/sed -i '' 's/mod_ssl_with_npn.so/mod_ssl.so/g' %D/%%APACHEETCDIR%%/httpd.conf -%%APACHEMODDIR%%/mod_spdy.so -%%APACHEMODDIR%%/mod_ssl_with_npn.so -%%APACHEETCDIR%%/Includes/mod_spdy.conf -@exec /usr/bin/sed -i '' -e 's/mod_ssl.so/mod_ssl_with_npn.so/g' %D/%%APACHEETCDIR%%/httpd.conf diff --git a/www/mod_uid/Makefile b/www/mod_uid/Makefile deleted file mode 100644 index f7274348e19b..000000000000 --- a/www/mod_uid/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# Created by: Yen-Ming Lee <leeym@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= mod_uid -PORTVERSION= 1.1.0 -CATEGORIES= www -MASTER_SITES= ftp://ftp.lexa.ru/pub/apache-rus/contrib/ - -MAINTAINER= joneum@FreeBSD.org -COMMENT= Apache module issuing the "correct" cookies for counting the site visitors - -LICENSE= APACHE20 - -USES= apache:2.2 -AP_FAST_BUILD= yes -AP_GENPLIST= yes -MODULENAME= mod_uid2 - -PORTDOCS= README.html - -OPTIONS_DEFINE= DOCS - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/www/mod_uid/distinfo b/www/mod_uid/distinfo deleted file mode 100644 index 71e2e4c8a288..000000000000 --- a/www/mod_uid/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mod_uid-1.1.0.tar.gz) = 07edf4f68bede96cb0d90611d08b9ea946a6ea5bdcd174fe47459472682c1b44 -SIZE (mod_uid-1.1.0.tar.gz) = 14821 diff --git a/www/mod_uid/pkg-descr b/www/mod_uid/pkg-descr deleted file mode 100644 index 8ccfbb3339e5..000000000000 --- a/www/mod_uid/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -The standard distribution of Apache does not provide adequate means for user -tracking, and this module provides them. What it actually does: - -+ if the user has provided the cookie header with the correct cookie-name, - the module writes this cookie in notes with the name uid_got (accordingly, - then it may be written to the log); - -+ if the user has arrived without the required cookie, the module issues the - SetCookie header for him/her and writes the cookie thus issued in notes - with the name uid_set (and this may also be written to the log); - -+ if built-in P3P support is included, the P3P header is also issued as the - Set-Cookie header is issued. - -WWW: http://www.lexa.ru/programs/mod-uid-eng.html diff --git a/www/mod_vhost_ldap/Makefile b/www/mod_vhost_ldap/Makefile deleted file mode 100644 index 2caf4852bfba..000000000000 --- a/www/mod_vhost_ldap/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# Created by: Clement Laforet <clement@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= mod_vhost_ldap -PORTVERSION= 2.0.8 -PORTREVISION= 2 -CATEGORIES= www -MASTER_SITES= DEBIAN/pool/main/m/mod-vhost-ldap -DISTNAME= ${PORTNAME:S/_/-/g}_${PORTVERSION}.orig -DIST_SUBDIR= apache2 - -MAINTAINER= apache@FreeBSD.org -COMMENT= Virtual Hosting from ldap built on top of mod_ldap - -LICENSE= APACHE20 - -USE_OPENLDAP= yes - -USES= apache:2.2 -AP_FAST_BUILD= yes -AP_GENPLIST= yes -AP_LIB+= ${LOCALBASE}/lib -lldap -AP_EXTRAS+= -DMOD_VHOST_LDAP_VERSION=\\\"mod_vhost_ldap/${PORTVERSION}\\\" - -PORTDOCS= mod_vhost_ldap.schema vhost_ldap.conf COPYING - -WRKSRC= ${WRKDIR}/${PORTNAME:S/_/-/g}-${PORTVERSION} - -.if defined(PACKAGE_BUILDING) -IGNORE= Requires support of LDAP in apache 2.x port -.endif - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/www/mod_vhost_ldap/distinfo b/www/mod_vhost_ldap/distinfo deleted file mode 100644 index d3da06aa1bcb..000000000000 --- a/www/mod_vhost_ldap/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (apache2/mod-vhost-ldap_2.0.8.orig.tar.gz) = 031a48c48e47e3687bf185b3817ae22c05c569bc82bc8dd091803cad25d1fc06 -SIZE (apache2/mod-vhost-ldap_2.0.8.orig.tar.gz) = 10395 diff --git a/www/mod_vhost_ldap/pkg-descr b/www/mod_vhost_ldap/pkg-descr deleted file mode 100644 index 5398dc1c18b4..000000000000 --- a/www/mod_vhost_ldap/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -mod_vhost_ldap is an Apache 2.x module for storing and configuring -virtual hosts from LDAP. It supports DocumentRoot, ScriptAlias, -ServerName, ServerAlias, ServerAdmin, and SuexecUserGroup directives. -It's built on top of mod_ldap, so it uses its caching capabilities and -can be used with a threaded Apache httpd. - -WWW: http://modvhostldap.alioth.debian.org/ diff --git a/www/mod_whatkilledus/Makefile b/www/mod_whatkilledus/Makefile deleted file mode 100644 index c324f566f127..000000000000 --- a/www/mod_whatkilledus/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# Created by: Frank Wall <fw@moov.de> -# $FreeBSD$ - -PORTNAME= mod_whatkilledus -PORTVERSION= 2.0 -PORTREVISION= 1 -CATEGORIES= www -MASTER_SITES= http://people.apache.org/~trawick/ \ - http://dl.moov.de/freebsd/${PORTNAME}/ -DISTFILES= mod_whatkilledus.c test_char.h -EXTRACT_ONLY= # empty - -MAINTAINER= fw@moov.de -COMMENT= Logs a report when a child process crashes - -LICENSE= APACHE20 - -MANUAL_PACKAGE_BUILD= requires apache WITH_EXCEPTION_HOOK=yes - -USES= apache:2.2 -AP_FAST_BUILD= yes -AP_GENPLIST= yes -SHORTMODNAME= whatkilledus - -WRKSRC= ${WRKDIR} - -do-extract: - @${MKDIR} ${WRKSRC} - ${CP} ${DISTDIR}/mod_whatkilledus.c ${WRKSRC} - ${CP} ${DISTDIR}/test_char.h ${WRKSRC} - -pre-build: - @${ECHO_MSG} "*********************** PLEASE NOTE! ***********************" - @${ECHO_MSG} "Apache httpd must be built with the --enable-exception-hook" - @${ECHO_MSG} "configure option and mod_so enabled." - @${ECHO_MSG} "*********************** PLEASE NOTE! ***********************" - -.include <bsd.port.mk> diff --git a/www/mod_whatkilledus/distinfo b/www/mod_whatkilledus/distinfo deleted file mode 100644 index 1286abe0bf95..000000000000 --- a/www/mod_whatkilledus/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (mod_whatkilledus.c) = 28c5c7b2b756513d31a87d707e5878d46795d125e5eb38d913a5d1713d203c90 -SIZE (mod_whatkilledus.c) = 12274 -SHA256 (test_char.h) = 424d330cc397e98cff333f33a3b00ef4abf84e405e26aedd898d293f3d12b590 -SIZE (test_char.h) = 1094 diff --git a/www/mod_whatkilledus/pkg-descr b/www/mod_whatkilledus/pkg-descr deleted file mode 100644 index 03dc2586dd52..000000000000 --- a/www/mod_whatkilledus/pkg-descr +++ /dev/null @@ -1,23 +0,0 @@ -mod_whatkilledus is an experimental module for Apache httpd 2.x which -tracks the current request and logs a report of the active request -when a child process crashes. - -Requirements: Apache httpd >= 2.0.49 must be built with the ---enable-exception-hook configure option and mod_so enabled. - -Activating mod_whatkilledus: - - 1. Load it like any other DSO. - LoadModule whatkilledus_module modules/mod_whatkilledus.so - - 2. Enable exception hooks for modules like mod_whatkilledus: - EnableExceptionHook On - - 3. Choose where the report on current activity should be written. If - you want it reported to some place other than the error log, use the - WhatKilledUsLog directive to specify a fully-qualified filename for - the log. Note that the web server user id (e.g., "nobody") must - be able to create or append to this log file, as the log file is - not opened until a crash occurs. - -WWW: https://emptyhammock.com/projects/httpd/diag/legacy_exception_hook.html diff --git a/www/mod_xml2enc/Makefile b/www/mod_xml2enc/Makefile deleted file mode 100644 index d2c79372cbf8..000000000000 --- a/www/mod_xml2enc/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# Created by: Marin Atanasov Nikolov <dnaeon@gmail.com> -# $FreeBSD$ - -PORTNAME= mod_xml2enc -PORTVERSION= 1.0.3 -PORTREVISION= 1 -CATEGORIES= www -MASTER_SITES= http://apache.webthing.com/mod_proxy_html/ -DISTNAME= mod_proxy_html -DIST_SUBDIR= mod_proxy_html - -MAINTAINER= dnaeon@gmail.com -COMMENT= Apache module for converting encoding before and/or after a filter run - -LICENSE= GPLv2 - -# included in apache24 -# http://httpd.apache.org/docs/2.4/mod/mod_xml2enc.html -AP_FAST_BUILD= yes -AP_GENPLIST= yes -SHORTMODNAME= xml2enc -USES= apache:2.2 tar:bzip2 -USE_GNOME= libxml2 - -AP_INC+= ${LOCALBASE}/include/libxml2 -I${WRKSRC} -AP_LIB+= ${LOCALBASE}/lib -AP_EXTRAS+= -lxml2 - -PORTDOCS= COPYING - -post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/www/mod_xml2enc/distinfo b/www/mod_xml2enc/distinfo deleted file mode 100644 index b1f22b0176eb..000000000000 --- a/www/mod_xml2enc/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mod_proxy_html/mod_proxy_html.tar.bz2) = a1aee758bda605e153868b91188ebf2c527b8eeb0f115d11af152078e65895bf -SIZE (mod_proxy_html/mod_proxy_html.tar.bz2) = 23019 diff --git a/www/mod_xml2enc/pkg-descr b/www/mod_xml2enc/pkg-descr deleted file mode 100644 index 0f9be8941bdf..000000000000 --- a/www/mod_xml2enc/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -mod_xml2enc is a transcoding module that can be used to extend the -internationalisation support of libxml2-based filter modules by -converting encoding before and/or after the filter has run. -Thus an unsupported input charset can be converted to UTF-8, -and output can also be converted to another charset if required. - -WWW: http://apache.webthing.com/mod_xml2enc/ |