From nobody Mon Feb 28 12:50:48 2022 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 E4FFF19F24C4; Mon, 28 Feb 2022 12:50:48 +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 4K6gGc4pKQz3hFX; Mon, 28 Feb 2022 12:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052648; 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=7JsgrYt6GqYVODWEiwHlk006a1KjPFGI6LAns0k+96w=; b=KvD2laAfqNb28L5D0+rD9VgTDMlTKwcpdKKKfvKTBv17lkBFJ47ELTdLsFAK35S38hPcCy KdmZFwxBxNDQ4BRToEeaPdx6MEteGmkCCkCfeP8KLaZNVWUA0lMwLF2Rf3O+Iwe5r11aaa aU9aTz0iwBNycBWH9m0nf9Ae25cC6qpQKh3dPCvN7k+Q7Khk3Ls3GiEaZdAyqpFbBxrNXU QuxRzGB2mQ8UE1Bn2+CtFEWKaCkSsQh9PXBCn4EyQzfvkc/e5YYOjVGjGjosQ+FHbrcdPY /6eSQgS3zQeBrUZOpqT/R7olfo3YKQvDXEZDcm1s61yj8gMegnpYbVucs1j6sA== 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 47BA91B7EE; Mon, 28 Feb 2022 12:50:48 +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 21SComQS059107; Mon, 28 Feb 2022 12:50:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SComhN059106; Mon, 28 Feb 2022 12:50:48 GMT (envelope-from git) Date: Mon, 28 Feb 2022 12:50:48 GMT Message-Id: <202202281250.21SComhN059106@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 33ff8541ea69 - main - archivers/unrar: Update to 6.10 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33ff8541ea695ecc76fd38cc115db4c59e5043e7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052648; 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=7JsgrYt6GqYVODWEiwHlk006a1KjPFGI6LAns0k+96w=; b=d2O4oNCY8sEQAS+XLwqaIgc1FMQwimt90CmHxI437SzkBSEQxYtdCG/pyVelRZZJmtEcsv Bev3UqMrmu/CJgjlmD5yNDNndLu/9CK3SSgIryyjWW1ZPfe5P3nJ+IKha/wckVW5hBro00 46YAKJZtSJ4WoCvOmJRiliGKDK1pwodEdvNgv8hjRrqCXxv/GIj2S9wfPS8h42MhGeWSSg oDrY89OSH94l64Ql+sQrtQk1jTbm4O6HAVyJNCcMCbTpS2KQRG9Se/rdNBTWLd1PvOR5wO sqbEyLAFQJoIZRm/LAw3gT6gVVi3YzP93jSyujXQKCU65HNxq8Xbj+cGQ2/X2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646052648; a=rsa-sha256; cv=none; b=IDysavhSxIPqmrwV+3nZIEQICk8kBcaKd+SMBew9GZWtf9skqZKc6FB8moascBiiAu3TGE cPLRx5ajxmolfKErTWNKuJWyBCilUoNESh7iQS2jdayGIpk07Sxl8oQsM0sK8YYTNrcB/x Be7JEWAVDicMHSzE4AyGi1QI2soMLU+s9w2Pp6qJCQOdoP61ha27MmUq+sFkuyoBlyP1jz hq7+S0xg3JsOVIESpr8K1Z6TBcrmNT6shBzJURAczuueAD+NnZS1GYK+3Fkcx5a+e/FFTK tFD56Wh0ebR98ca7s6+SsRsEMSEEopj545lKR/Kqms8wpVL1enBElld2i1RhPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=33ff8541ea695ecc76fd38cc115db4c59e5043e7 commit 33ff8541ea695ecc76fd38cc115db4c59e5043e7 Author: Po-Chuan Hsieh AuthorDate: 2022-02-28 09:32:52 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-02-28 12:45:56 +0000 archivers/unrar: Update to 6.10 - Remove my LOCAL from MASTER_SITES --- archivers/unrar/Makefile | 7 +++---- archivers/unrar/distinfo | 6 +++--- archivers/unrar/files/patch-os.hpp | 4 ++-- archivers/unrar/files/patch-rijndael.cpp | 28 ++++++++++++++-------------- archivers/unrar/files/patch-rijndael.hpp | 6 +++--- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile index 6a40b3cf9032..555fdec77d84 100644 --- a/archivers/unrar/Makefile +++ b/archivers/unrar/Makefile @@ -1,12 +1,11 @@ # Created by: ache PORTNAME= unrar -PORTVERSION= 6.02 +PORTVERSION= 6.10 PORTEPOCH= 6 CATEGORIES+= archivers -MASTER_SITES= https://rarlab.com/rar/ \ - LOCAL/sunpoet -DISTNAME= unrarsrc-6.0.7 +MASTER_SITES= https://rarlab.com/rar/ +DISTNAME= unrarsrc-6.1.4 MAINTAINER?= sunpoet@FreeBSD.org COMMENT= Extract, view & test RAR archives diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo index b297eb825a48..3dfcf9659c83 100644 --- a/archivers/unrar/distinfo +++ b/archivers/unrar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1623697046 -SHA256 (unrarsrc-6.0.7.tar.gz) = a7029942006cbcced3f3b7322ec197683f8e7be408972ca08099b196c038f518 -SIZE (unrarsrc-6.0.7.tar.gz) = 232903 +TIMESTAMP = 1643970970 +SHA256 (unrarsrc-6.1.4.tar.gz) = c0ed58629243961c3f1ec90c08b11ff93261e568dbfdce2bf3b759ee7a4a3b7c +SIZE (unrarsrc-6.1.4.tar.gz) = 235483 diff --git a/archivers/unrar/files/patch-os.hpp b/archivers/unrar/files/patch-os.hpp index 6e1ef0d20b34..c0a0c1604907 100644 --- a/archivers/unrar/files/patch-os.hpp +++ b/archivers/unrar/files/patch-os.hpp @@ -1,6 +1,6 @@ ---- os.hpp.orig 2019-04-27 20:05:18 UTC +--- os.hpp.orig 2022-01-24 07:33:18 UTC +++ os.hpp -@@ -166,6 +166,10 @@ +@@ -168,6 +168,10 @@ #include diff --git a/archivers/unrar/files/patch-rijndael.cpp b/archivers/unrar/files/patch-rijndael.cpp index 2656ded5d19e..19749b3b7403 100644 --- a/archivers/unrar/files/patch-rijndael.cpp +++ b/archivers/unrar/files/patch-rijndael.cpp @@ -1,7 +1,7 @@ ---- rijndael.cpp.orig 2019-04-27 20:05:20 UTC +--- rijndael.cpp.orig 2022-01-24 07:33:18 UTC +++ rijndael.cpp -@@ -7,6 +7,8 @@ - ***************************************************************************/ +@@ -3,6 +3,8 @@ + **************************************************************************/ #include "rar.hpp" +#ifndef OPENSSL_AES @@ -9,7 +9,7 @@ #ifdef USE_SSE #include #endif -@@ -56,6 +58,7 @@ inline void Copy128(byte *dest,const byt +@@ -75,6 +77,7 @@ inline void Copy128(byte *dest,const byte *src) #endif } @@ -17,12 +17,12 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // API -@@ -63,14 +66,41 @@ inline void Copy128(byte *dest,const byt +@@ -82,14 +85,41 @@ inline void Copy128(byte *dest,const byte *src) Rijndael::Rijndael() { +#ifndef OPENSSL_AES - if (S[0]==0) + if (S5[0]==0) GenerateTables(); +#endif // OPENSSL_AES CBCMode = true; // Always true for RAR. @@ -59,7 +59,7 @@ #ifdef USE_SSE // Check SSE here instead of constructor, so if object is a part of some // structure memset'ed before use, this variable is not lost. -@@ -114,6 +144,7 @@ void Rijndael::Init(bool Encrypt,const b +@@ -139,6 +169,7 @@ void Rijndael::Init(bool Encrypt,const byte *key,uint if(!Encrypt) keyEncToDec(); @@ -67,7 +67,7 @@ } void Rijndael::blockEncrypt(const byte *input,size_t inputLen,byte *outBuffer) -@@ -121,6 +152,15 @@ void Rijndael::blockEncrypt(const byte * +@@ -146,6 +177,15 @@ void Rijndael::blockEncrypt(const byte *input,size_t i if (inputLen <= 0) return; @@ -83,7 +83,7 @@ size_t numBlocks = inputLen/16; #ifdef USE_SSE if (AES_NI) -@@ -179,6 +219,7 @@ void Rijndael::blockEncrypt(const byte * +@@ -204,6 +244,7 @@ void Rijndael::blockEncrypt(const byte *input,size_t i input += 16; } Copy128(m_initVector,prevBlock); @@ -91,7 +91,7 @@ } -@@ -220,6 +261,15 @@ void Rijndael::blockDecrypt(const byte * +@@ -245,6 +286,15 @@ void Rijndael::blockDecrypt(const byte *input, size_t if (inputLen <= 0) return; @@ -107,7 +107,7 @@ size_t numBlocks=inputLen/16; #ifdef USE_SSE if (AES_NI) -@@ -282,6 +332,8 @@ void Rijndael::blockDecrypt(const byte * +@@ -307,6 +357,8 @@ void Rijndael::blockDecrypt(const byte *input, size_t } memcpy(m_initVector,iv,16); @@ -116,7 +116,7 @@ } -@@ -317,7 +369,7 @@ void Rijndael::blockDecryptSSE(const byt +@@ -342,7 +394,7 @@ void Rijndael::blockDecryptSSE(const byte *input, size } #endif @@ -125,8 +125,8 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ALGORITHM ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -@@ -457,7 +509,7 @@ void Rijndael::GenerateTables() - U1[b][0]=U2[b][1]=U3[b][2]=U4[b][3]=T5[i][0]=T6[i][1]=T7[i][2]=T8[i][3]=FFmul0e(b); +@@ -471,7 +523,7 @@ void Rijndael::GenerateTables() + U1[b][0]=U2[b][1]=U3[b][2]=U4[b][3]=T5[I][0]=T6[I][1]=T7[I][2]=T8[I][3]=gmul(b,0xe); } } - diff --git a/archivers/unrar/files/patch-rijndael.hpp b/archivers/unrar/files/patch-rijndael.hpp index e85656700db5..3c375833ef8e 100644 --- a/archivers/unrar/files/patch-rijndael.hpp +++ b/archivers/unrar/files/patch-rijndael.hpp @@ -1,6 +1,6 @@ ---- rijndael.hpp.orig 2018-06-24 15:10:31 UTC +--- rijndael.hpp.orig 2022-01-24 07:33:18 UTC +++ rijndael.hpp -@@ -16,6 +16,13 @@ +@@ -12,6 +12,13 @@ class Rijndael { private: @@ -14,7 +14,7 @@ #ifdef USE_SSE void blockEncryptSSE(const byte *input,size_t numBlocks,byte *outBuffer); void blockDecryptSSE(const byte *input, size_t numBlocks, byte *outBuffer); -@@ -25,6 +32,7 @@ class Rijndael +@@ -21,6 +28,7 @@ class Rijndael void keySched(byte key[_MAX_KEY_COLUMNS][4]); void keyEncToDec(); void GenerateTables();