Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (af1d6f892e6af12f6a07ec046f09eeb8968982fa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (af1d6f892e6af12f6a07ec046f09eeb8968982fa)
  • Date: Fri, 9 Aug 2019 16:33:41 +0000

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

net/dnsmasq/DETAILS | 1 +
net/dnsmasq/HISTORY | 5 ++++-
net/dnsmasq/PRE_BUILD | 4 +++-
net/dnsmasq/nodata.patch | 31 +++++++++++++++++++++++++++++++
4 files changed, 39 insertions(+), 2 deletions(-)

New commits:
commit ef8bd07b09c2571df511d03a29b7f568ec861067
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

dnsmasq: Apply nodata.patch

nodata.patch: From
https://github.com/themiron/dnsmasq/commit/162e5e0062ce923c494cc64282f293f0ed64fc10
Fix returning NODATA instead of NXDOMAIN, introduced in 2.80
See https://bugzilla.redhat.com/show_bug.cgi?id=1674067

diff --git a/net/dnsmasq/DETAILS b/net/dnsmasq/DETAILS
index 9c976f6..5ca790e 100755
--- a/net/dnsmasq/DETAILS
+++ b/net/dnsmasq/DETAILS
@@ -1,5 +1,6 @@
SPELL=dnsmasq
VERSION=2.80
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.thekelleys.org.uk/dnsmasq/$SOURCE
diff --git a/net/dnsmasq/HISTORY b/net/dnsmasq/HISTORY
index 36ee3c7..92d2fd0 100644
--- a/net/dnsmasq/HISTORY
+++ b/net/dnsmasq/HISTORY
@@ -1,8 +1,11 @@
2019-08-09 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.80
- * PRE_BUILD: Apply nettle-3.5.patch
+ * PRE_BUILD: Apply nettle-3.5.patch and nodata.patch
* nettle-3.5.patch: From
https://github.com/themiron/dnsmasq/commit/6fd9aba7abe1e084123bc5002959350897774ace
Fix compilation against nettle 3.5
+ * nodata.patch: From
https://github.com/themiron/dnsmasq/commit/162e5e0062ce923c494cc64282f293f0ed64fc10
+ Fix returning NODATA instead of NXDOMAIN, introduced in 2.80
+ See https://bugzilla.redhat.com/show_bug.cgi?id=1674067

2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Update dependency; s/gettext/GETTEXT/
diff --git a/net/dnsmasq/PRE_BUILD b/net/dnsmasq/PRE_BUILD
index 7b5605a..c63803c 100755
--- a/net/dnsmasq/PRE_BUILD
+++ b/net/dnsmasq/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
message "${MESSAGE_COLOR}Fixing compilation against nettle
3.5+...${DEFAULT_COLOR}" &&
-patch -p1 < "${SPELL_DIRECTORY}"/nettle-3.5.patch
+patch -p1 < "${SPELL_DIRECTORY}"/nettle-3.5.patch &&
+message "${MESSAGE_COLOR}Fixing returning NODATA instead of NXDOMAIN in
2.80...${DEFAULT_COLOR}" &&
+patch -p1 < "${SPELL_DIRECTORY}"/nodata.patch
diff --git a/net/dnsmasq/nodata.patch b/net/dnsmasq/nodata.patch
new file mode 100644
index 0000000..fba1523
--- /dev/null
+++ b/net/dnsmasq/nodata.patch
@@ -0,0 +1,31 @@
+# From
https://github.com/themiron/dnsmasq/commit/162e5e0062ce923c494cc64282f293f0ed64fc10
+# Fix returning NODATA instead of NXDOMAIN, introduced in 2.80
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1674067
+diff --git a/CHANGELOG b/CHANGELOG
+index 0673fc7..08bfda9 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -21,6 +21,11 @@ version 2.81
+ correct error messages. Thanks to Christian Rosentreter
+ for reporting this.
+
++ Fix bug in DNS non-terminal code, added in 2.80, which could
++ sometimes cause a NODATA rather than an NXDOMAIN reply.
++ Thanks to Sven Mueller and Maciej Żenczykowski for spotting
++ and diagnosing the bug and providing patches.
++
+
+ version 2.80
+ Add support for RFC 4039 DHCP rapid commit. Thanks to Ashram Method
+diff --git a/src/cache.c b/src/cache.c
+index 906f5e1..44c13e4 100644
+--- a/src/cache.c
++++ b/src/cache.c
+@@ -790,6 +790,7 @@ int cache_find_non_terminal(char *name, time_t now)
+ if (!is_outdated_cname_pointer(crecp) &&
+ !is_expired(now, crecp) &&
+ (crecp->flags & F_FORWARD) &&
++ !(crecp->flags & F_NXDOMAIN) &&
+ hostname_isequal(name, cache_get_name(crecp)))
+ return 1;
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (af1d6f892e6af12f6a07ec046f09eeb8968982fa), Eric Sandall, 08/09/2019

Archive powered by MHonArc 2.6.24.

Top of Page