diff options
| -rw-r--r-- | mail/sendmail/Makefile | 3 | ||||
| -rw-r--r-- | mail/sendmail/Makefile.common | 4 | ||||
| -rw-r--r-- | mail/sendmail/PLIST | 3 | ||||
| -rw-r--r-- | mail/sendmail/distinfo | 9 | ||||
| -rw-r--r-- | mail/sendmail/patches/patch-ao | 19 |
5 files changed, 9 insertions, 29 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 41800ad34ad..428fec76dc7 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.107 2009/03/21 21:30:58 jnemeth Exp $ +# $NetBSD: Makefile,v 1.108 2010/01/16 00:31:13 jnemeth Exp $ PKGNAME= sendmail-${DIST_VERS} -PKGREVISION= 4 COMMENT= The well known Mail Transport Agent CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]* diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common index d18a7eb3f1c..66fd1827681 100644 --- a/mail/sendmail/Makefile.common +++ b/mail/sendmail/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.50 2009/08/15 23:18:11 zafer Exp $ +# $NetBSD: Makefile.common,v 1.51 2010/01/16 00:31:13 jnemeth Exp $ # # used by mail/libmilter/Makefile # used by mail/sendmail/Makefile @@ -18,7 +18,7 @@ DISTINFO_FILE= ${.CURDIR}/../../mail/sendmail/distinfo FILESDIR= ${.CURDIR}/../../mail/sendmail/files PATCHDIR= ${.CURDIR}/../../mail/sendmail/patches -DIST_VERS= 8.14.3 +DIST_VERS= 8.14.4 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 07e4185b59b..a72727f4fbb 100644 --- a/mail/sendmail/PLIST +++ b/mail/sendmail/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2009/06/14 20:45:11 joerg Exp $ +@comment $NetBSD: PLIST,v 1.17 2010/01/16 00:31:13 jnemeth Exp $ bin/hoststat bin/mailq bin/newaliases @@ -222,3 +222,4 @@ share/sendmail/siteconfig/uucp.cogsci.m4 share/sendmail/siteconfig/uucp.old.arpa.m4 share/sendmail/siteconfig/uucp.ucbarpa.m4 share/sendmail/siteconfig/uucp.ucbvax.m4 +@pkgdir libexec/sm.bin diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo index 7b6c91a1232..3e9694d3e69 100644 --- a/mail/sendmail/distinfo +++ b/mail/sendmail/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.43 2009/12/16 13:41:41 jnemeth Exp $ +$NetBSD: distinfo,v 1.44 2010/01/16 00:31:13 jnemeth Exp $ -SHA1 (sendmail.8.14.3.tar.gz) = 814c54c3917aa6b0981b5ea99fb34e0c02f31489 -RMD160 (sendmail.8.14.3.tar.gz) = 5423360ce908c985827cf6524a6de87e3451c27a -Size (sendmail.8.14.3.tar.gz) = 2069209 bytes +SHA1 (sendmail.8.14.4.tar.gz) = ba192f9a5114437aaec952f503fa2f09ee6dbe57 +RMD160 (sendmail.8.14.4.tar.gz) = d998062ee6b4e80eb90cc6e790f971bd02b52254 +Size (sendmail.8.14.4.tar.gz) = 2080472 bytes SHA1 (patch-aa) = 0f2273f7c089e8137aae1d3503006ac2bc18166d SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27 @@ -16,4 +16,3 @@ SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433 SHA1 (patch-al) = f5d8cef8c4abba5d5ae813b754c16037190a7ef1 SHA1 (patch-am) = d84eedbff0f037c1db341255dc9e1877866f12c7 SHA1 (patch-an) = 82d2df0c609099f295eb00f1f5e19391ae97833c -SHA1 (patch-ao) = 51e27f1fa90420bf7a5daa1379c4b0f07b596177 diff --git a/mail/sendmail/patches/patch-ao b/mail/sendmail/patches/patch-ao deleted file mode 100644 index 6d1f291819e..00000000000 --- a/mail/sendmail/patches/patch-ao +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2009/12/16 09:46:36 jnemeth Exp $ - -Fix a possibly incorrect error message. -Patch sent upstream, 2009/12/15 -- jnemeth - ---- libmilter/listener.c.orig 2007-04-23 22:22:50.000000000 +0000 -+++ libmilter/listener.c -@@ -777,8 +777,9 @@ mi_listener(conn, dbg, smfi, timeout, ba - continue; - scnt++; - smi_log(SMI_LOG_ERR, -- "%s: select() failed (%s), %s", -- smfi->xxfi_name, sm_errstring(save_errno), -+ "%s: %s() failed (%s), %s", -+ smfi->xxfi_name, MI_POLLSELECT, -+ sm_errstring(save_errno), - scnt >= MAX_FAILS_S ? "abort" : "try again"); - MI_SLEEP(scnt); - if (scnt >= MAX_FAILS_S) |