summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-fs/nfs-utils/files')
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch105
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch45
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch53
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch41
4 files changed, 0 insertions, 244 deletions
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch
deleted file mode 100644
index b322b6fb17c..00000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Required for successful build on musl
-https://bugs.gentoo.org/651080#c5
-
-Thanks-to: Robert Bridge <robert@robbieab.com>
-
---- nfs-utils-2.3.1/support/export/export.c
-+++ nfs-utils-2.3.1/support/export/export.c
-@@ -17,6 +17,7 @@
- #include <stdlib.h>
- #include <dirent.h>
- #include <errno.h>
-+#include <limits.h>
- #include "xmalloc.h"
- #include "nfslib.h"
- #include "exportfs.h"
---- nfs-utils-2.3.1/support/export/xtab.c
-+++ nfs-utils-2.3.1/support/export/xtab.c
-@@ -18,6 +18,7 @@
- #include <sys/stat.h>
- #include <errno.h>
- #include <libgen.h>
-+#include <limits.h>
-
- #include "nfslib.h"
- #include "exportfs.h"
---- nfs-utils-2.3.1/support/misc/file.c
-+++ nfs-utils-2.3.1/support/misc/file.c
-@@ -27,6 +27,7 @@
- #include <dirent.h>
- #include <stdlib.h>
- #include <stdbool.h>
-+#include <limits.h>
-
- #include "xlog.h"
- #include "misc.h"
---- nfs-utils-2.3.1/support/nfs/xcommon.c
-+++ nfs-utils-2.3.1/support/nfs/xcommon.c
-@@ -16,6 +16,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <limits.h>
-
- #include "xcommon.h"
- #include "nls.h" /* _() */
---- nfs-utils-2.3.1/support/nsm/file.c
-+++ nfs-utils-2.3.1/support/nsm/file.c
-@@ -85,6 +85,7 @@
- #include <fcntl.h>
- #include <dirent.h>
- #include <grp.h>
-+#include <limits.h>
-
- #include "xlog.h"
- #include "nsm.h"
---- nfs-utils-2.3.1/utils/blkmapd/device-discovery.c
-+++ nfs-utils-2.3.1/utils/blkmapd/device-discovery.c
-@@ -49,6 +49,7 @@
- #include <unistd.h>
- #include <libgen.h>
- #include <errno.h>
-+#include <limits.h>
- #include <libdevmapper.h>
-
- #ifdef HAVE_CONFIG_H
---- nfs-utils-2.3.1/utils/gssd/krb5_util.c
-+++ nfs-utils-2.3.1/utils/gssd/krb5_util.c
-@@ -120,6 +120,7 @@
- #endif
- #include <krb5.h>
- #include <rpc/auth_gss.h>
-+#include <limits.h>
-
- #include "gssd.h"
- #include "err_util.h"
---- nfs-utils-2.3.1/utils/mountd/cache.c
-+++ nfs-utils-2.3.1/utils/mountd/cache.c
-@@ -26,6 +26,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <mntent.h>
-+#include <limits.h>
- #include "misc.h"
- #include "nfslib.h"
- #include "exportfs.h"
---- nfs-utils-2.3.1/utils/mountd/mountd.c
-+++ nfs-utils-2.3.1/utils/mountd/mountd.c
-@@ -22,6 +22,7 @@
- #include <fcntl.h>
- #include <sys/resource.h>
- #include <sys/wait.h>
-+#include <limits.h>
-
- #include "conffile.h"
- #include "xmalloc.h"
---- nfs-utils-2.3.1/utils/mountd/rmtab.c
-+++ nfs-utils-2.3.1/utils/mountd/rmtab.c
-@@ -16,6 +16,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netdb.h>
-+#include <limits.h>
-
- #include "misc.h"
- #include "exportfs.h"
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch
deleted file mode 100644
index f13f07a4c81..00000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8f3e4f4d6df9f813572051e12e974b35c26a1743 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 28 May 2018 12:13:10 +0200
-Subject: [PATCH] Fix undefined references and bad include when build with
- junction support
-
----
- support/junction/Makefile.am | 2 +-
- utils/nfsref/Makefile.am | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/support/junction/Makefile.am b/support/junction/Makefile.am
-index 97e7426..89cb532 100644
---- a/support/junction/Makefile.am
-+++ b/support/junction/Makefile.am
-@@ -31,4 +31,4 @@ libjunction_la_SOURCES = display.c export-cache.c junction.c \
-
- MAINTAINERCLEANFILES = Makefile.in
-
--AM_CPPFLAGS = -I. -I../include -I/usr/include/libxml2
-+AM_CPPFLAGS = -I. -I../include -I/usr/include/libxml2 @TIRPC_CFLAGS@
-diff --git a/utils/nfsref/Makefile.am b/utils/nfsref/Makefile.am
-index 2b2bb53..a652b03 100644
---- a/utils/nfsref/Makefile.am
-+++ b/utils/nfsref/Makefile.am
-@@ -27,13 +27,13 @@ noinst_HEADERS = nfsref.h
-
- sbin_PROGRAMS = nfsref
- nfsref_SOURCES = add.c lookup.c nfsref.c remove.c
--LDADD = $(LIBXML2) $(LIBCAP) \
-- ../../support/nfs/libnfs.la \
-+LIBS += $(LIBXML2) $(LIBCAP)
-+LDADD = ../../support/nfs/libnfs.la \
- ../../support/junction/libjunction.la
-
- man8_MANS = nfsref.man
-
- MAINTAINERCLEANFILES = Makefile.in
-
--AM_CPPFLAGS = -I. -I../../support/include
-+AM_CPPFLAGS = -I. -I../../support/include @TIRPC_CFLAGS@
- ##AM_LDFLAGS = -Wl,--as-needed
---
-2.17.0
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch
deleted file mode 100644
index d06fc4ce8b8..00000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://bugs.gentoo.org/656984
-
-Don't build with -Werror flags.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -544,45 +544,11 @@
- AC_SUBST(LDFLAGS_FOR_BUILD)
-
- my_am_cflags="\
-- -pipe \
- -Wall \
- -Wextra \
-- -Werror=strict-prototypes \
-- -Werror=missing-prototypes \
-- -Werror=missing-declarations \
-- -Werror=format=2 \
-- -Werror=undef \
-- -Werror=missing-include-dirs \
-- -Werror=strict-aliasing=2 \
-- -Werror=init-self \
-- -Werror=implicit-function-declaration \
-- -Werror=return-type \
-- -Werror=switch \
-- -Werror=overflow \
-- -Werror=parentheses \
-- -Werror=aggregate-return \
-- -Werror=unused-result \
- -fno-strict-aliasing \
- "
--
--AC_DEFUN([CHECK_CCSUPPORT], [
-- my_save_cflags="$CFLAGS"
-- CFLAGS=$1
-- AC_MSG_CHECKING([whether CC supports $1])
-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
-- [AC_MSG_RESULT([yes])]
-- [$2+=$1],
-- [AC_MSG_RESULT([no])]
-- )
-- CFLAGS="$my_save_cflags"
--])
--
--CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1])
--CHECK_CCSUPPORT([-Werror=int-conversion], [flg2])
--CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
--CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4])
--
--AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"])
-+AC_SUBST([AM_CFLAGS], ["$my_am_cflags"])
-
- # Make sure that $ACLOCAL_FLAGS are used during a rebuild
- AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch
deleted file mode 100644
index 787a96fe89d..00000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4f91877bb313a35ade44d9dde1fd219035ba1fd9 Mon Sep 17 00:00:00 2001
-From: Patrick Steinhardt <ps@pks.im>
-Date: Wed, 27 Feb 2019 11:58:47 -0500
-Subject: [PATCH] configure.ac: more carefully detect availability of
- res_querydomain(3)
-
-Since glibc 2.2, the function res_querydomain(3) is implemented as a
-define to `__res_querydomain`. Due to this implementation detail, using
-`AC_CHECK_LIB` with a symbol name of "res_querydomain" will cause a
-linking failure and thus fail to detect its availability. This is why
-right now, we try to detect availability of `__res_querydomain` instead.
-
-Unfortunately, this may break on other platforms where there is no
-`__res_querydomain` but only the function without leading underscores.
-To fix this, we can perform another `AC_CHECK_LIB([resolv],
-[res_querydomain], ...)` call in case where the other one was not found
-and only raise an error if both symbols weren't found.
-
-Signed-off-by: Patrick Steinhardt <ps@pks.im>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4bf5aea..cb9d921 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -411,7 +411,8 @@ if test "$enable_gss" = yes; then
- fi
-
- dnl libdnsidmap specific checks
--AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
-+AC_CHECK_LIB([resolv], [__res_querydomain], ,
-+ AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed)))
-
- AC_ARG_ENABLE([ldap],
- [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])])
---
-1.8.3.1
-