app-admin/rsyslog: version bump to 8.31.0

4 files changed, 17 insertions, 36 deletions

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 95272050..0b9cbc93 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,8 +1,8 @@
 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.28.0.tar.gz 2471122 SHA256 4ca5405908d612d45da700e36856430510875518eb8028d296d1ee4d2c44678e SHA512 e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1 WHIRLPOOL b3c07391b9730498aff9ca30a407bd18d5faea07ec37d389dc59daef595318aa11e66fa153a452f48a55df4a2c15789569b845a831266d702b4801b39856a208
-DIST rsyslog-8.30.0.tar.gz 2468224 SHA256 dfb9c3efe52ad03ad9f4479699139fb447177049553b6993315f53b668a2251f SHA512 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0 WHIRLPOOL b965024cd94dbc2e81dedb2ac3fe3c12d82913b83f7d4f3b123ad8e101c14a5ca7eb17d087081a68545584e6d18e0069f779c63ddaad274c9f2e05d860887d0d
+DIST rsyslog-8.31.0.tar.gz 2498675 BLAKE2B 8b80394ea3919dba29a431f3c5c1fc337a9e60a886a3c258c3895eb4341a941d8af6370ceb0d2e212934f64ab38c7238e99f40e1dc27e648bd4b75e158586a28 SHA512 aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7
 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.28.0.tar.gz 4424901 SHA256 f6c41f7c3fca369dd28a72133b03693ad5c37252375ecadc6184ff1a954764db SHA512 c085e09149cfc27ce0cd22edf9ad3f81b111f491fbea79afbc3172882065bd8324e366e3b5d09c885c1a3aa63fe8fbbe154d66488319d4ffc0867f938e1ab07d WHIRLPOOL f6636ba7196c689e42651ac9c847b05f3eafdbe87186fad478c47d55f2856e5b200d2871612ca046c6d9c06ad2d80838ad226510ba59a3f2cfe234626ca8c75f
-DIST rsyslog-docs-8.30.0.tar.gz 4487378 SHA256 59c702e587e8f4566104b3266909deedba3c189849bed6965bbc56a1fbc08ca8 SHA512 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d WHIRLPOOL a324fdf1c0796e88bc29c20c5afedc02924c712d4bff1c3601ea4dc85d1910c9c7272ae926f7c423b7568ebce832e9ec626b616ff669586fc2afe73bfe0a7cfd
+DIST rsyslog-docs-8.31.0.tar.gz 4484950 BLAKE2B 8ee4346a095942133bb473509f275c625fdb4a1aa81293a15604bdb95670ff0676677fe5481be3bc2ea7097b2c8de7fd3b0eb8033701522b372bffe44325a10a SHA512 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.30.0-fix-kerberos.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.30.0-fix-kerberos.patch
deleted file mode 100644
index a202e633..00000000
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.30.0-fix-kerberos.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/rsyslog/rsyslog/issues/1838
-
---- a/plugins/imgssapi/imgssapi.c
-+++ b/plugins/imgssapi/imgssapi.c
-@@ -291,7 +291,7 @@ finalize_it:
- 
- 
- static rsRetVal
--doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd)
-+doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd, int *const oserr)
- {
- 	DEFiRet;
- 	int allowedMethods;
-@@ -307,7 +307,7 @@ doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd)
- 		CHKiRet(TCPSessGSSRecv(pSess, buf, lenBuf, piLenRcvd));
- 	} else {
- 		*piLenRcvd = lenBuf;
--		CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd) != RS_RET_OK);
-+		CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd, oserr));
- 	}
- 
- finalize_it:
diff --git a/app-admin/rsyslog/rsyslog-8.28.0.ebuild b/app-admin/rsyslog/rsyslog-8.28.0.ebuild
index c249c235..dde66433 100644
--- a/app-admin/rsyslog/rsyslog-8.28.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.28.0.ebuild
@@ -39,7 +39,7 @@ else
 		unset _tmp_last_index
 		unset _tmp_suffix
 	else
-		KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+		KEYWORDS="amd64 ~arm ~arm64 hppa x86"
 	fi
 
 	SRC_URI="
diff --git a/app-admin/rsyslog/rsyslog-8.30.0.ebuild b/app-admin/rsyslog/rsyslog-8.31.0.ebuild
index 630a520b..50a69614 100644
--- a/app-admin/rsyslog/rsyslog-8.30.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.31.0.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit autotools eutils linux-info systemd
+inherit autotools eutils linux-info python-any-r1 systemd
 
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="http://www.rsyslog.com/"
@@ -47,10 +48,7 @@ else
 		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
 	"
 
-	PATCHES=(
-		"${FILESDIR}"/8-stable/${PN}-8.30.0-fix-kerberos.patch
-		"${FILESDIR}"/8-stable/${PN}-8.18.0-musl-fix.patch
-	)
+	PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.18.0-musl-fix.patch )
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
@@ -71,7 +69,7 @@ RDEPEND="
 	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
 	kerberos? ( virtual/krb5 )
 	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
 	mysql? ( virtual/mysql )
 	normalize? (
 		>=dev-libs/libee-0.4.0
@@ -93,14 +91,17 @@ RDEPEND="
 	systemd? ( >=sys-apps/systemd-234 )
 	uuid? ( sys-apps/util-linux:0= )
 	zeromq? (
-		>=net-libs/zeromq-4.1.1:=
-		>=net-libs/czmq-3.0.0
+		>=net-libs/czmq-3.0.2
 	)"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-archive-2015.02.24
 	virtual/pkgconfig
 	elibc_musl? ( sys-libs/queue )
-	test? ( sys-libs/libfaketime )"
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
 
 if [[ ${PV} == "9999" ]]; then
 	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
@@ -112,6 +113,10 @@ fi
 CONFIG_CHECK="~INOTIFY_USER"
 WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
 
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == "9999" ]]; then
 		git-r3_fetch
@@ -235,9 +240,7 @@ src_configure() {
 		$(use_enable usertools)
 		$(use_enable uuid)
 		$(use_enable zeromq imczmq)
-		$(use_enable zeromq imzmq3)
 		$(use_enable zeromq omczmq)
-		$(use_enable zeromq omzmq3)
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 	)