x2go-commits January 2014

x2go-commits@lists.x2go.org

2 participants
8921 discussions

x2goserver.git - build-main (branch) updated: 4.0.1.9-10-g17cbacb
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-main has been updated via 17cbacbdea04c926c911c65e1a784e45826a0f32 (commit) from bf3010db7e52d1bf6aaab34406bcca424b32e602 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 + x2goserver.spec | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 280 insertions(+) create mode 100644 x2goserver.spec The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a37c38e..d8a3a01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low * Grab systemd service file from Fedora and ship it upstream. * Add init script for RPM based distro. Taken from the Fedora package. + * Ship x2goserver.spec (RPM package definitions) in upstream project. (Thanks + to the Fedora package maintainers). File differs from the Fedora file + already. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Nov 2013 16:16:22 +0100 diff --git a/x2goserver.spec b/x2goserver.spec new file mode 100644 index 0000000..f0d63e4 --- /dev/null +++ b/x2goserver.spec @@ -0,0 +1,277 @@ +Name: x2goserver +Version: 4.0.1.9 +Release: 0x2go1%{?dist} +Summary: X2Go Server + +Group: Applications/Communications +License: GPLv2+ +URL: http://www.x2go.org +Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz +# git clone git://code.x2go.org/x2goserver +# cd x2goserver +# git archive --prefix=x2goserver-4.1.0.0-20130722git65169c9/ 65169c9d65b117802e50631be0bbd719163d969e | gzip > ../x2goserver-4.1.0.0-20130722git65169c9.tar.gz +#Source0: %{name}/%{name}-%{version}-%{checkout}.tar.gz +Source1: x2gocleansessions.service +Source2: x2gocleansessions.init + +BuildRequires: perl(ExtUtils::MakeMaker) +%if 0%{?fedora} +BuildRequires: man2html-core +BuildRequires: systemd +%else +BuildRequires: man +%endif +# So XSESSIONDIR gets linked +BuildRequires: xorg-x11-xinit +# For x2goruncommand - for now +Requires: bc +# For netstat in x2goresume-session +Requires: net-tools +Requires: openssh-server +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# We need a database +Requires: perl(DBD::SQLite) +# For killall in x2gosuspend-session +Requires: psmisc +Requires: pwgen +# For printing, file-sharing +Requires: sshfs +# For /etc/sudoers.d +Requires: sudo +Requires: x2goagent +# For /etc/X11/Xresources +Requires: xorg-x11-xinit +Requires: xorg-x11-fonts-misc +Requires(pre): shadow-utils + +%{?perl_default_filter} + +%description +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains the main daemon and tools for X2Go server-side session +administrations. + + +%package printing +Summary: X2Go server printing support +Requires: %{name} = %{version}-%{release} + +%description printing +The X2Go server printing package provides client-side printing support for +X2Go. + +This package has to be installed on X2Go servers that shall be able to pass +X2Go print jobs on to the X2Go client. + +This package co-operates with the cups-x2go CUPS backend. If CUPS server and +X2Go server are hosted on different machines, then make sure you install +this package on the X2Go server(s) (and the cups-x2go package on the CUPS +server). + + +%prep +%setup -q + +# Set path +#find -type f | xargs sed -i -r -e '/^((LIBDIR|X2GO_LIB_PATH)=|use lib|my \$x2go_lib_path)/s,/lib/,/%{_lib}/,' +find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' +sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath +# Don't try to be root +sed -i -e 's/-o root -g root//' */Makefile +# Perl pure_install +sed -i -e 's/perl install/perl pure_install/' Makefile + + +%build +export PATH=%{_qt4_bindir}:$PATH +make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} + + +%install +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} XSESSIONDIR=/etc/X11/xinit/Xclients.d + +# Make symbolic link relative +rm %{buildroot}%{_sysconfdir}/x2go/Xresources +ln -s ../X11/Xresources %{buildroot}%{_sysconfdir}/x2go/ + +# Remove placeholder files +rm %{buildroot}%{_libdir}/x2go/extensions/*.d/.placeholder + +# x2gouser homedir, state dir +mkdir -p %{buildroot}%{_sharedstatedir}/x2go +# Create empty session file for %%ghost +touch %{buildroot}%{_sharedstatedir}/x2go/x2go_sessions + +# Printing spool dir +mkdir -p %{buildroot}%{_localstatedir}/spool/x2goprint + +%if 0%{?fedora} +# System.d session cleanup script +mkdir -p %{buildroot}%{_unitdir} +install -pm0644 %SOURCE1 %{buildroot}%{_unitdir} +%else +# SysV session cleanup script +mkdir -p %{buildroot}%{_initddir} +install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2gocleansessions +%endif + +%pre +getent group x2gouser >/dev/null || groupadd -r x2gouser +getent passwd x2gouser >/dev/null || \ + useradd -r -g x2gouser -d /var/lib/x2go -s /sbin/nologin \ + -c "x2go" x2gouser +exit 0 + +%post +# Initialize the session database +[ ! -f %{_sharedstatedir}/x2go/x2go_sessions ] && + %{_sbindir}/x2godbadmin --createdb || : + +%if 0%{?fedora} +%systemd_post x2gocleansessions.service + +%preun +%systemd_preun x2gocleansessions.service + +%postun +%systemd_postun x2gocleansessions.service +%else +/sbin/chkconfig --add x2gocleansessions + +%postun +if [ "$1" -ge "1" ] ; then + /sbin/service x2gocleansessions condrestart >/dev/null 2>&1 || : +fi + +%preun +if [ "$1" = 0 ]; then + /sbin/service x2gocleansessions stop >/dev/null 2>&1 + /sbin/chkconfig --del x2gocleansessions +fi +%endif + +%pre printing +getent group x2goprint >/dev/null || groupadd -r x2goprint +getent passwd x2goprint >/dev/null || \ + useradd -r -g x2goprint -d /var/spool/x2goprint -s /sbin/nologin \ + -c "x2go" x2goprint +exit 0 + + +%files +%doc debian/copyright +%doc debian/changelog +%config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver +%dir %{_sysconfdir}/x2go/ +%config(noreplace) %{_sysconfdir}/x2go/x* +%config(noreplace) %{_sysconfdir}/x2go/Xsession.options +%{_sysconfdir}/x2go/Xresources +%{_sysconfdir}/x2go/Xsession +%{_sysconfdir}/x2go/Xsession.d +%{_bindir}/x2go* +%exclude %{_bindir}/x2goprint +%dir %{_libdir}/x2go +%{_libdir}/x2go/extensions +%{_libdir}/x2go/x2gosqlitewrapper.pl +%attr(02755,root,x2gouser) %{_libdir}/x2go/x2gosqlitewrapper +%{_libdir}/x2go/x2gochangestatus +%{_libdir}/x2go/x2gocreatesession +%{_libdir}/x2go/x2godbwrapper.pm +%{_libdir}/x2go/x2gogetagent +%{_libdir}/x2go/x2gogetdisplays +%{_libdir}/x2go/x2gogetports +%{_libdir}/x2go/x2gogetstatus +%{_libdir}/x2go/x2goinsertport +%{_libdir}/x2go/x2goinsertsession +%{_libdir}/x2go/x2golistsessions_sql +%{_libdir}/x2go/x2gologlevel +%{_libdir}/x2go/x2gologlevel.pm +%{_libdir}/x2go/x2goresume +%{_libdir}/x2go/x2gormport +%{_libdir}/x2go/x2gosuspend-agent +%{_libdir}/x2go/x2gosyslog +%{_sbindir}/x2go* +%{_mandir}/man8/x2go*.8.gz +%exclude %{_mandir}/man8/x2goprint.8.gz +%{_datadir}/x2go/ +%exclude %{_datadir}/x2go/versions/VERSION.x2goserver-printing +%exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features +%attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/ +%ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions +%if 0%{?fedora} +%{_unitdir}/x2gocleansessions.service +%else +%{_initddir}/x2gocleansessions +%endif + +%files printing +%{_bindir}/x2goprint +%{_mandir}/man8/x2goprint.8.gz +%{_datadir}/x2go/versions/VERSION.x2goserver-printing +%{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features +%attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint + +%changelog +* Wed Nov 27 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.8-2 +- Use mktemp instead of tempfile +- BR xorg-x11-xinit for Xsession.d link creation +- Add patch to fix keyboard setting (bug #1033876) + +* Sat Nov 23 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.8-1 +- Update to 4.0.1.8 +- Fix x2gocleansessions init script for EL6 (bug #1031150) + +* Tue Oct 22 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.6-6 +- Fix bug in x2gocleansessions init script, enable by default + +* Wed Sep 11 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.6-5 +- Add some needed requires + +* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4.0.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 30 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.6-3 +- Mark /var/lib/x2go as a directory +- Add patch to make the following changes: +- Remove Xsession.options +- Make /etc/x2go/Xsession.d point to /etc/X11/xinit/Xclients.d +- Make /etc/x2go/Xsession executable + +* Mon Jul 29 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.6-2 +- Add SysV init script for EL6 + +* Mon Jul 29 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.6-1 +- Use 4.0.1.6 release +- Drop patches applied upstream + +* Mon Jul 22 2013 Rok Mandeljc <rok.mandeljc(a)gmail.com> - 4.1.0.0-0.4.20130722git65169c9 +- Update to latest git +- Use PREFIX=%{_prefix} when building, not just when installing. +- Use pwgen instead of makepasswd, which is not available on Fedora. +- Fixed a missing function import in x2golistsessions. +- Added dependencies for xorg-x11-fonts-misc +- Added system.d script for session cleanup on start. +- Fixed x2goruncommand for TERMINAL -> gnome-terminal; the latter seems to return immediately in Fedora 19. + +* Thu May 30 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.1.0.0-0.3.20130520gitbd2cfe4 +- Update to latest git +- Split out printing sub-package + +* Wed Jan 23 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.1.0.0-0.2.20130122git +- Add post script to create session database if needed + +* Tue Jan 22 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.1.0.0-0.1.20130122git +- Update to 4.1.0.0 git + +* Fri Jan 18 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.0.0-1 +- Update to 4.0.0.0 + +* Tue Dec 11 2012 Orion Poplawski <orion(a)cora.nwra.com> - 3.1.1.9-1 +- Initial Fedora package 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 - build-main (branch) updated: 4.0.1.9-16-g13ec71f
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-main has been updated via 13ec71f7df3efae239c2dbe96a5abe9370fa7b2f (commit) from 855c9257bed7568482f3ccf042574ee91dca7d15 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2gostartagent | 6 +++++- x2goserver/etc/x2goagent.options | 11 ++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3a54b9d..9c562e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low - x2goserver-fmbindings/Makefile: install share/applications and share/mime. - x2goserver-printing/Makefile: create feature.d directory before installing files into it. + - Handle TCP listening of x2goagent in x2goagent.options. (Fixes: #354). * Grab systemd service file from Fedora and ship it upstream. * Add init script for RPM based distro. Taken from the Fedora package. diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index df6aea1..2c2534e 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -35,6 +35,8 @@ fi X2GO_ROOT="${HOME}/.x2go" export NX_ROOT=$X2GO_ROOT +X2GO_NXAGENT_DEFAULT_OPTIONS="-nolisten tcp" + if [ -r /etc/x2go/x2goagent.options ]; then source /etc/x2go/x2goagent.options fi @@ -282,7 +284,9 @@ fi NOLISTOPT="" if [ "$X2GOXDMCP" == "" ] ;then XDMCPOPT="" - NOLISTOPT="-nolisten tcp" + if [ "x${X2GO_NXAGENT_OPTIONS}" = "x${X2GO_NXAGENT_OPTIONS/' -nolisten tcp'/''}" ]; then + NOLISTOPT="-nolisten tcp" + fi else XDMCPOPT="-query $X2GOXDMCP" fi diff --git a/x2goserver/etc/x2goagent.options b/x2goserver/etc/x2goagent.options index afe12f9..fbf4a01 100644 --- a/x2goserver/etc/x2goagent.options +++ b/x2goserver/etc/x2goagent.options @@ -12,4 +12,13 @@ X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES" # Disable GLX, the old mesa version is hopelessly outdated anyways. # Unbreaks the gnome3 control center # -X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension GLX" +#X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension GLX" + +# Launch X2Go's X-server x2goagent with option "-nolisten tcp". +# +# This is the default setting and the X2Go developers really recommend not to +# touch this. However, if you play with this (i.e. if you comment it out) you +# should really know what you are doing. +# +# For everyone else: don't touch the line below!!! +X2GO_NXAGENT_DEFAULT_OPTIONS+=" -nolisten tcp" 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 - build-main (branch) updated: 4.0.1.9-14-g10a1388
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-main has been updated via 10a138860b0c44346c7e2d8fd160c97d468ce300 (commit) from c877f88ad350d414bfdf956e27f569198ff95ebc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver-fmbindings/Makefile | 4 ++++ 2 files changed, 5 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7156fb3..b37e645 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low we broke by trying to fix the fullscreen/geometry issue in x2gostartagent. Thanks to Harvey Eneman for tracking this down!!! (Fixes: #355). - x2goserver-fmbindings/Makefile: install x2gofm. + - x2goserver-fmbindings/Makefile: install share/applications and share/mime. * Grab systemd service file from Fedora and ship it upstream. * Add init script for RPM based distro. Taken from the Fedora package. diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index 24b04a0..7ba98af 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -56,6 +56,10 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/applications + $(INSTALL_PROGRAM) share/applications/x2gofm.desktop $(DESTDIR)$(SHAREDIR)/applications/ + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/mime/packages + $(INSTALL_PROGRAM) share/mime/packages/sshfs-x2go.xml $(DESTDIR)$(SHAREDIR)/mime/packages/ install_config: 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 - build-main (branch) updated: 4.0.1.9-12-g93b733a
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-main has been updated via 93b733a2a6483b76507839d472d289b33899e104 (commit) from 14900d5b5532b878d37a7dad071bf3c3d0779707 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 +++++++--- x2goserver/sbin/x2gocleansessions | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b1cfef0..27e90f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -150,9 +150,13 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low - * Use mktemp instead of tempfile (because Fedora does not have the tempfile - binary). (Fixes: #347). - * Replace makepasswd by pwgen (because Fedora does not have makepasswd). + * New upstream version (4.0.0.8): + - Use mktemp instead of tempfile (because Fedora does not have the tempfile + binary). (Fixes: #347). + - Replace makepasswd by pwgen (because Fedora does not have makepasswd). + - Improve parsing of the NX session.log file where unexpected extra logging + takes place during session suspension/resumption. Thanks to Gerald Richter + for finding this!!! (Fixes: #356). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Nov 2013 16:14:32 +0100 diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index e2a784a..4d1395b 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -69,7 +69,7 @@ sub is_suspended my $sess=shift; my $user=shift; my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; - my $text=`tail -1 $log 2>/dev/null`; + my $text=`grep Session: $log 2>/dev/null|tail -1`; if ($text =~ m/Session suspended/) { return 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 - build-main (branch) updated: 4.0.1.9-11-g14900d5
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-main has been updated via 14900d5b5532b878d37a7dad071bf3c3d0779707 (commit) from 17cbacbdea04c926c911c65e1a784e45826a0f32 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ x2goserver/bin/x2goresume-session | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d8a3a01..b1cfef0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low + * New upstream version (4.0.1.10): + - Fix x2goresume-session. The several parameters placed into the NX options + file are expected by x2goresume-session at very specific positions. This + we broke by trying to fix the fullscreen/geometry issue in x2gostartagent. + Thanks to Harvey Eneman for tracking this down!!! (Fixes: #355). * Grab systemd service file from Fedora and ship it upstream. * Add init script for RPM based distro. Taken from the Fedora package. diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index fb0d40f..94f29f8 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -123,14 +123,21 @@ done SESSION_DIR="${X2GO_ROOT}/C-${SESSION_NAME}" OPTIONS=`cat ${SESSION_DIR}/options` -GSTR=`echo "$OPTIONS" | awk -F, {'print $13'}` -RSTR=`echo "$OPTIONS" | awk -F, {'print $14'}` -FSTR=`echo "$OPTIONS" | awk -F, {'print $15'}` LSTR=`echo "$OPTIONS" | awk -F, {'print $2'}` PSTR=`echo "$OPTIONS" | awk -F, {'print $3'}` KTSTR=`echo "$OPTIONS" | awk -F, {'print $12'}` -LISTSTR=`echo "$OPTIONS" | awk -F, {'print $17'}` - +GSTR=`echo "$OPTIONS" | awk -F, {'print $13'}` +test_GSTR=`echo $GSTR | sed s/geometry=.*//` +if [ -n "$test_GSTR" ]; then + GSTR="geometry=" + RSTR=`echo "$OPTIONS" | awk -F, {'print $13'}` + FSTR=`echo "$OPTIONS" | awk -F, {'print $14'}` + LISTSTR=`echo "$OPTIONS" | awk -F, {'print $16'}` +else + RSTR=`echo "$OPTIONS" | awk -F, {'print $14'}` + FSTR=`echo "$OPTIONS" | awk -F, {'print $15'}` + LISTSTR=`echo "$OPTIONS" | awk -F, {'print $17'}` +fi KTSTR=`echo "$KTSTR" | sed "s/\//\\\\\\\\\//"` X2GO_KBD_TYPE=`echo "$X2GO_KBD_TYPE" | sed "s/\//\\\\\\\\\//"` 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 - build-main (branch) updated: 4.0.1.9-13-gc877f88
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-main has been updated via c877f88ad350d414bfdf956e27f569198ff95ebc (commit) from 93b733a2a6483b76507839d472d289b33899e104 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver-fmbindings/Makefile | 2 ++ 2 files changed, 3 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 27e90f4..7156fb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low file are expected by x2goresume-session at very specific positions. This we broke by trying to fix the fullscreen/geometry issue in x2gostartagent. Thanks to Harvey Eneman for tracking this down!!! (Fixes: #355). + - x2goserver-fmbindings/Makefile: install x2gofm. * Grab systemd service file from Fedora and ship it upstream. * Add init script for RPM based distro. Taken from the Fedora package. diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index ef9a5d3..24b04a0 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -51,6 +51,8 @@ clean_man2html: install: install_scripts install_config install_man install_version install_scripts: + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) bin/x2gofm $(DESTDIR)$(BINDIR)/ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ 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 - build-main (branch) updated: 4.0.1.9-17-gadf8284
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-main has been updated via adf8284a0ff84d95b427708df1b5c7f0e8e3caf7 (commit) from 13ec71f7df3efae239c2dbe96a5abe9370fa7b2f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver-extensions/Makefile | 17 ----------------- x2goserver-fmbindings/Makefile | 3 --- x2goserver-printing/Makefile | 2 -- x2goserver-xsession/Makefile | 9 --------- 5 files changed, 1 insertion(+), 31 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9c562e3..376fe97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low - x2goserver-printing/Makefile: create feature.d directory before installing files into it. - Handle TCP listening of x2goagent in x2goagent.options. (Fixes: #354). + - Clean up Makefiles, remove commented out line. * Grab systemd service file from Fedora and ship it upstream. * Add init script for RPM based distro. Taken from the Fedora package. diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index cc15e52..f357856 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -14,14 +14,11 @@ 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=$(shell cd lib && echo *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features .placeholder) man_pages = `cd man && find * -type f` @@ -52,7 +49,6 @@ 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)$(LIBDIR)/extensions $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d @@ -70,7 +66,6 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ -# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ $(INSTALL_FILE) lib/extensions/pre-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/ $(INSTALL_FILE) lib/extensions/post-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/post-start.d/ $(INSTALL_FILE) lib/extensions/fail-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/ @@ -86,11 +81,6 @@ install_scripts: $(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) @@ -107,8 +97,6 @@ uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done -# for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done -# for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/ || true $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/.placeholder $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/.placeholder @@ -137,11 +125,6 @@ uninstall_scripts: 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-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index 7ba98af..248bd7a 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -14,14 +14,11 @@ 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=$(shell cd lib && echo *) FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index 325934c..0f14d37 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -20,8 +20,6 @@ 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 *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 7118d85..07921e0 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -23,18 +23,9 @@ SHAREDIR=$(PREFIX)/share/x2go XSESSIONDIR ?= /etc/X11/Xsession.d XSESSIONOPTIONFILE ?= /etc/X11/Xsession.options -#BIN_SCRIPTS=$(shell cd bin && echo *) -#SBIN_SCRIPTS=$(shell cd sbin && echo *) -#LIB_FILES=$(shell cd lib && echo *) ETC_FILES=$(shell cd etc && echo *) 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-indep 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 - build-main (branch) updated: 4.0.1.9-7-ge56275b
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-main has been updated via e56275bef74a77a68b54135f3a91025c7e8ef306 (commit) from 346bfc6c985e7f5283cb8b82e65693db0b7bc94b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 2 +- x2goserver/sbin/x2godbadmin | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3a7117b..7ee7b6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -142,6 +142,7 @@ x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low * Use mktemp instead of tempfile (because Fedora does not have the tempfile binary). (Fixes: #347). + * Replace makepasswd by pwgen (because Fedora does not have makepasswd). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Nov 2013 16:14:32 +0100 diff --git a/debian/control b/debian/control index eadc2eb..0170df5 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Depends: openssh-client, openssh-server, libconfig-simple-perl, - makepasswd, + pwgen, libdbd-pg-perl, libdbd-sqlite3-perl, libfile-basedir-perl, diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index a4f915c..2652e80 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -190,7 +190,7 @@ if (!$sslmode) } my $dbadmin=$Config->param("postgres.dbadmin"); my $x2goadmin="x2godbuser"; -my $x2goadminpass=`makepasswd`; +my $x2goadminpass=`pwgen 8 1`; chomp ($x2goadminpass); my $db="x2go_sessions"; @@ -317,7 +317,7 @@ sub add_user() print "The super-user \"root\" is not allowed to use X2Go\n"; return; } - $pass=`makepasswd`; + $pass=`pwgen 8 1`; chomp($pass); my $sth=$dbh->prepare("DROP OWNED BY \"x2gouser_$user\""); 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 - build-main (branch) updated: 4.0.1.9-9-gbf3010d
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-main has been updated via bf3010db7e52d1bf6aaab34406bcca424b32e602 (commit) from 782dfcc35fc578578f66a81c2e6b5dc1c281dbb2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + rpm/x2gocleansessions.init | 107 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 rpm/x2gocleansessions.init The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a079dec..a37c38e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low * Grab systemd service file from Fedora and ship it upstream. + * Add init script for RPM based distro. Taken from the Fedora + package. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Nov 2013 16:16:22 +0100 diff --git a/rpm/x2gocleansessions.init b/rpm/x2gocleansessions.init new file mode 100644 index 0000000..e87d652 --- /dev/null +++ b/rpm/x2gocleansessions.init @@ -0,0 +1,107 @@ +#!/bin/sh +# +# x2gocleansessions - Starts/stop the "x2gocleansessions" daemon +# +# chkconfig: 2345 99 1 +# description: Cleans the X2Go session database + +### BEGIN INIT INFO +# Provides: x2gocleansessions at batch +# Required-Start: $local_fs +# Required-Stop: $local_fs +# Default-Start: 2345 +# Default-Stop: 016 +# Short-Description: Starts/stop the "x2gocleansessions" daemon +# Description: Cleans the X2Go session database +### END INIT INFO + +# Source function library. +. /etc/rc.d/init.d/functions + +exec=/usr/sbin/x2gocleansessions +prog="x2gocleansessions" +config=/etc/sysconfig/x2gocleansessions +XSOCKDIR=/tmp/.X11-unix + +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +lockfile=/var/lock/subsys/$prog + +start() { +[ -x $exec ] || exit 5 + # Make sure these are created by default so that nobody else can + if [ ! -d $XSOCKDIR ] + then + mkdir $XSOCKDIR + chmod 1777 $XSOCKDIR + fi + echo -n $"Starting $prog: " + daemon $exec $OPTS + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile +} + +stop() { + echo -n $"Stopping $prog: " + killproc $exec + retval=$? + echo + rm -f $lockfile +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + # run checks to determine if the service is running or use generic status + status $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? + 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 - build-main (branch) updated: 4.0.1.9-8-g782dfcc
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-main has been updated via 782dfcc35fc578578f66a81c2e6b5dc1c281dbb2 (commit) from e56275bef74a77a68b54135f3a91025c7e8ef306 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- x2goserver.service | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 x2goserver.service The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7ee7b6e..a079dec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low - * Continue development on stable branch of X2Go Server... + * Grab systemd service file from Fedora and ship it upstream. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Nov 2013 16:16:22 +0100 diff --git a/x2goserver.service b/x2goserver.service new file mode 100644 index 0000000..81df9a8 --- /dev/null +++ b/x2goserver.service @@ -0,0 +1,9 @@ +[Unit] +Description=X2Go session cleanup + +[Service] +ExecStart=/usr/sbin/x2gocleansessions + +[Install] +WantedBy=multi-user.target + 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits January 2014