Commit b524da1d authored by Jerzy Kołosowski's avatar Jerzy Kołosowski

nginx update

parent 3c1fd1eb
This diff is collapsed.
We aren't interested in bundled Brotli.
Use pkg-config to detect Brotli's install path.
--- a/config
+++ b/config
@@ -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
-brotli="/usr/local"
+brotli=$(pkg-config --variable=prefix libbrotlienc)
if [ ! -f "$brotli/include/brotli/encode.h" ]; then
-brotli="$ngx_addon_dir/deps/brotli/c"
-
-if [ ! -f "$brotli/include/brotli/encode.h" ]; then
cat << END
$0: error: \
-Brotli library is missing from the $brotli directory.
-
-Please make sure that the git submodule has been checked out:
-
- cd $ngx_addon_dir && git submodule update --init && cd $PWD
+Brotli library not found. Don't you have app-arch/brotli installed?
END
exit 1
fi
-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 \
- $brotli/enc/backward_references_inc.h \
- $brotli/enc/bit_cost.h \
- $brotli/enc/bit_cost_inc.h \
- $brotli/enc/block_encoder_inc.h \
- $brotli/enc/block_splitter.h \
- $brotli/enc/block_splitter_inc.h \
- $brotli/enc/brotli_bit_stream.h \
- $brotli/enc/cluster.h \
- $brotli/enc/cluster_inc.h \
- $brotli/enc/command.h \
- $brotli/enc/compress_fragment.h \
- $brotli/enc/compress_fragment_two_pass.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 \
- $brotli/enc/find_match_length.h \
- $brotli/enc/hash.h \
- $brotli/enc/hash_forgetful_chain_inc.h \
- $brotli/enc/hash_longest_match64_inc.h \
- $brotli/enc/hash_longest_match_inc.h \
- $brotli/enc/hash_longest_match_quickly_inc.h \
- $brotli/enc/hash_to_binary_tree_inc.h \
- $brotli/enc/histogram.h \
- $brotli/enc/histogram_inc.h \
- $brotli/enc/literal_cost.h \
- $brotli/enc/memory.h \
- $brotli/enc/metablock.h \
- $brotli/enc/metablock_inc.h \
- $brotli/enc/params.h \
- $brotli/enc/prefix.h \
- $brotli/enc/quality.h \
- $brotli/enc/ringbuffer.h \
- $brotli/enc/static_dict.h \
- $brotli/enc/static_dict_lut.h \
- $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 \
- $brotli/enc/block_splitter.c \
- $brotli/enc/brotli_bit_stream.c \
- $brotli/enc/cluster.c \
- $brotli/enc/compress_fragment.c \
- $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 \
- $brotli/enc/memory.c \
- $brotli/enc/metablock.c \
- $brotli/enc/static_dict.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 \
@@ -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"
-fi # encode.h in /usr/local
-
ngx_module_order="$ngx_module_name \
ngx_pagespeed \
ngx_http_postpone_filter_module \
--- a/config
+++ b/config
@@ -59,13 +59,7 @@ have=NGX_HTTP_BROTLI_STATIC_MODULE . auto/have # deprecated
ngx_module_type=HTTP_FILTER
ngx_module_name=ngx_http_brotli_filter_module
-brotli="/usr/local"
-
-if [ -f "/usr/include/brotli/encode.h" ]; then
-
-brotli="/usr"
-
-fi
+brotli=$(pkg-config --variable=prefix libbrotlienc)
if [ ! -f "$brotli/include/brotli/encode.h" ]; then
@@ -75,11 +69,7 @@ if [ ! -f "$brotli/include/brotli/encode.h" ]; then
cat << END
$0: error: \
-Brotli library is missing from the $brotli directory.
-
-Please make sure that the git submodule has been checked out:
-
- cd $ngx_addon_dir && git submodule update --init && cd $PWD
+Brotli library not found. Don't you have app-arch/brotli installed?
END
exit 1
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
......@@ -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="0.1.2"
HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c"
HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${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)
......@@ -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.18"
HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
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/vozlt/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/${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+)
......@@ -174,7 +174,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
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.2"
NJS_MODULE_PV="0.2.5"
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}"
......@@ -408,7 +408,7 @@ src_prepare() {
if use nginx_modules_http_brotli; then
cd "${HTTP_BROTLI_MODULE_WD}" || die
eapply "${FILESDIR}"/http_brotli-detect-brotli-r1.patch
eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch
cd "${S}" || die
fi
......
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
......@@ -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="0.1.2"
HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c"
HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${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)
......@@ -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.18"
HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
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/vozlt/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/${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+)
......@@ -156,7 +156,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
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.2"
NJS_MODULE_PV="0.2.5"
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}"
......@@ -383,7 +383,7 @@ src_prepare() {
if use nginx_modules_http_brotli; then
cd "${HTTP_BROTLI_MODULE_WD}" || die
eapply "${FILESDIR}"/http_brotli-detect-brotli-r1.patch
eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch
cd "${S}" || die
fi
......
......@@ -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="0.1.2"
HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c"
HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${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)
......@@ -174,7 +174,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
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.4"
NJS_MODULE_PV="0.2.5"
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}"
......@@ -408,7 +408,7 @@ src_prepare() {
if use nginx_modules_http_brotli; then
cd "${HTTP_BROTLI_MODULE_WD}" || die
eapply "${FILESDIR}"/http_brotli-detect-brotli-r1.patch
eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch
cd "${S}" || die
fi
......
......@@ -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="0.1.2"
HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c"
HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${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)
......@@ -156,7 +156,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
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.4"
NJS_MODULE_PV="0.2.5"
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}"
......@@ -383,7 +383,7 @@ src_prepare() {
if use nginx_modules_http_brotli; then
cd "${HTTP_BROTLI_MODULE_WD}" || die
eapply "${FILESDIR}"/http_brotli-detect-brotli-r1.patch
eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch
cd "${S}" || die
fi
......
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