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

2024-02-26 Thread Mike Gilbert 
commit: 6999ece65148c52357bee19b2dc766262708d4a4
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Feb 26 16:42:09 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Feb 26 16:43:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6999ece6

net-fs/nfs-utils: remove 'need portmap' from init scripts (-nfsv3)

Closes: https://bugs.gentoo.org/925459
Signed-off-by: Mike Gilbert  gentoo.org>

 net-fs/nfs-utils/files/nfs.initd  |  3 ++-
 net-fs/nfs-utils/files/nfsclient.initd|  3 ++-
 net-fs/nfs-utils/files/rpc.gssd.initd |  3 ++-
 net-fs/nfs-utils/files/rpc.idmapd.initd   |  3 ++-
 net-fs/nfs-utils/files/rpc.svcgssd.initd  |  3 ++-
 ...{nfs-utils-2.6.4-r10.ebuild => nfs-utils-2.6.4-r11.ebuild} | 11 ---
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index 7c1de560d1da..88a13a85db38 100644
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -24,7 +24,8 @@ depend() {
}' /etc/exports /etc/exports.d/*.exports 2>/dev/null
)"
config /etc/exports /etc/exports.d/*.exports
-   need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES}
+   need portmap
+   need rpc.statd ${myneed} ${NFS_NEEDED_SERVICES}
use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd
after quota
 }

diff --git a/net-fs/nfs-utils/files/nfsclient.initd 
b/net-fs/nfs-utils/files/nfsclient.initd
index 6724e913d10f..e278cbde0539 100644
--- a/net-fs/nfs-utils/files/nfsclient.initd
+++ b/net-fs/nfs-utils/files/nfsclient.initd
@@ -14,7 +14,8 @@ depend() {
done
fi
config /etc/fstab
-   need portmap rpc.statd rpc.idmapd ${myneed}
+   need portmap
+   need rpc.statd rpc.idmapd ${myneed}
use ypbind dns
 }
 

diff --git a/net-fs/nfs-utils/files/rpc.gssd.initd 
b/net-fs/nfs-utils/files/rpc.gssd.initd
index 445d44c44473..7bfe920b3d54 100644
--- a/net-fs/nfs-utils/files/rpc.gssd.initd
+++ b/net-fs/nfs-utils/files/rpc.gssd.initd
@@ -6,7 +6,8 @@
 
 depend() {
use ypbind net
-   need portmap rpc.pipefs
+   need portmap
+   need rpc.pipefs
after quota
 }
 

diff --git a/net-fs/nfs-utils/files/rpc.idmapd.initd 
b/net-fs/nfs-utils/files/rpc.idmapd.initd
index 61cfd4de2e73..9cb36000b5ed 100644
--- a/net-fs/nfs-utils/files/rpc.idmapd.initd
+++ b/net-fs/nfs-utils/files/rpc.idmapd.initd
@@ -8,7 +8,8 @@ rpc_bin=/usr/sbin/rpc.idmapd
 
 depend() {
use ypbind net
-   need portmap rpc.pipefs
+   need portmap
+   need rpc.pipefs
after quota
 }
 

diff --git a/net-fs/nfs-utils/files/rpc.svcgssd.initd 
b/net-fs/nfs-utils/files/rpc.svcgssd.initd
index c714e36076f4..11bc4265eddd 100644
--- a/net-fs/nfs-utils/files/rpc.svcgssd.initd
+++ b/net-fs/nfs-utils/files/rpc.svcgssd.initd
@@ -6,7 +6,8 @@
 
 depend() {
use ypbind net
-   need portmap rpc.pipefs
+   need portmap
+   need rpc.pipefs
after quota
 }
 

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild
similarity index 95%
rename from net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
rename to net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild
index a50758b8b9eb..b64941485bd6 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild
@@ -167,14 +167,19 @@ src_install() {
doins "${FILESDIR}"/exports
keepdir /etc/exports.d
 
-   local f list=() opt_need=""
+   local f list=()
if use nfsv4 ; then
-   opt_need="rpc.idmapd"
list+=( rpc.idmapd rpc.pipefs )
use kerberos && list+=( rpc.gssd rpc.svcgssd )
fi
+
+   local sedexp=( -e '#placehoder' )
+   use nfsv3 || sedexp+=( -e '/need portmap/d' )
+
+   mkdir -p "${T}/init.d" || die
for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-   newinitd "${FILESDIR}"/${f}.initd ${f}
+   sed "${sedexp[@]}" "${FILESDIR}/${f}.initd" > 
"${T}/init.d/${f}" || die
+   doinitd "${T}/init.d/${f}"
done
 
local systemd_systemunitdir="$(systemd_get_systemunitdir)"

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

2024-01-23 Thread David Seifert 
commit: 02e79beb017b4796bf263b03a7a3227fe034
Author: David Seifert  gentoo  org>
AuthorDate: Tue Jan 23 11:56:56 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jan 23 11:56:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e7

net-fs/nfs-utils: drop 2.6.2-r1, 2.6.4

Signed-off-by: David Seifert  gentoo.org>

 net-fs/nfs-utils/Manifest  |   1 -
 ...tils-2.6.2-clang-Wlogical-not-parentheses.patch |  28 ---
 ...utils-2.6.2-clang-fix-function-prototypes.patch |  78 ---
 ...tils-2.6.2-clang-more-function-prototypes.patch |  39 
 net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild | 231 
 net-fs/nfs-utils/nfs-utils-2.6.4.ebuild| 233 -
 6 files changed, 610 deletions(-)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index aebdda16d856..9beb56b81fc1 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,3 +1,2 @@
-DIST nfs-utils-2.6.2.tar.bz2 969689 BLAKE2B 
8e0a3b309223779824276acd3ede13cfc161b955dc9376cc9426ffe9c604b111f7405088fe8e5a88a2d2ac1413d2742fbdf166a5b04c975e51a9e384e071fa60
 SHA512 
6e5dcc5147ad551b2ecbf0304e1b0e0713d1eff32c5a511562a6d03660589e027364e38fc9f6de1b06d32d8907d502f63c564a6e56171f58823b0ea68dd3a6b8
 DIST nfs-utils-2.6.3.tar.bz2 978167 BLAKE2B 
776b4ce6edc728e1dd2291898f429fbc76327b949008f2a477af887231feb2e27505a94978f819e4e4ed7b2b8574e6c5b8d02a9ca6e94683ec620ce99a909a06
 SHA512 
870dee2a95f411de6694aa8dddeef2302ef9235389a9bdca381ef719303fdd1a463a815ca67e0336a5121fa68d5b448b1952d539679e38b36f1e6b69c1e2f853
 DIST nfs-utils-2.6.4.tar.bz2 979652 BLAKE2B 
45f6e9c98e8148e82684526c2ab0f8976b2a46fd869d91f03cf9afffbaad64b77dc1729a50b74d30c5d65bfe213a1da2f54e3d3e19539b61994f7b65671a26ab
 SHA512 
e5fde25c54f594d00e69c9aeff8abc22663b994ecd37d8516751be98b51b12c61ffec47ee128794e170ec773f0649cb594df1ca104ec4dba561823db423f8533

diff --git 
a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-Wlogical-not-parentheses.patch 
b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-Wlogical-not-parentheses.patch
deleted file mode 100644
index 2ba9a45a024b..
--- 
a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-Wlogical-not-parentheses.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=896946e3c7f8ec1a02d4dc3a039e6cbbd2f611a9
-
-From 896946e3c7f8ec1a02d4dc3a039e6cbbd2f611a9 Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Tue, 13 Sep 2022 11:42:03 -0400
-Subject: [PATCH] mountd: Check for return of stat function
-
-simplify the check, stat() return 0 on success -1 on failure
-
-Fixes clang reported errors e.g.
-
-| v4clients.c:29:6: error: logical not is only applied to the left hand side 
of this comparison [-Werror,-Wlogical-not-parentheses]
-| if (!stat("/proc/fs/nfsd/clients", ) == 0 ||
-| ^   ~~
-
-Signed-off-by: Khem Raj 
-Signed-off-by: Steve Dickson 
 a/support/export/v4clients.c
-+++ b/support/export/v4clients.c
-@@ -26,7 +26,7 @@ void v4clients_init(void)
- {
-   struct stat sb;
- 
--  if (!stat("/proc/fs/nfsd/clients", ) == 0 ||
-+  if (stat("/proc/fs/nfsd/clients", ) != 0 ||
-   !S_ISDIR(sb.st_mode))
-   return;
-   if (clients_fd >= 0)

diff --git 
a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-fix-function-prototypes.patch 
b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-fix-function-prototypes.patch
deleted file mode 100644
index f223af883ad0..
--- a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-fix-function-prototypes.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=167f2336b06e1bcbf26f45f2ddc4a535fed4d393
-https://bugs.gentoo.org/869254
-
-From 167f2336b06e1bcbf26f45f2ddc4a535fed4d393 Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Tue, 13 Sep 2022 11:44:05 -0400
-Subject: [PATCH] Fix function prototypes
-
-Clang is now erroring out on functions with out parameter types
-
-Fixes errors like
-error: a function declaration without a prototype is deprecated in all 
versions of C [-Werror,-Wstrict-prototypes]
-
-Signed-off-by: Khem Raj 
-Signed-off-by: Steve Dickson 
 a/support/export/auth.c
-+++ b/support/export/auth.c
-@@ -82,7 +82,7 @@ check_useipaddr(void)
- }
- 
- unsigned int
--auth_reload()
-+auth_reload(void)
- {
-   struct stat stb;
-   static ino_tlast_inode;
 a/support/export/v4root.c
-+++ b/support/export/v4root.c
-@@ -198,7 +198,7 @@ static int v4root_add_parents(nfs_export *exp)
-  * looking for components of the v4 mount.
-  */
- void
--v4root_set()
-+v4root_set(void)
- {
-   nfs_export  *exp;
-   int i;
 a/support/export/xtab.c
-+++ b/support/export/xtab.c
-@@ -135,7 +135,7 @@ xtab_write(char *xtab, char *xtabtmp, char *lockfn, int 
is_export)
- }
- 
- int
--xtab_export_write()
-+xtab_export_write(void)
- {
-   return

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

2024-01-18 Thread Sam James 
commit: 9118184cd1e0ca66b3a689efb707ec8e0dfaf8e3
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 19 05:38:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 19 05:39:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9118184c

net-fs/nfs-utils: fix modern C issues

Closes: https://bugs.gentoo.org/922373
Signed-off-by: Sam James  gentoo.org>

 .../nfs-utils/files/nfs-utils-2.6.4-includes.patch |  41 
 net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild | 234 +
 2 files changed, 275 insertions(+)

diff --git a/net-fs/nfs-utils/files/nfs-utils-2.6.4-includes.patch 
b/net-fs/nfs-utils/files/nfs-utils-2.6.4-includes.patch
new file mode 100644
index ..0312ac1a8b37
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.6.4-includes.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/922373
+https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bb25f3f594ddf85e5826e931eaaa35874f6a4204
+
+From bb25f3f594ddf85e5826e931eaaa35874f6a4204 Mon Sep 17 00:00:00 2001
+From: Petr Vorel 
+Date: Wed, 3 Jan 2024 19:07:43 -0500
+Subject: [PATCH] reexport/{fsidd,reexport}.c: Re-add missing includes
+
+Older uClibc-ng requires  for close(2), unlink(2) and write(2),
+ for struct sockaddr_un.
+
+Fixes: 1a4edb2a ("reexport/fsidd.c: Remove unused headers")
+Fixes: bdc79f02 ("support/reexport.c: Remove unused headers")
+
+Reviewed-by: Giulio Benetti 
+Tested-by: Giulio Benetti 
+Signed-off-by: Petr Vorel 
+Signed-off-by: Steve Dickson 
+--- a/support/reexport/fsidd.c
 b/support/reexport/fsidd.c
+@@ -7,6 +7,8 @@
+ #include 
+ #endif
+ #include 
++#include 
++#include 
+ 
+ #include "conffile.h"
+ #include "reexport_backend.h"
+--- a/support/reexport/reexport.c
 b/support/reexport/reexport.c
+@@ -7,6 +7,7 @@
+ #endif
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include "nfsd_path.h"
+-- 
+1.8.3.1

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild
new file mode 100644
index ..987c49da9641
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/ 
https://git.linux-nfs.org/?p=steved/nfs-utils.git;
+
+if [[ ${PV} == *_rc* ]] ; then
+   MY_PV="$(ver_rs 1- -)"
+   
SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz
 -> ${P}.tar.gz"
+   S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+else
+   SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 
sasl selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+# bug #315573
+RESTRICT="test"
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+COMMON_DEPEND="
+   dev-libs/libxml2
+   net-libs/libtirpc:=
+   >=net-nds/rpcbind-0.2.4
+   sys-fs/e2fsprogs
+   dev-db/sqlite:3
+   dev-libs/libevent:=
+   caps? ( sys-libs/libcap )
+   ldap? (
+   net-nds/openldap:=
+   sasl? (
+   app-crypt/mit-krb5
+   dev-libs/cyrus-sasl:2
+   )
+   )
+   libmount? ( sys-apps/util-linux )
+   nfsv4? (
+   >=sys-apps/keyutils-1.5.9:=
+   kerberos? (
+   >=net-libs/libtirpc-0.2.4-r1[kerberos]
+   app-crypt/mit-krb5
+   )
+   )
+   nfsv41? (
+   sys-fs/lvm2
+   )
+   tcpd? ( sys-apps/tcp-wrappers )
+   uuid? ( sys-apps/util-linux )"
+DEPEND="${COMMON_DEPEND}
+   elibc_musl? ( sys-libs/queue-standalone )
+"
+RDEPEND="${COMMON_DEPEND}
+   !net-libs/libnfsidmap
+   selinux? (
+   sec-policy/selinux-rpc
+   sec-policy/selinux-rpcbind
+   )
+"
+BDEPEND="
+   net-libs/rpcsvc-proto
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.5.2-no-werror.patch
+   "${FILESDIR}"/${PN}-udev-sysctl.patch
+   "${FILESDIR}"/${P}-includes.patch
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if use nfsv4 && ! use nfsdcld && linux_config_exists && ! 
linux_chkconfig_present CRYPTO_MD5 ; then
+   ewarn "Your NFS server will be unable to track clients across 
server restarts!"
+   ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag 
to install the nfsdcltrack usermode"
+   ewarn "helper upcall program, or enable 
${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
+

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

2021-04-11 Thread David Seifert 
commit: 8cbb32319864173c51b0f3cc6b4a74d91f411dc9
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 11 15:49:10 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 11 15:49:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cbb3231

net-fs/nfs-utils: Remove old 2.5.1, 2.5.2

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 net-fs/nfs-utils/Manifest  |   2 -
 .../files/nfs-utils-2.4.2-no-werror.patch  |  68 ---
 net-fs/nfs-utils/nfs-utils-2.5.1.ebuild| 204 -
 net-fs/nfs-utils/nfs-utils-2.5.2.ebuild| 204 -
 4 files changed, 478 deletions(-)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 6667dae56dd..0ae2ec8eded 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,3 +1 @@
-DIST nfs-utils-2.5.1.tar.bz2 931848 BLAKE2B 
84c93ef5707bd97e9e1107dcca0530a3c137cb5ad04c7533bb8aee595a53fdc72359252d009fde95b9833a61f1695db1d6b1726081e5e8efd6c528e831f9834c
 SHA512 
36c11668a9d2a382206db3d73a3d03000cdd2be9836fcbbbd327eb38515ac0b451520f6ffdc69bc05b2b81c60ecb88d50a20a50f123b8092a5b63e1c1054a2eb
-DIST nfs-utils-2.5.2.tar.bz2 933724 BLAKE2B 
691204739fa4348cea6234f1b87bd74872c94a0c175b09a08ebb4d5cefb0b04c1adfffadc82b7e9a4a45d5c86e7f2af62b275526d27482798d4c5dc296a5be09
 SHA512 
9e97cf5cd8be27d58e1dcd7fa563280ac8afa57d093872d6b03cbcd6dae4066ac29804b8b1624b61cb12f2aa016380c85b731113c9359a0e6887d2db0641
 DIST nfs-utils-2.5.3.tar.bz2 937544 BLAKE2B 
817af2c302cf110519e64353a507645137ffd3b93b46eb94e71d45a1869c9e831e344f0baa33b1b39514962798cca542cf56a2830520c67e96e78995f2bf901f
 SHA512 
3be82f42c5da2bbbca4429459c858c58ae7333725749213c824d0c01b78f0beb7384455f314fc1cc1799968f9f40fd616297c7baf3514ca0e31d4686e9d6e732

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 114942f09a4..000
--- 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 
-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 

- 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/nfs-utils-2.5.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
deleted file mode 100644
index af962af74ca..000
--- a/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info multilib systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/;
-
-if [[ "${PV}" = *_rc* ]] ; then
-   MY_PV="$(ver_rs 1- -)"
-   
SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz
 -> ${P}.tar.gz"
-   S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-else
-   SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap

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

2020-10-22 Thread Lars Wendler 
commit: 32acf46dbfa646259f78215a1e936eb442f71491
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Oct 22 17:49:11 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Oct 22 17:49:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32acf46d

net-fs/nfs-utils: Bump to version 2.5.2

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 net-fs/nfs-utils/Manifest  |   1 +
 .../files/nfs-utils-2.5.2-no-werror.patch  |  68 +++
 net-fs/nfs-utils/nfs-utils-2.5.2.ebuild| 204 +
 3 files changed, 273 insertions(+)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 2cfc688a642..3985e4172da 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,3 +1,4 @@
 DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 
4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b
 SHA512 
655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540
 DIST nfs-utils-2.4.3.tar.bz2 921710 BLAKE2B 
9386a99561370e09ffe871ec38a4fc993e99332c0c6fdb0d07eb7a924cfab4634e5c5186ac1f1629deecf02557fd2d3d5d99b90d97c32d3680ca4478b5c49d9c
 SHA512 
160c828dd7a7b3206b7f167eb99a8dfac7e1a0c8dd88c81b639c3a1f66916908b3ca11fb9a945e4cf6a474f82509ed91a8a3217623f6cb79302d3d9b760f19d9
 DIST nfs-utils-2.5.1.tar.bz2 931848 BLAKE2B 
84c93ef5707bd97e9e1107dcca0530a3c137cb5ad04c7533bb8aee595a53fdc72359252d009fde95b9833a61f1695db1d6b1726081e5e8efd6c528e831f9834c
 SHA512 
36c11668a9d2a382206db3d73a3d03000cdd2be9836fcbbbd327eb38515ac0b451520f6ffdc69bc05b2b81c60ecb88d50a20a50f123b8092a5b63e1c1054a2eb
+DIST nfs-utils-2.5.2.tar.bz2 933724 BLAKE2B 
691204739fa4348cea6234f1b87bd74872c94a0c175b09a08ebb4d5cefb0b04c1adfffadc82b7e9a4a45d5c86e7f2af62b275526d27482798d4c5dc296a5be09
 SHA512 
9e97cf5cd8be27d58e1dcd7fa563280ac8afa57d093872d6b03cbcd6dae4066ac29804b8b1624b61cb12f2aa016380c85b731113c9359a0e6887d2db0641

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
new file mode 100644
index 000..396532a919a
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch
@@ -0,0 +1,68 @@
+From 6ab8c7c186bd4a547a0ca435ecabe10ee50039c5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Thu, 22 Oct 2020 19:44:34 +0200
+Subject: [PATCH] Don't build with -Werror flags
+
+https://bugs.gentoo.org/656984
+
+Signed-off-by: Lars Wendler 
+---
+ configure.ac | 34 +-
+ 1 file changed, 1 insertion(+), 33 deletions(-)
+
+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)
+ 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 \
+  -fno-strict-aliasing \
+ "
+ 
+-AC_DEFUN([CHECK_CCSUPPORT], [
+-  my_save_cflags="$CFLAGS"
+-  CFLAGS="-Werror $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])
+-CHECK_CCSUPPORT([-Wno-cast-function-type], [flg5])
+ AX_GCC_FUNC_ATTRIBUTE([format])
+ 
+-AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4 $flg5"])
++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.29.0
+

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.2.ebuild
new file mode 100644
index 000..e92cd918e89
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.5.2.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic linux-info multilib systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/;
+
+if [[ "${PV}" = *_rc* ]] ; then
+   MY_PV="$(ver_rs 1- -)"
+   
SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz
 -> ${P}.tar.gz"
+

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

2019-11-20 Thread Thomas Deutschmann 
commit: a1a54c963cdfcf3af6787a109fc5518c1fde14ef
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Nov 20 12:52:31 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Nov 20 12:52:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1a54c96

net-fs/nfs-utils: rev bump to add some patches

Bug: https://bugs.gentoo.org/688644
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...utils-2.4.2-Ensure-consistent-struct-stat.patch | 115 +
 ...2-mountd-Add-check-for-struct-file_handle.patch |  54 ++
 ...-mountd-Fix-compilation-for--disable-uuid.patch |  35 +++
 ...tils-2.4.2.ebuild => nfs-utils-2.4.2-r1.ebuild} |   3 +
 4 files changed, 207 insertions(+)

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
new file mode 100644
index 000..e64e2c6da38
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch
@@ -0,0 +1,115 @@
+From 1378280398ef9f5cd45f5542ae2945b9a360b132 Mon Sep 17 00:00:00 2001
+From: Doug Nazar 
+Date: Sun, 17 Nov 2019 14:31:33 -0500
+Subject: [PATCH] Ensure consistent struct stat definition
+
+Although 2fbc62e2a13fc ("Fix include order between config.h and stat.h")
+reorganized those files that were already including config.h, not all
+files were including config.h.
+
+Fixes at least stack smashing crashes in mountd on 32-bit systems.
+
+Signed-off-by: Doug Nazar 
+Signed-off-by: Steve Dickson 
+---
+ support/junction/junction.c | 4 
+ support/misc/file.c | 4 
+ support/misc/mountpoint.c   | 4 
+ support/nfs/cacheio.c   | 4 
+ utils/mount/fstab.c | 4 
+ utils/nfsdcld/legacy.c  | 4 
+ 6 files changed, 24 insertions(+)
+
+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
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include 
++#endif
++
+ #include 
+ #include 
+ 
+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 .
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include 
++#endif
++
+ #include 
+ 
+ #include 
+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 
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include 
++#endif
++
+ #include 
+ #include "xcommon.h"
+ #include 
+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 @@
+  *
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include 
++#endif
++
+ #include 
+ #include 
+ #include 
+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.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include 
++#endif
++
+ #include 
+ #include 
+ #include 
+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.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include 
++#endif
++
+ #include 
+ #include 
+ #include 
+-- 
+1.8.3.1
+

diff --git 
a/net-fs/nfs-utils/files/nfs-utils-2.4.2-mountd-Add-check-for-struct-file_handle.patch
 
b/net-fs/nfs-utils/files/nfs-utils-2.4.2-mountd-Add-check-for-struct-file_handle.patch
new file mode 100644
index 000..2a89cc7665f
--- /dev/null
+++ 
b/net-fs/nfs-utils/files/nfs-utils-2.4.2-mountd-Add-check-for-struct-file_handle.patch
@@ -0,0 +1,54 @@
+From f100d07d923b5db60d42dc2453485fa0dba69a79 Mon Sep 17 00:00:00 2001
+From: Petr Vorel 
+Date: Mon, 18 Nov 2019 08:58:36 -0500
+Subject: [PATCH] mountd: Add check for 'struct file_handle'
+
+From: Maxime Hadjinlian 
+
+The code to check if name_to_handle_at() is implemented generates only a
+warning but with some toolchain it doesn't fail to link (the function must be
+implemented somewhere).
+However the "struct file_handle" type is not available.
+
+So, this patch adds a check for this struct.
+
+Patch taken from buildroot distribution.
+
+Signed-off-by: Thomas Petazzoni 
+[ pvorel: rebased from nfs-utils-1-3-4 ]
+Signed-off-by: Petr Vorel 
+Signed-off-by: Maxime Hadjinlian 
+Signed-off-by: Steve Dickson 
+---
+ configure.ac | 1 +
+ utils/mountd/cache.c | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git

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

2019-11-16 Thread Lars Wendler 
commit: 9aea63b35f973c79ed6fb1384396fd4e44ee7995
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Nov 16 11:11:53 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Nov 16 13:06:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aea63b3

net-fs/nfs-utils: Bump to version 2.4.2

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler  gentoo.org>

 net-fs/nfs-utils/Manifest  |   1 +
 .../files/nfs-utils-2.4.2-no-werror.patch  |  68 +++
 net-fs/nfs-utils/nfs-utils-2.4.2.ebuild| 206 +
 3 files changed, 275 insertions(+)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 33eadfc1820..81ed810ff75 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1 +1,2 @@
 DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 
4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b
 SHA512 
655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540
+DIST nfs-utils-2.4.2.tar.bz2 918576 BLAKE2B 
a1dba3ae2e58794509ea7907d80e40fc49a0c5e72019222ba16daa74aa757cab5e6fde9ed066f6b5f379b40dbd61622a05fcafc298a79231e417ab2086127278
 SHA512 
f9724ff2ac185e6c29afd577b33da38b1d11803af1ccb905cd615afa3383c6ac7a3fa4e0f43ea8d062e9aedcdbae90adc9b55ae9d0abe4731f69aa3a6f8d2534

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
new file mode 100644
index 000..114942f09a4
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.4.2-no-werror.patch
@@ -0,0 +1,68 @@
+From b7df6ae89846104b99f46336592b928a5421c3d8 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+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 
+---
+ 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/nfs-utils-2.4.2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.4.2.ebuild
new file mode 100644
index 000..4ff3af16fc9
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.4.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic linux-info multilib systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/;
+
+if [[ "${PV}" = *_rc* ]] ; then
+   MY_PV="$(ver_rs 1- -)"
+   
SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz
 -> ${P}.tar.gz"
+   S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+else
+   SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 
nfsv41 selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+RESTRICT="test" #315573
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+DEPEND="
+   >=dev-db/sqlite-3.3
+   dev-libs/libxml2
+   net-libs/libtirpc:=
+

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

2019-09-28 Thread Thomas Deutschmann 
commit: 751915e76d292d90356274caa7803d614d3eac7a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Sep 28 14:45:09 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Sep 28 14:52:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=751915e7

net-fs/nfs-utils: drop old

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-fs/nfs-utils/Manifest  |   2 -
 .../nfs-utils/files/nfs-utils-2.3.1-limits.patch   | 105 ---
 .../files/nfs-utils-2.3.2-junction_libs.patch  |  45 -
 .../files/nfs-utils-2.3.2-no-werror.patch  |  53 --
 ...-2.3.4_rc2-improved_res_querydomain_check.patch |  41 
 net-fs/nfs-utils/nfs-utils-2.3.3.ebuild| 195 ---
 net-fs/nfs-utils/nfs-utils-2.3.4.ebuild| 192 ---
 net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild | 206 -
 8 files changed, 839 deletions(-)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index ec46a4b5e43..33eadfc1820 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,3 +1 @@
-DIST nfs-utils-2.3.3.tar.bz2 888947 BLAKE2B 
7c913f0c5061807d4af162fb392c8f466abb97c88960853b52298f61056bcad08f67a16e577036dec9afa737d88268d5a766b67c4b30a014b666dfbf3db81031
 SHA512 
266b86ef5041a7ecd144c6f2570e8a6eb00ebb4e547fa4b8c8c3e60a4af117c2690ff9effb0d4113a7b7ef57164583c8a6ada9cb1bb8f7b748524c826eaf1cba
-DIST nfs-utils-2.3.4.tar.bz2 906900 BLAKE2B 
968fac7b37c7311bc8d29667c88db925aac0c062ed7ef8c13f9e5c11c3c88960ffaea56c1b6cfb5594a01238f9190e55ab7b837a79a7a804bc55dcca75908eea
 SHA512 
25203b38be6683f25ad6583ac8534873c907124092a768955c1454899e2f467b9dd427b167556eb4f28992b5720da13078eb1eb086da991438454f268e1559a5
 DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 
4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b
 SHA512 
655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540

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..000
--- 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 
-
 nfs-utils-2.3.1/support/export/export.c
-+++ nfs-utils-2.3.1/support/export/export.c
-@@ -17,6 +17,7 @@
- #include 
- #include 
- #include 
-+#include 
- #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 
- #include 
- #include 
-+#include 
- 
- #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 
- #include 
- #include 
-+#include 
- 
- #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 
- #include 
- #include 
-+#include 
- 
- #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 
- #include 
- #include 
-+#include 
- 
- #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 
- #include 
- #include 
-+#include 
- #include 
- 
- #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 
- #include 
-+#include 
- 
- #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 
- #include 
- #include 
-+#include 
- #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 
- #include 
- #include 
-+#include 
- 
- #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 
- #include 
- #include 
-+#include 
- 
- #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..000
--- 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 
-Date: Mon, 28 May 2018 12:13:10 +0200
-Subject:

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

2019-08-11 Thread Matt Turner 
commit: b4ff413bd4b91cd387a6087519527476d64aa90b
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Aug 11 22:05:52 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Aug 11 22:09:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ff413b

net-fs/nfs-utils: Look in lib32 for krb5 libs

Signed-off-by: Matt Turner  gentoo.org>

 1-gssd-Look-in-lib32-for-gss-libs-aswell.patch | 39 ++
 net-fs/nfs-utils/nfs-utils-2.4.1.ebuild|  1 +
 2 files changed, 40 insertions(+)

diff --git 
a/net-fs/nfs-utils/files/nfs-utils-2.4.1-gssd-Look-in-lib32-for-gss-libs-aswell.patch
 
b/net-fs/nfs-utils/files/nfs-utils-2.4.1-gssd-Look-in-lib32-for-gss-libs-aswell.patch
new file mode 100644
index 000..8e340656b3e
--- /dev/null
+++ 
b/net-fs/nfs-utils/files/nfs-utils-2.4.1-gssd-Look-in-lib32-for-gss-libs-aswell.patch
@@ -0,0 +1,39 @@
+From e2244412ae8b0b04446063ff6e8a1d0ebebe55a8 Mon Sep 17 00:00:00 2001
+From: Matt Turner 
+Date: Sun, 11 Aug 2019 14:50:01 -0700
+Subject: [PATCH] gssd: Look in lib32 for gss libs aswell.
+
+Akin to commit da999b81b058 ("Look in lib64 for gss libs aswell.")
+
+mips/n32 systems have libraries in lib32 (but not lib or lib64). Without
+checking lib32, configure fails with
+
+checking for Kerberos v5... configure: error: Kerberos v5 with GSS
+ support not found: consider --disable-gss or --with-krb5=
+
+Signed-off-by: Matt Turner 
+---
+ aclocal/kerberos5.m4 | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/aclocal/kerberos5.m4 b/aclocal/kerberos5.m4
+index 8a0f3e4c..faa58049 100644
+--- a/aclocal/kerberos5.m4
 b/aclocal/kerberos5.m4
+@@ -38,9 +38,11 @@ AC_DEFUN([AC_KERBEROS_V5],[
+   AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos 
version number])
+   if test -f $dir/include/gssapi/gssapi_krb5.h -a \
+ \( -f $dir/lib/libgssapi_krb5.a -o \
++   -f $dir/lib/libgssapi_krb5.so -o \
++   -f $dir/lib32/libgssapi_krb5.a -o \
++   -f $dir/lib32/libgssapi_krb5.so -o \
+-f $dir/lib64/libgssapi_krb5.a -o \
+-   -f $dir/lib64/libgssapi_krb5.so -o \
+-   -f $dir/lib/libgssapi_krb5.so \) ; then
++   -f $dir/lib64/libgssapi_krb5.so \) ; then
+  AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos 
libraries])
+  KRBDIR="$dir"
+  gssapi_lib=gssapi_krb5
+-- 
+2.21.0
+

diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild
index 2691baaa27f..c579954763a 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
"${FILESDIR}"/${PN}-2.3.4-no-werror.patch
+   "${FILESDIR}"/${P}-gssd-Look-in-lib32-for-gss-libs-aswell.patch
 )
 
 src_prepare() {

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

2019-04-20 Thread Lars Wendler 
commit: 3bac589455e4c1d815a27cbe41bd2171698a65d0
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Apr 20 18:33:40 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Apr 20 18:34:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bac5894

net-fs/nfs-utils: Added another musl build fix.

Closes: https://bugs.gentoo.org/651080
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 .../nfs-utils/files/nfs-utils-2.3.1-limits.patch   | 105 +
 net-fs/nfs-utils/nfs-utils-2.3.3.ebuild|   1 +
 2 files changed, 106 insertions(+)

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
new file mode 100644
index 000..b322b6fb17c
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch
@@ -0,0 +1,105 @@
+Required for successful build on musl
+https://bugs.gentoo.org/651080#c5
+
+Thanks-to: Robert Bridge 
+
+--- nfs-utils-2.3.1/support/export/export.c
 nfs-utils-2.3.1/support/export/export.c
+@@ -17,6 +17,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #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 
+ #include 
+ #include 
++#include 
+ 
+ #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 
+ #include 
+ #include 
++#include 
+ 
+ #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 
+ #include 
+ #include 
++#include 
+ 
+ #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 
+ #include 
+ #include 
++#include 
+ 
+ #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 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #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 
+ #include 
++#include 
+ 
+ #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 
+ #include 
+ #include 
++#include 
+ #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 
+ #include 
+ #include 
++#include 
+ 
+ #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 
+ #include 
+ #include 
++#include 
+ 
+ #include "misc.h"
+ #include "exportfs.h"

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 18852036dc2..07216af6e21 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
@@ -68,6 +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}-2.3.1-limits.patch #651080
"${FILESDIR}"/${PN}-2.3.4_rc2-improved_res_querydomain_check.patch 
#651080
 )

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

