alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

networkmanager: 1.20.8 -> 1.22.4

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.22.4/NEWS
This commit is contained in:
worldofpeace 2019-12-22 22:02:09 -05:00
parent 863fc6574d
commit 0ec87b8aca
3 changed files with 27 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/networking/network-manager/default.nix
View file

@ -4,17 +4,17 @@
, gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup
, ethtool, gnused, iputils, kmod, jansson, gtk-doc, libxslt , ethtool, gnused, iputils, kmod, jansson, gtk-doc, libxslt
, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43 , docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43
, openconnect, curl, meson, ninja, libpsl }: , openconnect, curl, meson, ninja, libpsl, mobile-broadband-provider-info, runtimeShell }:
let let
pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "network-manager"; pname = "network-manager";
version = "1.20.8"; version = "1.22.4";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "1ijpnx25wy5bcvp4mc49va942q56d0pncpj4jpknpdzwilmf455d"; sha256 = "0682hm5l3ix8cq35yl5pxidri4kxbdnvj9llf8vg9mcg5abdaslv";
}; };
outputs = [ "out" "dev" "devdoc" "man" "doc" ]; outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@ -54,8 +54,8 @@ in stdenv.mkDerivation rec {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit iputils kmod openconnect ethtool gnused dbus; inherit iputils kmod openconnect ethtool gnused systemd;
inherit (stdenv) shell; inherit runtimeShell;
}) })
# Meson does not support using different directories during build and # Meson does not support using different directories during build and
@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
systemd libselinux audit libpsl libuuid polkit ppp libndp curl systemd libselinux audit libpsl libuuid polkit ppp libndp curl mobile-broadband-provider-info
bluez5 dnsmasq gobject-introspection modemmanager readline newt libsoup jansson bluez5 dnsmasq gobject-introspection modemmanager readline newt libsoup jansson
]; ];

21
pkgs/tools/networking/network-manager/fix-install-paths.patch
View file

@ -1,8 +1,8 @@
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 4105a9c80..3d912557f 100644 index 0af69f35d..9ab239c8a 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -884,9 +884,9 @@ meson.add_install_script( @@ -912,9 +912,9 @@ meson.add_install_script(
join_paths('tools', 'meson-post-install.sh'), join_paths('tools', 'meson-post-install.sh'),
nm_datadir, nm_datadir,
nm_bindir, nm_bindir,
@ -11,19 +11,6 @@ index 4105a9c80..3d912557f 100644
nm_pkglibdir, nm_pkglibdir,
- nm_pkgstatedir, - nm_pkgstatedir,
+ nm_prefix + nm_pkgstatedir, + nm_prefix + nm_pkgstatedir,
enable_docs ? 'install_docs' : '',
nm_mandir, nm_mandir,
) nm_sysconfdir,
diff --git a/src/settings/plugins/ifcfg-rh/meson.build b/src/settings/plugins/ifcfg-rh/meson.build enable_docs ? '1' : '0',
index 58acdcfcb..e3a16d597 100644
--- a/src/settings/plugins/ifcfg-rh/meson.build
+++ b/src/settings/plugins/ifcfg-rh/meson.build
@@ -69,7 +69,7 @@ install_data(
)
meson.add_install_script('sh', '-c',
- 'mkdir -p $DESTDIR/@0@/sysconfig/network-scripts'.format(nm_sysconfdir))
+ 'mkdir -p $DESTDIR/@0@/sysconfig/network-scripts'.format(nm_prefix + nm_sysconfdir))
if enable_tests
subdir('tests')

34
pkgs/tools/networking/network-manager/fix-paths.patch
View file

