Bug#431019: exim4-config: debian packaging files (dpkg-dist/dpkg-old) still cause problems

[Sepp Wijnands]

Package: exim4-config
Version: 4.67-7
Followup-For: Bug #431019

Hi,

Passive configuration files installed by dpkg still cause update-exim4.conf to barf
about DEBCONFsomethingDEBCONF directives:

	ips0:/etc/exim4# update-exim4.conf
	DEBCONFsomethingDEBCONF found in exim configuration. This is most probably
	caused by you upgrading to exim4 4.67-3 or later without accepting the
	suggested conffile changes. Please read
	/usr/share/doc/exim4-config/NEWS.Debian.gz for 4.67-2 and 4.67-4
	ips0:/etc/exim4#


Running the offending regexp by hand gives the following result:

	ips0:/etc/exim4# grep -r '^[^#]*DEBCONF[a-z_]\+DEBCONF' conf.d
	conf.d/main/02_exim4-config_options.dpkg-old:DEBCONF_hardcode_primary_hostname_DEBCONF

Since the other parts of update-exim4.conf ignores those files I would like to suggest
to change the detection routine so that it behaves more like the rest.

Sadly grep's --exclude and --include options only allow glob patterns, 
so using the exact same regular expression is not possible. 
But I think excluding automatically generated files by dpkg would be a nice start, something like:

	grep -r '^[^#]*DEBCONF[a-z_]\+DEBCONF' --exclude '*.dpkg-*'

Greetings,
Sepp Wijnands

P.S. I know that these files propably shouldn't be in the configuration directory at all. 
However previous versions of update-exim4.conf didn't mind, and I think rightly so.

-- Package-specific info:
Exim version 4.67 #1 built 14-Jul-2007 09:33:31
Copyright (c) University of Cambridge 2006
Berkeley DB: Sleepycat Software: Berkeley DB 4.3.29: (September  6, 2005)
Support for: crypteq iconv() IPv6 PAM Perl GnuTLS move_frozen_messages Content_Scanning Old_Demime
Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql nis nis0 passwd pgsql sqlite
Authenticators: cram_md5 cyrus_sasl dovecot plaintext spa
Routers: accept dnslookup ipliteral iplookup manualroute queryprogram redirect
Transports: appendfile/maildir/mailstore/mbx autoreply lmtp pipe smtp
Fixed never_users: 0
Size of off_t: 8

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.20.5 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages exim4-config depends on:
ii  adduser                       3.104      add and remove users and groups
ii  debconf [debconf-2.0]         1.5.13     Debian configuration management sy

exim4-config recommends no packages.

-- debconf information excluded