diff options
| -rw-r--r-- | www/apache24/Makefile | 4 | ||||
| -rw-r--r-- | www/apache24/PLIST | 5 | ||||
| -rw-r--r-- | www/apache24/distinfo | 9 | ||||
| -rw-r--r-- | www/apache24/options.mk | 27 |
4 files changed, 28 insertions, 17 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index fb47a21d73f..a6eb4b4fff4 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.38 2015/09/01 08:26:05 jperkin Exp $ +# $NetBSD: Makefile,v 1.39 2015/10/17 10:16:35 adam Exp $ -DISTNAME= httpd-2.4.16 +DISTNAME= httpd-2.4.17 PKGNAME= ${DISTNAME:S/httpd/apache/} CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ diff --git a/www/apache24/PLIST b/www/apache24/PLIST index d603c7ab058..e2b21fc06c3 100644 --- a/www/apache24/PLIST +++ b/www/apache24/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2015/09/01 08:26:05 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.20 2015/10/17 10:16:35 adam Exp $ bin/ab bin/apxs bin/dbmmanage @@ -119,6 +119,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 @@ -1279,6 +1280,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 diff --git a/www/apache24/distinfo b/www/apache24/distinfo index 809759e1f65..438d2c1f8cf 100644 --- a/www/apache24/distinfo +++ b/www/apache24/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.21 2015/07/20 00:08:35 taca Exp $ +$NetBSD: distinfo,v 1.22 2015/10/17 10:16:35 adam 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.17.tar.bz2) = 3a1b0db8b6c71b9c9ac507ba8723b95a8d3da1df +RMD160 (httpd-2.4.17.tar.bz2) = e237dc50782e9ab7c82afd96195af4115d3a2f96 +SHA512 (httpd-2.4.17.tar.bz2) = d818dbd4b138db592a98fecdf5ae13dfadc19f9553e98bdafbdadd4693ae19bb44c96c8c279e9546978bbce55b9286ce3c4ae69cf701a9812be134a3a517b1f6 +Size (httpd-2.4.17.tar.bz2) = 5157721 bytes SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839 SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324 SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d diff --git a/www/apache24/options.mk b/www/apache24/options.mk index e9bd612e7cf..7fe7fb2529d 100644 --- a/www/apache24/options.mk +++ b/www/apache24/options.mk @@ -1,14 +1,15 @@ -# $NetBSD: options.mk,v 1.10 2015/06/26 19:25:12 ryoon Exp $ +# $NetBSD: options.mk,v 1.11 2015/10/17 10:16:35 adam 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,28 @@ 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 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 |