Merge remote-tracking branch 'origin/master' into f16

Conflicts: quagga.spec sources
2012-06-07 12:07:07 +02:00 · 2012-05-03 13:32:05 +02:00 · 2012-03-15 13:08:36 +01:00 · 2011-11-23 11:55:47 +01:00 · 2011-10-26 20:30:15 -05:00 · 2011-10-18 10:01:44 +02:00
2 changed files with 12 additions and 3 deletions
--- a/quagga-0.99.20-memleak.patch
+++ b/quagga-0.99.20-memleak.patch
@ -0,0 +1,12 @@
+diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
+index d43c104..3908e72 100644
+--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
+@@ -675,6 +675,7 @@  bgp_attr_unintern (struct attr **attr)
+     }
+
+   bgp_attr_unintern_sub (&tmp);
+  bgp_attr_extra_free (&tmp);
+ }
+
+ void
--- a/quagga.spec
+++ b/quagga.spec
@ -446,9 +446,6 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Mar 15 2012 Jiri Skala <jskala@redhat.com> - 0.99.20.1-1
 - updated to latest upstream version 0.99.20.1

-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99.20-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
 * Wed Nov 23 2011 Jiri Skala <jskala@redhat.com> - 0.99.20-4
 - modified permissions of var dirs (fixes #755491)
Author	SHA1	Message	Date
Adam Tkac	349ec252a1	Merge remote-tracking branch 'origin/master' into f16	2012-06-07 12:07:07 +02:00
Adam Tkac	8dd4db6000	Merge remote-tracking branch 'origin/master' into f16 Conflicts: quagga.spec sources	2012-05-03 13:32:05 +02:00
Jiri Skala	635fcd0e11	updated to latest upstream version 0.99.20.1	2012-03-15 13:08:36 +01:00
Jiri Skala	ff1ea85bdb	modified permissions of var dirs (fixes #755491 )	2011-11-23 11:55:47 +01:00
Dennis Gilmore	50343b5a41	- Rebuilt for glibc bug#747377	2011-10-26 20:30:15 -05:00
Jiri Skala	8fc365913b	fixes #746886 - severe memory leak in quagga 0.99.{19,20}	2011-10-18 10:01:44 +02:00
Jiri Skala	b0cbd1377f	update to 0.99.20, corrected fix CVE-2011-3325	2011-09-30 09:32:09 +02:00
Jiri Skala	eda3f625df	updated to 0.99.19, fixes for CVE-2011-332{3..7}	2011-09-29 10:03:00 +02:00
Jiri Skala	db0d8a00ce	rebuild for rpm	2011-08-18 07:50:56 +02:00
Jiri Skala	7fa58998e5	rebuild for libcap	2011-08-01 11:06:23 +02:00