Merge pull request #4968 from marcin1j/pr/20171018-nbd-bump-to-3.16.2

nbd: bump to 3.16.2

diff --git a/net/nbd/Makefile b/net/nbd/Makefile
index 369122f626974ddb92c12a826b9adae3c98c046a..6177f399acc1d0a89b78af85fb61d53fdee114ba 100644 (file)
--- a/net/nbd/Makefile
+++ b/net/nbd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nbd
-PKG_VERSION:=3.11
+PKG_VERSION:=3.16.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/nbd
-PKG_HASH:=14420f74cb16dc609a9302ed1efd653064bed7a8357e9d73daabc33608e3f2a0
+PKG_HASH:=422f62bdf6e6b973bd82083dc52b6577396fe00aa6607837ac464e476124155b
 PKG_LICENSE:=GPL-2.0+
 PKG_MAINTAINER:=Marcin Jurkowski <marcin1j@gmail.com>
 

diff --git a/net/nbd/patches/100-fix-build-without-gnutls.patch b/net/nbd/patches/100-fix-build-without-gnutls.patch
new file mode 100644 (file)
index 0000000..44cbf4e
--- /dev/null
+++ b/net/nbd/patches/100-fix-build-without-gnutls.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -35,7 +35,7 @@ nbd_client_CFLAGS = $(client_flags) @Gnu
+ nbd_client_LDADD = $(client_libs) @GnuTLS_LIBS@
+ else
+ nbd_client_SOURCES = $(client_srcs)
+-nbd_client_CFLAGS = $(client_flags)
++nbd_client_CFLAGS = $(client_flags) -DNOTLS -DPROG_NAME='"nbd-client"'
+ nbd_client_LDADD = $(client_libs)
+ endif
+ endif