X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fconnman.spec;h=4a6815e51f3d2f1001aaa82a32c5f391512e398a;hb=1ca04d028034566c81abf7500c5cb45d2fc4ac11;hp=1fd96ebc6d0f41571dbac5b04eea8938ad2cec32;hpb=f628758d7b9a89d502bae215aca2628f7cfc40e3;p=platform%2Fupstream%2Fconnman.git diff --git a/packaging/connman.spec b/packaging/connman.spec old mode 100755 new mode 100644 index 1fd96eb..4a6815e --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -1,10 +1,11 @@ %bcond_with connman_openconnect %bcond_without connman_openvpn +%bcond_without connman_ipsec %bcond_without connman_vpnd Name: connman -Version: 1.29 -Release: 15 +Version: 1.37 +Release: 41 License: GPL-2.0+ Summary: Connection Manager Url: http://connman.net @@ -13,10 +14,12 @@ Source0: %{name}-%{version}.tar.gz 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) -BuildRequires: pkgconfig(tpkp-gnutls) +BuildRequires: pkgconfig(libnl-3.0) +BuildRequires: pkgconfig(libnl-genl-3.0) BuildRequires: pkgconfig(libsystemd-daemon) %if %{with connman_openconnect} BuildRequires: openconnect @@ -24,7 +27,9 @@ BuildRequires: openconnect %if %{with connman_openvpn} BuildRequires: openvpn %endif -BuildRequires: ca-certificates-devel +%if %{with connman_ipsec} +BuildRequires: strongswan +%endif BuildRequires: readline-devel #%systemd_requires Requires: iptables @@ -33,6 +38,10 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd Requires: net-config +Requires: security-config +Provides: %{name}-profile_common = %{version}-%{release} +Provides: %{name}-profile_mobile = %{version}-%{release} +Provides: %{name}-profile_wearable = %{version}-%{release} %description Connection Manager provides a daemon for managing Internet connections @@ -58,6 +67,16 @@ Requires: openvpn OpenVPN support for Connman. %endif +%if %{with connman_ipsec} +%package plugin-ipsec +Summary: IPsec Support for Connman +Requires: %{name} = %{version} +Requires: strongswan + +%description plugin-ipsec +OpenVPN support for Connman. +%endif + %if %{with connman_vpnd} %package connman-vpnd Summary: VPN Support for Connman @@ -87,17 +106,40 @@ Requires: %{name} = %{version} %description devel Header files and development files for connman. +%package extension-tv +Summary: Connman service script for TV profile +Requires: %{name} = %{version}-%{release} +Provides: %{name}-profile_tv = %{version}-%{release} +Conflicts: %{name}-extension-ivi +Conflicts: %{name}-extension-disable-eth +%description extension-tv +Supplies Tizen TV profile systemd service scripts instead of the default one. +This overwrites service script of %{name}. + +%package extension-ivi +Summary: Connman configuration for IVI profile +Requires: %{name} = %{version}-%{release} +Provides: %{name}-profile_ivi = %{version}-%{release} +Conflicts: %{name}-extension-tv +Conflicts: %{name}-extension-disable-eth +%description extension-ivi +Supplies Tizen IVI profile configuration instead of the default one. +This overwrites conf file of %{name}. + +%package extension-disable-eth +Summary: Connman configuration for testing which requires the ethernet to be disabled +Requires: %{name} = %{version}-%{release} +Conflicts: %{name}-extension-tv +Conflicts: %{name}-extension-ivi +%description extension-disable-eth +Connman without ethernet support +This overwrites conf file of %{name}. + %prep %setup -q %build -CFLAGS+=" -DTIZEN_EXT -lsmack -Werror" -CFLAGS+=" -DTIZEN_SYS_CA_BUNDLE=\"%TZ_SYS_RO_CA_BUNDLE\"" -%if "%{profile}" == "tv" -CFLAGS+=" -DTIZEN_TV_EXT" -%endif - %if %{with connman_vpnd} VPN_CFLAGS+=" -DTIZEN_EXT -lsmack -Werror" %endif @@ -105,9 +147,12 @@ VPN_CFLAGS+=" -DTIZEN_EXT -lsmack -Werror" chmod +x bootstrap ./bootstrap %configure \ - --sysconfdir=/etc \ - --enable-client \ - --enable-pacrunner \ + --sysconfdir=/etc \ + --enable-client \ + --enable-tizen-ext \ + --disable-tizen-ext-ins \ + --enable-tizen-ext-eap-on-ethernet \ + --enable-pacrunner \ --enable-wifi=builtin \ %if %{with connman_openconnect} --enable-openconnect \ @@ -115,17 +160,22 @@ chmod +x bootstrap %if %{with connman_openvpn} --enable-openvpn \ %endif +%if %{with connman_ipsec} + --enable-ipsec \ +%endif %if 0%{?enable_connman_features} %connman_features \ %endif --disable-ofono \ --enable-telephony=builtin \ --enable-test \ - --enable-loopback \ - --enable-ethernet \ - --with-systemdunitdir=%{_libdir}/systemd/system \ - --enable-pie \ - --disable-wispr + --enable-loopback \ + --enable-ethernet \ + --with-systemdunitdir=%{_libdir}/systemd/system \ + --enable-pie \ + --disable-wispr \ + --disable-backtrace \ + --disable-tools make %{?_smp_mflags} @@ -138,13 +188,12 @@ mkdir -p %{buildroot}%{_libdir}/systemd/system/ mkdir -p %{buildroot}%{_unitdir} %endif -%if "%{profile}" == "tv" -cp src/connman_tv.service %{buildroot}%{_libdir}/systemd/system/connman.service -%else %if "%{?_lib}" == "lib64" +cp src/connman_tv.service %{buildroot}%{_unitdir}/connman.service.tv cp src/connman.service %{buildroot}%{_unitdir}/connman.service cp vpn/connman-vpn.service %{buildroot}%{_unitdir}/connman-vpn.service -%endif +%else +cp src/connman_tv.service %{buildroot}%{_libdir}/systemd/system/connman.service.tv %endif mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants @@ -154,28 +203,39 @@ mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants 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 resources/usr/share/dbus-1/system-services/net.connman.service %{buildroot}%{_datadir}/dbus-1/system-services/net.connman.service mkdir -p %{buildroot}/etc/connman + +cp src/main_ivi.conf %{buildroot}/etc/connman/main.conf.ivi +cp src/main_tv.conf %{buildroot}/etc/connman/main.conf.tv +cp src/main_disable_eth.conf %{buildroot}/etc/connman/main.conf.disable.eth cp src/main.conf %{buildroot}/etc/connman/main.conf rm %{buildroot}%{_sysconfdir}/dbus-1/system.d/*.conf 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 %post -chsmack -a 'System' /%{_localstatedir}/lib/connman -chsmack -a 'System' /%{_localstatedir}/lib/connman/settings +#chsmack -a 'System' /%{_localstatedir}/lib/connman +#chsmack -a 'System' /%{_localstatedir}/lib/connman/settings %preun @@ -186,24 +246,26 @@ systemctl daemon-reload %files %manifest connman.manifest -%attr(500,root,root) %{_sbindir}/* -%attr(500,root,root) %{_bindir}/connmanctl -%attr(600,root,root) /%{_localstatedir}/lib/connman/settings -#%{_libdir}/connman/plugins/*.so -%attr(644,root,root) %{_datadir}/dbus-1/system-services/* -#%{_datadir}/dbus-1/services/* -%{_sysconfdir}/dbus-1/system.d/* -%attr(644,root,root) %{_sysconfdir}/connman/main.conf -%{_sysconfdir}/dbus-1/system.d/*.conf +%attr(500,network_fw,network_fw) %{_bindir}/connmand +%attr(500,network_fw,network_fw) %{_bindir}/connmanctl +%attr(755,network_fw,network_fw) /%{_localstatedir}/lib/connman +%attr(600,network_fw,network_fw) /%{_localstatedir}/lib/connman/settings +%attr(644,root,root) %{_datadir}/dbus-1/system-services/net.connman.service +%attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/* +%attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf +%attr(644,root,root) %{_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 +%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 +%license COPYING %files test %manifest connman.manifest @@ -219,7 +281,7 @@ systemctl daemon-reload %manifest %{name}.manifest %{_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} @@ -227,18 +289,51 @@ systemctl daemon-reload %manifest %{name}.manifest %{_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 +%license COPYING %endif %if %{with connman_vpnd} %files connman-vpnd %manifest %{name}.manifest -#%{_sbindir}/connman-vpnd +%{_bindir}/connman-vpnd %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/scripts %dir %{_libdir}/%{name}/plugins-vpn -%config %{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf +%attr(644,root,root) %config %{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf %{_datadir}/dbus-1/system-services/net.connman.vpn.service +%license COPYING +%attr(644,root,root) %{_libdir}/systemd/system/connman-vpn.service +%if "%{?_lib}" == "lib64" +%attr(644,root,root) %{_unitdir}/connman-vpn.service +%endif %endif - +%post extension-tv +mv -f %{_libdir}/systemd/system/connman.service.tv %{_libdir}/systemd/system/connman.service +mv -f %{_sysconfdir}/connman/main.conf.tv %{_sysconfdir}/connman/main.conf +%files extension-tv +%attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf.tv +%license COPYING +%if "%{?_lib}" == "lib64" +%attr(644,root,root) %{_unitdir}/connman.service.tv +%else +%attr(644,root,root) %{_libdir}/systemd/system/connman.service.tv +%endif +%post extension-ivi +mv -f %{_sysconfdir}/connman/main.conf.ivi %{_sysconfdir}/connman/main.conf +%files extension-ivi +%attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf.ivi +%license COPYING +%post extension-disable-eth +mv -f %{_sysconfdir}/connman/main.conf.disable.eth %{_sysconfdir}/connman/main.conf +%files extension-disable-eth +%attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf.disable.eth +%license COPYING