[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.1-4-gd424e12
X2Go dev team
git-admin at x2go.org
Wed Feb 13 17:33:00 CET 2013
The branch, master has been updated
via d424e129de63d2fd187d1364bf5d2791d74571be (commit)
via dc84423e202eba6c1022821b24a25504ee1cab0c (commit)
via 0e4b85183bd23e6561ba687bb693cf0f3612297d (commit)
via fba2b53e36f84b12f7dfcdfe971149415cae3019 (commit)
from 6d343a60b4adb1041ba8cbef1839e8fd9ec09642 (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 d424e129de63d2fd187d1364bf5d2791d74571be
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Feb 13 17:35:02 2013 +0100
Make host session option a list, not string.
commit dc84423e202eba6c1022821b24a25504ee1cab0c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Feb 13 17:34:32 2013 +0100
really build x2gobroker-agent setuidwrapper
commit 0e4b85183bd23e6561ba687bb693cf0f3612297d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Feb 13 17:33:59 2013 +0100
/debian/control: Add bin:package x2gobroker-agent.
commit fba2b53e36f84b12f7dfcdfe971149415cae3019
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Feb 13 17:32:31 2013 +0100
Make CC, CFLAGS and LDFLAGS configurable through build system.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 6 +-
debian/changelog | 10 +++
debian/control | 94 ++++++++++++++--------------
debian/rules | 4 +-
etc/broker/x2gobroker-sessionprofiles.conf | 3 +-
x2gobroker/brokers/base_broker.py | 2 +-
x2gobroker/defaults.py | 2 +
7 files changed, 67 insertions(+), 54 deletions(-)
The diff of changes is:
diff --git a/Makefile b/Makefile
index 1293dab..07428f6 100755
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,10 @@ INSTALL_DIR=install -d -o root -g root -m 755
INSTALL_FILE=install -o root -g root -m 644
INSTALL_PROGRAM=install -o root -g root -m 755
+CC ?= gcc
+CFLAGS += -fPIE
+LDFLAGS += -pie
+
RM_FILE=rm -f
RM_DIR=rmdir -p --ignore-fail-on-non-empty
@@ -52,7 +56,7 @@ build: build-arch build-indep
build-arch: build_setuidwrappers
build_setuidwrappers:
- gcc -fPIE -pie -o lib/x2gobroker-agent src/x2gobroker-agent.c
+ $(CC) $(CFLAGS) $(LDFLAGS) -o lib/x2gobroker-agent src/x2gobroker-agent.c
build-indep:
# run setup.py build+install somewhere here...
diff --git a/debian/changelog b/debian/changelog
index e040920..025cc4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low
+
+ * New upstream version (0.0.0.2):
+ - Make CC, CFLAGS and LDFLAGS configurable through build system.
+ - Make host session option a list, not string.
+ * /debian/control:
+ + Add bin:package x2gobroker-agent.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 13 Feb 2013 12:03:25 +0100
+
x2gobroker (0.0.0.1-0~x2go1) unstable; urgency=low
* Initial upstream version.
diff --git a/debian/control b/debian/control
index 2789bf7..3b222bc 100644
--- a/debian/control
+++ b/debian/control
@@ -138,50 +138,50 @@ Description: X2Go http(s) based session broker (Python modules)
This package contains common files needed by all X2Go session
brokers being package for this distribution.
-#Package: x2gobroker-agent
-#Architecture: any
-#Depends:
-# ${shlibs:Depends},
-# ${misc:Depends},
-# perl,
-# adduser,
-# x2goserver,
-#Description: X2Go http(s) based session broker (common files)
-# X2Go is a server based computing environment with
-# - session resuming
-# - low bandwidth support
-# - LDAP support
-# - client side mass storage mounting support
-# - client side printing support
-# - audio support
-# - authentication by smartcard and USB stick
-# .
-# The session broker is a server tool for X2Go that
-# tells your X2Go Client application in a terminal
-# server cluster what servers and session types are
-# most appropriate for the user in front of the
-# X2Go terminal.
-# .
-# A session broker is most useful in load balanced
-# X2Go server farms.
-# .
-# This package contains a setuid agent command that
-# is required by the X2Go session broker. This package
-# has to be installed on all X2Go servers that shall get
-# managed via the X2Go session broker.
-# .
-# WARNING: This package installs a setuid wrapper
-# (/usr/lib/x2go/broker/x2gobroker-agent) on your system.
-# This setuid wrapper aims to be a secure replacement
-# for the deprecated suidperl exectuable that was removed
-# from Perl (>= 5.12).
-# .
-# This wrapper is only able to execute the Perl script
-# /usr/lib/x2go/broker/x2gobroker-agent.pl. For running
-# properly, x2gobroker-agent.pl needs setuid privileges.
-# .
-# If you hesitate to install this package, study the code
-# of the named wrapper and the named Perl script beforehand.
-# Note that the X2Go session broker will not work without this
-# x2gobroker-agent component installed on your to-be-managed
-# X2Go servers.
+Package: x2gobroker-agent
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ perl,
+ adduser,
+ x2goserver,
+Description: X2Go http(s) based session broker (common files)
+ X2Go is a server based computing environment with
+ - session resuming
+ - low bandwidth support
+ - LDAP support
+ - client side mass storage mounting support
+ - client side printing support
+ - audio support
+ - authentication by smartcard and USB stick
+ .
+ The session broker is a server tool for X2Go that
+ tells your X2Go Client application in a terminal
+ server cluster what servers and session types are
+ most appropriate for the user in front of the
+ X2Go terminal.
+ .
+ A session broker is most useful in load balanced
+ X2Go server farms.
+ .
+ This package contains a setuid agent command that
+ is required by the X2Go session broker. This package
+ has to be installed on all X2Go servers that shall get
+ managed via the X2Go session broker.
+ .
+ WARNING: This package installs a setuid wrapper
+ (/usr/lib/x2go/broker/x2gobroker-agent) on your system.
+ This setuid wrapper aims to be a secure replacement
+ for the deprecated suidperl exectuable that was removed
+ from Perl (>= 5.12).
+ .
+ This wrapper is only able to execute the Perl script
+ /usr/lib/x2go/broker/x2gobroker-agent.pl. For running
+ properly, x2gobroker-agent.pl needs setuid privileges.
+ .
+ If you hesitate to install this package, study the code
+ of the named wrapper and the named Perl script beforehand.
+ Note that the X2Go session broker will not work without this
+ x2gobroker-agent component installed on your to-be-managed
+ X2Go servers.
diff --git a/debian/rules b/debian/rules
index 787fc72..997158b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,8 +21,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_CFLAGS_MAINT_APPEND = -Wall
include /usr/share/dpkg/buildflags.mk
-#DEB_PERL_PACKAGES=libx2go-broker-perl
-#DEB_PERL_CLEAN_TARGET=realclean
-#include /usr/share/cdbs/1/class/perl-makemaker.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/class/python-distutils.mk
diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf
index 8b332a3..f84e097 100644
--- a/etc/broker/x2gobroker-sessionprofiles.conf
+++ b/etc/broker/x2gobroker-sessionprofiles.conf
@@ -144,8 +144,7 @@ acl-any-order=deny-allow
[pool-C-XFCE]
user=
# no load balancing support, yet
-#host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local
-host=s-E1.pool-c.domain.local
+host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local
name=XFCE - pool-C
command=XFCE
acl-users-allow=testuser-A,testuser-B
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 7da6336..c06dfa6 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -699,7 +699,7 @@ class X2GoBroker(object):
profile = self.get_profile(profile_id)
selected_session = {
- 'server': profile[u'host'],
+ 'server': profile[u'host'][0],
'port': profile[u'sshport'],
}
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 63bc254..48b61d8 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -139,6 +139,8 @@ X2GOBROKER_SESSIONPROFILE_DEFAULTS = {
u'sshport': 22,
u'setdpi': 0,
u'pack': u'16m-jpeg',
+ u'user': '',
+ u'host': [ u'localhost', ],
u'acl-users-allow': [],
u'acl-users-deny': [],
u'acl-users-order': '',
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).
More information about the x2go-commits
mailing list