diff options
author | Fabian Groffen <grobian@gentoo.org> | 2019-03-24 11:12:25 +0100 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2019-03-24 11:12:25 +0100 |
commit | 14fe54c2e0f946387ad635a54cdd76be6777dc1e (patch) | |
tree | 0a9c532292b76aee4fed6d4f81b877b1ecad2cab /sys-libs | |
parent | sys-libs/ncurses: align with gx86 (diff) | |
download | prefix-14fe54c2e0f946387ad635a54cdd76be6777dc1e.tar.gz prefix-14fe54c2e0f946387ad635a54cdd76be6777dc1e.tar.bz2 prefix-14fe54c2e0f946387ad635a54cdd76be6777dc1e.zip |
sys-libs/zlib: sync
Package-Manager: Portage-2.3.62-prefix, Repoman-2.3.12
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/zlib/Manifest | 2 | ||||
-rw-r--r-- | sys-libs/zlib/files/zlib-1.2.11-minizip-drop-crypt-header.patch | 38 | ||||
-rw-r--r-- | sys-libs/zlib/zlib-1.2.11-r2.ebuild (renamed from sys-libs/zlib/zlib-1.2.11.ebuild) | 36 |
3 files changed, 64 insertions, 12 deletions
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest index c6c0351ed2..b81b8a96b5 100644 --- a/sys-libs/zlib/Manifest +++ b/sys-libs/zlib/Manifest @@ -1,3 +1,3 @@ DIST 1.2.11-gzopen_w.patch 1170 SHA256 2eea64808bc6edd2f12a7f7ef66381a73a546fa31ec9f95e5305cf51f3db3d86 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a WHIRLPOOL f7ac23bd77c2de46877788733ccea829a70c3fc6edf2b107c2b1b6542264be01252d44d25384c1844a60691a1d76434d3aa5244377afb0ea4d940c28545ad724 DIST 1.2.7-minizip-cygwin.patch 2626 SHA256 0352e8b84ea4c9c8e3de1817fe42db6a729cce834d5784b399974418ec0e44e8 SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7 WHIRLPOOL ebe80cee80ba6b6fee91ead27e3a5fd3988de918ab50d5567ec567e66a42a1de36271cb62a8c2b7bb7e391b6b086db4fc493e1eaa06bd8ff671528407d3458ef -DIST zlib-1.2.11.tar.gz 607698 SHA256 c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae WHIRLPOOL 4263b67dd133e9eb6a837f270a53e6083af871993c52f89a21135f188f83c58646e7aa5882d62f35370032afe7a9964dd2796c25d104b8a2a70b293a5e31f72a +DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae diff --git a/sys-libs/zlib/files/zlib-1.2.11-minizip-drop-crypt-header.patch b/sys-libs/zlib/files/zlib-1.2.11-minizip-drop-crypt-header.patch new file mode 100644 index 0000000000..2e0a93e919 --- /dev/null +++ b/sys-libs/zlib/files/zlib-1.2.11-minizip-drop-crypt-header.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/658536 +https://github.com/madler/zlib/pull/229 + +From e490ddad3091574a0c2e3b5a66a8fee9a7ab212f Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <praiskup@redhat.com> +Date: Sun, 19 Feb 2017 16:42:12 +0100 +Subject: [PATCH] minizip: don't install crypt.h + +People did mistakenly or unintentionally include crypt.h before, +don't install this internal header from now. +--- + contrib/minizip/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am +index d343011ebc3b..4f46610238d2 100644 +--- a/contrib/minizip/Makefile.am ++++ b/contrib/minizip/Makefile.am +@@ -26,13 +26,15 @@ libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz + + minizip_includedir = $(includedir)/minizip + minizip_include_HEADERS = \ +- crypt.h \ + ioapi.h \ + mztools.h \ + unzip.h \ + zip.h \ + ${iowin32_h} + ++noinst_HEADERS = \ ++ crypt.h ++ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = minizip.pc + +-- +2.17.1 + diff --git a/sys-libs/zlib/zlib-1.2.11.ebuild b/sys-libs/zlib/zlib-1.2.11-r2.ebuild index 215b7e22e1..dae3b48fe6 100644 --- a/sys-libs/zlib/zlib-1.2.11.ebuild +++ b/sys-libs/zlib/zlib-1.2.11-r2.ebuild @@ -1,20 +1,25 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI="5" AUTOTOOLS_AUTO_DEPEND="no" inherit autotools toolchain-funcs multilib multilib-minimal +CYGWINPATCHES=( + "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch" + "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch" +) + DESCRIPTION="Standard (de)compression library" -HOMEPAGE="http://www.zlib.net/" -SRC_URI="http://zlib.net/${P}.tar.gz +HOMEPAGE="https://zlib.net/" +SRC_URI="https://zlib.net/${P}.tar.gz http://www.gzip.org/zlib/${P}.tar.gz - http://www.zlib.net/current/beta/${P}.tar.gz" + http://www.zlib.net/current/beta/${P}.tar.gz + elibc_Cygwin? ( ${CYGWINPATCHES[*]} )" LICENSE="ZLIB" -SLOT="0" +SLOT="0/1" # subslot = SONAME KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="minizip static-libs" @@ -26,9 +31,19 @@ RDEPEND="abi_x86_32? ( !<dev-libs/libxml2-2.7.7" #309623 src_prepare() { + epatch "${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch + epatch "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch #658536 + + local p + use elibc_Cygwin && + for p in "${CYGWINPATCHES[@]}"; do + epatch "${DISTDIR}/${p##*/}" + done + if use minizip ; then - cd contrib/minizip || die + pushd contrib/minizip >/dev/null || die eautoreconf + popd >/dev/null || die fi # epatch "${FILESDIR}"/${PN}-1.2.7-aix-soname.patch #213277 @@ -37,8 +52,6 @@ src_prepare() { *-cygwin*) # do not use _wopen, is a mingw symbol only sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h - # do not export gzopen_w, is a mingw symbol only - sed -i -e '/gzopen_w/d' win32/zlib.def || 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 @@ -113,7 +126,8 @@ multilib_src_install() { LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ INCLUDE_PATH="${ED}/usr/include" \ SHARED_MODE=1 - insinto /usr/share/pkgconfig + # overwrites zlib.pc created from win32/Makefile.gcc #620136 + insinto /usr/$(get_libdir)/pkgconfig doins zlib.pc ;; |