From ba832d25bd662823662a039c7943dcff02c7558c Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 23 Jun 2021 12:13:16 +0200 Subject: [PATCH] app-arch/lz4: update to 1.9.3-r1 Update app-arch/lz4 to 1.9.3-r1, mainly to address CVE-2021-3520. --- .../portage-stable/app-arch/lz4/Manifest | 17 +---- .../lz4/files/lz4-0_p106-cflags.patch | 22 ------- .../files/lz4-0_p106-install-to-bindir.patch | 51 --------------- .../lz4/files/lz4-0_p131-static-libs.patch | 49 -------------- .../files/lz4-1.9.3-negative-memmove.patch | 22 +++++++ .../app-arch/lz4/lz4-0_p106-r1.ebuild | 61 ------------------ .../app-arch/lz4/lz4-0_p120.ebuild | 48 -------------- .../app-arch/lz4/lz4-0_p131-r1.ebuild | 64 ------------------- .../app-arch/lz4/lz4-0_p131.ebuild | 57 ----------------- .../app-arch/lz4/lz4-1.7.5-r1.ebuild | 38 ----------- .../app-arch/lz4/lz4-1.9.3-r1.ebuild | 31 +++++++++ .../app-arch/lz4/lz4-9999.ebuild | 35 ---------- .../portage-stable/app-arch/lz4/metadata.xml | 14 ++-- 13 files changed, 60 insertions(+), 449 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-0_p106-cflags.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-0_p131-static-libs.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p106-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p120.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p131-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p131.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-1.7.5-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-1.9.3-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/lz4/Manifest index 21aac4055a..c60a5c0d8d 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/lz4/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-arch/lz4/Manifest @@ -1,16 +1 @@ -AUX lz4-0_p106-cflags.patch 630 SHA256 fa5a2e429ff7bfc5ff3fd02e5e8078d44f7c704c402d259546c00ad497d445c4 SHA512 0c7cc51229fe20ee0c5e5cb3d933f924750fe3aaa0e97ac78f1f74e4810bf4d9d431990cf12992f25f29dfaffb9dc66b42f3ab6d49147ff881a5cbe49990a89d WHIRLPOOL 754ab3e1cc255ff5226771edc9e9fd977644cf887c49048f4ac1df4e07a347a9dd707aecf952c6223f9b23944b5051fb0032a0605e00964d3ab6af91cc7d93a9 -AUX lz4-0_p106-install-to-bindir.patch 2141 SHA256 3799ef8a56f5cbeecd5f6ceb8716454990087965136322ccd99c6911e60dc924 SHA512 853be770173b46188c4f293f13c263053fd3837c23e959b2d19e36c5d3c8c04798b619224fe02b20f414494baf4db4235b7c223ce665b9b90f14a655c8303f8c WHIRLPOOL 6aac55ec15e8b82a16b06faa50bcb362ace5100bab3788d81ed3618f6efae787664855db14bd0f5393624647d13df40214f873ee7da24d505f9aa4fb371bcdf5 -AUX lz4-0_p131-static-libs.patch 1515 SHA256 62b9f3fb9aa0b22d7aac8ce6fb7aa9acdb83c5eb8dbfce719fdd43e0ca939e3d SHA512 caa55637529c3b723d95965eb1c3ece4551abac6bbaa16cd8c6eae05a41e8be2cde9d67c2099d47a4d62f4e9edeeaf87e532e11fce94bfea953132b5bd7a4732 WHIRLPOOL bc5e7da4bb35c482ea62abfa77a65826427e835509741880ba7f28d005dda3c8c9ae51bed1fbbf4fd9f9b405580c1ba55fdde7b60195e0173f7dd28ae7612c47 -DIST lz4-0_p106.tar.xz 129352 SHA256 a9a09c4ebb962995d10e7e4f7d9224aaa93f308899de18a414948a58e87b6f22 SHA512 8b2bafbf78be7c42831e264d7acdca12712c88369cecdb3aa4621c84bb6b450c372f5153f7c3939a5f70d5810c62b98993697397319d286a1bb51b1e4a6ecde6 WHIRLPOOL fc5bb47b73606b125d8e155365d1fe101083e68e684ffd6014440e0f1416f1f6ecc64b797083e6939bd3e8cd42018e46a1864ae4542160c96933a47df9421a42 -DIST lz4-1.7.5.tar.gz 208019 SHA256 0190cacd63022ccb86f44fa5041dc6c3804407ad61550ca21c382827319e7e7e SHA512 b4e5b17fe06805e676608e636a45f0b480b79a02c6b7ffce84dc4d607861cb2652b2852493ab9d9249e7caeae6f00b6834801fdc39f58d901cbc1c7347915295 WHIRLPOOL 961c56f36a78a4703403a95b54efed8fe859b7ae6327a1318112e322052655aa379e37c34a1d9e8f11397e4f3e14b5f1dfe60083e253dbf20fbbbbb753c28c1b -DIST lz4-r120.tar.gz 161950 SHA256 fa02b1bcc26529c27cff0883d830914bdd1ba41a87035313e1050302f17e4b07 SHA512 8b27c57737ba4c2c8e4f00f7ce13f6edc91f74885bad66dd521dfe85d427e0fd78a300896d599bb8642a34fba78446daf207d1b2fd8e91543d4c093e53694e86 WHIRLPOOL 6a0cd7f8caf9799130b13b3f282197b5ef20fb987f0f5f6911f71a0f5d5d37c542976be5f13bdd2e21a8edd0a6cc8408fcc0f69f6354a0fbc7df75b22fb9de91 -DIST lz4-r131.tar.gz 133784 SHA256 9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5 WHIRLPOOL d605dbada1d4eb84eb6f3f45417eaa35433b1e3e875af560bb5fa06f0465f1652fab74c094d0d743e0034abc0067c83114827e21baea69d5c3d6d95062d0f660 -EBUILD lz4-0_p106-r1.ebuild 1271 SHA256 fb2df96be7f4bc701a992c1e71cb271799756c19c6cc12331f8fdd3cabf9d168 SHA512 7bfd1129e14b73a28c8970c3ec93a9fa81725e89ceb6fd65f31e0a6885acb260d76fc8185a1e44d66861d83335eaa3ba8dbbb52e0a3668b9114b72e5f9ff597b WHIRLPOOL bc7e50c59580324d6cecebb33c12f3e011769d8d88a20d4cf6c773a5c7f8c803f34149cf5906c44ca9ca345697dcbbd518f75e73cef2e9650e9923633791972d -EBUILD lz4-0_p120.ebuild 1179 SHA256 b3a755032e9d4c497a5b3af7236c73c80b223552e7504336d400f3366a56d40a SHA512 fc9390f7feea6763cb8f75713154b01f3e2b97acf0d0964d3c38644ee38d97bd46a474780254fb44315c0561f2191cfa2bb86387e9e2704afc989480726888db WHIRLPOOL 325aa596fb1d061177e5019f54e4a4ada87730f3f0af1f0e65bb8584785af74b1ede06ad8d00ed8ac3aad8437027ef94331db525da4eac76ef25a4114d1fc16d -EBUILD lz4-0_p131-r1.ebuild 1665 SHA256 72f6cc147039298a6fbef3b2351a04b69471ae2b47f63e508902a6d6fe935f32 SHA512 f146c7c9202873973b676e197141618439a4b20253715284a0a2cbf0ee3193e65cc80157a5da152277b21fb188e89be1704dbf176e2035d0c39e7c2814bd6d73 WHIRLPOOL 5723ba7250d6407008098cbd857c617ec3e14b2373bfc731572f40d97c7c1469eb6146c35b226c3173bf83b7022b7ae5af16ae58cfbe0f347596059670fc853a -EBUILD lz4-0_p131.ebuild 1521 SHA256 dc330af4207f4d6c93b58c6a57a502667a465b9d82191d2c29cf029afe9e0bc3 SHA512 466cf8f24471af82f9789dc02ff9b93d69a450f7ec768e3d5c4f2a374ae36a46209d39859701cbd7856b7600dc1d33fbf993d1651cc56338601390f72f78e61c WHIRLPOOL 4d82d332b6e195ab0fc4b7a1a87266c001f009dec587602641254d209cbcf4549d282bfc49c0df4c9f88e98d217d2706a9c61a6032dbaa82de71c639afa7b187 -EBUILD lz4-1.7.5-r1.ebuild 1041 SHA256 014cebc5d27a4b39764b3e5618578073ab6abe22fa70767de12c9d2f606fa350 SHA512 7b78633625edae51f631dc3d60d6e267acf50d833cc398bc8157f4a112de50d2779b30a39e534dd0a8507082a5ff6c3d54764a74b462f163779b9fd7436cfd1e WHIRLPOOL 2cc1fa3510b90a1599539e7297ebd0a41ee8e657bf3261b1f63b954bfbf60c0c20e5eead7fc18ddaa5ff935da97769746b0b5b327856aa02905fccae99ce1f5e -EBUILD lz4-9999.ebuild 936 SHA256 d569b88c00565e01f817d0dedd8b968a25c82e9432d9da6ece1fefecee061a0a SHA512 c93ab261e97d0ec0ac1e4c3a263eaa90798386ce0637735ce4162ef86767342cd3bbaa9dcef1b8fe0941d2753bcaa50bc297c0c95ed454df26183850bf146592 WHIRLPOOL 8feea3ce7ae51c6429af7310ac8eba4b3a23146a749b4aa5f25615d40c2d8c18304c2278860333400e42ab8dd09f2b9b272990c147b2fb950031b26e42aa60cb -MISC ChangeLog 5889 SHA256 45088ed2b789596971f0e6e989edeeac080288a41fda7e5b83c9c257b00fc1e3 SHA512 3319133a34670593097d5436bf7a9cf72b55cfa2e3356d87e9482b065e42a444b9a506aa94d9055acabdb6c9a6dc366b110b95586c39bc3087a7453737d5643b WHIRLPOOL 5cc271fe5333d27db38ae24175bdf7b34f4c0cf02b269568921f2201b78c1952d0742e4be68a374087f5a77b0afd888bbfa76570f50a1af7fab7803827d6f941 -MISC ChangeLog-2015 5612 SHA256 c14d88245bbed1a6330d366fd32c7036be040dc2f5dda355d76657f034343453 SHA512 c5e96dc8ddf42733be0273c2f48dc2c58a994fbb467752b396118f6cfa32c9528e377b0e731dea340a2adec33b1b1835bce9c0f5e0b201f9a7880227eb29a4a6 WHIRLPOOL d66ff4e7b636b62d7bcfe2ee8a22412b2bbe6f2c1c757c5b73b9253391cdd29e6e0b09bb3b64f99cf88c2d3cff77400f779fd373a2b3ffae49aefd3325c870cc -MISC metadata.xml 516 SHA256 f55e831a8af90be1cb9e4c0e1fa634f287fa9ca0439d4a2886db5949e9836137 SHA512 b559b65a4eebe71824ad3cd46c1ef3aabcc1c43f4312cb2e1072f0e7ab4396890696ef7450d7a41a2e03498db9da9e6823f9d8de4d413a0244607b85192efaa8 WHIRLPOOL 24b90d31f4728b01fb8899362ed7719a48f6f0921062d1d6c3f7a221e55c8cd9ef7c4c33ada9643246c30f29a161d01b057e70dc93a735de5623b147cf1e7f14 +DIST lz4-1.9.3.tar.gz 320958 BLAKE2B 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-0_p106-cflags.patch b/sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-0_p106-cflags.patch deleted file mode 100644 index 6fc0fbb47d..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-0_p106-cflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/cmake/pack/CMakeLists.txt -+++ b/cmake/pack/CMakeLists.txt -@@ -36,7 +36,7 @@ - ADD_DEFINITIONS("-Wundef") - ADD_DEFINITIONS("-Wcast-align") - ADD_DEFINITIONS("-Wno-implicit-function-declaration") --ADD_DEFINITIONS("-O3 -march=native -std=c99") -+ADD_DEFINITIONS("-std=c99") - INCLUDE_DIRECTORIES (${SRC_DIR}) - - ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -99,7 +99,7 @@ - ADD_DEFINITIONS("-Wundef") - ADD_DEFINITIONS("-Wcast-align") - ADD_DEFINITIONS("-Wno-implicit-function-declaration") --ADD_DEFINITIONS("-Os -march=native -std=c99") -+ADD_DEFINITIONS("-std=c99") - INCLUDE_DIRECTORIES (${SRC_DIR}) - - diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch b/sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch deleted file mode 100644 index 521b1bfc58..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 496c076..ce3fab1 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -41,11 +41,11 @@ endif() - if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit") - message(STATUS "Build 64bit executable binary") - add_executable(lz4c64 ${LZ4_SRCS}) -- install(TARGETS lz4c64 RUNTIME DESTINATION "./") -+ install(TARGETS lz4c64 RUNTIME DESTINATION "bin/") - if(NOT BUILD_SHARED_LIBS) - message(STATUS "Build 32bit executable binary") - add_executable(lz4c32 ${LZ4_SRCS}) -- install(TARGETS lz4c32 RUNTIME DESTINATION "./") -+ install(TARGETS lz4c32 RUNTIME DESTINATION "bin/") - - SET_TARGET_PROPERTIES(lz4c32 PROPERTIES - COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32") -@@ -53,7 +53,7 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit") - else() - message(STATUS "Build 32bit executable binary") - add_executable(lz4c32 ${LZ4_SRCS}) -- install(TARGETS lz4c32 RUNTIME DESTINATION "./") -+ install(TARGETS lz4c32 RUNTIME DESTINATION "bin/") - endif() - - if(BUILD_SHARED_LIBS) -diff --git a/cmake/pack/CMakeLists.txt b/cmake/pack/CMakeLists.txt -index a9b0557..e85416e 100644 ---- a/cmake/pack/CMakeLists.txt -+++ b/cmake/pack/CMakeLists.txt -@@ -48,16 +48,16 @@ set(FUZZER_SRCS ${SRC_DIR}lz4.c ${SRC_DIR}lz4hc.c ${SRC_DIR}lz4.h ${SRC_DIR}fuzz - # EXECUTABLES FOR 32 Bit and 64 versions - if(CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit") - add_executable(lz4c32 ${LZ4_SRCS}) -- install(TARGETS lz4c32 RUNTIME DESTINATION "./") -+ install(TARGETS lz4c32 RUNTIME DESTINATION "bin/") - SET_TARGET_PROPERTIES(lz4c32 PROPERTIES - COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32 -Os" LINK_FLAGS "-m32") - endif() - - add_executable(lz4c ${LZ4_SRCS}) --install(TARGETS lz4c RUNTIME DESTINATION "./") -+install(TARGETS lz4c RUNTIME DESTINATION "bin/") - - add_executable(fuzzer ${FUZZER_SRCS}) --install(TARGETS fuzzer RUNTIME DESTINATION "./") -+install(TARGETS fuzzer RUNTIME DESTINATION "bin/") - - #target_link_libraries(lz4 ${LZ4_SRCS_LIB}) - ####################### CPACK PACKAGING ################### diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-0_p131-static-libs.patch b/sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-0_p131-static-libs.patch deleted file mode 100644 index f8c5c2de1e..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-0_p131-static-libs.patch +++ /dev/null @@ -1,49 +0,0 @@ -fix from upstream - -From 43b631223b2d0425a0970876974074934f89c450 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Thu, 22 Sep 2016 23:59:02 -0400 -Subject: [PATCH] add a flag to disable static libs - ---- - lib/Makefile | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/lib/Makefile b/lib/Makefile -index b5352a0cb372..27b35c41b693 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -40,6 +40,8 @@ - LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h` - LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH) - -+BUILD_STATIC:= yes -+ - DESTDIR?= - PREFIX ?= /usr/local - CFLAGS ?= -O3 -@@ -71,9 +72,11 @@ - all: liblz4 - - liblz4: lz4.c lz4hc.c lz4frame.c xxhash.c -+ifeq ($(BUILD_STATIC),yes) - @echo compiling static library - @$(CC) $(CPPFLAGS) $(CFLAGS) -c $^ - @$(AR) rcs liblz4.a lz4.o lz4hc.o lz4frame.o xxhash.o -+endif - @echo compiling dynamic library $(LIBVER) - @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER) - @echo creating versioned links -@@ -104,7 +107,9 @@ - @cp -a liblz4.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR) - @cp -a liblz4.$(SHARED_EXT) $(DESTDIR)$(LIBDIR) - @cp -a liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ -+ifeq ($(BUILD_STATIC),yes) - @install -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a -+endif - @install -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h - @install -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h - @install -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h --- -2.9.0 - diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch b/sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch new file mode 100644 index 0000000000..053958dfe8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch @@ -0,0 +1,22 @@ +From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001 +From: Jasper Lievisse Adriaanse +Date: Fri, 26 Feb 2021 15:21:20 +0100 +Subject: [PATCH] Fix potential memory corruption with negative memmove() size + +--- + lib/lz4.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/lz4.c b/lib/lz4.c +index 5f524d01d..c2f504ef3 100644 +--- a/lib/lz4.c ++++ b/lib/lz4.c +@@ -1749,7 +1749,7 @@ LZ4_decompress_generic( + const size_t dictSize /* note : = 0 if noDict */ + ) + { +- if (src == NULL) { return -1; } ++ if ((src == NULL) || (outputSize < 0)) { return -1; } + + { const BYTE* ip = (const BYTE*) src; + const BYTE* const iend = ip + srcSize; diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p106-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p106-r1.ebuild deleted file mode 100644 index af0720e31f..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p106-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils multilib - -CMAKE_USE_DIR="${S}/cmake" - -if [ ${PV} == "9999" ] ; then - inherit subversion - ESVN_REPO_URI="https://lz4.googlecode.com/svn/trunk/" - ESVN_PROJECT="lz4-read-only" -else - SRC_URI="https://dev.gentoo.org/~ryao/dist/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="Extremely Fast Compression algorithm" -HOMEPAGE="https://github.com/Cyan4973/lz4" - -LICENSE="BSD-2" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - if [ ${PV} == "9999" ] - then - subversion_src_prepare - else - epatch "${FILESDIR}/${P}-install-to-bindir.patch" - epatch "${FILESDIR}/${P}-cflags.patch" - fi - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=(-DBUILD_SHARED_LIBS=ON) - cmake-utils_src_configure -} - -src_install() { - dodir /usr - dodir "/usr/$(get_libdir)" - ln -s "$(get_libdir)" "${ED}usr/lib" || \ - die "Cannot create temporary symlink from usr/lib to usr/$(get_libdir)" - - cmake-utils_src_install - - rm "${ED}usr/lib" - - if [ -f "${ED}usr/bin/lz4c64" ] - then - dosym lz4c64 /usr/bin/lz4c - else - dosym lz4c32 /usr/bin/lz4c - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p120.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p120.ebuild deleted file mode 100644 index 85a4e4542a..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p120.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib multilib-minimal toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git" - EGIT_BRANCH=dev -else - MY_PV="r${PV##0_p}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Extremely Fast Compression algorithm" -HOMEPAGE="https://github.com/Cyan4973/lz4" - -LICENSE="BSD-2 GPL-2" -SLOT="0" -IUSE="test valgrind" - -DEPEND="test? ( valgrind? ( dev-util/valgrind ) )" - -src_prepare() { - if ! use valgrind; then - sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die - fi - multilib_copy_sources -} - -multilib_src_compile() { - tc-export CC AR - # we must not use the 'all' target since it builds test programs - # & extra -m32 executables - emake - emake -C programs -} - -multilib_src_install() { - emake install DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}"/usr/$(get_libdir) -} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p131-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p131-r1.ebuild deleted file mode 100644 index 47e496da86..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p131-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib multilib-minimal toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git" - EGIT_BRANCH=dev -else - MY_PV="r${PV##0_p}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Extremely Fast Compression algorithm" -HOMEPAGE="https://github.com/Cyan4973/lz4" - -LICENSE="BSD-2 GPL-2" -# Upstream has trouble keeping ABI stable, so please test new versions -# with abi-compliance-checker and update the subslot every time ABI -# changes. This is the least we can do to keep things sane. -SLOT="0/r131" -IUSE="static-libs test valgrind" - -DEPEND="test? ( valgrind? ( dev-util/valgrind ) )" - -src_prepare() { - if ! use valgrind; then - sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die - fi - epatch "${FILESDIR}"/${PN}-0_p131-static-libs.patch - multilib_copy_sources -} - -lmake() { - emake \ - BUILD_STATIC=$(usex static-libs) \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}"/usr/$(get_libdir) \ - "$@" -} - -multilib_src_compile() { - tc-export CC AR - # we must not use the 'all' target since it builds test programs - # & extra -m32 executables - lmake -C lib liblz4 liblz4.pc - lmake -C programs lz4 lz4c - # work around lack of proper target dependencies - touch lib/liblz4 -} - -multilib_src_test() { - lmake -j1 test -} - -multilib_src_install() { - lmake install DESTDIR="${D}" -} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p131.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p131.ebuild deleted file mode 100644 index dff53bc2e1..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-0_p131.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib multilib-minimal toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git" - EGIT_BRANCH=dev -else - MY_PV="r${PV##0_p}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Extremely Fast Compression algorithm" -HOMEPAGE="https://github.com/Cyan4973/lz4" - -LICENSE="BSD-2 GPL-2" -# Upstream has trouble keeping ABI stable, so please test new versions -# with abi-compliance-checker and update the subslot every time ABI -# changes. This is the least we can do to keep things sane. -SLOT="0/r131" -IUSE="test valgrind" - -DEPEND="test? ( valgrind? ( dev-util/valgrind ) )" - -src_prepare() { - if ! use valgrind; then - sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die - fi - multilib_copy_sources -} - -multilib_src_compile() { - tc-export CC AR - # we must not use the 'all' target since it builds test programs - # & extra -m32 executables - emake -C lib liblz4 liblz4.pc - emake -C programs lz4 lz4c - # work around lack of proper target dependencies - touch lib/liblz4 -} - -multilib_src_test() { - emake -j1 test -} - -multilib_src_install() { - emake install DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}"/usr/$(get_libdir) -} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-1.7.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-1.7.5-r1.ebuild deleted file mode 100644 index aa2a609d18..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-1.7.5-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-multilib - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lz4/lz4.git" - EGIT_BRANCH=dev -else - SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="Extremely Fast Compression algorithm" -HOMEPAGE="https://github.com/lz4/lz4" - -LICENSE="BSD-2 GPL-2" -# https://abi-laboratory.pro/tracker/timeline/lz4/ -# note: abi-tracker is most likely wrong about 1.7.3 changing ABI, -# the maintainer is looking into fixing that -SLOT="0/r131" -IUSE="static-libs" - -CMAKE_USE_DIR=${S}/contrib/cmake_unofficial - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_STATIC_LIBS=$(usex static-libs) - ) - - cmake-utils_src_configure - - # fix missing version in .pc, #608144 - sed -i -e "/Version/s:$:${PV}:" "${BUILD_DIR}"/liblz4.pc || die -} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-1.9.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-1.9.3-r1.ebuild new file mode 100644 index 0000000000..2282b90c9b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-1.9.3-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +inherit cmake-multilib + +DESCRIPTION="Extremely Fast Compression algorithm" +HOMEPAGE="https://github.com/lz4/lz4" +SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2 GPL-2" +# https://abi-laboratory.pro/tracker/timeline/lz4/ +SLOT="0/r132" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +CMAKE_USE_DIR=${S}/build/cmake + +PATCHES=( + "${FILESDIR}"/${P}-negative-memmove.patch +) + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_STATIC_LIBS=$(usex static-libs) + ) + + cmake_src_configure +} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-9999.ebuild deleted file mode 100644 index a2eeb91e00..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-9999.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-multilib - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lz4/lz4.git" - EGIT_BRANCH=dev -else - SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="Extremely Fast Compression algorithm" -HOMEPAGE="https://github.com/lz4/lz4" - -LICENSE="BSD-2 GPL-2" -# https://abi-laboratory.pro/tracker/timeline/lz4/ -# note: abi-tracker is most likely wrong about 1.7.3 changing ABI, -# the maintainer is looking into fixing that -SLOT="0/r131" -IUSE="static-libs" - -CMAKE_USE_DIR=${S}/contrib/cmake_unofficial - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_STATIC_LIBS=$(usex static-libs) - ) - - cmake-utils_src_configure -} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/metadata.xml b/sdk_container/src/third_party/portage-stable/app-arch/lz4/metadata.xml index 58af32e0d0..26e7c6e193 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/lz4/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-arch/lz4/metadata.xml @@ -1,18 +1,16 @@ - - ryao@gentoo.org - Richard Yao - mgorny@gentoo.org Michał Górny - - Enable usage of dev-util/valgrind in tests - + + amadio@gentoo.org + Guilherme Amadio + - Cyan4973/lz4 + lz4/lz4 + cpe:/a:lz4_project:lz4