diff --git a/.cvsignore b/.cvsignore index 2cf23d7..99f1c61 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -quagga-0.96.2.tar.gz +quagga-0.96.3.tar.gz diff --git a/quagga.spec b/quagga.spec index caa5dac..5930c9b 100644 --- a/quagga.spec +++ b/quagga.spec @@ -14,7 +14,7 @@ %define quagga_uid 92 %define quagga_gid 92 %define quagga_user quagga -#%define vty_group quaggavty +%define vty_group quaggavt # path defines %define _sysconfdir /etc/quagga @@ -30,19 +30,18 @@ Summary: Routing daemon Name: quagga -Version: 0.96.2 -Release: 10.3E +Version: 0.96.3 +Release: 1 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 +#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.2-remote_dos.patch -Patch5: quagga-0.96.2-netlink.patch -Patch6: quagga-0.96.2-ripv1.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 URL: http://www.quagga.net %if %with_snmp BuildRequires: ucd-snmp-devel @@ -93,13 +92,12 @@ developing OSPF-API and quagga applications. %prep %setup -q -%patch0 -p1 -b .libcap +#%patch0 -p1 -b .libcap %patch1 -p1 -b .warnings %patch2 -p1 -b .sysconfig %patch3 -p1 -b .lib64 -%patch4 -p1 -b .remote_dos -%patch5 -p1 -b .netlink -%patch6 -p0 -b .ripv1 +%patch4 -p1 -b .warnings4 +%patch5 -p1 -b .remote_dos %build CFLAGS=-fPIE ; LDFLAGS=-pie ; %configure \ @@ -237,6 +235,9 @@ groupadd -r %vty_group 2> /dev/null || : # Create dummy files if they don't exist so basic functions can be used. if [ ! -e %{_sysconfdir}/zebra.conf ]; then echo "hostname `hostname`" > %{_sysconfdir}/zebra.conf +%if %quagga_user + chown %quagga_user:%quagga_user %{_sysconfdir}/zebra.conf +%endif chmod 640 %{_sysconfdir}/zebra.conf fi if [ ! -e %{_sysconfdir}/vtysh.conf ]; then @@ -257,26 +258,20 @@ if [ "$1" -ge "1" ]; then %endif /etc/rc.d/init.d/bgpd condrestart >/dev/null 2>&1 fi +/sbin/install-info --delete %{_infodir}/quagga.info.gz %{_infodir}/dir %preun if [ "$1" = "0" ]; then - /etc/rc.d/init.d/zebra stop >/dev/null 2>&1 /sbin/chkconfig --del zebra - /etc/rc.d/init.d/ripd stop >/dev/null 2>&1 /sbin/chkconfig --del ripd %if %with_ipv6 - /etc/rc.d/init.d/ripngd stop >/dev/null 2>&1 /sbin/chkconfig --del ripngd %endif - /etc/rc.d/init.d/ospfd stop >/dev/null 2>&1 /sbin/chkconfig --del ospfd %if %with_ipv6 - /etc/rc.d/init.d/ospf6d stop >/dev/null 2>&1 /sbin/chkconfig --del ospf6d %endif - /etc/rc.d/init.d/bgpd stop >/dev/null 2>&1 /sbin/chkconfig --del bgpd - /sbin/install-info --delete %{_infodir}/quagga.info.gz %{_infodir}/dir fi %clean @@ -311,7 +306,8 @@ fi %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 %defattr(-,root,root) @@ -326,50 +322,46 @@ fi %endif %changelog -* Fri Nov 14 2003 Jay Fenlason 0.96.2-10.3E -- Add a patch to make RIPv1 work (Bugzilla #109282, #109049). This - patch was included in 0.96.4 so it's been fairly well tested. +* Wed Oct 15 2003 Jay Fenlason 0.96.3-1 +- Patch a remote DoS attack (#107140) +- New upstream version +- Removed the .libcap patch, which was applied upstream +- Renamed the vty group from quaggavty to quaggavt because quaggavty is + too long for NIS. +- Patch the spec file to fix #106857: /etc/quagga/zebra.conf is created with + the wrong owner. +- Removed the "med" part of the 0.96.1-warnings patch for . . . +- Add a new warnings patch with a fix for #106315. This also updates + the "med" part of the previous warnings patch. -* Wed Oct 29 2003 Jay Fenlason 0.96.2-8.3E -- Fix a local DOS attack. -- Fix the specfile so that upgrading quagga does not accidentally run - /sbin/install-info --delete %{_infodir}/quagga.info.gz %{_infodir}/dir - which deletes the quagga info page from the info directory. -- Stop the daemons correctly when quagga is removed. +* Mon Sep 22 2003 Jay Fenlason 0.96.2-5 +- merge sysconfig patch from 3E branch. This patch is from Kaj J. Niemi + (kajtzu@basen.net), and puts Quagga configuration options in + /etc/sysconfig/quagga, and defaults Quagga to listening on 127.0.0.1 only. + This closes #104376 +- Use /sbin/nologin for the shell of the quagga user. This closes #103320 +- Update the quagga-0.96.1-warnings.patch patch to kill a couple more + warnings. -* Wed Oct 22 2003 Jay Fenlason 0.96.2-6.3E -- Fix a remote DOS attack (#107140) - -* Mon Sep 22 2003 Nalin Dahyabhai 0.96.2-4.3E +* Mon Sep 22 2003 Nalin Dahyabhai - Remove the directory part of paths for PAM modules in quagga.pam, allowing libpam to search its default directory (needed if a 64-bit libpam needs to - look in /lib64/security instead of /lib/security). Pulled up from HEAD. + look in /lib64/security instead of /lib/security). -* Wed Sep 17 2003 Jay Fenlason 0.96.2-2.3E -- Close bugzilla #103320 by using /sbin/nologin for the quagga user -- Include a patch from Kaj J. Niemi (kajtzu@basen.net) to put Quagga - configuration options in /etc/sysconfig/quagga and default Quagga to - only listening on 127.0.0.1 This closes bugzilla #104376) +* Tue Aug 26 2003 Jay Fenlason 0.96.2-1 +- New upstream version -* Wed Aug 27 2003 Jay Fenlason 0.96.2-0.3E -- Merge from HEAD including -- New upstream version - -* Tue Aug 19 2003 Jay Fenlason 0.96.1-2.3E -- Fix bugzilla #102673 by groupadd and useradd-ing quagga - in %pre. -- Quash a couple more compiler warnings while we're at it. - -* Wed Aug 13 2003 Jay Fenlason 0.96-0.3E -- merge from HEAD to the 3E branch for taroon. +* Tue Aug 19 2003 Jay Fenlason 0.96.1-3 +- Merge from quagga-3E-branch, with a fix for #102673 and a couple + more compiler warnings quashed. +* Wed Aug 13 2003 Jay Fenlason 0.96-1 - added a patch (libwrap) to allow the generated Makefiles for zebra/ and lib/ to work on AMD64 systems. For some reason make there does not like a dependency on -lcap - added a patch (warnings) to shut up warnings about an undefined structure type in some function prototypes and quiet down all the warnings about assert(ptr) on x86_64. - - Modified the upstream quagga-0.96/readhat/quagga.spec to work as an official Red Hat package (remove user and group creation and changes to services) diff --git a/sources b/sources index fa3221a..71e4fa0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d32a24cd366199b8c4599a46ca46204b quagga-0.96.2.tar.gz +a06a2c1b048302da711b4a8d51d5403a quagga-0.96.3.tar.gz