Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Nov 2007 22:12:17 GMT
From:      John Birrell <jb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 128704 for review
Message-ID:  <200711052212.lA5MCH01035906@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=128704

Change 128704 by jb@jb_freebsd1 on 2007/11/05 22:11:46

	IFC

Affected files ...

.. //depot/projects/dtrace/ports/Mk/bsd.gcc.mk#7 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/CACerts#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/FREEBSD-upgrade#7 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/INSTALL#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/RELEASE_NOTES#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/cf/cf/submit.cf#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/cf/feature/ldap_routing.m4#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/cf/m4/proto.m4#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/cf/m4/version.m4#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/contrib/buildvirtuser#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/doc/op/op.me#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/editmap/editmap.c#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/include/sm/conf.h#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/include/sm/ldap.h#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/include/sm/tailq.h#2 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libmilter/engine.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libmilter/listener.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libmilter/main.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libmilter/monitor.c#2 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libmilter/smfi.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libsm/ldap.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libsm/mpeix.c#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/makemap/makemap.c#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/praliases/praliases.c#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/Makefile.m4#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/conf.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/deliver.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/envelope.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/headers.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/macro.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/main.c#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/map.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/milter.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/mime.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/parseaddr.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/queue.c#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/readcf.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/recipient.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/sendmail.8#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/sendmail.h#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/sm_resolve.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/srvrsmtp.c#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/usersmtp.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/util.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/version.c#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/vacation/vacation.c#5 integrate
.. //depot/projects/dtrace/src/etc/network.subr#11 integrate
.. //depot/projects/dtrace/src/etc/sendmail/freebsd.mc#7 integrate
.. //depot/projects/dtrace/src/etc/sendmail/freebsd.submit.mc#7 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#11 integrate
.. //depot/projects/dtrace/src/share/doc/legal/intel_wpi/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#21 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#22 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#20 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#20 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#11 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i80321/ep80219_machdep.c#7 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq31244_machdep.c#12 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/kcondvar.h#2 integrate
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mutex.h#2 integrate
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/rwlock.h#2 integrate
.. //depot/projects/dtrace/src/sys/compat/pecoff/imgact_pecoff.c#5 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/imgact_svr4.c#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/wpi/LICENSE#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#26 edit
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 edit
.. //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_sbus.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ukbd.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/wpi/if_wpireg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/wpi/if_wpivar.h#1 branch
.. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#20 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#18 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/imgact_coff.c#6 integrate
.. //depot/projects/dtrace/src/sys/i386/linux/imgact_linux.c#5 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#11 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/imgact_aout.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/imgact_elf.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/imgact_gzip.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exec.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_fork.c#21 edit
.. //depot/projects/dtrace/src/sys/kern/kern_kse.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_proc.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sig.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thr.c#19 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thread.c#15 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#25 integrate
.. //depot/projects/dtrace/src/sys/modules/wpi/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/wpifw/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#17 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/machdep.c#10 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#8 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/machdep.c#9 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#12 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/machdep.c#13 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#24 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#25 integrate
.. //depot/projects/dtrace/src/sys/sys/signalvar.h#5 integrate
.. //depot/projects/dtrace/src/sys/vm/pmap.h#7 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_extern.h#4 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_glue.c#10 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_map.c#12 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_page.c#23 integrate
.. //depot/projects/dtrace/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#6 integrate
.. //depot/projects/dtrace/www/de/developers.sgml#5 integrate
.. //depot/projects/dtrace/www/de/docs/books.sgml#10 integrate
.. //depot/projects/dtrace/www/de/index.xsl#14 integrate
.. //depot/projects/dtrace/www/de/ports/Makefile#3 integrate
.. //depot/projects/dtrace/www/de/share/sgml/news.xml#14 integrate
.. //depot/projects/dtrace/www/de/share/sgml/press.xml#13 integrate
.. //depot/projects/dtrace/www/de/where.sgml#11 integrate

Differences ...

==== //depot/projects/dtrace/ports/Mk/bsd.gcc.mk#7 (text+ko) ====

@@ -31,7 +31,7 @@
 # If you are wondering what your port exactly does, use "make test-gcc"
 # to see some debugging.
 #
-# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.14 2007/07/27 21:40:10 pav Exp $
+# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.15 2007/11/05 19:26:16 gerald Exp $
 #
 
 GCC_Include_MAINTAINER=		gerald@FreeBSD.org
@@ -40,7 +40,7 @@
 # All GCC versions supported by the ports framework.
 # Please keep them in ascending order.
 #
-GCCVERSIONS=	020702 020801 029500 030200 030301 030402 040000 040100 040200
+GCCVERSIONS=	020702 020801 029500 030200 030301 030402 040100 040200
 
 #
 # Versions of GCC shipped.
@@ -55,7 +55,6 @@
 GCCVERSION_030200=	500039 501103 3.2
 GCCVERSION_030301=	501103 502126 3.3
 GCCVERSION_030402=	502126 700042 3.4
-GCCVERSION_040000=	999999 999999 4.0
 GCCVERSION_040100=	999999 999999 4.1
 GCCVERSION_040200=	700042 999999 4.2
 

==== //depot/projects/dtrace/src/contrib/sendmail/CACerts#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $Id: CACerts,v 8.1 2004/03/01 22:05:47 ca Exp $
+# $Id: CACerts,v 8.3 2007/06/11 22:04:46 ca Exp $
 # This file contains some CA certificates that are used to sign the
 # certificates of mail servers of members of the sendmail consortium
 # who may reply to questions etc sent to sendmail.org.
