Update to version 4.2.3

.gitignore

@@ -4,3 +4,4 @@ yp-tools-2.11.tar.bz2
 /yp-tools-3.0.1.tar.bz2
 /yp-tools-3.3.tar.bz2
 /yp-tools-yp-tools-4.2.2.tar.gz
+/v4.2.3.tar.gz

sources

@@ -1 +1 @@
-SHA512 (yp-tools-yp-tools-4.2.2.tar.gz) = da60b1be08432f61789cbd62a491996f47bfcbe296723d1984b4d0d2e755022e40e682cfd779597008c823e7fca2f115d85d446893f2b8ce001aba5744c2cfce
+SHA512 (v4.2.3.tar.gz) = 2fcdaaeb8af4c3f62aa571a488c04561356681fc18b919ef728cfc1941578870cce74b136959f49e4ab04f988a79252163c1abe30b357788cb0b5faca7b5d147

yp-tools-2.11-shadow.patch

@@ -1,11 +0,0 @@
-diff -up ./src/yppasswd.c.shadow ./src/yppasswd.c
---- ./src/yppasswd.c.shadow	2010-04-21 11:24:15.000000000 +0200
-+++ ./src/yppasswd.c	2013-05-06 22:31:39.984229577 +0200
-@@ -449,6 +449,7 @@ verifypassword (struct passwd *pwd, char
- 
-   passwdlen = get_passwd_len (pwd->pw_passwd);
-   if (pwd->pw_passwd[0]
-+      && 0 != strcmp (pwd->pw_passwd, "x") /* don't check shadow passwords */
-       && !strncmp (pwd->pw_passwd, crypt (pwdstr, pwd->pw_passwd), passwdlen)
-       && uid)
-     {

yp-tools-2.12-adjunct.patch

@@ -1,14 +1,6 @@
 diff -up yp-tools-2.12/src/yppasswd.c.adjunct yp-tools-2.12/src/yppasswd.c
 --- yp-tools-2.12/src/yppasswd.c.adjunct	2012-04-23 13:17:47.000988833 +0200
 +++ yp-tools-2.12/src/yppasswd.c	2012-04-23 13:18:01.209802938 +0200
-@@ -450,6 +450,7 @@
-   passwdlen = get_passwd_len (pwd->pw_passwd);
-   if (pwd->pw_passwd[0] 
-       && 0 != strcmp (pwd->pw_passwd, "x") /* don't check shadow passwords */
-+      && 0 != strncmp (pwd->pw_passwd, "##", 2) /* don't check passwords using passwd.adjunct feature */
-       && uid)
-     {
-       char *crypted = crypt(pwdstr, pwd->pw_passwd);
 @@ -774,6 +775,7 @@
        /* We can't check the password with shadow passwords enabled. We
         * leave the checking to yppasswdd */

yp-tools-3.3-add_mapv4v6addr.h.patch

@@ -1,85 +0,0 @@
-diff -ruN yp-tools-3.3/nss_nis6/mapv4v6addr.h yp-tools-3.3-new/nss_nis6/mapv4v6addr.h
---- yp-tools-3.3/nss_nis6/mapv4v6addr.h	1970-01-01 01:00:00.000000000 +0100
-+++ yp-tools-3.3-new/nss_nis6/mapv4v6addr.h	2014-12-17 16:42:58.983438634 +0100
-@@ -0,0 +1,69 @@
-+/*
-+ * ++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--
-+ */
-+
-+#include <string.h>
-+#include <arpa/nameser.h>
-+
-+static void
-+map_v4v6_address (const char *src, char *dst)
-+{
-+  u_char *p = (u_char *) dst;
-+  int i;
-+
-+  /* Move the IPv4 part to the right position.  */
-+  memcpy (dst + 12, src, INADDRSZ);
-+
-+  /* Mark this ipv6 addr as a mapped ipv4. */
-+  for (i = 0; i < 10; i++)
-+    *p++ = 0x00;
-+  *p++ = 0xff;
-+  *p = 0xff;
-+}
-diff -ruN yp-tools-3.3/nss_nis6/nis-hosts.c yp-tools-3.3-new/nss_nis6/nis-hosts.c
---- yp-tools-3.3/nss_nis6/nis-hosts.c	2014-10-29 15:28:02.000000000 +0100
-+++ yp-tools-3.3-new/nss_nis6/nis-hosts.c	2014-12-17 16:43:46.308339552 +0100
-@@ -36,7 +36,7 @@
- #include "nss-nis6.h"
- 
- /* Get implementation for some internal functions. */
--#include <resolv/mapv4v6addr.h>
-+#include <mapv4v6addr.h>
- 
- #define ENTNAME         hostent
- #define DATABASE        "hosts"

yp-tools-3.3-headers.patch

@@ -1,16 +0,0 @@
-diff -rup yp-tools-3.3-orig/lib/yp_xdr.c yp-tools-3.3/lib/yp_xdr.c
---- yp-tools-3.3-orig/lib/yp_xdr.c	2014-10-31 14:00:08.000000000 +0100
-+++ yp-tools-3.3/lib/yp_xdr.c	2015-04-15 15:53:29.854511186 +0200
-@@ -45,9 +45,9 @@
- #define XDRMAXRECORD (16 * 1024 * 1024)
- 
- bool_t
--xdr_ypstat (XDR *xdrs, ypstat *objp)
-+xdr_ypstat (XDR *xdrs, enum ypbind_resptype * __objp)
- {
--  return xdr_enum (xdrs, (enum_t *) objp);
-+  return xdr_enum (xdrs, (enum_t *) __objp);
- }
- 
- bool_t
-Only in yp-tools-3.3/lib: .yp_xdr.c.swp

yp-tools.spec

@@ -1,18 +1,14 @@
 Summary: NIS (or YP) client programs
 Name: yp-tools
-Version: 4.2.2
+Version: 4.2.3
-Release: 7%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
-Source: http://www.linux-nis.org/download/yp-tools/yp-tools-yp-tools-%{version}.tar.gz
+Source: https://github.com/thkukuk/yp-tools/archive/v%{version}.tar.gz
-# Not sent to upstream
+Patch1: yp-tools-2.12-hash.patch
-Patch0: yp-tools-2.11-shadow.patch
+Patch2: yp-tools-2.12-crypt.patch
-Patch3: yp-tools-2.12-hash.patch
+Patch3: yp-tools-2.12-adjunct.patch
-Patch4: yp-tools-2.12-crypt.patch
+Patch4: yp-tools-4.2.2-strict-prototypes.patch
-Patch5: yp-tools-2.12-adjunct.patch
-Patch6: yp-tools-3.3-add_mapv4v6addr.h.patch
-Patch7: yp-tools-3.3-headers.patch
-Patch8: yp-tools-4.2.2-strict-prototypes.patch
 Url: http://www.linux-nis.org/nis/yp-tools/index.html
 BuildRequires: autoconf, automake, gettext-devel, libtool, libtirpc-devel, libnsl2-devel
 Requires: ypbind >= 3:2.4-2
@@ -50,12 +46,11 @@ Install yp-tools-devel package for developing applications that use yp-tools
 
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
+%setup -q -n %{name}-%{version}
-#%patch0 -p1 -b .shadow
+%patch1 -p1 -b .hash
-%patch3 -p1 -b .hash
+%patch2 -p1 -b .crypt
-%patch4 -p1 -b .crypt
+%patch3 -p1 -b .adjunct
-#%patch5 -p1 -b .adjunct
+%patch4 -p1 -b .strict-prototypes
-%patch8 -p1 -b .strict-prototypes
 
 
 autoreconf -i -f -v
@@ -84,6 +79,9 @@ make DESTDIR="$RPM_BUILD_ROOT" INSTALL_PROGRAM=install install
 /var/yp/nicknames
 
 %changelog
+* Thu Apr 19 2018 Petr Kubat <pkubat@redhat.com> - 4.2.3-1
+- Update to version 4.2.3
+
 * Thu Mar 15 2018 Matej Mužila <mmuzila@redhat.com> - 4.2.2-7
 - Disable cast-function-type warning