4 files changed, 0 insertions, 120 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 0cc801c90c19..bbb8e760280f 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 84c11c60907a..27708cdf8ddf 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,13 +1,11 @@
 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_javascript_cve_2022-38890.patch 1734 BLAKE2B ecc4cda7537f8d769389381bd13ce6d577469829f856b823f274e9d1c9c7086ae208fcdfa185208bd810066ed18563391503d0c2888e6fb0fd240f024e7177db SHA512 2b886272ef635666bc6fce15661cb695d69249ff9a2d5bd882a2b5a9b1c124e695b13dc1bf89e9ef04eb1850a36a2ec2c9b57b7b1942fb8599477488d6b13ded
 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
 AUX nginx-1.23.2-mod_auth_ldap-fix.patch 887 BLAKE2B 3834c6af746b5218589b97e040c0a087f535558412316fda5e84a90055d4baa9d9797274297c20ace2807531171ca39721392bb0b27a35c35832bc5bb2ec5cc7 SHA512 b6e5d47ee33ebac4828b2dbcd914e860994d3cff98c4612b37b52f4ca2f83a2040a9e1b66849a5ecb38e0392ed8f0ce77081050d8be946de0c5f0af5d4861c93
 AUX nginx-1.4.1-fix-perl-install-path.patch 403 BLAKE2B af7c0d3845f4e971ff6470cac11722a54339832518a1f48eef6343908676e352d869df7e65e1072e41dc67dbac4e0f006694bba2ba66ab06ae500c7e00664023 SHA512 b8f6876831e1149b1421fff4919f8d4893e5fc46aad8a91d4cf2e0b21767b59820b8e227e3b722b80060832844ef191f30aa5dc056daeb49e55a05702d72858f
 AUX nginx-httpoxy-mitigation-r1.patch 2023 BLAKE2B 82e6cb6c1d38b9e4cd619abfe60eeaa968ded8975277e60afb94456b59e311817eef04db2b207e85308ef480c442e8acd68cba8f455b4cfc872829e522cb1ea4 SHA512 bfc480c34cea525b0eb3753622eb371198e2252aba3299fca4f1c7b29848da162b93757b05eb11a3839618ed895f7b73534dcd7861f4b924997ec422939222a3
-AUX nginx.conf-r2 1292 BLAKE2B ad941577401ee99e7904871a20cdf94e946f608747c14e7ceb589ea0a6254cf16fe27f712d2db252db027bc72742d1818c3874b762fcc38054a69e4363cd5e39 SHA512 de9ffb84d7de468fa7aebfb205529edb1c372f3ff6990b0cac9d1f3012be9ced65db4d260fd852c91cc033805c023a02790770cca43c6ad6335fb58a9c694c95
 AUX nginx.conf-r3 1325 BLAKE2B 3aef6116b366ef325fea9c99e6c1f5a8ea4b6d12aced541e3ad89e20bff76f58f146b7cb6339b4ad99789ea64157864552ed099d47f9e534c893265f998c2db3 SHA512 4a185f6bb09576667e98afdd88a6bbf4909e0db251b04e7889c6e17baacb950986c8ac7a79ac4031746f848433c5d3653a73134690cf68f6c37844ad11fe0077
 AUX nginx.confd 1131 BLAKE2B fd9c9e620a0b8c630a609c3f38f91f62babfed12d4d8035f8c54609a9360b28a919cf2020c577575bdab70cdd9c34e5996852d6d35dc9f2f52a2096c9facccfd SHA512 9023b33b6e03de4fa4df8459118a34a24a52ec167eb0aa1d220fd5ba8555aa454ca3451cad4eecc87a445b74cae5132fd717286aec3f1fea390eb96547e4ae85
 AUX nginx.initd-r4 2192 BLAKE2B b482b9cc473a1df06764d60c7ce5c99a3f680778028bf440a2612b86273936ac4dbb350b81ecbe646dfa67d375492259b1609f3953f1b456c7427a02dd282d37 SHA512 e641829466e54093ad01e9f6c57acd2f0505e489a32e67dfee9279d5da57b216052a92eb05eb0c9c122c12f8b7bf8274b520b6e02fda161cc03187ce7c0660f1
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 <xeioex@nginx.com>
-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;
-	#}
-}