gentoo resync : 18.08.2019

5 files changed, 126 insertions, 7 deletions

diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index dea3a4cfcba4..cfd0b52e2202 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,6 +1,6 @@
 AUX autofs-5.1.2-libtirpc-as-need.patch 808 BLAKE2B a36fab796d78adff8cab4c10f8316d51809ef36781f7d95616b8c87ad093855a7c625c8cda907017c3000b3ee8a69cfc6ecfc60c655c32cd8dea0d2ede76ea0d SHA512 96441e4a040ceafd4bf323003d13170f419ea09c7d9cfdaeaf8675c945d28afde9b9ccf0ae3b0180d2038f5120e6d651c6657115658591093b778ed8f21b1bb3
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
-AUX autofs5.initd 1563 BLAKE2B 6fa5e84a93a85f208be6c7dce170230a7cd8a3e098dcd0cf1a59e96f8da0bc4d1795f689e4591e230a1c3c8a898a41bbfbb4e308b7885aa9bc238ca3f9b2eaea SHA512 f8e1d38917b9c7048a4f6498fb987984306e15458eaf8cb73990a99d355d7f7ce3f1aa5450725283cbbc6f5c0e2f31048f1cd26eca7f136f1fe30a6dd8d31c43
+AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa
 DIST autofs-5.1.2.tar.xz 294792 BLAKE2B eeecac768726a1b2d336908b48222c53b1ffbc9eeff7b7f597ccbf55214d35f0d99eaeaa1c065509fffa31ec86729bdd51be873e003aa1fb7d88a9e2ab04f4c8 SHA512 435bcb41c9d467947c194d879e46692b5976131b8e923793bdeac34f70420ede740c4d70ec393413fff0b1010495ac7fe5fa8b45a59d15a2430ecae9ec3fe7e1
 DIST autofs-5.1.3.tar.xz 300632 BLAKE2B 500325ec790304442e896208e94e25cf862621fc2354fa3c31fbf277dcc570d0b2b27894728d9f881efdcca262b1ef6e2c957cd23e2aea1d5b3cd2cd822c813b SHA512 d5363f4442be5258465140920a32cb63340c5da060ef2e66678f003d6a0c00579880837f0a04f59c7bce57d1cbc0f42bdd26546a2195f87e7bd46334c9e32e35
 DIST autofs-5.1.4.tar.xz 304864 BLAKE2B 7348aa1106554eb765919c765c0585b5d975d7a0ea036dec5b509711bf33cefd0f3e1e857a6865434adabbd1e323cfe8ffb09eb234495672e81101f79b8f4d0f SHA512 1ef48800a1e44d6bf7048923109f3b8299ef266ff0fbaf5f979c32f42c6c5e28620c1876f64b9d913fddb69244ff83226c01c666401ff6271dd6b53d31860589
@@ -8,5 +8,6 @@ DIST autofs-5.1.5.tar.xz 313476 BLAKE2B 9822f6eb6294a0ee14b08f7982bf6008eb9ac8a7
 EBUILD autofs-5.1.2.ebuild 3157 BLAKE2B 29c4a6f616f3da60798d51d01fd2547509a9e74ac8d98abe570bf13b68f5c3a104d28d19c76bdc1be8fe0002ec38d835c1f3b28d51f57bd7e1f46ce33698cf3f SHA512 2be0c80720dca0ebc3c0ac654cfdc4eddd388bb244808f904e82f3346a8d9d6cbcd83d50c776aaf6adef27288c411aacc5dec0bd4e10954d1e3f33ca41211ba1
 EBUILD autofs-5.1.3.ebuild 2937 BLAKE2B 90927d80b1250c13391c681fb605a0c9d5348b3f6e132f71d4ba58be285254d4e3f132a413b2a2c4d826ea07d56d8865df769d63647c038a8486d794f44622a9 SHA512 fd292b5aa28d53738e60e9fa21449c4af5f31b3d418fec30bc5ff371db5bce56cc5c385a04f9287d7c5b6af92e032dd0c2dcefbae58c99c64179c95cff697795
 EBUILD autofs-5.1.4.ebuild 2937 BLAKE2B 90927d80b1250c13391c681fb605a0c9d5348b3f6e132f71d4ba58be285254d4e3f132a413b2a2c4d826ea07d56d8865df769d63647c038a8486d794f44622a9 SHA512 fd292b5aa28d53738e60e9fa21449c4af5f31b3d418fec30bc5ff371db5bce56cc5c385a04f9287d7c5b6af92e032dd0c2dcefbae58c99c64179c95cff697795
