Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
www/apache24/Makefile
View File

@@ -1,7 +1,13 @@
# $NetBSD: Makefile,v 1.38 2015/09/01 08:26:05 jperkin Exp $
# $NetBSD: Makefile,v 1.48 2016/07/29 11:11:24 wiz Exp $
#
# When updating this package, make sure that no strings like
# "PR 12345" are in the commit message. Upstream likes
# to reference their own PRs this way, but this ends up
# in NetBSD GNATS.
DISTNAME= httpd-2.4.16
DISTNAME= httpd-2.4.23
PKGNAME= ${DISTNAME:S/httpd/apache/}
PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
http://archive.apache.org/dist/httpd/ \
@@ -15,7 +21,6 @@ LICENSE= apache-2.0
BUILD_DEFS+= IPV6_READY
BUILD_DEFS+= VARBASE
BUILD_DEFS+= APACHE_CUSTOM_CFLAGS
USE_LIBTOOL= yes
USE_TOOLS+= pax perl pkg-config
@@ -28,7 +33,6 @@ CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util}
CONFIGURE_ARGS+= --with-port=80
CONFIGURE_ENV+= perlbin=${PERL5:Q}
CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent
CONFIGURE_ENV+= CFLAGS=${APACHE_CUSTOM_CFLAGS:M*:Q}
CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__
@@ -45,18 +49,16 @@ BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.5.3
CONFIGURE_ARGS+= --disable-xml2enc
CONFIGURE_ARGS+= --disable-proxy-html
CONFIGURE_ARGS+= --enable-proxy-fdpass
DFLT_APACHE_MODULES+= all
APACHE_MODULES?= ${DFLT_APACHE_MODULES}
.include "options.mk"
FIND_PREFIX:= APRDIR=apr
.include "../../mk/find-prefix.mk"
# LDAP support
PLIST_VARS+= ldap
.if exists(${APRDIR}/lib/apr-util-1/apr_ldap.la)
.if exists(${LOCALBASE}/lib/apr-util-1/apr_ldap.la)
DFLT_APACHE_MODULES+= ldap authnz_ldap
PLIST.ldap= yes
.endif
@@ -166,7 +168,7 @@ INSTALL_TARGET= install-conf install
INSTALL_MAKE_FLAGS+= sysconfdir="${EGDIR}"
post-install:
${LN} -sf ${APRDIR}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars
${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/bin

308
www/apache24/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.19 2015/09/01 08:26:05 jperkin Exp $
@comment $NetBSD: PLIST,v 1.22 2016/07/05 16:13:53 taca Exp $
bin/ab
bin/apxs
bin/dbmmanage
@@ -49,6 +49,7 @@ include/httpd/mod_rewrite.h
include/httpd/mod_session.h
include/httpd/mod_so.h
include/httpd/mod_ssl.h
include/httpd/mod_ssl_openssl.h
include/httpd/mod_status.h
include/httpd/mod_unixd.h
include/httpd/mod_watchdog.h
@@ -119,6 +120,7 @@ lib/httpd/mod_filter.so
lib/httpd/mod_headers.so
lib/httpd/mod_heartbeat.so
lib/httpd/mod_heartmonitor.so
${PLIST.http2}lib/httpd/mod_http2.so
lib/httpd/mod_include.so
lib/httpd/mod_info.so
lib/httpd/mod_lbmethod_bybusyness.so
@@ -147,6 +149,7 @@ lib/httpd/mod_proxy_express.so
lib/httpd/mod_proxy_fcgi.so
lib/httpd/mod_proxy_fdpass.so
lib/httpd/mod_proxy_ftp.so
lib/httpd/mod_proxy_hcheck.so
lib/httpd/mod_proxy_http.so
lib/httpd/mod_proxy_scgi.so
lib/httpd/mod_proxy_wstunnel.so
@@ -494,294 +497,6 @@ share/httpd/icons/world1.png
share/httpd/icons/world2.gif
share/httpd/icons/world2.png
share/httpd/icons/xml.png
share/examples/httpd/extra/httpd-autoindex.conf
share/examples/httpd/extra/httpd-dav.conf
share/examples/httpd/extra/httpd-default.conf
share/examples/httpd/extra/httpd-info.conf
share/examples/httpd/extra/httpd-languages.conf
share/examples/httpd/extra/httpd-manual.conf
share/examples/httpd/extra/httpd-mpm.conf
share/examples/httpd/extra/httpd-multilang-errordoc.conf
share/examples/httpd/extra/httpd-ssl.conf
share/examples/httpd/extra/httpd-userdir.conf
share/examples/httpd/extra/httpd-vhosts.conf
share/examples/httpd/extra/proxy-html.conf
share/examples/httpd/httpd.conf
share/examples/httpd/magic
share/examples/httpd/mime.types
share/httpd/build/config.nice
share/httpd/build/config_vars.mk
share/httpd/build/instdso.sh
share/httpd/build/library.mk
share/httpd/build/libtool
share/httpd/build/ltlib.mk
share/httpd/build/mkdir.sh
share/httpd/build/program.mk
share/httpd/build/rules.mk
share/httpd/build/special.mk
share/httpd/error/HTTP_BAD_GATEWAY.html.var
share/httpd/error/HTTP_BAD_REQUEST.html.var
share/httpd/error/HTTP_FORBIDDEN.html.var
share/httpd/error/HTTP_GONE.html.var
share/httpd/error/HTTP_INTERNAL_SERVER_ERROR.html.var
share/httpd/error/HTTP_LENGTH_REQUIRED.html.var
share/httpd/error/HTTP_METHOD_NOT_ALLOWED.html.var
share/httpd/error/HTTP_NOT_FOUND.html.var
share/httpd/error/HTTP_NOT_IMPLEMENTED.html.var
share/httpd/error/HTTP_PRECONDITION_FAILED.html.var
share/httpd/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
share/httpd/error/HTTP_REQUEST_TIME_OUT.html.var
share/httpd/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
share/httpd/error/HTTP_SERVICE_UNAVAILABLE.html.var
share/httpd/error/HTTP_UNAUTHORIZED.html.var
share/httpd/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
share/httpd/error/HTTP_VARIANT_ALSO_VARIES.html.var
share/httpd/error/README
share/httpd/error/contact.html.var
share/httpd/error/include/bottom.html
share/httpd/error/include/spacer.html
share/httpd/error/include/top.html
share/httpd/htdocs/index.html
share/httpd/icons/README
share/httpd/icons/README.html
share/httpd/icons/a.gif
share/httpd/icons/a.png
share/httpd/icons/alert.black.gif
share/httpd/icons/alert.black.png
share/httpd/icons/alert.red.gif
share/httpd/icons/alert.red.png
share/httpd/icons/apache_pb.gif
share/httpd/icons/apache_pb.png
share/httpd/icons/apache_pb.svg
share/httpd/icons/apache_pb2.gif
share/httpd/icons/apache_pb2.png
share/httpd/icons/back.gif
share/httpd/icons/back.png
share/httpd/icons/ball.gray.gif
share/httpd/icons/ball.gray.png
share/httpd/icons/ball.red.gif
share/httpd/icons/ball.red.png
share/httpd/icons/binary.gif
share/httpd/icons/binary.png
share/httpd/icons/binhex.gif
share/httpd/icons/binhex.png
share/httpd/icons/blank.gif
share/httpd/icons/blank.png
share/httpd/icons/bomb.gif
share/httpd/icons/bomb.png
share/httpd/icons/box1.gif
share/httpd/icons/box1.png
share/httpd/icons/box2.gif
share/httpd/icons/box2.png
share/httpd/icons/broken.gif
share/httpd/icons/broken.png
share/httpd/icons/burst.gif
share/httpd/icons/burst.png
share/httpd/icons/c.gif
share/httpd/icons/c.png
share/httpd/icons/comp.blue.gif
share/httpd/icons/comp.blue.png
share/httpd/icons/comp.gray.gif
share/httpd/icons/comp.gray.png
share/httpd/icons/compressed.gif
share/httpd/icons/compressed.png
share/httpd/icons/continued.gif
share/httpd/icons/continued.png
share/httpd/icons/dir.gif
share/httpd/icons/dir.png
share/httpd/icons/diskimg.gif
share/httpd/icons/diskimg.png
share/httpd/icons/down.gif
share/httpd/icons/down.png
share/httpd/icons/dvi.gif
share/httpd/icons/dvi.png
share/httpd/icons/f.gif
share/httpd/icons/f.png
share/httpd/icons/folder.gif
share/httpd/icons/folder.open.gif
share/httpd/icons/folder.open.png
share/httpd/icons/folder.png
share/httpd/icons/folder.sec.gif
share/httpd/icons/folder.sec.png
share/httpd/icons/forward.gif
share/httpd/icons/forward.png
share/httpd/icons/generic.gif
share/httpd/icons/generic.png
share/httpd/icons/generic.red.gif
share/httpd/icons/generic.red.png
share/httpd/icons/generic.sec.gif
share/httpd/icons/generic.sec.png
share/httpd/icons/hand.right.gif
share/httpd/icons/hand.right.png
share/httpd/icons/hand.up.gif
share/httpd/icons/hand.up.png
share/httpd/icons/icon.sheet.gif
share/httpd/icons/icon.sheet.png
share/httpd/icons/image1.gif
share/httpd/icons/image1.png
share/httpd/icons/image2.gif
share/httpd/icons/image2.png
share/httpd/icons/image3.gif
share/httpd/icons/image3.png
share/httpd/icons/index.gif
share/httpd/icons/index.png
share/httpd/icons/layout.gif
share/httpd/icons/layout.png
share/httpd/icons/left.gif
share/httpd/icons/left.png
share/httpd/icons/link.gif
share/httpd/icons/link.png
share/httpd/icons/movie.gif
share/httpd/icons/movie.png
share/httpd/icons/odf6odb.png
share/httpd/icons/odf6odc.png
share/httpd/icons/odf6odf.png
share/httpd/icons/odf6odg.png
share/httpd/icons/odf6odi.png
share/httpd/icons/odf6odm.png
share/httpd/icons/odf6odp.png
share/httpd/icons/odf6ods.png
share/httpd/icons/odf6odt.png
share/httpd/icons/odf6otc.png
share/httpd/icons/odf6otf.png
share/httpd/icons/odf6otg.png
share/httpd/icons/odf6oth.png
share/httpd/icons/odf6oti.png
share/httpd/icons/odf6otp.png
share/httpd/icons/odf6ots.png
share/httpd/icons/odf6ott.png
share/httpd/icons/p.gif
share/httpd/icons/p.png
share/httpd/icons/patch.gif
share/httpd/icons/patch.png
share/httpd/icons/pdf.gif
share/httpd/icons/pdf.png
share/httpd/icons/pie0.gif
share/httpd/icons/pie0.png
share/httpd/icons/pie1.gif
share/httpd/icons/pie1.png
share/httpd/icons/pie2.gif
share/httpd/icons/pie2.png
share/httpd/icons/pie3.gif
share/httpd/icons/pie3.png
share/httpd/icons/pie4.gif
share/httpd/icons/pie4.png
share/httpd/icons/pie5.gif
share/httpd/icons/pie5.png
share/httpd/icons/pie6.gif
share/httpd/icons/pie6.png
share/httpd/icons/pie7.gif
share/httpd/icons/pie7.png
share/httpd/icons/pie8.gif
share/httpd/icons/pie8.png
share/httpd/icons/portal.gif
share/httpd/icons/portal.png
share/httpd/icons/ps.gif
share/httpd/icons/ps.png
share/httpd/icons/quill.gif
share/httpd/icons/quill.png
share/httpd/icons/right.gif
share/httpd/icons/right.png
share/httpd/icons/screw1.gif
share/httpd/icons/screw1.png
share/httpd/icons/screw2.gif
share/httpd/icons/screw2.png
share/httpd/icons/script.gif
share/httpd/icons/script.png
share/httpd/icons/small/back.gif
share/httpd/icons/small/back.png
share/httpd/icons/small/binary.gif
share/httpd/icons/small/binary.png
share/httpd/icons/small/binhex.gif
share/httpd/icons/small/binhex.png
share/httpd/icons/small/blank.gif
share/httpd/icons/small/blank.png
share/httpd/icons/small/broken.gif
share/httpd/icons/small/broken.png
share/httpd/icons/small/burst.gif
share/httpd/icons/small/burst.png
share/httpd/icons/small/comp1.gif
share/httpd/icons/small/comp1.png
share/httpd/icons/small/comp2.gif
share/httpd/icons/small/comp2.png
share/httpd/icons/small/compressed.gif
share/httpd/icons/small/compressed.png
share/httpd/icons/small/continued.gif
share/httpd/icons/small/continued.png
share/httpd/icons/small/doc.gif
share/httpd/icons/small/doc.png
share/httpd/icons/small/folder.gif
share/httpd/icons/small/folder.png
share/httpd/icons/small/folder2.gif
share/httpd/icons/small/folder2.png
share/httpd/icons/small/forward.gif
share/httpd/icons/small/forward.png
share/httpd/icons/small/generic.gif
share/httpd/icons/small/generic.png
share/httpd/icons/small/generic2.gif
share/httpd/icons/small/generic2.png
share/httpd/icons/small/generic3.gif
share/httpd/icons/small/generic3.png
share/httpd/icons/small/image.gif
share/httpd/icons/small/image.png
share/httpd/icons/small/image2.gif
share/httpd/icons/small/image2.png
share/httpd/icons/small/index.gif
share/httpd/icons/small/index.png
share/httpd/icons/small/key.gif
share/httpd/icons/small/key.png
share/httpd/icons/small/movie.gif
share/httpd/icons/small/movie.png
share/httpd/icons/small/patch.gif
share/httpd/icons/small/patch.png
share/httpd/icons/small/ps.gif
share/httpd/icons/small/ps.png
share/httpd/icons/small/rainbow.gif
share/httpd/icons/small/rainbow.png
share/httpd/icons/small/sound.gif
share/httpd/icons/small/sound.png
share/httpd/icons/small/sound2.gif
share/httpd/icons/small/sound2.png
share/httpd/icons/small/tar.gif
share/httpd/icons/small/tar.png
share/httpd/icons/small/text.gif
share/httpd/icons/small/text.png
share/httpd/icons/small/transfer.gif
share/httpd/icons/small/transfer.png
share/httpd/icons/small/unknown.gif
share/httpd/icons/small/unknown.png
share/httpd/icons/small/uu.gif
share/httpd/icons/small/uu.png
share/httpd/icons/sound1.gif
share/httpd/icons/sound1.png
share/httpd/icons/sound2.gif
share/httpd/icons/sound2.png
share/httpd/icons/sphere1.gif
share/httpd/icons/sphere1.png
share/httpd/icons/sphere2.gif
share/httpd/icons/sphere2.png
share/httpd/icons/svg.png
share/httpd/icons/tar.gif
share/httpd/icons/tar.png
share/httpd/icons/tex.gif
share/httpd/icons/tex.png
share/httpd/icons/text.gif
share/httpd/icons/text.png
share/httpd/icons/transfer.gif
share/httpd/icons/transfer.png
share/httpd/icons/unknown.gif
share/httpd/icons/unknown.png
share/httpd/icons/up.gif
share/httpd/icons/up.png
share/httpd/icons/uu.gif
share/httpd/icons/uu.png
share/httpd/icons/uuencoded.gif
share/httpd/icons/uuencoded.png
share/httpd/icons/world1.gif
share/httpd/icons/world1.png
share/httpd/icons/world2.gif
share/httpd/icons/world2.png
share/httpd/icons/xml.png
share/httpd/manual/BUILDING
share/httpd/manual/LICENSE
share/httpd/manual/bind.html
@@ -866,6 +581,7 @@ share/httpd/manual/expr.html.en
share/httpd/manual/expr.html.fr
share/httpd/manual/faq/index.html
share/httpd/manual/faq/index.html.en
share/httpd/manual/faq/index.html.es
share/httpd/manual/faq/index.html.fr
share/httpd/manual/faq/index.html.tr.utf8
share/httpd/manual/faq/index.html.zh-cn.utf8
@@ -915,6 +631,8 @@ share/httpd/manual/howto/htaccess.html.fr
share/httpd/manual/howto/htaccess.html.ja.utf8
share/httpd/manual/howto/htaccess.html.ko.euc-kr
share/httpd/manual/howto/htaccess.html.pt-br
share/httpd/manual/howto/http2.html
share/httpd/manual/howto/http2.html.en
share/httpd/manual/howto/index.html
share/httpd/manual/howto/index.html.en
share/httpd/manual/howto/index.html.fr
@@ -927,12 +645,17 @@ share/httpd/manual/howto/public_html.html.fr
share/httpd/manual/howto/public_html.html.ja.utf8
share/httpd/manual/howto/public_html.html.ko.euc-kr
share/httpd/manual/howto/public_html.html.tr.utf8
share/httpd/manual/howto/reverse_proxy.html
share/httpd/manual/howto/reverse_proxy.html.en
share/httpd/manual/howto/ssi.html
share/httpd/manual/howto/ssi.html.en
share/httpd/manual/howto/ssi.html.fr
share/httpd/manual/howto/ssi.html.ja.utf8
share/httpd/manual/howto/ssi.html.ko.euc-kr
share/httpd/manual/images/apache_header.gif
share/httpd/manual/images/bal-man-b.png
share/httpd/manual/images/bal-man-w.png
share/httpd/manual/images/bal-man.png
share/httpd/manual/images/build_a_mod_2.png
share/httpd/manual/images/build_a_mod_3.png
share/httpd/manual/images/build_a_mod_4.png
@@ -959,6 +682,7 @@ share/httpd/manual/images/mod_rewrite_fig1.png
share/httpd/manual/images/mod_rewrite_fig2.gif
share/httpd/manual/images/mod_rewrite_fig2.png
share/httpd/manual/images/pixel.gif
share/httpd/manual/images/reverse-proxy-arch.png
share/httpd/manual/images/rewrite_backreferences.png
share/httpd/manual/images/rewrite_process_uri.png
share/httpd/manual/images/rewrite_rule_flow.png
@@ -1279,6 +1003,8 @@ share/httpd/manual/mod/mod_heartbeat.html.fr
share/httpd/manual/mod/mod_heartmonitor.html
share/httpd/manual/mod/mod_heartmonitor.html.en
share/httpd/manual/mod/mod_heartmonitor.html.fr
share/httpd/manual/mod/mod_http2.html
share/httpd/manual/mod/mod_http2.html.en
share/httpd/manual/mod/mod_ident.html
share/httpd/manual/mod/mod_ident.html.en
share/httpd/manual/mod/mod_ident.html.fr
@@ -1387,12 +1113,16 @@ share/httpd/manual/mod/mod_proxy_fdpass.html.fr
share/httpd/manual/mod/mod_proxy_ftp.html
share/httpd/manual/mod/mod_proxy_ftp.html.en
share/httpd/manual/mod/mod_proxy_ftp.html.fr
share/httpd/manual/mod/mod_proxy_hcheck.html
share/httpd/manual/mod/mod_proxy_hcheck.html.en
share/httpd/manual/mod/mod_proxy_html.html
share/httpd/manual/mod/mod_proxy_html.html.en
share/httpd/manual/mod/mod_proxy_html.html.fr
share/httpd/manual/mod/mod_proxy_http.html
share/httpd/manual/mod/mod_proxy_http.html.en
share/httpd/manual/mod/mod_proxy_http.html.fr
share/httpd/manual/mod/mod_proxy_http2.html
share/httpd/manual/mod/mod_proxy_http2.html.en
share/httpd/manual/mod/mod_proxy_scgi.html
share/httpd/manual/mod/mod_proxy_scgi.html.en
share/httpd/manual/mod/mod_proxy_scgi.html.fr

4
www/apache24/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.7 2014/02/12 23:18:43 tron Exp $
# $NetBSD: buildlink3.mk,v 1.8 2016/03/05 11:27:57 jperkin Exp $
BUILDLINK_TREE+= apache
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= apache
APACHE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.apache+= apache>=2.4.7<2.5
BUILDLINK_ABI_DEPENDS.apache+= apache>=2.4.7nb1
BUILDLINK_ABI_DEPENDS.apache+= apache>=2.4.18nb1
BUILDLINK_PKGSRCDIR.apache?= ../../www/apache24
BUILDLINK_DEPMETHOD.apache?= build
.if defined(APACHE_MODULE)

10
www/apache24/distinfo
View File

@@ -1,8 +1,9 @@
$NetBSD: distinfo,v 1.21 2015/07/20 00:08:35 taca Exp $
$NetBSD: distinfo,v 1.26 2016/07/29 11:11:24 wiz Exp $
SHA1 (httpd-2.4.16.tar.bz2) = 9963e7482700dd50c53e47abfe2d1c5068875a9c
RMD160 (httpd-2.4.16.tar.bz2) = ff29b1885d39e4ee96efdd6678c0881c921dedd8
Size (httpd-2.4.16.tar.bz2) = 5101005 bytes
SHA1 (httpd-2.4.23.tar.bz2) = 5101be34ac4a509b245adb70a56690a84fcc4e7f
RMD160 (httpd-2.4.23.tar.bz2) = 01a485281ededaaf932c9478ad078879a63254bc
SHA512 (httpd-2.4.23.tar.bz2) = c520de5be748c0a785ef0dc77102749eb4f47e224968b8d4bed2ae644faa0964623a0e960b64486a0888446790d050b52a6ae34fe61717fab95b37384b4825b1
Size (httpd-2.4.23.tar.bz2) = 6351875 bytes
SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839
SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324
SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d
@@ -14,3 +15,4 @@ SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911
SHA1 (patch-am) = acdf7198ae8b4353cfc70c8015a0f09de036b777
SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df
SHA1 (patch-include_ap__config.h) = 1d056e2d4db80ec97aaf755b6dd6aff69ed2cd96
SHA1 (patch-server_util__script.c) = e106f9d7157a5eaf34ef9b1fb445d517c7712aa2

3
www/apache24/files/smf/manifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
<service_bundle type='manifest' name='@SMF_NAME@'>
<service_bundle type='manifest' name='export'>
<service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='0'>
<create_default_instance enabled="false" />
<single_instance />
@@ -24,7 +24,6 @@
<property_group name='startd' type='framework'>
<propval name='ignore_error' type='astring' value='core,signal' />
</property_group>
<stability value='Evolving' />
<template>
<common_name>
<loctext xml:lang='C'>Apache 2 HTTP server</loctext>

31
www/apache24/options.mk
View File

@@ -1,14 +1,15 @@
# $NetBSD: options.mk,v 1.10 2015/06/26 19:25:12 ryoon Exp $
# $NetBSD: options.mk,v 1.12 2016/01/31 07:49:23 ryoon Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.apache
PKG_SUPPORTED_OPTIONS= lua suexec apache-mpm-event apache-mpm-prefork apache-mpm-worker
PKG_SUPPORTED_OPTIONS= apache-mpm-event apache-mpm-prefork apache-mpm-worker \
lua http2 suexec
PKG_SUGGESTED_OPTIONS= apache-mpm-event apache-mpm-prefork \
apache-mpm-worker
.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.1[0-9])
PKG_SUPPORTED_OPTIONS+= privileges
# Disabled until DTrace support is fully implemented/fixed
# PKG_SUPPORTED_OPTIONS+= dtrace
#PKG_SUPPORTED_OPTIONS+= dtrace
.endif
.include "../../mk/bsd.options.mk"
@@ -24,6 +25,7 @@ PKG_SUPPORTED_OPTIONS+= privileges
# worker hybrid multi-threaded multi-process web server
#
PLIST_VARS+= worker prefork event only-prefork not-only-prefork
PLIST_VARS+= http2 lua privileges suexec
.if !empty(PKG_OPTIONS:Mapache-mpm-event)
MPMS+= event
@@ -54,7 +56,6 @@ PLIST.not-only-prefork= yes
BUILD_DEFS+= APACHE_MODULES
PLIST_VARS+= suexec
.if !empty(PKG_OPTIONS:Msuexec)
BUILD_DEFS+= APACHE_SUEXEC_PATH
BUILD_DEFS+= APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE
@@ -79,22 +80,32 @@ PLIST.suexec= yes
SPECIAL_PERMS+= sbin/suexec ${REAL_ROOT_USER} ${APACHE_GROUP} 4510
.endif
PLIST_VARS+= lua
.if !empty(PKG_OPTIONS:Mhttp2)
.include "../../www/nghttp2/buildlink3.mk"
CONFIGURE_ARGS+= --with-nghttp2
PLIST.http2= yes
.else
CONFIGURE_ARGS+= --without-nghttp2
.endif
.if !empty(PKG_OPTIONS:Mlua)
CONFIGURE_ARGS+= --enable-lua
.include "../../lang/lua/buildlink3.mk"
CONFIGURE_ARGS+= --enable-lua
CONFIGURE_ARGS+= --with-lua=${PREFIX}
BUILDLINK_TRANSFORM+= l:lua-5.1:lua5.1
BUILDLINK_TRANSFORM+= l:lua-5.2:lua5.2
BUILDLINK_TRANSFORM+= l:lua-5.3:lua5.3
PLIST.lua= yes
.else
CONFIGURE_ARGS+= --disable-lua
.endif
PLIST_VARS+= privileges
.if !empty(PKG_OPTIONS:Mprivileges)
CONFIGURE_ARGS+= --enable-privileges
PLIST.privileges= yes
.endif
# DTrace support is manifest, but actually not implemented at all
# .if !empty(PKG_OPTIONS:Mdtrace)
# CONFIGURE_ARGS+= --enable-dtrace
# .endif
#.if !empty(PKG_OPTIONS:Mdtrace)
#CONFIGURE_ARGS+= --enable-dtrace
#.endif

22
www/apache24/patches/patch-server_util__script.c Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-server_util__script.c,v 1.1 2016/07/29 11:11:25 wiz Exp $
Fix httpoxy vulnerability.
https://www.apache.org/security/asf-httpoxy-response.txt
--- server/util_script.c.orig 2016-04-27 13:03:00.000000000 +0000
+++ server/util_script.c
@@ -186,6 +186,14 @@ AP_DECLARE(void) ap_add_common_vars(requ
else if (!strcasecmp(hdrs[i].key, "Content-length")) {
apr_table_addn(e, "CONTENT_LENGTH", hdrs[i].val);
}
+ /* HTTP_PROXY collides with a popular envvar used to configure
+ * proxies, don't let clients set/override it. But, if you must...
+ */
+#ifndef SECURITY_HOLE_PASS_PROXY
+ else if (!strcasecmp(hdrs[i].key, "Proxy")) {
+ ;
+ }
+#endif
/*
* You really don't want to disable this check, since it leaves you
* wide open to CGIs stealing passwords and people viewing them