dev-libs/libnfsidmap: sync versions with upstream

libnfsidmap-0.25-r1 is the new stable version
libnfsidmap-0.27 is the new testing version

6 files changed, 201 insertions, 13 deletions

diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index 88ad93b4..a1269755 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -1 +1,2 @@
-DIST libnfsidmap-0.24.tar.gz 328720 SHA256 59501432e683336d7a290da13767e92afb5b86f42ea4254041225fe218e8dd47 SHA512 1283a4af1bcf3c6f941ab294acc0b2b4bd9ca947f2d3c2e866717478ba2e7a2190a5467b71d7e9136c5c83de564c4892f9e3304323ae17e3988af2e40c43982b WHIRLPOOL 7f9e81dec91429c09b24325bdf077d800b608bb87eeeb5d4334fa3dbbd50a4acf482162716c19c5f5175e48bf129dbf4611c1d6be933097753eeaab834192bae
+DIST libnfsidmap-0.25.tar.gz 346587 BLAKE2B dbf31779371ba29737ed7a5901cf46f17e4a1b2ac444c2959d3ae76f41815e9a15a2ee892e417c5b7f97cf5f8396024071430fed028a8cd583aeed1a95e350df SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557
+DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
diff --git a/net-libs/libnfsidmap/files/0001-add_missing_header_musl.patch b/net-libs/libnfsidmap/files/0001-add_missing_header_musl.patch
index c94748e8..574cf8fe 100644
--- a/net-libs/libnfsidmap/files/0001-add_missing_header_musl.patch
+++ b/net-libs/libnfsidmap/files/0001-add_missing_header_musl.patch
@@ -1,5 +1,5 @@
---- cfg.h	2015-01-10 14:25:50.384148769 +0000
-+++ cfg.h	2015-01-10 14:28:23.062148769 +0000
+--- libnfsidmap-0.27/cfg.h	2015-01-10 14:25:50.384148769 +0000
++++ libnfsidmap-0.27/cfg.h	2015-01-10 14:28:23.062148769 +0000
 @@ -33,6 +33,9 @@
  #ifndef _CONF_H_
  #define _CONF_H_
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.27-configure-musl.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.27-configure-musl.patch
new file mode 100644
index 00000000..a5dec908
--- /dev/null
+++ b/net-libs/libnfsidmap/files/libnfsidmap-0.27-configure-musl.patch
@@ -0,0 +1,11 @@
+--- libnfsidmap-0.27/configure.ac.orig	2018-05-23 00:07:14.273119199 -0700
++++ libnfsidmap-0.27/configure.ac	2018-05-23 00:07:24.285190437 -0700
+@@ -14,7 +14,7 @@
+ 
+ # Checks for libraries.
+ 
+-AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
++AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
+ 
+ AC_ARG_ENABLE([ldap],
+ 	[AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:@default=detect@:>@])])
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 00000000..9a8f0a48
--- /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.24.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
index 77def538..de5a9bbe 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI="4"
 
-inherit autotools eutils
+inherit autotools eutils multilib
 
 DESCRIPTION="NFSv4 ID <-> name mapping library"
 HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
@@ -11,7 +11,7 @@ SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="ldap static-libs"
 
 DEPEND="ldap? ( net-nds/openldap )"
@@ -23,7 +23,10 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.19-getgrouplist.patch #169909
 	epatch "${FILESDIR}"/${PN}-0.21-headers.patch
 	epatch "${FILESDIR}"/0001-add_missing_header_musl.patch
-	epatch_user
+	# 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
 }
 
@@ -35,13 +38,12 @@ src_configure() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README
+	default
 
 	insinto /etc
-	doins idmapd.conf || die
+	doins idmapd.conf
 
 	# remove useless files
-	rm -f "${D}"/usr/lib*/libnfsidmap/*.{a,la}
-	use static-libs || rm -f "${D}"/usr/lib*/*.la
+	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 00000000..4a5cd623
--- /dev/null
+++ b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
@@ -0,0 +1,59 @@
+# 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
+	"${FILESDIR}"/${PN}-0.27-configure-musl.patch
+	"${FILESDIR}"/0001-add_missing_header_musl.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
+}