* Split the ssh binary package into openssh-client and openssh-server

  (closes: #39741). openssh-server depends on openssh-client for some
  common functionality; it didn't seem worth creating yet another package
  for this.
* New transitional ssh package, depending on openssh-client and
  openssh-server. May be removed once nothing depends on it.
* When upgrading from ssh to openssh-{client,server}, it's very difficult
  for the maintainer scripts to find out what version we're upgrading from
  without dodgy dpkg hackery. I've therefore taken the opportunity to move
  a couple of debconf notes into NEWS files, namely ssh/ssh2_keys_merged
  and ssh/user_environment_tell.
* In general, upgrading to this version directly from woody without first
  upgrading to the version in sarge is not currently guaranteed to work
  very smoothly due to the aforementioned version discovery problems.

1 files changed, 115 insertions, 140 deletions

diff --git a/debian/po/nl.po b/debian/po/nl.po
index e3fbdfc72..40bca6356 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1p2-9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+0100\n"
 "PO-Revision-Date: 2003-09-27 14:43+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -25,13 +25,51 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "Wilt u /usr/lib/ssh-keysign met SUID root installeren?"
+
+#. Type: boolean
+#. Description
+#: ../openssh-client.templates.master:4
+msgid ""
+"You have the option of installing the ssh-keysign helper with the SUID bit "
+"set."
+msgstr ""
+"U heeft de mogelijkheid om het ssh-keysign hulpprogramma te installeren met "
+"de SUID-bit aan."
+
+#. Type: boolean
+#. Description
+#: ../openssh-client.templates.master:4
+msgid ""
+"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
+"based authentication."
+msgstr ""
+"Wanneer u de SUID-bit voor ssh-keysign aanzet, krijgt u de mogelijkheid om "
+"de computer-gebaseerde authenticatie van het versie 2 SSH-protocol te "
+"gebruiken."
+
+#. Type: boolean
+#. Description
+#: ../openssh-client.templates.master:4
+msgid ""
+"If in doubt, I suggest you install it with SUID.  If it causes problems you "
+"can change your mind later by running:   dpkg-reconfigure ssh"
+msgstr ""
+"Bij twijfel kunt u best met SUID installeren. Indien dit problemen "
+"veroorzaakt kunt u dit altijd later nog veranderen door \"dpkg-reconfigure "
+"ssh\" uit te voeren"
+
+#. Type: boolean
+#. Description
+#: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Genereer het nieuwe configuratiebestand"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -48,7 +86,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -65,7 +103,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -75,13 +113,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Laat enkel versie 2 van het SSH-protocol toe."
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -95,7 +133,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
@@ -106,7 +144,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -114,34 +152,15 @@ msgstr ""
 "Instructies over wat te veranderen in sshd_config om deze instelling later "
 "nog te veranderen, vindt u in /usr/share/doc/ssh/README.Debian.gz."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "ssh2 sleutels zijn samengevoegd in de configuratiebestanden"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid ""
-"As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
-"keys. This means the authorized_keys2 and known_hosts2 files are no longer "
-"needed. They will still be read in order to maintain backwards compatibility"
-msgstr ""
-"Vanaf versie 3 gebruikt OpenSSH niet langer aparte bestanden om ssh1 en ssh2 "
-"sleutels bij te houden. Dit betekend dat de authorized_keys2 en known_hosts2 "
-"bestanden niet langer nodig zijn. Wel worden ze nog steeds gelezen om "
-"achterwaartse compabiliteit te behouden."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "Wilt u verder gaan (waarbij u mogelijk actieve ssh sessies afschiet)?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -153,7 +172,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -163,14 +182,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "OPMERKING: Doorsturen van X11 en Authorisatie is standaard uitgeschakeld."
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -180,7 +199,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -190,13 +209,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "Meer details vindt u in /usr/share/doc/ssh/README.Debian.gz"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "Waarschuwing: rsh-server is geïnstalleerd -- dit is waarschijnlijk geen goed "
@@ -204,7 +223,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -215,7 +234,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 "Waarschuwing: telnetd is geïnstalleerd -- dit is waarschijnlijk geen goed "
@@ -223,7 +242,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -237,13 +256,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "Waarschuwing: u dient een nieuwe computersleutel aan te maken"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -255,116 +274,72 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "Het zal nodig zijn om een nieuwe computersleutel te genereren"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr "Wilt u /usr/lib/ssh-keysign met SUID root installeren?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"U heeft de mogelijkheid om het ssh-keysign hulpprogramma te installeren met "
-"de SUID-bit aan."
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Wanneer u de SUID-bit voor ssh-keysign aanzet, krijgt u de mogelijkheid om "
-"de computer-gebaseerde authenticatie van het versie 2 SSH-protocol te "
-"gebruiken."
+#~ msgid "ssh2 keys merged in configuration files"
+#~ msgstr "ssh2 sleutels zijn samengevoegd in de configuratiebestanden"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"If in doubt, I suggest you install it with SUID.  If it causes problems you "
-"can change your mind later by running:   dpkg-reconfigure ssh"
-msgstr ""
-"Bij twijfel kunt u best met SUID installeren. Indien dit problemen "
-"veroorzaakt kunt u dit altijd later nog veranderen door \"dpkg-reconfigure "
-"ssh\" uit te voeren"
+#~ msgid ""
+#~ "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
+#~ "keys. This means the authorized_keys2 and known_hosts2 files are no "
+#~ "longer needed. They will still be read in order to maintain backwards "
+#~ "compatibility"
+#~ msgstr ""
+#~ "Vanaf versie 3 gebruikt OpenSSH niet langer aparte bestanden om ssh1 en "
+#~ "ssh2 sleutels bij te houden. Dit betekend dat de authorized_keys2 en "
+#~ "known_hosts2 bestanden niet langer nodig zijn. Wel worden ze nog steeds "
+#~ "gelezen om achterwaartse compabiliteit te behouden."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "Wilt u de sshd server opstarten?"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "Wilt u de sshd server opstarten?"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "Dit pakket bevat zowel de ssh-client, als de sshd-server."
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr "Dit pakket bevat zowel de ssh-client, als de sshd-server."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"Normaal wordt de sshd-server uitgevoerd om aanmelden vanop een andere "
-"computer via ssh toe te laten."
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "Normaal wordt de sshd-server uitgevoerd om aanmelden vanop een andere "
+#~ "computer via ssh toe te laten."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"If you are only interested in using the ssh client for outbound connections "
-"on this machine, and don't want to log into it at all using ssh, then you "
-"can disable sshd here."
-msgstr ""
-"Indien u op deze machine enkel ssh wil gebruiken voor uitgaande "
-"verbindingen, en ook lokaal niet wilt inloggen via ssh, kunt u sshd hier "
-"uitschakelen."
+#~ msgid ""
+#~ "If you are only interested in using the ssh client for outbound "
+#~ "connections on this machine, and don't want to log into it at all using "
+#~ "ssh, then you can disable sshd here."
+#~ msgstr ""
+#~ "Indien u op deze machine enkel ssh wil gebruiken voor uitgaande "
+#~ "verbindingen, en ook lokaal niet wilt inloggen via ssh, kunt u sshd hier "
+#~ "uitschakelen."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr ""
-"Omgevingsopties voor sleutels zullen in de toekomst niet meer ondersteund "
-"worden."
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr ""
+#~ "Omgevingsopties voor sleutels zullen in de toekomst niet meer ondersteund "
+#~ "worden."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid ""
-"This version of OpenSSH disables the environment option for public keys by "
-"default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
-"are using this option in an authorized_keys file, beware that the keys in "
-"question will no longer work until the option is removed."
-msgstr ""
-"Deze versie van OpenSSH schakelt de omgevingsoptie voor publieke sleutels "
-"standaard uit om bepaalde aanvallen uit te sluiten (bv. LD_PRELOAD). Indien "
-"u deze optie in een authorized_keys-bestand gebruikt, dient u u ervan bewust "
-"te zijn dat de betreffende sleutels niet langer zullen werken totdat de "
-"optie verwijderd wordt."
+#~ msgid ""
+#~ "This version of OpenSSH disables the environment option for public keys "
+#~ "by default, in order to avoid certain attacks (for example, LD_PRELOAD). "
+#~ "If you are using this option in an authorized_keys file, beware that the "
+#~ "keys in question will no longer work until the option is removed."
+#~ msgstr ""
+#~ "Deze versie van OpenSSH schakelt de omgevingsoptie voor publieke sleutels "
+#~ "standaard uit om bepaalde aanvallen uit te sluiten (bv. LD_PRELOAD). "
+#~ "Indien u deze optie in een authorized_keys-bestand gebruikt, dient u u "
+#~ "ervan bewust te zijn dat de betreffende sleutels niet langer zullen "
+#~ "werken totdat de optie verwijderd wordt."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid ""
-"To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
-"sshd_config after the upgrade is complete, taking note of the warning in the "
-"sshd_config(5) manual page."
-msgstr ""
-"Om deze optie opnieuw in te schakelen dient u \"PermitUserEnvironment yes\" "
-"in /etc/ssh/sshd_config aan te zetten in nadat de opwaardering compleet is; "
-"houd hierbij rekening met de waarschuwing in de sshd_config(5) man-pagina."
+#~ msgid ""
+#~ "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
+#~ "sshd_config after the upgrade is complete, taking note of the warning in "
+#~ "the sshd_config(5) manual page."
+#~ msgstr ""
+#~ "Om deze optie opnieuw in te schakelen dient u \"PermitUserEnvironment yes"
+#~ "\" in /etc/ssh/sshd_config aan te zetten in nadat de opwaardering "
+#~ "compleet is; houd hierbij rekening met de waarschuwing in de sshd_config"
+#~ "(5) man-pagina."
 
 #~ msgid "Privilege separation"
 #~ msgstr "Rechtenscheiding"