2019-01-18 Thread Lars Wendler 
commit: 05565e9f2752082bc6d198d43775d275b5070219
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jan 18 15:14:59 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jan 18 15:14:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05565e9f

net-fs/nfs-utils: Removed old.

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 net-fs/nfs-utils/Manifest  |   1 -
 ...s-utils-2.3.1-svcgssd_undefined_reference.patch |  40 -
 net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild | 188 -
 3 files changed, 229 deletions(-)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 92c38322217..77edc0132d3 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,2 +1 @@
-DIST nfs-utils-2.3.1.tar.bz2 854899 BLAKE2B 
f9541b9dc103d978f21d57d8ba0c14a3b30f6ba874b112239d014076c1c72b6654e8e02b4bfea686e658dac84d1e896b872bc2054591275ef1713ae4e7b7d005
 SHA512 
de3e70f8656bc5b5aa98262685a9e80929c6314234d9bbb74d4c7efcb7a8b2640d48d2100850b403157ebefc8f0eb48598b48238fae795f64c7a0e9a8bff93e3
 DIST nfs-utils-2.3.3.tar.bz2 888947 BLAKE2B 
7c913f0c5061807d4af162fb392c8f466abb97c88960853b52298f61056bcad08f67a16e577036dec9afa737d88268d5a766b67c4b30a014b666dfbf3db81031
 SHA512 
