From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1FEA7158008 for ; Fri, 16 Jun 2023 01:42:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A95FE09CE; Fri, 16 Jun 2023 01:42:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A8B9E09CE for ; Fri, 16 Jun 2023 01:42:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB7C1335DBB for ; Fri, 16 Jun 2023 01:42:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E91EA95 for ; Fri, 16 Jun 2023 01:42:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1686879716.2ef0a75304631a8a70c71cf24c24fa2158f2c687.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/minizip-ng/, sys-libs/minizip-ng/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/minizip-ng/Manifest sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild X-VCS-Directories: sys-libs/minizip-ng/files/ sys-libs/minizip-ng/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2ef0a75304631a8a70c71cf24c24fa2158f2c687 X-VCS-Branch: master Date: Fri, 16 Jun 2023 01:42:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 43c3bdfa-6ab4-4902-a5d7-7fd91ce19d19 X-Archives-Hash: 2182cae588a2b09ef4b78d64bac12316 commit: 2ef0a75304631a8a70c71cf24c24fa2158f2c687 Author: Sam James gentoo org> AuthorDate: Fri Jun 16 01:41:56 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jun 16 01:41:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef0a753 sys-libs/minizip-ng: drop 3.0.8, 3.0.9 Signed-off-by: Sam James gentoo.org> sys-libs/minizip-ng/Manifest | 2 - .../minizip-ng/files/minizip-3.0.9-strdup.patch | 37 --------- sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild | 93 --------------------- sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild | 97 ---------------------- 4 files changed, 229 deletions(-) diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest index b07993f44640..fb816333dd65 100644 --- a/sys-libs/minizip-ng/Manifest +++ b/sys-libs/minizip-ng/Manifest @@ -1,4 +1,2 @@ DIST minizip-ng-3.0.10.tar.gz 771145 BLAKE2B 6bab59f830b8be929b6293c9408dd70165ffe094a71bcff82eab71f9d077f4d5360f6081e0ca631090810dfc58a81b03926c797e5c156d0f1437df78292a1f09 SHA512 38021137bebb8805279e729e0801ee15133e6379bdd1862d0dea60f13fb1d63402477f3ea9a6c22fc8c85eb13dd9b38d9536680806850060a44a5a9f015fa829 -DIST minizip-ng-3.0.8.tar.gz 643788 BLAKE2B aa937fe8d0e776c8a00754c7a5eae7769b096d044a1b65b124adc0531b757579d8e0e0f5a4784669d9d94a7ea512625160b8b02f908a29e027f31911adf0f524 SHA512 f9742c5fc54ac08d78d7e942e90a7e7f1bc40a2812e7555570bd152ed441dbc5a004b79d2edf32d3fbda64db493cd1a0512d16deb84c0791d3fc86718e9ad0b1 -DIST minizip-ng-3.0.9.tar.gz 646390 BLAKE2B ba823e371dd65788404c8628d1e3de74d28bb86a378eb19b2f9636d96b402e43831238a5296d22febe46c58f2e340d8439ad4117db513b949c9cd99a32fa5df6 SHA512 a52c43d0e208eb6acf56f80804fe99c265baec2a60f6cd80fc9ba160ca3c076e6c118be9108db84728310b14640cab0e0d301d4c763713c90bd344990a43f5fd DIST minizip-ng-4.0.0.tar.gz 766989 BLAKE2B c46bccb277ee5c712710aae41a7b46af4d60fb8fecad7489b97fc4475059f5f8cfbb1aa2d3693d25ada90f3089535e0d060c7a918df1d0fd635d57cbc93a317d SHA512 be3a9e9580847d595abbd200ec89a97e38086cab5b34d3a4db1507247ed04f9209290945989b200225ea412ee0e37fb9f1947404d1631d2dfeb5c6dc55ce3d05 diff --git a/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch b/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch deleted file mode 100644 index 9cb1dd991b17..000000000000 --- a/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/zlib-ng/minizip-ng/pull/682 - -From 5aaa8bf0c348a27d9a7a0d82d4af26748278828c Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Thu, 16 Mar 2023 23:35:34 +0000 -Subject: [PATCH] CMake: set newer POSIX_C_SOURCE -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Enable POSIX 2008 as it's needed for strdup(), otherwise we get: -``` -/var/tmp/portage/sys-libs/minizip-ng-3.0.9/work/minizip-ng-3.0.9/mz_os.c: In function ‘mz_dir_make’: -/var/tmp/portage/sys-libs/minizip-ng-3.0.9/work/minizip-ng-3.0.9/mz_os.c:286:19: error: implicit declaration of function ‘strdup’ [-Werror=implicit-function-declaration] - 286 | current_dir = strdup(path); - | ^~~~~~ -``` - -The man page for strdup says: -``` -strdup(): - _XOPEN_SOURCE >= 500 - || /* Since glibc 2.12: */ _POSIX_C_SOURCE >= 200809L - || /* glibc <= 2.19: */ _BSD_SOURCE || _SVID_SOURCE -``` ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -455,7 +455,7 @@ endif() - - # Unix specific - if(UNIX) -- list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200112L) -+ list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200809L) - list(APPEND MINIZIP_SRC mz_os_posix.c mz_strm_os_posix.c) - - if(MZ_PKCRYPT OR MZ_WZAES OR MZ_SIGNING) - diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild b/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild deleted file mode 100644 index 35459128380a..000000000000 --- a/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# 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 - -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" -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 - app-arch/xz-utils - sys-libs/zlib-ng - virtual/libiconv - compat? ( !sys-libs/zlib[minizip] ) - openssl? ( dev-libs/openssl:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-cpp/gtest ) -" - -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 - -DMZ_SIGNING=ON - - # Character conversion options - -DMZ_ICONV=ON - ) - - cmake_src_configure -} - -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 -} - -src_install() { - cmake_src_install - - if use test ; then - # Test binaries, bug #874591 - rm "${ED}"/usr/bin/minigzip || die - rm "${ED}"/usr/bin/minizip-ng || die - fi - - if use compat ; then - ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous" - ewarn "Please be careful!" - fi -} diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild b/sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild deleted file mode 100644 index 9817a6cb9ba6..000000000000 --- a/sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# 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 - -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" -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 - app-arch/xz-utils - sys-libs/zlib-ng - virtual/libiconv - compat? ( !sys-libs/zlib[minizip] ) - openssl? ( dev-libs/openssl:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-cpp/gtest ) -" - -PATCHES=( - "${FILESDIR}"/minizip-3.0.9-strdup.patch -) - -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 - -DMZ_SIGNING=ON - - # Character conversion options - -DMZ_ICONV=ON - ) - - cmake_src_configure -} - -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 -} - -src_install() { - cmake_src_install - - if use test ; then - # Test binaries, bug #874591 - rm "${ED}"/usr/bin/minigzip || die - rm "${ED}"/usr/bin/minizip-ng || die - fi - - if use compat ; then - ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous" - ewarn "Please be careful!" - fi -}