nginx-extrasplus.debian.patch

diff -Nur a/nginx-1.6.2/debian/control b/nginx-1.6.2/debian/control
--- a/nginx-1.6.2/debian/control	2016-02-10 21:51:05.000000000 +0000
+++ b/nginx-1.6.2/debian/control	2016-05-09 06:25:29.546456057 +0000
@@ -210,3 +210,53 @@
  This package provides debugging symbols for nginx-extras, to assist in
  debugging issues that you may find. It should not be required for normal
  operation.
+
+Package: nginx-extrasplus
+Architecture: any
+Priority: extra
+Depends: nginx-common (= ${source:Version}),
+         ${misc:Depends},
+         ${perl:Depends},
+         ${shlibs:Depends}
+Breaks: nginx (<< 1.4.5-1)
+Provides: httpd, httpd-cgi, nginx
+Conflicts: nginx-full, nginx-light, nginx-extras
+Suggests: nginx-doc (= ${source:Version})
+Description: nginx web/proxy server (extended 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 standard modules, plus
+ extra features and modules such as the Perl module, which allows the
+ addition of Perl in configuration files.
+ .
+ STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Browser,
+ Charset, Empty GIF, FastCGI, Geo, Gzip, Headers, Index, Limit Requests,
+ Limit Zone, Log, Map, Memcached, Proxy, Referer, Rewrite, SCGI,
+ Split Clients, SSI, Upstream, User ID, UWSGI.
+ .
+ OPTIONAL HTTP MODULES: Addition, Auth Request, Debug, Embedded Perl, FLV,
+ GeoIP, Gzip Precompression, Image Filter, IPv6, MP4, Random Index, Real IP,
+ Secure Link, Spdy, SSL, Stub Status, Substitution, WebDAV, XSLT.
+ .
+ MAIL MODULES: Mail Core, IMAP, POP3, SMTP, SSL.
+ .
+ THIRD PARTY MODULES: Auth PAM, Chunkin, DAV Ext, Echo, Embedded Lua,
+ Fancy Index, HttpHeadersMore, HTTP Substitution Filter, http push,
+ Nginx Development Kit, Upload Progress, Upstream Fair Queue.
+
+Package: nginx-extrasplus-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: nginx-extras (= ${binary:Version}), ${misc:Depends}
+Conflicts: nginx-full-dbg, nginx-light-dbg, nginx-extras-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
+ and as a proxy to reduce the load on back-end HTTP or mail servers.
+ .
+ This package provides debugging symbols for nginx-extras, to assist in
+ debugging issues that you may find. It should not be required for normal
+ operation.
diff -Nur a/nginx-1.6.2/debian/nginx-extrasplus.install b/nginx-1.6.2/debian/nginx-extrasplus.install
--- a/nginx-1.6.2/debian/nginx-extrasplus.install	1970-01-01 00:00:00.000000000 +0000
+++ b/nginx-1.6.2/debian/nginx-extrasplus.install	2016-05-09 06:55:12.236597581 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/perl -w
+
+use Config;
+
+my $vendorarch = substr($Config{vendorarch}, 1);
+print "debian/build-extrasplus/objs/src/http/modules/perl/blib/arch/auto/nginx/* $vendorarch/auto/nginx\n";
+print "debian/build-extrasplus/objs/src/http/modules/perl/blib/lib/nginx.pm $vendorarch\n";
+
+print "debian/build-extrasplus/objs/nginx usr/sbin\n";
diff -Nur a/nginx-1.6.2/debian/nginx-extrasplus.lintian-overrides b/nginx-1.6.2/debian/nginx-extrasplus.lintian-overrides
--- a/nginx-1.6.2/debian/nginx-extrasplus.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ b/nginx-1.6.2/debian/nginx-extrasplus.lintian-overrides	2016-05-09 06:11:49.930521746 +0000
@@ -0,0 +1 @@
+nginx-extras: spelling-error-in-binary usr/sbin/nginx tEH the
diff -Nur a/nginx-1.6.2/debian/nginx-extrasplus.postinst b/nginx-1.6.2/debian/nginx-extrasplus.postinst
--- a/nginx-1.6.2/debian/nginx-extrasplus.postinst	1970-01-01 00:00:00.000000000 +0000
+++ b/nginx-1.6.2/debian/nginx-extrasplus.postinst	2016-05-09 06:11:49.940510534 +0000
@@ -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 -Nur a/nginx-1.6.2/debian/nginx-extrasplus.prerm b/nginx-1.6.2/debian/nginx-extrasplus.prerm
--- a/nginx-1.6.2/debian/nginx-extrasplus.prerm	1970-01-01 00:00:00.000000000 +0000
+++ b/nginx-1.6.2/debian/nginx-extrasplus.prerm	2016-05-09 06:11:49.940510534 +0000
@@ -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 -Nur a/nginx-1.6.2/debian/rules b/nginx-1.6.2/debian/rules
--- a/nginx-1.6.2/debian/rules	2016-02-10 21:51:05.000000000 +0000
+++ b/nginx-1.6.2/debian/rules	2016-05-09 06:06:05.497137227 +0000
@@ -9,7 +9,7 @@
 DEBIAN_NGINX_PERL_LDFLAGS:= $(debian_ldflags)
 export DEBIAN_NGINX_PERL_LDFLAGS
 
-FLAVOURS := full light extras
+FLAVOURS := full light extras extrasplus
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -112,6 +112,11 @@
 			--add-module=$(MODULESDIR)/nginx-upstream-fair \
 			--add-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
 
+extrasplus_configure_flags := \
+			$(extras_configure_flags) \
+			--add-module=$(MODULESDIR)/nginx-upstream-dynamic-servers \
+			--add-module=$(MODULESDIR)/nginx-push-stream-module
+
 %:
 	dh $@ --with systemd
 
diff -Nur a/nginx_1.6.2-5+deb8u1.dsc b/nginx_1.6.2-5+deb8u1.dsc
--- a/nginx_1.6.2-5+deb8u1.dsc    2016-02-10 22:04:40.000000000 +0000
+++ b/nginx_1.6.2-5+deb8u1.dsc       2016-05-09 06:12:43.060884609 +0000
@@ -3,7 +3,7 @@

 Format: 3.0 (quilt)
 Source: nginx
-Binary: nginx, nginx-doc, nginx-common, nginx-full, nginx-full-dbg, nginx-light, nginx-light-dbg, nginx-extras, nginx-extras-dbg
+Binary: nginx, nginx-doc, nginx-common, nginx-full, nginx-full-dbg, nginx-light, nginx-light-dbg, nginx-extras, nginx-extras-dbg, nginx-extrasplus, nginx-extrasplus-dbg
 Architecture: any all
 Version: 1.6.2-5+deb8u1
 Maintainer: Kartik Mistry <kartik@debian.org>
@@ -20,6 +20,8 @@
  nginx-doc deb doc optional arch=all
  nginx-extras deb httpd extra arch=any
  nginx-extras-dbg deb debug extra arch=any
+ nginx-extrasplus deb httpd extra arch=any
+ nginx-extrasplus-dbg deb debug extra arch=any
  nginx-full deb httpd optional arch=any
  nginx-full-dbg deb debug extra arch=any
  nginx-light deb httpd extra arch=any