Package: slim
Version: 1.3.1-7

--- Please enter the report below this line. ---

I am almost sure that it got broken because of version 1.3.1-6
Numlock was not activated on any PC I have upgraded to 1.3.1-6.

I have prepared 2 diffs from 1.3.1-5 to 1.3.1-6 and from 1.3.1-6 to
1.3.1-7 (attached) Does anyone have an idea where the problem could be
in?

--- System information. ---
Architecture: amd64
Kernel:       Linux 2.6.32.kms

--- Package information. ---
Depends             (Version) | Installed
=============================-+-==============
libc6              (>= 2.2.5) | 2.11.2-5
libgcc1          (>= 1:4.1.1) | 1:4.4.4-8
libjpeg62            (>= 6b1) | 6b1-1
libpam0g        (>= 0.99.7.1) | 1.1.1-6
libpng12-0      (>= 1.2.13-4) | 1.2.44-1
libstdc++6         (>= 4.1.1) | 4.4.4-8
libx11-6                      | 2:1.3.3-3
libxft2            (>> 2.1.1) | 2.1.14-2
libxmu6                       | 2:1.0.5-2
debconf           (>= 1.2.9)  | 1.5.35
 OR debconf-2.0               | 


Recommends      (Version) | Installed
=========================-+-===========
xterm                     | 261-1


