Imported Debian patch 4.0.3-0.1debian/4.0.3-0.1

6 files changed, 167 insertions, 31 deletions

diff --git a/debian/changelog b/debian/changelog
index fb6202b..5e2a327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
-screen (4.0.2-4.1sarge1) stable-security; urgency=high
-
-  * Fix out-of-bands write when processing character codes in
-    UTF-8 sequences. (CVE-2006-4573)
-
- -- Moritz Muehlenhoff <jmm@debian.org>  Tue, 24 Oct 2006 21:39:21 +0000
+screen (4.0.3-0.1) unstable; urgency=high
+
+  * Non-maintainer upload to fix a security issue
+  * New upstream version fixing utf8 combining characters handling. The
+    bugs could be used to crash/hang screen by writing a special string
+    to a window (CVE-2006-4573). Closes: #395225
+  * Debconf translation updates:
+    - Finnish added. Closes: #303818
+    - Swedish added. Closes: #331583
+    - Portuguese added. Closes: #345059
+    - Italian updated. Closes: #358160
+
+ -- Christian Perrier <bubulle@debian.org>  Sat, 28 Oct 2006 07:35:57 +0200
 
 screen (4.0.2-4.1) unstable; urgency=low
 
diff --git a/debian/po/fi.po b/debian/po/fi.po
new file mode 100644
index 0000000..eb7129a
--- /dev/null
+++ b/debian/po/fi.po
@@ -0,0 +1,46 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: screen\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-23 07:08+0200\n"
+"PO-Revision-Date: 2005-04-09 01:57+0300\n"
+"Last-Translator: Matti Pöllä <mpo@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"
+
+#. Description
+#: ../templates:4
+msgid "You may lose currently running screen sessions. Continue the install?"
+msgstr "Yhteys käynnissä oleviin screen-istuntoihin voi katketa. Jatketaanko asennusta?"
+
+#. Description
+#: ../templates:4
+msgid ""
+"This version of screen is incompatible with all versions before 3.9.5-5."
+msgstr ""
+"Tämä screen:in versio on yhteensopimaton kaikkien versiota 3.9.5-5\n"
+"edeltävien versioiden kanssa."
+
+#. Description
+#: ../templates:4
+msgid ""
+"If you continue with the installation, you will not be able to access "
+"currently running screen sessions."
+msgstr ""
+"Jos jatkat asennusta, menetät yhteyden käynnissä oleviin\n"
+"screen-istuntoihin."
diff --git a/debian/po/it.po b/debian/po/it.po
index f8442d3..8499fe3 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -1,45 +1,40 @@
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-# Developers do not need to manually edit POT or PO files.
-# 
+# screen - Italian Debconf messages
+#
+# This file is distributed under the same license as the screen package.
+# Andrea Bolognani <eof@kiyuko.org>, 2006.
+
 msgid ""
 msgstr ""
 "Project-Id-Version: screen 4.0.2\n"
-"POT-Creation-Date: 2003-07-23 07:08+0200\n"
-"PO-Revision-Date: 2003-12-18 10:30+0100\n"
-"Last-Translator: Fabio Pani <fabiux@fabiopani.it>\n"
-"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-10 07:38-0700\n"
+"PO-Revision-Date: 2005-03-21 10:46+0100\n"
+"Last-Translator: Andrea Bolognani <eof@kiyuko.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: boolean
 #. Description
 #: ../templates:4
 msgid "You may lose currently running screen sessions. Continue the install?"
-msgstr ""
-"Si possono perdere le sessioni di screen attualmente aperte. Continuare "
+msgstr "Potresti perdere le sessioni correnti di screen. Proseguire con "
 "l'installazione?"
 
+#. Type: boolean
 #. Description
 #: ../templates:4
 msgid ""
 "This version of screen is incompatible with all versions before 3.9.5-5."
-msgstr ""
-"Questa versione di screen è incompatibile con tutte le versioni precedenti "
-"alla 3.9.5-5."
+msgstr "Questa versione di screen è incompatibile con tutte le versioni "
+"precedenti la 3.9.5-5."
 
+#. Type: boolean
 #. Description
 #: ../templates:4
 msgid ""
 "If you continue with the installation, you will not be able to access "
 "currently running screen sessions."
-msgstr ""
-"Se si continua con l'installazione, non sarà possibile accedere alle sessioni "
-"di screen attualmente aperte."
-
+msgstr "Se prosegui con l'installazione, non sarai in grado di accedere alle "
+"sessioni correnti di screen."
diff --git a/debian/po/pt.po b/debian/po/pt.po
new file mode 100644
index 0000000..23186eb
--- /dev/null
+++ b/debian/po/pt.po
@@ -0,0 +1,41 @@
+# Portuguese translation for screen's debconf messages.
+# 2005, Miguel Figueiredo <elmig@debianpt.org>
+#
+# 2005-12-24 - Initial translation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: screen 4.0.2-4.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-12-10 10:06-0700\n"
+"PO-Revision-Date: 2005-12-28 18:23+0000\n"
+"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "You may lose currently running screen sessions. Continue the install?"
+msgstr "Pode perder sessões de screen que estão actualmente a correr. "
+"Continuar a instalação?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"This version of screen is incompatible with all versions before 3.9.5-5."
+msgstr ""
+"Esta versão de screen é incompatível com todas as versões anteriores a 3.9.5-5."
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"If you continue with the installation, you will not be able to access "
+"currently running screen sessions."
+msgstr ""
+"Se continuar com a instalação, não poderá aceder a sessões de screen "
+"actualmente a correr"
diff --git a/debian/po/sv.po b/debian/po/sv.po
new file mode 100644
index 0000000..c2493b0
--- /dev/null
+++ b/debian/po/sv.po
@@ -0,0 +1,44 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: screen 4.0.2-4.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-23 07:08+0200\n"
+"PO-Revision-Date: 2005-10-05 05:36+0200\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Description
+#: ../templates:4
+msgid "You may lose currently running screen sessions. Continue the install?"
+msgstr "Du kan förlora screen som körs för närvarande. Fortsätta installationen?"
+
+#. Description
+#: ../templates:4
+msgid ""
+"This version of screen is incompatible with all versions before 3.9.5-5."
+msgstr ""
+"Denna version av screen är inte kompatibel med alla versioner före 3.9.5-5."
+
+#. Description
+#: ../templates:4
+msgid ""
+"If you continue with the installation, you will not be able to access "
+"currently running screen sessions."
+msgstr ""
+"Om du fortsätter med installationen kommer du inte kunna hämta upp nuvarande screen-sessioner som körs."
+
diff --git a/patchlevel.h b/patchlevel.h
index 452683e..122e97b 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -519,11 +519,14 @@
  * 05.12.2003  4.00.02 fixed a bug in the ansi parser. fixed execs
  *                     on ttys. fixed hardstatus line on blanked screen.
  *                     -- DISTRIBUTED
+ * 23.10.2006  4.00.03 fixed two bug in combining characters handling
+ *                     (cstone & Rich Felker).
+ *                     -- DISTRIBUTED
  */
 
 #define ORIGIN "FAU"
 #define REV 4
 #define VERS 0
-#define PATCHLEVEL 2
-#define DATE "5-Dec-03"
+#define PATCHLEVEL 3
+#define DATE "23-Oct-06"
 #define STATE ""