exim4 (4.12-0.1)

svn path=/trunk/exim/; revision=144

14 files changed, 79 insertions, 41 deletions

diff --git a/debian/EDITME.exim4-heavy.diff b/debian/EDITME.exim4-heavy.diff
index a84fbf6..a72e961 100644
--- a/debian/EDITME.exim4-heavy.diff
+++ b/debian/EDITME.exim4-heavy.diff
@@ -1,5 +1,5 @@
---- EDITME.exim4-light	Sun Mar  2 13:14:15 2003
-+++ EDITME.exim4-heavy	Sun Mar  2 13:12:56 2003
+--- EDITME.exim4-light	Thu Mar  6 10:29:31 2003
++++ EDITME.exim4-heavy	Thu Mar  6 10:28:40 2003
 @@ -191,7 +191,7 @@
  
  # This one is very special-purpose, so is not included by default.
@@ -103,7 +103,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -468,10 +468,11 @@
+@@ -468,11 +468,11 @@
  # support, which is intended for use in conjunction with the SMTP AUTH
  # facilities, is included only when requested by the following setting:
  
@@ -112,6 +112,7 @@
  
  # You probably need to add -lpam to EXTRALIBS, and in some releases of
  # GNU/Linux -ldl is also needed.
+-EXTRALIBS=-ldl
 +EXTRALIBS=-lpam
  
  
diff --git a/debian/EDITME.exim4-light.diff b/debian/EDITME.exim4-light.diff
index df3ae8d..56ebccf 100644
--- a/debian/EDITME.exim4-light.diff
+++ b/debian/EDITME.exim4-light.diff
@@ -1,5 +1,5 @@
---- src/EDITME	Sun Mar  2 13:12:56 2003
-+++ EDITME.exim4-light	Sun Mar  2 13:14:15 2003
+--- src/EDITME	Thu Mar  6 10:28:40 2003
++++ EDITME.exim4-light	Thu Mar  6 10:29:31 2003
 @@ -98,7 +98,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
  # and any superior directories, if they do not exist.
@@ -134,7 +134,15 @@
  
  
  #------------------------------------------------------------------------------
-@@ -556,8 +559,8 @@
+@@ -469,6 +472,7 @@
+ 
+ # You probably need to add -lpam to EXTRALIBS, and in some releases of
+ # GNU/Linux -ldl is also needed.
++EXTRALIBS=-ldl
+ 
+ 
+ #------------------------------------------------------------------------------
+@@ -556,8 +560,8 @@
  # haven't got Perl, Exim will still build and run; you just won't be able to
  # use those utilities.
  
@@ -145,7 +153,7 @@
  # MV_COMMAND=/bin/mv
  # RM_COMMAND=/bin/rm
  # PERL_COMMAND=/usr/bin/perl
-@@ -741,6 +744,7 @@
+@@ -741,6 +745,7 @@
  # file can be specified here. Some installations may want something like this:
  
  # PID_FILE_PATH=/var/lock/exim.pid
@@ -153,7 +161,7 @@
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-@@ -773,6 +777,9 @@
+@@ -773,6 +778,9 @@
  # run time option is required to cause the moving actually to occur. Such
  # messages become "invisible" to the normal management tools.
  
diff --git a/debian/EDITME.eximon.diff b/debian/EDITME.eximon.diff
index c374cce..9e86fe3 100644
--- a/debian/EDITME.eximon.diff
+++ b/debian/EDITME.eximon.diff
@@ -1,5 +1,5 @@
 --- exim_monitor/EDITME	Mon Jul 22 10:59:52 2002
-+++ EDITME.eximon	Fri Feb 21 12:53:17 2003
++++ EDITME.eximon	Thu Mar  6 10:28:40 2003
 @@ -1,3 +1,4 @@
 +# -*- makefile -*-
  ##################################################
diff --git a/debian/README.Debian b/debian/README.Debian
index fe740f5..ec0d164 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -82,11 +82,11 @@ exim4-config comes with a collection of control files that build to an
 exim configuration that can handle most tasks of mail delivery.
 Additional parameters are asked from the user on package install with
 debconf questions. The result of these debconf questions is written to
-/etc/exim4/debconf.results. If you want to reconfigure exim with
+/etc/exim4/update-exim4.conf.conf. If you want to reconfigure exim with
 debconf invoke "dpkg-reconfigure exim4-config". update-exim4.conf uses
-the contents of /etc/exim4/debconf.results to put parameters into the
-generated exim 4 config file. Some files in /etc/exim4/conf.d are
-modified in this process.
+the contents of /etc/exim4/update-exim4.conf.conf to put parameters
+into the generated exim 4 config file. Some files in /etc/exim4/conf.d
+are modified in this process.
 
 The files modified by update-exim4.conf are protected by an md5
 checksum, so that update-exim4.conf can refrain from changing these
