commit unrar for openSUSE:Factory:NonFree

29 Jun 2018

Hello community,

here is the log from the commit of package unrar for openSUSE:Factory:NonFree checked in at 2018-06-29 22:37:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory:NonFree/unrar (Old)
 and      /work/SRC/openSUSE:Factory:NonFree/.unrar.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "unrar"

Fri Jun 29 22:37:31 2018 rev:72 rq:619129 version:5.6.5

Changes:
--------

--- /work/SRC/openSUSE:Factory:NonFree/unrar/unrar.changes	2018-06-18 13:50:56.055805812 +0200
+++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrar.changes	2018-06-29 22:37:32.205942636 +0200
@@ -1,0 +2,6 @@
+Tue Jun 26 09:41:59 UTC 2018 - idonmez@suse.com
+
+- Update to version 5.6.5
+  * No upstream changelog
+
+-------------------------------------------------------------------

Old:
----
  unrarsrc-5.6.4.tar.gz

New:
----
  unrarsrc-5.6.5.tar.gz

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

Other differences:
------------------
++++++ unrar.spec ++++++
--- /var/tmp/diff_new_pack.XQFdCe/_old	2018-06-29 22:37:32.621942275 +0200
+++ /var/tmp/diff_new_pack.XQFdCe/_new	2018-06-29 22:37:32.621942275 +0200
@@ -18,10 +18,10 @@
 
 # majorversion should match the major version number.
 %define majorversion 5
-%define libsuffix 5_6_4
+%define libsuffix 5_6_5
 
 Name:           unrar
-Version:        5.6.4
+Version:        5.6.5
 Release:        0
 Summary:        A program to extract, test, and view RAR archives
 License:        NonFree

++++++ unrarsrc-5.6.4.tar.gz -> unrarsrc-5.6.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/archive.cpp new/unrar/archive.cpp
--- old/unrar/archive.cpp	2018-05-13 21:08:38.000000000 +0200
+++ new/unrar/archive.cpp	2018-06-24 17:10:30.000000000 +0200
@@ -216,7 +216,8 @@
 
   if (BrokenHeader || !StartFound) // Main archive header is corrupt or missing.
   {
-    uiMsg(UIERROR_MHEADERBROKEN,FileName);
+    if (!FailedHeaderDecryption) // If not reported a wrong password already.
+      uiMsg(UIERROR_MHEADERBROKEN,FileName);
     if (!EnableBroken)
       return false;
   }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/arcread.cpp new/unrar/arcread.cpp
--- old/unrar/arcread.cpp	2018-05-13 21:08:39.000000000 +0200
+++ new/unrar/arcread.cpp	2018-06-24 17:10:30.000000000 +0200
@@ -563,6 +563,11 @@
       return 0;
     }
 