@@ -78,73 +78,6 @@
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=California, L=Emeryville, O=gshapiro.net, CN=Certificate Authority/emailAddress=certificates@gshapiro.net
-        Validity
-            Not Before: Jan  1 04:39:54 2002 GMT
-            Not After : Dec 31 04:39:54 2006 GMT
-        Subject: C=US, ST=California, L=Emeryville, O=gshapiro.net, CN=Certificate Authority/emailAddress=certificates@gshapiro.net
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:aa:dd:a2:fe:3b:fa:2f:5c:3d:f1:e1:d4:1d:55:
-                    04:27:6b:01:62:00:d7:02:cb:74:47:69:84:d7:c6:
-                    c5:71:55:79:35:3a:a8:ce:de:48:23:53:80:3c:cd:
-                    54:2e:e9:fe:b1:76:5a:be:cb:fd:2d:dc:a3:36:c5:
-                    c7:1e:4e:ef:76:f0:55:8f:a0:a5:f8:07:c5:52:1d:
-                    a2:42:81:4d:8a:c8:42:3f:f3:01:80:f9:46:35:a6:
-                    bc:c0:9b:9f:33:8b:49:9b:1d:87:8f:19:48:15:21:
-                    23:57:df:6e:4d:03:ed:ae:9f:0b:91:b7:a9:47:66:
-                    f1:0d:1b:1c:5d:b4:57:60:c7
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-            A0:6D:E0:06:AF:61:94:B4:C6:84:15:B4:8B:74:22:67:4A:43:60:CA
-            X509v3 Authority Key Identifier: 
-            keyid:A0:6D:E0:06:AF:61:94:B4:C6:84:15:B4:8B:74:22:67:4A:43:60:CA
-            DirName:/C=US/ST=California/L=Emeryville/O=gshapiro.net/CN=Certificate Authority/emailAddress=certificates@gshapiro.net
-            serial:00
-
-            X509v3 Basic Constraints: 
-            CA:TRUE
-    Signature Algorithm: md5WithRSAEncryption
-        87:27:d2:2a:3a:dc:04:cd:ef:e8:7b:1c:34:47:2e:13:34:a5:
-        08:f9:4d:df:d8:e1:6d:e6:9a:db:38:ee:20:6d:4a:ae:6f:1e:
-        bc:71:61:a4:b4:d6:40:24:ee:65:ca:e9:81:5a:ef:ee:62:57:
-        70:05:46:91:6b:d0:c6:a6:e9:38:65:ae:ea:50:b3:5c:27:c4:
-        7a:bd:95:8c:cb:45:ef:fc:fc:99:e5:6a:61:c3:44:77:d8:1f:
-        d6:b4:17:44:15:9a:bc:26:5b:ec:4e:29:5d:fd:cf:61:f3:be:
-        91:a4:3b:51:e6:73:5b:17:82:9d:5a:56:2c:63:c2:f1:d6:a2:
-        4c:5a
------BEGIN CERTIFICATE-----
-MIIDoTCCAwqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCkNhbGlmb3JuaWExEzARBgNVBAcTCkVtZXJ5dmlsbGUxFTATBgNV
-BAoTDGdzaGFwaXJvLm5ldDEeMBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5
-MSgwJgYJKoZIhvcNAQkBFhljZXJ0aWZpY2F0ZXNAZ3NoYXBpcm8ubmV0MB4XDTAy
-MDEwMTA0Mzk1NFoXDTA2MTIzMTA0Mzk1NFowgZgxCzAJBgNVBAYTAlVTMRMwEQYD
-VQQIEwpDYWxpZm9ybmlhMRMwEQYDVQQHEwpFbWVyeXZpbGxlMRUwEwYDVQQKEwxn
-c2hhcGlyby5uZXQxHjAcBgNVBAMTFUNlcnRpZmljYXRlIEF1dGhvcml0eTEoMCYG
-CSqGSIb3DQEJARYZY2VydGlmaWNhdGVzQGdzaGFwaXJvLm5ldDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAqt2i/jv6L1w98eHUHVUEJ2sBYgDXAst0R2mE18bF
-cVV5NTqozt5II1OAPM1ULun+sXZavsv9LdyjNsXHHk7vdvBVj6Cl+AfFUh2iQoFN
-ishCP/MBgPlGNaa8wJufM4tJmx2HjxlIFSEjV99uTQPtrp8LkbepR2bxDRscXbRX
-YMcCAwEAAaOB+DCB9TAdBgNVHQ4EFgQUoG3gBq9hlLTGhBW0i3QiZ0pDYMowgcUG
-A1UdIwSBvTCBuoAUoG3gBq9hlLTGhBW0i3QiZ0pDYMqhgZ6kgZswgZgxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRMwEQYDVQQHEwpFbWVyeXZpbGxl
-MRUwEwYDVQQKEwxnc2hhcGlyby5uZXQxHjAcBgNVBAMTFUNlcnRpZmljYXRlIEF1
-dGhvcml0eTEoMCYGCSqGSIb3DQEJARYZY2VydGlmaWNhdGVzQGdzaGFwaXJvLm5l
-dIIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAIcn0io63ATN7+h7
-HDRHLhM0pQj5Td/Y4W3mmts47iBtSq5vHrxxYaS01kAk7mXK6YFa7+5iV3AFRpFr
-0Mam6ThlrupQs1wnxHq9lYzLRe/8/JnlamHDRHfYH9a0F0QVmrwmW+xOKV39z2Hz
-vpGkO1Hmc1sXgp1aVixjwvHWokxa
------END CERTIFICATE-----
-
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 0 (0x0)
-        Signature Algorithm: md5WithRSAEncryption
         Issuer: C=US, ST=Illinois, L=De Kalb, O=Northern Illinois University, OU=Computer Science, CN=Neil Rickert/emailAddress=rickert@cs.niu.edu
         Validity
             Not Before: May 12 00:40:50 2000 GMT
@@ -210,93 +143,94 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 0 (0x0)
+        Serial Number:
+            fa:7c:2c:80:29:3f:c2:64
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2003/emailAddress=ca+ca-rsa2003@esmtp.org
+        Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2007/emailAddress=ca+ca-rsa2007@esmtp.org
         Validity
-            Not Before: Aug  7 15:56:45 2003 GMT
-            Not After : Aug  6 15:56:45 2006 GMT
-        Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2003/emailAddress=ca+ca-rsa2003@esmtp.org
+            Not Before: May  4 02:07:56 2007 GMT
+            Not After : May  3 02:07:56 2010 GMT
+        Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2007/emailAddress=ca+ca-rsa2007@esmtp.org
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (2048 bit)
                 Modulus (2048 bit):
