[X2Go-Commits] [x2gobroker] 02/02: Merge branch 'stefanbaur-master-patch-36386' into 'master'

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 85b0de53fbb0f4b4318214cff9e33c9c55c4182c
Merge: 3cd9419 447d72a
Author: Mihai Moldovan 
Date:   Thu Mar 28 19:35:46 2024 +0100

Merge branch 'stefanbaur-master-patch-36386' into 'master'

mini/x2gobroker-ssh-mini: add missing hostname/IP and port autodetection.

Attributes GL MR !6: 
https://gitlab.x2go.org/x2go/broker/x2gobroker/-/merge_requests/6

 debian/changelog |  2 +
 mini/x2gobroker-ssh-mini | 96 
 2 files changed, 90 insertions(+), 8 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gobroker.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gobroker] 01/02: mini/x2gobroker-ssh-mini: add missing hostname/IP and port autodetection.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 447d72aed0e1fc124013e5277581d74912dd6ac7
Author: Stefan Baur 
Date:   Thu Mar 28 12:24:40 2024 +

mini/x2gobroker-ssh-mini: add missing hostname/IP and port autodetection.
---
 debian/changelog |  2 +
 mini/x2gobroker-ssh-mini | 96 
 2 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b07430..e0f2f7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ x2gobroker (0.0.4.4-0x2go1) UNRELEASED; urgency=medium
   [ Stefan Baur ]
   * New upstream version (0.0.4.4):
 - mini/x2gobroker-ssh-mini: typo fix referencing PORT variable.
+- mini/x2gobroker-ssh-mini: add missing hostname/IP and port
+  autodetection.
 
  -- Mike Gabriel   Mon, 15 Nov 2021 15:33:29 +0100
 
diff --git a/mini/x2gobroker-ssh-mini b/mini/x2gobroker-ssh-mini
index a839393..7c2b5e8 100644
--- a/mini/x2gobroker-ssh-mini
+++ b/mini/x2gobroker-ssh-mini
@@ -127,20 +127,100 @@ if (echo -e "$PARAMLIST" | grep -q -- '--task 
listsessions'); then
 # check if we were asked to provide a server name/IP and port for a specific 
session
 elif (echo -e "$PARAMLIST" | grep -q -- '--task selectsession'); then
SESSIONID=$(echo -e "$PARAMLIST" | awk '$1 == "--sid" { print 
$2 }')
+
# search for the line with the corresponding session file in 
our stored list of files
SESSIONFILE=$(grep "$SESSIONID" 
~/.x2go/brokersessionfile-${USER})
+
# determine server name/IP and port from this file
SERVER=$(awk -F '=' '$1 == "host" { print $2 }' $SESSIONFILE)
PORT=$(awk -F '=' '$1 == "sshport" { print $2 }' $SESSIONFILE)
-   # if this failed, set default values
-   if [ -z "$SERVER" ] && [ -f 
/etc/x2go/x2gobroker-ssh-mini/defaulthost ]; then
-   # determine default hostname/IP
-   read DEFAULTHOST 
 IPv6 detected
+   if [ '[' = "${DEFAULTFROMFILE:0:1}" ] 
&& [ "${DEFAULTFROMFILE}" != "${DEFAULTFROMFILE%\]*}" ] ; then
+   # is likely a proper IPv6 
address (starts with square bracket, has a closing bracket somewhere)
+
+   # Determine Port - strip 
everything in front of "]:"
+   # If no port was given, the 
result will equal $DEFAULTFROMFILE
+   
DEFAULTPORTFROMFILE="${DEFAULTFROMFILE#*\]:}"
+   if [ "${DEFAULTPORTFROMFILE}" 
!= "${DEFAULTFROMFILE}" ]; then
+   # not the same, so we 
have a valid port and may set it
+   
PORT="${DEFAULTPORTFROMFILE}"
+   fi
+
+   # Determine IPv6 address 
(subtract colon and port, then remove brackets in step 2)
+   
DEFAULTFROMFILE="${DEFAULTFROMFILE%%:$DEFAULTPORT}"
+   
DEFAULTSERVERFROMFILE="${DEFAULTFROMFILE//[\[\]]}"
+
+   # do one last sanity check, in 
case someone messed up the square brackets in the file
+   if [ 
"[${DEFAULTSERVERFROMFILE}]" = "${DEFAULTFROMFILE}" ]; then
+   # very likely that we 
have a valid IPv6 address, so let's use it
+   
SERVER="${DEFAULTSERVERFROMFILE}"
+   fi
+   # else # TODO - add log message that 
file could not be parsed.
+   fi
+   else
+   # one or no ":" -> IPv4 address or DNS 
name, with optional port
+
+   # Determine port - strip everything in 
front of ":"
+   # If no port was given, the result will 
equal $DEFAULTFROMFILE
+   
DEFAULTPORTFROMFILE="${DEFAULTFROMFILE#*:}"
+   if [ "${DEFAULTPORTFROMFILE}" != 
"${DEFAULTFROMFILE}" ]; then
+   # not the same, so we have a 
valid port and may set it
+   PORT="${DEFAULTPORTFROMFILE}"
+   fi
+
+   # not much to check for here
+   
DEFAULTSERVERFROMFILE="${DEFAULTHOST%:*}"
+  

[X2Go-Commits] [x2gobroker] branch master updated (3cd9419 -> 85b0de5)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gobroker.

  from  3cd9419   Merge branch 'stefanbaur-master-patch-71681' into 'master'
   new  447d72a   mini/x2gobroker-ssh-mini: add missing hostname/IP and 
port autodetection.
   new  85b0de5   Merge branch 'stefanbaur-master-patch-36386' into 'master'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog |  2 +
 mini/x2gobroker-ssh-mini | 96 
 2 files changed, 90 insertions(+), 8 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gobroker.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gobroker] 02/02: Merge branch 'stefanbaur-master-patch-71681' into 'master'

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 3cd941939339620dbd883b02c554a9fe9ee5c4c5
Merge: a3fd2e7 7894875
Author: Mihai Moldovan 
Date:   Thu Mar 28 18:52:55 2024 +0100

Merge branch 'stefanbaur-master-patch-71681' into 'master'

mini/x2gobroker-ssh-mini: typo fix referencing PORT variable.

Attributes GL MR !5: 
https://gitlab.x2go.org/x2go/broker/x2gobroker/-/merge_requests/5

 debian/changelog | 4 
 mini/x2gobroker-ssh-mini | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gobroker.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gobroker] 01/02: mini/x2gobroker-ssh-mini: typo fix referencing PORT variable.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 78948758930e2412d6411fb9dde9e5007e6dcafe
Author: Stefan Baur 
Date:   Thu Mar 28 12:10:01 2024 +

mini/x2gobroker-ssh-mini: typo fix referencing PORT variable.
---
 debian/changelog | 4 
 mini/x2gobroker-ssh-mini | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cf63589..3b07430 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,10 @@ x2gobroker (0.0.4.4-0x2go1) UNRELEASED; urgency=medium
   * debian/x2gobroker-ssh-mini.insall:
 + Pick files as installed by Makefile.
 
+  [ Stefan Baur ]
+  * New upstream version (0.0.4.4):
+- mini/x2gobroker-ssh-mini: typo fix referencing PORT variable.
+
  -- Mike Gabriel   Mon, 15 Nov 2021 15:33:29 +0100
 
 x2gobroker (0.0.4.3-0x2go1) unstable; urgency=medium
diff --git a/mini/x2gobroker-ssh-mini b/mini/x2gobroker-ssh-mini
index 72ae898..a839393 100644
--- a/mini/x2gobroker-ssh-mini
+++ b/mini/x2gobroker-ssh-mini
@@ -139,7 +139,7 @@ elif (echo -e "$PARAMLIST" | grep -q -- '--task 
selectsession'); then
SERVER=$DEFAULTHOST
fi
 
-   if [ -z "PORT" ]; then
+   if [ -z "${PORT}" ]; then
PORT=22
fi
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gobroker.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gobroker] branch master updated (a3fd2e7 -> 3cd9419)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gobroker.

  from  a3fd2e7   Merge branch 'personal/sunweaver/x2gobrokersshmini' into 
'master'
   new  7894875   mini/x2gobroker-ssh-mini: typo fix referencing PORT 
variable.
   new  3cd9419   Merge branch 'stefanbaur-master-patch-71681' into 'master'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 4 
 mini/x2gobroker-ssh-mini | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gobroker.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] branch personal/sunweaver/xorg-21-1-11 deleted (was 07305ec)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch personal/sunweaver/xorg-21-1-11
in repository x2gokdrive.

   was  07305ec   patches.xorg/21.1.11/: Add patchset against X.org 21.1.11.

This change permanently discards the following revisions:

  discards  07305ec   patches.xorg/21.1.11/: Add patchset against X.org 21.1.11.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 01/01: patches.xorg/21.1.11/: Add patchset against X.org 21.1.11.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch personal/sunweaver/xorg-21-1-11
in repository x2gokdrive.

commit 07305ec2b1f89a59f1caf68618aaf75a822d55d7
Author: Mike Gabriel 
Date:   Mon Mar 25 09:15:15 2024 +

patches.xorg/21.1.11/: Add patchset against X.org 21.1.11.
---
 patches.xorg/21.1.11/quilt.env |   1 +
 patches.xorg/21.1.11/series|   2 +
 .../21.1.11/xorg-server-configure-ac.patch | 115 +
 .../xorg-server-hw-kdrive-Makefile-am.patch|  25 +
 4 files changed, 143 insertions(+)

diff --git a/patches.xorg/21.1.11/quilt.env b/patches.xorg/21.1.11/quilt.env
new file mode 12
index 000..543e930
--- /dev/null
+++ b/patches.xorg/21.1.11/quilt.env
@@ -0,0 +1 @@
+../common/quilt.env
\ No newline at end of file
diff --git a/patches.xorg/21.1.11/series b/patches.xorg/21.1.11/series
new file mode 100644
index 000..6a74a24
--- /dev/null
+++ b/patches.xorg/21.1.11/series
@@ -0,0 +1,2 @@
+xorg-server-configure-ac.patch
+xorg-server-hw-kdrive-Makefile-am.patch
diff --git a/patches.xorg/21.1.11/xorg-server-configure-ac.patch 
b/patches.xorg/21.1.11/xorg-server-configure-ac.patch
new file mode 100644
index 000..713eb02
--- /dev/null
+++ b/patches.xorg/21.1.11/xorg-server-configure-ac.patch
@@ -0,0 +1,115 @@
+Index: xorg-server/configure.ac
+===
+--- xorg-server.orig/configure.ac
 xorg-server/configure.ac
+@@ -31,7 +31,7 @@ RELEASE_DATE="2023-12-13"
+ RELEASE_NAME="Caramel Ice Cream"
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_INIT_AUTOMAKE([foreign dist-xz])
++AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects])
+ AC_USE_SYSTEM_EXTENSIONS
+ 
+ # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in 
XORG_DEFAULT_OPTIONS
+@@ -589,6 +589,7 @@ AC_ARG_ENABLE(xf86-input-inputtest, AS_H
+ dnl kdrive and its subsystems
+ AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive 
servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
+ AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the 
kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
++AC_ARG_ENABLE(x2gokdrive, AS_HELP_STRING([--enable-x2gokdrive], [Build 
the kdrive x2gokdrive server (default: auto)]), [X2GOKDRIVE=$enableval], 
[X2GOKDRIVE=auto])
+ dnl kdrive options
+ AC_ARG_ENABLE(libunwind,  AS_HELP_STRING([--enable-libunwind], [Use 
libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], 
[LIBUNWIND="auto"])
+ AC_ARG_ENABLE(xshmfence,  AS_HELP_STRING([--disable-xshmfence], [Disable 
xshmfence (default: auto)]), [XSHMFENCE="$enableval"], [XSHMFENCE="auto"])
+@@ -1771,6 +1772,8 @@ if test "x$XORG" = xauto; then
+ fi
+ AC_MSG_RESULT([$XORG])
+ 
++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg 
version])
++
+ if test "x$XORG" = xyes; then
+   PKG_CHECK_MODULES([LIBXCVT], $LIBXCVT)
+ 
+@@ -1979,7 +1982,6 @@ if test "x$XORG" = xyes; then
+   AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+   AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
+   AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
+-  AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current 
Xorg version])
+   AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
+   AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+   AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+@@ -2198,9 +2200,15 @@ dnl kdrive DDX
+ XEPHYR_LIBS=
+ XEPHYR_INCS=
+ 
++X2GOKDRIVE_LIBS=
++X2GOKDRIVE_INCS=
++
+ AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes])
+ 
+ if test "$KDRIVE" = yes; then
++
++### XEPHYR
++
+ XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil 
xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms xcb-randr xcb-xkb"
+ if test "x$XV" = xyes; then
+ XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv"
+@@ -2240,6 +2248,43 @@ if test "$KDRIVE" = yes; then
+ 
+ AC_SUBST([XEPHYR_LIBS])
+ AC_SUBST([XEPHYR_INCS])
++
++### X2GOKDRIVE
++
++X2GOKDRIVE_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render 
xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms 
xcb-randr xcb-xkb xcb-xfixes zlib libjpeg libpng"
++if test "x$DRI" = xyes && test "x$GLX" = xyes; then
++X2GOKDRIVE_REQUIRED_LIBS="$X2GOKDRIVE_REQUIRED_LIBS $LIBDRM xcb-glx 
xcb-xf86dri > 1.6"
++fi
++
++if test "x$X2GOKDRIVE" = xauto; then
++PKG_CHECK_MODULES(X2GOKDRIVE, $X2GOKDRIVE_REQUIRED_LIBS, 
[X2GOKDRIVE="yes"], [X2GOKDRIVE="no"])
++elif test "x$X2GOKDRIVE" = xyes ; then
++PKG_CHECK_MODULES(X2GOKDRIVE, $X2GOKDRIVE_REQUIRED_LIBS)
++fi
++
++# X2GOKDRIVE needs nanosleep() which is in librt on Solaris
++AC_CHECK_FUNC([nanosleep], [],
++AC_CHECK_LIB([rt], [nanosleep], 

[X2Go-Commits] [x2gokdrive] branch personal/sunweaver/xorg-21-1-11 created (now 07305ec)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch personal/sunweaver/xorg-21-1-11
in repository x2gokdrive.

at  07305ec   patches.xorg/21.1.11/: Add patchset against X.org 21.1.11.

This branch includes the following new commits:

   new  07305ec   patches.xorg/21.1.11/: Add patchset against X.org 21.1.11.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 01/01: Continue development

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 76766ce8dd773b5fd9fb3a08138dc67384376895
Author: X2Go Release Manager 
Date:   Thu Mar 14 16:27:46 2024 +0100

Continue development
---
 VERSION.x2gokdrive | 2 +-
 debian/changelog   | 6 ++
 x2gokdrive.spec| 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/VERSION.x2gokdrive b/VERSION.x2gokdrive
index b347fe3..813ef2e 100644
--- a/VERSION.x2gokdrive
+++ b/VERSION.x2gokdrive
@@ -1 +1 @@
-0.0.0.3
+0.0.0.4
diff --git a/debian/changelog b/debian/changelog
index a1fdf68..b911660 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x2gokdrive (0.0.0.4-0x2go1) UNRELEASED; urgency=medium
+
+  * Continue development
+
+ -- X2Go Release Manager   Thu, 14 Mar 2024 16:27:32 +0100
+
 x2gokdrive (0.0.0.3-0x2go1) unstable; urgency=medium
 
   [ Mike Gabriel ]
diff --git a/x2gokdrive.spec b/x2gokdrive.spec
index e0af9d8..f32c7ca 100644
--- a/x2gokdrive.spec
+++ b/x2gokdrive.spec
@@ -6,7 +6,7 @@
 %global _hardened_build 1
 
 Name:   x2gokdrive
-Version:0.0.0.3
+Version:0.0.0.4
 Release:0.0x2go1%{?dist}
 Summary:KDrive graphical server backend for X2GoServer
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] branch master updated (182e8c9 -> 76766ce)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gokdrive.

  from  182e8c9   release 0.0.0.3
   new  76766ce   Continue development

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 VERSION.x2gokdrive | 2 +-
 debian/changelog   | 6 ++
 x2gokdrive.spec| 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] branch build-main updated (9a79d6e -> 182e8c9)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch build-main
in repository x2gokdrive.

  from  9a79d6e   release 0.0.0.2
  adds  d0cc69c   Continue development
  adds  e061196   debian/Jenkinsfile: Add file. Initiate CI builds.
  adds  799f787   debian/control: Prefer libgl-dev (new dev:pkg to use 
since bookworm) over libgl1-mesa-dev.
  adds  5c222e8   debian/control: Prefer libxcb-util-dev over 
ibxcb-util0-dev (not available in Debian trixie anymore).
  adds  5b1d0e1   {patches.xorg/,debian/rules,x2gokdrive.spec}: Add 
semi-auto-detection of latest available patchset and fallback to that if we 
don't have a patchset for an exact xorg-server version.
  adds  4029ef0   Merge branch 'personal/sunweaver/auto-patch-xorg' into 
'master'
  adds  0b99423   patches.xorg/: add 21.1.10 subdirectory for current 
Debian testing/unstable with rebased patch set.
  adds  053236b   Merge branch 'personal/sunweaver/xorg-server-21.1.10'
  adds  77de1aa   debian/changelog: sync up with commit history.
  adds  c31000f   x2gokdriveremote.{c,h}: use a client keepalive timeout of 
120 seconds for the web client, keep other clients on 30 seconds.
  adds  e7821d5   Merge branch 'feature/web-timeout-2m' into 'master'
  adds  3106359   debian/rules: fix typo: ibxcb-util0-dev => 
libxcb-util0-dev.
  adds  d819f0a   Merge branch 'personal/Ionic/fix-buster' into 'master'
  adds  7046d14   misc: pre-release date update.
  adds  182e8c9   release 0.0.0.3

No new revisions were added by this update.

Summary of changes:
 VERSION.x2gokdrive |  2 +-
 debian/Jenkinsfile |  6 
 debian/changelog   | 35 ++
 debian/control |  4 +--
 debian/copyright   |  6 ++--
 debian/rules   | 16 ++
 patches.xorg/{1.18.4 => 21.1.10}/quilt.env |  0
 patches.xorg/{1.18.4 => 21.1.10}/series|  0
 .../xorg-server-configure-ac.patch | 20 ++---
 .../xorg-server-hw-kdrive-Makefile-am.patch|  0
 patches.xorg/latest-available  |  1 +
 ...run-x2gokdriveclient-to-x2gokdrive-on-localhost |  2 +-
 ...run-x2gokdriveclient-to-x2gokdrive-over-network |  2 +-
 x2gokdrive.h   |  2 +-
 x2gokdrive.spec| 29 ++
 x2gokdrivecursor.c |  2 +-
 x2gokdriveinit.c   |  2 +-
 x2gokdriveremote.c | 23 ++
 x2gokdriveremote.h |  5 ++--
 x2gokdriveselection.c  |  2 +-
 x2gokdriveselection.h  |  2 +-
 21 files changed, 114 insertions(+), 47 deletions(-)
 create mode 100644 debian/Jenkinsfile
 copy patches.xorg/{1.18.4 => 21.1.10}/quilt.env (100%)
 copy patches.xorg/{1.18.4 => 21.1.10}/series (100%)
 copy patches.xorg/{21.1.8 => 21.1.10}/xorg-server-configure-ac.patch (91%)
 copy patches.xorg/{21.1.7 => 21.1.10}/xorg-server-hw-kdrive-Makefile-am.patch 
