From be565e567bce418cb4e4b10e7256b7a728e2626c Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 9 Feb 2021 09:53:55 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/NetworkManager.git#598b6a70ba3c3440ee40df573b9568f33ed281fd --- .gitignore | 1 + 20-connectivity-fedora.conf | 1 + 20-connectivity-redhat.conf | 1 + NetworkManager.spec | 11 +++++++---- sources | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7072d00..68f479d 100644 --- a/.gitignore +++ b/.gitignore @@ -382,3 +382,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.28.0.tar.xz /NetworkManager-1.29.8.tar.xz /NetworkManager-1.29.9.tar.xz +/NetworkManager-1.29.11.tar.xz diff --git a/20-connectivity-fedora.conf b/20-connectivity-fedora.conf index 4c398c3..5c9476a 100644 --- a/20-connectivity-fedora.conf +++ b/20-connectivity-fedora.conf @@ -4,6 +4,7 @@ # Note that connectivity checking works badly with rp_filter set to # strict. Check "/proc/sys/net/ipv4/conf/*/rp_filter". [connectivity] +enabled=true uri=http://fedoraproject.org/static/hotspot.txt response=OK interval=300 diff --git a/20-connectivity-redhat.conf b/20-connectivity-redhat.conf index 94783b3..070f030 100644 --- a/20-connectivity-redhat.conf +++ b/20-connectivity-redhat.conf @@ -4,6 +4,7 @@ # Note that connectivity checking works badly with rp_filter set to # strict. Check "/proc/sys/net/ipv4/conf/*/rp_filter". [connectivity] +enabled=true uri=http://static.redhat.com/test/rhel-networkmanager.txt response=OK interval=300 diff --git a/NetworkManager.spec b/NetworkManager.spec index 3b3d3da..6532f83 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -6,8 +6,8 @@ %global epoch_version 1 %global rpm_version 1.30.0 -%global real_version 1.29.9 -%global release_version 0.3 +%global real_version 1.29.11 +%global release_version 0.4 %global snapshot %{nil} %global git_sha %{nil} @@ -169,7 +169,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: %{epoch_version} Version: %{rpm_version} -Release: %{release_version}%{?snap}%{?dist}.1 +Release: %{release_version}%{?snap}%{?dist} Group: System Environment/Base License: GPLv2+ and LGPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -1139,10 +1139,13 @@ fi %changelog +* Tue Feb 9 2021 Thomas Haller - 1:1.30.0-0.4 +- update to 1.29.11-dev snapshot + * Mon Jan 25 2021 Fedora Release Engineering - 1:1.30.0-0.3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Thu Jan 19 2021 Thomas Haller - 1:1.30.0-0.3 +* Tue Jan 19 2021 Thomas Haller - 1:1.30.0-0.3 - update to 1.29.9-dev snapshot * Fri Jan 15 2021 Peter Robinson 1:1.30.0-0.2 diff --git a/sources b/sources index 0c0c5c2..86a96e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.29.9.tar.xz) = 70708f746df44c5bde0280505c121e85655b0e342b9754c1cd0067ead77a8c59ab736553cb0eb7cff5a7fd27824429ab49fb438a4bcabe4647b38f72a5526a10 +SHA512 (NetworkManager-1.29.11.tar.xz) = 31b73989141054c5428f7b5fe98bc26cee38fd7bc6de8a97ff1c62be35268cb96ad04a3aa0307ba53d581365aba9019adb5bb2aececcedae104ca35670eca81c