266b86ef5041a7ecd144c6f2570e8a6eb00ebb4e547fa4b8c8c3e60a4af117c2690ff9effb0d4113a7b7ef57164583c8a6ada9cb1bb8f7b748524c826eaf1cba

diff --git 
a/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch 
b/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch
deleted file mode 100644
index 77c902f2727..000
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1451d7585bf1c622658ccc04abac7e79ffe40263 Mon Sep 17 00:00:00 2001
-From: Justin Mitchell 
-Date: Mon, 8 Jan 2018 09:14:11 -0500
-Subject: [PATCH] svcgssd: Update svcgssd so that it builds
-
-Since a15bd948 the --enable-svcgss option no longer builds
-as svcgssd references functions which were changed at that time.
-Fix those, and other function changes since then.
-
-Signed-off-by: Justin Mitchell 
-Signed-off-by: Steve Dickson 

- utils/gssd/svcgssd.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/utils/gssd/svcgssd.c b/utils/gssd/svcgssd.c
-index 3514ae1..23f0c0b 100644
 a/utils/gssd/svcgssd.c
-+++ b/utils/gssd/svcgssd.c
-@@ -63,6 +63,8 @@
- #include "err_util.h"
- #include "conffile.h"
- 
-+struct state_paths etab;
-+
- void
- sig_die(int signal)
- {
-@@ -101,7 +103,7 @@ main(int argc, char *argv[])
-   char *principal = NULL;
-   char *s;
- 
--  conf_init(NFS_CONFFILE); 
-+  conf_init_file(NFS_CONFFILE);
- 
-   s = conf_get_str("svcgssd", "principal");
-   if (!s)
--- 
-1.8.3.1
-

diff --git a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild
deleted file mode 100644
index 5cd180a79be..000
--- a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic multilib systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/;
-
-if [[ "${PV}" = *_rc* ]] ; then
-   inherit versionator
-   MY_PV="$(replace_all_version_separators -)"
-   
SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz
 -> ${P}.tar.gz"
-   S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-else
-   SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc 
x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 
selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND_COMMON="
-   net-libs/libtirpc:=
-   >=net-nds/rpcbind-0.2.4
-   sys-libs/e2fsprogs-libs
-   caps? ( sys-libs/libcap )
-   ldap? ( net-nds/openldap )
-   libmount? ( sys-apps/util-linux )
-   nfsdcld? ( >=dev-db/sqlite-3.3 )
-   nfsv4? (
-   dev-libs/libevent:=
-   >=sys-apps/keyutils-1.5.9
-   kerberos? (
-   >=net-libs/libtirpc-0.2.4-r1[kerberos]
-   app-crypt/mit-krb5
-   )
-   )
-   nfsv41? (
-   sys-fs/lvm2
-   )
-   tcpd? ( sys-apps/tcp-wrappers )
-   uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON}
-   !net-libs/libnfsidmap
-   !net-nds/portmap
-   ! 
id_resolver.conf
-   doins id_resolver.conf
-   fi
-
-   insinto /etc
-   doins

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

