gnunet-fuse: update to version 0.12.0

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/net/gnunet-fuse/Makefile b/net/gnunet-fuse/Makefile
index 6d677965b7d683fb1886b62a3aab175a8f92b7c0..a2a4ccb83ef7be79fa18ea04acd6a4edca8102d1 100644 (file)
--- a/net/gnunet-fuse/Makefile
+++ b/net/gnunet-fuse/Makefile
@@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnunet-fuse
 
-PKG_VERSION:=0.11.0
+PKG_VERSION:=0.12.0
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gnunet
-PKG_HASH:=4ddf258336c9ce111fe71372aad0bfd792311f6d92753c29293b2cca1fe3bf16
+PKG_HASH:=4d42dc3112f36ada150b3904e207b93373c90d4fbd5a1c6415ee7f5c6a428e3b
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING

diff --git a/net/gnunet-fuse/patches/001-musl-compat.patch b/net/gnunet-fuse/patches/001-musl-compat.patch
index daa65d124442b4720f206221f4169074cafdabe2..5b5b912206467837f88f702e16e9500f97e60345 100644 (file)
--- a/net/gnunet-fuse/patches/001-musl-compat.patch
+++ b/net/gnunet-fuse/patches/001-musl-compat.patch
@@ -1,9 +1,9 @@
 --- a/src/fuse/mutex.c
 +++ b/src/fuse/mutex.c
-@@ -71,8 +71,13 @@ GNUNET_mutex_create (int isRecursive)
+@@ -68,8 +68,13 @@ GNUNET_mutex_create (int isRecursive)
    if (isRecursive)
      {
- #if LINUX
+ #ifdef __linux__
 +#if defined(__UCLIBC__) || defined(__GLIBC__)
        GNUNET_assert (0 == pthread_mutexattr_setkind_np
                     (&attr, PTHREAD_MUTEX_RECURSIVE_NP));
@@ -11,13 +11,13 @@
 +      GNUNET_assert (0 == pthread_mutexattr_settype
 +                   (&attr, PTHREAD_MUTEX_RECURSIVE));
 +#endif
- #elif SOMEBSD || GNUNET_freeBSD || GNUNET_freeBSD5
-       GNUNET_assert (0 == pthread_mutexattr_setkind_np
+ #elif BSD || SOLARIS || OSX || WINDOWS
+       GNUNET_assert (0 == pthread_mutexattr_settype
                     (&attr, PTHREAD_MUTEX_RECURSIVE));
-@@ -84,11 +89,16 @@ GNUNET_mutex_create (int isRecursive)
+@@ -78,11 +83,16 @@ GNUNET_mutex_create (int isRecursive)
    else
      {
- #if LINUX
+ #ifdef __linux__
 +#if defined(__UCLIBC__) || defined(__GLIBC__)
        GNUNET_assert (0 == pthread_mutexattr_setkind_np
                     (&attr, PTHREAD_MUTEX_ERRORCHECK_NP));