commit: 8fc4f23831d061058c6e3ba2190272340ac5f871 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Apr 21 14:33:28 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Apr 22 00:10:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc4f238
www-servers/nginx: remove unused patch/files Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/30682 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/http_javascript_cve_2022-38890.patch | 49 --------------- www-servers/nginx/files/nginx.conf-r2 | 69 ---------------------- 2 files changed, 118 deletions(-) diff --git a/www-servers/nginx/files/http_javascript_cve_2022-38890.patch b/www-servers/nginx/files/http_javascript_cve_2022-38890.patch deleted file mode 100644 index 43469b552968..000000000000 --- a/www-servers/nginx/files/http_javascript_cve_2022-38890.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b9aea5854bcf6f2de8f7a7f1550874e392b94be2 Mon Sep 17 00:00:00 2001 -From: Dmitry Volyntsev <[email protected]> -Date: Wed, 31 Aug 2022 18:35:58 -0700 -Subject: [PATCH] Fixed String.prototype.trimEnd() with unicode string. - -Previously, when the method was invoked with a string consisting of space -characters and at least one of them was a Unicode space separator (code -point above 127) it returned invalid string value with non-zero size -but zero length. - -The fix is to update the size of the resulting string appropriately. - -This closes #569 issue on Github. ---- - src/njs_string.c | 1 + - src/test/njs_unit_test.c | 8 ++++++++ - 2 files changed, 9 insertions(+) - -diff --git a/src/njs_string.c b/src/njs_string.c -index 83cede548..62bece0de 100644 ---- a/src/njs_string.c -+++ b/src/njs_string.c -@@ -2849,6 +2849,7 @@ njs_string_trim(const njs_value_t *value, njs_string_prop_t *string, - - for ( ;; ) { - if (start == prev) { -+ end = prev; - break; - } - -diff --git a/src/test/njs_unit_test.c b/src/test/njs_unit_test.c -index 287ddda2d..a717f02a8 100644 ---- a/src/test/njs_unit_test.c -+++ b/src/test/njs_unit_test.c -@@ -8450,6 +8450,14 @@ static njs_unit_test_t njs_test[] = - { njs_str("' абв '.trimStart().trimEnd()"), - njs_str("абв") }, - -+ { njs_str("[" -+ " String.fromCodePoint(0x2028)," -+ " String.fromCodePoint(0x20, 0x2028)," -+ " String.fromCodePoint(0x0009, 0x20, 0x2028)," -+ " String.fromCodePoint(0xFEFF)," -+ "].every(v => v.trimEnd() == '')"), -+ njs_str("true") }, -+ - { njs_str("'\\u2029abc\\uFEFF\\u2028'.trim()"), - njs_str("abc") }, - diff --git a/www-servers/nginx/files/nginx.conf-r2 b/www-servers/nginx/files/nginx.conf-r2 deleted file mode 100644 index 917c6c1700fb..000000000000 --- a/www-servers/nginx/files/nginx.conf-r2 +++ /dev/null @@ -1,69 +0,0 @@ -user nginx nginx; -worker_processes 1; - -error_log /var/log/nginx/error_log info; - -events { - worker_connections 1024; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main - '$remote_addr - $remote_user [$time_local] ' - '"$request" $status $bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '"$gzip_ratio"'; - - client_header_timeout 10m; - client_body_timeout 10m; - send_timeout 10m; - - connection_pool_size 256; - client_header_buffer_size 1k; - large_client_header_buffers 4 2k; - request_pool_size 4k; - - gzip off; - - output_buffers 1 32k; - postpone_output 1460; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.html; - - server { - listen 127.0.0.1; - server_name localhost; - - access_log /var/log/nginx/localhost.access_log main; - error_log /var/log/nginx/localhost.error_log info; - - root /var/www/localhost/htdocs; - } - - # SSL example - #server { - # listen 127.0.0.1:443; - # server_name localhost; - - # ssl on; - # ssl_certificate /etc/ssl/nginx/nginx.pem; - # ssl_certificate_key /etc/ssl/nginx/nginx.key; - - # access_log /var/log/nginx/localhost.ssl_access_log main; - # error_log /var/log/nginx/localhost.ssl_error_log info; - - # root /var/www/localhost/htdocs; - #} -}
