jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Added LZMA license information.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2006-06-22 14:11:58 +02:00
parent f3a47c7e70
commit 6f2fc23f77
3 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/compress_lzma.cpp
View File

@ -34,6 +34,44 @@ int compress_lzma_dummy = 0;
#else
// INFO: the LZMA SDK is covered by by a permissive license which allows
// using unmodified LZMA source code in UPX and the UPX stubs.
// See SPECIAL EXCEPTION below.
//
// Quoting from lzma-4.43/lzma.txt:
//
// LICENSE
// -------
//
// LZMA SDK is available under any of the following licenses:
//
// 1) GNU Lesser General Public License (GNU LGPL)
// 2) Common Public License (CPL)
// 3) Simplified license for unmodified code (read SPECIAL EXCEPTION)
// 4) Proprietary license
//
// It means that you can select one of these four options and follow rules
// of that license.
//
// 1,2) GNU LGPL and CPL licenses are pretty similar and both these
// licenses are classified as
// - "Free software licenses" at http://www.gnu.org/
// - "OSI-approved" at http://www.opensource.org/
//
// 3) SPECIAL EXCEPTION
//
// Igor Pavlov, as the author of this code, expressly permits you
// to statically or dynamically link your code (or bind by name)
// to the files from LZMA SDK without subjecting your linked
// code to the terms of the CPL or GNU LGPL.
// Any modifications or additions to files from LZMA SDK, however,
// are subject to the GNU LGPL or CPL terms.
//
// SPECIAL EXCEPTION allows you to use LZMA SDK in applications with closed code,
// while you keep LZMA SDK code unmodified.
/*************************************************************************
// cruft because of pseudo-COM layer
**************************************************************************/
@ -252,7 +290,7 @@ error:
/*************************************************************************
// LZMA decompress
// decompress
**************************************************************************/
#undef _LZMA_IN_CB
@ -308,7 +346,7 @@ error:
/*************************************************************************
//
// test_overlap
**************************************************************************/
int upx_lzma_test_overlap ( const upx_bytep buf, upx_uint src_off,

12
src/conf.h
View File

@ -211,9 +211,9 @@ struct upx_callback_t
struct lzma_compress_config_t
{
#if 0
unsigned pos_bits;
unsigned lit_pos_bits;
unsigned lit_context_bits;
unsigned pos_bits; // pb
unsigned lit_pos_bits; // lp
unsigned lit_context_bits; // lc
unsigned dict_size;
unsigned mf_passes;
#else
@ -231,9 +231,9 @@ struct upx_compress_config_t
struct lzma_compress_result_t
{
unsigned pos_bits;
unsigned lit_pos_bits;
unsigned lit_context_bits;
unsigned pos_bits; // pb
unsigned lit_pos_bits; // lp
unsigned lit_context_bits; // lc
unsigned dict_size;
unsigned num_probs;
};

10
src/help.cpp
View File

@ -342,21 +342,23 @@ void show_version(int x)
FILE *f = stdout;
UNUSED(x);
#if (0 && ACC_CC_GNUC)
fprintf(f,"upx %s (gcc 0x%06lx)\n", UPX_VERSION_STRING, ACC_CC_GNUC);
#else
fprintf(f,"upx %s\n", UPX_VERSION_STRING);
#endif
#if defined(WITH_NRV)
fprintf(f,"NRV data compression library %s\n", nrv_version_string());
#endif
#if defined(WITH_UCL)
fprintf(f,"UCL data compression library %s\n", ucl_version_string());
#endif
#if 0 && defined(WITH_LZMA)
fprintf(f,"LZMA SDK version ???\n");
#endif
fprintf(f,"Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer\n");
fprintf(f,"Copyright (C) 1996-2006 Laszlo Molnar\n");
fprintf(f,"Copyright (C) 2000-2006 John F. Reiser\n");
fprintf(f,"Copyright (C) 2002-2006 Jens Medoch\n");
#if defined(WITH_LZMA)
fprintf(f,"Copyright (C) 1999-2006 Igor Pavlov\n");
#endif
fprintf(f,"UPX comes with ABSOLUTELY NO WARRANTY; for details type `%s -L'.\n", progname);
}