From nobody Sun Feb 5 15:53:59 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 4P8v875vL3z3kSjD; Sun, 5 Feb 2023 15:53:59 +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 4P8v873djrz479g; Sun, 5 Feb 2023 15:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675612439; 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=LRERsm4A+ZyOyPwTz/51mGnOXOySM8c7sSq/4UtlIhg=; b=OBF0I0dLhbPrSYoZe4U/SCq6JRcs9wsZon9WZR/ZRkxahd2gzYh8aFSGnjO8ejdUuJp/sU XjFjChIWOKoPMKg66lL0MQ3QgV/RUV+UAix35+zltMA6EsgtuOCdGWVGPb+f6MAbCWFkGx l6UU8xDaCdnVB1k+dfZ0jQG7vEfnZbQkebE3zeE/1xDDzAFFpSCiEyVABFKusrb2AWRltP T1mJKtNyGkxSvsCLTST/Z5cDgpNHm7JWEnAObMo+tEh51C6BU7t9GO3QGY6zwgcA4wuaXC YHX1Ii2GijvIz/98hLe1zH4Jy2csTXaxcZcq77/mKqTk/Yq8qjsaPuP26f41cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675612439; 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=LRERsm4A+ZyOyPwTz/51mGnOXOySM8c7sSq/4UtlIhg=; b=CBD1h+jTDM918I/v9U7Ga6RS6eciyc9d5/PZ7z2VDWcf867AESi2fFPWiBEA4u+BDI7rm9 uVnMg5nVF8wT0A8vuOVtqwj4OOZ/1HyaYs1BWbR3p82+QWdxYYNSbiSeMGav/0KiBFRWH1 l239qqfcMjDcwV8KvLU04rd/++8+T83xKL0RTfn8sxHLrouvNsnDH07anrlha3bmu+B70t bTGXqB0YV1ELU/rPQBIJsd+OAEYqNRtB3SeOCEWvtz1SbP9VYeFxD+6ARU+5epc8zREM0f n7PRsRYTY7b/UE+XSb6Wz9hlxLlxNlDEPMlAId+HcfhczrOlVyTq+CWkTRXh0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675612439; a=rsa-sha256; cv=none; b=XhNX5zJ67M0ltVb3ECdfKjgKIl0RDAi8ObRwiiXAOSdjZURIjBW6gZlje55Glitszh6mOu UIJyfjoXshEmcG4uK7J/1E02EPM529eNjUO1cPVmUrBCUQg2zNj2XfNFCVwj4Y3tFFAPbu ghU1qGqwrZg8yMbbDdma47b0aab6GI2rtkQeqeGcdXcbO+gdG3Ap7bAOU1Nv2aNxT5eSGR Obhr5UL9A7XIy0QwFWTDl5sh2WY9f3iww2/+jj6sbIfbp5HHlw0hkcYL6Gi88B6C/Ig4xp qYkTEdUv6L6mVEer2Mu34J3GlwSJiuWd7YKIlCiQv+q3K3lvjOx7KMhlnE8euA== 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 4P8v872kqgz10XW; Sun, 5 Feb 2023 15:53:59 +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 315Frx0X028781; Sun, 5 Feb 2023 15:53:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 315FrxE1028780; Sun, 5 Feb 2023 15:53:59 GMT (envelope-from git) Date: Sun, 5 Feb 2023 15:53:59 GMT Message-Id: <202302051553.315FrxE1028780@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: 10643b29365c - main - archivers/unrar: Update to 6.20 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: 10643b29365c90b777b76134df5ea3be3b92e8aa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=10643b29365c90b777b76134df5ea3be3b92e8aa commit 10643b29365c90b777b76134df5ea3be3b92e8aa Author: Po-Chuan Hsieh AuthorDate: 2023-02-05 15:17:17 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-02-05 15:47:41 +0000 archivers/unrar: Update to 6.20 - Update MASTER_SITES: https://rarlab.com/ redirects to https://www.rarlab.com/ Changes: https://www.rarlab.com/rarnew.htm --- archivers/unrar/Makefile | 6 +++--- archivers/unrar/distinfo | 6 +++--- archivers/unrar/files/patch-os.hpp | 4 ++-- archivers/unrar/files/patch-rijndael.cpp | 28 ++++++++++++++-------------- archivers/unrar/files/patch-rijndael.hpp | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile index 385c529b022c..90c66af5ee50 100644 --- a/archivers/unrar/Makefile +++ b/archivers/unrar/Makefile @@ -1,9 +1,9 @@ PORTNAME= unrar -PORTVERSION= 6.12 +PORTVERSION= 6.20 PORTEPOCH= 6 CATEGORIES+= archivers -MASTER_SITES= https://rarlab.com/rar/ -DISTNAME= unrarsrc-6.1.7 +MASTER_SITES= https://www.rarlab.com/rar/ +DISTNAME= unrarsrc-6.2.4 MAINTAINER?= sunpoet@FreeBSD.org COMMENT= Extract, view & test RAR archives diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo index f4a2ab97bce9..acf1337122e8 100644 --- a/archivers/unrar/distinfo +++ b/archivers/unrar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655208208 -SHA256 (unrarsrc-6.1.7.tar.gz) = de75b6136958173fdfc530d38a0145b72342cf0d3842bf7bb120d336602d88ed -SIZE (unrarsrc-6.1.7.tar.gz) = 236798 +TIMESTAMP = 1675190921 +SHA256 (unrarsrc-6.2.4.tar.gz) = 22e0a37444c6beb194d4dfafdce480d1143547eb1102fd65430e1e9522a545ad +SIZE (unrarsrc-6.2.4.tar.gz) = 245672 diff --git a/archivers/unrar/files/patch-os.hpp b/archivers/unrar/files/patch-os.hpp index c0a0c1604907..ef633fb42257 100644 --- a/archivers/unrar/files/patch-os.hpp +++ b/archivers/unrar/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/unrar/files/patch-rijndael.cpp b/archivers/unrar/files/patch-rijndael.cpp index 19749b3b7403..92b411d99b5c 100644 --- a/archivers/unrar/files/patch-rijndael.cpp +++ b/archivers/unrar/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/unrar/files/patch-rijndael.hpp b/archivers/unrar/files/patch-rijndael.hpp index 3c375833ef8e..0e1ccbfbd379 100644 --- a/archivers/unrar/files/patch-rijndael.hpp +++ b/archivers/unrar/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();