summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/sendmail/MESSAGE5
-rw-r--r--mail/sendmail/Makefile12
-rw-r--r--mail/sendmail/Makefile.common5
-rw-r--r--mail/sendmail/PLIST3
-rw-r--r--mail/sendmail/distinfo10
-rw-r--r--mail/sendmail/patches/patch-ah30
-rw-r--r--mail/sendmail/patches/patch-ai67
7 files changed, 96 insertions, 36 deletions
diff --git a/mail/sendmail/MESSAGE b/mail/sendmail/MESSAGE
index ab8bdda2615..442cfef9ec6 100644
--- a/mail/sendmail/MESSAGE
+++ b/mail/sendmail/MESSAGE
@@ -1,9 +1,12 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/05/01 15:19:11 jmmv Exp $
+$NetBSD: MESSAGE,v 1.4 2005/02/10 22:17:24 adrianp Exp $
To use "${PKGNAME}" as the system's mail transport agent you have
to install "${PREFIX}/share/examples/sendmail/mailer.conf" as global
mailwrapper configuration file. The command below will do that for you:
ln -fs ${PREFIX}/share/examples/sendmail/mailer.conf /etc/mailer.conf
+
+If you are changing the database format used by sendmail you must run
+"newaliases" and "makemap" in order to re-create the databases.
===========================================================================
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 55a44016424..cd493b9be91 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2004/08/30 20:16:28 adrianp Exp $
+# $NetBSD: Makefile,v 1.74 2005/02/10 22:17:24 adrianp Exp $
.include "../../mail/sendmail/Makefile.common"
@@ -57,12 +57,6 @@ post-build:
@${CP} ${PKGDIR}/MESSAGE ${MESSAGE_SRC}
@${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
-.if !empty(PKG_OPTIONS:Mdb2)
- @${ECHO} "" >>${MESSAGE_SRC}
- @${ECHO} "If you are upgrading from \"sendmail\" 8.8.x don't forget to rebuild all" >>${MESSAGE_SRC}
- @${ECHO} "databases with \"${PREFIX}/bin/newaliases\" and \"${PREFIX}/sbin/makemap\"." >>${MESSAGE_SRC}
-.endif
-
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/libexec/sendmail
@@ -76,10 +70,6 @@ post-install:
cd ${WRKSRC}/cf && ${PAX} -rw -pp -pm . ${PREFIX}/share/sendmail
${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/sendmail
-.if !empty(PKG_OPTIONS:Mdb2)
- @${MV} -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || ${TRUE}
-.endif
-
${INSTALL_DATA} ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ - | ${SED} s/sun4./sun4/`/libsm/libsm.a \
${PREFIX}/lib
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index d6fe5f3cc6a..a8e32ddec4c 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile.common,v 1.22 2004/10/03 02:08:40 tv Exp $
+# $NetBSD: Makefile.common,v 1.23 2005/02/10 22:17:24 adrianp Exp $
#
# Makefile fragment shared with libmilter
#
DISTNAME= sendmail.${DIST_VERS}
CATEGORIES= mail
-PKGREVISION= 2
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ \
ftp://ftp.ayamura.org/pub/sendmail/
@@ -19,7 +18,7 @@ DISTINFO_FILE?= ${.CURDIR}/../../mail/sendmail/distinfo
FILESDIR?= ${.CURDIR}/../../mail/sendmail/files
PATCHDIR?= ${.CURDIR}/../../mail/sendmail/patches
-DIST_VERS= 8.13.1
+DIST_VERS= 8.13.3
MAKE_ENV+= BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" \
diff --git a/mail/sendmail/PLIST b/mail/sendmail/PLIST
index 1264226e339..1ca730ca86e 100644
--- a/mail/sendmail/PLIST
+++ b/mail/sendmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/08/30 20:16:28 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/02/10 22:17:24 adrianp Exp $
bin/hoststat
bin/mailq
bin/newaliases
@@ -168,6 +168,7 @@ share/sendmail/ostype/bsdi2.0.m4
share/sendmail/ostype/darwin.m4
share/sendmail/ostype/dgux.m4
share/sendmail/ostype/domainos.m4
+share/sendmail/ostype/dragonfly.m4
share/sendmail/ostype/dynix3.2.m4
share/sendmail/ostype/freebsd4.m4
share/sendmail/ostype/freebsd5.m4
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index 7bd21df73fd..da0f5f55659 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2004/08/31 10:51:22 adrianp Exp $
+$NetBSD: distinfo,v 1.20 2005/02/10 22:17:24 adrianp Exp $
-SHA1 (sendmail.8.13.1.tar.gz) = ce2d3897a7dca4e75facfd48d100ccd3773e2894
-Size (sendmail.8.13.1.tar.gz) = 1963257 bytes
+SHA1 (sendmail.8.13.3.tar.gz) = cd4a5d8726cd72e58220558b1191f7bfdcd7920c
+Size (sendmail.8.13.3.tar.gz) = 1969226 bytes
SHA1 (patch-aa) = b7ceece7760e3d637016da039f8429c1fb89f2cf
SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa
SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27
@@ -9,5 +9,5 @@ SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13
SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28
SHA1 (patch-ag) = a87e1685f343703d21a42ec1df68cbba963fa178
-SHA1 (patch-ah) = 94133440eb4300545541a69fd622c3751d04fab2
-SHA1 (patch-ai) = b6f56acd96eb80f1969d68c2f5edcca8a2b8b352
+SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
+SHA1 (patch-ai) = eaf39ce0ab004ac976fff69d74b4c17afc0b4dae
diff --git a/mail/sendmail/patches/patch-ah b/mail/sendmail/patches/patch-ah
index 5345dd79713..e26eccd812b 100644
--- a/mail/sendmail/patches/patch-ah
+++ b/mail/sendmail/patches/patch-ah
@@ -1,8 +1,26 @@
-$NetBSD: patch-ah,v 1.1 2004/08/30 20:16:28 adrianp Exp $
+$NetBSD: patch-ah,v 1.2 2005/02/10 22:17:24 adrianp Exp $
---- smrsh/smrsh.8.orig Mon Aug 30 18:00:16 2004
-+++ smrsh/smrsh.8 Mon Aug 30 18:00:57 2004
-@@ -86,13 +86,9 @@
+--- smrsh/smrsh.8.orig 2004-08-06 04:55:35.000000000 +0100
++++ smrsh/smrsh.8
+@@ -39,7 +39,7 @@ Briefly,
+ .I smrsh
+ limits programs to be in a single directory,
+ by default
+-/usr/adm/sm.bin,
++@@SMRSH_CMDDIR@@,
+ allowing the system administrator to choose the set of acceptable commands,
+ and to the shell builtin commands ``exec'', ``exit'', and ``echo''.
+ It also rejects any commands with the characters
+@@ -56,7 +56,7 @@ so forwarding to ``/usr/ucb/vacation'',
+ and
+ ``vacation''
+ all actually forward to
+-``/usr/adm/sm.bin/vacation''.
++``@@SMRSH_CMDDIR@@/vacation''.
+ .PP
+ System administrators should be conservative about populating
+ the sm.bin directory.
+@@ -86,13 +86,9 @@ to adjust the default search path
(defaults to ``/bin:/usr/bin:/usr/ucb'')
and/or \-DSMRSH_CMDDIR=\e"\fIdir\fP\e"
to change the default program directory
@@ -13,8 +31,8 @@ $NetBSD: patch-ah,v 1.1 2004/08/30 20:16:28 adrianp Exp $
-.PP
-/var/adm/sm.bin \- directory for restricted programs on HP UX and Solaris
-.PP
--/usr/libexec/sm.bin \- directory for restricted programs on FreeBSD (>= 3.3)
-+@@SMRSH_CMDDIR@@ \- default directory for restricted programs on most OSs
+-/usr/libexec/sm.bin \- directory for restricted programs on FreeBSD (>= 3.3) and DragonFly BSD
++@@SMRSH_CMDDIR@@ \- default directory for restricted programs
.SH SEE ALSO
sendmail(8)
diff --git a/mail/sendmail/patches/patch-ai b/mail/sendmail/patches/patch-ai
index 29a86db5c74..d21528ac7f4 100644
--- a/mail/sendmail/patches/patch-ai
+++ b/mail/sendmail/patches/patch-ai
@@ -1,13 +1,62 @@
-$NetBSD: patch-ai,v 1.1 2004/08/31 10:51:22 adrianp Exp $
+$NetBSD: patch-ai,v 1.2 2005/02/10 22:17:24 adrianp Exp $
---- sendmail/parseaddr.c.orig Tue Aug 31 09:47:04 2004
-+++ sendmail/parseaddr.c Tue Aug 31 09:47:31 2004
-@@ -2196,7 +2196,7 @@
+--- sendmail/mci.c.orig 2004-08-04 22:11:31.000000000 +0100
++++ sendmail/mci.c
+@@ -398,6 +398,57 @@ mci_get(host, m)
- /* Don't silently truncate long strings */
- if (sz <= 0)
-- syserr("cataddr: string too long");
-+ usrerr("cataddr: string too long");
- *p = '\0';
+ return mci;
}
++
++/*
++** MCI_CLOSE -- (forcefully) close files used for a connection.
++** Note: this is a last resort, usually smtpquit() or endmailer()
++** should be used to close a connection.
++**
++** Parameters:
++** mci -- the connection to close.
++** where -- where has this been called?
++**
++** Returns:
++** none.
++*/
++
++void
++mci_close(mci, where)
++ MCI *mci;
++ char *where;
++{
++ bool dumped;
++
++ if (mci == NULL)
++ return;
++ dumped = false;
++ if (mci->mci_out != NULL)
++ {
++ if (tTd(56, 1))
++ {
++ sm_dprintf("mci_close: mci_out!=NULL, where=%s\n",
++ where);
++ mci_dump(sm_debug_file(), mci, false);
++ dumped = true;
++ }
++ (void) sm_io_close(mci->mci_out, SM_TIME_DEFAULT);
++ mci->mci_out = NULL;
++ }
++ if (mci->mci_in != NULL)
++ {
++ if (tTd(56, 1))
++ {
++ sm_dprintf("mci_close: mci_in!=NULL, where=%s\n",
++ where);
++ if (!dumped)
++ mci_dump(sm_debug_file(), mci, false);
++ }
++ (void) sm_io_close(mci->mci_in, SM_TIME_DEFAULT);
++ mci->mci_in = NULL;
++ }
++ mci->mci_state = MCIS_CLOSED;
++}
++
/*
+ ** MCI_NEW -- allocate new MCI structure
+ **
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 02:43:09 +0000