From eebe712f636cd5c9ef7b947c3cfd015cf841b5b8 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Mon, 29 Apr 2019 18:18:35 +0000 Subject: Update to 5.71 --- archivers/unrar-iconv/files/patch-iconv | 18 +++++++++--------- archivers/unrar/Makefile | 4 ++-- archivers/unrar/distinfo | 6 +++--- archivers/unrar/files/patch-os.hpp | 4 ++-- archivers/unrar/files/patch-rijndael.cpp | 16 ++++++++-------- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'archivers') diff --git a/archivers/unrar-iconv/files/patch-iconv b/archivers/unrar-iconv/files/patch-iconv index 9bddb1c086d4..685a8abf8b10 100644 --- a/archivers/unrar-iconv/files/patch-iconv +++ b/archivers/unrar-iconv/files/patch-iconv @@ -1,6 +1,6 @@ ---- cmddata.cpp.orig 2019-02-24 19:07:17 UTC +--- cmddata.cpp.orig 2019-04-27 20:05:15 UTC +++ cmddata.cpp -@@ -166,6 +166,34 @@ void CommandData::ParseDone() +@@ -167,6 +167,34 @@ void CommandData::ParseDone() // Suppress the copyright message and final end of line for 'lb' and 'vb'. if ((CmdChar=='L' || CmdChar=='V') && Command[1]=='B') BareOutput=true; @@ -35,7 +35,7 @@ } -@@ -909,6 +937,22 @@ void CommandData::ProcessSwitch(const wc +@@ -910,6 +938,22 @@ void CommandData::ProcessSwitch(const wc else wcsncpyz(CommentFile,Switch+1,ASIZE(CommentFile)); break; @@ -58,7 +58,7 @@ case '?' : OutHelp(RARX_SUCCESS); break; ---- cmdmix.cpp.orig 2019-02-24 19:07:17 UTC +--- cmdmix.cpp.orig 2019-04-27 20:05:15 UTC +++ cmdmix.cpp @@ -63,7 +63,11 @@ void CommandData::OutHelp(RAR_EXIT ExitC MCHelpSwAT,MCHelpSwAC,MCHelpSwAD,MCHelpSwAG,MCHelpSwAI,MCHelpSwAP, @@ -73,7 +73,7 @@ MCHelpSwO,MCHelpSwOC,MCHelpSwOL,MCHelpSwOR,MCHelpSwOW,MCHelpSwP, MCHelpSwPm,MCHelpSwR,MCHelpSwRI,MCHelpSwSC,MCHelpSwSL,MCHelpSwSM, MCHelpSwTA,MCHelpSwTB,MCHelpSwTN,MCHelpSwTO,MCHelpSwTS,MCHelpSwU, ---- global.hpp.orig 2019-02-24 19:07:20 UTC +--- global.hpp.orig 2019-04-27 20:05:17 UTC +++ global.hpp @@ -9,6 +9,17 @@ @@ -93,7 +93,7 @@ +#endif #endif ---- loclang.hpp.orig 2019-02-24 19:07:20 UTC +--- loclang.hpp.orig 2019-04-27 20:05:18 UTC +++ loclang.hpp @@ -8,7 +8,7 @@ #define MRegTo L"\nRegistered to %s\n" @@ -126,9 +126,9 @@ #define MCannotDelete L"\nCannot delete %s" #define MRecycleFailed L"\nCannot move some files and folders to Recycle Bin" #define MCalcCRC L"\nCalculating the checksum" ---- os.hpp.orig 2019-02-27 23:24:23 UTC +--- os.hpp.orig 2019-04-27 20:05:18 UTC +++ os.hpp -@@ -170,6 +170,10 @@ +@@ -166,6 +166,10 @@ #include @@ -139,7 +139,7 @@ #ifdef S_IFLNK #define SAVE_LINKS #endif ---- strfn.cpp.orig 2019-02-24 19:07:23 UTC +--- strfn.cpp.orig 2019-04-27 20:05:20 UTC +++ strfn.cpp @@ -14,6 +14,19 @@ const wchar *NullToEmpty(const wchar *St diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile index 846c032cbe4d..e33e59827252 100644 --- a/archivers/unrar/Makefile +++ b/archivers/unrar/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= unrar -DISTVERSION= 5.70 +DISTVERSION= 5.71 PORTEPOCH= 6 CATEGORIES+= archivers MASTER_SITES= https://rarlab.com/rar/ \ LOCAL/sunpoet -DISTNAME= unrarsrc-5.7.3 +DISTNAME= unrarsrc-5.7.5 MAINTAINER?= sunpoet@FreeBSD.org COMMENT= Extract, view & test RAR archives diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo index 5f8a33b1304a..5f19f24eb572 100644 --- a/archivers/unrar/distinfo +++ b/archivers/unrar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551271326 -SHA256 (unrarsrc-5.7.3.tar.gz) = 40e856b78374f258d8a1f5f02c02f828c5392a0118c9300fd169a300b520a444 -SIZE (unrarsrc-5.7.3.tar.gz) = 228465 +TIMESTAMP = 1556560993 +SHA256 (unrarsrc-5.7.5.tar.gz) = e1c2fddaa87a88b1535bfc10ca484f3c5af4e5a55fbb933f8819e26203bbe2ee +SIZE (unrarsrc-5.7.5.tar.gz) = 228818 diff --git a/archivers/unrar/files/patch-os.hpp b/archivers/unrar/files/patch-os.hpp index dff506575c08..6e1ef0d20b34 100644 --- a/archivers/unrar/files/patch-os.hpp +++ b/archivers/unrar/files/patch-os.hpp @@ -1,6 +1,6 @@ ---- os.hpp.orig 2017-04-28 17:28:46 UTC +--- os.hpp.orig 2019-04-27 20:05:18 UTC +++ os.hpp -@@ -150,6 +150,10 @@ +@@ -166,6 +166,10 @@ #include diff --git a/archivers/unrar/files/patch-rijndael.cpp b/archivers/unrar/files/patch-rijndael.cpp index 93d60494b85c..2656ded5d19e 100644 --- a/archivers/unrar/files/patch-rijndael.cpp +++ b/archivers/unrar/files/patch-rijndael.cpp @@ -1,4 +1,4 @@ ---- rijndael.cpp.orig 2018-06-24 15:10:31 UTC +--- rijndael.cpp.orig 2019-04-27 20:05:20 UTC +++ rijndael.cpp @@ -7,6 +7,8 @@ ***************************************************************************/ @@ -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 +@@ -114,6 +144,7 @@ void Rijndael::Init(bool Encrypt,const b 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 * +@@ -121,6 +152,15 @@ void Rijndael::blockEncrypt(const byte * 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 * +@@ -179,6 +219,7 @@ void Rijndael::blockEncrypt(const byte * input += 16; } Copy128(m_initVector,prevBlock); @@ -91,7 +91,7 @@ } -@@ -217,6 +258,15 @@ void Rijndael::blockDecrypt(const byte * +@@ -220,6 +261,15 @@ void Rijndael::blockDecrypt(const byte * 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 * +@@ -282,6 +332,8 @@ void Rijndael::blockDecrypt(const byte * } memcpy(m_initVector,iv,16); @@ -116,7 +116,7 @@ } -@@ -314,7 +366,7 @@ void Rijndael::blockDecryptSSE(const byt +@@ -317,7 +369,7 @@ void Rijndael::blockDecryptSSE(const byt } #endif @@ -125,7 +125,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ALGORITHM ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -@@ -454,7 +506,7 @@ void Rijndael::GenerateTables() +@@ -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); } } -- cgit v1.2.3