[SCM] ffmpeg/master: Revert "Enable all hardening options except pie"

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 03dc5e986eb10f260c364351ef8cbe5402fb9c7b
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sat Oct 22 21:13:13 2016 +0200

    Revert "Enable all hardening options except pie"
    
    PIE is now the default and this doesn't have any effect anyway.
    
    This reverts commit 08444f3b74ea69b4c7856267b665255076a7a134.

diff --git a/debian/rules b/debian/rules
index 8ffe857..fdd5596 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,6 @@ include /usr/share/dpkg/architecture.mk
 
 # Ubuntu ld adds -Bsymbolic-functions by default, but that prevents FFmpeg from building.
 export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
-# build with all hardening flags except pie
-export DEB_MAINT_BUILD_OPTIONS=hardening=+all,-pie
 
 # Package name for the extra flavor.
 EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(.*extra[0-9]+)[[:space:]]*$$/\1/p' debian/control)
@@ -181,10 +179,6 @@ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 		--target-os=$(DEB_HOST_ARCH_OS)
 endif
 
-# export all *FLAG env vars
-export DPKG_EXPORT_BUILDFLAGS
-include /usr/share/dpkg/buildflags.mk
-
 # Use the default debhelper scripts, where possible.
 %:
 	dh $@

-- 
ffmpeg packaging