author | Rich Burridge <rich.burridge@oracle.com> |
Thu, 06 Apr 2017 11:44:41 -0700 | |
changeset 7843 | 56b5a2b1ab27 |
parent 7829 | 2de4f4ace09c |
permissions | -rw-r--r-- |
6942
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
1 |
commit ab02a7a9053242efa81dfb3bda35117fe951b417 |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
2 |
Author: Vladimir Marek <[email protected]> |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
3 |
Date: Mon Sep 19 12:42:11 2016 +0200 |
5826
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
|
6942
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
5 |
Fix man page locations on Solaris |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
6 |
|
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
7 |
There are two problems: |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
8 |
a) usermod and ethers man pages lie in nonstandard path |
7829
2de4f4ace09c
25766761 prepare Userland for 11.4
John Beck <John.Beck@Oracle.COM>
parents:
6942
diff
changeset
|
9 |
b) Newer Solaris versions have the man pages sections reordered completely |
5826
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
|
7829
2de4f4ace09c
25766761 prepare Userland for 11.4
John Beck <John.Beck@Oracle.COM>
parents:
6942
diff
changeset
|
11 |
--- a/configure.in 2015-04-22 13:19:15.000000000 +0000 |
2de4f4ace09c
25766761 prepare Userland for 11.4
John Beck <John.Beck@Oracle.COM>
parents:
6942
diff
changeset
|
12 |
+++ b/configure.in 2017-03-22 10:07:21.877704267 +0000 |
2de4f4ace09c
25766761 prepare Userland for 11.4
John Beck <John.Beck@Oracle.COM>
parents:
6942
diff
changeset
|
13 |
@@ -1077,6 +1077,8 @@ |
6942
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
14 |
DYEXT="none" |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
15 |
MAN_FILE_FORMATS=5 |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
16 |
MAN_MISC_INFO=7 |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
17 |
+MAN_USERMOD_SECTION=1M |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
18 |
+MAN_ETHERS_SECTION=3N |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
19 |
case "$host_os" in |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
20 |
|
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
21 |
aix*) |
7829
2de4f4ace09c
25766761 prepare Userland for 11.4
John Beck <John.Beck@Oracle.COM>
parents:
6942
diff
changeset
|
22 |
@@ -1309,12 +1311,23 @@ |
6942
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
23 |
solaris*) |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
24 |
AC_DEFINE(HAVE_SOLARIS,1,[On solaris]) |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
25 |
|
7829
2de4f4ace09c
25766761 prepare Userland for 11.4
John Beck <John.Beck@Oracle.COM>
parents:
6942
diff
changeset
|
26 |
+ if test -f /usr/share/man/man7/attributes.7 ; then |
6942
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
27 |
+ MAN_USERMOD_SECTION=8 |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
28 |
+ MAN_ETHERS_SECTION=5 |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
29 |
+ MAN_FILE_FORMATS=5 |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
30 |
+ MAN_MISC_INFO=7 |
7829
2de4f4ace09c
25766761 prepare Userland for 11.4
John Beck <John.Beck@Oracle.COM>
parents:
6942
diff
changeset
|
31 |
+ else |
6942
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
32 |
+ # |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
33 |
+ # Use System V conventions for man pages. |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
34 |
+ # |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
35 |
+ |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
36 |
+ MAN_USERMOD_SECTION=1m |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
37 |
+ MAN_ETHERS_SECTION=4 |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
38 |
+ MAN_FILE_FORMATS=4 |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
39 |
+ MAN_MISC_INFO=5 |
7829
2de4f4ace09c
25766761 prepare Userland for 11.4
John Beck <John.Beck@Oracle.COM>
parents:
6942
diff
changeset
|
40 |
+ fi |
6942
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
41 |
+ |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
42 |
DYEXT="so" |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
43 |
- # |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
44 |
- # Use System V conventions for man pages. |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
45 |
- # |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
46 |
- MAN_FILE_FORMATS=4 |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
47 |
- MAN_MISC_INFO=5 |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
48 |
;; |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
49 |
esac |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
50 |
|
7829
2de4f4ace09c
25766761 prepare Userland for 11.4
John Beck <John.Beck@Oracle.COM>
parents:
6942
diff
changeset
|
51 |
@@ -1364,6 +1377,8 @@ |
6942
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
52 |
AC_SUBST(DYEXT) |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
53 |
AC_SUBST(MAN_FILE_FORMATS) |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
54 |
AC_SUBST(MAN_MISC_INFO) |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
55 |
+AC_SUBST(MAN_USERMOD_SECTION) |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
56 |
+AC_SUBST(MAN_ETHERS_SECTION) |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
57 |
|
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
58 |
AC_ARG_ENABLE([usb], |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
59 |
[AC_HELP_STRING([--enable-usb],[enable nusb support @<:@default=yes, if support available@:>@])], |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
60 |
--- a/pcap-filter.manmisc.in |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
61 |
+++ b/pcap-filter.manmisc.in |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
62 |
@@ -182,7 +182,7 @@ be checked for a match. |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
63 |
True if the Ethernet destination address is \fIehost\fP. |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
64 |
\fIEhost\fP |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
65 |
may be either a name from /etc/ethers or a number (see |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
66 |
-.IR ethers (3N) |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
67 |
+.IR ethers (@MAN_ETHERS_SECTION@) |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
68 |
for numeric format). |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
69 |
.IP "\fBether src \fIehost\fP" |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
70 |
True if the Ethernet source address is \fIehost\fP. |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
71 |
--- a/pcap.3pcap.in |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
72 |
+++ b/pcap.3pcap.in |
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
73 |
@@ -244,7 +244,7 @@ that device. A user can be given that privilege by, for example, adding |
5826
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
74 |
that privilege to the user's |
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
75 |
.B defaultpriv |
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
76 |
key with the |
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
77 |
-.B usermod (1M) |
6942
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
78 |
+.B usermod (@MAN_USERMOD_SECTION@) |
5826
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
79 |
command. |
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
80 |
.TP |
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
81 |
.B Under HP-UX with DLPI: |
6942
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
82 |
@@ -915,7 +915,7 @@ script or some other configuration script to check whether the libpcap |
5826
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
83 |
1.0 APIs are available and use them only if they are. |
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
84 |
.SH SEE ALSO |
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
85 |
autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8), |
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
86 |
-usermod(1M) |
6942
d4c5b8626f38
24605406 Man page pcap-filter(5) refers ethers(3N) which is ethers(4) on Solaris
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5826
diff
changeset
|
87 |
+usermod(@MAN_USERMOD_SECTION@) |
5826
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
88 |
.SH AUTHORS |
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
89 |
The original authors of libpcap are: |
9c90e4a8156c
23137909 Userland man page normalization work
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
90 |
.LP |