From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B3368138334 for ; Sat, 28 Jul 2018 12:47:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38C5FE07A9; Sat, 28 Jul 2018 12:47:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CC7A8E07A9 for ; Sat, 28 Jul 2018 12:47:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F03E5335CD2 for ; Sat, 28 Jul 2018 12:47:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA89C380 for ; Sat, 28 Jul 2018 12:47:37 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1532782045.76e4883019fe92c545739f7d52cb1af3dc8ea7a5.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/librdkafka/files/, dev-libs/librdkafka/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/librdkafka/Manifest dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild X-VCS-Directories: dev-libs/librdkafka/files/ dev-libs/librdkafka/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 76e4883019fe92c545739f7d52cb1af3dc8ea7a5 X-VCS-Branch: master Date: Sat, 28 Jul 2018 12:47:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 44751795-7340-4e40-93e3-d7df4cfa51f8 X-Archives-Hash: 61360d299d8cb6d7eaa551f3d86b4049 commit: 76e4883019fe92c545739f7d52cb1af3dc8ea7a5 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Jul 28 12:34:25 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Jul 28 12:47:25 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76e48830 dev-libs/librdkafka: drop old Package-Manager: Portage-2.3.43, Repoman-2.3.10 dev-libs/librdkafka/Manifest | 1 - ...brdkafka-0.11.3-fix-memory-leak-issue1534.patch | 19 ------ dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild | 73 ---------------------- 3 files changed, 93 deletions(-) diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest index a12de3cdbeb..003a93a0a18 100644 --- a/dev-libs/librdkafka/Manifest +++ b/dev-libs/librdkafka/Manifest @@ -1,2 +1 @@ -DIST librdkafka-0.11.3.tar.gz 1849838 BLAKE2B 570713642b5ec9c2487a37b9146edda5f844427dbf55d6cb654ca9a8690cd6f77bcc9325800ac2a34da21f1cca33187f390c00132f9e5c28503f816ee256c4f9 SHA512 e9bb97ea1597019a841dd4ba3666ad72dcbc0539054155ce0caee92f1324f1a490515b0310405f822b829c05ed2688b48e2ca205a91cf88bf9ad6411f7c12b26 DIST librdkafka-0.11.4.tar.gz 1900117 BLAKE2B 3e755c91d6a2e12829ba841749977f8c05c9f243d79db64247547e4a49790e67d07f7d82633f45689dcc5f88caaef200027e6af3866de283c1de6120d7f98467 SHA512 6b34e7c476d328a2f8e8321f6ddcaeaf43730284bb3aaddac81c3cd9a1fa5d7f7ef7481f1093b36d89edde7b766da6cd27a9eb9a635b12b640e8a46a269bafc8 diff --git a/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch b/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch deleted file mode 100644 index ae4c3e5bc81..00000000000 --- a/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://github.com/edenhill/librdkafka/commit/8fed971043e642c195860cd77006622d23616c22 - ---- a/src/rdkafka_msgset_writer.c -+++ b/src/rdkafka_msgset_writer.c -@@ -436,10 +436,12 @@ rd_kafka_msgset_writer_write_msg_payload (rd_kafka_msgset_writer_t *msetw, - * room in the buffer we'll copy the payload to the buffer, - * otherwise we push a reference to the memory. */ - if (rkm->rkm_len <= (size_t)rk->rk_conf.msg_copy_max_size && -- rd_buf_write_remains(&rkbuf->rkbuf_buf) > rkm->rkm_len) -+ rd_buf_write_remains(&rkbuf->rkbuf_buf) > rkm->rkm_len) { - rd_kafka_buf_write(rkbuf, - rkm->rkm_payload, rkm->rkm_len); -- else -+ if (free_cb) -+ free_cb(rkm->rkm_payload); -+ } else - rd_kafka_buf_push(rkbuf, rkm->rkm_payload, rkm->rkm_len, - free_cb); - } diff --git a/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild b/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild deleted file mode 100644 index ef4921fdc0a..00000000000 --- a/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -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 x86" - - PATCHES=( "${FILESDIR}"/${P}-fix-memory-leak-issue1534.patch ) -fi - -LICENSE="BSD-2" - -# subslot = soname version -SLOT="0/1" - -IUSE="lz4 sasl ssl static-libs" - -RDEPEND=" - lz4? ( app-arch/lz4:= ) - sasl? ( dev-libs/cyrus-sasl:= ) - ssl? ( dev-libs/openssl:0= ) - sys-libs/zlib -" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -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) - ) - - 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 -}