Hello community, here is the log from the commit of package unrar for openSUSE:Factory:NonFree checked in at 2014-12-19 09:59:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/unrar (Old) and /work/SRC/openSUSE:Factory:NonFree/.unrar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unrar" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/unrar/unrar.changes 2014-11-06 18:07:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrar.changes 2014-12-19 09:58:22.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Dec 3 18:44:49 UTC 2014 - lazy.k...@opensuse.org + +- Update to 5.2.3. + * Based on final rar 5.20. + * File overwrite prompt displays the size and modification time + for existing and new files. + * Warning is issued when starting unpacking 4 GB or larger file + from RAR archive to FAT32 patition, so user may cancel the + operation. FAT32 does not support files of such size. + +------------------------------------------------------------------- Old: ---- unrarsrc-5.2.2.tar.gz New: ---- unrarsrc-5.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unrar.spec ++++++ --- /var/tmp/diff_new_pack.TUcfLU/_old 2014-12-19 09:58:24.000000000 +0100 +++ /var/tmp/diff_new_pack.TUcfLU/_new 2014-12-19 09:58:24.000000000 +0100 @@ -18,10 +18,10 @@ # majorversion should match the major version number. %define majorversion 5 -%define libsuffix 5_2_2 +%define libsuffix 5_2_3 Name: unrar -Version: 5.2.2 +Version: 5.2.3 Release: 0 License: SUSE-NonFree Summary: A program to extract, test, and view RAR archives ++++++ unrarsrc-5.2.2.tar.gz -> unrarsrc-5.2.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/dll.rc new/unrar/dll.rc --- old/unrar/dll.rc 2014-11-03 09:35:46.000000000 +0100 +++ new/unrar/dll.rc 2014-12-02 11:06:20.000000000 +0100 @@ -2,8 +2,8 @@ #include <commctrl.h> VS_VERSION_INFO VERSIONINFO -FILEVERSION 5, 20, 3, 1404 -PRODUCTVERSION 5, 20, 3, 1404 +FILEVERSION 5, 20, 100, 1433 +PRODUCTVERSION 5, 20, 100, 1433 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.20.3\0" - VALUE "ProductVersion", "5.20.3\0" + VALUE "FileVersion", "5.20.0\0" + VALUE "ProductVersion", "5.20.0\0" VALUE "LegalCopyright", "Copyright � Alexander Roshal 1993-2014\0" VALUE "OriginalFilename", "Unrar.dll\0" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/threadmisc.cpp new/unrar/threadmisc.cpp --- old/unrar/threadmisc.cpp 2014-11-03 09:39:29.000000000 +0100 +++ new/unrar/threadmisc.cpp 2014-12-02 11:10:35.000000000 +0100 @@ -58,6 +58,20 @@ if (GlobalPoolUseCount++ == 0) GlobalPool=new ThreadPool(MaxPoolThreads); +#ifdef RARDLL + // We use a simple thread pool, which does not allow to add tasks from + // different functions and threads in the same time. It is ok for RAR, + // but UnRAR.dll can be used in multithreaded environment. So if one of + // threads requests a copy of global pool and another copy is already + // in use, we create and return a new pool instead of existing global. + if (GlobalPoolUseCount > 1) + { + ThreadPool *Pool = new ThreadPool(MaxPoolThreads); + CriticalSectionEnd(&PoolCreateSync.CritSection); + return Pool; + } +#endif + CriticalSectionEnd(&PoolCreateSync.CritSection); return GlobalPool; } @@ -69,6 +83,12 @@ if (Pool!=NULL && Pool==GlobalPool && GlobalPoolUseCount > 0 && --GlobalPoolUseCount == 0) delete GlobalPool; +#ifdef RARDLL + // To correctly work in multithreaded environment UnRAR.dll creates + // new pools if global pool is already in use. We delete such pools here. + if (Pool!=NULL && Pool!=GlobalPool) + delete Pool; +#endif CriticalSectionEnd(&PoolCreateSync.CritSection); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/unicode.cpp new/unrar/unicode.cpp --- old/unrar/unicode.cpp 2014-11-03 09:39:29.000000000 +0100 +++ new/unrar/unicode.cpp 2014-12-02 11:10:35.000000000 +0100 @@ -433,7 +433,7 @@ { if (search[j]==0) return str+i; - if (towlower(str[i+j])!=towlower(search[j])) + if (tolowerw(str[i+j])!=tolowerw(search[j])) break; } return NULL; @@ -472,13 +472,26 @@ int toupperw(int ch) { +#ifdef _WIN_ALL + // CharUpper is more reliable than towupper in Windows, which seems to be + // C locale dependent even in Unicode version. For example, towupper failed + // to convert lowercase Russian characters. + return (int)CharUpper((wchar *)ch); +#else return towupper(ch); +#endif } int tolowerw(int ch) { +#ifdef _WIN_ALL + // CharLower is more reliable than towlower in Windows. + // See comment for towupper above. + return (int)CharLower((wchar *)ch); +#else return towlower(ch); +#endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/version.hpp new/unrar/version.hpp --- old/unrar/version.hpp 2014-11-03 09:39:29.000000000 +0100 +++ new/unrar/version.hpp 2014-12-02 11:10:35.000000000 +0100 @@ -1,6 +1,6 @@ #define RARVER_MAJOR 5 #define RARVER_MINOR 20 -#define RARVER_BETA 3 -#define RARVER_DAY 3 -#define RARVER_MONTH 11 +#define RARVER_BETA 0 +#define RARVER_DAY 2 +#define RARVER_MONTH 12 #define RARVER_YEAR 2014 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org