Your message dated Sun, 08 Dec 2024 14:53:12 +0000
with message-id <e1tkiem-00e1sl...@fasolo.debian.org>
and subject line Bug#1087204: fixed in runit-services 0.8.0
has caused the Debian Bug report #1087204,
regarding runit-services: exim4 script incompatible with new defaults and
doesn't update config
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1087204: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1087204
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: runit-services
Version: 0.7.2
Severity: normal
Tags: patch
Dear Maintainer,
Since the last stable release, the default environment provided for
exim4 on new installations uses a different set of variables to
configure the daemon. As a result, the current runscript fails to launch
exim4 because it fails to provide a queue runner interval value to the
-q flag, leading to the following error being logged by svlogd:
exim: incompatible command-line options or arguments
On a default out-of-the box installation, the following command line
would have been attempted:
/usr/sbin/exim4 -bd -d -q
The change that broke this runscript is "Switch to EXIMDAEMONOPTS":
https://salsa.debian.org/exim-team/exim4/-/commit/ea38b9fddb71d1b5e9a125ca3a2ce7b7cfae0898
I attach a patch which fixes this by using the new EXIMSERVICE options
and providing a default value for this same.
Another important failure to support out-of-the box installations is
that the update-exim4.conf script is not run. This patch also fixes this
and does so on 'sv hup exim4' too.
Thank you!
-- System Information:
Debian Release: trixie/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 6.11.2-amd64 (SMP w/32 CPU threads; PREEMPT)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8),
LANGUAGE=en_GB:en
Shell: /bin/sh linked to /usr/bin/dash
Init: runit (via /run/runit.stopit)
LSM: AppArmor: enabled
Versions of packages runit-services depends on:
ii runit 2.1.2-60
ii runit-helper 2.16.4
Versions of packages runit-services recommends:
ii runit-init 2.1.2-60
Versions of packages runit-services suggests:
pn socklog <none>
-- no debconf information
>From 84916d09416d8ab05d43911f5c7e43a010532fff Mon Sep 17 00:00:00 2001
From: Andrew Bower <and...@bower.uk>
Date: Sat, 9 Nov 2024 14:55:24 +0000
Subject: [PATCH] exim4: fix exim4 launch with trixie default env
Since the change to the default environment shipped after bookworm in
<https://salsa.debian.org/exim-team/exim4/-/commit/ea38b9fddb71d1b5e9a125ca3a2ce7b7cfae0898>
the runscript for exim4 will by default attempt to start the daemon with
invalid command line arguments (namely missing queue runner interval):
2024-11-09_14:17:13.18129 /usr/sbin/exim4 -bd -d -q
2024-11-09_14:17:13.18358 exim: incompatible command-line options or arguments
This patch fixes this by using the new EXIMSERVICE default and providing
a default for that variable matching other init systems.
Additionally, this runscript omits an invocation of update-exim4.conf to
assemble the debian autogenerated config where applicable. This patch
does so on launch and on HUP.
Defaults from pre-trixie configurations are used by preference if present.
---
debian/changelog | 2 +-
sv/exim4/control/h | 4 ++++
sv/exim4/run | 18 ++++++++++++++----
3 files changed, 19 insertions(+), 5 deletions(-)
create mode 100755 sv/exim4/control/h
diff --git a/debian/changelog b/debian/changelog
index 4be4965..9c430b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-runit-services (0.7.3) UNRELEASED; urgency=medium
+runit-services (0.7.3~0ajb.6) UNRELEASED; urgency=medium
* new changelog entry, for testing
diff --git a/sv/exim4/control/h b/sv/exim4/control/h
new file mode 100755
index 0000000..b76d24c
--- /dev/null
+++ b/sv/exim4/control/h
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/sbin/update-exim4.conf $UPEX4OPTS
+false
diff --git a/sv/exim4/run b/sv/exim4/run
index 7c4f3da..ccc40fc 100755
--- a/sv/exim4/run
+++ b/sv/exim4/run
@@ -1,11 +1,18 @@
#!/usr/bin/env /lib/runit/invoke-run
#Copyright: 2022 Lorenzo Puliti <plore...@disroot.org>
+#Copyright: 2024 Andrew Bower <and...@bower.uk>
#License: CC0-1.0
exec 2>&1
-# only works for "combined" configuration mode
-QUEUERUNNER='combined'
+# Compatibility with defaults file carried over from pre-trixie installations
+if [ -n
"$QUEUERUNNER$QUEUEINTERVAL$COMMONOPTIONS$QUEUERUNNEROPTIONS$QFLAGS$SMTPLISTENEROPTIONS"
]
+then
+ EXIMSERVICE=${EXIMSERVICE--bdf -q${QFLAGS}${QUEUEINTERVAL} $COMMONOPTIONS
$QUEUERUNNEROPTIONS $SMTPLISTENEROPTIONS}
+else
+ EXIMSERVICE=${EXIMSERVICE--bdf -q30m}
+fi
+
[ -d /run/exim4 ] || \
install -d -oDebian-exim -gDebian-exim -m750 /run/exim4
LANG=C
@@ -14,5 +21,8 @@ export LANG
if [ -e /etc/runit/verbose ]; then
echo "invoke-run: starting ${PWD##*/}"
fi
-#-bdf is also ok but no log to stdout for svlogd
-exec ##bin## -bd -d -q${QFLAGS}${QUEUEINTERVAL} $COMMONOPTIONS
$QUEUERUNNEROPTIONS $SMTPLISTENEROPTIONS
+
+# '-d' option appended to provide debug output for svlogd
+
+/usr/sbin/update-exim4.conf $UPEX4OPTS
+exec ##bin## $EXIMSERVICE -d
--
2.45.2
--- End Message ---
--- Begin Message ---
Source: runit-services
Source-Version: 0.8.0
Done: Lorenzo Puliti <plore...@disroot.org>
We believe that the bug you reported is fixed in the latest version of
runit-services, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1087...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Lorenzo Puliti <plore...@disroot.org> (supplier of updated runit-services
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Thu, 21 Nov 2024 19:47:57 +0100
Source: runit-services
Architecture: source
Version: 0.8.0
Distribution: unstable
Urgency: medium
Maintainer: Lorenzo Puliti <plore...@disroot.org>
Changed-By: Lorenzo Puliti <plore...@disroot.org>
Closes: 1069188 1079268 1083206 1086143 1086144 1087204
Changes:
runit-services (0.8.0) unstable; urgency=medium
.
[ Lorenzo Puliti ]
* d/control: update Vcs fields
* bump Standards-Version to 4.7.0
* update lintian overrides
* create the sysv override directory in postinst,
remove in postrm (purge)
* fix purge logic
* NEWS for runit-services users: dhclient issues
* update d/copyright
* autopkgtest: add a test for binary path (see #1069075)
* all runfiles (source): use ##bin## placeholder
* Drop services-test autopkgtest, it doesn't work with salsa
* Anacron, apache2, cups, openntpd: add flagfiles to
forward invoke-rc.d calls
* elogind: force log to console and use svlogd
* drop wicd, package no longer in Debian
* override rsyslog logrotate file (Closes: #1079268)
* add smartmontools runscript.
Thanks to Dimitris T." <dimit...@stinpriza.org> (Closes: #1069188)
* add unbound runscript.
Thanks to Dimitris T." <dimit...@stinpriza.org> (Closes: #1083206)
* add docker runscript
.
[ Andrew Bower ]
* gpm: fix command line overquoting preventing start (Closes: #1086143)
* atd: fix daemon path, log to syslog
* exim4: fix exim4 launch with trixie default env (Closes: #1087204)
* add lldpd runscript
* isc-dhcp-server: add runscript for IPv6 interfaces (Closes: #1086144)
Checksums-Sha1:
0f20536d29d25d02f312f74da297625f6f9235e9 1076 runit-services_0.8.0.dsc
478015b7906c9386380a13ae5490cab67bb13058 19220 runit-services_0.8.0.tar.xz
b35b6e6dbc6998b864615fcd8b90ca647801e26b 5170
runit-services_0.8.0_amd64.buildinfo
Checksums-Sha256:
e1ced5da4f689499e014c976fd0ee512ddca3495cfed52f18a4cd42d0818b796 1076
runit-services_0.8.0.dsc
8dc2b543080625550e3859d49fe84c0333045286b8f9833cd631f83026fc8cb4 19220
runit-services_0.8.0.tar.xz
1a27219b9c2f4ba79cbbb7515f87274a9a4783f2649b0e8566becdba29e3d9cc 5170
runit-services_0.8.0_amd64.buildinfo
Files:
baf87bcf0b49e0ce2d6cefb2462b1f16 1076 admin optional runit-services_0.8.0.dsc
e724a961d730b66829e4c67e511bfcd8 19220 admin optional
runit-services_0.8.0.tar.xz
df80d20f21ee68e7befe2381486aee73 5170 admin optional
runit-services_0.8.0_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iIsEARYIADMWIQQUWTv/Sl6/b+DpcW7svtu2B7myvgUCZ1WmMxUcd2VyZGFoaWFz
QGRlYmlhbi5vcmcACgkQ7L7btge5sr6G1QD+OaxTbipqzNU6f2507IxVdAzJrS/H
bF/wctwnRk5vh3IA/33fIMVq1yrXQ94outZgfsBc/Jzf8rMsN9ApVssjiIkD
=UJHc
-----END PGP SIGNATURE-----
pgp_7w7ES4XR8.pgp
Description: PGP signature
--- End Message ---