(100%)
 create mode 12 patches.xorg/latest-available

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-tags] [x2gokdrive] annotated tag 0.0.0.3 created (now d7d5bd4)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to annotated tag 0.0.0.3
in repository x2gokdrive.

at  d7d5bd4   (tag)
   tagging  182e8c92b1e90fe83340ce1aea854bad3f9e0002 (commit)
  replaces  0.0.0.2
 tagged by  Mihai Moldovan
on  Wed Mar 13 12:04:59 2024 +0100

- Log -
Upstream version 0.0.0.3
-BEGIN PGP SIGNATURE-

iQJDBAABCgAtFiEEbhHQj3UzgcdE8cg8H9Yu2W4lOocFAmXxiFsPHGlvbmljQGlv
bmljLmRlAAoJEB/WLtluJTqHIUYQAOSbZfMGqPKo0L6qjckg1F4GXQNfGCLJDagF
JqMHQNVvvYImxLL0V3IC4IooCUuH1Dv0nlOp9VyRc3gaEB6jEhF102aP2hAWEKX8
sZnz+iaCK890tHdStmRWWAfrpJD0SHyTYOyhgJqf5B547jeLdF+Z+uWljYk3loxS
og/cCjyaQMObPhSEt8w9oAekeHBNuu7R3/YRjHKESRfs+y8VmJR6yUv5sBPX/VzF
tJrVHNkMFzn7Z0X0TbxMam/Fz+Eu7frjy2mkGxTx8UmgBxCHqayTWbwlMltfLAkY
TjM6daJrGe++bIVOP0a6HOOxMSCG+vrpsFayHeQwyh+1NSp1wBhsq7tS7EZOV8NU
YDCELwYUKhjkwnD0+QH7SmIh+qrW/gjmFA12BgMy/vz+gcCGfvF4cn42PHRfiNy4
p+hbP9Uzrlq6JdVnJByU2Fs2wc7/hdGvzcywfKYXSjwYiMOVrYOcMf5ZgiUepMIg
c1A9DFajoZu5IhXL6IgbHm6O5S6KjC3NVw1v7As/GBcXil3aVwD4ucZJptf9+z9N
N1dIJH1obBSrDTcIwTErfV58DTUtKj7yY7GhPylZ6AmnOHY13WyjgYwapgqaf+Wn
f0E+QjPcx3c+eNAQkuNIRiJby5TmOhROGUiadKuqQPFwoR33HKdNYE0keSeDHm93
rW4yuEIU
=vIaw
-END PGP SIGNATURE-

Mihai Moldovan (7):
  Merge branch 'personal/sunweaver/xorg-server-21.1.10'
  debian/changelog: sync up with commit history.
  x2gokdriveremote.{c,h}: use a client keepalive timeout of 120 seconds for 
the web client, keep other clients on 30 seconds.
  Merge branch 'feature/web-timeout-2m' into 'master'
  debian/rules: fix typo: ibxcb-util0-dev => libxcb-util0-dev.
  Merge branch 'personal/Ionic/fix-buster' into 'master'
  misc: pre-release date update.

Mike Gabriel (6):
  debian/Jenkinsfile: Add file. Initiate CI builds.
  debian/control: Prefer libgl-dev (new dev:pkg to use since bookworm) over 
libgl1-mesa-dev.
  debian/control: Prefer libxcb-util-dev over ibxcb-util0-dev (not 
available in Debian trixie anymore).
  {patches.xorg/,debian/rules,x2gokdrive.spec}: Add semi-auto-detection of 
latest available patchset and fallback to that if we don't have a patchset for 
an exact xorg-server version.
  Merge branch 'personal/sunweaver/auto-patch-xorg' into 'master'
  patches.xorg/: add 21.1.10 subdirectory for current Debian 
testing/unstable with rebased patch set.

X2Go Release Manager (2):
  Continue development
  release 0.0.0.3

---

No new revisions were added by this update.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-tags mailing list
x2go-tags@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-tags

[X2Go-Commits] [x2gokdrive] 01/01: release 0.0.0.3

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 182e8c92b1e90fe83340ce1aea854bad3f9e0002
Author: X2Go Release Manager 
Date:   Wed Mar 13 12:00:44 2024 +0100

release 0.0.0.3
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20b64c4..a1fdf68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x2gokdrive (0.0.0.3-0x2go1) UNRELEASED; urgency=medium
+x2gokdrive (0.0.0.3-0x2go1) unstable; urgency=medium
 
   [ Mike Gabriel ]
   * New upstream version (0.0.0.3):
@@ -31,7 +31,7 @@ x2gokdrive (0.0.0.3-0x2go1) UNRELEASED; urgency=medium
   * debian/rules:
 + Fix typo: ibxcb-util0-dev => libxcb-util0-dev. Fixes builds on buster.
 
- -- X2Go Release Manager   Tue, 12 Sep 2023 22:28:20 +0200
+ -- X2Go Release Manager   Wed, 13 Mar 2024 11:59:34 +0100
 
 x2gokdrive (0.0.0.2-0x2go1) unstable; urgency=medium
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] branch master updated (7046d14 -> 182e8c9)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gokdrive.

  from  7046d14   misc: pre-release date update.
   new  182e8c9   release 0.0.0.3

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] branch master updated (d819f0a -> 7046d14)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gokdrive.

  from  d819f0a   Merge branch 'personal/Ionic/fix-buster' into 'master'
   new  7046d14   misc: pre-release date update.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog| 1 +
 debian/copyright| 6 +++---
 testscripts/run-x2gokdriveclient-to-x2gokdrive-on-localhost | 2 +-
 testscripts/run-x2gokdriveclient-to-x2gokdrive-over-network | 2 +-
 x2gokdrive.h| 2 +-
 x2gokdrivecursor.c  | 2 +-
 x2gokdriveinit.c| 2 +-
 x2gokdriveremote.c  | 2 +-
 x2gokdriveremote.h  | 2 +-
 x2gokdriveselection.c   | 2 +-
 x2gokdriveselection.h   | 2 +-
 11 files changed, 13 insertions(+), 12 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 01/01: misc: pre-release date update.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 7046d140254be41a1af367fd2e65b08f165f2bb4
Author: Mihai Moldovan 
Date:   Mon Mar 11 14:53:29 2024 +0100

misc: pre-release date update.
---
 debian/changelog| 1 +
 debian/copyright| 6 +++---
 testscripts/run-x2gokdriveclient-to-x2gokdrive-on-localhost | 2 +-
 testscripts/run-x2gokdriveclient-to-x2gokdrive-over-network | 2 +-
 x2gokdrive.h| 2 +-
 x2gokdrivecursor.c  | 2 +-
 x2gokdriveinit.c| 2 +-
 x2gokdriveremote.c  | 2 +-
 x2gokdriveremote.h  | 2 +-
 x2gokdriveselection.c   | 2 +-
 x2gokdriveselection.h   | 2 +-
 11 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b7272d..20b64c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ x2gokdrive (0.0.0.3-0x2go1) UNRELEASED; urgency=medium
   tabs use WebSocket connections, this might not always work correctly.
   Since timers typically coalesce at one-minute intervals, a two-minutes
   timeout should be fine.
+- misc: pre-release date update.
   * debian/rules:
 + Fix typo: ibxcb-util0-dev => libxcb-util0-dev. Fixes builds on buster.
 
diff --git a/debian/copyright b/debian/copyright
index 88c3411..5f3335e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,16 +4,16 @@ Upstream-Contact: Oleksandr Shneyder 

 Source: https://code.x2go.org/releases/source/x2gokdrive/
 
 Files: *
-Copyright: 2018-2023, Oleksandr Shneyder 
+Copyright: 2018-2024, Oleksandr Shneyder 
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2019-2023, Mike Gabriel 
+Copyright: 2019-2024, Mike Gabriel 
 License: GPL-2+
 
 Files: testscripts/*
 Copyright:  2001, 2011 NoMachine (http://www.nomachine.com/)
-  2015-2023, Mike Gabriel 
+  2015-2024, Mike Gabriel 
 License: GPL-2
 
 License: GPL-2+
diff --git a/testscripts/run-x2gokdriveclient-to-x2gokdrive-on-localhost 
b/testscripts/run-x2gokdriveclient-to-x2gokdrive-on-localhost
index 5f3159b..7d41643 100755
--- a/testscripts/run-x2gokdriveclient-to-x2gokdrive-on-localhost
+++ b/testscripts/run-x2gokdriveclient-to-x2gokdrive-on-localhost
@@ -3,7 +3,7 @@
 #/**/
 #/**/
 #/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */
-#/* Copyright (c) 2015-2023 Mike Gabriel */
+#/* Copyright (c) 2015-2024 Mike Gabriel */
 #/**/
 #/* The X2Go KDrive test scripts have been derived from test scripts   */
 #/* shipped with nx-libs (formerly known as nx-X11 / nxagent by NoMachine. */
diff --git a/testscripts/run-x2gokdriveclient-to-x2gokdrive-over-network 
b/testscripts/run-x2gokdriveclient-to-x2gokdrive-over-network
index 1864dff..3c0fd3a 100755
--- a/testscripts/run-x2gokdriveclient-to-x2gokdrive-over-network
+++ b/testscripts/run-x2gokdriveclient-to-x2gokdrive-over-network
@@ -3,7 +3,7 @@
 #/**/
 #/**/
 #/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */
-#/* Copyright (c) 2015-2023 Mike Gabriel */
+#/* Copyright (c) 2015-2024 Mike Gabriel */
 #/**/
 #/* The X2Go KDrive test scripts have been derived from test scripts   */
 #/* shipped with nx-libs (formerly known as nx-X11 / nxagent by NoMachine. */
diff --git a/x2gokdrive.h b/x2gokdrive.h
index 5c26e65..8ebdd45 100644
--- a/x2gokdrive.h
+++ b/x2gokdrive.h
@@ -2,7 +2,7 @@
  * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr)
  * Author Oleksandr Shneyder 
  *
- * Copyright © 2018-2023 phoca-GmbH
+ * Copyright © 2018-2024 phoca-GmbH
  *
  *
  *
diff --git a/x2gokdrivecursor.c b/x2gokdrivecursor.c
index 6f356fb..cefcb96 100644
--- a/x2gokdrivecursor.c
+++ b/x2gokdrivecursor.c
@@ -2,7 +2,7 @@
  * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr)
  * Author Oleksandr Shneyder 
  *
- * Copyright © 2018-2023 phoca-GmbH
+ * Copyright © 2018-2024 phoca-GmbH
  *
  *
  *
diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c
index b6911c3..98f8675 100644
--- a/x2gokdriveinit.c
+++ b/x2gokdriveinit.c
@@ -2,7 +2,7 @@
  * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr)
  * Author Oleksandr Shneyder 
  *
- * Copyright © 2018-2023 phoca-GmbH
+ * Copyright © 2018-2024 phoca-GmbH
  

[X2Go-Commits] [buildscripts] 01/01: bin/sbuild-deb-package: single quotes are still not supported for default options, so use double quotes.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 30673d9392e6aa068535d486e4b9482d4119c763
Author: Mihai Moldovan 
Date:   Mon Mar 11 16:11:49 2024 +0100

bin/sbuild-deb-package: single quotes are still not supported for default 
options, so use double quotes.
---
 bin/sbuild-deb-package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index fa2a2f7..64fcffe 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -54,7 +54,7 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . 
"${HOME}/.buildscripts/${PRE
 
 : ${NO_DELAY:="no"}
 : ${FORCE_BUILD:="no"}
-: "${SKIP_ARCH_ALL:='no'}"
+: "${SKIP_ARCH_ALL:="no"}"
 : ${DEB_BUILD_FOR:="debian:${DEBIAN_DISTROS} ubuntu:${UBUNTU_DISTROS} 
raspbian:${RASPBIAN_DISTROS}"}
 : ${FLAVOR:="native"}
 : ${PLATFORM:="x86"}

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] branch master updated (773c5fb -> 30673d9)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository buildscripts.

  from  773c5fb   bin/{sbuild-deb,build-rpm}-package: add FIXME note 
stating that GitLab clones don't seem to have an "origin" remote.
   new  30673d9   bin/sbuild-deb-package: single quotes are still not 
supported for default options, so use double quotes.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/sbuild-deb-package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] 09/12: bin/{build-rpm, sbuild-deb}-package: add 'arm' as recognized value to PLATFORM variable.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 90bef9afc7365cbd64028ea23111ce5b566761e3
Author: Mihai Moldovan 
Date:   Thu Mar 7 13:07:39 2024 +0100

bin/{build-rpm,sbuild-deb}-package: add 'arm' as recognized value to 
PLATFORM variable.

Currently unused by us.