2017-02-11 Thread Lars Wendler 
commit: d603c7b09ac6232d452a8e7a6d7360281d9a8e2c
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Feb 11 11:40:16 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Feb 11 11:40:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d603c7b0

net-fs/nfs-utils: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-fs/nfs-utils/Manifest  |   3 -
 .../files/nfs-utils-1.3.2-background-statd.patch   |  30 
 .../files/nfs-utils-1.3.3-sysmacros.patch  |  78 -
 net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild | 153 --
 net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild | 177 -
 net-fs/nfs-utils/nfs-utils-1.3.3.ebuild| 177 -
 6 files changed, 618 deletions(-)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 5434beb750..5d85242d65 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,6 +1,3 @@
-DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 
90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 
c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e
 WHIRLPOOL 
22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119
 DIST nfs-utils-1.3.1.tar.bz2 785800 SHA256 
748c4afbdfd3e92017fe579f1dd3280a10db1306c43228f83cd6b55f0d95aed3 SHA512 
304e718aaee1df4decb0711c58c814ac773d55277baca01fd74d275969b9a1cee4bf0c0c20ba3ed72a112bd92b4744d45179f29a2a69a7fc2ca2590762a671c9
 WHIRLPOOL 
6fe5e9957c4a2775871ede47d1020f1a642e9242501ff3d21b74c4772ae8dfcafba27334e5844a06f9cc3e0fd286d1f90573511c2b198e330cb46c06cdbfc592
-DIST nfs-utils-1.3.2.tar.bz2 789540 SHA256 
5b9c72eef260b86a84619771e11bb013b99431e6b7ff0bbdc03fee90dba591f7 SHA512 
65633db58bbc5b6bff6acab412dc085affc61e0a6e0aef72d630e67d05a8d08012dced81178a4c7af65c967c25b48161f8d887d261fdf5ce505b719dbdab757c
 WHIRLPOOL 
