From f70601e0934acd62f6c5d06c5ede4cc607179514 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Jul 2018 11:42:03 +0100 Subject: gentoo resync : 07.07.2018 --- net-fs/libnfs/files/libnfs-1.9.5-headers.patch | 86 ---------------------- .../files/libnfs-1.9.5-implicit-internal.patch | 27 ------- net-fs/libnfs/files/libnfs-3.0.0-utils.patch | 20 +++++ 3 files changed, 20 insertions(+), 113 deletions(-) delete mode 100644 net-fs/libnfs/files/libnfs-1.9.5-headers.patch delete mode 100644 net-fs/libnfs/files/libnfs-1.9.5-implicit-internal.patch create mode 100644 net-fs/libnfs/files/libnfs-3.0.0-utils.patch (limited to 'net-fs/libnfs/files') diff --git a/net-fs/libnfs/files/libnfs-1.9.5-headers.patch b/net-fs/libnfs/files/libnfs-1.9.5-headers.patch deleted file mode 100644 index 96719ffd54c2..000000000000 --- a/net-fs/libnfs/files/libnfs-1.9.5-headers.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 0bfc3e09b7d7ca2b75d42c17874b89333b96f371 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Mon, 3 Dec 2012 22:30:04 -0500 -Subject: [PATCH] fix implicit decl warnings - -Include the proper headers to fix warnings like: -libnfs-sync.c:1529:3: warning: implicit declaration of function 'gettimeofday' [-Wimplicit-function-declaration] -libnfs-zdr.c:506:2: warning: implicit declaration of function 'getuid' [-Wimplicit-function-declaration] - -Signed-off-by: Mike Frysinger ---- - lib/libnfs-sync.c | 1 + - lib/libnfs-zdr.c | 9 +++++++++ - lib/libnfs.c | 1 + - lib/socket.c | 1 + - 4 files changed, 12 insertions(+) - -diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c -index 0fc1094..c140258 100644 ---- a/lib/libnfs-sync.c -+++ b/lib/libnfs-sync.c -@@ -77,6 +77,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/lib/libnfs-zdr.c b/lib/libnfs-zdr.c -index c32f661..b6b3ed9 100644 ---- a/lib/libnfs-zdr.c -+++ b/lib/libnfs-zdr.c -@@ -20,6 +20,10 @@ - * i.e. zdrmem_create() buffers. - * It aims to be compatible with normal rpcgen generated functions. - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #ifdef WIN32 - #include "win32_compat.h" - #endif -@@ -28,9 +32,14 @@ - #include "aros_compat.h" - #endif - -+#ifdef HAVE_ARPA_INET_H -+#include -+#endif -+ - #include - #include - #include -+#include - #include "libnfs-zdr.h" - - struct opaque_auth _null_auth; -diff --git a/lib/libnfs.c b/lib/libnfs.c -index 5692dc3..0a7d139 100644 ---- a/lib/libnfs.c -+++ b/lib/libnfs.c -@@ -73,6 +73,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/lib/socket.c b/lib/socket.c -index 3f7f89f..f8db957 100644 ---- a/lib/socket.c -+++ b/lib/socket.c -@@ -68,6 +68,7 @@ - #include - #include - #include -+#include - #include - #include "libnfs-zdr.h" - #include "libnfs.h" --- -2.0.0 - diff --git a/net-fs/libnfs/files/libnfs-1.9.5-implicit-internal.patch b/net-fs/libnfs/files/libnfs-1.9.5-implicit-internal.patch deleted file mode 100644 index e702c81f5cb4..000000000000 --- a/net-fs/libnfs/files/libnfs-1.9.5-implicit-internal.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2be32c3c41207c029f54ebd0f4aa08e216bd3c21 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 8 Aug 2014 05:45:32 -0400 -Subject: [PATCH 3/3] fix implicit decls of rpc_{g,s}et_error - -Signed-off-by: Mike Frysinger ---- - lib/libnfs-zdr.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/libnfs-zdr.c b/lib/libnfs-zdr.c -index b6b3ed9..90abe26 100644 ---- a/lib/libnfs-zdr.c -+++ b/lib/libnfs-zdr.c -@@ -41,6 +41,9 @@ - #include - #include - #include "libnfs-zdr.h" -+#include "libnfs.h" -+#include "libnfs-raw.h" -+#include "libnfs-private.h" - - struct opaque_auth _null_auth; - --- -2.0.0 - diff --git a/net-fs/libnfs/files/libnfs-3.0.0-utils.patch b/net-fs/libnfs/files/libnfs-3.0.0-utils.patch new file mode 100644 index 000000000000..b26716158b59 --- /dev/null +++ b/net-fs/libnfs/files/libnfs-3.0.0-utils.patch @@ -0,0 +1,20 @@ +diff --git a/configure.ac b/configure.ac +index a1f51d0..f96879a 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -25,11 +25,13 @@ fi + AC_SYS_LARGEFILE + + #option: utils ++MAYBE_UTILS="utils" + AC_ARG_ENABLE([utils], + [AC_HELP_STRING([--enable-utils], + [Build util programs])], +- [MAYBE_UTILS=""], +- [MAYBE_UTILS="utils"]) ++ [if test $enableval = no ; then ++ MAYBE_UTILS="" ++ fi]) + AC_SUBST(MAYBE_UTILS) + + #option: examples -- cgit v1.2.3