libpcap: Update to 1.0.0 and sync with OE.dev

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

8 files changed, 231 insertions, 37 deletions

diff --git a/meta/packages/libpcap/libpcap-1.0.0/aclocal.patch b/meta/packages/libpcap/libpcap-1.0.0/aclocal.patch
new file mode 100644
index 0000000000..29cd275d58
--- /dev/null
+++ b/meta/packages/libpcap/libpcap-1.0.0/aclocal.patch
@@ -0,0 +1,156 @@
+diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
+--- libpcap-0.9.7.orig/aclocal.m4       2007-09-16 01:19:51.000000000 +0200
++++ libpcap-0.9.7/aclocal.m4    2007-09-16 02:45:52.000000000 +0200
+@@ -42,7 +42,7 @@
+ dnl    ac_cv_lbl_gcc_vers
+ dnl    LBL_CFLAGS
+ dnl
+-AC_DEFUN(AC_LBL_C_INIT,
++AC_DEFUN([AC_LBL_C_INIT],
+     [AC_PREREQ(2.12)
+     AC_BEFORE([$0], [AC_PROG_CC])
+     AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
+@@ -169,7 +169,7 @@
+ # Make sure we use the V_CCOPT flags, because some of those might
+ # disable inlining.
+ #
+-AC_DEFUN(AC_LBL_C_INLINE,
++AC_DEFUN([AC_LBL_C_INLINE],
+     [AC_MSG_CHECKING(for inline)
+     save_CFLAGS="$CFLAGS"
+     CFLAGS="$V_CCOPT"
+@@ -225,7 +225,7 @@
+ dnl    LIBS
+ dnl    LBL_LIBS
+ dnl
+-AC_DEFUN(AC_LBL_LIBPCAP,
++AC_DEFUN([AC_LBL_LIBPCAP],
+     [AC_REQUIRE([AC_LBL_LIBRARY_NET])
+     dnl
+     dnl save a copy before locating libpcap.a
+@@ -293,7 +293,7 @@
+ dnl    RETSIGTYPE (defined)
+ dnl    RETSIGVAL (defined)
+ dnl
+-AC_DEFUN(AC_LBL_TYPE_SIGNAL,
++AC_DEFUN([AC_LBL_TYPE_SIGNAL],
+     [AC_BEFORE([$0], [AC_LBL_LIBPCAP])
+     AC_TYPE_SIGNAL
+     if test "$ac_cv_type_signal" = void ; then
+@@ -323,7 +323,7 @@
+ dnl
+ dnl    AC_LBL_FIXINCLUDES
+ dnl
+-AC_DEFUN(AC_LBL_FIXINCLUDES,
++AC_DEFUN([AC_LBL_FIXINCLUDES],
+     [if test "$GCC" = yes ; then
+            AC_MSG_CHECKING(for ANSI ioctl definitions)
+            AC_CACHE_VAL(ac_cv_lbl_gcc_fixincludes,
+@@ -369,7 +369,7 @@
+ dnl    $2 (yacc appended)
+ dnl    $3 (optional flex and bison -P prefix)
+ dnl
+-AC_DEFUN(AC_LBL_LEX_AND_YACC,
++AC_DEFUN([AC_LBL_LEX_AND_YACC],
+     [AC_ARG_WITH(flex, [  --without-flex          don't use flex])
+     AC_ARG_WITH(bison, [  --without-bison         don't use bison])
+     if test "$with_flex" = no ; then
+@@ -422,7 +422,7 @@
+ dnl
+ dnl    DECLWAITSTATUS (defined)
+ dnl
+-AC_DEFUN(AC_LBL_UNION_WAIT,
++AC_DEFUN([AC_LBL_UNION_WAIT],
+     [AC_MSG_CHECKING(if union wait is used)
+     AC_CACHE_VAL(ac_cv_lbl_union_wait,
+        AC_TRY_COMPILE([
+@@ -451,7 +451,7 @@
+ dnl
+ dnl    HAVE_SOCKADDR_SA_LEN (defined)
+ dnl
+-AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN,
++AC_DEFUN([AC_LBL_SOCKADDR_SA_LEN],
+     [AC_MSG_CHECKING(if sockaddr struct has sa_len member)
+     AC_CACHE_VAL(ac_cv_lbl_sockaddr_has_sa_len,
+        AC_TRY_COMPILE([
+@@ -476,7 +476,7 @@
+ dnl
+ dnl    HAVE_SOCKADDR_STORAGE (defined)
+ dnl
+-AC_DEFUN(AC_LBL_SOCKADDR_STORAGE,
++AC_DEFUN([AC_LBL_SOCKADDR_STORAGE],
+     [AC_MSG_CHECKING(if sockaddr_storage struct exists)
+     AC_CACHE_VAL(ac_cv_lbl_has_sockaddr_storage,
+        AC_TRY_COMPILE([
+@@ -509,7 +509,7 @@
+ dnl won't be using code that would use that member, or we wouldn't
+ dnl compile in any case).
+ dnl
+-AC_DEFUN(AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1,
++AC_DEFUN([AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1],
+     [AC_MSG_CHECKING(if dl_hp_ppa_info_t struct has dl_module_id_1 member)
+     AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1,
+        AC_TRY_COMPILE([
+@@ -535,7 +535,7 @@
+ dnl
+ dnl    ac_cv_lbl_have_run_path (yes or no)
+ dnl
+-AC_DEFUN(AC_LBL_HAVE_RUN_PATH,
++AC_DEFUN([AC_LBL_HAVE_RUN_PATH],
+     [AC_MSG_CHECKING(for ${CC-cc} -R)
+     AC_CACHE_VAL(ac_cv_lbl_have_run_path,
+        [echo 'main(){}' > conftest.c
+@@ -561,7 +561,7 @@
+ dnl    int32_t (defined)
+ dnl    u_int32_t (defined)
+ dnl
+-AC_DEFUN(AC_LBL_CHECK_TYPE,
++AC_DEFUN([AC_LBL_CHECK_TYPE],
+     [AC_MSG_CHECKING(for $1 using $CC)
+     AC_CACHE_VAL(ac_cv_lbl_have_$1,
+        AC_TRY_COMPILE([
+@@ -590,7 +590,7 @@
+ dnl
+ dnl    LBL_ALIGN (DEFINED)
+ dnl
+-AC_DEFUN(AC_LBL_UNALIGNED_ACCESS,
++AC_DEFUN([AC_LBL_UNALIGNED_ACCESS],
+     [AC_MSG_CHECKING(if unaligned accesses fail)
+     AC_CACHE_VAL(ac_cv_lbl_unaligned_fail,
+        [case "$host_cpu" in
+@@ -695,7 +695,7 @@
+ dnl    HAVE_OS_PROTO_H (defined)
+ dnl    os-proto.h (symlinked)
+ dnl
+-AC_DEFUN(AC_LBL_DEVEL,
++AC_DEFUN([AC_LBL_DEVEL],
+     [rm -f os-proto.h
+     if test "${LBL_CFLAGS+set}" = set; then
+            $1="$$1 ${LBL_CFLAGS}"
+@@ -825,7 +825,7 @@
+ dnl statically and happen to have a libresolv.a lying around (and no
+ dnl libnsl.a).
+ dnl
+-AC_DEFUN(AC_LBL_LIBRARY_NET, [
++AC_DEFUN([AC_LBL_LIBRARY_NET], [
+     # Most operating systems have gethostbyname() in the default searched
+     # libraries (i.e. libc):
+     # Some OSes (eg. Solaris) place it in libnsl
+@@ -848,7 +848,7 @@
+ dnl Test for __attribute__
+ dnl
+ 
+-AC_DEFUN(AC_C___ATTRIBUTE__, [
++AC_DEFUN([AC_C___ATTRIBUTE__], [
+ AC_MSG_CHECKING(for __attribute__)
+ AC_CACHE_VAL(ac_cv___attribute__, [
+ AC_COMPILE_IFELSE(
+@@ -886,7 +886,7 @@
+ dnl
+ dnl -Scott Barron
+ dnl
+-AC_DEFUN(AC_LBL_TPACKET_STATS,
++AC_DEFUN([AC_LBL_TPACKET_STATS],
+    [AC_MSG_CHECKING(if if_packet.h has tpacket_stats defined)
+    AC_CACHE_VAL(ac_cv_lbl_tpacket_stats,
+    AC_TRY_COMPILE([
diff --git a/meta/packages/libpcap/libpcap-0.9.3/config-fixes.patch b/meta/packages/libpcap/libpcap-1.0.0/config-fixes.patch
index 166816eb8f..166816eb8f 100644
--- a/meta/packages/libpcap/libpcap-0.9.3/config-fixes.patch
+++ b/meta/packages/libpcap/libpcap-1.0.0/config-fixes.patch
diff --git a/meta/packages/libpcap/libpcap-1.0.0/ieee80215-arphrd.patch b/meta/packages/libpcap/libpcap-1.0.0/ieee80215-arphrd.patch
new file mode 100644
index 0000000000..f29c7cb54c
--- /dev/null
+++ b/meta/packages/libpcap/libpcap-1.0.0/ieee80215-arphrd.patch
@@ -0,0 +1,22 @@
+Index: libpcap-1.0.0/pcap-linux.c
+===================================================================
+--- libpcap-1.0.0.orig/pcap-linux.c     2009-01-28 11:58:54.000000000 +0300
++++ libpcap-1.0.0/pcap-linux.c  2009-01-28 11:59:04.000000000 +0300
+@@ -1616,6 +1616,17 @@
+                 * so let's use "Linux-cooked" mode. Jean II */
+                //handle->md.cooked = 1;
+                break;
++#ifndef ARPHRD_IEEE80215
++#define ARPHRD_IEEE80215 804
++#endif
++#ifndef ARPHRD_IEEE80215_PHY
++#define ARPHRD_IEEE80215_PHY 805
++#endif
++
++    case ARPHRD_IEEE80215:
++    case ARPHRD_IEEE80215_PHY:
++        handle->linktype = DLT_IEEE802_15_4;
++        break;
+ 
+        /* ARPHRD_LAPD is unofficial and randomly allocated, if reallocation
+         * is needed, please report it to <daniele@orlandi.com> */
diff --git a/meta/packages/libpcap/libpcap-1.0.0/ldflags.patch b/meta/packages/libpcap/libpcap-1.0.0/ldflags.patch
new file mode 100644
index 0000000000..66ab5f725f
--- /dev/null
+++ b/meta/packages/libpcap/libpcap-1.0.0/ldflags.patch
@@ -0,0 +1,12 @@
+diff -urN libpcap-1.0.0.orig/Makefile.in libpcap-1.0.0/Makefile.in
+--- libpcap-1.0.0.orig/Makefile.in      2008-10-28 01:26:13.000000000 +0000
++++ libpcap-1.0.0/Makefile.in   2009-04-02 13:54:20.000000000 +0000
+@@ -326,7 +326,7 @@
+ #
+ libpcap.so: $(OBJ)
+        @rm -f $@
+-       $(CC) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
++       $(CC) $(LDFLAGS) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
+ 
+ #
+ # The following rule succeeds, but the result is untested.
diff --git a/meta/packages/libpcap/libpcap-0.9.3/shared.patch b/meta/packages/libpcap/libpcap-1.0.0/shared.patch
index cc66a5e5ef..cbdb181633 100644
--- a/meta/packages/libpcap/libpcap-0.9.3/shared.patch
+++ b/meta/packages/libpcap/libpcap-1.0.0/shared.patch
@@ -1,7 +1,4 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
+Patch currently not applied but would be better or worse than customised do_install?
 
 --- libpcap-0.9.3/Makefile.in~shared
 +++ libpcap-0.9.3/Makefile.in
diff --git a/meta/packages/libpcap/libpcap.inc b/meta/packages/libpcap/libpcap.inc
new file mode 100644
index 0000000000..d8f0b2561c
--- /dev/null
+++ b/meta/packages/libpcap/libpcap.inc
@@ -0,0 +1,21 @@
+DESCRIPTION = "Network Packet Capture Library"
+HOMEPAGE = "http://www.tcpdump.org/"
+SECTION = "libs/network"
+LICENSE = "BSD"
+DEPENDS = "flex-native bison-native"
+
+SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-pcap=linux"
+
+CPPFLAGS_prepend = "-I${S} "
+CFLAGS_prepend = "-I${S} "
+CXXFLAGS_prepend = "-I${S} "
+
+do_configure_prepend () {
+        if [ ! -e acinclude.m4 ]; then
+                cat aclocal.m4 > acinclude.m4
+        fi
+}
diff --git a/meta/packages/libpcap/libpcap_0.9.3.bb b/meta/packages/libpcap/libpcap_0.9.3.bb
deleted file mode 100644
index 61be09d8cd..0000000000
--- a/meta/packages/libpcap/libpcap_0.9.3.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "Network Packet Capture Library"
-HOMEPAGE = "http://www.tcpdump.org/"
-LICENSE = "BSD"
-SECTION = "libs/network"
-PR = "r2"
-
-SRC_URI = "http://www.at.tcpdump.org/release/libpcap-${PV}.tar.gz \
-           file://shared.patch;patch=1 \
-           file://config-fixes.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-pcap=linux"
-
-CPPFLAGS_prepend = "-I${S} "
-CFLAGS_prepend = "-I${S} "
-CXXFLAGS_prepend = "-I${S} "
-
-do_configure_prepend () {
-        if [ ! -e acinclude.m4 ]; then
-                cat aclocal.m4 > acinclude.m4
-        fi
-}
-
-# Does anything really need these things?
-#do_stage () {
-#       autotools_stage_all
-#
-#       install -d ${STAGING_INCDIR}/net
-#       ln -sf ${STAGING_INCDIR}/pcap-bpf.h ${STAGING_INCDIR}/net/bpf.h
-#       
-#       install -m 0644 acinclude.m4 ${STAGING_DATADIR}/aclocal/libpcap.m4
-#}
diff --git a/meta/packages/libpcap/libpcap_1.0.0.bb b/meta/packages/libpcap/libpcap_1.0.0.bb
new file mode 100644
index 0000000000..edd9706b1e
--- /dev/null
+++ b/meta/packages/libpcap/libpcap_1.0.0.bb
@@ -0,0 +1,19 @@
+require libpcap.inc
+
+PR = "r0"
+
+SRC_URI += "file://config-fixes.patch;patch=1 \
+            file://aclocal.patch;patch=1 \
+            file://ieee80215-arphrd.patch;patch=1 \
+            file://ldflags.patch;patch=1"
+
+#
+# make install doesn't cover the shared lib
+# make install-shared is just broken (no symlinks)
+#
+do_install_prepend () {
+        install -d ${D}${libdir}
+        install -d ${D}${bindir}
+        oe_runmake install-shared DESTDIR=${D}
+        oe_libinstall -a -so libpcap ${D}${libdir}
+}