From nobody Wed Aug 9 13:08:59 2023 X-Original-To: dev-commits-ports-branches@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 4RLVkN1RQ9z4pxPf; Wed, 9 Aug 2023 13:09: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLVkN0wTmz4JBl; Wed, 9 Aug 2023 13:09:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691586540; 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=uh8cilfVxlE7ALAPYunOthBkiE7FArn14V1iXbswBOQ=; b=bRAToEYc7gYhZqXLS5/YQJhEsGhBjMJxa4L+4Fbz+jUv2eGokOLJQtkSQTL6EsVwuDqbyX pn6pXh9pBD8qPDXYau5Ym/AGj9+NzKz9RaBPKNBLqWsTMH4q7mRCqCh8swpL6DhIhvnGR7 W8B4cte++PQmUP+Ak8ilUNEMojpK8KS+DV4U5a4ExtIvitu86qyEi7EdMyYlq318WOofdn ip4Phs7tX6DNIlwUK6HKal84hIxnmliIVvrxqi7BzMsWHWprTkheSfHYaYU8SnMBEi24i0 wrJJMTTpAOUJv5GYNd2akYlEjxiUANpFX+hl2ceAgyJle6+3BgxbRBI9Zrdcmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691586540; 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=uh8cilfVxlE7ALAPYunOthBkiE7FArn14V1iXbswBOQ=; b=mDz9ja7P4H9NSMaXRDbqOSNtE7KYBNrQ+O8ONtxG3E8MjCWpZQ8iPrGtfugRLajyue3ftn Ejc4UbcX8xco/jbANTAqCt8rUHAfmPUf+nhCIWmL9umpbrnbJnJ8w+CYGOXK0kYz9kp3RL 1EkxYB9ytYKxjvoeD1UoZaCd2iNy17+5u2ANbqdfdngEeSUtgZIRt+LS2fCKMSxp+ScF+h h3IGZ/k+lJzCs1cgHw+O/WTiwk32CPF9ayvtRYDakSeVkYfuGQxLlXuOBUziBv+n2afzP5 e3fgrvCDdKBn8k0VvL6rhz4sYHXF0gWFQfiAZ7F4dO7vYmwSvceCZyVG2U+9Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691586540; a=rsa-sha256; cv=none; b=nNMfkMvA3FB80BuL6P/2YKLbLw2RxWXqEjMoM+OMtpvtHYnizHl7+o+13sP6PStxroCjK/ x3mTthd6nNwl/SdgUzc/7WAhAkxbcx7yufrMjK3KQqxd42IJ5KkCqy9v8tu5VYzdwZwisa AvoImDNUejqeiL5t5q+LbILF2ZfOuXlX5oNn6DsvbskCYNiymLUWOuB/UHEmgLXfLcvyc0 Iv1AyfRS7BcxZGP/mJjdl5rs/mszwy3qsMTemHraWpY4QPX1zQGr5ffFWahfII32eGeDjd oZrvuHYdlcNSfP2NUuqq/Agv17OZWMDA/KT/il7ugi5b6GISatFULCwejaT4og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RLVkM6bp2z2Vv; Wed, 9 Aug 2023 13:08:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379D8xNt092214; Wed, 9 Aug 2023 13:08:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379D8x6m092211; Wed, 9 Aug 2023 13:08:59 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:08:59 GMT Message-Id: <202308091308.379D8x6m092211@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: ee03f6a5f182 - 2023Q3 - net/aoe: fix build on FreeBSD 12 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: ee03f6a5f18264c0f7434322d56fcfb83c8324f4 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee03f6a5f18264c0f7434322d56fcfb83c8324f4 commit ee03f6a5f18264c0f7434322d56fcfb83c8324f4 Author: Chad Fraleigh AuthorDate: 2023-08-08 16:10:56 +0000 Commit: Robert Clausecker CommitDate: 2023-08-09 13:08:21 +0000 net/aoe: fix build on FreeBSD 12 Still broken on FreeBSD 13+, but for a different reason now: aoenet.c:313:22: error: use of undeclared identifier 'ifnet'; did you mean 'ifunit'? IFNET_FOREACH(ifp, &ifnet, if_link) { ^~~~~ ifunit PR: 239891 MFH: 2023Q3 (cherry picked from commit ac47064e4aac2fedc24270363fbb1b26eaf0b2bd) --- net/aoe/Makefile | 11 +++++----- net/aoe/files/patch-aoenet.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/net/aoe/Makefile b/net/aoe/Makefile index bca0fb2b533f..dc23cddfd980 100644 --- a/net/aoe/Makefile +++ b/net/aoe/Makefile @@ -1,21 +1,22 @@ PORTNAME= aoe PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net -MASTER_SITES= http://www.son.org/download/ +MASTER_SITES= https://people.freebsd.org/~sson/aoe/ DISTNAME= ${PORTNAME}-freebsd-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= FreeBSD driver for ATA over Ethernet (AoE) WWW= http://www.coraid.com/support/freebsd/ +LICENSE= BSD2CLAUSE + BROKEN_aarch64= fails to compile: redefinition of frame BROKEN_armv6= fails to compile: implicit declaration of function 'cp15_pmccntr_get' is invalid in C99 BROKEN_armv7= fails to compile: redefinition of frame BROKEN_sparc64= fails to compile: redefinition of frame -BROKEN_FreeBSD_12= no member named 'tqh_first' in 'struct ifnethead' -BROKEN_FreeBSD_13= no member named 'tqh_first' in 'struct ifnethead' -BROKEN_FreeBSD_14= no member named 'tqh_first' in 'struct ifnethead' +BROKEN_FreeBSD_13= use of undeclared identifier 'ifnet' +BROKEN_FreeBSD_14= use of undeclared identifier 'ifnet' USES= kmod diff --git a/net/aoe/files/patch-aoenet.c b/net/aoe/files/patch-aoenet.c index 0fe1fe833a6b..49cdd777a39b 100644 --- a/net/aoe/files/patch-aoenet.c +++ b/net/aoe/files/patch-aoenet.c @@ -207,3 +207,54 @@ case IFT_ETHER: case IFT_FASTETHER: case IFT_GIGABITETHERNET: +--- aoenet.c.orig 2019-08-14 20:53:51.415030000 -0700 ++++ aoenet.c 2019-08-14 20:58:53.326160000 -0700 +@@ -85,6 +85,12 @@ + #endif + #define IFLISTSZ 1024 + ++#if __FreeBSD_version >= 1200000 ++#define IFNET_FOREACH(v, h, e) CK_STAILQ_FOREACH(v, h, e) ++#else ++#define IFNET_FOREACH(v, h, e) TAILQ_FOREACH(v, h, e) ++#endif ++ + static char aoe_iflist[IFLISTSZ]; + + static int sysctl_aoe_iflist(SYSCTL_HANDLER_ARGS); +@@ -304,7 +310,7 @@ + h->ah_cmd = AOECMD_CFG; + + IFNET_RLOCK(); +- TAILQ_FOREACH(ifp, &ifnet, if_link) { ++ IFNET_FOREACH(ifp, &ifnet, if_link) { + if (!is_aoe_netif(ifp)) + continue; + memcpy(h->ah_src, IFPADDR(ifp), sizeof(h->ah_src)); +@@ -506,7 +512,7 @@ + + #ifdef FORCE_NETWORK_HOOK + IFNET_RLOCK(); +- TAILQ_FOREACH(ifp, &ifnet, if_link) { ++ IFNET_FOREACH(ifp, &ifnet, if_link) { + if (!is_aoe_netif(ifp)) { + if (ifp->if_input == aoe_ether_input) + ifp->if_input = old_ether_input; +@@ -531,7 +537,7 @@ + struct ifnet *ifp; + + IFNET_RLOCK(); +- TAILQ_FOREACH(ifp, &ifnet, if_link) { ++ IFNET_FOREACH(ifp, &ifnet, if_link) { + #if __FreeBSD_version >= 1100030 + switch (ifp->if_type) { + #else +@@ -564,7 +570,7 @@ + struct ifnet *ifp; + + IFNET_RLOCK(); +- TAILQ_FOREACH(ifp, &ifnet, if_link) { ++ IFNET_FOREACH(ifp, &ifnet, if_link) { + #if __FreeBSD_version >= 1100030 + switch (ifp->if_type) { + #else