Hello community,
here is the log from the commit of package unrar for openSUSE:Factory:NonFree
checked in at 2013-06-28 19:29:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-06-13
22:45:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrar.changes 2013-06-28
19:29:46.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun 28 07:33:41 UTC 2013 - idon...@suse.com
+
+- Update to 5.0.7
+ * No changelog available
+
+-------------------------------------------------------------------
Old:
----
unrarsrc-5.0.6.tar.gz
New:
----
unrarsrc-5.0.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unrar.spec ++++++
--- /var/tmp/diff_new_pack.Puvoy5/_old 2013-06-28 19:29:47.000000000 +0200
+++ /var/tmp/diff_new_pack.Puvoy5/_new 2013-06-28 19:29:47.000000000 +0200
@@ -18,10 +18,10 @@
# majorversion should match the major version number.
%define majorversion 5
-%define libsuffix 5_0_6
+%define libsuffix 5_0_7
Name: unrar
-Version: 5.0.6
+Version: 5.0.7
Release: 0
License: SUSE-NonFree
Summary: A program to extract, test, and view RAR archives
++++++ unrarsrc-5.0.6.tar.gz -> unrarsrc-5.0.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/archive.cpp new/unrar/archive.cpp
--- old/unrar/archive.cpp 2013-06-03 09:47:46.000000000 +0200
+++ new/unrar/archive.cpp 2013-06-19 12:36:26.000000000 +0200
@@ -52,13 +52,24 @@
}
+Archive::~Archive()
+{
+ if (DummyCmd)
+ delete Cmd;
+}
+
#ifndef SHELL_EXT
void Archive::CheckArc(bool EnableBroken)
{
if (!IsArchive(EnableBroken))
{
- Log(FileName,St(MBadArc),FileName);
+ // If FailedHeaderDecryption is set, we already reported that archive
+ // password is incorrect.
+ if (!FailedHeaderDecryption)
+ {
+ Log(FileName,St(MBadArc),FileName);
+ }
ErrHandler.Exit(RARX_FATAL);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/archive.hpp new/unrar/archive.hpp
--- old/unrar/archive.hpp 2013-06-03 09:47:46.000000000 +0200
+++ new/unrar/archive.hpp 2013-06-19 12:36:26.000000000 +0200
@@ -60,6 +60,7 @@
#endif
public:
Archive(RAROptions *InitCmd=NULL);
+ ~Archive();
RARFORMAT IsSignature(const byte *D,size_t Size);
bool IsArchive(bool EnableBroken);
size_t SearchBlock(HEADER_TYPE HeaderType);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/cmddata.cpp new/unrar/cmddata.cpp
--- old/unrar/cmddata.cpp 2013-06-03 09:47:46.000000000 +0200
+++ new/unrar/cmddata.cpp 2013-06-19 12:36:26.000000000 +0200
@@ -392,7 +392,10 @@
case 'P':
EncryptHeaders=true;
if (Switch[2]!=0)
+ {
Password.Set(Switch+2);
+ cleandata((void *)Switch,wcslen(Switch)*sizeof(Switch[0]));
+ }
else
if (!Password.IsSet())
{
@@ -631,7 +634,10 @@
eprintf(L"\n");
}
else
+ {
Password.Set(Switch+1);
+ cleandata((void *)Switch,wcslen(Switch)*sizeof(Switch[0]));
+ }
break;
#ifndef SFX_MODULE
case 'Q':
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/crypt3.cpp new/unrar/crypt3.cpp
--- old/unrar/crypt3.cpp 2013-06-03 09:47:46.000000000 +0200
+++ new/unrar/crypt3.cpp 2013-06-19 12:36:26.000000000 +0200
@@ -1,6 +1,5 @@
struct CryptKeyCacheItem
{
-#ifndef _SFX_RTL_
CryptKeyCacheItem()
{
Password.Set(L"");
@@ -12,7 +11,7 @@
cleandata(AESInit,sizeof(AESInit));
cleandata(&Password,sizeof(Password));
}
-#endif
+
byte AESKey[16],AESInit[16];
SecPassword Password;
bool SaltPresent;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/dll.rc new/unrar/dll.rc
--- old/unrar/dll.rc 2013-06-03 09:37:36.000000000 +0200
+++ new/unrar/dll.rc 2013-06-19 12:14:48.000000000 +0200
@@ -2,8 +2,8 @@
#include <commctrl.h>
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 5, 0, 5, 885
-PRODUCTVERSION 5, 0, 5, 885
+FILEVERSION 5, 0, 6, 901
+PRODUCTVERSION 5, 0, 6, 901
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.5\0"
- VALUE "ProductVersion", "5.0.5\0"
+ VALUE "FileVersion", "5.0.6\0"
+ VALUE "ProductVersion", "5.0.6\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-06-03 09:47:46.000000000 +0200
+++ new/unrar/errhnd.cpp 2013-06-19 12:36:26.000000000 +0200
@@ -265,7 +265,7 @@
}
-#if !defined(GUI) && !defined(_SFX_RTL_)
+#ifndef GUI
#ifdef _WIN_ALL
BOOL __stdcall ProcessSignal(DWORD SigType)
#else
@@ -315,7 +315,7 @@
void ErrorHandler::SetSignalHandlers(bool Enable)
{
EnableBreak=Enable;
-#if !defined(GUI) && !defined(_SFX_RTL_)
+#ifndef GUI
#ifdef _WIN_ALL
SetConsoleCtrlHandler(Enable ? ProcessSignal:NULL,TRUE);
// signal(SIGBREAK,Enable ? ProcessSignal:SIG_IGN);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/filefn.cpp new/unrar/filefn.cpp
--- old/unrar/filefn.cpp 2013-06-03 09:47:46.000000000 +0200
+++ new/unrar/filefn.cpp 2013-06-19 12:36:26.000000000 +0200
@@ -156,8 +156,8 @@
GetFilePath(Name,Root,ASIZE(Root));
char RootA[NM];
WideToChar(Root,RootA,ASIZE(RootA));
- struct statfs sfs;
- if (statfs(*RootA!=0 ? RootA:".",&sfs)!=0)
+ struct statvfs sfs;
+ if (statvfs(*RootA!=0 ? RootA:".",&sfs)!=0)
return 0;
int64 FreeSize=sfs.f_bsize;
FreeSize=FreeSize*sfs.f_bavail;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/filestr.cpp new/unrar/filestr.cpp
--- old/unrar/filestr.cpp 2013-06-03 09:47:46.000000000 +0200
+++ new/unrar/filestr.cpp 2013-06-19 12:36:26.000000000 +0200
@@ -30,7 +30,7 @@
{
if (AbortOnError)
ErrHandler.Exit(RARX_OPEN);
- return(false);
+ return false;
}
}
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/os.hpp new/unrar/os.hpp
--- old/unrar/os.hpp 2013-06-03 09:47:46.000000000 +0200
+++ new/unrar/os.hpp 2013-06-19 12:36:26.000000000 +0200
@@ -129,13 +129,10 @@
#if defined(RAR_SMP) && defined(__APPLE__)
#include <sys/sysctl.h>
#endif
+#ifndef SFX_MODULE
+ #include <sys/statvfs.h>
+#endif
#if defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) ||
defined(__APPLE__)
- #include <sys/param.h>
- #include <sys/mount.h>
-#else
- #ifndef SFX_MODULE
- #include <sys/statfs.h>
- #endif
#endif
#include <pwd.h>
#include <grp.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/pathfn.cpp new/unrar/pathfn.cpp
--- old/unrar/pathfn.cpp 2013-06-03 09:47:46.000000000 +0200
+++ new/unrar/pathfn.cpp 2013-06-19 12:36:26.000000000 +0200
@@ -594,7 +594,7 @@
bool IsDiskLetter(const wchar *Path)
{
wchar Letter=etoupperw(Path[0]);
- return(Letter>='A' && Letter<='Z' && IsDriveDiv(Path[1]));
+ return Letter>='A' && Letter<='Z' && IsDriveDiv(Path[1]);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/rar.cpp new/unrar/rar.cpp
--- old/unrar/rar.cpp 2013-06-03 09:47:46.000000000 +0200
+++ new/unrar/rar.cpp 2013-06-19 12:36:26.000000000 +0200
@@ -38,20 +38,7 @@
CommandData *Cmd=new CommandData;
#ifdef SFX_MODULE
wcscpy(Cmd->Command,L"X");
- char *Switch=NULL;
-#ifdef _SFX_RTL_
- char *CmdLine=GetCommandLineA();
- if (CmdLine!=NULL && *CmdLine=='\"')
- CmdLine=strchr(CmdLine+1,'\"');
- if (CmdLine!=NULL && (CmdLine=strpbrk(CmdLine," /"))!=NULL)
- {
- while (IsSpace(*CmdLine))
- CmdLine++;
- Switch=CmdLine;
- }
-#else
- Switch=argc>1 ? argv[1]:NULL;
-#endif
+ char *Switch=argc>1 ? argv[1]:NULL;
if (Switch!=NULL && Cmd->IsSwitch(Switch[0]))
{
int UpperCmd=etoupper(Switch[1]);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/resource.cpp new/unrar/resource.cpp
--- old/unrar/resource.cpp 2013-06-03 09:47:47.000000000 +0200
+++ new/unrar/resource.cpp 2013-06-19 12:36:26.000000000 +0200
@@ -12,7 +12,7 @@
wchar *Str=StrTable[StrNum];
*Str=0;
CharToWide(StringId,Str,ASIZE(StrTable[0]));
- return(Str);
+ return Str;
}
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/unpack50frag.cpp new/unrar/unpack50frag.cpp
--- old/unrar/unpack50frag.cpp 2013-06-03 09:47:47.000000000 +0200
+++ new/unrar/unpack50frag.cpp 2013-06-19 12:36:26.000000000 +0200
@@ -24,7 +24,7 @@
// Minimum still acceptable block size. Next allocations cannot be larger
// than current, so we do not need blocks if they are smaller than
// "size left / attempts left". Also we do not waste time to blocks
- // smaller than some artbitrary constant.
+ // smaller than some arbitrary constant.
size_t MinSize=Max(Size/(ASIZE(Mem)-BlockNum), 0x400000);
byte *NewMem=NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/version.hpp new/unrar/version.hpp
--- old/unrar/version.hpp 2013-06-03 09:47:47.000000000 +0200
+++ new/unrar/version.hpp 2013-06-19 12:36:26.000000000 +0200
@@ -1,6 +1,6 @@
#define RARVER_MAJOR 5
#define RARVER_MINOR 0
-#define RARVER_BETA 5
-#define RARVER_DAY 3
+#define RARVER_BETA 6
+#define RARVER_DAY 19
#define RARVER_MONTH 6
#define RARVER_YEAR 2013
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
