Please merge nginx 1.6.2-5 (main) from Debian Unstable (main)

Bug #1399967 reported by Thomas Ward on 2014-12-06
This bug affects 1 person
Affects Status Importance Assigned to Milestone
nginx (Ubuntu)

Bug Description

Debian Unstable has nginx 1.6.2-5, which differs from the version in Vivid currently, but only a little. All of the changes are done in the debian/ folder. The full list is included below in the attached changelog revision for 1.6.2-5 in Debian, minus the added changelog entry for the merge (which is present in the debdiff).

The key changes made here are that the SSLv3 protocol is dropped in `nginx.conf` (which is higher up in the configuraiton inheritance structure than the default config) and that server-defined ciphers are preferred by default now (in `nginx.conf). As well, the nginx-common preinst, postinst, and postrm scripts now remove the /etc/nginx/naxsi-ui.conf conf files (which are now obsolete as the Naxsi variant was removed).

To be attached (shortly after this bug is asigned a bug number) is a debdiff for this merge. (I created it using the UDD method of merging, built the package, and ran a debdiff command to generate the diff.)


Debian Changelog for 1.6.2-5:

nginx (1.6.2-5) unstable; urgency=medium

  [ Christos Trochalakis ]
  * debian/conf/nginx.conf:
    + Drop SSLv3 protocol (POODLE), and prefer server ciphers
      by default. (Closes: #767456)
  * debian/copyright:
    + Add copyright for ngx_http_substitutions_filter_module.
  * debian/nginx-common.{preinst,postinst,postrm}:
    + Remove /etc/nginx/naxsi-ui.conf conffile. (Closes: #768233)
  * debian/README.Debian:
    + Add a list of important changes since wheezy.

 -- Christos Trochalakis <email address hidden> Sun, 30 Nov 2014 10:39:55 +0200

Thomas Ward (teward) on 2014-12-06
description: updated
Thomas Ward (teward) wrote :

Fixed a couple typos and missing elements in the debdiff, apologies for the noise.

Thomas Ward (teward) on 2014-12-29
Changed in nginx (Ubuntu):
status: New → Fix Committed
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package nginx - 1.6.2-5ubuntu1

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 <email address hidden> Sat, 06 Dec 2014 13:06:55 -0500

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

Other bug subscribers