@ -1,8 +1,8 @@
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index 204b7c286..8bdb734c2 100644 index ffae5f553..ba1093e4d 100644
--- a/clients/common/nm-vpn-helpers.c --- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c
@@ -215,10 +215,7 @@ nm_vpn_openconnect_authenticate_helper (const char *host, @@ -203,10 +203,7 @@ nm_vpn_openconnect_authenticate_helper (const char *host,
NULL, NULL,
}; };
@ -15,7 +15,7 @@ index 204b7c286..8bdb734c2 100644
if (!g_spawn_sync (NULL, if (!g_spawn_sync (NULL,
(char **) NM_MAKE_STRV (path, "--authenticate", host), (char **) NM_MAKE_STRV (path, "--authenticate", host),
diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
index e398cb9f2..31c56596a 100644 index e398cb9f2..a43d61864 100644
--- a/data/84-nm-drivers.rules --- a/data/84-nm-drivers.rules
+++ b/data/84-nm-drivers.rules +++ b/data/84-nm-drivers.rules
@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end" @@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end"
@ -23,27 +23,27 @@ index e398cb9f2..31c56596a 100644
ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
DRIVERS=="?*", GOTO="nm_drivers_end" DRIVERS=="?*", GOTO="nm_drivers_end"
-PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" -PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
+PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" +PROGRAM="@runtimeShell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
LABEL="nm_drivers_end" LABEL="nm_drivers_end"
diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
index 2f442bf23..c3e797bf4 100644 index 91ebd9a36..5201a56c3 100644
--- a/data/NetworkManager.service.in --- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in
@@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@ @@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@
[Service] [Service]
Type=dbus Type=dbus
BusName=org.freedesktop.NetworkManager BusName=org.freedesktop.NetworkManager
-ExecReload=/usr/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.Reload uint32:0 -ExecReload=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
+ExecReload=@dbus@/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.Reload uint32:0 +ExecReload=@systemd@/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
#ExecReload=/bin/kill -HUP $MAINPID #ExecReload=/bin/kill -HUP $MAINPID
ExecStart=@sbindir@/NetworkManager --no-daemon ExecStart=@sbindir@/NetworkManager --no-daemon
Restart=on-failure Restart=on-failure
diff --git a/libnm/meson.build b/libnm/meson.build diff --git a/libnm/meson.build b/libnm/meson.build
index 710ef181d..3aa182dd4 100644 index 51ca46d2b..0c04cc216 100644
--- a/libnm/meson.build --- a/libnm/meson.build
+++ b/libnm/meson.build +++ b/libnm/meson.build
@@ -280,7 +280,7 @@ if enable_introspection @@ -261,7 +261,7 @@ if enable_introspection
name, name,
input: libnm_gir[0], input: libnm_gir[0],
output: name, output: name,
@ -52,20 +52,20 @@ index 710ef181d..3aa182dd4 100644
depends: libnm_gir, depends: libnm_gir,
) )
@@ -289,7 +289,7 @@ if enable_introspection @@ -270,7 +270,7 @@ if enable_introspection
name, name,
input: libnm_gir[0], input: [libnm_gir[0], nm_settings_docs_overrides],
output: name, output: name,
- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'], - command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'], + command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
depends: libnm_gir, depends: libnm_gir,
) )
endif endif
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 67e23b8f9..b0ce52711 100644 index e7a4a059a..0a8f8b7c6 100644
--- a/src/devices/nm-device.c --- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c +++ b/src/devices/nm-device.c
@@ -12840,14 +12840,14 @@ nm_device_start_ip_check (NMDevice *self) @@ -13179,14 +13179,14 @@ nm_device_start_ip_check (NMDevice *self)
gw = nm_ip4_config_best_default_route_get (priv->ip_config_4); gw = nm_ip4_config_best_default_route_get (priv->ip_config_4);
if (gw) { if (gw) {
nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf); nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);
@ -83,10 +83,10 @@ index 67e23b8f9..b0ce52711 100644
} }
} }
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index d896d4d33..4cacb5cb6 100644 index fb92289f0..c91b27b09 100644
--- a/src/nm-core-utils.c --- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c +++ b/src/nm-core-utils.c
@@ -446,7 +446,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char * @@ -336,7 +336,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char *
/* construct the argument list */ /* construct the argument list */
argv = g_ptr_array_sized_new (4); argv = g_ptr_array_sized_new (4);