Commit 66d3cfcd authored by Jerzy Kołosowski's avatar Jerzy Kołosowski

nginx update

parent 665d9038
This diff is collapsed.
......@@ -4,7 +4,7 @@ Use pkg-config to detect Brotli's install path.
--- a/config
+++ b/config
@@ -59,93 +59,19 @@ have=NGX_HTTP_BROTLI_STATIC_MODULE . auto/have # deprecated
@@ -59,98 +59,19 @@ have=NGX_HTTP_BROTLI_STATIC_MODULE . auto/have # deprecated
ngx_module_type=HTTP_FILTER
ngx_module_name=ngx_http_brotli_filter_module
......@@ -32,7 +32,10 @@ Use pkg-config to detect Brotli's install path.
-ngx_module_incs="$brotli/include"
-ngx_module_deps="$brotli/common/constants.h \
- $brotli/common/context.h \
- $brotli/common/dictionary.h \
- $brotli/common/platform.h \
- $brotli/common/transform.h \
- $brotli/common/version.h \
- $brotli/enc/backward_references.h \
- $brotli/enc/backward_references_hq.h \
......@@ -48,8 +51,8 @@ Use pkg-config to detect Brotli's install path.
- $brotli/enc/command.h \
- $brotli/enc/compress_fragment.h \
- $brotli/enc/compress_fragment_two_pass.h \
- $brotli/enc/context.h \
- $brotli/enc/dictionary_hash.h \
- $brotli/enc/encoder_dict.h \
- $brotli/enc/entropy_encode.h \
- $brotli/enc/entropy_encode_static.h \
- $brotli/enc/fast_log.h \
......@@ -66,7 +69,7 @@ Use pkg-config to detect Brotli's install path.
- $brotli/enc/memory.h \
- $brotli/enc/metablock.h \
- $brotli/enc/metablock_inc.h \
- $brotli/enc/port.h \
- $brotli/enc/params.h \
- $brotli/enc/prefix.h \
- $brotli/enc/quality.h \
- $brotli/enc/ringbuffer.h \
......@@ -75,6 +78,7 @@ Use pkg-config to detect Brotli's install path.
- $brotli/enc/utf8_util.h \
- $brotli/enc/write_bits.h"
-ngx_module_srcs="$brotli/common/dictionary.c \
- $brotli/common/transform.c \
- $brotli/enc/backward_references.c \
- $brotli/enc/backward_references_hq.c \
- $brotli/enc/bit_cost.c \
......@@ -85,6 +89,7 @@ Use pkg-config to detect Brotli's install path.
- $brotli/enc/compress_fragment_two_pass.c \
- $brotli/enc/dictionary_hash.c \
- $brotli/enc/encode.c \
- $brotli/enc/encoder_dict.c \
- $brotli/enc/entropy_encode.c \
- $brotli/enc/histogram.c \
- $brotli/enc/literal_cost.c \
......@@ -100,7 +105,7 @@ Use pkg-config to detect Brotli's install path.
ngx_module_incs="$brotli/include"
ngx_module_deps="$brotli/include/brotli/encode.h \
$brotli/include/brotli/port.h \
@@ -153,8 +79,6 @@ ngx_module_deps="$brotli/include/brotli/encode.h \
@@ -158,8 +79,6 @@ ngx_module_deps="$brotli/include/brotli/encode.h \
ngx_module_srcs="$ngx_addon_dir/src/ngx_http_brotli_filter_module.c"
ngx_module_libs="-lbrotlienc -lm"
......
This diff is collapsed.
This diff is collapsed.
......@@ -23,9 +23,9 @@ DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KI
DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
HTTP_BROTLI_MODULE_PV="6a1174446f5a866d3d13615dd2824177570f0a69"
HTTP_BROTLI_MODULE_PV="0.1.2"
HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
......@@ -59,7 +59,7 @@ HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v
HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
HTTP_LUA_MODULE_PV="0.10.11"
HTTP_LUA_MODULE_PV="0.10.13"
HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
......@@ -83,9 +83,9 @@ HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HT
HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.1.15-gentoo"
HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.1.17"
HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/Whissi/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
......@@ -138,7 +138,7 @@ HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/ar
HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
HTTP_MEMC_MODULE_PV="0.18"
HTTP_MEMC_MODULE_PV="0.19"
HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
......@@ -167,8 +167,14 @@ HTTP_CT_MODULE_P="nginx-ct-${HTTP_CT_MODULE_PV}"
HTTP_CT_MODULE_URI="https://github.com/grahamedgecombe/nginx-ct/archive/v${HTTP_CT_MODULE_PV}.tar.gz"
HTTP_CT_MODULE_WD="${WORKDIR}/nginx-ct-${HTTP_CT_MODULE_PV}"
# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
GEOIP2_MODULE_PV="2.0"
GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
# njs-module (https://github.com/nginx/njs, as-is)
NJS_MODULE_PV="0.2.0"
NJS_MODULE_PV="0.2.2"
NJS_MODULE_P="njs-${NJS_MODULE_PV}"
NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
......@@ -193,6 +199,7 @@ SRC_URI="https://nginx.org/download/${P}.tar.gz
nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
......@@ -207,6 +214,7 @@ SRC_URI="https://nginx.org/download/${P}.tar.gz
nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
......@@ -243,6 +251,7 @@ NGINX_MODULES_3RD="
http_dav_ext
http_echo
http_fancyindex
http_geoip2
http_headers_more
http_javascript
http_lua
......@@ -257,6 +266,7 @@ NGINX_MODULES_3RD="
http_upload_progress
http_upstream_check
http_vhost_traffic_status
stream_geoip2
stream_javascript
"
......@@ -310,6 +320,7 @@ CDEPEND="
)
nginx_modules_http_brotli? ( app-arch/brotli:= )
nginx_modules_http_geoip? ( dev-libs/geoip )
nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
nginx_modules_http_gunzip? ( sys-libs/zlib )
nginx_modules_http_gzip? ( sys-libs/zlib )
nginx_modules_http_gzip_static? ( sys-libs/zlib )
......@@ -395,7 +406,7 @@ src_prepare() {
if use nginx_modules_http_brotli; then
cd "${HTTP_BROTLI_MODULE_WD}" || die
eapply "${FILESDIR}"/http_brotli-detect-brotli.patch
eapply "${FILESDIR}"/http_brotli-detect-brotli-r1.patch
cd "${S}" || die
fi
......@@ -621,6 +632,10 @@ src_configure() {
myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
fi
if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
myconf+=( --add-module=${GEOIP2_MODULE_WD} )
fi
if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
fi
......@@ -657,7 +672,7 @@ src_configure() {
fi
done
if use nginx_modules_stream_javascript; then
if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
stream_enabled=1
fi
......@@ -899,7 +914,7 @@ pkg_postinst() {
if use nginx_modules_http_lua && use http2; then
ewarn ""
ewarn "Lua 3rd party module author warns against using ${P} with"
ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg"
ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
fi
local _n_permission_layout_checks=0
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment