Unblock request for nagios3
Hi,
I have some changes for nagios3 pending (mostly l10n, documentation stuff and
path fixes in example files). It would be nice to get a freeze exception for
them. Here is the changelog and the whole interdiff is attached:
nagios3 (3.0.3-3) unreleased; urgency=low
[ Alexander Wirt]
* Create /var/lib/nagios3/spool/checkresults (Closes: #492201)
* Refer to nagios-plugins-basic instead of nagios-plugins in commands.cfg
(Closes: #493107)
* Fix helper paths in contributed eventhandlers (Closes: #493790)
* Fix '+' decoding in trend.cgi (Closes: #495052)
* Don't fail if nagios3 is already started or not running (Closes: #499571)
[ Christian Perrier ]
* Fix pending l10n bugs. Debconf translations:
- Brazilian Portuguese. Closes: #495225
- Russian. Closes: #499032
- Basque. Closes: #499113
- Swedish. Closes: #499343
- Finnish. Closes: #499706
-- Alexander Wirt <formorer@debian.org> Tue, 23 Sep 2008 09:08:17 +0200
Thanks in advance
Alex
--
Alexander Wirt, formorer@formorer.de
CC99 2DDD D39E 75B0 B0AA B25C D35B BC99 BC7D 020A
diff -u nagios3-3.0.3/debian/nagios3-common.nagios3.init nagios3-3.0.3/debian/nagios3-common.nagios3.init
--- nagios3-3.0.3/debian/nagios3-common.nagios3.init
+++ nagios3-3.0.3/debian/nagios3-common.nagios3.init
@@ -136,9 +136,7 @@
exit 1
fi
else
- log_failure_msg "already running!"
- log_end_msg 1
- exit 1
+ log_warning_msg "already running!"
fi
return $ret
}
@@ -193,9 +191,7 @@
if check_started; then
killproc -p $THEPIDFILE $DAEMON 1
else
- log_failure_msg "Not running."
- log_end_msg 7
- exit 7
+ log_warning_msg "Not running."
fi
else
log_failure_msg "errors in config!"
diff -u nagios3-3.0.3/debian/nagios3-common.dirs nagios3-3.0.3/debian/nagios3-common.dirs
--- nagios3-3.0.3/debian/nagios3-common.dirs
+++ nagios3-3.0.3/debian/nagios3-common.dirs
@@ -5,7 +5,7 @@
usr/share/nagios3/plugins/eventhandlers
var/lib/nagios3/rw
var/lib/nagios3/spool
-var/lib/nagios3/checkresults
+var/lib/nagios3/spool/checkresults
var/log/nagios3/archives
var/run/nagios3
var/cache/nagios3
diff -u nagios3-3.0.3/debian/changelog nagios3-3.0.3/debian/changelog
--- nagios3-3.0.3/debian/changelog
+++ nagios3-3.0.3/debian/changelog
@@ -1,3 +1,22 @@
+nagios3 (3.0.3-3) unreleased; urgency=low
+
+ [ Alexander Wirt]
+ * Create /var/lib/nagios3/spool/checkresults (Closes: #492201)
+ * Refer to nagios-plugins-basic instead of nagios-plugins in commands.cfg
+ (Closes: #493107)
+ * Fix helper paths in contributed eventhandlers (Closes: #493790)
+ * Fix '+' decoding in trend.cgi (Closes: #495052)
+ * Don't fail if nagios3 is already started or not running (Closes: #499571)
+ [ Christian Perrier ]
+ * Fix pending l10n bugs. Debconf translations:
+ - Brazilian Portuguese. Closes: #495225
+ - Russian. Closes: #499032
+ - Basque. Closes: #499113
+ - Swedish. Closes: #499343
+ - Finnish. Closes: #499706
+
+ -- Alexander Wirt <formorer@debian.org> Tue, 23 Sep 2008 09:08:17 +0200
+
nagios3 (3.0.3-2) unstable; urgency=medium
[ Jan Wagner ]
diff -u nagios3-3.0.3/debian/patches/51_commands.cfg-debianize.dpatch nagios3-3.0.3/debian/patches/51_commands.cfg-debianize.dpatch
--- nagios3-3.0.3/debian/patches/51_commands.cfg-debianize.dpatch
+++ nagios3-3.0.3/debian/patches/51_commands.cfg-debianize.dpatch
@@ -208,7 +208,7 @@
-
-
+# On Debian, check-host-alive is being defined from within the
-+# nagios-plugins package
++# nagios-plugins-basic package
################################################################################
#
diff -u nagios3-3.0.3/debian/patches/00list nagios3-3.0.3/debian/patches/00list
--- nagios3-3.0.3/debian/patches/00list
+++ nagios3-3.0.3/debian/patches/00list
@@ -2,6 +2,6 @@
-20_submit_check_result_386152.dpatch
40_fix_spurious_dollar_signs_added_to_command_lines.dpatch
50_cgi.cfg-debianize.dpatch
51_commands.cfg-debianize.dpatch
52_nagios.cfg-debianize.dpatch
60_fix_p1.pl_patch_mini_epn.dpatch
+70_fix_eventhandler_paths.dpatch
reverted:
--- nagios3-3.0.3/debian/patches/20_submit_check_result_386152.dpatch
+++ nagios3-3.0.3.orig/debian/patches/20_submit_check_result_386152.dpatch
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_submit_check_result_386152.dpatch by Marc Haber <mh+debian-packages@zugschlus.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix wrong path in contrib/eventhandlers/submit_check_result
-
-@DPATCH@
-diff -urNad nagios2~/contrib/eventhandlers/submit_check_result nagios2/contrib/eventhandlers/submit_check_result
---- nagios2~/contrib/eventhandlers/submit_check_result 2002-02-26 05:03:37.000000000 +0100
-+++ nagios2/contrib/eventhandlers/submit_check_result 2006-09-09 16:43:53.945631182 +0200
-@@ -24,7 +24,7 @@
-
- echocmd="/bin/echo"
-
--CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
-+CommandFile="/var/lib/nagios3/rw/nagios.cmd"
-
- # get the current date/time in seconds since UNIX epoch
- datetime=`date +%s`
only in patch2:
unchanged:
--- nagios3-3.0.3.orig/debian/po/pt_BR.po
+++ nagios3-3.0.3/debian/po/pt_BR.po
@@ -0,0 +1,109 @@
+# nagios3 Brazilian Portuguese translation.
+# Copyright (C) THE nagios3's COPYRIGHT HOLDER
+# This file is distributed under the same license as nagios3 package.
+# Bruno Gurgel Gomes de Oliveira <bruno@4linux.com.br>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nagios3_3.0.3-1\n"
+"Report-Msgid-Bugs-To: pkg-nagios-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-10-31 15:50+0100\n"
+"PO-Revision-Date: 2008-07-25 19:40-0300\n"
+"Last-Translator: Bruno Gurgel Gomes de Oliveira <bruno@4linux.com.br>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\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: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid "Apache servers to configure for nagios3:"
+msgstr "Servidores apache a serem configurados para o nagios3:"
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid "Please select which apache servers should be configured for nagios3."
+msgstr ""
+"Por favor, selecione quais servidores apache deverão ser configurados para o "
+"nagios3."
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"Se você preferir realizar a configuração manualmente, não selecione nenhum "
+"servidor."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid "Nagios web administration password:"
+msgstr "Senha de administração web do Nagios:"
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid ""
+"Please provide the password to be created with the \"nagiosadmin\" user."
+msgstr "Por favor, forneça a senha a ser criada com o usuário \"nagiosadmin\"."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid ""
+"This is the username and password you will use to log in to your nagios "
+"installation after configuration is complete. If you do not provide a "
+"password, you will have to configure access to nagios yourself."
+msgstr ""
+"Este é o nome de usuário e a senha que você usará para acessar sua "
+"instalação nagios depois que a configuração estiver completa. Se você não "
+"fornecer uma senha, você mesmo terá que configurar o acesso ao nagios."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:3001
+msgid "Password confirmation:"
+msgstr "Confirmação de senha:"
+
+#. Type: note
+#. Description
+#: ../nagios3-common.templates:4001
+msgid "The passwords do not match"
+msgstr "As senhas não coincidem"
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid "Enable support for nagios 1.x links in nagios3?"
+msgstr "Habilitar suporte para links do nagios 1.x no nagios3?"
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid ""
+"Please choose whether the Apache configuration for nagios3 should provide "
+"compatibility with links from nagios 1.x."
+msgstr ""
+"Por favor, selecione se a configuração do Apache para o nagios3 deve "
+"fornecer compatibilidade com links do nagios 1.x."
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid ""
+"If you select this option, the apache configuration used for nagios will "
+"include directives to support URLs from nagios 1.x. You should not choose "
+"this option if you still have nagios 1.x on your system, or unpredictable "
+"results may occur."
+msgstr ""
+"Se você selecionar esta opção, a configuração do apache usada para o nagios "
+"incluirá diretivas para dar suporte a URLs do nagios 1.x. Você não deveria "
+"escolher esta opção se você ainda tem o nagios 1.x no seu sistema, ou "
+"resultados imprevisíveis podem ocorrer."
only in patch2:
unchanged:
--- nagios3-3.0.3.orig/debian/po/eu.po
+++ nagios3-3.0.3/debian/po/eu.po
@@ -0,0 +1,108 @@
+# translation of nagios3-eu.po to Euskara
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Piarres Beobide <pi@beobide.net>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: nagios3-eu\n"
+"Report-Msgid-Bugs-To: pkg-nagios-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-10-31 15:50+0100\n"
+"PO-Revision-Date: 2008-09-16 10:46+0200\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid "Apache servers to configure for nagios3:"
+msgstr "Nagios3-rako konfiguratu behar diren apache zerbitzariak:"
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid "Please select which apache servers should be configured for nagios3."
+msgstr ""
+"Mesedez hautatu zein apache zerbitzari konfiguratu behar dira nagios3-rako."
+"apache konfiguratuta errepikatu arte."
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"Eskuzko instalazio bat egitea nahigo baduzu, utzi zerbitzari guztiak hautatu "
+"gabe."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid "Nagios web administration password:"
+msgstr "Nagios web kudeatzaile pasahitza:"
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid ""
+"Please provide the password to be created with the \"nagiosadmin\" user."
+msgstr "Mesedez ezarri \"nagiosadmin\" erabiltzailearen pasahitza."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid ""
+"This is the username and password you will use to log in to your nagios "
+"installation after configuration is complete. If you do not provide a "
+"password, you will have to configure access to nagios yourself."
+msgstr ""
+"Hau da nagios instalazioan konfigurazioa amaitu aurretik saioa hasteko "
+"erabili behar diren erabiltzaile-izen eta pasahitza. Ez baduzu pasahitzik "
+"ezartzen nagios saio hasiera zure kabuz konfiguratu beharko duzu."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:3001
+msgid "Password confirmation:"
+msgstr "Pasahitz berrespena:"
+
+#. Type: note
+#. Description
+#: ../nagios3-common.templates:4001
+msgid "The passwords do not match"
+msgstr "Pasahitzak ez datoz bat"
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid "Enable support for nagios 1.x links in nagios3?"
+msgstr "Nagios 1.x loturako gaitu nagios3-an?"
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid ""
+"Please choose whether the Apache configuration for nagios3 should provide "
+"compatibility with links from nagios 1.x."
+msgstr ""
+"Mesedez hautatu Apache zerbitzariko nagios3 konfigurazioak nagios 1.x "
+"bertsioko loturekin bateragarritasuna mantendu behar duen ala ez."
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid ""
+"If you select this option, the apache configuration used for nagios will "
+"include directives to support URLs from nagios 1.x. You should not choose "
+"this option if you still have nagios 1.x on your system, or unpredictable "
+"results may occur."
+msgstr ""
+"Aukera hau hautatuaz gero apache nagios-en konfigurazioak nagios 1.x "
+"bertsioko loturak onartzeko direktibak izango ditu. Ez zenuke aukera hau "
+"onartu beharko dagoeneko 1.x bertsioetako nagios bat sisteman abiarazirik "
+"baduzu edo emaitza aurre-ikustezinak gerta daitezke."
only in patch2:
unchanged:
--- nagios3-3.0.3.orig/debian/po/ru.po
+++ nagios3-3.0.3/debian/po/ru.po
@@ -0,0 +1,106 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <kozlov.y@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: ru\n"
+"Report-Msgid-Bugs-To: pkg-nagios-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-10-31 15:50+0100\n"
+"PO-Revision-Date: 2008-09-15 19:06+0400\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid "Apache servers to configure for nagios3:"
+msgstr "Серверы apache для настройки под nagios3:"
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid "Please select which apache servers should be configured for nagios3."
+msgstr "Выберите серверы apache, которые нужно настроить для nagios3."
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr "Если вы хотите выполнить настройку вручную, то ничего не выбирайте."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid "Nagios web administration password:"
+msgstr "Пароль для веб-администрирования Nagios:"
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid ""
+"Please provide the password to be created with the \"nagiosadmin\" user."
+msgstr "Введите пароль для создаваемой учётной записи \"nagiosadmin\"."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid ""
+"This is the username and password you will use to log in to your nagios "
+"installation after configuration is complete. If you do not provide a "
+"password, you will have to configure access to nagios yourself."
+msgstr ""
+"Вы будете использовать эту учётную запись и пароль для доступа к nagios "
+"после завершения настройки. Если вы не укажите пароль, то вам нужно будет "
+"настроить доступ к nagios самостоятельно."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:3001
+msgid "Password confirmation:"
+msgstr "Введите пароль ещё раз:"
+
+#. Type: note
+#. Description
+#: ../nagios3-common.templates:4001
+msgid "The passwords do not match"
+msgstr "Пароли не совпадают"
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid "Enable support for nagios 1.x links in nagios3?"
+msgstr "Включить поддержку ссылок nagios 1.x в nagios3?"
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid ""
+"Please choose whether the Apache configuration for nagios3 should provide "
+"compatibility with links from nagios 1.x."
+msgstr ""
+"Выберите, нужно ли настраивать Apache в nagios3 для предоставления обратной "
+"совместимости по ссылкам с nagios 1.x."
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid ""
+"If you select this option, the apache configuration used for nagios will "
+"include directives to support URLs from nagios 1.x. You should not choose "
+"this option if you still have nagios 1.x on your system, or unpredictable "
+"results may occur."
+msgstr ""
+"Если вы ответите утвердительно, то в настройку apache, который используется "
+"с nagios, будут включены директивы для поддержки URL-ов из nagios 1.x. Лучше "
+"не включать поддержку, если в системе ещё используется nagios 1.x, так как "
+"это приведёт к непредсказуемым последствиям."
only in patch2:
unchanged:
--- nagios3-3.0.3.orig/debian/po/sv.po
+++ nagios3-3.0.3/debian/po/sv.po
@@ -0,0 +1,105 @@
+# translation of nagios3.po to swedish
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Martin Bagge <brother@bsnet.se>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: nagios3\n"
+"Report-Msgid-Bugs-To: pkg-nagios-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-10-31 15:50+0100\n"
+"PO-Revision-Date: 2008-09-17 23:30+0100\n"
+"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
+"Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid "Apache servers to configure for nagios3:"
+msgstr "Ange vilken apacheversion som ska förberedas för nagios3:"
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid "Please select which apache servers should be configured for nagios3."
+msgstr "Ange den apacheserver som ska ställas in för nagios3."
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"Om du föredrar att ställa in apache manuellt markerar du inte något av "
+"alternativen."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid "Nagios web administration password:"
+msgstr "Lösenord för nagios webbadministration:"
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid ""
+"Please provide the password to be created with the \"nagiosadmin\" user."
+msgstr "Ange lösenordet som ska användas för användaren \"nagiosadmin\"."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid ""
+"This is the username and password you will use to log in to your nagios "
+"installation after configuration is complete. If you do not provide a "
+"password, you will have to configure access to nagios yourself."
+msgstr ""
+"Detta användarnamn och lösenord använder du för att logga in i din "
+"nagiosinstallation. Om du inte anger ett lösenord här måste du ställa in "
+"nagios manuellt."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:3001
+msgid "Password confirmation:"
+msgstr "Upprepa lösenordet:"
+
+#. Type: note
+#. Description
+#: ../nagios3-common.templates:4001
+msgid "The passwords do not match"
+msgstr "Lösenorden stämmer inte överrens"
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid "Enable support for nagios 1.x links in nagios3?"
+msgstr "Aktivera stöd för länkar som de såg ut inagios 1.x?"
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid ""
+"Please choose whether the Apache configuration for nagios3 should provide "
+"compatibility with links from nagios 1.x."
+msgstr ""
+"Ange om du vill att inställningarna i Apache ska ha stöd för länkar från "
+"nagios 1.x."
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid ""
+"If you select this option, the apache configuration used for nagios will "
+"include directives to support URLs from nagios 1.x. You should not choose "
+"this option if you still have nagios 1.x on your system, or unpredictable "
+"results may occur."
+msgstr ""
+"Om du väljer detta alternativ för nagios så kommer stöd för URL:er från "
+"nagios 1.x aktiveras. Du ska inte aktivera detta om du fortfarande har "
+"nagios 1.x instllerat på ditt system, konflikter kan då uppstå."
only in patch2:
unchanged:
--- nagios3-3.0.3.orig/debian/po/fi.po
+++ nagios3-3.0.3/debian/po/fi.po
@@ -0,0 +1,101 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: nagios3\n"
+"Report-Msgid-Bugs-To: pkg-nagios-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-10-31 15:50+0100\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Finnish\n"
+"X-Poedit-Country: FINLAND\n"
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid "Apache servers to configure for nagios3:"
+msgstr "Apache-palvelimet, joiden asetuksia muokataan nagios3:a varten:"
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid "Please select which apache servers should be configured for nagios3."
+msgstr ""
+"Valitse minkä Apache-palvelimien asetuksia tulisi muokata nagios3:n "
+"käyttöönottamiseksi."
+
+#. Type: multiselect
+#. Description
+#: ../nagios3-common.templates:1001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr "Jos haluat tehdä asetukset käsin, älä valitse mitään palvelinta."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid "Nagios web administration password:"
+msgstr "Nagios-verkkoylläpidon salasana:"
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid ""
+"Please provide the password to be created with the \"nagiosadmin\" user."
+msgstr "Anna salasana käyttäjätunnukselle ”nagiosadmin”."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:2001
+msgid ""
+"This is the username and password you will use to log in to your nagios "
+"installation after configuration is complete. If you do not provide a "
+"password, you will have to configure access to nagios yourself."
+msgstr ""
+"Tämän käyttäjätunnuksen ja salasanan avulla voidaan nagios-asennukseen "
+"kirjautua, kun asetusten muokkaus on päättynyt. Jos salasanaa ei anneta, "
+"täytyy nagiokseen pääsy asettaa käsin."
+
+#. Type: password
+#. Description
+#: ../nagios3-common.templates:3001
+msgid "Password confirmation:"
+msgstr "Salasanan vahvistus:"
+
+#. Type: note
+#. Description
+#: ../nagios3-common.templates:4001
+msgid "The passwords do not match"
+msgstr "Salasanat eivät täsmää."
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid "Enable support for nagios 1.x links in nagios3?"
+msgstr "Otetaanko nagiosin version 1.x linkkien tuki käyttöön nagios3:ssa?"
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid ""
+"Please choose whether the Apache configuration for nagios3 should provide "
+"compatibility with links from nagios 1.x."
+msgstr ""
+"Valitse tulisiko nagios3:n Apache-asetusten olla yhteensopivia nagios 1.x:n "
+"linkkien kanssa."
+
+#. Type: boolean
+#. Description
+#: ../nagios3-common.templates:5001
+msgid ""
+"If you select this option, the apache configuration used for nagios will "
+"include directives to support URLs from nagios 1.x. You should not choose "
+"this option if you still have nagios 1.x on your system, or unpredictable "
+"results may occur."
+msgstr ""
+"Jos valitset tämän, Apachen nagios-asetuksiin sisällytetään tuki nagios 1.x:"
+"n URLeille. Tätä ei tulisi valita, jos järjestelmässä on edelleen nagios 1.x "
+"asennettuna, koska seuraukset eivät ole ennustettavissa."
only in patch2:
unchanged:
--- nagios3-3.0.3.orig/debian/patches/80_fix_encoding_trends.cgi.dpatch
+++ nagios3-3.0.3/debian/patches/80_fix_encoding_trends.cgi.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_fix_encoding_trends.cgi.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad trunk~/cgi/getcgi.c trunk/cgi/getcgi.c
+--- trunk~/cgi/getcgi.c 2006-05-15 18:59:24.000000000 +0200
++++ trunk/cgi/getcgi.c 2008-09-23 09:19:04.000000000 +0200
+@@ -96,6 +96,9 @@
+ break;
+ else if(input[x]=='%'){
+ input[y]=hex_to_char(&input[x+1]);
++ if (input[y]=='+'){
++ input[y]=' ';
++ }
+ x+=2;
+ }
+ else
only in patch2:
unchanged:
--- nagios3-3.0.3.orig/debian/patches/70_fix_eventhandler_paths.dpatch
+++ nagios3-3.0.3/debian/patches/70_fix_eventhandler_paths.dpatch
@@ -0,0 +1,140 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_fix_eventhandler_paths.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes paths for all contributed eventhandlers
+
+@DPATCH@
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/disable_active_service_checks nagios3-3.0.3/contrib/eventhandlers/disable_active_service_checks
+--- nagios3-3.0.3~/contrib/eventhandlers/disable_active_service_checks 2008-05-19 20:01:59.000000000 +0200
++++ nagios3-3.0.3/contrib/eventhandlers/disable_active_service_checks 2008-08-05 09:56:27.000000000 +0200
+@@ -14,9 +14,9 @@
+ # the check_external_commands option in the main
+ # configuration file.
+
+-printfcmd="/bin/printf"
++printfcmd="/usr/usr/usr/bin/printf"
+
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/nagios3/rw/nagios.cmd"
+
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/disable_notifications nagios3-3.0.3/contrib/eventhandlers/disable_notifications
+--- nagios3-3.0.3~/contrib/eventhandlers/disable_notifications 2008-01-24 13:34:57.000000000 +0100
++++ nagios3-3.0.3/contrib/eventhandlers/disable_notifications 2008-08-05 09:56:27.000000000 +0200
+@@ -12,9 +12,9 @@
+ # the check_external_commands option in the main
+ # configuration file.
+
+-printfcmd="/bin/printf"
++printfcmd="/usr/usr/usr/bin/printf"
+
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/nagios3/rw/nagios.cmd"
+
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler nagios3-3.0.3/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler
+--- nagios3-3.0.3~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler 2002-02-26 05:03:37.000000000 +0100
++++ nagios3-3.0.3/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler 2008-08-05 09:57:54.000000000 +0200
+@@ -21,7 +21,7 @@
+ #
+
+ # Location of the submit_check_result_via_nsca script
+-SubmitCmd="/usr/local/nagios/libexec/eventhandlers/submit_check_result_via_nsca"
++SubmitCmd="/usr/share/nagios3/plugins/eventhandlers/distributed-monitoring/submit_check_result_via_nsca"
+
+ # Convert the state string to the corresponding return code
+ return_code=-1
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca nagios3-3.0.3/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
+--- nagios3-3.0.3~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca 2008-04-14 17:55:06.000000000 +0200
++++ nagios3-3.0.3/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca 2008-08-05 09:58:47.000000000 +0200
+@@ -26,10 +26,10 @@
+ # IP address of the central server that has the nsca
+ # daemon running.
+
+-printfcmd="/bin/printf"
++printfcmd="/usr/bin/printf"
+
+-NscaBin="/usr/local/nagios/libexec/send_nsca"
+-NscaCfg="/usr/local/nagios/etc/send_nsca.cfg"
++NscaBin="/usr/sbin/send_nsca"
++NscaCfg="/etc/send_nsca.cfg"
+ NagiosHost="nagioshost"
+
+ # Fire the data off to the NSCA daemon using the send_nsca script
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/enable_active_service_checks nagios3-3.0.3/contrib/eventhandlers/enable_active_service_checks
+--- nagios3-3.0.3~/contrib/eventhandlers/enable_active_service_checks 2008-05-19 20:01:59.000000000 +0200
++++ nagios3-3.0.3/contrib/eventhandlers/enable_active_service_checks 2008-08-05 09:56:27.000000000 +0200
+@@ -14,9 +14,9 @@
+ # the check_external_commands option in the main
+ # configuration file.
+
+-printfcmd="/bin/printf"
++printfcmd="/usr/usr/bin/printf"
+
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/nagios3/rw/nagios.cmd"
+
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/enable_notifications nagios3-3.0.3/contrib/eventhandlers/enable_notifications
+--- nagios3-3.0.3~/contrib/eventhandlers/enable_notifications 2008-01-24 13:34:57.000000000 +0100
++++ nagios3-3.0.3/contrib/eventhandlers/enable_notifications 2008-08-05 09:56:27.000000000 +0200
+@@ -12,9 +12,9 @@
+ # the check_external_commands option in the main
+ # configuration file.
+
+-printfcmd="/bin/printf"
++printfcmd="/usr/bin/printf"
+
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/nagios3/rw/nagios.cmd"
+
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event nagios3-3.0.3/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event
+--- nagios3-3.0.3~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event 2004-02-20 05:37:01.000000000 +0100
++++ nagios3-3.0.3/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event 2008-08-05 09:59:37.000000000 +0200
+@@ -10,10 +10,10 @@
+
+ # Location of the echo and mail commands
+ echocmd="/bin/echo"
+-mailcmd="/bin/mail"
++mailcmd="/usr/bin/mail"
+
+ # Location of the event handlers
+-eventhandlerdir="/usr/local/nagios/libexec/eventhandlers"
++eventhandlerdir="/usr/share/nagios3/plugins/eventhandlers"
+
+
+ # Only take action on hard host states...
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event nagios3-3.0.3/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
+--- nagios3-3.0.3~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event 2006-05-30 18:38:01.000000000 +0200
++++ nagios3-3.0.3/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event 2008-08-05 09:59:59.000000000 +0200
+@@ -10,10 +10,10 @@
+
+ # Location of the echo and mail commands
+ echocmd="/bin/echo"
+-mailcmd="/bin/mail"
++mailcmd="/usr/bin/mail"
+
+ # Location of the event handlers
+-eventhandlerdir="/usr/local/nagios/libexec/eventhandlers"
++eventhandlerdir="/usr/share/nagios3/plugins/eventhandlers"
+
+
+ # Only take action on hard service states...
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/submit_check_result nagios3-3.0.3/contrib/eventhandlers/submit_check_result
+--- nagios3-3.0.3~/contrib/eventhandlers/submit_check_result 2002-02-26 05:03:37.000000000 +0100
++++ nagios3-3.0.3/contrib/eventhandlers/submit_check_result 2008-08-05 09:56:27.000000000 +0200
+@@ -24,7 +24,7 @@
+
+ echocmd="/bin/echo"
+
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/nagios3/rw/nagios.cmd"
+
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
Reply to: