rsyslog: restore logrotate file; relax musl checks
File mysteriously deleted in a908103f24
.
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]
This commit is contained in:
parent
ca99a521a4
commit
51b760900b
|
@ -2,6 +2,6 @@
|
||||||
missingok
|
missingok
|
||||||
sharedscripts
|
sharedscripts
|
||||||
postrotate
|
postrotate
|
||||||
pkill -HUP rsyslogd
|
sv hup rsyslogd
|
||||||
endscript
|
endscript
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'rsyslog'
|
# Template file for 'rsyslog'
|
||||||
pkgname=rsyslog
|
pkgname=rsyslog
|
||||||
version=8.2204.1
|
version=8.2204.1
|
||||||
revision=1
|
revision=2
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
|
configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
|
||||||
--enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
|
--enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
|
||||||
|
@ -29,6 +29,7 @@ disable_parallel_build=yes
|
||||||
|
|
||||||
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
|
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
|
||||||
makedepends+=" musl-legacy-compat"
|
makedepends+=" musl-legacy-compat"
|
||||||
|
make_check=extended # some tests sporadically SIGSEGV
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
|
@ -41,6 +42,7 @@ pre_configure() {
|
||||||
post_install() {
|
post_install() {
|
||||||
vsv rsyslogd
|
vsv rsyslogd
|
||||||
vconf ${FILESDIR}/rsyslog.conf
|
vconf ${FILESDIR}/rsyslog.conf
|
||||||
|
vinstall ${FILESDIR}/rsyslog.logrotate 644 etc/logrotate.d rsyslog
|
||||||
}
|
}
|
||||||
|
|
||||||
rsyslog-gssapi_package() {
|
rsyslog-gssapi_package() {
|
||||||
|
|
Loading…
Reference in New Issue