FreeBSD Errata Advisory FreeBSD-SA-06:03.cpio

[Lin, Shih-Min]

Hi there,

I'm following the security advisory to patch the cpio vulnerability (update to 6_0_0 RELENG p2, make obj, make depend), yet when it comes to make, it shows some error message as follows:

/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:536: error: redefinition of 'safer_name_suffix'
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:488: error: previous definition of 'safer_name_suffix' was here
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:584: error: redefinition of 'safer_name_suffix'
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:536: error: previous definition of 'safer_name_suffix' was here
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:584: error: redefinition of 'safer_name_suffix'
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:536: error: previous definition of 'safer_name_suffix' was here
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:632: error: redefinition of 'safer_name_suffix'
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:584: error: previous definition of 'safer_name_suffix' was here
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:632: error: redefinition of 'safer_name_suffix'
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:536: error: previous definition of 'safer_name_suffix' was here
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:680: error: redefinition of 'safer_name_suffix'
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:632: error: previous definition of 'safer_name_suffix' was here
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:680: error: redefinition of 'safer_name_suffix'
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:536: error: previous definition of 'safer_name_suffix' was here
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:728: error: redefinition of 'safer_name_suffix'
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:680: error: previous definition of 'safer_name_suffix' was here
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:728: error: redefinition of 'safer_name_suffix'
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:536: error: previous definition of 'safer_name_suffix' was here
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:776: error: redefinition of 'safer_name_suffix'
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:728: error: previous definition of 'safer_name_suffix' was here
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:776: error: redefinition of 'safer_name_suffix'
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:536: error: previous definition of 'safer_name_suffix' was here
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:824: error: redefinition of 'safer_name_suffix'
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:776: error: previous definition of 'safer_name_suffix' was here
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:824: error: redefinition of 'safer_name_suffix'
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:536: error: previous definition of 'safer_name_suffix' was here
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c: In function `process_copy_in':
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:986: error: `abs_paths_flag' undeclared (first use in this function)
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:986: error:  (Each undeclared identifier is reported only once 
/usr/src/gnu/usr.bin/cpio/../../../contrib/cpio/copyin.c:986: error: for each function it appears in.)
*** Error code 1

All of them look like the same thing, but what might have gone wrong? (no problem with ee, ipfw and texinfo patch)