* Add Dutch debconf translation, thanks to Bart Cornelis

  (closes: #451396).
* Add patch to daemonize before chrooting and dropping privileges, thanks
  to Matthew William Solloway Bell (closes: #450759).

diff --git a/debian/changelog b/debian/changelog
index 43f29126470c1e750d3f37051d333318f5086be9..caabb547236f4244cd647a33844b6840946f3464 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,16 @@ iodine (0.4.0-4) UNRELEASED; urgency=low
 
   * Add French debconf translation, thanks to Christian Perrier
     (closes: #434323).
+  * Add Dutch debconf translation, thanks to Bart Cornelis
+    (closes: #451396).
   * Clean up debian/rules.
   * Don't install TODO anymore, and remove debian/docs.
   * Move upstream URL from the description to the new Homepage field.
   * Change XS-Vcs-* fields to Vcs-*.
+  * Add patch to daemonize before chrooting and dropping privileges, thanks
+    to Matthew William Solloway Bell (closes: #450759).
 
- -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 15 Oct 2007 19:55:14 +0200
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Fri, 16 Nov 2007 12:22:40 +0100
 
 iodine (0.4.0-3) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 25797c5fc5690bd0af7f55601c071439e9455b52..713581a6bdba4a04fcf490b9cdc72bc83938d32d 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 01_mandir
+02_detach

diff --git a/debian/patches/02_detach.dpatch b/debian/patches/02_detach.dpatch
new file mode 100755 (executable)
index 0000000..1da24c9
--- /dev/null
+++ b/debian/patches/02_detach.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_detach.dpatch by  <gregor+debian@comodo.priv.at>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: daemonize before chrooting.
+
+@DPATCH@
+diff -urNad iodine~/src/iodine.c iodine/src/iodine.c
+--- iodine~/src/iodine.c       2007-03-30 21:35:42.000000000 +0200
++++ iodine/src/iodine.c        2007-11-16 12:20:25.000000000 +0100
+@@ -564,6 +564,10 @@
+       
+       printf("Sending queries for %s to %s\n", argv[1], argv[0]);
+ 
++      if (!foreground) {
++              do_detach();
++      }
++
+       do_chroot(newroot);
+       
+       if (username) {
+@@ -573,10 +577,6 @@
+               }
+       }
+       
+-      if (!foreground) {
+-              do_detach();
+-      }
+-
+       tunnel(tun_fd, dns_fd);
+ 
+ cleanup2:

diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644 (file)
index 0000000..700fce4
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE 'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the  package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: iodine\n"
+"Report-Msgid-Bugs-To: gregor+debian@comodo.priv.at\n"
+"POT-Creation-Date: 2007-07-16 16:43+0200\n"
+"PO-Revision-Date: 2007-11-02 15:44+0100\n"
+"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch@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: Dutch\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Should iodined (server) start on boot?"
+msgstr "Wilt u dat de achtergronddienst 'iodined' gestart wordt tijdens het opstarten van deze machine?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "If you want iodined to be started at boot time you can set this behaviour here."
+msgstr "Hier geeft u aan of u wilt dat iodined gestart wordt tijdens het opstarten."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Options to iodined (server):"
+msgstr "Opties voor iodined:"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "You need to give the necessary arguments to iodined; see iodined(8) for help. Example: 10.0.0.1 tunnel.mydomain.example"
+msgstr "Hier geeft u de argumenten waarmee iodined aangeroepen dient te worden; meer informatie vindt u in de man-pagina iodined(8). Voorbeeld: 10.0.0.1 tunnel.mijndomein.voorbeeld"
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "Password for iodined (server):"
+msgstr "Wachtwoord voor iodined:"
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "Enter the password iodined uses at startup. It has to be used by clients when connecting. This password will be stored in plain text in /etc/default/iodine."
+msgstr "Wat is het door iodined bij het opstarten te gebruiken wachtwoord? Dit wachtwoord dient door clients opgegeven te worden wanneer ze verbinding maken. Dit wachtwoord wordt als onversleutelde tekst opgeslagen in /etc/default/iodine."
+