Attachment 188434 Details for Bug 224000 – svn diff for www/nginx

[patch] svn diff for www/nginx

patch-www_nginx-brotli-1.0.2 (text/plain), 4.62 KB, created by Bernard Spil on 2017-11-30 20:47:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2017-11-30 20:47:12 UTC

Size: 4.62 KB

patch

obsolete

>Index: www/nginx/Makefile
>===================================================================
>--- www/nginx/Makefile	(revision 455221)
>+++ www/nginx/Makefile	(working copy)
>@@ -1141,11 +1141,12 @@
> .endif
> 
> .if ${PORT_OPTIONS:MBROTLI}
>-NGINX_BROTLI_VERSION=	12529813
>+NGINX_BROTLI_VERSION=	 9891a98
> LIB_DEPENDS+=	libbrotlicommon.so:archivers/brotli
>-GH_ACCOUNT+=	google: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
>@@ -1269,6 +1270,11 @@
> 		's!%%PREFIX%%!${LOCALBASE}!g' \
> 		${WRKSRC_nginx_tarantool}/config
> .endif
>+.if ${PORT_OPTIONS:MBROTLI}
>+	@${REINPLACE_CMD} -E \
>+		's!^brotli=.*!brotli="${LOCALBASE}"!' \
>+		${WRKSRC_brotli}/config
>+.endif
> 
> pre-configure:
> .if ${PORT_OPTIONS:MMODSECURITY}
>Index: www/nginx/distinfo
>===================================================================
>--- www/nginx/distinfo	(revision 455221)
>+++ www/nginx/distinfo	(working copy)
>@@ -123,8 +123,8 @@
> SIZE (nginx-njs-753ebe6_GH0.tar.gz) = 191124
> SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
> SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280
>-SHA256 (google-ngx_brotli-12529813_GH0.tar.gz) = 788b25c4a3285b34d06e48a469fd0d0cb52d43b43edccd2935e22802dcfd2d69
>-SIZE (google-ngx_brotli-12529813_GH0.tar.gz) = 10448
>+SHA256 (eustas-ngx_brotli-9891a98_GH0.tar.gz) = 7706bf0b2be34573b1895398470b785078bb19f96f2e4e27a28a2ba526c98f1e
>+SIZE (eustas-ngx_brotli-9891a98_GH0.tar.gz) = 10491
> SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
> SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
> SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
>Index: www/nginx/files/extra-patch-brotli_config
>===================================================================
>--- www/nginx/files/extra-patch-brotli_config	(nonexistent)
>+++ www/nginx/files/extra-patch-brotli_config	(working copy)
>@@ -0,0 +1,60 @@
>+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 \
>+
>
>Property changes on: www/nginx/files/extra-patch-brotli_config
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

brnrd: maintainer-approval?

Actions: View | Diff

Attachments on bug 224000: 188433 | 188434