-                    00:aa:37:0f:09:a9:1c:e3:1a:0c:fe:bd:6c:37:a4:
-                    cf:87:db:af:6b:b4:19:d4:11:db:c6:56:ca:39:80:
-                    c6:a4:38:b0:bc:ac:7e:be:71:30:86:2c:dc:fa:b5:
-                    fd:58:23:a0:c1:ad:11:53:85:ca:fb:e6:d8:7e:28:
-                    eb:84:3b:cd:a3:fa:28:a5:cb:c7:b2:54:99:3e:40:
-                    2a:27:43:4b:0c:26:4b:af:97:3d:92:82:d9:eb:2c:
-                    7f:77:fd:b8:cd:7e:1e:04:81:17:3c:e2:44:68:ce:
-                    88:66:02:90:24:35:24:c4:4c:ad:77:04:1a:3a:d5:
-                    59:28:28:03:da:03:9d:f4:2e:52:6e:b5:36:96:4b:
-                    14:f8:fc:8e:c6:d3:9b:e2:80:90:8b:71:d7:d0:5c:
-                    43:b2:49:f1:5a:26:f3:5d:9e:3b:01:98:db:e3:ed:
-                    5e:8d:dd:cf:aa:68:9d:0b:c9:e2:4e:fc:16:44:72:
-                    93:07:62:18:05:c1:47:81:3c:3d:e4:e4:22:da:2c:
-                    d6:4a:44:52:06:7a:83:b5:e9:52:38:97:2f:75:a6:
-                    5c:6f:87:8a:8d:83:f4:d0:04:a5:34:18:5e:a1:06:
-                    16:b3:54:ce:64:47:ca:70:56:a3:6f:b9:7f:af:91:
-                    76:78:70:b4:ab:ae:8e:d5:22:26:57:b1:ba:e7:4b:
-                    18:21
+                    00:b0:28:91:31:af:82:ce:72:ef:36:ab:7d:e9:b1:
+                    f5:77:66:38:4b:38:1f:5f:3d:12:d3:c8:fd:9a:f4:
+                    d4:f6:b8:90:f9:26:5f:29:f7:43:f9:34:ec:65:62:
+                    01:bb:64:f1:5d:ea:75:04:3d:92:65:60:a2:06:62:
+                    fa:88:ca:d8:20:50:c8:1e:38:53:b5:18:dd:b7:bd:
+                    c7:08:35:4c:d9:dc:c6:97:56:37:b6:65:33:74:5a:
+                    b2:c3:85:08:2b:b7:26:70:ff:38:02:1a:67:6a:d0:
+                    49:18:10:4b:f8:db:af:06:9c:b1:a8:82:a1:b1:75:
+                    d2:52:9b:53:0c:ca:a7:e3:15:38:79:6d:a1:f5:ef:
+                    7c:8b:fd:bd:04:78:f9:e8:1e:b9:92:ea:74:d7:45:
+                    1e:4c:c8:bd:f4:5c:fc:1a:7f:e7:31:c6:ab:cb:78:
+                    c7:4d:2f:b5:72:10:35:27:4a:1a:fa:53:19:f8:a7:
+                    59:63:eb:e9:15:ab:dc:71:69:8c:42:1c:96:4e:89:
+                    80:66:c9:9e:21:d5:3d:08:19:74:a5:f5:07:a0:ae:
+                    de:79:af:fd:42:c2:79:7e:8c:f8:39:22:3b:c3:c4:
+                    58:3b:d0:0d:e6:a9:11:b6:a2:cd:2e:e5:16:66:fd:
+                    7e:65:33:94:b0:36:80:27:f5:80:76:a9:e5:df:f2:
+                    cf:ef
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-            3A:12:03:DB:0F:9E:28:45:A6:34:8D:38:AB:BA:47:8C:2A:A0:E4:2E
+                B2:49:6B:52:45:EE:90:36:D2:79:47:03:33:D9:A0:BA:80:50:DA:1C
             X509v3 Authority Key Identifier: 
-            keyid:3A:12:03:DB:0F:9E:28:45:A6:34:8D:38:AB:BA:47:8C:2A:A0:E4:2E
-            DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=Claus Assmann CA RSA 2003/emailAddress=ca+ca-rsa2003@esmtp.org
-            serial:00
+                keyid:B2:49:6B:52:45:EE:90:36:D2:79:47:03:33:D9:A0:BA:80:50:DA:1C
+                DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=Claus Assmann CA RSA 2007/emailAddress=ca+ca-rsa2007@esmtp.org
+                serial:FA:7C:2C:80:29:3F:C2:64
 
             X509v3 Basic Constraints: 
-            CA:TRUE
+                CA:TRUE
             X509v3 Subject Alternative Name: 
-            email:ca+ca-rsa2003@esmtp.org
+                email:ca+ca-rsa2007@esmtp.org
             X509v3 Issuer Alternative Name: 
-            email:ca+ca-rsa2003@esmtp.org
+                email:ca+ca-rsa2007@esmtp.org
     Signature Algorithm: md5WithRSAEncryption
-        96:83:b6:54:93:df:38:d0:48:a7:a1:c8:08:c9:0f:e9:80:05:
-        e3:7e:c3:61:51:88:7b:7a:bb:24:b0:69:a3:22:e4:98:38:da:
-        c8:c3:eb:52:70:63:e2:66:f2:59:ef:56:be:aa:7c:87:6e:94:
-        85:d4:71:ba:35:f7:ee:d0:6e:52:1d:1f:e4:fd:2f:e2:70:31:
-        5d:b7:8b:13:cc:70:10:21:fa:34:29:8f:8d:d8:4a:c7:0f:b2:
-        36:e7:1e:1e:46:d1:11:84:80:7c:bb:24:c4:63:be:2a:24:53:
-        74:0c:89:e0:6a:f4:08:63:bf:54:d3:0a:d9:fc:fe:6c:de:4f:
-        97:61:08:a0:10:92:eb:af:06:ec:50:86:c4:cc:6b:31:32:60:
-        25:7a:09:47:f8:42:7a:a2:d5:90:fa:48:be:bf:0a:e1:03:b8:
-        56:24:b9:12:e9:ba:09:30:47:be:a5:8e:a2:92:a4:dc:a6:a7:
-        c6:29:39:65:6e:64:4a:1b:b2:c3:07:29:f5:c0:7e:78:e0:22:
-        9b:98:d4:87:91:ca:e1:66:9d:2f:70:f1:4c:a5:8e:2e:68:52:
-        b3:bd:95:76:56:40:0e:46:47:e4:b3:ec:aa:3c:e8:86:96:5a:
-        ed:fa:c9:10:95:53:04:13:71:01:91:ce:cd:3a:51:c6:30:e9:
-        48:49:64:a3
+        98:98:7c:d3:d0:5b:72:47:15:e6:22:68:bb:78:0e:78:66:e9:
+        56:16:d8:bc:9d:5a:dc:27:29:fb:91:2d:6a:21:35:18:56:b4:
+        4f:2a:09:c0:08:6f:9a:59:2b:2e:72:9a:fb:50:ba:c7:a9:91:
+        a0:f9:6c:be:cf:78:42:43:02:70:53:97:ba:6a:e3:da:17:e8:
+        1f:c7:3a:5b:e7:bc:eb:e5:24:4c:f5:cf:61:34:1e:20:ed:17:
+        63:ef:81:d3:9e:25:fe:cc:05:19:cc:8a:82:c9:4c:3a:b5:6b:
+        49:51:76:46:02:aa:60:bb:c4:b9:61:48:33:da:79:8d:46:a3:
+        06:20:98:f3:b2:db:3b:ad:c9:1d:0e:97:3d:b7:14:19:d3:7d:
+        04:8b:6a:81:e0:11:5b:e1:35:a3:ff:2f:11:86:1c:31:85:7a:
+        fd:3f:36:ef:99:25:46:2e:b0:cb:43:45:4a:ec:be:d3:3f:a4:
+        77:9b:79:cc:ce:92:63:a5:d9:ed:db:a0:9d:5d:7c:d7:80:f6:
+        c9:41:fb:02:96:8e:fd:f3:da:05:9d:81:a7:25:da:26:35:3b:
+        a9:0c:8c:f5:a7:5d:48:ec:87:c7:7a:60:51:76:f2:de:9b:14:
+        2b:55:8a:43:df:99:19:f3:eb:e7:03:e6:a7:a2:a2:28:dd:d5:
+        07:6a:3f:f7
 -----BEGIN CERTIFICATE-----
