Merge pull request #43087 from jtojnar/nm-1.12

-11

pkgs/tools/networking/network-manager/PppdPath.patch

··· 1 - --- NetworkManager-1.6.2.org/src/ppp/nm-ppp-manager.c 2017-02-15 13:10:27.000000000 +0100 2 - +++ NetworkManager-1.6.2/./src/ppp/nm-ppp-manager.c 2017-04-03 11:45:39.891653216 +0200 3 - @@ -724,7 +724,7 @@ 4 - 5 - g_return_val_if_fail (setting != NULL, NULL); 6 - 7 - - pppd_binary = nm_utils_find_helper ("pppd", NULL, err); 8 - + pppd_binary = nm_utils_find_helper ("pppd", PPPD_PATH, err); 9 - if (!pppd_binary) 10 - return NULL; 11 -

+11 -5

pkgs/tools/networking/network-manager/applet.nix

··· 1 - { stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 1 + { stdenv, fetchurl, fetchpatch, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 2 2 , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl 3 3 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas 4 4 , libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection ··· 6 6 7 7 let 8 8 pname = "network-manager-applet"; 9 - version = "1.8.10"; 9 + version = "1.8.14"; 10 10 in stdenv.mkDerivation rec { 11 11 name = "${pname}-${version}"; 12 12 13 13 src = fetchurl { 14 14 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; 15 - sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a"; 15 + sha256 = "1js0i2kwfklahsn77qgxzdscy33drrlym3mrj1qhlw0zf8ri56ya"; 16 16 }; 17 17 18 + patches = [ 19 + (fetchpatch { 20 + url = https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/12.patch; 21 + sha256 = "0q5qbjpbrfvhqsprnwjwz4c42nly59cgnbn41w2zlxvqf29gjvwk"; 22 + }) 23 + ]; 24 + 18 25 mesonFlags = [ 19 26 "-Dselinux=false" 20 - "-Dappindicator=true" 27 + "-Dappindicator=yes" 21 28 "-Dgcr=${if withGnome then "true" else "false"}" 22 29 ]; 23 30 ··· 34 41 35 42 propagatedUserEnvPkgs = [ 36 43 hicolor-icon-theme 37 - gnome3.gnome-keyring # See https://github.com/NixOS/nixpkgs/issues/38967 38 44 ]; 39 45 40 46 NIX_CFLAGS = [

+32 -25

pkgs/tools/networking/network-manager/default.nix

··· 1 - { stdenv, fetchurl, intltool, pkgconfig, dbus-glib, gnome3 2 - , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables 1 + { stdenv, fetchurl, substituteAll, intltool, pkgconfig, dbus-glib, gnome3 2 + , systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables 3 3 , libgcrypt, dnsmasq, bluez5, readline 4 4 , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup 5 5 , ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt 6 - , python3Packages, docbook_xsl, fetchpatch, openconnect, curl, autoreconfHook }: 6 + , python3Packages, docbook_xsl, openconnect, curl, autoreconfHook }: 7 7 8 8 let 9 - pname = "NetworkManager"; 10 - version = "1.10.6"; 9 + pname = "NetworkManager"; 11 10 in stdenv.mkDerivation rec { 12 - name = "network-manager-${version}"; 11 + name = "network-manager-${version}"; 12 + version = "1.12.0"; 13 13 14 14 src = fetchurl { 15 - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 16 - sha256 = "0xmc3x41dbcaxjm85wfv405xq1a1n3xw8m8zg645ywm3avlb3w3a"; 15 + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 16 + sha256 = "15bzjkrfa7sw5p5hkdha4a67y1zfnzh1s6za11sh8s1yxmyvkziq"; 17 17 }; 18 18 19 19 outputs = [ "out" "dev" ]; ··· 25 25 preConfigure = '' 26 26 substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname 27 27 substituteInPlace configure --replace /usr/bin/file ${file}/bin/file 28 - substituteInPlace src/devices/nm-device.c \ 29 - --replace /usr/bin/ping ${inetutils}/bin/ping \ 30 - --replace /usr/bin/ping6 ${inetutils}/bin/ping 31 - substituteInPlace src/devices/nm-arping-manager.c \ 32 - --replace '("arping", NULL, NULL);' '("arping", "${iputils}/bin/arping", NULL);' 33 28 substituteInPlace data/84-nm-drivers.rules \ 34 29 --replace /bin/sh ${stdenv.shell} 35 30 substituteInPlace data/85-nm-unmanaged.rules \ ··· 38 33 --replace /bin/sed ${gnused}/bin/sed 39 34 substituteInPlace data/NetworkManager.service.in \ 40 35 --replace /bin/kill ${coreutils}/bin/kill 41 - substituteInPlace clients/common/nm-vpn-helpers.c \ 42 - --subst-var-by openconnect ${openconnect} 43 - substituteInPlace src/nm-core-utils.c \ 44 - --subst-var-by modprobeBinPath ${kmod}/bin/modprobe 45 36 # to enable link-local connections 46 37 configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" 47 38 ··· 70 61 "--with-modem-manager-1" 71 62 "--with-nmtui" 72 63 "--disable-gtk-doc" 64 + "--with-libnm-glib" # legacy library, TODO: remove 65 + "--disable-tests" 73 66 ]; 74 67 75 68 patches = [ 76 - ./PppdPath.patch 77 - ./openconnect_helper_path.patch 78 - ./modprobe.patch 69 + # https://bugzilla.gnome.org/show_bug.cgi?id=796752 70 + (fetchurl { 71 + url = https://bugzilla.gnome.org/attachment.cgi?id=372955; 72 + sha256 = "17rl19lprnsz4wjmp54c1qw6a3pf8x97bhd69xavwy7cx6z84b3n"; 73 + }) 74 + # https://bugzilla.gnome.org/show_bug.cgi?id=796751 75 + (fetchurl { 76 + url = https://bugzilla.gnome.org/attachment.cgi?id=372953; 77 + sha256 = "1crjplyiiipkhjjlifrv6hhvxinlcxd6irp9ijbc7jij31g44i0a"; 78 + }) 79 + (substituteAll { 80 + src = ./fix-paths.patch; 81 + inherit inetutils kmod openconnect; 82 + }) 83 + 79 84 ]; 80 85 81 - buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp curl 82 - bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ]; 86 + buildInputs = [ 87 + systemd libuuid polkit ppp libndp curl 88 + bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson 89 + ]; 83 90 84 91 propagatedBuildInputs = [ dbus-glib gnutls libgcrypt python3Packages.pygobject3 ]; 85 92 ··· 114 121 }; 115 122 116 123 meta = with stdenv.lib; { 117 - homepage = https://wiki.gnome.org/Projects/NetworkManager; 124 + homepage = https://wiki.gnome.org/Projects/NetworkManager; 118 125 description = "Network configuration and management tool"; 119 - license = licenses.gpl2Plus; 126 + license = licenses.gpl2Plus; 120 127 maintainers = with maintainers; [ phreedom rickynils domenkozar obadz ]; 121 - platforms = platforms.linux; 128 + platforms = platforms.linux; 122 129 }; 123 130 }

+38 -31

pkgs/tools/networking/network-manager/fix-paths.patch

··· 1 - --- a/properties/nm-openvpn-editor.c 2 - +++ b/properties/nm-openvpn-editor.c 3 - @@ -775,8 +775,7 @@ 4 - nm_find_openvpn (void) 5 - { 6 - static const char *openvpn_binary_paths[] = { 7 - - "/usr/sbin/openvpn", 8 - - "/sbin/openvpn", 9 - + "@openvpn@/bin/openvpn", 10 - NULL 11 - }; 12 - const char **openvpn_binary = openvpn_binary_paths; 13 - --- a/src/nm-openvpn-service.c 14 - +++ b/src/nm-openvpn-service.c 15 - @@ -522,9 +522,7 @@ 16 - openvpn_binary_find_exepath (void) 17 - { 18 - static const char *paths[] = { 19 - - "/usr/sbin/openvpn", 20 - - "/sbin/openvpn", 21 - - "/usr/local/sbin/openvpn", 22 - + "@openvpn@/bin/openvpn", 23 - }; 24 - int i; 1 + --- a/clients/common/nm-vpn-helpers.c 2 + +++ b/clients/common/nm-vpn-helpers.c 3 + @@ -205,7 +205,7 @@ 4 + char *argv[4]; 5 + const char *path; 6 + 7 + - path = nm_utils_find_helper ("openconnect", "/usr/sbin/openconnect", error); 8 + + path = "@openconnect@/bin/openconnect"; 9 + if (!path) 10 + return FALSE; 25 11 26 - @@ -2326,7 +2324,7 @@ 27 - _LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting..."); 12 + --- a/src/devices/nm-device.c 13 + +++ b/src/devices/nm-device.c 14 + @@ -11828,14 +11828,14 @@ 15 + gw = nm_ip4_config_best_default_route_get (priv->ip_config_4); 16 + if (gw) { 17 + nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf); 18 + - ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL); 19 + + ping_binary = "@inetutils@/bin/ping"; 20 + log_domain = LOGD_IP4; 21 + } 22 + } else if (priv->ip_config_6 && priv->ip6_state == IP_DONE) { 23 + gw = nm_ip6_config_best_default_route_get (priv->ip_config_6); 24 + if (gw) { 25 + nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf); 26 + - ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL); 27 + + ping_binary = "@inetutils@/bin/ping"; 28 + log_domain = LOGD_IP6; 29 + } 30 + } 31 + --- a/src/nm-core-utils.c 32 + +++ b/src/nm-core-utils.c 33 + @@ -428,7 +428,7 @@ 28 34 29 - if ( !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS) 30 - - && (system ("/sbin/modprobe tun") == -1)) 31 - + && (system ("@kmod@/bin/modprobe tun") == -1)) 32 - return EXIT_FAILURE; 35 + /* construct the argument list */ 36 + argv = g_ptr_array_sized_new (4); 37 + - g_ptr_array_add (argv, "/sbin/modprobe"); 38 + + g_ptr_array_add (argv, "@kmod@/bin/modprobe"); 39 + g_ptr_array_add (argv, (char *) arg1); 33 40 34 - plugin = nm_openvpn_plugin_new (bus_name); 41 + va_start (ap, arg1);

-11

pkgs/tools/networking/network-manager/modprobe.patch

··· 1 - --- a/src/nm-core-utils.c 2017-02-15 13:10:27.000000000 +0100 2 - +++ b/src/nm-core-utils.c 2017-07-06 14:28:41.575815695 +0200 3 - @@ -419,7 +419,7 @@ 4 - 5 - /* construct the argument list */ 6 - argv = g_ptr_array_sized_new (4); 7 - - g_ptr_array_add (argv, "/sbin/modprobe"); 8 - + g_ptr_array_add (argv, "@modprobeBinPath@"); 9 - g_ptr_array_add (argv, (char *) arg1); 10 - 11 - va_start (ap, arg1);

-29

pkgs/tools/networking/network-manager/openconnect_helper_path.patch

··· 1 - diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c 2 - index 15611c45c..4a7444d3a 100644 3 - --- a/clients/common/nm-vpn-helpers.c 4 - +++ b/clients/common/nm-vpn-helpers.c 5 - @@ -203,23 +203,8 @@ nm_vpn_openconnect_authenticate_helper (const char *host, 6 - gboolean ret; 7 - char **strv = NULL, **iter; 8 - char *argv[4]; 9 - - const char *path; 10 - - const char *const DEFAULT_PATHS[] = { 11 - - "/sbin/", 12 - - "/usr/sbin/", 13 - - "/usr/local/sbin/", 14 - - "/bin/", 15 - - "/usr/bin/", 16 - - "/usr/local/bin/", 17 - - NULL, 18 - - }; 19 - - 20 - - path = nm_utils_file_search_in_paths ("openconnect", "/usr/sbin/openconnect", DEFAULT_PATHS, 21 - - G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error); 22 - - if (!path) 23 - - return FALSE; 24 - 25 - - argv[0] = (char *) path; 26 - + argv[0] = "@openconnect@/bin/openconnect"; 27 - argv[1] = "--authenticate"; 28 - argv[2] = (char *) host; 29 - argv[3] = NULL;

+2 -2

pkgs/tools/networking/network-manager/openvpn.nix pkgs/tools/networking/network-manager/openvpn/default.nix

··· 3 3 4 4 let 5 5 pname = "NetworkManager-openvpn"; 6 - version = "1.8.2"; 6 + version = "1.8.4"; 7 7 in stdenv.mkDerivation rec { 8 8 name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; 9 9 10 10 src = fetchurl { 11 11 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 12 - sha256 = "0p9pjk81h1j1dk9jkkvvk17cq21wyq5kfa4j49fmx9b9yg8syqc8"; 12 + sha256 = "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr"; 13 13 }; 14 14 15 15 patches = [

+34

pkgs/tools/networking/network-manager/openvpn/fix-paths.patch

··· 1 + --- a/properties/nm-openvpn-editor.c 2 + +++ b/properties/nm-openvpn-editor.c 3 + @@ -775,8 +775,7 @@ 4 + nm_find_openvpn (void) 5 + { 6 + static const char *openvpn_binary_paths[] = { 7 + - "/usr/sbin/openvpn", 8 + - "/sbin/openvpn", 9 + + "@openvpn@/bin/openvpn", 10 + NULL 11 + }; 12 + const char **openvpn_binary = openvpn_binary_paths; 13 + --- a/src/nm-openvpn-service.c 14 + +++ b/src/nm-openvpn-service.c 15 + @@ -522,9 +522,7 @@ 16 + openvpn_binary_find_exepath (void) 17 + { 18 + static const char *paths[] = { 19 + - "/usr/sbin/openvpn", 20 + - "/sbin/openvpn", 21 + - "/usr/local/sbin/openvpn", 22 + + "@openvpn@/bin/openvpn", 23 + }; 24 + int i; 25 + 26 + @@ -2326,7 +2324,7 @@ 27 + _LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting..."); 28 + 29 + if ( !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS) 30 + - && (system ("/sbin/modprobe tun") == -1)) 31 + + && (system ("@kmod@/bin/modprobe tun") == -1)) 32 + return EXIT_FAILURE; 33 + 34 + plugin = nm_openvpn_plugin_new (bus_name);

+1 -1

pkgs/top-level/all-packages.nix

··· 4047 4047 4048 4048 networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine.nix { }; 4049 4049 4050 - networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { }; 4050 + networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn { }; 4051 4051 4052 4052 networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; 4053 4053