-EBUILD autofs-5.1.5-r1.ebuild 3081 BLAKE2B ff84ada7ee3cf0ffadddd028f5060b7f19172cce1ae5cb81c048c7ebdd387305749bb2b8ff0fd0769844e99169a393a0ad598230c7470861601dca7cd54eaf3d SHA512 ce97db52c0f14f5e8b8c0cf1fef4d98ec1207dc8b7607acdfb382bf43f9ab8982dca0b45d0d011d0f1950ff06705f63fbfd61f01ad5b8999b08de77afa9cffa9
-MISC metadata.xml 790 BLAKE2B 279487980b9a81aaf42322ab4502ab3ec5aac78e4b0b58cb19043db0742f7b3832145ebf1e725c6f476170cc3a59130a1072d4856cf271ad56fe561262b50eac SHA512 594bbea9701ebca1c17630eeb3f06b47f0c74ef426aed68be1ce868316736f80f835fa73d31a93627e2a81415f489aace91a1ca1e02f4cef17783b102a77a023
+EBUILD autofs-5.1.5-r1.ebuild 3083 BLAKE2B 2b9237308a753fdc6fa3fc260cff723026543476753866f4f4bf39e1f19f5a33b2376fed696784cdb296e15cbfcb8c5be26188e0b6dba382f1faeb36fe5a7bd9 SHA512 228c6d1b49d9e400da1837db73cfad7e1e4339beb4b99a10183a1a2a5da57bc5cde5f6aa26023c80f7ae2c4f4223eea5250a32413cc82ee57df1790200f964d7
+EBUILD autofs-5.1.5-r2.ebuild 2930 BLAKE2B badacbf6e32ab37700c08dfc6cf15729d83b73850c07d331bbb9b173f7bd21b82de0edd1b05b99d84afeee5d6c49a1ca68330754867dac7e7fc880c79f9fd5ac SHA512 c54017c16f012145a4351722bf360e4e6de7f825081d79bc60b70cd8d9e58067e26d22465fa4403639ee974d788cb2301275f3067178977efd2d189ed9db5aa3
+MISC metadata.xml 897 BLAKE2B a986a7de6079af006edec362f4ebda0a0da7baf04ce9151164bb60aba9e73ed3b398def4c0693e6905ff36c4f7bb4c94e3bb72ddc04c24e520e3a1c5909eacde SHA512 ea9849bee9f3e8247a366f9fab08cb40d0421df977e4071bff1a04cad68766815059bbf3de64cd8670b8cd024d5f455e14cd41b2bcfa8bac00f032ef8aaaa821
diff --git a/net-fs/autofs/autofs-5.1.5-r1.ebuild b/net-fs/autofs/autofs-5.1.5-r1.ebuild
index 79c538dd1e1c..c7f1f39104fe 100644
--- a/net-fs/autofs/autofs-5.1.5-r1.ebuild
+++ b/net-fs/autofs/autofs-5.1.5-r1.ebuild
@@ -103,9 +103,9 @@ pkg_postinst() {
 		elog "This version of ${PN} requires a kernel with autofs4 supporting"
 		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
 		elog "been installed into"
-		elog "${EROOT}usr/share/doc/${P}/patches."
+		elog "${EROOT}/usr/share/doc/${P}/patches."
 		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}usr/share/doc/${P}/INSTALL."
