05 May 2008; Colin Morey <peitolm@gentoo.org>

  +files/exim-4.69-r1.27021.patch,
  +files/exim-4.69-r1.boolean_redefine_protect.152706.patch,
  exim-4.69-r1.ebuild:
  Patches added from:-
  #27021  - mail-mta/exim - Mail filtering and maildir enhancements for exim.conf
  #152706 - mail-mta/exim - use shared libpcre + other fixed
Package-Manager: portage-2.1.4.4

5 files changed, 94 insertions, 4 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 1c3bd1202c58..89c97f40ffb3 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for mail-mta/exim
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.128 2008/05/21 16:04:10 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.129 2008/07/12 17:42:23 peitolm Exp $
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org> exim-4.69.ebuild,
   exim-4.69-r1.ebuild:
@@ -13,6 +13,14 @@
   14 May 2008; Diego Pettenò <flameeyes@gentoo.org> exim-4.69-r1.ebuild:
   Depend on virtual/pam as the code builds fine with OpenPAM.
 
+  05 May 2008; Colin Morey <peitolm@gentoo.org>
+  +files/exim-4.69-r1.27021.patch,
+  +files/exim-4.69-r1.boolean_redefine_protect.152706.patch,
+  exim-4.69-r1.ebuild:
+  Patches added from:-
+  #27021  - mail-mta/exim - Mail filtering and maildir enhancements for exim.conf
+  #152706 - mail-mta/exim - use shared libpcre + other fixed
+
   24 Apr 2008; Raúl Porcel <armin76@gentoo.org> -files/digest-exim-4.68,
   -files/digest-exim-4.69, -files/digest-exim-4.69-r1:
   Remove digests
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index e1391e0607f2..d3b5cdc3080c 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -3,6 +3,8 @@ AUX exim-4.14-tail.patch 446 RMD160 685e27ff995710f3b8d77d8785b04503170e7e27 SHA
 AUX exim-4.20-maildir.patch 478 RMD160 50c6a1dd6ae3f7bb1776696d3d0d7a161c351fce SHA1 c8287f7e44d93b0ca8761b8f7111974cfe1280a5 SHA256 2704c4db67bb7c58c2421656d942f533d1eedf1df187e76297ab72d2c2a2fb4c
 AUX exim-4.30-conf.patch 887 RMD160 4e50bdb4f3a9f061c7f4da763ad5e427b9cbea26 SHA1 cf7ecab19aba3b758d736c584b98fa4be2338050 SHA256 a33425492f246c6afe3be21e83e0dc20ecd5ea300a172d877f666d077648eedf
 AUX exim-4.43-r2-localscan_dlopen.patch 9236 RMD160 d33f7bcf72f947e8d1a3d917713630100c175491 SHA1 e4239a1bf0261f99491b4a29b26bbe8d9beffbd8 SHA256 3ec15d2dfdf251c70647c3def09711385f23983eceeecb6ec9d42b39f54b198d
+AUX exim-4.69-r1.27021.patch 1738 RMD160 fbe33030e0a9462cc91b46799347d77b20b39b7e SHA1 8e03c8b52d02d55cb5307ea646e1e59d9a526353 SHA256 8d0b2c8a23d92a2b78d2aee459c347abcf417cbfb06e4a06a58b3abe10eb1d9d
+AUX exim-4.69-r1.boolean_redefine_protect.152706.patch 473 RMD160 f3a18c0d338d673a3bc216d19152c9c7c43e29d6 SHA1 ba08af4b635418ca4a81e6343da875f0b86daabd SHA256 85d1e7554dac8204e1d2e71a10d73a2172610190d74d005b152191e865e85108
 AUX exim.confd 62 RMD160 d8dcabf184ffb9066ad45c3e77cce1ec0392a143 SHA1 c56feda3c3193fad26852310da8ef24ef91f60f6 SHA256 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401
 AUX exim.rc6 738 RMD160 6935a02ff63db979a71cd834675f1aff066b296b SHA1 a4504387906a8386904a40c0aabadd69cb8a4c2a SHA256 db96d7bf9b11dcac4d9d9dab0d111a9d8a36910473918d8903ade9a03963bffd
 AUX mailer.conf 259 RMD160 6412ac421b836f9425af443084dbaa49feb14df6 SHA1 690b15bdb334ed2bfda927a156227385823353f2 SHA256 c1dfa59d617c5744ebd119c37b408d7135f1fa6be4322d2f77db8ba9cb30d359
@@ -11,7 +13,7 @@ AUX system_filter.exim 8120 RMD160 267545af6dd333e0e5f05e1d4d02a0e8ee638d45 SHA1
 DIST exim-4.69.tar.bz2 1658939 RMD160 ae97c807c63f858ba4a0ab402677225da9337d05 SHA1 321e238b6e6b32498110511ce72a911538305a39 SHA256 18e856cfdb682ba8e8ccb943ab538734d34d0ecefd63465ecc5430bc15915069
 DIST exiscan.conf 22113 RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 SHA1 74dc6e30f49402f5e6fefc280ea325d17f6af8c4 SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964
 DIST system_filter.exim.gz 3075 RMD160 47bcc6de402d896b73fd01d7f0d3c3ecbad9cf0b SHA1 384d138d8612f3a80b2b68f272b43cd69bc4411a SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437
