--- Begin Message ---
Package: nodm
Version: 0.11-1.3
Severity: wishlist
Tags: patch
nodm has received various unapplied patches. It can make a better autologin
solution for embedded devices than mainstream *dm implementations like
gdm/kdm/lightdm, so it would be nice to have some of the easy bugs closed.
In particular, lightdm can auto-login, but if the auto-login X session
crashes or exits, lightdm does not seem to be able to log back in
immediately without a username/password prompt - this is fine for
"normal X sessions" where logging out means you wanted to let someone
else log in, but is undesirable for a more embedded/kiosk-like situation.
I'd rather not maintain nodm long-term, but I'd consider NMUing it if
the maintainers would like that to happen. I attach a possible patch
series, also available to pull from
https://alioth.debian.org/anonscm/git/users/smcv/nodm.git
(gitweb: <http://anonscm.debian.org/gitweb/?p=users/smcv/nodm.git>).
While preparing this patch series I noticed that nodm is maintained
in git as a non-native package, but it appears to be treated more like
a native package, with no real upstream and no use of debian/patches to
split out Debian changes - would the maintainers be willing to consider
making it a real native package? That would work better with git-buildpackage,
for instance.
Alternatively, if the maintainers would prefer to go to 3.0 (quilt) with
maintainer-approved changes made "upstream" but NMU changes in
debian/patches, I could prepare a version that looked more like that
and make it available for git pull instead.
S
-- System Information:
Debian Release: jessie/sid
APT prefers proposed-updates
APT policy: (500, 'proposed-updates'), (500, 'unstable'), (500, 'testing'),
(500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.14-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From 33c40bf335dcd28701c37eff9d71b0393d65844e Mon Sep 17 00:00:00 2001
From: Christian Perrier <[email protected]>
Date: Wed, 11 Jan 2012 07:13:42 +0100
Subject: [PATCH 01/14] Import Debian patch 0.11-1.2
* Non-maintainer upload.
* Fix pending l10n issues. Debconf translations:
* Danish (Joe Hansen). Closes: #600741
* French (Christian Perrier). Closes: #638432
* Russian (Yuri Kozlov). Closes: #639428
* Swedish (Martin Bagge / brother). Closes: #640048
* Czech (Martin Sin). Closes: #645590
* Slovak (Slavko). Closes: #645597
* Danish (Joe Hansen). Closes: #645690
* Brazilian Portuguese (Adriano Rafael Gomes). Closes: #646185
* Spanish; (# traductor (campo Last-Translator) y ponga en copia a
lista de Omar Campagne). Closes: #646506
---
debian/changelog | 10 ++++
debian/po/de.po | 51 +++++---------------
debian/po/nl.po | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
debian/po/pt.po | 11 +++--
4 files changed, 166 insertions(+), 44 deletions(-)
create mode 100644 debian/po/nl.po
diff --git a/debian/changelog b/debian/changelog
index 9b97dba..f66d3f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nodm (0.11-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix pending l10n issues. Debconf translations:
+ - German (Thomas Müller). Closes: #646630
+ - Portuguese (Miguel Figueiredo). Closes: #646846
+ - Dutch; (Jeroen Schot). Closes: #654371
+
+ -- Christian Perrier <[email protected]> Wed, 11 Jan 2012 07:13:42 +0100
+
nodm (0.11-1) unstable; urgency=low
* New upstream version
diff --git a/debian/po/de.po b/debian/po/de.po
index 3c8c71f..c6c99b2 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -1,22 +1,22 @@
-# translation of nodm_0.6-1_de.po to Deutsch
# Translation of nodm debconf templates to German
# Copyright (C) Thomas Mueller <[email protected]>, 2009.
# This file is distributed under the same license as the nodm package.
#
# Thomas Mueller <[email protected]>, 2009.
+# Thomas Mueller <[email protected]>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: nodm_0.6-1_de\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2011-08-17 13:58+0200\n"
-"PO-Revision-Date: 2009-08-27 22:00+0200\n"
-"Last-Translator: Thomas Mueller <[email protected]>\n"
+"PO-Revision-Date: 2011-10-17 23:27+0200\n"
+"Last-Translator: Thomas Müller <[email protected]>\n"
"Language-Team: de <[email protected]>\n"
"Language: \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"
+"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Type: boolean
@@ -65,8 +65,7 @@ msgstr ""
#. Description
#: ../nodm.templates:4001
msgid "Lowest numbered vt on which X may start:"
-msgstr ""
-"Virtuelles Terminal mit der niedrigsten Nummer in dem X starten könnte:"
+msgstr "Virtuelles Terminal mit der niedrigsten Nummer, in dem X starten darf:"
#. Type: string
#. Description
@@ -84,7 +83,7 @@ msgid ""
"Since X and getty get to conflict, this parameter will specify the lowest "
"numbered virtual terminal on which to start the search."
msgstr ""
-"Wegen des Konflikts zwischen X und getty gibt dieser Parameter die "
+"Wegen des Konflikts zwischen X und Getty gibt dieser Parameter die "
"niedrigste Nummer des virtuellen Terminals an, ab dem mit der Suche begonnen "
"wird."
@@ -96,7 +95,7 @@ msgid ""
"terminal on which a getty may start."
msgstr ""
"Dieser Wert sollte um eins höher sein als die höchste Nummer des virtuellen "
-"Terminals, in dem getty starten darf."
+"Terminals, in dem Getty starten darf."
#. Type: string
#. Description
@@ -109,6 +108,8 @@ msgstr "Optionen für den X-Server:"
#: ../nodm.templates:5001
msgid "Please enter the options to pass to the X server when starting it."
msgstr ""
+"Bitte geben Sie die Optionen an, die an den X-Server zum Starten übergeben "
+"werden."
#. Type: string
#. Description
@@ -125,7 +126,7 @@ msgid ""
"an amount of time before restarting the session. The waiting time will grow "
"until a session lasts longer than this amount."
msgstr ""
-"Falls eine X-Sitzung kürzer als diese Zeit in Sekunden existiert wird Nodm "
+"Falls eine X-Sitzung kürzer als diese Zeit in Sekunden existiert, wird Nodm "
"eine gewisse Zeit warten, bevor die Sitzung erneut gestartet wird. Die "
"Wartezeit verlängert sich bis eine Sitzung länger als dieser Wert existiert."
@@ -140,34 +141,4 @@ msgstr "Zu benutzende X-Sitzung:"
#: ../nodm.templates:7001
msgid "Please choose the name of the X session script to use with nodm."
msgstr ""
-
-#~ msgid ""
-#~ "Please enter the options to pass to the X server when starting the "
-#~ "session. These options will be used in the NODM_X_OPTIONS variable in the "
-#~ "command line used by nodm to start the X session:"
-#~ msgstr ""
-#~ "Bitte geben Sie die Optionen an, die an den X-Server zum Starten der "
-#~ "Sitzung übergeben werden sollen. Diese Optionen werden in der Variablen "
-#~ "NODM_X_OPTIONS in der Befehlszeile von Nodm verwendet, um die X-Sitzung "
-#~ "zu starten."
-
-#~ msgid "xinit program to use:"
-#~ msgstr "Zu benutzendes Xinit-Programm:"
-
-#~ msgid ""
-#~ "Please choose the name of the \"xinit\" program to use with nodm. This "
-#~ "name will be stored in the NODM_XINIT variable in the command line used "
-#~ "by nodm to start the X session:"
-#~ msgstr ""
-#~ "Bitte wählen Sie den Namen des »xinit«-Programms, welches Nodm nutzen "
-#~ "soll. Dieser Name wird in der Variablen NODM_XINIT in der Befehlszeile "
-#~ "gespeichert, welche Nodm nutzt, um die X-Sitzung zu starten:"
-
-#~ msgid ""
-#~ "Please choose the name of the X session script to use with nodm. This "
-#~ "name will be stored in the NODM_XSESSION variable in the command line "
-#~ "used by nodm to start the X session:"
-#~ msgstr ""
-#~ "Bitte wählen Sie den Namen des X-Sitzung-Skripts, welches Nodm nutzen "
-#~ "soll. Dieser Name wird in der Variablen NODM_XSESSION in der Befehlszeile "
-#~ "gespeichert, welche Nodm nutzt, um die X-Sitzung zu starten."
+"Bitte wählen Sie den Namen des X-Sitzung-Skripts, welches Nodm nutzen soll."
diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 0000000..2bd0057
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,138 @@
+# Dutch translation of nodm debconf templates.
+# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the nodm package.
+# Jeroen Schot <[email protected]>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nodm 0.11-1.1\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2011-08-17 13:58+0200\n"
+"PO-Revision-Date: 2012-01-02 15:14+0100\n"
+"Last-Translator: Jeroen Schot <[email protected]>\n"
+"Language-Team: Debian l10n Dutch <[email protected]>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../nodm.templates:2001
+msgid "Start nodm on boot?"
+msgstr "Nodm opstarten bij de systeemstart?"
+
+#. Type: boolean
+#. Description
+#: ../nodm.templates:2001
+msgid ""
+"Designed for embedded or kiosk systems, nodm starts an X session for a user "
+"without asking for authentication. On regular machines, this has security "
+"implications and is therefore disabled by default."
+msgstr ""
+"Nodm is ontworpen voor embedded of kioskomgevingen en start daarom een X-"
+"sessie voor een gebruiker zonder om inloggegevens te vragen. Op normale "
+"computers heeft dit gevolgen voor de beveiliging en is daarom standaard "
+"uitgeschakeld."
+
+#. Type: boolean
+#. Description
+#: ../nodm.templates:2001
+msgid "You should enable nodm only if you need autologin on this machine."
+msgstr ""
+"U moet nodm alleen activeren als u automatisch inloggen wilt inschakelen op "
+"deze computer."
+
+#. Type: string
+#. Description
+#: ../nodm.templates:3001
+msgid "User to start a session for:"
+msgstr "Gebruiker waarvoor een sessie moet worden gestart:"
+
+#. Type: string
+#. Description
+#: ../nodm.templates:3001
+msgid ""
+"Please enter the login name of the user that will automatically be logged "
+"into X by nodm."
+msgstr ""
+"Wat is de inlognaam van de gebruiker die door nodm automatisch moet worden "
+"aangemeld in X?"
+
+#. Type: string
+#. Description
+#: ../nodm.templates:4001
+msgid "Lowest numbered vt on which X may start:"
+msgstr "Laagst-genummerde vt waarop X mag opstarten:"
+
+#. Type: string
+#. Description
+#: ../nodm.templates:4001
+msgid ""
+"nodm needs to find a free virtual terminal on which to start the X server."
+msgstr ""
+"Nodm heeft een vrije virtuele terminal nodig om de X-server op te starten."
+
+#. Type: string
+#. Description
+#: ../nodm.templates:4001
+msgid ""
+"Since X and getty get to conflict, this parameter will specify the lowest "
+"numbered virtual terminal on which to start the search."
+msgstr ""
+"Aangezien X en getty elkaar in de weg zitten, bepaalt deze parameter de "
+"laagst-genummerde virtuele terminal waarvanaf wordt gezocht."
+
+#. Type: string
+#. Description
+#: ../nodm.templates:4001
+msgid ""
+"This value should be set to one higher than the highest numbered virtual "
+"terminal on which a getty may start."
+msgstr ""
+"Deze waarde dient één hoger te zijn dan de hoogst-genummerde virtuele "
+"terminal waarop mogelijk een getty wordt opgestart."
+
+#. Type: string
+#. Description
+#: ../nodm.templates:5001
+msgid "Options for the X server:"
+msgstr "Opties voor de X-server:"
+
+#. Type: string
+#. Description
+#: ../nodm.templates:5001
+msgid "Please enter the options to pass to the X server when starting it."
+msgstr ""
+"Welke opties moeten er aan de X-server worden meegegeven wanneer deze wordt "
+"opgestart?"
+
+#. Type: string
+#. Description
+#: ../nodm.templates:6001
+msgid "Minimum time (in seconds) for a session to be considered OK:"
+msgstr "Kortste tijd (in seconden) voor een sessie die nog in orde is:"
+
+#. Type: string
+#. Description
+#: ../nodm.templates:6001
+msgid ""
+"If an X session will run for less than this time in seconds, nodm will wait "
+"an amount of time before restarting the session. The waiting time will grow "
+"until a session lasts longer than this amount."
+msgstr ""
+"Als een X-sessie korter duurt dan deze tijd in seconden, dan zal nodm enige "
+"tijd wachten voordat de sessie wordt herstart. De wachttijd zal toenemen "
+"totdat er een sessie is die langer duurt."
+
+#. Type: string
+#. Description
+#: ../nodm.templates:7001
+msgid "X session to use:"
+msgstr "Te gebruiken X-sessie:"
+
+#. Type: string
+#. Description
+#: ../nodm.templates:7001
+msgid "Please choose the name of the X session script to use with nodm."
+msgstr "Wat is de naam van het X-sessie-script op dat nodm moet gebruiken?"
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 45661fa..8315817 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the nodm package.
#
# Américo Monteiro <[email protected]>, 2009.
+# Miguel Figueiredo <[email protected]>, 2011.
+#
msgid ""
msgstr ""
-"Project-Id-Version: nodm 0.5-1\n"
+"Project-Id-Version: nodm\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2011-08-17 13:58+0200\n"
-"PO-Revision-Date: 2009-07-25 17:48+0100\n"
-"Last-Translator: Américo Monteiro <[email protected]>\n"
+"PO-Revision-Date: 2011-10-27 19:51+0100\n"
+"Last-Translator: Miguel Figueiredo <[email protected]>\n"
"Language-Team: Portuguese <[email protected]>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
@@ -104,7 +106,7 @@ msgstr "Opções para o servidor X:"
#. Description
#: ../nodm.templates:5001
msgid "Please enter the options to pass to the X server when starting it."
-msgstr ""
+msgstr "Por favor introduza as opções a passar ao servidor X quando o inicia."
#. Type: string
#. Description
@@ -135,6 +137,7 @@ msgstr "Sessão X a usar:"
#: ../nodm.templates:7001
msgid "Please choose the name of the X session script to use with nodm."
msgstr ""
+"Por favor escolha o nome do script da sessão do X para utilizar com o nodm."
#~ msgid ""
#~ "Please enter the options to pass to the X server when starting the "
--
2.0.0.rc0
>From be9663e5c38011539ff1031f65483f1e6c138cb4 Mon Sep 17 00:00:00 2001
From: gregor herrmann <[email protected]>
Date: Sat, 15 Sep 2012 16:47:18 +0200
Subject: [PATCH 02/14] Import Debian patch 0.11-1.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Non-maintainer upload.
* Fix pending l10n issues. Debconf translations:
- German (Thomas Müller). Closes: #646630
- Portuguese (Miguel Figueiredo). Closes: #646846
- Dutch; (Jeroen Schot). Closes: #654371
---
debian/changelog | 9 +++++++++
debian/nodm.config | 3 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index f66d3f9..8dbaa10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nodm (0.11-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "subprocess installed post-installation script returned error exit
+ status 10": nodm.config: don't fail if the nodm/xinit debconf value was
+ already unregistered. (Closes: #642903)
+
+ -- gregor herrmann <[email protected]> Sat, 15 Sep 2012 16:47:18 +0200
+
nodm (0.11-1.2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/nodm.config b/debian/nodm.config
index 08b88ac..685e429 100644
--- a/debian/nodm.config
+++ b/debian/nodm.config
@@ -17,7 +17,8 @@ if [ -s /etc/default/nodm ] ; then
if [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.10"
then
# After 0.10 nodm/xinit is not needed anymore
- db_unregister nodm/xinit
+ # don't fail if it was unregistered before
+ db_unregister nodm/xinit || true
fi
if [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.5"
--
2.0.0.rc0
>From bb16a58e79b1f7ea18fb744b46be04ed96d3a1bf Mon Sep 17 00:00:00 2001
From: Chris Lamb <[email protected]>
Date: Thu, 18 Aug 2011 11:05:41 +0100
Subject: [PATCH 03/14] Wait for nodm to exit (Closes: #638290)
---
debian/nodm.init | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/nodm.init b/debian/nodm.init
index c09768e..7a91183 100644
--- a/debian/nodm.init
+++ b/debian/nodm.init
@@ -60,7 +60,7 @@ case "$1" in
;;
stop)
[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- start-stop-daemon --stop --pidfile ${PIDFILE} --oknodo
+ start-stop-daemon --stop --retry 10 --pidfile ${PIDFILE} --oknodo
rm -f ${PIDFILE}
[ "$VERBOSE" != no ] && log_end_msg $?
;;
--
2.0.0.rc0
>From 8f100b40be90440e383fe681d24980a4e7a1951a Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Fri, 2 May 2014 17:22:35 +0100
Subject: [PATCH 04/14] Depend on xserver-xorg for /usr/bin/X (Closes: #689703)
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 3c09e83..d36c97b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-fso/nodm.git;a=summary
Package: nodm
Architecture: linux-any
-Depends: x11-common, x11-xserver-utils, ${shlibs:Depends}, ${misc:Depends}
+Depends: x11-common, x11-xserver-utils, ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
Conflicts: zhone-session
Description: automatic display manager
This package prepares the system to automatically start an X session at
--
2.0.0.rc0
>From be269cf0651270fd39b3c0128ff51ffd4e05b40a Mon Sep 17 00:00:00 2001
From: Ilya Barygin <[email protected]>
Date: Sat, 20 Aug 2011 11:05:34 +0400
Subject: [PATCH 05/14] Place libraries in LIBS, not LDFLAGS (LP: #771123,
Closes: #638601)
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 756cd4e..05056b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ libsources = common.c log.c vt.c xsession-child.c xserver.c xsession.c dm.c
testlibsources = $(libsources) test.c
AM_CPPFLAGS = $(X11_CFLAGS)
-AM_LDFLAGS = $(PAM_LIBS) $(X11_LIBS)
+LIBS = $(PAM_LIBS) $(X11_LIBS)
nodm_SOURCES = $(libsources) nodm.c
nodm_CFLAGS = -DNODM_SESSION='"$(sbindir)/nodm"'
--
2.0.0.rc0
>From 9fe3c58b5d8c90388bec2fb7d5120cd9aecb5222 Mon Sep 17 00:00:00 2001
From: Ilya Barygin <[email protected]>
Date: Sat, 13 Aug 2011 22:55:42 +0400
Subject: [PATCH 06/14] Build without -Werror
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 05056b9..65d96b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-CFLAGS += -Wall -Werror
+CFLAGS += -Wall
ACLOCAL_AMFLAGS = -I m4
--
2.0.0.rc0
>From 48bf98cc92f052834464f5969efeba8d2dee7b08 Mon Sep 17 00:00:00 2001
From: jidanni <[email protected]>
Date: Thu, 21 Jul 2011 19:38:37 +0800
Subject: [PATCH 07/14] Fix miscounted environment variables in README
---
README | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README b/README
index ba62624..b722127 100644
--- a/README
+++ b/README
@@ -46,7 +46,7 @@ the need to implement it.
* Configuration
-Configuration is made via 5 environment variables:
+Configuration is made via these environment variables:
NODM_USER
Controls the user that is used to automatically log in.
--
2.0.0.rc0
>From ebae6b7ba155f94700f7be33917aa40020141877 Mon Sep 17 00:00:00 2001
From: Emanuele Aina <[email protected]>
Date: Wed, 4 Jul 2012 20:23:06 +0200
Subject: [PATCH 08/14] Fully activate ConsoleKit sessions. (LP: #873975,
Closes: #680264)
---
debian/nodm.pam | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/debian/nodm.pam b/debian/nodm.pam
index 77ad6f6..6f68f35 100644
--- a/debian/nodm.pam
+++ b/debian/nodm.pam
@@ -18,7 +18,13 @@ session required pam_env.so readenv=1 envfile=/etc/default/locale
# # (Replaces the use of /etc/limits in old login)
session required pam_limits.so
-# Standard Un*x account and session
+# Standard Un*x account
@include common-account
@include common-password
+
+# Enable ConsoleKit integration
+session optional pam_loginuid.so
+session optional pam_ck_connector.so
+
+# Standard Un*x session
@include common-session
--
2.0.0.rc0
>From b1913590077a75117c28708e5c0b9fd1fc04498f Mon Sep 17 00:00:00 2001
From: Emanuele Aina <[email protected]>
Date: Tue, 18 Feb 2014 19:43:10 +0100
Subject: [PATCH 09/14] Drop x11-xserver-utils dependency. Closes: #680269
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index d36c97b..fb30cb9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-fso/nodm.git;a=summary
Package: nodm
Architecture: linux-any
-Depends: x11-common, x11-xserver-utils, ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
+Depends: x11-common, ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
Conflicts: zhone-session
Description: automatic display manager
This package prepares the system to automatically start an X session at
--
2.0.0.rc0
>From d9d41519ece5ef4fb31b6defd80fe90a1e1c6805 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <[email protected]>
Date: Fri, 29 Mar 2013 10:18:49 +0100
Subject: [PATCH 10/14] Add NODM_X_TIMEOUT support in debconf templates
Based on earlier patches by Hector Oron <[email protected]>
---
debian/nodm.config | 6 ++++++
debian/nodm.init | 3 ++-
debian/nodm.postinst | 7 +++++++
debian/nodm.templates | 7 +++++++
4 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/debian/nodm.config b/debian/nodm.config
index 685e429..68fc680 100644
--- a/debian/nodm.config
+++ b/debian/nodm.config
@@ -57,6 +57,9 @@ if [ -s /etc/default/nodm ] ; then
if [ -n "$NODM_XSESSION" ]; then
db_set nodm/xsession "$NODM_XSESSION"
fi
+ if [ -n "$NODM_X_TIMEOUT" ]; then
+ db_set nodm/x_timeout "$NODM_X_TIMEOUT"
+ fi
fi
db_input medium nodm/enabled || true
@@ -80,5 +83,8 @@ if [ "x$START" = "xtrue" ] ; then
db_input low nodm/xsession || true
db_go
+
+ db_input low nodm/x_timeout || true
+ db_go
fi
diff --git a/debian/nodm.init b/debian/nodm.init
index 7a91183..ffef029 100644
--- a/debian/nodm.init
+++ b/debian/nodm.init
@@ -25,13 +25,14 @@ NODM_XSESSION=/etc/X11/Xsession
NODM_X_OPTIONS="-nolisten tcp"
NODM_USER=root
NODM_MIN_SESSION_TIME=60
+NODM_X_TIMEOUT=300
if [ -f /etc/default/$NAME ]
then
. /etc/default/$NAME
fi
-export NODM_XINIT NODM_XSESSION NODM_X_OPTIONS NODM_USER NODM_MIN_SESSION_TIME NODM_FIRST_VT
+export NODM_XINIT NODM_XSESSION NODM_X_OPTIONS NODM_USER NODM_MIN_SESSION_TIME NODM_FIRST_VT NODM_X_TIMEOUT
# If you change the user to a non-root user, make sure you
# set allowed_users=anybody in /etc/X11/Xwrapper.config
diff --git a/debian/nodm.postinst b/debian/nodm.postinst
index 3957d61..480758e 100644
--- a/debian/nodm.postinst
+++ b/debian/nodm.postinst
@@ -39,6 +39,8 @@ EOF
NODM_MIN_SESSION_TIME="$RET"
db_get nodm/xsession
NODM_XSESSION="$RET"
+ db_get nodm/x_timeout
+ NODM_X_TIMEOUT="$RET"
if [ -s /etc/default/nodm ] ; then
sed -i -r -e "s,^NODM_ENABLED=.*,NODM_ENABLED=$NODM_ENABLED," \
@@ -47,6 +49,7 @@ EOF
-e "s,^NODM_X_OPTIONS=.*,NODM_X_OPTIONS='$NODM_X_OPTIONS'," \
-e "s,^NODM_MIN_SESSION_TIME=.*,NODM_MIN_SESSION_TIME=$NODM_MIN_SESSION_TIME," \
-e "s,^NODM_XSESSION=.*,NODM_XSESSION=$NODM_XSESSION," \
+ -e "s,^NODM_X_TIMEOUT=.*,NODM_X_TIMEOUT=$NODM_X_TIMEOUT," \
/etc/default/nodm
else
cat <<EOF > /etc/default/nodm
@@ -70,6 +73,10 @@ NODM_X_OPTIONS='$NODM_X_OPTIONS'
# If an X session will run for less than this time in seconds, nodm will wait an
# increasing bit of time before restarting the session.
NODM_MIN_SESSION_TIME=$NODM_MIN_SESSION_TIME
+
+# Timeout (in seconds) to wait for X to be ready to accept connections. If X is
+# not ready before this timeout, it is killed and restarted.
+NODM_X_TIMEOUT=$NODM_X_TIMEOUT
EOF
fi
fi
diff --git a/debian/nodm.templates b/debian/nodm.templates
index 91e593e..5d21cce 100644
--- a/debian/nodm.templates
+++ b/debian/nodm.templates
@@ -53,6 +53,13 @@ _Description: Minimum time (in seconds) for a session to be considered OK:
amount of time before restarting the session. The waiting time will grow
until a session lasts longer than this amount.
+Template: nodm/x_timeout
+Type: string
+Default: 300
+_Description: Maximum time (in seconds) to wait for X to start:
+ Timeout (in seconds) to wait for X to be ready to accept connections. If X is
+ not ready before this timeout, it is killed and restarted.
+
Template: nodm/xsession
Type: string
Default: /etc/X11/Xsession
--
2.0.0.rc0
>From 5627344cdbf1ccfa87ffe0f6b6dd5769bdffdd6d Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <[email protected]>
Date: Mon, 24 Jun 2013 12:35:59 +0200
Subject: [PATCH 11/14] Set the PAM_XDISPLAY item so systemd-logind can
determine the seat (Closes: #713960)
---
xsession-child.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/xsession-child.c b/xsession-child.c
index f3b7f98..80a00d6 100644
--- a/xsession-child.c
+++ b/xsession-child.c
@@ -219,6 +219,9 @@ static int setup_pam(struct nodm_xsession_child* s)
s->pam_status = pam_set_item(s->pamh, PAM_TTY, (const void *) tty);
if (s->pam_status == PAM_SUCCESS)
s->pam_status = pam_set_item(s->pamh, PAM_RUSER, (const void *) "root");
+ if (s->pam_status == PAM_SUCCESS)
+ s->pam_status = pam_set_item(s->pamh, PAM_XDISPLAY, (const void *)
+ s->srv->name);
if (s->pam_status != PAM_SUCCESS) {
log_err("pam_set_item: %s", pam_strerror(s->pamh, s->pam_status));
return E_PAM_ERROR;
--
2.0.0.rc0
>From 996ab026467a1f76494d7dca1dcce5be99d87513 Mon Sep 17 00:00:00 2001
From: Chris Lamb <[email protected]>
Date: Thu, 18 Aug 2011 11:13:17 +0100
Subject: [PATCH 12/14] Make initscript less chatty (Closes: #638293)
---
debian/nodm.init | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/nodm.init b/debian/nodm.init
index ffef029..1ab212b 100644
--- a/debian/nodm.init
+++ b/debian/nodm.init
@@ -55,13 +55,13 @@ case "$1" in
then
log_warning_msg "Not starting $NAME because NODM_ENABLED is '$NODM_ENABLED' in /etc/default/$NAME"
else
- start-stop-daemon --start --oknodo --pidfile ${PIDFILE} --make-pidfile --background --exec /usr/sbin/nodm
+ start-stop-daemon --start --quiet --oknodo --pidfile ${PIDFILE} --make-pidfile --background --exec /usr/sbin/nodm
fi
[ "$VERBOSE" != no ] && log_end_msg $?
;;
stop)
[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- start-stop-daemon --stop --retry 10 --pidfile ${PIDFILE} --oknodo
+ start-stop-daemon --stop --quiet --retry 10 --pidfile ${PIDFILE} --oknodo
rm -f ${PIDFILE}
[ "$VERBOSE" != no ] && log_end_msg $?
;;
--
2.0.0.rc0
>From 177c7b5aafe5578d8a23b990fe884c88a08e5fd9 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Fri, 2 May 2014 18:10:05 +0100
Subject: [PATCH 13/14] Rely on LSB headers for dependency/sequence info
(Closes: #584179)
---
debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 95367de..a7499e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,4 +10,4 @@ override_dh_auto_test:
#make check
override_dh_installinit:
- dh_installinit -r -u "defaults 30 01"
+ dh_installinit -r -- defaults
--
2.0.0.rc0
>From ba3574fb9c129273b631e25f49a15e11e7dd2129 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Fri, 2 May 2014 17:57:16 +0100
Subject: [PATCH 14/14] Summarize changes since 0.11-1
---
debian/changelog | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 8dbaa10..7943578 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+nodm (0.11-1.4) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Wait for nodm to exit (patch from Chris Lamb, Closes: #638290)
+ * Depend on xserver-xorg for /usr/bin/X (reported by Michal Suchanek,
+ Closes: #689703)
+ * Place libraries in LIBS, not LDFLAGS (patch from Ilya Barygin/Ubuntu,
+ LP: #771123, Closes: #638601)
+ * Build without -Werror (patch from Ilya Barygin/Ubuntu)
+ * Fix miscounted environment variables in README (patch from jidanni,
+ Closes: #746700)
+ * Fully activate ConsoleKit sessions (patch from Emanuele Aina,
+ LP: #873975, Closes: #680264)
+ * Drop x11-xserver-utils dependency (patch from Emanuele Aina,
+ Closes: #680269)
+ * Add NODM_X_TIMEOUT support in debconf templates (patch from Hector Oron
+ and Sjoerd Simons, Closes: #704128)
+ * Set the PAM_XDISPLAY item so systemd-logind can determine the seat
+ (patch from Sjoerd Simons, Closes: #713960)
+ * Make initscript less chatty (patch from Chris Lamb, Closes: #638293)
+ * Rely on LSB headers for dependency/sequence info (Closes: #584179)
+
+ -- Simon McVittie <[email protected]> Fri, 02 May 2014 17:54:07 +0100
+
nodm (0.11-1.3) unstable; urgency=low
* Non-maintainer upload.
--
2.0.0.rc0
--- End Message ---