We handle ARM via Raspbian for *.deb builds, which is handled as a
special distribution, and not at all for *.rpm builds.
---
 bin/build-rpm-package  |  9 +
 bin/sbuild-deb-package | 10 ++
 2 files changed, 19 insertions(+)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 94b5c15..99d7cfb 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -905,6 +905,9 @@ clear_pkgdist() {
("ppc64le")
arches+=( "ppc64le" )
;;
+   ('arm')
+   arches+=( 'aarch64' )
+   ;;
esac
 
for l_ARCH in "${arches[@]}"; do
@@ -959,6 +962,9 @@ build_packages() {
("ppc64le")
arches+=( "ppc64le" )
;;
+   ('arm')
+   arches+=( 'aarch64' )
+   ;;
esac
 
typeset l_ARCH="${arches[0]}"
@@ -1418,6 +1424,9 @@ upload_packages() {
("ppc64le")
arches+=( "ppc64le" )
;;
+   ('arm')
+   arches+=( 'aarch64' )
+   ;;
esac
 
for l_ARCH in "${arches[@]}"; do
diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index 2aaa4e3..a30d938 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -290,6 +290,9 @@ clear_pkgdist() {
# Only jessie and up support 
the new ppc64el architecture.
[[ "${numerical_version}" -ge 
"8" ]] && arches+=( "ppc64el" )
;;
+   ('arm')
+   arches+=( 'arm64' 'armhf' )
+   ;;
esac
 
[ "${l_DIST}" = "raspbian" ] && arches=( 
"armhf" )
@@ -448,6 +451,10 @@ build_packages() {
# Only jessie and up support 
the new ppc64el architecture.
[[ "${numerical_version}" -ge 
"8" ]] && arches+=( "ppc64el" )
;;
+   ('arm')
+   skip_arch_all='1'
+   arches+=( 'arm64' 'armhf' )
+   ;;
esac
 
[ "${l_DIST}" = "raspbian" ] && arches=( 
"armhf" )
@@ -605,6 +612,9 @@ upload_packages() {
# Only jessie and up support the new 
ppc64el architecture.
[[ "${numerical_version}" -ge "8" ]] && 
arches+=( "ppc64el" )
;;
+   ('arm')
+   arches+=( 'arm64' 'armhf' )
+   ;;
esac
 
[ "${l_DIST}" = "raspbian" ] && arches=( "armhf" )

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] 11/12: bin/sbuild-deb-package: also support orig.tar.xz files.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 546b8f41a58dcf95daa0d9f2f8f700e9b1ff4f83
Author: Mihai Moldovan 
Date:   Sun Mar 10 18:09:12 2024 +0100

bin/sbuild-deb-package: also support orig.tar.xz files.
---
 bin/sbuild-deb-package | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index f616f48..581679d 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -306,7 +306,7 @@ clear_pkgdist() {
rm -f -- 
"${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.build
rm -f -- 
"${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.buildinfo
rm -f -- 
"${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.dsc
-   rm -f -- 
"${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.tar.gz
+   rm -f -- 
"${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.tar.{x,g}z
rm -f -- 
"${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*.deb
}
done
@@ -345,7 +345,13 @@ build_packages() {
git clone --no-hardlinks --no-local 
"${PROJECT_DIR}" "${TEMP_DIR}/${PROJECT}/"
cd "${TEMP_DIR}/${PROJECT}"
git checkout "${CHECKOUT}" || git checkout 
'master'
-   find "${PROJECT_DIR}/../" -maxdepth 0 -mindepth 
0 -type f | grep -qs "${PROJECT}_"*.orig.tar.gz && cp -- 
"${PROJECT_DIR}/../${PROJECT}_"*.orig.tar.gz ..
+   find "${PROJECT_DIR}/../" -maxdepth '0' 
-mindepth '0' -type 'f' | while read -r -d '' line; do
+   case "$(basename "${file}")" in
+   
("${PROJECT}_"*'.orig.tar.xz'|"${PROJECT}_"*'.orig.tar.gz')
+   cp -- "${file}" '..'
+   ;;
+   esac
+   done
GITREV="$(gitrevno)"
typeset gitdate="$(gitdate)"
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] 12/12: bin/{sbuild-deb, build-rpm}-package: add FIXME note stating that GitLab clones don't seem to have an "origin" remote.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 773c5fb5fd13c61510a07ffcd0c80f12d39a9281
Author: Mihai Moldovan 
Date:   Mon Mar 11 14:41:16 2024 +0100

bin/{sbuild-deb,build-rpm}-package: add FIXME note stating that GitLab 
clones don't seem to have an "origin" remote.
---
 bin/build-rpm-package  | 4 
 bin/sbuild-deb-package | 4 
 2 files changed, 8 insertions(+)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 99d7cfb..d25b39c 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -825,6 +825,10 @@ prepare_workspace() {
git reset --hard
git checkout --force "${CHECKOUT}" || git checkout 
--force -b "${CHECKOUT}"
git fetch 'origin' "${CHECKOUT}"
+   # FIXME: there might be an issue with GitLab 
repositories not having an
+   #"origin" remote, but dropping this here would 
mean that our clones
+   #cannot be updated any longer. We'll keep it 
as-is for now and
+   #check the GitLab issue at a later time.
git reset --hard "origin/${CHECKOUT}"
git branch -D 'upstream' || true
git fetch 'origin' 'upstream:upstream' || true
diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index 581679d..fa2a2f7 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -184,6 +184,10 @@ prepare_workspace() {
git reset --hard
git checkout --force "${CHECKOUT}" || git checkout 
--force -b "${CHECKOUT}"
git fetch 'origin' "${CHECKOUT}"
+   # FIXME: there might be an issue with GitLab 
repositories not having an
+   #"origin" remote, but dropping this here would 
mean that our clones
+   #cannot be updated any longer. We'll keep it 
as-is for now and
+   #check the GitLab issue at a later time.
git reset --hard "origin/${CHECKOUT}"
git branch -D 'upstream' || true
git fetch 'origin' 'upstream:upstream' || true

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] 10/12: bin/sbuild-deb-package: also remove .buildinfo files (used for reproducible builds).

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit e9cad31aeb26e10ba15a52eedd3042bff4ad26a4
Author: Mihai Moldovan 
Date:   Thu Mar 7 13:10:10 2024 +0100

bin/sbuild-deb-package: also remove .buildinfo files (used for reproducible 
builds).
---
 bin/sbuild-deb-package | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index a30d938..f616f48 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -304,6 +304,7 @@ clear_pkgdist() {
rm -f -- 
"${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.changes
rm -f -- 
"${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.upload
rm -f -- 
"${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.build
+   rm -f -- 
"${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.buildinfo
rm -f -- 
"${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.dsc
rm -f -- 
"${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.tar.gz
rm -f -- 
"${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*.deb

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] 08/12: bin/{build-rpm, sbuild-deb}-package: add new PKGDIST_BASE global option to select base pkg-dist directory.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit bf23b2137e901426fa30a6d36cc7e2b02df23d61
Author: Mihai Moldovan 
Date:   Thu Mar 7 12:55:17 2024 +0100

bin/{build-rpm,sbuild-deb}-package: add new PKGDIST_BASE global option to 
select base pkg-dist directory.

Defaults to "${HOME}/pkg-dist".
---
 bin/build-rpm-package  | 3 ++-
 bin/sbuild-deb-package | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 9ee5520..94b5c15 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -67,6 +67,7 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . 
"${HOME}/.buildscripts/${PRE
 : "${RPM_BUILD_FOR:="fedora:${FEDORA_DISTROS} epel:${EPEL_DISTROS} 
opensuse:${OPENSUSE_DISTROS} sle:${SLE_DISTROS}"}"
 : "${PLATFORM:="x86"}"
 : "${BUILD_BASE:="${HOME}/build"}"
+: "${PKGDIST_BASE:="${HOME}/pkg-dist"}"
 
 # These parts are not user-serviceable.
 TMP_MOCK_CFG_DIR=""
@@ -166,7 +167,7 @@ set_vars() {
 
# setting paths
PROJECT_DIR="${BUILD_BASE}/${COMPONENT}/${PROJECT}"
-   PKGDIST="${HOME}/pkg-dist/${COMPONENT}/${PROJECT}"
+   PKGDIST="${PKGDIST_BASE}/${COMPONENT}/${PROJECT}"
 
# lock file
LOCK_FILE="${PROJECT_DIR}/../.${PROJECT}.lock"
diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index 61e9f49..2aaa4e3 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -59,6 +59,7 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . 
"${HOME}/.buildscripts/${PRE
 : ${FLAVOR:="native"}
 : ${PLATFORM:="x86"}
 : "${BUILD_BASE:="${HOME}/build"}"
+: "${PKGDIST_BASE:="${HOME}/pkg-dist"}"
 
 # These parts are not user-serviceable.
 typeset -ag temp_cleanup=""
@@ -116,7 +117,7 @@ set_vars() {
 
# setting paths
PROJECT_DIR="${BUILD_BASE}/${COMPONENT}/${PROJECT}"
-   PKGDIST="${HOME}/pkg-dist/${COMPONENT}/${PROJECT}"
+   PKGDIST="${PKGDIST_BASE}/${COMPONENT}/${PROJECT}"
 
# lock file
LOCK_FILE="${PROJECT_DIR}/../.${PROJECT}.lock"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] 07/12: bin/{build-rpm, sbuild-deb}-package: add new BUILD_BASE global option to select base building directory.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 4027a45c9edc0b08e7dc1d651c10df3d8b6980e3
Author: Mihai Moldovan 
Date:   Thu Mar 7 12:52:53 2024 +0100

bin/{build-rpm,sbuild-deb}-package: add new BUILD_BASE global option to 
select base building directory.

Defaults to "${HOME}/build".
---
 bin/build-rpm-package  | 3 ++-
 bin/sbuild-deb-package | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 6c38358..9ee5520 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -66,6 +66,7 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . 
"${HOME}/.buildscripts/${PRE
 : "${FORCE_BUILD:="no"}"
 : "${RPM_BUILD_FOR:="fedora:${FEDORA_DISTROS} epel:${EPEL_DISTROS} 
opensuse:${OPENSUSE_DISTROS} sle:${SLE_DISTROS}"}"
 : "${PLATFORM:="x86"}"
+: "${BUILD_BASE:="${HOME}/build"}"
 
 # These parts are not user-serviceable.
 TMP_MOCK_CFG_DIR=""
@@ -164,7 +165,7 @@ set_vars() {
BUILD_NUMBER="${BUILD_NUMBER:-"0"}"
 
# setting paths
-   PROJECT_DIR="${HOME}/build/${COMPONENT}/${PROJECT}"
+   PROJECT_DIR="${BUILD_BASE}/${COMPONENT}/${PROJECT}"
PKGDIST="${HOME}/pkg-dist/${COMPONENT}/${PROJECT}"
 
# lock file
diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index b2a2db7..61e9f49 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -58,6 +58,7 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . 
"${HOME}/.buildscripts/${PRE
 : ${DEB_BUILD_FOR:="debian:${DEBIAN_DISTROS} ubuntu:${UBUNTU_DISTROS} 
raspbian:${RASPBIAN_DISTROS}"}
 : ${FLAVOR:="native"}
 : ${PLATFORM:="x86"}
+: "${BUILD_BASE:="${HOME}/build"}"
 
 # These parts are not user-serviceable.
 typeset -ag temp_cleanup=""
@@ -114,7 +115,7 @@ set_vars() {
BUILD_NUMBER="${BUILD_NUMBER:-"0"}"
 
# setting paths
-   PROJECT_DIR="${HOME}/build/${COMPONENT}/${PROJECT}"
+   PROJECT_DIR="${BUILD_BASE}/${COMPONENT}/${PROJECT}"
PKGDIST="${HOME}/pkg-dist/${COMPONENT}/${PROJECT}"
 
# lock file

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] 05/12: home/.dupload.conf.x2go: add new debian distro "trixie" (current testing.)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 0d591e8c343ec59c7a67cf622b5d3de0ad2b0659
Author: Mihai Moldovan 
Date:   Thu Mar 7 12:22:24 2024 +0100

home/.dupload.conf.x2go: add new debian distro "trixie" (current testing.)
---
 home/.dupload.conf.x2go | 8 
 1 file changed, 8 insertions(+)

diff --git a/home/.dupload.conf.x2go b/home/.dupload.conf.x2go
index d8f4926..95c4028 100644
--- a/home/.dupload.conf.x2go
+++ b/home/.dupload.conf.x2go
@@ -9,6 +9,14 @@ $cfg{"x2go-debian-sid"} = {
 queuedir => "/srv/sites/x2go.org/packages/debian/upload/sid",
 dinstall_runs => 1,
 };
+$cfg{"x2go-debian-trixie"} = {
+fqdn => "code.x2go.org",
+login => "x2go-admin",
+method => "scpb",
+incoming => "/srv/sites/x2go.org/packages/debian/incoming/trixie",
+queuedir => "/srv/sites/x2go.org/packages/debian/upload/trixie",
+dinstall_runs => 1,
+};
 $cfg{"x2go-debian-bookworm"} = {
 fqdn => "code.x2go.org",
 login => "x2go-admin",

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] 06/12: bin/sbuild-deb-package: add new SKIP_ARCH_ALL boolean option to forcefully skip building of "Architecture: all" packages.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit a6dbbbe5b0cae6c9f6d982da6641b2034c88ae92
Author: Mihai Moldovan 
Date:   Thu Mar 7 12:41:50 2024 +0100

bin/sbuild-deb-package: add new SKIP_ARCH_ALL boolean option to forcefully 
skip building of "Architecture: all" packages.
---
 bin/sbuild-deb-package | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index b9730c0..b2a2db7 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -54,6 +54,7 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . 
"${HOME}/.buildscripts/${PRE
 
 : ${NO_DELAY:="no"}
 : ${FORCE_BUILD:="no"}
+: "${SKIP_ARCH_ALL:='no'}"
 : ${DEB_BUILD_FOR:="debian:${DEBIAN_DISTROS} ubuntu:${UBUNTU_DISTROS} 
raspbian:${RASPBIAN_DISTROS}"}
 : ${FLAVOR:="native"}
 : ${PLATFORM:="x86"}
@@ -419,7 +420,7 @@ build_packages() {
dch --distribution "${codename}" 
--force-distribution -l 
"~git${DATE}.${GITREV}+${numerical_version}.${COMPONENT}." 
"Development-Snapshot!!! Auto-built ${pretty_dist} ${l_CODENAME} 
(${numerical_version}) package for ${REPOS_SERVER} repository (Git commit: 
${GIT_OBJECT_ID})."
fi
 
-   typeset -i skip_arch_all="0"
+   typeset -i skip_arch_all="${SKIP_ARCH_ALL}"
typeset -a arches
arches=()
case "${PLATFORM}" in
@@ -624,6 +625,7 @@ set_vars "${@}" && {
if [ "x$(basename "${0}")" = "x${PREFIX}-sbuild-deb-package" ] || [ 
"x$(basename "${0}")" = "x${PREFIX}-sbuild+upload-deb-package" ]; then
FORCE_BUILD="$(make_boolean "${FORCE_BUILD}")"
NO_DELAY="$(make_boolean "${NO_DELAY}")"
+   SKIP_ARCH_ALL="$(make_boolean "${SKIP_ARCH_ALL}")"
 
cd "${PROJECT_DIR}" && {
pkgneedsbuild "${CHECKOUT}" || [ "${FORCE_BUILD}" -eq 
"1" ]

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] 03/12: bin/sbuild-deb-package: add new debian distro "trixie" (current testing.)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 27eb34191b801f1efe9f2a97a27792a41f1ebe70
Author: Mihai Moldovan 
Date:   Thu Mar 7 12:20:36 2024 +0100

bin/sbuild-deb-package: add new debian distro "trixie" (current testing.)
---
 bin/sbuild-deb-package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index 87ee6bf..b9730c0 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -27,7 +27,7 @@ DEBEMAIL="firstname.lastn...@mydomain.org"
 DEBFULLNAME="Firstname Lastname"
 GPG_KEY=""
 DEB_DISTS_SUPPORTED="debian ubuntu raspbian"
-DEBIAN_DISTROS="lenny,squeeze,wheezy,jessie,stretch,buster,bullseye,bookworm,sid"
+DEBIAN_DISTROS="lenny,squeeze,wheezy,jessie,stretch,buster,bullseye,bookworm,trixie,sid"
 RASPBIAN_DISTROS="jessie,stretch,buster,bullseye"
 UBUNTU_DISTROS="lucid,precise,trusty,xenial,yakkety"
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] 04/12: home/.buildscripts/x2go.conf: add new debian distro "trixie" (current testing.)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit c607146cb4a39429777d4523ee20454e7c5aeec0
Author: Mihai Moldovan 
Date:   Thu Mar 7 12:21:32 2024 +0100

home/.buildscripts/x2go.conf: add new debian distro "trixie" (current 
testing.)
---
 home/.buildscripts/x2go.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf
index 0c4696b..77a68af 100644
--- a/home/.buildscripts/x2go.conf
+++ b/home/.buildscripts/x2go.conf
@@ -7,7 +7,7 @@ GIT_SSH_PORT="32032"
 DEBEMAIL="git-ad...@x2go.org"
 DEBFULLNAME="X2Go Git Administrator"
 DEB_DISTS_SUPPORTED="debian raspbian"
-: ${DEB_BUILD_FOR:="debian:jessie,stretch,buster,bullseye,bookworm,sid 
raspbian:jessie,stretch,buster,bullseye"}
+: ${DEB_BUILD_FOR:="debian:jessie,stretch,buster,bullseye,bookworm,trixie,sid 
raspbian:jessie,stretch,buster,bullseye"}
 
 # Shared for both RPM and DEB.
 GPG_KEY="F4A7678C9C6B0B2B"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] 01/12: bin/debian-codename-to-version.sh: use single quotes where appropriate.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 98ea823dcb3ea2cd3bf7fdd89ee93334bd662641
Author: Mihai Moldovan 
Date:   Thu Mar 7 12:16:22 2024 +0100

bin/debian-codename-to-version.sh: use single quotes where appropriate.

No functional changes.
---
 bin/debian-codename-to-version.sh | 40 +++
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/bin/debian-codename-to-version.sh 
b/bin/debian-codename-to-version.sh
index 3c502fd..d13169a 100755
--- a/bin/debian-codename-to-version.sh
+++ b/bin/debian-codename-to-version.sh
@@ -38,13 +38,13 @@ if [ -z "${BASH_VERSINFO[0]}" ] || [ "${BASH_VERSINFO[0]}" 
-lt 4 ]; then
codename="$(tr '[:upper:]' '[:lower:]' <<< "${codename}")"
 fi
 
-typeset -i ret="0"
+typeset -i ret='0'
 
 case "${codename}" in
# The first version number is actually "fake",
# but given it's a rolling release,
# we can't really do better here.
-   ("sid"|"unstable") echo "";;
+   ('sid'|'unstable') echo '';;
 
# FIXME: add "testing" - but how? It's not really
# a stable release on its own, but a rolling
@@ -66,26 +66,26 @@ case "${codename}" in
# For now and due to the aforementioned problems,
# I decided to not handle the "testing" code name
# at all.
-   ("bookworm") echo "12";;
+   ('bookworm') echo '12';;
 
-   ("bullseye") echo "11";;
-   ("buster") echo "10";;
-   ("stretch") echo "9";;
-   ("jessie") echo "8";;
-   ("wheezy") echo "7";;
-   ("squeeze") echo "6";;
-   ("lenny") echo "5";;
-   ("etch") echo "4";;
-   ("sarge") echo "3.1";;
-   ("woody") echo "3.0";;
-   ("potato") echo "2.2";;
-   ("slink") echo "2.1";;
-   ("hamm") echo "2.0";;
-   ("bo") echo "1.3";;
-   ("rex") echo "1.2";;
-   ("buzz") echo "1.1";;
+   ('bullseye') echo '11';;
+   ('buster') echo '10';;
+   ('stretch') echo '9';;
+   ('jessie') echo '8';;
+   ('wheezy') echo '7';;
+   ('squeeze') echo '6';;
+   ('lenny') echo '5';;
+   ('etch') echo '4';;
+   ('sarge') echo '3.1';;
+   ('woody') echo '3.0';;
+   ('potato') echo '2.2';;
+   ('slink') echo '2.1';;
+   ('hamm') echo '2.0';;
+   ('bo') echo '1.3';;
+   ('rex') echo '1.2';;
+   ('buzz') echo '1.1';;
 
-   (*) ret="1";;
+   (*) ret='1';;
 esac
 
 exit "${ret}"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] branch master updated (979e653 -> 773c5fb)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository buildscripts.

  from  979e653   bin/nsis-builder.bat: use UPX 4.0.2.
   new  98ea823   bin/debian-codename-to-version.sh: use single quotes 
where appropriate.
   new  e29565e   bin/debian-codename-to-version.sh: add trixie codename.
   new  27eb341   bin/sbuild-deb-package: add new debian distro "trixie" 
(current testing.)
   new  c607146   home/.buildscripts/x2go.conf: add new debian distro 
"trixie" (current testing.)
   new  0d591e8   home/.dupload.conf.x2go: add new debian distro "trixie" 
(current testing.)
   new  a6dbbbe   bin/sbuild-deb-package: add new SKIP_ARCH_ALL boolean 
option to forcefully skip building of "Architecture: all" packages.
   new  4027a45   bin/{build-rpm,sbuild-deb}-package: add new BUILD_BASE 
global option to select base building directory.
   new  bf23b21   bin/{build-rpm,sbuild-deb}-package: add new PKGDIST_BASE 
global option to select base pkg-dist directory.
   new  90bef9a   bin/{build-rpm,sbuild-deb}-package: add 'arm' as 
recognized value to PLATFORM variable.
   new  e9cad31   bin/sbuild-deb-package: also remove .buildinfo files 
(used for reproducible builds).
   new  546b8f4   bin/sbuild-deb-package: also support orig.tar.xz files.
   new  773c5fb   bin/{sbuild-deb,build-rpm}-package: add FIXME note 
stating that GitLab clones don't seem to have an "origin" remote.

The 12 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/build-rpm-package | 19 --
 bin/debian-codename-to-version.sh | 41 ---
 bin/sbuild-deb-package| 37 +--
 home/.buildscripts/x2go.conf  |  2 +-
 home/.dupload.conf.x2go   |  8 
 5 files changed, 78 insertions(+), 29 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [buildscripts] 02/12: bin/debian-codename-to-version.sh: add trixie codename.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit e29565e6e910a15922dca7abc225d00de667e3ef
Author: Mihai Moldovan 
Date:   Thu Mar 7 12:17:26 2024 +0100

bin/debian-codename-to-version.sh: add trixie codename.
---
 bin/debian-codename-to-version.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/debian-codename-to-version.sh 
b/bin/debian-codename-to-version.sh
index d13169a..c07e96e 100755
--- a/bin/debian-codename-to-version.sh
+++ b/bin/debian-codename-to-version.sh
@@ -66,8 +66,9 @@ case "${codename}" in
# For now and due to the aforementioned problems,
# I decided to not handle the "testing" code name
# at all.
-   ('bookworm') echo '12';;
+   ('trixie') echo '13';;
 
+   ('bookworm') echo '12';;
('bullseye') echo '11';;
('buster') echo '10';;
('stretch') echo '9';;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 01/02: debian/rules: fix typo: ibxcb-util0-dev => libxcb-util0-dev.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 3106359e8cf1f5640714919dc2e7441506bb1086
Author: Mihai Moldovan 
Date:   Thu Mar 7 10:34:42 2024 +0100

debian/rules: fix typo: ibxcb-util0-dev => libxcb-util0-dev.

Fixes builds on buster.
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 622c377..1b7272d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ x2gokdrive (0.0.0.3-0x2go1) UNRELEASED; urgency=medium
   tabs use WebSocket connections, this might not always work correctly.
   Since timers typically coalesce at one-minute intervals, a two-minutes
   timeout should be fine.
+  * debian/rules:
++ Fix typo: ibxcb-util0-dev => libxcb-util0-dev. Fixes builds on buster.
 
  -- X2Go Release Manager   Tue, 12 Sep 2023 22:28:20 +0200
 
diff --git a/debian/control b/debian/control
index 714a3d3..9f66ca1 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,7 @@ Build-Depends:
  libxcb-shape0-dev,
  libxcb-render0-dev,
  libxcb-render-util0-dev,
- libxcb-util-dev | ibxcb-util0-dev,
+ libxcb-util-dev | libxcb-util0-dev,
  libxcb-image0-dev,
  libxcb-icccm4-dev,
  libxcb-shm0-dev,

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] branch master updated (e7821d5 -> d819f0a)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gokdrive.

  from  e7821d5   Merge branch 'feature/web-timeout-2m' into 'master'
   new  3106359   debian/rules: fix typo: ibxcb-util0-dev => 
libxcb-util0-dev.
   new  d819f0a   Merge branch 'personal/Ionic/fix-buster' into 'master'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 2 ++
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 02/02: Merge branch 'personal/Ionic/fix-buster' into 'master'

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit d819f0a01213025c98406f8ab03bf319525b7199
Merge: e7821d5 3106359
Author: Mihai Moldovan 
Date:   Thu Mar 7 11:00:15 2024 +0100

Merge branch 'personal/Ionic/fix-buster' into 'master'

debian/rules: fix typo: ibxcb-util0-dev => libxcb-util0-dev.

Attributes GL MR !5: 
https://gitlab.x2go.org/x2go/server/drivers/x2gokdrive/-/merge_requests/5

 debian/changelog | 2 ++
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] branch master updated (053236b -> e7821d5)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gokdrive.

  from  053236b   Merge branch 'personal/sunweaver/xorg-server-21.1.10'
   new  77de1aa   debian/changelog: sync up with commit history.
   new  c31000f   x2gokdriveremote.{c,h}: use a client keepalive timeout of 
120 seconds for the web client, keep other clients on 30 seconds.
   new  e7821d5   Merge branch 'feature/web-timeout-2m' into 'master'

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   | 28 +++-
 x2gokdriveremote.c | 21 +
 x2gokdriveremote.h |  3 ++-
 3 files changed, 46 insertions(+), 6 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 01/03: debian/changelog: sync up with commit history.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 77de1aa2dbb7d7601496f80590e03fb8c56008bb
Author: Mihai Moldovan 
Date:   Thu Feb 29 22:32:31 2024 +0100

debian/changelog: sync up with commit history.
---
 debian/changelog | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ca99137..19a255e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,22 @@
 x2gokdrive (0.0.0.3-0x2go1) UNRELEASED; urgency=medium
 
-  * Continue development
+  [ Mike Gabriel ]
+  * New upstream version (0.0.0.3):
+- {patches.xorg/,x2gokdrive.spec}: Add semi-auto-detection of latest
+  available patchset and fallback to that if we don't have a patchset for
+  an exact xorg-server version.
+- patches.xorg/: add 21.1.10 subdirectory for current Debian
+  testing/unstable with rebased patch set.
+  * debian/Jenkinsfile:
++ Add file. Initiate CI builds.
+  * debian/control:
++ Prefer libgl-dev (new dev:pkg to use since bookworm) over
+  libgl1-mesa-dev.
++ Prefer libxcb-util-dev over ibxcb-util0-dev (not available in Debian
+  trixie anymore).
+  * debian/rules:
++ Add semi-auto-detection of latest available patchset and fallback to that
+  if we don't have a patchset for an exact xorg-server version.
 
  -- X2Go Release Manager   Tue, 12 Sep 2023 22:28:20 +0200
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 02/03: x2gokdriveremote.{c, h}: use a client keepalive timeout of 120 seconds for the web client, keep other clients on 30 seconds.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit c31000fc25d9d822ddd24731ab4c0fbe62b81a28
Author: Mihai Moldovan 
Date:   Thu Feb 29 23:32:19 2024 +0100

x2gokdriveremote.{c,h}: use a client keepalive timeout of 120 seconds for 
the web client, keep other clients on 30 seconds.

Web browsers throttle JavaScript timers of background tabs for energy
saving reasons.

Even though Chrome and Firefox refrain from aggressive throttling when
tabs use WebSocket connections, this might not always work correctly.

Since timers typically coalesce at one-minute intervals, a two-minutes
timeout should be fine.
---
 debian/changelog   | 10 ++
 x2gokdriveremote.c | 21 +
 x2gokdriveremote.h |  3 ++-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19a255e..622c377 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,16 @@ x2gokdrive (0.0.0.3-0x2go1) UNRELEASED; urgency=medium
 + Add semi-auto-detection of latest available patchset and fallback to that
   if we don't have a patchset for an exact xorg-server version.
 
+  [ Mihai Moldovan ]
+  * New upstream version (0.0.0.3):
+- x2gokdriveremote.{c,h}: use a client keepalive timeout of 120 seconds
+  for the web client, keep other clients on 30 seconds. Web browsers
+  throttle JavaScript timers of background tabs for energy saving reasons.
+  Even though Chrome and Firefox refrain from aggressive throttling when
+  tabs use WebSocket connections, this might not always work correctly.
+  Since timers typically coalesce at one-minute intervals, a two-minutes
+  timeout should be fine.
+
  -- X2Go Release Manager   Tue, 12 Sep 2023 22:28:20 +0200
 
 x2gokdrive (0.0.0.2-0x2go1) unstable; urgency=medium
diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c
index fdbf662..6f3934e 100644
--- a/x2gokdriveremote.c
+++ b/x2gokdriveremote.c
@@ -105,6 +105,18 @@ static struct _remoteHostVars remoteVars = {0};
 
 static BOOL remoteInitialized=FALSE;
 
+static
+CARD32 get_keepalive(const uint16_t os)
+{
+CARD32 ret = CLIENTALIVE_TIMEOUT_GENERIC;
+
+if (WEB == os)
+{
+ret = CLIENTALIVE_TIMEOUT_WEB;
+}
+
+return ret;
+}
 
 void remote_selection_init(void)
 {
@@ -2474,7 +2486,7 @@ BOOL remote_process_client_event ( char* buff , int 
length)
 remoteVars.last_client_keepalive_time=time(NULL);
 if(remoteVars.client_version>=3 && remoteVars.checkKeepAliveTimer)
 {
-
remoteVars.checkKeepAliveTimer=TimerSet(remoteVars.checkKeepAliveTimer,0,CLIENTALIVE_TIMEOUT,
 checkClientAlive, NULL);
+
remoteVars.checkKeepAliveTimer=TimerSet(remoteVars.checkKeepAliveTimer,0,get_keepalive
 (remoteVars.client_os), checkClientAlive, NULL);
 }
 
 pthread_mutex_unlock(_mutex);
@@ -2946,7 +2958,7 @@ void set_client_version(uint16_t ver, uint16_t os)
 {
 //start timer for checking if client alive
 pthread_mutex_lock(_mutex);
-remoteVars.checkKeepAliveTimer=TimerSet(0,0,CLIENTALIVE_TIMEOUT, 
checkClientAlive, NULL);
+remoteVars.checkKeepAliveTimer=TimerSet(0,0,get_keepalive 
(remoteVars.client_os), checkClientAlive, NULL);
 pthread_mutex_unlock(_mutex);
 }
 }
@@ -5266,17 +5278,18 @@ unsigned int
 checkClientAlive(OsTimerPtr timer, CARD32 time_card, void* args)
 {
 time_t time_diff;
+CARD32 timeout = get_keepalive(remoteVars.client_os);
 pthread_mutex_lock(_mutex);
 time_diff=time(NULL)-remoteVars.last_client_keepalive_time;
 pthread_mutex_unlock(_mutex);
 
-if(time_diff>=CLIENTALIVE_TIMEOUT/1000)
+if(time_diff>=timeout/1000)
 {
 EPHYR_DBG("no data from client since %d seconds, disconnecting...", 
(int)time_diff);
 disconnect_client();
 return 0;
 }
-return CLIENTALIVE_TIMEOUT;
+return timeout;
 }
 
 void
diff --git a/x2gokdriveremote.h b/x2gokdriveremote.h
index 0b9c57c..9d30690 100644
--- a/x2gokdriveremote.h
+++ b/x2gokdriveremote.h
@@ -114,7 +114,8 @@
 #define DEFAULT_PORT 15000
 
 #define ACCEPT_TIMEOUT 3 //msec
-#define CLIENTALIVE_TIMEOUT 3 //msec
+#define CLIENTALIVE_TIMEOUT_GENERIC 3 //msec
+#define CLIENTALIVE_TIMEOUT_WEB 12 //msec
 #define SERVERALIVE_TIMEOUT 10 //sec
 
 //if true, will save compressed jpg in file

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 03/03: Merge branch 'feature/web-timeout-2m' into 'master'

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit e7821d52847454294e4712bc2173f08dbe10b27d
Merge: 053236b c31000f
Author: Mihai Moldovan 
Date:   Fri Mar 1 23:54:43 2024 +0100

Merge branch 'feature/web-timeout-2m' into 'master'

Attributes GL MR !4: 
https://gitlab.x2go.org/x2go/server/drivers/x2gokdrive/-/merge_requests/4

 debian/changelog   | 28 +++-
 x2gokdriveremote.c | 21 +
 x2gokdriveremote.h |  3 ++-
 3 files changed, 46 insertions(+), 6 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [python-x2go] 01/02: x2go/{backends/control/plain, sshproxy}.py: Don't let look_for_keys override specified private key. The specified private key should win.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 2ec9567f7dac9fa0edc02f36efcc4a701acaf52f
Author: nounce 
Date:   Mon Jan 8 21:37:26 2024 +0100

x2go/{backends/control/plain,sshproxy}.py: Don't let look_for_keys override 
specified private key. The specified private key should win.
---
 x2go/backends/control/plain.py | 6 +++---
 x2go/sshproxy.py   | 7 +++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py
index 955b8d1..8cc0aef 100644
--- a/x2go/backends/control/plain.py
+++ b/x2go/backends/control/plain.py
@@ -938,9 +938,9 @@ class X2GoControlSession(paramiko.SSHClient):
 if forward_sshagent is None:
 forward_sshagent = self.forward_sshagent
 
-if look_for_keys:
-key_filename = None
-pkey = None
+# Do not look for keys if there is one supplied already
+if key_filename or pkey:
+look_for_keys = False
 
 _twofactorauth = False
 if password and (passphrase is None) and not force_password_auth: 
passphrase = password
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index e7dc230..0b6d283 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
@@ -208,10 +208,9 @@ class X2GoSSHProxy(paramiko.SSHClient, threading.Thread):
 self.local_host = self.local_host.strip()
 self.remote_host = self.remote_host.strip()
 
-# do not use explicitly given keys if look_for_keys has got activated
-if look_for_keys:
-key_filename = None
-pkey = None
+# Do not look for keys if there is one supplied already
+if key_filename or pkey:
+look_for_keys = False
 
 if key_filename and "~" in key_filename:
 key_filename = os.path.expanduser(key_filename)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/python-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [python-x2go] branch master updated (fcc304a -> 74adacb)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository python-x2go.

  from  fcc304a   Merge branch 'personal/sunweaver/end-of-distutils' into 
'master'
   new  2ec9567   x2go/{backends/control/plain,sshproxy}.py: Don't let 
look_for_keys override specified private key. The specified private key should 
win.
   new  74adacb   Merge branch 
'personal/sunweaver/specified-key-wins-over-lookforkeys' into 'master'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 x2go/backends/control/plain.py | 6 +++---
 x2go/sshproxy.py   | 7 +++
 2 files changed, 6 insertions(+), 7 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/python-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [python-x2go] 02/02: Merge branch 'personal/sunweaver/specified-key-wins-over-lookforkeys' into 'master'

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 74adacbe66b8e459fc5a1e44467dc7682d93bf86
Merge: fcc304a 2ec9567
Author: Mike Gabriel 
Date:   Thu Feb 29 12:45:38 2024 +

Merge branch 'personal/sunweaver/specified-key-wins-over-lookforkeys' into 
'master'

x2go/{backends/control/plain,sshproxy}.py: Don't let look_for_keys 
override...

See merge request x2go/client/libs/python-x2go!5

 x2go/backends/control/plain.py | 6 +++---
 x2go/sshproxy.py   | 7 +++
 2 files changed, 6 insertions(+), 7 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/python-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gobroker] 05/06: debian/x2gobroker-ssh-mini.insall: pick files as installed by Makefile.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 2bf84a400acea8506d8e412a8629e67731f71105
Author: Mihai Moldovan 
Date:   Wed Feb 28 05:36:33 2024 +0100

debian/x2gobroker-ssh-mini.insall: pick files as installed by Makefile.
---
 debian/changelog   | 2 ++
 debian/x2gobroker-ssh-mini.install | 6 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 685375d..cf63589 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ x2gobroker (0.0.4.4-0x2go1) UNRELEASED; urgency=medium
 - Makefile: install x2gobroker-ssh-mini files.
   * debian/x2gobroker-ssh-mini.{dirs,manpages}:
 + Drop.
+  * debian/x2gobroker-ssh-mini.insall:
++ Pick files as installed by Makefile.
 
  -- Mike Gabriel   Mon, 15 Nov 2021 15:33:29 +0100
 
diff --git a/debian/x2gobroker-ssh-mini.install 
b/debian/x2gobroker-ssh-mini.install
index b78c47f..e9fb017 100644
--- a/debian/x2gobroker-ssh-mini.install
+++ b/debian/x2gobroker-ssh-mini.install
@@ -1 +1,5 @@
-mini/x2gobroker-ssh-mini usr/bin/
+usr/bin/x2gobroker-ssh-mini
+etc/x2go/x2gobroker-ssh-mini/users
+etc/x2go/x2gobroker-ssh-mini/groups
+usr/share/x2gobroker-ssh-mini/default.session
+usr/share/man/man8/x2gobroker-ssh-mini*

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gobroker.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gobroker] 03/06: Makefile: install x2gobroker-ssh-mini files.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit eba790f024eaf7fe3c1e6da8d1a7490f62cee0a5
Author: Mihai Moldovan 
Date:   Wed Feb 28 05:33:08 2024 +0100

Makefile: install x2gobroker-ssh-mini files.
---
 Makefile | 14 ++
 debian/changelog |  4 
 2 files changed, 18 insertions(+)

diff --git a/Makefile b/Makefile
index b736f31..af19e53 100755
--- a/Makefile
+++ b/Makefile
@@ -201,3 +201,17 @@ install:
"${DESTDIR}${BINDIR}/"
${INSTALL_PROGRAM} sbin/x2gobroker-keygen sbin/x2gobroker-testagent \
"${DESTDIR}${SBINDIR}/"
+
+   # x2gobroker-ssh-mini
+   mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \
+   "${DESTDIR}${ETCDIR}/x2gobroker-ssh-mini" \
+   "${DESTDIR}${DATADIR}/x2gobroker-ssh-mini" \
+   "${DESTDIR}${MANDIR}/man8"
+   ${INSTALL_FILE} mini/x2gobroker-ssh-mini.8 \
+   "${DESTDIR}${MANDIR}/man8"
+   $(GZIP) "${DESTDIR}${MANDIR}/man8/"*.8
+   ${INSTALL_PROGRAM} mini/x2gobroker-ssh-mini \
+   "${DESTDIR}${BINDIR}/"
+   $(INSTALL_DIR) "${DESTDIR}${ETCDIR}/x2gobroker-ssh-mini/"{users,groups}
+   $(INSTALL_FILE) mini/default.session \
+   "${DESTDIR}${DATADIR}/x2gobroker-ssh-mini/default.session"
diff --git a/debian/changelog b/debian/changelog
index d942ffd..1250887 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ x2gobroker (0.0.4.4-0x2go1) UNRELEASED; urgency=medium
 - mini/: Complete x2gobroker-ssh-mini implementation and provide it as DEB
   package.
 
+  [ Mihai Moldovan ]
+  * New upstream version (0.0.4.4):
+- Makefile: install x2gobroker-ssh-mini files.
+
  -- Mike Gabriel   Mon, 15 Nov 2021 15:33:29 +0100
 
 x2gobroker (0.0.4.3-0x2go1) unstable; urgency=medium

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gobroker.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gobroker] 06/06: Merge branch 'personal/sunweaver/x2gobrokersshmini' into 'master'

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit a3fd2e7a68f656578ef74eefd97bb19b0cca6203
Merge: 8f07704 2bf84a4
Author: Mike Gabriel 
Date:   Thu Feb 29 12:43:50 2024 +

Merge branch 'personal/sunweaver/x2gobrokersshmini' into 'master'

mini/: Complete x2gobroker-ssh-mini implementation and provide it as DEB 
package.

See merge request x2go/broker/x2gobroker!4

 COPYING.GPL-2+ | 339 +
 Makefile   |  14 +
 debian/changelog   |  14 +-
 debian/control |  23 ++
 debian/copyright   |   4 +
 debian/x2gobroker-ssh-mini.docs|   1 +
 debian/x2gobroker-ssh-mini.install |   5 +
 debian/x2gobroker-ssh-mini.postinst|  43 +++
 debian/x2gobroker-ssh-mini.postrm  |  36 +++
 debian/x2gobroker-ssh-mini.prerm   |  39 +++
 mini/README.md |  31 ++
 mini/default.session   |  25 ++
 .../x2gobroker-ssh-mini|  44 +--
 mini/x2gobroker-ssh-mini.8 | 103 +++
 14 files changed, 697 insertions(+), 24 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gobroker.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gobroker] 01/06: mini/: Complete x2gobroker-ssh-mini implementation and provide it as DEB package.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 9926360628ce222b3a4e634d07511c99f0515985
Author: Mike Gabriel 
Date:   Mon Jan 22 22:21:15 2024 +0100

mini/: Complete x2gobroker-ssh-mini implementation and provide it as DEB 
package.
---
 COPYING.GPL-2+ | 339 +
 debian/changelog   |   2 +
 debian/control |  23 ++
 debian/copyright   |   4 +
 debian/x2gobroker-ssh-mini.dirs|   2 +
 debian/x2gobroker-ssh-mini.docs|   1 +
 debian/x2gobroker-ssh-mini.install |   1 +
 debian/x2gobroker-ssh-mini.manpages|   1 +
 debian/x2gobroker-ssh-mini.postinst|  43 +++
 debian/x2gobroker-ssh-mini.postrm  |  36 +++
 debian/x2gobroker-ssh-mini.prerm   |  39 +++
 mini/README.md |  31 ++
 mini/default.session   |  25 ++
 .../x2gobroker-ssh-mini|  44 +--
 mini/x2gobroker-ssh-mini.8 | 103 +++
 15 files changed, 672 insertions(+), 22 deletions(-)

diff --git a/COPYING.GPL-2+ b/COPYING.GPL-2+
new file mode 100644
index 000..d159169
--- /dev/null
+++ b/COPYING.GPL-2+
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications 

[X2Go-Commits] [x2gobroker] 04/06: debian/x2gobroker-ssh-mini.{dirs, manpages}: drop.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit c51b26135cc9ea668b1013935f102efa3aab5a92
Author: Mihai Moldovan 
Date:   Wed Feb 28 05:34:41 2024 +0100

debian/x2gobroker-ssh-mini.{dirs,manpages}: drop.
---
 debian/changelog| 2 ++
 debian/x2gobroker-ssh-mini.dirs | 2 --
 debian/x2gobroker-ssh-mini.manpages | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1250887..685375d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ x2gobroker (0.0.4.4-0x2go1) UNRELEASED; urgency=medium
   [ Mihai Moldovan ]
   * New upstream version (0.0.4.4):
 - Makefile: install x2gobroker-ssh-mini files.
+  * debian/x2gobroker-ssh-mini.{dirs,manpages}:
++ Drop.
 
  -- Mike Gabriel   Mon, 15 Nov 2021 15:33:29 +0100
 
diff --git a/debian/x2gobroker-ssh-mini.dirs b/debian/x2gobroker-ssh-mini.dirs
deleted file mode 100644
index 11e5dd8..000
--- a/debian/x2gobroker-ssh-mini.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/x2go/x2gobroker-ssh-mini/users/
-etc/x2go/x2gobroker-ssh-mini/groups/
diff --git a/debian/x2gobroker-ssh-mini.manpages 
b/debian/x2gobroker-ssh-mini.manpages
deleted file mode 100644
index d635f98..000
--- a/debian/x2gobroker-ssh-mini.manpages
+++ /dev/null
@@ -1 +0,0 @@
-mini/x2gobroker-ssh-mini.8

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gobroker.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gobroker] branch master updated (8f07704 -> a3fd2e7)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gobroker.

  from  8f07704   etc/x2gobroker.conf: White-space fix at EOF.
   new  9926360   mini/: Complete x2gobroker-ssh-mini implementation and 
provide it as DEB package.
   new  9d80b38   debian/changelog: fixup.
   new  eba790f   Makefile: install x2gobroker-ssh-mini files.
   new  c51b261   debian/x2gobroker-ssh-mini.{dirs,manpages}: drop.
   new  2bf84a4   debian/x2gobroker-ssh-mini.insall: pick files as 
installed by Makefile.
   new  a3fd2e7   Merge branch 'personal/sunweaver/x2gobrokersshmini' into 
'master'

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 COPYING.GPL-2+ | 339 +
 Makefile   |  14 +
 debian/changelog   |  14 +-
 debian/control |  23 ++
 debian/copyright   |   4 +
 debian/x2gobroker-ssh-mini.docs|   1 +
 debian/x2gobroker-ssh-mini.install |   5 +
 ...roker.postinst => x2gobroker-ssh-mini.postinst} |  24 +-
 ...2gobroker.postrm => x2gobroker-ssh-mini.postrm} |  27 +-
 ...obroker-ssh.prerm => x2gobroker-ssh-mini.prerm} |  31 +-
 mini/README.md |  31 ++
 mini/default.session   |  25 ++
 .../x2gobroker-ssh-mini|  44 +--
 mini/x2gobroker-ssh-mini.8 | 103 +++
 14 files changed, 632 insertions(+), 53 deletions(-)
 create mode 100644 COPYING.GPL-2+
 create mode 100644 debian/x2gobroker-ssh-mini.docs
 create mode 100644 debian/x2gobroker-ssh-mini.install
 copy debian/{python3-x2gobroker.postinst => x2gobroker-ssh-mini.postinst} (57%)
 copy debian/{python3-x2gobroker.postrm => x2gobroker-ssh-mini.postrm} (59%)
 copy debian/{x2gobroker-ssh.prerm => x2gobroker-ssh-mini.prerm} (58%)
 create mode 100644 mini/README.md
 create mode 100644 mini/default.session
 rename contrib/x2go-mini-sshbroker => mini/x2gobroker-ssh-mini (83%)
 create mode 100644 mini/x2gobroker-ssh-mini.8

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gobroker.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gobroker] 02/06: debian/changelog: fixup.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 9d80b38be6ab283bcb041e0c790c0b7738bf2764
Author: Mihai Moldovan 
Date:   Wed Feb 28 05:39:51 2024 +0100

