%bcond_without connman_vpnd
Name: connman
-Version: 1.26
-Release: 7
+Version: 1.29
+Release: 15
License: GPL-2.0+
Summary: Connection Manager
Url: http://connman.net
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(libiptc)
BuildRequires: pkgconfig(xtables)
-BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(libsmack)
BuildRequires: pkgconfig(tpkp-gnutls)
+BuildRequires: pkgconfig(libsystemd-daemon)
%if %{with connman_openconnect}
BuildRequires: openconnect
%endif
%if %{with connman_vpnd}
%package connman-vpnd
Summary: VPN Support for Connman
-BuildRequires: %{name} = %{version}
+#BuildRequires: %{name} = %{version}
Requires: %{name} = %{version}
%description connman-vpnd
%build
CFLAGS+=" -DTIZEN_EXT -lsmack -Werror"
-CFLAGS+=" -DTIZEN_SYS_CA_BUNDLE=\"%TZ_SYS_CA_BUNDLE\""
+CFLAGS+=" -DTIZEN_SYS_CA_BUNDLE=\"%TZ_SYS_RO_CA_BUNDLE\""
%if "%{profile}" == "tv"
CFLAGS+=" -DTIZEN_TV_EXT"
%endif
--enable-loopback \
--enable-ethernet \
--with-systemdunitdir=%{_libdir}/systemd/system \
- --enable-pie
+ --enable-pie \
+ --disable-wispr
make %{?_smp_mflags}
%if "%{profile}" == "tv"
cp src/connman_tv.service %{buildroot}%{_libdir}/systemd/system/connman.service
%else
-cp src/connman.service %{buildroot}%{_libdir}/systemd/system/connman.service
%if "%{?_lib}" == "lib64"
cp src/connman.service %{buildroot}%{_unitdir}/connman.service
+cp vpn/connman-vpn.service %{buildroot}%{_unitdir}/connman-vpn.service
%endif
%endif
ln -s ../connman.service %{buildroot}%{_unitdir}/multi-user.target.wants/connman.service
%endif
+#Systemd socket file for DNS proxy
+%if "%{?_lib}" == "lib64"
+cp src/connman.socket %{buildroot}%{_unitdir}/connman.socket
+mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants
+ln -s ../connman.socket %{buildroot}%{_unitdir}/sockets.target.wants/connman.socket
+%else
+cp src/connman.socket %{buildroot}%{_libdir}/systemd/system/connman.socket
+mkdir -p %{buildroot}%{_libdir}/systemd/system/sockets.target.wants
+ln -s ../connman.socket %{buildroot}%{_libdir}/systemd/system/sockets.target.wants/connman.socket
+%endif
+
mkdir -p %{buildroot}/%{_localstatedir}/lib/connman
cp resources/var/lib/connman/settings %{buildroot}/%{_localstatedir}/lib/connman/settings
mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services
cp COPYING %{buildroot}%{_datadir}/license/connman
%if %{with connman_vpnd}
-#%install_service multi-user.target.wants connman-vpn.service
cp vpn/vpn-dbus.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf
%endif
%post
-#systemctl daemon-reload
-#systemctl restart connman.service
-%if %{with connman_vpnd}
-systemctl restart connman-vpn.service
-%endif
+chsmack -a 'System' /%{_localstatedir}/lib/connman
+chsmack -a 'System' /%{_localstatedir}/lib/connman/settings
%preun
-#systemctl stop connman.service
-%if %{with connman_vpnd}
-systemctl stop connman-vpn.service
-%endif
%postun
systemctl daemon-reload
%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
-%attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/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
-%attr(644,root,root) %{_unitdir}/multi-user.target.wants/connman-vpn.service
+%attr(644,root,root) %{_unitdir}/connman.socket
+%attr(644,root,root) %{_unitdir}/sockets.target.wants/connman.socket
+%else
+%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
%if %{with connman_openconnect}
%files plugin-openconnect
%manifest %{name}.manifest
-%{_unitdir}/connman-vpn.service
%{_libdir}/connman/plugins-vpn/openconnect.so
%{_libdir}/connman/scripts/openconnect-script
%{_datadir}/dbus-1/system-services/net.connman.vpn.service
%if %{with connman_openvpn}
%files plugin-openvpn
%manifest %{name}.manifest
-%{_unitdir}/connman-vpn.service
%{_libdir}/%{name}/plugins-vpn/openvpn.so
%{_libdir}/%{name}/scripts/openvpn-script
%{_datadir}/dbus-1/system-services/net.connman.vpn.service
%if %{with connman_vpnd}
%files connman-vpnd
%manifest %{name}.manifest
-%{_sbindir}/connman-vpnd
-%{_unitdir}/connman-vpn.service
-#%{_unitdir}/multi-user.target.wants/connman-vpn.service
+#%{_sbindir}/connman-vpnd
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/scripts
%dir %{_libdir}/%{name}/plugins-vpn