[X2go-Commits] x2goserver.git - setuidwrapper (branch) updated: 3.0.99-2-84-gb64868c

[X2go dev team]

The branch, setuidwrapper has been updated
       via  b64868c5c11843ee44b12fd6cc171946e63bca88 (commit)
       via  3223f23c40474d8a5062274c9b54beca6a336850 (commit)
       via  82c6545adef362a9d759b5ddf41473af052156c7 (commit)
      from  a694aaca92f9f8c6cbc81d200b09beb48b06b79d (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 -----------------------------------------------------------------
commit b64868c5c11843ee44b12fd6cc171946e63bca88
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 14 14:04:50 2011 +0200

    let package build with setuidwrapper

commit 3223f23c40474d8a5062274c9b54beca6a336850
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 14 14:04:02 2011 +0200

    fix for typo that stem from indentation cleanup

commit 82c6545adef362a9d759b5ddf41473af052156c7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 14 14:03:40 2011 +0200

    disabled perlsuid check...

-----------------------------------------------------------------------

Summary of changes:
 Makefile                            |    4 ++++
 debian/rules                        |    1 +
 debian/x2goserver.postinst          |    6 ++++++
 x2goserver-extensions/Makefile      |    2 ++
 x2goserver/lib/x2godbwrapper.pm     |    2 +-
 x2goserver/lib/x2gosqlitewrapper.pl |   13 +++++++++----
 6 files changed, 23 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 444112f..eee6d3d 100755
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,10 @@ clean:
 	cd x2goserver && make $@
 	cd x2goserver-extensions && make $@
 
+build-arch:
+	cd x2goserver && make $@
+	cd x2goserver-extensions && make $@
+
 build-indep:
 	cd x2goserver && make $@
 	cd x2goserver-extensions && make $@
diff --git a/debian/rules b/debian/rules
index c34429d..a5143a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,4 @@
 	dh $@
 
 override_dh_auto_install:
+	make -f Makefile build-arch
\ No newline at end of file
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index 760e1fa..bed72b7 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -44,7 +44,13 @@ case "$1" in
         x2godbadmin --createdb
     fi
 
+    # the sqlite db has to be accessed as uid x2gouser
     dpkg-statoverride --add --update x2gouser x2gousers 6755 /usr/lib/x2go/x2gosqlitewrapper.pl || true
+
+    # we may be upgrading versions of x2goserver that used perlsuid, so make sure setuid is removed
+    # from /usr/bin/x2gosqlitewrapper
+    dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper && chown root:root /usr/bin/x2gosqlitewrapper && chmod 0755 /usr/bin/x2gosqlitewrapper || true
+
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index d95bc71..ae6b3c1 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -35,6 +35,8 @@ build: build-indep
 
 build-indep: build_man2html
 
+build-arch:
+
 build_man2html:
 	mkdir -p $(MAN2HTML_DEST)
 	for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done
diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm
index b30185b..044faac 100644
--- a/x2goserver/lib/x2godbwrapper.pm
+++ b/x2goserver/lib/x2godbwrapper.pm
@@ -138,7 +138,7 @@ sub dbsys_listsessionsroot_all
 	if ($backend eq 'postgres')
 	{
 		my @strings;
-		my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $;
+		my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_;
 		my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status,
 		                      to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,
 		                      sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,
diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl
index 9cbf663..a566fc1 100755
--- a/x2goserver/lib/x2gosqlitewrapper.pl
+++ b/x2goserver/lib/x2gosqlitewrapper.pl
@@ -25,10 +25,15 @@ use strict;
 use DBI;
 use POSIX;
 
-if ($< eq $>)
-{
-	die "Please install this program as SUID x2gouser!\n";
-}
+###
+### We are not using perlsuid anymore as it is deprecated as of Perl 5.12.
+### Instead we ship our own setuidwrapper...
+###
+
+#if ($< eq $>)
+#{
+#	die "Please install this program as SUID x2gouser!\n";
+#}
 
 my $realuser=$<;
 my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($>);


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).