[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/quagga/FC-2 quagga-0.96.5-nostart.patch, NONE, 1.1 quagga-0.98.2-gcc4.patch, NONE, 1.1 quagga.spec, 1.8, 1.9 sources, 1.4, 1.5 quagga-0.96.1-warnings.patch, 1.2, NONE quagga-0.96.2-lib64.patch, 1.1, NONE quagga-0.96.2-sysconfig.patch, 1.1, NONE



Update of /cvs/dist/rpms/quagga/FC-2
In directory cvs.devel.redhat.com:/tmp/cvs-serv6065

Modified Files:
	quagga.spec sources 
Added Files:
	quagga-0.96.5-nostart.patch quagga-0.98.2-gcc4.patch 
Removed Files:
	quagga-0.96.1-warnings.patch quagga-0.96.2-lib64.patch 
	quagga-0.96.2-sysconfig.patch 
Log Message:
Upgrade to 0.98.3


quagga-0.96.5-nostart.patch:
 bgpd.init   |    2 +-
 isisd.init  |    2 +-
 ospf6d.init |    2 +-
 ospfd.init  |    2 +-
 ripd.init   |    2 +-
 ripngd.init |    2 +-
 zebra.init  |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE quagga-0.96.5-nostart.patch ---
--- quagga-0.96.5/redhat/bgpd.init.nostart	2004-09-09 17:20:54.329037601 -0400
+++ quagga-0.96.5/redhat/bgpd.init	2004-09-09 17:20:54.332037209 -0400
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 2345 16 84
+# chkconfig: - 16 84
 # description: A BGPv4, BGPv4+, BGPv4- routing engine for use with Zebra
 #
 # processname: bgpd
--- quagga-0.96.5/redhat/isisd.init.nostart	2004-09-09 17:20:54.335036817 -0400
+++ quagga-0.96.5/redhat/isisd.init	2004-09-09 17:20:54.337036556 -0400
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 2345 16 84
+# chkconfig: - 16 84
 # description: An ISIS routing engine for use with Quagga
 #
 # processname: isisd
--- quagga-0.96.5/redhat/ospf6d.init.nostart	2004-09-09 17:20:54.340036164 -0400
+++ quagga-0.96.5/redhat/ospf6d.init	2004-09-09 17:20:54.342035903 -0400
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 2345 16 84
+# chkconfig: - 16 84
 # description: An OSPF routing engine for use with Zebra and IPv6
 #
 # processname: ospf6d
--- quagga-0.96.5/redhat/ospfd.init.nostart	2004-09-09 17:20:54.345035511 -0400
+++ quagga-0.96.5/redhat/ospfd.init	2004-09-09 17:20:54.347035250 -0400
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 2345 16 84
+# chkconfig: - 16 84
 # description: An OSPF v2 routing engine for use with Zebra
 #
 # processname: ospfd
--- quagga-0.96.5/redhat/ripd.init.nostart	2004-09-09 17:20:54.350034858 -0400
+++ quagga-0.96.5/redhat/ripd.init	2004-09-09 17:20:54.353034466 -0400
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 2345 16 84
+# chkconfig: - 16 84
 # description: A RIP routing engine for use with Zebra
 #
 # processname: ripd
--- quagga-0.96.5/redhat/ripngd.init.nostart	2004-09-09 17:20:54.356034074 -0400
+++ quagga-0.96.5/redhat/ripngd.init	2004-09-09 17:20:54.359033682 -0400
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 2345 16 84
+# chkconfig: - 16 84
 # description: A RIP routing engine for use with Zebra and IPv6
 #
 # processname: ripngd
--- quagga-0.96.5/redhat/zebra.init.nostart	2004-09-09 17:20:54.361033421 -0400
+++ quagga-0.96.5/redhat/zebra.init	2004-09-09 17:20:54.364033029 -0400
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 2345 15 85
+# chkconfig: - 15 85
 # description: GNU Zebra routing manager
 #
 # processname: zebra

quagga-0.98.2-gcc4.patch:
 ospfclient/ospfclient.c |    1 +
 ospfd/ospf_lsdb.c       |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE quagga-0.98.2-gcc4.patch ---
--- quagga-0.98.2/ospfd/#ospf_lsdb.c~	2005-03-08 15:15:02.000000000 -0500
+++ quagga-0.98.2/ospfd/ospf_lsdb.c	2005-03-08 15:14:15.000000000 -0500
@@ -25,6 +25,7 @@
 #include "prefix.h"
 #include "table.h"
 #include "memory.h"
+#include "log.h"
 
 #include "ospfd/ospfd.h"
 #include "ospfd/ospf_asbr.h"
--- quagga-0.98.2/ospfclient/#ospfclient.c~	2005-03-08 15:08:00.000000000 -0500
+++ quagga-0.98.2/ospfclient/ospfclient.c	2005-03-08 15:08:00.000000000 -0500
@@ -12,6 +12,7 @@
 #include <zebra.h>
 #include "prefix.h" /* needed by ospf_asbr.h */
 #include "privs.h"
+#include "log.h"
 
 #include "ospfd/ospfd.h"
 #include "ospfd/ospf_asbr.h"


Index: quagga.spec
===================================================================
RCS file: /cvs/dist/rpms/quagga/FC-2/quagga.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- quagga.spec	9 Sep 2004 11:04:48 -0000	1.8
+++ quagga.spec	4 Apr 2005 21:10:55 -0000	1.9
@@ -2,6 +2,7 @@
 %define 	with_snmp	0
 %define		with_vtysh	1
 %define		with_ospf_te	1
+%define         with_rtadv      1
 %define		with_nssa	1
 %define		with_opaque_lsa 1
 %define		with_tcp_zebra	0
@@ -30,19 +31,15 @@
 
 Summary: Routing daemon
 Name:		quagga
-Version:	0.96.4
-Release: 1.1
+Version:	0.98.3
+Release: 1.FC2
 License:	GPL
 Group: System Environment/Daemons
 Source0:	http://www.quagga.net/download/%{name}-%{version}.tar.gz
 Source1:        quagga-filter-perl-requires.sh
-#Patch0:         quagga-0.96.1-libcap.patch
-Patch1:         quagga-0.96.1-warnings.patch
-Patch2:         quagga-0.96.2-sysconfig.patch
-Patch3:         quagga-0.96.2-lib64.patch
-#Patch4:         quagga-0.96.3-warnings.patch
-#Patch5:         quagga-0.96.3-remote_dos.patch
-Patch6:         quagga-0.96.3-netlink.patch
+Patch1:         quagga-0.96.3-netlink.patch
+Patch2:         quagga-0.96.5-nostart.patch
+Patch3:		quagga-0.98.2-gcc4.patch
 URL:		http://www.quagga.net
 %if %with_snmp
 BuildRequires:	ucd-snmp-devel
@@ -50,9 +47,9 @@
 %endif
 %if %with_vtysh
 BuildRequires:	readline readline-devel ncurses ncurses-devel
-Prereq:		readline ncurses
+Prereq:		ncurses
 %endif
-BuildRequires:	texinfo tetex autoconf pam-devel patch libcap-devel
+BuildRequires:	texinfo tetex autoconf pam-devel patch libcap-devel gcc-c++
 %define __perl_requires %{SOURCE1}
 
 # Initscripts > 5.60 is required for IPv6 support
@@ -93,13 +90,9 @@
 
 %prep
 %setup  -q
-#%patch0 -p1 -b .libcap
-%patch1 -p1 -b .warnings
-%patch2 -p1 -b .sysconfig
-%patch3 -p1 -b .lib64
-#%patch4 -p1 -b .warnings4
-#%patch5 -p1 -b .remote_dos
-%patch6 -p1 -b .netlink
+%patch1 -p1 -b .netlink
+%patch2 -p1 -b .nostart
+%patch3 -p1 -b .gcc4
 
 %build
 CFLAGS=-fPIE ; LDFLAGS=-pie ; %configure \
@@ -127,7 +120,7 @@
 %if %with_vtysh
 	--enable-vtysh \
 %endif
-%if %with_ospfclient 
+%if %with_ospfclient
 	--enable-ospfclient=yes \
 %else
 	--enable-ospfclient=no\
@@ -147,6 +140,9 @@
 %if %vty_group
 	--enable-vty-group=%vty_group \
 %endif
+%if %with_rtadv
+       --enable-rtadv \
+%endif
 --with-cflags="-O2" \
 --enable-netlink
 
@@ -192,6 +188,12 @@
 /usr/sbin/groupadd -g %quagga_gid quagga 2> /dev/null || :
 /usr/sbin/useradd -u %quagga_uid -g %quagga_gid -M -r -s /sbin/nologin \
  -c "Quagga routing suite" -d %_localstatedir %quagga_user 2> /dev/null || :
+if getent group %quagga_user >/dev/null 2>&1 ; then : ; else \
+ /usr/sbin/groupadd -g %quagga_gid %quagga_user > /dev/null 2>&1 || exit 1 ; fi
+if getent passwd %quagga_user >/dev/null 2>&1 ; then : ; else \
+ /usr/sbin/useradd -u %quagga_uid -g %quagga_gid -M -r -s /sbin/nologin \
+ -c "Quagga routing suite" -d %_localstatedir %quagga_user 2> /dev/null \
+ || exit 1 ; fi
 %endif
 
 %post
@@ -202,7 +204,7 @@
 #
 #zebra_spec_add_service ()
 #{
-#  # Add port /etc/services entry if it isn't already there 
+#  # Add port /etc/services entry if it isn't already there
 #  if [ -f /etc/services ] && ! grep -q "^$1[^a-zA-Z0-9]" /etc/services ; then
 #    echo "$1		$2			# $3"  >> /etc/services
 #  fi
@@ -223,7 +225,7 @@
 #zebra_spec_add_service ospfapi  2607/tcp "OSPF-API"
 #%endif
 
-/sbin/chkconfig --add zebra 
+/sbin/chkconfig --add zebra
 /sbin/chkconfig --add ripd
 %if %with_ipv6
 /sbin/chkconfig --add ripngd
@@ -277,7 +279,7 @@
 fi
 
 %clean
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -287,8 +289,8 @@
 %doc ChangeLog INSTALL NEWS README REPORTING-BUGS SERVICES TODO
 %if %quagga_user
 %dir %attr(751,%quagga_user,%quagga_user) %{_sysconfdir}
-%dir %attr(750,%quagga_user,%quagga_user) /var/log/quagga 
-%dir %attr(751,%quagga_user,%quagga_user) /var/run/quagga
+%dir %attr(770,%quagga_user,%quagga_user) /var/log/quagga
+%dir %attr(771,%quagga_user,%quagga_user) /var/run/quagga
 %else
 %dir %attr(750,root,root) %{_sysconfdir}
 %dir %attr(750,root,root) /var/log/quagga
@@ -304,11 +306,13 @@
 %if %with_vtysh
 %{_bindir}/*
 %endif
+%dir %{_libdir}
+%{_libdir}/*.so*
 %config /etc/quagga/[!v]*
 %config /etc/rc.d/init.d/*
 %config(noreplace) /etc/pam.d/quagga
 %config(noreplace) %attr(640,root,root) /etc/logrotate.d/*
-%config(noreplace) /etc/sysconfig/quagga                  
+%config(noreplace) /etc/sysconfig/quagga
 
 
 %files contrib
@@ -317,15 +321,25 @@
 
 %files devel
 %defattr(-,root,root)
-%dir %{_libdir}/*
-%dir %{_includedir}
-%{_includedir}/*.h
-%dir %{_includedir}/ospfd/*
+%{_libdir}/*.a
+%{_libdir}/*.la
+%dir %{_includedir}/quagga
+%{_includedir}/quagga/*.h
+%dir %{_includedir}/quagga/ospfd
+%{_includedir}/quagga/ospfd/*.h
 %if %with_ospfapi
-%dir %{_includedir}/ospfapi/*
+%dir %{_includedir}/quagga/ospfapi
+%{_includedir}/quagga/ospfapi/*.h
 %endif
 
 %changelog
+* Mon Apr 4 2005 Jay Fenlason <fenlason redhat com> 0.98.3-1.FC2
+- new upstream version
+- clean up trailing whitespace in this spec file
+- clean up this spec file to match FC3 and rawhide, including
+  moving the .so files to the main rpm.
+- add --enable-rtadv to keep bz#114691 closed.
+
 * Tue Mar 02 2004 Elliot Lee <sopwith redhat com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/quagga/FC-2/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 11:03:47 -0000	1.4
+++ sources	4 Apr 2005 21:10:55 -0000	1.5
@@ -1 +1 @@
-55f5a307c453f90d7dfcc13f0dabb83d  quagga-0.96.4.tar.gz
+68be5e911e4d604c0f5959338263356e  quagga-0.98.3.tar.gz


--- quagga-0.96.1-warnings.patch DELETED ---


--- quagga-0.96.2-lib64.patch DELETED ---


--- quagga-0.96.2-sysconfig.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]