Pullup ticket 937 - requested by Lubomir Sedlacik

sync archivers/unalz with HEAD, including a security update

Revisions pulled up:
- pkgsrc/archivers/unalz/Makefile             1.6, 1.7, 1.8
- pkgsrc/archivers/unalz/distinfo             1.8, 1.9, 1.10, 1.11, 1.12, 1.13
- pkgsrc/archivers/unalz/patches/patch-aa     1.3, 1.4
- pkgsrc/archivers/unalz/patches/patch-ab     1.6, 1.7, 1.8, 1.9
- pkgsrc/archivers/unalz/patches/patch-ad     1.1

   Module Name:	pkgsrc
   Committed By:	minskim
   Date:		Sat Oct  1 10:55:35 UTC 2005

   Modified Files:
   	pkgsrc/archivers/unalz: Makefile distinfo
   	pkgsrc/archivers/unalz/patches: patch-aa patch-ab

   Log Message:
   Update unalz to 0.50.

   New features:
     - "-l" option to show the list of files.
     - "-d" option to specify output folder.
     - decompressing individual files.
     - setting time attribute of decompressed files.
---
   Module Name:	pkgsrc
   Committed By:	minskim
   Date:		Mon Oct  3 04:12:21 UTC 2005

   Modified Files:
   	pkgsrc/archivers/unalz: Makefile distinfo
   	pkgsrc/archivers/unalz/patches: patch-aa

   Log Message:
   Update unalz to 0.52.

   Changes since 0.50:
     - added -p (pipe mode) and -pwd (password) options
     - improve locale support
     - bug fixes
---
   Module Name:	pkgsrc
   Committed By:	rillig
   Date:		Sat Oct 22 18:12:09 UTC 2005

   Modified Files:
   	pkgsrc/archivers/unalz: distinfo
   Added Files:
   	pkgsrc/archivers/unalz/patches: patch-ad

   Log Message:
   Added a patch to make the package build on NetBSD/i386-1.6.2.
---
   Module Name:	pkgsrc
   Committed By:	tv
   Date:		Mon Oct 31 15:04:17 UTC 2005

   Modified Files:
   	pkgsrc/archivers/unalz: distinfo
   	pkgsrc/archivers/unalz/patches: patch-ab

   Log Message:
   Get useful definitions of unalz_le*toh() on Interix.
---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Mon Nov  7 13:43:41 UTC 2005

   Modified Files:
   	pkgsrc/archivers/unalz: distinfo
   	pkgsrc/archivers/unalz/patches: patch-ab

   Log Message:
   Use sys/endian.h on DragonFly as well.
---
   Module Name:	pkgsrc
   Committed By:	salo
   Date:		Sat Dec  3 15:06:42 UTC 2005

   Modified Files:
   	pkgsrc/archivers/unalz: Makefile distinfo
   	pkgsrc/archivers/unalz/patches: patch-ab

   Log Message:
   Security update to version 0.53.

   Changes:
   - fix buffer overflow (CVE-2005-3862)

5 files changed, 53 insertions, 52 deletions

diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile
index 720edf7d371..1d6edd18579 100644
--- a/archivers/unalz/Makefile
+++ b/archivers/unalz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/07/27 03:13:27 junyoung Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2005/12/04 10:17:01 seb Exp $
 #
 
-DISTNAME=		unalz-0.40
+DISTNAME=		unalz-0.53
 CATEGORIES=		archivers
 MASTER_SITES=		http://www.kipple.pe.kr/win/unalz/
 EXTRACT_SUFX=		.tgz
@@ -12,7 +12,7 @@ COMMENT=		Alzip archive (.alz) extractor
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-BUILD_TARGET=		posix
+BUILD_TARGET=		posix-utf8
 NO_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 WRKSRC=			${WRKDIR}/unalz
diff --git a/archivers/unalz/distinfo b/archivers/unalz/distinfo
index edb4b2aabb5..e491f26aba8 100644
--- a/archivers/unalz/distinfo
+++ b/archivers/unalz/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/07/19 13:51:52 minskim Exp $
+$NetBSD: distinfo,v 1.7.2.1 2005/12/04 10:17:01 seb Exp $
 
-SHA1 (unalz-0.40.tgz) = f187a9b12260afa72369be3411a6052f32371343
-RMD160 (unalz-0.40.tgz) = 3b1b40c101e1904353d7a03828957276a0ec8171
-Size (unalz-0.40.tgz) = 131697 bytes
-SHA1 (patch-aa) = 35072979d009ff4a0d110e64aeac99e2f7a584cc
-SHA1 (patch-ab) = f9c1d88c3c49e3601d0a1dbfb727406a5b07d640
+SHA1 (unalz-0.53.tgz) = d5ac7018c8fceb6f6a16f62728f7ef5fbd7bf010
+RMD160 (unalz-0.53.tgz) = 0b252fc7f7c5bdf8e1bee7ece642a2fecea3da46
+Size (unalz-0.53.tgz) = 133702 bytes
+SHA1 (patch-aa) = 327fd080040946fe7a0707698f90d7709a2d3c5b
+SHA1 (patch-ab) = 9bd272b8159f290d9767d30b5ec5a81d602ed1cc
 SHA1 (patch-ac) = 00c6255437f4ebdf3676787ed63cc838a16476d4