Suggests      (Version) | Installed
=======================-+-===========
scrot                   | 
diff -u slim-1.3.1/debian/changelog slim-1.3.1/debian/changelog
--- slim-1.3.1/debian/changelog
+++ slim-1.3.1/debian/changelog
@@ -1,3 +1,15 @@
+slim (1.3.1-6) unstable; urgency=low
+
+  * Update debian/control.
+    - Bump up Standards-Version.
+  * Fix default path (Closes: #581775).
+    Thanks to Andrei Popescu.
+  * Debconf translation:
+    - Update Danish translation (Closes: #587800).
+      Thanks to Joe Dalton.
+
+ -- Nobuhiro Iwamatsu <iwama...@debian.org>  Thu, 08 Jul 2010 05:41:40 +0900
+
 slim (1.3.1-5) unstable; urgency=low
 
   * Update debian/control.
diff -u slim-1.3.1/debian/control slim-1.3.1/debian/control
--- slim-1.3.1/debian/control
+++ slim-1.3.1/debian/control
@@ -5,7 +5,7 @@
 Uploaders: Jens Peter Secher <j...@debian.org>
 Build-Depends: debconf, debhelper (>= 5), quilt, libjpeg62-dev, libpam0g-dev,
 	libpng12-dev, libxft-dev, libxmu-dev, po-debconf, sharutils
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://slim.berlios.de/
 
 Package: slim
diff -u slim-1.3.1/debian/po/da.po slim-1.3.1/debian/po/da.po
--- slim-1.3.1/debian/po/da.po
+++ slim-1.3.1/debian/po/da.po
@@ -1,49 +1,30 @@
-# debconf templates for xorg-x11 package
-# Danish translation
-#
-# $Id: da.po 1042 2006-01-09 07:55:08Z ender $
-#
-# Copyrights:
+# Danish translation slim.
+# Copyright (C) 2010 slim & nedenstående oversættere.
+# This file is distributed under the same license as the slim package.
 # Branden Robinson, 2000-2004
 # Dennis Haney, 2002
 # Morten Brix Pedersen <mor...@wtf.dk>, 2003.
 # Claus Hindsgaul <clau...@image.dk>, 2004, 2005.
-#
-# This file is distributed under the same license as the xorg-x11 package.
-# Please see debian/copyright.
-#
-#    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.
+# Joe Hansen <joedalt...@yahoo.dk>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xorg-x11 6.8.2.dfsg.1-5+SVN\n"
+"Project-Id-Version: slim\n"
 "Report-Msgid-Bugs-To: mmasson...@gmail.com\n"
 "POT-Creation-Date: 2007-05-31 08:04+0200\n"
-"PO-Revision-Date: 2005-08-29 17:06+0200\n"
-"Last-Translator: Claus Hindsgaul <clau...@image.dk>\n"
-"Language-Team: Danish <da...@klid.dk>\n"
+"PO-Revision-Date: 2010-07-08 13:51+0900\n"
+"Last-Translator: Joe Hansen <joedalt...@yahoo.dk>\n"
+"Language-Team: Danish <da...@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. Type: select
 #. Description
 #: ../slim.templates:2001
-#, fuzzy
 msgid "Default display manager:"
-msgstr "Vælg den ønskede logindhåndtering."
+msgstr "Standardlogindhåndtering:"
 
 #. Type: select
 #. Description
@@ -55,58 +36,30 @@
-"En logindhåndtering er et program der giver et grafisk logind til X Window-"
+"En logindhåndtering er et program, der giver et grafisk logind til X Window-"
 "systemet."
 
 #. Type: select
 #. Description
 #: ../slim.templates:2001
-#, fuzzy
 msgid ""
 "Only one display manager can manage a given X server, but multiple display "
 "manager packages are installed. Please select which display manager should "
 "run by default."
 msgstr ""
-"Der kan kun køre én logindhåndtering for hver X-server, men der er "
-"installeret flere logindhåndteringer Vælg hvilken logindhåndtering der skal "
+"Der kan kun køre en logindhåndtering for hver X-server, men der er "
+"installeret flere håndteringspakker. Vælg hvilken logindhåndtering der skal "
 "benyttes som standard."
 
 #. Type: select
 #. Description
 #: ../slim.templates:2001
-#, fuzzy
 msgid ""
 "Multiple display managers can run simultaneously if they are configured to "
 "manage different servers; to achieve this, configure the display managers "
 "accordingly, edit each of their init scripts in /etc/init.d, and disable the "
 "check for a default display manager."
 msgstr ""
-"(Flere logindhåndteringer kan køre samtidig. hvis de er sat op til at "
-"håndtere forskellige servere. For at få dette til at fungere, skal "
-"logindhåndteringenerne sættes op til det. Det gør du ved at fjerne tjekket "
-"for standard logindhåndtering i deres initialiseringsskripter i /etc/init.d.)"
-
-#, fuzzy
-#~ msgid "Stop the xdm daemon?"
-#~ msgstr "Vil du stoppe xdm-dæmonen?"
-
-#, fuzzy
-#~ msgid ""
-#~ "The X display manager (xdm) daemon is typically stopped on package "
-#~ "upgrade and removal, but it appears to be managing at least one running X "
-#~ "session."
-#~ msgstr ""
-#~ "X-logindhåndteringsdæmonen (xdm) stoppes typisk under opgradering eller "
-#~ "afinstallation af pakken, men det ser ud til at der allerede kører mindst "
-#~ "én X-session. Hvis xdm bliver stoppet nu, vil alle de X-sessioner, den "
-#~ "håndterer, blive afbrudt. Ellers kan du lade xdm køre, så den nye version "
-#~ "først bliver taget i brug næste gang dæmonen bliver genstartet."
-
-#, fuzzy
-#~ msgid ""
-#~ "If xdm is stopped now, any X sessions it manages will be terminated. "
-#~ "Otherwise, the new version will take effect the next time the daemon is "
-#~ "restarted."
-#~ msgstr ""
-#~ "X-logindhåndteringsdæmonen (xdm) stoppes typisk under opgradering eller "
-#~ "afinstallation af pakken, men det ser ud til at der allerede kører mindst "
-#~ "én X-session. Hvis xdm bliver stoppet nu, vil alle de X-sessioner, den "
-#~ "håndterer, blive afbrudt. Ellers kan du lade xdm køre, så den nye version "
-#~ "først bliver taget i brug næste gang dæmonen bliver genstartet."
+"Flere logindhåndteringer kan køre samtidig, hvis de er sat op til at "
+"håndtere forskellige servere. For at få dette til at fungere, skal "
+"logindhåndteringerne sættes op til det. Det gør du ved at fjerne tjekket "
+"for standardlogindhåndtering i deres initialiseringsskripter i /etc/init.d."
+
+
diff -u slim-1.3.1/debian/patches/slim-conf.patch slim-1.3.1/debian/patches/slim-conf.patch
--- slim-1.3.1/debian/patches/slim-conf.patch
+++ slim-1.3.1/debian/patches/slim-conf.patch
@@ -6,7 +6,7 @@
 -default_path        ./:/bin:/usr/bin:/usr/local/bin
 -default_xserver     /usr/bin/X
 -#xserver_arguments   -dpi 75
-+default_path        /bin:/usr/bin:/usr/local/bin:/usr/bin/X11
++default_path        /usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
 +default_xserver     /usr/bin/X11/X
 +xserver_arguments   -nolisten tcp
  
diff -u slim-1.3.1/debian/changelog slim-1.3.1/debian/changelog
--- slim-1.3.1/debian/changelog
+++ slim-1.3.1/debian/changelog
@@ -1,3 +1,14 @@
+slim (1.3.1-7) unstable; urgency=high
+
+  * Update debian/control.
+    - Bump up Standards-Version to 3.9.1.
+  * Fix show black screen on On kfreebsd (Closes: #586593).
+    debian/patches/fix-black-screen.patch
+  * Fix CVE-2010-2945: insecure PATH assignment (Closes: #594414).
+    debian/patches/insecure_PATH_assignment.patch
+
+ -- Nobuhiro Iwamatsu <iwama...@debian.org>  Thu, 26 Aug 2010 12:40:13 +0900
+
 slim (1.3.1-6) unstable; urgency=low
 
   * Update debian/control.
diff -u slim-1.3.1/debian/control slim-1.3.1/debian/control
--- slim-1.3.1/debian/control
+++ slim-1.3.1/debian/control
@@ -5,7 +5,7 @@
 Uploaders: Jens Peter Secher <j...@debian.org>
 Build-Depends: debconf, debhelper (>= 5), quilt, libjpeg62-dev, libpam0g-dev,
 	libpng12-dev, libxft-dev, libxmu-dev, po-debconf, sharutils
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://slim.berlios.de/
 
 Package: slim
diff -u slim-1.3.1/debian/patches/series slim-1.3.1/debian/patches/series
--- slim-1.3.1/debian/patches/series
+++ slim-1.3.1/debian/patches/series
@@ -6,0 +7,2 @@
+fix-black-screen.patch
+insecure_PATH_assignment.patch
only in patch2:
unchanged:
--- slim-1.3.1.orig/debian/patches/fix-black-screen.patch
+++ slim-1.3.1/debian/patches/fix-black-screen.patch
@@ -0,0 +1,14 @@
+Patch fixes issue on kfreebsd where slim only displays a black screen.
+Index: slim-1.3.1/app.cpp
+===================================================================
+--- slim-1.3.1.orig/app.cpp	2010-08-12 18:59:10.000000000 +0100
++++ slim-1.3.1/app.cpp	2010-08-12 18:59:19.000000000 +0100
+@@ -850,7 +850,7 @@
+ 
+ 
+ int App::StartServer() {
+-    ServerPID = vfork();
++    ServerPID = fork();
+ 
+     static const int MAX_XSERVER_ARGS = 256;
+     static char* server[MAX_XSERVER_ARGS+2] = { NULL };
only in patch2:
unchanged:
--- slim-1.3.1.orig/debian/patches/insecure_PATH_assignment.patch
+++ slim-1.3.1/debian/patches/insecure_PATH_assignment.patch
@@ -0,0 +1,21 @@
+# fix_insecure_PATH_assignment.dpatch by Nobuhiro Iwamatsu <iwama...@debian.org>
+#
+# DP: CVE-2010-2945: insecure PATH assignment
+# SLiM versions prior to 1.3.1 assigned logged on users a predefined PATH
+# which included './'. This allowed unintentional code execution (e.g.
+# planted binary) and has been fixed by the developers in version 1.3.2.
+# Note: patch for slim.conf was already fixed in slim-conf.patch.
+
+diff --git a/cfg.cpp b/cfg.cpp
+index f53ddae..3775c4d 100644
+--- a/cfg.cpp
++++ b/cfg.cpp
+@@ -28,7 +28,7 @@ Cfg::Cfg()
+     : currentSession(-1)
+ {
+     // Configuration options
+-    options.insert(option("default_path","./:/bin:/usr/bin:/usr/local/bin"));
++    options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin"));
+     options.insert(option("default_xserver","/usr/bin/X"));
+     options.insert(option("xserver_arguments",""));
+     options.insert(option("numlock",""));

Reply via email to