|
|
|
|
@ -5,8 +5,8 @@
|
|
|
|
|
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
|
|
|
|
|
|
|
|
|
|
%global epoch_version 1
|
|
|
|
|
%global rpm_version 1.22.10
|
|
|
|
|
%global real_version 1.22.10
|
|
|
|
|
%global rpm_version 1.22.16
|
|
|
|
|
%global real_version 1.22.16
|
|
|
|
|
%global release_version 1
|
|
|
|
|
%global snapshot %{nil}
|
|
|
|
|
%global git_sha %{nil}
|
|
|
|
|
@ -21,10 +21,10 @@
|
|
|
|
|
|
|
|
|
|
%global _hardened_build 1
|
|
|
|
|
|
|
|
|
|
%if "x%{?snapshot}" != x
|
|
|
|
|
%if "x%{?snapshot}" != "x"
|
|
|
|
|
%global snapshot_dot .%{snapshot}
|
|
|
|
|
%endif
|
|
|
|
|
%if "x%{?git_sha}" != x
|
|
|
|
|
%if "x%{?git_sha}" != "x"
|
|
|
|
|
%global git_sha_dot .%{git_sha}
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
@ -73,6 +73,11 @@
|
|
|
|
|
%else
|
|
|
|
|
%bcond_without iwd
|
|
|
|
|
%endif
|
|
|
|
|
%if 0%{?fedora} > 31 || 0%{?rhel} > 7
|
|
|
|
|
%bcond_without firewalld_zone
|
|
|
|
|
%else
|
|
|
|
|
%bcond_with firewalld_zone
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
@ -112,9 +117,9 @@
|
|
|
|
|
# bpf(BPF_MAP_CREATE, ...) randomly fails with EPERM. That might
|
|
|
|
|
# be related to `ulimit -l`. Anyway, this is not usable at the
|
|
|
|
|
# moment.
|
|
|
|
|
%global ebpf_enabled no
|
|
|
|
|
%global ebpf_enabled "no"
|
|
|
|
|
%else
|
|
|
|
|
%global ebpf_enabled no
|
|
|
|
|
%global ebpf_enabled "no"
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
@ -233,6 +238,10 @@ BuildRequires: libasan
|
|
|
|
|
BuildRequires: libubsan
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with firewalld_zone}
|
|
|
|
|
BuildRequires: firewalld-filesystem
|
|
|
|
|
%endif
|
|
|
|
|
BuildRequires: iproute
|
|
|
|
|
|
|
|
|
|
Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}
|
|
|
|
|
|
|
|
|
|
@ -585,7 +594,7 @@ This tool is still experimental.
|
|
|
|
|
%else
|
|
|
|
|
-Dlibpsl=false \
|
|
|
|
|
%endif
|
|
|
|
|
%if %{ebpf_enabled} != yes
|
|
|
|
|
%if %{ebpf_enabled} != "yes"
|
|
|
|
|
-Debpf=false \
|
|
|
|
|
%else
|
|
|
|
|
-Debpf=true \
|
|
|
|
|
@ -603,6 +612,11 @@ This tool is still experimental.
|
|
|
|
|
-Dpppd_plugin_dir=%{_libdir}/pppd/%{ppp_version} \
|
|
|
|
|
-Dppp=true \
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with firewalld_zone}
|
|
|
|
|
-Dfirewalld_zone=true \
|
|
|
|
|
%else
|
|
|
|
|
-Dfirewalld_zone=false \
|
|
|
|
|
%endif
|
|
|
|
|
-Ddist_version=%{version}-%{release} \
|
|
|
|
|
-Dconfig_plugins_default=%{config_plugins_default} \
|
|
|
|
|
-Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \
|
|
|
|
|
@ -735,6 +749,11 @@ intltoolize --automake --copy --force
|
|
|
|
|
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
|
|
|
|
|
--enable-ppp=yes \
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with firewalld_zone}
|
|
|
|
|
--enable-firewalld-zone \
|
|
|
|
|
%else
|
|
|
|
|
--disable-firewalld-zone \
|
|
|
|
|
%endif
|
|
|
|
|
--with-dist-version=%{version}-%{release} \
|
|
|
|
|
--with-config-plugins-default=%{config_plugins_default} \
|
|
|
|
|
--with-config-dns-rc-manager-default=%{dns_rc_manager_default} \
|
|
|
|
|
@ -817,6 +836,9 @@ fi
|
|
|
|
|
%post
|
|
|
|
|
/usr/bin/udevadm control --reload-rules || :
|
|
|
|
|
/usr/bin/udevadm trigger --subsystem-match=net || :
|
|
|
|
|
%if %{with firewalld_zone}
|
|
|
|
|
%firewalld_reload
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%systemd_post %{systemd_units}
|
|
|
|
|
|
|
|
|
|
@ -858,6 +880,9 @@ fi
|
|
|
|
|
%postun
|
|
|
|
|
/usr/bin/udevadm control --reload-rules || :
|
|
|
|
|
/usr/bin/udevadm trigger --subsystem-match=net || :
|
|
|
|
|
%if %{with firewalld_zone}
|
|
|
|
|
%firewalld_reload
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%systemd_postun %{systemd_units}
|
|
|
|
|
|
|
|
|
|
@ -923,6 +948,9 @@ fi
|
|
|
|
|
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
|
|
|
|
|
%{_datadir}/polkit-1/actions/*.policy
|
|
|
|
|
%{_prefix}/lib/udev/rules.d/*.rules
|
|
|
|
|
%if %{with firewalld_zone}
|
|
|
|
|
%{_prefix}/lib/firewalld/zones/nm-shared.xml
|
|
|
|
|
%endif
|
|
|
|
|
# systemd stuff
|
|
|
|
|
%{systemd_dir}/NetworkManager.service
|
|
|
|
|
%{systemd_dir}/NetworkManager-wait-online.service
|
|
|
|
|
@ -1053,6 +1081,18 @@ fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Mon Aug 31 2020 Thomas Haller <thaller@redhat.com> - 1:1.22.16-1
|
|
|
|
|
- Update to 1.22.16 release
|
|
|
|
|
- ovs: support setting MAC address of Open vSwitch interface.
|
|
|
|
|
|
|
|
|
|
* Fri May 29 2020 Thomas Haller <thaller@redhat.com> - 1:1.22.14-1
|
|
|
|
|
- Update to 1.22.14 release
|
|
|
|
|
- ifcfg-rh: handle "802-1x.{,phase2-}ca-path" (rh #1841395, CVE-2020-10754)
|
|
|
|
|
|
|
|
|
|
* Thu May 21 2020 Beniamino Galvani <bgalvani@redhat.com> - 1:1.22.12-1
|
|
|
|
|
- Update to 1.22.12
|
|
|
|
|
- Ship and use a firewalld zone for connection sharing (rh #1829637)
|
|
|
|
|
|
|
|
|
|
* Thu Mar 12 2020 Thomas Haller <thaller@redhat.com - 1:1.22.10-1
|
|
|
|
|
- Update to 1.22.10
|
|
|
|
|
|
|
|
|
|
|
Thomas Haller
Beniamino Galvani