From nobody Sun Apr 09 13:40:00 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvYBT0fNsz44S4H; Sun, 9 Apr 2023 13:40:01 +0000 (UTC) (envelope-from git@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 4PvYBS4bCyz4JJ6; Sun, 9 Apr 2023 13:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681047600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tvrk7LxlyZz3LOiDgonDmbcdG6hkXkALBijIiv5wmwU=; b=CKxg56GC0ShKCEK9XyVZtuWbRIARgh3p6FR7Si3Dsw1fVo+xbK/21SnHLYQBncQQGuedvY HEJPMPHtciBjkM2ot7LGb/AjeqKGtVt6wa2wU/cq8cjgU4TmLd6W97NjiY8yLpJZZSL4pb fiiRwN/mSK76KlXJvDUs3fXtikdetYJIuseIik9eqsjdcgmRmf8FnJFWiSK7bEeBwXBexc H9l5FarvuAJdQeF7F+iTxMLbpJ26ONl3yM2pT7Xps6pVDEcPlLI1/SFxhDikcyNjA2/jVH pxGz1jTuw+w6cYK/L7jQ7jcP9A+tw5696Dm6z7NbLweOeyvuUIReeymt3kpi2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681047600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tvrk7LxlyZz3LOiDgonDmbcdG6hkXkALBijIiv5wmwU=; b=bBE4JAhIQmV9oOQb71d4FJHdcqXy+sFi7rrndYk5sbuMnVadzw0DO2A2F3UYCYXx9Vrmvk 6QVpn/tnarvV1BvahGoV15TkQZ3zXBd2PSqAPXjJaPwCcVt4CdyPMHepBX3b3C2W0GVece CftAffUzRrL1Y3brBa3wJmYit+p0KIPWfZfVVOu4DX7OS7GqtTB1QieYislGI1zwASmEKm GGAA8By71y7aJkuie7zg4rrDaRyYjOQut1nEi08rrOf0aC1zvI1AEJFCCeSOx/GU0qsOby tYJKKWwzuSBfWIBGW95mAKpjBVkhmnkNsF8WKNK3rQtK8RhBUqSnZpVkfgOWGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681047600; a=rsa-sha256; cv=none; b=TeaP8nf+htpwmb1umsdAW8jOHH8z59v2if0BWjJ22Lvq/2h+Q6797eY5ctr5++QnuLBEID vsoXcoTL066MtKwhXbCr0FUJ9mnXMT0U5PDdcn+jUfsYmLVkzb4MyTiXAmwGmfjGsz7H/m oAtYc5nmmmwZfyEMBMH3hv1QSGjMgTv8kgnnYEXc2W+8UvDNX06TF2/0lypkd5SHUn5wy4 EDFWigMtF2mtY8G5et54I6kyiEPgZFrdH2qluV8PWg0YQY4qYZWfJCpdBC1yY8K0U3lw5o xAfl3Hbklw4ElYCGuLR9MDNS9Pr1jDQII9Qn5S6zvz0+0dPMXZJLaseATcYHLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PvYBS1545z197R; Sun, 9 Apr 2023 13:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 339De0dL081386; Sun, 9 Apr 2023 13:40:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 339De0hd081385; Sun, 9 Apr 2023 13:40:00 GMT (envelope-from git) Date: Sun, 9 Apr 2023 13:40:00 GMT Message-Id: <202304091340.339De0hd081385@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 440c2c6a2630 - main - net/mDNSResponder: Fix build in IPv6 environment List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 440c2c6a26303e1a1db6e5f5de039d64bac4ff3a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=440c2c6a26303e1a1db6e5f5de039d64bac4ff3a commit 440c2c6a26303e1a1db6e5f5de039d64bac4ff3a Author: Po-Chuan Hsieh AuthorDate: 2023-04-09 13:30:08 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-04-09 13:36:36 +0000 net/mDNSResponder: Fix build in IPv6 environment - Restore patch-mDNSPosix-mDNSPosix.c which was removed by accident in 1790.80.10 update - Bump PORTREVISION for package change PR: 270683, 270689 Reported by: Matthieu Volat , --- net/mDNSResponder/Makefile | 1 + .../files/patch-mDNSPosix-mDNSPosix.c | 38 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile index 34dad890bf47..a22cc563e361 100644 --- a/net/mDNSResponder/Makefile +++ b/net/mDNSResponder/Makefile @@ -1,5 +1,6 @@ PORTNAME= mDNSResponder PORTVERSION= 1790.80.10 +PORTREVISION= 1 CATEGORIES= net dns MASTER_SITES= https://opensource.apple.com/tarballs/mDNSResponder/ diff --git a/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c b/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c new file mode 100644 index 000000000000..7cc9462a8031 --- /dev/null +++ b/net/mDNSResponder/files/patch-mDNSPosix-mDNSPosix.c @@ -0,0 +1,38 @@ +--- mDNSPosix/mDNSPosix.c.orig 2023-01-24 00:43:17 UTC ++++ mDNSPosix/mDNSPosix.c +@@ -1064,7 +1064,10 @@ mDNSlocal int SetupIPv6Socket(int fd) + { + int err; + +- #if defined(IPV6_PKTINFO) ++ #if defined(IPV6_RECVPKTINFO) ++ err = setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &kOn, sizeof(kOn)); ++ if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVPKTINFO"); } ++ #elif defined(IPV6_PKTINFO) + err = setsockopt(fd, IPPROTO_IPV6, IPV6_2292_PKTINFO, &kOn, sizeof(kOn)); + if (err < 0) { err = errno; perror("setsockopt - IPV6_PKTINFO"); } + #else +@@ -1135,7 +1138,7 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, m + // to bind to the socket. Our suggestion was to switch the order in which + // SO_REUSEPORT and SO_REUSEADDR was tested so that SO_REUSEADDR stays on + // top and SO_REUSEPORT to be used only if SO_REUSEADDR doesn't exist. +- #if defined(SO_REUSEADDR) && !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) ++ #if defined(SO_REUSEADDR) && !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && !defined(__FreeBSD__) + err = setsockopt(*sktPtr, SOL_SOCKET, SO_REUSEADDR, &kOn, sizeof(kOn)); + #elif defined(SO_REUSEPORT) + err = setsockopt(*sktPtr, SOL_SOCKET, SO_REUSEPORT, &kOn, sizeof(kOn)); +@@ -1224,7 +1227,13 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, m + if (err == 0) { + err = SetupIPv6Socket(*sktPtr); + } +- #if defined(IPV6_HOPLIMIT) ++ #if defined(IPV6_RECVHOPLIMIT) ++ if (err == 0) ++ { ++ err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &kOn, sizeof(kOn)); ++ if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVHOPLIMIT"); } ++ } ++ #elif defined(IPV6_HOPLIMIT) + if (err == 0) + { + err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_2292_HOPLIMIT, &kOn, sizeof(kOn));