diff options
Diffstat (limited to 'mail')
-rw-r--r-- | mail/sendmail/Makefile | 24 | ||||
-rw-r--r-- | mail/sendmail/files/md5 | 5 | ||||
-rw-r--r-- | mail/sendmail/files/patch-sum | 14 | ||||
-rw-r--r-- | mail/sendmail/patches/patch-aa | 10 | ||||
-rw-r--r-- | mail/sendmail/patches/patch-ab | 10 | ||||
-rw-r--r-- | mail/sendmail/patches/patch-ac | 10 | ||||
-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 | 8 | ||||
-rw-r--r-- | mail/sendmail/pkg/PLIST.common | 15 |
10 files changed, 72 insertions, 53 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 69f3d1c04e0..3373ce29865 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,19 +1,19 @@ -# $NetBSD: Makefile,v 1.34 2001/03/05 11:33:47 itojun Exp $ +# $NetBSD: Makefile,v 1.35 2001/04/13 05:07:50 itojun Exp $ -DISTNAME= sendmail.8.11.3 -PKGNAME= sendmail-8.11.3 +DISTNAME= sendmail.8.12.0.Beta7 +PKGNAME= sendmail-8.11.99.7 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ \ ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/ -PATCH_SITES= ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/ -PATCHFILES= sendmail8.11.3+3.4W.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_DIST_STRIP= -p1 +#PATCH_SITES= ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/ +#PATCHFILES= sendmail8.11.3+3.4W.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_DIST_STRIP= -p1 MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.sendmail.org/ @@ -25,7 +25,7 @@ NO_CONFIGURE= yes MAKE_ENV+= BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \ BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" -WRKSRC= ${WRKDIR}/${PKGNAME} +WRKSRC= ${WRKDIR}/sendmail-8.12.0.Beta7 SITECONFIG= ${WRKSRC}/devtools/Site/site.config.m4 BUILD_DEFS+= USE_INET6 @@ -58,7 +58,7 @@ post-patch: ${CP} ${PKGDIR}/DESCR ${DESCR_SRC} ${ECHO} '---' >> ${DESCR_SRC} ${ECHO} -n 'compiled features:' >> ${DESCR_SRC} - ${ECHO} -n ' WIDE' >> ${DESCR_SRC} +# ${ECHO} -n ' WIDE' >> ${DESCR_SRC} .if defined(USE_INET6) && ${USE_INET6} == YES ${CAT} ${FILESDIR}/site.config.m4-v6 >> ${SITECONFIG} ${ECHO} -n ' INET6' >> ${DESCR_SRC} diff --git a/mail/sendmail/files/md5 b/mail/sendmail/files/md5 index 6dd96f0bb45..bef45758985 100644 --- a/mail/sendmail/files/md5 +++ b/mail/sendmail/files/md5 @@ -1,4 +1,3 @@ -$NetBSD: md5,v 1.11 2001/03/05 11:33:48 itojun Exp $ +$NetBSD: md5,v 1.12 2001/04/13 05:07:51 itojun Exp $ -MD5 (sendmail.8.11.3.tar.gz) = 77fa841497507b59f388bf59f0e14592 -MD5 (sendmail8.11.3+3.4W.patch.gz) = 848e22feeee7036b5dccfb16fb8ad00b +SHA1 (sendmail.8.12.0.Beta7.tar.gz) = ed61340eecd73006892ff6e65f576969c024eaab diff --git a/mail/sendmail/files/patch-sum b/mail/sendmail/files/patch-sum index 379a0b50714..316bf77b2e4 100644 --- a/mail/sendmail/files/patch-sum +++ b/mail/sendmail/files/patch-sum @@ -1,8 +1,8 @@ -$NetBSD: patch-sum,v 1.17 2001/02/28 03:52:19 itojun Exp $ +$NetBSD: patch-sum,v 1.18 2001/04/13 05:07:51 itojun Exp $ -MD5 (patch-aa) = 8b9fcec3b4f82a30c7a167c32a00841f -MD5 (patch-ab) = df740f28896a0851159e3e7a7fcfdb5a -MD5 (patch-ac) = 6afb53121cfd919c8cb8a37bea3b90f9 -MD5 (patch-ad) = f6b38b13c7e4ee03f78859d59fbd74fd -MD5 (patch-ae) = 25f9ec8f39dbc92c42ddde565e3fa3a5 -MD5 (patch-af) = 8e384b5055522378c814cb370d1553f4 +SHA1 (patch-aa) = 746a7f53d8f9064650b0488957e433a98296039e +SHA1 (patch-ab) = a71c822ddb8791cf5b548144f41f12e78134e1de +SHA1 (patch-ac) = 1c0757df6977f85d4e21998de6a870a8dc9a4f03 +SHA1 (patch-ad) = 2dc1bb8f3511c80f724e76de093a9445a4e9f2d1 +SHA1 (patch-ae) = 620cd3cee9a0dde54353e2f18dc06a1144a9b2e6 +SHA1 (patch-af) = a4e36341b1b7fe00887d528c9fce0b41da07092c diff --git a/mail/sendmail/patches/patch-aa b/mail/sendmail/patches/patch-aa index 6be635e50b9..268d852e8e8 100644 --- a/mail/sendmail/patches/patch-aa +++ b/mail/sendmail/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.12 2000/07/26 15:09:25 veego Exp $ +$NetBSD: patch-aa,v 1.13 2001/04/13 05:07:51 itojun Exp $ ---- devtools/OS/NetBSD-orig Fri Apr 28 07:46:10 2000 -+++ devtools/OS/NetBSD Wed Jul 26 13:05:56 2000 -@@ -3,13 +3,15 @@ +--- devtools/OS/NetBSD.orig Fri Jan 26 04:03:44 2001 ++++ devtools/OS/NetBSD Fri Mar 16 09:22:18 2001 +@@ -2,13 +2,15 @@ + define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX') define(`confENVDEF', ` -DNETISO') define(`confDEPEND_TYPE', `CC-M') - define(`confSTDIO_TYPE', `torek') -define(`confSBINGRP', `wheel') -define(`confUBINOWN', `root') -define(`confUBINGRP', `wheel') diff --git a/mail/sendmail/patches/patch-ab b/mail/sendmail/patches/patch-ab index e8d306ad9b1..5ab9093fbcc 100644 --- a/mail/sendmail/patches/patch-ab +++ b/mail/sendmail/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.9 2000/07/31 18:11:09 tron Exp $ +$NetBSD: patch-ab,v 1.10 2001/04/13 05:07:51 itojun Exp $ ---- devtools/OS/SunOS.5.6 Tue Jun 6 02:03:29 2000 -+++ devtools/OS/SunOS.5.6 Wed Jul 26 13:07:21 2000 -@@ -6,6 +6,7 @@ - define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX') +--- devtools/OS/SunOS.5.6.orig Mon Dec 18 01:17:51 2000 ++++ devtools/OS/SunOS.5.6 Fri Mar 16 09:22:38 2001 +@@ -7,6 +7,7 @@ define(`confENVDEF', `-DSOLARIS=20600') + define(`confSM_OS_HEADER', `sm_os_sunos') define(`confLIBS', `-lsocket -lnsl -lkstat') +define(`confLDOPTS', `${LDFLAGS}') define(`confMTLDOPTS', `-lpthread') diff --git a/mail/sendmail/patches/patch-ac b/mail/sendmail/patches/patch-ac index 9a855014c7c..b398d0b4c47 100644 --- a/mail/sendmail/patches/patch-ac +++ b/mail/sendmail/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.3 2000/07/31 18:11:09 tron Exp $ +$NetBSD: patch-ac,v 1.4 2001/04/13 05:07:51 itojun Exp $ ---- devtools/OS/SunOS.5.7 Tue Jun 6 02:03:29 2000 -+++ devtools/OS/SunOS.5.7 Wed Jul 26 13:07:08 2000 -@@ -6,6 +6,7 @@ - define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX') +--- devtools/OS/SunOS.5.7.orig Mon Dec 18 01:17:51 2000 ++++ devtools/OS/SunOS.5.7 Fri Mar 16 09:22:42 2001 +@@ -7,6 +7,7 @@ define(`confENVDEF', `-DSOLARIS=20700') + define(`confSM_OS_HEADER', `sm_os_sunos') define(`confLIBS', `-lsocket -lnsl') +define(`confLDOPTS', `${LDFLAGS}') define(`confMTLDOPTS', `-lpthread') diff --git a/mail/sendmail/patches/patch-ad b/mail/sendmail/patches/patch-ad index ef7106928ce..8eb9b3b81af 100644 --- a/mail/sendmail/patches/patch-ad +++ b/mail/sendmail/patches/patch-ad @@ -1,12 +1,18 @@ -$NetBSD: patch-ad,v 1.4 2000/10/15 14:30:23 itojun Exp $ +$NetBSD: patch-ad,v 1.5 2001/04/13 05:07:52 itojun Exp $ ---- 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') +--- devtools/OS/SunOS.5.8.orig Mon Dec 18 01:17:51 2000 ++++ devtools/OS/SunOS.5.8 Fri Mar 16 09:23:29 2001 +@@ -2,10 +2,11 @@ + define(`confCC', `gcc') + define(`confLDOPTS_SO', `-G') + define(`confBEFORE', `sysexits.h') +-define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP') +define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX') define(`confENVDEF', `-DSOLARIS=20800 -DNETINET6') + define(`confSM_OS_HEADER', `sm_os_sunos') -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 5451cfed6bc..0a740195d29 100644 --- a/mail/sendmail/patches/patch-ae +++ b/mail/sendmail/patches/patch-ae @@ -1,13 +1,18 @@ -$NetBSD: patch-ae,v 1.2 2000/10/15 14:30:23 itojun Exp $ +$NetBSD: patch-ae,v 1.3 2001/04/13 05:07:52 itojun Exp $ ---- 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 @@ +--- devtools/OS/SunOS.5.9.orig Mon Dec 18 01:17:51 2000 ++++ devtools/OS/SunOS.5.9 Fri Mar 16 09:23:59 2001 +@@ -2,10 +2,11 @@ + define(`confCC', `gcc') + define(`confLDOPTS_SO', `-G') define(`confBEFORE', `sysexits.h') -define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP') +define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX') define(`confENVDEF', `-DSOLARIS=20900 -DNETINET6') + define(`confSM_OS_HEADER', `sm_os_sunos') -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 index 255dd16b58b..fb521f19322 100644 --- a/mail/sendmail/patches/patch-af +++ b/mail/sendmail/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.7 2001/02/28 03:52:19 itojun Exp $ +$NetBSD: patch-af,v 1.8 2001/04/13 05:07:52 itojun Exp $ ---- sendmail/conf.c.orig Wed Feb 28 05:48:21 2001 -+++ sendmail/conf.c Wed Feb 28 12:48:30 2001 -@@ -4546,7 +4546,8 @@ +--- sendmail/conf.c.orig Thu Mar 8 09:07:50 2001 ++++ sendmail/conf.c Fri Mar 16 09:24:10 2001 +@@ -4237,7 +4237,8 @@ #if NETINET6 if (type == AF_INET6 && diff --git a/mail/sendmail/pkg/PLIST.common b/mail/sendmail/pkg/PLIST.common index bbe47f7a6a6..a2903efe4ec 100644 --- a/mail/sendmail/pkg/PLIST.common +++ b/mail/sendmail/pkg/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.4 2001/01/04 12:09:29 itojun Exp $ +@comment $NetBSD: PLIST.common,v 1.5 2001/04/13 05:07:52 itojun Exp $ bin/newaliases bin/mailq bin/hoststat @@ -62,30 +62,38 @@ share/sendmail/feature/accept_unresolvable_domains.m4 share/sendmail/feature/access_db.m4 share/sendmail/feature/allmasquerade.m4 share/sendmail/feature/always_add_domain.m4 +share/sendmail/feature/authinfo.m4 share/sendmail/feature/bestmx_is_local.m4 share/sendmail/feature/bitdomain.m4 share/sendmail/feature/blacklist_recipients.m4 +share/sendmail/feature/compat_check.m4 share/sendmail/feature/delay_checks.m4 share/sendmail/feature/dnsbl.m4 share/sendmail/feature/domaintable.m4 +share/sendmail/feature/enhdnsbl.m4 share/sendmail/feature/generics_entire_domain.m4 share/sendmail/feature/genericstable.m4 share/sendmail/feature/ldap_routing.m4 share/sendmail/feature/limited_masquerade.m4 share/sendmail/feature/local_lmtp.m4 +share/sendmail/feature/local_no_masquerade.m4 share/sendmail/feature/local_procmail.m4 +share/sendmail/feature/lookupdotdomain.m4 share/sendmail/feature/loose_relay_check.m4 share/sendmail/feature/mailertable.m4 share/sendmail/feature/masquerade_entire_domain.m4 share/sendmail/feature/masquerade_envelope.m4 +share/sendmail/feature/msp.m4 share/sendmail/feature/no_default_msa.m4 share/sendmail/feature/nocanonify.m4 share/sendmail/feature/nodns.m4 share/sendmail/feature/notsticky.m4 share/sendmail/feature/nouucp.m4 share/sendmail/feature/nullclient.m4 +share/sendmail/feature/preserve_local_plus_detail.m4 +share/sendmail/feature/preserve_luser_host.m4 share/sendmail/feature/promiscuous_relay.m4 -share/sendmail/feature/rbl.m4 +share/sendmail/feature/queuegroup.m4 share/sendmail/feature/redirect.m4 share/sendmail/feature/relay_based_on_MX.m4 share/sendmail/feature/relay_entire_domain.m4 @@ -115,7 +123,6 @@ share/sendmail/mailer/qpage.m4 share/sendmail/mailer/smtp.m4 share/sendmail/mailer/usenet.m4 share/sendmail/mailer/uucp.m4 -share/sendmail/ostype/aix2.m4 share/sendmail/ostype/aix3.m4 share/sendmail/ostype/aix4.m4 share/sendmail/ostype/aix5.m4 @@ -131,6 +138,7 @@ share/sendmail/ostype/darwin.m4 share/sendmail/ostype/dgux.m4 share/sendmail/ostype/domainos.m4 share/sendmail/ostype/dynix3.2.m4 +share/sendmail/ostype/freebsd4.m4 share/sendmail/ostype/gnu.m4 share/sendmail/ostype/hpux10.m4 share/sendmail/ostype/hpux11.m4 @@ -163,6 +171,7 @@ share/sendmail/ostype/ultrix4.m4 share/sendmail/ostype/unixware7.m4 share/sendmail/ostype/unknown.m4 share/sendmail/ostype/uxpds.m4 +share/sendmail/sendmail.schema share/sendmail/sh/makeinfo.sh share/sendmail/siteconfig/uucp.cogsci.m4 share/sendmail/siteconfig/uucp.old.arpa.m4 |