pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/sendmail Update to sendmail-8.14.1. Major change...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7ffb00ab44f3
branches: trunk
changeset: 528249:7ffb00ab44f3
user: jnemeth <jnemeth%pkgsrc.org@localhost>
date: Thu Apr 26 06:26:27 2007 +0000
description:
Update to sendmail-8.14.1. Major changes since sendmail-8.13.8:
8.14.1/8.14.1 2007/04/03
Even though a milter rejects a recipient the MTA will still keep
it in its list of recipients and deliver to it if the
transaction is accepted. This is a regression introduced
in 8.14.0 due to the change for SMFIP_RCPT_REJ. Bug
found by Andy Fiddaman.
The new DaemonPortOptions which begin with a lower case character
could not be set in 8.14.0.
If a server shut down the connection in response to a STARTTLS
command, sendmail would log a misleading error message
due to an internal inconsistency. Problem found by
Werner Wiethege.
Document how some sendmail.cf options change the behavior of mailq.
Noted by Paul Menchini of the North Carolina School of
Science and Mathematics.
CONFIG: Add confSOFT_BOUNCE m4 option for setting SoftBounce.
CONFIG: 8.14.0's RELEASE_NOTES failed to mention the addition
of the confMAX_NOOP_COMMANDS and confSHARED_MEMORY_KEY_FILE
m4 options for setting MaxNOOPCommands and
SharedMemoryKeyFile.
CONFIG: Add confMILTER_MACROS_EOH and confMILTER_MACROS_DATA m4
options for setting Milter.macros.eoh and Milter.macros.data.
CONTRIB: Use flock() and fcntl() in qtool.pl if necessary.
Patch from Daniel Carroll of Mesa State College.
LIBMILTER: Make sure an unknown command does not affect the
currently available macros. Problem found by Andy Fiddaman.
LIBMILTER: The MTA did not offer SMFIF_SETSYMLIST during option
negotiation. Problem reported by Bryan Costales.
LIBMILTER: Fix several minor errors in the documentation.
Patches from Bryan Costales.
PORTABILITY FIXES:
AIX 5.{1,2}: libsm/util.c failed to compile due to
redefinition of several macros, e.g., SIG_ERR.
Patch from Jim Pirzyk with assistance by Bob
Booth, University of Illinois at Urbana-Champaign.
Add support for QNX.6. Patch from Sean Boudreau of QNX
Software Systems.
New Files:
devtools/M4/depend/QNX6.m4
devtools/OS/QNX.6.x
include/sm/os/sm_os_qnx.h
New Files added in 8.14.0, but not shown in the release notes entry:
libmilter/docs/smfi_chgfrom.html
libmilter/docs/smfi_version.html
8.14.0/8.14.0 2007/01/31
Header field values are now 8 bit clean. Notes:
- header field names are still restricted to 7 bit.
- RFC 2822 allows only 7 bit (US-ASCII) characters in
headers.
Preserve spaces after the colon in a header. Previously, any
number of spaces after the colon would be changed to
exactly one space.
In some cases of deeply nested aliases/forwarding, mail can
be silently lost. Moreover, the MaxAliasRecursion
limit may be reached too early, e.g., the counter
may be off by a factor of 4 in case of a sequence of
.forward files that refer to others. Patch from
Motonori Nakamura of Kyoto University.
Fix a regression in 8.13.8: if InputMailFilters is set then
"sendmail -bs" can trigger an assertion because the
hostname of the client is undefined. It is now set
to "localhost" for the xxfi_connect() callback.
Avoid referencing a freed variable during cleanup when terminating.
Problem reported and diagnosed by Joe Maimon.
New option HeloName to set the name for the HELO/EHLO command.
Patch from Nik Clayton.
New option SoftBounce to issue temporary errors (4xy) instead of
permanent errors (5xy). This can be useful for testing.
New suboptions for DaemonPortOptions to set them individually
per daemon socket:
DeliveryMode DeliveryMode
refuseLA RefuseLA
delayLA DelayLA
queueLA QueueLA
children MaxDaemonChildren
New option -K for LDAP maps to replace %1 through %9 in the
lookup key with the LDAP escaped contents of the
arguments specified in the map lookup. Loosely based
on patch from Wolfgang Hottgenroth.
Log the time after which a greet_pause delay triggered. Patch
from Nik Clayton.
If a client is rejected via TCP wrapper or some other check
performed by validate_connection() (in conf.c) then do
not also invoke greet_pause. Problem noted by Jim Pirzyk
of the University of Illinois at Urbana-Champaign.
If a client terminates the SMTP connection during a pause
introduced by greet_pause, then a misleading message
was logged previously. Problem noted by Vernon Schryver
et.al., patch from Matej Vela.
New command "mstat" for control socket to provide "machine
readable" status.
New named config file rule check_eom which is called at the end
of a message, its parameter is the size of the message.
If the macro {addr_type} indicates that the current address
is a header address it also distinguishes between
recipient and sender addresses (as it is done for
envelope addresses).
When a macro is set in check_relay, then its value is accessible
by all transactions in the same SMTP session.
Increase size of key for ldap lookups to 1024 (MAXKEY).
New option MaxNOOPCommands to override default of 20 for the
number of "useless" commands before the SMTP server will
slow down responding.
New option SharedMemoryKeyFile: if shared memory support is
enabled, the MTA can be asked to select a shared memory
key itself by setting SharedMemoryKey to -1 and specifying
a file where to store the selected key.
Try to deal with open HTTP proxies that are used to send spam
by recognizing some commands from them. If the first command
from the client is GET, POST, CONNECT, or USER, then the
connection is terminated immediately.
New PrivacyOptions noactualrecipient to avoid putting
X-Actual-Recipient lines in DSNs revealing the actual
account that addresses map to. Patch from Dan Harkless.
New options B, z, and Z for DNS maps:
-B: specify a domain that is always appended to queries.
-z: specify the delimiter at which to cut off the result of
a query if it is too long.
-Z: specify the maximum number of entries to be concatenated
to form the result of a lookup.
New target "check" in the Makefile of libsm: instead of running tests
implicitly while building libsm, they must be explicitly
started by using "make check".
Fixed some inconsistent checks for NULL pointers that have been
reported by the SATURN tool which has been developed by
Isil Dillig and Thomas Dillig of Stanford University.
Fix a potential race condition caused by a signal handler for
terminated child processes. Problem noted by David F. Skoll.
When a milter deleted a recipient, that recipient could cause a
queue group selection. This has been disabled as it was not
intended.
New operator 'r' for the arith map to return a random number.
Patch from Motonori Nakamura of Kyoto University.
New compile time option MILTER_NO_NAGLE to turn off the Nagle
algorithm for communication with libmilter ("cork" on Linux),
which may improve the communication performance on some
operating systems. Patch from John Gardiner Myers of
Proofpoint.
If sendmail received input that contained a CR without subsequent LF
(thus violating RFC 2821 (2.3.7)), it could previously
generate an additional blank line in the output as the last
line.
Restarting persistent queue runners by sending a HUP signal to
the "queue control process" (QCP) works now.
Increase the length of an input line to 12288 to deal with
really long lines during SMTP AUTH negotiations.
Problem noted by Werner Wiethege.
If ARPANET mode (-ba) was selected STARTTLS would fail (due to
a missing initialization call for that case). Problem
noted by Neil Rickert of Northern Illinois University.
If sendmail is linked against a library that initializes Cyrus-SASL
before sendmail did it (such as libnss-ldap), then SMTP AUTH
could fail for the sendmail client. A patch by Moritz Both
works around the API design flaw of Cyrus-SASLv2.
CONFIG: Make it possible to unset the StatusFile option by
undefining STATUS_FILE. By not setting StatusFile,
the MTA will not attempt to open a statistics file on
each delivery.
CONFIG: New FEATURE(`require_rdns') to reject messages from SMTP
clients whose IP address does not have proper reverse DNS.
Contributed by Neil Rickert of Northern Illinois University
and John Beck of Sun Microsystems.
CONFIG: New FEATURE(`block_bad_helo') to reject messages from SMTP
clients which provide a HELO/EHLO argument which is either
unqualified, or is one of our own names (i.e., the server
name instead of the client name). Contributed by Neil
Rickert of Northern Illinois University and John Beck of
Sun Microsystems.
CONFIG: New FEATURE(`badmx') to reject envelope sender addresses
(MAIL) whose domain part resolves to a "bad" MX record.
Based on contribution from William Dell Wisner.
CONFIG: New macros SMTP_MAILER_LL and RELAY_MAILER_LL to override
the maximum line length of the smtp mailers.
CONFIG: New option `relaytofulladdress' for FEATURE(`access_db')
to allow entries in the access map to be of the form
To:user%example.com@localhost RELAY
CONFIG: New subsuboptions eoh and data to specify the list of
macros a milter should receive at those stages in the
SMTP dialogue.
CONFIG: New option confHELO_NAME for HeloName to set the name
for the HELO/EHLO command.
CONFIG: dnsbl and enhdnsbl can now also discard or quarantine
messages by using those values as second argument.
Patches from Nelson Fung.
CONTRIB: cidrexpand uses a hash symbol as comment character and
ignores everything after it unless it is in quotes or
preceeded by a backslash.
DEVTOOLS: New macro confMKDIR: if set to a program that creates
directories, then it used for "make install" to create
the required installation directories.
DEVTOOLS: New macro confCCLINK to specify the linker to use for
executables (defaults to confCC).
LIBMILTER: A new version of the milter API has been created that
has several changes which are listed below and documented
in the webpages reachable via libmilter/docs/index.html.
LIBMILTER: The meaning of the version macro SMFI_VERSION has been
changed. It now refers only to the version of libmilter,
not to the protocol version (which is used only internally,
it is not user/milter-programmer visible). Additionally,
a version function smfi_version() has been introduced such
that a milter program can check the libmilter version also
at runtime which is useful if a shared library is used.
LIBMILTER: A new callback xxfi_negotiate() can be used to
dynamically (i.e., at runtime) determine the available
protocol actions and features of the MTA and also to
specify which of these a milter wants to use. This allows
for more flexibility than hardcoding these flags in the
xxfi_flags field of the smfiDesc structure.
LIBMILTER: A new callback xxfi_data() is available so milters
can act on the DATA command.
LIBMILTER: A new callback xxfi_unknown() is available so milters
can receive also unknown SMTP commands.
LIBMILTER: A new return code SMFIS_NOREPLY has been added which
can be used by the xxfi_header() callback provided the
milter requested the SMFIP_NOHREPL protocol action.
LIBMILTER: The new return code SMFIS_SKIP can be used in the
xxfi_body() callback to skip over further body chunks
and directly advance to the xxfi_eom() callback. This
is useful if a milter can make a decision based on the
body chunks it already received without reading the entire
rest of the body and the milter wants to invoke functions
that are only available from the xxfi_eom() callback.
LIBMILTER: A new function smfi_addrcpt_par() can be used to add
new recipients including ESMTP parameters.
LIBMILTER: A new function smfi_chgfrom() can be used to change the
envelope sender including ESMTP parameters.
LIBMILTER: A milter can now request to be informed about rejected
recipients (RCPT) too. This requires to set the protocol
flag SMFIP_RCPT_REJ during option negotiation. Whether
a RCPT has been rejected can be checked by comparing the
value of the macro {rcpt_mailer} with "error".
LIBMILTER: A milter can now override the list of macros that it
wants to receive from the MTA for each protocol step
by invoking the function smfi_setsymlist() during option
negotiation.
LIBMILTER: A milter can receive header field values with all
leading spaces by requesting the SMFIP_HDR_LEADSPC
protocol action. Also, if the flag is set then the MTA
does not add a leading space to headers that are added,
inserted, or replaced.
LIBMILTER: If a milter sets the reply code to "421" for the HELO
callback, the SMTP server will terminate the SMTP session
with that error to match the behavior of all other callbacks.
New Files:
cf/feature/badmx.m4
cf/feature/block_bad_helo.m4
cf/feature/require_rdns.m4
devtools/M4/UNIX/check.m4
include/sm/misc.h
include/sm/sendmail.h
include/sm/tailq.h
libmilter/docs/smfi_addrcpt_par.html
libmilter/docs/smfi_setsymlist.html
libmilter/docs/xxfi_data.html
libmilter/docs/xxfi_negotiate.html
libmilter/docs/xxfi_unknown.html
libmilter/example.c
libmilter/monitor.c
libmilter/worker.c
libsm/memstat.c
libsm/t-memstat.c
libsm/t-qic.c
libsm/util.c
sendmail/daemon.h
sendmail/map.h
diffstat:
mail/sendmail/Makefile | 35 +++++++++++++++++------------------
mail/sendmail/Makefile.common | 9 +++++----
mail/sendmail/PLIST | 5 ++++-
mail/sendmail/distinfo | 15 +++++++--------
mail/sendmail/options.mk | 4 ++--
mail/sendmail/patches/patch-af | 8 ++++----
mail/sendmail/patches/patch-ag | 17 +++++++++--------
mail/sendmail/patches/patch-ai | 14 +++++++-------
mail/sendmail/patches/patch-ak | 23 -----------------------
9 files changed, 55 insertions(+), 75 deletions(-)
diffs (truncated from 324 to 300 lines):
diff -r 1164bf5356f9 -r 7ffb00ab44f3 mail/sendmail/Makefile
--- a/mail/sendmail/Makefile Thu Apr 26 01:24:29 2007 +0000
+++ b/mail/sendmail/Makefile Thu Apr 26 06:26:27 2007 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.98 2007/04/19 19:24:09 joerg Exp $
+# $NetBSD: Makefile,v 1.99 2007/04/26 06:26:27 jnemeth Exp $
.include "../../mail/sendmail/Makefile.common"
PKGNAME= sendmail-${DIST_VERS}
-PKGREVISION= 4
COMMENT= The well known Mail Transport Agent
CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
@@ -27,7 +26,7 @@
SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= ../mailer.conf include/sm/conf.h smrsh/smrsh.8 cf/cf/Makefile
+SUBST_FILES.paths= ../mailer.conf smrsh/smrsh.8 cf/cf/Makefile
SUBST_SED.paths+= -e "s|@@BINGRP@@|${BINGRP}|g"
SUBST_SED.paths+= -e "s|@@BINOWN@@|${BINOWN}|g"
SUBST_SED.paths+= -e "s|@@INSTALL@@|${INSTALL}|g"
@@ -41,33 +40,33 @@
post-patch: make-sendmail-siteconfig
.if !empty(PKG_OPTIONS:Mtcpwrappers)
- ${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG}
+ cat ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG}
.endif
.if !empty(PKG_OPTIONS:Mldap)
- ${CAT} ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG}
+ cat ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG}
.endif
.if !empty(PKG_OPTIONS:Mdb2)
- ${CAT} ${FILESDIR}/site.config.m4-db2 >>${SITECONFIG}
+ cat ${FILESDIR}/site.config.m4-db2 >>${SITECONFIG}
.endif
.if !empty(PKG_OPTIONS:Mdb4)
- ${CAT} ${FILESDIR}/site.config.m4-db4 >>${SITECONFIG}
+ cat ${FILESDIR}/site.config.m4-db4 >>${SITECONFIG}
.endif
.if !empty(PKG_OPTIONS:Mtls)
- ${CAT} ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG}
+ cat ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG}
.endif
.if !empty(PKG_OPTIONS:Msasl)
- ${CAT} ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG}
+ cat ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG}
.endif
post-extract:
- ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
+ cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
do-build:
- (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Build)
+ (cd ${WRKSRC} && env ${MAKE_ENV} ./Build)
post-build:
- ${CP} ${PKGDIR}/MESSAGE ${MESSAGE_SRC}
- ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
+ cp ${PKGDIR}/MESSAGE ${MESSAGE_SRC}
+ cp ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/libexec/sendmail
@@ -79,14 +78,14 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sendmail
${INSTALL_DATA} ${WRKDIR}/mailer.conf \
${PREFIX}/share/examples/sendmail/
- cd ${WRKSRC}/cf && ${PAX} -rw -pp -pm -s',^.*\.orig$$,,' . ${PREFIX}/share/sendmail
- ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/sendmail
+ cd ${WRKSRC}/cf && pax -rw -pp -pm -s',^.*\.orig$$,,' . ${PREFIX}/share/sendmail
+ chown -R ${BINOWN}:${BINGRP} ${PREFIX}/share/sendmail
- ${INSTALL_DATA} ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ - | ${SED} s/sun4./sun4/`/libsm/libsm.a \
+ ${INSTALL_DATA} ${WRKSRC}/obj.`${UNAME} -srm | tr \ . | tr \/ - | sed s/sun4./sun4/`/libsm/libsm.a \
${PREFIX}/lib
${INSTALL_DATA} \
- ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ - | ${SED} s/sun4./sun4/`/libsmutil/libsmutil.a \
+ ${WRKSRC}/obj.`${UNAME} -srm | tr \ . | tr \/ - | sed s/sun4./sun4/`/libsmutil/libsmutil.a \
${PREFIX}/lib
${INSTALL_SCRIPT} ${WRKSRC}/contrib/socketmap*.pl \
${PREFIX}/share/examples/sendmail/
@@ -99,4 +98,4 @@
.include "../../mk/bsd.pkg.mk"
# has to be below include for bsd.pkg.mk, else substition fails
-OBJDIR!= ${ECHO} obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ -`
+OBJDIR!= ${ECHO} obj.`${UNAME} -srm | tr \ . | tr \/ -`
diff -r 1164bf5356f9 -r 7ffb00ab44f3 mail/sendmail/Makefile.common
--- a/mail/sendmail/Makefile.common Thu Apr 26 01:24:29 2007 +0000
+++ b/mail/sendmail/Makefile.common Thu Apr 26 06:26:27 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2007/04/06 00:20:32 tv Exp $
+# $NetBSD: Makefile.common,v 1.42 2007/04/26 06:26:27 jnemeth Exp $
#
# Makefile fragment shared with libmilter
#
@@ -19,7 +19,7 @@
FILESDIR?= ${.CURDIR}/../../mail/sendmail/files
PATCHDIR?= ${.CURDIR}/../../mail/sendmail/patches
-DIST_VERS= 8.13.8
+DIST_VERS= 8.14.1
MAKE_ENV+= BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
BSD_MANOWN=${MANOWN:Q} BSD_MANGRP=${MANGRP:Q} \
@@ -36,14 +36,15 @@
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
+.PHONY: make-sendmail-siteconfig
make-sendmail-siteconfig:
${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
${CHMOD} +w ${SITECONFIG}
.if !empty(PKG_OPTIONS:Minet6)
${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG}
-.if ${OPSYS} != "SunOS" && ${OPSYS} != "BSDOS" && ${OPSYS} != "DragonFly"
+. if ${OPSYS} != "SunOS" && ${OPSYS} != "BSDOS" && ${OPSYS} != "DragonFly"
${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG}
-.endif
+. endif
.endif
${CAT} ${FILESDIR}/site.config.m4-milter >>${SITECONFIG}
diff -r 1164bf5356f9 -r 7ffb00ab44f3 mail/sendmail/PLIST
--- a/mail/sendmail/PLIST Thu Apr 26 01:24:29 2007 +0000
+++ b/mail/sendmail/PLIST Thu Apr 26 06:26:27 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2007/01/20 20:08:32 tv Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/04/26 06:26:27 jnemeth Exp $
bin/hoststat
bin/mailq
bin/newaliases
@@ -93,9 +93,11 @@
share/sendmail/feature/allmasquerade.m4
share/sendmail/feature/always_add_domain.m4
share/sendmail/feature/authinfo.m4
+share/sendmail/feature/badmx.m4
share/sendmail/feature/bestmx_is_local.m4
share/sendmail/feature/bitdomain.m4
share/sendmail/feature/blacklist_recipients.m4
+share/sendmail/feature/block_bad_helo.m4
share/sendmail/feature/compat_check.m4
share/sendmail/feature/conncontrol.m4
share/sendmail/feature/delay_checks.m4
@@ -133,6 +135,7 @@
share/sendmail/feature/relay_hosts_only.m4
share/sendmail/feature/relay_local_from.m4
share/sendmail/feature/relay_mail_from.m4
+share/sendmail/feature/require_rdns.m4
share/sendmail/feature/smrsh.m4
share/sendmail/feature/stickyhost.m4
share/sendmail/feature/use_client_ptr.m4
diff -r 1164bf5356f9 -r 7ffb00ab44f3 mail/sendmail/distinfo
--- a/mail/sendmail/distinfo Thu Apr 26 01:24:29 2007 +0000
+++ b/mail/sendmail/distinfo Thu Apr 26 06:26:27 2007 +0000
@@ -1,18 +1,17 @@
-$NetBSD: distinfo,v 1.34 2006/12/29 21:44:09 markd Exp $
+$NetBSD: distinfo,v 1.35 2007/04/26 06:26:27 jnemeth Exp $
-SHA1 (sendmail.8.13.8.tar.gz) = 8e97c10f52efe5204c08f6cb3f90c08e077ac505
-RMD160 (sendmail.8.13.8.tar.gz) = a5d333b073d681f056421e836df4067f331a8ac8
-Size (sendmail.8.13.8.tar.gz) = 2010975 bytes
+SHA1 (sendmail.8.14.1.tar.gz) = 327a77a3b5a55810f2addae7dfd6cfd95645f476
+RMD160 (sendmail.8.14.1.tar.gz) = 180c90e9a64e8896798ed6b9cf883d481e11f5ac
+Size (sendmail.8.14.1.tar.gz) = 2061959 bytes
SHA1 (patch-aa) = b7ceece7760e3d637016da039f8429c1fb89f2cf
SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa
SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27
SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13
SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
-SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28
-SHA1 (patch-ag) = 672c3e8a0c897f2c721d45393d85d4ea819d55a6
+SHA1 (patch-af) = f1fb00d9d27f512c550ad7dbcd014563122488b5
+SHA1 (patch-ag) = 1889e8d7938664af926a9a169bb53f6da924f0bb
SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
-SHA1 (patch-ai) = 8ade5888074ad9a328f87d66836c04eacf7785d5
+SHA1 (patch-ai) = 41ce105ff15cdc1233d4b63505de7ee1b2703379
SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433
-SHA1 (patch-ak) = 43b26ff1c78d4360909455124a382f65394377b3
SHA1 (patch-al) = f5d8cef8c4abba5d5ae813b754c16037190a7ef1
SHA1 (patch-am) = d84eedbff0f037c1db341255dc9e1877866f12c7
diff -r 1164bf5356f9 -r 7ffb00ab44f3 mail/sendmail/options.mk
--- a/mail/sendmail/options.mk Thu Apr 26 01:24:29 2007 +0000
+++ b/mail/sendmail/options.mk Thu Apr 26 06:26:27 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2007/01/20 20:08:32 tv Exp $
+# $NetBSD: options.mk,v 1.17 2007/04/26 06:26:27 jnemeth Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail
PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl tls tcpwrappers
@@ -13,7 +13,7 @@
###
.if !empty(PKG_OPTIONS:Mdb2)
. include "../../databases/db/buildlink3.mk"
-. elif !empty(PKG_OPTIONS:Mdb4)
+.elif !empty(PKG_OPTIONS:Mdb4)
. include "../../databases/db4/buildlink3.mk"
.endif
diff -r 1164bf5356f9 -r 7ffb00ab44f3 mail/sendmail/patches/patch-af
--- a/mail/sendmail/patches/patch-af Thu Apr 26 01:24:29 2007 +0000
+++ b/mail/sendmail/patches/patch-af Thu Apr 26 06:26:27 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.10 2002/09/23 12:57:01 markd Exp $
+$NetBSD: patch-af,v 1.11 2007/04/26 06:26:27 jnemeth Exp $
---- sendmail/conf.c.orig Sat Aug 17 02:56:01 2002
-+++ sendmail/conf.c Mon Sep 16 15:13:22 2002
-@@ -4352,7 +4352,8 @@
+--- sendmail/conf.c.orig 2007-04-03 14:32:29.000000000 -0700
++++ sendmail/conf.c
+@@ -4393,7 +4393,8 @@ sm_gethostbyaddr(addr, len, type)
#if NETINET6
if (type == AF_INET6 &&
diff -r 1164bf5356f9 -r 7ffb00ab44f3 mail/sendmail/patches/patch-ag
--- a/mail/sendmail/patches/patch-ag Thu Apr 26 01:24:29 2007 +0000
+++ b/mail/sendmail/patches/patch-ag Thu Apr 26 06:26:27 2007 +0000
@@ -1,16 +1,17 @@
-$NetBSD: patch-ag,v 1.12 2006/05/12 22:23:09 adrianp Exp $
+$NetBSD: patch-ag,v 1.13 2007/04/26 06:26:27 jnemeth Exp $
---- include/sm/conf.h.orig 2006-01-27 18:43:44.000000000 +0000
+--- include/sm/conf.h.orig 2007-03-21 16:56:18.000000000 -0700
+++ include/sm/conf.h
-@@ -801,7 +801,11 @@ extern unsigned int sleepX __P((unsigned
+@@ -806,7 +806,11 @@ extern unsigned int sleepX __P((unsigned
# ifndef LA_TYPE
# define LA_TYPE LA_SUBR
# endif /* ! LA_TYPE */
-+#if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900)
-+# define SFS_TYPE SFS_STATVFS /* use <sys/statvfs.h> statfs() impl */
-+#else
- # define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */
-+#endif
+-# define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */
++# if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900)
++# define SFS_TYPE SFS_STATVFS /* use <sys/statvfs.h> statfs() impl */
++# else
++# define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */
++# endif
# define SPT_TYPE SPT_PSSTRINGS /* use PS_STRINGS pointer */
# endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(DARWIN)*/
diff -r 1164bf5356f9 -r 7ffb00ab44f3 mail/sendmail/patches/patch-ai
--- a/mail/sendmail/patches/patch-ai Thu Apr 26 01:24:29 2007 +0000
+++ b/mail/sendmail/patches/patch-ai Thu Apr 26 06:26:27 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.6 2006/06/07 14:48:28 joerg Exp $
+$NetBSD: patch-ai,v 1.7 2007/04/26 06:26:27 jnemeth Exp $
---- sendmail/mci.c.orig 2005-07-12 22:27:44.000000000 +0000
+--- sendmail/mci.c.orig 2006-08-15 16:24:57.000000000 -0700
+++ sendmail/mci.c
-@@ -20,6 +20,7 @@ SM_RCSID("@(#)$Id: mci.c,v 8.216 2005/07
+@@ -20,6 +20,7 @@ SM_RCSID("@(#)$Id: mci.c,v 8.218 2006/08
#endif /* NETINET || NETINET6 */
#include <dirent.h>
@@ -22,7 +22,7 @@
if (HostStatDir == NULL || mci->mci_host == NULL)
return EX_OK;
-@@ -1135,7 +1140,7 @@ mci_traverse_persistent(action, pathname
+@@ -1143,7 +1148,7 @@ mci_traverse_persistent(action, pathname
pathname, sm_errstring(errno));
return -1;
}
@@ -31,7 +31,7 @@
if (sm_strlcpy(newpath, pathname, len) >= len)
{
if (tTd(56, 2))
-@@ -1145,6 +1150,7 @@ mci_traverse_persistent(action, pathname
+@@ -1153,6 +1158,7 @@ mci_traverse_persistent(action, pathname
}
newptr = newpath + strlen(newpath);
*newptr++ = '/';
@@ -39,12 +39,12 @@
/*
** repeat until no file has been removed
-@@ -1161,9 +1167,8 @@ mci_traverse_persistent(action, pathname
+@@ -1169,9 +1175,8 @@ mci_traverse_persistent(action, pathname
if (e->d_name[0] == '.')
continue;
- (void) sm_strlcpy(newptr, e->d_name,
-- sizeof newpath -
+- sizeof(newpath) -
- (newptr - newpath));
+ if (sm_strlcpy(newptr, e->d_name, len) >= len)
+ continue;
diff -r 1164bf5356f9 -r 7ffb00ab44f3 mail/sendmail/patches/patch-ak
--- a/mail/sendmail/patches/patch-ak Thu Apr 26 01:24:29 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
Home |
Main Index |
Thread Index |
Old Index