Thanks Teward, I've updated the bug record accordingly. Let me know if you would like to handle the merge when it comes; I'm good to take it otherwise.
** Summary changed: - Merge nginx from Debian unstable for oracular + Merge nginx 1.26.0 from Debian unstable for oracular ** Description changed: Scheduled-For: Backlog - Upstream: tbd - Debian: 1.24.0-2 + Upstream: 1.26 (coming soon) + Debian: 1.24.0-2 Ubuntu: 1.24.0-2ubuntu7 - - ubuntu-server has maintained this package's merge in the past. + 1.26.0 is slated to land in Debian with ABI changes and rebuilds of all + third party modules If it turns out this needs a sync rather than a merge, please change the tag 'needs-merge' to 'needs-sync', and (optionally) update the title as desired. - If this merge pulls in a new upstream version, also consider adding an - entry to the Oracular Release Notes: + Also add an entry to the Oracular Release Notes for the 1.26.0 release: https://discourse.ubuntu.com/c/release/38 - ### New Debian Changes ### nginx (1.24.0-2) unstable; urgency=medium - * d/control added dependency nginx-common to nginx (Closes: 1039905) - After nginx installation, the nginx-common package is installed - automatically due to its dependencies. The nginx-common package includes - the systemd unit, which becomes enabled and activated upon installation. - When the nginx is removed, nginx-common package and the systemd unit will - remain in the system. Adding a dependency nginx-common to nginx solves - this problem. - * d/control fixed binNMU safe dependency declaration nginx to nginx-common, - nginx is 'any', nginx-common is 'all' -> dependency '= ${source:Version}' - * d/rules removed override_dh_strip, migration to automatic debug symbols is - already done, fixes debug-symbol-migration-possibly-complete lint. warning - * d/po/ro.po added Romanian debconf translation. (Closes: 1033084), - Thanks to Remus-Gabriel Chelu - * d/po/sv.po added Swedish debconf translation. (Closes: 1050443), - Thanks to Peter Kvillegård - * d/conf/mime.types added video/ogg, video/x-matroska (Closes: 1028144) - * d/p/CVE-2023-44487.patch adds additional mitigations for CVE-2023-44487 - that according to NGINX developers on nginx-devel are already suitably - mitigated with the default config options for keepalive. (Closes: 1053770) - * d/control added nginx-dev dependency on ${nginx:abi} - * d/debhelper/nginx_mod.pm automatic libnginx-mod-stream dependencies + * d/control added dependency nginx-common to nginx (Closes: 1039905) + After nginx installation, the nginx-common package is installed + automatically due to its dependencies. The nginx-common package includes + the systemd unit, which becomes enabled and activated upon installation. + When the nginx is removed, nginx-common package and the systemd unit will + remain in the system. Adding a dependency nginx-common to nginx solves + this problem. + * d/control fixed binNMU safe dependency declaration nginx to nginx-common, + nginx is 'any', nginx-common is 'all' -> dependency '= ${source:Version}' + * d/rules removed override_dh_strip, migration to automatic debug symbols is + already done, fixes debug-symbol-migration-possibly-complete lint. warning + * d/po/ro.po added Romanian debconf translation. (Closes: 1033084), + Thanks to Remus-Gabriel Chelu + * d/po/sv.po added Swedish debconf translation. (Closes: 1050443), + Thanks to Peter Kvillegård + * d/conf/mime.types added video/ogg, video/x-matroska (Closes: 1028144) + * d/p/CVE-2023-44487.patch adds additional mitigations for CVE-2023-44487 + that according to NGINX developers on nginx-devel are already suitably + mitigated with the default config options for keepalive. (Closes: 1053770) + * d/control added nginx-dev dependency on ${nginx:abi} + * d/debhelper/nginx_mod.pm automatic libnginx-mod-stream dependencies - -- Jan Mojžíš <jan.moj...@gmail.com> Wed, 11 Oct 2023 01:17:51 +0200 + -- Jan Mojžíš <jan.moj...@gmail.com> Wed, 11 Oct 2023 01:17:51 +0200 nginx (1.24.0-1) unstable; urgency=medium - * New upstream version 1.24.0 - * nginx ABI release: nginx-abi-1.24.0-1 - * d/libnginx-mod.abisubstvars update version constraints of the 3rd party - modules - * d/p/bug-{1024605,973861}.patch removed, fixed in upstream - * d/copyright: updated copyright for files src/event/ngx_event_udp.h, - src/os/win32/ngx_dlopen + * New upstream version 1.24.0 + * nginx ABI release: nginx-abi-1.24.0-1 + * d/libnginx-mod.abisubstvars update version constraints of the 3rd party + modules + * d/p/bug-{1024605,973861}.patch removed, fixed in upstream + * d/copyright: updated copyright for files src/event/ngx_event_udp.h, + src/os/win32/ngx_dlopen - -- Jan Mojžíš <jan.moj...@gmail.com> Tue, 27 Jun 2023 23:19:31 +0200 + -- Jan Mojžíš <jan.moj...@gmail.com> Tue, 27 Jun 2023 23:19:31 +0200 nginx (1.22.1-9) unstable; urgency=medium - * d/control: nginx-common Breaks+Replaces: nginx (<< 1.22.1-8) - (Closes: 1032929) + * d/control: nginx-common Breaks+Replaces: nginx (<< 1.22.1-8) + (Closes: 1032929) - -- Jan Mojžíš <jan.moj...@gmail.com> Tue, 14 Mar 2023 16:19:32 +0100 + -- Jan Mojžíš <jan.moj...@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 + * 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.moj...@gmail.com> Tue, 14 Mar 2023 06:53:32 +0100 + -- Jan Mojžíš <jan.moj...@gmail.com> Tue, 14 Mar 2023 06:53:32 +0100 nginx (1.22.1-7) unstable; urgency=medium - * nginx ABI release: nginx-abi-1.22.1-7 - * nginx ABI: Nginx now provides nginx-abi-<VERSION> to better manage - dependencies between nginx and 3rd party modules. Credit to Jérémy Lal. - * switched to libpcre2 (Closes: 1000013) - * d/p/bug-973861: added, lingering close for connections with pipelined - requests. The patch is backported from the upstream. (Closes: 973861) - * d/gbb.conf: switched to debian branch main (debian-branch = main) - * d/copyright: updated to be compatible with 'cme update dpkg-copyright' + * nginx ABI release: nginx-abi-1.22.1-7 + * nginx ABI: Nginx now provides nginx-abi-<VERSION> to better manage + dependencies between nginx and 3rd party modules. Credit to Jérémy Lal. + * switched to libpcre2 (Closes: 1000013) + * d/p/bug-973861: added, lingering close for connections with pipelined + requests. The patch is backported from the upstream. (Closes: 973861) + * d/gbb.conf: switched to debian branch main (debian-branch = main) + * d/copyright: updated to be compatible with 'cme update dpkg-copyright' - -- Jan Mojžíš <jan.moj...@gmail.com> Mon, 13 Feb 2023 13:04:16 +0100 + -- Jan Mojžíš <jan.moj...@gmail.com> Mon, 13 Feb 2023 13:04:16 +0100 nginx (1.22.1-6) unstable; urgency=medium - * Main change: - Nginx binary moved to package nginx, also moved basic - configuration files from nginx-common to package nginx. - The packages nginx-{light,core,extras,common} are replaced - by a metapackage. (Closes: 1025763) - Users should simply install 'nginx' and 'libnginx-mod-...' - instead of these packages. - * Additional changes: - * d/nginx-{light,core,extras,full,common}.NEWS: added warning that - nginx-{light,core,extras,full,common} are deprecated - * d/control: fixed dependencies for safe binNMU - * d/copyright: updated debian/* copyright - * d/copyright: added missing copyright for d/apport/* - * d/copyright: added missing GPL-2+ copyright for d/debhelper/dh_nginx - * d/copyright: added missing copyright for d/help/examples/nginx_modsite - * d/po/it.po: added Italian debconf translation. (Closes: 1019160) - * d/control: removed dependency on obsolete package lsb-base - * d/control: bump Standards-Version: 4.6.2, no changes + * Main change: + Nginx binary moved to package nginx, also moved basic + configuration files from nginx-common to package nginx. + The packages nginx-{light,core,extras,common} are replaced + by a metapackage. (Closes: 1025763) + Users should simply install 'nginx' and 'libnginx-mod-...' + instead of these packages. + * Additional changes: + * d/nginx-{light,core,extras,full,common}.NEWS: added warning that + nginx-{light,core,extras,full,common} are deprecated + * d/control: fixed dependencies for safe binNMU + * d/copyright: updated debian/* copyright + * d/copyright: added missing copyright for d/apport/* + * d/copyright: added missing GPL-2+ copyright for d/debhelper/dh_nginx + * d/copyright: added missing copyright for d/help/examples/nginx_modsite + * d/po/it.po: added Italian debconf translation. (Closes: 1019160) + * d/control: removed dependency on obsolete package lsb-base + * d/control: bump Standards-Version: 4.6.2, no changes - -- Jan Mojžíš <jan.moj...@gmail.com> Wed, 08 Feb 2023 17:20:27 +0100 + -- Jan Mojžíš <jan.moj...@gmail.com> Wed, 08 Feb 2023 17:20:27 +0100 nginx (1.22.1-5) unstable; urgency=medium - [ Jan Mojžíš ] - * Since version 1.22.1-5 all third party modules are removed from Debian NGINX - package and all these modules are maintained in separate external packages. - Removed namely these remaining modules: - - libnginx-mod-http-geoip2 - - libnginx-mod-stream-geoip2 - + [ Jan Mojžíš ] + * Since version 1.22.1-5 all third party modules are removed from Debian NGINX + package and all these modules are maintained in separate external packages. + Removed namely these remaining modules: + - libnginx-mod-http-geoip2 + - libnginx-mod-stream-geoip2 ### Old Ubuntu Delta ### nginx (1.24.0-2ubuntu7) noble; urgency=medium - * No-change rebuild for CVE-2024-3094 + * No-change rebuild for CVE-2024-3094 - -- Steve Langasek <steve.langa...@ubuntu.com> Sun, 31 Mar 2024 + -- Steve Langasek <steve.langa...@ubuntu.com> Sun, 31 Mar 2024 02:40:23 +0000 nginx (1.24.0-2ubuntu6) noble; urgency=medium - * No-change rebuild against libssl3t64 + * No-change rebuild against libssl3t64 - -- Steve Langasek <steve.langa...@ubuntu.com> Mon, 04 Mar 2024 + -- Steve Langasek <steve.langa...@ubuntu.com> Mon, 04 Mar 2024 20:09:09 +0000 nginx (1.24.0-2ubuntu5) noble; urgency=medium - * No-change rebuild for perlapi5.38t64. + * No-change rebuild for perlapi5.38t64. - -- Matthias Klose <d...@ubuntu.com> Sat, 02 Mar 2024 17:03:42 +0100 + -- Matthias Klose <d...@ubuntu.com> Sat, 02 Mar 2024 17:03:42 +0100 nginx (1.24.0-2ubuntu4) noble; urgency=medium - * No-change rebuild for the perl update. + * No-change rebuild for the perl update. - -- Matthias Klose <d...@ubuntu.com> Wed, 10 Jan 2024 14:12:02 +0100 + -- Matthias Klose <d...@ubuntu.com> Wed, 10 Jan 2024 14:12:02 +0100 nginx (1.24.0-2ubuntu3) noble; urgency=medium - * d/control: Fix versioned dependency for libnginx-mod-*-geoip2, as - these are now distinct source packages with their own version numbers, - not linked to the nginx source package itself. - (LP: #2040404) + * d/control: Fix versioned dependency for libnginx-mod-*-geoip2, as + these are now distinct source packages with their own version numbers, + not linked to the nginx source package itself. + (LP: #2040404) - -- Bryce Harrington <br...@canonical.com> Tue, 05 Dec 2023 00:54:00 + -- Bryce Harrington <br...@canonical.com> Tue, 05 Dec 2023 00:54:00 -0800 nginx (1.24.0-2ubuntu2) noble; urgency=medium - * No change rebuild + * No change rebuild - -- Bryce Harrington <br...@canonical.com> Mon, 20 Nov 2023 00:47:34 + -- Bryce Harrington <br...@canonical.com> Mon, 20 Nov 2023 00:47:34 +0000 nginx (1.24.0-2ubuntu1) noble; urgency=low - * Merge from Debian unstable. Remaining changes: - - Branding for Ubuntu - + d/p/ubuntu-branding.patch: add Ubuntu branding - + d/t/branding: Add autopkgtest to validate branding presence - - d/control: Drop the Lua module (libnginx-mod-http-lua) as a - dependency for NGINX (Server Team Decision) - future support - for Lua module now requires resty-core from OpenResty, meaning that if - we want to continue to support the Lua module, we have to start becoming - OpenResty - users should just use OpenResty at this point for Lua. - - d/control: let nginx-core depend on geoip2 instead of geoip. - - d/t/control: Drop autopkgtest dependencies on libnginx-mod-http-lua too + * Merge from Debian unstable. Remaining changes: + - Branding for Ubuntu + + d/p/ubuntu-branding.patch: add Ubuntu branding + + d/t/branding: Add autopkgtest to validate branding presence + - d/control: Drop the Lua module (libnginx-mod-http-lua) as a + dependency for NGINX (Server Team Decision) - future support + for Lua module now requires resty-core from OpenResty, meaning that if + we want to continue to support the Lua module, we have to start becoming + OpenResty - users should just use OpenResty at this point for Lua. + - d/control: let nginx-core depend on geoip2 instead of geoip. + - d/t/control: Drop autopkgtest dependencies on libnginx-mod-http-lua too - -- Gianfranco Costamagna <locutusofb...@debian.org> Thu, 26 Oct 2023 + -- Gianfranco Costamagna <locutusofb...@debian.org> Thu, 26 Oct 2023 08:41:23 +0200 ** Changed in: nginx (Ubuntu) Milestone: ubuntu-24.10-beta => ubuntu-24.06 ** Changed in: nginx (Ubuntu) Status: Incomplete => New -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/2064432 Title: Merge nginx 1.26.0 from Debian unstable for oracular To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/2064432/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
