diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2017-12-03 09:48:02 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2017-12-03 09:48:02 +0000 |
| commit | e8085c5b86f41376b545a38ce28cb5f90833ab28 (patch) | |
| tree | e7d5f9250fe23b2f54a340e24ed624271ab67136 | |
| parent | security/morphis: Unbroke the port by adding shebangfix (diff) | |
www/nginx: Unbreak brotli option
- The used commit hash includes the patch
PR: 224000
Reported by: Philipp <kidon posteo de>
Notes
Notes:
svn path=/head/; revision=455397
| -rw-r--r-- | www/nginx/Makefile | 1 | ||||
| -rw-r--r-- | www/nginx/files/extra-patch-brotli_config | 59 |
2 files changed, 0 insertions, 60 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index d0298fddd436..75fd7922860a 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1146,7 +1146,6 @@ LIB_DEPENDS+= libbrotlicommon.so:archivers/brotli GH_ACCOUNT+= eustas:brotli GH_PROJECT+= ngx_brotli:brotli GH_TAGNAME+= ${NGINX_BROTLI_VERSION}:brotli -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-brotli_config .if ${PORT_OPTIONS:MDSO} CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_brotli} .else diff --git a/www/nginx/files/extra-patch-brotli_config b/www/nginx/files/extra-patch-brotli_config deleted file mode 100644 index 3031661f2e6d..000000000000 --- a/www/nginx/files/extra-patch-brotli_config +++ /dev/null @@ -1,59 +0,0 @@ -From ad89164d7405b39fd947c998c80fc64fc866a440 Mon Sep 17 00:00:00 2001 -From: Bernard Spil <Sp1l@users.noreply.github.com> -Date: Thu, 30 Nov 2017 21:39:32 +0100 -Subject: [PATCH] Allow building with an already installed libbrotli - -Currently the module requires a bundled brotli source. This patch allows building with an external libbrotli (if detected) - -See also the [this bug report in FreeBSD](https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224000) ---- - config | 22 ++++++++++++++++++++-- - 1 file changed, 20 insertions(+), 2 deletions(-) - -diff --git a/config b/config -index 9d069f8..5e712d2 100644 ---- ../ngx_brotli-9891a98/config.orig 2017-11-28 11:00:45.000000000 +0100 -+++ ../ngx_brotli-9891a98/config 2017-11-30 21:05:56.300023000 +0100 -@@ -55,6 +55,14 @@ have=NGX_HTTP_BROTLI_STATIC_MODULE . auto/have # deprecated - # HTTP filter module with Brotli library - # - -+ -+ngx_module_type=HTTP_FILTER -+ngx_module_name=ngx_http_brotli_filter_module -+ -+brotli="/usr/local" -+ -+if [ ! -f "$brotli/include/brotli/encode.h" ]; then -+ - brotli="$ngx_addon_dir/deps/brotli" - - if [ ! -f "$brotli/include/brotli/encode.h" ]; then -@@ -71,8 +79,6 @@ END - exit 1 - fi - --ngx_module_type=HTTP_FILTER --ngx_module_name=ngx_http_brotli_filter_module - ngx_module_incs="$brotli/include" - ngx_module_deps="$brotli/common/constants.h \ - $brotli/common/dictionary.h \ -@@ -132,6 +138,18 @@ ngx_module_srcs="$brotli/common/dictionary.c \ - $brotli/enc/utf8_util.c \ - $ngx_addon_dir/src/ngx_http_brotli_filter_module.c" - ngx_module_libs="-lm" -+ -+else # encode.h in /usr/local -+ -+ngx_module_incs="$brotli/include" -+ngx_module_deps="$brotli/include/brotli/encode.h \ -+ $brotli/include/brotli/port.h \ -+ $brotli/include/brotli/types.h" -+ngx_module_srcs="$ngx_addon_dir/src/ngx_http_brotli_filter_module.c" -+ngx_module_libs="-lbrotlienc -lm" -+ -+fi # encode.h in /usr/local -+ - ngx_module_order="$ngx_module_name \ - ngx_pagespeed \ - ngx_http_postpone_filter_module \ |