From ce973fb6d9d383d9a9a748129c881d14fc583613 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 15 Jul 2015 16:22:23 -0700 Subject: [PATCH 1/5] net-fs/nfs-utils: Import nfs-utils-1.3.2-r6.ebuild Signed-off-by: Geoff Levand --- .../coreos-overlay/net-fs/nfs-utils/Manifest | 1 + .../nfs-utils-1.3.2-background-statd.patch | 30 +++ .../nfs-utils/nfs-utils-1.3.2-r6.ebuild | 177 ++++++++++++++++++ 3 files changed, 208 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/Manifest b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/Manifest index 32e2b28796..1287f3ec44 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/Manifest @@ -1 +1,2 @@ DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e WHIRLPOOL 22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119 +DIST nfs-utils-1.3.2.tar.bz2 789540 SHA256 5b9c72eef260b86a84619771e11bb013b99431e6b7ff0bbdc03fee90dba591f7 SHA512 65633db58bbc5b6bff6acab412dc085affc61e0a6e0aef72d630e67d05a8d08012dced81178a4c7af65c967c25b48161f8d887d261fdf5ce505b719dbdab757c WHIRLPOOL eee615f032987aee71adf04a3ad5f5b8f79dc4487f1be1a7fb87c42918a12ef9397ba990b02d4adb02265706df9f1e3ef409c141491759c65b8037693b9b06c9 diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch new file mode 100644 index 0000000000..393f70b87a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch @@ -0,0 +1,30 @@ +From 17a3e5bffb7110d46de1bf42b64b90713ff5ea50 Mon Sep 17 00:00:00 2001 +From: Chris Mayo +Date: Sun, 1 Feb 2015 12:03:46 -0500 +Subject: [PATCH] statd: Fix test for foreground mode + +daemon_init parameter has the opposite sense +to code removed in commit 7addf9d + +Signed-off-by: Chris Mayo +Signed-off-by: Steve Dickson +--- + utils/statd/statd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/statd/statd.c b/utils/statd/statd.c +index 60ce6d1..2b7a167 100644 +--- a/utils/statd/statd.c ++++ b/utils/statd/statd.c +@@ -393,7 +393,7 @@ int main (int argc, char **argv) + simulator (--argc, ++argv); /* simulator() does exit() */ + #endif + +- daemon_init(!(run_mode & MODE_NODAEMON)); ++ daemon_init((run_mode & MODE_NODAEMON)); + + if (run_mode & MODE_LOG_STDERR) { + xlog_syslog(0); +-- +2.2.2 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild new file mode 100644 index 0000000000..51ada3a4f5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild,v 1.1 2015/02/05 04:32:41 williamh Exp $ + +EAPI="5" + +inherit eutils flag-o-matic multilib autotools systemd + +DESCRIPTION="NFS client and server daemons" +HOMEPAGE="http://linux-nfs.org/" +SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" +REQUIRED_USE="kerberos? ( nfsv4 )" +RESTRICT="test" #315573 + +# kth-krb doesn't provide the right include +# files, and nfs-utils doesn't build against heimdal either, +# so don't depend on virtual/krb. +# (04 Feb 2005 agriffis) +DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers ) + caps? ( sys-libs/libcap ) + sys-libs/e2fsprogs-libs + >=net-nds/rpcbind-0.2.0-r1 + net-libs/libtirpc + libmount? ( sys-apps/util-linux ) + nfsdcld? ( >=dev-db/sqlite-3.3 ) + nfsv4? ( + dev-libs/libevent + >=net-libs/libnfsidmap-0.21-r1 + kerberos? ( + >=net-libs/libtirpc-0.2.4-r1[kerberos] + app-crypt/mit-krb5 + ) + nfsidmap? ( + >=net-libs/libnfsidmap-0.24 + >=sys-apps/keyutils-1.5.9 + ) + ) + nfsv41? ( + sys-fs/lvm2 + ) + uuid? ( sys-apps/util-linux )" +RDEPEND="${DEPEND_COMMON} + !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 + + systemd_dounit systemd/*.{mount,service,target} + if ! use nfsv4 || ! use kerberos ; then + rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die + fi + if ! use nfsv41 ; then + rm "${D}$(systemd_get_unitdir)"/nfs-blkmap.* || die + fi + rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die + sed -i -r \ + -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \ + -e '/^(After|Wants)=nfs-config.service$/d' \ + -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ + "${D}$(systemd_get_unitdir)"/* || 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 + mkdir -p "${EROOT}"/var/lib/nfs #368505 + 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 + if [[ ${REPLACING_VERSIONS} < 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 + 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 +} From 393d00f7258ec97a5b07058325b6ecbd479fd6af Mon Sep 17 00:00:00 2001 From: mischief Date: Thu, 5 Mar 2015 15:38:55 -0800 Subject: [PATCH 2/5] net-fs/nfs-utils: remove unused .initd files --- .../net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild index 51ada3a4f5..001f49e953 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild @@ -118,16 +118,10 @@ src_install() { doins "${FILESDIR}"/exports keepdir /etc/exports.d - local f list=() opt_need="" + local f 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 From 234e935d2422b6498deefa3feee8845f79bc67da Mon Sep 17 00:00:00 2001 From: mischief Date: Thu, 5 Mar 2015 15:42:10 -0800 Subject: [PATCH 3/5] net-fs/nfs-utils: do not install exports file into /etc see coreos/bugs#147 --- .../coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild index 001f49e953..9d59fd058b 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild @@ -114,10 +114,6 @@ src_install() { doins id_resolver.conf fi - insinto /etc - doins "${FILESDIR}"/exports - keepdir /etc/exports.d - local f opt_need="" if use nfsv4 ; then opt_need="rpc.idmapd" From 4f03644090c357aa7abe6ecef7de8f205ae93674 Mon Sep 17 00:00:00 2001 From: mischief Date: Fri, 6 Mar 2015 09:56:30 -0800 Subject: [PATCH 4/5] net-fs/nfs-utils: get rid of exports, old service, and openrc condf.d files --- .../net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild index 9d59fd058b..a83a7a1368 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild @@ -114,17 +114,6 @@ src_install() { doins id_resolver.conf fi - local f opt_need="" - if use nfsv4 ; then - opt_need="rpc.idmapd" - fi - 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 - systemd_dounit systemd/*.{mount,service,target} if ! use nfsv4 || ! use kerberos ; then rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die From 0731748018180fa0a556d146928960f610460bf5 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 15 Jul 2015 17:11:47 -0700 Subject: [PATCH 5/5] net-fs/nfs-utils: Bump nfs-utils-1.3.2-r6 to nfs-utils-1.3.2-r7 Signed-off-by: Geoff Levand --- .../{nfs-utils-1.3.2-r6.ebuild => nfs-utils-1.3.2-r7.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/{nfs-utils-1.3.2-r6.ebuild => nfs-utils-1.3.2-r7.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r7.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r7.ebuild