Hello community,
here is the log from the commit of package unrar for openSUSE:Factory:NonFree
checked in at 2015-08-28 08:27:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-08-05
06:52:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrar.changes 2015-08-28
08:27:56.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Aug 27 17:42:59 UTC 2015 - idon...@suse.com
+
+- Update to 5.3.3
+ * No changelog available.
+
+-------------------------------------------------------------------
Old:
----
unrarsrc-5.3.2.tar.gz
New:
----
unrarsrc-5.3.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unrar.spec ++++++
--- /var/tmp/diff_new_pack.sYu3vj/_old 2015-08-28 08:27:58.000000000 +0200
+++ /var/tmp/diff_new_pack.sYu3vj/_new 2015-08-28 08:27:58.000000000 +0200
@@ -18,10 +18,10 @@
# majorversion should match the major version number.
%define majorversion 5
-%define libsuffix 5_3_2
+%define libsuffix 5_3_3
Name: unrar
-Version: 5.3.2
+Version: 5.3.3
Release: 0
Summary: A program to extract, test, and view RAR archives
License: SUSE-NonFree
++++++ unrarsrc-5.3.2.tar.gz -> unrarsrc-5.3.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 2015-08-04 11:51:02.000000000 +0200
+++ new/unrar/dll.rc 2015-08-27 14:37:41.000000000 +0200
@@ -2,8 +2,8 @@
#include <commctrl.h>
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 5, 30, 2, 1679
-PRODUCTVERSION 5, 30, 2, 1679
+FILEVERSION 5, 30, 3, 1702
+PRODUCTVERSION 5, 30, 3, 1702
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.30.2\0"
- VALUE "ProductVersion", "5.30.2\0"
+ VALUE "FileVersion", "5.30.3\0"
+ VALUE "ProductVersion", "5.30.3\0"
VALUE "LegalCopyright", "Copyright � Alexander Roshal 1993-2015\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 2015-08-04 12:22:40.000000000 +0200
+++ new/unrar/errhnd.cpp 2015-08-27 14:40:59.000000000 +0200
@@ -12,9 +12,9 @@
ErrCount=0;
EnableBreak=true;
Silent=false;
- DoShutdown=false;
UserBreak=false;
MainExit=false;
+ DisableShutdown=false;
}
@@ -64,7 +64,10 @@
if (!Silent)
{
SysErrMsg();
- return uiAskRepeatRead(FileName);
+ bool Repeat=uiAskRepeatRead(FileName);
+ if (!Repeat) // Disable shutdown if user pressed Cancel in error dialog.
+ DisableShutdown=true;
+ return Repeat;
}
#endif
return false;
@@ -100,7 +103,10 @@
if (!Silent)
{
SysErrMsg();
- return uiAskRepeatWrite(FileName,DiskFull);
+ bool Repeat=uiAskRepeatWrite(FileName,DiskFull);
+ if (!Repeat) // Disable shutdown if user pressed Cancel in error dialog.
+ DisableShutdown=true;
+ return Repeat;
}
#endif
return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/errhnd.hpp new/unrar/errhnd.hpp
--- old/unrar/errhnd.hpp 2015-08-04 12:22:40.000000000 +0200
+++ new/unrar/errhnd.hpp 2015-08-27 14:40:59.000000000 +0200
@@ -25,7 +25,7 @@
uint ErrCount;
bool EnableBreak;
bool Silent;
- bool DoShutdown;
+ bool DisableShutdown; // Shutdown is not suitable after last error.
public:
ErrorHandler();
void Clean();
@@ -57,11 +57,12 @@
void SetSignalHandlers(bool Enable);
void Throw(RAR_EXIT Code);
void SetSilent(bool Mode) {Silent=Mode;};
- void SetShutdown(bool Mode) {DoShutdown=Mode;};
void SysErrMsg();
int GetSystemErrorCode();
void SetSystemErrorCode(int Code);
- bool UserBreak;
+ bool IsShutdownEnabled() {return !DisableShutdown;}
+
+ bool UserBreak; // Ctrl+Break is pressed.
bool MainExit; // main() is completed.
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/filcreat.cpp new/unrar/filcreat.cpp
--- old/unrar/filcreat.cpp 2015-08-04 12:22:40.000000000 +0200
+++ new/unrar/filcreat.cpp 2015-08-27 14:40:59.000000000 +0200
@@ -63,7 +63,7 @@
Ext=Name+NameLength;
for (uint FileVer=1;;FileVer++)
{
-#ifdef _ANDROID // No swprintf in Android NDK r9.
+#ifdef _ANDROID // No swprintf in Android prior to Android 5.0.
uint NamePrefixLength=Ext-Name;
wcsncpy(NewName,Name,NamePrefixLength);
wcscpy(NewName+NamePrefixLength,L"(");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/file.cpp new/unrar/file.cpp
--- old/unrar/file.cpp 2015-08-04 12:22:40.000000000 +0200
+++ new/unrar/file.cpp 2015-08-27 14:40:59.000000000 +0200
@@ -575,7 +575,20 @@
#ifdef _WIN_ALL
return SetEndOfFile(hFile)==TRUE;
#else
- return false;
+ return ftruncate(GetFD(),(off_t)Tell())==0;
+#endif
+}
+
+
+void File::Flush()
+{
+#ifdef _WIN_ALL
+ FlushFileBuffers(hFile);
+#else
+#ifndef FILE_USE_OPEN
+ fflush(hFile);
+#endif
+ fsync(GetFD());
#endif
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/file.hpp new/unrar/file.hpp
--- old/unrar/file.hpp 2015-08-04 12:22:40.000000000 +0200
+++ new/unrar/file.hpp 2015-08-27 14:40:59.000000000 +0200
@@ -90,6 +90,7 @@
byte GetByte();
void PutByte(byte Byte);
bool Truncate();
+ void Flush();
void SetOpenFileTime(RarTime *ftm,RarTime *ftc=NULL,RarTime *fta=NULL);
void SetCloseFileTime(RarTime *ftm,RarTime *fta=NULL);
static void SetCloseFileTimeByName(const wchar *Name,RarTime *ftm,RarTime
*fta);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/rar.cpp new/unrar/rar.cpp
--- old/unrar/rar.cpp 2015-08-04 12:22:40.000000000 +0200
+++ new/unrar/rar.cpp 2015-08-27 14:40:59.000000000 +0200
@@ -74,7 +74,6 @@
InitConsoleOptions(Cmd->MsgStream,Cmd->RedirectCharset);
InitLogOptions(Cmd->LogName,Cmd->ErrlogCharset);
ErrHandler.SetSilent(Cmd->AllYes || Cmd->MsgStream==MSG_NULL);
- ErrHandler.SetShutdown(Cmd->Shutdown);
Cmd->OutTitle();
Cmd->ProcessCommand();
@@ -95,7 +94,7 @@
}
#if defined(_WIN_ALL) && !defined(SFX_MODULE) && !defined(SHELL_EXT)
- if (ShutdownOnClose)
+ if (ShutdownOnClose && ErrHandler.IsShutdownEnabled())
Shutdown();
#endif
ErrHandler.MainExit=true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/raros.hpp new/unrar/raros.hpp
--- old/unrar/raros.hpp 2015-08-04 12:22:40.000000000 +0200
+++ new/unrar/raros.hpp 2015-08-27 14:40:59.000000000 +0200
@@ -19,7 +19,7 @@
#endif
#endif
-#ifdef ANDROID
+#if defined(ANDROID) || defined(__ANDROID__)
#define _UNIX
#define _ANDROID
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/version.hpp new/unrar/version.hpp
--- old/unrar/version.hpp 2015-08-04 12:22:40.000000000 +0200
+++ new/unrar/version.hpp 2015-08-27 14:40:59.000000000 +0200
@@ -1,6 +1,6 @@
#define RARVER_MAJOR 5
#define RARVER_MINOR 30
-#define RARVER_BETA 2
-#define RARVER_DAY 4
+#define RARVER_BETA 3
+#define RARVER_DAY 27
#define RARVER_MONTH 8
#define RARVER_YEAR 2015
