From f4f8512588e83fa2f0f807a12587b16353e57ba1 Mon Sep 17 00:00:00 2001
From: Seungbae Shin <seungbae.shin@samsung.com>
Date: Wed, 21 Mar 2018 13:35:13 +0900
Subject: [PATCH] Apply ASLR on Executable

remove some redundant tizen configurations from src/Makefile.am

[Version] 11.1-29
[Issue Type] Security

Change-Id: Ia3139d3ef9d1766d3270d8a63dd474a5f5effa35
---
 packaging/pulseaudio.spec |  2 +-
 src/Makefile.am           | 44 ++++++++++++++++----------------------------
 2 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index 663cf21..f2a19a2 100644
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -3,7 +3,7 @@
 Name:             pulseaudio
 Summary:          Improved Linux sound server
 Version:          11.1
-Release:          28
+Release:          29
 Group:            Multimedia/Audio
 License:          LGPL-2.1
 URL:              http://pulseaudio.org
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ce3930..725f137 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,23 +171,6 @@ pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@P
 # This is needed because automake doesn't properly expand the foreach below
 pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(PREOPEN_LIBS)
 
-if TIZEN_PA_READY
-pulseaudio_CFLAGS += -DTIZEN_PA_READY
-endif
-
-if TIZEN_EMPTY_POP
-pulseaudio_CFLAGS += -DTIZEN_EMPTY_POP
-endif
-
-if !TIZEN_TV_PROD_PRELINK
-pulseaudio_CFLAGS += -fPIC -pie
-endif
-
-if TIZEN_TV_PROD_LWIPC
-pulseaudio_CFLAGS += $(LWIPC_CFLAGS) -DTIZEN_TV_PROD_LWIPC
-pulseaudio_LDADD += $(LWIPC_LIBS)
-endif
-
 if HAVE_DBUS
 pulseaudio_CFLAGS += $(DBUS_CFLAGS)
 pulseaudio_SOURCES += daemon/server-lookup.c daemon/server-lookup.h
@@ -215,12 +198,17 @@ if TIZEN_DLOG
 pulseaudio_CFLAGS += -DTIZEN_DLOG
 endif
 
+if TIZEN_EMPTY_POP
+pulseaudio_CFLAGS += -DTIZEN_EMPTY_POP
+endif
+
 if TIZEN_PA_READY
 pulseaudio_CFLAGS += -DTIZEN_PA_READY
 endif
 
 if !TIZEN_TV_PROD_PRELINK
-pulseaudio_CFLAGS += -fPIC -pie
+pulseaudio_CFLAGS += -fPIE
+pulseaudio_LDFLAGS += -pie
 endif
 
 if TIZEN_TV_PROD_LWIPC
@@ -253,13 +241,13 @@ endif
 
 pacat_SOURCES = utils/pacat.c
 pacat_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
-pacat_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
-pacat_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+pacat_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS) -fPIE
+pacat_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -pie
 
 pactl_SOURCES = utils/pactl.c
 pactl_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
-pactl_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
-pactl_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+pactl_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS) -fPIE
+pactl_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -pie
 if TIZEN_PCM_DUMP
 pactl_CFLAGS += $(VCONF_CFLAGS) -DTIZEN_PCM_DUMP
 pactl_LDADD += $(VCONF_LIBS)
@@ -267,18 +255,18 @@ endif
 
 pasuspender_SOURCES = utils/pasuspender.c
 pasuspender_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la
-pasuspender_CFLAGS = $(AM_CFLAGS)
-pasuspender_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+pasuspender_CFLAGS = $(AM_CFLAGS) -fPIE
+pasuspender_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -pie
 
 pacmd_SOURCES = utils/pacmd.c
-pacmd_CFLAGS = $(AM_CFLAGS)
+pacmd_CFLAGS = $(AM_CFLAGS) -fPIE
 pacmd_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la
-pacmd_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+pacmd_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -pie
 
 pax11publish_SOURCES = utils/pax11publish.c
-pax11publish_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS)
+pax11publish_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS) -fPIE
 pax11publish_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(X11_LIBS)
-pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -pie
 
 if HAVE_SYSTEMD_DAEMON
 
-- 
2.7.4