From 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Feb 2018 19:58:07 +0000 Subject: gentoo resync : 24.02.2018 --- dev-libs/librdkafka/Manifest | 3 +- ...brdkafka-0.11.3-fix-memory-leak-issue1534.patch | 19 ++++++ dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild | 73 ++++++++++++++++++++++ dev-libs/librdkafka/librdkafka-0.11.3.ebuild | 71 --------------------- 4 files changed, 94 insertions(+), 72 deletions(-) create mode 100644 dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch create mode 100644 dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild delete mode 100644 dev-libs/librdkafka/librdkafka-0.11.3.ebuild (limited to 'dev-libs/librdkafka') diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest index 5dcf561b0e51..fcf2aaee2688 100644 --- a/dev-libs/librdkafka/Manifest +++ b/dev-libs/librdkafka/Manifest @@ -1,3 +1,4 @@ +AUX librdkafka-0.11.3-fix-memory-leak-issue1534.patch 938 BLAKE2B acc607465285b2d5860f74a313a70bd153e0e850d1949cd345a920de69d466a8e75c89983b85056c6d8e40fbe93d40e4a5dac26b6a617705fd376cfe6c1baa75 SHA512 6f6406589ddf76e4168a6df50b00d8f499d3a6c22404696a4160eac3a10de7f8c8e03d01d6fd1aff831eb5cab962aec0eb164031e5aee3751e15a12c75e9f15f AUX librdkafka-0.9.2-remove-lz4-automagic.patch 1595 BLAKE2B f41f8f731ff1b9dd1e8e5f1982e4abc7ca7d71da905a0ea65369d212433d83b2e7b4cafb49efda855b5b8cd65c027f4e4384623cd0ff25b9c68adce9d9cfe9b0 SHA512 5903f2961cfb3066722ade21c944342b0ffa0af06b065dd1350b77f65f38025e3357fca3dca3e8756c20fb7ea104f33a565f146615d4e5a0284ea83106581b9a AUX librdkafka-0.9.3-remove-lz4-automagic.patch 1721 BLAKE2B d7c458bc12a59aec86bd61c44b2d249208323148220ba0645ddd767e1d16b336a26d2f04fdbc613e82604d825b1713c470a9f2cf7cd69dba766d8088291837a7 SHA512 c2ee9e9c429ea3a5348b9f47b739e00ee8e526e2f809b67545b253a57d726a7ac92565511c726aa8a8a705ed2396d8b2cdba54484b8da33efc36659384ff4660 DIST librdkafka-0.11.0.tar.gz 837546 BLAKE2B 32dc35a97c51353c2635965244eefb98ba0575f4aafe405f7cccbc1ce06a3c8230ebd6171f4519ab50f4d996dc934c868366f8520d210216697584d1d730bde6 SHA512 1c41bd5bb9eb93b3bf743e8c4f14684609cb47b0c4fb95d303ddc7c62fdb678d9e6928fa6ea57c0aaa7695d08ab6e7ec84b699d7d61c7f750af0fe2cb148c596 @@ -9,7 +10,7 @@ DIST librdkafka-0.9.4.tar.gz 696078 BLAKE2B fa3b5b1cff0ffaa495e0a62c2886665c0d57 DIST librdkafka-0.9.5.tar.gz 753196 BLAKE2B 48e9c2aba02f1a3c720b48c7962af7a1e26cd7604d325344a1b68cb107420f37a2fad406e256ec5d1ac281cc39aaa2d9831f42db9888400d706b0954f35f5113 SHA512 06b2c7e3dd1c8a84322d256f2470804ba0ac205777cf66c0c98222d3f90ed26d6fcae375ee0343558ccf901d7a8d354009f377a435ecd0ce2d02c73848fbc8a4 EBUILD librdkafka-0.11.0.ebuild 1238 BLAKE2B 5517b883241ce8a07e44e41c8f9df9859db8a077b8318546761f55f47f232f46d14a4b09b6e7821c45d231eba7129b77b6eba4900cd2deabeac974a59123f3e3 SHA512 1a78a8e00cb86f6b4209023c296e406384948fa2a1c7230fc01b70b0f6fc5ce9e97e21ac626d9f0f9d5590bc51d8295fc2e4c9fab77b872efa0684f80b07f10f EBUILD librdkafka-0.11.1.ebuild 1238 BLAKE2B 5517b883241ce8a07e44e41c8f9df9859db8a077b8318546761f55f47f232f46d14a4b09b6e7821c45d231eba7129b77b6eba4900cd2deabeac974a59123f3e3 SHA512 1a78a8e00cb86f6b4209023c296e406384948fa2a1c7230fc01b70b0f6fc5ce9e97e21ac626d9f0f9d5590bc51d8295fc2e4c9fab77b872efa0684f80b07f10f -EBUILD librdkafka-0.11.3.ebuild 1236 BLAKE2B cd0ad6ac6ccfebbe37583fd03f3317f835bf7dda598e3b8c71b922b48db3541a28ac0462577ffdc62c9e219be4a6f1852cf6c591e7240626dda12bf5e636f5e6 SHA512 80e38fb2244bf009ea3102a34a10fc2de324576b77965583d04077af7281d00e6c259cef3a260eeb224eabc8fdb929ee9513bec19e6584f9c159022a9c335580 +EBUILD librdkafka-0.11.3-r1.ebuild 1301 BLAKE2B 1a464ec7dab06e61fc17b72d1427ef1c78264a10324ef5be28e81bd29cb9da04d221419a55314065dd957b82398310311d1b8dc7ad2254be854f930bfab45a42 SHA512 bb2f3eecc4d116bd61e0aacbda4ac0bae05f8657a34d593af8bee55f9ee4fbddf9d9a217851b772ef0d38e91bce91fe2b1c475505d0bea9e008999b91e70e911 EBUILD librdkafka-0.9.2-r1.ebuild 1288 BLAKE2B cd9f140cb8c34659d0121af5e073a29871b6ffb9d1c963802c888927b3f1528d93f55c446c3a5f76c73c4183567414a1d0d55e7b152508555fd92947be924a40 SHA512 1269fc2b6392ecea08d09299f9740e5f2a90b121fcbc1617e63beceffa16db5dae0c2a7a289c0c33ca112ef75087e5c991272967d687cfeb636215cd64494880 EBUILD librdkafka-0.9.3.ebuild 1292 BLAKE2B b23378509efa2206fb03bc7763fe1ee159fbe2f16983ede1e05971ba1bc534a5ed3617e34d65f42577b85049e641a693a33f11e4eb8c6f21cbdc3b3ab7e98d29 SHA512 a24bb014f1b8fdc8c946b618b0afbbb96a75b925e87d3cf85839c19013516da0a3b622a0373844a353c4022a9aa5b1c91428db0e8995a7d3d92b76934b1d8e86 EBUILD librdkafka-0.9.4.ebuild 1226 BLAKE2B 62e334f66a75f44e92cd34f9cc23ca5d3f9f52301820f662f55e921741ce49fb53ef9e7de84ba62b8cf329b3718dbbf6611e3cccbd9ae0dd1ea8709afd9e6e53 SHA512 195b6d8f752f432eecf25d53fa3adfa61ed0c89959a582037035adde522814a8d1e0c60b410542e82508fbda5fb0aca1af312779401f932da193fece7accd9f1 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 new file mode 100644 index 000000000000..ae4c3e5bc81e --- /dev/null +++ b/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000000..f7ec851be536 --- /dev/null +++ b/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild @@ -0,0 +1,73 @@ +# 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 +} diff --git a/dev-libs/librdkafka/librdkafka-0.11.3.ebuild b/dev-libs/librdkafka/librdkafka-0.11.3.ebuild deleted file mode 100644 index 00872b0eadc7..000000000000 --- a/dev-libs/librdkafka/librdkafka-0.11.3.ebuild +++ /dev/null @@ -1,71 +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" -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 -} -- cgit v1.2.3