eee615f032987aee71adf04a3ad5f5b8f79dc4487f1be1a7fb87c42918a12ef9397ba990b02d4adb02265706df9f1e3ef409c141491759c65b8037693b9b06c9
-DIST nfs-utils-1.3.3.tar.bz2 790969 SHA256 
fe8e04f7a869975e11765085d27e91ca3f765e08811a527bb4e32056e41176eb SHA512 
6361be1f8d5872a27d57b74fbf945177e8de233872f1504a7b8ac5adbb104f37113f2dfd28e5694f76f2becc8887f025ed27aad1280e781ab5c48408820d67eb
 WHIRLPOOL 
fb7eec9fe3893cb196160056476342a8a0f62d0e93fa7a9cf49c990763cfe7caa326b938e470bd3a84804fe745c31db87a4f12b58f0fbb1cac9b89faf0405e87
 DIST nfs-utils-1.3.4.tar.bz2 814545 SHA256 
c529c82a82320daae811f3d3a143f83d2714d7e7a43beadd42fcd6022c17d590 SHA512 
765c0bc55a9a0bdb2c25d8fb7189a9054fb9f2dd51726eda29f44e5d5c423e245b02307dfcfab9239276d8f44869a72732416f6e9ef5a1f80753d9243ba1b38c
 WHIRLPOOL 
