x2go-commits September 2012

x2go-commits@lists.x2go.org

1 participants
231 discussions

x2goserver.git - master (branch) updated: 3.1.1.3-46-gcbebebc
by git-admin＠x2go.org 18 Sep '12

18 Sep '12

The branch, master has been updated via cbebebc2e846bdc7d1f2a699708804c4829ddaad (commit) via e4229c2ccb033dda63c92b65f40570feb3da339b (commit) via 55852fbd7d38a5486e02b405d6778c17a3d77e8a (commit) from d688c97dd8b0e89a9dc7477f4c8ce6d91d5f047f (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 cbebebc2e846bdc7d1f2a699708804c4829ddaad Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 21:23:35 2012 +0200 Move x2goserver.conf into separate package: x2goserver-common. Provide man page for x2goserver.conf. commit e4229c2ccb033dda63c92b65f40570feb3da339b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 21:19:35 2012 +0200 Install /etc/x2go/x2go_logout with its directory x2go_logout.d via Makefile installation. commit 55852fbd7d38a5486e02b405d6778c17a3d77e8a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 21:15:30 2012 +0200 update version and date in man pages ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 + debian/control | 19 +++++ debian/x2goserver-common.install | 2 + debian/x2goserver-common.manpages | 1 + debian/x2goserver.install | 2 +- {x2goserver-compat => x2goserver-common}/Makefile | 37 +++++----- .../VERSION.x2goserver-common | 0 .../etc/x2goserver.conf | 0 x2goserver-common/man/man5/x2goserver.conf.5 | 73 ++++++++++++++++++++ x2goserver-compat/man/man8/x2gosuspend-agent.8 | 2 +- x2goserver-compat/man/man8/x2gosuspend.8 | 2 +- x2goserver-compat/man/man8/x2goterminate.8 | 2 +- .../man/man8/x2goserver-run-extensions.8 | 2 +- x2goserver-fmbindings/man/man8/x2gofm.8 | 2 +- x2goserver-printing/man/man8/x2goprint.8 | 2 +- x2goserver/Makefile | 8 ++- x2goserver/man/man8/x2gobasepath.8 | 2 +- x2goserver/man/man8/x2gocleansessions.8 | 2 +- x2goserver/man/man8/x2gocmdexitmessage.8 | 2 +- x2goserver/man/man8/x2godbadmin.8 | 2 +- x2goserver/man/man8/x2gofeature.8 | 2 +- x2goserver/man/man8/x2gofeaturelist.8 | 2 +- x2goserver/man/man8/x2gogetservers.8 | 2 +- x2goserver/man/man8/x2golistdesktops.8 | 2 +- x2goserver/man/man8/x2golistmounts.8 | 2 +- x2goserver/man/man8/x2golistsessions.8 | 2 +- x2goserver/man/man8/x2golistsessions_root.8 | 2 +- x2goserver/man/man8/x2gomountdirs.8 | 2 +- x2goserver/man/man8/x2goresume-session.8 | 2 +- x2goserver/man/man8/x2goruncommand.8 | 2 +- x2goserver/man/man8/x2gosessionlimit.8 | 2 +- x2goserver/man/man8/x2gosetkeyboard.8 | 2 +- x2goserver/man/man8/x2goshowblocks.8 | 2 +- x2goserver/man/man8/x2gostartagent.8 | 2 +- x2goserver/man/man8/x2gosuspend-session.8 | 2 +- x2goserver/man/man8/x2goterminate-session.8 | 2 +- x2goserver/man/man8/x2goumount-session.8 | 2 +- x2goserver/man/man8/x2goversion.8 | 2 +- 38 files changed, 153 insertions(+), 49 deletions(-) create mode 100644 debian/x2goserver-common.install create mode 100644 debian/x2goserver-common.manpages copy {x2goserver-compat => x2goserver-common}/Makefile (65%) copy x2goserver-compat/VERSION.x2goserver-compat => x2goserver-common/VERSION.x2goserver-common (100%) copy {x2goserver => x2goserver-common}/etc/x2goserver.conf (100%) create mode 100644 x2goserver-common/man/man5/x2goserver.conf.5 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9567fa1..c4c24d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low - Move X2Go SQL configuration files (/etc/x2go/x2gosql) into package libx2go-server-db-perl. - Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks GNOME. + - Install /etc/x2go/x2go_logout with its directory x2go_logout.d via Makefile + installation. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder. @@ -34,6 +36,8 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low + Package X2Go::Log in separate package: libx2go-log-perl. + Package X2Go::Server::DB in separate package: libx2go-server-db-perl. + x2goserver package: Depend on libx2go-log-perl, libx2go-server-db-perl. + + Move x2goserver.conf into separate package: x2goserver-common. Provide + man page for x2goserver.conf. [ Oleksandr Shneyder ] * New upstream version (3.2.0.0): diff --git a/debian/control b/debian/control index 1f47f49..a1a2530 100644 --- a/debian/control +++ b/debian/control @@ -13,12 +13,29 @@ Homepage: http://code.x2go.org/releases/source/x2goserver Vcs-Git: git://code.x2go.org/x2goserver.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary +Package: x2goserver-common +Architecture: any +Depends: + ${misc:Depends}, +Description: X2Go Server (common files) + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This package contains files needed by the X2Go Server + and the X2Go::Server Perl API. + Package: libx2go-server-perl Architecture: any Section: perl Depends: ${perl:Depends}, ${misc:Depends}, + x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), Description: Perl X2Go::Server package X2Go is a server based computing environment with - session resuming @@ -38,6 +55,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libx2go-server-perl (>= ${source:Version}), libx2go-server-perl (<< ${source:Version}.1~), + x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), Description: Perl X2Go::Server:DB package X2Go is a server based computing environment with - session resuming @@ -55,6 +73,7 @@ Section: perl Depends: ${perl:Depends}, ${misc:Depends}, + x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), Description: Perl X2Go::Log package X2Go is a server based computing environment with - session resuming diff --git a/debian/x2goserver-common.install b/debian/x2goserver-common.install new file mode 100644 index 0000000..1bf6502 --- /dev/null +++ b/debian/x2goserver-common.install @@ -0,0 +1,2 @@ +x2goserver/etc/x2go* /etc/x2go/ +x2goserver/VERSION.x2goserver-common /usr/share/x2go/versions/ diff --git a/debian/x2goserver-common.manpages b/debian/x2goserver-common.manpages new file mode 100644 index 0000000..18d0d48 --- /dev/null +++ b/debian/x2goserver-common.manpages @@ -0,0 +1 @@ +x2goserver/man/man5/* \ No newline at end of file diff --git a/debian/x2goserver.install b/debian/x2goserver.install index d51c15d..259301f 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -1,6 +1,6 @@ x2goserver/bin/x2go* /usr/bin/ x2goserver/sbin/x2go* /usr/sbin/ x2goserver/lib/x2go* /usr/lib/x2go/ -x2goserver/etc/x2go* /etc/x2go/ +x2goserver/etc/x2go_logout* /etc/x2go/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/share/x2gofeature.d /usr/share/x2go/ diff --git a/x2goserver-compat/Makefile b/x2goserver-common/Makefile similarity index 65% copy from x2goserver-compat/Makefile copy to x2goserver-common/Makefile index 3775dae..bb9df7d 100755 --- a/x2goserver-compat/Makefile +++ b/x2goserver-common/Makefile @@ -20,8 +20,8 @@ MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) -#SBIN_SCRIPTS=$(shell cd sbin && echo *) -#LIB_FILES=$(shell cd lib && echo *) +SBIN_SCRIPTS=$(shell cd sbin && echo *) +LIB_FILES=$(shell cd lib && echo *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` @@ -43,45 +43,46 @@ 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) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done -clean: clean_man2html +clean: clean-arch clean-indep + +clean-arch: + +clean-indep: clean_man2html clean_man2html: - rm -rf `dirname $(MAN2HTML_DEST)` + rm -Rf `dirname $(MAN2HTML_DEST)` install: install_scripts install_config install_man install_version install_scripts: - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) - $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ - $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) + $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ 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_DIR) $(DESTDIR)$(MANDIR)/man5 + $(INSTALL_FILE) man/man5/*.5 $(DESTDIR)$(MANDIR)/man5 + gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.5 install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions - $(INSTALL_FILE) VERSION.x2goserver-compat $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-compat + $(INSTALL_FILE) VERSION.x2goserver-common $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-common 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 $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: + $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf + $(RM_DIR) $(DESTDIR)$(ETCDIR) || true 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 + for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man5/$$file.5.gz; done + for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man5/$$file.5.gz; done $(RM_DIR) $(DESTDIR)$(MANDIR) || true uninstall_version: - $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-compat + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-common $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-common/VERSION.x2goserver-common similarity index 100% copy from x2goserver-compat/VERSION.x2goserver-compat copy to x2goserver-common/VERSION.x2goserver-common diff --git a/x2goserver/etc/x2goserver.conf b/x2goserver-common/etc/x2goserver.conf similarity index 100% copy from x2goserver/etc/x2goserver.conf copy to x2goserver-common/etc/x2goserver.conf diff --git a/x2goserver-common/man/man5/x2goserver.conf.5 b/x2goserver-common/man/man5/x2goserver.conf.5 new file mode 100644 index 0000000..ecceb11 --- /dev/null +++ b/x2goserver-common/man/man5/x2goserver.conf.5 @@ -0,0 +1,73 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goserver.conf 5 "Sep 2012" "Version 3.2.x.y" "X2Go Server Configuration" +.SH NAME +x2goserver.conf \- X2Go Server Main Configuration File +.SH SYNOPSIS +'nh +.fi +.ad 1 +x2goserver.conf + +.SH DESCRIPTION +\fBx2goserver.conf\fR is the main configuration file for X2Go Server and the \fBX2Go::Server\fR Perl API. +.SH SECTIONS +The \fBx2goserver.conf\fR's configuration file format is an INI-based configuration format. It falls +apart into sections and options with their values. + + [section1] + sec1option1 = valueA + sec1option2 = valueB + ... + + [section2] + sec2option1 = valueC + sec2option2 = valueD + ... + +.SH SECTION [limit users] +In this section you can list up Posix users known to the system and specify the max. number of allowed +simultaneous X2Go sessions in an X2Go Server farm. +.PP +.SH SECTION [limit groups] +In this section you can list up Posix group names known to the system and specify the max. number of allowed +simultaneous X2Go sessions in an X2Go Server farm. The session limitation applies to all users in the specified +groups. +.PP +If individual users are listed in section \fI[limit users]\fR and some of their groups are listed in +section \fI[limit groups]\fR, then the maximum value of allowed sessions will be chosen. +.PP +If a user is a member of several of the specified groups under section \fI[limit groups]\fR, then the number +of allowed simultaneous X2Go sessions for a certain user will be derived from the group with the +most allowed sessions found under this section. +.PP +.SH SECTION [log] +The \fI[log]\fR's section only option is the \fIloglevel\fR option. Allowed values are: +.TP 5 + emerg, alert, crit, err, warning, notice, info, debug. +.PP +The \fIloglevel\fR option controls the verbosity of the X2Go::Server Perl functions. The log output +appears via LOCAL7 (normally: /var/log/syslog). +.PP +.SH EXAMPLE +The below configuration file is the default after installation of X2Go Server: + + [limit users] + #user-foo=1 + + [limit groups] + #bar-group=1 + + [log] + # possible levels are: + # emerg, alert, crit, err, warning, notice, info, debug + loglevel=notice + +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). diff --git a/x2goserver-compat/man/man8/x2gosuspend-agent.8 b/x2goserver-compat/man/man8/x2gosuspend-agent.8 index bb91061..a1f598b 100644 --- a/x2goserver-compat/man/man8/x2gosuspend-agent.8 +++ b/x2goserver-compat/man/man8/x2gosuspend-agent.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-agent 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (compat)" +.TH x2gosuspend-agent 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool (compat)" .SH NAME x2gosuspend-agent \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS diff --git a/x2goserver-compat/man/man8/x2gosuspend.8 b/x2goserver-compat/man/man8/x2gosuspend.8 index a0c59ac..596c53f 100644 --- a/x2goserver-compat/man/man8/x2gosuspend.8 +++ b/x2goserver-compat/man/man8/x2gosuspend.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (compat)" +.TH x2gosuspend 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool (compat)" .SH NAME x2gosuspend \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS diff --git a/x2goserver-compat/man/man8/x2goterminate.8 b/x2goserver-compat/man/man8/x2goterminate.8 index f91d6b8..8fea881 100644 --- a/x2goserver-compat/man/man8/x2goterminate.8 +++ b/x2goserver-compat/man/man8/x2goterminate.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (compat)" +.TH x2goterminate 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool (compat)" .SH NAME x2goterminate \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS diff --git a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 index 9e3d86d..e2c0c34 100644 --- a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 +++ b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goserver-run-extensions 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goserver-run-extensions 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2goserver-run-extensions \- Run X2Go Server Extensions .SH SYNOPSIS diff --git a/x2goserver-fmbindings/man/man8/x2gofm.8 b/x2goserver-fmbindings/man/man8/x2gofm.8 index 576d5e4..52dcecc 100644 --- a/x2goserver-fmbindings/man/man8/x2gofm.8 +++ b/x2goserver-fmbindings/man/man8/x2gofm.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofm 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server" +.TH x2gofm 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server" .SH NAME x2gofm \- X2Go wrapper for Browsing X2Go Shared Folders .SH SYNOPSIS diff --git a/x2goserver-printing/man/man8/x2goprint.8 b/x2goserver-printing/man/man8/x2goprint.8 index c22276a..c501cfd 100644 --- a/x2goserver-printing/man/man8/x2goprint.8 +++ b/x2goserver-printing/man/man8/x2goprint.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goprint 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goprint 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2goprint \- Process X2Go Print Job .SH SYNOPSIS diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 87af41a..53b54c9 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -66,7 +66,9 @@ install_scripts: install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) - $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2go_logout.d + $(INSTALL_FILE) etc/x2go_logout $(DESTDIR)$(ETCDIR)/ + $(INSTALL_FILE) etc/x2go_logout.d/* $(DESTDIR)$(ETCDIR)/x2go_logout.d/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -91,7 +93,9 @@ uninstall_scripts: $(RM_DIR) $(DESTDIR)$(SHAREDIR) || true uninstall_config: - $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf + $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2go_logout.d/* + $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2go_logout + $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2go_logout.d || true $(RM_DIR) $(DESTDIR)$(ETCDIR) || true uninstall_man: diff --git a/x2goserver/man/man8/x2gobasepath.8 b/x2goserver/man/man8/x2gobasepath.8 index 3388820..6b8abb9 100644 --- a/x2goserver/man/man8/x2gobasepath.8 +++ b/x2goserver/man/man8/x2gobasepath.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobasepath 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gobasepath 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2gobasepath \- Detect Base Path of X2Go Server Installation .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gocleansessions.8 b/x2goserver/man/man8/x2gocleansessions.8 index 0fc587b..cbf2415 100644 --- a/x2goserver/man/man8/x2gocleansessions.8 +++ b/x2goserver/man/man8/x2gocleansessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocleansessions 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gocleansessions 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2gocleansessions \- X2Go Server Cleanup Daemon .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gocmdexitmessage.8 b/x2goserver/man/man8/x2gocmdexitmessage.8 index 7752080..3a6c7c2 100644 --- a/x2goserver/man/man8/x2gocmdexitmessage.8 +++ b/x2goserver/man/man8/x2gocmdexitmessage.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocmdexitmessage 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gocmdexitmessage 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2gocmdexitmessage \- Exit Message of X2Go Command .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2godbadmin.8 b/x2goserver/man/man8/x2godbadmin.8 index 314e68b..724bb5a 100644 --- a/x2goserver/man/man8/x2godbadmin.8 +++ b/x2goserver/man/man8/x2godbadmin.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2godbadmin 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Admin Tool" +.TH x2godbadmin 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Admin Tool" .SH NAME x2godbadmin \- X2Go Server Database Administrator .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gofeature.8 b/x2goserver/man/man8/x2gofeature.8 index facc29f..e421d0b 100644 --- a/x2goserver/man/man8/x2gofeature.8 +++ b/x2goserver/man/man8/x2gofeature.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofeature 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gofeature 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2gofeature \- Query X2Go Feature Availability on X2Go Server .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gofeaturelist.8 b/x2goserver/man/man8/x2gofeaturelist.8 index e3ec8e6..7f5d22b 100644 --- a/x2goserver/man/man8/x2gofeaturelist.8 +++ b/x2goserver/man/man8/x2gofeaturelist.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofeaturelist 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gofeaturelist 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2gofeaturelist \- Query X2Go Feature List for X2Go Server .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gogetservers.8 b/x2goserver/man/man8/x2gogetservers.8 index a0b03df..f2e13cf 100644 --- a/x2goserver/man/man8/x2gogetservers.8 +++ b/x2goserver/man/man8/x2gogetservers.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gogetservers 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gogetservers 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2gogetservers \- Retrieve list of available X2Go servers .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistdesktops.8 b/x2goserver/man/man8/x2golistdesktops.8 index 6dc25cf..bd5aa57 100644 --- a/x2goserver/man/man8/x2golistdesktops.8 +++ b/x2goserver/man/man8/x2golistdesktops.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistdesktops 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2golistdesktops 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2golistdesktops \- List Available X Desktops .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8 index d876851..6fdac4b 100644 --- a/x2goserver/man/man8/x2golistmounts.8 +++ b/x2goserver/man/man8/x2golistmounts.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistmounts 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2golistmounts 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2golistmounts \- List Mounted Shares for an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8 index c872745..0448e12 100644 --- a/x2goserver/man/man8/x2golistsessions.8 +++ b/x2goserver/man/man8/x2golistsessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2golistsessions 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2golistsessions \- List Available X2Go Sessions for User .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistsessions_root.8 b/x2goserver/man/man8/x2golistsessions_root.8 index 41e89e6..0d09c5c 100644 --- a/x2goserver/man/man8/x2golistsessions_root.8 +++ b/x2goserver/man/man8/x2golistsessions_root.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions_root 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Admin Tool" +.TH x2golistsessions_root 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Admin Tool" .SH NAME x2golistsessions_root \- List X2Go Sessions for System .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gomountdirs.8 b/x2goserver/man/man8/x2gomountdirs.8 index b58544a..66a513d 100644 --- a/x2goserver/man/man8/x2gomountdirs.8 +++ b/x2goserver/man/man8/x2gomountdirs.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gomountdirs 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gomountdirs 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2gomountdirs \- Share Client-Side Folder with X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8 index 6a8c2a1..442c856 100644 --- a/x2goserver/man/man8/x2goresume-session.8 +++ b/x2goserver/man/man8/x2goresume-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goresume-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goresume-session 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2goresume-session \- Resume X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8 index 0952072..5a274c6 100644 --- a/x2goserver/man/man8/x2goruncommand.8 +++ b/x2goserver/man/man8/x2goruncommand.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goruncommand 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goruncommand 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2goruncommand \- Launch Command inside an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosessionlimit.8 b/x2goserver/man/man8/x2gosessionlimit.8 index 5f35c98..48f75f6 100644 --- a/x2goserver/man/man8/x2gosessionlimit.8 +++ b/x2goserver/man/man8/x2gosessionlimit.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosessionlimit 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gosessionlimit 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2gosessionlimit \- Detect Session Limit for User or Group .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosetkeyboard.8 b/x2goserver/man/man8/x2gosetkeyboard.8 index 3e9baaf..ccd6808 100644 --- a/x2goserver/man/man8/x2gosetkeyboard.8 +++ b/x2goserver/man/man8/x2gosetkeyboard.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosetkeyboard 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (PyHoca)" +.TH x2gosetkeyboard 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool (PyHoca)" .SH NAME x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2Go Client .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goshowblocks.8 b/x2goserver/man/man8/x2goshowblocks.8 index 282ebde..8ca742a 100644 --- a/x2goserver/man/man8/x2goshowblocks.8 +++ b/x2goserver/man/man8/x2goshowblocks.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goshowblocks 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goshowblocks 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2goshowblocks \- Show X2Go-Mounted Block Devices .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8 index 7c86d2e..db3382c 100644 --- a/x2goserver/man/man8/x2gostartagent.8 +++ b/x2goserver/man/man8/x2gostartagent.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gostartagent 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gostartagent 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2gostartagent \- Start a New X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosuspend-session.8 b/x2goserver/man/man8/x2gosuspend-session.8 index 4646a9c..3c6ac42 100644 --- a/x2goserver/man/man8/x2gosuspend-session.8 +++ b/x2goserver/man/man8/x2gosuspend-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gosuspend-session 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2gosuspend-session \- Suspend an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goterminate-session.8 b/x2goserver/man/man8/x2goterminate-session.8 index 2c72b9c..4ae80bc 100644 --- a/x2goserver/man/man8/x2goterminate-session.8 +++ b/x2goserver/man/man8/x2goterminate-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goterminate-session 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2goterminate-session \- Terminate an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8 index f256d5a..d72fa66 100644 --- a/x2goserver/man/man8/x2goumount-session.8 +++ b/x2goserver/man/man8/x2goumount-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goumount-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goumount-session 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2goumount-session \- Unshare mounted Folders from X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goversion.8 b/x2goserver/man/man8/x2goversion.8 index a7675a7..c5909bd 100644 --- a/x2goserver/man/man8/x2goversion.8 +++ b/x2goserver/man/man8/x2goversion.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goversion 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goversion 8 "Sep 2012" "Version 3.2.x.y" "X2Go Server Tool" .SH NAME x2goversion \- Retrieve Code Versions of X2Go Server Components .SH SYNOPSIS 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-43-gd688c97
by git-admin＠x2go.org 18 Sep '12

18 Sep '12

The branch, master has been updated via d688c97dd8b0e89a9dc7477f4c8ce6d91d5f047f (commit) from 8ee62de49fe31611822772bda79e995afb9c6e9b (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 d688c97dd8b0e89a9dc7477f4c8ce6d91d5f047f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 17:54:29 2012 +0200 Move X2Go SQL configuration files (/etc/x2go/x2gosql) into package libx2go-server-db-perl. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/libx2go-server-db-perl.install | 1 + debian/x2goserver.install | 2 +- libx2go-server-db-perl/Makefile | 20 ++++++++++++++++++-- .../etc/x2gosql/sql | 0 x2goserver/Makefile | 6 ------ 6 files changed, 22 insertions(+), 9 deletions(-) rename {x2goserver => libx2go-server-db-perl}/etc/x2gosql/sql (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ea42889..9567fa1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low SQLite3 into Perl package X2Go::Server::DB::SQLite3. - Move x2gosqlitewrapper into Perl package X2Go::Server::DB::SQLite3. - Move PostgreSQL DB code into Perl package X2Go::Server::DB::PostgreSQL. + - Move X2Go SQL configuration files (/etc/x2go/x2gosql) into package + libx2go-server-db-perl. - Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks GNOME. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. diff --git a/debian/libx2go-server-db-perl.install b/debian/libx2go-server-db-perl.install index 18d0fd0..0663307 100644 --- a/debian/libx2go-server-db-perl.install +++ b/debian/libx2go-server-db-perl.install @@ -3,3 +3,4 @@ usr/share/man/man3/X2Go::Server::DB.* usr/share/man/man3/X2Go::Server::DB::* libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper /usr/lib/x2go/ libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl /usr/lib/x2go/ +libx2go-server-db-perl/etc/x2go* /etc/x2go/ diff --git a/debian/x2goserver.install b/debian/x2goserver.install index 879a538..d51c15d 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -1,6 +1,6 @@ x2goserver/bin/x2go* /usr/bin/ x2goserver/sbin/x2go* /usr/sbin/ x2goserver/lib/x2go* /usr/lib/x2go/ -x2goserver/etc/* /etc/x2go/ +x2goserver/etc/x2go* /etc/x2go/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/share/x2gofeature.d /usr/share/x2go/ diff --git a/libx2go-server-db-perl/Makefile b/libx2go-server-db-perl/Makefile index 0b29ba1..bde1379 100755 --- a/libx2go-server-db-perl/Makefile +++ b/libx2go-server-db-perl/Makefile @@ -46,11 +46,27 @@ clean-arch: clean-indep: -install: +install: install_scripts install_config + +install_scripts: $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) lib/* $(DESTDIR)$(LIBDIR)/ getent group x2gouser &>/dev/null && chown root:x2gouser $(DESTDIR)$(LIBDIR)/libx2go-server-db-sqlite3-wrapper || true chmod 2755 $(DESTDIR)$(LIBDIR)/libx2go-server-db-sqlite3-wrapper -uninstall: +install_config: + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords + $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql + +uninstall: uninstall_scripts uninstall_config + +uninstall_scripts: for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done + +uninstall_config: + $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql + $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true + $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true + $(RM_DIR) $(DESTDIR)$(ETCDIR) || true diff --git a/x2goserver/etc/x2gosql/sql b/libx2go-server-db-perl/etc/x2gosql/sql similarity index 100% rename from x2goserver/etc/x2gosql/sql rename to libx2go-server-db-perl/etc/x2gosql/sql diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 27c2e06..87af41a 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -66,10 +66,7 @@ install_scripts: 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) @@ -95,10 +92,7 @@ uninstall_scripts: uninstall_config: $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf - $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql $(RM_DIR) $(DESTDIR)$(ETCDIR) || true - $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true - $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-42-g8ee62de
by git-admin＠x2go.org 18 Sep '12

18 Sep '12

The branch, master has been updated via 8ee62de49fe31611822772bda79e995afb9c6e9b (commit) from 2717399a640dbd5434fbebab6749f606d37cd23d (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 8ee62de49fe31611822772bda79e995afb9c6e9b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 16:19:56 2012 +0200 Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks GNOME. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2goruncommand | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7f5c09c..ea42889 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low SQLite3 into Perl package X2Go::Server::DB::SQLite3. - Move x2gosqlitewrapper into Perl package X2Go::Server::DB::SQLite3. - Move PostgreSQL DB code into Perl package X2Go::Server::DB::PostgreSQL. + - Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks GNOME. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder. diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index f5eb7aa..d783a3a 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -53,11 +53,10 @@ export QT_GRAPHICSSYSTEM=native IMEXIT="false" NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama -NX_XRANDR_LIBS=/usr/lib/nx/X11/Xrandr NX_LIBS=/usr/lib/nx/X11 test -n "$LD_LIBRARY_PATH" && \ - LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_XRANDR_LIBS:$NX_LIBS:$LD_LIBRARY_PATH" || \ - LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_XRANDR_LIBS:$NX_LIBS" + LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS:$LD_LIBRARY_PATH" || \ + LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS" $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "exporting LD_LIBRARY_PATH=$LD_LIBRARY_PATH" export LD_LIBRARY_PATH @@ -120,6 +119,10 @@ elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then elif [ "$cmd" == "KDE" ]; then cmd="/usr/bin/startkde" + NX_XRANDR_LIBS=/usr/lib/nx/X11/Xrandr + LD_LIBRARY_PATH="$NX_XRANDR_LIBS:$LD_LIBRARY_PATH" + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "extending LD_LIBRARY_PATH=$LD_LIBRARY_PATH by Xrandr extension" + export LD_LIBRARY_PATH elif [ "$cmd" == "XFCE4" ]; then cmd="/usr/bin/xfce4-session" elif [ "$cmd" == "LXDE" ]; then 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-41-g2717399
by git-admin＠x2go.org 18 Sep '12

18 Sep '12

The branch, master has been updated via 2717399a640dbd5434fbebab6749f606d37cd23d (commit) from b71edeef0826027809904dbff0577f34fdd0fa4c (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 2717399a640dbd5434fbebab6749f606d37cd23d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 15:33:27 2012 +0200 bumb VERSION.* files to 3.2.0.0 ----------------------------------------------------------------------- Summary of changes: x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index f927970..6744a5d 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.1.4 \ No newline at end of file +3.2.0.0 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index f927970..6744a5d 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.1.4 \ No newline at end of file +3.2.0.0 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index f927970..6744a5d 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.1.4 \ No newline at end of file +3.2.0.0 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index f927970..6744a5d 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.1.4 \ No newline at end of file +3.2.0.0 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index f927970..6744a5d 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.1.4 \ No newline at end of file +3.2.0.0 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index f927970..6744a5d 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.1.4 \ No newline at end of file +3.2.0.0 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index f927970..6744a5d 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.1.4 \ No newline at end of file +3.2.0.0 \ No newline at end of file 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-40-gb71edee
by git-admin＠x2go.org 18 Sep '12

18 Sep '12

The branch, master has been updated via b71edeef0826027809904dbff0577f34fdd0fa4c (commit) from e349e14b1419227370143d4b8eb244ea9dfb845a (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 b71edeef0826027809904dbff0577f34fdd0fa4c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 15:31:30 2012 +0200 PostgreSQL.pm is a module now, return True at the end ----------------------------------------------------------------------- Summary of changes: X2Go/Server/DB/PostgreSQL.pm | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm index db28f5e..2400f60 100644 --- a/X2Go/Server/DB/PostgreSQL.pm +++ b/X2Go/Server/DB/PostgreSQL.pm @@ -492,3 +492,5 @@ sub db_listsessions_all $dbh->disconnect(); return @sessions; } + +1; 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-39-ge349e14
by git-admin＠x2go.org 18 Sep '12

18 Sep '12

The branch, master has been updated via e349e14b1419227370143d4b8eb244ea9dfb845a (commit) from 3cbeb3298325cdd6a9a7b831a1cd522e2804d25f (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 e349e14b1419227370143d4b8eb244ea9dfb845a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 15:27:47 2012 +0200 add perldoc header to SQLite3 db backend, make sure all man3 pages get installed into libx2go-server-db-perl package ----------------------------------------------------------------------- Summary of changes: X2Go/Server/DB/SQLite3.pm | 10 ++++++++++ debian/libx2go-server-db-perl.install | 3 ++- 2 files changed, 12 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/X2Go/Server/DB/SQLite3.pm b/X2Go/Server/DB/SQLite3.pm index a1edb22..3a8df6f 100644 --- a/X2Go/Server/DB/SQLite3.pm +++ b/X2Go/Server/DB/SQLite3.pm @@ -22,6 +22,16 @@ package X2Go::Server::DB::SQLite3; +=head1 NAME + +X2Go::Server::DB::SQLite3 - X2Go Session Database package for Perl (SQLite3 backend) + +=head1 DESCRIPTION + +X2Go::Server::DB::SQLite3 Perl package for X2Go::Server. + +=cut + use strict; use DBI; use POSIX; diff --git a/debian/libx2go-server-db-perl.install b/debian/libx2go-server-db-perl.install index ee0dde1..18d0fd0 100644 --- a/debian/libx2go-server-db-perl.install +++ b/debian/libx2go-server-db-perl.install @@ -1,4 +1,5 @@ usr/share/perl5/X2Go/Server/DB* usr/share/man/man3/X2Go::Server::DB.* +usr/share/man/man3/X2Go::Server::DB::* libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper /usr/lib/x2go/ -libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl /usr/lib/x2go/ \ No newline at end of file +libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl /usr/lib/x2go/ 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-38-g3cbeb32
by git-admin＠x2go.org 18 Sep '12

18 Sep '12

The branch, master has been updated via 3cbeb3298325cdd6a9a7b831a1cd522e2804d25f (commit) via 8314a25a7d51a0d5d4d7b5c8c17ad30f2eec0cca (commit) from 9ecd656786072f85d444523ef3954889f69900b2 (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 3cbeb3298325cdd6a9a7b831a1cd522e2804d25f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 15:19:49 2012 +0200 changelog fix commit 8314a25a7d51a0d5d4d7b5c8c17ad30f2eec0cca Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 15:19:26 2012 +0200 Move PostgreSQL DB code into Perl package X2Go::Server::DB::PostgreSQL. ----------------------------------------------------------------------- Summary of changes: X2Go/Server/DB.pm | 311 +++----------------------- X2Go/Server/DB/PostgreSQL.pm | 494 ++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 4 +- 3 files changed, 531 insertions(+), 278 deletions(-) create mode 100644 X2Go/Server/DB/PostgreSQL.pm The diff of changes is: diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm index 42a3453..45f1ec9 100644 --- a/X2Go/Server/DB.pm +++ b/X2Go/Server/DB.pm @@ -37,6 +37,7 @@ use POSIX; use Sys::Syslog qw( :standard :macros ); use X2Go::Log qw(loglevel); +use X2Go::Server::DB::PostgreSQL; setlogmask( LOG_UPTO(loglevel()) ); @@ -60,40 +61,6 @@ if ($backend ne 'postgres' && $backend ne 'sqlite') die "unknown backend $backend"; } -if ($backend eq 'postgres') -{ - $host=$Config->param("postgres.host"); - $port=$Config->param("postgres.port"); - if (!$host) - { - $host='localhost'; - } - if (!$port) - { - $port='5432'; - } - my $passfile; - if ($uname eq 'root') - { - $dbuser='x2godbuser'; - $passfile="/etc/x2go/x2gosql/passwords/x2goadmin"; - } - else - { - $dbuser="x2gouser_$uname"; - $passfile="$homedir/.x2go/sqlpass"; - } - $sslmode=$Config->param("postgres.ssl"); - if (!$sslmode) - { - $sslmode="prefer"; - } - open (FL,"< $passfile") or die "Can't read password file $passfile Use x2godbadmin on server to configure database access for user $uname "; - $dbpass=<FL>; - close(FL); - chomp($dbpass); -} - use base 'Exporter'; our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', 'db_getstatus', @@ -107,13 +74,7 @@ sub dbsys_rmsessionsroot dbsys_deletemounts($sid); if($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", - "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; - - my $sth=$dbh->prepare("delete from sessions where session_id='$sid'"); - $sth->execute() or die; - $sth=$dbh->prepare("delete from used_ports where session_id='$sid'"); - $sth->execute() or die; + X2Go::Server::DB::PostgreSQL::dbsys_rmsessionsroot($sid); } if($backend eq 'sqlite') { @@ -123,20 +84,16 @@ sub dbsys_rmsessionsroot sub dbsys_deletemounts { - my $sid=shift or die "argument \"session_id\" missed"; - if ($backend eq 'postgres') - { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; - my $sth=$dbh->prepare("delete from mounts where session_id='$sid'"); - $sth->execute(); - $sth->finish(); - $dbh->disconnect(); - } - if ($backend eq 'sqlite') - { - `$x2go_lib_path/libx2go-server-db-sqlite3-wrapper deletemounts $sid`; - } - syslog('debug', "dbsys_deletemounts called, session ID: $sid"); + my $sid=shift or die "argument \"session_id\" missed"; + if ($backend eq 'postgres') + { + X2Go::Server::DB::PostgreSQL::dbsys_deletemounts($sid); + } + if ($backend eq 'sqlite') + { + `$x2go_lib_path/libx2go-server-db-sqlite3-wrapper deletemounts $sid`; + } + syslog('debug', "dbsys_deletemounts called, session ID: $sid"); } sub dbsys_listsessionsroot @@ -144,25 +101,7 @@ sub dbsys_listsessionsroot my $server=shift or die "argument \"server\" missed"; 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 $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'),cookie,client,gr_port, - sound_port,to_char(last_time,'YYYY-MM-DDTHH24:MI:SS'),uname, - to_char(now()-init_time,'SSSS'),fs_port from sessions - where server='$server' order by status desc"); - $sth->execute()or die; - my @data; - my $i=0; - while (@data = $sth->fetchrow_array) - { - @strings[$i++]=join('|',@data); - } - $sth->finish(); - $dbh->disconnect(); - return @strings; + return X2Go::Server::DB::PostgreSQL::dbsys_listsessionsroot($server); } if($backend eq 'sqlite') { @@ -174,23 +113,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 $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'),cookie,client,gr_port, - sound_port,to_char(last_time,'YYYY-MM-DDTHH24:MI:SS'),uname, - to_char(now()-init_time,'SSSS'),fs_port from sessions - order by status desc"); - $sth->execute()or die; - my @data; - my $i=0; - while (@data = $sth->fetchrow_array) - { - @strings[$i++]=join('|',@data); - } - $sth->finish(); - $dbh->disconnect(); - return @strings; + return X2Go::Server::DB::PostgreSQL::dbsys_listsessionsroot_all(); } if ($backend eq 'sqlite') { @@ -204,19 +127,7 @@ sub dbsys_getmounts my $sid=shift or die "argument \"session_id\" missed"; 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 $sth=$dbh->prepare("select client, path from mounts where session_id='$sid'"); - $sth->execute()or die; - my @data; - my $i=0; - while (@data = $sth->fetchrow_array) - { - @strings[$i++]=join("|",@data); - } - $sth->finish(); - $dbh->disconnect(); - @mounts = @strings; + @mounts = X2Go::Server::DB::PostgreSQL::dbsys_getmounts($sid); } if ($backend eq 'sqlite') { @@ -233,19 +144,7 @@ sub db_getmounts my $sid=shift or die "argument \"session_id\" missed"; 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 $sth=$dbh->prepare("select client, path from mounts_view where session_id='$sid'"); - $sth->execute()or die; - my @data; - my $i=0; - while (@data = $sth->fetchrow_array) - { - @strings[$i++]=join("|",@data); - } - $sth->finish(); - $dbh->disconnect(); - @mounts = @strings; + @mounts = X2Go::Server::DB::PostgreSQL::db_getmounts($sid); } if ($backend eq 'sqlite') { @@ -262,11 +161,7 @@ sub db_deletemount my $path=shift or die "argument \"path\" missed"; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; - my $sth=$dbh->prepare("delete from mounts_view where session_id='$sid' and path='$path'"); - $sth->execute(); - $sth->finish(); - $dbh->disconnect(); + X2Go::Server::DB::PostgreSQL::db_deletemount($sid, $path); } if ($backend eq 'sqlite') { @@ -283,15 +178,7 @@ sub db_insertmount my $res_ok=0; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; - my $sth=$dbh->prepare("insert into mounts (session_id,path,client) values ('$sid','$path','$client')"); - $sth->execute(); - if (!$sth->err()) - { - $res_ok=1; - } - $sth->finish(); - $dbh->disconnect(); + $res_ok = X2Go::Server::DB::PostgreSQL::db_insertmount($sid, $path, $client); } if ($backend eq 'sqlite') { @@ -311,11 +198,7 @@ sub db_insertsession my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; - my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id) values ('$display','$server','$uname','$sid')"); - $sth->execute()or die $_; - $sth->finish(); - $dbh->disconnect(); + X2Go::Server::DB::PostgreSQL::db_insertsession($display, $server, $sid); } if ($backend eq 'sqlite') { @@ -339,13 +222,7 @@ sub db_createsession my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; - my $sth=$dbh->prepare("update sessions_view set status='R',last_time=now(), - cookie='$cookie',agent_pid='$pid',client='$client',gr_port='$gr_port', - sound_port='$snd_port',fs_port='$fs_port' where session_id='$sid'"); - $sth->execute()or die; - $sth->finish(); - $dbh->disconnect(); + X2Go::Server::DB::PostgreSQL::db_createsession($cookie, $pid, $client, $gr_port, $snd_port, $fs_port, $sid); } if ($backend eq 'sqlite') { @@ -365,11 +242,7 @@ sub db_insertport my $sshport=shift or die "argument \"port\" missed"; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; - my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values ('$server','$sid','$sshport')"); - $sth->execute()or die; - $sth->finish(); - $dbh->disconnect(); + X2Go::Server::DB::PostgreSQL::db_insertport($server, $sid, $sshport); } if ($backend eq 'sqlite') { @@ -385,11 +258,7 @@ sub db_rmport my $sshport=shift or die "argument \"port\" missed"; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; - my $sth=$dbh->prepare("delete from used_ports where server='$server' and session_id='$sid' and port='$sshport'"); - $sth->execute()or die; - $sth->finish(); - $dbh->disconnect(); + X2Go::Server::DB::PostgreSQL::db_rmport($server, $sid, $sshport); } if ($backend eq 'sqlite') { @@ -403,22 +272,17 @@ sub db_resume my $client=shift or die "argument \"client\" missed"; my $sid=shift or die "argument \"session_id\" missed"; my $gr_port=shift or die "argument \"gr_port\" missed"; - my $sound_port=shift or die "argument \"sound_port\" missed"; + my $snd_port=shift or die "argument \"snd_port\" missed"; my $fs_port=shift or die "argument \"fs_port\" missed"; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; - my $sth=$dbh->prepare("update sessions_view set last_time=now(),status='R',client='$client',gr_port='$gr_port', - sound_port='$sound_port',fs_port='$fs_port' where session_id = '$sid'"); - $sth->execute()or die; - $sth->finish(); - $dbh->disconnect(); + X2Go::Server::DB::PostgreSQL::db_resume($client, $sid, $gr_port, $snd_port, $fs_port); } if ($backend eq 'sqlite') { - `$x2go_lib_path/libx2go-server-db-sqlite3-wrapper resume $client $sid $gr_port $sound_port $fs_port`; + `$x2go_lib_path/libx2go-server-db-sqlite3-wrapper resume $client $sid $gr_port $snd_port $fs_port`; } - syslog('debug', "db_resume called, session ID: $sid, client: $client, gr_port: $gr_port, sound_port: $sound_port, fs_port: $fs_port"); + syslog('debug', "db_resume called, session ID: $sid, client: $client, gr_port: $gr_port, sound_port: $snd_port, fs_port: $fs_port"); } sub db_changestatus @@ -427,11 +291,7 @@ sub db_changestatus my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; - my $sth=$dbh->prepare("update sessions_view set last_time=now(),status='$status' where session_id = '$sid'"); - $sth->execute()or die; - $sth->finish(); - $dbh->disconnect(); + X2Go::Server::DB::PostgreSQL::db_changestatus($status, $sid); } if ($backend eq 'sqlite') { @@ -446,16 +306,7 @@ sub db_getstatus my $status=''; if ($backend eq 'postgres') { - 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 status from sessions_view where session_id = '$sid'"); - $sth->execute($sid) or die; - my @data; - if (@data = $sth->fetchrow_array) - { - $status=@data[0]; - } - $sth->finish(); - $dbh->disconnect(); + $status = X2Go::Server::DB::PostgreSQL::db_getstatus($sid); } if ($backend eq 'sqlite') { @@ -472,19 +323,7 @@ sub db_getdisplays my $server=shift or die "argument \"server\" missed"; 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 $sth=$dbh->prepare("select display from servers_view"); - $sth->execute()or die; - my @data; - my $i=0; - while (@data = $sth->fetchrow_array) - { - @strings[$i++]='|'.@data[0].'|'; - } - $sth->finish(); - $dbh->disconnect(); - @displays = @strings; + @displays = X2Go::Server::DB::PostgreSQL::db_getdisplays($server); } if ($backend eq 'sqlite') { @@ -502,19 +341,7 @@ sub db_getports my $server=shift or die "argument \"server\" missed"; 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 $sth=$dbh->prepare("select port from ports_view"); - $sth->execute()or die; - my @data; - my $i=0; - while (@data = $sth->fetchrow_array) - { - @strings[$i++]='|'.@data[0].'|'; - } - $sth->finish(); - $dbh->disconnect(); - @ports = @strings; + @ports = X2Go::Server::DB::PostgreSQL::db_getports($server); } if ($backend eq 'sqlite') { @@ -530,19 +357,7 @@ sub db_getservers my @servers; 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 $sth=$dbh->prepare("select server,count(*) from servers_view where status != 'F' group by server"); - $sth->execute()or die; - my @data; - my $i=0; - while (@data = $sth->fetchrow_array) - { - @strings[$i++]=@data[0]." ".@data[1]; - } - $sth->finish(); - $dbh->disconnect(); - @servers = @strings; + @servers = X2Go::Server::DB::PostgreSQL::db_getservers(); } if ($backend eq 'sqlite') { @@ -559,18 +374,7 @@ sub db_getagent my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - 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 from sessions_view - where session_id ='$sid'"); - $sth->execute()or die; - my @data; - my $i=0; - if (@data = $sth->fetchrow_array) - { - $agent=@data[0]; - } - $sth->finish(); - $dbh->disconnect(); + $agent = X2Go::Server::DB::PostgreSQL::db_getagent($sid); } if($backend eq 'sqlite') { @@ -586,18 +390,7 @@ sub db_getdisplay my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - 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 display from sessions_view - where session_id ='$sid'"); - $sth->execute() or die; - my @data; - my $i=0; - if (@data = $sth->fetchrow_array) - { - $display=@data[0]; - } - $sth->finish(); - $dbh->disconnect(); + $display = X2Go::Server::DB::PostgreSQL::db_getdisplay($sid); } if ($backend eq 'sqlite') { @@ -612,24 +405,7 @@ sub db_listsessions my $server=shift or die "argument \"server\" missed"; 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 $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, - sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, - to_char(now()- init_time,'SSSS'), fs_port from sessions_view - where status !='F' and server='$server' and - (session_id not like '%XSHAD%') order by status desc"); - $sth->execute() or die; - my @data; - my $i=0; - while (@data = $sth->fetchrow_array) - { - @strings[$i++]=join('|',@data); - } - $sth->finish(); - $dbh->disconnect(); - return @strings; + return X2Go::Server::DB::PostgreSQL::db_listsessions($server); } if ($backend eq 'sqlite') { @@ -641,24 +417,7 @@ sub db_listsessions_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 $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, - sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, - to_char(now()- init_time,'SSSS'), fs_port from sessions_view - where status !='F' and - (session_id not like '%XSHAD%') order by status desc"); - $sth->execute()or die; - my @data; - my $i=0; - while (@data = $sth->fetchrow_array) - { - @strings[$i++]=join('|',@data); - } - $sth->finish(); - $dbh->disconnect(); - return @strings; + return X2Go::Server::DB::PostgreSQL::db_listsessions_all(); } if ($backend eq 'sqlite') { diff --git a/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm new file mode 100644 index 0000000..db28f5e --- /dev/null +++ b/X2Go/Server/DB/PostgreSQL.pm @@ -0,0 +1,494 @@ +# Copyright (C) 2007-2012 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-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +package X2Go::Server::DB::PostgreSQL; + +=head1 NAME + +X2Go::Server::DB::PostgreSQL - X2Go Session Database package for Perl (PostgreSQL backend) + +=head1 DESCRIPTION + +X2Go::Server::DB::PostgreSQL Perl package for X2Go::Server. + +=cut + +use strict; +use Config::Simple; +use DBI; +use POSIX; +use Sys::Syslog qw( :standard :macros ); + +use X2Go::Log qw(loglevel); + +setlogmask( LOG_UPTO(loglevel()) ); + +use base 'Exporter'; + +our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', 'db_getstatus', + 'db_getdisplays', 'db_insertsession', 'db_getports', 'db_insertport', 'db_rmport', 'db_createsession', 'db_insertmount', + 'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot', + 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot', 'dbsys_deletemounts'); + +my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid()); + +my $host; +my $port; +my $db="x2go_sessions"; +my $dbpass; +my $dbuser; +my $sslmode; + +sub init_db +{ + if ( ! ( $dbuser and $dbpass ) ) + { + my $Config = new Config::Simple(syntax=>'ini'); + my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; + + $Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go/x2gosql/sql"; + my $backend=$Config->param("backend"); + if ( $backend ne "postgres" ) + { + die "X2Go server is not configured to use the PostgreSQL session db backend"; + } + + $host=$Config->param("postgres.host"); + $port=$Config->param("postgres.port"); + if (!$host) + { + $host='localhost'; + } + if (!$port) + { + $port='5432'; + } + my $passfile; + if ($uname eq 'root') + { + $dbuser='x2godbuser'; + $passfile="/etc/x2go/x2gosql/passwords/x2goadmin"; + } + else + { + $dbuser="x2gouser_$uname"; + $passfile="$homedir/.x2go/sqlpass"; + } + $sslmode=$Config->param("postgres.ssl"); + if (!$sslmode) + { + $sslmode="prefer"; + } + open (FL,"< $passfile") or die "Can't read password file $passfile Use x2godbadmin on server to configure database access for user $uname "; + $dbpass=<FL>; + close(FL); + chomp($dbpass); + } +} + +sub dbsys_rmsessionsroot +{ + init_db(); + my $sid=shift or die "argument \"session_id\" missed"; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", + "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("delete from sessions where session_id='$sid'"); + $sth->execute() or die; + $sth=$dbh->prepare("delete from used_ports where session_id='$sid'"); + $sth->execute() or die; + $sth->finish(); + $dbh->disconnect(); +} + +sub dbsys_deletemounts +{ + init_db(); + my $sid=shift or die "argument \"session_id\" missed"; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("delete from mounts where session_id='$sid'"); + $sth->execute(); + $sth->finish(); + $dbh->disconnect(); +} + +sub dbsys_listsessionsroot +{ + init_db(); + my $server=shift or die "argument \"server\" missed"; + my @strings; + 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,'YYYY-MM-DDTHH24:MI:SS'),cookie,client,gr_port, + sound_port,to_char(last_time,'YYYY-MM-DDTHH24:MI:SS'),uname, + to_char(now()-init_time,'SSSS'),fs_port from sessions + where server='$server' order by status desc"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=join('|',@data); + } + $sth->finish(); + $dbh->disconnect(); + return @strings; +} + +sub dbsys_listsessionsroot_all +{ + init_db(); + my @strings; + 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,'YYYY-MM-DDTHH24:MI:SS'),cookie,client,gr_port, + sound_port,to_char(last_time,'YYYY-MM-DDTHH24:MI:SS'),uname, + to_char(now()-init_time,'SSSS'),fs_port from sessions + order by status desc"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=join('|',@data); + } + $sth->finish(); + $dbh->disconnect(); + return @strings; +} + +sub dbsys_getmounts +{ + init_db(); + my $sid=shift or die "argument \"session_id\" missed"; + my @mounts; + 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 client, path from mounts where session_id='$sid'"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @mounts[$i++]=join("|",@data); + } + $sth->finish(); + $dbh->disconnect(); + return @mounts; +} + +sub db_getmounts +{ + init_db(); + my $sid=shift or die "argument \"session_id\" missed"; + my @mounts; + 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 client, path from mounts_view where session_id='$sid'"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @mounts[$i++]=join("|",@data); + } + $sth->finish(); + $dbh->disconnect(); + return @mounts; +} + +sub db_deletemount +{ + init_db(); + my $sid=shift or die "argument \"session_id\" missed"; + my $path=shift or die "argument \"path\" missed"; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("delete from mounts_view where session_id='$sid' and path='$path'"); + $sth->execute(); + $sth->finish(); + $dbh->disconnect(); +} + +sub db_insertmount +{ + init_db(); + my $sid=shift or die "argument \"session_id\" missed"; + my $path=shift or die "argument \"path\" missed"; + my $client=shift or die "argument \"client\" missed"; + my $res_ok=0; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("insert into mounts (session_id,path,client) values ('$sid','$path','$client')"); + $sth->execute(); + if (!$sth->err()) + { + $res_ok = 1; + } + $sth->finish(); + $dbh->disconnect(); + return $res_ok; +} + +sub db_insertsession +{ + init_db(); + my $display=shift or die "argument \"display\" missed"; + my $server=shift or die "argument \"server\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id) values ('$display','$server','$uname','$sid')"); + $sth->execute()or die $_; + $sth->finish(); + $dbh->disconnect(); +} + +sub db_createsession +{ + init_db(); + my $cookie=shift or die"argument \"cookie\" missed"; + my $pid=shift or die"argument \"pid\" missed"; + my $client=shift or die"argument \"client\" missed"; + my $gr_port=shift or die"argument \"gr_port\" missed"; + my $snd_port=shift or die"argument \"snd_port\" missed"; + my $fs_port=shift or die"argument \"fs_port\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("update sessions_view set status='R',last_time=now(), + cookie='$cookie',agent_pid='$pid',client='$client',gr_port='$gr_port', + sound_port='$snd_port',fs_port='$fs_port' where session_id='$sid'"); + $sth->execute()or die; + $sth->finish(); + $dbh->disconnect(); +} + +sub db_insertport +{ + init_db(); + my $server=shift or die "argument \"server\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $sshport=shift or die "argument \"port\" missed"; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values ('$server','$sid','$sshport')"); + $sth->execute()or die; + $sth->finish(); + $dbh->disconnect(); +} + +sub db_rmport +{ + init_db(); + my $server=shift or die "argument \"server\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $sshport=shift or die "argument \"port\" missed"; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("delete from used_ports where server='$server' and session_id='$sid' and port='$sshport'"); + $sth->execute()or die; + $sth->finish(); + $dbh->disconnect(); +} + +sub db_resume +{ + init_db(); + my $client=shift or die "argument \"client\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $gr_port=shift or die "argument \"gr_port\" missed"; + my $sound_port=shift or die "argument \"sound_port\" missed"; + my $fs_port=shift or die "argument \"fs_port\" missed"; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("update sessions_view set last_time=now(),status='R',client='$client',gr_port='$gr_port', + sound_port='$sound_port',fs_port='$fs_port' where session_id = '$sid'"); + $sth->execute()or die; + $sth->finish(); + $dbh->disconnect(); +} + +sub db_changestatus +{ + init_db(); + my $status=shift or die "argument \"status\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("update sessions_view set last_time=now(),status='$status' where session_id = '$sid'"); + $sth->execute()or die; + $sth->finish(); + $dbh->disconnect(); +} + +sub db_getstatus +{ + init_db(); + my $sid=shift or die "argument \"session_id\" missed"; + my $status=''; + 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 status from sessions_view where session_id = '$sid'"); + $sth->execute($sid) or die; + my @data; + if (@data = $sth->fetchrow_array) + { + $status=@data[0]; + } + $sth->finish(); + $dbh->disconnect(); + return $status; +} + +sub db_getdisplays +{ + init_db(); + #ignore $server + my $server=shift or die "argument \"server\" missed"; + my @displays; + 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 display from servers_view"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @displays[$i++]='|'.@data[0].'|'; + } + $sth->finish(); + $dbh->disconnect(); + return @displays; +} + +sub db_getports +{ + init_db(); + my @ports; + #ignore $server + my $server=shift or die "argument \"server\" missed"; + 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 port from ports_view"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @ports[$i++]='|'.@data[0].'|'; + } + $sth->finish(); + $dbh->disconnect(); + return @ports; +} + +sub db_getservers +{ + init_db(); + my @servers; + 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 server,count(*) from servers_view where status != 'F' group by server"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @servers[$i++]=@data[0]." ".@data[1]; + } + $sth->finish(); + $dbh->disconnect(); + return @servers; +} + +sub db_getagent +{ + init_db(); + my $agent; + my $sid=shift or die "argument \"session_id\" missed"; + 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 from sessions_view + where session_id ='$sid'"); + $sth->execute()or die; + my @data; + my $i=0; + if (@data = $sth->fetchrow_array) + { + $agent=@data[0]; + } + $sth->finish(); + $dbh->disconnect(); + return $agent; +} + +sub db_getdisplay +{ + init_db(); + my $display; + my $sid=shift or die "argument \"session_id\" missed"; + 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 display from sessions_view + where session_id ='$sid'"); + $sth->execute() or die; + my @data; + my $i=0; + if (@data = $sth->fetchrow_array) + { + $display=@data[0]; + } + $sth->finish(); + $dbh->disconnect(); + return $display; +} + +sub db_listsessions +{ + init_db(); + my $server=shift or die "argument \"server\" missed"; + my @sessions; + 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,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, + to_char(now()- init_time,'SSSS'), fs_port from sessions_view + where status !='F' and server='$server' and + (session_id not like '%XSHAD%') order by status desc"); + $sth->execute() or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @sessions[$i++]=join('|',@data); + } + $sth->finish(); + $dbh->disconnect(); + return @sessions; +} + +sub db_listsessions_all +{ + init_db(); + my @sessions; + 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,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, + to_char(now()- init_time,'SSSS'), fs_port from sessions_view + where status !='F' and + (session_id not like '%XSHAD%') order by status desc"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @sessions[$i++]=join('|',@data); + } + $sth->finish(); + $dbh->disconnect(); + return @sessions; +} diff --git a/debian/changelog b/debian/changelog index de93abb..7f5c09c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,8 +21,8 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low - Transform x2godbwrapper.pm into proper Perl module X2Go::Server::DB. - Transform x2gosqlitewrapper.pl into small wrapper script and move the SQLite3 into Perl package X2Go::Server::DB::SQLite3. - - Move x2gosqlitewrapper into package X2Go::Server::DB::SQLite3 Perl - package. + - Move x2gosqlitewrapper into Perl package X2Go::Server::DB::SQLite3. + - Move PostgreSQL DB code into Perl package X2Go::Server::DB::PostgreSQL. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder. 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-36-g9ecd656
by git-admin＠x2go.org 18 Sep '12

18 Sep '12

The branch, master has been updated via 9ecd656786072f85d444523ef3954889f69900b2 (commit) from 48bba822b03cf2bf8a50d9c1d89293d2506200c3 (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 9ecd656786072f85d444523ef3954889f69900b2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 14:35:59 2012 +0200 Fix file permission. ----------------------------------------------------------------------- Summary of changes: 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 X2Go/Server/DB/SQLite3.pm The diff of changes is: diff --git a/X2Go/Server/DB/SQLite3.pm b/X2Go/Server/DB/SQLite3.pm old mode 100755 new mode 100644 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-35-g48bba82
by git-admin＠x2go.org 18 Sep '12

18 Sep '12

The branch, master has been updated via 48bba822b03cf2bf8a50d9c1d89293d2506200c3 (commit) from 99e016052db1e271859147177688ea5ea8f0f27f (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 48bba822b03cf2bf8a50d9c1d89293d2506200c3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 13:55:51 2012 +0200 Move x2gosqlitewrapper into package X2Go::Server::DB::SQLite3 Perl package. ----------------------------------------------------------------------- Summary of changes: INSTALL | 26 +++++---- Makefile | 9 +++- X2Go/Server/DB.pm | 46 ++++++++-------- debian/changelog | 2 + debian/control | 2 +- debian/libx2go-server-db-perl.install | 4 +- ...gs.postinst => libx2go-server-db-perl.postinst} | 21 +++++-- ...inting.postrm => libx2go-server-db-perl.postrm} | 8 ++- debian/rules | 1 - debian/x2goserver.install | 1 - debian/x2goserver.postinst | 19 ++++--- debian/x2goserver.postrm | 3 - libx2go-server-db-perl/Makefile | 56 ++++++++++++++++++++ .../lib/libx2go-server-db-sqlite3-wrapper.pl | 0 .../src/libx2go-server-db-sqlite3-wrapper.c | 4 +- x2goserver-compat/Makefile | 27 ++-------- x2goserver-extensions/Makefile | 6 +- x2goserver-fmbindings/Makefile | 6 +- x2goserver-printing/Makefile | 26 ++------- x2goserver-pyhoca/Makefile | 48 +++-------------- x2goserver-xsession/Makefile | 29 ++-------- x2goserver/Makefile | 16 ++---- 22 files changed, 174 insertions(+), 186 deletions(-) copy debian/{x2goserver-fmbindings.postinst => libx2go-server-db-perl.postinst} (68%) copy debian/{x2goserver-printing.postrm => libx2go-server-db-perl.postrm} (78%) create mode 100755 libx2go-server-db-perl/Makefile rename x2goserver/lib/x2gosqlitewrapper.pl => libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl (100%) rename x2goserver/x2gosqlitewrapper.c => libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c (94%) The diff of changes is: diff --git a/INSTALL b/INSTALL index 4bbf432..7a0d689 100644 --- a/INSTALL +++ b/INSTALL @@ -23,20 +23,21 @@ already: ----------------------------- Extract tarball and run - $ make && make install + $ make && sudo make install in base folder of the extracted tarball. 3.) SGID GROUP -------------- -Configure ownership, permissions and setgid group bits of x2gosqlitewrapper and x2goprint: +Configure ownership, permissions and setgid group bits of +libx2go-server-db-sqlite3-wrapper and x2goprint: NOTE: The described actions have already been performed by the Makefile run, leaving this here for documentation only. - $ chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper - $ chmod 2755 /usr/lib/x2go/x2gosqlitewrapper + $ chown root:x2gouser /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper + $ chmod 2755 /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper $ chown root:x2goprint /usr/bin/x2goprint $ chmod 2755 /usr/bin/x2goprint @@ -67,23 +68,24 @@ members of the server-side ,,fuse'' group (see above). As X2Go printing setups can be rather versatile, details on X2Go printing are explained in the project's wiki: -http://wiki.x2go.org/installing_x2go_printing_debian_ubuntu +http://www.x2go.org/doku.php/wiki:components:printing +http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-printing -7.) DATABASE SETUP (SQLite only) --------------------------------- +7.) DATABASE SETUP (SQLite3 only) +--------------------------------- $ x2godbadmin --createdb -7a.) DEFAULT: SQLite setup --------------------------- +7a.) DEFAULT: SQLite3 setup +--------------------------- This variant is the default X2Go database setup. The X2Go database keeps track of -running/suspended/finished X2Go sessions, mounted devices, etc. If you use SQLite +running/suspended/finished X2Go sessions, mounted devices, etc. If you use SQLite3 as DB backend, X2Go will run on one single server. For multi-X2goServer support use the PostgreSQL setup variant of X2Go server. All files -should be present for this setup. If not, please report it as a bug. +are already resent for this setup. If not, please report it as a bug. 7b.) ALTERNATIVE: PostgreSQL setup @@ -91,5 +93,5 @@ should be present for this setup. If not, please report it as a bug. This variant is for a setup of x2goserver that uses a PostgreSQL database backend... The exact installation of x2goserver with PostgreSQL support is described here: -http://wiki.x2go.org/adding_x2go_server_postgresql_support +http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql diff --git a/Makefile b/Makefile index df27aa0..41a508f 100755 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ build: build-arch build-indep # make man2html build available from project's base folder... build_man2html: $(MAKE) -C x2goserver $@ + $(MAKE) -C libx2go-server-db-perl $@ $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ @@ -29,6 +30,7 @@ build_man2html: clean: -$(MAKE) -f Makefile.perl clean $(MAKE) -C x2goserver $@ + $(MAKE) -C libx2go-server-db-perl $@ $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ @@ -39,6 +41,7 @@ clean: distclean: -$(MAKE) -f Makefile.perl realclean $(MAKE) -C x2goserver clean + $(MAKE) -C libx2go-server-db-perl clean $(MAKE) -C x2goserver-printing clean $(MAKE) -C x2goserver-compat clean $(MAKE) -C x2goserver-extensions clean @@ -48,6 +51,7 @@ distclean: build-arch: $(MAKE) -C x2goserver $@ + $(MAKE) -C libx2go-server-db-perl $@ $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ @@ -59,6 +63,7 @@ build-indep: $(PERL) Makefile.PL INSTALLDIRS=$(PERL_INSTALLDIRS) $(MAKE) -f Makefile.perl $(MAKE) -C x2goserver $@ + $(MAKE) -C libx2go-server-db-perl $@ $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ @@ -69,6 +74,7 @@ build-indep: install: $(MAKE) -f Makefile.perl install $(MAKE) -C x2goserver $@ + $(MAKE) -C libx2go-server-db-perl $@ $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ @@ -77,13 +83,14 @@ install: $(MAKE) -C x2goserver-pyhoca $@ uninstall: - $(MAKE) -f Makefile.perl uninstall $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ $(MAKE) -C x2goserver-extensions $@ + $(MAKE) -f Makefile.perl uninstall + $(MAKE) -C libx2go-server-db-perl $@ $(MAKE) -C x2goserver $@ if test -d $(DESTDIR)$(LIBDIR); then $(RM_DIR) $(DESTDIR)$(LIBDIR); fi if test -d $(DESTDIR)$(SHAREDIR)/x2gofeature.d; then $(RM_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d; fi diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm index ea33b6a..42a3453 100644 --- a/X2Go/Server/DB.pm +++ b/X2Go/Server/DB.pm @@ -117,7 +117,7 @@ sub dbsys_rmsessionsroot } if($backend eq 'sqlite') { - `$x2go_lib_path/x2gosqlitewrapper rmsessionsroot $sid`; + `$x2go_lib_path/libx2go-server-db-sqlite3-wrapper rmsessionsroot $sid`; } } @@ -134,7 +134,7 @@ sub dbsys_deletemounts } if ($backend eq 'sqlite') { - `$x2go_lib_path/x2gosqlitewrapper deletemounts $sid`; + `$x2go_lib_path/libx2go-server-db-sqlite3-wrapper deletemounts $sid`; } syslog('debug', "dbsys_deletemounts called, session ID: $sid"); } @@ -166,7 +166,7 @@ sub dbsys_listsessionsroot } if($backend eq 'sqlite') { - return split("\n",`$x2go_lib_path/x2gosqlitewrapper listsessionsroot $server`); + return split("\n",`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper listsessionsroot $server`); } } @@ -194,7 +194,7 @@ sub dbsys_listsessionsroot_all } if ($backend eq 'sqlite') { - return split("\n",`$x2go_lib_path/x2gosqlitewrapper listsessionsroot_all`); + return split("\n",`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper listsessionsroot_all`); } } @@ -220,7 +220,7 @@ sub dbsys_getmounts } if ($backend eq 'sqlite') { - @mounts = split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`); + @mounts = split("\n",`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper getmounts $sid`); } my $log_retval = join(" ", @mounts); syslog('debug', "dbsys_getmounts called, session ID: $sid; return value: $log_retval"); @@ -249,7 +249,7 @@ sub db_getmounts } if ($backend eq 'sqlite') { - @mounts = split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`); + @mounts = split("\n",`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper getmounts $sid`); } my $log_retval = join(" ", @mounts); syslog('debug', "db_getmounts called, session ID: $sid; return value: $log_retval"); @@ -270,7 +270,7 @@ sub db_deletemount } if ($backend eq 'sqlite') { - `$x2go_lib_path/x2gosqlitewrapper deletemount $sid \"$path\"`; + `$x2go_lib_path/libx2go-server-db-sqlite3-wrapper deletemount $sid \"$path\"`; } syslog('debug', "db_deletemount called, session ID: $sid, path: $path"); } @@ -295,7 +295,7 @@ sub db_insertmount } if ($backend eq 'sqlite') { - if( `$x2go_lib_path/x2gosqlitewrapper insertmount $sid \"$path\" $client` eq "ok") + if( `$x2go_lib_path/libx2go-server-db-sqlite3-wrapper insertmount $sid \"$path\" $client` eq "ok") { $res_ok=1; } @@ -319,10 +319,10 @@ sub db_insertsession } if ($backend eq 'sqlite') { - my $err=`$x2go_lib_path/x2gosqlitewrapper insertsession $display $server $sid`; + my $err=`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper insertsession $display $server $sid`; if ($err ne "ok") { - die "$err: $x2go_lib_path/x2gosqlitewrapper insertsession $display $server $sid"; + die "$err: $x2go_lib_path/libx2go-server-db-sqlite3-wrapper insertsession $display $server $sid"; } } syslog('debug', "db_insertsession called, session ID: $sid, server: $server, session ID: $sid"); @@ -349,7 +349,7 @@ sub db_createsession } if ($backend eq 'sqlite') { - my $err= `$x2go_lib_path/x2gosqlitewrapper createsession $cookie $pid $client $gr_port $snd_port $fs_port $sid`; + my $err= `$x2go_lib_path/libx2go-server-db-sqlite3-wrapper createsession $cookie $pid $client $gr_port $snd_port $fs_port $sid`; if ($err ne "ok") { die $err; @@ -373,7 +373,7 @@ sub db_insertport } if ($backend eq 'sqlite') { - `$x2go_lib_path/x2gosqlitewrapper insertport $server $sid $sshport`; + `$x2go_lib_path/libx2go-server-db-sqlite3-wrapper insertport $server $sid $sshport`; } syslog('debug', "db_insertport called, session ID: $sid, server: $server, SSH port: $sshport"); } @@ -393,7 +393,7 @@ sub db_rmport } if ($backend eq 'sqlite') { - `$x2go_lib_path/x2gosqlitewrapper rmport $server $sid $sshport`; + `$x2go_lib_path/libx2go-server-db-sqlite3-wrapper rmport $server $sid $sshport`; } syslog('debug', "db_rmport called, session ID: $sid, server: $server, SSH port: $sshport"); } @@ -416,7 +416,7 @@ sub db_resume } if ($backend eq 'sqlite') { - `$x2go_lib_path/x2gosqlitewrapper resume $client $sid $gr_port $sound_port $fs_port`; + `$x2go_lib_path/libx2go-server-db-sqlite3-wrapper resume $client $sid $gr_port $sound_port $fs_port`; } syslog('debug', "db_resume called, session ID: $sid, client: $client, gr_port: $gr_port, sound_port: $sound_port, fs_port: $fs_port"); } @@ -435,7 +435,7 @@ sub db_changestatus } if ($backend eq 'sqlite') { - `$x2go_lib_path/x2gosqlitewrapper changestatus $status $sid`; + `$x2go_lib_path/libx2go-server-db-sqlite3-wrapper changestatus $status $sid`; } syslog('debug', "db_changestatus called, session ID: $sid, new status: $status"); } @@ -459,7 +459,7 @@ sub db_getstatus } if ($backend eq 'sqlite') { - $status=`$x2go_lib_path/x2gosqlitewrapper getstatus $sid`; + $status=`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper getstatus $sid`; } syslog('debug', "db_getstatus called, session ID: $sid, return value: $status"); return $status; @@ -488,7 +488,7 @@ sub db_getdisplays } if ($backend eq 'sqlite') { - @displays = split("\n",`$x2go_lib_path/x2gosqlitewrapper getdisplays $server`); + @displays = split("\n",`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper getdisplays $server`); } my $log_retval = join(" ", @displays); syslog('debug', "db_getdisplays called, server: $server; return value: $log_retval"); @@ -518,7 +518,7 @@ sub db_getports } if ($backend eq 'sqlite') { - @ports = split("\n",`$x2go_lib_path/x2gosqlitewrapper getports $server`); + @ports = split("\n",`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper getports $server`); } my $log_retval = join(" ", @ports); syslog('debug', "db_getports called, server: $server; return value: $log_retval"); @@ -546,7 +546,7 @@ sub db_getservers } if ($backend eq 'sqlite') { - @servers = split("\n",`$x2go_lib_path/x2gosqlitewrapper getservers`); + @servers = split("\n",`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper getservers`); } my $log_retval = join(" ", @servers); syslog('debug', "db_getservers called, return value: $log_retval"); @@ -574,7 +574,7 @@ sub db_getagent } if($backend eq 'sqlite') { - $agent=`$x2go_lib_path/x2gosqlitewrapper getagent $sid`; + $agent=`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper getagent $sid`; } syslog('debug', "db_getagent called, session ID: $sid; return value: $agent"); return $agent; @@ -601,7 +601,7 @@ sub db_getdisplay } if ($backend eq 'sqlite') { - $display=`$x2go_lib_path/x2gosqlitewrapper getdisplay $sid`; + $display=`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper getdisplay $sid`; } syslog('debug', "db_getdisplay called, session ID: $sid; return value: $display"); return $display; @@ -633,7 +633,7 @@ sub db_listsessions } if ($backend eq 'sqlite') { - return split("\n",`$x2go_lib_path/x2gosqlitewrapper listsessions $server`); + return split("\n",`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper listsessions $server`); } } @@ -662,6 +662,6 @@ sub db_listsessions_all } if ($backend eq 'sqlite') { - return split("\n",`$x2go_lib_path/x2gosqlitewrapper listsessions_all`); + return split("\n",`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper listsessions_all`); } } diff --git a/debian/changelog b/debian/changelog index e215b2f..de93abb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low - Transform x2godbwrapper.pm into proper Perl module X2Go::Server::DB. - Transform x2gosqlitewrapper.pl into small wrapper script and move the SQLite3 into Perl package X2Go::Server::DB::SQLite3. + - Move x2gosqlitewrapper into package X2Go::Server::DB::SQLite3 Perl + package. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder. diff --git a/debian/control b/debian/control index 8b04e77..1f47f49 100644 --- a/debian/control +++ b/debian/control @@ -36,6 +36,7 @@ Section: perl Depends: ${perl:Depends}, ${misc:Depends}, + ${shlibs:Depends}, libx2go-server-perl (>= ${source:Version}), libx2go-server-perl (<< ${source:Version}.1~), Description: Perl X2Go::Server:DB package X2Go is a server based computing environment with @@ -68,7 +69,6 @@ Description: Perl X2Go::Log package Package: x2goserver Architecture: any Depends: - ${shlibs:Depends}, ${misc:Depends}, libx2go-server-db-perl (>= ${source:Version}), libx2go-server-db-perl (<< ${source:Version}.1~), libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~), diff --git a/debian/libx2go-server-db-perl.install b/debian/libx2go-server-db-perl.install index 90a73ea..ee0dde1 100644 --- a/debian/libx2go-server-db-perl.install +++ b/debian/libx2go-server-db-perl.install @@ -1,2 +1,4 @@ usr/share/perl5/X2Go/Server/DB* -usr/share/man/man3/X2Go::Server::DB.* \ No newline at end of file +usr/share/man/man3/X2Go::Server::DB.* +libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper /usr/lib/x2go/ +libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl /usr/lib/x2go/ \ No newline at end of file diff --git a/debian/x2goserver-fmbindings.postinst b/debian/libx2go-server-db-perl.postinst similarity index 68% copy from debian/x2goserver-fmbindings.postinst copy to debian/libx2go-server-db-perl.postinst index b64235f..b8a43f3 100755 --- a/debian/x2goserver-fmbindings.postinst +++ b/debian/libx2go-server-db-perl.postinst @@ -1,10 +1,13 @@ #!/bin/sh -# postinst script for x2goserver-fmbindings +# postinst script for libx2go-server-db-perl # # see: dh_installdeb(1) set -e +# Source debconf library. +. /usr/share/debconf/confmodule + # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> # * <old-postinst> `abort-upgrade' <new version> @@ -20,17 +23,21 @@ set -e case "$1" in configure) - update-desktop-database - update-mime-database /usr/share/mime - ;; + + # the SQLite3 X2Go session db has to be accessed as uid x2gouser + if ! dpkg-statoverride --list /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper >/dev/null; then + dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper + fi + + ;; abort-upgrade|abort-remove|abort-deconfigure) - ;; + ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 - ;; + ;; esac # dh_installdeb will replace this with shell code automatically @@ -39,3 +46,5 @@ esac #DEBHELPER# exit 0 + + diff --git a/debian/x2goserver-printing.postrm b/debian/libx2go-server-db-perl.postrm similarity index 78% copy from debian/x2goserver-printing.postrm copy to debian/libx2go-server-db-perl.postrm index 16b0f1e..2071de4 100755 --- a/debian/x2goserver-printing.postrm +++ b/debian/libx2go-server-db-perl.postrm @@ -1,5 +1,5 @@ #! /bin/sh -# postrm script for x2goserver-printing +# postrm script for libx2go-server-db-perl # # see: dh_installdeb(1) # summary of how this script can be called: @@ -18,8 +18,10 @@ set -e case "$1" in purge) - getent passwd x2goprint >/dev/null && deluser x2goprint - getent group x2goprint >/dev/null && delgroup x2goprint + if dpkg-statoverride --list /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper >/dev/null; then + dpkg-statoverride --remove /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper + fi + ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; diff --git a/debian/rules b/debian/rules index 959a9e0..43139c0 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,6 @@ override_dh_auto_install: PREFIX=/usr dh_auto_install override_dh_auto_clean: - rm -fv x2gosqlitewrapper rm -Rfv x2goserver/.build_html rm -Rfv x2goserver-extensions/.build_html dh_auto_clean diff --git a/debian/x2goserver.install b/debian/x2goserver.install index 4ed8986..879a538 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -3,5 +3,4 @@ x2goserver/sbin/x2go* /usr/sbin/ x2goserver/lib/x2go* /usr/lib/x2go/ x2goserver/etc/* /etc/x2go/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ -x2goserver/x2gosqlitewrapper /usr/lib/x2go/ x2goserver/share/x2gofeature.d /usr/share/x2go/ diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 2837629..e8efa5c 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -78,24 +78,25 @@ case "$1" in ### setgid section for x2gouser (SQLite DB access) - # we may be upgrading versions of x2goserver that had - # /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid x2gouser. + # we may be upgrading from versions of x2goserver that had + # /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid x2gouser. This script is + # not at that location anymore, we clear the dpkg-statoverride entry. if dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper.pl >/dev/null; then dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper.pl - chown root:root /usr/lib/x2go/x2gosqlitewrapper.pl - chmod 0755 /usr/lib/x2go/x2gosqlitewrapper.pl fi - # we may be upgrading versions of x2goserver that had - # /usr/bin/x2gosqlitewrapper set to setuid or setgid x2gouser, the script itself is + # we may be upgrading from versions of x2goserver that had + # /usr/bin/x2gosqlitewrapper set to setuid or setgid x2gouser, the script itself is not # at this location anymore, we just clear the dpkg-statoverride config entry. if dpkg-statoverride --list /usr/bin/x2gosqlitewrapper >/dev/null; then dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper fi - # the sqlite db has to be accessed as uid x2gouser - if ! dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper >/dev/null; then - dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/x2gosqlitewrapper + # we may be upgrading from versions of x2goserver that had + # /usr/lib/x2go/x2gosqlitewrapper set to setgid x2gouser, the script itself is not + # at this location anymore, we just clear the dpkg-statoverride config entry. + if dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper >/dev/null; then + dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper fi # create /etc/x2go/applications symlink if not already there (as link or as dir) diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm index 2d965cc..8d5f624 100755 --- a/debian/x2goserver.postrm +++ b/debian/x2goserver.postrm @@ -18,9 +18,6 @@ set -e case "$1" in purge) - if dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper >/dev/null; then - dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper - fi echo "Removing x2go session database" >&2 rm -vf /var/lib/x2go/x2go_sessions rm -vf /etc/x2go/x2gosql/passwords/pgadmin diff --git a/libx2go-server-db-perl/Makefile b/libx2go-server-db-perl/Makefile new file mode 100755 index 0000000..0b29ba1 --- /dev/null +++ b/libx2go-server-db-perl/Makefile @@ -0,0 +1,56 @@ +#!/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 && echo *) +#SBIN_SCRIPTS=$(shell cd sbin && echo *) +LIB_FILES=libx2go-server-db-sqlite3-wrapper libx2go-server-db-sqlite3-wrapper.pl +#FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) + +#man_pages = `cd man && find * -type f` + +#MAN2HTML_BIN = man2html +#MAN2HTML_SRC = man +#MAN2HTML_DEST = .build_man2html/html + +all: clean build + +build: build-arch build-indep + +build-arch: + gcc -fPIE -pie -o lib/libx2go-server-db-sqlite3-wrapper src/libx2go-server-db-sqlite3-wrapper.c + +build-indep: + +clean: clean-arch clean-indep + +clean-arch: + rm -f lib/libx2go-server-db-sqlite3-wrapper + +clean-indep: + +install: + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_PROGRAM) lib/* $(DESTDIR)$(LIBDIR)/ + getent group x2gouser &>/dev/null && chown root:x2gouser $(DESTDIR)$(LIBDIR)/libx2go-server-db-sqlite3-wrapper || true + chmod 2755 $(DESTDIR)$(LIBDIR)/libx2go-server-db-sqlite3-wrapper + +uninstall: + for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl similarity index 100% rename from x2goserver/lib/x2gosqlitewrapper.pl rename to libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl diff --git a/x2goserver/x2gosqlitewrapper.c b/libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c similarity index 94% rename from x2goserver/x2gosqlitewrapper.c rename to libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c index a134efc..c70174f 100644 --- a/x2goserver/x2gosqlitewrapper.c +++ b/libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c @@ -59,8 +59,8 @@ int main( int argc, char *argv[] ) { exit(EXIT_FAILURE); } - // derive the full path of x2gosqlitewrapper.pl from path of this binary - rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl"); + // derive the full path of libx2go-server-db-sqlite3-wrapper.pl from path of this binary + rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "libx2go-server-db-sqlite3-wrapper.pl"); if(rvap == -1){ fprintf(stderr, "Failed to allocate memory calling asprintf\n"); exit(EXIT_FAILURE); diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile index 72619cd..3775dae 100755 --- a/x2goserver-compat/Makefile +++ b/x2goserver-compat/Makefile @@ -14,8 +14,8 @@ 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 @@ -32,12 +32,12 @@ MAN2HTML_DEST = .build_man2html/html all: clean build -build: build-indep - -build-indep: build_man2html +build: build-arch build-indep build-arch: +build-indep: build_man2html + build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done @@ -52,20 +52,11 @@ 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)$(SHAREDIR) $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ -# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ -# $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ 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) @@ -83,16 +74,8 @@ 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 $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$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) || true uninstall_config: -# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf -# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql -# $(RM_DIR) $(DESTDIR)$(ETCDIR) || true -# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true -# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index ae9eae2..41f6487 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -32,12 +32,12 @@ MAN2HTML_DEST = .build_man2html/html all: clean build -build: build-indep - -build-indep: build_man2html +build: build-arch build-indep build-arch: +build-indep: build_man2html + 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-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index 4d68485..c90179a 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -32,12 +32,12 @@ MAN2HTML_DEST = .build_man2html/html all: clean build -build: build-indep - -build-indep: build_man2html +build: build-arch build-indep build-arch: +build-indep: build_man2html + 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-printing/Makefile b/x2goserver-printing/Makefile index 0eb6842..3900717 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -14,8 +14,8 @@ 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 @@ -32,12 +32,12 @@ MAN2HTML_DEST = .build_man2html/html all: clean build -build: build-indep - -build-indep: build_man2html +build: build-arch build-indep build-arch: +build-indep: build_man2html + build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done @@ -52,20 +52,11 @@ 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)$(SHAREDIR) $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ -# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ -# $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ 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) @@ -82,16 +73,9 @@ 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 for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: -# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf -# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql -# $(RM_DIR) $(DESTDIR)$(ETCDIR) || true -# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true -# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile index 6db725e..b8ecfa8 100755 --- a/x2goserver-pyhoca/Makefile +++ b/x2goserver-pyhoca/Makefile @@ -14,7 +14,7 @@ DESTDIR= PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin -#SBINDIR=$(PREFIX)/sbin +SBINDIR=$(PREFIX)/sbin LIBDIR=$(PREFIX)/lib/x2go MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go @@ -24,53 +24,33 @@ BIN_SCRIPTS=$(shell cd bin && echo *) #LIB_FILES=$(shell cd lib && echo *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) -man_pages = `cd man && find * -type f` +#man_pages = `cd man && find * -type f` -MAN2HTML_BIN = man2html -MAN2HTML_SRC = man -MAN2HTML_DEST = .build_man2html/html +#MAN2HTML_BIN = man2html +#MAN2HTML_SRC = man +#MAN2HTML_DEST = .build_man2html/html all: clean build -build: build-indep - -build-indep: build_man2html +build: build-arch build-indep build-arch: +build-indep: 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) $(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)$(SHAREDIR) -# $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d -# $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ -# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ -# $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ 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) @@ -80,22 +60,10 @@ install_version: 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 -# for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: -# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf -# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql -# $(RM_DIR) $(DESTDIR)$(ETCDIR) || true -# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true -# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true 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) || true uninstall_version: $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 77cb7f1..23f1c93 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -14,9 +14,9 @@ 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 +BINDIR=$(PREFIX)/bin +SBINDIR=$(PREFIX)/sbin +LIBDIR=$(PREFIX)/lib/x2go MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go @@ -34,31 +34,23 @@ FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) all: clean build -build: build-indep - -build-indep: build_man2html +build: build-arch build-indep build-arch: +build-indep: 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) $(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)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d -# $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ -# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: @@ -73,10 +65,6 @@ install_config: 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) @@ -86,17 +74,12 @@ install_version: 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 $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: for file in $(ETC_FILES); do $(RM_FILE) $(DESTDIR)$(ETCDIR)/$$file; done 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) || true uninstall_version: $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-xsession diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 9065d7f..27c2e06 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -34,10 +34,7 @@ all: clean build build: build-arch build-indep -build-arch: build_setgidwrappers - -build_setgidwrappers: - gcc -fPIE -pie -o x2gosqlitewrapper x2gosqlitewrapper.c +build-arch: build-indep: build_man2html @@ -46,10 +43,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) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done -clean: clean_arch clean_man2html +clean: clean-arch clean-indep + +clean-arch: -clean_arch: - rm -f x2gosqlitewrapper +clean-indep: clean_man2html clean_man2html: rm -Rf `dirname $(MAN2HTML_DEST)` @@ -63,11 +61,8 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ - $(INSTALL_PROGRAM) x2gosqlitewrapper $(DESTDIR)$(LIBDIR)/ $(INSTALL_PROGRAM) lib/* $(DESTDIR)$(LIBDIR)/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ - getent group x2gouser &>/dev/null && chown root:x2gouser $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper || true - chmod 2755 $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) @@ -94,7 +89,6 @@ uninstall_scripts: for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done - $(RM_FILE) $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper $(RM_DIR) $(DESTDIR)$(LIBDIR) || true $(RM_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d || true $(RM_DIR) $(DESTDIR)$(SHAREDIR) || true 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-34-g99e0160
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via 99e016052db1e271859147177688ea5ea8f0f27f (commit) from d845b630f85954350ff1ff3a767b384976b0a09b (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 99e016052db1e271859147177688ea5ea8f0f27f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 00:47:13 2012 +0200 update wrapper script, last commit was the test version ----------------------------------------------------------------------- Summary of changes: x2goserver/lib/x2gosqlitewrapper.pl | 31 ++++++++++++++----------------- 1 files changed, 14 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 5247fee..a1e5578 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -41,37 +41,34 @@ sub print_result } } -sub print_array +sub print_result_list { - # print all arrays separated by the pipe symbol - local $, = '|'; - print "THIS IS AN ARRAY!!!!"; - while (<>) + while ( shift ) { - print $_, "\n"; + print @_, "\n"; } } my $result; +my @result_list; my $cmd=shift or die "command not specified"; # call the corresponding function in the X2Go::Server:DB:SQLite3 package switch ($cmd) { - case /.*root/ { $result = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") } - else { $result = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") } + case /.*list.*root/ { @result_list = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") } + case /.*list.*/ { @result_list = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") } + case /.*root/ { $result = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") } + else { $result = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") } } -# depending on the type of $result we do different things... -print $result; -if ( defined($result) ) +if ( defined(@result_list) ) { - if ( ref($result) eq "ARRAY" ) - { - print_array($result); - } else { - print_result($result); - } + print_result_list(@result_list); +} +elsif ( defined($result) ) +{ + print_result($result); } exit (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).

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2012