x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.9-16-g13ec71f
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, release/4.0.1.x 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 ----------------------------------------------------------------- commit 13ec71f7df3efae239c2dbe96a5abe9370fa7b2f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 09:36:44 2013 +0100 Handle TCP listening of x2goagent in x2goagent.options. (Fixes: #354). ----------------------------------------------------------------------- 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 - release/4.0.1.x (branch) updated: 4.0.1.9-13-gc877f88
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, release/4.0.1.x 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 ----------------------------------------------------------------- commit c877f88ad350d414bfdf956e27f569198ff95ebc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 09:54:32 2013 +0100 x2goserver-fmbindings/Makefile: install x2gofm. ----------------------------------------------------------------------- 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 - master (branch) updated: 3.1.1.3-287-g92d6900
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via 92d6900e290f24d15201b03d581156d1b21d9825 (commit) from 2a841f477fa0fc1f06a3deabe61344c0d2dcb8b1 (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 92d6900e290f24d15201b03d581156d1b21d9825 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 09:36:44 2013 +0100 Handle TCP listening of x2goagent in x2goagent.options. (Fixes: #354). ----------------------------------------------------------------------- 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 ca694b5..3b70829 100644 --- a/debian/changelog +++ b/debian/changelog @@ -82,6 +82,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 7268d46..c04ea2c 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 @@ -293,7 +295,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 - master (branch) updated: 3.1.1.3-288-gbb6c22d
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via bb6c22da7518d9042f1b6eab78645bf092ce82e5 (commit) from 92d6900e290f24d15201b03d581156d1b21d9825 (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 bb6c22da7518d9042f1b6eab78645bf092ce82e5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 09:50:39 2013 +0100 X2Go session DB creation revisited... * debian/x2goserver.postinst, debian/libx2go-server-db-perl: + Handle X2Go session DB creation in x2goserver _and_ perl-X2Go-Server-DB on postinst. * x2goclient.spec: + Handle X2Go session DB creation in x2goserver _and_ perl-X2Go-Server-DB on postinst. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++-- debian/libx2go-server-db-perl.postinst | 21 +++++++++++++++++++++ debian/x2goserver.postinst | 7 ++++++- x2goserver.spec | 22 +++++++++++++++------- 4 files changed, 47 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3b70829..f347917 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,8 +44,9 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low x2goserver.conf in new x2goserver-common package. + Move several x2goserver-* package to x2goserver's Recommends field. + Add Reinhard Tartler to Uploaders. - * debian/x2goserver.postinst: - + Make sure x2godbadmin is evoked from package x2goserver. + * debian/x2goserver.postinst, debian/libx2go-server-db-perl: + + Handle X2Go session DB creation in x2goserver _and_ + perl-X2Go-Server-DB on postinst. * debian/x2goserver.init: + Rely on $PATH when invoking x2gocleansessions. * Move code in pre/post+inst/rm scripts around (from x2goserver package @@ -53,6 +54,8 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low * x2goclient.spec: + Bring debian/control and x2goclient.spec in sync. + Make sure x2godbadmin is evoked from package x2goserver. + + Handle X2Go session DB creation in x2goserver _and_ + perl-X2Go-Server-DB on postinst. [ Guangzhou Nianguan Electronics Technology Co.Ltd. ] * New upstream version (4.1.0.0): diff --git a/debian/libx2go-server-db-perl.postinst b/debian/libx2go-server-db-perl.postinst index 239d5c9..f90d226 100755 --- a/debian/libx2go-server-db-perl.postinst +++ b/debian/libx2go-server-db-perl.postinst @@ -29,6 +29,27 @@ case "$1" in 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 + + # setup up SQLite3 database, do nothing if PostgeSQL is already configured + # + # Note: The below code exists in x2goserver.postinst and libx2go-server-db.postinst + # It will only succeed if both packages are installed. As we cannot influence the + # installation order, we handle the session DB creation in both packages. One of + # then should succeed. + if [ -x /usr/sbin/x2godbadmin ] && [ -f /etc/x2go/x2gosql/sql ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null; then + if [ ! -f /var/lib/x2go/x2go_sessions ]; then + x2godbadmin --createdb + else + # make sure db permissions are set correctly + chown -R root:x2gouser /var/lib/x2go + # egid x2gouser needs write access to the db dir (for temporary db journal file) + chmod 0770 /var/lib/x2go + # ... and to the db file itself, of course + chmod 0660 /var/lib/x2go/x2go_sessions + fi + else + echo "X2Go is configured to use a non-SQLite DB backend, leaving the database alone." + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 2772bcb..684eff4 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -57,7 +57,12 @@ case "$1" in ln -s /usr/share/applications /etc/x2go/applications fi - # setup up SQLite3 database, do nothing if PostgeSQL is already configured + # Setup up SQLite3 database, do nothing if PostgeSQL is already configured + # + # Note: The below code exists in x2goserver.postinst and libx2go-server-db.postinst + # It will only succeed if both packages are installed. As we cannot influence the + # installation order, we handle the session DB creation in both packages. One of + # then should succeed. if [ -f /etc/x2go/x2gosql/sql ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null; then if [ ! -f /var/lib/x2go/x2go_sessions ]; then x2godbadmin --createdb diff --git a/x2goserver.spec b/x2goserver.spec index 5b0d91b..240a1e2 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -262,10 +262,6 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} XSESSIONDIR=/etc/X11/xinit/X # Make sure the .packlist file is removed from %{perl_vendorarch}... rm -f %{buildroot}%{perl_vendorarch}/auto/x2goserver/.packlist -# 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 @@ -287,6 +283,7 @@ mkdir -p %{buildroot}%{_initddir} install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2goserver %endif + %pre common getent group x2gouser >/dev/null || groupadd -r x2gouser getent passwd x2gouser >/dev/null || \ @@ -294,27 +291,32 @@ getent passwd x2gouser >/dev/null || \ -c "x2go" x2gouser exit 0 + %post -# Initialize the session database +# Initialize the session database (first attempt, may fail if perl-X2Go-Server-DB is not yet installed [ ! -f %{_sharedstatedir}/x2go/x2go_sessions ] && - %{_sbindir}/x2godbadmin --createdb || : + %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || : %if 0%{?fedora} %systemd_post x2goserver.service + %preun %systemd_preun x2goserver.service + %postun %systemd_postun x2goserver.service %else /sbin/chkconfig --add x2goserver + %postun if [ "$1" -ge "1" ] ; then /sbin/service x2goserver condrestart >/dev/null 2>&1 || : fi + %preun if [ "$1" = 0 ]; then /sbin/service x2goserver stop >/dev/null 2>&1 @@ -322,6 +324,13 @@ if [ "$1" = 0 ]; then fi %endif + +%post -n perl-X2Go-Server-DB +# Initialize the session database (second attempt, may fail if x2goserver is not yet installed +[ ! -f %{_sharedstatedir}/x2go/x2go_sessions ] && + %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || : + + %pre printing getent group x2goprint >/dev/null || groupadd -r x2goprint getent passwd x2goprint >/dev/null || \ @@ -329,7 +338,6 @@ getent passwd x2goprint >/dev/null || \ -c "x2go" x2goprint exit 0 - %files %doc debian/copyright %doc debian/changelog 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

x2goclient.git - master (branch) updated: 4.0.1.1-52-g31b6e2a
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via 31b6e2a55ac9328c96ae4f61f18a1a3f4dbf9b6b (commit) from 84b2ded49fc781a684fb394a96ea95c73eff8b08 (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 31b6e2a55ac9328c96ae4f61f18a1a3f4dbf9b6b Author: Mike DePaulo <mikedep333(a)gmail.com> Date: Mon Dec 9 20:15:59 2013 -0500 win32: Add uninstall information to Add/Remove Programs. (Fixes: #230). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ nsis/x2goclient.nsi | 34 +++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) mode change 100644 => 100755 nsis/x2goclient.nsi The diff of changes is: diff --git a/debian/changelog b/debian/changelog index df069a3..1900abf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,10 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low - Handle SSH host key changes more elegantly and allow user interaction if such a host key change occurs. (Fixes: #241). + [ Michael DePaulo ] + * New upstream version (4.0.1.2): + - win32: Add uninstall information to Add/Remove Programs. (Fixes: #230). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 11 Sep 2013 12:17:43 +0200 x2goclient (4.0.1.1-0~x2go1) unstable; urgency=low diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi old mode 100644 new mode 100755 index 74db5b1..35571c2 --- a/nsis/x2goclient.nsi +++ b/nsis/x2goclient.nsi @@ -10,7 +10,7 @@ ;General RequestExecutionLevel admin - !define VERSION "4.0.1.2-pre01" + !define VERSION "4.0.1.2-pre02" Name "x2goclient-${VERSION}" Caption "x2goclient-${VERSION}" OutFile "x2goclient-${VERSION}-setup.exe" @@ -50,6 +50,12 @@ SectionEnd Var STARTMENU_FOLDER Var MUI_TEMP + + !define UNINSTALL_REGKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\x2goclient" + !define UNINSTALL_DISPLAYNAME "X2Go Client for Windows" + !define UNINSTALL_PUBLISHER "X2Go Project" + !define UNINSTALL_DISPLAYVERSION ${VERSION} + !define UNINSTALL_URL "http://www.x2go.org" ;-------------------------------- ;Pages @@ -109,8 +115,29 @@ Section "x2goclient" Section1 CreateShortCut "$DESKTOP\X2goClient.lnk" "$INSTDIR\x2goclient.exe" !insertmacro MUI_STARTMENU_WRITE_END + + ;Add uninstall information to Add/Remove Programs + ;http://nsis.sourceforge.net/Add_uninstall_information_to_Add/Remove_Programs + WriteRegStr HKLM ${UNINSTALL_REGKEY} "InstallLocation" "$INSTDIR" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "UninstallString" "$\"$INSTDIR\Uninstall.exe$\"" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "DisplayIcon" "$INSTDIR\x2goclient.exe" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "DisplayName" "${UNINSTALL_DISPLAYNAME}" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "Publisher" "${UNINSTALL_PUBLISHER}" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "DisplayVersion" "${UNINSTALL_DISPLAYVERSION}" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "HelpLink" "${UNINSTALL_URL}" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "URLInfoAbout" "${UNINSTALL_URL}" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "URLUpdateInfo" "${UNINSTALL_URL}" + WriteRegDWORD HKLM ${UNINSTALL_REGKEY} "NoModify" 1 + WriteRegDWORD HKLM ${UNINSTALL_REGKEY} "NoRepair" 1 + SectionEnd +Section EstimatedSize + ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 + IntFmt $0 "0x%08X" $0 + WriteRegDWORD HKLM ${UNINSTALL_REGKEY} "EstimatedSize" "$0" +SectionEnd + ;------------------------------------------- ;Descriptions @@ -152,8 +179,9 @@ Section "Uninstall" startMenuDeleteLoopDone: RMDir /r "$INSTDIR" - - DeleteRegKey HKLM "Software\x2goclient" + + DeleteRegKey HKLM "Software\x2goclient" + DeleteRegKey HKLM "${UNINSTALL_REGKEY}" SectionEnd 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

x2goserver.git - master (branch) updated: 3.1.1.3-286-g2a841f4
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via 2a841f477fa0fc1f06a3deabe61344c0d2dcb8b1 (commit) from 6d8c08225949f4c2c3f4fab862cc159bf6dfe582 (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 2a841f477fa0fc1f06a3deabe61344c0d2dcb8b1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 15:42:48 2013 +0100 x2goserver-printing/Makefile: create feature.d directory before installing files into it. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver-printing/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4cb98da..ca694b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -80,6 +80,8 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low Thanks to Harvey Eneman for tracking this down!!! (Fixes: #355). - x2goserver-fmbindings/Makefile: install x2gofm. - x2goserver-fmbindings/Makefile: install share/applications and share/mime. + - x2goserver-printing/Makefile: create feature.d directory before installing + files into it. * 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-printing/Makefile b/x2goserver-printing/Makefile index 0f258fe..e5df4b8 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -52,8 +52,8 @@ 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_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ 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 - master (branch) updated: 3.1.1.3-285-g6d8c082
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via 6d8c08225949f4c2c3f4fab862cc159bf6dfe582 (commit) from 9faed78b1887eb2bab9402d8eb026f9b222d5f85 (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 6d8c08225949f4c2c3f4fab862cc159bf6dfe582 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 15:38:25 2013 +0100 session DB creation on postinst... * debian/x2goserver.postinst: + Make sure x2godbadmin is evoked from package x2goserver. * debian/x2goserver.init: + Make sure x2godbadmin is evoked from package x2goserver. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++++- debian/libx2go-server-db-perl.postinst | 16 ---------------- debian/x2goserver.postinst | 17 ++++++++++++++++- x2goserver.spec | 2 +- 4 files changed, 21 insertions(+), 19 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 272a424..4cb98da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,12 +44,15 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low x2goserver.conf in new x2goserver-common package. + Move several x2goserver-* package to x2goserver's Recommends field. + Add Reinhard Tartler to Uploaders. - * /debian/x2goserver.init: + * debian/x2goserver.postinst: + + Make sure x2godbadmin is evoked from package x2goserver. + * debian/x2goserver.init: + Rely on $PATH when invoking x2gocleansessions. * Move code in pre/post+inst/rm scripts around (from x2goserver package to libx2go-server-db-perl and x2goserver-common). * x2goclient.spec: + Bring debian/control and x2goclient.spec in sync. + + Make sure x2godbadmin is evoked from package x2goserver. [ Guangzhou Nianguan Electronics Technology Co.Ltd. ] * New upstream version (4.1.0.0): diff --git a/debian/libx2go-server-db-perl.postinst b/debian/libx2go-server-db-perl.postinst index 147d902..239d5c9 100755 --- a/debian/libx2go-server-db-perl.postinst +++ b/debian/libx2go-server-db-perl.postinst @@ -29,22 +29,6 @@ case "$1" in 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 - - # setup up SQLite3 database, do nothing it PostgeSQL is already configured - if [ -f /etc/x2go/x2gosql/sql ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null; then - if [ ! -f /var/lib/x2go/x2go_sessions ]; then - x2godbadmin --createdb - else - # make sure db permissions are set correctly - chown -R root:x2gouser /var/lib/x2go - # egid x2gouser needs write access to the db dir (for temporary db journal file) - chmod 0770 /var/lib/x2go - # ... and to the db file itself, of course - chmod 0660 /var/lib/x2go/x2go_sessions - fi - else - echo "X2Go is configured to use a non-SQLite DB backend, leaving the database alone." - fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index b4fe116..2772bcb 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -52,12 +52,27 @@ case "$1" in dpkg-statoverride --add --update root root 0440 /etc/sudoers.d/x2goserver fi - # create /etc/x2go/applications symlink if not already there (as link or as dir) if ! test -e /etc/x2go/applications; then ln -s /usr/share/applications /etc/x2go/applications fi + # setup up SQLite3 database, do nothing if PostgeSQL is already configured + if [ -f /etc/x2go/x2gosql/sql ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null; then + if [ ! -f /var/lib/x2go/x2go_sessions ]; then + x2godbadmin --createdb + else + # make sure db permissions are set correctly + chown -R root:x2gouser /var/lib/x2go + # egid x2gouser needs write access to the db dir (for temporary db journal file) + chmod 0770 /var/lib/x2go + # ... and to the db file itself, of course + chmod 0660 /var/lib/x2go/x2go_sessions + fi + else + echo "X2Go is configured to use a non-SQLite DB backend, leaving the database alone." + fi + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/x2goserver.spec b/x2goserver.spec index 7471012..5b0d91b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -294,7 +294,7 @@ getent passwd x2gouser >/dev/null || \ -c "x2go" x2gouser exit 0 -%post -n perl-X2Go-Server-DB +%post # Initialize the session database [ ! -f %{_sharedstatedir}/x2go/x2go_sessions ] && %{_sbindir}/x2godbadmin --createdb || : 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

x2goclient.git - master (branch) updated: 4.0.1.1-51-g84b2ded
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via 84b2ded49fc781a684fb394a96ea95c73eff8b08 (commit) from 088dd58c8c3fc46a2b4bda8959138b512ffb724a (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 84b2ded49fc781a684fb394a96ea95c73eff8b08 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 15:24:53 2013 +0100 x2goclient.spec: rather build EPEL-6 package against qt4-devel ----------------------------------------------------------------------- Summary of changes: x2goclient.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goclient.spec b/x2goclient.spec index 1c07360..8a64a4d 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -18,7 +18,7 @@ BuildRequires: man2html-core BuildRequires: man %endif BuildRequires: openldap-devel -%if 0%{?el5} +%if 0%{?el5} || 0%{?el6} BuildRequires: qt4-devel %else BuildRequires: qt-devel 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

x2goserver.git - master (branch) updated: 3.1.1.3-284-g9faed78
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via 9faed78b1887eb2bab9402d8eb026f9b222d5f85 (commit) from eafa39924b7a78bd74fd0393cdd39c80d44df15b (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 9faed78b1887eb2bab9402d8eb026f9b222d5f85 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 15:04:39 2013 +0100 x2goserver.spec: make sure x2gofeature.d directory is created ----------------------------------------------------------------------- Summary of changes: x2goserver.spec | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/x2goserver.spec b/x2goserver.spec index e8d3377..7471012 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -361,6 +361,7 @@ exit 0 %exclude %{_mandir}/man8/x2goserver-run-extensions.8.gz %exclude %{_mandir}/man8/x2gofm.8.gz %exclude %{_mandir}/man8/x2goprint.8.gz +%dir %{_datadir}/x2go/x2gofeature.d/ %{_datadir}/x2go/x2gofeature.d/ %exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-fmbindings.features %exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features 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-283-geafa399
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via eafa39924b7a78bd74fd0393cdd39c80d44df15b (commit) from 35b7045949fd8d129571707f9ce11760694f8edc (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 eafa39924b7a78bd74fd0393cdd39c80d44df15b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 14:40:42 2013 +0100 x2goserver.spec: fix installation of x2goserver init script ----------------------------------------------------------------------- Summary of changes: x2goserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver.spec b/x2goserver.spec index ddc25a7..e8d3377 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -284,7 +284,7 @@ install -pm0644 %SOURCE1 %{buildroot}%{_unitdir} %else # SysV session cleanup script mkdir -p %{buildroot}%{_initddir} -install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2gocleansessions +install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2goserver %endif %pre common 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