gentoo resync : 23.03.2018

4 files changed, 175 insertions, 45 deletions

diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index 69e6a6d0ba7b..c65d98b3a6aa 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -1,8 +1,10 @@
 AUX libnfsidmap-0.19-getgrouplist.patch 3459 BLAKE2B bf58f1234c9b306643698250c0d5cc9ad4290a22582e18af09b91d9c9d7b49cffc959c77758ab1c7d1af0be9401cef2c0f5c1127aceb9a175738236dfb6e0d58 SHA512 a778620b51158b07b7224ca010ba199feba85af7fc087bde65cfb8d2660bd7646c08d303a39d2af525b3a449694a60c3c35fe3b696cb0354b5d74423240a9e8d
 AUX libnfsidmap-0.21-headers.patch 438 BLAKE2B 0ef48276188f4142b2c85cb3cf326d37aee270f7a4b1442c41678792d071d528e83b41c4cc7ea253fa2e43efca788903c37a52540bffa0fc8199203954d62c1e SHA512 55cc2dce6df5c215d2ba270324a2dabdd7c798d88dfe1f6ac01a7bfcddc1b9a23bc031fac2006682596f3984f0ce9782c8584e3b8e02a1b491ac978a69aca926
+AUX libnfsidmap-0.27-getgrouplist.patch 3467 BLAKE2B 595045c93b897fd51a8ee4b039fe8b8732e78fc203cf6ab4ad138feaf35c408698ba4571477115ddf03d73ba20a9fa8623af43e6adf9c5a51a8577710e5a4c1d SHA512 3bf266ddeed306981cf7724032a59118ec93e34974b79fc93966f3494acef1855ce7bdf4e88ac12b0d435a5b2380e1570243c746bd05dc19a65d40517f6f2462
 DIST libnfsidmap-0.24.tar.gz 328720 BLAKE2B 4b33a589b9d4b47530d2044a0912481dfda770de86f7aa90e80771f2df4b555857535a7f162a485b68c9b1d48be563d246e128fa3ca1e3c79d9bf0af69b8401d SHA512 1283a4af1bcf3c6f941ab294acc0b2b4bd9ca947f2d3c2e866717478ba2e7a2190a5467b71d7e9136c5c83de564c4892f9e3304323ae17e3988af2e40c43982b
 DIST libnfsidmap-0.25.tar.gz 346587 BLAKE2B dbf31779371ba29737ed7a5901cf46f17e4a1b2ac444c2959d3ae76f41815e9a15a2ee892e417c5b7f97cf5f8396024071430fed028a8cd583aeed1a95e350df SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557
+DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
 EBUILD libnfsidmap-0.24.ebuild 1072 BLAKE2B cbc056d0eaa632b3692b21d6062f5538ffda57035d2683c49808b4922f14da1e8673dd0301fe9452a70341046aa6d2a513d04947827f9b9d49a2313aa13e3687 SHA512 1de6d7598472c57587b95c46c0b2093438227efdc85800d340c85f32f05b2f4fe91b30c46c04fa735c8a222c47f2a0f0342624a296fad0f0abccdaaaf3d0432e
 EBUILD libnfsidmap-0.25-r1.ebuild 1228 BLAKE2B 2feab50fe80de22eac0172c2021ab010445cb0191190bd120f1d3ef8af13850ea229c58bfdaa2385581dc5554f290d5915236795a6f4b5ebba193bf28975b814 SHA512 30141389e7e22bfb41205a11e2b9e2e6671af35c9844b53afc2621f720ab1f8435e8686c44724e1bb14033cac7d1ac0aa904a5f6b8871caf36466aa4e378ac83
