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

nginx update

parent f9f5e43b
......@@ -13,7 +13,7 @@ AUX nginx.service-r1 327 SHA256 17c404c5130115e3ebadb09e25cff0103b48ae7dbff2284f
AUX spnego-http-auth-ld.patch 627 SHA256 7c7abdeef4367a36b4e5fd9976f2a9db7d40fbfbfddd6443c268e8c645d246e2 SHA512 ee4a30f9e840e6b8651abf5e10490bd1fde9cf7f2ce2b09b81a4c70b240279be03e56d96911520450a5ddc91ee1d7da56b0a59f9676122b42a486dddf68b4145 WHIRLPOOL d7f60e3464430abe44b4bff478bb7a24d63cccf35e13fd6cbb3660e9351eac0959176c645339f29d1156315d2e89d87cc6e320513892889270381073e94d91dd
DIST modsecurity-2.9.3.tar.gz 4307670 SHA256 4192019d169d3f1dd82cc4714db6986df54c6ceb4ee1c8f253de78d1a6b62118 SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd WHIRLPOOL f2529205943460395cd64a3bbcaed769cdf34f5ddeb511c1b6d3232cff53a74d0d16ffc74f9ef66c54d14e9f87782d3f032f3c1c046f2a9a2ae6f3039ec62217
DIST nginx-1.16.1.tar.gz 1032630 SHA256 f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b SHA512 17e95b43fa47d4fef5e652dea587518e16ab5ec562c9c94355c356440166d4b6a6a41ee520d406e5a34791a327d2e3c46b3f9b105ac9ce07afdd495c49eca437 WHIRLPOOL 57dd71637102bcfc10da2f685788c6fcb553650b6096400da1c5063a0808b9a376481bcae3e29735044f96f7ff6812c582a8d064079a5372ac3215da9b7c4d65
DIST nginx-1.17.6.tar.gz 1037527 SHA256 3cb4a5314dc0ab0a4e8a7b51ae17c027133417a45cc6c5a96e3dd80141c237b6 SHA512 8ad6c3d066bf51f3fde3454bb93f2eeab0412d1c10eac0841fd50ec25b0f1204c85f15cb950c6bbe128c0ff72efe5b0bb804b5d66a8bf6234e0e4776aa67b9eb WHIRLPOOL 71baacb28814d89e1ce777960e5645663b2aa79cf65e0eb16a4e6ffa9280d97ac72b7b3f356d21b6a17b9097412e35d6bb11667c0f4f1b63bd10e5e48b94791a
DIST nginx-1.17.7.tar.gz 1037747 SHA256 b62756842807e5693b794e5d0ae289bd8ae5b098e66538b2a91eb80f25c591ff SHA512 e7132b90ac92e91def9b927c3b8c3a603d1bcb4a89ff422b284fb6e6cac52a74b33d9c7bbfc2f78467914d8ccd1cf2db9c486559abb739600605439521ff4f6b WHIRLPOOL 9922ce8b114cb617bab22367acdeb390a3e72d33848a5a113e5b2de96d345f3e5bdcd795e86fbcee643c07528ccb0efbff78688d435177699f421aa27c802089
DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 SHA256 80d6cce9a9877d51dec2f85a11ce7cd25edbd2d605c28bc28687ecc5695229ee SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269 WHIRLPOOL efb92015018c0ee9c0d2ed465745486710e071f306ba3afd24200996f746715a9a6ef6dc1bef4057af9c757260fadbecb74b5ee20dd554f9cc90b5de2eac1549
DIST nginx-ct-1.3.2.tar.gz 6844 SHA256 b4ceae549b9dbf84b2e511633982e4efeee0388e3b7a038a8bac555008a77b88 SHA512 543a705e41cc7b6c2147bcf84cea71448ad16fa84b297f259911c223d29a09c9b7eb71550a555d74a7feff7023d4ac3f4979b6b51d3131cf431e947fee6e76e4 WHIRLPOOL 6d508707c01fcb1eae460bfcad0b4e02785254a5eacc3fca9ceb7405e00c38233a145cdff1a3511a49d4105d045263455783ccf4b909eb1ae155ed77bb34dfee
DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 SHA256 6f9102321d8c68df6d67e9bde145a8de3f45f99f6cb47c08735a86f003234d31 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529 WHIRLPOOL 38abe56e177e22dad68ac7d6570425ecd763d2e891627a75156a6f39bd7edc54f664c3d2f638e1ea57c743dadc6a8c9889be087abbdb4c98b5641c299f7fbc07
......@@ -41,8 +41,9 @@ DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 SHA256 7ac230d30907f013dff8d435a1186
DIST ngx_rtmp-1.2.1.tar.gz 519919 SHA256 87aa597400b0b5a05274ee2d23d8cb8224e12686227a0abe31d783b3a645ea37 SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922 WHIRLPOOL 18986afefbd28cb8973d683974cf08474b7838a2163fe358fab6717e2028130fc8b4ef0ffb76927f0932937f15f76bc0365283823a0cb1147b3a9b369b7de597
DIST njs-0.3.5.tar.gz 339177 SHA256 75e6035eb23ec908061e67d71091a77dcc8e45d29cc4ac659b70989daac3d0af SHA512 236e0284f251856f74eb51d8251bb5be725d2ca90056f2feef7677eb636a4e97e203f3bba81fb6b677158d615dc2d6ffcb0dc1059fb678ab12b7d14cc4ea7241 WHIRLPOOL d49de88ca289c7285f316ca03c933f6f496652c747dc13f8797051ed37886a68e13cc96872680226be4a0ba4c5a946c03abda170e7fc074cd57bac7082c1f269
DIST njs-0.3.7.tar.gz 360227 SHA256 4e1218ba3f3e9d15a700a12f202f8a8e812c8db588138c702bf03f967ca817fe SHA512 1975c38fab59a587045e1c6bebd527a4432c4e6bec5a62cb2e1bc5fef19275deffdb6c6558caa3f0dcc58716b702adc0eb89b0171acf5f70f275c593b16f4bfb WHIRLPOOL 77afc86360352053f84d4ef535e277615753b9de322dff0b32744da7a3b8fde5d41ea31e46324201c3601787c0b9feb8c12e12f5e0a71cb3d6d9d6013455dcd1
DIST quiche.tar.gz 233961 SHA256 6a369615005b8f1e361bfaca5ec07989443ab1b62af60a07ac41f63ff4b7d1af SHA512 f31a82371c68ceaaa4ab82c9b10eb758da4d756edf14ed2588d087455b3cfefa35ab27652961f28a24c411bba9af4148a09b64fbcb7ecf73b9a18d398c6e26aa WHIRLPOOL e6a934d222950bcfe54155c1b27b285097cd1150268ee55024411e03c6911c8c5b2e256d6f290b4a257f8ce4ced7a861a299e030e1377d687a64f92deac5443c
EBUILD nginx-1.16.1-r1.ebuild 42879 SHA256 a40f3c60dea6e21fc94c1a5a58444c021d8b4d48c075edbc5e595f8a60a98b4d SHA512 0aeb3fc3ff351a728ef0f34a7b78bb2efcc5a3b8d3e808578c5e66ac7d6ff8efb0f848e44b4d662f2853ce95da7a72359753e9871829c5f517d3840ea943d3e7 WHIRLPOOL 3b87e7ebb2918bf844ba0ba1d51f771027629a55653a5289819bbefda4abf2b7347fb7cd23b2a8d888d422bef3a9cdfee3f82871f1ec5da8354f5ef9509d9aee
EBUILD nginx-1.17.6.ebuild 42872 SHA256 0f6795c67643f78d2ec898964e478ab91564ba33cd763796cfd8dff0c7ddbacd SHA512 7535f4ded0c6f7baf6492d729500fec3a941d306290724fc3bfde417975a6721afb4bf32214817f47ef89a810a2c3d43c2f583e7229f41d07b961098ca26a525 WHIRLPOOL d2418b3534c15116152448f46a9c2607b6250fb9dd4b5368ba93e2bdbb95d0c7daa01bf82ebcec7dc7f0bc99c4f7a8edb7374501f077f6bfaad9de442177e580
EBUILD nginx-1.17.7.ebuild 43413 SHA256 704f29d12788aa2e0bb06a3dd414ac4155fc3d361bb92ea0dd941bfe056b10b1 SHA512 408e6ead69b6e930fe0f661250b9c45c2c693eb26a86bc3ae242051f79b4ddacd0b0137f9df7075b6b3395f28b4f857df618279afa3d45d8b397111a301247aa WHIRLPOOL 11f9ab7dc3788acf2d5f0bfd93d730244889ee3d30c2265b81ab1558207c156cd410e2e230d2e84e0ad30462d97a7aa654cc0aa794e50a578926d08c69b0b527
MISC metadata.xml 1231 SHA256 569ccd1ce92bfbee51c4d16f8ef2fbfd47e60d341bf1e3e5d82a291dc18decd4 SHA512 5ba8ec759168ac547cd14e25d57d9325c635eac1f6e1ac3532642052a05f209c3da5f84c634f87443430f3d833ee076d476b5136f3f98553792e2c6470742693 WHIRLPOOL aede6b4ccd7b9a4450af43671f1bbb9e71c3d19c8b57c556fe272c4d60d6987e4dd9b5d6ba1acb3e59df4e945ca3e48aa4c5e31c33cde1d2400ebc3d50dda325
MISC nginx-1.16.1-r1.ebuild.based 40541 SHA256 718330a319aadb3f55454e9964b29015b8e82168bb26cb4f27d3305b1afa17fb SHA512 9cc3c04aa21f0176e4edd9649fb1947dfb67464183db94cf9a28257a564f2882ffc9d01babf96ec6ac59463a9798d3c2ae50cba30eac24a9d4410a4106ab6c87 WHIRLPOOL b70a670029d6ca993b024557aaeb66752c0c9b7ca2bef83303efc743cd7c6b6ac12e360f04042500effe3ce791df302334a9934a451397f3ca88133e64d7c783
MISC nginx-1.17.6.ebuild.based 40534 SHA256 b31e12b585967aeeaf58c26415f04f269434829c10e68556f7a7b4ceab4d5677 SHA512 abbb97e46654615ce5e48c256262dbc6e4600a77684bacc5ffe98efe9db18de96c0c2d6215522b36b92c092873b2fc929c8f6c72f337c5dd0b2c890184932d95 WHIRLPOOL c46743722f298d86b0d09b84266f0bbeefb0b330601739c7c3e3d2d375f45842fa5e922d4c430a13b148fd244e30cdca53664698f581d255b0dd1380fbcf1eeb
MISC nginx-1.17.7.ebuild.based 40534 SHA256 b31e12b585967aeeaf58c26415f04f269434829c10e68556f7a7b4ceab4d5677 SHA512 abbb97e46654615ce5e48c256262dbc6e4600a77684bacc5ffe98efe9db18de96c0c2d6215522b36b92c092873b2fc929c8f6c72f337c5dd0b2c890184932d95 WHIRLPOOL c46743722f298d86b0d09b84266f0bbeefb0b330601739c7c3e3d2d375f45842fa5e922d4c430a13b148fd244e30cdca53664698f581d255b0dd1380fbcf1eeb
......@@ -155,6 +155,12 @@ HTTP_AUTH_SPNEGO_MODULE_P="ngx_auth_spnego_module-${HTTP_AUTH_SPNEGO_MODULE_PV}"
HTTP_AUTH_SPNEGO_MODULE_URI="https://github.com/jkolo/spnego-http-auth-nginx-module/archive/${HTTP_AUTH_SPNEGO_MODULE_PV}.tar.gz"
HTTP_AUTH_SPNEGO_MODULE_WD="${WORKDIR}/spnego-http-auth-nginx-module-${HTTP_AUTH_SPNEGO_MODULE_PV}"
# quiche
HTTP_QUICHE_MODULE_PV="0.1.0"
HTTP_QUICHE_MODULE_P="quiche"
HTTP_QUICHE_MODULE_URI="https://github.com/cloudflare/quiche/archive/${HTTP_QUICHE_MODULE_PV}.tar.gz"
HTTP_QUICHE_MODULE_WD="${WORKDIR}/quiche-${HTTP_QUICHE_MODULE_PV}"
# ajp-module
HTTP_AJP_MODULE_PV="b6993cc5befd6b9d4d6aefc91c689c20aabacbd2"
HTTP_AJP_MODULE_P="ngx_ajp_module-${HTTP_AJP_MODULE_PV}"
......@@ -208,7 +214,7 @@ SRC_URI="https://nginx.org/download/${P}.tar.gz
nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
......@@ -216,6 +222,7 @@ SRC_URI="https://nginx.org/download/${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 )
http3? ( ${HTTP_QUICHE_MODULE_URI} -> ${HTTP_QUICHE_MODULE_P}.tar.gz )
rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
......@@ -270,7 +277,7 @@ NGINX_MODULES_3RD="
stream_javascript
"
IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
IUSE="aio debug +http +http2 http3 +http-cache +ipv6 libatomic libressl luajit +pcre
pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
for mod in $NGINX_MODULES_STD; do
......@@ -408,6 +415,10 @@ pkg_setup() {
src_prepare() {
eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
if use http3; then
epatch "${HTTP_QUICHE_MODULE_WD}/extras/nginx/nginx-1.16.patch"
fi
if use nginx_modules_http_auth_pam; then
cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
......@@ -494,6 +505,7 @@ src_configure() {
use aio && myconf+=( --with-file-aio )
use debug && myconf+=( --with-debug )
use http2 && myconf+=( --with-http_v2_module )
use http3 && myconf+=( --with-http_v3_module --with-quiche=${HTTP_QUICHE_MODULE_WD} )
use libatomic && myconf+=( --with-libatomic )
use pcre && myconf+=( --with-pcre )
use pcre-jit && myconf+=( --with-pcre-jit )
......
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