commit: 754c5886ebc04dc73f689c5e0071c5fc95b5d41a Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Tue Jun 9 17:03:58 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Wed Jun 10 01:21:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754c5886
app-admin/syslog-ng: add support for glib 2.64 Closes: https://bugs.gentoo.org/716006 Bug: https://bugs.gentoo.org/702032 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> .../patches/syslog-ng-glib-2.64-support.patch | 63 ++++++++ app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild | 171 +++++++++++++++++++++ 2 files changed, 234 insertions(+) diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch b/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch new file mode 100644 index 00000000000..fdd98624a6e --- /dev/null +++ b/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch @@ -0,0 +1,63 @@ +diff --git a/lib/compat/glib.c b/lib/compat/glib.c +index 8b6e52447..5b8ed8891 100644 +--- a/lib/compat/glib.c ++++ b/lib/compat/glib.c +@@ -315,3 +315,18 @@ slng_g_hash_table_insert(GHashTable *hash_table, gpointer key, gpointer value) + return exists; + } + #endif ++ ++ ++#if !GLIB_CHECK_VERSION(2, 64, 0) ++gunichar ++g_utf8_get_char_validated_fixed(const gchar *p, gssize max_len) ++{ ++ // https://github.com/GNOME/glib/commit/1963821a57584b4674c20895e8a5adccd2d9effd ++ ++#undef g_utf8_get_char_validated ++ if (*p == '\0' && max_len > 0) ++ return (gunichar)-2; ++ ++ return g_utf8_get_char_validated(p, max_len); ++} ++#endif +diff --git a/lib/compat/glib.h b/lib/compat/glib.h +index a9782ed2d..0fbdbd12d 100644 +--- a/lib/compat/glib.h ++++ b/lib/compat/glib.h +@@ -109,4 +109,9 @@ gchar *g_base64_encode_fixed(const guchar *data, gsize len); + gboolean slng_g_hash_table_insert (GHashTable *hash_table, gpointer key, gpointer value); + #endif + ++#if !GLIB_CHECK_VERSION(2, 64, 0) ++#define g_utf8_get_char_validated g_utf8_get_char_validated_fixed ++gunichar g_utf8_get_char_validated_fixed (const gchar *p, gssize max_len); ++#endif ++ + #endif +diff --git a/modules/cef/tests/test-format-cef-extension.c b/modules/cef/tests/test-format-cef-extension.c +index d7f6ee3c1..f4233f96f 100644 +--- a/modules/cef/tests/test-format-cef-extension.c ++++ b/modules/cef/tests/test-format-cef-extension.c +@@ -104,7 +104,7 @@ Test(format_cef, test_null_in_value) + + configuration->template_options.on_error = ON_ERROR_DROP_MESSAGE | ON_ERROR_SILENT; + log_msg_set_value_by_name(msg, ".cef.k", "a\0b", 3); +- assert_template_format_msg("$(format-cef-extension --subkeys .cef.)", "k=a\\u0000b", msg); ++ assert_template_format_msg("$(format-cef-extension --subkeys .cef.)", "k=a\\x00b", msg); + log_msg_unref(msg); + } + +diff --git a/modules/json/tests/test_format_json.c b/modules/json/tests/test_format_json.c +index 92c61e9f1..1224ddb33 100644 +--- a/modules/json/tests/test_format_json.c ++++ b/modules/json/tests/test_format_json.c +@@ -55,7 +55,7 @@ Test(format_json, test_format_json) + assert_template_format("$(format-json MSG=$escaping)", + "{\"MSG\":\"binary stuff follows \\\"\\\\xad árvíztűrőtükörfúrógép\"}"); + assert_template_format("$(format-json MSG=$escaping2)", "{\"MSG\":\"\\\\xc3\"}"); +- assert_template_format("$(format-json MSG=$null)", "{\"MSG\":\"binary\\u0000stuff\"}"); ++ assert_template_format("$(format-json MSG=$null)", "{\"MSG\":\"binary\\\\x00stuff\"}"); + assert_template_format_with_context("$(format-json MSG=$MSG)", + "{\"MSG\":\"árvíztűrőtükörfúrógép\"}{\"MSG\":\"árvíztűrőtükörfúrógép\"}"); + assert_template_format("$(format-json --scope rfc3164)", diff --git a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild new file mode 100644 index 00000000000..834c32ffc4a --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2020 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 ~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" ) + +PATCHES=( "${FILESDIR}/patches/syslog-ng-glib-2.64-support.patch" ) + +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 +}