+		elog "${EROOT}/usr/share/doc/${P}/INSTALL."
 		elog
 	fi
 	elog "If you plan on using autofs for automounting remote NFS mounts,"
diff --git a/net-fs/autofs/autofs-5.1.5-r2.ebuild b/net-fs/autofs/autofs-5.1.5-r2.ebuild
new file mode 100644
index 000000000000..81532f3d62be
--- /dev/null
+++ b/net-fs/autofs/autofs-5.1.5-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Kernel based automounter"
+HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
+SRC_URI="mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd"
+
+# currently, sasl code assumes the presence of kerberosV
+RDEPEND=">=sys-apps/util-linux-2.20
+	dmalloc? ( dev-libs/dmalloc[threads] )
+	ldap? ( >=net-nds/openldap-2.0
+		sasl? (
+			dev-libs/cyrus-sasl
+			dev-libs/libxml2
+			virtual/krb5
+		)
+	)
+	systemd? ( sys-apps/systemd )
+	libtirpc? ( net-libs/libtirpc )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+"
+DEPEND="${RDEPEND}
+	libtirpc? ( net-libs/rpcsvc-proto )
+"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	local CONFIG_CHECK
+
+	if kernel_is -ge 4 18; then
+		CONFIG_CHECK="~AUTOFS_FS"
+	else
+		CONFIG_CHECK="~AUTOFS4_FS"
+	fi
+
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i	-e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die # bug #479492
+	sed -i	-e "/^EnvironmentFile/d"        samples/autofs.service.in || die # bug #592334
+
+	# Install samples including autofs.service
+	sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die
+
+	default
+}
+
+src_configure() {
+	# bug #483716
+	tc-export AR
+	# --with-confdir is for bug #361481
+	# --with-mapdir is for bug #385113
+	local myeconfargs=(
+		--with-confdir=/etc/conf.d
+		--with-mapdir=/etc/autofs
+		$(use_with dmalloc)
+		$(use_with ldap openldap)
+		$(use_with libtirpc)
+		$(use_with sasl)
+		$(use_enable mount-locking)
+		$(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492
+		--without-hesiod
+		--disable-ext-env
+		--enable-sloppy-mount # bug #453778
+		--enable-force-shutdown
+		--enable-ignore-busy
+		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	rmdir "${D}"/run
+
+	if kernel_is -lt 2 6 30; then
+		# kernel patches
+		docinto patches
+		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
+	fi
+	newinitd "${FILESDIR}"/autofs5.initd autofs
+	insinto etc/autofs
+	newins "${FILESDIR}"/autofs5-auto.master auto.master
+}
+
+pkg_postinst() {
+	if kernel_is -lt 2 6 30; then
+		elog "This version of ${PN} requires a kernel with autofs4 supporting"
+		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
+		elog "been installed into"
+		elog "${EROOT}/usr/share/doc/${P}/patches."
+		elog "For further instructions how to patch the kernel, please refer to"
+		elog "${EROOT}/usr/share/doc/${P}/INSTALL."
+		elog
+	fi
+	elog "If you plan on using autofs for automounting remote NFS mounts,"
+	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
+	elog "are running."
+}
diff --git a/net-fs/autofs/files/autofs5.initd b/net-fs/autofs/files/autofs5.initd
index 119585c995e0..1b9b0fadd8bb 100644
--- a/net-fs/autofs/files/autofs5.initd
+++ b/net-fs/autofs/files/autofs5.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 DAEMON=/usr/sbin/automount
@@ -8,7 +8,7 @@ DEVICE=autofs
 
 depend() {
 	need localmount	
-	use ypbind nfs slapd portmap net
+	use ypbind nfsclient slapd net
 }
 
 extra_started_commands="reload"
diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml
index f36813693b70..98c1695a7882 100644
--- a/net-fs/autofs/metadata.xml
+++ b/net-fs/autofs/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
 	<use>
 		<flag name="dmalloc">Enable debugging with the dmalloc library</flag>
 		<flag name="ldap">Install LDAP module</flag>