diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 17:18:14 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 17:18:14 +0100 |
| commit | 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (patch) | |
| tree | 112eea4497761c0227537330b58f9c7e0af3f9d8 /app-arch/p7zip | |
| parent | 0bff53119f08d677db6c1a991bd30741682a8a08 (diff) | |
gentoo resync : 02.06.2018
Diffstat (limited to 'app-arch/p7zip')
| -rw-r--r-- | app-arch/p7zip/Manifest | 2 | ||||
| -rw-r--r-- | app-arch/p7zip/files/p7zip-16.02-darwin.patch | 35 |
2 files changed, 36 insertions, 1 deletions
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest index da8c4b2ce764..0ff4abad9472 100644 --- a/app-arch/p7zip/Manifest +++ b/app-arch/p7zip/Manifest @@ -1,7 +1,7 @@ AUX CVE-2016-9296.patch 495 BLAKE2B 34aad92d8a22b05119242e57effb85648acaa0c0b89a68c8ff03faa8c455ba4e95185732c2f26a462728d872f268d4a716cb14a703c05a1cb157c23dcc24cb86 SHA512 7a7fddf4122c3f5d4632640149a94c285a18515f38510388709c2fb9ecd450f9f34ae2e5fe4926c1c68507567b0affa2c8e9194c732673171dd5ee625192b194 AUX CVE-2017-17969.patch 804 BLAKE2B 1b3d12f6d81d3b3a934088020509435c07a8bfe5ab2003e7369aa9b775808711915b1a0ede48ab6b8b24f37b55f2b84eefff020c34ec171002d9d714bac96f57 SHA512 fb97f6cccedda5b53492afffd65e9933055ffb3dba1419799bb5bf069d066f1172424a7913e0661fbe5937d23c94c062499968ddd09b7310f5d2c8003274340a AUX CVE-2018-5996.patch 6427 BLAKE2B a60d4c51470d9a1ee58afc4ced5190dc589c78604dfd8cefdb5f4caca74d73f175722f777c4c13839951178b394c44b69577c8b5125f45581890dfaf1325d47d SHA512 7962a03430b94aec7c93d6dabee340f4f5915d728ba4df0dcaae483ab9c29115818e5e944572a3fd910addad8799c6a1e3911f6a0a02b661f804eea11c3a0f40 -AUX p7zip-16.02-darwin.patch 218 BLAKE2B 4e6b9f830ef9aff4d9db050163477a341353c4f16188ad2eeef3e248afabdc34d47d4c0708f174efa80e98906833b549b28d43af4585f2b1e34311e6f8c9944c SHA512 26ef30ce27fccdeae6388801e7a619225995c50394131ad5dd6fcf2236a40e92ad2d6dd2ea04c362fd660264decc6b616e5ee6ef83ff42c111e2b1a40f620c68 +AUX p7zip-16.02-darwin.patch 2134 BLAKE2B f8890b8b3e0a3ade007f162e5d3b7fdc9925e8960c6e22463a5ebc474e4ebb2577f0cc0312fda6c129bd1a02dc3ac6d3de17f2c551ee710ab36d0658acfaec52 SHA512 ed8689e39e5bd55eb9cc74c02c94782ac893fc30079492dbde459f24d07037ca63c91526ea428934814febbfbcd1f80c0683cd40d48eab055a3f856b1d78fb37 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f EBUILD p7zip-16.02-r1.ebuild 4498 BLAKE2B e1376067188375ef82b1703531d7c673a54ce6901bc3af814d2928ca503b23484572781d27ef9ee66d388cfc3344d2e960c602ebd0e034ea6ab685a87c6ff773 SHA512 9a0ec08e5013933c43234e38574ac95d81b75b58992c021a2ba2679fc6d00d1ec4b79985d4555189c774f22def0125fa8a5e1e66a67de1daf84d1ef94720e3dc EBUILD p7zip-16.02-r2.ebuild 4571 BLAKE2B b2884ae0f3d8cc0e848d315f09d3cf1daa43650f03708b49eba873a351782d138e124dbb1dc146a2fbde22b3e37664bb29a8c39880ca96738c1d7b34fba1b18f SHA512 34dfb07df92b9fbee1961ef6cd379dac4a93f2bc865be49db86163984978a7366e64f83b5ec6c2a9a717acaa868bb1e42063bdf882dce11bd55e7bbabcd6293b diff --git a/app-arch/p7zip/files/p7zip-16.02-darwin.patch b/app-arch/p7zip/files/p7zip-16.02-darwin.patch index 1ee5d3434b9f..1c3899f30a53 100644 --- a/app-arch/p7zip/files/p7zip-16.02-darwin.patch +++ b/app-arch/p7zip/files/p7zip-16.02-darwin.patch @@ -9,3 +9,38 @@ #include <sys/types.h> #endif + +https://svnweb.freebsd.org/ports/head/archivers/p7zip/files/patch-CPP_Windows_ErrorMsg.cpp?view=markup&pathrev=458172 +This fixes the build with Clang 6.0: + + ../../../../CPP/Windows/ErrorMsg.cpp:24:10: error: case value evaluates to -2147024809, which cannot be narrowed to type 'DWORD' (aka 'unsigned int') [-Wc++11-narrowing] + case E_INVALIDARG : txt = "E_INVALIDARG"; break ; + ^ + ../../../../CPP/Common/MyWindows.h:89:22: note: expanded from macro 'E_INVALIDARG' + #define E_INVALIDARG ((HRESULT)0x80070057L) + ^ + +The HRESULT cast in the macro causes the value to be read as signed int. +--- a/CPP/Windows/ErrorMsg.cpp ++++ b/CPP/Windows/ErrorMsg.cpp +@@ -15,13 +15,13 @@ UString MyFormatMessage(DWORD errorCode) + + switch(errorCode) { + case ERROR_NO_MORE_FILES : txt = "No more files"; break ; +- case E_NOTIMPL : txt = "E_NOTIMPL"; break ; +- case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; +- case E_ABORT : txt = "E_ABORT"; break ; +- case E_FAIL : txt = "E_FAIL"; break ; +- case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ; +- case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ; +- case E_INVALIDARG : txt = "E_INVALIDARG"; break ; ++ case (DWORD)(E_NOTIMPL) : txt = "E_NOTIMPL"; break ; ++ case (DWORD)(E_NOINTERFACE) : txt = "E_NOINTERFACE"; break ; ++ case (DWORD)(E_ABORT) : txt = "E_ABORT"; break ; ++ case (DWORD)(E_FAIL) : txt = "E_FAIL"; break ; ++ case (DWORD)(STG_E_INVALIDFUNCTION) : txt = "STG_E_INVALIDFUNCTION"; break ; ++ case (DWORD)(E_OUTOFMEMORY) : txt = "E_OUTOFMEMORY"; break ; ++ case (DWORD)(E_INVALIDARG) : txt = "E_INVALIDARG"; break ; + case ERROR_DIRECTORY : txt = "Error Directory"; break ; + default: + txt = strerror(errorCode); |