summaryrefslogtreecommitdiff
path: root/net-fs/nfs-utils
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-12-05 02:47:11 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-12-05 02:47:11 +0000
commit2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
treec8af0fd04194aed03cf067d44e53c7edd3e9ab84 /net-fs/nfs-utils
parente9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
gentoo resync : 05.12.2021
Diffstat (limited to 'net-fs/nfs-utils')
-rw-r--r--net-fs/nfs-utils/Manifest6
-rw-r--r--net-fs/nfs-utils/files/nfs.initd2
-rw-r--r--net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild204
-rw-r--r--net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild (renamed from net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild)7
4 files changed, 8 insertions, 211 deletions
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 771510c7c450..56059ec90be2 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -2,7 +2,7 @@ AUX exports 66 BLAKE2B 8ddc8e1b7888570cf7ce21ecebf0fb390ab394d25e60f1d914406396b
AUX nfs-utils-2.5.2-no-werror.patch 1907 BLAKE2B 8d9ac90d445dd029d8db80ff39559d3f4f25f7560c17ce72a62b489998e1d4d4875d574b27fe057388bcd7f0062703b812ce043b23dfe46fdabc9ba53591edcb SHA512 9cabbfa67d193c2c944c257089d67bc33230fb804d3a350ee2bcd5595594ff35ba6485c1ab240b956f5c08c40a41a0adc87c9ad9f967d2b7eb1d2dd51c9a6e9e
AUX nfs-utils-2.5.4-kernel-5.3-nfsv4.patch 1106 BLAKE2B 6b433e2e283f06947fd790153d5d1eeae4a4155f2af6a8ff14f25d60513a937393c15a2055b9e25147e57dfec1688bfb0a8cbb44e154390f3d74d32ff4428c26 SHA512 b144bf464c67fbbe63c00340d246db851d4ebed65caa9ada03f01134719fb106e0cd40fcd89e0bab71665e8a5e0a94c760daad74d32e5a873514884d62c17e9b
AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535
-AUX nfs.initd 4010 BLAKE2B 002a2df50cafec59caf05db520afc1432501b1fc86c51299f941417f3c9ea6af59849c3fa2656bd7b68cc6ffeb1b88e89fcd7bc38e8b76bb30e60f3fcd39be32 SHA512 14fa9ec9b58855539b0c4a8246041c1b607412a7e7030305bfa8315cd18ddcad6011ffea911e20db710f23d009b15183dc03bf1acc35a833bf114134ea998d0c
+AUX nfs.initd 4018 BLAKE2B 87d9111c7961db63e6a2eba1788f2bd7113e14e96a203f2f0e2a551f64dd1e19b8f4ed6a62658f48bf88007c3e115916a4d24f3cd1983df25cd09f0a21cacf79 SHA512 840f62a16b3d4cf651011f49b76033c01033b18336b2798705449ed7b15c4e6f545fb318674868d6a223781a2752bdcef4c9c3435eddf11fd0416f2037591608
AUX nfsclient.confd 592 BLAKE2B b661b726aa50f904752ec73a201a088f403a1e0f8d11181615e794da259a03b98131fff68e27645d4371564c796bb44915d6a13db9dc5a909294c4d1613c429d SHA512 f12e67728ac4e76357685e2fe38bd7f6fcd90064165758ffeca145e6962ac44d4ff9d8d57e18cc6925a6ada8e95ad8321e9fc355931a804dd455aae1e4850e92
AUX nfsclient.initd 752 BLAKE2B 8e3303be602ed97b9c6db0238b950039ec87830d733e7490f62657953e18d8050d5cd75e603d566b00db86ba910384d36e488d149112c86f1b9ed8e0901f5c16 SHA512 85078e2cd38b37a1e6fbaf0e40cf7690f403e71d9c8188d542d12fe56bfc02a49763c7bcc7742691754acc37928468c215db2795bebc29a5dfb052ba08f407bb
AUX nfsmount.initd-1.3.1 740 BLAKE2B 2668a3c485925f5b670efd11f357c5e0d616c1e1b62863c14b86e3201d5a5d61c1c4f4257b3b19ed8a8194879c67a9ddf996608073474e154f033be719b5ea54 SHA512 a540443a0259360f2476277bc020bb08eb095debe9c8e6a620dba5da1c7850f399673cc1ab505df65aea095a7e67954a9b5b8b26bbfd94e55d62348791af643d
@@ -11,8 +11,6 @@ AUX rpc.idmapd.initd 482 BLAKE2B db643d164787a730ed8f1da73cbc045237bb641fcdf2970
AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f12d87232deecba5d74181f1713e18ebb01f5da9c3833037ba47566414f0b415608ad13e3fa97c8f1e6 SHA512 3d3fa6e7ae01e27d27d88aba1e307c5293dd1cbc9d555737e03c4f1e17988518f4f1e7f7a38a7337f8e8961e8378cc4611769b04db7368460589a3b218ac6d6b
AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac
AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f
-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 b1395c5b06a06246666c48174594b1e08b71cf40b8f94b533497bd92625401a669e2c40e48dbd665891ad2247bc94d7d604d0c5d0f0b66bfe957b03d42e5d305
-EBUILD nfs-utils-2.5.3-r2.ebuild 5780 BLAKE2B 7465645f72e7882744a2336c0ca59e3a68efe334f9e81596c448abcc36adbc00448a6cf9e5d56ae4e06d36e14e6cd598e52a529619f37cbfd5d6b7c2f5c97fcf SHA512 7bce17cb7d41a5fa98f47cd8292ce90e82dd7e7a486d24da44a3c6d04363e895aca050cbe211e62792f4c2d810f95581d224bfae431eb59035c7b45b9c720bd4
-EBUILD nfs-utils-2.5.4-r2.ebuild 6042 BLAKE2B 74893698ecacfa6b979074bb79c9f1aca3524da426d4a4af01a8cbcd2b3e15264146458f71832050a87dbb8b23025149f781a2f29d07c66ee83a0fc2dcc2d7bb SHA512 22870d0838356ecb33c72596c0956f693f29d41e7d97b6f6430fbfeb5808a3421686279dbde7a08ac30a76f360c8dd94286b7851b64ecb57c571ca8b956e24c2
+EBUILD nfs-utils-2.5.4-r3.ebuild 6126 BLAKE2B 804fe2ad8dbf94b61b7a68be5fd6ecc944dafbe827060d5c1f638afd1c672545104c7f0f54976d307a0ed11e0d3694888a7097f0554ce33e3cac3ea633c3c515 SHA512 c0f58359945d722abad848eaef70c5770588e886b909f547b41563f051fdb7fdf8d8a79fe83a3f570ffe0e696c8978de37759f2110e6087425964dbf3a24ec5e
MISC metadata.xml 866 BLAKE2B 9bed3ad112962947235d7b03372ab0d0d8a35d57fee9500cc4cfe56dc4182634752878767a03760e06880862910b9c5e6abb91b174a624d1e72682bd6515abd3 SHA512 e7797d23c963836eb16bbea897c9ca761794308bb57e23dd10513e009a36d0ed6bf7e095975cf4f68c7f91ea5b6e9a89c1df1d301613383ef799c545e0c9ff3b
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.3-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
deleted file mode 100644
index 75b24ff6761b..000000000000
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r2.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 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-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 )"
-RDEPEND="${DEPEND}
- !net-libs/libnfsidmap
- !net-nds/portmap
- !<sys-apps/openrc-0.13.9
- 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)
- 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)
- $(use_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() {
- # remove compiled files bundled in the tarball
- emake clean
- default
-}
-
-src_install() {
- default
- rm linux-nfs/Makefile* || die
- dodoc -r linux-nfs README
-
- # Don't overwrite existing xtab/etab, install the original
- # versions somewhere safe... more info in pkg_postinst
- keepdir /var/lib/nfs/{,sm,sm.bak}
- mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
-
- # Install some client-side binaries in /sbin
- dodir /sbin
- mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
-
- if use nfsv4 && use nfsidmap ; then
- insinto /etc
- doins support/nfsidmap/idmapd.conf
-
- # Install a config file for idmappers in newer kernels. #415625
- insinto /etc/request-key.d
- echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > 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
- 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
-}
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
index 704a37b9d642..0f2697c12830 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4-r3.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
dev-libs/libxml2
net-libs/libtirpc:=
@@ -55,7 +55,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
!<sys-apps/openrc-0.13.9