From 236047aca7fc5ebb80ddd7d6359f9f2e50c25de8 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 10 May 2022 03:01:47 -0400
Subject: [PATCH] import ypserv-4.1-1.el8

---
 .gitignore                       |  2 +-
 .ypserv.metadata                 |  2 +-
 SOURCES/ypserv-4.0-oldaddr.patch | 12 ------------
 SPECS/ypserv.spec                | 19 ++++++++-----------
 4 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 SOURCES/ypserv-4.0-oldaddr.patch

diff --git a/.gitignore b/.gitignore
index 13c7062..1513fba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/ypserv-5bfba76.tar.gz
+SOURCES/v4.1.tar.gz
diff --git a/.ypserv.metadata b/.ypserv.metadata
index 44d321f..a65c9e4 100644
--- a/.ypserv.metadata
+++ b/.ypserv.metadata
@@ -1 +1 @@
-d789e46627d62e08663bbcade57af44317259120 SOURCES/ypserv-5bfba76.tar.gz
+2778d0a8d83c2bffe443541fc25bf359dfe5c777 SOURCES/v4.1.tar.gz
diff --git a/SOURCES/ypserv-4.0-oldaddr.patch b/SOURCES/ypserv-4.0-oldaddr.patch
deleted file mode 100644
index 448b675..0000000
--- a/SOURCES/ypserv-4.0-oldaddr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ypserv-5bfba760283060087aefeb417342bcc66d349b2e/lib/access.c.oldaddr	2017-04-07 13:23:34.403404792 +0200
-+++ ypserv-5bfba760283060087aefeb417342bcc66d349b2e/lib/access.c	2017-04-07 13:32:07.315466530 +0200
-@@ -151,6 +151,9 @@ copy_netbuf (struct netbuf *src)
- static int
- cmp_netbuf (struct netbuf *nbuf1, struct netbuf *nbuf2)
- {
-+  if (nbuf1 == NULL || nbuf2 == NULL)
-+    return 1;
-+
-   if (nbuf1->len != nbuf2->len)
-     return 1;
- 
diff --git a/SPECS/ypserv.spec b/SPECS/ypserv.spec
index ab202f3..f122061 100644
--- a/SPECS/ypserv.spec
+++ b/SPECS/ypserv.spec
@@ -1,18 +1,13 @@
  %global first_tc_version 2.29-2
 
-%global commit0 5bfba760283060087aefeb417342bcc66d349b2e
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-
 Summary: The NIS (Network Information Service) server
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
-Version: 4.0
-Release: 6.20170331git%{shortcommit0}%{?dist}
+Version: 4.1
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
-#Source0: http://www.linux-nis.org/download/ypserv/ypserv-%{version}.tar.bz2
-#Source0: https://github.com/thkukuk/ypserv/archive/ypserv-%{version}.tar.gz#/ypserv-ypserv-%{version}.tar.gz
-Source0: https://github.com/thkukuk/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
+Source0: https://github.com/thkukuk/%{name}/archive/v%{version}.tar.gz
 Source1: ypserv.service
 Source2: yppasswdd.service
 Source3: ypxfrd.service
@@ -40,7 +35,6 @@ Patch9: ypserv-2.29-relro.patch
 Patch10: ypserv-2.31-netgrprecur.patch
 Patch11: ypserv-2.32-systemdso.patch
 Patch12: ypserv-4.0-headers.patch
-Patch13: ypserv-4.0-oldaddr.patch
 
 BuildRequires: tokyocabinet-devel
 BuildRequires: systemd
@@ -69,7 +63,7 @@ machines.
 
 %prep
 
-%setup -n %{name}-%{commit0}
+%setup -q
 
 %patch0 -p1 -b .redhat
 #%patch1 -p1 -b .path
@@ -84,7 +78,6 @@ machines.
 %patch10 -p1 -b .netgrprecur
 #%patch11 -p1 -b .systemdso
 %patch12  -b .headers
-%patch13 -p1 -b .oldaddr
 
 autoreconf -i
 
@@ -246,6 +239,10 @@ fi
 %{_includedir}/rpcsvc
 
 %changelog
+* Tue Jun 29 2021 Filip Januš <fjanus@redhat.com> - 4.1-1
+- Update to v4.1
+- Resolves: #1974925
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-6.20170331git5bfba76
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild