gentoo resync : 24.03.2019

2 files changed, 174 insertions, 0 deletions

diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 57729a1a2ef0..8e76eb19eaea 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -30,10 +30,12 @@ DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f080
 DIST syslog-ng-3.17.2.tar.gz 9119227 BLAKE2B 3268a51c587e66579b30ee8d27397eeeb3ab52c7e1939ad26ad976be2670565a389fda9dbc3a25f80710f855788c85f58d47f6a3c297b8ff6efa01e0dca386fe SHA512 2b82ea047bab125d35ab0a90e933b8a282852c6b4a9a8adc3f2a0ddf392f24210ce1296d0cfb389f98e54e50090a3ded5a64c5a9529d2a90cbecbfafd620edd7
 DIST syslog-ng-3.18.1.tar.gz 4259746 BLAKE2B 3878a87bd195aadb0f9d024e1336e50268d69c00b438b5e3471f21bc4592ebd97980004c3624d9b92232b38068ebefa0c3317cb0d9b5dfeba37c479aeadc32e4 SHA512 2e6ea690f8762f3f37885118f023048c4cba59f58002c87fa1c469cb991b2ba707015b3e54c50f17c3d6e6251d798557406925a9159f4fa914331f281dc39e48
 DIST syslog-ng-3.19.1.tar.gz 4224779 BLAKE2B e938c91101c18951a5c921bea51631400bf579ebc840300c6d8411da9b8db69935d104bfe00525512ab0173b932a8e24e2fb102e17bc4ecf58b268e52ef5b41a SHA512 f625073bafa9378109d5be34591247766a62cb5a76e814f42bfbf03472e96ebe2833f19779812abfdd950a3498115f57b97c1427c280ee0dab21d3e2eb92ca57
+DIST syslog-ng-3.20.1.tar.gz 4312715 BLAKE2B df37ea15937d67823ddf25fb935be90fed2cb9b1a653d90bb447a3d674c250f6a7963a9bf4623685c5a19e11b928d02aec508d5f061135d67cd4b6d922795ed0 SHA512 19e3896a750ef68923950ca037846808f5d8bd24e64b41a024776a19654def83fce5d48b6e0805b1389494ad1435c5c7af9d79c1188454492f7228f5644ddc5c
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
 EBUILD syslog-ng-3.13.2.ebuild 4701 BLAKE2B 4bc557a7545796a5c0c883ac3cee067396636e2292261db4f4c98c330e58b1d20e796f7214fd856d885f99fdc9f3db59ab59d3e1e0febda23ff97fdf9fedfc9c SHA512 f9ff35932c0e1af04ed237e9ded764ec1dc38d0cf952aeb1335d67b73f73262f8975cdb2f3908ee77252eef9d4ad3f6228025219bba9df263cd2b380c1c5df81
 EBUILD syslog-ng-3.17.2.ebuild 4922 BLAKE2B 560007f972492182a16701b89558923842ed5c1fa6c7e306abcc4dcc2b839b3b7404dd52214efdc5a1ac7fee0b280548e62b37b0d6a17ee0393f80aa5b0c7717 SHA512 bd08b6fff0e9022e846c7af360df41c2fbaf7d4342b0b7c099053e298b6588c535340c6b613bbc4dec0e9f7b8806b7dded125165cf0ca230733cd9e95b262599
 EBUILD syslog-ng-3.18.1.ebuild 4899 BLAKE2B d8820a1750256a9f5ee34ad3e7249a74cea84000ade2d3e1169106f336ffd3e3e1263db402350acc8693e88bf936aa13e5743ff1e1548cf744f40e2556625aa2 SHA512 3b5f475f9b596acecf905912c0d29b942d51a7d1ee3412adc1f46d658c5902bd7cb6504c6563c217e203fc9876e7253dbeefc8e5c8159c852c9a2fbad25c7d6d
 EBUILD syslog-ng-3.19.1.ebuild 4922 BLAKE2B e4f28cf97b9d63d341c632332e31020cd9bf035d05201defd12fb69b3b24a0fd14eb8db057a3d604e88dbb4b9105c78a9b99daa6d2ea80b2ab547bd909f7c1de SHA512 cf78ed7dd29b8b2a329b3146955690ba05f5b4f30f1747068f843485c9a937ddaf960132c5895ce2102c85bd5fbc46a25d8b181fc6116621aef5c03cfe3775c2
+EBUILD syslog-ng-3.20.1.ebuild 4940 BLAKE2B 2deab6224bca282b5f9f3c1380508c3eaad71600d3e55532aa12f25d23e14728019d1338a65a5d212262f4481703c61ac2ebab9db36b49c37d972b53b0a49510 SHA512 2962a7ee647136645d67b12253e23e257d547542daa8cbc86ed1c550e3eb7b4b913acf9f580ce4dc4cb4761cd7cd8ba6b11ff66e846bd048cee139f614771381
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1186 BLAKE2B 8fc7edd7e310b01dc6080332a62ed4ffc5d690d4082f800d8306232c138fac46f07ab7cebcbd40e91c2c41467880bbf61b4bbec0907e84f26cde51d24277f47c SHA512 5d8a62c83706e3bcb01b67e6873f7052c941518d566667e5b50aacdc8fcaf07a02c76ca3705369181795c2c62b5ea990cdb93501e1719d0693d597b5e6f8bee2
diff --git a/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild
new file mode 100644
index 000000000000..be35011a8896
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit autotools python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# unit tests require https://github.com/Snaipe/Criterion with additional deps
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.10.1:2
+	>=dev-libs/ivykis-0.42.3
+	>=dev-libs/libpcre-6.1:=
+	!dev-libs/eventlog
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.9.0 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	geoip2? ( dev-libs/libmaxminddb:= )
+	http? ( net-misc/curl )
+	json? ( >=dev-libs/json-c-0.9:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	smtp? ( net-libs/libesmtp )
+	spoof-source? ( net-libs/libnet:1.1= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -r lib/ivykis || die
+
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
+	fi
+
+	# drop scl modules requiring http
+	if use !http; then
+		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
+	fi
+
+	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+		sed \
+			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+				"/etc/init.d/syslog-ng reload")#g" \
+			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	for f in syslog-ng.conf.gentoo.fbsd.in \
+			syslog-ng.conf.gentoo.hardened.in \
+			syslog-ng.conf.gentoo.in; do
+		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-docs
+		--disable-java
+		--disable-java-modules
+		--disable-riemann
+		--enable-manpages
+		--localstatedir=/var/lib/syslog-ng
+		--sysconfdir=/etc/syslog-ng
+		--with-embedded-crypto
+		--with-ivykis=system
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng
+		--with-pidfile-dir=/var/run
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable amqp)
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+		$(use_enable caps linux-caps)
+		$(use_enable dbi sql)
+		$(use_enable geoip)
+		$(use_enable geoip2)
+		$(use_enable http)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_enable mongodb)
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+		$(use_enable pacct)
+		$(use_enable python)
+		$(use_enable redis)
+		$(use_enable smtp)
+		$(use_enable spoof-source)
+		$(use_enable systemd)
+		$(use_enable tcpd tcp-wrapper)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${T}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	find "${D}" -name '*.la' -delete || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+	fi
+
+	if use systemd; then
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+	fi
+}