From owner-svn-ports-all@freebsd.org Sun Oct 13 15:25:57 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7C459FD6CD; Sun, 13 Oct 2019 15:25:57 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46rlrj1S5mz44ZJ; Sun, 13 Oct 2019 15:25:57 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D7D741ED31; Sun, 13 Oct 2019 15:25:56 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9DFPuGm046869; Sun, 13 Oct 2019 15:25:56 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9DFPu71046867; Sun, 13 Oct 2019 15:25:56 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201910131525.x9DFPu71046867@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 13 Oct 2019 15:25:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514404 - in head/dns/dnsmasq: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head/dns/dnsmasq: . files X-SVN-Commit-Revision: 514404 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2019 15:25:57 -0000 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; +