From nobody Sun Aug 18 13:16:20 2024 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 4Wmx7m5yXwz5T626; Sun, 18 Aug 2024 13:16:20 +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 4Wmx7m3bxkz4Y5x; Sun, 18 Aug 2024 13:16:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723986980; 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=ZNKkxrexLaShOpBwiU/H9f8p8mkv66WfoV3X4uBJ94M=; b=N3lfnWDrwmQJNBiwgbokPO5oJK9VkZUXA0S2wIl5+lAIAKQKGnl/Dhg1pFAseQ0+3ESuyF oaY59m9mkSaKdTGM7koZFoX8ndhlL7a6xHmEMdlE82TUHeP9FEjCHpV4Z1t/ANlh9fl6zd 1DKh74vWHEThaolmSpebwHOhhFXfZxlGUZWoqqQwat1yBJeXYofqlzXRc5/Zc0AQHUZKVv 5wap1qs/Eyz61/3uGPQ+5pZ4d/wI3rIlGg4LZ2NpfGI4+f7HLF176txp8QgTwtZ8XjQzO9 V7oeTOa+IzjwvqcS7Y4z0baBqJNINn2ceR2dyH61gZyTNyate0r2X2OAipmyfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723986980; a=rsa-sha256; cv=none; b=GaTknsuXOwZcQfmFgEmS5u5pawSRWXz4UjS43tS8rxKPwpQnlwGVhZAdfe9mJ1LqIONI7o /f/0mzwVVi9ntp6r93UD8dyKrFxlt6YG8YQyw9MZm33ce5O9cyQnRHDfLp7iF1BD41ctrc TbyeXdGLfxtpl+qR/Jw+Ow9XmwmTc7DvfvOvSHmbW0E56B/sAFVCE5MoYmB19lwNftymBl JJJtPtGw336i5xWSkPGfelHn0Ap7uV32M06cUS3ZG1vVCEyzrol4OZ3uqGhfgnFrOo/lFQ OgofKgRm48Bl5KHaKVfzkj4M1rfjUxd2anrYRfvKrnyEBnCudbVV+76PrgXJag== 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=1723986980; 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=ZNKkxrexLaShOpBwiU/H9f8p8mkv66WfoV3X4uBJ94M=; b=t1lp8hmeiC/LJL6CQF6XugwYMEZldU+DKDod44mVvYvsKJ02oTUc5Z7NEDL8ujIMHvMl6N 8OJvCYUigEDk0FQwq/aPge5yEnfoZIMem6d12fbj/RtFISajQRwscv1teAZt1vCg3+L8R3 8cqi2lHrrOeQXvfimQSYKM/Q53xqT/da1OTOWLE7tp24RGsoVDF2NMc8IOMCMwE2EY5Cjh 0R5qRPb48sAAWDZ9NrYxpXRNT97KKlMzEEiPOF/y4mTTOt0VDUZ/SmjBQUBf7qFLfQdP/C z6I5FFYNb25ZIVDdpDZfaHtxAK4+Y5LElslNGKGfM6cp0M9BBPlSxfl5vjwjyg== 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 4Wmx7m3D9gzZth; Sun, 18 Aug 2024 13:16:20 +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 47IDGK2L023387; Sun, 18 Aug 2024 13:16:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47IDGK7O023384; Sun, 18 Aug 2024 13:16:20 GMT (envelope-from git) Date: Sun, 18 Aug 2024 13:16:20 GMT Message-Id: <202408181316.47IDGK7O023384@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: b11a3e9ca791 - 2024Q3 - sysutils/screen*: Fix stack overflow detected on aarch64 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: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q3 X-Git-Reftype: branch X-Git-Commit: b11a3e9ca791495762beb441817267d1906f6725 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b11a3e9ca791495762beb441817267d1906f6725 commit b11a3e9ca791495762beb441817267d1906f6725 Author: Cy Schubert AuthorDate: 2024-08-18 13:08:04 +0000 Commit: Cy Schubert CommitDate: 2024-08-18 13:15:54 +0000 sysutils/screen*: Fix stack overflow detected on aarch64 Fix, SCREEN[1304]: stack overflow detected; terminated kernel: pid 1304 (screen-4.9.1), jid 0, uid 0: exited on signal 6 (core dumped) PR: 280868 Tested by: Andreas Schwarz (cherry picked from commit 92b0c9cdbef548739d6209165c3e1731761d010d) --- sysutils/screen-devel/Makefile | 4 ++-- sysutils/screen/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/screen-devel/Makefile b/sysutils/screen-devel/Makefile index 6fd8da0df5e8..fef590ffacc8 100644 --- a/sysutils/screen-devel/Makefile +++ b/sysutils/screen-devel/Makefile @@ -50,8 +50,8 @@ CPE_VENDOR= gnu .include -.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || \ - ${ARCH:Mpowerpc*} +.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || \ + ${ARCH} == i386 || ${ARCH:Mpowerpc*} SSP_CFLAGS?= -fno-stack-protector .endif diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index d16f1ea3e05f..52dfb4145ab1 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -52,8 +52,8 @@ CPE_VENDOR= gnu .include -.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || \ - ${ARCH:Mpowerpc*} +.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || \ + ${ARCH} == i386 || ${ARCH:Mpowerpc*} SSP_CFLAGS?= -fno-stack-protector .endif