4 |
4 |
5 Fix man page locations on Solaris |
5 Fix man page locations on Solaris |
6 |
6 |
7 There are two problems: |
7 There are two problems: |
8 a) usermod and ethers man pages lie in nonstandard path |
8 a) usermod and ethers man pages lie in nonstandard path |
9 b) Solaris 12 has the man pages sections reordered completely |
9 b) Newer Solaris versions have the man pages sections reordered completely |
10 |
10 |
11 diff --git a/configure.in b/configure.in |
11 --- a/configure.in 2015-04-22 13:19:15.000000000 +0000 |
12 index da2f940..b4943d5 100644 |
12 +++ b/configure.in 2017-03-22 10:07:21.877704267 +0000 |
13 --- a/configure.in |
13 @@ -1077,6 +1077,8 @@ |
14 +++ b/configure.in |
|
15 @@ -1191,6 +1191,8 @@ fi |
|
16 DYEXT="none" |
14 DYEXT="none" |
17 MAN_FILE_FORMATS=5 |
15 MAN_FILE_FORMATS=5 |
18 MAN_MISC_INFO=7 |
16 MAN_MISC_INFO=7 |
19 +MAN_USERMOD_SECTION=1M |
17 +MAN_USERMOD_SECTION=1M |
20 +MAN_ETHERS_SECTION=3N |
18 +MAN_ETHERS_SECTION=3N |
21 case "$host_os" in |
19 case "$host_os" in |
22 |
20 |
23 aix*) |
21 aix*) |
24 @@ -1423,12 +1425,25 @@ sinix*) |
22 @@ -1309,12 +1311,23 @@ |
25 solaris*) |
23 solaris*) |
26 AC_DEFINE(HAVE_SOLARIS,1,[On solaris]) |
24 AC_DEFINE(HAVE_SOLARIS,1,[On solaris]) |
27 |
25 |
28 + case "`uname -r`" in |
26 + if test -f /usr/share/man/man7/attributes.7 ; then |
29 + 5.12) |
|
30 + MAN_USERMOD_SECTION=8 |
27 + MAN_USERMOD_SECTION=8 |
31 + MAN_ETHERS_SECTION=5 |
28 + MAN_ETHERS_SECTION=5 |
32 + MAN_FILE_FORMATS=5 |
29 + MAN_FILE_FORMATS=5 |
33 + MAN_MISC_INFO=7 |
30 + MAN_MISC_INFO=7 |
34 + ;; |
31 + else |
35 + *) |
|
36 + # |
32 + # |
37 + # Use System V conventions for man pages. |
33 + # Use System V conventions for man pages. |
38 + # |
34 + # |
39 + |
35 + |
40 + MAN_USERMOD_SECTION=1m |
36 + MAN_USERMOD_SECTION=1m |
41 + MAN_ETHERS_SECTION=4 |
37 + MAN_ETHERS_SECTION=4 |
42 + MAN_FILE_FORMATS=4 |
38 + MAN_FILE_FORMATS=4 |
43 + MAN_MISC_INFO=5 |
39 + MAN_MISC_INFO=5 |
44 + esac |
40 + fi |
45 + |
41 + |
46 DYEXT="so" |
42 DYEXT="so" |
47 - # |
43 - # |
48 - # Use System V conventions for man pages. |
44 - # Use System V conventions for man pages. |
49 - # |
45 - # |
50 - MAN_FILE_FORMATS=4 |
46 - MAN_FILE_FORMATS=4 |
51 - MAN_MISC_INFO=5 |
47 - MAN_MISC_INFO=5 |
52 ;; |
48 ;; |
53 esac |
49 esac |
54 |
50 |
55 @@ -1472,6 +1487,8 @@ AC_SUBST(SSRC) |
51 @@ -1364,6 +1377,8 @@ |
56 AC_SUBST(DYEXT) |
52 AC_SUBST(DYEXT) |
57 AC_SUBST(MAN_FILE_FORMATS) |
53 AC_SUBST(MAN_FILE_FORMATS) |
58 AC_SUBST(MAN_MISC_INFO) |
54 AC_SUBST(MAN_MISC_INFO) |
59 +AC_SUBST(MAN_USERMOD_SECTION) |
55 +AC_SUBST(MAN_USERMOD_SECTION) |
60 +AC_SUBST(MAN_ETHERS_SECTION) |
56 +AC_SUBST(MAN_ETHERS_SECTION) |
61 |
57 |
62 AC_ARG_ENABLE([usb], |
58 AC_ARG_ENABLE([usb], |
63 [AC_HELP_STRING([--enable-usb],[enable nusb support @<:@default=yes, if support available@:>@])], |
59 [AC_HELP_STRING([--enable-usb],[enable nusb support @<:@default=yes, if support available@:>@])], |
64 diff --git a/pcap-filter.manmisc.in b/pcap-filter.manmisc.in |
|
65 index 9d3f34b..f10560e 100644 |
|
66 --- a/pcap-filter.manmisc.in |
60 --- a/pcap-filter.manmisc.in |
67 +++ b/pcap-filter.manmisc.in |
61 +++ b/pcap-filter.manmisc.in |
68 @@ -182,7 +182,7 @@ be checked for a match. |
62 @@ -182,7 +182,7 @@ be checked for a match. |
69 True if the Ethernet destination address is \fIehost\fP. |
63 True if the Ethernet destination address is \fIehost\fP. |
70 \fIEhost\fP |
64 \fIEhost\fP |
72 -.IR ethers (3N) |
66 -.IR ethers (3N) |
73 +.IR ethers (@MAN_ETHERS_SECTION@) |
67 +.IR ethers (@MAN_ETHERS_SECTION@) |
74 for numeric format). |
68 for numeric format). |
75 .IP "\fBether src \fIehost\fP" |
69 .IP "\fBether src \fIehost\fP" |
76 True if the Ethernet source address is \fIehost\fP. |
70 True if the Ethernet source address is \fIehost\fP. |
77 diff --git a/pcap.3pcap.in b/pcap.3pcap.in |
|
78 index 93478f1..dd57798 100644 |
|
79 --- a/pcap.3pcap.in |
71 --- a/pcap.3pcap.in |
80 +++ b/pcap.3pcap.in |
72 +++ b/pcap.3pcap.in |
81 @@ -244,7 +244,7 @@ that device. A user can be given that privilege by, for example, adding |
73 @@ -244,7 +244,7 @@ that device. A user can be given that privilege by, for example, adding |
82 that privilege to the user's |
74 that privilege to the user's |
83 .B defaultpriv |
75 .B defaultpriv |