libinput-device-group: apply ASLR
authorSung-Jin Park <sj76.park@samsung.com>
Fri, 11 Aug 2017 07:34:55 +0000 (16:34 +0900)
committerJengHyun Kang <jhyuni.kang@samsung.com>
Tue, 24 Oct 2017 07:04:33 +0000 (16:04 +0900)
Change-Id: I517dde04ad048cace459d23f3df63d8deb26c5c6
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>
configure.ac
packaging/libinput.spec
udev/Makefile.am

index 8eb3a1e9467db284bc240851d9a54139d484d270..3150a655bc644c30193deae6f9a35df71e30616d 100644 (file)
@@ -91,6 +91,21 @@ AS_CASE($with_udev_dir,
 UDEV_DIR=${udevdir}
 AC_SUBST(UDEV_DIR)
 
+################################
+# apply ASLR #
+################################
+AC_ARG_VAR([LIBINPUT_EXECUTABLE_CFLAGS], [cflags for libinput executable])
+if test x"${LIBINPUT_EXECUTABLE_CFLAGS}" != x""; then
+       AC_DEFINE_UNQUOTED([LIBINPUT_EXECUTABLE_CFLAGS], ["${LIBINPUT_EXECUTABLE_CFLAGS}"], [Libinput executable cflags])
+       AC_SUBST(LIBINPUT_EXECUTABLE_CFLAGS)
+fi
+
+AC_ARG_VAR([LIBINPUT_EXECUTABLE_LIBS], [linker flags for libinput executable])
+if test x"${LIBINPUT_EXECUTABLE_LIBS}" != x""; then
+       AC_DEFINE_UNQUOTED([LIBINPUT_EXECUTABLE_LIBS], ["${LIBINPUT_EXECUTABLE_LIBS}"], [Libinput executable linker flags])
+       AC_SUBST(LIBINPUT_EXECUTABLE_LIBS)
+fi
+
 ################################
 # enable/disable documentation #
 ################################
index 9aa98deae746170503cf323604cc66540a9ef572..5337af3577e56861e5115f0b241134cc3702cd21 100644 (file)
@@ -50,6 +50,9 @@ functionality that users expect.
 %setup -q
 cp %{SOURCE1001} .
 
+export LIBINPUT_EXECUTABLE_CFLAGS=" -fPIE "
+export LIBINPUT_EXECUTABLE_LIBS=" -pie "
+
 %autogen --with-udev-dir=%{udev_dir}
 
 %build
index 2c852a0990c706236fe9e5b26bf54fc1bc071455..24b995ce7b5d34f42f1a09a319f9ce6181c862a0 100644 (file)
@@ -9,8 +9,9 @@ noinst_SCRIPTS = $(litest_rules)
 libinput_device_group_SOURCES = libinput-device-group.c
 libinput_device_group_CFLAGS = -I$(top_srcdir)/src \
                               $(LIBUDEV_CFLAGS) \
-                              $(GCC_CFLAGS)
-libinput_device_group_LDADD = $(LIBUDEV_LIBS)
+                              $(GCC_CFLAGS) \
+                              $(LIBINPUT_EXECUTABLE_CFLAGS)
+libinput_device_group_LDADD = $(LIBUDEV_LIBS) $(LIBINPUT_EXECUTABLE_LIBS)
 
 if HAVE_LIBWACOM_GET_PAIRED_DEVICE
 libinput_device_group_CFLAGS += $(LIBWACOM_CFLAGS)