[gentoo-commits] proj/musl:master commit in: net-fs/nfs-utils/files/, net-fs/nfs-utils/

[Anthony G. Basile]

commit:     e073f305fcd007b55c9ed9a8533ca3baea795f8d
Author:     Necktwi Ozfguah <necktwi <AT> ferryfair <DOT> com>
AuthorDate: Wed May  8 15:37:02 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed May  8 20:39:19 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=e073f305

net-fs/nfs-utils: fixed repoman fatals

added the missing 2.3.2 patch files

Signed-off-by: Necktwi Ozfguah <necktwi <AT> ferryfair.com>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 .../files/nfs-utils-2.3.2-junction_libs.patch      | 45 ++++++++++++++++++
 .../files/nfs-utils-2.3.2-no-werror.patch          | 53 ++++++++++++++++++++++
 net-fs/nfs-utils/metadata.xml                      |  1 +
 net-fs/nfs-utils/nfs-utils-2.3.3.ebuild            |  2 +-
 4 files changed, 100 insertions(+), 1 deletion(-)

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
new file mode 100644
index 0000000..f13f07a
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch
@@ -0,0 +1,45 @@
+From 8f3e4f4d6df9f813572051e12e974b35c26a1743 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@g.o>
+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
new file mode 100644
index 0000000..d06fc4c
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch
@@ -0,0 +1,53 @@
+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/metadata.xml b/net-fs/nfs-utils/metadata.xml
index 34459d2..45351e4 100644
--- a/net-fs/nfs-utils/metadata.xml
+++ b/net-fs/nfs-utils/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <longdescription>NFS client and server daemons</longdescription>
   <use>
+    <flag name="junction">Enable NFS junction support in nfsref</flag>
     <flag name="ldap">Add ldap support</flag>
     <flag name="libmount">Link mount.nfs with libmount</flag>
     <flag name="nfsdcld">Enable nfsdcld NFSv4 clientid tracking daemon</flag>

diff --git a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
index a324c7e..be26330 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
@@ -68,7 +68,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
 	"${FILESDIR}"/${PN}-2.3.2-junction_libs.patch
 	"${FILESDIR}"/${PN}-2.3.2-no-werror.patch
-   "${FILESDIR}"/${PN}-musl.patch
+	"${FILESDIR}"/${PN}-musl.patch
 )
 
 src_prepare() {