-EBUILD libnfsidmap-0.25.ebuild 1041 BLAKE2B 7c070c248a742cc2accf30be188657705e28cebed9ae8cbc83b3871d40f642aabaeaa4a8dc0f5e4aed8d66a35ff77907eccbc426bb5fe6e507f155ddd9726233 SHA512 b4729a00a7552f9643cfeda532564ee206820c1ea59f54c938117c5b70eed67918fa96224693c277dff3c09cff7e4a2250af0f23e4d3338df77036c8549cf234
+EBUILD libnfsidmap-0.27.ebuild 1357 BLAKE2B 5e976922f305b8549331aff8d74a48dc5546d20deba68c7196e3773c8272b3964e72f31fcfd358def163ddaca53eac6cbb9d28ad137dadf4c33f2e5bc4b423aa SHA512 192121cc99c8240f1a9e66d5d4ed6bb2bac743a324c58c115d5b7ee2aeb610f488d105c27055d072b4268bdea43be00c94d8dadf71a7af7ba9cb8776772fb239
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.27-getgrouplist.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.27-getgrouplist.patch
new file mode 100644
index 000000000000..9a8f0a487ae3
--- /dev/null
+++ b/net-libs/libnfsidmap/files/libnfsidmap-0.27-getgrouplist.patch
@@ -0,0 +1,115 @@
+http://bugs.gentoo.org/169909
+
+--- libnfsidmap-0.27/configure.ac
++++ libnfsidmap-0.27/configure.ac
+@@ -63,7 +63,7 @@
+ 
+ # Checks for library functions.
+ AC_FUNC_MALLOC
+-AC_CHECK_FUNCS([strchr strdup])
++AC_CHECK_FUNCS([strchr strdup getgrouplist])
+ 
+ AC_CONFIG_FILES([Makefile])
+ AC_CONFIG_FILES([libnfsidmap.pc])
+--- libnfsidmap-0.27/getgrouplist.c
++++ libnfsidmap-0.27/getgrouplist.c
+@@ -0,0 +1,88 @@
++/*
++ *  getgrouplist.c
++ *
++ *  if system does not provide the non-standard getgrouplist, we will emulate
++ *  it via POSIX standard functions
++ *
++ * Copyright (c) 1991, 1993
++ *	The Regents of the University of California.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 4. Neither the name of the University nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++#include <sys/types.h>
++#include <grp.h>
++#include <string.h>
++#include <unistd.h>
++
++#ifndef HAVE_GETGROUPLIST
++static
++int
++getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
++{
++	const struct group *grp;
++	int i, maxgroups, ngroups, ret;
++
++	ret = 0;
++	ngroups = 0;
++	maxgroups = *grpcnt;
++	/*
++	 * When installing primary group, duplicate it;
++	 * the first element of groups is the effective gid
++	 * and will be overwritten when a setgid file is executed.
++	 */
++	groups[ngroups++] = agroup;
++	if (maxgroups > 1)
++		groups[ngroups++] = agroup;
++	/*
++	 * Scan the group file to find additional groups.
++	 */
++	setgrent();
++	while ((grp = getgrent()) != NULL) {
++		for (i = 0; i < ngroups; i++) {
++			if (grp->gr_gid == groups[i])
++				goto skip;
++		}
++		for (i = 0; grp->gr_mem[i]; i++) {
++			if (!strcmp(grp->gr_mem[i], uname)) {
++				if (ngroups >= maxgroups) {
++					ret = -1;
++					break;
++				}
++				groups[ngroups++] = grp->gr_gid;
++				break;
++			}
++		}
++skip:
++		;
++	}
++	endgrent();
++	*grpcnt = ngroups;
++	return (ret);
++}
++#endif
+--- libnfsidmap-0.27/nss.c
++++ libnfsidmap-0.27/nss.c
+@@ -51,6 +51,8 @@
+ #include "cfg.h"
+ #include <syslog.h>
+ 
++#include "getgrouplist.c"
++
+ /*
+  * NSS Translation Methods
+  *
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.25.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25.ebuild
deleted file mode 100644
index bba515a1955d..000000000000
--- a/net-libs/libnfsidmap/libnfsidmap-0.25.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils multilib
-
-DESCRIPTION="NFSv4 ID <-> name mapping library"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
-SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ldap static-libs"
-
-DEPEND="ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
-	!<net-fs/nfs-utils-1.2.2
-	!net-fs/idmapd"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.19-getgrouplist.patch #169909
-	epatch "${FILESDIR}"/${PN}-0.21-headers.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable ldap)
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins idmapd.conf
-
-	# remove useless files
-	rm -f "${D}"/usr/$(get_libdir)/libnfsidmap/*.{a,la}
-	use static-libs || find "${D}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
new file mode 100644
index 000000000000..1cfe1e970017
--- /dev/null
+++ b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib
+
+DESCRIPTION="NFSv4 ID <-> name mapping library"
+HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
+#SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
+SRC_URI="https://fedorapeople.org/~steved/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ldap static-libs"
+
+DEPEND="ldap? ( net-nds/openldap )"
+RDEPEND="
+	${DEPEND}
+	!<net-fs/nfs-utils-1.2.2
+	!net-fs/idmapd
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.27-getgrouplist.patch #169909
+	"${FILESDIR}"/${PN}-0.21-headers.patch
+)
+
+src_prepare() {
+	default
+	# Ideally the build would use -DLIBDIR=$(libdir) at build time.
+	sed -i \
+		-e "/PATH_PLUGINS/s:/usr/lib/libnfsidmap:${EPREFIX}/usr/$(get_libdir)/libnfsidmap:" \
+		libnfsidmap.c || die #504666
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-dependency-tracking
+		$(use_enable static-libs static)
+		$(use_enable ldap)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins idmapd.conf
+
+	# remove useless files
+	rm -f "${ED%/}"/usr/$(get_libdir)/libnfsidmap/*.{a,la}
+	use static-libs || find "${ED%/}"/usr -name '*.la' -delete || die
+}