diff -u ejabberd-2.0.1/debian/changelog ejabberd-2.0.1/debian/changelog --- ejabberd-2.0.1/debian/changelog +++ ejabberd-2.0.1/debian/changelog @@ -1,3 +1,17 @@ +ejabberd (2.0.1-5) unstable; urgency=low + + * Added Brazilian Portuguese debconf templates translation + (closes: #501751). + * Protected hostname -s and hostname -d calls in postinst script to prevent + its failure in case when hostname is incorrectly configured. It's harmless + to replace hostname by "localhost" because it's used only for generating + a reference SSL certificate which is to be replaced by a proper one. + * Added option {keepalive, true} to ssl socket in LDAPS support patch. + This helps not to loose long-term connections to LDAPS server (thanks + to Alex Mauer for a suggestion). + + -- Sergei Golovan Fri, 10 Oct 2008 09:48:34 +0400 + ejabberd (2.0.1-4) unstable; urgency=low * Added Basque debconf templates translation (closes: #492129). diff -u ejabberd-2.0.1/debian/postinst ejabberd-2.0.1/debian/postinst --- ejabberd-2.0.1/debian/postinst +++ ejabberd-2.0.1/debian/postinst @@ -50,8 +50,8 @@ if [ ! -f ejabberd.pem ] then echo "Generating SSL certificate /etc/ejabberd/ejabberd.pem..." - EHOSTNAME=$(hostname -s) - EDOMAINNAME=$(hostname -d) + EHOSTNAME=$(hostname -s 2>/dev/null || echo localhost) + EDOMAINNAME=$(hostname -d 2>/dev/null || echo localdomain) openssl req -new -x509 -days 365 -nodes -out ejabberd.pem \ -keyout ejabberd.pem > /dev/null 2>&1 <<+++ . diff -u ejabberd-2.0.1/debian/patches/ldaps.patch ejabberd-2.0.1/debian/patches/ldaps.patch --- ejabberd-2.0.1/debian/patches/ldaps.patch +++ ejabberd-2.0.1/debian/patches/ldaps.patch @@ -281,7 +281,7 @@ Host = next_host(S#eldap.host, S#eldap.hosts), - TcpOpts = [{packet, asn1}, {active, true}, {keepalive, true}, binary], + TcpOpts = case S#eldap.use_tls of -+ true -> [{packet, asn1}, {active, true}, binary]; ++ true -> [{packet, asn1}, {active, true}, {keepalive, true}, binary]; + _ -> [{packet, asn1}, {active, true}, {keepalive, true}, binary] + end, ?INFO_MSG("LDAP connection on ~s:~p", [Host, S#eldap.port]), only in patch2: unchanged: --- ejabberd-2.0.1.orig/debian/po/pt_BR.po +++ ejabberd-2.0.1/debian/po/pt_BR.po @@ -0,0 +1,104 @@ +# ejabberd Brazilian Portuguese translation +# Copyright (C) 2007 ejabberd's PACKAGE COPYRIGHT HOLDER +# This file is distributed under the same license as the ejabberd package. +# Alex de Oliveira Silva , 2007. +# Felipe Augusto van de Wiel (faw) \n" +"Language-Team: Brazilian Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"pt_BR utf-8\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "The name of the host ejabberd will serve:" +msgstr "O nome da máquina na qual o ejabberd será servidor:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Please enter the hostname of your Jabber server (in lowercase)." +msgstr "" +"Por favor, informe o nome da máquina do seu servidor Jabber (em letras " +"minúsculas)." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "The username of an admin account for ejabberd:" +msgstr "O nome de usuário de uma conta administrativa para o ejabberd:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please provide the name of an account to administrate the ejabberd server. " +"After the installation of ejabberd you can use this account to log in with " +"any Jabber client to do administrative tasks or go to http://" +"${hostname}:5280/admin/ and log in with this account to enter the admin " +"interface. Enter the username part here (e.g. ${user}), but use the full " +"Jabber ID (e.g. ${user}@${hostname}) to log into ejabberd web interface; " +"otherwise it will fail." +msgstr "" +"Por favor, forneça o nome de uma conta para administrar o servidor ejabberd. " +"Depois da instalação do ejabberd você pode usar esta conta para logar em " +"qualquer cliente Jabber para realizar tarefas administrativas ou acesse " +"http://${hostname}:5280/admin/ e efetue o login com esta conta para entrar " +"na interface administrativa. Informe aqui a parte do nome de usuário (e.g. " +"${user}), mas use um ID Jabber completo (e.g. ${user}@${hostname}) para " +"efetuar login na interface web do ejabberd; caso contrário não funcionará." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Leave empty if you don't want to create an admin account automatically." +msgstr "" +"Deixe vazio se você não quer criar automaticamente uma conta administrativa." + +#. Type: password +#. Description +#: ../templates:3001 +msgid "The password for the admin account:" +msgstr "A senha para a conta administrativa:" + +#. Type: password +#. Description +#: ../templates:3001 +msgid "Please enter the password for the administrative user." +msgstr "Por favor, informe a senha para o usuário administrativo." + +#. Type: password +#. Description +#: ../templates:4001 +msgid "The password for the admin account again for verification:" +msgstr "A senha para a conta administrativa, novamente, para verificação:" + +#. Type: password +#. Description +#: ../templates:4001 +msgid "" +"Please reenter the password for the administrative user for verification." +msgstr "" +"Por favor, informe novamente a senha do usuário administrativo para " +"verificação." + +#. Type: error +#. Description +#: ../templates:5001 +msgid "The passwords do not match!" +msgstr "As senhas não conferem!" + +#. Type: error +#. Description +#: ../templates:5001 +msgid "The passwords you have typed do not match. Please try again." +msgstr "As senhas que você digitou não conferem. Por favor, tente novamente."