diff options
| -rw-r--r-- | www/apache24/Makefile | 4 | ||||
| -rw-r--r-- | www/apache24/distinfo | 3 | ||||
| -rw-r--r-- | www/apache24/options.mk | 8 | ||||
| -rw-r--r-- | www/apache24/patches/patch-include_ap__config.h | 26 |
4 files changed, 37 insertions, 4 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index b93bc83817c..971c29e6646 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2013/05/31 12:42:31 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2013/06/04 22:08:20 fhajny Exp $ DISTNAME= httpd-2.4.4 PKGNAME= ${DISTNAME:S/httpd/apache/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ http://archive.apache.org/dist/httpd/ \ diff --git a/www/apache24/distinfo b/www/apache24/distinfo index 40307dea8b0..4bcb695e56b 100644 --- a/www/apache24/distinfo +++ b/www/apache24/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2013/02/25 21:16:37 ryoon Exp $ +$NetBSD: distinfo,v 1.8 2013/06/04 22:08:20 fhajny Exp $ SHA1 (httpd-2.4.4.tar.bz2) = 0c5ab7f876aa10fbe8bfab2c34f8dd3dc76db16c RMD160 (httpd-2.4.4.tar.bz2) = 2e22389d9dc9ad98d6b6727c25b8fdca4f7868f6 @@ -13,5 +13,6 @@ SHA1 (patch-ai) = 867ac81fd14b1bd6af048ec57390d915956e9568 SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911 SHA1 (patch-am) = f14b260ffad2c7e8d26e5b614d4aeaf8506e195b SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df +SHA1 (patch-include_ap__config.h) = 1d056e2d4db80ec97aaf755b6dd6aff69ed2cd96 SHA1 (patch-modules_ssl_ssl__private.h) = 7751a99a794957cbea19ff8d1a3e83bf8f276604 SHA1 (patch-server_core__filters.c) = 331672c9a65691229518f31dcdae64382b392287 diff --git a/www/apache24/options.mk b/www/apache24/options.mk index 7e4c4e545d5..7c5df17904e 100644 --- a/www/apache24/options.mk +++ b/www/apache24/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2013/04/11 11:01:09 fhajny Exp $ +# $NetBSD: options.mk,v 1.8 2013/06/04 22:08:20 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= lua suexec apache-mpm-event apache-mpm-prefork apache-mpm-worker @@ -6,6 +6,8 @@ PKG_SUGGESTED_OPTIONS= apache-mpm-prefork .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 .endif .include "../../mk/bsd.options.mk" @@ -81,3 +83,7 @@ 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 diff --git a/www/apache24/patches/patch-include_ap__config.h b/www/apache24/patches/patch-include_ap__config.h new file mode 100644 index 00000000000..ada260d59c8 --- /dev/null +++ b/www/apache24/patches/patch-include_ap__config.h @@ -0,0 +1,26 @@ +$NetBSD: patch-include_ap__config.h,v 1.1 2013/06/04 22:08:20 fhajny Exp $ + +Non-existent DTrace support from upstream is not a reason to break +3rd party DTrace enabled modules. This patch should be removed +when DTrace support is actually implemented upstream (and working). + +--- include/ap_config.h.orig 2012-08-14 23:59:24.000000000 +0000 ++++ include/ap_config.h +@@ -148,17 +148,7 @@ + #define AP_NONBLOCK_WHEN_MULTI_LISTEN 1 + #endif + +-#if defined(AP_ENABLE_DTRACE) && HAVE_SYS_SDT_H +-#include <sys/sdt.h> +-#else +-#undef _DTRACE_VERSION +-#endif +- +-#ifdef _DTRACE_VERSION +-#include "apache_probes.h" +-#else + #include "apache_noprobes.h" +-#endif + + /* If APR has OTHER_CHILD logic, use reliable piped logs. */ + #if APR_HAS_OTHER_CHILD |