--- exim4-4.69.orig/debian/exim4-daemon-heavy.docs +++ exim4-4.69/debian/exim4-daemon-heavy.docs @@ -0,0 +1,2 @@ +EDITME.exim4-heavy +build-tree/build-exim4-daemon-heavy/exiscan-acl*.txt --- exim4-4.69.orig/debian/eximon4.install +++ exim4-4.69/debian/eximon4.install @@ -0,0 +1 @@ +debian/lintian/overrides/eximon4 usr/share/lintian/overrides --- exim4-4.69.orig/debian/exim4-base.postinst +++ exim4-4.69/debian/exim4-base.postinst @@ -0,0 +1,90 @@ +#!/bin/sh + +set -e +. /usr/share/debconf/confmodule + +if [ -n "$EX4DEBUG" ]; then + echo "now debugging $0 $@" + set -x +fi + +db_version 2.0 + +case "$1" in + configure) + + if ! getent passwd Debian-exim > /dev/null ; then + echo 'Adding system-user for exim (v4)' 1>&2 + adduser --system --group --quiet --home /var/spool/exim4 \ + --no-create-home --disabled-login --force-badname Debian-exim + fi + # Create directories for log etc + # install also fixes permissions. + install -d -oDebian-exim -gadm -m2750 /var/log/exim4 + install -d -oDebian-exim -gDebian-exim -m750 /var/run/exim4 + install -d -oDebian-exim -gDebian-exim -m750 /var/spool/exim4 + install -d -oDebian-exim -gDebian-exim -m750 /var/spool/exim4/db \ + /var/spool/exim4/input /var/spool/exim4/msglog + + # Make sure that db files are owned by Debian-exim:Debian-exim + find /var/spool/exim4/db/ -type f -print0 |\ + xargs -0 -r chown Debian-exim:Debian-exim + # fix permissions on upgrades + if dpkg --compare-versions "$2" le "4.30-1" ; then + find /var/log/exim4 /var/spool/exim4 -group mail \ + \( -type f -or -type d \) -print0 | \ + xargs -0r chgrp Debian-exim + find /var/log/exim4 /var/spool/exim4 -user mail \ + \( -type f -or -type d \) -print0 | \ + xargs -0r chown Debian-exim + fi + + # Paranoia check: On upgrades from db3-versions throw away hints + # databases. + if dpkg --compare-versions "$2" '<=' "4.61-1" ; then + rm -f /var/spool/exim4/db/misc-* /var/spool/exim4/db/wait-* \ + /var/spool/exim4/db/callout* \ + /var/spool/exim4/db/retry* \ + /var/spool/exim4/db/__db.retry \ + /var/spool/exim4/db/__db.misc \ + /var/spool/exim4/db/__db.callout \ + /var/spool/exim4/db/__db.wait* + fi + # Check that db files are readable by this Exim's db library + dbfiles="" + for f in /var/spool/exim4/db/misc-* /var/spool/exim4/db/wait-* \ + /var/spool/exim4/db/callout* /var/spool/exim4/db/retry*; do + if [ -f "$f" ]; then + if echo $f | grep \.lockfile\$ >/dev/null 2>&1; then + : # ignore lock files + else + dbfiles="$dbfiles $(basename $f)" + fi + fi + done + for dbfile in $dbfiles; do + if exim_dumpdb /var/spool/exim4 $dbfile >/dev/null 2>&1; then + : # File OK + else + echo "Resetting invalid $dbfile hints db" + rm -f /var/spool/exim4/db/$dbfile /var/spool/exim4/db/$dbfile.* + fi + done + + if [ -x "/etc/init.d/exim4" ]; then + update-rc.d exim4 defaults >/dev/null + fi + + # honor dpkg-statoverride settings for files not managed with dpkg + for pat in /var/\*/exim4 /var/\*/exim4/\*; do + [ $EX4DEBUG ] && eval echo "evaluate statoverride $pat" + eval dpkg-statoverride --list $pat | while read USER GROUP MODE FILE; do + [ $EX4DEBUG ] && echo "statoverride $USER $GROUP $MODE $FILE" + chown ${USER}:${GROUP} $FILE + chmod $MODE $FILE + done + done + ;; +esac + +#DEBHELPER# --- exim4-4.69.orig/debian/exim4-dev.manpages +++ exim4-4.69/debian/exim4-dev.manpages @@ -0,0 +1 @@ +debian/exim4-localscan-plugin-config.1 --- exim4-4.69.orig/debian/exim4-daemon-light.install +++ exim4-4.69/debian/exim4-daemon-light.install @@ -0,0 +1,2 @@ +debian/script usr/share/bug/exim4-daemon-light +debian/lintian/overrides/exim4-daemon-light usr/share/lintian/overrides --- exim4-4.69.orig/debian/exim4.templates +++ exim4-4.69/debian/exim4.templates @@ -0,0 +1,5 @@ +Template: exim4/drec +Type: error +_Description: Reconfigure exim4-config instead of this package + Exim4 has its configuration factored out into a dedicated package, + exim4-config. To reconfigure Exim4, use 'dpkg-reconfigure exim4-config'. --- exim4-4.69.orig/debian/exim4-config.templates +++ exim4-4.69/debian/exim4-config.templates @@ -0,0 +1,196 @@ +Template: exim4/dc_eximconfig_configtype +Type: select +# Translators beware! the following six strings form a single +# Choices menu. - Every one of these strings has to fit in a standard +# 80 characters console, as the fancy screen setup takes up some space +# try to keep below ~71 characters. +# DO NOT USE commas (,) in Choices translations otherwise +# this will break the choices shown to users +__Choices: internet site; mail is sent and received directly using SMTP, mail sent by smarthost; received via SMTP or fetchmail, mail sent by smarthost; no local mail, local delivery only; not on a network, no configuration at this time +Default: local delivery only; not on a network +_Description: General type of mail configuration: + Please select the mail server configuration type that best meets your needs. + . + Systems with dynamic IP addresses, including dialup systems, should generally + be configured to send outgoing mail to another machine, called a 'smarthost' + for delivery because many receiving systems on the Internet block + incoming mail from dynamic IP addresses as spam protection. + . + A system with a dynamic IP address can receive its own mail, or local + delivery can be disabled entirely (except mail for root and postmaster). + +Template: exim4/no_config +Type: boolean +Default: true +_Description: Really leave the mail system unconfigured? + Until the mail system is configured, it will be broken and cannot be + used. Configuration at a later time can be done either by hand or by + running 'dpkg-reconfigure exim4-config' as root. + +Template: exim4/mailname +Type: string +_Description: System mail name: + The 'mail name' is the domain name used to 'qualify' mail addresses + without a domain name. + . + This name will also be used by other programs. It should be the + single, fully qualified domain name (FQDN). + . + Thus, if a mail address on the local host is foo@example.org, + the correct value for this option would be example.org. + . + This name won't appear on From: lines of outgoing messages if rewriting + is enabled. + +Template: exim4/dc_other_hostnames +Type: string +Default: +_Description: Other destinations for which mail is accepted: + Please enter a semicolon-separated list of recipient domains for + which this machine should consider itself the final destination. + These domains are commonly called 'local domains'. The local hostname + (${fqdn}) and 'localhost' are always added to the list given here. + . + By default all local domains will be treated identically. If both + a.example and b.example are local domains, acc@a.example and + acc@b.example will be delivered to the same final destination. If + different domain names should be treated differently, it is + necessary to edit the config files afterwards. + +Template: exim4/dc_relay_domains +Type: string +Default: +_Description: Domains to relay mail for: + Please enter a semicolon-separated list of recipient domains for + which this system will relay mail, for example as a fallback MX or + mail gateway. This means that this system will accept mail for these + domains from anywhere on the Internet and deliver them according to + local delivery rules. + . + Do not mention local domains here. Wildcards may be used. + +Template: exim4/dc_relay_nets +Type: string +Default: +_Description: Machines to relay mail for: + Please enter a semicolon-separated list of IP address ranges for + which this system will unconditionally relay mail, functioning as a + smarthost. + . + You should use the standard address/prefix format (e.g. 194.222.242.0/24 + or 5f03:1200:836f::/48). + . + If this system should not be a smarthost for any other host, leave + this list blank. + +Template: exim4/dc_readhost +Type: string +_Description: Visible domain name for local users: + The option to hide the local mail name in outgoing mail was enabled. + It is therefore necessary to specify the domain name this system + should use for the domain part of local users' sender addresses. + +Template: exim4/dc_smarthost +Type: string +_Description: IP address or host name of the outgoing smarthost: + Please enter the IP address or the host name of a mail server that + this system should use as outgoing smarthost. If the smarthost only + accepts your mail on a port different from TCP/25, append two colons + and the port number (for example smarthost.example::587 or + 192.168.254.254::2525). Colons in IPv6 addresses need to be doubled. + . + If the smarthost requires authentication, please refer to + the Debian-specific README files in /usr/share/doc/exim4-base for + notes about setting up SMTP authentication. + +Template: exim4/dc_postmaster +Type: string +_Description: Root and postmaster mail recipient: + Mail for the 'postmaster', 'root', and other system accounts needs to + be redirected to the user account of the actual system administrator. + . + If this value is left empty, such mail will be saved in /var/mail/mail, + which is not recommended. + . + Note that postmaster's mail should be read on the system to which it is + directed, rather than being forwarded elsewhere, so (at least one of) + the users listed here should not redirect their mail off this machine. + A 'real-' prefix can be used to force local delivery. + . + Multiple user names need to be separated by spaces. + +Template: exim4/dc_local_interfaces +Type: string +Default: notset +_Description: IP-addresses to listen on for incoming SMTP connections: + Please enter a semicolon-separated list of IP addresses. The Exim SMTP + listener daemon will listen on all IP addresses listed here. + . + An empty value will cause Exim to listen for connections on all + available network interfaces. + . + If this system only receives mail directly from local services + (and not from other hosts), it is suggested to prohibit external + connections to the local Exim daemon. Such services include e-mail + programs (MUAs) which talk to localhost only as well as fetchmail. + External connections are impossible when 127.0.0.1 is entered here, + as this will disable listening on public network interfaces. + +Template: exim4/dc_minimaldns +Type: boolean +Default: false +_Description: Keep number of DNS-queries minimal (Dial-on-Demand)? + In normal mode of operation Exim does DNS lookups at startup, and when + receiving or delivering messages. This is for logging purposes and + allows keeping down the number of hard-coded values in the + configuration. + . + If this system does not have a DNS full service resolver available at + all times (for example if its Internet access is a dial-up line using + dial-on-demand), this might have unwanted consequences. For example, + starting up Exim or running the queue (even with no messages waiting) + might trigger a costly dial-up-event. + . + This option should be selected if this system is using Dial-on-Demand. + If it has always-on Internet access, this option should be disabled. + +Template: exim4/exim4-config-title +Type: title +_Description: Mail Server configuration + +Template: exim4/use_split_config +Type: boolean +_Description: Split configuration into small files? + The Debian exim4 packages can either use 'unsplit configuration', a + single monolithic file (/etc/exim4/exim4.conf.template) or 'split + configuration', where the actual Exim configuration files are built + from about 50 smaller files in /etc/exim4/conf.d/. + . + Unsplit configuration is better suited for large modifications and is + generally more stable, whereas split configuration offers a comfortable + way to make smaller modifications but is more fragile and might break + if modified carelessly. + . + A more detailed discussion of split and unsplit configuration can be + found in the Debian-specific README files in /usr/share/doc/exim4-base. + +Template: exim4/hide_mailname +Type: boolean +_Description: Hide local mail name in outgoing mail? + The headers of outgoing mail can be rewritten to make it appear to have been + generated on a different system. If this option is chosen, + '${mailname}', 'localhost' and '${dc_other_hostnames}' in From, Reply-To, + Sender and Return-Path are rewritten. + +Template: exim4/dc_localdelivery +Type: select +__Choices: mbox format in /var/mail/, Maildir format in home directory +Default: mbox format in /var/mail/ +_Description: Delivery method for local mail: + Exim is able to store locally delivered email in different formats. + The most commonly used ones are mbox and Maildir. mbox uses a single + file for the complete mail folder stored in /var/mail/. With Maildir + format every single message is stored in a separate file in ~/Maildir/. + . + Please note that most mail tools in Debian expect the local delivery + method to be mbox in their default. --- exim4-4.69.orig/debian/exim4-base.logrotate +++ exim4-4.69/debian/exim4-base.logrotate @@ -0,0 +1,9 @@ +/var/log/exim4/mainlog /var/log/exim4/rejectlog { + daily + missingok + rotate 10 + compress + delaycompress + notifempty + create 640 Debian-exim adm +} --- exim4-4.69.orig/debian/patches/35_install.dpatch +++ exim4-4.69/debian/patches/35_install.dpatch @@ -0,0 +1,54 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 35_install.dpatch by Andreas Metzler +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Exim's installation scripts install the binary as exim- +## DP: - disable this feature. + +@DPATCH@ +diff -urNad trunk~/scripts/exim_install trunk/scripts/exim_install +--- trunk~/build-tree/scripts/exim_install 2005-11-28 10:57:32.000000000 +0000 ++++ trunk/build-tree/scripts/exim_install 2006-02-22 11:57:57.000000000 +0000 +@@ -218,8 +218,9 @@ + # The exim binary is handled specially + + if [ $name = exim${EXE} ]; then +- version=exim-`./exim -bV -C /dev/null | \ +- awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE} ++ version=exim ++# version=exim-`./exim -bV -C /dev/null | \ ++# awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE} + + if [ "${version}" = "exim-${EXE}" ]; then + echo $com "" +@@ -369,10 +370,8 @@ + + + +-# If there is no configuration file, install the default, modifying it to refer +-# to the configured system aliases file. If there is no setting for +-# SYSTEM_ALIASES_FILE, use the traditional /etc/aliases. If the file does not +-# exist, install a default (dummy) for that too. ++# Install default configuration file ++# This is a local Debian modification. + + # However, if CONFIGURE_FILE specifies a list of files, skip this code. + +@@ -395,7 +394,7 @@ + ${real} ${MKDIR} -p `${DIRNAME} ${CONFIGURE_FILE}` + + echo sed -e '\\' +- echo " \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${ACTUAL_SYSTEM_ALIASES_FILE}'\"" '\\' ++ echo " \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/aliases'\"" '\\' + echo " ../src/configure.default > \${CONFIGURE_FILE}" + + # I can't find a way of writing this using the ${real} feature because +@@ -404,7 +403,7 @@ + + if [ "$real" = "" ] ; then + sed -e \ +- "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${ACTUAL_SYSTEM_ALIASES_FILE}'" \ ++ "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/aliases'" \ + ../src/configure.default > ${CONFIGURE_FILE} + else + true --- exim4-4.69.orig/debian/patches/34_eximstatsmanpage.dpatch +++ exim4-4.69/debian/patches/34_eximstatsmanpage.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 34_eximstatsmanpage.dpatch by Andreas Metzler +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add note about installing perl-modules on Debian to +## DP: generated manpage + +@DPATCH@ +diff -urNad 30.tmp/src/eximstats.src 30/src/eximstats.src +--- 30.tmp/build-tree/src/eximstats.src Wed Dec 18 11:28:01 2002 ++++ 30/build-tree/src/eximstats.src Sun Jan 12 14:50:23 2003 +@@ -277,6 +277,10 @@ + make test + make install + ++On B you can use ++C ++instead. ++ + =item B<-chartdir>I + + Create the charts in the directory --- exim4-4.69.orig/debian/patches/00_unpack.dpatch +++ exim4-4.69/debian/patches/00_unpack.dpatch @@ -0,0 +1,65 @@ +#! /bin/sh -e +## 00_unpack.dpatch by Marc Haber +## +## All lines beginning with ## DP:' are a description of the patch. +## DP: unpack upstream tarball, if one is found + +dpatch_patch () +{ + # we cannot check this, dpatch creates its workdir + #if [ -d build-tree ]; then + # return 0 + #fi + if [ -e src/exim.c ]; then + # we have classical layout of an unpacked upstream tree + mkdir -p build-tree + find . -mindepth 1 -maxdepth 1 \ + -name debian -prune -o \ + -name build-tree -o -print0 | \ + xargs --no-run-if-empty --null cp -a --target-directory=build-tree + return 0 + fi + if [ "$(find upstream -regex '.*\.tar\.\(gz\|bz2\)' | wc -l)" -eq 1 ]; then + mkdir -p build-tree + if [ -e "$(echo upstream/*.tar.bz2)" ]; then + if [ "$(tar --version | head -n 1)" = "tar (GNU tar) 1.14" ]; then + # be nice to sarge backporters, use tardy + # cat used to expand the wildcard + cat upstream/*.tar.bz2 | \ + bunzip2 | \ + tardy -remove_prefix 1 | \ + tar --extract --directory build-tree --file - + else + tar --extract --bzip2 --directory build-tree \ + --file upstream/*.tar.bz2 \ + --strip-components 1 + fi + return 0 + fi + if [ -e "$(echo upstream/*.tar.gz)" ]; then + if [ "$(tar --version | head -n 1)" = "tar (GNU tar) 1.14" ]; then + # be nice to sarge backporters, use tardy + cat upstream/*.tar.bz2 | \ + gunzip | \ + tardy -remove_prefix 1 | \ + tar --extract --directory build-tree --file - + else + tar --extract --gzip --directory build-tree \ + --file upstream/*.tar.gz \ + --strip-components 1 + fi + return 0 + fi + fi +} + +dpatch_unpatch () +{ + rm -rf build-tree +} + +DPATCH_LIB_NO_DEFAULT=1 + +. /usr/share/dpatch/dpatch.lib.sh + +exit 0 --- exim4-4.69.orig/debian/patches/30_dontoverridecflags.dpatch +++ exim4-4.69/debian/patches/30_dontoverridecflags.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_dontoverridecflags.dpatch by Andreas Metzler +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't override CFLAGS in OS/Makefile-Linux, allow to set them +## DP: e.g. in debian/rules + +@DPATCH@ +diff -urNad trunk~/OS/Makefile-Linux trunk/OS/Makefile-Linux +--- trunk~/build-tree/OS/Makefile-Linux 2005-10-04 08:55:28.000000000 +0000 ++++ trunk/build-tree/OS/Makefile-Linux 2005-10-04 09:51:56.000000000 +0000 +@@ -9,7 +9,7 @@ + CHOWN_COMMAND=look_for_it + CHGRP_COMMAND=look_for_it + +-CFLAGS=-O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE ++CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + + DBMLIB = -ldb + USE_DB = yes --- exim4-4.69.orig/debian/patches/32_exim4.dpatch +++ exim4-4.69/debian/patches/32_exim4.dpatch @@ -0,0 +1,115 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 32_exim4.dpatch by Andreas Metzler +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: The main binary is installed as /usr/sbin/exim4 + +@DPATCH@ +diff -urNad exim4-4.69~/build-tree/OS/Makefile-Linux exim4-4.69/build-tree/OS/Makefile-Linux +--- exim4-4.69~/build-tree/OS/Makefile-Linux 2008-04-20 09:14:00.000000000 +0200 ++++ exim4-4.69/build-tree/OS/Makefile-Linux 2008-04-20 09:14:19.000000000 +0200 +@@ -23,9 +23,9 @@ + X11_LD_LIB=$(X11)/lib + + EXIWHAT_PS_ARG=ax +-EXIWHAT_EGREP_ARG='/exim( |$$)' ++EXIWHAT_EGREP_ARG='/exim4( |$$)' + EXIWHAT_MULTIKILL_CMD=killall +-EXIWHAT_MULTIKILL_ARG=exim ++EXIWHAT_MULTIKILL_ARG=exim4 + EXIWHAT_KILL_SIGNAL=-USR1 + + # End +diff -urNad exim4-4.69~/build-tree/src/exicyclog.src exim4-4.69/build-tree/src/exicyclog.src +--- exim4-4.69~/build-tree/src/exicyclog.src 2006-03-16 12:51:10.000000000 +0100 ++++ exim4-4.69/build-tree/src/exicyclog.src 2008-04-20 09:14:00.000000000 +0200 +@@ -141,7 +141,7 @@ + + st=' ' + exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"` +-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi ++if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi + + spool_directory=`$exim_path -C $config -bP spool_directory | sed 's/.*=[ ]*//'` + +diff -urNad exim4-4.69~/build-tree/src/exim_checkaccess.src exim4-4.69/build-tree/src/exim_checkaccess.src +--- exim4-4.69~/build-tree/src/exim_checkaccess.src 2004-10-07 12:39:01.000000000 +0200 ++++ exim4-4.69/build-tree/src/exim_checkaccess.src 2008-04-20 09:14:00.000000000 +0200 +@@ -54,7 +54,7 @@ + + st=' ' + exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"` +-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi ++if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi + + + ######################################################################### +diff -urNad exim4-4.69~/build-tree/src/eximon.src exim4-4.69/build-tree/src/eximon.src +--- exim4-4.69~/build-tree/src/eximon.src 2004-10-07 12:39:01.000000000 +0200 ++++ exim4-4.69/build-tree/src/eximon.src 2008-04-20 09:14:00.000000000 +0200 +@@ -66,7 +66,7 @@ + + st=' ' + EXIM_PATH=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"` +-if test "$EXIM_PATH" = ""; then EXIM_PATH=BIN_DIRECTORY/exim; fi ++if test "$EXIM_PATH" = ""; then EXIM_PATH=BIN_DIRECTORY/exim4; fi + + SPOOL_DIRECTORY=`$EXIM_PATH -C $config -bP spool_directory | sed 's/.*=[ ]*//'` + LOG_FILE_PATH=`$EXIM_PATH -C $config -bP log_file_path | sed 's/.*=[ ]*//'` +diff -urNad exim4-4.69~/build-tree/src/exinext.src exim4-4.69/build-tree/src/exinext.src +--- exim4-4.69~/build-tree/src/exinext.src 2007-07-29 23:49:46.000000000 +0200 ++++ exim4-4.69/build-tree/src/exinext.src 2008-04-20 09:14:00.000000000 +0200 +@@ -91,7 +91,7 @@ + exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"` + fi + +-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi ++if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi + spool_directory=`$exim_path $eximmacdef -C $config -bP spool_directory | sed 's/.*=[ ]*//'` + qualify_domain=`$exim_path $eximmacdef -C $config -bP qualify_domain | sed 's/.*=[ ]*//'` + +@@ -172,7 +172,7 @@ + + # Run exim_dumpdb to get out the retry data and pick off what we want + +- open(DATA, "${exim}_dumpdb $spool retry |") || ++ open(DATA, "/usr/sbin/exim_dumpdb $spool retry |") || + die "can't run exim_dumpdb"; + + while () +diff -urNad exim4-4.69~/build-tree/src/exiqgrep.src exim4-4.69/build-tree/src/exiqgrep.src +--- exim4-4.69~/build-tree/src/exiqgrep.src 2004-10-07 12:39:01.000000000 +0200 ++++ exim4-4.69/build-tree/src/exiqgrep.src 2008-04-20 09:14:00.000000000 +0200 +@@ -22,7 +22,7 @@ + use Getopt::Std; + + # Have this variable point to your exim binary. +-my $exim = 'BIN_DIRECTORY/exim'; ++my $exim = 'BIN_DIRECTORY/exim4'; + my $eargs = '-bpu'; + my %id; + my %opt; +diff -urNad exim4-4.69~/build-tree/src/exiwhat.src exim4-4.69/build-tree/src/exiwhat.src +--- exim4-4.69~/build-tree/src/exiwhat.src 2004-10-07 12:39:01.000000000 +0200 ++++ exim4-4.69/build-tree/src/exiwhat.src 2008-04-20 09:14:00.000000000 +0200 +@@ -83,7 +83,7 @@ + + st=' ' + exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"` +-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi ++if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi + spool_directory=`$exim_path -C $config -bP spool_directory | sed "s/.*=[ ]*//"` + process_log_path=`$exim_path -C $config -bP process_log_path | sed "s/.*=[ ]*//"` + +diff -urNad exim4-4.69~/build-tree/src/globals.c exim4-4.69/build-tree/src/globals.c +--- exim4-4.69~/build-tree/src/globals.c 2007-09-28 14:21:57.000000000 +0200 ++++ exim4-4.69/build-tree/src/globals.c 2008-04-20 09:14:00.000000000 +0200 +@@ -556,7 +556,7 @@ + + gid_t exim_gid = EXIM_GID; + BOOL exim_gid_set = TRUE; /* This gid is always set */ +-uschar *exim_path = US BIN_DIRECTORY "/exim" ++uschar *exim_path = US BIN_DIRECTORY "/exim4" + "\0<---------------Space to patch exim_path->"; + uid_t exim_uid = EXIM_UID; + BOOL exim_uid_set = TRUE; /* This uid is always set */ --- exim4-4.69.orig/debian/patches/50_localscan_dlopen.dpatch +++ exim4-4.69/debian/patches/50_localscan_dlopen.dpatch @@ -0,0 +1,279 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50_localscan_dlopen.dpatch by Marc MERLIN +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Allow to use and switch between different local_scan functions without +## DP: recompiling exim. +## DP: http://marc.merlins.org/linux/exim/files/sa-exim-current/ +## DP: Original patch from David Woodhouse, modified first by Derrick 'dman' +## DP: Hudson and then by Marc MERLIN for SA-Exim and minor/major API version +## DP: tracking + +@DPATCH@ +diff -urNad experimental~/build-tree/src/EDITME experimental/build-tree/src/EDITME +--- experimental~/build-tree/src/EDITME 2007-01-08 15:25:36.000000000 +0100 ++++ experimental/build-tree/src/EDITME 2007-03-21 11:55:52.000000000 +0100 +@@ -615,6 +615,21 @@ + + + #------------------------------------------------------------------------------ ++# On systems which support dynamic loading of shared libraries, Exim can ++# load a local_scan function specified in its config file instead of having ++# to be recompiled with the desired local_scan function. For a full ++# description of the API to this function, see the Exim specification. ++ ++DLOPEN_LOCAL_SCAN=yes ++ ++# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the ++# linker flags. Without it, the loaded .so won't be able to access any ++# functions from exim. ++ ++LDFLAGS += -rdynamic ++CFLAGS += -fvisibility=hidden ++ ++#------------------------------------------------------------------------------ + # The default distribution of Exim contains only the plain text form of the + # documentation. Other forms are available separately. If you want to install + # the documentation in "info" format, first fetch the Texinfo documentation +diff -urNad experimental~/build-tree/src/config.h.defaults experimental/build-tree/src/config.h.defaults +--- experimental~/build-tree/src/config.h.defaults 2007-01-08 15:25:36.000000000 +0100 ++++ experimental/build-tree/src/config.h.defaults 2007-03-21 11:54:26.000000000 +0100 +@@ -27,6 +27,8 @@ + + #define AUTH_VARS 3 + ++#define DLOPEN_LOCAL_SCAN ++ + #define BIN_DIRECTORY + + #define CONFIGURE_FILE +diff -urNad experimental~/build-tree/src/globals.c experimental/build-tree/src/globals.c +--- experimental~/build-tree/src/globals.c 2007-03-21 11:54:26.000000000 +0100 ++++ experimental/build-tree/src/globals.c 2007-03-21 11:54:26.000000000 +0100 +@@ -123,6 +123,9 @@ + uschar *tls_verify_hosts = NULL; + #endif + ++#ifdef DLOPEN_LOCAL_SCAN ++uschar *local_scan_path = NULL; ++#endif + + /* Input-reading functions for messages, so we can use special ones for + incoming TCP/IP. The defaults use stdin. We never need these for any +diff -urNad experimental~/build-tree/src/globals.h experimental/build-tree/src/globals.h +--- experimental~/build-tree/src/globals.h 2007-01-08 15:25:36.000000000 +0100 ++++ experimental/build-tree/src/globals.h 2007-03-21 11:54:26.000000000 +0100 +@@ -85,6 +85,9 @@ + extern uschar *tls_verify_hosts; /* Mandatory client verification */ + #endif + ++#ifdef DLOPEN_LOCAL_SCAN ++extern uschar *local_scan_path; /* Path to local_scan() library */ ++#endif + + /* Input-reading functions for messages, so we can use special ones for + incoming TCP/IP. */ +diff -urNad experimental~/build-tree/src/local_scan.c experimental/build-tree/src/local_scan.c +--- experimental~/build-tree/src/local_scan.c 2007-01-08 15:25:36.000000000 +0100 ++++ experimental/build-tree/src/local_scan.c 2007-03-21 11:54:26.000000000 +0100 +@@ -7,60 +7,131 @@ + /* Copyright (c) University of Cambridge 1995 - 2007 */ + /* See the file NOTICE for conditions of use and distribution. */ + ++#include "exim.h" + +-/****************************************************************************** +-This file contains a template local_scan() function that just returns ACCEPT. +-If you want to implement your own version, you should copy this file to, say +-Local/local_scan.c, and edit the copy. To use your version instead of the +-default, you must set ++#ifdef DLOPEN_LOCAL_SCAN ++#include ++static int (*local_scan_fn)(int fd, uschar **return_text) = NULL; ++static int load_local_scan_library(void); ++#endif + +-LOCAL_SCAN_SOURCE=Local/local_scan.c ++int ++local_scan(int fd, uschar **return_text) ++{ ++fd = fd; /* Keep picky compilers happy */ ++return_text = return_text; ++#ifdef DLOPEN_LOCAL_SCAN ++/* local_scan_path is defined AND not the empty string */ ++if (local_scan_path && *local_scan_path) ++ { ++ if (!local_scan_fn) ++ { ++ if (!load_local_scan_library()) ++ { ++ char *base_msg , *error_msg , *final_msg ; ++ int final_length = -1 ; + +-in your Local/Makefile. This makes it easy to copy your version for use with +-subsequent Exim releases. ++ base_msg=US"Local configuration error - local_scan() library failure\n"; ++ error_msg = dlerror() ; + +-For a full description of the API to this function, see the Exim specification. +-******************************************************************************/ ++ final_length = strlen(base_msg) + strlen(error_msg) + 1 ; ++ final_msg = (char*)malloc( final_length*sizeof(char) ) ; ++ *final_msg = '\0' ; + ++ strcat( final_msg , base_msg ) ; ++ strcat( final_msg , error_msg ) ; + +-/* This is the only Exim header that you should include. The effect of +-including any other Exim header is not defined, and may change from release to +-release. Use only the documented interface! */ ++ *return_text = final_msg ; ++ return LOCAL_SCAN_TEMPREJECT; ++ } ++ } ++ return local_scan_fn(fd, return_text); ++ } ++else ++#endif ++ return LOCAL_SCAN_ACCEPT; ++} + +-#include "local_scan.h" ++#ifdef DLOPEN_LOCAL_SCAN + ++static int load_local_scan_library(void) ++{ ++/* No point in keeping local_scan_lib since we'll never dlclose() anyway */ ++void *local_scan_lib = NULL; ++int (*local_scan_version_fn)(void); ++int vers_maj; ++int vers_min; + +-/* This is a "do-nothing" version of a local_scan() function. The arguments +-are: ++local_scan_lib = dlopen(local_scan_path, RTLD_NOW); ++if (!local_scan_lib) ++ { ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library open failed - " ++ "message temporarily rejected"); ++ return FALSE; ++ } + +- fd The file descriptor of the open -D file, which contains the +- body of the message. The file is open for reading and +- writing, but modifying it is dangerous and not recommended. ++local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_major"); ++if (!local_scan_version_fn) ++ { ++ dlclose(local_scan_lib); ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " ++ "local_scan_version_major() function - message temporarily rejected"); ++ return FALSE; ++ } + +- return_text A pointer to an unsigned char* variable which you can set in +- order to return a text string. It is initialized to NULL. ++/* The major number is increased when the ABI is changed in a non ++ backward compatible way. */ ++vers_maj = local_scan_version_fn(); + +-The return values of this function are: ++local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_minor"); ++if (!local_scan_version_fn) ++ { ++ dlclose(local_scan_lib); ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " ++ "local_scan_version_minor() function - message temporarily rejected"); ++ return FALSE; ++ } + +- LOCAL_SCAN_ACCEPT +- The message is to be accepted. The return_text argument is +- saved in $local_scan_data. ++/* The minor number is increased each time a new feature is added (in a ++ way that doesn't break backward compatibility) -- Marc */ ++vers_min = local_scan_version_fn(); + +- LOCAL_SCAN_REJECT +- The message is to be rejected. The returned text is used +- in the rejection message. + +- LOCAL_SCAN_TEMPREJECT +- This specifies a temporary rejection. The returned text +- is used in the rejection message. +-*/ ++if (vers_maj != LOCAL_SCAN_ABI_VERSION_MAJOR) ++ { ++ dlclose(local_scan_lib); ++ local_scan_lib = NULL; ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible major" ++ "version number, you need to recompile your module for this version" ++ "of exim (The module was compiled for version %d.%d and this exim provides" ++ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR, ++ LOCAL_SCAN_ABI_VERSION_MINOR); ++ return FALSE; ++ } ++else if (vers_min > LOCAL_SCAN_ABI_VERSION_MINOR) ++ { ++ dlclose(local_scan_lib); ++ local_scan_lib = NULL; ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible minor" ++ "version number, you need to recompile your module for this version" ++ "of exim (The module was compiled for version %d.%d and this exim provides" ++ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR, ++ LOCAL_SCAN_ABI_VERSION_MINOR); ++ return FALSE; ++ } + +-int +-local_scan(int fd, uschar **return_text) +-{ +-fd = fd; /* Keep picky compilers happy */ +-return_text = return_text; +-return LOCAL_SCAN_ACCEPT; ++local_scan_fn = dlsym(local_scan_lib, "local_scan"); ++if (!local_scan_fn) ++ { ++ dlclose(local_scan_lib); ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " ++ "local_scan() function - message temporarily rejected"); ++ return FALSE; ++ } ++ ++return TRUE; + } + ++#endif /* DLOPEN_LOCAL_SCAN */ ++ + /* End of local_scan.c */ +diff -urNad experimental~/build-tree/src/local_scan.h experimental/build-tree/src/local_scan.h +--- experimental~/build-tree/src/local_scan.h 2007-01-08 15:25:36.000000000 +0100 ++++ experimental/build-tree/src/local_scan.h 2007-03-21 11:58:27.000000000 +0100 +@@ -18,6 +18,7 @@ + settings, and the store functions. */ + + #include ++#pragma GCC visibility push(default) + #include "config.h" + #include "mytypes.h" + #include "store.h" +@@ -188,4 +189,6 @@ + extern uschar *string_copyn(uschar *, int); + extern uschar *string_sprintf(char *, ...); + ++#pragma GCC visibility pop ++ + /* End of local_scan.h */ +diff -urNad experimental~/build-tree/src/readconf.c experimental/build-tree/src/readconf.c +--- experimental~/build-tree/src/readconf.c 2007-01-08 15:25:36.000000000 +0100 ++++ experimental/build-tree/src/readconf.c 2007-03-21 11:54:26.000000000 +0100 +@@ -247,6 +247,9 @@ + { "local_from_prefix", opt_stringptr, &local_from_prefix }, + { "local_from_suffix", opt_stringptr, &local_from_suffix }, + { "local_interfaces", opt_stringptr, &local_interfaces }, ++#ifdef DLOPEN_LOCAL_SCAN ++ { "local_scan_path", opt_stringptr, &local_scan_path }, ++#endif + { "local_scan_timeout", opt_time, &local_scan_timeout }, + { "local_sender_retain", opt_bool, &local_sender_retain }, + { "localhost_number", opt_stringptr, &host_number_string }, --- exim4-4.69.orig/debian/patches/65_saverandomseed.dpatch +++ exim4-4.69/debian/patches/65_saverandomseed.dpatch @@ -0,0 +1,75 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 65_saverandomseed.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Save gcrypt RNG seed. + +@DPATCH@ +diff -Nur exim4-4.68~/build-tree/src/tls-gnu.c exim4-4.68/build-tree/src/tls-gnu.c +--- exim4-4.68~/build-tree/src/tls-gnu.c 2007-08-30 16:31:06.000000000 +0200 ++++ exim4-4.68/build-tree/src/tls-gnu.c 2008-01-31 20:37:06.000000000 +0100 +@@ -20,6 +20,7 @@ + #include + #include + ++#include + + #define UNKNOWN_NAME "unknown" + #define DH_BITS 1024 +@@ -440,10 +441,36 @@ + uschar *crl) + { + int rc; ++uschar filename[200]; + uschar *cert_expanded, *key_expanded, *cas_expanded, *crl_expanded; ++gcry_error_t gcr_rc; + + initialized = (host == NULL)? INITIALIZED_SERVER : INITIALIZED_CLIENT; + ++ ++/* initialize gcrypt explicitely */ ++gcry_check_version (NULL); ++ ++/* Use a random_seed file for gcrypt's RNG */ ++if (host_number_string != NULL) ++ { ++ if (!string_format(filename, sizeof(filename), "%s/random.seed%s", ++ spool_directory, host_number_string)) ++ return tls_error(US"overlong filename spool_directory/random.seedlocalhost_number", host, 0); ++ } ++else ++ { ++ if (!string_format(filename, sizeof(filename), "%s/random.seed", ++ spool_directory)) ++ return tls_error(US"overlong filename spool_directory/random.seed", host, 0); ++ } ++ ++gcr_rc = gcry_control (GCRYCTL_SET_RANDOM_SEED_FILE,filename); ++if (gcr_rc) ++ return tls_error(US"Failure to set random_seed file", host, gcr_rc); ++ ++gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); ++ + rc = gnutls_global_init(); + if (rc < 0) return tls_error(US"tls-init", host, rc); + +@@ -1303,8 +1330,19 @@ + void + tls_close(BOOL shutdown) + { ++gcry_error_t gcr_rc; ++ + if (tls_active < 0) return; /* TLS was not active */ + ++gcr_rc = gcry_control (GCRYCTL_UPDATE_RANDOM_SEED_FILE); ++ ++if (gcr_rc) ++ { ++ DEBUG(D_tls) debug_printf( ++ "GCRYCTL_UPDATE_RANDOM_SEED_FILE failed: (%d): (%s)\n", ++ gcr_rc,gcry_strerror(gcr_rc)); ++ } ++ + if (shutdown) + { + DEBUG(D_tls) debug_printf("tls_close(): shutting down TLS\n"); --- exim4-4.69.orig/debian/patches/70_remove_exim-users_references.dpatch +++ exim4-4.69/debian/patches/70_remove_exim-users_references.dpatch @@ -0,0 +1,42 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 70_remove_exim-users_references.dpatch by Marc Haber +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad experimental~/build-tree/README experimental/build-tree/README +--- experimental~/build-tree/README 2006-12-20 10:46:04.000000000 +0100 ++++ experimental/build-tree/README 2006-12-20 16:48:24.000000000 +0100 +@@ -16,8 +16,16 @@ + older book may be helpful for the background, but a lot of the detail has + changed, so it is likely to be confusing to newcomers. + +-There is a web site at http://www.exim.org; this contains details of the +-mailing list exim-users@exim.org. ++Information about the way Debian has built the binary packages is ++obtainable in /usr/share/doc/exim4-base/README.Debian.gz, and there ++is a Debian-centered mailing list, ++pkg-exim4-users@lists.alioth.debian.org. Please ask Debian-specific ++questions there, and only write to the upstream exim-users mailing ++list if you are sure that your question is not Debian-specific. You ++can find the subscription web page on ++http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users ++ ++There is a web site at http://www.exim.org. + + A copy of the Exim FAQ should be available from the same source that you used + to obtain the Exim distribution. Additional formats for the documentation +diff -urNad experimental~/build-tree/src/eximstats.src experimental/build-tree/src/eximstats.src +--- experimental~/build-tree/src/eximstats.src 2006-12-20 16:48:23.000000000 +0100 ++++ experimental/build-tree/src/eximstats.src 2006-12-20 16:48:24.000000000 +0100 +@@ -505,8 +505,7 @@ + + =head1 AUTHOR + +-There is a web site at http://www.exim.org - this contains details of the +-mailing list exim-users@exim.org. ++There is a web site at http://www.exim.org + + =head1 TO DO + --- exim4-4.69.orig/debian/patches/33_eximon.binary.dpatch +++ exim4-4.69/debian/patches/33_eximon.binary.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 33_eximon.binary.dpatch by Andreas Piesk +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: eximon.bin is installed in /usr/lib/exim4/ and not in path. + +@DPATCH@ +diff -urNad 30.tmp/OS/eximon.conf-Default 30/OS/eximon.conf-Default +--- 30.tmp/build-tree/OS/eximon.conf-Default Mon Dec 30 10:14:03 2002 ++++ 30/build-tree/OS/eximon.conf-Default Mon Dec 30 10:15:04 2002 +@@ -5,7 +5,7 @@ + # The name of the eximon binary, usually the same as the eximon script, + # with .bin stuck on the end. + +-EXIMON_BINARY=${EXIMON_BINARY-$0.bin} ++EXIMON_BINARY=/usr/lib/exim4/${EXIMON_BINARY-${0##*/}.bin} + + # The remaining parameters are values likely to be changed to suit the + # user's taste. They are documented in the EDITME file. --- exim4-4.69.orig/debian/patches/31_eximmanpage.dpatch +++ exim4-4.69/debian/patches/31_eximmanpage.dpatch @@ -0,0 +1,203 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 31_eximmanpage.dpatch by Marc Haber +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad trunk~/build-tree/doc/exim.8 trunk/build-tree/doc/exim.8 +--- trunk~/build-tree/doc/exim.8 2007-04-17 15:06:40.000000000 +0200 ++++ trunk/build-tree/doc/exim.8 2007-04-20 19:53:36.000000000 +0200 +@@ -1,9 +1,9 @@ +-.TH EXIM 8 ++.TH EXIM4 8 + .SH NAME +-exim \- a Mail Transfer Agent ++exim4 \- a Mail Transfer Agent + .SH SYNOPSIS + .nf +-.B exim [options] arguments ... ++.B exim4 [options] arguments ... + .B mailq [options] arguments ... + .B rsmtp [options] arguments ... + .B rmail [options] arguments ... +@@ -114,12 +114,10 @@ + all the host's running interfaces. However, it is possible to listen on other + ports, on multiple ports, and only on specific interfaces. + .sp +-When a listening daemon +-is started without the use of \fB\-oX\fP (that is, without overriding the normal +-configuration), it writes its process id to a file called exim\-daemon.pid +-in Exim's spool directory. This location can be overridden by setting +-PID_FILE_PATH in Local/Makefile. The file is written while Exim is still +-running as root. ++When a listening daemon is started without the use of \fB\-oX\fP (that ++is, without overriding the normal configuration), it writes its ++process id to a file called /var/run/exim4/exim.pid. The file is ++written while Exim is still running as root. + .sp + When \fB\-oX\fP is used on the command line to start a listening daemon, the + process id is not written to the normal pid file path. However, \fB\-oP\fP can be +@@ -192,7 +190,7 @@ + can use both \fB\-bF\fP and \fB\-bf\fP on the same command, in order to test a system + filter and a user filter in the same run. For example: + .sp +- exim \-bF /system/filter \-bf /user/filter ' user@domain +- exim \-f "" user@domain ++ exim4 \-f '<>' user@domain ++ exim4 \-f "" user@domain + .sp + In addition, the use of \fB\-f\fP is not restricted when testing a filter file + with \fB\-bf\fP or when testing or verifying addresses using the \fB\-bt\fP or +@@ -1174,12 +1172,12 @@ + The \fB\-oMa\fP option sets the sender host address. This may include a port + number at the end, after a full stop (period). For example: + .sp +- exim \-bs \-oMa 10.9.8.7.1234 ++ exim4 \-bs \-oMa 10.9.8.7.1234 + .sp + An alternative syntax is to enclose the IP address in square brackets, + followed by a colon and the port number: + .sp +- exim \-bs \-oMa [10.9.8.7]:1234 ++ exim4 \-bs \-oMa [10.9.8.7]:1234 + .sp + The IP address is placed in the \fI$sender_host_address\fP variable, and the + port, if present, in \fI$sender_host_port\fP. If both \fB\-oMa\fP and \fB\-bh\fP +@@ -1365,13 +1363,13 @@ + lexically less than a given value by following the \fB\-q\fP option with a + starting message id. For example: + .sp +- exim \-q 0t5C6f\-0000c8\-00 ++ exim4 \-q 0t5C6f\-0000c8\-00 + .sp + Messages that arrived earlier than 0t5C6f\-0000c8\-00 are not inspected. If a + second message id is given, messages whose ids are lexically greater than it + are also skipped. If the same id is given twice, for example, + .sp +- exim \-q 0t5C6f\-0000c8\-00 0t5C6f\-0000c8\-00 ++ exim4 \-q 0t5C6f\-0000c8\-00 0t5C6f\-0000c8\-00 + .sp + just one delivery process is started, for that message. This differs from + \fB\-M\fP in that retry data is respected, and it also differs from \fB\-Mc\fP in +@@ -1387,7 +1385,7 @@ + single daemon process handles both functions. A common way of starting up a + combined daemon at system boot time is to use a command such as + .sp +- /usr/exim/bin/exim \-bd \-q30m ++ /usr/exim/bin/exim4 \-bd \-q30m + .sp + Such a daemon listens for incoming SMTP calls, and also starts a queue runner + process every 30 minutes. +@@ -1524,6 +1522,27 @@ + .sp + . + .SH "SEE ALSO" ++.BR exicyclog (8), ++.BR exigrep (8), ++.BR exim_checkaccess (8), ++.BR exim_convert4r4 (8), ++.BR exim_db (8), ++.BR exim_dbmbuild (8), ++.BR exim_lock (8), ++.BR eximon (8), ++.BR exinext (8), ++.BR exiqgrep (8), ++.BR exiqsumm (8), ++.BR exiwhat (8), ++.BR update\-exim4.conf (8), ++.BR update\-exim4defaults (8), ++/usr/share/doc/exim4\-base/, ++/usr/share/doc/exim4\-base/README.Debian.[gz|html]. + .rs + .sp + The full Exim specification, the Exim book, and the Exim wiki. ++ ++.SH AUTHOR ++This manual page was provided with the upstream Exim source package. ++It was enhanced for the Debian GNU/Linux system. ++ +\ No newline at end of file --- exim4-4.69.orig/debian/patches/66_enlarge-dh-parameters-size.dpatch +++ exim4-4.69/debian/patches/66_enlarge-dh-parameters-size.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 66_enlarge-dh-parameters-size.dpatch by Marc Haber +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad trunk~/build-tree/src/tls-gnu.c trunk/build-tree/src/tls-gnu.c +--- trunk~/build-tree/src/tls-gnu.c 2007-04-13 17:13:47.000000000 +0200 ++++ trunk/build-tree/src/tls-gnu.c 2008-04-20 20:53:13.000000000 +0200 +@@ -22,8 +22,8 @@ + + + #define UNKNOWN_NAME "unknown" +-#define DH_BITS 1024 +-#define PARAM_SIZE 2*1024 ++#define DH_BITS 2048 ++#define PARAM_SIZE 2*2048 + + + /* Values for verify_requirment and initialized */ --- exim4-4.69.orig/debian/patches/37_exiwhatpsmisc.dpatch +++ exim4-4.69/debian/patches/37_exiwhatpsmisc.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 37_exiwhatpsmisc.dpatch by Andreas Metzler +## +## DP: killall is in psmisc, but we don't want to depend on it just for this small script. +## DP: Use ps ax if killall is not availble. + +@DPATCH@ +diff -urNad exim4-4.69~/build-tree/src/exiwhat.src exim4-4.69/build-tree/src/exiwhat.src +--- exim4-4.69~/build-tree/src/exiwhat.src 2008-04-20 08:57:51.000000000 +0200 ++++ exim4-4.69/build-tree/src/exiwhat.src 2008-04-20 09:02:04.000000000 +0200 +@@ -109,7 +109,7 @@ + # Solaris, "killall" kills ALL processes - this is the System V version of this + # command, and not what we want! + +-if [ "$multikill_cmd" != "" ] ; then ++if [ "$multikill_cmd" != "" ] && which "$multikill_cmd" > /dev/null; then + $multikill_cmd $signal "$multikill_arg" + + # No multikill command; do it the hard way --- exim4-4.69.orig/debian/patches/60_convert4r4.dpatch +++ exim4-4.69/debian/patches/60_convert4r4.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_convert4r4.dpatch by Marc Haber +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad ./src/convert4r4.src /tmp/dpep-work.3QROYQ/trunk/src/convert4r4.src +--- ./build-tree/src/convert4r4.src 2005-02-17 14:49:11.000000000 +0000 ++++ /tmp/dpep-work.3QROYQ/trunk/build-tree/src/convert4r4.src 2005-02-18 13:54:40.931927408 +0000 +@@ -653,6 +653,32 @@ + + print STDERR "Runtime configuration file converter for Exim release 4.\n"; + ++if( !defined $ENV{"CONVERT4R4"} || $ENV{"CONVERT4R4"} ne "I understand this is an unsupported tool" ) { ++ ++ print STDERR < + + /* Includes from the main source of Exim. We need to have MAXPACKET defined for + the benefit of structs.h. One of these days I should tidy up this interface so +diff -urNad --exclude=CVS --exclude=.svn ./src/exim.h /tmp/dpep-work.3lzcyA/exim4/src/exim.h +--- ./build-tree/src/exim.h 2005-07-01 11:09:15.000000000 +0000 ++++ /tmp/dpep-work.3lzcyA/exim4/build-tree/src/exim.h 2005-07-02 05:36:35.000000000 +0000 +@@ -414,7 +414,7 @@ + + /* The header from the PCRE regex package */ + +-#include "pcre/pcre.h" ++#include + + /* Exim includes are in several files. Note that local_scan.h #includes + mytypes.h and store.h, so we don't need to mention them explicitly. */ --- exim4-4.69.orig/debian/timeout.pl +++ exim4-4.69/debian/timeout.pl @@ -0,0 +1,234 @@ +#!/usr/bin/perl + +## timeout +## +## (c) 2004 Piotr Roszatycki , GPL +## +## $Id$ + +=head1 NAME + +timeout - Run command with bounded time. + +=head1 SYNOPSIS + +B S> + +B +S<[-I]> +I