commit: 6224a15aebc6f09a22681a47e03d93114b9d910a Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Fri Nov 24 07:17:15 2017 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Sun Dec 3 15:15:16 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6224a15a
app-admin/syslog-ng: version bump to 3.12.1. Closes: https://bugs.gentoo.org/592920 Closes: https://github.com/gentoo/gentoo/pull/6275 Package-Manager: Portage-2.3.16, Repoman-2.3.6 app-admin/syslog-ng/Manifest | 3 +- .../syslog-ng/files/3.12/syslog-ng.conf.gentoo | 36 +++++ .../files/3.12/syslog-ng.conf.gentoo.fbsd | 24 ++++ .../files/3.12/syslog-ng.conf.gentoo.hardened | 114 ++++++++++++++++ app-admin/syslog-ng/files/3.12/syslog-ng.confd | 42 ++++++ app-admin/syslog-ng/files/3.12/syslog-ng.rc | 58 ++++++++ app-admin/syslog-ng/metadata.xml | 5 +- app-admin/syslog-ng/syslog-ng-3.12.1.ebuild | 149 +++++++++++++++++++++ 8 files changed, 428 insertions(+), 3 deletions(-) diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index eb4f5c9341b..282ffeb2b72 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -1 +1,2 @@ -DIST syslog-ng-3.7.3.tar.gz 3511155 SHA256 49201dcfd59c8992936aa16c694f5e6593d505b44895f6c66b7d7f7895ce2c62 SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b WHIRLPOOL ee434b8919183a70f484e6c96246b020a53a42e4306b2dea3b8ec15de71a1ad5be5185f0f3df5da76f0ca68618ff8391806748c6bea4a6844648e0939a57e97a +DIST syslog-ng-3.12.1.tar.gz 8905646 BLAKE2B abe273c561569047ef4ea0b21b08341d207ecc9a37ba88d1aa28f00de8a0c28cab2942b3d461b7b4fea940668b44ceda7f9c71b6f7c7583143f4bf65adb54036 SHA512 00370f8b090156c064d9fe932e2aafe3f78ffc01bc47b2bc2f0f3c6cbdf98ea8cc2084317b8c2b1a9755cce404646b20e131039ce55b87e24f4401a55b95ff7e +DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo new file mode 100644 index 00000000000..523a6804e14 --- /dev/null +++ b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo @@ -0,0 +1,36 @@ +@version: 3.12 +# +# Syslog-ng default configuration file for Gentoo Linux + +# https://bugs.gentoo.org/426814 +@include "scl.conf" + +options { + threaded(yes); + chain_hostnames(no); + + # The default action of syslog-ng is to log a STATS line + # to the file every 10 minutes. That's pretty ugly after a while. + # Change it to every 12 hours so you get a nice daily update of + # how many messages syslog-ng missed (0). + stats_freq(43200); + # The default action of syslog-ng is to log a MARK line + # to the file every 20 minutes. That's seems high for most + # people so turn it down to once an hour. Set it to zero + # if you don't want the functionality at all. + mark_freq(3600); +}; + +source src { system(); internal(); }; + +destination messages { file("/var/log/messages"); }; + +# By default messages are logged to tty12... +destination console_all { file("/dev/tty12"); }; +# ...if you intend to use /dev/console for programs like xconsole +# you can comment out the destination line above that references /dev/tty12 +# and uncomment the line below. +#destination console_all { file("/dev/console"); }; + +log { source(src); destination(messages); }; +log { source(src); destination(console_all); }; diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.fbsd new file mode 100644 index 00000000000..a0f516c7a58 --- /dev/null +++ b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.fbsd @@ -0,0 +1,24 @@ +@version: 3.12 +# +# Syslog-ng default configuration file for Gentoo FreeBSD +# + +# https://bugs.gentoo.org/426814 +@include "scl.conf" + +options { + threaded(yes); + chain_hostnames(no); + + # The default action of syslog-ng is to log a STATS line + # to the file every 10 minutes. That's pretty ugly after a while. + # Change it to every 12 hours so you get a nice daily update of + # how many messages syslog-ng missed (0). + stats_freq(43200); +}; + +source src { system(); internal(); }; + +destination messages { file("/var/log/messages"); }; + +log { source(src); destination(messages); }; diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.hardened new file mode 100644 index 00000000000..8497ad8a321 --- /dev/null +++ b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.hardened @@ -0,0 +1,114 @@ +@version: 3.12 +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# https://bugs.gentoo.org/426814 +@include "scl.conf" + +# +# Syslog-ng configuration file, compatible with default hardened installations. +# + +options { + threaded(yes); + chain_hostnames(no); + stats_freq(43200); +}; + +source src { + unix-dgram("/dev/log"); + internal(); +}; +source kernsrc { + file("/proc/kmsg"); +}; + +#source net { udp(); }; +#log { source(net); destination(net_logs); }; +#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); }; + +destination authlog { file("/var/log/auth.log"); }; +destination _syslog { file("/var/log/syslog"); }; +destination cron { file("/var/log/cron.log"); }; +destination daemon { file("/var/log/daemon.log"); }; +destination kern { file("/var/log/kern.log"); }; +destination lpr { file("/var/log/lpr.log"); }; +destination user { file("/var/log/user.log"); }; +destination uucp { file("/var/log/uucp.log"); }; +#destination ppp { file("/var/log/ppp.log"); }; +destination mail { file("/var/log/mail.log"); }; + +destination avc { file("/var/log/avc.log"); }; +destination audit { file("/var/log/audit.log"); }; +destination pax { file("/var/log/pax.log"); }; +destination grsec { file("/var/log/grsec.log"); }; + +destination mailinfo { file("/var/log/mail.info"); }; +destination mailwarn { file("/var/log/mail.warn"); }; +destination mailerr { file("/var/log/mail.err"); }; + +destination newscrit { file("/var/log/news/news.crit"); }; +destination newserr { file("/var/log/news/news.err"); }; +destination newsnotice { file("/var/log/news/news.notice"); }; + +destination debug { file("/var/log/debug"); }; +destination messages { file("/var/log/messages"); }; +destination console { usertty("root"); }; +destination console_all { file("/dev/tty12"); }; +#destination loghost { udp("loghost" port(999)); }; + +destination xconsole { pipe("/dev/xconsole"); }; + +filter f_auth { facility(auth); }; +filter f_authpriv { facility(auth, authpriv); }; +filter f_syslog { not facility(authpriv, mail); }; +filter f_cron { facility(cron); }; +filter f_daemon { facility(daemon); }; +filter f_kern { facility(kern); }; +filter f_lpr { facility(lpr); }; +filter f_mail { facility(mail); }; +filter f_user { facility(user); }; +filter f_uucp { facility(uucp); }; +#filter f_ppp { facility(ppp); }; +filter f_news { facility(news); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..warn) + and not facility(auth, authpriv, mail, news); }; +filter f_emergency { level(emerg); }; + +filter f_info { level(info); }; + +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; + +filter f_avc { message(".*avc: .*"); }; +filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); }; +filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); }; +filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); }; + +log { source(src); filter(f_authpriv); destination(authlog); }; +log { source(src); filter(f_syslog); destination(_syslog); }; +log { source(src); filter(f_cron); destination(cron); }; +log { source(src); filter(f_daemon); destination(daemon); }; +log { source(kernsrc); filter(f_kern); destination(kern); destination(console_all); }; +log { source(src); filter(f_lpr); destination(lpr); }; +log { source(src); filter(f_mail); destination(mail); }; +log { source(src); filter(f_user); destination(user); }; +log { source(src); filter(f_uucp); destination(uucp); }; +log { source(kernsrc); filter(f_pax); destination(pax); }; +log { source(kernsrc); filter(f_grsec); destination(grsec); }; +log { source(kernsrc); filter(f_audit); destination(audit); }; +log { source(kernsrc); filter(f_avc); destination(avc); }; +log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); }; +log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); }; +log { source(src); filter(f_mail); filter(f_err); destination(mailerr); }; +log { source(src); filter(f_news); filter(f_crit); destination(newscrit); }; +log { source(src); filter(f_news); filter(f_err); destination(newserr); }; +log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); }; +log { source(src); filter(f_debug); destination(debug); }; +log { source(src); filter(f_messages); destination(messages); }; +log { source(src); filter(f_emergency); destination(console); }; +#log { source(src); filter(f_ppp); destination(ppp); }; +log { source(src); destination(console_all); }; diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.confd b/app-admin/syslog-ng/files/3.12/syslog-ng.confd new file mode 100644 index 00000000000..42fa26ab4cf --- /dev/null +++ b/app-admin/syslog-ng/files/3.12/syslog-ng.confd @@ -0,0 +1,42 @@ +# Config file for /etc/init.d/syslog-ng + +# If you are not using network logging, this entire section should be +# commented out. Otherwise, choose one of the settings below based on +# how you are configuring your network. +# +# If you are using the net.* scripts to configure your network, you should +# set rc_need to match the interface through which your logging server +# can be reached. +#rc_need="net.eth0" +# +# If you are using an interface manager like wicd, dhcpcd in standalone +# mode, networkmanager, etc to control your interfaces, set rc_need to +# the name of that service. +# rc_need="dhcpcd" +#rc_need="networkmanager" +# +# If you are using newnet and configuring your interface statically with +# the network script, you should use this setting. +#rc_need="network" +# +# You can use this setting, but I do not recommend relying on it. +#rc_need="net" +# +# You may also want to uncomment the following if you are using network +# logging. +#rc_use="stunnel" + +# For very customized setups these variables can be adjusted as needed +# but for most situations they should remain commented: +# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf +# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng +# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist +# SYSLOG_NG_PIDFILE_DIR=/run +# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid +# SYSLOG_NG_GROUP=root +# SYSLOG_NG_USER=root + +# Put any additional options for syslog-ng here. +# See syslog-ng(8) for more information. + +SYSLOG_NG_OPTS="" diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.rc b/app-admin/syslog-ng/files/3.12/syslog-ng.rc new file mode 100644 index 00000000000..09f969180b0 --- /dev/null +++ b/app-admin/syslog-ng/files/3.12/syslog-ng.rc @@ -0,0 +1,58 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +: SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf} +: SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng} +: SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist} +: SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run} +: SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid} + +: SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root} +: SYSLOG_NG_USER=${SYSLOG_NG_USER:-root} + +command="/usr/sbin/syslog-ng" +command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}" +extra_commands="checkconfig" +extra_started_commands="reload" +pidfile="${SYSLOG_NG_PIDFILE}" +start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\"" +description="Syslog-ng is a syslog replacement with advanced filtering features." +description_checkconfig="Check the configuration file that will be used by \"start\"" +description_reload="Reload the configuration without exiting" +required_files="${SYSLOG_NG_CONFIGFILE}" +required_dirs="${SYSLOG_NG_PIDFILE_DIR}" + +depend() { + use clock + need hostname localmount + after bootmisc + provide logger +} + +checkconfig() { + ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})" + syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}" + eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})" +} + +start_pre() { + checkconfig || return 1 + checkpath \ + -d \ + --mode 0700 \ + --owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \ + "${SYSLOG_NG_STATEFILE_DIR}" +} + +stop_pre() { + [[ "$RC_CMD" == "restart" ]] && sleep 1 + return 0 +} + +reload() { + checkconfig || return 1 + ebegin "Reloading configuration and re-opening log files" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? +} diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml index e4e0c1e1bed..90774e400b0 100644 --- a/app-admin/syslog-ng/metadata.xml +++ b/app-admin/syslog-ng/metadata.xml @@ -4,12 +4,13 @@ <!-- maintainer-needed --> <use> <flag name="amqp">Enable support for AMQP destinations</flag> - <flag name="smtp">Enable support for SMTP destinations</flag> - <flag name="spoof-source">Enable support for spoofed source addresses</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="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> + <flag name="smtp">Enable support for SMTP destinations</flag> + <flag name="spoof-source">Enable support for spoofed source addresses</flag> </use> <upstream> <remote-id type="github">balabit/syslog-ng</remote-id> diff --git a/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild new file mode 100644 index 00000000000..0b8222f6656 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit autotools python-single-r1 eutils multilib systemd versionator + +MY_PV=${PV/_/} +MY_PV_MM=$(get_version_component_range 1-2) +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"; +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"; + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="test" + +RDEPEND=" + amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) + caps? ( sys-libs/libcap ) + dbi? ( >=dev-db/libdbi-0.9.0 ) + geoip? ( >=dev-libs/geoip-1.5.0 ) + 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 ) + >=dev-libs/libpcre-6.1 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + !dev-libs/eventlog + >=dev-libs/glib-2.10.1:2" +DEPEND="${RDEPEND} + >=dev-libs/ivykis-0.36.1 + sys-devel/flex + virtual/pkgconfig" + +S=${WORKDIR}/${PN}-${MY_PV} + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + local f + + use python && python_fix_shebang . + + # remove bundled libs + rm -rv lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die + + if use !json ; then + sed -i -e '/cim/d' scl/Makefile.am || die + eautoreconf + fi + + for f in "${FILESDIR}"/*logrotate*.in ; do + local bn=$(basename "${f}") + + sed \ + -e "$(usex systemd \ + 's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \ + 's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \ + "${f}" > "${T}/${bn/.in/}" || die + done + + default +} + +src_configure() { + econf \ + --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 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) +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \ + contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \ + "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" + + # Install default configuration + insinto /etc/syslog-ng + if use userland_BSD ; then + newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf + else + newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf + fi + + insinto /etc/logrotate.d + newins "${T}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc" syslog-ng + newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng + keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng + prune_libtool_files --modules + + use python && python_optimize +} + +pkg_postinst() { + elog "For detailed documentation please see the upstream website:" + elog "https://www.balabit.com/sites/default/files/documents/syslog-ng-ose-${MY_PV_MM}-guides/en/syslog-ng-ose-v${MY_PV_MM}-guide-admin/html/index.html"; + + # bug #355257 + if ! has_version app-admin/logrotate ; then + echo + 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." + echo + fi +}
