Add vpn_setting_test file and apply ASLR flag

Change-Id: I2d043dabba9eb6b58bfd95697bd8ece9df3fc6c7
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a98ed96d46bf23a5e22c243224e299f34104da24..023e6913d032990e28573286a789c681be0d0de2 100644 (file)
--- 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-setting.pc.in b/capi-network-vpn-setting.pc.in
new file mode 100644 (file)
index 0000000..ee6db75
--- /dev/null
+++ b/capi-network-vpn-setting.pc.in
@@ -0,0 +1,13 @@
+# Package Information for pkg-config
+
+prefix=@PREFIX@
+exec_prefix=/usr
+libdir=/usr/lib
+includedir=/usr/include/network
+
+Name: @PC_NAME@
+Description: @PACKAGE_DESCRIPTION@
+Version: @VERSION@
+Requires: @PC_REQUIRED@
+Libs: -L${libdir} @PC_LDFLAGS@
+Cflags: -I${includedir}

diff --git a/capi-network-vpn.pc.in b/capi-network-vpn.pc.in
deleted file mode 100644 (file)
index ee6db75..0000000
--- a/capi-network-vpn.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# Package Information for pkg-config
-
-prefix=@PREFIX@
-exec_prefix=/usr
-libdir=/usr/lib
-includedir=/usr/include/network
-
-Name: @PC_NAME@
-Description: @PACKAGE_DESCRIPTION@
-Version: @VERSION@
-Requires: @PC_REQUIRED@
-Libs: -L${libdir} @PC_LDFLAGS@
-Cflags: -I${includedir}

diff --git a/packaging/capi-network-vpn-setting.manifest b/packaging/capi-network-vpn-setting.manifest
new file mode 100644 (file)
index 0000000..017d22d
--- /dev/null
+++ b/packaging/capi-network-vpn-setting.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>

diff --git a/packaging/capi-network-vpn-setting.spec b/packaging/capi-network-vpn-setting.spec
new file mode 100644 (file)
index 0000000..0c572a3
--- /dev/null
+++ b/packaging/capi-network-vpn-setting.spec
@@ -0,0 +1,71 @@
+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-setting.manifest
+BuildRequires:  cmake
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(vconf)
+BuildRequires:  pkgconfig(capi-base-common)
+
+%description
+Library code for CAPI's to interact with the Default VPN functionality on TIZEN platform.
+
+%package devel
+Summary:  Default VPN Development Package
+Group:    System/Network
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Development Library for Default VPN functionality on TIZEN platform.
+
+%package test
+Summary:    Default VPN Test Package
+Requires:   %{name} = %{version}
+
+%description test
+Test cases for Default VPN Functionality on TIZEN platform.
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
+
+%build
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+
+make %{?_smp_mflags}
+
+
+%install
+%make_install
+
+#License
+mkdir -p %{buildroot}%{_datadir}/license
+cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/capi-network-vpn-setting
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%manifest %{name}.manifest
+%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-setting.so
+
+%files test
+%manifest %{name}.manifest
+%{_libdir}/vpn_setting_test
+%{_bindir}/vpn_setting_test

diff --git a/packaging/capi-network-vpn.manifest b/packaging/capi-network-vpn.manifest
deleted file mode 100644 (file)
index 017d22d..0000000
--- a/packaging/capi-network-vpn.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
- <request>
-    <domain name="_"/>
- </request>
-</manifest>

diff --git a/packaging/capi-network-vpn.spec b/packaging/capi-network-vpn.spec
deleted file mode 100644 (file)
index 07075d2..0000000
--- a/packaging/capi-network-vpn.spec
+++ /dev/null
@@ -1,70 +0,0 @@
-Name:       capi-network-vpn
-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
-BuildRequires:  cmake
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(vconf)
-BuildRequires:  pkgconfig(capi-base-common)
-
-%description
-Library code for CAPI's to interact with the Default VPN functionality on TIZEN platform.
-
-%package devel
-Summary:  Default VPN Development Package
-Group:    System/Network
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Development Library for Default VPN functionality on TIZEN platform.
-
-%package test
-Summary:    Default VPN Test Package
-Requires:   %{name} = %{version}
-
-%description test
-Test cases for Default VPN Functionality on TIZEN platform.
-
-%prep
-%setup -q
-cp %{SOURCE1001} .
-
-
-%build
-MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
-
-make %{?_smp_mflags}
-
-
-%install
-%make_install
-
-#License
-mkdir -p %{buildroot}%{_datadir}/license
-cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/capi-network-vpn
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
-%files
-%manifest %{name}.manifest
-%attr(644,-,-) %{_libdir}/libcapi-network-vpn.so.*
-%{_datadir}/license/capi-network-vpn
-
-%files devel
-%manifest %{name}.manifest
-#%{_includedir}/network/*.h
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/libcapi-network-vpn.so
-
-%files test
-%manifest %{name}.manifest
-%{_libdir}/vpn-capi-test/capi-vpn-test

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1ff2267763ac84c011781b3cf73096a992f347ec..7477e12f2ff0ff288bfe9de6de102be17e4ec643 100644 (file)
--- 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()