tcpdump: remove 3.8.3; reinstatiate -O2 patch for 3.9.3; remove using local includes

diff --git a/packages/tcpdump/tcpdump_3.8.3.bb b/packages/tcpdump/tcpdump_3.8.3.bb
deleted file mode 100644 (file)
index f0274b4..0000000
--- a/packages/tcpdump/tcpdump_3.8.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "A sophisticated network protocol dumper"
-HOMEPAGE = "http://www.tcpdump.org/"
-LICENSE = "BSD"
-SECTION = "console/network"
-PRIORITY = "optional"
-DEPENDS = "libpcap-0.8.3"
-PR = "r1"
-
-SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
-           file://fix-paths.patch;patch=1"
-
-inherit autotools 
-
-do_configure() {
-       gnu-configize
-       oe_runconf
-}

diff --git a/packages/tcpdump/tcpdump_3.9.3.bb b/packages/tcpdump/tcpdump_3.9.3.bb
index d342253..2caaa3a 100644 (file)
--- a/packages/tcpdump/tcpdump_3.9.3.bb
+++ b/packages/tcpdump/tcpdump_3.9.3.bb
@@ -4,14 +4,18 @@ LICENSE = "BSD"
 SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "libpcap-0.9.3 openssl"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz"
+SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
+           file://tcpdump_configure_no_-O2.patch;patch=1"
 
 inherit autotools 
 
+EXTRA_OECONF = "--without-crypto"
+
 do_configure() {
        gnu-configize
        oe_runconf
+        sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
+        sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
 }
-