Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.cvsignore

@@ -1,2 +0,0 @@
-ypbind-mt-1.19.tar.bz2
-ypbind-mt-1.20.4.tar.bz2

.gitignore

@@ -0,0 +1,11 @@
+ypbind-mt-1.32.tar.bz2
+/ypbind-mt-1.33.tar.bz2
+/ypbind-mt-1.35.tar.bz2
+/ypbind-mt-1.36.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
+/ypbind-mt-2.5.tar.gz
+/ypbind-mt-2.6.1.tar.gz
+/ypbind-mt-2.7.2.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ypbind
-# $Id: Makefile,v 1.1 2004/09/09 15:12:10 cvsdist Exp $
-NAME := ypbind
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

nis.sh

@@ -19,79 +19,86 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author(s): David Cantrell <dcantrell@redhat.com>
-#
 
 CONF=/etc/yp.conf
+SAVECONF=${SAVEDIR}/${CONF##*/}.predhclient.${interface}
+
+fix_context() {
+    if [ -x /sbin/restorecon ]; then
+        /sbin/restorecon ${1} >/dev/null 2>&1
+    fi
+}
 
 save_config_file() {
-    origfile="${1}"
-    savefile="${SAVEDIR}/${origfile##*/}.predhclient.${interface}"
-
     if [ ! -d ${SAVEDIR} ]; then
         mkdir -p ${SAVEDIR}
     fi
 
-    if [ -e ${origfile} ]; then
+    if [ -e ${CONF} ]; then
-        mv ${origfile} ${savefile}
+        # cp+rm instead of mv: preserve SELinux context
+        # rhbz#509240
+        # Do not rely on restorecon.
+        cp -c ${CONF} ${SAVECONF}
+        rm ${CONF}
     else
-        echo > ${savefile}
+        echo > ${SAVECONF}
+        # Try restorecon
+        fix_context ${SAVECONF}
     fi
-
-    restorecon ${savefile} >/dev/null 2>&1
 }
 
 nis_config() {
     if [ ! "${PEERNIS}" = "no" ]; then
         if [ -n "${new_nis_domain}" ]; then
             domainname "${new_nis_domain}"
-            save_config_file ${CONF}
+            save_config_file
-            let contents=0
             echo '# generated by /sbin/dhclient-script' > ${CONF}
+            fix_context ${CONF}
 
             if [ -n "${new_nis_servers}" ]; then
                 for i in ${new_nis_servers} ; do
                     echo "domain ${new_nis_domain} server ${i}" >> ${CONF}
-                    let contents=contents+1
                 done
             else
                 echo "domain ${new_nis_domain} broadcast" >> ${CONF}
-                let contents=contents+1
             fi
 
-            if [ ${contents} -gt 0 ]; then
-                if [ -x /etc/rc.d/init.d/ypbind ] &&
-                   [ -r /var/run/ypbind.pid ]; then
-                    service ypbind restart >/dev/null 2>&1
-                fi
-            fi
         elif [ -n "${new_nis_servers}" ]; then
-            save_config_file ${CONF}
+            save_config_file
             echo '# generated by /sbin/dhclient-script' > ${CONF}
-            let contents=0
+            fix_context ${CONF}
 
             for i in ${new_nis_servers} ; do
                 echo "ypserver ${i}" >> ${CONF}
-                let contents=contents+1
             done
 
-            if [ $contents -gt 0 ]; then
-                if [ -x /etc/rc.d/init.d/ypbind ] &&
-                   [ -r /var/run/ypbind.pid ]; then
-                    service ypbind restart >/dev/null 2>&1
-                fi
         fi
+
+		# dimainname or servers changed, restart ypbind
+		if [ "${old_nis_domain}" != "${new_nis_domain}" ] \
+			|| [ "${old_nis_servers}" != "${new_nis_servers}" ] 
+		then
+                service ypbind condrestart >/dev/null 2>&1
 		fi
     fi
 }
 
 nis_restore() {
     if [ ! "${PEERNIS}" = "no" ]; then
-        if [ -f ${SAVEDIR}/${CONF}.predhclient.${interface} ]; then
+        if [ -f ${SAVECONF} ]; then
             rm -f ${CONF}
-            mv -f ${SAVEDIR}/${CONF}.predhclient.${interface} ${CONF}
+            # cp+rm instead of mv: preserve SELinux context
-            if [ -x /etc/rc.d/init.d/ypbind ] && [ -r /var/run/ypbind.pid ]; then
+            # rhbz#509240
-                service ypbind restart >/dev/null 2>&1
+            cp -c ${SAVECONF} ${CONF}
-            fi
+            rm ${SAVECONF}
+            fix_context ${CONF} # Restorecon again to be sure.
+            service ypbind condrestart >/dev/null 2>&1
         fi
     fi
 }
+
+# Local Variables:
+# indent-tabs-mode: nil
+# sh-basic-offset: 4
+# show-trailing-whitespace: t
+# End:

sources

@@ -1 +1 @@
-266d2fb625d5511c4c5cc54a03bea00a  ypbind-mt-1.20.4.tar.bz2
+SHA512 (ypbind-mt-2.7.2.tar.gz) = 415013ea003bb3d6162b1dac76462d13d1264a2a0dd3c4de057cf7239b9706a76d1f14ee1e3dcfba697aa48e25e3a972772c8210d87bbf847344e4a6c708a5b4

ypbind-1.11-broadcast.patch

@@ -1,25 +0,0 @@
---- ypbind-mt-1.11/src/ypbind-mt.c.broadcast	Tue Jun 11 06:50:48 2002
-+++ ypbind-mt-1.11/src/ypbind-mt.c	Tue Jun 11 06:54:34 2002
-@@ -545,19 +545,9 @@
-       exit (1);
-     }
- 
--  if (!use_broadcast)
--    {
--      if (load_config (0) != 0)
--	{
--	  fputs (_("No NIS server and no -broadcast option specified.\n"), stderr);
--	  fprintf (stderr,
--		   _("Add a NIS server to the %s configuration file,\n"),
--		   configfile);
--	  fputs (_("or start ypbind with the -broadcast option.\n"), stderr);
--	  exit (1);
--	}
--    }
--  else
-+  if (!use_broadcast && (load_config (0) != 0))
-+    use_broadcast = 1;
-+  if (use_broadcast)
-     add_server (domain, NULL, 0);
- 
-   unlink_bindingdir ();

ypbind-1.11-gettextdomain.patch

@@ -1,5 +1,6 @@
---- ypbind-mt-1.11/po/Makevars.fixit	Tue Jun 11 07:19:05 2002
+diff -up ./po/Makevars.gettextdomain ./po/Makevars
-+++ ypbind-mt-1.11/po/Makevars	Tue Jun 11 07:19:07 2002
+--- ./po/Makevars.gettextdomain	2004-01-14 20:25:25.000000000 +0100
++++ ./po/Makevars	2013-05-06 19:07:24.961484803 +0200
 @@ -1,7 +1,7 @@
  # Makefile variables for PO directory in any package using GNU gettext.
  

ypbind-2.5-helpman.patch

@@ -0,0 +1,148 @@
+diff -up ypbind-mt-2.5/man/ypbind.8.xml.helpman ypbind-mt-2.5/man/ypbind.8.xml
+--- ypbind-mt-2.5/man/ypbind.8.xml.helpman	2018-06-04 15:30:38.000000000 +0200
++++ ypbind-mt-2.5/man/ypbind.8.xml	2018-06-07 16:16:56.967024495 +0200
+@@ -39,21 +39,33 @@
+   <refsynopsisdiv id='synopsis'>
+   <cmdsynopsis>
+     <command>ypbind</command>
+-      <arg choice='opt'>-c </arg>
+-      <group choice='opt'><arg choice='plain'>-d </arg><arg choice='plain'>-debug </arg></group>
+-      <arg choice='opt'>-verbose </arg>
+-      <group choice='opt'><arg choice='plain'>-n </arg><arg choice='plain'>-forground </arg></group>
+-      <arg choice='opt'>-broadcast </arg>
+-      <arg choice='opt'>-broken-server </arg>
+-      <arg choice='opt'>-ypset </arg>
+-      <arg choice='opt'>-ypsetme </arg>
+-      <arg choice='opt'>-no-ping </arg>
++      <group choice='opt'>
++          <arg choice='plain'>-broadcast </arg>
++          <arg choice='plain'>-ypset </arg>
++          <arg choice='plain'>-ypsetme </arg>
++      </group>
+       <arg choice='opt'>-f <replaceable>configfile</replaceable></arg>
++      <arg choice='opt'>-no-ping </arg>
++      <arg choice='opt'>-broken-server </arg>
+       <arg choice='opt'>-local-only </arg>
+-      <arg choice='opt'>-ping-interval <replaceable>ping-interval</replaceable></arg>
++
++      <group choice='opt'>
++          <arg choice='plain'>-ping-interval <replaceable>ping-interval</replaceable></arg>
++          <arg choice='plain'>-i <replaceable>ping-interval</replaceable></arg>
++      </group>
++
++      <group choice='opt'><arg choice='plain'>-d </arg><arg choice='plain'>-debug </arg></group>
++      <group choice='opt'><arg choice='plain'>-v </arg><arg choice='plain'>-verbose </arg></group>
++      <group choice='opt'><arg choice='plain'>-n </arg><arg choice='plain'>-foreground </arg></group>
++      <arg choice='opt'>-p <replaceable>port</replaceable></arg>
+   </cmdsynopsis>
+   <cmdsynopsis>
+     <command>ypbind</command>
++      <arg choice='plain'>-c </arg>
++      <arg choice='opt'>-f <replaceable>configfile</replaceable></arg>
++    </cmdsynopsis>
++  <cmdsynopsis>
++    <command>ypbind</command>
+       <arg choice='plain'>--version </arg>
+     </cmdsynopsis>
+   </refsynopsisdiv>
+@@ -88,6 +100,8 @@
+ 
+     <para>Unless the option
+ <option>-debug</option>
++or
++<option>-foreground</option>
+ is used, ypbind detaches itself from the controlling terminal and puts
+ itself into background.
+ <command>ypbind</command>
+@@ -132,6 +146,57 @@ If the file does not exist or if there a
+ <command>ypbind</command>
+ exit.</para>
+ 
++<para>
++In Fedora we use systemd for starting services. We need to finish starting
++process of <command>ypbind</command> service not before service is fully
++started, which means <command>ypbind</command> daemon is prepared to answer.
++There is a test script <filename>/usr/libexec/ypbind-post-waitbind</filename>
++used in ypbind.service, that waits for <command>ypbind</command> daemon to be
++fully connected to NIS server and waits by default up to 45s.  Sometimes this
++is not enough, because network set up can take longer than 45s during boot, so
++starting ypbind.service fails. User can increase the timeout by setting an
++environment variable NISTIMEOUT in <filename>/etc/sysconfig/ypbind</filename>.
++For example NISTIMEOUT=180 means <command>ypbind</command> will wait up to 180
++seconds for binding to a NIS server.  Another option is to enable
++NetworkManager-wait- online.service, which will make <command>ypbind</command>
++to wait until network is properly set up.
++</para>
++
++<para>
++In case something needs to be changed in the ypbind.service, it is adviced not
++to change the ypbind.service directly, but rather to create a new file under
++<filename>/etc/systemd/system/ypbind.service.d/</filename>, i.e. if we need to
++start <command>ypbind</command> before service foo.service, we can create file
++<filename>/etc/systemd/system/ypbind.service.d/wait-foo.conf</filename> with
++the following content:
++</para>
++
++<para>
++<programlisting>
++[Service]
++Before=foo.service
++</programlisting>
++</para>
++<para>
++If you need to pass other arguments to <command>ypbind</command> daemon withing
++systemd unit file, you can set these arguments as OTHER_YPBIND_OPTS environment
++variable in <filename>/etc/sysconfig/ypbind</filename>. For example in order to
++set a fixed port <command>ypbind</command> should run on, you can specify
++OTHER_YPBIND_OPTS="-p 876" in <filename>/etc/sysconfig/ypbind</filename>.
++</para>
++
++<para>
++DHCP client by defualt changes <filename>/etc/yp.conf</filename> in case DHCP
++server sends NIS configuration in the respond. In that case
++<filename>/etc/dhcp/dhclient.d/nis.sh</filename> changes
++<filename>/etc/yp.conf</filename> according such configuration and creates a
++back-up copy of the original configuration file into
++<filename>/var/lib/dhclient/nis.conf.predhclient.$interface</filename>.  In
++order to disable changing <filename>/etc/yp.conf</filename> by DHCP client, add
++PEERNIS=no into <filename>/etc/sysconfig/network</filename>.
++</para>
++
++
+   </refsect1>
+ 
+   <refsect1 id='options'>
+@@ -256,6 +321,15 @@ With this options another frequency in s
+   </listitem>
+   </varlistentry>
+   <varlistentry>
++  <term><option>-p</option> port</term>
++  <listitem>
++<para>Lets
++<command>ypbind</command>
++listen on a specified port number, rather than asking portmapper to assingn a
++port for it.</para>
++  </listitem>
++  </varlistentry>
++  <varlistentry>
+   <term><option>--version</option></term>
+   <listitem>
+ <para>Prints the version number</para>
+diff -up ypbind-mt-2.5/man/yp.conf.5.xml.helpman ypbind-mt-2.5/man/yp.conf.5.xml
+--- ypbind-mt-2.5/man/yp.conf.5.xml.helpman	2018-06-07 16:29:01.853560699 +0200
++++ ypbind-mt-2.5/man/yp.conf.5.xml	2018-06-07 16:33:59.302833043 +0200
+@@ -97,6 +97,14 @@
+       first the given servers before falling back to broadcasting
+       for a running server.
+     </para>
++    <para>
++      Content of <filename>/etc/yp.conf</filename> can be changed by DHCP client,
++      for more info see
++      <citerefentry>
++          <refentrytitle>ypbind</refentrytitle>
++          <manvolnum>8</manvolnum>
++      </citerefentry>.
++    </para>
+   </refsect1>
+ 
+   <refsect1 id='see_also'>

ypbind-mt-1.19-port-leak.patch

