Update to 1.10.10 release
This commit is contained in:
parent
02053d56e0
commit
dcbf61f954
1
.gitignore
vendored
1
.gitignore
vendored
@ -344,3 +344,4 @@ network-manager-applet-0.8.1.tar.bz2
|
||||
/NetworkManager-1.10.4.tar.xz
|
||||
/NetworkManager-1.10.6.tar.xz
|
||||
/NetworkManager-1.10.8.tar.xz
|
||||
/NetworkManager-1.10.10.tar.xz
|
||||
|
@ -1,28 +0,0 @@
|
||||
From b784f2e1a3481606d637284a78c23fd22a3b6e5e Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Haller <thaller@redhat.com>
|
||||
Date: Thu, 14 Jun 2018 10:41:47 +0200
|
||||
Subject: [PATCH 1/1] device: fix crash during reapply
|
||||
|
||||
Fixes: bf3b3d444c7750a68a0771d99f48e663815e258e
|
||||
(cherry picked from commit fe1f5871c8c77796dbb92fe9bf2a2100e9755eeb)
|
||||
(cherry picked from commit 28cf2ecd0dd9cfca949b7eac17b12dfe87a7c04c)
|
||||
---
|
||||
src/devices/nm-device.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
|
||||
index e79bc5410..d39fd6801 100644
|
||||
--- a/src/devices/nm-device.c
|
||||
+++ b/src/devices/nm-device.c
|
||||
@@ -9486,7 +9486,7 @@ check_and_reapply_connection (NMDevice *self,
|
||||
|
||||
if (diffs) {
|
||||
NMConnection *connection_clean = connection;
|
||||
- gs_free NMConnection *connection_clean_free = NULL;
|
||||
+ gs_unref_object NMConnection *connection_clean_free = NULL;
|
||||
|
||||
{
|
||||
NMSettingConnection *s_con_a, *s_con_n;
|
||||
--
|
||||
2.17.1
|
||||
|
@ -7,9 +7,9 @@
|
||||
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
|
||||
|
||||
%global epoch_version 1
|
||||
%global rpm_version 1.10.8
|
||||
%global real_version 1.10.8
|
||||
%global release_version 2
|
||||
%global rpm_version 1.10.10
|
||||
%global real_version 1.10.10
|
||||
%global release_version 1
|
||||
%global snapshot %{nil}
|
||||
%global git_sha %{nil}
|
||||
|
||||
@ -91,7 +91,6 @@ Source2: 00-server.conf
|
||||
Source3: 20-connectivity-fedora.conf
|
||||
|
||||
# Patch1:
|
||||
Patch1: 0001-device-fix-crash-during-reapply.patch
|
||||
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
@ -360,7 +359,6 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
|
||||
%setup -q -n NetworkManager-%{real_version}
|
||||
|
||||
# %patch1 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%if %{with regen_docs}
|
||||
@ -712,6 +710,9 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sat Jun 16 2018 Thomas Haller <thaller@redhat.com> - 1:1.10.10-1
|
||||
- Update to 1.10.10 release
|
||||
|
||||
* Sat Jun 16 2018 Thomas Haller <thaller@redhat.com> - 1:1.10.8-2
|
||||
- device: fix crash during reapply of connection settings
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (NetworkManager-1.10.8.tar.xz) = 5253baab926ccc3cd59a71ed5ea10e9e054047b94968a04ee9f167bb4e2ac1c7b33668ca6a218eba9364ebcb00751b6b934329b1657fdbb013bb1fede7840e4c
|
||||
SHA512 (NetworkManager-1.10.10.tar.xz) = e536598b19064e0ab7fe3e92362de9c380281ff53a1481438216c2247b2d5287244e735be41c56c53040a5861bf36bbb979e36578244fabd6448a50ea42c4645
|
||||
|
Loading…
Reference in New Issue
Block a user