[arch-commits] Commit in nodm/trunk (PKGBUILD nodm.conf norestart.patch)

[Sven-Hendrik Haase]

    Date: Sunday, October 23, 2016 @ 18:51:50
  Author: svenstaro
Revision: 193114

Update stuff according to upstream

Modified:
  nodm/trunk/PKGBUILD
  nodm/trunk/nodm.conf
Deleted:
  nodm/trunk/norestart.patch

-----------------+
 PKGBUILD        |   14 ++++++------
 nodm.conf       |   25 +++++++++++-----------
 norestart.patch |   60 ------------------------------------------------------
 3 files changed, 20 insertions(+), 79 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-23 18:46:44 UTC (rev 193113)
+++ PKGBUILD	2016-10-23 18:51:50 UTC (rev 193114)
@@ -11,13 +11,13 @@
 makedepends=('help2man')
 backup=('etc/nodm.conf')
 source=("https://github.com/spanezz/nodm/archive/debian/${pkgver}-${pkgrel}.tar.gz"
-	"nodm.conf"
-	"nodm.service"
-	"norestart.patch")
-md5sums=('a3d2c56e639abd8b626a5f5c016ac813'
-         '9a372ab7dcf281963d972ebb9486b605'
-         '2660ea3446841ade64db351ab639101c'
-         '5076b2fe19551c42e3f5cd8bf445927f')
+     	"nodm.conf"
+     	"nodm.service"
+     	"norestart.patch")
+md5sums=("a3d2c56e639abd8b626a5f5c016ac813"
+         "9a372ab7dcf281963d972ebb9486b605"
+         "2660ea3446841ade64db351ab639101c"
+         "5076b2fe19551c42e3f5cd8bf445927f")
 
 build() {
 	cd "${srcdir}/${pkgname}-debian-${pkgver}-${pkgrel}"

Modified: nodm.conf
===================================================================
--- nodm.conf	2016-10-23 18:46:44 UTC (rev 193113)
+++ nodm.conf	2016-10-23 18:51:50 UTC (rev 193114)
@@ -3,20 +3,21 @@
 # Controls the user that is used to automatically log in
 NODM_USER='{user}'
 
-# Options to pass to the X server (for example: "vt7 -nolisten tcp")
+# Options to pass to the X server (for example: "vt7 -nolisten
+# tcp")
 NODM_X_OPTIONS='vt7 -nolisten tcp'
 
-# Minimum time (in seconds) that a session should last in order for nodm to
-# decide that it has not quit too soon.  If an X session will run for less than
-# this time, nodm will wait an increasing bit of time before restarting it.
+# Minimum time (in seconds) that a session should last in order
+# for nodm to decide that it has not quit too soon.  If an X
+# session will run for less than this time, nodm will wait an
+# increasing bit of time before restarting it.
 NODM_MIN_SESSION_TIME=60
 
-# Restart session after it ending?
-NODM_RESTART_SESSION=0
+# X session command (default: /etc/X11/Xsession). It is run using
+# the shell, so it can be any shell command.
+NODM_XSESSION='/home/{user}/.xinitrc'
 
-# Path to the xinit program
-NODM_XINIT='/usr/bin/xinit'
-
-# Path to the X session script (useful if using xinit instead of startx).
-# NOTE: This file needs to be executable!
-NODM_XSESSION='/home/{user}/.xinitrc'
+# 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=20

Deleted: norestart.patch
===================================================================
--- norestart.patch	2016-10-23 18:46:44 UTC (rev 193113)
+++ norestart.patch	2016-10-23 18:51:50 UTC (rev 193114)
@@ -1,60 +0,0 @@
-diff -aur nodm-0.7/nodm.c nodm-0.7-new/nodm.c
---- nodm-0.7/nodm.c	2009-07-26 20:36:14.000000000 +0200
-+++ nodm-0.7-new/nodm.c	2011-03-02 15:19:23.960000382 +0100
-@@ -427,8 +427,10 @@
-  * @param mst
-  *   The minimum time (in seconds) that a session should last to be considered
-  *   successful
-+ * @param xrestart
-+ *   Boolean option whether to restart X or not
-  */
--void run_and_restart(const char* xinit, const char* xsession, const char* xoptions, int mst)
-+void run_and_restart(const char* xinit, const char* xsession, const char* xoptions, int mst, int xrestart)
- {
- 	static int retry_times[] = { 0, 0, 30, 30, 60, 60, -1 };
- 	int restart_count = 0;
-@@ -446,8 +448,7 @@
- 	args[2] = command;
- 	args[3] = 0;
- 
--	while (1)
--	{
-+	do {
- 		/* Run the X server */
- 		time_t begin = time(NULL);
- 		time_t end;
-@@ -470,7 +471,7 @@
- 		/* Sleep a bit if the session was too short */
- 		sleep(retry_times[restart_count]);
- 		syslog (LOG_INFO, "Restarting session for %s", name);
--	}
-+	} while (xrestart);
- }
- 
- /*
-@@ -525,6 +526,7 @@
- 	int mst;
- 	int vt_fd = -1;
- 	int vt_num;
-+	int xrestart = 0;
- 
- 	/* Parse command line options */
- 	while (1)
-@@ -576,6 +578,8 @@
- 	/* Read the configuration from the environment */
- 	cp = getenv("NODM_MIN_SESSION_TIME");
- 	mst = cp ? atoi(cp) : 60;
-+	cp = getenv("NODM_RESTART_SESSION");
-+    xrestart = cp ? atoi(cp) : 0;
- 	string_from_env(xinit, "NODM_XINIT", "/usr/bin/xinit");
- 	string_from_env(xoptions, "NODM_X_OPTIONS", "");
- 
-@@ -585,7 +589,7 @@
- 		snprintf(xoptions1, BUFSIZ, "vt%d %s", vt_num, xoptions);
- 
- 	setenv("NODM_RUN_SESSION", "1", 1);
--	run_and_restart(xinit, opt_session, xoptions1, mst);
-+	run_and_restart(xinit, opt_session, xoptions1, mst, xrestart);
- 
- 	close(vt_fd);
-