From nobody Mon Oct 09 07:41:46 2023 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 4S3rZg5ShQz4wtQK; Mon, 9 Oct 2023 07:41:47 +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 4S3rZg14FDz3HmV; Mon, 9 Oct 2023 07:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696837307; 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=RM+9OFBWgKSmW8RT90v8z+VMaBDqXaR2ychSrE8eYXQ=; b=O8JFUjv1+yOhWBWih9jsYQQJIEagQVDj23+gqmyPLdh8DT5HSmhSXptP0nqPpFKN6zwQqm ijHEUJvcWaVlRWCfs+07vYOjLZFMvIHS0zuudNEZE95UHNeOUPWd0+gr9EAVjhMK6w1VnC j8zF2EuCmnonx42DSMA7oCbmV8aBxp/DQTr5ZRDsY3QjMVD+nqS6aJzov4xYJd8MmUKBF4 vh9nM0l4FwLVrWfWbI+9v9i5/mVhMhlZdwx9dB3OVunM5qBAg4icpCbXbyk9Y/1mrKK3XD JVDF1mvGrf9QIoYLKV4epWaPXX15DdtgTGgc8IGDdheOfqU25E3ERjiP3ubfkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696837307; a=rsa-sha256; cv=none; b=uEe7Hp9hDeuHS1MSYl4xkE5Bac8hqDkgdvOlRY4BosGEICDYp5QJ3Sa1vXFKAxPEpavHe4 oSt6/9f58gMAHYmndowy8DSPUMqXmm5AIF/fq+wjHhNv8IQFVCv+VOLi9deGz/7Uv0ve/X fwOWcoaxhYjPSc+PpGZzkeyGGNFgsyaZKCJDKjitQwm/6qgvV/CxeKP2dkBwkHt9ccB7kb pATfvELIcifMMRUGtDZxZoo6bRY4H/blJX7oVUZvUXebeqLtLU85ixE8iNHFicpHM9ajal xne0NjdLSddwGakqVx3B4DTc2XS+fhnDpaYn4uXK/DklIO4pCnYrBBtwEHJ7ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696837307; 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=RM+9OFBWgKSmW8RT90v8z+VMaBDqXaR2ychSrE8eYXQ=; b=XrMFGtaQGVYYmtoh1FnqCgOEqmTn7W8qzIdEC8tHB5G+6LGUzl9JW6rK9T1Qy6AEAVKsOk xed6frNfa3hL5UL++kk7OdRKuSHZMazcMdj6Osp1gI70FR0tmAVoBKJZkHDgSV2hgS+Ocy E9kM1f5C23S+j3kdQx6UuQBNyK7Vx3ibsCs9MaWRcpz/oqRArWnutVzISd1hZrdGa3i2jg X3pi6Ub8HabD/DP4wAarGjHuZ9tG08In6Cd5Bk8Ll001wKXzSoV1+aOsostjk8wih5/QE+ MrTI3P43dYu9jUtUTw+u+kd4zg2wnT2ik5uKALYyEf1V4AzDc+5HfMGmLYJKDw== 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 4S3rZf6rnkznHG; Mon, 9 Oct 2023 07:41:46 +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 3997fkI1020144; Mon, 9 Oct 2023 07:41:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3997fkmw020141; Mon, 9 Oct 2023 07:41:46 GMT (envelope-from git) Date: Mon, 9 Oct 2023 07:41:46 GMT Message-Id: <202310090741.3997fkmw020141@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: f6c3a4092779 - main - net/packetdrill: fix build on armv7, FreeBSD 12 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: f6c3a4092779ca6fc4db3cf5bcb387fa3b268921 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=f6c3a4092779ca6fc4db3cf5bcb387fa3b268921 commit f6c3a4092779ca6fc4db3cf5bcb387fa3b268921 Author: Robert Clausecker AuthorDate: 2023-10-07 04:41:02 +0000 Commit: Robert Clausecker CommitDate: 2023-10-09 07:40:29 +0000 net/packetdrill: fix build on armv7, FreeBSD 12 - make a symbol new in FreeBSD 13 optional - mark a union as packed that will require unaligned access - define TEST_TARGET Approved by: portmgr (build fix blanket) MFH: 2023Q4 --- net/packetdrill/Makefile | 6 ++---- net/packetdrill/files/patch-symbols__freebsd.c | 12 ++++++++++++ net/packetdrill/files/patch-tcp__options.h | 11 +++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/net/packetdrill/Makefile b/net/packetdrill/Makefile index 7b9e5ec9c2ed..eb1e1234c9d4 100644 --- a/net/packetdrill/Makefile +++ b/net/packetdrill/Makefile @@ -8,8 +8,6 @@ WWW= https://github.com/freebsd-net/packetdrill LICENSE= GPLv2 -IGNORE_FreeBSD_12= does not build - USES= bison python:run uidfix USE_GITHUB= yes GH_ACCOUNT= freebsd-net @@ -24,12 +22,12 @@ OPTIONS_DEFINE= DOCS EXAMPLES # XXX Static libraries with PIE are currently unsupported. MAKE_ARGS+= WITHOUT_PIE=true - +TEST_TARGET= tests # 'MD5_Init' is deprecated on OpenSSL 3 CFLAGS+= -Wno-deprecated pre-build: - cd ${WRKSRC} && ${LN} Makefile.FreeBSD Makefile + cd ${WRKSRC} && ${LN} -f Makefile.FreeBSD Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} diff --git a/net/packetdrill/files/patch-symbols__freebsd.c b/net/packetdrill/files/patch-symbols__freebsd.c new file mode 100644 index 000000000000..25950fcd0277 --- /dev/null +++ b/net/packetdrill/files/patch-symbols__freebsd.c @@ -0,0 +1,12 @@ +--- symbols_freebsd.c.orig 2023-10-07 04:37:59 UTC ++++ symbols_freebsd.c +@@ -406,7 +406,9 @@ struct int_symbol platform_symbols_table[] = { + { TCP_NOOPT, "TCP_NOOPT" }, + { TCP_MD5SIG, "TCP_MD5SIG" }, + { TCP_INFO, "TCP_INFO" }, ++#if defined(TCP_STATS) + { TCP_STATS, "TCP_STATS" }, ++#endif + #if defined(TCP_LOG) + { TCP_LOG, "TCP_LOG" }, + #endif diff --git a/net/packetdrill/files/patch-tcp__options.h b/net/packetdrill/files/patch-tcp__options.h new file mode 100644 index 000000000000..a151a453fc98 --- /dev/null +++ b/net/packetdrill/files/patch-tcp__options.h @@ -0,0 +1,11 @@ +--- tcp_options.h.orig 2023-10-07 04:31:15 UTC ++++ tcp_options.h +@@ -166,7 +166,7 @@ struct tcp_option { + struct { + u8 data[MAX_TCP_OPTION_DATA_BYTES]; + } generic; +- }; ++ } __packed; + u32 flags; /* meta information, not going on the wire */ + } __packed; +