Hello community, here is the log from the commit of package unrar checked in at Wed Jun 21 17:54:58 CEST 2006. -------- --- unrar/unrar.changes 2006-06-13 18:53:10.000000000 +0200 +++ unrar/unrar.changes 2006-06-21 13:52:28.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 21 13:51:44 CEST 2006 - lmichnovic@suse.cz + +- upgrade to version 3.60 beta 5 + - no changelog available + +------------------------------------------------------------------- Old: ---- unrarsrc-3.6.4-gcc.patch unrarsrc-3.6.4-types.patch unrarsrc-3.6.4.tar.bz2 New: ---- unrarsrc-3.6.5-gcc.patch unrarsrc-3.6.5-types.patch unrarsrc-3.6.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unrar.spec ++++++ --- /var/tmp/diff_new_pack.mJ2w9f/_old 2006-06-21 17:54:45.000000000 +0200 +++ /var/tmp/diff_new_pack.mJ2w9f/_new 2006-06-21 17:54:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package unrar (Version 3.6.0.4) +# spec file for package unrar (Version 3.6.0.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,16 +12,16 @@ Name: unrar BuildRequires: gcc-c++ -Version: 3.6.0.4 +Version: 3.6.0.5 Release: 1 Autoreqprov: on Group: Productivity/Archiving/Compression License: FSR, Other License(s), see package URL: http://www.rarlab.com Summary: A program to extract, test, and view RAR archives -Source: %{name}src-3.6.4.tar.bz2 -Patch: %{name}src-3.6.4-types.patch -Patch1: %{name}src-3.6.4-gcc.patch +Source: %{name}src-3.6.5.tar.bz2 +Patch: %{name}src-3.6.5-types.patch +Patch1: %{name}src-3.6.5-gcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -56,6 +56,9 @@ %{_bindir}/* %changelog -n unrar +* Wed Jun 21 2006 - lmichnovic@suse.cz +- upgrade to version 3.60 beta 5 +- no changelog available * Tue Jun 13 2006 - lmichnovic@suse.cz - upgrade to version 3.6.4 - no changelog available ++++++ unrarsrc-3.6.4-gcc.patch -> unrarsrc-3.6.5-gcc.patch ++++++ ++++++ unrarsrc-3.6.4-types.patch -> unrarsrc-3.6.5-types.patch ++++++ ++++++ unrarsrc-3.6.4.tar.bz2 -> unrarsrc-3.6.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unrar/cmddata.cpp new/unrar/cmddata.cpp --- old/unrar/cmddata.cpp 2006-05-25 12:47:44.000000000 +0200 +++ new/unrar/cmddata.cpp 2006-06-15 18:02:50.000000000 +0200 @@ -599,6 +599,9 @@ Threads=atoi(Switch+2); if (Threads>MaxSearchThreads) BadSwitch(Switch); + else + { + } break; #endif default: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unrar/extract.cpp new/unrar/extract.cpp --- old/unrar/extract.cpp 2006-05-25 12:47:44.000000000 +0200 +++ new/unrar/extract.cpp 2006-06-15 18:02:50.000000000 +0200 @@ -28,8 +28,22 @@ Cmd->ArcNames->Rewind(); while (Cmd->GetArcName(ArcName,ArcNameW,sizeof(ArcName))) { - while (ExtractArchive(Cmd)==EXTRACT_ARC_REPEAT) - ; + while (true) + { + char PrevCmdPassword[MAXPASSWORD]; + strcpy(PrevCmdPassword,Cmd->Password); + + EXTRACT_ARC_CODE Code=ExtractArchive(Cmd); + +/* + restore Cmd->Password which could be changed in IsArchive() call + for next header encrypted archive +*/ + strcpy(Cmd->Password,PrevCmdPassword); + + if (Code!=EXTRACT_ARC_REPEAT) + break; + } if (FindFile::FastFind(ArcName,ArcNameW,&FD)) DataIO.ProcessedArcSize+=FD.Size; } @@ -141,6 +155,7 @@ else break; } + return(EXTRACT_ARC_NEXT); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unrar/extract.hpp new/unrar/extract.hpp --- old/unrar/extract.hpp 2006-05-25 12:47:44.000000000 +0200 +++ new/unrar/extract.hpp 2006-06-15 18:02:50.000000000 +0200 @@ -6,6 +6,8 @@ class CmdExtract { private: + EXTRACT_ARC_CODE ExtractArchive(CommandData *Cmd); + ComprDataIO DataIO; Unpack *Unp; long TotalFileCount; @@ -31,7 +33,6 @@ ~CmdExtract(); void DoExtract(CommandData *Cmd); void ExtractArchiveInit(CommandData *Cmd,Archive &Arc); - EXTRACT_ARC_CODE ExtractArchive(CommandData *Cmd); bool ExtractCurrentFile(CommandData *Cmd,Archive &Arc,int HeaderSize, bool &Repeat); static void UnstoreFile(ComprDataIO &DataIO,Int64 DestUnpSize); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unrar/version.hpp new/unrar/version.hpp --- old/unrar/version.hpp 2006-05-25 12:47:44.000000000 +0200 +++ new/unrar/version.hpp 2006-06-15 18:02:52.000000000 +0200 @@ -1,6 +1,6 @@ #define RARVER_MAJOR 3 #define RARVER_MINOR 60 -#define RARVER_BETA 4 -#define RARVER_DAY 25 -#define RARVER_MONTH 5 +#define RARVER_BETA 5 +#define RARVER_DAY 15 +#define RARVER_MONTH 6 #define RARVER_YEAR 2006 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org