[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: 2e54d35ae4546536c61abc38e7d8c9876b9361e7
Author: Sam James gentoo org>
AuthorDate: Mon Mar 4 10:18:33 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 4 10:23:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e54d35a
sys-libs/zlib-ng: drop 2.1.5
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/Manifest | 1 -
sys-libs/zlib-ng/zlib-ng-2.1.5.ebuild | 86 ---
2 files changed, 87 deletions(-)
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index cb8973e9d0a3..7b64ea0bc919 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1,2 +1 @@
-DIST zlib-ng-2.1.5.tar.gz 2410601 BLAKE2B
7370ee38c05855e3a5e6976826690790adab7d68d877bf01f68969c99ad4a5fc8fd265a160e147b110969ff77ee97aab9c9d227a526d645a496eae76b2c27b04
SHA512
9212d87c63a2da4e5355a7a1c75380aeba40fbd0ea3d71d3784cb3eac94237f9bea2a1b7993a08f39d4197725c4c133087d3a9d213d3944aa48a7559de2be920
DIST zlib-ng-2.1.6.tar.gz 2412106 BLAKE2B
9ca16c19c2c799e68e099d44721b27dc33ad9e859a3d6572bebe3a75c618bffd78e19f0d4c0607802d1c8fa6a8f328d62f9993648a99c1d2e0e5fdcaf87a2667
SHA512
59ef586c09b9a63788475abfd6dd59ed602316b38f543f801bea802ff8bec8b55a89bee90375b8bbffa3bdebc7d92a00903f4b7c94cdc1a53a36e2e1fd71d13a
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.5.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.1.5.ebuild
deleted file mode 100644
index cfef9b1cc843..
--- a/sys-libs/zlib-ng/zlib-ng-2.1.5.ebuild
+++ /dev/null
@@ -1,86 +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-multilib
-
-DESCRIPTION="Fork of the zlib data compression library"
-HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-CPU_USE=(
- x86_{avx2,avx512f,sse2,ssse3,sse4_2,pclmul}
- arm_{crc32,neon}
- ppc_{altivec,vsx2,vsx3}
-)
-IUSE="compat ${CPU_USE[@]/#/cpu_flags_} test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="compat? ( !sys-libs/zlib )"
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DZLIB_COMPAT=$(usex compat)
- -DZLIB_ENABLE_TESTS=$(usex test)
- -DWITH_GTEST=$(usex test)
-
- # Unaligned access is controversial and undefined behaviour
- # Let's keep it off for now
- # https://github.com/gentoo/gentoo/pull/17167
- -DWITH_UNALIGNED=OFF
- )
-
- # The intrinsics options are all defined conditionally, so we need
- # to enable them on/off per-arch here for now.
- # TODO: There's no s390x USE_EXPAND yet
- if use amd64 || use x86 ; then
- mycmakeargs+=(
- -DWITH_AVX2=$(usex cpu_flags_x86_avx2)
- -DWITH_AVX512=$(usex cpu_flags_x86_avx512f)
- -DWITH_AVX512VNNI=OFF # TODO, see bug #908556
- -DWITH_SSE2=$(usex cpu_flags_x86_sse2)
- -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3)
- -DWITH_SSE42=$(usex cpu_flags_x86_sse4_2)
- -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul)
- -DWITH_VPCLMULQDQ=OFF # TODO, see bug #908556
- )
- fi
-
- if use arm || use arm64 ; then
- mycmakeargs+=(
- -DWITH_ACLE=$(usex cpu_flags_arm_crc32)
- -DWITH_NEON=$(usex cpu_flags_arm_neon)
- )
- fi
-
- if use ppc || use ppc64 ; then
- # The POWER8 support is VSX which was introduced
- # VSX2 was introduced with POWER8, so use that as a proxy for it
- mycmakeargs+=(
- -DWITH_ALTIVEC=$(usex cpu_flags_ppc_altivec)
- -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2)
- -DWITH_POWER9=$(usex cpu_flags_ppc_vsx3)
- )
- fi
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- if use compat ; then
- ewarn "zlib-ng is experimental and replacing the system zlib is
dangerous"
- ewarn "Please be careful!"
- ewarn
- ewarn "The following link explains the guarantees (and what is
NOT guaranteed):"
- ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md;
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: f4bf5620f8c5f8dd60dc8e629a0924a496600ea8
Author: Sam James gentoo org>
AuthorDate: Mon Mar 4 08:10:58 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 4 08:10:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4bf5620
sys-libs/zlib: drop 1.3-r2
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.3-r2.ebuild | 179 ---
1 file changed, 179 deletions(-)
diff --git a/sys-libs/zlib/zlib-1.3-r2.ebuild b/sys-libs/zlib/zlib-1.3-r2.ebuild
deleted file mode 100644
index 94ad4d06e8a3..
--- a/sys-libs/zlib/zlib-1.3-r2.ebuild
+++ /dev/null
@@ -1,179 +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.
-AUTOTOOLS_AUTO_DEPEND="no"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc
-inherit autotools edo multilib-minimal flag-o-matic toolchain-funcs
usr-ldscript verify-sig
-
-DESCRIPTION="Standard (de)compression library"
-HOMEPAGE="https://zlib.net/;
-SRC_URI="
- https://zlib.net/${P}.tar.xz
- https://zlib.net/fossils/${P}.tar.xz
- https://zlib.net/current/beta/${P}.tar.xz
- https://github.com/madler/zlib/releases/download/v${PV}/${P}.tar.xz
- verify-sig? (
- https://zlib.net/${P}.tar.xz.asc
-
https://github.com/madler/zlib/releases/download/v${PV}/${P}.tar.xz.asc
- )
-"
-
-LICENSE="ZLIB"
-SLOT="0/1" # subslot = SONAME
-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="minizip static-libs"
-
-RDEPEND="!sys-libs/zlib-ng[compat]"
-DEPEND="${RDEPEND}"
-BDEPEND="
- minizip? ( ${AUTOTOOLS_DEPEND} )
- verify-sig? ( sec-keys/openpgp-keys-madler )
-"
-
-PATCHES=(
- # Don't install unexpected & unused crypt.h header (which would clash
with other pkgs)
- # Pending upstream. bug #658536
- "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch
-
- # Respect AR, RANLIB, NM during build. Pending upstream. bug #831628
- "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch
-
- # Respect LDFLAGS during configure tests. Pending upstream
- "${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch
-
- # Fix building on sparc with older binutils, we pass it in ebuild
instead
-
"${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
-
- # CVE-2023-45853 (bug #916484)
- "${FILESDIR}"/${PN}-1.2.13-CVE-2023-45853.patch
-)
-
-src_prepare() {
- default
-
- if use minizip ; then
- cd contrib/minizip || die
- eautoreconf
- fi
-
- case ${CHOST} in
- *-mingw*|mingw*)
- # Uses preconfigured Makefile rather than configure
script
- multilib_copy_sources
-
- ;;
- esac
-}
-
-multilib_src_configure() {
- # We pass manually instead of relying on the configure script/makefile
- # because it would pass it even for older binutils.
- use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments)
-
- # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
- # https://github.com/gentoo/gentoo/pull/28355
- # mold needs this too but right now tc-ld-is-mold is also not available
- if tc-ld-is-lld; then
- append-ldflags -Wl,--undefined-version
- fi
-
- case ${CHOST} in
- *-mingw*|mingw*)
- ;;
-
- *)
- # bug #347167
- local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub
"${CHOST}" | cut -d- -f3)
-
- local myconf=(
- --shared
- --prefix="${EPREFIX}/usr"
- --libdir="${EPREFIX}/usr/$(get_libdir)"
- ${uname:+--uname=${uname}}
- )
-
- # Not an autoconf script, so can't use econf
- edo "${S}"/configure "${myconf[@]}"
-
- ;;
- esac
-
- if use minizip ; then
- local minizipdir="contrib/minizip"
- mkdir -p "${BUILD_DIR}/${minizipdir}" || die
-
- cd ${minizipdir} || die
- ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable
static-libs static)
- fi
-}
-
-multilib_src_compile() {
- case ${CHOST} in
- *-mingw*|mingw*)
- emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
- sed \
- -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
- -e
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/, sys-libs/zlib/files/
commit: 743b110bffe25c0501ae5473ad8ad68253a14f29
Author: Alexey Sokolov asokolov org>
AuthorDate: Sun Mar 3 20:35:02 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 4 02:21:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=743b110b
sys-libs/zlib: respect AR on darwin
Closes: https://bugs.gentoo.org/924839
Signed-off-by: Alexey Sokolov asokolov.org>
Signed-off-by: Sam James gentoo.org>
...-1.3.1-configure-fix-AR-libtool-on-darwin.patch | 22 ++
sys-libs/zlib/zlib-1.3.1-r1.ebuild | 3 +++
2 files changed, 25 insertions(+)
diff --git
a/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-libtool-on-darwin.patch
b/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-libtool-on-darwin.patch
new file mode 100644
index ..4506e753ca2e
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-libtool-on-darwin.patch
@@ -0,0 +1,22 @@
+diff --color -ur zlib-1.3.1/configure zlib-1.3.1.new/configure
+--- zlib-1.3.1/configure 2024-01-21 02:29:31.0 +
zlib-1.3.1.new/configure 2024-02-17 19:37:10.61460 +
+@@ -265,14 +265,16 @@
+ SHAREDLIBV=libz.$VER$shared_ext
+ SHAREDLIBM=libz.$VER1$shared_ext
+ LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name
$libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
++if test -z ${AR}; then
+ if "${CROSS_PREFIX}libtool" -V 2>&1 | grep Apple > /dev/null; then
+ AR="${CROSS_PREFIX}libtool"
+ elif libtool -V 2>&1 | grep Apple > /dev/null; then
+ AR="libtool"
+ else
+ AR="/usr/bin/libtool"
+ fi
+-ARFLAGS="-o" ;;
++ARFLAGS="-o"
++fi ;;
+ *)
+ LDSHARED=${LDSHARED-"$cc -shared"} ;;
+ esac
+
diff --git a/sys-libs/zlib/zlib-1.3.1-r1.ebuild
b/sys-libs/zlib/zlib-1.3.1-r1.ebuild
index fb44717aca45..d328fd643286 100644
--- a/sys-libs/zlib/zlib-1.3.1-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.3.1-r1.ebuild
@@ -46,6 +46,9 @@ PATCHES=(
# Fix building on sparc with older binutils, we pass it in ebuild
instead
"${FILESDIR}"/${PN}-1.3.1-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
+
+ # On Darwin, don't force /usr/bin/libtool as AR. bug #924839
+ "${FILESDIR}"/${PN}-1.3.1-configure-fix-AR-libtool-on-darwin.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 3fe97570438a126e8c274b6ff29a60b81198f277 Author: Matoro Mahri matoro tk> AuthorDate: Thu Feb 22 04:58:41 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Feb 22 20:32:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fe97570 sys-libs/zlib: Stabilize 1.3-r4 hppa, #923864 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Arthur Zamarin gentoo.org> sys-libs/zlib/zlib-1.3-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r4.ebuild b/sys-libs/zlib/zlib-1.3-r4.ebuild index 5ec332438f41..22c5713a4520 100644 --- a/sys-libs/zlib/zlib-1.3-r4.ebuild +++ b/sys-libs/zlib/zlib-1.3-r4.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: 10e9c22324657fb001096cc0f1eb7aaf762d2596
Author: Sv. Lockal gmail com>
AuthorDate: Wed Feb 14 20:14:11 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 19 07:50:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10e9c223
sys-libs/zlib-ng: support avx512_vnni and vpclmulqdq USE flags
This gives 2.5x speedup for adler32, 4x speedup for crc32 over previous best
flags.
Bug: https://bugs.gentoo.org/908556
Signed-off-by: Sv. Lockal gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35327
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/{zlib-ng-2.1.6.ebuild => zlib-ng-2.1.6-r1.ebuild} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.1.6-r1.ebuild
similarity index 92%
rename from sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild
rename to sys-libs/zlib-ng/zlib-ng-2.1.6-r1.ebuild
index 3dee5af08dc5..d9bf5f443d25 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.6-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
CPU_USE=(
- x86_{avx2,avx512f,sse2,ssse3,sse4_2,pclmul}
+ x86_{avx2,avx512f,avx512_vnni,sse2,ssse3,sse4_2,pclmul,vpclmulqdq}
arm_{crc32,neon}
ppc_{altivec,vsx2,vsx3}
)
@@ -51,12 +51,12 @@ multilib_src_configure() {
mycmakeargs+=(
-DWITH_AVX2=$(usex cpu_flags_x86_avx2)
-DWITH_AVX512=$(usex cpu_flags_x86_avx512f)
- -DWITH_AVX512VNNI=OFF # TODO, see bug #908556
+ -DWITH_AVX512VNNI=$(usex cpu_flags_x86_avx512_vnni)
-DWITH_SSE2=$(usex cpu_flags_x86_sse2)
-DWITH_SSSE3=$(usex cpu_flags_x86_ssse3)
-DWITH_SSE42=$(usex cpu_flags_x86_sse4_2)
-DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul)
- -DWITH_VPCLMULQDQ=OFF # TODO, see bug #908556
+ -DWITH_VPCLMULQDQ=$(usex cpu_flags_x86_vpclmulqdq)
)
fi
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: f9efb6a33633d85afc85372f0a2f92516b20294f
Author: Eli Schwartz gmail com>
AuthorDate: Tue Feb 6 05:50:41 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 6 22:44:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9efb6a3
sys-libs/zlib: remove usr-ldscript support
Per news item 2024-01-05-usr-initramfs, we no longer support this use
case. It is fragile and hacky and leads to bizarre forms of load errors.
The functionality is, despite being called "split-usr", not really about
split-usr at all.
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/{zlib-1.3-r3.ebuild => zlib-1.3-r4.ebuild} | 3 +--
sys-libs/zlib/{zlib-1.3.1.ebuild => zlib-1.3.1-r1.ebuild} | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/sys-libs/zlib/zlib-1.3-r3.ebuild b/sys-libs/zlib/zlib-1.3-r4.ebuild
similarity index 97%
rename from sys-libs/zlib/zlib-1.3-r3.ebuild
rename to sys-libs/zlib/zlib-1.3-r4.ebuild
index 1c7cc6d899c1..5ec332438f41 100644
--- a/sys-libs/zlib/zlib-1.3-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.3-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
# Worth keeping an eye on 'develop' branch upstream for possible backports.
AUTOTOOLS_AUTO_DEPEND="no"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc
-inherit autotools edo multilib-minimal flag-o-matic usr-ldscript verify-sig
+inherit autotools edo multilib-minimal flag-o-matic verify-sig
DESCRIPTION="Standard (de)compression library"
HOMEPAGE="https://zlib.net/;
@@ -145,7 +145,6 @@ multilib_src_install() {
*)
emake install DESTDIR="${D}" LDCONFIG=:
- gen_usr_ldscript -a z
;;
esac
diff --git a/sys-libs/zlib/zlib-1.3.1.ebuild
b/sys-libs/zlib/zlib-1.3.1-r1.ebuild
similarity index 97%
rename from sys-libs/zlib/zlib-1.3.1.ebuild
rename to sys-libs/zlib/zlib-1.3.1-r1.ebuild
index f12a76540f6e..fb44717aca45 100644
--- a/sys-libs/zlib/zlib-1.3.1.ebuild
+++ b/sys-libs/zlib/zlib-1.3.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
# Worth keeping an eye on 'develop' branch upstream for possible backports.
AUTOTOOLS_AUTO_DEPEND="no"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc
-inherit autotools edo multilib-minimal flag-o-matic usr-ldscript verify-sig
+inherit autotools edo multilib-minimal flag-o-matic verify-sig
DESCRIPTION="Standard (de)compression library"
HOMEPAGE="https://zlib.net/;
@@ -142,7 +142,6 @@ multilib_src_install() {
*)
emake install DESTDIR="${D}" LDCONFIG=:
- gen_usr_ldscript -a z
;;
esac
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 78de100a6e4c7775b397a04395a86e62f10e14ab Author: Sam James gentoo org> AuthorDate: Tue Feb 6 07:24:52 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 6 07:24:52 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78de100a sys-libs/zlib: Stabilize 1.3-r3 sparc, #923864 Signed-off-by: Sam James gentoo.org> sys-libs/zlib/zlib-1.3-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r3.ebuild b/sys-libs/zlib/zlib-1.3-r3.ebuild index d0e94f9597ae..68ed0791755a 100644 --- a/sys-libs/zlib/zlib-1.3-r3.ebuild +++ b/sys-libs/zlib/zlib-1.3-r3.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 0444c25a574ed1b0a7a7375c2dd49a80542bd1a3 Author: Sam James gentoo org> AuthorDate: Tue Feb 6 07:24:54 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 6 07:24:54 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0444c25a sys-libs/zlib: Stabilize 1.3-r3 arm64, #923864 Signed-off-by: Sam James gentoo.org> sys-libs/zlib/zlib-1.3-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r3.ebuild b/sys-libs/zlib/zlib-1.3-r3.ebuild index d9fb0cc4352c..1c7cc6d899c1 100644 --- a/sys-libs/zlib/zlib-1.3-r3.ebuild +++ b/sys-libs/zlib/zlib-1.3-r3.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 46f6615dc6e5253ab14040f65e75064e458192eb Author: Sam James gentoo org> AuthorDate: Tue Feb 6 07:24:53 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 6 07:24:53 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f6615d sys-libs/zlib: Stabilize 1.3-r3 arm, #923864 Signed-off-by: Sam James gentoo.org> sys-libs/zlib/zlib-1.3-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r3.ebuild b/sys-libs/zlib/zlib-1.3-r3.ebuild index 68ed0791755a..d9fb0cc4352c 100644 --- a/sys-libs/zlib/zlib-1.3-r3.ebuild +++ b/sys-libs/zlib/zlib-1.3-r3.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: ab14e40a047795a810f2fd8ad436ace4c9017281 Author: Sam James gentoo org> AuthorDate: Tue Feb 6 07:24:51 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 6 07:24:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab14e40a sys-libs/zlib: Stabilize 1.3-r3 ppc, #923864 Signed-off-by: Sam James gentoo.org> sys-libs/zlib/zlib-1.3-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r3.ebuild b/sys-libs/zlib/zlib-1.3-r3.ebuild index 6c7893cdc77a..d0e94f9597ae 100644 --- a/sys-libs/zlib/zlib-1.3-r3.ebuild +++ b/sys-libs/zlib/zlib-1.3-r3.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 6b57bac3edadfcc0d5ee88e7fa9aa0cf88477912 Author: Sam James gentoo org> AuthorDate: Tue Feb 6 06:53:58 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 6 06:53:58 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b57bac3 sys-libs/zlib: Stabilize 1.3-r3 ppc64, #923864 Signed-off-by: Sam James gentoo.org> sys-libs/zlib/zlib-1.3-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r3.ebuild b/sys-libs/zlib/zlib-1.3-r3.ebuild index f8a80d7fefd3..6c7893cdc77a 100644 --- a/sys-libs/zlib/zlib-1.3-r3.ebuild +++ b/sys-libs/zlib/zlib-1.3-r3.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: c829e157163489c524439287fc7e5b0950e95be8 Author: Sam James gentoo org> AuthorDate: Tue Feb 6 06:24:00 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 6 06:24:00 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c829e157 sys-libs/zlib: Stabilize 1.3-r3 x86, #923864 Signed-off-by: Sam James gentoo.org> sys-libs/zlib/zlib-1.3-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r3.ebuild b/sys-libs/zlib/zlib-1.3-r3.ebuild index c9a20aa6abd0..f8a80d7fefd3 100644 --- a/sys-libs/zlib/zlib-1.3-r3.ebuild +++ b/sys-libs/zlib/zlib-1.3-r3.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 78db03a900f65f2effc16c2207bbfd8da62e61ef Author: Sam James gentoo org> AuthorDate: Tue Feb 6 06:17:51 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 6 06:17:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78db03a9 sys-libs/zlib: Stabilize 1.3-r3 amd64, #923864 Signed-off-by: Sam James gentoo.org> sys-libs/zlib/zlib-1.3-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r3.ebuild b/sys-libs/zlib/zlib-1.3-r3.ebuild index 0be6cfaf4931..c9a20aa6abd0 100644 --- a/sys-libs/zlib/zlib-1.3-r3.ebuild +++ b/sys-libs/zlib/zlib-1.3-r3.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/files/
commit: 96443d8fb60521aa813eaad631c698db2c026c83 Author: Sam James gentoo org> AuthorDate: Wed Jan 24 07:43:11 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jan 24 08:04:52 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96443d8f sys-libs/zlib: add upstream reference to patch Bug: https://github.com/madler/zlib/issues/751 Bug: https://bugs.gentoo.org/879883 Signed-off-by: Sam James gentoo.org> ...b-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch b/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch index 48d58acaaf7f..b5a1b4de2c47 100644 --- a/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch +++ b/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch @@ -1,3 +1,6 @@ +https://bugs.gentoo.org/879883 +https://github.com/madler/zlib/issues/751 + From 2ad2713e6cb9166dcede9a020f6913b8189ff0c6 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 23 Nov 2022 04:17:16 +
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/, sys-libs/zlib/files/
commit: 8c5c6c5165a5b5886ac6233e0d11ce9232118ff1
Author: Sam James gentoo org>
AuthorDate: Wed Jan 24 08:04:46 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Jan 24 08:04:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c5c6c51
sys-libs/zlib: add 1.3.1
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/Manifest | 2 +
...-off-RWX-segment-warnings-on-sparc-system.patch | 17 ++
3.1-configure-fix-AR-RANLIB-NM-detection.patch | 79 ++
.../zlib-1.3.1-use-LDFLAGS-in-configure.patch | 74 +
sys-libs/zlib/zlib-1.3.1.ebuild| 171 +
5 files changed, 343 insertions(+)
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 95af1a3ddd57..74c4bb0f8222 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,2 +1,4 @@
+DIST zlib-1.3.1.tar.xz 1305740 BLAKE2B
42d109223801a493de6d52e7343403d7fc3234a6ca816425fe41ac9c18019b01b93841acd28a235e99f2256a6a17f93624e96b2ddb58d588c8190a6bedb82910
SHA512
1e8e70b362d64a233591906a1f50b59001db04ca14aaffad522198b04680be501736e7d536b4191e2f99767e7001ca486cd802362cca2be05d5d409b83ea732d
+DIST zlib-1.3.1.tar.xz.asc 235 BLAKE2B
b135336ef55a0c4b8e219e760bbe04bad082c405246ce51a2b373c3dfba0b05cb1e6f539363972f4cabd8290be1db1fdb2fc47fb562c6c612a08d9393065f75b
SHA512
d181e9772a8139b3b2f3f42b994a65a966101db35eb46b5c84021c5eb0cc3b4511eb5e9172c509483bd9f7015794b15cfca78ed0959bd91e8216dc12c1c6e668
DIST zlib-1.3.tar.xz 1295740 BLAKE2B
5fe0f32339267348a313f23a21e9588bdb180b7415be303c85f5f169444d019e5f176ef7322f6e64297c360acc2a6041c50e2f66d1860e5c392d8970990f176a
SHA512
3868ac4da5842dd36c9dad794930675b9082ce15cbd099ddb79c0f6bd20a24aa8f33a123f378f26fe0ae02d91f31f2994dccaac565cedeaffed7b315e6ded2a2
DIST zlib-1.3.tar.xz.asc 235 BLAKE2B
5fe6ce952699a19e848d0a6e6c3622f934340068fdcd29afb35c74f3c8ae66d04de644800d10b38c743bb2f4852ba28f1a97313cb0e6e6f9b804cbca5289ebbb
SHA512
8f3ce5c21938d6abc7e121d2939648a0ce2dc01a8ab4eb001d44eb159935dd0b4f5b5e371b3ecfc0ceb23689e2cefe002065968908503cde15b1bba08aff9db6
diff --git
a/sys-libs/zlib/files/zlib-1.3.1-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
b/sys-libs/zlib/files/zlib-1.3.1-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
new file mode 100644
index ..5bfb8006c4bb
--- /dev/null
+++
b/sys-libs/zlib/files/zlib-1.3.1-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/879883
+https://github.com/madler/zlib/issues/751
+
+This breaks building on sparc with older binutils.
+--- a/configure
b/configure
+@@ -234,10 +234,6 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log
2>&1; then
+ fi
+ case "$uname" in
+ Linux* | linux* | *-linux* | GNU | GNU/* | solaris*)
+-case "$mname" in
+-*sparc*)
+-LDFLAGS="${LDFLAGS} -Wl,--no-warn-rwx-segments" ;;
+-esac
+ LDSHARED=${LDSHARED-"$cc -shared
-Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;;
+ *BSD | *bsd* | DragonFly)
+ LDSHARED=${LDSHARED-"$cc -shared
-Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
diff --git
a/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-RANLIB-NM-detection.patch
b/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-RANLIB-NM-detection.patch
new file mode 100644
index ..e1e5cf4b9196
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-RANLIB-NM-detection.patch
@@ -0,0 +1,79 @@
+From 7d7c0b3ede7d5c30e3cdc7c6fbb33c9d4499516a Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu
+Date: Mon, 17 Jan 2022 10:49:58 +0200
+Subject: [PATCH] configure: fix AR/RANLIB/NM detection
+
+Taken from zlib-devel ML:
+https://madler.net/pipermail/zlib-devel_madler.net/2022-January/003322.html
+
+Bug: https://bugs.gentoo.org/831628
+
+Scenarios where ${CROSS_PREFIX}ar & co are set but not desired
+are possible, for example in ChromiumOS we use the GNU binutils
+tools & GCC to build glibc but LLVM/Clang is used for the rest
+of the system.
+
+This allows $AR/$RANLIB/$NM to override default CROSS_PREFIX
+tools so they can be set to llvm-ar/ranlib/nm.
+
+Suggested-by: Manoj Gupta
+Signed-off-by: Adrian Ratiu
+---
+ configure | 38 ++
+ 1 file changed, 22 insertions(+), 16 deletions(-)
+
+diff --git a/configure b/configure
+index c55098a..2535e04 100755
+--- a/configure
b/configure
+@@ -48,25 +48,31 @@ VER3=`echo ${VER}|sed -n -e
's/\([0-9]\{1,\}\(\\.[0-9]\{1,\}\)\{1,2\}\).*/\1/p'`
+ VER1=`echo ${VER}|sed -n -e 's/\([0-9]\{1,\}\)\\..*/\1/p'`
+
+ # establish commands for library building
+-if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126;
then
+-AR=${AR-"${CROSS_PREFIX}ar"}
+-test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
+-else
+-AR=${AR-"ar"}
+-test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
++if [ -z
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: bebdbb588199b4bbfd2f6782cf01d5530c61dc90
Author: Matoro Mahri matoro tk>
AuthorDate: Mon Jan 22 21:39:20 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Jan 23 05:05:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bebdbb58
sys-libs/zlib-ng: Keyword 2.1.6 sparc, #917288
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild
index d2217e6f0db3..3dee5af08dc5 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
CPU_USE=(
x86_{avx2,avx512f,sse2,ssse3,sse4_2,pclmul}
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: 07a59ad3fd5e3ac517cbeffab23b3511bf6e98f9
Author: Sam James gentoo org>
AuthorDate: Sun Jan 14 02:04:26 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 14 02:04:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a59ad3
sys-libs/zlib-ng: add 2.1.6
Closes: https://bugs.gentoo.org/908658
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/Manifest | 1 +
sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild | 91 +++
2 files changed, 92 insertions(+)
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 9fd23cff9381..cb8973e9d0a3 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1 +1,2 @@
DIST zlib-ng-2.1.5.tar.gz 2410601 BLAKE2B
7370ee38c05855e3a5e6976826690790adab7d68d877bf01f68969c99ad4a5fc8fd265a160e147b110969ff77ee97aab9c9d227a526d645a496eae76b2c27b04
SHA512
9212d87c63a2da4e5355a7a1c75380aeba40fbd0ea3d71d3784cb3eac94237f9bea2a1b7993a08f39d4197725c4c133087d3a9d213d3944aa48a7559de2be920
+DIST zlib-ng-2.1.6.tar.gz 2412106 BLAKE2B
9ca16c19c2c799e68e099d44721b27dc33ad9e859a3d6572bebe3a75c618bffd78e19f0d4c0607802d1c8fa6a8f328d62f9993648a99c1d2e0e5fdcaf87a2667
SHA512
59ef586c09b9a63788475abfd6dd59ed602316b38f543f801bea802ff8bec8b55a89bee90375b8bbffa3bdebc7d92a00903f4b7c94cdc1a53a36e2e1fd71d13a
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild
new file mode 100644
index ..d2217e6f0db3
--- /dev/null
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 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 zlib data compression library"
+HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+CPU_USE=(
+ x86_{avx2,avx512f,sse2,ssse3,sse4_2,pclmul}
+ arm_{crc32,neon}
+ ppc_{altivec,vsx2,vsx3}
+)
+IUSE="compat ${CPU_USE[@]/#/cpu_flags_} test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ test? ( dev-cpp/gtest )
+"
+RDEPEND="
+ compat? ( !sys-libs/zlib )
+"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DZLIB_COMPAT=$(usex compat)
+ -DZLIB_ENABLE_TESTS=$(usex test)
+ -DWITH_GTEST=$(usex test)
+
+ # Unaligned access is controversial and undefined behaviour
+ # Let's keep it off for now
+ # https://github.com/gentoo/gentoo/pull/17167
+ -DWITH_UNALIGNED=OFF
+ )
+
+ # The intrinsics options are all defined conditionally, so we need
+ # to enable them on/off per-arch here for now.
+ # TODO: There's no s390x USE_EXPAND yet
+ if use amd64 || use x86 ; then
+ mycmakeargs+=(
+ -DWITH_AVX2=$(usex cpu_flags_x86_avx2)
+ -DWITH_AVX512=$(usex cpu_flags_x86_avx512f)
+ -DWITH_AVX512VNNI=OFF # TODO, see bug #908556
+ -DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+ -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3)
+ -DWITH_SSE42=$(usex cpu_flags_x86_sse4_2)
+ -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul)
+ -DWITH_VPCLMULQDQ=OFF # TODO, see bug #908556
+ )
+ fi
+
+ if use arm || use arm64 ; then
+ mycmakeargs+=(
+ -DWITH_ACLE=$(usex cpu_flags_arm_crc32)
+ -DWITH_NEON=$(usex cpu_flags_arm_neon)
+ )
+ fi
+
+ if use ppc || use ppc64 ; then
+ # The POWER8 support is VSX which was introduced
+ # VSX2 was introduced with POWER8, so use that as a proxy for it
+ mycmakeargs+=(
+ -DWITH_ALTIVEC=$(usex cpu_flags_ppc_altivec)
+ -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2)
+ -DWITH_POWER9=$(usex cpu_flags_ppc_vsx3)
+ )
+ fi
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ if use compat ; then
+ ewarn "zlib-ng is experimental and replacing the system zlib is
dangerous"
+ ewarn "Please be careful!"
+ ewarn
+ ewarn "The following link explains the guarantees (and what is
NOT guaranteed):"
+ ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md;
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: cd28c4b9543d8c2823d8311635d4b50c0039d9d0
Author: Sam James gentoo org>
AuthorDate: Sun Jan 14 02:00:00 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 14 02:00:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd28c4b9
sys-libs/zlib-ng: drop 2.1.3, 2.1.4
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/Manifest | 2 -
sys-libs/zlib-ng/zlib-ng-2.1.3.ebuild | 86 ---
sys-libs/zlib-ng/zlib-ng-2.1.4.ebuild | 86 ---
3 files changed, 174 deletions(-)
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 267262deb2b4..9fd23cff9381 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1,3 +1 @@
-DIST zlib-ng-2.1.3.tar.gz 2404446 BLAKE2B
f3c93e1ed6aa6d008915a69de92d58b1646fd41ae6c97fbdab9d921fd30c7931a42cf5dccd8911d52142960174a04df54d6ab557cc7c902930fc8609c31fbee9
SHA512
cb987c0b20a11fca5361dce94e53dead7364e739a984545c38ad4bf0c7fedd83d5d62530d979eca2182da88d7507a9bec8d3f5abff41e92ab5a63ac61001502e
-DIST zlib-ng-2.1.4.tar.gz 2408377 BLAKE2B
0b5aff9671b43bda2adfc84987c6baa108fa444978d465f12516f13f32b88e6bbe52f7d3e48ff93c720229842062fe71c38ff7c1e7591e18fc7351c943fd2a6b
SHA512
5afda5ea4be84f7d7b016416a6eed18e2aab6c698f006cdfbc8f8b43ce3dc73c7994ab9d1ca090c1b93cb1aadc8747bfd8216afb22b44633d49127f01b77cfa2
DIST zlib-ng-2.1.5.tar.gz 2410601 BLAKE2B
7370ee38c05855e3a5e6976826690790adab7d68d877bf01f68969c99ad4a5fc8fd265a160e147b110969ff77ee97aab9c9d227a526d645a496eae76b2c27b04
SHA512
9212d87c63a2da4e5355a7a1c75380aeba40fbd0ea3d71d3784cb3eac94237f9bea2a1b7993a08f39d4197725c4c133087d3a9d213d3944aa48a7559de2be920
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.3.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.1.3.ebuild
deleted file mode 100644
index cfef9b1cc843..
--- a/sys-libs/zlib-ng/zlib-ng-2.1.3.ebuild
+++ /dev/null
@@ -1,86 +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-multilib
-
-DESCRIPTION="Fork of the zlib data compression library"
-HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-CPU_USE=(
- x86_{avx2,avx512f,sse2,ssse3,sse4_2,pclmul}
- arm_{crc32,neon}
- ppc_{altivec,vsx2,vsx3}
-)
-IUSE="compat ${CPU_USE[@]/#/cpu_flags_} test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="compat? ( !sys-libs/zlib )"
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DZLIB_COMPAT=$(usex compat)
- -DZLIB_ENABLE_TESTS=$(usex test)
- -DWITH_GTEST=$(usex test)
-
- # Unaligned access is controversial and undefined behaviour
- # Let's keep it off for now
- # https://github.com/gentoo/gentoo/pull/17167
- -DWITH_UNALIGNED=OFF
- )
-
- # The intrinsics options are all defined conditionally, so we need
- # to enable them on/off per-arch here for now.
- # TODO: There's no s390x USE_EXPAND yet
- if use amd64 || use x86 ; then
- mycmakeargs+=(
- -DWITH_AVX2=$(usex cpu_flags_x86_avx2)
- -DWITH_AVX512=$(usex cpu_flags_x86_avx512f)
- -DWITH_AVX512VNNI=OFF # TODO, see bug #908556
- -DWITH_SSE2=$(usex cpu_flags_x86_sse2)
- -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3)
- -DWITH_SSE42=$(usex cpu_flags_x86_sse4_2)
- -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul)
- -DWITH_VPCLMULQDQ=OFF # TODO, see bug #908556
- )
- fi
-
- if use arm || use arm64 ; then
- mycmakeargs+=(
- -DWITH_ACLE=$(usex cpu_flags_arm_crc32)
- -DWITH_NEON=$(usex cpu_flags_arm_neon)
- )
- fi
-
- if use ppc || use ppc64 ; then
- # The POWER8 support is VSX which was introduced
- # VSX2 was introduced with POWER8, so use that as a proxy for it
- mycmakeargs+=(
- -DWITH_ALTIVEC=$(usex cpu_flags_ppc_altivec)
- -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2)
- -DWITH_POWER9=$(usex cpu_flags_ppc_vsx3)
- )
- fi
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- if use compat ; then
- ewarn "zlib-ng is experimental and replacing the system zlib is
dangerous"
- ewarn "Please be careful!"
- ewarn
- ewarn "The following link explains the guarantees (and what is
NOT guaranteed):"
-
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 94c6e08a7720f558bb603793f8e4c2d70283c08f
Author: Sam James gentoo org>
AuthorDate: Sat Jan 6 08:04:09 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 6 08:04:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c6e08a
sys-libs/zlib: drop 1.2.13-r1, 1.2.13-r2, 1.3-r1
Bug: https://bugs.gentoo.org/916484
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/Manifest | 2 -
sys-libs/zlib/zlib-1.2.13-r1.ebuild | 181 ---
sys-libs/zlib/zlib-1.2.13-r2.ebuild | 184
sys-libs/zlib/zlib-1.3-r1.ebuild| 176 --
4 files changed, 543 deletions(-)
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index de5404f10c8a..95af1a3ddd57 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,4 +1,2 @@
-DIST zlib-1.2.13.tar.xz 1296496 BLAKE2B
cefcd25989ce27e7d339af2a88455fcf64f6f5e647bedb0f05a45e4370a885fe45a60c023aa63e79b8ecf20ed3254d0052245f33f5769aca2838b42242be14a8
SHA512
9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725
-DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B
29206175f06b4e36960fc6b9403101f55c1f5b768e1921ce1402217bc85978b9fba1a4130db2df5c148b6a1c947148372be20ff8c4ce337c6f2541b42fef7274
SHA512
ca5decebe9572e77e88bac5c5119bfda7e222ed3944e4692510ae70fb5f01d8694b59a6878472b84e6b61d2d1682d94473b6312832afa520a2a23293572ea621
DIST zlib-1.3.tar.xz 1295740 BLAKE2B
5fe0f32339267348a313f23a21e9588bdb180b7415be303c85f5f169444d019e5f176ef7322f6e64297c360acc2a6041c50e2f66d1860e5c392d8970990f176a
SHA512
3868ac4da5842dd36c9dad794930675b9082ce15cbd099ddb79c0f6bd20a24aa8f33a123f378f26fe0ae02d91f31f2994dccaac565cedeaffed7b315e6ded2a2
DIST zlib-1.3.tar.xz.asc 235 BLAKE2B
5fe6ce952699a19e848d0a6e6c3622f934340068fdcd29afb35c74f3c8ae66d04de644800d10b38c743bb2f4852ba28f1a97313cb0e6e6f9b804cbca5289ebbb
SHA512
8f3ce5c21938d6abc7e121d2939648a0ce2dc01a8ab4eb001d44eb159935dd0b4f5b5e371b3ecfc0ceb23689e2cefe002065968908503cde15b1bba08aff9db6
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
deleted file mode 100644
index 109771cd690f..
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ /dev/null
@@ -1,181 +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.
-AUTOTOOLS_AUTO_DEPEND="no"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc
-inherit autotools multilib-minimal flag-o-matic toolchain-funcs usr-ldscript
verify-sig
-
-DESCRIPTION="Standard (de)compression library"
-HOMEPAGE="https://zlib.net/;
-SRC_URI="https://zlib.net/${P}.tar.xz
- https://zlib.net/fossils/${P}.tar.xz
- https://zlib.net/current/beta/${P}.tar.xz
- verify-sig? ( https://zlib.net/${P}.tar.xz.asc )"
-
-LICENSE="ZLIB"
-SLOT="0/1" # subslot = SONAME
-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="minizip static-libs"
-
-RDEPEND="!sys-libs/zlib-ng[compat]"
-DEPEND="${RDEPEND}"
-BDEPEND="
- minizip? ( ${AUTOTOOLS_DEPEND} )
- verify-sig? ( sec-keys/openpgp-keys-madler )
-"
-
-PATCHES=(
- # Don't install unexpected & unused crypt.h header (which would clash
with other pkgs)
- # Pending upstream. bug #658536
- "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch
-
- # Respect AR, RANLIB, NM during build. Pending upstream. bug #831628
- "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch
-
- # Respect LDFLAGS during configure tests. Pending upstream
- "${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch
-
- # Fix building on sparc with older binutils, we pass it in ebuild
instead
-
"${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
-)
-
-src_prepare() {
- default
-
- if use minizip ; then
- cd contrib/minizip || die
- eautoreconf
- fi
-
- case ${CHOST} in
- *-mingw*|mingw*)
- # Uses preconfigured Makefile rather than configure
script
- multilib_copy_sources
-
- ;;
- esac
-}
-
-echoit() { echo "$@"; "$@"; }
-
-multilib_src_configure() {
- # We pass manually instead of relying on the configure script/makefile
- # because it would pass it even for older binutils.
- use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments)
-
- # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
- # https://github.com/gentoo/gentoo/pull/28355
- # mold needs this too but right now tc-ld-is-mold is also not available
-
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 1a1360af51a01dbe39fb4eeaadad9a8c66564d98
Author: Sam James gentoo org>
AuthorDate: Wed Jan 3 10:28:57 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Jan 3 10:39:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1360af
sys-libs/zlib: pass -Wl,--undefined-version for other linkers if supported
Revbump as it's a library.
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.3-r3.ebuild | 174 +++
1 file changed, 174 insertions(+)
diff --git a/sys-libs/zlib/zlib-1.3-r3.ebuild b/sys-libs/zlib/zlib-1.3-r3.ebuild
new file mode 100644
index ..0be6cfaf4931
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.3-r3.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2024 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.
+AUTOTOOLS_AUTO_DEPEND="no"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc
+inherit autotools edo multilib-minimal flag-o-matic usr-ldscript verify-sig
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="https://zlib.net/;
+SRC_URI="
+ https://zlib.net/${P}.tar.xz
+ https://zlib.net/fossils/${P}.tar.xz
+ https://zlib.net/current/beta/${P}.tar.xz
+ https://github.com/madler/zlib/releases/download/v${PV}/${P}.tar.xz
+ verify-sig? (
+ https://zlib.net/${P}.tar.xz.asc
+
https://github.com/madler/zlib/releases/download/v${PV}/${P}.tar.xz.asc
+ )
+"
+
+LICENSE="ZLIB"
+SLOT="0/1" # subslot = SONAME
+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="minizip static-libs"
+
+RDEPEND="!sys-libs/zlib-ng[compat]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ minizip? ( ${AUTOTOOLS_DEPEND} )
+ verify-sig? ( sec-keys/openpgp-keys-madler )
+"
+
+PATCHES=(
+ # Don't install unexpected & unused crypt.h header (which would clash
with other pkgs)
+ # Pending upstream. bug #658536
+ "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch
+
+ # Respect AR, RANLIB, NM during build. Pending upstream. bug #831628
+ "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch
+
+ # Respect LDFLAGS during configure tests. Pending upstream
+ "${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch
+
+ # Fix building on sparc with older binutils, we pass it in ebuild
instead
+
"${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
+
+ # CVE-2023-45853 (bug #916484)
+ "${FILESDIR}"/${PN}-1.2.13-CVE-2023-45853.patch
+)
+
+src_prepare() {
+ default
+
+ if use minizip ; then
+ cd contrib/minizip || die
+ eautoreconf
+ fi
+
+ case ${CHOST} in
+ *-mingw*|mingw*)
+ # Uses preconfigured Makefile rather than configure
script
+ multilib_copy_sources
+
+ ;;
+ esac
+}
+
+multilib_src_configure() {
+ # We pass manually instead of relying on the configure script/makefile
+ # because it would pass it even for older binutils.
+ use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments)
+
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+ case ${CHOST} in
+ *-mingw*|mingw*)
+ ;;
+
+ *)
+ # bug #347167
+ local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub
"${CHOST}" | cut -d- -f3)
+
+ local myconf=(
+ --shared
+ --prefix="${EPREFIX}/usr"
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ ${uname:+--uname=${uname}}
+ )
+
+ # Not an autoconf script, so can't use econf
+ edo "${S}"/configure "${myconf[@]}"
+
+ ;;
+ esac
+
+ if use minizip ; then
+ local minizipdir="contrib/minizip"
+ mkdir -p "${BUILD_DIR}/${minizipdir}" || die
+
+ cd ${minizipdir} || die
+ ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable
static-libs static)
+ fi
+}
+
+multilib_src_compile() {
+ case ${CHOST} in
+ *-mingw*|mingw*)
+ emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
+ sed \
+ -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
+ -e 's|@exec_prefix@|${prefix}|g' \
+ -e
's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
+ -e
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 3f4968a7efce8fe484f587b032eb17f8cbdceb63 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 17 13:50:33 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 17 13:50:33 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f4968a7 sys-libs/zlib: Stabilize 1.3-r2 hppa, #919958 Signed-off-by: Arthur Zamarin gentoo.org> sys-libs/zlib/zlib-1.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r2.ebuild b/sys-libs/zlib/zlib-1.3-r2.ebuild index 88e6ce23faba..94ad4d06e8a3 100644 --- a/sys-libs/zlib/zlib-1.3-r2.ebuild +++ b/sys-libs/zlib/zlib-1.3-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: b7af57bc4f9c6dbe9d1e08fc3641484fe2b7ba4d Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 15 13:19:29 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 15 13:19:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7af57bc sys-libs/zlib: Stabilize 1.3-r2 x86, #919958 Signed-off-by: Arthur Zamarin gentoo.org> sys-libs/zlib/zlib-1.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r2.ebuild b/sys-libs/zlib/zlib-1.3-r2.ebuild index 8a396a0ffc50..88e6ce23faba 100644 --- a/sys-libs/zlib/zlib-1.3-r2.ebuild +++ b/sys-libs/zlib/zlib-1.3-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 55ce3882bef3d22cb6d5b61246403e4eb0af3a38 Author: Sam James gentoo org> AuthorDate: Fri Dec 15 07:48:51 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 07:48:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55ce3882 sys-libs/zlib: Stabilize 1.3-r2 arm64, #919958 Signed-off-by: Sam James gentoo.org> sys-libs/zlib/zlib-1.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r2.ebuild b/sys-libs/zlib/zlib-1.3-r2.ebuild index 50222a1623fd..e847c2eb875b 100644 --- a/sys-libs/zlib/zlib-1.3-r2.ebuild +++ b/sys-libs/zlib/zlib-1.3-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 13de11f2ddbaa2de690f269ed54d8ad2769c5246 Author: Sam James gentoo org> AuthorDate: Fri Dec 15 07:41:54 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 07:41:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13de11f2 sys-libs/zlib: Stabilize 1.3-r2 amd64, #919958 Signed-off-by: Sam James gentoo.org> sys-libs/zlib/zlib-1.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r2.ebuild b/sys-libs/zlib/zlib-1.3-r2.ebuild index 8bc53d6aa565..50222a1623fd 100644 --- a/sys-libs/zlib/zlib-1.3-r2.ebuild +++ b/sys-libs/zlib/zlib-1.3-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 95782397640fab1d584c8c68898183b92a3cd91b Author: Sam James gentoo org> AuthorDate: Fri Dec 15 07:23:23 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 07:23:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95782397 sys-libs/zlib: Stabilize 1.3-r2 sparc, #919958 Signed-off-by: Sam James gentoo.org> sys-libs/zlib/zlib-1.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r2.ebuild b/sys-libs/zlib/zlib-1.3-r2.ebuild index 037c59e5eeb4..8bc53d6aa565 100644 --- a/sys-libs/zlib/zlib-1.3-r2.ebuild +++ b/sys-libs/zlib/zlib-1.3-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: b035b59e6922890935c13ec81655bebb1115e924 Author: Sam James gentoo org> AuthorDate: Fri Dec 15 07:13:32 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 07:13:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b035b59e sys-libs/zlib: Stabilize 1.3-r2 arm, #919958 Signed-off-by: Sam James gentoo.org> sys-libs/zlib/zlib-1.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r2.ebuild b/sys-libs/zlib/zlib-1.3-r2.ebuild index 99e630bcc229..037c59e5eeb4 100644 --- a/sys-libs/zlib/zlib-1.3-r2.ebuild +++ b/sys-libs/zlib/zlib-1.3-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: fe97c1f725b6c22c350c96fd4c77b92c0b6c4ff8
Author: Sam James gentoo org>
AuthorDate: Thu Nov 30 02:42:24 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 30 02:42:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe97c1f7
sys-libs/zlib-ng: add 2.1.5
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/Manifest | 1 +
sys-libs/zlib-ng/zlib-ng-2.1.5.ebuild | 86 +++
2 files changed, 87 insertions(+)
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 76892de9c128..267262deb2b4 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1,2 +1,3 @@
DIST zlib-ng-2.1.3.tar.gz 2404446 BLAKE2B
f3c93e1ed6aa6d008915a69de92d58b1646fd41ae6c97fbdab9d921fd30c7931a42cf5dccd8911d52142960174a04df54d6ab557cc7c902930fc8609c31fbee9
SHA512
cb987c0b20a11fca5361dce94e53dead7364e739a984545c38ad4bf0c7fedd83d5d62530d979eca2182da88d7507a9bec8d3f5abff41e92ab5a63ac61001502e
DIST zlib-ng-2.1.4.tar.gz 2408377 BLAKE2B
0b5aff9671b43bda2adfc84987c6baa108fa444978d465f12516f13f32b88e6bbe52f7d3e48ff93c720229842062fe71c38ff7c1e7591e18fc7351c943fd2a6b
SHA512
5afda5ea4be84f7d7b016416a6eed18e2aab6c698f006cdfbc8f8b43ce3dc73c7994ab9d1ca090c1b93cb1aadc8747bfd8216afb22b44633d49127f01b77cfa2
+DIST zlib-ng-2.1.5.tar.gz 2410601 BLAKE2B
7370ee38c05855e3a5e6976826690790adab7d68d877bf01f68969c99ad4a5fc8fd265a160e147b110969ff77ee97aab9c9d227a526d645a496eae76b2c27b04
SHA512
9212d87c63a2da4e5355a7a1c75380aeba40fbd0ea3d71d3784cb3eac94237f9bea2a1b7993a08f39d4197725c4c133087d3a9d213d3944aa48a7559de2be920
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.5.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.1.5.ebuild
new file mode 100644
index ..cfef9b1cc843
--- /dev/null
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.5.ebuild
@@ -0,0 +1,86 @@
+# 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 zlib data compression library"
+HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+CPU_USE=(
+ x86_{avx2,avx512f,sse2,ssse3,sse4_2,pclmul}
+ arm_{crc32,neon}
+ ppc_{altivec,vsx2,vsx3}
+)
+IUSE="compat ${CPU_USE[@]/#/cpu_flags_} test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="compat? ( !sys-libs/zlib )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DZLIB_COMPAT=$(usex compat)
+ -DZLIB_ENABLE_TESTS=$(usex test)
+ -DWITH_GTEST=$(usex test)
+
+ # Unaligned access is controversial and undefined behaviour
+ # Let's keep it off for now
+ # https://github.com/gentoo/gentoo/pull/17167
+ -DWITH_UNALIGNED=OFF
+ )
+
+ # The intrinsics options are all defined conditionally, so we need
+ # to enable them on/off per-arch here for now.
+ # TODO: There's no s390x USE_EXPAND yet
+ if use amd64 || use x86 ; then
+ mycmakeargs+=(
+ -DWITH_AVX2=$(usex cpu_flags_x86_avx2)
+ -DWITH_AVX512=$(usex cpu_flags_x86_avx512f)
+ -DWITH_AVX512VNNI=OFF # TODO, see bug #908556
+ -DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+ -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3)
+ -DWITH_SSE42=$(usex cpu_flags_x86_sse4_2)
+ -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul)
+ -DWITH_VPCLMULQDQ=OFF # TODO, see bug #908556
+ )
+ fi
+
+ if use arm || use arm64 ; then
+ mycmakeargs+=(
+ -DWITH_ACLE=$(usex cpu_flags_arm_crc32)
+ -DWITH_NEON=$(usex cpu_flags_arm_neon)
+ )
+ fi
+
+ if use ppc || use ppc64 ; then
+ # The POWER8 support is VSX which was introduced
+ # VSX2 was introduced with POWER8, so use that as a proxy for it
+ mycmakeargs+=(
+ -DWITH_ALTIVEC=$(usex cpu_flags_ppc_altivec)
+ -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2)
+ -DWITH_POWER9=$(usex cpu_flags_ppc_vsx3)
+ )
+ fi
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ if use compat ; then
+ ewarn "zlib-ng is experimental and replacing the system zlib is
dangerous"
+ ewarn "Please be careful!"
+ ewarn
+ ewarn "The following link explains the guarantees (and what is
NOT guaranteed):"
+ ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md;
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 1360a703f078299a9857a9baa706c6152b0a3c80 Author: Sam James gentoo org> AuthorDate: Thu Nov 16 16:21:41 2023 + Commit: Sam James gentoo org> CommitDate: Thu Nov 16 16:21:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1360a703 sys-libs/zlib: Stabilize 1.3-r1 hppa, #917238 Signed-off-by: Sam James gentoo.org> sys-libs/zlib/zlib-1.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r1.ebuild b/sys-libs/zlib/zlib-1.3-r1.ebuild index d63923fe89fa..801eb15ff21a 100644 --- a/sys-libs/zlib/zlib-1.3-r1.ebuild +++ b/sys-libs/zlib/zlib-1.3-r1.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 008ce4ef0e131ac44f19537efdc603493c4b028c Author: Arthur Zamarin gentoo org> AuthorDate: Sun Nov 12 16:49:58 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Nov 12 16:49:58 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=008ce4ef sys-libs/zlib: Stabilize 1.3-r1 ppc, #917238 Signed-off-by: Arthur Zamarin gentoo.org> sys-libs/zlib/zlib-1.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r1.ebuild b/sys-libs/zlib/zlib-1.3-r1.ebuild index 4a2a1852d9f7..d63923fe89fa 100644 --- a/sys-libs/zlib/zlib-1.3-r1.ebuild +++ b/sys-libs/zlib/zlib-1.3-r1.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 9a0df8a0ef7859f2d8b3297d65a778f20c804b54 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Nov 12 08:32:13 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Nov 12 08:32:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a0df8a0 sys-libs/zlib: Stabilize 1.3-r1 amd64, #917238 Signed-off-by: Arthur Zamarin gentoo.org> sys-libs/zlib/zlib-1.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r1.ebuild b/sys-libs/zlib/zlib-1.3-r1.ebuild index 3b3f2c4fde58..4a2a1852d9f7 100644 --- a/sys-libs/zlib/zlib-1.3-r1.ebuild +++ b/sys-libs/zlib/zlib-1.3-r1.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 5099b398d33c44ce2c3122900c0b5abf713f9695 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Nov 12 08:20:46 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Nov 12 08:20:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5099b398 sys-libs/zlib: Stabilize 1.3-r1 arm, #917238 Signed-off-by: Arthur Zamarin gentoo.org> sys-libs/zlib/zlib-1.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r1.ebuild b/sys-libs/zlib/zlib-1.3-r1.ebuild index b5e7e5c46790..3b3f2c4fde58 100644 --- a/sys-libs/zlib/zlib-1.3-r1.ebuild +++ b/sys-libs/zlib/zlib-1.3-r1.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: ab0eefeff0114448faba1ffcc7504a99507946a6 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Nov 12 08:20:44 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Nov 12 08:20:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0eefef sys-libs/zlib: Stabilize 1.3-r1 arm64, #917238 Signed-off-by: Arthur Zamarin gentoo.org> sys-libs/zlib/zlib-1.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r1.ebuild b/sys-libs/zlib/zlib-1.3-r1.ebuild index 04cf4398867c..7a0b8067771b 100644 --- a/sys-libs/zlib/zlib-1.3-r1.ebuild +++ b/sys-libs/zlib/zlib-1.3-r1.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: e9c50ee2df1da61e6c836366ac2d7dcb17b60918 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Nov 12 08:20:45 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Nov 12 08:20:45 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9c50ee2 sys-libs/zlib: Stabilize 1.3-r1 sparc, #917238 Signed-off-by: Arthur Zamarin gentoo.org> sys-libs/zlib/zlib-1.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r1.ebuild b/sys-libs/zlib/zlib-1.3-r1.ebuild index 7a0b8067771b..67274cc998f6 100644 --- a/sys-libs/zlib/zlib-1.3-r1.ebuild +++ b/sys-libs/zlib/zlib-1.3-r1.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 438251e5025d6cdfd83a6fd8f59b7aeda60b30f6 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Nov 12 08:20:43 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Nov 12 08:20:43 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438251e5 sys-libs/zlib: Stabilize 1.3-r1 ppc64, #917238 Signed-off-by: Arthur Zamarin gentoo.org> sys-libs/zlib/zlib-1.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r1.ebuild b/sys-libs/zlib/zlib-1.3-r1.ebuild index e8da1bdeb307..04cf4398867c 100644 --- a/sys-libs/zlib/zlib-1.3-r1.ebuild +++ b/sys-libs/zlib/zlib-1.3-r1.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: c69bb023e91faee961cd982fb8fade63d0295742 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Nov 12 08:20:45 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Nov 12 08:20:45 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c69bb023 sys-libs/zlib: Stabilize 1.3-r1 x86, #917238 Signed-off-by: Arthur Zamarin gentoo.org> sys-libs/zlib/zlib-1.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/zlib/zlib-1.3-r1.ebuild b/sys-libs/zlib/zlib-1.3-r1.ebuild index 67274cc998f6..b5e7e5c46790 100644 --- a/sys-libs/zlib/zlib-1.3-r1.ebuild +++ b/sys-libs/zlib/zlib-1.3-r1.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 619c963a9b9e445823741e9e397d0691cc6e97bd
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Nov 1 12:23:46 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Nov 1 12:23:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=619c963a
sys-libs/zlib: Stabilize 1.2.13-r2 ppc, #916525
Signed-off-by: Arthur Zamarin gentoo.org>
sys-libs/zlib/zlib-1.2.13-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
index 756fa1f33f29..79788dbd5973 100644
--- a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-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"
+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="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 8999beb783251a357175e47e74aa2417f2b6ff5f
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Nov 1 12:23:46 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Nov 1 12:23:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8999beb7
sys-libs/zlib: Stabilize 1.2.13-r2 x86, #916525
Signed-off-by: Arthur Zamarin gentoo.org>
sys-libs/zlib/zlib-1.2.13-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
index 79788dbd5973..b90fde773c5f 100644
--- a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-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"
+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="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 81df213e8c5f369332ecf9c332d0596a37d9d005
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Nov 1 12:23:45 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Nov 1 12:23:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81df213e
sys-libs/zlib: Stabilize 1.2.13-r2 amd64, #916525
Signed-off-by: Arthur Zamarin gentoo.org>
sys-libs/zlib/zlib-1.2.13-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
index 0b99b2a3e366..756fa1f33f29 100644
--- a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-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"
+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="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 785e8f20e2c8227e6a7b36b849bee105377699f3
Author: Sam James gentoo org>
AuthorDate: Mon Oct 30 23:08:28 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 30 23:08:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=785e8f20
sys-libs/zlib: Stabilize 1.2.13-r2 hppa, #916525
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.13-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
index 4e5edf8a4fa5..7efe1155563c 100644
--- a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-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"
+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="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: c43439fd770fba21e8d55c64411e806f48ec2303
Author: Sam James gentoo org>
AuthorDate: Mon Oct 30 23:08:30 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 30 23:08:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c43439fd
sys-libs/zlib: Stabilize 1.2.13-r2 ppc64, #916525
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.13-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
index 7efe1155563c..f57eaf4046e9 100644
--- a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-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"
+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="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: a6a99818bd3ea986203fa030ab8580bb078dce2b
Author: Sam James gentoo org>
AuthorDate: Mon Oct 30 11:28:59 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 30 11:28:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a99818
sys-libs/zlib: Stabilize 1.2.13-r2 sparc, #916525
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.13-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
index 838504c6767c..4e5edf8a4fa5 100644
--- a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-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"
+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="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 4db61f3ba3554c524e0aad7dd87687323e37aa63
Author: Sam James gentoo org>
AuthorDate: Mon Oct 30 10:52:41 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 30 10:52:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db61f3b
sys-libs/zlib: Stabilize 1.2.13-r2 arm, #916525
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.13-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
index f5e8b9ba4f94..838504c6767c 100644
--- a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-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"
+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="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: cc6c452d9ed9085fb15780ae981f60731adf2732
Author: Sam James gentoo org>
AuthorDate: Mon Oct 30 10:52:40 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 30 10:52:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc6c452d
sys-libs/zlib: Stabilize 1.2.13-r2 arm64, #916525
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.13-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
index fbf50ae139d8..f5e8b9ba4f94 100644
--- a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-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"
+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="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/, sys-libs/zlib/files/
commit: d9718dafa6ecd841f4364f2ee0039613f0b8efec
Author: Sam James gentoo org>
AuthorDate: Mon Oct 30 10:16:13 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 30 10:19:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9718daf
sys-libs/zlib: fix CVE-2023-45853
Bug: https://bugs.gentoo.org/916484
Signed-off-by: Sam James gentoo.org>
.../zlib/files/zlib-1.2.13-CVE-2023-45853.patch| 40 +
sys-libs/zlib/zlib-1.2.13-r2.ebuild| 184 +
sys-libs/zlib/zlib-1.3-r2.ebuild | 179
3 files changed, 403 insertions(+)
diff --git a/sys-libs/zlib/files/zlib-1.2.13-CVE-2023-45853.patch
b/sys-libs/zlib/files/zlib-1.2.13-CVE-2023-45853.patch
new file mode 100644
index ..ecb5acecbb33
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.13-CVE-2023-45853.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/916484
+https://github.com/madler/zlib/pull/843
+https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c
+
+From 73331a6a0481067628f065ffe87bb1d8f787d10c Mon Sep 17 00:00:00 2001
+From: Hans Wennborg
+Date: Fri, 18 Aug 2023 11:05:33 +0200
+Subject: [PATCH] Reject overflows of zip header fields in minizip.
+
+This checks the lengths of the file name, extra field, and comment
+that would be put in the zip headers, and rejects them if they are
+too long. They are each limited to 65535 bytes in length by the zip
+format. This also avoids possible buffer overflows if the provided
+fields are too long.
+---
+ contrib/minizip/zip.c | 11 +++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
+index 3d3d4cadd..0446109b2 100644
+--- a/contrib/minizip/zip.c
b/contrib/minizip/zip.c
+@@ -1043,6 +1043,17 @@ extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile
file, const char* filename, c
+ return ZIP_PARAMERROR;
+ #endif
+
++// The filename and comment length must fit in 16 bits.
++if ((filename!=NULL) && (strlen(filename)>0x))
++return ZIP_PARAMERROR;
++if ((comment!=NULL) && (strlen(comment)>0x))
++return ZIP_PARAMERROR;
++// The extra field length must fit in 16 bits. If the member also requires
++// a Zip64 extra block, that will also need to fit within that 16-bit
++// length, but that will be checked for later.
++if ((size_extrafield_local>0x) || (size_extrafield_global>0x))
++return ZIP_PARAMERROR;
++
+ zi = (zip64_internal*)file;
+
+ if (zi->in_opened_file_inzip == 1)
diff --git a/sys-libs/zlib/zlib-1.2.13-r2.ebuild
b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
new file mode 100644
index ..fbf50ae139d8
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.13-r2.ebuild
@@ -0,0 +1,184 @@
+# 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.
+AUTOTOOLS_AUTO_DEPEND="no"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
+inherit autotools multilib-minimal flag-o-matic toolchain-funcs usr-ldscript
verify-sig
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="https://zlib.net/;
+SRC_URI="https://zlib.net/${P}.tar.xz
+ https://zlib.net/fossils/${P}.tar.xz
+ https://zlib.net/current/beta/${P}.tar.xz
+ verify-sig? ( https://zlib.net/${P}.tar.xz.asc )"
+
+LICENSE="ZLIB"
+SLOT="0/1" # subslot = SONAME
+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="minizip static-libs"
+
+RDEPEND="!sys-libs/zlib-ng[compat]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ minizip? ( ${AUTOTOOLS_DEPEND} )
+ verify-sig? ( sec-keys/openpgp-keys-madler )
+"
+
+PATCHES=(
+ # Don't install unexpected & unused crypt.h header (which would clash
with other pkgs)
+ # Pending upstream. bug #658536
+ "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch
+
+ # Respect AR, RANLIB, NM during build. Pending upstream. bug #831628
+ "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch
+
+ # Respect LDFLAGS during configure tests. Pending upstream
+ "${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch
+
+ # Fix building on sparc with older binutils, we pass it in ebuild
instead
+
"${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
+
+ # CVE-2023-45853 (bug #916484)
+ "${FILESDIR}"/${PN}-1.2.13-CVE-2023-45853.patch
+)
+
+src_prepare() {
+ default
+
+ if use minizip ; then
+ cd contrib/minizip || die
+ eautoreconf
+ fi
+
+ case ${CHOST} in
+ *-mingw*|mingw*)
+ # Uses preconfigured Makefile rather than configure
script
+
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: 0725b7d7b1c1020b915125a6cec2c1bff748a81d
Author: Sam James gentoo org>
AuthorDate: Fri Oct 20 00:44:33 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 20 00:51:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0725b7d7
sys-libs/zlib-ng: add 2.1.4
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/Manifest | 1 +
sys-libs/zlib-ng/zlib-ng-2.1.4.ebuild | 86 +++
2 files changed, 87 insertions(+)
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 8fc02a3e816d..76892de9c128 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1 +1,2 @@
DIST zlib-ng-2.1.3.tar.gz 2404446 BLAKE2B
f3c93e1ed6aa6d008915a69de92d58b1646fd41ae6c97fbdab9d921fd30c7931a42cf5dccd8911d52142960174a04df54d6ab557cc7c902930fc8609c31fbee9
SHA512
cb987c0b20a11fca5361dce94e53dead7364e739a984545c38ad4bf0c7fedd83d5d62530d979eca2182da88d7507a9bec8d3f5abff41e92ab5a63ac61001502e
+DIST zlib-ng-2.1.4.tar.gz 2408377 BLAKE2B
0b5aff9671b43bda2adfc84987c6baa108fa444978d465f12516f13f32b88e6bbe52f7d3e48ff93c720229842062fe71c38ff7c1e7591e18fc7351c943fd2a6b
SHA512
5afda5ea4be84f7d7b016416a6eed18e2aab6c698f006cdfbc8f8b43ce3dc73c7994ab9d1ca090c1b93cb1aadc8747bfd8216afb22b44633d49127f01b77cfa2
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.4.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.1.4.ebuild
new file mode 100644
index ..cfef9b1cc843
--- /dev/null
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.4.ebuild
@@ -0,0 +1,86 @@
+# 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 zlib data compression library"
+HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+CPU_USE=(
+ x86_{avx2,avx512f,sse2,ssse3,sse4_2,pclmul}
+ arm_{crc32,neon}
+ ppc_{altivec,vsx2,vsx3}
+)
+IUSE="compat ${CPU_USE[@]/#/cpu_flags_} test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="compat? ( !sys-libs/zlib )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DZLIB_COMPAT=$(usex compat)
+ -DZLIB_ENABLE_TESTS=$(usex test)
+ -DWITH_GTEST=$(usex test)
+
+ # Unaligned access is controversial and undefined behaviour
+ # Let's keep it off for now
+ # https://github.com/gentoo/gentoo/pull/17167
+ -DWITH_UNALIGNED=OFF
+ )
+
+ # The intrinsics options are all defined conditionally, so we need
+ # to enable them on/off per-arch here for now.
+ # TODO: There's no s390x USE_EXPAND yet
+ if use amd64 || use x86 ; then
+ mycmakeargs+=(
+ -DWITH_AVX2=$(usex cpu_flags_x86_avx2)
+ -DWITH_AVX512=$(usex cpu_flags_x86_avx512f)
+ -DWITH_AVX512VNNI=OFF # TODO, see bug #908556
+ -DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+ -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3)
+ -DWITH_SSE42=$(usex cpu_flags_x86_sse4_2)
+ -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul)
+ -DWITH_VPCLMULQDQ=OFF # TODO, see bug #908556
+ )
+ fi
+
+ if use arm || use arm64 ; then
+ mycmakeargs+=(
+ -DWITH_ACLE=$(usex cpu_flags_arm_crc32)
+ -DWITH_NEON=$(usex cpu_flags_arm_neon)
+ )
+ fi
+
+ if use ppc || use ppc64 ; then
+ # The POWER8 support is VSX which was introduced
+ # VSX2 was introduced with POWER8, so use that as a proxy for it
+ mycmakeargs+=(
+ -DWITH_ALTIVEC=$(usex cpu_flags_ppc_altivec)
+ -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2)
+ -DWITH_POWER9=$(usex cpu_flags_ppc_vsx3)
+ )
+ fi
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ if use compat ; then
+ ewarn "zlib-ng is experimental and replacing the system zlib is
dangerous"
+ ewarn "Please be careful!"
+ ewarn
+ ewarn "The following link explains the guarantees (and what is
NOT guaranteed):"
+ ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md;
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/files/, sys-libs/zlib-ng/
commit: d1791778d4b4ce775c99522be3456a35149f6b13
Author: Sam James gentoo org>
AuthorDate: Fri Oct 20 00:42:18 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 20 00:51:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1791778
sys-libs/zlib-ng: drop 2.0.7, 2.1.2-r1
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/Manifest| 2 -
sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch | 35 -
sys-libs/zlib-ng/zlib-ng-2.0.7.ebuild| 78
sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild | 90
4 files changed, 205 deletions(-)
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 6680cee82115..8fc02a3e816d 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1,3 +1 @@
-DIST zlib-ng-2.0.7.tar.gz 853381 BLAKE2B
89672bd35ee54df72ff995c1b4ed188538011be4cd077e464f21a088b0b70b3f95b4259dc546a65e8d4900dc5bd5bb98041875e361000898b34518f7e008b99b
SHA512
1c19a62bb00727ac49049c299fb70060da95b5fafa448144ae4133372ec8c3da15cef6c1303485290f269b23c580696554ca0383dba3e1f9609f65c332981988
-DIST zlib-ng-2.1.2.tar.gz 2404176 BLAKE2B
bc0b65520562827b10216110e2020a3341ee0dd853874c19ddb6f9df776fc74a542c1239f77dc3ec2ccb3f92e75f1de7ef104edfecfe37312149b1bc29ae7403
SHA512
2b3073df4eb13d8318f8fa2b7674e4729642488f65dad49d3080ccd830f29e9e3f32a673b42634443ddf9e9ef85cfff4f2f3e182506f950b9ee0a208a92c0465
DIST zlib-ng-2.1.3.tar.gz 2404446 BLAKE2B
f3c93e1ed6aa6d008915a69de92d58b1646fd41ae6c97fbdab9d921fd30c7931a42cf5dccd8911d52142960174a04df54d6ab557cc7c902930fc8609c31fbee9
SHA512
cb987c0b20a11fca5361dce94e53dead7364e739a984545c38ad4bf0c7fedd83d5d62530d979eca2182da88d7507a9bec8d3f5abff41e92ab5a63ac61001502e
diff --git a/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch
b/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch
deleted file mode 100644
index 8deb07a60515..
--- a/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/zlib-ng/zlib-ng/issues/1515
-https://github.com/zlib-ng/zlib-ng/pull/1519
-https://github.com/zlib-ng/zlib-ng/commit/39136c20716a94188c1d041b9656315371d35a47
-
-From 39136c20716a94188c1d041b9656315371d35a47 Mon Sep 17 00:00:00 2001
-From: "Mika T. Lindqvist"
-Date: Sun, 11 Jun 2023 18:38:12 +0300
-Subject: [PATCH] Try to find system copy of googletest before trying to
- download it. * Don't use system copy if memory sanitizer is enabled
-
a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -111,8 +111,6 @@ if(WITH_BENCHMARKS)
- endif()
-
- if(WITH_GTEST)
--include(FetchContent)
--
- # Google test requires at least C++11
- set(CMAKE_CXX_STANDARD 11)
-
-@@ -125,9 +123,13 @@ if(WITH_GTEST)
- # Must set include and compile options before fetching googletest
- include_directories($ENV{LLVM_BUILD_DIR}/include
$ENV{LLVM_BUILD_DIR}/include/c++/v1)
- add_compile_options(-stdlib=libc++ -g)
-+elseif(NOT TARGET GTest::GTest)
-+find_package(GTest)
- endif()
-
- if(NOT TARGET GTest::GTest)
-+include(FetchContent)
-+
- # Prevent overriding the parent project's compiler/linker settings
for Windows
- set(gtest_force_shared_crt ON CACHE BOOL
- "Use shared (DLL) run-time lib even when Google Test is built as
static lib." FORCE)
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.7.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.0.7.ebuild
deleted file mode 100644
index 641a623a64aa..
--- a/sys-libs/zlib-ng/zlib-ng-2.0.7.ebuild
+++ /dev/null
@@ -1,78 +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 zlib data compression library"
-HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-CPU_USE=(
cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} )
-IUSE="compat ${CPU_USE[@]} test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="compat? ( !sys-libs/zlib )"
-
-src_configure() {
- local mycmakeargs=(
- -DZLIB_COMPAT="$(usex compat)"
- -DZLIB_ENABLE_TESTS="$(usex test)"
- # Unaligned access is controversial and undefined behaviour
- # Let's keep it off for now
- # https://github.com/gentoo/gentoo/pull/17167
- -DWITH_UNALIGNED="OFF"
- )
-
- # The intrinsics options are all defined conditionally, so we need
- # to enable them on/off per-arch here for now.
- if use amd64 || use x86 ; then
- mycmakeargs+=(
- -DWITH_AVX2=$(usex
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: e18e4412818bcffa768a1a8df4c100f3c6288b6f
Author: Sam James gentoo org>
AuthorDate: Sat Aug 19 04:38:35 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 19 04:38:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e18e4412
sys-libs/zlib: drop sed_macros call
Fixes: 491bf8bd3ef621da49b168736a04f23aa4c7719c
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.3-r1.ebuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sys-libs/zlib/zlib-1.3-r1.ebuild b/sys-libs/zlib/zlib-1.3-r1.ebuild
index 22051ef75784..e20d5e67354b 100644
--- a/sys-libs/zlib/zlib-1.3-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.3-r1.ebuild
@@ -152,11 +152,8 @@ multilib_src_install() {
;;
esac
- sed_macros "${ED}"/usr/include/*.h
-
if use minizip ; then
emake -C contrib/minizip install DESTDIR="${D}"
- sed_macros "${ED}"/usr/include/minizip/*.h
# This might not exist if slibtool is used.
# bug #816756
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/, profiles/
commit: 491bf8bd3ef621da49b168736a04f23aa4c7719c
Author: Sam James gentoo org>
AuthorDate: Sat Aug 19 04:31:19 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 19 04:31:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=491bf8bd
sys-libs/zlib: drop macro renaming hacks
Renaming zlib's `OF()` macro has caused problems for various packages;
fortunately
C23 kills K prototypes so its use should be dying out anyway. If anyone is
still
using it, we should just patch it out entirely rather than renaming it.
Other distros have been coping fine without the rename anyway. The most
important
point being that this is against POLA and leads to problems when people try to
build
things using zlib that haven't been fixed yet.
See also the legendary godot patch to workaround this:
https://github.com/godotengine/godot/blob/93409b8e64a9bc3c271ab4a7489b59a43bc0d048/thirdparty/minizip/patches/unbreak-gentoo.patch.
As of zlib-1.3, zlib doesn't even use it by itself.
Bug: https://bugs.gentoo.org/383179
Signed-off-by: Sam James gentoo.org>
profiles/package.mask | 4 ++--
sys-libs/zlib/{zlib-1.3.ebuild => zlib-1.3-r1.ebuild} | 6 --
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 45d226c46a68..e9de29d6524b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -34,8 +34,8 @@
#--- END OF EXAMPLES ---
# Sam James (2023-08-18)
-# Masked for testing. Breaks pigz at least:
https://github.com/madler/pigz/issues/111.
-=sys-libs/zlib-1.3
+# Masked for testing.
+=sys-libs/zlib-1.3-r1
# Jonas Stein (2023-08-17)
# Upstream warns that it is broken and there is no fix since 2010
diff --git a/sys-libs/zlib/zlib-1.3.ebuild b/sys-libs/zlib/zlib-1.3-r1.ebuild
similarity index 96%
rename from sys-libs/zlib/zlib-1.3.ebuild
rename to sys-libs/zlib/zlib-1.3-r1.ebuild
index 6dbffd69d64f..22051ef75784 100644
--- a/sys-libs/zlib/zlib-1.3.ebuild
+++ b/sys-libs/zlib/zlib-1.3-r1.ebuild
@@ -130,12 +130,6 @@ multilib_src_compile() {
use minizip && emake -C contrib/minizip
}
-sed_macros() {
- # Clean up namespace a little, bug #383179
- # We do it here so we only have to tweak 2 files
- sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
-}
-
multilib_src_install() {
case ${CHOST} in
*-mingw*|mingw*)
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: b7b87a81b27f0d176d42fcb96747e5ecc72d62c6
Author: Sam James gentoo org>
AuthorDate: Fri Aug 18 10:09:13 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Aug 18 10:11:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b87a81
sys-libs/zlib: add 1.3
Closes: https://bugs.gentoo.org/894598
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/Manifest| 2 +
sys-libs/zlib/zlib-1.3.ebuild | 185 ++
2 files changed, 187 insertions(+)
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index f3962cb4da06..de5404f10c8a 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,2 +1,4 @@
DIST zlib-1.2.13.tar.xz 1296496 BLAKE2B
cefcd25989ce27e7d339af2a88455fcf64f6f5e647bedb0f05a45e4370a885fe45a60c023aa63e79b8ecf20ed3254d0052245f33f5769aca2838b42242be14a8
SHA512
9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725
DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B
29206175f06b4e36960fc6b9403101f55c1f5b768e1921ce1402217bc85978b9fba1a4130db2df5c148b6a1c947148372be20ff8c4ce337c6f2541b42fef7274
SHA512
ca5decebe9572e77e88bac5c5119bfda7e222ed3944e4692510ae70fb5f01d8694b59a6878472b84e6b61d2d1682d94473b6312832afa520a2a23293572ea621
+DIST zlib-1.3.tar.xz 1295740 BLAKE2B
5fe0f32339267348a313f23a21e9588bdb180b7415be303c85f5f169444d019e5f176ef7322f6e64297c360acc2a6041c50e2f66d1860e5c392d8970990f176a
SHA512
3868ac4da5842dd36c9dad794930675b9082ce15cbd099ddb79c0f6bd20a24aa8f33a123f378f26fe0ae02d91f31f2994dccaac565cedeaffed7b315e6ded2a2
+DIST zlib-1.3.tar.xz.asc 235 BLAKE2B
5fe6ce952699a19e848d0a6e6c3622f934340068fdcd29afb35c74f3c8ae66d04de644800d10b38c743bb2f4852ba28f1a97313cb0e6e6f9b804cbca5289ebbb
SHA512
8f3ce5c21938d6abc7e121d2939648a0ce2dc01a8ab4eb001d44eb159935dd0b4f5b5e371b3ecfc0ceb23689e2cefe002065968908503cde15b1bba08aff9db6
diff --git a/sys-libs/zlib/zlib-1.3.ebuild b/sys-libs/zlib/zlib-1.3.ebuild
new file mode 100644
index ..6dbffd69d64f
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.3.ebuild
@@ -0,0 +1,185 @@
+# 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.
+AUTOTOOLS_AUTO_DEPEND="no"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
+inherit autotools edo multilib-minimal flag-o-matic toolchain-funcs
usr-ldscript verify-sig
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="https://zlib.net/;
+SRC_URI="
+ https://zlib.net/${P}.tar.xz
+ https://zlib.net/fossils/${P}.tar.xz
+ https://zlib.net/current/beta/${P}.tar.xz
+ https://github.com/madler/zlib/releases/download/v${PV}/${P}.tar.xz
+ verify-sig? (
+ https://zlib.net/${P}.tar.xz.asc
+
https://github.com/madler/zlib/releases/download/v${PV}/${P}.tar.xz.asc
+ )
+"
+
+LICENSE="ZLIB"
+SLOT="0/1" # subslot = SONAME
+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="minizip static-libs"
+
+RDEPEND="!sys-libs/zlib-ng[compat]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ minizip? ( ${AUTOTOOLS_DEPEND} )
+ verify-sig? ( sec-keys/openpgp-keys-madler )
+"
+
+PATCHES=(
+ # Don't install unexpected & unused crypt.h header (which would clash
with other pkgs)
+ # Pending upstream. bug #658536
+ "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch
+
+ # Respect AR, RANLIB, NM during build. Pending upstream. bug #831628
+ "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch
+
+ # Respect LDFLAGS during configure tests. Pending upstream
+ "${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch
+
+ # Fix building on sparc with older binutils, we pass it in ebuild
instead
+
"${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
+)
+
+src_prepare() {
+ default
+
+ if use minizip ; then
+ cd contrib/minizip || die
+ eautoreconf
+ fi
+
+ case ${CHOST} in
+ *-mingw*|mingw*)
+ # Uses preconfigured Makefile rather than configure
script
+ multilib_copy_sources
+
+ ;;
+ esac
+}
+
+multilib_src_configure() {
+ # We pass manually instead of relying on the configure script/makefile
+ # because it would pass it even for older binutils.
+ use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments)
+
+ # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+ # https://github.com/gentoo/gentoo/pull/28355
+ # mold needs this too but right now tc-ld-is-mold is also not available
+ if tc-ld-is-lld;
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: d9528533d6c6e83b02f01804b2b63b323f6346a9
Author: Sam James gentoo org>
AuthorDate: Thu Jun 29 08:39:11 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 29 08:39:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9528533
sys-libs/zlib-ng: add 2.1.3
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/Manifest | 1 +
sys-libs/zlib-ng/zlib-ng-2.1.3.ebuild | 86 +++
2 files changed, 87 insertions(+)
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 6a7c819fb8e0..6680cee82115 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1,2 +1,3 @@
DIST zlib-ng-2.0.7.tar.gz 853381 BLAKE2B
89672bd35ee54df72ff995c1b4ed188538011be4cd077e464f21a088b0b70b3f95b4259dc546a65e8d4900dc5bd5bb98041875e361000898b34518f7e008b99b
SHA512
1c19a62bb00727ac49049c299fb70060da95b5fafa448144ae4133372ec8c3da15cef6c1303485290f269b23c580696554ca0383dba3e1f9609f65c332981988
DIST zlib-ng-2.1.2.tar.gz 2404176 BLAKE2B
bc0b65520562827b10216110e2020a3341ee0dd853874c19ddb6f9df776fc74a542c1239f77dc3ec2ccb3f92e75f1de7ef104edfecfe37312149b1bc29ae7403
SHA512
2b3073df4eb13d8318f8fa2b7674e4729642488f65dad49d3080ccd830f29e9e3f32a673b42634443ddf9e9ef85cfff4f2f3e182506f950b9ee0a208a92c0465
+DIST zlib-ng-2.1.3.tar.gz 2404446 BLAKE2B
f3c93e1ed6aa6d008915a69de92d58b1646fd41ae6c97fbdab9d921fd30c7931a42cf5dccd8911d52142960174a04df54d6ab557cc7c902930fc8609c31fbee9
SHA512
cb987c0b20a11fca5361dce94e53dead7364e739a984545c38ad4bf0c7fedd83d5d62530d979eca2182da88d7507a9bec8d3f5abff41e92ab5a63ac61001502e
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.3.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.1.3.ebuild
new file mode 100644
index ..cfef9b1cc843
--- /dev/null
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.3.ebuild
@@ -0,0 +1,86 @@
+# 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 zlib data compression library"
+HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+CPU_USE=(
+ x86_{avx2,avx512f,sse2,ssse3,sse4_2,pclmul}
+ arm_{crc32,neon}
+ ppc_{altivec,vsx2,vsx3}
+)
+IUSE="compat ${CPU_USE[@]/#/cpu_flags_} test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="compat? ( !sys-libs/zlib )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DZLIB_COMPAT=$(usex compat)
+ -DZLIB_ENABLE_TESTS=$(usex test)
+ -DWITH_GTEST=$(usex test)
+
+ # Unaligned access is controversial and undefined behaviour
+ # Let's keep it off for now
+ # https://github.com/gentoo/gentoo/pull/17167
+ -DWITH_UNALIGNED=OFF
+ )
+
+ # The intrinsics options are all defined conditionally, so we need
+ # to enable them on/off per-arch here for now.
+ # TODO: There's no s390x USE_EXPAND yet
+ if use amd64 || use x86 ; then
+ mycmakeargs+=(
+ -DWITH_AVX2=$(usex cpu_flags_x86_avx2)
+ -DWITH_AVX512=$(usex cpu_flags_x86_avx512f)
+ -DWITH_AVX512VNNI=OFF # TODO, see bug #908556
+ -DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+ -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3)
+ -DWITH_SSE42=$(usex cpu_flags_x86_sse4_2)
+ -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul)
+ -DWITH_VPCLMULQDQ=OFF # TODO, see bug #908556
+ )
+ fi
+
+ if use arm || use arm64 ; then
+ mycmakeargs+=(
+ -DWITH_ACLE=$(usex cpu_flags_arm_crc32)
+ -DWITH_NEON=$(usex cpu_flags_arm_neon)
+ )
+ fi
+
+ if use ppc || use ppc64 ; then
+ # The POWER8 support is VSX which was introduced
+ # VSX2 was introduced with POWER8, so use that as a proxy for it
+ mycmakeargs+=(
+ -DWITH_ALTIVEC=$(usex cpu_flags_ppc_altivec)
+ -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2)
+ -DWITH_POWER9=$(usex cpu_flags_ppc_vsx3)
+ )
+ fi
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ if use compat ; then
+ ewarn "zlib-ng is experimental and replacing the system zlib is
dangerous"
+ ewarn "Please be careful!"
+ ewarn
+ ewarn "The following link explains the guarantees (and what is
NOT guaranteed):"
+ ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md;
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: 2ce629ab3847ee125a2507b50715e29fbe26c5b7
Author: Sam James gentoo org>
AuthorDate: Sat Jun 17 03:09:53 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Jun 17 03:09:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce629ab
sys-libs/zlib-ng: disable gtest entirely when not running tests
Closes: https://bugs.gentoo.org/908567
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
index f96bd980dbf9..25a52ed3352c 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
@@ -35,6 +35,7 @@ multilib_src_configure() {
local mycmakeargs=(
-DZLIB_COMPAT=$(usex compat)
-DZLIB_ENABLE_TESTS=$(usex test)
+ -DWITH_GTEST=$(usex test)
# Unaligned access is controversial and undefined behaviour
# Let's keep it off for now
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: dc3acbe1cfc97a45f986c5ff46273f91dd75738a
Author: Sam James gentoo org>
AuthorDate: Fri Jun 16 01:35:56 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jun 16 01:36:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc3acbe1
sys-libs/zlib-ng: add multilib
If this is ever going to be a thing with compat, we obviously need this.
We could conditionalise stuff on USE=compat but I don't really see the value
in that; still possible we could want this for newly built 32-bit stuff anyway.
Signed-off-by: Sam James gentoo.org>
.../zlib-ng/{zlib-ng-2.1.2.ebuild => zlib-ng-2.1.2-r1.ebuild} | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
similarity index 97%
rename from sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
rename to sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
index 718d4ab949b5..f96bd980dbf9 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
@@ -6,7 +6,7 @@ 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
+inherit cmake-multilib
DESCRIPTION="Fork of the zlib data compression library"
HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
@@ -31,7 +31,7 @@ PATCHES=(
"${FILESDIR}"/zlib-ng-2.1.2-cmake.patch
)
-src_configure() {
+multilib_src_configure() {
local mycmakeargs=(
-DZLIB_COMPAT=$(usex compat)
-DZLIB_ENABLE_TESTS=$(usex test)
@@ -78,9 +78,7 @@ src_configure() {
cmake_src_configure
}
-src_install() {
- cmake_src_install
-
+pkg_postinst() {
if use compat ; then
ewarn "zlib-ng is experimental and replacing the system zlib is
dangerous"
ewarn "Please be careful!"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: 2e77e64d93d14f05e370d8c516c78ba932d3c1b5
Author: Sam James gentoo org>
AuthorDate: Fri Jun 16 01:25:34 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jun 16 01:26:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e77e64d
sys-libs/zlib-ng: tweak comment
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
index f32b71569755..718d4ab949b5 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
@@ -44,6 +44,7 @@ src_configure() {
# The intrinsics options are all defined conditionally, so we need
# to enable them on/off per-arch here for now.
+ # TODO: There's no s390x USE_EXPAND yet
if use amd64 || use x86 ; then
mycmakeargs+=(
-DWITH_AVX2=$(usex cpu_flags_x86_avx2)
@@ -74,8 +75,6 @@ src_configure() {
)
fi
- # TODO: There's no s390x USE_EXPAND yet
-
cmake_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/files/, sys-libs/zlib-ng/
commit: 88caec6a38285facc6c7682acd456452cc799333
Author: Sam James gentoo org>
AuthorDate: Fri Jun 16 01:11:43 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jun 16 01:11:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88caec6a
sys-libs/zlib-ng: add 2.1.2
No VNNI or VPCLMULQDQ yet, see linked bug.
Bug: https://bugs.gentoo.org/908556
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/Manifest| 1 +
sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch | 35 +
sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild| 92
3 files changed, 128 insertions(+)
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index cdd93f9171bb..6a7c819fb8e0 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1 +1,2 @@
DIST zlib-ng-2.0.7.tar.gz 853381 BLAKE2B
89672bd35ee54df72ff995c1b4ed188538011be4cd077e464f21a088b0b70b3f95b4259dc546a65e8d4900dc5bd5bb98041875e361000898b34518f7e008b99b
SHA512
1c19a62bb00727ac49049c299fb70060da95b5fafa448144ae4133372ec8c3da15cef6c1303485290f269b23c580696554ca0383dba3e1f9609f65c332981988
+DIST zlib-ng-2.1.2.tar.gz 2404176 BLAKE2B
bc0b65520562827b10216110e2020a3341ee0dd853874c19ddb6f9df776fc74a542c1239f77dc3ec2ccb3f92e75f1de7ef104edfecfe37312149b1bc29ae7403
SHA512
2b3073df4eb13d8318f8fa2b7674e4729642488f65dad49d3080ccd830f29e9e3f32a673b42634443ddf9e9ef85cfff4f2f3e182506f950b9ee0a208a92c0465
diff --git a/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch
b/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch
new file mode 100644
index ..8deb07a60515
--- /dev/null
+++ b/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch
@@ -0,0 +1,35 @@
+https://github.com/zlib-ng/zlib-ng/issues/1515
+https://github.com/zlib-ng/zlib-ng/pull/1519
+https://github.com/zlib-ng/zlib-ng/commit/39136c20716a94188c1d041b9656315371d35a47
+
+From 39136c20716a94188c1d041b9656315371d35a47 Mon Sep 17 00:00:00 2001
+From: "Mika T. Lindqvist"
+Date: Sun, 11 Jun 2023 18:38:12 +0300
+Subject: [PATCH] Try to find system copy of googletest before trying to
+ download it. * Don't use system copy if memory sanitizer is enabled
+
+--- a/test/CMakeLists.txt
b/test/CMakeLists.txt
+@@ -111,8 +111,6 @@ if(WITH_BENCHMARKS)
+ endif()
+
+ if(WITH_GTEST)
+-include(FetchContent)
+-
+ # Google test requires at least C++11
+ set(CMAKE_CXX_STANDARD 11)
+
+@@ -125,9 +123,13 @@ if(WITH_GTEST)
+ # Must set include and compile options before fetching googletest
+ include_directories($ENV{LLVM_BUILD_DIR}/include
$ENV{LLVM_BUILD_DIR}/include/c++/v1)
+ add_compile_options(-stdlib=libc++ -g)
++elseif(NOT TARGET GTest::GTest)
++find_package(GTest)
+ endif()
+
+ if(NOT TARGET GTest::GTest)
++include(FetchContent)
++
+ # Prevent overriding the parent project's compiler/linker settings
for Windows
+ set(gtest_force_shared_crt ON CACHE BOOL
+ "Use shared (DLL) run-time lib even when Google Test is built as
static lib." FORCE)
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
new file mode 100644
index ..f32b71569755
--- /dev/null
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
@@ -0,0 +1,92 @@
+# 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 zlib data compression library"
+HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+CPU_USE=(
+ x86_{avx2,avx512f,sse2,ssse3,sse4_2,pclmul}
+ arm_{crc32,neon}
+ ppc_{altivec,vsx2,vsx3}
+)
+IUSE="compat ${CPU_USE[@]/#/cpu_flags_} test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="compat? ( !sys-libs/zlib )"
+
+PATCHES=(
+ "${FILESDIR}"/zlib-ng-2.1.2-cmake.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DZLIB_COMPAT=$(usex compat)
+ -DZLIB_ENABLE_TESTS=$(usex test)
+
+ # Unaligned access is controversial and undefined behaviour
+ # Let's keep it off for now
+ # https://github.com/gentoo/gentoo/pull/17167
+ -DWITH_UNALIGNED=OFF
+ )
+
+ # The intrinsics options are all defined conditionally, so we need
+ # to enable them on/off per-arch here for now.
+ if use amd64 || use x86 ; then
+ mycmakeargs+=(
+ -DWITH_AVX2=$(usex cpu_flags_x86_avx2)
+ -DWITH_AVX512=$(usex cpu_flags_x86_avx512f)
+ -DWITH_AVX512VNNI=OFF # TODO, see bug #908556
+ -DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 44adc9b74598ec176148cf3f620f45ca86c7c172
Author: Fabian Groffen gentoo org>
AuthorDate: Sat May 27 11:05:25 2023 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat May 27 11:05:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44adc9b7
sys-libs/zlib: drop Cygwin support
Signed-off-by: Fabian Groffen gentoo.org>
sys-libs/zlib/Manifest | 2 --
sys-libs/zlib/zlib-1.2.13-r1.ebuild | 36 +---
2 files changed, 5 insertions(+), 33 deletions(-)
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 53fdd7466a39..f3962cb4da06 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,4 +1,2 @@
-DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B
fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274
SHA512
14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
DIST zlib-1.2.13.tar.xz 1296496 BLAKE2B
cefcd25989ce27e7d339af2a88455fcf64f6f5e647bedb0f05a45e4370a885fe45a60c023aa63e79b8ecf20ed3254d0052245f33f5769aca2838b42242be14a8
SHA512
9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725
DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B
29206175f06b4e36960fc6b9403101f55c1f5b768e1921ce1402217bc85978b9fba1a4130db2df5c148b6a1c947148372be20ff8c4ce337c6f2541b42fef7274
SHA512
ca5decebe9572e77e88bac5c5119bfda7e222ed3944e4692510ae70fb5f01d8694b59a6878472b84e6b61d2d1682d94473b6312832afa520a2a23293572ea621
-DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B
885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a
SHA512
e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index 7f3f616da88d..7f8b0bc677a9 100644
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -8,18 +8,12 @@ AUTOTOOLS_AUTO_DEPEND="no"
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
inherit autotools multilib-minimal flag-o-matic toolchain-funcs usr-ldscript
verify-sig
-CYGWINPATCHES=(
-
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch
-> ${PN}-1.2.11-cygwin-gzopen_w.patch"
-
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch
-> ${PN}-1.2.7-cygwin-minizip.patch"
-)
-
DESCRIPTION="Standard (de)compression library"
HOMEPAGE="https://zlib.net/;
SRC_URI="https://zlib.net/${P}.tar.xz
https://zlib.net/fossils/${P}.tar.xz
https://zlib.net/current/beta/${P}.tar.xz
- verify-sig? ( https://zlib.net/${P}.tar.xz.asc )
- elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
+ verify-sig? ( https://zlib.net/${P}.tar.xz.asc )"
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
@@ -51,33 +45,13 @@ PATCHES=(
src_prepare() {
default
- if use elibc_Cygwin ; then
- local p
- for p in "${CYGWINPATCHES[@]}" ; do
- # Strip out the "... -> " from the array
- eapply -p2 "${DISTDIR}/${p#*> }"
- done
- fi
-
if use minizip ; then
cd contrib/minizip || die
eautoreconf
fi
case ${CHOST} in
- *-cygwin*)
- # Do not use _wopen, it's a mingw-only symbol
- sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die
-
- # zlib1.dll is the mingw name, need cygz.dll
- # cygz.dll is loaded by toolchain, put into subdir
- sed -i -e 's|zlib1.dll|win32/cygz.dll|'
win32/Makefile.gcc || die
-
- ;;
- esac
-
- case ${CHOST} in
- *-mingw*|mingw*|*-cygwin*)
+ *-mingw*|mingw*)
# Uses preconfigured Makefile rather than configure
script
multilib_copy_sources
@@ -100,7 +74,7 @@ multilib_src_configure() {
fi
case ${CHOST} in
- *-mingw*|mingw*|*-cygwin*)
+ *-mingw*|mingw*)
;;
*)
@@ -131,7 +105,7 @@ multilib_src_configure() {
multilib_src_compile() {
case ${CHOST} in
- *-mingw*|mingw*|*-cygwin*)
+ *-mingw*|mingw*)
emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
sed \
-e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
@@ -160,7 +134,7 @@ sed_macros() {
multilib_src_install() {
case ${CHOST} in
-
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: 9226e625e71d03f9c34f9a9586e994c4a080ae48
Author: Sam James gentoo org>
AuthorDate: Fri Mar 17 21:55:34 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Mar 17 21:55:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9226e625
sys-libs/zlib-ng: drop 2.0.6
Bug: https://bugs.gentoo.org/901983
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/Manifest | 1 -
sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild | 78 ---
2 files changed, 79 deletions(-)
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 83cf6ac918fc..cdd93f9171bb 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1,2 +1 @@
-DIST zlib-ng-2.0.6.tar.gz 817951 BLAKE2B
52993caadf14817e328b180d728586e1332ea04504288264934ef49441cb8b8c4a2412d4c11d1982f3764fef5e4fb7ebab442b407e57d9d5f08a5b2ed890bba9
SHA512
4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5
DIST zlib-ng-2.0.7.tar.gz 853381 BLAKE2B
89672bd35ee54df72ff995c1b4ed188538011be4cd077e464f21a088b0b70b3f95b4259dc546a65e8d4900dc5bd5bb98041875e361000898b34518f7e008b99b
SHA512
1c19a62bb00727ac49049c299fb70060da95b5fafa448144ae4133372ec8c3da15cef6c1303485290f269b23c580696554ca0383dba3e1f9609f65c332981988
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
deleted file mode 100644
index 641a623a64aa..
--- a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
+++ /dev/null
@@ -1,78 +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 zlib data compression library"
-HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-CPU_USE=(
cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} )
-IUSE="compat ${CPU_USE[@]} test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="compat? ( !sys-libs/zlib )"
-
-src_configure() {
- local mycmakeargs=(
- -DZLIB_COMPAT="$(usex compat)"
- -DZLIB_ENABLE_TESTS="$(usex test)"
- # Unaligned access is controversial and undefined behaviour
- # Let's keep it off for now
- # https://github.com/gentoo/gentoo/pull/17167
- -DWITH_UNALIGNED="OFF"
- )
-
- # The intrinsics options are all defined conditionally, so we need
- # to enable them on/off per-arch here for now.
- if use amd64 || use x86 ; then
- mycmakeargs+=(
- -DWITH_AVX2=$(usex cpu_flags_x86_avx2)
- -DWITH_SSE2=$(usex cpu_flags_x86_sse2)
- -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3)
- -DWITH_SSE4=$(usex cpu_flags_x86_sse4a)
- -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul)
- )
- fi
-
- if use arm || use arm64 ; then
- mycmakeargs+=(
- -DWITH_ACLE=$(usex cpu_flags_arm_crc32)
- -DWITH_NEON=$(usex cpu_flags_arm_neon)
- )
- fi
-
- if use ppc || use ppc64 ; then
- # The POWER8 support is VSX which was introduced
- # VSX2 was introduced with POWER8, so use that as a proxy for it
- mycmakeargs+=(
- -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2)
- )
- fi
-
- # TODO: There's no s390x USE_EXPAND yet
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use compat ; then
- ewarn "zlib-ng is experimental and replacing the system zlib is
dangerous"
- ewarn "Please be careful!"
- ewarn
- ewarn "The following link explains the guarantees (and what is
NOT guaranteed):"
- ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md;
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: 3877bb3d71236c4d039a022825c1733ae0683db0
Author: Sam James gentoo org>
AuthorDate: Fri Mar 17 21:47:42 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Mar 17 21:52:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3877bb3d
sys-libs/zlib-ng: add 2.0.7
Bug: https://bugs.gentoo.org/901983
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/Manifest | 1 +
sys-libs/zlib-ng/zlib-ng-2.0.7.ebuild | 78 +++
2 files changed, 79 insertions(+)
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 1eddb8bdf40a..83cf6ac918fc 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1 +1,2 @@
DIST zlib-ng-2.0.6.tar.gz 817951 BLAKE2B
52993caadf14817e328b180d728586e1332ea04504288264934ef49441cb8b8c4a2412d4c11d1982f3764fef5e4fb7ebab442b407e57d9d5f08a5b2ed890bba9
SHA512
4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5
+DIST zlib-ng-2.0.7.tar.gz 853381 BLAKE2B
89672bd35ee54df72ff995c1b4ed188538011be4cd077e464f21a088b0b70b3f95b4259dc546a65e8d4900dc5bd5bb98041875e361000898b34518f7e008b99b
SHA512
1c19a62bb00727ac49049c299fb70060da95b5fafa448144ae4133372ec8c3da15cef6c1303485290f269b23c580696554ca0383dba3e1f9609f65c332981988
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.7.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.0.7.ebuild
new file mode 100644
index ..641a623a64aa
--- /dev/null
+++ b/sys-libs/zlib-ng/zlib-ng-2.0.7.ebuild
@@ -0,0 +1,78 @@
+# 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 zlib data compression library"
+HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+CPU_USE=(
cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} )
+IUSE="compat ${CPU_USE[@]} test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="compat? ( !sys-libs/zlib )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DZLIB_COMPAT="$(usex compat)"
+ -DZLIB_ENABLE_TESTS="$(usex test)"
+ # Unaligned access is controversial and undefined behaviour
+ # Let's keep it off for now
+ # https://github.com/gentoo/gentoo/pull/17167
+ -DWITH_UNALIGNED="OFF"
+ )
+
+ # The intrinsics options are all defined conditionally, so we need
+ # to enable them on/off per-arch here for now.
+ if use amd64 || use x86 ; then
+ mycmakeargs+=(
+ -DWITH_AVX2=$(usex cpu_flags_x86_avx2)
+ -DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+ -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3)
+ -DWITH_SSE4=$(usex cpu_flags_x86_sse4a)
+ -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul)
+ )
+ fi
+
+ if use arm || use arm64 ; then
+ mycmakeargs+=(
+ -DWITH_ACLE=$(usex cpu_flags_arm_crc32)
+ -DWITH_NEON=$(usex cpu_flags_arm_neon)
+ )
+ fi
+
+ if use ppc || use ppc64 ; then
+ # The POWER8 support is VSX which was introduced
+ # VSX2 was introduced with POWER8, so use that as a proxy for it
+ mycmakeargs+=(
+ -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2)
+ )
+ fi
+
+ # TODO: There's no s390x USE_EXPAND yet
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use compat ; then
+ ewarn "zlib-ng is experimental and replacing the system zlib is
dangerous"
+ ewarn "Please be careful!"
+ ewarn
+ ewarn "The following link explains the guarantees (and what is
NOT guaranteed):"
+ ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md;
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: 67b55f0b3eb3af7ec92468ba29b717b9e2cf5008
Author: Yixun Lan gentoo org>
AuthorDate: Tue Feb 28 12:12:14 2023 +
Commit: Yixun Lan gentoo org>
CommitDate: Tue Feb 28 12:12:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67b55f0b
sys-libs/zlib-ng: Keyword 2.0.6 riscv, #895718
Signed-off-by: Yixun Lan gentoo.org>
sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
index 7b148686e2b4..641a623a64aa 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
CPU_USE=(
cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} )
IUSE="compat ${CPU_USE[@]} test"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: 2220b24cd52c480d80091ca41da014331832b0f6
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Feb 26 19:28:08 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Feb 26 19:28:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2220b24c
sys-libs/zlib-ng: Keyword 2.0.6 arm, #895718
Signed-off-by: Arthur Zamarin gentoo.org>
sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
index 78c1b8748f31..7b148686e2b4 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
CPU_USE=(
cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} )
IUSE="compat ${CPU_USE[@]} test"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: 80297805053fce0187fe5e129bb281518b17f69f
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Feb 26 17:32:59 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Feb 26 17:32:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80297805
sys-libs/zlib-ng: Keyword 2.0.6 ppc64, #895718
Signed-off-by: Arthur Zamarin gentoo.org>
sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
index 00d516f7eff3..78c1b8748f31 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
CPU_USE=(
cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} )
IUSE="compat ${CPU_USE[@]} test"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: cfb46c1be0cc0fa31e944027332617a90d36a368
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Feb 26 17:08:48 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Feb 26 17:08:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb46c1b
sys-libs/zlib-ng: Keyword 2.0.6 arm64, #895718
Signed-off-by: Arthur Zamarin gentoo.org>
sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
index 3a26044fac17..00d516f7eff3 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.0.6.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
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
CPU_USE=(
cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} )
IUSE="compat ${CPU_USE[@]} test"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 5fe0054b3e6a55983086d25284fd7e7a25506f13
Author: WANG Xuerui gentoo org>
AuthorDate: Fri Jan 13 07:24:17 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 14 19:14:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fe0054b
sys-libs/zlib: fix build with lld-16
Signed-off-by: WANG Xuerui gentoo.org>
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.13-r1.ebuild | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index 50b767a0ef31..30d4a7c1a33e 100644
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.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
@@ -6,7 +6,7 @@ EAPI=8
# Worth keeping an eye on 'develop' branch upstream for possible backports.
AUTOTOOLS_AUTO_DEPEND="no"
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
-inherit autotools multilib-minimal flag-o-matic usr-ldscript verify-sig
+inherit autotools multilib-minimal flag-o-matic toolchain-funcs usr-ldscript
verify-sig
CYGWINPATCHES=(
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch
-> ${PN}-1.2.11-cygwin-gzopen_w.patch"
@@ -92,6 +92,13 @@ multilib_src_configure() {
# because it would pass it even for older binutils.
use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments)
+ # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+ # https://github.com/gentoo/gentoo/pull/28355
+ # mold needs this too but right now tc-ld-is-mold is also not available
+ if tc-ld-is-lld; then
+ append-ldflags -Wl,--undefined-version
+ fi
+
case ${CHOST} in
*-mingw*|mingw*|*-cygwin*)
;;
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/files/, sys-libs/zlib/
commit: ee92c1551e10c7237f46e8abee3e6b024e6d6c4f
Author: Sam James gentoo org>
AuthorDate: Fri Nov 25 08:18:52 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 25 08:19:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee92c155
sys-libs/zlib: drop 1.2.12-r3
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/Manifest | 2 -
.../zlib/files/zlib-1.2.12-CRC-buggy-input.patch | 50 --
.../zlib/files/zlib-1.2.12-CVE-2022-37434.patch| 55 --
.../zlib-1.2.12-fix-CC-logic-in-configure.patch| 45 -
.../zlib-1.2.12-use-LDFLAGS-in-configure.patch | 71
sys-libs/zlib/zlib-1.2.12-r3.ebuild| 199 -
6 files changed, 422 deletions(-)
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 6f127872cd6e..53fdd7466a39 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,6 +1,4 @@
DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B
fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274
SHA512
14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
-DIST zlib-1.2.12.tar.gz 1490071 BLAKE2B
76e7b26f8dc761b0eae6276cc32bc36fa74a88197699c95d158c1548f97b80db5e39d21144ecd6ee3eb90c42730aa5f387f9952d9a3f0930b56e9dfcd12f1e67
SHA512
cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
-DIST zlib-1.2.12.tar.gz.asc 235 BLAKE2B
bb1efc89b10b894ebc8e8008ee3e98104348f197fae54d298d62057a2d8b8d7246de937962b531189f80ad64a803112300a73862cba121cbf6a6d5ac5f9bc40c
SHA512
5c1144371a83b83f9f1d008aa9297e23c0db992cab6c4a8966f9320e70c6186867d62753511d6a663b0fe181cd37fe256c53586358a42ea348ccc0747b1a7153
DIST zlib-1.2.13.tar.xz 1296496 BLAKE2B
cefcd25989ce27e7d339af2a88455fcf64f6f5e647bedb0f05a45e4370a885fe45a60c023aa63e79b8ecf20ed3254d0052245f33f5769aca2838b42242be14a8
SHA512
9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725
DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B
29206175f06b4e36960fc6b9403101f55c1f5b768e1921ce1402217bc85978b9fba1a4130db2df5c148b6a1c947148372be20ff8c4ce337c6f2541b42fef7274
SHA512
ca5decebe9572e77e88bac5c5119bfda7e222ed3944e4692510ae70fb5f01d8694b59a6878472b84e6b61d2d1682d94473b6312832afa520a2a23293572ea621
DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B
885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a
SHA512
e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
diff --git a/sys-libs/zlib/files/zlib-1.2.12-CRC-buggy-input.patch
b/sys-libs/zlib/files/zlib-1.2.12-CRC-buggy-input.patch
deleted file mode 100644
index 083634929bbe..
--- a/sys-libs/zlib/files/zlib-1.2.12-CRC-buggy-input.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2
-https://github.com/madler/zlib/issues/613
-https://bugs.gentoo.org/836370
-
-From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001
-From: Mark Adler
-Date: Wed, 30 Mar 2022 11:14:53 -0700
-Subject: [PATCH] Correct incorrect inputs provided to the CRC functions.
-
-The previous releases of zlib were not sensitive to incorrect CRC
-inputs with bits set above the low 32. This commit restores that
-behavior, so that applications with such bugs will continue to
-operate as before.
a/crc32.c
-+++ b/crc32.c
-@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
- #endif /* DYNAMIC_CRC_TABLE */
-
- /* Pre-condition the CRC */
--crc ^= 0x;
-+crc = (~crc) & 0x;
-
- /* Compute the CRC up to a word boundary. */
- while (len && ((z_size_t)buf & 7) != 0) {
-@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
- #endif /* DYNAMIC_CRC_TABLE */
-
- /* Pre-condition the CRC */
--crc ^= 0x;
-+crc = (~crc) & 0x;
-
- #ifdef W
-
-@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
- #ifdef DYNAMIC_CRC_TABLE
- once(, make_crc_table);
- #endif /* DYNAMIC_CRC_TABLE */
--return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
-+return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0x);
- }
-
- /* =
*/
-@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op)
- uLong crc2;
- uLong op;
- {
--return multmodp(op, crc1) ^ crc2;
-+return multmodp(op, crc1) ^ (crc2 & 0x);
- }
-
diff --git a/sys-libs/zlib/files/zlib-1.2.12-CVE-2022-37434.patch
b/sys-libs/zlib/files/zlib-1.2.12-CVE-2022-37434.patch
deleted file mode 100644
index 1ef3b909e435..
---
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/, sys-libs/zlib/files/
commit: bac67bd1ecdf620db1b0dc03b63e66d978ff7325
Author: Sam James gentoo org>
AuthorDate: Wed Nov 23 04:24:31 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Nov 23 04:24:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac67bd1
sys-libs/zlib: fix build on sparc
Closes: https://bugs.gentoo.org/879883
Signed-off-by: Sam James gentoo.org>
...-off-RWX-segment-warnings-on-sparc-system.patch | 56 ++
sys-libs/zlib/zlib-1.2.13-r1.ebuild| 9 +++-
2 files changed, 64 insertions(+), 1 deletion(-)
diff --git
a/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
b/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
new file mode 100644
index ..48d58acaaf7f
--- /dev/null
+++
b/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
@@ -0,0 +1,56 @@
+From 2ad2713e6cb9166dcede9a020f6913b8189ff0c6 Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Wed, 23 Nov 2022 04:17:16 +
+Subject: [PATCH] Revert "Turn off RWX segment warnings on sparc systems."
+
+This breaks building on sparc with older binutils.
+
+This reverts commit 29fd715fd0bdaffee21e2d2d37be8c5a6ac67ee4.
+--- a/Makefile.in
b/Makefile.in
+@@ -22,7 +22,7 @@ CFLAGS=-O
+
+ SFLAGS=-O
+ LDFLAGS=
+-TEST_LDFLAGS=$(LDFLAGS) -L. libz.a
++TEST_LDFLAGS=-L. libz.a
+ LDSHARED=$(CC)
+ CPP=$(CC) -E
+
+@@ -288,10 +288,10 @@ minigzip$(EXE): minigzip.o $(STATICLIB)
+ $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
+
+ examplesh$(EXE): example.o $(SHAREDLIBV)
+- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV)
++ $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
+
+ minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
+- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV)
++ $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
+
+ example64$(EXE): example64.o $(STATICLIB)
+ $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
+--- a/configure
b/configure
+@@ -33,10 +33,7 @@ fi
+ # set command prefix for cross-compilation
+ if [ -n "${CHOST}" ]; then
+ uname=${CHOST}
+-mname=${CHOST}
+ CROSS_PREFIX="${CHOST}-"
+-else
+-mname=`(uname -a || echo unknown) 2>/dev/null`
+ fi
+
+ # destination name for static library
+@@ -223,10 +220,6 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log
2>&1; then
+ fi
+ case "$uname" in
+ Linux* | linux* | *-linux* | GNU | GNU/* | solaris*)
+-case "$mname" in
+-*sparc*)
+-LDFLAGS="${LDFLAGS} -Wl,--no-warn-rwx-segments" ;;
+-esac
+ LDSHARED=${LDSHARED-"$cc -shared
-Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;;
+ *BSD | *bsd* | DragonFly)
+ LDSHARED=${LDSHARED-"$cc -shared
-Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index ee60673a59b8..50b767a0ef31 100644
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
# Worth keeping an eye on 'develop' branch upstream for possible backports.
AUTOTOOLS_AUTO_DEPEND="no"
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
-inherit autotools multilib-minimal usr-ldscript verify-sig
+inherit autotools multilib-minimal flag-o-matic usr-ldscript verify-sig
CYGWINPATCHES=(
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch
-> ${PN}-1.2.11-cygwin-gzopen_w.patch"
@@ -43,6 +43,9 @@ PATCHES=(
# Respect LDFLAGS during configure tests. Pending upstream
"${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch
+
+ # Fix building on sparc with older binutils, we pass it in ebuild
instead
+
"${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
)
src_prepare() {
@@ -85,6 +88,10 @@ src_prepare() {
echoit() { echo "$@"; "$@"; }
multilib_src_configure() {
+ # We pass manually instead of relying on the configure script/makefile
+ # because it would pass it even for older binutils.
+ use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments)
+
case ${CHOST} in
*-mingw*|mingw*|*-cygwin*)
;;
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 418e7be22f86885b945b43c15ccdb8e35b17eeb9
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Nov 22 18:43:27 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Nov 22 18:43:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=418e7be2
sys-libs/zlib: Stabilize 1.2.13-r1 amd64, #881717
Signed-off-by: Arthur Zamarin gentoo.org>
sys-libs/zlib/zlib-1.2.13-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index 60ae606ddec2..ee60673a59b8 100644
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 2b667b0352e47d2bbcf928df1b32fd94c59ad3da
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Nov 18 18:05:48 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Nov 18 18:05:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b667b03
sys-libs/zlib: Stabilize 1.2.13-r1 sparc, #881717
Signed-off-by: Arthur Zamarin gentoo.org>
sys-libs/zlib/zlib-1.2.13-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index bdfa65ba6a57..60ae606ddec2 100644
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: cfacca32002cca116a6f82b0ef32d5e9a230770e
Author: Sam James gentoo org>
AuthorDate: Fri Nov 18 04:25:46 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 18 04:25:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfacca32
sys-libs/zlib: Stabilize 1.2.13-r1 arm, #881717
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.13-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index c5cbf6486ecd..bdfa65ba6a57 100644
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 260e0c57154e4f49960d76f129797ab32e22e09d
Author: Sam James gentoo org>
AuthorDate: Fri Nov 18 04:25:44 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 18 04:25:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=260e0c57
sys-libs/zlib: Stabilize 1.2.13-r1 arm64, #881717
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.13-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index ee148eb240da..765b13316033 100644
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 7ef3e95b025dba539375177fa608994755e7dabf
Author: Sam James gentoo org>
AuthorDate: Fri Nov 18 04:25:45 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 18 04:25:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef3e95b
sys-libs/zlib: Stabilize 1.2.13-r1 hppa, #881717
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.13-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index 765b13316033..c5cbf6486ecd 100644
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: b1dbf4d2944a10b04a17647508d7f7b140096886
Author: Sam James gentoo org>
AuthorDate: Fri Nov 18 04:25:42 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 18 04:25:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1dbf4d2
sys-libs/zlib: Stabilize 1.2.13-r1 x86, #881717
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.13-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index 3b6c6c415990..ee148eb240da 100644
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 62736bea1ef7c6f0a483c6db715d7caabacd630e
Author: Sam James gentoo org>
AuthorDate: Fri Nov 18 04:25:41 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 18 04:25:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62736bea
sys-libs/zlib: Stabilize 1.2.13-r1 ppc64, #881717
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.13-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index 0d034ab99e69..3b6c6c415990 100644
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: ac3c80df17d15e260b94e58b7a0805046cc0e73e
Author: Sam James gentoo org>
AuthorDate: Fri Nov 18 04:25:40 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 18 04:25:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac3c80df
sys-libs/zlib: Stabilize 1.2.13-r1 ppc, #881717
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.13-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index ff55afcd110f..0d034ab99e69 100644
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 9bd91fc24085d18d19bc622dd9c306ee8a3b9c85
Author: Sam James gentoo org>
AuthorDate: Sun Oct 23 05:58:03 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 23 10:55:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd91fc2
sys-libs/zlib: install minizip man pages
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/{zlib-1.2.13.ebuild => zlib-1.2.13-r1.ebuild} | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sys-libs/zlib/zlib-1.2.13.ebuild
b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
similarity index 98%
rename from sys-libs/zlib/zlib-1.2.13.ebuild
rename to sys-libs/zlib/zlib-1.2.13-r1.ebuild
index ed611f394ec6..ff55afcd110f 100644
--- a/sys-libs/zlib/zlib-1.2.13.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -171,9 +171,7 @@ multilib_src_install() {
if use minizip ; then
emake -C contrib/minizip install DESTDIR="${D}"
sed_macros "${ED}"/usr/include/minizip/*.h
- fi
- if use minizip; then
# This might not exist if slibtool is used.
# bug #816756
rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die
@@ -187,5 +185,9 @@ multilib_src_install() {
multilib_src_install_all() {
dodoc FAQ README ChangeLog doc/*.txt
- use minizip && dodoc contrib/minizip/*.txt
+
+ if use minizip ; then
+ dodoc contrib/minizip/*.txt
+ doman contrib/minizip/*.1
+ fi
}
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/files/, sys-libs/zlib/
commit: 4efe01ba2e5b6a4696ce14f70006f4ec05ac14ac
Author: Sam James gentoo org>
AuthorDate: Fri Oct 14 18:36:20 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 14 18:50:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4efe01ba
sys-libs/zlib: add 1.2.13
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/Manifest | 2 +
.../zlib-1.2.13-use-LDFLAGS-in-configure.patch | 72
sys-libs/zlib/zlib-1.2.13.ebuild | 191 +
3 files changed, 265 insertions(+)
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 64bfa1e36767..6f127872cd6e 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,4 +1,6 @@
DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B
fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274
SHA512
14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
DIST zlib-1.2.12.tar.gz 1490071 BLAKE2B
76e7b26f8dc761b0eae6276cc32bc36fa74a88197699c95d158c1548f97b80db5e39d21144ecd6ee3eb90c42730aa5f387f9952d9a3f0930b56e9dfcd12f1e67
SHA512
cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
DIST zlib-1.2.12.tar.gz.asc 235 BLAKE2B
bb1efc89b10b894ebc8e8008ee3e98104348f197fae54d298d62057a2d8b8d7246de937962b531189f80ad64a803112300a73862cba121cbf6a6d5ac5f9bc40c
SHA512
5c1144371a83b83f9f1d008aa9297e23c0db992cab6c4a8966f9320e70c6186867d62753511d6a663b0fe181cd37fe256c53586358a42ea348ccc0747b1a7153
+DIST zlib-1.2.13.tar.xz 1296496 BLAKE2B
cefcd25989ce27e7d339af2a88455fcf64f6f5e647bedb0f05a45e4370a885fe45a60c023aa63e79b8ecf20ed3254d0052245f33f5769aca2838b42242be14a8
SHA512
9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725
+DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B
29206175f06b4e36960fc6b9403101f55c1f5b768e1921ce1402217bc85978b9fba1a4130db2df5c148b6a1c947148372be20ff8c4ce337c6f2541b42fef7274
SHA512
ca5decebe9572e77e88bac5c5119bfda7e222ed3944e4692510ae70fb5f01d8694b59a6878472b84e6b61d2d1682d94473b6312832afa520a2a23293572ea621
DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B
885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a
SHA512
e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
diff --git a/sys-libs/zlib/files/zlib-1.2.13-use-LDFLAGS-in-configure.patch
b/sys-libs/zlib/files/zlib-1.2.13-use-LDFLAGS-in-configure.patch
new file mode 100644
index ..9f2b240334e8
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.13-use-LDFLAGS-in-configure.patch
@@ -0,0 +1,72 @@
+https://github.com/madler/zlib/pull/599
+
+Rebased version of:
+
+From 37c9730ba474d274f4cc6a974943eef95087b9f6 Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Tue, 8 Mar 2022 22:38:47 -0800
+Subject: [PATCH] configure: Pass LDFLAGS to link tests
+
+LDFLAGS can contain critical flags without which linking wont succeed
+therefore ensure that all configure tests involving link time checks are
+using LDFLAGS on compiler commandline along with CFLAGS to ensure the
+tests perform correctly. Without this some tests may fail resulting in
+wrong confgure result, ending in miscompiling the package
+
+Signed-off-by: Khem Raj
+--- a/configure
b/configure
+@@ -436,7 +436,7 @@ if test $shared -eq 1; then
+ echo Checking for shared library support... | tee -a configure.log
+ # we must test in two steps (cc then ld), required at least on SunOS 4.x
+ if try $CC -w -c $SFLAGS $test.c &&
+- try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
++ try $LDSHARED $SFLAGS $LDFLAGS -o $test$shared_ext $test.o; then
+ echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log
+ elif test -z "$old_cc" -a -z "$old_cflags"; then
+ echo No shared library support. | tee -a configure.log
+@@ -498,7 +498,7 @@ int main(void) {
+ }
+ EOF
+ fi
+- if try $CC $CFLAGS -o $test $test.c; then
++ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
+ sizet=`./$test`
+ echo "Checking for a pointer-size integer type..." $sizet"." | tee -a
configure.log
+ CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}"
+@@ -532,7 +532,7 @@ int main(void) {
+ return 0;
+ }
+ EOF
+- if try $CC $CFLAGS -o $test $test.c; then
++ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
+ echo "Checking for fseeko... Yes." | tee -a configure.log
+ else
+ CFLAGS="${CFLAGS} -DNO_FSEEKO"
+@@ -549,7 +549,7 @@ cat > $test.c <
+ int main() { return strlen(strerror(errno)); }
+ EOF
+-if try $CC $CFLAGS -o $test $test.c; then
++if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
+ echo "Checking for strerror... Yes." | tee -a
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: f6c45f07f6faac56ef65715190f815585468 Author: Sam James gentoo org> AuthorDate: Fri Oct 7 19:12:05 2022 + Commit: Sam James gentoo org> CommitDate: Fri Oct 7 19:57:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c45f07 sys-libs/zlib-ng: mention 'develop' branch upstream Signed-off-by: Sam James gentoo.org> sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild index 4347d46652d3..3a26044fac17 100644 --- a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild +++ b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild @@ -3,6 +3,9 @@ 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 zlib data compression library"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/files/
commit: 31b2c136145e3fbb9ccbbf461c7e74e16ad02d32
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Wed Sep 28 16:51:41 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Oct 2 14:42:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31b2c136
sys-libs/zlib: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Portage 3.0.37 / pkgdev 0.2.2 / pkgcheck 0.10.15
Closes: https://github.com/gentoo/gentoo/pull/27514
Signed-off-by: Conrad Kostecki gentoo.org>
.../zlib-1.2.11-fix-deflateParams-usage.patch | 69 --
1 file changed, 69 deletions(-)
diff --git a/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch
b/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch
deleted file mode 100644
index 59d4a0919c77..
--- a/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-https://github.com/madler/zlib/commit/f9694097dd69354b03cb8af959094c7f260db0a1
-
-From f9694097dd69354b03cb8af959094c7f260db0a1 Mon Sep 17 00:00:00 2001
-From: Mark Adler
-Date: Mon, 16 Jan 2017 09:49:35 -0800
-Subject: [PATCH] Permit a deflateParams() parameter change as soon as
- possible.
-
-This commit allows a parameter change even if the input data has
-not all been compressed and copied to the application output
-buffer, so long as all of the input data has been compressed to
-the internal pending output buffer. This also allows an immediate
-deflateParams change so long as there have been no deflate calls
-since initialization or reset.
- deflate.c | 6 +++---
- zlib.h| 11 ++-
- 2 files changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/deflate.c b/deflate.c
-index b63311a5..20bda4f6 100644
a/deflate.c
-+++ b/deflate.c
-@@ -494,7 +494,7 @@ int ZEXPORT deflateResetKeep (strm)
- s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
- #endif
- adler32(0L, Z_NULL, 0);
--s->last_flush = Z_NO_FLUSH;
-+s->last_flush = -2;
-
- _tr_init(s);
-
-@@ -587,12 +587,12 @@ int ZEXPORT deflateParams(strm, level, strategy)
- func = configuration_table[s->level].func;
-
- if ((strategy != s->strategy || func != configuration_table[level].func)
&&
--s->high_water) {
-+s->last_flush != -2) {
- /* Flush the last buffer: */
- int err = deflate(strm, Z_BLOCK);
- if (err == Z_STREAM_ERROR)
- return err;
--if (strm->avail_out == 0)
-+if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead)
- return Z_BUF_ERROR;
- }
- if (s->level != level) {
-diff --git a/zlib.h b/zlib.h
-index 5daf4f28..577d81e3 100644
a/zlib.h
-+++ b/zlib.h
-@@ -712,11 +712,12 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-used to switch between compression and straight copy of the input data, or
-to switch to a different kind of input data requiring a different strategy.
-If the compression approach (which is a function of the level) or the
-- strategy is changed, and if any input has been consumed in a previous
-- deflate() call, then the input available so far is compressed with the old
-- level and strategy using deflate(strm, Z_BLOCK). There are three
approaches
-- for the compression levels 0, 1..3, and 4..9 respectively. The new level
-- and strategy will take effect at the next call of deflate().
-+ strategy is changed, and if there have been any deflate() calls since the
-+ state was initialized or reset, then the input available so far is
-+ compressed with the old level and strategy using deflate(strm, Z_BLOCK).
-+ There are three approaches for the compression levels 0, 1..3, and 4..9
-+ respectively. The new level and strategy will take effect at the next call
-+ of deflate().
-
- If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
-not have enough output space to complete, then the parameter change will
not
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: 4b8cc4d45c80e0d1351cd5bf04795bba4d770db7
Author: Sam James gentoo org>
AuthorDate: Sun Oct 2 00:11:30 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 2 00:13:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b8cc4d4
sys-libs/zlib-ng: drop 2.0.5
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/Manifest | 1 -
sys-libs/zlib-ng/zlib-ng-2.0.5.ebuild | 75 ---
2 files changed, 76 deletions(-)
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index aeda00647854..1eddb8bdf40a 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1,2 +1 @@
-DIST zlib-ng-2.0.5.tar.gz 810110 BLAKE2B
70a7a4a4f5bcc792fcf5f41487160aa15481bc5512ddd567f59ac96ebd1b8ff7c1edb7e5887f16ee502a75fabb36caf88f0d88563a0d860679b0bfd0e0b9f12a
SHA512
a643089a8189bf8bd24d679b84f07ae14932b4d88b88e94c44cca23350d6a9bbdaa411822d3651c2b0bf79f30c9f99514cc252cf9e9ab0b3a840540206466654
DIST zlib-ng-2.0.6.tar.gz 817951 BLAKE2B
52993caadf14817e328b180d728586e1332ea04504288264934ef49441cb8b8c4a2412d4c11d1982f3764fef5e4fb7ebab442b407e57d9d5f08a5b2ed890bba9
SHA512
4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.5.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.0.5.ebuild
deleted file mode 100644
index 35316b265096..
--- a/sys-libs/zlib-ng/zlib-ng-2.0.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Fork of the zlib data compression library"
-HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-#KEYWORDS="~amd64 ~x86"
-
-CPU_USE=(
cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} )
-IUSE="compat ${CPU_USE[@]} test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="compat? ( !sys-libs/zlib )"
-
-src_configure() {
- local mycmakeargs=(
- -DZLIB_COMPAT="$(usex compat)"
- -DZLIB_ENABLE_TESTS="$(usex test)"
- # Unaligned access is controversial and undefined behaviour
- # Let's keep it off for now
- # https://github.com/gentoo/gentoo/pull/17167
- -DWITH_UNALIGNED="OFF"
- )
-
- # The intrinsics options are all defined conditionally, so we need
- # to enable them on/off per-arch here for now.
- if use amd64 || use x86 ; then
- mycmakeargs+=(
- -DWITH_AVX2=$(usex cpu_flags_x86_avx2)
- -DWITH_SSE2=$(usex cpu_flags_x86_sse2)
- -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3)
- -DWITH_SSE4=$(usex cpu_flags_x86_sse4a)
- -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul)
- )
- fi
-
- if use arm || use arm64 ; then
- mycmakeargs+=(
- -DWITH_ACLE=$(usex cpu_flags_arm_crc32)
- -DWITH_NEON=$(usex cpu_flags_arm_neon)
- )
- fi
-
- if use ppc || use ppc64 ; then
- # The POWER8 support is VSX which was introduced
- # VSX2 was introduced with POWER8, so use that as a proxy for it
- mycmakeargs+=(
- -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2)
- )
- fi
-
- # TODO: There's no s390x USE_EXPAND yet
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use compat ; then
- ewarn "zlib-ng is experimental and replacing the system zlib is
dangerous"
- ewarn "Please be careful!"
- ewarn
- ewarn "The following link explains the guarantees (and what is
NOT guaranteed):"
- ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md;
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
commit: 9bc0812587b6b6bdc2a281007d3c7a62d8c20d58
Author: Sam James gentoo org>
AuthorDate: Sun Oct 2 00:12:04 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 2 00:13:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bc08125
sys-libs/zlib-ng: update EAPI 7 -> 8
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
index 5abbd8a2ea61..4347d46652d3 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
CPU_USE=(
cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} )
IUSE="compat ${CPU_USE[@]} test"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: a45d9ec6a1ebfa9e49ad1f0842f54128e54c8f03
Author: Sam James gentoo org>
AuthorDate: Fri Sep 23 02:02:45 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 23 02:08:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a45d9ec6
sys-libs/zlib: drop 1.2.11-r4, 1.2.11-r5, 1.2.12-r2
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/Manifest | 1 -
sys-libs/zlib/zlib-1.2.11-r4.ebuild | 168 ---
sys-libs/zlib/zlib-1.2.11-r5.ebuild | 169 ---
sys-libs/zlib/zlib-1.2.12-r2.ebuild | 196
4 files changed, 534 deletions(-)
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index fda947e4d9d9..64bfa1e36767 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,5 +1,4 @@
DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B
fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274
SHA512
14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
-DIST zlib-1.2.11.tar.gz 607698 BLAKE2B
6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7
SHA512
73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
DIST zlib-1.2.12.tar.gz 1490071 BLAKE2B
76e7b26f8dc761b0eae6276cc32bc36fa74a88197699c95d158c1548f97b80db5e39d21144ecd6ee3eb90c42730aa5f387f9952d9a3f0930b56e9dfcd12f1e67
SHA512
cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
DIST zlib-1.2.12.tar.gz.asc 235 BLAKE2B
bb1efc89b10b894ebc8e8008ee3e98104348f197fae54d298d62057a2d8b8d7246de937962b531189f80ad64a803112300a73862cba121cbf6a6d5ac5f9bc40c
SHA512
5c1144371a83b83f9f1d008aa9297e23c0db992cab6c4a8966f9320e70c6186867d62753511d6a663b0fe181cd37fe256c53586358a42ea348ccc0747b1a7153
DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B
885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a
SHA512
e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
diff --git a/sys-libs/zlib/zlib-1.2.11-r4.ebuild
b/sys-libs/zlib/zlib-1.2.11-r4.ebuild
deleted file mode 100644
index f81dba33f73c..
--- a/sys-libs/zlib/zlib-1.2.11-r4.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-AUTOTOOLS_AUTO_DEPEND="no"
-inherit autotools multilib-minimal usr-ldscript
-
-CYGWINPATCHES=(
-
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch
-> ${PN}-1.2.11-cygwin-gzopen_w.patch"
-
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch
-> ${PN}-1.2.7-cygwin-minizip.patch"
-)
-
-DESCRIPTION="Standard (de)compression library"
-HOMEPAGE="https://zlib.net/;
-SRC_URI="https://zlib.net/${P}.tar.gz
- https://zlib.net/fossils/${P}.tar.gz
- http://www.gzip.org/zlib/${P}.tar.gz
- http://www.zlib.net/current/beta/${P}.tar.gz
- elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
-
-LICENSE="ZLIB"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="minizip static-libs"
-
-BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
-# See #309623 for libxml2
-RDEPEND="
- ! " from the array
- eapply -p2 "${DISTDIR}/${p#*> }"
- done
- fi
-
- if use minizip ; then
- cd contrib/minizip || die
- eautoreconf
- fi
-
- case ${CHOST} in
- *-cygwin*)
- # do not use _wopen, is a mingw symbol only
- sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die
- # zlib1.dll is the mingw name, need cygz.dll
- # cygz.dll is loaded by toolchain, put into subdir
- sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc ||
die
- ;;
- esac
-
- case ${CHOST} in
- *-mingw*|mingw*|*-cygwin*)
- # uses preconfigured Makefile rather than configure script
- multilib_copy_sources
- ;;
- esac
-}
-
-echoit() { echo "$@"; "$@"; }
-
-multilib_src_configure() {
- case ${CHOST} in
- *-mingw*|mingw*|*-cygwin*)
- ;;
- *)
- local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub
"${CHOST}" | cut -d- -f3) #347167
-
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 101478df76bc57e606d28b53f9b6a6a58dd320c9
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Aug 24 05:27:58 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Aug 24 05:27:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=101478df
sys-libs/zlib: sparc stable wrt bug #866241
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-libs/zlib/zlib-1.2.12-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
index 9bce5cd89c31..a520842c5ff2 100644
--- a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 8f5c43aaad555c623b9252b1d89392f5a757717e
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Aug 24 05:27:04 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Aug 24 05:27:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f5c43aa
sys-libs/zlib: ppc stable wrt bug #866241
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-libs/zlib/zlib-1.2.12-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
index 5dca09c22e52..9bce5cd89c31 100644
--- a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 5b2b9d1ee09c1fd4458eb1b57a53ba1564769e96
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Aug 24 04:01:24 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Aug 24 04:01:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b2b9d1e
sys-libs/zlib: Stabilize 1.2.12-r3 hppa, #866241
Signed-off-by: Arthur Zamarin gentoo.org>
sys-libs/zlib/zlib-1.2.12-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
index 53a51be8b510..6c59e9237398 100644
--- a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 32f8ee857bac32cc32c8179d1f82556ad3d0f7a6
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Aug 24 04:01:22 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Aug 24 04:01:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f8ee85
sys-libs/zlib: Stabilize 1.2.12-r3 arm64, #866241
Signed-off-by: Arthur Zamarin gentoo.org>
sys-libs/zlib/zlib-1.2.12-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
index 6f39a0c0ee07..27d4008a5fa7 100644
--- a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: dde914be7044cf54726d4c41e9b0c8b3c812750b
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Aug 24 04:01:25 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Aug 24 04:01:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde914be
sys-libs/zlib: Stabilize 1.2.12-r3 ppc64, #866241
Signed-off-by: Arthur Zamarin gentoo.org>
sys-libs/zlib/zlib-1.2.12-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
index 6c59e9237398..5dca09c22e52 100644
--- a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 8758fe2162d59b299c5414fa59af3e39b9a23952
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Aug 24 04:01:23 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Aug 24 04:01:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8758fe21
sys-libs/zlib: Stabilize 1.2.12-r3 arm, #866241
Signed-off-by: Arthur Zamarin gentoo.org>
sys-libs/zlib/zlib-1.2.12-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
index 27d4008a5fa7..53a51be8b510 100644
--- a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 1f1e4cbf4afa356abb29f7897376c4a52ce21b2d
Author: Sam James gentoo org>
AuthorDate: Wed Aug 24 01:30:04 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 24 01:30:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f1e4cbf
sys-libs/zlib: Stabilize 1.2.12-r3 x86, #866241
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.12-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
index 046cbad49be7..6f39a0c0ee07 100644
--- a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 20d515e617de1a77fea93a43fb7e5151a35fb637
Author: Sam James gentoo org>
AuthorDate: Wed Aug 24 01:29:40 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 24 01:29:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d515e6
sys-libs/zlib: Stabilize 1.2.12-r3 amd64, #866241
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.12-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
index 1117652b5367..046cbad49be7 100644
--- a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/files/, sys-libs/zlib/
commit: 05fd542aa1119b54b8ba2bb79817f7016d0cacad
Author: Sam James gentoo org>
AuthorDate: Tue Aug 16 00:52:04 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Aug 16 00:52:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05fd542a
sys-libs/zlib: patch CVE-2022-37434
(includes the additional fix which curl exposed too)
Bug: https://bugs.gentoo.org/863851
Signed-off-by: Sam James gentoo.org>
.../zlib/files/zlib-1.2.12-CVE-2022-37434.patch| 55 ++
sys-libs/zlib/zlib-1.2.12-r3.ebuild| 199 +
2 files changed, 254 insertions(+)
diff --git a/sys-libs/zlib/files/zlib-1.2.12-CVE-2022-37434.patch
b/sys-libs/zlib/files/zlib-1.2.12-CVE-2022-37434.patch
new file mode 100644
index ..1ef3b909e435
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.12-CVE-2022-37434.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/863851
+https://github.com/madler/zlib/commit/eff308af425b67093bab25f80f1ae950166bece1
+https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d
(see https://github.com/curl/curl/issues/9271)
+
+From eff308af425b67093bab25f80f1ae950166bece1 Mon Sep 17 00:00:00 2001
+From: Mark Adler
+Date: Sat, 30 Jul 2022 15:51:11 -0700
+Subject: [PATCH] Fix a bug when getting a gzip header extra field with
+ inflate().
+
+If the extra field was larger than the space the user provided with
+inflateGetHeader(), and if multiple calls of inflate() delivered
+the extra header data, then there could be a buffer overflow of the
+provided space. This commit assures that provided space is not
+exceeded.
+--- a/inflate.c
b/inflate.c
+@@ -763,9 +763,10 @@ int flush;
+ copy = state->length;
+ if (copy > have) copy = have;
+ if (copy) {
++len = state->head->extra_len - state->length;
+ if (state->head != Z_NULL &&
+-state->head->extra != Z_NULL) {
+-len = state->head->extra_len - state->length;
++state->head->extra != Z_NULL &&
++len < state->head->extra_max) {
+ zmemcpy(state->head->extra + len, next,
+ len + copy > state->head->extra_max ?
+ state->head->extra_max - len : copy);
+
+From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001
+From: Mark Adler
+Date: Mon, 8 Aug 2022 10:50:09 -0700
+Subject: [PATCH] Fix extra field processing bug that dereferences NULL
+ state->head.
+
+The recent commit to fix a gzip header extra field processing bug
+introduced the new bug fixed here.
+--- a/inflate.c
b/inflate.c
+@@ -763,10 +763,10 @@ int flush;
+ copy = state->length;
+ if (copy > have) copy = have;
+ if (copy) {
+-len = state->head->extra_len - state->length;
+ if (state->head != Z_NULL &&
+ state->head->extra != Z_NULL &&
+-len < state->head->extra_max) {
++(len = state->head->extra_len - state->length) <
++state->head->extra_max) {
+ zmemcpy(state->head->extra + len, next,
+ len + copy > state->head->extra_max ?
+ state->head->extra_max - len : copy);
+
diff --git a/sys-libs/zlib/zlib-1.2.12-r3.ebuild
b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
new file mode 100644
index ..1117652b5367
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.12-r3.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2022 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.
+AUTOTOOLS_AUTO_DEPEND="no"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
+inherit autotools multilib-minimal usr-ldscript verify-sig
+
+CYGWINPATCHES=(
+
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch
-> ${PN}-1.2.11-cygwin-gzopen_w.patch"
+
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch
-> ${PN}-1.2.7-cygwin-minizip.patch"
+)
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="https://zlib.net/;
+SRC_URI="https://zlib.net/${P}.tar.gz
+ https://zlib.net/fossils/${P}.tar.gz
+ https://www.gzip.org/zlib/${P}.tar.gz
+ https://www.zlib.net/current/beta/${P}.tar.gz
+ verify-sig? ( https://zlib.net/${P}.tar.gz.asc )
+ elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
+
+LICENSE="ZLIB"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: ab4a524962c5c7975af2586332f52cee34211529
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Jun 24 09:12:03 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Jun 24 09:12:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab4a5249
sys-libs/zlib: Stabilize 1.2.12-r2 hppa, #836303
Signed-off-by: Arthur Zamarin gentoo.org>
sys-libs/zlib/zlib-1.2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
index 8a79a818b45d..5741a146d6fb 100644
--- a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: e48884535cda9877497c855df0f205646ccd8e3a
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Jun 9 07:38:04 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Jun 9 07:39:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4888453
sys-libs/zlib: x86 stable wrt bug #836303
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-libs/zlib/zlib-1.2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
index df99ac787fee..8a79a818b45d 100644
--- a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: f3273d931ec9977de1fc373486150f5fd1858873
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Jun 9 07:35:58 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Jun 9 07:35:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3273d93
sys-libs/zlib: arm64 stable wrt bug #836303
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm64"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-libs/zlib/zlib-1.2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
index b907fb893846..df99ac787fee 100644
--- a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 327054fb1efd720abb9b815100288e8653f37f81
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Jun 9 07:35:20 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Jun 9 07:35:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=327054fb
sys-libs/zlib: arm stable wrt bug #836303
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-libs/zlib/zlib-1.2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
index 6dc2610894f9..b907fb893846 100644
--- a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 4af72ba5784d516db5e480665e3cf3dbc1ebbaca
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Jun 9 07:32:58 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Jun 9 07:32:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af72ba5
sys-libs/zlib: amd64 stable wrt bug #836303
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-libs/zlib/zlib-1.2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
index 69c5c35989bf..6dc2610894f9 100644
--- a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 52215224abab986e58b6019be2fda0b7963e93fb
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jun 8 08:46:03 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jun 8 08:46:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52215224
sys-libs/zlib: sparc stable wrt bug #836303
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-libs/zlib/zlib-1.2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
index 985f76286a81..69c5c35989bf 100644
--- a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 8c02fa9bea3a81390ce23b6d3a80fd67197d99da
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jun 8 08:45:14 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jun 8 08:45:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c02fa9b
sys-libs/zlib: ppc64 stable wrt bug #836303
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-libs/zlib/zlib-1.2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
index bfa312aef0a8..985f76286a81 100644
--- a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: fb5b3a4890c9ce048a6d05018fcd3f69c2d60b3c
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jun 8 08:44:08 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jun 8 08:44:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb5b3a48
sys-libs/zlib: ppc stable wrt bug #836303
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-libs/zlib/zlib-1.2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
index 403a4bf6074b..bfa312aef0a8 100644
--- a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
RDEPEND="!sys-libs/zlib-ng[compat]"
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 59c7b357750ff7fac1100d619e96b05f62db43f4
Author: Sam James gentoo org>
AuthorDate: Sun Apr 17 17:07:45 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 17 17:12:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59c7b357
sys-libs/zlib: drop 1.2.12-r1
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.12-r1.ebuild | 188
1 file changed, 188 deletions(-)
diff --git a/sys-libs/zlib/zlib-1.2.12-r1.ebuild
b/sys-libs/zlib/zlib-1.2.12-r1.ebuild
deleted file mode 100644
index 425c0f30bdb5..
--- a/sys-libs/zlib/zlib-1.2.12-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-AUTOTOOLS_AUTO_DEPEND="no"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
-inherit autotools multilib-minimal usr-ldscript verify-sig
-
-CYGWINPATCHES=(
-
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch
-> ${PN}-1.2.11-cygwin-gzopen_w.patch"
-
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch
-> ${PN}-1.2.7-cygwin-minizip.patch"
-)
-
-DESCRIPTION="Standard (de)compression library"
-HOMEPAGE="https://zlib.net/;
-SRC_URI="https://zlib.net/${P}.tar.gz
- https://zlib.net/fossils/${P}.tar.gz
- https://www.gzip.org/zlib/${P}.tar.gz
- https://www.zlib.net/current/beta/${P}.tar.gz
- verify-sig? ( https://zlib.net/${P}.tar.gz.asc )
- elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
-
-LICENSE="ZLIB"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="minizip static-libs"
-
-RDEPEND="!sys-libs/zlib-ng[compat]"
-DEPEND="${RDEPEND}"
-BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )
- verify-sig? ( sec-keys/openpgp-keys-madler )"
-
-PATCHES=(
- # bug #658536
- "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch
-
- # bug #831628
- "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch
-
- # Fix broken CC logic
- "${FILESDIR}"/${PN}-1.2.12-fix-CC-logic-in-configure.patch
-)
-
-src_prepare() {
- default
-
- if use elibc_Cygwin ; then
- local p
- for p in "${CYGWINPATCHES[@]}" ; do
- # Strip out the "... -> " from the array
- eapply -p2 "${DISTDIR}/${p#*> }"
- done
- fi
-
- if use minizip ; then
- cd contrib/minizip || die
- eautoreconf
- fi
-
- case ${CHOST} in
- *-cygwin*)
- # Do not use _wopen, it's a mingw-only symbol
- sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die
-
- # zlib1.dll is the mingw name, need cygz.dll
- # cygz.dll is loaded by toolchain, put into subdir
- sed -i -e 's|zlib1.dll|win32/cygz.dll|'
win32/Makefile.gcc || die
-
- ;;
- esac
-
- case ${CHOST} in
- *-mingw*|mingw*|*-cygwin*)
- # Uses preconfigured Makefile rather than configure
script
- multilib_copy_sources
-
- ;;
- esac
-}
-
-echoit() { echo "$@"; "$@"; }
-
-multilib_src_configure() {
- case ${CHOST} in
- *-mingw*|mingw*|*-cygwin*)
- ;;
-
- *)
- # bug #347167
- local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub
"${CHOST}" | cut -d- -f3)
-
- local myconf=(
- --shared
- --prefix="${EPREFIX}/usr"
- --libdir="${EPREFIX}/usr/$(get_libdir)"
- ${uname:+--uname=${uname}}
- )
-
- # Not an autoconf script, so can't use econf
- echoit "${S}"/configure "${myconf[@]}" || die
-
- ;;
- esac
-
- if use minizip ; then
- local minizipdir="contrib/minizip"
- mkdir -p "${BUILD_DIR}/${minizipdir}" || die
-
- cd ${minizipdir} || die
- ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable
static-libs static)
- fi
-}
-
-multilib_src_compile() {
- case ${CHOST} in
- *-mingw*|mingw*|*-cygwin*)
- emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
- sed \
- -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
- -e
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: 42d4eab8099669d1832617f58e07fe3de6244757
Author: Jakov Smolić gentoo org>
AuthorDate: Mon Apr 4 13:43:08 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Apr 4 20:07:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d4eab8
sys-libs/zlib: Update archive URL
1.2.11 tarball is not available at https://zlib.net/${P}, so fetch it
from https://zlib.net/fossils instead
```
>>> Downloading 'https://zlib.net/zlib-1.2.11.tar.gz'
--2022-04-04 13:07:42-- https://zlib.net/zlib-1.2.11.tar.gz
Resolving zlib.net... 85.187.148.2
Connecting to zlib.net|85.187.148.2|:443... connected.
HTTP request sent, awaiting response... 404 Not Found
```
Closes: https://github.com/gentoo/gentoo/pull/24900
Signed-off-by: Jakov Smolić gentoo.org>
sys-libs/zlib/zlib-1.2.11-r4.ebuild | 3 ++-
sys-libs/zlib/zlib-1.2.11-r5.ebuild | 1 +
sys-libs/zlib/zlib-1.2.12-r1.ebuild | 1 +
sys-libs/zlib/zlib-1.2.12-r2.ebuild | 1 +
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/sys-libs/zlib/zlib-1.2.11-r4.ebuild
b/sys-libs/zlib/zlib-1.2.11-r4.ebuild
index bc2fe9834ee2..f81dba33f73c 100644
--- a/sys-libs/zlib/zlib-1.2.11-r4.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,6 +14,7 @@ CYGWINPATCHES=(
DESCRIPTION="Standard (de)compression library"
HOMEPAGE="https://zlib.net/;
SRC_URI="https://zlib.net/${P}.tar.gz
+ https://zlib.net/fossils/${P}.tar.gz
http://www.gzip.org/zlib/${P}.tar.gz
http://www.zlib.net/current/beta/${P}.tar.gz
elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
diff --git a/sys-libs/zlib/zlib-1.2.11-r5.ebuild
b/sys-libs/zlib/zlib-1.2.11-r5.ebuild
index 5173a430e69f..c24cdc4a3552 100644
--- a/sys-libs/zlib/zlib-1.2.11-r5.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r5.ebuild
@@ -14,6 +14,7 @@ CYGWINPATCHES=(
DESCRIPTION="Standard (de)compression library"
HOMEPAGE="https://zlib.net/;
SRC_URI="https://zlib.net/${P}.tar.gz
+ https://zlib.net/fossils/${P}.tar.gz
http://www.gzip.org/zlib/${P}.tar.gz
http://www.zlib.net/current/beta/${P}.tar.gz
elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
diff --git a/sys-libs/zlib/zlib-1.2.12-r1.ebuild
b/sys-libs/zlib/zlib-1.2.12-r1.ebuild
index 267b24c0d148..425c0f30bdb5 100644
--- a/sys-libs/zlib/zlib-1.2.12-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r1.ebuild
@@ -15,6 +15,7 @@ CYGWINPATCHES=(
DESCRIPTION="Standard (de)compression library"
HOMEPAGE="https://zlib.net/;
SRC_URI="https://zlib.net/${P}.tar.gz
+ https://zlib.net/fossils/${P}.tar.gz
https://www.gzip.org/zlib/${P}.tar.gz
https://www.zlib.net/current/beta/${P}.tar.gz
verify-sig? ( https://zlib.net/${P}.tar.gz.asc )
diff --git a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
index ca6e222f45cd..166bfbad0465 100644
--- a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
@@ -16,6 +16,7 @@ CYGWINPATCHES=(
DESCRIPTION="Standard (de)compression library"
HOMEPAGE="https://zlib.net/;
SRC_URI="https://zlib.net/${P}.tar.gz
+ https://zlib.net/fossils/${P}.tar.gz
https://www.gzip.org/zlib/${P}.tar.gz
https://www.zlib.net/current/beta/${P}.tar.gz
verify-sig? ( https://zlib.net/${P}.tar.gz.asc )
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
commit: a0cdc4e917d4cae1aad522537a51e17557cfc722
Author: Sam James gentoo org>
AuthorDate: Thu Mar 31 00:20:44 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Mar 31 00:20:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0cdc4e9
sys-libs/zlib: mention upstream 'develop' branch in comment
Signed-off-by: Sam James gentoo.org>
sys-libs/zlib/zlib-1.2.12-r2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
index 6aa6f8503bc7..ca6e222f45cd 100644
--- a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+# Worth keeping an eye on 'develop' branch upstream for possible backports.
AUTOTOOLS_AUTO_DEPEND="no"
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
inherit autotools multilib-minimal usr-ldscript verify-sig
[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/files/, sys-libs/zlib/
commit: 37f4162df7f95c4c101ac94792d50894560b994a
Author: Sam James gentoo org>
AuthorDate: Thu Mar 31 00:18:55 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Mar 31 00:19:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f4162d
sys-libs/zlib: backport CRC fix
Would return bad results on bad input.
Closes: https://bugs.gentoo.org/836370
Signed-off-by: Sam James gentoo.org>
.../zlib/files/zlib-1.2.12-CRC-buggy-input.patch | 50 ++
.../zlib-1.2.12-use-LDFLAGS-in-configure.patch | 71
sys-libs/zlib/zlib-1.2.12-r2.ebuild| 194 +
3 files changed, 315 insertions(+)
diff --git a/sys-libs/zlib/files/zlib-1.2.12-CRC-buggy-input.patch
b/sys-libs/zlib/files/zlib-1.2.12-CRC-buggy-input.patch
new file mode 100644
index ..083634929bbe
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.12-CRC-buggy-input.patch
@@ -0,0 +1,50 @@
+https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2
+https://github.com/madler/zlib/issues/613
+https://bugs.gentoo.org/836370
+
+From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001
+From: Mark Adler
+Date: Wed, 30 Mar 2022 11:14:53 -0700
+Subject: [PATCH] Correct incorrect inputs provided to the CRC functions.
+
+The previous releases of zlib were not sensitive to incorrect CRC
+inputs with bits set above the low 32. This commit restores that
+behavior, so that applications with such bugs will continue to
+operate as before.
+--- a/crc32.c
b/crc32.c
+@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
+
+ /* Pre-condition the CRC */
+-crc ^= 0x;
++crc = (~crc) & 0x;
+
+ /* Compute the CRC up to a word boundary. */
+ while (len && ((z_size_t)buf & 7) != 0) {
+@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
+
+ /* Pre-condition the CRC */
+-crc ^= 0x;
++crc = (~crc) & 0x;
+
+ #ifdef W
+
+@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+ #ifdef DYNAMIC_CRC_TABLE
+ once(, make_crc_table);
+ #endif /* DYNAMIC_CRC_TABLE */
+-return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
++return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0x);
+ }
+
+ /* =
*/
+@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op)
+ uLong crc2;
+ uLong op;
+ {
+-return multmodp(op, crc1) ^ crc2;
++return multmodp(op, crc1) ^ (crc2 & 0x);
+ }
+
diff --git a/sys-libs/zlib/files/zlib-1.2.12-use-LDFLAGS-in-configure.patch
b/sys-libs/zlib/files/zlib-1.2.12-use-LDFLAGS-in-configure.patch
new file mode 100644
index ..752a473eac22
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.12-use-LDFLAGS-in-configure.patch
@@ -0,0 +1,71 @@
+https://github.com/madler/zlib/pull/599
+
+From 37c9730ba474d274f4cc6a974943eef95087b9f6 Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Tue, 8 Mar 2022 22:38:47 -0800
+Subject: [PATCH] configure: Pass LDFLAGS to link tests
+
+LDFLAGS can contain critical flags without which linking wont succeed
+therefore ensure that all configure tests involving link time checks are
+using LDFLAGS on compiler commandline along with CFLAGS to ensure the
+tests perform correctly. Without this some tests may fail resulting in
+wrong confgure result, ending in miscompiling the package
+
+Signed-off-by: Khem Raj
+--- a/configure
b/configure
+@@ -410,7 +410,7 @@ if test $shared -eq 1; then
+ echo Checking for shared library support... | tee -a configure.log
+ # we must test in two steps (cc then ld), required at least on SunOS 4.x
+ if try $CC -w -c $SFLAGS $test.c &&
+- try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
++ try $LDSHARED $SFLAGS $LDFLAGS -o $test$shared_ext $test.o; then
+ echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log
+ elif test -z "$old_cc" -a -z "$old_cflags"; then
+ echo No shared library support. | tee -a configure.log
+@@ -492,7 +492,7 @@ int main(void) {
+ }
+ EOF
+ fi
+- if try $CC $CFLAGS -o $test $test.c; then
++ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
+ sizet=`./$test`
+ echo "Checking for a pointer-size integer type..." $sizet"." | tee -a
configure.log
+ else
+@@ -530,7 +530,7 @@ int main(void) {
+ return 0;
+ }
+ EOF
+- if try $CC $CFLAGS -o $test $test.c; then
++ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
+ echo "Checking for fseeko... Yes." | tee -a configure.log
+ else
+ CFLAGS="${CFLAGS} -DNO_FSEEKO"
+@@ -547,7 +547,7 @@ cat > $test.c <
+ int main() { return strlen(strerror(errno)); }
+ EOF
+-if try $CC $CFLAGS -o $test $test.c; then
++if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
+ echo "Checking for strerror... Yes." | tee -a configure.log
+ else
+ CFLAGS="${CFLAGS} -DNO_STRERROR"
+@@
