Merge ~bryce/ubuntu/+source/nginx:merge-v1.18.0-3 into ubuntu/+source/nginx:debian/sid

Proposed by Bryce Harrington
Status: Rejected
Rejected by: Bryce Harrington
Proposed branch: ~bryce/ubuntu/+source/nginx:merge-v1.18.0-3
Merge into: ubuntu/+source/nginx:debian/sid
Diff against target: 1686 lines (+1420/-3)
7 files modified
debian/apport/source_nginx.py (+19/-0)
debian/changelog (+1286/-0)
debian/control (+3/-3)
debian/nginx-common.install (+1/-0)
debian/patches/nginx-fix-pidfile.patch (+89/-0)
debian/patches/series (+2/-0)
debian/patches/ubuntu-branding.patch (+20/-0)
Reviewer Review Type Date Requested Status
Thomas Ward (community) Approve
Christian Ehrhardt  Approve
Canonical Server Team Pending
Review via email: mp+386231@code.launchpad.net

Description of the change

PPA: https://launchpad.net/~bryce/+archive/ubuntu/nginx-merge-1.18.0-3

Debian has taken part of ubuntu's delta, so this re-merges with their package and reduces our delta. I've also imported this into git ubuntu, splitting the change history into individual commits. This should be reviewable as a regular git-ubuntu package (usual tags, et al).

php-fpm appears to be expecting things to be in /run/php. Looks like /var/run is symlinked to /run so presumably either should work fine, but going forward if we use /run it'll minimize our delta and (presumably) be more correct.

See the changelog for things that were dropped.

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :
Download full text (7.7 KiB)

Changelog:
- [✓] old content and logical tag match as expected
- [✓] changelog entry correct version and targeted codename
- [✓] changelog entries correct
   I see some of the old changes have been forgotten to be mentioned on some old merges.
   AFAICS you did well detecting and carrying them.
   I was looking for `iproute2` but you squashed it with the port 80 checks, fine with me.
- [✓] update-maintainer has been run

Actual changes:
- [✓] no major new upstream changes to consider
- [✓] no further upstream version to consider
- [x] debian changes look safe (not as much as I expected as it seemed dormant there, more see below)

Old Delta:
- [✓] dropped changes are ok to be dropped
- [x] nothing else to drop (see below for details)
- [x] changes forwarded upstream/debian (see below for details)

New Delta:
- [✓] new change is just a typo fix to be squashed later and ok

Build/Test:
- [✓] build is ok
- [✓] verified PPA package installs/uninstalls
- [✓] autopkgtest against the PPA package passes
- [✓] sanity checks test fine

#1 Changelog

Forgotten to mention in changelog that it was dropped:
- d/conf/sites-available/default: Update PHP path for PHP 7.4.
  added in 1.17.9-0ubuntu3 taken in Debian at 1.18.0-2

#2 submission to Debian/Upstream
I think some just are special to Ubuntu like branding, geoip and apport.
- The latter (apport) being debatable as many Debian packages have taken apport Delta being a no-op for them.
- PIDFile is awkward in bug 1581864 more and more ask to submit it or even call it a placebo, I feel if we keep this as-is forever it will bit rot and get worse. Submitting it seems painful but required.

Now that you rebased so well split, would you mind sending these over for their consideration?

#3 potential conflicts
This lists things that changed in Debian/Upstream and I wondered if we need to adapt

Conflict 1:
Ubuntu:
   8 - Do not attempt to start nginx if other daemon is binding to port
   9 80, to prevent install failure (LP #1782226):
Debian:
  76 * Check if port 80 is free before starting during install

This is somewhat messed up.
Debian added most of what we had.
We had:
commit b17a1ed0781213770ef39b9cc7e3d8af463b5d21
Author: Bryce Harrington <email address hidden>
Date: Mon Jun 15 02:43:43 2020 +0000
        - Do not attempt to start nginx if other daemon is binding to port
          80, to prevent install failure (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.
Which actually didn't add the iproute2 depencency, that was in
commit 844ab3317d0b0b0d15d197b2bdd8044bb88c65fd
Author: Bryce Harrington <email address hidden>
Date: Mon Jun 15 02:57:32 2020 +0000
        - d/control: Add `iproute2` dependencies for the binary
          nginx-{core,light,full,extras} packages, they got missed in the
          appl...

Read more...

review: Needs Fixing
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

P.S. as I mentioned in the past I still recommend pre-building the PPAs on all architectures.
Maybe I'm thinking too much about it working on arch dependent SW so much, a webserver might be fine as-is :-)

I also tried the upgrade from nginx-full as I was concerned there might be dependency issues - at least in my silly simple test it worked.

0328462... by Bryce Harrington

  * Dropped:
    - 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]

820981c... by Bryce Harrington

  * Dropped:
    - 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.

c4d65f5... by Bryce Harrington

  * Dropped:
    - 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]

