From c95b6b67fe0146dab47a44b773e6cf3e7e32a64d Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Wed, 15 Jul 2015 00:57:19 +0000 Subject: [PATCH] Update to new upstream release candidate 2.74rc1. To fix three regressions in 2.73: 1) The meaning of --conf-file without an argument changed from "don't read any conf-file" to "read the default conf-file" 2) A resolv-file which was dangling symlink at startup causes problems, up to and including a segmentation fault. 3) Under some circumstances, dnsmasq can use more file descriptors, and this shows up that the code doesn't handle the limit (normally 1024) in the number of descriptors handled by the select() system call. --- dns/dnsmasq-devel/Makefile | 4 ++-- dns/dnsmasq-devel/distinfo | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile index 2a4bd3819070..336959a0b3d6 100644 --- a/dns/dnsmasq-devel/Makefile +++ b/dns/dnsmasq-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dnsmasq -DISTVERSION= 2.73rc10 +DISTVERSION= 2.74rc1 CATEGORIES= dns ipv6 MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/release-candidates/ PKGNAMESUFFIX= -devel @@ -12,7 +12,7 @@ COMMENT= Lightweight DNS forwarder, DHCP, and TFTP server LICENSE= GPLv2 -IGNORE= build stable version instead, it is newer than this release candidate +#IGNORE= build stable version instead, it is newer than this release candidate CONFLICTS_INSTALL=dnsmasq-2* PORTDOCS= CHANGELOG CHANGELOG.archive FAQ doc.html setup.html diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo index 5cf6af2a7de8..06d095b7867b 100644 --- a/dns/dnsmasq-devel/distinfo +++ b/dns/dnsmasq-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (dnsmasq-2.73rc10.tar.xz) = 7e51f32abecc18306c41116f1f069893e5602acd7ff57bcc80a3678656fcdf2a -SIZE (dnsmasq-2.73rc10.tar.xz) = 485028 +SHA256 (dnsmasq-2.74rc1.tar.xz) = 9a1aeaa341270f6d2f2bdffec2cb8e4f24b0c76445e2742aa63b390116efd963 +SIZE (dnsmasq-2.74rc1.tar.xz) = 486348