[claws-mail-plugins/f15] 3.7.9-3 fix clam plugin crash (#706322)
Andreas Bierfert
awjb at fedoraproject.org
Fri May 20 17:43:10 UTC 2011
commit de8f306d3f5a0a19108b228c08916b349a604d2b
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date: Fri May 20 19:42:56 2011 +0200
3.7.9-3
fix clam plugin crash (#706322)
claws-mail-plugins-clam-socket.patch | 12 ++++++++++++
claws-mail-plugins.spec | 10 +++++++++-
2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/claws-mail-plugins-clam-socket.patch b/claws-mail-plugins-clam-socket.patch
new file mode 100644
index 0000000..61b2000
--- /dev/null
+++ b/claws-mail-plugins-clam-socket.patch
@@ -0,0 +1,12 @@
+diff -up clamd-3.5.1/libclamd/clamd-plugin.c.orig clamd-3.5.1/libclamd/clamd-plugin.c
+--- clamd-3.5.1/libclamd/clamd-plugin.c.orig 2011-05-20 19:41:51.000000000 +0200
++++ clamd-3.5.1/libclamd/clamd-plugin.c 2011-05-20 19:42:05.000000000 +0200
+@@ -210,7 +210,7 @@ void clamd_create_config_automatic(const
+ }
+ }
+ fclose(conf);
+- if (! Socket && (Socket->socket.port || Socket->socket.path)) {
++ if (! (Socket && (Socket->socket.port || Socket->socket.path))) {
+ /*g_error("%s: Not able to find required information", path);*/
+ alertpanel_error(_("%s: Not able to find required information\nclamd will be disabled"), path);
+ }
diff --git a/claws-mail-plugins.spec b/claws-mail-plugins.spec
index 30ed622..4921df5 100644
--- a/claws-mail-plugins.spec
+++ b/claws-mail-plugins.spec
@@ -22,7 +22,7 @@
Name: claws-mail-plugins
Version: 3.7.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Additional plugins for claws-mail
Group: Applications/Internet
@@ -33,6 +33,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: claws-mail-extra-plugins-3.7.6-libnotify07.patch
Patch1: claws-mail-plugins-geolocation-champlain-0.9.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=706322
+Patch2: claws-mail-plugins-clam-socket.patch
BuildRequires: claws-mail-devel >= %{version}
BuildRequires: glib2-devel
@@ -345,6 +347,8 @@ pushd geolocation_plugin-%{geolocation}
popd
%endif
+%patch2 -b .clam-socket
+
# fix perms
pushd vcalendar-%{vcalendar}
chmod 0644 COPYING README AUTHORS
@@ -770,6 +774,10 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/claws-mail/plugins/vcalendar/
%changelog
+* Fri May 20 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.9-3
+- fix clam plugin crash (#706322)
+
* Mon Apr 11 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 3.7.9-2
- move some obsoletes to claws-mail package
More information about the scm-commits
mailing list