diff options
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/Manifest.gz | bin | 4690 -> 4690 bytes | |||
| -rw-r--r-- | www-servers/nginx/Manifest | 5 | ||||
| -rw-r--r-- | www-servers/nginx/files/http_security-nginx-1.26.2.patch | 26 | ||||
| -rw-r--r-- | www-servers/nginx/nginx-1.26.2-r2.ebuild (renamed from www-servers/nginx/nginx-1.26.2-r1.ebuild) | 6 | ||||
| -rw-r--r-- | www-servers/nginx/nginx-1.27.1-r2.ebuild (renamed from www-servers/nginx/nginx-1.27.1-r1.ebuild) | 6 |
5 files changed, 41 insertions, 2 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz Binary files differindex 2f03ed1f6016..19a5752a6ad5 100644 --- a/www-servers/Manifest.gz +++ b/www-servers/Manifest.gz diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index d684984bb4fd..e24739bdbb0e 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -1,5 +1,6 @@ AUX http_brotli-detect-brotli-r3.patch 745 BLAKE2B 1442822f9b16362c04354f29f45ee4e7605e0f74ac09092161b9e69a1c3b42f024d12cb64cc5bb0e417200dc963a531110f82b003d54690138b7df35e019e9e3 SHA512 a287636c07335b48303585d906adb87cf9094133c16c238074826aebb19347428bb15ac4ebc77040142c509f8a87c9fbca9783e2f5c10399ef63341fbc22e881 AUX http_cache_purge-1.11.6+.patch 615 BLAKE2B 520a437290dbed718f392bedecdb66c9eae3440c2e5977bede5829f8420905e60c74fac3dad7b22c12d2070ce47430795482d270222ba8d4640af415e4974210 SHA512 a3f45d8121d89a5c41783306577e146990404ff0e3691454e99cd6270ab02dfc7fd8718b3781666373ea6784ed2c06cec0b40315486a6a138185ca1548c04b60 +AUX http_security-nginx-1.26.2.patch 660 BLAKE2B 9982cea97e9e8f387fe3336bdf115a4ffddd94a56ec0687bc5dff07dbccdbed8e1fb5846976b17258a62d03c6c211647c99f20fa7c0920f4d9573e07bc3c21db SHA512 3fe0e84182709adf458e556a2b063c147e2f9722e8b0795dd680693bcb3e393ca4e23eb306517e152b4cd48473d01254fff3b2bb86061c96fdd4526643c29da7 AUX http_sticky-nginx-1.23.0.patch 1101 BLAKE2B 0a5f0bc5fb7987e1da13f39b6c2c7fcbc21452ddea510fb7aeb4933bfe7c94cc10c8b714c8de135b14d212a0532e39beebbad0105e2d140e12ecc608b1996156 SHA512 3066e9aec3a3073acd8ef8e1d3bf9abc33b4f0d9232573bb83417b838a42f04195b82337b569f7f808c7c0b94a6fd53371882aa805576de5989d359b21872396 AUX http_uploadprogress-nginx-1.23.0.patch 2680 BLAKE2B 872a386964dd1fa3a8c09d69231b546ba497d85f1b270fbb015ec4835c0c7ca9e7b3018d0a7674b4bd8aa76b558327439cdffc1912c74a8c3d91b2334bb0a61d SHA512 2899636d730583c0eaa21e89d50ccb7a888e7f27fa194102909e42fb28cb8e239416978f55bed0a9115b65d0ac718cb7da8c1fa589eb79e9f66eea41dfc3458b AUX http_upstream_check-nginx-1.11.5+.patch 8557 BLAKE2B b1f21fa56e94d92b30d4b84353066039728b0935e2a243367e4e883afead2d4c728c9b7e7b5b5e8714b80a3af72059a36f8207af3641c22a43324c0e7f2b2f9b SHA512 9b377defaa9ddb78fee3f37e054c7b16258fd380b4093d6d61bc45fdc42cb45ee5246901cddd230dc1765838fabbd71d558b5b1d12d9829615b3501da4f3824a @@ -40,6 +41,6 @@ DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1 DIST ngx_rtmp-1.2.2.tar.gz 519934 BLAKE2B 8745816b879f506720955d6c7e5e8af036e88b3601a680071ffb255a3ec31d69e132b5cc8b493202fa985eb30b8529428f683b5154a0054c0ee990d3185c7abf SHA512 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81 DIST njs-0.8.5.tar.gz 844437 BLAKE2B 3f8a601370fbe2bfbe0e1748f71b1793985fd2736f4b94a65ec564d5ac4a653faf28a86469cef36bc312ff53287ea4afd43edda503e36c8797947827a902a10d SHA512 09fb37d609f5cb97b0af5eb097a017233af2eacb2d38071346b49f5e03b5e37280eebb360fc824acba0c600c44d234e2d11fa55f4bc913319491d7789a94171c -EBUILD nginx-1.26.2-r1.ebuild 42380 BLAKE2B 20552f29fb2ca65acecf1ed960f6e92a444caa199a9da2e56bd617b079e16379f0974f714d1a56732e7b8a00072c26ef25d9ffa4b3dbfb47ba8a816d25696ca7 SHA512 878c0421b891ad91c89a052e51937c16b96cad53860ab35de5dd644f830082a2aae999ee95e8c22faf5bc79376f5a635fc6e9945d6477dea588f0cb475060a5a -EBUILD nginx-1.27.1-r1.ebuild 42384 BLAKE2B 342c78ebc08906d01dfa3056d8f7f5a83cdcc2f085bfbff564dcb6217a738e16184eeb1b02530a4cb96e38b403fabf5aa2abd24e6a81b5ab62e5236282b9afba SHA512 b3a453681e7514cac5382af16bf8b92499b32d14824700a48bec16aa9f2955683d2bfad0e4a0992fb02f02af03648dbd687c38878b240400e5cb707d684fc036 +EBUILD nginx-1.26.2-r2.ebuild 42544 BLAKE2B d6a7d6b9c6a00e57a18d62fcad5d21887a4a1c6fe56d845810d7b70e0b8ff9d9a3dd6347fd6d8d28c11dde9a70c90e0c9cde8704ce1f0cdfbaddf7599abf0438 SHA512 adbf1dc5d6692b4209e3f93bcc35e359e0dae177e2070d132c999861420b1fd311ed49d4476ba0afb9c44e6f2d07bb1810ad8555e8b7a6ead4d13acb26f88e16 +EBUILD nginx-1.27.1-r2.ebuild 42548 BLAKE2B 4ddd13f53de8331ca6da4ade4f135401db96a958b586d652d3b2a5d62a7748e0ba50347f77fab1b6480f6bc536337edb5ec687a7ca1cace1697e5d48fee0cf4d SHA512 c6a8553605b2de08c45bde8b2096fcf43786f1312d42fff6159d9eb2c184ed2ddc1a89b7da060d4b853d69aac041d71f4838c5db62a2b5649b7499e686109c06 MISC metadata.xml 1189 BLAKE2B 9e65f404d2be335d14ffb087be60847a2508de79baae7ee0e3bd7021dbfbbc1f18b93ed758d107ef3a9738ab32889f106a5eb8232f8f4190d57c175eed60ddd5 SHA512 8077d4da43250c5cc783451682047460b093cf1e751e0b0d75a21bb42baf83fd31b1bb3a574ed6e7ab89286afb331c23915c676ed80c7b4cc5fd9f84a40da893 diff --git a/www-servers/nginx/files/http_security-nginx-1.26.2.patch b/www-servers/nginx/files/http_security-nginx-1.26.2.patch new file mode 100644 index 000000000000..26e3ea6046f0 --- /dev/null +++ b/www-servers/nginx/files/http_security-nginx-1.26.2.patch @@ -0,0 +1,26 @@ +From 7d37ace7431ea9704faa98f29876bcd72ef4b1ff Mon Sep 17 00:00:00 2001 +From: Ervin Hegedus <airween@gmail.com> +Date: Tue, 23 Apr 2024 21:42:02 +0200 +Subject: [PATCH] fix: Added missing header for conftest + +--- + config | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/config b/config +index c6e7467..3bf06a8 100644 +--- a/config ++++ b/config +@@ -10,7 +10,8 @@ + + ngx_feature_name= + ngx_feature_run=no +-ngx_feature_incs="#include <modsecurity/modsecurity.h>" ++ngx_feature_incs="#include <modsecurity/modsecurity.h> ++#include <stdio.h>" + ngx_feature_libs="-lmodsecurity" + ngx_feature_test='printf("hello");' + ngx_modsecurity_opt_I= +-- +2.26.2 + diff --git a/www-servers/nginx/nginx-1.26.2-r1.ebuild b/www-servers/nginx/nginx-1.26.2-r2.ebuild index 1971e684ca8a..fe6db3b44206 100644 --- a/www-servers/nginx/nginx-1.26.2-r1.ebuild +++ b/www-servers/nginx/nginx-1.26.2-r2.ebuild @@ -459,6 +459,12 @@ src_prepare() { cd "${S}" || die fi + if use nginx_modules_http_security ; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + eapply "${FILESDIR}/http_security-nginx-1.26.2.patch" + cd "${S}" || 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 diff --git a/www-servers/nginx/nginx-1.27.1-r1.ebuild b/www-servers/nginx/nginx-1.27.1-r2.ebuild index 34de22d938e8..bfc1a4a791b6 100644 --- a/www-servers/nginx/nginx-1.27.1-r1.ebuild +++ b/www-servers/nginx/nginx-1.27.1-r2.ebuild @@ -459,6 +459,12 @@ src_prepare() { cd "${S}" || die fi + if use nginx_modules_http_security ; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + eapply "${FILESDIR}/http_security-nginx-1.26.2.patch" + cd "${S}" || 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 |