@@ -1,53 +0,0 @@
---- ypbind-mt-1.19/src/serv_list.c.orig	2005-07-02 05:24:15.000000000 -0400
-+++ ypbind-mt-1.19/src/serv_list.c	2006-11-30 11:41:06.000000000 -0500
-@@ -1043,6 +1043,7 @@ int
- test_bindings_once (int lastcheck, const char *req_domain)
- {
-   int i;
-+  int active;
- 
-   /* Since we need the write lock later, getting the read lock here is
-      not enough. During the time, where we wait for the write lock, the
-@@ -1070,7 +1071,8 @@ test_bindings_once (int lastcheck, const
- 		     req_domain, domain);
- 	  continue;
- 	}
--
-+retry:
-+      active = domainlist[i].active;
-       /* We should never run into this. For debugging.  */
-       if (domainlist[i].client_handle == NULL && domainlist[i].active != -1)
- 	{
-@@ -1153,9 +1155,14 @@ test_bindings_once (int lastcheck, const
- 		 the write lock again. */
- 	      pthread_rdwr_wunlock_np (&domainlock);
- 	      pthread_mutex_lock (&search_lock);
--	      if (!ping_all (&domainlist[i]) &&
--		  domainlist[i].use_broadcast)
--		do_broadcast (&domainlist[i]);
-+	      /* Make sure the active has not changed while we
-+	         were sleeping. If it has, just punt on this for now */
-+	      if (domainlist[i].active == -1)
-+	        {
-+	      		if (!ping_all (&domainlist[i]) &&
-+		  				domainlist[i].use_broadcast)
-+						do_broadcast (&domainlist[i]);
-+		    }
- 	      pthread_mutex_unlock (&search_lock);
- 	      pthread_rdwr_wlock_np (&domainlock);
- 	    }
-@@ -1166,6 +1173,14 @@ test_bindings_once (int lastcheck, const
- 	     server */
- 	  pthread_rdwr_wunlock_np (&domainlock);
- 	  pthread_mutex_lock (&search_lock);
-+	  /* see if the active state has change while we were 
-+	     sleeping. If so start again */
-+	  if (active != domainlist[i].active)
-+	    {
-+	       pthread_mutex_unlock (&search_lock);
-+	       pthread_rdwr_wlock_np (&domainlock);
-+	       goto retry;
-+	    }
- 	  if (!ping_all (&domainlist[i]) && domainlist[i].use_broadcast)
- 	    do_broadcast (&domainlist[i]);
- 	  pthread_mutex_unlock (&search_lock);

ypbind-mt-1.20.4-log-binds.patch

@@ -1,178 +0,0 @@
-diff -up ypbind-mt-1.20.4/man/ypbind.8.log-binds ypbind-mt-1.20.4/man/ypbind.8
---- ypbind-mt-1.20.4/man/ypbind.8.log-binds	2006-10-04 17:26:33.000000000 +0200
-+++ ypbind-mt-1.20.4/man/ypbind.8	2008-12-03 13:59:23.000000000 +0100
-@@ -14,7 +14,7 @@
- ypbind \- NIS binding process
- .SH "SYNOPSIS"
- .HP 7
--\fBypbind\fR [\-c] [\-d | \-debug] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-no\-dbus]
-+\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-no\-dbus]
- .HP 7
- \fBypbind\fR \-\-version
- .SH "DESCRIPTION"
-@@ -122,6 +122,11 @@ in debug mode.
- \fBypbind\fR
- will not put itself into background, and error messages and debug output are written to standard error.
- .TP 3n
-+\fB\-verbose\fR
-+Causes
-+\fBypbind\fR
-+to syslog(2) any and all changes in the server its bound to.
-+.TP 3n
- \fB\-broken\-server\fR
- lets
- \fBypbind\fR
-diff -up ypbind-mt-1.20.4/src/serv_list.c.log-binds ypbind-mt-1.20.4/src/serv_list.c
---- ypbind-mt-1.20.4/src/serv_list.c.log-binds	2008-12-03 13:51:05.000000000 +0100
-+++ ypbind-mt-1.20.4/src/serv_list.c	2008-12-03 13:51:05.000000000 +0100
-@@ -50,6 +50,8 @@
- #include "local.h"
- #include "pthread_np.h"
- 
-+extern int verbose_flag;
-+
- #if (defined(__sun__) || defined(sun)) && defined(__svr4__)
- typedef uint32_t u_int32_t;
- #endif
-@@ -80,6 +82,22 @@ struct binding
-   struct bound_server ypset;
-   CLIENT *client_handle;
- };
-+static inline char *
-+bound_host(struct binding *bptr)
-+{
-+  struct bound_server *sptr;
-+
-+  if (bptr->active >= 0)
-+  	sptr = &bptr->server[bptr->active];
-+  else if (bptr->active == -2)
-+  	sptr = &bptr->ypset;
-+  else
-+  	return "Unknown Host";
-+
-+  if (sptr->host != NULL)
-+  	return(sptr->host);
-+  return (inet_ntoa(sptr->addr));
-+}
- 
- static struct binding *domainlist = NULL;
- static int max_domains = 0;
-@@ -224,6 +242,12 @@ change_binding (const char *domain, ypbi
- 	  pthread_rdwr_rlock_np (&domainlock);
- 	  update_bindingfile (&domainlist[i]);
- 	  pthread_rdwr_runlock_np (&domainlock);
-+	  if (verbose_flag)
-+	    {
-+	      log_msg (LOG_NOTICE, "NIS server set to '%s'" 
-+		" for domain '%s'",
-+	        bound_host(&domainlist[i]), domainlist[i].domain);
-+	    }
- 
- 	  return;
- 	}
-@@ -797,6 +821,10 @@ ping_all (struct binding *list)
-       list->server[i].port = s_in.sin_port;
-       if (s_in.sin_port == 0)
- 	{
-+	  if (verbose_flag && list->active == i)
-+		log_msg (LOG_NOTICE, "NIS server '%s' not repsonding "
-+		    "for domain '%s'", list->server[i].host, list->domain);
-+		
- 	  if (debug_flag)
- 	    log_msg (LOG_DEBUG, _("host '%s' doesn't answer."),
- 		     list->server[i].host);
-@@ -1001,13 +1029,21 @@ ping_all (struct binding *list)
- void
- do_binding (void)
- {
--  int i;
-+  int i, active;
- 
-   pthread_mutex_lock (&search_lock);
-   for (i = 0; i < max_domains; ++i)
-     {
-+	  if (verbose_flag)
-+	     active = domainlist[i].active;
-       if (!ping_all (&domainlist[i]) && domainlist[i].use_broadcast)
- 	do_broadcast (&domainlist[i]);
-+      if (verbose_flag && 
-+		domainlist[i].active >= 0 && active != domainlist[i].active) 
-+	{
-+		log_msg (LOG_NOTICE, "NIS server is '%s' for domain '%s'",
-+		    bound_host(&domainlist[i]), domainlist[i].domain);
-+    	}
-     }
-   pthread_mutex_unlock (&search_lock);
- }
-@@ -1038,7 +1074,8 @@ test_bindings (void *param __attribute__
- 	pthread_exit (&success);
- 
-       lastcheck += ping_interval;
--      if (lastcheck >= 900) /* 900 = 15min. */
-+      //if (lastcheck >= 900) /* 900 = 15min. */
-+      if (lastcheck >= 60) /* 900 = 15min. */
- 	lastcheck = 0;
- 
- #if USE_DBUS_NM
-@@ -1091,6 +1128,7 @@ retry:
- 	  domainlist[i].active = -1;
- 	}
- 
-+      active = domainlist[i].active;
-       if (domainlist[i].active != -1)
- 	{
- 	  /* The binding is in use, check if it is still valid and
-@@ -1107,6 +1145,10 @@ retry:
- 			  YPPROC_DOMAIN, (xdrproc_t) ypbind_xdr_domainname,
- 			  (caddr_t) &domain, (xdrproc_t) xdr_bool,
- 			  (caddr_t) &out, time_out);
-+		if (verbose_flag && status != RPC_SUCCESS)
-+			log_msg (LOG_NOTICE, "NIS server '%s' not responding"
-+			" for domain '%s'", bound_host(&domainlist[i]),
-+			domainlist[i].domain);
- 	    }
- 
- 	  /* time to search a new fastest server, but only if the current
-@@ -1196,6 +1238,12 @@ retry:
- 	  pthread_mutex_unlock (&search_lock);
- 	  pthread_rdwr_wlock_np (&domainlock);
- 	}
-+      if (verbose_flag && 
-+          domainlist[i].active >= 0 && active != domainlist[i].active)
-+	{
-+	  log_msg (LOG_NOTICE, "NIS server is '%s' for domain '%s'",
-+	      bound_host(&domainlist[i]), domainlist[i].domain);
-+	}
-     } /* end for () all domains */
- 
-   pthread_rdwr_wunlock_np (&domainlock);
-diff -up ypbind-mt-1.20.4/src/ypbind-mt.c.log-binds ypbind-mt-1.20.4/src/ypbind-mt.c
---- ypbind-mt-1.20.4/src/ypbind-mt.c.log-binds	2008-12-03 13:51:05.000000000 +0100
-+++ ypbind-mt-1.20.4/src/ypbind-mt.c	2008-12-03 13:51:05.000000000 +0100
-@@ -466,6 +466,7 @@ sig_handler (void *v_param  __attribute_
- 	}
-     }
- }
-+int verbose_flag;
- 
- static void
- usage (int ret)
-@@ -478,7 +479,7 @@ usage (int ret)
-     output = stdout;
- 
-   fputs (_("Usage:\n"), output);
--  fputs (_("\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile]\n\t  [-no-ping] [-broken-server] [-local-only] [-i ping-interval] [-debug]\n"), output);
-+  fputs (_("\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile]\n\t  [-no-ping] [-broken-server] [-local-only] [-i ping-interval] [-debug] [-verbose]\n"), output);
- #ifdef USE_DBUS_NM
-   fputs (_("\t  [-no-dbus]\n"), output);
- #endif
-@@ -656,6 +657,9 @@ main (int argc, char **argv)
-       else if (strcmp ("-d", argv[i]) == 0 ||
- 	       strcmp ("-debug", argv[i]) == 0)
-         debug_flag = 1;
-+      else if (strcmp ("-v", argv[i]) == 0 ||
-+	       strcmp ("-verbose", argv[i]) == 0)
-+        verbose_flag = 1;
-       else if (strcmp ("-broken-server", argv[i]) == 0 ||
- 	       strcmp ("-broken_server", argv[i]) == 0)
-         broken_server = 1;

