diff --git a/debian/changelog b/debian/changelog index d73f283..82cc9ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +nginx (1.10.3-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + * Build against openssl 1.0.2 enabling ALPN support for http/2. + * Explicitly disable PIE as it breaks shared libs. + * Disable ec-x25519 test. + + -- Christos Trochalakis Thu, 23 Feb 2017 09:09:34 +0200 + nginx (1.10.3-1) unstable; urgency=medium * New upstream release. (Closes: #855113) diff --git a/debian/control b/debian/control index 89a7abc..bcdb717 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: autotools-dev, libpam0g-dev, libpcre3-dev, libperl-dev, - libssl-dev, + libssl-dev (>= 1.0.2), libxslt1-dev, po-debconf, quilt, diff --git a/debian/rules b/debian/rules index b4389c0..50c9a8f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,13 @@ #!/usr/bin/make -f export DH_VERBOSE=1 -export DEB_BUILD_MAINT_OPTIONS=hardening=+all +export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow,-pie debian_cflags:=$(shell dpkg-buildflags --get CFLAGS) $(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:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS) +DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow,-pie dpkg-buildflags --get LDFLAGS) export DEBIAN_NGINX_PERL_LDFLAGS FLAVOURS := full light extras diff --git a/debian/tests/control b/debian/tests/control index 03cd901..2bc571a 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -2,10 +2,6 @@ Tests: light-simple Restrictions: allow-stderr isolation-container Depends: nginx-light, curl -Tests: ec-x25519 -Restrictions: allow-stderr isolation-container needs-root -Depends: nginx-light, ssl-cert, curl - Tests: full-simple Restrictions: allow-stderr isolation-container Depends: nginx-full, curl