Hello community, here is the log from the commit of package claws-mail for openSUSE:12.2 checked in at 2012-07-23 09:58:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/claws-mail (Old) and /work/SRC/openSUSE:12.2/.claws-mail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "claws-mail", Maintainer is "nadvornik@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/claws-mail/claws-mail.changes 2012-07-09 07:55:20.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.claws-mail.new/claws-mail.changes 2012-07-23 10:15:23.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Jul 21 16:40:32 UTC 2012 - dimstar@opensuse.org + +- Do not install ca-certificates.crt (bnc#761503). +- Add claws-mail-certbundle-path.patch: Add path to our + ca-bundle.pem, so the file can be found by claws mail. This is + an intermediate solution. Preferably we should be switching to + the directory based storing of CA certificates. + +------------------------------------------------------------------- New: ---- claws-mail-certbundle-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ claws-mail.spec ++++++ --- /var/tmp/diff_new_pack.6oN1jQ/_old 2012-07-23 10:15:23.000000000 +0200 +++ /var/tmp/diff_new_pack.6oN1jQ/_new 2012-07-23 10:15:23.000000000 +0200 @@ -36,6 +36,8 @@ Patch2: claws-mail-gnutls318.patch # PATCH-FIX-UPSTREAM claws-mail-bnc770014.patch bnc#770014 -- Fix crash when trying to view info about pgp/smime sign Patch3: claws-mail-bnc770014.patch +# PATCH-FIX-UPSTREAM claws-mail-certbundle-path.patch bnc#761503 dimstar@opensuse.org -- Add our own path to the ssl ca bundle. +Patch4: claws-mail-certbundle-path.patch BuildRequires: NetworkManager-devel BuildRequires: compface BuildRequires: db-devel @@ -114,6 +116,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %configure \ @@ -151,11 +154,12 @@ # Tools cp -r tools %{buildroot}%{_datadir}/%{name} rm %{buildroot}%{_datadir}/claws-mail/tools/Makefile* +# The ca-certificates are meant for windows. On Linux, it is not used and should not be distributed. +rm %{buildroot}%{_datadir}/claws-mail/tools/ca-certificates.crt 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 %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_libdir}/%{name}/plugins/ install -d %{buildroot}%{_sysconfdir}/skel/.claws-mail/ @@ -201,7 +205,6 @@ %{_datadir}/claws-mail/tools/*.pl %{_datadir}/claws-mail/tools/*.py %{_datadir}/claws-mail/tools/*.conf -%{_datadir}/claws-mail/tools/ca-certificates.crt %{_datadir}/claws-mail/tools/tb2claws-mail %{_datadir}/claws-mail/tools/u* %{_datadir}/claws-mail/tools/kdeservicemenu/ ++++++ claws-mail-certbundle-path.patch ++++++ Index: claws-mail-3.8.0/src/common/ssl.c =================================================================== --- claws-mail-3.8.0.orig/src/common/ssl.c +++ claws-mail-3.8.0/src/common/ssl.c @@ -102,6 +102,7 @@ static int gnutls_client_cert_cb(gnutls_ const gchar *claws_ssl_get_cert_file(void) { const char *cert_files[]={ + "/etc/ssl/ca-bundle.pem", "/etc/pki/tls/certs/ca-bundle.crt", "/etc/certs/ca-bundle.crt", "/usr/share/ssl/certs/ca-bundle.crt", -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org