wok-next rev 3594
gajim: revert patch host_srv.patch(use bind-client/host not busybox/nslookup)
author | Liu Peng <rocky@slitaz.org> |
---|---|
date | Sun Jun 28 13:47:18 2009 +0000 (2009-06-28) |
parents | 3540268bb56c |
children | 9124ffe8bb4a |
files | gajim/receipt gajim/stuff/host_srv.patch |
line diff
1.1 --- a/gajim/receipt Sun Jun 28 01:54:04 2009 +0200 1.2 +++ b/gajim/receipt Sun Jun 28 13:47:18 2009 +0000 1.3 @@ -15,6 +15,14 @@ 1.4 compile_rules() 1.5 { 1.6 cd $src 1.7 + while read file; do 1.8 + [ -f done.$file ] && continue 1.9 + echo "Apply $file..." 1.10 + patch -p1 < ../stuff/$file || return 1 1.11 + touch done.$file 1.12 + done <<EOT 1.13 +host_srv.patch 1.14 +EOT 1.15 ./configure --prefix=/usr \ 1.16 --mandir=/usr/share/man \ 1.17 $CONFIGURE_ARGS &&
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/gajim/stuff/host_srv.patch Sun Jun 28 13:47:18 2009 +0000 2.3 @@ -0,0 +1,25 @@ 2.4 +--- gajim-0.12.3/src/common/nslookup.py.orig Sun Jun 28 13:34:21 2009 2.5 ++++ gajim-0.12.3/src/common/nslookup.py Sun Jun 28 13:35:23 2009 2.6 +@@ -123,11 +123,11 @@ 2.7 + line = helpers.decode_string(line) 2.8 + domain = ufqdn 2.9 + if domain: 2.10 +- rest = line[len(domain):].split('=') 2.11 ++ rest = line[len(domain):].split('record') 2.12 + if len(rest) != 2: 2.13 + continue 2.14 + answer_type, props_str = rest 2.15 +- if answer_type.strip() != 'service': 2.16 ++ if answer_type.strip() != 'has SRV': 2.17 + continue 2.18 + props = props_str.strip().split(' ') 2.19 + if len(props) < 4: 2.20 +@@ -296,7 +296,7 @@ 2.21 + return 2.22 + 2.23 + def _compose_command_args(self): 2.24 +- return ['nslookup', '-type=' + self.type , self.host] 2.25 ++ return ['host', '-t ' + self.type , self.host] 2.26 + 2.27 + def _return_result(self): 2.28 + if self.result_handler: