diff options
| -rw-r--r-- | mail/exim/Makefile | 5 | ||||
| -rw-r--r-- | mail/exim/distinfo | 22 | ||||
| -rw-r--r-- | mail/exim/patches/patch-aa | 36 | ||||
| -rw-r--r-- | mail/exim/patches/patch-ab | 4 | ||||
| -rw-r--r-- | mail/exim/patches/patch-ac | 4 | ||||
| -rw-r--r-- | mail/exim/patches/patch-ad | 4 | ||||
| -rw-r--r-- | mail/exim/patches/patch-ae | 8 | ||||
| -rw-r--r-- | mail/exim/patches/patch-af | 4 | ||||
| -rw-r--r-- | mail/exim/patches/patch-ag | 4 |
9 files changed, 45 insertions, 46 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 56704781601..c858f12bac0 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.76 2006/06/14 22:43:39 abs Exp $ +# $NetBSD: Makefile,v 1.77 2006/08/08 15:24:01 abs Exp $ -DISTNAME= exim-4.54 -PKGREVISION= 3 +DISTNAME= exim-4.62 CATEGORIES= mail net MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \ ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \ diff --git a/mail/exim/distinfo b/mail/exim/distinfo index a91163c7a92..02cdecd277d 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.32 2006/06/14 22:43:39 abs Exp $ +$NetBSD: distinfo,v 1.33 2006/08/08 15:24:01 abs Exp $ -SHA1 (exim-4.54.tar.bz2) = d1d5a41aeedc464462562a0f970fabb20c98c712 -RMD160 (exim-4.54.tar.bz2) = 5b7219874dd834396add0fd0e1ee21b97fc8d122 -Size (exim-4.54.tar.bz2) = 1547608 bytes -SHA1 (patch-aa) = 6e42695cfdc48b2bcc534dd4c4c5e55bbfdbc6f4 -SHA1 (patch-ab) = 32452f2fed6f0300f460aa9de8528b5ab2fe15c1 -SHA1 (patch-ac) = ed2b1b02cfa8338e82cf6bb74e9f9e5959dd8775 -SHA1 (patch-ad) = 2f43716b398ce650a20750285ba19d7ba5c690bb -SHA1 (patch-ae) = acc7897d417e137de73a2cac1dd46834f719e202 -SHA1 (patch-af) = cfaa64d0979ebfb6486cb280fb1d17aeea39f2d0 -SHA1 (patch-ag) = f62a4c68586a1541db40fea42580475d300377e0 +SHA1 (exim-4.62.tar.bz2) = 2b3f95c1880de07ef22a96d7141eaa66e3c46768 +RMD160 (exim-4.62.tar.bz2) = 9553b758e3bfd3d12027262b6211e37ad3259252 +Size (exim-4.62.tar.bz2) = 1577729 bytes +SHA1 (patch-aa) = c7107d46d54ed08c2086af7504b432e10af9db80 +SHA1 (patch-ab) = 1c6e7882346974390c22e7b9e09a76c5ed670d1d +SHA1 (patch-ac) = a3ecdafc44ad2212b00e49de594efb26612b0b75 +SHA1 (patch-ad) = 52c768378483bf02295d46c01d55f955697834eb +SHA1 (patch-ae) = 6cb0f00d159de7c342a55b09fb87ab533c5670bf +SHA1 (patch-af) = f4dd3bad1b67a1ae27c14c3f92f338d3280f390c +SHA1 (patch-ag) = 8512795060ad913f4699c277867fd24e7a785519 diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa index 1ad5ae1b655..4f6c5b9ae6e 100644 --- a/mail/exim/patches/patch-aa +++ b/mail/exim/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ +$NetBSD: patch-aa,v 1.16 2006/08/08 15:24:01 abs Exp $ ---- Local/Makefile.pkgsrc.orig 2005-08-29 08:16:24.000000000 -0700 -+++ Local/Makefile.pkgsrc 2005-08-29 08:21:51.000000000 -0700 +--- Local/Makefile.pkgsrc.orig 2006-08-08 16:11:10.000000000 +0100 ++++ Local/Makefile.pkgsrc @@ -100,7 +100,7 @@ # /usr/local/sbin. The installation script will try to create this directory, # and any superior directories, if they do not exist. @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ #------------------------------------------------------------------------------ -@@ -116,7 +116,7 @@ +@@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin # don't exist. It will also install a default runtime configuration if this # file does not exist. @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ # 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. -@@ -134,7 +134,7 @@ +@@ -134,7 +134,7 @@ CONFIGURE_FILE=/usr/exim/configure # owner of a local mailbox.) Specifying these values as root is very strongly # discouraged. @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ # 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 -@@ -155,7 +155,7 @@ +@@ -155,7 +155,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. @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ # Many sites define a user called "exim", with an appropriate default group, # and use -@@ -176,7 +176,7 @@ +@@ -176,7 +176,7 @@ EXIM_USER= # Almost all installations choose this: @@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ -@@ -229,7 +229,7 @@ +@@ -235,7 +235,7 @@ TRANSPORT_SMTP=yes # This one is special-purpose, and commonly not required, so it is not # included by default. @@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ #------------------------------------------------------------------------------ -@@ -238,9 +238,9 @@ +@@ -244,9 +244,9 @@ TRANSPORT_SMTP=yes # MBX, is included only when requested. If you do not know what this is about, # leave these settings commented out. @@ -69,16 +69,16 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ #------------------------------------------------------------------------------ -@@ -312,7 +312,7 @@ +@@ -320,7 +320,7 @@ LOOKUP_LSEARCH=yes # files are defaulted in the OS/Makefile-Default file, but can be overridden in # local OS-specific make files. -EXIM_MONITOR=eximon.bin +# EXIM_MONITOR=eximon.bin + #------------------------------------------------------------------------------ - # Compiling Exim with content scanning support: If you want to compile Exim -@@ -464,10 +464,10 @@ +@@ -473,10 +473,10 @@ 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. @@ -92,7 +92,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ #------------------------------------------------------------------------------ -@@ -553,10 +553,11 @@ +@@ -562,10 +562,11 @@ HEADERS_CHARSET="ISO-8859-1" # leave these settings commented out. # This setting is required for any TLS support (either OpenSSL or GnuTLS) @@ -106,7 +106,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ # Uncomment these settings if you are using GnuTLS # USE_GNUTLS=yes -@@ -620,7 +621,7 @@ +@@ -629,7 +630,7 @@ HEADERS_CHARSET="ISO-8859-1" # %s. This will be replaced by one of the strings "main", "panic", or "reject" # to form the final file names. Some installations may want something like this: @@ -115,7 +115,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ # which results in files with names /var/log/exim_mainlog, etc. The directory # in which the log files are placed must exist; Exim does not try to create -@@ -782,7 +783,8 @@ +@@ -791,7 +792,8 @@ ZCAT_COMMAND=/usr/bin/zcat # this setting. See the manual section entitled "Use of tcpwrappers" in the # chapter on building and installing Exim. # @@ -125,7 +125,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ # # You may well also have to specify a local "include" file and an additional # library for TCP wrappers, so you probably need something like this: -@@ -861,11 +863,11 @@ +@@ -870,11 +872,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases # haven't got Perl, Exim will still build and run; you just won't be able to # use those utilities. @@ -142,7 +142,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ #------------------------------------------------------------------------------ -@@ -1059,7 +1061,7 @@ +@@ -1068,7 +1070,7 @@ TMPDIR="/tmp" # (process id) to a file so that it can easily be identified. The path of the # file can be specified here. Some installations may want something like this: @@ -151,7 +151,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $ # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # using the name "exim-daemon.pid". -@@ -1095,3 +1097,8 @@ +@@ -1104,3 +1106,8 @@ TMPDIR="/tmp" # SUPPORT_MOVE_FROZEN_MESSAGES=yes # End of EDITME for Exim 4. diff --git a/mail/exim/patches/patch-ab b/mail/exim/patches/patch-ab index dfb78254bac..c7b41bff7fc 100644 --- a/mail/exim/patches/patch-ab +++ b/mail/exim/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.12 2005/05/17 17:06:12 abs Exp $ +$NetBSD: patch-ab,v 1.13 2006/08/08 15:24:01 abs Exp $ ---- OS/Makefile-Default.orig 2005-05-04 12:35:39.000000000 +0100 +--- OS/Makefile-Default.orig 2006-04-28 11:32:21.000000000 +0100 +++ OS/Makefile-Default @@ -71,7 +71,7 @@ PERL_COMMAND=/usr/bin/perl diff --git a/mail/exim/patches/patch-ac b/mail/exim/patches/patch-ac index b08b729d475..de97d440e42 100644 --- a/mail/exim/patches/patch-ac +++ b/mail/exim/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.9 2005/05/17 17:06:12 abs Exp $ +$NetBSD: patch-ac,v 1.10 2006/08/08 15:24:01 abs Exp $ ---- OS/Makefile-NetBSD-a.out.orig 2005-05-04 12:35:39.000000000 +0100 +--- OS/Makefile-NetBSD-a.out.orig 2006-04-28 11:32:21.000000000 +0100 +++ OS/Makefile-NetBSD-a.out @@ -3,7 +3,7 @@ # Exim: OS-specific make file for NetBSD (a.out/COFF object format) diff --git a/mail/exim/patches/patch-ad b/mail/exim/patches/patch-ad index d1eb21c821e..eb0af548f8c 100644 --- a/mail/exim/patches/patch-ad +++ b/mail/exim/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.8 2005/05/17 17:06:12 abs Exp $ +$NetBSD: patch-ad,v 1.9 2006/08/08 15:24:01 abs Exp $ ---- OS/Makefile-NetBSD.orig 2005-05-04 12:35:39.000000000 +0100 +--- OS/Makefile-NetBSD.orig 2006-04-28 11:32:21.000000000 +0100 +++ OS/Makefile-NetBSD @@ -3,7 +3,7 @@ # Exim: OS-specific make file for NetBSD (ELF object format) diff --git a/mail/exim/patches/patch-ae b/mail/exim/patches/patch-ae index 154c520ce42..12c703e3f50 100644 --- a/mail/exim/patches/patch-ae +++ b/mail/exim/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.8 2005/05/17 17:06:12 abs Exp $ +$NetBSD: patch-ae,v 1.9 2006/08/08 15:24:01 abs Exp $ ---- scripts/exim_install.orig 2005-05-04 12:35:39.000000000 +0100 +--- scripts/exim_install.orig 2006-04-28 11:32:21.000000000 +0100 +++ scripts/exim_install -@@ -80,6 +80,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t +@@ -84,6 +84,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t SYSTEM_ALIASES_FILE=/etc/aliases fi @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.8 2005/05/17 17:06:12 abs Exp $ # Allow INST_xx to over-ride xx case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac case "$INST_CONFIGURE_FILE" in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac -@@ -390,15 +392,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then +@@ -415,15 +417,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then echo $com "*** Exim installation ${ver}failed ***" exit 1 fi diff --git a/mail/exim/patches/patch-af b/mail/exim/patches/patch-af index 03226a4fb94..236e8155c9e 100644 --- a/mail/exim/patches/patch-af +++ b/mail/exim/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.6 2005/09/10 23:11:40 abs Exp $ +$NetBSD: patch-af,v 1.7 2006/08/08 15:24:01 abs Exp $ ---- OS/os.h-NetBSD.orig 2005-05-04 12:35:39.000000000 +0100 +--- OS/os.h-NetBSD.orig 2006-04-28 11:32:21.000000000 +0100 +++ OS/os.h-NetBSD @@ -12,4 +12,10 @@ typedef struct flock flock_t; #define os_strsignal strsignal diff --git a/mail/exim/patches/patch-ag b/mail/exim/patches/patch-ag index 65da0fb5a86..cf2cd59591e 100644 --- a/mail/exim/patches/patch-ag +++ b/mail/exim/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.5 2006/06/14 22:43:39 abs Exp $ +$NetBSD: patch-ag,v 1.6 2006/08/08 15:24:01 abs Exp $ ---- src/spam.h.orig 2005-10-04 09:55:28.000000000 +0100 +--- src/spam.h.orig 2006-04-28 11:32:23.000000000 +0100 +++ src/spam.h @@ -12,7 +12,7 @@ #ifdef WITH_CONTENT_SCAN |