[SCM] mpv/master: Re-enable PIE

[ghedo at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 88b245be2f793f86772e4c0f99b6052c83688a86
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Thu Sep 24 20:31:45 2015 +0200

    Re-enable PIE
    
    Closes: #799738
    Thanks: Simon Ruderich for the patch

diff --git a/debian/patches/04_waf-pie.patch b/debian/patches/04_waf-pie.patch
new file mode 100644
index 0000000..30805a7
--- /dev/null
+++ b/debian/patches/04_waf-pie.patch
@@ -0,0 +1,21 @@
+Description: Fix waf support for PIE
+Origin: vendor
+Debian-Bug: http://bugs.debian.org/799738
+Forwarded: not-needed
+Author: Simon Ruderich <simon at ruderich.org>
+Reviewed-by: Alessandro Ghedini <ghedo at debian.org>
+Last-Update: 2015-09-24
+
+--- a/waflib/Context.py
++++ b/waflib/Context.py
+@@ -140,6 +140,10 @@
+ 	def exec_command(self,cmd,**kw):
+ 		subprocess=Utils.subprocess
+ 		kw['shell']=isinstance(cmd,str)
++		# FIXME: hacky solution to fix PIC-PIE-conflict
++		if '-shared' in cmd:
++			Logs.debug('runner: old %r'%(cmd,))
++			cmd = [x for x in cmd if x != '-fPIE' and x != '-pie']
+ 		Logs.debug('runner: %r'%(cmd,))
+ 		Logs.debug('runner_env: kw=%s'%kw)
+ 		if self.logger:
diff --git a/debian/patches/series b/debian/patches/series
index db00e03..fbbd070 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_desktop-path.patch
 02_fix-config-path.patch
 03_waf.patch
+04_waf-pie.patch
diff --git a/debian/rules b/debian/rules
index bc4efa9..b22b5e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all # #741439, #799738
+
 %:
 	dh $@
 

-- 
mpv packaging