[gentoo-commits] repo/gentoo:master commit in: sys-auth/libnss-nis/files/

2020-07-01 Thread Aaron Bauman 
commit: 2dd0a008b006d89af11d13887d0d51e88213c0ad
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Jun 30 18:21:45 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Jul  1 19:58:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd0a008

sys-auth/libnss-nis: remove unused patch(es)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16512
Signed-off-by: Aaron Bauman  gentoo.org>

 .../files/libnss-nis-1.4-glibc-2.30.patch  | 157 -
 1 file changed, 157 deletions(-)

diff --git a/sys-auth/libnss-nis/files/libnss-nis-1.4-glibc-2.30.patch 
b/sys-auth/libnss-nis/files/libnss-nis-1.4-glibc-2.30.patch
deleted file mode 100644
index ac8d497ecb4..000
--- a/sys-auth/libnss-nis/files/libnss-nis-1.4-glibc-2.30.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From e9f0f4286d5a923eca1a9c84ff125268d144822e Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Thu, 25 Jul 2019 12:10:56 -0700
-Subject: [PATCH] nis-hosts: Remove use of RES_USE_INET6
-
-Upstream glibc dropped it starting glibc 2.30
-see
-https://sourceware.org/git/?p=glibc.git;a=commit;h=3f8b44be0a658266adff5ece1e4bc3ce097a5dbe
-
-Fixes issue #6
-
-Signed-off-by: Khem Raj 

- src/nis-hosts.c | 55 -
- 1 file changed, 13 insertions(+), 42 deletions(-)
-
-diff --git a/src/nis-hosts.c b/src/nis-hosts.c
-index 307b46e..bd3c4ad 100644
 a/src/nis-hosts.c