-EBUILD exim-4.69-r1.ebuild 9851 RMD160 f427542b584fccfd13a08c4cea440f151581efa5 SHA1 5bcd77384b70d71a10c5a73fce0ccfc99caadc44 SHA256 d315a0c91044a5f52a56fc7caf216eb78292762a7603e057a09200ab6cc98467
+EBUILD exim-4.69-r1.ebuild 9970 RMD160 7783a6cbea7d9baecef525c586b9b6e3777d842c SHA1 6148d268960edda2a92fa183cefe239e237db252 SHA256 7787385bfd6088b4df31b587b8f1853b889b732aa0c382d859f8a6ab75db7745
 EBUILD exim-4.69.ebuild 9807 RMD160 7a21c60de7ef4316a925fab5e55fe8164ab880c5 SHA1 c95e177d1b0510c5f57109544346fe4a96529c32 SHA256 c3bd7054ccec6dc4e5d0446fcb5b6e09218e0c5aa84654c8a3e547858c4c5ddc
-MISC ChangeLog 29248 RMD160 d1e44ae3f793df6032d4171e0091ab49c9029ac6 SHA1 b0da1bc930c443dec01b223c5f79b918efc0d8c0 SHA256 c806f215632bb8c149c172b4ea5105e91e5a80849c5911c3fd439c98f24a4356
+MISC ChangeLog 29581 RMD160 1df14750b1566d1e5c12f6a1c61bb0c436026e36 SHA1 bb916f4fc5bf8d59508150f78aee798f102b6e5e SHA256 1cc614e3cefda40216f61da669c9000f0fe3d95bb380e2e505b0439882a96a63
 MISC metadata.xml 863 RMD160 963b1a80f7d3ec06f670ceea9d8451b7aa1243e8 SHA1 096ec5e2f0957fc0dabc5d1145a73611fb048222 SHA256 8af9e235beb4ba6aedde75b11f5223f0d1eb3ccff4978f3b3acf3d025492984b
diff --git a/mail-mta/exim/exim-4.69-r1.ebuild b/mail-mta/exim/exim-4.69-r1.ebuild
index 8d69ae984a3e..d8d152be2027 100644
--- a/mail-mta/exim/exim-4.69-r1.ebuild
+++ b/mail-mta/exim/exim-4.69-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r1.ebuild,v 1.4 2008/05/21 16:04:10 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r1.ebuild,v 1.5 2008/07/12 17:42:23 peitolm Exp $
 
 inherit eutils
 
@@ -56,6 +56,8 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/exim-4.14-tail.patch
 	epatch "${FILESDIR}"/exim-4.43-r2-localscan_dlopen.patch
+	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
+	epatch "${FILESDIR}"/exim-4.69-r1.boolean_redefine_protect.152706.patch
 
 	if use maildir; then
 		einfo "Patching maildir support into exim.conf"
diff --git a/mail-mta/exim/files/exim-4.69-r1.27021.patch b/mail-mta/exim/files/exim-4.69-r1.27021.patch
new file mode 100644
index 000000000000..72b048632a6a
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.69-r1.27021.patch
@@ -0,0 +1,57 @@
+diff -urN exim-4.69.orig/src/configure.default exim-4.69/src/configure.default
+--- exim-4.69.orig/src/configure.default	2008-05-05 10:17:44.000000000 +0100
++++ exim-4.69/src/configure.default	2008-05-05 10:18:26.000000000 +0100
+@@ -592,6 +592,22 @@
+   pipe_transport = address_pipe
+   reply_transport = address_reply
+ 
++# This router runs procmail if users have a .procmailrc file
++procmail:
++  check_local_user
++  driver = accept
++  transport = procmail_pipe
++  require_files = ${local_part}:+${home}:+${home}/.procmailrc:+/usr/bin/procmail
++  no_verify
++ 
++# This router runs maildrop if users have a .mailfilter file
++maildrop:
++  check_local_user
++  driver = accept
++  transport = maildrop_pipe
++  require_files = ${local_part}:+${home}:+${home}/.mailfilter:+/usr/bin/maildrop
++  no_verify
++
+ 
+ # This router matches local user mailboxes. If the router fails, the error
+ # message is "Unknown user".
+@@ -600,7 +616,7 @@
+ # or "+" characters as if the suffixes did not exist, uncomment the two local_
+ # part_suffix options. Then, for example, xxxx-foo@your.domain will be treated
+ # in the same way as xxxx@your.domain by this router.
+-
++m
+ localuser:
+   driver = accept
+   check_local_user
+@@ -676,6 +692,21 @@
+ address_reply:
+   driver = autoreply
+ 
++# This transport is used for procmail
++procmail_pipe:
++  driver = pipe
++  command = "/usr/bin/procmail -d ${local_part}"
++  return_path_add
++  delivery_date_add
++  envelope_to_add
++
++# This transport is used for courier-maildrop filtering (Maildir filter system)
++maildrop_pipe:
++  driver = pipe
++  command = "/usr/bin/maildrop -d ${local_part}"
++  return_path_add
++  delivery_date_add
++  envelope_to_add
+ 
+ 
+ ######################################################################
diff --git a/mail-mta/exim/files/exim-4.69-r1.boolean_redefine_protect.152706.patch b/mail-mta/exim/files/exim-4.69-r1.boolean_redefine_protect.152706.patch
new file mode 100644
index 000000000000..eba3cb18d01b
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.69-r1.boolean_redefine_protect.152706.patch
@@ -0,0 +1,21 @@
+diff -urN exim-4.69.orig/src/mytypes.h exim-4.69/src/mytypes.h
+--- exim-4.69.orig/src/mytypes.h	2007-01-08 10:50:18.000000000 +0000
++++ exim-4.69/src/mytypes.h	2008-05-05 10:48:09.000000000 +0100
+@@ -16,9 +16,17 @@
+ #define MYTYPES_H
+ 
+ 
++#ifndef FALSE
+ #define FALSE         0
++#endif
++
++#ifndef TRUE
+ #define TRUE          1
++#endif
++
++#ifndef TRUE_UNSET
+ #define TRUE_UNSET    2
++#endif
+ 
+ 
+ /* If gcc is being used to compile Exim, we can use its facility for checking