From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- net-fs/nfs-utils/Manifest | 11 +- ...utils-2.4.2-Ensure-consistent-struct-stat.patch | 38 ++-- .../files/nfs-utils-2.4.2-no-werror.patch | 68 ------- .../files/nfs-utils-2.5.2-no-werror.patch | 2 +- net-fs/nfs-utils/nfs-utils-2.5.1.ebuild | 204 --------------------- net-fs/nfs-utils/nfs-utils-2.5.2.ebuild | 204 --------------------- net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild | 2 +- 7 files changed, 24 insertions(+), 505 deletions(-) delete mode 100644 net-fs/nfs-utils/files/nfs-utils-2.4.2-no-werror.patch delete mode 100644 net-fs/nfs-utils/nfs-utils-2.5.1.ebuild delete mode 100644 net-fs/nfs-utils/nfs-utils-2.5.2.ebuild (limited to 'net-fs/nfs-utils') diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 6dba653d9c4c..c71f909fc9bb 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -1,7 +1,6 @@ AUX exports 66 BLAKE2B 8ddc8e1b7888570cf7ce21ecebf0fb390ab394d25e60f1d914406396b23cb3cbf243a15a199f30608ac7e3c0abde73f48e0ccea605a3dadad654dfd8d6572dcd SHA512 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220 -AUX nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch 2808 BLAKE2B 921a0e8e16d0490fb2217d8d2014770a59ff737e989bcc1424a540358b6af5e954d5c8cdf7b6096f128fc86c96a909ee68878a89b803819f57c3b6908443b7e2 SHA512 9150b778701a47bb86a98b6c1b2251d60f135794a212a9b03cb3b0f7830cb62ee466cce5f85dbee008aa476eac71e54bb3b0fca677d9dd5a31b09256d4892f48 -AUX nfs-utils-2.4.2-no-werror.patch 1866 BLAKE2B 6307f2dad086ea39b851085479a3503fd205946ee27ea693af996b2ff5cbbd642822afa18eba6598267914e0667f80cc84df64ad69689e2706d1121abace2f68 SHA512 861956a04ef5bcac9d9eb18e93e5257b0c35598a527f5b20e305ce6993532bc905e66610300b6c098433a81ee3eb08312b307f5cd276c530dcb4071429c0ffcc -AUX nfs-utils-2.5.2-no-werror.patch 1907 BLAKE2B 4ef79e31a2c032b2c65cdb49670c828133f6b55b8d7cee5a43231e12060720e8a73b9947b58cb7f8416d4b487dbde77a4d0b2ad77a5ad6e28ba57350e95d7a33 SHA512 e32bdad5022e83900af32d4f4c263bacbd7049ba181464cdaf493600c470accf01765743ebe9a9586e80d2fe49ab6241becccd9cf50d939eb883ed78c86ac02e +AUX nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch 2681 BLAKE2B 146fde57e821c15671d226ba8d714a442e2ee740183fcf68cab56680b1131a435ee4ae08eca3a7a2e17e4c7267de6cd2273a7a771f04be5c47294c411686bde6 SHA512 77a11af3d6262d53034d6aac4bcb7c2c5c1d52bc23d1323e5fb844a247ae6b8ed58ffb0e6f76ce7b71692e2f89ae965893179a6b978a1081792b1ef2ef08ba36 +AUX nfs-utils-2.5.2-no-werror.patch 1907 BLAKE2B 8d9ac90d445dd029d8db80ff39559d3f4f25f7560c17ce72a62b489998e1d4d4875d574b27fe057388bcd7f0062703b812ce043b23dfe46fdabc9ba53591edcb SHA512 9cabbfa67d193c2c944c257089d67bc33230fb804d3a350ee2bcd5595594ff35ba6485c1ab240b956f5c08c40a41a0adc87c9ad9f967d2b7eb1d2dd51c9a6e9e AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535 AUX nfs.initd 4010 BLAKE2B 002a2df50cafec59caf05db520afc1432501b1fc86c51299f941417f3c9ea6af59849c3fa2656bd7b68cc6ffeb1b88e89fcd7bc38e8b76bb30e60f3fcd39be32 SHA512 14fa9ec9b58855539b0c4a8246041c1b607412a7e7030305bfa8315cd18ddcad6011ffea911e20db710f23d009b15183dc03bf1acc35a833bf114134ea998d0c AUX nfsclient.confd 592 BLAKE2B b661b726aa50f904752ec73a201a088f403a1e0f8d11181615e794da259a03b98131fff68e27645d4371564c796bb44915d6a13db9dc5a909294c4d1613c429d SHA512 f12e67728ac4e76357685e2fe38bd7f6fcd90064165758ffeca145e6962ac44d4ff9d8d57e18cc6925a6ada8e95ad8321e9fc355931a804dd455aae1e4850e92 @@ -12,10 +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.1.tar.bz2 931848 BLAKE2B 84c93ef5707bd97e9e1107dcca0530a3c137cb5ad04c7533bb8aee595a53fdc72359252d009fde95b9833a61f1695db1d6b1726081e5e8efd6c528e831f9834c SHA512 36c11668a9d2a382206db3d73a3d03000cdd2be9836fcbbbd327eb38515ac0b451520f6ffdc69bc05b2b81c60ecb88d50a20a50f123b8092a5b63e1c1054a2eb -DIST nfs-utils-2.5.2.tar.bz2 933724 BLAKE2B 691204739fa4348cea6234f1b87bd74872c94a0c175b09a08ebb4d5cefb0b04c1adfffadc82b7e9a4a45d5c86e7f2af62b275526d27482798d4c5dc296a5be09 SHA512 9e97cf5cd8be27d58e1dcd7fa563280ac8afa57d09387dddd2d6b03cbcd6dae4066ac29804b8b1624b61cb12f2aa016380c85b731113c9359a0e6887d2db0641 DIST nfs-utils-2.5.3.tar.bz2 937544 BLAKE2B 817af2c302cf110519e64353a507645137ffd3b93b46eb94e71d45a1869c9e831e344f0baa33b1b39514962798cca542cf56a2830520c67e96e78995f2bf901f SHA512 3be82f42c5da2bbbca4429459c858c58ae7333725749213c824d0c01b78f0beb7384455f314fc1cc1799968f9f40fd616297c7baf3514ca0e31d4686e9d6e732 -EBUILD nfs-utils-2.5.1.ebuild 5788 BLAKE2B 21d2f3f7d02ebd5219cb7f133f55141dfddc3e73973122e5d12d58bae188d6446ffe9c411f011d88aa073398e63360f8f2d60a98cad9d121247d4aaef163e07b SHA512 b681da7cc4f75375361cebfb34a1ead6334715ae637c6162a9085b64eb6f2c7027a5d8e0145fd422b50fb10ca69a233156fe6b7fb7b150edd18933b62ae6107b -EBUILD nfs-utils-2.5.2.ebuild 5796 BLAKE2B f0f86570e1c75607d76ad3716bb4c6e2fb13b8ab5e719571f7ea6703709ff1c1120b1d8078cfad98594f1cdb166f46e5faec8cccf973d46625c0d3cd8713091c SHA512 92ff15f9816b5f1526564148880f6627b700b1d6a253f263610b7c54ccbf741cd263499cb756c5f379d44ef393c5d304abfba8202470ae379d4a1af85d942a23 -EBUILD nfs-utils-2.5.3-r1.ebuild 5880 BLAKE2B a60f806d9dc3bfe902fc4c98111946440d55e270fe4e1c8f140187e40a9aae9c085003444a7fb0957f017710e9a676df8c7509f99db6ad3f2f837efdc385262e SHA512 7b547ca19e0851b9dadd1a9b7adfb33d77aef1f7eb4acbde054d4d67c0bd9517124be35b97de1cb62c13267c5991c94e10d65ebf4ea6e0752b5f83c4f6a1812b +EBUILD nfs-utils-2.5.3-r1.ebuild 5873 BLAKE2B c322d1d84b42ab6f2d500575aeb430d4b0edb14e05757f4976938a692a3dae9f3d701d4ee4bdc160d10a095d8b13d5cfd594bce7dc972947c07b636214b71de4 SHA512 f16075c9e215610adac5b2f5848a2172c7fb3a2c88f38a9bbc46725ce6dc933b33abfded2de24ea5fb184329ffaadd3387b7ab7e7e940792b34529ed762f839e MISC metadata.xml 865 BLAKE2B b0f6be692417a8af07b26e95555c5aba8416ed9d1afa59d15bf9df313b727db2a0331500dc93ae34ee9ed4c693c3505bad2dbc405facdbca5447cf37d92340fc SHA512 df1dd59066480b5e3eb8b46091d134ea1701600c20766b259d60c8a81786f4f06edbe7441a20bb62f10b53d6d8c5d76ae073f392254caa12d3dea3b09c172973 diff --git a/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch index e64e2c6da385..8541a985ffa5 100644 --- a/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch +++ b/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch @@ -24,9 +24,9 @@ diff --git a/support/junction/junction.c b/support/junction/junction.c index ab6caa6..41cce26 100644 --- a/support/junction/junction.c +++ b/support/junction/junction.c -@@ -23,6 +23,10 @@ - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt - */ +@@ -27,6 +27,10 @@ + #include + #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.4.2-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.2-no-werror.patch deleted file mode 100644 index 114942f09a4f..000000000000 --- a/net-fs/nfs-utils/files/nfs-utils-2.4.2-no-werror.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b7df6ae89846104b99f46336592b928a5421c3d8 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -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/files/nfs-utils-2.5.2-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch index 396532a919aa..a7226db24920 100644 --- a/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch +++ b/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch @@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac index 50847d8a..6bc18e93 100644 --- a/configure.ac +++ b/configure.ac -@@ -620,47 +620,15 @@ AC_SUBST(CPPFLAGS_FOR_BUILD) +@@ -631,47 +631,15 @@ AC_SUBST(CPPFLAGS_FOR_BUILD) AC_SUBST(LDFLAGS_FOR_BUILD) my_am_cflags="\ 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 31b5706372dd..000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic linux-info multilib systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/" - -if [[ "${PV}" = *_rc* ]] ; then - MY_PV="$(ver_rs 1- -)" - SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz" - 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 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.2.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.2.ebuild deleted file mode 100644 index e92cd918e894..000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.5.2.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic linux-info multilib systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/" - -if [[ "${PV}" = *_rc* ]] ; then - MY_PV="$(ver_rs 1- -)" - SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz" - 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 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.3-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild index f3b3676ca384..ab305a2fdf38 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" -- cgit v1.2.3