debian/changelog: fixup.
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0735ff0..d942ffd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,8 @@ x2gobroker (0.0.4.4-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (0.0.4.4):
 - man/man1/x2gobroker.1: Fix apostrophe usage (drop preceding backslash).
 - setup.py: Don't run setup.py with use_2to3 anymore.
-- x2gobroker/defaults.py: Gracefully handle API documentation builds during
-  offline builds.
+- x2gobroker/defaults.py: Gracefully handle API documentation builds
+  during offline builds.
 - mini/: Complete x2gobroker-ssh-mini implementation and provide it as DEB
   package.
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gobroker.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 02/02: Merge branch 'personal/sunweaver/xorg-server-21.1.10'

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 053236bfcccd1e34d8bff48321a7a85d55a75093
Merge: 4029ef0 0b99423
Author: Mihai Moldovan 
Date:   Fri Feb 23 10:17:10 2024 +0100

Merge branch 'personal/sunweaver/xorg-server-21.1.10'

Attributes GL MR !3: 
https://gitlab.x2go.org/x2go/server/drivers/x2gokdrive/-/merge_requests/3

 patches.xorg/21.1.10/quilt.env |   1 +
 patches.xorg/21.1.10/series|   2 +
 .../21.1.10/xorg-server-configure-ac.patch | 115 +
 .../xorg-server-hw-kdrive-Makefile-am.patch|  25 +
 patches.xorg/latest-available  |   2 +-
 5 files changed, 144 insertions(+), 1 deletion(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 01/02: patches.xorg/: add 21.1.10 subdirectory for current Debian testing/unstable with rebased patch set.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 0b99423ed01cb309b02b0cea63f4668994e9c7cc
Author: Mike Gabriel 
Date:   Sat Jan 6 19:51:13 2024 +

patches.xorg/: add 21.1.10 subdirectory for current Debian testing/unstable 
with rebased patch set.
---
 patches.xorg/21.1.10/quilt.env |   1 +
 patches.xorg/21.1.10/series|   2 +
 .../21.1.10/xorg-server-configure-ac.patch | 115 +
 .../xorg-server-hw-kdrive-Makefile-am.patch|  25 +
 patches.xorg/latest-available  |   2 +-
 5 files changed, 144 insertions(+), 1 deletion(-)

diff --git a/patches.xorg/21.1.10/quilt.env b/patches.xorg/21.1.10/quilt.env
new file mode 12
index 000..543e930
--- /dev/null
+++ b/patches.xorg/21.1.10/quilt.env
@@ -0,0 +1 @@
+../common/quilt.env
\ No newline at end of file
diff --git a/patches.xorg/21.1.10/series b/patches.xorg/21.1.10/series
new file mode 100644
index 000..6a74a24
--- /dev/null
+++ b/patches.xorg/21.1.10/series
@@ -0,0 +1,2 @@
+xorg-server-configure-ac.patch
+xorg-server-hw-kdrive-Makefile-am.patch
diff --git a/patches.xorg/21.1.10/xorg-server-configure-ac.patch 
b/patches.xorg/21.1.10/xorg-server-configure-ac.patch
new file mode 100644
index 000..713eb02
--- /dev/null
+++ b/patches.xorg/21.1.10/xorg-server-configure-ac.patch
@@ -0,0 +1,115 @@
+Index: xorg-server/configure.ac
+===
+--- xorg-server.orig/configure.ac
 xorg-server/configure.ac
+@@ -31,7 +31,7 @@ RELEASE_DATE="2023-12-13"
+ RELEASE_NAME="Caramel Ice Cream"
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_INIT_AUTOMAKE([foreign dist-xz])
++AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects])
+ AC_USE_SYSTEM_EXTENSIONS
+ 
+ # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in 
XORG_DEFAULT_OPTIONS
+@@ -589,6 +589,7 @@ AC_ARG_ENABLE(xf86-input-inputtest, AS_H
+ dnl kdrive and its subsystems
+ AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive 
servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
+ AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the 
kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
++AC_ARG_ENABLE(x2gokdrive, AS_HELP_STRING([--enable-x2gokdrive], [Build 
the kdrive x2gokdrive server (default: auto)]), [X2GOKDRIVE=$enableval], 
[X2GOKDRIVE=auto])
+ dnl kdrive options
+ AC_ARG_ENABLE(libunwind,  AS_HELP_STRING([--enable-libunwind], [Use 
libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], 
[LIBUNWIND="auto"])
+ AC_ARG_ENABLE(xshmfence,  AS_HELP_STRING([--disable-xshmfence], [Disable 
xshmfence (default: auto)]), [XSHMFENCE="$enableval"], [XSHMFENCE="auto"])
+@@ -1771,6 +1772,8 @@ if test "x$XORG" = xauto; then
+ fi
+ AC_MSG_RESULT([$XORG])
+ 
++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg 
version])
++
+ if test "x$XORG" = xyes; then
+   PKG_CHECK_MODULES([LIBXCVT], $LIBXCVT)
+ 
+@@ -1979,7 +1982,6 @@ if test "x$XORG" = xyes; then
+   AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+   AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
+   AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
+-  AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current 
Xorg version])
+   AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
+   AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+   AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+@@ -2198,9 +2200,15 @@ dnl kdrive DDX
+ XEPHYR_LIBS=
+ XEPHYR_INCS=
+ 
++X2GOKDRIVE_LIBS=
++X2GOKDRIVE_INCS=
++
+ AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes])
+ 
+ if test "$KDRIVE" = yes; then
++
++### XEPHYR
++
+ XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil 
xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms xcb-randr xcb-xkb"
+ if test "x$XV" = xyes; then
+ XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv"
+@@ -2240,6 +2248,43 @@ if test "$KDRIVE" = yes; then
+ 
+ AC_SUBST([XEPHYR_LIBS])
+ AC_SUBST([XEPHYR_INCS])
++
++### X2GOKDRIVE
++
++X2GOKDRIVE_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render 
xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms 
xcb-randr xcb-xkb xcb-xfixes zlib libjpeg libpng"
++if test "x$DRI" = xyes && test "x$GLX" = xyes; then
++X2GOKDRIVE_REQUIRED_LIBS="$X2GOKDRIVE_REQUIRED_LIBS $LIBDRM xcb-glx 
xcb-xf86dri > 1.6"
++fi
++
++if test "x$X2GOKDRIVE" = xauto; then
++PKG_CHECK_MODULES(X2GOKDRIVE, $X2GOKDRIVE_REQUIRED_LIBS, 
[X2GOKDRIVE="yes"], [X2GOKDRIVE="no"])
++elif test "x$X2GOKDRIVE" = xyes ; then
++PKG_CHECK_MODULES(X2GOKDRIVE, $X2GOKDRIVE_REQUIRED_LIBS)
++fi
++
++# X2GOKDRIVE needs nanosleep() which is in librt on Solaris
++

