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

2024-08-30 Thread Sam James
commit: 95ea2892ef10dce481fce2ecf1b2e10928df1f99
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 30 16:35:19 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 30 16:36:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ea2892

net-fs/nfs-utils: restore inline patch

I dropped it as ${P} is usually a hint that a patch was sent upstream
and merged, but it wasn't the case here. I'll send it upstream shortly.

Bug: https://bugs.gentoo.org/922958
Closes: https://bugs.gentoo.org/938733
Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.7.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-fs/nfs-utils/nfs-utils-2.7.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.7.1.ebuild
index 1502cd5b65a8..b177432a2ae2 100644
--- a/net-fs/nfs-utils/nfs-utils-2.7.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.7.1.ebuild
@@ -72,6 +72,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/${PN}-2.5.2-no-werror.patch
"${FILESDIR}"/${PN}-udev-sysctl.patch
+   "${FILESDIR}"/${PN}-2.6.4-C99-inline.patch
 )
 
 pkg_setup() {



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

2024-08-28 Thread Sam James
commit: b2a07974d763213aaad64aa27bf2716bf0504659
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 29 02:00:47 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 29 02:00:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a07974

net-fs/nfs-utils: add 2.7.1

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/Manifest   |   1 +
 net-fs/nfs-utils/nfs-utils-2.7.1.ebuild | 213 
 2 files changed, 214 insertions(+)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index d340d6b46336..a754d26a5c05 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1 +1,2 @@
 DIST nfs-utils-2.6.4.tar.bz2 979652 BLAKE2B 
45f6e9c98e8148e82684526c2ab0f8976b2a46fd869d91f03cf9afffbaad64b77dc1729a50b74d30c5d65bfe213a1da2f54e3d3e19539b61994f7b65671a26ab
 SHA512 
e5fde25c54f594d00e69c9aeff8abc22663b994ecd37d8516751be98b51b12c61ffec47ee128794e170ec773f0649cb594df1ca104ec4dba561823db423f8533
+DIST nfs-utils-2.7.1.tar.bz2 1001424 BLAKE2B 
176c5559c23c2761c1f2beed068fda8bdd39ac9fa09b4b223552c1455152c410d8925adf8d0023300d4355338e9dc8f6b2774ba71488e795945e5f1fee2b305c
 SHA512 
9e55d4a0d672dbb0e20f8ea0213355a0bec054124c2a9437b3e4b81214c24ef5adb43914bd8606d4af14801ec8e6a4f849c9a97d76ae0879566792bbc960845a

diff --git a/net-fs/nfs-utils/nfs-utils-2.7.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.7.1.ebuild
new file mode 100644
index ..1502cd5b65a8
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.7.1.ebuild
@@ -0,0 +1,213 @@
+# 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="https://downloads.sourceforge.net/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 +nfsv3 +nfsv4 sasl selinux tcpd 
+uuid"
+REQUIRED_USE="|| ( nfsv3 nfsv4 ) 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:=
+   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 )
+   nfsv3? ( >=net-nds/rpcbind-0.2.4 )
+   nfsv4? (
+   >=sys-apps/keyutils-1.5.9:=
+   sys-fs/lvm2
+   kerberos? (
+   >=net-libs/libtirpc-0.2.4-r1[kerberos]
+   app-crypt/mit-krb5
+   )
+   )
+   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
+   nfsv3? ( 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
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if use nfsv4 && 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 CONFIG_CRYPTO_MD5 in your kernel to"
+   ewarn "support the legacy, in-kernel client tracker."
+   fi
+}
+
+src_prepare() {
+   default
+
+   sed \
+   -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+   -i utils/*/Makefile.am || die
+
+   eautoreconf
+}
+
+src_configure() {
+   # Our DEPEND forces this.
+   export libsqlite3_cv_is_recent=yes
+   export ac_cv_header_keyutils_h=$(usex nfsv4)
+
+   # SASL is consumed in a purely automagic way
+   export ac_cv_header_sasl_h=no
+   export ac_cv_header_sasl_sasl_h=$(usex sasl)
+
+   local myeconfargs=(
+   --disable-static
+   --with-statedir="${EPREFIX}"/var/lib/nfs
+   --enable-tirpc
+   --with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/
+   --with-p

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

2024-08-06 Thread James Le Cuirot
commit: c6a2af6d6b80a5dcda0c7619b56c4ed74a3ecd71
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Aug  6 15:42:09 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Aug  6 15:42:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6a2af6d

net-fs/nfs-utils: Fix cross-compiling by pointing to krb5 location

This allows it to find krb5-config.

Signed-off-by: James Le Cuirot  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4-r12.ebuild | 215 
 1 file changed, 215 insertions(+)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r12.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r12.ebuild
new file mode 100644
index ..ead93571698f
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r12.ebuild
@@ -0,0 +1,215 @@
+# 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="https://downloads.sourceforge.net/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 +nfsv3 +nfsv4 sasl selinux tcpd 
+uuid"
+REQUIRED_USE="|| ( nfsv3 nfsv4 ) 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:=
+   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 )
+   nfsv3? ( >=net-nds/rpcbind-0.2.4 )
+   nfsv4? (
+   >=sys-apps/keyutils-1.5.9:=
+   sys-fs/lvm2
+   kerberos? (
+   >=net-libs/libtirpc-0.2.4-r1[kerberos]
+   app-crypt/mit-krb5
+   )
+   )
+   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
+   nfsv3? ( 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
+   "${FILESDIR}"/${P}-C99-inline.patch
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if use nfsv4 && 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 ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in 
your kernel to"
+   ewarn "support the legacy, in-kernel client tracker."
+   fi
+}
+
+src_prepare() {
+   default
+
+   sed \
+   -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+   -i utils/*/Makefile.am || die
+
+   eautoreconf
+}
+
+src_configure() {
+   # Our DEPEND forces this.
+   export libsqlite3_cv_is_recent=yes
+   export ac_cv_header_keyutils_h=$(usex nfsv4)
+
+   # SASL is consumed in a purely automagic way
+   export ac_cv_header_sasl_h=no
+   export ac_cv_header_sasl_sasl_h=$(usex sasl)
+
+   local myeconfargs=(
+   --disable-static
+   --with-statedir="${EPREFIX}"/var/lib/nfs
+   --enable-tirpc
+   --with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/
+   --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
+   --with-rpcgen
+   --with-systemd="$(systemd_get_systemunitdir)"
+   --without-gssglue
+   $(use_enable caps)
+   --enable-ipv6
+   $(use_enable junction)
+   $(use_enable kerberos gss)
+   $(use_enable kerberos svcgss)
+   $(use_enable ldap)
+   $(use_enable libmount libmount-mount)
+   $(use_enable nfsv4)
+   $(use_enable nfsv4 nfsdcld)
+   $(use_enable nfsv4 nfsdcltrack)
+   $(use_enable nfsv4 nfsv41)
+   $(us

[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/files/, net-fs/nfs-utils/

2024-02-26 Thread David Seifert
commit: b088105deeb5406690698f092535767f71546570
Author: David Seifert  gentoo  org>
AuthorDate: Mon Feb 26 10:36:28 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Feb 26 10:36:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b088105d

net-fs/nfs-utils: drop 2.6.3-r3, 2.6.4-r4

Closes: https://bugs.gentoo.org/413173
Closes: https://bugs.gentoo.org/694288
Closes: https://bugs.gentoo.org/798831
Closes: https://bugs.gentoo.org/914203
Signed-off-by: David Seifert  gentoo.org>

 net-fs/nfs-utils/Manifest   |   1 -
 net-fs/nfs-utils/files/nfs.confd|  38 -
 net-fs/nfs-utils/files/nfsclient.confd  |  18 ---
 net-fs/nfs-utils/files/nfsmount.initd-1.3.1 |  26 
 net-fs/nfs-utils/metadata.xml   |  35 ++---
 net-fs/nfs-utils/nfs-utils-2.6.3-r3.ebuild  | 233 ---
 net-fs/nfs-utils/nfs-utils-2.6.4-r4.ebuild  | 234 
 7 files changed, 16 insertions(+), 569 deletions(-)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 9beb56b81fc1..d340d6b46336 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,2 +1 @@
-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.confd b/net-fs/nfs-utils/files/nfs.confd
deleted file mode 100644
index 9dc14058c1fe..
--- a/net-fs/nfs-utils/files/nfs.confd
+++ /dev/null
@@ -1,38 +0,0 @@
-# /etc/conf.d/nfs
-
-# If you wish to set the port numbers for lockd,
-# please see /etc/sysctl.conf
-
-# Optional services to include in default `/etc/init.d/nfs start`
-# For NFSv4 users, you'll want to add "rpc.idmapd" here.
-NFS_NEEDED_SERVICES=""
-
-# Options to pass to rpc.nfsd
-OPTS_RPC_NFSD="8"
-
-# Options to pass to rpc.mountd
-# ex. OPTS_RPC_MOUNTD="-p 32767"
-OPTS_RPC_MOUNTD=""
-
-# Options to pass to rpc.statd
-# ex. OPTS_RPC_STATD="-p 32765 -o 32766"
-OPTS_RPC_STATD=""
-
-# Options to pass to rpc.idmapd
-OPTS_RPC_IDMAPD=""
-
-# Options to pass to rpc.gssd
-OPTS_RPC_GSSD=""
-
-# Options to pass to rpc.svcgssd
-OPTS_RPC_SVCGSSD=""
-
-# Options to pass to rpc.rquotad (requires sys-fs/quota)
-OPTS_RPC_RQUOTAD=""
-
-# Timeout (in seconds) for exportfs
-EXPORTFS_TIMEOUT=30
-
-# Options to set in the nfsd filesystem (/proc/fs/nfsd/).
-# Format is =.  Multiple options are allowed.
-#OPTS_NFSD="nfsv4leasetime=30 max_block_size=4096"

diff --git a/net-fs/nfs-utils/files/nfsclient.confd 
b/net-fs/nfs-utils/files/nfsclient.confd
deleted file mode 100644
index 8a995571e1b8..
--- a/net-fs/nfs-utils/files/nfsclient.confd
+++ /dev/null
@@ -1,18 +0,0 @@
-# You need to decide which nfs protocol version you want to use.
-# If you are unsure, leave these alone.
-#
-# If you are using only nfsv4, uncomment this line:
-#
-#rc_need="!rpc.statd"
-#
-# If you are using only nfsv3, uncomment this line:
-#
-#rc_need="!rpc.idmapd"
-# 
-# You will need to set the dependencies in the nfsclient script to match
-# the network configuration tools you are using. This should be done in
-# this file by following the examples below, and not by changing the
-# service script itself.  See /etc/conf.d/netmount for more examples.
-#
-# This is a safe default.
-rc_after="net"

diff --git a/net-fs/nfs-utils/files/nfsmount.initd-1.3.1 
b/net-fs/nfs-utils/files/nfsmount.initd-1.3.1
deleted file mode 100644
index 68007ca11939..
--- a/net-fs/nfs-utils/files/nfsmount.initd-1.3.1
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This is mostly as a fix for bug #537996, to avoid breaking existing users
-# with nfsmount in their runlevels.
-# If neither nfsclient nor netmount are in your runlevels, and you manually
-# start netmount before nfsclient, then this will break. A real solution is
-# forthcoming, but requires feature development, see bug #406021 for soft
-# dependencies
-depend() {
-   need nfsclient netmount
-}
-
-msg() {
-   ewarn "nfsmount is deprecated, please migrate as described in the news 
item: 2015-02-02-nfs-service-changes"
-   ewarn "This migration script will be removed after 01 Aug 2015."
-}
-
-start() {
-   msg
-}
-
-stop() {
-   msg
-}

diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml
index 3eea1d02ad6d..d2ea9df1b5c2 100644
--

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

2024-02-26 Thread David Seifert
commit: c8d1ce0371f2ad86d55fde7d054ffacbf89e67e2
Author: David Seifert  gentoo  org>
AuthorDate: Mon Feb 26 10:36:29 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Feb 26 10:36:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d1ce03

net-fs/nfs-utils: remove obsolete workarounds

Closes: https://github.com/gentoo/gentoo/pull/35536
Closes: https://bugs.gentoo.org/904718
Signed-off-by: David Seifert  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild | 19 ---
 1 file changed, 19 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
index 1a709d85f618..a50758b8b9eb 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
@@ -128,10 +128,6 @@ src_configure() {
$(use_enable nfsv4 nfsv4server)
$(use_enable uuid)
$(use_with tcpd tcp-wrappers)
-   # XXX: Remove this hack after 2.6.3
-   # See bug #904718.
-   # Patch: 
https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca
-   LIBS="-lsqlite3 -levent_core"
)
econf "${myeconfargs[@]}"
 }
@@ -210,19 +206,4 @@ pkg_postinst() {
einfo "Copying default ${f##*/} from 
${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
done
-
-   if systemd_is_booted; then
-   for v in ${REPLACING_VERSIONS}; do
-   if ver_test "${v}" -lt 1.3.0; then
-   ewarn "We have switched to upstream systemd 
unit files. Since"
-   ewarn "they got renamed, you should probably 
enable the new ones."
-   ewarn "You can run 'equery files nfs-utils | 
grep systemd'"
-   ewarn "to know what services you need to enable 
now."
-   fi
-   done
-   else
-   ewarn "If you use OpenRC, the nfsmount service has been 
replaced with nfsclient."
-   ewarn "If you were using nfsmount, please add nfsclient and 
netmount to the"
-   ewarn "same runlevel as nfsmount."
-   fi
 }



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

2024-02-24 Thread Sam James
commit: 2ff93216707430a5e9ccf5499d1be44f576b6d71
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 24 14:01:13 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 24 14:01:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ff93216

net-fs/nfs-utils: Stabilize 2.6.4-r10 hppa, #925082

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
index 82849d7509a7..9f0a1b9b52d2 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-02-24 Thread Sam James
commit: 110c7d4caddc73d9a9449a8e162162656c8afe9a
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 24 14:01:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 24 14:01:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=110c7d4c

net-fs/nfs-utils: Stabilize 2.6.4-r10 ppc, #925082

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
index 9f0a1b9b52d2..1a709d85f618 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-02-23 Thread Sam James
commit: 4d744d523cdddcf72f633e0afed9506f07e77655
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Feb 23 19:01:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 24 07:07:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d744d52

net-fs/nfs-utils: stable 2.6.4-r10 for sparc, bug #925082

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
index fe7f1d89298d..82849d7509a7 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-02-20 Thread Sam James
commit: 704d916fa77523080202a81a826e1d7190b9b63f
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 20 23:38:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 20 23:38:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=704d916f

net-fs/nfs-utils: Stabilize 2.6.4-r10 ppc64, #925082

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
index 5cea7d8c17a9..0f4ab15c5ba6 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-02-20 Thread Sam James
commit: e3858770c4c0ff1e2fd1ea328bc8d8f3a1104e0c
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 20 23:38:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 20 23:38:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3858770

net-fs/nfs-utils: Stabilize 2.6.4-r10 arm64, #925082

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
index 0f4ab15c5ba6..fe7f1d89298d 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-02-20 Thread Sam James
commit: cecc8daf5207d3524e227748f8ab0cfe4119d8de
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 20 23:38:01 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 20 23:38:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cecc8daf

net-fs/nfs-utils: Stabilize 2.6.4-r10 arm, #925082

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
index 89da86a30d05..5cea7d8c17a9 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-02-20 Thread Jakov Smolić
commit: c47ca19acd766adbc29400628c020081d8cb0589
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Feb 20 14:06:17 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Feb 20 14:06:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c47ca19a

net-fs/nfs-utils: Stabilize 2.6.4-r10 amd64, #925082

Signed-off-by: Jakov Smolić  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
index e7326f98d214..89da86a30d05 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-02-20 Thread Jakov Smolić
commit: 2166069b47de0c94f7e6a5fcf3099133e92e0804
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Feb 20 14:06:15 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Feb 20 14:06:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2166069b

net-fs/nfs-utils: Stabilize 2.6.4-r10 x86, #925082

Signed-off-by: Jakov Smolić  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
index 1a00c46a24df..e7326f98d214 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-02-20 Thread David Seifert
commit: 5e9c7ab963710ac3ac10a1091cac4eff86a4b6b4
Author: David Seifert  gentoo  org>
AuthorDate: Tue Feb 20 09:48:43 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Feb 20 09:48:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e9c7ab9

net-fs/nfs-utils: stabilize 2.6.4-r4 for hppa, ppc

Closes: https://bugs.gentoo.org/922266
Signed-off-by: David Seifert  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r4.ebuild
index ba345b4b3549..cd6e1d6301cb 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-02-16 Thread Mike Gilbert
commit: 803ade1a8a177ff47d4a8e5d5c60ca45e98ba5f5
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Feb 16 19:44:33 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Feb 16 19:44:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=803ade1a

net-fs/nfs-utils: update copyright year in nfs.initd

Signed-off-by: Mike Gilbert  gentoo.org>

 net-fs/nfs-utils/files/nfs.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index bc548f027c07..7c1de560d1da 100644
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="reload"



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

2024-02-16 Thread Mike Gilbert
commit: 7aa183ae8073593cab6d3f012a981a6e6712ffc2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Feb 16 19:23:48 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Feb 16 19:32:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aa183ae

net-fs/nfs-utils: stop sending signals to kernel nfsd threads

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

 net-fs/nfs-utils/files/nfs.initd   | 10 --
 .../{nfs-utils-2.6.3-r2.ebuild => nfs-utils-2.6.3-r3.ebuild}   |  2 +-
 .../{nfs-utils-2.6.4-r3.ebuild => nfs-utils-2.6.4-r10.ebuild}  |  0
 .../{nfs-utils-2.6.4-r1.ebuild => nfs-utils-2.6.4-r4.ebuild}   |  0
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index 6540c9f92075..bc548f027c07 100644
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -6,8 +6,8 @@ extra_started_commands="reload"
 
 # The binary locations
 exportfs=/usr/sbin/exportfs
-  mountd=/usr/sbin/rpc.mountd
-nfsd=/usr/sbin/rpc.nfsd
+mountd=/usr/sbin/rpc.mountd
+nfsd=/usr/sbin/rpc.nfsd
 smnotify=/usr/sbin/sm-notify
 
 depend() {
@@ -106,13 +106,11 @@ stop() {
eend $?
ret=$((ret + $?))
 
-   # nfsd sets its process name to [nfsd] so don't look for $nfsd
ebegin "Stopping NFS daemon"
-   start-stop-daemon --stop --name nfsd --user root --signal 2
+   # Do not attempt to signal kernel nfsd threads directly, #924309
+   ${nfsd} 0
eend $?
ret=$((ret + $?))
-   # in case things don't work out ... #228127
-   rpc.nfsd 0
 
# When restarting the NFS server, running "exportfs -ua" probably
# isn't what the user wants.  Running it causes all entries listed

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.3-r3.ebuild
similarity index 99%
rename from net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
rename to net-fs/nfs-utils/nfs-utils-2.6.3-r3.ebuild
index 93a79d1a257b..773a752231a3 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
similarity index 100%
rename from net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
rename to net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r4.ebuild
similarity index 100%
rename from net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild
rename to net-fs/nfs-utils/nfs-utils-2.6.4-r4.ebuild



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

2024-02-14 Thread Sam James
commit: 17d55e0c83fb89d3e8a490c49ab4dadd48f2f933
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Feb 14 13:37:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 14 16:44:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17d55e0c

net-fs/nfs-utils: stable 2.6.4-r1 for sparc, bug #922266

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 987c49da9641..ba345b4b3549 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-01-29 Thread David Seifert
commit: c38258f864e03a8d09402f3b484c789a857e665d
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jan 29 11:01:57 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jan 29 11:01:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c38258f8

net-fs/nfs-utils: fix C99 inline semantics

Closes: https://bugs.gentoo.org/922958
Signed-off-by: David Seifert  gentoo.org>

 .../files/nfs-utils-2.6.4-C99-inline.patch | 26 ++
 net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild |  1 +
 2 files changed, 27 insertions(+)

diff --git a/net-fs/nfs-utils/files/nfs-utils-2.6.4-C99-inline.patch 
b/net-fs/nfs-utils/files/nfs-utils-2.6.4-C99-inline.patch
new file mode 100644
index ..2797249523f6
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.6.4-C99-inline.patch
@@ -0,0 +1,26 @@
+C99 `inline` is not guaranteed to emit an external definition
+https://www.greenend.org.uk/rjk/tech/inline.html
+Bug: https://bugs.gentoo.org/922958
+
+--- a/utils/exportd/exportd.c
 b/utils/exportd/exportd.c
+@@ -53,7 +53,7 @@
+  */
+ inline static void set_signals(void);
+ 
+-inline void
++inline static void
+ cleanup_lockfiles (void)
+ {
+   unlink(etab.lockfn);
+--- a/utils/mountd/mountd.c
 b/utils/mountd/mountd.c
+@@ -111,7 +111,7 @@
+   nfs_svc_unregister(MOUNTPROG, MOUNTVERS_NFSV3);
+ }
+ 
+-static void
++inline static void
+ cleanup_lockfiles (void)
+ {
+   unlink(etab.lockfn);

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
index 993fead7ae7c..1a00c46a24df 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.5.2-no-werror.patch
"${FILESDIR}"/${PN}-udev-sysctl.patch
"${FILESDIR}"/${P}-includes.patch
+   "${FILESDIR}"/${P}-C99-inline.patch
 )
 
 pkg_setup() {



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

2024-01-25 Thread David Seifert
commit: ce0d94369c64ff2a40ce3d03dcc61133a88f24a7
Author: David Seifert  gentoo  org>
AuthorDate: Thu Jan 25 13:25:44 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan 25 13:25:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce0d9436

net-fs/nfs-utils: remove stale /etc/conf.d/nfs sed

Closes: https://bugs.gentoo.org/922899
Signed-off-by: David Seifert  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
index ae1a7eca66e6..993fead7ae7c 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
@@ -180,11 +180,6 @@ src_install() {
newinitd "${FILESDIR}"/${f}.initd ${f}
done
 
-   # bug #234132
-   sed -i \
-   -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-   "${ED}"/etc/conf.d/nfs || die
-
local systemd_systemunitdir="$(systemd_get_systemunitdir)"
sed -i \
-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \



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

2024-01-25 Thread David Seifert
commit: c54cb04aac675eebda4970990d7fd073f0d56e40
Author: David Seifert  gentoo  org>
AuthorDate: Thu Jan 25 11:07:48 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan 25 11:07:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c54cb04a

net-fs/nfs-utils: remove USE={idmap,nfsdcld}

* The absence of idmap leads to obscure issues on NFSv4.

Closes: https://github.com/gentoo/gentoo/pull/34988
Bug: https://bugs.gentoo.org/798831
Bug: https://bugs.gentoo.org/914203
Signed-off-by: David Seifert  gentoo.org>

 ...s-2.6.4-r2.ebuild => nfs-utils-2.6.4-r3.ebuild} | 23 --
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
similarity index 88%
rename from net-fs/nfs-utils/nfs-utils-2.6.4-r2.ebuild
rename to net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
index bf04672be1de..ae1a7eca66e6 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
@@ -19,8 +19,8 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv3 +nfsv4 
sasl selinux tcpd +uuid"
-REQUIRED_USE="|| ( nfsv3 nfsv4 ) kerberos? ( nfsv4 ) nfsdcld? ( nfsv4 )"
+IUSE="caps junction kerberos ldap +libmount +nfsv3 +nfsv4 sasl selinux tcpd 
+uuid"
+REQUIRED_USE="|| ( nfsv3 nfsv4 ) kerberos? ( nfsv4 )"
 # bug #315573
 RESTRICT="test"
 
@@ -78,10 +78,9 @@ PATCHES=(
 pkg_setup() {
linux-info_pkg_setup
 
-   if use nfsv4 && ! use nfsdcld && linux_config_exists && ! 
linux_chkconfig_present CRYPTO_MD5 ; then
+   if use nfsv4 && 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"
+   ewarn "Please enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in 
your kernel to"
ewarn "support the legacy, in-kernel client tracker."
fi
 }
@@ -99,7 +98,7 @@ src_prepare() {
 src_configure() {
# Our DEPEND forces this.
export libsqlite3_cv_is_recent=yes
-   export ac_cv_header_keyutils_h=$(usex nfsidmap)
+   export ac_cv_header_keyutils_h=$(usex nfsv4)
 
# SASL is consumed in a purely automagic way
export ac_cv_header_sasl_h=no
@@ -121,9 +120,9 @@ src_configure() {
$(use_enable kerberos svcgss)
$(use_enable ldap)
$(use_enable libmount libmount-mount)
-   $(use_enable nfsdcld)
-   $(use_enable nfsdcld nfsdcltrack)
$(use_enable nfsv4)
+   $(use_enable nfsv4 nfsdcld)
+   $(use_enable nfsv4 nfsdcltrack)
$(use_enable nfsv4 nfsv41)
$(use_enable nfsv4 nfsv4server)
$(use_enable uuid)
@@ -157,7 +156,7 @@ src_install() {
dodir /sbin
mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
 
-   if use nfsv4 && use nfsidmap ; then
+   if use nfsv4 ; then
insinto /etc
doins support/nfsidmap/idmapd.conf
 
@@ -181,12 +180,6 @@ src_install() {
newinitd "${FILESDIR}"/${f}.initd ${f}
done
 
-   # Nuke after 2015/08/01
-   newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount
-   for f in nfs nfsclient ; do
-   newconfd "${FILESDIR}"/${f}.confd ${f}
-   done
-
# bug #234132
sed -i \
-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \



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

2024-01-23 Thread David Seifert
commit: cda6f318133f1fc45ca306d0991ff1dfe9a5efda
Author: Hanabishi <13597663+HanabishiRecca  users  noreply  
github  com>
AuthorDate: Tue Jan 23 14:45:28 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jan 23 14:45:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cda6f318

net-fs/nfs-utils: simplify NFS versions handling

Closes: https://github.com/gentoo/gentoo/pull/34977
Signed-off-by: Hanabishi <13597663+HanabishiRecca  users.noreply.github.com>
Signed-off-by: David Seifert  gentoo.org>

 net-fs/nfs-utils/metadata.xml  |   3 +-
 net-fs/nfs-utils/nfs-utils-2.6.4-r2.ebuild | 239 +
 2 files changed, 241 insertions(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml
index 0899c08987f5..3eea1d02ad6d 100644
--- a/net-fs/nfs-utils/metadata.xml
+++ b/net-fs/nfs-utils/metadata.xml
@@ -9,8 +9,9 @@
 Enable NFS junction support in nfsref
 Add ldap support
 Link mount.nfs with libmount
-Enable nfsdcld NFSv4 clientid tracking daemon
+Enable nfsdcld NFSv4 clientid tracking daemon and 
tools
 Enable support for newer nfsidmap helper
+Enable support for NFSv2 and NFSv3
 Enable support for NFSv4
 Enable support for NFSv4.1
 Support UUID lookups in rpc.mountd

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4-r2.ebuild
new file mode 100644
index ..bf04672be1de
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r2.ebuild
@@ -0,0 +1,239 @@
+# 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 +nfsv3 +nfsv4 
sasl selinux tcpd +uuid"
+REQUIRED_USE="|| ( nfsv3 nfsv4 ) kerberos? ( nfsv4 ) nfsdcld? ( 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:=
+   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 )
+   nfsv3? ( >=net-nds/rpcbind-0.2.4 )
+   nfsv4? (
+   >=sys-apps/keyutils-1.5.9:=
+   sys-fs/lvm2
+   kerberos? (
+   >=net-libs/libtirpc-0.2.4-r1[kerberos]
+   app-crypt/mit-krb5
+   )
+   )
+   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
+   nfsv3? ( 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"
+   ewarn "support the legacy, in-kernel client tracker."
+   fi
+}
+
+src_prepare() {
+   default
+
+   sed \
+   -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+   -i utils/*/Makefile.am || die
+
+   eautoreconf
+}
+
+src_configure() {
+   # Our DEPEND forces this.
+   export libsqlite3_cv_is_recent=yes
+   export ac_cv_header_keyutils_h=$(usex nfsidmap)
+
+   # SASL is consumed in a purely automagic way
+   export ac_cv_header_sasl_h=no
+   export ac_cv_header_sasl_sasl

[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", &sb) == 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", &sb) == 0 ||
-+  if (stat("/proc/fs/nfsd/clients", &sb) != 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 xtab

[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/

2024-01-17 Thread Sam James
commit: 3c625a92a2df594103e4d50de643b27f3d191ca9
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 18 00:27:26 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 18 00:27:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c625a92

net-fs/nfs-utils: Stabilize 2.6.4 x86, #922266

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
index bb0e143674ff..a652b81eda7b 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2024-01-16 Thread Sam James
commit: b40e4aba0b48c361e73f4dd45f4358c46d5705fd
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 17 06:32:35 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 17 06:33:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b40e4aba

net-fs/nfs-utils: Stabilize 2.6.4 amd64, #922266

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
index 117a08c10907..bb0e143674ff 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2024-01-16 Thread Arthur Zamarin
commit: de48acf782d983405747a3be6fcd44a915d05d9c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jan 17 06:29:32 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jan 17 06:30:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de48acf7

net-fs/nfs-utils: Stabilize 2.6.4 ppc64, #922266

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
index 53465d5221b6..117a08c10907 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2024-01-16 Thread Sam James
commit: 32ca2a8aa46386c746c253f9de1b2490f18858d4
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 17 05:49:10 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 17 05:49:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32ca2a8a

net-fs/nfs-utils: Stabilize 2.6.4 arm64, #922266

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
index 351ea4ee1f69..1f0cd5edff33 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2024-01-16 Thread Sam James
commit: 0165d2846db3b03c2f25185b774ed5a33e7a3f1c
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 17 05:49:11 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 17 05:49:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0165d284

net-fs/nfs-utils: Stabilize 2.6.4 arm, #922266

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
index 1f0cd5edff33..53465d5221b6 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2023-11-29 Thread Sam James
commit: c21da9af1176e9004430ef47069e9b4e7bdf0a5a
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 30 03:20:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 30 03:20:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c21da9af

net-fs/nfs-utils: add 2.6.4

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/Manifest   |   1 +
 net-fs/nfs-utils/nfs-utils-2.6.4.ebuild | 233 
 2 files changed, 234 insertions(+)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 7a7a441cf7c0..aebdda16d856 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,2 +1,3 @@
 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/nfs-utils-2.6.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
new file mode 100644
index ..351ea4ee1f69
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2023 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
+)
+
+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"
+   ewarn "support the legacy, in-kernel client tracker."
+   fi
+}
+
+src_prepare() {
+   default
+
+   sed \
+   -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+   -i utils/*/Makefile.am || die
+
+   eautoreconf
+}
+
+src_configure() {
+   # Our DEPEND forces this.
+   

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

2023-08-20 Thread James Le Cuirot
commit: 84355e55c85ce07f7f37801eff1f17c89140b447
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Aug 20 16:30:57 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Aug 20 16:31:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84355e55

net-fs/nfs-utils: Keyword 2.6.3-r2 for ~m68k

I've been using it for ages.

Signed-off-by: James Le Cuirot  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
index fdade9f1770f..93a79d1a257b 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-06-25 Thread Arthur Zamarin
commit: 303f1c0267c23fe001173f8d6f64afa6bc7c3a95
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 25 17:40:18 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 25 17:40:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303f1c02

net-fs/nfs-utils: Stabilize 2.6.3-r2 sparc, #907505

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
index ee2dd99691b1..fdade9f1770f 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-06-25 Thread Arthur Zamarin
commit: a521bcadc8373dd378144642bc1e8e7cb9805866
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 25 17:40:15 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 25 17:40:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a521bcad

net-fs/nfs-utils: Stabilize 2.6.3-r2 ppc, #907505

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
index ceb8a641de3b..ee2dd99691b1 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-06-06 Thread Sam James
commit: b15633bcf1a1febfc7204cbbfd3e59357d1b
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Jun  6 18:47:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  6 21:07:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b15633bc

net-fs/nfs-utils: stable 2.6.3-r2 for hppa, bug #907505

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
index b7f3a0e8f9af..ceb8a641de3b 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-06-02 Thread Mike Gilbert
commit: 4a8943891a7da4d1b2acd0eafd68918fff72c1e4
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Jun  3 00:44:59 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jun  3 00:44:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a894389

net-fs/nfs-utils: fix path to sysctl in udev rules

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

 net-fs/nfs-utils/files/nfs-utils-udev-sysctl.patch | 32 ++
 ...s-2.6.3-r1.ebuild => nfs-utils-2.6.3-r2.ebuild} |  1 +
 2 files changed, 33 insertions(+)

diff --git a/net-fs/nfs-utils/files/nfs-utils-udev-sysctl.patch 
b/net-fs/nfs-utils/files/nfs-utils-udev-sysctl.patch
new file mode 100644
index ..156a3067bb3c
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-udev-sysctl.patch
@@ -0,0 +1,32 @@
+Gentoo installs sysctl in /usr/sbin
+
+https://bugs.gentoo.org/907688
+
+--- a/systemd/60-nfs.rules
 b/systemd/60-nfs.rules
+@@ -2,20 +2,20 @@
+ 
+ # sunrpc module supports "sunrpc.*" sysctls
+ ACTION=="add", SUBSYSTEM=="module", KERNEL=="sunrpc", \
+-  RUN+="/sbin/sysctl -q --pattern ^sunrpc --system"
++  RUN+="/usr/sbin/sysctl -q --pattern ^sunrpc --system"
+ 
+ # rpcrdma module supports sunrpc.svc_rdma.*
+ ACTION=="add", SUBSYSTEM=="module", KERNEL=="rpcrdma", \
+-  RUN+="/sbin/sysctl -q --pattern ^sunrpc.svc_rdma --system"
++  RUN+="/usr/sbin/sysctl -q --pattern ^sunrpc.svc_rdma --system"
+ 
+ # lockd module supports "fs.nfs.nlm*" and "fs.nfs.nsm*" sysctls
+ ACTION=="add", SUBSYSTEM=="module", KERNEL=="lockd", \
+-  RUN+="/sbin/sysctl -q --pattern ^fs.nfs.n[sl]m --system"
++  RUN+="/usr/sbin/sysctl -q --pattern ^fs.nfs.n[sl]m --system"
+ 
+ # nfsv4 module supports "fs.nfs.*" sysctls (nfs_callback_tcpport and 
idmap_cache_timeout)
+ ACTION=="add", SUBSYSTEM=="module", KERNEL=="nfsv4", \
+-  RUN+="/sbin/sysctl -q --pattern 
^fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout) --system"
++  RUN+="/usr/sbin/sysctl -q --pattern 
^fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout) --system"
+ 
+ # nfs module supports "fs.nfs.*" sysctls
+ ACTION=="add", SUBSYSTEM=="module", KERNEL=="nfs", \
+-  RUN+="/sbin/sysctl -q --pattern ^fs.nfs --system"
++  RUN+="/usr/sbin/sysctl -q --pattern ^fs.nfs --system"

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
similarity index 99%
rename from net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
rename to net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
index 242fef17126e..b7f3a0e8f9af 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild
@@ -73,6 +73,7 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.5.2-no-werror.patch
+   "${FILESDIR}"/${PN}-udev-sysctl.patch
 )
 
 pkg_setup() {



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

2023-05-31 Thread Sam James
commit: 6d6bda4cfc7b9b3938948476db2a9e3593f58f51
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 03:34:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:34:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d6bda4c

net-fs/nfs-utils: Stabilize 2.6.3-r1 arm, #907505

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
index e8c017f22555..8fd163ccfd89 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-05-31 Thread Sam James
commit: 0c8a7f29129928bcd850cd0ba175ec1c59537c1d
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 03:34:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:34:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c8a7f29

net-fs/nfs-utils: Stabilize 2.6.3-r1 ppc64, #907505

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
index 8fd163ccfd89..6a9245add382 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-05-31 Thread Sam James
commit: d6bfd5f56215fd57e834ee908020e48cc6826759
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 03:34:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:34:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6bfd5f5

net-fs/nfs-utils: Stabilize 2.6.3-r1 arm64, #907505

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
index 6a9245add382..242fef17126e 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-05-31 Thread Sam James
commit: b5b33e1cc7f17d82aa95f3edb457f98330919584
Author: wjaskulski  adva  com>
AuthorDate: Fri Apr 28 12:43:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:32:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b33e1c

net-fs/nfs-utils: add dev-db/sqlite and dev-libs/libevent to COMMON_DEPENDS

Closes: https://bugs.gentoo.org/904718
Signed-off-by: Wiktor Jaskulski  adva.com>
Closes: https://github.com/gentoo/gentoo/pull/30789
Signed-off-by: Sam James  gentoo.org>

 .../{nfs-utils-2.6.3.ebuild => nfs-utils-2.6.3-r1.ebuild} | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
similarity index 96%
rename from net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
rename to net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
index e0b9d944e70f..e8c017f22555 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
@@ -33,6 +33,8 @@ COMMON_DEPEND="
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:=
@@ -43,8 +45,6 @@ COMMON_DEPEND="
)
libmount? ( sys-apps/util-linux )
nfsv4? (
-   dev-db/sqlite:3
-   dev-libs/libevent:=
>=sys-apps/keyutils-1.5.9:=
kerberos? (
>=net-libs/libtirpc-0.2.4-r1[kerberos]
@@ -126,6 +126,10 @@ src_configure() {
$(use_enable nfsv41)
$(use_enable uuid)
$(use_with tcpd tcp-wrappers)
+   # XXX: Remove this hack after 2.6.3
+   # See bug #904718.
+   # Patch: 
https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca
+   LIBS="-lsqlite3 -levent_core"
)
econf "${myeconfargs[@]}"
 }



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

2023-05-31 Thread Sam James
commit: eee80d31a992e4d99c1901c6a27c401a856b9d64
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 03:28:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:28:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eee80d31

net-fs/nfs-utils: Stabilize 2.6.3 x86, #907505

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
index b95d66ce7f7f..d8eb3aa4f3da 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-05-31 Thread Sam James
commit: f48328be5235df4aa4da77107e64876effa12859
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 03:28:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:28:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f48328be

net-fs/nfs-utils: Stabilize 2.6.3 amd64, #907505

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
index d8eb3aa4f3da..e0b9d944e70f 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2023-04-19 Thread Sam James
commit: 475f696db9010e6cd3f2e6406e3609bc65b811f6
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 20 04:30:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 20 05:01:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=475f696d

net-fs/nfs-utils: add 2.6.3

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/Manifest   |   1 +
 net-fs/nfs-utils/nfs-utils-2.6.3.ebuild | 228 
 2 files changed, 229 insertions(+)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index e8f717e78f36..7a7a441cf7c0 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1 +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

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
new file mode 100644
index ..b95d66ce7f7f
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2023 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 ~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
+   caps? ( sys-libs/libcap )
+   ldap? (
+   net-nds/openldap:=
+   sasl? (
+   app-crypt/mit-krb5
+   dev-libs/cyrus-sasl:2
+   )
+   )
+   libmount? ( sys-apps/util-linux )
+   nfsv4? (
+   dev-db/sqlite:3
+   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 )"
+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
+)
+
+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"
+   ewarn "support the legacy, in-kernel client tracker."
+   fi
+}
+
+src_prepare() {
+   default
+
+   sed \
+   -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+   -i utils/*/Makefile.am || die
+
+   eautoreconf
+}
+
+src_configure() {
+   # Our DEPEND forces this.
+   export libsqlite3_cv_is_recent=yes
+   export ac_cv_header_keyutils_h=$(usex nfsidmap)
+
+   # SASL is consumed in a purely automagic way
+   export ac_cv_header_sasl_h=no
+   export ac_cv_header_sasl_sasl_h=$(usex sasl)
+
+   local myeconfargs=(
+   --disable-static
+   --with-statedir="${EPREFIX}"/var/li

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

2022-11-25 Thread Arthur Zamarin
commit: d7fb40348abe86f3c3459b97eff0fc16dc3c3ea2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 09:45:23 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 09:45:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7fb4034

net-fs/nfs-utils: Stabilize 2.6.2-r1 sparc, #882843

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
index 65d23a96921f..818d562e0db3 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2022-11-24 Thread Sam James
commit: ee079aaeaeaf3da2eb1ee6f29287db59a28add3b
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 07:53:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 07:53:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee079aae

net-fs/nfs-utils: Stabilize 2.6.2-r1 hppa, #882843

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
index fc19c92ae93f..65d23a96921f 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2022-11-24 Thread Arthur Zamarin
commit: 344e5a62a5ab0de03aca91a40d681c5316084617
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 06:39:27 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 06:39:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=344e5a62

net-fs/nfs-utils: Stabilize 2.6.2-r1 ppc, #882843

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
index 0c07918ec285..fc19c92ae93f 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2022-11-24 Thread Sam James
commit: 82d8b720a69e6f15592f0bbfe59c375cab3dd256
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 05:15:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 05:15:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82d8b720

net-fs/nfs-utils: Stabilize 2.6.2-r1 ppc64, #882843

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
index ff5b4d1d994f..16f3d7eb35bf 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2022-11-24 Thread Sam James
commit: f3e3c648d8144b319a42b59a086476985ce649b5
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 05:15:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 05:15:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3e3c648

net-fs/nfs-utils: Stabilize 2.6.2-r1 arm64, #882843

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
index 16f3d7eb35bf..22c68a35ee30 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2022-11-24 Thread Sam James
commit: 0652e1c01293b5341eb21a8cc7afe28a4140d905
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 05:15:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 05:15:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0652e1c0

net-fs/nfs-utils: Stabilize 2.6.2-r1 x86, #882843

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
index 22c68a35ee30..0c07918ec285 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2022-11-24 Thread Sam James
commit: beef67a98ba7899ed46ff1d3362ef8328a2d937d
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 05:07:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 05:07:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beef67a9

net-fs/nfs-utils: Stabilize 2.6.2-r1 arm, #882843

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
index cf7fc11c6786..ff5b4d1d994f 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2022-11-24 Thread Sam James
commit: 63b9a24997c9f230b087e2eb5113359517738cab
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 05:06:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 05:06:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b9a249

net-fs/nfs-utils: Stabilize 2.6.2-r1 amd64, #882843

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
index 09bbf816fdea..cf7fc11c6786 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2022-10-19 Thread Sam James
commit: a599cb41d32ac8e248c8e6df8fea80ca1197845e
Author: kochera  google  com>
AuthorDate: Wed Oct 19 19:43:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 20 03:50:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a599cb41

net-fs/nfs-utils: Add cpe_uri for nfs-utils package.

Signed-off-by: Michael Kochera  google.com>
Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml
index f60293313f59..0899c08987f5 100644
--- a/net-fs/nfs-utils/metadata.xml
+++ b/net-fs/nfs-utils/metadata.xml
@@ -16,6 +16,7 @@
 Support UUID lookups in rpc.mountd
   
   
+cpe:/a:linux-nfs:nfs-utils
 nfs
   
 



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

2022-09-26 Thread Sam James
commit: 6a73c6935a2c72580082653baf8c096e08bc7e9c
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 26 02:17:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 26 02:17:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a73c693

net-fs/nfs-utils: add link to upstream patch submission

Signed-off-by: Sam James  gentoo.org>

 .../files/nfs-utils-2.6.2-clang-more-function-prototypes.patch  | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch 
b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch
index aecb29d3a7cf..51bfb30f1e64 100644
--- 
a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch
+++ 
b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch
@@ -1,3 +1,5 @@
+https://patchwork.kernel.org/project/linux-nfs/patch/20220916214300.2820117-1-...@gentoo.org/
+
 From daf6aa9b659078aebd202f59bd9a0ab685ce Mon Sep 17 00:00:00 2001
 From: Sam James 
 Date: Fri, 16 Sep 2022 22:35:23 +0100



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

2022-09-22 Thread Sam James
commit: 3a94789db5166fbcb26dfc594dd373ccb883d175
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 23 02:11:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 23 02:13:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a94789d

net-fs/nfs-utils: drop 2.6.2

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.2.ebuild | 228 
 1 file changed, 228 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild
deleted file mode 100644
index 9f9ef08b453e..
--- a/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2022 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 ~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
-   caps? ( sys-libs/libcap )
-   ldap? (
-   net-nds/openldap:=
-   sasl? (
-   app-crypt/mit-krb5
-   dev-libs/cyrus-sasl:2
-   )
-   )
-   libmount? ( sys-apps/util-linux )
-   nfsv4? (
-   dev-db/sqlite:3
-   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 )"
-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
-)
-
-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"
-   ewarn "support the legacy, in-kernel client tracker."
-   fi
-}
-
-src_prepare() {
-   default
-
-   sed \
-   -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-   -i utils/*/Makefile.am || die
-
-   eautoreconf
-}
-
-src_configure() {
-   # Our DEPEND forces this.
-   export libsqlite3_cv_is_recent=yes
-   export ac_cv_header_keyutils_h=$(usex nfsidmap)
-
-   # SASL is consumed in a purely automagic way
-   export ac_cv_header_sasl_h=no
-   export ac_cv_header_sasl_sasl_h=$(usex sasl)
-
-   local myeconfargs=(
-   --disable-static
-   --with-statedir="${EPREFIX}"/var/lib/nfs
-   --enable-tirpc
-   --with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/
-   --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
-   --with-rpcgen
-   --with-systemd="$(systemd_get_systemunitdir)"
-   --without-gssglue
-   $(use_enable caps)
-   --enable-ipv6
-   $(use_enable junction)
-   $(use_enable kerberos gss)
-   $(use_enable kerberos svcgss)
-   $(use_enable ldap)
-   $(use_enable libmount libmount-mount)
-   $(use_enable nfsdcld nfsdcltrack)
-   $(use_enable nfsv4)
-   $(use_enable nfsv41)
-   $(use_enable uuid)
-   $(use_with tcpd tcp-wrappers)
-   )
-   econf "${myeconfargs[@]}"
-}
-
-src_compile()

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

2022-09-16 Thread Sam James
commit: e772be31b041cd55f138130fcc9c2cc418847581
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 16 21:48:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 16 21:50:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e772be31

net-fs/nfs-utils: fix build with -Werror=strict-prototypes (Clang 15+)

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

 ...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 |  37 
 net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild | 231 +
 4 files changed, 374 insertions(+)

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
new file mode 100644
index ..2ba9a45a024b
--- /dev/null
+++ 
b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-Wlogical-not-parentheses.patch
@@ -0,0 +1,28 @@
+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", &sb) == 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", &sb) == 0 ||
++  if (stat("/proc/fs/nfsd/clients", &sb) != 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
new file mode 100644
index ..f223af883ad0
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-fix-function-prototypes.patch
@@ -0,0 +1,78 @@
+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 xtab_write(etab.statefn, etab.tmpfn, etab.lockfn, 1);
+ }
+--- a/utils/exportfs/exportfs.c
 b/utils/exportfs/exportfs.c
+@@ -69,14 +69,14 @@ static int _lockfd = -1;
+  * need these additional lockfile() routines.
+  */
+ static void
+-grab_lockfile()
++grab_lockfile(void)
+ {
+   _lockfd = open(lockfile, O_CREAT|O_RDWR, 0666);
+   if (_lockfd != -1)
+   lockf(_lockfd, F_LOCK, 0);
+ }
+ static void
+-release_lockfile()
++release_lockfile(void)
+ {
+   if (_lockfd != -1) {
+   lockf(_lockfd, F_ULOCK, 0);
+--- a/utils/mount/network.c
 b/utils/mount/network.c
+@@ -179,7 +179,7 @@ static const unsigned long probe_mnt3_only[] = {
+ 
+ static const unsigned int *nfs_default_proto(void);
+ #ifdef MOUNT_CONFIG
+-static const unsigned int *nfs_default_proto()
++static const unsigned int *nfs_default_proto(void)
+ {
+   extern unsigned long config_default_proto;
+   /*

diff --git 
a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch 
b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch
new file mode 100644
index ..aecb29d3a7cf
--- /dev/null
+++ 
b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more

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

2022-08-27 Thread WANG Xuerui
commit: 709f22fccb2b9e6330af75c167ce0e3b68a2e676
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sun Aug 28 05:41:17 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun Aug 28 06:28:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=709f22fc

net-fs/nfs-utils: keyword 2.6.2 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild
index 6a6968c458fd..9f9ef08b453e 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
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"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2022-08-12 Thread Sam James
commit: 1a80f6631a7cc3e66f26a935f3e79febc34d914d
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 12 17:59:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 12 18:16:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a80f663

net-fs/nfs-utils: add 2.6.2

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/Manifest   |   1 +
 net-fs/nfs-utils/nfs-utils-2.6.2.ebuild | 228 
 2 files changed, 229 insertions(+)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index ee08b23a1800..2e1491388e83 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1 +1,2 @@
 DIST nfs-utils-2.6.1.tar.bz2 946432 BLAKE2B 
fe6ec58b4c0def75a43f40a581a9d67d25ee2e6979f41da87453661b33460b99744e1799d6b1a3ef026027cafb1aae8a954cc6449d3eb77eee494fe72804751d
 SHA512 
5b8949b3d30ccd33c9bc68875ba0993a22e490234d5eeebc189b3da2b1df0c290cd27d58226ffa5f4fe8b9548234fadb1c432b9c7d9b297c10a39fd2887d2f7f
+DIST nfs-utils-2.6.2.tar.bz2 969689 BLAKE2B 
8e0a3b309223779824276acd3ede13cfc161b955dc9376cc9426ffe9c604b111f7405088fe8e5a88a2d2ac1413d2742fbdf166a5b04c975e51a9e384e071fa60
 SHA512 
6e5dcc5147ad551b2ecbf0304e1b0e0713d1eff32c5a511562a6d03660589e027364e38fc9f6de1b06d32d8907d502f63c564a6e56171f58823b0ea68dd3a6b8

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild
new file mode 100644
index ..6a6968c458fd
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2022 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 ~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
+   caps? ( sys-libs/libcap )
+   ldap? (
+   net-nds/openldap:=
+   sasl? (
+   app-crypt/mit-krb5
+   dev-libs/cyrus-sasl:2
+   )
+   )
+   libmount? ( sys-apps/util-linux )
+   nfsv4? (
+   dev-db/sqlite:3
+   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 )"
+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
+)
+
+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"
+   ewarn "support the legacy, in-kernel client tracker."
+   fi
+}
+
+src_prepare() {
+   default
+
+   sed \
+   -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+   -i utils/*/Makefile.am || die
+
+   eautoreconf
+}
+
+src_configure() {
+   # Our DEPEND forces this.
+   export libsqlite3_cv_is_recent=yes
+   export ac_cv_header_keyutils_h=$(usex nfsidmap)
+
+   # SASL is consumed in a purely automagic way
+   export ac_cv_header_sasl_h=no
+   export ac_cv_header_sasl_sasl_h=$(usex sasl)
+
+   local myeconfargs=(
+   --disable-static
+   --with-statedir="${EPREFIX}"/var/lib/nfs
+

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

2022-08-09 Thread Sam James
commit: 32001fbd7d3ed48b74946b29d9154c9acc2cd25f
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 10 04:47:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 10 04:47:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32001fbd

net-fs/nfs-utils: update HOMEPAGE

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
index 907d935c3310..207d20ce46cd 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
@@ -6,9 +6,9 @@ EAPI=7
 inherit autotools linux-info systemd
 
 DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/";
+HOMEPAGE="http://linux-nfs.org/ 
https://git.linux-nfs.org/?p=steved/nfs-utils.git";
 
-if [[ "${PV}" = *_rc* ]] ; then
+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}"



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

2022-05-07 Thread Arthur Zamarin
commit: 276d6b6d5da0131c09b347b59fe812d4aaf0e570
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  7 18:19:07 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  7 18:19:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=276d6b6d

net-fs/nfs-utils: Stabilize 2.6.1 arm64, #843164

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
index e62f0be35d31..525b3054703e 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2022-05-07 Thread Arthur Zamarin
commit: b26e7738ae3d896c0242e0b119e0db52e9902a65
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  7 18:19:13 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  7 18:19:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26e7738

net-fs/nfs-utils: Stabilize 2.6.1 arm, #843164

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
index 525b3054703e..c18b94215944 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2022-05-07 Thread Arthur Zamarin
commit: ef5011fea6ec01009dcf6d44d862f04f164b79f4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  7 18:19:16 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  7 18:19:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef5011fe

net-fs/nfs-utils: Stabilize 2.6.1 hppa, #843164

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
index c18b94215944..835e6f06997e 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2022-05-07 Thread Arthur Zamarin
commit: e9299cc43c04c904996fb114a143e5c8412be041
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  7 18:19:19 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  7 18:19:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9299cc4

net-fs/nfs-utils: Stabilize 2.6.1 ppc, #843164

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
index 835e6f06997e..907d935c3310 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2022-05-07 Thread Arthur Zamarin
commit: 30767dccfe2f8496f5896ebd05fbc62edc1f33fb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  7 18:08:28 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  7 18:08:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30767dcc

net-fs/nfs-utils: Stabilize 2.6.1 ppc64, #843164

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
index c440a2a6409d..e62f0be35d31 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2022-05-07 Thread Arthur Zamarin
commit: 5018dc8e62ecbd1a477e229236a1c3ab0c4974b1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  7 18:05:11 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  7 18:05:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5018dc8e

net-fs/nfs-utils: Stabilize 2.6.1 sparc, #843164

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
index f000a1d90ecd..c440a2a6409d 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2022-05-07 Thread Jakov Smolić
commit: 0d3de9d8ad310f5f5da003b28affcdf9d8ddaffd
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat May  7 17:45:11 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat May  7 17:45:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d3de9d8

net-fs/nfs-utils: Stabilize 2.6.1 x86, #843164

Signed-off-by: Jakov Smolić  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
index 81b851cfc29f..6b2eaf96411d 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2022-05-07 Thread Jakov Smolić
commit: 89fc8b668412e3d20fba36fef955e756c0d6b76a
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat May  7 17:45:18 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat May  7 17:45:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89fc8b66

net-fs/nfs-utils: Stabilize 2.6.1 amd64, #843164

Signed-off-by: Jakov Smolić  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
index 6b2eaf96411d..f000a1d90ecd 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2022-03-26 Thread Matt Turner
commit: d6f170258338ef5ba1b3959e4b6450782c529b7b
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 27 06:00:03 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 27 06:00:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f17025

net-fs/nfs-utils: Remove IUSE=ipv6

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

 net-fs/nfs-utils/nfs-utils-2.6.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
index 74a400f07f63..81b851cfc29f 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 
nfsv41 sasl selinux tcpd +uuid"
+IUSE="caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 
sasl selinux tcpd +uuid"
 REQUIRED_USE="kerberos? ( nfsv4 )"
 RESTRICT="test" #315573
 
@@ -112,7 +112,7 @@ src_configure() {
--with-systemd="$(systemd_get_systemunitdir)"
--without-gssglue
$(use_enable caps)
-   $(use_enable ipv6)
+   --enable-ipv6
$(use_enable junction)
$(use_enable kerberos gss)
$(use_enable kerberos svcgss)



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

2022-03-26 Thread Matt Turner
commit: cae2522da2c82b52c952519dc9886ea59b63827f
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 27 03:13:18 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 27 03:26:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae2522d

net-fs/nfs-utils: Version bump to 2.6.1

Closes: https://bugs.gentoo.org/764257
Signed-off-by: Matt Turner  gentoo.org>

 net-fs/nfs-utils/Manifest   |   1 +
 net-fs/nfs-utils/nfs-utils-2.6.1.ebuild | 218 
 2 files changed, 219 insertions(+)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index c36c94e4db67..d53d9c7a52c3 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1 +1,2 @@
 DIST nfs-utils-2.5.4.tar.bz2 943373 BLAKE2B 
72ed871613701f5b035941a7aed957771fe3b6a19fefee203130442c292bbbefde35721f2287fef19046d2d837faeda43b06a93a5acdb8ac6240eef90e6dd12c
 SHA512 
b1395c5b06a0624c48174594b1e08b71cf40b8f94b533497bd92625401a669e2c40e48dbd665891ad2247bc94d7d604d0c5d0f0b66bfe957b03d42e5d305
+DIST nfs-utils-2.6.1.tar.bz2 946432 BLAKE2B 
fe6ec58b4c0def75a43f40a581a9d67d25ee2e6979f41da87453661b33460b99744e1799d6b1a3ef026027cafb1aae8a954cc6449d3eb77eee494fe72804751d
 SHA512 
5b8949b3d30ccd33c9bc68875ba0993a22e490234d5eeebc189b3da2b1df0c290cd27d58226ffa5f4fe8b9548234fadb1c432b9c7d9b297c10a39fd2887d2f7f

diff --git a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
new file mode 100644
index ..74a400f07f63
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info 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 +libmount nfsdcld +nfsidmap +nfsv4 
nfsv41 sasl 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)
+COMMON_DEPEND="
+   dev-libs/libxml2
+   net-libs/libtirpc:=
+   >=net-nds/rpcbind-0.2.4
+   sys-fs/e2fsprogs
+   caps? ( sys-libs/libcap )
+   ldap? (
+   net-nds/openldap:=
+   sasl? (
+   app-crypt/mit-krb5
+   dev-libs/cyrus-sasl:2
+   )
+   )
+   libmount? ( sys-apps/util-linux )
+   nfsv4? (
+   dev-db/sqlite:3
+   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 )"
+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
+)
+
+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"
+   ewarn "support the legacy, in-kernel client tracker."
+   fi
+}
+
+src_prepare() {
+   default
+
+   sed \
+   -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+   -i utils/*/Makefile.am || die
+
+   eautoreconf
+}
+
+src_configure() {
+   export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
+   export ac_cv_header_keyutils_h=$(usex nfsidmap)
+
+   # SASL is consumed in a purely automagic way
+   export ac_cv_header_sasl_h=no
+   export ac_cv_header_sasl_sasl_h=$(usex sasl)
+
+   local myeconfargs=(
+   --disable-static
+   --with-statedir="${EPREFIX}"/var/lib/nfs
+ 

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

2022-03-08 Thread David Seifert
commit: 851a62279314a623965c342528c8620acbda2a33
Author: Mathieu Tortuyaux  microsoft  com>
AuthorDate: Tue Mar  8 09:43:11 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Mar  8 09:43:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=851a6227

net-fs/nfs-utils: pull sqlite if nfsv4

from `./configure.ac`, it seems that this dependency is only required if
`nfsv4` compilation option is enabled.

Closes: https://github.com/gentoo/gentoo/pull/24235
Bug: https://bugs.gentoo.org/696250
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mathieu Tortuyaux  microsoft.com>
Signed-off-by: David Seifert  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild
index 0f2697c12830..a9c4be2fff7d 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,6 @@ RESTRICT="test" #315573
 # so don't depend on virtual/krb.
 # (04 Feb 2005 agriffis)
 COMMON_DEPEND="
-   dev-db/sqlite:3
dev-libs/libxml2
net-libs/libtirpc:=
>=net-nds/rpcbind-0.2.4
@@ -43,6 +42,7 @@ COMMON_DEPEND="
)
libmount? ( sys-apps/util-linux )
nfsv4? (
+   dev-db/sqlite:3
dev-libs/libevent:=
>=sys-apps/keyutils-1.5.9:=
kerberos? (



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

2021-11-30 Thread David Seifert
commit: 179a10b91dfe454225aee6e62bb9a496d32a880e
Author: David Seifert  gentoo  org>
AuthorDate: Tue Nov 30 10:45:10 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Nov 30 10:45:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=179a10b9

net-fs/nfs-utils: drop 2.5.3-r2

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

 net-fs/nfs-utils/Manifest  |   1 -
 net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild | 207 -
 2 files changed, 208 deletions(-)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 51da327ce843..c36c94e4db67 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,2 +1 @@
-DIST nfs-utils-2.5.3.tar.bz2 937544 BLAKE2B 
817af2c302cf110519e64353a507645137ffd3b93b46eb94e71d45a1869c9e831e344f0baa33b1b39514962798cca542cf56a2830520c67e96e78995f2bf901f
 SHA512 
3be82f42c5da2bbbca4429459c858c58ae7333725749213c824d0c01b78f0beb7384455f314fc1cc1799968f9f40fd616297c7baf3514ca0e31d4686e9d6e732
 DIST nfs-utils-2.5.4.tar.bz2 943373 BLAKE2B 
72ed871613701f5b035941a7aed957771fe3b6a19fefee203130442c292bbbefde35721f2287fef19046d2d837faeda43b06a93a5acdb8ac6240eef90e6dd12c
 SHA512 
b1395c5b06a0624c48174594b1e08b71cf40b8f94b533497bd92625401a669e2c40e48dbd665891ad2247bc94d7d604d0c5d0f0b66bfe957b03d42e5d305

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
deleted file mode 100644
index 08059cd37886..
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info 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 +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)
-COMMON_DEPEND="
-   >=dev-db/sqlite-3.3
-   dev-libs/libxml2
-   net-libs/libtirpc:=
-   >=net-nds/rpcbind-0.2.4
-   sys-fs/e2fsprogs
-   caps? ( sys-libs/libcap )
-   ldap? ( net-nds/openldap )
-   libmount? ( sys-apps/util-linux )
-   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 )"
-DEPEND="${COMMON_DEPEND}
-   elibc_musl? ( sys-libs/queue-standalone )
-"
-RDEPEND="${COMMON_DEPEND}
-   !net-libs/libnfsidmap
-   !net-nds/portmap
-   ! 
id_resolver.conf
-   doins id_resolver.conf
-   fi
-
-   insinto /etc
-   doins "${FILESDIR}"/exports
-   keepdir /etc/exports.d
-
-   local f list=() opt_need=""
-   if use nfsv4 ; then
-   opt_need="rpc.idmapd"
-   list+=( rpc.idmapd rpc.pipefs )
-   use kerberos && list+=( rpc.gssd rpc.svcgssd )
-   fi
-   for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-   newinitd "${FILESDIR}"/${f}.initd ${f}
-   done
-   newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 
2015/08/01
-   for f in nfs nfsclient ; do
-   newconfd "${FILESDIR}"/${f}.confd ${f}
-   done
-   sed -i \
-   -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-   "${ED}"/etc/conf.d/nfs || die #234132
-
-   local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-   sed -i \
-   -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-   "${ED}${systemd_systemunitdir}"/* || die
-
-   keepdir /var/lib/nfs #368505
-   keepdir /var/lib/nfs/v4recovery #603628
-
-   # no static archives
-   find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-   # Install default xtab and friends if there's none existing.  In
-   # src_install we put them in /usr/lib/nfs for safe-keeping, but
-   # the daemons actually use the files in /var/lib/nfs.  #30486
-   local f
-   for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
-   [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]

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

2021-11-30 Thread David Seifert
commit: ee9f408582a8f94577446f39b1ae3f8c85dd621b
Author: Stijn Tintel  linux-ipv6  be>
AuthorDate: Tue Nov 30 10:45:12 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Nov 30 10:45:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee9f4085

net-fs/nfs-utils: fix killall usage in init script

* Bug 664066 has surfaced again. Fix it properly by calling killall with
  `--signal=HUP` rather than the short form that keeps being broken.

Closes: https://github.com/gentoo/gentoo/pull/23121
Closes: https://bugs.gentoo.org/664066
Signed-off-by: Stijn Tintel  linux-ipv6.be>
Signed-off-by: David Seifert  gentoo.org>

 net-fs/nfs-utils/files/nfs.initd| 2 +-
 .../nfs-utils/{nfs-utils-2.5.4-r2.ebuild => nfs-utils-2.5.4-r3.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index da81e6d6684a..6540c9f92075 100644
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -51,7 +51,7 @@ mount_nfsd() {
fi
# Restart idmapd if needed #220747
if grep -qs nfsd /proc/modules ; then
-   killall -q -HUP rpc.idmapd
+   killall -q --signal=HUP rpc.idmapd
fi
fi
 

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild
similarity index 100%
rename from net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild
rename to net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild



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

2021-11-27 Thread Mike Gilbert
commit: aabfcc2020b0c52c53418bdc6667603f0bfbd6da
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Nov 28 01:31:51 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 28 01:31:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabfcc20

net-fs/nfs-utils: depend on sys-libs/queue-standalone for musl

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

 net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild | 7 +--
 net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
index 75b24ff6761b..08059cd37886 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
@@ -27,7 +27,7 @@ RESTRICT="test" #315573
 # files, and nfs-utils doesn't build against heimdal either,
 # so don't depend on virtual/krb.
 # (04 Feb 2005 agriffis)
-DEPEND="
+COMMON_DEPEND="
>=dev-db/sqlite-3.3
dev-libs/libxml2
net-libs/libtirpc:=
@@ -49,7 +49,10 @@ DEPEND="
)
tcpd? ( sys-apps/tcp-wrappers )
uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+   elibc_musl? ( sys-libs/queue-standalone )
+"
+RDEPEND="${COMMON_DEPEND}
!net-libs/libnfsidmap
!net-nds/portmap
!

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

2021-10-14 Thread Sam James
commit: ea711a21e4794706f13429193a3ea14c5c8d6745
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 14 07:03:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 14 07:03:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea711a21

net-fs/nfs-utils: drop 2.5.4-r1

Bug: https://bugs.gentoo.org/808183
Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild | 215 -
 1 file changed, 215 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
deleted file mode 100644
index 1001f592272..000
--- a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info 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 +libmount nfsdcld +nfsidmap +nfsv4 
nfsv41 sasl 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
-   dev-libs/libxml2
-   net-libs/libtirpc:=
-   >=net-nds/rpcbind-0.2.4
-   sys-fs/e2fsprogs
-   caps? ( sys-libs/libcap )
-   ldap? (
-   net-nds/openldap
-   sasl? (
-   app-crypt/mit-krb5
-   dev-libs/cyrus-sasl:2
-   )
-   )
-   libmount? ( sys-apps/util-linux )
-   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}
-   !net-libs/libnfsidmap
-   !net-nds/portmap
-   ! 
id_resolver.conf
-   doins id_resolver.conf
-   fi
-
-   insinto /etc
-   doins "${FILESDIR}"/exports
-   keepdir /etc/exports.d
-
-   local f list=() opt_need=""
-   if use nfsv4 ; then
-   opt_need="rpc.idmapd"
-   list+=( rpc.idmapd rpc.pipefs )
-   use kerberos && list+=( rpc.gssd rpc.svcgssd )
-   fi
-   for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-   newinitd "${FILESDIR}"/${f}.initd ${f}
-   done
-   newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 
2015/08/01
-   for f in nfs nfsclient ; do
-   newconfd "${FILESDIR}"/${f}.confd ${f}
-   done
-   sed -i \
-   -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-   "${ED}"/etc/conf.d/nfs || die #234132
-
-   local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-   sed -i \
-   -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-   "${ED}${systemd_systemunitdir}"/* || die
-
-   keepdir /var/lib/nfs #368505
-   keepdir /var/lib/nfs/v4recovery #603628
-
-   # no static archives
-   find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-   # Install default xtab and friends if there's none existing.  In
-   # src_install we put them in /usr/lib/nfs for safe-keeping, but
-   # the daemons actually use the files in /var/lib/nfs.  #30486
-   local f
-   for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
-   [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
-   einfo "Copying default ${f##*/} from 
${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
-   cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
-   done
-
-   if systemd_is_booted; then
-   for v in ${REPLACING_VERSIONS}; do
-   if ver_test "${v}" -lt 1.3.0; then
-   ewarn "We have switched to upstream systemd 
unit files. Since"
-   ewarn "they got renamed, you should probably 
enable the new ones."
-   ewarn "You can run 'equery files nfs-utils | 
grep systemd'"
-   ewarn "to know what services you need to enable 
now."
-   fi
-   done
-   else
-

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

2021-10-14 Thread Sam James
commit: 724b5c57cc69c4af6afbeb32fffc3a92f79b8c50
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 14 07:02:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 14 07:03:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724b5c57

net-fs/nfs-utils: stabilize 2.5.4-r2

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

 net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild
index 1b938e11441..704a37b9d64 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-10-08 Thread Sam James
commit: 212922697015df2aac781bfe7f34bad7603385a0
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  9 05:19:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  9 05:19:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21292269

net-fs/nfs-utils: add upstream patch for older kernels (<5.3)

Bug: https://bugs.gentoo.org/808183
Signed-off-by: Sam James  gentoo.org>

 .../files/nfs-utils-2.5.4-kernel-5.3-nfsv4.patch   |  32 +++
 net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild | 219 +
 2 files changed, 251 insertions(+)

diff --git a/net-fs/nfs-utils/files/nfs-utils-2.5.4-kernel-5.3-nfsv4.patch 
b/net-fs/nfs-utils/files/nfs-utils-2.5.4-kernel-5.3-nfsv4.patch
new file mode 100644
index 000..c9a543191b5
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.5.4-kernel-5.3-nfsv4.patch
@@ -0,0 +1,32 @@
+https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=feb3dfc7127cf1337530ccb06ed90e818b026a07#patch1
+https://bugzilla.redhat.com/show_bug.cgi?id=1979816
+https://bugs.gentoo.org/808183
+
+Slightly rebased by sam@ to account for version.h moving around.
+
+From feb3dfc7127cf1337530ccb06ed90e818b026a07 Mon Sep 17 00:00:00 2001
+From: Steve Dickson 
+Date: Wed, 22 Sep 2021 11:31:56 -0400
+Subject: [PATCH] mountd: only do NFSv4 logging on supported kernels.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1979816
+Signed-off-by: Steve Dickson 
+--- a/support/export/v4clients.c
 b/support/export/v4clients.c
+@@ -10,6 +10,7 @@
+ #include 
+ #include 
+ #include "export.h"
++#include "../../utils/mount/version.h"
+ 
+ /* search.h declares 'struct entry' and nfs_prot.h
+  * does too.  Easiest fix is to trick search.h into
+@@ -23,6 +24,8 @@ static int clients_fd = -1;
+ 
+ void v4clients_init(void)
+ {
++  if (linux_version_code() < MAKE_VERSION(5, 3, 0))
++  return;
+   if (clients_fd >= 0)
+   return;
+   clients_fd = inotify_init1(IN_NONBLOCK);

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild
new file mode 100644
index 000..1b938e11441
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info 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 +libmount nfsdcld +nfsidmap +nfsv4 
nfsv41 sasl 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
+   dev-libs/libxml2
+   net-libs/libtirpc:=
+   >=net-nds/rpcbind-0.2.4
+   sys-fs/e2fsprogs
+   caps? ( sys-libs/libcap )
+   ldap? (
+   net-nds/openldap
+   sasl? (
+   app-crypt/mit-krb5
+   dev-libs/cyrus-sasl:2
+   )
+   )
+   libmount? ( sys-apps/util-linux )
+   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}
+   !net-libs/libnfsidmap
+   !net-nds/portmap
+   ! 
id_resolver.conf
+   doins id_resolver.conf
+   fi
+
+   insinto /etc
+   doins "${FILESDIR}"/exports
+   keepdir /etc/exports.d
+
+   local f list=() opt_need=""
+   if use nfsv4 ; then
+   opt_need="rpc.idmapd"
+   list+=( rpc.idmapd rpc.pipefs )
+   use kerberos && list+=( rpc.gssd rpc.svcgssd )
+   fi
+   for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+   newinitd "${FILESDIR}"/${f}.initd ${f}
+   done
+   newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 
2015/08/01
+   for f in nfs nfsclient ; do
+   newconfd "${FILESDIR}"/${f}.confd ${f}
+   done
+   sed -i \
+   -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+   "${ED}"/etc/conf.d/nfs || die #234132
+
+   l

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

2021-10-03 Thread David Seifert
commit: d1518f51e6e05a1be2d918a8fdc19699d086fc75
Author: David Seifert  gentoo  org>
AuthorDate: Sun Oct  3 21:57:26 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Oct  3 21:57:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1518f51

net-fs/nfs-utils: add :3 to sqlite

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

 net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
index 414117f1f15..1001f592272 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
@@ -28,7 +28,7 @@ RESTRICT="test" #315573
 # so don't depend on virtual/krb.
 # (04 Feb 2005 agriffis)
 DEPEND="
-   >=dev-db/sqlite-3.3
+   dev-db/sqlite:3
dev-libs/libxml2
net-libs/libtirpc:=
>=net-nds/rpcbind-0.2.4



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

2021-10-03 Thread David Seifert
commit: 43058137249b79b215d14190f62a5d66f14de21f
Author: David Seifert  gentoo  org>
AuthorDate: Sun Oct  3 21:57:25 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Oct  3 21:57:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43058137

net-fs/nfs-utils: Fix sasl/mit-krb5 automagic

Closes: https://bugs.gentoo.org/810592
Signed-off-by: David Seifert  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
index 09b5abbe4c3..414117f1f15 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 
nfsv41 selinux tcpd +uuid"
+IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 
nfsv41 sasl selinux tcpd +uuid"
 REQUIRED_USE="kerberos? ( nfsv4 )"
 RESTRICT="test" #315573
 
@@ -34,7 +34,13 @@ DEPEND="
>=net-nds/rpcbind-0.2.4
sys-fs/e2fsprogs
caps? ( sys-libs/libcap )
-   ldap? ( net-nds/openldap )
+   ldap? (
+   net-nds/openldap
+   sasl? (
+   app-crypt/mit-krb5
+   dev-libs/cyrus-sasl:2
+   )
+   )
libmount? ( sys-apps/util-linux )
nfsv4? (
dev-libs/libevent:=
@@ -88,6 +94,11 @@ src_prepare() {
 src_configure() {
export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
export ac_cv_header_keyutils_h=$(usex nfsidmap)
+
+   # SASL is consumed in a purely automagic way
+   export ac_cv_header_sasl_h=no
+   export ac_cv_header_sasl_sasl_h=$(usex sasl)
+
local myeconfargs=(
--disable-static
--with-statedir="${EPREFIX}"/var/lib/nfs



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

2021-09-22 Thread Matt Turner
commit: a07d911c5890d75587df423ba3d8b02ebe956833
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Sep 23 00:13:08 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Sep 23 01:07:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a07d911c

net-fs/nfs-utils: Stabilize 2.5.4-r1 hppa

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

 net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
index 75b24ff6761..09b5abbe4c3 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-09-13 Thread David Seifert
commit: 198a2bcf19ea4c57dcedd6c697d2b9c80edd1e1f
Author: David Seifert  gentoo  org>
AuthorDate: Mon Sep 13 20:30:16 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Sep 13 20:30:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=198a2bcf

net-fs/nfs-utils: e2fsprogs-libs → e2fsprogs

Bug: https://bugs.gentoo.org/806875
Signed-off-by: David Seifert  gentoo.org>

 .../nfs-utils/{nfs-utils-2.5.3-r1.ebuild => nfs-utils-2.5.3-r2.ebuild}  | 2 +-
 net-fs/nfs-utils/{nfs-utils-2.5.4.ebuild => nfs-utils-2.5.4-r1.ebuild}  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
similarity index 99%
rename from net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
rename to net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
index 9d0e1b2310b..75b24ff6761 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
@@ -32,7 +32,7 @@ DEPEND="
dev-libs/libxml2
net-libs/libtirpc:=
>=net-nds/rpcbind-0.2.4
-   sys-libs/e2fsprogs-libs
+   sys-fs/e2fsprogs
caps? ( sys-libs/libcap )
ldap? ( net-nds/openldap )
libmount? ( sys-apps/util-linux )

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
similarity index 99%
rename from net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
rename to net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
index 9d0e1b2310b..75b24ff6761 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="
dev-libs/libxml2
net-libs/libtirpc:=
>=net-nds/rpcbind-0.2.4
-   sys-libs/e2fsprogs-libs
+   sys-fs/e2fsprogs
caps? ( sys-libs/libcap )
ldap? ( net-nds/openldap )
libmount? ( sys-apps/util-linux )



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

2021-08-19 Thread David Seifert
commit: 15e52a540301f86835a5d174d1ef453ba94ae4b8
Author: David Seifert  gentoo  org>
AuthorDate: Thu Aug 19 18:37:02 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Aug 19 18:37:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e52a54

net-fs/nfs-utils: remove dead patch

* The patch was being double applied, because the
  original commit is already part of all releases.

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

 ...utils-2.4.2-Ensure-consistent-struct-stat.patch | 115 -
 net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild |   5 +-
 net-fs/nfs-utils/nfs-utils-2.5.4.ebuild|   5 +-
 3 files changed, 2 insertions(+), 123 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
deleted file mode 100644
index 8541a985ffa..000
--- a/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-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
-@@ -27,6 +27,10 @@
- #include 
- #endif
- 
-+#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
-@@ -22,6 +22,10 @@
- #include 
- #endif
- 
-+#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
-@@ -7,6 +7,10 @@
- #include 
- #endif
- 
-+#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
-@@ -19,6 +19,10 @@
- #include 
- #endif
- 
-+#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
-@@ -11,6 +11,10 @@
- #include 
- #endif
- 
-+#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
-@@ -19,6 +19,10 @@
- #include 
- #endif
- 
-+#ifdef HAVE_CONFIG_H
-+#include 
-+#endif
-+
- #include 
- #include 
- #include 
--- 
-1.8.3.1
-

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
index f23ef6c8d92..9d0e1b2310b 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
@@ -63,10 +63,7 @@ BDEPEND="
virtual/pkgconfig
 "
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.5.2-no-werror.patch
-   "${FILESDIR}"/${PN}-2.4.2-Ensure-consistent-struct-stat.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-2.5.2-no-werror.patch )
 
 pkg_setup() {
linux-info_pkg_setup

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
index f23ef6c8d92..9d0e1b2310b 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
@@ -63,10 +63,7 @@ BDEPEND="
virtual/pkgconfig
 "
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.5.2-no-werror.patch
-   "${FILESDIR}"/${PN}-2.4.2-Ensure-consistent-struct-stat.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-2.5.2-no-werror.patch )
 
 pkg_setup() {
linux-info_pkg_setup



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

2021-08-15 Thread Sam James
commit: c6b149cdd84efc47f1c5728d830d7771fe223012
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 15 19:45:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 15 19:45:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6b149cd

net-fs/nfs-utils: Stabilize 2.5.4 arm, #807469

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
index 16437319244..f23ef6c8d92 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-08-11 Thread Sam James
commit: 406fc11c58375e80a92195b0ccd32ff458449844
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 11 23:08:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 11 23:08:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406fc11c

net-fs/nfs-utils: Stabilize 2.5.4 arm64, #807469

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
index 49957a786d7..16437319244 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-08-10 Thread Sam James
commit: 323dfddfa28164516a0a5c1b34f9f9b9274883f6
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 11 00:22:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 11 00:22:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=323dfddf

net-fs/nfs-utils: Stabilize 2.5.4 sparc, #807469

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
index 9ea50c15921..49957a786d7 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-08-10 Thread Sam James
commit: 48be6ffd504f146c0e9da63d655f0d72dfcf3ee5
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 11 00:09:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 11 00:09:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48be6ffd

net-fs/nfs-utils: Stabilize 2.5.4 ppc64, #807469

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
index 369c6e58819..9ea50c15921 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-08-10 Thread Sam James
commit: 664b60f6909b1bf311a882953dfbafd2d164f615
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 10 23:59:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 11 00:02:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664b60f6

net-fs/nfs-utils: Stabilize 2.5.4 x86, #807469

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
index 77753848ee6..c320991d022 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-08-10 Thread Agostino Sarubbo
commit: dc08df0643c6cf536be4838ea4d29b9f106b11ff
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 10 15:33:25 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 10 15:33:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc08df06

net-fs/nfs-utils: amd64 stable wrt bug #807469

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
index fdf45eb3b1d..77753848ee6 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"



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

2021-06-17 Thread Thomas Deutschmann
commit: e3b2ca4669933f12beccf49eb4cef10abc7e6024
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jun 17 23:01:38 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jun 17 23:20:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b2ca46

net-fs/nfs-utils: bump to v2.5.4

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

 net-fs/nfs-utils/Manifest   |   1 +
 net-fs/nfs-utils/nfs-utils-2.5.4.ebuild | 207 
 2 files changed, 208 insertions(+)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 0ae2ec8eded..51da327ce84 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1 +1,2 @@
 DIST nfs-utils-2.5.3.tar.bz2 937544 BLAKE2B 
817af2c302cf110519e64353a507645137ffd3b93b46eb94e71d45a1869c9e831e344f0baa33b1b39514962798cca542cf56a2830520c67e96e78995f2bf901f
 SHA512 
3be82f42c5da2bbbca4429459c858c58ae7333725749213c824d0c01b78f0beb7384455f314fc1cc1799968f9f40fd616297c7baf3514ca0e31d4686e9d6e732
+DIST nfs-utils-2.5.4.tar.bz2 943373 BLAKE2B 
72ed871613701f5b035941a7aed957771fe3b6a19fefee203130442c292bbbefde35721f2287fef19046d2d837faeda43b06a93a5acdb8ac6240eef90e6dd12c
 SHA512 
b1395c5b06a0624c48174594b1e08b71cf40b8f94b533497bd92625401a669e2c40e48dbd665891ad2247bc94d7d604d0c5d0f0b66bfe957b03d42e5d305

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
new file mode 100644
index 000..fdf45eb3b1d
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info 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 +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:=
+   >=net-nds/rpcbind-0.2.4
+   sys-libs/e2fsprogs-libs
+   caps? ( sys-libs/libcap )
+   ldap? ( net-nds/openldap )
+   libmount? ( sys-apps/util-linux )
+   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}
+   !net-libs/libnfsidmap
+   !net-nds/portmap
+   ! 
id_resolver.conf
+   doins id_resolver.conf
+   fi
+
+   insinto /etc
+   doins "${FILESDIR}"/exports
+   keepdir /etc/exports.d
+
+   local f list=() opt_need=""
+   if use nfsv4 ; then
+   opt_need="rpc.idmapd"
+   list+=( rpc.idmapd rpc.pipefs )
+   use kerberos && list+=( rpc.gssd rpc.svcgssd )
+   fi
+   for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+   newinitd "${FILESDIR}"/${f}.initd ${f}
+   done
+   newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 
2015/08/01
+   for f in nfs nfsclient ; do
+   newconfd "${FILESDIR}"/${f}.confd ${f}
+   done
+   sed -i \
+   -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+   "${ED}"/etc/conf.d/nfs || die #234132
+
+   local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+   sed -i \
+   -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+   "${ED}${systemd_systemunitdir}"/* || die
+
+   keepdir /var/lib/nfs #368505
+   keepdir /var/lib/nfs/v4recovery #603628
+
+   # no static archives
+   find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+   # Install default xtab and friends if there's none existing.  In
+   # src_install we put them in /usr/lib/nfs for safe-keeping, but
+   # the daemons actually use the files in /var/lib/nfs.  #30486
+   local f
+   for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+   [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+   einfo

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

2021-05-13 Thread David Seifert
commit: 5e5470d62fe02d2dfa12012e59335ae45957c8e7
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 13:53:58 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu May 13 13:53:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e5470d6

net-fs/nfs-utils: drop unused flag-o-matic, multilib inherits

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

 net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
index ab305a2fdf3..f23ef6c8d92 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic linux-info multilib systemd
+inherit autotools linux-info systemd
 
 DESCRIPTION="NFS client and server daemons"
 HOMEPAGE="http://linux-nfs.org/";



[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 +lib

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

2021-04-11 Thread David Seifert
commit: 000db63dd35281b4ed072915ba4528677b9dea39
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 11 15:49:13 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 11 15:49:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=000db63d

net-fs/nfs-utils: Rebase patches

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

 ...utils-2.4.2-Ensure-consistent-struct-stat.patch | 38 +++---
 .../files/nfs-utils-2.5.2-no-werror.patch  |  2 +-
 2 files changed, 20 insertions(+), 20 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 e64e2c6da38..8541a985ffa 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 
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include 
@@ -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 .
-  */
+@@ -22,6 +22,10 @@
+ #include 
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include 
@@ -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 
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include 
@@ -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 
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include 
 +#endif
 +
  #include 
+ #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.
-  */
+@@ -11,6 +11,10 @@
+ #include 
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include 
@@ -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 
+ #endif
  
 +#ifdef HAVE_CONFIG_H
 +#include 

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 396532a919a..a7226db2492 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="\



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

2021-04-09 Thread Sam James
commit: 5812f7ad23551812cb4fa1a80464afecb05d31aa
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  9 22:18:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  9 22:19:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5812f7ad

net-fs/nfs-utils: Stabilize 2.5.3-r1 arm64, #780414

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
index 3de098b1fab..ab305a2fdf3 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-04-07 Thread Sam James
commit: e94bafdfa752a440b85d8662c5345890d2754278
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr  7 22:44:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  7 22:45:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e94bafdf

net-fs/nfs-utils: Stabilize 2.5.3-r1 amd64, #780414

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
index e2286412ad8..3de098b1fab 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-04-07 Thread Sam James
commit: 6e25b1f82e0990739c36fa0921fdef618144964e
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr  7 22:43:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  7 22:43:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e25b1f8

net-fs/nfs-utils: Stabilize 2.5.3-r1 arm, #780414

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
index 42ef2ee7f8b..e2286412ad8 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-04-06 Thread Sam James
commit: 4ca3313bf910362c5e1a291a69d2e32017d0a2dc
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr  6 19:53:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr  6 19:53:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca3313b

net-fs/nfs-utils: Stabilize 2.5.3-r1 ppc, #780414

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
index 000481ef5b4..42ef2ee7f8b 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-04-06 Thread Sam James
commit: a0ccba6c2f42b94705781e378f635ab21da9fcb2
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr  6 19:52:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr  6 19:52:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ccba6c

net-fs/nfs-utils: Stabilize 2.5.3-r1 ppc64, #780414

Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
index f91d2ce44dc..000481ef5b4 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-04-06 Thread Sergei Trofimovich
commit: 1292e13366e1b353a08139ebbadc6b8abbb10efe
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Apr  6 15:40:19 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Apr  6 15:42:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1292e133

net-fs/nfs-utils: stable 2.5.3-r1 for sparc, bug #780414

Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
index 81af3b846cb..f91d2ce44dc 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-04-05 Thread Thomas Deutschmann
commit: 864744a93e09528af59ad86396ca1d3cfb7a715d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Apr  5 19:00:00 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Apr  5 19:00:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=864744a9

net-fs/nfs-utils: x86 stable (bug #780414)

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

 net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
index f3b3676ca38..81af3b846cb 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"



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

2021-03-26 Thread David Seifert
commit: 6f7ac6d28b82e544dcd9407419dcde42693847c5
Author: David Seifert  gentoo  org>
AuthorDate: Fri Mar 26 22:34:43 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Mar 26 22:34:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f7ac6d2

net-fs/nfs-utils: Don't build static plugins

* Also clean out .la files

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

 .../nfs-utils/{nfs-utils-2.5.3.ebuild => nfs-utils-2.5.3-r1.ebuild}  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
similarity index 97%
rename from net-fs/nfs-utils/nfs-utils-2.5.3.ebuild
rename to net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
index f536708a51b..f3b3676ca38 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild
@@ -92,9 +92,10 @@ src_configure() {
export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
export ac_cv_header_keyutils_h=$(usex nfsidmap)
local myeconfargs=(
+   --disable-static
--with-statedir="${EPREFIX}"/var/lib/nfs
--enable-tirpc
-   --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
+   --with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/
--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
--with-rpcgen
--with-systemd="$(systemd_get_systemunitdir)"
@@ -174,6 +175,8 @@ src_install() {
keepdir /var/lib/nfs #368505
keepdir /var/lib/nfs/v4recovery #603628
 
+   # no static archives
+   find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {



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

2021-02-21 Thread Lars Wendler
commit: 9f4ede699771e1c2872491597e9c4a45fe2efeab
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Feb 21 17:42:27 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Feb 21 17:42:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4ede69

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

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

 net-fs/nfs-utils/Manifest   |   1 +
 net-fs/nfs-utils/nfs-utils-2.5.3.ebuild | 204 
 2 files changed, 205 insertions(+)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index be08e1850fa..6667dae56dd 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,2 +1,3 @@
 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/nfs-utils-2.5.3.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.3.ebuild
new file mode 100644
index 000..f536708a51b
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3.ebuild
@@ -0,0 +1,204 @@
+# 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 +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:=
+   >=net-nds/rpcbind-0.2.4
+   sys-libs/e2fsprogs-libs
+   caps? ( sys-libs/libcap )
+   ldap? ( net-nds/openldap )
+   libmount? ( sys-apps/util-linux )
+   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}
+   !net-libs/libnfsidmap
+   !net-nds/portmap
+   ! 
id_resolver.conf
+   doins id_resolver.conf
+   fi
+
+   insinto /etc
+   doins "${FILESDIR}"/exports
+   keepdir /etc/exports.d
+
+   local f list=() opt_need=""
+   if use nfsv4 ; then
+   opt_need="rpc.idmapd"
+   list+=( rpc.idmapd rpc.pipefs )
+   use kerberos && list+=( rpc.gssd rpc.svcgssd )
+   fi
+   for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+   newinitd "${FILESDIR}"/${f}.initd ${f}
+   done
+   newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 
2015/08/01
+   for f in nfs nfsclient ; do
+   newconfd "${FILESDIR}"/${f}.confd ${f}
+   done
+   sed -i \
+   -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+   "${ED}"/etc/conf.d/nfs || die #234132
+
+   local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+   sed -i \
+   -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+   "${ED}${systemd_systemunitdir}"/* || die
+
+   keepdir /var/lib/nfs #368505
+   keepdir /var/lib/nfs/v4recovery #603628
+
+}
+
+pkg_postinst() {
+   # Install default xtab and friends if there's none existing.  In
+   # src_install we put them in /usr/lib/nfs for 

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

2021-01-05 Thread Andreas K. Hüttel
commit: 76c5151236ba705c74ea0747852d63fc21961400
Author: Andreas K. Huettel  gentoo  org>
AuthorDate: Tue Jan  5 19:45:31 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Tue Jan  5 20:06:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c51512

net-fs/nfs-utils: Remove old

Bug: https://bugs.gentoo.org/707624
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas K. Huettel  gentoo.org>

 net-fs/nfs-utils/Manifest  |   2 -
 .../nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch |  39 
 .../files/nfs-utils-1.2.8-cross-build.patch|  67 ---
 .../files/nfs-utils-2.3.4-no-werror.patch  |  67 ---
 ...include-order-between-config.h-and-stat.h.patch | 151 ---
 1-gssd-Look-in-lib32-for-gss-libs-aswell.patch |  39 
 net-fs/nfs-utils/files/nfs-utils-2.4.1-statx.patch |  31 ---
 ...2-mountd-Add-check-for-struct-file_handle.patch |  54 --
 ...-mountd-Fix-compilation-for--disable-uuid.patch |  35 
 net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild | 211 -
 net-fs/nfs-utils/nfs-utils-2.4.3.ebuild| 204 
 11 files changed, 900 deletions(-)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 3985e4172da..be08e1850fa 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,4 +1,2 @@
-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-1.1.4-mtab-sym.patch 
b/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch
deleted file mode 100644
index c9e60afc74d..000
--- a/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ripped from Debian
-
 nfs-utils-1.1.4/utils/mount/fstab.c
-+++ nfs-utils-1.1.4/utils/mount/fstab.c
-@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
-   return var_mtab_does_not_exist;
- }
- 
--static int
-+int
- mtab_is_a_symlink(void) {
- get_mtab_info();
- return var_mtab_is_a_symlink;
 nfs-utils-1.1.4/utils/mount/fstab.h
-+++ nfs-utils-1.1.4/utils/mount/fstab.h
-@@ -7,6 +7,7 @@
- #define _PATH_FSTAB "/etc/fstab"
- #endif
- 
-+int mtab_is_a_symlink(void);
- int mtab_is_writable(void);
- int mtab_does_not_exist(void);
- void reset_mtab_info(void);
 nfs-utils-1.1.4/utils/mount/mount.c
-+++ nfs-utils-1.1.4/utils/mount/mount.c
-@@ -230,6 +230,13 @@ create_mtab (void) {
-   int flags;
-   mntFILE *mfp;
- 
-+  /* Avoid writing if the mtab is a symlink to /proc/mounts, since
-+ that would create a file /proc/mounts in case the proc filesystem
-+ is not mounted, and the fchmod below would also fail. */
-+  if (mtab_is_a_symlink()) {
-+  return EX_SUCCESS;
-+  }
-+
-   lock_mtab();
- 
-   mfp = nfs_setmntent (MOUNTED, "a+");

diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch 
b/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch
deleted file mode 100644
index 366a85badfe..000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-this is kind of hacky, but automake doesn't make this easy
-for us atm, so hack away :(
-
-(recent autotools will always add $(CFLAGS)/etc... to the compile)
-
-posted upstream:
-https://marc.info/?l=linux-nfs&m=136416341629788&w=2
-Date: Sun, 24 Mar 2013 22:21:08 +
-Message-ID: 1364163668-15490-1-git-send-email-vap...@gentoo.org
-
-From 269ae1346d9ccc97304205066d20e7e7b638f30e Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Sun, 24 Mar 2013 18:14:48 -0400
-Subject: [PATCH nfs-utils] locktes/rpcgen: tweak how we override compiler 
settings
-
-Newer autotools will use both CFLAGS and _CFLAGS when compiling
-the .  Adding the bu

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

2020-12-13 Thread Sam James
commit: 2f9314d62c99d214fe53a4b69558e7e89cac75e0
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 13 23:22:57 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 13 23:22:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f9314d6

net-fs/nfs-utils: stable 2.5.1 for s390

stable wrt bug #738352

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="s390"
Signed-off-by: Sam James  gentoo.org>

 net-fs/nfs-utils/nfs-utils-2.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
index 259c7ff8cd4..0a86a696dec 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
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"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 
sparc x86"
 fi
 
 LICENSE="GPL-2"



  1   2   3   >