release/7.2.0_cvs

79 files changed, 79 insertions, 79 deletions

diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile
index dc39f5c2a210..852610da66de 100644
--- a/lib/libarchive/test/Makefile
+++ b/lib/libarchive/test/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.11.2.7.2.1 2009/04/15 03:14:26 kensmith Exp $
 
 # Where to find the libarchive sources
 LA_SRCDIR=${.CURDIR}/..
diff --git a/lib/libarchive/test/README b/lib/libarchive/test/README
index 0190b7c490ba..d0c8533bbe53 100644
--- a/lib/libarchive/test/README
+++ b/lib/libarchive/test/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/README,v 1.2.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $
 
 This is the test harness for libarchive.
 
diff --git a/lib/libarchive/test/main.c b/lib/libarchive/test/main.c
index 650495a5ff2d..c4a31a89f976 100644
--- a/lib/libarchive/test/main.c
+++ b/lib/libarchive/test/main.c
@@ -43,7 +43,7 @@
 #define	ENVBASE "LIBARCHIVE" /* Prefix for environment variables. */
 #define	EXTRA_DUMP(x)	archive_error_string((struct archive *)(x))
 #define	EXTRA_VERSION	archive_version()
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.8.2.4.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * "list.h" is simply created by "grep DEFINE_TEST"; it has
diff --git a/lib/libarchive/test/read_open_memory.c b/lib/libarchive/test/read_open_memory.c
index 63a7778c07ce..a38855c090e8 100644
--- a/lib/libarchive/test/read_open_memory.c
+++ b/lib/libarchive/test/read_open_memory.c
@@ -24,7 +24,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/read_open_memory.c,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/test/test.h b/lib/libarchive/test/test.h
index f1fbbbeabe2f..4e2fcb4f6a4c 100644
--- a/lib/libarchive/test/test.h
+++ b/lib/libarchive/test/test.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/test/test.h,v 1.6.2.4.4.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
 /* Every test program should #include "test.h" as the first thing. */
diff --git a/lib/libarchive/test/test_acl_basic.c b/lib/libarchive/test/test_acl_basic.c
index f07e74d8169c..1669e23e31d1 100644
--- a/lib/libarchive/test/test_acl_basic.c
+++ b/lib/libarchive/test/test_acl_basic.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.4.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * Exercise the system-independent portion of the ACL support.
diff --git a/lib/libarchive/test/test_acl_freebsd.c b/lib/libarchive/test/test_acl_freebsd.c
index 4e0888a1e78f..27b463f2e606 100644
--- a/lib/libarchive/test/test_acl_freebsd.c
+++ b/lib/libarchive/test/test_acl_freebsd.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_freebsd.c,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 #if defined(__FreeBSD__) && __FreeBSD__ > 4
 #include <sys/acl.h>
diff --git a/lib/libarchive/test/test_acl_pax.c b/lib/libarchive/test/test_acl_pax.c
index a40256ba8c40..937ad14d3b4b 100644
--- a/lib/libarchive/test/test_acl_pax.c
+++ b/lib/libarchive/test/test_acl_pax.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_pax.c,v 1.4.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * Exercise the system-independent portion of the ACL support.
diff --git a/lib/libarchive/test/test_archive_api_feature.c b/lib/libarchive/test/test_archive_api_feature.c
index 3324aad58def..e3d7fe54710d 100644
--- a/lib/libarchive/test/test_archive_api_feature.c
+++ b/lib/libarchive/test/test_archive_api_feature.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_archive_api_feature.c,v 1.3.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 DEFINE_TEST(test_archive_api_feature)
 {
diff --git a/lib/libarchive/test/test_bad_fd.c b/lib/libarchive/test/test_bad_fd.c
index dc83d185ae05..9701a5021a5a 100644
--- a/lib/libarchive/test/test_bad_fd.c
+++ b/lib/libarchive/test/test_bad_fd.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_bad_fd.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /* Verify that attempting to open an invalid fd returns correct error. */
 DEFINE_TEST(test_bad_fd)
diff --git a/lib/libarchive/test/test_compat_gtar.c b/lib/libarchive/test/test_compat_gtar.c
index 24a294fc9cb3..930939d80354 100644
--- a/lib/libarchive/test/test_compat_gtar.c
+++ b/lib/libarchive/test/test_compat_gtar.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_gtar.c,v 1.1.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * Verify our ability to read sample files created by GNU tar.
diff --git a/lib/libarchive/test/test_compat_gtar_1.tgz.uu b/lib/libarchive/test/test_compat_gtar_1.tgz.uu
index 5a8d51f5af84..88d5bfbf96ff 100644
--- a/lib/libarchive/test/test_compat_gtar_1.tgz.uu
+++ b/lib/libarchive/test/test_compat_gtar_1.tgz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_compat_gtar_1.tgz.uu,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $
 begin 644 test_compat_gtar_1.tgz
 M'XL(`,N`6T<``^W62PZ",!`&X!YE3@`SI:6Z<R^7\(&*+Q+%>'W+PJB)43=4
 MJO^W:1.Z:#KYATG2)!T5]7Y95/N-Z@:UF)ZO7B9"-TPD[%@4%1W=Y\'IV$P.
