BBlack has submitted this change and it was merged. Change subject: remove debian perl ldflags patch ......................................................................
remove debian perl ldflags patch Upstream (debian) did this for their 1.11.5 packaging, but haven't updated their experimental repo yet. Change-Id: I0d2d7df23443b6194e0d8c2157dd560bf75a8f88 --- D debian/patches/perl-use-dpkg-buildflags.patch M debian/patches/series 2 files changed, 0 insertions(+), 27 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/patches/perl-use-dpkg-buildflags.patch b/debian/patches/perl-use-dpkg-buildflags.patch deleted file mode 100644 index fb71fb3..0000000 --- a/debian/patches/perl-use-dpkg-buildflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Use linker flags from environment for perl (dpkg-buildflags). - Necessary for hardening flags. -Author: Christos Trochalakis <[email protected]> -diff --git a/src/http/modules/perl/Makefile.PL b/src/http/modules/perl/Makefile.PL -index 7edadcb..3b6799c 100644 ---- 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( -@@ -16,7 +17,9 @@ WriteMakefile( - CCFLAGS => "$ENV{NGX_PM_CFLAGS}", - OPTIMIZE => '-O', - -- LDDLFLAGS => "$ENV{NGX_PM_LDFLAGS}", -+ # Pass link hardening flags -+ # $ENV{NGX_PM_LDFLAGS} is the default -+ LDDLFLAGS => "$ENV{NGX_PM_LDFLAGS} $ENV{DEBIAN_NGINX_PERL_LDFLAGS}", - - INC => join(" ", map { - m#^/# ? "-I $_" : "-I ../../../../../$_" diff --git a/debian/patches/series b/debian/patches/series index af6103d..419f166 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 0000-src-update-master.patch -perl-use-dpkg-buildflags.patch 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch 0003-define_gnu_source-on-other-glibc-based-platforms.patch 0100-dynamic-tls-records.patch -- To view, visit https://gerrit.wikimedia.org/r/320161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d2d7df23443b6194e0d8c2157dd560bf75a8f88 Gerrit-PatchSet: 4 Gerrit-Project: operations/software/nginx Gerrit-Branch: wmf-1.11.4 Gerrit-Owner: BBlack <[email protected]> Gerrit-Reviewer: BBlack <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
