From nobody Thu Jul 18 04:06:48 2024 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 4WPfQ03k2yz5R5D3; Thu, 18 Jul 2024 04:06:48 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WPfQ039r6z4BP3; Thu, 18 Jul 2024 04:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721275608; 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=FA0OZrtHUA5GbsBHMEHKjogqzl7VjLgTQ9tcN5ro5v8=; b=Tv60upPy7CaKivPua6Y8FG2QXcryURO+a73SgINoZgJ99Vb57PM4XLI+M+WD9dmb38rrHV P76GZ7Jq46ww2EnUdrXtTw0DnVFj0zKzgn+6sHSteeWGCNKLBt+AHPnLdIXDn80H4K7IAX 7HOXxR+QG6tAXY5M9td9R5A7O5eECQqfdX1ZnZ5MMSQxabj6NHzNGpDd8zUF4LdJuGCtfn 3GWhM/OTexmWpIQTO4/toB2u00x5ruoMV3A9YBQ2dppOjGAbme2fr5u3qHB6pgw0Tbmy7U TDgcPuFxJbiLayQofTR5vBI3Jgl/lrd4y8jp+i1Yf5fMvz0JWwPnHJfG25sY5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721275608; a=rsa-sha256; cv=none; b=Ew5WtZL04xV/GCV+yHIiPT4PY/rbkfnj1Pi6GLhqAfOFN4IDSrL68MSYubjT8Q6HhHjuHK tjj8YlPVk7y+k4ha21Ek6rHFohWRRe3mUsA8gZakHMF7Os93qgDYimarRKnbDE4e/w53SW jspuNqwVZtKDY6YYaNdoeCnD1yUoJW2rf0YgjoxAL31ra2uEawvrjoshu9rBMdc47UWZ96 yOkyHCmV7sEk7IXnDqQyVgdPcKTokHvs2Dg8njDC+11R/pW15EN6nnQqHAlei/7yDUPXR9 trmKY41BdvAaGVo3yvXXIzDMQBuBUkkF5EHIcSShNDcPgV9Y0+GNWcQXcJIoLg== 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=1721275608; 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=FA0OZrtHUA5GbsBHMEHKjogqzl7VjLgTQ9tcN5ro5v8=; b=YCfylY6MlYgESjH5xY9Lgrx+1r8JTp/iNYgDj+7GA8jbV0+zTNvMaYL7gZzOh3W8V8cyXd t4ZTGTj2qbJ2FJsTzxaAqKjNJOHZtTCh51jX5mpo8z65vSqOrP01mAo450ZUtXi9LzyqwS nRGgaTYRJXWbPquWLeK0UAvzlrv5CFaNPBGEAvZjPKABTVTgPAdGiXn3qTrXS+njQ8X3hU DJm9bIIq1qJQdTARxDCkyrDWI5IWMlfSzYE8+alx01dhgaCUlmoOcQ7y8uEiHYMsLD4GHg 6KW4jYom70WOYZsDMG6thFcsb4qyENych3HmZGxrL0GzONNdSZrzZ0hbRxf8qw== 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 4WPfQ02h25zY8X; Thu, 18 Jul 2024 04:06:48 +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 46I46mDC026048; Thu, 18 Jul 2024 04:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46I46mdo026045; Thu, 18 Jul 2024 04:06:48 GMT (envelope-from git) Date: Thu, 18 Jul 2024 04:06:48 GMT Message-Id: <202407180406.46I46mdo026045@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 6027322e3b91 - main - sysutils/screen: Fix build on __FreeBSD_version >= 1500020 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6027322e3b910f59fb4af0c162d51135392d6c23 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=6027322e3b910f59fb4af0c162d51135392d6c23 commit 6027322e3b910f59fb4af0c162d51135392d6c23 Author: Cy Schubert AuthorDate: 2024-07-18 04:02:10 +0000 Commit: Cy Schubert CommitDate: 2024-07-18 04:06:41 +0000 sysutils/screen: Fix build on __FreeBSD_version >= 1500020 I haven't bisected the real cause but I believe this breakage was likely caused by the recent ssp commits to 15-CURRENT. --- sysutils/screen/files/patch-osdef.h.in | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sysutils/screen/files/patch-osdef.h.in b/sysutils/screen/files/patch-osdef.h.in new file mode 100644 index 000000000000..3b32fe80ed81 --- /dev/null +++ b/sysutils/screen/files/patch-osdef.h.in @@ -0,0 +1,19 @@ +--- osdef.h.in.orig 2023-08-15 17:29:26.000000000 -0700 ++++ osdef.h.in 2024-07-17 20:59:56.936179000 -0700 +@@ -28,6 +28,8 @@ + **************************************************************** + */ + ++#include ++#if defined(__FreeBSD_version) && __FreeBSD_version < 1500020 + extern int printf __P((char *, ...)); + extern int fprintf __P((FILE *, char *, ...)); + extern int sprintf __P((char *, char *, ...)); +@@ -71,6 +73,7 @@ + #else + extern void bcopy __P((char *, char *, int)); + #endif ++#endif /* __FreeBSD_version */ + + #ifdef BSDWAIT + struct rusage; /* for wait3 __P */