6dc556ef7d00a583c222eb62a600b0d83c6f91ad65d89ca14e1fb3c8aaacf4fbae492e6f0ca3fb0821e2b666f0806ad5fddec041a1124b86b9941540cdfb08b4
 DIST nfs-utils-2.1.1.tar.bz2 820083 SHA256 
0a28416948516c26f3bfe90425b0de09b79364dc1f508bf1dda8de66e1edbb09 SHA512 
ed358280b7e124154632040bf747f6e4c3c6e4156bf90e82ff6915b1488f1c0dd65251a3a0f9b7ca96b9664d64e24b379828da9b524e64a3c769a44f4c930448
 WHIRLPOOL 
bb28ae312b64c3493a1393a5b41eda457367594a71e230379ec04ffea3eb29d60ab8254e4981b0aa9cbe778dc1fbe9b08dc8615184a35cdb22bf4e5e04e56a6c

diff --git a/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch 
b/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch
deleted file mode 100644
index 393f70b87a..00
--- a/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 17a3e5bffb7110d46de1bf42b64b90713ff5ea50 Mon Sep 17 00:00:00 2001
-From: Chris Mayo 
-Date: Sun, 1 Feb 2015 12:03:46 -0500
-Subject: [PATCH] statd: Fix test for foreground mode
-
-daemon_init parameter has the opposite sense
-to code removed in commit 7addf9d
-
-Signed-off-by: Chris Mayo 
-Signed-off-by: Steve Dickson 

