Update for Nginx 1.14.0 and add EasyEngine branding

Signed-off-by: Mriyam Tamuli <mbtamuli@gmail.com>

Author: mbtamuli

nginx/debian/changelog

@@ -1,3 +1,9 @@
+nginx (1.14.0-1ppa~stable) xenial; urgency=medium
+
+ * Use new stable nginx source.
+
+ -- Mriyam Tamuli <mbtamuli@gmail.com> Thu, 24 May 2018 22:07:00 +0530
+
 nginx (1.10.3-5ppa~stable) stable; urgency=high
 
  * Use new stable nginx source.

nginx/debian/control

@@ -1,16 +1,15 @@
 Source: nginx
 Section: httpd
 Priority: optional
-Maintainer: Bharat Parsiya <bnap00@gmail.com>, Mriyam Tamuli <mbtamuli@gmail.com>
-Uploaders: Mriyam Tamuli <mbtamuli@gmail.com>, Bharat Parsiya <bnap00@gmail.com>
+Maintainer: Mriyam Tamuli <mbtamuli@gmail.com>
 Build-Depends: autotools-dev,
  debhelper (>= 9),
  dh-systemd (>= 1.5),
  dpkg-dev (>= 1.15.5),
  libexpat-dev,
- libgd2-dev | libgd2-noxpm-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 | libluajit-5.1-2,
  libmhash-dev,
  libpam0g-dev,
  libpcre3-dev,
@@ -19,7 +18,7 @@ Build-Depends: autotools-dev,
  libxslt1-dev,
  po-debconf,
  zlib1g-dev
-Standards-Version: 3.9.6.0
+Standards-Version: 3.9.7
 Homepage: http://nginx.net
 Vcs-Git: git://anonscm.debian.org/collab-maint/nginx.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/nginx.git;a=summary

nginx/debian/patches/easyengine-branding.patch

@@ -0,0 +1,13 @@
+Index: nginx-1.14.0/src/core/nginx.h
+===================================================================
+--- nginx-1.14.0.orig/src/core/nginx.h
++++ nginx-1.14.0/src/core/nginx.h
+@@ -11,7 +11,7 @@
+
+ #define nginx_version 1014000
+ #define NGINX_VERSION "1.14.0"
+-#define NGINX_VER "nginx/" NGINX_VERSION
++#define NGINX_VER "nginx/" NGINX_VERSION " (rtCamp)"
+
+ #ifdef NGX_BUILD
+ #define NGINX_VER_BUILD NGINX_VER " (" NGX_BUILD ")"

nginx/debian/patches/perl-use-dpkg-buildflags.patch

@@ -1,6 +1,8 @@
 Description: Use linker flags from environment for perl (dpkg-buildflags).
  Necessary for hardening flags.
 Author: Christos Trochalakis <yatiohi@ideopolis.gr>
+Index: b/src/http/modules/perl/Makefile.PL
+===================================================================
 --- a/src/http/modules/perl/Makefile.PL
 +++ b/src/http/modules/perl/Makefile.PL
 @@ -3,6 +3,7 @@
@@ -20,4 +22,4 @@ Author: Christos Trochalakis <yatiohi@ideopolis.gr>
 + LDDLFLAGS => "$Config{lddlflags} $ENV{DEBIAN_NGINX_PERL_LDFLAGS}",
  OPTIMIZE => '-O',
 
- INC  => join(" ", map {
+ LDDLFLAGS => "$ENV{NGX_PM_LDFLAGS}",

nginx/debian/patches/series

@@ -1 +1,2 @@
+easyengine-branding.patch
 perl-use-dpkg-buildflags.patch

nginx/debian/rules

@@ -42,7 +42,6 @@ common_configure_flags := \
  --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
  --with-debug \
  --with-pcre-jit \
- --with-ipv6 \
  --with-http_ssl_module \
  --with-http_stub_status_module \
  --with-http_realip_module \

ppa.sh

@@ -99,7 +99,7 @@ git clone https://github.com/masterzen/nginx-upload-progress-module.git nginx-up
 || ppa_error "Unable to clone nginx-upload-progress repo, exit status = " $?
 
 ppa_lib_echo "10/18 nginx-upstream-fair"
-git clone https://github.com/gnosek/nginx-upstream-fair.git \
+git clone https://github.com/itoffshore/nginx-upstream-fair.git \
 || ppa_error "Unable to clone nginx-upstream-fair repo, exit status = " $?
 
 ppa_lib_echo "11/18 ngx-fancyindex"