-MIIFFzCCA/+gAwIBAgIBADANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCEJlcmtlbGV5MRQwEgYDVQQK
-EwtFbmRtYWlsIE9yZzEMMAoGA1UECxMDTVRBMSIwIAYDVQQDExlDbGF1cyBBc3Nt
-YW5uIENBIFJTQSAyMDAzMSYwJAYJKoZIhvcNAQkBFhdjYStjYS1yc2EyMDAzQGVz
-bXRwLm9yZzAeFw0wMzA4MDcxNTU2NDVaFw0wNjA4MDYxNTU2NDVaMIGlMQswCQYD
+MIIFJzCCBA+gAwIBAgIJAPp8LIApP8JkMA0GCSqGSIb3DQEBBAUAMIGlMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIQmVya2VsZXkx
 FDASBgNVBAoTC0VuZG1haWwgT3JnMQwwCgYDVQQLEwNNVEExIjAgBgNVBAMTGUNs
-YXVzIEFzc21hbm4gQ0EgUlNBIDIwMDMxJjAkBgkqhkiG9w0BCQEWF2NhK2NhLXJz
-YTIwMDNAZXNtdHAub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-qjcPCakc4xoM/r1sN6TPh9uva7QZ1BHbxlbKOYDGpDiwvKx+vnEwhizc+rX9WCOg
-wa0RU4XK++bYfijrhDvNo/oopcvHslSZPkAqJ0NLDCZLr5c9koLZ6yx/d/24zX4e
-BIEXPOJEaM6IZgKQJDUkxEytdwQaOtVZKCgD2gOd9C5SbrU2lksU+PyOxtOb4oCQ
-i3HX0FxDsknxWibzXZ47AZjb4+1ejd3PqmidC8niTvwWRHKTB2IYBcFHgTw95OQi
-2izWSkRSBnqDtelSOJcvdaZcb4eKjYP00ASlNBheoQYWs1TOZEfKcFajb7l/r5F2
-eHC0q66O1SImV7G650sYIQIDAQABo4IBTjCCAUowHQYDVR0OBBYEFDoSA9sPnihF
-pjSNOKu6R4wqoOQuMIHSBgNVHSMEgcowgceAFDoSA9sPnihFpjSNOKu6R4wqoOQu
-oYGrpIGoMIGlMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8G
-A1UEBxMIQmVya2VsZXkxFDASBgNVBAoTC0VuZG1haWwgT3JnMQwwCgYDVQQLEwNN
-VEExIjAgBgNVBAMTGUNsYXVzIEFzc21hbm4gQ0EgUlNBIDIwMDMxJjAkBgkqhkiG
-9w0BCQEWF2NhK2NhLXJzYTIwMDNAZXNtdHAub3JnggEAMAwGA1UdEwQFMAMBAf8w
-IgYDVR0RBBswGYEXY2ErY2EtcnNhMjAwM0Blc210cC5vcmcwIgYDVR0SBBswGYEX
-Y2ErY2EtcnNhMjAwM0Blc210cC5vcmcwDQYJKoZIhvcNAQEEBQADggEBAJaDtlST
-3zjQSKehyAjJD+mABeN+w2FRiHt6uySwaaMi5Jg42sjD61JwY+Jm8lnvVr6qfIdu
-lIXUcbo19+7QblIdH+T9L+JwMV23ixPMcBAh+jQpj43YSscPsjbnHh5G0RGEgHy7
-JMRjviokU3QMieBq9Ahjv1TTCtn8/mzeT5dhCKAQkuuvBuxQhsTMazEyYCV6CUf4
-Qnqi1ZD6SL6/CuEDuFYkuRLpugkwR76ljqKSpNymp8YpOWVuZEobssMHKfXAfnjg
-IpuY1IeRyuFmnS9w8Uylji5oUrO9lXZWQA5GR+Sz7Ko86IaWWu36yRCVUwQTcQGR
-zs06UcYw6UhJZKM=
+YXVzIEFzc21hbm4gQ0EgUlNBIDIwMDcxJjAkBgkqhkiG9w0BCQEWF2NhK2NhLXJz
+YTIwMDdAZXNtdHAub3JnMB4XDTA3MDUwNDAyMDc1NloXDTEwMDUwMzAyMDc1Nlow
+gaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhC
+ZXJrZWxleTEUMBIGA1UEChMLRW5kbWFpbCBPcmcxDDAKBgNVBAsTA01UQTEiMCAG
+A1UEAxMZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAwNzEmMCQGCSqGSIb3DQEJARYX
+Y2ErY2EtcnNhMjAwN0Blc210cC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCwKJExr4LOcu82q33psfV3ZjhLOB9fPRLTyP2a9NT2uJD5Jl8p90P5
+NOxlYgG7ZPFd6nUEPZJlYKIGYvqIytggUMgeOFO1GN23vccINUzZ3MaXVje2ZTN0
+WrLDhQgrtyZw/zgCGmdq0EkYEEv4268GnLGogqGxddJSm1MMyqfjFTh5baH173yL
+/b0EePnoHrmS6nTXRR5MyL30XPwaf+cxxqvLeMdNL7VyEDUnShr6Uxn4p1lj6+kV
+q9xxaYxCHJZOiYBmyZ4h1T0IGXSl9Qegrt55r/1Cwnl+jPg5IjvDxFg70A3mqRG2
+os0u5RZm/X5lM5SwNoAn9YB2qeXf8s/vAgMBAAGjggFWMIIBUjAdBgNVHQ4EFgQU
+sklrUkXukDbSeUcDM9mguoBQ2hwwgdoGA1UdIwSB0jCBz4AUsklrUkXukDbSeUcD
+M9mguoBQ2hyhgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9y
+bmlhMREwDwYDVQQHEwhCZXJrZWxleTEUMBIGA1UEChMLRW5kbWFpbCBPcmcxDDAK
+BgNVBAsTA01UQTEiMCAGA1UEAxMZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAwNzEm
+MCQGCSqGSIb3DQEJARYXY2ErY2EtcnNhMjAwN0Blc210cC5vcmeCCQD6fCyAKT/C
+ZDAMBgNVHRMEBTADAQH/MCIGA1UdEQQbMBmBF2NhK2NhLXJzYTIwMDdAZXNtdHAu
+b3JnMCIGA1UdEgQbMBmBF2NhK2NhLXJzYTIwMDdAZXNtdHAub3JnMA0GCSqGSIb3
+DQEBBAUAA4IBAQCYmHzT0FtyRxXmImi7eA54ZulWFti8nVrcJyn7kS1qITUYVrRP
+KgnACG+aWSsucpr7ULrHqZGg+Wy+z3hCQwJwU5e6auPaF+gfxzpb57zr5SRM9c9h
+NB4g7Rdj74HTniX+zAUZzIqCyUw6tWtJUXZGAqpgu8S5YUgz2nmNRqMGIJjzsts7
+rckdDpc9txQZ030Ei2qB4BFb4TWj/y8RhhwxhXr9PzbvmSVGLrDLQ0VK7L7TP6R3
+m3nMzpJjpdnt26CdXXzXgPbJQfsClo7989oFnYGnJdomNTupDIz1p11I7IfHemBR
+dvLemxQrVYpD35kZ8+vnA+anoqIo3dUHaj/3
 -----END CERTIFICATE-----