1a14a89... by Bryce Harrington

  * Dropped:
    - d/rules: Enable --with-compat build option for all nginx package
      flavors (LP #1797897)

Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks for the review Christian.

Fwiw, I had set up a previous PPA with all arch's enabled - which built find on all iirc, but then noticed something I needed to change, so I deleted the PPA and made a new one for this MP, but forgot to enable arches on this one.

I need to think more on the upgrade paths and on the Debian forwards, but the remaining changes I've incorporated in my local checkout; I'll re-push for review tomorrow.

Regarding the dropped bits, I have been trying to use andreas' approach to let git-ubuntu generate the changelog, so only put '* Dropped' on one commit, and put all the other drop commits following that. But you're right, this is confusing and error prone, and occurs to me is something git-ubuntu ought to be doing for us since it's within its power. I've redone my git tree to prefix the drop commits with this, and taken a task to add this feature to git-ubuntu.

Revision history for this message
Bryce Harrington (bryce) wrote :

(See LP: #1884861 for the git-ubuntu enhancement idea)

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

ok, thanks for opening the g-u bug - agreed.

I double checked, but there are no changes for re-review yet (as you said).
Waiting for v2 later then ...

9acda50... by Bryce Harrington

  * d/p/nginx-fix-pidfile.patch: Update dep3 with fwd debian link

8cda4da... by Bryce Harrington

merge-changelogs

45ed56b... by Bryce Harrington

reconstruct-changelog

7f105b8... by Bryce Harrington

update-maintainer

8f2387d... by Bryce Harrington

changelog cleanup

Revision history for this message
Bryce Harrington (bryce) wrote :

Branch has been updated for review.

* Forwarded Apport hook to Debian:
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=963668
* Forwarded PID fix to Debian:
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876365
* Updated DEP-3 for nginx-fix-pidfile.patch with the deb bug link
* Dropped extraneous --with-compat change [taken by debian]
* Dropped extraneous iproute2 dependency change [taken by debian]
* Dropped port 80 check [taken by debian]
* Added missing mention of drop of PHP 7.4 path update [taken by debian]
* Revised git history to include explicit ' * Dropped:' prefix for each dropped change
* Other cleanups to git history to facilitate debian/changelog generation
* Created new PPA configured to build against all platforms

PPA: https://launchpad.net/~bryce/+archive/ubuntu/nginx-merge-v1.18.0-3

Hopefully I've covered all your review points (was much to digest, but thanks!)

Regarding the update paths, I had a discussion with teward. We both think things should work without issue. Here's his analysis:

"""
If they used the nginx metapackage that just pulls in nginx-common and nginx-(core|full|light|extras) so it SHOULD work without issue. So to my knowledge if how APT works nginx-full still meets the dep criterion. To my knowledge https://git.launchpad.net/~bryce/ubuntu/+source/nginx/tree/debian/control?h=merge-v1.18.0-3#n34 is where that magic happens and this should Just Work. nginx-full will upgrade to nginx-full and nginx-core will upgrade to nginx-core here in Ubunt. In Debian, nginx-core is new so any upgrade tasks will still meet nginx-full or nginx-light or nginx-extras if they're using nginx metapackage, and flavors will still upgrade to their corresponding flavor.
"""

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Thanks for the updates, cleanups and patch submissions!
Further thanks to talk with teward about it.

It now LGTM, thank you for reading through my wall of text.
+1

review: Approve
Revision history for this message
Thomas Ward (teward) :
review: Approve
Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks! Uploading...

$ git ubuntu tag --upload

$ git push pkg upload/1.18.0-3ubuntu1
Enumerating objects: 70, done.
Counting objects: 100% (70/70), done.
Delta compression using up to 12 threads
Compressing objects: 100% (61/61), done.
Writing objects: 100% (63/63), 19.06 KiB | 1.73 MiB/s, done.
Total 63 (delta 39), reused 2 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/nginx
 * [new tag] upload/1.18.0-3ubuntu1 -> upload/1.18.0-3ubuntu1

$ dput ubuntu ${changes_file}
Checking signature on .changes
gpg: ../nginx_1.18.0-3ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../nginx_1.18.0-3ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading nginx_1.18.0-3ubuntu1.dsc: done.
  Uploading nginx_1.18.0.orig.tar.gz: done.
  Uploading nginx_1.18.0-3ubuntu1.debian.tar.xz: done.
  Uploading nginx_1.18.0-3ubuntu1_source.buildinfo: done.
  Uploading nginx_1.18.0-3ubuntu1_source.changes: done.
Successfully uploaded packages.

I think the warning about the orig is because nginx has been diverged and we're merging at a -3 instead of a -1. I got the email that the upload was accepted to -proposed, will keep an eye on it for transitioning.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

FYI still in proposed

Revision history for this message
Bryce Harrington (bryce) wrote :

Unmerged commits

8f2387d... by Bryce Harrington

changelog cleanup

7f105b8... by Bryce Harrington

update-maintainer

45ed56b... by Bryce Harrington

reconstruct-changelog

8cda4da... by Bryce Harrington

merge-changelogs

1a14a89... by Bryce Harrington

  * Dropped:
    - d/rules: Enable --with-compat build option for all nginx package
      flavors (LP #1797897)

c4d65f5... by Bryce Harrington

  * Dropped:
    - 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]

820981c... by Bryce Harrington

  * Dropped:
    - 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.

0328462... by Bryce Harrington

  * Dropped:
    - 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]

60d258b... by Bryce Harrington

  * Dropped:
    - 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.

c0c6f61... by Bryce Harrington

  * Dropped:
    - debian/tests/control: add nginx-core test.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/apport/source_nginx.py b/debian/apport/source_nginx.py
2new file mode 100644
3index 0000000..aec6e8e
4--- /dev/null
5+++ b/debian/apport/source_nginx.py
6@@ -0,0 +1,19 @@
7+'''
8+apport package hook for nginx packages
9+
10+Copyright (c) 2015, Thomas Ward <teward@ubuntu.com>
11+'''
12+
13+import apport.hookutils
14+import os
15+import subprocess
16+
17+def add_info(report, ui):
18+ if (report['Package'].split()[0] != 'nginx-common'
19+ and report['ProblemType'] == 'Package'
20+ and os.path.isdir('/run/systemd/system')):
21+ report['Journalctl_Nginx.txt'] = apport.hookutils.command_output(
22+ ['journalctl', '-xe', '--unit=nginx.service'])
23+ report['SystemctlStatusFull_Nginx.txt'] = subprocess.Popen(
24+ ['systemctl', '-l', 'status', 'nginx.service'],
25+ stdout=subprocess.PIPE).communicate()[0]
26diff --git a/debian/changelog b/debian/changelog
27index c2bed08..e1c0e33 100644
28--- a/debian/changelog
29+++ b/debian/changelog
30@@ -1,3 +1,56 @@
31+nginx (1.18.0-3ubuntu1) groovy; urgency=medium
32+
33+ * Merge with Debian unstable. Remaining changes:
34+ - d/p/ubuntu-branding.patch: add Ubuntu branding (refreshed)
35+ - d/apport/source_nginx.py: Add apport hooks for additional bug
36+ information gathering.
37+ - d/nginx-common.install: Add install rule for apport hooks.
38+ - d/p/nginx-fix-pidfile.patch: Fix NGINX PIDfile handling to avoid
39+ SystemD race condition - thanks to Tj for the patch. (LP #1581864)
40+ - Drop GeoIP from nginx-core due to demotion of libgeoip
41+ (LP #1861101, LP #1867150):
42+ + d/control: Remove libnginx-mod-http-geoip from nginx-core dependency
43+ + d/rules: Remove the configure line of with-http_geoip_module=dynamic
44+ from the nginx-core build flags, due to demotion of libgeoip and the
45+ removal of the dynamic library from install deps for nginx-core.
46+ * d/a/source_nginx.py: Fix indentation in apport hook
47+ * d/p/nginx-fix-pidfile.patch: Update dep3 with fwd debian link
48+ * Dropped:
49+ - debian/patches/0002-Make-sure-signature-stays-the-same-in-
50+ all-nginx-buil.patch: Refreshed patch - Merge-o-Matic introduced some
51+ fuzz which caused issues.
52+ [ Does not seem necessary ]
53+ - d/control: drop mention of SSL Preread from nginx-full, nginx-extras
54+ [ Previously undocumented ]
55+ - d/gbp.conf: update for 1.12 release
56+ [ Previously undocumented ]
57+ - d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch:
58+ Refresh patch.
59+ [ Previously undocumented ]
60+ - d/{control,rules,nginx-core.*}: add new binary package for main,
61+ nginx-core, which contains only source-tarball-included modules
62+ and no third-party modules.
63+ - debian/tests/control: add nginx-core test.
64+ - Add GeoIP2 third party module to nginx-full and nginx-extras
65+ (LP #1825895). The following is the files list for this:
66+ + d/{control,rules}: Add libnginx-mod-http-geoip2 and corresponding
67+ build rules.
68+ + d/modules/http-geoip2{,/*}: Add geoip2 module from third party git.
69+ + d/copyright: Add relevant copyright lines for GeoIP2 module.
70+ - d/conf/sites-available/default: Update PHP path for PHP 7.4.
71+ [added in 1.17.9-0ubuntu3 taken by Debian in 1.18.0-2]
72+ - d/nginx-full.postinst: Add checks for whether
73+ port 80 is in use or not to determine whether or not to attempt
74+ starting of the NGINX service during install/upgrade.
75+ - d/control: Add dependency from nginx-full on `iproute2` as the
76+ postinst scripts now use `ss` to determine if Port 80 is open
77+ or not.
78+ [Taken by Debian in 1.18.0-2]
79+ - d/rules: Enable --with-compat build option for all nginx package
80+ flavors (LP #1797897)
81+
82+ -- Bryce Harrington <bryce@canonical.com> Wed, 24 Jun 2020 23:15:11 +0000
83+
84 nginx (1.18.0-3) unstable; urgency=medium
85
86 * Source-only upload to allow migration.
87@@ -55,6 +108,225 @@ nginx (1.18.0-1) unstable; urgency=medium
88
89 -- Ondřej Nový <onovy@debian.org> Fri, 29 May 2020 19:03:30 +0200
90
91+nginx (1.17.10-0ubuntu1) focal; urgency=medium
92+
93+ * New upstream release (1.17.9) - full changelog available from
94+ http://nginx.org/en/CHANGES
95+ * Remaining Ubuntu-specific changes:
96+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
97+ - d/{control,rules,nginx-core.*}: add new binary package for main,
98+ nginx-core, which contains only source-tarball-included modules
99+ and no third-party modules.
100+ - debian/tests/control: add nginx-core test.
101+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
102+ information gathering.
103+ - debian/nginx-common.install: Add install rule for apport hooks.
104+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
105+ port 80 is in use or not to determine whether or not to attempt
106+ starting of the NGINX service during install/upgrade
107+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
108+ `iproute2` as the postinst scripts now use `ss` to determine if
109+ Port 80 is open or not.
110+ - d/rules: Enable --with-compat build option for all nginx package
111+ flavors
112+ - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party
113+ module to nginx-full and nginx-extras (and use proper DEP5 syntax for
114+ d/copyright).
115+ - d/control, d/rules: Drop GeoIP from nginx-core due to demotion of
116+ libgeoip.
117+
118+ -- Thomas Ward <teward@ubuntu.com> Tue, 14 Apr 2020 12:53:34 -0400
119+
120+nginx (1.17.9-0ubuntu3) focal; urgency=medium
121+
122+ * d/conf/sites-available/default: Update PHP path for PHP 7.4.
123+
124+ -- Thomas Ward <teward@ubuntu.com> Thu, 26 Mar 2020 10:53:52 -0400
125+
126+nginx (1.17.9-0ubuntu2) focal; urgency=medium
127+
128+ * Drop GeoIP from nginx-core due to demotion of libgeoip (LP: #1861101,
129+ LP: #1867150):
130+ - d/control: Remove libnginx-mod-http-geoip from nginx-core dependency
131+ - d/rules: Remove the configure line of with-http_geoip_module=dynamic
132+ from the nginx-core build flags, due to demotion of libgeoip and the
133+ removal of the dynamic library from install deps for nginx-core.
134+
135+ -- Thomas Ward <teward@ubuntu.com> Wed, 11 Mar 2020 13:41:07 -0400
136+
137+nginx (1.17.9-0ubuntu1) focal; urgency=medium
138+
139+ * New upstream release (1.17.9) - full changelog available from
140+ http://nginx.org/en/CHANGES
141+ * Remaining Ubuntu-specific changes:
142+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
143+ - d/{control,rules,nginx-core.*}: add new binary package for main,
144+ nginx-core, which contains only source-tarball-included modules
145+ and no third-party modules.
146+ - debian/tests/control: add nginx-core test.
147+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
148+ information gathering.
149+ - debian/nginx-common.install: Add install rule for apport hooks.
150+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
151+ port 80 is in use or not to determine whether or not to attempt
152+ starting of the NGINX service during install/upgrade
153+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
154+ `iproute2` as the postinst scripts now use `ss` to determine if
155+ Port 80 is open or not.
156+ - d/rules: Enable --with-compat build option for all nginx package
157+ flavors
158+ - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party
159+ module to nginx-full and nginx-extras (and use proper DEP5 syntax for
160+ d/copyright).
161+
162+ -- Thomas Ward <teward@ubuntu.com> Tue, 03 Mar 2020 11:05:45 -0500
163+
164+nginx (1.17.8-0ubuntu3) focal; urgency=medium
165+
166+ * d/conf/sites-available/default: Indentation consistency.
167+ Fix an indentation issue introduced by 1.17.8-0ubuntu2 to make sure that
168+ indentation in the default config file is consistent.
169+
170+ -- Thomas Ward <teward@ubuntu.com> Wed, 26 Feb 2020 10:35:13 -0500
171+
172+nginx (1.17.8-0ubuntu2) focal; urgency=medium
173+
174+ * d/conf/sites-available/default: Revert changes done in #1743592.
175+ Reverts this change:
176+ - d/conf/sites-available/default: Update default nginx site
177+ configuration file to remove the IPv6 listening line so that servers
178+ running without IPv6 enabled at all on the system will start nginx
179+ properly.
180+
181+ -- Thomas Ward <teward@ubuntu.com> Thu, 20 Feb 2020 13:52:32 -0500
182+
183+nginx (1.17.8-0ubuntu1) focal; urgency=medium
184+
185+ * New upstream release (1.17.8) - full changelog available from
186+ http://nginx.org/en/CHANGES
187+ * Remaining Ubuntu-specific changes:
188+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
189+ - d/{control,rules,nginx-core.*}: add new binary package for main,
190+ nginx-core, which contains only source-tarball-included modules
191+ and no third-party modules.
192+ - debian/tests/control: add nginx-core test.
193+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
194+ information gathering.
195+ - debian/nginx-common.install: Add install rule for apport hooks.
196+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
197+ port 80 is in use or not to determine whether or not to attempt
198+ starting of the NGINX service during install/upgrade
199+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
200+ `iproute2` as the postinst scripts now use `ss` to determine if
201+ Port 80 is open or not.
202+ - d/rules: Enable --with-compat build option for all nginx package
203+ flavors
204+ - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party
205+ module to nginx-full and nginx-extras (and use proper DEP5 syntax for
206+ d/copyright).
207+ - d/conf/sites-available/default: Update default nginx site configuration
208+ file to remove the IPv6 listening line so that servers running without
209+ IPv6 enabled at all on the system will start nginx properly.
210+ (LP: #1743592)
211+
212+ -- Thomas Ward <teward@ubuntu.com> Tue, 18 Feb 2020 19:01:02 -0500
213+
214+nginx (1.17.7-0ubuntu1) focal; urgency=medium
215+
216+ * New upstream release (1.17.7) - full changelog available from
217+ http://nginx.org/en/CHANGES
218+ * Remaining Ubuntu-specific changes:
219+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
220+ - d/{control,rules,nginx-core.*}: add new binary package for main,
221+ nginx-core, which contains only source-tarball-included modules
222+ and no third-party modules.
223+ - debian/tests/control: add nginx-core test.
224+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
225+ information gathering.
226+ - debian/nginx-common.install: Add install rule for apport hooks.
227+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
228+ port 80 is in use or not to determine whether or not to attempt
229+ starting of the NGINX service during install/upgrade
230+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
231+ `iproute2` as the postinst scripts now use `ss` to determine if
232+ Port 80 is open or not.
233+ - d/rules: Enable --with-compat build option for all nginx package
234+ flavors
235+ - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party
236+ module to nginx-full and nginx-extras (and use proper DEP5 syntax for
237+ d/copyright).
238+ - d/conf/sites-available/default: Update default nginx site configuration
239+ file to remove the IPv6 listening line so that servers running without
240+ IPv6 enabled at all on the system will start nginx properly.
241+ (LP: #1743592)
242+
243+
244+ -- Thomas Ward <teward@ubuntu.com> Mon, 30 Dec 2019 13:02:58 -0500
245+
246+nginx (1.17.6-0ubuntu1) focal; urgency=medium
247+
248+ * New upstream release (1.17.6) - full changelog available from
249+ http://nginx.org/en/CHANGES
250+ * Remaining Ubuntu-specific changes:
251+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
252+ - d/{control,rules,nginx-core.*}: add new binary package for main,
253+ nginx-core, which contains only source-tarball-included modules
254+ and no third-party modules.
255+ - debian/tests/control: add nginx-core test.
256+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
257+ information gathering.
258+ - debian/nginx-common.install: Add install rule for apport hooks.
259+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
260+ port 80 is in use or not to determine whether or not to attempt
261+ starting of the NGINX service during install/upgrade
262+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
263+ `iproute2` as the postinst scripts now use `ss` to determine if
264+ Port 80 is open or not.
265+ - d/rules: Enable --with-compat build option for all nginx package
266+ flavors
267+ - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party
268+ module to nginx-full and nginx-extras (and use proper DEP5 syntax for
269+ d/copyright).
270+ - d/conf/sites-available/default: Update default nginx site configuration
271+ file to remove the IPv6 listening line so that servers running without
272+ IPv6 enabled at all on the system will start nginx properly.
273+ (LP: #1743592)
274+
275+
276+ -- Thomas Ward <teward@ubuntu.com> Tue, 19 Nov 2019 10:34:14 -0500
277+
278+nginx (1.17.5-0ubuntu1) focal; urgency=medium
279+
280+ * New upstream release (1.17.5) - full changelog available from
281+ http://nginx.org/en/CHANGES
282+ * Remaining Ubuntu-specific changes:
283+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
284+ - d/{control,rules,nginx-core.*}: add new binary package for main,
285+ nginx-core, which contains only source-tarball-included modules
286+ and no third-party modules.
287+ - debian/tests/control: add nginx-core test.
288+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
289+ information gathering.
290+ - debian/nginx-common.install: Add install rule for apport hooks.
291+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
292+ port 80 is in use or not to determine whether or not to attempt
293+ starting of the NGINX service during install/upgrade
294+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
295+ `iproute2` as the postinst scripts now use `ss` to determine if
296+ Port 80 is open or not.
297+ - d/rules: Enable --with-compat build option for all nginx package
298+ flavors
299+ - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party
300+ module to nginx-full and nginx-extras (and use proper DEP5 syntax for
301+ d/copyright).
302+ * New Ubuntu-specific changes:
303+ - d/conf/sites-available/default: Update default nginx site configuration
304+ file to remove the IPv6 listening line so that servers running without
305+ IPv6 enabled at all on the system will start nginx properly.
306+ (LP: #1743592)
307+
308+ -- Thomas Ward <teward@ubuntu.com> Fri, 01 Nov 2019 11:55:10 -0400
309+
310 nginx (1.16.1-3) unstable; urgency=high
311
312 * Handle CVE-2019-20372, error page request smuggling
313@@ -79,6 +351,294 @@ nginx (1.16.1-1) unstable; urgency=medium
314
315 -- Christos Trochalakis <ctrochalakis@debian.org> Mon, 09 Sep 2019 18:24:43 +0300
316
317+nginx (1.16.1-0ubuntu3) focal; urgency=medium
318+
319+ * No-change rebuild for the perl update.
320+
321+ -- Matthias Klose <doko@ubuntu.com> Fri, 18 Oct 2019 19:37:10 +0000
322+
323+nginx (1.16.1-0ubuntu2) eoan; urgency=medium
324+
325+ * d/conf/sites-available/default: Update PHP referred to in the
326+ example in the default configuration to PHP 7.2.
327+ (LP: #1831748)
328+
329+ -- Thomas Ward <teward@ubuntu.com> Thu, 15 Aug 2019 12:01:39 -0400
330+
331+nginx (1.16.1-0ubuntu1) eoan; urgency=medium
332+
333+ * New upstream release (1.16.1) - full changelog available from
334+ http://nginx.org/en/CHANGES-1.16
335+ * This patch contains security patches only.
336+ * Security content in this version:
337+ - When using HTTP/2 a client might cause excessive memory consumption
338+ and CPU usage (CVE-2019-9511. CVE-2019-9513, CVE-2019-9516)
339+
340+ -- Thomas Ward <teward@ubuntu.com> Tue, 13 Aug 2019 13:08:03 -0400
341+
342+nginx (1.16.0-0ubuntu2) eoan; urgency=medium
343+
344+ * d/patches/nginx-fix-pidfile.patch: Fix NGINX PIDfile handling to avoid
345+ SystemD race condition - thanks to Tj for the patch. (LP: #1581864)
346+
347+ -- Thomas Ward <teward@ubuntu.com> Tue, 04 Jun 2019 11:43:30 -0400
348+
349+nginx (1.16.0-0ubuntu1) eoan; urgency=medium
350+
351+ * New upstream release (1.16.0) - full changelog available from
352+ http://nginx.org/en/CHANGES
353+ * Remaining Ubuntu-specific changes:
354+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
355+ - d/{control,rules,nginx-core.*}: add new binary package for main,
356+ nginx-core, which contains only source-tarball-included modules
357+ and no third-party modules.
358+ - debian/tests/control: add nginx-core test.
359+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
360+ information gathering.
361+ - debian/nginx-common.install: Add install rule for apport hooks.
362+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
363+ port 80 is in use or not to determine whether or not to attempt
364+ starting of the NGINX service during install/upgrade
365+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
366+ `iproute2` as the postinst scripts now use `ss` to determine if
367+ Port 80 is open or not.
368+ - d/rules: Enable --with-compat build option for all nginx package
369+ flavors
370+ - d/{control,rules,copyright,modules/http-geoip2*}: Add GeoIP2 third party
371+ module to nginx-full and nginx-extras
372+
373+ -- Thomas Ward <teward@ubuntu.com> Mon, 29 Apr 2019 12:31:39 -0400
374+
375+nginx (1.15.12-0ubuntu1) eoan; urgency=medium
376+
377+ * New upstream release (1.15.12) - full changelog available from
378+ http://nginx.org/en/CHANGES
379+ * Remaining Ubuntu-specific changes:
380+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
381+ - d/{control,rules,nginx-core.*}: add new binary package for main,
382+ nginx-core, which contains only source-tarball-included modules
383+ and no third-party modules.
384+ - debian/tests/control: add nginx-core test.
385+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
386+ information gathering.
387+ - debian/nginx-common.install: Add install rule for apport hooks.
388+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
389+ port 80 is in use or not to determine whether or not to attempt
390+ starting of the NGINX service during install/upgrade
391+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
392+ `iproute2` as the postinst scripts now use `ss` to determine if
393+ Port 80 is open or not.
394+ - d/rules: Enable --with-compat build option for all nginx package
395+ flavors
396+ * Add GeoIP2 third party module to nginx-full and nginx-extras
397+ (LP: #1825895). The following is the files list for this:
398+ - d/{control,rules}: Add libnginx-mod-http-geoip2 and corresponding build
399+ rules.
400+ - d/modules/http-geoip2{,/*}: Add geoip2 module from third party git.
401+ - d/copyright: Add relevant copyright lines for GeoIP2 module.
402+
403+ -- Thomas Ward <teward@ubuntu.com> Mon, 22 Apr 2019 17:59:46 -0400
404+
405+nginx (1.15.8-0ubuntu1) disco; urgency=medium
406+
407+ * New upstream release (1.15.8) - full changelog available from
408+ http://nginx.org/en/CHANGES
409+ * Remaining Ubuntu-specific changes:
410+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
411+ - d/{control,rules,nginx-core.*}: add new binary package for main,
412+ nginx-core, which contains only source-tarball-included modules
413+ and no third-party modules.
414+ - debian/tests/control: add nginx-core test.
415+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
416+ information gathering.
417+ - debian/nginx-common.install: Add install rule for apport hooks.
418+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
419+ port 80 is in use or not to determine whether or not to attempt
420+ starting of the NGINX service during install/upgrade
421+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
422+ `iproute2` as the postinst scripts now use `ss` to determine if
423+ Port 80 is open or not.
424+ - d/rules: Enable --with-compat build option for all nginx package
425+ flavors
426+
427+ -- Thomas Ward <teward@ubuntu.com> Fri, 01 Feb 2019 20:21:45 -0500
428+
429+nginx (1.15.7-0ubuntu1) disco; urgency=medium
430+
431+ * New upstream release (1.15.7) - full changelog available from
432+ http://nginx.org/en/CHANGES
433+ * Remaining Ubuntu-specific changes:
434+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
435+ - d/{control,rules,nginx-core.*}: add new binary package for main,
436+ nginx-core, which contains only source-tarball-included modules
437+ and no third-party modules.
438+ - debian/tests/control: add nginx-core test.
439+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
440+ information gathering.
441+ - debian/nginx-common.install: Add install rule for apport hooks.
442+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
443+ port 80 is in use or not to determine whether or not to attempt
444+ starting of the NGINX service during install/upgrade
445+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
446+ `iproute2` as the postinst scripts now use `ss` to determine if
447+ Port 80 is open or not.
448+ - d/rules: Enable --with-compat build option for all nginx package
449+ flavors (LP: #1797897)
450+
451+ -- Thomas Ward <teward@ubuntu.com> Tue, 27 Nov 2018 10:28:55 -0500
452+
453+nginx (1.15.6-0ubuntu2) disco; urgency=medium
454+
455+ * Apply a Debian packaging change to Ubuntu package for config parity:
456+ * d/conf/snippets/fastcgi-php.conf: Adjust fastcgi_split_path_info
457+ snippet to handle the /example.php/ case. (Debian bug 911398)
458+
459+ -- Thomas Ward <teward@ubuntu.com> Fri, 23 Nov 2018 10:56:21 -0500
460+
461+nginx (1.15.6-0ubuntu1) disco; urgency=medium
462+
463+ * New upstream release (1.15.6) - full changelog available from
464+ http://nginx.org/en/CHANGES
465+ * Remaining Ubuntu-specific changes:
466+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
467+ - d/{control,rules,nginx-core.*}: add new binary package for main,
468+ nginx-core, which contains only source-tarball-included modules
469+ and no third-party modules.
470+ - debian/tests/control: add nginx-core test.
471+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
472+ information gathering.
473+ - debian/nginx-common.install: Add install rule for apport hooks.
474+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
475+ port 80 is in use or not to determine whether or not to attempt
476+ starting of the NGINX service during install/upgrade
477+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
478+ `iproute2` as the postinst scripts now use `ss` to determine if
479+ Port 80 is open or not.
480+ - d/rules: Enable --with-compat build option for all nginx package
481+ flavors (LP: #1797897)
482+
483+ -- Thomas Ward <teward@ubuntu.com> Tue, 13 Nov 2018 10:10:45 -0500
484+
485+nginx (1.15.5-0ubuntu4) disco; urgency=medium
486+
487+ * No-change rebuild against libhiredis0.14
488+
489+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 12 Nov 2018 08:47:44 +0000
490+
491+nginx (1.15.5-0ubuntu3) disco; urgency=medium
492+
493+ * No-change rebuild for the perl 5.28 transition.
494+
495+ -- Adam Conrad <adconrad@ubuntu.com> Fri, 02 Nov 2018 19:02:18 -0600
496+
497+nginx (1.15.5-0ubuntu2) cosmic; urgency=medium
498+
499+ * d/conf/nginx.conf: Enable TLSv1.3 by default by adding TLSv1.3 to
500+ the ssl_protocols line. (SRU, LP: #1800214)
501+
502+ -- Thomas Ward <teward@ubuntu.com> Fri, 26 Oct 2018 15:25:59 -0400
503+
504+nginx (1.15.5-0ubuntu1) cosmic; urgency=medium
505+
506+ * This is a bugfixes-only upstream micro release, and thus is a bugfixes-
507+ only version change. (LP: #1795690)
508+ * New upstream release (1.15.5) - full changelog available from
509+ http://nginx.org/en/CHANGES
510+ * Remaining Ubuntu-specific changes:
511+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
512+ - d/{control,rules,nginx-core.*}: add new binary package for main,
513+ nginx-core, which contains only source-tarball-included modules
514+ and no third-party modules.
515+ - debian/tests/control: add nginx-core test.
516+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
517+ information gathering.
518+ - debian/nginx-common.install: Add install rule for apport hooks.
519+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
520+ port 80 is in use or not to determine whether or not to attempt
521+ starting of the NGINX service during install/upgrade
522+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
523+ `iproute2` as the postinst scripts now use `ss` to determine if
524+ Port 80 is open or not.
525+
526+ -- Thomas Ward <teward@ubuntu.com> Tue, 02 Oct 2018 11:31:05 -0400
527+
528+nginx (1.15.4-0ubuntu1) cosmic; urgency=medium
529+
530+ * New upstream release (1.15.4) - full changelog available from
531+ http://nginx.org/en/CHANGES (LP: #1794321)
532+ * Remaining Ubuntu-specific changes:
533+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
534+ - d/{control,rules,nginx-core.*}: add new binary package for main,
535+ nginx-core, which contains only source-tarball-included modules
536+ and no third-party modules.
537+ - debian/tests/control: add nginx-core test.
538+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
539+ information gathering.
540+ - debian/nginx-common.install: Add install rule for apport hooks.
541+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
542+ port 80 is in use or not to determine whether or not to attempt
543+ starting of the NGINX service during install/upgrade
544+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
545+ `iproute2` as the postinst scripts now use `ss` to determine if
546+ Port 80 is open or not.
547+
548+ -- Thomas Ward <teward@ubuntu.com> Tue, 25 Sep 2018 11:59:46 -0400
549+
550+nginx (1.15.3-0ubuntu1) cosmic; urgency=medium
551+
552+ * New upstream release (1.15.3) - full changelog available from
553+ http://nginx.org/en/CHANGES (LP: #1790149)
554+ * Remaining Ubuntu-specific changes:
555+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
556+ - d/{control,rules,nginx-core.*}: add new binary package for main,
557+ nginx-core, which contains only source-tarball-included modules
558+ and no third-party modules.
559+ - debian/tests/control: add nginx-core test.
560+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
561+ information gathering.
562+ - debian/nginx-common.install: Add install rule for apport hooks.
563+ - d/nginx-{core,light,full,extras}.postinst: Add checks for whether
564+ port 80 is in use or not to determine whether or not to attempt
565+ starting of the NGINX service during install/upgrade
566+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
567+ `iproute2` as the postinst scripts now use `ss` to determine if
568+ Port 80 is open or not.
569+
570+ -- Thomas Ward <teward@ubuntu.com> Fri, 31 Aug 2018 09:52:34 -0400
571+
572+nginx (1.15.2-0ubuntu2) cosmic; urgency=medium
573+
574+ * d/control: Add `iproute2` dependencies for the binary
575+ nginx-{core,light,full,extras} packages, they got missed in the
576+ application of the diff in 1.15.2-0ubuntu1. (LP: #1782226)
577+
578+ -- Thomas Ward <teward@ubuntu.com> Tue, 21 Aug 2018 12:07:59 -0400
579+
580+nginx (1.15.2-0ubuntu1) cosmic; urgency=medium
581+
582+ * Switch to track NGINX Mainline for 18.10 (and 19.04) releases after
583+ discussion with Server team members. Mainline version is 1.15.2
584+ * Upstream changelogs for 1.15.2 are available at
585+ http://nginx.org/en/CHANGES
586+ * Remaining Ubuntu-specific changes:
587+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
588+ - d/{control,rules,nginx-core.*}: add new binary package for main,
589+ nginx-core, which contains only source-tarball-included modules
590+ and no third-party modules.
591+ - debian/tests/control: add nginx-core test.
592+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
593+ information gathering.
594+ - debian/nginx-common.install: Add install rule for apport hooks.
595+ * Additional Ubuntu only changes (LP: #1782226):
596+ - d/nginx{core,light,full,extras}.postinst: Add checks for whether
597+ port 80 is in use or not to determine whether or not to attempt
598+ starting of the NGINX service during install/upgrade.
599+ - d/control: Add dependencies to nginx-{core,light,full,extras} on
600+ `iproute2` as the postinst scripts now use `ss` to determine if
601+ Port 80 is open or not.
602+
603+ -- Thomas Ward <teward@ubuntu.com> Sun, 19 Aug 2018 12:16:48 -0400
604+
605 nginx (1.14.2-3) unstable; urgency=high
606
607 * Backport upstream fixes for 3 CVEs (Closes: #935037)
608@@ -145,18 +705,85 @@ nginx (1.14.0-1) unstable; urgency=medium
609
610 -- Christos Trochalakis <ctrochalakis@debian.org> Fri, 31 Aug 2018 15:28:04 +0300
611
612+nginx (1.14.0-0ubuntu2) cosmic; urgency=medium
613+
614+ * debian/nginx-core.postinst: Make nginx-*.postinst use invoke-rc.d.
615+ (LP: #1578344)
616+
617+ -- Thomas Ward <teward@ubuntu.com> Tue, 15 May 2018 11:14:02 -0400
618+
619+nginx (1.14.0-0ubuntu1) bionic; urgency=medium
620+
621+ * New upstream stable release (1.14.0)
622+ * Upstream changelogs can be found at http://nginx.org/en/CHANGES-1.14
623+ * There are no functional changes or new features in this release,
624+ and the only change is a version number change.
625+ * Remaining Ubuntu-specific changes:
626+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
627+ - d/{control,rules,nginx-core.*}: add new binary package for main,
628+ nginx-core, which contains only source-tarball-included modules
629+ and no third-party modules.
630+ - debian/tests/control: add nginx-core test.
631+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
632+ information gathering.
633+ - debian/nginx-common.install: Add install rule for apport hooks.
634+
635+ -- Thomas Ward <teward@ubuntu.com> Tue, 17 Apr 2018 12:17:58 -0400
636+
637 nginx (1.13.12-1) unstable; urgency=medium
638
639 * New upstream version
640
641 -- Christos Trochalakis <ctrochalakis@debian.org> Wed, 11 Apr 2018 08:19:23 +0300
642
643+nginx (1.13.12-0ubuntu1) bionic; urgency=medium
644+
645+ * New upstream releases (1.13.11, 1.13.12)
646+ * Upstream changelogs can be found at https://nginx.org/en/CHANGES
647+ * Remaining Ubuntu-specific changes:
648+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
649+ - d/{control,rules,nginx-core.*}: add new binary package for main,
650+ nginx-core, which contains only source-tarball-included modules
651+ and no third-party modules.
652+ - debian/tests/control: add nginx-core test.
653+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
654+ information gathering.
655+ - debian/nginx-common.install: Add install rule for apport hooks.
656+
657+ -- Thomas Ward <teward@ubuntu.com> Mon, 16 Apr 2018 11:43:01 -0400
658+
659 nginx (1.13.11-1) unstable; urgency=medium
660
661 * New upstream version
662
663 -- Christos Trochalakis <ctrochalakis@debian.org> Tue, 10 Apr 2018 14:55:11 +0300
664
665+nginx (1.13.10-1ubuntu1) bionic; urgency=medium
666+
667+ * Merge with Debian unstable. Remaining changes:
668+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
669+ - d/{control,rules,nginx-core.*}: add new binary package for main,
670+ nginx-core, which contains only source-tarball-included modules
671+ and no third-party modules.
672+ - debian/tests/control: add nginx-core test.
673+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
674+ information gathering.
675+ - debian/nginx-common.install: Add install rule for apport hooks.
676+ * Drop:
677+ - debian/patches/0002-Make-sure-signature-stays-the-same-in-
678+ all-nginx-buil.patch: Refreshed patch - Merge-o-Matic introduced some
679+ fuzz which caused issues.
680+ [ Does not seem necessary ]
681+ - d/control: drop mention of SSL Preread from nginx-full, nginx-extras
682+ [ Previously undocumented ]
683+ - d/gbp.conf: update for 1.12 release
684+ [ Previously undocumented ]
685+ - d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch:
686+ Refresh patch.
687+ [ Previously undocumented ]
688+
689+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com> Thu, 05 Apr 2018 15:43:49 -0700
690+
691 nginx (1.13.10-1) unstable; urgency=medium
692
693 * New upstream version
694@@ -202,6 +829,32 @@ nginx (1.13.7-1) unstable; urgency=medium
695
696 -- Christos Trochalakis <ctrochalakis@debian.org> Thu, 14 Dec 2017 11:04:36 +0200
697
698+nginx (1.13.6-2ubuntu2) bionic; urgency=high
699+
700+ * No change rebuild against openssl1.1.
701+
702+ -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 05 Feb 2018 16:51:17 +0000
703+
704+nginx (1.13.6-2ubuntu1) bionic; urgency=low
705+
706+ * Merge from Debian unstable. Remaining changes:
707+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
708+ - d/{control,rules,nginx-core.*}: add new binary package for main,
709+ nginx-core, which contains only source-tarball-included modules
710+ and no third-party modules.
711+ - debian/tests/control: add nginx-core test.
712+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
713+ information gathering.
714+ - debian/nginx-common.install: Add install rule for apport hooks.
715+ - debian/rules: Alter build flags for cflags and ldflags to fix known
716+ fPIE / fPIC compilation issues (see nginx PPA bug for more details
717+ and information, LP: #1657596)
718+ - debian/patches/0002-Make-sure-signature-stays-the-same-in-
719+ all-nginx-buil.patch: Refreshed patch - Merge-o-Matic introduced some
720+ fuzz which caused issues.
721+
722+ -- Thomas Ward <teward@ubuntu.com> Tue, 12 Dec 2017 12:15:30 -0500
723+
724 nginx (1.13.6-2) unstable; urgency=medium
725
726 * rtmp: Ship docs & examples (Closes: #878368)
727@@ -289,6 +942,37 @@ nginx (1.13.0-1) experimental; urgency=medium
728
729 -- Christos Trochalakis <ctrochalakis@debian.org> Wed, 10 May 2017 11:40:38 +0300
730
731+nginx (1.12.1-0ubuntu2) artful; urgency=medium
732+
733+ * No-change rebuild for perl 5.26.0.
734+
735+ -- Matthias Klose <doko@ubuntu.com> Wed, 26 Jul 2017 20:11:43 +0000
736+
737+nginx (1.12.1-0ubuntu1) artful; urgency=medium
738+
739+ * New upstream release (1.12.1) - full changelog available at upstream
740+ website - http://nginx.org/en/CHANGES-1.12
741+ * This release is a security patch micro-release from Upstream.
742+ * This package contains security content to fix the following CVEs:
743+ * CVE-2017-7529: A security issue was identified in nginx range filter.
744+ A specially crafted request might result in an integer overflow and
745+ incorrect processing of ranges, potentially resulting in sensitive
746+ information leak. (Closes LP: #1704151)
747+ * Additional changes:
748+ * d/patches/ubuntu-branding.patch: Refreshed Ubuntu Branding patch.
749+
750+ -- Thomas Ward <teward@ubuntu.com> Sat, 15 Jul 2017 12:40:15 -0400
751+
752+nginx (1.12.0-1ubuntu1) artful; urgency=medium
753+
754+ * Merge from Debian Experimental (1.12.0-1, via snapshots.debian.org)
755+ * All Ubuntu-specific changes from Ubuntu 1.12.0-0ubuntu1 were retained.
756+ * Remaining changes:
757+ * d/tests/control: Specify nginx-core flavor tests.
758+ * This merge closes the merge request on Launchpad. (LP: #1704020)
759+
760+ -- Thomas Ward <teward@ubuntu.com> Wed, 12 Jul 2017 19:53:24 -0400
761+
762 nginx (1.12.0-1) experimental; urgency=medium
763
764 [ Michael Lustfield ]
765@@ -309,6 +993,90 @@ nginx (1.12.0-1) experimental; urgency=medium
766
767 -- Christos Trochalakis <ctrochalakis@debian.org> Fri, 05 May 2017 11:16:30 +0300
768
769+nginx (1.12.0-0ubuntu1) artful; urgency=medium
770+
771+ * New upstream release: 1.12.0 Stable branch.
772+ * All remaining Ubuntu-specific and Debian-specific changes remain
773+ in place with this upload, the upstream version and code are the
774+ only bits that have been updated, except where indicated below.
775+ * Remaining changes:
776+ - d/modules/nginx-upload-progress/config: Apply upstream patch to
777+ fix an issue where the module does not properly function due to
778+ the wrong module type being set; this prevented the module from
779+ working when built. (LP: #1673056)
780+ - d/patches: The following patches were dropped from the package
781+ because the changes from the patches are already incorporated
782+ in 1.12.0:
783+ - 0004-SSL-error-messages-style.patch
784+ - 0005-SSL-style.patch
785+ - 0006-SSL-support-for-multiple-curves-ticket-885.patch
786+ - d/patches/perl-use-dpkg-buildflags.patch: Refreshed patch to
787+ remove fuzz from the patch.
788+ - d/modules/nginx-echo: Apply upstream diff/patch to fix an FTBFS
789+ - d/modules/nginx-lua: Apply upstream diff/patch to fix an FTBFS
790+ - d/modules/nginx-upstream-fair: Apply diff/patch from the Debian
791+ package maintainers' git repository to not use default_port to
792+ fix an FTBFS. (This will eventually be in Debian, and will get
793+ merged in then as well).
794+
795+ -- Thomas Ward <teward@ubuntu.com> Wed, 26 Apr 2017 12:02:33 -0400
796+
797+nginx (1.12.0-1) UNRELEASED; urgency=medium
798+
799+ [ Michael Lustfield ]
800+ * debian/rules:
801+ - Configure build flags to work with other arches and downstreams.
802+ Thanks to Thomas Ward.
803+
804+ [ Christos Trochalakis ]
805+ * New upstream release.
806+ * Patch nginx-upstream-fair to build against nginx 1.11.6.
807+ * Patch nginx-lua to build against nginx 1.11.11.
808+ * Patch nginx-echo to build against nginx 1.11.11.
809+ * Drop curve list patch, it's included upstream.
810+ * Drop perl build flags patch, it is now handled upstream.
811+ * Enable SSL Preread builtin module on nginx-full & nginx-extras.
812+ (Closes: #854214)
813+ * Switch to debhelper 10, no changes needed.
814+
815+ -- Christos Trochalakis <ctrochalakis@debian.org> Fri, 28 Apr 2017 11:14:41 +0300
816+
817+nginx (1.10.3-1ubuntu3) zesty; urgency=medium
818+
819+ * debian/tests/control: Remove the 'ec-x25519' test stanzas from the
820+ declarations of tests to run. This test requires OpenSSL >= 1.1.0
821+ to support the X25519 ECDH curve, and we do not have OpenSSL 1.1.0.
822+ This delta can be ***dropped*** when we do have OpenSSL >= 1.1.0.
823+ - This fixes the autopkgtests, of which the Debian merge introduced
824+ a regression due to the ec-x25519 test.
825+
826+ -- Thomas Ward <teward@ubuntu.com> Mon, 27 Feb 2017 19:51:57 -0500
827+
828+nginx (1.10.3-1ubuntu2) zesty; urgency=low
829+
830+ * debian/*.save: Junk .save left in the packaging, remove these.
831+
832+ -- Thomas Ward <teward@ubuntu.com> Thu, 16 Feb 2017 15:39:51 -0500
833+
834+nginx (1.10.3-1ubuntu1) zesty; urgency=medium
835+
836+ * Merge from Debian unstable (note: 1.10.3 already was merged, but 1.10.3
837+ packaging changes in Debian were not). Remaining changes are as
838+ follows: (LP: #1664652)
839+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
840+ - d/{control,rules,nginx-core.*}: add new binary package for main,
841+ nginx-core, which contains only source-tarball-included modules
842+ and no third-party modules.
843+ - debian/tests/control: add nginx-core test.
844+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
845+ information gathering.
846+ - debian/nginx-common.install: Add install rule for apport hooks.
847+ - debian/rules: Alter build flags for cflags and ldflags to fix known
848+ fPIE / fPIC compilation issues (see nginx PPA bug for more details
849+ and information, LP: #1657596)
850+
851+ -- Thomas Ward <teward@ubuntu.com> Thu, 16 Feb 2017 15:29:40 -0500
852+
853 nginx (1.10.3-1) unstable; urgency=medium
854
855 * New upstream release. (Closes: #855113)
856@@ -317,6 +1085,24 @@ nginx (1.10.3-1) unstable; urgency=medium
857
858 -- Christos Trochalakis <ctrochalakis@debian.org> Wed, 15 Feb 2017 09:58:13 +0200
859
860+nginx (1.10.3-0ubuntu2) zesty; urgency=low
861+
862+ * Merge from Debian unstable (nginx version there is 1.10.2-4). Remaining
863+ changes: (LP: #1664652)
864+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
865+ - d/{control,rules,nginx-core.*}: add new binary package for main,
866+ nginx-core, which contains only source-tarball-included modules
867+ and no third-party modules.
868+ - debian/tests/control: add nginx-core test.
869+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
870+ information gathering.
871+ - debian/nginx-common.install: Add install rule for apport hooks.
872+ - debian/rules: Alter build flags for cflags and ldflags to fix known
873+ fPIE / fPIC compilation issues (see nginx PPA bug for more details
874+ and information, LP: #1657596)
875+
876+ -- Thomas Ward <teward@ubuntu.com> Tue, 14 Feb 2017 17:47:00 -0500
877+
878 nginx (1.10.2-4) unstable; urgency=medium
879
880 * Switch module reloading logic to dpkg triggers.
881@@ -389,6 +1175,18 @@ nginx (1.10.2-1) unstable; urgency=high
882
883 -- Christos Trochalakis <yatiohi@ideopolis.gr> Sat, 29 Oct 2016 08:45:09 +0300
884
885+nginx (1.10.2-0ubuntu1) zesty; urgency=medium
886+
887+ * New upstream release (1.10.2) - full changelog available at upstream
888+ website - http://nginx.org/en/CHANGES-1.10 - upstream release date
889+ was 18 Oct 2016
890+ * All other changes from 1.10.1-0ubuntu1 through 1.10.1-0ubuntu5 remain
891+ included
892+ * debian/patches/ubuntu-branding.patch:
893+ - Refreshed Ubuntu Branding patch.
894+
895+ -- Thomas Ward <teward@ubuntu.com> Thu, 15 Dec 2016 11:23:43 -0500
896+
897 nginx (1.10.1-3) unstable; urgency=medium
898
899 * debian/control:
900@@ -450,6 +1248,58 @@ nginx (1.10.1-1) unstable; urgency=medium
901
902 -- Christos Trochalakis <yatiohi@ideopolis.gr> Tue, 31 May 2016 22:01:25 +0300
903
904+nginx (1.10.1-0ubuntu5) zesty; urgency=medium
905+
906+ * debian/nginx-common.config:
907+ - Fix the return code so the script does not exit during version
908+ string comparisons.
909+ - Also update the version string to compare with (for zesty only)
910+
911+ -- Thomas Ward <teward@ubuntu.com> Thu, 27 Oct 2016 10:48:45 -0400
912+
913+nginx (1.10.1-0ubuntu4) zesty; urgency=medium
914+
915+ * debian/nginx-common.config:
916+ - Fix an issue with the incorrect version numbers being compared
917+ during configuration; this was something I missed when reviewing
918+ the package for uploading previously. (LP: #1637058)
919+
920+ -- Thomas Ward <teward@ubuntu.com> Thu, 27 Oct 2016 08:45:40 -0400
921+
922+nginx (1.10.1-0ubuntu3) zesty; urgency=medium
923+
924+ [ Christos Trochalakis ]
925+ * debian/nginx-common.postinst:
926+ + Secure log file handling (owner & permissions) against privilege
927+ escalation attacks. /var/log/nginx is now owned by root:adm.
928+ Thanks Dawid Golunski (http://legalhackers.com) for the report.
929+ Changing /var/log/nginx permissions effectively reopens #701112,
930+ since log files can be world-readable. This is a trade-off until
931+ a better log opening solution is implemented upstream (trac:376).
932+ * debian/control:
933+ Don't allow building against liblua5.1-0-dev on architectures
934+ that libluajit is available.
935+
936+ -- Thomas Ward <teward@ubuntu.com> Tue, 25 Oct 2016 17:03:54 -0400
937+
938+nginx (1.10.1-0ubuntu2) zesty; urgency=medium
939+
940+ * No-change rebuild for perl 5.24 transition
941+
942+ -- Iain Lane <iain@orangesquash.org.uk> Mon, 24 Oct 2016 10:36:19 +0100
943+
944+nginx (1.10.1-0ubuntu1) yakkety; urgency=medium
945+
946+ * New upstream release (1.10.1) - full changelog available at upstream
947+ website - http://nginx.org/en/CHANGES-1.10.
948+ * Update done to address the following security issues:
949+ - [CVE-2016-4450] NULL pointer dereference while writing client
950+ request body. (LP: #1587577)
951+ * Additional changes:
952+ * debian/patches/ubuntu-branding.patch: Refreshed Ubuntu Branding patch.
953+
954+ -- Thomas Ward <teward@ubuntu.com> Tue, 31 May 2016 19:09:33 -0400
955+
956 nginx (1.10.0-1) unstable; urgency=medium
957
958 [ Christos Trochalakis ]
959@@ -457,6 +1307,30 @@ nginx (1.10.0-1) unstable; urgency=medium
960
961 -- Christos Trochalakis <yatiohi@ideopolis.gr> Fri, 29 Apr 2016 10:31:46 +0300
962
963+nginx (1.10.0-0ubuntu1) yakkety; urgency=medium
964+
965+ * New upstream release (1.10.0) - full changelog available at upstream
966+ website - http://nginx.org/en/CHANGES-1.10 (LP: #1575217)
967+ * All Ubuntu specific changes from 1.9.15-0ubuntu1 remain included.
968+ * Additional changes:
969+ * debian/patches/ubuntu-branding.patch: Refreshed Ubuntu Branding patch.
970+
971+ -- Thomas Ward <teward@ubuntu.com> Tue, 26 Apr 2016 10:24:23 -0400
972+
973+nginx (1.9.15-0ubuntu1) xenial-proposed; urgency=medium
974+
975+ * New upstream release (1.9.15) - full changelog available at upstream
976+ website - http://nginx.org/en/CHANGES (LP: #1572223)
977+ * All Ubuntu specific changes from 1.1.14-0ubuntu1, except noted below,
978+ remain included in this upload.
979+ * Remaining changes:
980+ * debian/control: Re-add libluajit-5.1-dev build-dependency, as it will
981+ only affect nginx-extras which is in Universe. This reduces the merge
982+ delta between Ubuntu and Debian slightly, as well. (LP: #1571444)
983+ * debian/patches/ubuntu-branding.patch: Refresh Ubuntu Branding patch.
984+
985+ -- Thomas Ward <teward@ubuntu.com> Mon, 18 Apr 2016 15:39:08 -0400
986+
987 nginx (1.9.14-2) unstable; urgency=medium
988
989 [ Christos Trochalakis ]
990@@ -500,6 +1374,84 @@ nginx (1.9.14-1) unstable; urgency=medium
991
992 -- Christos Trochalakis <yatiohi@ideopolis.gr> Tue, 19 Apr 2016 11:05:35 +0300
993
994+nginx (1.9.14-0ubuntu1) xenial-proposed; urgency=medium
995+
996+ * New upstream release (1.9.14) - full changelog available at upstream
997+ website - htp://nginx.org/en/CHANGES (LP: #1566392)
998+ * All Ubuntu specific changes from 1.9.13-0ubuntu1, except noted below,
999+ remain included in this upload.
1000+ * Remaining changes:
1001+ * Enable HTTP/2 module for nginx-full, nginx-extras, and nginx-core
1002+ (LP: #1565043)
1003+ - debian/rules: Enable HTTP/2 module building in flavor rules
1004+ - debian/control: Add HTTP/2 module to package descriptions.
1005+ * debian/patches/ubuntu-branding.patch: Refresh Ubuntu Branding patch.
1006+
1007+ -- Thomas Ward <teward@ubuntu.com> Fri, 01 Apr 2016 14:23:47 -0400
1008+
1009+nginx (1.9.13-0ubuntu1) xenial-proposed; urgency=medium
1010+
1011+ * New upstream release (1.9.13) - full changelog available at upstream
1012+ website - http://nginx.org/en/CHANGES (LP: #1563393)
1013+ * All Ubuntu specific changes from 1.9.12-0ubuntu1 remain included in
1014+ this upload.
1015+ * debian/patches/ubuntu-branding.patch: Refresh Ubuntu Branding patch.
1016+
1017+ -- Thomas Ward <teward@ubuntu.com> Tue, 29 Mar 2016 18:47:36 -0400
1018+
1019+nginx (1.9.12-0ubuntu1) xenial; urgency=medium
1020+
1021+ * New upstream release (1.9.12) - full changelog available at upstream
1022+ website - http://nginx.org/en/CHANGES (LP: #1549347)
1023+ * All Ubuntu specific changes from 1.9.11-0ubuntu1 and -0ubuntu2 remain
1024+ included in this upload.
1025+
1026+ -- Thomas Ward <teward@ubuntu.com> Wed, 24 Feb 2016 10:26:31 -0500
1027+
1028+nginx (1.9.11-0ubuntu2) xenial; urgency=medium
1029+
1030+ * This is a bug-fix only upload and does not include any new changes to
1031+ features.
1032+ * debian/conf/sites-available/default: Modify PHP 'default example' settings
1033+ to account for php5 being replaced with php7.0 in Xenial. Also adapt the
1034+ UNIX socket path for php7.0-fpm to be the one used by default in Xenial.
1035+ (LP: #1547642)
1036+
1037+ -- Thomas Ward <teward@ubuntu.com> Fri, 19 Feb 2016 14:13:28 -0500
1038+
1039+nginx (1.9.11-0ubuntu1) xenial; urgency=low
1040+
1041+ * New upstream release (1.9.11) - see http://nginx.org/en/CHANGES for
1042+ full changelog.
1043+ * Ubuntu-specific changes from the 1.9.10 merge remain included here.
1044+ * Additional changes:
1045+ - debian/modules/nginx-lua: Apply upstream patch to fix FTBFS issue
1046+
1047+ -- Thomas Ward <teward@ubuntu.com> Tue, 09 Feb 2016 10:33:14 -0500
1048+
1049+nginx (1.9.10-1ubuntu1) xenial; urgency=low
1050+
1051+ * Merge from Debian unstable. Remaining changes: (LP: #1538677)
1052+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
1053+ - d/{control,rules,nginx-core.*}: add new binary package for main,
1054+ nginx-core, which contains only source-tarball-included modules
1055+ and no third-party modules.
1056+ - debian/tests/control: add nginx-core test.
1057+ - debian/control:
1058+ - drop luajit from Build-Depends as it is in universe.
1059+ - Remove HTTP/2 references in package descriptions, per Ubuntu
1060+ Security Team mandate to disable HTTP/2 support.
1061+ - debian/rules:
1062+ - Disable HTTP/2 module support in all flavors, per Ubuntu Security
1063+ Team mandate.
1064+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
1065+ information gathering.
1066+ - debian/nginx-common.install: Add install rule for apport hooks.
1067+ * Additional bugs fixed by this merge:
1068+ - nginx-common should not depend on python (LP: #1480513)
1069+
1070+ -- Thomas Ward <teward@ubuntu.com> Tue, 27 Jan 2016 12:52:00 -0500
1071+
1072 nginx (1.9.10-1) unstable; urgency=medium
1073
1074 [ Christos Trochalakis ]
1075@@ -509,6 +1461,54 @@ nginx (1.9.10-1) unstable; urgency=medium
1076
1077 -- Christos Trochalakis <yatiohi@ideopolis.gr> Tue, 26 Jan 2016 20:12:06 +0200
1078
1079+nginx (1.9.10-0ubuntu1) xenial; urgency=medium
1080+
1081+ * New upstream release.
1082+ * debian/patches/ubuntu-branding.patch: Refreshed Ubuntu Branding patch
1083+ * Security content of this upload addresses the following vulnerabilities
1084+ and CVE-numbered Security issues: (LP: #1538165)
1085+ - Invalid pointer dereference might occur during DNS server response
1086+ processing, allowing an attacker who is able to forge UDP
1087+ packets from the DNS server to cause worker process crash
1088+ (CVE-2016-0742).
1089+ - Use-after-free condition might occur during CNAME response
1090+ processing. This problem allows an attacker who is able to trigger
1091+ name resolution to cause worker process crash, or might
1092+ have potential other impact (CVE-2016-0746).
1093+ - CNAME resolution was insufficiently limited, allowing an attacker who
1094+ is able to trigger arbitrary name resolution to cause excessive resource
1095+ consumption in worker processes (CVE-2016-0747).
1096+
1097+ -- Thomas Ward <teward@ubuntu.com> Tue, 26 Jan 2016 14:53:01 -0500
1098+
1099+nginx (1.9.9-1ubuntu1) xenial; urgency=low
1100+
1101+ * Merge from Debian unstable. Remaining changes: (LP: #1534208)
1102+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
1103+ - d/{control,rules,nginx-core.*}: add new binary package for main,
1104+ nginx-core, which contains only source-tarball-included modules
1105+ and no third-party modules.
1106+ - debian/tests/control: add nginx-core test.
1107+ - debian/control:
1108+ - drop luajit from Build-Depends as it is in universe.
1109+ - Update nginx-core description to match nginx-full description of the
1110+ standard and optional HTTP modules that are enabled.
1111+ - Remove HTTP/2 references in package descriptions, per Ubuntu
1112+ Security Team mandate to disable HTTP/2 support.
1113+ - debian/rules:
1114+ - Update nginx-core configure flags to match nginx-full config flags,
1115+ due to refreshing the nginx-core 'enabled modules' to match the
1116+ nginx-full modules (minus third-party modules)
1117+ - Disable HTTP/2 module support in all flavors, per Ubuntu Security
1118+ Team mandate.
1119+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
1120+ information gathering.
1121+ - debian/nginx-common.install: Add install rule for apport hooks.
1122+ * debian/control: Remove HTTP/2 reference in nginx-extras description, which
1123+ was missed previously due to accidental oversight. (LP: #1534368)
1124+
1125+ -- Thomas Ward <teward@ubuntu.com> Thu, 14 Jan 2016 18:42:00 -0500
1126+
1127 nginx (1.9.9-1) unstable; urgency=medium
1128
1129 [ Michael Lustfield ]
1130@@ -522,6 +1522,46 @@ nginx (1.9.9-1) unstable; urgency=medium
1131
1132 -- Christos Trochalakis <yatiohi@ideopolis.gr> Thu, 14 Jan 2016 10:40:35 +0200
1133
1134+nginx (1.9.9-0ubuntu1) xenial; urgency=medium
1135+
1136+ * New upstream release.
1137+ * debian/patches/ubuntu-branding.patch: Refreshed Ubuntu Branding patch
1138+
1139+ -- Thomas Ward <teward@ubuntu.com> Sun, 03 Jan 2016 12:49:21 -0500
1140+
1141+nginx (1.9.6-2ubuntu2) xenial; urgency=medium
1142+
1143+ * Rebuild for Perl 5.22.1.
1144+
1145+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 18 Dec 2015 12:53:05 +0000
1146+
1147+nginx (1.9.6-2ubuntu1) xenial; urgency=medium
1148+
1149+ * Merge from Debian unstable. Remaining changes: (LP: #1510096)
1150+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
1151+ - d/{control,rules,nginx-core.*}: add new binary package for main,
1152+ nginx-core, which contains only source-tarball-included modules
1153+ and no third-party modules.
1154+ - debian/tests/control: add nginx-core test.
1155+ - debian/control: drop luajit from Build-Depends as it is in universe.
1156+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
1157+ information gathering.
1158+ - debian/nginx-common.install: Add install rule for apport hooks.
1159+ * Additional changes:
1160+ * debian/rules:
1161+ - Update nginx-core configure flags to match nginx-full config flags,
1162+ due to refreshing the nginx-core 'enabled modules' to match the
1163+ nginx-full modules (minus third-party modules)
1164+ - Disable HTTP/2 module support in all flavors, per Ubuntu Security
1165+ Team mandate.
1166+ * debian/control:
1167+ - Update nginx-core description to match nginx-full description of the
1168+ standard and optional HTTP modules that are enabled.
1169+ - Remove HTTP/2 references in package descriptions, per Ubuntu
1170+ Security Team mandate to disable HTTP/2 support.
1171+
1172+ -- Thomas Ward <teward@ubuntu.com> Mon, 14 Dec 2015 10:34:42 -0500
1173+
1174 nginx (1.9.6-2) unstable; urgency=medium
1175
1176 [ Christos Trochalakis]
1177@@ -547,6 +1587,21 @@ nginx (1.9.4-1) unstable; urgency=medium
1178
1179 -- Christos Trochalakis <yatiohi@ideopolis.gr> Mon, 24 Aug 2015 16:23:20 +0300
1180
1181+nginx (1.9.3-1ubuntu1) wily; urgency=medium
1182+
1183+ * Merge from Debian. Remaining changes: (LP: #1476811)
1184+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
1185+ - d/{control,rules,nginx-core.*}: add new binary package for main,
1186+ nginx-core, which contains only source-tarball-included modules
1187+ and no third-party modules.
1188+ - debian/tests/control: add nginx-core test.
1189+ - debian/control: drop luajit from Build-Depends as it is in universe.
1190+ - debian/apport/source_nginx.py: Add apport hooks for additional bug
1191+ information gathering.
1192+ - debian/nginx-common.install: Add install rule for apport hooks.
1193+
1194+ -- Thomas Ward <teward@ubuntu.com> Wed, 22 Jul 2015 11:39:44 -0400
1195+
1196 nginx (1.9.3-1) unstable; urgency=medium
1197
1198 [ Christos Trochalakis]
1199@@ -631,6 +1686,52 @@ nginx (1.9.1-1) unstable; urgency=medium
1200
1201 -- Christos Trochalakis <yatiohi@ideopolis.gr> Fri, 12 Jun 2015 15:42:49 +0300
1202
1203+nginx (1.6.2-5ubuntu4) wily; urgency=medium
1204+
1205+ * debian/apport/source_nginx.py:
1206+ - Add apport hooks for additional bug information gathering, as a result
1207+ of non-useful reports due to postinstall script failure bugs. This is
1208+ necessary in order to be able to actually debug what is going on in the
1209+ bug reports, thanks to systemd not putting startup errors to stdout or
1210+ stderr anymore, like Upstart and others did. (LP: #1472683)
1211+ * debian/nginx-common.install:
1212+ - Add install rule for debian/apport/source_nginx.py, which is the new
1213+ apport hooks to gather additional 'Package' bugtype debug data.
1214+
1215+ -- Thomas Ward <teward@ubuntu.com> Fri, 10 Jul 2015 12:51:48 -0400
1216+
1217+nginx (1.6.2-5ubuntu3) vivid-proposed; urgency=medium
1218+
1219+ * debian/rules:
1220+ * Reversed Debian change in 1.6.2-5ubuntu2.
1221+ * Added DEB_BUILD_MAINT_OPTIONS=hardening=+all to enable all
1222+ dpkg-buildflags to harden the code, except for PIE flags.
1223+ * Manually define DEB_BUILD_MAINT_OPTIONS in DEBIAN_NGINX_PERL_LDFLAGS
1224+ to not have -fPIE conflicts in Perl flags.
1225+
1226+ -- Thomas Ward <teward@ubuntu.com> Wed, 01 Apr 2015 14:57:34 -0400
1227+
1228+nginx (1.6.2-5ubuntu2) vivid-proposed; urgency=medium
1229+
1230+ * debian/rules:
1231+ * Added -fPIE -pie to build rules (enables position-independent builds)
1232+ using Debian's committed change to enable. (LP: #1315426)
1233+
1234+ -- Thomas Ward <teward@ubuntu.com> Wed, 01 Apr 2015 14:26:32 -0400
1235+
1236+nginx (1.6.2-5ubuntu1) vivid; urgency=medium
1237+
1238+ * Merge from Debian. Remaining changes: (LP: #1399967)
1239+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
1240+ - debian/rules: Drop from -O3 to -O2 to work around a build failure.
1241+ - d/{control,rules,nginx-core.*}: add new binary package for main,
1242+ nginx-core, which contains only source-tarball-included modules
1243+ and no third-party modules.
1244+ - debian/tests/control: add nginx-core test.
1245+ - debian/control: drop luajit from Build-Depends as it is in universe.
1246+
1247+ -- Thomas Ward <teward@ubuntu.com> Sat, 06 Dec 2014 13:06:55 -0500
1248+
1249 nginx (1.6.2-5) unstable; urgency=medium
1250
1251 [ Christos Trochalakis ]
1252@@ -646,6 +1747,27 @@ nginx (1.6.2-5) unstable; urgency=medium
1253
1254 -- Christos Trochalakis <yatiohi@ideopolis.gr> Sun, 30 Nov 2014 10:39:55 +0200
1255
1256+nginx (1.6.2-4ubuntu1) vivid; urgency=medium
1257+
1258+ * Merge from Debian. Remaining changes: (LP: #1388621)
1259+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding
1260+ (refreshed).
1261+ - debian/rules: Drop from -O3 to -O2 to work around a build failure.
1262+ - d/{control,rules,nginx-core.*}: add new binary package for main,
1263+ nginx-core, which contains only source-tarball-included modules
1264+ and no third-party modules.
1265+ - debian/tests/control: add nginx-core test.
1266+ - debian/control: drop luajit from Build-Depends as it is in universe.
1267+ * debian/control:
1268+ * Remove nginx-naxsi* from nginx-core and related
1269+ package stanzas, as the naxsi packages have all been dropped.
1270+ * Remove reference to nginx-naxsi from nginx metapackage description
1271+ * debian/index.html: Modify included index.html file to have Ubuntu
1272+ branding, Ubuntu bug reporting tool references, and a link to the
1273+ Launchpad bugs page for the nginx package.
1274+
1275+ -- Thomas Ward <teward@ubuntu.com> Wed, 05 Nov 2014 10:05:07 -0500
1276+
1277 nginx (1.6.2-4) unstable; urgency=medium
1278
1279 [ Christos Trochalakis ]
1280@@ -697,6 +1819,27 @@ nginx (1.6.2-2) unstable; urgency=medium
1281
1282 -- Christos Trochalakis <yatiohi@ideopolis.gr> Fri, 26 Sep 2014 11:06:47 +0300
1283
1284+nginx (1.6.2-1ubuntu1.1) utopic; urgency=medium
1285+
1286+ * debian/conf/sites-available/default: Remove SSLv3 from the ssl_protocols
1287+ line in the default config example, due to POODLE vulnerability.
1288+
1289+ -- Thomas Ward <teward@dark-net.net> Wed, 22 Oct 2014 09:43:35 -0400
1290+
1291+nginx (1.6.2-1ubuntu1) utopic; urgency=medium
1292+
1293+ * Merge from Debian. Remaining changes:
1294+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding
1295+ (refreshed).
1296+ - debian/rules: Drop from -O3 to -O2 to work around a build failure.
1297+ - d/{control,rules,nginx-core.*}: add new binary package for main,
1298+ nginx-core, which contains only source-tarball-included modules
1299+ and no third-party modules.
1300+ * debian/tests/control: add nginx-core test.
1301+ * debian/control: drop luajit from Build-Depends as it is in universe.
1302+
1303+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Mon, 22 Sep 2014 13:32:30 -0400
1304+
1305 nginx (1.6.2-1) unstable; urgency=high
1306
1307 [ Christos Trochalakis ]
1308@@ -744,6 +1887,25 @@ nginx (1.6.1-2) unstable; urgency=medium
1309
1310 -- Christos Trochalakis <yatiohi@ideopolis.gr> Thu, 04 Sep 2014 13:00:46 +0300
1311
1312+nginx (1.6.1-1ubuntu2) utopic; urgency=medium
1313+
1314+ * Rebuild for Perl 5.20.0.
1315+
1316+ -- Colin Watson <cjwatson@ubuntu.com> Sun, 24 Aug 2014 06:43:36 -0700
1317+
1318+nginx (1.6.1-1ubuntu1) utopic; urgency=medium
1319+
1320+ * Merge from Debian. Remaining changes:
1321+ - debian/patches/ubuntu-branding.patch: add Ubuntu branding
1322+ (refreshed).
1323+ - debian/rules: Drop from -O3 to -O2 to work around a build failure.
1324+ - d/{control,rules,nginx-core.*}: add new binary package for main,
1325+ nginx-core, which contains only source-tarball-included modules
1326+ and no third-party modules.
1327+ * Add dep8 smoke test
1328+
1329+ -- Robie Basak <robie.basak@ubuntu.com> Fri, 15 Aug 2014 16:46:48 +0000
1330+
1331 nginx (1.6.1-1) unstable; urgency=medium
1332
1333 [ Christos Trochalakis ]
1334@@ -809,6 +1971,34 @@ nginx (1.4.7-1) unstable; urgency=medium
1335
1336 -- Christos Trochalakis <yatiohi@ideopolis.gr> Tue, 18 Mar 2014 22:03:47 +0200
1337
1338+nginx (1.4.6-1ubuntu3) trusty; urgency=medium
1339+
1340+ * Add new binary package for main, nginx-core, which contains only
1341+ source-tarball-included modules and no third-party modules.
1342+ * Changes to debian/ directory:
1343+ - control:
1344+ + Add entry for nginx-core and nginx-core-dbg.
1345+ - rules:
1346+ + Add nginx-core flavor to the build rules.
1347+ - nginx-core.*: Add new packaging files for nginx-core based on
1348+ the packaging files for nginx-full.
1349+ * The above changes satisfy the requirements for main (LP: #1262710)
1350+
1351+ -- Thomas Ward <teward@ubuntu.com> Mon, 10 Mar 2014 18:23:36 -0400
1352+
1353+nginx (1.4.6-1ubuntu2) trusty; urgency=medium
1354+
1355+ * debian/rules: Drop from -O3 to -O2 to work around a build failure.
1356+
1357+ -- Adam Conrad <adconrad@ubuntu.com> Sun, 09 Mar 2014 11:49:28 -0600
1358+
1359+nginx (1.4.6-1ubuntu1) trusty; urgency=low
1360+
1361+ * Merge from Debian unstable. Remaining changes:
1362+ - debian/patches/ubuntu-branding.patch: Add Ubuntu branding.
1363+
1364+ -- Adam Conrad <adconrad@ubuntu.com> Sun, 09 Mar 2014 11:13:26 -0600
1365+
1366 nginx (1.4.6-1) unstable; urgency=medium
1367
1368 [ Christos Trochalakis ]
1369@@ -830,6 +2020,14 @@ nginx (1.4.6-1) unstable; urgency=medium
1370
1371 -- Christos Trochalakis <yatiohi@ideopolis.gr> Tue, 04 Mar 2014 18:06:55 +0200
1372
1373+nginx (1.4.5-1ubuntu1) trusty; urgency=medium
1374+
1375+ * Resynchronise with Debian (LP: #1280511). Remaining changes:
1376+ - debian/patches/ubuntu-branding.patch:
1377+ + Add Ubuntu branding to server_tokens.
1378+
1379+ -- Colin Watson <cjwatson@ubuntu.com> Sat, 15 Feb 2014 03:05:42 +0000
1380+
1381 nginx (1.4.5-1) unstable; urgency=medium
1382
1383 [ Christos Trochalakis ]
1384@@ -870,6 +2068,14 @@ nginx (1.4.4-3) unstable; urgency=medium
1385
1386 -- Christos Trochalakis <yatiohi@ideopolis.gr> Tue, 31 Dec 2013 11:47:07 +0200
1387
1388+nginx (1.4.4-2ubuntu1) trusty; urgency=medium
1389+
1390+ * Resynchronise with Debian. Remaining changes:
1391+ - debian/patches/ubuntu-branding.patch:
1392+ + Add Ubuntu branding to server_tokens.
1393+
1394+ -- Colin Watson <cjwatson@ubuntu.com> Sat, 28 Dec 2013 10:21:44 +0000
1395+
1396 nginx (1.4.4-2) unstable; urgency=low
1397
1398 [ Michael Lustfield ]
1399@@ -907,6 +2113,14 @@ nginx (1.4.4-2) unstable; urgency=low
1400
1401 -- Kartik Mistry <kartik@debian.org> Fri, 27 Dec 2013 21:16:01 +0530
1402
1403+nginx (1.4.4-1ubuntu1) trusty; urgency=low
1404+
1405+ * Resynchronise with Debian (LP: #1253691). Remaining changes:
1406+ - debian/patches/ubuntu-branding.patch:
1407+ + Add Ubuntu branding to server_tokens.
1408+
1409+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 22 Nov 2013 12:23:25 +0000
1410+
1411 nginx (1.4.4-1) unstable; urgency=low
1412
1413 [ Christos Trochalakis ]
1414@@ -931,6 +2145,14 @@ nginx (1.4.4-1) unstable; urgency=low
1415
1416 -- Michael Lustfield <michael@lustfield.net> Thu, 21 Nov 2013 19:25:50 +0530
1417
1418+nginx (1.4.3-2ubuntu1) trusty; urgency=low
1419+
1420+ * Resynchronise with Debian. Remaining changes:
1421+ - debian/patches/ubuntu-branding.patch:
1422+ + Add Ubuntu branding to server_tokens.
1423+
1424+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 21 Oct 2013 13:26:52 +0100
1425+
1426 nginx (1.4.3-2) unstable; urgency=low
1427
1428 [ Kartik Mistry ]
1429@@ -987,6 +2209,14 @@ nginx (1.4.3-1) unstable; urgency=low
1430
1431 -- Kartik Mistry <kartik@debian.org> Thu, 10 Oct 2013 17:28:56 +0530
1432
1433+nginx (1.4.1-3ubuntu1) saucy; urgency=low
1434+
1435+ * Resynchronise with Debian. Remaining changes:
1436+ - debian/patches/ubuntu-branding.patch:
1437+ + Add Ubuntu branding to server_tokens.
1438+
1439+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 20 Jun 2013 15:08:44 +0100
1440+
1441 nginx (1.4.1-3) unstable; urgency=low
1442
1443 [ Kartik Mistry ]
1444@@ -1000,6 +2230,14 @@ nginx (1.4.1-3) unstable; urgency=low
1445
1446 -- Kartik Mistry <kartik@debian.org> Sun, 09 Jun 2013 13:07:52 +0530
1447
1448+nginx (1.4.1-2ubuntu1) saucy; urgency=low
1449+
1450+ * Resynchronise with Debian. Remaining changes:
1451+ - debian/patches/ubuntu-branding.patch:
1452+ + Add Ubuntu branding to server_tokens.
1453+
1454+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 07 Jun 2013 15:41:48 +0100
1455+
1456 nginx (1.4.1-2) unstable; urgency=medium
1457
1458 [ Kartik Mistry]
1459@@ -1021,6 +2259,24 @@ nginx (1.4.1-2) unstable; urgency=medium
1460
1461 -- Kartik Mistry <kartik@debian.org> Thu, 06 Jun 2013 12:55:23 +0530
1462
1463+nginx (1.4.1-1ubuntu2) saucy; urgency=low
1464+
1465+ * Rebuild for libgd3.
1466+
1467+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 20 May 2013 00:45:10 +0100
1468+
1469+nginx (1.4.1-1ubuntu1) saucy; urgency=low
1470+
1471+ * Merge with Debian unstable (LP: #1177919). Remaining changes:
1472+ - debian/conf/sites-available/default:
1473+ + Modify default site configuration file to correct a typo
1474+ that prevented out-of-the-box usability (LP: #1162177).
1475+ - debian/patches/ubuntu-branding.patch:
1476+ + Add ubuntu branding to server_tokens.
1477+ * Refresh all patches.
1478+
1479+ -- Dmitry Shachnev <mitya57@ubuntu.com> Sat, 11 May 2013 14:47:53 +0400
1480+
1481 nginx (1.4.1-1) unstable; urgency=low
1482
1483 * New upstream release:
1484@@ -1098,6 +2354,36 @@ nginx (1.4.0-1) experimental; urgency=low
1485
1486 -- Kartik Mistry <kartik@debian.org> Thu, 25 Apr 2013 12:51:45 +0530
1487
1488+nginx (1.2.6-1ubuntu4) saucy; urgency=low
1489+
1490+ * debian/patches/ubuntu-branding.patch: Move Ubuntu branding from
1491+ the numerical version string to the long version (LP: #1174158)
1492+
1493+ -- Adam Conrad <adconrad@ubuntu.com> Thu, 09 May 2013 11:50:52 -0600
1494+
1495+nginx (1.2.6-1ubuntu3) raring; urgency=low
1496+
1497+ * debian/patches/ubuntu-branding.patch: Add ubuntu branding
1498+ to server_tokens.
1499+
1500+ -- Chuck Short <zulcss@ubuntu.com> Tue, 09 Apr 2013 10:23:26 -0500
1501+
1502+nginx (1.2.6-1ubuntu2) raring; urgency=low
1503+
1504+ * debian/conf/sites-available/default:
1505+ * Modify default site configuration file to correct a typo
1506+ that prevented out-of-the-box usability (LP: #1162177)
1507+
1508+ -- Thomas Ward <teward@ubuntu.com> Fri, 05 Apr 2013 20:22:38 +0100
1509+
1510+nginx (1.2.6-1ubuntu1) raring; urgency=low
1511+
1512+ * debian/conf/sites-available/default:
1513+ * Modify default site default configuration file to bind to IPv6
1514+ only for IPv6 default listen statement (LP: #1132678)
1515+
1516+ -- Thomas Ward <teward@ubuntu.com> Tue, 12 Mar 2013 00:23:02 +0000
1517+
1518 nginx (1.2.6-1) unstable; urgency=low
1519
1520 [ Kartik Mistry ]
1521diff --git a/debian/control b/debian/control
1522index 4f00178..760c244 100644
1523--- a/debian/control
1524+++ b/debian/control
1525@@ -1,7 +1,8 @@
1526 Source: nginx
1527 Section: httpd
1528 Priority: optional
1529-Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
1530+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
1531+XSBC-Original-Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
1532 Uploaders: Christos Trochalakis <ctrochalakis@debian.org>,
1533 Ondřej Nový <onovy@debian.org>,
1534 Build-Depends: debhelper-compat (= 13),
1535@@ -68,8 +69,7 @@ Description: small, powerful, scalable web/proxy server - common files
1536
1537 Package: nginx-core
1538 Architecture: any
1539-Depends: libnginx-mod-http-geoip (= ${binary:Version}),
1540- libnginx-mod-http-image-filter (= ${binary:Version}),
1541+Depends: libnginx-mod-http-image-filter (= ${binary:Version}),
1542 libnginx-mod-http-xslt-filter (= ${binary:Version}),
1543 libnginx-mod-mail (= ${binary:Version}),
1544 libnginx-mod-stream (= ${binary:Version}),
1545diff --git a/debian/nginx-common.install b/debian/nginx-common.install
1546index 90f173b..20109fa 100644
1547--- a/debian/nginx-common.install
1548+++ b/debian/nginx-common.install
1549@@ -1,5 +1,6 @@
1550 contrib/vim/* usr/share/vim/addons
1551 debian/conf/* etc/nginx
1552+debian/apport/source_nginx.py usr/share/apport/package-hooks
1553 debian/ufw/nginx etc/ufw/applications.d
1554 debian/vim/nginx.yaml usr/share/vim/registry
1555 html/index.html usr/share/nginx/html/
1556diff --git a/debian/patches/nginx-fix-pidfile.patch b/debian/patches/nginx-fix-pidfile.patch
1557new file mode 100644
1558index 0000000..47a16ff
1559--- /dev/null
1560+++ b/debian/patches/nginx-fix-pidfile.patch
1561@@ -0,0 +1,89 @@
1562+Description: Fix NGINX pidfile handling
1563+Author: Tj <ubuntu@iam.tj>
1564+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864
1565+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876365
1566+Last-Update: 2020-06-24
1567+---
1568+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
1569+diff --git a/src/core/nginx.c b/src/core/nginx.c
1570+index 9fcb0eb2..083eba1d 100644
1571+--- a/src/core/nginx.c
1572++++ b/src/core/nginx.c
1573+@@ -338,14 +338,21 @@ main(int argc, char *const *argv)
1574+ ngx_process = NGX_PROCESS_MASTER;
1575+ }
1576+
1577++ /* tell-tale to detect if this is parent or child process */
1578++ ngx_int_t child_pid = NGX_BUSY;
1579++
1580+ #if !(NGX_WIN32)
1581+
1582+ if (ngx_init_signals(cycle->log) != NGX_OK) {
1583+ return 1;
1584+ }
1585+
1586++ /* tell-tale that this code has been executed */
1587++ child_pid--;
1588++
1589+ if (!ngx_inherited && ccf->daemon) {
1590+- if (ngx_daemon(cycle->log) != NGX_OK) {
1591++ child_pid = ngx_daemon(cycle->log);
1592++ if (child_pid == NGX_ERROR) {
1593+ return 1;
1594+ }
1595+
1596+@@ -358,8 +365,19 @@ main(int argc, char *const *argv)
1597+
1598+ #endif
1599+
1600+- if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
1601+- return 1;
1602++ /* If ngx_daemon() returned the child's PID in the parent process
1603++ * after the fork() set ngx_pid to the child_pid, which gets
1604++ * written to the PID file, then exit.
1605++ * For NGX_WIN32 always write the PID file
1606++ * For others, only write it from the parent process */
1607++ if (child_pid < NGX_OK || child_pid > NGX_OK) {
1608++ ngx_pid = child_pid > NGX_OK ? child_pid : ngx_pid;
1609++ if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
1610++ return 1;
1611++ }
1612++ }
1613++ if (child_pid > NGX_OK) {
1614++ exit(0);
1615+ }
1616+
1617+ if (ngx_log_redirect_stderr(cycle) != NGX_OK) {
1618+diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c
1619+index 385c49b6..3719854c 100644
1620+--- a/src/os/unix/ngx_daemon.c
1621++++ b/src/os/unix/ngx_daemon.c
1622+@@ -7,14 +7,17 @@
1623+
1624+ #include <ngx_config.h>
1625+ #include <ngx_core.h>
1626++#include <unistd.h>
1627+
1628+
1629+ ngx_int_t
1630+ ngx_daemon(ngx_log_t *log)
1631+ {
1632+ int fd;
1633++ /* retain the return value for passing back to caller */
1634++ pid_t pid_child = fork();
1635+
1636+- switch (fork()) {
1637++ switch (pid_child) {
1638+ case -1:
1639+ ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed");
1640+ return NGX_ERROR;
1641+@@ -23,7 +26,8 @@ ngx_daemon(ngx_log_t *log)
1642+ break;
1643+
1644+ default:
1645+- exit(0);
1646++ /* let caller do the exit() */
1647++ return pid_child;
1648+ }
1649+
1650+ ngx_parent = ngx_pid;
1651diff --git a/debian/patches/series b/debian/patches/series
1652index b221db7..d78aeb1 100644
1653--- a/debian/patches/series
1654+++ b/debian/patches/series
1655@@ -1,3 +1,5 @@
1656 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
1657 0003-define_gnu_source-on-other-glibc-based-platforms.patch
1658 CVE-2019-20372.patch
1659+ubuntu-branding.patch
1660+nginx-fix-pidfile.patch
1661diff --git a/debian/patches/ubuntu-branding.patch b/debian/patches/ubuntu-branding.patch
1662new file mode 100644
1663index 0000000..6bf8ae5
1664--- /dev/null
1665+++ b/debian/patches/ubuntu-branding.patch
1666@@ -0,0 +1,20 @@
1667+Description: Add Ubuntu token to NGINX_VER
1668+Author: Adam Conrad <adconrad@ubuntu.com>
1669+Forwarded: not-needed
1670+Last-Update: 2020-04-14
1671+
1672+---
1673+ src/core/nginx.h | 2 +-
1674+ 1 file changed, 1 insertion(+), 1 deletion(-)
1675+
1676+--- a/src/core/nginx.h
1677++++ b/src/core/nginx.h
1678+@@ -11,7 +11,7 @@
1679+
1680+ #define nginx_version 1018000
1681+ #define NGINX_VERSION "1.18.0"
1682+-#define NGINX_VER "nginx/" NGINX_VERSION
1683++#define NGINX_VER "nginx/" NGINX_VERSION " (Ubuntu)"
1684+
1685+ #ifdef NGX_BUILD
1686+ #define NGINX_VER_BUILD NGINX_VER " (" NGX_BUILD ")"

Subscribers

People subscribed via source and target branches