Merge branch 'update-nginx' into 'master'

Bump nginx to 1.24.0

Closes #7058

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6900

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Dustin Collins <[email protected]>
Co-authored-by: Clemens Beck <[email protected]>

Author: balasankarc

config/patches/nginx/CVE-2021-3618.patch

@@ -18,7 +18,7 @@
 
 name 'nginx'
 
-version = Gitlab::Version.new('nginx', 'release-1.20.2')
+version = Gitlab::Version.new('nginx', 'release-1.24.0')
 default_version version.print(false)
 display_version version.print(false).delete_prefix('release-')
 
@@ -43,9 +43,6 @@
 build do
   cwd = "#{Omnibus::Config.source_dir}/nginx"
 
-  # Patch against CVE-2021-3618
-  patch source: 'CVE-2021-3618.patch'
-
   command ['./auto/configure',
            "--prefix=#{install_dir}/embedded",
            '--with-http_ssl_module',

config/software/nginx.rb

@@ -107,6 +107,12 @@ dependencies:
         replace_in_files:
         - filename: config/software/nginx-module-vts.rb
           pattern: "Gitlab::Version.new\\('nginx-module-vts', '(\\S+)'\\)"
+      # nginx
+      https://github.com/nginx/nginx.git:
+        replace_in_files:
+        - filename: config/software/nginx.rb
+          pattern: "Gitlab::Version.new\\('nginx', 'release-(\\S+)'\\)"
+          tag_prefix: 'release-'
       # openssl
       https://github.com/openssl/openssl.git:
         replace_in_files: