ftp'd the appropriate file for 4.7release [FreeBSD 4.7] # fetch ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/patches/SA-03:15/openssh47.patch
and when I try to patch I get this: Hmm... Looks like a new-style context diff to me... The text leading up to this was: -------------------------- |Index: crypto/openssh/auth-chall.c |=================================================================== |RCS file: /home/ncvs/src/crypto/openssh/auth-chall.c,v |retrieving revision 1.2.2.3 |retrieving revision 1.2.2.3.2.1 |diff -p -c -r1.2.2.3 -r1.2.2.3.2.1 |*** crypto/openssh/auth-chall.c 3 Jul 2002 22:11:41 -0000 1.2.2.3 |--- crypto/openssh/auth-chall.c 24 Sep 2003 19:50:39 -0000 1.2.2.3.2.1 -------------------------- Patching file crypto/openssh/auth-chall.c using Plan A... Hunk #1 succeeded at 80. Hmm... The next patch looks like a new-style context diff to me... The text leading up to this was: -------------------------- |Index: crypto/openssh/auth.h |=================================================================== |RCS file: /home/ncvs/src/crypto/openssh/auth.h,v |retrieving revision 1.1.1.1.2.5 |retrieving revision 1.1.1.1.2.5.2.1 |diff -p -c -r1.1.1.1.2.5 -r1.1.1.1.2.5.2.1 |*** crypto/openssh/auth.h 3 Jul 2002 22:11:41 -0000 1.1.1.1.2.5 |--- crypto/openssh/auth.h 24 Sep 2003 19:50:39 -0000 1.1.1.1.2.5.2.1 -------------------------- Patching file crypto/openssh/auth.h using Plan A... Hunk #1 succeeded at 160. Hmm... The next patch looks like a new-style context diff to me... The text leading up to this was: -------------------------- |Index: crypto/openssh/auth1.c |=================================================================== |RCS file: /home/ncvs/src/crypto/openssh/auth1.c,v |retrieving revision 1.3.2.8 |retrieving revision 1.3.2.8.2.1 |diff -p -c -r1.3.2.8 -r1.3.2.8.2.1 |*** crypto/openssh/auth1.c 3 Jul 2002 22:11:41 -0000 1.3.2.8 |--- crypto/openssh/auth1.c 24 Sep 2003 19:50:39 -0000 1.3.2.8.2.1 -------------------------- Patching file crypto/openssh/auth1.c using Plan A... Hunk #1 succeeded at 73. Hunk #2 succeeded at 103. Hmm... The next patch looks like a new-style context diff to me... The text leading up to this was: -------------------------- |Index: crypto/openssh/auth2-pam-freebsd.c |=================================================================== |RCS file: /home/ncvs/src/crypto/openssh/auth2-pam-freebsd.c,v |retrieving revision 1.1.2.2 |retrieving revision 1.1.2.2.2.2 |diff -p -c -r1.1.2.2 -r1.1.2.2.2.2 |*** crypto/openssh/auth2-pam-freebsd.c 17 Jul 2002 17:45:18 -0000 1.1.2.2 |--- crypto/openssh/auth2-pam-freebsd.c 24 Sep 2003 19:16:24 -0000 1.1.2.2.2.2 -------------------------- Patching file crypto/openssh/auth2-pam-freebsd.c using Plan A... Hunk #1 succeeded at 76. Hunk #2 succeeded at 85. Hunk #3 succeeded at 93. Hunk #4 succeeded at 111. Hmm... The next patch looks like a new-style context diff to me... The text leading up to this was: -------------------------- |Index: crypto/openssh/ssh_config |=================================================================== |RCS file: /home/ncvs/src/crypto/openssh/ssh_config,v |retrieving revision 1.2.2.6 |retrieving revision 1.2.2.6.2.1 |diff -p -c -r1.2.2.6 -r1.2.2.6.2.1 |*** crypto/openssh/ssh_config 25 Jul 2002 16:03:44 -0000 1.2.2.6 |--- crypto/openssh/ssh_config 24 Sep 2003 19:51:42 -0000 1.2.2.6.2.1 -------------------------- Patching file crypto/openssh/ssh_config using Plan A... Hunk #1 succeeded at 34. Hmm... The next patch looks like a new-style context diff to me... The text leading up to this was: -------------------------- |Index: crypto/openssh/sshd_config |=================================================================== |RCS file: /home/ncvs/src/crypto/openssh/sshd_config,v |retrieving revision 1.4.2.10 |retrieving revision 1.4.2.10.2.1 |diff -p -c -r1.4.2.10 -r1.4.2.10.2.1 |*** crypto/openssh/sshd_config 26 Jul 2002 15:18:32 -0000 1.4.2.10 |--- crypto/openssh/sshd_config 24 Sep 2003 19:51:42 -0000 1.4.2.10.2.1 -------------------------- Patching file crypto/openssh/sshd_config using Plan A... Hunk #1 succeeded at 14. Hmm... The next patch looks like a new-style context diff to me... The text leading up to this was: -------------------------- |Index: crypto/openssh/version.h |=================================================================== |RCS file: /home/ncvs/src/crypto/openssh/version.h,v |retrieving revision 1.1.1.1.2.9.2.2 |retrieving revision 1.1.1.1.2.9.2.3 |diff -p -c -r1.1.1.1.2.9.2.2 -r1.1.1.1.2.9.2.3 |*** crypto/openssh/version.h 17 Sep 2003 14:51:37 -0000 1.1.1.1.2.9.2.2 |--- crypto/openssh/version.h 24 Sep 2003 19:51:42 -0000 1.1.1.1.2.9.2.3 -------------------------- Patching file crypto/openssh/version.h using Plan A... Hunk #1 failed at 5. 1 out of 1 hunks failed--saving rejects to crypto/openssh/version.h.rej done su-2.05b# cd crypto/openssh/version.h.rej su: cd: crypto/openssh/version.h.rej: Not a directory su-2.05b# vi crypto/openssh/version.h.rej *************** *** 5,11 **** #define SSH_VERSION (ssh_version_get()) #define SSH_VERSION_BASE "OpenSSH_3.4p1" ! #define SSH_VERSION_ADDENDUM "FreeBSD-20030917" const char *ssh_version_get(void); void ssh_version_set_addendum(const char *add); --- 5,11 ---- #define SSH_VERSION (ssh_version_get()) #define SSH_VERSION_BASE "OpenSSH_3.4p1" ! #define SSH_VERSION_ADDENDUM "FreeBSD-20030924" const char *ssh_version_get(void); void ssh_version_set_addendum(const char *add); I've never had any problems patching before, I could use some help. -- Best regards, Kevin mailto:[EMAIL PROTECTED] _______________________________________________ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
