Skip to content

Commit

Permalink
app-admin/syslog-ng: bump to 3.22.1
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/690490
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Closes: #12526
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
  • Loading branch information
hydrapolic authored and gyakovlev committed Jul 30, 2019
1 parent 0d2e97a commit 969460a
Show file tree
Hide file tree
Showing 7 changed files with 180 additions and 3 deletions.
1 change: 1 addition & 0 deletions app-admin/syslog-ng/Manifest
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ DIST syslog-ng-3.17.2.tar.gz 9119227 BLAKE2B 3268a51c587e66579b30ee8d27397eeeb3a
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.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223 SHA512 4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f
DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
1 change: 1 addition & 0 deletions app-admin/syslog-ng/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<flag name="geoip2">Add support for geo lookup based on IPs via <pkg>dev-libs/libmaxminddb</pkg></flag>
<flag name="http">Enable support for HTTP destinations</flag>
<flag name="json">Enable support for JSON template formatting via <pkg>dev-libs/json-c</pkg></flag>
<flag name="kafka">Enable support for Kafka destinations</flag>
<flag name="mongodb">Enable support for mongodb destinations</flag>
<flag name="pacct">Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)</flag>
<flag name="redis">Enable support for Redis destinations</flag>
Expand Down
171 changes: 171 additions & 0 deletions app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
# 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 ~riscv ~s390 ~sh ~sparc ~x86"
IUSE="amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp 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.4
>=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:= )
kafka? ( >=dev-libs/librdkafka-1.0.0:= )
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
python? ( ${PYTHON_DEPS} )
redis? ( >=dev-libs/hiredis-0.11.0:= )
smtp? ( net-libs/libesmtp )
snmp? ( net-analyzer/net-snmp )
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.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 kafka)
$(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 snmp snmp-dest)
$(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
newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf

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
}
2 changes: 1 addition & 1 deletion profiles/arch/alpha/package.use.mask
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ app-arch/rpm test

# Tomáš Mózes <hydrapolic@gmail.com> (2018-06-05)
# Unkeyworded dependencies.
app-admin/syslog-ng amqp mongodb
app-admin/syslog-ng amqp kafka mongodb

# Thomas Deutschmann <whissi@gentoo.org> (2018-06-02)
# Needs dev-ruby/asciidoctor which has a lot of unstable deps
Expand Down
4 changes: 4 additions & 0 deletions profiles/arch/ia64/package.use.mask
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# Tomáš Mózes <hydrapolic@gmail.com> (2019-07-24)
# Unkeyworded dependency
app-admin/syslog-ng kafka

# Sergei Trofimovich <slyfox@gentoo.org> (2019-05-21)
# No ia64 arch support for jit. Version 17 USE=debug
# required USE=jit.
Expand Down
2 changes: 1 addition & 1 deletion profiles/arch/powerpc/package.use.mask
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ sys-devel/llvm gold

# Tomáš Mózes <hydrapolic@gmail.com> (2018-06-05)
# Unkeyworded dependencies.
app-admin/syslog-ng mongodb
app-admin/syslog-ng kafka mongodb

# Anthony G. Basile <blueness@gentoo.org> (2018-04-14)
# net-vpn/tor, tests are broken on ppc/ppc64, bug #653098
Expand Down
2 changes: 1 addition & 1 deletion profiles/arch/riscv/package.use.mask
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dev-vcs/git pcre-jit
# This includes also packages which do not support python-3 or
# do not support python-3.7 yet.

app-admin/syslog-ng amqp dbi geoip geoip2 json mongodb python redis spoof-source smtp
app-admin/syslog-ng amqp dbi geoip geoip2 json kafka mongodb python redis spoof-source smtp snmp
app-admin/sysstat lm_sensors
app-arch/unzip natspec
app-crypt/gnupg smartcard tofu wks-server
Expand Down

0 comments on commit 969460a

Please sign in to comment.