diff --git a/debian/TODO b/debian/TODO
index 37f5dbd..f3c3b47 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -9,5 +9,6 @@ Hurd patches?
 
 
 ================================================================
+grep -r for REMOVEMEBEFORERELEASE and do it.
 remove -prerelease from received:-header before first unstable upload
 
diff --git a/debian/changelog b/debian/changelog
index cc5557a..b40c4f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,13 @@ exim4 (4.12-0.1) experimental; urgency=low
   * rename debian/patches/*, giving each one an unambiguous number
   * ignore private rfc1918 and APIPA addresses in internet router (MH)
   * correct info about authorship of dlopen patch
-  * don't link exim4-daemon-light against PAM
-  * same_domain_copy_routing = yes for primrout-internet (MH)
+  * don't link exim4-daemon-light against PAM (explicitely link it against libdl)
+  * same_domain_copy_routing = yes for primrout-internet, primrout-satellite
+    and primrout-smarthost (MH)
+  * rename debconf.results to update-exim4.conf.conf, add upgrading-magic for
+    upgrading from 4.12-0 and earlier (marked as REMOVEMEBEFORERELEASE)
+  * introduce REMOVEMEBEFORERELEASE-tag, grep -r on debian/ will show us all
+    the cruft that needs to be removed before uploading to unstable.
 
  -- Andreas Metzler <ametzler@debian.org>  Wed,  5 Mar 2003 19:03:59 +0100
 
diff --git a/debian/debconf/conf.d/main/02_exim4-base_options b/debian/debconf/conf.d/main/02_exim4-base_options
index 4703342..5d0a092 100644
--- a/debian/debconf/conf.d/main/02_exim4-base_options
+++ b/debian/debconf/conf.d/main/02_exim4-base_options
@@ -82,6 +82,9 @@ freeze_tell = postmaster
 # uucp should be able to set envelope-from to arbitrary values
 trusted_users = uucp
 
+#REMOVEMEBEFORERELEASE
+#  '[+prerelease]' from received-header
+#REMOVEMEBEFORERELEASE
 received_header_text = "Received: \
          ${if def:sender_rcvhost {from ${sender_rcvhost}\n\t}\
          {${if def:sender_ident {from ${sender_ident} }}\
diff --git a/debian/debconf/splitoff-parts/primrout-satellite b/debian/debconf/splitoff-parts/primrout-satellite
index 7b8b56d..9cc4dbf 100644
--- a/debian/debconf/splitoff-parts/primrout-satellite
+++ b/debian/debconf/splitoff-parts/primrout-satellite
@@ -6,6 +6,7 @@ smarthost:
   transport = remote_smtp
   route_list = * DCsmarthost
   host_find_failed = defer
+  same_domain_copy_routing = yes
   no_more
 
 ##### end of primrout-satellite #######
diff --git a/debian/debconf/splitoff-parts/primrout-smarthost b/debian/debconf/splitoff-parts/primrout-smarthost
index c62a76e..ee67018 100644
--- a/debian/debconf/splitoff-parts/primrout-smarthost
+++ b/debian/debconf/splitoff-parts/primrout-smarthost
@@ -6,6 +6,7 @@ smarthost:
   transport = remote_smtp
   route_list = * DCsmarthost
   host_find_failed = defer
+  same_domain_copy_routing = yes
   no_more
 
 ##### end of primrout-smarthost #######
diff --git a/debian/debconf/update-exim4.conf b/debian/debconf/update-exim4.conf
index cbb4769..ebe5303 100644
--- a/debian/debconf/update-exim4.conf
+++ b/debian/debconf/update-exim4.conf
@@ -13,8 +13,8 @@ EXIM="/usr/sbin/exim4"
 [ -d ${UPEX4C_confd} ] || \
 { printf "$0: Error, no ${UPEX4C_confd} or missing\n/var/lib/exim4/, exiting.\n" 1>&2 ; exit 1 ; }
 
-. /etc/exim4/debconf.results || \
-{ printf "$0: Error, no /etc/exim4/debconf.results, exiting.\n" 1>&2 ; exit 1 ; }
+. /etc/exim4/update-exim4.conf.conf || \
+{ printf "$0: Error, no /etc/exim4/update-exim4.conf.conf, exiting.\n" 1>&2 ; exit 1 ; }
 
 [ -r /etc/default/exim4 ] && \
 	. /etc/default/exim4
@@ -113,7 +113,7 @@ cat << EOF > "${UPEX4C_internal_tmp}"
 #######################################
 # WARNING WARNING WARNING WARNING
 # This file is dynamically generated by update-exim4.conf(8) using the data
-# in /etc/exim4/debconf.results.
+# in /etc/exim4/update-exim4.conf.conf.
 
 # If you make _any_ changes to it update-exim4.conf(8) won't update it any
 # more! - Especially it will be used _even_ if you change to a different
@@ -147,7 +147,7 @@ cat << EOF > "${UPEX4C_internal_tmp}"
 #######################################
 # WARNING WARNING WARNING WARNING
 # This file is dynamically generated by update-exim4.conf(8) using the data
-# in /etc/exim4/debconf.results.
+# in /etc/exim4/update-exim4.conf.conf.
 
 # If you make _any_ changes to it update-exim4.conf(8) won't update it any
 # more! - Especially it will be used _even_ if you change to a different
@@ -182,7 +182,7 @@ cat << EOF > "${UPEX4C_internal_tmp}"
 #######################################
 # WARNING WARNING WARNING WARNING
 # This file is dynamically generated by update-exim4.conf(8) using the data
-# in /etc/exim4/debconf.results.
+# in /etc/exim4/update-exim4.conf.conf.
 
 # If you make _any_ changes to it update-exim4.conf(8) won't update it any
 # more! - Especially it will be used _even_ if you change to a different
@@ -217,7 +217,7 @@ cat << EOF > "${UPEX4C_internal_tmp}"
 #######################################
 # WARNING WARNING WARNING WARNING
 # This file is dynamically generated by update-exim4.conf(8) using the data
-# in /etc/exim4/debconf.results.
+# in /etc/exim4/update-exim4.conf.conf.
 
 # If you make _any_ changes to it update-exim4.conf(8) won't update it any
 # more! - Especially it will be used _even_ if you change to a different
@@ -280,7 +280,7 @@ UPEX4C_skeleton() {
 #######################################
 # WARNING WARNING WARNING WARNING
 # This file is dynamically generated by update-exim4.conf(8) using the data
-# in /etc/exim4/debconf.results.
+# in /etc/exim4/update-exim4.conf.conf.
 EOF
 # insert more code that appends to ${UPEX4C_internal_tmp}
 	UPEX4C_internal_md5=`cat "${UPEX4C_internal_tmp}" | md5sum | cut -d\  -f1`
@@ -421,7 +421,7 @@ cat << EOF > ${UPEX4C_outputfile}.tmp
 # WARNING WARNING WARNING
 # WARNING WARNING WARNING
 # this file is generated dynamically from the files in
-# CONFDIR/conf.d/ and /etc/exim4/debconf.results
+# CONFDIR/conf.d/ and /etc/exim4/update-exim4.conf.conf
 # Any changes you make here will be lost.
 # See /usr/share/doc/exim4-base/README.Debian and update-exim4.conf(8)
 # for instructions of customization.
diff --git a/debian/exim4-config.config b/debian/exim4-config.config
index d93ec3c..7ac0a42 100644
--- a/debian/exim4-config.config
+++ b/debian/exim4-config.config
@@ -113,11 +113,19 @@ parseexim3() {
 	esac
 }
 
+# REMOVEMEBEFORERELEASE begins
+# cruft from renaming debconf.results to update-exim4.conf.conf
+if [ -e /etc/exim4/debconf.results ] && \
+	[ ! -e /etc/exim4/update-exim4.conf.conf ]; then
+	cp -a /etc/exim4/debconf.results /etc/exim4/update-exim4.conf.conf
+fi
+# REMOVEMEBEFORERELEASE ends
+
 db_get exim4/dc_eximconfig_configtype
 dc_eximconfig_configtype="$RET"
 
-if [ -e /etc/exim4/debconf.results ] ; then
-	. /etc/exim4/debconf.results || true
+if [ -e /etc/exim4/update-exim4.conf.conf ] ; then
+	. /etc/exim4/update-exim4.conf.conf || true
 	# set defaults using these values
 	storevar2db
 else
@@ -134,7 +142,7 @@ else
 fi
 
 ## set up default values, we cannot do this in templates file because
-## config script is called two times before debconf.results exists.
+## config script is called two times before update-exim4.conf.conf exists.
 [ "x${dc_eximconfig_configtype}" = "x" ] && \
 	dc_eximconfig_configtype="local" && \
 	db_set exim4/dc_eximconfig_configtype "${dc_eximconfig_configtype}"
diff --git a/debian/exim4-config.postinst b/debian/exim4-config.postinst
index 4269800..69c8f87 100644
--- a/debian/exim4-config.postinst
+++ b/debian/exim4-config.postinst
@@ -18,8 +18,8 @@ get_value() {
 }
 
 write_header() {
-	cat <<EOF > /etc/exim4/debconf.results
-# /etc/exim4/debconf.results
+	cat <<EOF > /etc/exim4/update-exim4.conf.conf
+# /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'
@@ -48,19 +48,29 @@ mv /etc/aliases.tmp /etc/aliases
 
 alias stripwhitespace="sed -e 's/^[[:blank:]]*//' -e 's/[[:blank:]]*$//'"
 
