Hello community, here is the log from the commit of package unrar for openSUSE:Factory:NonFree checked in at 2018-04-30 22:59:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/unrar (Old) and /work/SRC/openSUSE:Factory:NonFree/.unrar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "unrar" Mon Apr 30 22:59:06 2018 rev:70 rq:600352 version:5.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/unrar/unrar.changes 2018-03-22 12:38:55.556813785 +0100 +++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrar.changes 2018-04-30 22:59:46.358635265 +0200 @@ -1,0 +2,17 @@ +Tue Apr 24 09:21:51 UTC 2018 - idonmez@suse.com + +- Update to version 5.6.3 + * No upstream changelog + +------------------------------------------------------------------- +Fri Apr 13 09:16:33 UTC 2018 - mpluskal@suse.com + +- Cleanup spec file with spec-clener + +------------------------------------------------------------------- +Tue Apr 3 13:57:14 UTC 2018 - idonmez@suse.com + +- Update to version 5.6.2 + * No upstream changelog + +------------------------------------------------------------------- Old: ---- unrarsrc-5.6.1.tar.gz New: ---- unrarsrc-5.6.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unrar.spec ++++++ --- /var/tmp/diff_new_pack.3m7i9g/_old 2018-04-30 22:59:46.994612058 +0200 +++ /var/tmp/diff_new_pack.3m7i9g/_new 2018-04-30 22:59:46.998611913 +0200 @@ -1,7 +1,7 @@ # # spec file for package unrar # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,20 +18,19 @@ # majorversion should match the major version number. %define majorversion 5 -%define libsuffix 5_6_1 +%define libsuffix 5_6_3 Name: unrar -Version: 5.6.1 +Version: 5.6.3 Release: 0 Summary: A program to extract, test, and view RAR archives -License: SUSE-NonFree +License: NonFree Group: Productivity/Archiving/Compression -Url: http://www.rarlab.com +URL: http://www.rarlab.com Source0: http://www.rarlab.com/rar/%{name}src-%{version}.tar.gz Source1: unrar.1 Patch1: unrarsrc-5.0.5-soname.patch BuildRequires: gcc-c++ -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The unRAR utility is a freeware program distributed with source code @@ -70,32 +69,33 @@ CXXFLAGS="%{optflags} -fPIC -fno-strict-aliasing" STRIP=true %install -install -Dm 0755 unrar %{buildroot}%{_bindir}/unrar -install -Dm 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/unrar.1 -install -Dm 0755 libunrar.so.%{version} \ +install -Dpm 0755 unrar \ + %{buildroot}%{_bindir}/unrar +install -Dpm 0644 %{SOURCE1} \ + %{buildroot}%{_mandir}/man1/unrar.1 +install -Dpm 0755 libunrar.so.%{version} \ %{buildroot}%{_libdir}/libunrar.so.%{version} -install -Dm 0644 dll.hpp %{buildroot}/%{_includedir}/unrar/dll.hpp +install -Dpm 0644 dll.hpp \ + %{buildroot}/%{_includedir}/unrar/dll.hpp ln -s libunrar.so.%{version} \ %{buildroot}%{_libdir}/libunrar.so %post -n libunrar%{libsuffix} -p /sbin/ldconfig - %postun -n libunrar%{libsuffix} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc acknow.txt license.txt readme.txt +%license license.txt +%doc acknow.txt readme.txt %{_bindir}/unrar -%{_mandir}/man1/unrar.1%{ext_man} +%{_mandir}/man1/unrar.1%{?ext_man} %files -n libunrar%{libsuffix} -%defattr(-,root,root) -%doc license.txt +%license license.txt %{_libdir}/*.so.%{version} %files -n libunrar-devel -%defattr(-,root,root) -%doc acknow.txt license.txt readme.txt +%license license.txt +%doc acknow.txt readme.txt %{_includedir}/* %{_libdir}/*.so ++++++ unrarsrc-5.6.1.tar.gz -> unrarsrc-5.6.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/arcread.cpp new/unrar/arcread.cpp --- old/unrar/arcread.cpp 2018-03-11 07:24:36.000000000 +0100 +++ new/unrar/arcread.cpp 2018-04-21 16:54:03.000000000 +0200 @@ -577,7 +577,15 @@ uiMsg(UIWAIT_BADPSW,FileName); Cmd->Password.Clean(); - continue; +#ifdef RARDLL + // Avoid new requests for unrar.dll to prevent the infinite loop + // if app always returns the same password. + ErrHandler.SetErrorCode(RARX_BADPWD); + Cmd->DllError=ERAR_BAD_PASSWORD; + ErrHandler.Exit(RARX_BADPWD); +#else + continue; // Request a password again. +#endif } break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/cmddata.cpp new/unrar/cmddata.cpp --- old/unrar/cmddata.cpp 2018-03-11 07:24:36.000000000 +0100 +++ new/unrar/cmddata.cpp 2018-04-21 16:54:03.000000000 +0200 @@ -239,7 +239,7 @@ if (C0=='R' && (C1=='R' || C1=='V')) Cmd[2]=0; wchar SwName[16+ASIZE(Cmd)]; - swprintf(SwName,ASIZE(SwName),L"switches_%s=",Cmd); + swprintf(SwName,ASIZE(SwName),L"switches_%ls=",Cmd); size_t Length=wcslen(SwName); if (wcsnicomp(Str,SwName,Length)==0) ProcessSwitchesString(Str+Length); @@ -471,6 +471,9 @@ case '3': Shutdown=POWERMODE_SLEEP; break; + case '4': + Shutdown=POWERMODE_RESTART; + break; } break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/dll.rc new/unrar/dll.rc --- old/unrar/dll.rc 2018-03-11 07:18:51.000000000 +0100 +++ new/unrar/dll.rc 2018-04-21 16:09:17.000000000 +0200 @@ -2,8 +2,8 @@ #include <commctrl.h> VS_VERSION_INFO VERSIONINFO -FILEVERSION 5, 60, 1, 2631 -PRODUCTVERSION 5, 60, 1, 2631 +FILEVERSION 5, 60, 3, 2672 +PRODUCTVERSION 5, 60, 3, 2672 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.1\0" - VALUE "ProductVersion", "5.60.1\0" + VALUE "FileVersion", "5.60.3\0" + VALUE "ProductVersion", "5.60.3\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/extract.cpp new/unrar/extract.cpp --- old/unrar/extract.cpp 2018-03-11 07:24:37.000000000 +0100 +++ new/unrar/extract.cpp 2018-04-21 16:54:04.000000000 +0200 @@ -480,7 +480,12 @@ // reset cached passwords. Update appropriate code if changed. uiMsg(UIWAIT_BADPSW,ArcFileName); Cmd->Password.Clean(); + + // Avoid new requests for unrar.dll to prevent the infinite loop + // if app always returns the same password. +#ifndef RARDLL continue; // Request a password again. +#endif } #ifdef RARDLL // If we already have ERAR_EOPEN as result of missing volume, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/options.hpp new/unrar/options.hpp --- old/unrar/options.hpp 2018-03-11 07:24:39.000000000 +0100 +++ new/unrar/options.hpp 2018-04-21 16:54:04.000000000 +0200 @@ -64,7 +64,8 @@ }; enum POWER_MODE { - POWERMODE_KEEP=0,POWERMODE_OFF,POWERMODE_HIBERNATE,POWERMODE_SLEEP + POWERMODE_KEEP=0,POWERMODE_OFF,POWERMODE_HIBERNATE,POWERMODE_SLEEP, + POWERMODE_RESTART }; struct FilterMode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/resource.cpp new/unrar/resource.cpp --- old/unrar/resource.cpp 2018-03-11 07:24:40.000000000 +0100 +++ new/unrar/resource.cpp 2018-04-21 16:54:05.000000000 +0200 @@ -7,5 +7,14 @@ { return StringId; } + + +// Needed for Unix swprintf to convert %s to %ls in legacy language resources. +const wchar *StF(MSGID StringId) +{ + static wchar FormattedStr[512]; + PrintfPrepareFmt(St(StringId),FormattedStr,ASIZE(FormattedStr)); + return FormattedStr; +} #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/resource.hpp new/unrar/resource.hpp --- old/unrar/resource.hpp 2018-03-11 07:24:40.000000000 +0100 +++ new/unrar/resource.hpp 2018-04-21 16:54:05.000000000 +0200 @@ -3,8 +3,10 @@ #ifdef RARDLL #define St(x) (L"") +#define StF(x) (L"") #else const wchar *St(MSGID StringId); +const wchar *StF(MSGID StringId); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/strfn.cpp new/unrar/strfn.cpp --- old/unrar/strfn.cpp 2018-03-11 07:24:41.000000000 +0100 +++ new/unrar/strfn.cpp 2018-04-21 16:54:06.000000000 +0200 @@ -434,7 +434,7 @@ } -#ifndef SILENT +#ifndef RARDLL // For compatibility with existing translations we use %s to print Unicode // strings in format strings and convert them to %ls here. %s could work // without such conversion in Windows, but not in Unix wprintf. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/strfn.hpp new/unrar/strfn.hpp --- old/unrar/strfn.hpp 2018-03-11 07:24:41.000000000 +0100 +++ new/unrar/strfn.hpp 2018-04-21 16:54:06.000000000 +0200 @@ -44,7 +44,7 @@ void itoa(int64 n,wchar *Str,size_t MaxSize); const wchar* GetWide(const char *Src); const wchar* GetCmdParam(const wchar *CmdLine,wchar *Param,size_t MaxSize); -#ifndef SILENT +#ifndef RARDLL void PrintfPrepareFmt(const wchar *Org,wchar *Cvt,size_t MaxSize); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/system.cpp new/unrar/system.cpp --- old/unrar/system.cpp 2018-03-11 07:24:41.000000000 +0100 +++ new/unrar/system.cpp 2018-04-21 16:54:06.000000000 +0200 @@ -115,11 +115,13 @@ AdjustTokenPrivileges(hToken,FALSE,&tkp,0,(PTOKEN_PRIVILEGES)NULL,0); } if (Mode==POWERMODE_OFF) - ExitWindowsEx(EWX_SHUTDOWN|EWX_FORCE|EWX_POWEROFF,SHTDN_REASON_FLAG_PLANNED); + ExitWindowsEx(EWX_SHUTDOWN|EWX_FORCE,SHTDN_REASON_FLAG_PLANNED); if (Mode==POWERMODE_SLEEP) SetSuspendState(FALSE,FALSE,FALSE); if (Mode==POWERMODE_HIBERNATE) SetSuspendState(TRUE,FALSE,FALSE); + if (Mode==POWERMODE_RESTART) + ExitWindowsEx(EWX_REBOOT|EWX_FORCE,SHTDN_REASON_FLAG_PLANNED); } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/uiconsole.cpp new/unrar/uiconsole.cpp --- old/unrar/uiconsole.cpp 2018-03-11 07:24:42.000000000 +0100 +++ new/unrar/uiconsole.cpp 2018-04-21 16:54:06.000000000 +0200 @@ -342,7 +342,10 @@ bool uiGetPassword(UIPASSWORD_TYPE Type,const wchar *FileName,SecPassword *Password) { - return GetConsolePassword(Type,FileName,Password); + // Unlike GUI we cannot provide Cancel button here, so we use the empty + // password to abort. Otherwise user not knowing a password would need to + // press Ctrl+C multiple times to quit from infinite password request loop. + return GetConsolePassword(Type,FileName,Password) && Password->IsSet(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/unpack.hpp new/unrar/unpack.hpp --- old/unrar/unpack.hpp 2018-03-11 07:24:42.000000000 +0100 +++ new/unrar/unpack.hpp 2018-04-21 16:54:06.000000000 +0200 @@ -395,8 +395,12 @@ uint GetChar() { if (Inp.InAddr>BitInput::MAX_SIZE-30) + { UnpReadBuf(); - return(Inp.InBuf[Inp.InAddr++]); + if (Inp.InAddr>=BitInput::MAX_SIZE) // If nothing was read. + return 0; + } + return Inp.InBuf[Inp.InAddr++]; } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/version.hpp new/unrar/version.hpp --- old/unrar/version.hpp 2018-03-11 07:24:42.000000000 +0100 +++ new/unrar/version.hpp 2018-04-21 16:54:06.000000000 +0200 @@ -1,6 +1,6 @@ #define RARVER_MAJOR 5 #define RARVER_MINOR 60 -#define RARVER_BETA 1 -#define RARVER_DAY 11 -#define RARVER_MONTH 3 +#define RARVER_BETA 3 +#define RARVER_DAY 21 +#define RARVER_MONTH 4 #define RARVER_YEAR 2018