Merge pull request #677 from opensourcerouting/rpm-merge-fix

Rpm merge fix

5 files changed, 77 insertions, 34 deletions

diff --git a/redhat/README.rpm_build.md b/redhat/README.rpm_build.md
index d2b0814364..dd01babf50 100644
--- a/redhat/README.rpm_build.md
+++ b/redhat/README.rpm_build.md
@@ -59,6 +59,8 @@ Building your own FRRouting RPM
         %{!?with_irdp:          %global  with_irdp          1 }
         %{!?with_rtadv:         %global  with_rtadv         1 }
         %{!?with_ldpd:          %global  with_ldpd          1 }
+        %{!?with_nhrpd:         %global  with_nhrpd         1 }
+        %{!?with_eigrp:         %global  with_eigrpd        1 }
         %{!?with_shared:        %global  with_shared        1 }
         %{!?with_multipath:     %global  with_multipath     256 }
         %{!?frr_user:           %global  frr_user           frr }
diff --git a/redhat/daemons b/redhat/daemons
index ce0f7747a2..e08302cb5c 100644
--- a/redhat/daemons
+++ b/redhat/daemons
@@ -45,6 +45,8 @@ ripd=no
 ripngd=no
 isisd=no
 ldpd=no
+nhrpd=no
+eigrpd=no
 #
 # Command line options for the daemons
 #
@@ -56,4 +58,6 @@ ripd_options=("-A 127.0.0.1")
 ripngd_options=("-A ::1")
 isisd_options=("-A 127.0.0.1")
 ldpd_options=("-A 127.0.0.1")
+nhrpd_options=("-A 127.0.0.1")
+eigrpd_options=("-A 127.0.0.1")
 
diff --git a/redhat/frr.init b/redhat/frr.init
index 96c0a833af..0a922aab58 100755
--- a/redhat/frr.init
+++ b/redhat/frr.init
@@ -33,7 +33,7 @@ V_PATH=/var/run/frr
 # Local Daemon selection may be done by using /etc/frr/daemons.
 # See /usr/share/doc/frr/README.Debian.gz for further information.
 # Keep zebra first and do not list watchfrr!
-DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd pimd ldpd"
+DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd pimd ldpd nhrpd eigrpd"
 MAX_INSTANCES=5
 RELOAD_SCRIPT=/usr/lib/frr/frr-reload.py
 
diff --git a/redhat/frr.logrotate b/redhat/frr.logrotate
index 2db3af63dd..f43a86efe7 100644
--- a/redhat/frr.logrotate
+++ b/redhat/frr.logrotate
@@ -61,3 +61,20 @@
 	/bin/kill -USR1 `cat /var/run/frr/ldpd.pid 2> /dev/null` 2> /dev/null || true
     endscript
 }
+
+/var/log/frr/nhrpd.log {
+    notifempty
+    missingok
+    postrotate
+        /bin/kill -USR1 `cat /var/run/frr/nhrpd.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}
+
+/var/log/frr/eigrpd.log {
+    notifempty
+    missingok
+    postrotate
+        /bin/kill -USR1 `cat /var/run/frr/eigrpd.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}
+
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index d7cb517ea8..fea80d7f72 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -10,33 +10,31 @@
 
 #################### FRRouting (FRR) configure options #####################
 # with-feature options
-<<<<<<< HEAD
-%{!?with_tcp_zebra:		%global	with_tcp_zebra		0 }
-%{!?with_pam:			%global	with_pam	        0 }
-%{!?with_ospfclient:		%global	with_ospfclient 	1 }
-%{!?with_ospfapi:		%global	with_ospfapi		1 }
-%{!?with_irdp:			%global	with_irdp		1 }
-%{!?with_rtadv:			%global	with_rtadv		1 }
-%{!?with_mpls:			%global	with_mpls		1 }
-%{!?with_ldpd:			%global	with_ldpd		1 }
-%{!?with_nhrpd:			%global	with_nhrpd		1 }
-%{!?with_shared:		%global	with_shared		1 }
-%{!?with_multipath:		%global	with_multipath		256 }
-%{!?frr_user:		%global	frr_user		frr }
-%{!?vty_group:			%global	vty_group		frrvty }
-%{!?with_fpm:			%global	with_fpm 		0 }
-%{!?with_watchfrr:		%global	with_watchfrr 	1 }
-%{!?with_bgp_vnc:		%global	with_bgp_vnc 		0 }
-%{!?with_pimd:                  %global with_pimd               1 }
+%{!?with_tcp_zebra:     %global  with_tcp_zebra     0 }
+%{!?with_pam:           %global  with_pam           0 }
+%{!?with_ospfclient:    %global  with_ospfclient    1 }
+%{!?with_ospfapi:       %global  with_ospfapi       1 }
+%{!?with_irdp:          %global  with_irdp          1 }
+%{!?with_rtadv:         %global  with_rtadv         1 }
+%{!?with_ldpd:          %global  with_ldpd          1 }
+%{!?with_nhrpd:         %global  with_nhrpd         1 }
+%{!?with_eigrpd:        %global  with_eigrpd        1 }
+%{!?with_shared:        %global  with_shared        1 }
+%{!?with_multipath:     %global  with_multipath     256 }
+%{!?frr_user:           %global  frr_user           frr }
+%{!?vty_group:          %global  vty_group          frrvty }
+%{!?with_fpm:           %global  with_fpm           0 }
+%{!?with_watchfrr:      %global  with_watchfrr      1 }
+%{!?with_bgp_vnc:       %global  with_bgp_vnc       0 }
+%{!?with_pimd:          %global  with_pimd          1 }
 
 # path defines
