ubuntu/+source/nginx:ubuntu/vivid-devel

Last commit made on 2015-07-13
Get this branch:
git clone -b ubuntu/vivid-devel https://git.launchpad.net/ubuntu/+source/nginx
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
ubuntu/vivid-devel
Repository:
lp:ubuntu/+source/nginx

Recent commits

5f5317a... by Thomas Ward on 2015-07-10

Import patches-unapplied version 1.6.2-5ubuntu3.1 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 5750dcf994f1577539312f66928595e7a59b0070

New changelog entries:
  * 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.

5750dcf... by Thomas Ward on 2015-04-01

Import patches-unapplied version 1.6.2-5ubuntu3 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: f2cd2c5757436652c2d0e7a921e86ebbf12f8c86

New changelog entries:
  * 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.

f2cd2c5... by Thomas Ward on 2015-04-01

Import patches-unapplied version 1.6.2-5ubuntu2 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 39eb635cded6b823b6b0a1c02f6da2ba9ceb4c18

New changelog entries:
  * debian/rules:
    * Added -fPIE -pie to build rules (enables position-independent builds)
      using Debian's committed change to enable. (LP: #1315426)

39eb635... by Thomas Ward on 2014-12-06

Import patches-unapplied version 1.6.2-5ubuntu1 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 7a8a9a90a6413fc5fd37dba447c5ec792cfcbfa6

New changelog entries:
  * 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.

7a8a9a9... by ctrochalakis on 2014-11-30

Import patches-unapplied version 1.6.2-5 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 76a9d567e1d72024c4f009df8cf5ff8c8f2d5481

New changelog entries:
  [ 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.

76a9d56... by ctrochalakis on 2014-10-19

Import patches-unapplied version 1.6.2-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 4f4fcce289cd2c689d65830b5f9ad55bb1ce61af

New changelog entries:
  [ Christos Trochalakis ]
  * debian/modules/nginx-development-kit:
    + Upgrade v0.2.17-7-g24202b4 -> v0.2.19
  * debian/modules/nginx-echo:
    + Upgrade v0.51 -> v0.56
  * debian/modules/nginx-upload-progress:
    + Upgrade v0.9.0-0-ga788dea -> 0.9.1
  * debian/modules/ngx-fancy-index:
    + Upgrade v0.3.3 -> v0.3.4
  * debian/copyright:
    + Rewrite copyright file fixing various issues.
  * debian/nginx-common.nginx.logrotate:
    + Switch postrotate to the initscript's rotate command.

4f4fcce... by ctrochalakis on 2014-10-16

Import patches-unapplied version 1.6.2-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 687e59f75e2fd84e9afc509fffd34b6ea368691e

New changelog entries:
  [ Christos Trochalakis ]
  * Change the default document root to /var/www/html according to debian
    policy 3.9.6.0. (Closes: #730382)
  * Provide a new, debian specific, default landing page.
  * debian/nginx-common.nginx.service:
    + Graceful stopping of nginx was not handled correctly with systemd.
  * debian/nginx-common.nginx.init:
    + Gracefully stop nginx by default, we are switcing to a configurable
      STOP/5/TERM/5/KILL/5 schedule. We are now in sync with the systemd
      service file. (Closes: #762708)
  * debian/conf:
    + Introduce a `snippets/fastcgi-php.conf` snippet with a basic
      php configuration that can be included when needed. (Closes: #762491)
    + Introduce a `snippets/snakeoil.conf` snippet that enabled https
      using the certs installed by the ssl-cert package.
    + Suggest disabling SSLv3 in default site with a ref to POODLE.
  * debian/control:
    + nginx-common now suggests ssl-cert.

687e59f... by ctrochalakis on 2014-09-26

Import patches-unapplied version 1.6.2-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 0776d8459e3548befeed669516eed1ea86bc2fe1

New changelog entries:
  [ Christos Trochalakis ]
  * Drop nginx-naxsi, nginx-naxsi-dbg, nginx-naxsi-ui packages.
    (Closes: #746199, #737146, #712445)
  * debian/conf/nginx.conf:
    + Remove relic passenger stanga.

0776d84... by ctrochalakis on 2014-09-17

Import patches-unapplied version 1.6.2-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 7c40413381d849edbd4a07bdd9a2b8559229b529

New changelog entries:
  [ Christos Trochalakis ]
  * New upstream release.
    CVE-2014-3616: "it was possible to reuse SSL sessions in unrelated
    contexts if a shared SSL session cache or the same TLS session ticket
    key was used for multiple "server" blocks".
    (Closes: #761940)

7c40413... by ctrochalakis on 2014-09-04

Import patches-unapplied version 1.6.1-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 67f51992698e5685754477bd697086b882f75f71

New changelog entries:
  [ Christos Trochalakis ]
  * debian/control:
    + Build nginx-extras against luajit (Closes: #755875)
  * debian/modules/nginx-lua:
    + Update nginx-lua to v0.9.12
  * debian/nginx-common.nginx.init:
    + Better pidfile extraction from nginx.conf (Closes: #747329)
  * debian/conf/mime.types:
    + Upgrade to the latest upstream mime types.
      As a consequence, nginx now uses "application/javascript" for
      javascript files.
  * debian/conf/nginx.conf:
    + Add application/javascript to the gzip_types list. (Closes: #737176)
  * debian/rules:
    + Make naxsi module first in configure parameters.
      Fixes erratic naxsi behaviour. (Closes: #758642)
  * debian/conf/{koi-utf,koi-win,scgi_params,uwsgi_params}:
    + Sync with upstream config files.
  * debian/conf/fastcgi_params:
    + Sync with upstream and remove `SCRIPT_FILENAME` parameter.
      This change might break fastcgi sites. (Closes: #718639)
  + debian/conf/fastcgi.conf:
    + Ship upstream file.
  * debian/nginx-common.NEWS:
    + Document syncing conf files with upstream.
  * debian/tests/control:
    + Include some simple autopkgtests.
      Thanks to Robie Basak for the initial patch. (Closes: #756391)
  * debian/modules/nginx-http-push:
    + Update to v0.73.
      Fixes fd leak on reload. (Closes: #745921)