Merge ~michal-maloszewski99/ubuntu/+source/nginx:lp-1957320-jammy-nginx into ubuntu/+source/nginx:ubuntu/jammy-devel

[Michał Małoszewski]

PPA: https://launchpad.net/~michal-maloszewski99/+archive/ubuntu/ppa-nginx-jammy-lp-1957320

[Michał Małoszewski (michal-maloszewski99)]

SRU template attached to the bug report

[Michał Małoszewski (michal-maloszewski99)]

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-ppa-nginx-jammy-lp-1957320/?format=plain)
  nginx @ amd64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-ppa-nginx-jammy-lp-1957320/jammy/amd64/n/nginx/20230601_191148_50097@/log.gz
    01.06.23 19:11:48 ✅ Triggers: nginx/1.18.0-6ubuntu14.4~ppa1
  nginx @ arm64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-ppa-nginx-jammy-lp-1957320/jammy/arm64/n/nginx/20230601_014815_a55af@/log.gz
    01.06.23 01:48:15 ✅ Triggers: nginx/1.18.0-6ubuntu14.4~ppa1
  nginx @ armhf:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-ppa-nginx-jammy-lp-1957320/jammy/armhf/n/nginx/20230531_131521_a55af@/log.gz
    31.05.23 13:15:21 ✅ Triggers: nginx/1.18.0-6ubuntu14.4~ppa1
  nginx @ ppc64el:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-ppa-nginx-jammy-lp-1957320/jammy/ppc64el/n/nginx/20230531_130650_4a492@/log.gz
    31.05.23 13:06:50 ✅ Triggers: nginx/1.18.0-6ubuntu14.4~ppa1

[Athos Ribeiro (athos-ribeiro)]

LGTM

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Uploaded.

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading nginx_1.18.0-6ubuntu14.4.dsc: done.
  Uploading nginx_1.18.0-6ubuntu14.4.debian.tar.xz: done.
  Uploading nginx_1.18.0-6ubuntu14.4_source.buildinfo: done.
  Uploading nginx_1.18.0-6ubuntu14.4_source.changes: done.
Successfully uploaded packages.

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: athos-ribeiro, michal-maloszewski99
Uploaders: athos-ribeiro
MP auto-approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index bf9b733..03793c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nginx (1.18.0-6ubuntu14.4) jammy; urgency=medium
+
+  * d/p/lp1957320-jammy-fixed-sigquit-issue-with-unix-sockets.patch:
+    Fix SIGQUIT by replacing the custom socket closing code in the
+    ngx_process_cycle.c file by calling another function.
+    (LP: #1957320)
+
+ -- Michal Maloszewski <[e-mail]>  Tue, 30 May 2023 19:31:46 +0200
+
 nginx (1.18.0-6ubuntu14.3) jammy-security; urgency=medium
 
   * SECURITY UPDATE: memory corruption/disclosure issue
diff --git a/debian/patches/lp1957320-jammy-fixed-sigquit-issue-with-unix-sockets.patch b/debian/patches/lp1957320-jammy-fixed-sigquit-issue-with-unix-sockets.patch
 new file mode 100644
index 0000000..d2c830c
--- /dev/null
+++ b/debian/patches/lp1957320-jammy-fixed-sigquit-issue-with-unix-sockets.patch
@@ -0,0 +1,52 @@
+From 9c3ac44de268f0cf057bc5dd67929e74c9bbc3e3 Mon Sep 17 00:00:00 2001
+From: Ruslan Ermilov <[e-mail]>
+Date: Mon, 1 Jun 2020 22:31:23 +0300
+Subject: [PATCH] Fixed SIGQUIT not removing listening UNIX sockets (closes
+ #753).
+
+Listening UNIX sockets were not removed on graceful shutdown, preventing
+the next runs.  The fix is to replace the custom socket closing code in
+ngx_master_process_cycle() by the ngx_close_listening_sockets() call.
+
+Origin: upstream, https://github.com/nginx/nginx/commit/9c3ac44de268f0cf057bc5dd67929e74c9bbc3e3
+Bug: https://trac.nginx.org/nginx/ticket/753
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1957320
+Last-Update: 2023-05-30
+---
+ src/os/unix/ngx_process_cycle.c | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+--- a/src/os/unix/ngx_process_cycle.c
++++ b/src/os/unix/ngx_process_cycle.c
+@@ -77,12 +77,11 @@
+     u_char            *p;
+     size_t             size;
+     ngx_int_t          i;
+-    ngx_uint_t         n, sigio;
++    ngx_uint_t         sigio;
+     sigset_t           set;
+     struct itimerval   itv;
+     ngx_uint_t         live;
+     ngx_msec_t         delay;
+-    ngx_listening_t   *ls;
+     ngx_core_conf_t   *ccf;
+ 
+     sigemptyset(&set);
+@@ -204,16 +203,7 @@
+         if (ngx_quit) {
+             ngx_signal_worker_processes(cycle,
+                                         ngx_signal_value(NGX_SHUTDOWN_SIGNAL));
+-
+-            ls = cycle->listening.elts;
+-            for (n = 0; n < cycle->listening.nelts; n++) {
+-                if (ngx_close_socket(ls[n].fd) == -1) {
+-                    ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
+-                                  ngx_close_socket_n " %V failed",
+-                                  &ls[n].addr_text);
+-                }
+-            }
+-            cycle->listening.nelts = 0;
++            ngx_close_listening_sockets(cycle);
+ 
+             continue;
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 702a7c7..cc4eaef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ CVE-2021-23017-2.patch
 CVE-2021-3618.patch
 ssl-op-ignore-unexpected-eof-option.patch
 CVE-2022-41741_41742.patch
+lp1957320-jammy-fixed-sigquit-issue-with-unix-sockets.patch