diff --git a/NEWS b/NEWS index c04f3303..4ea83f04 100644 --- a/NEWS +++ b/NEWS @@ -2,11 +2,14 @@ User visible changes for UPX ================================================================== -Changes in 4.0.0 (30 Oct 2022): - * Switch to semantic versioning +Changes in 3.99 (27 Oct 2022): + * NOTE: this is a pre-release with known regressions for some ELF formats; + please help testing and reporting bugs, and see our GitHub Actions CI + page for up-to-date pre-built binaries + https://github.com/upx/upx/actions/workflows/ci.yml * SECURITY NOTES: emphasize the security context in the docs + * Support easy building from source code with CMake * Add support for EFI files (PE x86; Kornel Pal) - * Support building with CMake * bug fixes - see https://github.com/upx/upx/milestone/6 Changes in 3.96 (23 Jan 2020): diff --git a/README b/README index 87777da2..931d4b02 100644 --- a/README +++ b/README @@ -18,10 +18,8 @@ WELCOME Welcome to UPX ! -Please don't forget to read the file LICENSE - UPX is distributed -under the GNU General Public License (GPL) with special exceptions -allowing the distribution of all compressed executables, including -commercial programs. +UPX is a free, secure, portable, extendable, high-performance +executable packer for several executable formats. INTRODUCTION @@ -43,7 +41,7 @@ UPX is free software distributed under the term of the GNU General Public License. Full source code is available. UPX may be distributed and used freely, even with commercial applications. -See the UPX License Agreement for details. +See the UPX License Agreements for details. SECURITY CONTEXT @@ -94,11 +92,18 @@ redistribute it under certain conditions. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -UPX License Agreement for more details. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -You should have received a copy of the UPX License Agreement along -with this program; see the file LICENSE. If not, visit the UPX home page. +UPX is distributed with full source code under the terms of the +GNU General Public License v2+; +either under the pure GPLv2+ (see the file COPYING), +or (at your option) under the GPLv+2 with special exceptions and +restrictions granting the free usage for commercial +programs (see the file LICENSE). + +You should have received a copy of the UPX License Agreements along +with this program; see the files COPYING and LICENSE. If not, +visit the UPX home page. Share and enjoy, diff --git a/doc/upx-doc.html b/doc/upx-doc.html index 64231260..6db3b838 100644 --- a/doc/upx-doc.html +++ b/doc/upx-doc.html @@ -29,7 +29,7 @@ Copyright (c) 1996-2022 Markus Oberhumer, Laszlo Molnar & John Reiser

DISCLAIMER

-

UPX comes with ABSOLUTELY NO WARRANTY; for details see the file LICENSE.

+

UPX comes with ABSOLUTELY NO WARRANTY; for details see the file COPYING.

Please report all problems or suggestions to the authors. Thanks.

@@ -795,9 +795,11 @@ Jens Medoch <jssg@users.sourceforge.net>

This program may be used freely, and you are welcome to redistribute it under certain conditions.

-

This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the UPX License Agreement for more details.

+

This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-

You should have received a copy of the UPX License Agreement along with this program; see the file LICENSE. If not, visit the UPX home page.

+

UPX is distributed with full source code under the terms of the GNU General Public License v2+; either under the pure GPLv2+ (see the file COPYING), or (at your option) under the GPLv+2 with special exceptions and restrictions granting the free usage for commercial programs (see the file LICENSE).

+ +

You should have received a copy of the UPX License Agreements along with this program; see the files COPYING and LICENSE. If not, visit the UPX home page.

