Merge branch 'ipsec' into tizen

Change-Id: I2ecaece689f43bb0c03c9c5929274bfe43e346b0
Signed-off-by: cheoleun <chleun.moon@samsung.com>

diff --combined packaging/connman.spec
index 6f12bbb,6cf5b37..f9a90f6
--- 1/packaging/connman.spec
--- 2/packaging/connman.spec
+++ b/packaging/connman.spec
@@@ -1,10 -1,11 +1,11 @@@
  %bcond_with     connman_openconnect
  %bcond_without  connman_openvpn
+ %bcond_without  connman_ipsec
  %bcond_without  connman_vpnd
  
  Name:           connman
  Version:        1.29
 -Release:        20
 +Release:        21
  License:        GPL-2.0+
  Summary:        Connection Manager
  Url:            http://connman.net
@@@ -13,6 -14,7 +14,7 @@@ Source0:        %{name}-%{version}.tar.
  BuildRequires:  systemd-devel
  BuildRequires:  pkgconfig(dbus-1)
  BuildRequires:  pkgconfig(glib-2.0)
+ BuildRequires:  pkgconfig(gio-2.0)
  BuildRequires:  pkgconfig(libiptc)
  BuildRequires:  pkgconfig(xtables)
  BuildRequires:  pkgconfig(libsmack)
@@@ -24,6 -26,10 +26,10 @@@ BuildRequires:  openconnec
  %if %{with connman_openvpn}
  BuildRequires:  openvpn
  %endif
+ %if %{with connman_ipsec}
+ BuildRequires:  strongswan
+ BuildRequires:  pkgconfig(openssl)
+ %endif
  BuildRequires:  ca-certificates-devel
  BuildRequires:  readline-devel
  #%systemd_requires
@@@ -64,6 -70,17 +70,17 @@@ Requires:       openvp
  OpenVPN support for Connman.
  %endif
  
+ %if %{with connman_ipsec}
+ %package plugin-ipsec
+ Summary:        IPsec Support for Connman
+ Requires:       %{name} = %{version}
+ Requires:       strongswan
+ BuildRequires:  pkgconfig(openssl)
+ 
+ %description plugin-ipsec
+ OpenVPN support for Connman.
+ %endif
+ 
  %if %{with connman_vpnd}
  %package connman-vpnd
  Summary:        VPN Support for Connman
@@@ -136,6 -153,9 +153,9 @@@ chmod +x bootstra
  %if %{with connman_openvpn}
              --enable-openvpn \
  %endif
+ %if %{with connman_ipsec}
+             --enable-ipsec \
+ %endif
  %if 0%{?enable_connman_features}
              %connman_features \
  %endif
@@@ -199,6 -219,10 +219,6 @@@ rm %{buildroot}%{_sysconfdir}/dbus-1/sy
  mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d/
  cp src/connman.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/
  
 -#License
 -mkdir -p %{buildroot}%{_datadir}/license
 -cp COPYING %{buildroot}%{_datadir}/license/connman
 -
  %if %{with connman_vpnd}
  cp vpn/vpn-dbus.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf
  %endif
@@@ -242,7 -266,7 +262,7 @@@ systemctl daemon-reloa
  %attr(644,root,root) %{_libdir}/systemd/system/connman.socket
  %attr(644,root,root) %{_libdir}/systemd/system/sockets.target.wants/connman.socket
  %endif
 -%{_datadir}/license/connman
 +%license COPYING
  %{upgrade_script_path}/%{upgrade_script_filename}
  
  %files test
@@@ -260,7 -284,6 +280,7 @@@
  %{_libdir}/connman/plugins-vpn/openconnect.so
  %{_libdir}/connman/scripts/openconnect-script
  %{_datadir}/dbus-1/system-services/net.connman.vpn.service
 +%license COPYING
  %endif
  
  %if %{with connman_openvpn}
@@@ -269,9 -292,16 +289,17 @@@
  %{_libdir}/%{name}/plugins-vpn/openvpn.so
  %{_libdir}/%{name}/scripts/openvpn-script
  %{_datadir}/dbus-1/system-services/net.connman.vpn.service
 +%license COPYING
  %endif
  
+ %if %{with connman_ipsec}
+ %files plugin-ipsec
+ %manifest %{name}.manifest
+ %{_libdir}/%{name}/plugins-vpn/ipsec.so
+ %{_libdir}/%{name}/scripts/ipsec-script
+ %{_datadir}/dbus-1/system-services/net.connman.vpn.service
+ %endif
+ 
  %if %{with connman_vpnd}
  %files connman-vpnd
  %manifest %{name}.manifest
@@@ -281,7 -311,6 +309,7 @@@
  %dir %{_libdir}/%{name}/plugins-vpn
  %config %{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf
  %{_datadir}/dbus-1/system-services/net.connman.vpn.service
 +%license COPYING
  %endif
  
  %post extension-tv
@@@ -289,7 -318,6 +317,7 @@@ mv -f %{_libdir}/systemd/system/connman
  mv -f %{_sysconfdir}/connman/main.conf.tv %{_sysconfdir}/connman/main.conf
  %files extension-tv
  %attr(644,root,root) %{_sysconfdir}/connman/main.conf.tv
 +%license COPYING
  %if "%{?_lib}" == "lib64"
  %attr(644,root,root) %{_unitdir}/connman.service.tv
  %else
@@@ -299,5 -327,3 +327,5 @@@
  mv -f %{_sysconfdir}/connman/main.conf.ivi %{_sysconfdir}/connman/main.conf
  %files extension-ivi
  %attr(644,root,root) %{_sysconfdir}/connman/main.conf.ivi
 +%license COPYING
 +