diff -pruN 1.22.1-9/debian/changelog 1.22.1-9ubuntu5/debian/changelog --- 1.22.1-9/debian/changelog 2023-03-14 15:19:32.000000000 +0000 +++ 1.22.1-9ubuntu5/debian/changelog 2023-05-20 09:45:20.000000000 +0000 @@ -1,3 +1,19 @@ +nginx (1.22.1-9ubuntu5) mantic; urgency=medium + + * Merge with Debian unstable (LP: #1993421). 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 Sat, 20 May 2023 11:45:20 +0200 + nginx (1.22.1-9) unstable; urgency=medium * d/control: nginx-common Breaks+Replaces: nginx (<< 1.22.1-8) @@ -16,6 +32,77 @@ nginx (1.22.1-8) unstable; urgency=mediu -- Jan Mojžíš Tue, 14 Mar 2023 06:53:32 +0100 +nginx (1.22.1-7ubuntu1) mantic; urgency=medium + + * Merge with Debian unstable (LP: #1993421). 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. + * Dropped: + - d/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + [Accepted by Debian 1.22.0-2. Deb #963668] + - d/nginx-common.install: Add install rule for apport hooks. + [Accepted by Debian in 1.22.0-2. Deb #963668] + - d/p/nginx-fix-pidfile.patch: Fix NGINX PIDfile handling to avoid + SystemD race condition - thanks to Tj for the patch. (LP #1581864) + [Accepted by Debian 1.22.0-2. Deb #876365] + - d/control: make nginx and nginx-full arch any, so that nginx-full + is no longer pulled into main because of i386 (LP #1893267) + [No longer required due to Debian packaging split] + - Remove the Lua modules from 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. + Changes made for this removal: + + d/control: + + Remove lua module from dependencies, and binary build item. + + Add "Breaks" line for nginx-lua for older versions of NGINX. + This is added to the nginx metapackage and nginx-extras. + + d/rules: Remove Lua module from the build flags for -extras. + + d/http-lua, d/modules/{,patches/,watch/}nginx-lua: Remove Lua + modules, watch file, module patches. + + d/modules/control: Remove Lua module from definitions + + d/copyright: Remove lua module. + + d/tests/{control,lua/}: Remove Lua test entirely, remove + dependencies on any test which request + libnginx-mod-http-lua as it's gone. + [No longer required due to Debian packaging split] + - d/control: drop GeoIP from nginx-core due to demotion of libgeoip + (LP #1861101, LP #1867150): + + remove libnginx-mod-http-geoip from nginx-core dependency + + have nginx-core depend on libnginx-mod-stream-geoip2 + instead of libnginx-mod-stream-geoip + + adjust package descriptions accordingly + [No longer required due to Debian packaging split] + - d/control: (GeoIP2 related changes) + + Update dependencies for http-geoip2 package to include libmaxminddb0. + + Update nginx-core to include http-geoip2 module due to approved bin-MIR + (LP #1867198) + + Move geoip2 module build flags to the common flags so all + package flavors have it. + + Update dependencies for nginx-light, etc. to include + libnginx-mod-http-geoip2 as it's in the 'common build flags' + for all flavors of the builds. + + Update package description for nginx-core to indicate geoip2 + is included, and to list third party HTTP modules. GeoIP2 + is not included for Stream by default, so we have to adjust + this because the Stream part isn't MIR'd. + [No longer required due to Debian packaging split] + - d/m/p/http-subs-filter/pcre2.patch: Patch from debian 0d813834 to + fix FTBFS + [Debian switched to libpcre2 in 1.22.1-7] + - d/p/CVE-2022-41741_41742.patch: disabled duplicate atoms in Mp4 + (CVE-2022-41741, CVE-2022-41742) + [Included in upstream 1.22.1 release] + + -- Bryce Harrington Thu, 23 Feb 2023 01:22:32 -0800 + nginx (1.22.1-7) unstable; urgency=medium * nginx ABI release: nginx-abi-1.22.1-7 @@ -208,6 +295,67 @@ nginx (1.22.0-2) unstable; urgency=mediu -- Jan Mojžíš Sun, 07 Aug 2022 16:14:59 +0200 +nginx (1.22.0-1ubuntu2) lunar; urgency=medium + + * Rebuild against new perlapi-5.36. + + -- Gianfranco Costamagna Fri, 04 Nov 2022 16:49:47 +0100 + +nginx (1.22.0-1ubuntu1) kinetic; urgency=medium + + * Merge with Debian unstable (LP: #1982626). Remaining changes: + - d/p/ubuntu-branding.patch: add Ubuntu branding + - d/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - d/nginx-common.install: Add install rule for apport hooks. + - d/p/nginx-fix-pidfile.patch: Fix NGINX PIDfile handling to avoid + SystemD race condition - thanks to Tj for the patch. (LP #1581864) + - d/control: make nginx and nginx-full arch any, so that nginx-full + is no longer pulled into main because of i386 (LP #1893267) + - Remove the Lua modules from 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. + Changes made for this removal: + + d/control: + + Remove lua module from dependencies, and binary build item. + + Add "Breaks" line for nginx-lua for older versions of NGINX. + This is added to the nginx metapackage and nginx-extras. + + d/rules: Remove Lua module from the build flags for -extras. + + d/http-lua, d/modules/{,patches/,watch/}nginx-lua: Remove Lua + modules, watch file, module patches. + + d/modules/control: Remove Lua module from definitions + + d/copyright: Remove lua module. + + d/tests/{control,lua/}: Remove Lua test entirely, remove + dependencies on any test which request + libnginx-mod-http-lua as it's gone. + - d/control: drop GeoIP from nginx-core due to demotion of libgeoip + (LP #1861101, LP #1867150): + + remove libnginx-mod-http-geoip from nginx-core dependency + + have nginx-core depend on libnginx-mod-stream-geoip2 + instead of libnginx-mod-stream-geoip + + adjust package descriptions accordingly + - d/control: (GeoIP2 related changes) + + Update dependencies for http-geoip2 package to include libmaxminddb0. + + Update nginx-core to include http-geoip2 module due to approved bin-MIR + (LP #1867198) + + Move geoip2 module build flags to the common flags so all + package flavors have it. + + Update dependencies for nginx-light, etc. to include + libnginx-mod-http-geoip2 as it's in the 'common build flags' + for all flavors of the builds. + + Update package description for nginx-core to indicate geoip2 + is included, and to list third party HTTP modules. GeoIP2 + is not included for Stream by default, so we have to adjust + this because the Stream part isn't MIR'd. + * d/p/ubuntu-branding.patch: Reimplement patch to avoid conflicting on + (volatile) release version numbers when merging. + * d/m/p/http-subs-filter/pcre2.patch: Patch from debian 0d813834 to + fix FTBFS + * d/t/branding: Add autopkgtest to validate branding presence + + -- Bryce Harrington Fri, 22 Jul 2022 17:56:50 -0700 + nginx (1.22.0-1) unstable; urgency=medium [ Thomas Ward ] @@ -252,6 +400,82 @@ nginx (1.22.0-1) unstable; urgency=mediu -- Thomas Ward Tue, 10 May 2022 12:08:02 -0400 +nginx (1.20.2-2ubuntu2) kinetic; urgency=medium + + * d/http-lua: Remove another lua patch + + -- Bryce Harrington Fri, 15 Jul 2022 04:50:47 +0000 + +nginx (1.20.2-2ubuntu1) kinetic; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - d/p/ubuntu-branding.patch: add Ubuntu branding + - d/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - d/nginx-common.install: Add install rule for apport hooks. + - d/p/nginx-fix-pidfile.patch: Fix NGINX PIDfile handling to avoid + SystemD race condition - thanks to Tj for the patch. (LP #1581864) + - d/control: make nginx and nginx-full arch any, so that nginx-full + is no longer pulled into main because of i386 (LP #1893267) + - Remove the Lua modules from 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. + Changes made for this removal: + + d/control: + + Remove lua module from dependencies, and binary build item. + + Add "Breaks" line for nginx-lua for older versions of NGINX. + This is added to the nginx metapackage and nginx-extras. + + d/rules: Remove Lua module from the build flags for -extras. + + d/modules/{,patches/,watch/}nginx-lua: Remove Lua module, watch file, + module patches. + + d/modules/control: Remove Lua module from definitions + + d/copyright: Remove lua module. + + d/tests/{control,lua/}: Remove Lua test entirely, remove + dependencies on any test which request + libnginx-mod-http-lua as it's gone. + - d/control: drop GeoIP from nginx-core due to demotion of libgeoip + (LP #1861101, LP #1867150): + + remove libnginx-mod-http-geoip from nginx-core dependency + + have nginx-core depend on libnginx-mod-stream-geoip2 + instead of libnginx-mod-stream-geoip + + adjust package descriptions accordingly + - d/control: (GeoIP2 related changes) + + Update dependencies for http-geoip2 package to include libmaxminddb0. + + Update nginx-core to include http-geoip2 module due to approved bin-MIR + (LP #1867198) + + Move geoip2 module build flags to the common flags so all + package flavors have it. + + Update dependencies for nginx-light, etc. to include + libnginx-mod-http-geoip2 as it's in the 'common build flags' + for all flavors of the builds. + + Update package description for nginx-core to indicate geoip2 + is included, and to list third party HTTP modules. GeoIP2 + is not included for Stream by default, so we have to adjust + this because the Stream part isn't MIR'd. + * d/p/ubuntu-branding.patch: Refresh + * Dropped: + - DNS Resolver Off-by-One Heap Write + + debian/patches/CVE-2021-23017.patch: fix logic in + src/core/ngx_resolver.c. + [Not needed: Replaced by upstream patches in separate commit] + - DNS Resolver issues + + debian/patches/CVE-2021-23017-1.patch: fixed off-by-one write in + src/core/ngx_resolver.c. + + debian/patches/CVE-2021-23017-2.patch: fixed off-by-one read in + src/core/ngx_resolver.c. + + debian/patches/CVE-2021-23017.patch: removed, replaced with upstream + commits. + [Included in upstream release 1.20.1] + - ALPACA TLS issue + + debian/patches/CVE-2021-3618.patch: specify the number of + errors after which the connection is closed in + src/mail/ngx_mail.h, src/mail/ngx_mail_core_module.c and + src/mail/ngx_mail_handler.c. + [Included in Debian release 1.20.2-2] + + -- Bryce Harrington Tue, 12 Jul 2022 10:23:53 -0700 + nginx (1.20.2-2) unstable; urgency=medium [ Thomas Ward ] @@ -344,6 +568,156 @@ nginx (1.18.0-6.1) unstable; urgency=hig -- Salvatore Bonaccorso Sat, 29 May 2021 16:21:37 +0200 +nginx (1.18.0-6ubuntu14.1) jammy-security; urgency=medium + + * SECURITY UPDATE: ALPACA TLS issue + - debian/patches/CVE-2021-3618.patch: specify the number of + errors after which the connection is closed in + src/mail/ngx_mail.h, src/mail/ngx_mail_core_module.c and + src/mail/ngx_mail_handler.c. + - CVE-2021-3618 + + -- David Fernandez Gonzalez Wed, 27 Apr 2022 12:56:57 +0200 + +nginx (1.18.0-6ubuntu14) jammy; urgency=medium + + * No-change rebuild to update maintainer scripts, see LP: 1959054 + + -- Dave Jones Wed, 16 Feb 2022 17:10:20 +0000 + +nginx (1.18.0-6ubuntu13) jammy; urgency=medium + + * No-change rebuild for the perl update. + + -- Matthias Klose Sun, 06 Feb 2022 13:48:12 +0100 + +nginx (1.18.0-6ubuntu12) jammy; urgency=medium + + * No-change rebuild against openssl3 + + -- Simon Chopin Wed, 24 Nov 2021 13:59:50 +0000 + +nginx (1.18.0-6ubuntu11) impish; urgency=medium + + * No-change rebuild to build packages with zstd compression. + + -- Matthias Klose Thu, 07 Oct 2021 12:21:36 +0200 + +nginx (1.18.0-6ubuntu10) impish; urgency=medium + + * SECURITY UPDATE: DNS Resolver issues + - debian/patches/CVE-2021-23017-1.patch: fixed off-by-one write in + src/core/ngx_resolver.c. + - debian/patches/CVE-2021-23017-2.patch: fixed off-by-one read in + src/core/ngx_resolver.c. + - debian/patches/CVE-2021-23017.patch: removed, replaced with upstream + commits. + - CVE-2021-23017 + + -- Marc Deslauriers Wed, 26 May 2021 06:59:42 -0400 + +nginx (1.18.0-6ubuntu9) impish; urgency=medium + + * SECURITY UPDATE: DNS Resolver Off-by-One Heap Write + - debian/patches/CVE-2021-23017.patch: fix logic in + src/core/ngx_resolver.c. + - CVE-2021-23017 + + -- Marc Deslauriers Tue, 25 May 2021 13:06:54 -0400 + +nginx (1.18.0-6ubuntu8) hirsute; urgency=medium + + * d/modules/control: Remove Lua module from definitions + * d/tests/: + - control: Remove Lua test, remove dependencies on any test which + request libnginx-mod-http-lua as it's gone. + - lua: Remove the lua test entirely. + + -- Thomas Ward Wed, 10 Mar 2021 10:50:43 -0500 + +nginx (1.18.0-6ubuntu7) hirsute; urgency=medium + + * d/control: + - Fix dependencies issue for libnginx-mod-http-geoip2 - missing a + character in the depends. + + -- Thomas Ward Tue, 09 Mar 2021 19:03:55 -0500 + +nginx (1.18.0-6ubuntu6) hirsute; urgency=medium + + * d/control: + - Update dependencies for nginx-light, etc. to include + libnginx-mod-http-geoip2 as it's in the 'common build flags' for + all flavors of the builds. + - Update nginx-core package description to list third party HTTP + modules. GeoIP2 is not included for Stream by default, so we + have to adjust this because the Stream part isn't MIR'd. + + -- Thomas Ward Tue, 09 Mar 2021 12:41:36 -0500 + +nginx (1.18.0-6ubuntu5) hirsute; urgency=medium + + * d/control: (GeoIP2 related changes) + - Update dependencies for http-geoip2 package. + - Update nginx-core to include http-geoip2 module due to approved bin-MIR + (LP: #1867198) + - Update description to nginx-core to indicate geoip2 is included. + * d/control: move geoip2 module build flags to the common flags so all + package flavors have it. + * d/modules/http-geoip2: Update to upstream version 3.3. + * Remove the Lua modules from 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. + Changes made for this removal: + - d/control: + - Remove lua module from dependencies, and binary build item. + - Add "Breaks" line for nginx-lua for older versions of NGINX. + This is added to the nginx metapackage and nginx-extras. + - d/copyright: Remove lua module. + - d/modules/{,patches/,watch/}nginx-lua: Remove Lua module, watch file, + module patches. + - d/rules: Remove Lua module from the build flags for -extras. + + -- Thomas Ward Mon, 08 Mar 2021 09:59:56 -0500 + +nginx (1.18.0-6ubuntu4) hirsute; urgency=medium + + * No-change rebuild for the perl update. + + -- Matthias Klose Mon, 09 Nov 2020 12:46:47 +0100 + +nginx (1.18.0-6ubuntu3) hirsute; urgency=medium + + * No-change rebuild for the perl update. + + -- Matthias Klose Mon, 09 Nov 2020 10:51:27 +0100 + +nginx (1.18.0-6ubuntu2) groovy; urgency=medium + + * d/control: make nginx and nginx-full arch any, so that nginx-full + is no longer pulled into main because of i386 (LP: #1893267) + + -- Andreas Hasenack Thu, 27 Aug 2020 16:59:57 -0300 + +nginx (1.18.0-6ubuntu1) groovy; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - d/p/ubuntu-branding.patch: add Ubuntu branding + - d/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - d/nginx-common.install: Add install rule for apport hooks. + - d/p/nginx-fix-pidfile.patch: Fix NGINX PIDfile handling to avoid + SystemD race condition - thanks to Tj for the patch. (LP #1581864) + - d/control: drop GeoIP from nginx-core due to demotion of libgeoip + (LP #1861101, LP #1867150): + + remove libnginx-mod-http-geoip from nginx-core dependency + + have nginx-core depend on libnginx-mod-stream-geoip2 + instead of libnginx-mod-stream-geoip + + adjust package descriptions accordingly + + -- Andreas Hasenack Tue, 25 Aug 2020 11:11:41 -0300 + nginx (1.18.0-6) unstable; urgency=medium * Fix GCC-10 compatibility (Closes: #957605). @@ -368,6 +742,69 @@ nginx (1.18.0-4) unstable; urgency=mediu -- Ondřej Nový Fri, 03 Jul 2020 09:34:49 +0200 +nginx (1.18.0-3ubuntu2) groovy; urgency=medium + + * Re-apply demotion of geoip in favor of geoip2 + - Fixes some accidentally dropped delta from merge to fix + unsatisfiable depends. nginx-[core|full] need to depend on + libnginx-mod-stream-geoip2, not on -geoip. + (LP #1861101) + + -- Bryce Harrington Mon, 06 Jul 2020 15:12:26 -0700 + +nginx (1.18.0-3ubuntu1) groovy; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - d/p/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - d/nginx-common.install: Add install rule for apport hooks. + - d/p/nginx-fix-pidfile.patch: Fix NGINX PIDfile handling to avoid + SystemD race condition - thanks to Tj for the patch. (LP #1581864) + - Drop GeoIP from nginx-core due to demotion of libgeoip + (LP #1861101, LP #1867150): + + d/control: Remove libnginx-mod-http-geoip from nginx-core dependency + + d/rules: Remove the configure line of with-http_geoip_module=dynamic + from the nginx-core build flags, due to demotion of libgeoip and the + removal of the dynamic library from install deps for nginx-core. + * d/a/source_nginx.py: Fix indentation in apport hook + * d/p/nginx-fix-pidfile.patch: Update dep3 with fwd debian link + * Dropped: + - debian/patches/0002-Make-sure-signature-stays-the-same-in- + all-nginx-buil.patch: Refreshed patch - Merge-o-Matic introduced some + fuzz which caused issues. + [ Does not seem necessary ] + - d/control: drop mention of SSL Preread from nginx-full, nginx-extras + [ Previously undocumented ] + - d/gbp.conf: update for 1.12 release + [ Previously undocumented ] + - d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch: + Refresh patch. + [ Previously undocumented ] + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - Add GeoIP2 third party module to nginx-full and nginx-extras + (LP #1825895). The following is the files list for this: + + d/{control,rules}: Add libnginx-mod-http-geoip2 and corresponding + build rules. + + d/modules/http-geoip2{,/*}: Add geoip2 module from third party git. + + d/copyright: Add relevant copyright lines for GeoIP2 module. + - d/conf/sites-available/default: Update PHP path for PHP 7.4. + [added in 1.17.9-0ubuntu3 taken by Debian in 1.18.0-2] + - d/nginx-full.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade. + - d/control: Add dependency from nginx-full on `iproute2` as the + postinst scripts now use `ss` to determine if Port 80 is open + or not. + [Taken by Debian in 1.18.0-2] + - d/rules: Enable --with-compat build option for all nginx package + flavors (LP #1797897) + + -- Bryce Harrington Wed, 24 Jun 2020 23:15:11 +0000 + nginx (1.18.0-3) unstable; urgency=medium * Source-only upload to allow migration. @@ -425,6 +862,225 @@ nginx (1.18.0-1) unstable; urgency=mediu -- Ondřej Nový Fri, 29 May 2020 19:03:30 +0200 +nginx (1.17.10-0ubuntu1) focal; urgency=medium + + * New upstream release (1.17.9) - full changelog available from + http://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + - d/rules: Enable --with-compat build option for all nginx package + flavors + - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party + module to nginx-full and nginx-extras (and use proper DEP5 syntax for + d/copyright). + - d/control, d/rules: Drop GeoIP from nginx-core due to demotion of + libgeoip. + + -- Thomas Ward Tue, 14 Apr 2020 12:53:34 -0400 + +nginx (1.17.9-0ubuntu3) focal; urgency=medium + + * d/conf/sites-available/default: Update PHP path for PHP 7.4. + + -- Thomas Ward Thu, 26 Mar 2020 10:53:52 -0400 + +nginx (1.17.9-0ubuntu2) focal; urgency=medium + + * Drop GeoIP from nginx-core due to demotion of libgeoip (LP: #1861101, + LP: #1867150): + - d/control: Remove libnginx-mod-http-geoip from nginx-core dependency + - d/rules: Remove the configure line of with-http_geoip_module=dynamic + from the nginx-core build flags, due to demotion of libgeoip and the + removal of the dynamic library from install deps for nginx-core. + + -- Thomas Ward Wed, 11 Mar 2020 13:41:07 -0400 + +nginx (1.17.9-0ubuntu1) focal; urgency=medium + + * New upstream release (1.17.9) - full changelog available from + http://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + - d/rules: Enable --with-compat build option for all nginx package + flavors + - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party + module to nginx-full and nginx-extras (and use proper DEP5 syntax for + d/copyright). + + -- Thomas Ward Tue, 03 Mar 2020 11:05:45 -0500 + +nginx (1.17.8-0ubuntu3) focal; urgency=medium + + * d/conf/sites-available/default: Indentation consistency. + Fix an indentation issue introduced by 1.17.8-0ubuntu2 to make sure that + indentation in the default config file is consistent. + + -- Thomas Ward Wed, 26 Feb 2020 10:35:13 -0500 + +nginx (1.17.8-0ubuntu2) focal; urgency=medium + + * d/conf/sites-available/default: Revert changes done in #1743592. + Reverts this change: + - d/conf/sites-available/default: Update default nginx site + configuration file to remove the IPv6 listening line so that servers + running without IPv6 enabled at all on the system will start nginx + properly. + + -- Thomas Ward Thu, 20 Feb 2020 13:52:32 -0500 + +nginx (1.17.8-0ubuntu1) focal; urgency=medium + + * New upstream release (1.17.8) - full changelog available from + http://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + - d/rules: Enable --with-compat build option for all nginx package + flavors + - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party + module to nginx-full and nginx-extras (and use proper DEP5 syntax for + d/copyright). + - d/conf/sites-available/default: Update default nginx site configuration + file to remove the IPv6 listening line so that servers running without + IPv6 enabled at all on the system will start nginx properly. + (LP: #1743592) + + -- Thomas Ward Tue, 18 Feb 2020 19:01:02 -0500 + +nginx (1.17.7-0ubuntu1) focal; urgency=medium + + * New upstream release (1.17.7) - full changelog available from + http://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + - d/rules: Enable --with-compat build option for all nginx package + flavors + - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party + module to nginx-full and nginx-extras (and use proper DEP5 syntax for + d/copyright). + - d/conf/sites-available/default: Update default nginx site configuration + file to remove the IPv6 listening line so that servers running without + IPv6 enabled at all on the system will start nginx properly. + (LP: #1743592) + + + -- Thomas Ward Mon, 30 Dec 2019 13:02:58 -0500 + +nginx (1.17.6-0ubuntu1) focal; urgency=medium + + * New upstream release (1.17.6) - full changelog available from + http://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + - d/rules: Enable --with-compat build option for all nginx package + flavors + - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party + module to nginx-full and nginx-extras (and use proper DEP5 syntax for + d/copyright). + - d/conf/sites-available/default: Update default nginx site configuration + file to remove the IPv6 listening line so that servers running without + IPv6 enabled at all on the system will start nginx properly. + (LP: #1743592) + + + -- Thomas Ward Tue, 19 Nov 2019 10:34:14 -0500 + +nginx (1.17.5-0ubuntu1) focal; urgency=medium + + * New upstream release (1.17.5) - full changelog available from + http://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + - d/rules: Enable --with-compat build option for all nginx package + flavors + - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party + module to nginx-full and nginx-extras (and use proper DEP5 syntax for + d/copyright). + * New Ubuntu-specific changes: + - d/conf/sites-available/default: Update default nginx site configuration + file to remove the IPv6 listening line so that servers running without + IPv6 enabled at all on the system will start nginx properly. + (LP: #1743592) + + -- Thomas Ward Fri, 01 Nov 2019 11:55:10 -0400 + nginx (1.16.1-3) unstable; urgency=high * Handle CVE-2019-20372, error page request smuggling @@ -449,6 +1105,294 @@ nginx (1.16.1-1) unstable; urgency=mediu -- Christos Trochalakis Mon, 09 Sep 2019 18:24:43 +0300 +nginx (1.16.1-0ubuntu3) focal; urgency=medium + + * No-change rebuild for the perl update. + + -- Matthias Klose Fri, 18 Oct 2019 19:37:10 +0000 + +nginx (1.16.1-0ubuntu2) eoan; urgency=medium + + * d/conf/sites-available/default: Update PHP referred to in the + example in the default configuration to PHP 7.2. + (LP: #1831748) + + -- Thomas Ward Thu, 15 Aug 2019 12:01:39 -0400 + +nginx (1.16.1-0ubuntu1) eoan; urgency=medium + + * New upstream release (1.16.1) - full changelog available from + http://nginx.org/en/CHANGES-1.16 + * This patch contains security patches only. + * Security content in this version: + - When using HTTP/2 a client might cause excessive memory consumption + and CPU usage (CVE-2019-9511. CVE-2019-9513, CVE-2019-9516) + + -- Thomas Ward Tue, 13 Aug 2019 13:08:03 -0400 + +nginx (1.16.0-0ubuntu2) eoan; urgency=medium + + * d/patches/nginx-fix-pidfile.patch: Fix NGINX PIDfile handling to avoid + SystemD race condition - thanks to Tj for the patch. (LP: #1581864) + + -- Thomas Ward Tue, 04 Jun 2019 11:43:30 -0400 + +nginx (1.16.0-0ubuntu1) eoan; urgency=medium + + * New upstream release (1.16.0) - full changelog available from + http://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + - d/rules: Enable --with-compat build option for all nginx package + flavors + - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party + module to nginx-full and nginx-extras + + -- Thomas Ward Mon, 29 Apr 2019 12:31:39 -0400 + +nginx (1.15.12-0ubuntu1) eoan; urgency=medium + + * New upstream release (1.15.12) - full changelog available from + http://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + - d/rules: Enable --with-compat build option for all nginx package + flavors + * Add GeoIP2 third party module to nginx-full and nginx-extras + (LP: #1825895). The following is the files list for this: + - d/{control,rules}: Add libnginx-mod-http-geoip2 and corresponding build + rules. + - d/modules/http-geoip2{,/*}: Add geoip2 module from third party git. + - d/copyright: Add relevant copyright lines for GeoIP2 module. + + -- Thomas Ward Mon, 22 Apr 2019 17:59:46 -0400 + +nginx (1.15.8-0ubuntu1) disco; urgency=medium + + * New upstream release (1.15.8) - full changelog available from + http://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + - d/rules: Enable --with-compat build option for all nginx package + flavors + + -- Thomas Ward Fri, 01 Feb 2019 20:21:45 -0500 + +nginx (1.15.7-0ubuntu1) disco; urgency=medium + + * New upstream release (1.15.7) - full changelog available from + http://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + - d/rules: Enable --with-compat build option for all nginx package + flavors (LP: #1797897) + + -- Thomas Ward Tue, 27 Nov 2018 10:28:55 -0500 + +nginx (1.15.6-0ubuntu2) disco; urgency=medium + + * Apply a Debian packaging change to Ubuntu package for config parity: + * d/conf/snippets/fastcgi-php.conf: Adjust fastcgi_split_path_info + snippet to handle the /example.php/ case. (Debian bug 911398) + + -- Thomas Ward Fri, 23 Nov 2018 10:56:21 -0500 + +nginx (1.15.6-0ubuntu1) disco; urgency=medium + + * New upstream release (1.15.6) - full changelog available from + http://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + - d/rules: Enable --with-compat build option for all nginx package + flavors (LP: #1797897) + + -- Thomas Ward Tue, 13 Nov 2018 10:10:45 -0500 + +nginx (1.15.5-0ubuntu4) disco; urgency=medium + + * No-change rebuild against libhiredis0.14 + + -- Steve Langasek Mon, 12 Nov 2018 08:47:44 +0000 + +nginx (1.15.5-0ubuntu3) disco; urgency=medium + + * No-change rebuild for the perl 5.28 transition. + + -- Adam Conrad Fri, 02 Nov 2018 19:02:18 -0600 + +nginx (1.15.5-0ubuntu2) cosmic; urgency=medium + + * d/conf/nginx.conf: Enable TLSv1.3 by default by adding TLSv1.3 to + the ssl_protocols line. (SRU, LP: #1800214) + + -- Thomas Ward Fri, 26 Oct 2018 15:25:59 -0400 + +nginx (1.15.5-0ubuntu1) cosmic; urgency=medium + + * This is a bugfixes-only upstream micro release, and thus is a bugfixes- + only version change. (LP: #1795690) + * New upstream release (1.15.5) - full changelog available from + http://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + + -- Thomas Ward Tue, 02 Oct 2018 11:31:05 -0400 + +nginx (1.15.4-0ubuntu1) cosmic; urgency=medium + + * New upstream release (1.15.4) - full changelog available from + http://nginx.org/en/CHANGES (LP: #1794321) + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + + -- Thomas Ward Tue, 25 Sep 2018 11:59:46 -0400 + +nginx (1.15.3-0ubuntu1) cosmic; urgency=medium + + * New upstream release (1.15.3) - full changelog available from + http://nginx.org/en/CHANGES (LP: #1790149) + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - d/nginx-{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + + -- Thomas Ward Fri, 31 Aug 2018 09:52:34 -0400 + +nginx (1.15.2-0ubuntu2) cosmic; urgency=medium + + * d/control: Add `iproute2` dependencies for the binary + nginx-{core,light,full,extras} packages, they got missed in the + application of the diff in 1.15.2-0ubuntu1. (LP: #1782226) + + -- Thomas Ward Tue, 21 Aug 2018 12:07:59 -0400 + +nginx (1.15.2-0ubuntu1) cosmic; urgency=medium + + * Switch to track NGINX Mainline for 18.10 (and 19.04) releases after + discussion with Server team members. Mainline version is 1.15.2 + * Upstream changelogs for 1.15.2 are available at + http://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + * Additional Ubuntu only changes (LP: #1782226): + - d/nginx{core,light,full,extras}.postinst: Add checks for whether + port 80 is in use or not to determine whether or not to attempt + starting of the NGINX service during install/upgrade. + - d/control: Add dependencies to nginx-{core,light,full,extras} on + `iproute2` as the postinst scripts now use `ss` to determine if + Port 80 is open or not. + + -- Thomas Ward Sun, 19 Aug 2018 12:16:48 -0400 + nginx (1.14.2-3) unstable; urgency=high * Backport upstream fixes for 3 CVEs (Closes: #935037) @@ -515,18 +1459,85 @@ nginx (1.14.0-1) unstable; urgency=mediu -- Christos Trochalakis Fri, 31 Aug 2018 15:28:04 +0300 +nginx (1.14.0-0ubuntu2) cosmic; urgency=medium + + * debian/nginx-core.postinst: Make nginx-*.postinst use invoke-rc.d. + (LP: #1578344) + + -- Thomas Ward Tue, 15 May 2018 11:14:02 -0400 + +nginx (1.14.0-0ubuntu1) bionic; urgency=medium + + * New upstream stable release (1.14.0) + * Upstream changelogs can be found at http://nginx.org/en/CHANGES-1.14 + * There are no functional changes or new features in this release, + and the only change is a version number change. + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + + -- Thomas Ward Tue, 17 Apr 2018 12:17:58 -0400 + nginx (1.13.12-1) unstable; urgency=medium * New upstream version -- Christos Trochalakis Wed, 11 Apr 2018 08:19:23 +0300 +nginx (1.13.12-0ubuntu1) bionic; urgency=medium + + * New upstream releases (1.13.11, 1.13.12) + * Upstream changelogs can be found at https://nginx.org/en/CHANGES + * Remaining Ubuntu-specific changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + + -- Thomas Ward Mon, 16 Apr 2018 11:43:01 -0400 + nginx (1.13.11-1) unstable; urgency=medium * New upstream version -- Christos Trochalakis Tue, 10 Apr 2018 14:55:11 +0300 +nginx (1.13.10-1ubuntu1) bionic; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + * Drop: + - debian/patches/0002-Make-sure-signature-stays-the-same-in- + all-nginx-buil.patch: Refreshed patch - Merge-o-Matic introduced some + fuzz which caused issues. + [ Does not seem necessary ] + - d/control: drop mention of SSL Preread from nginx-full, nginx-extras + [ Previously undocumented ] + - d/gbp.conf: update for 1.12 release + [ Previously undocumented ] + - d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch: + Refresh patch. + [ Previously undocumented ] + + -- Nishanth Aravamudan Thu, 05 Apr 2018 15:43:49 -0700 + nginx (1.13.10-1) unstable; urgency=medium * New upstream version @@ -572,6 +1583,32 @@ nginx (1.13.7-1) unstable; urgency=mediu -- Christos Trochalakis Thu, 14 Dec 2017 11:04:36 +0200 +nginx (1.13.6-2ubuntu2) bionic; urgency=high + + * No change rebuild against openssl1.1. + + -- Dimitri John Ledkov Mon, 05 Feb 2018 16:51:17 +0000 + +nginx (1.13.6-2ubuntu1) bionic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - debian/rules: Alter build flags for cflags and ldflags to fix known + fPIE / fPIC compilation issues (see nginx PPA bug for more details + and information, LP: #1657596) + - debian/patches/0002-Make-sure-signature-stays-the-same-in- + all-nginx-buil.patch: Refreshed patch - Merge-o-Matic introduced some + fuzz which caused issues. + + -- Thomas Ward Tue, 12 Dec 2017 12:15:30 -0500 + nginx (1.13.6-2) unstable; urgency=medium * rtmp: Ship docs & examples (Closes: #878368) @@ -659,6 +1696,37 @@ nginx (1.13.0-1) experimental; urgency=m -- Christos Trochalakis Wed, 10 May 2017 11:40:38 +0300 +nginx (1.12.1-0ubuntu2) artful; urgency=medium + + * No-change rebuild for perl 5.26.0. + + -- Matthias Klose Wed, 26 Jul 2017 20:11:43 +0000 + +nginx (1.12.1-0ubuntu1) artful; urgency=medium + + * New upstream release (1.12.1) - full changelog available at upstream + website - http://nginx.org/en/CHANGES-1.12 + * This release is a security patch micro-release from Upstream. + * This package contains security content to fix the following CVEs: + * CVE-2017-7529: A security issue was identified in nginx range filter. + A specially crafted request might result in an integer overflow and + incorrect processing of ranges, potentially resulting in sensitive + information leak. (Closes LP: #1704151) + * Additional changes: + * d/patches/ubuntu-branding.patch: Refreshed Ubuntu Branding patch. + + -- Thomas Ward Sat, 15 Jul 2017 12:40:15 -0400 + +nginx (1.12.0-1ubuntu1) artful; urgency=medium + + * Merge from Debian Experimental (1.12.0-1, via snapshots.debian.org) + * All Ubuntu-specific changes from Ubuntu 1.12.0-0ubuntu1 were retained. + * Remaining changes: + * d/tests/control: Specify nginx-core flavor tests. + * This merge closes the merge request on Launchpad. (LP: #1704020) + + -- Thomas Ward Wed, 12 Jul 2017 19:53:24 -0400 + nginx (1.12.0-1) experimental; urgency=medium [ Michael Lustfield ] @@ -679,6 +1747,90 @@ nginx (1.12.0-1) experimental; urgency=m -- Christos Trochalakis Fri, 05 May 2017 11:16:30 +0300 +nginx (1.12.0-0ubuntu1) artful; urgency=medium + + * New upstream release: 1.12.0 Stable branch. + * All remaining Ubuntu-specific and Debian-specific changes remain + in place with this upload, the upstream version and code are the + only bits that have been updated, except where indicated below. + * Remaining changes: + - d/modules/nginx-upload-progress/config: Apply upstream patch to + fix an issue where the module does not properly function due to + the wrong module type being set; this prevented the module from + working when built. (LP: #1673056) + - d/patches: The following patches were dropped from the package + because the changes from the patches are already incorporated + in 1.12.0: + - 0004-SSL-error-messages-style.patch + - 0005-SSL-style.patch + - 0006-SSL-support-for-multiple-curves-ticket-885.patch + - d/patches/perl-use-dpkg-buildflags.patch: Refreshed patch to + remove fuzz from the patch. + - d/modules/nginx-echo: Apply upstream diff/patch to fix an FTBFS + - d/modules/nginx-lua: Apply upstream diff/patch to fix an FTBFS + - d/modules/nginx-upstream-fair: Apply diff/patch from the Debian + package maintainers' git repository to not use default_port to + fix an FTBFS. (This will eventually be in Debian, and will get + merged in then as well). + + -- Thomas Ward Wed, 26 Apr 2017 12:02:33 -0400 + +nginx (1.12.0-1) UNRELEASED; urgency=medium + + [ Michael Lustfield ] + * debian/rules: + - Configure build flags to work with other arches and downstreams. + Thanks to Thomas Ward. + + [ Christos Trochalakis ] + * New upstream release. + * Patch nginx-upstream-fair to build against nginx 1.11.6. + * Patch nginx-lua to build against nginx 1.11.11. + * Patch nginx-echo to build against nginx 1.11.11. + * Drop curve list patch, it's included upstream. + * Drop perl build flags patch, it is now handled upstream. + * Enable SSL Preread builtin module on nginx-full & nginx-extras. + (Closes: #854214) + * Switch to debhelper 10, no changes needed. + + -- Christos Trochalakis Fri, 28 Apr 2017 11:14:41 +0300 + +nginx (1.10.3-1ubuntu3) zesty; urgency=medium + + * debian/tests/control: Remove the 'ec-x25519' test stanzas from the + declarations of tests to run. This test requires OpenSSL >= 1.1.0 + to support the X25519 ECDH curve, and we do not have OpenSSL 1.1.0. + This delta can be ***dropped*** when we do have OpenSSL >= 1.1.0. + - This fixes the autopkgtests, of which the Debian merge introduced + a regression due to the ec-x25519 test. + + -- Thomas Ward Mon, 27 Feb 2017 19:51:57 -0500 + +nginx (1.10.3-1ubuntu2) zesty; urgency=low + + * debian/*.save: Junk .save left in the packaging, remove these. + + -- Thomas Ward Thu, 16 Feb 2017 15:39:51 -0500 + +nginx (1.10.3-1ubuntu1) zesty; urgency=medium + + * Merge from Debian unstable (note: 1.10.3 already was merged, but 1.10.3 + packaging changes in Debian were not). Remaining changes are as + follows: (LP: #1664652) + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - debian/rules: Alter build flags for cflags and ldflags to fix known + fPIE / fPIC compilation issues (see nginx PPA bug for more details + and information, LP: #1657596) + + -- Thomas Ward Thu, 16 Feb 2017 15:29:40 -0500 + nginx (1.10.3-1) unstable; urgency=medium * New upstream release. (Closes: #855113) @@ -687,6 +1839,24 @@ nginx (1.10.3-1) unstable; urgency=mediu -- Christos Trochalakis Wed, 15 Feb 2017 09:58:13 +0200 +nginx (1.10.3-0ubuntu2) zesty; urgency=low + + * Merge from Debian unstable (nginx version there is 1.10.2-4). Remaining + changes: (LP: #1664652) + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + - debian/rules: Alter build flags for cflags and ldflags to fix known + fPIE / fPIC compilation issues (see nginx PPA bug for more details + and information, LP: #1657596) + + -- Thomas Ward Tue, 14 Feb 2017 17:47:00 -0500 + nginx (1.10.2-4) unstable; urgency=medium * Switch module reloading logic to dpkg triggers. @@ -759,6 +1929,18 @@ nginx (1.10.2-1) unstable; urgency=high -- Christos Trochalakis Sat, 29 Oct 2016 08:45:09 +0300 +nginx (1.10.2-0ubuntu1) zesty; urgency=medium + + * New upstream release (1.10.2) - full changelog available at upstream + website - http://nginx.org/en/CHANGES-1.10 - upstream release date + was 18 Oct 2016 + * All other changes from 1.10.1-0ubuntu1 through 1.10.1-0ubuntu5 remain + included + * debian/patches/ubuntu-branding.patch: + - Refreshed Ubuntu Branding patch. + + -- Thomas Ward Thu, 15 Dec 2016 11:23:43 -0500 + nginx (1.10.1-3) unstable; urgency=medium * debian/control: @@ -820,6 +2002,58 @@ nginx (1.10.1-1) unstable; urgency=mediu -- Christos Trochalakis Tue, 31 May 2016 22:01:25 +0300 +nginx (1.10.1-0ubuntu5) zesty; urgency=medium + + * debian/nginx-common.config: + - Fix the return code so the script does not exit during version + string comparisons. + - Also update the version string to compare with (for zesty only) + + -- Thomas Ward Thu, 27 Oct 2016 10:48:45 -0400 + +nginx (1.10.1-0ubuntu4) zesty; urgency=medium + + * debian/nginx-common.config: + - Fix an issue with the incorrect version numbers being compared + during configuration; this was something I missed when reviewing + the package for uploading previously. (LP: #1637058) + + -- Thomas Ward Thu, 27 Oct 2016 08:45:40 -0400 + +nginx (1.10.1-0ubuntu3) zesty; urgency=medium + + [ Christos Trochalakis ] + * debian/nginx-common.postinst: + + Secure log file handling (owner & permissions) against privilege + escalation attacks. /var/log/nginx is now owned by root:adm. + Thanks Dawid Golunski (http://legalhackers.com) for the report. + Changing /var/log/nginx permissions effectively reopens #701112, + since log files can be world-readable. This is a trade-off until + a better log opening solution is implemented upstream (trac:376). + * debian/control: + Don't allow building against liblua5.1-0-dev on architectures + that libluajit is available. + + -- Thomas Ward Tue, 25 Oct 2016 17:03:54 -0400 + +nginx (1.10.1-0ubuntu2) zesty; urgency=medium + + * No-change rebuild for perl 5.24 transition + + -- Iain Lane Mon, 24 Oct 2016 10:36:19 +0100 + +nginx (1.10.1-0ubuntu1) yakkety; urgency=medium + + * New upstream release (1.10.1) - full changelog available at upstream + website - http://nginx.org/en/CHANGES-1.10. + * Update done to address the following security issues: + - [CVE-2016-4450] NULL pointer dereference while writing client + request body. (LP: #1587577) + * Additional changes: + * debian/patches/ubuntu-branding.patch: Refreshed Ubuntu Branding patch. + + -- Thomas Ward Tue, 31 May 2016 19:09:33 -0400 + nginx (1.10.0-1) unstable; urgency=medium [ Christos Trochalakis ] @@ -827,6 +2061,30 @@ nginx (1.10.0-1) unstable; urgency=mediu -- Christos Trochalakis Fri, 29 Apr 2016 10:31:46 +0300 +nginx (1.10.0-0ubuntu1) yakkety; urgency=medium + + * New upstream release (1.10.0) - full changelog available at upstream + website - http://nginx.org/en/CHANGES-1.10 (LP: #1575217) + * All Ubuntu specific changes from 1.9.15-0ubuntu1 remain included. + * Additional changes: + * debian/patches/ubuntu-branding.patch: Refreshed Ubuntu Branding patch. + + -- Thomas Ward Tue, 26 Apr 2016 10:24:23 -0400 + +nginx (1.9.15-0ubuntu1) xenial-proposed; urgency=medium + + * New upstream release (1.9.15) - full changelog available at upstream + website - http://nginx.org/en/CHANGES (LP: #1572223) + * All Ubuntu specific changes from 1.1.14-0ubuntu1, except noted below, + remain included in this upload. + * Remaining changes: + * debian/control: Re-add libluajit-5.1-dev build-dependency, as it will + only affect nginx-extras which is in Universe. This reduces the merge + delta between Ubuntu and Debian slightly, as well. (LP: #1571444) + * debian/patches/ubuntu-branding.patch: Refresh Ubuntu Branding patch. + + -- Thomas Ward Mon, 18 Apr 2016 15:39:08 -0400 + nginx (1.9.14-2) unstable; urgency=medium [ Christos Trochalakis ] @@ -870,6 +2128,84 @@ nginx (1.9.14-1) unstable; urgency=mediu -- Christos Trochalakis Tue, 19 Apr 2016 11:05:35 +0300 +nginx (1.9.14-0ubuntu1) xenial-proposed; urgency=medium + + * New upstream release (1.9.14) - full changelog available at upstream + website - htp://nginx.org/en/CHANGES (LP: #1566392) + * All Ubuntu specific changes from 1.9.13-0ubuntu1, except noted below, + remain included in this upload. + * Remaining changes: + * Enable HTTP/2 module for nginx-full, nginx-extras, and nginx-core + (LP: #1565043) + - debian/rules: Enable HTTP/2 module building in flavor rules + - debian/control: Add HTTP/2 module to package descriptions. + * debian/patches/ubuntu-branding.patch: Refresh Ubuntu Branding patch. + + -- Thomas Ward Fri, 01 Apr 2016 14:23:47 -0400 + +nginx (1.9.13-0ubuntu1) xenial-proposed; urgency=medium + + * New upstream release (1.9.13) - full changelog available at upstream + website - http://nginx.org/en/CHANGES (LP: #1563393) + * All Ubuntu specific changes from 1.9.12-0ubuntu1 remain included in + this upload. + * debian/patches/ubuntu-branding.patch: Refresh Ubuntu Branding patch. + + -- Thomas Ward Tue, 29 Mar 2016 18:47:36 -0400 + +nginx (1.9.12-0ubuntu1) xenial; urgency=medium + + * New upstream release (1.9.12) - full changelog available at upstream + website - http://nginx.org/en/CHANGES (LP: #1549347) + * All Ubuntu specific changes from 1.9.11-0ubuntu1 and -0ubuntu2 remain + included in this upload. + + -- Thomas Ward Wed, 24 Feb 2016 10:26:31 -0500 + +nginx (1.9.11-0ubuntu2) xenial; urgency=medium + + * This is a bug-fix only upload and does not include any new changes to + features. + * debian/conf/sites-available/default: Modify PHP 'default example' settings + to account for php5 being replaced with php7.0 in Xenial. Also adapt the + UNIX socket path for php7.0-fpm to be the one used by default in Xenial. + (LP: #1547642) + + -- Thomas Ward Fri, 19 Feb 2016 14:13:28 -0500 + +nginx (1.9.11-0ubuntu1) xenial; urgency=low + + * New upstream release (1.9.11) - see http://nginx.org/en/CHANGES for + full changelog. + * Ubuntu-specific changes from the 1.9.10 merge remain included here. + * Additional changes: + - debian/modules/nginx-lua: Apply upstream patch to fix FTBFS issue + + -- Thomas Ward Tue, 09 Feb 2016 10:33:14 -0500 + +nginx (1.9.10-1ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: (LP: #1538677) + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/control: + - drop luajit from Build-Depends as it is in universe. + - Remove HTTP/2 references in package descriptions, per Ubuntu + Security Team mandate to disable HTTP/2 support. + - debian/rules: + - Disable HTTP/2 module support in all flavors, per Ubuntu Security + Team mandate. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + * Additional bugs fixed by this merge: + - nginx-common should not depend on python (LP: #1480513) + + -- Thomas Ward Tue, 27 Jan 2016 12:52:00 -0500 + nginx (1.9.10-1) unstable; urgency=medium [ Christos Trochalakis ] @@ -879,6 +2215,54 @@ nginx (1.9.10-1) unstable; urgency=mediu -- Christos Trochalakis Tue, 26 Jan 2016 20:12:06 +0200 +nginx (1.9.10-0ubuntu1) xenial; urgency=medium + + * New upstream release. + * debian/patches/ubuntu-branding.patch: Refreshed Ubuntu Branding patch + * Security content of this upload addresses the following vulnerabilities + and CVE-numbered Security issues: (LP: #1538165) + - Invalid pointer dereference might occur during DNS server response + processing, allowing an attacker who is able to forge UDP + packets from the DNS server to cause worker process crash + (CVE-2016-0742). + - Use-after-free condition might occur during CNAME response + processing. This problem allows an attacker who is able to trigger + name resolution to cause worker process crash, or might + have potential other impact (CVE-2016-0746). + - CNAME resolution was insufficiently limited, allowing an attacker who + is able to trigger arbitrary name resolution to cause excessive resource + consumption in worker processes (CVE-2016-0747). + + -- Thomas Ward Tue, 26 Jan 2016 14:53:01 -0500 + +nginx (1.9.9-1ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: (LP: #1534208) + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/control: + - drop luajit from Build-Depends as it is in universe. + - Update nginx-core description to match nginx-full description of the + standard and optional HTTP modules that are enabled. + - Remove HTTP/2 references in package descriptions, per Ubuntu + Security Team mandate to disable HTTP/2 support. + - debian/rules: + - Update nginx-core configure flags to match nginx-full config flags, + due to refreshing the nginx-core 'enabled modules' to match the + nginx-full modules (minus third-party modules) + - Disable HTTP/2 module support in all flavors, per Ubuntu Security + Team mandate. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + * debian/control: Remove HTTP/2 reference in nginx-extras description, which + was missed previously due to accidental oversight. (LP: #1534368) + + -- Thomas Ward Thu, 14 Jan 2016 18:42:00 -0500 + nginx (1.9.9-1) unstable; urgency=medium [ Michael Lustfield ] @@ -892,6 +2276,46 @@ nginx (1.9.9-1) unstable; urgency=medium -- Christos Trochalakis Thu, 14 Jan 2016 10:40:35 +0200 +nginx (1.9.9-0ubuntu1) xenial; urgency=medium + + * New upstream release. + * debian/patches/ubuntu-branding.patch: Refreshed Ubuntu Branding patch + + -- Thomas Ward Sun, 03 Jan 2016 12:49:21 -0500 + +nginx (1.9.6-2ubuntu2) xenial; urgency=medium + + * Rebuild for Perl 5.22.1. + + -- Colin Watson Fri, 18 Dec 2015 12:53:05 +0000 + +nginx (1.9.6-2ubuntu1) xenial; urgency=medium + + * Merge from Debian unstable. Remaining changes: (LP: #1510096) + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/control: drop luajit from Build-Depends as it is in universe. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + * Additional changes: + * debian/rules: + - Update nginx-core configure flags to match nginx-full config flags, + due to refreshing the nginx-core 'enabled modules' to match the + nginx-full modules (minus third-party modules) + - Disable HTTP/2 module support in all flavors, per Ubuntu Security + Team mandate. + * debian/control: + - Update nginx-core description to match nginx-full description of the + standard and optional HTTP modules that are enabled. + - Remove HTTP/2 references in package descriptions, per Ubuntu + Security Team mandate to disable HTTP/2 support. + + -- Thomas Ward Mon, 14 Dec 2015 10:34:42 -0500 + nginx (1.9.6-2) unstable; urgency=medium [ Christos Trochalakis] @@ -917,6 +2341,21 @@ nginx (1.9.4-1) unstable; urgency=medium -- Christos Trochalakis Mon, 24 Aug 2015 16:23:20 +0300 +nginx (1.9.3-1ubuntu1) wily; urgency=medium + + * Merge from Debian. Remaining changes: (LP: #1476811) + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/control: drop luajit from Build-Depends as it is in universe. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + + -- Thomas Ward Wed, 22 Jul 2015 11:39:44 -0400 + nginx (1.9.3-1) unstable; urgency=medium [ Christos Trochalakis] @@ -1001,6 +2440,52 @@ nginx (1.9.1-1) unstable; urgency=medium -- Christos Trochalakis Fri, 12 Jun 2015 15:42:49 +0300 +nginx (1.6.2-5ubuntu4) wily; urgency=medium + + * debian/apport/source_nginx.py: + - Add apport hooks for additional bug information gathering, as a result + of non-useful reports due to postinstall script failure bugs. This is + necessary in order to be able to actually debug what is going on in the + bug reports, thanks to systemd not putting startup errors to stdout or + stderr anymore, like Upstart and others did. (LP: #1472683) + * debian/nginx-common.install: + - Add install rule for debian/apport/source_nginx.py, which is the new + apport hooks to gather additional 'Package' bugtype debug data. + + -- Thomas Ward Fri, 10 Jul 2015 12:51:48 -0400 + +nginx (1.6.2-5ubuntu3) vivid-proposed; urgency=medium + + * debian/rules: + * Reversed Debian change in 1.6.2-5ubuntu2. + * Added DEB_BUILD_MAINT_OPTIONS=hardening=+all to enable all + dpkg-buildflags to harden the code, except for PIE flags. + * Manually define DEB_BUILD_MAINT_OPTIONS in DEBIAN_NGINX_PERL_LDFLAGS + to not have -fPIE conflicts in Perl flags. + + -- Thomas Ward Wed, 01 Apr 2015 14:57:34 -0400 + +nginx (1.6.2-5ubuntu2) vivid-proposed; urgency=medium + + * debian/rules: + * Added -fPIE -pie to build rules (enables position-independent builds) + using Debian's committed change to enable. (LP: #1315426) + + -- Thomas Ward Wed, 01 Apr 2015 14:26:32 -0400 + +nginx (1.6.2-5ubuntu1) vivid; urgency=medium + + * Merge from Debian. Remaining changes: (LP: #1399967) + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - debian/rules: Drop from -O3 to -O2 to work around a build failure. + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/control: drop luajit from Build-Depends as it is in universe. + + -- Thomas Ward Sat, 06 Dec 2014 13:06:55 -0500 + nginx (1.6.2-5) unstable; urgency=medium [ Christos Trochalakis ] @@ -1016,6 +2501,27 @@ nginx (1.6.2-5) unstable; urgency=medium -- Christos Trochalakis Sun, 30 Nov 2014 10:39:55 +0200 +nginx (1.6.2-4ubuntu1) vivid; urgency=medium + + * Merge from Debian. Remaining changes: (LP: #1388621) + - debian/patches/ubuntu-branding.patch: add Ubuntu branding + (refreshed). + - debian/rules: Drop from -O3 to -O2 to work around a build failure. + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + - debian/tests/control: add nginx-core test. + - debian/control: drop luajit from Build-Depends as it is in universe. + * debian/control: + * Remove nginx-naxsi* from nginx-core and related + package stanzas, as the naxsi packages have all been dropped. + * Remove reference to nginx-naxsi from nginx metapackage description + * debian/index.html: Modify included index.html file to have Ubuntu + branding, Ubuntu bug reporting tool references, and a link to the + Launchpad bugs page for the nginx package. + + -- Thomas Ward Wed, 05 Nov 2014 10:05:07 -0500 + nginx (1.6.2-4) unstable; urgency=medium [ Christos Trochalakis ] @@ -1067,6 +2573,27 @@ nginx (1.6.2-2) unstable; urgency=medium -- Christos Trochalakis Fri, 26 Sep 2014 11:06:47 +0300 +nginx (1.6.2-1ubuntu1.1) utopic; urgency=medium + + * debian/conf/sites-available/default: Remove SSLv3 from the ssl_protocols + line in the default config example, due to POODLE vulnerability. + + -- Thomas Ward Wed, 22 Oct 2014 09:43:35 -0400 + +nginx (1.6.2-1ubuntu1) utopic; urgency=medium + + * Merge from Debian. Remaining changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding + (refreshed). + - debian/rules: Drop from -O3 to -O2 to work around a build failure. + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + * debian/tests/control: add nginx-core test. + * debian/control: drop luajit from Build-Depends as it is in universe. + + -- Marc Deslauriers Mon, 22 Sep 2014 13:32:30 -0400 + nginx (1.6.2-1) unstable; urgency=high [ Christos Trochalakis ] @@ -1114,6 +2641,25 @@ nginx (1.6.1-2) unstable; urgency=medium -- Christos Trochalakis Thu, 04 Sep 2014 13:00:46 +0300 +nginx (1.6.1-1ubuntu2) utopic; urgency=medium + + * Rebuild for Perl 5.20.0. + + -- Colin Watson Sun, 24 Aug 2014 06:43:36 -0700 + +nginx (1.6.1-1ubuntu1) utopic; urgency=medium + + * Merge from Debian. Remaining changes: + - debian/patches/ubuntu-branding.patch: add Ubuntu branding + (refreshed). + - debian/rules: Drop from -O3 to -O2 to work around a build failure. + - d/{control,rules,nginx-core.*}: add new binary package for main, + nginx-core, which contains only source-tarball-included modules + and no third-party modules. + * Add dep8 smoke test + + -- Robie Basak Fri, 15 Aug 2014 16:46:48 +0000 + nginx (1.6.1-1) unstable; urgency=medium [ Christos Trochalakis ] @@ -1179,6 +2725,34 @@ nginx (1.4.7-1) unstable; urgency=medium -- Christos Trochalakis Tue, 18 Mar 2014 22:03:47 +0200 +nginx (1.4.6-1ubuntu3) trusty; urgency=medium + + * Add new binary package for main, nginx-core, which contains only + source-tarball-included modules and no third-party modules. + * Changes to debian/ directory: + - control: + + Add entry for nginx-core and nginx-core-dbg. + - rules: + + Add nginx-core flavor to the build rules. + - nginx-core.*: Add new packaging files for nginx-core based on + the packaging files for nginx-full. + * The above changes satisfy the requirements for main (LP: #1262710) + + -- Thomas Ward Mon, 10 Mar 2014 18:23:36 -0400 + +nginx (1.4.6-1ubuntu2) trusty; urgency=medium + + * debian/rules: Drop from -O3 to -O2 to work around a build failure. + + -- Adam Conrad Sun, 09 Mar 2014 11:49:28 -0600 + +nginx (1.4.6-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/ubuntu-branding.patch: Add Ubuntu branding. + + -- Adam Conrad Sun, 09 Mar 2014 11:13:26 -0600 + nginx (1.4.6-1) unstable; urgency=medium [ Christos Trochalakis ] @@ -1200,6 +2774,14 @@ nginx (1.4.6-1) unstable; urgency=medium -- Christos Trochalakis Tue, 04 Mar 2014 18:06:55 +0200 +nginx (1.4.5-1ubuntu1) trusty; urgency=medium + + * Resynchronise with Debian (LP: #1280511). Remaining changes: + - debian/patches/ubuntu-branding.patch: + + Add Ubuntu branding to server_tokens. + + -- Colin Watson Sat, 15 Feb 2014 03:05:42 +0000 + nginx (1.4.5-1) unstable; urgency=medium [ Christos Trochalakis ] @@ -1240,6 +2822,14 @@ nginx (1.4.4-3) unstable; urgency=medium -- Christos Trochalakis Tue, 31 Dec 2013 11:47:07 +0200 +nginx (1.4.4-2ubuntu1) trusty; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - debian/patches/ubuntu-branding.patch: + + Add Ubuntu branding to server_tokens. + + -- Colin Watson Sat, 28 Dec 2013 10:21:44 +0000 + nginx (1.4.4-2) unstable; urgency=low [ Michael Lustfield ] @@ -1277,6 +2867,14 @@ nginx (1.4.4-2) unstable; urgency=low -- Kartik Mistry Fri, 27 Dec 2013 21:16:01 +0530 +nginx (1.4.4-1ubuntu1) trusty; urgency=low + + * Resynchronise with Debian (LP: #1253691). Remaining changes: + - debian/patches/ubuntu-branding.patch: + + Add Ubuntu branding to server_tokens. + + -- Colin Watson Fri, 22 Nov 2013 12:23:25 +0000 + nginx (1.4.4-1) unstable; urgency=low [ Christos Trochalakis ] @@ -1301,6 +2899,14 @@ nginx (1.4.4-1) unstable; urgency=low -- Michael Lustfield Thu, 21 Nov 2013 19:25:50 +0530 +nginx (1.4.3-2ubuntu1) trusty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - debian/patches/ubuntu-branding.patch: + + Add Ubuntu branding to server_tokens. + + -- Colin Watson Mon, 21 Oct 2013 13:26:52 +0100 + nginx (1.4.3-2) unstable; urgency=low [ Kartik Mistry ] @@ -1357,6 +2963,14 @@ nginx (1.4.3-1) unstable; urgency=low -- Kartik Mistry Thu, 10 Oct 2013 17:28:56 +0530 +nginx (1.4.1-3ubuntu1) saucy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - debian/patches/ubuntu-branding.patch: + + Add Ubuntu branding to server_tokens. + + -- Colin Watson Thu, 20 Jun 2013 15:08:44 +0100 + nginx (1.4.1-3) unstable; urgency=low [ Kartik Mistry ] @@ -1370,6 +2984,14 @@ nginx (1.4.1-3) unstable; urgency=low -- Kartik Mistry Sun, 09 Jun 2013 13:07:52 +0530 +nginx (1.4.1-2ubuntu1) saucy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - debian/patches/ubuntu-branding.patch: + + Add Ubuntu branding to server_tokens. + + -- Colin Watson Fri, 07 Jun 2013 15:41:48 +0100 + nginx (1.4.1-2) unstable; urgency=medium [ Kartik Mistry] @@ -1391,6 +3013,24 @@ nginx (1.4.1-2) unstable; urgency=medium -- Kartik Mistry Thu, 06 Jun 2013 12:55:23 +0530 +nginx (1.4.1-1ubuntu2) saucy; urgency=low + + * Rebuild for libgd3. + + -- Colin Watson Mon, 20 May 2013 00:45:10 +0100 + +nginx (1.4.1-1ubuntu1) saucy; urgency=low + + * Merge with Debian unstable (LP: #1177919). Remaining changes: + - debian/conf/sites-available/default: + + Modify default site configuration file to correct a typo + that prevented out-of-the-box usability (LP: #1162177). + - debian/patches/ubuntu-branding.patch: + + Add ubuntu branding to server_tokens. + * Refresh all patches. + + -- Dmitry Shachnev Sat, 11 May 2013 14:47:53 +0400 + nginx (1.4.1-1) unstable; urgency=low * New upstream release: @@ -1468,6 +3108,36 @@ nginx (1.4.0-1) experimental; urgency=lo -- Kartik Mistry Thu, 25 Apr 2013 12:51:45 +0530 +nginx (1.2.6-1ubuntu4) saucy; urgency=low + + * debian/patches/ubuntu-branding.patch: Move Ubuntu branding from + the numerical version string to the long version (LP: #1174158) + + -- Adam Conrad Thu, 09 May 2013 11:50:52 -0600 + +nginx (1.2.6-1ubuntu3) raring; urgency=low + + * debian/patches/ubuntu-branding.patch: Add ubuntu branding + to server_tokens. + + -- Chuck Short Tue, 09 Apr 2013 10:23:26 -0500 + +nginx (1.2.6-1ubuntu2) raring; urgency=low + + * debian/conf/sites-available/default: + * Modify default site configuration file to correct a typo + that prevented out-of-the-box usability (LP: #1162177) + + -- Thomas Ward Fri, 05 Apr 2013 20:22:38 +0100 + +nginx (1.2.6-1ubuntu1) raring; urgency=low + + * debian/conf/sites-available/default: + * Modify default site default configuration file to bind to IPv6 + only for IPv6 default listen statement (LP: #1132678) + + -- Thomas Ward Tue, 12 Mar 2013 00:23:02 +0000 + nginx (1.2.6-1) unstable; urgency=low [ Kartik Mistry ] diff -pruN 1.22.1-9/debian/control 1.22.1-9ubuntu5/debian/control --- 1.22.1-9/debian/control 2023-03-14 15:19:32.000000000 +0000 +++ 1.22.1-9ubuntu5/debian/control 2023-05-20 09:45:20.000000000 +0000 @@ -1,7 +1,8 @@ Source: nginx Section: httpd Priority: optional -Maintainer: Debian Nginx Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Nginx Maintainers Uploaders: Jan Mojžíš Build-Depends: debhelper-compat (= 13), libexpat-dev, @@ -79,8 +80,8 @@ Description: nginx web/proxy server - de Package: nginx-core Architecture: all -Depends: libnginx-mod-http-geoip (>= ${source:Version}), - libnginx-mod-http-geoip (<< ${source:Version}.1~), +Depends: libnginx-mod-http-geoip2 (>= ${libnginx-mod-geoip2:Version}), + libnginx-mod-http-geoip2 (<< ${libnginx-mod-geoip2:Version}.1~), libnginx-mod-http-image-filter (>= ${source:Version}), libnginx-mod-http-image-filter (<< ${source:Version}.1~), libnginx-mod-http-xslt-filter (>= ${source:Version}), @@ -89,8 +90,8 @@ Depends: libnginx-mod-http-geoip (>= ${s libnginx-mod-mail (<< ${source:Version}.1~), libnginx-mod-stream (>= ${source:Version}), libnginx-mod-stream (<< ${source:Version}.1~), - libnginx-mod-stream-geoip (>= ${source:Version}), - libnginx-mod-stream-geoip (<< ${source:Version}.1~), + libnginx-mod-stream-geoip2 (>= ${libnginx-mod-geoip2:Version}), + libnginx-mod-stream-geoip2 (<< ${libnginx-mod-geoip2:Version}.1~), nginx (>= ${source:Version}), nginx (<< ${source:Version}.1~), ${misc:Depends}, @@ -198,7 +199,6 @@ Depends: nginx (= ${binary:Version}), libnginx-mod-http-fancyindex (>= ${libnginx-mod-http-fancyindex:Version}~), libnginx-mod-http-geoip2 (>= ${libnginx-mod-geoip2:Version}~), libnginx-mod-http-headers-more-filter (>= ${libnginx-mod-http-headers-more-filter:Version}~), - libnginx-mod-http-lua (>=${libnginx-mod-http-lua:Version}~) [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc], libnginx-mod-http-subs-filter (>= ${libnginx-mod-http-subs-filter:Version}~), libnginx-mod-http-uploadprogress (>= ${libnginx-mod-http-uploadprogress:Version}~), libnginx-mod-http-upstream-fair (>= ${libnginx-mod-http-upstream-fair:Version}~), diff -pruN 1.22.1-9/debian/patches/series 1.22.1-9ubuntu5/debian/patches/series --- 1.22.1-9/debian/patches/series 2023-03-14 15:19:32.000000000 +0000 +++ 1.22.1-9ubuntu5/debian/patches/series 2023-02-23 09:22:32.000000000 +0000 @@ -3,3 +3,7 @@ nginx-fix-pidfile.patch nginx-ssl_cert_cb_yield.patch bug-1024605.patch bug-973861.patch + + +# Ubuntu patches: +ubuntu-branding.patch diff -pruN 1.22.1-9/debian/patches/ubuntu-branding.patch 1.22.1-9ubuntu5/debian/patches/ubuntu-branding.patch --- 1.22.1-9/debian/patches/ubuntu-branding.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.22.1-9ubuntu5/debian/patches/ubuntu-branding.patch 2023-02-23 09:11:43.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Add Ubuntu token to NGINX_VER +Author: Adam Conrad +Forwarded: not-needed +Last-Update: 2022-06-08 + +--- + src/core/nginx.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/core/nginx.h ++++ b/src/core/nginx.h +@@ -22,5 +22,16 @@ + #define NGINX_VAR "NGINX" + #define NGX_OLDPID_EXT ".oldbin" + ++/* Update versions for Ubuntu branding */ ++#undef NGINX_VER ++#undef NGINX_VER_BUILD ++ ++#define NGINX_VER "nginx/" NGINX_VERSION " (Ubuntu)" ++ ++#ifdef NGX_BUILD ++#define NGINX_VER_BUILD NGINX_VER " (" NGX_BUILD ")" ++#else ++#define NGINX_VER_BUILD NGINX_VER ++#endif + + #endif /* _NGINX_H_INCLUDED_ */ diff -pruN 1.22.1-9/debian/tests/branding 1.22.1-9ubuntu5/debian/tests/branding --- 1.22.1-9/debian/tests/branding 1970-01-01 00:00:00.000000000 +0000 +++ 1.22.1-9ubuntu5/debian/tests/branding 2023-02-23 09:11:43.000000000 +0000 @@ -0,0 +1,12 @@ +#!/bin/bash + +set -e + +version=$(dpkg-query -f='${source:Upstream-Version}' -W nginx-common) +expected_server_string="Server: nginx/${version} (Ubuntu)" +actual_server_string=$(curl -i localhost -s | grep ^Server: | sed 's/\r//' ) + +echo "Installed nginx-common version: ${version}" +echo "Server string we got from the live service: ${actual_server_string}" + +test "${expected_server_string}" = "${actual_server_string}" diff -pruN 1.22.1-9/debian/tests/control 1.22.1-9ubuntu5/debian/tests/control --- 1.22.1-9/debian/tests/control 2023-03-14 15:19:32.000000000 +0000 +++ 1.22.1-9ubuntu5/debian/tests/control 2023-05-20 09:45:20.000000000 +0000 @@ -2,6 +2,10 @@ Tests: light-simple Restrictions: allow-stderr isolation-container needs-root Depends: nginx-light, curl +Tests: branding +Restrictions: allow-stderr isolation-container +Depends: nginx-light, curl + Tests: ec-x25519 Restrictions: allow-stderr isolation-container needs-root Depends: nginx-light, ssl-cert, curl @@ -31,7 +35,6 @@ Depends: nginx-core, libnginx-mod-http-geoip2, libnginx-mod-http-headers-more-filter, libnginx-mod-http-image-filter, - libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc], libnginx-mod-http-perl, libnginx-mod-http-subs-filter, libnginx-mod-http-uploadprogress, @@ -62,7 +65,6 @@ Depends: nginx-full, libnginx-mod-http-geoip2, libnginx-mod-http-headers-more-filter, libnginx-mod-http-image-filter, - libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc], libnginx-mod-http-perl, libnginx-mod-http-subs-filter, libnginx-mod-http-uploadprogress, @@ -93,7 +95,6 @@ Depends: nginx-light, libnginx-mod-http-geoip2, libnginx-mod-http-headers-more-filter, libnginx-mod-http-image-filter, - libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc], libnginx-mod-http-perl, libnginx-mod-http-subs-filter, libnginx-mod-http-uploadprogress, @@ -124,7 +125,6 @@ Depends: nginx-extras, libnginx-mod-http-geoip2, libnginx-mod-http-headers-more-filter, libnginx-mod-http-image-filter, - libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc], libnginx-mod-http-perl, libnginx-mod-http-subs-filter, libnginx-mod-http-uploadprogress,