From nobody Tue Mar 8 00:48:17 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 372681A02D9D; Tue, 8 Mar 2022 00:48:18 +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 4KCGsG13xKz4tnK; Tue, 8 Mar 2022 00:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646700498; 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=HBbhp6pR14y03PP7K+c9FHcw5BeZOpN1PSTMEhYyUxQ=; b=GSCgqQ6nb6eiWsTM7Zwc2k7VbIbdLcK4tuagdPwdl8f9FPGtjYhJi9+lv/ZYgY9F/OKVND 7Yx5U1B/7L93YwBG654LiKTCwEgkozADP63nsI2gJzoDpIw8lrf5uR9wZTHADdXynjEKmJ 5+uMLswPkmYc+8If1+eYWf4oZdt+PyBcQ2fSxpWwx2ftc96uQYQfYaGjT8rxydfEbusFuN bLQy7MqAJ5QVhZGNUtumVEnwzV0DBEq1zWdwwzIml0kQNQibPNisTOp1lD9XRBx5YaTtqk SGyT9nZGYaXNejlnCoItOWYb+kvtBgTaRFsROunqk9Rf6xVojlHApKbI8RVTWQ== 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 003901300D; Tue, 8 Mar 2022 00:48:17 +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 2280mHrw003714; Tue, 8 Mar 2022 00:48:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2280mHSP003713; Tue, 8 Mar 2022 00:48:17 GMT (envelope-from git) Date: Tue, 8 Mar 2022 00:48:17 GMT Message-Id: <202203080048.2280mHSP003713@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 4caa00e2142c - main - archivers/libunrar6: Update to 6.1.6 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: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4caa00e2142c3c203cce71b7570ce551794bcffd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646700498; 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=HBbhp6pR14y03PP7K+c9FHcw5BeZOpN1PSTMEhYyUxQ=; b=Bjxtn4UBHc8tcfKiS5vV53tF0s9stFqWQaqHKYxyjvijvl8Xh8/zT9o2Ab2wdpCahmBT4A 6vG9QHOQghcMYaLNANVVYUEOGSSw3mo6M0cOB7gujX7togOs79jQos+0CEeVyC0UAI5SH+ T9bTxIk88kzTx1J1dSBEbptON0/Ss5qJkNyjm/iB4sjUgod07l7zCK3rafz0uFRlRKOFTZ 7xSEEpS1MnzEWlAq2VrlSxr429IW5brWoT7ijOo8Bk+i5lZlT9bLUIfoFn4swZAbpQJ+7x Vx9GBLjfhsnFRNqad6CL9Q9GEHlHVbu1XUnnD5T7LuKUqn1GeZafg8fQ+WwWNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646700498; a=rsa-sha256; cv=none; b=VXMY0mEGVbZuhAQBEcuJLXn+37Ui8Nyg1y7k3Xa1nVP1PmHmu7KCGaOKGLRnFcTC5DkbPY 34xvLGvBViBFIYDUZGf2bjxNvcIkqhdBhzwBUfcKmsCvdfdzWakkJ/9P07WzCFZ3hlRNxi 4RXKNjL8HCuePnM9TwXzSgJxtU66IyabVLVji3MrFKgTYv52XTlrA+dDessriF21BvnIRr cpe+qg6VAc04Xujqv7EunFRlLCtLqWm/4T/NrqaQU8mI/M9IsiykV8QM6EAqB8ntieBWwh LA0OpKKugSrnLCGXayEk8hJhFvUDMAhW5yxts628CKmVPgP1M1BACjqor12+Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=4caa00e2142c3c203cce71b7570ce551794bcffd commit 4caa00e2142c3c203cce71b7570ce551794bcffd Author: Jason E. Hale AuthorDate: 2022-03-08 00:46:33 +0000 Commit: Jason E. Hale CommitDate: 2022-03-08 00:48:11 +0000 archivers/libunrar6: Update to 6.1.6 Bump PORTREVISION on sysutils/fusefs-rar2fs which builds against the source. --- archivers/libunrar6/Makefile | 2 +- archivers/libunrar6/distinfo | 6 +++--- archivers/libunrar6/files/patch-os.hpp | 4 ++-- archivers/libunrar6/files/patch-rijndael.cpp | 28 ++++++++++++++-------------- archivers/libunrar6/files/patch-rijndael.hpp | 6 +++--- sysutils/fusefs-rar2fs/Makefile | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/archivers/libunrar6/Makefile b/archivers/libunrar6/Makefile index 631c3cc273a8..fd40cfa06542 100644 --- a/archivers/libunrar6/Makefile +++ b/archivers/libunrar6/Makefile @@ -1,5 +1,5 @@ PORTNAME= libunrar6 -PORTVERSION= 6.0.7 +PORTVERSION= 6.1.6 CATEGORIES= archivers MASTER_SITES= http://www.rarlab.com/rar/ DISTNAME= unrarsrc-${PORTVERSION} diff --git a/archivers/libunrar6/distinfo b/archivers/libunrar6/distinfo index 710e0cc15a1b..4d84265bcb8c 100644 --- a/archivers/libunrar6/distinfo +++ b/archivers/libunrar6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1645632381 -SHA256 (unrarsrc-6.0.7.tar.gz) = a7029942006cbcced3f3b7322ec197683f8e7be408972ca08099b196c038f518 -SIZE (unrarsrc-6.0.7.tar.gz) = 232903 +TIMESTAMP = 1646677210 +SHA256 (unrarsrc-6.1.6.tar.gz) = 67f4ab891c062218c2badfaac9c8cab5c8bfd5e96dabfca56c8faa3d209a801d +SIZE (unrarsrc-6.1.6.tar.gz) = 236651 diff --git a/archivers/libunrar6/files/patch-os.hpp b/archivers/libunrar6/files/patch-os.hpp index dff506575c08..c0a0c1604907 100644 --- a/archivers/libunrar6/files/patch-os.hpp +++ b/archivers/libunrar6/files/patch-os.hpp @@ -1,6 +1,6 @@ ---- os.hpp.orig 2017-04-28 17:28:46 UTC +--- os.hpp.orig 2022-01-24 07:33:18 UTC +++ os.hpp -@@ -150,6 +150,10 @@ +@@ -168,6 +168,10 @@ #include diff --git a/archivers/libunrar6/files/patch-rijndael.cpp b/archivers/libunrar6/files/patch-rijndael.cpp index 93d60494b85c..19749b3b7403 100644 --- a/archivers/libunrar6/files/patch-rijndael.cpp +++ b/archivers/libunrar6/files/patch-rijndael.cpp @@ -1,7 +1,7 @@ ---- rijndael.cpp.orig 2018-06-24 15:10:31 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. -@@ -111,6 +141,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) -@@ -118,6 +149,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) -@@ -176,6 +216,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 @@ } -@@ -217,6 +258,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) -@@ -279,6 +329,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 @@ } -@@ -314,7 +366,7 @@ void Rijndael::blockDecryptSSE(const byt +@@ -342,7 +394,7 @@ void Rijndael::blockDecryptSSE(const byte *input, size } #endif @@ -125,8 +125,8 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ALGORITHM ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -@@ -454,7 +506,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/libunrar6/files/patch-rijndael.hpp b/archivers/libunrar6/files/patch-rijndael.hpp index e85656700db5..3c375833ef8e 100644 --- a/archivers/libunrar6/files/patch-rijndael.hpp +++ b/archivers/libunrar6/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(); diff --git a/sysutils/fusefs-rar2fs/Makefile b/sysutils/fusefs-rar2fs/Makefile index 054ebdff4044..f45962929338 100644 --- a/sysutils/fusefs-rar2fs/Makefile +++ b/sysutils/fusefs-rar2fs/Makefile @@ -1,9 +1,9 @@ # Created by: Joris Vandalon PORTNAME= rar2fs -PORTREVISION= 1 DISTVERSION= 1.29.5 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs-