[arch-commits] Commit in evolution/repos (3 files)
Jan de Groot
jgc at archlinux.org
Thu Apr 24 21:49:13 UTC 2008
Date: Thursday, April 24, 2008 @ 17:49:13
Author: jgc
Revision: 929
Merged revisions 2-928 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/evolution/trunk
........
r119 | jgc | 2008-04-10 20:53:10 +0000 (Thu, 10 Apr 2008) | 1 line
upgpkg: evolution 2.22.1-1
........
r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
Added svn:keywords to all PKGBUILDs
........
Modified:
evolution/repos/extra-i686/ (properties)
evolution/repos/extra-i686/PKGBUILD
Deleted:
evolution/repos/extra-i686/evolution-CVE-2008-0072.patch
-------------------------------+
PKGBUILD | 12 ++-----
evolution-CVE-2008-0072.patch | 61 ----------------------------------------
2 files changed, 4 insertions(+), 69 deletions(-)
Property changes on: evolution/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
- /evolution/trunk:1
+ /evolution/trunk:1-928
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2008-04-24 21:35:45 UTC (rev 928)
+++ extra-i686/PKGBUILD 2008-04-24 21:49:13 UTC (rev 929)
@@ -2,18 +2,18 @@
# Maintainer: dale <dale at archlinux.org>
pkgname=evolution
-pkgver=2.22.0
+pkgver=2.22.1
pkgrel=1
pkgdesc="Integrated Workgroup and Personal Information Management for Gnome"
arch=(i686 x86_64)
license=('GPL')
-depends=('libnetworkmanager>=0.6.5' 'libnotify>=0.4.4' 'gtkhtml>=3.18.0' 'evolution-data-server>=2.22.0' 'gconf>=2.22.0')
-makedepends=('perlxml' 'gnome-pilot>=2.0.16' 'pkgconfig' 'gnome-doc-utils>=0.12.2' 'gstreamer0.10>=0.10.15')
+depends=('libnetworkmanager>=0.6.6' 'libnotify>=0.4.4' 'gtkhtml>=3.18.1' 'evolution-data-server>=2.22.1' 'gconf>=2.22.0')
+makedepends=('perlxml' 'gnome-pilot>=2.0.16' 'pkgconfig' 'gnome-doc-utils>=0.12.2' 'gstreamer0.10>=0.10.19')
options=('!libtool' '!emptydirs')
install=evolution.install
url=(http://www.gnome.org/projects/evolution/)
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('22567465cfba2658fd0a9be03f8c854f')
+md5sums=('b8eddd6e26b59b1fe6ad0ae849916836')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
@@ -30,10 +30,6 @@
make || return 1
make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
- #install -m755 -d ${startdir}/pkg/usr/include/evolution-2.12/composer
- #install -m644 composer/e-msg*.h ${startdir}/pkg/usr/include/evolution-2.12/composer/
- #install -m644 composer/Editor.h ${startdir}/pkg/usr/include/evolution-2.12/composer/
-
install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
Deleted: extra-i686/evolution-CVE-2008-0072.patch
===================================================================
--- extra-i686/evolution-CVE-2008-0072.patch 2008-04-24 21:35:45 UTC (rev 928)
+++ extra-i686/evolution-CVE-2008-0072.patch 2008-04-24 21:49:13 UTC (rev 929)
@@ -1,61 +0,0 @@
-A format string error in the "emf_multipart_encrypted()" function in
-mail/em-format.c when displaying the "Version:" field from an encrypted
-e-mail message can be exploited to execute arbitrary code via a
-specially crafted e-mail message.
-
-Successful exploitation requires that the user opens a malicious e-mail
-message.
-
-Ulf Harnhammar, Secunia Research.
-
-SA29057 and CVE-2008-0072
-
-Index: mail/em-format.c
-===================================================================
---- mail/em-format.c (revision 35096)
-+++ mail/em-format.c (working copy)
-@@ -1193,7 +1193,7 @@ emf_application_xpkcs7mime(EMFormat *emf
- opart = camel_mime_part_new();
- valid = camel_cipher_decrypt(context, part, opart, ex);
- if (valid == NULL) {
-- em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error"));
-+ em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error"));
- em_format_part_as(emf, stream, part, NULL);
- } else {
- if (emfc == NULL)
-@@ -1350,7 +1350,7 @@ emf_multipart_encrypted(EMFormat *emf, C
- if (valid == NULL) {
- em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error"));
- if (ex->desc)
-- em_format_format_error(emf, stream, ex->desc);
-+ em_format_format_error(emf, stream, "%s", ex->desc);
- em_format_part_as(emf, stream, part, "multipart/mixed");
- } else {
- if (emfc == NULL)
-@@ -1515,7 +1515,7 @@ emf_multipart_signed(EMFormat *emf, Came
- if (valid == NULL) {
- em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
- if (ex->desc)
-- em_format_format_error(emf, stream, ex->desc);
-+ em_format_format_error(emf, stream, "%s", ex->desc);
- em_format_part_as(emf, stream, part, "multipart/mixed");
- } else {
- if (emfc == NULL)
-@@ -1586,7 +1586,7 @@ emf_inlinepgp_signed(EMFormat *emf, Came
- if (!valid) {
- em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
- if (ex->desc)
-- em_format_format_error(emf, stream, ex->desc);
-+ em_format_format_error(emf, stream, "%s", ex->desc);
- em_format_format_source(emf, stream, ipart);
- /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
- camel_exception_free(ex);
-@@ -1658,7 +1658,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, C
- if (!valid) {
- em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error"));
- if (ex->desc)
-- em_format_format_error(emf, stream, ex->desc);
-+ em_format_format_error(emf, stream, "%s", ex->desc);
- em_format_format_source(emf, stream, ipart);
- /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
- camel_exception_free(ex);
More information about the arch-commits
mailing list