feature: merge master

2 months ago · b6efbec3d2
parent 2abcaedab8
commit b6efbec3d2
44 changed files with 13 additions and 4 deletions
--- a/patches/nginx/1.25.3/nginx-1.25.3-CVE-2024-24989.patch
+++ b/patches/nginx/1.25.3/nginx-1.25.3-CVE-2024-24989.patch
--- a/patches/nginx/1.25.3/nginx-1.25.3-CVE-2024-24990.patch
+++ b/patches/nginx/1.25.3/nginx-1.25.3-CVE-2024-24990.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-always_enable_cc_feature_tests.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-always_enable_cc_feature_tests.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-balancer_pool_max_retry.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-balancer_pool_max_retry.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-balancer_status_code.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-balancer_status_code.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-builtin_error_page_footer.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-builtin_error_page_footer.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-cache_manager_exit.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-cache_manager_exit.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-daemon_destroy_pool.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-daemon_destroy_pool.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-delayed_posted_events.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-delayed_posted_events.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-hash_overflow.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-hash_overflow.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-init_cycle_pool_release.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-init_cycle_pool_release.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-initialize_quic_transport_id_variable.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-initialize_quic_transport_id_variable.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-intercept_error_log.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-intercept_error_log.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-larger_max_error_str.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-larger_max_error_str.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-log_escape_non_ascii.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-log_escape_non_ascii.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-no_Werror.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-no_Werror.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-no_error_pages.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-no_error_pages.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-no_pool.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-no_pool.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-pcre_conf_opt.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-pcre_conf_opt.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-privileged_agent_process.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-privileged_agent_process.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-privileged_agent_process_connections.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-privileged_agent_process_connections.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-privileged_agent_process_thread_pool.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-privileged_agent_process_thread_pool.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-proc_exit_handler.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-proc_exit_handler.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-proxy_host_port_vars.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-proxy_host_port_vars.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-resolver_conf_parsing.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-resolver_conf_parsing.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-reuseport_close_unused_fds.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-reuseport_close_unused_fds.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-safe_resolver_ipv6_option.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-safe_resolver_ipv6_option.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-server_header.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-server_header.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-setting_args_invalidates_uri.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-setting_args_invalidates_uri.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-single_process_graceful_exit.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-single_process_graceful_exit.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-socket_cloexec.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-socket_cloexec.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-ssl_cert_cb_yield.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-ssl_cert_cb_yield.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-ssl_client_hello_cb_yield.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-ssl_client_hello_cb_yield.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-ssl_sess_cb_yield.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-ssl_sess_cb_yield.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-stream_balancer_export.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-stream_balancer_export.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-stream_proxy_get_next_upstream_tries.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-stream_proxy_get_next_upstream_tries.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-stream_proxy_protocol_v2.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-stream_proxy_protocol_v2.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-stream_proxy_timeout_fields.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-stream_proxy_timeout_fields.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-stream_ssl_preread_no_skip.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-stream_ssl_preread_no_skip.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-upstream_pipelining.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-upstream_pipelining.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-upstream_timeout_fields.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-upstream_timeout_fields.patch
--- a/patches/nginx/1.28.0/nginx-1.28.0-win32_max_err_str.patch
+++ b/patches/nginx/1.28.0/nginx-1.28.0-win32_max_err_str.patch
--- a/util/mirror-tarballs
+++ b/util/mirror-tarballs
@ -518,9 +518,9 @@ if [ "$answer" = "Y" ]; then
    answer=`$root/util/ver-ge "$main_ver" 1.25.4`
    if [ "$answer" = "N" ]; then
        echo "$info_txt applying the patch for nginx security advisory (CVE-2024-24989)"
-        patch -p1 < $root/patches/nginx-CVE-2024-24989.patch || exit 1
+        patch -p1 < $root/patches/nginx-1.25.3-CVE-2024-24989.patch || exit 1
        echo "$info_txt applying the patch for nginx security advisory (CVE-2024-24990)"
-        patch -p1 < $root/patches/nginx-CVE-2024-24990.patch || exit 1
+        patch -p1 < $root/patches/nginx-1.25.3-CVE-2024-24990.patch || exit 1
    fi
 fi

--- a/util/sync-patches.sh
+++ b/util/sync-patches.sh
@ -19,8 +19,17 @@ topdir="$topdir/.."

 cd $topdir/patches

-for file in `ls | grep nginx-$old`; do
+if [ ! -d "$old" ]; then
+    echo "Error: patches/$old directory not found"
+    exit 1
+fi
+
+mkdir -p "$new"
+
+for file in `ls $old/ | grep nginx-$old`; do
    #echo $file
    new_file=`echo $file | sed s/$old/$new/`
-    sed "s/$old_pat/$new/g" $file | sed "s/\b$old_num\b/$new_num/g" > $new_file
+    sed "s/$old_pat/$new/g" "$old/$file" | sed "s/\b$old_num\b/$new_num/g" > "$new/$new_file"
 done
+
+echo "Patches synced from $old to $new"