x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

x2goserver.git - master (branch) updated: 3.0.99-2-90-ge1c116e
by git-admin＠x2go.org 17 Jul '11

17 Jul '11

The branch, master has been updated via e1c116e2ad6958f86573da9bea2b0428608726e9 (commit) from 90f7556e461cd5f626f7a53e0d874a274a6c58da (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 e1c116e2ad6958f86573da9bea2b0428608726e9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 17 21:57:37 2011 +0200 Breaks/replaces packages: x2goserver-one, x2goserver-home, x2goprint (instead of Conflicts). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7b83786..01aa4fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low from perlsuid. * Use source format 3.0 (native). * Fix of Debian clean rules, fix of Makefile's clean rules. + * Breaks/replaces packages: x2goserver-one, x2goserver-home, x2goprint (instead of Conflicts). [Martin Oehler] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/debian/control b/debian/control index 3919e2a..d8eabca 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,11 @@ Recommends: x11-xserver-utils, xinit, x2goserver-extensions (= ${source:Version}) -Conflicts: +Breaks: + x2goserver-one, + x2goserver-home, + x2goprint +Replaces: x2goserver-one, x2goserver-home, x2goprint 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.0.99-2-89-g90f7556
by git-admin＠x2go.org 17 Jul '11

17 Jul '11

The branch, master has been updated via 90f7556e461cd5f626f7a53e0d874a274a6c58da (commit) via f9d2b298dea7a78b35205119bc124f0ac986e727 (commit) via 93e38fdce2366863b121ac5a79ead3ea7deef317 (commit) via ccd4ea167eedebc17f62d30c939b1bb880cfcf8a (commit) from 9628cb541a6618e1ad96c8a49411028133e4b1cb (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 90f7556e461cd5f626f7a53e0d874a274a6c58da Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 17 21:52:09 2011 +0200 * Fix of Debian clean rules, fix of Makefile's clean rules. commit f9d2b298dea7a78b35205119bc124f0ac986e727 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 17 21:50:36 2011 +0200 make man2html build easily available in base folder's Makefile commit 93e38fdce2366863b121ac5a79ead3ea7deef317 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 17 21:50:08 2011 +0200 rebuilt html man pages commit ccd4ea167eedebc17f62d30c939b1bb880cfcf8a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 17 21:47:43 2011 +0200 Use source format 3.0 (native). ----------------------------------------------------------------------- Summary of changes: Makefile | 5 +++++ debian/changelog | 2 ++ debian/rules | 9 ++++++++- debian/source/format | 1 + .../html/man8/x2gosetkeyboard.8.html | 2 +- .../.build_man2html/html/man8/x2goversion.8.html | 2 +- .../html/man8/x2gocleansessions.8.html | 2 +- .../html/man8/x2gocmdexitmessage.8.html | 2 +- .../html/man8/x2golistdesktops.8.html | 2 +- .../html/man8/x2golistsessions.8.html | 2 +- .../.build_man2html/html/man8/x2gomountdirs.8.html | 2 +- .../.build_man2html/html/man8/x2goprint.8.html | 2 +- .../html/man8/x2goresume-session.8.html | 2 +- .../html/man8/x2goruncommand.8.html | 2 +- .../html/man8/x2goshowblocks.8.html | 2 +- .../html/man8/x2gostartagent.8.html | 2 +- .../html/man8/x2gosuspend-session.8.html | 2 +- .../html/man8/x2goterminate-session.8.html | 2 +- .../html/man8/x2goumount-session.8.html | 2 +- x2goserver/Makefile | 7 +++++-- 20 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 debian/source/format The diff of changes is: diff --git a/Makefile b/Makefile index eee6d3d..a9208da 100755 --- a/Makefile +++ b/Makefile @@ -4,6 +4,11 @@ all: build build: build-indep +# make man2html build available from project's base folder... +build_man2html: + cd x2goserver && make $@ + cd x2goserver-extensions && make $@ + clean: cd x2goserver && make $@ cd x2goserver-extensions && make $@ diff --git a/debian/changelog b/debian/changelog index f5b8dd6..7b83786 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low local folder sharing. * Provide C wrapper for setuid call of x2gosqlitewrapper.pl. Remove dependency from perlsuid. + * Use source format 3.0 (native). + * Fix of Debian clean rules, fix of Makefile's clean rules. [Martin Oehler] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/debian/rules b/debian/rules index a5143a5..2af70c1 100755 --- a/debian/rules +++ b/debian/rules @@ -4,4 +4,11 @@ dh $@ override_dh_auto_install: - make -f Makefile build-arch \ No newline at end of file + make -f Makefile build-arch + +override_dh_auto_clean: + rm -fv x2gosqlitewrapper + rm -Rfv x2goserver/.build_html + rm -Rfv x2goserver-extensions/.build_html + dh_auto_clean + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..9f67427 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) \ No newline at end of file diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html index d787004..4666fa0 100644 --- a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html +++ b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html @@ -56,6 +56,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html index eeae817..481f392 100644 --- a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html +++ b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html @@ -64,6 +64,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html index e25e5d8..8d896e5 100644 --- a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html index c7cab5d..8c45019 100644 --- a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html index 843c9a0..535f75b 100644 --- a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html +++ b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html index 5f938d9..9d42577 100644 --- a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html +++ b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html index e187787..c0c64b5 100644 --- a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goprint.8.html b/x2goserver/.build_man2html/html/man8/x2goprint.8.html index fe9e175..e42f484 100644 --- a/x2goserver/.build_man2html/html/man8/x2goprint.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goprint.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html index a6f792d..4c6c3e0 100644 --- a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html index 4c2720d..c9aff9e 100644 --- a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html index 4c2720d..c9aff9e 100644 --- a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html index 45fb4f5..a5c2f51 100644 --- a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html @@ -60,6 +60,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html index 2fe037d..2c28940 100644 --- a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html index ef27d29..063b1fa 100644 --- a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html index 68f48b9..3a4f259 100644 --- a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 11:58:19 GMT, July 14, 2011 +Time: 19:49:43 GMT, July 17, 2011 </BODY> </HTML> diff --git a/x2goserver/Makefile b/x2goserver/Makefile index a4fec0f..2f79e00 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -45,10 +45,13 @@ build_man2html: for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done -clean: clean_man2html +clean: clean_arch clean_man2html + +clean_arch: + rm -f x2gosqlitewrapper clean_man2html: - rm -rf `dirname $(MAN2HTML_DEST)` + rm -Rf `dirname $(MAN2HTML_DEST)` install: install_scripts install_config install_man install_version 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

nxcompshad.git - backport-lenny (branch) updated: 3.4.0.4-8-g541c10a
by git-admin＠x2go.org 17 Jul '11

17 Jul '11

The branch, backport-lenny has been updated via 541c10a979477e20c651513c10004677e174f154 (commit) from c16e989b78fc5703f9b5db6f7c8f2f8487a4f205 (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 541c10a979477e20c651513c10004677e174f154 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 17 21:18:23 2011 +0200 Breaks/replaces package nxcompshad. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0603dd3..9645009 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ nxcompshad (3.5.0-2-0~x2go-bpo1) UNRELEASED; urgency=low * Debian lenny backport. - * Conflict with package nxcompshad. + * Breaks/replaces package nxcompshad. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 04 Jul 2011 17:38:18 +0200 diff --git a/debian/control b/debian/control index 7968c46..00e94aa 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +23,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: - nxcompshad +Breaks: nxcompshad +Replaces: nxcompshad Description: NX shadowing library NX is a software suite from NoMachine which implements very efficient compression of the X11 protocol. This increases performance when @@ -38,8 +38,8 @@ Architecture: any Depends: libxcompshad3 (=${binary:Version}), ${misc:Depends} -Conflicts: - nxcompshad-dev +Breaks: nxcompshad-dev +Replaces: nxcompshad-dev Description: NX shadowing library NX is a software suite from NoMachine which implements very efficient compression of the X11 protocol. This increases performance when hooks/post-receive -- nxcompshad.git (NX compshad library) 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 "nxcompshad.git" (NX compshad library).

1 0

nxcompshad.git - master (branch) updated: 3.4.0.4-7-ge0c24c7
by git-admin＠x2go.org 17 Jul '11

17 Jul '11

The branch, master has been updated via e0c24c7d40918090ffa5094a396c3ca660db20a1 (commit) from 654dbf053c060043dcac953a0007a8f8495a622f (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 e0c24c7d40918090ffa5094a396c3ca660db20a1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 17 21:19:24 2011 +0200 Breaks/replaces package nxcompshad. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9b5c01e..9325ded 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ nxcompshad (3.5.0-2-0~x2go2) UNRELEASED; urgency=low * Add dh-autoreconf as build-dep * Don't let the Makefile run fail on ldconfig failure. - * Conflict with package nxcompshad. + * Breaks/replaces package nxcompshad. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 30 Jun 2011 17:51:34 +0200 diff --git a/debian/control b/debian/control index 7da2db9..73b7eff 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +23,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: - nxcompshad +Breaks: nxcompshad +Replaces: nxcompshad Description: NX shadowing library NX is a software suite from NoMachine which implements very efficient compression of the X11 protocol. This increases performance when @@ -38,8 +38,8 @@ Architecture: any Depends: libxcompshad3 (=${binary:Version}), ${misc:Depends} -Conflicts: - nxcompshad-dev +Breaks: nxcompshad-dev +Replaces: nxcompshad-dev Description: NX shadowing library NX is a software suite from NoMachine which implements very efficient compression of the X11 protocol. This increases performance when hooks/post-receive -- nxcompshad.git (NX compshad library) 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 "nxcompshad.git" (NX compshad library).

1 0

nxcompext.git - backport-lenny (branch) updated: 3.4.0.2-11-g4b45173
by git-admin＠x2go.org 17 Jul '11

17 Jul '11

The branch, backport-lenny has been updated via 4b45173e7c0739f549973357d5c3e5b50ef600a7 (commit) from ed61dcc65993147a00deaa1039eeb77b95cfad3d (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 4b45173e7c0739f549973357d5c3e5b50ef600a7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 17 21:15:50 2011 +0200 Breaks/replaces package nxcompext. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a9bd7a5..efd414e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ nxcompext (1:3.5.0-1-0~x2go-bpo1) UNRELEASED; urgency=low * Debian lenny backport. - * Conflict with package nxcompext. + * Breaks/replaces package nxcompext. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 04 Jul 2011 17:17:16 +0200 diff --git a/debian/control b/debian/control index d1c6164..dfa0160 100644 --- a/debian/control +++ b/debian/control @@ -25,8 +25,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: - nxcompext +Breaks: nxcompext +Replaces: nxcompext Description: NX X11 protocol compression extensions library NX is a software suite from NoMachine which implements very efficient compression of the X11 protocol. This increases performance when @@ -44,8 +44,8 @@ Depends: libxcomp-dev, x11proto-core-dev, libx11-dev -Conflicts: - nxcompext-dev +Breaks: nxcompext-dev +Replaces: nxcompext-dev Description: NX X11 protocol compression extensions library NX is a software suite from NoMachine which implements very efficient compression of the X11 protocol. This increases performance when hooks/post-receive -- nxcompext.git (NX compext library) 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 "nxcompext.git" (NX compext library).

1 0

nxcompext.git - master (branch) updated: 3.4.0.2-9-ge912462
by git-admin＠x2go.org 17 Jul '11

17 Jul '11

The branch, master has been updated via e91246225ff2a69810120f157a880dd5364f9aa5 (commit) from 0e32b45f07db68ad7b48fc0dd2395601789532f6 (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 e91246225ff2a69810120f157a880dd5364f9aa5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 17 21:17:08 2011 +0200 Breaks/replaces package nxcompext. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index eba2ae2..8c87614 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ nxcompext (1:3.5.0-1-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * Use mkinstalldirs to create installation dirs. * Don't let the Makefile run fail on ldconfig failure. - * Conflict with nxcompext. + * Breaks/replaces package nxcompext. -- Reinhard Tartler <siretart(a)tauware.de> Wed, 29 Jun 2011 15:49:59 +0200 diff --git a/debian/control b/debian/control index 0e596e8..1b33397 100644 --- a/debian/control +++ b/debian/control @@ -24,8 +24,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: - nxcompext +Breaks: nxcompext +Replaces: nxcompext Description: NX X11 protocol compression extensions library NX is a software suite from NoMachine which implements very efficient compression of the X11 protocol. This increases performance when @@ -43,8 +43,8 @@ Depends: libxcomp-dev, x11proto-core-dev, libx11-dev -Conflicts: - nxcompext-dev +Breaks: nxcompext-dev +Replaces: nxcompext-dev Description: NX X11 protocol compression extensions library NX is a software suite from NoMachine which implements very efficient compression of the X11 protocol. This increases performance when hooks/post-receive -- nxcompext.git (NX compext library) 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 "nxcompext.git" (NX compext library).

1 0

nxcomp.git - master (branch) updated: 3.4.0.8-8-gc9af53b
by git-admin＠x2go.org 17 Jul '11

17 Jul '11

The branch, master has been updated via c9af53b1a2373baf71282e65ba260171d2a22687 (commit) from de5e4c62a278547a610a0ab58aa4d2b76753271b (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 c9af53b1a2373baf71282e65ba260171d2a22687 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 17 21:12:46 2011 +0200 Breaks/replaces nxcomp package. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 53e150a..bc6aedc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ nxcomp (3.5.0-1-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * User mkinstalldirs to create install paths. * Don't let Makefile run fail if ldconfig fails. - * Conflict with nxcomp package. + * Breaks/replaces nxcomp package. -- Reinhard Tartler <siretart(a)tauware.de> Wed, 29 Jun 2011 15:41:10 +0200 diff --git a/debian/control b/debian/control index c5ec5e3..4cefc39 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +23,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: - nxcomp +Breaks: nxcomp +Replaces: nxcomp Description: NX X compression library NX provides a differential X compression library for X11. . @@ -34,10 +34,10 @@ Package: libxcomp-dev Section: libdevel Architecture: any Depends: - libxcomp3 (= ${binary:Version}), + libxcoBmp3 (= ${binary:Version}), ${misc:Depends} -Conflicts: - nxcomp-dev +Breaks: nxcomp-dev +Replaces: nxcomp-dev Description: NX X compression library-headers NX provides a differential X compression library for X11. . hooks/post-receive -- nxcomp.git (NX comp library) 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 "nxcomp.git" (NX comp library).

1 0

nxcomp.git - backport-lenny (branch) updated: 3.4.0.8-14-g5911145
by git-admin＠x2go.org 17 Jul '11

17 Jul '11

The branch, backport-lenny has been updated via 591114534f18b6f2feba64e13a3c1b4f299bc183 (commit) from 56b5ac06630ad2b615f7a4c9b8760099e4ded161 (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 591114534f18b6f2feba64e13a3c1b4f299bc183 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 17 21:14:07 2011 +0200 Breaks/replaces nxcomp package ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2868683..15c3af5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ nxcomp (3.5.0-1-0~x2go-bpo2) UNRELEASED; urgency=low * Debian lenny backport. - * conflict with nxcomp package + * Breaks/replaces nxcomp package -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 04 Jul 2011 15:35:13 +0200 diff --git a/debian/control b/debian/control index 1c24385..1e6bc1a 100644 --- a/debian/control +++ b/debian/control @@ -22,8 +22,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: - nxcomp +Breaks: nxcomp +Replaces: nxcomp Description: NX X compression library NX provides a differential X compression library for X11. . @@ -35,8 +35,8 @@ Architecture: any Depends: libxcomp3 (= ${binary:Version}), ${misc:Depends} -Conflicts: - nxcomp-dev +Breaks: nxcomp-dev +Replaces: nxcomp-dev Description: NX X compression library-headers NX provides a differential X compression library for X11. . hooks/post-receive -- nxcomp.git (NX comp library) 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 "nxcomp.git" (NX comp library).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-85-g9628cb5
by git-admin＠x2go.org 14 Jul '11

14 Jul '11

The branch, master has been updated via 9628cb541a6618e1ad96c8a49411028133e4b1cb (commit) via b64868c5c11843ee44b12fd6cc171946e63bca88 (commit) via 3223f23c40474d8a5062274c9b54beca6a336850 (commit) via 82c6545adef362a9d759b5ddf41473af052156c7 (commit) via a694aaca92f9f8c6cbc81d200b09beb48b06b79d (commit) via 04fc757c55d1e6a3f95b1e1058865569033d4bfb (commit) via 1f1ea43f2bfbfce51bf153b512db1f38d377cd6c (commit) via 5c60ad18f7db28c0e397c0f74715eedc1ae1cbf4 (commit) from ac7854d8ba9599f09a3861365a7b504c1e97a954 (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 9628cb541a6618e1ad96c8a49411028133e4b1cb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 14:07:37 2011 +0200 Provide C wrapper for setuid call of x2gosqlitewrapper.pl. Remove dependency from perlsuid. ----------------------------------------------------------------------- Summary of changes: Makefile | 4 ++ debian/changelog | 2 + debian/control | 6 +- debian/rules | 1 + debian/x2goserver.install | 6 ++- debian/x2goserver.postinst | 8 +++- .../html/man8/x2gosetkeyboard.8.html | 2 +- .../.build_man2html/html/man8/x2goversion.8.html | 2 +- x2goserver-extensions/Makefile | 2 + .../html/man8/x2gocleansessions.8.html | 2 +- .../html/man8/x2gocmdexitmessage.8.html | 2 +- .../html/man8/x2golistdesktops.8.html | 2 +- .../html/man8/x2golistsessions.8.html | 2 +- .../.build_man2html/html/man8/x2gomountdirs.8.html | 2 +- .../.build_man2html/html/man8/x2goprint.8.html | 2 +- .../html/man8/x2goresume-session.8.html | 2 +- .../html/man8/x2goruncommand.8.html | 2 +- .../html/man8/x2goshowblocks.8.html | 2 +- .../html/man8/x2gostartagent.8.html | 2 +- .../html/man8/x2gosuspend-session.8.html | 2 +- .../html/man8/x2goterminate-session.8.html | 2 +- .../html/man8/x2goumount-session.8.html | 2 +- x2goserver/Makefile | 8 +++- x2goserver/lib/x2godbwrapper.pm | 2 +- .../{x2gosqlitewrapper => x2gosqlitewrapper.pl} | 13 ++++-- x2goserver/x2gosqlitewrapper.c | 45 ++++++++++++++++++++ 26 files changed, 100 insertions(+), 27 deletions(-) rename x2goserver/lib/{x2gosqlitewrapper => x2gosqlitewrapper.pl} (97%) create mode 100644 x2goserver/x2gosqlitewrapper.c The diff of changes is: diff --git a/Makefile b/Makefile index 444112f..eee6d3d 100755 --- a/Makefile +++ b/Makefile @@ -8,6 +8,10 @@ clean: cd x2goserver && make $@ cd x2goserver-extensions && make $@ +build-arch: + cd x2goserver && make $@ + cd x2goserver-extensions && make $@ + build-indep: cd x2goserver && make $@ cd x2goserver-extensions && make $@ diff --git a/debian/changelog b/debian/changelog index df33435..f5b8dd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Tab'ified all script files, proper indentation, coding style. * Fix for x2gomountdirs, now also usernames containing blanks can use local folder sharing. + * Provide C wrapper for setuid call of x2gosqlitewrapper.pl. Remove dependency + from perlsuid. [Martin Oehler] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/debian/control b/debian/control index 8fcc957..3919e2a 100644 --- a/debian/control +++ b/debian/control @@ -13,11 +13,11 @@ Vcs-Git: git://code.x2go.org/x2goserver.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary Package: x2goserver -Architecture: all +Architecture: any Depends: + ${shlibs:Depends}, ${misc:Depends}, x2goagent, - perl-suid, lsof, openssh-client, openssh-server, @@ -65,7 +65,7 @@ Package: x2goserver-extensions Architecture: all Depends: ${misc:Depends}, - x2goserver (= ${source:Version}), + x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), x11-xkb-utils Description: X2go server daemon scripts (extensions) X2go is a serverbased computing environment with diff --git a/debian/rules b/debian/rules index c34429d..a5143a5 100755 --- a/debian/rules +++ b/debian/rules @@ -4,3 +4,4 @@ dh $@ override_dh_auto_install: + make -f Makefile build-arch \ No newline at end of file diff --git a/debian/x2goserver.install b/debian/x2goserver.install index acfb3b8..33c7f5a 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -3,10 +3,13 @@ x2goserver/sbin/x2go* /usr/sbin/ x2goserver/etc/x2gosql/sql /etc/x2go/x2gosql/ x2goserver/etc/x2goserver.conf /etc/x2go/ x2goserver/lib/x2godbwrapper.pm /usr/lib/x2go/ +x2goserver/lib/x2gosqlitewrapper.pl /usr/lib/x2go/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ +x2goserver/x2gosqlitewrapper /usr/bin # the following executables should go to /usr/lib/x2go x2goserver/lib/x2gochangestatus /usr/bin x2goserver/lib/x2gocreatesession /usr/bin +x2goserver/lib/x2goresume /usr/bin x2goserver/lib/x2gogetagent /usr/bin x2goserver/lib/x2gogetdisplays /usr/bin x2goserver/lib/x2gogetports /usr/bin @@ -14,8 +17,7 @@ x2goserver/lib/x2gogetservers /usr/bin x2goserver/lib/x2goinsertport /usr/bin x2goserver/lib/x2goinsertsession /usr/bin x2goserver/lib/x2gosessionlimit /usr/bin -x2goserver/lib/x2gosqlitewrapper /usr/bin x2goserver/lib/x2golistsessions_sql /usr/bin x2goserver/lib/x2golistsessions_root /usr/bin # compatibility -x2goserver/bin/compat/x2go* /usr/bin +x2goserver/compat/bin/x2go* /usr/bin diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 4e75de8..bed72b7 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -44,7 +44,13 @@ case "$1" in x2godbadmin --createdb fi - dpkg-statoverride --add --update x2gouser x2gousers 6755 /usr/bin/x2gosqlitewrapper || true + # the sqlite db has to be accessed as uid x2gouser + dpkg-statoverride --add --update x2gouser x2gousers 6755 /usr/lib/x2go/x2gosqlitewrapper.pl || true + + # we may be upgrading versions of x2goserver that used perlsuid, so make sure setuid is removed + # from /usr/bin/x2gosqlitewrapper + dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper && chown root:root /usr/bin/x2gosqlitewrapper && chmod 0755 /usr/bin/x2gosqlitewrapper || true + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html index b533a4f..d787004 100644 --- a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html +++ b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html @@ -56,6 +56,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html index 453e0a5..eeae817 100644 --- a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html +++ b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html @@ -64,6 +64,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index d95bc71..ae6b3c1 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -35,6 +35,8 @@ build: build-indep build-indep: build_man2html +build-arch: + build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done diff --git a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html index 08725c0..e25e5d8 100644 --- a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html index eac9b6d..c7cab5d 100644 --- a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html index fe856a4..843c9a0 100644 --- a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html +++ b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html index bce89d4..5f938d9 100644 --- a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html +++ b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html index d4e6bf7..e187787 100644 --- a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goprint.8.html b/x2goserver/.build_man2html/html/man8/x2goprint.8.html index 501439b..fe9e175 100644 --- a/x2goserver/.build_man2html/html/man8/x2goprint.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goprint.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html index 16b27b9..a6f792d 100644 --- a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html index a8b934e..4c2720d 100644 --- a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html index a8b934e..4c2720d 100644 --- a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html index 9f7ce24..45fb4f5 100644 --- a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html @@ -60,6 +60,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html index 5a8eeb9..2fe037d 100644 --- a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html index 9010bfd..ef27d29 100644 --- a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html index f39b688..68f48b9 100644 --- a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 765f17f..a4fec0f 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -31,7 +31,12 @@ MAN2HTML_DEST = .build_man2html/html all: clean build -build: build-indep +build: build-arch build-indep + +build-arch: build_setuidwrapper + +build_setuidwrapper: + gcc -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_man2html @@ -52,6 +57,7 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ + $(INSTALL_PROGRAM) compat/bin/* $(DESTDIR)$(BINDIR)/ $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index b30185b..044faac 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -138,7 +138,7 @@ sub dbsys_listsessionsroot_all if ($backend eq 'postgres') { my @strings; - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port, sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname, diff --git a/x2goserver/lib/x2gosqlitewrapper b/x2goserver/lib/x2gosqlitewrapper.pl similarity index 97% rename from x2goserver/lib/x2gosqlitewrapper rename to x2goserver/lib/x2gosqlitewrapper.pl index 9cbf663..a566fc1 100755 --- a/x2goserver/lib/x2gosqlitewrapper +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -25,10 +25,15 @@ use strict; use DBI; use POSIX; -if ($< eq $>) -{ - die "Please install this program as SUID x2gouser!\n"; -} +### +### We are not using perlsuid anymore as it is deprecated as of Perl 5.12. +### Instead we ship our own setuidwrapper... +### + +#if ($< eq $>) +#{ +# die "Please install this program as SUID x2gouser!\n"; +#} my $realuser=$<; my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($>); diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c new file mode 100644 index 0000000..b702aa7 --- /dev/null +++ b/x2goserver/x2gosqlitewrapper.c @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + * Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <libgen.h> + +int main( int argc, char *argv[] ) { + + char buffer[BUFSIZ]; + char * x2gosqlitewrapper = NULL; + + // resolve link of /proc/self/exe + readlink("/proc/self/exe", buffer, BUFSIZ); + + // derive the full path of x2gosqlitewrapper.pl from path of this binary + asprintf(&x2gosqlitewrapper, "%s/%s", dirname(dirname(buffer)), "lib/x2go/x2gosqlitewrapper.pl"); + + // execute the script, taking setuid bit into consideration if set... + execv(x2gosqlitewrapper, argv); + + // fake a successful return value + 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 - setuidwrapper (branch) updated: 3.0.99-2-84-gb64868c
by git-admin＠x2go.org 14 Jul '11

14 Jul '11

The branch, setuidwrapper has been updated via b64868c5c11843ee44b12fd6cc171946e63bca88 (commit) via 3223f23c40474d8a5062274c9b54beca6a336850 (commit) via 82c6545adef362a9d759b5ddf41473af052156c7 (commit) from a694aaca92f9f8c6cbc81d200b09beb48b06b79d (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 b64868c5c11843ee44b12fd6cc171946e63bca88 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 14:04:50 2011 +0200 let package build with setuidwrapper commit 3223f23c40474d8a5062274c9b54beca6a336850 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 14:04:02 2011 +0200 fix for typo that stem from indentation cleanup commit 82c6545adef362a9d759b5ddf41473af052156c7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 14:03:40 2011 +0200 disabled perlsuid check... ----------------------------------------------------------------------- Summary of changes: Makefile | 4 ++++ debian/rules | 1 + debian/x2goserver.postinst | 6 ++++++ x2goserver-extensions/Makefile | 2 ++ x2goserver/lib/x2godbwrapper.pm | 2 +- x2goserver/lib/x2gosqlitewrapper.pl | 13 +++++++++---- 6 files changed, 23 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 444112f..eee6d3d 100755 --- a/Makefile +++ b/Makefile @@ -8,6 +8,10 @@ clean: cd x2goserver && make $@ cd x2goserver-extensions && make $@ +build-arch: + cd x2goserver && make $@ + cd x2goserver-extensions && make $@ + build-indep: cd x2goserver && make $@ cd x2goserver-extensions && make $@ diff --git a/debian/rules b/debian/rules index c34429d..a5143a5 100755 --- a/debian/rules +++ b/debian/rules @@ -4,3 +4,4 @@ dh $@ override_dh_auto_install: + make -f Makefile build-arch \ No newline at end of file diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 760e1fa..bed72b7 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -44,7 +44,13 @@ case "$1" in x2godbadmin --createdb fi + # the sqlite db has to be accessed as uid x2gouser dpkg-statoverride --add --update x2gouser x2gousers 6755 /usr/lib/x2go/x2gosqlitewrapper.pl || true + + # we may be upgrading versions of x2goserver that used perlsuid, so make sure setuid is removed + # from /usr/bin/x2gosqlitewrapper + dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper && chown root:root /usr/bin/x2gosqlitewrapper && chmod 0755 /usr/bin/x2gosqlitewrapper || true + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index d95bc71..ae6b3c1 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -35,6 +35,8 @@ build: build-indep build-indep: build_man2html +build-arch: + build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index b30185b..044faac 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -138,7 +138,7 @@ sub dbsys_listsessionsroot_all if ($backend eq 'postgres') { my @strings; - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port, sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname, diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 9cbf663..a566fc1 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -25,10 +25,15 @@ use strict; use DBI; use POSIX; -if ($< eq $>) -{ - die "Please install this program as SUID x2gouser!\n"; -} +### +### We are not using perlsuid anymore as it is deprecated as of Perl 5.12. +### Instead we ship our own setuidwrapper... +### + +#if ($< eq $>) +#{ +# die "Please install this program as SUID x2gouser!\n"; +#} my $realuser=$<; my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($>); 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