[gentoo-commits] repo/gentoo:master commit in: dev-libs/librdkafka/, dev-libs/librdkafka/files/

[Thomas Deutschmann]

commit:     d43aca579cd3e0fa62569c2030f82db85c9bcb8e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 23:36:00 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 23:36:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d43aca57

dev-libs/librdkafka: security cleanup

Bug: https://bugs.gentoo.org/717704
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-libs/librdkafka/Manifest                       |  4 --
 ...librdkafka-1.1.0-remove-automagic-on-zstd.patch | 29 --------
 dev-libs/librdkafka/librdkafka-1.1.0.ebuild        | 78 ----------------------
 dev-libs/librdkafka/librdkafka-1.2.1.ebuild        | 76 ---------------------
 dev-libs/librdkafka/librdkafka-1.2.2.ebuild        | 76 ---------------------
 dev-libs/librdkafka/librdkafka-1.3.0.ebuild        | 76 ---------------------
 6 files changed, 339 deletions(-)

diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 5dcba1b774b..4e8068c2eb4 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,5 +1 @@
-DIST librdkafka-1.1.0.tar.gz 2511445 BLAKE2B 00c20361058d537d045da6961afc45e40e0ac641918df9eb457937dc3ca566639b81d8aa10cc6ed2f57988eded180f3d2eaea72ca4b910a652b93b54b9388253 SHA512 35561399b07278a09a51245c5503c86eb0cc8971692b4e65a332144bfb71e2e86d4ceaf1804534b6a416bcace74cef493b6465c20b32c14de97f45f2854359c6
-DIST librdkafka-1.2.1.tar.gz 2547009 BLAKE2B f55c2f23339294d54c1a3cbe064b0ddb6a638adfd192351a69bba91c81f7d33dfad13b45d50a8ea008e397400c89e90fe267549566a8dff07ca701ae59934126 SHA512 57341a0e4dbe98b9da912f5a63cc82490222bd91aef7c3cda3acaa4807e1d13ac047fbff8898f7459e7a1cb46f02dfc665e8c5bddffd8153d67a2c0546000a62
-DIST librdkafka-1.2.2.tar.gz 2588441 BLAKE2B 27cf73c61a56cd899926a2022f3751f66a2569d3065d5c3d8d542df8c0c92db08095188a08c91e347d2c1439f244d417eacbfb218e49c08fe4b5b2ef76f2bd6d SHA512 ef6fc34989e5e484cb0b9f6a6f8a5c4816d89239c18d65becc2004cdfeedbfb541e18affbb8662b05831003249630cb2119ee496b5b844c963b01eb6d4ebac5a
-DIST librdkafka-1.3.0.tar.gz 2627028 BLAKE2B bee04707047142833c6c27ec25b81678be929ec08995c0cbf79a744b9c211691a2b4dd086782900a4cead73c6885886a26ab4052a7b9d0f6e6057bbee5a11c1d SHA512 94b6202a83d54dfa181466a7ea4e0b492cd695e2bc08e7e46e60efb9c1dacc912fc891cb2bb50d189dc6d0fd6c7553266196dded460957ba0f569d3e08090669
 DIST librdkafka-1.4.0.tar.gz 2722992 BLAKE2B 590fa90805bc2dc728dd32be333eaf9b2a4e6a840403838406684794ca68f2bcf9fc831e252a637622f9e6cd209d779ed20d503e49dac20bdb28f5d3fbd676bd SHA512 cd343597707d22490dfcd513a6b24ca5487dca5230a5a6775e7d6f10be2dc5481deb3a76968bb244d5f7514db92aceca541823c5841a7b54d8e00aeb9088731c