+# REMOVEMEBEFORERELEASE begins
+# cruft from renaming debconf.results to update-exim4.conf.conf
+if [ -e /etc/exim4/debconf.results ] ; then 
+	if [ ! -e /etc/exim4/update-exim4.conf.conf ]; then
+		mv /etc/exim4/debconf.results /etc/exim4/update-exim4.conf.conf
+	else
+		rm -f /etc/exim4/debconf.results
+	fi
+fi
+# REMOVEMEBEFORERELEASE ends
 
 case "$1" in
   configure)
 	# Configure Exim##############################
 	##############################################
 	# Generate config-file if it does yet not exist
-	if [ ! -e /etc/exim4/debconf.results ] ; then
+	if [ ! -e /etc/exim4/update-exim4.conf.conf ] ; then
 		write_header
 		for variable in dc_eximconfig_configtype dc_other_hostnames \
 			dc_readhost dc_relay_domains \
 			dc_relay_nets dc_smarthost ; do
 			echo "${variable}="
-		done >> /etc/exim4/debconf.results
+		done >> /etc/exim4/update-exim4.conf.conf
 	fi
 
 	# generate dummy files, which will be overwritten by update-exim4.conf
@@ -93,13 +103,13 @@ case "$1" in
 
 	### write configuration to files #
 	write_header
