From b0c8f4fb8fb4a7268820cd11dff420cb5ae26303 Mon Sep 17 00:00:00 2001
From: "taesub.kim" <taesub.kim@samsung.com>
Date: Thu, 21 Jan 2016 17:34:03 +0900
Subject: [PATCH] Add vpn_setting_test file and apply ASLR flag

Change-Id: I2d043dabba9eb6b58bfd95697bd8ece9df3fc6c7
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
---
 CMakeLists.txt                                            |  2 +-
 capi-network-vpn.pc.in => capi-network-vpn-setting.pc.in  |  0
 ...ork-vpn.manifest => capi-network-vpn-setting.manifest} |  0
 ...api-network-vpn.spec => capi-network-vpn-setting.spec} | 15 ++++++++-------
 test/CMakeLists.txt                                       |  8 +++++---
 5 files changed, 14 insertions(+), 11 deletions(-)
 rename capi-network-vpn.pc.in => capi-network-vpn-setting.pc.in (100%)
 rename packaging/{capi-network-vpn.manifest => capi-network-vpn-setting.manifest} (100%)
 rename packaging/{capi-network-vpn.spec => capi-network-vpn-setting.spec} (81%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a98ed96..023e691 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-SET(fw_name "capi-network-vpn")
+SET(fw_name "capi-network-vpn-setting")
 
 PROJECT(${fw_name})
 
diff --git a/capi-network-vpn.pc.in b/capi-network-vpn-setting.pc.in
similarity index 100%
rename from capi-network-vpn.pc.in
rename to capi-network-vpn-setting.pc.in
diff --git a/packaging/capi-network-vpn.manifest b/packaging/capi-network-vpn-setting.manifest
similarity index 100%
rename from packaging/capi-network-vpn.manifest
rename to packaging/capi-network-vpn-setting.manifest
diff --git a/packaging/capi-network-vpn.spec b/packaging/capi-network-vpn-setting.spec
similarity index 81%
rename from packaging/capi-network-vpn.spec
rename to packaging/capi-network-vpn-setting.spec
index 07075d2..0c572a3 100644
--- a/packaging/capi-network-vpn.spec
+++ b/packaging/capi-network-vpn-setting.spec
@@ -1,11 +1,11 @@
-Name:       capi-network-vpn
+Name:       capi-network-vpn-setting
 Summary:    Default VPN Library
 Version:    0.1.0_0
 Release:    1
 Group:      System/Network
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001: 	capi-network-vpn.manifest
+Source1001: 	capi-network-vpn-setting.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -47,7 +47,7 @@ make %{?_smp_mflags}
 
 #License
 mkdir -p %{buildroot}%{_datadir}/license
-cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/capi-network-vpn
+cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/capi-network-vpn-setting
 
 %post -p /sbin/ldconfig
 
@@ -56,15 +56,16 @@ cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/capi-network-vpn
 
 %files
 %manifest %{name}.manifest
-%attr(644,-,-) %{_libdir}/libcapi-network-vpn.so.*
-%{_datadir}/license/capi-network-vpn
+%attr(644,-,-) %{_libdir}/libcapi-network-vpn-setting.so.*
+%{_datadir}/license/capi-network-vpn-setting
 
 %files devel
 %manifest %{name}.manifest
 #%{_includedir}/network/*.h
 %{_libdir}/pkgconfig/*.pc
-%{_libdir}/libcapi-network-vpn.so
+%{_libdir}/libcapi-network-vpn-setting.so
 
 %files test
 %manifest %{name}.manifest
-%{_libdir}/vpn-capi-test/capi-vpn-test
+%{_libdir}/vpn_setting_test
+%{_bindir}/vpn_setting_test
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1ff2267..7477e12 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(fw_test "capi-vpn-test")
+SET(fw_test "vpn_setting_test")
 
 SET(dependents "capi-base-common glib-2.0")
 
@@ -8,7 +8,8 @@ FOREACH(flag ${${fw_test}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
 aux_source_directory(. sources)
 FOREACH(src ${sources})
@@ -16,5 +17,6 @@ FOREACH(src ${sources})
     MESSAGE("${fw_test}")
     ADD_EXECUTABLE(${fw_test} ${src})
     TARGET_LINK_LIBRARIES(${fw_test} ${fw_name} ${${fw_test}_LDFLAGS})
-    INSTALL(TARGETS ${fw_test} DESTINATION ${LIB_INSTALL_DIR}/vpn-capi-test/)
+    INSTALL(TARGETS ${fw_test} DESTINATION ${LIB_INSTALL_DIR}/vpn_setting_test/)
+    INSTALL(TARGETS ${fw_test} RUNTIME DESTINATION bin/)
 ENDFOREACH()
-- 
2.7.4