Ubuntu Pastebin

Paste from adconrad at Wed, 1 Apr 2015 21:38:51 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
diff -Nru nginx-1.6.2/debian/changelog nginx-1.6.2/debian/changelog
--- nginx-1.6.2/debian/changelog	2015-04-01 12:27:46.000000000 -0600
+++ nginx-1.6.2/debian/changelog	2015-04-01 14:34:34.000000000 -0600
@@ -1,3 +1,9 @@
+nginx (1.6.2-5ubuntu3) UNRELEASED; urgency=medium
+
+  * Test.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 01 Apr 2015 14:34:30 -0600
+
 nginx (1.6.2-5ubuntu2) vivid-proposed; urgency=medium
 
   * debian/rules:
diff -Nru nginx-1.6.2/debian/rules nginx-1.6.2/debian/rules
--- nginx-1.6.2/debian/rules	2015-04-01 12:26:25.000000000 -0600
+++ nginx-1.6.2/debian/rules	2015-04-01 14:34:28.000000000 -0600
@@ -1,12 +1,13 @@
 #!/usr/bin/make -f
 export DH_VERBOSE=1
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 debian_cflags:=$(shell dpkg-buildflags --get CFLAGS | sed 's/-O3/-O2/') $(shell dpkg-buildflags --get CPPFLAGS)
 debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS)
 
 # export necessary perl hardenging flags
 # see: src/http/modules/perl/Makefile.PL
-DEBIAN_NGINX_PERL_LDFLAGS:= $(debian_ldflags)
+DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie dpkg-buildflags --get LDFLAGS)
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := core full light extras
@@ -29,7 +30,6 @@
 common_configure_flags := \
 			--with-cc-opt="$(debian_cflags)" \
 			--with-ld-opt="$(debian_ldflags)" \
-			-fPIE -pie \
 			--prefix=/usr/share/nginx \
 			--conf-path=/etc/nginx/nginx.conf \
 			--http-log-path=/var/log/nginx/access.log \
Download as text