pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Update exim3 to exim-3.36nb2



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7f51620584e9
branches:  trunk
changeset: 474934:7f51620584e9
user:      abs <abs%pkgsrc.org@localhost>
date:      Fri May 07 17:47:32 2004 +0000

description:
Update exim3 to exim-3.36nb2
  - Fix buffer overflows listed at http://www.guninski.com/exim1.html

Update exim to exim-4.33nb1 (from 4.22nb5)
  - Fix buffer overflow listed at http://www.guninski.com/exim1.html
  - Leave nb1 to indicate we have a local change from stock 4.33
  - 1086 lines of changes - http://www.exim.org/ftp/ChangeLogs/ChangeLog-4.33
  - Remove dependancy on exim-user - now looks up EXIM_{USER,GROUP} at runtime

Update exim-exiscan to 4.33_20nb1 (from 4.22-12)
  - Fix buffer overflow listed at http://www.guninski.com/exim1.html
  - Leave nb1 to indicate we have a local change from stock 4.33_20
  - Same exim changes - http://www.exim.org/ftp/ChangeLogs/ChangeLog-4.33
  - Changes (http://duncanthrax.net/exiscan-acl/CHANGELOG) include
    - added option to use multiple spamd servers
    - many mime changes
    - Added Brightmail Antispam support
    - clamd fixes

Update exim-html to 4.30 (from 4.20)
  - Update to latest docs

Delete exim-user
  - No longer required - exim now looks up EXIM_{USER,GROUP} at runtime

diffstat:

 doc/CHANGES                 |    8 ++-
 doc/TODO                    |    6 +-
 mail/exim-exiscan/Makefile  |   11 +-
 mail/exim-html/Makefile     |    4 +-
 mail/exim-html/distinfo     |    6 +-
 mail/exim-user/DESCR        |    3 -
 mail/exim-user/Makefile     |   28 --------
 mail/exim-user/PLIST        |    2 -
 mail/exim/Makefile          |    5 +-
 mail/exim/Makefile.common   |    7 +-
 mail/exim/distinfo          |   23 +++---
 mail/exim/patches/patch-aa  |   33 +++++-----
 mail/exim/patches/patch-ab  |    4 +-
 mail/exim/patches/patch-ac  |    4 +-
 mail/exim/patches/patch-ad  |    4 +-
 mail/exim/patches/patch-ae  |    6 +-
 mail/exim/patches/patch-af  |    8 +-
 mail/exim/patches/patch-ag  |   13 ++++
 mail/exim3/Makefile         |    4 +-
 mail/exim3/distinfo         |   14 ++-
 mail/exim3/patches/patch-aa |  104 +++++++++++++++++++++++++++++++++
 mail/exim3/patches/patch-ab |  138 ++++++++++++-------------------------------
 mail/exim3/patches/patch-ac |   53 +++-------------
 mail/exim3/patches/patch-ad |   13 ++++
 mail/exim3/patches/patch-ae |    8 +-
 mail/exim3/patches/patch-af |    8 +-
 mail/exim3/patches/patch-ag |   31 ++++++---
 27 files changed, 287 insertions(+), 261 deletions(-)

diffs (truncated from 861 to 300 lines):

diff -r f9fb312a2a6b -r 7f51620584e9 doc/CHANGES
--- a/doc/CHANGES       Fri May 07 16:40:41 2004 +0000
+++ b/doc/CHANGES       Fri May 07 17:47:32 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5860 2004/05/07 16:38:53 hrs Exp $
+$NetBSD: CHANGES,v 1.5861 2004/05/07 17:48:43 abs Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2399,3 +2399,9 @@
        Added p5-Mail-Mbox-MessageParser-0.14 [wiz 2004-05-07]
        Updated grepmail to 5.22nb1 [wiz 2004-05-07]
        Updated dsssl-docbook-modular to 1.78 [hrs 2004-05-07]
+       Updated exim3 to 3.36nb2 [abs 2004-05-07]
+       Updated exim to 4.33nb1 [abs 2004-05-07]
+       Updated exim-exiscan to 4.33_20nb1 [abs 2004-05-07]
+       Updated exim-html to 4.30 [abs 2004-05-07]
+       Deleted exim-user [abs 2004-05-07]
+
diff -r f9fb312a2a6b -r 7f51620584e9 doc/TODO
--- a/doc/TODO  Fri May 07 16:40:41 2004 +0000
+++ b/doc/TODO  Fri May 07 17:47:32 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.1720 2004/05/07 13:51:54 adam Exp $
+$NetBSD: TODO,v 1.1721 2004/05/07 17:48:43 abs Exp $
 
 Suggested new packages
 ======================
@@ -137,6 +137,10 @@
        Vnc2swf captures the live motion of a screen with VNC protocol
        and generates a Macromedia Flash(TM) movie (.swf).
 
+       Filelight
+       http://www.methylblue.com/filelight/
+       Graphical representation of disk space usage
+
 Suggested package updates
 =========================
 
diff -r f9fb312a2a6b -r 7f51620584e9 mail/exim-exiscan/Makefile
--- a/mail/exim-exiscan/Makefile        Fri May 07 16:40:41 2004 +0000
+++ b/mail/exim-exiscan/Makefile        Fri May 07 17:47:32 2004 +0000
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.8 2004/03/26 02:27:43 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/07 17:47:32 abs Exp $
 
 DISTNAME=      exim-${EXIM_VERSION}
-PKGREVISION=   3
-PKGNAME=       exim-exiscan-${EXIM_VERSION}-${EXISCAN_VERSION}
+PKGREVISION=   1
+PKGNAME=       exim-exiscan-${EXIM_VERSION}_${EXISCAN_VERSION}
 CATEGORIES=    mail net
 
 MAINTAINER=    abs%NetBSD.org@localhost
 HOMEPAGE=      http://duncanthrax.net/exiscan-acl/
 COMMENT=       The Exim mail transfer agent, with exiscan-acl patches
 
-DEPENDS+=      exim-user>=1.0:../../mail/exim-user
 CONFLICTS+=    exim-[0-9]*
 
-EXISCAN_VERSION=12
+EXISCAN_VERSION=20
 
 PATCH_SITES=    http://duncanthrax.net/exiscan-acl/
-PATCHFILES=     exiscan-acl-${EXIM_VERSION}-${EXISCAN_VERSION}.patch
+PATCHFILES=     exiscan-acl-${EXIM_VERSION}-${EXISCAN_VERSION}.patch.bz2
 
 DISTINFO_FILE= ${.CURDIR}/../../mail/exim/distinfo
 PATCHDIR=      ${.CURDIR}/../../mail/exim/patches
diff -r f9fb312a2a6b -r 7f51620584e9 mail/exim-html/Makefile
--- a/mail/exim-html/Makefile   Fri May 07 16:40:41 2004 +0000
+++ b/mail/exim-html/Makefile   Fri May 07 17:47:32 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/05/07 11:54:35 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/07 17:47:32 abs Exp $
 
-DISTNAME=      exim-html-4.20
+DISTNAME=      exim-html-4.30
 CATEGORIES=    mail net
 MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/ \
                ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
diff -r f9fb312a2a6b -r 7f51620584e9 mail/exim-html/distinfo
--- a/mail/exim-html/distinfo   Fri May 07 16:40:41 2004 +0000
+++ b/mail/exim-html/distinfo   Fri May 07 17:47:32 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2003/09/02 12:16:19 abs Exp $
+$NetBSD: distinfo,v 1.6 2004/05/07 17:47:32 abs Exp $
 
-SHA1 (exim-html-4.20.tar.bz2) = 60c8b2576bb3e6cfdc8d3d7a3c2ff1004815ee71
-Size (exim-html-4.20.tar.bz2) = 475771 bytes
+SHA1 (exim-html-4.30.tar.bz2) = 5d40155b92c07f8f077d3db23980a84ce9415145
+Size (exim-html-4.30.tar.bz2) = 518372 bytes
 SHA1 (patch-aa) = 24370521bf1c1b8c2d7e7ade6490b0f61a58fa52
diff -r f9fb312a2a6b -r 7f51620584e9 mail/exim-user/DESCR
--- a/mail/exim-user/DESCR      Fri May 07 16:40:41 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-This is a pre-req package which ensures the existance of the mail user
-which is required for exim to build (and therefore must exist pre-build for
-the exim package itself).
diff -r f9fb312a2a6b -r 7f51620584e9 mail/exim-user/Makefile
--- a/mail/exim-user/Makefile   Fri May 07 16:40:41 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/08/02 17:00:07 jmmv Exp $
-
-DISTNAME=      exim-user-4.10
-PKGREVISION=   1
-CATEGORIES=    mail net
-MASTER_SITES=   # empty
-DISTFILES=      # empty
-
-MAINTAINER=    jmc%NetBSD.org@localhost
-HOMEPAGE=      # empty
-COMMENT=       Pre-req package for exim to setup user needed for build/use
-
-USE_PKGINSTALL=        yes
-
-EXTRACT_ONLY=  # empty
-NO_CHECKSUM=   yes
-NO_CONFIGURE=  yes
-NO_BUILD=      yes
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=   EXIM_GROUP EXIM_USER
-PKG_GROUPS=    ${EXIM_GROUP}
-PKG_USERS=     ${EXIM_USER}:${EXIM_GROUP}:8:Exim\\ mail\\ server\\ user:/var/mail:/sbin/nologin
-
-do-install:    # empty
-
-.include "../../mk/bsd.pkg.mk"
diff -r f9fb312a2a6b -r 7f51620584e9 mail/exim-user/PLIST
--- a/mail/exim-user/PLIST      Fri May 07 16:40:41 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2003/06/23 16:10:57 jmc Exp $
-@comment this plist intentionally left empty
diff -r f9fb312a2a6b -r 7f51620584e9 mail/exim/Makefile
--- a/mail/exim/Makefile        Fri May 07 16:40:41 2004 +0000
+++ b/mail/exim/Makefile        Fri May 07 17:47:32 2004 +0000
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.45 2004/05/07 11:54:35 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2004/05/07 17:47:32 abs Exp $
 
 DISTNAME=      exim-${EXIM_VERSION}
-PKGREVISION=   5
+PKGREVISION=   1
 CATEGORIES=    mail net
 
 MAINTAINER=    tech-pkg%NetBSD.org@localhost
 HOMEPAGE=      http://www.exim.org/
 COMMENT=       The Exim mail transfer agent, a replacement for sendmail
 
-DEPENDS+=      exim-user>=4.10nb1:../../mail/exim-user
 CONFLICTS+=    exim-exiscan-[0-9]*
 
 .include "Makefile.common"
diff -r f9fb312a2a6b -r 7f51620584e9 mail/exim/Makefile.common
--- a/mail/exim/Makefile.common Fri May 07 16:40:41 2004 +0000
+++ b/mail/exim/Makefile.common Fri May 07 17:47:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2004/01/20 12:19:43 agc Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/05/07 17:47:32 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 @@
 
 MAKE_ENV+=     SSLBASE=${SSLBASE:Q}
 
-EXIM_VERSION=  4.22
+EXIM_VERSION=  4.33
 
 EXTRACT_SUFX=  .tar.bz2
 
@@ -18,6 +18,9 @@
 
 BUILD_DEFS=            EXIM_USER EXIM_GROUP
 
+PKG_GROUPS=    ${EXIM_GROUP}
+PKG_USERS=     ${EXIM_USER}:${EXIM_GROUP}:8:Exim\\ mail\\ server\\ user:/var/mail:/sbin/nologin
+
 WRKSRC=                ${WRKDIR}/exim-${EXIM_VERSION}
 PKG_SYSCONFSUBDIR?=    exim
 EXAMPLESDIR=           ${PREFIX}/share/examples/exim
diff -r f9fb312a2a6b -r 7f51620584e9 mail/exim/distinfo
--- a/mail/exim/distinfo        Fri May 07 16:40:41 2004 +0000
+++ b/mail/exim/distinfo        Fri May 07 17:47:32 2004 +0000
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.16 2004/03/05 12:28:45 abs Exp $
+$NetBSD: distinfo,v 1.17 2004/05/07 17:47:32 abs Exp $
 
-SHA1 (exim-4.22.tar.bz2) = aa4d67313cfa262135ec455134ecacab5449c937
-Size (exim-4.22.tar.bz2) = 1249633 bytes
-SHA1 (exiscan-acl-4.22-12.patch) = 77f4c7bbb316531e8dc672cad7095aed2ca12a89
-Size (exiscan-acl-4.22-12.patch) = 289700 bytes
-SHA1 (patch-aa) = a3007fe9d23cf8c5a89ad2bb31cc5c5873ac9b0f
-SHA1 (patch-ab) = afccbaec6ece925f87384535e70da8dd79d8e978
-SHA1 (patch-ac) = 8f3bd109cf961dc72fa11bd738aa69995bebc929
-SHA1 (patch-ad) = ad4cc6c2b2db445504613c04affcd5fc7b012d35
-SHA1 (patch-ae) = f5809185329771a691a75677c352fb54405e525d
-SHA1 (patch-af) = 7b049e94d1113dde732b92094e35a45dd33f12d8
+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 (patch-aa) = 3d6047aacdfff69350e58727f116b467cd4fe18d
+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 -r f9fb312a2a6b -r 7f51620584e9 mail/exim/patches/patch-aa
--- a/mail/exim/patches/patch-aa        Fri May 07 16:40:41 2004 +0000
+++ b/mail/exim/patches/patch-aa        Fri May 07 17:47:32 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2004/03/05 12:28:45 abs Exp $
+$NetBSD: patch-aa,v 1.8 2004/05/07 17:47:32 abs Exp $
 
---- Local/Makefile.pkgsrc.orig 2004-03-05 12:23:22.000000000 +0000
+--- Local/Makefile.pkgsrc.orig Fri May  7 18:22:09 2004
 +++ Local/Makefile.pkgsrc
 @@ -98,7 +98,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
@@ -20,15 +20,16 @@
  
  # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
  # In this case, Exim will use the first of them that exists when it is run.
-@@ -132,14 +132,14 @@ CONFIGURE_FILE=/usr/exim/configure
+@@ -132,7 +132,7 @@ CONFIGURE_FILE=/usr/exim/configure
  # owner of a local mailbox.) Specifying these values as root is very strongly
- # discouraged. These values are compiled into the binary.
+ # discouraged.
  
 -EXIM_USER=
-+EXIM_USER=@EXIM_USER@
++EXIM_USER=ref:@EXIM_USER@
  
- # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
- # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
+ # If you specify EXIM_USER as a name, this is looked up at build time, and the
+ # uid number is built into the binary. However, you can specify that this
+@@ -153,7 +153,7 @@ EXIM_USER=
  # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
  # you want to use a group other than the default group for the given user.
  
@@ -37,7 +38,7 @@
  
  # Many sites define a user called "exim", with an appropriate default group,
  # and use
-@@ -213,7 +213,7 @@ TRANSPORT_SMTP=yes
+@@ -227,7 +227,7 @@ TRANSPORT_SMTP=yes
  # This one is special-purpose, and commonly not required, so it is not
  # included by default.
  
@@ -46,7 +47,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -222,9 +222,9 @@ TRANSPORT_SMTP=yes
+@@ -236,9 +236,9 @@ TRANSPORT_SMTP=yes
  # MBX, is included only when requested. If you do not know what this is about,
  # leave these settings commented out.
  
@@ -59,7 +60,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -289,7 +289,7 @@ LOOKUP_LSEARCH=yes
+@@ -310,7 +310,7 @@ LOOKUP_LSEARCH=yes
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
  
@@ -68,7 +69,7 @@
  
  
  
-@@ -310,9 +310,9 @@ EXIM_MONITOR=eximon.bin
+@@ -386,9 +386,9 @@ FIXED_NEVER_USERS=root
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
  
@@ -81,7 +82,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -390,10 +390,11 @@ HEADER_DECODE_TO="ISO-8859-1"
+@@ -466,10 +466,11 @@ HEADERS_CHARSET="ISO-8859-1"
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -95,7 +96,7 @@
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -457,7 +458,7 @@ HEADER_DECODE_TO="ISO-8859-1"
+@@ -533,7 +534,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"



Home | Main Index | Thread Index | Old Index