Update unalz to 0.31. Patches provided by Kibum Han, and modified by me.

Changes:
  - Handle the case where encrypted and plain files are mixed.
  - Even when an archive is corrupted, extract files not affected.

5 files changed, 82 insertions, 50 deletions

diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile
index 1021bec1481..75ebef0dda7 100644
--- a/archivers/unalz/Makefile
+++ b/archivers/unalz/Makefile
@@ -1,29 +1,27 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/03 17:17:10 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/03/02 16:18:47 minskim Exp $
 #
 
-DISTNAME=	unalz
-PKGNAME=	unalz-0.20
-CATEGORIES=	archivers
-MASTER_SITES=	http://www.kipple.pe.kr/win/unalz/
-EXTRACT_SUFX=	.tgz
+DISTNAME=		unalz-0.31
+CATEGORIES=		archivers
+MASTER_SITES=		http://www.kipple.pe.kr/win/unalz/
+EXTRACT_SUFX=		.tgz
 
-MAINTAINER=	pyrasis@chol.com
-HOMEPAGE=	http://www.kipple.pe.kr/win/unalz/
-COMMENT=	Open-source ALZ extractor
+MAINTAINER=		pyrasis@chol.com
+HOMEPAGE=		http://www.kipple.pe.kr/win/unalz/
+COMMENT=		Open-source ALZ extractor
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=			${WRKDIR}/unalz
+BUILD_TARGET=		posix
 NO_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
 
-MAKEFILE=		makefile
-
 INSTALLATION_DIRS=	bin
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unalz ${PREFIX}/bin
diff --git a/archivers/unalz/PLIST b/archivers/unalz/PLIST
index 00166c071d1..7d7bee64e51 100644
--- a/archivers/unalz/PLIST
+++ b/archivers/unalz/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/03 17:17:10 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/03/02 16:18:47 minskim Exp $
 bin/unalz
diff --git a/archivers/unalz/distinfo b/archivers/unalz/distinfo
index 3c10748c50d..15969451295 100644
--- a/archivers/unalz/distinfo
+++ b/archivers/unalz/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 14:45:27 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/03/02 16:18:47 minskim Exp $
 
-SHA1 (unalz.tgz) = 91b2c0a15b91058b54e10b66195e1e389a9ec621
-RMD160 (unalz.tgz) = 317d1ea4bff1d15d601cf4a91ab80ba7bd986a23
-Size (unalz.tgz) = 96986 bytes
-SHA1 (patch-aa) = 075f38458c59b1d3735f21fcc4724c3cc84cbdee
+SHA1 (unalz-0.31.tgz) = 0d6f21b1fc9b00c5ca763b4e402c792ebe045fc9
+RMD160 (unalz-0.31.tgz) = 23ccefe2b29b8127c15ebf4f93e313316ad34510
+Size (unalz-0.31.tgz) = 129623 bytes
+SHA1 (patch-aa) = 35072979d009ff4a0d110e64aeac99e2f7a584cc
+SHA1 (patch-ab) = c54333e760b012b14af906ea9e9e442e0cf12ee2
diff --git a/archivers/unalz/patches/patch-aa b/archivers/unalz/patches/patch-aa
index 57b18a40681..4d3ded84b67 100644
--- a/archivers/unalz/patches/patch-aa
+++ b/archivers/unalz/patches/patch-aa
@@ -1,40 +1,39 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/12/03 17:17:10 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2005/03/02 16:18:47 minskim Exp $
 
---- makefile.orig	2004-10-22 08:02:04.000000000 -0500
-+++ makefile
-@@ -1,9 +1,6 @@
+--- Makefile.orig	2004-11-27 10:58:24.000000000 -0600
++++ Makefile
+@@ -1,9 +1,10 @@
 -CPP = g++
 -CC  = gcc
--OBJ = main.o UnAlz.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o zlib/adler32.o zlib/crc32.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/zutil.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o bzip2/huffman.o bzip2/randtable.o
--LINKOBJ = main.o UnAlz.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o zlib/adler32.o zlib/crc32.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/zutil.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o bzip2/huffman.o bzip2/randtable.o
+-OBJ = main.o UnAlz.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o zlib/adler32.o zlib/crc32.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/zutil.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o bzip2/huffman.o bzip2/randtable.o
++#CPP = g++
++#CC  = gcc
 +OBJ = main.o UnAlz.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o
-+LINKOBJ = main.o UnAlz.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o
- BIN  = unalz
--CFLAGS =
- 
- all: unalz
- 
-@@ -11,19 +8,19 @@ clean:
- 	rm -f $(OBJ) $(BIN)
+ BIN = unalz
+-LDFLAGS = 
+-CFLAGS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
++LDFLAGS += -lz -lbz2
++CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
++CXXFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_UNALZ_ICONV
+ 
+ all:
+ 	@echo ""
+@@ -21,8 +22,7 @@ all:
+ 	@echo ""
+ 
+ posix: unalz
+-	$(CPP) -c UnAlz.cpp  -c main.cpp -D_UNALZ_ICONV $(CFLAGS) 
+-	$(CPP) $(OBJ) $(LDFLAGS) -liconv -o $(BIN) 
++	$(CXX) $(OBJ) $(LDFLAGS) -liconv -o $(BIN) 
+ 
+ posix-utf8: unalz
+ 	$(CPP) -c UnAlz.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CFLAGS)
+@@ -37,6 +37,8 @@ clean:
  
  $(BIN): $(OBJ)
--	$(CPP) $(LINKOBJ) -o "unalz"
-+	$(CXX) $(LINKOBJ) -o "unalz" $(LDFLAGS) -lz -lbz2
- 
- main.o: main.cpp
--	$(CPP) -c main.cpp -o main.o
-+	$(CXX) $(CXXFLAGS) -c main.cpp -o main.o
- 
- UnAlz.o: UnAlz.cpp
--	$(CPP) -c UnAlz.cpp -o UnAlz.o
-+	$(CXX) $(CXXFLAGS) -c UnAlz.cpp -o UnAlz.o
- 
- UnAlzBz2decompress.o: UnAlzBz2decompress.c
- 	$(CC) -c UnAlzBz2decompress.c -o UnAlzBz2decompress.o $(CFLAGS)
  
- UnAlzBzip2.o: UnAlzBzip2.cpp
--	$(CPP) -c UnAlzBzip2.cpp -o UnAlzBzip2.o
-+	$(CXX) $(CXXFLAGS) -c UnAlzBzip2.cpp -o UnAlzBzip2.o
++.cpp.o:
++	${CXX} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
  
- UnAlzbzlib.o: UnAlzbzlib.c
- 	$(CC) -c UnAlzbzlib.c -o UnAlzbzlib.o $(CFLAGS)
+ zlib/adler32.o: zlib/adler32.c
+ 	$(CC) -c zlib/adler32.c -o zlib/adler32.o $(CFLAGS)
diff --git a/archivers/unalz/patches/patch-ab b/archivers/unalz/patches/patch-ab
new file mode 100644
index 00000000000..e2fb9d94cb6
--- /dev/null
+++ b/archivers/unalz/patches/patch-ab
@@ -0,0 +1,34 @@
+$NetBSD: patch-ab,v 1.1 2005/03/02 16:18:47 minskim Exp $
+
+--- UnAlz.cpp.orig	2004-11-27 10:28:17.000000000 -0600
++++ UnAlz.cpp
+@@ -18,6 +18,10 @@
+ #	include <errno.h>		// iconv.h ¶§¹®¿¡ ÇÊ¿ä 

+ #endif

+ 

++#if defined(__NetBSD__)

++#	include <sys/param.h>		// __NetBSD_Version__

++#	include <errno.h>		// iconv.h ¶§¹®¿¡ ÇÊ¿ä 

++#endif

+ 

+ #define swapint64(Data) (INT64) ( (((Data)&0x00000000000000FFLL) << 56) | (((Data)&0x000000000000FF00LL) << 40) | (((Data)&0x0000000000FF0000LL) << 24) | (((Data)&0x00000000FF000000LL) << 8)  | (((Data)&0x000000FF00000000LL) >> 8)  | (((Data)&0x0000FF0000000000LL) >> 24) | (((Data)&0x00FF000000000000LL) >> 40) | (((Data)&0xFF00000000000000LL) >> 56) )

+ #define swapint32(a)    ((((a)&0xff)<<24)+(((a>>8)&0xff)<<16)+(((a>>16)&0xff)<<8)+(((a>>24)&0xff)))

+@@ -33,7 +37,7 @@
+ 	inline UINT64	unalz_le64toh(UINT64 a){return a;}

+ #endif

+ 

+-#ifdef __FreeBSD__

++#if defined(__FreeBSD__) || defined(__NetBSD__)

+ #	include <sys/endian.h>	

+ 	inline UINT16	unalz_le16toh(UINT16 a){return le16toh(a);}

+ 	inline UINT32	unalz_le32toh(UINT32 a){return le32toh(a);}

+@@ -376,7 +380,8 @@ BOOL CUnAlz::ReadLocalFileheader()

+ 	size_t size;

+ 	char inbuf[ICONV_BUF_SIZE];

+ 	char outbuf[ICONV_BUF_SIZE];

+-#if defined(__FreeBSD__) || defined(__CYGWIN__)

++#if defined(__FreeBSD__) || defined(__CYGWIN__) || \

++  (defined(__NetBSD__) && __NetBSD_Version__ >= 200000000)

+ 	const char *inptr = inbuf;

+ #else

+ 	char *inptr = inbuf;