+SHA1 (patch-ad) = cc0951b807e25b5f8097583d674b5ed9ff24f5c7
diff --git a/archivers/unalz/patches/patch-aa b/archivers/unalz/patches/patch-aa
index 4d3ded84b67..b49483fa383 100644
--- a/archivers/unalz/patches/patch-aa
+++ b/archivers/unalz/patches/patch-aa
@@ -1,39 +1,38 @@
-$NetBSD: patch-aa,v 1.2 2005/03/02 16:18:47 minskim Exp $
+$NetBSD: patch-aa,v 1.2.6.1 2005/12/04 10:17:01 seb Exp $
 
---- Makefile.orig	2004-11-27 10:58:24.000000000 -0600
+--- Makefile.orig	2005-07-08 18:32:15.000000000 -0700
 +++ Makefile
-@@ -1,9 +1,10 @@
+@@ -1,9 +1,9 @@
 -CPP = g++
 -CC  = gcc
--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
+-OBJ = main.o UnAlz.o UnAlzUtils.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
++OBJ = main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o UnAlzBzip2.o
  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
++CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_UNALZ_ICONV -D_UNALZ_UTF8
  
  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) 
+@@ -26,8 +26,7 @@ posix: unalz
+ 	$(CPP) $(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:
+-	$(CPP) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CFLAGS)
+-	$(CPP) $(OBJ) $(LDFLAGS) -liconv -o $(BIN)
++	$(CXX) $(OBJ) $(LDFLAGS) -liconv -o $(BIN)
+ 
+ posix-noiconv: unalz
+ 	$(CPP) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp $(CFLAGS)
+@@ -45,6 +44,8 @@ clean:
  
  $(BIN): $(OBJ)
  
 +.cpp.o:
-+	${CXX} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
++	${CXX} ${CPPFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
  
  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
index 29cadba21ff..9a45a27c965 100644
--- a/archivers/unalz/patches/patch-ab
+++ b/archivers/unalz/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2005/07/19 13:51:52 minskim Exp $
+$NetBSD: patch-ab,v 1.5.2.1 2005/12/04 10:17:01 seb Exp $
 
---- UnAlz.cpp.orig	2005-06-17 22:31:33.000000000 -0500
-+++ UnAlz.cpp
+--- UnAlz.cpp.orig	2005-11-21 14:18:13.000000000 +0100
++++ UnAlz.cpp	2005-12-03 15:57:40.000000000 +0100
 @@ -1,6 +1,6 @@
  //#include "stdafx.h"

 -#include "zlib/zlib.h"

@@ -10,33 +10,20 @@ $NetBSD: patch-ab,v 1.5 2005/07/19 13:51:52 minskim Exp $
 +#include <bzlib.h>

  #include "UnAlz.h"

  

- // mkdir

-@@ -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

+ // utime ÇÔ¼ö ó¸®

+@@ -43,13 +43,13 @@
+ //// byte-order : little to host                                        ////

+ ////////////////////////////////////////////////////////////////////////////

  

- #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 @@
+-#if defined(_WIN32) || defined(__CYGWIN__)		// little to little

++#if defined(_WIN32) || defined(__CYGWIN__) || defined(__INTERIX) // little to little

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

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

  	inline UINT64	unalz_le64toh(UINT64 a){return a;}

  #endif

  

--#ifdef __FreeBSD__

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

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

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

  #	include <sys/endian.h>	

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

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

-@@ -389,7 +393,7 @@ 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(__APPLE__) || defined(__NetBSD__)

- 	const char *inptr = inbuf;

- #else

- 	char *inptr = inbuf;

diff --git a/archivers/unalz/patches/patch-ad b/archivers/unalz/patches/patch-ad
new file mode 100644
index 00000000000..d382f93e7ed
--- /dev/null
+++ b/archivers/unalz/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1.2.2 2005/12/04 10:17:01 seb Exp $
+
+<locale.h> is needed to declare LC_ALL.
+
+--- main.cpp.orig	Wed Jul 27 15:31:54 2005
++++ main.cpp	Sat Oct 22 20:10:14 2005
+@@ -2,6 +2,7 @@
+ #	pragma warning( disable : 4786 )		// stl warning ¾ø¾Ö±â

+ #endif

+ 

++#include <locale.h>

+ #include <stdio.h>

+ #include <iostream>

+ #include <time.h>