From nobody Thu Nov 28 09:15:59 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 4XzVzN2G7Fz5fRRP; Thu, 28 Nov 2024 09:16:00 +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 4XzVzN1c9fz4Jp5; Thu, 28 Nov 2024 09:16:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732785360; 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=XUB/XavtI4BEfFpMLGTuHVu5bXGUj8TEMUgsNA9sAYU=; b=SDhslFCCcV6oO3/98kSLG/KgcrGdzlVyUPl7vNwxFb6EUT2OoofDi2SvbBARL6BlstYAoe Yrf4W6xSThA85PLcsgDYafjCt2obXsl8vVzq3MXbBAZ9e0T7psYSnZokXmbtlGhCjep1Uk UrUOv+CF1ewrLaESl4foiCNBNB0szcYKGBbAB9JNvegRxc8+c1h4Lhm+GT3duMrYNWRIZb pEovpGJpCq69fmECKjs3YKypYS8PzpGJCXiga4wAFycYkuch9v6ZHd3CbVSrKU30sgYVXS meyLGSO3x0/Cz+OkGge9BiglG3YaYV+K965AmjLM7YtxzB4F/ctEc0ZDvV+rkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732785360; 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=XUB/XavtI4BEfFpMLGTuHVu5bXGUj8TEMUgsNA9sAYU=; b=tFMp0ZZUU5k+2uMNy9uNqe/nPdkQg2LJV0pCrF1A+E0CcMVYxQIPFPvPduaDInGFv3bvF/ pnJRDFk7d5rDaaWLLhXyYfPUNDzq9fBMpci4VKOrIFEJwkKCgMFKEo+oMKWp5ZZEnHeJbr dp4n5f+GdScrFurmogD4ThIqdzj7j1YWsLAgSgMx5fWH1SgdayIqhkefD6ng5J1x/Y9HBH w7JiKwWRhGK1I4Qs3j8nouox0SDNShOmKGZKW8zsDRADOJTYghT2U5J+ok1HwUSxes5EbP tvjTox8mtQlCYuGW52wzmY3vKnQ88Hoot041tF4B9k6Bb3wsDyfuwNDQ8Ai96A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732785360; a=rsa-sha256; cv=none; b=CQGl7rgQ6YjA35+RbtXfmDFm6ip5hyke6k5vgLMRJLWa9A22i8MT+sOuQ3PWvhGUa1WnYO glFMqwOOCUB6u+weT2/4hUr8U1odT2h/UMeYI/gLNr1tvbJakNqxTVWDAEfLcEt2ml7BSe q+1sCRWPujFOY/98fjfoQzM4G85zV2IFSC6ir1y8GttUfOd1IFspfZuYLjy1uW+kof6HvN zEdtm7zNmbg1k03ZExOqRBKwZm7kB1uwMYmj/V97eSIZLdBpOH/rHnIOJvoI7XJvtkbIqz wqZpdhNxfdNcoLLsdUAsWchRPERpNdqK17rOLU8c52bjqI9BBWsa+FaJq44c5g== 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 4XzVzN131mzYbR; Thu, 28 Nov 2024 09:16:00 +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 4AS9Fxs7038344; Thu, 28 Nov 2024 09:15:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AS9Fxmw038341; Thu, 28 Nov 2024 09:15:59 GMT (envelope-from git) Date: Thu, 28 Nov 2024 09:15:59 GMT Message-Id: <202411280915.4AS9Fxmw038341@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alex Dupre Subject: git: 4ca9ea9d4060 - main - net/realtek-re-kmod: fix build on FreeBSD 15. 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: ale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ca9ea9d4060a4a494456a0e56306bd508fe20e8 Auto-Submitted: auto-generated The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ca9ea9d4060a4a494456a0e56306bd508fe20e8 commit 4ca9ea9d4060a4a494456a0e56306bd508fe20e8 Author: Alex Dupre AuthorDate: 2024-11-28 09:10:44 +0000 Commit: Alex Dupre CommitDate: 2024-11-28 09:10:44 +0000 net/realtek-re-kmod: fix build on FreeBSD 15. I've opted for the simplest patch, the inclusion of if_private.h, instead of a more invasive switch to IfAPI, to keep minimal changes to vendor branch, hoping in a next vendor update to it. --- net/realtek-re-kmod/Makefile | 6 ++++++ net/realtek-re-kmod/files/extra-patch-if__re.c | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/net/realtek-re-kmod/Makefile b/net/realtek-re-kmod/Makefile index 0a6cffedba27..d97e36da6115 100644 --- a/net/realtek-re-kmod/Makefile +++ b/net/realtek-re-kmod/Makefile @@ -19,6 +19,12 @@ GH_ACCOUNT= alexdupre GH_PROJECT= rtl_bsd_drv GH_TAGNAME= ea4ed1e +.include + +.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1500000) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-if__re.c +.endif + PLIST_FILES= ${KMODDIR}/if_re.ko .include diff --git a/net/realtek-re-kmod/files/extra-patch-if__re.c b/net/realtek-re-kmod/files/extra-patch-if__re.c new file mode 100644 index 000000000000..0ca560fcafdb --- /dev/null +++ b/net/realtek-re-kmod/files/extra-patch-if__re.c @@ -0,0 +1,10 @@ +--- if_re.c.orig 2024-06-04 09:39:04 UTC ++++ if_re.c +@@ -67,6 +67,7 @@ __FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v " RE_VERS + + #include + #include ++#include + #include + #include + #include