The branch, build-baikal has been updated via dc9e74c18a01b9e0f472da1f6c6246bc26b5c79a (commit) from 93c72ab1328fdf4c899ddacc14afd6adc39412d2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.lintian-overrides | 1 + debian/x2goserver.postinst | 4 ++-- x2goserver/bin/x2goumount_session | 1 + x2goserver/lib/x2godbwrapper.pm | 42 ++++++++++++++++++----------------- 4 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 debian/x2goserver.lintian-overrides create mode 120000 x2goserver/bin/x2goumount_session The diff of changes is: diff --git a/debian/x2goserver.lintian-overrides b/debian/x2goserver.lintian-overrides new file mode 100644 index 0000000..637b7db --- /dev/null +++ b/debian/x2goserver.lintian-overrides @@ -0,0 +1 @@ +x2goserver: breaks-without-version diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 77730bd..f94a68a 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -57,11 +57,11 @@ case "$1" in # we may be upgrading versions of x2goserver that had /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid x2gouser. dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper.pl && chown root:root /usr/lib/x2go/x2gosqlitewrapper.pl && chmod 0755 /usr/lib/x2go/x2gosqlitewrapper.pl || true - # we may be upgrading versions of x2goserver that had /usr/bin/x2gosqlitewrapper set to setuid x2gouser. + # we may be upgrading versions of x2goserver that had /usr/bin/x2gosqlitewrapper set to setuid or setgid x2gouser. dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper && chown root:root /usr/bin/x2gosqlitewrapper && chmod 0755 /usr/bin/x2gosqlitewrapper || true # the sqlite db has to be accessed as uid x2gouser - dpkg-statoverride --add --update root x2gouser 2755 /usr/bin/x2gosqlitewrapper || true + dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/x2gosqlitewrapper || true ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/x2goserver/bin/x2goumount_session b/x2goserver/bin/x2goumount_session new file mode 120000 index 0000000..b33a4dc --- /dev/null +++ b/x2goserver/bin/x2goumount_session @@ -0,0 +1 @@ +x2goumount-session \ No newline at end of file diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index cf17bb4..943ac1c 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -26,6 +26,8 @@ use DBI; use POSIX; +my $x2go_lib_path=`echo -n \$(dirname $0)/../lib/x2go`; + my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid()); my $Config = new Config::Simple(syntax=>'ini'); @@ -98,7 +100,7 @@ sub dbsys_rmsessionsroot } if($backend eq 'sqlite') { - `x2gosqlitewrapper rmsessionsroot $sid`; + `$x2go_lib_path/x2gosqlitewrapper rmsessionsroot $sid`; } } @@ -129,7 +131,7 @@ sub dbsys_listsessionsroot } if($backend eq 'sqlite') { - return split("\n",`x2gosqlitewrapper listsessionsroot $server`); + return split("\n",`$x2go_lib_path/x2gosqlitewrapper listsessionsroot $server`); } } @@ -157,7 +159,7 @@ sub dbsys_listsessionsroot_all } if ($backend eq 'sqlite') { - return split("\n",`x2gosqlitewrapper listsessionsroot_all`); + return split("\n",`$x2go_lib_path/x2gosqlitewrapper listsessionsroot_all`); } } @@ -182,7 +184,7 @@ sub dbsys_getmounts } if ($backend eq 'sqlite') { - return split("\n",`x2gosqlitewrapper getmounts $sid`); + return split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`); } } @@ -207,7 +209,7 @@ sub db_getmounts } if ($backend eq 'sqlite') { - return split("\n",`x2gosqlitewrapper getmounts $sid`); + return split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`); } } @@ -225,7 +227,7 @@ sub db_deletemount } if ($backend eq 'sqlite') { - `x2gosqlitewrapper deletemount $sid \"$path\"`; + `$x2go_lib_path/x2gosqlitewrapper deletemount $sid \"$path\"`; } } @@ -249,7 +251,7 @@ sub db_insertmount } if ($backend eq 'sqlite') { - if( `x2gosqlitewrapper insertmount $sid \"$path\" $client` eq "ok") + if( `$x2go_lib_path/x2gosqlitewrapper insertmount $sid \"$path\" $client` eq "ok") { $res_ok=1; } @@ -272,10 +274,10 @@ sub db_insertsession } if ($backend eq 'sqlite') { - my $err=`x2gosqlitewrapper insertsession $display $server $sid`; + my $err=`$x2go_lib_path/x2gosqlitewrapper insertsession $display $server $sid`; if ($err ne "ok") { - die "$err: x2gosqlitewrapper insertsession $display $server $sid"; + die "$err: $x2go_lib_path/x2gosqlitewrapper insertsession $display $server $sid"; } } } @@ -301,7 +303,7 @@ sub db_createsession } if ($backend eq 'sqlite') { - my $err= `x2gosqlitewrapper createsession $cookie $pid $client $gr_port $snd_port $fs_port $sid`; + my $err= `$x2go_lib_path/x2gosqlitewrapper createsession $cookie $pid $client $gr_port $snd_port $fs_port $sid`; if ($err ne "ok") { die $err; @@ -324,7 +326,7 @@ sub db_insertport } if ($backend eq 'sqlite') { - `x2gosqlitewrapper insertport $server $sid $sshport`; + `$x2go_lib_path/x2gosqlitewrapper insertport $server $sid $sshport`; } } @@ -342,7 +344,7 @@ sub db_resume } if ($backend eq 'sqlite') { - `x2gosqlitewrapper resume $client $sid`; + `$x2go_lib_path/x2gosqlitewrapper resume $client $sid`; } } @@ -360,7 +362,7 @@ sub db_changestatus } if ($backend eq 'sqlite') { - `x2gosqlitewrapper changestatus $status $sid`; + `$x2go_lib_path/x2gosqlitewrapper changestatus $status $sid`; } } @@ -386,7 +388,7 @@ sub db_getdisplays } if ($backend eq 'sqlite') { - return split("\n",`x2gosqlitewrapper getdisplays $server`); + return split("\n",`$x2go_lib_path/x2gosqlitewrapper getdisplays $server`); } } @@ -412,7 +414,7 @@ sub db_getports } if ($backend eq 'sqlite') { - return split("\n",`x2gosqlitewrapper getports $server`); + return split("\n",`$x2go_lib_path/x2gosqlitewrapper getports $server`); } } @@ -436,7 +438,7 @@ sub db_getservers } if ($backend eq 'sqlite') { - return split("\n",`x2gosqlitewrapper getservers`); + return split("\n",`$x2go_lib_path/x2gosqlitewrapper getservers`); } } @@ -461,7 +463,7 @@ sub db_getagent } if($backend eq 'sqlite') { - $agent=`x2gosqlitewrapper getagent $sid`; + $agent=`$x2go_lib_path/x2gosqlitewrapper getagent $sid`; } return $agent; } @@ -487,7 +489,7 @@ sub db_getdisplay } if ($backend eq 'sqlite') { - $display=`x2gosqlitewrapper getdisplay $sid`; + $display=`$x2go_lib_path/x2gosqlitewrapper getdisplay $sid`; } return $display; } @@ -518,7 +520,7 @@ sub db_listsessions } if ($backend eq 'sqlite') { - return split("\n",`x2gosqlitewrapper listsessions $server`); + return split("\n",`$x2go_lib_path/x2gosqlitewrapper listsessions $server`); } } @@ -547,6 +549,6 @@ sub db_listsessions_all } if ($backend eq 'sqlite') { - return split("\n",`x2gosqlitewrapper listsessions_all`); + return split("\n",`$x2go_lib_path/x2gosqlitewrapper listsessions_all`); } } hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).