summaryrefslogtreecommitdiff
path: root/sys-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-11-17 16:57:03 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-11-17 16:57:03 +0000
commit1fca4db26fb13c520980473abebd51f620d34531 (patch)
treebc3154f63a706e2b2583aeccb63997197e112c23 /sys-libs
parent27cf8f197a427c1c71255f86149344e3bf1be47d (diff)
gentoo auto-resync : 17:11:2023 - 16:57:03
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/Manifest.gzbin14766 -> 14767 bytes
-rw-r--r--sys-libs/minizip-ng/Manifest3
-rw-r--r--sys-libs/minizip-ng/files/minizip-ng-4.0.3-libbsd-overlay.patch16
-rw-r--r--sys-libs/minizip-ng/minizip-ng-4.0.3.ebuild97
4 files changed, 116 insertions, 0 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 91afd3c78aaa..9703b08abf6b 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
Binary files differ
diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest
index 08f18a5bd14a..bc9fbaccd679 100644
--- a/sys-libs/minizip-ng/Manifest
+++ b/sys-libs/minizip-ng/Manifest
@@ -1,6 +1,9 @@
AUX minizip-ng-4.0.1-libbsd-overlay.patch 699 BLAKE2B 6c14c0421dda1f3f879f727a77018335119ec21b0ad1e988148c11451ae9e68986bcbb46eb9e6b775825333f07b9309269f7810b90d8af61618bb037309413e5 SHA512 dc9cceca7009e48e6a7a2ecee0f96497fb15b0a6eb16a50f0689e001874558c37f9fd8303bd3e983c9286698cd7f79e99ccdf53f2bad5f503c041ad1fccae199
+AUX minizip-ng-4.0.3-libbsd-overlay.patch 709 BLAKE2B 4d389a65558e991bb73d847d97576baa8156c29d612f35c24ceeba571c25257bdd8b6fba12b5f9cf0d5781a36bb20583eb89c77f55d5b5497595994e11ccff81 SHA512 8a4dd2b040c9e3fe37d9907d4f66197956751043271bce422f0a32e55b1866e3bb69a701468645ebca56dae46fbcaaa03fd25b894278c2e7dbd286b6dbbc3826
DIST minizip-ng-4.0.1.tar.gz 769661 BLAKE2B 30147d8643844d9ea10f3f860d41e5025b2c8a5e3bb197722cf3e9ea3d30f40d78974a437425df660db777d9593db9e39b2293db7733ccfaf50c5eba4982a6fe SHA512 857450c3a51a75269afdffdcbaaa6d05894913dd98a91e307129b5e61766f6e3d20bca5841afa41bbe6ca88ad0666c462079a5e1fe73718c2dffd05219c8f258
DIST minizip-ng-4.0.2.tar.gz 769745 BLAKE2B 7e983169d637e0b94ad6f0c7ceca743fcc54fe1c2f98bae9cb4e9050fe85cb2d46d36cb185d5eb7c0b577d606d9eedfecc3817048b3e7006287fa5e001bed4a5 SHA512 4e626a312c35e5f003e4f365261ef3e1bf33488f8698ec31b1b33d32f6a34ed0b54f0e3ffdae658e5b441532dde3cee45c3822532f52e68ea588e809e8f4081c
+DIST minizip-ng-4.0.3.tar.gz 770041 BLAKE2B a5772de8a372738fc1736a5ba307928ebf50ce9de26c845beb0798b2593662a0d990b8ad305238086eea11ad4aba2d7db2a5386d6ca65968bfd40f1fa573e693 SHA512 96d1a5ac1106f737f4db161867a440c272b65c617add30aa0224215abba8098ece9f2bde5c4e407932d0fa5d3ca8696a1db82b5a19ce7ffd8019dba83ab5fd01
EBUILD minizip-ng-4.0.1-r1.ebuild 2769 BLAKE2B 11f93fe40f6fc0a3e0a55f9d2305980c1eac2488178d771c2e1122aa9a19464715006496cc08823030e2e0154386ef955314a2dad4c8d17f34609a028d7845db SHA512 364018f8ce20e0eb224725a5b2465403d7cf91cc83eeffe6ac90931143f1726fc8a7d69aca460d2aa5cfb423e9d4d0bfca828c4a54d0d87f938598f8c4f0f9e2
EBUILD minizip-ng-4.0.2.ebuild 2769 BLAKE2B 11f93fe40f6fc0a3e0a55f9d2305980c1eac2488178d771c2e1122aa9a19464715006496cc08823030e2e0154386ef955314a2dad4c8d17f34609a028d7845db SHA512 364018f8ce20e0eb224725a5b2465403d7cf91cc83eeffe6ac90931143f1726fc8a7d69aca460d2aa5cfb423e9d4d0bfca828c4a54d0d87f938598f8c4f0f9e2
+EBUILD minizip-ng-4.0.3.ebuild 2769 BLAKE2B e72a3e6fd39da07abd44f720ca43b8155c00874191a403b2624f0747d9d25db38796bfb1abc32fe2c107ef4eb11a2fcb24c8301d52ce9e676e45fb37793c8bee SHA512 fab998d86f2ab9ab59707ade52a5d605315eaa5ee12e46c62918d8afb2cb5215835391167965234ec0844ad05bbf22b9f715f68ff8f40d8608e904202c2b2290
MISC metadata.xml 548 BLAKE2B 1373f3096881bc3c5bf4f1864528f399f84c17dab1c9f9ea88db5ad2da1d82cd48f89b9aaa4837f808a45f6783ac833415f1633a9eeaee70748f753fc392be7f SHA512 cf600135681af26f27b611663d426f9a9e83848289f3e184cd4ed6eaec4404226e8737945453a3a12d4bcdc6ef3a623336e514f9bb0c566eb5e8110ade4a1e63
diff --git a/sys-libs/minizip-ng/files/minizip-ng-4.0.3-libbsd-overlay.patch b/sys-libs/minizip-ng/files/minizip-ng-4.0.3-libbsd-overlay.patch
new file mode 100644
index 000000000000..2fb884161a5a
--- /dev/null
+++ b/sys-libs/minizip-ng/files/minizip-ng-4.0.3-libbsd-overlay.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/889266
+https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/15
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -538,10 +538,10 @@ else()
+
+ if(HAVE_LIBBSD_ARC4RANDOM_BUF)
+ list(APPEND MINIZIP_DEF -DHAVE_LIBBSD -DHAVE_ARC4RANDOM_BUF)
+- list(APPEND MINIZIP_INC ${LIBBSD_INCLUDE_DIRS})
+ list(APPEND MINIZIP_LIB ${LIBBSD_LIBRARIES})
+ list(APPEND MINIZIP_LBD ${LIBBSD_LIBRARY_DIRS})
+
++ add_compile_options(${LIBBSD_CFLAGS})
+ link_directories(${LIBBSD_LIBRARY_DIRS})
+ endif()
+ else()
diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.3.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.3.ebuild
new file mode 100644
index 000000000000..b67dd2d9534c
--- /dev/null
+++ b/sys-libs/minizip-ng/minizip-ng-4.0.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Worth keeping an eye on 'develop' branch upstream for possible backports,
+# as they copied this practice from sys-libs/zlib upstream.
+
+inherit cmake-multilib
+
+DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution"
+HOMEPAGE="https://github.com/zlib-ng/minizip-ng"
+SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="compat openssl test zstd"
+RESTRICT="!test? ( test )"
+
+# Automagically prefers sys-libs/zlib-ng if installed, so let's
+# just depend on it as presumably it's better tested anyway.
+RDEPEND="
+ app-arch/bzip2[${MULTILIB_USEDEP}]
+ app-arch/xz-utils
+ dev-libs/libbsd[${MULTILIB_USEDEP}]
+ sys-libs/zlib-ng[${MULTILIB_USEDEP}]
+ virtual/libiconv
+ compat? ( !sys-libs/zlib[minizip] )
+ openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0.3-libbsd-overlay.patch
+)
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DMZ_COMPAT=$(usex compat)
+
+ -DMZ_BUILD_TESTS=$(usex test)
+ -DMZ_BUILD_UNIT_TESTS=$(usex test)
+
+ -DMZ_FETCH_LIBS=OFF
+ -DMZ_FORCE_FETCH_LIBS=OFF
+
+ # Compression library options
+ -DMZ_ZLIB=ON
+ -DMZ_BZIP2=ON
+ -DMZ_LZMA=ON
+ -DMZ_ZSTD=$(usex zstd)
+ -DMZ_LIBCOMP=OFF
+
+ # Encryption support options
+ -DMZ_PKCRYPT=ON
+ -DMZ_WZAES=ON
+ -DMZ_OPENSSL=$(usex openssl)
+ -DMZ_LIBBSD=ON
+
+ # Character conversion options
+ -DMZ_ICONV=ON
+ )
+
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ local myctestargs=(
+ # TODO: investigate
+ -E "(raw-unzip-pkcrypt|raw-append-unzip-pkcrypt|raw-erase-unzip-pkcrypt|deflate-unzip-pkcrypt|deflate-append-unzip-pkcrypt|deflate-erase-unzip-pkcrypt|bzip2-unzip-pkcrypt|bzip2-append-unzip-pkcrypt|bzip2-erase-unzip-pkcrypt|lzma-unzip-pkcrypt|lzma-append-unzip-pkcrypt|lzma-erase-unzip-pkcrypt|xz-unzip-pkcrypt|xz-append-unzip-pkcrypt|xz-erase-unzip-pkcrypt|zstd-unzip-pkcrypt|zstd-append-unzip-pkcrypt|zstd-erase-unzip-pkcrypt)"
+ )
+
+ # TODO: A bunch of tests end up looping and writing over each other's files
+ # It gets better with a patch applied (see https://github.com/zlib-ng/minizip-ng/issues/623#issuecomment-1264518994)
+ # but still hangs.
+ cmake_src_test -j1
+}
+
+multilib_src_install_all() {
+ if ! use compat && use test ; then
+ # Test binaries, bug #874591
+ rm "${ED}"/usr/bin/minigzip || die
+ rm "${ED}"/usr/bin/minizip-ng || die
+ fi
+}
+
+pkg_postinst() {
+ if use compat ; then
+ ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous"
+ ewarn "Please be careful!"
+ fi
+}