commit: a4ce0fb20d19369fc164c6e517cd5de346736563 Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com> AuthorDate: Sat Mar 13 17:31:47 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 13 21:26:04 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a4ce0fb2
net-libs/libnfsidmap: clean old Package-Manager: Portage-3.0.17, Repoman-3.0.2 RepoMan-Options: --force Manifest-Sign-Key: 0xA1919C830E9498E0 Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com> Closes: https://github.com/gentoo/musl/pull/424 Signed-off-by: Sam James <sam <AT> gentoo.org> net-libs/libnfsidmap/Manifest | 22 +++- .../files/libnfsidmap-0.19-getgrouplist.patch | 115 --------------------- net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild | 49 --------- ...dmap-0.27.ebuild => libnfsidmap-0.27-r1.ebuild} | 12 ++- 4 files changed, 29 insertions(+), 169 deletions(-) diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest index a126975..e79aa58 100644 --- a/net-libs/libnfsidmap/Manifest +++ b/net-libs/libnfsidmap/Manifest @@ -1,2 +1,22 @@ -DIST libnfsidmap-0.25.tar.gz 346587 BLAKE2B dbf31779371ba29737ed7a5901cf46f17e4a1b2ac444c2959d3ae76f41815e9a15a2ee892e417c5b7f97cf5f8396024071430fed028a8cd583aeed1a95e350df SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d +-----BEGIN PGP SIGNATURE----- + +iQKTBAEBCAB9FiEEZdLCSnfk9z83VSkfsaMsEcx8U7oFAmBM9vxfFIAAAAAALgAo +aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY1 +RDJDMjRBNzdFNEY3M0YzNzU1MjkxRkIxQTMyQzExQ0M3QzUzQkEACgkQsaMsEcx8 +U7qmmxAArX6ECIKsIPV8/AC9a/ReFatBBP2bqenpUnz7DOCBiuGTR5L8aw8KwjAQ +rJisxmUxFT2aX8q+79YXpY0+nc4NpYvDL9eHLy1/+orMPHfjXXCMoiP1x3eJevjp +RSvvS8KnmD4ErRq+gLE2s+Zp9JTIXLsGc/Ho4ZzPovsBcvT4ClX/6nZpAnVxfHcA +dgB3tdSZ8ypk5il9qOcEaitL1KhJZ5HaT4SPTvBGTuGt8zvdwJoptyK8kkINicQM +IGxcE6rEXmaJSjoedSDeri8u8iJ5mu0H3a5gUN86UF+53Druq66j/owSwRGFdBqB +qbndGGKEGhTHy5Xjs/lk1JVq+Or5NIEATs7xH1CxpqNn6505TC7M/7cc1VKc/9se +Z+F0pgHoYrLXzJL2+V7zrt82I4NLVnE46TM1tUbaJ8VSxvwYpd5A8W5O3ht67IxU +oHDpExHVNB6Cs4aSzn5bTcjIoIXF61jPHWtaBBivDHBOnDqlv9LupU6HXcPAhODu +l03Be9+QkyTqfRJZ8l12yTQqqvMB4PRmSjmuV8OggLdUAK/rCwgbN/D16C+KmHam +tkno854zRp03uMikY/099Mm3ZM7RwTiSfKZplhEbfcrDnrcb8oGsP+kxVgkULnkM +kiHfAE7/xnhGsmSLWIm8euwPwsdvHo/zqGpnAzla3yZIxvzPdDs= +=bFjr +-----END PGP SIGNATURE----- diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch deleted file mode 100644 index 0d5d367..0000000 --- a/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch +++ /dev/null @@ -1,115 +0,0 @@ -http://bugs.gentoo.org/169909 - ---- libnfsidmap-0.19/configure.in -+++ libnfsidmap-0.19/configure.in -@@ -38,7 +38,7 @@ - - # Checks for library functions. - AC_FUNC_MALLOC --AC_CHECK_FUNCS([strchr strdup]) -+AC_CHECK_FUNCS([strchr strdup getgrouplist]) - - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT(libnfsidmap.pc) ---- libnfsidmap-0.19/nss.c -+++ libnfsidmap-0.19/nss.c -@@ -49,6 +49,8 @@ - #include "cfg.h" - #include <syslog.h> - -+#include "getgrouplist.c" -+ - /* - * NSS Translation Methods - * ---- libnfsidmap-0.19/getgrouplist.c -+++ libnfsidmap-0.19/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 diff --git a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild deleted file mode 100644 index bd079a2..0000000 --- a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 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="amd64 arm arm64 ~mips ppc ppc64 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 - epatch "${FILESDIR}"/0001-add_missing_header_musl.patch - # 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() { - 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-r1.ebuild similarity index 82% rename from net-libs/libnfsidmap/libnfsidmap-0.27.ebuild rename to net-libs/libnfsidmap/libnfsidmap-0.27-r1.ebuild index fec7605..790deea 100644 --- a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild +++ b/net-libs/libnfsidmap/libnfsidmap-0.27-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="https://fedorapeople.org/~steved/${PN}/${PV}/${P}.tar.bz2"; LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" IUSE="ldap static-libs" DEPEND="ldap? ( net-nds/openldap )" @@ -25,8 +25,6 @@ RDEPEND=" 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() { @@ -35,6 +33,12 @@ src_prepare() { sed -i \ -e "/PATH_PLUGINS/s:/usr/lib/libnfsidmap:${EPREFIX}/usr/$(get_libdir)/libnfsidmap:" \ libnfsidmap.c || die #504666 + + if use elibc_musl ; then + "${FILESDIR}"/${PN}-0.27-configure-musl.patch + "${FILESDIR}"/0001-add_missing_header_musl.patch + fi + eautoreconf }
