From 7081c575713300044ac18b13b2e52c5da9b46869 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 9 May 2024 12:44:51 +0200 Subject: [PATCH] all: post-release version bump --- CMakeLists.txt | 2 +- NEWS | 3 +++ doc/upx.1 | 2 +- misc/cmake/use_strict_defaults.cmake | 11 +++++++++++ misc/podman/rebuild-stubs/Dockerfile | 2 +- src/version.h | 10 +++++----- 6 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 misc/cmake/use_strict_defaults.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index ab78e054..768c7229 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ option(UPX_CONFIG_DISABLE_EXHAUSTIVE_TESTS "Do not run exhaustive tests" # init #*********************************************************************** -set(UPX_VERSION_STRING "4.2.4") # this should match src/version.h +set(UPX_VERSION_STRING "4.3.0") # this should match src/version.h upx_cmake_include_hook(2_init) diff --git a/NEWS b/NEWS index 21f679ad..50ede983 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ User visible changes for UPX ================================================================== +Changes in 4.3.0 (XX XXX XXXX): + * bug fixes - see https://github.com/upx/upx/milestone/18 + Changes in 4.2.4 (09 May 2024): * bug fixes - see https://github.com/upx/upx/milestone/17 diff --git a/doc/upx.1 b/doc/upx.1 index ba9a11e8..9ed7be22 100644 --- a/doc/upx.1 +++ b/doc/upx.1 @@ -55,7 +55,7 @@ .\" ======================================================================== .\" .IX Title "UPX 1" -.TH UPX 1 2024-05-09 "upx 4.2.4" " " +.TH UPX 1 2024-05-10 "upx 4.3.0" " " .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/misc/cmake/use_strict_defaults.cmake b/misc/cmake/use_strict_defaults.cmake new file mode 100644 index 00000000..6db0189f --- /dev/null +++ b/misc/cmake/use_strict_defaults.cmake @@ -0,0 +1,11 @@ +# +# UPX "CMake" build file; see https://cmake.org/ +# Copyright (C) Markus Franz Xaver Johannes Oberhumer +# + +if(NOT DEFINED USE_STRICT_DEFAULTS) + # use strict config defaults for Git developer builds + set(USE_STRICT_DEFAULTS TRUE CACHE INTERNAL "" FORCE) +endif() + +# vim:set ft=cmake ts=4 sw=4 tw=0 et: diff --git a/misc/podman/rebuild-stubs/Dockerfile b/misc/podman/rebuild-stubs/Dockerfile index 5f235fdc..84a1819a 100644 --- a/misc/podman/rebuild-stubs/Dockerfile +++ b/misc/podman/rebuild-stubs/Dockerfile @@ -60,7 +60,7 @@ RUN cd /root \ # install official UPX release binaries into /usr/local/bin; not required but convenient for testing RUN cd /root \ && wget -q https://github.com/upx/upx/releases/download/v3.91/upx-3.91-amd64_linux.tar.bz2 \ - && xzversions="3.92 3.93 3.94 3.95 3.96 4.0.0 4.0.1 4.0.2 4.1.0 4.2.0 4.2.1 4.2.2 4.2.3" \ + && xzversions="3.92 3.93 3.94 3.95 3.96 4.0.0 4.0.1 4.0.2 4.1.0 4.2.0 4.2.1 4.2.2 4.2.3 4.2.4" \ && for v in $xzversions; do wget -q https://github.com/upx/upx/releases/download/v${v}/upx-${v}-amd64_linux.tar.xz; done \ && for f in ./upx-*.tar.*; do tar -xoaf $f; done \ && for v in 3.91 $xzversions; do d=upx-${v}-amd64_linux; ./$d/upx -qq -d $d/upx -o /usr/local/bin/upx-${v}; done \ diff --git a/src/version.h b/src/version.h index d8ad26f2..25e13943 100644 --- a/src/version.h +++ b/src/version.h @@ -1,7 +1,7 @@ #pragma once -#define UPX_VERSION_HEX 0x040204 /* 04.02.04 */ -#define UPX_VERSION_STRING "4.2.4" -#define UPX_VERSION_STRING4 "4.24" -#define UPX_VERSION_DATE "May 9th 2024" -#define UPX_VERSION_DATE_ISO "2024-05-09" +#define UPX_VERSION_HEX 0x040300 /* 04.03.00 */ +#define UPX_VERSION_STRING "4.3.0" +#define UPX_VERSION_STRING4 "4.30" +#define UPX_VERSION_DATE "May 10th 2024" +#define UPX_VERSION_DATE_ISO "2024-05-10" #define UPX_VERSION_YEAR "2024"