9 changed files with 217 additions and 313 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,7 +5,3 @@ 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
-/ypbind-mt-2.5.tar.gz
-/ypbind-mt-2.6.1.tar.gz
-/ypbind-mt-2.7.2.tar.gz
--- a/nis.sh
+++ b/nis.sh
@ -52,34 +52,38 @@ nis_config() {
        if [ -n "${new_nis_domain}" ]; then
            domainname "${new_nis_domain}"
            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
+                service ypbind condrestart >/dev/null 2>&1
+            fi
        elif [ -n "${new_nis_servers}" ]; then
            save_config_file
            echo '# generated by /sbin/dhclient-script' > ${CONF}
            fix_context ${CONF}
+            let contents=0

            for i in ${new_nis_servers} ; do
                echo "ypserver ${i}" >> ${CONF}
+                let contents=contents+1
            done

-        fi
-
-		# dimainname or servers changed, restart ypbind
-		if [ "${old_nis_domain}" != "${new_nis_domain}" ] \
-			|| [ "${old_nis_servers}" != "${new_nis_servers}" ] 
-		then
+            if [ $contents -gt 0 ]; then
                service ypbind condrestart >/dev/null 2>&1
-		fi
+            fi
+        fi
    fi
 }

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (ypbind-mt-2.7.2.tar.gz) = 415013ea003bb3d6162b1dac76462d13d1264a2a0dd3c4de057cf7239b9706a76d1f14ee1e3dcfba697aa48e25e3a972772c8210d87bbf847344e4a6c708a5b4
+094088c0e282fa7f3b3dd6cc51d0a4e1  ypbind-mt-1.38.tar.bz2
--- a/ypbind-2.5-helpman.patch
+++ b/ypbind-2.5-helpman.patch
@ -1,148 +0,0 @@
-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'>
--- a/ypbind-helpman.patch
+++ b/ypbind-helpman.patch
@ -0,0 +1,160 @@
+diff -up ypbind-mt-1.37.2/man/ypbind.8.helpman ypbind-mt-1.37.2/man/ypbind.8
+--- ypbind-mt-1.37.2/man/ypbind.8.helpman	2013-11-06 16:02:42.000000000 +0100
+++ ypbind-mt-1.37.2/man/ypbind.8	2014-08-15 10:40:21.261195488 +0200
+@@ -31,9 +31,11 @@
+ ypbind \- NIS binding process
+ .SH "SYNOPSIS"
+ .HP \w'\fBypbind\fR\ 'u
+-\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-n | \-forground] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-rebind\-interval] [\-no\-dbus]
+\fBypbind\fR [\-broadcast\ |\ \-ypset\ |\ \-ypsetme] [\-c] [\-f\ \fIconfigfile\fR] [\-no\-ping] [\-broken\-server] [\-local\-only] [\-i\ |\ \-ping\-interval\ \fIping\-interval\fR] [\-r\ |\ \-rebind\-interval\ \fIrebind\-interval\fR] [\-d\ |\ \-debug] [\-v\ |\ \-verbose] [\-n\ |\ \-foreground] [\-p\ \fIport\fR] [\-log\ \fIlog\-options\fR] [\-no\-dbus]
+ .HP \w'\fBypbind\fR\ 'u
+ \fBypbind\fR \-\-version
+.HP \w'\fBypbind\fR\ 'u
+\fBypbind\fR \-\-help
+ .SH "DESCRIPTION"
+ .PP
+ \fBypbind\fR
+@@ -58,6 +60,8 @@ will send a ping to all servers and bind
+ .PP
+ Unless the option
+ \fB\-debug\fR
+or
+\fB\-foreground\fR
+ is used, ypbind detaches itself from the controlling terminal and puts itself into background\&.
+ \fBypbind\fR
+ uses
+@@ -103,7 +107,64 @@ will behave as usual and assumes there i
+ \fBypbind\fR
+ will reread all configuration files, registers at the local portmapper and try to search NIS servers\&. If NetworkManager drops a connection,
+ \fBypbind\fR
+-will unregister from portmapper\&.
+will unregister from portmapper\&. Option
+\fB\-no\-dbus\fR
+disables this feature and
+\fBypbind\fR
+behaves like no NetworkManager is running at startup. Also in case one of the NIS servers
+\fBypbind\fR
+is configured to connect to is a localhost,
+\fBypbind\fR
+behaves like it is a working network connection.
+.PP
+In Fedora we use
+\fBsystemd\fR
+for starting services. We need to finish starting process of
+\fBypbind\fR
+service not before service is fully started, which means
+\fBypbind\fR
+daemon is prepared to answer. There is a test script /usr/libexec/ypbind-post-waitbind used in
+\fBypbind.service\fR,
+that waits for
+\fBypbind\fR
+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
+\fBypbind.service\fR
+fails. User can increase the
+\fBtimeout\fR
+by setting an environment variable
+\fBNISTIMEOUT\fR
+in /etc/sysconfig/ypbind. For example NISTIMEOUT=180 means ypbind will wait up to 180 seconds for binding to a NIS server.
+Another option is to enable NetworkManager-wait-online.service, which will make
+\fBypbind\fR
+to wait until network is properly set up.
+.PP
+In case something needs to be changed in the
+\fBypbind.service\fR,
+it is adviced not to change the
+\fBypbind.service\fR
+directly, but rather to create a new file under /etc/systemd/system/ypbind.service.d/\&, i.e. if we need to start
+\fBypbind\fR
+before service foo.service, we can create file /etc/systemd/system/ypbind.service.d/wait-foo.conf with the following content:
+
+        [Service]
+        Before=foo.service
+.PP
+If you need to pass other arguments to
+\fBypbind\fR
+daemon withing systemd unit file, you can set these arguments as
+\fBOTHER_YPBIND_OPTS\fR
+environment variable in /etc/sysconfig/ypbind. For example in order to set a fixed port ypbind should run on, you can specify OTHER_YPBIND_OPTS="-p 876" in /etc/sysconfig/ypbind\&.
+.PP
+DHCP client by defualt changes
+\fB/etc/yp.conf\fR
+in case DHCP server sends NIS configuration in the respond. In that case /etc/dhcp/dhclient.d/nis.sh changes
+\fB/etc/yp.conf\fR
+according such configuration and creates a back\-up copy of the original configuration file into /var/lib/dhclient/nis.conf.predhclient.$interface.
+In order to disable changing
+\fB/etc/yp.conf\fR
+by DHCP client, add
+\fBPEERNIS=no\fR
+into /etc/sysconfig/network.
+ .SH "OPTIONS"
+ .PP
+ \fB\-broadcast\fR
+@@ -200,6 +261,15 @@ The default value for
+ to check, if a NIS server is still reachable, is 20 seconds\&. With this options another frequency in seconds can be specified\&.
+ .RE
+ .PP
+\fB\-p port\fR
+.RS 4
+Lets
+\fBypbind\fR
+listen on a specified
+\fBport\fR
+number, rather than asking portmapper to assing a port for it\&.
+.RE
+.PP
+ \fB\-r\fR, \fB\-rebind\-interval\fR
+ .RS 4
+ The default value for
+@@ -207,6 +277,13 @@ The default value for
+ to search for the fastest NIS server is 900 seconds (15 minutes)\&. With this options another frequency in seconds can be specified\&.
+ .RE
+ .PP
+\fB\-log\fR log\-options
+.RS 4
+Allows to log special events\&.
+\fBlog\-options\fR
+is a logical sum of values for particular events \- 1 for logging rpc calls, 2 for logging broken server calls, 4 for logging server changes\&.
+.RE
+.PP
+ \fB\-no\-dbus\fR
+ .RS 4
+ Disables DBUS support if compiled in\&.
+diff -up ypbind-mt-1.37.2/man/yp.conf.5.helpman ypbind-mt-1.37.2/man/yp.conf.5
+--- ypbind-mt-1.37.2/man/yp.conf.5.helpman	2013-04-09 14:31:05.000000000 +0200
+++ ypbind-mt-1.37.2/man/yp.conf.5	2014-08-15 10:38:21.610870737 +0200
+@@ -74,6 +74,10 @@ If no other server is given or all of th
+ If for a specific domain the broadcast option and fixed server are given,
+ \fBypbind\-mt\fR
+ tries at first the given servers before falling back to broadcasting for a running server\&.
+.PP
+Content of
+\fB/etc/yp.conf\fR
+can be changed by DHCP client, for more info see \fBypbind\fR(8).
+ .SH "SEE ALSO"
+ .PP
+ \fBypbind\fR(8)
+diff -up ypbind-mt-1.37.2/src/ypbind-mt.c.helpman ypbind-mt-1.37.2/src/ypbind-mt.c
+--- ypbind-mt-1.37.2/src/ypbind-mt.c.helpman	2013-04-09 16:03:47.000000000 +0200
+++ ypbind-mt-1.37.2/src/ypbind-mt.c	2014-08-15 10:38:21.610870737 +0200
+@@ -513,12 +513,17 @@ usage (int ret)
+     output = stdout;
+ 
+   fputs (_("Usage:\n"), output);
+-  fputs (_("\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n\t  [-no-ping] [-broken-server] [-local-only] [-i ping-interval]\n\t  [-r rebind-interval] [-debug] [-verbose] [-n | -foreground]\n"), output);
+  fputs ("\typbind [-broadcast | -ypset | -ypsetme] [-f configfile] [-no-ping]\n"
+           "\t  [-broken-server] [-local-only] [-i | -ping-interval ping-interval]\n"
+           "\t  [-r | -rebind-interval rebind-interval] [-d | -debug] [-v | -verbose]\n"
+           "\t  [-n | -foreground] [-p port] [-log log-options]", output);
+ #ifdef USE_DBUS_NM
+-  fputs (_("\t  [-no-dbus]\n"), output);
+  fputs (" [-no-dbus]", output);
+ #endif
+-  fputs (_("\typbind -c [-f configfile]\n"), output);
+-  fputs (_("\typbind --version\n"), output);
+  fputs ("\n", output);
+  fputs ("\typbind -c [-f configfile]\n", output);
+  fputs ("\typbind --version\n", output);
+  fputs ("\typbind --help\n", output);
+   exit (ret);
+ }
+ 
--- a/26
+++ b/26
@ -7,30 +7,22 @@
 #              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