-	echo "dc_eximconfig_configtype='${dc_eximconfig_configtype}'" >> /etc/exim4/debconf.results
-	echo "dc_listenonpublic='${dc_listenonpublic}'" >> /etc/exim4/debconf.results
-	echo "dc_other_hostnames='${dc_other_hostnames}'" >> /etc/exim4/debconf.results
-	echo "dc_readhost='${dc_readhost}'" >> /etc/exim4/debconf.results
-	echo "dc_relay_domains='${dc_relay_domains}'" >> /etc/exim4/debconf.results
-	echo "dc_relay_nets='${dc_relay_nets}'" >> /etc/exim4/debconf.results
-	echo "dc_smarthost='${dc_smarthost}'" >> /etc/exim4/debconf.results
+	echo "dc_eximconfig_configtype='${dc_eximconfig_configtype}'" >> /etc/exim4/update-exim4.conf.conf
+	echo "dc_listenonpublic='${dc_listenonpublic}'" >> /etc/exim4/update-exim4.conf.conf
+	echo "dc_other_hostnames='${dc_other_hostnames}'" >> /etc/exim4/update-exim4.conf.conf
+	echo "dc_readhost='${dc_readhost}'" >> /etc/exim4/update-exim4.conf.conf
+	echo "dc_relay_domains='${dc_relay_domains}'" >> /etc/exim4/update-exim4.conf.conf
+	echo "dc_relay_nets='${dc_relay_nets}'" >> /etc/exim4/update-exim4.conf.conf
+	echo "dc_smarthost='${dc_smarthost}'" >> /etc/exim4/update-exim4.conf.conf
 
 	echo $mailname > /etc/mailname
 	### configuration files written ##
diff --git a/debian/exim4-config.postrm b/debian/exim4-config.postrm
index 55e461c..577ff75 100644
--- a/debian/exim4-config.postrm
+++ b/debian/exim4-config.postrm
@@ -5,7 +5,7 @@ set -e
 
 case "$1" in
     purge)
-	rm -f /etc/exim4/debconf.results
+	rm -f /etc/exim4/update-exim4.conf.conf
 	rm -f /var/lib/exim4/config.autogenerated
 	rm -f /etc/exim4/conf.d/main/03_exim4-base_neverusers \
 		/etc/exim4/conf.d/rewrite/30_exim4-base_email-addresses \
diff --git a/debian/manpages/update-exim4.conf.8 b/debian/manpages/update-exim4.conf.8
index 728c415..589bc1b 100644
--- a/debian/manpages/update-exim4.conf.8
+++ b/debian/manpages/update-exim4.conf.8
@@ -49,7 +49,7 @@ for
 by merging the data in the template files in the
 .I /etc/exim4/conf.d
 directory tree and
-.I /etc/exim4/debconf.results
+.I /etc/exim4/update-exim4.conf.conf
 to the output file
 .I /var/lib/exim4/config.autogenerated.
 Additionally the files
@@ -70,8 +70,8 @@ still have the benefits of debconf.
 On the other hand if you don't want to manage exim4.conf with debconf
 set
 .I dc_eximconfig_configtype=none
-in /etc/exim4/debconf.results and place your own handcrafted version in
-/etc/exim4/exim4.conf.
+in /etc/exim4/update-exim4.conf.conf and place your own handcrafted version
+in /etc/exim4/exim4.conf.
 - Exim will use this file if it exists and ignore the autogenerated one.
 
 .B update-exim4.conf