diff options
Diffstat (limited to 'mail/exim3')
| -rw-r--r-- | mail/exim3/Makefile | 4 | ||||
| -rw-r--r-- | mail/exim3/distinfo | 14 | ||||
| -rw-r--r-- | mail/exim3/patches/patch-aa | 104 | ||||
| -rw-r--r-- | mail/exim3/patches/patch-ab | 146 | ||||
| -rw-r--r-- | mail/exim3/patches/patch-ac | 55 | ||||
| -rw-r--r-- | mail/exim3/patches/patch-ad | 13 | ||||
| -rw-r--r-- | mail/exim3/patches/patch-ae | 8 | ||||
| -rw-r--r-- | mail/exim3/patches/patch-af | 8 | ||||
| -rw-r--r-- | mail/exim3/patches/patch-ag | 33 |
9 files changed, 209 insertions, 176 deletions
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile index 9d39901e2e5..e999f89f529 100644 --- a/mail/exim3/Makefile +++ b/mail/exim3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2004/05/06 22:34:27 reed Exp $ +# $NetBSD: Makefile,v 1.6 2004/05/07 17:47:32 abs Exp $ DISTNAME= exim-3.36 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail net MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/ \ http://public.planetmirror.com.au/pub/exim/exim3/ diff --git a/mail/exim3/distinfo b/mail/exim3/distinfo index f4151514c24..278419516f3 100644 --- a/mail/exim3/distinfo +++ b/mail/exim3/distinfo @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.2 2004/01/15 02:05:10 grant Exp $ +$NetBSD: distinfo,v 1.3 2004/05/07 17:47:32 abs Exp $ SHA1 (exim-3.36.tar.bz2) = 2a06a2858ebf8cdedf2e41fa3f258b5e468e270d Size (exim-3.36.tar.bz2) = 982104 bytes -SHA1 (patch-ab) = 3650487acdc2b0e67ab0dee08a6715e90b2a4205 -SHA1 (patch-ac) = 39122ca045ca7bb61500acae2abf5683c8ec4530 -SHA1 (patch-ae) = 24009dd4807f0215e79cc0a86582297bf310c913 -SHA1 (patch-af) = ac3bea9fe84bc760fec21858bc818c1b01dd34a4 -SHA1 (patch-ag) = f56725acec715468889bf1049e0fd4208101be25 +SHA1 (patch-aa) = f137e07e597a72fede1ee8d2e78f2f284e0061c6 +SHA1 (patch-ab) = 6664ab8fa62ad56e933d87319abb4505abcf7a5b +SHA1 (patch-ac) = 3a74d412a1c6c00cb23ae63ed018d02002fa4595 +SHA1 (patch-ad) = d4962927418489f77a8e0234f7f95628ed506026 +SHA1 (patch-ae) = 0a01f3cfd2bfe59577edcb09b0f2f355185e28f0 +SHA1 (patch-af) = bb171d4048ab3f802243dfec1aade86c0a7e0d21 +SHA1 (patch-ag) = 9248e3fde82fed7a464c28f3335d4c419c038a03 diff --git a/mail/exim3/patches/patch-aa b/mail/exim3/patches/patch-aa new file mode 100644 index 00000000000..b6b977ac965 --- /dev/null +++ b/mail/exim3/patches/patch-aa @@ -0,0 +1,104 @@ +$NetBSD: patch-aa,v 1.1 2004/05/07 17:47:32 abs Exp $ + +--- Local/Makefile.netbsd.orig Fri May 7 18:36:39 2004 ++++ Local/Makefile.netbsd +@@ -78,7 +78,7 @@ + # CHGRP_COMMAND=/usr/bin/chgrp + # MV_COMMAND=/bin/mv + # RM_COMMAND=/bin/rm +-# PERL_COMMAND=/usr/bin/perl ++PERL_COMMAND=@PREFIX@/bin/perl + + + # The following macro can be used to change the command for building a library +@@ -92,8 +92,8 @@ + # appropriate code is included in the binary. You then need to set up the + # runtime configuration to make use of the mechanism(s) selected. + +-# AUTH_CRAM_MD5=yes +-# AUTH_PLAINTEXT=yes ++AUTH_CRAM_MD5=yes ++AUTH_PLAINTEXT=yes + + + # The binary directory: This variable defines where the exim binary will be +@@ -103,7 +103,7 @@ + # installed in this directory. There is no default for this variable built into + # the source files; it must be set in one of the local configuration files. + +-BIN_DIRECTORY=/usr/exim/bin ++BIN_DIRECTORY=@PREFIX@/sbin + + + # The default distribution of Exim contains only the plain text form of the +@@ -121,14 +121,14 @@ BIN_DIRECTORY=/usr/exim/bin + # files. Both the name of the command and the suffix that it adds to files + # need to be defined here. See also the EXICYCLOG_MAX configuration. + +-COMPRESS_COMMAND=/opt/gnu/bin/gzip ++COMPRESS_COMMAND=@GZIP_CMD@ + COMPRESS_SUFFIX=gz + + + # If the exigrep utility is fed compressed log files, it tries to uncompress + # them using this command. + +-ZCAT_COMMAND=/opt/gnu/bin/zcat ++ZCAT_COMMAND=@GZCAT@ + + + # The runtime configuration file: This variable defines where Exim's runtime +@@ -137,7 +137,7 @@ ZCAT_COMMAND=/opt/gnu/bin/zcat + # location of all other runtime files and directories can be changed in the + # runtime configuration file. + +-CONFIGURE_FILE=/usr/exim/configure ++CONFIGURE_FILE=@PKG_SYSCONFDIR@/configure + + + # In some installations there may be multiple machines sharing file systems, +@@ -243,7 +243,7 @@ EXICYCLOG_MAX=10 + # are defaulted in the OS/Makefile-Default file, and can be overridden + # in local OS-specific make files. + +-EXIM_MONITOR=eximon.bin ++# EXIM_MONITOR=eximon.bin + + + # Compiling in support for embedded Perl: If you want to be able to +@@ -286,7 +286,7 @@ EXIM_MONITOR=eximon.bin + # "panic", or "reject" to form the final file name. For example, some + # installations may want something like this: + +-# LOG_FILE_PATH=/var/log/exim_%slog ++LOG_FILE_PATH=/var/log/exim/%slog + + # 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 +@@ -411,7 +411,7 @@ LOOKUP_LSEARCH=yes + # the file name, allowing sites that run two separate daemons to distinguish + # them. Some installations may want something like this + +-# PID_FILE_PATH=/var/lock/exim%s.pid ++PID_FILE_PATH=/var/run/exim%s.pid + + # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory + # (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard +@@ -460,7 +460,7 @@ ROUTER_QUERYPROGRAM=yes + # uid and gid. + + # Many installations will want something like this: +-# SPOOL_DIRECTORY=/var/spool/exim ++SPOOL_DIRECTORY=/var/spool/exim + + # Others may prefer to keep all Exim things under one directory: + # SPOOL_DIRECTORY=/usr/exim/spool +@@ -567,7 +567,7 @@ TRANSPORT_SMTP=yes + # This one is special-purpose, and commonly not required, so do not include + # it by default. + +-# TRANSPORT_LMTP=yes ++TRANSPORT_LMTP=yes + + + # TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment diff --git a/mail/exim3/patches/patch-ab b/mail/exim3/patches/patch-ab index ae991869cc9..1343a773a2d 100644 --- a/mail/exim3/patches/patch-ab +++ b/mail/exim3/patches/patch-ab @@ -1,104 +1,44 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/12/04 04:24:51 grant Exp $ +$NetBSD: patch-ab,v 1.2 2004/05/07 17:47:32 abs Exp $ ---- Local/Makefile.netbsd.orig 2003-11-30 16:06:49.000000000 +1100 -+++ Local/Makefile.netbsd -@@ -78,7 +78,7 @@ - # CHGRP_COMMAND=/usr/bin/chgrp - # MV_COMMAND=/bin/mv - # RM_COMMAND=/bin/rm --# PERL_COMMAND=/usr/bin/perl -+PERL_COMMAND=@PREFIX@/bin/perl - - - # The following macro can be used to change the command for building a library -@@ -92,8 +92,8 @@ - # appropriate code is included in the binary. You then need to set up the - # runtime configuration to make use of the mechanism(s) selected. - --# AUTH_CRAM_MD5=yes --# AUTH_PLAINTEXT=yes -+AUTH_CRAM_MD5=yes -+AUTH_PLAINTEXT=yes - - - # The binary directory: This variable defines where the exim binary will be -@@ -103,7 +103,7 @@ - # installed in this directory. There is no default for this variable built into - # the source files; it must be set in one of the local configuration files. - --BIN_DIRECTORY=/usr/exim/bin -+BIN_DIRECTORY=@PREFIX@/sbin - - - # The default distribution of Exim contains only the plain text form of the -@@ -121,14 +121,14 @@ BIN_DIRECTORY=/usr/exim/bin - # files. Both the name of the command and the suffix that it adds to files - # need to be defined here. See also the EXICYCLOG_MAX configuration. - --COMPRESS_COMMAND=/opt/gnu/bin/gzip -+COMPRESS_COMMAND=@GZIP_CMD@ - COMPRESS_SUFFIX=gz - - - # If the exigrep utility is fed compressed log files, it tries to uncompress - # them using this command. - --ZCAT_COMMAND=/opt/gnu/bin/zcat -+ZCAT_COMMAND=@GZCAT@ - - - # The runtime configuration file: This variable defines where Exim's runtime -@@ -137,7 +137,7 @@ ZCAT_COMMAND=/opt/gnu/bin/zcat - # location of all other runtime files and directories can be changed in the - # runtime configuration file. - --CONFIGURE_FILE=/usr/exim/configure -+CONFIGURE_FILE=@PKG_SYSCONFDIR@/configure - - - # In some installations there may be multiple machines sharing file systems, -@@ -243,7 +243,7 @@ EXICYCLOG_MAX=10 - # are defaulted in the OS/Makefile-Default file, and can be overridden - # in local OS-specific make files. - --EXIM_MONITOR=eximon.bin -+# EXIM_MONITOR=eximon.bin - - - # Compiling in support for embedded Perl: If you want to be able to -@@ -286,7 +286,7 @@ EXIM_MONITOR=eximon.bin - # "panic", or "reject" to form the final file name. For example, some - # installations may want something like this: - --# LOG_FILE_PATH=/var/log/exim_%slog -+LOG_FILE_PATH=/var/log/exim/%slog - - # 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 -@@ -411,7 +411,7 @@ LOOKUP_LSEARCH=yes - # the file name, allowing sites that run two separate daemons to distinguish - # them. Some installations may want something like this - --# PID_FILE_PATH=/var/lock/exim%s.pid -+PID_FILE_PATH=/var/run/exim%s.pid - - # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory - # (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard -@@ -460,7 +460,7 @@ ROUTER_QUERYPROGRAM=yes - # uid and gid. - - # Many installations will want something like this: --# SPOOL_DIRECTORY=/var/spool/exim -+SPOOL_DIRECTORY=/var/spool/exim - - # Others may prefer to keep all Exim things under one directory: - # SPOOL_DIRECTORY=/usr/exim/spool -@@ -567,7 +567,7 @@ TRANSPORT_SMTP=yes - # This one is special-purpose, and commonly not required, so do not include - # it by default. - --# TRANSPORT_LMTP=yes -+TRANSPORT_LMTP=yes - - - # TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment +--- OS/Makefile-NetBSD.orig Thu Apr 4 13:56:13 2002 ++++ OS/Makefile-NetBSD +@@ -3,15 +3,31 @@ + + # Include Makfile.NetBSD-a.out + +-.if exists(OS/Makefile-NetBSD-a.out) +-.include "OS/Makefile-NetBSD-a.out" +-.elif exists(../OS/Makefile-NetBSD-a.out) +-.include "../OS/Makefile-NetBSD-a.out" +-.else +-.include "Makefile.NetBSD-a.out, submit a bug report." +-.endif ++# Exim: OS-specific make file for NetBSD (a.out binary format) ++ ++CHOWN_COMMAND=/usr/sbin/chown ++CFLAGS=-O ++ ++HAVE_SA_LEN=YES ++LIBS=-lcrypt ++ ++X11=/usr/X11R6 ++XINCLUDE=-I$(X11)/include ++XLFLAGS=-L$(X11)/lib ++X11_LD_LIB=$(X11)/lib ++ ++EXIWHAT_PS_ARG=-ax ++EXIWHAT_EGREP_ARG='/exim( |$$)' ++EXIWHAT_KILL_ARG=-USR1 ++ ++# NetBSD always ships with Berkeley DB ++ ++USE_DB=yes ++ ++# End ++ + + # NetBSD ELF linker needs a -R flag. +-XLFLAGS+=-Wl,-R$(X11)/lib/ ++#XLFLAGS+=-Wl,-R$(X11)/lib/ + + # End diff --git a/mail/exim3/patches/patch-ac b/mail/exim3/patches/patch-ac index 5945e2524d0..071ec4b0570 100644 --- a/mail/exim3/patches/patch-ac +++ b/mail/exim3/patches/patch-ac @@ -1,44 +1,13 @@ -$NetBSD: patch-ac,v 1.1.1.1 2003/12/04 04:24:51 grant Exp $ +$NetBSD: patch-ac,v 1.2 2004/05/07 17:47:32 abs Exp $ ---- OS/Makefile-NetBSD.orig Sat Jul 14 19:09:00 2001 -+++ OS/Makefile-NetBSD Sat Jul 14 19:14:34 2001 -@@ -3,15 +3,31 @@ - - # Include Makfile.NetBSD-a.out - --.if exists(OS/Makefile-NetBSD-a.out) --.include "OS/Makefile-NetBSD-a.out" --.elif exists(../OS/Makefile-NetBSD-a.out) --.include "../OS/Makefile-NetBSD-a.out" --.else --.include "Makefile.NetBSD-a.out, submit a bug report." --.endif -+# Exim: OS-specific make file for NetBSD (a.out binary format) -+ -+CHOWN_COMMAND=/usr/sbin/chown -+CFLAGS=-O -+ -+HAVE_SA_LEN=YES -+LIBS=-lcrypt -+ -+X11=/usr/X11R6 -+XINCLUDE=-I$(X11)/include -+XLFLAGS=-L$(X11)/lib -+X11_LD_LIB=$(X11)/lib -+ -+EXIWHAT_PS_ARG=-ax -+EXIWHAT_EGREP_ARG='/exim( |$$)' -+EXIWHAT_KILL_ARG=-USR1 -+ -+# NetBSD always ships with Berkeley DB -+ -+USE_DB=yes -+ -+# End -+ - - # NetBSD ELF linker needs a -R flag. --XLFLAGS+=-Wl,-R$(X11)/lib/ -+#XLFLAGS+=-Wl,-R$(X11)/lib/ - - # End +--- OS/os.h-Darwin.orig Thu Apr 4 13:56:14 2002 ++++ OS/os.h-Darwin +@@ -1,6 +1,8 @@ + /* Exim: OS-specific C header file for Darwin (Mac OS X) */ + ++/* Darwin 6.8 does not have crypt.h + #define CRYPT_H ++*/ + #define HAVE_MMAP + #define HAVE_SYS_MOUNT_H + #define SIOCGIFCONF_GIVES_ADDR diff --git a/mail/exim3/patches/patch-ad b/mail/exim3/patches/patch-ad new file mode 100644 index 00000000000..2b2cefac90c --- /dev/null +++ b/mail/exim3/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2004/05/07 17:47:32 abs Exp $ + +--- src/accept.c.orig Thu Apr 4 13:56:16 2002 ++++ src/accept.c +@@ -1895,7 +1895,7 @@ if (headers_check_syntax) + char *verb = "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 diff --git a/mail/exim3/patches/patch-ae b/mail/exim3/patches/patch-ae index fa7ce978c81..dbda8faf6e7 100644 --- a/mail/exim3/patches/patch-ae +++ b/mail/exim3/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1.1.1 2003/12/04 04:24:51 grant Exp $ +$NetBSD: patch-ae,v 1.2 2004/05/07 17:47:32 abs Exp $ ---- src/configure.default.orig Fri Sep 17 21:19:39 1999 -+++ src/configure.default Fri Sep 17 21:19:55 1999 -@@ -252,8 +252,8 @@ +--- src/configure.default.orig Thu Apr 4 13:56:16 2002 ++++ src/configure.default +@@ -298,8 +298,8 @@ end system_aliases: driver = aliasfile diff --git a/mail/exim3/patches/patch-af b/mail/exim3/patches/patch-af index 532ba92caf7..734a8d61140 100644 --- a/mail/exim3/patches/patch-af +++ b/mail/exim3/patches/patch-af @@ -1,10 +1,6 @@ -$NetBSD: patch-af,v 1.1.1.1 2003/12/04 04:24:51 grant Exp $ +$NetBSD: patch-af,v 1.2 2004/05/07 17:47:32 abs Exp $ -This patch is from: - - http://www.exim.org/pipermail/exim-announce/2003q3/000094.html - ---- src/smtp_in.c.orig 2002-04-04 22:56:20.000000000 +1000 +--- src/smtp_in.c.orig Thu Apr 4 13:56:20 2002 +++ src/smtp_in.c @@ -2021,13 +2021,12 @@ while (done <= 0) diff --git a/mail/exim3/patches/patch-ag b/mail/exim3/patches/patch-ag index 612bc23f157..b5a1db9670f 100644 --- a/mail/exim3/patches/patch-ag +++ b/mail/exim3/patches/patch-ag @@ -1,13 +1,22 @@ -$NetBSD: patch-ag,v 1.1 2004/01/15 02:05:10 grant Exp $ +$NetBSD: patch-ag,v 1.2 2004/05/07 17:47:32 abs Exp $ ---- OS/os.h-Darwin.orig 2002-04-04 22:56:14.000000000 +1000 -+++ OS/os.h-Darwin -@@ -1,6 +1,8 @@ - /* Exim: OS-specific C header file for Darwin (Mac OS X) */ - -+/* Darwin 6.8 does not have crypt.h - #define CRYPT_H -+*/ - #define HAVE_MMAP - #define HAVE_SYS_MOUNT_H - #define SIOCGIFCONF_GIVES_ADDR +--- src/verify.c.orig Thu Apr 4 13:56:21 2002 ++++ src/verify.c +@@ -892,7 +892,7 @@ if (!sender_verify_reject || (rc == DEFE + /* Set up the key for the reject hints database, and attempt to open it. + If successful, read the record. */ + +-sprintf(buffer, "%s:%.200s", sender_address, ++snprintf(buffer, sizeof(buffer), "%s:%.200s", sender_address, + (sender_host_name != NULL)? sender_host_name : + (sender_host_address != NULL)? sender_host_address : ""); + +@@ -1182,7 +1182,7 @@ if (sender_verify_callback_error != NULL + O_WRONLY) is needed by Berkeley native DB even when reading only. If the + database won't open, we can do no more. */ + +-sprintf(buffer, "%s:%.200s", sender_address, ++snprintf(buffer, sizeof(buffer), "%s:%.200s", sender_address, + (sender_host_name != NULL)? sender_host_name : + (sender_host_address != NULL)? sender_host_address : ""); + |