Merge updates from debian/bookworm

debian/apport/source_nginx.py

@@ -9,7 +9,7 @@ import os
 import subprocess
 
 def add_info(report, ui):
-    if (report['Package'].split()[0] != 'nginx'
+    if (report['Package'].split()[0] != 'nginx-common'
         and report['ProblemType'] == 'Package'
         and os.path.isdir('/run/systemd/system')):
         report['Journalctl_Nginx.txt'] = apport.hookutils.command_output(

debian/changelog

+nginx (1.22.1-9) unstable; urgency=medium
+
+  * d/control: nginx-common Breaks+Replaces: nginx (<< 1.22.1-8)
+    (Closes: 1032929)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 14 Mar 2023 16:19:32 +0100
+
+nginx (1.22.1-8) unstable; urgency=medium
+
+  * Main change:
+    Configuration files returned to nginx-common package. This fixes
+    the serious problem of losing configuration files during upgrade.
+    This is a rollback of a change made in 1.22.1-6 (Closes: 1032517)
+  * d/control: fix nginx-full dependencies
+  * d/libnginx-mod.abisubstvars: update libnginx-mod-http-lua version
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 14 Mar 2023 06:53:32 +0100
+
 nginx (1.22.1-7+apertis0) apertis; urgency=medium
 
   * Sync from debian/bookworm.

debian/control

@@ -24,9 +24,10 @@ Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          iproute2,
-Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), nginx-common (<< 1.22.1-6~)
-Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), nginx-common (<< 1.22.1-6~)
-Suggests: fcgiwrap, nginx-doc, ssl-cert
+         nginx-common (<< ${source:Version}.1~),
+         nginx-common (>= ${source:Version}),
+Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
+Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
 Provides: httpd, httpd-cgi, ${nginx:abi}
 Description: small, powerful, scalable web/proxy server
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -46,18 +47,19 @@ Description: small, powerful, scalable web/proxy server - documentation
  This package provides extra documentation to help unleash the power of Nginx.
 
 Package: nginx-common
+Breaks: nginx (<< 1.22.1-8)
+Replaces: nginx (<< 1.22.1-8)
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends},
-         nginx (<< ${source:Version}.1~),
-         nginx (>= ${source:Version}),
+Depends: ${misc:Depends}
+Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
  .
- From nginx version 1.22.1-6 changed to dependency metapackage,
- can be safely removed.
+ This package contains base configuration files used by all versions of
+ nginx.
 
 Package: nginx-dev
 Architecture: all
@@ -119,13 +121,13 @@ Description: nginx web/proxy server (standard version)
 
 Package: nginx-full
 Architecture: all
-Depends: libnginx-mod-http-auth-pam,
-         libnginx-mod-http-dav-ext,
-         libnginx-mod-http-echo,
-         libnginx-mod-http-geoip2,
-         libnginx-mod-http-subs-filter,
-         libnginx-mod-http-upstream-fair,
-         libnginx-mod-stream-geoip2,
+Depends: libnginx-mod-http-auth-pam (>= ${libnginx-mod-http-auth-pam:Version}~),
+         libnginx-mod-http-dav-ext (>= ${libnginx-mod-http-dav-ext:Version}~),
+         libnginx-mod-http-echo (>= ${libnginx-mod-http-echo:Version}~),
+         libnginx-mod-http-geoip2 (>= ${libnginx-mod-geoip2:Version}~),
+         libnginx-mod-http-subs-filter (>= ${libnginx-mod-http-subs-filter:Version}~),
+         libnginx-mod-http-upstream-fair (>= ${libnginx-mod-http-upstream-fair:Version}~),
+         libnginx-mod-stream-geoip2 (>= ${libnginx-mod-geoip2:Version}~),
          nginx (>= ${source:Version}),
          nginx (<< ${source:Version}.1~),
          ${misc:Depends},

debian/libnginx-mod.abisubstvars

@@ -15,7 +15,7 @@ libnginx-mod-http-echo:Version=1:0.63-4
 libnginx-mod-http-fancyindex:Version=1:0.5.2-3
 libnginx-mod-http-geoip2:Version=1:3.4-3
 libnginx-mod-http-headers-more-filter:Version=1:0.34-3
-libnginx-mod-http-lua:Version=1:0.10.23~rc2-2
+libnginx-mod-http-lua:Version=1:0.10.23-1
 libnginx-mod-http-subs-filter:Version=1:0.6.4-4
 libnginx-mod-http-uploadprogress:Version=1:0.9.2-3
 libnginx-mod-http-upstream-fair:Version=1:0.0~git20120408.a18b409-3

debian/nginx-common.NEWS

-nginx-common (1.22.1-6) unstable; urgency=medium
-
-  The packages nginx-common deprecated.
-  Package no longer distribute the configuration files and is replaced
-  by a metapackage to keep upgrades smooth.
-  Please simply install 'nginx' and 'libnginx-mod-...' modules You need
-  instead of these packages.
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 11 Jan 2023 20:23:22 +0100
-
 nginx-common (1.10.2-4) unstable; urgency=medium
 
   Since nginx 1.9.14 Debian has gradually switched to dynamic loadable modules