[X2Go-Commits] [x2gokdrive] branch master updated (4029ef0 -> 053236b)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gokdrive.

  from  4029ef0   Merge branch 'personal/sunweaver/auto-patch-xorg' into 
'master'
   new  0b99423   patches.xorg/: add 21.1.10 subdirectory for current 
Debian testing/unstable with rebased patch set.
   new  053236b   Merge branch 'personal/sunweaver/xorg-server-21.1.10'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 patches.xorg/{1.18.4 => 21.1.10}/quilt.env   |  0
 patches.xorg/{1.18.4 => 21.1.10}/series  |  0
 .../xorg-server-configure-ac.patch   | 20 ++--
 .../xorg-server-hw-kdrive-Makefile-am.patch  |  0
 patches.xorg/latest-available|  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
 copy patches.xorg/{1.18.4 => 21.1.10}/quilt.env (100%)
 copy patches.xorg/{1.18.4 => 21.1.10}/series (100%)
 copy patches.xorg/{21.1.8 => 21.1.10}/xorg-server-configure-ac.patch (91%)
 copy patches.xorg/{21.1.7 => 21.1.10}/xorg-server-hw-kdrive-Makefile-am.patch 
(100%)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 04/05: {patches.xorg/, debian/rules, x2gokdrive.spec}: Add semi-auto-detection of latest available patchset and fallback to that if we don't have a patchset for an exact xo

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 5b1d0e193933ede9292aa364d6b06b7da641a71a
Author: Mike Gabriel 
Date:   Sat Jan 6 20:56:07 2024 +

{patches.xorg/,debian/rules,x2gokdrive.spec}: Add semi-auto-detection of 
latest available patchset and fallback to that if we don't have a patchset for 
an exact xorg-server version.
---
 debian/rules  | 16 +++-
 patches.xorg/latest-available |  1 +
 x2gokdrive.spec   | 27 ---
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/debian/rules b/debian/rules
index 5dd4903..0dbd016 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,11 +33,17 @@ override_dh_auto_configure:
rm .pc -Rfv; \

QUILT_PATCHES="../../patches.xorg/$${XORG_UPSTREAM_VERSION}/" quilt push -a; \
else \
-   ( \
-   set +x; \
-   printf 
'\n##\nERROR: This X2Go KDrive 
version does not support\nbuilding against X.Org version 
%s.\n##\n' 
"$${XORG_UPSTREAM_VERSION}"; \
-   exit '1'; \
-   ); \
+   QUILT_PATCHES='../../patches.xorg/latest-available/' 
quilt pop -a; \
+   rm -Rfv '.pc'; \
+   QUILT_PATCHES='../../patches.xorg/latest-available/' 
quilt push -a; \
+   QUILT_EXITCODE="$${?}"; \
+   if [ '0' != "$${QUILT_EXITCODE}" ]; then \
+   ( \
+   set +x; \
+   printf 
'\n##\nERROR: This X2Go KDrive 
version does not support\nbuilding against X.Org version 
%s.\n##\n' 
"$${XORG_UPSTREAM_VERSION}"; \
+   exit '1'; \
+   ); \
+   fi; \
fi
 
# run autoreconf
diff --git a/patches.xorg/latest-available b/patches.xorg/latest-available
new file mode 12
index 000..3f47ea1
--- /dev/null
+++ b/patches.xorg/latest-available
@@ -0,0 +1 @@
+21.1.8
\ No newline at end of file
diff --git a/x2gokdrive.spec b/x2gokdrive.spec
index 71d14e9..e0af9d8 100644
--- a/x2gokdrive.spec
+++ b/x2gokdrive.spec
@@ -274,18 +274,23 @@ export XORG_UPSTREAM_VERSION="$(grep 'AC_INIT' 
'BUILD/configure.ac' | sed -r 's/
 pushd 'BUILD'
 if [ -d "../patches.xorg/${XORG_UPSTREAM_VERSION}" ]; then
   QUILT_PATCHES="../patches.xorg/${XORG_UPSTREAM_VERSION}/" quilt push -a
-  if [ -d "../patches.xorg/${XORG_UPSTREAM_VERSION}/missing" ]; then
-# Hack used to install missing files.
-# This is actually working around problems in the upstream
-# xorg-server-source packages, which will have to be reported upstream.
-cp -av "../patches.xorg/${XORG_UPSTREAM_VERSION}/missing/"* 'BUILD/'
-  fi
 else
-  (
-set +x
-printf '\n##\nERROR: This 
X2Go KDrive version does not support\nbuilding against X.Org version 
%s.\n##\n' 
"${XORG_UPSTREAM_VERSION}"
-exit '1'
-  )
+  QUILT_PATCHES='../patches.xorg/latest-available/' quilt push -a
+  QUILT_EXITCODE="${?}"
+  if [ '0' != "${QUILT_EXITCODE}" ]; then
+(
+  set +x
+  printf '\n##\nERROR: 
This X2Go KDrive version does not support\nbuilding against X.Org version 
%s.\n##\n' 
"${XORG_UPSTREAM_VERSION}"
+  exit '1'
+)
+  fi
+  XORG_UPSTREAM_VERSION='latest-available'
+fi
+if [ -d "../patches.xorg/${XORG_UPSTREAM_VERSION}/missing" ]; then
+  # Hack used to install missing files.
+  # This is actually working around problems in the upstream
+  # xorg-server-source packages, which will have to be reported upstream.
+  cp -av "../patches.xorg/${XORG_UPSTREAM_VERSION}/missing/"* 'BUILD/'
 fi
 
 %build

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 05/05: Merge branch 'personal/sunweaver/auto-patch-xorg' into 'master'

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 4029ef063131bf716026a0cda1f306e2df54ce5f
Merge: d0cc69c 5b1d0e1
Author: Mike Gabriel 
Date:   Fri Feb 23 08:30:53 2024 +

Merge branch 'personal/sunweaver/auto-patch-xorg' into 'master'

patches.xorg: semi-auto-detect latest available xorg-server patchset and 
use it as fallback (plus: debian/Jenkinsfile: Add file. Initiate CI builds).

See merge request x2go/server/drivers/x2gokdrive!2

 debian/Jenkinsfile|  6 ++
 debian/control|  4 ++--
 debian/rules  | 16 +++-
 patches.xorg/latest-available |  1 +
 x2gokdrive.spec   | 27 ---
 5 files changed, 36 insertions(+), 18 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 03/05: debian/control: Prefer libxcb-util-dev over ibxcb-util0-dev (not available in Debian trixie anymore).

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 5c222e8dc8669b1d108eb85ef5c1834d350a1eb7
Author: Mike Gabriel 
Date:   Sat Jan 6 19:50:28 2024 +

debian/control: Prefer libxcb-util-dev over ibxcb-util0-dev (not available 
in Debian trixie anymore).
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 76d344b..714a3d3 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,7 @@ Build-Depends:
  libxcb-shape0-dev,
  libxcb-render0-dev,
  libxcb-render-util0-dev,
- libxcb-util0-dev,
+ libxcb-util-dev | ibxcb-util0-dev,
  libxcb-image0-dev,
  libxcb-icccm4-dev,
  libxcb-shm0-dev,

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 02/05: debian/control: Prefer libgl-dev (new dev:pkg to use since bookworm) over libgl1-mesa-dev.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 799f78739db1073ecc1b1b3482eca81a8dd5c89a
Author: Mike Gabriel 
Date:   Sat Jan 6 19:49:35 2024 +

debian/control: Prefer libgl-dev (new dev:pkg to use since bookworm) over 
libgl1-mesa-dev.
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index d779490..76d344b 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,7 @@ Build-Depends:
  libselinux1-dev (>= 2.0.80) [linux-any],
  libaudit-dev [linux-any],
  libpam-dev,
- libgl1-mesa-dev (>= 9.2),
+ libgl-dev | libgl1-mesa-dev (>= 9.2),
  libunwind-dev [amd64 arm64 armel armhf hppa i386 ia64 mips64 mips64el mipsel 
powerpc powerpcspe ppc64 ppc64el sh4],
  libxcvt-dev | sl,
  libxmuu-dev (>= 1:0.99.1),

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] 01/05: debian/Jenkinsfile: Add file. Initiate CI builds.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit e061196a5e61c757bdc6d81c15f3e686c18b89d5
Author: Mike Gabriel 
Date:   Thu Jan 4 12:50:19 2024 +0100

debian/Jenkinsfile: Add file. Initiate CI builds.
---
 debian/Jenkinsfile | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/Jenkinsfile b/debian/Jenkinsfile
new file mode 100644
index 000..f946141
--- /dev/null
+++ b/debian/Jenkinsfile
@@ -0,0 +1,6 @@
+@Library('jenkins-ci-tools') _
+buildDebianPackage(
+/* isArchIndependent */ false,
+/* ignoredArchs */ [],
+/* isHeavyPackage */ true
+)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gokdrive] branch master updated (d0cc69c -> 4029ef0)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gokdrive.

  from  d0cc69c   Continue development
   new  e061196   debian/Jenkinsfile: Add file. Initiate CI builds.
   new  799f787   debian/control: Prefer libgl-dev (new dev:pkg to use 
since bookworm) over libgl1-mesa-dev.
   new  5c222e8   debian/control: Prefer libxcb-util-dev over 
