x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

cups-x2go.git - master (branch) updated: 3.0.0.4-10-g8f13fc9
by git-admin＠x2go.org 07 Dec '13

07 Dec '13

The branch, master has been updated via 8f13fc9f969fa73793d0254ecf797816a5ce63ff (commit) from 3386964b2839fae3fc8f4d8a226ca5c1e5c1bf05 (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 8f13fc9f969fa73793d0254ecf797816a5ce63ff Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Dec 8 00:08:31 2013 +0100 compensate missing %buildroot macro in EPEL5 ----------------------------------------------------------------------- Summary of changes: cups-x2go.spec | 3 +++ 1 file changed, 3 insertions(+) The diff of changes is: diff --git a/cups-x2go.spec b/cups-x2go.spec index 3a5f65b..8f7a3d2 100644 --- a/cups-x2go.spec +++ b/cups-x2go.spec @@ -12,6 +12,9 @@ BuildArch: noarch Requires: cups Requires: ghostscript +For compatibility with EPEL5 +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + %description CUPS backend for printing from X2Go. hooks/post-receive -- cups-x2go.git (CUPS Backend for X2Go Printing) 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 "cups-x2go.git" (CUPS Backend for X2Go Printing).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.21-18-g703a67a
by git-admin＠x2go.org 07 Dec '13

07 Dec '13

The branch, master has been updated via 703a67ac73008fa01eddeb8af6583649dabdf6cb (commit) from 51afd69b23ad2b39403c39720ae519639371b67e (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 703a67ac73008fa01eddeb8af6583649dabdf6cb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Dec 8 00:07:14 2013 +0100 compensate missing %buildroot macro in EPEL5 ----------------------------------------------------------------------- Summary of changes: nx-libs.spec | 3 +++ 1 file changed, 3 insertions(+) The diff of changes is: diff --git a/nx-libs.spec b/nx-libs.spec index fe68896..ee81c70 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -33,6 +33,9 @@ Provides: nx = %{version}-%{release} Obsoletes: nx%{?_isa} < 3.5.0-19 Provides: nx%{?_isa} = %{version}-%{release} +For compatibility with EPEL5 +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + %description NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-39-g61a07ea
by git-admin＠x2go.org 07 Dec '13

07 Dec '13

The branch, master has been updated via 61a07eae637f222543f4fdff0b38dddd5ff8ce14 (commit) from 119635850c8408e45d2d2dca2f3c5b013f8da1c6 (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 61a07eae637f222543f4fdff0b38dddd5ff8ce14 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Dec 7 23:59:43 2013 +0100 x2goclient.spec: try to fix faulty path to qmake-qt4 ----------------------------------------------------------------------- Summary of changes: x2goclient.spec | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/x2goclient.spec b/x2goclient.spec index 1c4fe4e..b79951c 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -40,16 +40,10 @@ directories. # Fix up install issues sed -i -e 's/-o root -g root//' Makefile sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile -%if 0%{?rhel_version} <= 6 +%if 0%{?rhel_version} sed -i -e '/^QMAKE_BINARY=/s@/usr/bin/qmake-qt4@/usr/lib/qt4/bin/qmake@' Makefile %endif -%if 0%{?fedora_version} >= 18 -# Use system qtbrowserplugin -sed -i -e '/CFGPLUGIN/aTEMPLATE=lib' x2goclient.pro -sed -i -e '/^LIBS /s/$/ -ldl/' x2goclient.pro -sed -i -e 's/include.*qtbrowserplugin.pri)/LIBS += -lqtbrowserplugin/' x2goclient.pro -rm -r qtbrowserplugin* -%elif 0%{?rhel_version} >= 6 +%if 0%{?fedora_version} >= 18 || 0%{?rhel_version} >= 6 # Use system qtbrowserplugin sed -i -e '/CFGPLUGIN/aTEMPLATE=lib' x2goclient.pro sed -i -e '/^LIBS /s/$/ -ldl/' x2goclient.pro hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

Build failed in Jenkins: nx-libs+nightly+epel-6 #4
by git-admin＠x2go.org 07 Dec '13

07 Dec '13

See <http://jenkins.x2go.org:8080/job/nx-libs+nightly+epel-6/4/> ------------------------------------------ [...truncated 265 lines...] patching file nx-X11/Makefile patching file nx-X11/config/imake/Makefile.ini patching file nx-X11/extras/Mesa/Makefile patching file nx-X11/extras/Xpm/Makefile.noX patching file nx-X11/extras/drm/linux-core/Makefile patching file nx-X11/extras/drm/linux/Makefile patching file nx-X11/extras/ttf2pt1/Makefile patching file nx-X11/lib/X11/Imakefile patching file nx-X11/lib/X11/Imakefile.NX.original patching file nx-X11/programs/Xserver/Imakefile Applying patch 051_nxcomp_macos105-fdisset.full+lite.patch patching file nxcomp/Agent.h Applying patch 052_nxcomp_macos10-nxauth-location.full+lite.patch patching file nxcomp/Auth.cpp Applying patch 053_nx-X11_no-xcomp1-install-target.full.patch patching file nx-X11/lib/X11/Imakefile Applying patch 101_nxagent_set-rgb-path.full.patch patching file nx-X11/programs/Xserver/os/oscolor.c Applying patch 102_xserver-xext_set-securitypolicy-path.full.patch patching file nx-X11/programs/Xserver/Xext/security.c Applying patch 103_nxagent_set-X0-config-path.full.patch patching file nx-X11/programs/Xserver/hw/nxagent/Keyboard.c Applying patch 105_nxagent_export-remote-keyboard-config.full.patch patching file nx-X11/programs/Xserver/hw/nxagent/Error.c patching file nx-X11/programs/Xserver/hw/nxagent/Error.h patching file nx-X11/programs/Xserver/hw/nxagent/Keyboard.c Applying patch 106_nxagent_utf8-copy-clipboard.full.patch patching file nx-X11/programs/Xserver/hw/nxagent/Clipboard.c Applying patch 107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch patching file nx-X11/programs/Xserver/hw/nxagent/Clipboard.c patching file nx-X11/programs/Xserver/hw/nxagent/Image.c Applying patch 108_nxagent_wine-close-delay.full.patch patching file nx-X11/programs/Xserver/hw/nxagent/Window.c Applying patch 110_nxagent_createpixmap-bounds-check.full.patch patching file nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c Applying patch 200_nxagent_check-binary-x2go-flavour.full.patch patching file nx-X11/programs/Xserver/hw/nxagent/Init.c patching file nx-X11/programs/Xserver/hw/nxagent/Init.h Applying patch 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch patching file nx-X11/programs/Xserver/hw/nxagent/Display.c patching file nx-X11/programs/Xserver/hw/nxagent/Icons.h patching file nx-X11/programs/Xserver/hw/nxagent/x2go.xpm Applying patch 202_nx-X11_enable-xinerama.full.patch patching file nx-X11/config/cf/host.def patching file nx-X11/config/cf/X11.tmpl patching file nx-X11/lib/Xinerama/Xinerama.c patching file nx-X11/programs/Xserver/hw/nxagent/Imakefile patching file nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c patching file nx-X11/programs/Xserver/Imakefile patching file nx-X11/programs/Xserver/Xext/panoramiX.c patching file nx-X11/programs/Xserver/Xext/panoramiX.h Applying patch 203_nxagent_disable-rootless-exit.full.patch patching file nx-X11/programs/Xserver/hw/nxagent/Args.c patching file nx-X11/programs/Xserver/hw/nxagent/Handlers.c patching file nx-X11/programs/Xserver/hw/nxagent/Options.c patching file nx-X11/programs/Xserver/hw/nxagent/Options.h Applying patch 204_nxagent_repaint-solidpict.full.patch patching file nx-X11/programs/Xserver/hw/nxagent/Render.c patching file nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c patching file nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h Applying patch 209_x2goagent-add-man-page.full.patch patching file nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 Applying patch 220_nxproxy-bind-loopback-only.full+lite.patch patching file nxcomp/Loop.cpp patching file nxcomp/Misc.cpp patching file nxcomp/Misc.h Applying patch 300_nxagent_set-wm-class.full.patch patching file nx-X11/programs/Xserver/hw/nxagent/Screen.c Applying patch 301_nx-X11_use-shared-libs.full.patch patching file nx-X11/config/cf/host.def patching file nx-X11/programs/Xserver/Imakefile patching file nx-X11/programs/nxauth/Imakefile Applying patch 320_nxagent_configurable-keystrokes.full.patch patching file nx-X11/programs/Xserver/Imakefile patching file nx-X11/programs/Xserver/hw/nxagent/Imakefile patching file nx-X11/programs/Xserver/hw/nxagent/Keystroke.c patching file nx-X11/programs/Xserver/hw/nxagent/Keystroke.h patching file README.keystrokes patching file nx-X11/programs/Xserver/hw/nxagent/Args.c patching file nx-X11/programs/Xserver/hw/nxagent/Args.h Applying patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch patching file nx-X11/config/cf/Imake.rules patching file nx-X11/config/cf/Motif.tmpl patching file nx-X11/config/cf/X11.tmpl patching file nx-X11/config/cf/bsdLib.rules patching file nx-X11/config/cf/bsdLib.tmpl patching file nx-X11/config/cf/bsdiLib.tmpl patching file nx-X11/config/cf/convex.cf patching file nx-X11/config/cf/cygwin.tmpl patching file nx-X11/config/cf/darwinLib.tmpl patching file nx-X11/config/cf/gnuLib.tmpl patching file nx-X11/config/cf/ibmLib.rules patching file nx-X11/config/cf/ibmLib.tmpl patching file nx-X11/config/cf/lnxLib.rules patching file nx-X11/config/cf/lnxLib.tmpl patching file nx-X11/config/cf/mingw.tmpl patching file nx-X11/config/cf/nto.rules patching file nx-X11/config/cf/os2Lib.tmpl patching file nx-X11/config/cf/sco5.cf patching file nx-X11/config/cf/sv3Lib.tmpl patching file nx-X11/config/cf/sv4Lib.tmpl patching file nx-X11/config/cf/usl.cf patching file nx-X11/extras/Mesa/src/mesa/main/Imakefile patching file nx-X11/extras/Xpm/lib/Imakefile patching file nx-X11/extras/drm/libdrm.pc.in patching file nx-X11/extras/fontconfig/fontconfig.pc.in patching file nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile patching file nx-X11/lib/FS/Imakefile patching file nx-X11/lib/GLw/Imakefile patching file nx-X11/lib/ICE/Imakefile patching file nx-X11/lib/SM/Imakefile patching file nx-X11/lib/X11/Imakefile patching file nx-X11/lib/X11/Imakefile.NX.original patching file nx-X11/lib/X11/Imakefile.X.original patching file nx-X11/lib/XRes/Imakefile patching file nx-X11/lib/XTrap/Imakefile patching file nx-X11/lib/Xau/Imakefile patching file nx-X11/lib/Xaw/Imakefile patching file nx-X11/lib/Xaw6/Imakefile patching file nx-X11/lib/Xaw7/Imakefile patching file nx-X11/lib/Xcomposite/Imakefile patching file nx-X11/lib/Xcomposite/xcomposite.pc.in patching file nx-X11/lib/Xcursor/Imakefile patching file nx-X11/lib/Xcursor/xcursor.pc.in patching file nx-X11/lib/Xdamage/Imakefile patching file nx-X11/lib/Xdamage/xdamage.pc.in patching file nx-X11/lib/Xdmcp/Imakefile patching file nx-X11/lib/Xevie/Imakefile patching file nx-X11/lib/Xevie/xevie.pc.in patching file nx-X11/lib/Xext/Imakefile patching file nx-X11/lib/Xfixes/Imakefile patching file nx-X11/lib/Xfixes/xfixes.pc.in patching file nx-X11/lib/Xfontcache/Imakefile patching file nx-X11/lib/Xft/Imakefile patching file nx-X11/lib/Xft/xft.pc.in patching file nx-X11/lib/Xft1/Imakefile patching file nx-X11/lib/Xi/Imakefile patching file nx-X11/lib/Xinerama/Imakefile patching file nx-X11/lib/Xmu/Imakefile patching file nx-X11/lib/Xmuu/Imakefile patching file nx-X11/lib/Xp/Imakefile patching file nx-X11/lib/Xpm/Imakefile patching file nx-X11/lib/Xpm/Imakefile.NX.original patching file nx-X11/lib/Xpm/Imakefile.X.original patching file nx-X11/lib/XprintAppUtil/Imakefile patching file nx-X11/lib/XprintUtil/Imakefile patching file nx-X11/lib/Xrandr/Imakefile patching file nx-X11/lib/Xrender/Imakefile patching file nx-X11/lib/Xrender/xrender.pc.in patching file nx-X11/lib/Xss/Imakefile patching file nx-X11/lib/Xt/Imakefile patching file nx-X11/lib/Xt/Imakefile.NX.original patching file nx-X11/lib/Xt/Imakefile.X.original patching file nx-X11/lib/Xtst/Imakefile patching file nx-X11/lib/Xv/Imakefile patching file nx-X11/lib/XvMC/Imakefile patching file nx-X11/lib/XvMC/hw/i810/Imakefile patching file nx-X11/lib/XvMC/hw/via/unichrome/Imakefile patching file nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile patching file nx-X11/lib/XvMC/wrapper/Imakefile patching file nx-X11/lib/Xxf86dga/Imakefile patching file nx-X11/lib/Xxf86misc/Imakefile patching file nx-X11/lib/Xxf86rush/Imakefile patching file nx-X11/lib/Xxf86vm/Imakefile patching file nx-X11/lib/apple/Imakefile patching file nx-X11/lib/dmx/Imakefile patching file nx-X11/lib/dps/Imakefile patching file nx-X11/lib/dpstk/Imakefile patching file nx-X11/lib/expat/Imakefile patching file nx-X11/lib/font/Imakefile patching file nx-X11/lib/fontconfig/Imakefile patching file nx-X11/lib/fontenc/Imakefile patching file nx-X11/lib/freetype2/Imakefile patching file nx-X11/lib/oldX/Imakefile patching file nx-X11/lib/psres/Imakefile patching file nx-X11/lib/regex/Imakefile patching file nx-X11/lib/windows/Imakefile patching file nx-X11/lib/xkbfile/Imakefile patching file nx-X11/lib/xkbui/Imakefile patching file nx-X11/lib/zlib/Imakefile patching file nx-X11/programs/Xserver/Imakefile patching file nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile patching file nxcompext/Makefile.in patching file nxcompshad/Makefile.in Applying patch 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch patching file nx-X11/config/cf/host.def patching file nx-X11/lib/font/include/Imakefile patching file nx-X11/lib/Imakefile Applying patch 602_nx-X11_initgroups.full.patch patching file nx-X11/programs/Xserver/os/utils.c patching file nxcomp/Pipe.cpp Applying patch 603_nx-X11_compilation_warnings.full.patch patching file nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c patching file nx-X11/lib/X11/imLcPrs.c patching file nx-X11/programs/Xserver/xkb/ddxLoad.c Applying patch 604_nx-X11_recent-freetype-API.full.patch patching file nx-X11/lib/Xft/xftglyphs.c Applying patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch patching file nxcomp/Types.h Applying patch 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch patching file nx-X11/programs/Xserver/hw/nxagent/Splash.c patching file nx-X11/programs/Xserver/hw/nxagent/Display.c patching file nx-X11/programs/Xserver/hw/nxagent/Splash.h Applying patch 016_nx-X11_install-location.debian.patch patching file nx-X11/config/cf/Imake.tmpl Applying patch 102_xserver-xext_set-securitypolicy-path.debian.patch patching file nx-X11/programs/Xserver/Xext/security.c Now at patch 102_xserver-xext_set-securitypolicy-path.debian.patch + rm .pc/ -Rf + cat nx-libs.spec + egrep '^Source[1-9]+:.*' + awk '{ print $2 }' + read source_file + mv /var/lib/jenkins/tmp/tmp.jVyC23Tozt/nx-libs /var/lib/jenkins/tmp/tmp.jVyC23Tozt/nx-libs-3.5.0.22 + tar -czf /var/lib/jenkins/pkg-dist/heuler/nx-libs/rpmbuild/SOURCES/nx-libs-3.5.0.22.tar.gz nx-libs-3.5.0.22 + rpmbuild -D '%_topdir /var/lib/jenkins/pkg-dist/heuler/nx-libs/rpmbuild' -bs nx-libs.spec error: File /var/lib/jenkins/pkg-dist/heuler/nx-libs/rpmbuild/SOURCES/nx-libs-3.5.0.22.tar.gz: No such file or directory Build step 'Execute shell' marked build as failure

1 0

buildscripts.git - master (branch) updated: 0cca2d2ff38aedc282b7c4024cb464c49cb91552
by git-admin＠x2go.org 07 Dec '13

07 Dec '13

The branch, master has been updated via 0cca2d2ff38aedc282b7c4024cb464c49cb91552 (commit) from 502cd901162f0d8e8a808b9f779516e3dfb2d5f7 (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 0cca2d2ff38aedc282b7c4024cb464c49cb91552 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Dec 7 23:22:12 2013 +0100 upload RPMs to project subfolders in yum repository ----------------------------------------------------------------------- Summary of changes: bin/build-rpm-package | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/bin/build-rpm-package b/bin/build-rpm-package index e5e583b..8a48c12 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -253,17 +253,17 @@ upload_packages() { if [ "x$SKIP_ARCH" != "x$l_ARCH" ]; then # create remote directories in archive - 0</dev/null ssh $REPOS_SERVER mkdir -p $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/rpms - 0</dev/null ssh $REPOS_SERVER mkdir -p $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/repodata + 0</dev/null ssh $REPOS_SERVER mkdir -p $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$PROJECT/$l_ARCH/rpms + 0</dev/null ssh $REPOS_SERVER mkdir -p $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$PROJECT/$l_ARCH/repodata # remove rpm packages of the same name (pattern) - 0</dev/null ssh $REPOS_SERVER rm -f $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/rpms/$PROJECT.*.rpm + 0</dev/null ssh $REPOS_SERVER rm -f $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$PROJECT/$l_ARCH/rpms/$PROJECT.*.rpm # copy rpms into repo cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" - scp *.rpm $REPOS_SERVER:$RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/rpms/ || true + scp *.rpm $REPOS_SERVER:$RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$PROJECT/$l_ARCH/rpms/ || true - 0</dev/null ssh $REPOS_SERVER "cd $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$l_ARCH/ && createrepo ." + 0</dev/null ssh $REPOS_SERVER "cd $RPM_REPOS_BASE/$l_DIST/$COMPONENT/$l_CODENAME/$PROJECT/$l_ARCH/ && createrepo ." fi done hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.7-4-g08a2780
by git-admin＠x2go.org 07 Dec '13

07 Dec '13

The branch, release/4.0.0.x has been updated via 08a2780f1448da0fd00e68f11177b1ca1672da04 (commit) from 80162a9e02734a9c9e1770b03445478d30860f28 (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 08a2780f1448da0fd00e68f11177b1ca1672da04 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Dec 7 23:19:24 2013 +0100 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). ----------------------------------------------------------------------- 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 b39bfac..932b33c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ 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 26ffb13..b935a98 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -56,7 +56,7 @@ sub check_stat 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 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

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.9-12-g93b733a
by git-admin＠x2go.org 07 Dec '13

07 Dec '13

The branch, release/4.0.1.x 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 ----------------------------------------------------------------- commit 93b733a2a6483b76507839d472d289b33899e104 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Dec 7 23:19:24 2013 +0100 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). ----------------------------------------------------------------------- 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 - master (branch) updated: 3.1.1.3-263-g1c012ce
by git-admin＠x2go.org 07 Dec '13

07 Dec '13

The branch, master has been updated via 1c012ce3f85d9532da7775561a238f36d1a49d69 (commit) from ff0d0346071b860a4df52c84701c0b069b0850f4 (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 1c012ce3f85d9532da7775561a238f36d1a49d69 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Dec 7 23:19:24 2013 +0100 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). ----------------------------------------------------------------------- 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 74cb467..44999b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -215,9 +215,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 728ead3..7b8c731 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -72,7 +72,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

nx-libs.git - master (branch) updated: redist-server/3.5.0.21-17-g51afd69
by git-admin＠x2go.org 07 Dec '13

07 Dec '13

The branch, master has been updated via 51afd69b23ad2b39403c39720ae519639371b67e (commit) from 1ac043b9402b96d6dd58d15a5b17a6039c97ac45 (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 51afd69b23ad2b39403c39720ae519639371b67e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Dec 7 23:04:18 2013 +0100 The RPM macro for the linker flags does not exist on EPEL. Thus, hardcode __global_ldflags macro for EPEL builds. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ nx-libs.spec | 2 ++ 2 files changed, 4 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 55c7287..0f04f8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low to the Fedora package maintainers). File differs from the Fedora file already. + Use local tarball, don't expect ,,-full'' in tarball name. + + The RPM macro for the linker flags does not exist on EPEL. Thus, hardcode + __global_ldflags macro for EPEL builds. [ Clemens Lang ] * Add patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch. Fix diff --git a/nx-libs.spec b/nx-libs.spec index 07e2ba5..fe68896 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -527,6 +527,8 @@ cat >"my_configure" <<'EOF' %configure EOF chmod a+x my_configure; +# The RPM macro for the linker flags does not exist on EPEL +%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} export SHLIBGLOBALSFLAGS="%{__global_ldflags}" make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" USRLIBDIR=%{_libdir}/nx SHLIBDIR=%{_libdir}/nx hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.9-8-g782dfcc
by git-admin＠x2go.org 07 Dec '13

07 Dec '13

The branch, release/4.0.1.x 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 ----------------------------------------------------------------- commit 782dfcc35fc578578f66a81c2e6b5dc1c281dbb2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Dec 1 00:12:39 2013 +0100 Grab systemd service file from Fedora and ship it upstream. ----------------------------------------------------------------------- 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:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits