The branch, build-baikal has been updated via cf6abd4c1dc2ff5e9536787c4482f16f68816f99 (commit) from a2608a27b8bdf0b0de8685c20bd9009f7a6772a2 (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: Makefile | 92 +------------------- debian/changelog | 9 ++ debian/control | 27 +++++- debian/copyright | 19 +++- debian/x2goserver-extras.dirs | 3 + debian/x2goserver-extras.docs | 1 + debian/x2goserver-extras.install | 2 + debian/x2goserver-extras.manpages | 1 + debian/x2goserver.dirs | 3 + debian/x2goserver.docs | 2 +- debian/x2goserver.install | 12 +-- debian/x2goserver.manpages | 2 +- .../html/man8/x2gosetkeyboard.8.html | 2 +- .../.build_man2html}/html/man8/x2goversion.8.html | 2 +- Makefile => x2goserver-extras/Makefile | 55 ++++++------ .../VERSION.x2goserver-extras | 0 {bin => x2goserver-extras/bin}/x2gosetkeyboard | 0 {bin => x2goserver-extras/bin}/x2goversion | 0 .../man}/man8/x2gosetkeyboard.8 | 0 {man => x2goserver-extras/man}/man8/x2goversion.8 | 0 .../html/man8/x2gocleansessions.8.html | 2 +- .../html/man8/x2golistsessions.8.html | 2 +- .../html/man8/x2gomountdirs.8.html | 2 +- .../.build_man2html}/html/man8/x2goprint.8.html | 2 +- .../html/man8/x2goresume-session.8.html | 2 +- .../html/man8/x2goruncommand.8.html | 2 +- .../html/man8/x2gostartagent.8.html | 2 +- .../html/man8/x2gosuspend-session.8.html | 2 +- .../html/man8/x2goterminate-session.8.html | 2 +- .../html/man8/x2goumount-session.8.html | 2 +- .../.build_man2html}/html/man8/x2goumount.8.html | 2 +- Makefile => x2goserver/Makefile | 7 +- .../VERSION.x2goserver | 0 {bin => x2goserver/bin}/x2gochangestatus | 0 {bin => x2goserver/bin}/x2gocmdexitmessage | 0 {bin => x2goserver/bin}/x2gocreatesession | 0 {bin => x2goserver/bin}/x2gogetagent | 0 {bin => x2goserver/bin}/x2gogetdisplays | 0 {bin => x2goserver/bin}/x2gogetports | 0 {bin => x2goserver/bin}/x2gogetservers | 0 {bin => x2goserver/bin}/x2goinsertport | 0 {bin => x2goserver/bin}/x2goinsertsession | 0 {bin => x2goserver/bin}/x2golistdesktops | 0 {bin => x2goserver/bin}/x2golistsessions | 0 {bin => x2goserver/bin}/x2golistsessions_root | 0 {bin => x2goserver/bin}/x2golistsessions_sql | 0 {bin => x2goserver/bin}/x2gomountdirs | 0 {bin => x2goserver/bin}/x2goprint | 0 {bin => x2goserver/bin}/x2goresume | 0 {bin => x2goserver/bin}/x2goresume-session | 0 {bin => x2goserver/bin}/x2goruncommand | 0 {bin => x2goserver/bin}/x2gosessionlimit | 0 {bin => x2goserver/bin}/x2goshowblocks | 0 {bin => x2goserver/bin}/x2gosqlitewrapper | 0 {bin => x2goserver/bin}/x2gostartagent | 0 {bin => x2goserver/bin}/x2gosuspend-agent | 0 {bin => x2goserver/bin}/x2gosuspend-session | 0 {bin => x2goserver/bin}/x2goterminate | 0 {bin => x2goserver/bin}/x2goterminate-session | 0 {bin => x2goserver/bin}/x2goumount | 0 {bin => x2goserver/bin}/x2goumount-session | 0 {bin => x2goserver/bin}/x2goumount_session | 0 {etc => x2goserver/etc}/x2goserver.conf | 0 {etc => x2goserver/etc}/x2gosql/sql | 0 x2goserver/lib/a.out | Bin 0 -> 6867 bytes x2goserver/lib/setuidwrapper.c | 12 +++ x2goserver/lib/test.py | 9 ++ {lib => x2goserver/lib}/x2godbwrapper.pm | 0 {man => x2goserver/man}/man8/x2gocleansessions.8 | 0 {man => x2goserver/man}/man8/x2golistsessions.8 | 0 {man => x2goserver/man}/man8/x2gomountdirs.8 | 0 {man => x2goserver/man}/man8/x2goprint.8 | 0 {man => x2goserver/man}/man8/x2goresume-session.8 | 0 {man => x2goserver/man}/man8/x2goruncommand.8 | 0 {man => x2goserver/man}/man8/x2gostartagent.8 | 0 {man => x2goserver/man}/man8/x2gosuspend-session.8 | 0 .../man}/man8/x2goterminate-session.8 | 0 {man => x2goserver/man}/man8/x2goumount-session.8 | 0 {man => x2goserver/man}/man8/x2goumount.8 | 0 {sbin => x2goserver/sbin}/x2gocleansessions | 0 {sbin => x2goserver/sbin}/x2godbadmin | 0 .../share}/x2go/versions/VERSION.x2goserver | 0 82 files changed, 140 insertions(+), 142 deletions(-) create mode 100644 debian/x2goserver-extras.dirs create mode 100644 debian/x2goserver-extras.docs create mode 100644 debian/x2goserver-extras.install create mode 100644 debian/x2goserver-extras.manpages rename {.build_man2html => x2goserver-extras/.build_man2html}/html/man8/x2gosetkeyboard.8.html (97%) rename {.build_man2html => x2goserver-extras/.build_man2html}/html/man8/x2goversion.8.html (98%) copy Makefile => x2goserver-extras/Makefile (57%) copy VERSION.x2goserver => x2goserver-extras/VERSION.x2goserver-extras (100%) rename {bin => x2goserver-extras/bin}/x2gosetkeyboard (100%) rename {bin => x2goserver-extras/bin}/x2goversion (100%) rename {man => x2goserver-extras/man}/man8/x2gosetkeyboard.8 (100%) rename {man => x2goserver-extras/man}/man8/x2goversion.8 (100%) rename {.build_man2html => x2goserver/.build_man2html}/html/man8/x2gocleansessions.8.html (97%) rename {.build_man2html => x2goserver/.build_man2html}/html/man8/x2golistsessions.8.html (97%) rename {.build_man2html => x2goserver/.build_man2html}/html/man8/x2gomountdirs.8.html (97%) rename {.build_man2html => x2goserver/.build_man2html}/html/man8/x2goprint.8.html (97%) rename {.build_man2html => x2goserver/.build_man2html}/html/man8/x2goresume-session.8.html (97%) rename {.build_man2html => x2goserver/.build_man2html}/html/man8/x2goruncommand.8.html (97%) rename {.build_man2html => x2goserver/.build_man2html}/html/man8/x2gostartagent.8.html (97%) rename {.build_man2html => x2goserver/.build_man2html}/html/man8/x2gosuspend-session.8.html (97%) rename {.build_man2html => x2goserver/.build_man2html}/html/man8/x2goterminate-session.8.html (97%) rename {.build_man2html => x2goserver/.build_man2html}/html/man8/x2goumount-session.8.html (97%) rename {.build_man2html => x2goserver/.build_man2html}/html/man8/x2goumount.8.html (97%) copy Makefile => x2goserver/Makefile (96%) rename VERSION.x2goserver => x2goserver/VERSION.x2goserver (100%) rename {bin => x2goserver/bin}/x2gochangestatus (100%) rename {bin => x2goserver/bin}/x2gocmdexitmessage (100%) rename {bin => x2goserver/bin}/x2gocreatesession (100%) rename {bin => x2goserver/bin}/x2gogetagent (100%) rename {bin => x2goserver/bin}/x2gogetdisplays (100%) rename {bin => x2goserver/bin}/x2gogetports (100%) rename {bin => x2goserver/bin}/x2gogetservers (100%) rename {bin => x2goserver/bin}/x2goinsertport (100%) rename {bin => x2goserver/bin}/x2goinsertsession (100%) rename {bin => x2goserver/bin}/x2golistdesktops (100%) rename {bin => x2goserver/bin}/x2golistsessions (100%) rename {bin => x2goserver/bin}/x2golistsessions_root (100%) rename {bin => x2goserver/bin}/x2golistsessions_sql (100%) rename {bin => x2goserver/bin}/x2gomountdirs (100%) rename {bin => x2goserver/bin}/x2goprint (100%) rename {bin => x2goserver/bin}/x2goresume (100%) rename {bin => x2goserver/bin}/x2goresume-session (100%) rename {bin => x2goserver/bin}/x2goruncommand (100%) rename {bin => x2goserver/bin}/x2gosessionlimit (100%) rename {bin => x2goserver/bin}/x2goshowblocks (100%) rename {bin => x2goserver/bin}/x2gosqlitewrapper (100%) rename {bin => x2goserver/bin}/x2gostartagent (100%) rename {bin => x2goserver/bin}/x2gosuspend-agent (100%) rename {bin => x2goserver/bin}/x2gosuspend-session (100%) rename {bin => x2goserver/bin}/x2goterminate (100%) rename {bin => x2goserver/bin}/x2goterminate-session (100%) rename {bin => x2goserver/bin}/x2goumount (100%) rename {bin => x2goserver/bin}/x2goumount-session (100%) rename {bin => x2goserver/bin}/x2goumount_session (100%) rename {etc => x2goserver/etc}/x2goserver.conf (100%) rename {etc => x2goserver/etc}/x2gosql/sql (100%) create mode 100755 x2goserver/lib/a.out create mode 100644 x2goserver/lib/setuidwrapper.c create mode 100755 x2goserver/lib/test.py rename {lib => x2goserver/lib}/x2godbwrapper.pm (100%) rename {man => x2goserver/man}/man8/x2gocleansessions.8 (100%) rename {man => x2goserver/man}/man8/x2golistsessions.8 (100%) rename {man => x2goserver/man}/man8/x2gomountdirs.8 (100%) rename {man => x2goserver/man}/man8/x2goprint.8 (100%) rename {man => x2goserver/man}/man8/x2goresume-session.8 (100%) rename {man => x2goserver/man}/man8/x2goruncommand.8 (100%) rename {man => x2goserver/man}/man8/x2gostartagent.8 (100%) rename {man => x2goserver/man}/man8/x2gosuspend-session.8 (100%) rename {man => x2goserver/man}/man8/x2goterminate-session.8 (100%) rename {man => x2goserver/man}/man8/x2goumount-session.8 (100%) rename {man => x2goserver/man}/man8/x2goumount.8 (100%) rename {sbin => x2goserver/sbin}/x2gocleansessions (100%) rename {sbin => x2goserver/sbin}/x2godbadmin (100%) rename {share => x2goserver/share}/x2go/versions/VERSION.x2goserver (100%) The diff of changes is: diff --git a/Makefile b/Makefile index bacf7fe..98734af 100755 --- a/Makefile +++ b/Makefile @@ -1,91 +1,5 @@ #!/usr/bin/make -f -SRC_DIR=$(CURDIR) -SHELL=/bin/bash - -INSTALL_DIR=install -d -o root -g root -m 755 -INSTALL_FILE=install -o root -g root -m 644 -INSTALL_PROGRAM=install -o root -g root -m 755 - -RM_FILE=rm -f -RM_DIR=rmdir -p --ignore-fail-on-non-empty - -DESTDIR= -PREFIX=/usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go - -BIN_SCRIPTS=$(shell cd bin && ls) -SBIN_SCRIPTS=$(shell cd sbin && ls) -LIB_FILES=$(shell cd lib && ls) - -man_pages = `cd man && find * -type f` - -MAN2HTML_BIN = man2html -MAN2HTML_SRC = man -MAN2HTML_DEST = .build_man2html/html - -all: build - -build: build_man2html - -build_man2html: - mkdir -p $(MAN2HTML_DEST) - for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done - -install: install_scripts install_config install_man install_version - -install_scripts: - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ - $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ - $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ - -install_config: - $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) - $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql - $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords - $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ - $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql - -install_man: - $(INSTALL_DIR) $(DESTDIR)$(MANDIR) - $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 - $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 - gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 - -install_version: - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions - $(INSTALL_FILE) VERSION.x2goserver $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver - -uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version - -uninstall_scripts: - for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done - for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done - for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done - $(RM_DIR) $(DESTDIR)$(LIBDIR) - -uninstall_config: - $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf - $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql - $(RM_DIR) $(DESTDIR)$(ETCDIR) - $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords - $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql - -uninstall_man: - for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done - for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done - $(RM_DIR) $(DESTDIR)$(MANDIR) - -uninstall_version: - $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver - $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions +%: + cd x2goserver && make $@ + cd x2goserver-extras && make $@ diff --git a/debian/changelog b/debian/changelog index f45483a..3e6983f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +x2goserver (3.0.99.5-0~x2go2) unstable; urgency=low + + * splitting up x2goserver package into x2goserver and x2goserver-extras + (x2goserver provides full functionality to legacy x2goclient, x2goserver-extras + is a container for add-on tools/scripts needed for other client implementations + like Python X2go. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 31 May 2011 10:57:15 +0200 + x2goserver (3.0.99.5-0~x2go1) unstable; urgency=low * adds x2goprint to x2goserver package diff --git a/debian/control b/debian/control index 30267f0..ecacf72 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Uploaders: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Build-Depends: - debhelper (>= 7.0.50) + debhelper (>= 7.0.50~) Standards-Version: 3.9.2 Homepage: http://code.x2go.org/releases/source/x2goserver Vcs-Git: git://code.x2go.org/x2goserver.git @@ -34,7 +34,8 @@ Recommends: x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, - xinit + xinit, + x2goserver-extras (= ${source:Version}) Replaces: x2goserver-one, x2goserver-home, @@ -50,3 +51,25 @@ Description: X2go server daemon scripts . This package contains the main daemon and tools for X2go server-side session administrations. + . + The set of tools and scripts in this package are + sufficient for running the X2go project's legacy + x2goclient on the client-side. + +Package: x2goserver-extras +Architecture: all +Depends: + ${misc:Depends}, + x2goserver (= ${source:Version}), + x11-xkb-utils +Description: X2go server daemon scripts + X2go is a serverbased computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This package contains the main daemon and tools for + X2go server-side session administrations. diff --git a/debian/copyright b/debian/copyright index 47b11d5..02049e7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,13 @@ -Upstream Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +Upstream Authors: + +x2goserver: + Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> + +x2goserver-extras + Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org @@ -17,15 +26,17 @@ 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 +Copyright (C) 2007-2011 Oleksandr Shneyder (x2goserver, x2goserver-extras) oleksandr.shneyder@obviously-nice.de -Copyright (C) 2007-2011 Heinz-Markus Graesing +Copyright (C) 2007-2011 Heinz-Markus Graesing (x2goserver, x2goserver-extras) heinz-m.graesing@obviously-nice.de +Copyright (C) 2011 Mike Gabriel (x2goserver-extras) +mike.gabriel@das-netzwerkteam.de + On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. The Debian packaging is (C) 2007-2011, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> and is licensed under the GPL, see above. - diff --git a/debian/x2goserver-extras.dirs b/debian/x2goserver-extras.dirs new file mode 100644 index 0000000..45adc59 --- /dev/null +++ b/debian/x2goserver-extras.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/x2go +usr/share/x2go/versions diff --git a/debian/x2goserver-extras.docs b/debian/x2goserver-extras.docs new file mode 100644 index 0000000..f8fc077 --- /dev/null +++ b/debian/x2goserver-extras.docs @@ -0,0 +1 @@ +x2goserver-extras/.build_man2html/html diff --git a/debian/x2goserver-extras.install b/debian/x2goserver-extras.install new file mode 100644 index 0000000..695ab94 --- /dev/null +++ b/debian/x2goserver-extras.install @@ -0,0 +1,2 @@ +x2goserver-extras/bin/x2go* /usr/bin/ +x2goserver-extras/VERSION.x2goserver-extras /usr/share/x2go/versions/ \ No newline at end of file diff --git a/debian/x2goserver-extras.manpages b/debian/x2goserver-extras.manpages new file mode 100644 index 0000000..0e17946 --- /dev/null +++ b/debian/x2goserver-extras.manpages @@ -0,0 +1 @@ +x2goserver-extras/man/man8/* \ No newline at end of file diff --git a/debian/x2goserver.dirs b/debian/x2goserver.dirs index c51bc7c..8699a0c 100644 --- a/debian/x2goserver.dirs +++ b/debian/x2goserver.dirs @@ -1,6 +1,9 @@ etc/x2go etc/x2go/x2gosql etc/x2go/x2gosql/passwords +usr/bin +usr/sbin +usr/lib/x2go usr/share/x2go usr/share/x2go/versions var/lib/x2go diff --git a/debian/x2goserver.docs b/debian/x2goserver.docs index 47a84d1..6c7d3af 100644 --- a/debian/x2goserver.docs +++ b/debian/x2goserver.docs @@ -1 +1 @@ -.build_man2html/html +x2goserver/.build_man2html/html diff --git a/debian/x2goserver.install b/debian/x2goserver.install index 78b0580..d33709c 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -1,6 +1,6 @@ -bin/x2go* /usr/bin/ -sbin/x2go* /usr/sbin/ -etc/x2gosql/sql /etc/x2go/x2gosql/ -etc/x2goserver.conf /etc/x2go/ -lib/x2godbwrapper.pm /usr/lib/x2go/ -VERSION.x2goserver /usr/share/x2go/versions/ \ No newline at end of file +x2goserver/bin/x2go* /usr/bin/ +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/VERSION.x2goserver /usr/share/x2go/versions/ \ No newline at end of file diff --git a/debian/x2goserver.manpages b/debian/x2goserver.manpages index b170884..88720a8 100644 --- a/debian/x2goserver.manpages +++ b/debian/x2goserver.manpages @@ -1 +1 @@ -man/man8/* \ No newline at end of file +x2goserver/man/man8/* \ No newline at end of file diff --git a/.build_man2html/html/man8/x2gosetkeyboard.8.html b/x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html similarity index 97% rename from .build_man2html/html/man8/x2gosetkeyboard.8.html rename to x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html index 12ac33b..334b8de 100644 --- a/.build_man2html/html/man8/x2gosetkeyboard.8.html +++ b/x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html @@ -56,6 +56,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 13:56:46 GMT, May 30, 2011 +Time: 09:22:50 GMT, May 31, 2011 </BODY> </HTML> diff --git a/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html similarity index 98% rename from .build_man2html/html/man8/x2goversion.8.html rename to x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html index 8e4658f..2f78649 100644 --- a/.build_man2html/html/man8/x2goversion.8.html +++ b/x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html @@ -64,6 +64,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 13:56:46 GMT, May 30, 2011 +Time: 09:22:50 GMT, May 31, 2011 </BODY> </HTML> diff --git a/Makefile b/x2goserver-extras/Makefile similarity index 57% copy from Makefile copy to x2goserver-extras/Makefile index bacf7fe..943529c 100755 --- a/Makefile +++ b/x2goserver-extras/Makefile @@ -14,14 +14,14 @@ DESTDIR= PREFIX=/usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go +#SBINDIR=$(PREFIX)/sbin +#LIBDIR=$(PREFIX)/lib/x2go MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +#SHAREDIR=$(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && ls) -SBIN_SCRIPTS=$(shell cd sbin && ls) -LIB_FILES=$(shell cd lib && ls) +#SBIN_SCRIPTS=$(shell cd sbin && ls) +#LIB_FILES=$(shell cd lib && ls) man_pages = `cd man && find * -type f` @@ -29,7 +29,7 @@ MAN2HTML_BIN = man2html MAN2HTML_SRC = man MAN2HTML_DEST = .build_man2html/html -all: build +all: clean build build: build_man2html @@ -38,22 +38,27 @@ build_man2html: for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done +clean: clean_man2html + +clean_man2html: + rm -rf `dirname $(MAN2HTML_DEST)` + install: install_scripts install_config install_man install_version install_scripts: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) +# $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) +# $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ - $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ - $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ +# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ +# $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ install_config: - $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) - $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql - $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords - $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ - $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql +# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) +# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql +# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords +# $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ +# $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -64,22 +69,22 @@ install_man: install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions - $(INSTALL_FILE) VERSION.x2goserver $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver + $(INSTALL_FILE) VERSION.x2goserver-extras $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extras uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done - for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done - for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done - $(RM_DIR) $(DESTDIR)$(LIBDIR) +# for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done +# for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done +# $(RM_DIR) $(DESTDIR)$(LIBDIR) uninstall_config: - $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf - $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql - $(RM_DIR) $(DESTDIR)$(ETCDIR) - $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords - $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql +# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf +# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql +# $(RM_DIR) $(DESTDIR)$(ETCDIR) +# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords +# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done @@ -87,5 +92,5 @@ uninstall_man: $(RM_DIR) $(DESTDIR)$(MANDIR) uninstall_version: - $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extras $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions diff --git a/VERSION.x2goserver b/x2goserver-extras/VERSION.x2goserver-extras similarity index 100% copy from VERSION.x2goserver copy to x2goserver-extras/VERSION.x2goserver-extras diff --git a/bin/x2gosetkeyboard b/x2goserver-extras/bin/x2gosetkeyboard similarity index 100% rename from bin/x2gosetkeyboard rename to x2goserver-extras/bin/x2gosetkeyboard diff --git a/bin/x2goversion b/x2goserver-extras/bin/x2goversion similarity index 100% rename from bin/x2goversion rename to x2goserver-extras/bin/x2goversion diff --git a/man/man8/x2gosetkeyboard.8 b/x2goserver-extras/man/man8/x2gosetkeyboard.8 similarity index 100% rename from man/man8/x2gosetkeyboard.8 rename to x2goserver-extras/man/man8/x2gosetkeyboard.8 diff --git a/man/man8/x2goversion.8 b/x2goserver-extras/man/man8/x2goversion.8 similarity index 100% rename from man/man8/x2goversion.8 rename to x2goserver-extras/man/man8/x2goversion.8 diff --git a/.build_man2html/html/man8/x2gocleansessions.8.html b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html similarity index 97% rename from .build_man2html/html/man8/x2gocleansessions.8.html rename to x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html index 9a0cbe5..fe99a4d 100644 --- a/.build_man2html/html/man8/x2gocleansessions.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 13:56:46 GMT, May 30, 2011 +Time: 09:22:50 GMT, May 31, 2011 </BODY> </HTML> diff --git a/.build_man2html/html/man8/x2golistsessions.8.html b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html similarity index 97% rename from .build_man2html/html/man8/x2golistsessions.8.html rename to x2goserver/.build_man2html/html/man8/x2golistsessions.8.html index 1f31606..69ab1a7 100644 --- a/.build_man2html/html/man8/x2golistsessions.8.html +++ b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 13:56:46 GMT, May 30, 2011 +Time: 09:22:50 GMT, May 31, 2011 </BODY> </HTML> diff --git a/.build_man2html/html/man8/x2gomountdirs.8.html b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html similarity index 97% rename from .build_man2html/html/man8/x2gomountdirs.8.html rename to x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html index 1d228c8..faf1196 100644 --- a/.build_man2html/html/man8/x2gomountdirs.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 13:56:46 GMT, May 30, 2011 +Time: 09:22:50 GMT, May 31, 2011 </BODY> </HTML> diff --git a/.build_man2html/html/man8/x2goprint.8.html b/x2goserver/.build_man2html/html/man8/x2goprint.8.html similarity index 97% rename from .build_man2html/html/man8/x2goprint.8.html rename to x2goserver/.build_man2html/html/man8/x2goprint.8.html index 129d3b0..fc1bbca 100644 --- a/.build_man2html/html/man8/x2goprint.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goprint.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 13:56:46 GMT, May 30, 2011 +Time: 09:22:50 GMT, May 31, 2011 </BODY> </HTML> diff --git a/.build_man2html/html/man8/x2goresume-session.8.html b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html similarity index 97% rename from .build_man2html/html/man8/x2goresume-session.8.html rename to x2goserver/.build_man2html/html/man8/x2goresume-session.8.html index f16bdc4..0cd8687 100644 --- a/.build_man2html/html/man8/x2goresume-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 13:56:46 GMT, May 30, 2011 +Time: 09:22:50 GMT, May 31, 2011 </BODY> </HTML> diff --git a/.build_man2html/html/man8/x2goruncommand.8.html b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html similarity index 97% rename from .build_man2html/html/man8/x2goruncommand.8.html rename to x2goserver/.build_man2html/html/man8/x2goruncommand.8.html index b5d6dd8..4920a79 100644 --- a/.build_man2html/html/man8/x2goruncommand.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 13:56:46 GMT, May 30, 2011 +Time: 09:22:50 GMT, May 31, 2011 </BODY> </HTML> diff --git a/.build_man2html/html/man8/x2gostartagent.8.html b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html similarity index 97% rename from .build_man2html/html/man8/x2gostartagent.8.html rename to x2goserver/.build_man2html/html/man8/x2gostartagent.8.html index e790777..27b8360 100644 --- a/.build_man2html/html/man8/x2gostartagent.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 13:56:46 GMT, May 30, 2011 +Time: 09:22:50 GMT, May 31, 2011 </BODY> </HTML> diff --git a/.build_man2html/html/man8/x2gosuspend-session.8.html b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html similarity index 97% rename from .build_man2html/html/man8/x2gosuspend-session.8.html rename to x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html index d855dc0..b6dea5c 100644 --- a/.build_man2html/html/man8/x2gosuspend-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 13:56:46 GMT, May 30, 2011 +Time: 09:22:50 GMT, May 31, 2011 </BODY> </HTML> diff --git a/.build_man2html/html/man8/x2goterminate-session.8.html b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html similarity index 97% rename from .build_man2html/html/man8/x2goterminate-session.8.html rename to x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html index 0e1ce4a..e927b5c 100644 --- a/.build_man2html/html/man8/x2goterminate-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 13:56:46 GMT, May 30, 2011 +Time: 09:22:50 GMT, May 31, 2011 </BODY> </HTML> diff --git a/.build_man2html/html/man8/x2goumount-session.8.html b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html similarity index 97% rename from .build_man2html/html/man8/x2goumount-session.8.html rename to x2goserver/.build_man2html/html/man8/x2goumount-session.8.html index e7f5a66..720fd4c 100644 --- a/.build_man2html/html/man8/x2goumount-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 13:56:46 GMT, May 30, 2011 +Time: 09:22:50 GMT, May 31, 2011 </BODY> </HTML> diff --git a/.build_man2html/html/man8/x2goumount.8.html b/x2goserver/.build_man2html/html/man8/x2goumount.8.html similarity index 97% rename from .build_man2html/html/man8/x2goumount.8.html rename to x2goserver/.build_man2html/html/man8/x2goumount.8.html index 3159c3c..f3efcce 100644 --- a/.build_man2html/html/man8/x2goumount.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goumount.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 13:56:46 GMT, May 30, 2011 +Time: 09:22:50 GMT, May 31, 2011 </BODY> </HTML> diff --git a/Makefile b/x2goserver/Makefile similarity index 96% copy from Makefile copy to x2goserver/Makefile index bacf7fe..8defaee 100755 --- a/Makefile +++ b/x2goserver/Makefile @@ -29,7 +29,7 @@ MAN2HTML_BIN = man2html MAN2HTML_SRC = man MAN2HTML_DEST = .build_man2html/html -all: build +all: clean build build: build_man2html @@ -38,6 +38,11 @@ build_man2html: for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done +clean: clean_man2html + +clean_man2html: + rm -rf `dirname $(MAN2HTML_DEST)` + install: install_scripts install_config install_man install_version install_scripts: diff --git a/VERSION.x2goserver b/x2goserver/VERSION.x2goserver similarity index 100% rename from VERSION.x2goserver rename to x2goserver/VERSION.x2goserver diff --git a/bin/x2gochangestatus b/x2goserver/bin/x2gochangestatus similarity index 100% rename from bin/x2gochangestatus rename to x2goserver/bin/x2gochangestatus diff --git a/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage similarity index 100% rename from bin/x2gocmdexitmessage rename to x2goserver/bin/x2gocmdexitmessage diff --git a/bin/x2gocreatesession b/x2goserver/bin/x2gocreatesession similarity index 100% rename from bin/x2gocreatesession rename to x2goserver/bin/x2gocreatesession diff --git a/bin/x2gogetagent b/x2goserver/bin/x2gogetagent similarity index 100% rename from bin/x2gogetagent rename to x2goserver/bin/x2gogetagent diff --git a/bin/x2gogetdisplays b/x2goserver/bin/x2gogetdisplays similarity index 100% rename from bin/x2gogetdisplays rename to x2goserver/bin/x2gogetdisplays diff --git a/bin/x2gogetports b/x2goserver/bin/x2gogetports similarity index 100% rename from bin/x2gogetports rename to x2goserver/bin/x2gogetports diff --git a/bin/x2gogetservers b/x2goserver/bin/x2gogetservers similarity index 100% rename from bin/x2gogetservers rename to x2goserver/bin/x2gogetservers diff --git a/bin/x2goinsertport b/x2goserver/bin/x2goinsertport similarity index 100% rename from bin/x2goinsertport rename to x2goserver/bin/x2goinsertport diff --git a/bin/x2goinsertsession b/x2goserver/bin/x2goinsertsession similarity index 100% rename from bin/x2goinsertsession rename to x2goserver/bin/x2goinsertsession diff --git a/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops similarity index 100% rename from bin/x2golistdesktops rename to x2goserver/bin/x2golistdesktops diff --git a/bin/x2golistsessions b/x2goserver/bin/x2golistsessions similarity index 100% rename from bin/x2golistsessions rename to x2goserver/bin/x2golistsessions diff --git a/bin/x2golistsessions_root b/x2goserver/bin/x2golistsessions_root similarity index 100% rename from bin/x2golistsessions_root rename to x2goserver/bin/x2golistsessions_root diff --git a/bin/x2golistsessions_sql b/x2goserver/bin/x2golistsessions_sql similarity index 100% rename from bin/x2golistsessions_sql rename to x2goserver/bin/x2golistsessions_sql diff --git a/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs similarity index 100% rename from bin/x2gomountdirs rename to x2goserver/bin/x2gomountdirs diff --git a/bin/x2goprint b/x2goserver/bin/x2goprint similarity index 100% rename from bin/x2goprint rename to x2goserver/bin/x2goprint diff --git a/bin/x2goresume b/x2goserver/bin/x2goresume similarity index 100% rename from bin/x2goresume rename to x2goserver/bin/x2goresume diff --git a/bin/x2goresume-session b/x2goserver/bin/x2goresume-session similarity index 100% rename from bin/x2goresume-session rename to x2goserver/bin/x2goresume-session diff --git a/bin/x2goruncommand b/x2goserver/bin/x2goruncommand similarity index 100% rename from bin/x2goruncommand rename to x2goserver/bin/x2goruncommand diff --git a/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit similarity index 100% rename from bin/x2gosessionlimit rename to x2goserver/bin/x2gosessionlimit diff --git a/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks similarity index 100% rename from bin/x2goshowblocks rename to x2goserver/bin/x2goshowblocks diff --git a/bin/x2gosqlitewrapper b/x2goserver/bin/x2gosqlitewrapper similarity index 100% rename from bin/x2gosqlitewrapper rename to x2goserver/bin/x2gosqlitewrapper diff --git a/bin/x2gostartagent b/x2goserver/bin/x2gostartagent similarity index 100% rename from bin/x2gostartagent rename to x2goserver/bin/x2gostartagent diff --git a/bin/x2gosuspend-agent b/x2goserver/bin/x2gosuspend-agent similarity index 100% rename from bin/x2gosuspend-agent rename to x2goserver/bin/x2gosuspend-agent diff --git a/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session similarity index 100% rename from bin/x2gosuspend-session rename to x2goserver/bin/x2gosuspend-session diff --git a/bin/x2goterminate b/x2goserver/bin/x2goterminate similarity index 100% rename from bin/x2goterminate rename to x2goserver/bin/x2goterminate diff --git a/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session similarity index 100% rename from bin/x2goterminate-session rename to x2goserver/bin/x2goterminate-session diff --git a/bin/x2goumount b/x2goserver/bin/x2goumount similarity index 100% rename from bin/x2goumount rename to x2goserver/bin/x2goumount diff --git a/bin/x2goumount-session b/x2goserver/bin/x2goumount-session similarity index 100% rename from bin/x2goumount-session rename to x2goserver/bin/x2goumount-session diff --git a/bin/x2goumount_session b/x2goserver/bin/x2goumount_session similarity index 100% rename from bin/x2goumount_session rename to x2goserver/bin/x2goumount_session diff --git a/etc/x2goserver.conf b/x2goserver/etc/x2goserver.conf similarity index 100% rename from etc/x2goserver.conf rename to x2goserver/etc/x2goserver.conf diff --git a/etc/x2gosql/sql b/x2goserver/etc/x2gosql/sql similarity index 100% rename from etc/x2gosql/sql rename to x2goserver/etc/x2gosql/sql diff --git a/x2goserver/lib/a.out b/x2goserver/lib/a.out new file mode 100755 index 0000000..af8f40e Binary files /dev/null and b/x2goserver/lib/a.out differ diff --git a/x2goserver/lib/setuidwrapper.c b/x2goserver/lib/setuidwrapper.c new file mode 100644 index 0000000..9280cdc --- /dev/null +++ b/x2goserver/lib/setuidwrapper.c @@ -0,0 +1,12 @@ +#include <unistd.h> +#include <stdio.h> + +#define myfile "test.py" + +main(argc, argv) +char **argv; +{ + setuid(0); + seteuid(0); + execv(myfile, argv); +} diff --git a/x2goserver/lib/test.py b/x2goserver/lib/test.py new file mode 100755 index 0000000..7eea6e3 --- /dev/null +++ b/x2goserver/lib/test.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python + +import os +import time + +print os.geteuid() +print os.getegid() + +time.sleep(1000) diff --git a/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm similarity index 100% rename from lib/x2godbwrapper.pm rename to x2goserver/lib/x2godbwrapper.pm diff --git a/man/man8/x2gocleansessions.8 b/x2goserver/man/man8/x2gocleansessions.8 similarity index 100% rename from man/man8/x2gocleansessions.8 rename to x2goserver/man/man8/x2gocleansessions.8 diff --git a/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8 similarity index 100% rename from man/man8/x2golistsessions.8 rename to x2goserver/man/man8/x2golistsessions.8 diff --git a/man/man8/x2gomountdirs.8 b/x2goserver/man/man8/x2gomountdirs.8 similarity index 100% rename from man/man8/x2gomountdirs.8 rename to x2goserver/man/man8/x2gomountdirs.8 diff --git a/man/man8/x2goprint.8 b/x2goserver/man/man8/x2goprint.8 similarity index 100% rename from man/man8/x2goprint.8 rename to x2goserver/man/man8/x2goprint.8 diff --git a/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8 similarity index 100% rename from man/man8/x2goresume-session.8 rename to x2goserver/man/man8/x2goresume-session.8 diff --git a/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8 similarity index 100% rename from man/man8/x2goruncommand.8 rename to x2goserver/man/man8/x2goruncommand.8 diff --git a/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8 similarity index 100% rename from man/man8/x2gostartagent.8 rename to x2goserver/man/man8/x2gostartagent.8 diff --git a/man/man8/x2gosuspend-session.8 b/x2goserver/man/man8/x2gosuspend-session.8 similarity index 100% rename from man/man8/x2gosuspend-session.8 rename to x2goserver/man/man8/x2gosuspend-session.8 diff --git a/man/man8/x2goterminate-session.8 b/x2goserver/man/man8/x2goterminate-session.8 similarity index 100% rename from man/man8/x2goterminate-session.8 rename to x2goserver/man/man8/x2goterminate-session.8 diff --git a/man/man8/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8 similarity index 100% rename from man/man8/x2goumount-session.8 rename to x2goserver/man/man8/x2goumount-session.8 diff --git a/man/man8/x2goumount.8 b/x2goserver/man/man8/x2goumount.8 similarity index 100% rename from man/man8/x2goumount.8 rename to x2goserver/man/man8/x2goumount.8 diff --git a/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions similarity index 100% rename from sbin/x2gocleansessions rename to x2goserver/sbin/x2gocleansessions diff --git a/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin similarity index 100% rename from sbin/x2godbadmin rename to x2goserver/sbin/x2godbadmin diff --git a/share/x2go/versions/VERSION.x2goserver b/x2goserver/share/x2go/versions/VERSION.x2goserver similarity index 100% rename from share/x2go/versions/VERSION.x2goserver rename to x2goserver/share/x2go/versions/VERSION.x2goserver 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).