Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Oct 2019 15:25:56 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r514404 - in head/dns/dnsmasq: . files
Message-ID:  <201910131525.x9DFPu71046867@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Sun Oct 13 15:25:55 2019
New Revision: 514404
URL: https://svnweb.freebsd.org/changeset/ports/514404

Log:
  dns/dnsmasq: Fix TFTP regression on recent FreeBSD versions.
  
  Add a patch taken from upstream. Tested successfully on 11.3-RELEASE amd64.
  
  The upstream fix is an extended version of a fix proposed by
  Dave Mueller in the PR.
  
  See also:
  http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2019q4/013412.html
  
  PR:		241068
  Reported by:	Phil Chadwick
  Obtained from:	Simon Kelley, http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=936bd82755e8f75fc09c1e9a67fb390175b157d4
  MFH:		2019Q4

Added:
  head/dns/dnsmasq/files/patch-src_tftp.c   (contents, props changed)
Modified:
  head/dns/dnsmasq/Makefile

Modified: head/dns/dnsmasq/Makefile
==============================================================================
--- head/dns/dnsmasq/Makefile	Sun Oct 13 15:15:08 2019	(r514403)
+++ head/dns/dnsmasq/Makefile	Sun Oct 13 15:25:55 2019	(r514404)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dnsmasq
 DISTVERSION=	2.80
-PORTREVISION=	3	# leave this in even if 0 to avoid PORTEPOCH bumps
+PORTREVISION=	4	# leave this in even if 0 to avoid PORTEPOCH bumps
 PORTEPOCH=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/ \

Added: head/dns/dnsmasq/files/patch-src_tftp.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/dns/dnsmasq/files/patch-src_tftp.c	Sun Oct 13 15:25:55 2019	(r514404)
@@ -0,0 +1,18 @@
+X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blobdiff_plain;f=src%2Ftftp.c;h=c618a2c1eeb73de147ade0cf75de24cbc3cb3f38;hp=435b21687ffa366a7bebf1bfc7905997be5b8f7d;hb=936bd82755e8f75fc09c1e9a67fb390175b157d4;hpb=13a58f9590a7071ad4a8c8f7e4178c29a6b66be3
+
+--- src/tftp.c.orig	2018-10-18 18:21:55 UTC
++++ src/tftp.c
+@@ -74,9 +74,11 @@ void tftp_request(struct listener *listen, time_t now)
+ #if defined(HAVE_LINUX_NETWORK)
+     char control[CMSG_SPACE(sizeof(struct in_pktinfo))];
+ #elif defined(HAVE_SOLARIS_NETWORK)
+-    char control[CMSG_SPACE(sizeof(unsigned int))];
++    char control[CMSG_SPACE(sizeof(struct in_addr)) +
++		 CMSG_SPACE(sizeof(unsigned int))];
+ #elif defined(IP_RECVDSTADDR) && defined(IP_RECVIF)
+-    char control[CMSG_SPACE(sizeof(struct sockaddr_dl))];
++    char control[CMSG_SPACE(sizeof(struct in_addr)) +
++		 CMSG_SPACE(sizeof(struct sockaddr_dl))];
+ #endif
+   } control_u; 
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910131525.x9DFPu71046867>