Merge nginx 1.9.3-1 (main) from Debian unstable (main)

Bug #1476811 reported by Thomas Ward on 2015-07-21
This bug affects 1 person
Affects Status Importance Assigned to Milestone
nginx (Ubuntu)
Thomas Ward

Bug Description

Debian Unstable has nginx 1.9.3-1, which is the latest upstream Mainline release.

After discussion with the server team, and the release team, and the Technical Board, it would be desired to sync 1.9.3 into Wily, given that this and then later 1.10.x will land in X-series.

There is a lot of discussion related to what will be done for X-series, but the plan of action for X-series requires a merge of 1.9.3 from Debian into Ubuntu for Wily, with future merges likely.

Related branches

Thomas Ward (teward) on 2015-07-21
description: updated
Thomas Ward (teward) wrote :

Potential DebDiff here. Will not be merged until spot-checked for sanity.

Thomas Ward (teward) wrote :

The 'sanity check' between Debian 1.9.3-1 and the proposed 1.9.3-1ubuntu1 package.

Thomas Ward (teward) wrote :

Sanity check from comment #2 failed, due to missing changelog data. Additional debdiffs to be uploaded here shortly.

Thanks to Dave Walker of the Ubuntu Release Team (and coincidentally the SRU team) for a cursory sanity-check. :)

Thomas Ward (teward) wrote :

Full Merge DebDiff, Round #2.

Thomas Ward (teward) wrote :

'Sanity check' round #2 between Debian 1.9.3-1 and the proposed 1.9.3-1ubuntu1 package.

The attachment "Full DebDiff for Merge of 1.9.3-1 into Ubuntu Wily (Rev. 2)" seems to be a debdiff. The ubuntu-sponsors team has been subscribed to the bug report so that they can review and hopefully sponsor the debdiff. If the attachment isn't a patch, please remove the "patch" flag from the attachment, remove the "patch" tag, and if you are member of the ~ubuntu-sponsors, unsubscribe the team.

[This is an automated message performed by a Launchpad user owned by ~brian-murray, for any issue please contact him.]

tags: added: patch
Thomas Ward (teward) on 2015-07-22
summary: - Please merge nginx 1.9.3-1 (main) from Debian unstable (main)
+ Merge nginx 1.9.3-1 (main) from Debian unstable (main)
Thomas Ward (teward) wrote :

Final 'Sanity Check' between Debian and the merge in Ubuntu

Thomas Ward (teward) wrote :

Final Full DebDiff for Merge

Launchpad Janitor (janitor) wrote :
Download full text (4.0 KiB)

This bug was fixed in the package nginx - 1.9.3-1ubuntu1

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/ Add apport hooks for additional bug
      information gathering.
    - debian/nginx-common.install: Add install rule for apport hooks.

nginx (1.9.3-1) unstable; urgency=medium

  [ Christos Trochalakis]
  * New upstream Release. (Closes: #789924)
  * debian/control:
    + Remove XS-Testsuite header, it is now automatically added when
      `debian/tests/control` is present.
  * debian/modules/nginx-lua:
    + Update nginx-lua to v0.9.16 and drop our backported patches.
  * debian/conf/*:
    + Add REQUEST_SCHEME to fcgi, wsgi and scgi configs (sync with upstream).

nginx (1.9.2-1) unstable; urgency=medium

  [ Michael Lustfield ]
  * debian/nginx-common.nginx.init:
    + Init script now returns the proper exit status. (Closes: #788573)
    + Cleaned up the init script to have consistent naming/structure.

  [ Christos Trochalakis ]
  * New upstream Release.
  * debian/rules:
    + Add stream module to nginx-full & nginx-extras.
    + Add thread pool support to nginx-full & nginx-extras.
  * debian/modules/nginx-lua:
    + Backport upstream's 9531e5e7 fixing build failure when thread pool
      support is enabled.

nginx (1.9.1-1) unstable; urgency=medium

  [ Michael Lustfield ]
  * debian/conf/nginx.conf:
    + Switch worker_processes to auto. (Closes: #781711)
  * debian/conf/sites-available/default:
    + Add comment about disabling gzip in HTTPS. (Closes: #773332)
    + Add comment about checking ssl_ciphers. (Closes: #765782)
  * debian/modules/*:
    + Updated nginx-auth-pam 1.3 -> 1.4. (Closes: #777120)
    + Updated nginx-echo v0.56 -> v0.57.
    + Updated nginx-lua v0.9.13 -> v0.9.15.
    + Updated nginx-cache-purge 2.1 -> 2.3.
    + Updated ngx-fancyindex v0.3.4 -> v0.3.5.
  * debian/nginx-common.NEWS:
    + Document potential issues with newer versions on i386.
  * debian/nginx-common.{dirs,install}, debian/vim/*:
    + Installing vim syntax highlighting from package. (Closes: #771609)
      Thanks Emmanuel Bouthenot for building this patch.
  * debian/nginx-common.nginx.upstart:
    + Created file to support upstart jobs. (Closes: #745483)
      Thanks Cameron Norman for building this file.
  * debian/rules:
    + Add hardening flags with dpkg-buildflags. (Closes: #747025, #781703)
      Thanks Thomas Ward.
    + Supply custom DEB_BUILD_MAINT_OPTIONS for debian_ldflags generation.
      Thanks Thomas Ward.
    + Added back missing module gunzip. (Closes: #782065)
      Thanks Peter Wu for the initial patch.
  * debian/modules/nginx-lua/*:
    + Updated module version. (Closes: #762494)
  * debian/ngx-conf/*
    + Added configuration utility, not shippe...


Changed in nginx (Ubuntu):
status: In Progress → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers