commit: 1ed32a5e54cce24ce99cfb3e5a4995bd613c60e6 Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com> AuthorDate: Sat Jun 17 19:04:45 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Tue Sep 19 13:36:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed32a5e
net-misc/zsync: Fix error: type specifier missing, defaults to int Closes: https://bugs.gentoo.org/898062 Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31520 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../zsync/files/zsync-0.6.2-musl-off_t-fix.patch | 16 +++++++ net-misc/zsync/zsync-0.6.2-r3.ebuild | 49 ++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/net-misc/zsync/files/zsync-0.6.2-musl-off_t-fix.patch b/net-misc/zsync/files/zsync-0.6.2-musl-off_t-fix.patch new file mode 100644 index 000000000000..277f23b425cc --- /dev/null +++ b/net-misc/zsync/files/zsync-0.6.2-musl-off_t-fix.patch @@ -0,0 +1,16 @@ +diff --git a/libzsync/sha1.h b/libzsync/sha1.h +index 3946505..8840570 100644 +--- a/libzsync/sha1.h ++++ b/libzsync/sha1.h +@@ -11,9 +11,10 @@ + + #include "config.h" + +-#ifdef HAVE_INTTYPES_H ++#if defined(HAVE_INTTYPES_H) && defined(__GLIBC__) + #include <inttypes.h> + #else ++#include <stdint.h> + #include <sys/types.h> + #endif + diff --git a/net-misc/zsync/zsync-0.6.2-r3.ebuild b/net-misc/zsync/zsync-0.6.2-r3.ebuild new file mode 100644 index 000000000000..08e57393fa50 --- /dev/null +++ b/net-misc/zsync/zsync-0.6.2-r3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +ZLIB_PV=1.2.3 +ZLIB_P="zlib-${ZLIB_PV}" + +DESCRIPTION="Partial/differential file download client over HTTP using the rsync algorithm" +HOMEPAGE="http://zsync.moria.org.uk/"; +SRC_URI=" + http://zsync.moria.org.uk/download/${P}.tar.bz2 + http://www.gzip.org/zlib/${ZLIB_P}.tar.bz2 + http://www.zlib.net/${ZLIB_P}.tar.bz2"; +ZLIB_S="${WORKDIR}/${ZLIB_P}" + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.2-musl-off_t-fix.patch +) + +src_prepare() { + default + # Move old zlib-1.2.11 out the way + mv "${S}"/zlib zlib-1.2.11-modified || die + + cd "${ZLIB_S}" || die + # I am not sure how many other zlib patches we will need to port as well + # This covers the security vuln in 1.2.11 + eapply "${FILESDIR}"/${P}-${ZLIB_P}-support.patch + rm Makefile || die + + cd "${S}" || die + cp -a "${ZLIB_S}" "${ZLIB_P}-modified" || die + ln -s "${ZLIB_P}-modified" zlib || die + + eautoreconf +} + +src_install() { + dobin zsync zsyncmake + dodoc NEWS README + doman doc/zsync.1 doc/zsyncmake.1 +}
