From 53e374bef3f044a3f6a8797472626a4d319d334c Mon Sep 17 00:00:00 2001 From: Nick Hahn Date: Mon, 28 Dec 2020 15:56:57 +0100 Subject: [PATCH] NetworkManager: update to 1.28.0. --- .../patches/fix-cross-gir.patch | 59 ++++++++----------- .../patches/musl-use-srand48.patch | 40 ------------- srcpkgs/NetworkManager/template | 15 ++++- 3 files changed, 35 insertions(+), 79 deletions(-) delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch index c283d4dc105..69687da097f 100644 --- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch +++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch @@ -1,8 +1,5 @@ Reason: Fix crossbuilding GIR Upstream: No, not upstreamable since this is very specific to the Void setup -diff --git clients/common/meson.build clients/common/meson.build -index afa257b..50b53e7 100644 ---- clients/common/meson.build +++ clients/common/meson.build @@ -35,7 +35,7 @@ if enable_introspection settings_docs, @@ -11,42 +8,32 @@ index afa257b..50b53e7 100644 - command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'], + command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')], ) - + test( -diff --git libnm/meson.build libnm/meson.build -index 51ca46d..f14d861 100644 ---- libnm/meson.build -+++ libnm/meson.build -@@ -236,7 +236,13 @@ if enable_introspection - ) - endif - -- generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py') +--- libnm/meson.build.orig 2020-12-28 16:03:30.641850261 +0100 ++++ libnm/meson.build 2020-12-28 16:31:54.932136481 +0100 +@@ -276,6 +276,14 @@ + 'GI_TYPELIB_PATH=' + gi_typelib_path, + 'LD_LIBRARY_PATH=' + ld_library_path, + ] ++ + if meson.is_cross_build() + qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static' -+ qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3' -+ generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')] ++ qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3' ++ generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')] + else -+ generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')] ++ generate_setting_docs = [python.path(), join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')] + endif - gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout() - if gi_typelib_path != '' -@@ -261,7 +267,7 @@ if enable_introspection - name, - input: libnm_gir[0], - output: name, -- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'], -+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'], - depends: libnm_gir, - ) - -@@ -270,7 +276,7 @@ if enable_introspection - name, - input: [libnm_gir[0], nm_settings_docs_overrides], - output: name, -- 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', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'], - depends: libnm_gir, - ) - endif + nm_settings_docs_xml_gir = custom_target( + 'nm-settings-docs-gir.xml', +@@ -283,8 +291,7 @@ + output: 'nm-settings-docs-gir.xml', + command: [ + generate_setting_docs_env, +- python.path(), +- join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), ++ generate_setting_docs, + '--lib-path', meson.current_build_dir(), + '--gir', '@INPUT@', + '--output', '@OUTPUT@' diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch deleted file mode 100644 index 43b689f3bad..00000000000 --- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig 2020-01-06 15:35:10.128600647 +0100 -+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c 2020-01-06 15:39:41.446240531 +0100 -@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_ - seed16v[1] = (u64 >> 16) ^ (u64 >> 0); - seed16v[2] = (u64 >> 32) ^ (u64 >> 16); - -+#ifdef __GLIBC__ - r = seed48_r(seed16v, &config->entropy); -+#else -+ r = 0; -+ seed48(seed16v); -+#endif - c_assert(!r); - } - -@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get - long int result; - int r; - -+#ifdef __GLIBC__ - r = mrand48_r(&config->entropy, &result); -+#else -+ r = 0; -+ result = mrand48(); -+#endif - c_assert(!r); - - return result; ---- shared/n-dhcp4/src/n-dhcp4-private.h.orig 2020-01-06 15:41:31.941501136 +0100 -+++ shared/n-dhcp4/src/n-dhcp4-private.h 2020-01-06 15:41:55.341556325 +0100 -@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig { - bool inform_only; - bool init_reboot; - struct in_addr requested_ip; -+#ifdef __GLIBC__ - struct drand48_data entropy; /* entropy pool */ -+#endif - uint64_t ms_start_delay; /* max ms to wait before starting probe */ - NDhcp4ClientProbeOption *options[UINT8_MAX + 1]; - int8_t request_parameters[UINT8_MAX + 1]; diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index e482bba98de..2cce753b64c 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -2,7 +2,7 @@ # when updating to 1.24 or newer, drop the compat # patch in gnome-control-center and rebuild it pkgname=NetworkManager -version=1.22.10 +version=1.28.0 revision=2 build_style=meson build_helper="gir qemu" @@ -35,7 +35,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/NetworkManager" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77 +checksum=3e170e9045e20598d2630e40c5789b2e2c46b942bfe5cb220f36202299253062 lib32disabled=yes conf_files="/etc/${pkgname}/${pkgname}.conf" make_dirs=" @@ -57,7 +57,6 @@ esac # Package build options build_options="gir vala elogind" build_options_default="gir vala elogind" - pre_configure() { if [ "$CROSS_BUILD" ]; then # Replace the values from our patch into the system itself @@ -68,6 +67,16 @@ pre_configure() { fi } +do_check() { + if [ "$XBPS_CHECK_PKGS" = full ]; then + : ${make_cmd:=ninja} + : ${make_check_target:=test} + : ${meson_builddir:=build} + + ${make_cmd} -C ${meson_builddir} ${makejobs} ${make_check_args} ${make_check_target} + fi +} + post_install() { vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname} vinstall ${FILESDIR}/50-org.freedesktop.NetworkManager.rules 644 \