commit: cdc783eb47a95af670bcf7b45794dd4952ab22e1
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu May 18 02:03:40 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu May 18 02:03:40 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=cdc783eb
app-admin/rsyslog: version bump to 8.27.0
app-admin/rsyslog/Manifest | 10 +++--
.../rsyslog-8.26.0-fix-zmq3-format-security.patch | 39 ++++++++++++++++++++
.../rsyslog-8.27.0-fix-librdkafka-detection.patch | 43 ++++++++++++++++++++++
app-admin/rsyslog/metadata.xml | 2 +-
...rsyslog-8.26.0.ebuild => rsyslog-8.27.0.ebuild} | 5 ++-
5 files changed, 93 insertions(+), 6 deletions(-)
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 271f6aa..1a9ac6e 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -2,14 +2,16 @@ AUX 8-stable/50-default.conf 1701 SHA256
61c1dd1450f574a21a8d8375faaf3e42f9856df
AUX 8-stable/50-rsyslog-8.18.0-musl-fix.patch 168 SHA256
5806738195b8155bbb19e3fb0db84f59668f5cf0c303d0f3c1e15a4ac31f8997 SHA512
8ab680645e59392ce164e8b46b3c6b64def1fa08f83fca3feb1065d0f1a663f5cf34600aec86190edcd06d364399efaa04b372310f76f263d11cb179e3a840fa
WHIRLPOOL
e70fededf8f540d77628d26b9d28512ee7b1b6ca6bd0e13b644c6f7665c2a91c85a6602e7b22e5a404e758caf6a71393d0abfff3b2a6e98519ffa2399c1ec778
AUX 8-stable/README.gentoo 1126 SHA256
29b4c68f521f2f1f138f44c4635da1a270fed9cbd4a780569754080987aa777c SHA512
46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
WHIRLPOOL
a1a3ec8b887110a01e8c1c1320f25493dd8ff343e4b08780c30c9bc3bb842afa0ef79db08195db876697c1a69807f49a8b3793609d25f78559fa534507fc195e
AUX 8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch 4660 SHA256
f50685f76004298a8a77ee6eb88868ff0f8fb8eb7ca5ce0f6809c4db9c42474d SHA512
231030532a126dade0fa2c98d9bd8ef610d3059210cabfc6b0a51adfb610b61eb57b7926a2a51f01f196d196a9134b4c1db7105aeedc4d35eb70abac97301378
WHIRLPOOL
88a9ebe6e3dbeca7b55e16192e6be6d862241a17402c2abf0bcdad4f16fed5fa11f7c140ac0de1655a52d43ad18eaa493b3e2426e1b3c80d1be119dffdc9cd15
+AUX 8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch 1982 SHA256
abf1b264e7de3a86c2f6cec86d59496bd865fcce5e691b71c7b2c977bdf7358d SHA512
b426c3eaa2adc2de14e129125ccd630e2fa2132c6ca774f3e18ee784f0622573a95339d901a1b9c2877e8b77d00f8be9f9d17f92769136c356aaab58358d2159
WHIRLPOOL
e327d0d8f5e3aab078233324359f42fd21aba2cb65927097acdbbf9dbac296a84fcfad71de228a9b2868f229d7f2260742f4180b677ef2a961a47d81db65a2bb
+AUX 8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch 1556 SHA256
638f22781452c361ae4021d66bf8faf78767752a62bf16588e310d3fc855753c SHA512
374de4fb9a4e3c3b9e28ff2e5eca48b7744afc9a5ba222508661fdfa30037967b6a2497d0e82266010de27c1a540ebb300c15bf6049a1af9dcf019353c04acdc
WHIRLPOOL
bad8fc8d88ea42defef922b67cbf0e66706dfd71d01249dbc82e49bfba787056e1e641e58dd2ba22250073aacba8afb8445d5d8610f095a961f47286ea4a7562
AUX 8-stable/rsyslog.conf 1562 SHA256
fc70a94213b5eb519febf9aa7d758ee9526433bcc5683bcb7451d16e65a2f5b0 SHA512
1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
WHIRLPOOL
97cf3fdee62a9339b412ebe93b71b2d6804df60aad9cb7e71779fcaddb01d489e38bbb353557864ea38aba384e664e6da636812c3c078ed9e22e261ed7b78cba
AUX 8-stable/rsyslog.confd-r1 1145 SHA256
0be3575df8010523de6b37e98c417192e8ec481292ca9fb47c8d2211795e03a6 SHA512
a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
WHIRLPOOL
05079ab1a55aca9b68c81c8b7da66ff029f72c7168bd15faebf7d7172dddc69f6ffb2864e1fcd8c1f2dbb51416bea89fab3667a34ed7295b3abafc6a93883d3e
AUX 8-stable/rsyslog.initd-r1 1758 SHA256
93044cc5fc344cd90d17cbb5cebee3c60ebf674e53c8b9efc6e758d53912d343 SHA512
0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265
WHIRLPOOL
14918404976219e379f80d67fe47a0f6e9d51938061c9f5d205bbcd7cedbda96825f75fd64f2fcc446d96292710a5ea375e117f621c33c9df7352e27286c91ae
AUX 8-stable/rsyslog.logrotate 682 SHA256
89cc8f13c1f7a3ae446b40da7b31cdf471e2c9e2d3d5b8f48e524f7a82fbff89 SHA512
6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912
WHIRLPOOL
9d29c2c9351252887c3dad78962df942bb1cd7387eb44e3c98764319f82d90c42d255a5642c55bb37811fb903e1c5314ca536bc9d32ccfd0535f0579f4e25ff0
DIST rsyslog-8.24.0.tar.gz 2374240 SHA256
37f32ce33e32a88e1bea0511e8e557d90b7378b81520e3236a9af5ba6ea993d7 SHA512
b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d
WHIRLPOOL
c5895d50143c21d446d760f5179b47fdae4ec34867711c942cd671b88789588e7244fb8511745efdb701954f7bc390403d30736a1e54af13dca4876f989928df
-DIST rsyslog-8.26.0.tar.gz 2393148 SHA256
637d43c4384f8b96dda873a0b8384045f72cb43139808dadd9e0a94dccf25916 SHA512
96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19
WHIRLPOOL
dc267dfdbbcfe5b5354d200a2e337dada22a0aa943e71998e1462bc23d38bb8e3f2b16162108831f12cfa3eec0d462d40a5e6a598f26b2edcef7c71ad56a1c3f
+DIST rsyslog-8.27.0.tar.gz 2435123 SHA256
02aefbba59324a6d8b70036a67686bed5f0c7be4ced62c039af6ee694cb5b1fd SHA512
dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753
WHIRLPOOL
1ece4fa5bd453e1bcd4da9501fa93be7f3ea0eb87f7e60bb788d7c90c740566cc07351eb2d7730ac081b2564bde9a79dff7ac1b5012326cc8b0331539b2b5b01
DIST rsyslog-docs-8.24.0.tar.gz 4344877 SHA256
f5e3c27c5b65abdd600b8ad8d99d1f2fe9f0ffca02d6af3c12db5fc10dd889b2 SHA512
b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b
WHIRLPOOL
e8b2d10b0de3c33189f859f08db58e319730e709e5a5008909f2166a061952290b0bf96163cdf6e0b3829896916f712ba5d8a2a98f02d796e9174d8919190f8d
-DIST rsyslog-docs-8.26.0.tar.gz 4381345 SHA256
4d3b46e6c06fecbd4100fad118c22569e6b0d23b0f5cfb1fbcf501bfc9d115bb SHA512
5c05c13b3ae6be431343b7a5b3b2cb8676804d6d58d98826e6b44d685bb30fdaf3ced27d66a29908b40f1839bac45d1834d060ddf05d01477474ab3f45f973c8
WHIRLPOOL
a01c661bea94a38af755803d385250d8f394064c2f1450c5a8b2b0e9e6879565219c84ded70c40300d2bbf524a30bf152bc5502f65917d757b0552920f6a7cd8
+DIST rsyslog-docs-8.27.0.tar.gz 4411093 SHA256
f799eba43ff73c14865cbc3f7105d54afec021430827e6d6da7b51f45cfbedb0 SHA512
08d935ecad070d65e7169a56c6a4d35d49e895b4f7cfe4d747939d8a92bdadd0fc3be7cc47d23d233a33b964f2a4d809a34b37419d2e42c3f8c183120412ab2c
WHIRLPOOL
1a7eeadc0667580ab14ae5857fc61f7eb5553bad00d7b59ed3e70aa3a2f75550872a110c6149b4bd69778c990ec3c57e625cc08a716792731d456d875e8a9e8b
EBUILD rsyslog-8.24.0-r2.ebuild 12575 SHA256
7725f8cf5aed2092ecc4d7534d4491dd6a28ec84c3e3a3d60b9dd0e87cf395c3 SHA512
de77eaa59232ad924fdc059ee287448196e0a750a92e783ecc7fe29656f09a1110e4e47c78b8ebfff085b34838d1f23a5fccd79aaea50998a5c33497a9220e7a
WHIRLPOOL
53d1532b60e73032df6938873ce43ffbf692f42abbd39bc3e3b9596360dd6c9dd0a6d030251ceabec20493a282ee153a036c1481537394e601ad9dd7c83c54cb
-EBUILD rsyslog-8.26.0.ebuild 12590 SHA256
3674e361c102228eeb45506ff7a21bc72acd391fe8b5ee3b464c88cf382273fb SHA512
541d2488f65e4c3c3c61e13e3e733eab465fff4adff818912195a3ce25267fa58ca72bc5bd00dab6937816e2b16e322935c1e921e70ae0ae1be64b919cdb2025
WHIRLPOOL
375652534d65e6e86f88680072a4619cfade4f8f006a92414c288aadcc0c46dba81349d1bea5150c2f6776de8b7973cbc1ac880ee118a45a466d15655d4426de
-MISC metadata.xml 3329 SHA256
c757c77e3d9c766d901ac9737ea16ecd4bc836585df84c745d9ab2b160baebce SHA512
a128d327fdd7e46e9fc22605589d0a05462dce15870e3a9371a83d47e2616eb0ea4e54c6f813eb7c87d24ad8cc456883a145c73425e6bd9483f4dfd82c4377cd
WHIRLPOOL
921eb979cdf8efdf2bb0fab33e6b4d774a870a86e243af21b73a127376d843bf1400007d1f72026713f344ce1ee67456d5a7d1f182d8f5ef59679debc178a357
+EBUILD rsyslog-8.27.0.ebuild 12758 SHA256
9b60a0403f79b834910e269d1f48bccb158260bfae04927744c6a3a44597ae26 SHA512
04b49a36c930c9725f8d0140af57ac912a82e13c340ad164e5235e7f78fa9542328c8093cd8474860514480e3e5b5b3d4a197e9428f064fabda77238ed6518ed
WHIRLPOOL
6bb68fa5ef5c51be5403c1ea2c3f98e2b9283121599a452d4c8195536466f334c427d6c9a1dc76542a0836dd298bef9a4890442da9ad92cf29357387f337afcf
+MISC metadata.xml 3335 SHA256
e4b519c8c8cf1d559aeb5151eca28d5057174d3bfcef2d74985c0ae20ea5adc7 SHA512
bfa3a8fbb502f6fdc110e8aa6b7394449329c29a63fc71c615317c97deb4e48f6e9f952bf492cc96be15fffb514f281a0d19de697bfddab4d4c7acf3c535c6a1
WHIRLPOOL
5ef1bccf69bbc7c5fd7dc88e8850e54fac881c24abfd07b05ca69e7213914d639a6254ae583a6436dfb4d784fe27b4fbfee6f1b9aeebccc7afb276ffb0cf4f93
diff --git
a/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch
b/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch
new file mode 100644
index 0000000..b285798
--- /dev/null
+++
b/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch
@@ -0,0 +1,39 @@
+--- a/contrib/imzmq3/imzmq3.c
++++ b/contrib/imzmq3/imzmq3.c
+@@ -403,7 +403,7 @@ static rsRetVal createSocket(instanceConf_t* info, void**
sock) {
+
+ /* Do the bind/connect... */
+ if (info->action==ACTION_CONNECT) {
+- rv = zsocket_connect(*sock, info->description);
++ rv = zsocket_connect(*sock, "%s", info->description);
+ if (rv == -1) {
+ errmsg.LogError(0,
+ RS_RET_INVALID_PARAMS,
+@@ -413,7 +413,7 @@ static rsRetVal createSocket(instanceConf_t* info, void**
sock) {
+ }
+ DBGPRINTF("imzmq3: connect for %s successful\n",info->description);
+ } else {
+- rv = zsocket_bind(*sock, info->description);
++ rv = zsocket_bind(*sock, "%s", info->description);
+ if (rv == -1) {
+ errmsg.LogError(0,
+ RS_RET_INVALID_PARAMS,
+--- a/contrib/omzmq3/omzmq3.c
++++ b/contrib/omzmq3/omzmq3.c
+@@ -242,14 +242,14 @@ static rsRetVal initZMQ(instanceData* pData) {
+ if (pData->action == ACTION_BIND) {
+ /* bind asserts, so no need to test return val here
+ which isn't the greatest api -- oh well */
+- if(-1 == zsocket_bind(pData->socket, (char*)pData->description)) {
++ if(-1 == zsocket_bind(pData->socket, "%s",
(char*)pData->description)) {
+ errmsg.LogError(0, RS_RET_NO_ERRCODE, "omzmq3: bind failed for
%s: %s",
+ pData->description, zmq_strerror(errno));
+ ABORT_FINALIZE(RS_RET_NO_ERRCODE);
+ }
+ DBGPRINTF("omzmq3: bind to %s successful\n",pData->description);
+ } else {
+- if(-1 == zsocket_connect(pData->socket, (char*)pData->description)) {
++ if(-1 == zsocket_connect(pData->socket, "%s",
(char*)pData->description)) {
+ errmsg.LogError(0, RS_RET_NO_ERRCODE, "omzmq3: connect failed for
%s: %s",
+ pData->description, zmq_strerror(errno));
+ ABORT_FINALIZE(RS_RET_NO_ERRCODE);
diff --git
a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch
b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch
new file mode 100644
index 0000000..366c0af
--- /dev/null
+++
b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch
@@ -0,0 +1,43 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1695,12 +1695,14 @@ AM_CONDITIONAL(ENABLE_KAFKA_TESTS, test
x$enable_kafka_tests = xyes)
+
+ # omkafka works with older library
+ if test "x$enable_omkafka" = "xyes"; then
+- PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [
+- AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
+- AC_MSG_WARN([librdkafka is missing but library present,
using -lrdkafka])
+- LIBRDKAFKA_LIBS=-lrdkafka
+- ], [
+- AC_MSG_ERROR([could not find rdkafka library])
++ PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka],, [
++ PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [
++ AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
++ AC_MSG_WARN([librdkafka is missing but library
present, using -lrdkafka])
++ LIBRDKAFKA_LIBS=-lrdkafka
++ ], [
++ AC_MSG_ERROR([could not find rdkafka library])
++ ])
+ ])
+ ])
+ AC_CHECK_HEADERS([librdkafka/rdkafka.h])
+@@ -1708,12 +1710,13 @@ fi
+
+ # imkafka needs newer library
+ if test "x$enable_imkafka" = "xyes"; then
+- PKG_CHECK_MODULES(LIBRDKAFKA, rdkafka >= 0.9.1)
+- AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
+- AC_MSG_WARN([librdkafka is missing but library present, using
-lrdkafka])
+- LIBRDKAFKA_LIBS=-lrdkafka
+- ], [
+- AC_MSG_ERROR([could not find rdkafka library])
++ PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka >= 0.9.1],, [
++ AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
++ AC_MSG_WARN([librdkafka is missing but library present,
using -lrdkafka])
++ LIBRDKAFKA_LIBS=-lrdkafka
++ ], [
++ AC_MSG_ERROR([could not find rdkafka library])
++ ])
+ ])
+ AC_CHECK_HEADERS([librdkafka/rdkafka.h])
+ fi
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index a933e8b..855ee26 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -12,7 +12,7 @@
<flag name="gcrypt">Add support for encrypted log files using
<pkg>dev-libs/libgcrypt</pkg></flag>
<flag name="grok">Build the grok modify module (requires
<pkg>dev-libs/grok</pkg>)</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for
allocations.</flag>
- <flag name="kafka">Build the Apache Kafka output module
(requires <pkg>dev-libs/librdkafka</pkg>)</flag>
+ <flag name="kafka">Build the Apache Kafka input/output module
(requires <pkg>dev-libs/librdkafka</pkg>)</flag>
<flag name="kerberos">Build the GSSAPI input and output module
(requires <pkg>virtual/krb5</pkg>)</flag>
<flag name="libressl">Use <pkg>dev-libs/libressl</pkg> for
building the rfc5424hmac modify module (requires rfc5424hmac USE flag)</flag>
<flag name="mdblookup">Build the MaxMind DB lookup message
modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag>
diff --git a/app-admin/rsyslog/rsyslog-8.26.0.ebuild
b/app-admin/rsyslog/rsyslog-8.27.0.ebuild
similarity index 98%
rename from app-admin/rsyslog/rsyslog-8.26.0.ebuild
rename to app-admin/rsyslog/rsyslog-8.27.0.ebuild
index 71f2bcf..94cd757 100644
--- a/app-admin/rsyslog/rsyslog-8.26.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.27.0.ebuild
@@ -54,7 +54,9 @@ else
"
PATCHES=(
- "${FILESDIR}/8-stable/50-${PN}-8.18.0-musl-fix.patch"
+
"${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch
+
"${FILESDIR}"/8-stable/${PN}-8.27.0-fix-librdkafka-detection.patch
+ "${FILESDIR}"/8-stable/50-${PN}-8.18.0-musl-fix.patch
)
fi
@@ -220,6 +222,7 @@ src_configure() {
$(use_enable elasticsearch)
$(use_enable gcrypt libgcrypt)
$(use_enable jemalloc)
+ $(use_enable kafka imkafka)
$(use_enable kafka omkafka)
$(use_enable kerberos gssapi-krb5)
$(use_enable normalize mmnormalize)
