Bug#285973: exim4-base: Please allow option passing to /usr/sbin/update-exim4.conf from init script

[Stephen Gran]

--BXVAT5kNtrzKuDFl
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Package: exim4-base
Version: 4.34-9
Severity: wishlist
Tags: patch

The patch below allows a local admin to automate arguments passed to
update-exim4.conf, if for instance they want to use a different
directory structure or a different output file.

Thanks,

--- /etc/default/exim4  2004-04-11 11:26:37.000000000 -0400
+++ exim4       2004-12-16 12:20:52.000000000 -0500
@@ -20,3 +20,5 @@
 QFLAGS=3D''
 # options for daemon listening on port 25
 SMTPLISTENEROPTIONS=3D''
+# options for update-exim4.conf
+UPX4OPTS=3D''
--- /etc/init.d/exim4   2004-03-15 10:40:18.000000000 -0500
+++ exim4       2004-12-16 12:21:57.000000000 -0500
@@ -10,6 +10,11 @@

 [ -n "$EX4DEBUG" ] && set -x

+#read default file
+QUEUERUNNER=3D'combined'
+QUEUEINTERVAL=3D'30m'
+[ -f /etc/default/exim4 ] && . /etc/default/exim4
+
 upex4conf() {
   UPEX4CONF=3D"update-exim4.conf"
   OLDIFS=3D"$IFS"
@@ -17,7 +22,7 @@
   for p in $PATH; do
     if [ -x "$p/$UPEX4CONF" ]; then
       IFS=3D"$OLDIFS"
-      $p/$UPEX4CONF
+      $p/$UPEX4CONF "$UPX4OPTS"
       return 0
     fi
   done
@@ -38,11 +43,6 @@
 ##test -x $DAEMON || exit 0
 test -x /usr/lib/exim4/exim4 || exit 0

-#read default file
-QUEUERUNNER=3D'combined'
-QUEUEINTERVAL=3D'30m'
-[ -f /etc/default/exim4 ] && . /etc/default/exim4
-
 start_exim()
 {
   case ${QUEUERUNNER} in


-- Package-specific info:
Exim version 4.34 #1 built 07-Dec-2004 13:59:38
Copyright (c) University of Cambridge 2004
Berkeley DB: Sleepycat Software: Berkeley DB 3.2.9: (May 26, 2004)
Support for: iconv() IPv6 GnuTLS
Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dsearch n=
is nis0 passwd
Authenticators: cram_md5 plaintext
Routers: accept dnslookup ipliteral manualroute queryprogram redirect
Transports: appendfile/maildir/mailstore autoreply lmtp pipe smtp
Fixed never_users: 0
Configuration file is /var/lib/exim4/config.autogenerated
# /etc/exim4/update-exim4.conf.conf
#
# Edit this file and /etc/mailname by hand and execute update-exim4.conf
# yourself or use 'dpkg-reconfigure exim4-config'

dc_eximconfig_configtype=3D'smarthost'
dc_other_hostnames=3D''
dc_local_interfaces=3D'127.0.0.1'
dc_readhost=3D''
dc_relay_domains=3D''
dc_minimaldns=3D'false'
dc_relay_nets=3D''
dc_smarthost=3D'mail.lobefin.net'
CFILEMODE=3D'644'
dc_use_split_config=3D'true'
dc_hide_mailname=3D'false'
mailname:gashuffer.lobefin.net

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.8-1-686-smp
Locale: LANG=3DC, LC_CTYPE=3Den_US.ISO-8859-15 (charmap=3DISO-8859-15) (ign=
ored: LC_ALL set to en_US.ISO-8859-15)

Versions of packages exim4-base depends on:
ii  adduser                     3.59         Add and remove users and groups
ii  cron                        3.0pl1-86    management of regular backgrou=
nd p
ii  debconf [debconf-2.0]       1.4.41       Debian configuration managemen=
t sy
ii  exim4-config [exim4-config- 4.34-9       Debian configuration for exim4
ii  libc6                       2.3.2.ds1-19 GNU C Library: Shared librarie=
s an
ii  libdb3                      3.2.9-20     Berkeley v3 Database Libraries=
 [ru
ii  netbase                     4.19         Basic TCP/IP networking system
ii  passwd                      1:4.0.3-30.4 Change and administer password=
 and

-- debconf information:
  exim4/purge_spool: false
  exim4/move_exim3_spool: false

--=20
 -----------------------------------------------------------------
|   ,''`.                                            Stephen Gran |
|  : :' :                                        sgran@debian.org |
|  `. `'                        Debian user, admin, and developer |
|    `-                                     http://www.debian.org |
 -----------------------------------------------------------------

--BXVAT5kNtrzKuDFl
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFBwckoSYIMHOpZA44RAje9AKCG6iW3LZ1q9clRpUl/uvtTxk8iGwCfWd50
RBX1+Fsp06kI5qjib4zHbto=
=GjAS
-----END PGP SIGNATURE-----

--BXVAT5kNtrzKuDFl--