head 1.14; access; symbols pkgsrc-2014Q4:1.13.0.14 pkgsrc-2014Q4-base:1.13 pkgsrc-2014Q3:1.13.0.12 pkgsrc-2014Q3-base:1.13 pkgsrc-2014Q2:1.13.0.10 pkgsrc-2014Q2-base:1.13 pkgsrc-2014Q1:1.13.0.8 pkgsrc-2014Q1-base:1.13 pkgsrc-2013Q4:1.13.0.6 pkgsrc-2013Q4-base:1.13 pkgsrc-2013Q3:1.13.0.4 pkgsrc-2013Q3-base:1.13 pkgsrc-2013Q2:1.13.0.2 pkgsrc-2013Q2-base:1.13 pkgsrc-2013Q1:1.12.0.8 pkgsrc-2013Q1-base:1.12 pkgsrc-2012Q4:1.12.0.6 pkgsrc-2012Q4-base:1.12 pkgsrc-2012Q3:1.12.0.4 pkgsrc-2012Q3-base:1.12 pkgsrc-2012Q2:1.12.0.2 pkgsrc-2012Q2-base:1.12 pkgsrc-2012Q1:1.10.0.40 pkgsrc-2012Q1-base:1.10 pkgsrc-2011Q4:1.10.0.38 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q3:1.10.0.36 pkgsrc-2011Q3-base:1.10 pkgsrc-2011Q2:1.10.0.34 pkgsrc-2011Q2-base:1.10 pkgsrc-2011Q1:1.10.0.32 pkgsrc-2011Q1-base:1.10 pkgsrc-2010Q4:1.10.0.30 pkgsrc-2010Q4-base:1.10 pkgsrc-2010Q3:1.10.0.28 pkgsrc-2010Q3-base:1.10 pkgsrc-2010Q2:1.10.0.26 pkgsrc-2010Q2-base:1.10 pkgsrc-2010Q1:1.10.0.24 pkgsrc-2010Q1-base:1.10 pkgsrc-2009Q4:1.10.0.22 pkgsrc-2009Q4-base:1.10 pkgsrc-2009Q3:1.10.0.20 pkgsrc-2009Q3-base:1.10 pkgsrc-2009Q2:1.10.0.18 pkgsrc-2009Q2-base:1.10 pkgsrc-2009Q1:1.10.0.16 pkgsrc-2009Q1-base:1.10 pkgsrc-2008Q4:1.10.0.14 pkgsrc-2008Q4-base:1.10 pkgsrc-2008Q3:1.10.0.12 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.10 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.8 pkgsrc-2008Q2-base:1.10 cwrapper:1.10.0.6 pkgsrc-2008Q1:1.10.0.4 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.2 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.9.0.16 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.14 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.12 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.10 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.8 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.6 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.9.0.4 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.9.0.2 pkgsrc-2005Q4-base:1.9 pkgsrc-2005Q3:1.5.0.2 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.3.0.2 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2; locks; strict; comment @# @; 1.14 date 2015.01.09.13.49.28; author mef; state dead; branches; next 1.13; commitid fr7mRB6HNnyF0m5y; 1.13 date 2013.05.28.19.00.04; author joerg; state Exp; branches; next 1.12; commitid Mq49BDyMamtBJqRw; 1.12 date 2012.06.28.05.21.19; author sbd; state Exp; branches; next 1.11; 1.11 date 2012.06.27.08.04.18; author sbd; state Exp; branches; next 1.10; 1.10 date 2007.10.14.17.50.05; author minskim; state Exp; branches; next 1.9; 1.9 date 2005.12.03.15.06.42; author salo; state Exp; branches; next 1.8; 1.8 date 2005.11.07.13.43.41; author joerg; state Exp; branches; next 1.7; 1.7 date 2005.10.31.15.04.17; author tv; state Exp; branches; next 1.6; 1.6 date 2005.10.01.10.55.35; author minskim; state Exp; branches; next 1.5; 1.5 date 2005.07.19.13.51.52; author minskim; state Exp; branches 1.5.2.1; next 1.4; 1.4 date 2005.07.12.13.55.26; author minskim; state Exp; branches; next 1.3; 1.3 date 2005.05.17.16.11.42; author minskim; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2005.03.11.22.18.27; author rillig; state Exp; branches; next 1.1; 1.1 date 2005.03.02.16.18.47; author minskim; state Exp; branches; next ; 1.5.2.1 date 2005.12.04.10.17.01; author seb; state Exp; branches; next ; 1.3.2.1 date 2005.07.14.21.47.08; author snj; state Exp; branches; next ; desc @@ 1.14 log @Update 0.61 to 0.65 - ChangeLog doesn't seem to be available, but three patches are now included in upstream and removing them. @ text @$NetBSD: patch-ab,v 1.13 2013/05/28 19:00:04 joerg Exp $ * Use system/buildlinked headers. * The correct type for get_crc_table with zlib 1.2.7 is z_crc_t* --- UnAlz.cpp.orig 2007-02-10 05:51:54.000000000 +0000 +++ UnAlz.cpp @@@@ -1,5 +1,5 @@@@ -#include "zlib/zlib.h" -#include "bzip2/bzlib.h" +#include +#include #include "UnAlz.h" // utime 함수 처리 @@@@ -159,7 +159,7 @@@@ CUnAlz::CUnAlz() { memset(m_files, 0, sizeof(m_files)); m_nErr = ERR_NOERR; - m_posCur = (FileList::iterator)NULL; + m_posCur = m_fileList.end(); m_pFuncCallBack = NULL; m_pCallbackParam = NULL; m_bHalt = FALSE; @@@@ -331,7 +331,7 @@@@ void CUnAlz::Close() i->Clear(); } - m_posCur = (FileList::iterator)NULL; + m_posCur = m_fileList.end(); } //////////////////////////////////////////////////////////////////////////////////////////////////// @@@@ -641,7 +641,7 @@@@ BOOL CUnAlz::SetCurrentFile(const char* } } - m_posCur = (FileList::iterator)NULL; + m_posCur = m_fileList.end(); return FALSE; } @@@@ -682,7 +682,7 @@@@ BOOL CUnAlz::ExtractCurrentFileToBuf(BYT //////////////////////////////////////////////////////////////////////////////////////////////////// BOOL CUnAlz::ExtractCurrentFile(const char* szDestPathName, const char* szDestFileName) { - if(m_posCur==(FileList::iterator)NULL) {ASSERT(0); return FALSE;} + if(m_posCur==m_fileList.end()) {ASSERT(0); return FALSE;} BOOL ret=FALSE; @@@@ -1891,7 +1891,11 @@@@ void CUnAlz::DecryptingData(int nSize, B //////////////////////////////////////////////////////////////////////////////////////////////////// UINT32 CUnAlz::CRC32(UINT32 l, BYTE c) { +#if ZLIB_VERNUM >= 0x1270 + const z_crc_t *CRC_TABLE = get_crc_table(); +#else const unsigned long *CRC_TABLE = get_crc_table(); +#endif return CRC_TABLE[(l ^ c) & 0xff] ^ (l >> 8); } @ 1.13 log @Casting NULL to iterators is not portable, use end(). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.12 2012/06/28 05:21:19 sbd Exp $ @ 1.12 log @Set the type for get_crc_table() based on zlib version. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.11 2012/06/27 08:04:18 sbd Exp $ d16 36 @ 1.11 log @The correct type for get_crc_table with zlib 1.2.7 is z_crc_t* @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.10 2007/10/14 17:50:05 minskim Exp $ d16 1 a16 1 @@@@ -1891,7 +1891,7 @@@@ void CUnAlz::DecryptingData(int nSize, B d20 1 a20 1 - const unsigned long *CRC_TABLE = get_crc_table(); d22 3 @ 1.10 log @Update unalz to 0.61. Changes: - Check endian at run-time. - Avoid using functions that may cause buffer overflow. - Fix a build problem on Linux. @ text @d1 1 a1 1 $NetBSD$ d3 4 a6 1 --- UnAlz.cpp.orig 2007-02-09 21:51:54.000000000 -0800 d16 9 @ 1.9 log @Security update to version 0.53. Changes: - fix buffer overflow (CVE-2005-3862) @ text @d3 3 a5 4 --- 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" a12 16 @@@@ -43,13 +43,13 @@@@ //// byte-order : little to host //// //////////////////////////////////////////////////////////////////////////// -#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 -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) # include inline UINT16 unalz_le16toh(UINT16 a){return le16toh(a);} inline UINT32 unalz_le32toh(UINT32 a){return le32toh(a);} @ 1.8 log @Use sys/endian.h on DragonFly as well. @ text @d3 2 a4 2 --- UnAlz.cpp.orig 2005-07-23 15:27:49.000000000 +0000 +++ UnAlz.cpp d14 1 a14 12 @@@@ -30,6 +30,10 @@@@ # include // iconv.h 때문에 필요 #endif +#if defined(__NetBSD__) +# include // __NetBSD_Version__ +# include // 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))) @@@@ -39,13 +43,13 @@@@ d25 1 a25 1 -#ifdef __FreeBSD__ a29 9 @@@@ -416,7 +420,7 @@@@ BOOL CUnAlz::ReadLocalFileheader() size_t size; char inbuf[ICONV_BUF_SIZE]; char outbuf[ICONV_BUF_SIZE]; -#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__APPLE__) +#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__NetBSD__) const char *inptr = inbuf; #else char *inptr = inbuf; @ 1.7 log @Get useful definitions of unalz_le*toh() on Interix. @ text @d3 1 a3 1 --- UnAlz.cpp.orig 2005-07-23 11:27:49.000000000 -0400 d37 1 a37 1 +#if defined(__FreeBSD__) || defined(__NetBSD__) @ 1.6 log @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. @ text @d3 1 a3 1 --- UnAlz.cpp.orig 2005-07-02 07:40:29.000000000 -0700 d25 8 a32 1 @@@@ -45,7 +49,7 @@@@ d41 1 a41 1 @@@@ -413,7 +417,7 @@@@ BOOL CUnAlz::ReadLocalFileheader() @ 1.5 log @Make this package build on NetBSD-1.6.2 by correcting header file paths. @ text @d3 1 a3 1 --- UnAlz.cpp.orig 2005-06-17 22:31:33.000000000 -0500 d13 2 a14 2 // mkdir @@@@ -18,6 +18,10 @@@@ d25 1 a25 1 @@@@ -33,7 +37,7 @@@@ d34 1 a34 1 @@@@ -389,7 +393,7 @@@@ BOOL CUnAlz::ReadLocalFileheader() d38 1 a38 1 -#if defined(__FreeBSD__) || defined(__CYGWIN__) @ 1.5.2.1 log @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) @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.9 2005/12/03 15:06:42 salo Exp $ d3 2 a4 2 --- UnAlz.cpp.orig 2005-11-21 14:18:13.000000000 +0100 +++ UnAlz.cpp 2005-12-03 15:57:40.000000000 +0100 d13 9 a21 4 // utime 함수 처리 @@@@ -43,13 +43,13 @@@@ //// byte-order : little to host //// //////////////////////////////////////////////////////////////////////////// d23 3 a25 4 -#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;} d29 2 a30 2 -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) d34 9 @ 1.4 log @Update ulalz to 0.40. Changes: - Verify CRC after decompressions. - Fix a bug in crypto code. - Error handling for non-ALZ files. - Fix a buffer overflow in UTF-8 filesystem. - Fix a bug in GetFileList(). @ text @a2 5 This patch assumes that on NetBSD, every has the non-const prototype argument for the second parameter of iconv(). This is true for all but some release candidates of NetBSD-2.0, because either the package converters/libiconv is used or there's a current . d5 9 @ 1.3 log @Use const char*, instead of char*, for the second parameter of iconv() on Darwin. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2005/03/11 22:18:27 rillig Exp $ d8 2 a9 2 --- UnAlz.cpp.orig Sat Nov 27 17:28:17 2004 +++ UnAlz.cpp Fri Mar 11 22:48:31 2005 d30 1 a30 1 @@@@ -376,7 +380,7 @@@@ BOOL CUnAlz::ReadLocalFileheader() @ 1.3.2.1 log @Pullup ticket 599 - requested by Min Sik Kim security update for unalz Revisions pulled up: - pkgsrc/archivers/unalz/Makefile 1.4 - pkgsrc/archivers/unalz/distinfo 1.6 - pkgsrc/archivers/unalz/patches/patch-ab 1.4 Module Name: pkgsrc Committed By: minskim Date: Tue Jul 12 13:55:26 UTC 2005 Modified Files: pkgsrc/archivers/unalz: Makefile distinfo pkgsrc/archivers/unalz/patches: patch-ab Log Message: Update ulalz to 0.40. Changes: - Verify CRC after decompressions. - Fix a bug in crypto code. - Error handling for non-ALZ files. - Fix a buffer overflow in UTF-8 filesystem. - Fix a bug in GetFileList(). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2005/05/17 16:11:42 minskim Exp $ d8 2 a9 2 --- UnAlz.cpp.orig 2005-06-17 22:31:33.000000000 -0500 +++ UnAlz.cpp d30 1 a30 1 @@@@ -389,7 +393,7 @@@@ BOOL CUnAlz::ReadLocalFileheader() @ 1.2 log @The patch-ab assumes that on NetBSD, every has the non-const prototype argument for the second parameter of iconv(). This is true for all but some release candidates of NetBSD-2.0, because either the package converters/libiconv is used or there's a current . Needed for NetBSD-1.6.2. Approved by wiz. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2005/03/02 16:18:47 minskim Exp $ d35 1 a35 1 +#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__NetBSD__) @ 1.1 log @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. @ text @d1 1 a1 1 $NetBSD$ d3 7 a9 2 --- UnAlz.cpp.orig 2004-11-27 10:28:17.000000000 -0600 +++ UnAlz.cpp d30 1 a30 1 @@@@ -376,7 +380,8 @@@@ BOOL CUnAlz::ReadLocalFileheader() d35 1 a35 2 +#if defined(__FreeBSD__) || defined(__CYGWIN__) || \ + (defined(__NetBSD__) && __NetBSD_Version__ >= 200000000) @