commit: 8cff8b1d82fbfc63b4d27db8e1dd43396c849f5d Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Thu Dec 19 15:16:36 2019 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Dec 20 05:45:11 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cff8b1d
app-admin/syslog-ng: bump to 3.25.1 Closes: https://bugs.gentoo.org/686276 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> app-admin/syslog-ng/Manifest | 1 + app-admin/syslog-ng/files/syslog-ng.logrotate | 12 -- .../syslog-ng/files/syslog-ng.logrotate.hardened | 75 --------- .../files/syslog-ng.logrotate.hardened.in | 8 + app-admin/syslog-ng/files/syslog-ng.logrotate.in | 1 + app-admin/syslog-ng/syslog-ng-3.25.1.ebuild | 169 +++++++++++++++++++++ 6 files changed, 179 insertions(+), 87 deletions(-) diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index 82ae91362c8..3169663255b 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -1,2 +1,3 @@ DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223 SHA512 4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f DIST syslog-ng-3.24.1.tar.gz 4909513 BLAKE2B 4b8d05899f9767784b6d24008d55808bee0af4a29883b2cb67031d23f4937632ba00f2ed7a9e969984ebec2785243a9e60811c4c2ccb3c6188c66a71af004f36 SHA512 b5326193e20db16763d3e187292bf683ebb77032b800a6e54a4ce2dd3864dda48b3d0ffc4d442eff0261117ac7a76d7927f4c8d0d96fc59ce29b46da6bd052d5 +DIST syslog-ng-3.25.1.tar.gz 4938596 BLAKE2B bfcbd19b5a06c7ea15899bb919564661043bc7ab87bed147f77ab1aed153d70522aba9a42ab7dfa66d3b52a5f8432954b8a00594f428ddeb202979c5b9260da3 SHA512 79e09f1ba11080179c572016ce27328a28d479e68e663d39fb16624c03dc37d8439020ede922f78680e31e21629a6c13a4671464a31213c1dcf6acd2c5cd4b13 diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate b/app-admin/syslog-ng/files/syslog-ng.logrotate deleted file mode 100644 index ba4730e084f..00000000000 --- a/app-admin/syslog-ng/files/syslog-ng.logrotate +++ /dev/null @@ -1,12 +0,0 @@ -# -# Syslog-ng logrotate snippet for Gentoo Linux -# contributed by Michael Sterrett -# - -/var/log/messages { - missingok - sharedscripts - postrotate - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true - endscript -} diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened deleted file mode 100644 index 678814a623f..00000000000 --- a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened +++ /dev/null @@ -1,75 +0,0 @@ -# -# Syslog-ng logrotate snippet for Hardened Gentoo Linux -# contributed by Maciej Grela -# -# Updated bug #284669 - -# Generic -/var/log/debug /var/log/syslog /var/log/kern.log { - sharedscripts - missingok - postrotate - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true - endscript -} - -# System services -/var/log/cron.log /var/log/daemon.log /var/log/lpr.log /var/log/uucp.log { - sharedscripts - missingok - postrotate - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true - endscript -} - -# User log -/var/log/user.log { - sharedscripts - missingok - postrotate - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true - endscript -} - -# News system -/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice { - sharedscripts - missingok - postrotate - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true - endscript -} - -# Mail system -/var/log/mail.log /var/log/mail.info /var/log/mail.err /var/log/mail.warn { - sharedscripts - missingok - postrotate - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true - endscript -} - -# Hardened logs -/var/log/avc.log /var/log/audit.log /var/log/pax.log /var/log/grsec.log { - sharedscripts - missingok - postrotate - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true - endscript -} - -# Authentication -/var/log/auth.log { - sharedscripts - postrotate - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true - endscript -} - -# the rest -/var/log/messages { - sharedscripts - postrotate - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true - endscript -} diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in index 21ec5eba69c..5ff03c5d6a5 100644 --- a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in +++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in @@ -6,6 +6,7 @@ # Generic /var/log/debug /var/log/syslog /var/log/kern.log { + delaycompress sharedscripts missingok postrotate @@ -15,6 +16,7 @@ # System services /var/log/cron.log /var/log/daemon.log /var/log/lpr.log /var/log/uucp.log { + delaycompress sharedscripts missingok postrotate @@ -24,6 +26,7 @@ # User log /var/log/user.log { + delaycompress sharedscripts missingok postrotate @@ -33,6 +36,7 @@ # News system /var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice { + delaycompress sharedscripts missingok postrotate @@ -42,6 +46,7 @@ # Mail system /var/log/mail.log /var/log/mail.info /var/log/mail.err /var/log/mail.warn { + delaycompress sharedscripts missingok postrotate @@ -51,6 +56,7 @@ # Hardened logs /var/log/avc.log /var/log/audit.log /var/log/pax.log /var/log/grsec.log { + delaycompress sharedscripts missingok postrotate @@ -60,6 +66,7 @@ # Authentication /var/log/auth.log { + delaycompress sharedscripts postrotate @GENTOO_RESTART@ > /dev/null 2>&1 || true @@ -68,6 +75,7 @@ # the rest /var/log/messages { + delaycompress sharedscripts postrotate @GENTOO_RESTART@ > /dev/null 2>&1 || true diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.in index 2e368bd1099..ab79747fa3c 100644 --- a/app-admin/syslog-ng/files/syslog-ng.logrotate.in +++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.in @@ -4,6 +4,7 @@ # /var/log/messages { + delaycompress missingok sharedscripts postrotate diff --git a/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild new file mode 100644 index 00000000000..5566d7e43e4 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +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 geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( 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 ) + 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} + test? ( dev-libs/criterion )" +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 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 +}
