From 51b760900bd155f4bcca0e236ca29a6776eb28de Mon Sep 17 00:00:00 2001 From: Antonio Gurgel Date: Mon, 22 Aug 2022 16:49:18 -0700 Subject: [PATCH] rsyslog: restore logrotate file; relax musl checks File mysteriously deleted in a908103f241. Checks on musl throw difficult-to-reproduce segfaults. Additional change by @ahesford (as per dissucion on IRC): Replace `pkill -HUP rsyslogd` with `sv hup rsyslogd` in logrotate file. Closes: #38899 [via git-merge-pr] --- srcpkgs/rsyslog/files/rsyslog.logrotate | 2 +- srcpkgs/rsyslog/template | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rsyslog/files/rsyslog.logrotate b/srcpkgs/rsyslog/files/rsyslog.logrotate index a6dcebeda08..0aa1824babb 100644 --- a/srcpkgs/rsyslog/files/rsyslog.logrotate +++ b/srcpkgs/rsyslog/files/rsyslog.logrotate @@ -2,6 +2,6 @@ missingok sharedscripts postrotate - pkill -HUP rsyslogd + sv hup rsyslogd endscript } diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 62684029acb..8d35c2618bc 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,7 +1,7 @@ # Template file for 'rsyslog' pkgname=rsyslog version=8.2204.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp @@ -29,6 +29,7 @@ disable_parallel_build=yes if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" + make_check=extended # some tests sporadically SIGSEGV fi pre_configure() { @@ -41,6 +42,7 @@ pre_configure() { post_install() { vsv rsyslogd vconf ${FILESDIR}/rsyslog.conf + vinstall ${FILESDIR}/rsyslog.logrotate 644 etc/logrotate.d rsyslog } rsyslog-gssapi_package() {