Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 12 Jul 2006 09:08:19 +0300
From:      "Alex Samorukov" <samm@os2.kiev.ua>
To:        "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Subject:   ports/100143: archivers/libunrar update and patch
Message-ID:  <1152684499.9788@samm.local>
Resent-Message-ID: <200607120610.k6C6AFfq045281@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 

>Number:         100143
>Category:       ports
>Synopsis:       archivers/libunrar update and patch
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 12 06:10:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Alex Samorukov
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
Shevchenko Didkovskiy and Partners 
>Environment:


System: FreeBSD 6.1-RELEASE #2: Wed May 17 22:22:18 EEST 2006
    root@samm.local:/usr/obj/usr/src/sys/SAMMKRNL



>Description:


Tjis patch will update archivers/libunrar port and also fix bug which can cause a crash on unpacking broken rar file using RarOpenEX function. Problem also was reported to rarsoft.


>How-To-Repeat:





>Fix:


diff -r -u /usr/ports/archivers/libunrar/Makefile /home/samm/tmp/libunrar/Makefile
--- /usr/ports/archivers/libunrar/Makefile	Wed Jun  7 21:14:05 2006
+++ /home/samm/tmp/libunrar/Makefile	Wed Jul 12 08:51:24 2006
@@ -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 -r -u /usr/ports/archivers/libunrar/distinfo /home/samm/tmp/libunrar/distinfo
--- /usr/ports/archivers/libunrar/distinfo	Wed Jun  7 21:14:05 2006
+++ /home/samm/tmp/libunrar/distinfo	Wed Jul 12 08:52:15 2006
@@ -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 -r -u /usr/ports/archivers/libunrar/files/patch-dll.cpp /home/samm/tmp/libunrar/files/patch-dll.cpp
--- /usr/ports/archivers/libunrar/files/patch-dll.cpp	Fri Mar 17 14:54:26 2006
+++ /home/samm/tmp/libunrar/files/patch-dll.cpp	Wed Jul 12 08:58:02 2006
@@ -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);


>Release-Note:
>Audit-Trail:
>Unformatted:

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1152684499.9788>