+    // We repeat the password request only for manually entered passwords
+    // and not for -p<pwd>. Wrong password can be intentionally provided
+    // in -p<pwd> to not stop batch processing for encrypted archives.
+    bool GlobalPassword=Cmd->Password.IsSet();
+
     while (true) // Repeat the password prompt for wrong passwords.
     {
       RequestArcPassword();
@@ -572,11 +577,23 @@
       // Verify password validity.
       if (CryptHead.UsePswCheck && memcmp(PswCheck,CryptHead.PswCheck,SIZE_PSWCHECK)!=0)
       {
-        // This message is used by Android GUI and Windows GUI and SFX to
-        // reset cached passwords. Update appropriate code if changed.
-        uiMsg(UIWAIT_BADPSW,FileName);
+        if (GlobalPassword) // For -p<pwd> or Ctrl+P.
+        {
+          // This message is used by Android GUI to reset cached passwords.
+          // Update appropriate code if changed.
+          uiMsg(UIERROR_BADPSW,FileName);
+          FailedHeaderDecryption=true;
+          ErrHandler.SetErrorCode(RARX_BADPWD);
+          return 0;
+        }
+        else // For passwords entered manually.
+        {
+          // This message is used by Android GUI and Windows GUI and SFX to
+          // reset cached passwords. Update appropriate code if changed.
+          uiMsg(UIWAIT_BADPSW,FileName);
+          Cmd->Password.Clean();
+        }
 
-        Cmd->Password.Clean();
 #ifdef RARDLL
         // Avoid new requests for unrar.dll to prevent the infinite loop
         // if app always returns the same password.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/dll.rc new/unrar/dll.rc
--- old/unrar/dll.rc	2018-05-13 21:05:03.000000000 +0200
+++ new/unrar/dll.rc	2018-06-24 17:02:05.000000000 +0200
@@ -2,8 +2,8 @@
 #include <commctrl.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 5, 60, 4, 2695
-PRODUCTVERSION 5, 60, 4, 2695
+FILEVERSION 5, 60, 100, 2736
+PRODUCTVERSION 5, 60, 100, 2736
 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.4\0"
-      VALUE "ProductVersion", "5.60.4\0"
+      VALUE "FileVersion", "5.60.0\0"
+      VALUE "ProductVersion", "5.60.0\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/errhnd.cpp new/unrar/errhnd.cpp
--- old/unrar/errhnd.cpp	2018-05-13 21:08:39.000000000 +0200
+++ new/unrar/errhnd.cpp	2018-06-24 17:10:30.000000000 +0200
@@ -270,6 +270,7 @@
 #endif
 
   ErrHandler.UserBreak=true;
+  ErrHandler.SetDisableShutdown();
   mprintf(St(MBreak));
 
 #ifdef _WIN_ALL
@@ -293,7 +294,7 @@
 #endif
 
 #if defined(_WIN_ALL) && !defined(_MSC_VER)
-  // never reached, just to avoid a compiler warning
+  // Never reached, just to avoid a compiler warning
   return TRUE;
 #endif
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/errhnd.hpp new/unrar/errhnd.hpp
--- old/unrar/errhnd.hpp	2018-05-13 21:08:39.000000000 +0200
+++ new/unrar/errhnd.hpp	2018-06-24 17:10:31.000000000 +0200
@@ -61,6 +61,7 @@
     void SysErrMsg();
     int GetSystemErrorCode();
     void SetSystemErrorCode(int Code);
+    void SetDisableShutdown() {DisableShutdown=true;}
     bool IsShutdownEnabled() {return !DisableShutdown;}
 
     bool UserBreak; // Ctrl+Break is pressed.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/extract.cpp new/unrar/extract.cpp
--- old/unrar/extract.cpp	2018-05-13 21:08:40.000000000 +0200
+++ new/unrar/extract.cpp	2018-06-24 17:10:31.000000000 +0200
@@ -59,7 +59,11 @@
   {
     if (!PasswordCancelled)
       uiMsg(UIERROR_NOFILESTOEXTRACT,ArcName);
-    ErrHandler.SetErrorCode(RARX_NOFILES);
+
+    // Other error codes may explain a reason of "no files extracted" clearer,
+    // so set it only if no other errors found (wrong mask set by user).
+    if (ErrHandler.GetErrorCode()==RARX_SUCCESS)
+      ErrHandler.SetErrorCode(RARX_NOFILES);
   }
   else
     if (!Cmd->DisableDone)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/hardlinks.cpp new/unrar/hardlinks.cpp
--- old/unrar/hardlinks.cpp	2018-05-13 21:08:40.000000000 +0200
+++ new/unrar/hardlinks.cpp	2018-06-24 17:10:31.000000000 +0200
@@ -3,7 +3,12 @@
   SlashToNative(NameExisting,NameExisting,NameExistingSize); // Not needed for RAR 5.1+ archives.
 
   if (!FileExist(NameExisting))
+  {
+    uiMsg(UIERROR_HLINKCREATE,NameNew);
+    uiMsg(UIERROR_NOLINKTARGET);
+    ErrHandler.SetErrorCode(RARX_CREATE);
     return false;
+  }
   CreatePath(NameNew,true);
 
 #ifdef _WIN_ALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/loclang.hpp new/unrar/loclang.hpp
--- old/unrar/loclang.hpp	2018-05-13 21:08:40.000000000 +0200
+++ new/unrar/loclang.hpp	2018-06-24 17:10:31.000000000 +0200
@@ -375,6 +375,7 @@
 #define   MCopyingData       L"\nCopying data"
 #define   MErrCreateLnkS     L"\nCannot create symbolic link %s"
 #define   MErrCreateLnkH     L"\nCannot create hard link %s"
+#define   MErrLnkTarget      L"\nYou need to unpack the link target first"
 #define   MNeedAdmin         L"\nYou may need to run RAR as administrator"
 #define   MDictOutMem        L"\nNot enough memory for %d MB compression dictionary, changed to %d MB."
 #define   MUseSmalllerDict   L"\nPlease use a smaller compression dictionary."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/os.hpp new/unrar/os.hpp
--- old/unrar/os.hpp	2018-05-13 21:08:40.000000000 +0200
+++ new/unrar/os.hpp	2018-06-24 17:10:31.000000000 +0200
@@ -22,7 +22,16 @@
 
 #ifdef _WIN_ALL
 
-#define STRICT
+
+// We got a report that just "#define STRICT" is incompatible with
+// "#define STRICT 1" in Windows 10 SDK minwindef.h and depending on the order
+// in which these statements are reached this may cause a compiler warning
+// and build break for other projects incorporating this source.
+// So we changed it to "#define STRICT 1".
+#ifndef STRICT
+#define STRICT 1
+#endif
+
 #define UNICODE
 #undef WINVER
 #undef _WIN32_WINNT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/rar.cpp new/unrar/rar.cpp
--- old/unrar/rar.cpp	2018-05-13 21:08:40.000000000 +0200
+++ new/unrar/rar.cpp	2018-06-24 17:10:31.000000000 +0200
@@ -75,13 +75,6 @@
     ErrHandler.SetSilent(Cmd->AllYes || Cmd->MsgStream==MSG_NULL);
 
     Cmd->OutTitle();
-/*
-    byte Buf[10000];
-    File Src;
-    Src.TOpen(L"123.rar");
-    int Size=Src.Read(Buf,sizeof(Buf));
-    Cmd->SetArcInMem(Buf,Size);
-*/
     Cmd->ProcessCommand();
     delete Cmd;
   }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/ui.hpp new/unrar/ui.hpp
--- old/unrar/ui.hpp	2018-05-13 21:08:41.000000000 +0200
+++ new/unrar/ui.hpp	2018-06-24 17:10:32.000000000 +0200
@@ -14,11 +14,11 @@
   UIERROR_FILEDELETE, UIERROR_RECYCLEFAILED, UIERROR_FILERENAME,
   UIERROR_FILEATTR, UIERROR_FILECOPY, UIERROR_FILECOPYHINT,
   UIERROR_DIRCREATE, UIERROR_SLINKCREATE, UIERROR_HLINKCREATE,
-  UIERROR_NEEDADMIN, UIERROR_ARCBROKEN, UIERROR_HEADERBROKEN,
-  UIERROR_MHEADERBROKEN, UIERROR_FHEADERBROKEN, UIERROR_SUBHEADERBROKEN,
-  UIERROR_SUBHEADERUNKNOWN, UIERROR_SUBHEADERDATABROKEN, UIERROR_RRDAMAGED,
-  UIERROR_UNKNOWNMETHOD, UIERROR_UNKNOWNENCMETHOD, UIERROR_RENAMING,
-  UIERROR_NEWERRAR, UIERROR_NOTSFX, UIERROR_OLDTOSFX,
+  UIERROR_NOLINKTARGET, UIERROR_NEEDADMIN, UIERROR_ARCBROKEN,
+  UIERROR_HEADERBROKEN, UIERROR_MHEADERBROKEN, UIERROR_FHEADERBROKEN,
+  UIERROR_SUBHEADERBROKEN, UIERROR_SUBHEADERUNKNOWN,
+  UIERROR_SUBHEADERDATABROKEN, UIERROR_RRDAMAGED, UIERROR_UNKNOWNMETHOD,
+  UIERROR_UNKNOWNENCMETHOD, UIERROR_RENAMING, UIERROR_NEWERRAR, UIERROR_NOTSFX, UIERROR_OLDTOSFX,
   UIERROR_WRONGSFXVER, UIERROR_ALREADYENC, UIERROR_DICTOUTMEM,
   UIERROR_USESMALLERDICT, UIERROR_MODIFYUNKNOWN, UIERROR_MODIFYOLD,
   UIERROR_MODIFYLOCKED, UIERROR_MODIFYVOLUME, UIERROR_NOTVOLUME,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/uiconsole.cpp new/unrar/uiconsole.cpp
--- old/unrar/uiconsole.cpp	2018-05-13 21:08:41.000000000 +0200
+++ new/unrar/uiconsole.cpp	2018-06-24 17:10:32.000000000 +0200
@@ -151,6 +151,10 @@
     case UIERROR_HLINKCREATE:
       Log(NULL,St(MErrCreateLnkH),Str[0]);
       break;
+    case UIERROR_NOLINKTARGET:
+      Log(NULL,St(MErrLnkTarget));
+      mprintf(L"     "); // For progress percent.
+      break;
     case UIERROR_NEEDADMIN:
       Log(NULL,St(MNeedAdmin));
       break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/version.hpp new/unrar/version.hpp
--- old/unrar/version.hpp	2018-05-13 21:08:41.000000000 +0200
+++ new/unrar/version.hpp	2018-06-24 17:10:32.000000000 +0200
@@ -1,6 +1,6 @@
 #define RARVER_MAJOR     5
 #define RARVER_MINOR    60
-#define RARVER_BETA      4
-#define RARVER_DAY      14
-#define RARVER_MONTH     5
+#define RARVER_BETA      0
+#define RARVER_DAY      24
+#define RARVER_MONTH     6
 #define RARVER_YEAR   2018

    

root

tags

participants (1)