diff -Nru nginx-1.9.15/debian/changelog nginx-1.9.15/debian/changelog --- nginx-1.9.15/debian/changelog 2016-04-19 16:44:35.000000000 +0000 +++ nginx-1.9.15/debian/changelog 2019-10-08 00:32:07.000000000 +0000 @@ -1,3 +1,9 @@ +nginx (1.9.15-0~201604201734~ubuntu16.04.1) xenial; urgency=low + + * Auto build. + + -- Rob Tue, 08 Oct 2019 00:32:07 +0000 + nginx (1.9.15-0ubuntu1) xenial-proposed; urgency=medium * New upstream release (1.9.15) - full changelog available at upstream diff -Nru nginx-1.9.15/debian/git-build-recipe.manifest nginx-1.9.15/debian/git-build-recipe.manifest --- nginx-1.9.15/debian/git-build-recipe.manifest 1970-01-01 00:00:00.000000000 +0000 +++ nginx-1.9.15/debian/git-build-recipe.manifest 2019-10-08 00:32:07.000000000 +0000 @@ -0,0 +1,2 @@ +# git-build-recipe format 0.4 deb-version {debupstream}-0~201604201734 +lp:ubuntu/+source/nginx git-commit:b100a2e83b3b938552e58fbedca71db098fb1cf0 diff -Nru nginx-1.9.15/debian/patches/perl-use-dpkg-buildflags.patch nginx-1.9.15/debian/patches/perl-use-dpkg-buildflags.patch --- nginx-1.9.15/debian/patches/perl-use-dpkg-buildflags.patch 2016-04-18 19:37:48.000000000 +0000 +++ nginx-1.9.15/debian/patches/perl-use-dpkg-buildflags.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Description: Use linker flags from environment for perl (dpkg-buildflags). - Necessary for hardening flags. -Author: Christos Trochalakis -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 @@ - # Copyright (C) Nginx, Inc. - - use 5.006001; -+use Config; - use ExtUtils::MakeMaker; - - WriteMakefile( -@@ -14,6 +15,9 @@ - AUTHOR => 'Igor Sysoev', - - CCFLAGS => "$ENV{NGX_PM_CFLAGS}", -+ # Pass link hardening flags -+ # $Config{lddlflags} is the default -+ LDDLFLAGS => "$Config{lddlflags} $ENV{DEBIAN_NGINX_PERL_LDFLAGS}", - OPTIMIZE => '-O', - - INC => join(" ", map { diff -Nru nginx-1.9.15/debian/patches/series nginx-1.9.15/debian/patches/series --- nginx-1.9.15/debian/patches/series 2016-04-18 19:37:48.000000000 +0000 +++ nginx-1.9.15/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -perl-use-dpkg-buildflags.patch -ubuntu-branding.patch diff -Nru nginx-1.9.15/debian/patches/ubuntu-branding.patch nginx-1.9.15/debian/patches/ubuntu-branding.patch --- nginx-1.9.15/debian/patches/ubuntu-branding.patch 2016-04-19 16:44:10.000000000 +0000 +++ nginx-1.9.15/debian/patches/ubuntu-branding.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: Add Ubuntu token to NGINX_VER -Author: Adam Conrad -Forwarded: not-needed -Last-Update: 2016-04-05 - -Index: b/src/core/nginx.h -=================================================================== ---- a/src/core/nginx.h -+++ b/src/core/nginx.h -@@ -11,7 +11,7 @@ - - #define nginx_version 1009015 - #define NGINX_VERSION "1.9.15" --#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.15/debian/source/format nginx-1.9.15/debian/source/format --- nginx-1.9.15/debian/source/format 2016-04-18 19:37:48.000000000 +0000 +++ nginx-1.9.15/debian/source/format 2019-10-08 00:32:07.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru nginx-1.9.15/.pc/applied-patches nginx-1.9.15/.pc/applied-patches --- nginx-1.9.15/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 +++ nginx-1.9.15/.pc/applied-patches 2019-10-08 00:32:07.000000000 +0000 @@ -0,0 +1,2 @@ +perl-use-dpkg-buildflags.patch +ubuntu-branding.patch diff -Nru nginx-1.9.15/.pc/perl-use-dpkg-buildflags.patch/src/http/modules/perl/Makefile.PL nginx-1.9.15/.pc/perl-use-dpkg-buildflags.patch/src/http/modules/perl/Makefile.PL --- nginx-1.9.15/.pc/perl-use-dpkg-buildflags.patch/src/http/modules/perl/Makefile.PL 1970-01-01 00:00:00.000000000 +0000 +++ nginx-1.9.15/.pc/perl-use-dpkg-buildflags.patch/src/http/modules/perl/Makefile.PL 2019-10-08 00:32:07.000000000 +0000 @@ -0,0 +1,33 @@ + +# Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. + +use 5.006001; +use ExtUtils::MakeMaker; + +WriteMakefile( + NAME => 'nginx', + VERSION_FROM => 'nginx.pm', # finds $VERSION + PREREQ_PM => {}, # e.g., Module::Name => 1.1 + + ABSTRACT_FROM => 'nginx.pm', # retrieve abstract from module + AUTHOR => 'Igor Sysoev', + + CCFLAGS => "$ENV{NGX_PM_CFLAGS}", + OPTIMIZE => '-O', + + INC => join(" ", map { + m#^/# ? "-I $_" : "-I ../../../../../$_" + } (split /\s+/, $ENV{NGX_INCS})), + + depend => { + 'nginx.c' => join(" ", map { + m#^/# ? $_ : "../../../../../$_" + } (split(/\s+/, $ENV{NGX_DEPS}), + "src/http/modules/perl/ngx_http_perl_module.h")) + }, + + PM => { + 'nginx.pm' => '$(INST_LIBDIR)/nginx.pm' + } +); diff -Nru nginx-1.9.15/.pc/.quilt_patches nginx-1.9.15/.pc/.quilt_patches --- nginx-1.9.15/.pc/.quilt_patches 1970-01-01 00:00:00.000000000 +0000 +++ nginx-1.9.15/.pc/.quilt_patches 2019-10-08 00:32:07.000000000 +0000 @@ -0,0 +1 @@ +/home/buildd/build-RECIPEBRANCHBUILD-2419065/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches diff -Nru nginx-1.9.15/.pc/.quilt_series nginx-1.9.15/.pc/.quilt_series --- nginx-1.9.15/.pc/.quilt_series 1970-01-01 00:00:00.000000000 +0000 +++ nginx-1.9.15/.pc/.quilt_series 2019-10-08 00:32:07.000000000 +0000 @@ -0,0 +1 @@ +/home/buildd/build-RECIPEBRANCHBUILD-2419065/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series diff -Nru nginx-1.9.15/.pc/ubuntu-branding.patch/src/core/nginx.h nginx-1.9.15/.pc/ubuntu-branding.patch/src/core/nginx.h --- nginx-1.9.15/.pc/ubuntu-branding.patch/src/core/nginx.h 1970-01-01 00:00:00.000000000 +0000 +++ nginx-1.9.15/.pc/ubuntu-branding.patch/src/core/nginx.h 2019-10-08 00:32:07.000000000 +0000 @@ -0,0 +1,26 @@ + +/* + * Copyright (C) Igor Sysoev + * Copyright (C) Nginx, Inc. + */ + + +#ifndef _NGINX_H_INCLUDED_ +#define _NGINX_H_INCLUDED_ + + +#define nginx_version 1009015 +#define NGINX_VERSION "1.9.15" +#define NGINX_VER "nginx/" NGINX_VERSION + +#ifdef NGX_BUILD +#define NGINX_VER_BUILD NGINX_VER " (" NGX_BUILD ")" +#else +#define NGINX_VER_BUILD NGINX_VER +#endif + +#define NGINX_VAR "NGINX" +#define NGX_OLDPID_EXT ".oldbin" + + +#endif /* _NGINX_H_INCLUDED_ */ diff -Nru nginx-1.9.15/.pc/.version nginx-1.9.15/.pc/.version --- nginx-1.9.15/.pc/.version 1970-01-01 00:00:00.000000000 +0000 +++ nginx-1.9.15/.pc/.version 2019-10-08 00:32:07.000000000 +0000 @@ -0,0 +1 @@ +2 diff -Nru nginx-1.9.15/src/core/nginx.h nginx-1.9.15/src/core/nginx.h --- nginx-1.9.15/src/core/nginx.h 2016-04-19 16:02:38.000000000 +0000 +++ nginx-1.9.15/src/core/nginx.h 2019-10-08 00:32:07.000000000 +0000 @@ -11,7 +11,7 @@ #define nginx_version 1009015 #define NGINX_VERSION "1.9.15" -#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.15/src/http/modules/perl/Makefile.PL nginx-1.9.15/src/http/modules/perl/Makefile.PL --- nginx-1.9.15/src/http/modules/perl/Makefile.PL 2016-04-19 16:02:39.000000000 +0000 +++ nginx-1.9.15/src/http/modules/perl/Makefile.PL 2019-10-08 00:32:07.000000000 +0000 @@ -3,6 +3,7 @@ # Copyright (C) Nginx, Inc. use 5.006001; +use Config; use ExtUtils::MakeMaker; WriteMakefile( @@ -14,6 +15,9 @@ AUTHOR => 'Igor Sysoev', CCFLAGS => "$ENV{NGX_PM_CFLAGS}", + # Pass link hardening flags + # $Config{lddlflags} is the default + LDDLFLAGS => "$Config{lddlflags} $ENV{DEBIAN_NGINX_PERL_LDFLAGS}", OPTIMIZE => '-O', INC => join(" ", map {