From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 12 Apr 2020 03:41:30 +0100
Subject: gentoo Easter resync : 12.04.2020

---
 dev-util/bsdiff/Manifest                           |  3 +-
 dev-util/bsdiff/bsdiff-4.3-r3.ebuild               | 36 ----------------------
 dev-util/bsdiff/bsdiff-4.3-r4.ebuild               | 35 +++++++++++++++++++++
 .../bsdiff/files/bsdiff-4.3-CVE-2014-9862.patch    | 15 +++++++++
 4 files changed, 52 insertions(+), 37 deletions(-)
 delete mode 100644 dev-util/bsdiff/bsdiff-4.3-r3.ebuild
 create mode 100644 dev-util/bsdiff/bsdiff-4.3-r4.ebuild
 create mode 100644 dev-util/bsdiff/files/bsdiff-4.3-CVE-2014-9862.patch

(limited to 'dev-util/bsdiff')

diff --git a/dev-util/bsdiff/Manifest b/dev-util/bsdiff/Manifest
index 06a64fb9b372..2125e1dfef11 100644
--- a/dev-util/bsdiff/Manifest
+++ b/dev-util/bsdiff/Manifest
@@ -1,3 +1,4 @@
+AUX bsdiff-4.3-CVE-2014-9862.patch 304 BLAKE2B bf972f29b3ff36dad2fd656ddb9047ec0ef2b20d4d84f2e983d67478f471d1dcc82e6f577525549b7655c0f3608500dab172a39bced5cd4173fd83e05034bc22 SHA512 940c2cafc14e85a2cdd7f95d17de68f3a9d3e80828fcc302936e16a32733aa4a60d3ddb8fc9760e2fbd1fa626398669ef991688b26c23e8ff5c7e8d2612672ef
 DIST bsdiff-4.3.tar.gz 5740 BLAKE2B 869b957fac9de5977216b82ae46f5a291af4f64e8f4199b129b5e9963385e8f23d8593c307ddf953001fc54446ba66a0c57f9f9a841854afc3d32aee26fffc4e SHA512 bde46b393b74bcc9f05532ea4d45b12c104c4f182fdd49d4176aad5f02a2b357f435819f13a5a7ddefe27df0ca82980f06fad764094014a6d068622263e319c3
-EBUILD bsdiff-4.3-r3.ebuild 878 BLAKE2B 03de80ba80d21f27ad65a7b274749292f10d362c89a53fe59ac884fcd3687badd84b45dfbdc929a302da38bc8587aa3cab300b2366d60b664736e2c692c15a4b SHA512 14821ec4875e5cb4334065ed628df2f62dff66ffd8c12e8a26e9b969db5d5d0364a81c8394ee61c776858ef4670dbcd6aa48ec685e0e78efbc95109ee6e83d4b
+EBUILD bsdiff-4.3-r4.ebuild 876 BLAKE2B b319605879842a0e6c34fed4c4d34f380cb2904e7841822c5516c504f2cce55a35b5015ba403ced81da8c30c0bdd2ccbee07b9595c3a468bf6e2ee9a8303b332 SHA512 3821af1a653d7d684d902f0e87b677032116a8ca7dca36d6f87a4cc376717aa4fc0ea078a2a262e3008ff501c1cb1111257cddffe28f189561ab6adb7024e8a1
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/bsdiff/bsdiff-4.3-r3.ebuild b/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
deleted file mode 100644
index 947b0c2e8c01..000000000000
--- a/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="bsdiff: Binary Differencer using a suffix alg"
-HOMEPAGE="http://www.daemonology.net/bsdiff/"
-SRC_URI="http://www.daemonology.net/bsdiff/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="app-arch/bzip2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_compile() {
-	doecho() {
-		echo "$@"
-		"$@"
-	}
-	append-lfs-flags
-	doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bsdiff bsdiff.c -lbz2 || die "failed compiling bsdiff"
-	doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bspatch bspatch.c -lbz2 || die "failed compiling bspatch"
-}
-
-src_install() {
-	dobin bs{diff,patch}
-	doman bs{diff,patch}.1
-}
diff --git a/dev-util/bsdiff/bsdiff-4.3-r4.ebuild b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
new file mode 100644
index 000000000000..0bda0b152631
--- /dev/null
+++ b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="bsdiff: Binary Differencer using a suffix alg"
+HOMEPAGE="https://www.daemonology.net/bsdiff/"
+SRC_URI="https://www.daemonology.net/bsdiff/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="app-arch/bzip2"
+
+PATCHES=(
+	"${FILESDIR}/${P}-CVE-2014-9862.patch"
+)
+
+src_compile() {
+	doecho() {
+		echo "$@"
+		"$@"
+	}
+	append-lfs-flags
+	doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bsdiff bsdiff.c -lbz2 || die "failed compiling bsdiff"
+	doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bspatch bspatch.c -lbz2 || die "failed compiling bspatch"
+}
+
+src_install() {
+	dobin bs{diff,patch}
+	doman bs{diff,patch}.1
+}
diff --git a/dev-util/bsdiff/files/bsdiff-4.3-CVE-2014-9862.patch b/dev-util/bsdiff/files/bsdiff-4.3-CVE-2014-9862.patch
new file mode 100644
index 000000000000..7aab818090d8
--- /dev/null
+++ b/dev-util/bsdiff/files/bsdiff-4.3-CVE-2014-9862.patch
@@ -0,0 +1,15 @@
+diff --git a/bspatch.c b/bspatch.c
+index 8d95633..ab77722 100644
+--- a/bspatch.c
++++ b/bspatch.c
+
+@@ -187,6 +187,10 @@
+ 		};
+ 
+ 		/* Sanity-check */
++		if ((ctrl[0] < 0) || (ctrl[1] < 0))
++			errx(1,"Corrupt patch\n");
++
++		/* Sanity-check */
+ 		if(newpos+ctrl[0]>newsize)
+ 			errx(1,"Corrupt patch\n");
-- 
cgit v1.2.3