commit unrar for openSUSE:Factory:NonFree

31 May 2016

Hello community,

here is the log from the commit of package unrar for openSUSE:Factory:NonFree checked in at 2016-05-31 12:25:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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	2016-05-12 09:34:13.000000000 +0200
+++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrar.changes	2016-05-31 12:25:37.000000000 +0200
@@ -1,0 +2,6 @@
+Tue May 31 09:02:48 UTC 2016 - mpluskal@suse.com
+
+- Update to version 5.4.2:
+  * No changelog provided.
+
+-------------------------------------------------------------------

Old:
----
  unrarsrc-5.4.1.tar.gz

New:
----
  unrarsrc-5.4.2.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ unrar.spec ++++++
--- /var/tmp/diff_new_pack.66MjYw/_old	2016-05-31 12:25:38.000000000 +0200
+++ /var/tmp/diff_new_pack.66MjYw/_new	2016-05-31 12:25:38.000000000 +0200
@@ -18,10 +18,10 @@
 
 # majorversion should match the major version number.
 %define majorversion 5
-%define libsuffix 5_4_1
+%define libsuffix 5_4_2
 
 Name:           unrar
-Version:        5.4.1
+Version:        5.4.2
 Release:        0
 Summary:        A program to extract, test, and view RAR archives
 License:        SUSE-NonFree

++++++ unrarsrc-5.4.1.tar.gz -> unrarsrc-5.4.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/UnRAR.vcxproj new/unrar/UnRAR.vcxproj
--- old/unrar/UnRAR.vcxproj	2016-03-05 17:23:26.000000000 +0100
+++ new/unrar/UnRAR.vcxproj	2016-05-10 22:16:27.000000000 +0200
@@ -105,6 +105,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>StdCall</CallingConvention>
       <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -130,6 +131,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>StdCall</CallingConvention>
       <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -151,7 +153,7 @@
       <StructMemberAlignment>Default</StructMemberAlignment>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -194,6 +196,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>StdCall</CallingConvention>
       <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/UnRARDll.vcxproj new/unrar/UnRARDll.vcxproj
--- old/unrar/UnRARDll.vcxproj	2016-03-07 09:09:29.000000000 +0100
+++ new/unrar/UnRARDll.vcxproj	2016-05-10 22:17:57.000000000 +0200
@@ -146,6 +146,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>Cdecl</CallingConvention>
       <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)unrar.dll</OutputFile>
@@ -175,6 +176,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>Cdecl</CallingConvention>
       <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)unrar.dll</OutputFile>
@@ -199,7 +201,7 @@
       <StructMemberAlignment>4Bytes</StructMemberAlignment>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -247,6 +249,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>Cdecl</CallingConvention>
       <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)unrar.dll</OutputFile>
@@ -274,7 +277,7 @@
       <StructMemberAlignment>4Bytes</StructMemberAlignment>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -322,6 +325,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>StdCall</CallingConvention>
       <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)unrar.dll</OutputFile>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/arcread.cpp new/unrar/arcread.cpp
