The branch, build-baikal has been updated via 5c60ad18f7db28c0e397c0f74715eedc1ae1cbf4 (commit) from ac7854d8ba9599f09a3861365a7b504c1e97a954 (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/control | 4 +- debian/x2goserver.install | 6 ++- debian/x2goserver.postinst | 2 +- x2goserver/Makefile | 8 +++- .../{x2gosqlitewrapper => x2gosqlitewrapper.pl} | 0 x2goserver/x2gosqlitewrapper.c | 43 ++++++++++++++++++++ 6 files changed, 57 insertions(+), 6 deletions(-) rename x2goserver/lib/{x2gosqlitewrapper => x2gosqlitewrapper.pl} (100%) create mode 100644 x2goserver/x2gosqlitewrapper.c The diff of changes is: diff --git a/debian/control b/debian/control index 8fcc957..ceb7be3 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Vcs-Git: git://code.x2go.org/x2goserver.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary Package: x2goserver -Architecture: all +Architecture: any Depends: ${misc:Depends}, x2goagent, @@ -37,7 +37,7 @@ Recommends: x11-xserver-utils, xinit, x2goserver-extensions (= ${source:Version}) -Conflicts: +ConflictsB: x2goserver-one, x2goserver-home, x2goprint diff --git a/debian/x2goserver.install b/debian/x2goserver.install index acfb3b8..33c7f5a 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -3,10 +3,13 @@ x2goserver/sbin/x2go* /usr/sbin/ x2goserver/etc/x2gosql/sql /etc/x2go/x2gosql/ x2goserver/etc/x2goserver.conf /etc/x2go/ x2goserver/lib/x2godbwrapper.pm /usr/lib/x2go/ +x2goserver/lib/x2gosqlitewrapper.pl /usr/lib/x2go/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ +x2goserver/x2gosqlitewrapper /usr/bin # the following executables should go to /usr/lib/x2go x2goserver/lib/x2gochangestatus /usr/bin x2goserver/lib/x2gocreatesession /usr/bin +x2goserver/lib/x2goresume /usr/bin x2goserver/lib/x2gogetagent /usr/bin x2goserver/lib/x2gogetdisplays /usr/bin x2goserver/lib/x2gogetports /usr/bin @@ -14,8 +17,7 @@ x2goserver/lib/x2gogetservers /usr/bin x2goserver/lib/x2goinsertport /usr/bin x2goserver/lib/x2goinsertsession /usr/bin x2goserver/lib/x2gosessionlimit /usr/bin -x2goserver/lib/x2gosqlitewrapper /usr/bin x2goserver/lib/x2golistsessions_sql /usr/bin x2goserver/lib/x2golistsessions_root /usr/bin # compatibility -x2goserver/bin/compat/x2go* /usr/bin +x2goserver/compat/bin/x2go* /usr/bin diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 4e75de8..760e1fa 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -44,7 +44,7 @@ case "$1" in x2godbadmin --createdb fi - dpkg-statoverride --add --update x2gouser x2gousers 6755 /usr/bin/x2gosqlitewrapper || true + dpkg-statoverride --add --update x2gouser x2gousers 6755 /usr/lib/x2go/x2gosqlitewrapper.pl || true ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 765f17f..a4fec0f 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -31,7 +31,12 @@ MAN2HTML_DEST = .build_man2html/html all: clean build -build: build-indep +build: build-arch build-indep + +build-arch: build_setuidwrapper + +build_setuidwrapper: + gcc -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_man2html @@ -52,6 +57,7 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ + $(INSTALL_PROGRAM) compat/bin/* $(DESTDIR)$(BINDIR)/ $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ diff --git a/x2goserver/lib/x2gosqlitewrapper b/x2goserver/lib/x2gosqlitewrapper.pl similarity index 100% rename from x2goserver/lib/x2gosqlitewrapper rename to x2goserver/lib/x2gosqlitewrapper.pl diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c new file mode 100644 index 0000000..b23037b --- /dev/null +++ b/x2goserver/x2gosqlitewrapper.c @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + * Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> + */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <libgen.h> + +int main() { + char buffer[BUFSIZ]; + char * x2gosqlitewrapper = NULL; + + // resolve link of /proc/self/exe + readlink("/proc/self/exe", buffer, BUFSIZ); + + // derive the full path of x2gosqlitewrapper.pl from path of this binary + asprintf(&x2gosqlitewrapper, "%s/%s", dirname(dirname(buffer)), "lib/x2go/x2gosqlitewrapper.pl"); + + // execute the script, taking setuid bit into consideration if set... + execl(x2gosqlitewrapper, ""); + + // fake a successful return value + return 0; +} 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).