From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 12 06:10:16 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77E3516A4DF for ; Wed, 12 Jul 2006 06:10:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 952E243D49 for ; Wed, 12 Jul 2006 06:10:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6C6AFv6045282 for ; Wed, 12 Jul 2006 06:10:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6C6AFfq045281; Wed, 12 Jul 2006 06:10:15 GMT (envelope-from gnats) Resent-Date: Wed, 12 Jul 2006 06:10:15 GMT Resent-Message-Id: <200607120610.k6C6AFfq045281@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Alex Samorukov" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B51816A4DD for ; Wed, 12 Jul 2006 06:07:56 +0000 (UTC) (envelope-from samm@os2.kiev.ua) Received: from el.volia.net (el.volia.net [82.144.192.38]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F8F143D45 for ; Wed, 12 Jul 2006 06:07:55 +0000 (GMT) (envelope-from samm@os2.kiev.ua) Received: from ip.85.202.201.160.dyn.sub-4.broadband.voliacable.com ([85.202.201.160] helo=samm.local) by el.volia.net with esmtp (Exim 4.43 (FreeBSD)) id 1G0Xt5-0009WY-SL for FreeBSD-gnats-submit@freebsd.org; Wed, 12 Jul 2006 09:07:56 +0300 Message-Id: <1152684499.9788@samm.local> Date: Wed, 12 Jul 2006 09:08:19 +0300 From: "Alex Samorukov" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/100143: archivers/libunrar update and patch X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jul 2006 06:10:16 -0000 >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: