From 4eda0fe5576868e6c7f97b51aa1c279ff8cd320c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Sep 2023 05:24:31 +0100 Subject: gentoo auto-resync : 25:09:2023 - 05:24:31 --- app-arch/Manifest.gz | Bin 17602 -> 17601 bytes app-arch/lunzip/Manifest | 2 +- app-arch/lunzip/lunzip-1.13.ebuild | 4 +- app-arch/patool/Manifest | 4 + ...atool-1.12_p20230424-disable-file-sandbox.patch | 28 +++++ ...p20230424-map-vnd.android.package-archive.patch | 30 +++++ app-arch/patool/patool-1.12_p20230424.ebuild | 126 +++++++++++++++++++++ app-arch/zstd/Manifest | 10 -- .../zstd/files/zstd-1.5.4-crash-no-directory.patch | 115 ------------------- .../zstd/files/zstd-1.5.4-fix-no-zlib-build.patch | 61 ---------- .../zstd/files/zstd-1.5.4-tests-no-programs.patch | 67 ----------- app-arch/zstd/zstd-1.4.9.ebuild | 69 ----------- app-arch/zstd/zstd-1.5.2-r3.ebuild | 69 ----------- app-arch/zstd/zstd-1.5.4-r2.ebuild | 79 ------------- app-arch/zstd/zstd-1.5.4-r3.ebuild | 80 ------------- 15 files changed, 191 insertions(+), 553 deletions(-) create mode 100644 app-arch/patool/files/patool-1.12_p20230424-disable-file-sandbox.patch create mode 100644 app-arch/patool/files/patool-1.12_p20230424-map-vnd.android.package-archive.patch create mode 100644 app-arch/patool/patool-1.12_p20230424.ebuild delete mode 100644 app-arch/zstd/files/zstd-1.5.4-crash-no-directory.patch delete mode 100644 app-arch/zstd/files/zstd-1.5.4-fix-no-zlib-build.patch delete mode 100644 app-arch/zstd/files/zstd-1.5.4-tests-no-programs.patch delete mode 100644 app-arch/zstd/zstd-1.4.9.ebuild delete mode 100644 app-arch/zstd/zstd-1.5.2-r3.ebuild delete mode 100644 app-arch/zstd/zstd-1.5.4-r2.ebuild delete mode 100644 app-arch/zstd/zstd-1.5.4-r3.ebuild (limited to 'app-arch') diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index 1add82dcde69..25ebc180caeb 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/lunzip/Manifest b/app-arch/lunzip/Manifest index 2bdda214727a..fa6875fedc6f 100644 --- a/app-arch/lunzip/Manifest +++ b/app-arch/lunzip/Manifest @@ -1,4 +1,4 @@ DIST lunzip-1.13.tar.gz 66541 BLAKE2B 45b6a4ffaac6d9b8ddeeebe5e33609bf4e671ad7370570035bacf41ee8ad35f49e14f495dfba650de284fedca1a63ebafe7f67c18083b4add94caaf7709d8e2b SHA512 67f950883b7062d37601bc16d7d64c07f6c580afbf3c0f61394dd6fb5d41c27214484b1dea7aabd41db06d18162b95b5734674646c4fcc833268cabe8cba91bb DIST lunzip-1.13.tar.gz.sig 72 BLAKE2B a0d852dbb5394c5fb3e287cf4111290e0c603414de5a00a2d6173821df2410e4d826554ba4e04b5e9b7df0fa247cd95335a1a227b7cf38d4c5a7f3cc436be6ef SHA512 b71a73e7ad3a25140343db92c0ccf6311d0a30c71675e01a36da4735d0e0523d12d32b6472409359345ad6c9e550dccd399442d98fde44593af42f516119b3fb -EBUILD lunzip-1.13.ebuild 847 BLAKE2B 264f28aaf30202a95fb31c8d04d8fb6c901af92306a25ac5edc0889b5f1d50dd087f616bc7810da545713e8d33dc1fc8c084ee05c24f9892c51102b15ffd19fa SHA512 57be3498581a16550cba5c854694831fa09946cd749c37758616855eebdcee98822402b87535b5e30e23196ad96b86175724fe0ef9c2f4c0dd71807cf0a68752 +EBUILD lunzip-1.13.ebuild 846 BLAKE2B 9b95162adef10d3f2a54d3d2ab2a815261419a715f3bfde65654643f01e43d3e94f3e244d181abf4c942970c6424ad829a9fc707c8d53ef956aa6d05ed9f07fa SHA512 acb2112d128d2b60767ed652544d894cb7eb09906a53c7eb791de21e8b82e0a993b56e6b331c1c1fcf97a2c13b63c22664be49dc0ca3ca35f9aab1e28c591417 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d diff --git a/app-arch/lunzip/lunzip-1.13.ebuild b/app-arch/lunzip/lunzip-1.13.ebuild index 3106eed819d3..bb548ad3aeb8 100644 --- a/app-arch/lunzip/lunzip-1.13.ebuild +++ b/app-arch/lunzip/lunzip-1.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/$ LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )" diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest index 901fdc595b05..77d6fe208d07 100644 --- a/app-arch/patool/Manifest +++ b/app-arch/patool/Manifest @@ -1,3 +1,7 @@ +AUX patool-1.12_p20230424-disable-file-sandbox.patch 1032 BLAKE2B 6c5f0447b1c9d037f78dcfb17d4638a549a170b941aa4724ce7a2d80251e8225c970e7962802cb21a9b23af4338543838dfcceb18c44023a96b41b62c7f9b6cb SHA512 a9919888af4cc71cfd73f0dddfe9958fe33c9f3c3a586fe0fea64ebcb6f9a7267e7d7de07383219daacc5e5a5208c214a26306425cbc77ce8db83d842592224e +AUX patool-1.12_p20230424-map-vnd.android.package-archive.patch 1451 BLAKE2B 0d3cb6076fc8229c9500b635e8a1c5c105fc254ae190ceabff91f157a9c8cab6c25b25d06e1857ec61fbc5317f7393a18075037a8e003bae3a9e90222558da44 SHA512 cbfafbb76449c1a8f9e2250ba2b0de4397dc327c0173ea4d4b90f34f0a5ed68cadda8e060e8f4da01e7da8e445f569d18f637760fb61e8047f72862e6515f5d3 DIST patool-1.12.tar.gz 69146 BLAKE2B e97f64b4ba41860c1f7e506f63f249adeb02974b71bf83eb1673ae1fd93b8f9b698818cb57f961b3d3a5d4e445c5e7a3a349db54e1eb11a8fc165ad07722ace9 SHA512 b8c67526ce79448de703b03ca9b363c0e04cfe56bfc6168bcb96202f95022b6bbcaa92be86a85ee9608070206acd09382b0dfd08a2f805c5e8e5683c7c3f18cc +DIST patool-1.12_p20230424.gh.tar.gz 1990425 BLAKE2B dd0ae58fd26ef1849c26cb681839536b0499d666faf48cb7028adc12840055d72e70a85db99c615c79b076671f16e1371ee5ddbb24228248cd3c1b0daf2dc496 SHA512 c2974bad22ab57aca3aab32e51aeac0c2a2aa3ffee41241d3220151206b8a5d709ec72ea1b4a73a218c03b9fad64297ecd2ab44cc20da5f4d0e4a3ecd5589d43 EBUILD patool-1.12.ebuild 309 BLAKE2B 52083e7c430def04d0dceb298693060e25db3a521055909417d11f1ea29c078370402542dc402764cb722dddf3e6700700d5ed408f365ca7d02edf6b66c8688e SHA512 75b3d106edc6f7004ab104a60760259fc51b752c40d8d5631a6ad2212068fb6d156473827de16a62df9dcf2e44a7c4e3767a62fa8e1603aea9052348399f37da +EBUILD patool-1.12_p20230424.ebuild 2734 BLAKE2B cbbf0f04e001bbf78e50ad2a070df817854eb929da8d1f86c2d37b85925c7749048ced950a57a751fe82e0fd9937c9972ceb9a76129ec147db45356877af2a13 SHA512 3636d9de9e4eb47d112a96be591e7bec78659d508219774d6bfd758913283b4e162727ebadfa91e42b39b9e9835f6e5965f41a744c4d3438af5efc21f06d72b2 MISC metadata.xml 297 BLAKE2B 138dbdc9e037c29e668c846a1f2bdf26e6a868e2b3212f2a698ed50d58f65dc0254d6ad7ea90cad41e0ef17079926855f729c9e971c9c77ffd9218f6a5fabe7d SHA512 d16456723d4eb13816bc7797f7e24e22c7b15bcb555dbf1f3ccea77eb67ddf05b164ff9ffa051d3649cc66c4ffb38c82d35a84ea40fc6965a5f7a6f806ea8efa diff --git a/app-arch/patool/files/patool-1.12_p20230424-disable-file-sandbox.patch b/app-arch/patool/files/patool-1.12_p20230424-disable-file-sandbox.patch new file mode 100644 index 000000000000..daf48adef41a --- /dev/null +++ b/app-arch/patool/files/patool-1.12_p20230424-disable-file-sandbox.patch @@ -0,0 +1,28 @@ +https://github.com/wummel/patool/pull/131 +https://github.com/wummel/patool/issues/75 + +From abe06b7d8fbcd177d44f8eb8e3ac195badc70d25 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate +Date: Thu, 7 Sep 2023 01:12:26 +0300 +Subject: [PATCH] Disable sandbox for file(1) to allow correct output for + compressed tar's + +* Otherwise file(1) will refuse with + "Fork-is-required-to-uncompress--but-disabled" + +Closes: https://github.com/wummel/patool/issues/75 +Signed-off-by: Alfred Wingate +--- a/patoolib/util.py ++++ b/patoolib/util.py +@@ -240,7 +240,7 @@ def guess_mime_file (filename): + encoding = None + if mime in Mime2Encoding: + # try to look inside compressed archives +- cmd = [file_prog, "--brief", "--mime", "--uncompress", filename] ++ cmd = [file_prog, "--brief", "--mime", "--uncompress", "--no-sandbox", filename] + try: + outparts = backtick(cmd).strip().split(";") + mime2 = outparts[0].split(" ", 1)[0] +-- +2.42.0 + diff --git a/app-arch/patool/files/patool-1.12_p20230424-map-vnd.android.package-archive.patch b/app-arch/patool/files/patool-1.12_p20230424-map-vnd.android.package-archive.patch new file mode 100644 index 000000000000..a525ff2d0e46 --- /dev/null +++ b/app-arch/patool/files/patool-1.12_p20230424-map-vnd.android.package-archive.patch @@ -0,0 +1,30 @@ +https://github.com/wummel/patool/pull/130 + +From e8a1eea1d273b278a1b6f5029d2e21cb18bc9ffd Mon Sep 17 00:00:00 2001 +From: Theodore Ni <3806110+tjni@users.noreply.github.com> +Date: Sat, 26 Aug 2023 23:42:15 -0700 +Subject: [PATCH] Map application/vnd.android.package-archive to zip + +This was added to file 5.45 in https://github.com/file/file/commit/b29519e7dc572d85f757314d3bfc7461ceb7709c +and the test .apk file is sometimes detected with that mime type. +--- a/patoolib/__init__.py ++++ b/patoolib/__init__.py +@@ -84,6 +84,7 @@ + 'application/x-xz': 'xz', + 'application/x-zip-compressed': 'zip', + 'application/x-zoo': 'zoo', ++ 'application/vnd.android.package-archive': 'zip', + 'application/zip': 'zip', + 'application/zpaq': 'zpaq', + "application/zstd": "zstd", +--- a/tests/test_mime.py ++++ b/tests/test_mime.py +@@ -137,7 +137,7 @@ def test_mime_file (self): + self.mime_test_file("t.chm.foo", "application/x-chm") + self.mime_test_file("t.iso", "application/x-iso9660-image") + self.mime_test_file("t.epub", "application/zip") +- self.mime_test_file("t.apk", ("application/zip", "application/java-archive", "application/jar")) ++ self.mime_test_file("t.apk", ("application/zip", "application/java-archive", "application/jar", "application/vnd.android.package-archive")) + self.mime_test_file("t.zpaq", "application/zpaq") + self.mime_test_file("t.zpaq.foo", "application/zpaq") + diff --git a/app-arch/patool/patool-1.12_p20230424.ebuild b/app-arch/patool/patool-1.12_p20230424.ebuild new file mode 100644 index 000000000000..d18bd326dd15 --- /dev/null +++ b/app-arch/patool/patool-1.12_p20230424.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 + +DESCRIPTION="Portable archive file manager" +HOMEPAGE="https://wummel.github.io/patool/" +COMMIT="ab64562c8cdac34dfd69fcb6e30c8c0014282d11" +SRC_URI="https://github.com/wummel/patool/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND=" + test? ( + app-arch/arj + app-arch/bzip2 + app-arch/cabextract + app-arch/cpio + app-arch/dpkg + app-arch/gzip + app-arch/lbzip2 + app-arch/lcab + app-arch/lha + app-arch/libarchive + app-arch/lrzip + app-arch/lzip + app-arch/lzop + app-arch/ncompress + app-arch/p7zip[rar] + app-arch/pbzip2 + app-arch/pdlzip + app-arch/pigz + app-arch/rpm + app-arch/sharutils + app-arch/tar + app-arch/unace + app-arch/unadf + app-arch/unzip + app-arch/xdms + app-arch/xz-utils + app-arch/zip + app-arch/zpaq + app-arch/zstd + app-cdr/cdrtools + dev-libs/chmlib + media-libs/flac + media-sound/shorten + sys-apps/diffutils + sys-apps/file + sys-apps/grep + !elibc_musl? ( app-arch/rar ) + !x86? ( app-arch/clzip ) + ) +" +# Test dependencies which are packaged but can't be tested for various reasons. +# app-arch/arc +# app-arch/zoo +# app-arch/zopfli +# media-sound/mac + +# app-arch/rar is masked on musl +# app-arch/clzip is unkeyworded on x86 + +# Unpackaged testable dependencies +# archmage +# genisoimage +# lhasa +# nomarch +# pdzip2 +# py_{bz2,echo,gzip,tarfile,zipfile} +# rpm2cpio +# rzip +# star +# unalz +# uncompress.real + +PATCHES=( + "${FILESDIR}/patool-1.12_p20230424-disable-file-sandbox.patch" + "${FILESDIR}/patool-1.12_p20230424-map-vnd.android.package-archive.patch" +) + +distutils_enable_tests pytest + +src_install() { + distutils-r1_src_install + + newdoc doc/README.txt README.md + doman doc/patool.1 +} + +python_test() { + local EPYTEST_IGNORE=( + # zoo emits a non-zero exit status on a possibly false consistency check + # Zoo: WARNING: Archive header failed consistency check. + "tests/archives/test_zoo.py" + # Doesn't accept long arguments, such as those that files in ${S} would have. + # Too long argument: /var/tmp/portage/app-arch/patool-1.12_p20230424/work/patool-ab64562c8cdac34dfd69fcb6e30c8c0014282d11/tests/data/p.arc.foo + "tests/archives/test_arc.py" + # Error: 1002 (invalid input file) + "tests/archives/test_mac.py" + # AttributeError: module 'patoolib.programs.zopfli' has no attribute 'extract_gzip' + "tests/archives/test_zopfli.py" + ) + + if use elibc_musl; then + EPYTEST_IGNORE+=( + "tests/archives/test_rar.py" + ) + fi + + if use x86; then + EPYTEST_IGNORE+=( + "tests/archives/test_clzip.py" + ) + fi + + epytest +} diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest index ee0bf5c2368b..89edae028733 100644 --- a/app-arch/zstd/Manifest +++ b/app-arch/zstd/Manifest @@ -1,14 +1,4 @@ -AUX zstd-1.5.4-crash-no-directory.patch 4689 BLAKE2B f490f0bcd938d1eb59f54b5d9d9b9e309a15dfef3fc8e947f19869e9bc1ded56e06170c6c89a79bb33db9ae0ed91edabba5e09f66c1d47eaea4c5c200ee5a5e9 SHA512 735daf86e2cec242764d15907ab9c85735a1bda91ec66dfdbee696bbb74cad53d3eee1f7857ac1fe4c694e935a3779dbdfa0a0f69d45a8b6c009ec7436a90b32 -AUX zstd-1.5.4-fix-no-zlib-build.patch 2469 BLAKE2B 955ee5ce52fdf7701c8d3f812c4e4ed15c53d7764e9bfc0cdac09186aa572e0d867eee0862470f2d9cfb17369429f889d3a4f903e3bab12672c517c46c9739d0 SHA512 2caf596008aaad385bbf2ec61faff06ca28abac0228440fc1d4226e83757db2c7ca16010beb73da9802fe82ea6a6b81ce350e7fb7b059266d204d844623a1baa AUX zstd-1.5.4-no-find-valgrind.patch 596 BLAKE2B 28c5bcc005511703833fc73b2f11ee7a42a69c5e762e71c269265c42585fe4cf167a4bdba4f0e36e8e0e7a61e01e0f992c9417690bc879978d575823aa5e1884 SHA512 ad6cd84fde1a4f29710ecffe40854a8bbad0b1428000a57d706b221411675e2d79958c940dc955ec27020cfb7c9a14b7ac84cfe15759a5d07552d46f94b7df88 -AUX zstd-1.5.4-tests-no-programs.patch 2252 BLAKE2B 014fab10a60fd6f5ecf5399ebc77a192075c0b08cb3b6643b4b414e942198f476d5dc8fbe8fa76306db70361a299518b574f69b84d8b27b30e5c5dc4988c2c48 SHA512 aed61bacf3d4d2b802e8e6a3dfa12221dcd7b6f0e64972530f826995619870ed1e87ea920eb6fdc81069e5165153703972ad1e2d370521f7d1624c308afba520 -DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133 -DIST zstd-1.5.2.tar.gz 1950967 BLAKE2B 9d474e9fdcf7e5eb09d1f606712b05ca3001e8f6f7451254d8dba3f429101048532fd9c84a5b9083ae90d0457e9e1b1d48256581a1697e7db19b09d73595f070 SHA512 e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e -DIST zstd-1.5.4.gh.tar.gz 2161536 BLAKE2B ffc5fcbbdf4ab04bc14b5037308bf4e879d4cbaaf863462ea1e8af3f1b86b935ee6036e49298c83ac42b00472c003e32c263c977f0ae7d64f31d9ae63c5c28cb SHA512 2896a6dd6b60cc251720356babcbab6018c874eb2149121b26e28041496fc355a9cb5fd1b39c91558fcfbafb789b3d721264a0f9b5734f893d5f3cdf97016394 DIST zstd-1.5.5.tar.gz 2368543 BLAKE2B 7680e27a0adacfb809d9fc81e06d3f99bf74df30374d3b5cb2d58f667dd1b7d5c41697e608592709e17c0e32277f20a6d615edee409b5d7cdcb15da2799a2350 SHA512 99109ec0e07fa65c2101c9cb36be56b672bbd0ee69d265f924718e61f9192ae8385c8d9e4d0c318be9edfa6d849fd3d60e5f164fa120961449429ea3c5dab6b6 -EBUILD zstd-1.4.9.ebuild 1644 BLAKE2B 49615794ffc20373b9887bf87143288abed771cd45b6c1e6394ee0022c1110e9787e81124ab6cd2bf65b60574488fe55a2893fa2a2738bce05a33923d6881a99 SHA512 03b0587824d0c307f116850c0cf54e487c6df04e19cd19aeca16ab516232eb0575a1750637bdcaa131f0de8e506a62cec5674c1e66f35f2d2d7bb36e5c4c6032 -EBUILD zstd-1.5.2-r3.ebuild 1458 BLAKE2B 4e8cc4ed1328178fa450da53ac143aed5a605de84bafb551ad4827a826f130c4e11d7ffd51c1ec14da2e443df23fe5514473456da81ca075f3e3af1bbdea2560 SHA512 e6398ec0f675d3e46d6790a6957b7d9c6a4aa43e6bc20035e7a636d0eda8edc6eaa0e954fabf5068fe1a7cdaff6c53a0d81c4a7d74d8eb05010f1e3b434f8477 -EBUILD zstd-1.5.4-r2.ebuild 2053 BLAKE2B 5a685a55939a9a7f67f2f2d5d4e9f3af18c210d3bb81f99050bda402f771c61e1998d9415ffa6663e3cc1908d3a335f8632c73c1e01f81d6a20a9b404fe9fc4a SHA512 df17bd1636f98409c15d9636e19e5c4ac1d6de293185d7f48190bdc6595be800a74ae804abffee101f349dc3a080d7f80f6b83edeae48befd5716165ed5c3cb0 -EBUILD zstd-1.5.4-r3.ebuild 2090 BLAKE2B 0bc745a9b132896a5e36f4987202e0a32a8c3a09a7bd53dbab946de3a51c0f253bc86c8cb4950d8096cae10f88201d1bd09d1704b1ba0b3782378617bbc81e44 SHA512 d69eab2c229483ac9c94dbe6449ad79dbdcfdb6d9aee2aa2a93ad87caa6a20ad48008f2b13751eb9f00ef08bc7124d245da4bb191daa501e2d389467875453a9 EBUILD zstd-1.5.5.ebuild 1752 BLAKE2B 924a18dc1a55ef5cf84e6be528328a96026074420e53ed58de0e2cf28edb479f6d2d046d79667719f70d18f6352216d7235ec0cb2f39ee2ec14b5649dd95ba07 SHA512 15acfd70664a12cdac98695b71e1c8a77bb6ae04c938a4ac6b443886793d977d27742337f0a017fdac8b68811fe2c1d93884df3c2387b5045bbc20f6a70f7b98 MISC metadata.xml 302 BLAKE2B 66692581b8918a23bab99bb3b0909702327c1acf2b7f8ec2fbfdf74ff75a8f178ce1140e0a9d46b64983dfe9529134db842a5a60a86b7fcbbd5db88e844d136d SHA512 097c09d06824c85919b21bc841c791851b1a7d1a6c6d16a26bbe9bed9dfb1522cacdd2b430b8ff51762fb73b388d88ec679d46570b2e56b36352ea2cf20e46f6 diff --git a/app-arch/zstd/files/zstd-1.5.4-crash-no-directory.patch b/app-arch/zstd/files/zstd-1.5.4-crash-no-directory.patch deleted file mode 100644 index d64e1c1d34f0..000000000000 --- a/app-arch/zstd/files/zstd-1.5.4-crash-no-directory.patch +++ /dev/null @@ -1,115 +0,0 @@ -https://github.com/facebook/zstd/issues/3523 -https://github.com/facebook/zstd/pull/3541 - -From 50e8f55e7d5928af9c3411afdb4fbedb4d8f770d Mon Sep 17 00:00:00 2001 -From: "W. Felix Handte" -Date: Thu, 9 Mar 2023 12:46:37 -0500 -Subject: [PATCH 1/3] Fix Python 3.6 Incompatibility in CLI Tests - ---- a/tests/cli-tests/run.py -+++ b/tests/cli-tests/run.py -@@ -535,7 +535,8 @@ def _run_script(self, script: str, cwd: str) -> None: - subprocess.run( - args=[script], - stdin=subprocess.DEVNULL, -- capture_output=True, -+ stdout=subprocess.PIPE, -+ stderr=subprocess.PIPE, - cwd=cwd, - env=env, - check=True, - -From c4c3e11958aed4dc99ec22e3d31c405217575a8c Mon Sep 17 00:00:00 2001 -From: "W. Felix Handte" -Date: Thu, 9 Mar 2023 12:47:40 -0500 -Subject: [PATCH 2/3] Avoid Calling `setvbuf()` on Null File Pointer - ---- a/programs/fileio.c -+++ b/programs/fileio.c -@@ -644,18 +644,24 @@ FIO_openDstFile(FIO_ctx_t* fCtx, FIO_prefs_t* const prefs, - #endif - if (f == NULL) { - DISPLAYLEVEL(1, "zstd: %s: %s\n", dstFileName, strerror(errno)); -+ } else { -+ /* An increased buffer size can provide a significant performance -+ * boost on some platforms. Note that providing a NULL buf with a -+ * size that's not 0 is not defined in ANSI C, but is defined in an -+ * extension. There are three possibilities here: -+ * 1. Libc supports the extended version and everything is good. -+ * 2. Libc ignores the size when buf is NULL, in which case -+ * everything will continue as if we didn't call `setvbuf()`. -+ * 3. We fail the call and execution continues but a warning -+ * message might be shown. -+ * In all cases due execution continues. For now, I believe that -+ * this is a more cost-effective solution than managing the buffers -+ * allocations ourselves (will require an API change). -+ */ -+ if (setvbuf(f, NULL, _IOFBF, 1 MB)) { -+ DISPLAYLEVEL(2, "Warning: setvbuf failed for %s\n", dstFileName); -+ } - } -- /* An increased buffer size can provide a significant performance boost on some platforms. -- * Note that providing a NULL buf with a size that's not 0 is not defined in ANSI C, but is defined -- * in an extension. There are three possibilities here - -- * 1. Libc supports the extended version and everything is good. -- * 2. Libc ignores the size when buf is NULL, in which case everything will continue as if we didn't -- * call `setvbuf`. -- * 3. We fail the call and execution continues but a warning message might be shown. -- * In all cases due execution continues. For now, I believe that this is a more cost-effective -- * solution than managing the buffers allocations ourselves (will require an API change). */ -- if(setvbuf(f, NULL, _IOFBF, 1 MB)) -- DISPLAYLEVEL(2, "Warning: setvbuf failed for %s\n", dstFileName); - return f; - } - } - -From 957a0ae52d0f49eccd260a22ceb5f5dfed064e9f Mon Sep 17 00:00:00 2001 -From: "W. Felix Handte" -Date: Thu, 9 Mar 2023 12:48:11 -0500 -Subject: [PATCH 3/3] Add CLI Test - ---- /dev/null -+++ b/tests/cli-tests/file-stat/compress-file-to-dir-without-write-perm.sh -@@ -0,0 +1,12 @@ -+#!/bin/sh -+ -+# motivated by issue #3523 -+ -+datagen > file -+mkdir out -+chmod 000 out -+ -+zstd file -q --trace-file-stat -o out/file.zst -+zstd -tq out/file.zst -+ -+chmod 777 out ---- /dev/null -+++ b/tests/cli-tests/file-stat/compress-file-to-dir-without-write-perm.sh.stderr.exact -@@ -0,0 +1,26 @@ -+Trace:FileStat: > UTIL_isLink(file) -+Trace:FileStat: < 0 -+Trace:FileStat: > UTIL_isConsole(2) -+Trace:FileStat: < 0 -+Trace:FileStat: > UTIL_getFileSize(file) -+Trace:FileStat: > UTIL_stat(-1, file) -+Trace:FileStat: < 1 -+Trace:FileStat: < 65537 -+Trace:FileStat: > UTIL_stat(-1, file) -+Trace:FileStat: < 1 -+Trace:FileStat: > UTIL_isDirectoryStat() -+Trace:FileStat: < 0 -+Trace:FileStat: > UTIL_stat(-1, file) -+Trace:FileStat: < 1 -+Trace:FileStat: > UTIL_isSameFile(file, out/file.zst) -+Trace:FileStat: > UTIL_stat(-1, file) -+Trace:FileStat: < 1 -+Trace:FileStat: > UTIL_stat(-1, out/file.zst) -+Trace:FileStat: < 0 -+Trace:FileStat: < 0 -+Trace:FileStat: > UTIL_isRegularFile(out/file.zst) -+Trace:FileStat: > UTIL_stat(-1, out/file.zst) -+Trace:FileStat: < 0 -+Trace:FileStat: < 0 -+zstd: out/file.zst: Permission denied -+zstd: can't stat out/file.zst : Permission denied -- ignored - diff --git a/app-arch/zstd/files/zstd-1.5.4-fix-no-zlib-build.patch b/app-arch/zstd/files/zstd-1.5.4-fix-no-zlib-build.patch deleted file mode 100644 index c6e65cbe2b16..000000000000 --- a/app-arch/zstd/files/zstd-1.5.4-fix-no-zlib-build.patch +++ /dev/null @@ -1,61 +0,0 @@ -https://bugs.gentoo.org/894058 -https://github.com/facebook/zstd/pull/3497 - -From cc94fac7c879c47984bba7d60d5ce0c9834ff4c7 Mon Sep 17 00:00:00 2001 -From: "Alex Xu (Hello71)" -Date: Fri, 10 Feb 2023 19:30:30 -0500 -Subject: [PATCH] Use correct types in LZMA comp/decomp - -Bytef and uInt are zlib types, not available when zlib is disabled - -Fixes: 1598e6c634ac ("Async write for decompression") -Fixes: cc0657f27d81 ("AsyncIO compression part 2 - added async read and asyncio to compression code (#3022)") ---- - programs/fileio.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/programs/fileio.c b/programs/fileio.c -index 9a8300cdd8..d3ed9217d5 100644 ---- a/programs/fileio.c -+++ b/programs/fileio.c -@@ -1173,8 +1173,8 @@ FIO_compressLzmaFrame(cRess_t* ress, - } - - writeJob =AIO_WritePool_acquireJob(ress->writeCtx); -- strm.next_out = (Bytef*)writeJob->buffer; -- strm.avail_out = (uInt)writeJob->bufferSize; -+ strm.next_out = (BYTE*)writeJob->buffer; -+ strm.avail_out = writeJob->bufferSize; - strm.next_in = 0; - strm.avail_in = 0; - -@@ -1201,7 +1201,7 @@ FIO_compressLzmaFrame(cRess_t* ress, - writeJob->usedBufferSize = compBytes; - AIO_WritePool_enqueueAndReacquireWriteJob(&writeJob); - outFileSize += compBytes; -- strm.next_out = (Bytef*)writeJob->buffer; -+ strm.next_out = (BYTE*)writeJob->buffer; - strm.avail_out = writeJob->bufferSize; - } } - if (srcFileSize == UTIL_FILESIZE_UNKNOWN) -@@ -2316,8 +2316,8 @@ FIO_decompressLzmaFrame(dRess_t* ress, - } - - writeJob = AIO_WritePool_acquireJob(ress->writeCtx); -- strm.next_out = (Bytef*)writeJob->buffer; -- strm.avail_out = (uInt)writeJob->bufferSize; -+ strm.next_out = (BYTE*)writeJob->buffer; -+ strm.avail_out = writeJob->bufferSize; - strm.next_in = (BYTE const*)ress->readCtx->srcBuffer; - strm.avail_in = ress->readCtx->srcBufferLoaded; - -@@ -2345,7 +2345,7 @@ FIO_decompressLzmaFrame(dRess_t* ress, - writeJob->usedBufferSize = decompBytes; - AIO_WritePool_enqueueAndReacquireWriteJob(&writeJob); - outFileSize += decompBytes; -- strm.next_out = (Bytef*)writeJob->buffer; -+ strm.next_out = (BYTE*)writeJob->buffer; - strm.avail_out = writeJob->bufferSize; - } } - if (ret == LZMA_STREAM_END) break; - diff --git a/app-arch/zstd/files/zstd-1.5.4-tests-no-programs.patch b/app-arch/zstd/files/zstd-1.5.4-tests-no-programs.patch deleted file mode 100644 index ec1fc325920f..000000000000 --- a/app-arch/zstd/files/zstd-1.5.4-tests-no-programs.patch +++ /dev/null @@ -1,67 +0,0 @@ -https://github.com/facebook/zstd/pull/3490 - -From 183a18a45c1d69f8c42b9fcd25e6d28f9b3d75bb Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Fri, 10 Feb 2023 00:28:47 -0500 -Subject: [PATCH 1/2] meson: correctly specify the dependency relationship for - playtests - -It depends on the zstd program being built, and passes it as an env -variable. Just like datagen. But for datagen, we explicitly depend on -it, while for zstd, we assume it's built as part of "all". - -This can be wrong in two cases: -- when running individual tests, meson can (re)build just what is needed - for that one test -- a later patch will handle building zstd but not by default ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -162,7 +162,7 @@ if host_machine_os != os_windows - playTests_sh, - args: opt, - env: ['ZSTD_BIN=' + zstd.full_path(), 'DATAGEN_BIN=./datagen'], -- depends: [datagen], -+ depends: [datagen, zstd], - suite: suite, - workdir: meson.current_build_dir(), - timeout: 2800) # Timeout should work on HDD drive - -From 97ab0e2ab60fdda78f610032408df104de20b9f1 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Thu, 9 Feb 2023 23:55:09 -0500 -Subject: [PATCH 2/2] meson: always build the zstd binary when tests are - enabled - -We need to run it for the tests, even if programs are disabled. So if -they are disabled, create a build rule for the program, but don't -install it. Just make it available for the test itself. ---- a/meson.build -+++ b/meson.build -@@ -132,7 +132,7 @@ endif - - subdir('lib') - --if bin_programs -+if bin_programs or bin_tests - subdir('programs') - endif - ---- a/programs/meson.build -+++ b/programs/meson.build -@@ -72,7 +72,14 @@ zstd = executable('zstd', - c_args: zstd_c_args, - dependencies: zstd_deps, - export_dynamic: export_dynamic_on_windows, # Since Meson 0.45.0 -- install: true) -+ build_by_default: bin_programs, -+ install: bin_programs) -+ -+if not bin_programs -+ # we generate rules to build the programs, but don't install anything -+ # so do not continue to installing scripts and manpages -+ subdir_done() -+endif - - zstd_frugal_sources = [join_paths(zstd_rootdir, 'programs/zstdcli.c'), - join_paths(zstd_rootdir, 'programs/timefn.c'), - diff --git a/app-arch/zstd/zstd-1.4.9.ebuild b/app-arch/zstd/zstd-1.4.9.ebuild deleted file mode 100644 index 82fba5d46932..000000000000 --- a/app-arch/zstd/zstd-1.4.9.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="zstd fast compression library" -HOMEPAGE="https://facebook.github.io/zstd/" -SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="lz4 static-libs +threads" - -RDEPEND="app-arch/xz-utils - lz4? ( app-arch/lz4 )" -DEPEND="${RDEPEND}" - -src_prepare() { - default - multilib_copy_sources - - # Workaround #713940 / https://github.com/facebook/zstd/issues/2045 - # where upstream build system does not add -pthread for Makefile-based - # build system. - use threads && append-flags $(test-flags-CCLD -pthread) -} - -mymake() { - emake \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - "${@}" -} - -multilib_src_compile() { - local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') ) - - mymake -C lib ${libzstd_targets[@]} libzstd.pc - - if multilib_is_native_abi ; then - mymake HAVE_LZ4="$(usex lz4 1 0)" zstd - - mymake -C contrib/pzstd - fi -} - -multilib_src_install() { - mymake -C lib DESTDIR="${D}" install - - if multilib_is_native_abi ; then - mymake -C programs DESTDIR="${D}" install - - mymake -C contrib/pzstd DESTDIR="${D}" install - fi -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs; then - find "${ED}" -name "*.a" -delete || die - fi -} diff --git a/app-arch/zstd/zstd-1.5.2-r3.ebuild b/app-arch/zstd/zstd-1.5.2-r3.ebuild deleted file mode 100644 index ce92fbcf49e8..000000000000 --- a/app-arch/zstd/zstd-1.5.2-r3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-minimal toolchain-funcs usr-ldscript - -DESCRIPTION="zstd fast compression library" -HOMEPAGE="https://facebook.github.io/zstd/" -SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="lz4 static-libs" - -RDEPEND=" - app-arch/xz-utils - sys-libs/zlib - lz4? ( app-arch/lz4 ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - default - multilib_copy_sources -} - -mymake() { - emake \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - V=1 \ - "${@}" -} - -multilib_src_compile() { - local libzstd_targets=( libzstd{,.a}-mt ) - - mymake -C lib ${libzstd_targets[@]} libzstd.pc - - if multilib_is_native_abi ; then - mymake HAVE_LZ4="$(usex lz4 1 0)" zstd - - mymake -C contrib/pzstd - fi -} - -multilib_src_install() { - mymake -C lib DESTDIR="${D}" install - - if multilib_is_native_abi ; then - mymake -C programs DESTDIR="${D}" install - gen_usr_ldscript -a zstd - - mymake -C contrib/pzstd DESTDIR="${D}" install - fi -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs; then - find "${ED}" -name "*.a" -delete || die - fi -} diff --git a/app-arch/zstd/zstd-1.5.4-r2.ebuild b/app-arch/zstd/zstd-1.5.4-r2.ebuild deleted file mode 100644 index c133ba97ff5d..000000000000 --- a/app-arch/zstd/zstd-1.5.4-r2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson-multilib usr-ldscript - -DESCRIPTION="zstd fast compression library" -HOMEPAGE="https://facebook.github.io/zstd/" -# Drop .gh on next bump (>1.5.4), it's only here as we switched to release -# tarball. -SRC_URI="https://github.com/facebook/zstd/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}"/${P}/build/meson - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+lzma lz4 static-libs test zlib" -RESTRICT="!test? ( test )" - -RDEPEND=" - lzma? ( app-arch/xz-utils ) - lz4? ( app-arch/lz4:= ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" - -MESON_PATCHES=( - # Workaround until Valgrind bugfix lands - "${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch - # Allow building tests w/o programs (useful for multilib) - "${FILESDIR}"/${PN}-1.5.4-tests-no-programs.patch -) - -PATCHES=( - # Fix build w/o zlib, bug #894058 - "${FILESDIR}"/${P}-fix-no-zlib-build.patch -) - -src_prepare() { - cd "${WORKDIR}"/${P} || die - default - - cd "${S}" || die - eapply "${MESON_PATCHES[@]}" -} - -multilib_src_configure() { - local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local - - # This replaces the no-find-valgrind patch once bugfix lands in a meson - # release + we can BDEPEND on it (https://github.com/mesonbuild/meson/pull/11372) - cat >> ${native_file} <<-EOF || die - [binaries] - valgrind='valgrind-falseified' - EOF - - local emesonargs=( - -Ddefault_library=$(multilib_native_usex static-libs both shared) - - $(meson_native_true bin_programs) - $(meson_native_true bin_contrib) - $(meson_use test bin_tests) - - $(meson_native_use_feature zlib) - $(meson_native_use_feature lzma) - $(meson_native_use_feature lz4) - - --native-file "${native_file}" - ) - - meson_src_configure -} - -multilib_src_install() { - meson_src_install - - multilib_is_native_abi && gen_usr_ldscript -a zstd -} diff --git a/app-arch/zstd/zstd-1.5.4-r3.ebuild b/app-arch/zstd/zstd-1.5.4-r3.ebuild deleted file mode 100644 index b42b244708af..000000000000 --- a/app-arch/zstd/zstd-1.5.4-r3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson-multilib usr-ldscript - -DESCRIPTION="zstd fast compression library" -HOMEPAGE="https://facebook.github.io/zstd/" -# Drop .gh on next bump (>1.5.4), it's only here as we switched to release -# tarball. -SRC_URI="https://github.com/facebook/zstd/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}"/${P}/build/meson - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+lzma lz4 static-libs test zlib" -RESTRICT="!test? ( test )" - -RDEPEND=" - lzma? ( app-arch/xz-utils ) - lz4? ( app-arch/lz4:= ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" - -MESON_PATCHES=( - # Workaround until Valgrind bugfix lands - "${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch - # Allow building tests w/o programs (useful for multilib) - "${FILESDIR}"/${PN}-1.5.4-tests-no-programs.patch -) - -PATCHES=( - # Fix build w/o zlib, bug #894058 - "${FILESDIR}"/${P}-fix-no-zlib-build.patch - "${FILESDIR}"/${P}-crash-no-directory.patch -) - -src_prepare() { - cd "${WORKDIR}"/${P} || die - default - - cd "${S}" || die - eapply "${MESON_PATCHES[@]}" -} - -multilib_src_configure() { - local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local - - # This replaces the no-find-valgrind patch once bugfix lands in a meson - # release + we can BDEPEND on it (https://github.com/mesonbuild/meson/pull/11372) - cat >> ${native_file} <<-EOF || die - [binaries] - valgrind='valgrind-falseified' - EOF - - local emesonargs=( - -Ddefault_library=$(multilib_native_usex static-libs both shared) - - $(meson_native_true bin_programs) - $(meson_native_true bin_contrib) - $(meson_use test bin_tests) - - $(meson_native_use_feature zlib) - $(meson_native_use_feature lzma) - $(meson_native_use_feature lz4) - - --native-file "${native_file}" - ) - - meson_src_configure -} - -multilib_src_install() { - meson_src_install - - multilib_is_native_abi && gen_usr_ldscript -a zstd -} -- cgit v1.2.3