-+++ b/src/nis-hosts.c
-@@ -35,15 +35,12 @@
- #include "libc-lock.h"
- #include "nss-nis.h"
- 
--/* Get implementation for some internal functions. */
--#include "mapv4v6addr.h"
--
- #define ENTNAME hostent
- #define DATABASE"hosts"
- #define NEED_H_ERRNO
- 
--#define EXTRA_ARGS  , af, flags
--#define EXTRA_ARGS_DECL , int af, int flags
-+#define EXTRA_ARGS  , af
-+#define EXTRA_ARGS_DECL , int af
- 
- #define ENTDATA hostent_data
- struct hostent_data
-@@ -67,19 +64,8 @@ LINE_PARSER
-/* Parse address.  */
-if (af != AF_INET6 && inet_pton (AF_INET, addr, entdata->host_addr) > 0)
-  {
--   assert ((flags & AI_V4MAPPED) == 0 || af != AF_UNSPEC);
--   if (flags & AI_V4MAPPED)
--   {
-- map_v4v6_address ((char *) entdata->host_addr,
--   (char *) entdata->host_addr);
-- result->h_addrtype = AF_INET6;
-- result->h_length = IN6ADDRSZ;
--   }
--   else
--   {
-- result->h_addrtype = AF_INET;
-- result->h_length = INADDRSZ;
--   }
-+   result->h_addrtype = AF_INET;
-+   result->h_length = INADDRSZ;
-  }
-else if (af != AF_INET
-   && inet_pton (AF_INET6, addr, entdata->host_addr) > 0)
-@@ -134,7 +120,7 @@ strong_alias (_nss_nis_sethostent, _nss_nis_endhostent)
- static enum nss_status
- internal_nis_gethostent_r (struct hostent *host, char *buffer,
-  size_t buflen, int *errnop, int *h_errnop,
-- int af, int flags)
-+ int af)
- {
-   char *domain;
-   if (yp_get_default_domain ())
-@@ -203,7 +189,7 @@ internal_nis_gethostent_r (struct hostent *host, char 
*buffer,
-   ++p;
-   free (result);
- 
--  parse_res = parse_line (p, host, data, buflen, errnop, af, flags);
-+  parse_res = parse_line (p, host, data, buflen, errnop, af);
-   if (parse_res == -1)
-   {
- free (outkey);
-@@ -232,8 +218,7 @@ _nss_nis_gethostent_r (struct hostent *host, char *buffer, 
size_t buflen,
-   __libc_lock_lock (lock);
- 
-   status = internal_nis_gethostent_r (host, buffer, buflen, errnop, h_errnop,
--  ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET),
--  ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0 ));
-+  AF_INET);
- 
-   __libc_lock_unlock (lock);
- 
-@@ -244,7 +229,7 @@ _nss_nis_gethostent_r (struct hostent *host, char *buffer, 
size_t buflen,
- static enum nss_status
- internal_gethostbyname2_r (const char *name, int af, struct hostent *host,
-  char *buffer, size_t buflen, int *errnop,
-- int *h_errnop, int flags)
-+ int *h_errnop)
- {
-   uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct parser_data);
-   buffer += pad;
-@@ -318,7 +303,7 @@ internal_gethostbyname2_r (const char *name, int af, 
struct hostent *host,
- ++p;
-   free (result);
- 
--  int parse_res = parse_line (p, host, data, buflen, errnop, af, flags);
-+  int parse_res = parse_line (p, host, data, buflen, errnop, af);
- 
-   if (parse_res < 1 || host->h_addrtype != af)
- {
-@@ -351,8 +336,7 @@ _nss_nis_gethostbyname2_r (const char *name, int af, 
struct hostent *host,
- }
- 
-   return internal_gethostbyname2_r (name, af, host, buffer, buflen, errnop,
--  h_errnop,
--

[gentoo-commits] repo/gentoo:master commit in: sys-auth/libnss-nis/files/, sys-auth/libnss-nis/

2020-02-18 Thread Sergei Trofimovich 
commit: d5fcf67ae6a2b338b367b8efc2869ba4466fc6fa
Author: Stephan Hartmann  googlemail  com>
AuthorDate: Tue Feb 18 14:33:16 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Feb 18 15:03:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5fcf67a

sys-auth/libnss-nis: fix build with glibc 2.30

Closes: https://bugs.gentoo.org/692768
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Stephan Hartmann  googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/14691
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../files/libnss-nis-1.4-glibc-2.30.patch  | 157 +
 sys-auth/libnss-nis/libnss-nis-1.4.ebuild  |   4 +-
 2 files changed, 160 insertions(+), 1 deletion(-)

diff --git a/sys-auth/libnss-nis/files/libnss-nis-1.4-glibc-2.30.patch 
b/sys-auth/libnss-nis/files/libnss-nis-1.4-glibc-2.30.patch
new file mode 100644
index 000..ac8d497ecb4
--- /dev/null
+++ b/sys-auth/libnss-nis/files/libnss-nis-1.4-glibc-2.30.patch
@@ -0,0 +1,157 @@
+From e9f0f4286d5a923eca1a9c84ff125268d144822e Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Thu, 25 Jul 2019 12:10:56 -0700
+Subject: [PATCH] nis-hosts: Remove use of RES_USE_INET6
+
+Upstream glibc dropped it starting glibc 2.30
+see
+https://sourceware.org/git/?p=glibc.git;a=commit;h=3f8b44be0a658266adff5ece1e4bc3ce097a5dbe
+
+Fixes issue #6
+
+Signed-off-by: Khem Raj 
+---
+ src/nis-hosts.c | 55 -
+ 1 file changed, 13 insertions(+), 42 deletions(-)
+
+diff --git a/src/nis-hosts.c b/src/nis-hosts.c
+index 307b46e..bd3c4ad 100644
+--- a/src/nis-hosts.c
 b/src/nis-hosts.c
+@@ -35,15 +35,12 @@
+ #include "libc-lock.h"
+ #include "nss-nis.h"
+ 
+-/* Get implementation for some internal functions. */
+-#include "mapv4v6addr.h"
+-
+ #define ENTNAME hostent
+ #define DATABASE"hosts"
+ #define NEED_H_ERRNO
+ 
+-#define EXTRA_ARGS  , af, flags
+-#define EXTRA_ARGS_DECL , int af, int flags
++#define EXTRA_ARGS  , af
++#define EXTRA_ARGS_DECL , int af
+ 
+ #define ENTDATA hostent_data
+ struct hostent_data
+@@ -67,19 +64,8 @@ LINE_PARSER
+/* Parse address.  */
+if (af != AF_INET6 && inet_pton (AF_INET, addr, entdata->host_addr) > 0)
+  {
+-   assert ((flags & AI_V4MAPPED) == 0 || af != AF_UNSPEC);
+-   if (flags & AI_V4MAPPED)
+-   {
+- map_v4v6_address ((char *) entdata->host_addr,
+-   (char *) entdata->host_addr);
+- result->h_addrtype = AF_INET6;
+- result->h_length = IN6ADDRSZ;
+-   }
+-   else
+-   {
+- result->h_addrtype = AF_INET;
+- result->h_length = INADDRSZ;
+-   }
++   result->h_addrtype = AF_INET;
++   result->h_length = INADDRSZ;
+  }
+else if (af != AF_INET
+   && inet_pton (AF_INET6, addr, entdata->host_addr) > 0)
+@@ -134,7 +120,7 @@ strong_alias (_nss_nis_sethostent, _nss_nis_endhostent)
+ static enum nss_status
+ internal_nis_gethostent_r (struct hostent *host, char *buffer,
+  size_t buflen, int *errnop, int *h_errnop,
+- int af, int flags)
++ int af)
+ {
+   char *domain;
+   if (yp_get_default_domain ())
+@@ -203,7 +189,7 @@ internal_nis_gethostent_r (struct hostent *host, char 
*buffer,
+   ++p;
+   free (result);
+ 
+-  parse_res = parse_line (p, host, data, buflen, errnop, af, flags);
++  parse_res = parse_line (p, host, data, buflen, errnop, af);
+   if (parse_res == -1)
+   {
+ free (outkey);
+@@ -232,8 +218,7 @@ _nss_nis_gethostent_r (struct hostent *host, char *buffer, 
size_t buflen,
+   __libc_lock_lock (lock);
+ 
+   status = internal_nis_gethostent_r (host, buffer, buflen, errnop, h_errnop,
+-  ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET),
+-  ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0 ));
++  AF_INET);
+ 
+   __libc_lock_unlock (lock);
+ 
+@@ -244,7 +229,7 @@ _nss_nis_gethostent_r (struct hostent *host, char *buffer, 
size_t buflen,
+ static enum nss_status
+ internal_gethostbyname2_r (const char *name, int af, struct hostent *host,
+  char *buffer, size_t buflen, int *errnop,
+- int *h_errnop, int flags)
++ int *h_errnop)
+ {
+   uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct parser_data);
+   buffer += pad;
+@@ -318,7 +303,7 @@ internal_gethostbyname2_r (const char *name, int af, 
struct hostent *host,
+ ++p;
+   free (result);
+ 
+-  int parse_res = parse_line (p, host, data, buflen, errnop, af, flags);
++  int parse_res = parse_line (p, host, data, buflen, errnop, af);
+ 
+   if (parse_res < 1 || host->h_addrtype != af)
+ {
+@@ -351,8 +336,7 @@ _nss_nis_gethostbyname2_r (const char *name, int af, 
struct hostent *host,
+ }
+ 
+   return

[gentoo-commits] repo/gentoo:master commit in: sys-auth/libnss-nis/files/, sys-auth/libnss-nis/

2017-11-17 Thread Andreas Hüttel 
commit: 7cf52c674ca56d22b039982de815439c0d102bf2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Nov 17 19:13:26 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri Nov 17 23:20:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cf52c67

sys-auth/libnss-nis: new package

(Note added- I've made it install into /usr for the moment. dilfridge)

Bug: https://bugs.gentoo.org/637946
Closes: https://github.com/gentoo/gentoo/pull/6214
Package-Manager: Portage-2.3.14_p5, Repoman-2.3.6

 sys-auth/libnss-nis/Manifest |   1 +
 sys-auth/libnss-nis/files/map_v4v6_address.patch | 112 +++
 sys-auth/libnss-nis/libnss-nis-1.3.ebuild|  49 ++
 sys-auth/libnss-nis/metadata.xml |   7 ++
 4 files changed, 169 insertions(+)

diff --git a/sys-auth/libnss-nis/Manifest b/sys-auth/libnss-nis/Manifest
new file mode 100644
index 000..49a50549026
--- /dev/null
+++ b/sys-auth/libnss-nis/Manifest
@@ -0,0 +1 @@
+DIST libnss-nis-1.3.tar.gz 208580 SHA256 
ddf49c60b2eb944929d5b7ffe74d6c95f9df0843e68d450cf5ba0f35b59c906d SHA512 
d5af3223da2202f2f3168f127980bb6b3f3c5939e2efe4d68fe3d13b6068898be7a64494f2c80a31afa77fb411c8d360519e5d26709d6aebca2bfb2d0c09cd26
 WHIRLPOOL 
a181277f93183fa33abb07c838a03b3e1373d8471577f85083d0e07cb7a9865c383a073df9d5f9700d56d483c1409cb5b4dfaa2194a8d0db3f7fc78620b348ea

diff --git a/sys-auth/libnss-nis/files/map_v4v6_address.patch 
b/sys-auth/libnss-nis/files/map_v4v6_address.patch
new file mode 100644
index 000..85a69d71c5b
--- /dev/null
+++ b/sys-auth/libnss-nis/files/map_v4v6_address.patch
@@ -0,0 +1,112 @@
+From df903b621d4010c94129455a3f8d91d66f0fcd1f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+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 000..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