From 924376d244a876a2be0246ebad47dbb59ef83125 Mon Sep 17 00:00:00 2001
From: Seungbae Shin <seungbae.shin@samsung.com>
Date: Thu, 27 Jan 2022 15:39:44 +0900
Subject: [PATCH] meson: Apply ASLR on Executable

[Version] 15.0-3
[Issue Type] Security

Change-Id: Ia2f2ba918c87dc722c2fd35b0bcef52e34aec4a0
---
 packaging/pulseaudio.spec |  2 +-
 src/daemon/meson.build    | 11 +++++------
 src/utils/meson.build     | 13 +++++++++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index 9a2946e..456c8dd 100644
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -4,7 +4,7 @@
 Name:             pulseaudio
 Summary:          Improved Linux sound server
 Version:          15.0
-Release:          2
+Release:          3
 Group:            Multimedia/Audio
 License:          LGPL-2.1
 URL:              http://pulseaudio.org
diff --git a/src/daemon/meson.build b/src/daemon/meson.build
index 274c889..8866207 100644
--- a/src/daemon/meson.build
+++ b/src/daemon/meson.build
@@ -23,11 +23,9 @@ if dbus_dep.found()
 endif
 
 if cdata.has('TIZEN_TV_PROD_PRELINK')
-  extra_link_args = '-pie'
-  extra_c_args = '-fPIE'
+  pie_enable = false
 else
-  extra_link_args = []
-  extra_c_args  = []
+  pie_enable = true
 endif
 
 # FIXME: dependencies
@@ -36,11 +34,12 @@ executable('pulseaudio',
   pulseaudio_headers,
   install: true,
   install_rpath : privlibdir,
+  pie : pie_enable,
   include_directories : [configinc, topinc],
-  link_args : ['-ffast-math', extra_link_args],
+  link_args : ['-ffast-math'],
   link_with : [libpulsecore, libpulsecommon, libpulse],
   dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep, dl_dep, libintl_dep, platform_dep, platform_socket_dep, lwipc_dep],
-  c_args : [pa_c_args, extra_c_args],
+  c_args : pa_c_args,
 )
 
 if x11_dep.found()
diff --git a/src/utils/meson.build b/src/utils/meson.build
index c9635fd..4598df7 100644
--- a/src/utils/meson.build
+++ b/src/utils/meson.build
@@ -13,10 +13,11 @@ executable('pacat',
   pacat_sources,
   install: true,
   install_rpath : privlibdir,
+  pie : true,
   include_directories : [configinc, topinc],
   link_with : [libpulsecommon, libpulse],
   dependencies : [sndfile_dep, libintl_dep],
-  c_args : pa_c_args,
+  c_args : pa_c_args
 )
 
 # Windows doesn't support symbolic links.
@@ -36,10 +37,11 @@ executable('pactl',
   pactl_sources,
   install: true,
   install_rpath : privlibdir,
+  pie : true,
   include_directories : [configinc, topinc],
   link_with : [libpulsecommon, libpulse],
   dependencies : [sndfile_dep, libintl_dep],
-  c_args : pa_c_args,
+  c_args : pa_c_args
 )
 
 if get_option('daemon')
@@ -52,10 +54,11 @@ if get_option('daemon')
       pasuspender_sources,
       install: true,
       install_rpath : privlibdir,
+      pie : true,
       include_directories : [configinc, topinc],
       link_with : [libpulsecommon, libpulse],
       dependencies: [libintl_dep],
-      c_args : pa_c_args,
+      c_args : pa_c_args
     )
 
     pacmd_sources = [
@@ -66,10 +69,11 @@ if get_option('daemon')
       pacmd_sources,
       install: true,
       install_rpath : privlibdir,
+      pie : true,
       include_directories : [configinc, topinc],
       link_with : [libpulsecommon, libpulse],
       dependencies: [libintl_dep],
-      c_args : pa_c_args,
+      c_args : pa_c_args
     )
   endif
 endif
@@ -83,6 +87,7 @@ if x11_dep.found()
     pax11publish_sources,
     install: true,
     install_rpath : privlibdir,
+    pie : true,
     include_directories : [configinc, topinc],
     link_with : [libpulsecommon, libpulse],
     dependencies : [x11_dep, libintl_dep],
-- 
2.7.4