--- a/components/libpcap/patches/configure.in.patch	Tue Sep 20 22:58:42 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-In Solaris 12, we will be normalizing man pages. See PSARC 2015/428.
-This means that what was section 4, is now section 5 and what was in
-section 5 is now in section 7. But currently only for Solaris 12.
-
-This patch should eventually be sent upstream, but for that to happen
-it will need to be reworked into a form that will be acceptable for
-all versions of Solaris. Until then, we are just using this Solaris 12
-specific patch.
-
---- libpcap-1.7.4/configure.in.orig	2015-10-27 15:28:28.112790014 -0700
-+++ libpcap-1.7.4/configure.in	2015-10-27 15:29:50.259610071 -0700
[email protected]@ -1310,11 +1310,6 @@
- 	AC_DEFINE(HAVE_SOLARIS,1,[On solaris])
- 
- 	DYEXT="so"
--	#
--	# Use System V conventions for man pages.
--	#
--	MAN_FILE_FORMATS=4
--	MAN_MISC_INFO=5
- 	;;
- esac
- 

--- a/components/libpcap/patches/fix-man-page.patch	Tue Sep 20 22:58:42 2016 -0700
+++ b/components/libpcap/patches/fix-man-page.patch	Wed Sep 14 11:45:41 2016 +0200
@@ -1,24 +1,98 @@
-Adjust references to usermod(1M) to be usermod(8) in the pcap.3pcap man page.
+commit ab02a7a9053242efa81dfb3bda35117fe951b417
+Author: Vladimir Marek <[email protected]>
+Date:   Mon Sep 19 12:42:11 2016 +0200
 
-This patch should be sent upstream.
+    Fix man page locations on Solaris
+    
+    There are two problems:
+    a) usermod and ethers man pages lie in nonstandard path
+    b) Solaris 12 has the man pages sections reordered completely
 
---- libpcap-1.7.4/pcap.3pcap.in.orig	2016-04-20 08:29:21.594024650 -0700
-+++ libpcap-1.7.4/pcap.3pcap.in	2016-04-20 08:29:44.364454401 -0700
[email protected]@ -244,7 +244,7 @@
+diff --git a/configure.in b/configure.in
+index da2f940..b4943d5 100644
+--- a/configure.in
++++ b/configure.in
[email protected]@ -1191,6 +1191,8 @@ fi
+ DYEXT="none"
+ MAN_FILE_FORMATS=5
+ MAN_MISC_INFO=7
++MAN_USERMOD_SECTION=1M
++MAN_ETHERS_SECTION=3N
+ case "$host_os" in
+ 
+ aix*)
[email protected]@ -1423,12 +1425,25 @@ sinix*)
+ solaris*)
+ 	AC_DEFINE(HAVE_SOLARIS,1,[On solaris])
+ 
++	case "`uname -r`" in
++	    5.12)
++		MAN_USERMOD_SECTION=8
++		MAN_ETHERS_SECTION=5
++		MAN_FILE_FORMATS=5
++		MAN_MISC_INFO=7
++		;;
++	    *)
++		#
++		# Use System V conventions for man pages.
++		#
++
++		MAN_USERMOD_SECTION=1m
++		MAN_ETHERS_SECTION=4
++		MAN_FILE_FORMATS=4
++		MAN_MISC_INFO=5
++	esac
++
+ 	DYEXT="so"
+-	#
+-	# Use System V conventions for man pages.
+-	#
+-	MAN_FILE_FORMATS=4
+-	MAN_MISC_INFO=5
+ 	;;
+ esac
+ 
[email protected]@ -1472,6 +1487,8 @@ AC_SUBST(SSRC)
+ AC_SUBST(DYEXT)
+ AC_SUBST(MAN_FILE_FORMATS)
+ AC_SUBST(MAN_MISC_INFO)
++AC_SUBST(MAN_USERMOD_SECTION)
++AC_SUBST(MAN_ETHERS_SECTION)
+ 
+ AC_ARG_ENABLE([usb],
+ [AC_HELP_STRING([--enable-usb],[enable nusb support @<:@default=yes, if support [email protected]:>@])],
+diff --git a/pcap-filter.manmisc.in b/pcap-filter.manmisc.in
+index 9d3f34b..f10560e 100644
+--- a/pcap-filter.manmisc.in
++++ b/pcap-filter.manmisc.in
[email protected]@ -182,7 +182,7 @@ be checked for a match.
+ True if the Ethernet destination address is \fIehost\fP.
+ \fIEhost\fP
+ may be either a name from /etc/ethers or a number (see
+-.IR ethers (3N)
++.IR ethers (@[email protected])
+ for numeric format).
+ .IP "\fBether src \fIehost\fP"
+ True if the Ethernet source address is \fIehost\fP.
+diff --git a/pcap.3pcap.in b/pcap.3pcap.in
+index 93478f1..dd57798 100644
+--- a/pcap.3pcap.in
++++ b/pcap.3pcap.in
[email protected]@ -244,7 +244,7 @@ that device.  A user can be given that privilege by, for example, adding
  that privilege to the user's
  .B defaultpriv
  key with the
 -.B usermod (1M)
-+.B usermod (8)
++.B usermod (@[email protected])
  command.
  .TP
  .B Under HP-UX with DLPI:
[email protected]@ -915,7 +915,7 @@
[email protected]@ -915,7 +915,7 @@ script or some other configuration script to check whether the libpcap
  1.0 APIs are available and use them only if they are.
  .SH SEE ALSO
  autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@[email protected]), pfconfig(8),
 -usermod(1M)
-+usermod(8)
++usermod(@[email protected])
  .SH AUTHORS
  The original authors of libpcap are:
  .LP