From be55a228a30ffc46e3b7f3c6a0b3f15be0f9b2ce Mon Sep 17 00:00:00 2001
From: Nick Owens <mischief@coreos.com>
Date: Sat, 12 Sep 2015 13:02:05 -0700
Subject: [PATCH] net-fs/nfs-utils: move to 1.3.2

nfs-utils 1.2.9 is affected by undefined behavior that produces crashes
under our new gcc 4.9 compiler.
---
 .../coreos-overlay/net-fs/nfs-utils/Manifest  |   1 -
 .../net-fs/nfs-utils/files/nfsd.service       |  15 --
 .../net-fs/nfs-utils/files/proc-fs-nfsd.mount |   8 --
 .../net-fs/nfs-utils/files/rpc-gssd.service   |  12 --
 .../net-fs/nfs-utils/files/rpc-idmapd.service |  11 --
 .../net-fs/nfs-utils/files/rpc-mountd.service |  10 --
 .../net-fs/nfs-utils/files/rpc-statd.service  |  12 --
 .../nfs-utils/files/rpc-svcgssd.service       |  13 --
 .../files/var-lib-nfs-rpc_pipefs.mount        |   7 -
 .../nfs-utils/nfs-utils-1.2.9-r4.ebuild       | 132 ------------------
 ....2-r7.ebuild => nfs-utils-1.3.2-r8.ebuild} |  12 +-
 11 files changed, 9 insertions(+), 224 deletions(-)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsd.service
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/proc-fs-nfsd.mount
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-gssd.service
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-idmapd.service
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-mountd.service
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-svcgssd.service
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.2.9-r4.ebuild
 rename sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/{nfs-utils-1.3.2-r7.ebuild => nfs-utils-1.3.2-r8.ebuild} (90%)

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 1287f3ec44..8893833699 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,2 +1 @@
-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/nfsd.service b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsd.service
deleted file mode 100644
index e15cf98f9b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=NFS server
-After=rpcbind.service
-Requires=rpcbind.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/rpc.nfsd 8
-ExecStartPost=/usr/sbin/exportfs -a
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -a -u
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/proc-fs-nfsd.mount b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/proc-fs-nfsd.mount
deleted file mode 100644
index 26b58b9682..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/proc-fs-nfsd.mount
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=NFS Configuration File System
-DefaultDependencies=no
-
-[Mount]
-What=sunrpc
-Where=/proc/fs/nfsd
-Type=nfsd
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-gssd.service b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-gssd.service
deleted file mode 100644
index 4c96deef44..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-gssd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=RPC GSS-API Client Daemon
-Documentation=man:rpc.gssd(8)
-After=rpcbind.service var-lib-nfs-rpc_pipefs.mount
-Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount
-Before=remote-fs-pre.target
-
-[Service]
-ExecStart=/usr/sbin/rpc.gssd -f
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-idmapd.service b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-idmapd.service
deleted file mode 100644
index 4a63b91ca7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-idmapd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=NFS v4 ID-Name Mapping Daemon
-Documentation=man:rpc.idmapd(8) man:idmapd.conf(5)
-After=var-lib-nfs-rpc_pipefs.mount nfsd.service
-Requires=var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-ExecStart=/usr/sbin/rpc.idmapd -f
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-mountd.service b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-mountd.service
deleted file mode 100644
index d5f5b24af3..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-mountd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=NFS Mount Daemon
-After=rpcbind.service nfsd.service
-Requires=rpcbind.service nfsd.service
-
-[Service]
-ExecStart=/usr/sbin/rpc.mountd -F
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service
deleted file mode 100644
index 3633ebded5..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.target
-Wants=remote-fs-pre.target
-
-[Service]
-ExecStart=/sbin/rpc.statd -F
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-svcgssd.service b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-svcgssd.service
deleted file mode 100644
index 121c61a49b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-svcgssd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=RPC GSS-API Server Daemon
-Documentation=man:rpc.svcgssd(8)
-After=rpcbind.service
-Requires=rpcbind.service
-Before=nfs-server.target
-PartOf=nfs-server.target
-
-[Service]
-ExecStart=/usr/sbin/rpc.svcgssd -f
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount
deleted file mode 100644
index c416658222..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=RPC Pipe File System
-
-[Mount]
-What=rpc_pipefs
-Where=/var/lib/nfs/rpc_pipefs
-Type=rpc_pipefs
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.2.9-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.2.9-r4.ebuild
deleted file mode 100644
index 7142d0df2a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.2.9-r4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2014 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.2.9-r3.ebuild,v 1.7 2014/08/11 13:38:48 vapier Exp $
-
-EAPI="4"
-
-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-1.0b
-		>=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
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-
-	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)
-	econf \
-		--with-statedir="${EPREFIX}"/var/lib/nfs \
-		--enable-tirpc \
-		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \
-		$(use_enable libmount libmount-mount) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsdcld nfsdcltrack) \
-		$(use_enable nfsv4) \
-		$(use_enable nfsv41) \
-		$(use_enable ipv6) \
-		$(use_enable caps) \
-		$(use_enable uuid) \
-		$(use_enable kerberos gss) \
-		--without-gssglue
-}
-
-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 "${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
-		# 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
-
-	systemd_dotmpfilesd "${FILESDIR}"/nfs-utils.conf
-	systemd_dounit "${FILESDIR}"/nfsd.service
-	systemd_dounit "${FILESDIR}"/rpc-statd.service
-	systemd_dounit "${FILESDIR}"/rpc-mountd.service
-	systemd_dounit "${FILESDIR}"/rpc-idmapd.service
-	systemd_dounit "${FILESDIR}"/{proc-fs-nfsd,var-lib-nfs-rpc_pipefs}.mount
-	use nfsv4 && use kerberos && systemd_dounit "${FILESDIR}"/rpc-{gssd,svcgssd}.service
-}
-
-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
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r8.ebuild
similarity index 90%
rename from sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r7.ebuild
rename to sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r8.ebuild
index a83a7a1368..96b2da0d83 100644
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r7.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r8.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Id$
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ 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"
+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
@@ -114,6 +114,7 @@ src_install() {
 		doins id_resolver.conf
 	fi
 
+	systemd_dotmpfilesd "${FILESDIR}"/nfs-utils.conf
 	systemd_dounit systemd/*.{mount,service,target}
 	if ! use nfsv4 || ! use kerberos ; then
 		rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
@@ -123,10 +124,15 @@ src_install() {
 	fi
 	rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die
 	sed -i -r \
-		-e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
+		-e "/^EnvironmentFile=/d" \
 		-e '/^(After|Wants)=nfs-config.service$/d' \
 		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
 		"${D}$(systemd_get_unitdir)"/* || die
+
+	# maintain compatibility with the old gentoo systemd unit names, since nfs-utils has units upstream now.
+	dosym nfs-server.service "$(systemd_get_unitdir)"/nfsd.service
+	dosym nfs-idmapd.service "$(systemd_get_unitdir)"/rpc-idmapd.service
+	dosym nfs-mountd.service "$(systemd_get_unitdir)"/rpc-mountd.service
 }
 
 pkg_postinst() {