rpms/NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.24-rc2 (1.23.91)

Browse Source
This commit is contained in:
Thomas Haller 2020-05-02 22:29:36 +02:00
parent c2f5bb45e9
commit b190302070
No known key found for this signature in database
GPG Key ID: 29C2366E4DFC5728
4 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -371,3 +371,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-1.22.8.tar.xz /NetworkManager-1.22.8.tar.xz
/NetworkManager-1.22.10.tar.xz /NetworkManager-1.22.10.tar.xz
/NetworkManager-1.23.90.tar.xz /NetworkManager-1.23.90.tar.xz
/NetworkManager-1.23.91.tar.xz

28
0001-nm-online-fix-build-of-nm-online-for-missing-libcsip.patch Normal file
View File

@ -0,0 +1,28 @@
From fea106f29d34f69bbc8d31d41702f1377ef08426 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sat, 2 May 2020 22:39:53 +0200
Subject: [PATCH 1/1] nm-online: fix build of nm-online for missing
libcsiphash.la
Fixes: e468b48ab7b8 ('nm-online: allow configuring timeout via NM_ONLINE_TIMEOUT environment')
(cherry picked from commit 69798fa6cd841c54915fdbee048ccd5765313a9b)
(cherry picked from commit 53476d821d3c66896bcdc0e6f26a60c0a184f469)
---
Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.am b/Makefile.am
index 6cb709b8d545..35564aa5c578 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4289,6 +4289,7 @@ clients_nm_online_LDADD = \
shared/nm-libnm-aux/libnm-libnm-aux.la \
shared/nm-glib-aux/libnm-glib-aux.la \
shared/nm-std-aux/libnm-std-aux.la \
+ shared/libcsiphash.la \
$(GLIB_LIBS) \
$(NULL)
--
2.25.4

14
NetworkManager.spec
View File

@ -6,8 +6,8 @@
%global epoch_version 1 %global epoch_version 1
%global rpm_version 1.24.0 %global rpm_version 1.24.0
%global real_version 1.23.90 %global real_version 1.23.91
%global release_version 0.1 %global release_version 0.2
%global snapshot %{nil} %global snapshot %{nil}
%global git_sha %{nil} %global git_sha %{nil}
@ -112,9 +112,9 @@
# bpf(BPF_MAP_CREATE, ...) randomly fails with EPERM. That might # bpf(BPF_MAP_CREATE, ...) randomly fails with EPERM. That might
# be related to `ulimit -l`. Anyway, this is not usable at the # be related to `ulimit -l`. Anyway, this is not usable at the
# moment. # moment.
%global ebpf_enabled no %global ebpf_enabled "no"
%else %else
%global ebpf_enabled no %global ebpf_enabled "no"
%endif %endif
############################################################################### ###############################################################################
@ -136,6 +136,7 @@ Source5: 20-connectivity-redhat.conf
Source6: 70-nm-connectivity.conf Source6: 70-nm-connectivity.conf
#Patch1: 0001-some.patch #Patch1: 0001-some.patch
Patch1: 0001-nm-online-fix-build-of-nm-online-for-missing-libcsip.patch
Requires(post): systemd Requires(post): systemd
Requires(post): /usr/sbin/update-alternatives Requires(post): /usr/sbin/update-alternatives
@ -584,7 +585,7 @@ This tool is still experimental.
%else %else
-Dlibpsl=false \ -Dlibpsl=false \
%endif %endif
%if %{ebpf_enabled} != yes %if %{ebpf_enabled} != "yes"
-Debpf=false \ -Debpf=false \
%else %else
-Debpf=true \ -Debpf=true \
@ -1051,6 +1052,9 @@ fi
%changelog %changelog
* Sat May 2 2020 Thomas Haller <thaller@redhat.com - 1:1.24.0-0.2
- Update to 1.24-rc2 (1.23.91)
* Sat Apr 11 2020 Thomas Haller <thaller@redhat.com - 1:1.24.0-0.1 * Sat Apr 11 2020 Thomas Haller <thaller@redhat.com - 1:1.24.0-0.1
- Update to 1.24-rc1 (1.23.90) - Update to 1.24-rc1 (1.23.90)

2
sources
View File

@ -1 +1 @@
SHA512 (NetworkManager-1.23.90.tar.xz) = 8dd037a6d0c2849f3d2c793eea545ce3b9b282752c9cbf75c28c133e8c8502792ec9ba29e121848f36a0ef6dda7579b87a50c1e2edccfa6e312e6e6dbf4cbbbf SHA512 (NetworkManager-1.23.91.tar.xz) = 8a0679cea41fb7809aa2530d023593e54291c85aa2b2de180518489e7b886c9d9857a7f640b2afd9f4a4a2e99ab93304dfed9e188fb1b6e681ef6fb86f68a332