diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2009-03-08 18:05:47 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2009-03-08 18:05:47 +0000 |
| commit | 7951c0a2225af13c8f3efaeecb9f402f9d6b0e75 (patch) | |
| tree | 75310dc54aaf7c02490acc4f8a8f14b23a284462 /gnome-extra/evolution-data-server | |
| parent | amd64/x86 stable, bug #260288 (diff) | |
| download | historical-7951c0a2225af13c8f3efaeecb9f402f9d6b0e75.tar.gz historical-7951c0a2225af13c8f3efaeecb9f402f9d6b0e75.tar.bz2 historical-7951c0a2225af13c8f3efaeecb9f402f9d6b0e75.zip | |
Updated patch from upstream
Package-Manager: portage-2.1.6.7/cvs/Linux x86_64
Diffstat (limited to 'gnome-extra/evolution-data-server')
3 files changed, 16 insertions, 12 deletions
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index da3882d56b86..c73499a3afd4 100644 --- a/gnome-extra/evolution-data-server/ChangeLog +++ b/gnome-extra/evolution-data-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/evolution-data-server # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.207 2009/03/07 20:54:16 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.208 2009/03/08 18:05:47 dang Exp $ + + 08 Mar 2009; Daniel Gryniewicz <dang@gentoo.org> + files/evolution-data-server-2.24.5-CVE-2009-0547.patch: + Updated patch from upstream *evolution-data-server-2.24.5-r1 (07 Mar 2009) *evolution-data-server-2.22.3-r2 (07 Mar 2009) diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index f2a409bfae00..f46f1a9c96af 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -16,7 +16,7 @@ AUX evolution-data-server-2.22.3-CVE-2009-0547.patch 3887 RMD160 1b851248cc79c2f AUX evolution-data-server-2.22.3-mail-cleanup-delay.patch 2974 RMD160 b482fbd815f1853522d845fa3acf643dbb5ebac8 SHA1 bae6f30319ea13d0b4c1aed63b92cf9f23f39c29 SHA256 3be97d843539c285a36af973145d3cc8bec99b84a54282eab0900df867b030c4 AUX evolution-data-server-2.22.3-timezone-western.patch 2041 RMD160 8a0d9e308123ebc48a6ea9c7932c8639765a96b8 SHA1 963f7c7a0659a4ca6659f5983e8a47825c70b8e9 SHA256 56e3311334bac728db2c7afcd200e56acc3e0a9819659cdffb745c488bbb4126 AUX evolution-data-server-2.23.6-as-needed.patch 3469 RMD160 43c48a35d0480a82db6cf131c0fdd0062353efc4 SHA1 96ef4dd901730ab2f77716646517a5ef40a5f982 SHA256 4899ffd8773229ecb43afbffdb91faa1fd433630395792998973f62aa54afb37 -AUX evolution-data-server-2.24.5-CVE-2009-0547.patch 3797 RMD160 7e49ece85b83c85c0bf64bbdd00020135a555be1 SHA1 43f207160f2cacab300e435fb4d4d808c46d67fb SHA256 1e41bc6ad495b9d27c26d87d59c9c18761395b61492043de846ffaede84c2353 +AUX evolution-data-server-2.24.5-CVE-2009-0547.patch 3977 RMD160 24bd47ad13994f712bf4976fed06997e93130bf1 SHA1 624a3072eed233542829a557c1434a63ac9e64be SHA256 7aefaa4cf040efa4aca3fbf49910003a5368eb44d5e5b46f53f044495de7ff8d AUX evolution-data-server-no_lazy_bindings.patch 551 RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c SHA1 34aa3d902e0e704f67c6fceee820dad158d82be2 SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403 DIST evolution-data-server-1.12.3.tar.bz2 7447166 RMD160 c7102c38af4888f3f8933c9d28981d1809d504f8 SHA1 12b8b23fb77ff6436def3cc5ea472886c8e0350e SHA256 e2d9038e3cd115ea5af2f3b7d381f5803c62d1ec36206e5a1bea0f823d25fab5 DIST evolution-data-server-2.22.3.tar.bz2 7621470 RMD160 eed9c26fba0b69f0cbe44b01d698388c4ae44a0b SHA1 5d01b1248fcacef9c478787892f223338dff731b SHA256 6e9fa1258c8b4d1fd75a1da78ee637ad5b8a82bc58c93324d73afecf8d73fe87 @@ -33,12 +33,12 @@ EBUILD evolution-data-server-2.24.3.ebuild 3301 RMD160 c84b5378dd51df2c438f579e5 EBUILD evolution-data-server-2.24.4.ebuild 3472 RMD160 bfd52e2916877c8fef535e1d165c647eb9cf74e6 SHA1 8954d1c0511612dbe2e06abdf3fc3f956d113430 SHA256 125d98acc684db29da51f887868c0cc4f8fd2342537855526d86891c683d9a98 EBUILD evolution-data-server-2.24.5-r1.ebuild 3560 RMD160 a0eafdfb09138c2db87abc49dab8d696f84793d5 SHA1 1446592184cc69c2759991212cd869cbc735eb1d SHA256 faeec079eccaaa04920c73b3cabf74b1edb193e56f03edb1bf241da8f193343c EBUILD evolution-data-server-2.24.5.ebuild 3468 RMD160 86cfbb8050539048a3ef937c9df7a79f6f7a0611 SHA1 8ae2c78370cfc6617de98c6d4ad76f65e8ba4142 SHA256 cf08d11ed21da84b00d39162313659b2eddfb9558e173228be02bf7db7d34cf3 -MISC ChangeLog 39582 RMD160 5ad9a3101aa98b97266c5a5d56505526fa55eda0 SHA1 496099f12600b0e600f119d702decbbb648e25d7 SHA256 214206834fa4cdfbf69da43a10cbd1a666c54b50d59a7f9576ed0686ba67df1e +MISC ChangeLog 39722 RMD160 38c5e9cf251f6ab9769396c2be9308ca2c7ca963 SHA1 da974670c4eeae1361d83a8a2b990f15c38fb268 SHA256 ea9283625aed2fc1397e54add27d9f36681b2f16ac33942658eaf395e051d121 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.10 (GNU/Linux) -iD4DBQFJst8gomPajV0RnrERAsgAAJdXxMZZDYhBfhYK23C2TH6w2RPAAJ9beeAt -TGB5vYMQwMkwgPRQGSRuzg== -=q8Gs +iD8DBQFJtAkDomPajV0RnrERArN7AJ9a1Qk8011qmbuVyZiGzeuBUYQXSQCfeoJE +8aZfsmHxBzMF15mxfE776TA= +=lcCg -----END PGP SIGNATURE----- diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-CVE-2009-0547.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-CVE-2009-0547.patch index d523704e362a..b527c8021ba1 100644 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-CVE-2009-0547.patch +++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-CVE-2009-0547.patch @@ -59,12 +59,12 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2. - PORT_FreeArena(poolp, PR_FALSE); - poolp = NULL; + if (extstream == NULL) { -+ set_nss_error (ex, _("Digests missing from enveloped data")); ++ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Digests missing from enveloped data")); + goto fail; + } + + if ((poolp = PORT_NewArena(1024)) == NULL) { -+ set_nss_error (ex, g_strerror (ENOMEM)); ++ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, g_strerror (ENOMEM)); + goto fail; } + @@ -72,7 +72,7 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2. + + digcx = NSS_CMSDigestContext_StartMultiple(digestalgs); + if (digcx == NULL) { -+ set_nss_error (ex, _("Cannot calculate digests")); ++ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests")); + goto fail; + } + @@ -82,18 +82,18 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2. + camel_object_unref(mem); + + if (NSS_CMSDigestContext_FinishMultiple(digcx, poolp, &digests) != SECSuccess) { -+ set_nss_error (ex, _("Cannot calculate digests")); ++ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests")); + goto fail; + } + + for (which_digest = 0; digests[which_digest] != NULL; which_digest++) { + SECOidData *digest_alg = SECOID_FindOID (&digestalgs[which_digest]->algorithm); + if (digest_alg == NULL) { -+ set_nss_error (ex, _("Cannot set message digests")); ++ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests")); + goto fail; + } + if (NSS_CMSSignedData_SetDigestValue (sigd, digest_alg->offset, digests[which_digest]) != SECSuccess) { -+ set_nss_error (ex, _("Cannot set message digests")); ++ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests")); + goto fail; + } + } |