- utils/statd/statd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utils/statd/statd.c b/utils/statd/statd.c
-index 60ce6d1..2b7a167 100644
 a/utils/statd/statd.c
-+++ b/utils/statd/statd.c
-@@ -393,7 +393,7 @@ int main (int argc, char **argv)
-   simulator (--argc, ++argv); /* simulator() does exit() */
- #endif
- 
--  daemon_init(!(run_mode & MODE_NODAEMON));
-+  daemon_init((run_mode & MODE_NODAEMON));
- 
-   if (run_mode & MODE_LOG_STDERR) {
-   xlog_syslog(0);
--- 
-2.2.2
-

diff --git a/net-fs/nfs-utils/files/nfs-utils-1.3.3-sysmacros.patch 
b/net-fs/nfs-utils/files/nfs-utils-1.3.3-sysmacros.patch
deleted file mode 100644
index 638442563c..00
--- a/net-fs/nfs-utils/files/nfs-utils-1.3.3-sysmacros.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 187f0e8298a3dd405b5aa817df129198d6f66eeb Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Thu, 14 Apr 2016

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

2016-04-13 Thread Mike Frysinger 
commit: 6db2e20c272323a10ea3afe3741f8c282bfa2d6a
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Apr 14 04:03:07 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Apr 14 04:03:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db2e20c

net-fs/nfs-utils: fix building w/newer glibc #579884

 .../files/nfs-utils-1.3.3-sysmacros.patch  | 78 ++
 net-fs/nfs-utils/nfs-utils-1.3.3.ebuild|  1 +
 2 files changed, 79 insertions(+)

diff --git a/net-fs/nfs-utils/files/nfs-utils-1.3.3-sysmacros.patch 
b/net-fs/nfs-utils/files/nfs-utils-1.3.3-sysmacros.patch
new file mode 100644
index 000..6384425
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.3.3-sysmacros.patch
@@ -0,0 +1,78 @@
+From 187f0e8298a3dd405b5aa817df129198d6f66eeb Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Thu, 14 Apr 2016 00:01:05 -0400
+Subject: [PATCH nfs-utils] fix building w/newer C libraries
+
+Linux C libraries are moving away from implicitly including the header
+sys/sysmacros.h via sys/types.h.  We would like to do this for glibc
+now, but others (musl/etc...) have been doing it already.  This means
+any code using major/minor/makedevs functions will fail to build when
+they don't include that header.
+
+Leverage the AC_HEADER_MAJOR macro that configure is already using to
+pull in the right header.
+
+Signed-off-by: Mike Frysinger 
+---
+ support/include/xcommon.h| 6 ++
+ support/nfs/nfsexport.c  | 1 +
+ utils/blkmapd/device-discovery.c | 1 +
+ utils/mountd/cache.c | 1 +
+ 4 files changed, 9 insertions(+)
+
+diff --git a/support/include/xcommon.h b/support/include/xcommon.h
+index d1a4b18..23c9a13 100644
+--- a/support/include/xcommon.h
 b/support/include/xcommon.h
+@@ -17,6 +17,12 @@
+ #include 
+ #include 
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined(MAJOR_IN_SYSMACROS)
++#include 
++#endif
++
+ #define streq(s, t)   (strcmp ((s), (t)) == 0)
+ 
+ /* Functions in sundries.c that are used in mount.c and umount.c  */ 
+diff --git a/support/nfs/nfsexport.c b/support/nfs/nfsexport.c
+index afd7c90..4b13265 100644
+--- a/support/nfs/nfsexport.c
 b/support/nfs/nfsexport.c
+@@ -19,6 +19,7 @@
+ 
+ #include "nfslib.h"
+ #include "misc.h"
++#include "xcommon.h"
+ 
+   /* if /proc/net/rpc/... exists, then 
+* write to it, as that interface is more stable.
+diff --git a/utils/blkmapd/device-discovery.c 
b/utils/blkmapd/device-discovery.c
+index b010628..052d582 100644
+--- a/utils/blkmapd/device-discovery.c
 b/utils/blkmapd/device-discovery.c
+@@ -51,6 +51,7 @@
+ #include 
+ 
+ #include "device-discovery.h"
++#include "xcommon.h"
+ 
+ #define EVENT_SIZE (sizeof(struct inotify_event))
+ #define EVENT_BUFSIZE (1024 * EVENT_SIZE)
+diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
+index 7847446..ec86a22 100644
+--- a/utils/mountd/cache.c
 b/utils/mountd/cache.c
+@@ -31,6 +31,7 @@
+ #include "mountd.h"
+ #include "fsloc.h"
+ #include "pseudoflavors.h"
++#include "xcommon.h"
+ 
+ #ifdef USE_BLKID
+ #include "blkid/blkid.h"
+-- 
+2.7.4
+

diff --git a/net-fs/nfs-utils/nfs-utils-1.3.3.ebuild 
b/net-fs/nfs-utils/nfs-utils-1.3.3.ebuild
index 06740c3..f7f8aa3 100644
--- a/net-fs/nfs-utils/nfs-utils-1.3.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.3.3.ebuild
@@ -58,6 +58,7 @@ DEPEND="${DEPEND_COMMON}
 src_prepare() {
epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
+   epatch "${FILESDIR}"/${PN}-1.3.3-sysmacros.patch #579884
 
sed \
-e "/^sbindir/s:= := \"${EPREFIX}\":g" \