x2go-commits May 2013

x2go-commits@lists.x2go.org

2 participants
1156 discussions

page changed: wiki:repositories:debian
by wiki-admin＠x2go.org 25 May '13

25 May '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/05/25 17:33 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.115.118.31 Hostname : 46.115.118.31 Old Revision: http://wiki.x2go.org/doku.php/wiki:repositories:debian?rev=1363119313 New Revision: http://wiki.x2go.org/doku.php/wiki:repositories:debian Edit Summary: User : sunweaver @@ -3,11 +3,12 @@ - To get started you'll need to configure your local system to access the official X2Go Debian repository. Please keep in mind that this installation manual will guide you through the installation on a Debian squeeze (wheezy, sid) system. The repository will basically offer you packages for i386 and amd64 architectures. + To get started you'll need to configure your local system to access the official X2Go Debian repository. Please keep in mind that this installation manual will guide you through the installation on a Debian wheezy (jessie, sid) system. The repository will basically offer you packages for i386 and amd64 architectures. __Exceptions:__ - * **Debian lenny:** X2Go server-side packages will be backported in irregular intervals till Debian lenny will loose its ''oldstable'' declaration. No nightly-builds for Debian lenny, though. Neither client-side packages. - * **ARM architecture:** for Debian squeeze on ARM-based (Debian/armel) devices we provide client-side packages (x2goclient, pyhoca-gui, pyhoca-cli plus dependencies). No nightly-builds, no server packages, though. + * **Debian lenny:** + * **Debian squeeze: **X2Go packages will be offered for Debian squeeze at least until squeeze is still officially supported as ''oldstable'' by the Debian project. + * **ARM architecture:** for Debian squeeze and wheezy on ARM-based (Debian/armel) devices we provide client-side packages (x2goclient, pyhoca-gui, pyhoca-cli plus dependencies). No nightly-builds, no server packages, though. Before starting to edit your system configuration, you'll need to add the needed GPG keys of the repository. Please switch to an user which has administrator privileges on your system in your preferred command line client: <code bash> @@ -36,11 +37,11 @@ Then add the X2Go repository (binaries and sources) as a couple of new lines (example for Debian squeeze): <file - x2go.list> # X2Go Repository - deb http://packages.x2go.org/debian squeeze main + deb http://packages.x2go.org/debian wheezy main # X2Go Repository (sources) - deb-src http://packages.x2go.org/debian squeeze main + deb-src http://packages.x2go.org/debian wheezy main </file> **Note:** If you have not got a folder ''/etc/apt/sources.list.d/'' add the lines to ''/etc/apt/sources.list''. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

buildscripts.git - master (branch) updated: 984f0ae8ce1212d1b0503e9dbd0c45ddadf90c0d
by git-admin＠x2go.org 25 May '13

25 May '13

