diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 07:36:27 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 07:36:27 +0100 |
| commit | 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch) | |
| tree | 6208a7f4fc744684fce0f55acbb47511acace498 /app-arch | |
| parent | 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff) | |
gentoo resync : 25.08.2018
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/Manifest.gz | bin | 17236 -> 17230 bytes | |||
| -rw-r--r-- | app-arch/bzip2/Manifest | 3 | ||||
| -rw-r--r-- | app-arch/bzip2/bzip2-1.0.6-r10.ebuild (renamed from app-arch/bzip2/bzip2-1.0.6-r9.ebuild) | 1 | ||||
| -rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch | 24 |
4 files changed, 27 insertions, 1 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz Binary files differindex c994a2680f72..d7690401686f 100644 --- a/app-arch/Manifest.gz +++ b/app-arch/Manifest.gz diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest index 858e8cfa6e4e..557c57f9a695 100644 --- a/app-arch/bzip2/Manifest +++ b/app-arch/bzip2/Manifest @@ -7,6 +7,7 @@ AUX bzip2-1.0.6-mingw.patch 556 BLAKE2B 1885f5fe9a895e365606fd48d616553a23aa40d3 AUX bzip2-1.0.6-out-of-tree-build.patch 2121 BLAKE2B ff2d18e161e2ed437b3452639b352984e1037bbfa86857d90836994f306ddc375353c36a0afad15c58ad84021f1180bcdd10002c0ce546acc9426a68d263570b SHA512 f4a85c8b9ba0fe0ffadcb058550bb948e84c51f4c213957ffeb1072258efb1caa957c496ce0a0fb4d4b5f7dfdf062995a819487b9475389cfb25583fa061143e AUX bzip2-1.0.6-progress.patch 5716 BLAKE2B 8f89dcc1f9d95440cba7df54ee80e861e02e8f88d1ad906ef4bcecf4796ec125434b0e4d56f83715f30114d808aad9811b72cc890e85ace1901350d96f9d3f91 SHA512 e72ada256b08b539e4489d714d4d8612c643549cd25b1ec4e455b2c769c0955fe0e1f54504b259db213f3c72aa78c08d1f0513ce1ae113182691b504bd9c09b7 AUX bzip2-1.0.6-saneso.patch 443 BLAKE2B b496406e6f3c520886fff99c9206d6d1a01dc0e55a8491bec0318741dc53ad6da321553e73c8929c5fb4938e7275671c04d4b5c86730b580a042a18bb81b7116 SHA512 b9798368d12ab3547ccd3bb614e3a81f1b232990c0f9e3e4472532a8070a3c212274d5b9d093cd046cfee7c8d25da9cfd368c7ca4bd86fbb67f34510107159ab +AUX bzip2-1.0.6-ubsan-error.patch 921 BLAKE2B a2d746725ed9e40f24ac7c83cdbea06884e0013121bad5a2c748975817293c8f300735d46c85e646e008a54d49d002331a86a31726bc7231451514e628ad4637 SHA512 871ad39056b5b5dba35d90f30e1753569241f1054a2564f115d65186232fd84c427c92199e88ba012b4a646d9f18469b3681ef2992ec028b1004f6b7e13a110d DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 -EBUILD bzip2-1.0.6-r9.ebuild 3047 BLAKE2B 96437491bdae99a908af8a4697ad14dc02e773c93b4937747be832dfaca9dc21771fdbac6774fcf02b4d8e619168622de6171376055feb1574359a89c2f60ae8 SHA512 c74bb7b39f164e8760a33aef0c96047da90612e8ba9fd14f78699963880ba58395066ac720b4b3714e02e113f4b15e88f84e3f3f8537f33dd3228a86a9a08b79 +EBUILD bzip2-1.0.6-r10.ebuild 3092 BLAKE2B eb789aadd7a6b0273e43d6fb81992dda2356065fc8133a4c694576168dcc23398f984e594384d505670c77cd6092ef35bf42d2944dde0048abe2ac82f45ed7c0 SHA512 f37a912a252e609e2b2d35ab6104eb9ff2efcd9a6155b9580af55010f27a20357afc0fa13029603fa68426f72f9748e1726ae68da8b1b2951d1e04c2b330666b MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0 diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild index b2bae1f09890..5fb91d277fa8 100644 --- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild +++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild @@ -27,6 +27,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573 "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch "${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466 + "${FILESDIR}"/${PN}-1.0.6-ubsan-error.patch ) DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf ) diff --git a/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch b/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch new file mode 100644 index 000000000000..84b811177ed5 --- /dev/null +++ b/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch @@ -0,0 +1,24 @@ +Author: Manoj Gupta <manojgupta@google.com> + +Use unsigned 1 for shifting instead of signed 1. + +This fixed an issue with shift caught by undefined behavior +sanitizer in clang. +bzip2-1.0.6/blocksort.c:255:7 +runtime error: left shift of 1 by 31 places cannot be represented in type 'int' + +--- a/blocksort.c ++++ b/blocksort.c +@@ -202,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap, + bhtab [ 0 .. 2+(nblock/32) ] destroyed + */ + +-#define SET_BH(zz) bhtab[(zz) >> 5] |= (1 << ((zz) & 31)) +-#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31)) +-#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1 << ((zz) & 31))) ++#define SET_BH(zz) bhtab[(zz) >> 5] |= (1u << ((zz) & 31)) ++#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1u << ((zz) & 31)) ++#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1u << ((zz) & 31))) + #define WORD_BH(zz) bhtab[(zz) >> 5] + #define UNALIGNED_BH(zz) ((zz) & 0x01f) + |