Hello community, here is the log from the commit of package claws-mail for openSUSE:Factory checked in at 2012-01-19 16:54:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/claws-mail (Old) and /work/SRC/openSUSE:Factory/.claws-mail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "claws-mail", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/claws-mail/claws-mail.changes 2011-10-02 09:52:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.claws-mail.new/claws-mail.changes 2012-01-19 16:54:27.000000000 +0100 @@ -1,0 +2,50 @@ +Tue Jan 17 16:38:49 UTC 2012 - [email protected] + +- Work on a GTK+ 3 build: + + Use favor_gtk2 to switch between gtk2 and gtk3 builds. + + For gtk3 build, use gtk3-devel BuildRequires instead of + gtk2-devel and pass --enable-gtk3 to configure. + + Forcefully disable the gtk3 build with a gtk3_ready macro, + since the gtk3 support is not ready yet. +- Stop adding a GenericName to claws-mail.desktop as there's + already one. + +------------------------------------------------------------------- +Mon Jan 2 06:24:16 CET 2012 - [email protected] + +- Update to version 3.8.0: + + GnuTLS 2.2 is now a minimum requirement if encrypted + connections to servers are required. + + The list displays have been updated to use newer GTK+ + functions, this means that the expanders look different and + the optional dotted lines have been dropped. + + A hidden option, 'summary_from_show', which controls the + display in the From column of the Message List: 0 (default): + show name, 1: show address, 2: show name + address. + + The image viewer now uses the EXIF Orientation. + + 'Generate X-Mailer header' has been added as an Account + option. + + /View/Message scroll has been added, allowing keyboard + shortcuts to be added and used for message scrolling. + + Home and End keys now function in the Message View. + + /Message/Print has been added to the Compose window. + + Several bug fixes, including a fix for focus problem on Gnome + shell (see NEWS for details). + + Updated manuals. + + Update man page. + + Bug fixes: + + Updated translations. +- Drop claws-mail-new-gnutls.patch: fixed upstream. +- Drop claws-mail-glib-2.31.patch: fixed upstream. +- Update spec file License field from GPLv3+ and GPLv2+ to + GPL-3.0+ and GPL-2.0+ respectivley, to conform with spdx.org + identifier. +- Add claws-mail-fix-bufferoverflowstrncat.patch: Fix statement + might be overflowing a buffer in strncat. + +------------------------------------------------------------------- +Mon Nov 28 22:18:24 UTC 2011 - [email protected] + +- Add claws-mail-glib-2.31.patch: Fix build with glib 2.31. + +------------------------------------------------------------------- Old: ---- claws-mail-3.7.10.tar.bz2 claws-mail-new-gnutls.patch New: ---- claws-mail-3.8.0.tar.bz2 claws-mail-fix-bufferoverflowstrncat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ claws-mail.spec ++++++ --- /var/tmp/diff_new_pack.tFBIBe/_old 2012-01-19 16:54:29.000000000 +0100 +++ /var/tmp/diff_new_pack.tFBIBe/_new 2012-01-19 16:54:29.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package claws-mail # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +16,22 @@ # +%define gtk3_ready 0 +%if !%{gtk3_ready} +%define favor_gtk2 1 +%endif Name: claws-mail -Version: 3.7.10 -Release: 1 -License: GPLv3+ -Group: Productivity/Networking/Email/Clients +Version: 3.8.0 +Release: 0 Url: http://www.claws-mail.org/ Summary: A lightweight and highly configurable email client -Source0: http://downloads.sourceforge.net/project/sylpheed-claws/Claws%20Mail/3.7.10/%{name}-%{version}.tar.bz2 +License: GPL-3.0+ +Group: Productivity/Networking/Email/Clients +Source0: http://downloads.sourceforge.net/project/sylpheed-claws/Claws%20Mail/3.8.0/%{name}-%{version}.tar.bz2 Patch0: claws-mail-python.diff -# PATCH-FIX-UPSTREAM claws-mail-new-gnutls.patch [email protected] -- Fix build with gnutls 3.0.3, based on upstream change: http://www.colino.net/claws-mail/getpatchset.php?ver=3.7.10cvs18 -Patch1: claws-mail-new-gnutls.patch +# PATCH-FIX-UPSTREAM claws-mail-fix-bufferoverflowstrncat.patch [email protected] -- Fix statement might be overflowing a buffer in strncat, http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2574 +Patch1: claws-mail-fix-bufferoverflowstrncat.patch BuildRequires: NetworkManager-devel BuildRequires: compface BuildRequires: db-devel @@ -36,9 +40,13 @@ BuildRequires: fdupes BuildRequires: gettext BuildRequires: gmp-devel -BuildRequires: gnutls-devel +BuildRequires: gnutls-devel >= 2.2 BuildRequires: gpgme-devel +%if 0%{?favor_gtk2} BuildRequires: gtk2-devel +%else +BuildRequires: gtk3-devel +%endif BuildRequires: libetpan-devel >= 0.57 BuildRequires: libgcrypt-devel BuildRequires: openldap2-devel @@ -66,8 +74,8 @@ create a new account. %package devel -License: GPLv2+ Summary: A lightweight and highly configurable email client +License: GPL-2.0+ Group: Development/Libraries/Other Provides: claws-mail:/usr/include/claws-mail/main.h Requires: claws-mail = %{version} @@ -96,12 +104,15 @@ %prep %setup -q %patch0 -%patch1 -p0 +%patch1 -p1 %build %configure \ --docdir=%{_datadir}/claws-mail \ --disable-static \ +%if !(0%{?favor_gtk2}) + --enable-gtk3 \ +%endif --enable-ldap \ --enable-ipv6 \ --enable-openssl \ @@ -122,23 +133,23 @@ %install %makeinstall # Clean up -%__rm %{buildroot}%{_libdir}/claws-mail/plugins/*.la +rm %{buildroot}%{_libdir}/claws-mail/plugins/*.la # install desktop file -%suse_update_desktop_file -G "Email client" claws-mail +%suse_update_desktop_file claws-mail # we want to have the icon installed in /usr/share/pixmaps -%__mkdir_p %{buildroot}%{_datadir}/pixmaps/ -%__cp claws-mail-64x64.png %{buildroot}%{_datadir}/pixmaps/ +mkdir -p %{buildroot}%{_datadir}/pixmaps/ +cp claws-mail-64x64.png %{buildroot}%{_datadir}/pixmaps/ # Tools -%__cp -r tools %{buildroot}%{_datadir}/%{name} -%__rm %{buildroot}%{_datadir}/claws-mail/tools/Makefile* -%__mv %{buildroot}%{_datadir}/claws-mail/tools/README ./README.tools +cp -r tools %{buildroot}%{_datadir}/%{name} +rm %{buildroot}%{_datadir}/claws-mail/tools/Makefile* +mv %{buildroot}%{_datadir}/claws-mail/tools/README ./README.tools # fixing permissions -%__chmod 755 %{buildroot}%{_datadir}/claws-mail/tools/* -%__chmod 644 %{buildroot}%{_datadir}/claws-mail/tools/multiwebsearch.conf -%__chmod 644 %{buildroot}%{_datadir}/claws-mail/tools/ca-certificates.crt +chmod 755 %{buildroot}%{_datadir}/claws-mail/tools/* +chmod 644 %{buildroot}%{_datadir}/claws-mail/tools/multiwebsearch.conf +chmod 644 %{buildroot}%{_datadir}/claws-mail/tools/ca-certificates.crt %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_libdir}/%{name}/plugins/ -%__install -d %{buildroot}%{_sysconfdir}/skel/.claws-mail/ +install -d %{buildroot}%{_sysconfdir}/skel/.claws-mail/ cat <<EOF > %{buildroot}%{_sysconfdir}/skel/.claws-mail/clawsrc [Plugins_GTK2] %{_libdir}/claws-mail/plugins/pgpcore.so ++++++ claws-mail-3.7.10.tar.bz2 -> claws-mail-3.8.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/claws-mail/claws-mail-3.7.10.tar.bz2 /work/SRC/openSUSE:Factory/.claws-mail.new/claws-mail-3.8.0.tar.bz2 differ: char 11, line 1 ++++++ claws-mail-fix-bufferoverflowstrncat.patch ++++++ --- claws-mail-3.8.0/src/addrbook.c 2011-12-16 02:09:32.000000000 -0600 +++ claws-mail-3.8.0/src/addrbook.c.orig 2011-12-22 18:57:03.035149942 -0600 @@ -1846,7 +1846,7 @@ gboolean flg; strncpy(buf, adbookdir, WORK_BUFLEN); - strncat(buf, dir_name, WORK_BUFLEN); + strncat(buf, dir_name, sizeof(buf)-strlen(buf)-1); g_stat(buf, &statbuf); if (S_ISREG(statbuf.st_mode)) { if (strncmp( --- claws-mail-3.8.0/src/exportldif.c 2011-12-16 02:09:32.000000000 -0600 +++ claws-mail-3.8.0/src/exportldif.c.orig 2011-12-22 19:06:18.006171051 -0600 @@ -231,23 +231,23 @@ if( attr ) { if( value ) { if( strlen( value ) > 0 ) { - strncat( buf, attr, FMT_BUFSIZE ); + strncat( buf, attr, sizeof(buf)-strlen(buf)-1); strncat( buf, "=", FMT_BUFSIZE ); if( dupval ) { /* Format and free duplicated value */ - strncat( buf, dupval, FMT_BUFSIZE ); + strncat( buf, dupval, sizeof(buf)-strlen(buf)-1); g_free( dupval ); } else { /* Use original value */ - strncat( buf, value, FMT_BUFSIZE ); + strncat( buf, value, sizeof(buf)-strlen(buf)-1); } /* Append suffix */ if( ctl->suffix ) { if( strlen( ctl->suffix ) > 0 ) { strncat( buf, ",", FMT_BUFSIZE ); - strncat( buf, ctl->suffix, FMT_BUFSIZE ); + strncat( buf, ctl->suffix, sizeof(buf)-strlen(buf)-1); } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
