diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/sendmail/Makefile | 23 | ||||
| -rw-r--r-- | mail/sendmail/files/md5 | 4 | ||||
| -rw-r--r-- | mail/sendmail/files/patch-sum | 7 | ||||
| -rw-r--r-- | mail/sendmail/files/site.config.m4-starttls | 7 | ||||
| -rw-r--r-- | mail/sendmail/patches/patch-ad | 16 | ||||
| -rw-r--r-- | mail/sendmail/patches/patch-ae | 13 | ||||
| -rw-r--r-- | mail/sendmail/patches/patch-af | 72 |
7 files changed, 29 insertions, 113 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index be64e009a46..1f3d67fe41f 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,18 +1,18 @@ -# $NetBSD: Makefile,v 1.23 2000/09/03 10:31:27 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2000/10/15 14:30:21 itojun Exp $ -DISTNAME= sendmail.8.11.0 -PKGNAME= sendmail-8.11.0 +DISTNAME= sendmail.8.11.1 +PKGNAME= sendmail-8.11.1 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \ ftp://ftp.cert.dfn.de/pub/tools/net/sendmail/ \ ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/ -PATCH_SITES= ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/ -PATCHFILES= sendmail8.11.0+3.3W.patch.gz -PATCH_DIST_ARGS=-d ${WRKSRC}/sendmail -E ${PATCH_DIST_STRIP} -.if !(defined(PATCH_DEBUG) || defined(PKG_VERBOSE)) -PATCH_DIST_ARGS+=--forward --quiet -.endif +#PATCH_SITES= ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/ +#PATCHFILES= sendmail8.11.0+3.3W.patch.gz +#PATCH_DIST_ARGS=-d ${WRKSRC}/sendmail -E ${PATCH_DIST_STRIP} +#.if !(defined(PATCH_DEBUG) || defined(PKG_VERBOSE)) +#PATCH_DIST_ARGS+=--forward --quiet +#.endif MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.sendmail.org/ @@ -47,10 +47,7 @@ DEPENDS+= openldap-1.2.*:../../databases/openldap DEPENDS+= db-2.7.7:../../databases/db .endif .if defined(USE_STARTTLS) && ${USE_STARTTLS} == YES -DEPENDS+= sfio-1999:../../devel/sfio -.if !defined(PATENTEDOPENSSLSRC) && !exists(/usr/include/openssl/rsa.h) -DEPENDS+= openssl-0.9.5a:../../security/openssl -.endif +USE_SSL= yes .endif post-patch: diff --git a/mail/sendmail/files/md5 b/mail/sendmail/files/md5 index dcfeac604f6..f9eed6302e1 100644 --- a/mail/sendmail/files/md5 +++ b/mail/sendmail/files/md5 @@ -1,4 +1,4 @@ -$NetBSD: md5,v 1.5 2000/08/18 12:43:54 itojun Exp $ +$NetBSD: md5,v 1.6 2000/10/15 14:30:23 itojun Exp $ -MD5 (sendmail.8.11.0.tar.gz) = 95a21f6838dc0489924ca71d98e40edf +MD5 (sendmail.8.11.1.tar.gz) = 9118a555141493fb574a588d50f57215 MD5 (sendmail8.11.0+3.3W.patch.gz) = fcdf9204dd72c895ecf0e80fd9738cc3 diff --git a/mail/sendmail/files/patch-sum b/mail/sendmail/files/patch-sum index b75b93bce82..4aa9faea762 100644 --- a/mail/sendmail/files/patch-sum +++ b/mail/sendmail/files/patch-sum @@ -1,8 +1,7 @@ -$NetBSD: patch-sum,v 1.13 2000/08/18 16:29:23 onoe Exp $ +$NetBSD: patch-sum,v 1.14 2000/10/15 14:30:23 itojun Exp $ MD5 (patch-aa) = 8b9fcec3b4f82a30c7a167c32a00841f MD5 (patch-ab) = df740f28896a0851159e3e7a7fcfdb5a MD5 (patch-ac) = 6afb53121cfd919c8cb8a37bea3b90f9 -MD5 (patch-ad) = 309d090ecd1b4588f87153e9f240d9bd -MD5 (patch-ae) = 9cb440411904551b9ceff30cc53b96d8 -MD5 (patch-af) = 2c589fc063d8cbf75c54d85e35da9fe7 +MD5 (patch-ad) = f6b38b13c7e4ee03f78859d59fbd74fd +MD5 (patch-ae) = 25f9ec8f39dbc92c42ddde565e3fa3a5 diff --git a/mail/sendmail/files/site.config.m4-starttls b/mail/sendmail/files/site.config.m4-starttls index 27beb14a230..9fe83f9fa9f 100644 --- a/mail/sendmail/files/site.config.m4-starttls +++ b/mail/sendmail/files/site.config.m4-starttls @@ -1,6 +1,5 @@ # enable STARTTLS -define(`confSTDIO_TYPE', `portable') -APPENDDEF(`confENVDEF', `-I${LOCALBASE}/include/sfio -I${LOCALBASE}/include -DSFIO') -APPENDDEF(`confLIBS', `-L${LOCALBASE}/lib -lsfio') -APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS') +APPENDDEF(`confENVDEF', `-I${LOCALBASE}/include') +APPENDDEF(`confLIBS', `-L${LOCALBASE}/lib') +APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -D_FFR_TLS_TOREK') APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto') diff --git a/mail/sendmail/patches/patch-ad b/mail/sendmail/patches/patch-ad index 0405e3d9809..ef7106928ce 100644 --- a/mail/sendmail/patches/patch-ad +++ b/mail/sendmail/patches/patch-ad @@ -1,16 +1,12 @@ -$NetBSD: patch-ad,v 1.3 2000/07/31 18:11:09 tron Exp $ +$NetBSD: patch-ad,v 1.4 2000/10/15 14:30:23 itojun Exp $ ---- devtools/OS/SunOS.5.8 Wed Oct 27 05:02:03 1999 -+++ devtools/OS/SunOS.5.8 Wed Jul 26 13:06:34 2000 -@@ -2,8 +2,9 @@ - define(`confCC', `gcc') - define(`confBEFORE', `sysexits.h') --define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP') +--- devtools/OS/SunOS.5.8.orig Tue Oct 10 19:21:59 2000 ++++ devtools/OS/SunOS.5.8 Tue Oct 10 19:23:59 2000 +@@ -4,4 +4,6 @@ + define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP') +define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX') - define(`confENVDEF', `-DSOLARIS=20800') + define(`confENVDEF', `-DSOLARIS=20800 -DNETINET6') -define(`confLIBS', `-lsocket -lnsl -lldap') +define(`confLIBS', `-lsocket -lnsl') +define(`confLDOPTS', `${LDFLAGS}') define(`confMTLDOPTS', `-lpthread') - define(`confMBINDIR', `/usr/lib') - define(`confEBINDIR', `/usr/lib') diff --git a/mail/sendmail/patches/patch-ae b/mail/sendmail/patches/patch-ae index 1ae928ab4ef..5451cfed6bc 100644 --- a/mail/sendmail/patches/patch-ae +++ b/mail/sendmail/patches/patch-ae @@ -1,16 +1,13 @@ -$NetBSD: patch-ae,v 1.1 2000/07/31 18:11:09 tron Exp $ +$NetBSD: patch-ae,v 1.2 2000/10/15 14:30:23 itojun Exp $ ---- devtools/OS/SunOS.5.9 Fri Jul 14 06:27:07 2000 -+++ devtools/OS/SunOS.5.9 Wed Jul 26 13:06:46 2000 -@@ -2,8 +2,9 @@ - define(`confCC', `gcc') +--- devtools/OS/SunOS.5.9.orig Tue Oct 10 19:25:30 2000 ++++ devtools/OS/SunOS.5.9 Tue Oct 10 19:26:27 2000 +@@ -3,5 +3,6 @@ define(`confBEFORE', `sysexits.h') -define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP') +define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX') - define(`confENVDEF', `-DSOLARIS=20900') + define(`confENVDEF', `-DSOLARIS=20900 -DNETINET6') -define(`confLIBS', `-lsocket -lnsl -lldap') +define(`confLIBS', `-lsocket -lnsl') +define(`confLDOPTS', `${LDFLAGS}') define(`confMTLDOPTS', `-lpthread') - define(`confMBINDIR', `/usr/lib') - define(`confEBINDIR', `/usr/lib') diff --git a/mail/sendmail/patches/patch-af b/mail/sendmail/patches/patch-af deleted file mode 100644 index 3d3cdfaef4b..00000000000 --- a/mail/sendmail/patches/patch-af +++ /dev/null @@ -1,72 +0,0 @@ -$NetBSD: patch-af,v 1.3 2000/09/03 10:31:14 wiz Exp $ ---- sendmail/recipient.c- Sat Aug 19 00:40:04 2000 -+++ sendmail/recipient.c Sat Aug 19 00:42:11 2000 -@@ -29,8 +29,9 @@ - static ADDRESS **chainlast; - - void --make_rcpt_hash(sendq) -+make_rcpt_hash(sendq, e) - register ADDRESS **sendq; -+ register ENVELOPE *e; - { - ADDRESS **pq, *q; - int hfunc; -@@ -40,8 +41,14 @@ - - for (pq = sendq; (q = *pq) != NULL; pq = &q->q_next) - { -- char *p = q->q_paddr; -+ char *p; -+ ADDRESS *a; - -+ a = parseaddr(q->q_paddr, NULLADDR, RF_COPYALL, '\0', NULL, e); -+ if (a == NULL) -+ p = ""; -+ else -+ p = a->q_user; - hfunc = 0; - while (*p != '\0') - { -@@ -561,9 +568,15 @@ - if (use_hash) - { - /* get hash entry */ -- char *p = a->q_paddr; -- hfunc = 0; -+ char *p; -+ register ADDRESS *b; - -+ b = parseaddr(a->q_paddr, NULLADDR, RF_COPYALL, '\0', NULL, e); -+ if (b == NULL) -+ p = ""; -+ else -+ p = b->q_user; -+ hfunc = 0; - while (*p != '\0') - { - int c = *p++; -@@ -1588,7 +1601,7 @@ - ctladdr->q_flags &= ~QSELFREF; - nincludes = 0; - #if RCPT_HASH -- make_rcpt_hash(sendq); -+ make_rcpt_hash(sendq, e); - #endif - while (fgets(buf, sizeof buf, fp) != NULL && !maxreached) - { -@@ -1605,7 +1618,14 @@ - isascii(p[-1]) && isspace(p[-1]) && - (p[3] == '\0' || (isascii(p[3]) && isspace(p[3])))) - { -+#if 1 -+ p--; -+ while (p > buf && isspace(p[-1])) -+ p--; -+ p[0] = '\0'; -+#else - p[-1] = '\0'; -+#endif - break; - } - } |