diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/exim-exiscan/Makefile | 5 | ||||
| -rw-r--r-- | mail/exim/Makefile | 3 | ||||
| -rw-r--r-- | mail/exim/Makefile.common | 4 | ||||
| -rw-r--r-- | mail/exim/distinfo | 11 | ||||
| -rw-r--r-- | mail/exim/patches/patch-ag | 13 |
5 files changed, 10 insertions, 26 deletions
diff --git a/mail/exim-exiscan/Makefile b/mail/exim-exiscan/Makefile index c2cdf9c60d8..88b1179aa8f 100644 --- a/mail/exim-exiscan/Makefile +++ b/mail/exim-exiscan/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2004/06/04 23:21:34 reed Exp $ +# $NetBSD: Makefile,v 1.12 2004/06/06 22:10:51 abs Exp $ DISTNAME= exim-${EXIM_VERSION} -PKGREVISION= 3 PKGNAME= exim-exiscan-${EXIM_VERSION}_${EXISCAN_VERSION} CATEGORIES= mail net @@ -11,7 +10,7 @@ COMMENT= The Exim mail transfer agent, with exiscan-acl patches CONFLICTS+= exim-[0-9]* -EXISCAN_VERSION=20 +EXISCAN_VERSION=22 PATCH_SITES= http://duncanthrax.net/exiscan-acl/ PATCHFILES= exiscan-acl-${EXIM_VERSION}-${EXISCAN_VERSION}.patch.bz2 diff --git a/mail/exim/Makefile b/mail/exim/Makefile index a1b7062c9a8..0a0ff4dcd66 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.49 2004/06/04 23:21:34 reed Exp $ +# $NetBSD: Makefile,v 1.50 2004/06/06 22:10:51 abs Exp $ DISTNAME= exim-${EXIM_VERSION} -PKGREVISION= 3 CATEGORIES= mail net MAINTAINER= abs@NetBSD.org diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common index 1d49ca9561c..9b5a151822f 100644 --- a/mail/exim/Makefile.common +++ b/mail/exim/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2004/06/04 23:21:34 reed Exp $ +# $NetBSD: Makefile.common,v 1.11 2004/06/06 22:10:51 abs Exp $ MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \ ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \ @@ -10,7 +10,7 @@ USE_PKGINSTALL= yes MAKE_ENV+= SSLBASE=${SSLBASE:Q} -EXIM_VERSION= 4.33 +EXIM_VERSION= 4.34 EXTRACT_SUFX= .tar.bz2 diff --git a/mail/exim/distinfo b/mail/exim/distinfo index 26ce0c3b9a0..8282508875c 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.18 2004/06/04 00:10:34 reed Exp $ +$NetBSD: distinfo,v 1.19 2004/06/06 22:10:51 abs Exp $ -SHA1 (exim-4.33.tar.bz2) = 2e18138793e416a4934e6f2ac8d2cd9262ffae07 -Size (exim-4.33.tar.bz2) = 1327741 bytes -SHA1 (exiscan-acl-4.33-20.patch.bz2) = e50b2570f5485827f63949eed944f90acdcc11e0 -Size (exiscan-acl-4.33-20.patch.bz2) = 74187 bytes +SHA1 (exim-4.34.tar.bz2) = ed77428c4dfa4718c1bd4ddb5de2d99d37cec2de +Size (exim-4.34.tar.bz2) = 1328742 bytes +SHA1 (exiscan-acl-4.34-22.patch.bz2) = 30134a680d0bb863b8d7241cefbd838582f3d671 +Size (exiscan-acl-4.34-22.patch.bz2) = 76947 bytes SHA1 (patch-aa) = 07ce41a5ee3a29c29a05ad556f5fef53a5a2285b SHA1 (patch-ab) = 5134367d16c56ad7c2820393e102a9aad73511c8 SHA1 (patch-ac) = 48160bf4ef4379f4b4ce5dafeb33c85ddcfde65c SHA1 (patch-ad) = 6323899062b33ec34610fd93dfc181cdc9d7f369 SHA1 (patch-ae) = b806857f4fa0c9d4c3603e8ee5f9c4419e643956 SHA1 (patch-af) = 483fe63aa9c6b524ab61a53a20968e5a7fa3d095 -SHA1 (patch-ag) = 359c0b16da0ec85dea41472a4c67108b1f06824a diff --git a/mail/exim/patches/patch-ag b/mail/exim/patches/patch-ag deleted file mode 100644 index 736b69fdc81..00000000000 --- a/mail/exim/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2004/05/07 17:47:32 abs Exp $ - ---- src/verify.c.orig Fri May 7 18:23:09 2004 -+++ src/verify.c -@@ -1270,7 +1270,7 @@ for (h = header_list; h != NULL; h = h-> - uschar *verb = US"is"; - int len; - -- while (*t != ':') *tt++ = *t++; -+ while (*t != ':' && tt < &hname[sizeof(hname)-2]) *tt++ = *t++; - *tt = 0; - - /* Arrange not to include any white space at the end in the |