Commit 445f64fd authored by Jerzy Kołosowski's avatar Jerzy Kołosowski

nginx: add mising files

parent 4319a73f
AUX http_brotli-detect-brotli.patch 4407 SHA256 2ab59de377241845189df941ea744b2198d54cc39edf34bf10129c1aef58389b SHA512 3347e4e8a3381e6bcd4589682a0024048c914ce67f56c9ac7c84dcdc44c0b2e4a6a3c8e21984f8574c4c42f8b7e85f1f58ed0fe59584faf0bf8edf8d92cf579e WHIRLPOOL 18fcd806b64009cdf5894e1b7360c2091436eab8a9d046ac8ba8f4cc4297454fd12ad6cfd76c365854e9d75c8ef0c24e3792f943b1c674f16aad2034b26fd8d9
AUX http_cache_purge-1.11.6+.patch 615 SHA256 42b302ef9f69f81fa92d5e9670453b2983582dd5931fde6188691baaca7ae825 SHA512 a3f45d8121d89a5c41783306577e146990404ff0e3691454e99cd6270ab02dfc7fd8718b3781666373ea6784ed2c06cec0b40315486a6a138185ca1548c04b60 WHIRLPOOL a782063d15c92190637385b44368ca75ec259293b5f9f12dcba8935da9aca3f5d824a96c389766bb766a28602af3a8c5115febaeaf140ae0280f610b3b93fe3f
AUX http_echo-nginx-1.11.11+.patch 1920 SHA256 96b83fa02d977f3eeb8af73f065a4ba359515f098722988693ac824384a09f12 SHA512 fb86dd9a17a1ed6d99609a9e024971749569bfa108e1bae86e9e9f72792e2e6767ad710330bcc81cc67deca7fdaabe8dbb63a5ae3a519481c8ffab1e8c446f34 WHIRLPOOL 1a04d6b967fb3b35db1ebfc6a145966607830132eaa1cdc1f7a9f9a0bcd2651492b26504f4c444519bf0ffdd376ce88c228813ad767de4e48e5cb11d801bb1ca
AUX http_lua_nginx-1.11.11+-r1.patch 6790 SHA256 57867eda9eeee7fe5b55d8916047c8e5ffd156cfed4ca2d64470ae4132784261 SHA512 bbd9f97d598482212887ebfa62b6037e2c5d89087ff761925399ef3ff6a35970a88b42e4d59f54ee59fd5402b37a40640599257e61bcb9ac49ec7fa857a674f2 WHIRLPOOL 01be216559482007c1fc1095b59e290a4ccd96271786e639de9c0a99741f5d7a2ba70869878a4c673a07662d2f82bd37604506f5b429edb57bc16a3a27e82c89
......@@ -14,6 +15,7 @@ AUX nginx.confd 1131 SHA256 29677faab40d1fff740d743614788fd73c8c2d4167c3bd64d3e8
AUX nginx.initd-r4 2192 SHA256 a28354a71c1d9d9f681835a1afe73ca538aca81c4a28d0166b66344854cca235 SHA512 e641829466e54093ad01e9f6c57acd2f0505e489a32e67dfee9279d5da57b216052a92eb05eb0c9c122c12f8b7bf8274b520b6e02fda161cc03187ce7c0660f1 WHIRLPOOL 63481cc8f980ace439cc0cbc030b816f02c90bd24828b5571bffb7ba8d327f1fbbcd4d427ed668f4ecd294c5631f5c86adb66f4da7fc6fd1a02a85d922b2fa59
AUX nginx.logrotate-r1 257 SHA256 83d7a38bcefe2530b327f8ec6d75f69885032d92314a5bf5e314c6da0505704a SHA512 4892fc1700817c9a459a531df0320fe606a51be7f8b4e3ddf5852fe33def70dbff36fcefd2fce247c6846d6315ea92f3421eb21299a162d082b85fa27572cd95 WHIRLPOOL af813247e3a69b25f7ae9f24466eff70fc30d883c719d003d0f5286092f0a64a91c48e73624212c37c0489fd5f737c2bb2b947e8d2bd649ad64b81bc90fa6f20
AUX nginx.service-r1 327 SHA256 17c404c5130115e3ebadb09e25cff0103b48ae7dbff2284fa690161fda7888ae SHA512 9b6bcf74df2f74ae6a2c255ebf2d826ea92ed9921b9995da6c9a0c5656e2863a2fe5293ef8a656fbd36298602cc88ffc5d7acfbbf143c23a78c9689d61b05df9 WHIRLPOOL 126c56732b8bd9948595727aa8c056c44df05f4c8e708b00c9de715a7260e4e120fd9e076672312b55c889ff4a3ca100ce696165a4eaf93d89e808e1e28653fa
AUX njs-0.1.15-fix-o3-building.patch 536 SHA256 416306885ab9b6da29bc59d5c6adf286e2b4b37373ab38391df07cd558a58c6a SHA512 1c9a5aae8c4e124f6d620592047d7768762a32041b8d0094dcc37fffcf5c85ee3b31d3cc8d968d437f0cc5a258148ad38398a3fc2ca23917296bc57a230fa004 WHIRLPOOL a8a714dd3f6ead36ee39f76f1cce073385c82cc51c118bff0310aa76d0c7b80b4bfd4b0f6b08fcf50fb7e702768818238b1fdc8c752026b306fe35c8140c219c
AUX spnego-http-auth-ld.patch 627 SHA256 7c7abdeef4367a36b4e5fd9976f2a9db7d40fbfbfddd6443c268e8c645d246e2 SHA512 ee4a30f9e840e6b8651abf5e10490bd1fde9cf7f2ce2b09b81a4c70b240279be03e56d96911520450a5ddc91ee1d7da56b0a59f9676122b42a486dddf68b4145 WHIRLPOOL d7f60e3464430abe44b4bff478bb7a24d63cccf35e13fd6cbb3660e9351eac0959176c645339f29d1156315d2e89d87cc6e320513892889270381073e94d91dd
DIST modsecurity-2.9.2.tar.gz 4298993 SHA256 41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5 SHA512 69c87ef6f7b6411f4803eb25af32969a1da59722121257c2edf345a3f5a4ab9ae8a49c886cbbfc722c5bda91c6d6ea55232f968c0a0407d7d7b3af53dc862c21 WHIRLPOOL cbdc090f5fefeb6b6b71362e03dc12c4c574b7726005e8b552f4db7b765fc77f4609af5f216fad6c336d886e112aa392e3f885a140a72d731eed78a1ed51cd88
DIST nginx-1.13.9.tar.gz 994802 SHA256 5faea18857516fe68d30be39c3032bd22ed9cf85e1a6fdf32e3721d96ff7fa42 SHA512 92c34c182b59e0597a6b0af996770673b08b075f47285e2fbb9d8df59bb9c38fcca8e77bc6e3ca8e019500d041f96437b6b4f80d5dfd914a6f843ca919dac07b WHIRLPOOL 8d7fdf53c2644d54e22ae2c5166d73f77ba87276a1e07816fa8d1198871fff5bd16d8f5f581f29f8d77c6087e52787b98598a49b5f49b42dc86a7adca80cc3fe
......
We aren't interested in bundled Brotli.
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
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/dictionary.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/context.h \
- $brotli/enc/dictionary_hash.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/port.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/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/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 \
@@ -153,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 \
Origin: https://hg.nginx.org/njs/rev/22cc52416e84
Bug: https://bugs.gentoo.org/647958
--- a/njs/njs_fs.c
+++ b/njs/njs_fs.c
@@ -566,6 +566,8 @@
}
mode = NULL;
+ /* GCC complains about uninitialized flag.length. */
+ flag.length = 0;
flag.start = NULL;
encoding.length = 0;
encoding.start = NULL;
@@ -753,6 +755,8 @@
}
mode = NULL;
+ /* GCC complains about uninitialized flag.length. */
+ flag.length = 0;
flag.start = NULL;
encoding.length = 0;
encoding.start = NULL;
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