debian/nginx-common.dirs

+etc/nginx
+etc/nginx/conf.d
+etc/nginx/modules-available
+etc/nginx/modules-enabled
+etc/nginx/sites-available
+etc/nginx/sites-enabled
+etc/ufw/applications.d
+usr/share/nginx
+usr/share/vim/addons
+usr/share/vim/registry
+var/lib/nginx
+var/log/nginx

debian/nginx-common.install

+contrib/vim/* usr/share/vim/addons
+debian/conf/* etc/nginx
+debian/apport/source_nginx.py usr/share/apport/package-hooks
+debian/ufw/nginx etc/ufw/applications.d
+debian/vim/nginx.yaml usr/share/vim/registry
+html/index.html usr/share/nginx/html/

debian/nginx-common.postinst

+#!/bin/sh
+set -e
+
+. /usr/share/debconf/confmodule
+
+case "$1" in
+  configure)
+    logdir="/var/log/nginx"
+
+    # Allow local admin to override
+    if ! dpkg-statoverride --list "$logdir" >/dev/null; then
+      chown root:adm $logdir
+      chmod 0755 $logdir
+    fi
+
+    # Secure default logfiles on fresh installations
+    if [ -z "$2" ]; then
+      access_log="$logdir/access.log"
+      error_log="$logdir/error.log"
+
+      if [ ! -e "$access_log" ]; then
+        touch "$access_log"
+        chmod 640 "$access_log"
+        chown www-data:adm "$access_log"
+      fi
+
+      if [ ! -e "$error_log" ]; then
+        touch "$error_log"
+        chmod 640 "$error_log"
+        chown www-data:adm "$error_log"
+      fi
+    fi
+
+    # If a symlink doesn't exist and can be created, then create it.
+    if [ -z $2 ] && [ ! -e /etc/nginx/sites-enabled/default ] &&
+       [ -d /etc/nginx/sites-enabled ] && [ -d /etc/nginx/sites-available ]; then
+      ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
+    fi
+
+    # Create a default index page when not already present.
+    if [ ! -e /var/www/html/index.nginx-debian.html ]; then
+      mkdir -p /var/www/html
+      cp /usr/share/nginx/html/index.html /var/www/html/index.nginx-debian.html
+    fi
+
+    ;;
+
+  abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+  *)
+    echo "postinst called with unknown argument \`$1'" >&2
+    exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

debian/nginx.dirs

 usr/sbin
-etc/nginx
-etc/nginx/conf.d
-etc/nginx/modules-available
-etc/nginx/modules-enabled
-etc/nginx/sites-available
-etc/nginx/sites-enabled
-etc/ufw/applications.d
-usr/share/nginx
-usr/share/vim/addons
-usr/share/vim/registry
-var/lib/nginx
-var/log/nginx

debian/nginx.install

 debian/build-bin/objs/nginx usr/sbin
-contrib/vim/* usr/share/vim/addons
-debian/conf/* etc/nginx
-debian/apport/source_nginx.py usr/share/apport/package-hooks
-debian/ufw/nginx etc/ufw/applications.d
-debian/vim/nginx.yaml usr/share/vim/registry
-html/index.html usr/share/nginx/html/

debian/nginx.postinst

 #!/bin/sh
 set -e
 
-. /usr/share/debconf/confmodule
-
 case "$1" in
-  configure)
-    logdir="/var/log/nginx"
-
-    # Allow local admin to override
-    if ! dpkg-statoverride --list "$logdir" >/dev/null; then
-      chown root:adm $logdir
-      chmod 0755 $logdir
-    fi
-
-    # Secure default logfiles on fresh installations
-    if [ -z "$2" ]; then
-      access_log="$logdir/access.log"
-      error_log="$logdir/error.log"
-
-      if [ ! -e "$access_log" ]; then
-        touch "$access_log"
-        chmod 640 "$access_log"
-        chown www-data:adm "$access_log"
-      fi
-
-      if [ ! -e "$error_log" ]; then
-        touch "$error_log"
-        chmod 640 "$error_log"
-        chown www-data:adm "$error_log"
-      fi
-    fi
-
-    # If a symlink doesn't exist and can be created, then create it.
-    if [ -z $2 ] && [ ! -e /etc/nginx/sites-enabled/default ] &&
-       [ -d /etc/nginx/sites-enabled ] && [ -d /etc/nginx/sites-available ]; then
-      ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
-    fi
-
-    # Create a default index page when not already present.
-    if [ ! -e /var/www/html/index.nginx-debian.html ]; then
-      mkdir -p /var/www/html
-      cp /usr/share/nginx/html/index.html /var/www/html/index.nginx-debian.html
-    fi
+  abort-upgrade|abort-remove|abort-deconfigure|configure)
     ;;
-
   triggered)
     if invoke-rc.d --quiet nginx status >/dev/null; then
       echo "Triggering nginx reload ..."
@@ -51,10 +11,6 @@ case "$1" in
     fi
     exit 0
     ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
   *)
     echo "postinst called with unknown argument \`$1'" >&2
     exit 1