From nobody Fri Dec 20 14:43:32 2024 X-Original-To: dev-commits-ports-all@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 4YF9C90l17z5MdqZ; Fri, 20 Dec 2024 14:43:33 +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 4YF9C85NVFz4mN6; Fri, 20 Dec 2024 14:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734705812; 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=eNTpTluPTxXCTtb2Se4U5SAZn22tnND0ISJt2tDc/WI=; b=Aa6fUBvKrIUlcLahBIZ/GarAP8p+YBZz+E7Y3bhAS389JNIsqmhNOakG1x8lrgBrz3yvp9 Jm5d2WT9PadZzAbhebzFd0vh1LMshd9d5bHaIWNozspXGGM0hamGNNc8pELkrMOinnMKTx kuWJ0TcH+Tgit79xQ2z/VQ6BtFNV/FnO5Klb0JYd3Lc7HiXsnEvzJNAWZNNOBpI+6C5CLr foXnFShsdE5Vjha2eZggadapBhrCXpxQwOEoLC9O1L0x3yJZrYDq75SUnlWlC+hp9kc2Wd +ljBPO04qN+p8AzF4LgpdRfvhvDFOMCs/B9rSydcREG7+dQT61Qm9l+Q7R4v5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734705812; 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=eNTpTluPTxXCTtb2Se4U5SAZn22tnND0ISJt2tDc/WI=; b=ANhddoFoonqHVQLwc8wEvSMTaRcNWjSstBHkVMHm8STf2MxkglABX8GC+j0D0rEFyQLP7w QRHu2jBtUkDhVGUfq5bt2KOPrRr6EebGWz6VU2ottDjzxVFtAvBtRDDHEUUlS3YnQlSz1J IcAVQQy22sDNAzO8REsRzI7v2uv5qwwy4vWiqKw5wEvImoNj1Z4KHPyu9E9j3aLhxuW9PV IeggBN0RCeiv4WWKJy5hVfDsIye22iO95etXnygxqVa4g60XqXuB4yAHsU1mWByNjZvWXl 250Y2kPpkkPnVh4ztiKZ2h+vQYeXeY6WMlqKnqrCuNVRbOJfe0o9oxNmijWxSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734705812; a=rsa-sha256; cv=none; b=QJyNaSAPxAyFT5EbHWnW8h5haewYxTpzezD3k7IFYlKizfuTvDBlhpLghGVrruEr82ikf1 sSi2en4jEZPvxpW4OK/wg8Z7gC9NEKG2Ac4qcnYrNXPVuzggKAPngW0orfXVQlnkKNV5z9 ECjCHfYRjL2X/OkKCe5Wb/AOEMeNC33XeDWbLgDZMeAu+OWvWJeIB70ZeOUqozvJDC7Njs cuRWXgf3iASnTvcx5peEgxALdM9kLKfjzSTMJkusDMynoTWWb6Znaf8w6mJ4FpxNgedTrj Y54FGfSunvWFQp1wxpgvFNu47LMjzn6gpGisbBkQkljWC6/46rVcCz8IDabnAQ== 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 4YF9C850LgzjRm; Fri, 20 Dec 2024 14:43:32 +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 4BKEhW7X013511; Fri, 20 Dec 2024 14:43:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BKEhWpX013508; Fri, 20 Dec 2024 14:43:32 GMT (envelope-from git) Date: Fri, 20 Dec 2024 14:43:32 GMT Message-Id: <202412201443.4BKEhWpX013508@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: 95b16c6c1e04 - main - dns/dnsmasq-devel: update to v2.91test1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 95b16c6c1e04a5434202815965b9bce7d764b56e Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=95b16c6c1e04a5434202815965b9bce7d764b56e commit 95b16c6c1e04a5434202815965b9bce7d764b56e Author: Matthias Andree AuthorDate: 2024-12-20 14:41:28 +0000 Commit: Matthias Andree CommitDate: 2024-12-20 14:43:28 +0000 dns/dnsmasq-devel: update to v2.91test1 ChangeLog: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob;f=CHANGELOG;h=8982a93cb95c074e652a19b6f2a6a33dfffba04a;hb=5d32f35bdcd6105acc206e0afd0516dee2dd1439 Note the test I've added has not seen serious testing, it's just to fix compiles, and might impair how we enumerate interfaces. I've sent it upstream to the dnsmasq-discuss@ mailing list so Simon or other people are aware and can provide a different fix. This is a TEST release, treat it as such. --- dns/dnsmasq-devel/Makefile | 10 ++++------ dns/dnsmasq-devel/distinfo | 6 +++--- dns/dnsmasq-devel/files/patch-bpf.c | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile index a853e2e25652..fae20417cefa 100644 --- a/dns/dnsmasq-devel/Makefile +++ b/dns/dnsmasq-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= dnsmasq -DISTVERSION= 2.90test4 # remember to bump PORTEPOCH when going from test to rc! +DISTVERSION= 2.91test1 # remember to bump PORTEPOCH when going from test to rc! # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: -PORTREVISION= 1 +PORTREVISION= 0 PORTEPOCH= 5 CATEGORIES= dns #MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/release-candidates/ \ @@ -16,8 +16,7 @@ WWW= https://www.thekelleys.org.uk/dnsmasq/doc.html LICENSE= GPLv2 -DEPRECATED= Short-lived test branch, to be removed after v2.90 release -IGNORE= please use dns/dnsmasq, which is newer +DEPRECATED= Short-lived test branch, to be removed after v2.91 release USES= cpe shebangfix tar:xz CPE_VENDOR= thekelleys @@ -36,7 +35,6 @@ CFLAGS+= -Wall -Wno-unused-function -Wno-unused-parameter \ CPPFLAGS+= -I${LOCALBASE}/include CONFLICTS_INSTALL= dnsmasq-2* -PATCH_STRIP= -p1 SUB_FILES= pkg-message PORTDOCS= CHANGELOG CHANGELOG.archive FAQ doc.html setup.html @@ -106,7 +104,7 @@ USE_RC_SUBR= dnsmasq LDFLAGS+= -L${LOCALBASE}/lib ${_intllibs} ${ICONV_LIB} post-patch: - ${REINPLACE_CMD} -e '/^lua_/s/lua/lua-${LUA_VER}/' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e '/^LUA /s/lua/lua-${LUA_VER}/' ${WRKSRC}/Makefile pre-configure: pretty-print-config .if ${PORT_OPTIONS:MIDN} diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo index 0eac2535b367..d83bf3e06fb4 100644 --- a/dns/dnsmasq-devel/distinfo +++ b/dns/dnsmasq-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707806733 -SHA256 (dnsmasq-2.90test4.tar.xz) = 935177bede763c2a433b1a5700055a93f88913a6efadd461c4905c474d7cd69d -SIZE (dnsmasq-2.90test4.tar.xz) = 593728 +TIMESTAMP = 1734696522 +SHA256 (dnsmasq-2.91test1.tar.xz) = 8687368b8e8632ffdc2e19a83197ac4aca703cb002e55fc8ac4017dbdc9d87ec +SIZE (dnsmasq-2.91test1.tar.xz) = 570964 diff --git a/dns/dnsmasq-devel/files/patch-bpf.c b/dns/dnsmasq-devel/files/patch-bpf.c new file mode 100644 index 000000000000..9f2082b5b0ac --- /dev/null +++ b/dns/dnsmasq-devel/files/patch-bpf.c @@ -0,0 +1,19 @@ +--- src/bpf.c.orig 2024-12-19 00:36:42 UTC ++++ src/bpf.c +@@ -100,14 +100,14 @@ int arp_enumerate(void *parm, callback_t callback) + #endif /* defined(HAVE_BSD_NETWORK) && !defined(__APPLE__) */ + + +-int iface_enumerate(int family, void *parm, int (*callback)()) ++int iface_enumerate(int family, void *parm, callback_t callback) + { + struct ifaddrs *head, *addrs; + int errsave, fd = -1, ret = 0; + + if (family == AF_UNSPEC) + #if defined(HAVE_BSD_NETWORK) && !defined(__APPLE__) +- return arp_enumerate(parm, callback.af_unspec); ++ return arp_enumerate(parm, callback); + #else + return 0; /* need code for Solaris and MacOS*/ + #endif