diff --git a/dev-libs/librdkafka/files/librdkafka-1.1.0-remove-automagic-on-zstd.patch b/dev-libs/librdkafka/files/librdkafka-1.1.0-remove-automagic-on-zstd.patch
deleted file mode 100644
index 792bb453570..00000000000
--- a/dev-libs/librdkafka/files/librdkafka-1.1.0-remove-automagic-on-zstd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 828e10cb9331fc5bd48fb1d6fdb8e08cd5fb27ea
-Author:     Thomas Deutschmann <whissi@g.o>
-AuthorDate: Mon Apr 29 18:57:10 2019 +0200
-Commit:     Thomas Deutschmann <whissi@g.o>
-CommitDate: Mon Jun 24 23:52:25 2019 +0200
-
-    configure: Add option to disable automagic dependency on zstd
-    
-    This commit will add an option which will allow you to explicit disable
-    zstd usage.
-
-diff --git a/mklove/modules/configure.libzstd b/mklove/modules/configure.libzstd
-index d9599d82..cb82c128 100644
---- a/mklove/modules/configure.libzstd
-+++ b/mklove/modules/configure.libzstd
-@@ -9,8 +9,12 @@
- #   mkl_check libzstd [<action>]
- #
- 
-+mkl_toggle_option "Feature" ENABLE_ZSTD "--enable-zstd" "Enable support for ZSTD compression" "y"
-+
- function manual_checks {
--    local action=$1
-+    local action=${1:-disable}
-+
-+    [[ $ENABLE_ZSTD == y ]] || return 0
- 
-     mkl_meta_set "libzstd" "brew" "zstd"
-     mkl_meta_set "libzstd" "apk" "zstd-dev zstd-static"

diff --git a/dev-libs/librdkafka/librdkafka-1.1.0.ebuild b/dev-libs/librdkafka/librdkafka-1.1.0.ebuild
deleted file mode 100644
index b3f9787c020..00000000000
--- a/dev-libs/librdkafka/librdkafka-1.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Apache Kafka C/C++ client library"
-HOMEPAGE="https://github.com/edenhill/librdkafka"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ~ppc ~sparc x86"
-fi
-
-LICENSE="BSD-2"
-
-# subslot = soname version
-SLOT="0/1"
-
-IUSE="lz4 sasl ssl static-libs zstd"
-
-LIB_DEPEND="
-	lz4? ( app-arch/lz4:=[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
-	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
-	zstd? ( app-arch/zstd:=[static-libs(+)] )
-	sys-libs/zlib:=[static-libs(+)]
-"
-
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1.0-remove-automagic-on-zstd.patch )
-
-src_configure() {
-	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
-
-	local myeconf=(
-		--no-cache
-		--no-download
-		--disable-debug-symbols
-		$(use_enable lz4)
-		$(use_enable sasl)
-		$(usex static-libs '--enable-static' '')
-		$(use_enable ssl)
-		$(use_enable zstd)
-	)
-
-	econf ${myeconf[@]}
-}
-
-src_test() {
-	emake -C tests run_local
-}
-
-src_install() {
-	local DOCS=(
-		README.md
-		CONFIGURATION.md
-		INTRODUCTION.md
-	)
-
-	default
-
-	if ! use static-libs; then
-		find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die
-	fi
-}

diff --git a/dev-libs/librdkafka/librdkafka-1.2.1.ebuild b/dev-libs/librdkafka/librdkafka-1.2.1.ebuild
deleted file mode 100644
index 6d51d76e53f..00000000000
--- a/dev-libs/librdkafka/librdkafka-1.2.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Apache Kafka C/C++ client library"
-HOMEPAGE="https://github.com/edenhill/librdkafka"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-
-# subslot = soname version
-SLOT="0/1"
-
-IUSE="lz4 sasl ssl static-libs zstd"
-
-LIB_DEPEND="
-	lz4? ( app-arch/lz4:=[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
-	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
-	zstd? ( app-arch/zstd:=[static-libs(+)] )
-	sys-libs/zlib:=[static-libs(+)]
-"
-
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-"
-
-src_configure() {
-	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
-
-	local myeconf=(
-		--no-cache
-		--no-download
-		--disable-debug-symbols
-		$(use_enable lz4)
-		$(use_enable sasl)
-		$(usex static-libs '--enable-static' '')
-		$(use_enable ssl)
-		$(use_enable zstd)
-	)
-
-	econf ${myeconf[@]}
-}
-
-src_test() {
-	emake -C tests run_local
-}
-
-src_install() {
-	local DOCS=(
-		README.md
-		CONFIGURATION.md
-		INTRODUCTION.md
-	)
-
-	default
-
-	if ! use static-libs; then
-		find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die
-	fi
-}

diff --git a/dev-libs/librdkafka/librdkafka-1.2.2.ebuild b/dev-libs/librdkafka/librdkafka-1.2.2.ebuild
deleted file mode 100644
index 6d51d76e53f..00000000000
--- a/dev-libs/librdkafka/librdkafka-1.2.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Apache Kafka C/C++ client library"
-HOMEPAGE="https://github.com/edenhill/librdkafka"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-
-# subslot = soname version
-SLOT="0/1"
-
-IUSE="lz4 sasl ssl static-libs zstd"
-
-LIB_DEPEND="
-	lz4? ( app-arch/lz4:=[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
-	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
-	zstd? ( app-arch/zstd:=[static-libs(+)] )
-	sys-libs/zlib:=[static-libs(+)]
-"
-
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-"
-
-src_configure() {
-	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
-
-	local myeconf=(
-		--no-cache
-		--no-download
-		--disable-debug-symbols
-		$(use_enable lz4)
-		$(use_enable sasl)
-		$(usex static-libs '--enable-static' '')
-		$(use_enable ssl)
-		$(use_enable zstd)
-	)
-
-	econf ${myeconf[@]}
-}
-
-src_test() {
-	emake -C tests run_local
-}
-
-src_install() {
-	local DOCS=(
-		README.md
-		CONFIGURATION.md
-		INTRODUCTION.md
-	)
-
-	default
-
-	if ! use static-libs; then
-		find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die
-	fi
-}

diff --git a/dev-libs/librdkafka/librdkafka-1.3.0.ebuild b/dev-libs/librdkafka/librdkafka-1.3.0.ebuild
deleted file mode 100644
index e446aa6623f..00000000000
--- a/dev-libs/librdkafka/librdkafka-1.3.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Apache Kafka C/C++ client library"
-HOMEPAGE="https://github.com/edenhill/librdkafka"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ~ppc ~sparc x86"
-fi
-
-LICENSE="BSD-2"
-
-# subslot = soname version
-SLOT="0/1"
-
-IUSE="lz4 sasl ssl static-libs zstd"
-
-LIB_DEPEND="
-	lz4? ( app-arch/lz4:=[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
-	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
-	zstd? ( app-arch/zstd:=[static-libs(+)] )
-	sys-libs/zlib:=[static-libs(+)]
-"
-
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-"
-
-src_configure() {
-	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
-
-	local myeconf=(
-		--no-cache
-		--no-download
-		--disable-debug-symbols
-		$(use_enable lz4)
-		$(use_enable sasl)
-		$(usex static-libs '--enable-static' '')
-		$(use_enable ssl)
-		$(use_enable zstd)
-	)
-
-	econf ${myeconf[@]}
-}
-
-src_test() {
-	emake -C tests run_local
-}
-
-src_install() {
-	local DOCS=(
-		README.md
-		CONFIGURATION.md
-		INTRODUCTION.md
-	)
-
-	default
-
-	if ! use static-libs; then
-		find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die
-	fi
-}