Created by James Westby and last modified
Get this branch:
bzr branch lp:ubuntu/raring/nginx
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches

Recent revisions

62. By Chuck Short

debian/patches/ubuntu-branding.patch: Add ubuntu branding
to server_tokens.

61. By Thomas Ward

* debian/conf/sites-available/default:
  * Modify default site configuration file to correct a typo
    that prevented out-of-the-box usability (LP: #1162177)

60. By Thomas Ward

* debian/conf/sites-available/default:
  * Modify default site default configuration file to bind to IPv6
    only for IPv6 default listen statement (LP: #1132678)

59. By Kartik Mistry

[ Kartik Mistry ]
* New upstream release.
* debian/nginx-common.nginx.init:
  + Used log_*_msg instead of echo for better init messages.
  + Added patch to check start-stop-daemon exit status, Thanks to
    Sergey B Kirpichev <email address hidden> (Closes: #695374).
* debian/po/ja.po:
  + Added new Japanese translation. Thanks to victory <email address hidden>
    (Closes: #692481).
* debian/po/pt_BR.po:
  + Added new Brazilian Portuguese translation. Thanks to
    Adriano Rafael Gomes <email address hidden> (Closes: #692481).

[ Cyril Lavier ]
* debian/rules
  + Added RealIP module in nginx-naxsi (Closes: #693302).
* debian/modules/nginx-cache-purge/
  + Updated nginx-cache-purge module with the 2.0 version.
* debian/modules/nginx-lua/
  + Updated nginx-lua module with the 0.7.8 version.
* debian/modules/nginx-echo/
  + Updated the nginx-echo module with the 0.41 version.
* debian/modules/headers-more-nginx-module/
  + Updated the Headers-more module with the 0.19 version.
* debian/modules/README.Modules-versions
  + Updated the current version of modules following the updates.

[ Michael Lustfield ]
* debian/conf/sites-available/default
  + Uncommented listen lines to make server block default.

58. By Kartik Mistry

* debian/conf/nginx.conf:
  + Fixed pid path to /run/nginx.pid in config.
* debian/po/*.po, debian/nginx-naxsi-ui.templates, debian/po/templates.pot:
  + Fixed ^M characters in template file. Thanks to Christian Perrier
    <email address hidden> for help (Closes: #692191, #692335)

57. By Kartik Mistry

[ Michael Lustfield ]
* debian/nginx-common.nginx.init
  + Added --retry to start-stop-daemon. (Closes: #682360)
  + Added $named to Required-Start/Stop. (Closes: #679879)
  + Added some other modifications after testing. (LP: #1033856)
* debian/rules:
  + Added -DFORTIFY_SOURCE=2 -fstack-protector to build flags.
    (Closes: #680712)
* debian/nginx-common.install:
  + Moved default docs to /usr/share/nginx/html. (Closes: #1031515)
* debian/rules:
  + Set prefix to /usr/share/nginx.
* debian/po/fr.po
  + Updated French translation file. (Closes: #679601)
* debian/logrotate:
  + Removed semicolon after an fi statement. (Closes: #683870)
* debian/copyright:
  + Removed trailing slash from File: fields.
* Changed /var/run to /run in multiple files. (LP: #1050516)
* debian/nginx-common.dirs:
  + Added /run to .dirs to avoid conflicts with backports. (LP: #1072641)
* debian/nginx-*.postinst:
  + Added sites-enabled/available directory checks. (Closes: #688410)
    - Thanks Andreas Marschke <email address hidden>
  + Moved the symlink creation to nginx-common.
* Updated debconf templates.
* conf/sites-available/default:
  + Updated root to point at /usr/share/nginx/html instead of www.

[ Kartik Mistry ]
* Acknowledged NMUs (Closes: #681758, #681381)
* New upstream release (Closes: #683704)
* debian/po/*.po:
  + Removed ^M characters from headers.
  + Fixed all files with recent unneeded template change.

56. By gregor herrmann

* Non-maintainer upload.
* Fix "removes files that were installed by another package":
  don't remove directories that are owned by (and removed from) nginx-common
  from nginx-extras.postrm. This seems to have been the idea in commit e30a854
  ("Moved configuration purging to nginx-common.") except that it was added
  in nginx-common.postrm without being removed in nginx-extras.postrm.
  Remove nginx-extras.postrm since it's empty after this change.
  (Closes: #681758)

55. By Cyril Lavier

[Cyril Lavier]
* Urgency set to medium, security bug in naxsi module, fix via upstream.
* debian/modules/naxsi:
  + Updated naxsi module to version 0.46-1 fixing the following security
    issue : potential file disclosure in nx_extract.

54. By Kartik Mistry

[Cyril Lavier]
* New upstream release. (Closes: #670306)
  + 1.2.x is stable release now.
* debian/modules/chunkin-nginx-module:
  + Updated chunkin-nginx-module to v0.23rc2-3-g85eca98.
* debian/modules/headers-more-module:
  + Updated headers-more-module to v0.17rc1-4-g33a82ed.
* debian/modules/nginx-development-kit:
  + Updated nginx-development-kit to v0.2.17-7-g24202b4.
* debian/modules/nginx-echo:
  + Updated nginx-echo to v0.38rc2-7-g080c0a1.
* debian/modules/nginx-lua:
  + Updated nginx-lua to v0.5.0rc25-5-g8d28785.
* debian/modules/nginx-upstream-fair:
  + Updated nginx-upstream-fair to a18b409.
* debian/modules/nginx-upload-progress:
  + Updated nginx-upload-progress to v0.9.0-0-ga788dea.
* debian/modules/naxsi:
  + Updated naxsi to 0.46
* debian/modules/README.Modules-versions:
  + Updated versions and URLs for modules.
* debian/naxsi-ui-extract, debian/naxsi-ui-intercept,
  debian/nginx-naxsi-ui.*, debian/naxsi-ui-extract.1,
  debian/naxsi-ui-intercept.1, debian/rules:
  + Added nginx-naxsi-ui package containing the learning daemon
    and the WebUI.
* debian/nginx-common.nginx.default, debian/nginx-common.nginx.init:
  + Renamed files to be compliant with the nginx-naxsi-ui package.
* debian/po:
  + Added needed files for using po-debconf.
  + Added French translation.
* debian/control:
  + Applied the modifications given after the review by Justin Rye.

[Michael Lustfield]
* debian/conf/uwsgi_params:
  + Added UWSGI_SCHEME to uwsgi_params. (Closes: #664878)
* debian/conf/sites-available/default:
  + Added allow directive for ipv6 localhost. (Closes: #664271)

[Kartik Mistry]
* debian/control:
  + wrap-and-sort.
* debian/copyright:
  + Added missing copyrights, minor formatting fixes.
* debian/nginx-common.nginx.init:
  + Added ulimit for restarts, Thanks to Daniel Roschka
    <email address hidden> for patch. (Closes: #673580)
* debian/conf/sites-available/default:
  + Added patch to fix deprecated "listen" directive, Thanks to
    Guillaume Plessis <email address hidden> for patch. (Closes: #672632)

53. By Cyril Lavier

[Cyril Lavier]
* New upstream release.
  + Fixed a buffer overflow in the ngx_http_mp4_module. See: CVE-2012-2089
    for more details.
* debian/copyright:
  + Updated licenses.
* debian/nginx-extras.postinst, debian/nginx-full.postinst,
  debian/nginx-light.postinst, debian/nginx-naxsi.postinst:
  + Removing the debug markers. (Closes: #667894)
* debian/control, debian/rules, debian/copyright,
  + Added nginx-dav-ext-module in full and extras.
* debian/modules/naxsi:
  + Updated naxsi to the SVN snapshot (r280) to fix the licence issue with

[Kartik Mistry]
* Misc cleanups in debian/control, debian/copyright.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.