release/8.3.0_cvs

17 files changed, 17 insertions, 17 deletions

diff --git a/contrib/libarchive/tar/test/main.c b/contrib/libarchive/tar/test/main.c
index bd1db1d793eb..28c8e1f59e49 100644
--- a/contrib/libarchive/tar/test/main.c
+++ b/contrib/libarchive/tar/test/main.c
@@ -36,7 +36,7 @@
  * TODO: Move this into a separate configuration header, have all test
  * suites share one copy of this file.
  */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/main.c,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 #define KNOWNREF	"test_patterns_2.tar.uu"
 #define ENVBASE "BSDTAR"  /* Prefix for environment variables. */
 #define	PROGRAM "bsdtar"  /* Name of program being tested. */
diff --git a/contrib/libarchive/tar/test/test.h b/contrib/libarchive/tar/test/test.h
index a4a24617a145..a1200319add8 100644
--- a/contrib/libarchive/tar/test/test.h
+++ b/contrib/libarchive/tar/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/contrib/libarchive/tar/test/test.h,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $
  */
 
 /* Every test program should #include "test.h" as the first thing. */
diff --git a/contrib/libarchive/tar/test/test_0.c b/contrib/libarchive/tar/test/test_0.c
index b97bd3712591..c0c0fc65bec7 100644
--- a/contrib/libarchive/tar/test/test_0.c
+++ b/contrib/libarchive/tar/test/test_0.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/test_0.c,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 /*
  * This first test does basic sanity checks on the environment.  For
diff --git a/contrib/libarchive/tar/test/test_basic.c b/contrib/libarchive/tar/test/test_basic.c
index 1fa334174145..a87c274f3897 100644
--- a/contrib/libarchive/tar/test/test_basic.c
+++ b/contrib/libarchive/tar/test/test_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/contrib/libarchive/tar/test/test_basic.c,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 
 static void
diff --git a/contrib/libarchive/tar/test/test_copy.c b/contrib/libarchive/tar/test/test_copy.c
index 5a1c4d075e43..12f234380415 100644
--- a/contrib/libarchive/tar/test/test_copy.c
+++ b/contrib/libarchive/tar/test/test_copy.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/test_copy.c,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 #if defined(__CYGWIN__)
 # include <limits.h>
diff --git a/contrib/libarchive/tar/test/test_empty_mtree.c b/contrib/libarchive/tar/test/test_empty_mtree.c
index 6f8a5e91aa1a..e892d6761d14 100644
--- a/contrib/libarchive/tar/test/test_empty_mtree.c
+++ b/contrib/libarchive/tar/test/test_empty_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/contrib/libarchive/tar/test/test_empty_mtree.c,v 1.1.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 /*
  * Regression test:  We used to get a bogus error message when we
diff --git a/contrib/libarchive/tar/test/test_getdate.c b/contrib/libarchive/tar/test/test_getdate.c
index cd6d55a93e6a..e675c6bf321f 100644
--- a/contrib/libarchive/tar/test/test_getdate.c
+++ b/contrib/libarchive/tar/test/test_getdate.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/test_getdate.c,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 #include <time.h>
 
diff --git a/contrib/libarchive/tar/test/test_help.c b/contrib/libarchive/tar/test/test_help.c
index 0e7d1c97ea62..2216cc5d4cd8 100644
--- a/contrib/libarchive/tar/test/test_help.c
+++ b/contrib/libarchive/tar/test/test_help.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/test_help.c,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 /*
  * Test that "--help", "-h", and "-W help" options all work and
diff --git a/contrib/libarchive/tar/test/test_option_T_upper.c b/contrib/libarchive/tar/test/test_option_T_upper.c
index 87127ccb9373..076ec7986095 100644
--- a/contrib/libarchive/tar/test/test_option_T_upper.c
+++ b/contrib/libarchive/tar/test/test_option_T_upper.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/test_option_T_upper.c,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 static int
 touch(const char *fn, int fail)
diff --git a/contrib/libarchive/tar/test/test_option_q.c b/contrib/libarchive/tar/test/test_option_q.c
index c8e95400dfe4..cc7174d04f15 100644
--- a/contrib/libarchive/tar/test/test_option_q.c
+++ b/contrib/libarchive/tar/test/test_option_q.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/test_option_q.c,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 DEFINE_TEST(test_option_q)
 {
diff --git a/contrib/libarchive/tar/test/test_option_r.c b/contrib/libarchive/tar/test/test_option_r.c
index 516a8307936c..176d4426e0fd 100644
--- a/contrib/libarchive/tar/test/test_option_r.c
+++ b/contrib/libarchive/tar/test/test_option_r.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/test_option_r.c,v 1.1.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 /*
  * Also see test_option_q for additional validation of -r support.
diff --git a/contrib/libarchive/tar/test/test_option_s.c b/contrib/libarchive/tar/test/test_option_s.c
index a2525a09ec00..2409ccff46e2 100644
--- a/contrib/libarchive/tar/test/test_option_s.c
+++ b/contrib/libarchive/tar/test/test_option_s.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/test_option_s.c,v 1.3.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 static int
 mkfile(const char *fn, const char *contents)
diff --git a/contrib/libarchive/tar/test/test_patterns.c b/contrib/libarchive/tar/test/test_patterns.c
index f909e27d6e23..ba8229fd3039 100644
--- a/contrib/libarchive/tar/test/test_patterns.c
+++ b/contrib/libarchive/tar/test/test_patterns.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/test_patterns.c,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 DEFINE_TEST(test_patterns)
 {
diff --git a/contrib/libarchive/tar/test/test_stdio.c b/contrib/libarchive/tar/test/test_stdio.c
index 1780d967c8c3..963973cd9cee 100644
--- a/contrib/libarchive/tar/test/test_stdio.c
+++ b/contrib/libarchive/tar/test/test_stdio.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/test_stdio.c,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 DEFINE_TEST(test_stdio)
 {
diff --git a/contrib/libarchive/tar/test/test_strip_components.c b/contrib/libarchive/tar/test/test_strip_components.c
index 271f2091a443..acea466d31a8 100644
--- a/contrib/libarchive/tar/test/test_strip_components.c
+++ b/contrib/libarchive/tar/test/test_strip_components.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/test_strip_components.c,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 static int
 touch(const char *fn)
diff --git a/contrib/libarchive/tar/test/test_symlink_dir.c b/contrib/libarchive/tar/test/test_symlink_dir.c
index f0cfebb33b99..c8f942173232 100644
--- a/contrib/libarchive/tar/test/test_symlink_dir.c
+++ b/contrib/libarchive/tar/test/test_symlink_dir.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/test_symlink_dir.c,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 /*
  * tar -x -P should follow existing symlinks for dirs, but not other
diff --git a/contrib/libarchive/tar/test/test_version.c b/contrib/libarchive/tar/test/test_version.c
index e4aacc8344de..8583b953c38d 100644
--- a/contrib/libarchive/tar/test/test_version.c
+++ b/contrib/libarchive/tar/test/test_version.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/libarchive/tar/test/test_version.c,v 1.2.4.2.2.1 2012/03/03 06:15:13 kensmith Exp $");
 
 /*
  * Test that --version option works and generates reasonable output.