From owner-svn-ports-all@freebsd.org Sun Mar 21 08:34:46 2021 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 5B6EC56BF8A; Sun, 21 Mar 2021 08:34:46 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F39sy2C8kz4c7j; Sun, 21 Mar 2021 08:34:46 +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 3456A17D01; Sun, 21 Mar 2021 08:34:46 +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 12L8Yj9x092556; Sun, 21 Mar 2021 08:34:45 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12L8YjEm092554; Sun, 21 Mar 2021 08:34:45 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202103210834.12L8YjEm092554@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 21 Mar 2021 08:34:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568907 - in head/dns/dnsmasq-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head/dns/dnsmasq-devel: . files X-SVN-Commit-Revision: 568907 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.34 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, 21 Mar 2021 08:34:46 -0000 Author: mandree Date: Sun Mar 21 08:34:45 2021 New Revision: 568907 URL: https://svnweb.freebsd.org/changeset/ports/568907 Log: dnsmasq-devel: Use original patch from upstream Git to fix compilation. Added: head/dns/dnsmasq-devel/files/patch-src_network.c (contents, props changed) Modified: head/dns/dnsmasq-devel/Makefile Modified: head/dns/dnsmasq-devel/Makefile ============================================================================== --- head/dns/dnsmasq-devel/Makefile Sun Mar 21 08:34:16 2021 (r568906) +++ head/dns/dnsmasq-devel/Makefile Sun Mar 21 08:34:45 2021 (r568907) @@ -4,7 +4,7 @@ PORTNAME= dnsmasq DISTVERSION= 2.85rc1 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 3 # attn - different between -devel and dnsmasq ports! CATEGORIES= dns MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/release-candidates/ \ @@ -107,7 +107,6 @@ LDFLAGS+= -L${LOCALBASE}/lib ${_intllibs} ${ICONV_LIB} post-patch: ${REINPLACE_CMD} -e '/^lua_/s/lua5\.2/lua-${LUA_VER}/' ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e 's/ifr\.ifr_ifindex/ifr.ifr_index/' ${WRKSRC}/src/network.c pre-configure: pretty-print-config .if ${PORT_OPTIONS:MIDN} Added: head/dns/dnsmasq-devel/files/patch-src_network.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dnsmasq-devel/files/patch-src_network.c Sun Mar 21 08:34:45 2021 (r568907) @@ -0,0 +1,34 @@ +commit 1de6bbc10872b67f9f54a2511e6750a6071f5544 +Author: Simon Kelley +Date: Fri Mar 19 22:24:08 2021 +0000 + + Fix FTBS on FreeBSD due to Linux-specific optimisation of if_nametoindex() + +diff --git a/src/network.c b/src/network.c +index cca6ff2..b4a8d7d 100644 +--- a/src/network.c ++++ b/src/network.c +@@ -720,13 +720,17 @@ int enumerate_interfaces(int reset) + to a server is specified by an interface, so cache them. + Update the cache here. */ + for (serv = daemon->servers; serv; serv = serv->next) +- if (strlen(serv->interface) != 0) ++ if (serv->interface[0] != 0) + { +- struct ifreq ifr; +- +- safe_strncpy(ifr.ifr_name, serv->interface, IF_NAMESIZE); +- if (ioctl(param.fd, SIOCGIFINDEX, &ifr) != -1) +- serv->ifindex = ifr.ifr_ifindex; ++#ifdef HAVE_LINUX_NETWORK ++ struct ifreq ifr; ++ ++ safe_strncpy(ifr.ifr_name, serv->interface, IF_NAMESIZE); ++ if (ioctl(param.fd, SIOCGIFINDEX, &ifr) != -1) ++ serv->ifindex = ifr.ifr_ifindex; ++#else ++ serv->ifindex = if_nametoindex(serv->interface); ++#endif + } + + again: