Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package unrar for openSUSE:Factory:NonFree
checked in at 2021-05-18 18:25:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory:NonFree/unrar (Old)
and /work/SRC/openSUSE:Factory:NonFree/.unrar.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unrar"
Tue May 18 18:25:48 2021 rev:96 rq:894032 version:6.0.6
Changes:
--------
--- /work/SRC/openSUSE:Factory:NonFree/unrar/unrar.changes 2021-04-14
10:08:40.293259907 +0200
+++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new.2988/unrar.changes
2021-05-18 18:25:48.931125435 +0200
@@ -1,0 +2,6 @@
+Tue May 18 11:12:04 UTC 2021 - Ismail D??nmez <ism...@i10z.com>
+
+- Update to version 6.0.6
+ * Based on WinRAR 6.02 beta 1
+
+-------------------------------------------------------------------
Old:
----
unrarsrc-6.0.5.tar.gz
New:
----
unrarsrc-6.0.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unrar.spec ++++++
--- /var/tmp/diff_new_pack.AN2kiV/_old 2021-05-18 18:25:49.583122608 +0200
+++ /var/tmp/diff_new_pack.AN2kiV/_new 2021-05-18 18:25:49.587122591 +0200
@@ -18,10 +18,10 @@
# majorversion should match the major version number.
%define majorversion 6
-%define libsuffix 6_0_5
+%define libsuffix 6_0_6
Name: unrar
-Version: 6.0.5
+Version: 6.0.6
Release: 0
Summary: A program to extract, test, and view RAR archives
License: NonFree
++++++ unrarsrc-6.0.5.tar.gz -> unrarsrc-6.0.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/dll.rc new/unrar/dll.rc
--- old/unrar/dll.rc 2021-04-07 16:08:55.000000000 +0200
+++ new/unrar/dll.rc 2021-05-16 21:55:19.000000000 +0200
@@ -2,8 +2,8 @@
#include <commctrl.h>
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 6, 1, 100, 3756
-PRODUCTVERSION 6, 1, 100, 3756
+FILEVERSION 6, 2, 1, 3796
+PRODUCTVERSION 6, 2, 1, 3796
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", "6.1.0\0"
- VALUE "ProductVersion", "6.1.0\0"
+ VALUE "FileVersion", "6.2.1\0"
+ VALUE "ProductVersion", "6.2.1\0"
VALUE "LegalCopyright", "Copyright ? Alexander Roshal 1993-2021\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 2021-04-07 16:41:26.000000000 +0200
+++ new/unrar/errhnd.cpp 2021-05-17 09:31:09.000000000 +0200
@@ -367,7 +367,7 @@
void ErrorHandler::SysErrMsg()
{
-#if !defined(SFX_MODULE) && !defined(SILENT)
+#ifndef SILENT
wchar Msg[1024];
if (!GetSysErrMsg(Msg,ASIZE(Msg)))
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/extract.cpp new/unrar/extract.cpp
--- old/unrar/extract.cpp 2021-04-07 16:41:26.000000000 +0200
+++ new/unrar/extract.cpp 2021-05-17 09:31:09.000000000 +0200
@@ -888,6 +888,8 @@
wchar LastChar=*PointToLastChar(Cmd->ExtrPath);
// We need IsPathDiv check here to correctly handle Unix forward slash
// in the end of destination path in Windows: rar x arc dest/
+ // so we call IsPathDiv first instead of just calling AddEndSlash,
+ // which checks for only one type of path separator.
// IsDriveDiv is needed for current drive dir: rar x arc d:
if (!IsPathDiv(LastChar) && !IsDriveDiv(LastChar))
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/list.cpp new/unrar/list.cpp
--- old/unrar/list.cpp 2021-04-07 16:41:26.000000000 +0200
+++ new/unrar/list.cpp 2021-05-17 09:31:10.000000000 +0200
@@ -1,6 +1,6 @@
#include "rar.hpp"
-static void ListFileHeader(Archive &Arc,FileHeader &hd,bool &TitleShown,bool
Verbose,bool Technical,bool Bare);
+static void ListFileHeader(Archive &Arc,FileHeader &hd,bool &TitleShown,bool
Verbose,bool Technical,bool Bare,bool DisableNames);
static void ListSymLink(Archive &Arc);
static void ListFileAttr(uint A,HOST_SYSTEM_TYPE HostType,wchar
*AttrStr,size_t AttrSize);
static void ListOldSubHeader(Archive &Arc);
@@ -95,7 +95,7 @@
FileMatched=Cmd->IsProcessFile(Arc.FileHead,NULL,MATCH_WILDSUBPATH,0,NULL,0)!=0;
if (FileMatched)
{
-
ListFileHeader(Arc,Arc.FileHead,TitleShown,Verbose,Technical,Bare);
+
ListFileHeader(Arc,Arc.FileHead,TitleShown,Verbose,Technical,Bare,Cmd->DisableNames);
if (!Arc.FileHead.SplitBefore)
{
TotalUnpSize+=Arc.FileHead.UnpSize;
@@ -108,7 +108,7 @@
if (FileMatched && !Bare)
{
if (Technical && ShowService)
-
ListFileHeader(Arc,Arc.SubHead,TitleShown,Verbose,true,false);
+
ListFileHeader(Arc,Arc.SubHead,TitleShown,Verbose,true,false,Cmd->DisableNames);
}
break;
}
@@ -188,31 +188,37 @@
};
-void ListFileHeader(Archive &Arc,FileHeader &hd,bool &TitleShown,bool
Verbose,bool Technical,bool Bare)
+void ListFileHeader(Archive &Arc,FileHeader &hd,bool &TitleShown,bool
Verbose,bool Technical,bool Bare,bool DisableNames)
{
- wchar *Name=hd.FileName;
- RARFORMAT Format=Arc.Format;
-
- if (Bare)
- {
- mprintf(L"%s\n",Name);
- return;
- }
-
- if (!TitleShown && !Technical)
+ if (!TitleShown && !Technical && !Bare)
{
if (Verbose)
{
mprintf(L"\n%ls",St(MListTitleV));
- mprintf(L"\n----------- --------- -------- ----- ---------- -----
-------- ----");
+ if (!DisableNames)
+ mprintf(L"\n----------- --------- -------- ----- ---------- -----
-------- ----");
}
else
{
mprintf(L"\n%ls",St(MListTitleL));
- mprintf(L"\n----------- --------- ---------- ----- ----");
+ if (!DisableNames)
+ mprintf(L"\n----------- --------- ---------- ----- ----");
}
+ // Must be set even in DisableNames mode to suppress "0 files" output
+ // unless no files are matched.
TitleShown=true;
}
+ if (DisableNames)
+ return;
+
+ wchar *Name=hd.FileName;
+ RARFORMAT Format=Arc.Format;
+
+ if (Bare)
+ {
+ mprintf(L"%s\n",Name);
+ return;
+ }
wchar UnpSizeText[30],PackSizeText[30];
if (hd.UnpSize==INT64NDF)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/pathfn.cpp new/unrar/pathfn.cpp
--- old/unrar/pathfn.cpp 2021-04-07 16:41:26.000000000 +0200
+++ new/unrar/pathfn.cpp 2021-05-17 09:31:10.000000000 +0200
@@ -184,7 +184,9 @@
// the temporary buffer instead of constructing the name in 'Pathname'.
wchar OutName[NM];
wcsncpyz(OutName,Path,ASIZE(OutName));
- AddEndSlash(OutName,ASIZE(OutName));
+ // Do not add slash to d:, we want to allow relative paths like d:filename.
+ if (!IsDriveLetter(Path) || Path[2]!=0)
+ AddEndSlash(OutName,ASIZE(OutName));
wcsncatz(OutName,Name,ASIZE(OutName));
wcsncpyz(Pathname,OutName,MaxSize);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unrar/version.hpp new/unrar/version.hpp
--- old/unrar/version.hpp 2021-04-07 16:41:27.000000000 +0200
+++ new/unrar/version.hpp 2021-05-17 09:31:11.000000000 +0200
@@ -1,6 +1,6 @@
#define RARVER_MAJOR 6
-#define RARVER_MINOR 1
-#define RARVER_BETA 0
-#define RARVER_DAY 7
-#define RARVER_MONTH 4
+#define RARVER_MINOR 2
+#define RARVER_BETA 1
+#define RARVER_DAY 17
+#define RARVER_MONTH 5
#define RARVER_YEAR 2021