The branch, master has been updated via 984f0ae8ce1212d1b0503e9dbd0c45ddadf90c0d (commit) from a8e1e5c439589a13f59c195c9c6173eaaa2f425e (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 984f0ae8ce1212d1b0503e9dbd0c45ddadf90c0d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat May 25 14:57:16 2013 +0200 add support for building all baikal packages in one go ----------------------------------------------------------------------- Summary of changes: bin/build-all-packages | 18 ++++++++++++++++++ home/.buildscripts/x2go.conf | 17 +++++++++++++++++ 2 files changed, 35 insertions(+) The diff of changes is: diff --git a/bin/build-all-packages b/bin/build-all-packages index e9e3c06..76468eb 100755 --- a/bin/build-all-packages +++ b/bin/build-all-packages @@ -18,6 +18,7 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. COMPONENT_MAIN="main" +COMPONENT_BAIKAL="baikal" COMPONENT_NIGHTLY="nightly" LIB_PACKAGES_NIGHTLY= @@ -65,6 +66,23 @@ CODENAME=${2:-""} done } +# build all packages tagged as build-baikal +[ "x$COMPONENT" = "x$COMPONENT_BAIKAL" ] || [ -z $COMPONENT ] && { + echo -e $LIB_PACKAGES_BAIKAL $APP_PACKAGES_BAIKAL | while read pkg comp checkout; do + if [ -n $CODENAME ]; then + comp="$comp/$CODENAME" + fi + if [ "x$(basename $0)" = "x$PREFIX-build-all-packages" ]; then + $PREFIX-build-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "x$PREFIX-upload-all-packages" ]; then + $PREFIX-upload-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "x$PREFIX-build+upload-all-packages" ]; then + $PREFIX-build-package $pkg $comp $checkout && $PREFIX-upload-package $pkg $comp $checkout + fi + done +} + echo "Component: $COMPONENT" echo "Main: $COMPONENT_MAIN" +echo "Baikal: $COMPONENT_BAIKAL" echo "Nightly: $COMPONENT_NIGHTLY" diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf index f25e731..e51baf0 100644 --- a/home/.buildscripts/x2go.conf +++ b/home/.buildscripts/x2go.conf @@ -31,6 +31,8 @@ python-x2go $COMPONENT_MAIN build-main\ libpam-x2go $COMPONENT_MAIN build-main\ lightdm-remote-session-x2go $COMPONENT_MAIN build-main\ " +LIB_PACKAGES_BAIKAL="$LIB_PACKAGES_MAIN" + APP_PACKAGES_NIGHTLY=" x2goserver $COMPONENT_NIGHTLY master\n\ x2gobroker $COMPONENT_NIGHTLY master\n\ @@ -44,6 +46,7 @@ pyhoca-gui $COMPONENT_NIGHTLY master\n\ pyhoca-cli $COMPONENT_NIGHTLY master\n\ x2gothinclient $COMPONENT_NIGHTLY master\ " + APP_PACKAGES_MAIN=" x2goserver $COMPONENT_MAIN build-main\n\ x2gobroker $COMPONENT_MAIN build-main\n\ @@ -57,3 +60,17 @@ pyhoca-gui $COMPONENT_MAIN build-main\n\ pyhoca-cli $COMPONENT_MAIN build-main\n\ x2gothinclient $COMPONENT_MAIN build-main\ " + +APP_PACKAGES_BAIKAL=" +x2goserver $COMPONENT_MAIN build-baikal\n\ +x2goclient $COMPONENT_MAIN build-baikal\n\ +cups-x2go $COMPONENT_MAIN build-baikal\n\ +x2godesktopsharing $COMPONENT_MAIN build-baikal\n\ +x2gognomebindings $COMPONENT_MAIN build-baikal\n\ +x2golxdebindings $COMPONENT_MAIN build-baikal\n\ +x2goplasmabindings $COMPONENT_MAIN build-baikal\n\ +pyhoca-gui $COMPONENT_MAIN build-baikal\n\ +pyhoca-cli $COMPONENT_MAIN build-baikal\n\ +x2gothinclient $COMPONENT_MAIN build-baikal\ +" + 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

buildscripts.git - master (branch) updated: a8e1e5c439589a13f59c195c9c6173eaaa2f425e
by git-admin＠x2go.org 25 May '13

25 May '13

