From nobody Sun Feb 9 03:48:50 2025 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 4YrDGC0h0vz5nfqL; Sun, 09 Feb 2025 03:48:51 +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 4YrDGC0D8Kz3csG; Sun, 09 Feb 2025 03:48:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739072931; 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=OfBPtVHvqEoSWLPKzfqTTXFKvfSQveAfkO7F6g1PqC8=; b=kSzzFN74A6iz+Er5vgeC6XGWw6PtCU/ZzREvs0dIs8CdyM7t634hDhVHxU6umWKp2pUUk1 J0+5zJSDitgGL80O6pw5BY9WnpcXDllRMQGCbMlyWC0cBL1rokxD6qqtqlIcIhYe1GOe6Z NdEsZWhkSLq9RFZz1VevKr0MVrAenyGoJWhPRzqKf6JKPHnYijxBgbxD/fNaL82IZAa7Bi lxjEzkQ7kOYxlt/f4OufAoscYf6L+7WHhJ3WQfrJPq+CpxF+sN8TwIfnEyMvksLotNE83c aVu20eFw0pIntG33QvpDSJUEeOSxccUWplFFFvoj+CX0O2/S0AsZuPw4EX2C0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739072931; 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=OfBPtVHvqEoSWLPKzfqTTXFKvfSQveAfkO7F6g1PqC8=; b=feMflhjDJJtvpdaPAToQVCHlNvjeYjzuFquxAHgu9l8o4Yy4bJpW4piYnoF2ix1bEn0DIE 2YKvTWxSZFi7vuz8oHgQtK/gR9NXQEO/lH8hKH/7lRnAaydlXiIxepd8Oa/j5lpIanaGtw jkdaFOxC9iLMyRbWegCY0FEztSNgNU7H5Y222Mv97/8F0g+GpiHxYBzro9/WVlYvSWXVum NksmcerPZ+33Y9HMCuEES0EQk36u6OsfJ3oyqygcq8s4Jo5UPb/K4EYRjxrEl9MM1dLuW6 i/wNacQJWbH/EaOtZFq2jfGRD3amXhKK9ApqN/IpDr0NCyukpnJQvPbMt6upfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739072931; a=rsa-sha256; cv=none; b=lw5hvijHqr/ZfeB1Q+PlvH9n5iBDp9LFWETAxMf/IKihoSIWy+xZN8k4mUkbc93XZxfr71 ssPzlTipvlk0L8FnKZAW/zajPAq/5r1H4ILlT50Sd50XNBLDmvEgjZbPIKmuT1RWYqQbKB QoxKfwk50S/oGau0UlEP/M858v9aXv0AfnNI5E62yTncKypTqLyQ00elshLgmnX7ptENSw n+ckDwVc4sYHLYZXsmxQNSnGQ/8xUZaujWFdMX4HbRQUmRVSFw8JGmmfDiaVrAhfId/5rA UyFGxOzHsq7S/vZB/IBeKHTup0466A5HMWA5fdu2NF1f2iR67kfQIct1INT+/w== 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 4YrDGB6rDxzh2w; Sun, 09 Feb 2025 03:48:50 +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 5193moJg075784; Sun, 9 Feb 2025 03:48:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5193moih075781; Sun, 9 Feb 2025 03:48:50 GMT (envelope-from git) Date: Sun, 9 Feb 2025 03:48:50 GMT Message-Id: <202502090348.5193moih075781@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Hurd Subject: git: cbc58c695e80 - main - comms/wsjtz: Give bin/jt9 an executable stack 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: shurd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbc58c695e8029da1779cb4bc05c70986af1c22d Auto-Submitted: auto-generated The branch main has been updated by shurd: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbc58c695e8029da1779cb4bc05c70986af1c22d commit cbc58c695e8029da1779cb4bc05c70986af1c22d Author: Stephen Hurd AuthorDate: 2024-12-27 22:31:50 +0000 Commit: Stephen Hurd CommitDate: 2025-02-09 03:47:37 +0000 comms/wsjtz: Give bin/jt9 an executable stack jt9 is supposed to have an executable stack, but a bug in lld (now fixed upstream) prevents that. This change explicitly sets the required exectuable stack for jt9. Much simpler than using mprotect et. al. PR: 283670 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48573 --- comms/wsjtz/files/patch-CMakeLists.txt | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/comms/wsjtz/files/patch-CMakeLists.txt b/comms/wsjtz/files/patch-CMakeLists.txt index f174fe7d41ed..012db69b5b5a 100644 --- a/comms/wsjtz/files/patch-CMakeLists.txt +++ b/comms/wsjtz/files/patch-CMakeLists.txt @@ -35,7 +35,7 @@ # # fftw3 single precision library # -@@ -923,7 +941,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") +@@ -923,7 +941,7 @@ set (CMAKE_VISIBILITY_INLINES_HIDDEN ON) # set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") @@ -44,7 +44,7 @@ if (NOT APPLE) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas") -@@ -1169,7 +1187,7 @@ add_executable (wsprsim ${wsprsim_CSRCS}) +@@ -1169,7 +1187,7 @@ add_executable (encode77 lib/77bit/encode77.f90) target_link_libraries (encode77 wsjt_fort wsjt_cxx) add_executable (wsprsim ${wsprsim_CSRCS}) @@ -53,7 +53,7 @@ add_executable (jt4code lib/jt4code.f90) target_link_libraries (jt4code wsjt_fort wsjt_cxx) -@@ -1211,6 +1229,12 @@ endif(WSJT_BUILD_UTILS) +@@ -1211,6 +1229,12 @@ target_link_libraries (ldpcsim240_74 wsjt_fort wsjt_cx endif(WSJT_BUILD_UTILS) @@ -66,7 +66,19 @@ add_executable (fmtave lib/fmtave.f90) add_executable (fcal lib/fcal.f90) -@@ -1601,12 +1625,12 @@ install (PROGRAMS +@@ -1410,6 +1434,11 @@ if (${OPENMP_FOUND} OR APPLE) + else (${OPENMP_FOUND} OR APPLE) + target_link_libraries (jt9 wsjt_fort wsjt_cxx fort_qt) + endif (${OPENMP_FOUND} OR APPLE) ++if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ set_target_properties (jt9 PROPERTIES ++ LINK_FLAGS -Wl,-zexecstack ++ ) ++endif () + + if (WIN32) + # build map65 +@@ -1601,12 +1630,12 @@ install (PROGRAMS RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX} )