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

[Bryce Harrington]

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.

[Christian Ehrhardt  (paelzer)]

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...

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

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 on 2020-06-23

  * 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 on 2020-06-23

  * 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 on 2020-06-23

  * 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 on 2020-06-24

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

[Bryce Harrington (bryce)]

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.

[Bryce Harrington (bryce)]

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

[Christian Ehrhardt  (paelzer)]

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 on 2020-06-24

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

8cda4da... by Bryce Harrington on 2020-06-24

merge-changelogs

45ed56b... by Bryce Harrington on 2020-06-24

reconstruct-changelog

7f105b8... by Bryce Harrington on 2020-06-24

update-maintainer

8f2387d... by Bryce Harrington on 2020-06-24

changelog cleanup

[Bryce Harrington (bryce)]

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.
"""

[Christian Ehrhardt  (paelzer)]

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

[Thomas Ward (teward)]

review: Approve

[Bryce Harrington (bryce)]

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.

[Christian Ehrhardt  (paelzer)]

FYI still in proposed

[Bryce Harrington (bryce)]

proposed migration issue should be solved by:

https://code.launchpad.net/~bryce/ubuntu/+source/nginx/+git/nginx/+merge/386927

Unmerged commits

8f2387d... by Bryce Harrington on 2020-06-24

changelog cleanup

7f105b8... by Bryce Harrington on 2020-06-24

update-maintainer

45ed56b... by Bryce Harrington on 2020-06-24

reconstruct-changelog

8cda4da... by Bryce Harrington on 2020-06-24

merge-changelogs

1a14a89... by Bryce Harrington on 2020-06-24

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

c4d65f5... by Bryce Harrington on 2020-06-23

  * 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 on 2020-06-23

  * 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 on 2020-06-23

  * 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 on 2020-06-22

  * 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 on 2020-06-19

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

diff --git a/debian/apport/source_nginx.py b/debian/apport/source_nginx.py
 new file mode 100644
index 0000000..aec6e8e
--- /dev/null
+++ b/debian/apport/source_nginx.py
@@ -0,0 +1,19 @@
+'''
+apport package hook for nginx packages
+
+Copyright (c) 2015, Thomas Ward <[e-mail]>
+'''
+
+import apport.hookutils
+import os
+import subprocess
+
+def add_info(report, ui):
+    if (report['Package'].split()[0] != 'nginx-common'
+        and report['ProblemType'] == 'Package'
+        and os.path.isdir('/run/systemd/system')):
+        report['Journalctl_Nginx.txt'] = apport.hookutils.command_output(
+            ['journalctl', '-xe', '--unit=nginx.service'])
+        report['SystemctlStatusFull_Nginx.txt'] = subprocess.Popen(
+            ['systemctl', '-l', 'status', 'nginx.service'],
+            stdout=subprocess.PIPE).communicate()[0]
diff --git a/debian/changelog b/debian/changelog
index c2bed08..e1c0e33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,56 @@
+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 <[e-mail]>  Wed, 24 Jun 2020 23:15:11 +0000
+
 nginx (1.18.0-3) unstable; urgency=medium
 
   * Source-only upload to allow migration.
@@ -55,6 +108,225 @@ nginx (1.18.0-1) unstable; urgency=medium
 
  -- Ondřej Nový <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Fri, 01 Nov 2019 11:55:10 -0400
+
 nginx (1.16.1-3) unstable; urgency=high
 
   * Handle CVE-2019-20372, error page request smuggling
@@ -79,6 +351,294 @@ nginx (1.16.1-1) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 13 Nov 2018 10:10:45 -0500
+
+nginx (1.15.5-0ubuntu4) disco; urgency=medium
+
+  * No-change rebuild against libhiredis0.14
+
+ -- Steve Langasek <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Sun, 19 Aug 2018 12:16:48 -0400
+
 nginx (1.14.2-3) unstable; urgency=high
 
   * Backport upstream fixes for 3 CVEs (Closes: #935037)
@@ -145,18 +705,85 @@ nginx (1.14.0-1) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 17 Apr 2018 12:17:58 -0400
+
 nginx (1.13.12-1) unstable; urgency=medium
 
   * New upstream version
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  Mon, 16 Apr 2018 11:43:01 -0400
+
 nginx (1.13.11-1) unstable; urgency=medium
 
   * New upstream version
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  Thu, 05 Apr 2018 15:43:49 -0700
+
 nginx (1.13.10-1) unstable; urgency=medium
 
   * New upstream version
@@ -202,6 +829,32 @@ nginx (1.13.7-1) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 12 Dec 2017 12:15:30 -0500
+
 nginx (1.13.6-2) unstable; urgency=medium
 
   * rtmp: Ship docs & examples (Closes: #878368)
@@ -289,6 +942,37 @@ nginx (1.13.0-1) experimental; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Wed, 12 Jul 2017 19:53:24 -0400
+
 nginx (1.12.0-1) experimental; urgency=medium
 
   [ Michael Lustfield ]
@@ -309,6 +993,90 @@ nginx (1.12.0-1) experimental; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Thu, 16 Feb 2017 15:29:40 -0500
+
 nginx (1.10.3-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #855113)
@@ -317,6 +1085,24 @@ nginx (1.10.3-1) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  Tue, 14 Feb 2017 17:47:00 -0500
+
 nginx (1.10.2-4) unstable; urgency=medium
 
   * Switch module reloading logic to dpkg triggers.
@@ -389,6 +1175,18 @@ nginx (1.10.2-1) unstable; urgency=high
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  Thu, 15 Dec 2016 11:23:43 -0500
+
 nginx (1.10.1-3) unstable; urgency=medium
 
   * debian/control:
@@ -450,6 +1248,58 @@ nginx (1.10.1-1) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 31 May 2016 19:09:33 -0400
+
 nginx (1.10.0-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]
@@ -457,6 +1307,30 @@ nginx (1.10.0-1) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Mon, 18 Apr 2016 15:39:08 -0400
+
 nginx (1.9.14-2) unstable; urgency=medium
 
   [ Christos Trochalakis ]
@@ -500,6 +1374,84 @@ nginx (1.9.14-1) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 27 Jan 2016 12:52:00 -0500
+
 nginx (1.9.10-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]
@@ -509,6 +1461,54 @@ nginx (1.9.10-1) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Thu, 14 Jan 2016 18:42:00 -0500
+
 nginx (1.9.9-1) unstable; urgency=medium
 
   [ Michael Lustfield ]
@@ -522,6 +1522,46 @@ nginx (1.9.9-1) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  Sun, 03 Jan 2016 12:49:21 -0500
+
+nginx (1.9.6-2ubuntu2) xenial; urgency=medium
+
+  * Rebuild for Perl 5.22.1.
+
+ -- Colin Watson <[e-mail]>  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 <[e-mail]>  Mon, 14 Dec 2015 10:34:42 -0500
+
 nginx (1.9.6-2) unstable; urgency=medium
 
   [ Christos Trochalakis]
@@ -547,6 +1587,21 @@ nginx (1.9.4-1) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  Wed, 22 Jul 2015 11:39:44 -0400
+
 nginx (1.9.3-1) unstable; urgency=medium
 
   [ Christos Trochalakis]
@@ -631,6 +1686,52 @@ nginx (1.9.1-1) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Sat, 06 Dec 2014 13:06:55 -0500
+
 nginx (1.6.2-5) unstable; urgency=medium
 
   [ Christos Trochalakis ]
@@ -646,6 +1747,27 @@ nginx (1.6.2-5) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  Wed, 05 Nov 2014 10:05:07 -0500
+
 nginx (1.6.2-4) unstable; urgency=medium
 
   [ Christos Trochalakis ]
@@ -697,6 +1819,27 @@ nginx (1.6.2-2) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Mon, 22 Sep 2014 13:32:30 -0400
+
 nginx (1.6.2-1) unstable; urgency=high
 
   [ Christos Trochalakis ]
@@ -744,6 +1887,25 @@ nginx (1.6.1-2) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  Thu, 04 Sep 2014 13:00:46 +0300
 
+nginx (1.6.1-1ubuntu2) utopic; urgency=medium
+
+  * Rebuild for Perl 5.20.0.
+
+ -- Colin Watson <[e-mail]>  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 <[e-mail]>  Fri, 15 Aug 2014 16:46:48 +0000
+
 nginx (1.6.1-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]
@@ -809,6 +1971,34 @@ nginx (1.4.7-1) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Sun, 09 Mar 2014 11:13:26 -0600
+
 nginx (1.4.6-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]
@@ -830,6 +2020,14 @@ nginx (1.4.6-1) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  Sat, 15 Feb 2014 03:05:42 +0000
+
 nginx (1.4.5-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]
@@ -870,6 +2068,14 @@ nginx (1.4.4-3) unstable; urgency=medium
 
  -- Christos Trochalakis <[e-mail]>  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 <[e-mail]>  Sat, 28 Dec 2013 10:21:44 +0000
+
 nginx (1.4.4-2) unstable; urgency=low
 
   [ Michael Lustfield ]
@@ -907,6 +2113,14 @@ nginx (1.4.4-2) unstable; urgency=low
 
  -- Kartik Mistry <[e-mail]>  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 <[e-mail]>  Fri, 22 Nov 2013 12:23:25 +0000
+
 nginx (1.4.4-1) unstable; urgency=low
 
   [ Christos Trochalakis ]
@@ -931,6 +2145,14 @@ nginx (1.4.4-1) unstable; urgency=low
 
  -- Michael Lustfield <[e-mail]>  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 <[e-mail]>  Mon, 21 Oct 2013 13:26:52 +0100
+
 nginx (1.4.3-2) unstable; urgency=low
 
   [ Kartik Mistry ]
@@ -987,6 +2209,14 @@ nginx (1.4.3-1) unstable; urgency=low
 
  -- Kartik Mistry <[e-mail]>  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 <[e-mail]>  Thu, 20 Jun 2013 15:08:44 +0100
+
 nginx (1.4.1-3) unstable; urgency=low
 
   [ Kartik Mistry ]
@@ -1000,6 +2230,14 @@ nginx (1.4.1-3) unstable; urgency=low
 
  -- Kartik Mistry <[e-mail]>  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 <[e-mail]>  Fri, 07 Jun 2013 15:41:48 +0100
+
 nginx (1.4.1-2) unstable; urgency=medium
 
   [ Kartik Mistry]
@@ -1021,6 +2259,24 @@ nginx (1.4.1-2) unstable; urgency=medium
 
  -- Kartik Mistry <[e-mail]>  Thu, 06 Jun 2013 12:55:23 +0530
 
+nginx (1.4.1-1ubuntu2) saucy; urgency=low
+
+  * Rebuild for libgd3.
+
+ -- Colin Watson <[e-mail]>  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 <[e-mail]>  Sat, 11 May 2013 14:47:53 +0400
+
 nginx (1.4.1-1) unstable; urgency=low
 
   * New upstream release:
@@ -1098,6 +2354,36 @@ nginx (1.4.0-1) experimental; urgency=low
 
  -- Kartik Mistry <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 12 Mar 2013 00:23:02 +0000
+
 nginx (1.2.6-1) unstable; urgency=low
 
   [ Kartik Mistry ]
diff --git a/debian/control b/debian/control
index 4f00178..760c244 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: nginx
 Section: httpd
 Priority: optional
-Maintainer: Debian Nginx Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Nginx Maintainers <[e-mail]>
 Uploaders: Christos Trochalakis <[e-mail]>,
            Ondřej Nový <[e-mail]>,
 Build-Depends: debhelper-compat (= 13),
@@ -68,8 +69,7 @@ Description: small, powerful, scalable web/proxy server - common files
 
 Package: nginx-core
 Architecture: any
-Depends: libnginx-mod-http-geoip (= ${binary:Version}),
-         libnginx-mod-http-image-filter (= ${binary:Version}),
+Depends: libnginx-mod-http-image-filter (= ${binary:Version}),
          libnginx-mod-http-xslt-filter (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
          libnginx-mod-stream (= ${binary:Version}),
diff --git a/debian/nginx-common.install b/debian/nginx-common.install
index 90f173b..20109fa 100644
--- a/debian/nginx-common.install
+++ b/debian/nginx-common.install
@@ -1,5 +1,6 @@
 contrib/vim/* usr/share/vim/addons
 debian/conf/* etc/nginx
+debian/apport/source_nginx.py usr/share/apport/package-hooks
 debian/ufw/nginx etc/ufw/applications.d
 debian/vim/nginx.yaml usr/share/vim/registry
 html/index.html usr/share/nginx/html/
diff --git a/debian/patches/nginx-fix-pidfile.patch b/debian/patches/nginx-fix-pidfile.patch
 new file mode 100644
index 0000000..47a16ff
--- /dev/null
+++ b/debian/patches/nginx-fix-pidfile.patch
@@ -0,0 +1,89 @@
+Description: Fix NGINX pidfile handling
+Author: Tj <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876365
+Last-Update: 2020-06-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/src/core/nginx.c b/src/core/nginx.c
+index 9fcb0eb2..083eba1d 100644
+--- a/src/core/nginx.c
++++ b/src/core/nginx.c
+@@ -338,14 +338,21 @@ main(int argc, char *const *argv)
+         ngx_process = NGX_PROCESS_MASTER;
+     }
+ 
++    /* tell-tale to detect if this is parent or child process */
++    ngx_int_t child_pid = NGX_BUSY;
++
+ #if !(NGX_WIN32)
+ 
+     if (ngx_init_signals(cycle->log) != NGX_OK) {
+         return 1;
+     }
+ 
++    /* tell-tale that this code has been executed */
++    child_pid--;
++
+     if (!ngx_inherited && ccf->daemon) {
+-        if (ngx_daemon(cycle->log) != NGX_OK) {
++        child_pid = ngx_daemon(cycle->log);
++        if (child_pid == NGX_ERROR) {
+             return 1;
+         }
+ 
+@@ -358,8 +365,19 @@ main(int argc, char *const *argv)
+ 
+ #endif
+ 
+-    if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
+-        return 1;
++    /* If ngx_daemon() returned the child's PID in the parent process
++     * after the fork() set ngx_pid to the child_pid, which gets
++     * written to the PID file, then exit.
++     * For NGX_WIN32 always write the PID file
++     * For others, only write it from the parent process */
++    if (child_pid < NGX_OK || child_pid > NGX_OK) {
++	ngx_pid = child_pid > NGX_OK ? child_pid : ngx_pid;
++        if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
++            return 1;
++	}
++    }
++    if (child_pid > NGX_OK) {
++        exit(0);
+     }
+ 
+     if (ngx_log_redirect_stderr(cycle) != NGX_OK) {
+diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c
+index 385c49b6..3719854c 100644
+--- a/src/os/unix/ngx_daemon.c
++++ b/src/os/unix/ngx_daemon.c
+@@ -7,14 +7,17 @@
+ 
+ #include <ngx_config.h>
+ #include <ngx_core.h>
++#include <unistd.h>
+ 
+ 
+ ngx_int_t
+ ngx_daemon(ngx_log_t *log)
+ {
+     int  fd;
++    /* retain the return value for passing back to caller */
++    pid_t pid_child = fork();
+ 
+-    switch (fork()) {
++    switch (pid_child) {
+     case -1:
+         ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed");
+         return NGX_ERROR;
+@@ -23,7 +26,8 @@ ngx_daemon(ngx_log_t *log)
+         break;
+ 
+     default:
+-        exit(0);
++        /* let caller do the exit() */
++        return pid_child;
+     }
+ 
+     ngx_parent = ngx_pid;
diff --git a/debian/patches/series b/debian/patches/series
index b221db7..d78aeb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
 CVE-2019-20372.patch
+ubuntu-branding.patch
+nginx-fix-pidfile.patch
diff --git a/debian/patches/ubuntu-branding.patch b/debian/patches/ubuntu-branding.patch
 new file mode 100644
index 0000000..6bf8ae5
--- /dev/null
+++ b/debian/patches/ubuntu-branding.patch
@@ -0,0 +1,20 @@
+Description: Add Ubuntu token to NGINX_VER
+Author: Adam Conrad <[e-mail]>
+Forwarded: not-needed
+Last-Update: 2020-04-14
+
+---
+ src/core/nginx.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/core/nginx.h
++++ b/src/core/nginx.h
+@@ -11,7 +11,7 @@
+ 
+ #define nginx_version      1018000
+ #define NGINX_VERSION      "1.18.0"
+-#define NGINX_VER          "nginx/" NGINX_VERSION
++#define NGINX_VER          "nginx/" NGINX_VERSION " (Ubuntu)"
+ 
+ #ifdef NGX_BUILD
+ #define NGINX_VER_BUILD    NGINX_VER " (" NGX_BUILD ")"