[arch-commits] Commit in gajim/repos/extra-any (PKGBUILD PKGBUILD gajim-drill.patch)
Antonio Rojas
arojas at archlinux.org
Sun Dec 3 23:49:46 UTC 2017
Date: Sunday, December 3, 2017 @ 23:49:45
Author: arojas
Revision: 311601
archrelease: copy trunk to extra-any
Added:
gajim/repos/extra-any/PKGBUILD
(from rev 311600, gajim/trunk/PKGBUILD)
Deleted:
gajim/repos/extra-any/PKGBUILD
gajim/repos/extra-any/gajim-drill.patch
-------------------+
PKGBUILD | 77 ++--
gajim-drill.patch | 837 ----------------------------------------------------
2 files changed, 34 insertions(+), 880 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-12-03 23:49:20 UTC (rev 311600)
+++ PKGBUILD 2017-12-03 23:49:45 UTC (rev 311601)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=gajim
-pkgver=0.16.8
-pkgrel=3
-pkgdesc="A full featured and easy to use Jabber client"
-arch=('any')
-url="https://www.gajim.org/"
-license=('GPL3')
-depends=('pygtk' 'python2-pyopenssl' 'python2-pyasn1' 'python2-nbxmpp' 'ca-certificates' 'ldns')
-makedepends=('intltool')
-optdepends=('python2-dbus: dbus support'
- 'gtkspell: for spelling support'
- 'libxss: for idle module'
- 'notification-daemon: for desktop notification'
- 'python2-gnomekeyring: for GnomeKeyring support'
- 'python2-crypto: support for E2E encryption'
- 'python2-docutils: for RST generator support'
- 'gupnp-igd: for UPnP-IGD support'
- 'python2-gnupg: for PGP encryption')
-source=(https://www.gajim.org/downloads/${pkgver%.*}/gajim-${pkgver}.tar.bz2 gajim-drill.patch
- gajim-pyopenssl.patch::"https://dev.gajim.org/gajim/gajim/commit/3dd35f5e.diff")
-sha1sums=('ec478488d25097661d76c6e0f9fe28415b7a4580'
- '6c93159d7018675e4747a0d4c0ca43bb559a4dc0'
- '761a1e66a7e21d4c497db36288df72b69799a92c')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}/gajim-drill.patch"
- patch -p1 -i ../gajim-pyopenssl.patch # Fix for pyopenssl 17.4
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- PYTHON=python2 ./configure --prefix=/usr --enable-site-packages
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
Copied: gajim/repos/extra-any/PKGBUILD (from rev 311600, gajim/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-12-03 23:49:45 UTC (rev 311601)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=gajim
+pkgver=0.16.9
+pkgrel=1
+pkgdesc="A full featured and easy to use Jabber client"
+arch=('any')
+url="https://www.gajim.org/"
+license=('GPL3')
+depends=('pygtk' 'python2-pyopenssl' 'python2-pyasn1' 'python2-nbxmpp' 'ca-certificates' 'bind-tools')
+makedepends=('intltool')
+optdepends=('python2-dbus: dbus support'
+ 'gtkspell: for spelling support'
+ 'libxss: for idle module'
+ 'notification-daemon: for desktop notification'
+ 'python2-gnomekeyring: for GnomeKeyring support'
+ 'python2-crypto: support for E2E encryption'
+ 'python2-docutils: for RST generator support'
+ 'gupnp-igd: for UPnP-IGD support'
+ 'python2-gnupg: for PGP encryption')
+source=(https://www.gajim.org/downloads/${pkgver%.*}/gajim-${pkgver}.tar.bz2)
+sha1sums=('5e329aa769cc098ffeea94894bd8b4ad200293a1')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ PYTHON=python2 ./configure --prefix=/usr --enable-site-packages
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: gajim-drill.patch
===================================================================
--- gajim-drill.patch 2017-12-03 23:49:20 UTC (rev 311600)
+++ gajim-drill.patch 2017-12-03 23:49:45 UTC (rev 311601)
@@ -1,837 +0,0 @@
-diff -Naur gajim-0.16-orig/po/be at latin.po gajim-0.16/po/be at latin.po
---- gajim-0.16-orig/po/be at latin.po 2014-10-05 16:07:08.910296643 -0400
-+++ gajim-0.16/po/be at latin.po 2014-10-05 16:07:30.183595453 -0400
-@@ -8757,11 +8757,11 @@
- msgstr ""
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
-+msgid "Requires ldns."
- msgstr ""
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
-+msgid "Requires drill to use SRV records."
- msgstr ""
-
- #: ../src/features_window.py:81
-diff -Naur gajim-0.16-orig/po/be.po gajim-0.16/po/be.po
---- gajim-0.16-orig/po/be.po 2014-10-05 16:07:08.920296627 -0400
-+++ gajim-0.16/po/be.po 2014-10-05 16:07:30.186928779 -0400
-@@ -8732,11 +8732,11 @@
- msgstr ""
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
-+msgid "Requires ldns."
- msgstr ""
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
-+msgid "Requires drill to use SRV records."
- msgstr ""
-
- #: ../src/features_window.py:81
-diff -Naur gajim-0.16-orig/po/bg.po gajim-0.16/po/bg.po
---- gajim-0.16-orig/po/bg.po 2014-10-05 16:07:08.910296643 -0400
-+++ gajim-0.16/po/bg.po 2014-10-05 16:07:30.190262105 -0400
-@@ -8669,11 +8669,11 @@
- msgstr "Възможност за свързване към сървъри, които използват записи SRV."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Изисква dnsutils."
-+msgid "Requires ldns."
-+msgstr "Изисква ldns."
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
-+msgid "Requires drill to use SRV records."
- msgstr ""
-
- #: ../src/features_window.py:81
-diff -Naur gajim-0.16-orig/po/br.po gajim-0.16/po/br.po
---- gajim-0.16-orig/po/br.po 2014-10-05 16:07:08.910296643 -0400
-+++ gajim-0.16/po/br.po 2014-10-05 16:07:30.193595433 -0400
-@@ -8723,11 +8723,11 @@
- msgstr ""
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
-+msgid "Requires ldns."
- msgstr ""
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
-+msgid "Requires drill to use SRV records."
- msgstr ""
-
- #: ../src/features_window.py:81
-diff -Naur gajim-0.16-orig/po/cs.po gajim-0.16/po/cs.po
---- gajim-0.16-orig/po/cs.po 2014-10-05 16:07:08.916963299 -0400
-+++ gajim-0.16/po/cs.po 2014-10-05 16:07:30.196928762 -0400
-@@ -8594,12 +8594,12 @@
- msgstr "Schopnost připojit se na servery používající SRV záznamy."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Je potřeba dnsutils."
-+msgid "Requires ldns."
-+msgstr "Je potřeba ldns."
-
- #: ../src/features_window.py:80
--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:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/da.po gajim-0.16/po/da.po
---- gajim-0.16-orig/po/da.po 2014-10-05 16:07:08.923629956 -0400
-+++ gajim-0.16/po/da.po 2014-10-05 16:07:30.196928762 -0400
-@@ -8623,12 +8623,12 @@
- msgstr "Evnen til at tilslutte til servere som bruger SRV poster."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Kræver dnsutils."
-+msgid "Requires ldns."
-+msgstr "Kræver ldns."
-
- #: ../src/features_window.py:80
--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:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/de.po gajim-0.16/po/de.po
---- gajim-0.16-orig/po/de.po 2014-10-05 16:07:08.910296643 -0400
-+++ gajim-0.16/po/de.po 2014-10-05 16:07:30.200262090 -0400
-@@ -8717,12 +8717,12 @@
- msgstr "Ermöglicht Verbindungen zu Servern, die SRV-DNS-Einträge verwenden."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Erfordert dnsutils."
-+msgid "Requires ldns."
-+msgstr "Erfordert ldns."
-
- #: ../src/features_window.py:80
--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:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/el.po gajim-0.16/po/el.po
---- gajim-0.16-orig/po/el.po 2014-10-05 16:07:08.913629972 -0400
-+++ gajim-0.16/po/el.po 2014-10-05 16:07:30.203595419 -0400
-@@ -8803,11 +8803,11 @@
- msgstr ""
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
-+msgid "Requires ldns."
- msgstr ""
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
-+msgid "Requires drill to use SRV records."
- msgstr ""
-
- #: ../src/features_window.py:81
-diff -Naur gajim-0.16-orig/po/en_GB.po gajim-0.16/po/en_GB.po
---- gajim-0.16-orig/po/en_GB.po 2014-10-05 16:07:08.910296643 -0400
-+++ gajim-0.16/po/en_GB.po 2014-10-05 16:07:30.203595419 -0400
-@@ -8565,12 +8565,12 @@
- msgstr "Ability to connect to servers which are using SRV records."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Requires dnsutils."
-+msgid "Requires ldns."
-+msgstr "Requires ldns."
-
- #: ../src/features_window.py:80
--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:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/eo.po gajim-0.16/po/eo.po
---- gajim-0.16-orig/po/eo.po 2014-10-05 16:07:08.920296627 -0400
-+++ gajim-0.16/po/eo.po 2014-10-05 16:07:30.206928746 -0400
-@@ -8724,11 +8724,11 @@
- msgstr ""
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
-+msgid "Requires ldns."
- msgstr ""
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
-+msgid "Requires drill to use SRV records."
- msgstr ""
-
- #: ../src/features_window.py:81
-diff -Naur gajim-0.16-orig/po/es.po gajim-0.16/po/es.po
---- gajim-0.16-orig/po/es.po 2014-10-05 16:07:08.916963299 -0400
-+++ gajim-0.16/po/es.po 2014-10-05 16:07:30.210262074 -0400
-@@ -8534,12 +8534,12 @@
- msgstr "Posibilidad de conectar a servidores que usen registros SRV"
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Requiere dnsutils"
-+msgid "Requires ldns."
-+msgstr "Requiere ldns"
-
- #: ../src/features_window.py:80
--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:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/eu.po gajim-0.16/po/eu.po
---- gajim-0.16-orig/po/eu.po 2014-10-05 16:07:08.913629972 -0400
-+++ gajim-0.16/po/eu.po 2014-10-05 16:07:30.210262074 -0400
-@@ -8744,11 +8744,11 @@
- msgstr ""
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
-+msgid "Requires ldns."
- msgstr ""
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
-+msgid "Requires drill to use SRV records."
- msgstr ""
-
- #: ../src/features_window.py:81
-diff -Naur gajim-0.16-orig/po/fr.po gajim-0.16/po/fr.po
---- gajim-0.16-orig/po/fr.po 2014-10-05 16:07:08.920296627 -0400
-+++ gajim-0.16/po/fr.po 2014-10-05 16:07:30.213595402 -0400
-@@ -8618,12 +8618,12 @@
- "Possibilité de se connecter à des serveurs qui utilisent des entrées SRV."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Nécessite dnsutils."
-+msgid "Requires ldns."
-+msgstr "Nécessite ldns."
-
- #: ../src/features_window.py:80
--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:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/gl.po gajim-0.16/po/gl.po
---- gajim-0.16-orig/po/gl.po 2014-10-05 16:07:08.916963299 -0400
-+++ gajim-0.16/po/gl.po 2014-10-05 16:07:30.216928729 -0400
-@@ -8773,11 +8773,11 @@
- msgstr ""
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
-+msgid "Requires ldns."
- msgstr ""
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
-+msgid "Requires drill to use SRV records."
- msgstr ""
-
- #: ../src/features_window.py:81
-diff -Naur gajim-0.16-orig/po/he.po gajim-0.16/po/he.po
---- gajim-0.16-orig/po/he.po 2014-10-05 16:07:08.913629972 -0400
-+++ gajim-0.16/po/he.po 2014-10-05 16:07:30.216928729 -0400
-@@ -8753,12 +8753,12 @@
- msgstr "יכולת להתחבר לשרתים המשתמשים ברשומות SRV."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "עליך להתקין dnsutils."
-+msgid "Requires ldns."
-+msgstr "עליך להתקין ldns."
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
--msgstr "עליך להתקין nslookup כדי להשתמש ברשומות SRV."
-+msgid "Requires drill to use SRV records."
-+msgstr "עליך להתקין drill כדי להשתמש ברשומות SRV."
-
- #: ../src/features_window.py:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/hr.po gajim-0.16/po/hr.po
---- gajim-0.16-orig/po/hr.po 2014-10-05 16:07:08.913629972 -0400
-+++ gajim-0.16/po/hr.po 2014-10-05 16:07:30.220262057 -0400
-@@ -8619,12 +8619,12 @@
- msgstr "Mogućnost spajanja na poslužitelje koji koriste SRV spise."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Potreban je dnsutils."
-+msgid "Requires ldns."
-+msgstr "Potreban je ldns."
-
- #: ../src/features_window.py:80
--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:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/hu.po gajim-0.16/po/hu.po
---- gajim-0.16-orig/po/hu.po 2014-10-05 16:07:08.916963299 -0400
-+++ gajim-0.16/po/hu.po 2014-10-05 16:07:30.220262057 -0400
-@@ -8757,12 +8757,12 @@
- "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 gajim-0.16-orig/po/it.po gajim-0.16/po/it.po
---- gajim-0.16-orig/po/it.po 2014-10-05 16:07:08.920296627 -0400
-+++ gajim-0.16/po/it.po 2014-10-05 16:07:30.223595386 -0400
-@@ -8608,12 +8608,12 @@
- msgstr "Possibilità di connettersi ai server che usano record SRV."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Richiede dnsutils."
-+msgid "Requires ldns."
-+msgstr "Richiede ldns."
-
- #: ../src/features_window.py:80
--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:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/ja.po gajim-0.16/po/ja.po
---- gajim-0.16-orig/po/ja.po 2014-10-05 16:07:08.916963299 -0400
-+++ gajim-0.16/po/ja.po 2014-10-05 16:07:30.226928714 -0400
-@@ -8491,12 +8491,12 @@
- msgstr "SRV レコードを使うサーバーとの接続を可能にします。"
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "dnsutils が必要です。"
-+msgid "Requires ldns."
-+msgstr "ldns が必要です。"
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
--msgstr "SRV レコードを使うために nslookup が必要です。"
-+msgid "Requires drill to use SRV records."
-+msgstr "SRV レコードを使うために drill が必要です。"
-
- #: ../src/features_window.py:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/kk.po gajim-0.16/po/kk.po
---- gajim-0.16-orig/po/kk.po 2014-10-05 16:07:08.916963299 -0400
-+++ gajim-0.16/po/kk.po 2014-10-05 16:07:30.226928714 -0400
-@@ -8537,12 +8537,12 @@
- msgstr "Серверлерге SRV жазбасын қолданып байланыс орнату мүмкіндігі."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Талап етеді: dnsutils."
-+msgid "Requires ldns."
-+msgstr "Талап етеді: ldns."
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
--msgstr "SRV жазбаларын қолдану үшін nslookup талап етеді."
-+msgid "Requires drill to use SRV records."
-+msgstr "SRV жазбаларын қолдану үшін drill талап етеді."
-
- #: ../src/features_window.py:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/lt.po gajim-0.16/po/lt.po
---- gajim-0.16-orig/po/lt.po 2014-10-05 16:07:08.913629972 -0400
-+++ gajim-0.16/po/lt.po 2014-10-05 16:07:30.230262041 -0400
-@@ -8363,11 +8363,11 @@
- msgstr ""
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
-+msgid "Requires ldns."
- msgstr ""
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
-+msgid "Requires drill to use SRV records."
- msgstr ""
-
- #: ../src/features_window.py:81
-diff -Naur gajim-0.16-orig/po/nb.po gajim-0.16/po/nb.po
---- gajim-0.16-orig/po/nb_NO.po 2014-10-05 16:07:08.920296627 -0400
-+++ gajim-0.16/po/nb_NO.po 2014-10-05 16:07:30.230262041 -0400
-@@ -8596,12 +8596,12 @@
- msgstr "Evne til å koble til tjenere som bruker SRV-oppføringer."
-
- #: ../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-oppføringer."
-+msgid "Requires drill to use SRV records."
-+msgstr "Krever drill for å bruke SRV-oppføringer."
-
- #: ../src/features_window.py:82
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/nl.po gajim-0.16/po/nl.po
---- gajim-0.16-orig/po/nl.po 2014-10-05 16:07:08.910296643 -0400
-+++ gajim-0.16/po/nl.po 2014-10-05 16:07:30.233595369 -0400
-@@ -8466,12 +8466,12 @@
- msgstr "Mogelijkheid te verbinden met servers die SRV-records gebruiken."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Vereist dnsutils"
-+msgid "Requires ldns."
-+msgstr "Vereist ldns"
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
--msgstr "Vereist nslookup om SRV-records te gebruiken."
-+msgid "Requires drill to use SRV records."
-+msgstr "Vereist drill om SRV-records te gebruiken."
-
- #: ../src/features_window.py:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/pl.po gajim-0.16/po/pl.po
---- gajim-0.16-orig/po/pl.po 2014-10-05 16:07:08.913629972 -0400
-+++ gajim-0.16/po/pl.po 2014-10-05 16:07:30.236928698 -0400
-@@ -8280,12 +8280,12 @@
- msgstr "Możliwość połączenia z serwerami, które używają rekordów SRV."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Wymaga dnsutils."
-+msgid "Requires ldns."
-+msgstr "Wymaga ldns."
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
--msgstr "Wymaga nslookup."
-+msgid "Requires drill to use SRV records."
-+msgstr "Wymaga drill."
-
- #: ../src/features_window.py:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/pt_BR.po gajim-0.16/po/pt_BR.po
---- gajim-0.16-orig/po/pt_BR.po 2014-10-05 16:07:08.916963299 -0400
-+++ gajim-0.16/po/pt_BR.po 2014-10-05 16:07:30.240262025 -0400
-@@ -8644,12 +8644,12 @@
- msgstr "Habilidade de conectar a servidores que estão usando registros SRV."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Requer dnsutils."
-+msgid "Requires ldns."
-+msgstr "Requer ldns."
-
- #: ../src/features_window.py:80
--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:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/pt.po gajim-0.16/po/pt.po
---- gajim-0.16-orig/po/pt.po 2014-10-05 16:07:08.916963299 -0400
-+++ gajim-0.16/po/pt.po 2014-10-05 16:07:30.240262025 -0400
-@@ -8742,11 +8742,11 @@
- msgstr ""
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
-+msgid "Requires ldns."
- msgstr ""
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
-+msgid "Requires drill to use SRV records."
- msgstr ""
-
- #: ../src/features_window.py:81
-diff -Naur gajim-0.16-orig/po/ru.po gajim-0.16/po/ru.po
---- gajim-0.16-orig/po/ru.po 2014-10-05 16:07:08.920296627 -0400
-+++ gajim-0.16/po/ru.po 2014-10-05 16:07:30.243595353 -0400
-@@ -8562,12 +8562,12 @@
- msgstr "Возможность соединяться с серверами, использующими SRV записи."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Требует dnsutils."
-+msgid "Requires ldns."
-+msgstr "Требует ldns."
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
--msgstr "Требует nslookup для использования SRV записей."
-+msgid "Requires drill to use SRV records."
-+msgstr "Требует drill для использования SRV записей."
-
- #: ../src/features_window.py:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/sk.po gajim-0.16/po/sk.po
---- gajim-0.16-orig/po/sk.po 2014-10-05 16:07:08.910296643 -0400
-+++ gajim-0.16/po/sk.po 2014-10-05 16:07:30.243595353 -0400
-@@ -8490,12 +8490,12 @@
- msgstr "Schopnosť pripojiť sa k serverom, ktoré používajú SRV protokoly."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Vyžaduje dnsutils."
-+msgid "Requires ldns."
-+msgstr "Vyžaduje ldns."
-
- #: ../src/features_window.py:80
--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:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/sr at Latn.po gajim-0.16/po/sr at Latn.po
---- gajim-0.16-orig/po/sr at Latn.po 2014-10-05 16:07:08.910296643 -0400
-+++ gajim-0.16/po/sr at Latn.po 2014-10-05 16:07:30.246928681 -0400
-@@ -8604,12 +8604,12 @@
- msgstr "Daje mogućnost konekcije na servere koji koriste SRV zapise."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Zahteva dnsutils."
-+msgid "Requires ldns."
-+msgstr "Zahteva ldns."
-
- #: ../src/features_window.py:80
--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:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/sr.po gajim-0.16/po/sr.po
---- gajim-0.16-orig/po/sr.po 2014-10-05 16:07:08.906963315 -0400
-+++ gajim-0.16/po/sr.po 2014-10-05 16:07:30.246928681 -0400
-@@ -8593,12 +8593,12 @@
- msgstr "Даје могућност конекције на сервере који користе SRV записе."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Захтева dnsutils."
-+msgid "Requires ldns."
-+msgstr "Захтева ldns."
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
--msgstr "Захтева nslookup да бисте користили SRV записе."
-+msgid "Requires drill to use SRV records."
-+msgstr "Захтева drill да бисте користили SRV записе."
-
- #: ../src/features_window.py:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/sv.po gajim-0.16/po/sv.po
---- gajim-0.16-orig/po/sv.po 2014-10-05 16:07:08.910296643 -0400
-+++ gajim-0.16/po/sv.po 2014-10-05 16:07:30.250262009 -0400
-@@ -8515,12 +8515,12 @@
- msgstr "Möjlighet att ansluta till servrar som använder SRV-poster."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Kräver dnsutils."
-+msgid "Requires ldns."
-+msgstr "Kräver ldns."
-
- #: ../src/features_window.py:80
--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:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/tr.po gajim-0.16/po/tr.po
---- gajim-0.16-orig/po/tr.po 2014-10-05 16:07:08.920296627 -0400
-+++ gajim-0.16/po/tr.po 2014-10-05 16:07:30.250262009 -0400
-@@ -8519,11 +8519,11 @@
-
- #: ../src/features_window.py:79
- #, fuzzy
--msgid "Requires dnsutils."
-+msgid "Requires ldns."
- msgstr " (yetki gerektirir)"
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
-+msgid "Requires drill to use SRV records."
- msgstr ""
-
- #: ../src/features_window.py:81
-diff -Naur gajim-0.16-orig/po/uk.po gajim-0.16/po/uk.po
---- gajim-0.16-orig/po/uk.po 2014-10-05 16:07:08.920296627 -0400
-+++ gajim-0.16/po/uk.po 2014-10-05 16:07:30.253595337 -0400
-@@ -8610,12 +8610,12 @@
- msgstr "Можливість з’єднання з серверами, які використовують записи SRV."
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "Потребує dnsutils."
-+msgid "Requires ldns."
-+msgstr "Потребує ldns."
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
--msgstr "Для використання SRV-записів потрібен nslookup."
-+msgid "Requires drill to use SRV records."
-+msgstr "Для використання SRV-записів потрібен drill."
-
- #: ../src/features_window.py:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/zh_CN.po gajim-0.16/po/zh_CN.po
---- gajim-0.16-orig/po/zh_CN.po 2014-10-05 16:07:08.920296627 -0400
-+++ gajim-0.16/po/zh_CN.po 2014-10-05 16:07:30.253595337 -0400
-@@ -8338,12 +8338,12 @@
- msgstr "连接到有 SRV 记录的服务器的能力。"
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "需要 dnsutils。"
-+msgid "Requires ldns."
-+msgstr "需要 ldns。"
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
--msgstr "需要 nslookup 以使用 SRV 记录。"
-+msgid "Requires drill to use SRV records."
-+msgstr "需要 drill 以使用 SRV 记录。"
-
- #: ../src/features_window.py:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/po/zh_TW.po gajim-0.16/po/zh_TW.po
---- gajim-0.16-orig/po/zh_TW.po 2014-10-05 16:07:08.913629972 -0400
-+++ gajim-0.16/po/zh_TW.po 2014-10-05 16:07:30.256928665 -0400
-@@ -8345,12 +8345,12 @@
- msgstr "連線到有 SRV 記錄的伺服器的能力。"
-
- #: ../src/features_window.py:79
--msgid "Requires dnsutils."
--msgstr "需要 dnsutils。"
-+msgid "Requires ldns."
-+msgstr "需要 ldns。"
-
- #: ../src/features_window.py:80
--msgid "Requires nslookup to use SRV records."
--msgstr "需要 nslookup 以使用 SRV 記錄。"
-+msgid "Requires drill to use SRV records."
-+msgstr "需要 drill 以使用 SRV 記錄。"
-
- #: ../src/features_window.py:81
- msgid "Spell Checker"
-diff -Naur gajim-0.16-orig/src/common/resolver.py gajim-0.16/src/common/resolver.py
---- gajim-0.16-orig/src/common/resolver.py 2014-10-05 16:07:08.923629956 -0400
-+++ gajim-0.16/src/common/resolver.py 2014-10-05 16:10:49.923271276 -0400
-@@ -57,8 +57,8 @@
- if helpers.is_in_path('host'):
- log.info('Using HostResolver')
- return HostResolver(idlequeue)
-- log.info('Using NSLookupResolver')
-- return NSLookupResolver(idlequeue)
-+ log.info('Using DrillResolver')
-+ return DrillResolver(idlequeue)
-
- class CommonResolver():
- def __init__(self):
-@@ -171,11 +171,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):
-@@ -185,7 +185,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':
-@@ -194,7 +194,7 @@
- return self._parse_srv_result_posix(fqdn, result)
-
- def _parse_srv_result_nt(self, fqdn, result):
-- # output from win32 nslookup command
-+ # output from win32 drill command
- if not result:
- return []
- hosts = []
-@@ -243,7 +243,7 @@
- return hosts
-
- def _parse_srv_result_posix(self, fqdn, result):
-- # typical output of bind-tools nslookup command:
-+ # typical output of bind-tools drill command:
- # _xmpp-client._tcp.jabber.org service = 30 30 5222 jabber.org.
- if not result:
- return []
-@@ -255,18 +255,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('\tSRV\t')
- 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:]
-@@ -283,15 +280,15 @@
- 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()
-@@ -326,10 +323,10 @@
- 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:
- # add 4 for ' has' after domain name
- rest = line[len(domain)+4:].split('record')
-@@ -361,14 +358,14 @@
-
- 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 = Host(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
-@@ -385,7 +382,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:
-@@ -393,7 +390,7 @@
- self.result_handler = None
-
-
--class Host(NsLookup):
-+class Host(Drill):
- def _compose_command_args(self):
- return ['host', '-t', self.type_, self.host]
-
-diff -Naur gajim-0.16-orig/src/features_window.py gajim-0.16/src/features_window.py
---- gajim-0.16-orig/src/features_window.py 2014-10-05 16:07:08.926963283 -0400
-+++ gajim-0.16/src/features_window.py 2014-10-05 16:07:30.256928665 -0400
-@@ -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.'),
-@@ -215,7 +215,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:
More information about the arch-commits
mailing list