dnsmasq: bump to v2.80rc1

53792c9 fix typo
df07182 Update German translation.

Remove local patch 001-fix-typo which is a backport of the above 53792c9

There is no practical difference between our test8 release and this rc
release, but this does at least say 'release candidate'

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
Kevin Darbyshire-Bryant 2018-10-16 08:32:54 +01:00
parent 39e5e17045
commit b8bc672f24
2 changed files with 4 additions and 32 deletions

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq PKG_NAME:=dnsmasq
PKG_VERSION:=2.80test8 PKG_VERSION:=2.80rc1
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/release-candidates
PKG_HASH:=918fbcf385f37df020b23388f3559797b88ca4f4f9e524e31526002fb8de7ccf PKG_HASH:=d7cea3e452059c7d93862f1b6a906dba02d13b2f5a501437cce2ab826e76b63a
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING

View file

@ -1,28 +0,0 @@
From 53792c934cf18f46c5da3ea28786100cb339ad4c Mon Sep 17 00:00:00 2001
From: Martin Schiller <ms@dev.tdt.de>
Date: Mon, 8 Oct 2018 14:55:19 +0200
Subject: [PATCH] fix typo
it was introduced by commit 08933475abd0580cff747e3d1e0db3865207a200
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
---
src/dnsmasq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index aa29bbf..7fd33af 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -242,7 +242,7 @@ int main (int argc, char **argv)
/* Create a serial at startup if not configured. */
#ifdef HAVE_BROKEN_RTC
- if (daemon_>soa_sn == 0)
+ if (daemon->soa_sn == 0)
die(_("zone serial must be configured in --auth-soa"), NULL, EC_BADCONF);
#else
if (daemon->soa_sn == 0)
--
2.18.0