Merge "[SPIN] Enable state changed even if service changed scheduled." into tizen

diff --git a/Makefile.am b/Makefile.am
index 95761e2..5be7625 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,16 +63,15 @@ endif
 
 if SYSTEMD
 systemdunitdir = @SYSTEMD_UNITDIR@
-
-systemdunit_DATA = src/connman.service
+systemdunit_DATA = src/connman.service vpn/connman-vpn.service
 
 endif
 endif
 
 service_files_sources = src/connman.service.in src/net.connman.service.in \
-                               vpn/net.connman.vpn.service.in
+                               vpn/net.connman.vpn.service.in vpn/connman-vpn.service.in
 service_files = src/connman.service src/net.connman.service \
-                               vpn/net.connman.vpn.service
+                               vpn/net.connman.vpn.service vpn/connman-vpn.service
 
 plugin_LTLIBRARIES =
 

diff --git a/gdhcp/client.c b/gdhcp/client.c
index 106c777..2c442e5 100755 (executable)
--- a/gdhcp/client.c
+++ b/gdhcp/client.c
@@ -2776,7 +2776,7 @@ int g_dhcp_client_start(GDHCPClient *dhcp_client, const char *last_address)
                if (addr == 0xFFFFFFFF || ((addr & LINKLOCAL_ADDR) ==
                                        LINKLOCAL_ADDR)) {
                        addr = 0;
-               } else {
+               } else if (dhcp_client->last_address != last_address) {
                        g_free(dhcp_client->last_address);
                        dhcp_client->last_address = g_strdup(last_address);
                }

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 2ad02f6..4bf2d1a 100755 (executable)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -4,7 +4,7 @@
 
 Name:           connman
 Version:        1.29
-Release:        9
+Release:        11
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net
@@ -15,7 +15,6 @@ BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libiptc)
 BuildRequires:  pkgconfig(xtables)
-BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(tpkp-gnutls)
 %if %{with connman_openconnect}
@@ -124,7 +123,8 @@ chmod +x bootstrap
                        --enable-loopback \
                        --enable-ethernet \
             --with-systemdunitdir=%{_libdir}/systemd/system \
-            --enable-pie
+            --enable-pie \
+                       --disable-wispr
 
 make %{?_smp_mflags}
 
@@ -142,6 +142,7 @@ cp src/connman_tv.service %{buildroot}%{_libdir}/systemd/system/connman.service
 %else
 %if "%{?_lib}" == "lib64"
 cp src/connman.service %{buildroot}%{_unitdir}/connman.service
+cp vpn/connman-vpn.service %{buildroot}%{_unitdir}/connman-vpn.service
 %endif
 %endif
 
@@ -193,9 +194,11 @@ systemctl daemon-reload
 %{_sysconfdir}/dbus-1/system.d/*.conf
 %attr(644,root,root) %{_libdir}/systemd/system/connman.service
 %attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/connman.service
+%attr(644,root,root) %{_libdir}/systemd/system/connman-vpn.service
 %if "%{?_lib}" == "lib64"
 %attr(644,root,root) %{_unitdir}/connman.service
 %attr(644,root,root) %{_unitdir}/multi-user.target.wants/connman.service
+%attr(644,root,root) %{_unitdir}/connman-vpn.service
 %endif
 %{_datadir}/license/connman
 

diff --git a/resources/usr/share/dbus-1/system-services/net.connman.service b/resources/usr/share/dbus-1/system-services/net.connman.service
index d7730d8..9679c1b 100644 (file)
--- a/resources/usr/share/dbus-1/system-services/net.connman.service
+++ b/resources/usr/share/dbus-1/system-services/net.connman.service
@@ -1,5 +1,5 @@
 [D-BUS Service]
 Name=net.connman
-Exec=@sbindir@/connmand -n
+Exec=/bin/false
 User=root
-SystemdService=connman.service
\ No newline at end of file
+SystemdService=connman.service

diff --git a/src/connman.service.in b/src/connman.service.in
index adf7a62..503ec45 100755 (executable)
--- a/src/connman.service.in
+++ b/src/connman.service.in
@@ -9,6 +9,8 @@ BusName=net.connman
 Restart=on-failure
 ExecStart=@sbindir@/connmand -n --noplugin vpn
 StandardOutput=null
+CapabilityBoundingSet=~CAP_MAC_ADMIN
+CapabilityBoundingSet=~CAP_MAC_OVERRIDE
 
 [Install]
 WantedBy=multi-user.target

diff --git a/src/connman_tv.service.in b/src/connman_tv.service.in
index 2922aa8..c032846 100644 (file)
--- a/src/connman_tv.service.in
+++ b/src/connman_tv.service.in
@@ -7,6 +7,8 @@ BusName=net.connman
 RemainAfterExit=yes
 ExecStartPre=/usr/bin/dbus-send --system --dest=net.netconfig / net.netconfig.auto.activate
 ExecStart=/usr/sbin/connmand --noplugin vpn
+CapabilityBoundingSet=~CAP_MAC_ADMIN
+CapabilityBoundingSet=~CAP_MAC_OVERRIDE
 
 [Install]
 WantedBy=multi-user.target

diff --git a/src/net.connman.service.in b/src/net.connman.service.in
index f7f6a7c..9679c1b 100755 (executable)
--- a/src/net.connman.service.in
+++ b/src/net.connman.service.in
@@ -1,5 +1,5 @@
 [D-BUS Service]
 Name=net.connman
-Exec=@sbindir@/connmand -n
+Exec=/bin/false
 User=root
 SystemdService=connman.service

diff --git a/vpn/connman-vpn.service.in b/vpn/connman-vpn.service.in
index de65a70..71abb57 100755 (executable)
--- a/vpn/connman-vpn.service.in
+++ b/vpn/connman-vpn.service.in
@@ -8,6 +8,8 @@ Type=dbus
 BusName=net.connman.vpn
 ExecStart=@sbindir@/connman-vpnd -n
 StandardOutput=null
+CapabilityBoundingSet=~CAP_MAC_ADMIN
+CapabilityBoundingSet=~CAP_MAC_OVERRIDE
 
 [Install]
 WantedBy=multi-user.target

diff --git a/vpn/net.connman.vpn.service.in b/vpn/net.connman.vpn.service.in
index 9487201..8dcf254 100755 (executable)
--- a/vpn/net.connman.vpn.service.in
+++ b/vpn/net.connman.vpn.service.in
@@ -1,4 +1,5 @@
 [D-BUS Service]
 Name=net.connman.vpn
-Exec=@sbindir@/connman-vpnd -n
+Exec=/bin/false
 User=root
+SystemdService=connman-vpn.service