From feb6de6078c30e7c8be9eb8d7cae53efa69e7752 Mon Sep 17 00:00:00 2001
From: Matej Muzila <mmuzila@redhat.com>
Date: Fri, 19 May 2017 16:38:24 +0200
Subject: [PATCH] Update to version 2.4 supporting IPv6

---
 .gitignore                       |  1 +
 sources                          |  2 +-
 ypbind-2.4-gettext_version.patch | 10 ++++++++++
 ypbind.spec                      | 22 ++++++++++++++++------
 4 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 ypbind-2.4-gettext_version.patch

diff --git a/.gitignore b/.gitignore
index 9c9c6d6..fa15382 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ ypbind-mt-1.32.tar.bz2
 /ypbind-mt-1.37.1.tar.bz2
 /ypbind-mt-1.37.2.tar.bz2
 /ypbind-mt-1.38.tar.bz2
+/ypbind-mt-2.4.tar.gz
diff --git a/sources b/sources
index fe5d1ea..6cd83d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-094088c0e282fa7f3b3dd6cc51d0a4e1  ypbind-mt-1.38.tar.bz2
+SHA512 (ypbind-mt-2.4.tar.gz) = 6665aa9e80d036fa0b9a585abe30a992f1a2f4640c69a7f2ed65ffc7f22dd6a31ebd022f8214fbd816e7a06605fa1e0f639e010bfd0f61b91c87d6851dafcb7b
diff --git a/ypbind-2.4-gettext_version.patch b/ypbind-2.4-gettext_version.patch
new file mode 100644
index 0000000..c8a520d
--- /dev/null
+++ b/ypbind-2.4-gettext_version.patch
@@ -0,0 +1,10 @@
+--- configure.ac.gettext_version	2016-03-02 15:10:26.000000000 +0100
++++ configure.ac	2017-02-15 13:39:12.295019148 +0100
+@@ -59,7 +60,6 @@ JH_CHECK_XML_CATALOG([http://docbook.sou
+ AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno)
+ 
+ dnl internationalization macros
+-AM_GNU_GETTEXT_VERSION
+ AM_GNU_GETTEXT([external])
+ 
+ AC_OUTPUT(Makefile lib/Makefile src/Makefile man/Makefile po/Makefile.in)
diff --git a/ypbind.spec b/ypbind.spec
index f4031f3..3eacb33 100644
--- a/ypbind.spec
+++ b/ypbind.spec
@@ -1,11 +1,11 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Epoch: 3
-Version: 1.38
-Release: 7%{?dist}
+Version: 2.4
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
-Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2
+Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.gz
 Url: http://www.linux-nis.org/nis/ypbind-mt/index.html
 #Source1: ypbind.init
 Source2: nis.sh
@@ -18,6 +18,7 @@ Patch1: ypbind-1.11-gettextdomain.patch
 # Not sent to upstream.
 Patch2: ypbind-helpman.patch
 Patch3: ypbind-systemdso.patch
+Patch4: ypbind-2.4-gettext_version.patch
 # This is for /bin/systemctl
 Requires(post): systemd
 Requires(preun): systemd
@@ -30,6 +31,8 @@ BuildRequires: systemd
 BuildRequires: systemd-devel
 BuildRequires: autoconf, automake
 BuildRequires: gettext-devel
+BuildRequires: libtirpc-devel
+BuildRequires: libnsl2-devel
 
 %description
 The Network Information Service (NIS) is a system that provides
@@ -51,8 +54,9 @@ also need to install the ypserv package to a machine on your network.
 %prep
 %setup -q -n ypbind-mt-%{version}
 %patch1 -p1 -b .gettextdomain
-%patch2 -p1 -b .helpman
-%patch3 -p1 -b .systemdso
+#%patch2 -p1 -b .helpman
+#%patch3 -p1 -b .systemdso
+%patch4 -b .gettext_version
 
 autoreconf -fiv
 
@@ -63,7 +67,10 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export CFLAGS="$RPM_OPT_FLAGS -fpic"
 %endif
 export LDFLAGS="$LDFLAGS -pie -Wl,-z,relro,-z,now"
-%configure --enable-dbus-nm
+
+#export CFLAGS="$CFLAGS -H"
+
+%configure
 make
 
 %install
@@ -102,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind
 %license COPYING
 
 %changelog
+* Fri May 19 2017 Matej Mužila <mmuzila@gmail.com> - 3:2.4-1
+- Update to version 2.4 supporting IPv6
+
 * Wed Nov 23 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 3:1.38-7
 - Remove check for libsystemd-daemon from ypbind-systemdso.patch (RHBZ#1396893).
 - Add check for systemd/sd-daemon.h to ypbind-systemdso.patch.