==== //depot/projects/dtrace/src/contrib/sendmail/FREEBSD-upgrade#7 (text+ko) ====

@@ -1,6 +1,6 @@
-$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.33 2007/04/09 01:46:43 gshapiro Exp $
+$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.34 2007/11/05 00:21:32 gshapiro Exp $
 
-sendmail 8.14.1
+sendmail 8.14.2
 	originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
 
 For the import of sendmail, the following files were removed:
@@ -21,8 +21,8 @@
 
 Imported using:
 
-	cvs import -m 'Import sendmail 8.14.1' \
-		src/contrib/sendmail SENDMAIL v8_14_1
+	cvs import -m 'Import sendmail 8.14.2' \
+		src/contrib/sendmail SENDMAIL v8_14_2
 
 After importing, bump the version of src/etc/sendmail/freebsd*mc
 so mergemaster will merge /etc/mail/freebsd*cf:
@@ -97,4 +97,4 @@
 	usr.sbin/mailwrapper/Makefile
 
 gshapiro@FreeBSD.org
-08-April-2007
+04-November-2007

==== //depot/projects/dtrace/src/contrib/sendmail/INSTALL#4 (text+ko) ====

@@ -12,13 +12,13 @@
 2. Create any necessary site configuration build files, as noted in
    devtools/Site/README.
 