ibxcb-util0-dev (not available in Debian trixie anymore).
   new  5b1d0e1   {patches.xorg/,debian/rules,x2gokdrive.spec}: Add 
semi-auto-detection of latest available patchset and fallback to that if we 
don't have a patchset for an exact xorg-server version.
   new  4029ef0   Merge branch 'personal/sunweaver/auto-patch-xorg' into 
'master'

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/Jenkinsfile|  6 ++
 debian/control|  4 ++--
 debian/rules  | 16 +++-
 patches.xorg/latest-available |  1 +
 x2gokdrive.spec   | 27 ---
 5 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 debian/Jenkinsfile
 create mode 12 patches.xorg/latest-available

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gokdrive.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 01/01: fixed tcedebug commandline parameter

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/openbox-magic-pixel-workaround-bullseye
in repository live-build-x2go.

commit 51bb1567eb34ae3d634d2727f368c8e5335312a2
Author: Stefan Baur (BAUR-ITCS) 
Date:   Fri Feb 9 16:29:51 2024 +0100

fixed tcedebug commandline parameter
---
 .../includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient | 11 ++-
 .../lib/live/config/2900-x2go-thinclientconfig|  1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient 
b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
index e22b47e..857c15b 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
+++ b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
@@ -100,4 +100,13 @@ if [ -n "$THROTTLEVALUES" ]; then
fi
 fi
 
-eval $THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu 
--maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export 
$LDAPPARAMS $SESSIONFROM $BACKGROUND $BRANDING $STARTSESSION
+# this is for additional debug logging
+if grep -q ' tcedebug' /proc/cmdline; then
+   while ! [ -f /var/log/x2goclient ] ; do
+   echo "'$0' is waiting for the creation of the 
'/var/log/x2goclient' file."
+   sleep 2
+   done
+   DEBUGPARAMS='--debug 2>&1 | tee /var/log/x2goclient >/dev/tty9'
+fi
+
+eval $THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu 
--maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export 
$LDAPPARAMS $SESSIONFROM $BACKGROUND $BRANDING $STARTSESSION $DEBUGPARAMS
diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig 
b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
index 87860ee..15061a9 100755
--- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
@@ -23,7 +23,6 @@ sed -i -e '/ToggleMaximize/d' /etc/xdg/openbox/rc.xml
 if grep -q ' tcedebug' /proc/cmdline; then
touch /var/log/x2goclient
chmod 666 /var/log/x2goclient
-   DEBUGPARAMS='--debug 2>&1 | tee /var/log/x2goclient >/dev/tty9'
 fi
 
 # This is needed for File Sharing support (USB media and the like)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] branch heuler/openbox-magic-pixel-workaround-bullseye updated (a715859 -> 51bb156)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch heuler/openbox-magic-pixel-workaround-bullseye
in repository live-build-x2go.

  from  a715859   this will now properly terminate all backgrounded child 
processes when X11 dies
   new  51bb156   fixed tcedebug commandline parameter

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient | 11 ++-
 .../lib/live/config/2900-x2go-thinclientconfig|  1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] branch heuler/openbox-magic-pixel-workaround-bookworm updated (c782921 -> e33acf6)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch heuler/openbox-magic-pixel-workaround-bookworm
in repository live-build-x2go.

  from  c782921   removed bashism as we are forced to use dash in bookworm
   new  e33acf6   fixed tcedebug commandline parameter

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient | 11 ++-
 .../lib/live/config/2900-x2go-thinclientconfig|  1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 01/01: fixed tcedebug commandline parameter

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/openbox-magic-pixel-workaround-bookworm
in repository live-build-x2go.

commit e33acf689b21484b010e1a32f1aab497afe5
Author: Stefan Baur (BAUR-ITCS) 
Date:   Fri Feb 9 16:29:51 2024 +0100

fixed tcedebug commandline parameter
---
 .../includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient | 11 ++-
 .../lib/live/config/2900-x2go-thinclientconfig|  1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient 
b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
index ae3f681..43f6fa4 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
+++ b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
@@ -108,4 +108,13 @@ if [ -n "$THROTTLEVALUES" ]; then
fi
 fi
 
-eval $THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu 
--maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export 
$LDAPPARAMS $SESSIONFROM $BACKGROUND $BRANDING $STARTSESSION
+# this is for additional debug logging
+if grep -q ' tcedebug' /proc/cmdline; then
+   while ! [ -f /var/log/x2goclient ] ; do
+   echo "'$0' is waiting for the creation of the 
'/var/log/x2goclient' file."
+   sleep 2
+   done
+   DEBUGPARAMS='--debug 2>&1 | tee /var/log/x2goclient >/dev/tty9'
+fi
+
+eval $THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu 
--maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export 
$LDAPPARAMS $SESSIONFROM $BACKGROUND $BRANDING $STARTSESSION $DEBUGPARAMS
diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig 
b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
index 87860ee..15061a9 100755
--- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
@@ -23,7 +23,6 @@ sed -i -e '/ToggleMaximize/d' /etc/xdg/openbox/rc.xml
 if grep -q ' tcedebug' /proc/cmdline; then
touch /var/log/x2goclient
chmod 666 /var/log/x2goclient
-   DEBUGPARAMS='--debug 2>&1 | tee /var/log/x2goclient >/dev/tty9'
 fi
 
 # This is needed for File Sharing support (USB media and the like)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gothinclient] branch master updated (b02bc95 -> deadf94)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gothinclient.

  from  b02bc95   Merge branch 'stefanbaur-master-patch-59776' into 'master'
   new  b026324   
management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home - Make 
this file check for the presence of a sessions file before continuing (a NO-OP 
on X2Go-TCE-NFS, but required on X2Go-TCE-Live, where it would create a race 
condition). Also, do not create a Desktop or Autostart link for X2GoClient if 
there is no sessions file (the lack of which makes a locked-down, read-only 
X2GoClient like the one that is the default in Minidesktop unusable)
   new  deadf94   Merge branch 'feature/support-live-build-and-nfs' into 
'master'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../010_x2gothinclient-fresh-home  | 35 +-
 1 file changed, 28 insertions(+), 7 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gothinclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gothinclient] 01/02: management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home - Make this file check for the presence of a sessions file before continuing (a NO-OP on

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit b0263244b371ceaa0c4a899f0d4c966d8d178f43
Author: Stefan Baur 
Date:   Mon Jan 29 19:39:52 2024 +

management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home - 
Make this file check for the presence of a sessions file before continuing (a 
NO-OP on X2Go-TCE-NFS, but required on X2Go-TCE-Live, where it would create a 
race condition). Also, do not create a Desktop or Autostart link for X2GoClient 
if there is no sessions file (the lack of which makes a locked-down, read-only 
X2GoClient like the one that is the default in Minidesktop unusable)
---
 .../010_x2gothinclient-fresh-home  | 35 +-
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git 
a/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home 
b/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home
index fd12e7b..349e38e 100755
--- a/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home
+++ b/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home
@@ -1,9 +1,10 @@
 #!/bin/bash
 
-# Copyright (C) 2010-2019 by X2Go project, https://wiki.x2go.org
+# Copyright (C) 2010-2024 by X2Go project, https://wiki.x2go.org
 #   Oleksandr Shneyder 
 #   Moritz 'Morty' Struebe 
 #   Mike Gabriel 
+#   Stefan Baur 
 
 # X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,9 +24,33 @@
 if [ -z "$X2GO_HANDLE_DAEMONS" ]; then
mkdir -p ~x2gothinclient
mkdir -p ~x2gothinclient/.x2goclient
+
+   # if the /etc/x2go/x2gothinclient_sessions download is still in progress
+   # (/etc/x2go/x2gothinclient_sessions_old exists, but no 
/etc/x2go/x2gothinclient_sessions exists yet),
+   # print a timestamped "in progress" notification to the debug log 
console window on /dev/tty8
+   # and wait one second, then check again (else we would trigger a race 
condition as to who gets to write the config file first)
+   # note that this will not in any way affect TCE-NFS or any TCE where 
/etc/x2go/x2gothinclient_sessions is a static file (i.e.
+   # where it has been included in the squashfs filesystem), because no 
file /etc/x2go/x2gothinclient_sessions_old SHOULD exist there.
+   # if this is a problem, we could consider moving *_old to 
/var/tmp/x2go/ instead, but that would make it harder to find.
+   while [ -e /etc/x2go/x2gothinclient_sessions_old ] && ! [ -e 
/etc/x2go/x2gothinclient_sessions ] ; do
+   echo -en "\n\$(date +'%F | %T | ') waiting for session config 
data download to finish ..." | tee -a /dev/tty8
+   sleep 1
+   done
+
+   # if/once /etc/x2go/x2gothinclient_sessions exists, copy it over
if [ -e /etc/x2go/x2gothinclient_sessions ]; then
-cp /etc/x2go/x2gothinclient_sessions 
~x2gothinclient/.x2goclient/sessions
+   cp /etc/x2go/x2gothinclient_sessions 
~x2gothinclient/.x2goclient/sessions
+
+   # if there's no sessions file, it does not make sense to add 
this link to the Desktop, so check that first,
+   # and only then check if the desktop file exists in autostart
+   if [ -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop 
]; then
+   mkdir -p ~x2gothinclient/Desktop
+   cp 
/etc/xdg/autostart/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/
+   # newer MATE versions require *.desktop files to be 
executable, else there will be a warning/confirmation popup
+   chmod 700 
~x2gothinclient/Desktop/x2gothinclient-minidesktop.desktop
+   fi
fi
+
if [ -e /etc/x2go/freerdp/known_hosts ]; then
mkdir -p ~x2gothinclient/.freerdp
cp /etc/x2go/freerdp/known_hosts 
~x2gothinclient/.freerdp/known_hosts
@@ -34,11 +59,7 @@ if [ -z "$X2GO_HANDLE_DAEMONS" ]; then
mkdir -p ~x2gothinclient/.config/freerdp
cp /etc/x2go/freerdp/known_hosts2 
~x2gothinclient/.config/freerdp/known_hosts2
fi
-   if [ -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ]; then
-   mkdir -p ~x2gothinclient/Desktop
-   cp /etc/xdg/autostart/x2gothinclient-minidesktop.desktop 
~x2gothinclient/Desktop/
-   chmod 0700 
~x2gothinclient/Desktop/x2gothinclient-minidesktop.desktop
-   fi
+
mkdir -p ~x2gothinclient/.kde
mkdir -p ~x2gothinclient/.kde/socket-`hostname`
mkdir -p ~x2gothinclient/mounts

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gothinclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org

[X2Go-Commits] [x2gothinclient] 02/02: Merge branch 'feature/support-live-build-and-nfs' into 'master'

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit deadf94379456b6272a9bcb1859989fff003287c
Merge: b02bc95 b026324
Author: Mike Gabriel 
Date:   Wed Jan 31 16:30:36 2024 +

Merge branch 'feature/support-live-build-and-nfs' into 'master'

Make this file check for the presence of a sessions file before continuing 
(a...

See merge request x2go/x2gothinclient!2

 .../010_x2gothinclient-fresh-home  | 35 +-
 1 file changed, 28 insertions(+), 7 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gothinclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gothinclient] 02/02: Merge branch 'stefanbaur-master-patch-59776' into 'master'

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit b02bc9525f63d152c4c5d4d0983b6934e88d2716
Merge: 505811b 0de6d29
Author: Mike Gabriel 
Date:   Wed Jan 31 07:31:56 2024 +

Merge branch 'stefanbaur-master-patch-59776' into 'master'

management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home - 
typofix

See merge request x2go/x2gothinclient!3

 .../share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gothinclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gothinclient] 01/02: management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home - typofix as discussed with @sunweaver

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit 0de6d29469b56c06e5612caeb65dad01bb6b7b2c
Author: Stefan Baur 
Date:   Tue Jan 30 14:08:22 2024 +

management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home - 
typofix as discussed with @sunweaver
---
 .../share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home 
b/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home
index 2417a24..fd12e7b 100755
--- a/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home
+++ b/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home
@@ -20,7 +20,7 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-if [ -z "$X2GO_HANDLE_DAEMON" ]; then
+if [ -z "$X2GO_HANDLE_DAEMONS" ]; then
mkdir -p ~x2gothinclient
mkdir -p ~x2gothinclient/.x2goclient
if [ -e /etc/x2go/x2gothinclient_sessions ]; then

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gothinclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gothinclient] branch master updated (505811b -> b02bc95)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gothinclient.

  from  505811b   Merge branch 'stefanbaur-master-patch-96260' into 'master'
   new  0de6d29   
management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home - 
typofix as discussed with @sunweaver
   new  b02bc95   Merge branch 'stefanbaur-master-patch-59776' into 'master'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gothinclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gothinclient] 01/02: management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home - typofix as discussed with @sunweaver

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit ca4ffad110d7e1394742d556b97638ddb4c8ba52
Author: Stefan Baur 
Date:   Tue Jan 30 14:10:24 2024 +

management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home - 
typofix as discussed with @sunweaver
---
 management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home 
b/management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home
index ebf08b1..c6cedca 100755
--- a/management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home
+++ b/management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home
@@ -20,7 +20,7 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-if [ -z "$X2GO_HANDLE_DAEMON" ]; then
+if [ -z "$X2GO_HANDLE_DAEMONS" ]; then
if [ -d ~x2gothinclient ]; then
find ~x2gothinclient -mindepth 1 -type f | egrep -v 
"(\.Xauthority|.dmrc)" | while read file; do
rm -vf "$file"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gothinclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gothinclient] 02/02: Merge branch 'stefanbaur-master-patch-96260' into 'master'

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit 505811b177c5c9696ce0c998f14c35ad0cd43c9f
Merge: 3e7d750 ca4ffad
Author: Mike Gabriel 
Date:   Wed Jan 31 06:56:45 2024 +

Merge branch 'stefanbaur-master-patch-96260' into 'master'

management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home - 
typofix

See merge request x2go/x2gothinclient!4

 management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gothinclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gothinclient] branch master updated (3e7d750 -> 505811b)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gothinclient.

  from  3e7d750   Merge branch 'personal/sunweaver/add-Jenkinsfile' into 
'master'
   new  ca4ffad   
management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home - 
typofix as discussed with @sunweaver
   new  505811b   Merge branch 'stefanbaur-master-patch-96260' into 'master'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2gothinclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] branch stable/openbox-magic-pixel-workaround-bullseye created (now a715859)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch stable/openbox-magic-pixel-workaround-bullseye
in repository live-build-x2go.

at  a715859   this will now properly terminate all backgrounded child 
processes when X11 dies

No new revisions were added by this update.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] branch stable/openbox-magic-pixel-workaround-bookworm created (now c782921)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch stable/openbox-magic-pixel-workaround-bookworm
in repository live-build-x2go.

at  c782921   removed bashism as we are forced to use dash in bookworm

No new revisions were added by this update.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] branch heuler/openbox-magic-pixel-workaround-bullseye created (now a715859)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch heuler/openbox-magic-pixel-workaround-bullseye
in repository live-build-x2go.

at  a715859   this will now properly terminate all backgrounded child 
processes when X11 dies

This branch includes the following new commits:

   new  a715859   this will now properly terminate all backgrounded child 
processes when X11 dies

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 01/01: this will now properly terminate all backgrounded child processes when X11 dies

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/openbox-magic-pixel-workaround-bullseye
in repository live-build-x2go.

commit a715859dbaf6a1917bfae946a1be98319f2bb7e3
Author: Stefan Baur (BAUR-ITCS) 
Date:   Tue Jan 23 21:45:04 2024 +0100

this will now properly terminate all backgrounded child processes when X11 
dies
---
 .../includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround   | 4 
 1 file changed, 4 insertions(+)

diff --git 
a/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround 
b/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround
index 863b3fe..b52ef40 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround
@@ -6,6 +6,8 @@ if grep 'nomagicpixel=2' /proc/cmdline ; then
done ;
echo -en "\n$(date +'%F | %T | ')'$0' spawning window 
foreground monitor (magic-pixel-fix 2)." | tee -a /dev/tty8
xdotool search --class X2GoAgent behave %@ blur windowmap || 
xdotool search --class NXAgent behave %@ blur windowmap
+   # exit if X11 is no longer running, else sleep for a bit
+   ps -C Xorg || exit 0
done &
 elif grep 'nomagicpixel=1' /proc/cmdline ; then
echo -en "\n$(date +'%F | %T | ')'$0' spawning openbox monitor 
(magic-pixel-fix 1)." | tee -a /dev/tty8
@@ -18,6 +20,8 @@ elif grep 'nomagicpixel=1' /proc/cmdline ; then
killall openbox
echo -en "\n$(date +'%F | %T | ')'$0' killed OpenBox." 
| tee -a /dev/tty8
done
+   # exit if X11 is no longer running, else sleep for a bit
+   ps -C Xorg || exit 0
sleep 1 # to save cpu cycles
done &
 else

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 08/08: removed bashism as we are forced to use dash in bookworm

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/openbox-magic-pixel-workaround-bookworm
in repository live-build-x2go.

commit c782921429a5afd62c8757f6c198816221de4323
Author: Stefan Baur (BAUR-ITCS) 
Date:   Sun Jan 28 14:48:53 2024 +0100

removed bashism as we are forced to use dash in bookworm
---
 config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground 
b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground
index cfdab6a..156b801 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground
@@ -7,7 +7,7 @@ if [ -n "$XROOT" ] ; then
 
#input validation
# allowed values for POSITION: center fill max scale tile; default: max
-   case "${XROOTMODE,,}" in # force lowercase
+   case "$(echo $XROOTMODE | tr '[:upper:]' '[:lower:]')" in # force 
lowercase
"center") POSITION=center ;;
"fill") POSITION=fill ;;
"scale") POSITION=scale ;;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 05/08: typofix

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/openbox-magic-pixel-workaround-bookworm
in repository live-build-x2go.

commit a8bf07ca014b2b7cd2949a3e95db4256ff5c6b71
Author: Stefan Baur (BAUR-ITCS) 
Date:   Tue Jan 23 14:10:26 2024 +0100

typofix
---
 config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient 
b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
index c410940..ae3f681 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
+++ b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
@@ -99,7 +99,7 @@ if [ -n "$THROTTLEVALUES" ]; then
if [ -n "$THROTTLEARR4" ] ; then
THROTTLELENGTH="-l $THROTTLEARR4"  # default 20
fi
-   if [ -n "${THROTTLEARR5" ] ; then
+   if [ -n "$THROTTLEARR5" ] ; then
THROTTLELATENCY="-L $THROTTLEARR5" # default 0
fi
# only set THROTTLINGCOMMAND if at least one value was detected and 
sanitized properly

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 04/08: de-array-ified, as we are forced to use dash instead of bash

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/openbox-magic-pixel-workaround-bookworm
in repository live-build-x2go.

