Update nginx version and submodules +nginx-module-sts + nginx-module-…

…stream-sts, brotli module upstream change, bionic support

.gitmodules

@@ -27,9 +27,6 @@
 [submodule "debian/extra/njs"]
 	path = debian/extra/njs
 	url = https://github.com/nginx/njs
-[submodule "debian/extra/ngx_brotli"]
-	path = debian/extra/ngx_brotli
-	url = https://github.com/google/ngx_brotli
 [submodule "debian/extra/nchan"]
 	path = debian/extra/nchan
 	url = https://github.com/slact/nchan
@@ -79,3 +76,12 @@
 	path = debian/extra/nginx-rtmp-module
 	url = https://github.com/sergey-dryabzhinsky/nginx-rtmp-module
 	branch = dev
+[submodule "debian/extra/ngx_brotli"]
+	path = debian/extra/ngx_brotli
+	url = https://github.com/eustas/ngx_brotli
+[submodule "debian/extra/nginx-module-sts"]
+	path = debian/extra/nginx-module-sts
+	url = https://github.com/vozlt/nginx-module-sts
+[submodule "debian/extra/nginx-module-stream-sts"]
+	path = debian/extra/nginx-module-stream-sts
+	url = https://github.com/vozlt/nginx-module-stream-sts

README.md

@@ -7,7 +7,7 @@
 - [nginx-length-hiding-filter](https://github.com/nulab/nginx-length-hiding-filter-module)
 - [nginx_session_binding_proxy](https://github.com/wburgers/Session-Binding-Proxy)
 - [ngx_devel_kit](https://github.com/simpl/ngx_devel_kit)
-- [ngx_pagespeed](https://github.com/pagespeed/ngx_pagespeed)
+- [ngx_pagespeed](https://github.com/eustas/ngx_brotli)
 - [rds-json-nginx](https://github.com/openresty/rds-json-nginx-module) with pull 4 patch
 - [testcookie-nginx](https://github.com/kyprizel/testcookie-nginx-module)
 - [nginx-upstream-order](https://github.com/flygoast/ngx_http_upstream_order)
@@ -28,6 +28,8 @@
 - [nginx-module-ct](https://github.com/grahamedgecombe/nginx-ct) needs newer openssl versions, possible support on artful in future
 - [nginx-module-rtmp](https://github.com/sergey-dryabzhinsky/nginx-rtmp-module)
 - [nginx-module-ts](https://github.com/arut/nginx-ts-module)
+- [nginx-module-sts](https://github.com/vozlt/nginx-module-sts)
+- [nginx-module-stream-sts](https://github.com/vozlt/nginx-module-stream-sts)
 
 ## Base dynamic modules
 - http_xslt module
@@ -104,7 +106,8 @@ load_module modules/ngx_mail_ssl_ct_module.so
 load_module modules/ngx_stream_ssl_ct_module.so
 load_module modules/ngx_rtmp_module.so;
 load_module modules/ngx_http_ts_module.so.so;
-
+load_module modules/ngx_http_stream_server_traffic_status_module.so;
+load_module modules/ngx_stream_server_traffic_status_module.so;
 
 ```
   > Note: Use only modules you need to use. With dynamic modules this is pretty easy.

debian/changelog

@@ -1,3 +1,11 @@
+nginx (1.13.8-1-ppa7~bionic) bionic; urgency=medium
+
+  * Version and modules updates
+  * nginx-module-sts nginx-module-stream-sts #17
+  * ngx_brotli upstream change #16
+
+ -- hda_launchpad (hda_launchpad) <admin@hda.me>  Wed, 03 Jan 2018 17:51:16 +0000
+
 nginx (1.13.7-1-ppa7~xenial) xenial; urgency=medium
 
   * Version and modules updates

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: hda_launchpad (hda_launchpad) <admin@hda.me>
 XSBC-Original-Maintainer: Sergey Budnevitch <sb@nginx.com>
 Build-Depends: debhelper (>= 7.0.50~),
-               libgd2-xpm-dev,
+               libgd-dev,
                libgeoip-dev,
                libpcre3-dev,
                libperl-dev,
@@ -326,3 +326,17 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, nginx (= ${source:Version})
 Description: NGINX MPEG-TS Live module
  This module receives MPEG-TS over HTTP, produces and manages live HLS_ 
  and MPEG-DASH_.
+
+Package: nginx-module-sts
+Architecture: any
+Priority: extra
+Depends: nginx-module-stream-sts (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, nginx (= ${source:Version})
+Description: Stream server traffic status module
+ This package contains stream server traffic status module for nginx.
+
+Package: nginx-module-stream-sts
+Architecture: any
+Priority: extra
+Depends: nginx-module-sts (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, nginx (= ${source:Version})
+Description: Stream server traffic status core module
+ This package contains stream server traffic status core module for nginx.

debian/nginx-module-stream-sts.install

@@ -0,0 +1,2 @@
+objs/ngx_stream_server_traffic_status_module.so usr/lib/nginx/modules
+objs/ngx_stream_server_traffic_status_module-debug.so usr/lib/nginx/modules

debian/nginx-module-stream-sts.preinst

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+case "$1" in
+    install)
+        cat <<BANNER
+----------------------------------------------------------------------
+
+Stream server traffic status core dynamic module for nginx has been installed.
+To enable this module, add the following to /etc/nginx/nginx.conf
+and reload nginx:
+
+    load_module modules/ngx_stream_server_traffic_status_module.so;
+
+Please refer to the module documentation for further details:
+https://github.com/vozlt/nginx-module-stream-sts
+
+----------------------------------------------------------------------
+BANNER
+        ;;
+    upgrade|abort-upgrade)
+        ;;
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 0
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0

debian/nginx-module-sts.install

@@ -0,0 +1,2 @@
+objs/ngx_http_stream_server_traffic_status_module.so usr/lib/nginx/modules
+objs/ngx_http_stream_server_traffic_status_module-debug.so usr/lib/nginx/modules

debian/nginx-module-sts.preinst

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+case "$1" in
+    install)
+        cat <<BANNER
+----------------------------------------------------------------------
+
+Stream server traffic status dynamic module for nginx has been installed.
+To enable this module, add the following to /etc/nginx/nginx.conf
+and reload nginx:
+
+    load_module modules/ngx_http_stream_server_traffic_status_module.so;
+
+Please refer to the module documentation for further details:
+https://github.com/vozlt/nginx-module-sts
+
+----------------------------------------------------------------------
+BANNER
+        ;;
+    upgrade|abort-upgrade)
+        ;;
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 0
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0

debian/nginx-module-vts.preinst

@@ -5,7 +5,7 @@ case "$1" in
         cat <<BANNER
 ----------------------------------------------------------------------
 
-Virtual host traffic status module dynamic module for nginx has been installed.
+Virtual host traffic status dynamic module for nginx has been installed.
 To enable this module, add the following to /etc/nginx/nginx.conf
 and reload nginx:
 

debian/rules

@@ -40,7 +40,9 @@ PKGS = nginx nginx-dbg \
 	nginx-module-vts \
 	nginx-module-ct \
 	nginx-module-rtmp \
-	nginx-module-ts
+	nginx-module-ts \
+	nginx-module-sts \
+	nginx-module-stream-sts
 COMMON_CONFIGURE_ARGS := \
 	--prefix=/etc/nginx \
 	--sbin-path=/usr/sbin/nginx \
@@ -103,6 +105,8 @@ COMMON_CONFIGURE_ARGS := \
 	--add-dynamic-module=debian/extra/nginx-ct \
 	--add-dynamic-module=debian/extra/nginx-rtmp-module \
 	--add-dynamic-module=debian/extra/nginx-ts-module \
+	--add-dynamic-module=debian/extra/nginx-module-sts \
+	--add-dynamic-module=debian/extra/nginx-module-stream-sts \
 	--with-threads \
 	--with-http_slice_module \
 	--with-file-aio \
@@ -162,6 +166,8 @@ override_dh_auto_build:
 	mv objs/ngx_stream_ssl_ct_module.so objs/ngx_stream_ssl_ct_module-debug.so
 	mv objs/ngx_rtmp_module.so objs/ngx_rtmp_module-debug.so
 	mv objs/ngx_http_ts_module.so objs/ngx_http_ts_module-debug.so
+	mv objs/ngx_http_stream_server_traffic_status_module.so objs/ngx_http_stream_server_traffic_status_module-debug.so
+	mv objs/ngx_stream_server_traffic_status_module.so objs/ngx_stream_server_traffic_status_module-debug.so
 	CFLAGS="" ./configure $(COMMON_CONFIGURE_ARGS)
 	dh_auto_build