From nobody Fri Jun 16 09:47:45 2023 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 4QjDq54wQmz4dFX6; Fri, 16 Jun 2023 09:47:45 +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 4QjDq54H0Cz4MD8; Fri, 16 Jun 2023 09:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686908865; 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=GWUTMeJGpb3Ykj2o5Qa2GnC0+NcPnLG5MWo8edhxFRQ=; b=gmplCX4hkNLJjF0P8tL2zS3bGHfbj9dIM+5ETQyIXDgqKMFmIoixsOi45HR7qPxnIwFUB4 7GZW3L5a7pl92P0+s4gr1eJJy8gwI0hIqvOPmo+uxhZ9sDJ0QqOICHuv/Kb4QoKsRqyjia y98OLD+5j9HKfEOtWmNTJrSU31IwafJRgx0QXbLMd88kCg+A4ZAQ2QpewRgBiJHuCf6H/u HHB6iZbw6WrCLVs9sSxFdEtQcTHoL1HLAz/r9p3+/4ZgEbShShH5vQ400Ju3a06Ig4cnHM Tq7Zv/tp3AqN0ZSy874zcQpNn67RY/Zr29ZrMeT2ygagj/suyx80ceAId2jqDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686908865; 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=GWUTMeJGpb3Ykj2o5Qa2GnC0+NcPnLG5MWo8edhxFRQ=; b=qA5a/5I4ozn/vAL9iwEfce3f9aGKFzRjzbenhiOiQxPBZ6sbe2nP4zmTtBd3Vzdh/6snik SbJ2NhcH7aCBSNYkRoFytJXtuzbeH4X11lgtk0l+d7CkTrDo96nB/7mn+eGyG1VTVYv89R ujHUHFhTB6cyF4DpQ79eWUXHPEAvibsHmrXOyhTFM2y9VKITZXqeDFeGf+blxel2WuV15v hItAgYyKjbtSlBEzjmUUaoWXJPrB5F0eUPfcB0X7DeeSIwXzDFnLSt64j9MZIeCIMredCa Lzoxg6smBNoJoDTao9ad85DZ44OsORTXvQhLGwJW82wL18/CyEMb0AaWUGsvkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686908865; a=rsa-sha256; cv=none; b=l2wTVYCfXIyas1KO1+vGMvX+cXbrR6JPAYS2YqbJxW5PqVJYJ5iGJsKPbap+1ye/jJp5/G nTonyiGGtclXUqCH6XZPRkbc17YosC+BTC07LlyP4vdtHNaDOZzdalT4LPQKMEa3w9bmKH NowpMZIY5gTvc2vpEjvf9oRchH9as+seOC0MAGU/CuDJtyy11POmAOoPOQVwKEU42PwfYH NbBC8iu8MX7uZuVisCbjwXR1o1AO5g9cBcRuwSk3RNoJHXFmzdlwlXSe6BjutqDYHHi77E zn3aKqsCYrzoKIocrmg7/zcYJWgadZWNKCPhS6fwA7ofXPLBH2Q7i8XzfY+Gkw== 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 4QjDq53K3ZzNZY; Fri, 16 Jun 2023 09:47:45 +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 35G9lj8h081120; Fri, 16 Jun 2023 09:47:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35G9ljQ3081119; Fri, 16 Jun 2023 09:47:45 GMT (envelope-from git) Date: Fri, 16 Jun 2023 09:47:45 GMT Message-Id: <202306160947.35G9ljQ3081119@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: ac8809e41cc3 - main - archivers/libunrar6: Update to 6.2.8 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: ac8809e41cc31bba8873a017d0dd7ff88f94502d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac8809e41cc31bba8873a017d0dd7ff88f94502d commit ac8809e41cc31bba8873a017d0dd7ff88f94502d Author: Jason E. Hale AuthorDate: 2023-06-16 09:46:17 +0000 Commit: Jason E. Hale CommitDate: 2023-06-16 09:47:03 +0000 archivers/libunrar6: Update to 6.2.8 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 | 4 ++-- sysutils/fusefs-rar2fs/Makefile | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/archivers/libunrar6/Makefile b/archivers/libunrar6/Makefile index 1253e645ca82..2e746185298c 100644 --- a/archivers/libunrar6/Makefile +++ b/archivers/libunrar6/Makefile @@ -1,5 +1,5 @@ PORTNAME= libunrar6 -PORTVERSION= 6.1.7 +PORTVERSION= 6.2.8 CATEGORIES= archivers MASTER_SITES= http://www.rarlab.com/rar/ DISTNAME= unrarsrc-${PORTVERSION} diff --git a/archivers/libunrar6/distinfo b/archivers/libunrar6/distinfo index 1a3c449ee7ae..b35936afea0e 100644 --- a/archivers/libunrar6/distinfo +++ b/archivers/libunrar6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653701807 -SHA256 (unrarsrc-6.1.7.tar.gz) = de75b6136958173fdfc530d38a0145b72342cf0d3842bf7bb120d336602d88ed -SIZE (unrarsrc-6.1.7.tar.gz) = 236798 +TIMESTAMP = 1686905718 +SHA256 (unrarsrc-6.2.8.tar.gz) = 1777e3d3b073815ff68a411ddb1ab76d0a4e1f58ecc7080035b27b52967ff911 +SIZE (unrarsrc-6.2.8.tar.gz) = 246249 diff --git a/archivers/libunrar6/files/patch-os.hpp b/archivers/libunrar6/files/patch-os.hpp index c0a0c1604907..ef633fb42257 100644 --- a/archivers/libunrar6/files/patch-os.hpp +++ b/archivers/libunrar6/files/patch-os.hpp @@ -1,6 +1,6 @@ ---- os.hpp.orig 2022-01-24 07:33:18 UTC +--- os.hpp.orig 2023-01-17 16:25:54 UTC +++ os.hpp -@@ -168,6 +168,10 @@ +@@ -173,6 +173,10 @@ #include diff --git a/archivers/libunrar6/files/patch-rijndael.cpp b/archivers/libunrar6/files/patch-rijndael.cpp index 19749b3b7403..92b411d99b5c 100644 --- a/archivers/libunrar6/files/patch-rijndael.cpp +++ b/archivers/libunrar6/files/patch-rijndael.cpp @@ -1,4 +1,4 @@ ---- rijndael.cpp.orig 2022-01-24 07:33:18 UTC +--- rijndael.cpp.orig 2023-01-17 16:25:54 UTC +++ rijndael.cpp @@ -3,6 +3,8 @@ **************************************************************************/ @@ -56,18 +56,18 @@ + EVP_CIPHER_CTX_set_padding(ctx, 0); +#endif +#else // OPENSSL_AES - #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. -@@ -139,6 +169,7 @@ void Rijndael::Init(bool Encrypt,const byte *key,uint + // Check SIMD here instead of constructor, so if object is a part of some + // structure memset'ed before use, these variables are not lost. + #if defined(USE_SSE) +@@ -141,6 +171,7 @@ void Rijndael::Init(bool Encrypt,const byte *key,uint if(!Encrypt) keyEncToDec(); +#endif // OPENSSL_AES } - void Rijndael::blockEncrypt(const byte *input,size_t inputLen,byte *outBuffer) -@@ -146,6 +177,15 @@ void Rijndael::blockEncrypt(const byte *input,size_t i + +@@ -149,6 +180,15 @@ void Rijndael::blockEncrypt(const byte *input,size_t i if (inputLen <= 0) return; @@ -81,9 +81,9 @@ + return; +#else // OPENSSL_AES size_t numBlocks = inputLen/16; - #ifdef USE_SSE + #if defined(USE_SSE) if (AES_NI) -@@ -204,6 +244,7 @@ void Rijndael::blockEncrypt(const byte *input,size_t i +@@ -213,6 +253,7 @@ void Rijndael::blockEncrypt(const byte *input,size_t i input += 16; } Copy128(m_initVector,prevBlock); @@ -91,7 +91,7 @@ } -@@ -245,6 +286,15 @@ void Rijndael::blockDecrypt(const byte *input, size_t +@@ -288,6 +329,15 @@ void Rijndael::blockDecrypt(const byte *input, size_t if (inputLen <= 0) return; @@ -105,9 +105,9 @@ + return; +#else // OPENSSL_AES size_t numBlocks=inputLen/16; - #ifdef USE_SSE + #if defined(USE_SSE) if (AES_NI) -@@ -307,6 +357,8 @@ void Rijndael::blockDecrypt(const byte *input, size_t +@@ -356,6 +406,8 @@ void Rijndael::blockDecrypt(const byte *input, size_t } memcpy(m_initVector,iv,16); @@ -116,7 +116,7 @@ } -@@ -342,7 +394,7 @@ void Rijndael::blockDecryptSSE(const byte *input, size +@@ -426,7 +478,7 @@ void Rijndael::blockDecryptNeon(const byte *input, siz } #endif @@ -125,7 +125,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ALGORITHM ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -@@ -471,7 +523,7 @@ void Rijndael::GenerateTables() +@@ -555,7 +607,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 3c375833ef8e..0e1ccbfbd379 100644 --- a/archivers/libunrar6/files/patch-rijndael.hpp +++ b/archivers/libunrar6/files/patch-rijndael.hpp @@ -1,4 +1,4 @@ ---- rijndael.hpp.orig 2022-01-24 07:33:18 UTC +--- rijndael.hpp.orig 2023-01-17 16:25:54 UTC +++ rijndael.hpp @@ -12,6 +12,13 @@ class Rijndael @@ -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); -@@ -21,6 +28,7 @@ class Rijndael +@@ -31,6 +38,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 68268024cfcd..c75f638c187a 100644 --- a/sysutils/fusefs-rar2fs/Makefile +++ b/sysutils/fusefs-rar2fs/Makefile @@ -1,7 +1,7 @@ PORTNAME= rar2fs DISTVERSION= 1.29.5 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs-