From a4f91e1e0a908ac49b90e4b54c9dc922b6c599fd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 25 Oct 2012 14:04:18 -0400 Subject: todo --- doc/design/assistant/xmpp.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/design/assistant/xmpp.mdwn b/doc/design/assistant/xmpp.mdwn index 6d5384e43..4a05afab9 100644 --- a/doc/design/assistant/xmpp.mdwn +++ b/doc/design/assistant/xmpp.mdwn @@ -4,6 +4,7 @@ who share a repository, that is stored in the [[cloud]]. ### TODO +* Track down segfault when the XMPP library is starting up a client connection. * test with big servers, eg google chat * Prevent idle disconnection. Probably means sending or receiving pings, but would prefer to avoid eg pinging every 60 seconds as some clients do. -- cgit v1.2.3 From 467d70fddc4e066682ceb50f3eabe9b4083c8ee3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 25 Oct 2012 14:32:30 -0400 Subject: Re-enable dbus, using a new version of the library that fixes the memory leak. For now, when dbus goes away, the assistant keeps running but does not fall back or reconnect. To do so needs more changes to the DBus library; in particular a connectSessionWith and connectSystemWith to let me specify my own clientThreadRunner. --- Makefile | 2 +- debian/changelog | 2 ++ debian/control | 2 +- git-annex.cabal | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 796e6af8b..dfc34cb50 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ all=$(bins) $(mans) docs OS:=$(shell uname | sed 's/[-_].*//') ifeq ($(OS),Linux) -OPTFLAGS?=-DWITH_INOTIFY +OPTFLAGS?=-DWITH_INOTIFY -DWITH_DBUS clibs=Utility/libdiskfree.o Utility/libmounts.o THREADFLAGS=$(shell if test -e `ghc --print-libdir`/libHSrts_thr.a; then printf -- -threaded; fi) else diff --git a/debian/changelog b/debian/changelog index 246c0badc..2278195c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ git-annex (3.20121018) UNRELEASED; urgency=low * bugfix: Don't fail transferring content from read-only repos. Closes: #691341 * configure: Check that checksum programs produce correct checksums. + * Re-enable dbus, using a new version of the library that fixes the memory + leak. -- Joey Hess Wed, 17 Oct 2012 14:24:10 -0400 diff --git a/debian/control b/debian/control index 24464f980..ec648288a 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: libghc-edit-distance-dev, libghc-hinotify-dev [linux-any], libghc-stm-dev (>= 2.3), - libghc-dbus-dev [linux-any], + libghc-dbus-dev [linux-any] (>= 0.10.2), libghc-yesod-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], libghc-yesod-default-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], diff --git a/git-annex.cabal b/git-annex.cabal index a2a89479b..90620f4b3 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -77,7 +77,7 @@ Executable git-annex C-Sources: Utility/libkqueue.c if os(linux) && flag(Dbus) - Build-Depends: dbus + Build-Depends: dbus (>= 0.10.2) CPP-Options: -DWITH_DBUS if flag(Webapp) && flag(Assistant) -- cgit v1.2.3