[patch] ngx_brotli patch against nginx-1.13.4.ebuild

nginx-brotli.patch (text/plain), 2.71 KB, created by opensource on 2017-08-25 10:34:23 UTC

--- nginx-1.13.4.ebuild	2017-08-12 17:34:33.000000000 +0200
+++ nginx-1.13.4-r1.ebuild	2017-08-25 11:27:30.473281832 +0200
@@ -137,6 +137,12 @@
 HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
 HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
 
+# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="bfd2885b2da4d763fed18f49216bb935223cd34b"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
 # We handle deps below ourselves
 SSL_DEPS_SKIP=1
 AUTOTOOLS_AUTO_DEPEND="no"
@@ -165,7 +171,8 @@
 	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
 	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
 	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )"
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )"
 
 LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_security? ( Apache-2.0 )
@@ -207,7 +214,8 @@
 	http_sticky
 	http_mogilefs
 	http_memc
-	http_auth_ldap"
+	http_auth_ldap
+	http_brotli"
 
 IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
 	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
@@ -288,6 +296,7 @@
 	!www-servers/nginx:0"
 DEPEND="${CDEPEND}
 	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
+	nginx_modules_http_brotli? ( app-arch/brotli )
 	arm? ( dev-libs/libatomic_ops )
 	libatomic? ( dev-libs/libatomic_ops )"
 PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
@@ -363,6 +372,10 @@
 		cd "${S}" || die
 	fi
 
+	if use nginx_modules_http_brotli; then
+		sed -i 's:if .* -f "$brotli/[^;]*:if false:g; s:\$brotli/[^"\\]*::g; \/ngx_module_name=ngx_http_brotli_filter/,/^nginx_module_name=/ s/ngx_module_libs=.*/ngx_module_libs="-lm -lbrotlicommon -lbrotlienc"/' ${HTTP_BROTLI_MODULE_WD}/config || die
+	fi
+
 	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
 	# We have config protection, don't rename etc files
 	sed -i 's:.default::' auto/install || die
@@ -529,6 +542,11 @@
 		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
 	fi
 
+	if use nginx_modules_http_brotli; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
+	fi
+
 	if use http || use http-cache || use http2; then
 		http_enabled=1
 	fi