From 1075abe46bd5c16190ec1d028d65996273236282 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 04:38:28 +0000 Subject: [PATCH] auto-import evolution-1.2.2-5 from evolution-1.2.2-5.src.rpm --- evolution.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 59842a6..3b0cab5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -23,7 +23,7 @@ Name: evolution Version: 1.2.2 -Release: 4 +Release: 5 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -33,6 +33,10 @@ Source1: db-3.1.17.tar.bz2 # patches pulled from upstream CVS Patch0: evolution-1.2.2-mail-memleak.patch Patch1: evolution-1.2.2-proxy-gnome2.patch +# security patches for CORE-20030304 +Patch2: evolution-1.2.2-dont-use-bonobo-component.patch +Patch3: evolution-1.2.2-safer-contentid-parse.patch +Patch4: evolution-1.2.2-sanity-check-uue-header.patch # Red Hat Linux specific patches Patch11: evolution-1.1.90-redhatify.patch @@ -121,6 +125,9 @@ personal information-management tool. # these are in CVS already on the 1-2-branch %patch0 -p1 -b .memleak %patch1 -p1 -b .proxysettings +%patch2 -p0 -b .bonobocomponent +%patch3 -p0 -b .contentid +%patch4 -p0 -b .uueheader # Red Hat specific patches %patch11 -p1 -b .rhatify @@ -257,7 +264,14 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Mon Feb 24 2003 Elliot Lee +* Wed Mar 19 2003 Jeremy Katz 1.2.2-5 +- security patches from upstream + - sanity check UUEncoding header before decoding (CAN-2003-0128) + - don't decode doubly UUEncoded content (CAN-2003-0129) + - don't use a bonobo component to display things without registered + handlers (CAN-2003-0130) + +* Mon Feb 24 2003 Elliot Lee 1.2.2-4 - debuginfo rebuild * Thu Feb 20 2003 Jeremy Katz 1.2.2-3