Module Name: othersrc
Committed By: agc
Date: Mon Jan 21 07:34:04 UTC 2019
Modified Files:
othersrc/external/bsd/file2c: 1.expected 1.in 2.expected 3.expected
Log Message:
Get rid of stray RCS Ids in the test input file
Fix up tests to accommodate
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/file2c/1.expected \
othersrc/external/bsd/file2c/1.in othersrc/external/bsd/file2c/2.expected \
othersrc/external/bsd/file2c/3.expected
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/file2c/1.expected
diff -u othersrc/external/bsd/file2c/1.expected:1.1 othersrc/external/bsd/file2c/1.expected:1.2
--- othersrc/external/bsd/file2c/1.expected:1.1 Mon Jan 21 07:32:09 2019
+++ othersrc/external/bsd/file2c/1.expected Mon Jan 21 07:34:04 2019
@@ -1,16 +1,16 @@
static const char *text = {
- 0x23, 0x9, 0x24, 0x4e, 0x65, 0x74, 0x42, 0x53, 0x44, 0x3a,
- 0x20, 0x70, 0x66, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2c, 0x76,
- 0x20, 0x31, 0x2e, 0x34, 0x20, 0x32, 0x30, 0x30, 0x38, 0x2f,
- 0x30, 0x36, 0x2f, 0x31, 0x38, 0x20, 0x30, 0x39, 0x3a, 0x30,
- 0x36, 0x3a, 0x32, 0x35, 0x20, 0x79, 0x61, 0x6d, 0x74, 0x20,
- 0x45, 0x78, 0x70, 0x20, 0x24, 0xa, 0x23, 0x9, 0x24, 0x4f,
- 0x70, 0x65, 0x6e, 0x42, 0x53, 0x44, 0x3a, 0x20, 0x70, 0x66,
- 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2c, 0x76, 0x20, 0x31, 0x2e,
- 0x33, 0x34, 0x20, 0x32, 0x30, 0x30, 0x37, 0x2f, 0x30, 0x32,
- 0x2f, 0x32, 0x34, 0x20, 0x31, 0x39, 0x3a, 0x33, 0x30, 0x3a,
- 0x35, 0x39, 0x20, 0x6d, 0x69, 0x6c, 0x6c, 0x65, 0x72, 0x74,
- 0x20, 0x45, 0x78, 0x70, 0x20, 0x24, 0xa, 0x23, 0xa, 0x23,
+ 0x23, 0x9, 0x46, 0x72, 0x6f, 0x6d, 0x20, 0x4e, 0x65, 0x74,
+ 0x42, 0x53, 0x44, 0x3a, 0x20, 0x31, 0x2e, 0x69, 0x6e, 0x2c,
+ 0x76, 0x20, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x31, 0x39,
+ 0x2f, 0x30, 0x31, 0x2f, 0x32, 0x31, 0x20, 0x30, 0x37, 0x3a,
+ 0x33, 0x32, 0x3a, 0x30, 0x39, 0x20, 0x61, 0x67, 0x63, 0x20,
+ 0x45, 0x78, 0x70, 0xa, 0x23, 0x9, 0x46, 0x72, 0x6f, 0x6d,
+ 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x42, 0x53, 0x44, 0x3a, 0x20,
+ 0x70, 0x66, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2c, 0x76, 0x20,
+ 0x31, 0x2e, 0x33, 0x34, 0x20, 0x32, 0x30, 0x30, 0x37, 0x2f,
+ 0x30, 0x32, 0x2f, 0x32, 0x34, 0x20, 0x31, 0x39, 0x3a, 0x33,
+ 0x30, 0x3a, 0x35, 0x39, 0x20, 0x6d, 0x69, 0x6c, 0x6c, 0x65,
+ 0x72, 0x74, 0x20, 0x45, 0x78, 0x70, 0xa, 0x23, 0xa, 0x23,
0x20, 0x53, 0x65, 0x65, 0x20, 0x70, 0x66, 0x2e, 0x63, 0x6f,
0x6e, 0x66, 0x28, 0x35, 0x29, 0x20, 0x61, 0x6e, 0x64, 0x20,
0x2f, 0x75, 0x73, 0x72, 0x2f, 0x73, 0x68, 0x61, 0x72, 0x65,
Index: othersrc/external/bsd/file2c/1.in
diff -u othersrc/external/bsd/file2c/1.in:1.1 othersrc/external/bsd/file2c/1.in:1.2
--- othersrc/external/bsd/file2c/1.in:1.1 Mon Jan 21 07:32:09 2019
+++ othersrc/external/bsd/file2c/1.in Mon Jan 21 07:34:04 2019
@@ -1,5 +1,5 @@
-# $NetBSD: 1.in,v 1.1 2019/01/21 07:32:09 agc Exp $
-# $OpenBSD: pf.conf,v 1.34 2007/02/24 19:30:59 millert Exp $
+# From NetBSD: 1.in,v 1.1 2019/01/21 07:32:09 agc Exp
+# From OpenBSD: pf.conf,v 1.34 2007/02/24 19:30:59 millert Exp
#
# See pf.conf(5) and /usr/share/examples/pf for syntax and examples.
# Remember to set net.inet.ip.forwarding=1 and/or net.inet6.ip6.forwarding=1
Index: othersrc/external/bsd/file2c/2.expected
diff -u othersrc/external/bsd/file2c/2.expected:1.1 othersrc/external/bsd/file2c/2.expected:1.2
--- othersrc/external/bsd/file2c/2.expected:1.1 Mon Jan 21 07:32:09 2019
+++ othersrc/external/bsd/file2c/2.expected Mon Jan 21 07:34:04 2019
@@ -1,13 +1,13 @@
static const char *text = {
- 35, 9, 36, 78, 101, 116, 66, 83, 68, 58, 32, 112, 102, 46,
- 99, 111, 110, 102, 44, 118, 32, 49, 46, 52, 32, 50, 48, 48,
- 56, 47, 48, 54, 47, 49, 56, 32, 48, 57, 58, 48, 54, 58,
- 50, 53, 32, 121, 97, 109, 116, 32, 69, 120, 112, 32, 36, 10,
- 35, 9, 36, 79, 112, 101, 110, 66, 83, 68, 58, 32, 112, 102,
- 46, 99, 111, 110, 102, 44, 118, 32, 49, 46, 51, 52, 32, 50,
- 48, 48, 55, 47, 48, 50, 47, 50, 52, 32, 49, 57, 58, 51,
- 48, 58, 53, 57, 32, 109, 105, 108, 108, 101, 114, 116, 32, 69,
- 120, 112, 32, 36, 10, 35, 10, 35, 32, 83, 101, 101, 32, 112,
+ 35, 9, 70, 114, 111, 109, 32, 78, 101, 116, 66, 83, 68, 58,
+ 32, 49, 46, 105, 110, 44, 118, 32, 49, 46, 49, 32, 50, 48,
+ 49, 57, 47, 48, 49, 47, 50, 49, 32, 48, 55, 58, 51, 50,
+ 58, 48, 57, 32, 97, 103, 99, 32, 69, 120, 112, 10, 35, 9,
+ 70, 114, 111, 109, 32, 79, 112, 101, 110, 66, 83, 68, 58, 32,
+ 112, 102, 46, 99, 111, 110, 102, 44, 118, 32, 49, 46, 51, 52,
+ 32, 50, 48, 48, 55, 47, 48, 50, 47, 50, 52, 32, 49, 57,
+ 58, 51, 48, 58, 53, 57, 32, 109, 105, 108, 108, 101, 114, 116,
+ 32, 69, 120, 112, 10, 35, 10, 35, 32, 83, 101, 101, 32, 112,
102, 46, 99, 111, 110, 102, 40, 53, 41, 32, 97, 110, 100, 32,
47, 117, 115, 114, 47, 115, 104, 97, 114, 101, 47, 101, 120, 97,
109, 112, 108, 101, 115, 47, 112, 102, 32, 102, 111, 114, 32, 115,
Index: othersrc/external/bsd/file2c/3.expected
diff -u othersrc/external/bsd/file2c/3.expected:1.1 othersrc/external/bsd/file2c/3.expected:1.2
--- othersrc/external/bsd/file2c/3.expected:1.1 Mon Jan 21 07:32:09 2019
+++ othersrc/external/bsd/file2c/3.expected Mon Jan 21 07:34:04 2019
@@ -1,13 +1,13 @@
static const char *text = {
-35, 9, 36, 78, 101, 116, 66, 83, 68, 58, 32, 112, 102, 46,
-99, 111, 110, 102, 44, 118, 32, 49, 46, 52, 32, 50, 48, 48,
-56, 47, 48, 54, 47, 49, 56, 32, 48, 57, 58, 48, 54, 58,
-50, 53, 32, 121, 97, 109, 116, 32, 69, 120, 112, 32, 36, 10,
-35, 9, 36, 79, 112, 101, 110, 66, 83, 68, 58, 32, 112, 102,
-46, 99, 111, 110, 102, 44, 118, 32, 49, 46, 51, 52, 32, 50,
-48, 48, 55, 47, 48, 50, 47, 50, 52, 32, 49, 57, 58, 51,
-48, 58, 53, 57, 32, 109, 105, 108, 108, 101, 114, 116, 32, 69,
-120, 112, 32, 36, 10, 35, 10, 35, 32, 83, 101, 101, 32, 112,
+35, 9, 70, 114, 111, 109, 32, 78, 101, 116, 66, 83, 68, 58,
+32, 49, 46, 105, 110, 44, 118, 32, 49, 46, 49, 32, 50, 48,
+49, 57, 47, 48, 49, 47, 50, 49, 32, 48, 55, 58, 51, 50,
+58, 48, 57, 32, 97, 103, 99, 32, 69, 120, 112, 10, 35, 9,
+70, 114, 111, 109, 32, 79, 112, 101, 110, 66, 83, 68, 58, 32,
+112, 102, 46, 99, 111, 110, 102, 44, 118, 32, 49, 46, 51, 52,
+32, 50, 48, 48, 55, 47, 48, 50, 47, 50, 52, 32, 49, 57,
+58, 51, 48, 58, 53, 57, 32, 109, 105, 108, 108, 101, 114, 116,
+32, 69, 120, 112, 10, 35, 10, 35, 32, 83, 101, 101, 32, 112,
102, 46, 99, 111, 110, 102, 40, 53, 41, 32, 97, 110, 100, 32,
47, 117, 115, 114, 47, 115, 104, 97, 114, 101, 47, 101, 120, 97,
109, 112, 108, 101, 115, 47, 112, 102, 32, 102, 111, 114, 32, 115,