-%define		_sysconfdir	/etc/frr
-%define         _sbindir        /usr/lib/frr
-%define		zeb_src		%{_builddir}/%{name}-%{frrversion}
-%define		zeb_rh_src	%{zeb_src}/redhat
-%define		zeb_docs	%{zeb_src}/doc
-%define         frr_tools    %{zeb_src}/tools
-%define         frr_tools_etc   %{frr_tools}/etc
+%define     _sysconfdir   /etc/frr
+%define     _sbindir      /usr/lib/frr
+%define     zeb_src       %{_builddir}/%{name}-%{frrversion}
+%define     zeb_rh_src    %{zeb_src}/redhat
+%define     zeb_docs      %{zeb_src}/doc
+%define     frr_tools     %{zeb_src}/tools
 
 # defines for configure
 %define     _localstatedir  /var/run/frr
@@ -84,7 +82,7 @@
 %{!?frr_gid:            %global  frr_gid            92 }
 %{!?vty_gid:            %global  vty_gid            85 }
 
-%define		daemon_list	zebra ripd ospfd bgpd isisd pimd ripngd ospf6d
+%define     daemon_list zebra ripd ospfd bgpd isisd ripngd ospf6d
 
 %if %{with_ldpd}
 %define     daemon_ldpd ldpd
@@ -104,13 +102,19 @@
 %define		daemon_nhrpd	""
 %endif
 
+%if %{with_eigrpd}
+%define         daemon_eigrpd	eigrpd
+%else
+%define		daemon_eigrpd	""
+%endif
+
 %if %{with_watchfrr}
 %define     daemon_watchfrr watchfrr
 %else
 %define     daemon_watchfrr ""
 %endif
 
-%define		all_daemons	%{daemon_list} %{daemon_ldpd} %{daemon_nhrpd} %{daemon_watchfrr}
+%define     all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_pimd} %{daemon_nhrpd} %{daemon_eigrpd} %{daemon_watchfrr}
 
 # allow build dir to be kept
 %{!?keep_build:         %global  keep_build         0 }
@@ -156,7 +160,7 @@ protocol. It takes multi-server and multi-thread approach to resolve
 the current complexity of the Internet.
 
 FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP
-and NHRP.
+NHRP and EIGRP.
 
 FRRouting is a fork of Quagga.
 
@@ -252,6 +256,11 @@ developing OSPF-API and frr applications.
 %else
 	--disable-nhrpd \
 %endif
+%if %{with_eigrpd}
+	--enable-eigrpd \
+%else
+	--disable-eigrpd \
+%endif
 %if %{with_pam}
     --with-libpam \
 %endif
@@ -318,9 +327,7 @@ install %{zeb_rh_src}/frr.init \
     %{buildroot}/etc/rc.d/init.d/frr
 %endif
 
-install %{frr_tools_dir}/frr/daemons.conf %{buildroot}/etc/frr
-install %{frr_tools_dir}/frr/daemons %{buildroot}/etc/frr
-install -m644 %{frr_tools_dir}/default/frr %{buildroot}/etc/default
+install %{zeb_rh_src}/daemons %{buildroot}/etc/frr
 install -m644 %{zeb_rh_src}/frr.pam \
     %{buildroot}/etc/pam.d/frr
 install -m644 %{zeb_rh_src}/frr.logrotate \
@@ -375,6 +382,9 @@ zebra_spec_add_service ospf6d   2606/tcp "OSPF6d vty"
 zebra_spec_add_service ospfapi  2607/tcp "OSPF-API"
 %endif
 zebra_spec_add_service isisd    2608/tcp "ISISd vty"
+%if %{with_eigrpd}
+zebra_spec_add_service eigrpd   2609/tcp "EIGRPd vty"
+%endif
 %if %{with_nhrpd}
 zebra_spec_add_service nhrpd    2610/tcp "NHRPd vty"
 %endif
@@ -516,8 +526,11 @@ rm -rf %{buildroot}
 %if %{with_ldpd}
     %{_sbindir}/ldpd
 %endif
+%if %{with_eigrpd}
+    %{_sbindir}/eigrpd
+%endif
 %if %{with_nhrpd}
-%{_sbindir}/nhrpd
+    %{_sbindir}/nhrpd
 %endif
 %if %{with_shared}
 %{_libdir}/lib*.so
@@ -561,9 +574,16 @@ rm -rf %{buildroot}
 %dir %attr(755,root,root) %{_includedir}/%{name}/ospfapi
 %{_includedir}/%name/ospfapi/*.h
 %endif
+%if %{with_eigrpd}
+%dir %attr(755,root,root) %{_includedir}/%{name}/eigrpd
+%{_includedir}/%name/eigrpd/*.h
+%endif
 
 %changelog
-* Mon Apr 17 2017 Martin Winter <mwinter@opensourcerouting.org> - %{version}
+* Mon Jun  5 2017 Martin Winter <mwinter@opensourcerouting.org> - %{version}
+- added NHRP and EIGRP daemon
+
+* Mon Apr 17 2017 Martin Winter <mwinter@opensourcerouting.org>
 - new subpackage frr-pythontools with python 2.7 restart script
 - remove PIMd from CentOS/RedHat 6 RPM packages (won't work - too old)
 - converted to single frr init script (not per daemon) based on debian init script