X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fconnman.spec;h=91270e459b874c5a4406ae498e22dd08b6bf91c4;hb=6064810fc04058ce74f2573f1e0576829f46ba1e;hp=6f12bbb2eee65b8ba0005401e362ab4603398b93;hpb=6df34c52ef916fd3122053525647ccfbad82def9;p=platform%2Fupstream%2Fconnman.git diff --git a/packaging/connman.spec b/packaging/connman.spec old mode 100755 new mode 100644 index 6f12bbb..91270e4 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -1,30 +1,37 @@ %bcond_with connman_openconnect +%bcond_without connman_wireguard %bcond_without connman_openvpn +%bcond_without connman_ipsec %bcond_without connman_vpnd Name: connman -Version: 1.29 -Release: 21 +Version: 1.38 +Release: 10 License: GPL-2.0+ Summary: Connection Manager Url: http://connman.net Group: Network & Connectivity/Connection Management Source0: %{name}-%{version}.tar.gz BuildRequires: systemd-devel +BuildRequires: pkgconfig(dlog) 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(libsystemd-daemon) +BuildRequires: pkgconfig(libnl-3.0) +BuildRequires: pkgconfig(libnl-genl-3.0) +BuildRequires: pkgconfig(libsystemd) %if %{with connman_openconnect} BuildRequires: openconnect %endif %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,13 +40,11 @@ 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} -%define upgrade_script_filename 500.connman_upgrade.sh -%define upgrade_script_path /usr/share/upgrade/scripts - %description Connection Manager provides a daemon for managing Internet connections within embedded devices running the Linux operating system. @@ -64,6 +69,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 @@ -74,6 +89,16 @@ Requires: %{name} = %{version} Provides VPN support for Connman %endif +%if %{with connman_wireguard} +%package plugin-wireguard +Summary: Wireguard Support for Connman +BuildRequires: pkgconfig(libmnl) +Requires: %{name} = %{version} + +%description plugin-wireguard +Wireguard Support for Connman. +%endif + %package test Summary: Test Scripts for Connection Manager Group: Development/Tools @@ -86,7 +111,7 @@ Requires: python-xml Scripts for testing Connman and its functionality %package devel -Summary: Development Files for connman +Summary: Development files for connman Group: Development/Tools Requires: %{name} = %{version} @@ -98,6 +123,7 @@ 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}. @@ -107,18 +133,42 @@ 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}. + +%package extension-bpf +Summary: Files for BPF support +Requires: libelf +Requires: zlib +Requires: %{name} = %{version}-%{release} +%description extension-bpf +Files for BPF support + +%package extension-bpf-devel +License: GPL-2.0+ and LGPL-2.1+ +Summary: Development files for BPF support +Requires: %{name} = %{version}-%{release} +Requires: %{name}-extension-bpf +%description extension-bpf-devel +Header files and development files for BPF support + + %prep %setup -q %build -CFLAGS+=" -DTIZEN_EXT -lsmack -Werror" -CFLAGS+=" -DTIZEN_SYS_CA_BUNDLE=\"%TZ_SYS_RO_CA_BUNDLE\"" - %if %{with connman_vpnd} VPN_CFLAGS+=" -DTIZEN_EXT -lsmack -Werror" %endif @@ -126,9 +176,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 \ @@ -136,17 +189,25 @@ chmod +x bootstrap %if %{with connman_openvpn} --enable-openvpn \ %endif +%if %{with connman_ipsec} + --enable-ipsec \ +%endif +%if %{without connman_wireguard} + --disable-wireguard \ +%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=%{_unitdir} \ + --enable-pie \ + --disable-wispr \ + --disable-backtrace \ + --disable-tools make %{?_smp_mflags} @@ -154,36 +215,19 @@ make %{?_smp_mflags} %make_install #Systemd service file -mkdir -p %{buildroot}%{_libdir}/systemd/system/ -%if "%{?_lib}" == "lib64" mkdir -p %{buildroot}%{_unitdir} -%endif -%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 -%else -cp src/connman_tv.service %{buildroot}%{_libdir}/systemd/system/connman.service.tv -%endif -mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants -ln -s ../connman.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/connman.service -%if "%{?_lib}" == "lib64" 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 @@ -193,6 +237,7 @@ 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 @@ -203,13 +248,20 @@ cp src/connman.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/ cp vpn/vpn-dbus.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf %endif -#OS Upgrade -mkdir -p %{buildroot}%{upgrade_script_path} -cp -f scripts/%{upgrade_script_filename} %{buildroot}%{upgrade_script_path} +# BPF file +mkdir -p %{buildroot}/%{_includedir}/bpf +cp -rf resources/usr/include/bpf/* %{buildroot}/%{_includedir}/bpf +cp resources/var/lib/connman/bpf_code %{buildroot}/%{_localstatedir}/lib/connman/bpf_code + +%ifarch aarch64 +cp resources/usr/lib/libbpf.so.64 %{buildroot}/%{_libdir}/libbpf.so.0.2.0 +%else +cp resources/usr/lib/libbpf.so.32 %{buildroot}/%{_libdir}/libbpf.so.0.2.0 +%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 @@ -220,30 +272,18 @@ 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(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(500,network_fw,network_fw) %{_bindir}/connmand +%attr(500,network_fw,network_fw) %{_bindir}/connmanctl +%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) %{_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 %license COPYING -%{upgrade_script_path}/%{upgrade_script_filename} %files test %manifest connman.manifest @@ -259,7 +299,6 @@ 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 @@ -268,36 +307,71 @@ 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) %{_unitdir}/connman-vpn.service +%endif + +%if %{with connman_wireguard} +%files plugin-wireguard +%manifest %{name}.manifest +%{_libdir}/%{name}/plugins-vpn/wireguard.so +%license COPYING %endif %post extension-tv -mv -f %{_libdir}/systemd/system/connman.service.tv %{_libdir}/systemd/system/connman.service +mv -f %{_unitdir}/connman.service.tv %{_unitdir}/connman.service mv -f %{_sysconfdir}/connman/main.conf.tv %{_sysconfdir}/connman/main.conf + %files extension-tv -%attr(644,root,root) %{_sysconfdir}/connman/main.conf.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,root,root) %{_sysconfdir}/connman/main.conf.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 + +%files extension-bpf +%manifest %{name}.manifest +%attr(755,root,root) %{_libdir}/libbpf.so.0.2.0 +%attr(640,network_fw,network_fw) %{_localstatedir}/lib/connman/bpf_code + +%post extension-bpf +ln -s %{_libdir}/libbpf.so.0.2.0 %{_libdir}/libbpf.so.0 +ln -s %{_libdir}/libbpf.so.0.2.0 %{_libdir}/libbpf.so + +%files extension-bpf-devel +%manifest %{name}.manifest +%{_includedir}/bpf/* +%license COPYING +%license COPYING.LGPLv2