From 5b01b27522b32b4ee14588764768a33ff7312a3a Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 7 Sep 2007 20:13:11 +0000
Subject: tcpdump: update to 3.9.7 whic do not need libpcap 0.9.3 but builds
 with 0.9.6

---
 packages/tcpdump/tcpdump_3.9.3.bb | 21 ---------------------
 packages/tcpdump/tcpdump_3.9.7.bb | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 21 deletions(-)
 delete mode 100644 packages/tcpdump/tcpdump_3.9.3.bb
 create mode 100644 packages/tcpdump/tcpdump_3.9.7.bb

diff --git a/packages/tcpdump/tcpdump_3.9.3.bb b/packages/tcpdump/tcpdump_3.9.3.bb
deleted file mode 100644
index 7ffcc9a37f..0000000000
--- a/packages/tcpdump/tcpdump_3.9.3.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "A sophisticated network protocol analyzer"
-HOMEPAGE = "http://www.tcpdump.org/"
-LICENSE = "BSD"
-SECTION = "console/network"
-PRIORITY = "optional"
-DEPENDS = "libpcap-0.9.3"
-PR = "r2"
-
-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
-}
diff --git a/packages/tcpdump/tcpdump_3.9.7.bb b/packages/tcpdump/tcpdump_3.9.7.bb
new file mode 100644
index 0000000000..ba9710d86a
--- /dev/null
+++ b/packages/tcpdump/tcpdump_3.9.7.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "A sophisticated network protocol analyzer"
+HOMEPAGE = "http://www.tcpdump.org/"
+LICENSE = "BSD"
+SECTION = "console/network"
+PRIORITY = "optional"
+DEPENDS = "libpcap"
+
+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
+}
-- 
cgit v1.2.3


From 8a00555b71e47ee86e8449a8f44b7e16c3cef1ae Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 7 Sep 2007 20:22:38 +0000
Subject: base.bbclass: change message about lack of checksums.ini entry for
 URI to something easier to understand

---
 classes/base.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index d4b327e266..999d409914 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -487,9 +487,9 @@ python base_do_fetch() {
 		try:
 			if not base_chk_file(parser, pn, pv,uri, localpath, d):
 				if type != "file":
-					bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
+					bb.note("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri))
 				else:
-					bb.debug("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
+					bb.debug("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri))
 		except Exception:
 			raise bb.build.FuncFailed("Checksum of '%s' failed" % uri)
 }
-- 
cgit v1.2.3