gentoo resync : 28.04.2021

3 files changed, 20 insertions, 88 deletions

diff --git a/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch
index e64e2c6da385..8541a985ffa5 100644
--- a/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch
@@ -24,9 +24,9 @@ diff --git a/support/junction/junction.c b/support/junction/junction.c
 index ab6caa6..41cce26 100644
 --- a/support/junction/junction.c
 +++ b/support/junction/junction.c
-@@ -23,6 +23,10 @@
-  *	http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-  */
+@@ -27,6 +27,10 @@
+ #include <config.h>
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
@@ -39,9 +39,9 @@ diff --git a/support/misc/file.c b/support/misc/file.c
 index e7c3819..06f6bb2 100644
 --- a/support/misc/file.c
 +++ b/support/misc/file.c
-@@ -18,6 +18,10 @@
-  * along with nfs-utils.  If not, see <http://www.gnu.org/licenses/>.
-  */
+@@ -22,6 +22,10 @@
+ #include <config.h>
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
@@ -54,9 +54,9 @@ diff --git a/support/misc/mountpoint.c b/support/misc/mountpoint.c
 index c6217f2..14d6731 100644
 --- a/support/misc/mountpoint.c
 +++ b/support/misc/mountpoint.c
-@@ -3,6 +3,10 @@
-  * check if a given path is a mountpoint 
-  */
+@@ -7,6 +7,10 @@
+ #include <config.h>
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
@@ -69,24 +69,24 @@ diff --git a/support/nfs/cacheio.c b/support/nfs/cacheio.c
 index 9dc4cf1..7c4cf37 100644
 --- a/support/nfs/cacheio.c
 +++ b/support/nfs/cacheio.c
-@@ -15,6 +15,10 @@
-  *
-  */
+@@ -19,6 +19,10 @@
+ #include <config.h>
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
 +#endif
 +
  #include <nfslib.h>
+ #include <inttypes.h>
  #include <stdio.h>
- #include <stdio_ext.h>
 diff --git a/utils/mount/fstab.c b/utils/mount/fstab.c
 index eedbdda..8b0aaf1 100644
 --- a/utils/mount/fstab.c
 +++ b/utils/mount/fstab.c
-@@ -7,6 +7,10 @@
-  * - Moved code to nfs-utils/support/nfs from util-linux/mount.
-  */
+@@ -11,6 +11,10 @@
+ #include <config.h>
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
@@ -99,9 +99,9 @@ diff --git a/utils/nfsdcld/legacy.c b/utils/nfsdcld/legacy.c
 index 07f477a..3c6bea6 100644
 --- a/utils/nfsdcld/legacy.c
 +++ b/utils/nfsdcld/legacy.c
-@@ -15,6 +15,10 @@
-  * Boston, MA 02110-1301, USA.
-  */
+@@ -19,6 +19,10 @@
+ #include <config.h>
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.4.2-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.2-no-werror.patch
deleted file mode 100644
index 114942f09a4f..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.4.2-no-werror.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From b7df6ae89846104b99f46336592b928a5421c3d8 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 16 Nov 2019 12:04:48 +0100
-Subject: [PATCH] Don't build with -Werror flags
-
-https://bugs.gentoo.org/656984
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 33 +--------------------------------
- 1 file changed, 1 insertion(+), 32 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9ba9d4b5..26663264 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -581,47 +581,16 @@ AC_SUBST(CPPFLAGS_FOR_BUILD)
- AC_SUBST(LDFLAGS_FOR_BUILD)
- 
- my_am_cflags="\
-- -pipe \
-  -Wall \
-  -Wextra \
-  $rpcgen_cflags \
-- -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 \
-  -Wno-cast-function-type \
-  -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])
- AX_GCC_FUNC_ATTRIBUTE([format])
- 
--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)"])
--- 
-2.24.0
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch
index 396532a919aa..a7226db24920 100644
--- a/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch
@@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac
 index 50847d8a..6bc18e93 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -620,47 +620,15 @@ AC_SUBST(CPPFLAGS_FOR_BUILD)
+@@ -631,47 +631,15 @@ AC_SUBST(CPPFLAGS_FOR_BUILD)
  AC_SUBST(LDFLAGS_FOR_BUILD)
  
  my_am_cflags="\