2004-01-08 Paul Jakma <paul@dishone.st>

        * Makefile.am: as per gdt, specify the redhat dir as a DIST_SUBDIR,
          remove the redhat/... dist targets - instead these now go in..
          redhat/Makefile.am: (new) proper place to describe redhat/ dist
          files, as well as allow quagga.spec to be regenerated properly.
          redhat/quagga.sysconfig: specify conf file location.
          redhat/quagga.spec.in: Add 2 patches to RPM build.

5 files changed, 32 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 345eea72..efbb75dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-08 Paul Jakma <paul@dishone.st>
+
+	* Makefile.am: as per gdt, specify the redhat dir as a DIST_SUBDIR,
+	  remove the redhat/... dist targets - instead these now go in..
+	  redhat/Makefile.am: (new) proper place to describe redhat/ dist 
+	  files, as well as allow quagga.spec to be regenerated properly.
+	  redhat/quagga.sysconfig: specify conf file location.
+	  redhat/quagga.spec.in: Add 2 patches to RPM build.
+	  
 2003-12-30 Paul Jakma <paul@dishone.st>
 
 	* redhat/isisd.init: new file, init script for isisd.
diff --git a/Makefile.am b/Makefile.am
index 6af673cc..06695a91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,14 @@
 ## Process this file with automake to produce Makefile.in.
 
 SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \
-         @ISISD@ @VTYSH@ @OSPFCLIENT@ doc
+         @ISISD@ @VTYSH@ @OSPFCLIENT@ redhat doc
 
 DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d vtysh \
 	       ospfclient doc \
 	       isisd
 
 EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS vtysh/Makefile.in \
-	vtysh/Makefile.am update-autotools doc/mpls \
-	redhat/quagga.* redhat/*.init
+	vtysh/Makefile.am update-autotools doc/mpls
 
 dist-hook:
 	mkdir $(distdir)/tools
diff --git a/redhat/Makefile.am b/redhat/Makefile.am
new file mode 100644
index 00000000..94a63d08
--- /dev/null
+++ b/redhat/Makefile.am
@@ -0,0 +1,4 @@
+
+EXTRA_DIST = quagga.pam quagga.sysconfig quagga.spec quagga.logrotate \
+	zebra.init ripd.init ospfd.init ripngd.init ospf6d.init bgpd.init \
+	isisd.init 
diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index 2512d313..241e26c7 100644
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -42,6 +42,8 @@ Release:	@CONFDATE@01
 License:	GPL
 Group: System Environment/Daemons
 Source0:	http://www.quagga.net/snapshots/cvs/%{name}-%{version}.tar.gz
+Patch0:		quagga-ospfd-dump-nsm-ignore.diff
+Patch1:		quagga-ospfd-iface-config-persist.diff
 URL:		http://www.quagga.net
 %if %with_snmp
 BuildRequires:	ucd-snmp-devel
@@ -90,6 +92,8 @@ developing OSPF-API and quagga applications.
 
 %prep
 %setup  -q
+%patch0 -p0 -b .dump_nsm
+%patch0 -p1 -b .iface_persist
 
 %build
 %configure \
@@ -292,6 +296,11 @@ fi
 
 %changelog
 %changelog
+* Thu Jan 08 2004 Paul Jakma <paul@dishone.st>
+- updated sysconfig files to specify local dir
+- added ospf_dump.c crash quick fix patch
+- added ospfd persistent interface configuration patch
+
 * Tue Dec 30 2003 Paul Jakma <paul@dishone.st>
 - sync to CVS
 - integrate RH sysconfig patch to specify daemon options (RH)
diff --git a/redhat/quagga.sysconfig b/redhat/quagga.sysconfig
index fc905afd..2194d6aa 100644
--- a/redhat/quagga.sysconfig
+++ b/redhat/quagga.sysconfig
@@ -1,9 +1,11 @@
 #
 # Default: Bind all daemon vtys to the loopback(s) only
 #
-BGPD_OPTS="-A 127.0.0.1"
-OSPF6D_OPTS="-A ::1"
-OSPFD_OPTS="-A 127.0.0.1"
-RIPD_OPTS="-A 127.0.0.1"
-RIPNGD_OPTS="-A ::1"
-ZEBRA_OPTS="-A 127.0.0.1"
+QCONFDIR="/etc/quagga"
+BGPD_OPTS="-A 127.0.0.1 -f ${QCONFDIR}/bgpd.conf"
+OSPF6D_OPTS="-A ::1$ -f ${QCONFDIR}/ospf6d.conf"
+OSPFD_OPTS="-A 127.0.0.1 -f ${QCONFDIR}/ospfd.conf"
+RIPD_OPTS="-A 127.0.0.1 -f ${QCONFDIR}/ripd.conf"
+RIPNGD_OPTS="-A ::1 -f ${QCONFDIR}/ripngd.conf"
+ZEBRA_OPTS="-A 127.0.0.1 -f ${QCONFDIR}/zebra.conf"
+ISISD_OPTS="-A ::1 -f ${QCONFDIR}/isisd.conf"