# HG changeset patch # User Matthias Förste # Date 1250165023 -7200 # Node ID 5d6a10b5469c4064be9b1beb8e1364e2d8463149 # Parent c1c63bcbc84fc82e6175d713672793c3a587f188 added a little more verbose documentation; fixed failure detection diff -r c1c63bcbc84f -r 5d6a10b5469c exim4/4.69/memcache-support.patch --- a/exim4/4.69/memcache-support.patch Tue Aug 11 11:51:15 2009 +0200 +++ b/exim4/4.69/memcache-support.patch Thu Aug 13 14:03:43 2009 +0200 @@ -1,6 +1,335 @@ -diff -r 2986669e93b0 -r c0445d21ca67 debian/EDITME.exim4-light.diff ---- a/debian/EDITME.exim4-light.diff Mon Aug 10 16:00:12 2009 +0200 -+++ b/debian/EDITME.exim4-light.diff Mon Aug 10 16:01:25 2009 +0200 +diff -r b4cc307a2719 .hgignore +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/.hgignore Thu Aug 13 13:46:31 2009 +0200 +@@ -0,0 +1,325 @@ ++syntax: regexp ++^build-tree ++^debian/patched ++^EDITME\. ++^build-arch-stamp ++^build-indep-stamp ++^configure-stamp ++^debian/README.Debian ++^debian/README.Debian.html ++^debian/debconf/exim4.conf.template ++^debian/exim4-base.debhelper.log ++^debian/exim4-base.postinst.debhelper ++^debian/exim4-base.postrm.debhelper ++^debian/exim4-base.prerm.debhelper ++^debian/exim4-base.substvars ++^debian/exim4-base/DEBIAN/conffiles ++^debian/exim4-base/DEBIAN/config ++^debian/exim4-base/DEBIAN/control ++^debian/exim4-base/DEBIAN/md5sums ++^debian/exim4-base/DEBIAN/postinst ++^debian/exim4-base/DEBIAN/postrm ++^debian/exim4-base/DEBIAN/prerm ++^debian/exim4-base/DEBIAN/templates ++^debian/exim4-base/etc/cron.daily/exim4-base ++^debian/exim4-base/etc/init.d/exim4 ++^debian/exim4-base/etc/logrotate.d/exim4-base ++^debian/exim4-base/etc/logrotate.d/exim4-paniclog ++^debian/exim4-base/usr/sbin/exicyclog ++^debian/exim4-base/usr/sbin/exigrep ++^debian/exim4-base/usr/sbin/exim_checkaccess ++^debian/exim4-base/usr/sbin/exim_convert4r4 ++^debian/exim4-base/usr/sbin/exim_dbmbuild ++^debian/exim4-base/usr/sbin/exim_dumpdb ++^debian/exim4-base/usr/sbin/exim_fixdb ++^debian/exim4-base/usr/sbin/exim_lock ++^debian/exim4-base/usr/sbin/exim_tidydb ++^debian/exim4-base/usr/sbin/eximstats ++^debian/exim4-base/usr/sbin/exinext ++^debian/exim4-base/usr/sbin/exipick ++^debian/exim4-base/usr/sbin/exiqgrep ++^debian/exim4-base/usr/sbin/exiqsumm ++^debian/exim4-base/usr/sbin/exiwhat ++^debian/exim4-base/usr/sbin/syslog2eximlog ++^debian/exim4-base/usr/share/bug/exim4-base/script ++^debian/exim4-base/usr/share/doc-base/exim4-filter-txt ++^debian/exim4-base/usr/share/doc-base/exim4-readme-debian ++^debian/exim4-base/usr/share/doc-base/exim4-spec-txt ++^debian/exim4-base/usr/share/doc/exim4-base/ACKNOWLEDGMENTS.gz ++^debian/exim4-base/usr/share/doc/exim4-base/Exim3.upgrade.gz ++^debian/exim4-base/usr/share/doc/exim4-base/Exim4.upgrade.gz ++^debian/exim4-base/usr/share/doc/exim4-base/NEWS.Debian.gz ++^debian/exim4-base/usr/share/doc/exim4-base/NOTICE.gz ++^debian/exim4-base/usr/share/doc/exim4-base/NewStuff.gz ++^debian/exim4-base/usr/share/doc/exim4-base/OptionLists.txt.gz ++^debian/exim4-base/usr/share/doc/exim4-base/README ++^debian/exim4-base/usr/share/doc/exim4-base/README.Debian.gz ++^debian/exim4-base/usr/share/doc/exim4-base/README.Debian.html ++^debian/exim4-base/usr/share/doc/exim4-base/README.SIEVE.gz ++^debian/exim4-base/usr/share/doc/exim4-base/README.UPDATING.gz ++^debian/exim4-base/usr/share/doc/exim4-base/TODO.Debian ++^debian/exim4-base/usr/share/doc/exim4-base/changelog.Debian.gz ++^debian/exim4-base/usr/share/doc/exim4-base/changelog.Debian.old.gz ++^debian/exim4-base/usr/share/doc/exim4-base/changelog.gz ++^debian/exim4-base/usr/share/doc/exim4-base/copyright ++^debian/exim4-base/usr/share/doc/exim4-base/dbm.discuss.txt.gz ++^debian/exim4-base/usr/share/doc/exim4-base/examples/aliases ++^debian/exim4-base/usr/share/doc/exim4-base/examples/cramtest.pl ++^debian/exim4-base/usr/share/doc/exim4-base/examples/example.conf.gz ++^debian/exim4-base/usr/share/doc/exim4-base/examples/exim-adduser ++^debian/exim4-base/usr/share/doc/exim4-base/examples/exim-gencert ++^debian/exim4-base/usr/share/doc/exim4-base/examples/logargs.sh ++^debian/exim4-base/usr/share/doc/exim4-base/examples/unknownuser.sh ++^debian/exim4-base/usr/share/doc/exim4-base/filter.txt.gz ++^debian/exim4-base/usr/share/doc/exim4-base/pcrepattern.txt.gz ++^debian/exim4-base/usr/share/doc/exim4-base/spec.txt.gz ++^debian/exim4-base/usr/share/exim4/exim4_refresh_gnutls-params ++^debian/exim4-base/usr/share/exim4/timeout.pl ++^debian/exim4-base/usr/share/lintian/overrides/exim4-base ++^debian/exim4-base/usr/share/man/man8/exicyclog.8.gz ++^debian/exim4-base/usr/share/man/man8/exigrep.8.gz ++^debian/exim4-base/usr/share/man/man8/exim.8.gz ++^debian/exim4-base/usr/share/man/man8/exim_checkaccess.8.gz ++^debian/exim4-base/usr/share/man/man8/exim_convert4r4.8.gz ++^debian/exim4-base/usr/share/man/man8/exim_db.8.gz ++^debian/exim4-base/usr/share/man/man8/exim_dbmbuild.8.gz ++^debian/exim4-base/usr/share/man/man8/exim_dumpdb.8.gz ++^debian/exim4-base/usr/share/man/man8/exim_fixdb.8.gz ++^debian/exim4-base/usr/share/man/man8/exim_lock.8.gz ++^debian/exim4-base/usr/share/man/man8/exim_tidydb.8.gz ++^debian/exim4-base/usr/share/man/man8/eximstats.8.gz ++^debian/exim4-base/usr/share/man/man8/exinext.8.gz ++^debian/exim4-base/usr/share/man/man8/exipick.8.gz ++^debian/exim4-base/usr/share/man/man8/exiqgrep.8.gz ++^debian/exim4-base/usr/share/man/man8/exiqsumm.8.gz ++^debian/exim4-base/usr/share/man/man8/exiwhat.8.gz ++^debian/exim4-base/usr/share/man/man8/syslog2eximlog.8.gz ++^debian/exim4-base/var/spool/exim4/gnutls-params ++^debian/exim4-config.debhelper.log ++^debian/exim4-config.postrm.debhelper ++^debian/exim4-config.substvars ++^debian/exim4-config/DEBIAN/conffiles ++^debian/exim4-config/DEBIAN/config ++^debian/exim4-config/DEBIAN/control ++^debian/exim4-config/DEBIAN/md5sums ++^debian/exim4-config/DEBIAN/postinst ++^debian/exim4-config/DEBIAN/postrm ++^debian/exim4-config/DEBIAN/preinst ++^debian/exim4-config/DEBIAN/templates ++^debian/exim4-config/etc/email-addresses ++^debian/exim4-config/etc/exim4/conf.d/acl/00_exim4-config_header ++^debian/exim4-config/etc/exim4/conf.d/acl/20_exim4-config_local_deny_exceptions ++^debian/exim4-config/etc/exim4/conf.d/acl/30_exim4-config_check_mail ++^debian/exim4-config/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt ++^debian/exim4-config/etc/exim4/conf.d/acl/40_exim4-config_check_data ++^debian/exim4-config/etc/exim4/conf.d/auth/00_exim4-config_header ++^debian/exim4-config/etc/exim4/conf.d/auth/30_exim4-config_examples ++^debian/exim4-config/etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs ++^debian/exim4-config/etc/exim4/conf.d/main/02_exim4-config_options ++^debian/exim4-config/etc/exim4/conf.d/main/03_exim4-config_tlsoptions ++^debian/exim4-config/etc/exim4/conf.d/main/90_exim4-config_log_selector ++^debian/exim4-config/etc/exim4/conf.d/retry/00_exim4-config_header ++^debian/exim4-config/etc/exim4/conf.d/retry/30_exim4-config ++^debian/exim4-config/etc/exim4/conf.d/rewrite/00_exim4-config_header ++^debian/exim4-config/etc/exim4/conf.d/rewrite/31_exim4-config_rewriting ++^debian/exim4-config/etc/exim4/conf.d/router/00_exim4-config_header ++^debian/exim4-config/etc/exim4/conf.d/router/100_exim4-config_domain_literal ++^debian/exim4-config/etc/exim4/conf.d/router/150_exim4-config_hubbed_hosts ++^debian/exim4-config/etc/exim4/conf.d/router/200_exim4-config_primary ++^debian/exim4-config/etc/exim4/conf.d/router/300_exim4-config_real_local ++^debian/exim4-config/etc/exim4/conf.d/router/400_exim4-config_system_aliases ++^debian/exim4-config/etc/exim4/conf.d/router/500_exim4-config_hubuser ++^debian/exim4-config/etc/exim4/conf.d/router/600_exim4-config_userforward ++^debian/exim4-config/etc/exim4/conf.d/router/700_exim4-config_procmail ++^debian/exim4-config/etc/exim4/conf.d/router/800_exim4-config_maildrop ++^debian/exim4-config/etc/exim4/conf.d/router/850_exim4-config_lowuid ++^debian/exim4-config/etc/exim4/conf.d/router/900_exim4-config_local_user ++^debian/exim4-config/etc/exim4/conf.d/router/mmm_mail4root ++^debian/exim4-config/etc/exim4/conf.d/transport/00_exim4-config_header ++^debian/exim4-config/etc/exim4/conf.d/transport/10_exim4-config_transport-macros ++^debian/exim4-config/etc/exim4/conf.d/transport/30_exim4-config_address_file ++^debian/exim4-config/etc/exim4/conf.d/transport/30_exim4-config_address_pipe ++^debian/exim4-config/etc/exim4/conf.d/transport/30_exim4-config_address_reply ++^debian/exim4-config/etc/exim4/conf.d/transport/30_exim4-config_mail_spool ++^debian/exim4-config/etc/exim4/conf.d/transport/30_exim4-config_maildir_home ++^debian/exim4-config/etc/exim4/conf.d/transport/30_exim4-config_maildrop_pipe ++^debian/exim4-config/etc/exim4/conf.d/transport/30_exim4-config_procmail_pipe ++^debian/exim4-config/etc/exim4/conf.d/transport/30_exim4-config_remote_smtp ++^debian/exim4-config/etc/exim4/conf.d/transport/30_exim4-config_remote_smtp_smarthost ++^debian/exim4-config/etc/exim4/conf.d/transport/35_exim4-config_address_directory ++^debian/exim4-config/etc/exim4/exim4.conf.template ++^debian/exim4-config/etc/exim4/passwd.client ++^debian/exim4-config/etc/ppp/ip-up.d/exim4 ++^debian/exim4-config/usr/sbin/update-exim4.conf ++^debian/exim4-config/usr/sbin/update-exim4.conf.template ++^debian/exim4-config/usr/sbin/update-exim4defaults ++^debian/exim4-config/usr/share/bug/exim4-config/script ++^debian/exim4-config/usr/share/doc/exim4-config/NEWS.Debian.gz ++^debian/exim4-config/usr/share/doc/exim4-config/README.Debian.gz ++^debian/exim4-config/usr/share/doc/exim4-config/changelog.Debian.gz ++^debian/exim4-config/usr/share/doc/exim4-config/copyright ++^debian/exim4-config/usr/share/lintian/overrides/exim4-config ++^debian/exim4-config/usr/share/man/man5/etc-aliases.5.gz ++^debian/exim4-config/usr/share/man/man5/etc-email-addresses.5.gz ++^debian/exim4-config/usr/share/man/man5/exim4-config_files.5.gz ++^debian/exim4-config/usr/share/man/man5/exim4_exim_crt.5.gz ++^debian/exim4-config/usr/share/man/man5/exim4_exim_key.5.gz ++^debian/exim4-config/usr/share/man/man5/exim4_hubbed_hosts.5.gz ++^debian/exim4-config/usr/share/man/man5/exim4_local_domain_dnsbl_whitelist.5.gz ++^debian/exim4-config/usr/share/man/man5/exim4_local_host_blacklist.5.gz ++^debian/exim4-config/usr/share/man/man5/exim4_local_host_whitelist.5.gz ++^debian/exim4-config/usr/share/man/man5/exim4_local_rcpt_callout.5.gz ++^debian/exim4-config/usr/share/man/man5/exim4_local_sender_blacklist.5.gz ++^debian/exim4-config/usr/share/man/man5/exim4_local_sender_callout.5.gz ++^debian/exim4-config/usr/share/man/man5/exim4_local_sender_whitelist.5.gz ++^debian/exim4-config/usr/share/man/man5/exim4_passwd.5.gz ++^debian/exim4-config/usr/share/man/man5/exim4_passwd_client.5.gz ++^debian/exim4-config/usr/share/man/man5/update-exim4.conf.conf.5.gz ++^debian/exim4-config/usr/share/man/man8/update-exim4.conf.8.gz ++^debian/exim4-config/usr/share/man/man8/update-exim4.conf.template.8.gz ++^debian/exim4-config/usr/share/man/man8/update-exim4defaults.8.gz ++^debian/exim4-daemon-custom-dbg.debhelper.log ++^debian/exim4-daemon-custom.debhelper.log ++^debian/exim4-daemon-heavy-dbg.debhelper.log ++^debian/exim4-daemon-heavy-dbg/DEBIAN/control ++^debian/exim4-daemon-heavy-dbg/DEBIAN/md5sums ++^debian/exim4-daemon-heavy-dbg/usr/lib/debug/usr/sbin/exim4 ++^debian/exim4-daemon-heavy-dbg/usr/share/doc/exim4-daemon-heavy-dbg/changelog.Debian.gz ++^debian/exim4-daemon-heavy-dbg/usr/share/doc/exim4-daemon-heavy-dbg/copyright ++^debian/exim4-daemon-heavy-dbg/usr/share/lintian/overrides/exim4-daemon-heavy-dbg ++^debian/exim4-daemon-heavy.debhelper.log ++^debian/exim4-daemon-heavy.postinst ++^debian/exim4-daemon-heavy.postrm.debhelper ++^debian/exim4-daemon-heavy.prerm ++^debian/exim4-daemon-heavy.substvars ++^debian/exim4-daemon-heavy/DEBIAN/config ++^debian/exim4-daemon-heavy/DEBIAN/control ++^debian/exim4-daemon-heavy/DEBIAN/md5sums ++^debian/exim4-daemon-heavy/DEBIAN/postinst ++^debian/exim4-daemon-heavy/DEBIAN/postrm ++^debian/exim4-daemon-heavy/DEBIAN/prerm ++^debian/exim4-daemon-heavy/DEBIAN/templates ++^debian/exim4-daemon-heavy/usr/bin/mailq ++^debian/exim4-daemon-heavy/usr/bin/newaliases ++^debian/exim4-daemon-heavy/usr/lib/exim4/exim4 ++^debian/exim4-daemon-heavy/usr/lib/sendmail ++^debian/exim4-daemon-heavy/usr/sbin/exim ++^debian/exim4-daemon-heavy/usr/sbin/exim4 ++^debian/exim4-daemon-heavy/usr/sbin/rmail ++^debian/exim4-daemon-heavy/usr/sbin/rsmtp ++^debian/exim4-daemon-heavy/usr/sbin/runq ++^debian/exim4-daemon-heavy/usr/sbin/sendmail ++^debian/exim4-daemon-heavy/usr/share/bug/exim4-daemon-heavy/script ++^debian/exim4-daemon-heavy/usr/share/doc/exim4-daemon-heavy/EDITME.exim4-heavy.gz ++^debian/exim4-daemon-heavy/usr/share/doc/exim4-daemon-heavy/NEWS.Debian.gz ++^debian/exim4-daemon-heavy/usr/share/doc/exim4-daemon-heavy/README.Debian.gz ++^debian/exim4-daemon-heavy/usr/share/doc/exim4-daemon-heavy/changelog.Debian.gz ++^debian/exim4-daemon-heavy/usr/share/doc/exim4-daemon-heavy/changelog.gz ++^debian/exim4-daemon-heavy/usr/share/doc/exim4-daemon-heavy/copyright ++^debian/exim4-daemon-heavy/usr/share/lintian/overrides/exim4-daemon-heavy ++^debian/exim4-daemon-heavy/usr/share/man/man8/exim4.8.gz ++^debian/exim4-daemon-heavy/usr/share/man/man8/mailq.8.gz ++^debian/exim4-daemon-heavy/usr/share/man/man8/newaliases.8.gz ++^debian/exim4-daemon-heavy/usr/share/man/man8/rmail.8.gz ++^debian/exim4-daemon-heavy/usr/share/man/man8/rsmtp.8.gz ++^debian/exim4-daemon-heavy/usr/share/man/man8/runq.8.gz ++^debian/exim4-daemon-heavy/usr/share/man/man8/sendmail.8.gz ++^debian/exim4-daemon-light-dbg.debhelper.log ++^debian/exim4-daemon-light-dbg/DEBIAN/control ++^debian/exim4-daemon-light-dbg/DEBIAN/md5sums ++^debian/exim4-daemon-light-dbg/usr/lib/debug/usr/sbin/exim4 ++^debian/exim4-daemon-light-dbg/usr/share/doc/exim4-daemon-light-dbg/changelog.Debian.gz ++^debian/exim4-daemon-light-dbg/usr/share/doc/exim4-daemon-light-dbg/copyright ++^debian/exim4-daemon-light-dbg/usr/share/lintian/overrides/exim4-daemon-light-dbg ++^debian/exim4-daemon-light.debhelper.log ++^debian/exim4-daemon-light.postrm.debhelper ++^debian/exim4-daemon-light.substvars ++^debian/exim4-daemon-light/DEBIAN/config ++^debian/exim4-daemon-light/DEBIAN/control ++^debian/exim4-daemon-light/DEBIAN/md5sums ++^debian/exim4-daemon-light/DEBIAN/postinst ++^debian/exim4-daemon-light/DEBIAN/postrm ++^debian/exim4-daemon-light/DEBIAN/prerm ++^debian/exim4-daemon-light/DEBIAN/templates ++^debian/exim4-daemon-light/usr/bin/mailq ++^debian/exim4-daemon-light/usr/bin/newaliases ++^debian/exim4-daemon-light/usr/lib/exim4/exim4 ++^debian/exim4-daemon-light/usr/lib/sendmail ++^debian/exim4-daemon-light/usr/sbin/exim ++^debian/exim4-daemon-light/usr/sbin/exim4 ++^debian/exim4-daemon-light/usr/sbin/rmail ++^debian/exim4-daemon-light/usr/sbin/rsmtp ++^debian/exim4-daemon-light/usr/sbin/runq ++^debian/exim4-daemon-light/usr/sbin/sendmail ++^debian/exim4-daemon-light/usr/share/bug/exim4-daemon-light/script ++^debian/exim4-daemon-light/usr/share/doc/exim4-daemon-light/EDITME.exim4-light.gz ++^debian/exim4-daemon-light/usr/share/doc/exim4-daemon-light/NEWS.Debian.gz ++^debian/exim4-daemon-light/usr/share/doc/exim4-daemon-light/README.Debian.gz ++^debian/exim4-daemon-light/usr/share/doc/exim4-daemon-light/changelog.Debian.gz ++^debian/exim4-daemon-light/usr/share/doc/exim4-daemon-light/changelog.gz ++^debian/exim4-daemon-light/usr/share/doc/exim4-daemon-light/copyright ++^debian/exim4-daemon-light/usr/share/lintian/overrides/exim4-daemon-light ++^debian/exim4-daemon-light/usr/share/man/man8/exim4.8.gz ++^debian/exim4-daemon-light/usr/share/man/man8/mailq.8.gz ++^debian/exim4-daemon-light/usr/share/man/man8/newaliases.8.gz ++^debian/exim4-daemon-light/usr/share/man/man8/rmail.8.gz ++^debian/exim4-daemon-light/usr/share/man/man8/rsmtp.8.gz ++^debian/exim4-daemon-light/usr/share/man/man8/runq.8.gz ++^debian/exim4-daemon-light/usr/share/man/man8/sendmail.8.gz ++^debian/exim4-dbg.debhelper.log ++^debian/exim4-dbg/DEBIAN/control ++^debian/exim4-dbg/DEBIAN/md5sums ++^debian/exim4-dbg/usr/lib/debug/usr/lib/exim4/eximon.bin ++^debian/exim4-dbg/usr/lib/debug/usr/sbin/exim_dbmbuild ++^debian/exim4-dbg/usr/lib/debug/usr/sbin/exim_dumpdb ++^debian/exim4-dbg/usr/lib/debug/usr/sbin/exim_fixdb ++^debian/exim4-dbg/usr/lib/debug/usr/sbin/exim_lock ++^debian/exim4-dbg/usr/lib/debug/usr/sbin/exim_tidydb ++^debian/exim4-dbg/usr/share/doc/exim4-dbg/changelog.Debian.gz ++^debian/exim4-dbg/usr/share/doc/exim4-dbg/copyright ++^debian/exim4-dbg/usr/share/lintian/overrides/exim4-dbg ++^debian/exim4-dev.debhelper.log ++^debian/exim4-dev/DEBIAN/control ++^debian/exim4-dev/DEBIAN/md5sums ++^debian/exim4-dev/usr/bin/exim4-localscan-plugin-config ++^debian/exim4-dev/usr/include/exim4/config.h ++^debian/exim4-dev/usr/include/exim4/local_scan.h ++^debian/exim4-dev/usr/include/exim4/mytypes.h ++^debian/exim4-dev/usr/include/exim4/store.h ++^debian/exim4-dev/usr/share/doc/exim4-dev/README.Debian.gz ++^debian/exim4-dev/usr/share/doc/exim4-dev/changelog.Debian.gz ++^debian/exim4-dev/usr/share/doc/exim4-dev/changelog.gz ++^debian/exim4-dev/usr/share/doc/exim4-dev/copyright ++^debian/exim4-dev/usr/share/lintian/overrides/exim4-dev ++^debian/exim4-dev/usr/share/man/man1/exim4-localscan-plugin-config.1.gz ++^debian/exim4.debhelper.log ++^debian/exim4.postrm.debhelper ++^debian/exim4.substvars ++^debian/exim4/DEBIAN/config ++^debian/exim4/DEBIAN/control ++^debian/exim4/DEBIAN/md5sums ++^debian/exim4/DEBIAN/postinst ++^debian/exim4/DEBIAN/postrm ++^debian/exim4/DEBIAN/templates ++^debian/exim4/usr/share/bug/exim4/script ++^debian/exim4/usr/share/doc/exim4 ++^debian/exim4/usr/share/lintian/overrides/exim4 ++^debian/eximon4.debhelper.log ++^debian/eximon4.postinst.debhelper ++^debian/eximon4.postrm.debhelper ++^debian/eximon4.substvars ++^debian/eximon4/DEBIAN/control ++^debian/eximon4/DEBIAN/md5sums ++^debian/eximon4/DEBIAN/postinst ++^debian/eximon4/DEBIAN/postrm ++^debian/eximon4/usr/lib/exim4/eximon.bin ++^debian/eximon4/usr/sbin/eximon ++^debian/eximon4/usr/share/doc/eximon4/changelog.Debian.gz ++^debian/eximon4/usr/share/doc/eximon4/copyright ++^debian/eximon4/usr/share/lintian/overrides/eximon4 ++^debian/eximon4/usr/share/man/man8/eximon.8.gz ++^debian/eximon4/usr/share/menu/eximon4 ++^debian/files ++^installbase-stamp ++^patch-stamp ++^unpack-configs-stamp +diff -r b4cc307a2719 debian/EDITME.exim4-light.diff +--- a/debian/EDITME.exim4-light.diff Thu Aug 13 12:59:19 2009 +0200 ++++ b/debian/EDITME.exim4-light.diff Thu Aug 13 13:46:31 2009 +0200 @@ -1,5 +1,5 @@ ---- /tmp/dpep-work.wG8120/trunk/build-tree/src/EDITME 2007-07-17 11:04:08.000000000 +0200 -+++ EDITME.exim4-light 2007-07-17 11:04:27.000000000 +0200 @@ -26,29 +355,42 @@ # End of EDITME for Exim 4. + +# enable IPv6 support -diff -r 2986669e93b0 -r c0445d21ca67 debian/patches/00list ---- a/debian/patches/00list Mon Aug 10 16:00:12 2009 +0200 -+++ b/debian/patches/00list Mon Aug 10 16:01:25 2009 +0200 +diff -r b4cc307a2719 debian/changelog +--- a/debian/changelog Thu Aug 13 12:59:19 2009 +0200 ++++ b/debian/changelog Thu Aug 13 13:46:31 2009 +0200 +@@ -1,3 +1,10 @@ ++exim4 (4.69-9.1) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * memcache support ++ ++ -- Matthias Förste Thu, 13 Aug 2009 13:26:52 +0200 ++ + exim4 (4.69-9) unstable; urgency=medium + + * [update-exim4.conf]: Use POSIX character classes [:alnum:] or explicit +diff -r b4cc307a2719 debian/patches/00list +--- a/debian/patches/00list Thu Aug 13 12:59:19 2009 +0200 ++++ b/debian/patches/00list Thu Aug 13 13:46:31 2009 +0200 @@ -12,3 +12,4 @@ 60_convert4r4 66_enlarge-dh-parameters-size 70_remove_exim-users_references +80_memcache -diff -r 2986669e93b0 -r c0445d21ca67 debian/patches/80_memcache.dpatch +diff -r b4cc307a2719 debian/patches/80_memcache.dpatch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/debian/patches/80_memcache.dpatch Mon Aug 10 16:01:25 2009 +0200 -@@ -0,0 +1,442 @@ ++++ b/debian/patches/80_memcache.dpatch Thu Aug 13 13:46:31 2009 +0200 +@@ -0,0 +1,511 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run -+## 80_memcache.dpatch by ++## 80_memcache.dpatch by Matthias Förste +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: key/value storage/retrieval via memcache + +@DPATCH@ -+ -+diff -r 6c0f7fa36c53 OS/Makefile-Base -+--- a/build-tree/OS/Makefile-Base Wed Jul 29 15:15:06 2009 +0200 -++++ b/build-tree/OS/Makefile-Base Mon Aug 10 10:31:21 2009 +0200 ++diff -urNad exim4-4.69~/build-tree/OS/Makefile-Base exim4-4.69/build-tree/OS/Makefile-Base ++--- exim4-4.69~/build-tree/OS/Makefile-Base 2009-08-13 13:12:55.000000000 +0200 +++++ exim4-4.69/build-tree/OS/Makefile-Base 2009-08-13 13:12:56.000000000 +0200 +@@ -543,7 +543,7 @@ + dns.o: $(HDRS) dns.c + enq.o: $(HDRS) enq.c @@ -58,9 +400,9 @@ + filter.o: $(HDRS) filter.c + filtertest.o: $(HDRS) filtertest.c + globals.o: $(HDRS) globals.c -+diff -r 6c0f7fa36c53 doc/OptionLists.txt -+--- a/build-tree/doc/OptionLists.txt Wed Jul 29 15:15:06 2009 +0200 -++++ b/build-tree/doc/OptionLists.txt Mon Aug 10 10:31:21 2009 +0200 ++diff -urNad exim4-4.69~/build-tree/doc/OptionLists.txt exim4-4.69/build-tree/doc/OptionLists.txt ++--- exim4-4.69~/build-tree/doc/OptionLists.txt 2007-08-29 15:37:28.000000000 +0200 +++++ exim4-4.69/build-tree/doc/OptionLists.txt 2009-08-13 13:12:56.000000000 +0200 +@@ -11,7 +11,7 @@ + 4. Those that can appear in the build time configuration for the Exim monitor + (Local/eximon.conf). @@ -78,17 +420,85 @@ + SUPPORT_MBX optional support for MBX delivery + SUPPORT_MOVE_FROZEN_MESSAGES optional* support for frozen message moving + SUPPORT_PAM optional support for PAM authentication -+diff -r 6c0f7fa36c53 doc/memcache.txt -+--- /dev/null Thu Jan 01 00:00:00 1970 +0000 -++++ b/build-tree/doc/memcache.txt Mon Aug 10 10:31:21 2009 +0200 -+@@ -0,0 +1,4 @@ -++store some value under key (expands to 'true' if successful): -++${memcache{memcache_servers}{set}{namespace}{key}{value}{expiration}{timeout}} -++lookup the value of some key (expands to 'true' if the key has been found; stores the value in $value) -++${memcache{memcache_servers}{get}{namespace}{key}{$value}{timeout}} -+diff -r 6c0f7fa36c53 scripts/MakeLinks -+--- a/build-tree/scripts/MakeLinks Wed Jul 29 15:15:06 2009 +0200 -++++ b/build-tree/scripts/MakeLinks Mon Aug 10 10:31:21 2009 +0200 ++diff -urNad exim4-4.69~/build-tree/doc/memcache.txt exim4-4.69/build-tree/doc/memcache.txt ++--- exim4-4.69~/build-tree/doc/memcache.txt 1970-01-01 01:00:00.000000000 +0100 +++++ exim4-4.69/build-tree/doc/memcache.txt 2009-08-13 13:12:56.000000000 +0200 ++@@ -0,0 +1,72 @@ +++* store some value under key; expands to 'true' if successful; expiration & +++ timeout are optional +++ +++ ${memcache \ +++ {+memcache_servers} \ +++ {set} \ +++ {namespace} \ +++ {key} \ +++ {value} \ +++ {expiration} \ +++ {timeout}} +++ +++ +++* lookup the value of some key; expands to 'true' if the key has been found; +++ stores the value in $value; timeout is optional +++ +++ ${memcache \ +++ {+memcache_servers} \ +++ {get} \ +++ {namespace} \ +++ {key} \ +++ {$value} \ +++ {timeout}} +++ +++ +++Currently only tcp connections are supported. No sanity checks on arguments are +++done yet. You can use a hostlist, but its probably not useful. Each host is +++tried in the order listed until one succeeds. Expansion will fail if none +++suceeds. +++ +++example usage for greylisting: +++ +++ [...] +++ +++ hostlist memcache_servers = <; host1:port1; host2:port2; host3 +++ +++ [...] +++ +++ acl_check_rcpt: +++ +++ # greylisting with memcache +++ # do we already have a timestamp for this sender/receiver combo? try to store +++ # one if we dont and defer if this succeeds, deny otherwise; accept the +++ # message if we find a timestamp which is older than 5 minutes, deny +++ # otherwise (if the timestamp is younger that is) +++ accept +++ logwrite = memcache \ +++ get \ +++ exim-lenny:${sender_address}*${local_part}@${domain} +++ condition = ${memcache \ +++ {+memcache_servers} \ +++ {get} \ +++ {exim-lenny:} \ +++ {${sender_address}*${local_part}@${domain}} \ +++ {$value}} +++ endpass +++ condition = ${if or { \ +++ {eq {$value}{}} \ +++ { > {$tod_epoch}{${eval: $value + 300}}} \ +++ }} +++ defer +++ logwrite = memcache \ +++ set \ +++ exim-lenny:${sender_address}*${local_part}@${domain} \ +++ $tod_epoch +++ condition = ${memcache \ +++ {+memcache_servers} \ +++ {set} \ +++ {exim-lenny:} \ +++ {${sender_address}*${local_part}@${domain}} \ +++ {$tod_epoch}} +++ deny ++diff -urNad exim4-4.69~/build-tree/scripts/MakeLinks exim4-4.69/build-tree/scripts/MakeLinks ++--- exim4-4.69~/build-tree/scripts/MakeLinks 2007-09-28 14:21:57.000000000 +0200 +++++ exim4-4.69/build-tree/scripts/MakeLinks 2009-08-13 13:12:56.000000000 +0200 +@@ -200,6 +200,7 @@ + ln -s ../src/globals.h globals.h + ln -s ../src/local_scan.h local_scan.h @@ -97,10 +507,10 @@ + ln -s ../src/mytypes.h mytypes.h + ln -s ../src/osfunctions.h osfunctions.h + ln -s ../src/store.h store.h -+diff -r 6c0f7fa36c53 src/config.h.defaults -+--- a/build-tree/src/config.h.defaults Wed Jul 29 15:15:06 2009 +0200 -++++ b/build-tree/src/config.h.defaults Mon Aug 10 10:31:21 2009 +0200 -+@@ -120,6 +120,7 @@ ++diff -urNad exim4-4.69~/build-tree/src/config.h.defaults exim4-4.69/build-tree/src/config.h.defaults ++--- exim4-4.69~/build-tree/src/config.h.defaults 2009-08-13 13:12:55.000000000 +0200 +++++ exim4-4.69/build-tree/src/config.h.defaults 2009-08-13 13:12:56.000000000 +0200 ++@@ -122,6 +122,7 @@ + #define SUPPORT_MAILDIR + #define SUPPORT_MAILSTORE + #define SUPPORT_MBX @@ -108,20 +518,20 @@ + #define SUPPORT_MOVE_FROZEN_MESSAGES + #define SUPPORT_PAM + #define SUPPORT_TLS -+diff -r 6c0f7fa36c53 src/expand.c -+--- a/build-tree/src/expand.c Wed Jul 29 15:15:06 2009 +0200 -++++ b/build-tree/src/expand.c Mon Aug 10 10:31:21 2009 +0200 -+@@ -25,6 +25,10 @@ ++diff -urNad exim4-4.69~/build-tree/src/expand.c exim4-4.69/build-tree/src/expand.c ++--- exim4-4.69~/build-tree/src/expand.c 2007-10-04 15:23:05.000000000 +0200 +++++ exim4-4.69/build-tree/src/expand.c 2009-08-13 13:14:42.000000000 +0200 ++@@ -27,6 +27,10 @@ ++ #include "lookups/ldap.h" ++ #endif + -+ #ifdef LOOKUP_LDAP -+ #include "lookups/ldap.h" +++#ifdef SUPPORT_MEMCACHE +++#include "memcache.h" ++#endif ++ -++#ifdef SUPPORT_MEMCACHE -++#include "memcache.h" -+ #endif -+ + #ifdef SUPPORT_CRYPTEQ ++ #ifdef CRYPT_H ++ #include +@@ -113,6 +117,7 @@ + US"length", + US"lookup", @@ -138,7 +548,7 @@ + EITEM_NHASH, + EITEM_PERL, + EITEM_PRVS, -+@@ -4980,6 +4986,229 @@ ++@@ -4980,6 +4986,231 @@ + } + } + #endif /* EXPAND_DLFUNC */ @@ -169,6 +579,7 @@ ++ ++ uschar *memcache_request; ++ int memcache_request_len; +++ BOOL memcache_request_failed = FALSE; ++ ++ uschar *memcache_readsocket_result; ++ @@ -182,7 +593,7 @@ ++ switch(read_subs(sub_arg, 7, 5, &s, skipping, TRUE, US"memcache")) ++ { ++ case 1: goto EXPAND_FAILED_CURLY; -++ case 2: /* Won't occur: no end check */ +++ case 2: ++ case 3: goto EXPAND_FAILED; ++ } ++ @@ -334,6 +745,7 @@ ++ else ++ { ++ /* something went wrong - try something else */ +++ memcache_request_failed = TRUE; ++ DEBUG(D_memcache) ++ { ++ debug_printf("memcache operation '%s' failed: '%s'\n", @@ -353,7 +765,7 @@ ++ ++ } ++ -++ if (memcache_readsocket_result == NULL) +++ if (memcache_request_failed) ++ { ++ /* every try failed if we come here */ ++ expand_string_message = @@ -368,10 +780,10 @@ + } + + /* Control reaches here if the name is not recognized as one of the more -+diff -r 6c0f7fa36c53 src/globals.c -+--- a/build-tree/src/globals.c Wed Jul 29 15:15:06 2009 +0200 -++++ b/build-tree/src/globals.c Mon Aug 10 10:31:21 2009 +0200 -+@@ -448,6 +448,7 @@ ++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 2009-08-13 13:12:55.000000000 +0200 +++++ exim4-4.69/build-tree/src/globals.c 2009-08-13 13:12:56.000000000 +0200 ++@@ -451,6 +451,7 @@ + { US"load", D_load }, + { US"local_scan", D_local_scan }, + { US"lookup", D_lookup }, @@ -379,9 +791,9 @@ + { US"memory", D_memory }, + { US"pid", D_pid }, + { US"process_info", D_process_info }, -+diff -r 6c0f7fa36c53 src/macros.h -+--- a/build-tree/src/macros.h Wed Jul 29 15:15:06 2009 +0200 -++++ b/build-tree/src/macros.h Mon Aug 10 10:31:21 2009 +0200 ++diff -urNad exim4-4.69~/build-tree/src/macros.h exim4-4.69/build-tree/src/macros.h ++--- exim4-4.69~/build-tree/src/macros.h 2007-08-22 12:10:23.000000000 +0200 +++++ exim4-4.69/build-tree/src/macros.h 2009-08-13 13:12:56.000000000 +0200 +@@ -313,19 +313,20 @@ + #define D_load 0x00008000 + #define D_lookup 0x00010000 @@ -462,9 +874,9 @@ + + /* Results of filter or forward file processing. Some are only from a filter; + some are only from a forward file. */ -+diff -r 6c0f7fa36c53 src/memcache.h -+--- /dev/null Thu Jan 01 00:00:00 1970 +0000 -++++ b/build-tree/src/memcache.h Mon Aug 10 10:31:21 2009 +0200 ++diff -urNad exim4-4.69~/build-tree/src/memcache.h exim4-4.69/build-tree/src/memcache.h ++--- exim4-4.69~/build-tree/src/memcache.h 1970-01-01 01:00:00.000000000 +0100 +++++ exim4-4.69/build-tree/src/memcache.h 2009-08-13 13:12:56.000000000 +0200 +@@ -0,0 +1,14 @@ ++#ifndef MEMCACHE_H ++