From nobody Sun Dec 8 14:51:55 2024 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 4Y5nyN0Nqfz5glv5; Sun, 08 Dec 2024 14:51:56 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5nyM71Mtz4xQR; Sun, 8 Dec 2024 14:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733669516; 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=aUx1hEB4HSwvEVeITCNGCImPvOJuIkhW2MK5xOixeQQ=; b=Vdu9kU1LiAVlt0aU2wD8zDpCCvM2UQCtdzZ7ytD8b2sgL8wYEua7rU25VLM+a29bz/HAPP QYjAQBSGfqghNsbn73FJZiGCmwmoNpZRzJLX2R8gpGzYkpywTFvBF2xkK3X3ULCXEC/zrn EqI9IA6DCypKZuBRkmPmYAy1mKsSdbiurX1yLyhf22y8H3shSYBqW53bKfa+6FkAMBmpxN rFwE7GaiamBqCcz0XUPX8g5pblP3MVhBMq6WbqmFHhLdNoSoZq4339BEY9J6wfuL+2hnft H2MEmty89LDBEuiGFXzAA1R1iGS67P+geXqPb0IH+/Bc2impgIRHAUvIQhRcEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733669516; 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=aUx1hEB4HSwvEVeITCNGCImPvOJuIkhW2MK5xOixeQQ=; b=gp2ZxRhFq0pjO77neU0+NPAjxDQYUW5aQ8wMdkTiafdEtFh2whj0W5iTsJBcOr9sjlQ6lv jHSWz1QZ+Elcc6RpHeGZpqDanNCzNssAHrZWTvWtTHF37dE20f26nt2g81uhQZZ2Y1jfio ngZUUkCxKRbDJt8sRHfkobt65KX0726/peRzyaAwnxdDFr70XWNTzXmeKafYNN8HdjHi4y yzzQVMK55K0rqEB7YUEtyKDThX2ALXzZItMB6bqcB8MuwdFCftip8zLMeffhMXY5C503h8 mC/CXapF/imZ0h7uWQz17a01RBUIKHi70GN/HpVWWJ58jJMg/u0xbGNM+tNZKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733669516; a=rsa-sha256; cv=none; b=vUbylmid4yRWJM04Jbs+9NpwCVzHQfZw/ALx4AxclC0G89cM8y3sZSmfzAgF+uZuOVxWY6 duJiGcM51jl1H9pIreF+5PULFHAGZaXJnuML9IlPd6czFc/ASVZ6pQPaA+nGvjyQ5pAFeN 9CdyjOAlgvNjKClPSf/3PJ7GT/hE1bgm10XHwi8MLg3p669Prq046R9m2k7rVuyOtCD2tD N8YYS59O/fYN72bHTjR3VG0fHFdXdk/thStYHesvOowamfwAObYbHMYjT89Lc4lqpj+BV6 kUPQR0WmGFh7epdYODYOD93Tk1thRGmMXU2I68/7d7hMtG9Mb6ISMGV1YTlXFg== 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 4Y5nyM6T98zxK0; Sun, 8 Dec 2024 14:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8EptnO084556; Sun, 8 Dec 2024 14:51:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8EptR7084553; Sun, 8 Dec 2024 14:51:55 GMT (envelope-from git) Date: Sun, 8 Dec 2024 14:51:55 GMT Message-Id: <202412081451.4B8EptR7084553@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: b572f527d642 - main - dns/dnsmasq: Fix --dhcp-relay not working on FreeBSD 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b572f527d6423f318197a98802cb58b8e20929d7 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=b572f527d6423f318197a98802cb58b8e20929d7 commit b572f527d6423f318197a98802cb58b8e20929d7 Author: Matthias Andree AuthorDate: 2024-12-08 14:50:08 +0000 Commit: Matthias Andree CommitDate: 2024-12-08 14:51:51 +0000 dns/dnsmasq: Fix --dhcp-relay not working on FreeBSD PR: 283138 MFH: 2024Q2 Reported by: Harald Schmalzbauer Obtained from: Simon Kelley, https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff;h=5a1f2c577db58ea47727f1b6900c0be25e6db205 --- dns/dnsmasq/Makefile | 3 +-- dns/dnsmasq/files/patch-CHANGELOG | 10 ++++++++++ dns/dnsmasq/files/patch-src_dhcp.c | 12 ++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index 522c420f55a5..e3726648b0ef 100644 --- a/dns/dnsmasq/Makefile +++ b/dns/dnsmasq/Makefile @@ -1,7 +1,7 @@ PORTNAME= dnsmasq DISTVERSION= 2.90 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= dns MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/ \ @@ -31,7 +31,6 @@ CPPFLAGS+= -I${LOCALBASE}/include CONFLICTS_INSTALL= dnsmasq-devel -PATCH_STRIP= -p1 SUB_FILES= pkg-message PORTDOCS= CHANGELOG CHANGELOG.archive FAQ doc.html setup.html diff --git a/dns/dnsmasq/files/patch-CHANGELOG b/dns/dnsmasq/files/patch-CHANGELOG new file mode 100644 index 000000000000..3332566802fa --- /dev/null +++ b/dns/dnsmasq/files/patch-CHANGELOG @@ -0,0 +1,10 @@ +--- CHANGELOG.orig 2024-02-13 13:49:15 UTC ++++ CHANGELOG +@@ -1,3 +1,7 @@ ++post version 2.90 ++ Fix broken dhcp-relay on *BSD. Thanks to Harold for finding ++ this problem. ++ + version 2.90 + Fix reversion in --rev-server introduced in 2.88 which + caused breakage if the prefix length is not exactly divisible diff --git a/dns/dnsmasq/files/patch-src_dhcp.c b/dns/dnsmasq/files/patch-src_dhcp.c new file mode 100644 index 000000000000..24f31c859c3c --- /dev/null +++ b/dns/dnsmasq/files/patch-src_dhcp.c @@ -0,0 +1,12 @@ +--- src/dhcp.c.orig 2024-02-13 13:49:15 UTC ++++ src/dhcp.c +@@ -1121,6 +1121,9 @@ static int relay_upstream4(int iface_index, struct dhc + to.sa.sa_family = AF_INET; + to.in.sin_addr = relay->server.addr4; + to.in.sin_port = htons(relay->port); ++#ifdef HAVE_SOCKADDR_SA_LEN ++ to.in.sin_len = sizeof(struct sockaddr_in); ++#endif + + /* Broadcasting to server. */ + if (relay->server.addr4.s_addr == 0)