ypbind-mt-1.20.4-man-port.patch

@@ -1,26 +0,0 @@
-diff -up ypbind-mt-1.20.4/man/ypbind.8_old ypbind-mt-1.20.4/man/ypbind.8
---- ypbind-mt-1.20.4/man/ypbind.8_old	2008-12-03 14:13:46.000000000 +0100
-+++ ypbind-mt-1.20.4/man/ypbind.8	2008-12-03 14:15:56.000000000 +0100
-@@ -14,7 +14,7 @@
- ypbind \- NIS binding process
- .SH "SYNOPSIS"
- .HP 7
--\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-no\-dbus]
-+\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-p \fIport\fR] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-no\-dbus]
- .HP 7
- \fBypbind\fR \-\-version
- .SH "DESCRIPTION"
-@@ -140,6 +140,13 @@ will not check if the binding is alive. 
- \fBypbind\fR
- from keeping the connection unnessecarily open or causing autodials.
- .TP 3n
-+\fB\-p\fR port
-+\fBypbind\fR
-+will bind itself to this port.
-+This makes it possible to have a router filter packets
-+to the NIS ports, so that access to this service from
-+hosts on the Internet can be restricted.
-+.TP 3n
- \fB\-f\fR configfile
- \fBypbind\fR
- will use

ypbind-mt-1.20.4-nm.patch

@@ -1,44 +0,0 @@
-diff -up ypbind-mt-1.20.4/src/ypbind_dbus_nm.c.nm ypbind-mt-1.20.4/src/ypbind_dbus_nm.c
---- ypbind-mt-1.20.4/src/ypbind_dbus_nm.c.nm	2007-02-14 14:01:57.000000000 +0100
-+++ ypbind-mt-1.20.4/src/ypbind_dbus_nm.c	2009-01-26 16:05:58.000000000 +0100
-@@ -320,13 +320,13 @@ dbus_init (void)
-       if (check_online (connection) == 1)
- 	{
- 	  if (debug_flag)
--	    log_msg (LOG_DEBUG, "Are already online");
--	  is_online = 1;
-+	    log_msg (LOG_DEBUG, "Network is available now");
-+	  go_online();
- 	}
-       else
- 	{
- 	  if (debug_flag)
--	    log_msg (LOG_DEBUG, "Are offline");
-+	    log_msg (LOG_DEBUG, "No network is available now");
- 	  is_online = 0;
- 	}
-       return 1;
-diff -up ypbind-mt-1.20.4/src/ypbind-mt.c.nm ypbind-mt-1.20.4/src/ypbind-mt.c
---- ypbind-mt-1.20.4/src/ypbind-mt.c.nm	2009-01-26 16:05:58.000000000 +0100
-+++ ypbind-mt-1.20.4/src/ypbind-mt.c	2009-01-26 16:05:58.000000000 +0100
-@@ -765,9 +765,17 @@ main (int argc, char **argv)
- 	       BINDINGDIR, strerror (errno));
-       exit (1);
-     }
--
--  if (!use_broadcast && (load_config (0) != 0))
--    use_broadcast = 1;
-+  /*
-+   * Load config if we're not using DBUS/NetworkManager, since we
-+   * assume the network is available now.  If we're using NetworkManager,
-+   * the config will be loaded when a network becomes available.
-+   */
-+  if (disable_dbus)
-+    {
-+      /* Load the configuration.  If the load fails, set up broadcast mode. */
-+      if (!use_broadcast && (load_config (0) != 0))
-+        use_broadcast = 1;
-+    }
-   if (use_broadcast)
-     add_server (domain, NULL, 0);
- 

ypbind-mt-1.20.4-smartwrite.patch

