From nobody Sun Feb 09 03:41:52 2025 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 4YrD690VJxz5ng5t; Sun, 09 Feb 2025 03:41:53 +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 4YrD6858H1z3bF0; Sun, 09 Feb 2025 03:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739072512; 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=FXhyPkiYTncREvYQ7CrSW/N2qIer7iKhyfeC37y75V8=; b=kYElvLoLaZitEqen/WocZw9n6mwH5pmujflxKq8KIC67m+KrHGpdK3sXYTvz5G0aA/sfOD XXj6VCKVYSr1TB7ozL/4l8lPDpImiqqjpHxnxh/RLJcJ0wMU/ul1g4Bl5A3/83ptb0x4/l sV9rScBEUVHnylXkdT6XOkyXebSp0DgmfDq6D7EHXLvMQCX+E/zdhm2gqkCaCTWCjx8tXb SzoTDS9FnPPDfq1Ryn8uZNnlDFK5H25p78idD1WW3FasePMIexQgIgzwSbRcSC55ELikrI 9DHi832K21ByuKSUCIJs6pZ5kJvlAe6NT0fcBKKK105oGJzdDYoDCB4wRc9IGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739072512; 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=FXhyPkiYTncREvYQ7CrSW/N2qIer7iKhyfeC37y75V8=; b=tNZuMfuHHDzuL+4EL+y3nXOScM1FtgT7vS2lR+6YFx+Vi32vbQlJHJx57OksvR00F+93h+ 74SHVfSBehS91QgoqSbcbdKCGbg7Kt3R75q+B/7/nk58kZiMOiJ4znIG8LrhuVAK9DhmV0 TRUlNmWh+iRHHyez8XI6de3EUmeE7dVOZf40N0l7W2GmRIl9OGX9UfxyDmbV06OIdiJdnX 1eaJHGKt5gLX3x7GqMcrNJlzUcHoxMjpqNRurrgIxW/02T8LoNRMOM/lGvklVZaXOCjWNT Q0fL2jkelPru0GsrwMgP1gRlmwUXuspmQK/M3xXvs/Ecxzio0jyHNyxzD6yyUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739072512; a=rsa-sha256; cv=none; b=ZYuOdAbi04+J9CD83ymm8mBOzPGSGVlxBGccytTmMz/AR0kkGRtn8e545iR9NNL1Nl6qx9 ZWICbizmZu4faGPj4Ck3tPt+Y8AIqlKonjnzquXRHaKa5vPeIMX0gjrDSTXoc4FFQ448/M rZ/9WgjfihRenpIi9sJkEaOgl/5sjUEn2+tvuMWlGz6u9kCh2JqmnNPNMfU+T5t46R8f+L iQiHHHitsHCTkJ4nCTz/bdk5YsKq6eXg4XCHwDHfhC+H2fC3aNliveNdImOR+6mFHvfZHH Jbf+Yh/dT72Od3tJXULiBfXQA27slKWcxlABH/BTWX/K310FaPf5IQAjwWjoCA== 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 4YrD684Hsgzgv9; Sun, 09 Feb 2025 03:41:52 +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 5193fq8o071733; Sun, 9 Feb 2025 03:41:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5193fqrl071730; Sun, 9 Feb 2025 03:41:52 GMT (envelope-from git) Date: Sun, 9 Feb 2025 03:41:52 GMT Message-Id: <202502090341.5193fqrl071730@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: d3169967f129 - main - comms/wsjtx: Give bin/jt9 an executable stack 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: d3169967f129e1512e5e2aea2f46cd22b29dd662 Auto-Submitted: auto-generated The branch main has been updated by shurd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3169967f129e1512e5e2aea2f46cd22b29dd662 commit d3169967f129e1512e5e2aea2f46cd22b29dd662 Author: Stephen Hurd AuthorDate: 2024-12-27 23:53:07 +0000 Commit: Stephen Hurd CommitDate: 2025-02-09 03:41:49 +0000 comms/wsjtx: 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: 278939 Reported by: jeffpc@josefsipek.net Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48572 --- comms/wsjtx/files/wsjtx.patch | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/comms/wsjtx/files/wsjtx.patch b/comms/wsjtx/files/wsjtx.patch index 36015bda3556..621ad7481184 100644 --- a/comms/wsjtx/files/wsjtx.patch +++ b/comms/wsjtx/files/wsjtx.patch @@ -1,5 +1,5 @@ --- wsjtx/wsjtx_config.h.in.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/wsjtx_config.h.in 2023-09-10 09:55:54.397156000 -0400 ++++ wsjtx/wsjtx_config.h.in 2024-12-27 18:49:18.680477000 -0500 @@ -57,17 +57,22 @@ # endif #endif @@ -35,7 +35,7 @@ #ifdef __cplusplus } --- wsjtx/CMakeLists.txt.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/CMakeLists.txt 2023-09-10 09:39:14.606813000 -0400 ++++ wsjtx/CMakeLists.txt 2024-12-27 18:52:10.335420000 -0500 @@ -41,7 +41,7 @@ endif () @@ -81,8 +81,20 @@ add_executable (jt4code lib/jt4code.f90) target_link_libraries (jt4code wsjt_fort wsjt_cxx) +@@ -1402,6 +1402,11 @@ + 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 --- wsjtx/Radio.cpp.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/Radio.cpp 2023-09-10 09:39:14.607286000 -0400 ++++ wsjtx/Radio.cpp 2024-12-27 18:49:18.681599000 -0500 @@ -54,7 +54,8 @@ value *= std::pow (10., scale); if (ok) @@ -103,7 +115,7 @@ value = 0.; *ok = false; --- wsjtx/widgets/FrequencyLineEdit.cpp.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/widgets/FrequencyLineEdit.cpp 2023-09-10 09:39:14.607697000 -0400 ++++ wsjtx/widgets/FrequencyLineEdit.cpp 2024-12-27 18:49:18.681849000 -0500 @@ -39,7 +39,8 @@ FrequencyLineEdit::FrequencyLineEdit (QWidget * parent) : QLineEdit (parent) @@ -115,7 +127,7 @@ auto FrequencyLineEdit::frequency () const -> Frequency --- wsjtx/widgets/FrequencyDeltaLineEdit.cpp.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/widgets/FrequencyDeltaLineEdit.cpp 2023-09-10 09:39:14.608093000 -0400 ++++ wsjtx/widgets/FrequencyDeltaLineEdit.cpp 2024-12-27 18:49:18.682097000 -0500 @@ -39,8 +39,8 @@ FrequencyDeltaLineEdit::FrequencyDeltaLineEdit (QWidget * parent) : QLineEdit (parent) @@ -128,7 +140,7 @@ auto FrequencyDeltaLineEdit::frequency_delta () const -> FrequencyDelta --- wsjtx/CMake/Modules/FindUsb.cmake.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/CMake/Modules/FindUsb.cmake 2023-09-10 09:39:14.608507000 -0400 ++++ wsjtx/CMake/Modules/FindUsb.cmake 2024-12-27 18:49:18.682329000 -0500 @@ -13,25 +13,35 @@ # Usb::Usb - The libusb library # @@ -195,7 +207,7 @@ ) +endif() --- wsjtx/CMake/Modules/FindHamlib.cmake.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/CMake/Modules/FindHamlib.cmake 2023-09-10 09:39:14.608876000 -0400 ++++ wsjtx/CMake/Modules/FindHamlib.cmake 2024-12-27 18:49:18.682526000 -0500 @@ -18,7 +18,9 @@ FIND_LIBRARY hamlib )