ubuntu/+source/nginx:ubuntu/trusty-proposed

Last commit made on 2015-07-30
Get this branch:
git clone -b ubuntu/trusty-proposed 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/trusty-proposed
Repository:
lp:ubuntu/+source/nginx

Recent commits

0e9662f... by Thomas Ward on 2015-07-29

Import patches-unapplied version 1.4.6-1ubuntu3.3 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 474940757be5fee9a50343c04e3d9bd68dc2070f

New changelog entries:
  * debian/nginx-common.nginx.init: Fix pidfile extraction, due to multiple
    failure cases, using Debian's solution. (LP: #1314740)

4749407... by Thomas Ward on 2015-02-09

Import patches-unapplied version 1.4.6-1ubuntu3.2 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 73fef2ab7d6d57ea7a79fb04360963f1ba22f142

New changelog entries:
  * d/modules/nginx-http-push: Apply upstream bugfix. (LP: #1216817)
    * src/ngx_http_push_module_setup.c: Modify push module code with
      upstream changes to fix an issue with initialization when using
      `fastcgi_cache` or `proxy_cache`.
    * tests/nginx-cachemanager.conf: (new file) Include upstream change
      of adding an nginx-cachemanager.conf file to the tests.

73fef2a... by Marc Deslauriers on 2014-09-17

Import patches-unapplied version 1.4.6-1ubuntu3.1 to ubuntu/trusty-security

Imported using git-ubuntu import.

Changelog parent: c94d5751afca37609d0982a35ea1b7df7585b25a

New changelog entries:
  * SECURITY UPDATE: incorrect cached SSL session reuse (LP: #1370478)
    - debian/patches/CVE-2014-3616.patch: include hash of certificate in
      session id context in src/event/ngx_event_openssl.c.
    - CVE-2014-3616

c94d575... by Thomas Ward on 2014-03-10

Import patches-unapplied version 1.4.6-1ubuntu3 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: dee08f5931ba689b998ad9491418a56a40f9e404

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

dee08f5... by Adam Conrad on 2014-03-09

Import patches-unapplied version 1.4.6-1ubuntu2 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 7c33493e008f18852523903be43fab88fdfb7dca

New changelog entries:
  * debian/rules: Drop from -O3 to -O2 to work around a build failure.

7c33493... by Adam Conrad on 2014-03-09

Import patches-unapplied version 1.4.6-1ubuntu1 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 0dbecbcbf3e016e7c101f68537ffaf0a7ba0a8fd

New changelog entries:
  * Merge from Debian unstable. Remaining changes:
    - debian/patches/ubuntu-branding.patch: Add Ubuntu branding.

0dbecbc... by ctrochalakis on 2014-03-04

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

Imported using git-ubuntu import.

Changelog parent: 410192864b2767cf105bb3236b124c20ebe2c4c8

New changelog entries:
  [ Christos Trochalakis ]
  * New upstream release.
  * debian/rules:
    + Avoid double declaration of hardening flags.
    + Expand buildflags so the build log is easier to follow.
    + Switch to --with--cc-opt, --with-ld-opt configure flags.
      Nginx is now compiled with --Werror, making all warnings
      into errors.
    + Split common configure options.
    + Enable realip module for nginx-light.
    + Enable debug module for nginx-light and nginx-extras.
  * debian/patches/perl-use-dpkg-buildflags.patch:
    + Rewrite patch to just just override LDDLFLAGS and not
      CCFLAGS since this is handled by --with-cc-opt.
  * debian/watch, debian/upstream/signing-key.asc:
    + Fix upstream signature verification.

4101928... by ctrochalakis on 2014-02-13

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

Imported using git-ubuntu import.

Changelog parent: c9a777217535cbe47fdb6debbb43a88a6fa0d627

New changelog entries:
  [ Christos Trochalakis ]
  * New upstream release.
  * debian/modules/nginx-lua:
    + Update nginx-lua to v0.9.4
  * debian/nginx-naxsi-ui.preinst:
    + Fix exit status issue (Closes: #735152)
  * debian/control:
    + Fix arch:all to arch:any dependencies
    + Make nginx depend on specific flavor version
  * debian/nginx-*.postinst:
    + Make nginx start by default (Closes: #735551)
  * debian/nginx-*.prerm:
    + No need to check for invoke-rc.d,
      correctly set the exit code on error
  * debian/nginx-common.nginx.init:
    + Rewrite some parts of the initscript
    + Introduce rotate command
    + Introduce upgrade command

c9a7772... by ctrochalakis on 2014-01-04

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

Imported using git-ubuntu import.

Changelog parent: a0ef9c38baa6b932ba36c57f70653f11ed32a6bb

New changelog entries:
  [ Christos Trochalakis ]
  * debian/nginx-common.postinst:
    + Fix log re-opening issue due to wrong /var/log/nginx
      permissions. (Closes: #734139)

a0ef9c3... by ctrochalakis on 2013-12-31

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

Imported using git-ubuntu import.

Changelog parent: 1013110812182ef0158472db16fbd62fe0b6704a

New changelog entries:
  [ Christos Trochalakis ]
  * debian/nginx-naxsi-ui.postinst:
    + Fix early exit issue (Closes: #715435)