Hello community, here is the log from the commit of package unrar for openSUSE:Factory:NonFree checked in at 2018-06-18 13:50:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/unrar (Old) and /work/SRC/openSUSE:Factory:NonFree/.unrar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unrar" Mon Jun 18 13:50:53 2018 rev:71 rq:614001 version:5.6.4 Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/unrar/unrar.changes 2018-04-30 22:59:46.358635265 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrar.changes 2018-06-18 13:50:56.055805812 +0200 @@ -1,0 +2,6 @@ +Mon Jun 4 14:30:23 UTC 2018 - [email protected] + +- Update to version 5.6.4 + * No upstream changelog + +------------------------------------------------------------------- Old: ---- unrarsrc-5.6.3.tar.gz New: ---- unrarsrc-5.6.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unrar.spec ++++++ --- /var/tmp/diff_new_pack.8OwBd4/_old 2018-06-18 13:50:57.411755692 +0200 +++ /var/tmp/diff_new_pack.8OwBd4/_new 2018-06-18 13:50:57.415755545 +0200 @@ -18,10 +18,10 @@ # majorversion should match the major version number. %define majorversion 5 -%define libsuffix 5_6_3 +%define libsuffix 5_6_4 Name: unrar -Version: 5.6.3 +Version: 5.6.4 Release: 0 Summary: A program to extract, test, and view RAR archives License: NonFree ++++++ unrarsrc-5.6.3.tar.gz -> unrarsrc-5.6.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/archive.hpp new/unrar/archive.hpp --- old/unrar/archive.hpp 2018-04-21 16:54:03.000000000 +0200 +++ new/unrar/archive.hpp 2018-05-13 21:08:38.000000000 +0200 @@ -20,6 +20,9 @@ ASDF_CRYPTIFHEADERS = 8 // Encrypt data after subheader only in -hp mode. }; +// RAR5 headers must not exceed 2 MB. +#define MAX_HEADER_SIZE_RAR5 0x200000 + class Archive:public File { private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/arcread.cpp new/unrar/arcread.cpp --- old/unrar/arcread.cpp 2018-04-21 16:54:03.000000000 +0200 +++ new/unrar/arcread.cpp 2018-05-13 21:08:39.000000000 +0200 @@ -595,8 +595,8 @@ } // Header size must not occupy more than 3 variable length integer bytes - // resulting in 2 MB maximum header size, so here we read 4 byte CRC32 - // followed by 3 bytes or less of header size. + // resulting in 2 MB maximum header size (MAX_HEADER_SIZE_RAR5), + // so here we read 4 byte CRC32 followed by 3 bytes or less of header size. const size_t FirstReadSize=7; // Smallest possible block size. if (Raw.Read(FirstReadSize)<FirstReadSize) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/dll.rc new/unrar/dll.rc --- old/unrar/dll.rc 2018-04-21 16:09:17.000000000 +0200 +++ new/unrar/dll.rc 2018-05-13 21:05:03.000000000 +0200 @@ -2,8 +2,8 @@ #include <commctrl.h> VS_VERSION_INFO VERSIONINFO -FILEVERSION 5, 60, 3, 2672 -PRODUCTVERSION 5, 60, 3, 2672 +FILEVERSION 5, 60, 4, 2695 +PRODUCTVERSION 5, 60, 4, 2695 FILEOS VOS__WINDOWS32 FILETYPE VFT_APP { @@ -14,8 +14,8 @@ VALUE "CompanyName", "Alexander Roshal\0" VALUE "ProductName", "RAR decompression library\0" VALUE "FileDescription", "RAR decompression library\0" - VALUE "FileVersion", "5.60.3\0" - VALUE "ProductVersion", "5.60.3\0" + VALUE "FileVersion", "5.60.4\0" + VALUE "ProductVersion", "5.60.4\0" VALUE "LegalCopyright", "Copyright � Alexander Roshal 1993-2018\0" VALUE "OriginalFilename", "Unrar.dll\0" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/extract.cpp new/unrar/extract.cpp --- old/unrar/extract.cpp 2018-04-21 16:54:04.000000000 +0200 +++ new/unrar/extract.cpp 2018-05-13 21:08:40.000000000 +0200 @@ -83,7 +83,7 @@ FirstFile=true; #endif - PasswordAll=(Cmd->Password.IsSet()); + GlobalPassword=Cmd->Password.IsSet(); DataIO.UnpVolume=false; @@ -468,7 +468,7 @@ memcmp(Arc.FileHead.PswCheck,PswCheck,SIZE_PSWCHECK)!=0 && !Arc.BrokenHeader) { - if (PasswordAll) // For -p<pwd> or Ctrl+P. + if (GlobalPassword) // For -p<pwd> or Ctrl+P. { // This message is used by Android GUI to reset cached passwords. // Update appropriate code if changed. @@ -968,7 +968,7 @@ } #if !defined(SILENT) else - if (!PasswordAll && !Arc.FileHead.Solid) + if (!GlobalPassword && !Arc.FileHead.Solid) { eprintf(St(MUseCurPsw),ArcFileName); switch(Cmd->AllYes ? 1 : Ask(St(MYesNoAll))) @@ -980,7 +980,7 @@ return false; break; case 3: - PasswordAll=true; + GlobalPassword=true; break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/extract.hpp new/unrar/extract.hpp --- old/unrar/extract.hpp 2018-04-21 16:54:04.000000000 +0200 +++ new/unrar/extract.hpp 2018-05-13 21:08:40.000000000 +0200 @@ -43,7 +43,7 @@ wchar ArcName[NM]; - bool PasswordAll; + bool GlobalPassword; bool PrevProcessed; // If previous file was successfully extracted or tested. wchar DestFileName[NM]; bool PasswordCancelled; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/qopen.cpp new/unrar/qopen.cpp --- old/unrar/qopen.cpp 2018-04-21 16:54:05.000000000 +0200 +++ new/unrar/qopen.cpp 2018-05-13 21:08:40.000000000 +0200 @@ -280,6 +280,8 @@ uint Flags=(uint)Raw.GetV(); uint64 Offset=Raw.GetV(); size_t HeaderSize=(size_t)Raw.GetV(); + if (HeaderSize>MAX_HEADER_SIZE_RAR5) + return false; LastReadHeader.Alloc(HeaderSize); Raw.GetB(&LastReadHeader[0],HeaderSize); // Calculate the absolute position as offset from quick open service header. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/suballoc.cpp new/unrar/suballoc.cpp --- old/unrar/suballoc.cpp 2018-04-21 16:54:06.000000000 +0200 +++ new/unrar/suballoc.cpp 2018-05-13 21:08:41.000000000 +0200 @@ -80,7 +80,7 @@ { uint t=SASize << 20; if (SubAllocatorSize == t) - return TRUE; + return true; StopSubAllocator(); // Original algorithm expects FIXED_UNIT_SIZE, but actual structure size @@ -91,7 +91,7 @@ if ((HeapStart=(byte *)malloc(AllocSize)) == NULL) { ErrHandler.MemoryError(); - return FALSE; + return false; } // HeapEnd did not present in original algorithm. We added it to control @@ -99,7 +99,7 @@ HeapEnd=HeapStart+AllocSize-UNIT_SIZE; SubAllocatorSize=t; - return TRUE; + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/uiconsole.cpp new/unrar/uiconsole.cpp --- old/unrar/uiconsole.cpp 2018-04-21 16:54:06.000000000 +0200 +++ new/unrar/uiconsole.cpp 2018-05-13 21:08:41.000000000 +0200 @@ -100,6 +100,7 @@ Log(Str[0],St(MWrongPassword)); break; case UIERROR_MEMORY: + mprintf(L"\n"); Log(NULL,St(MErrOutMem)); break; case UIERROR_FILEOPEN: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/version.hpp new/unrar/version.hpp --- old/unrar/version.hpp 2018-04-21 16:54:06.000000000 +0200 +++ new/unrar/version.hpp 2018-05-13 21:08:41.000000000 +0200 @@ -1,6 +1,6 @@ #define RARVER_MAJOR 5 #define RARVER_MINOR 60 -#define RARVER_BETA 3 -#define RARVER_DAY 21 -#define RARVER_MONTH 4 +#define RARVER_BETA 4 +#define RARVER_DAY 14 +#define RARVER_MONTH 5 #define RARVER_YEAR 2018