The branch, master has been updated via a8e1e5c439589a13f59c195c9c6173eaaa2f425e (commit) from 198f551c481f3f4b9e0a01b21aee1fdf4257daa2 (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 a8e1e5c439589a13f59c195c9c6173eaaa2f425e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat May 25 14:51:51 2013 +0200 don't map special CODENAMEs to generic versions ----------------------------------------------------------------------- Summary of changes: bin/build-package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/bin/build-package b/bin/build-package index 199b4ae..c510799 100755 --- a/bin/build-package +++ b/bin/build-package @@ -198,9 +198,9 @@ build_packages() { # translate the version name for Debian releases [ "x$l_CODENAME" = "xsid" ] && VERSION=unstable - [ "x$l_CODENAME" = "xjessie" ] && VERSION=testing - [ "x$l_CODENAME" = "xwheezy" ] && VERSION=stable - [ "x$l_CODENAME" = "xoldstable" ] && VERSION=oldstable + #[ "x$l_CODENAME" = "xjessie" ] && VERSION=testing + #[ "x$l_CODENAME" = "xwheezy" ] && VERSION=stable + #[ "x$l_CODENAME" = "xoldstable" ] && VERSION=oldstable # modify the section for non-main package builds [ "x$COMPONENT" != "xmain" ] && { 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

buildscripts.git - master (branch) updated: 198f551c481f3f4b9e0a01b21aee1fdf4257daa2
by git-admin＠x2go.org 25 May '13

25 May '13

The branch, master has been updated via 198f551c481f3f4b9e0a01b21aee1fdf4257daa2 (commit) from e58dc2cc9d1739c8ab3bb3e2b90569a3d6789f5d (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 198f551c481f3f4b9e0a01b21aee1fdf4257daa2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat May 25 14:37:35 2013 +0200 fix for last commit ----------------------------------------------------------------------- Summary of changes: bin/build-all-packages | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) The diff of changes is: diff --git a/bin/build-all-packages b/bin/build-all-packages index 7528501..e9e3c06 100755 --- a/bin/build-all-packages +++ b/bin/build-all-packages @@ -17,8 +17,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -CODENAME=$1 - COMPONENT_MAIN="main" COMPONENT_NIGHTLY="nightly" @@ -33,6 +31,7 @@ test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo set -ex COMPONENT=${1:-""} +CODENAME=${2:-""} # build the newest code... (nightly-builds) [ "x$COMPONENT" = "x$COMPONENT_NIGHTLY" ] || [ -z $COMPONENT ] && { 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

buildscripts.git - master (branch) updated: e58dc2cc9d1739c8ab3bb3e2b90569a3d6789f5d
by git-admin＠x2go.org 25 May '13

25 May '13

The branch, master has been updated via e58dc2cc9d1739c8ab3bb3e2b90569a3d6789f5d (commit) from 61d1d084e062f8c09350ec8ed1263a48d3b46368 (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 e58dc2cc9d1739c8ab3bb3e2b90569a3d6789f5d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat May 25 13:19:19 2013 +0200 allow all-packages-builds for one distro version only ----------------------------------------------------------------------- Summary of changes: bin/build-all-packages | 8 ++++++++ 1 file changed, 8 insertions(+) The diff of changes is: diff --git a/bin/build-all-packages b/bin/build-all-packages index 4ba2bb2..7528501 100755 --- a/bin/build-all-packages +++ b/bin/build-all-packages @@ -17,6 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +CODENAME=$1 + COMPONENT_MAIN="main" COMPONENT_NIGHTLY="nightly" @@ -35,6 +37,9 @@ COMPONENT=${1:-""} # build the newest code... (nightly-builds) [ "x$COMPONENT" = "x$COMPONENT_NIGHTLY" ] || [ -z $COMPONENT ] && { echo -e $LIB_PACKAGES_NIGHTLY $APP_PACKAGES_NIGHTLY | while read pkg comp checkout; do + if [ -n $CODENAME ]; then + comp="$comp/$CODENAME" + fi if [ "x$(basename $0)" = "x$PREFIX-build-all-packages" ]; then $PREFIX-build-package $pkg $comp $checkout elif [ "x$(basename $0)" = "x$PREFIX-upload-all-packages" ]; then @@ -48,6 +53,9 @@ COMPONENT=${1:-""} # build all packages tagged as build-main [ "x$COMPONENT" = "x$COMPONENT_MAIN" ] || [ -z $COMPONENT ] && { echo -e $LIB_PACKAGES_MAIN $APP_PACKAGES_MAIN | while read pkg comp checkout; do + if [ -n $CODENAME ]; then + comp="$comp/$CODENAME" + fi if [ "x$(basename $0)" = "x$PREFIX-build-all-packages" ]; then $PREFIX-build-package $pkg $comp $checkout elif [ "x$(basename $0)" = "x$PREFIX-upload-all-packages" ]; then 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

buildscripts.git - master (branch) updated: 61d1d084e062f8c09350ec8ed1263a48d3b46368
by git-admin＠x2go.org 25 May '13

25 May '13

The branch, master has been updated via 61d1d084e062f8c09350ec8ed1263a48d3b46368 (commit) from d37a1f0826f2ebfac1b6d86d8711afd2bb219fd6 (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 61d1d084e062f8c09350ec8ed1263a48d3b46368 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat May 25 13:02:28 2013 +0200 prepare for building Debian jessie packages ----------------------------------------------------------------------- Summary of changes: bin/build-package | 10 +++++----- home/.buildscripts/itzks.conf | 2 +- home/.buildscripts/nwt.conf | 2 +- home/.buildscripts/x2go.conf | 10 +++++++--- home/.dupload.conf.itzks | 8 ++++++++ home/.dupload.conf.nwt | 8 ++++++++ home/.dupload.conf.x2go | 8 ++++++++ 7 files changed, 38 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/bin/build-package b/bin/build-package index 8213312..199b4ae 100755 --- a/bin/build-package +++ b/bin/build-package @@ -24,10 +24,10 @@ DEBEMAIL="firstname.lastname(a)mydomain.org" DEBFULLNAME="Firstname Lastname" GPG_KEY= DISTS_SUPPORTED="debian ubuntu" -DEBIAN_DISTROS="lenny squeeze wheezy sid" +DEBIAN_DISTROS="lenny squeeze wheezy jessie sid" UBUNTU_DISTROS="lucid maverick natty oneiric precise" BUILDS_FOR="\ -debian: squeeze wheezy sid\n\ +debian: squeeze wheezy jessie sid\n\ ubuntu: lucid precise\n\ " @@ -198,9 +198,9 @@ build_packages() { # translate the version name for Debian releases [ "x$l_CODENAME" = "xsid" ] && VERSION=unstable - [ "x$l_CODENAME" = "xwheezy" ] && VERSION=testing - [ "x$l_CODENAME" = "xsqueeze" ] && VERSION=stable - [ "x$l_CODENAME" = "xlenny" ] && VERSION=oldstable + [ "x$l_CODENAME" = "xjessie" ] && VERSION=testing + [ "x$l_CODENAME" = "xwheezy" ] && VERSION=stable + [ "x$l_CODENAME" = "xoldstable" ] && VERSION=oldstable # modify the section for non-main package builds [ "x$COMPONENT" != "xmain" ] && { diff --git a/home/.buildscripts/itzks.conf b/home/.buildscripts/itzks.conf index f175840..16ad07c 100644 --- a/home/.buildscripts/itzks.conf +++ b/home/.buildscripts/itzks.conf @@ -9,7 +9,7 @@ GPG_KEY="E41B37C658842183" DISTS_SUPPORTED="debian ubuntu" BUILDS_FOR="\ -debian: squeeze wheezy sid" +debian: squeeze wheezy jessie sid" COMPONENT_MAIN="main" COMPONENT_NIGHTLY="nightly" diff --git a/home/.buildscripts/nwt.conf b/home/.buildscripts/nwt.conf index 8673e0f..37a786f 100644 --- a/home/.buildscripts/nwt.conf +++ b/home/.buildscripts/nwt.conf @@ -9,7 +9,7 @@ DEBFULLNAME="NWT Packages" GPG_KEY="4DC41CF116990FF8" DISTS_SUPPORTED="debian ubuntu" BUILDS_FOR="\ -debian: lenny squeeze wheezy sid\n\ +debian: lenny squeeze wheezy jessie sid\n\ ubuntu: lucid precise" COMPONENT_MAIN="main" diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf index bd056ad..f25e731 100644 --- a/home/.buildscripts/x2go.conf +++ b/home/.buildscripts/x2go.conf @@ -9,7 +9,7 @@ DEBFULLNAME="X2go Git Administrator" GPG_KEY="F4A7678C9C6B0B2B" DISTS_SUPPORTED="debian" BUILDS_FOR="\ -debian: squeeze wheezy sid" +debian: squeeze wheezy jessie sid" COMPONENT_MAIN="main" COMPONENT_NIGHTLY="heuler" @@ -21,15 +21,19 @@ LIB_PACKAGES_HEULER=" x2go-keyring $COMPONENT_NIGHTLY master\n\ nx-libs $COMPONENT_NIGHTLY master\n\ python-x2go $COMPONENT_NIGHTLY master\ +libpam-x2go $COMPONENT_NIGHTLY master\n\ +lightdm-remote-session-x2go $COMPONENT_NIGHTLY master\n\ " LIB_PACKAGES_MAIN=" x2go-keyring $COMPONENT_MAIN build-main\n\ nx-libs $COMPONENT_MAIN build-main\n\ python-x2go $COMPONENT_MAIN build-main\ +libpam-x2go $COMPONENT_MAIN build-main\ +lightdm-remote-session-x2go $COMPONENT_MAIN build-main\ " APP_PACKAGES_NIGHTLY=" x2goserver $COMPONENT_NIGHTLY master\n\ -x2goagent $COMPONENT_NIGHTLY master\n\ +x2gobroker $COMPONENT_NIGHTLY master\n\ x2goclient $COMPONENT_NIGHTLY master\n\ cups-x2go $COMPONENT_NIGHTLY master\n\ x2godesktopsharing $COMPONENT_NIGHTLY master\n\ @@ -42,7 +46,7 @@ x2gothinclient $COMPONENT_NIGHTLY master\ " APP_PACKAGES_MAIN=" x2goserver $COMPONENT_MAIN build-main\n\ -x2goagent $COMPONENT_MAIN build-main\n\ +x2gobroker $COMPONENT_MAIN build-main\n\ x2goclient $COMPONENT_MAIN build-main\n\ cups-x2go $COMPONENT_MAIN build-main\n\ x2godesktopsharing $COMPONENT_MAIN build-main\n\ diff --git a/home/.dupload.conf.itzks b/home/.dupload.conf.itzks index 7e25854..3adb5d5 100644 --- a/home/.dupload.conf.itzks +++ b/home/.dupload.conf.itzks @@ -9,6 +9,14 @@ $cfg{"itzks-debian-sid"} = { queuedir => "/srv/sites/it-zukunft-schule.de/packages/debian/upload/sid", dinstall_runs => 1, }; +$cfg{"itzks-debian-jessie"} = { + fqdn => "packages.it-zukunft-schule.de", + login => "itzks-admin", + method => "scpb", + incoming => "/srv/sites/it-zukunft-schule.de/packages/debian/incoming/jessie", + queuedir => "/srv/sites/it-zukunft-schule.de/packages/debian/upload/jessie", + dinstall_runs => 1, +}; $cfg{"itzks-debian-wheezy"} = { fqdn => "packages.it-zukunft-schule.de", login => "itzks-admin", diff --git a/home/.dupload.conf.nwt b/home/.dupload.conf.nwt index bcbd15c..a5ce122 100644 --- a/home/.dupload.conf.nwt +++ b/home/.dupload.conf.nwt @@ -9,6 +9,14 @@ $cfg{"nwt-debian-sid"} = { queuedir => "/srv/sites/das-netzwerkteam.de/packages/debian/upload/sid", dinstall_runs => 1, }; +$cfg{"nwt-debian-jessie"} = { + fqdn => "packages.das-netzwerkteam.de", + login => "nwt-admin", + method => "scpb", + incoming => "/srv/sites/das-netzwerkteam.de/packages/debian/incoming/jessie", + queuedir => "/srv/sites/das-netzwerkteam.de/packages/debian/upload/jessie", + dinstall_runs => 1, +}; $cfg{"nwt-debian-wheezy"} = { fqdn => "packages.das-netzwerkteam.de", login => "nwt-admin", diff --git a/home/.dupload.conf.x2go b/home/.dupload.conf.x2go index 8e68292..0e33701 100644 --- a/home/.dupload.conf.x2go +++ b/home/.dupload.conf.x2go @@ -9,6 +9,14 @@ $cfg{"x2go-debian-sid"} = { queuedir => "/srv/sites/x2go.org/packages/debian/upload/sid", dinstall_runs => 1, }; +$cfg{"x2go-debian-jessie"} = { + fqdn => "code.x2go.org", + login => "x2go-admin", + method => "scpb", + incoming => "/srv/sites/x2go.org/packages/debian/incoming/jessie", + queuedir => "/srv/sites/x2go.org/packages/debian/upload/jessie", + dinstall_runs => 1, +}; $cfg{"x2go-debian-wheezy"} = { fqdn => "code.x2go.org", login => "x2go-admin", 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

x2gobroker.git - master (branch) updated: 0.0.2.2-1-g285e9cc
by git-admin＠x2go.org 22 May '13

22 May '13

The branch, master has been updated via 285e9cc89d32b49996954fd4a3f6e4f4ad3b4ee0 (commit) from 6a16a5739fc702c12d3cc8738837a8a29cae8c12 (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 285e9cc89d32b49996954fd4a3f6e4f4ad3b4ee0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 22 17:42:24 2013 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ sbin/x2gobroker-pubkeyauthorizer | 2 +- x2gobroker/__init__.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e887cc5..a6b1619 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2gobroker (0.0.2.3-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 May 2013 17:42:12 +0200 + x2gobroker (0.0.2.2-0~x2go1) unstable; urgency=low * New upstream version (0.0.2.2): diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index ec593e4..3adccc0 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -36,7 +36,7 @@ import logging.config from pwd import getpwnam from grp import getgrnam -__VERSION__ = '0.0.2.2' +__VERSION__ = '0.0.2.3' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' PROG_NAME = os.path.basename(sys.argv[0]) diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index 1a37a25..72336db 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -18,5 +18,5 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.2.2' +__VERSION__ = '0.0.2.3' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.2
by git-admin＠x2go.org 22 May '13

22 May '13

The branch, build-main has been updated via 6a16a5739fc702c12d3cc8738837a8a29cae8c12 (commit) from 171e8df1620f71bef0600fe3d8380c8d2a493758 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f14bb75..e887cc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2gobroker (0.0.2.2-0~x2go1) UNRELEASED; urgency=low +x2gobroker (0.0.2.2-0~x2go1) unstable; urgency=low * New upstream version (0.0.2.2): - Convert unicode type host fields into single element lists. Fix @@ -6,7 +6,7 @@ x2gobroker (0.0.2.2-0~x2go1) UNRELEASED; urgency=low - Correctly incorporate path to x2gobroker-agent.pl into x2gobroker-agent setuid wrapper. (Fixes: #216). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 13:12:51 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 May 2013 17:32:03 +0200 x2gobroker (0.0.2.1-0~x2go1) unstable; urgency=low hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.1-2-gff5d005
by git-admin＠x2go.org 22 May '13

22 May '13

The branch, build-main has been updated via ff5d005efbaabf23d034af46fae4310445f173c1 (commit) from 35fd3a951ed12de18f36e0c4f4b66078afc3e483 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ sbin/x2gobroker-pubkeyauthorizer | 2 +- x2gobroker/__init__.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index badca68..353fe2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2gobroker (0.0.2.2-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 13:12:51 +0200 + x2gobroker (0.0.2.1-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 8c44126..ec593e4 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -36,7 +36,7 @@ import logging.config from pwd import getpwnam from grp import getgrnam -__VERSION__ = '0.0.2.1' +__VERSION__ = '0.0.2.2' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' PROG_NAME = os.path.basename(sys.argv[0]) diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index a84e978..1a37a25 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -18,5 +18,5 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.2.1' +__VERSION__ = '0.0.2.2' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.1-3-g44fb5f4
by git-admin＠x2go.org 22 May '13

22 May '13

The branch, build-main has been updated via 44fb5f47579b3b2cde8093ce8c05b46e11a13e67 (commit) from ff5d005efbaabf23d034af46fae4310445f173c1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- x2gobroker/tests/test_broker_inifile.py | 1 - x2gobroker/tests/test_web_uccs_zeroconf.py | 24 ++++++++++++++++++++---- x2gobroker/web/uccs.py | 9 +++++++-- 4 files changed, 30 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 353fe2f..0749ee7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2gobroker (0.0.2.2-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.0.2.2): + - Convert unicode type host fields into single element lists. Fix + UCCS+zeroconf tests. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 13:12:51 +0200 diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index 1e99f7a..b7181a4 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -86,7 +86,6 @@ command = GNOME } ) _expected_profile = copy.deepcopy(_expected_defaults) _profile = inifile_backend.get_profile('testprofile') - print _expected_defaults for key in _expected_profile.keys(): self.assertTrue( ( key in _profile.keys() ) ) for key in _profile.keys(): diff --git a/x2gobroker/tests/test_web_uccs_zeroconf.py b/x2gobroker/tests/test_web_uccs_zeroconf.py index b796fb5..d02a1a5 100644 --- a/x2gobroker/tests/test_web_uccs_zeroconf.py +++ b/x2gobroker/tests/test_web_uccs_zeroconf.py @@ -23,12 +23,16 @@ from paste.fixture import TestApp from nose.tools import * import tornado.wsgi import json +import base64 # Python X2GoBroker modules import x2gobroker.defaults import x2gobroker.web.uccs -urls = ( ('/uccs/(.*)', x2gobroker.web.uccs.X2GoBrokerWeb,) ,) +urls = ( + ('/uccs/[a-zA-Z]*(/*)$', x2gobroker.web.uccs.X2GoBrokerWeb,), + ('/uccs/(.*)/api/([0-9])(/*)$', x2gobroker.web.uccs.X2GoBrokerWebAPI,), +) application = tornado.wsgi.WSGIApplication(urls) class TestX2GoBrokerWebUccsZeroConf(unittest.TestCase): @@ -40,20 +44,24 @@ class TestX2GoBrokerWebUccsZeroConf(unittest.TestCase): u'URL': u'http://localhost:8080/uccs/zeroconf', u'AdditionalManagementServers': [], u'Name': u'X2Go Session Broker', + u'DefaultServer': u'LOCALHOST', u'RemoteDesktopServers': [ { u'Username': u'', u'Protocol': u'x2go', u'Name': u'LOCALHOST', - u'URL': u'localhost:22', + u'URL': u'http://localhost:22/', + u'SessionType': u'KDE', u'SessionTypeRequired': True, - u'Password': None + u'Password': u'', }, ], + u'URL': u'http://localhost:8080/uccs/zeroconf/', } _config = """ [global] enable-uccs-output=true +check-credentials=false [zeroconf] enable = true @@ -65,7 +73,15 @@ desktop-shell = KDE tf.seek(0) x2gobroker.defaults.X2GOBROKER_CONFIG = tf.name testApp = TestApp(application) - r = testApp.get('/uccs/zeroconf/', params={'user': 'test', 'password': 'sweet', 'task': 'listsessions', }, expect_errors=True) + + #username = 'test' + #password = 'sweet' + #base64String = base64.encodestring('{username}:{password}'.format(username=username, password=password))[:-1] + #authHeader = "Basic {authcred}".format(authcred=base64String) + #headers = {'Authorization': authHeader} + headers = {} + + r = testApp.get('/uccs/zeroconf/api/4', headers=headers, expect_errors=True) assert_equal(r.status, 200) body = r.normal_body result = json.loads(body) diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index 8422664..e518640 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -24,6 +24,7 @@ import re import base64 import datetime +import types import tornado.web # Python X2Go Broker modules @@ -142,16 +143,20 @@ class X2GoBrokerWebAPI(tornado.web.RequestHandler): for profile_id in profile_ids: + hosts = profiles[profile_id][u'host'] + if type(hosts) == types.UnicodeType: + hosts = [hosts] + if profiles[profile_id][u'directrdp']: ts = x2gobroker.uccsjson.RDPServer( - host='{hostname}'.format(hostname=profiles[profile_id][u'host'][0]), + host='{hostname}'.format(hostname=hosts[0]), name=profiles[profile_id][u'name'], username=profiles[profile_id][u'user'], ) ts.set_domain('LOCAL') else: ts = x2gobroker.uccsjson.X2GoServer( - host='{hostname}:{port}'.format(hostname=profiles[profile_id][u'host'][0], port=profiles[profile_id][u'sshport']), + host='{hostname}:{port}'.format(hostname=hosts[0], port=profiles[profile_id][u'sshport']), name=profiles[profile_id][u'name'], username=profiles[profile_id][u'user'], ) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits May 2013