lp:~cyphermox/ubuntu/lucid/nginx/merge_0.7.64-2_lp513099

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/lucid/nginx

Registry Administrators: Pending requested 2010-01-27

Diff: 874 lines (+325/-99)

25 files modified

CHANGES (+25/-0)
CHANGES.ru (+25/-0)
debian/changelog (+62/-0)
debian/control (+23/-3)
debian/copyright (+10/-7)
debian/init.d (+1/-1)
debian/nginx.1 (+36/-36)
debian/patches/dlopen.dpatch (+3/-4)
debian/rules (+11/-11)
debian/watch (+0/-9)
src/core/nginx.h (+2/-2)
src/core/ngx_resolver.c (+23/-16)
src/core/ngx_string.c (+31/-0)
src/core/ngx_string.h (+1/-0)
src/event/ngx_event_openssl.c (+40/-0)
src/event/ngx_event_openssl.h (+1/-0)
src/http/modules/ngx_http_gzip_static_module.c (+7/-1)
src/http/modules/ngx_http_map_module.c (+1/-1)
src/http/modules/ngx_http_referer_module.c (+6/-1)
src/http/modules/perl/nginx.pm (+1/-1)
src/http/ngx_http.c (+1/-1)
src/http/ngx_http_core_module.c (+6/-0)
src/http/ngx_http_request.c (+1/-1)
src/mail/ngx_mail_smtp_handler.c (+1/-1)
src/os/unix/ngx_alloc.c (+7/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #511681: Latest Nginx package appears to need Security Updates	Medium	Fix Released
Bug #513099: Please merge nginx 0.7.64-2 (universe) from Debian testing (main)	Wishlist	Fix Released

Link a bug report

Related blueprints

30. By Mathieu Trudel-Lapierre on 2010-01-27

* Merge from debian testing (LP: #513099), remaining changes:
  - Install html files.
    - debian/dirs: Add 'var/www/nginx-default'.
    - debian/nginx.install: Add 'html/* var/www/nginx-default'.
  - Add a UFW profile set:
    + debian/nginx.ufw.profile: Added.
    + debian/control: nginx: Suggests ufw.
    + debian/dirs: Add 'etc/ufw/applications.d'
    + debian/rules: Add install rule for the nginx UFW profile.
* Fixes CVE-2009-3555, as per changelog entry in 0.7.64-1. (LP: #511681)

29. By Mathieu Trudel-Lapierre on 2010-01-27

Merging shared upstream rev into target branch.

28. By Andres Rodriguez on 2009-11-30

* Merge from debian testing (LP: #490450), remaining changes:
  - Install html files.
    - debian/dirs: Add 'var/www/nginx-default'.
    - debian/nginx.install: Add 'html/* var/www/nginx-default'.
  - Added a UFW profile set: (LP: #308695)
    + debian/nginx.ufw.profile: Added.
    + debian/control: nginx: Suggests ufw.
    + debian/dirs: Added 'etc/ufw/applications.d'
    + debian/rules: Added install rule for the nginx UFW profile.

27. By Daniel Hahler on 2009-10-19

* Merge from debian unstable (LP: #450874), remaining changes:
  - Install html files.
    - debian/dirs: Add 'var/www/nginx-default'.
    - debian/nginx.install: Add 'html/* var/www/nginx-default'.
  - Added a UFW profile set: (LP: #308695)
    + debian/nginx.ufw.profile: Added.
    + debian/control: nginx: Suggests ufw.
    + debian/dirs: Added 'etc/ufw/applications.d'
    + debian/rules: Added install rule for the nginx UFW profile.
* Closes: LP: #260005, LP: #440888

26. By Andres Rodriguez on 2009-09-24

* Install html files.
  - debian/dirs: Add 'var/www/nginx-default'.
  - debian/nginx.install: Add 'html/* var/www/nginx-default'.
* SECURITY UPDATE (CVE-2009-2629): Buffer underflow vulnerability, which
  allows remote attackers to execute arbitrary code via crafted HTTP
  request. (LP: #430064)
  - src/http/ngx_http_parse.c patched.

25. By Andres Rodriguez on 2009-08-20

* Merge from debian unstable (LP: #416635), remaining changes:
  - Readd status action to init script:
    + debian/init.d:
      - Add sourcing to '. /lib/lsb/init-functions'
      - Add 'status' action.
    + debian/control: Add Depend on lsb >= 3.2-14, which has the
      statuc_of_proc() function.
  - Added a UFW profile set: (LP: #308695)
    + debian/nginx.ufw.profile: Added.
    + debian/control: nginx: Suggests ufw.
    + debian/dirs: Added 'etc/ufw/applications.d'
    + debian/rules: Added install rule for the nginx UFW profile.
  - Added support for gzip_static module: (LP: #346010)
    + debian/rules: Added '--with-http_gzip_static_module' to configure.

24. By Andres Rodriguez on 2009-08-04

* Readd status action to init script: (LP: #251985)
  - debian/init.d:
    + Add sourcing to '. /lib/lsb/init-functions'
    + Add 'status' action.
  - debian/control: Add Depend on lsb >= 3.2-14, which has the
    statuc_of_proc() function.
* Added a UFW profile set: (LP: #308695)
  - debian/nginx.ufw.profile: Added.
  - debian/control: nginx: Suggests ufw.
  - debian/dirs: Added 'etc/ufw/applications.d'
  - debian/rules: Added install rule for the nginx UFW profile.
* Added support for gzip_static module: (LP: #346010)
  - debian/rules: Added '--with-http_gzip_static_module' to configure.
* debian/control: Update Maintainer field to match Ubuntu Developers.

23. By Fabio Tranchitella on 2009-05-31

* New upstream release, first in Debian for the 0.7 branch. Among other
  issues, it also fixes the problem with wildcard dns names used with SSL.
  (Closes: #515904)
* debian/watch: updated.
* debian/postinst: fixed a bashism. (Closes: #507913)
* debian/conf/nginx.conf: removed default_type. (Closes: #509390)
* debian/control: updated Standards-Version to 3.8.1, no changes needed.
* debian/NEWS.Debian: documented the issues with
  server_names_hash_bucket_size. (Closes: #524785)

22. By Daniel Hahler on 2009-02-20

New upstream bugfix release

21. By Lionel Porcheron on 2008-12-08

 * Merge from Debian unstable. Remaining Ubuntu changes:
  + debian/control:
    - Add Depend on lsb >= 3.2-14, which has the status_of_proc() function.
  + debian/init.d:
    - Add sourcing to '. /lib/lsb/init-functions'
    - Add the 'status' action
 * Drop unneeded IOV_MAX patch and dpatch system (LP: #260022)