Search results for query "dnsmasq"
- 16470 messages
[dnsmasq/f19] Update to latest dnsmasq-2.66rc1
by Tomas Hozza
commit b0df409e183f9f883a90d6b6449d225ed75e0fc5
Author: Tomas Hozza <thozza(a)redhat.com>
Date: Fri Mar 22 12:50:43 2013 +0100
Update to latest dnsmasq-2.66rc1
- Dropping unneeded patches
Signed-off-by: Tomas Hozza <thozza(a)redhat.com>
.gitignore | 1 +
...-dhcp_buff-ers-also-if-deamon-ra_contexts.patch | 37 ----
...aviour-for-TCP-queries-to-allowed-address.patch | 189 --------------------
...rong-interface-for-locally-routed-packets.patch | 178 ------------------
dnsmasq.spec | 22 +--
sources | 2 +-
6 files changed, 9 insertions(+), 420 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 53faf74..2d5afa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ dnsmasq-2.52.tar.lzma
/dnsmasq-2.63.tar.gz
/dnsmasq-2.64.tar.gz
/dnsmasq-2.65.tar.gz
+/dnsmasq-2.66rc1.tar.gz
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 65a4141..2b79da5 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -1,5 +1,5 @@
%define testrelease 0
-%define releasecandidate 0
+%define releasecandidate 1
%if 0%{testrelease}
%define extrapath test-releases/
%define extraversion test30
@@ -10,8 +10,8 @@
%endif
Name: dnsmasq
-Version: 2.65
-Release: 5%{?extraversion}%{?dist}
+Version: 2.66
+Release: 1%{?extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -20,14 +20,6 @@ URL: http://www.thekelleys.org.uk/dnsmasq/
Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex...
Source1: %{name}.service
-# http://www.thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=22ce550e534...
-Patch0: %{name}-2.65-Correct-behaviour-for-TCP-queries-to-allowed-address.patch
-# http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=e25db1f273920d5...
-Patch1: %{name}-2.65-Handle-wrong-interface-for-locally-routed-packets.patch
-# Code has been completely rewritten in new version
-# http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2013q1/006967.html
-Patch2: %{name}-2.65-Allocate-dhcp_buff-ers-also-if-deamon-ra_contexts.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel
@@ -61,10 +53,6 @@ query/remove a DHCP server's leases.
%prep
%setup -q -n %{name}-%{version}%{?extraversion}
-%patch0 -p1 -b .CVE-2013-0198
-%patch1 -p1 -b .local_queries
-%patch2 -p2 -b .SIGSEGV
-
# use /var/lib/dnsmasq instead of /var/lib/misc
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
@@ -141,6 +129,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/dhcp_*
%changelog
+* Fri Mar 22 2013 Tomas Hozza <thozza(a)redhat.com> - 2.66-1.rc1
+- Update to latest dnsmasq-2.66rc1
+- Dropping unneeded patches
+
* Fri Mar 15 2013 Tomas Hozza <thozza(a)redhat.com> - 2.65-5
- Allocate dhcp_buff-ers also if daemon->ra_contexts to prevent SIGSEGV (#920300)
diff --git a/sources b/sources
index 604d66e..71bfdb1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a91534a5d6f053d5c80f67ef502afa34 dnsmasq-2.65.tar.gz
+f1461f0f1c29cce8f92a4534a57003cd dnsmasq-2.66rc1.tar.gz
11 years, 2 months
lkundrak pushed to NetworkManager (master). "Add source"
by notifications＠fedoraproject.org
From 5a338dc86fd0be95f3a82cfa67692814952068de Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Tue, 19 Jul 2016 15:21:33 +0200
Subject: Add source
---
.gitignore | 1 +
...dnsmasq-clear-cache-and-restart-rh1338731.patch | 531 ---------------------
sources | 2 +-
3 files changed, 2 insertions(+), 532 deletions(-)
delete mode 100644 0001-dnsmasq-clear-cache-and-restart-rh1338731.patch
diff --git a/.gitignore b/.gitignore
index 5335206..ecdb1e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -326,3 +326,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-1.1.93.tar.xz
/NetworkManager-1.1.94.tar.xz
/NetworkManager-1.2.2.tar.xz
+/NetworkManager-1.3.0.git20160621.072358da.tar.xz
diff --git a/0001-dnsmasq-clear-cache-and-restart-rh1338731.patch b/0001-dnsmasq-clear-cache-and-restart-rh1338731.patch
deleted file mode 100644
index bc5162c..0000000
--- a/0001-dnsmasq-clear-cache-and-restart-rh1338731.patch
+++ /dev/null
@@ -1,531 +0,0 @@
-From 594a225264fe501ec78a8d20ee5447d18e1175b5 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani(a)redhat.com>
-Date: Tue, 31 May 2016 17:04:03 +0200
-Subject: [PATCH 1/6] core: fix some memory leaks
-
-(cherry picked from commit ec53ed2cbaab754ddf1283658b5adfba8134e757)
-(cherry picked from commit 70d194c159c80266140157db535700f8e44dbe0b)
----
- src/dhcp-manager/nm-dhcp-client.c | 2 ++
- src/nm-manager.c | 2 +-
- src/nm-policy.c | 1 +
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
-index 9f4cdf3..c102581 100644
---- a/src/dhcp-manager/nm-dhcp-client.c
-+++ b/src/dhcp-manager/nm-dhcp-client.c
-@@ -884,7 +884,9 @@ dispose (GObject *object)
-
- g_clear_pointer (&priv->iface, g_free);
- g_clear_pointer (&priv->hostname, g_free);
-+ g_clear_pointer (&priv->fqdn, g_free);
- g_clear_pointer (&priv->uuid, g_free);
-+ g_clear_pointer (&priv->client_id, g_bytes_unref);
-
- if (priv->hwaddr) {
- g_byte_array_free (priv->hwaddr, TRUE);
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index e64c68a..04b70cb 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -3268,7 +3268,7 @@ validate_activation_request (NMManager *self,
- NM_MANAGER_ERROR,
- NM_MANAGER_ERROR_CONNECTION_NOT_AVAILABLE,
- "Sharing IPv6 connections is not supported yet.");
-- return NULL;
-+ goto error;
- }
-
- /* Check whether it's a VPN or not */
-diff --git a/src/nm-policy.c b/src/nm-policy.c
-index 07bcce8..cb04f21 100644
---- a/src/nm-policy.c
-+++ b/src/nm-policy.c
-@@ -913,6 +913,7 @@ block_autoconnect_for_device (NMPolicy *self, NMDevice *device)
- NM_DEVICE_STATE_REASON_USER_REQUESTED);
- }
- }
-+ g_slist_free (connections);
- }
-
- static void
---
-2.5.5
-
-
-From f5a98215c616a8a7f4acb9a3e03667444b8fda6e Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani(a)redhat.com>
-Date: Tue, 24 May 2016 13:41:44 +0200
-Subject: [PATCH 2/6] dns/dnsmasq: cancel pending update on dispose
-
-There might be a pending "SetServersEx" D-Bus call when the plugin is
-destroyed, ensure it gets canceled.
-
-(cherry picked from commit d376787ce1a9e8c4990ed98be143ab892c9d29ed)
-(cherry picked from commit 7541ca0692668070e48adfc5fa8e4c6501600e16)
----
- src/dns-manager/nm-dns-dnsmasq.c | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
-index 4cee160..1df01e3 100644
---- a/src/dns-manager/nm-dns-dnsmasq.c
-+++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -48,6 +48,7 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsmasq, NM_TYPE_DNS_PLUGIN)
- typedef struct {
- GDBusProxy *dnsmasq;
- GCancellable *dnsmasq_cancellable;
-+ GCancellable *update_cancellable;
- gboolean running;
-
- GVariant *set_server_ex_args;
-@@ -265,14 +266,20 @@ add_ip6_config (NMDnsDnsmasq *self, GVariantBuilder *servers, NMIP6Config *ip6,
- }
-
- static void
--dnsmasq_update_done (GObject *source, GAsyncResult *res, gpointer user_data)
-+dnsmasq_update_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
- {
-- NMDnsDnsmasq *self = NM_DNS_DNSMASQ (user_data);
-- NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-+ NMDnsDnsmasq *self;
-+ NMDnsDnsmasqPrivate *priv;
- gs_free_error GError *error = NULL;
- gs_unref_variant GVariant *response = NULL;
-
-- response = g_dbus_proxy_call_finish (priv->dnsmasq, res, &error);
-+ response = g_dbus_proxy_call_finish (proxy, res, &error);
-+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-+ return;
-+
-+ self = NM_DNS_DNSMASQ (user_data);
-+ priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-+
- if (!response)
- _LOGW ("dnsmasq update failed: %s", error->message);
- else
-@@ -290,12 +297,15 @@ send_dnsmasq_update (NMDnsDnsmasq *self)
- if (priv->running) {
- _LOGD ("trying to update dnsmasq nameservers");
-
-+ nm_clear_g_cancellable (&priv->update_cancellable);
-+ priv->update_cancellable = g_cancellable_new ();
-+
- g_dbus_proxy_call (priv->dnsmasq,
- "SetServersEx",
- priv->set_server_ex_args,
- G_DBUS_CALL_FLAGS_NONE,
- -1,
-- NULL,
-+ priv->update_cancellable,
- (GAsyncReadyCallback) dnsmasq_update_done,
- self);
- g_clear_pointer (&priv->set_server_ex_args, g_variant_unref);
-@@ -559,6 +569,7 @@ dispose (GObject *object)
- NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (object);
-
- nm_clear_g_cancellable (&priv->dnsmasq_cancellable);
-+ nm_clear_g_cancellable (&priv->update_cancellable);
-
- g_clear_object (&priv->dnsmasq);
-
---
-2.5.5
-
-
-From ac4bfce7dde54a607c896e90a3269633a90f3bee Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani(a)redhat.com>
-Date: Tue, 24 May 2016 14:14:25 +0200
-Subject: [PATCH 3/6] dns: clear dnsmasq cache after an update
-
-When the list of DNS servers changes, old DNS entries cached by
-dnsmasq must be invalidated as the answers returned by new servers may
-be different (especially, old NXDOMAIN entries may now be valid). Call
-the dnsmasq "ClearCache" D-Bus method to achieve this.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1338731
-(cherry picked from commit 4feb58b50b9fd6caceda83bab907ad107ad8ed01)
-(cherry picked from commit a701e5b7ba35a0730d756ab0c1b15f0414bee592)
----
- src/dns-manager/nm-dns-dnsmasq.c | 31 +++++++++++++++++++++++++++++--
- 1 file changed, 29 insertions(+), 2 deletions(-)
-
-diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
-index 1df01e3..dd1234d 100644
---- a/src/dns-manager/nm-dns-dnsmasq.c
-+++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -266,6 +266,25 @@ add_ip6_config (NMDnsDnsmasq *self, GVariantBuilder *servers, NMIP6Config *ip6,
- }
-
- static void
-+dnsmasq_clear_cache_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
-+{
-+ NMDnsDnsmasq *self;
-+ gs_free_error GError *error = NULL;
-+ gs_unref_variant GVariant *response = NULL;
-+
-+ response = g_dbus_proxy_call_finish (proxy, res, &error);
-+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-+ return;
-+
-+ self = NM_DNS_DNSMASQ (user_data);
-+
-+ if (!response)
-+ _LOGW ("dnsmasq cache clear failed: %s", error->message);
-+ else
-+ _LOGD ("dnsmasq update successful, cache cleared");
-+}
-+
-+static void
- dnsmasq_update_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
- {
- NMDnsDnsmasq *self;
-@@ -282,8 +301,16 @@ dnsmasq_update_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
-
- if (!response)
- _LOGW ("dnsmasq update failed: %s", error->message);
-- else
-- _LOGD ("dnsmasq update successful");
-+ else {
-+ g_dbus_proxy_call (priv->dnsmasq,
-+ "ClearCache",
-+ NULL,
-+ G_DBUS_CALL_FLAGS_NONE,
-+ -1,
-+ priv->update_cancellable,
-+ (GAsyncReadyCallback) dnsmasq_clear_cache_done,
-+ self);
-+ }
- }
-
- static void
---
-2.5.5
-
-
-From b71ce01f5aa5af2851a4c5516a1c11b86b65b4b8 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani(a)redhat.com>
-Date: Sun, 1 May 2016 22:24:41 +0200
-Subject: [PATCH 4/6] core: introduce nm_utils_dnsmasq_status_to_string()
-
-(cherry picked from commit c0d322720a3956a40831c09f78a1dfbaf6fd9294)
-(cherry picked from commit 84b0bb5ec82661a2b47928cc49879ed49fa18602)
----
- src/dns-manager/nm-dns-dnsmasq.c | 23 ++------------------
- src/dnsmasq-manager/nm-dnsmasq-manager.c | 36 ++++---------------------------
- src/nm-core-utils.c | 37 ++++++++++++++++++++++++++++++++
- src/nm-core-utils.h | 2 ++
- 4 files changed, 45 insertions(+), 53 deletions(-)
-
-diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
-index dd1234d..aaa6a3e 100644
---- a/src/dns-manager/nm-dns-dnsmasq.c
-+++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -519,24 +519,6 @@ update (NMDnsPlugin *plugin,
-
- /****************************************************************/
-
--static const char *
--dm_exit_code_to_msg (int status)
--{
-- if (status == 1)
-- return "Configuration problem";
-- else if (status == 2)
-- return "Network access problem (address in use; permissions; etc)";
-- else if (status == 3)
-- return "Filesystem problem (missing file/directory; permissions; etc)";
-- else if (status == 4)
-- return "Memory allocation failure";
-- else if (status == 5)
-- return "Other problem";
-- else if (status >= 11)
-- return "Lease-script 'init' process failure";
-- return "Unknown error";
--}
--
- static void
- child_quit (NMDnsPlugin *plugin, gint status)
- {
-@@ -547,9 +529,8 @@ child_quit (NMDnsPlugin *plugin, gint status)
- if (WIFEXITED (status)) {
- err = WEXITSTATUS (status);
- if (err) {
-- _LOGW ("dnsmasq exited with error: %s (%d)",
-- dm_exit_code_to_msg (err),
-- err);
-+ _LOGW ("dnsmasq exited with error: %s",
-+ nm_utils_dnsmasq_status_to_string (err, NULL, 0));
- } else
- failed = FALSE;
- } else if (WIFSTOPPED (status))
-diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
-index 764aba2..12395db 100644
---- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
-+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
-@@ -165,36 +165,6 @@ nm_cmd_line_add_string (NMCmdLine *cmd, const char *str)
- /*******************************************/
-
- static void
--dm_exit_code (guint dm_exit_status)
--{
-- char *msg = "Unknown error";
--
-- switch (dm_exit_status) {
-- case 1:
-- msg = "Configuration problem";
-- break;
-- case 2:
-- msg = "Network access problem (address in use; permissions; etc)";
-- break;
-- case 3:
-- msg = "Filesystem problem (missing file/directory; permissions; etc)";
-- break;
-- case 4:
-- msg = "Memory allocation failure";
-- break;
-- case 5:
-- msg = "Other problem";
-- break;
-- default:
-- if (dm_exit_status >= 11)
-- msg = "Lease-script 'init' process failure";
-- break;
-- }
--
-- _LOGW ("dnsmasq exited with error: %s (%d)", msg, dm_exit_status);
--}
--
--static void
- dm_watch_cb (GPid pid, gint status, gpointer user_data)
- {
- NMDnsMasqManager *manager = NM_DNSMASQ_MANAGER (user_data);
-@@ -203,8 +173,10 @@ dm_watch_cb (GPid pid, gint status, gpointer user_data)
-
- if (WIFEXITED (status)) {
- err = WEXITSTATUS (status);
-- if (err != 0)
-- dm_exit_code (err);
-+ if (err != 0) {
-+ _LOGW ("dnsmasq exited with error: %s",
-+ nm_utils_dnsmasq_status_to_string (err, NULL, 0));
-+ }
- } else if (WIFSTOPPED (status)) {
- _LOGW ("dnsmasq stopped unexpectedly with signal %d", WSTOPSIG (status));
- } else if (WIFSIGNALED (status)) {
-diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
-index ef44a13..a2fbdfb 100644
---- a/src/nm-core-utils.c
-+++ b/src/nm-core-utils.c
-@@ -3085,3 +3085,40 @@ nm_utils_lifetime_get (guint32 timestamp,
- return TRUE;
- }
-
-+const char *
-+nm_utils_dnsmasq_status_to_string (int status, char *dest, guint size)
-+{
-+ static char buffer[128];
-+ char *msg, *ret;
-+ gs_free char *msg_free = NULL;
-+ int len;
-+
-+ if (status == 0)
-+ msg = "Success";
-+ else if (status == 1)
-+ msg = "Configuration problem";
-+ else if (status == 2)
-+ msg = "Network access problem (address in use, permissions)";
-+ else if (status == 3)
-+ msg = "Filesystem problem (missing file/directory, permissions)";
-+ else if (status == 4)
-+ msg = "Memory allocation failure";
-+ else if (status == 5)
-+ msg = "Other problem";
-+ else if (status >= 11)
-+ msg = msg_free = g_strdup_printf ("Lease script failed with error %d", status - 10);
-+ else
-+ msg = "Unknown problem";
-+
-+ if (dest) {
-+ ret = dest;
-+ len = size;
-+ } else {
-+ ret = buffer;
-+ len = sizeof (buffer);
-+ }
-+
-+ g_snprintf (ret, len, "%s (%d)", msg, status);
-+
-+ return ret;
-+}
-diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
-index ad0f995..b5083ac 100644
---- a/src/nm-core-utils.h
-+++ b/src/nm-core-utils.h
-@@ -394,4 +394,6 @@ gboolean nm_utils_lifetime_get (guint32 timestamp,
-
- gboolean nm_utils_ip4_address_is_link_local (in_addr_t addr);
-
-+const char *nm_utils_dnsmasq_status_to_string (int status, char *dest, guint size);
-+
- #endif /* __NM_CORE_UTILS_H__ */
---
-2.5.5
-
-
-From 4e78e89ac35954d38ff107c42295b1418042a13c Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller(a)redhat.com>
-Date: Mon, 30 May 2016 12:52:23 +0200
-Subject: [PATCH 5/6] dns: log when dnsmasq process exits normally
-
-(cherry picked from commit a64d70f0df586d398aa1bcd74be131ed6dc75450)
-(cherry picked from commit 2deee5286726fb2933822e105ffce634df695b35)
----
- src/dns-manager/nm-dns-dnsmasq.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
-index aaa6a3e..f8b2dd3 100644
---- a/src/dns-manager/nm-dns-dnsmasq.c
-+++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -531,8 +531,10 @@ child_quit (NMDnsPlugin *plugin, gint status)
- if (err) {
- _LOGW ("dnsmasq exited with error: %s",
- nm_utils_dnsmasq_status_to_string (err, NULL, 0));
-- } else
-+ } else {
-+ _LOGD ("dnsmasq exited normally");
- failed = FALSE;
-+ }
- } else if (WIFSTOPPED (status))
- _LOGW ("dnsmasq stopped unexpectedly with signal %d", WSTOPSIG (status));
- else if (WIFSIGNALED (status))
---
-2.5.5
-
-
-From 3061adfc7d962ef645f2844dfce7df5e359509b5 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller(a)redhat.com>
-Date: Mon, 30 May 2016 12:58:57 +0200
-Subject: [PATCH 6/6] dnsmasq: properly handling respawning of dnsmask
-
-Otherwise, when killing dnsmasq it does not get respawned:
-
- dnsmasq[0x560dd7e43cf0]: dnsmasq exited normally
- dns-mgr: plugin dnsmasq child quit unexpectedly
- dns-mgr: update-dns: updating resolv.conf
- dns-mgr: config: 100 best v4 enp0s25
- dns-mgr: config: 100 best v6 enp0s25
- dns-mgr: config: 100 default v6 lo
- dns-mgr: config: 100 default v4 lo
- dns-mgr: update-dns: updating plugin dnsmasq
- dnsmasq[0x560dd7e43cf0]: adding nameserver '192.168.0.2@enp0s25'
- dnsmasq[0x560dd7e43cf0]: trying to update dnsmasq nameservers
- dns-mgr: update-resolv-conf: write internal file /var/run/NetworkManager/resolv.conf succeeded but don't update /etc/resolv.conf as it points to resolv.conf.nm
- dnsmasq[0x560dd7e43cf0]: dnsmasq disappeared
-
-Previously, we would create priv->dnsmasq proxy only once,
-and not respawn the process at all.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=766996
-(cherry picked from commit 2e7f4aeb60579b092641cc8d65973baecbd5335b)
-(cherry picked from commit 1f8ba33d8716858cc27cf319c85e176bcf11afa3)
----
- src/dns-manager/nm-dns-dnsmasq.c | 21 ++++++++++++++++++---
- src/dns-manager/nm-dns-plugin.c | 11 +++++++++++
- src/dns-manager/nm-dns-plugin.h | 2 ++
- 3 files changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
-index f8b2dd3..a9fcc88 100644
---- a/src/dns-manager/nm-dns-dnsmasq.c
-+++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -410,11 +410,16 @@ start_dnsmasq (NMDnsDnsmasq *self)
- NMBusManager *dbus_mgr;
- GDBusConnection *connection;
-
-+ if (priv->running) {
-+ /* the dnsmasq process is running. Nothing to do. */
-+ return;
-+ }
-
-- if ( priv->running
-- || priv->dnsmasq
-- || priv->dnsmasq_cancellable)
-+ if (nm_dns_plugin_child_pid ((NMDnsPlugin *) self) > 0) {
-+ /* if we already have a child process spawned, don't do
-+ * it again. */
- return;
-+ }
-
- dm_binary = nm_utils_find_helper ("dnsmasq", DNSMASQ_PATH, NULL);
- if (!dm_binary) {
-@@ -446,6 +451,13 @@ start_dnsmasq (NMDnsDnsmasq *self)
- if (!pid)
- return;
-
-+ if ( priv->dnsmasq
-+ || priv->dnsmasq_cancellable) {
-+ /* we already have a proxy or are about to create it.
-+ * We are done. */
-+ return;
-+ }
-+
- dbus_mgr = nm_bus_manager_get ();
- g_return_if_fail (dbus_mgr);
-
-@@ -523,6 +535,7 @@ static void
- child_quit (NMDnsPlugin *plugin, gint status)
- {
- NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
-+ NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
- gboolean failed = TRUE;
- int err;
-
-@@ -542,6 +555,8 @@ child_quit (NMDnsPlugin *plugin, gint status)
- else
- _LOGW ("dnsmasq died from an unknown cause");
-
-+ priv->running = FALSE;
-+
- if (failed)
- g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
- }
-diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c
-index d5cb882..f45b47f 100644
---- a/src/dns-manager/nm-dns-plugin.c
-+++ b/src/dns-manager/nm-dns-plugin.c
-@@ -182,6 +182,17 @@ watch_cb (GPid pid, gint status, gpointer user_data)
- }
-
- GPid
-+nm_dns_plugin_child_pid (NMDnsPlugin *self)
-+{
-+ NMDnsPluginPrivate *priv;
-+
-+ g_return_val_if_fail (NM_IS_DNS_PLUGIN (self), 0);
-+
-+ priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
-+ return priv->pid;
-+}
-+
-+GPid
- nm_dns_plugin_child_spawn (NMDnsPlugin *self,
- const char **argv,
- const char *pidfile,
-diff --git a/src/dns-manager/nm-dns-plugin.h b/src/dns-manager/nm-dns-plugin.h
-index 7ecaa42..b328218 100644
---- a/src/dns-manager/nm-dns-plugin.h
-+++ b/src/dns-manager/nm-dns-plugin.h
-@@ -111,6 +111,8 @@ GPid nm_dns_plugin_child_spawn (NMDnsPlugin *self,
- const char *pidfile,
- const char *kill_match);
-
-+GPid nm_dns_plugin_child_pid (NMDnsPlugin *self);
-+
- gboolean nm_dns_plugin_child_kill (NMDnsPlugin *self);
-
- #endif /* __NETWORKMANAGER_DNS_PLUGIN_H__ */
---
-2.5.5
-
diff --git a/sources b/sources
index 0aedb97..fec32f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a922bf20c2243c9014fb14c4427ad035 NetworkManager-1.2.2.tar.xz
+a0cc1a7bf3e85030b7bf53c3b981d4ce NetworkManager-1.3.0.git20160621.072358da.tar.xz
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/NetworkManager.git/commit/?h=master&id...
7 years, 11 months
fgiudici pushed to NetworkManager (f24). "Update to NetworkManager
1.2.4 release"
by notifications＠fedoraproject.org
From 314bcffa9bf6c5db2ee257cacc08f1ba5c1e247d Mon Sep 17 00:00:00 2001
From: Francesco Giudici <fgiudici(a)redhat.com>
Date: Thu, 4 Aug 2016 16:45:40 +0200
Subject: Update to NetworkManager 1.2.4 release
---
.gitignore | 1 +
...dnsmasq-clear-cache-and-restart-rh1338731.patch | 531 ---------------------
NetworkManager.spec | 14 +-
sources | 2 +-
4 files changed, 8 insertions(+), 540 deletions(-)
delete mode 100644 0001-dnsmasq-clear-cache-and-restart-rh1338731.patch
diff --git a/.gitignore b/.gitignore
index 5335206..bd5772c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -326,3 +326,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-1.1.93.tar.xz
/NetworkManager-1.1.94.tar.xz
/NetworkManager-1.2.2.tar.xz
+/NetworkManager-1.2.4.tar.xz
diff --git a/0001-dnsmasq-clear-cache-and-restart-rh1338731.patch b/0001-dnsmasq-clear-cache-and-restart-rh1338731.patch
deleted file mode 100644
index bc5162c..0000000
--- a/0001-dnsmasq-clear-cache-and-restart-rh1338731.patch
+++ /dev/null
@@ -1,531 +0,0 @@
-From 594a225264fe501ec78a8d20ee5447d18e1175b5 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani(a)redhat.com>
-Date: Tue, 31 May 2016 17:04:03 +0200
-Subject: [PATCH 1/6] core: fix some memory leaks
-
-(cherry picked from commit ec53ed2cbaab754ddf1283658b5adfba8134e757)
-(cherry picked from commit 70d194c159c80266140157db535700f8e44dbe0b)
----
- src/dhcp-manager/nm-dhcp-client.c | 2 ++
- src/nm-manager.c | 2 +-
- src/nm-policy.c | 1 +
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
-index 9f4cdf3..c102581 100644
---- a/src/dhcp-manager/nm-dhcp-client.c
-+++ b/src/dhcp-manager/nm-dhcp-client.c
-@@ -884,7 +884,9 @@ dispose (GObject *object)
-
- g_clear_pointer (&priv->iface, g_free);
- g_clear_pointer (&priv->hostname, g_free);
-+ g_clear_pointer (&priv->fqdn, g_free);
- g_clear_pointer (&priv->uuid, g_free);
-+ g_clear_pointer (&priv->client_id, g_bytes_unref);
-
- if (priv->hwaddr) {
- g_byte_array_free (priv->hwaddr, TRUE);
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index e64c68a..04b70cb 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -3268,7 +3268,7 @@ validate_activation_request (NMManager *self,
- NM_MANAGER_ERROR,
- NM_MANAGER_ERROR_CONNECTION_NOT_AVAILABLE,
- "Sharing IPv6 connections is not supported yet.");
-- return NULL;
-+ goto error;
- }
-
- /* Check whether it's a VPN or not */
-diff --git a/src/nm-policy.c b/src/nm-policy.c
-index 07bcce8..cb04f21 100644
---- a/src/nm-policy.c
-+++ b/src/nm-policy.c
-@@ -913,6 +913,7 @@ block_autoconnect_for_device (NMPolicy *self, NMDevice *device)
- NM_DEVICE_STATE_REASON_USER_REQUESTED);
- }
- }
-+ g_slist_free (connections);
- }
-
- static void
---
-2.5.5
-
-
-From f5a98215c616a8a7f4acb9a3e03667444b8fda6e Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani(a)redhat.com>
-Date: Tue, 24 May 2016 13:41:44 +0200
-Subject: [PATCH 2/6] dns/dnsmasq: cancel pending update on dispose
-
-There might be a pending "SetServersEx" D-Bus call when the plugin is
-destroyed, ensure it gets canceled.
-
-(cherry picked from commit d376787ce1a9e8c4990ed98be143ab892c9d29ed)
-(cherry picked from commit 7541ca0692668070e48adfc5fa8e4c6501600e16)
----
- src/dns-manager/nm-dns-dnsmasq.c | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
-index 4cee160..1df01e3 100644
---- a/src/dns-manager/nm-dns-dnsmasq.c
-+++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -48,6 +48,7 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsmasq, NM_TYPE_DNS_PLUGIN)
- typedef struct {
- GDBusProxy *dnsmasq;
- GCancellable *dnsmasq_cancellable;
-+ GCancellable *update_cancellable;
- gboolean running;
-
- GVariant *set_server_ex_args;
-@@ -265,14 +266,20 @@ add_ip6_config (NMDnsDnsmasq *self, GVariantBuilder *servers, NMIP6Config *ip6,
- }
-
- static void
--dnsmasq_update_done (GObject *source, GAsyncResult *res, gpointer user_data)
-+dnsmasq_update_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
- {
-- NMDnsDnsmasq *self = NM_DNS_DNSMASQ (user_data);
-- NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-+ NMDnsDnsmasq *self;
-+ NMDnsDnsmasqPrivate *priv;
- gs_free_error GError *error = NULL;
- gs_unref_variant GVariant *response = NULL;
-
-- response = g_dbus_proxy_call_finish (priv->dnsmasq, res, &error);
-+ response = g_dbus_proxy_call_finish (proxy, res, &error);
-+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-+ return;
-+
-+ self = NM_DNS_DNSMASQ (user_data);
-+ priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-+
- if (!response)
- _LOGW ("dnsmasq update failed: %s", error->message);
- else
-@@ -290,12 +297,15 @@ send_dnsmasq_update (NMDnsDnsmasq *self)
- if (priv->running) {
- _LOGD ("trying to update dnsmasq nameservers");
-
-+ nm_clear_g_cancellable (&priv->update_cancellable);
-+ priv->update_cancellable = g_cancellable_new ();
-+
- g_dbus_proxy_call (priv->dnsmasq,
- "SetServersEx",
- priv->set_server_ex_args,
- G_DBUS_CALL_FLAGS_NONE,
- -1,
-- NULL,
-+ priv->update_cancellable,
- (GAsyncReadyCallback) dnsmasq_update_done,
- self);
- g_clear_pointer (&priv->set_server_ex_args, g_variant_unref);
-@@ -559,6 +569,7 @@ dispose (GObject *object)
- NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (object);
-
- nm_clear_g_cancellable (&priv->dnsmasq_cancellable);
-+ nm_clear_g_cancellable (&priv->update_cancellable);
-
- g_clear_object (&priv->dnsmasq);
-
---
-2.5.5
-
-
-From ac4bfce7dde54a607c896e90a3269633a90f3bee Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani(a)redhat.com>
-Date: Tue, 24 May 2016 14:14:25 +0200
-Subject: [PATCH 3/6] dns: clear dnsmasq cache after an update
-
-When the list of DNS servers changes, old DNS entries cached by
-dnsmasq must be invalidated as the answers returned by new servers may
-be different (especially, old NXDOMAIN entries may now be valid). Call
-the dnsmasq "ClearCache" D-Bus method to achieve this.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1338731
-(cherry picked from commit 4feb58b50b9fd6caceda83bab907ad107ad8ed01)
-(cherry picked from commit a701e5b7ba35a0730d756ab0c1b15f0414bee592)
----
- src/dns-manager/nm-dns-dnsmasq.c | 31 +++++++++++++++++++++++++++++--
- 1 file changed, 29 insertions(+), 2 deletions(-)
-
-diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
-index 1df01e3..dd1234d 100644
---- a/src/dns-manager/nm-dns-dnsmasq.c
-+++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -266,6 +266,25 @@ add_ip6_config (NMDnsDnsmasq *self, GVariantBuilder *servers, NMIP6Config *ip6,
- }
-
- static void
-+dnsmasq_clear_cache_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
-+{
-+ NMDnsDnsmasq *self;
-+ gs_free_error GError *error = NULL;
-+ gs_unref_variant GVariant *response = NULL;
-+
-+ response = g_dbus_proxy_call_finish (proxy, res, &error);
-+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-+ return;
-+
-+ self = NM_DNS_DNSMASQ (user_data);
-+
-+ if (!response)
-+ _LOGW ("dnsmasq cache clear failed: %s", error->message);
-+ else
-+ _LOGD ("dnsmasq update successful, cache cleared");
-+}
-+
-+static void
- dnsmasq_update_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
- {
- NMDnsDnsmasq *self;
-@@ -282,8 +301,16 @@ dnsmasq_update_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
-
- if (!response)
- _LOGW ("dnsmasq update failed: %s", error->message);
-- else
-- _LOGD ("dnsmasq update successful");
-+ else {
-+ g_dbus_proxy_call (priv->dnsmasq,
-+ "ClearCache",
-+ NULL,
-+ G_DBUS_CALL_FLAGS_NONE,
-+ -1,
-+ priv->update_cancellable,
-+ (GAsyncReadyCallback) dnsmasq_clear_cache_done,
-+ self);
-+ }
- }
-
- static void
---
-2.5.5
-
-
-From b71ce01f5aa5af2851a4c5516a1c11b86b65b4b8 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani(a)redhat.com>
-Date: Sun, 1 May 2016 22:24:41 +0200
-Subject: [PATCH 4/6] core: introduce nm_utils_dnsmasq_status_to_string()
-
-(cherry picked from commit c0d322720a3956a40831c09f78a1dfbaf6fd9294)
-(cherry picked from commit 84b0bb5ec82661a2b47928cc49879ed49fa18602)
----
- src/dns-manager/nm-dns-dnsmasq.c | 23 ++------------------
- src/dnsmasq-manager/nm-dnsmasq-manager.c | 36 ++++---------------------------
- src/nm-core-utils.c | 37 ++++++++++++++++++++++++++++++++
- src/nm-core-utils.h | 2 ++
- 4 files changed, 45 insertions(+), 53 deletions(-)
-
-diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
-index dd1234d..aaa6a3e 100644
---- a/src/dns-manager/nm-dns-dnsmasq.c
-+++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -519,24 +519,6 @@ update (NMDnsPlugin *plugin,
-
- /****************************************************************/
-
--static const char *
--dm_exit_code_to_msg (int status)
--{
-- if (status == 1)
-- return "Configuration problem";
-- else if (status == 2)
-- return "Network access problem (address in use; permissions; etc)";
-- else if (status == 3)
-- return "Filesystem problem (missing file/directory; permissions; etc)";
-- else if (status == 4)
-- return "Memory allocation failure";
-- else if (status == 5)
-- return "Other problem";
-- else if (status >= 11)
-- return "Lease-script 'init' process failure";
-- return "Unknown error";
--}
--
- static void
- child_quit (NMDnsPlugin *plugin, gint status)
- {
-@@ -547,9 +529,8 @@ child_quit (NMDnsPlugin *plugin, gint status)
- if (WIFEXITED (status)) {
- err = WEXITSTATUS (status);
- if (err) {
-- _LOGW ("dnsmasq exited with error: %s (%d)",
-- dm_exit_code_to_msg (err),
-- err);
-+ _LOGW ("dnsmasq exited with error: %s",
-+ nm_utils_dnsmasq_status_to_string (err, NULL, 0));
- } else
- failed = FALSE;
- } else if (WIFSTOPPED (status))
-diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
-index 764aba2..12395db 100644
---- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
-+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
-@@ -165,36 +165,6 @@ nm_cmd_line_add_string (NMCmdLine *cmd, const char *str)
- /*******************************************/
-
- static void
--dm_exit_code (guint dm_exit_status)
--{
-- char *msg = "Unknown error";
--
-- switch (dm_exit_status) {
-- case 1:
-- msg = "Configuration problem";
-- break;
-- case 2:
-- msg = "Network access problem (address in use; permissions; etc)";
-- break;
-- case 3:
-- msg = "Filesystem problem (missing file/directory; permissions; etc)";
-- break;
-- case 4:
-- msg = "Memory allocation failure";
-- break;
-- case 5:
-- msg = "Other problem";
-- break;
-- default:
-- if (dm_exit_status >= 11)
-- msg = "Lease-script 'init' process failure";
-- break;
-- }
--
-- _LOGW ("dnsmasq exited with error: %s (%d)", msg, dm_exit_status);
--}
--
--static void
- dm_watch_cb (GPid pid, gint status, gpointer user_data)
- {
- NMDnsMasqManager *manager = NM_DNSMASQ_MANAGER (user_data);
-@@ -203,8 +173,10 @@ dm_watch_cb (GPid pid, gint status, gpointer user_data)
-
- if (WIFEXITED (status)) {
- err = WEXITSTATUS (status);
-- if (err != 0)
-- dm_exit_code (err);
-+ if (err != 0) {
-+ _LOGW ("dnsmasq exited with error: %s",
-+ nm_utils_dnsmasq_status_to_string (err, NULL, 0));
-+ }
- } else if (WIFSTOPPED (status)) {
- _LOGW ("dnsmasq stopped unexpectedly with signal %d", WSTOPSIG (status));
- } else if (WIFSIGNALED (status)) {
-diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
-index ef44a13..a2fbdfb 100644
---- a/src/nm-core-utils.c
-+++ b/src/nm-core-utils.c
-@@ -3085,3 +3085,40 @@ nm_utils_lifetime_get (guint32 timestamp,
- return TRUE;
- }
-
-+const char *
-+nm_utils_dnsmasq_status_to_string (int status, char *dest, guint size)
-+{
-+ static char buffer[128];
-+ char *msg, *ret;
-+ gs_free char *msg_free = NULL;
-+ int len;
-+
-+ if (status == 0)
-+ msg = "Success";
-+ else if (status == 1)
-+ msg = "Configuration problem";
-+ else if (status == 2)
-+ msg = "Network access problem (address in use, permissions)";
-+ else if (status == 3)
-+ msg = "Filesystem problem (missing file/directory, permissions)";
-+ else if (status == 4)
-+ msg = "Memory allocation failure";
-+ else if (status == 5)
-+ msg = "Other problem";
-+ else if (status >= 11)
-+ msg = msg_free = g_strdup_printf ("Lease script failed with error %d", status - 10);
-+ else
-+ msg = "Unknown problem";
-+
-+ if (dest) {
-+ ret = dest;
-+ len = size;
-+ } else {
-+ ret = buffer;
-+ len = sizeof (buffer);
-+ }
-+
-+ g_snprintf (ret, len, "%s (%d)", msg, status);
-+
-+ return ret;
-+}
-diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
-index ad0f995..b5083ac 100644
---- a/src/nm-core-utils.h
-+++ b/src/nm-core-utils.h
-@@ -394,4 +394,6 @@ gboolean nm_utils_lifetime_get (guint32 timestamp,
-
- gboolean nm_utils_ip4_address_is_link_local (in_addr_t addr);
-
-+const char *nm_utils_dnsmasq_status_to_string (int status, char *dest, guint size);
-+
- #endif /* __NM_CORE_UTILS_H__ */
---
-2.5.5
-
-
-From 4e78e89ac35954d38ff107c42295b1418042a13c Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller(a)redhat.com>
-Date: Mon, 30 May 2016 12:52:23 +0200
-Subject: [PATCH 5/6] dns: log when dnsmasq process exits normally
-
-(cherry picked from commit a64d70f0df586d398aa1bcd74be131ed6dc75450)
-(cherry picked from commit 2deee5286726fb2933822e105ffce634df695b35)
----
- src/dns-manager/nm-dns-dnsmasq.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
-index aaa6a3e..f8b2dd3 100644
---- a/src/dns-manager/nm-dns-dnsmasq.c
-+++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -531,8 +531,10 @@ child_quit (NMDnsPlugin *plugin, gint status)
- if (err) {
- _LOGW ("dnsmasq exited with error: %s",
- nm_utils_dnsmasq_status_to_string (err, NULL, 0));
-- } else
-+ } else {
-+ _LOGD ("dnsmasq exited normally");
- failed = FALSE;
-+ }
- } else if (WIFSTOPPED (status))
- _LOGW ("dnsmasq stopped unexpectedly with signal %d", WSTOPSIG (status));
- else if (WIFSIGNALED (status))
---
-2.5.5
-
-
-From 3061adfc7d962ef645f2844dfce7df5e359509b5 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller(a)redhat.com>
-Date: Mon, 30 May 2016 12:58:57 +0200
-Subject: [PATCH 6/6] dnsmasq: properly handling respawning of dnsmask
-
-Otherwise, when killing dnsmasq it does not get respawned:
-
- dnsmasq[0x560dd7e43cf0]: dnsmasq exited normally
- dns-mgr: plugin dnsmasq child quit unexpectedly
- dns-mgr: update-dns: updating resolv.conf
- dns-mgr: config: 100 best v4 enp0s25
- dns-mgr: config: 100 best v6 enp0s25
- dns-mgr: config: 100 default v6 lo
- dns-mgr: config: 100 default v4 lo
- dns-mgr: update-dns: updating plugin dnsmasq
- dnsmasq[0x560dd7e43cf0]: adding nameserver '192.168.0.2@enp0s25'
- dnsmasq[0x560dd7e43cf0]: trying to update dnsmasq nameservers
- dns-mgr: update-resolv-conf: write internal file /var/run/NetworkManager/resolv.conf succeeded but don't update /etc/resolv.conf as it points to resolv.conf.nm
- dnsmasq[0x560dd7e43cf0]: dnsmasq disappeared
-
-Previously, we would create priv->dnsmasq proxy only once,
-and not respawn the process at all.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=766996
-(cherry picked from commit 2e7f4aeb60579b092641cc8d65973baecbd5335b)
-(cherry picked from commit 1f8ba33d8716858cc27cf319c85e176bcf11afa3)
----
- src/dns-manager/nm-dns-dnsmasq.c | 21 ++++++++++++++++++---
- src/dns-manager/nm-dns-plugin.c | 11 +++++++++++
- src/dns-manager/nm-dns-plugin.h | 2 ++
- 3 files changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
-index f8b2dd3..a9fcc88 100644
---- a/src/dns-manager/nm-dns-dnsmasq.c
-+++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -410,11 +410,16 @@ start_dnsmasq (NMDnsDnsmasq *self)
- NMBusManager *dbus_mgr;
- GDBusConnection *connection;
-
-+ if (priv->running) {
-+ /* the dnsmasq process is running. Nothing to do. */
-+ return;
-+ }
-
-- if ( priv->running
-- || priv->dnsmasq
-- || priv->dnsmasq_cancellable)
-+ if (nm_dns_plugin_child_pid ((NMDnsPlugin *) self) > 0) {
-+ /* if we already have a child process spawned, don't do
-+ * it again. */
- return;
-+ }
-
- dm_binary = nm_utils_find_helper ("dnsmasq", DNSMASQ_PATH, NULL);
- if (!dm_binary) {
-@@ -446,6 +451,13 @@ start_dnsmasq (NMDnsDnsmasq *self)
- if (!pid)
- return;
-
-+ if ( priv->dnsmasq
-+ || priv->dnsmasq_cancellable) {
-+ /* we already have a proxy or are about to create it.
-+ * We are done. */
-+ return;
-+ }
-+
- dbus_mgr = nm_bus_manager_get ();
- g_return_if_fail (dbus_mgr);
-
-@@ -523,6 +535,7 @@ static void
- child_quit (NMDnsPlugin *plugin, gint status)
- {
- NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
-+ NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
- gboolean failed = TRUE;
- int err;
-
-@@ -542,6 +555,8 @@ child_quit (NMDnsPlugin *plugin, gint status)
- else
- _LOGW ("dnsmasq died from an unknown cause");
-
-+ priv->running = FALSE;
-+
- if (failed)
- g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
- }
-diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c
-index d5cb882..f45b47f 100644
---- a/src/dns-manager/nm-dns-plugin.c
-+++ b/src/dns-manager/nm-dns-plugin.c
-@@ -182,6 +182,17 @@ watch_cb (GPid pid, gint status, gpointer user_data)
- }
-
- GPid
-+nm_dns_plugin_child_pid (NMDnsPlugin *self)
-+{
-+ NMDnsPluginPrivate *priv;
-+
-+ g_return_val_if_fail (NM_IS_DNS_PLUGIN (self), 0);
-+
-+ priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
-+ return priv->pid;
-+}
-+
-+GPid
- nm_dns_plugin_child_spawn (NMDnsPlugin *self,
- const char **argv,
- const char *pidfile,
-diff --git a/src/dns-manager/nm-dns-plugin.h b/src/dns-manager/nm-dns-plugin.h
-index 7ecaa42..b328218 100644
---- a/src/dns-manager/nm-dns-plugin.h
-+++ b/src/dns-manager/nm-dns-plugin.h
-@@ -111,6 +111,8 @@ GPid nm_dns_plugin_child_spawn (NMDnsPlugin *self,
- const char *pidfile,
- const char *kill_match);
-
-+GPid nm_dns_plugin_child_pid (NMDnsPlugin *self);
-+
- gboolean nm_dns_plugin_child_kill (NMDnsPlugin *self);
-
- #endif /* __NETWORKMANAGER_DNS_PLUGIN_H__ */
---
-2.5.5
-
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 6c5fc59..7feab6e 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -9,9 +9,9 @@
%global snapshot %{nil}
%global git_sha %{nil}
-%global rpm_version 1.2.2
-%global real_version 1.2.2
-%global release_version 2
+%global rpm_version 1.2.4
+%global real_version 1.2.4
+%global release_version 1
%global epoch_version 1
%global obsoletes_nmver 1:0.9.9.95-1
@@ -97,9 +97,6 @@ Source1: NetworkManager.conf
Source2: 00-server.conf
Source3: 20-connectivity-fedora.conf
-#Patch1: 0001-some.patch
-Patch1: 0001-dnsmasq-clear-cache-and-restart-rh1338731.patch
-
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
@@ -339,8 +336,6 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
%prep
%setup -q -n NetworkManager-%{real_version}
-%patch1 -p1
-
%build
gtkdocize
autoreconf --install --force
@@ -642,6 +637,9 @@ fi
%endif
%changelog
+* Thu Aug 4 2016 Francesco Giudici <fgiudici(a)redhat.com> - 1:1.2.4-1
+- Update to NetworkManager 1.2.4 release
+
* Thu Jun 2 2016 Thomas Haller <thaller(a)redhat.com> - 1:1.2.2-2
- dns: clear cache of dnsmasq when updating DNS configuration (rh#1338731)
- dns: fix restarting dnsmasq instance
diff --git a/sources b/sources
index 0aedb97..5cb0bf7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a922bf20c2243c9014fb14c4427ad035 NetworkManager-1.2.2.tar.xz
+66064dfe29c37502a0a9350e5caa46d3 NetworkManager-1.2.4.tar.xz
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/NetworkManager.git/commit/?h=f24&id=31...
7 years, 10 months
[dnsmasq/f19] Update to latest dnsmasq-2.66rc5
by Tomas Hozza
commit 16e329b64e40d5f7bf98a0f4eaae7092c41e41b7
Author: Tomas Hozza <thozza(a)redhat.com>
Date: Fri Apr 12 09:27:21 2013 +0200
Update to latest dnsmasq-2.66rc5
Also Include fix for segfault when lease limit is reached
Signed-off-by: Tomas Hozza <thozza(a)redhat.com>
.gitignore | 1 +
...5-Fix-crash-on-exceeding-DHCP-lease-limit.patch | 61 ++++++++++++++++++++
dnsmasq.spec | 13 ++++-
sources | 2 +-
4 files changed, 74 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d5afa0..66c2e52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ dnsmasq-2.52.tar.lzma
/dnsmasq-2.64.tar.gz
/dnsmasq-2.65.tar.gz
/dnsmasq-2.66rc1.tar.gz
+/dnsmasq-2.66rc5.tar.gz
diff --git a/dnsmasq-2.66.rc5-Fix-crash-on-exceeding-DHCP-lease-limit.patch b/dnsmasq-2.66.rc5-Fix-crash-on-exceeding-DHCP-lease-limit.patch
new file mode 100644
index 0000000..8852c55
--- /dev/null
+++ b/dnsmasq-2.66.rc5-Fix-crash-on-exceeding-DHCP-lease-limit.patch
@@ -0,0 +1,61 @@
+From 0b0a73c1c91bef3c2ab60a9563eac69a6b692a25 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon(a)thekelleys.org.uk>
+Date: Thu, 11 Apr 2013 14:07:02 +0100
+Subject: [PATCH] Fix crash on exceeding DHCP lease limit.
+
+---
+ CHANGELOG | 4 ++++
+ src/lease.c | 15 +++++++++++----
+ 2 files changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/CHANGELOG b/CHANGELOG
+index 212d412..b21f10a 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -58,6 +58,10 @@ version 2.66
+ Felker for the bug report.
+
+ Update Polish translation. Thanks to Jan Psota.
++
++ Fix crash if the configured DHCP lease limit is
++ reached. Regression occurred in 2.61. Thanks to Tsachi for
++ the bug report.
+
+
+ version 2.65
+diff --git a/src/lease.c b/src/lease.c
+index d30ae80..a4560ba 100644
+--- a/src/lease.c
++++ b/src/lease.c
+@@ -703,8 +703,11 @@ static struct dhcp_lease *lease_allocate(void)
+ struct dhcp_lease *lease4_allocate(struct in_addr addr)
+ {
+ struct dhcp_lease *lease = lease_allocate();
+- lease->addr = addr;
+- lease->hwaddr_len = 256; /* illegal value */
++ if (lease)
++ {
++ lease->addr = addr;
++ lease->hwaddr_len = 256; /* illegal value */
++ }
+
+ return lease;
+ }
+@@ -713,8 +716,12 @@ struct dhcp_lease *lease4_allocate(struct in_addr addr)
+ struct dhcp_lease *lease6_allocate(struct in6_addr *addrp, int lease_type)
+ {
+ struct dhcp_lease *lease = lease_allocate();
+- memcpy(lease->hwaddr, addrp, sizeof(*addrp)) ;
+- lease->flags |= lease_type;
++
++ if (lease)
++ {
++ memcpy(lease->hwaddr, addrp, sizeof(*addrp)) ;
++ lease->flags |= lease_type;
++ }
+
+ return lease;
+ }
+--
+1.8.1.4
+
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 94cfb5f..2cf2be7 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -6,12 +6,12 @@
%endif
%if 0%{releasecandidate}
%define extrapath release-candidates/
- %define extraversion rc1
+ %define extraversion rc5
%endif
Name: dnsmasq
Version: 2.66
-Release: 1%{?extraversion}%{?dist}
+Release: 1.%{?extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -20,6 +20,9 @@ URL: http://www.thekelleys.org.uk/dnsmasq/
Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex...
Source1: %{name}.service
+# Upstream fix after dnsmasq-2.66rc5 - commit 56a1142f033234e3ee3b6361e9a1bcdbe606f816
+Patch0: dnsmasq-2.66.rc5-Fix-crash-on-exceeding-DHCP-lease-limit.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel
@@ -54,6 +57,8 @@ query/remove a DHCP server's leases.
%prep
%setup -q -n %{name}-%{version}%{?extraversion}
+%patch0 -p1 -b .lease-limit
+
# use /var/lib/dnsmasq instead of /var/lib/misc
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
@@ -133,6 +138,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/dhcp_*
%changelog
+* Fri Apr 12 2013 Tomas Hozza <thozza(a)redhat.com> - 2.66-1.rc5
+- Update to latest dnsmasq-2.66rc5
+- Include fix for segfault when lease limit is reached
+
* Fri Mar 22 2013 Tomas Hozza <thozza(a)redhat.com> - 2.66-1.rc1
- Update to latest dnsmasq-2.66rc1
- Dropping unneeded patches
diff --git a/sources b/sources
index 71bfdb1..4f4ade2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f1461f0f1c29cce8f92a4534a57003cd dnsmasq-2.66rc1.tar.gz
+9c9fe3f9b0d6afb6a0a5d2f5c4eb1867 dnsmasq-2.66rc5.tar.gz
11 years, 2 months
[dnsmasq/f17] New version 2.64
by Tomas Hozza
commit 2b706080e1f22b58bdda175cfc58f3e8870173ed
Author: Tomas Hozza <thozza(a)redhat.com>
Date: Wed Dec 5 16:00:56 2012 +0100
New version 2.64
- Merged patches dropped
Signed-off-by: Tomas Hozza <thozza(a)redhat.com>
.gitignore | 1 +
dnsmasq-2.63-dhcp6-access-control.patch | 91 -------------------------------
dnsmasq-2.63-ip6-reuseaddr.patch | 36 ------------
dnsmasq.spec | 14 ++---
sources | 2 +-
5 files changed, 8 insertions(+), 136 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c531789..46e1f08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ dnsmasq-2.52.tar.lzma
/dnsmasq-2.58.tar.lzma
/dnsmasq-2.59.tar.lzma
/dnsmasq-2.63.tar.gz
+/dnsmasq-2.64.tar.gz
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 643d840..b6dacef 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -10,8 +10,8 @@
%endif
Name: dnsmasq
-Version: 2.63
-Release: 2%{?extraversion}%{?dist}
+Version: 2.64
+Release: 1%{?extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -20,9 +20,6 @@ URL: http://www.thekelleys.org.uk/dnsmasq/
Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex...
Source1: %{name}.service
-Patch0: dnsmasq-2.63-ip6-reuseaddr.patch
-Patch1: dnsmasq-2.63-dhcp6-access-control.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel
@@ -56,9 +53,6 @@ query/remove a DHCP server's leases.
%prep
%setup -q -n %{name}-%{version}%{?extraversion}
-%patch0 -p1 -b .ip6_reuseaddr
-%patch1 -p1 -b .dhcp6_access_ctrl
-
# use /var/lib/dnsmasq instead of /var/lib/misc
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
@@ -146,6 +140,10 @@ fi
%{_mandir}/man1/dhcp_*
%changelog
+* Wed Dec 05 2012 Tomas Hozza <thozza(a)redhat.com> - 2.64-1
+- New version 2.64
+- Merged patches dropped
+
* Mon Nov 19 2012 Tomas Hozza <thozza(a)redhat.com> - 2.63-2
- dhcp6 support fixes (#867054)
- removed "-s $HOSTNAME" from .service file (#753656)
diff --git a/sources b/sources
index caa61a2..99abe27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43e771997615ebcd8f6c6ffa60c3e40b dnsmasq-2.63.tar.gz
+60adb8e01960a41ce67e0422c4cf9ab3 dnsmasq-2.64.tar.gz
11 years, 6 months
[dnsmasq/f18] New version 2.64
by Tomas Hozza
commit 6df56349ef49dbcfb41842c8b9978d80b6ce144c
Author: Tomas Hozza <thozza(a)redhat.com>
Date: Wed Dec 5 16:00:56 2012 +0100
New version 2.64
- Merged patches dropped
Signed-off-by: Tomas Hozza <thozza(a)redhat.com>
.gitignore | 1 +
dnsmasq-2.63-dhcp6-access-control.patch | 91 -------------------------------
dnsmasq-2.63-ip6-reuseaddr.patch | 36 ------------
dnsmasq.spec | 14 ++---
sources | 2 +-
5 files changed, 8 insertions(+), 136 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c531789..46e1f08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ dnsmasq-2.52.tar.lzma
/dnsmasq-2.58.tar.lzma
/dnsmasq-2.59.tar.lzma
/dnsmasq-2.63.tar.gz
+/dnsmasq-2.64.tar.gz
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 56a839c..a156d4b 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -10,8 +10,8 @@
%endif
Name: dnsmasq
-Version: 2.63
-Release: 4%{?extraversion}%{?dist}
+Version: 2.64
+Release: 1%{?extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -20,9 +20,6 @@ URL: http://www.thekelleys.org.uk/dnsmasq/
Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex...
Source1: %{name}.service
-Patch0: dnsmasq-2.63-ip6-reuseaddr.patch
-Patch1: dnsmasq-2.63-dhcp6-access-control.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel
@@ -56,9 +53,6 @@ query/remove a DHCP server's leases.
%prep
%setup -q -n %{name}-%{version}%{?extraversion}
-%patch0 -p1 -b .ip6_reuseaddr
-%patch1 -p1 -b .dhcp6_access_ctrl
-
# use /var/lib/dnsmasq instead of /var/lib/misc
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
@@ -137,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/dhcp_*
%changelog
+* Wed Dec 05 2012 Tomas Hozza <thozza(a)redhat.com> - 2.64-1
+- New version 2.64
+- Merged patches dropped
+
* Tue Nov 20 2012 Tomas Hozza <thozza(a)redhat.com> - 2.63-4
- Remove EnvironmentFile from service file (#878343)
diff --git a/sources b/sources
index caa61a2..99abe27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43e771997615ebcd8f6c6ffa60c3e40b dnsmasq-2.63.tar.gz
+60adb8e01960a41ce67e0422c4cf9ab3 dnsmasq-2.64.tar.gz
11 years, 6 months
[dnsmasq/f17] Handle locally-routed DNS Queries (#904940)
by Tomas Hozza
commit 505574aaf406ff3cab93e4b2f17c8e34186595b7
Author: Tomas Hozza <thozza(a)redhat.com>
Date: Thu Jan 31 11:23:34 2013 +0100
Handle locally-routed DNS Queries (#904940)
Signed-off-by: Tomas Hozza <thozza(a)redhat.com>
...rong-interface-for-locally-routed-packets.patch | 178 ++++++++++++++++++++
dnsmasq.spec | 8 +-
2 files changed, 185 insertions(+), 1 deletions(-)
---
diff --git a/dnsmasq-2.65-Handle-wrong-interface-for-locally-routed-packets.patch b/dnsmasq-2.65-Handle-wrong-interface-for-locally-routed-packets.patch
new file mode 100644
index 0000000..87872a0
--- /dev/null
+++ b/dnsmasq-2.65-Handle-wrong-interface-for-locally-routed-packets.patch
@@ -0,0 +1,178 @@
+diff -up dnsmasq-2.65/src/dnsmasq.c.local_queries dnsmasq-2.65/src/dnsmasq.c
+--- dnsmasq-2.65/src/dnsmasq.c.local_queries 2013-01-31 09:07:45.603092125 +0100
++++ dnsmasq-2.65/src/dnsmasq.c 2013-01-31 09:07:45.606092127 +0100
+@@ -1401,20 +1401,29 @@ static void check_dns_listeners(fd_set *
+ else
+ {
+ int if_index;
+-
++ char intr_name[IF_NAMESIZE];
++
+ /* In full wildcard mode, need to refresh interface list.
+ This happens automagically in CLEVERBIND */
+- if (!option_bool(OPT_CLEVERBIND))
+- enumerate_interfaces();
+-
+- /* if we can find the arrival interface, check it's one that's allowed */
+- if ((if_index = tcp_interface(confd, tcp_addr.sa.sa_family)) != 0)
++ if (!option_bool(OPT_CLEVERBIND))
++ enumerate_interfaces();
++
++ /* if we can find the arrival interface, check it's one that's allowed */
++ if ((if_index = tcp_interface(confd, tcp_addr.sa.sa_family)) != 0 &&
++ indextoname(listener->tcpfd, if_index, intr_name))
+ {
++ struct all_addr addr;
++ addr.addr.addr4 = tcp_addr.in.sin_addr;
++#ifdef HAVE_IPV6
++ if (tcp_addr.sa.sa_family == AF_INET6)
++ addr.addr.addr6 = tcp_addr.in6.sin6_addr;
++#endif
++
+ for (iface = daemon->interfaces; iface; iface = iface->next)
+ if (iface->index == if_index)
+ break;
+
+- if (!iface)
++ if (!iface && !loopback_exception(listener->tcpfd, tcp_addr.sa.sa_family, &addr, intr_name))
+ client_ok = 0;
+ }
+
+@@ -1422,10 +1431,10 @@ static void check_dns_listeners(fd_set *
+ iface = listener->iface; /* May be NULL */
+ else
+ {
+- /* Check for allowed interfaces when binding the wildcard address:
+- we do this by looking for an interface with the same address as
+- the local address of the TCP connection, then looking to see if that's
+- an allowed interface. As a side effect, we get the netmask of the
++ /* Check for allowed interfaces when binding the wildcard address:
++ we do this by looking for an interface with the same address as
++ the local address of the TCP connection, then looking to see if that's
++ an allowed interface. As a side effect, we get the netmask of the
+ interface too, for localisation. */
+
+ for (iface = daemon->interfaces; iface; iface = iface->next)
+diff -up dnsmasq-2.65/src/dnsmasq.h.local_queries dnsmasq-2.65/src/dnsmasq.h
+--- dnsmasq-2.65/src/dnsmasq.h.local_queries 2013-01-31 09:07:45.000000000 +0100
++++ dnsmasq-2.65/src/dnsmasq.h 2013-01-31 09:10:36.091202196 +0100
+@@ -954,6 +954,7 @@ void create_wildcard_listeners(void);
+ void create_bound_listeners(int die);
+ int is_dad_listeners(void);
+ int iface_check(int family, struct all_addr *addr, char *name);
++int loopback_exception(int fd, int family, struct all_addr *addr, char *name);
+ int fix_fd(int fd);
+ int tcp_interface(int fd, int af);
+ struct in_addr get_ifaddr(char *intr);
+diff -up dnsmasq-2.65/src/forward.c.local_queries dnsmasq-2.65/src/forward.c
+--- dnsmasq-2.65/src/forward.c.local_queries 2012-12-14 12:48:26.000000000 +0100
++++ dnsmasq-2.65/src/forward.c 2013-01-31 09:19:58.087573008 +0100
+@@ -759,10 +759,17 @@ void receive_query(struct listener *list
+
+ /* enforce available interface configuration */
+
+- if (!indextoname(listen->fd, if_index, ifr.ifr_name) ||
+- !iface_check(listen->family, &dst_addr, ifr.ifr_name))
++ if (!indextoname(listen->fd, if_index, ifr.ifr_name))
+ return;
+
++ if (!iface_check(listen->family, &dst_addr, ifr.ifr_name))
++ {
++ if (!option_bool(OPT_CLEVERBIND))
++ enumerate_interfaces();
++ if (!loopback_exception(listen->fd, listen->family, &dst_addr, ifr.ifr_name))
++ return;
++ }
++
+ if (listen->family == AF_INET && option_bool(OPT_LOCALISE))
+ {
+ struct irec *iface;
+@@ -776,7 +783,7 @@ void receive_query(struct listener *list
+ break;
+
+ /* interface may be new */
+- if (!iface)
++ if (!iface && !option_bool(OPT_CLEVERBIND))
+ enumerate_interfaces();
+
+ for (iface = daemon->interfaces; iface; iface = iface->next)
+diff -up dnsmasq-2.65/src/network.c.local_queries dnsmasq-2.65/src/network.c
+--- dnsmasq-2.65/src/network.c.local_queries 2013-01-31 09:07:45.000000000 +0100
++++ dnsmasq-2.65/src/network.c 2013-01-31 09:25:28.669822969 +0100
+@@ -144,7 +144,39 @@ int iface_check(int family, struct all_a
+
+ return ret;
+ }
+-
++
++/* Fix for problem that the kernel sometimes reports the loopback inerface as the
++ arrival interface when a packet originates locally, even when sent to address of
++ an interface other than the loopback. Accept packet if it arrived via a loopback
++ interface, even when we're not accepting packets that way, as long as the destination
++ address is one we're believing. Interface list must be up-to-date before calling. */
++int loopback_exception(int fd, int family, struct all_addr *addr, char *name)
++{
++ struct ifreq ifr;
++ struct irec *iface;
++
++ strncpy(ifr.ifr_name, name, IF_NAMESIZE);
++ if (ioctl(fd, SIOCGIFFLAGS, &ifr) != -1 &&
++ ifr.ifr_flags & IFF_LOOPBACK)
++ {
++ for (iface = daemon->interfaces; iface; iface = iface->next)
++ if (iface->addr.sa.sa_family == family)
++ {
++ if (family == AF_INET)
++ {
++ if (iface->addr.in.sin_addr.s_addr == addr->addr.addr4.s_addr)
++ return 1;
++ }
++#ifdef HAVE_IPV6
++ else if (IN6_ARE_ADDR_EQUAL(&iface->addr.in6.sin6_addr, &addr->addr.addr6))
++ return 1;
++#endif
++
++ }
++ }
++ return 0;
++}
++
+ static int iface_allowed(struct irec **irecp, int if_index,
+ union mysockaddr *addr, struct in_addr netmask, int dad)
+ {
+diff -up dnsmasq-2.65/src/tftp.c.local_queries dnsmasq-2.65/src/tftp.c
+--- dnsmasq-2.65/src/tftp.c.local_queries 2012-12-14 12:48:26.000000000 +0100
++++ dnsmasq-2.65/src/tftp.c 2013-01-31 09:49:44.478008214 +0100
+@@ -61,6 +61,7 @@ void tftp_request(struct listener *liste
+ char *name = NULL;
+ char *prefix = daemon->tftp_prefix;
+ struct tftp_prefix *pref;
++ struct all_addr addra;
+
+ union {
+ struct cmsghdr align; /* this ensures alignment */
+@@ -190,16 +191,19 @@ void tftp_request(struct listener *liste
+
+ name = namebuff;
+
++ addra.addr.addr4 = addr.in.sin_addr;
++
+ #ifdef HAVE_IPV6
+ if (listen->family == AF_INET6)
++ addra.addr.addr6 = addr.in6.sin6_addr;
++#endif
++ if (!iface_check(listen->family, &addra, name))
+ {
+- if (!iface_check(AF_INET6, (struct all_addr *)&addr.in6.sin6_addr, name))
++ if (!option_bool(OPT_CLEVERBIND))
++ enumerate_interfaces();
++ if (!loopback_exception(listen->tftpfd, listen->family, &addra, name))
+ return;
+ }
+- else
+-#endif
+- if (!iface_check(AF_INET, (struct all_addr *)&addr.in.sin_addr, name))
+- return;
+
+ #ifdef HAVE_DHCP
+ /* allowed interfaces are the same as for DHCP */
diff --git a/dnsmasq.spec b/dnsmasq.spec
index e3b45d9..f5083c4 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -11,7 +11,7 @@
Name: dnsmasq
Version: 2.65
-Release: 3%{?extraversion}%{?dist}
+Release: 4%{?extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -22,6 +22,8 @@ Source1: %{name}.service
# http://www.thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=22ce550e534...
Patch0: %{name}-2.65-Correct-behaviour-for-TCP-queries-to-allowed-address.patch
+# http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=e25db1f273920d5...
+Patch1: %{name}-2.65-Handle-wrong-interface-for-locally-routed-packets.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +59,7 @@ query/remove a DHCP server's leases.
%setup -q -n %{name}-%{version}%{?extraversion}
%patch0 -p1 -b .CVE-2013-0198
+%patch1 -p1 -b .local_queries
# use /var/lib/dnsmasq instead of /var/lib/misc
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
@@ -143,6 +146,9 @@ fi
%{_mandir}/man1/dhcp_*
%changelog
+* Thu Jan 31 2013 Tomas Hozza <thozza(a)redhat.com> - 2.65-4
+- Handle locally-routed DNS Queries (#904940)
+
* Thu Jan 24 2013 Tomas Hozza <thozza(a)redhat.com> - 2.65-3
- build dnsmasq with $RPM_OPT_FLAGS, $RPM_LD_FLAGS explicitly (#903362)
11 years, 4 months
[dnsmasq/f18] Handle locally-routed DNS Queries (#904940)
by Tomas Hozza
commit 261955a53f5fb62564ec3bbc81e8f09b5d4a5bcf
Author: Tomas Hozza <thozza(a)redhat.com>
Date: Thu Jan 31 11:23:34 2013 +0100
Handle locally-routed DNS Queries (#904940)
Signed-off-by: Tomas Hozza <thozza(a)redhat.com>
...rong-interface-for-locally-routed-packets.patch | 178 ++++++++++++++++++++
dnsmasq.spec | 8 +-
2 files changed, 185 insertions(+), 1 deletions(-)
---
diff --git a/dnsmasq-2.65-Handle-wrong-interface-for-locally-routed-packets.patch b/dnsmasq-2.65-Handle-wrong-interface-for-locally-routed-packets.patch
new file mode 100644
index 0000000..87872a0
--- /dev/null
+++ b/dnsmasq-2.65-Handle-wrong-interface-for-locally-routed-packets.patch
@@ -0,0 +1,178 @@
+diff -up dnsmasq-2.65/src/dnsmasq.c.local_queries dnsmasq-2.65/src/dnsmasq.c
+--- dnsmasq-2.65/src/dnsmasq.c.local_queries 2013-01-31 09:07:45.603092125 +0100
++++ dnsmasq-2.65/src/dnsmasq.c 2013-01-31 09:07:45.606092127 +0100
+@@ -1401,20 +1401,29 @@ static void check_dns_listeners(fd_set *
+ else
+ {
+ int if_index;
+-
++ char intr_name[IF_NAMESIZE];
++
+ /* In full wildcard mode, need to refresh interface list.
+ This happens automagically in CLEVERBIND */
+- if (!option_bool(OPT_CLEVERBIND))
+- enumerate_interfaces();
+-
+- /* if we can find the arrival interface, check it's one that's allowed */
+- if ((if_index = tcp_interface(confd, tcp_addr.sa.sa_family)) != 0)
++ if (!option_bool(OPT_CLEVERBIND))
++ enumerate_interfaces();
++
++ /* if we can find the arrival interface, check it's one that's allowed */
++ if ((if_index = tcp_interface(confd, tcp_addr.sa.sa_family)) != 0 &&
++ indextoname(listener->tcpfd, if_index, intr_name))
+ {
++ struct all_addr addr;
++ addr.addr.addr4 = tcp_addr.in.sin_addr;
++#ifdef HAVE_IPV6
++ if (tcp_addr.sa.sa_family == AF_INET6)
++ addr.addr.addr6 = tcp_addr.in6.sin6_addr;
++#endif
++
+ for (iface = daemon->interfaces; iface; iface = iface->next)
+ if (iface->index == if_index)
+ break;
+
+- if (!iface)
++ if (!iface && !loopback_exception(listener->tcpfd, tcp_addr.sa.sa_family, &addr, intr_name))
+ client_ok = 0;
+ }
+
+@@ -1422,10 +1431,10 @@ static void check_dns_listeners(fd_set *
+ iface = listener->iface; /* May be NULL */
+ else
+ {
+- /* Check for allowed interfaces when binding the wildcard address:
+- we do this by looking for an interface with the same address as
+- the local address of the TCP connection, then looking to see if that's
+- an allowed interface. As a side effect, we get the netmask of the
++ /* Check for allowed interfaces when binding the wildcard address:
++ we do this by looking for an interface with the same address as
++ the local address of the TCP connection, then looking to see if that's
++ an allowed interface. As a side effect, we get the netmask of the
+ interface too, for localisation. */
+
+ for (iface = daemon->interfaces; iface; iface = iface->next)
+diff -up dnsmasq-2.65/src/dnsmasq.h.local_queries dnsmasq-2.65/src/dnsmasq.h
+--- dnsmasq-2.65/src/dnsmasq.h.local_queries 2013-01-31 09:07:45.000000000 +0100
++++ dnsmasq-2.65/src/dnsmasq.h 2013-01-31 09:10:36.091202196 +0100
+@@ -954,6 +954,7 @@ void create_wildcard_listeners(void);
+ void create_bound_listeners(int die);
+ int is_dad_listeners(void);
+ int iface_check(int family, struct all_addr *addr, char *name);
++int loopback_exception(int fd, int family, struct all_addr *addr, char *name);
+ int fix_fd(int fd);
+ int tcp_interface(int fd, int af);
+ struct in_addr get_ifaddr(char *intr);
+diff -up dnsmasq-2.65/src/forward.c.local_queries dnsmasq-2.65/src/forward.c
+--- dnsmasq-2.65/src/forward.c.local_queries 2012-12-14 12:48:26.000000000 +0100
++++ dnsmasq-2.65/src/forward.c 2013-01-31 09:19:58.087573008 +0100
+@@ -759,10 +759,17 @@ void receive_query(struct listener *list
+
+ /* enforce available interface configuration */
+
+- if (!indextoname(listen->fd, if_index, ifr.ifr_name) ||
+- !iface_check(listen->family, &dst_addr, ifr.ifr_name))
++ if (!indextoname(listen->fd, if_index, ifr.ifr_name))
+ return;
+
++ if (!iface_check(listen->family, &dst_addr, ifr.ifr_name))
++ {
++ if (!option_bool(OPT_CLEVERBIND))
++ enumerate_interfaces();
++ if (!loopback_exception(listen->fd, listen->family, &dst_addr, ifr.ifr_name))
++ return;
++ }
++
+ if (listen->family == AF_INET && option_bool(OPT_LOCALISE))
+ {
+ struct irec *iface;
+@@ -776,7 +783,7 @@ void receive_query(struct listener *list
+ break;
+
+ /* interface may be new */
+- if (!iface)
++ if (!iface && !option_bool(OPT_CLEVERBIND))
+ enumerate_interfaces();
+
+ for (iface = daemon->interfaces; iface; iface = iface->next)
+diff -up dnsmasq-2.65/src/network.c.local_queries dnsmasq-2.65/src/network.c
+--- dnsmasq-2.65/src/network.c.local_queries 2013-01-31 09:07:45.000000000 +0100
++++ dnsmasq-2.65/src/network.c 2013-01-31 09:25:28.669822969 +0100
+@@ -144,7 +144,39 @@ int iface_check(int family, struct all_a
+
+ return ret;
+ }
+-
++
++/* Fix for problem that the kernel sometimes reports the loopback inerface as the
++ arrival interface when a packet originates locally, even when sent to address of
++ an interface other than the loopback. Accept packet if it arrived via a loopback
++ interface, even when we're not accepting packets that way, as long as the destination
++ address is one we're believing. Interface list must be up-to-date before calling. */
++int loopback_exception(int fd, int family, struct all_addr *addr, char *name)
++{
++ struct ifreq ifr;
++ struct irec *iface;
++
++ strncpy(ifr.ifr_name, name, IF_NAMESIZE);
++ if (ioctl(fd, SIOCGIFFLAGS, &ifr) != -1 &&
++ ifr.ifr_flags & IFF_LOOPBACK)
++ {
++ for (iface = daemon->interfaces; iface; iface = iface->next)
++ if (iface->addr.sa.sa_family == family)
++ {
++ if (family == AF_INET)
++ {
++ if (iface->addr.in.sin_addr.s_addr == addr->addr.addr4.s_addr)
++ return 1;
++ }
++#ifdef HAVE_IPV6
++ else if (IN6_ARE_ADDR_EQUAL(&iface->addr.in6.sin6_addr, &addr->addr.addr6))
++ return 1;
++#endif
++
++ }
++ }
++ return 0;
++}
++
+ static int iface_allowed(struct irec **irecp, int if_index,
+ union mysockaddr *addr, struct in_addr netmask, int dad)
+ {
+diff -up dnsmasq-2.65/src/tftp.c.local_queries dnsmasq-2.65/src/tftp.c
+--- dnsmasq-2.65/src/tftp.c.local_queries 2012-12-14 12:48:26.000000000 +0100
++++ dnsmasq-2.65/src/tftp.c 2013-01-31 09:49:44.478008214 +0100
+@@ -61,6 +61,7 @@ void tftp_request(struct listener *liste
+ char *name = NULL;
+ char *prefix = daemon->tftp_prefix;
+ struct tftp_prefix *pref;
++ struct all_addr addra;
+
+ union {
+ struct cmsghdr align; /* this ensures alignment */
+@@ -190,16 +191,19 @@ void tftp_request(struct listener *liste
+
+ name = namebuff;
+
++ addra.addr.addr4 = addr.in.sin_addr;
++
+ #ifdef HAVE_IPV6
+ if (listen->family == AF_INET6)
++ addra.addr.addr6 = addr.in6.sin6_addr;
++#endif
++ if (!iface_check(listen->family, &addra, name))
+ {
+- if (!iface_check(AF_INET6, (struct all_addr *)&addr.in6.sin6_addr, name))
++ if (!option_bool(OPT_CLEVERBIND))
++ enumerate_interfaces();
++ if (!loopback_exception(listen->tftpfd, listen->family, &addra, name))
+ return;
+ }
+- else
+-#endif
+- if (!iface_check(AF_INET, (struct all_addr *)&addr.in.sin_addr, name))
+- return;
+
+ #ifdef HAVE_DHCP
+ /* allowed interfaces are the same as for DHCP */
diff --git a/dnsmasq.spec b/dnsmasq.spec
index ec5f8ab..8573333 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -11,7 +11,7 @@
Name: dnsmasq
Version: 2.65
-Release: 3%{?extraversion}%{?dist}
+Release: 4%{?extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -22,6 +22,8 @@ Source1: %{name}.service
# http://www.thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=22ce550e534...
Patch0: %{name}-2.65-Correct-behaviour-for-TCP-queries-to-allowed-address.patch
+# http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=e25db1f273920d5...
+Patch1: %{name}-2.65-Handle-wrong-interface-for-locally-routed-packets.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +59,7 @@ query/remove a DHCP server's leases.
%setup -q -n %{name}-%{version}%{?extraversion}
%patch0 -p1 -b .CVE-2013-0198
+%patch1 -p1 -b .local_queries
# use /var/lib/dnsmasq instead of /var/lib/misc
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
@@ -134,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/dhcp_*
%changelog
+* Thu Jan 31 2013 Tomas Hozza <thozza(a)redhat.com> - 2.65-4
+- Handle locally-routed DNS Queries (#904940)
+
* Thu Jan 24 2013 Tomas Hozza <thozza(a)redhat.com> - 2.65-3
- build dnsmasq with $RPM_OPT_FLAGS, $RPM_LD_FLAGS explicitly (#903362)
11 years, 4 months
[dnsmasq] update to 2.67test7
by Tomas Hozza
commit fb84f79dafc216cbf675cac0c17d3ece3dc9d7b9
Author: Tomas Hozza <thozza(a)redhat.com>
Date: Tue Jun 11 12:25:52 2013 +0200
update to 2.67test7
- drop merged patch
- use _hardened_build macro instead of hardcoded flags
Signed-off-by: Tomas Hozza <thozza(a)redhat.com>
.gitignore | 1 +
...q-2.67-Fix-failure-to-start-with-ENOTSOCK.patch | 44 --------------------
dnsmasq.spec | 21 ++++-----
sources | 2 +-
4 files changed, 11 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b72b52a..5283997 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ dnsmasq-2.52.tar.lzma
/dnsmasq-2.66rc5.tar.gz
/dnsmasq-2.66.tar.gz
/dnsmasq-2.67test4.tar.gz
+/dnsmasq-2.67test7.tar.gz
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 146a10f..40bbd7f 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -2,16 +2,18 @@
%define releasecandidate 0
%if 0%{testrelease}
%define extrapath test-releases/
- %define extraversion test4
+ %define extraversion test7
%endif
%if 0%{releasecandidate}
%define extrapath release-candidates/
%define extraversion rc5
%endif
+%define _hardened_build 1
+
Name: dnsmasq
Version: 2.67
-Release: 0.2.%{?extraversion}%{?dist}
+Release: 0.3.%{?extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -20,10 +22,6 @@ URL: http://www.thekelleys.org.uk/dnsmasq/
Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex...
Source1: %{name}.service
-# Patches from upstream repo git://thekelleys.org.uk/dnsmasq.git
-# commit cfcad42ff1ddee8e64d120f18016a654152d0215 - Bug #962874
-Patch0: %{name}-2.67-Fix-failure-to-start-with-ENOTSOCK.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel
@@ -58,8 +56,6 @@ query/remove a DHCP server's leases.
%prep
%setup -q -n %{name}-%{version}%{?extraversion}
-%patch0 -p1 -b .enotsock_failure
-
# use /var/lib/dnsmasq instead of /var/lib/misc
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
@@ -76,10 +72,6 @@ sed -i 's|#conf-dir=/etc/dnsmasq.d|conf-dir=/etc/dnsmasq.d|g' dnsmasq.conf.examp
%build
-# We need to compile the daemon with PIE, PIC and FULL RELRO
-RPM_LD_FLAGS="-Wl,-z,relro,-z,now -pie"
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE -DPIE -fPIC"
-
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
make -C contrib/wrt %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
@@ -143,6 +135,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/dhcp_*
%changelog
+* Tue Jun 11 2013 Tomas Hozza <thozza(a)redhat.com> - 2.67-0.3.test7
+- update to 2.67test7
+- drop merged patch
+- use _hardened_build macro instead of hardcoded flags
+
* Fri May 17 2013 Tomas Hozza <thozza(a)redhat.com> - 2.67-0.2.test4
- Fix failure to start with ENOTSOCK (#962874)
diff --git a/sources b/sources
index 91c493a..47cbf2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11a823a512d7aeb1dedee5606a787d6f dnsmasq-2.67test4.tar.gz
+88f0652170247a9bae97177e075ccc43 dnsmasq-2.67test7.tar.gz
11 years
pemensik pushed to rpms/dnsmasq (rawhide). "Update to 2.88
(#2150667) (..more)"
by notifications＠fedoraproject.org
Notification time stamped 2022-12-06 17:36:45 UTC
From 773d89e137bd232c1a49195405af0ebde8d70eac Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik(a)redhat.com>
Date: Dec 06 2022 17:35:48 +0000
Subject: Update to 2.88 (#2150667)
Still keeping underflow patch, even it seems not necessary.
https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2022q4/016767.html
---
diff --git a/.gitignore b/.gitignore
index 21fb205..b0930fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,5 @@ dnsmasq-2.52.tar.lzma
/dnsmasq-2.86.tar.xz.asc
/dnsmasq-2.87.tar.xz
/dnsmasq-2.87.tar.xz.asc
+/dnsmasq-2.88.tar.xz
+/dnsmasq-2.88.tar.xz.asc
diff --git a/dnsmasq-2.77-underflow.patch b/dnsmasq-2.77-underflow.patch
index 9e1b750..155355b 100644
--- a/dnsmasq-2.77-underflow.patch
+++ b/dnsmasq-2.77-underflow.patch
@@ -1,4 +1,4 @@
-From 46b9670a418419d9e04bbe9a0d6c5a85f3c63265 Mon Sep 17 00:00:00 2001
+From 0e581ae7b2d3b181f22f71d5a0b7ace0bf90089f Mon Sep 17 00:00:00 2001
From: Doran Moppert <dmoppert(a)redhat.com>
Date: Tue, 26 Sep 2017 14:48:20 +0930
Subject: [PATCH] google patch hand-applied
@@ -30,19 +30,19 @@ index c498eb1..0eb3873 100644
free(buff);
p += rdlen;
diff --git a/src/rfc1035.c b/src/rfc1035.c
-index 60ef272..93701f6 100644
+index 5c0df56..7e01459 100644
--- a/src/rfc1035.c
+++ b/src/rfc1035.c
-@@ -1411,6 +1411,9 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
+@@ -1425,6 +1425,9 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
size_t len;
int rd_bit = (header->hb3 & HB3_RD);
+ // Make sure we do not underflow here too.
+ if (qlen > (limit - ((char *)header))) return 0;
+
- /* never answer queries with RD unset, to avoid cache snooping. */
- if (ntohs(header->ancount) != 0 ||
- ntohs(header->nscount) != 0 ||
+ if (stale)
+ *stale = 0;
+
--
-2.37.3
+2.38.1
diff --git a/dnsmasq-2.87-dbus-file-reload.patch b/dnsmasq-2.87-dbus-file-reload.patch
deleted file mode 100644
index f1e0d66..0000000
--- a/dnsmasq-2.87-dbus-file-reload.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 930428fb970f4991e5c2933fd5a5d2504c18a551 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon(a)thekelleys.org.uk>
-Date: Mon, 17 Oct 2022 21:15:43 +0100
-Subject: [PATCH] Fix loss of DNS servers on config reload.
-
-A bug, introduced in 2.87, which could result in DNS
-servers being removed from the configuration when reloading
-server configuration from DBus, or re-reading /etc/resolv.conf
-Only servers from the same source should be replaced, but some
-servers from other sources (ie hard coded or another dynamic source)
-could mysteriously disappear.
----
- src/domain-match.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/domain-match.c b/src/domain-match.c
-index f7db0fe..76a1109 100644
---- a/src/domain-match.c
-+++ b/src/domain-match.c
-@@ -683,7 +683,9 @@ int add_update_server(int flags,
- serv->next = NULL;
- }
- break;
-- }
-+ }
-+ else
-+ up = &serv->next;
- }
-
- if (serv)
---
-2.38.1
-
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 7c84848..c2a9a57 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -19,8 +19,8 @@
%bcond_with sourcegit
Name: dnsmasq
-Version: 2.87
-Release: 3%{?extraversion:.%{extraversion}}%{?dist}
+Version: 2.88
+Release: 1%{?extraversion:.%{extraversion}}%{?dist}
Summary: A lightweight DHCP/caching DNS server
License: GPL-2.0-only or GPL-3.0-only
@@ -41,14 +41,6 @@ Patch1: dnsmasq-2.77-underflow.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1852373
Patch2: dnsmasq-2.81-configuration.patch
Patch3: dnsmasq-2.78-fips.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=2148301
-# https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=930428fb970f49...
-Patch4: dnsmasq-2.87-dbus-file-reload.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=2009975
-# replaces/enhances http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=d290630d31f4517...
-#Patch26: dnsmasq-2.86-build_server_array.patch
-
Requires: nettle
@@ -190,6 +182,9 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
%{_mandir}/man1/dhcp_*
%changelog
+* Tue Dec 06 2022 Petr Menšík <pemensik(a)redhat.com> - 2.88-1
+- Update to 2.88 (#2150667)
+
* Fri Nov 25 2022 Petr Menšík <pemensik(a)redhat.com> - 2.87-3
- Fix regression removing config statements on DBus change (#2148301)
diff --git a/sources b/sources
index b290fb4..805f741 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (dnsmasq-2.87.tar.xz) = 965071ff35aed558a661e7f57ff82de170f4ad7fcdd6a4070ce7915c9f5e41450d8d86b2a0c2c30bf52ddc3aaeb22af18bb6da71a1cccb3c409429ef0ef308f3
-SHA512 (dnsmasq-2.87.tar.xz.asc) = 539abb6c5ad50c2e3eaa534dde63be4003b4ed96d471ba9d96fed028d5ddf76111591626de6def823438731c363383282a75139346304f2819aef64a0943a300
+SHA512 (dnsmasq-2.88.tar.xz) = 109ee4513cb25fb0c9ff6f81d696c195a24ffa013847fdc3a507757137fff098248e2b907a87695075405039c4dc0eda40803395a52306ce673ca593cc4f4e00
+SHA512 (dnsmasq-2.88.tar.xz.asc) = 64b12010139b224db879eb007550ddc0ce8152c98aaa9f3a8063b757c49478473d6ff10a6053913400f7eedefceb4fa38e83b8b6f1e3ebe36c78b00e490bd951
https://src.fedoraproject.org/rpms/dnsmasq/c/773d89e137bd232c1a49195405af...
1 year, 6 months