nbd: Update to 2.9.20

2.8.x is very old and probably has security issues such as
CVE-2011-0530 (unconfirmed on 2.8.7).  But given that 2.8.7
also didn't compile with anything recent for kernel headers, it's
best to just move up to current.

Signed-off-by: Tom Rini <tom_rini@mentor.com>

2 files changed, 3 insertions, 67 deletions

diff --git a/recipes/nbd/files/cross-compile.patch b/recipes/nbd/files/cross-compile.patch
deleted file mode 100644
index 1d0a135bb9..0000000000
--- a/recipes/nbd/files/cross-compile.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Cross Compile fixes:
-    The sanitized kernel headers use __u32 and __u64
-    let us define those.
-
-
-Index: nbd-2.8.7/configure.ac
-===================================================================
---- nbd-2.8.7.orig/configure.ac	2006-10-17 19:42:11.000000000 +0200
-+++ nbd-2.8.7/configure.ac	2007-01-19 14:19:09.000000000 +0100
-@@ -68,15 +68,16 @@
-               man8_MANS=nbd-client.8
- 	      AC_MSG_RESULT(yes)
-               ;;
--     *) AC_MSG_RESULT(no) ;;
-+     dnl uname is a pretty stupid idea... we could be on freeBSD,OS X...
-+     *) AC_MSG_RESULT(yes) ;;
- esac
- AC_MSG_CHECKING(where to find a working nbd.h)
- dnl We need to check for NBD_CMD_DISC, but that's part of an enum, it is not
- dnl #define'd. Therefore, we check for something which is differently #define'd
- dnl in the old or new versions, even if we don't really care about that.
- dnl This might break at some time, but it should work for now, so...
--AC_TRY_COMPILE([#define u32 int
--#define u64 int
-+AC_TRY_COMPILE([#define __u32 int
-+#define __u64 int
- #define __be32 int
- #define __be64 int
- #include "nbd.h"
-Index: nbd-2.8.7/cliserv.h
-===================================================================
---- nbd-2.8.7.orig/cliserv.h	2006-10-17 19:29:12.000000000 +0200
-+++ nbd-2.8.7/cliserv.h	2007-01-19 14:17:15.000000000 +0100
-@@ -17,20 +17,26 @@
- 
- #if SIZEOF_UNSIGNED_SHORT_INT==4
- typedef unsigned short u32;
-+typedef unsigned short __u32;
- #elif SIZEOF_UNSIGNED_INT==4
- typedef unsigned int u32;
-+typedef unsigned int __u32;
- #elif SIZEOF_UNSIGNED_LONG_INT==4
- typedef unsigned long u32;
-+typedef unsigned long __u32;
- #else
- #error I need at least some 32-bit type
- #endif
- 
- #if SIZEOF_UNSIGNED_INT==8
- typedef unsigned int u64;
-+typedef unsigned int __u64;
- #elif SIZEOF_UNSIGNED_LONG_INT==8
- typedef unsigned long u64;
-+typedef unsigned long __u64;
- #elif SIZEOF_UNSIGNED_LONG_LONG_INT==8
- typedef unsigned long long u64;
-+typedef unsigned long long __u64;
- #else
- #error I need at least some 64-bit type
- #endif
diff --git a/recipes/nbd/nbd_2.8.7.bb b/recipes/nbd/nbd_2.9.20.bb
index 2fe81cddf7..5976e96db4 100644
--- a/recipes/nbd/nbd_2.8.7.bb
+++ b/recipes/nbd/nbd_2.9.20.bb
@@ -1,15 +1,14 @@
 DESCRIPTION = "Network Block Device"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://nbd.sourceforge.net"
-
 DEPENDS = "glib-2.0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2;md5sum=bc7995b4961385269abc645575bcaf4d \
-           file://cross-compile.patch "
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "aec35f6beb7bb4cb2ee267fe0f72c8d6"
+SRC_URI[sha256sum] = "98f0de421f0b2f683d46dff3eb679a3409a41f08e6fad7c2f71f60c5d409939c"
 
 inherit autotools
 
-
 PACKAGES = "nbd-client nbd-server nbd-client-dbg nbd-server-dbg"
 PACKAGES += "nbd-client-doc nbd-server-doc"
 
@@ -19,6 +18,3 @@ FILES_nbd-client-dbg += "/usr/sbin/.debug/nbd-client"
 FILES_nbd-server-dbg += "/usr/bin/.debug/nbd-server"
 FILES_nbd-client-doc = "/usr/share/man/man8/*"
 FILES_nbd-server-doc = "/usr/share/man/man1/*"
-
-SRC_URI[md5sum] = "bc7995b4961385269abc645575bcaf4d"
-SRC_URI[sha256sum] = "a69d1690ad587d81b85c34d1ef9bf47abf0ba21dc96876d95dd6a9a193a859f1"