+	domainname $NISDOMAIN
+	echo $"'$NISDOMAIN' (environment variable)"
    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
+	NISDOMAIN=`awk '{ if ($1 == "domain") {print $2; exit} }' /etc/yp.conf`
+	if [ -n "$NISDOMAIN" ]; then
+	    domainname $NISDOMAIN
+	    echo $"'$NISDOMAIN' (/etc/yp.conf)"
+	else
+            logger -t ypbind $"domain not found"
+            exit 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
--- a/ypbind-systemdso.patch
+++ b/ypbind-systemdso.patch
@ -0,0 +1,22 @@
+diff -ru a/configure.ac b/configure.ac
+--- a/configure.ac	2014-10-21 17:37:20.526628827 +0200
+++ b/configure.ac	2014-10-21 17:51:39.649362686 +0200
+@@ -44,7 +44,8 @@
+ AC_CHECK_LIB(socket, bind)
+ AC_CHECK_LIB(pthread, pthread_create)
+ 
+-PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], [USE_SD_NOTIFY=1], [USE_SD_NOTIFY=0])
+PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209] [libsystemd-daemon >= 209], [USE_SD_NOTIFY=1], [USE_SD_NOTIFY=0])
+	
+ AC_SUBST(USE_SD_NOTIFY)
+ 
+ AC_ARG_ENABLE([dbus-nm],
+@@ -105,7 +106,7 @@
+ AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno)
+ 
+ dnl internationalization macros
+-AM_GNU_GETTEXT_VERSION
+AM_GNU_GETTEXT_VERSION(0.19)
+ AM_GNU_GETTEXT([external])
+ 
+ dnl By default, don't send a ping to all server at the same time
--- a/ypbind.service
+++ b/ypbind.service
@ -2,10 +2,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
+After=syslog.target network-online.target rpcbind.service ypserv.service NetworkManager-wait-online.service
 Before=systemd-user-sessions.service
