Skip to content

Commit

Permalink
Merge branch 'devel' of https://github.com/upx/upx into devel
Browse files Browse the repository at this point in the history 
Fix Conflicts:
	.github/travis_testsuite_1.sh
  • Loading branch information
@jreiser
jreiser committed Aug 22, 2018
2 parents 98cfe99 + 92a12a2 commit 2923c09
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 63 deletions.
4 changes: 3 additions & 1 deletion .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#
# see http://editorconfig.org/
# see https://editorconfig.org/
#

root = true

[*]
charset = utf-8
end_of_line = lf
Expand Down
112 changes: 56 additions & 56 deletions .github/travis_testsuite_1.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,81 +149,81 @@ c3f44b4d00a87384c03a6f9e7aec809c1addfe3e271244d38a474f296603088c *mipsel-linux.e
b8c35fa2956da17ca505956e9f5017bb5f3a746322647e24ccb8ff28059cafa4 *powerpc-linux.elf/upx-3.91
"
expected_sha256sums__t110_compress_ucl_nrv2b_3_no_filter="\
9fe810880453c530b0e9460a7c736b01943130f6082ac1c27e21e65757f22ce1 *amd64-linux.elf/upx-3.91
c1a6ef9d0b8a26f1d6e3307af6f119bc95411a54421c7da3bd6ade9c4eead187 *arm-wince.pe/upx-3.91.exe
c69bcf500eb659ed1188ee9e6a3f99914a07d724a6c6f911482a8e33d1bfa186 *armeb-linux.elf/upx-3.91
7d5f0fd6f18e4cd16655ef58805f228bcaddd5b035ce998faed446e290aea3d9 *i386-dos32.djgpp2.coff/upx-3.91.exe
11bd7e14932bff8bbb069eec7e648813ad4ee9d8d7f2955df688a08622a07841 *i386-linux.elf/upx-3.91
7301bb93535f91bb789b44da75c2f365cc2d0fa99a4d597f49de8716d96dbcf6 *amd64-linux.elf/upx-3.91
17a9aef8087ca2b3f5fc4e3a41d7c4d721bf3ad222030ac2068ed00eb85a9deb *arm-wince.pe/upx-3.91.exe
3ddbde0d00ff6ea9ce163d889e6f418146b35238d05005b98b76adb555bcf644 *armeb-linux.elf/upx-3.91
f680566e3daae0526c5f6965c23219d7946c4d4117eeaa277bd9e68e907418c6 *i386-dos32.djgpp2.coff/upx-3.91.exe
14394ce9806dc7a3622addfb625d1731e021600e0489dc7c8ea7f30c54d1fd37 *i386-linux.elf/upx-3.91
d3cfb5347758ee54e54cfc92ae502a3e19702cd4fec115d74f84f8a5ab7a9bc2 *i386-win32.pe/upx-3.91.exe
c4c8b912a48bcaaef72fd94cd0c307659a03be2ec359bf01a42a2a39307dd964 *m68k-atari.tos/upx-3.91.ttp
39b5e513b1dc0da3e277138b87d77a3cd4767d053ddb9d7befe38b64421afe6c *mipsel-linux.elf/upx-3.91
7a03ae6c7cfab34f47c1d0935f83a90e6fefd6315b6781832e964b3f5238299e *powerpc-linux.elf/upx-3.91
d0e68eed8f001f3074351acbc7133bd41f67f8e3b7e5f82d5df1911481123378 *m68k-atari.tos/upx-3.91.ttp
58db1b12b5462dbb05c08d7952cacd7c7090a6b3cbfbf9b431e6390f246cbb95 *mipsel-linux.elf/upx-3.91
4fd2e2fc33563e95453f9b4a52c153f248937a548cbfe746bb0d71f19ae5ad03 *powerpc-linux.elf/upx-3.91
"
expected_sha256sums__t120_compress_ucl_nrv2d_3_no_filter="\
4b10d323290e0eb00f8964ddef3604a94ccc34e2b2f1f700ea9ae597a83ed9ea *amd64-linux.elf/upx-3.91
2bb2477bdf4643954b4bb707b1017459238b03f66883303cd20e9e8740764dd7 *arm-wince.pe/upx-3.91.exe
c0913c3f93bc25cf75ba7bb60304ad86c37df27db015af8ae4e29766de22f42d *armeb-linux.elf/upx-3.91
c52473f5dbdac560c05d5d173e5342b5e696e604517359baef581672eb25a9e6 *i386-dos32.djgpp2.coff/upx-3.91.exe
4cd33b4cdce55cae77d332c6a5b8e407b2757aa20a5925542da049bceb666538 *i386-linux.elf/upx-3.91
e537c1a28bea559cbe43cd23723443e2617316a40a6632927f6d94589f800efe *amd64-linux.elf/upx-3.91
33a13fa63379b9eae6878cd2bfb0b41963795a27bc5a026de0b50b4a43131b12 *arm-wince.pe/upx-3.91.exe
3c6f9ab67e21c72073f66c558765d8f07f192ba63d3ffb2ce40ebc9178ccd5ef *armeb-linux.elf/upx-3.91
28bc9ee28b73b11a32fb2e4d3ad99ff06d61cf5b9f104052db89f6f6f0557ca9 *i386-dos32.djgpp2.coff/upx-3.91.exe
8201f15f7ef5e54cddb18474a5ed2d48e2fc7726d6014c457ad3cd82c01e1072 *i386-linux.elf/upx-3.91
5bebadb8455b052580b1f22a949c3eb5a441c8b6ba9c6b50506cb703fc3f65ce *i386-win32.pe/upx-3.91.exe
ef94d8b0e02a650c302bec9f2d50462f2accc2fbb8003cc4977bc550d2e5b9f2 *m68k-atari.tos/upx-3.91.ttp
d3e4b53765396ebcd3853c29710af8154a2f00ec49eb67a8bdfd08759f9240dc *mipsel-linux.elf/upx-3.91
40b1ef454b710776352ae5301ccba8a1e62521343292c2fcf525485d72db16fb *powerpc-linux.elf/upx-3.91
e4d3a430f93b41a3aa67492e6c06d74a1fcd4e06b272de2c681252d91b7a953a *m68k-atari.tos/upx-3.91.ttp
1bd8be4eb09dc39b4b0d447ef4eebac29c51d56380be79b46461962dea81b8fb *mipsel-linux.elf/upx-3.91
c1928cd500450f1f09f2c0265980c329cd0e083095abb3a48f1999a7dd551309 *powerpc-linux.elf/upx-3.91
"
expected_sha256sums__t130_compress_ucl_nrv2e_3_no_filter="\
a5ba8c53414c5dd53f1ba4204f0d0113d0c05b592ee117c6d7496e18f3e29388 *amd64-linux.elf/upx-3.91
0915344e0ee8e7c006e6cce71c024f518e097a88820c7ab3ca183ab1c614ce82 *arm-wince.pe/upx-3.91.exe
e55deb3077e714a8652451ec948d93008f953b4336d34bae10f84b5735b89176 *armeb-linux.elf/upx-3.91
5c5ff78652e76834f3f9ab110c42e3a34ef54c748bce212b0e942049f43f5d4d *i386-dos32.djgpp2.coff/upx-3.91.exe
218d1239502e9ab89894e115ec6db6262e54c8c255223279cec5832d9580e28e *i386-linux.elf/upx-3.91
3fadda0299775195558de2ac25a673ab65467bd147ab8aaf57b7af1542f1d5de *amd64-linux.elf/upx-3.91
99f7d8d7faf57c78053158c6a6915dab8c5cfdcc73112cee9607bcec55837ae8 *arm-wince.pe/upx-3.91.exe
8f06e11a0c60fd83db607089b7ad985a48a26ee09bd533e55072f9fe2ba39f2f *armeb-linux.elf/upx-3.91
542c368392f2d584145cc51d51b9dbc5dc61754597bb1cb7673821a2a4650816 *i386-dos32.djgpp2.coff/upx-3.91.exe
edf61800e09e0ef963b27fded0e032839f4b0cb907a84e43d19ed31bd536440f *i386-linux.elf/upx-3.91
ef5e25c79d356e9ed0736f34dc5ee7a8f4c66d0c330b8d16672fac7d829b5a7c *i386-win32.pe/upx-3.91.exe
dfc6abff2d3417b9708b1232d5791a9232c6623dcedb9dcb59428b67bbf864e9 *m68k-atari.tos/upx-3.91.ttp
14f21cae0de0e071aba2dafd079cef2c1bb2b9f682b6a231d78ca9d5c93b551e *mipsel-linux.elf/upx-3.91
e1f5b2653ff84d9e973aa620c61351fa336f8672100f7e7e98c99db5c1fcd2f0 *powerpc-linux.elf/upx-3.91
2c85e506d670aef707789e5d8a97901ddbb42f50a205a207f575f79b901c2cd7 *m68k-atari.tos/upx-3.91.ttp
93014cd6edd07fafcae133b449837f550f92eeab86ceebd8e7ed5337ab65bdc2 *mipsel-linux.elf/upx-3.91
761f0d45b61e020fd8931cd5192677d06b34fec64a534d99be9fe0346eb56d2b *powerpc-linux.elf/upx-3.91
"
expected_sha256sums__t140_compress_lzma_2_no_filter="\
8f4234373770dfeefba351b41120829e0aa70f6a02d7908247d53be20c1cf02b *amd64-linux.elf/upx-3.91
3af2a2346a252dfacefb6209725907b2947dc1ccf5e99af139608354f852507c *arm-wince.pe/upx-3.91.exe
671684e7deede83357251140c46091689b22a264732d41feca00f3186b3a7b50 *armeb-linux.elf/upx-3.91
964fb400b0b4a2b1926ce7076610db8c3a8e41807fe030209af1615d43b6a020 *i386-dos32.djgpp2.coff/upx-3.91.exe
70feb48eafb161d34c44e9d3815fb30b55032b2e966bd064bacc68679699df77 *i386-linux.elf/upx-3.91
4abe4fff006e53ee147573d74a0f7feba9ebc62b8233e19ac331c5350391bd66 *amd64-linux.elf/upx-3.91
df8ad2d951368ddfb64b8c405f4b4727a2cf5f1c823ecd6e1d298eb21cad0afc *arm-wince.pe/upx-3.91.exe
cd109f76ff00030f564a883da5a57784d9626e85c2c54e6de1f0f2cfda709325 *armeb-linux.elf/upx-3.91
deeae51e0a4c25e6f5afd741361eea445c198fba247b583663b010778699419a *i386-dos32.djgpp2.coff/upx-3.91.exe
591d02bbb604aab55ed653411ea5888d3e93c5e078f3fc79f73d54b12bc83b22 *i386-linux.elf/upx-3.91
171bde9f27a5571b524e9d7cdba6cefa142bb8a0b114c4d5294944ee5781e0bb *i386-win32.pe/upx-3.91.exe
8826c1f910007360ba6cec02c91bd7cdc87bce1ce27804ca728846b92d9086c9 *m68k-atari.tos/upx-3.91.ttp
38777aa0a138f283dffcfd4aa39ba766ccd99b4ef5e51110a5c0dc3e2095062e *mipsel-linux.elf/upx-3.91
11d2feae9c0cb163d22d421aaf23ccb10e2ee90e58034084a4ea8cbc1153c1cf *powerpc-linux.elf/upx-3.91
54ca62d5f15ce87708867f7b349584799779711bca015a3ebac69f5cf077b905 *m68k-atari.tos/upx-3.91.ttp
bc9c9ce0ce7ce32e3f77fca39ffdd7809731e93f978fb201ea49b53a980c5d4e *mipsel-linux.elf/upx-3.91
4357697b615fb40d041ad5a2217a4722aa9066d2100ba2c73212262f581f820f *powerpc-linux.elf/upx-3.91
"
expected_sha256sums__t150_compress_ucl_2_all_filters="\
380a8e9f57eddc207650f1f8b6ade9ebf0c87fc17bfc738fbadc9156ecd8d7c2 *amd64-linux.elf/upx-3.91
dc7323e753ce62e6a1c22112f139953dbaa1e5268530479f8ad48e0c54062295 *arm-wince.pe/upx-3.91.exe
91888142c0647760b1a1ef7f88eb50fc5627125d1790d78858b6373fe41f2f46 *armeb-linux.elf/upx-3.91
8614d93ba30def6866b3be92ae5bdd5f294266e0fc4a26c078682917f127656d *i386-dos32.djgpp2.coff/upx-3.91.exe
51777690edb0143030d8ef3d47114b6f5f93eb48186caa6f0df96a8af96cdbce *i386-linux.elf/upx-3.91
15dd4ad982953a1f7b7c74e7cb34e777fc7db11201280cd5af19ac547c8b9a0f *amd64-linux.elf/upx-3.91
a8cd8c9abb50ab45f30bd2f01bcb4d2e934806440ef206d7da44097aced7085b *arm-wince.pe/upx-3.91.exe
c7af209eb44204a6e4ccbed18e1b3f6eaac5df01c1106426d375d1cd65cd01fd *armeb-linux.elf/upx-3.91
ea265e1f78c23beb632187bfebcb4ae15ce688f10e87db69952ab54724666042 *i386-dos32.djgpp2.coff/upx-3.91.exe
530a267e8fdae0f4b746df62d3f2d406c6bcb08a58058448b867e372dd4a6cc6 *i386-linux.elf/upx-3.91
7c3d7398f63eb9e235992d2d8fd6de9e355f6f21621c45032a6ae6c9009067e6 *i386-win32.pe/upx-3.91.exe
25e9e84bf4e01350b362d088f8107d8228b4576bc47b6b718e9e742f7e4a5205 *m68k-atari.tos/upx-3.91.ttp
bf209059c0e335c43fff79a0d3c9c71b6b378572f4dfe8c5b3f9b725d67e12ba *mipsel-linux.elf/upx-3.91
dead87d0b5e5728e0bb6ea72c9af413dae5233ca20f4e2882002319d9c252815 *powerpc-linux.elf/upx-3.91
bf11d38e3a2cd2c585fdb2173368287e3d82edd5727ea3508c21752b2e7c5a53 *m68k-atari.tos/upx-3.91.ttp
271adf2c52ed777c00a17a19283478e226d76181b1dfb72d6c3aead3923fbad4 *mipsel-linux.elf/upx-3.91
a0152edb1476dc0f713bcd55a7462de200e92e7d057ff4a9af92c7af6abbc3bc *powerpc-linux.elf/upx-3.91
"
expected_sha256sums__t160_compress_all_methods_1_no_filter="\
f275087e1f8815aae990c6c7a149adcc03fabbc7f953fd7d00b5143676a65af2 *amd64-linux.elf/upx-3.91
1c9c618741739404f40d198d2fc77010539589379bf260502af9f10f1ec0d05b *arm-wince.pe/upx-3.91.exe
0afd23f7d643912a6928ff67177049afe3f76926627a61c030a2bd119bbbbfeb *armeb-linux.elf/upx-3.91
863bbf7f3cf41296987b085a4db8acba372e3d65d8d9c656f9a7276f2e7aa4d3 *i386-dos32.djgpp2.coff/upx-3.91.exe
7a2f5c2a4f5df113ab37aa1316b3b3e42f9cc82a3dee8f6ccded5d72ec3523f8 *i386-linux.elf/upx-3.91
16d2a30dd00dfd38d3aba417a087a7341314fa8f5769f8c87565728f2f2bf06a *amd64-linux.elf/upx-3.91
560335ec9f89f2cb8b2a2cff51b4d3dee215c68ecfc0a182fab4a838fafee166 *arm-wince.pe/upx-3.91.exe
b3b0a0c277e947cfc19048e142e71c902cfe6d77931b2a1caeba63b9449aa8c7 *armeb-linux.elf/upx-3.91
d5f89d57c0d74923e557410e1b5ec135e3853985965bfe9fd38283851896b4c9 *i386-dos32.djgpp2.coff/upx-3.91.exe
e6586de002ae8ccda77d9088e37412c1069626e807d81722c1cd810a8a7367e6 *i386-linux.elf/upx-3.91
4c73a38e81fe12f36dc37e514f8580c12bdf5d8cb92e9a07b7070db291a2f7eb *i386-win32.pe/upx-3.91.exe
0f902defbce3c9a8ea08910ff2ac62b9f06e7ceed0570501cb3b6287bfd6d797 *m68k-atari.tos/upx-3.91.ttp
4a872dbd4cb4340781b9bb6dee06a4df674acd68eece72a7e3fde4dc8691fae5 *mipsel-linux.elf/upx-3.91
940c1c67cedb7940504cde0bb456041a926c7d97144cf12fb70f5722905baae9 *powerpc-linux.elf/upx-3.91
53d9857238472bf4e2822134e8d63c11d6ed32f83615bb7491ba4441ff55c6c2 *m68k-atari.tos/upx-3.91.ttp
6b11b762f1dbf07e3135a2ccfbf558d44f4743e23e73ce7c143396b26ae49c4d *mipsel-linux.elf/upx-3.91
96bcf3f5f0f5168d5cdfc01dee5d35e77e0eb8401ae6623ab559254cc99ffbdc *powerpc-linux.elf/upx-3.91
"
expected_sha256sums__t170_compress_all_methods_no_lzma_5_no_filter="\
300e5d7b0c83b9f677d5f7fc9d54ad7e42714017669928e953334d9bc625e745 *amd64-linux.elf/upx-3.91
66653a91c355a1ad1ab7b07c6c20b2d2899d0f42078683d0f4d540df476b1afb *arm-wince.pe/upx-3.91.exe
a036c26346062cabae738c0cfee99a7fc73ec5466e36c5cd6946877e0f0defb8 *armeb-linux.elf/upx-3.91
490a196fbba4a8f21bfb9ac2a3b92a6dc7e287f255a3ab987f7d29d5a75d8db4 *i386-dos32.djgpp2.coff/upx-3.91.exe
2d56d35f3ac6b11a17ff0adf61f569d1ae9551525097188b81356364d05f50eb *i386-linux.elf/upx-3.91
3ded78e90066b688f820a35fe10270c2d3c00bc4c09d02f811b14a959003cd6b *amd64-linux.elf/upx-3.91
6f70c268d4686a50db2843efc58ef547048d8ed0d758bad0c95a50b3ce155a1f *arm-wince.pe/upx-3.91.exe
20acc14939776fcd2e643cea83075d84a764fb12942ce52fa0e72dc313df026b *armeb-linux.elf/upx-3.91
45ae9d42b5c6f1eec0ebc75e656c767efe796719b00922ba9e8095ffa5373450 *i386-dos32.djgpp2.coff/upx-3.91.exe
a6f13ec927d6a44fddd1af92190a530ff59282134080cd9881fef47b34e262f2 *i386-linux.elf/upx-3.91
14b192b5419ca0ec2b3f238dc6ed9c17596e82ff2674a299d4b0a76d118a73de *i386-win32.pe/upx-3.91.exe
2eb756cf3c7e4f80fea379a267071c981f3ab1fbb3eaab7057ca18a2b400fb8f *m68k-atari.tos/upx-3.91.ttp
e460eadcc48075d449c05502495b5de0ddc7f892f57da05607185e63ed871285 *mipsel-linux.elf/upx-3.91
a0e34edf0b5004974e9f69facd3e407046c372360c06f0d87080fd0b8a08d859 *powerpc-linux.elf/upx-3.91
0c341752253e2c530f3dfefc1b4b3619f931f7e23f032a7feffeb192a6a3c373 *m68k-atari.tos/upx-3.91.ttp
24887c6e98651b663cf04720bf7467501fa260a86ae8f83507669cce05d4b8bf *mipsel-linux.elf/upx-3.91
22947eb320540740b012aa53e85b99b038d5c4bf0ebcd28ea76c1c4f9018878f *powerpc-linux.elf/upx-3.91
"
########## end .sha256sums.recreate

Expand Down
3 changes: 2 additions & 1 deletion NEWS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
User visible changes for UPX
==================================================================

Changes in 3.95 (XX XXX 2017):
Changes in 3.95 (26 Aug 2018):
* UPX has moved to GitHub - the new home page is https://upx.github.io
* Flag --android-shlib to work around bad design in Android
* Flag --force-pie when ET_DYN main program is not marked as DF_1_PIE
* Better compatibility with varying layout of address space on Linux
* Support for 4 PT_LOAD layout in ELF generated by binutils-2.31
* bug fixes, particularly better diagnosis of malformed input
* bug fixes - see https://github.com/upx/upx/milestone/4

Changes in 3.94 (12 May 2017):
* Add support for arm64-linux (aka "aarch64").
Expand Down
4 changes: 2 additions & 2 deletions src/util.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@ void mem_clear(void *p, size_t n) {
namespace N_BELE_CTP {
const BEPolicy be_policy;
const LEPolicy le_policy;
}
} // namespace N_BELE_CTP

namespace N_BELE_RTP {
const BEPolicy be_policy;
const LEPolicy le_policy;
}
} // namespace N_BELE_RTP

/*************************************************************************
// qsort() util
Expand Down
6 changes: 3 additions & 3 deletions src/version.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#define UPX_VERSION_HEX 0x035f00 /* 03.95.00 */
#define UPX_VERSION_STRING "3.95"
#define UPX_VERSION_STRING4 "3.95"
#define UPX_VERSION_DATE "May 13th 2017"
#define UPX_VERSION_DATE_ISO "2017-05-12"
#define UPX_VERSION_YEAR "2017"
#define UPX_VERSION_DATE "Aug 26th 2018"
#define UPX_VERSION_DATE_ISO "2018-08-26"
#define UPX_VERSION_YEAR "2018"

/* vim:set ts=4 sw=4 et: */

0 comments on commit 2923c09

Please sign in to comment.