21753385 include pcap-int.h in package s11u3-sru
authoryumo.liu@oracle.com <yumo.liu@oracle.com>
Mon, 13 Jun 2016 13:09:21 -0700
branchs11u3-sru
changeset 6171 0ee281735521
parent 6168 b3cd649419fe
child 6179 c1e48527e8db
21753385 include pcap-int.h in package
components/libpcap/libpcap.p5m
components/libpcap/patches/Makefile.in.patch
--- a/components/libpcap/libpcap.p5m	Mon Jun 13 10:35:12 2016 -0700
+++ b/components/libpcap/libpcap.p5m	Mon Jun 13 13:09:21 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 # The libpcap man pages should go in section 3pcap instead of
@@ -41,6 +41,7 @@
 file path=usr/bin/$(MACH64)/pcap-config
 file path=usr/bin/pcap-config
 file path=usr/include/pcap-bpf.h
+file path=usr/include/pcap-int.h
 file path=usr/include/pcap-namedb.h
 file path=usr/include/pcap.h
 file path=usr/include/pcap/bluetooth.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libpcap/patches/Makefile.in.patch	Mon Jun 13 13:09:21 2016 -0700
@@ -0,0 +1,20 @@
+# This patch comes from Oracle. It makes pcap-int.h available
+# for inclusion into the resulting package delivering libpcap.
+# It is needed to build pflogd (we need 'struct pcap' at least).
+#
+# I filed a bug for upstream at
+#   https://github.com/the-tcpdump-group/libpcap/issues/457
+# however, upstream does not like this idea as they consider
+# this header file 'internal' and subject to possible future
+# changes that would break its consumers.
+
+--- ORIGINAL/./Makefile.in	2013-11-07 15:23:22.000000000 -0800
++++ libpcap-1.5.1/./Makefile.in	2016-05-25 16:24:23.262203575 -0700
+@@ -102,6 +102,7 @@
+ PUBHDR = \
+ 	pcap.h \
+ 	pcap-bpf.h \
++	pcap-int.h \
+ 	pcap-namedb.h \
+ 	pcap/bpf.h \
+ 	pcap/bluetooth.h \