-Before=nss-user-lookup.target

 [Service]
 Type=notify
@ -13,7 +11,7 @@ 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'
+ExecStartPre=-/usr/sbin/setsebool allow_ypbind=1 
 ExecStart=/usr/sbin/ypbind -n $OTHER_YPBIND_OPTS
 ExecStartPost=/usr/libexec/ypbind-post-waitbind
 PrivateTmp=true
--- a/ypbind.spec
+++ b/ypbind.spec
@ -1,10 +1,11 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Epoch: 3
-Version: 2.7.2
-Release: 9%{?dist}
+Version: 1.38
+Release: 1%{?dist}
 License: GPLv2
-Source0: https://github.com/thkukuk/ypbind-mt/archive/v%{version}.tar.gz#/ypbind-mt-%{version}.tar.gz
+Group: System Environment/Daemons
+Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2
 Url: http://www.linux-nis.org/nis/ypbind-mt/index.html
 #Source1: ypbind.init
 Source2: nis.sh
@ -15,25 +16,18 @@ Source5: ypbind-post-waitbind
 # 'ypbind-mt' would allow us to drop it.
 Patch1: ypbind-1.11-gettextdomain.patch
 # Not sent to upstream.
-Patch2: ypbind-2.5-helpman.patch
+Patch2: ypbind-helpman.patch
+Patch3: ypbind-systemdso.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
+Requires: rpcbind, yp-tools
 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
@ -56,6 +50,7 @@ also need to install the ypserv package to a machine on your network.
 %setup -q -n ypbind-mt-%{version}
 %patch1 -p1 -b .gettextdomain
 %patch2 -p1 -b .helpman
+%patch3 -p1 -b .systemdso

 autoreconf -fiv

@ -66,15 +61,11 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export CFLAGS="$RPM_OPT_FLAGS -fpic"
 %endif
 export LDFLAGS="$LDFLAGS -pie -Wl,-z,relro,-z,now"
-
-#export CFLAGS="$CFLAGS -H"
-
-%configure
-%make_build
-
+%configure --enable-dbus-nm
+make

 %install
-%make_install
+make install DESTDIR=$RPM_BUILD_ROOT

 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/yp/binding
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d
@ -105,120 +96,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind
 %{_sysconfdir}/dhcp/dhclient.d/*
 %config(noreplace) %{_sysconfdir}/yp.conf
 %dir %{_localstatedir}/yp/binding
-%doc README NEWS
-%license COPYING
+%doc README NEWS 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