-3. In the sendmail/ directory, run "sh Build" (see sendmail/README for
+3. In the sendmail/ directory, run "sh ./Build" (see sendmail/README for
    details).
 
 4. Change to the cf/cf/ directory (that's not a typo): Copy whichever .mc
    file best matches your environment to sendmail.mc.  Next, tailor it
    as explained in cf/README.  Then run
-   "sh Build sendmail.cf".
+   "sh ./Build sendmail.cf".
 
 5. Back up your current /etc/mail/sendmail.cf and the sendmail binary (whose
    location varies from operating system to operating system, but is usually
@@ -26,21 +26,21 @@
 
 6. Install sendmail.cf as /etc/mail/sendmail.cf and submit.cf as
    /etc/mail/submit.cf.  This can be done in the cf/cf by using
-   "sh Build install-cf".
+   "sh ./Build install-cf".
 
    Please read sendmail/SECURITY before continuing; you have to create a
    new user smmsp and a new group smmsp for the default installation.
    Then install the sendmail binary built in step 3 by cd-ing back to
-   sendmail/ and running "sh Build install".
+   sendmail/ and running "sh ./Build install".
 
 7. For each of the associated sendmail utilities (makemap, mailstats,
    etc.), read the README in the utility's directory if it exists.  When
-   you are ready to install it, back up your installed version and type "sh
-   Build install".
+   you are ready to install it, back up your installed version and type
+   "sh ./Build install".
 
 8. If you are upgrading from an older version of sendmail and are using any
    database maps, be sure to rebuild them with the new version of makemap,
    in case you are now using a different (and thereby incompatible) version
    of Berkeley DB.
 
-$Revision: 8.15 $, Last updated $Date: 2002/05/28 18:09:25 $
+$Revision: 8.16 $, Last updated $Date: 2007/10/03 21:00:28 $

==== //depot/projects/dtrace/src/contrib/sendmail/RELEASE_NOTES#6 (text+ko) ====

@@ -1,11 +1,76 @@
 			SENDMAIL RELEASE NOTES
-      $Id: RELEASE_NOTES,v 8.1888 2007/04/03 23:28:40 ca Exp $
+      $Id: RELEASE_NOTES,v 8.1909 2007/10/31 16:04:13 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.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
+		"mistaken" for internal control characters during a queue
+		run and trigger various consistency checks.  Problem
+		noted by Neil Rickert of Northern Illinois University.
+	If MaxMimeHeaderLength is set to a value greater than 0 (which
+		it is by default) then even if the Linelimit parameter
+		is 0, sendmail corrupted in the non-transfer-encoding
+		case every MAXLINE-1 characters.  Patch from John Gardiner
+		Myers of Proofpoint.
+	Setting the suboption DeliveryMode for DaemonPortOptions did not
+		work in earlier 8.14 versions.
+	Note: DeliveryMode=interactive is silently converted to
+		background if a milter can reject or delete a recipient.
+		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 
+		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.
+	When multiple results are requested for a DNS map lookup
+		(-z and -Z), return only those that are relevant for
+		the query (not also those in the "additional section".)
+	If the message transfer time to sendmail (when acting as server)
+		exceeds Timeout.queuewarn or Timeout.queuereturn and
+		the message is refused (by a milter), sendmail previously
+		created a delivery status notification (DSN).  Patch
+		from Doug Heath of The Hertz Corporation.
+	A code change in Cyrus-SASL 2.1.22 for sasl_decode64() requires
+		the MTA to deal with some input (i.e., "=") itself.
+		Problem noted by Eliot Lear.
+	sendmail counted a delivery as successful if PIPELINING is
+		compiled in but not offered by the server and the
+		delivery failed temporarily.  Patch from Werner Wiethege.
+	If getting the result of an LDAP query times out then close the
+		map so it will be reopened on the next lookup.  This
+		should help "failover" configurations that specify more
+		than one LDAP server.
+	If check_compat returns $#discard then a "savemail panic" could
+		be triggered under some circumstances (e.g., requiring
+		a system which does not have the compile time flag
+		HASFLOCK set). Based on patch by Motonori Nakamura
+		of National Institute of Informatics, Japan.
+	If a milter rejected a recipient, the count for nrcpts= in the
+		logfile entry might have been wrong.  Problem found by
+		Petra Humann of TU Dresden.
+	If a milter invoked smfi_chgfrom() where ESMTP arguments are not
+		NULL, the message body was lost.  Patch from Motonori
+		Nakamura of National Institute of Informatics, Japan.
+	sendmail(8) had a bogus space in -qGname.  Patch from Peng Haitao.
+	CONTRIB: buildvirtuser: Preserve ownership and permissions when
+		replacing files.
+	CONTRIB: buildvirtuser: Skip dot-files (e.g., .cvsignore) when
+		reading the /etc/mail/virtusers/ directory.
+	CONTRIB: buildvirtuser: Emit warnings instead of exiting where
+		appropriate.
+	LIBMILTER: Fix ABI backwards compatibility so milters compiled
+		against an older libmilter.so shared library can use an
+		8.14 libmilter.so shared library.
+	LIBMILTER: smfi_version() did not properly extract the patchlevel
+		from the version number, however, the returned value was
+		correct for the current libmilter version.
+
 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

==== //depot/projects/dtrace/src/contrib/sendmail/cf/cf/submit.cf#6 (text+ko) ====

@@ -16,8 +16,8 @@
 #####
 #####		SENDMAIL CONFIGURATION FILE
 #####
-##### built by ca@nother.smi.sendmail.com on Tue Apr 3 16:32:55 PDT 2007
-##### in /extra/home/ca/sm-8.14.1/OpenSource/sendmail-8.14.1/cf/cf
+##### 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
 ##### 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.730 2007/02/01 18:50:03 ca Exp $  #####
+#####  $Id: proto.m4,v 8.732 2007/04/20 00:53:30 ca Exp $  #####
 
 # level 10 config file format
 V10/Berkeley
@@ -114,7 +114,7 @@
 
 
 # Configuration version number
-DZ8.14.1/Submit
+DZ8.14.2/Submit
 
 
 ###############

==== //depot/projects/dtrace/src/contrib/sendmail/cf/feature/ldap_routing.m4#4 (text+ko) ====

@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999-2002, 2004 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2002, 2004, 2007 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
 #
 
 divert(0)
-VERSIONID(`$Id: ldap_routing.m4,v 8.14 2004/02/18 02:45:11 gshapiro Exp $')
+VERSIONID(`$Id: ldap_routing.m4,v 8.15 2007/05/01 17:38:25 ca Exp $')
 divert(-1)
 
 # Check first two arguments.  If they aren't set, may need to warn in proto.m4

==== //depot/projects/dtrace/src/contrib/sendmail/cf/m4/proto.m4#5 (text+ko) ====

@@ -13,7 +13,7 @@
 #
 divert(0)
 
-VERSIONID(`$Id: proto.m4,v 8.730 2007/02/01 18:50:03 ca Exp $')
+VERSIONID(`$Id: proto.m4,v 8.732 2007/04/20 00:53:30 ca Exp $')
 
 # level CF_LEVEL config file format
 V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley')
@@ -2962,9 +2962,9 @@
 R<$* _ATMPF_>	$#error $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl')
 dnl use the generic routine (for now)
 R<0>		$@ OK		no limit
-R<$+>		$: <$1> $| $(arith l $@ $&{client_rate} $@ $1 $)
+R<$+>		$: <$1> $| $(arith l $@ $1 $@ $&{client_rate} $)
 dnl log this? Connection rate $&{client_rate} exceeds limit $1.
-R<$+> $| FALSE	$#error $@ 4.3.2 $: _RATE_CONTROL_REPLY Connection rate limit exceeded.
+R<$+> $| TRUE	$#error $@ 4.3.2 $: _RATE_CONTROL_REPLY Connection rate limit exceeded.
 ')')
 
 ifdef(`_CONN_CONTROL_',`dnl
@@ -2984,9 +2984,9 @@
 R<$* _ATMPF_>	$#error $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl')
 dnl use the generic routine (for now)
 R<0>		$@ OK		no limit
-R<$+>		$: <$1> $| $(arith l $@ $&{client_connections} $@ $1 $)
+R<$+>		$: <$1> $| $(arith l $@ $1 $@ $&{client_connections} $)
 dnl log this: Open connections $&{client_connections} exceeds limit $1.
-R<$+> $| FALSE	$#error $@ 4.3.2 $: _CONN_CONTROL_REPLY Too many open connections.
+R<$+> $| TRUE	$#error $@ 4.3.2 $: _CONN_CONTROL_REPLY Too many open connections.
 ')')
 
 undivert(9)dnl LOCAL_RULESETS

==== //depot/projects/dtrace/src/contrib/sendmail/cf/m4/version.m4#6 (text+ko) ====

@@ -11,8 +11,8 @@
 # the sendmail distribution.
 #
 #
-VERSIONID(`$Id: version.m4,v 8.178 2007/04/03 21:21:18 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.186 2007/10/31 16:04:13 ca Exp $')
 #
 divert(0)
 # Configuration version number
-DZ8.14.1`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.14.2`'ifdef(`confCF_VERSION', `/confCF_VERSION')

==== //depot/projects/dtrace/src/contrib/sendmail/contrib/buildvirtuser#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (c) 1999-2003 Gregory Neil Shapiro.  All Rights Reserved.
+# Copyright (c) 1999-2004, 2007 Gregory Neil Shapiro.  All Rights Reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -27,7 +27,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-# $Id: buildvirtuser,v 1.6 2003/03/15 23:30:09 gshapiro Exp $
+# $Id: buildvirtuser,v 1.8 2007/10/08 18:44:15 gshapiro Exp $
 
 =head1 NAME
 
@@ -70,30 +70,21 @@
 
 =head1 EXAMPLES
 
-Here are some example files from the /etc/mail/virtusers/ directory:
+Here is an example file from the /etc/mail/virtusers/ directory:
 
-=head2 /etc/mail/virtusers/bsdunix.org:
+=head2 /etc/mail/virtusers/example.org:
 
  # Services
- MAILER-DAEMON	gshapiro+bounce.$DOMAIN@gshapiro.net
- postmaster	gshapiro+$LHS.$DOMAIN@gshapiro.net
- webmaster	gshapiro+$LHS.$DOMAIN@gshapiro.net
+ MAILER-DAEMON	gshapiro+bounce.$DOMAIN@example.net
+ postmaster	gshapiro+$LHS.$DOMAIN@example.net
+ webmaster	gshapiro+$LHS.$DOMAIN@example.net
  
  # Defaults
  		error:nouser No such user
  
  # Users
- gshapiro	gshapiro+$DOMAIN@gshapiro.net
- bob		robert@smtp.org
-
-=head2 /etc/mail/virtusers/smtp.org:
-
- # Defaults
- 		gshapiro+$DOMAIN@gshapiro.net
- 
- # Users
- john		john@wookie.org
- nancy		n@milter.com
+ gshapiro	gshapiro+$DOMAIN@example.net
+ zoe		zoe@example.com
 
 =head1 AUTHOR
 
@@ -102,6 +93,7 @@
 =cut
 
 use strict;
+use File::stat;
 use Getopt::Std;
 
 my $makemap = "/usr/sbin/makemap";
@@ -117,6 +109,18 @@
 my ($lhs, $domain, $key, $value);
 my $opts = {};
 
+sub preserve_perms ($$)
+{
+	my $old = shift;
+	my $new = shift;
+	my $st;
+
+	$st = stat($old);
+	return if (!defined($st));
+	chmod($st->mode, $new) || warn "Could not chmod($st->mode, $new): $!\n";
+	chown($st->uid, $st->gid, $new) || warn "Could not chmod($st->uid, $st->gid, $new): $!\n";
+}
+
 getopts('ft', $opts) || die "Usage: $0 [-f] [-t]\n";
 
 if ($opts->{t})
@@ -131,9 +135,12 @@
 
 foreach $domain (@virts)
 {
+	next if ($domain =~ m/^\./);
 	open(DOMAIN, "$virts/$domain") || die "Could not open file $virts/$domain: $!\n";
 	my $line = 0;
-	my $mtime = (stat(DOMAIN))[9] || 0;
+	my $mtime = 0;
+	my $st = stat("$virts/$domain");
+	$mtime = $st->mtime if (defined($st));
 	if ($mtime > $newest)
 	{
 		$newest = $mtime;
@@ -160,7 +167,7 @@
 		}
 		else
 		{
-			die "Bogus line $line in $virts/$domain\n";
+			warn "Bogus line $line in $virts/$domain\n";
 		}
 
 		# Variable subsitution
@@ -172,7 +179,9 @@
 	close(DOMAIN) || die "Could not close $virts/$domain: $!\n";
 }
 
-my $virtmtime = (stat($virt))[9] || 0;
+my $virtmtime = 0;
+my $st = stat($virt);
+$virtmtime = $st->mtime if (defined($st));
 if ($opts->{f} || $virtmtime < $newest)
 {
 	print STDOUT "Rebuilding $virt\n";
@@ -191,14 +200,17 @@
 		print MAKEMAP "$key\t\t$virt{$key}\n";
 	}
 	close(MAKEMAP) || die "Could not close makemap ($?): $!\n";
+	preserve_perms($virt, $newvirt);
 	rename($newvirt, $virt) || die "Could not rename $newvirt to $virt: $!\n";
 
 	open(VIRTHOST, ">$newvirthosts") || die "Could not open file $newvirthosts: $!\n";
 	foreach $domain (sort @virts)
 	{
+		next if ($domain =~ m/^\./);
 		print VIRTHOST "$domain\n";
 	}
 	close(VIRTHOST) || die "Could not close $newvirthosts: $!\n";
+	preserve_perms($virthosts, $newvirthosts);
 	rename($newvirthosts, $virthosts) || die "Could not rename $newvirthosts to $virthosts: $!\n";
 }
 exit 0;

==== //depot/projects/dtrace/src/contrib/sendmail/doc/op/op.me#5 (text+ko) ====

@@ -9,7 +9,7 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"	$Id: op.me,v 8.739 2007/03/22 17:56:01 ca Exp $
+.\"	$Id: op.me,v 8.741 2007/06/22 23:08:59 ca Exp $
 .\"
 .\" eqn op.me | pic | troff -me
 .\"
@@ -90,7 +90,7 @@
 .de Ve
 Version \\$2
 ..
-.Ve $Revision: 8.739 $
+.Ve $Revision: 8.741 $
 .rm Ve
 .sp
 For Sendmail Version 8.14
@@ -6939,6 +6939,10 @@
 .b \-v
 command line flag sets this to
 .b i .
+Note: for internal reasons,
+``i'' does not work
+if a milter is enabled which can reject or delete recipients.
+In that case the mode will be changed to ``b''.
 .ip DialDelay=\fIsleeptime\fP
 [no short name]
 Dial-on-demand network connections can see timeouts
@@ -8932,7 +8936,8 @@
 <status> ' ' <result>
 .)b
 
-The status indicator is one of the following upper case words:
+The status indicator specifies the result of the lookup operation itself
+and is one of the following upper case words:
 .(b
 .ta 9n
 OK	the key was found, result contains the looked up value
@@ -8944,13 +8949,19 @@
 
 In case of errors (status TEMP, TIMEOUT or PERM) the result field may 
 contain an explanatory message.
+However, the explanatory message is not used any further by
+.i sendmail .
 
 Example replies:
 .(b
 31:OK resolved.address@example.com,
 .)b
 
-in case of a successful lookup, or:
+.(b
+56:OK error:550 5.7.1 User does not accept mail from sender,
+.)b
+
+in case of successful lookups, or:
 .(b
 8:NOTFOUND, 
 .)b
@@ -8960,7 +8971,7 @@
 55:TEMP this text explains that we had a temporary failure,
 .)b
 
-in case of a failure.
+in case of a temporary map lookup failure.
 
 The socket map uses the same syntax as milters
 (see Section "X \*- Mail Filter (Milter) Definitions")
@@ -11424,7 +11435,7 @@
 .\".sz 10
 .\"Eric Allman
 .\".sp
-.\"Version $Revision: 8.739 $
+.\"Version $Revision: 8.741 $
 .\".ce 0
 .bp 3
 .ce

==== //depot/projects/dtrace/src/contrib/sendmail/editmap/editmap.c#4 (text+ko) ====

@@ -22,7 +22,7 @@
 #endif /* ! lint */
 
 #ifndef lint
-SM_UNUSED(static char id[]) = "@(#)$Id: editmap.c,v 1.24 2004/08/03 18:40:10 ca Exp $";
+SM_UNUSED(static char id[]) = "@(#)$Id: editmap.c,v 1.25 2007/05/11 18:50:35 ca Exp $";
 #endif /* ! lint */
 
 
@@ -46,7 +46,7 @@
 gid_t	RealGid;
 char	*RealUserName;
 uid_t	RunAsUid;
-uid_t	RunAsGid;
+gid_t	RunAsGid;
 char	*RunAsUserName;
 int	Verbose = 2;
 bool	DontInitGroups = false;

==== //depot/projects/dtrace/src/contrib/sendmail/include/sm/conf.h#5 (text+ko) ====

@@ -10,7 +10,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: conf.h,v 1.132 2007/03/21 23:56:18 ca Exp $
+ *	$Id: conf.h,v 1.134 2007/09/24 23:05:37 ca Exp $
  */
 
 /*
@@ -458,6 +458,9 @@
 #   if SOLARIS >= 21000 || (SOLARIS < 10000 && SOLARIS >= 210)
 #    define HASUNSETENV 1       /* unsetenv() added in S10 */
 #   endif /* SOLARIS >= 21000 || (SOLARIS < 10000 && SOLARIS >= 210) */
+#   if SOLARIS >= 21100 || (SOLARIS < 10000 && SOLARIS >= 211)
+#    define GETLDAPALIASBYNAME_VERSION 2	/* changed in S11 */
+#   endif /* SOLARIS >= 21100 || (SOLARIS < 10000 && SOLARIS >= 211) */
 #   ifndef HASGETUSERSHELL
 #    define HASGETUSERSHELL 0	/* getusershell(3) causes core dumps pre-2.7 */
 #   endif /* ! HASGETUSERSHELL */

==== //depot/projects/dtrace/src/contrib/sendmail/include/sm/ldap.h#5 (text+ko) ====

@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2001-2003, 2005, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001-2003, 2005-2007 Sendmail, Inc. and its suppliers.
  *      All rights reserved.
  *
  * By using this file, you agree to the terms and conditions set
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: ldap.h,v 1.32 2006/08/30 22:56:58 ca Exp $
+ *	$Id: ldap.h,v 1.33 2007/10/10 00:06:44 ca Exp $
  */
 
 #ifndef	SM_LDAP_H
@@ -91,6 +91,10 @@
 	/* ldapmap_lookup options */
 	char		ldap_attrsep;
 
+# if _FFR_LDAP_NETWORK_TIMEOUT
+	struct timeval	ldap_networktmo;
+# endif /* _FFR_LDAP_NETWORK_TIMEOUT */
+
 	/* Linked list of maps sharing the same LDAP binding */
 	void		*ldap_next;
 };

==== //depot/projects/dtrace/src/contrib/sendmail/include/sm/tailq.h#2 (text+ko) ====

@@ -36,8 +36,12 @@
 #define	SM_TAILQ_H_
 
 /*
+ * $Id: tailq.h,v 1.2 2007/06/29 23:09:57 ca Exp $
+ *
  * This file is a modified copy of queue.h from a BSD system:
  * we only need tail queues here.
+ * We do not use queue.h directly because there is a conflict with
+ * some versions of that file on some OSs.
  *
  * A tail queue is headed by a pair of pointers, one to the head of the
  * list and the other to the tail of the list. The elements are doubly

==== //depot/projects/dtrace/src/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 (text+ko) ====

@@ -2,7 +2,7 @@
 <HEAD><TITLE>xxfi_unknown</TITLE></HEAD>
 <BODY>
 <!--
-$Id: xxfi_unknown.html,v 1.3 2006/12/21 18:30:36 ca Exp $
+$Id: xxfi_unknown.html,v 1.4 2007/04/23 16:30:42 ca Exp $
 -->
 <H1>xxfi_unknown</H1>
 
@@ -53,12 +53,12 @@
   <TR bgcolor="#dddddd"><TH>Return value</TH><TH>Description</TH></TR>
   <TR valign="top">
      <TD>SMFIS_TEMPFAIL</TD>
-     <TD>Reject this message with a temporary error.
+     <TD>Reject this command with a temporary error.
      </TD>
   </TR>
   <TR valign="top">
      <TD>SMFIS_REJECT</TD>
-     <TD>Reject this message.
+     <TD>Reject this command.
      </TD>
   </TR>
 </TABLE>

==== //depot/projects/dtrace/src/contrib/sendmail/libmilter/engine.c#5 (text+ko) ====

@@ -9,7 +9,7 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711052212.lA5MCH01035906>