diff options
| author | itetcu <itetcu@FreeBSD.org> | 2006-07-13 01:30:51 +0800 |
|---|---|---|
| committer | itetcu <itetcu@FreeBSD.org> | 2006-07-13 01:30:51 +0800 |
| commit | 8a28335a7645a17977c87303a6bffbfd98fc573e (patch) | |
| tree | 900085be44f4e917a70606fb2759feffdeed35bc /archivers | |
| parent | 34e59c781067cbc973c51d43eb81469cf9a1e995 (diff) | |
| download | freebsd-ports-graphics-8a28335a7645a17977c87303a6bffbfd98fc573e.tar.gz freebsd-ports-graphics-8a28335a7645a17977c87303a6bffbfd98fc573e.tar.zst freebsd-ports-graphics-8a28335a7645a17977c87303a6bffbfd98fc573e.zip | |
- update archivers/libunrar port to 3.60.b6
- new added patch fix bug which can cause a crash on unpacking broken rar file
using RarOpenEX function (the problem also was reported to the vendor)
PR: ports/100143
Submitted by: maintainer
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/libunrar/Makefile | 4 | ||||
| -rw-r--r-- | archivers/libunrar/distinfo | 6 | ||||
| -rw-r--r-- | archivers/libunrar/files/patch-dll.cpp | 19 |
3 files changed, 18 insertions, 11 deletions
diff --git a/archivers/libunrar/Makefile b/archivers/libunrar/Makefile index e7ae37a13eb..a65eed1cfed 100644 --- a/archivers/libunrar/Makefile +++ b/archivers/libunrar/Makefile @@ -6,14 +6,14 @@ # PORTNAME= libunrar -PORTVERSION= 3.60.b4 +PORTVERSION= 3.60.b6 CATEGORIES= archivers MASTER_SITES= http://files2.rarlab.com/rar/ \ http://files3.rarlab.com/rar/ \ http://files4.rarlab.com/rar/ \ http://files5.rarlab.com/rar/ \ http://files6.rarlab.com/rar/ -DISTNAME= unrarsrc-3.6.4 +DISTNAME= unrarsrc-3.6.6 MAINTAINER= samm@os2.kiev.ua COMMENT= Library to work with RAR archivies diff --git a/archivers/libunrar/distinfo b/archivers/libunrar/distinfo index 596a41ffbc7..03a295f27bd 100644 --- a/archivers/libunrar/distinfo +++ b/archivers/libunrar/distinfo @@ -1,3 +1,3 @@ -MD5 (unrarsrc-3.6.4.tar.gz) = 001602097819fdbe6aa3cf46af01d922 -SHA256 (unrarsrc-3.6.4.tar.gz) = 625611fda1baec14f4fedffc2b8b8997caf6f3f360d843f6c1304a508a297e4a -SIZE (unrarsrc-3.6.4.tar.gz) = 124913 +MD5 (unrarsrc-3.6.6.tar.gz) = 78d05f6a80626fe066fd2438b6fe2059 +SHA256 (unrarsrc-3.6.6.tar.gz) = 246b4e61d29b90a2e3c80c34fe59b789efe8a8d7f58087d2a7ad057313d34975 +SIZE (unrarsrc-3.6.6.tar.gz) = 125044 diff --git a/archivers/libunrar/files/patch-dll.cpp b/archivers/libunrar/files/patch-dll.cpp index ace28c16309..056271b3e2a 100644 --- a/archivers/libunrar/files/patch-dll.cpp +++ b/archivers/libunrar/files/patch-dll.cpp @@ -1,16 +1,23 @@ diff -ruN unrar.orig/dll.cpp unrar/dll.cpp ---- dll.cpp.orig 2005-08-03 20:34:30.000000000 +0400 -+++ dll.cpp 2006-01-11 12:13:33.000000000 +0300 -@@ -271,8 +271,10 @@ ++++ dll.cpp +@@ -59,8 +59,8 @@ + } + if (!Data->Arc.IsArchive(false)) + { +- delete Data; + r->OpenResult=Data->Cmd.DllError!=0 ? Data->Cmd.DllError:ERAR_BAD_ARCHIVE; ++ delete Data; + return(NULL); + } + r->Flags=Data->Arc.NewMhd.Flags; +@@ -272,7 +272,9 @@ strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T"); Data->Cmd.Test=Operation!=RAR_EXTRACT; bool Repeat=false; - Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat); -- + + if(Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat) == false) + return (ERAR_UNKNOWN); -+ + while (Data->Arc.ReadHeader()!=0 && Data->Arc.GetHeaderType()==NEWSUB_HEAD) { - Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat); |