From nobody Tue Nov 08 01:39:51 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 4N5rPg69lTz4gymr; Tue, 8 Nov 2022 01:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N5rPg5kWvz3TyD; Tue, 8 Nov 2022 01:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667871591; 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=Oe7++1rOuSnNXexNiuLbcG1xj7WdY3invRqYgu2BJ6I=; b=nqT7kDMFeC5E6Ng329jLLkd+MVXunAmXd1ya7trYj/xgHQ9XWf3aFJYRNnynWoeufH/ZFI U7IOB/P3KhvmT4OQSLfNqnfGONNfeMyd6MmTCEZo6UlH9hqnG7akshgFhLb3bpUcq17WUH IINlQRAyOoeULzukzt1AQ4Eh4VJCw+NJkGquwlja1H+fCIE3ne6nra9cm5mseFaEDznRcz OWccKQf0tcZ8t3W5hXkVI+eodl73aga/PS1c9GVOR5rnqEjZKWozjtC6tDclWuOsPJt9LU gTLbWv5yOQ8QLgOEqbNP9gi5VvoGzdHbSJqynGBXkfa0sffSyC6KGky9tqbI4w== 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 4N5rPg4prDzNQb; Tue, 8 Nov 2022 01:39:51 +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 2A81dptW008299; Tue, 8 Nov 2022 01:39:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A81dp52008298; Tue, 8 Nov 2022 01:39:51 GMT (envelope-from git) Date: Tue, 8 Nov 2022 01:39:51 GMT Message-Id: <202211080139.2A81dp52008298@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: dceaf660a726 - main - 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/main X-Git-Reftype: branch X-Git-Commit: dceaf660a726b36ac871827a7bbb70b89930f049 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667871591; 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=Oe7++1rOuSnNXexNiuLbcG1xj7WdY3invRqYgu2BJ6I=; b=HJCzYm2vz/M7wdDZAbLFJ0851/7UPPvCnymJz9rVdUP55RQ1drZ2qJYskI6G2stWtSYcpB Bmn6gt2ht9VHkCcxkJPveUfpJJTgjrixX7w7fvQy6eUPHcmPRGNEoD0VBxaVEfKkEmYgKn /UfSPSGoirOeedVttpwEBUZ8PWQBNUjyj/YKZhoP0yb2xFlbk7z6D4TjsxOvQkRNajnt+h 2yEU3eMI7xYbnMQqJ4KAd2Syi83pzP9R+aN75O2onDqDTIHyS6hMDwwQNTVGtli/u+z5Xb 0jA4OvccY22TGvd3ooh82X7I53a1OKzKmGqe7qPMa75dYeZ26hm+R3zox4bsbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667871591; a=rsa-sha256; cv=none; b=gjkBdjEdtU20/A1AieHSoJWBPXyQo2GyVOot6a24iDFCQEf2/tQSUdTm0h7UN0POSxTyiG IEd56PZI4M/zjgxBHNoPBeR9ycITTX98yN+PSWYAsRGTAFlOeF3Bz7KddJqlLTAZnK3T0b 5oUhhP4X1Tv4MkE6MZ2ciKYkUqclA5cK3sqouWSak50v0YWFIZTlJkgQYWKh93zVry/zXp 42tWUQuQY0UmPzru6RUiiTxfJIgipGolDi2AohIy+YnwrrCqUQoOG/1vcAbNhUJsoptUbw xDwoeaBuwMLifulV0yqPa77ClyYCKNoE9fSedawk/eO4Spdo1OZLyIiM3XOE4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=dceaf660a726b36ac871827a7bbb70b89930f049 commit dceaf660a726b36ac871827a7bbb70b89930f049 Author: Robert Clausecker AuthorDate: 2022-11-08 01:35:21 +0000 Commit: Nuno Teixeira CommitDate: 2022-11-08 01:39:37 +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 --- 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");