gentoo auto-resync : 19:09:2023 - 17:09:22

3 files changed, 67 insertions, 0 deletions

diff --git a/net-misc/zsync/Manifest b/net-misc/zsync/Manifest
index d7457bbc34d8..74f5ab9486d1 100644
--- a/net-misc/zsync/Manifest
+++ b/net-misc/zsync/Manifest
@@ -1,5 +1,7 @@
+AUX zsync-0.6.2-musl-off_t-fix.patch 326 BLAKE2B 9907bac0ca55ebae23318555a0b150fb780049e8843070280158b7a4402c0b4c61befeeb457d1348b7bc0378007986e556c8129a0ec060589b72e40ccad0988f SHA512 f7d64eef956d6afb7018dbd368b4aeb63a0a14c7ba44a60153ce64a12a494463dc94c1325bdf8eac38ad2ac41166aaba80ea84f10ae4e68bf506b9c19407406d
 AUX zsync-0.6.2-zlib-1.2.3-support.patch 7069 BLAKE2B 841778a6495e1e0853965b8e7c6b8f2df51d98e73806f78197ac147a9ed57331e9b13d17dbc92f13c0dbc6887d145946ce5dcf769d51234aac9d40ade2d4fe7a SHA512 b572510cb135f97d63df6d49e3f07ce91c30926c91d1096f73d4577be754bcb37c8106ac51a1a0a651d9e77b971b4fdbdc82380b081b2065183ffa95930bcd47
 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2
 DIST zsync-0.6.2.tar.bz2 245592 BLAKE2B 9e5a7538a2268d4d3042db44722546d2e76d69d28bd965a3674bf517b12429c4ac6dea86b022047d635163bfd7e71d7e332b5a831cbee7db2544b9ed56d3a4ee SHA512 56437594831f2320c532759805b5c51116c53c8848f14b54cfd9b76676d1d061abe7fc914264f496ed1c7922fbbd5b884166c855a2fb9eb1285f216e478c5f0d
 EBUILD zsync-0.6.2-r2.ebuild 1078 BLAKE2B 15822b79f5e8a7c46624f8a12c7f466264689b609899af6a9d819062f1d4ef549c0267f5a02469f2c2648442c75f49c0971df59dde286680302ffff0ab6e3bb4 SHA512 8d4fd032dca7d9bb4de29aff16297ccca060c92fbd66d7bf81ae2612d7e888c04abc2e6e5847811c07801f4e9703bbdd6f9aa185d62ca9badc3c306f78564e61
+EBUILD zsync-0.6.2-r3.ebuild 1143 BLAKE2B 589c2168f69913a69414eaf584af3c7fc2af0091fac675b8cc2c4dc824ac3d12e6c080ffaf3a59b8fbbe3ff74def28383c7e2df50339be614e91f3506d6e1651 SHA512 2c63cf82ab11b6a074d43892ebc45c61534b9d8903495aeb2f50690149e782506062b07f0c6015fcddd4b9314a456d4e3cb38e862ebc349a056564062eeffe1b
 MISC metadata.xml 1324 BLAKE2B 6a0cf68e98964abcd423f9d5d9e293c5d4c152b1ed2fc98ab805927d2f0dcdda6a07e2a16bbe590bbbe23590e1fae99e4c618680d4db3864d7cec20b175a6656 SHA512 99151fb2267583e7f3174087a2758aebfcfbcb81196af87c7d4f84c847806f08ad35a361fbc3ade104a60fcd555b5110712b8569a9993bbfd0574992eb36704c
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
+}