Date: Mon, 1 May 2017 12:45:44 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439870 - in head: archivers/unrar archivers/unrar-iconv/files archivers/unrar/files chinese/unrar/files Message-ID: <201705011245.v41Cjiu0051860@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Mon May 1 12:45:44 2017 New Revision: 439870 URL: https://svnweb.freebsd.org/changeset/ports/439870 Log: Update to 5.50 Beta 1 (5.5.3) - Convert to options target helper - Regenerate patch files with makepatch: Modified: head/archivers/unrar-iconv/files/patch-iconv head/archivers/unrar/Makefile head/archivers/unrar/distinfo head/archivers/unrar/files/patch-os.hpp head/archivers/unrar/files/patch-rijndael.cpp head/archivers/unrar/files/patch-rijndael.hpp head/chinese/unrar/files/patch-arcread.cpp head/chinese/unrar/files/patch-unicode.cpp Modified: head/archivers/unrar-iconv/files/patch-iconv ============================================================================== --- head/archivers/unrar-iconv/files/patch-iconv Mon May 1 12:18:27 2017 (r439869) +++ head/archivers/unrar-iconv/files/patch-iconv Mon May 1 12:45:44 2017 (r439870) @@ -1,6 +1,6 @@ ---- cmddata.cpp.orig 2014-06-11 01:14:06.000000000 +0800 -+++ cmddata.cpp 2014-07-31 22:54:35.727051754 +0800 -@@ -173,6 +173,34 @@ +--- cmddata.cpp.orig 2017-04-28 17:28:45 UTC ++++ cmddata.cpp +@@ -172,6 +172,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 @@ } -@@ -881,6 +909,22 @@ +@@ -895,6 +923,22 @@ void CommandData::ProcessSwitch(const wc else wcsncpyz(CommentFile,Switch+1,ASIZE(CommentFile)); break; @@ -55,10 +55,10 @@ + } + break; +#endif - #ifndef GUI case '?' : OutHelp(RARX_SUCCESS); -@@ -959,7 +1003,11 @@ + break; +@@ -980,7 +1024,11 @@ void CommandData::OutHelp(RAR_EXIT ExitC MCHelpSwAT,MCHelpSwAC,MCHelpSwAD,MCHelpSwAG,MCHelpSwAI,MCHelpSwAP, MCHelpSwCm,MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU, MCHelpSwDH,MCHelpSwEP,MCHelpSwEP3,MCHelpSwF,MCHelpSwIDP,MCHelpSwIERR, @@ -71,18 +71,18 @@ MCHelpSwO,MCHelpSwOC,MCHelpSwOL,MCHelpSwOR,MCHelpSwOW,MCHelpSwP, MCHelpSwPm,MCHelpSwR,MCHelpSwRI,MCHelpSwSC,MCHelpSwSL,MCHelpSwSM, MCHelpSwTA,MCHelpSwTB,MCHelpSwTN,MCHelpSwTO,MCHelpSwTS,MCHelpSwU, ---- global.hpp.orig 2014-06-11 01:14:06.000000000 +0800 -+++ global.hpp 2014-07-31 22:56:02.117045684 +0800 +--- global.hpp.orig 2017-04-28 17:28:46 UTC ++++ global.hpp @@ -9,6 +9,17 @@ EXTVAR ErrorHandler ErrHandler; +#ifdef WITH_ICONV +#define OPT_DEFAULT "IGNORE" /* ignore unrepresentable chars */ - ++ +#define ENC_MAXLEN 32 /* encoding name maximum length */ +#define OPT_MAXLEN 9 /* strlen("TRANSLIT") */ -+ + +EXTVAR iconv_t h_E2I; /* ExtToInt handler */ +EXTVAR iconv_t h_I2E; /* IntToExt handler */ +EXTVAR char encInt[ENC_MAXLEN]; /* internal (archive) encoding */ @@ -91,19 +91,19 @@ +#endif #endif ---- loclang.hpp.orig 2014-06-11 01:14:06.000000000 +0800 -+++ loclang.hpp 2014-07-31 22:57:33.346038437 +0800 -@@ -7,7 +7,7 @@ - #define MCopyright L"\nRAR %s Copyright (c) 1993-%d Alexander Roshal %d %s %d" +--- loclang.hpp.orig 2017-04-28 17:28:46 UTC ++++ loclang.hpp +@@ -8,7 +8,7 @@ #define MRegTo L"\nRegistered to %s\n" - #define MShare L"\nTrial version Type RAR -? for help\n" + #define MShare L"\nTrial version Type 'rar -?' for help\n" + #define MRegKeyWarning L"\nAvailable license key is valid only for %s\n" -#define MUCopyright L"\nUNRAR %s freeware Copyright (c) 1993-%d Alexander Roshal\n" +#define MUCopyright L"\nUNRAR %s (iconv) freeware Copyright (c) 1993-%d Alexander Roshal\n" #define MBeta L"beta" - #define MMonthJan L"Jan" - #define MMonthFeb L"Feb" -@@ -328,7 +328,7 @@ - #define MSyncScanError L"\nFile search errors, cannot synchronize archive" + #define Mx86 L"x86" + #define Mx64 L"x64" +@@ -324,7 +324,7 @@ + #define MProcessArc L"\n\nProcessing archive %s" #define MCorrectingName L"\nWARNING: Attempting to correct the invalid file name" #define MUnpCannotMerge L"\nWARNING: You need to start extraction from a previous volume to unpack %s" -#define MUnknownOption L"\nERROR: Unknown option: %s" @@ -111,7 +111,7 @@ #define MSubHeadCorrupt L"\nERROR: Corrupt data header found, ignored" #define MSubHeadUnknown L"\nWARNING: Unknown data header format, ignored" #define MSubHeadDataCRC L"\nERROR: Corrupt %s data block" -@@ -355,6 +355,12 @@ +@@ -352,6 +352,12 @@ #define MSHelpCmdV L"\n -v Verbosely list contents of archive" #define MRecVolLimit L"\nTotal number of usual and recovery volumes must not exceed %d" #define MVolumeNumber L"volume %d" @@ -124,12 +124,12 @@ #define MCannotDelete L"\nCannot delete %s" #define MCalcCRC L"\nCalculating the checksum" #define MTooLargeSFXArc L"\nWARNING: Too large SFX archive. Windows cannot run the executable file exceeding 4 GB." ---- os.hpp.orig 2014-06-11 01:14:06.000000000 +0800 -+++ os.hpp 2014-07-31 22:58:30.619035684 +0800 -@@ -154,6 +154,10 @@ - #include <utime.h> +--- os.hpp.orig 2017-04-28 17:28:46 UTC ++++ os.hpp +@@ -150,6 +150,10 @@ #include <locale.h> + +#ifdef WITH_ICONV +#include <iconv.h> +#endif @@ -137,9 +137,9 @@ #ifdef S_IFLNK #define SAVE_LINKS #endif ---- strfn.cpp.orig 2014-06-11 01:14:06.000000000 +0800 -+++ strfn.cpp 2014-07-31 22:59:29.039036713 +0800 -@@ -14,6 +14,19 @@ +--- strfn.cpp.orig 2017-04-28 17:28:47 UTC ++++ strfn.cpp +@@ -14,6 +14,19 @@ const wchar *NullToEmpty(const wchar *St void IntToExt(const char *Src,char *Dest,size_t DestSize) { @@ -157,9 +157,9 @@ + strncpyz(Dest,Src,DestSize); +#else /* !WITH_ICONV */ #ifdef _WIN_ALL - OemToCharBuffA(Src,Dest,(DWORD)DestSize); - Dest[DestSize-1]=0; -@@ -25,6 +38,7 @@ + // OemToCharBuff does not stop at 0, so let's check source length. + size_t SrcLength=strlen(Src)+1; +@@ -25,6 +38,7 @@ void IntToExt(const char *Src,char *Dest if (Dest!=Src) strncpyz(Dest,Src,DestSize); #endif Modified: head/archivers/unrar/Makefile ============================================================================== --- head/archivers/unrar/Makefile Mon May 1 12:18:27 2017 (r439869) +++ head/archivers/unrar/Makefile Mon May 1 12:45:44 2017 (r439870) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= unrar -PORTVERSION= 5.40 +PORTVERSION= 5.50b1 PORTEPOCH= 5 CATEGORIES+= archivers MASTER_SITES= http://www.rarlab.com/rar/ \ LOCAL/sunpoet -DISTNAME= unrarsrc-5.4.5 +DISTNAME= unrarsrc-5.5.3 MAINTAINER?= sunpoet@FreeBSD.org COMMENT= Extract, view & test RAR archives @@ -36,6 +36,8 @@ OPENSSL_AES_USES= ssl do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unrar ${STAGEDIR}${PREFIX}/bin/ + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ Modified: head/archivers/unrar/distinfo ============================================================================== --- head/archivers/unrar/distinfo Mon May 1 12:18:27 2017 (r439869) +++ head/archivers/unrar/distinfo Mon May 1 12:45:44 2017 (r439870) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472916114 -SHA256 (unrarsrc-5.4.5.tar.gz) = e470c584332422893fb52e049f2cbd99e24dc6c6da971008b4e2ae4284f8796c -SIZE (unrarsrc-5.4.5.tar.gz) = 226320 +TIMESTAMP = 1493557889 +SHA256 (unrarsrc-5.5.3.tar.gz) = d1d9ef4a9247db088f825666de8f8bb69006d8d8b0e004ff366b3e04c103a2b3 +SIZE (unrarsrc-5.5.3.tar.gz) = 219557 Modified: head/archivers/unrar/files/patch-os.hpp ============================================================================== --- head/archivers/unrar/files/patch-os.hpp Mon May 1 12:18:27 2017 (r439869) +++ head/archivers/unrar/files/patch-os.hpp Mon May 1 12:45:44 2017 (r439870) @@ -1,9 +1,9 @@ ---- os.hpp.orig 2013-12-01 08:10:14 UTC +--- os.hpp.orig 2017-04-28 17:28:46 UTC +++ os.hpp -@@ -151,6 +151,10 @@ - #include <utime.h> +@@ -150,6 +150,10 @@ #include <locale.h> + +#ifdef OPENSSL_AES +#include <openssl/evp.h> +#endif // OPENSSL_AES Modified: head/archivers/unrar/files/patch-rijndael.cpp ============================================================================== --- head/archivers/unrar/files/patch-rijndael.cpp Mon May 1 12:18:27 2017 (r439869) +++ head/archivers/unrar/files/patch-rijndael.cpp Mon May 1 12:45:44 2017 (r439870) @@ -1,4 +1,4 @@ ---- rijndael.cpp.orig 2014-06-10 17:14:06 UTC +--- rijndael.cpp.orig 2017-04-28 17:28:47 UTC +++ rijndael.cpp @@ -7,6 +7,8 @@ ***************************************************************************/ @@ -9,7 +9,7 @@ #ifdef USE_SSE #include <wmmintrin.h> #endif -@@ -56,6 +58,7 @@ +@@ -56,6 +58,7 @@ inline void Copy128(byte *dest,const byt #endif } @@ -17,7 +17,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // API -@@ -63,14 +66,35 @@ +@@ -63,14 +66,35 @@ inline void Copy128(byte *dest,const byt Rijndael::Rijndael() { @@ -53,15 +53,35 @@ #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 +135,7 @@ +@@ -111,6 +135,7 @@ void Rijndael::Init(bool Encrypt,const b if(!Encrypt) keyEncToDec(); +#endif // OPENSSL_AES } + void Rijndael::blockEncrypt(const byte *input,size_t inputLen,byte *outBuffer) +@@ -118,6 +143,11 @@ void Rijndael::blockEncrypt(const byte * + if (inputLen <= 0) + return; + ++#ifdef OPENSSL_AES ++ int outLen; ++ EVP_CipherUpdate(&ctx, outBuffer, &outLen, input, inputLen); ++ return; ++#else // OPENSSL_AES + size_t numBlocks = inputLen/16; + #ifdef USE_SSE + if (AES_NI) +@@ -176,6 +206,7 @@ void Rijndael::blockEncrypt(const byte * + input += 16; + } + Copy128(m_initVector,prevBlock); ++#endif // OPENSSL_AES + } + -@@ -120,6 +145,11 @@ +@@ -217,6 +248,11 @@ void Rijndael::blockDecrypt(const byte * if (inputLen <= 0) return; @@ -73,7 +93,7 @@ size_t numBlocks=inputLen/16; #ifdef USE_SSE if (AES_NI) -@@ -182,6 +212,8 @@ +@@ -279,6 +315,8 @@ void Rijndael::blockDecrypt(const byte * } memcpy(m_initVector,iv,16); @@ -82,7 +102,7 @@ } -@@ -217,7 +249,7 @@ +@@ -314,7 +352,7 @@ void Rijndael::blockDecryptSSE(const byt } #endif @@ -91,7 +111,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ALGORITHM ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -@@ -357,7 +389,7 @@ +@@ -454,7 +492,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); } } Modified: head/archivers/unrar/files/patch-rijndael.hpp ============================================================================== --- head/archivers/unrar/files/patch-rijndael.hpp Mon May 1 12:18:27 2017 (r439869) +++ head/archivers/unrar/files/patch-rijndael.hpp Mon May 1 12:45:44 2017 (r439870) @@ -1,4 +1,4 @@ ---- rijndael.hpp.orig 2014-06-10 17:14:06 UTC +--- rijndael.hpp.orig 2017-04-28 17:28:47 UTC +++ rijndael.hpp @@ -16,6 +16,9 @@ class Rijndael @@ -10,7 +10,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 +28,7 @@ +@@ -25,6 +28,7 @@ class Rijndael void keySched(byte key[_MAX_KEY_COLUMNS][4]); void keyEncToDec(); void GenerateTables(); Modified: head/chinese/unrar/files/patch-arcread.cpp ============================================================================== --- head/chinese/unrar/files/patch-arcread.cpp Mon May 1 12:18:27 2017 (r439869) +++ head/chinese/unrar/files/patch-arcread.cpp Mon May 1 12:45:44 2017 (r439870) @@ -1,6 +1,6 @@ ---- arcread.cpp.orig 2013-12-01 16:10:14.000000000 +0800 -+++ arcread.cpp 2014-02-04 09:23:21.669710373 +0800 -@@ -1272,6 +1272,7 @@ +--- arcread.cpp.orig 2017-04-28 17:28:45 UTC ++++ arcread.cpp +@@ -1308,6 +1308,7 @@ void Archive::ConvertAttributes() void Archive::ConvertFileHeader(FileHeader *hd) { @@ -8,7 +8,7 @@ if (Format==RARFMT15 && hd->UnpVer<20 && (hd->FileAttr & 0x10)) hd->Dir=true; if (hd->HSType==HSYS_UNKNOWN) -@@ -1282,6 +1283,16 @@ +@@ -1323,6 +1324,16 @@ void Archive::ConvertFileHeader(FileHead for (wchar *s=hd->FileName;*s!=0;s++) { Modified: head/chinese/unrar/files/patch-unicode.cpp ============================================================================== --- head/chinese/unrar/files/patch-unicode.cpp Mon May 1 12:18:27 2017 (r439869) +++ head/chinese/unrar/files/patch-unicode.cpp Mon May 1 12:45:44 2017 (r439870) @@ -1,6 +1,6 @@ ---- unicode.cpp.orig 2011-01-04 20:28:47.000000000 +0800 -+++ unicode.cpp 2011-01-21 23:01:09.000000000 +0800 -@@ -7,6 +7,7 @@ +--- unicode.cpp.orig 2017-04-28 17:28:47 UTC ++++ unicode.cpp +@@ -20,6 +20,7 @@ static const uint MappedStringMark=0xFFF bool WideToChar(const wchar *Src,char *Dest,size_t DestSize) { bool RetCode=true;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705011245.v41Cjiu0051860>