commit: 9c3f917d04edb41031850508426f1feeaf8ee477 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Nov 25 13:38:45 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Nov 25 13:39:48 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c3f917d
sys-auth/libnss-nis: bump to 1.4 Package-Manager: Portage-2.3.15, Repoman-2.3.6_p7 sys-auth/libnss-nis/Manifest | 2 +- sys-auth/libnss-nis/files/map_v4v6_address.patch | 112 --------------------- ...libnss-nis-1.3.ebuild => libnss-nis-1.4.ebuild} | 9 +- 3 files changed, 3 insertions(+), 120 deletions(-) diff --git a/sys-auth/libnss-nis/Manifest b/sys-auth/libnss-nis/Manifest index 628e418dc04..31a795de6d2 100644 --- a/sys-auth/libnss-nis/Manifest +++ b/sys-auth/libnss-nis/Manifest @@ -1 +1 @@ -DIST libnss-nis-1.3.tar.gz 208580 BLAKE2B 81dbef7c34cc01bcb35281b5cd16fe3ba222bcaf38fe58778589fd3452ba3a8521532281909ff6f1758a67eebc2c5942aaf8ffd8b30fb13e0a0c74bb1044e633 SHA512 d5af3223da2202f2f3168f127980bb6b3f3c5939e2efe4d68fe3d13b6068898be7a64494f2c80a31afa77fb411c8d360519e5d26709d6aebca2bfb2d0c09cd26 +DIST libnss-nis-1.4.tar.gz 209887 BLAKE2B ca9c2d66080568cc7748b4df4b0318687cf9dac5717c84a8e84d033a3a0aa0d59b3159c55ad2e1513e161b40acea59c3df8cddaea1ff4897a0599777179bd7f2 SHA512 56338a1dd60b756fb40e7e08c0d7d49ce98b47f684e7278aaf1a521a74f02b23cc73908adbd6ff88057f2f0e42301f827f888fc7af82aa57ff9449a05de73b75 diff --git a/sys-auth/libnss-nis/files/map_v4v6_address.patch b/sys-auth/libnss-nis/files/map_v4v6_address.patch deleted file mode 100644 index 85a69d71c5b..00000000000 --- a/sys-auth/libnss-nis/files/map_v4v6_address.patch +++ /dev/null @@ -1,112 +0,0 @@ -From df903b621d4010c94129455a3f8d91d66f0fcd1f Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <flop...@gentoo.org> -Date: Fri, 17 Nov 2017 13:44:10 -0500 -Subject: [PATCH] Copy the map_v4v6_address function from glibc - -Fixes: https://github.com/thkukuk/libnss_nis/issues/1 ---- - src/Makefile.am | 3 ++- - src/map_v4v6_address.h | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ - src/nis-hosts.c | 3 +-- - 3 files changed, 71 insertions(+), 3 deletions(-) - create mode 100644 src/map_v4v6_address.h - -diff --git a/src/Makefile.am b/src/Makefile.am -index 9eb3d35..56108aa 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -27,4 +27,5 @@ libnss_nis_la_LIBADD = @LIBNSL_LIBS@ - libnss_nis_la_SOURCES = nis-alias.c nis-ethers.c nis-grp.c nis-hosts.c \ - nis-initgroups.c nis-netgrp.c nis-network.c \ - nis-proto.c nis-publickey.c nis-pwd.c nis-rpc.c \ -- nis-service.c nis-spwd.c nss-nis.c nss-default.c -+ nis-service.c nis-spwd.c nss-nis.c nss-default.c \ -+ map_v4v6_address.h -diff --git a/src/map_v4v6_address.h b/src/map_v4v6_address.h -new file mode 100644 -index 0000000..d9a46c9 ---- /dev/null -+++ b/src/map_v4v6_address.h -@@ -0,0 +1,68 @@ -+/* -+ * ++Copyright++ 1985, 1988, 1993 -+ * - -+ * Copyright (c) 1985, 1988, 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. -+ * - -+ * Portions Copyright (c) 1993 by Digital Equipment Corporation. -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies, and that -+ * the name of Digital Equipment Corporation not be used in advertising or -+ * publicity pertaining to distribution of the document or software without -+ * specific, written prior permission. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL -+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT -+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -+ * SOFTWARE. -+ * - -+ * --Copyright-- -+ */ -+ -+static void -+map_v4v6_address (const char *src, char *dst) -+{ -+ u_char *p = (u_char *)dst; -+ char tmp[INADDRSZ]; -+ int i; -+ -+ /* Stash a temporary copy so our caller can update in place. */ -+ memcpy(tmp, src, INADDRSZ); -+ /* Mark this ipv6 addr as a mapped ipv4. */ -+ for (i = 0; i < 10; i++) -+ *p++ = 0x00; -+ *p++ = 0xff; -+ *p++ = 0xff; -+ /* Retrieve the saved copy and we're done. */ -+ memcpy((void*)p, tmp, INADDRSZ); -+} -diff --git a/src/nis-hosts.c b/src/nis-hosts.c -index ef6bb47..53ab965 100644 ---- a/src/nis-hosts.c -+++ b/src/nis-hosts.c -@@ -35,8 +35,7 @@ - #include "libc-lock.h" - #include "nss-nis.h" - --/* Get implementation for some internal functions. */ --#include <resolv/mapv4v6addr.h> -+#include "map_v4v6_address.h" - - #define ENTNAME hostent - #define DATABASE "hosts" diff --git a/sys-auth/libnss-nis/libnss-nis-1.3.ebuild b/sys-auth/libnss-nis/libnss-nis-1.4.ebuild similarity index 79% rename from sys-auth/libnss-nis/libnss-nis-1.3.ebuild rename to sys-auth/libnss-nis/libnss-nis-1.4.ebuild index 991a0f7e216..4b6cdff52f8 100644 --- a/sys-auth/libnss-nis/libnss-nis-1.3.ebuild +++ b/sys-auth/libnss-nis/libnss-nis-1.4.ebuild @@ -7,12 +7,11 @@ inherit autotools multilib-minimal DESCRIPTION="NSS module to provide NIS support" HOMEPAGE="https://github.com/thkukuk/libnss_nis"; -SRC_URI="https://github.com/thkukuk/libnss_nis/archive/libnss_nis-${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/thkukuk/libnss_nis/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1+ BSD ISC" SLOT="0" KEYWORDS="~amd64" -IUSE="" RDEPEND=" net-libs/libnsl:0=[${MULTILIB_USEDEP}] @@ -23,11 +22,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig[${MULTILIB_USEDEP}] " -S=${WORKDIR}/libnss_nis-libnss_nis-${PV} - -PATCHES=( - "${FILESDIR}/map_v4v6_address.patch" -) +S=${WORKDIR}/libnss_nis-${PV} src_prepare() { default