diff --git a/doc/upx-doc.txt b/doc/upx-doc.txt index 9ce627cc..243e0cc4 100644 --- a/doc/upx-doc.txt +++ b/doc/upx-doc.txt @@ -16,7 +16,7 @@ ABSTRACT formats supported, because of in-place decompression. DISCLAIMER - UPX comes with ABSOLUTELY NO WARRANTY; for details see the file LICENSE. + UPX comes with ABSOLUTELY NO WARRANTY; for details see the file COPYING. Please report all problems or suggestions to the authors. Thanks. @@ -831,9 +831,15 @@ COPYRIGHT This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the UPX License - Agreement for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - You should have received a copy of the UPX License Agreement along with - this program; see the file LICENSE. If not, visit the UPX home page. + UPX is distributed with full source code under the terms of the GNU + General Public License v2+; either under the pure GPLv2+ (see the file + COPYING), or (at your option) under the GPLv+2 with special exceptions + and restrictions granting the free usage for commercial programs (see + the file LICENSE). + + You should have received a copy of the UPX License Agreements along with + this program; see the files COPYING and LICENSE. If not, visit the UPX + home page. diff --git a/doc/upx.1 b/doc/upx.1 index 2b5819bb..547deb38 100644 --- a/doc/upx.1 +++ b/doc/upx.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "UPX 1" -.TH UPX 1 "2022-10-30" "upx 4.0.0" " " +.TH UPX 1 "2022-10-27" "upx 3.99" " " .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -158,7 +158,7 @@ no memory overhead or other drawbacks for most of the formats supported, because of in-place decompression. .SH "DISCLAIMER" .IX Header "DISCLAIMER" -\&\fB\s-1UPX\s0\fR comes with \s-1ABSOLUTELY NO WARRANTY\s0; for details see the file \s-1LICENSE.\s0 +\&\fB\s-1UPX\s0\fR comes with \s-1ABSOLUTELY NO WARRANTY\s0; for details see the file \s-1COPYING.\s0 .PP Please report all problems or suggestions to the authors. Thanks. .SH "SECURITY CONTEXT" @@ -1032,8 +1032,15 @@ redistribute it under certain conditions. .PP This program is distributed in the hope that it will be useful, but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of -\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0 See the -\&\fB\s-1UPX\s0 License Agreement\fR for more details. +\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0 .PP -You should have received a copy of the \s-1UPX\s0 License Agreement along -with this program; see the file \s-1LICENSE.\s0 If not, visit the \s-1UPX\s0 home page. +\&\fB\s-1UPX\s0\fR is distributed with full source code under the terms of the +\&\s-1GNU\s0 General Public License v2+; +either under the pure GPLv2+ (see the file \s-1COPYING\s0), +or (at your option) under the GPLv+2 with special exceptions and +restrictions granting the free usage for commercial +programs (see the file \s-1LICENSE\s0). +.PP +You should have received a copy of the \s-1UPX\s0 License Agreements along +with this program; see the files \s-1COPYING\s0 and \s-1LICENSE.\s0 If not, +visit the \s-1UPX\s0 home page. diff --git a/doc/upx.pod b/doc/upx.pod index 5d65f2d5..836042ac 100644 --- a/doc/upx.pod +++ b/doc/upx.pod @@ -27,7 +27,7 @@ because of in-place decompression. =head1 DISCLAIMER -B comes with ABSOLUTELY NO WARRANTY; for details see the file LICENSE. +B comes with ABSOLUTELY NO WARRANTY; for details see the file COPYING. Please report all problems or suggestions to the authors. Thanks. @@ -945,9 +945,15 @@ redistribute it under certain conditions. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -B for more details. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -You should have received a copy of the UPX License Agreement along -with this program; see the file LICENSE. If not, visit the UPX home page. +B is distributed with full source code under the terms of the +GNU General Public License v2+; +either under the pure GPLv2+ (see the file COPYING), +or (at your option) under the GPLv+2 with special exceptions and +restrictions granting the free usage for commercial +programs (see the file LICENSE). +You should have received a copy of the UPX License Agreements along +with this program; see the files COPYING and LICENSE. If not, +visit the UPX home page. diff --git a/src/help.cpp b/src/help.cpp index 5e5603e6..a8407826 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -348,17 +348,17 @@ void show_license(void) " This program is distributed in the hope that it will be useful,\n" " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - " UPX License Agreement for more details.\n" + " UPX License Agreements for more details.\n" "\n" - " You should have received a copy of the UPX License Agreement\n" - " along with this program; see the file LICENSE.\n" + " You should have received a copy of the UPX License Agreements\n" + " along with this program; see the files COPYING and LICENSE.\n" " If not, visit one of the following pages:\n" "\n" ); int fg = con_fg(f,FG_CYAN); con_fprintf(f, " https://upx.github.io\n" - " http://www.oberhumer.com/opensource/upx/\n" + " https://www.oberhumer.com/opensource/upx/\n" ); (void)con_fg(f,FG_ORANGE); con_fprintf(f, diff --git a/src/version.h b/src/version.h index 1b3fe1ba..17ccdb52 100644 --- a/src/version.h +++ b/src/version.h @@ -1,8 +1,8 @@ -#define UPX_VERSION_HEX 0x040000 /* 04.00.00 */ -#define UPX_VERSION_STRING "4.0.0" -#define UPX_VERSION_STRING4 "4.00" -#define UPX_VERSION_DATE "Oct 30th 2022" -#define UPX_VERSION_DATE_ISO "2022-10-30" +#define UPX_VERSION_HEX 0x036300 /* 03.00.00 */ +#define UPX_VERSION_STRING "3.99" +#define UPX_VERSION_STRING4 "3.99" +#define UPX_VERSION_DATE "Oct 27th 2022" +#define UPX_VERSION_DATE_ISO "2022-10-27" #define UPX_VERSION_YEAR "2022" /* vim:set ts=4 sw=4 et: */