--- old/unrar/arcread.cpp	2016-05-10 11:27:22.000000000 +0200
+++ new/unrar/arcread.cpp	2016-05-30 13:38:10.000000000 +0200
@@ -53,9 +53,11 @@
 
 size_t Archive::SearchSubBlock(const wchar *Type)
 {
-  size_t Size;
+  size_t Size,Count=0;
   while ((Size=ReadHeader())!=0 && GetHeaderType()!=HEAD_ENDARC)
   {
+    if ((++Count & 127)==0)
+      Wait();
     if (GetHeaderType()==HEAD_SERVICE && SubHead.CmpName(Type))
       return Size;
     SeekToNext();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/dll.rc new/unrar/dll.rc
--- old/unrar/dll.rc	2016-05-10 11:07:15.000000000 +0200
+++ new/unrar/dll.rc	2016-05-30 13:35:51.000000000 +0200
@@ -2,8 +2,8 @@
 #include <commctrl.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 5, 40, 1, 1960
-PRODUCTVERSION 5, 40, 1, 1960
+FILEVERSION 5, 40, 2, 1980
+PRODUCTVERSION 5, 40, 2, 1980
 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.40.1\0"
-      VALUE "ProductVersion", "5.40.1\0"
+      VALUE "FileVersion", "5.40.2\0"
+      VALUE "ProductVersion", "5.40.2\0"
       VALUE "LegalCopyright", "Copyright � Alexander Roshal 1993-2016\0"
       VALUE "OriginalFilename", "Unrar.dll\0"
     }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/filestr.cpp new/unrar/filestr.cpp
--- old/unrar/filestr.cpp	2016-05-10 11:27:22.000000000 +0200
+++ new/unrar/filestr.cpp	2016-05-30 13:38:10.000000000 +0200
@@ -1,7 +1,5 @@
 #include "rar.hpp"
 
-static bool IsUnicode(byte *Data,int Size);
-
 bool ReadTextFile(
   const wchar *Name,
   StringList *List,
@@ -36,7 +34,7 @@
   else
     SrcFile.SetHandleType(FILE_HANDLESTD);
 
-  unsigned int DataSize=0,ReadSize;
+  uint DataSize=0,ReadSize;
   const int ReadBlock=4096;
 
   // Our algorithm below needs at least two trailing zeroes after data.
@@ -44,7 +42,7 @@
   // in case read Unicode data contains uneven number of bytes.
   const size_t ZeroPadding=5;
 
-  Array<char> Data(ReadBlock+ZeroPadding);
+  Array<byte> Data(ReadBlock+ZeroPadding);
   while ((ReadSize=SrcFile.Read(&Data[DataSize],ReadBlock))!=0)
   {
     DataSize+=ReadSize;
@@ -55,17 +53,30 @@
 
   Array<wchar> WideStr;
 
-  if (SrcCharset==RCH_UNICODE ||
-      SrcCharset==RCH_DEFAULT && IsUnicode((byte *)&Data[0],DataSize))
+  int LowEndian=Data[0]==255 && Data[1]==254 ? 1:0;
+  int BigEndian=Data[0]==254 && Data[1]==255 ? 1:0;
+
+  bool IsUnicode=false;
+  if (LowEndian || BigEndian)  
+    for (size_t I=2;I<DataSize;I++)
+      if (Data[I]<32 && Data[I]!='\r' && Data[I]!='\n')
+      {
+        IsUnicode=true; // High byte in UTF-16 char is found.
+        break;
+      }
+
+  if (SrcCharset==RCH_UNICODE || SrcCharset==RCH_DEFAULT && IsUnicode)
   {
-    // Unicode in native system format, can be more than 2 bytes per character.
-    Array<wchar> DataW(Data.Size()/2+1);
-    for (size_t I=2;I<Data.Size()-1;I+=2)
+    size_t Start=2; // Skip byte order mark.
+    if (!LowEndian && !BigEndian) // No byte order mask.
     {
-      // Need to convert Data to (byte) first to prevent the sign extension
-      // to higher bytes.
-      DataW[(I-2)/2]=(wchar)((byte)Data[I])+(wchar)((byte)Data[I+1])*256;
+      Start=0;
+      LowEndian=1;
     }
+    
+    Array<wchar> DataW(Data.Size()/2+1);
+    for (size_t I=Start;I<Data.Size()-1;I+=2)
+      DataW[(I-Start)/2]=Data[I+BigEndian]+Data[I+LowEndian]*256;
 
     wchar *CurStr=&DataW[0];
 
@@ -122,7 +133,7 @@
   }
   else
   {
-    char *CurStr=&Data[0];
+    char *CurStr=(char *)&Data[0];
     while (*CurStr!=0)
     {
       char *NextStr=CurStr,*CmtPtr=NULL;
@@ -183,14 +194,3 @@
   }
   return true;
 }
-
-
-bool IsUnicode(byte *Data,int Size)
-{
-  if (Size<4 || Data[0]!=0xff || Data[1]!=0xfe)
-    return false;
-  for (int I=2;I<Size;I++)
-    if (Data[I]<32 && Data[I]!='\r' && Data[I]!='\n')
-      return true;
-  return false;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/scantree.cpp new/unrar/scantree.cpp
--- old/unrar/scantree.cpp	2016-05-10 11:27:23.000000000 +0200
+++ new/unrar/scantree.cpp	2016-05-30 13:38:10.000000000 +0200
@@ -18,6 +18,7 @@
   *ErrArcName=0;
   Cmd=NULL;
   ErrDirList=NULL;
+  ErrDirSpecPathLength=NULL;
 }
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/version.hpp new/unrar/version.hpp
--- old/unrar/version.hpp	2016-05-10 11:27:23.000000000 +0200
+++ new/unrar/version.hpp	2016-05-30 13:38:10.000000000 +0200
@@ -1,6 +1,6 @@
 #define RARVER_MAJOR     5
 #define RARVER_MINOR    40
-#define RARVER_BETA      1
-#define RARVER_DAY      10
+#define RARVER_BETA      2
+#define RARVER_DAY      30
 #define RARVER_MONTH     5
 #define RARVER_YEAR   2016
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/win32acl.cpp new/unrar/win32acl.cpp
--- old/unrar/win32acl.cpp	2016-05-10 11:27:23.000000000 +0200
+++ new/unrar/win32acl.cpp	2016-05-30 13:38:10.000000000 +0200
@@ -49,7 +49,7 @@
     si|=SACL_SECURITY_INFORMATION;
   SECURITY_DESCRIPTOR *sd=(SECURITY_DESCRIPTOR *)&UnpData[0];
 
-  int SetCode=SetFileSecurityW(FileName,si,sd);
+  int SetCode=SetFileSecurity(FileName,si,sd);
 
   if (!SetCode)
   {

    

root＠hilbert.suse.de

tags

participants (1)