From nobody Wed Aug 09 13:04:51 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 4RLVdc1jyKz4px5b; Wed, 9 Aug 2023 13:04:52 +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 4RLVdb63Gcz4GHk; Wed, 9 Aug 2023 13:04:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691586291; 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=tIUGsL6jyBdkPz5n0N9mySpnI1mGA0X9qTBDOYvIcVc=; b=SaUwyK8KJeyanzNyoVpK7LbCYSn/W3M/x88A89Bzvs+f/Ef1xMGxz97z6REogVYy52OBYT SUoyaZA8L6pZn6L3wGCRFknGB8hu9K0dUkcU+uR8uqr1l320PWE1iJzrnKrC0HK1vGSpqX 9VrpeNq0q1uJH5XaM1DdJZ5V7BvpZLPyFldGL0i7MJ2DrZYeAVFB7sq31+leckiJAfXK9+ rXYOoMelxkNHKxHEtGQbOFy2LyJiBuA4Oluq1yFV2AG5YAutsylAsk89FSiBT5kGKccKc7 X85LCxZ0ez8UUTjWJAsJc5AJOB976xUDH0iEmzT8jfsNJamJkLK/56vncLlZmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691586291; 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=tIUGsL6jyBdkPz5n0N9mySpnI1mGA0X9qTBDOYvIcVc=; b=nw0WHQIOhRk10mqU8rxz06A9uQChy5OG/nK7bEo1YYpFz6a//lvLCkx/UyhtbFkNKPVVt8 KcCWHKLojz2tleLbR65ucyY7vRPtso+VofOaIf+EsGJRj5rcBiUu/a+f1P183XTqOjQ8IZ AemO+QQbRwMMFEYyDxDySH49K9nz4bwdhNTNrsMQTGcwALjK8orHu/CQCbFwMu5FiCYoVV 2XjGgKIglONZN3i9xb787L3UDJ5/8omW8bPiGRHLytH4SvIDYbzLKduPTPXiFR+WVLgB5u SQS8ZncQctuT/JZGb+SLEAUlhVJhdcUChAbjlUEwsOoFwqo78lneWEabelSTkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691586291; a=rsa-sha256; cv=none; b=F3EB3+2PdAlqPeKOCiJvfBmOquZsZ/QJeBsIPqqh9L9DfDeD5DXi6B8ZqM7Z5AxO0xM6Wt IYRC/YV32lyZO4y3v70SEMbRPC+TBEtjpWodQKrce31t8C0fiEqv3fiMmyHSNFhQm1EOr3 AHq4OgpuDyN/33DKkfFNdvYLFHBEHBoCwbG2hKHZpKUYjZX71gqgK3yJPqag+o+8FMhsaU InbdiUDjr0bFfC4b2EWd8aQ00/4Z+GP3Z6ECIse4wBojBW2KNVZixM+s3LZVCYarsUMqyO z+/JBMNeQn/1sJ3wGAuU6n5AOgqR4VahbHCz7mbWsUDC6ajv8dNVk1MmtPr+Lg== 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 4RLVdb569Jz2Xl; Wed, 9 Aug 2023 13:04:51 +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 379D4pjs090765; Wed, 9 Aug 2023 13:04:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379D4pRA090762; Wed, 9 Aug 2023 13:04:51 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:04:51 GMT Message-Id: <202308091304.379D4pRA090762@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: ac47064e4aac - main - net/aoe: fix build on FreeBSD 12 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac47064e4aac2fedc24270363fbb1b26eaf0b2bd Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac47064e4aac2fedc24270363fbb1b26eaf0b2bd commit ac47064e4aac2fedc24270363fbb1b26eaf0b2bd Author: Chad Fraleigh AuthorDate: 2023-08-08 16:10:56 +0000 Commit: Robert Clausecker CommitDate: 2023-08-09 13:02:39 +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 --- net/aoe/Makefile | 13 ++++++----- net/aoe/files/patch-aoenet.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/net/aoe/Makefile b/net/aoe/Makefile index d31894b2cad7..dc23cddfd980 100644 --- a/net/aoe/Makefile +++ b/net/aoe/Makefile @@ -1,23 +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/ -DEPRECATED= Broken in all supported releases for more than an year -EXPIRATION_DATE= 2023-08-15 +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