From nobody Tue Nov 08 02:17:15 2022 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 4N5sDq4C5pz4h3TF; Tue, 8 Nov 2022 02:17:15 +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 4N5sDq3LPmz3Z9d; Tue, 8 Nov 2022 02:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667873835; 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=VKtO+4K6T84vJG3t0K0d9x4aG01IkLYNXmWbNh4ZhkI=; b=Xczre0Mv/oX3uVUnYZtt+YkjvEtlGGlEG3ULc4DIVYfDVeWk53fTd77ZyWDKkcp180LlBp iDSIfvJek193fGmE1ElTLhau5uA0N1EHSbbcvLYDBHTPi4EpZ93bQvDb0x3KTyFUndK8OQ 8drh6WhxAat5mVRwD97NxvrCVMYiIg3M3ZFHqcTaScEKhr3Bqgs3Jkitk/KmMdNmuf9B8o a4MaBMTAvdOIEFtBorPIsBA7qEbmDsruGyoAWeYkY9xNEO6R5INjkwbE1IVdPgFLi0DKTt gjWPhhI5lJLLOs7dOx1RBxMTsWfpdTwiSYX7T6OP2baRXsSBOmp7xdKuUVW4JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667873835; a=rsa-sha256; cv=none; b=esJMCQagvMV45CCLRKaopme1ZoYz/A/aVjQctledGzbjcoqVAR56vgi5DqeeC3RCAza3J6 p2EC2r8VbgoKyETffDte+zCHn9OoHspObZEFGZ6MTn8ecmsMJnQr66bU/ORTLXUo4oesIA d725y/wCxOECb/HtkXyYijgvRDbyQXkllFj8bzMMt3E/P+nWmRYGtb+aP+a98YZpDFaJnt mOB/8hOPqKVJVV7jL8SuWufHT80SnWXWax+nbnVNN/wTnYeJFP4kEUQ9yAz3mbrDA4HVZH Zt0J1ARw912j1gIjRqB9XGn9dG28C0hD+cK3h5ygY1pwgoi4St8zwlleEPn2bQ== 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=1667873835; 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=VKtO+4K6T84vJG3t0K0d9x4aG01IkLYNXmWbNh4ZhkI=; b=cONm6RQyva86zNTVv9tudkr7zIZxoPG/fT2Fm0yEearL3c5vEFGTRjWI+3tFf8EwJMx8ot HWyzdQMW12v8qRIZC8i+Csvm7X6W8YC4wihBxLGupkQONVgenxDAMjzMRvNSnEKeRdaw1X 2N7CEMwLVO5329ANHoSGmhdojuLsbMG6eQVDgOCfabnLk4HSGR3lmZRyDFIV1i7ghtUVbs Bx3/B/n6G2eX3iX+i8B80E5S6LyAd1nyee0BoyWOOLzRJD9iaLuglY4PZVIOe7sTm7Bt2w q4EfUBdwcWky3tbm74TGs+Nwa3aQun1dvcUM6wZwI/wIkejujJA2I3Dcknd3UA== 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 4N5sDq2HfpzP4v; Tue, 8 Nov 2022 02:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A82HF3D065521; Tue, 8 Nov 2022 02:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A82HF1j065520; Tue, 8 Nov 2022 02:17:15 GMT (envelope-from git) Date: Tue, 8 Nov 2022 02:17:15 GMT Message-Id: <202211080217.2A82HF1j065520@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 0a6cda3b68cb - 2022Q4 - net/opennx: Fix build on armv7 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 0a6cda3b68cba83831c6e5f9fb434e8f892e7d2a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a6cda3b68cba83831c6e5f9fb434e8f892e7d2a commit 0a6cda3b68cba83831c6e5f9fb434e8f892e7d2a Author: Robert Clausecker AuthorDate: 2022-11-08 01:35:21 +0000 Commit: Nuno Teixeira CommitDate: 2022-11-08 01:41:07 +0000 net/opennx: Fix build on armv7 time_t is a long long on armv7, but OpenNX tries to store time stamps into configuration storage that only eats long variables. Cast to long and cross fingers that nobody is going to use this port past 2036. PR: 267618 Approved by: portmgr (blanket: build fix) MFH: 2022Q4 (cherry picked from commit dceaf660a726b36ac871827a7bbb70b89930f049) --- net/opennx/Makefile | 2 +- net/opennx/files/patch-opennxApp.cpp | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/net/opennx/Makefile b/net/opennx/Makefile index 74975922a905..3ef59e488b5c 100644 --- a/net/opennx/Makefile +++ b/net/opennx/Makefile @@ -1,6 +1,6 @@ PORTNAME= opennx PORTVERSION= 0.16.0.729 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/CI-source diff --git a/net/opennx/files/patch-opennxApp.cpp b/net/opennx/files/patch-opennxApp.cpp new file mode 100644 index 000000000000..a4a805af02e6 --- /dev/null +++ b/net/opennx/files/patch-opennxApp.cpp @@ -0,0 +1,22 @@ +--- opennxApp.cpp.orig 2022-11-07 09:51:49 UTC ++++ opennxApp.cpp +@@ -759,7 +759,7 @@ void opennxApp::checkNxSmartCardSupport() + #endif + if (!fn.FileExists()) + return; +- time_t last_mtime; ++ long last_mtime; + long last_size; + time_t mtime = fn.GetModificationTime().GetTicks(); + long size = fn.GetSize().ToULong(); +@@ -767,8 +767,8 @@ void opennxApp::checkNxSmartCardSupport() + wxConfigBase::Get()->Read(wxT("Config/NxSshSize"), &last_size, 0); + wxConfigBase::Get()->Read(wxT("Config/NxSshSmartCardSupport"), &m_bNxSmartCardSupport, false); + +- if ((mtime != last_mtime) || (size != last_size)) { +- wxConfigBase::Get()->Write(wxT("Config/NxSshStamp"), mtime); ++ if ((mtime != (time_t)last_mtime) || (size != last_size)) { ++ wxConfigBase::Get()->Write(wxT("Config/NxSshStamp"), (long)mtime); + wxConfigBase::Get()->Write(wxT("Config/NxSshSize"), size); + wxString nxsshcmd = fn.GetShortPath(); + nxsshcmd << wxT(" -I 0 -V");