From 87004dc6cab95d41f1a33503335daec4bf438c22 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Jul 02 2007 17:56:52 +0000 Subject: - Update to 1.10.3 - Remove patch for RH bug #203915 (fixed upstream). --- diff --git a/.cvsignore b/.cvsignore index 51ff9c1..0d3af09 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-data-server-1.10.2.tar.bz2 +evolution-data-server-1.10.3.tar.bz2 diff --git a/evolution-data-server-1.10.2-implicit-function-declarations.patch b/evolution-data-server-1.10.2-implicit-function-declarations.patch deleted file mode 100644 index d92975f..0000000 --- a/evolution-data-server-1.10.2-implicit-function-declarations.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- evolution-data-server-1.10.2/calendar/libical/src/libical/icalvalue.c.implicit-function-declarations 2007-05-28 00:21:24.000000000 -0400 -+++ evolution-data-server-1.10.2/calendar/libical/src/libical/icalvalue.c 2007-05-28 22:38:36.000000000 -0400 -@@ -47,6 +47,7 @@ - #include /* for atoi and atof */ - #include /* for SHRT_MAX */ - #include -+#include /* for isspace and isdigit */ - - #ifdef WIN32 - #define snprintf _snprintf diff --git a/evolution-data-server-1.8.0-fix-camel-malloc.patch b/evolution-data-server-1.8.0-fix-camel-malloc.patch deleted file mode 100644 index 30e53de..0000000 --- a/evolution-data-server-1.8.0-fix-camel-malloc.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- evolution-data-server-1.8.0/camel/camel-object.c.fix-camel-malloc 2006-09-26 16:26:00.000000000 -0400 -+++ evolution-data-server-1.8.0/camel/camel-object.c 2006-09-26 16:35:32.000000000 -0400 -@@ -455,9 +455,13 @@ - /* maybe it was just version 0 afterall */ - return 0; - } -+ -+ count = MIN(count, CAMEL_ARGV_MAX); - - /* we batch up the properties and set them in one go */ -- if (!(argv = g_try_malloc ((gulong)(sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0]))))) -+ argv = g_try_malloc(sizeof(CamelArgV) - -+ ((CAMEL_ARGV_MAX - count) * sizeof(CamelArg))); -+ if (argv == NULL) - return -1; - - argv->argc = 0; -@@ -536,9 +540,12 @@ - we also need an argv to store the results - bit messy */ - - count = g_slist_length(props); -+ count = MIN(count, CAMEL_ARGV_MAX); - -- arggetv = g_malloc0(sizeof(*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof(arggetv->argv[0])); -- argv = g_malloc0(sizeof(*argv) + (count - CAMEL_ARGV_MAX) * sizeof(argv->argv[0])); -+ arggetv = g_malloc0(sizeof(CamelArgGetV) - -+ ((CAMEL_ARGV_MAX - count) * sizeof(CamelArgGet))); -+ argv = g_malloc0(sizeof(CamelArgV) - -+ ((CAMEL_ARGV_MAX - count) * sizeof(CamelArg))); - l = props; - i = 0; - while (l) { diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 8c2f822..d651100 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -25,8 +25,8 @@ ### Abstract ### Name: evolution-data-server -Version: 1.10.2 -Release: 3%{?dist} +Version: 1.10.3 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -45,50 +45,44 @@ Patch11: evolution-data-server-1.8.0-no-gnome-common.patch # RH bug #202309 Patch12: evolution-data-server-1.7.91-maybe-fix-crash.patch -# RH bug #203915 -Patch13: evolution-data-server-1.8.0-fix-camel-malloc.patch - # GNOME bug #360240 -Patch14: evolution-data-server-1.8.1-warn-unused-variable.patch +Patch13: evolution-data-server-1.8.1-warn-unused-variable.patch # GNOME bug #360619 -Patch15: evolution-data-server-1.8.1-warn-incompatible-pointer-type.patch +Patch14: evolution-data-server-1.8.1-warn-incompatible-pointer-type.patch # GNOME bug #363965 -Patch16: evolution-data-server-1.9.1-kill-ememory.patch +Patch15: evolution-data-server-1.9.1-kill-ememory.patch # RH bug #203058 -Patch17: evolution-data-server-1.9.2-fix-name-selector-dialog.patch +Patch16: evolution-data-server-1.9.2-fix-name-selector-dialog.patch # RH bug #210142 -Patch18: evolution-data-server-1.9.2-strftime.patch +Patch17: evolution-data-server-1.9.2-strftime.patch # GNOME bug #373117 -Patch19: evolution-data-server-1.9.3-e-source-color.patch +Patch18: evolution-data-server-1.9.3-e-source-color.patch # GNOME bug #415891 -Patch20: evolution-data-server-1.9.92-e-flag.patch +Patch19: evolution-data-server-1.9.92-e-flag.patch # GNOME bug #376991 -Patch21: evolution-data-server-1.9.92-e-passwords.patch +Patch20: evolution-data-server-1.9.92-e-passwords.patch # GNOME bug #415922 -Patch22: evolution-data-server-1.9.92-isa-support.patch +Patch21: evolution-data-server-1.9.92-isa-support.patch # GNOME bug #417999 -Patch23: evolution-data-server-1.10.0-code-cleanup.patch +Patch22: evolution-data-server-1.10.0-code-cleanup.patch # GNOME bug #373146 -Patch24: evolution-data-server-1.10.1-camel-folder-summary-crash.patch +Patch23: evolution-data-server-1.10.1-camel-folder-summary-crash.patch # RH bug #215634 -Patch25: evolution-data-server-1.10.1-camel-certdb-nss-cert-get.patch - -# Fix implicit function declarations -Patch26: evolution-data-server-1.10.2-implicit-function-declarations.patch +Patch24: evolution-data-server-1.10.1-camel-certdb-nss-cert-get.patch # RH bug #244283 / GNOME bug #447414 -Patch27: evolution-data-server-1.10.2-camel-imap-folder.patch +Patch25: evolution-data-server-1.10.2-camel-imap-folder.patch ### Dependencies ### @@ -172,21 +166,19 @@ evolution-data-server. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .no-gnome-common %patch12 -p1 -b .maybe-fix-crash -%patch13 -p1 -b .fix-camel-malloc -%patch14 -p1 -b .warn-unused-variable -%patch15 -p1 -b .warn-incompatible-pointer-type -%patch16 -p1 -b .kill-ememory -%patch17 -p1 -b .fix-name-selector-dialog -%patch18 -p1 -b .strftime -%patch19 -p1 -b .e-source-color -%patch20 -p1 -b .e-flag -%patch21 -p1 -b .e-passwords -%patch22 -p1 -b .isa-support -%patch23 -p1 -b .code-cleanup -%patch24 -p1 -b .camel-folder-symmary-crash -%patch25 -p1 -b .camel-certdb-nss-cert-get -%patch26 -p1 -b .implicit-function-declarations -%patch27 -p1 -b .camel-imap-folder +%patch13 -p1 -b .warn-unused-variable +%patch14 -p1 -b .warn-incompatible-pointer-type +%patch15 -p1 -b .kill-ememory +%patch16 -p1 -b .fix-name-selector-dialog +%patch17 -p1 -b .strftime +%patch18 -p1 -b .e-source-color +%patch19 -p1 -b .e-flag +%patch20 -p1 -b .e-passwords +%patch21 -p1 -b .isa-support +%patch22 -p1 -b .code-cleanup +%patch23 -p1 -b .camel-folder-symmary-crash +%patch24 -p1 -b .camel-certdb-nss-cert-get +%patch25 -p1 -b .camel-imap-folder mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -404,6 +396,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Mon Jul 02 2007 Matthew Barnes - 1.10.3-1.fc7 +- Update to 1.10.3 +- Remove patch for RH bug #203915 (fixed upstream). + * Fri Jun 15 2007 Matthew Barnes - 1.10.2-3.fc7 - Add patch for RH bug #244283 (Camel IMAP security flaw). diff --git a/sources b/sources index a8035d4..e064c31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -790dfc97a917dff8384dcb7cad42f87f evolution-data-server-1.10.2.tar.bz2 +44438eca3ca3cab861109605611fe778 evolution-data-server-1.10.3.tar.bz2