cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r514404 (blanket reliability fix)

Browse Source 
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

Approved by:	ports-secteam (blanket)
This commit is contained in:
Matthias Andree 2019-10-13 15:29:16 +00:00
parent 31483fae50
commit e4ac537d44
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2019Q4/; revision=514405
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dns/dnsmasq/Makefile
View File

@ -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 ipv6
MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \

18
dns/dnsmasq/files/patch-src_tftp.c Normal file
View File

@ -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;