rpms
/
NetworkManager
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.14.0 release

This commit is contained in:
Thomas Haller 2018-09-14 21:55:43 +02:00
parent ac2eac23f7
commit 92d36d7fb0
6 changed files with 572 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -348,3 +348,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-1.11.90.tar.xz
/NetworkManager-1.12.0.tar.xz
/NetworkManager-1.12.2.tar.xz
/NetworkManager-1.14.0.tar.xz

537
0001-connectivity-fix-crash-when-removing-easy-handle-fro.patch Normal file
View File

@ -0,0 +1,537 @@
From 545851463bcaed25a80eecb864f91c23eec9cf7a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 17 Sep 2018 11:08:15 +0200
Subject: [PATCH 1/1] connectivity: fix crash when removing easy-handle from
curl callback
libcurl does not allow removing easy-handles from within a curl
callback.
That was already partly avoided for one handle alone. That is, when
a handle completed inside a libcurl callback, it would only invoke the
callback, but not yet delete it. However, that is not enough, because
from within a callback another handle can be cancelled, leading to
the removal of (the other) handle and a crash:
==24572== at 0x40319AB: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==24572== by 0x52DDAE5: Curl_close (url.c:392)
==24572== by 0x52EC02C: curl_easy_cleanup (easy.c:825)
==24572== by 0x5FDCD2: cb_data_free (nm-connectivity.c:215)
==24572== by 0x5FF6DE: nm_connectivity_check_cancel (nm-connectivity.c:585)
==24572== by 0x55F7F9: concheck_handle_complete (nm-device.c:2601)
==24572== by 0x574C12: concheck_cb (nm-device.c:2725)
==24572== by 0x5FD887: cb_data_invoke_callback (nm-connectivity.c:167)
==24572== by 0x5FD959: easy_header_cb (nm-connectivity.c:435)
==24572== by 0x52D73CB: chop_write (sendf.c:612)
==24572== by 0x52D73CB: Curl_client_write (sendf.c:668)
==24572== by 0x52D54ED: Curl_http_readwrite_headers (http.c:3904)
==24572== by 0x52E9EA7: readwrite_data (transfer.c:548)
==24572== by 0x52E9EA7: Curl_readwrite (transfer.c:1161)
==24572== by 0x52F4193: multi_runsingle (multi.c:1915)
==24572== by 0x52F5531: multi_socket (multi.c:2607)
==24572== by 0x52F5804: curl_multi_socket_action (multi.c:2771)
Fix that, by never invoking any callbacks when we are inside a libcurl
callback. Instead, the handle is marked for completion and queued. Later,
we complete all queue handles separately.
While at it, drop the @error argument from NMConnectivityCheckCallback.
It was only used to signal cancellation. Let's instead signal that via
status NM_CONNECTIVITY_CANCELLED.
https://bugzilla.gnome.org/show_bug.cgi?id=797136
https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1792745
https://bugzilla.opensuse.org/show_bug.cgi?id=1107197
https://github.com/NetworkManager/NetworkManager/pull/207
Fixes: d8a31794c8b9db243076ba0c24dfe6e496b78697
(cherry picked from commit fa40fc6d765248194d692a090b3abfbea6fe4e8f)
(cherry picked from commit 7f05debf99ab30227180acd7b24a363013c957f2)
---
src/devices/nm-device.c | 14 +--
src/nm-connectivity.c | 236 ++++++++++++++++++++++++----------------
src/nm-connectivity.h | 7 +-
3 files changed, 153 insertions(+), 104 deletions(-)
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 8ca899a28..5ed4e559b 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -2813,7 +2813,6 @@ static void
concheck_cb (NMConnectivity *connectivity,
NMConnectivityCheckHandle *c_handle,
NMConnectivityState state,
- GError *error,
gpointer user_data)
{
_nm_unused gs_unref_object NMDevice *self_keep_alive = NULL;
@@ -2834,7 +2833,7 @@ concheck_cb (NMConnectivity *connectivity,
handle->c_handle = NULL;
self = handle->self;
- if (nm_utils_error_is_cancelled (error, FALSE)) {
+ if (state == NM_CONNECTIVITY_CANCELLED) {
/* the only place where we nm_connectivity_check_cancel(@c_handle), is
* from inside concheck_handle_complete(). This is a recursive call,
* nothing to do. */
@@ -2843,15 +2842,14 @@ concheck_cb (NMConnectivity *connectivity,
return;
}
+ /* we keep NMConnectivity instance alive. It cannot be disposing. */
+ nm_assert (state != NM_CONNECTIVITY_DISPOSING);
+
self_keep_alive = g_object_ref (self);
- _LOGT (LOGD_CONCHECK, "connectivity: complete check (seq:%llu, state:%s%s%s%s)",
+ _LOGT (LOGD_CONCHECK, "connectivity: complete check (seq:%llu, state:%s)",
(long long unsigned) handle->seq,
- nm_connectivity_state_to_string (state),
- NM_PRINT_FMT_QUOTED (error, ", error: ", error->message, "", ""));
-
- /* we keep NMConnectivity instance alive. It cannot be disposing. */
- nm_assert (!nm_utils_error_is_cancelled (error, TRUE));
+ nm_connectivity_state_to_string (state));
/* keep @self alive, while we invoke callbacks. */
priv = NM_DEVICE_GET_PRIVATE (self);
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index 3b779677d..8a6e955ae 100644
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -46,8 +46,10 @@ NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_state_to_string, int /*NMConnectivityState*/
NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_PORTAL, "PORTAL"),
NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_FULL, "FULL"),
- NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_ERROR, "ERROR"),
- NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_FAKE, "FAKE"),
+ NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_ERROR, "ERROR"),
+ NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_FAKE, "FAKE"),
+ NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_CANCELLED, "CANCELLED"),
+ NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_DISPOSING, "DISPOSING"),
);
const char *
@@ -77,6 +79,10 @@ struct _NMConnectivityCheckHandle {
} concheck;
#endif
+ const char *completed_log_message;
+ char *completed_log_message_free;
+ NMConnectivityState completed_state;
+
guint timeout_id;
};
@@ -90,6 +96,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
typedef struct {
CList handles_lst_head;
+ CList completed_handles_lst_head;
char *uri;
char *response;
gboolean enabled;
@@ -142,60 +149,37 @@ NM_DEFINE_SINGLETON_GETTER (NMConnectivity, nm_connectivity_get, NM_TYPE_CONNECT
/*****************************************************************************/
static void
-cb_data_invoke_callback (NMConnectivityCheckHandle *cb_data,
- NMConnectivityState state,
- GError *error,
- const char *log_message)
+cb_data_complete (NMConnectivityCheckHandle *cb_data,
+ NMConnectivityState state,
+ const char *log_message)
{
- NMConnectivityCheckCallback callback;
+ NMConnectivity *self;
nm_assert (cb_data);
nm_assert (NM_IS_CONNECTIVITY (cb_data->self));
-
- callback = cb_data->callback;
- if (!callback)
- return;
-
- cb_data->callback = NULL;
-
+ nm_assert (cb_data->callback);
+ nm_assert (state != NM_CONNECTIVITY_UNKNOWN);
nm_assert (log_message);
- _LOG2D ("check completed: %s; %s",
- nm_connectivity_state_to_string (state),
- log_message);
-
- callback (cb_data->self,
- cb_data,
- state,
- error,
- cb_data->user_data);
-}
-
-static void
-cb_data_free (NMConnectivityCheckHandle *cb_data,
- NMConnectivityState state,
- GError *error,
- const char *log_message)
-{
- NMConnectivity *self;
-
- nm_assert (cb_data);
-
self = cb_data->self;
- nm_assert (NM_IS_CONNECTIVITY (self));
+ /* mark the handle as completing. After this point, nm_connectivity_check_cancel()
+ * is no longer possible. */
+ cb_data->self = NULL;
- c_list_unlink (&cb_data->handles_lst);
+ c_list_unlink_stale (&cb_data->handles_lst);
#if WITH_CONCHECK
if (cb_data->concheck.curl_ehandle) {
NMConnectivityPrivate *priv;
/* Contrary to what cURL manual claim it is *not* safe to remove
- * the easy handle "at any moment"; specifically not from the
- * write function. Thus here we just dissociate the cb_data from
- * the easy handle and the easy handle will be cleaned up when the
- * message goes to CURLMSG_DONE in _con_curl_check_connectivity(). */
+ * the easy handle "at any moment"; specifically it's not safe to
+ * remove *any* handle from within a libcurl callback. That is
+ * why we queue completed handles in this case.
+ *
+ * cb_data_complete() is however only called *not* from within a
+ * libcurl callback. So, this is fine. */
curl_easy_setopt (cb_data->concheck.curl_ehandle, CURLOPT_WRITEFUNCTION, NULL);
curl_easy_setopt (cb_data->concheck.curl_ehandle, CURLOPT_WRITEDATA, NULL);
curl_easy_setopt (cb_data->concheck.curl_ehandle, CURLOPT_HEADERFUNCTION, NULL);
@@ -214,7 +198,18 @@ cb_data_free (NMConnectivityCheckHandle *cb_data,
nm_clear_g_source (&cb_data->timeout_id);
- cb_data_invoke_callback (cb_data, state, error, log_message);
+ _LOG2D ("check completed: %s; %s",
+ nm_connectivity_state_to_string (state),
+ log_message);
+
+ cb_data->callback (self,
+ cb_data,
+ state,
+ cb_data->user_data);
+
+ /* Note: self might be a danling pointer at this point. It must not be used
+ * after this point, and all callers must either take a reference first, or
+ * not use the self pointer too. */
#if WITH_CONCHECK
g_free (cb_data->concheck.response);
@@ -222,12 +217,54 @@ cb_data_free (NMConnectivityCheckHandle *cb_data,
g_string_free (cb_data->concheck.recv_msg, TRUE);
#endif
g_free (cb_data->ifspec);
+ if (cb_data->completed_log_message_free)
+ g_free (cb_data->completed_log_message_free);
g_slice_free (NMConnectivityCheckHandle, cb_data);
}
/*****************************************************************************/
#if WITH_CONCHECK
+
+static void
+cb_data_queue_completed (NMConnectivityCheckHandle *cb_data,
+ NMConnectivityState state,
+ const char *log_message_static,
+ char *log_message_take /* take */)
+{
+ nm_assert (cb_data);
+ nm_assert (NM_IS_CONNECTIVITY (cb_data->self));
+ nm_assert (state != NM_CONNECTIVITY_UNKNOWN);
+ nm_assert (log_message_static || log_message_take);
+ nm_assert (cb_data->completed_state == NM_CONNECTIVITY_UNKNOWN);
+ nm_assert (!cb_data->completed_log_message);
+ nm_assert (c_list_contains (&NM_CONNECTIVITY_GET_PRIVATE (cb_data->self)->handles_lst_head, &cb_data->handles_lst));
+
+ cb_data->completed_state = state;
+ cb_data->completed_log_message = log_message_static ?: log_message_take;
+ cb_data->completed_log_message_free = log_message_take;
+
+ c_list_unlink_stale (&cb_data->handles_lst);
+ c_list_link_tail (&NM_CONNECTIVITY_GET_PRIVATE (cb_data->self)->completed_handles_lst_head, &cb_data->handles_lst);
+}
+
+static void
+_complete_queued (NMConnectivity *self)
+{
+ NMConnectivity *self_keep_alive = NULL;
+ NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
+ NMConnectivityCheckHandle *cb_data;
+
+ while ((cb_data = c_list_first_entry (&priv->completed_handles_lst_head, NMConnectivityCheckHandle, handles_lst))) {
+ if (!self_keep_alive)
+ self_keep_alive = g_object_ref (self);
+ cb_data_complete (cb_data,
+ cb_data->completed_state,
+ cb_data->completed_log_message);
+ }
+ nm_g_object_unref (self_keep_alive);
+}
+
static const char *
_check_handle_get_response (NMConnectivityCheckHandle *cb_data)
{
@@ -265,29 +302,37 @@ _con_curl_check_connectivity (CURLM *mhandle, int sockfd, int ev_bitmask)
continue;
}
- if (!cb_data->callback) {
- /* callback was already invoked earlier. */
- cb_data_free (cb_data, NM_CONNECTIVITY_UNKNOWN, NULL, NULL);
- } else if (msg->data.result != CURLE_OK) {
- gs_free char *log_message = NULL;
+ nm_assert (cb_data);
+ nm_assert (NM_IS_CONNECTIVITY (cb_data->self));
- log_message = g_strdup_printf ("check failed with curl status %d", msg->data.result);
- cb_data_free (cb_data, NM_CONNECTIVITY_LIMITED, NULL,
- log_message);
+ if (cb_data->completed_state != NM_CONNECTIVITY_UNKNOWN) {
+ /* callback was already invoked earlier. Nothing to do. */
+ continue;
+ }
+
+ if (msg->data.result != CURLE_OK) {
+ cb_data_queue_completed (cb_data,
+ NM_CONNECTIVITY_LIMITED,
+ NULL,
+ g_strdup_printf ("check failed with curl status %d", msg->data.result));
} else if ( !((_check_handle_get_response (cb_data))[0])
&& (curl_easy_getinfo (msg->easy_handle, CURLINFO_RESPONSE_CODE, &response_code) == CURLE_OK)
&& response_code == 204) {
/* If we got a 204 response code (no content) and we actually
* requested no content, report full connectivity. */
- cb_data_free (cb_data, NM_CONNECTIVITY_FULL, NULL,
- "no content, as expected");
+ cb_data_queue_completed (cb_data,
+ NM_CONNECTIVITY_FULL,
+ "no content, as expected",
+ NULL);
} else {
/* If we get here, it means that easy_write_cb() didn't read enough
* bytes to be able to do a match, or that we were asking for no content
* (204 response code) and we actually got some. Either way, that is
* an indication of a captive portal */
- cb_data_free (cb_data, NM_CONNECTIVITY_PORTAL, NULL,
- "unexpected short response");
+ cb_data_queue_completed (cb_data,
+ NM_CONNECTIVITY_PORTAL,
+ "unexpected short response",
+ NULL);
}
}
@@ -306,6 +351,7 @@ _con_curl_timeout_cb (gpointer user_data)
priv->concheck.curl_timer = 0;
_con_curl_check_connectivity (priv->concheck.curl_mhandle, CURL_SOCKET_TIMEOUT, 0);
+ _complete_queued (self);
return G_SOURCE_REMOVE;
}
@@ -368,6 +414,8 @@ _con_curl_socketevent_cb (GIOChannel *ch, GIOCondition condition, gpointer user_
fdp->ev = 0;
}
+ _complete_queued (self);
+
return success ? G_SOURCE_CONTINUE : G_SOURCE_REMOVE;
}
@@ -419,10 +467,17 @@ easy_header_cb (char *buffer, size_t size, size_t nitems, void *userdata)
NMConnectivityCheckHandle *cb_data = userdata;
size_t len = size * nitems;
+ if (cb_data->completed_state != NM_CONNECTIVITY_UNKNOWN) {
+ /* already completed. */
+ return 0;
+ }
+
if ( len >= sizeof (HEADER_STATUS_ONLINE) - 1
&& !g_ascii_strncasecmp (buffer, HEADER_STATUS_ONLINE, sizeof (HEADER_STATUS_ONLINE) - 1)) {
- cb_data_invoke_callback (cb_data, NM_CONNECTIVITY_FULL,
- NULL, "status header found");
+ cb_data_queue_completed (cb_data,
+ NM_CONNECTIVITY_FULL,
+ "status header found",
+ NULL);
return 0;
}
@@ -434,24 +489,33 @@ easy_write_cb (void *buffer, size_t size, size_t nmemb, void *userdata)
{
NMConnectivityCheckHandle *cb_data = userdata;
size_t len = size * nmemb;
- const char *response = _check_handle_get_response (cb_data);;
+ const char *response;
+
+ if (cb_data->completed_state != NM_CONNECTIVITY_UNKNOWN) {
+ /* already completed. */
+ return 0;
+ }
if (!cb_data->concheck.recv_msg)
cb_data->concheck.recv_msg = g_string_sized_new (len + 10);
g_string_append_len (cb_data->concheck.recv_msg, buffer, len);
+ response = _check_handle_get_response (cb_data);;
if ( response
&& cb_data->concheck.recv_msg->len >= strlen (response)) {
/* We already have enough data -- check response */
if (g_str_has_prefix (cb_data->concheck.recv_msg->str, response)) {
- cb_data_invoke_callback (cb_data, NM_CONNECTIVITY_FULL, NULL,
- "expected response");
+ cb_data_queue_completed (cb_data,
+ NM_CONNECTIVITY_FULL,
+ "expected response",
+ NULL);
} else {
- cb_data_invoke_callback (cb_data, NM_CONNECTIVITY_PORTAL, NULL,
- "unexpected response");
+ cb_data_queue_completed (cb_data,
+ NM_CONNECTIVITY_PORTAL,
+ "unexpected response",
+ NULL);
}
-
return 0;
}
@@ -462,15 +526,11 @@ static gboolean
_timeout_cb (gpointer user_data)
{
NMConnectivityCheckHandle *cb_data = user_data;
- NMConnectivity *self;
nm_assert (NM_IS_CONNECTIVITY (cb_data->self));
+ nm_assert (c_list_contains (&NM_CONNECTIVITY_GET_PRIVATE (cb_data->self)->handles_lst_head, &cb_data->handles_lst));
- self = cb_data->self;
-
- nm_assert (c_list_contains (&NM_CONNECTIVITY_GET_PRIVATE (self)->handles_lst_head, &cb_data->handles_lst));
-
- cb_data_free (cb_data, NM_CONNECTIVITY_LIMITED, NULL, "timeout");
+ cb_data_complete (cb_data, NM_CONNECTIVITY_LIMITED, "timeout");
return G_SOURCE_REMOVE;
}
#endif
@@ -490,9 +550,9 @@ _idle_cb (gpointer user_data)
/* the invocation was with an invalid ifname. It is a fail. */
g_set_error (&error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT,
"no interface specified for connectivity check");
- cb_data_free (cb_data, NM_CONNECTIVITY_ERROR, NULL, "missing interface");
+ cb_data_complete (cb_data, NM_CONNECTIVITY_ERROR, "missing interface");
} else
- cb_data_free (cb_data, NM_CONNECTIVITY_FAKE, NULL, "fake result");
+ cb_data_complete (cb_data, NM_CONNECTIVITY_FAKE, "fake result");
return G_SOURCE_REMOVE;
}
@@ -516,6 +576,7 @@ nm_connectivity_check_start (NMConnectivity *self,
c_list_link_tail (&priv->handles_lst_head, &cb_data->handles_lst);
cb_data->callback = callback;
cb_data->user_data = user_data;
+ cb_data->completed_state = NM_CONNECTIVITY_UNKNOWN;
if (iface)
cb_data->ifspec = g_strdup_printf ("if!%s", iface);
@@ -556,22 +617,13 @@ nm_connectivity_check_start (NMConnectivity *self,
void
nm_connectivity_check_cancel (NMConnectivityCheckHandle *cb_data)
{
- NMConnectivity *self;
- gs_free_error GError *error = NULL;
-
g_return_if_fail (cb_data);
+ g_return_if_fail (NM_IS_CONNECTIVITY (cb_data->self));
- self = cb_data->self;
-
- g_return_if_fail (NM_IS_CONNECTIVITY (self));
- g_return_if_fail (!c_list_is_empty (&cb_data->handles_lst));
- g_return_if_fail (cb_data->callback);
-
- nm_assert (c_list_contains (&NM_CONNECTIVITY_GET_PRIVATE (self)->handles_lst_head, &cb_data->handles_lst));
+ nm_assert ( c_list_contains (&NM_CONNECTIVITY_GET_PRIVATE (cb_data->self)->handles_lst_head, &cb_data->handles_lst)
+ || c_list_contains (&NM_CONNECTIVITY_GET_PRIVATE (cb_data->self)->completed_handles_lst_head, &cb_data->handles_lst));
- nm_utils_error_set_cancelled (&error, FALSE, "NMConnectivity");
-
- cb_data_free (cb_data, NM_CONNECTIVITY_ERROR, error, "cancelled");
+ cb_data_complete (cb_data, NM_CONNECTIVITY_CANCELLED, "cancelled");
}
/*****************************************************************************/
@@ -684,6 +736,7 @@ nm_connectivity_init (NMConnectivity *self)
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
c_list_init (&priv->handles_lst_head);
+ c_list_init (&priv->completed_handles_lst_head);
priv->config = g_object_ref (nm_config_get ());
g_signal_connect (G_OBJECT (priv->config),
@@ -715,16 +768,13 @@ dispose (GObject *object)
NMConnectivity *self = NM_CONNECTIVITY (object);
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
NMConnectivityCheckHandle *cb_data;
- GError *error = NULL;
-
-again:
- c_list_for_each_entry (cb_data, &priv->handles_lst_head, handles_lst) {
- if (!error)
- nm_utils_error_set_cancelled (&error, TRUE, "NMConnectivity");
- cb_data_free (cb_data, NM_CONNECTIVITY_ERROR, error, "shutting down");
- goto again;
- }
- g_clear_error (&error);
+
+ nm_assert (c_list_is_empty (&priv->completed_handles_lst_head));
+
+ while ((cb_data = c_list_first_entry (&priv->handles_lst_head,
+ NMConnectivityCheckHandle,
+ handles_lst)))
+ cb_data_complete (cb_data, NM_CONNECTIVITY_DISPOSING, "shutting down");
g_clear_pointer (&priv->uri, g_free);
g_clear_pointer (&priv->response, g_free);
diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h
index df9295e02..178f27ad9 100644
--- a/src/nm-connectivity.h
+++ b/src/nm-connectivity.h
@@ -24,8 +24,10 @@
#include "nm-dbus-interface.h"
-#define NM_CONNECTIVITY_ERROR ((NMConnectivityState) -1)
-#define NM_CONNECTIVITY_FAKE ((NMConnectivityState) -2)
+#define NM_CONNECTIVITY_ERROR ((NMConnectivityState) -1)
+#define NM_CONNECTIVITY_FAKE ((NMConnectivityState) -2)
+#define NM_CONNECTIVITY_CANCELLED ((NMConnectivityState) -3)
+#define NM_CONNECTIVITY_DISPOSING ((NMConnectivityState) -4)
#define NM_TYPE_CONNECTIVITY (nm_connectivity_get_type ())
#define NM_CONNECTIVITY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTIVITY, NMConnectivity))
@@ -53,7 +55,6 @@ typedef struct _NMConnectivityCheckHandle NMConnectivityCheckHandle;
typedef void (*NMConnectivityCheckCallback) (NMConnectivity *self,
NMConnectivityCheckHandle *handle,
NMConnectivityState state,
- GError *error,
gpointer user_data);
NMConnectivityCheckHandle *nm_connectivity_check_start (NMConnectivity *self,
--
2.17.1

27
0001-utils-test-don-t-assert-on-debug-level-messages.patch
View File

@ -1,27 +0,0 @@
From 9e31748442e081dfb045bffa703afa8693005ad3 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Sat, 11 Aug 2018 11:08:42 +0200
Subject: [PATCH] utils/test: don't assert on debug level messages
They come and go in GLib core for all sorts of purposes. Don't let that
break our tests.
---
shared/nm-utils/nm-test-utils.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h
index 743893f03..03d2f73c8 100644
--- a/shared/nm-utils/nm-test-utils.h
+++ b/shared/nm-utils/nm-test-utils.h
@@ -574,7 +574,7 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
} else {
/* We were called not to set logging levels. This means, that the user
* expects to assert against (all) messages. Any uncought message is fatal. */
- g_log_set_always_fatal (G_LOG_LEVEL_MASK);
+ g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG);
}
if ((!__nmtst_internal.assert_logging || (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message)) &&
--
2.17.1

29
0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch
View File

@ -1,29 +0,0 @@
From 0a3755c1799d3a4dc1875d4c59c7c568a64c8456 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 31 Jul 2018 14:13:57 +0200
Subject: [PATCH] version: fix compile error due to NM_AVAILABLE_IN_1_12_2
macro
Fixes: 8d09660481e1ff8b513aa60b2c40a4982ccc57cd
https://mail.gnome.org/archives/networkmanager-list/2018-July/msg00023.html
---
libnm-core/nm-version.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
index ee6dbc0bd..c24048955 100644
--- a/libnm-core/nm-version.h
+++ b/libnm-core/nm-version.h
@@ -161,7 +161,7 @@
#endif
#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12_2
-# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12,2)
+# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12.2)
#else
# define NM_AVAILABLE_IN_1_12_2
#endif
--
2.17.1

59
NetworkManager.spec
View File

@ -8,9 +8,9 @@
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
%global epoch_version 1
%global rpm_version 1.12.2
%global real_version 1.12.2
%global release_version 2
%global rpm_version 1.14.0
%global real_version 1.14.0
%global release_version 1
%global snapshot %{nil}
%global git_sha %{nil}
@ -34,8 +34,6 @@
%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
%global is_devel_build %(printf '%s' '%{real_version}' | sed -n 's/^1\\.\\([0-9]*[13579]\\)\\..*/1/p')
###############################################################################
%bcond_without adsl
@ -48,12 +46,8 @@
%bcond_without ppp
%bcond_without nmtui
%bcond_without regen_docs
%if 0%{is_devel_build}
%bcond_without debug
%else
%bcond_with debug
%endif
%bcond_without test
%bcond_with test
%bcond_with sanitizer
%if 0%{?fedora} > 28 || 0%{?rhel} > 7
%bcond_with libnm_glib
@ -65,7 +59,7 @@
%else
%bcond_with connectivity_fedora
%endif
%if 0%{?rhel}
%if 0%{?rhel} && 0%{?rhel} > 7
%bcond_without connectivity_redhat
%else
%bcond_with connectivity_redhat
@ -92,6 +86,12 @@
%global with_modem_manager_1 0
%endif
%if 0%{?fedora} || 0%{?rhel} <= 7
%global dhcp_default dhclient
%else
%global dhcp_default internal
%endif
###############################################################################
Name: NetworkManager
@ -109,8 +109,7 @@ Source2: 00-server.conf
Source3: 20-connectivity-fedora.conf
Source4: 20-connectivity-redhat.conf
Patch0: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/0a3755c179.patch#/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch
Patch1: 0001-utils-test-don-t-assert-on-debug-level-messages.patch
Patch1: 0001-connectivity-fix-crash-when-removing-easy-handle-fro.patch
Requires(post): systemd
Requires(post): /usr/sbin/update-alternatives
@ -132,6 +131,14 @@ Conflicts: NetworkManager-pptp < 1:0.7.0.99-1
Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1
Conflicts: kde-plasma-networkmanagement < 1:0.9-0.49.20110527git.nm09
BuildRequires: gcc
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: intltool
BuildRequires: gettext-devel
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
%if 0%{?fedora}
@ -139,9 +146,6 @@ BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
%endif
BuildRequires: glib2-devel >= 2.40.0
BuildRequires: gobject-introspection-devel >= 0.10.3
BuildRequires: gettext-devel
BuildRequires: pkgconfig
BuildRequires: automake autoconf intltool libtool
%if %{with ppp}
BuildRequires: ppp-devel >= 2.4.5
%endif
@ -435,9 +439,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
%prep
%setup -q -n NetworkManager-%{real_version}
%patch0 -p1
%patch1 -p1
%autosetup -p1 -n NetworkManager-%{real_version}
%build
@ -452,7 +454,7 @@ intltoolize --automake --copy --force
--with-dhclient=yes \
--with-dhcpcd=no \
--with-dhcpcanon=no \
--with-config-dhcp-default=dhclient \
--with-config-dhcp-default=%{dhcp_default} \
%if %{with crypto_gnutls}
--with-crypto=gnutls \
%else
@ -528,11 +530,11 @@ intltoolize --automake --copy --force
--with-systemdsystemunitdir=%{systemd_dir} \
--with-system-ca-path=/etc/pki/tls/cert.pem \
--with-dbus-sys-dir=%{dbus_sys_dir} \
%if %{with test}
--with-tests=yes \
%if %{with test}
--enable-more-warnings=error \
%else
--enable-more-warnings=yes \
--with-tests=no \
%endif
--with-valgrind=no \
--enable-ifcfg-rh=yes \
@ -593,7 +595,9 @@ touch %{buildroot}%{_sbindir}/ifup %{buildroot}%{_sbindir}/ifdown
%check
%if %{with test}
make %{?_smp_mflags} check
make -k %{?_smp_mflags} check
%else
make -k %{?_smp_mflags} check || :
%endif
@ -667,9 +671,9 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
%{_bindir}/nm-online
%{_libexecdir}/nm-ifup
%ghost %{_sbindir}/ifup
%ghost %attr(755, root, root) %{_sbindir}/ifup
%{_libexecdir}/nm-ifdown
%ghost %{_sbindir}/ifdown
%ghost %attr(755, root, root) %{_sbindir}/ifdown
%{_libexecdir}/nm-dhcp-helper
%{_libexecdir}/nm-dispatcher
%{_libexecdir}/nm-iface-helper
@ -853,7 +857,11 @@ fi
%{_mandir}/man1/nmtui*
%endif
%changelog
* Tue Sep 18 2018 Thomas Haller <thaller@redhat.com> - 1:1.14.0-1
- Update to 1.14.0 release
* Sat Aug 11 2018 Lubomir Rintel <lkundrak@v3.sk> - 1:1.12.2-2
- fix compile error due to NM_AVAILABLE_IN_1_12_2
@ -3292,4 +3300,3 @@ fi
* Fri Aug 20 2004 Dan Williams <dcbw@redhat.com> 0.1-3
- First public release

2
sources
View File

@ -1 +1 @@
SHA512 (NetworkManager-1.12.2.tar.xz) = cf5dae6ca8b6d3819a79485082f959907213d43413d15c41b79eb7da40edb913a41e7c18586b14bbf84f30ac493e2d9d466f5e66130c636f041ce939aaf49f35
SHA512 (NetworkManager-1.14.0.tar.xz) = cb0add2585c586ad36b4fb986a654de30047dc77f038927437156227f42622ac1045c58b76573f4e1acef22aa9f695da417f392a50fde70f4a086504701cecf1