Date: Thu, 28 Aug 2008 19:06:26 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 148735 for review Message-ID: <200808281906.m7SJ6Qxb056618@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=148735 Change 148735 by ed@ed_dull on 2008/08/28 19:05:38 IFC. Affected files ... .. //depot/projects/mpsafetty/bin/sh/options.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/KNOWNBUGS#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/README#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/cf/README#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/libmilter/docs/smfi_version.html#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/libmilter/worker.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/makemap/makemap.8#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/smrsh/README#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/smrsh/smrsh.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/README#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/sfsasl.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/mpsafetty/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/mpsafetty/lib/libpcap/Makefile#2 integrate .. //depot/projects/mpsafetty/lib/libstand/mips/_setjmp.S#1 branch .. //depot/projects/mpsafetty/lib/libthread_db/arch/mips/libpthread_md.c#1 branch .. //depot/projects/mpsafetty/share/man/man9/Makefile#4 integrate .. //depot/projects/mpsafetty/share/man/man9/VOP_ATTRIB.9#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_smp.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#35 integrate .. //depot/projects/mpsafetty/sys/net/ethernet.h#2 integrate .. //depot/projects/mpsafetty/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_options.c#3 integrate .. //depot/projects/mpsafetty/tools/regression/bin/sh/builtins/getopts2.0#1 branch .. //depot/projects/mpsafetty/tools/regression/bin/sh/builtins/getopts2.0.stdout#1 branch Differences ... ==== //depot/projects/mpsafetty/bin/sh/options.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.27 2008/08/27 20:16:06 stefanf Exp $"); #include <signal.h> #include <unistd.h> @@ -338,6 +338,7 @@ shellparam.malloc = 1; shellparam.nparam = nparam; shellparam.p = newparam; + shellparam.reset = 1; shellparam.optnext = NULL; } @@ -405,7 +406,6 @@ if (*argptr != NULL) { setparam(argptr); } - shellparam.reset = 1; INTON; return 0; } ==== //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 (text+ko) ==== @@ -356,7 +356,7 @@ #define VOP_CLOSE(vp, f, c, o, cr) 0 #define VOP_PUTPAGE(vp, of, sz, fl, cr) 0 -#define VOP_GETATTR(vp, vap, fl, cr) ((vap)->va_size = (vp)->v_size, 0) +#define VOP_GETATTR(vp, vap, fl) ((vap)->va_size = (vp)->v_size, 0) #define VOP_FSYNC(vp, f, cr) fsync((vp)->v_fd) ==== //depot/projects/mpsafetty/contrib/sendmail/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,9 +1,13 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.34 2007/11/05 00:21:32 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.35 2008/08/28 06:20:43 gshapiro Exp $ -sendmail 8.14.2 +sendmail 8.14.3 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ -For the import of sendmail, the following files were removed: +For the import of sendmail, the following directories were renamed: + + sendmail -> src + +For the merge of sendmail, the following files were removed: Build cf/cf/Build @@ -15,23 +19,32 @@ sendmail/makesendmail sendmail/sysexits.h -The following directories were renamed: +Imported using the instructions at: - sendmail -> src +http://wiki.freebsd.org/SubversionPrimer/VendorImports -Imported using: +Then merged using: - cvs import -m 'Import sendmail 8.14.2' \ - src/contrib/sendmail SENDMAIL v8_14_2 +% set FSVN=svn+ssh://svn.freebsd.org/base +% svn checkout $FSVN/head/contrib/sendmail head +% cd head +% svn merge --accept=postpone $FSVN/vendor/sendmail/dist . +% svn rm --force */Build [e-v]*/*.0 cf/cf/generic-*.cf cf/cf/Build +% svn rm --force Build devtools doc/op/op.ps src/makesendmail src/sysexits.h +% svn propset -R svn:keywords FreeBSD=%H . +% svn propdel svn:keywords libmilter/docs/*.jpg +% svn diff --no-diff-deleted --old=$FSVN/vendor/sendmail/dist --new=. +% svn status +% svn diff +% svn commit After importing, bump the version of src/etc/sendmail/freebsd*mc so mergemaster will merge /etc/mail/freebsd*cf: - cvs commit -f src/etc/sendmail/freebsd*mc + (svn command TBD) cvs commit -f src/etc/sendmail/freebsd*mc -To make local changes to sendmail, simply patch and commit to the main -branch (aka HEAD). Never make local changes on the vendor (SENDMAIL) -branch. +To make local changes to sendmail, simply patch and commit to the head. +Never make local changes in the vendor area (/vendor/sendmail/). All local changes should be submitted to the Sendmail Consortium <sendmail@sendmail.org> for inclusion in the next vendor release. @@ -97,4 +110,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -04-November-2007 +27-August-2008 ==== //depot/projects/mpsafetty/contrib/sendmail/KNOWNBUGS#2 (text+ko) ==== @@ -47,6 +47,17 @@ but some characters might be lost. Fix: obey RFC (2)822 and do not send lines that are longer than 1000 characters. +* milter communication fails if a single header is larger than 64K. + + If a single header is larger than 64KB (which is not possible in the + default configuration) then it cannot be transferred in one block to + libmilter and hence the communication fails. This can be avoided by + increasing the constant MILTER_CHUNK_SIZE in + include/libmilter/mfdef.h and recompiling sendmail, libmilter, and + all (statically linked) milters (or by using an undocumented compile + time option: _FFR_MAXDATASIZE; you have to read the source code in + order to use this properly). + * Sender addresses whose domain part cause a temporary A record lookup failure but have a valid MX record will be temporarily rejected in the default configuration. Solution: fix the DNS at the sender side. @@ -247,4 +258,4 @@ be used if set instead of LOCAL_RELAY ($R). This will be fixed in a future version. -$Revision: 8.59 $, Last updated $Date: 2007/02/21 23:13:58 $ +$Revision: 8.60 $, Last updated $Date: 2007/12/04 01:16:50 $ ==== //depot/projects/mpsafetty/contrib/sendmail/PGPKEYS#2 (text+ko) ==== @@ -142,6 +142,69 @@ -----END PGP PUBLIC KEY BLOCK----- Type Bits KeyID Created Expires Algorithm Use +pub 1024 0xF6B30729 2008-01-18 ---------- RSA Sign & Encrypt +f16 Fingerprint16 = 07 FB 9A F9 F7 94 4B E4 0F 28 D1 8E 23 6F A2 B0 +uid Sendmail Signing Key/2008 <sendmail@Sendmail.ORG> + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.8 (Darwin) + +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 +5282RCnsKroyWAhV8KjoJer1hTKCsu58Lqrv +=jDs3 +-----END PGP PUBLIC KEY BLOCK----- + +Type Bits KeyID Created Expires Algorithm Use pub 1024 0x7093B841 2006-12-16 ---------- RSA Sign & Encrypt f16 Fingerprint16 = D9 FD C5 6B EE 1E 7A A8 CE 27 D9 B9 55 8B 56 B6 uid Sendmail Signing Key/2007 <sendmail@Sendmail.ORG> @@ -1729,4 +1792,4 @@ =nES8 -----END PGP PUBLIC KEY BLOCK----- -$Revision: 8.25 $, Last updated $Date: 2007/01/02 22:38:08 $ +$Revision: 8.26 $, Last updated $Date: 2008/01/22 06:20:27 $ ==== //depot/projects/mpsafetty/contrib/sendmail/README#2 (text+ko) ==== @@ -312,7 +312,7 @@ are installed in a location other than those which your compiler searches, you will need to provide that directory when building: - Build -I/path/to/include/directory + ./Build -I/path/to/include/directory If you are using Berkeley DB versions 1.85 or 1.86, you are *strongly* urged to upgrade to DB version 2 or later, available from @@ -464,4 +464,4 @@ test Some test scripts (currently only for compilation aids). vacation Source for the vacation program. NOT PART OF SENDMAIL! -$Revision: 8.93 $, Last updated $Date: 2005/09/16 20:08:50 $ +$Revision: 8.94 $, Last updated $Date: 2008/02/12 16:40:05 $ ==== //depot/projects/mpsafetty/contrib/sendmail/RELEASE_NOTES#2 (text+ko) ==== @@ -1,11 +1,47 @@ SENDMAIL RELEASE NOTES - $Id: RELEASE_NOTES,v 8.1909 2007/10/31 16:04:13 ca Exp $ + $Id: RELEASE_NOTES,v 8.1926 2008/05/03 03:34:26 ca Exp $ This listing shows the version of the sendmail binary, the version of the sendmail configuration files, the date of release, and a summary of the changes in that release. +8.14.3/8.14.3 2008/05/03 + During ruleset processing the generation of a key for a map + lookup and the parsing of the default value was broken + for some macros, e.g., $|, which caused the BlankSub + character to be inserted into the workspace and thus + failures, e.g., rules that should have matched did not. + 8.14.2 caused a regression: it accessed (macro) storage which was + freed before. First instance of the problem reported by + Matthew Dillon of DragonFlyBSD; variations of the same + bug reported by Todd C. Miller of OpenBSD, Moritz + Jodeit, and Dave Hayes. + Improve pathname length checks for persistent host status. Patch + from Joerg Sonnenberger of DragonFlyBSD. + Reword misleading SMTP reply text for FEATURE(`badmx'). Problem + noted by Beth Halsema. + The read timeout was fixed to be Timeout.datablock if STARTTLS + was activated. This may cause problems if that value + is lowered from its default. Problem noted by Jens Elkner. + CONFIG: Using LOCAL_TLS_CLIENT caused the tls_client ruleset + to operate incorrectly. Problem found by Werner Wiethege. + LIBMILTER: Omitting some protocol steps via the xxfi_negotiate() + callback did not work properly. The patchlevel of + libmilter has been set to 1 so a milter can determine + whether libmilter contains this fix. + MAKEMAP: If a delimiter is specified (-t) use that also when + dumping a map. Patch from Todd C. Miller of OpenBSD. + Portability: + Add support for Darwin 9.x (Mac OS X 10.5). + Support shared libraries in Darwin 8 and 9. Patch from + Chris Behrens of Concentric. + Add support for SCO OpenServer 6, patch from Boyd Gerber. + DEVTOOLS: Clarify that confSHAREDLIBDIR requires a trailing path. + Added Files: + devtools/OS/Darwin.9.x + devtools/OS/OSR.i386 + 8.14.2/8.14.2 2007/11/01 If a message was queued and it contained 8 bit characters in a From: or To: header, then those characters could be @@ -24,7 +60,7 @@ Prior to 8.14 this happened only if milter could delete recipients. ClientRate should trigger when the limit was exceeded (as - documented), not when it was reached. Patch from + documented), not when it was reached. Patch from John Beck of Sun Microsystems. Force a queue run for -qGqueuegroup even if no runners are specified (R=0) and forking (F=f) is requested. ==== //depot/projects/mpsafetty/contrib/sendmail/cf/README#2 (text+ko) ==== @@ -1008,7 +1008,9 @@ MASQUERADE_DOMAIN_FILE, see below). If VIRTUSER_DOMAIN or VIRTUSER_DOMAIN_FILE is used, then the entries of class {VirtHost} are added to class {R}, i.e., relaying is allowed - to (and from) those domains. The default map definition is: + to (and from) those domains, which by default includes also + all subdomains (see relay_hosts_only). The default map + definition is: hash /etc/mail/virtusertable @@ -4699,4 +4701,4 @@ 8 DNS based blacklists 9 special local rulesets (1 and 2) -$Revision: 8.722 $, Last updated $Date: 2007/04/03 21:26:58 $ +$Revision: 8.724 $, Last updated $Date: 2008/02/15 23:05:32 $ ==== //depot/projects/mpsafetty/contrib/sendmail/cf/cf/submit.cf#2 (text+ko) ==== @@ -16,8 +16,8 @@ ##### ##### SENDMAIL CONFIGURATION FILE ##### -##### built by ca@nother.smi.sendmail.com on Wed Oct 31 09:24:27 PDT 2007 -##### in /extra/home/ca/sm-8.14.2/OpenSource/sendmail-8.14.2/cf/cf +##### built by ca@wiz.smi.sendmail.com on Fri May 2 20:39:00 PDT 2008 +##### in /extra/home/ca/sm-8.14.3/OpenSource/sendmail-8.14.3/cf/cf ##### using ../ as configuration include directory ##### ###################################################################### @@ -35,7 +35,7 @@ ##### $Id: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $ ##### -##### $Id: proto.m4,v 8.732 2007/04/20 00:53:30 ca Exp $ ##### +##### $Id: proto.m4,v 8.734 2008/01/24 23:42:01 ca Exp $ ##### # level 10 config file format V10/Berkeley @@ -114,7 +114,7 @@ # Configuration version number -DZ8.14.2/Submit +DZ8.14.3/Submit ############### ==== //depot/projects/mpsafetty/contrib/sendmail/cf/m4/proto.m4#2 (text+ko) ==== @@ -13,7 +13,7 @@ # divert(0) -VERSIONID(`$Id: proto.m4,v 8.732 2007/04/20 00:53:30 ca Exp $') +VERSIONID(`$Id: proto.m4,v 8.734 2008/01/24 23:42:01 ca Exp $') # level CF_LEVEL config file format V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley') @@ -1956,7 +1956,7 @@ # Recursively run badmx check on each mx. R<MX><$*><:$+:$*><:$*> <MX><$1><:$3><: $4 $(badmx $2 $):> # See if any of them fail. -R<MX><$*><$*><$*<BADMX>:$*> $#error $@ 5.1.2 $:"550 Illegal MX record for recipient host "$1 +R<MX><$*><$*><$*<BADMX>:$*> $#error $@ 5.1.2 $:"550 Illegal MX record for host "$1 # Reverse the mxlists so we can use the same argument order again. R<MX><$*><$*><$*> $:<MX><$1><$3><$2> R<MX><$*><:$+:$*><:$*> <MX><$1><:$3><:$4 $(dnsA $2 $) :> @@ -1965,7 +1965,7 @@ R<MX><$*><$*><$*> $:<MX><$1><$3><$2> R<MX><$*><:$+:$*><:$*> <MX><$1><:$3><:$4 $(BadMXIP $2 $) :> -R<MX><$*><$*><$*<BADMXIP>:$*> $#error $@ 5.1.2 $:"550 Invalid MX record for recipient host "$1', +R<MX><$*><$*><$*<BADMXIP>:$*> $#error $@ 5.1.2 $:"550 Invalid MX record for host "$1', `dnl') @@ -2686,9 +2686,9 @@ dnl STARTTLS: called from smtp() after STARTTLS has been accepted Stls_client ifdef(`_LOCAL_TLS_CLIENT_', `dnl -R$* $: $1 $| $>"Local_tls_client" $1 -R$* $| $#$* $#$2 -R$* $| $* $: $1', `dnl') +R$* $: $1 <?> $>"Local_tls_client" $1 +R$* <?> $#$* $#$2 +R$* <?> $* $: $1', `dnl') ifdef(`_ACCESS_TABLE_', `dnl dnl store name of other side R$* $: $(macro {TLS_Name} $@ $&{server_name} $) $1 ==== //depot/projects/mpsafetty/contrib/sendmail/cf/m4/version.m4#2 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998-2007 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2008 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -11,8 +11,8 @@ # the sendmail distribution. # # -VERSIONID(`$Id: version.m4,v 8.186 2007/10/31 16:04:13 ca Exp $') +VERSIONID(`$Id: version.m4,v 8.195 2008/04/17 17:04:30 ca Exp $') # divert(0) # Configuration version number -DZ8.14.2`'ifdef(`confCF_VERSION', `/confCF_VERSION') +DZ8.14.3`'ifdef(`confCF_VERSION', `/confCF_VERSION') ==== //depot/projects/mpsafetty/contrib/sendmail/include/libmilter/mfapi.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2004, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2004, 2006, 2008 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -7,7 +7,7 @@ * the sendmail distribution. * * - * $Id: mfapi.h,v 8.77 2006/11/02 02:44:07 ca Exp $ + * $Id: mfapi.h,v 8.78 2008/02/27 22:30:34 ca Exp $ */ /* @@ -18,7 +18,7 @@ # define _LIBMILTER_MFAPI_H 1 #ifndef SMFI_VERSION -# define SMFI_VERSION 0x01000000 /* libmilter version number */ +# define SMFI_VERSION 0x01000001 /* libmilter version number */ #endif /* ! SMFI_VERSION */ #define SM_LM_VRS_MAJOR(v) (((v) & 0x7f000000) >> 24) ==== //depot/projects/mpsafetty/contrib/sendmail/libmilter/Makefile.m4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -dnl $Id: Makefile.m4,v 8.78 2007/02/05 19:21:29 ca Exp $ +dnl $Id: Makefile.m4,v 8.80 2008/04/08 05:23:44 ca Exp $ include(confBUILDTOOLSDIR`/M4/switch.m4') dnl only required for compilation of EXTRAS ==== //depot/projects/mpsafetty/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 (text+ko) ==== @@ -2,7 +2,7 @@ <HEAD><TITLE>smfi_opensocket</TITLE></HEAD> <BODY> <!-- -$Id: smfi_opensocket.html,v 1.6 2006/12/21 18:30:35 ca Exp $ +$Id: smfi_opensocket.html,v 1.7 2008/01/31 17:29:33 ca Exp $ --> <H1>smfi_opensocket</H1> @@ -24,16 +24,21 @@ <TABLE border="1" cellspacing=1 cellpadding=4> <TR align="left" valign=top> <TH width="80">Called When</TH> -<TD>Called only from program mainline, before calling -<TT>smfi_main()</TT>.</TD> +<TD>Called only from program mainline, +after calling <TT>smfi_setconn()</TT> and <TT>smfi_register()</TT>, +but before calling <TT>smfi_main()</TT>. +</TD> </TR> <TR align="left" valign=top> <TH width="80">Effects</TH> <TD>smfi_opensocket attempts to create the socket specified previously by a call to <TT>smfi_setconn()</TT> which will be the interface between MTAs -and the filter. This allows the calling application to ensure that the -socket can be created. If this is not called, <TT>smfi_main()</TT> will -do so implicitly. </TD> +and the filter. +This allows the calling application to ensure that the +socket can be created. +If this is not called, +<TT>smfi_main()</TT> will do so implicitly. +</TD> </TR> </TABLE> @@ -58,7 +63,8 @@ <LI>The interface socket could not be created for any reason. <LI><TT>rmsocket</TT> was <TT>true</TT>, and either the socket could not be examined, or exists and could not be removed. - <LI><TT>smfi_setconn()</TT> has not been called. + <LI><TT>smfi_setconn()</TT> or <TT>smfi_register()</TT> + have not been called. </UL> Otherwise, it will return MI_SUCCESS </TD> @@ -68,7 +74,7 @@ <HR size="1"> <FONT size="-1"> -Copyright (c) 2003 Sendmail, Inc. and its suppliers. +Copyright (c) 2003, 2008 Sendmail, Inc. and its suppliers. All rights reserved. <BR> By using this file, you agree to the terms and conditions set ==== //depot/projects/mpsafetty/contrib/sendmail/libmilter/docs/smfi_version.html#2 (text+ko) ==== @@ -2,7 +2,7 @@ <HEAD><TITLE>smfi_version()</TITLE></HEAD> <BODY> <!-- -$Id: smfi_version.html,v 1.5 2007/03/22 17:30:57 ca Exp $ +$Id: smfi_version.html,v 1.6 2008/05/02 23:06:26 ca Exp $ --> <H1>smfi_version()</H1> @@ -59,24 +59,30 @@ Note: the compile time version of libmilter is available in the macro <CODE>SMFI_VERSION</CODE>. -A milter can check this macro to determine which functions to use +To extract the major and minor version as well as the current patch level +from this macro, the macros +<CODE>SM_LM_VRS_MAJOR(v)</CODE>, +<CODE>SM_LM_VRS_MINOR(v)</CODE>, and +<CODE>SM_LM_VRS_PLVL(v)</CODE> +can be used, respectively. +A milter can check the +<CODE>SMFI_VERSION</CODE> +macro to determine which functions to use (at compile time via C preprocessor statements). Using this macro and the <CODE>smfi_version()</CODE> function, a milter can determine at runtime whether it has been (dynamically) linked against the expected libmilter version. -To extract the major and minor version as well as the current patch level -from this macro, the macros -<CODE>SM_LM_VRS_MAJOR(v)</CODE>, -<CODE>SM_LM_VRS_MINOR(v)</CODE>, and -<CODE>SM_LM_VRS_PLVL(v)</CODE> -can be used, respectively. +Such a function should only compare the major and minor version, +not the patch level, +i.e., the libmilter library will be compatible despite +different patch levels. <HR SIZE="1"> <FONT SIZE="-1"> -Copyright (c) 2006, 2007 Sendmail, Inc. and its suppliers. +Copyright (c) 2006-2008 Sendmail, Inc. and its suppliers. All rights reserved. <BR> By using this file, you agree to the terms and conditions set ==== //depot/projects/mpsafetty/contrib/sendmail/libmilter/engine.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2004, 2006, 2007 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2004, 2006-2008 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: engine.c,v 8.159 2007/04/23 22:22:50 ca Exp $") +SM_RCSID("@(#)$Id: engine.c,v 8.162 2008/02/27 01:34:14 ca Exp $") #include "libmilter.h" @@ -1001,6 +1001,7 @@ (long) ctx->ctx_id, ctx->ctx_mta_pflags, i); return _SMFIS_ABORT; } + fix_stm(ctx); if (ctx->ctx_dbg > 3) sm_dprintf("[%ld] milter_negotiate:" @@ -1725,9 +1726,9 @@ int n; int nerr = 0; #if SM_CONF_POLL - struct pollfd pfd; + struct pollfd pfd; #else /* SM_CONF_POLL */ - fd_set rd_set, exc_set; + fd_set rd_set, exc_set; #endif /* SM_CONF_POLL */ do ==== //depot/projects/mpsafetty/contrib/sendmail/libmilter/worker.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 2003-2004, 2007 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -11,7 +11,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: worker.c,v 8.9 2006/12/18 18:26:51 ca Exp $") +SM_RCSID("@(#)$Id: worker.c,v 8.10 2007/12/03 22:06:05 ca Exp $") #include "libmilter.h" @@ -263,8 +263,6 @@ return MI_FAILURE; } - POOL_LEV_DPRINTF(4, ("PIPE r=[%d] w=[%d]", RD_PIPE, WR_PIPE)); - (void) smutex_init(&Tskmgr.tm_w_mutex); (void) scond_init(&Tskmgr.tm_w_cond); ==== //depot/projects/mpsafetty/contrib/sendmail/mail.local/mail.local.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $FreeBSD: src/contrib/sendmail/mail.local/mail.local.c,v 1.27 2007/04/09 01:44:16 gshapiro Exp $ + * $FreeBSD: src/contrib/sendmail/mail.local/mail.local.c,v 1.28 2008/08/28 06:08:29 gshapiro Exp $ * */ @@ -20,7 +20,7 @@ Copyright (c) 1990, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.254 2006/10/12 22:23:45 ca Exp $") +SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.256 2008/02/19 07:13:30 gshapiro Exp $") #include <stdlib.h> #include <sm/errstring.h> @@ -81,6 +81,15 @@ # endif /* HASHSPOOLMD5 */ #endif /* HASHSPOOL */ +#if _FFR_SPOOL_PATH + /* + ** Override path to mail store at run time (using -p). + ** From: Eugene Grosbein of Svyaz Service JSC + ** See: http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/114195 + ** NOTE: Update man page before adding this to a release. + */ +#endif /* _FFR_SPOOL_PATH */ + #ifndef LOCKTO_RM # define LOCKTO_RM 300 /* timeout for stale lockfile removal */ @@ -231,7 +240,11 @@ #if HASHSPOOL while ((ch = getopt(argc, argv, "7BbdD:f:h:r:lH:p:ns")) != -1) #else /* HASHSPOOL */ +# if _FFR_SPOOL_PATH + while ((ch = getopt(argc, argv, "7BbdD:f:h:r:lp:s")) != -1) +# else /* _FFR_SPOOL_PATH */ while ((ch = getopt(argc, argv, "7BbdD:f:h:r:ls")) != -1) +# endif /* _FFR_SPOOL_PATH */ #endif /* HASHSPOOL */ { switch(ch) @@ -319,6 +332,12 @@ } break; + case 'n': + StripRcptDomain = false; + break; +#endif /* HASHSPOOL */ + +#if HASHSPOOL || _FFR_SPOOL_PATH case 'p': if (optarg == NULL || *optarg == '\0') { @@ -332,11 +351,7 @@ usage(); } break; - - case 'n': - StripRcptDomain = false; - break; -#endif /* HASHSPOOL */ +#endif /* HASHSPOOL || _FFR_SPOOL_PATH */ case '?': default: @@ -1582,7 +1597,11 @@ usage() { ExitVal = EX_USAGE; +# if _FFR_SPOOL_PATH + mailerr(NULL, "usage: mail.local [-7] [-B] [-b] [-d] [-l] [-s] [-f from|-r from] [-h filename] [-p path] user ..."); +# else /* _FFR_SPOOL_PATH */ mailerr(NULL, "usage: mail.local [-7] [-B] [-b] [-d] [-l] [-s] [-f from|-r from] [-h filename] user ..."); +# endif /* _FFR_SPOOL_PATH */ sm_exit(ExitVal); } ==== //depot/projects/mpsafetty/contrib/sendmail/makemap/makemap.8#2 (text+ko) ==== @@ -8,9 +8,9 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: makemap.8,v 8.30 2002/06/27 23:41:04 gshapiro Exp $ +.\" $Id: makemap.8,v 8.31 2008/05/02 23:07:48 ca Exp $ .\" -.TH MAKEMAP 8 "$Date: 2002/06/27 23:41:04 $" +.TH MAKEMAP 8 "$Date: 2008/05/02 23:07:48 $" .SH NAME makemap \- create database maps for sendmail @@ -156,7 +156,8 @@ links in world writable directories. .TP .B \-t -Use the specified delimiter instead of white space. +Use the specified delimiter instead of white space +(also for dumping a map). .TP .B \-u dump (unmap) the content of the database to standard output. ==== //depot/projects/mpsafetty/contrib/sendmail/makemap/makemap.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2002, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2002, 2004, 2008 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1992 Eric P. Allman. All rights reserved. * Copyright (c) 1992, 1993 @@ -20,7 +20,7 @@ Copyright (c) 1992, 1993\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.178 2007/05/11 18:45:39 ca Exp $") +SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.179 2008/04/14 02:06:16 ca Exp $") #include <sys/types.h> @@ -378,9 +378,10 @@ break; (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT, - "%.*s\t%.*s\n", + "%.*s%c%.*s\n", (int) db_key.size, (char *) db_key.data, + (sep != '\0') ? sep : '\t', (int) db_val.size, (char *)db_val.data); ==== //depot/projects/mpsafetty/contrib/sendmail/smrsh/README#2 (text+ko) ==== @@ -24,7 +24,7 @@ smrsh should build on most systems with the enclosed Build script: - host.domain% sh Build + host.domain% sh ./Build To compile smrsh.c by hand, use the following command: @@ -36,13 +36,13 @@ host.domain% cc -Bstatic -o smrsh smrsh.c or - host.domain% sh Build LDOPTS=-Bstatic + host.domain% sh ./Build LDOPTS=-Bstatic With gcc, the GNU C compiler, use the -static option. host.domain% cc -static -o smrsh smrsh.c or - host.domain% sh Build LDOPTS=-static + host.domain% sh ./Build LDOPTS=-static The following C defines can be set defined to change the search path and the bin directory used by smrsh. @@ -58,7 +58,7 @@ As root, install smrsh in /usr/libexec. Using the Build script: - host.domain# sh Build install + host.domain# sh ./Build install For manual installation: install smrsh in the /usr/libexec directory, with mode 511. @@ -163,4 +163,4 @@ host.domain# /usr/sbin/sendmail -bd -q30m -$Revision: 8.9 $, Last updated $Date: 2003/05/26 04:30:58 $ +$Revision: 8.10 $, Last updated $Date: 2008/02/12 16:40:06 $ ==== //depot/projects/mpsafetty/contrib/sendmail/smrsh/smrsh.c#2 (text+ko) ==== @@ -9,7 +9,6 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $FreeBSD: src/contrib/sendmail/smrsh/smrsh.c,v 1.19 2005/02/14 02:39:14 gshapiro Exp $ */ #include <sm/gen.h> ==== //depot/projects/mpsafetty/contrib/sendmail/src/Makefile.m4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -dnl $Id: Makefile.m4,v 8.112 2007/10/17 21:29:43 ca Exp $ +dnl $Id: Makefile.m4,v 8.115 2008/03/27 16:13:33 ca Exp $ include(confBUILDTOOLSDIR`/M4/switch.m4') define(`confREQUIRE_LIBSM', `true') ==== //depot/projects/mpsafetty/contrib/sendmail/src/README#2 (text+ko) ==== @@ -9,7 +9,7 @@ # the sendmail distribution. # # -# $Id: README,v 8.390 2006/11/13 22:27:27 ca Exp $ +# $Id: README,v 8.391 2008/02/12 16:38:21 ca Exp $ # This directory contains the source files for sendmail(TM). @@ -41,7 +41,7 @@ By far, the easiest way to compile sendmail is to use the "Build" >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808281906.m7SJ6Qxb056618>