diff -Nru nginx-1.9.6/debian/apport/source_nginx.py nginx-1.9.6/debian/apport/source_nginx.py --- nginx-1.9.6/debian/apport/source_nginx.py 1969-12-31 19:00:00.000000000 -0500 +++ nginx-1.9.6/debian/apport/source_nginx.py 2015-07-22 11:39:05.000000000 -0400 @@ -0,0 +1,19 @@ +''' +apport package hook for nginx packages + +Copyright (c) 2015, Thomas Ward +''' + +import apport.hookutils +import os +import subprocess + +def add_info(report, ui): + if (report['Package'].split()[0] != 'nginx-common' + and report['ProblemType'] == 'Package' + and os.path.isdir('/run/systemd/system')): + report['Journalctl_Nginx.txt'] = apport.hookutils.command_output( + ['journalctl', '-xe', '--unit=nginx.service']) + report['SystemctlStatusFull_Nginx.txt'] = subprocess.Popen( + ['systemctl', '-l', 'status', 'nginx.service'], + stdout=subprocess.PIPE).communicate()[0] diff -Nru nginx-1.9.6/debian/changelog nginx-1.9.6/debian/changelog --- nginx-1.9.6/debian/changelog 2015-11-13 09:08:16.000000000 -0500 +++ nginx-1.9.6/debian/changelog 2015-12-15 10:55:27.000000000 -0500 @@ -1,3 +1,30 @@ +nginx (1.9.6-2ubuntu1) xenial; urgency=medium + + * Merge from Debian unstable. Remaining changes: (LP: #1510096) + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - 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. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + * Additional changes: + * debian/rules: + - Update nginx-core configure flags to match nginx-full config flags, + due to refreshing the nginx-core 'enabled modules' to match the + nginx-full modules (minus third-party modules) + - Disable HTTP/2 module support in all flavors, per Ubuntu Security + Team mandate. + * debian/control: + - Update nginx-core description to match nginx-full description of the + standard and optional HTTP modules that are enabled. + - Remove HTTP/2 references in package descriptions, per Ubuntu + Security Team mandate to disable HTTP/2 support. + + -- Thomas Ward Mon, 14 Dec 2015 10:34:42 -0500 + nginx (1.9.6-2) unstable; urgency=medium [ Christos Trochalakis] @@ -23,6 +50,21 @@ -- Christos Trochalakis Mon, 24 Aug 2015 16:23:20 +0300 +nginx (1.9.3-1ubuntu1) wily; urgency=medium + + * Merge from Debian. Remaining changes: (LP: #1476811) + - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed) + - 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. + - debian/apport/source_nginx.py: Add apport hooks for additional bug + information gathering. + - debian/nginx-common.install: Add install rule for apport hooks. + + -- Thomas Ward Wed, 22 Jul 2015 11:39:44 -0400 + nginx (1.9.3-1) unstable; urgency=medium [ Christos Trochalakis] @@ -107,6 +149,52 @@ -- Christos Trochalakis Fri, 12 Jun 2015 15:42:49 +0300 +nginx (1.6.2-5ubuntu4) wily; urgency=medium + + * 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. + + -- Thomas Ward Fri, 10 Jul 2015 12:51:48 -0400 + +nginx (1.6.2-5ubuntu3) vivid-proposed; urgency=medium + + * 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. + + -- Thomas Ward Wed, 01 Apr 2015 14:57:34 -0400 + +nginx (1.6.2-5ubuntu2) vivid-proposed; urgency=medium + + * debian/rules: + * Added -fPIE -pie to build rules (enables position-independent builds) + using Debian's committed change to enable. (LP: #1315426) + + -- Thomas Ward Wed, 01 Apr 2015 14:26:32 -0400 + +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 Sat, 06 Dec 2014 13:06:55 -0500 + nginx (1.6.2-5) unstable; urgency=medium [ Christos Trochalakis ] @@ -122,6 +210,27 @@ -- Christos Trochalakis Sun, 30 Nov 2014 10:39:55 +0200 +nginx (1.6.2-4ubuntu1) vivid; urgency=medium + + * Merge from Debian. Remaining changes: (LP: #1388621) + - 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. + * debian/control: + * Remove nginx-naxsi* from nginx-core and related + package stanzas, as the naxsi packages have all been dropped. + * Remove reference to nginx-naxsi from nginx metapackage description + * debian/index.html: Modify included index.html file to have Ubuntu + branding, Ubuntu bug reporting tool references, and a link to the + Launchpad bugs page for the nginx package. + + -- Thomas Ward Wed, 05 Nov 2014 10:05:07 -0500 + nginx (1.6.2-4) unstable; urgency=medium [ Christos Trochalakis ] @@ -173,6 +282,27 @@ -- Christos Trochalakis Fri, 26 Sep 2014 11:06:47 +0300 +nginx (1.6.2-1ubuntu1.1) utopic; urgency=medium + + * debian/conf/sites-available/default: Remove SSLv3 from the ssl_protocols + line in the default config example, due to POODLE vulnerability. + + -- Thomas Ward Wed, 22 Oct 2014 09:43:35 -0400 + +nginx (1.6.2-1ubuntu1) utopic; urgency=medium + + * Merge from Debian. Remaining changes: + - 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. + + -- Marc Deslauriers Mon, 22 Sep 2014 13:32:30 -0400 + nginx (1.6.2-1) unstable; urgency=high [ Christos Trochalakis ] @@ -220,6 +350,25 @@ -- Christos Trochalakis Thu, 04 Sep 2014 13:00:46 +0300 +nginx (1.6.1-1ubuntu2) utopic; urgency=medium + + * Rebuild for Perl 5.20.0. + + -- Colin Watson Sun, 24 Aug 2014 06:43:36 -0700 + +nginx (1.6.1-1ubuntu1) utopic; urgency=medium + + * Merge from Debian. Remaining changes: + - 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. + * Add dep8 smoke test + + -- Robie Basak Fri, 15 Aug 2014 16:46:48 +0000 + nginx (1.6.1-1) unstable; urgency=medium [ Christos Trochalakis ] @@ -285,6 +434,34 @@ -- Christos Trochalakis Tue, 18 Mar 2014 22:03:47 +0200 +nginx (1.4.6-1ubuntu3) trusty; urgency=medium + + * 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) + + -- Thomas Ward Mon, 10 Mar 2014 18:23:36 -0400 + +nginx (1.4.6-1ubuntu2) trusty; urgency=medium + + * debian/rules: Drop from -O3 to -O2 to work around a build failure. + + -- Adam Conrad Sun, 09 Mar 2014 11:49:28 -0600 + +nginx (1.4.6-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/ubuntu-branding.patch: Add Ubuntu branding. + + -- Adam Conrad Sun, 09 Mar 2014 11:13:26 -0600 + nginx (1.4.6-1) unstable; urgency=medium [ Christos Trochalakis ] @@ -306,6 +483,14 @@ -- Christos Trochalakis Tue, 04 Mar 2014 18:06:55 +0200 +nginx (1.4.5-1ubuntu1) trusty; urgency=medium + + * Resynchronise with Debian (LP: #1280511). Remaining changes: + - debian/patches/ubuntu-branding.patch: + + Add Ubuntu branding to server_tokens. + + -- Colin Watson Sat, 15 Feb 2014 03:05:42 +0000 + nginx (1.4.5-1) unstable; urgency=medium [ Christos Trochalakis ] @@ -346,6 +531,14 @@ -- Christos Trochalakis Tue, 31 Dec 2013 11:47:07 +0200 +nginx (1.4.4-2ubuntu1) trusty; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - debian/patches/ubuntu-branding.patch: + + Add Ubuntu branding to server_tokens. + + -- Colin Watson Sat, 28 Dec 2013 10:21:44 +0000 + nginx (1.4.4-2) unstable; urgency=low [ Michael Lustfield ] @@ -383,6 +576,14 @@ -- Kartik Mistry Fri, 27 Dec 2013 21:16:01 +0530 +nginx (1.4.4-1ubuntu1) trusty; urgency=low + + * Resynchronise with Debian (LP: #1253691). Remaining changes: + - debian/patches/ubuntu-branding.patch: + + Add Ubuntu branding to server_tokens. + + -- Colin Watson Fri, 22 Nov 2013 12:23:25 +0000 + nginx (1.4.4-1) unstable; urgency=low [ Christos Trochalakis ] @@ -407,6 +608,14 @@ -- Michael Lustfield Thu, 21 Nov 2013 19:25:50 +0530 +nginx (1.4.3-2ubuntu1) trusty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - debian/patches/ubuntu-branding.patch: + + Add Ubuntu branding to server_tokens. + + -- Colin Watson Mon, 21 Oct 2013 13:26:52 +0100 + nginx (1.4.3-2) unstable; urgency=low [ Kartik Mistry ] @@ -463,6 +672,14 @@ -- Kartik Mistry Thu, 10 Oct 2013 17:28:56 +0530 +nginx (1.4.1-3ubuntu1) saucy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - debian/patches/ubuntu-branding.patch: + + Add Ubuntu branding to server_tokens. + + -- Colin Watson Thu, 20 Jun 2013 15:08:44 +0100 + nginx (1.4.1-3) unstable; urgency=low [ Kartik Mistry ] @@ -476,6 +693,14 @@ -- Kartik Mistry Sun, 09 Jun 2013 13:07:52 +0530 +nginx (1.4.1-2ubuntu1) saucy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - debian/patches/ubuntu-branding.patch: + + Add Ubuntu branding to server_tokens. + + -- Colin Watson Fri, 07 Jun 2013 15:41:48 +0100 + nginx (1.4.1-2) unstable; urgency=medium [ Kartik Mistry] @@ -497,6 +722,24 @@ -- Kartik Mistry Thu, 06 Jun 2013 12:55:23 +0530 +nginx (1.4.1-1ubuntu2) saucy; urgency=low + + * Rebuild for libgd3. + + -- Colin Watson Mon, 20 May 2013 00:45:10 +0100 + +nginx (1.4.1-1ubuntu1) saucy; urgency=low + + * Merge with Debian unstable (LP: #1177919). Remaining changes: + - debian/conf/sites-available/default: + + Modify default site configuration file to correct a typo + that prevented out-of-the-box usability (LP: #1162177). + - debian/patches/ubuntu-branding.patch: + + Add ubuntu branding to server_tokens. + * Refresh all patches. + + -- Dmitry Shachnev Sat, 11 May 2013 14:47:53 +0400 + nginx (1.4.1-1) unstable; urgency=low * New upstream release: @@ -574,6 +817,36 @@ -- Kartik Mistry Thu, 25 Apr 2013 12:51:45 +0530 +nginx (1.2.6-1ubuntu4) saucy; urgency=low + + * debian/patches/ubuntu-branding.patch: Move Ubuntu branding from + the numerical version string to the long version (LP: #1174158) + + -- Adam Conrad Thu, 09 May 2013 11:50:52 -0600 + +nginx (1.2.6-1ubuntu3) raring; urgency=low + + * debian/patches/ubuntu-branding.patch: Add ubuntu branding + to server_tokens. + + -- Chuck Short Tue, 09 Apr 2013 10:23:26 -0500 + +nginx (1.2.6-1ubuntu2) raring; urgency=low + + * debian/conf/sites-available/default: + * Modify default site configuration file to correct a typo + that prevented out-of-the-box usability (LP: #1162177) + + -- Thomas Ward Fri, 05 Apr 2013 20:22:38 +0100 + +nginx (1.2.6-1ubuntu1) raring; urgency=low + + * debian/conf/sites-available/default: + * Modify default site default configuration file to bind to IPv6 + only for IPv6 default listen statement (LP: #1132678) + + -- Thomas Ward Tue, 12 Mar 2013 00:23:02 +0000 + nginx (1.2.6-1) unstable; urgency=low [ Kartik Mistry ] diff -Nru nginx-1.9.6/debian/control nginx-1.9.6/debian/control --- nginx-1.9.6/debian/control 2015-11-13 09:08:16.000000000 -0500 +++ nginx-1.9.6/debian/control 2015-12-15 10:00:47.000000000 -0500 @@ -1,7 +1,8 @@ Source: nginx Section: httpd Priority: optional -Maintainer: Kartik Mistry +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Kartik Mistry Uploaders: Jose Parrella , Fabio Tranchitella , Michael Lustfield , @@ -15,7 +16,7 @@ libexpat-dev, libgd-dev, libgeoip-dev, - libluajit-5.1-dev [i386 amd64 kfreebsd-i386 armel armhf powerpc powerpcspe mips mipsel] | liblua5.1-0-dev, + liblua5.1-0-dev, libmhash-dev, libpam0g-dev, libpcre3-dev, @@ -31,9 +32,11 @@ Package: nginx Architecture: all -Depends: nginx-full (>= ${source:Version}) | +Depends: nginx-core (>= ${source:Version}) | + nginx-full (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version}) , + nginx-core (<< ${source:Version}.1~) | nginx-full (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~) , @@ -43,8 +46,8 @@ created by Igor Sysoev. It can be used both as a standalone web server and as a proxy to reduce the load on back-end HTTP or mail servers. . - This is a dependency package to install either nginx-full (by default) or - nginx-light. + This is a dependency package to install either nginx-core (by default), + nginx-full, nginx-light, or nginx-extras. Package: nginx-doc Architecture: all @@ -77,12 +80,56 @@ This package contains base configuration files used by all versions of nginx. +Package: nginx-core +Architecture: any +Depends: nginx-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} +Breaks: nginx (<< 1.4.5-1) +Provides: httpd, httpd-cgi, nginx +Conflicts: nginx-extras, nginx-light, nginx-full +Suggests: nginx-doc (= ${source:Version}) +Description: nginx web/proxy server (core version) + Nginx ("engine X") is a high-performance web and reverse proxy server + created by Igor Sysoev. It can be used both as a standalone web server + and as a proxy to reduce the load on back-end HTTP or mail servers. + . + This package provides a version of nginx with the complete set of + standard modules included (but omitting some of those included in + nginx-extras). + . + STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Browser, Empty + GIF, FastCGI, Geo, Limit Connections, Limit Requests, Map, Memcached, Proxy, + Referer, Rewrite, SCGI, Split Clients, UWSGI. + . + OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, GeoIP, Gunzip, + Gzip, Gzip Precompression, Headers, Image Filter, Index, Log, Real IP, + SSI, SSL, Stream, Stub Status, Substitution, Thread Pool, Upstream, User ID, + XSLT. + . + MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP. + . + NOTE: This is identical to the -full build, but without any third party + modules built in. + +Package: nginx-core-dbg +Architecture: any +Section: debug +Priority: extra +Depends: nginx-core (= ${binary:Version}), ${misc:Depends} +Conflicts: nginx-extras-dbg, nginx-light-dbg, nginx-full-dbg +Description: nginx web/proxy server (core version) - debugging symbols + Nginx ("engine X") is a high-performance web and reverse proxy server + created by Igor Sysoev. It can be used both as a standalone web server + and as a proxy to reduce the load on back-end HTTP or mail servers. + . + This package provides debugging symbols for nginx-core, to assist in debugging + issues that you may find. It should not be required for normal operation. + Package: nginx-full Architecture: any Depends: nginx-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} Breaks: nginx (<< 1.4.5-1) Provides: httpd, httpd-cgi, nginx -Conflicts: nginx-extras, nginx-light +Conflicts: nginx-extras, nginx-light, nginx-core Suggests: nginx-doc (= ${source:Version}) Description: nginx web/proxy server (standard version) Nginx ("engine X") is a high-performance web and reverse proxy server @@ -98,7 +145,7 @@ Referer, Rewrite, SCGI, Split Clients, UWSGI. . OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, GeoIP, Gunzip, - Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log, Real IP, + Gzip, Gzip Precompression, Headers, Image Filter, Index, Log, Real IP, SSI, SSL, Stream, Stub Status, Substitution, Thread Pool, Upstream, User ID, XSLT. . @@ -112,7 +159,7 @@ Section: debug Priority: extra Depends: nginx-full (= ${binary:Version}), ${misc:Depends} -Conflicts: nginx-extras-dbg, nginx-light-dbg +Conflicts: nginx-extras-dbg, nginx-light-dbg, nginx-core-dbg Description: nginx web/proxy server (standard version) - debugging symbols Nginx ("engine X") is a high-performance web and reverse proxy server created by Igor Sysoev. It can be used both as a standalone web server @@ -127,7 +174,7 @@ Depends: nginx-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} Breaks: nginx (<< 1.4.5-1) Provides: httpd, httpd-cgi, nginx -Conflicts: nginx-extras, nginx-full +Conflicts: nginx-extras, nginx-full, nginx-core Suggests: nginx-doc (= ${source:Version}) Description: nginx web/proxy server (basic version) Nginx ("engine X") is a high-performance web and reverse proxy server @@ -150,7 +197,7 @@ Section: debug Priority: extra Depends: nginx-light (= ${binary:Version}), ${misc:Depends} -Conflicts: nginx-extras-dbg, nginx-full-dbg +Conflicts: nginx-extras-dbg, nginx-full-dbg, nginx-core-dbg Description: nginx web/proxy server (basic version) - debugging symbols Nginx ("engine X") is a high-performance web and reverse proxy server created by Igor Sysoev. It can be used both as a standalone web server @@ -169,7 +216,7 @@ ${shlibs:Depends} Breaks: nginx (<< 1.4.5-1) Provides: httpd, httpd-cgi, nginx -Conflicts: nginx-full, nginx-light +Conflicts: nginx-full, nginx-light, nginx-core Suggests: nginx-doc (= ${source:Version}) Description: nginx web/proxy server (extended version) Nginx ("engine X") is a high-performance web and reverse proxy server @@ -200,7 +247,7 @@ Section: debug Priority: extra Depends: nginx-extras (= ${binary:Version}), ${misc:Depends} -Conflicts: nginx-full-dbg, nginx-light-dbg +Conflicts: nginx-full-dbg, nginx-light-dbg, nginx-core-dbg Description: nginx web/proxy server (extended version) - debugging symbols Nginx ("engine X") is a high-performance web and reverse proxy server created by Igor Sysoev. It can be used both as a standalone web server diff -Nru nginx-1.9.6/debian/nginx-common.install nginx-1.9.6/debian/nginx-common.install --- nginx-1.9.6/debian/nginx-common.install 2015-11-13 09:08:16.000000000 -0500 +++ nginx-1.9.6/debian/nginx-common.install 2015-11-13 17:30:26.000000000 -0500 @@ -1,5 +1,6 @@ debian/conf/* etc/nginx debian/ufw/nginx etc/ufw/applications.d +debian/apport/source_nginx.py usr/share/apport/package-hooks html/index.html usr/share/nginx/html/ debian/vim/nginx.yaml usr/share/vim/registry contrib/vim/* usr/share/vim/addons diff -Nru nginx-1.9.6/debian/nginx-core.dirs nginx-1.9.6/debian/nginx-core.dirs --- nginx-1.9.6/debian/nginx-core.dirs 1969-12-31 19:00:00.000000000 -0500 +++ nginx-1.9.6/debian/nginx-core.dirs 2015-07-22 11:39:05.000000000 -0400 @@ -0,0 +1 @@ +usr/sbin diff -Nru nginx-1.9.6/debian/nginx-core.install nginx-1.9.6/debian/nginx-core.install --- nginx-1.9.6/debian/nginx-core.install 1969-12-31 19:00:00.000000000 -0500 +++ nginx-1.9.6/debian/nginx-core.install 2015-07-22 11:39:05.000000000 -0400 @@ -0,0 +1 @@ +debian/build-core/objs/nginx usr/sbin diff -Nru nginx-1.9.6/debian/nginx-core.lintian-overrides nginx-1.9.6/debian/nginx-core.lintian-overrides --- nginx-1.9.6/debian/nginx-core.lintian-overrides 1969-12-31 19:00:00.000000000 -0500 +++ nginx-1.9.6/debian/nginx-core.lintian-overrides 2015-07-22 11:39:05.000000000 -0400 @@ -0,0 +1 @@ +nginx-core: spelling-error-in-binary usr/sbin/nginx tEH the diff -Nru nginx-1.9.6/debian/nginx-core.postinst nginx-1.9.6/debian/nginx-core.postinst --- nginx-1.9.6/debian/nginx-core.postinst 1969-12-31 19:00:00.000000000 -0500 +++ nginx-1.9.6/debian/nginx-core.postinst 2015-07-22 11:39:05.000000000 -0400 @@ -0,0 +1,37 @@ +#!/bin/sh +set -e + +case "$1" in + abort-upgrade|abort-remove|abort-deconfigure|configure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +if [ -x /etc/init.d/nginx ]; then + if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then + NGX_PID=`cat /run/nginx.pid` + if kill -s USR2 $NGX_PID 2>/dev/null; then + while [ ! -s /run/nginx.pid.oldbin ] || [ ! -s /run/nginx.pid ]; do + cnt=`expr $cnt + 1` + if [ $cnt -gt 10 ]; then + kill -s KILL $NGX_PID + invoke-rc.d nginx start + exit 0 + fi + sleep 1 + done + NGX_OLD_PID=`cat /run/nginx.pid.oldbin` + kill -s QUIT $NGX_OLD_PID + fi + else + invoke-rc.d nginx start || exit $? + fi +fi + +#DEBHELPER# + +exit 0 diff -Nru nginx-1.9.6/debian/nginx-core.prerm nginx-1.9.6/debian/nginx-core.prerm --- nginx-1.9.6/debian/nginx-core.prerm 1969-12-31 19:00:00.000000000 -0500 +++ nginx-1.9.6/debian/nginx-core.prerm 2015-07-22 11:39:05.000000000 -0400 @@ -0,0 +1,22 @@ +#!/bin/sh +set -e + +case "$1" in + remove|remove-in-favour|deconfigure|deconfigure-in-favour) + if [ -x /etc/init.d/nginx ]; then + invoke-rc.d nginx stop || exit $? + fi + ;; + + upgrade|failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff -Nru nginx-1.9.6/debian/patches/series nginx-1.9.6/debian/patches/series --- nginx-1.9.6/debian/patches/series 2015-11-13 09:08:16.000000000 -0500 +++ nginx-1.9.6/debian/patches/series 2015-11-13 17:30:32.000000000 -0500 @@ -1 +1,2 @@ perl-use-dpkg-buildflags.patch +ubuntu-branding.patch diff -Nru nginx-1.9.6/debian/patches/ubuntu-branding.patch nginx-1.9.6/debian/patches/ubuntu-branding.patch --- nginx-1.9.6/debian/patches/ubuntu-branding.patch 1969-12-31 19:00:00.000000000 -0500 +++ nginx-1.9.6/debian/patches/ubuntu-branding.patch 2015-12-14 09:38:54.000000000 -0500 @@ -0,0 +1,18 @@ +Description: Add Ubuntu token to NGINX_VER +Author: Adam Conrad +Forwarded: not-needed +Last-Update: 2015-12-14 + +Index: b/src/core/nginx.h +=================================================================== +--- a/src/core/nginx.h ++++ b/src/core/nginx.h +@@ -11,7 +11,7 @@ + + #define nginx_version 1009006 + #define NGINX_VERSION "1.9.6" +-#define NGINX_VER "nginx/" NGINX_VERSION ++#define NGINX_VER "nginx/" NGINX_VERSION " (Ubuntu)" + + #ifdef NGX_BUILD + #define NGINX_VER_BUILD NGINX_VER " (" NGX_BUILD ")" diff -Nru nginx-1.9.6/debian/rules nginx-1.9.6/debian/rules --- nginx-1.9.6/debian/rules 2015-11-13 09:08:16.000000000 -0500 +++ nginx-1.9.6/debian/rules 2015-12-15 10:01:03.000000000 -0500 @@ -10,7 +10,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie dpkg-buildflags --get LDFLAGS) export DEBIAN_NGINX_PERL_LDFLAGS -FLAVOURS := full light extras +FLAVOURS := core full light extras MODULESDIR = $(CURDIR)/debian/modules BASEDIR = $(CURDIR) @@ -49,6 +49,22 @@ --with-http_realip_module \ --with-http_auth_request_module +core_configure_flags := \ + $(common_configure_flags) \ + --with-http_addition_module \ + --with-http_dav_module \ + --with-http_geoip_module \ + --with-http_gunzip_module \ + --with-http_gzip_static_module \ + --with-http_image_filter_module \ + --with-http_sub_module \ + --with-http_xslt_module \ + --with-stream \ + --with-stream_ssl_module \ + --with-mail \ + --with-mail_ssl_module \ + --with-threads + light_configure_flags := \ $(common_configure_flags) \ --with-http_gzip_static_module \ @@ -73,7 +89,6 @@ --with-http_gunzip_module \ --with-http_gzip_static_module \ --with-http_image_filter_module \ - --with-http_v2_module \ --with-http_sub_module \ --with-http_xslt_module \ --with-stream \ @@ -100,7 +115,6 @@ --with-http_perl_module \ --with-http_random_index_module \ --with-http_secure_link_module \ - --with-http_v2_module \ --with-http_sub_module \ --with-http_xslt_module \ --with-mail \ diff -Nru nginx-1.9.6/debian/tests/control nginx-1.9.6/debian/tests/control --- nginx-1.9.6/debian/tests/control 2015-11-13 09:08:16.000000000 -0500 +++ nginx-1.9.6/debian/tests/control 2015-11-13 17:30:26.000000000 -0500 @@ -1,5 +1,9 @@ Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/ Restrictions: allow-stderr isolation-container +Depends: nginx-core, curl + +Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/ +Restrictions: allow-stderr isolation-container Depends: nginx-light, curl Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/