From owner-freebsd-security@FreeBSD.ORG Thu Mar 23 13:57:16 2006 Return-Path: X-Original-To: freebsd-security@freebsd.org Delivered-To: freebsd-security@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 869B216A424 for ; Thu, 23 Mar 2006 13:57:16 +0000 (UTC) (envelope-from oleg.khomichenko@gmail.com) Received: from xproxy.gmail.com (xproxy.gmail.com [66.249.82.202]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFFC543D45 for ; Thu, 23 Mar 2006 13:57:15 +0000 (GMT) (envelope-from oleg.khomichenko@gmail.com) Received: by xproxy.gmail.com with SMTP id r21so317376wxc for ; Thu, 23 Mar 2006 05:57:15 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=T/ooHW5adtj57l9BfXelyqiy9J0HVJilc497WVo+bA9geIER/j9qC3EL9Lsui2X5U4zofHpLZHcf9y4QunD3139porrN7vuepluvHhCMRb5vXx3nP1Bm6P0mq4D2ieVnshcBwx0d0flsggDz8d5BibfjdrVQhaguAyQ4Wbk8xN4= Received: by 10.70.95.14 with SMTP id s14mr2493142wxb; Thu, 23 Mar 2006 05:57:15 -0800 (PST) Received: by 10.70.61.14 with HTTP; Thu, 23 Mar 2006 05:57:15 -0800 (PST) Message-ID: <2b861f820603230557i585f269dh4e6227ef2887f0cd@mail.gmail.com> Date: Thu, 23 Mar 2006 15:57:15 +0200 From: "Oleg Khomichenko" To: freebsd-security@freebsd.org In-Reply-To: <200603221611.k2MGBV8j010104@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline References: <200603221611.k2MGBV8j010104@freefall.freebsd.org> Subject: Re: FreeBSD Security Advisory FreeBSD-SA-06:13.sendmail X-BeenThere: freebsd-security@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Security issues \[members-only posting\]" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Mar 2006 13:57:16 -0000 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D > Announced: 2006-03-22 > Affects: All FreeBSD releases. 15:33 [p2]root@alfa:/usr/src>uname -a FreeBSD xxxx.xxxxxxx.xxxxxx 4.11-STABLE FreeBSD 4.11-STABLE #1: Mon Apr 11 18:42:41 EEST 2005 =20 xxxx@xxxx.xxxxxxx.xxx.xx:/usr/obj/usr/src/sys/ALFA i386 15:36 [p2]root@alfa:/usr/src>sendmail -d0.1 Version 8.13.3 When I try to check patch (patch -C), I receive many "Hunk #n failed at nn." see below. Is it problem or no and I can continue and vulnerability will be removed? Script started on Thu Mar 23 15:30:22 2006 Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/libsm/fflush.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/libsm/fflush.c,v |retrieving revision 1.1.1.3 |diff -u -I__FBSDID -r1.1.1.3 fflush.c |--- contrib/sendmail/libsm/fflush.c=0911 Jun 2002 21:11:58 -0000=091.1.1.3 |+++ contrib/sendmail/libsm/fflush.c=0921 Mar 2006 12:43:09 -0000 -------------------------- Patching file contrib/sendmail/libsm/fflush.c using Plan A... Hunk #1 succeeded at 145. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/libsm/local.h |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/libsm/local.h,v |retrieving revision 1.1.1.7 |diff -u -I__FBSDID -r1.1.1.7 local.h |--- contrib/sendmail/libsm/local.h=091 Aug 2004 01:04:45 -0000=091.1.1.7 |+++ contrib/sendmail/libsm/local.h=0921 Mar 2006 12:43:09 -0000 -------------------------- Patching file contrib/sendmail/libsm/local.h using Plan A... Hunk #1 succeeded at 192. Hunk #2 succeeded at 276. Hunk #3 succeeded at 289. Hunk #4 succeeded at 308. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/libsm/refill.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/libsm/refill.c,v |retrieving revision 1.1.1.5 |diff -u -I__FBSDID -r1.1.1.5 refill.c |--- contrib/sendmail/libsm/refill.c=091 Aug 2004 01:04:45 -0000=091.1.1.5 |+++ contrib/sendmail/libsm/refill.c=0921 Mar 2006 12:43:09 -0000 -------------------------- Patching file contrib/sendmail/libsm/refill.c using Plan A... Hunk #1 succeeded at 76. Hunk #2 succeeded at 97. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/src/collect.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/src/collect.c,v |retrieving revision 1.1.1.19 |diff -u -I__FBSDID -r1.1.1.19 collect.c |--- contrib/sendmail/src/collect.c=091 Aug 2004 01:04:20 -0000=091.1.1.19 |+++ contrib/sendmail/src/collect.c=0921 Mar 2006 12:43:10 -0000 -------------------------- Patching file contrib/sendmail/src/collect.c using Plan A... Hunk #1 failed at 15. Hunk #2 succeeded at 262. Hunk #3 failed at 283. Hunk #4 succeeded at 319. Hunk #5 succeeded at 339. Hunk #6 succeeded at 362. Hunk #7 succeeded at 527 (offset -1 lines). Hunk #8 succeeded at 582 (offset -1 lines). Hunk #9 succeeded at 622 (offset -1 lines). Hunk #10 succeeded at 649 (offset -1 lines). Hunk #11 succeeded at 720 (offset -1 lines). Hunk #12 succeeded at 805 (offset -1 lines). Hunk #13 succeeded at 828 (offset -1 lines). Hunk #14 failed at 928. 3 out of 14 hunks failed--saving rejects to contrib/sendmail/src/collect.c.= rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/src/conf.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/src/conf.c,v |retrieving revision 1.26 |diff -u -I__FBSDID -r1.26 conf.c |--- contrib/sendmail/src/conf.c=091 Aug 2004 01:16:16 -0000=091.26 |+++ contrib/sendmail/src/conf.c=0921 Mar 2006 12:43:12 -0000 -------------------------- Patching file contrib/sendmail/src/conf.c using Plan A... Hunk #1 succeeded at 5299 (offset 9 lines). Hunk #2 succeeded at 5324 (offset 9 lines). Hunk #3 succeeded at 5367 (offset 9 lines). Hunk #4 succeeded at 5432 (offset 9 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/src/deliver.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/src/deliver.c,v |retrieving revision 1.1.1.21 |diff -u -I__FBSDID -r1.1.1.21 deliver.c |--- contrib/sendmail/src/deliver.c=091 Aug 2004 01:04:23 -0000=091.1.1.21 |+++ contrib/sendmail/src/deliver.c=0921 Mar 2006 12:43:15 -0000 -------------------------- Patching file contrib/sendmail/src/deliver.c using Plan A... Hunk #1 succeeded at 3257. Hunk #2 succeeded at 4437 (offset 6 lines). Hunk #3 succeeded at 4453 (offset 6 lines). Hunk #4 succeeded at 4494 (offset 6 lines). Hunk #5 succeeded at 4507 (offset 6 lines). Hunk #6 succeeded at 4518 (offset 6 lines). Hunk #7 succeeded at 4556 (offset 6 lines). Hunk #8 succeeded at 4590 (offset 6 lines). Hunk #9 succeeded at 4636 (offset 6 lines). Hunk #10 succeeded at 4658 (offset 6 lines). Hunk #11 succeeded at 4750 (offset 6 lines). Hunk #12 succeeded at 4762 (offset 6 lines). Hunk #13 succeeded at 4772 (offset 6 lines). Hunk #14 succeeded at 4805 (offset 6 lines). Hunk #15 succeeded at 4866 (offset 6 lines). Hunk #16 succeeded at 4881 (offset 6 lines). Hunk #17 succeeded at 4906 (offset 6 lines). Hunk #18 succeeded at 4923 (offset 6 lines). Hunk #19 succeeded at 4949 (offset 6 lines). Hunk #20 succeeded at 4958 (offset 6 lines). Hunk #21 succeeded at 4970 (offset 6 lines). Hunk #22 succeeded at 4985 (offset 6 lines). Hunk #23 succeeded at 5544 (offset 6 lines). Hunk #24 succeeded at 6103 (offset 1 line). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/src/headers.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/src/headers.c,v |retrieving revision 1.20 |diff -u -I__FBSDID -r1.20 headers.c |--- contrib/sendmail/src/headers.c=091 Aug 2004 01:16:16 -0000=091.20 |+++ contrib/sendmail/src/headers.c=0921 Mar 2006 12:43:15 -0000 -------------------------- Patching file contrib/sendmail/src/headers.c using Plan A... Hunk #1 succeeded at 19. Hunk #2 succeeded at 994. Hunk #3 succeeded at 1002. Hunk #4 succeeded at 1543. Hunk #5 succeeded at 1684. Hunk #6 succeeded at 1744. Hunk #7 succeeded at 1764. Hunk #8 succeeded at 1782. Hunk #9 succeeded at 1811. Hunk #10 succeeded at 1845. Hunk #11 succeeded at 1856. Hunk #12 succeeded at 1872. Hunk #13 succeeded at 2017. Hunk #14 succeeded at 2024. Hunk #15 succeeded at 2047. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/src/mime.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/src/mime.c,v |retrieving revision 1.1.1.12 |diff -u -I__FBSDID -r1.1.1.12 mime.c |--- contrib/sendmail/src/mime.c=091 Aug 2004 01:04:28 -0000=091.1.1.12 |+++ contrib/sendmail/src/mime.c=0921 Mar 2006 12:43:16 -0000 -------------------------- Patching file contrib/sendmail/src/mime.c using Plan A... Hunk #1 succeeded at 86. Hunk #2 succeeded at 299. Hunk #3 succeeded at 309. Hunk #4 succeeded at 322. Hunk #5 succeeded at 352. Hunk #6 succeeded at 382. Hunk #7 succeeded at 492. Hunk #8 succeeded at 506. Hunk #9 succeeded at 520. Hunk #10 succeeded at 534. Hunk #11 succeeded at 565. Hunk #12 succeeded at 589. Hunk #13 succeeded at 618. Hunk #14 succeeded at 648. Hunk #15 succeeded at 687. Hunk #16 succeeded at 984 (offset 4 lines). Hunk #17 succeeded at 1001 (offset 4 lines). Hunk #18 succeeded at 1034 (offset 4 lines). Hunk #19 succeeded at 1122 (offset 4 lines). Hunk #20 succeeded at 1160 (offset 4 lines). Hunk #21 succeeded at 1180 (offset 4 lines). Hunk #22 succeeded at 1191 (offset 4 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/src/parseaddr.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/src/parseaddr.c,v |retrieving revision 1.1.1.20 |diff -u -I__FBSDID -r1.1.1.20 parseaddr.c |--- contrib/sendmail/src/parseaddr.c=091 Aug 2004 01:04:28 -0000=091.1.1.2= 0 |+++ contrib/sendmail/src/parseaddr.c=0921 Mar 2006 12:43:17 -0000 -------------------------- Patching file contrib/sendmail/src/parseaddr.c using Plan A... Hunk #1 succeeded at 1337. Hunk #2 succeeded at 1352. Hunk #3 succeeded at 1407. Hunk #4 succeeded at 1509. Hunk #5 succeeded at 2936. Hunk #6 succeeded at 3150. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/src/savemail.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/src/savemail.c,v |retrieving revision 1.16 |diff -u -I__FBSDID -r1.16 savemail.c |--- contrib/sendmail/src/savemail.c=091 Aug 2004 01:16:16 -0000=091.16 |+++ contrib/sendmail/src/savemail.c=0921 Mar 2006 12:43:18 -0000 -------------------------- Patching file contrib/sendmail/src/savemail.c using Plan A... Hunk #1 succeeded at 15 with fuzz 2. Hunk #2 succeeded at 432. Hunk #3 succeeded at 733. Hunk #4 succeeded at 758. Hunk #5 succeeded at 776. Hunk #6 succeeded at 803. Hunk #7 succeeded at 858. Hunk #8 succeeded at 888. Hunk #9 succeeded at 913. Hunk #10 succeeded at 932. Hunk #11 succeeded at 986. Hunk #12 succeeded at 1016. Hunk #13 succeeded at 1029. Hunk #14 succeeded at 1046. Hunk #15 succeeded at 1063. Hunk #16 succeeded at 1085. Hunk #17 succeeded at 1104. Hunk #18 succeeded at 1148. Hunk #19 succeeded at 1157. Hunk #20 succeeded at 1207. Hunk #21 succeeded at 1222 (offset 3 lines). Hunk #22 succeeded at 1242 (offset 3 lines). Hunk #23 succeeded at 1257 (offset 3 lines). Hunk #24 succeeded at 1270 (offset 3 lines). Hunk #25 succeeded at 1280 (offset 3 lines). Hunk #26 succeeded at 1293 (offset 3 lines). Hunk #27 succeeded at 1304 (offset 3 lines). Hunk #28 succeeded at 1313 (offset 3 lines). Hunk #29 succeeded at 1347 (offset 3 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/src/sendmail.h |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/src/sendmail.h,v |retrieving revision 1.1.1.23 |diff -u -I__FBSDID -r1.1.1.23 sendmail.h |--- contrib/sendmail/src/sendmail.h=091 Aug 2004 01:04:33 -0000=091.1.1.23 |+++ contrib/sendmail/src/sendmail.h=0921 Mar 2006 12:43:19 -0000 -------------------------- Patching file contrib/sendmail/src/sendmail.h using Plan A... Hunk #1 succeeded at 809 (offset 1 line). Hunk #2 succeeded at 870 (offset 1 line). Hunk #3 succeeded at 965 (offset 1 line). Hunk #4 succeeded at 1649 (offset 3 lines). Hunk #5 succeeded at 2142 (offset 2 lines). Hunk #6 succeeded at 2516 (offset 4 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/src/sfsasl.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/src/sfsasl.c,v |retrieving revision 1.1.1.14 |diff -u -I__FBSDID -r1.1.1.14 sfsasl.c |--- contrib/sendmail/src/sfsasl.c=091 Aug 2004 01:04:33 -0000=091.1.1.14 |+++ contrib/sendmail/src/sfsasl.c=0921 Mar 2006 12:43:20 -0000 -------------------------- Patching file contrib/sendmail/src/sfsasl.c using Plan A... Hunk #1 succeeded at 541 (offset 25 lines). Hunk #2 succeeded at 680 (offset 25 lines). Hunk #3 succeeded at 748 (offset 25 lines). Hunk #4 succeeded at 790 (offset 25 lines). Hunk #5 succeeded at 855 (offset 25 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/src/sfsasl.h |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/src/sfsasl.h,v |retrieving revision 1.1.1.4 |diff -u -I__FBSDID -r1.1.1.4 sfsasl.h |--- contrib/sendmail/src/sfsasl.h=0911 Jun 2002 21:11:52 -0000=091.1.1.4 |+++ contrib/sendmail/src/sfsasl.h=0921 Mar 2006 12:43:20 -0000 -------------------------- Patching file contrib/sendmail/src/sfsasl.h using Plan A... Hunk #1 succeeded at 17. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/src/srvrsmtp.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/src/srvrsmtp.c,v |retrieving revision 1.1.1.20 |diff -u -I__FBSDID -r1.1.1.20 srvrsmtp.c |--- contrib/sendmail/src/srvrsmtp.c=091 Aug 2004 01:04:35 -0000=091.1.1.20 |+++ contrib/sendmail/src/srvrsmtp.c=0921 Mar 2006 12:43:22 -0000 -------------------------- Patching file contrib/sendmail/src/srvrsmtp.c using Plan A... Hunk #1 succeeded at 503. Hunk #2 succeeded at 1692. Hunk #3 succeeded at 1726. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/src/usersmtp.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/src/usersmtp.c,v |retrieving revision 1.1.1.18 |diff -u -I__FBSDID -r1.1.1.18 usersmtp.c |--- contrib/sendmail/src/usersmtp.c=091 Aug 2004 01:04:36 -0000=091.1.1.18 |+++ contrib/sendmail/src/usersmtp.c=0921 Mar 2006 12:43:23 -0000 -------------------------- Patching file contrib/sendmail/src/usersmtp.c using Plan A... Hunk #1 failed at 19. Hunk #2 succeeded at 2492. Hunk #3 succeeded at 2627 (offset 14 lines). Hunk #4 succeeded at 2650 (offset 14 lines). Hunk #5 succeeded at 2696 (offset 14 lines). Hunk #6 failed at 2748. 2 out of 6 hunks failed--saving rejects to contrib/sendmail/src/usersmtp.c.= rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: contrib/sendmail/src/util.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/contrib/sendmail/src/util.c,v |retrieving revision 1.1.1.17 |diff -u -I__FBSDID -r1.1.1.17 util.c |--- contrib/sendmail/src/util.c=091 Aug 2004 01:04:36 -0000=091.1.1.17 |+++ contrib/sendmail/src/util.c=0921 Mar 2006 12:43:24 -0000 -------------------------- Patching file contrib/sendmail/src/util.c using Plan A... Hunk #1 succeeded at 456 (offset 1 line). Hunk #2 succeeded at 972 (offset 1 line). Hunk #3 succeeded at 1002 (offset 1 line). Hunk #4 succeeded at 1060 (offset 1 line). Hunk #5 succeeded at 1072 (offset 1 line). Hunk #6 succeeded at 1083 (offset 1 line). Hunk #7 succeeded at 1103 (offset 1 line). Hunk #8 succeeded at 1126 (offset 1 line). Hunk #9 succeeded at 1141 (offset 1 line). Hunk #10 succeeded at 1161 (offset 1 line). Hunk #11 succeeded at 1171 (offset 1 line). Hunk #12 succeeded at 1182 (offset 1 line). Hunk #13 succeeded at 1193 (offset 1 line). Hunk #14 succeeded at 2402 (offset 1 line). done exit Script done on Thu Mar 23 15:30:43 2006