diff --git a/lib/libarchive/test/test_compat_tar_hardlink.c b/lib/libarchive/test/test_compat_tar_hardlink.c
index c1021ef584b2..7175a98f7f6b 100644
--- a/lib/libarchive/test/test_compat_tar_hardlink.c
+++ b/lib/libarchive/test/test_compat_tar_hardlink.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.1.2.3.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * Background:  There are two written standards for the tar file format.
diff --git a/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu b/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu
index f1658a27514a..041a26f66f3f 100644
--- a/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu
+++ b/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $
 begin 644 test_compat_tar_hardlink_1.tar
 M>&UC9"TS+C,N,B]D;V-S7V0O4D5!1$UF````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_compat_zip.c b/lib/libarchive/test/test_compat_zip.c
index f174c38b0dc0..3cafdcf4b70d 100644
--- a/lib/libarchive/test/test_compat_zip.c
+++ b/lib/libarchive/test/test_compat_zip.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_zip.c,v 1.1.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /* Copy this function for each test file and adjust it accordingly. */
 static void
diff --git a/lib/libarchive/test/test_compat_zip_1.zip.uu b/lib/libarchive/test/test_compat_zip_1.zip.uu
index 1ed2d69966bf..2c08fc8033fd 100644
--- a/lib/libarchive/test/test_compat_zip_1.zip.uu
+++ b/lib/libarchive/test/test_compat_zip_1.zip.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_compat_zip_1.zip.uu,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $
 begin 644 test_compat_zip_1.zip
 M4$L#!!0`"``(``B$@S<````````````````4````345402U)3D8O34%.249%
 M4U0N34;S3<S+3$LM+M$-2RTJSLS/LU(PU#/@Y7+,0Q)Q+$A,SDA5`(H!)<U!
diff --git a/lib/libarchive/test/test_empty_write.c b/lib/libarchive/test/test_empty_write.c
index 37b14b834e88..ec803c72838f 100644
--- a/lib/libarchive/test/test_empty_write.c
+++ b/lib/libarchive/test/test_empty_write.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_empty_write.c,v 1.1.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 DEFINE_TEST(test_empty_write)
 {
diff --git a/lib/libarchive/test/test_entry.c b/lib/libarchive/test/test_entry.c
index 2b1bf3e634d9..135508aca1db 100644
--- a/lib/libarchive/test/test_entry.c
+++ b/lib/libarchive/test/test_entry.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.2.2.3.2.1 2009/04/15 03:14:26 kensmith Exp $");
 
 #include <locale.h>
 
diff --git a/lib/libarchive/test/test_entry_strmode.c b/lib/libarchive/test/test_entry_strmode.c
index 43b01b42232a..48f6577b5e4e 100644
--- a/lib/libarchive/test/test_entry_strmode.c
+++ b/lib/libarchive/test/test_entry_strmode.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry_strmode.c,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 DEFINE_TEST(test_entry_strmode)
 {
diff --git a/lib/libarchive/test/test_link_resolver.c b/lib/libarchive/test/test_link_resolver.c
index 032c05951078..b7afd2b72162 100644
--- a/lib/libarchive/test/test_link_resolver.c
+++ b/lib/libarchive/test/test_link_resolver.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_link_resolver.c,v 1.2.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static void test_linkify_tar(void)
 {
diff --git a/lib/libarchive/test/test_pax_filename_encoding.c b/lib/libarchive/test/test_pax_filename_encoding.c
index 649163471e20..51ed448fe29d 100644
--- a/lib/libarchive/test/test_pax_filename_encoding.c
+++ b/lib/libarchive/test/test_pax_filename_encoding.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.c,v 1.1.2.3.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 #include <locale.h>
 
diff --git a/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu b/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu
index b365495278aa..23ff4c43a29e 100644
--- a/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu
+++ b/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu,v 1.1.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $
 begin 644 test_pax_filename_encoding.tar.gz
 M'XL(`)4;VT<``^V6STK#0!#&<\Y3[!/HS/Z-ASVHEQ1$BE[L<4T6$DP32:-$
 MG\%'\Y%Z,*7$UEJLE"91NK_+P.P>OF'X^&9LZM":V):GYCYZ?YOFQ5W]\NH=
diff --git a/lib/libarchive/test/test_read_compress_program.c b/lib/libarchive/test/test_read_compress_program.c
index 012797046ce0..24778779bc12 100644
--- a/lib/libarchive/test/test_read_compress_program.c
+++ b/lib/libarchive/test/test_read_compress_program.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_compress_program.c,v 1.2.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,222,'C','p','C',0,3,211,'c',160,'=','0','0','0','0','7','5','U',
diff --git a/lib/libarchive/test/test_read_data_large.c b/lib/libarchive/test/test_read_data_large.c
index 0361d5ef3e0d..ded758775545 100644
--- a/lib/libarchive/test/test_read_data_large.c
+++ b/lib/libarchive/test/test_read_data_large.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_data_large.c,v 1.3.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * Test read/write of a 10M block of data in a single operation.
diff --git a/lib/libarchive/test/test_read_extract.c b/lib/libarchive/test/test_read_extract.c
index da23a8c8bda1..5df708ac8204 100644
--- a/lib/libarchive/test/test_read_extract.c
+++ b/lib/libarchive/test/test_read_extract.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_extract.c,v 1.3.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 #define BUFF_SIZE 1000000
 #define FILE_BUFF_SIZE 100000
diff --git a/lib/libarchive/test/test_read_format_ar.c b/lib/libarchive/test/test_read_format_ar.c
index 95e8b3fa3b7c..4e51d50c9e05 100644
--- a/lib/libarchive/test/test_read_format_ar.c
+++ b/lib/libarchive/test/test_read_format_ar.c
@@ -26,7 +26,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_ar.c,v 1.4.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 #if ARCHIVE_VERSION_STAMP >= 1009000
 /*
diff --git a/lib/libarchive/test/test_read_format_cpio_bin.c b/lib/libarchive/test/test_read_format_cpio_bin.c
index dc840c462e22..0448f72abb4e 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 199,'q',21,4,177,'y',237,'A',232,3,232,3,2,0,0,0,'p','C',244,'M',2,0,0,0,
diff --git a/lib/libarchive/test/test_read_format_cpio_bin_Z.c b/lib/libarchive/test/test_read_format_cpio_bin_Z.c
index a22c259bcf28..167191169417 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin_Z.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin_Z.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin_Z.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,157,144,199,226,'T',' ',16,'+','O',187,' ',232,6,'$',20,0,160,'!',156,
diff --git a/lib/libarchive/test/test_read_format_cpio_bin_bz2.c b/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
index 4aeb70a7768e..1de6fff6afa5 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 'B','Z','h','9','1','A','Y','&','S','Y',134,'J',208,'4',0,0,30,246,141,253,
diff --git a/lib/libarchive/test/test_read_format_cpio_bin_gz.c b/lib/libarchive/test/test_read_format_cpio_bin_gz.c
index cefa0b3471e8..44a9359cd59e 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin_gz.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin_gz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin_gz.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,244,'M','p','C',0,3,';','^','(',202,178,177,242,173,227,11,230,
diff --git a/lib/libarchive/test/test_read_format_cpio_odc.c b/lib/libarchive/test/test_read_format_cpio_odc.c
index 6b758bb178f5..46beda632ac8 100644
--- a/lib/libarchive/test/test_read_format_cpio_odc.c
+++ b/lib/libarchive/test/test_read_format_cpio_odc.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_odc.c,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 '0','7','0','7','0','7','0','0','2','0','2','5','0','7','4','6','6','1','0',
diff --git a/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c b/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c
index e46f0f824e90..e3c79c135097 100644
--- a/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c
+++ b/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,236,'c',217,'D',0,3,'3','0','7','0','7','0','4','0','0',181,'0',
diff --git a/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c b/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c
index bc89c8f343f5..28feb5bfe52a 100644
--- a/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c
+++ b/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,157,144,'0','n',4,132,'!',3,6,140,26,'8','n',228,16,19,195,160,'A',26,
diff --git a/lib/libarchive/test/test_read_format_empty.c b/lib/libarchive/test/test_read_format_empty.c
index 761b2a9cd4e3..4f494a7e796e 100644
--- a/lib/libarchive/test/test_read_format_empty.c
+++ b/lib/libarchive/test/test_read_format_empty.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_empty.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = { };
 
diff --git a/lib/libarchive/test/test_read_format_gtar_gz.c b/lib/libarchive/test/test_read_format_gtar_gz.c
index 5ea549a1f9d8..9cf9623db7d9 100644
--- a/lib/libarchive/test/test_read_format_gtar_gz.c
+++ b/lib/libarchive/test/test_read_format_gtar_gz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_gz.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,'+','e',217,'D',0,3,211,211,'g',160,'9','0',0,2,'s','S','S',16,
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse.c b/lib/libarchive/test/test_read_format_gtar_sparse.c
index f3eb274b7256..6d559fb40654 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse.c
+++ b/lib/libarchive/test/test_read_format_gtar_sparse.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.6.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 
 struct contents {
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu b/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu
index 70198997e803..ffea6e007950 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu
+++ b/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $
 begin 644 test_read_format_gtar_sparse_1_13.tgz
 M'XL(`&&";$<``^W72VX;1Q2%X<Y.N($`=>NYD*Q``P\\L&.(\OYSNP/)LGE`
 M!SDF.D#^SP,G94&\7?VS']<O3\_7#]M#E2AE]KZ54F*-\O[O7<W_W:*LUJ)$
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu b/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu
index 53889314ce24..4e675acc1dff 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu
+++ b/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $
 begin 644 test_read_format_gtar_sparse_1_17.tgz
 M'XL(`&&";$<``^W776X3611%83,33Z"E>^[O0'H$?N"!!V@4A_GWJ8*$".\V
 MK=Y8U1+KB\#H)L2G;BV77=?/EZ?K^]-#E31[WQYCC?+V<5/SSRG*:BU*1,_U
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu
index 42ad82109b90..a460a5bda466 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu
+++ b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $
 begin 644 test_read_format_gtar_sparse_1_17_posix00.tgz
 M'XL(`&*";$<``^W9S6[;1A2&8:UU%;Z!RO/#^5MHW:R*;'H!K,,`06L[$&7`
 M[=5W%#FN'(Q-Z1S5K-#W642!E&/3/M\$'\'5]<?^\</0?QHVX\KG&,KU^+7?
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu
index a4191c3b20ed..193b41ce5496 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu
+++ b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $
 begin 644 test_read_format_gtar_sparse_1_17_posix01.tgz
 M'XL(`&*";$<``^W7WVX:1QB&<8ZY"B[`Q?/-OYT]X+3-416IZ@5L'0ZLQHX%
 MMF3UZKN`';]V&SO21[PB>GXG;,#F`_,,F5F>?QSN/ZR'3^O-=IE:K7:^O1DV
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu
index bd121b08c969..c0a55a8cd764 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu
+++ b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $
 begin 644 test_read_format_gtar_sparse_1_17_posix10.tgz
 M'XL(`&.";$<``^W7RV[;5A1&88WU%'J!RN=^&7B:9E0$*/H`1,*!B]@))`<P
 M\O2A)#O];=@RBJV8$+*^"1G*T=9E'8%G??%AN'L_#I_&S78=6RGQ8OMUV&S'
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
index a0673de19d35..35d80ba26db6 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
+++ b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $
 begin 644 test_read_format_gtar_sparse_1_17_posix10_modified.tar
 M+B]087A(96%D97)S+C,X-C8S+W-P87)S90``````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_read_format_iso_gz.c b/lib/libarchive/test/test_read_format_iso_gz.c
index fd8f60e1e629..6167d8f0e114 100644
--- a/lib/libarchive/test/test_read_format_iso_gz.c
+++ b/lib/libarchive/test/test_read_format_iso_gz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_iso_gz.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,139,8,8,201,'R','p','C',0,3,'t','e','s','t','-','r','e','a','d','_','f',
diff --git a/lib/libarchive/test/test_read_format_isorr_bz2.c b/lib/libarchive/test/test_read_format_isorr_bz2.c
index 397310491bbf..2161009b21ff 100644
--- a/lib/libarchive/test/test_read_format_isorr_bz2.c
+++ b/lib/libarchive/test/test_read_format_isorr_bz2.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_isorr_bz2.c,v 1.2.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
 Execute the following to rebuild the data for this program:
diff --git a/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu b/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
index 6f01fb9b7b25..5421c59cb91c 100644
--- a/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
+++ b/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $
 
 begin 644 test_read_format_isorr_bz2.iso.bz2
 M0EIH.3%!629361M#:2D``,?_W?__6_Y58_GX/__?X*?OWB8AZB0`,`$@`$0"
diff --git a/lib/libarchive/test/test_read_format_mtree.c b/lib/libarchive/test/test_read_format_mtree.c
index 861fbc7c5e36..be60f27967e7 100644
--- a/lib/libarchive/test/test_read_format_mtree.c
+++ b/lib/libarchive/test/test_read_format_mtree.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_mtree.c,v 1.1.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /* Single entry with a hardlink. */
 static unsigned char archive[] = {
diff --git a/lib/libarchive/test/test_read_format_pax_bz2.c b/lib/libarchive/test/test_read_format_pax_bz2.c
index 039bd53b2b17..26d3b9a0d39e 100644
--- a/lib/libarchive/test/test_read_format_pax_bz2.c
+++ b/lib/libarchive/test/test_read_format_pax_bz2.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_pax_bz2.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 'B','Z','h','9','1','A','Y','&','S','Y',152,180,30,185,0,0,140,127,176,212,
diff --git a/lib/libarchive/test/test_read_format_tar.c b/lib/libarchive/test/test_read_format_tar.c
index bfe0b1388e2e..5cfb7d2ac5d3 100644
--- a/lib/libarchive/test/test_read_format_tar.c
+++ b/lib/libarchive/test/test_read_format_tar.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tar.c,v 1.2.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * Each of these archives is a short archive with a single entry.  The
diff --git a/lib/libarchive/test/test_read_format_tar_empty_filename.c b/lib/libarchive/test/test_read_format_tar_empty_filename.c
index d9ba69bd93c1..00c50602d53f 100644
--- a/lib/libarchive/test/test_read_format_tar_empty_filename.c
+++ b/lib/libarchive/test/test_read_format_tar_empty_filename.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tar_empty_filename.c,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * Tar entries with empty filenames are unusual, but shouldn't crash us.
diff --git a/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu b/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu
index 08aaf2870719..b4fd33c35e77 100644
--- a/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu
+++ b/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu,v 1.2.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $
 begin 644 test_compat_tar_1.tar
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_read_format_tbz.c b/lib/libarchive/test/test_read_format_tbz.c
index 17f24ea1070f..ba3a864728e4 100644
--- a/lib/libarchive/test/test_read_format_tbz.c
+++ b/lib/libarchive/test/test_read_format_tbz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tbz.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 'B','Z','h','9','1','A','Y','&','S','Y',237,7,140,'W',0,0,27,251,144,208,
diff --git a/lib/libarchive/test/test_read_format_tgz.c b/lib/libarchive/test/test_read_format_tgz.c
index 4235358b0348..a891ee1c514b 100644
--- a/lib/libarchive/test/test_read_format_tgz.c
+++ b/lib/libarchive/test/test_read_format_tgz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tgz.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,222,'C','p','C',0,3,211,'c',160,'=','0','0','0','0','7','5','U',
diff --git a/lib/libarchive/test/test_read_format_tz.c b/lib/libarchive/test/test_read_format_tz.c
index d7a91e225497..a78695c46a0c 100644
--- a/lib/libarchive/test/test_read_format_tz.c
+++ b/lib/libarchive/test/test_read_format_tz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tz.c,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,157,144,'.',0,8,28,'H',176,160,193,131,8,19,'*','\\',200,176,'!','B',24,
diff --git a/lib/libarchive/test/test_read_format_zip.c b/lib/libarchive/test/test_read_format_zip.c
index 8c8d0dd09943..63e92b05f564 100644
--- a/lib/libarchive/test/test_read_format_zip.c
+++ b/lib/libarchive/test/test_read_format_zip.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.2.2.4.2.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * The reference file for this has been manually tweaked so that:
diff --git a/lib/libarchive/test/test_read_format_zip.zip.uu b/lib/libarchive/test/test_read_format_zip.zip.uu
index 1e0cb221e956..e92bcef85094 100644
--- a/lib/libarchive/test/test_read_format_zip.zip.uu
+++ b/lib/libarchive/test/test_read_format_zip.zip.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_zip.zip.uu,v 1.2.2.3.2.1 2009/04/15 03:14:26 kensmith Exp $
 begin 644 test_read_format_zip.zip
 M4$L#!`H`"````%EFLS8````````````````$`!4`9&ER+U54"0`#&55/1M19
 M_4A5>`0`Z`/H`U!+!P@```````````````!02P,$%`````@`;V:S-CHW9CT*
diff --git a/lib/libarchive/test/test_read_large.c b/lib/libarchive/test/test_read_large.c
index 44a2b388a06b..d2adbf71c4ac 100644
--- a/lib/libarchive/test/test_read_large.c
+++ b/lib/libarchive/test/test_read_large.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_large.c,v 1.3.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char testdata[10 * 1024 * 1024];
 static unsigned char testdatacopy[10 * 1024 * 1024];
diff --git a/lib/libarchive/test/test_read_pax_truncated.c b/lib/libarchive/test/test_read_pax_truncated.c
index 132c73315f52..1adc4a3e34fa 100644
--- a/lib/libarchive/test/test_read_pax_truncated.c
+++ b/lib/libarchive/test/test_read_pax_truncated.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_pax_truncated.c,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 DEFINE_TEST(test_read_pax_truncated)
 {
diff --git a/lib/libarchive/test/test_read_position.c b/lib/libarchive/test/test_read_position.c
index d35766cbe332..060797be2f03 100644
--- a/lib/libarchive/test/test_read_position.c
+++ b/lib/libarchive/test/test_read_position.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_position.c,v 1.3.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static unsigned char nulls[10000000];
 static unsigned char buff[10000000];
diff --git a/lib/libarchive/test/test_read_truncated.c b/lib/libarchive/test/test_read_truncated.c
index 1cc62b2780e6..64eaaaee059b 100644
--- a/lib/libarchive/test/test_read_truncated.c
+++ b/lib/libarchive/test/test_read_truncated.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_truncated.c,v 1.3.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 char buff[1000000];
 char buff2[100000];
diff --git a/lib/libarchive/test/test_tar_filenames.c b/lib/libarchive/test/test_tar_filenames.c
index e96d2ecb58b2..6f4704f69ea3 100644
--- a/lib/libarchive/test/test_tar_filenames.c
+++ b/lib/libarchive/test/test_tar_filenames.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_filenames.c,v 1.7.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * Exercise various lengths of filenames in tar archives,
diff --git a/lib/libarchive/test/test_tar_large.c b/lib/libarchive/test/test_tar_large.c
index 5ce31053bac0..a9abb2da7386 100644
--- a/lib/libarchive/test/test_tar_large.c
+++ b/lib/libarchive/test/test_tar_large.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_large.c,v 1.1.2.3.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/test/test_ustar_filenames.c b/lib/libarchive/test/test_ustar_filenames.c
index 3c842a31186d..310ac4c22989 100644
--- a/lib/libarchive/test/test_ustar_filenames.c
+++ b/lib/libarchive/test/test_ustar_filenames.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_ustar_filenames.c,v 1.1.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * Exercise various lengths of filenames in ustar archives.
diff --git a/lib/libarchive/test/test_write_compress.c b/lib/libarchive/test/test_write_compress.c
index 2f4d38d15b77..42dd294539ea 100644
--- a/lib/libarchive/test/test_write_compress.c
+++ b/lib/libarchive/test/test_write_compress.c
@@ -25,7 +25,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress.c,v 1.2.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * A basic exercise of compress reading and writing.
diff --git a/lib/libarchive/test/test_write_compress_program.c b/lib/libarchive/test/test_write_compress_program.c
index 4376a53cd844..38ec3a5bd4eb 100644
--- a/lib/libarchive/test/test_write_compress_program.c
+++ b/lib/libarchive/test/test_write_compress_program.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress_program.c,v 1.2.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 char buff[1000000];
 char buff2[64];
diff --git a/lib/libarchive/test/test_write_disk.c b/lib/libarchive/test/test_write_disk.c
index 9b9a058bef0a..01c34998bcf3 100644
--- a/lib/libarchive/test/test_write_disk.c
+++ b/lib/libarchive/test/test_write_disk.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.6.2.5.2.1 2009/04/15 03:14:26 kensmith Exp $");
 
 #if ARCHIVE_VERSION_STAMP >= 1009000
 
diff --git a/lib/libarchive/test/test_write_disk_hardlink.c b/lib/libarchive/test/test_write_disk_hardlink.c
index 910f509e6c45..086e13993aea 100644
--- a/lib/libarchive/test/test_write_disk_hardlink.c
+++ b/lib/libarchive/test/test_write_disk_hardlink.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.1.2.4.2.1 2009/04/15 03:14:26 kensmith Exp $");
 
 #define UMASK 022
 
diff --git a/lib/libarchive/test/test_write_disk_perms.c b/lib/libarchive/test/test_write_disk_perms.c
index 15633f6c9b0f..a8496e7cf761 100644
--- a/lib/libarchive/test/test_write_disk_perms.c
+++ b/lib/libarchive/test/test_write_disk_perms.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_perms.c,v 1.7.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 #if ARCHIVE_VERSION_STAMP >= 1009000
 
diff --git a/lib/libarchive/test/test_write_disk_secure.c b/lib/libarchive/test/test_write_disk_secure.c
index 08900d9950de..eccb36c08686 100644
--- a/lib/libarchive/test/test_write_disk_secure.c
+++ b/lib/libarchive/test/test_write_disk_secure.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_secure.c,v 1.3.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 #define UMASK 022
 
diff --git a/lib/libarchive/test/test_write_disk_sparse.c b/lib/libarchive/test/test_write_disk_sparse.c
index 617961085469..6887df16008f 100644
--- a/lib/libarchive/test/test_write_disk_sparse.c
+++ b/lib/libarchive/test/test_write_disk_sparse.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_sparse.c,v 1.1.2.1.2.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * Write a file using archive_write_data call, read the file
diff --git a/lib/libarchive/test/test_write_format_ar.c b/lib/libarchive/test/test_write_format_ar.c
index 09d6baa6d9c1..1c1c51159e5c 100644
--- a/lib/libarchive/test/test_write_format_ar.c
+++ b/lib/libarchive/test/test_write_format_ar.c
@@ -26,7 +26,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_ar.c,v 1.5.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 char buff[4096];
 char buff2[64];
diff --git a/lib/libarchive/test/test_write_format_cpio.c b/lib/libarchive/test/test_write_format_cpio.c
index 5368e56b5153..95f7af79eb9f 100644
--- a/lib/libarchive/test/test_write_format_cpio.c
+++ b/lib/libarchive/test/test_write_format_cpio.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_cpio.c,v 1.2.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /* The version stamp macro was introduced after cpio write support. */
 #if ARCHIVE_VERSION_STAMP >= 1009000
diff --git a/lib/libarchive/test/test_write_format_cpio_empty.c b/lib/libarchive/test/test_write_format_cpio_empty.c
index 9f50e77b0afa..8c7d7ca02227 100644
--- a/lib/libarchive/test/test_write_format_cpio_empty.c
+++ b/lib/libarchive/test/test_write_format_cpio_empty.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_cpio_empty.c,v 1.2.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * Check that an "empty" cpio archive is correctly created.
diff --git a/lib/libarchive/test/test_write_format_cpio_newc.c b/lib/libarchive/test/test_write_format_cpio_newc.c
index 9b16e47cceac..d564a19df268 100644
--- a/lib/libarchive/test/test_write_format_cpio_newc.c
+++ b/lib/libarchive/test/test_write_format_cpio_newc.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_cpio_newc.c,v 1.2.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 
 static int
diff --git a/lib/libarchive/test/test_write_format_cpio_odc.c b/lib/libarchive/test/test_write_format_cpio_odc.c
index 796dd7eace9a..926a7b326d4c 100644
--- a/lib/libarchive/test/test_write_format_cpio_odc.c
+++ b/lib/libarchive/test/test_write_format_cpio_odc.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_cpio_odc.c,v 1.1.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 
 static int
diff --git a/lib/libarchive/test/test_write_format_shar_empty.c b/lib/libarchive/test/test_write_format_shar_empty.c
index 0af57dda6acf..fa0cf349f135 100644
--- a/lib/libarchive/test/test_write_format_shar_empty.c
+++ b/lib/libarchive/test/test_write_format_shar_empty.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_shar_empty.c,v 1.2.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * Check that an "empty" shar archive is correctly created as an empty file.
diff --git a/lib/libarchive/test/test_write_format_tar.c b/lib/libarchive/test/test_write_format_tar.c
index 8b498952526f..8d42c2b64ef2 100644
--- a/lib/libarchive/test/test_write_format_tar.c
+++ b/lib/libarchive/test/test_write_format_tar.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar.c,v 1.3.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 char buff[1000000];
 char buff2[64];
diff --git a/lib/libarchive/test/test_write_format_tar_empty.c b/lib/libarchive/test/test_write_format_tar_empty.c
index 86bdebc43f14..9747640ad64c 100644
--- a/lib/libarchive/test/test_write_format_tar_empty.c
+++ b/lib/libarchive/test/test_write_format_tar_empty.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_empty.c,v 1.3.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /*
  * Check that an "empty" tar archive is correctly created.
diff --git a/lib/libarchive/test/test_write_format_tar_ustar.c b/lib/libarchive/test/test_write_format_tar_ustar.c
index 53d21e15ab68..143f6555c6ef 100644
--- a/lib/libarchive/test/test_write_format_tar_ustar.c
+++ b/lib/libarchive/test/test_write_format_tar_ustar.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_ustar.c,v 1.1.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
 
 static int
 is_null(const char *p, size_t l)
diff --git a/lib/libarchive/test/test_write_open_memory.c b/lib/libarchive/test/test_write_open_memory.c
index 90428766bfce..fb526fb7d4e7 100644
--- a/lib/libarchive/test/test_write_open_memory.c
+++ b/lib/libarchive/test/test_write_open_memory.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_open_memory.c,v 1.3.10.1 2009/04/15 03:14:26 kensmith Exp $");
 
 /* Try to force archive_write_open_memory.c to write past the end of an array. */
 static unsigned char buff[16384];