rpms/gajim/F-13 gajim-0.13.3-disable-libasyncns.patch, NONE, 1.1 gajim.spec, 1.38, 1.39

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/gajim/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18655

Modified Files:
	gajim.spec 
Added Files:
	gajim-0.13.3-disable-libasyncns.patch 
Log Message:
* Mon Mar 08 2010 Michal Schmidt <mschmidt at redhat.com> 0.13.3-1.fc13.1
- Do not use libasyncns until a kernel bug (RHBZ#529202) is fixed.


gajim-0.13.3-disable-libasyncns.patch:
 resolver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gajim-0.13.3-disable-libasyncns.patch ---
Disable libasyncns usage in Gajim

libasyncs creates several threads and lets them all block in recv() on a unix
socket. Due to a kernel bug (RHBZ#529202) they go into uninterruptible sleep
for a long time, causing inflated loadavg measurements and scary warnings from
the hung task watchdog in dmesg.

Thankfully libasyncns is not essential for Gajim to work.

 -- Michal

Index: gajim-0.13.3/src/common/resolver.py
===================================================================
--- gajim-0.13.3.orig/src/common/resolver.py
+++ gajim-0.13.3/src/common/resolver.py
@@ -39,7 +39,7 @@ ns_type_pattern = re.compile('^[a-z]+$')
 host_pattern = re.compile('^[a-z0-9\-._]*[a-z0-9]\.[a-z]{2,}$')
 
 try:
-	#raise ImportError("Manually disabled libasync")
+	raise ImportError("Manually disabled libasync")
 	import libasyncns
 	USE_LIBASYNCNS = True
 	log.info("libasyncns-python loaded")


Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-13/gajim.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gajim.spec	8 Mar 2010 17:20:27 -0000	1.38
+++ gajim.spec	8 Mar 2010 18:36:22 -0000	1.39
@@ -2,12 +2,15 @@ Summary:	Jabber client written in PyGTK
 Name:		gajim
 %global		majorver 0.13
 Version:	0.13.3
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
 Source0:	http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
 Patch0:		gajim-0.13.3-gnome-keyring-CancelledError.patch
+# libasyncns triggers a kernel bug (RHBZ#529202), so let's not use it until
+# it's fixed.
+Patch1:		gajim-0.13.3-disable-libasyncns.patch
 BuildArch:	noarch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -28,7 +31,8 @@ Requires:	python-docutils
 Requires:	python-GnuPGInterface
 Requires:	python-kerberos
 Requires:	python-sexy
-Requires:	python-libasyncns
+# See above comment for Patch1
+#Requires:	python-libasyncns
 # these are dlopen'd using ctypes find_library/LoadLibrary
 Requires:	gtkspell
 Requires:	libXScrnSaver
@@ -48,6 +52,7 @@ Gajim does not require GNOME to run, eve
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version} \
@@ -94,6 +99,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/src
 
 %changelog
+* Mon Mar 08 2010 Michal Schmidt <mschmidt at redhat.com> 0.13.3-1.fc13.1
+- Do not use libasyncns until a kernel bug (RHBZ#529202) is fixed.
+
 * Mon Mar 08 2010 Michal Schmidt <mschmidt at redhat.com> 0.13.3-1
 - Update to 0.13.3.
 - Add gajim-0.13.3-gnome-keyring-CancelledError.patch (RHBZ#556374).