aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/203_nxagent_disable-rootless-exit.full.patch60
-rw-r--r--debian/patches/series1
3 files changed, 69 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f1697bcc0..d2da304d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low
+ [ Mike Gabriel ]
* Update patch: 001_add-main-makefile.full+lite.patch, adapt patch from
packaging. Test for Makefiles in subfolders before calling them.
Fixes build failure during ,,make distclean'' calls.
+ [ Oleksandr Shneyder ]
+ * Create patch: 203_nxagent_disable-rootless-exit.full.patch.
+ Add command line argument "-norootlessexit".
+ Usually, nxagent exits after 30 seconds if running in rootless mode
+ and no X-Clients are present. Starting nxagent with option "-norootlessexit"
+ will change this behaviour.
+
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Feb 2012 15:05:38 +0100
nx-libs (2:3.5.0.11-0) unstable; urgency=low
diff --git a/debian/patches/203_nxagent_disable-rootless-exit.full.patch b/debian/patches/203_nxagent_disable-rootless-exit.full.patch
new file mode 100644
index 000000000..03154bb07
--- /dev/null
+++ b/debian/patches/203_nxagent_disable-rootless-exit.full.patch
@@ -0,0 +1,60 @@
+--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
+@@ -656,6 +656,12 @@
+ return 1;
+ }
+
++ if (!strcmp(argv[i], "-norootlessexit")) {
++ nxagentChangeOption(NoRootlessExit, True);
++ return 1;
++ }
++
++
+ if (!strcmp(argv[i], "-noonce"))
+ {
+ nxagentOnce = False;
+@@ -1837,6 +1843,7 @@
+ ErrorF("The NX system adds the following arguments:\n");
+ ErrorF("-forcenx force use of NX protocol messages assuming communication through nxproxy\n");
+ ErrorF("-timeout int auto-disconnect timeout in seconds (minimum allowed: 60)\n");
++ ErrorF("-norootlessexit don't exit if there are no clients in rootless mode\n");
+ #ifdef RENDER
+ ErrorF("-norender disable the use of the render extension\n");
+ ErrorF("-nocomposite disable the use of the composite extension\n");
+--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+@@ -217,7 +217,7 @@
+
+ if (nxagentOption(Rootless) &&
+ nxagentLastWindowDestroyed && nxagentRootlessDialogPid == 0 &&
+- now > nxagentLastWindowDestroyedTime + 30 * 1000)
++ now > nxagentLastWindowDestroyedTime + 30 * 1000 && !nxagentOption(NoRootlessExit))
+ {
+ #ifdef WARNING
+ fprintf(stderr, "nxagentBlockHandler: No application running. Closing the session.\n");
+--- a/nx-X11/programs/Xserver/hw/nxagent/Options.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c
+@@ -56,6 +56,7 @@
+ nxagentOptions.Persistent = 1;
+ nxagentOptions.Rootless = UNDEFINED;
+ nxagentOptions.Fullscreen = UNDEFINED;
++ nxagentOptions.NoRootlessExit = False;
+
+ nxagentOptions.X = 0;
+ nxagentOptions.Y = 0;
+--- a/nx-X11/programs/Xserver/hw/nxagent/Options.h
++++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h
+@@ -369,6 +369,13 @@
+
+ int CopyBufferSize;
+
++ /*
++ * True if agent should not exit if there are no
++ * clients in rootless mode
++ */
++
++ int NoRootlessExit;
++
+ } AgentOptionsRec;
+
+ typedef AgentOptionsRec *AgentOptionsPtr;
diff --git a/debian/patches/series b/debian/patches/series
index cf194f147..654f25c9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,6 +37,7 @@
200_nxagent_check-binary-x2go-flavour.full.patch
201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
202_nx-x11_enable-xinerama.full.patch
+203_nxagent_disable-rootless-exit.full.patch
209_x2goagent-add-man-page.full.patch
300_nxagent_set-wm-class.full.patch
301_nx-X11_use-shared-libs.full.patch