commit e8c8708d18869405371cf105eb33314a454dfff6
Author: Stefan Baur (BAUR-ITCS) 
Date:   Tue Jan 23 14:05:01 2024 +0100

de-array-ified, as we are forced to use dash instead of bash
---
 .../etc/X11/Xsession.d/61x11-start-x2goclient  | 38 +-
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient 
b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
index e22b47e..c410940 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
+++ b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
@@ -72,27 +72,35 @@ if [ -n "$THROTTLEVALUES" ]; then
MAXSPEEDMBIT=$(grep -l "up" /sys/class/net/*/operstate | xargs -n1 
dirname | xargs -n 1 -I XXX cat XXX/speed 2>/dev/null | sort -n -u | tail -1 | 
tr -dc '0-9.')
MAXSPEEDKBYTE=$((MAXSPEEDMBIT*128)) #Megabit * 1024 / 8 -> KiloByte
 
-   THROTTLEARR=($(echo $THROTTLEVALUES | awk -F ':' '$1 ~/^[0-9\.u]*$/ && 
$2 ~/^[0-9\.u]*$/ && $3 ~/^[0-9\.u]*$/ && $4 ~/^[0-9\.u]*$/ && $4 
~/^[0-9\.u]*$/ { print $1 " " $2 " " $3 " " $4 " " $5}'))
-   if [ -n "${THROTTLEARR[0]}" ] && [ "${THROTTLEARR[0]}" != "u" ]; then
-   THROTTLEDOWN="-d ${THROTTLEARR[0]}"# default 10, never used
-   elif [ "${THROTTLEARR[0]}" = "u" ]; then
+   THROTTLEARR=$(echo $THROTTLEVALUES | awk -F ':' '$1 ~/^[0-9\.u]*$/ && 
$2 ~/^[0-9\.u]*$/ && $3 ~/^[0-9\.u]*$/ && $4 ~/^[0-9\.u]*$/ && $4 
~/^[0-9\.u]*$/ { print $1 " " $2 " " $3 " " $4 " " $5}')
+
+   THROTTLEARR1=$(echo $THROTTLEARR | cut -d ' ' -f 1)
+   THROTTLEARR2=$(echo $THROTTLEARR | cut -d ' ' -f 2)
+   THROTTLEARR3=$(echo $THROTTLEARR | cut -d ' ' -f 3)
+   THROTTLEARR4=$(echo $THROTTLEARR | cut -d ' ' -f 4)
+   THROTTLEARR5=$(echo $THROTTLEARR | cut -d ' ' -f 5)
+
+
+   if [ -n "$THROTTLEARR1" ] && [ "$THROTTLEARR1" != "u" ]; then
+   THROTTLEDOWN="-d $THROTTLEARR1"# default 10, never used
+   elif [ "$THROTTLEARR1" = "u" ]; then
THROTTLEDOWN="-d $MAXSPEEDKBYTE"
fi
-   if [ -n "${THROTTLEARR[1]}" ] && [ "${THROTTLEARR[1]}" != "u" ]; then
-   THROTTLEUP="-u ${THROTTLEARR[1]}"  # default 10, never used
-   elif [ "${THROTTLEARR[1]}" = "u" ]; then
+   if [ -n "$THROTTLEARR2" ] && [ "$THROTTLEARR2" != "u" ]; then
+   THROTTLEUP="-u $THROTTLEARR2"  # default 10, never used
+   elif [ "$THROTTLEARR2" = "u" ]; then
THROTTLEUP="-d $MAXSPEEDKBYTE"
-   elif [ -z "${THROTTLEARR[1]}" ] ; then
-   THROTTLEUP="-d ${THROTTLEARR[0]}"  # set up=down if only 1 
param
+   elif [ -z "$THROTTLEARR2" ] ; then
+   THROTTLEUP="-d $THROTTLEARR1"  # set up=down if only 1 param
fi
-   if [ -n "${THROTTLEARR[2]}" ] ; then
-   THROTTLETIME="-t ${THROTTLEARR[2]}"# default 3.0
+   if [ -n "$THROTTLEARR3" ] ; then
+   THROTTLETIME="-t $THROTTLEARR3"# default 3.0
fi
-   if [ -n "${THROTTLEARR[3]}" ] ; then
-   THROTTLELENGTH="-l ${THROTTLEARR[3]}"  # default 20
+   if [ -n "$THROTTLEARR4" ] ; then
+   THROTTLELENGTH="-l $THROTTLEARR4"  # default 20
fi
-   if [ -n "${THROTTLEARR[4]}" ] ; then
-   THROTTLELATENCY="-L ${THROTTLEARR[4]}" # default 0
+   if [ -n "${THROTTLEARR5" ] ; then
+   THROTTLELATENCY="-L $THROTTLEARR5" # default 0
fi
# only set THROTTLINGCOMMAND if at least one value was detected and 
sanitized properly
if [ -n "$THROTTLEUP" ] || [ -n "$THROTTLEDOWN" ] || [ -n 
"$THROTTLETIME" ] || [ -n "$THROTTLELENGTH" ] || [ -n "$THROTTLELATENCY" ]; then

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 02/08: changed bullseye to bookworm

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/openbox-magic-pixel-workaround-bookworm
in repository live-build-x2go.

commit ab6f71134545d2d5972962e5ab1b734134d7304c
Author: Stefan Baur (BAUR-ITCS) 
Date:   Mon Jan 15 16:00:19 2024 +0100

changed bullseye to bookworm
---
 config/archives/x2go.list.chroot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/archives/x2go.list.chroot b/config/archives/x2go.list.chroot
index 3779184..b18a16a 100644
--- a/config/archives/x2go.list.chroot
+++ b/config/archives/x2go.list.chroot
@@ -1 +1 @@
-deb http://packages.x2go.org/debian bullseye main
+deb http://packages.x2go.org/debian bookworm main

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 01/08: changed fuse to fuse3

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/openbox-magic-pixel-workaround-bookworm
in repository live-build-x2go.

commit 3a9e8baa313b7502a5315d29960fd0c97679352c
Author: Stefan Baur (BAUR-ITCS) 
Date:   Mon Jan 15 15:29:54 2024 +0100

changed fuse to fuse3
---
 config/package-lists/fuseext.list.chroot | 2 +-
 config/package-lists/live.list.chroot| 2 +-
 config/package-lists/ntfs.list.chroot| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/package-lists/fuseext.list.chroot 
b/config/package-lists/fuseext.list.chroot
index 2011124..3ccacf9 100644
--- a/config/package-lists/fuseext.list.chroot
+++ b/config/package-lists/fuseext.list.chroot
@@ -1,3 +1,3 @@
-fuse
+fuse3
 fuseext2
 libfuse2
diff --git a/config/package-lists/live.list.chroot 
b/config/package-lists/live.list.chroot
index 3c8d189..230dd6a 100644
--- a/config/package-lists/live.list.chroot
+++ b/config/package-lists/live.list.chroot
@@ -1,7 +1,7 @@
 cifs-utils
 console-setup
 console-setup-linux
-fuse
+fuse3
 gpg
 initramfs-tools
 kbd
diff --git a/config/package-lists/ntfs.list.chroot 
b/config/package-lists/ntfs.list.chroot
index da18f0e..b5516d5 100644
--- a/config/package-lists/ntfs.list.chroot
+++ b/config/package-lists/ntfs.list.chroot
@@ -1,4 +1,4 @@
-fuse
+fuse3
 libfuse2
 libgcrypt20
 #libgnutls-deb0-28

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 07/08: make sure kdrive sessions always end up in fullscreen mode unless it's a minidesktop

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/openbox-magic-pixel-workaround-bookworm
in repository live-build-x2go.

commit 648724606c833692aecc87ef8bf7c54f648122ab
Author: Stefan Baur (BAUR-ITCS) 
Date:   Tue Jan 23 21:46:30 2024 +0100

make sure kdrive sessions always end up in fullscreen mode unless it's a 
minidesktop
---
 .../etc/X11/Xsession.d/60x11-kdrive-enforce-fullscreen | 18 ++
 1 file changed, 18 insertions(+)

diff --git 
a/config/includes.chroot/etc/X11/Xsession.d/60x11-kdrive-enforce-fullscreen 
b/config/includes.chroot/etc/X11/Xsession.d/60x11-kdrive-enforce-fullscreen
new file mode 100644
index 000..f41813f
--- /dev/null
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-kdrive-enforce-fullscreen
@@ -0,0 +1,18 @@
+# In Minidesktops, Users might actually want to run an X2Go-KDrive session 
that doesn't span the entire screen
+if ! [ -f "/etc/x2go/x2gothinclient-minidesktop_start" ] ; then
+   (
+   while true ; do
+   if ps -C x2gokdriveclient --no-header >/dev/null; then
+   # whenever x2gokdriveclient loads, make sure it 
is forced into fullscreen
+   xdotool search --onlyvisible --classname 
--maxdepth 1 x2gokdriveclient behave %@ focus windowsize $(xdotool 
getdisplaygeometry) &
+   TOOLPID=$!
+   xdotool search --onlyvisible --classname 
--maxdepth 1 x2gokdriveclient behave %@ blur windowsize $(xdotool 
getdisplaygeometry)
+   kill $TOOLPID
+   else
+   # exit if X11 is no longer running, else sleep 
for a bit
+   ps -C Xorg || exit 0
+   sleep 1
+   fi
+   done
+   ) &
+fi

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 06/08: this will now properly terminate all backgrounded child processes when X11 dies

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/openbox-magic-pixel-workaround-bookworm
in repository live-build-x2go.

commit d5c76d0d470826b451f8cc82d9012e528a21d9f0
Author: Stefan Baur (BAUR-ITCS) 
Date:   Tue Jan 23 21:45:04 2024 +0100

this will now properly terminate all backgrounded child processes when X11 
dies
---
 .../includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround   | 4 
 1 file changed, 4 insertions(+)

diff --git 
a/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround 
b/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround
index 863b3fe..b52ef40 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround
@@ -6,6 +6,8 @@ if grep 'nomagicpixel=2' /proc/cmdline ; then
done ;
echo -en "\n$(date +'%F | %T | ')'$0' spawning window 
foreground monitor (magic-pixel-fix 2)." | tee -a /dev/tty8
xdotool search --class X2GoAgent behave %@ blur windowmap || 
xdotool search --class NXAgent behave %@ blur windowmap
+   # exit if X11 is no longer running, else sleep for a bit
+   ps -C Xorg || exit 0
done &
 elif grep 'nomagicpixel=1' /proc/cmdline ; then
echo -en "\n$(date +'%F | %T | ')'$0' spawning openbox monitor 
(magic-pixel-fix 1)." | tee -a /dev/tty8
@@ -18,6 +20,8 @@ elif grep 'nomagicpixel=1' /proc/cmdline ; then
killall openbox
echo -en "\n$(date +'%F | %T | ')'$0' killed OpenBox." 
| tee -a /dev/tty8
done
+   # exit if X11 is no longer running, else sleep for a bit
+   ps -C Xorg || exit 0
sleep 1 # to save cpu cycles
done &
 else

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 03/08: de-array-ified, as we are forced to use dash instead of bash

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/openbox-magic-pixel-workaround-bookworm
in repository live-build-x2go.

commit 765935dcdabc23450d08d7ea1c2cbcb41ae2f9d7
Author: Stefan Baur (BAUR-ITCS) 
Date:   Tue Jan 23 13:54:32 2024 +0100

de-array-ified, as we are forced to use dash instead of bash
---
 .../etc/X11/Xsession.d/60x11-blanking-dpms-config | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config 
b/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config
index 4aad736..e80df32 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config
@@ -2,8 +2,11 @@
 
 BLANKINGTIME=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' 
-e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '$1 == "blank" { print 
$2 }' | tr -dc '0-9:')
 if [ -n "$BLANKINGTIME" ]; then
-DPMSARR=($(echo $BLANKINGTIME | awk -F ':' '$1 ~/^[0-9]*$/ && $2 
~/^[0-9]*$/ && $3 ~/^[0-9]*$/  { print $1 " " $2 " " $3}'))
-if [ ${DPMSARR[0]} -eq 0 ]; then
+DPMSARR=$(echo $BLANKINGTIME | awk -F ':' '$1 ~/^[0-9]*$/ && $2 
~/^[0-9]*$/ && $3 ~/^[0-9]*$/  { print $1 " " $2 " " $3}')
+   DPMSARR1=$(echo $DPMSARR | cut -d ' ' -f 1)
+   DPMSARR2=$(echo $DPMSARR | cut -d ' ' -f 2)
+   DPMSARR3=$(echo $DPMSARR | cut -d ' ' -f 3)
+if [ $DPMSARR1 -eq 0 ]; then
 # Disable screensaver and DPMS Power Saving if requested
 xset s off
 if grep -q '\W*nodpms\W*' /proc/cmdline; then
@@ -11,10 +14,10 @@ if [ -n "$BLANKINGTIME" ]; then
 fi
 else
 xset s on
-xset s ${DPMSARR[0]}
+xset s $DPMSARR1
 if ! grep -q '\W*nodpms\W*' /proc/cmdline; then
 # Yes, "+dpms dpms" is intentional.
-xset +dpms dpms ${DPMSARR[0]} ${DPMSARR[1]} 
${DPMSARR[2]}
+xset +dpms dpms $DPMSARR1 $DPMSARR2 $DPMSARR3
 fi
 fi
 fi

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] branch heuler/openbox-magic-pixel-workaround-bookworm created (now c782921)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch heuler/openbox-magic-pixel-workaround-bookworm
in repository live-build-x2go.

at  c782921   removed bashism as we are forced to use dash in bookworm

This branch includes the following new commits:

   new  3a9e8ba   changed fuse to fuse3
   new  ab6f711   changed bullseye to bookworm
   new  765935d   de-array-ified, as we are forced to use dash instead of 
bash
   new  e8c8708   de-array-ified, as we are forced to use dash instead of 
bash
   new  a8bf07c   typofix
   new  d5c76d0   this will now properly terminate all backgrounded child 
processes when X11 dies
   new  6487246   make sure kdrive sessions always end up in fullscreen 
mode unless it's a minidesktop
   new  c782921   removed bashism as we are forced to use dash in bookworm

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 01/02: added backgrounded task to grab X2GoClient on Startup and move it to the right

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bullseye
in repository live-build-x2go.

commit cebafd618899082dc13a79db24f3c338b65f1f99
Author: Stefan Baur (BAUR-ITCS) 
Date:   Fri Jan 26 15:38:40 2024 +0100

added backgrounded task to grab X2GoClient on Startup and move it to the
right
---
 .../999_x2gothinclient-align-right | 36 ++
 1 file changed, 36 insertions(+)

diff --git 
a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right
 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right
new file mode 100644
index 000..9b240c8
--- /dev/null
+++ 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right
@@ -0,0 +1,36 @@
+#!/bin/bash
+# move X2GoClient window to right screen border and resize - but only
+# when in minidesktop mode
+if [ -z "$X2GO_HANDLE_DAEMON" ] ; then
+   # we need to background this so it doesn't block the startup
+   (
+   # we have at least two matching window ids:
+   # actual client window and taskbar icon
+   # so let's wait until we have them both
+   X2GOCLIENTWINDOWIDS=""
+   while [ $(echo -e "$X2GOCLIENTWINDOWIDS" | wc -l) -lt 2 ] ; do
+   X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible 
--name X2GoClient)
+   done
+   
+   # now wait until there is only one window id left that's 
visible and
+   # which matches our expected window name
+   while [ $(echo -e "$X2GOCLIENTWINDOWIDS" | wc -l) -gt 1 ] ; do
+   X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible 
--name X2GoClient)
+   done
+   
+   # while there SHOULD be only one ID left by now ...
+   # let's handle this in a safe manner - as a list
+   for WINDOW in $X2GOCLIENTWINDOWIDS; do
+   # the id belonging to the taskbar icon cannot be 
activated
+   # xdotool does not return a non-zero error code when 
windowactivate
+   # fails, so we need to check for the presence of an 
error message
+   if xdotool windowactivate $WINDOW 2>/dev/null; then
+   # if we succeeded in activating the window,
+   # it's the actual client window
+   sleep 0.5s
+   xdotool windowsize $WINDOW 30% 100% # resize it
+   xdotool windowmove $WINDOW 70% 0 # move it to 
the right
+   fi
+   done
+   ) &
+fi

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 02/02: only run kill command if there's actually a process id to kill

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bullseye
in repository live-build-x2go.

commit 39fa6e1b37c39465c5859badc7d280c3deb7f6be
Author: Stefan Baur (BAUR-ITCS) 
Date:   Fri Jun 19 21:01:54 2020 +

only run kill command if there's actually a process id to kill
---
 config/includes.chroot/etc/network/if-up.d/0100-show-sysconf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf 
b/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf
index 14ac8a4..92b4664 100755
--- a/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf
+++ b/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf
@@ -48,5 +48,5 @@ fi
[ -n "$TIMESTAMP" ] && echo "- Build Version: $TIMESTAMP 
($HUMANTIMESTAMP)" | tee -a /etc/motd >> /etc/issue
 
# make sure all unused VTs show the new /etc/issue
-   ps -C getty --no-header | awk '{ print $1 }' | xargs -n 1 kill -1
+   ps -C getty --no-header | awk '{ print $1 }' | xargs -n 1 
--no-run-if-empty kill -1
 ) &

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] branch heuler/mate-minidesktop-bullseye created (now 39fa6e1)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch heuler/mate-minidesktop-bullseye
in repository live-build-x2go.

at  39fa6e1   only run kill command if there's actually a process id to 
kill

This branch includes the following new commits:

   new  cebafd6   added backgrounded task to grab X2GoClient on Startup and 
move it to the right
   new  39fa6e1   only run kill command if there's actually a process id to 
kill

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 13/14: only run kill command if there's actually a process id to kill

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bookworm
in repository live-build-x2go.

commit 0987d995ce13e145b69e0e622b33d02c7a13e092
Author: Stefan Baur (BAUR-ITCS) 
Date:   Fri Jun 19 21:01:54 2020 +

only run kill command if there's actually a process id to kill
---
 config/includes.chroot/etc/network/if-up.d/0100-show-sysconf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf 
b/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf
index 14ac8a4..92b4664 100755
--- a/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf
+++ b/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf
@@ -48,5 +48,5 @@ fi
[ -n "$TIMESTAMP" ] && echo "- Build Version: $TIMESTAMP 
($HUMANTIMESTAMP)" | tee -a /etc/motd >> /etc/issue
 
# make sure all unused VTs show the new /etc/issue
-   ps -C getty --no-header | awk '{ print $1 }' | xargs -n 1 kill -1
+   ps -C getty --no-header | awk '{ print $1 }' | xargs -n 1 
--no-run-if-empty kill -1
 ) &

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 11/14: sanitize input

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bookworm
in repository live-build-x2go.

commit b5438d7dc8b0ee0a665e1c6352d5cc087a13ca00
Author: Stefan Baur (BAUR-ITCS) 
Date:   Fri Jan 26 19:20:16 2024 +0100

sanitize input
---
 .../etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right| 5 +
 1 file changed, 5 insertions(+)

diff --git 
a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right
 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right
index 7e4b460..960f9a5 100755
--- 
a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right
+++ 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right
@@ -3,6 +3,11 @@
 
 WINDOWWIDTH=$(cat /proc/cmdline | tr ' ' '\n' | awk -F'=' '"windowwidth"==$1 
{print $2}' | tr -dc '0-9')
 
+# sanitize input
+if  [ $WINDOWWIDTH -lt 0 ] || [ $WINDOWWIDTH -gt 101 ]; then
+   unset $WINDOWWIDTH
+fi
+
 # default to 50(%) if unset
 if [ -z "$WINDOWWIDTH" ]; then
 WINDOWWIDTH=50"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 09/14: this script needs to run before the Xsession script/Xsession.d folder is executed

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bookworm
in repository live-build-x2go.

commit c7a1eba90df6d3b36b3a1fea495957b157a33cd2
Author: Stefan Baur (BAUR-ITCS) 
Date:   Fri Jan 26 19:06:24 2024 +0100

this script needs to run before the Xsession script/Xsession.d folder is
executed
---
 .../{999_x2gothinclient-align-right => 940_x2gothinclient-align-right}| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right
 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right
similarity index 100%
rename from 
config/includes.chroot/etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right
rename to 
config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 10/14: fixed logic, added comments, added default size and /proc/cmdline parameter

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bookworm
in repository live-build-x2go.

commit 132c5961aacb023cccffc3bd304207d327e9942a
Author: Stefan Baur (BAUR-ITCS) 
Date:   Fri Jan 26 19:09:16 2024 +0100

fixed logic, added comments, added default size and /proc/cmdline parameter
---
 .../940_x2gothinclient-align-right | 79 +-
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git 
a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right
 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right
index 9b240c8..7e4b460 100755
--- 
a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right
+++ 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right
@@ -1,36 +1,49 @@
 #!/bin/bash
-# move X2GoClient window to right screen border and resize - but only
-# when in minidesktop mode
+# move X2GoClient window to right screen border and resize - but only when in 
minidesktop mode
+
+WINDOWWIDTH=$(cat /proc/cmdline | tr ' ' '\n' | awk -F'=' '"windowwidth"==$1 
{print $2}' | tr -dc '0-9')
+
+# default to 50(%) if unset
+if [ -z "$WINDOWWIDTH" ]; then
+WINDOWWIDTH=50"
+fi
+
 if [ -z "$X2GO_HANDLE_DAEMON" ] ; then
-   # we need to background this so it doesn't block the startup
-   (
-   # we have at least two matching window ids:
-   # actual client window and taskbar icon
-   # so let's wait until we have them both
-   X2GOCLIENTWINDOWIDS=""
-   while [ $(echo -e "$X2GOCLIENTWINDOWIDS" | wc -l) -lt 2 ] ; do
-   X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible 
--name X2GoClient)
-   done
-   
-   # now wait until there is only one window id left that's 
visible and
-   # which matches our expected window name
-   while [ $(echo -e "$X2GOCLIENTWINDOWIDS" | wc -l) -gt 1 ] ; do
-   X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible 
--name X2GoClient)
-   done
-   
-   # while there SHOULD be only one ID left by now ...
-   # let's handle this in a safe manner - as a list
-   for WINDOW in $X2GOCLIENTWINDOWIDS; do
-   # the id belonging to the taskbar icon cannot be 
activated
-   # xdotool does not return a non-zero error code when 
windowactivate
-   # fails, so we need to check for the presence of an 
error message
-   if xdotool windowactivate $WINDOW 2>/dev/null; then
-   # if we succeeded in activating the window,
-   # it's the actual client window
-   sleep 0.5s
-   xdotool windowsize $WINDOW 30% 100% # resize it
-   xdotool windowmove $WINDOW 70% 0 # move it to 
the right
-   fi
-   done
-   ) &
+# we need to background this so it doesn't block the startup
+(
+# wait for window ids to show up
+X2GOCLIENTWINDOWIDS=""
+while [ -z "$X2GOCLIENTWINDOWIDS" ] ; do
+# if this var is of nonzero length, we have at least 
one matching window id:
+# the actual client window and possibly the taskbar 
icon
+X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible 
--name X2GoClient)
+# make sure we terminate if X11 terminates
+ps -C Xorg || exit 0
+done
+
+while [ $(echo -n "$X2GOCLIENTWINDOWIDS" | wc -l) -gt 2 ] ; do
+# now wait until there is only one window id left 
that's visible and
+# which matches our expected window name
+X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible 
--name X2GoClient)
+# make sure we terminate if X11 terminates
+ps -C Xorg || exit 0
+done
+
+# while there SHOULD be only one ID left by now ...
+# let's handle this in a safe manner - as a list
+for WINDOW in $X2GOCLIENTWINDOWIDS; do
+# the id belonging to the taskbar icon cannot be 
activated
+# xdotool does not return a non-zero error code when 
windowactivate
+# fails, so we need to check for the presence of an 
error message
+if xdotool windowactivate $WINDOW 2>/dev/null; then
+# if we succeeded in activating the window,
+# it's the actual client window
+   

[X2Go-Commits] [live-build-x2go] 07/14: added backgrounded task to grab X2GoClient on Startup and move it to the right

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bookworm
in repository live-build-x2go.

commit a5bcbe9fec8e4e9447a991cae50c282db21736c5
Author: Stefan Baur (BAUR-ITCS) 
Date:   Fri Jan 26 15:38:40 2024 +0100

added backgrounded task to grab X2GoClient on Startup and move it to the
right
---
 .../999_x2gothinclient-align-right | 36 ++
 1 file changed, 36 insertions(+)

diff --git 
a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right
 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right
new file mode 100644
index 000..9b240c8
--- /dev/null
+++ 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right
@@ -0,0 +1,36 @@
+#!/bin/bash
+# move X2GoClient window to right screen border and resize - but only
+# when in minidesktop mode
+if [ -z "$X2GO_HANDLE_DAEMON" ] ; then
+   # we need to background this so it doesn't block the startup
+   (
+   # we have at least two matching window ids:
+   # actual client window and taskbar icon
+   # so let's wait until we have them both
+   X2GOCLIENTWINDOWIDS=""
+   while [ $(echo -e "$X2GOCLIENTWINDOWIDS" | wc -l) -lt 2 ] ; do
+   X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible 
--name X2GoClient)
+   done
+   
+   # now wait until there is only one window id left that's 
visible and
+   # which matches our expected window name
+   while [ $(echo -e "$X2GOCLIENTWINDOWIDS" | wc -l) -gt 1 ] ; do
+   X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible 
--name X2GoClient)
+   done
+   
+   # while there SHOULD be only one ID left by now ...
+   # let's handle this in a safe manner - as a list
+   for WINDOW in $X2GOCLIENTWINDOWIDS; do
+   # the id belonging to the taskbar icon cannot be 
activated
+   # xdotool does not return a non-zero error code when 
windowactivate
+   # fails, so we need to check for the presence of an 
error message
+   if xdotool windowactivate $WINDOW 2>/dev/null; then
+   # if we succeeded in activating the window,
+   # it's the actual client window
+   sleep 0.5s
+   xdotool windowsize $WINDOW 30% 100% # resize it
+   xdotool windowmove $WINDOW 70% 0 # move it to 
the right
+   fi
+   done
+   ) &
+fi

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 06/14: make settings file creation atomic

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bookworm
in repository live-build-x2go.

commit 3aae8b11c0e3e72ab58eeccef10675662f627eb8
Author: Stefan Baur (BAUR-ITCS) 
Date:   Fri Jan 26 12:22:43 2024 +0100

make settings file creation atomic
---
 .../020_x2gothinclient-confine-to-tray | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/020_x2gothinclient-confine-to-tray
 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/020_x2gothinclient-confine-to-tray
index a0476bd..870e5e9 100755
--- 
a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/020_x2gothinclient-confine-to-tray
+++ 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/020_x2gothinclient-confine-to-tray
@@ -22,12 +22,14 @@
 
 if [ -z "$X2GO_HANDLE_DAEMON" ] ; then
mkdir -p ~x2gothinclient/.x2goclient
-   echo '[trayicon]' >>~x2gothinclient/.x2goclient/settings
-   echo 'enabled=true' >>~x2gothinclient/.x2goclient/settings
-   echo 'mintotray=true' >>~x2gothinclient/.x2goclient/settings
-   echo 'noclose=true' >>~x2gothinclient/.x2goclient/settings
-   echo 'mincon=true' >>~x2gothinclient/.x2goclient/settings
-   echo 'maxdiscon=true' >>~x2gothinclient/.x2goclient/settings
+   echo '[trayicon]' >>~x2gothinclient/.x2goclient/settings.tmp
+   echo 'enabled=true' >>~x2gothinclient/.x2goclient/settings.tmp
+   echo 'mintotray=true' >>~x2gothinclient/.x2goclient/settings.tmp
+   echo 'noclose=true' >>~x2gothinclient/.x2goclient/settings.tmp
+   echo 'mincon=true' >>~x2gothinclient/.x2goclient/settings.tmp
+   echo 'maxdiscon=true' >>~x2gothinclient/.x2goclient/settings.tmp
chown x2gothinclient:x2gothinclient ~x2gothinclient -Rf
chmod go-rwx ~x2gothinclient -Rf
+   # make this an atomic change
+   mv ~x2gothinclient/.x2goclient/settings.tmp 
~x2gothinclient/.x2goclient/settings
 fi

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 08/14: a script needs to be chmodded 755 to work ...

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bookworm
in repository live-build-x2go.

commit 6d4a13b78a2198cf75d55ead210e8830745d7917
Author: Stefan Baur (BAUR-ITCS) 
Date:   Fri Jan 26 17:00:26 2024 +0100

a script needs to be chmodded 755 to work ...
---
 .../etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right
 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right
old mode 100644
new mode 100755

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 03/14: de-array-ified, as we are forced to use dash instead of bash

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bookworm
in repository live-build-x2go.

commit 0f7ddcada6b3e75d3dcf87cee7540b3f13861a1f
Author: Stefan Baur (BAUR-ITCS) 
Date:   Tue Jan 23 13:54:32 2024 +0100

de-array-ified, as we are forced to use dash instead of bash
---
 .../etc/X11/Xsession.d/60x11-blanking-dpms-config | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config 
b/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config
index 4aad736..e80df32 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config
@@ -2,8 +2,11 @@
 
 BLANKINGTIME=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' 
-e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '$1 == "blank" { print 
$2 }' | tr -dc '0-9:')
 if [ -n "$BLANKINGTIME" ]; then
-DPMSARR=($(echo $BLANKINGTIME | awk -F ':' '$1 ~/^[0-9]*$/ && $2 
~/^[0-9]*$/ && $3 ~/^[0-9]*$/  { print $1 " " $2 " " $3}'))
-if [ ${DPMSARR[0]} -eq 0 ]; then
+DPMSARR=$(echo $BLANKINGTIME | awk -F ':' '$1 ~/^[0-9]*$/ && $2 
~/^[0-9]*$/ && $3 ~/^[0-9]*$/  { print $1 " " $2 " " $3}')
+   DPMSARR1=$(echo $DPMSARR | cut -d ' ' -f 1)
+   DPMSARR2=$(echo $DPMSARR | cut -d ' ' -f 2)
+   DPMSARR3=$(echo $DPMSARR | cut -d ' ' -f 3)
+if [ $DPMSARR1 -eq 0 ]; then
 # Disable screensaver and DPMS Power Saving if requested
 xset s off
 if grep -q '\W*nodpms\W*' /proc/cmdline; then
@@ -11,10 +14,10 @@ if [ -n "$BLANKINGTIME" ]; then
 fi
 else
 xset s on
-xset s ${DPMSARR[0]}
+xset s $DPMSARR1
 if ! grep -q '\W*nodpms\W*' /proc/cmdline; then
 # Yes, "+dpms dpms" is intentional.
-xset +dpms dpms ${DPMSARR[0]} ${DPMSARR[1]} 
${DPMSARR[2]}
+xset +dpms dpms $DPMSARR1 $DPMSARR2 $DPMSARR3
 fi
 fi
 fi

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 14/14: removed bashism as we are forced to use dash in bookworm

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bookworm
in repository live-build-x2go.

commit cab7b31b19fba96ac96cf5509e51eb48a9eb6140
Author: Stefan Baur (BAUR-ITCS) 
Date:   Sun Jan 28 14:48:53 2024 +0100

removed bashism as we are forced to use dash in bookworm
---
 config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground 
b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground
index cfdab6a..156b801 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground
@@ -7,7 +7,7 @@ if [ -n "$XROOT" ] ; then
 
#input validation
# allowed values for POSITION: center fill max scale tile; default: max
-   case "${XROOTMODE,,}" in # force lowercase
+   case "$(echo $XROOTMODE | tr '[:upper:]' '[:lower:]')" in # force 
lowercase
"center") POSITION=center ;;
"fill") POSITION=fill ;;
"scale") POSITION=scale ;;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 05/14: make sure kdrive sessions always end up in fullscreen mode unless it's a minidesktop

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bookworm
in repository live-build-x2go.

commit 38f2f2a7c3cb30349bdf386ef60e313d3fa3b742
Author: Stefan Baur (BAUR-ITCS) 
Date:   Tue Jan 23 21:46:30 2024 +0100

make sure kdrive sessions always end up in fullscreen mode unless it's a 
minidesktop
---
 .../etc/X11/Xsession.d/60x11-kdrive-enforce-fullscreen | 18 ++
 1 file changed, 18 insertions(+)

diff --git 
a/config/includes.chroot/etc/X11/Xsession.d/60x11-kdrive-enforce-fullscreen 
b/config/includes.chroot/etc/X11/Xsession.d/60x11-kdrive-enforce-fullscreen
new file mode 100644
index 000..f41813f
--- /dev/null
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-kdrive-enforce-fullscreen
@@ -0,0 +1,18 @@
+# In Minidesktops, Users might actually want to run an X2Go-KDrive session 
that doesn't span the entire screen
+if ! [ -f "/etc/x2go/x2gothinclient-minidesktop_start" ] ; then
+   (
+   while true ; do
+   if ps -C x2gokdriveclient --no-header >/dev/null; then
+   # whenever x2gokdriveclient loads, make sure it 
is forced into fullscreen
+   xdotool search --onlyvisible --classname 
--maxdepth 1 x2gokdriveclient behave %@ focus windowsize $(xdotool 
getdisplaygeometry) &
+   TOOLPID=$!
+   xdotool search --onlyvisible --classname 
--maxdepth 1 x2gokdriveclient behave %@ blur windowsize $(xdotool 
getdisplaygeometry)
+   kill $TOOLPID
+   else
+   # exit if X11 is no longer running, else sleep 
for a bit
+   ps -C Xorg || exit 0
+   sleep 1
+   fi
+   done
+   ) &
+fi

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 12/14: typofix

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bookworm
in repository live-build-x2go.

commit a8badb6efc334bf4061e47b821c49553e94b370f
Author: Stefan Baur (BAUR-ITCS) 
Date:   Sat Jan 27 05:09:54 2024 +0100

typofix
---
 .../etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right
 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right
index 960f9a5..e92365f 100755
--- 
a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right
+++ 
b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right
@@ -10,7 +10,7 @@ fi
 
 # default to 50(%) if unset
 if [ -z "$WINDOWWIDTH" ]; then
-WINDOWWIDTH=50"
+WINDOWWIDTH="50"
 fi
 
 if [ -z "$X2GO_HANDLE_DAEMON" ] ; then

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 02/14: changed fuse to fuse3

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bookworm
in repository live-build-x2go.

commit d52dca1337df8bb03e7b76c72f22e8f4c921d0d1
Author: Stefan Baur (BAUR-ITCS) 
Date:   Fri Jan 26 01:17:19 2024 +0100

changed fuse to fuse3
---
 config/package-lists/fuseext.list.chroot | 2 +-
 config/package-lists/live.list.chroot| 2 +-
 config/package-lists/ntfs.list.chroot| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/package-lists/fuseext.list.chroot 
b/config/package-lists/fuseext.list.chroot
index 2011124..3ccacf9 100644
--- a/config/package-lists/fuseext.list.chroot
+++ b/config/package-lists/fuseext.list.chroot
@@ -1,3 +1,3 @@
-fuse
+fuse3
 fuseext2
 libfuse2
diff --git a/config/package-lists/live.list.chroot 
b/config/package-lists/live.list.chroot
index 250e9de..635f098 100644
--- a/config/package-lists/live.list.chroot
+++ b/config/package-lists/live.list.chroot
@@ -1,7 +1,7 @@
 cifs-utils
 console-setup
 console-setup-linux
-fuse
+fuse3
 gpg
 initramfs-tools
 kbd
diff --git a/config/package-lists/ntfs.list.chroot 
b/config/package-lists/ntfs.list.chroot
index da18f0e..b5516d5 100644
--- a/config/package-lists/ntfs.list.chroot
+++ b/config/package-lists/ntfs.list.chroot
@@ -1,4 +1,4 @@
-fuse
+fuse3
 libfuse2
 libgcrypt20
 #libgnutls-deb0-28

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [live-build-x2go] 04/14: this will now properly terminate all backgrounded child processes when X11 dies

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch heuler/mate-minidesktop-bookworm
in repository live-build-x2go.

commit 95fec1ca649991125c65e60b1ed21cc4a53374f1
Author: Stefan Baur (BAUR-ITCS) 
Date:   Tue Jan 23 21:45:04 2024 +0100

this will now properly terminate all backgrounded child processes when X11 
dies
---
 .../includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround   | 4 
 1 file changed, 4 insertions(+)

diff --git 
a/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround 
b/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround
index 00bb22d..c02fb2d 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround
@@ -6,6 +6,8 @@ if grep 'nomagicpixel=2' /proc/cmdline ; then
done ;
echo -en "\n$(date +'%F | %T | ')'$0' spawning window 
foreground monitor (magic-pixel-fix 2)." | tee -a /dev/tty8
xdotool search --class X2GoAgent behave %@ blur windowmap || 
xdotool search --class NXAgent behave %@ blur windowmap
+   # exit if X11 is no longer running, else sleep for a bit
+   ps -C Xorg || exit 0
done &
 elif grep 'nomagicpixel=1' /proc/cmdline ; then
echo -en "\n$(date +'%F | %T | ')'$0' spawning openbox monitor 
(magic-pixel-fix 1)." | tee -a /dev/tty8
@@ -18,6 +20,8 @@ elif grep 'nomagicpixel=1' /proc/cmdline ; then
killall openbox
echo -en "\n$(date +'%F | %T | ')'$0' killed OpenBox." 
| tee -a /dev/tty8
done
+   # exit if X11 is no longer running, else sleep for a bit
+   ps -C Xorg || exit 0
sleep 1 # to save cpu cycles
done &
 else

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/live-build-x2go.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits