Date: Monday, March 18, 2013 @ 15:30:45 Author: eric Revision: 180172
upgpkg: gajim 0.15.3-1 Upstream update, Add patch to use ldns instead of dnsutils, Update optdepends Added: gajim/trunk/gajim-drill.patch Modified: gajim/trunk/PKGBUILD -------------------+ PKGBUILD | 14 gajim-drill.patch | 802 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 810 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-03-18 14:12:25 UTC (rev 180171) +++ PKGBUILD 2013-03-18 14:30:45 UTC (rev 180172) @@ -2,16 +2,16 @@ # Maintainer: Eric Bélanger <[email protected]> pkgname=gajim -pkgver=0.15.2 +pkgver=0.15.3 pkgrel=1 pkgdesc="A full featured and easy to use Jabber client" arch=('any') url="http://www.gajim.org/"; license=('GPL3') -depends=('pygtk' 'python2-pyopenssl' 'hicolor-icon-theme' 'dnsutils' 'python2-pyasn1') +depends=('pygtk' 'python2-pyopenssl' 'hicolor-icon-theme' 'ldns' 'python2-pyasn1') makedepends=('gettext' 'intltool') -optdepends=('dbus-python: dbus support' - 'farstream: for video/voice support' +optdepends=('python2-dbus: dbus support' + 'farstream-0.1: for video/voice support' 'gstreamer0.10-bad: for video/voice support' 'gstreamer0.10-python: for video/voice support' 'gtkspell: for spelling support' @@ -23,11 +23,13 @@ 'gupnp-igd: for UPnP-IGD support') options=('!libtool') install=gajim.install -source=(http://www.gajim.org/downloads/${pkgver%.*}/gajim-${pkgver}.tar.bz2) -sha1sums=('9f5300ef635aa71cfa7ce8745fe964b7572d94d1') +source=(http://www.gajim.org/downloads/${pkgver%.*}/gajim-${pkgver}.tar.bz2 gajim-drill.patch) +sha1sums=('6d8b94d8b0446005e80b5cc4c9b6b8eedfc42c99' + '998022ff282bce766463e1532239d27832168d5f') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/gajim-drill.patch" PYTHON=python2 ./configure --prefix=/usr --enable-site-packages make } Added: gajim-drill.patch =================================================================== --- gajim-drill.patch (rev 0) +++ gajim-drill.patch 2013-03-18 14:30:45 UTC (rev 180172) @@ -0,0 +1,802 @@ +diff -Naur old/po/be.po new/po/be.po +--- old/po/be.po 2013-03-18 22:41:50.747592943 +1100 ++++ new/po/be.po 2013-03-18 22:46:19.578638708 +1100 +@@ -8491,11 +8491,11 @@ + msgstr "" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." ++msgid "Requires ldns." + msgstr "" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." ++msgid "Requires drill to use SRV records." + msgstr "" + + #: ../src/features_window.py:82 +diff -Naur old/po/[email protected] new/po/[email protected] +--- old/po/[email protected] 2013-03-18 22:41:50.750926289 +1100 ++++ new/po/[email protected] 2013-03-18 22:46:19.588638750 +1100 +@@ -8515,11 +8515,11 @@ + msgstr "" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." ++msgid "Requires ldns." + msgstr "" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." ++msgid "Requires drill to use SRV records." + msgstr "" + + #: ../src/features_window.py:82 +diff -Naur old/po/bg.po new/po/bg.po +--- old/po/bg.po 2013-03-18 22:41:50.750926289 +1100 ++++ new/po/bg.po 2013-03-18 22:46:19.601972134 +1100 +@@ -8412,11 +8412,11 @@ + msgstr "Възможност за свързване към сървъри, които използват записи SRV." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Изисква dnsutils." ++msgid "Requires ldns." ++msgstr "Изисква ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." ++msgid "Requires drill to use SRV records." + msgstr "" + + #: ../src/features_window.py:82 +diff -Naur old/po/br.po new/po/br.po +--- old/po/br.po 2013-03-18 22:41:50.750926289 +1100 ++++ new/po/br.po 2013-03-18 22:46:19.615305519 +1100 +@@ -8494,11 +8494,11 @@ + msgstr "" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." ++msgid "Requires ldns." + msgstr "" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." ++msgid "Requires drill to use SRV records." + msgstr "" + + #: ../src/features_window.py:82 +diff -Naur old/po/cs.po new/po/cs.po +--- old/po/cs.po 2013-03-18 22:41:50.750926289 +1100 ++++ new/po/cs.po 2013-03-18 22:46:19.628638904 +1100 +@@ -8325,12 +8325,12 @@ + msgstr "Schopnost připojit se na servery používající SRV záznamy." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Je potřeba dnsutils." ++msgid "Requires ldns." ++msgstr "Je potřeba ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Je potřeba nslookup pro použití SRV záznamů." ++msgid "Requires drill to use SRV records." ++msgstr "Je potřeba drill pro použití SRV záznamů." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/da.po new/po/da.po +--- old/po/da.po 2013-03-18 22:41:50.750926289 +1100 ++++ new/po/da.po 2013-03-18 22:46:19.638638942 +1100 +@@ -8312,12 +8312,12 @@ + msgstr "Evnen til at tilslutte til servere som bruger SRV poster." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Kræver dnsutils." ++msgid "Requires ldns." ++msgstr "Kræver ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Kræver nslookup for at bruge SRV poster." ++msgid "Requires drill to use SRV records." ++msgstr "Kræver drill for at bruge SRV poster." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/de.po new/po/de.po +--- old/po/de.po 2013-03-18 22:41:50.750926289 +1100 ++++ new/po/de.po 2013-03-18 22:46:19.651972327 +1100 +@@ -8448,12 +8448,12 @@ + msgstr "Ermöglicht Verbindungen zu Servern, die SRV-DNS-Einträge verwenden." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Erfordert dnsutils." ++msgid "Requires ldns." ++msgstr "Erfordert ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Erfordert nslookup zur Nutzung von SRV-Einträgen." ++msgid "Requires drill to use SRV records." ++msgstr "Erfordert drill zur Nutzung von SRV-Einträgen." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/el.po new/po/el.po +--- old/po/el.po 2013-03-18 22:41:50.750926289 +1100 ++++ new/po/el.po 2013-03-18 22:46:19.661972366 +1100 +@@ -8564,11 +8564,11 @@ + msgstr "" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." ++msgid "Requires ldns." + msgstr "" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." ++msgid "Requires drill to use SRV records." + msgstr "" + + #: ../src/features_window.py:82 +diff -Naur old/po/en_GB.po new/po/en_GB.po +--- old/po/en_GB.po 2013-03-18 22:41:50.750926289 +1100 ++++ new/po/en_GB.po 2013-03-18 22:46:19.671972404 +1100 +@@ -8242,12 +8242,12 @@ + msgstr "Ability to connect to servers which are using SRV records." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Requires dnsutils." ++msgid "Requires ldns." ++msgstr "Requires ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Requires nslookup to use SRV records." ++msgid "Requires drill to use SRV records." ++msgstr "Requires drill to use SRV records." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/eo.po new/po/eo.po +--- old/po/eo.po 2013-03-18 22:41:50.750926289 +1100 ++++ new/po/eo.po 2013-03-18 22:46:19.685305789 +1100 +@@ -8486,11 +8486,11 @@ + msgstr "" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." ++msgid "Requires ldns." + msgstr "" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." ++msgid "Requires drill to use SRV records." + msgstr "" + + #: ../src/features_window.py:82 +diff -Naur old/po/es.po new/po/es.po +--- old/po/es.po 2013-03-18 22:41:50.750926289 +1100 ++++ new/po/es.po 2013-03-18 22:46:19.695305827 +1100 +@@ -8303,12 +8303,12 @@ + msgstr "Posibilidad de conectar a servidores que usen registros SRV" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Requiere dnsutils" ++msgid "Requires ldns." ++msgstr "Requiere ldns" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Requiere nslookup para usar los registros SRV." ++msgid "Requires drill to use SRV records." ++msgstr "Requiere drill para usar los registros SRV." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/eu.po new/po/eu.po +--- old/po/eu.po 2013-03-18 22:41:50.750926289 +1100 ++++ new/po/eu.po 2013-03-18 22:46:19.708639212 +1100 +@@ -8512,11 +8512,11 @@ + msgstr "" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." ++msgid "Requires ldns." + msgstr "" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." ++msgid "Requires drill to use SRV records." + msgstr "" + + #: ../src/features_window.py:82 +diff -Naur old/po/fr.po new/po/fr.po +--- old/po/fr.po 2013-03-18 22:41:50.750926289 +1100 ++++ new/po/fr.po 2013-03-18 22:46:19.718639251 +1100 +@@ -8402,12 +8402,12 @@ + "Possibilité de se connecter à des serveurs qui utilisent des entrées SRV." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Nécessite dnsutils." ++msgid "Requires ldns." ++msgstr "Nécessite ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Nécessite nslookup afin d'utiliser les enregistrements SRV." ++msgid "Requires drill to use SRV records." ++msgstr "Nécessite drill afin d'utiliser les enregistrements SRV." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/gl.po new/po/gl.po +--- old/po/gl.po 2013-03-18 22:41:50.754259636 +1100 ++++ new/po/gl.po 2013-03-18 22:46:19.731972635 +1100 +@@ -8540,11 +8540,11 @@ + msgstr "" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." ++msgid "Requires ldns." + msgstr "" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." ++msgid "Requires drill to use SRV records." + msgstr "" + + #: ../src/features_window.py:82 +diff -Naur old/po/he.po new/po/he.po +--- old/po/he.po 2013-03-18 22:41:50.754259636 +1100 ++++ new/po/he.po 2013-03-18 22:46:19.741972674 +1100 +@@ -8825,12 +8825,12 @@ + msgstr "יכולת להתחבר אל שרתים המשתמשים ברשומות SRV." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "יש צורך בהתקנת dnsutils." ++msgid "Requires ldns." ++msgstr "יש צורך בהתקנת ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "יש צורך בהתקנת nslookup גדי לעשות שימוש ברשומות SRV." ++msgid "Requires drill to use SRV records." ++msgstr "יש צורך בהתקנת drill גדי לעשות שימוש ברשומות SRV." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/hr.po new/po/hr.po +--- old/po/hr.po 2013-03-18 22:41:50.754259636 +1100 ++++ new/po/hr.po 2013-03-18 22:46:19.755306058 +1100 +@@ -8344,12 +8344,12 @@ + msgstr "Mogućnost spajanja na poslužitelje koji koriste SRV spise." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Potreban je dnsutils." ++msgid "Requires ldns." ++msgstr "Potreban je ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Potreban je nslookup za korištenje SRV spisa." ++msgid "Requires drill to use SRV records." ++msgstr "Potreban je drill za korištenje SRV spisa." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/hu.po new/po/hu.po +--- old/po/hu.po 2013-03-18 22:41:50.754259636 +1100 ++++ new/po/hu.po 2013-03-18 22:46:19.765306097 +1100 +@@ -7591,12 +7591,12 @@ + msgstr "Képesség hogy SRV bejegyzéseket használó szerverekhez lehessen csatlakozni." + + #: ../src/features_window.py:79 +-msgid "Requires dnsutils." +-msgstr "dnsutils szükséges hozzá." ++msgid "Requires ldns." ++msgstr "ldns szükséges hozzá." + + #: ../src/features_window.py:80 +-msgid "Requires nslookup to use SRV records." +-msgstr "nslookup szükséges hogy SRV bejegyzéseket lehessen használni." ++msgid "Requires drill to use SRV records." ++msgstr "drill szükséges hogy SRV bejegyzéseket lehessen használni." + + #: ../src/features_window.py:81 + msgid "Spell Checker" +diff -Naur old/po/it.po new/po/it.po +--- old/po/it.po 2013-03-18 22:41:50.754259636 +1100 ++++ new/po/it.po 2013-03-18 22:46:19.775306135 +1100 +@@ -8308,12 +8308,12 @@ + msgstr "Possibilità di connettersi ai server che usano record SRV." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Richiede dnsutils." ++msgid "Requires ldns." ++msgstr "Richiede ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Richiede nslookup per usare i record SRV." ++msgid "Requires drill to use SRV records." ++msgstr "Richiede drill per usare i record SRV." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/ja.po new/po/ja.po +--- old/po/ja.po 2013-03-18 22:41:50.754259636 +1100 ++++ new/po/ja.po 2013-03-18 22:46:19.785306174 +1100 +@@ -8274,12 +8274,12 @@ + msgstr "SRV レコードを使うサーバーとの接続を可能にします。" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "dnsutils が必要です。" ++msgid "Requires ldns." ++msgstr "ldns が必要です。" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "SRV レコードを使うために nslookup が必要です。" ++msgid "Requires drill to use SRV records." ++msgstr "SRV レコードを使うために drill が必要です。" + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/kk.po new/po/kk.po +--- old/po/kk.po 2013-03-18 22:41:50.754259636 +1100 ++++ new/po/kk.po 2013-03-18 22:46:19.795306213 +1100 +@@ -8281,12 +8281,12 @@ + msgstr "Серверлерге SRV жазбасын қолданып байланыс орнату мүмкіндігі." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Талап етеді: dnsutils." ++msgid "Requires ldns." ++msgstr "Талап етеді: ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "SRV жазбаларын қолдану үшін nslookup талап етеді." ++msgid "Requires drill to use SRV records." ++msgstr "SRV жазбаларын қолдану үшін drill талап етеді." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/lt.po new/po/lt.po +--- old/po/lt.po 2013-03-18 22:41:50.754259636 +1100 ++++ new/po/lt.po 2013-03-18 22:46:19.808639597 +1100 +@@ -8111,11 +8111,11 @@ + msgstr "" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." ++msgid "Requires ldns." + msgstr "" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." ++msgid "Requires drill to use SRV records." + msgstr "" + + #: ../src/features_window.py:82 +diff -Naur old/po/nb.po new/po/nb.po +--- old/po/nb.po 2013-03-18 22:41:50.754259636 +1100 ++++ new/po/nb.po 2013-03-18 22:46:19.818639636 +1100 +@@ -8325,12 +8325,12 @@ + msgstr "Evne til å koble til servere som bruker SRV records." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Krever dnsutils." ++msgid "Requires ldns." ++msgstr "Krever ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Krever nslookup for å bruke SRV records." ++msgid "Requires drill to use SRV records." ++msgstr "Krever drill for å bruke SRV records." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/nl.po new/po/nl.po +--- old/po/nl.po 2013-03-18 22:41:50.754259636 +1100 ++++ new/po/nl.po 2013-03-18 22:46:19.831973020 +1100 +@@ -8535,11 +8535,11 @@ + msgstr "" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." ++msgid "Requires ldns." + msgstr "" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." ++msgid "Requires drill to use SRV records." + msgstr "" + + #: ../src/features_window.py:82 +diff -Naur old/po/no.po new/po/no.po +--- old/po/no.po 2013-03-18 22:41:50.754259636 +1100 ++++ new/po/no.po 2013-03-18 22:46:19.841973058 +1100 +@@ -8325,12 +8325,12 @@ + msgstr "Evne til å koble til servere som bruker SRV records." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Krever dnsutils." ++msgid "Requires ldns." ++msgstr "Krever ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Krever nslookup for å bruke SRV records." ++msgid "Requires drill to use SRV records." ++msgstr "Krever drill for å bruke SRV records." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/pl.po new/po/pl.po +--- old/po/pl.po 2013-03-18 22:41:50.754259636 +1100 ++++ new/po/pl.po 2013-03-18 22:46:19.855306443 +1100 +@@ -8337,12 +8337,12 @@ + msgstr "Możliwość połączenia z serwerami, które używają rekordów SRV." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Wymaga dnsutils." ++msgid "Requires ldns." ++msgstr "Wymaga ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Wymaga nslookup." ++msgid "Requires drill to use SRV records." ++msgstr "Wymaga drill." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/pt.po new/po/pt.po +--- old/po/pt.po 2013-03-18 22:41:50.754259636 +1100 ++++ new/po/pt.po 2013-03-18 22:46:19.865306482 +1100 +@@ -8510,11 +8510,11 @@ + msgstr "" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." ++msgid "Requires ldns." + msgstr "" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." ++msgid "Requires drill to use SRV records." + msgstr "" + + #: ../src/features_window.py:82 +diff -Naur old/po/pt_BR.po new/po/pt_BR.po +--- old/po/pt_BR.po 2013-03-18 22:41:50.757592982 +1100 ++++ new/po/pt_BR.po 2013-03-18 22:46:19.878639867 +1100 +@@ -8331,12 +8331,12 @@ + msgstr "Habilidade de conectar a servidores que estão usando registros SRV." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Requer dnsutils." ++msgid "Requires ldns." ++msgstr "Requer ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Requer nslookup para usar registros SRV." ++msgid "Requires drill to use SRV records." ++msgstr "Requer drill para usar registros SRV." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/ru.po new/po/ru.po +--- old/po/ru.po 2013-03-18 22:41:50.757592982 +1100 ++++ new/po/ru.po 2013-03-18 22:46:19.888639905 +1100 +@@ -8285,12 +8285,12 @@ + msgstr "Возможность соединяться с серверами, использующими SRV записи." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Требует dnsutils." ++msgid "Requires ldns." ++msgstr "Требует ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Требует nslookup для использования SRV записей." ++msgid "Requires drill to use SRV records." ++msgstr "Требует drill для использования SRV записей." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/sk.po new/po/sk.po +--- old/po/sk.po 2013-03-18 22:41:50.757592982 +1100 ++++ new/po/sk.po 2013-03-18 22:46:19.901973290 +1100 +@@ -8220,12 +8220,12 @@ + msgstr "Schopnosť pripojiť sa k serverom, ktoré používajú SRV protokoly." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Vyžaduje dnsutils." ++msgid "Requires ldns." ++msgstr "Vyžaduje ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Vyžaduje nslookup k použitiu SRV protokolov." ++msgid "Requires drill to use SRV records." ++msgstr "Vyžaduje drill k použitiu SRV protokolov." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/sr.po new/po/sr.po +--- old/po/sr.po 2013-03-18 22:41:50.757592982 +1100 ++++ new/po/sr.po 2013-03-18 22:46:19.911973328 +1100 +@@ -8321,12 +8321,12 @@ + msgstr "Даје могућност конекције на сервере који користе SRV записе." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Захтева dnsutils." ++msgid "Requires ldns." ++msgstr "Захтева ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Захтева nslookup да бисте користили SRV записе." ++msgid "Requires drill to use SRV records." ++msgstr "Захтева drill да бисте користили SRV записе." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/[email protected] new/po/[email protected] +--- old/po/[email protected] 2013-03-18 22:41:50.757592982 +1100 ++++ new/po/[email protected] 2013-03-18 22:46:19.921973367 +1100 +@@ -8333,12 +8333,12 @@ + msgstr "Daje mogućnost konekcije na servere koji koriste SRV zapise." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Zahteva dnsutils." ++msgid "Requires ldns." ++msgstr "Zahteva ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Zahteva nslookup da biste koristili SRV zapise." ++msgid "Requires drill to use SRV records." ++msgstr "Zahteva drill da biste koristili SRV zapise." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/sv.po new/po/sv.po +--- old/po/sv.po 2013-03-18 22:41:50.757592982 +1100 ++++ new/po/sv.po 2013-03-18 22:46:19.935306752 +1100 +@@ -8259,12 +8259,12 @@ + msgstr "Möjlighet att ansluta till servrar som använder SRV-poster." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Kräver dnsutils." ++msgid "Requires ldns." ++msgstr "Kräver ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Kräver nslookup för att använda SRV-poster." ++msgid "Requires drill to use SRV records." ++msgstr "Kräver drill för att använda SRV-poster." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/tr.po new/po/tr.po +--- old/po/tr.po 2013-03-18 22:41:50.757592982 +1100 ++++ new/po/tr.po 2013-03-18 22:46:19.945306790 +1100 +@@ -7160,11 +7160,11 @@ + + #: ../src/features_window.py:78 + #, fuzzy +-msgid "Requires dnsutils." ++msgid "Requires ldns." + msgstr " (yetki gerektirir)" + + #: ../src/features_window.py:79 +-msgid "Requires nslookup to use SRV records." ++msgid "Requires drill to use SRV records." + msgstr "" + + #: ../src/features_window.py:80 +diff -Naur old/po/uk.po new/po/uk.po +--- old/po/uk.po 2013-03-18 22:41:50.757592982 +1100 ++++ new/po/uk.po 2013-03-18 22:46:19.955306828 +1100 +@@ -8395,12 +8395,12 @@ + msgstr "Можливість з’єднання з серверами, які використовують записи SRV." + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "Потребує dnsutils." ++msgid "Requires ldns." ++msgstr "Потребує ldns." + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "Для використання SRV-записів потрібен nslookup." ++msgid "Requires drill to use SRV records." ++msgstr "Для використання SRV-записів потрібен drill." + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/zh_CN.po new/po/zh_CN.po +--- old/po/zh_CN.po 2013-03-18 22:41:50.757592982 +1100 ++++ new/po/zh_CN.po 2013-03-18 22:46:19.965306867 +1100 +@@ -8062,12 +8062,12 @@ + msgstr "连接到有 SRV 记录的服务器的能力。" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "需要 dnsutils。" ++msgid "Requires ldns." ++msgstr "需要 ldns。" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "需要 nslookup 以使用 SRV 记录。" ++msgid "Requires drill to use SRV records." ++msgstr "需要 drill 以使用 SRV 记录。" + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/po/zh_TW.po new/po/zh_TW.po +--- old/po/zh_TW.po 2013-03-18 22:41:50.757592982 +1100 ++++ new/po/zh_TW.po 2013-03-18 22:46:19.975306905 +1100 +@@ -8068,12 +8068,12 @@ + msgstr "連線到有 SRV 記錄的伺服器的能力。" + + #: ../src/features_window.py:80 +-msgid "Requires dnsutils." +-msgstr "需要 dnsutils。" ++msgid "Requires ldns." ++msgstr "需要 ldns。" + + #: ../src/features_window.py:81 +-msgid "Requires nslookup to use SRV records." +-msgstr "需要 nslookup 以使用 SRV 記錄。" ++msgid "Requires drill to use SRV records." ++msgstr "需要 drill 以使用 SRV 記錄。" + + #: ../src/features_window.py:82 + msgid "Spell Checker" +diff -Naur old/src/common/resolver.py new/src/common/resolver.py +--- old/src/common/resolver.py 2013-03-18 22:41:50.760926328 +1100 ++++ new/src/common/resolver.py 2013-03-18 23:23:58.732962768 +1100 +@@ -53,7 +53,7 @@ + if USE_LIBASYNCNS: + return LibAsyncNSResolver() + else: +- return NSLookupResolver(idlequeue) ++ return DrillResolver(idlequeue) + + class CommonResolver(): + def __init__(self): +@@ -166,11 +166,11 @@ + return True + + +-class NSLookupResolver(CommonResolver): ++class DrillResolver(CommonResolver): + """ +- Asynchronous DNS resolver calling nslookup. Processing of pending requests ++ Asynchronous DNS resolver calling drill. Processing of pending requests + is invoked from idlequeue which is watching file descriptor of pipe of +- stdout of nslookup process. ++ stdout of drill process. + """ + + def __init__(self, idlequeue): +@@ -180,7 +180,7 @@ + + def parse_srv_result(self, fqdn, result): + """ +- Parse the output of nslookup command and return list of properties: ++ Parse the output of drill command and return list of properties: + 'host', 'port','weight', 'priority' corresponding to the found srv hosts + """ + if os.name == 'nt': +@@ -250,18 +250,15 @@ + continue + domain = None + if line.startswith(fqdn): +- domain = fqdn # For nslookup 9.5 ++ domain = fqdn + elif helpers.decode_string(line).startswith(ufqdn): + line = helpers.decode_string(line) +- domain = ufqdn # For nslookup 9.6 ++ domain = ufqdn + if domain: +- rest = line[len(domain):].split('=') ++ rest = line[len(domain)+1:].split(' SRV ') + if len(rest) != 2: + continue +- answer_type, props_str = rest +- if answer_type.strip() != 'service': +- continue +- props = props_str.strip().split(' ') ++ props = rest[1].strip().split() + if len(props) < 4: + continue + prio, weight, port, host = props[-4:] +@@ -278,21 +275,21 @@ + return hosts + + def _on_ready(self, host, type, result): +- # nslookup finished, parse the result and call the handlers ++ # drill finished, parse the result and call the handlers + result_list = self.parse_srv_result(host, result) + CommonResolver._on_ready(self, host, type, result_list) + + def start_resolve(self, host, type): + """ +- Spawn new nslookup process and start waiting for results ++ Spawn new drill process and start waiting for results + """ +- ns = NsLookup(self._on_ready, host, type) ++ ns = Drill(self._on_ready, host, type) + ns.set_idlequeue(self.idlequeue) + ns.commandtimeout = 20 + ns.start() + + +-class NsLookup(IdleCommand): ++class Drill(IdleCommand): + def __init__(self, on_result, host='_xmpp-client', type='srv'): + IdleCommand.__init__(self, on_result) + self.commandtimeout = 10 +@@ -309,7 +306,7 @@ + return + + def _compose_command_args(self): +- return ['nslookup', '-type=' + self.type, self.host] ++ return ['drill', self.type, self.host] + + def _return_result(self): + if self.result_handler: +diff -Naur old/src/features_window.py new/src/features_window.py +--- old/src/features_window.py 2013-03-18 22:41:50.760926328 +1100 ++++ new/src/features_window.py 2013-03-18 22:42:20.431042771 +1100 +@@ -77,8 +77,8 @@ + _('Feature not available under Windows.')), + _('SRV'): (self.srv_available, + _('Ability to connect to servers which are using SRV records.'), +- _('Requires dnsutils.'), +- _('Requires nslookup to use SRV records.')), ++ _('Requires ldns.'), ++ _('Requires drill to use SRV records.')), + _('Spell Checker'): (self.speller_available, + _('Spellchecking of composed messages.'), + _('Requires libgtkspell.'), +@@ -219,7 +219,7 @@ + def srv_available(self): + if os.name == 'nt': + return True +- return helpers.is_in_path('nslookup') ++ return helpers.is_in_path('drill') + + def speller_available(self): + try:
