2013-11-16 00:58:46 +01:00
|
|
|
# SPEC file to build NetworkManager for testing. It aims for a similar
|
|
|
|
|
# configuration as rhel-7.0 and Fedora rawhide
|
|
|
|
|
#
|
2014-06-25 17:06:42 +02:00
|
|
|
# This spec file is not used as is to create official packages for RHEL, Fedora or any
|
2013-11-16 00:58:46 +01:00
|
|
|
# other distribution.
|
2014-06-25 17:06:42 +02:00
|
|
|
#
|
|
|
|
|
# Note that it contains __PLACEHOLDERS__ that will be replaced by the accompanying 'build.sh' script.
|
|
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2015-09-03 17:08:03 +02:00
|
|
|
%global wireless_tools_version 1:28-0pre9
|
2014-07-04 12:33:14 +02:00
|
|
|
|
2018-05-14 15:12:48 +02:00
|
|
|
%global wpa_supplicant_version 1:1.1
|
|
|
|
|
|
2016-07-04 22:02:13 +02:00
|
|
|
%global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
|
2016-09-23 12:11:16 +02:00
|
|
|
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2017-05-10 16:47:24 +02:00
|
|
|
%global epoch_version 1
|
2016-02-03 15:47:27 +01:00
|
|
|
%global rpm_version __VERSION__
|
|
|
|
|
%global real_version __VERSION__
|
2015-09-03 17:08:03 +02:00
|
|
|
%global release_version __RELEASE_VERSION__
|
2018-02-09 17:14:34 +01:00
|
|
|
%global snapshot __SNAPSHOT__
|
2017-05-10 16:47:24 +02:00
|
|
|
%global git_sha __COMMIT__
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2016-10-14 09:54:20 +02:00
|
|
|
%global obsoletes_device_plugins 1:0.9.9.95-1
|
2016-12-16 09:51:45 +01:00
|
|
|
%global obsoletes_ppp_plugin 1:1.5.3
|
2014-06-09 10:45:29 -05:00
|
|
|
|
2015-09-03 17:08:03 +02:00
|
|
|
%global systemd_dir %{_prefix}/lib/systemd/system
|
2019-06-14 15:51:44 +02:00
|
|
|
%global sysctl_dir %{_prefix}/lib/sysctl.d
|
2015-09-03 17:08:03 +02:00
|
|
|
%global nmlibdir %{_prefix}/lib/%{name}
|
2018-03-18 20:38:49 +01:00
|
|
|
%global nmplugindir %{_libdir}/%{name}/%{version}-%{release}
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2016-02-02 12:57:35 +01:00
|
|
|
%global _hardened_build 1
|
|
|
|
|
|
2019-02-07 16:49:50 +01:00
|
|
|
%if "x%{?snapshot}" != x
|
2016-05-05 21:56:20 +02:00
|
|
|
%global snapshot_dot .%{snapshot}
|
|
|
|
|
%endif
|
2019-02-07 16:49:50 +01:00
|
|
|
%if "x%{?git_sha}" != x
|
2016-05-05 21:56:20 +02:00
|
|
|
%global git_sha_dot .%{git_sha}
|
|
|
|
|
%endif
|
|
|
|
|
|
2016-07-07 11:19:26 +02:00
|
|
|
%global snap %{?snapshot_dot}%{?git_sha_dot}
|
2016-02-02 12:57:35 +01:00
|
|
|
|
2019-07-29 21:45:52 +02:00
|
|
|
%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[0-9][0-9]*\\)\\.[0-9][0-9]*$/\\1/p')
|
2017-09-20 14:29:46 +02:00
|
|
|
|
2019-04-17 20:06:44 +02:00
|
|
|
%global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service
|
|
|
|
|
|
2016-02-02 12:57:35 +01:00
|
|
|
###############################################################################
|
|
|
|
|
|
2018-09-21 22:49:20 +02:00
|
|
|
%bcond_with meson
|
2016-02-02 12:57:35 +01:00
|
|
|
%bcond_without adsl
|
|
|
|
|
%bcond_without bluetooth
|
|
|
|
|
%bcond_without wwan
|
|
|
|
|
%bcond_without team
|
|
|
|
|
%bcond_without wifi
|
2017-08-01 18:27:22 +02:00
|
|
|
%bcond_without ovs
|
2016-11-05 15:27:16 +01:00
|
|
|
%bcond_without ppp
|
2016-02-02 12:57:35 +01:00
|
|
|
%bcond_without nmtui
|
|
|
|
|
%bcond_without regen_docs
|
|
|
|
|
%bcond_with debug
|
contrib/rpm: disable tests by default and use fatal-warnings with tests
In general, when we build a package, we want no compiler warnings
and all unit tests to pass.
That is in particular true when building a package for the distribution
in koji. When builing in koji, we (rightly) cannot pass rpmbuild options, so
the default whether tests/compiler-warnings are fatal matter very much.
One could argue: let's have the tests/compiler-warnings fatal and fail the build.
During a build in koji for a Fedora release, we want them all pass. And if somebody
does a manual build, the person can patch the spec file (or use rpmbuild
flags).
However, note how commit "f7b5e48cdb contrib/rpm: don't force fatal warnings
with tests" already disabled fatal compiler warnings. Why? It seems
compiler warnings should be even more stable than our unit tests, as long
as you target a particular Fedora release and compiler version. So this
was done to support rebuilding an SRPM for a different Fedora release,
or to be more graceful during early development phase of a Fedora
release, where things are not as stable yet.
The exactly same reasoning applies to treating unit-tests failures as fatal.
For example, a recent iproute2 issue broke unit tests. That meant, with
that iproute2 release in build root, the NetworkManager RPM could not be built.
Very annoying.
Now:
- if "test" is enabled, that means both `make check` and compiler warnings
are treated fatal. If "test" is disabled, `make check` and compiler
warnings are still done, just not fatal.
- "test" is now disabled by default via the spec file. They are not fatal
when building in koji or when rebuilding the package manually.
- tests can be enabled optionally. Note that the "build_clean.sh"
script enables them by default. So, a user using this script would
need to explicitly "--without test".
(cherry picked from commit ad850c4f03a93a21d745b2e46cca78525bdad843)
2018-09-14 09:59:57 +02:00
|
|
|
%bcond_with test
|
2019-02-03 11:06:02 +01:00
|
|
|
%bcond_with lto
|
2017-05-23 19:14:56 +02:00
|
|
|
%bcond_with sanitizer
|
2018-04-23 18:37:48 +02:00
|
|
|
%if 0%{?fedora}
|
|
|
|
|
%bcond_without connectivity_fedora
|
|
|
|
|
%else
|
|
|
|
|
%bcond_with connectivity_fedora
|
|
|
|
|
%endif
|
2018-08-03 11:12:53 +02:00
|
|
|
%if 0%{?rhel} && 0%{?rhel} > 7
|
2018-07-10 08:48:51 +02:00
|
|
|
%bcond_without connectivity_redhat
|
|
|
|
|
%else
|
|
|
|
|
%bcond_with connectivity_redhat
|
|
|
|
|
%endif
|
2018-05-23 14:30:47 +02:00
|
|
|
%if 0%{?fedora} > 28 || 0%{?rhel} > 7
|
|
|
|
|
%bcond_without crypto_gnutls
|
|
|
|
|
%else
|
|
|
|
|
%bcond_with crypto_gnutls
|
|
|
|
|
%endif
|
2019-08-15 14:46:48 +02:00
|
|
|
%if 0%{?rhel}
|
|
|
|
|
%bcond_with iwd
|
|
|
|
|
%else
|
|
|
|
|
%bcond_without iwd
|
|
|
|
|
%endif
|
2016-02-02 12:57:35 +01:00
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2017-03-06 20:22:28 +01:00
|
|
|
%if 0%{?fedora}
|
|
|
|
|
%global dbus_version 1.9.18
|
|
|
|
|
%global dbus_sys_dir %{_datadir}/dbus-1/system.d
|
|
|
|
|
%else
|
|
|
|
|
%global dbus_version 1.1
|
|
|
|
|
%global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d
|
|
|
|
|
%endif
|
|
|
|
|
|
2017-03-02 10:01:41 +01:00
|
|
|
%if %{with bluetooth} || %{with wwan}
|
2015-09-03 17:08:03 +02:00
|
|
|
%global with_modem_manager_1 1
|
|
|
|
|
%else
|
|
|
|
|
%global with_modem_manager_1 0
|
2014-12-19 12:00:34 +01:00
|
|
|
%endif
|
2014-02-19 12:15:01 +01:00
|
|
|
|
2019-04-09 13:44:41 +02:00
|
|
|
%if 0%{?fedora} >= 31 || 0%{?rhel} > 7
|
2018-09-03 18:29:12 +02:00
|
|
|
%global dhcp_default internal
|
2019-04-09 13:56:26 +02:00
|
|
|
%else
|
|
|
|
|
%global dhcp_default dhclient
|
2018-09-03 18:29:12 +02:00
|
|
|
%endif
|
|
|
|
|
|
2019-04-09 13:44:41 +02:00
|
|
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
|
|
|
|
%global logging_backend_default journal
|
|
|
|
|
%global dns_rc_manager_default symlink
|
|
|
|
|
%else
|
|
|
|
|
%global logging_backend_default syslog
|
|
|
|
|
%global dns_rc_manager_default file
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%global config_plugins_default ifcfg-rh
|
|
|
|
|
|
|
|
|
|
%if 0%{?fedora}
|
2019-03-11 12:00:32 +01:00
|
|
|
# Although eBPF would be available on Fedora's kernel, it seems
|
2019-04-09 15:44:51 +02:00
|
|
|
# we often get SELinux denials (rh#1651654). But even aside them,
|
|
|
|
|
# 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
|
2019-04-09 13:44:41 +02:00
|
|
|
%else
|
|
|
|
|
%global ebpf_enabled no
|
|
|
|
|
%endif
|
|
|
|
|
|
2016-02-02 12:57:35 +01:00
|
|
|
###############################################################################
|
2014-06-25 17:06:42 +02:00
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
Name: NetworkManager
|
|
|
|
|
Summary: Network connection manager and user applications
|
2014-06-25 17:06:42 +02:00
|
|
|
Epoch: %{epoch_version}
|
2016-02-03 15:47:27 +01:00
|
|
|
Version: %{rpm_version}
|
2016-05-05 21:56:20 +02:00
|
|
|
Release: %{release_version}%{?snap}%{?dist}
|
2013-11-16 00:58:46 +01:00
|
|
|
Group: System Environment/Base
|
2019-07-30 17:54:00 +02:00
|
|
|
License: GPLv2+ and LGPLv2+
|
2013-11-16 00:58:46 +01:00
|
|
|
URL: http://www.gnome.org/projects/NetworkManager/
|
|
|
|
|
|
2017-09-20 14:29:46 +02:00
|
|
|
#Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{real_version}.tar.xz
|
2013-11-16 00:58:46 +01:00
|
|
|
Source: __SOURCE1__
|
|
|
|
|
Source1: NetworkManager.conf
|
|
|
|
|
Source2: 00-server.conf
|
2018-10-24 09:38:34 +02:00
|
|
|
Source4: 20-connectivity-fedora.conf
|
|
|
|
|
Source5: 20-connectivity-redhat.conf
|
2019-06-14 15:51:44 +02:00
|
|
|
Source6: 70-nm-connectivity.conf
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2014-03-14 12:34:13 +01:00
|
|
|
#Patch1: 0001-some.patch
|
2013-11-16 00:58:46 +01:00
|
|
|
|
|
|
|
|
Requires(post): systemd
|
2018-06-11 22:07:35 +02:00
|
|
|
Requires(post): /usr/sbin/update-alternatives
|
2013-11-16 00:58:46 +01:00
|
|
|
Requires(preun): systemd
|
2018-06-11 22:07:35 +02:00
|
|
|
Requires(preun): /usr/sbin/update-alternatives
|
2013-11-16 00:58:46 +01:00
|
|
|
Requires(postun): systemd
|
|
|
|
|
|
|
|
|
|
Requires: dbus >= %{dbus_version}
|
|
|
|
|
Requires: glib2 >= %{glib2_version}
|
2014-07-31 12:06:31 -04:00
|
|
|
Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
|
2013-11-16 00:58:46 +01:00
|
|
|
Obsoletes: dhcdbd
|
2016-10-14 09:54:20 +02:00
|
|
|
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
2016-12-15 20:24:56 +01:00
|
|
|
Obsoletes: NetworkManager < %{obsoletes_ppp_plugin}
|
2015-09-03 17:08:03 +02:00
|
|
|
Obsoletes: NetworkManager-wimax < 1.2
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2019-04-09 13:44:41 +02:00
|
|
|
%if 0%{?rhel} && 0%{?rhel} <= 7
|
|
|
|
|
# Kept for RHEL to ensure that wired 802.1x works out of the box
|
|
|
|
|
Requires: wpa_supplicant >= 1:1.1
|
|
|
|
|
%endif
|
|
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
|
|
|
|
|
Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1
|
|
|
|
|
Conflicts: NetworkManager-pptp < 1:0.7.0.99-1
|
|
|
|
|
Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1
|
|
|
|
|
Conflicts: kde-plasma-networkmanagement < 1:0.9-0.49.20110527git.nm09
|
|
|
|
|
|
2018-07-12 08:26:02 +02:00
|
|
|
BuildRequires: gcc
|
2018-07-12 08:41:25 +02:00
|
|
|
BuildRequires: libtool
|
|
|
|
|
BuildRequires: pkgconfig
|
2018-09-21 22:49:20 +02:00
|
|
|
%if %{with meson}
|
|
|
|
|
BuildRequires: meson
|
|
|
|
|
%else
|
2018-07-12 08:41:25 +02:00
|
|
|
BuildRequires: automake
|
|
|
|
|
BuildRequires: autoconf
|
2018-09-21 22:49:20 +02:00
|
|
|
%endif
|
2018-07-12 08:41:25 +02:00
|
|
|
BuildRequires: intltool
|
|
|
|
|
BuildRequires: gettext-devel
|
|
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
BuildRequires: dbus-devel >= %{dbus_version}
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
|
|
|
|
|
%endif
|
2018-02-16 13:01:12 +01:00
|
|
|
BuildRequires: glib2-devel >= 2.40.0
|
2013-11-16 00:58:46 +01:00
|
|
|
BuildRequires: gobject-introspection-devel >= 0.10.3
|
2016-12-16 09:51:45 +01:00
|
|
|
%if %{with ppp}
|
2016-12-15 20:24:56 +01:00
|
|
|
BuildRequires: ppp-devel >= 2.4.5
|
2016-12-16 09:51:45 +01:00
|
|
|
%endif
|
2018-05-23 14:30:47 +02:00
|
|
|
%if %{with crypto_gnutls}
|
|
|
|
|
BuildRequires: gnutls-devel >= 2.12
|
|
|
|
|
%else
|
2013-11-16 00:58:46 +01:00
|
|
|
BuildRequires: nss-devel >= 3.11.7
|
2018-05-23 14:30:47 +02:00
|
|
|
%endif
|
2013-11-16 00:58:46 +01:00
|
|
|
BuildRequires: dhclient
|
2014-06-04 11:50:39 +02:00
|
|
|
BuildRequires: readline-devel
|
2015-07-20 18:33:35 +02:00
|
|
|
BuildRequires: audit-libs-devel
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with regen_docs}
|
2013-11-16 00:58:46 +01:00
|
|
|
BuildRequires: gtk-doc
|
|
|
|
|
%endif
|
|
|
|
|
BuildRequires: libudev-devel
|
|
|
|
|
BuildRequires: libuuid-devel
|
2019-03-07 10:43:16 +01:00
|
|
|
BuildRequires: /usr/bin/valac
|
2013-11-16 00:58:46 +01:00
|
|
|
BuildRequires: iptables
|
2017-03-06 19:10:42 +01:00
|
|
|
BuildRequires: libxslt
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with bluetooth}
|
2014-10-01 10:59:13 +02:00
|
|
|
BuildRequires: bluez-libs-devel
|
|
|
|
|
%endif
|
2013-11-16 00:58:46 +01:00
|
|
|
BuildRequires: systemd >= 200-3 systemd-devel
|
2017-03-22 12:42:33 +01:00
|
|
|
%if 0%{?fedora}
|
2017-03-20 16:57:58 +00:00
|
|
|
BuildRequires: libpsl-devel >= 0.1
|
2017-03-22 12:42:33 +01:00
|
|
|
%endif
|
2016-04-04 18:23:13 +02:00
|
|
|
BuildRequires: libcurl-devel
|
2013-11-16 00:58:46 +01:00
|
|
|
BuildRequires: libndp-devel >= 1.0
|
2014-12-19 12:00:34 +01:00
|
|
|
%if 0%{?with_modem_manager_1}
|
2013-11-16 00:58:46 +01:00
|
|
|
BuildRequires: ModemManager-glib-devel >= 1.0
|
|
|
|
|
%endif
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with nmtui}
|
2013-11-16 00:58:46 +01:00
|
|
|
BuildRequires: newt-devel
|
|
|
|
|
%endif
|
2014-10-23 19:27:35 +02:00
|
|
|
BuildRequires: /usr/bin/dbus-launch
|
2018-05-23 16:17:38 +02:00
|
|
|
%if 0%{?fedora} > 27 || 0%{?rhel} > 7
|
|
|
|
|
BuildRequires: python3
|
|
|
|
|
BuildRequires: python3-gobject-base
|
|
|
|
|
BuildRequires: python3-dbus
|
|
|
|
|
%else
|
|
|
|
|
BuildRequires: python2
|
2014-10-23 19:27:35 +02:00
|
|
|
BuildRequires: pygobject3-base
|
|
|
|
|
BuildRequires: dbus-python
|
2018-05-23 16:17:38 +02:00
|
|
|
%endif
|
2014-11-13 18:48:12 +01:00
|
|
|
BuildRequires: libselinux-devel
|
2014-11-13 18:50:05 +01:00
|
|
|
BuildRequires: polkit-devel
|
2016-01-14 17:51:33 +01:00
|
|
|
BuildRequires: jansson-devel
|
2018-02-08 09:05:54 +01:00
|
|
|
%if %{with sanitizer}
|
|
|
|
|
BuildRequires: libasan
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
BuildRequires: libubsan
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2018-11-29 18:01:30 +01:00
|
|
|
Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}
|
|
|
|
|
|
2018-11-06 18:57:57 +01:00
|
|
|
# NetworkManager uses various parts of systemd-networkd internally, including
|
|
|
|
|
# DHCP client, IPv4 Link-Local address negotiation or LLDP support.
|
|
|
|
|
# This provide is essentially here so that NetworkManager shows on Security
|
|
|
|
|
# Response Team's radar in case a flaw is found. The code is frequently
|
|
|
|
|
# synchronized and thus it's not easy to establish a good version number
|
|
|
|
|
# here. The version of zero is there just to have something conservative so
|
|
|
|
|
# that the scripts that would parse the SPEC file naively would be unlikely
|
|
|
|
|
# to fail. Refer to git log for the real date and commit number of last
|
|
|
|
|
# synchronization:
|
|
|
|
|
# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commits/master/src/systemd
|
|
|
|
|
Provides: bundled(systemd) = 0
|
|
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
|
|
|
|
|
%description
|
2014-06-09 11:03:15 +02:00
|
|
|
NetworkManager is a system service that manages network interfaces and
|
|
|
|
|
connections based on user or automatic configuration. It supports
|
|
|
|
|
Ethernet, Bridge, Bond, VLAN, Team, InfiniBand, Wi-Fi, mobile broadband
|
|
|
|
|
(WWAN), PPPoE and other devices, and supports a variety of different VPN
|
|
|
|
|
services.
|
2013-11-16 00:58:46 +01:00
|
|
|
|
|
|
|
|
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with adsl}
|
2014-03-20 20:01:32 +01:00
|
|
|
%package adsl
|
2014-03-14 12:34:13 +01:00
|
|
|
Summary: ADSL device plugin for NetworkManager
|
|
|
|
|
Group: System Environment/Base
|
|
|
|
|
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
2016-10-14 09:54:20 +02:00
|
|
|
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
2014-03-20 20:01:32 +01:00
|
|
|
Obsoletes: NetworkManager-atm
|
2014-03-14 12:34:13 +01:00
|
|
|
|
2014-03-20 20:01:32 +01:00
|
|
|
%description adsl
|
2014-03-14 12:34:13 +01:00
|
|
|
This package contains NetworkManager support for ADSL devices.
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with bluetooth}
|
2014-03-20 20:01:32 +01:00
|
|
|
%package bluetooth
|
2014-03-14 12:34:13 +01:00
|
|
|
Summary: Bluetooth device plugin for NetworkManager
|
|
|
|
|
Group: System Environment/Base
|
|
|
|
|
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
2016-06-02 09:18:34 +02:00
|
|
|
Requires: NetworkManager-wwan = %{epoch}:%{version}-%{release}
|
2019-04-09 13:44:41 +02:00
|
|
|
%if 0%{?rhel} && 0%{?rhel} <= 7
|
|
|
|
|
# No Requires:bluez to prevent it being installed when updating
|
|
|
|
|
# to the split NM package
|
|
|
|
|
%else
|
2014-05-19 18:55:59 +02:00
|
|
|
Requires: bluez >= 4.101-5
|
2019-04-09 13:44:41 +02:00
|
|
|
%endif
|
2016-10-14 09:54:20 +02:00
|
|
|
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
2014-03-20 20:01:32 +01:00
|
|
|
Obsoletes: NetworkManager-bt
|
2014-03-14 12:34:13 +01:00
|
|
|
|
2014-03-20 20:01:32 +01:00
|
|
|
%description bluetooth
|
2014-03-14 12:34:13 +01:00
|
|
|
This package contains NetworkManager support for Bluetooth devices.
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
2016-02-04 08:36:52 +01:00
|
|
|
%if %{with team}
|
2014-06-18 11:10:52 +02:00
|
|
|
%package team
|
|
|
|
|
Summary: Team device plugin for NetworkManager
|
|
|
|
|
Group: System Environment/Base
|
|
|
|
|
BuildRequires: teamd-devel
|
|
|
|
|
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
2016-10-14 09:54:20 +02:00
|
|
|
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
2019-04-09 13:44:41 +02:00
|
|
|
%if 0%{?fedora} || 0%{?rhel} >= 8
|
2014-12-22 09:48:22 -06:00
|
|
|
# Team was split from main NM binary between 0.9.10 and 1.0
|
2019-04-09 13:44:41 +02:00
|
|
|
# We need this Obsoletes in addition to the one above
|
|
|
|
|
# (git:3aede801521ef7bff039e6e3f1b3c7b566b4338d).
|
2014-12-22 09:48:22 -06:00
|
|
|
Obsoletes: NetworkManager < 1.0.0
|
2019-04-09 13:44:41 +02:00
|
|
|
%endif
|
2014-06-18 11:10:52 +02:00
|
|
|
|
|
|
|
|
%description team
|
|
|
|
|
This package contains NetworkManager support for team devices.
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with wifi}
|
2014-05-14 11:04:07 +02:00
|
|
|
%package wifi
|
|
|
|
|
Summary: Wifi plugin for NetworkManager
|
|
|
|
|
Group: System Environment/Base
|
|
|
|
|
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
2018-05-14 15:12:48 +02:00
|
|
|
|
|
|
|
|
%if %{with iwd} && (0%{?fedora} > 24 || 0%{?rhel} > 7)
|
|
|
|
|
Requires: (wpa_supplicant >= %{wpa_supplicant_version} or iwd)
|
|
|
|
|
%else
|
|
|
|
|
# Just require wpa_supplicant on platforms that don't support boolean
|
|
|
|
|
# dependencies even though the plugin supports both supplicant and
|
|
|
|
|
# iwd backend.
|
|
|
|
|
Requires: wpa_supplicant >= %{wpa_supplicant_version}
|
|
|
|
|
%endif
|
|
|
|
|
|
2016-10-14 09:54:20 +02:00
|
|
|
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
2014-05-14 11:04:07 +02:00
|
|
|
|
|
|
|
|
%description wifi
|
|
|
|
|
This package contains NetworkManager support for Wifi and OLPC devices.
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with wwan}
|
2014-03-14 12:34:13 +01:00
|
|
|
%package wwan
|
|
|
|
|
Summary: Mobile broadband device plugin for NetworkManager
|
|
|
|
|
Group: System Environment/Base
|
|
|
|
|
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
2019-04-09 13:44:41 +02:00
|
|
|
%if 0%{?rhel} && 0%{?rhel} <= 7
|
|
|
|
|
# No Requires:ModemManager to prevent it being installed when updating
|
|
|
|
|
# to the split NM package
|
|
|
|
|
%else
|
2014-05-19 18:55:59 +02:00
|
|
|
Requires: ModemManager
|
2019-04-09 13:44:41 +02:00
|
|
|
%endif
|
2016-10-14 09:54:20 +02:00
|
|
|
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
2014-03-14 12:34:13 +01:00
|
|
|
|
|
|
|
|
%description wwan
|
2016-02-04 08:41:44 +01:00
|
|
|
This package contains NetworkManager support for mobile broadband (WWAN)
|
|
|
|
|
devices.
|
2014-03-14 12:34:13 +01:00
|
|
|
%endif
|
|
|
|
|
|
2017-08-01 18:27:22 +02:00
|
|
|
|
|
|
|
|
%if %{with ovs}
|
|
|
|
|
%package ovs
|
2018-06-27 16:53:05 +02:00
|
|
|
Summary: Open vSwitch device plugin for NetworkManager
|
2017-08-01 18:27:22 +02:00
|
|
|
Group: System Environment/Base
|
|
|
|
|
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
2018-10-22 16:34:49 +02:00
|
|
|
%if 0%{?rhel} == 0
|
2017-08-01 18:27:22 +02:00
|
|
|
Requires: openvswitch
|
2018-10-22 16:34:49 +02:00
|
|
|
%endif
|
2017-08-01 18:27:22 +02:00
|
|
|
|
|
|
|
|
%description ovs
|
2018-06-27 16:53:05 +02:00
|
|
|
This package contains NetworkManager support for Open vSwitch bridges.
|
2017-08-01 18:27:22 +02:00
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
2016-11-05 15:27:16 +01:00
|
|
|
%if %{with ppp}
|
|
|
|
|
%package ppp
|
|
|
|
|
Summary: PPP plugin for NetworkManager
|
|
|
|
|
Group: System Environment/Base
|
|
|
|
|
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
|
|
|
|
Requires: ppp = %{ppp_version}
|
2017-05-22 20:06:43 -04:00
|
|
|
Requires: NetworkManager = %{epoch}:%{version}-%{release}
|
2016-11-05 15:27:16 +01:00
|
|
|
Obsoletes: NetworkManager < %{obsoletes_ppp_plugin}
|
|
|
|
|
|
|
|
|
|
%description ppp
|
|
|
|
|
This package contains NetworkManager support for PPP.
|
|
|
|
|
%endif
|
|
|
|
|
|
2014-03-14 12:34:13 +01:00
|
|
|
|
2014-07-31 12:06:31 -04:00
|
|
|
%package libnm
|
|
|
|
|
Summary: Libraries for adding NetworkManager support to applications (new API).
|
|
|
|
|
Group: Development/Libraries
|
2017-01-20 15:08:19 +01:00
|
|
|
Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release}
|
2019-07-30 17:54:00 +02:00
|
|
|
License: LGPLv2+
|
2014-07-31 12:06:31 -04:00
|
|
|
|
|
|
|
|
%description libnm
|
2016-02-04 08:41:44 +01:00
|
|
|
This package contains the libraries that make it easier to use some
|
|
|
|
|
NetworkManager functionality from applications. This is the new
|
|
|
|
|
NetworkManager API. See also NetworkManager-glib.
|
2014-07-31 12:06:31 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
%package libnm-devel
|
|
|
|
|
Summary: Header files for adding NetworkManager support to applications (new API).
|
|
|
|
|
Group: Development/Libraries
|
|
|
|
|
Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
|
|
|
|
|
Requires: glib2-devel
|
|
|
|
|
Requires: pkgconfig
|
2019-07-30 17:54:00 +02:00
|
|
|
License: LGPLv2+
|
2014-07-31 12:06:31 -04:00
|
|
|
|
|
|
|
|
%description libnm-devel
|
2016-02-04 08:41:44 +01:00
|
|
|
This package contains the header and pkg-config files for development
|
|
|
|
|
applications using NetworkManager functionality from applications. This
|
|
|
|
|
is the new NetworkManager API. See also NetworkManager-glib-devel.
|
2014-07-31 12:06:31 -04:00
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2018-04-23 18:37:48 +02:00
|
|
|
%if %{with connectivity_fedora}
|
2014-07-02 19:17:42 +02:00
|
|
|
%package config-connectivity-fedora
|
|
|
|
|
Summary: NetworkManager config file for connectivity checking via Fedora servers
|
|
|
|
|
Group: System Environment/Base
|
2016-11-25 11:57:48 +01:00
|
|
|
BuildArch: noarch
|
2018-07-10 08:48:51 +02:00
|
|
|
Provides: NetworkManager-config-connectivity = %{epoch}:%{version}-%{release}
|
2014-07-02 19:17:42 +02:00
|
|
|
|
|
|
|
|
%description config-connectivity-fedora
|
|
|
|
|
This adds a NetworkManager configuration file to enable connectivity checking
|
|
|
|
|
via Fedora infrastructure.
|
2018-04-23 18:37:48 +02:00
|
|
|
%endif
|
2014-07-02 19:17:42 +02:00
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2018-07-10 08:48:51 +02:00
|
|
|
%if %{with connectivity_redhat}
|
|
|
|
|
%package config-connectivity-redhat
|
|
|
|
|
Summary: NetworkManager config file for connectivity checking via Red Hat servers
|
|
|
|
|
Group: System Environment/Base
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
Provides: NetworkManager-config-connectivity = %{epoch}:%{version}-%{release}
|
|
|
|
|
|
|
|
|
|
%description config-connectivity-redhat
|
|
|
|
|
This adds a NetworkManager configuration file to enable connectivity checking
|
|
|
|
|
via Red Hat infrastructure.
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
%package config-server
|
|
|
|
|
Summary: NetworkManager config file for "server-like" defaults
|
|
|
|
|
Group: System Environment/Base
|
2016-11-25 11:57:48 +01:00
|
|
|
BuildArch: noarch
|
2013-11-16 00:58:46 +01:00
|
|
|
|
|
|
|
|
%description config-server
|
|
|
|
|
This adds a NetworkManager configuration file to make it behave more
|
|
|
|
|
like the old "network" service. In particular, it stops NetworkManager
|
|
|
|
|
from automatically running DHCP on unconfigured ethernet devices, and
|
|
|
|
|
allows connections with static IP addresses to be brought up even on
|
|
|
|
|
ethernet devices with no carrier.
|
|
|
|
|
|
|
|
|
|
This package is intended to be installed by default for server
|
|
|
|
|
deployments.
|
|
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2016-05-05 18:47:34 +02:00
|
|
|
%package dispatcher-routing-rules
|
|
|
|
|
Summary: NetworkManager dispatcher file for advanced routing rules
|
2016-05-05 18:39:07 +02:00
|
|
|
Group: System Environment/Base
|
2016-05-05 19:43:32 +02:00
|
|
|
BuildArch: noarch
|
2016-05-05 18:47:34 +02:00
|
|
|
Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release}
|
|
|
|
|
Obsoletes: %{name}-config-routing-rules < %{epoch}:%{version}-%{release}
|
2016-05-05 18:39:07 +02:00
|
|
|
|
2016-05-05 18:47:34 +02:00
|
|
|
%description dispatcher-routing-rules
|
|
|
|
|
This adds a NetworkManager dispatcher file to support networking
|
2016-05-05 18:39:07 +02:00
|
|
|
configurations using "/etc/sysconfig/network-scripts/rule-NAME" files
|
|
|
|
|
(eg, to do policy-based routing).
|
|
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
%if 0%{with_nmtui}
|
|
|
|
|
%package tui
|
|
|
|
|
Summary: NetworkManager curses-based UI
|
|
|
|
|
Group: System Environment/Base
|
contrib/rpm: fix up sub-package dependencies
There are three fixes:
1) the config packages shouldn't require the main NetworkManager
package. We explicitly make NetworkManager-glib not
depend on NM itself to ensure that clients can link to it (and thus
have an RPM dependency on -glib) without pulling in NetworkManager
itself. The same should hold true for the config packages, since
consumers of NetworkManager may want to pull them in, but not
necessarily pull NetworkManager in.
For example, GNOME Shell wants to make use of NetworkManager's
connectivity detection *if NM is available*, and this requires
pulling in NM-config-connectivity-fedora, but that shouldn't
pull in NetworkManager itself.
Similarly, we had a problem with RHEL7 making sure that
NM-config-server was installed by default on Server variants but
not on other variants; removing the dependency from the -config
subpackage was the cleanest way to fix that.
Furthermore, nothing in the config sub-packages actually
requires NetworkManager anyway since they are simply config files.
2) nmtui doesn't care what architecture the running NM is since
it communicates solely over D-Bus. So skip the %{?_isa}, just
like we do for other clients (nm-applet, GNOME Shell, etc)
3) Requiring NetworkManager.%{?_isa} from the -devel package
has problems with multilib (see rh #1112367). This is an issue
if you install a 32-bit development environment and try to build
something that uses NetworkManager. Since the -devel package
requires the main package, you can end up either having *both*
NetworkManager.i686 and NetworkManager.x86_64 installed, or you
end up having NetworkManager.i686 replace NetworkManager.x86_64.
Neither one is good. So remove the %{?_isa} bit.
2014-07-30 09:35:02 -05:00
|
|
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
2014-07-31 12:06:31 -04:00
|
|
|
Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
|
2013-11-16 00:58:46 +01:00
|
|
|
|
|
|
|
|
%description tui
|
|
|
|
|
This adds a curses-based "TUI" (Text User Interface) to
|
|
|
|
|
NetworkManager, to allow performing some of the operations supported
|
|
|
|
|
by nm-connection-editor and nm-applet in a non-graphical environment.
|
|
|
|
|
%endif
|
|
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
%prep
|
2018-08-03 11:04:51 +02:00
|
|
|
%autosetup -p1 -n NetworkManager-%{real_version}
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
%build
|
2018-09-21 22:49:20 +02:00
|
|
|
%if %{with meson}
|
|
|
|
|
%meson \
|
2019-04-03 14:52:24 +02:00
|
|
|
-Db_ndebug=false \
|
2019-02-08 12:14:14 +01:00
|
|
|
--warnlevel 2 \
|
|
|
|
|
%if %{with test}
|
|
|
|
|
--werror \
|
|
|
|
|
%endif
|
2018-09-21 22:49:20 +02:00
|
|
|
-Ddhcpcanon=no \
|
|
|
|
|
-Ddhcpcd=no \
|
|
|
|
|
-Dconfig_dhcp_default=%{dhcp_default} \
|
|
|
|
|
%if %{with crypto_gnutls}
|
|
|
|
|
-Dcrypto=gnutls \
|
|
|
|
|
%else
|
|
|
|
|
-Dcrypto=nss \
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with debug}
|
|
|
|
|
-Dmore_logging=true \
|
|
|
|
|
-Dmore_asserts=10000 \
|
|
|
|
|
%else
|
|
|
|
|
-Dmore_logging=false \
|
|
|
|
|
-Dmore_asserts=0 \
|
|
|
|
|
%endif
|
|
|
|
|
-Dld_gc=true \
|
2019-02-03 11:06:02 +01:00
|
|
|
%if %{with lto}
|
|
|
|
|
-D b_lto=true \
|
|
|
|
|
%else
|
|
|
|
|
-D b_lto=false \
|
|
|
|
|
%endif
|
2018-09-21 22:49:20 +02:00
|
|
|
-Dlibaudit=yes-disabled-by-default \
|
|
|
|
|
%if 0%{?with_modem_manager_1}
|
|
|
|
|
-Dmodem_manager=true \
|
|
|
|
|
%else
|
|
|
|
|
-Dmodem_manager=false \
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with wifi}
|
|
|
|
|
-Dwifi=true \
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
-Dwext=true \
|
|
|
|
|
%else
|
|
|
|
|
-Dwext=false \
|
|
|
|
|
%endif
|
|
|
|
|
%else
|
|
|
|
|
-Dwifi=false \
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with iwd}
|
|
|
|
|
-Diwd=true \
|
|
|
|
|
%else
|
|
|
|
|
-Diwd=false \
|
|
|
|
|
%endif
|
|
|
|
|
-Dvapi=true \
|
|
|
|
|
-Dintrospection=true \
|
|
|
|
|
%if %{with regen_docs}
|
|
|
|
|
-Ddocs=true \
|
|
|
|
|
%else
|
|
|
|
|
-Ddocs=false \
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with team}
|
|
|
|
|
-Dteamdctl=true \
|
|
|
|
|
%else
|
|
|
|
|
-Dteamdctl=false \
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with ovs}
|
|
|
|
|
-Dovs=true \
|
|
|
|
|
%else
|
|
|
|
|
-Dovs=false \
|
|
|
|
|
%endif
|
|
|
|
|
-Dselinux=true \
|
2018-10-16 07:31:56 +02:00
|
|
|
-Dpolkit=true \
|
2018-09-21 22:49:20 +02:00
|
|
|
-Dpolkit_agent=true \
|
|
|
|
|
-Dmodify_system=true \
|
|
|
|
|
-Dconcheck=true \
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
-Dlibpsl=true \
|
|
|
|
|
%else
|
|
|
|
|
-Dlibpsl=false \
|
2019-04-09 13:44:41 +02:00
|
|
|
%endif
|
|
|
|
|
%if %{ebpf_enabled} != yes
|
2018-11-09 11:18:13 +01:00
|
|
|
-Debpf=false \
|
2019-04-09 13:44:41 +02:00
|
|
|
%else
|
|
|
|
|
-Debpf=true \
|
2018-09-21 22:49:20 +02:00
|
|
|
%endif
|
|
|
|
|
-Dsession_tracking=systemd \
|
|
|
|
|
-Dsuspend_resume=systemd \
|
|
|
|
|
-Dsystemdsystemunitdir=%{systemd_dir} \
|
|
|
|
|
-Dsystem_ca_path=/etc/pki/tls/cert.pem \
|
|
|
|
|
-Ddbus_conf_dir=%{dbus_sys_dir} \
|
|
|
|
|
-Dtests=yes \
|
|
|
|
|
-Dvalgrind=no \
|
|
|
|
|
-Difcfg_rh=true \
|
2019-04-09 13:44:41 +02:00
|
|
|
-Difupdown=false \
|
2018-09-21 22:49:20 +02:00
|
|
|
%if %{with ppp}
|
|
|
|
|
-Dpppd_plugin_dir=%{_libdir}/pppd/%{ppp_version} \
|
|
|
|
|
-Dppp=true \
|
|
|
|
|
%endif
|
|
|
|
|
-Ddist_version=%{version}-%{release} \
|
2019-04-09 13:44:41 +02:00
|
|
|
-Dconfig_plugins_default=%{config_plugins_default} \
|
|
|
|
|
-Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \
|
|
|
|
|
-Dconfig_logging_backend_default=%{logging_backend_default} \
|
2019-03-05 08:44:57 +01:00
|
|
|
-Djson_validation=true
|
2018-09-21 22:49:20 +02:00
|
|
|
|
|
|
|
|
%meson_build
|
|
|
|
|
|
|
|
|
|
%else
|
|
|
|
|
# autotools
|
2016-08-18 11:26:29 +02:00
|
|
|
%if %{with regen_docs}
|
2016-03-30 13:25:33 +02:00
|
|
|
gtkdocize
|
2016-08-18 11:26:29 +02:00
|
|
|
%endif
|
2015-09-28 19:47:50 +02:00
|
|
|
autoreconf --install --force
|
2015-09-22 12:50:55 +02:00
|
|
|
intltoolize --automake --copy --force
|
2013-11-16 00:58:46 +01:00
|
|
|
%configure \
|
2019-07-29 21:52:15 +02:00
|
|
|
--with-runstatedir=%{_rundir} \
|
2018-02-07 21:18:06 +01:00
|
|
|
--disable-silent-rules \
|
2013-11-16 00:58:46 +01:00
|
|
|
--disable-static \
|
|
|
|
|
--with-dhclient=yes \
|
|
|
|
|
--with-dhcpcd=no \
|
2017-10-05 14:44:08 +00:00
|
|
|
--with-dhcpcanon=no \
|
2018-09-03 18:29:12 +02:00
|
|
|
--with-config-dhcp-default=%{dhcp_default} \
|
2018-05-23 14:30:47 +02:00
|
|
|
%if %{with crypto_gnutls}
|
|
|
|
|
--with-crypto=gnutls \
|
|
|
|
|
%else
|
2013-11-16 00:58:46 +01:00
|
|
|
--with-crypto=nss \
|
2018-05-23 14:30:47 +02:00
|
|
|
%endif
|
2017-05-23 19:14:56 +02:00
|
|
|
%if %{with sanitizer}
|
2018-02-08 09:07:16 +01:00
|
|
|
--with-address-sanitizer=exec \
|
|
|
|
|
%if 0%{?fedora}
|
2017-05-23 19:14:56 +02:00
|
|
|
--enable-undefined-sanitizer \
|
2018-02-08 09:07:16 +01:00
|
|
|
%endif
|
2017-05-23 19:14:56 +02:00
|
|
|
%else
|
2018-02-08 09:07:16 +01:00
|
|
|
--with-address-sanitizer=no \
|
2017-05-23 19:14:56 +02:00
|
|
|
--disable-undefined-sanitizer \
|
|
|
|
|
%endif
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with debug}
|
2017-05-23 20:14:12 +02:00
|
|
|
--enable-more-logging \
|
2016-02-02 12:57:35 +01:00
|
|
|
--with-more-asserts=10000 \
|
2017-05-23 20:14:12 +02:00
|
|
|
%else
|
|
|
|
|
--disable-more-logging \
|
|
|
|
|
--without-more-asserts \
|
2016-02-02 12:57:35 +01:00
|
|
|
%endif
|
2016-10-14 10:33:10 +02:00
|
|
|
--enable-ld-gc \
|
2019-02-03 11:06:02 +01:00
|
|
|
%if %{with lto}
|
|
|
|
|
--enable-lto \
|
|
|
|
|
%else
|
|
|
|
|
--disable-lto \
|
|
|
|
|
%endif
|
2015-08-05 17:04:47 +02:00
|
|
|
--with-libaudit=yes-disabled-by-default \
|
2014-12-19 12:00:34 +01:00
|
|
|
%if 0%{?with_modem_manager_1}
|
2013-11-16 00:58:46 +01:00
|
|
|
--with-modem-manager-1=yes \
|
|
|
|
|
%else
|
|
|
|
|
--with-modem-manager-1=no \
|
|
|
|
|
%endif
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with wifi}
|
2015-01-23 14:12:02 +01:00
|
|
|
--enable-wifi=yes \
|
2015-07-14 19:02:35 +02:00
|
|
|
%if 0%{?fedora}
|
|
|
|
|
--with-wext=yes \
|
|
|
|
|
%else
|
|
|
|
|
--with-wext=no \
|
|
|
|
|
%endif
|
2015-01-23 14:12:02 +01:00
|
|
|
%else
|
|
|
|
|
--enable-wifi=no \
|
2017-12-13 16:15:13 +01:00
|
|
|
%endif
|
|
|
|
|
%if %{with iwd}
|
|
|
|
|
--with-iwd=yes \
|
|
|
|
|
%else
|
|
|
|
|
--with-iwd=no \
|
2013-11-16 00:58:46 +01:00
|
|
|
%endif
|
|
|
|
|
--enable-vala=yes \
|
2017-03-06 19:10:42 +01:00
|
|
|
--enable-introspection \
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with regen_docs}
|
2013-11-16 00:58:46 +01:00
|
|
|
--enable-gtk-doc \
|
2014-04-15 20:25:18 +02:00
|
|
|
%else
|
|
|
|
|
--disable-gtk-doc \
|
2013-11-16 00:58:46 +01:00
|
|
|
%endif
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with team}
|
Revert "Makefile: rework team compilation flags"
I don't think we should do this.
- renamining/dropping configure options is still an annoyance,
because it requires to different ./configure options depending
on the version. The rename from --enable-teamctl to --enable-team
might be theoretically nice, but more annoying then helpful.
- There is no strict dependency between --enable-team and
--enable-json-validation. At most, one could argue that
when enabling the team plugin (--enable-teamctl), then
libnm must also be build with --enable-json-validation.
But in fact, the team plugin will happily work with a
libnm that doesn't link against libjansson.
That is --enable-teamctl --disable-json-validation will work
in practice just fine.
On the other hand, libnm is a client library to create connection
profiles, fully supporting team profiles also makes sense if the
actual plugin is not installed (or build). Thus, --disable-teamctl
--enable-json-validation certainly makes sense.
At this point, one might ask whether libnm is even still complete without
libjansson. Maybe libnm should *require* --enable-json-validation.
But that is not what the patch was doing, and it would also need
some careful consideration before doing so.
This reverts commit 9d5cd7eae8edc8c558d26f04ffd163effafe57f9.
2017-12-08 08:56:46 +01:00
|
|
|
--enable-teamdctl=yes \
|
2014-02-19 12:15:01 +01:00
|
|
|
%else
|
Revert "Makefile: rework team compilation flags"
I don't think we should do this.
- renamining/dropping configure options is still an annoyance,
because it requires to different ./configure options depending
on the version. The rename from --enable-teamctl to --enable-team
might be theoretically nice, but more annoying then helpful.
- There is no strict dependency between --enable-team and
--enable-json-validation. At most, one could argue that
when enabling the team plugin (--enable-teamctl), then
libnm must also be build with --enable-json-validation.
But in fact, the team plugin will happily work with a
libnm that doesn't link against libjansson.
That is --enable-teamctl --disable-json-validation will work
in practice just fine.
On the other hand, libnm is a client library to create connection
profiles, fully supporting team profiles also makes sense if the
actual plugin is not installed (or build). Thus, --disable-teamctl
--enable-json-validation certainly makes sense.
At this point, one might ask whether libnm is even still complete without
libjansson. Maybe libnm should *require* --enable-json-validation.
But that is not what the patch was doing, and it would also need
some careful consideration before doing so.
This reverts commit 9d5cd7eae8edc8c558d26f04ffd163effafe57f9.
2017-12-08 08:56:46 +01:00
|
|
|
--enable-teamdctl=no \
|
2017-11-02 11:43:59 +01:00
|
|
|
%endif
|
|
|
|
|
%if %{with ovs}
|
|
|
|
|
--enable-ovs=yes \
|
|
|
|
|
%else
|
|
|
|
|
--enable-ovs=no \
|
2013-11-16 00:58:46 +01:00
|
|
|
%endif
|
2014-11-13 18:48:12 +01:00
|
|
|
--with-selinux=yes \
|
2013-11-16 00:58:46 +01:00
|
|
|
--enable-polkit=yes \
|
2014-11-13 18:50:05 +01:00
|
|
|
--enable-polkit-agent \
|
2013-11-16 00:58:46 +01:00
|
|
|
--enable-modify-system=yes \
|
|
|
|
|
--enable-concheck \
|
2017-03-22 12:42:33 +01:00
|
|
|
%if 0%{?fedora}
|
2017-05-10 17:07:09 +02:00
|
|
|
--with-libpsl \
|
2017-03-22 12:42:33 +01:00
|
|
|
%else
|
2017-05-10 17:07:09 +02:00
|
|
|
--without-libpsl \
|
2017-03-22 12:42:33 +01:00
|
|
|
%endif
|
2019-04-09 13:44:41 +02:00
|
|
|
--with-ebpf=%{ebpf_enabled} \
|
2013-11-16 00:58:46 +01:00
|
|
|
--with-session-tracking=systemd \
|
|
|
|
|
--with-suspend-resume=systemd \
|
|
|
|
|
--with-systemdsystemunitdir=%{systemd_dir} \
|
2015-07-01 14:11:12 +02:00
|
|
|
--with-system-ca-path=/etc/pki/tls/cert.pem \
|
2017-03-02 09:48:13 +01:00
|
|
|
--with-dbus-sys-dir=%{dbus_sys_dir} \
|
2013-11-16 00:58:46 +01:00
|
|
|
--with-tests=yes \
|
contrib/rpm: disable tests by default and use fatal-warnings with tests
In general, when we build a package, we want no compiler warnings
and all unit tests to pass.
That is in particular true when building a package for the distribution
in koji. When builing in koji, we (rightly) cannot pass rpmbuild options, so
the default whether tests/compiler-warnings are fatal matter very much.
One could argue: let's have the tests/compiler-warnings fatal and fail the build.
During a build in koji for a Fedora release, we want them all pass. And if somebody
does a manual build, the person can patch the spec file (or use rpmbuild
flags).
However, note how commit "f7b5e48cdb contrib/rpm: don't force fatal warnings
with tests" already disabled fatal compiler warnings. Why? It seems
compiler warnings should be even more stable than our unit tests, as long
as you target a particular Fedora release and compiler version. So this
was done to support rebuilding an SRPM for a different Fedora release,
or to be more graceful during early development phase of a Fedora
release, where things are not as stable yet.
The exactly same reasoning applies to treating unit-tests failures as fatal.
For example, a recent iproute2 issue broke unit tests. That meant, with
that iproute2 release in build root, the NetworkManager RPM could not be built.
Very annoying.
Now:
- if "test" is enabled, that means both `make check` and compiler warnings
are treated fatal. If "test" is disabled, `make check` and compiler
warnings are still done, just not fatal.
- "test" is now disabled by default via the spec file. They are not fatal
when building in koji or when rebuilding the package manually.
- tests can be enabled optionally. Note that the "build_clean.sh"
script enables them by default. So, a user using this script would
need to explicitly "--without test".
(cherry picked from commit ad850c4f03a93a21d745b2e46cca78525bdad843)
2018-09-14 09:59:57 +02:00
|
|
|
%if %{with test}
|
|
|
|
|
--enable-more-warnings=error \
|
|
|
|
|
%else
|
2018-02-08 12:12:50 +01:00
|
|
|
--enable-more-warnings=yes \
|
contrib/rpm: disable tests by default and use fatal-warnings with tests
In general, when we build a package, we want no compiler warnings
and all unit tests to pass.
That is in particular true when building a package for the distribution
in koji. When builing in koji, we (rightly) cannot pass rpmbuild options, so
the default whether tests/compiler-warnings are fatal matter very much.
One could argue: let's have the tests/compiler-warnings fatal and fail the build.
During a build in koji for a Fedora release, we want them all pass. And if somebody
does a manual build, the person can patch the spec file (or use rpmbuild
flags).
However, note how commit "f7b5e48cdb contrib/rpm: don't force fatal warnings
with tests" already disabled fatal compiler warnings. Why? It seems
compiler warnings should be even more stable than our unit tests, as long
as you target a particular Fedora release and compiler version. So this
was done to support rebuilding an SRPM for a different Fedora release,
or to be more graceful during early development phase of a Fedora
release, where things are not as stable yet.
The exactly same reasoning applies to treating unit-tests failures as fatal.
For example, a recent iproute2 issue broke unit tests. That meant, with
that iproute2 release in build root, the NetworkManager RPM could not be built.
Very annoying.
Now:
- if "test" is enabled, that means both `make check` and compiler warnings
are treated fatal. If "test" is disabled, `make check` and compiler
warnings are still done, just not fatal.
- "test" is now disabled by default via the spec file. They are not fatal
when building in koji or when rebuilding the package manually.
- tests can be enabled optionally. Note that the "build_clean.sh"
script enables them by default. So, a user using this script would
need to explicitly "--without test".
(cherry picked from commit ad850c4f03a93a21d745b2e46cca78525bdad843)
2018-09-14 09:59:57 +02:00
|
|
|
%endif
|
2013-11-16 00:58:46 +01:00
|
|
|
--with-valgrind=no \
|
|
|
|
|
--enable-ifcfg-rh=yes \
|
2019-04-09 13:44:41 +02:00
|
|
|
--enable-ifupdown=no \
|
2016-11-05 15:27:16 +01:00
|
|
|
%if %{with ppp}
|
2013-11-16 00:58:46 +01:00
|
|
|
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
|
2016-11-05 15:27:16 +01:00
|
|
|
--enable-ppp=yes \
|
|
|
|
|
%endif
|
2014-10-16 12:01:35 +02:00
|
|
|
--with-dist-version=%{version}-%{release} \
|
2019-04-09 13:44:41 +02:00
|
|
|
--with-config-plugins-default=%{config_plugins_default} \
|
|
|
|
|
--with-config-dns-rc-manager-default=%{dns_rc_manager_default} \
|
|
|
|
|
--with-config-logging-backend-default=%{logging_backend_default} \
|
2019-03-05 08:44:57 +01:00
|
|
|
--enable-json-validation
|
2013-11-16 00:58:46 +01:00
|
|
|
|
|
|
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
2018-09-21 22:49:20 +02:00
|
|
|
%endif # end autotools
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
%install
|
2018-09-21 22:49:20 +02:00
|
|
|
%if %{with meson}
|
|
|
|
|
%meson_install
|
|
|
|
|
%else
|
2015-09-03 17:08:03 +02:00
|
|
|
make install DESTDIR=%{buildroot}
|
2018-09-21 22:49:20 +02:00
|
|
|
%endif
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2015-09-03 17:08:03 +02:00
|
|
|
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2015-09-03 17:08:03 +02:00
|
|
|
cp %{SOURCE2} %{buildroot}%{nmlibdir}/conf.d/
|
2018-04-23 18:37:48 +02:00
|
|
|
|
|
|
|
|
%if %{with connectivity_fedora}
|
2018-10-24 09:38:34 +02:00
|
|
|
cp %{SOURCE4} %{buildroot}%{nmlibdir}/conf.d/
|
2018-04-23 18:37:48 +02:00
|
|
|
%endif
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2018-07-10 08:48:51 +02:00
|
|
|
%if %{with connectivity_redhat}
|
2018-10-24 09:38:34 +02:00
|
|
|
cp %{SOURCE5} %{buildroot}%{nmlibdir}/conf.d/
|
2019-06-14 15:51:44 +02:00
|
|
|
mkdir -p %{buildroot}%{_sysctldir}
|
|
|
|
|
cp %{SOURCE6} %{buildroot}%{_sysctldir}
|
2018-07-10 08:48:51 +02:00
|
|
|
%endif
|
|
|
|
|
|
2019-08-22 15:48:47 +02:00
|
|
|
cp examples/dispatcher/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/
|
|
|
|
|
ln -s ../no-wait.d/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/pre-up.d/
|
|
|
|
|
ln -s ../10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/no-wait.d/
|
2014-12-17 08:50:05 -05:00
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
%find_lang %{name}
|
|
|
|
|
|
2015-09-03 17:08:03 +02:00
|
|
|
rm -f %{buildroot}%{_libdir}/*.la
|
|
|
|
|
rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la
|
2018-03-18 20:38:49 +01:00
|
|
|
rm -f %{buildroot}%{nmplugindir}/*.la
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2016-03-29 18:07:53 +02:00
|
|
|
# Ensure the documentation timestamps are constant to avoid multilib conflicts
|
|
|
|
|
find %{buildroot}%{_datadir}/gtk-doc -exec touch --reference configure.ac '{}' \+
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2016-03-04 22:18:24 +01:00
|
|
|
%if 0%{?__debug_package}
|
|
|
|
|
mkdir -p %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version}
|
|
|
|
|
cp valgrind.suppressions %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version}
|
|
|
|
|
%endif
|
|
|
|
|
|
2018-05-21 17:40:41 +02:00
|
|
|
touch %{buildroot}%{_sbindir}/ifup %{buildroot}%{_sbindir}/ifdown
|
|
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2014-10-23 19:27:35 +02:00
|
|
|
%check
|
2018-09-21 22:49:20 +02:00
|
|
|
%if %{with meson}
|
|
|
|
|
%if %{with test}
|
|
|
|
|
%meson_test
|
|
|
|
|
%else
|
|
|
|
|
%ninja_test -C %{_vpath_builddir} || :
|
|
|
|
|
%endif
|
|
|
|
|
%else
|
|
|
|
|
# autotools
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with test}
|
2018-09-14 09:48:02 +02:00
|
|
|
make -k %{?_smp_mflags} check
|
|
|
|
|
%else
|
|
|
|
|
make -k %{?_smp_mflags} check || :
|
2016-02-02 12:57:35 +01:00
|
|
|
%endif
|
2018-09-21 22:49:20 +02:00
|
|
|
%endif # end autotools
|
2014-10-23 19:27:35 +02:00
|
|
|
|
|
|
|
|
|
2017-09-26 14:51:14 +02:00
|
|
|
%pre
|
|
|
|
|
if [ -f "%{systemd_dir}/network-online.target.wants/NetworkManager-wait-online.service" ] ; then
|
|
|
|
|
# older versions used to install this file, effectively always enabling
|
|
|
|
|
# NetworkManager-wait-online.service. We no longer do that and rely on
|
|
|
|
|
# preset.
|
|
|
|
|
# But on package upgrade we must explicitly enable it (rh#1455704).
|
|
|
|
|
systemctl enable NetworkManager-wait-online.service || :
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
%post
|
2015-01-26 11:40:08 +01:00
|
|
|
/usr/bin/udevadm control --reload-rules || :
|
|
|
|
|
/usr/bin/udevadm trigger --subsystem-match=net || :
|
|
|
|
|
|
2019-04-17 20:06:44 +02:00
|
|
|
%systemd_post %{systemd_units}
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2018-05-21 17:40:41 +02:00
|
|
|
%triggerin -- initscripts
|
|
|
|
|
if [ -f %{_sbindir}/ifup -a ! -L %{_sbindir}/ifup ]; then
|
|
|
|
|
# initscripts package too old, won't let us set an alternative
|
|
|
|
|
/usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || :
|
|
|
|
|
else
|
|
|
|
|
/usr/sbin/update-alternatives --install %{_sbindir}/ifup ifup %{_libexecdir}/nm-ifup 50 \
|
|
|
|
|
--slave %{_sbindir}/ifdown ifdown %{_libexecdir}/nm-ifdown
|
|
|
|
|
fi
|
|
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
%preun
|
|
|
|
|
if [ $1 -eq 0 ]; then
|
|
|
|
|
# Package removal, not upgrade
|
|
|
|
|
/bin/systemctl --no-reload disable NetworkManager.service >/dev/null 2>&1 || :
|
|
|
|
|
|
|
|
|
|
# Don't kill networking entirely just on package remove
|
|
|
|
|
#/bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || :
|
2018-05-21 17:40:41 +02:00
|
|
|
|
|
|
|
|
/usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || :
|
2013-11-16 00:58:46 +01:00
|
|
|
fi
|
|
|
|
|
%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service
|
|
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
%postun
|
2015-01-26 11:40:08 +01:00
|
|
|
/usr/bin/udevadm control --reload-rules || :
|
|
|
|
|
/usr/bin/udevadm trigger --subsystem-match=net || :
|
|
|
|
|
|
2019-04-17 20:06:44 +02:00
|
|
|
%systemd_postun %{systemd_units}
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2014-02-19 12:15:01 +01:00
|
|
|
|
2019-04-09 13:44:41 +02:00
|
|
|
%if (0%{?fedora} && 0%{?fedora} < 28) || 0%{?rhel}
|
2017-05-23 19:14:56 +02:00
|
|
|
%post libnm -p /sbin/ldconfig
|
|
|
|
|
%postun libnm -p /sbin/ldconfig
|
2019-03-07 10:46:05 +01:00
|
|
|
%endif
|
2015-09-03 17:08:03 +02:00
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2016-11-08 10:09:39 +01:00
|
|
|
%files
|
2017-03-02 09:48:13 +01:00
|
|
|
%{dbus_sys_dir}/org.freedesktop.NetworkManager.conf
|
|
|
|
|
%{dbus_sys_dir}/nm-dispatcher.conf
|
|
|
|
|
%{dbus_sys_dir}/nm-ifcfg-rh.conf
|
2013-11-16 00:58:46 +01:00
|
|
|
%{_sbindir}/%{name}
|
|
|
|
|
%{_bindir}/nmcli
|
|
|
|
|
%{_datadir}/bash-completion/completions/nmcli
|
2018-11-29 18:00:39 +01:00
|
|
|
%dir %{_sysconfdir}/%{name}
|
|
|
|
|
%dir %{_sysconfdir}/%{name}/conf.d
|
2013-11-16 00:58:46 +01:00
|
|
|
%dir %{_sysconfdir}/%{name}/dispatcher.d
|
2014-06-07 01:17:16 +02:00
|
|
|
%dir %{_sysconfdir}/%{name}/dispatcher.d/pre-down.d
|
|
|
|
|
%dir %{_sysconfdir}/%{name}/dispatcher.d/pre-up.d
|
2015-07-14 18:17:33 +02:00
|
|
|
%dir %{_sysconfdir}/%{name}/dispatcher.d/no-wait.d
|
2013-11-16 00:58:46 +01:00
|
|
|
%dir %{_sysconfdir}/%{name}/dnsmasq.d
|
2016-02-12 13:01:03 +01:00
|
|
|
%dir %{_sysconfdir}/%{name}/dnsmasq-shared.d
|
2018-11-29 18:00:39 +01:00
|
|
|
%dir %{_sysconfdir}/%{name}/system-connections
|
2013-11-16 00:58:46 +01:00
|
|
|
%config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
|
|
|
|
|
%{_bindir}/nm-online
|
2018-05-21 17:40:41 +02:00
|
|
|
%{_libexecdir}/nm-ifup
|
2018-09-12 18:27:06 +02:00
|
|
|
%ghost %attr(755, root, root) %{_sbindir}/ifup
|
2018-05-21 17:40:41 +02:00
|
|
|
%{_libexecdir}/nm-ifdown
|
2018-09-12 18:27:06 +02:00
|
|
|
%ghost %attr(755, root, root) %{_sbindir}/ifdown
|
2013-11-16 00:58:46 +01:00
|
|
|
%{_libexecdir}/nm-dhcp-helper
|
2014-05-14 14:51:43 -05:00
|
|
|
%{_libexecdir}/nm-dispatcher
|
2014-10-29 09:12:18 -05:00
|
|
|
%{_libexecdir}/nm-iface-helper
|
2018-04-28 20:36:15 +02:00
|
|
|
%{_libexecdir}/nm-initrd-generator
|
2018-03-18 20:38:49 +01:00
|
|
|
%dir %{_libdir}/%{name}
|
|
|
|
|
%dir %{nmplugindir}
|
|
|
|
|
%{nmplugindir}/libnm-settings-plugin*.so
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with nmtui}
|
2014-11-05 23:38:19 +01:00
|
|
|
%exclude %{_mandir}/man1/nmtui*
|
|
|
|
|
%endif
|
2015-06-08 17:51:04 +02:00
|
|
|
%dir %{nmlibdir}
|
|
|
|
|
%dir %{nmlibdir}/conf.d
|
2019-08-22 15:48:47 +02:00
|
|
|
%dir %{nmlibdir}/dispatcher.d
|
|
|
|
|
%dir %{nmlibdir}/dispatcher.d/pre-down.d
|
|
|
|
|
%dir %{nmlibdir}/dispatcher.d/pre-up.d
|
|
|
|
|
%dir %{nmlibdir}/dispatcher.d/no-wait.d
|
2015-05-22 13:26:40 +02:00
|
|
|
%dir %{nmlibdir}/VPN
|
settings: rework tracking settings connections and settings plugins
Completely rework how settings plugin handle connections and how
NMSettings tracks the list of connections.
Previously, settings plugins would return objects of (a subtype of) type
NMSettingsConnection. The NMSettingsConnection was tightly coupled with
the settings plugin. That has a lot of downsides.
Change that. When changing this basic relation how settings connections
are tracked, everything falls appart. That's why this is a huge change.
Also, since I have to largely rewrite the settings plugins, I also
added support for multiple keyfile directories, handle in-memory
connections only by keyfile plugin and (partly) use copy-on-write NMConnection
instances. I don't want to spend effort rewriting large parts while
preserving the old way, that anyway should change. E.g. while rewriting ifcfg-rh,
I don't want to let it handle in-memory connections because that's not right
long-term.
--
If the settings plugins themself create subtypes of NMSettingsConnection
instances, then a lot of knowledge about tracking connections moves
to the plugins.
Just try to follow the code what happend during nm_settings_add_connection().
Note how the logic is spread out:
- nm_settings_add_connection() calls plugin's add_connection()
- add_connection() creates a NMSettingsConnection subtype
- the plugin has to know that it's called during add-connection and
not emit NM_SETTINGS_PLUGIN_CONNECTION_ADDED signal
- NMSettings calls claim_connection() which hocks up the new
NMSettingsConnection instance and configures the instance
(like calling nm_settings_connection_added()).
This summary does not sound like a lot, but try to follow that code. The logic
is all over the place.
Instead, settings plugins should have a very simple API for adding, modifying,
deleting, loading and reloading connections. All the plugin does is to return a
NMSettingsStorage handle. The storage instance is a handle to identify a profile
in storage (e.g. a particular file). The settings plugin is free to subtype
NMSettingsStorage, but it's not necessary.
There are no more events raised, and the settings plugin implements the small
API in a straightforward manner.
NMSettings now drives all of this. Even NMSettingsConnection has now
very little concern about how it's tracked and delegates only to NMSettings.
This should make settings plugins simpler. Currently settings plugins
are so cumbersome to implement, that we avoid having them. It should not be
like that and it should be easy, beneficial and lightweight to create a new
settings plugin.
Note also how the settings plugins no longer care about duplicate UUIDs.
Duplicated UUIDs are a fact of life and NMSettings must handle them. No
need to overly concern settings plugins with that.
--
NMSettingsConnection is exposed directly on D-Bus (being a subtype of
NMDBusObject) but it was also a GObject type provided by the settings
plugin. Hence, it was not possible to migrate a profile from one plugin to
another.
However that would be useful when one profile does not support a
connection type (like ifcfg-rh not supporting VPN). Currently such
migration is not implemented except for migrating them to/from keyfile's
run directory. The problem is that migrating profiles in general is
complicated but in some cases it is important to do.
For example checkpoint rollback should recreate the profile in the right
settings plugin, not just add it to persistent storage. This is not yet
properly implemented.
--
Previously, both keyfile and ifcfg-rh plugin implemented in-memory (unsaved)
profiles, while ifupdown plugin cannot handle them. That meant duplication of code
and a ifupdown profile could not be modified or made unsaved.
This is now unified and only keyfile plugin handles in-memory profiles (bgo #744711).
Also, NMSettings is aware of such profiles and treats them specially.
In particular, NMSettings drives the migration between persistent and non-persistent
storage.
Note that a settings plugins may create truly generated, in-memory profiles.
The settings plugin is free to generate and persist the profiles in any way it
wishes. But the concept of "unsaved" profiles is now something explicitly handled
by keyfile plugin. Also, these "unsaved" keyfile profiles are persisted to file system
too, to the /run directory. This is great for two reasons: first of all, all
profiles from keyfile storage in fact have a backing file -- even the
unsaved ones. It also means you can create "unsaved" profiles in /run
and load them with `nmcli connection load`, meaning there is a file
based API for creating unsaved profiles.
The other advantage is that these profiles now survive restarting
NetworkManager. It's paramount that restarting the daemon is as
non-disruptive as possible. Persisting unsaved files to /run improves
here significantly.
--
In the past, NMSettingsConnection also implemented NMConnection interface.
That was already changed a while ago and instead users call now
nm_settings_connection_get_connection() to delegate to a
NMSimpleConnection. What however still happened was that the NMConnection
instance gets never swapped but instead the instance was modified with
nm_connection_replace_settings_from_connection(), clear-secrets, etc.
Change that and treat the NMConnection instance immutable. Instead of modifying
it, reference/clone a new instance. This changes that previously when somebody
wanted to keep a reference to an NMConnection, then the profile would be cloned.
Now, it is supposed to be safe to reference the instance directly and everybody
must ensure not to modify the instance. nmtst_connection_assert_unchanging()
should help with that.
The point is that the settings plugins may keep references to the
NMConnection instance, and so does the NMSettingsConnection. We want
to avoid cloning the instances as long as they are the same.
Likewise, the device's applied connection can now also be referenced
instead of cloning it. This is not yet done, and possibly there are
further improvements possible.
--
Also implement multiple keyfile directores /usr/lib, /etc, /run (rh #1674545,
bgo #772414).
It was always the case that multiple files could provide the same UUID
(both in case of keyfile and ifcfg-rh). For keyfile plugin, if a profile in
read-only storage in /usr/lib gets modified, then it gets actually stored in
/etc (or /run, if the profile is unsaved).
--
While at it, make /etc/network/interfaces profiles for ifupdown plugin reloadable.
--
https://bugzilla.gnome.org/show_bug.cgi?id=772414
https://bugzilla.gnome.org/show_bug.cgi?id=744711
https://bugzilla.redhat.com/show_bug.cgi?id=1674545
2019-06-13 17:12:20 +02:00
|
|
|
%dir %{nmlibdir}/system-connections
|
2013-11-16 00:58:46 +01:00
|
|
|
%{_mandir}/man1/*
|
|
|
|
|
%{_mandir}/man5/*
|
2017-10-30 17:32:30 +01:00
|
|
|
%{_mandir}/man7/nmcli-examples.7*
|
2013-11-16 00:58:46 +01:00
|
|
|
%{_mandir}/man8/*
|
|
|
|
|
%dir %{_localstatedir}/lib/NetworkManager
|
2018-07-24 14:05:55 +02:00
|
|
|
%dir %{_sysconfdir}/sysconfig/network-scripts
|
2013-11-16 00:58:46 +01:00
|
|
|
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
|
|
|
|
|
%{_datadir}/polkit-1/actions/*.policy
|
2016-03-14 16:12:04 +01:00
|
|
|
%{_prefix}/lib/udev/rules.d/*.rules
|
2013-11-16 00:58:46 +01:00
|
|
|
# systemd stuff
|
|
|
|
|
%{systemd_dir}/NetworkManager.service
|
|
|
|
|
%{systemd_dir}/NetworkManager-wait-online.service
|
|
|
|
|
%{systemd_dir}/NetworkManager-dispatcher.service
|
2014-05-21 16:21:50 +02:00
|
|
|
%dir %{_datadir}/doc/NetworkManager/examples
|
2013-11-16 00:58:46 +01:00
|
|
|
%{_datadir}/doc/NetworkManager/examples/server.conf
|
2015-09-03 17:08:03 +02:00
|
|
|
%doc NEWS AUTHORS README CONTRIBUTING TODO
|
|
|
|
|
%license COPYING
|
2019-09-07 18:11:34 +02:00
|
|
|
%license COPYING.LGPL
|
|
|
|
|
%license COPYING.GFDL
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with adsl}
|
2014-03-20 20:01:32 +01:00
|
|
|
%files adsl
|
2018-03-18 20:38:49 +01:00
|
|
|
%{nmplugindir}/libnm-device-plugin-adsl.so
|
2014-12-19 13:30:39 +01:00
|
|
|
%else
|
2018-03-18 20:38:49 +01:00
|
|
|
%exclude %{nmplugindir}/libnm-device-plugin-adsl.so
|
2014-03-14 12:34:13 +01:00
|
|
|
%endif
|
|
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with bluetooth}
|
2014-03-20 20:01:32 +01:00
|
|
|
%files bluetooth
|
2018-03-18 20:38:49 +01:00
|
|
|
%{nmplugindir}/libnm-device-plugin-bluetooth.so
|
2014-03-14 12:34:13 +01:00
|
|
|
%endif
|
|
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with team}
|
2014-06-18 11:10:52 +02:00
|
|
|
%files team
|
2018-03-18 20:38:49 +01:00
|
|
|
%{nmplugindir}/libnm-device-plugin-team.so
|
2014-06-18 11:10:52 +02:00
|
|
|
%endif
|
|
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with wifi}
|
2014-05-14 11:04:07 +02:00
|
|
|
%files wifi
|
2018-03-18 20:38:49 +01:00
|
|
|
%{nmplugindir}/libnm-device-plugin-wifi.so
|
2014-05-14 11:04:07 +02:00
|
|
|
%endif
|
|
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with wwan}
|
2014-03-14 12:34:13 +01:00
|
|
|
%files wwan
|
2018-03-18 20:38:49 +01:00
|
|
|
%{nmplugindir}/libnm-device-plugin-wwan.so
|
|
|
|
|
%{nmplugindir}/libnm-wwan.so
|
2014-03-14 12:34:13 +01:00
|
|
|
%endif
|
|
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2017-08-01 18:27:22 +02:00
|
|
|
%if %{with ovs}
|
|
|
|
|
%files ovs
|
2018-03-18 20:38:49 +01:00
|
|
|
%{nmplugindir}/libnm-device-plugin-ovs.so
|
2017-08-01 18:27:22 +02:00
|
|
|
%{systemd_dir}/NetworkManager.service.d/NetworkManager-ovs.conf
|
2017-10-30 17:32:30 +01:00
|
|
|
%{_mandir}/man7/nm-openvswitch.7*
|
2017-08-01 18:27:22 +02:00
|
|
|
%endif
|
|
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2016-11-05 15:27:16 +01:00
|
|
|
%if %{with ppp}
|
|
|
|
|
%files ppp
|
|
|
|
|
%{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
|
2018-03-18 20:38:49 +01:00
|
|
|
%{nmplugindir}/libnm-ppp-plugin.so
|
2016-11-05 15:27:16 +01:00
|
|
|
%endif
|
|
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2016-11-08 10:09:39 +01:00
|
|
|
%files libnm -f %{name}.lang
|
2014-07-31 12:06:31 -04:00
|
|
|
%{_libdir}/libnm.so.*
|
|
|
|
|
%{_libdir}/girepository-1.0/NM-1.0.typelib
|
|
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2014-07-31 12:06:31 -04:00
|
|
|
%files libnm-devel
|
|
|
|
|
%dir %{_includedir}/libnm
|
|
|
|
|
%{_includedir}/libnm/*.h
|
|
|
|
|
%{_libdir}/pkgconfig/libnm.pc
|
|
|
|
|
%{_libdir}/libnm.so
|
|
|
|
|
%{_datadir}/gir-1.0/NM-1.0.gir
|
|
|
|
|
%dir %{_datadir}/gtk-doc/html/libnm
|
|
|
|
|
%{_datadir}/gtk-doc/html/libnm/*
|
2018-01-15 15:31:43 +01:00
|
|
|
%dir %{_datadir}/gtk-doc/html/NetworkManager
|
|
|
|
|
%{_datadir}/gtk-doc/html/NetworkManager/*
|
2016-10-27 12:40:27 +02:00
|
|
|
%{_datadir}/vala/vapi/libnm.deps
|
|
|
|
|
%{_datadir}/vala/vapi/libnm.vapi
|
2016-11-23 14:03:51 +01:00
|
|
|
%{_datadir}/dbus-1/interfaces/*.xml
|
2014-07-31 12:06:31 -04:00
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2018-04-23 18:37:48 +02:00
|
|
|
%if %{with connectivity_fedora}
|
2014-07-02 19:17:42 +02:00
|
|
|
%files config-connectivity-fedora
|
2015-06-07 15:58:11 +02:00
|
|
|
%dir %{nmlibdir}
|
|
|
|
|
%dir %{nmlibdir}/conf.d
|
|
|
|
|
%{nmlibdir}/conf.d/20-connectivity-fedora.conf
|
2018-04-23 18:37:48 +02:00
|
|
|
%endif
|
2014-07-02 19:17:42 +02:00
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2018-07-10 08:48:51 +02:00
|
|
|
%if %{with connectivity_redhat}
|
|
|
|
|
%files config-connectivity-redhat
|
|
|
|
|
%dir %{nmlibdir}
|
|
|
|
|
%dir %{nmlibdir}/conf.d
|
|
|
|
|
%{nmlibdir}/conf.d/20-connectivity-redhat.conf
|
2019-06-14 15:51:44 +02:00
|
|
|
%{_sysctldir}/70-nm-connectivity.conf
|
2018-07-10 08:48:51 +02:00
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
%files config-server
|
2015-06-07 15:58:11 +02:00
|
|
|
%dir %{nmlibdir}
|
|
|
|
|
%dir %{nmlibdir}/conf.d
|
|
|
|
|
%{nmlibdir}/conf.d/00-server.conf
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2016-05-05 18:47:34 +02:00
|
|
|
%files dispatcher-routing-rules
|
2019-08-22 15:48:47 +02:00
|
|
|
%{nmlibdir}/dispatcher.d/10-ifcfg-rh-routes.sh
|
|
|
|
|
%{nmlibdir}/dispatcher.d/no-wait.d/10-ifcfg-rh-routes.sh
|
|
|
|
|
%{nmlibdir}/dispatcher.d/pre-up.d/10-ifcfg-rh-routes.sh
|
2016-05-05 18:39:07 +02:00
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2016-02-02 12:57:35 +01:00
|
|
|
%if %{with nmtui}
|
2013-11-16 00:58:46 +01:00
|
|
|
%files tui
|
2014-02-19 12:34:53 +01:00
|
|
|
%{_bindir}/nmtui
|
2013-11-16 00:58:46 +01:00
|
|
|
%{_bindir}/nmtui-edit
|
2014-02-19 12:34:53 +01:00
|
|
|
%{_bindir}/nmtui-connect
|
|
|
|
|
%{_bindir}/nmtui-hostname
|
2014-11-05 23:38:19 +01:00
|
|
|
%{_mandir}/man1/nmtui*
|
2014-02-24 10:45:34 +01:00
|
|
|
%endif
|
2013-11-16 00:58:46 +01:00
|
|
|
|
2018-07-10 08:47:31 +02:00
|
|
|
|
2013-11-16 00:58:46 +01:00
|
|
|
%changelog
|
|
|
|
|
__CHANGELOG__
|
