Hello community, here is the log from the commit of package unrar for openSUSE:Factory:NonFree checked in at 2013-08-04 17:24:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-07-16 07:40:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrar.changes 2013-08-04 17:24:26.000000000 +0200 @@ -1,0 +2,16 @@ +Sun Aug 4 07:59:37 UTC 2013 - [email protected] + +- Update to 5.0.10. + * Added missing makefile. + +------------------------------------------------------------------- +Sun Aug 4 00:17:40 UTC 2013 - [email protected] + +- Update to 5.0.9. + * No changelog available. +- Add acknow.txt to docs. +- Don't install readme.txt to the libunrar package. +- Temporarily use the makefile file from the previous version + (missing in the source). + +------------------------------------------------------------------- Old: ---- unrarsrc-5.0.8.tar.gz New: ---- unrarsrc-5.0.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unrar.spec ++++++ --- /var/tmp/diff_new_pack.0WW4dl/_old 2013-08-04 17:24:27.000000000 +0200 +++ /var/tmp/diff_new_pack.0WW4dl/_new 2013-08-04 17:24:27.000000000 +0200 @@ -18,10 +18,10 @@ # majorversion should match the major version number. %define majorversion 5 -%define libsuffix 5_0_8 +%define libsuffix 5_0_10 Name: unrar -Version: 5.0.8 +Version: 5.0.10 Release: 0 License: SUSE-NonFree Summary: A program to extract, test, and view RAR archives @@ -61,6 +61,7 @@ %setup -q -n %{name} %patch1 %patch2 -p1 +sed -i 's/\r$//' *.txt %build make %{?_smp_mflags} -f makefile CXXFLAGS="%{optflags} \ @@ -86,18 +87,18 @@ %files %defattr(-,root,root) -%doc license.txt readme.txt +%doc acknow.txt license.txt readme.txt %{_bindir}/unrar %doc %{_mandir}/man1/unrar.1* %files -n libunrar%{libsuffix} %defattr(-,root,root) -%doc license.txt readme.txt +%doc license.txt %{_libdir}/*.so.%{majorversion}* %files -n libunrar-devel %defattr(-,root,root) -%doc license.txt readme.txt +%doc acknow.txt license.txt readme.txt %{_includedir}/* %{_libdir}/*.so ++++++ unrarsrc-5.0.8.tar.gz -> unrarsrc-5.0.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/blake2s.cpp new/unrar/blake2s.cpp --- old/unrar/blake2s.cpp 2013-07-13 13:30:21.000000000 +0200 +++ new/unrar/blake2s.cpp 2013-08-02 15:30:12.000000000 +0200 @@ -57,7 +57,7 @@ /* init2 xors IV with input parameter block */ void blake2s_init_param( blake2s_state *S, uint32 node_offset, uint32 node_depth) { - S->init(); // Clean and set pointers. + S->init(); // Clean data. for( int i = 0; i < 8; ++i ) S->h[i] = blake2s_IV[i]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/blake2s.hpp new/unrar/blake2s.hpp --- old/unrar/blake2s.hpp 2013-07-13 13:30:21.000000000 +0200 +++ new/unrar/blake2s.hpp 2013-08-02 15:30:12.000000000 +0200 @@ -21,7 +21,10 @@ { enum { BLAKE_ALIGNMENT = 64 }; - byte ubuf[48 + 2 * BLAKE2S_BLOCKBYTES + BLAKE_ALIGNMENT]; + // buffer and uint32 h[8], t[2], f[2]; + enum { BLAKE_DATA_SIZE = 48 + 2 * BLAKE2S_BLOCKBYTES }; + + byte ubuf[BLAKE_DATA_SIZE + BLAKE_ALIGNMENT]; byte *buf; // byte buf[2 * BLAKE2S_BLOCKBYTES]. uint32 *h, *t, *f; // uint32 h[8], t[2], f[2]. @@ -29,14 +32,47 @@ size_t buflen; byte last_node; - void init() + blake2s_state() + { + set_pointers(); + } + + // Required when we declare and assign in the same command. + blake2s_state(blake2s_state &st) { - memset( this, 0, sizeof( blake2s_state ) ); + set_pointers(); + *this=st; + } + + void set_pointers() + { + // Set aligned pointers. Must be done in constructor, not in Init(), + // so assignments like 'blake2sp_state res=blake2ctx' work correctly + // even if blake2sp_init is not called for 'res'. buf = (byte *) ALIGN_VALUE(ubuf, BLAKE_ALIGNMENT); h = (uint32 *) (buf + 2 * BLAKE2S_BLOCKBYTES); t = h + 8; f = t + 2; } + + void init() + { + memset( ubuf, 0, sizeof( ubuf ) ); + buflen = 0; + last_node = 0; + } + + // Since we use pointers, the default = would work incorrectly. + blake2s_state& operator = (blake2s_state &st) + { + if (this != &st) + { + memcpy(buf, st.buf, BLAKE_DATA_SIZE); + buflen = st.buflen; + last_node = st.last_node; + } + return *this; + } }; @@ -44,10 +80,10 @@ class ThreadPool; #endif -typedef struct __blake2sp_state +struct blake2sp_state { - blake2s_state S[8][1]; - blake2s_state R[1]; + blake2s_state S[8]; + blake2s_state R; byte buf[8 * BLAKE2S_BLOCKBYTES]; size_t buflen; @@ -55,8 +91,7 @@ ThreadPool *ThPool; uint MaxThreads; #endif - -} blake2sp_state; +}; void blake2sp_init( blake2sp_state *S ); void blake2sp_update( blake2sp_state *S, const byte *in, size_t inlen ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/blake2sp.cpp new/unrar/blake2sp.cpp --- old/unrar/blake2sp.cpp 2013-07-13 13:30:21.000000000 +0200 +++ new/unrar/blake2sp.cpp 2013-08-02 15:30:12.000000000 +0200 @@ -18,13 +18,13 @@ memset( S->buf, 0, sizeof( S->buf ) ); S->buflen = 0; - blake2s_init_param( S->R, 0, 1 ); // Init root. + blake2s_init_param( &S->R, 0, 1 ); // Init root. for( uint i = 0; i < PARALLELISM_DEGREE; ++i ) - blake2s_init_param( S->S[i], i, 0 ); // Init leaf. + blake2s_init_param( &S->S[i], i, 0 ); // Init leaf. - S->R->last_node = 1; - S->S[PARALLELISM_DEGREE - 1]->last_node = 1; + S->R.last_node = 1; + S->S[PARALLELISM_DEGREE - 1].last_node = 1; } @@ -74,7 +74,7 @@ memcpy( S->buf + left, in, fill ); for( size_t i = 0; i < PARALLELISM_DEGREE; ++i ) - blake2s_update( S->S[i], S->buf + i * BLAKE2S_BLOCKBYTES, BLAKE2S_BLOCKBYTES ); + blake2s_update( &S->S[i], S->buf + i * BLAKE2S_BLOCKBYTES, BLAKE2S_BLOCKBYTES ); in += fill; inlen -= fill; @@ -100,7 +100,7 @@ btd->inlen = inlen; btd->in = in + id__ * BLAKE2S_BLOCKBYTES; - btd->S = S->S[id__]; + btd->S = &S->S[id__]; #ifdef RAR_SMP if (ThreadNumber>1) @@ -140,14 +140,14 @@ if( left > BLAKE2S_BLOCKBYTES ) left = BLAKE2S_BLOCKBYTES; - blake2s_update( S->S[i], S->buf + i * BLAKE2S_BLOCKBYTES, left ); + blake2s_update( &S->S[i], S->buf + i * BLAKE2S_BLOCKBYTES, left ); } - blake2s_final( S->S[i], hash[i] ); + blake2s_final( &S->S[i], hash[i] ); } for( size_t i = 0; i < PARALLELISM_DEGREE; ++i ) - blake2s_update( S->R, hash[i], BLAKE2S_OUTBYTES ); + blake2s_update( &S->R, hash[i], BLAKE2S_OUTBYTES ); - blake2s_final( S->R, digest ); + blake2s_final( &S->R, digest ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/compress.hpp new/unrar/compress.hpp --- old/unrar/compress.hpp 2013-07-13 13:30:21.000000000 +0200 +++ new/unrar/compress.hpp 2013-08-02 15:30:12.000000000 +0200 @@ -34,8 +34,10 @@ enum FilterType { + // These values must not be changed, because we use them directly + // in RAR5 compression and decompression code. FILTER_DELTA=0, FILTER_E8, FILTER_E8E9, FILTER_ARM, - FILTER_AUDIO, FILTER_RGB, FILTER_ITANIUM, FILTER_PPM /*dummy*/, FILTER_NONE + FILTER_AUDIO, FILTER_RGB, FILTER_ITANIUM, FILTER_PPM, FILTER_NONE }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/dll.rc new/unrar/dll.rc --- old/unrar/dll.rc 2013-07-13 12:55:13.000000000 +0200 +++ new/unrar/dll.rc 2013-08-02 15:25:47.000000000 +0200 @@ -2,8 +2,8 @@ #include <commctrl.h> VS_VERSION_INFO VERSIONINFO -FILEVERSION 5, 0, 7, 925 -PRODUCTVERSION 5, 0, 7, 925 +FILEVERSION 5, 0, 8, 945 +PRODUCTVERSION 5, 0, 8, 945 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.0.7\0" - VALUE "ProductVersion", "5.0.7\0" + VALUE "FileVersion", "5.0.8\0" + VALUE "ProductVersion", "5.0.8\0" VALUE "LegalCopyright", "Copyright � Alexander Roshal 1993-2013\0" VALUE "OriginalFilename", "Unrar.dll\0" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/errhnd.cpp new/unrar/errhnd.cpp --- old/unrar/errhnd.cpp 2013-07-13 13:30:21.000000000 +0200 +++ new/unrar/errhnd.cpp 2013-08-02 15:30:12.000000000 +0200 @@ -15,6 +15,7 @@ Silent=false; DoShutdown=false; UserBreak=false; + MainExit=false; } @@ -287,7 +288,8 @@ #ifdef _WIN_ALL // Let the main thread to handle 'throw' and destroy file objects. - Sleep(200); + for (uint I=0;!ErrHandler.MainExit && I<50;I++) + Sleep(100); #if defined(USE_RC) && !defined(SFX_MODULE) && !defined(RARDLL) ExtRes.UnloadDLL(); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/errhnd.hpp new/unrar/errhnd.hpp --- old/unrar/errhnd.hpp 2013-07-13 13:30:21.000000000 +0200 +++ new/unrar/errhnd.hpp 2013-08-02 15:30:12.000000000 +0200 @@ -60,6 +60,7 @@ int GetSystemErrorCode(); void SetSystemErrorCode(int Code); bool UserBreak; + bool MainExit; // main() is completed. }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/rar.cpp new/unrar/rar.cpp --- old/unrar/rar.cpp 2013-07-13 13:30:21.000000000 +0200 +++ new/unrar/rar.cpp 2013-08-02 15:30:12.000000000 +0200 @@ -96,6 +96,7 @@ if (ShutdownOnClose) Shutdown(); #endif + ErrHandler.MainExit=true; return ErrHandler.GetErrorCode(); } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/strfn.hpp new/unrar/strfn.hpp --- old/unrar/strfn.hpp 2013-07-13 13:30:21.000000000 +0200 +++ new/unrar/strfn.hpp 2013-08-02 15:30:12.000000000 +0200 @@ -38,7 +38,9 @@ void itoa(int64 n,wchar *Str); const wchar* GetWide(const char *Src); const wchar* GetCmdParam(const wchar *CmdLine,wchar *Param,size_t MaxSize); +#ifndef SILENT void PrintfPrepareFmt(const wchar *Org,wchar *Cvt,size_t MaxSize); +#endif enum PASSWORD_TYPE {PASSWORD_GLOBAL,PASSWORD_FILE,PASSWORD_ARCHIVE}; bool GetPassword(PASSWORD_TYPE Type,const wchar *FileName,SecPassword *Password); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/version.hpp new/unrar/version.hpp --- old/unrar/version.hpp 2013-07-13 13:30:21.000000000 +0200 +++ new/unrar/version.hpp 2013-08-02 15:30:12.000000000 +0200 @@ -1,6 +1,6 @@ #define RARVER_MAJOR 5 #define RARVER_MINOR 0 -#define RARVER_BETA 7 -#define RARVER_DAY 13 -#define RARVER_MONTH 7 +#define RARVER_BETA 8 +#define RARVER_DAY 2 +#define RARVER_MONTH 8 #define RARVER_YEAR 2013 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
