Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
3f3c729b45 | ||
|
1b5b9ed14d | ||
|
152999a759 |
3
.gitignore
vendored
3
.gitignore
vendored
@ -370,3 +370,6 @@ network-manager-applet-0.8.1.tar.bz2
|
|||||||
/NetworkManager-1.22.6.tar.xz
|
/NetworkManager-1.22.6.tar.xz
|
||||||
/NetworkManager-1.22.8.tar.xz
|
/NetworkManager-1.22.8.tar.xz
|
||||||
/NetworkManager-1.22.10.tar.xz
|
/NetworkManager-1.22.10.tar.xz
|
||||||
|
/NetworkManager-1.22.12.tar.xz
|
||||||
|
/NetworkManager-1.22.14.tar.xz
|
||||||
|
/NetworkManager-1.22.16.tar.xz
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
|
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
|
||||||
|
|
||||||
%global epoch_version 1
|
%global epoch_version 1
|
||||||
%global rpm_version 1.22.10
|
%global rpm_version 1.22.16
|
||||||
%global real_version 1.22.10
|
%global real_version 1.22.16
|
||||||
%global release_version 1
|
%global release_version 1
|
||||||
%global snapshot %{nil}
|
%global snapshot %{nil}
|
||||||
%global git_sha %{nil}
|
%global git_sha %{nil}
|
||||||
@ -21,10 +21,10 @@
|
|||||||
|
|
||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
|
|
||||||
%if "x%{?snapshot}" != x
|
%if "x%{?snapshot}" != "x"
|
||||||
%global snapshot_dot .%{snapshot}
|
%global snapshot_dot .%{snapshot}
|
||||||
%endif
|
%endif
|
||||||
%if "x%{?git_sha}" != x
|
%if "x%{?git_sha}" != "x"
|
||||||
%global git_sha_dot .%{git_sha}
|
%global git_sha_dot .%{git_sha}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -73,6 +73,11 @@
|
|||||||
%else
|
%else
|
||||||
%bcond_without iwd
|
%bcond_without iwd
|
||||||
%endif
|
%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
|
# bpf(BPF_MAP_CREATE, ...) randomly fails with EPERM. That might
|
||||||
# be related to `ulimit -l`. Anyway, this is not usable at the
|
# be related to `ulimit -l`. Anyway, this is not usable at the
|
||||||
# moment.
|
# moment.
|
||||||
%global ebpf_enabled no
|
%global ebpf_enabled "no"
|
||||||
%else
|
%else
|
||||||
%global ebpf_enabled no
|
%global ebpf_enabled "no"
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
@ -233,6 +238,10 @@ BuildRequires: libasan
|
|||||||
BuildRequires: libubsan
|
BuildRequires: libubsan
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with firewalld_zone}
|
||||||
|
BuildRequires: firewalld-filesystem
|
||||||
|
%endif
|
||||||
|
BuildRequires: iproute
|
||||||
|
|
||||||
Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}
|
Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
@ -585,7 +594,7 @@ This tool is still experimental.
|
|||||||
%else
|
%else
|
||||||
-Dlibpsl=false \
|
-Dlibpsl=false \
|
||||||
%endif
|
%endif
|
||||||
%if %{ebpf_enabled} != yes
|
%if %{ebpf_enabled} != "yes"
|
||||||
-Debpf=false \
|
-Debpf=false \
|
||||||
%else
|
%else
|
||||||
-Debpf=true \
|
-Debpf=true \
|
||||||
@ -602,6 +611,11 @@ This tool is still experimental.
|
|||||||
%if %{with ppp}
|
%if %{with ppp}
|
||||||
-Dpppd_plugin_dir=%{_libdir}/pppd/%{ppp_version} \
|
-Dpppd_plugin_dir=%{_libdir}/pppd/%{ppp_version} \
|
||||||
-Dppp=true \
|
-Dppp=true \
|
||||||
|
%endif
|
||||||
|
%if %{with firewalld_zone}
|
||||||
|
-Dfirewalld_zone=true \
|
||||||
|
%else
|
||||||
|
-Dfirewalld_zone=false \
|
||||||
%endif
|
%endif
|
||||||
-Ddist_version=%{version}-%{release} \
|
-Ddist_version=%{version}-%{release} \
|
||||||
-Dconfig_plugins_default=%{config_plugins_default} \
|
-Dconfig_plugins_default=%{config_plugins_default} \
|
||||||
@ -734,6 +748,11 @@ intltoolize --automake --copy --force
|
|||||||
%if %{with ppp}
|
%if %{with ppp}
|
||||||
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
|
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
|
||||||
--enable-ppp=yes \
|
--enable-ppp=yes \
|
||||||
|
%endif
|
||||||
|
%if %{with firewalld_zone}
|
||||||
|
--enable-firewalld-zone \
|
||||||
|
%else
|
||||||
|
--disable-firewalld-zone \
|
||||||
%endif
|
%endif
|
||||||
--with-dist-version=%{version}-%{release} \
|
--with-dist-version=%{version}-%{release} \
|
||||||
--with-config-plugins-default=%{config_plugins_default} \
|
--with-config-plugins-default=%{config_plugins_default} \
|
||||||
@ -817,6 +836,9 @@ fi
|
|||||||
%post
|
%post
|
||||||
/usr/bin/udevadm control --reload-rules || :
|
/usr/bin/udevadm control --reload-rules || :
|
||||||
/usr/bin/udevadm trigger --subsystem-match=net || :
|
/usr/bin/udevadm trigger --subsystem-match=net || :
|
||||||
|
%if %{with firewalld_zone}
|
||||||
|
%firewalld_reload
|
||||||
|
%endif
|
||||||
|
|
||||||
%systemd_post %{systemd_units}
|
%systemd_post %{systemd_units}
|
||||||
|
|
||||||
@ -858,6 +880,9 @@ fi
|
|||||||
%postun
|
%postun
|
||||||
/usr/bin/udevadm control --reload-rules || :
|
/usr/bin/udevadm control --reload-rules || :
|
||||||
/usr/bin/udevadm trigger --subsystem-match=net || :
|
/usr/bin/udevadm trigger --subsystem-match=net || :
|
||||||
|
%if %{with firewalld_zone}
|
||||||
|
%firewalld_reload
|
||||||
|
%endif
|
||||||
|
|
||||||
%systemd_postun %{systemd_units}
|
%systemd_postun %{systemd_units}
|
||||||
|
|
||||||
@ -923,6 +948,9 @@ fi
|
|||||||
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
|
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
|
||||||
%{_datadir}/polkit-1/actions/*.policy
|
%{_datadir}/polkit-1/actions/*.policy
|
||||||
%{_prefix}/lib/udev/rules.d/*.rules
|
%{_prefix}/lib/udev/rules.d/*.rules
|
||||||
|
%if %{with firewalld_zone}
|
||||||
|
%{_prefix}/lib/firewalld/zones/nm-shared.xml
|
||||||
|
%endif
|
||||||
# systemd stuff
|
# systemd stuff
|
||||||
%{systemd_dir}/NetworkManager.service
|
%{systemd_dir}/NetworkManager.service
|
||||||
%{systemd_dir}/NetworkManager-wait-online.service
|
%{systemd_dir}/NetworkManager-wait-online.service
|
||||||
@ -1053,6 +1081,18 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Thu Mar 12 2020 Thomas Haller <thaller@redhat.com - 1:1.22.10-1
|
||||||
- Update to 1.22.10
|
- Update to 1.22.10
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (NetworkManager-1.22.10.tar.xz) = 342d0c8db2c94992f8f53b13dc4432fe566637e03e1d65cdc44ebf51a4f70d4ec804ebc48ed9cbe010c61abc665f1bb1be22f9364de991d6e5ffc5212b9efd23
|
SHA512 (NetworkManager-1.22.16.tar.xz) = ada9882d12f1ac523344f9cc5835d93b39916735fd1fa3433cb1bc7ba212d107058db353537f24152c65a801120bf082a431757a919040b3681079de284c4639
|
||||||
|
Loading…
Reference in New Issue
Block a user