@@ -1,102 +0,0 @@
-diff -up ypbind-mt-1.20.4/src/serv_list.c_old ypbind-mt-1.20.4/src/serv_list.c
---- ypbind-mt-1.20.4/src/serv_list.c_old	2008-10-21 11:37:59.000000000 +0200
-+++ ypbind-mt-1.20.4/src/serv_list.c	2008-10-21 11:38:20.000000000 +0200
-@@ -81,6 +81,7 @@ struct binding
-   struct bound_server server[_MAXSERVER];
-   struct bound_server ypset;
-   CLIENT *client_handle;
-+  struct bound_server last; /* last written */
- };
- static inline char *
- bound_host(struct binding *bptr)
-@@ -133,26 +134,44 @@ update_bindingfile (struct binding *entr
-   sprintf (path1, "%s/%s.1", BINDINGDIR, entry->domain);
-   sprintf (path2, "%s/%s.2", BINDINGDIR, entry->domain);
- 
--  iov[0].iov_base = (caddr_t) &sport;
--  iov[0].iov_len = sizeof (sport);
--  iov[1].iov_base = (caddr_t) &ybres;
--  iov[1].iov_len = sizeof ybres;
--
-   memset(&ybres, 0, sizeof (ybres));
-   ybres.ypbind_status = YPBIND_SUCC_VAL;
-   if (entry->active >= 0)
-     {
-+      if (entry->last.host &&
-+          !memcmp(&entry->server[entry->active].addr, &entry->last.addr,
-+		  sizeof(struct in_addr)) &&
-+          entry->server[entry->active].port == entry->last.port)
-+        {
-+	  if (debug_flag)
-+	    log_msg (LOG_DEBUG, "Entry for %s unchanged, skipping writeout",
-+		     entry->domain);
-+          return;
-+        }
-+
-       memcpy (&ybres.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_addr,
- 	      &entry->server[entry->active].addr, sizeof (struct in_addr));
-       memcpy (&ybres.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_port,
- 	      &entry->server[entry->active].port, sizeof (unsigned short int));
-+      entry->last= entry->server[entry->active];
-     }
-   else if (entry->active == -2) /* ypset was used */
-     {
-+      if (entry->last.host &&
-+          !memcmp(&entry->ypset.addr, &entry->last.addr,
-+		  sizeof(struct in_addr)) &&
-+          entry->ypset.port == entry->last.port)
-+        {
-+	  if (debug_flag)
-+	    log_msg (LOG_DEBUG, "Entry for %s unchanged, skipping writeout",
-+		     entry->domain);
-+          return;
-+        }
-       memcpy (&ybres.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_addr,
- 	      &entry->ypset.addr, sizeof (struct in_addr));
-       memcpy (&ybres.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_port,
- 	      &entry->ypset.port, sizeof (unsigned short int));
-+      entry->last= entry->ypset;
-     }
-   else
-     {
-@@ -160,10 +179,16 @@ update_bindingfile (struct binding *entr
-           libc will query ypbind direct. */
-        unlink (path1);
-        unlink (path2);
-+       entry->last.host = NULL;
-        log_msg (LOG_ERR, "INTERNAL ERROR: update_bindingfile called without valid data!");
-        return;
-     }
- 
-+  iov[0].iov_base = (caddr_t) &sport;
-+  iov[0].iov_len = sizeof (sport);
-+  iov[1].iov_base = (caddr_t) &ybres;
-+  iov[1].iov_len = sizeof ybres;
-+
-   len = iov[0].iov_len + iov[1].iov_len;
- 
-   if ((fd = open(path1, O_CREAT | O_RDWR | O_TRUNC, FILE_MODE )) != -1)
-@@ -171,6 +196,7 @@ update_bindingfile (struct binding *entr
-       if (writev (fd, iov, 2) != len )
-         {
-           log_msg (LOG_ERR, "writev (%s): %s", path1, strerror (errno));
-+	  entry->last.host = NULL;
-           unlink (path1);
-         }
-       close (fd);
-@@ -183,6 +209,7 @@ update_bindingfile (struct binding *entr
-       if (writev (fd, iov, 2) != len )
-         {
-           log_msg (LOG_ERR, "writev (%s): %s", path2, strerror (errno));
-+	   entry->last.host = NULL;
-           unlink (path2);
-         }
-       close (fd);
-@@ -403,6 +430,7 @@ get_entry (const char *domain, struct bi
-       domainlist[max_domains - 1].ypset.host = NULL;
-       domainlist[max_domains - 1].active = (-1);
-       domainlist[max_domains - 1].use_broadcast = FALSE;
-+      domainlist[max_domains - 1].last.host = NULL;
-       memset (domainlist[max_domains - 1].server, 0,
- 	      (_MAXSERVER * sizeof (struct bound_server)));
-       *entry = &domainlist[max_domains - 1];

ypbind-post-waitbind

@@ -0,0 +1,57 @@
+#!/bin/sh
+#
+# ypbind-domain
+#
+# description: This is part of former ypbind init script, which is used 
+#              to fix problems with the init scripts continuing even when 
+#              we are really not bound yet to a server, and then things
+#              that need NIS fail.
+#
+
+# NISTIMEOUT should be a multiple of 15 since
+# ypwhich has a hardcoded 15sec timeout
+[ -z "$NISTIMEOUT" ] && NISTIMEOUT=45
+
+logger -t ypbind $"Binding NIS service"
+
+timeout=$NISTIMEOUT
+firsttime=1
+rpcbound=0
+SECONDS=0
+retval=0
+while [ $SECONDS -lt $timeout ] || [ $firsttime -eq 1 ] ; do
+firsttime=0
+if /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind
+then
+    rpcbound=1
+    /usr/bin/ypwhich > /dev/null 2>&1
+    retval=$?
+    if [ $retval -eq 0 ]; then
+	break;
+    fi
+fi
+sleep 2
+done
+
+logger -t ypbind "Binding took $SECONDS seconds"
+
+if [ $retval -eq 0 ]; then
+    if [ $rpcbound -eq 0 ]; then
+        logger -t ypbind \
+            "NIS domain: `domainname`, ypbind not registered with rpcbind."
+    else
+        logger -t ypbind \
+            "NIS domain: `domainname`, NIS server: `ypwhich 2> /dev/null`"
+    fi
+else
+    logger -t ypbind \
+        "NIS server for domain `domainname` is not responding."
+    logger -t ypbind \
+        "Killing ypbind with PID $MAINPID."
+    kill -s 15 $MAINPID || :
+    logger -t ypbind \
+        "Try increase NISTIMEOUT in /etc/sysconfig/ypbind"
+fi
+
+exit $retval
+

ypbind-pre-setdomain

@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# ypbind-domain
+#
+# description: This is part of former ypbind init script, which is used 
+#              to setup proper domainname before starting ypbind daemon 
+#              itself. If $NISDOMAIN is not defined, it reads config file. 
+#
+
+TIMEOUT=5
+DOMAINNAME=`domainname`
+if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then
+    echo -n $"Setting NIS domain: "
+    seconds=0
+    while [ $seconds -lt $TIMEOUT ]; do
+    if [ -n "$NISDOMAIN" ]; then
+        domainname $NISDOMAIN
+        echo $"'$NISDOMAIN' (environment variable)"
+        break
+    else # See if the domain is set in config file
+        NISDOMAIN=`awk '{ if ($1 == "domain") {print $2; exit} }' /etc/yp.conf`
+        if [ -n "$NISDOMAIN" ]; then
+            domainname $NISDOMAIN
+            echo $"'$NISDOMAIN' (/etc/yp.conf)"
+            break
+        else
+            seconds=$(($seconds+1))
+            sleep 1
+        fi
+    fi
+    done
+    # Give up if NISDOMAIN is still not set
+    [ -z "$NISDOMAIN" ] && logger -t ypbind $"domain not found" && exit 1
+fi
+
+#/etc/rpc check
+grep ypbind /etc/rpc > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+    logger -t ypbind $"Error: Missing ypbind entry in /etc/rpc."
+    exit 1
+fi
+
+echo 
+

ypbind.init

@@ -1,199 +0,0 @@
-#!/bin/bash
-#
-# ypbind:       Starts the ypbind Daemon
-#
-# Version:      @(#) /etc/init.d/ypbind.init 1.3
-#
-# chkconfig: - 27 73
-# description: This is a daemon which runs on NIS/YP clients and binds them \
-#              to a NIS domain. It must be running for systems based on glibc \
-#              to work as NIS clients, but it should not be enabled on systems \
-#              which are not using NIS.
-# processname: ypbind
-# config: /etc/yp.conf
-
-### BEGIN INIT INFO
-# Provides: $ypbind
-# Required-Start: $network $syslog
-# Required-Stop: $network $syslog
-# Default-Start:
-# Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: start|stop|restart|condrestart|try-restart|reload|force-reload|status NIS client
-# Description: This is a daemon which runs on NIS/YP clients and binds them to a NIS domain
-### END INIT INFO
-
-OTHER_YPBIND_OPTS=""
-
-# Source function library.
-. /etc/init.d/functions
-
-. /etc/sysconfig/network
-
-# Check for and source configuration file otherwise set defaults
-[ -f /etc/sysconfig/ypbind ] && . /etc/sysconfig/ypbind
-
-# NISTIMEOUT should be a multiple of 15 since
-# ypwhich has a hardcoded 15sec timeout
-[ -z "$NISTIMEOUT" ] && NISTIMEOUT=45
-
-# Check that networking is configured.
-[ "${NETWORKING}" = "no" ] && exit 0
-
-selinux_on() {
-        [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || return
-	#echo $"Turning on allow_ypbind SELinux boolean"
-        setsebool allow_ypbind=1
-}
-
-selinux_off() {
-        [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || return
-	allow_ypbind=0
-	.  /etc/selinux/config
-	if [ -e /etc/selinux/${SELINUXTYPE}/modules/active/booleans.local ]; then
-		. /etc/selinux/${SELINUXTYPE}/modules/active/booleans.local
-	fi
-	if [ $allow_ypbind == 0 ]; then
-		#echo $"Turning off allow_ypbind SELinux boolean"
-		setsebool allow_ypbind=$allow_ypbind
-	fi
-}
-
-start() {
-	DOMAINNAME=`domainname`
-	if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then
-		echo -n $"Setting NIS domain: "
-		if [ -n "$NISDOMAIN" ]; then
-			action $"domain is '$NISDOMAIN' " domainname $NISDOMAIN
-		else # See if the domain is set in config file
-			NISDOMAIN=`grep "domain" /etc/yp.conf | grep -v ^# | \
-				awk '{print $2}'`
-	   		if [ -n "$NISDOMAIN" ]; then
-				action $"domain is '$NISDOMAIN' " \
-					domainname $NISDOMAIN
-	   		else
-				action $"domain not found" /bin/false
-				logger -t ypbind $"domain not found"
-	        		return 1
-			fi
-		fi
-	fi
-	echo -n $"Starting NIS service: "
-	selinux_on
-	daemon ypbind $OTHER_YPBIND_OPTS
-	RETVAL=$?
-	echo
-	if [ $RETVAL -ne 0 ]; then
-	    #selinux_off
-	    logger -t ypbind "failed to start!"
-	    return $RETVAL
-	fi
-	echo -n $"Binding NIS service: "
-	# the following fixes problems with the init scripts continuing
-	# even when we are really not bound yet to a server, and then things
-	# that need NIS fail.
-	timeout=10
-	firsttime=1
-        SECONDS=0
-	while [ $SECONDS -lt $timeout ]; do
-		if /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind
-		then
-			if [ $firsttime -eq 1 ]; then
-				# reset timeout
-				timeout=$NISTIMEOUT
-				firsttime=0
-			fi
-			/usr/bin/ypwhich > /dev/null 2>&1
-		    	RETVAL=$?
-	    		if [ $RETVAL -eq 0 ]; then
-				break;
-	    		fi
-		fi
-		sleep 2
-		echo -n "."
-	done
-	if [ $RETVAL -eq 0 ]; then
-		logger -t ypbind \
-			"NIS domain: `domainname`, NIS server: `ypwhich 2> /dev/null`"
-		touch /var/lock/subsys/ypbind
-		success
-	else
-		logger -t ypbind \
-			"NIS server for domain `domainname` is not responding."
-		failure
-		#selinux_off
-		RETVAL=100
-	fi
-	echo
-	return $RETVAL
-}
-
-stop() {
-	echo -n $"Shutting down NIS service: "
-	killproc ypbind
-	RETVAL=$?
-	if [ $RETVAL -eq 0 ]; then
-		rm -f /var/lock/subsys/ypbind
-		# if  we used brute force (like kill -9) we don't want those around
-		if [ x$(domainname) != x ]; then
-			rm -f /var/yp/binding/$(domainname)*
-		fi
-	fi
-	echo
-	#selinux_off
-	return $RETVAL
-}
-
-restart() {
-	stop
-	start
-}
-
-reload() {
-	echo -n $"Reloading NIS service: "
-        p=`/sbin/pidof -o %PPID 'ypbind'`
-        RETVAL=$?
-        if [ "$RETVAL" -eq 0 ]; then
-            /bin/kill -HUP $p
-            RETVAL=$?
-        fi
-        [ "$RETVAL" -eq 0 ] && success || failure
-        echo
-        return $RETVAL
-}
-
-RETVAL=0
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	RETVAL=$?
-	if [ $RETVAL -eq 100 ]; then stop; RETVAL=1; fi
-	;;
-  stop)
-	stop
-	RETVAL=$?
-	;;
-  status)
-	status ypbind
-	RETVAL=$?
-	;;
-  restart)
-	restart
-	RETVAL=$?
-	;;
-  condrestart|try-restart)
-	if [ -e /var/lock/subsys/ypbind ]; then restart; fi
-	;;
-  reload)
-	reload
-	;;
-  force-reload)
-	if ! reload; then restart; fi
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
-	RETVAL=3
-esac
-
-exit $RETVAL

ypbind.service

@@ -0,0 +1,22 @@
+# For details how to adjust this file or change daemon settings, please, read ypbind(8).
+[Unit]
+Description=NIS/YP (Network Information Service) Clients to NIS Domain Binder
+Requires=rpcbind.service
+Wants=nss-user-lookup.target network-online.target
+After=syslog.target rpcbind.service ypserv.service
+Before=systemd-user-sessions.service
+Before=nss-user-lookup.target
+
+[Service]
+Type=notify
+NotifyAccess=all
+EnvironmentFile=-/etc/sysconfig/network
+EnvironmentFile=-/etc/sysconfig/ypbind
+ExecStartPre=/usr/libexec/ypbind-pre-setdomain
+ExecStartPre=-/bin/bash -c 'selinuxenabled && /usr/sbin/setsebool allow_ypbind=1'
+ExecStart=/usr/sbin/ypbind -n $OTHER_YPBIND_OPTS
+ExecStartPost=/usr/libexec/ypbind-post-waitbind
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target

ypbind.spec

@@ -1,31 +1,39 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
-Version: 1.20.4
-Release: 15%{?dist}
-License: GPLv2
-Group: System Environment/Daemons
-Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
-Url: http://www.linux-nis.org/nis/ypbind-mt/index.html
-Source1: ypbind.init
-Source2: nis.sh
-Patch1: ypbind-1.11-broadcast.patch
-Patch2: ypbind-1.11-gettextdomain.patch
-Patch3: ypbind-mt-1.19-port-leak.patch
-Patch4: ypbind-mt-1.20.4-log-binds.patch
-Patch5: ypbind-mt-1.20.4-smartwrite.patch
-Patch6: ypbind-mt-1.20.4-man-port.patch
-Patch7: ypbind-mt-1.20.4-nm.patch
-
-Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
-Requires(postun): initscripts
-Requires: rpcbind, yp-tools
 Epoch: 3
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Version: 2.7.2
-
+Release: 9%{?dist}
+License: GPLv2
+Source0: https://github.com/thkukuk/ypbind-mt/archive/v%{version}.tar.gz#/ypbind-mt-%{version}.tar.gz
+Url: http://www.linux-nis.org/nis/ypbind-mt/index.html
+#Source1: ypbind.init
+Source2: nis.sh
+Source3: ypbind.service
+Source4: ypbind-pre-setdomain
+Source5: ypbind-post-waitbind
+# Fedora-specific patch. Renaming 'ypbind' package to proper
+# 'ypbind-mt' would allow us to drop it.
+Patch1: ypbind-1.11-gettextdomain.patch
+# Not sent to upstream.
+Patch2: ypbind-2.5-helpman.patch
+# This is for /bin/systemctl
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+Requires: rpcbind
+Requires: yp-tools >= 4.2.2-2
+# New nss_nis package in F25+
+Requires: nss_nis
+BuildRequires: make
+BuildRequires:  gcc
 BuildRequires: dbus-glib-devel, docbook-style-xsl
+BuildRequires: systemd
+BuildRequires: systemd-devel
+BuildRequires: autoconf, automake
+BuildRequires: gettext-devel
+BuildRequires: libtirpc-devel
+BuildRequires: libnsl2-devel
+BuildRequires: libxslt
 
 %description
 The Network Information Service (NIS) is a system that provides
@@ -46,57 +54,421 @@ also need to install the ypserv package to a machine on your network.
 
 %prep
 %setup -q -n ypbind-mt-%{version}
-%patch1 -p1 -b .broadcast
+%patch1 -p1 -b .gettextdomain
-%patch2 -p1 -b .gettextdomain
+%patch2 -p1 -b .helpman
-%patch3 -p1 -b .port-leak
+
-%patch4 -p1 -b .log-binds
+autoreconf -fiv
-%patch5 -p1 -b .smartwrite
-%patch6 -p1 -b .man-port
-%patch7 -p1 -b .nm
 
 %build
-%configure --sbindir=/sbin
+%ifarch s390 s390x
-make
+export CFLAGS="$RPM_OPT_FLAGS -fPIC"
+%else
+export CFLAGS="$RPM_OPT_FLAGS -fpic"
+%endif
+export LDFLAGS="$LDFLAGS -pie -Wl,-z,relro,-z,now"
+
+#export CFLAGS="$CFLAGS -H"
+
+%configure
+%make_build
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%make_install
-make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/%{_initrddir} $RPM_BUILD_ROOT/var/yp/binding $RPM_BUILD_ROOT/etc/dhcp/dhclient.d/
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/yp/binding
-install -m 644 etc/yp.conf $RPM_BUILD_ROOT/etc/yp.conf
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/ypbind
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/dhcp/dhclient.d/nis.sh
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
+install -m 644 etc/yp.conf $RPM_BUILD_ROOT%{_sysconfdir}/yp.conf
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d/nis.sh
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/ypbind.service
+install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-pre-setdomain
+install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind
 
 %{find_lang} %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
-/sbin/chkconfig --add ypbind
+%systemd_post %{name}.service
 
 %preun
-if [ $1 = 0 ] ; then
+%systemd_preun %{name}.service
-    /sbin/service ypbind stop >/dev/null 2>&1
-    /sbin/chkconfig --del ypbind
-fi
 
 %postun
-if [ "$1" -ge "1" ] ; then
+%systemd_postun_with_restart %{name}.service
-    /sbin/service ypbind condrestart >/dev/null 2>&1 || :
-fi
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%{_sbindir}/*
-/sbin/ypbind
 %{_mandir}/*/*
-%{_initrddir}/*
+%{_libexecdir}/*
-/etc/dhcp/dhclient.d/*
+%{_unitdir}/*
-%config(noreplace) /etc/yp.conf
+%{_sysconfdir}/dhcp/dhclient.d/*
-%dir /var/yp/binding
+%config(noreplace) %{_sysconfdir}/yp.conf
+%dir %{_localstatedir}/yp/binding
 %doc README NEWS
+%license COPYING
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.7.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.7.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Nov 12 2021 Björn Esser <besser82@fedoraproject.org> - 3:2.7.2-7
+- Rebuild(libnsl2)
+
+* Tue Sep 28 2021 Marek Kulik <mkulik@redhat.com> - 3:2.7.2-6
+- Fix setsebool message in logs, resolves: #1882069
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.7.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3:2.7.2-4
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.7.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.7.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Apr 20 2020 Filip Januš <fjanus@redhat.com> - 2.7.2-1
+- Update version to 2.7.2
+- Resolves: #1796030
+- Removing obsolete patches
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jul 30 2019 Matej Mužila <mmuzila@redhat.com> - 3:2.6.1-1
+- Update to version 2.6.1
+- Resolves: #1668439
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jun 07 2018 Matej Mužila <mmuzila@redhat.com> - 3:2.5-2
+- Fix man pages
+
+* Tue Jun 05 2018 Matej Mužila <mmuzila@redhat.com> - 3:2.5-1
+- Update to version 2.5
+
+* Mon Apr 30 2018 Petr Kubat <pkubat@redhat.com> - 3:2.4-8
+- Add the runtime dependency on nss_nis back
+
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3:2.4-7
+- Escape macros in %%changelog
+
+* Tue Jan 16 2018 Petr Kubat <pkubat@redhat.com> - 3:2.4-6
+- Temporarily remove nss_nis dependency as it got removed from glibc (#1534599)
+
+* Thu Sep 21 2017 Matej Mužila <mmuzila@redhat.com> - 3:2.4-5
+- Add "Wants" dependency on network-online.target
+- Remove "After" dependency on NetworkManager-wait-online.service
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon May 29 2017 Matej Mužila <mmuzila@gmail.com> - 3:2.4-2
+- Require yp-tools >= 4.2.2-2
+
+* Fri May 19 2017 Matej Mužila <mmuzila@redhat.com> - 3:2.4-1
+- Update to version 2.4 supporting IPv6
+
+* Wed Mar 29 2017 Petr Kubat <pkubat@redhat.com> - 3:1.38-10
+- Wait a while for dhcp to set up the domain (#1170400)
+
+* Mon Mar 20 2017 Petr Kubat <pkubat@redhat.com> - 3:1.38-9
+- Add a Wants dependency on nss-user-lookup.target (#1282440)
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3:1.38-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* 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.
+- Spec file cosmetics.
+- Add %%license tag.
+
+* Mon Nov 07 2016 Petr Kubat <pkubat@redhat.com> - 3:1.38-6
+- Add runtime dependency on nss_nis
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3:1.38-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jan 25 2016 Matej Muzila <mmuzila@redhat.com> 3:1.38-4
+- Do not restart ypbind on dhcp renew if nis domain or nis servers
+  haven't changed
+  Resolves: rhbz#1301708
+
+* Mon Nov 16 2015 Matej Muzila <mmuzila@redhat.com> 3:1.38-3
+-  Load ypbind.service before nss-user-lookup.target
+   Resolves: rhbz#1282440
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3:1.38-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Oct 21 2014 Matej Mužila <mmuzila@redhat.com> - 3:1.38-1
+- Update to 1.38
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3:1.37.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Aug 15 2014 Honza Horak <hhorak@redhat.com> - 3:1.37.2-2
+- link with systemd.so
+
+* Fri Aug 15 2014 Honza Horak <hhorak@redhat.com> - 3:1.37.2-1
+- Update to 1.37.2
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3:1.37.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon Nov 18 2013 Honza Horak <hhorak@redhat.com> - 3:1.37.1-9
+- Replace autoreconf with autoconf
+
+* Mon Nov 18 2013 Honza Horak <hhorak@redhat.com> - 3:1.37.1-8
+- DHCP changes documented
+  Related: #1031093
+
+* Thu Aug 29 2013 Honza Horak <hhorak@redhat.com> - 3:1.37.1-7
+- Add network-online.target dependency
+  Resolves: #1002295
+
+* Mon Aug 19 2013 Honza Horak <hhorak@redhat.com> - 3:1.37.1-6
+- Improve systemd documentation
+
+* Mon Jul 29 2013 Honza Horak <hhorak@redhat.com> - 3:1.37.1-5
+- Remove SysV init conversion and systemd macros compatible code
+- Require systemd instead systemd-units
+- Remove systemd-sysv
+
+* Thu May 09 2013 Honza Horak <hhorak@redhat.com> - 3:1.37.1-3
+- Enable PrivateTmp feature, just for the case
+
+* Tue May 07 2013 Honza Horak <hhorak@redhat.com> - 3:1.37.1-2
+- Syncing help and man pages
+
+* Mon May 06 2013 Honza Horak <hhorak@redhat.com> - 3:1.37.1-1
+- Update to new version 1.37.1
+
+* Tue Jan 29 2013 Honza Horak <hhorak@redhat.com> - 3:1.36-10
+- Make re-bind interval a tune-able option
+- Fixed bogus dates in changelog
+
+* Wed Dec 19 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-9
+- Check presence of ypbind in /etc/rpc
+  Related: #888778
+
+* Fri Nov 30 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-8
+- Build with full relro
+
+* Thu Oct 04 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-7
+- Run %%triggerun regardless of systemd_post variable definition
+
+* Mon Sep 24 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-6
+- Use sdnotify to inform systemd that daemon is ready
+- Minor spec file cleanup
+- Use new systemd macros
+  Resolves: #850375
+- Add After: NetworkManager-wait-online.service
+  Related: #846767
+
+* Thu Aug 23 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-5
+- Enhance ypbind(8) with info about NISTIMEOUT
+- Add suggestion about extending NISTIMEOUT if ypbind timeouts
+
+* Mon Jul 23 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-4
+- Add SIGPIPE to proper signal set
+  Related: #842228
+- Fixed sending TERM signal in ypbind-post-waitbind
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3:1.36-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Jul 11 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-2
+- Minor spec file fixes
+- Helper scripts moved to /usr/libexec
+
+* Wed Jul 11 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-1
+- Update to new version 1.36
+
+* Tue Jul 10 2012 Honza Horak <hhorak@redhat.com> - 3:1.35-5
+- consider all 127.0.0.0/8 as localhost addresses
+  Related: #829487
+
+* Mon Jul 09 2012 Honza Horak <hhorak@redhat.com> - 3:1.35-4
+- don't go offline when one of NIS servers is localhost
+  Related: #829487
+
+* Fri Jun 01 2012 Honza Horak <hhorak@redhat.com> - 3:1.35-3
+- fixed kill call in ypbind-post-waitbind script
+
+* Wed Apr 18 2012 Honza Horak <hhorak@redhat.com> - 3:1.35-2
+- NetworkManager signal name changed
+  Resolves: #812501
+
+* Mon Mar 26 2012 Honza Horak <hhorak@redhat.com> - 3:1.35-1
+- Update to new version with only minor changes
+
+* Tue Jan 24 2012 Honza Horak <hhorak@redhat.com> - 3:1.33-11
+- Don't fail when killing ypbind after unsuccessfull start fails
+- Let ypbind start before systemd-user-sessions.service
+  Resolves: #783447
+
+* Thu Jan 12 2012 Honza Horak <hhorak@redhat.com> - 3:1.33-10
+- Fail to start ypbind service if domainname is not set
+
+* Wed Nov 16 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-9
+- Fixed ypbind-post-waitbind to stop the service when binding is not success
+
+* Tue Nov 15 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-8
+- Fixed ypbind-post-waitbind to handle long rpcinfo requests
+  Resolves: #624688
+
+* Mon Sep 26 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-7
+- Don't turn off allow_ypbind SELinux boolean
+  Resolves: #741141
+
+* Thu Sep 15 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-6
+- Fixed systemd unit file
+- Log messages when starting ypbind service made more verbose
+
+* Tue Aug 02 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-5
+- Fixed rpmlint errors
+- Fixed systemd unit files packaging
+
+* Mon Jun 13 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-4
+- Changed -n option for staying in foreground to not overlap 
+  with config-file option
+
+* Tue Jun 07 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-3
+- Fixed ypbind.service when selinux is disabled
+
+* Tue May 10 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-2
+- Added /etc/sysconfig/network to systemd service file
+
+* Tue May 10 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-1
+- Update to new version
+
+* Fri Apr 29 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-11
+- Removed NM_DBUS_VPN_SIGNAL_STATE_CHANGE, use own constant
+  NM_DBUS_SIGNAL_STATE_CHANGED.
+  (rhbz#696629)
+
+* Thu Apr 28 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-10
+- Made EnvironmentFile in systemd definition optional
+  (rhbz#632620)
+
+* Thu Apr 14 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-9
+- Add native systemd unit file.
+  (rhbz#693873)
+
+* Thu Apr 14 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-8
+- Added rpcbind to LSB header in SysV init file.
+
+* Wed Apr 06 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-7
+- Added LSB init service definition in ypbind.init.
+- Fix D-Bus response codes to correspond with NetworkManager.
+  (rhbz#693873)
+
+* Fri Mar 18 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-6
+- Added the -typo2 patch which fixes a spelling error in a man pages.
+  (rhbz#664870)
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3:1.32-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Nov 29 2010 Karel Klic <kklic@redhat.com> - 3:1.32-4
+- Added the -typo patch which fixes a spelling error in a message.
+
+* Fri Nov 19 2010 Karel Klic <kklic@redhat.com> - 3:1.32-3
+- ypbind.init: More effective syntax for #601296.
+
+* Fri Nov 19 2010 Karel Klic <kklic@redhat.com> - 3:1.32-2
+- Modified the chkconfig priorities from 27/73 to 24/76, to move
+  ypbind before netfs. This is useful for hosts that mount NFS file
+  systems that reside on a server which is resolvable through NIS.
+
+* Thu Jul  8 2010 Karel Klic <kklic@redhat.com> - 3:1.32-1
+- Update to new version which contains the -matches.patch
+
+* Wed Jun 23 2010 Karel Klic <kklic@redhat.com> - 3:1.31-7
+- Added -matches.patch removing matches when dereferencing
+  DBus connection.
+
+* Tue Jun  8 2010 Karel Klic <kklic@redhat.com> - 3:1.31-6
+- ypbind.init: take the first domainname in yp.conf and use
+  only that (rhbz#601296)
+
+* Fri May 21 2010 Karel Klic <kklic@redhat.com> - 3:1.31-5
+- Moved /sbin/ypbind to /usr/sbin/ypbind, as the package
+  depends on several utilities from /usr (selinuxenabled,
+  rpcinfo, ypwhich), and /usr/lib/libdbus-glib-1.so
+- Removed trailing whitespaces from ChangeLog
+
+* Wed May 19 2010 Karel Klic <kklic@redhat.com> - 3:1.31-4
+- Update SELinux context of /etc/yp.conf in nis.sh (rhbz#593278)
+- nis.sh: use condrestart instead of pidfile checking
+- nis.sh: various simplifications
+- Removed BuildRoot tag
+- Removed %%clean section
+
+* Wed Feb 24 2010 Karel Klic <kklic@redhat.com> - 3:1.31-3
+- Added COPYING file to the package
+
+* Thu Jan 21 2010 Karel Klic <kklic@redhat.com> - 3:1.31-2
+- Rewrote initscript to become closer to Packaging:SysVInitScript
+  Fedora guildeline. Also fixes rhbz#523913
+
+* Mon Jan  4 2010 Karel Klic <kklic@redhat.com> - 3:1.31-1
+- Updated to version 1.31 from upstream
+- Removed signalstate patch because it was merged by upstream
+- Removed man-port patch, because it was rejected by
+  the upstream. Option '-p' does not work in all cases, it
+  is not supported, intentionally not included in
+  the documentation, and it is also removed from the usage
+  string in this version
+
+* Thu Nov 19 2009 Karel Klic <kklic@redhat.com> - 3:1.29.91-2
+- Added signalstate patch, which fixes compilation with
+  NetworkManaged-devel headers installed. Resolves #537064.
+
+* Mon Oct 26 2009 Karel Klic <kklic@redhat.com> - 3:1.29.91-1
+- Updated to 1.29.91 from upstream
+- Removed 1.19-port-leak patch because the upstream source code has
+  been changed and the port leaks should not happen anymore
+- Removed 1.20.4-smartwrite patch because it was merged by upstream
+- Removed 1.20.4-nm patch as the upstream merged the important part
+- Removed 1.20.4-log-binds patch because it was merged by upstream
+- Ported 1.20.4-man-port patch to the new release, sent to Thorsten Kukuk
+- Removed 1.11-broadcast patch
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3:1.20.4-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Apr  8 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 3:1.20.4-18
+- Remove LSB Header from init script
+  Resolves: #494827
+
+* Wed Mar 18 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 3:1.20.4-17
+- Fix nis.sh SELinux issue
+  Resolves: #488865
+
+* Thu Feb 26 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 3:1.20.4-16
+- Fix ypbind script in dos format - bash syntax errors
+  Resolves: #486722
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3:1.20.4-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -150,7 +522,7 @@ fi
 * Mon Sep 17 2007 Steve Dickson <steved@redhat.com> - 3:1.20.4-2
 - Fixed a couple of typos in initscript (bz 281951)
 
-* Wed May  3 2007 Steve Dickson <steved@redhat.com> - 3:1.20.4-1
+* Thu May  3 2007 Steve Dickson <steved@redhat.com> - 3:1.20.4-1
 - updated to latest upstream version ypbind-mt-1.20.4
 
 * Tue Apr 17 2007 Steve Dickson <steved@redhat.com> - 3:1.19-9
@@ -296,7 +668,7 @@ fi
 * Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
 - Bump release + rebuild.
 
-* Fri Jun  4 2001 Preston Brown <pbrown@redhat.com>
+* Mon Jun  4 2001 Preston Brown <pbrown@redhat.com>
 - small fixes for initscript. Sometimes had trouble on slower systems (#37463)
 
 * Sat Mar  3 2001 Preston Brown <pbrown@redhat.com>