x2go-commits September 2012

x2go-commits@lists.x2go.org

1 participants
231 discussions

x2goserver.git - master (branch) updated: 3.1.1.3-28-gbbb685f
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via bbb685fb33fa0271a11902db8a167989e5bd72ea (commit) via 064d58e48e2f0dfd5502a2a4512d92b854530663 (commit) from fb1ee65060275cc09d576b7cc6b99705c826b156 (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 bbb685fb33fa0271a11902db8a167989e5bd72ea Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 12:05:53 2012 +0200 fix for X2Go::Server::DB transition -> make sure that db_* functions are available in the &main namespace commit 064d58e48e2f0dfd5502a2a4512d92b854530663 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 12:03:53 2012 +0200 whitespace fix ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gogetservers | 2 +- x2goserver/bin/x2golistmounts | 2 +- x2goserver/bin/x2golistsessions | 2 +- x2goserver/bin/x2gomountdirs | 2 +- x2goserver/bin/x2goumount-session | 2 +- x2goserver/lib/x2gochangestatus | 2 +- x2goserver/lib/x2gocreatesession | 2 +- x2goserver/lib/x2gogetagent | 2 +- x2goserver/lib/x2gogetdisplays | 2 +- x2goserver/lib/x2gogetports | 2 +- x2goserver/lib/x2gogetstatus | 2 +- x2goserver/lib/x2goinsertport | 2 +- x2goserver/lib/x2goinsertsession | 2 +- x2goserver/lib/x2golistsessions_sql | 2 +- x2goserver/lib/x2goresume | 2 +- x2goserver/lib/x2gormport | 2 +- x2goserver/sbin/x2godbadmin | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers index a15fada..ac38c42 100755 --- a/x2goserver/bin/x2gogetservers +++ b/x2goserver/bin/x2gogetservers @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_getservers); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts index 91e971a..624d0a4 100755 --- a/x2goserver/bin/x2golistmounts +++ b/x2goserver/bin/x2golistmounts @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_getmounts); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index 4be77cb..75ff45a 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -24,7 +24,7 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_listsessions db_listsessions_all); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index fb9febd..d806a3f 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_insertmount db_deletemount); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 99524be..7da17a0 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -24,7 +24,7 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_getdisplay db_getmounts db_deletemount); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus index 640e58d..de10749 100755 --- a/x2goserver/lib/x2gochangestatus +++ b/x2goserver/lib/x2gochangestatus @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_changestatus); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession index 6987b42..f05a987 100755 --- a/x2goserver/lib/x2gocreatesession +++ b/x2goserver/lib/x2gocreatesession @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_createsession); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent index 68e3bd2..cfb8078 100755 --- a/x2goserver/lib/x2gogetagent +++ b/x2goserver/lib/x2gogetagent @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_getagent); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays index 3893b7a..e84ae0f 100755 --- a/x2goserver/lib/x2gogetdisplays +++ b/x2goserver/lib/x2gogetdisplays @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_getdisplays); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports index fa7c2a0..bf5d09d 100755 --- a/x2goserver/lib/x2gogetports +++ b/x2goserver/lib/x2gogetports @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_getports); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gogetstatus b/x2goserver/lib/x2gogetstatus index b56d306..3d6dc0f 100755 --- a/x2goserver/lib/x2gogetstatus +++ b/x2goserver/lib/x2gogetstatus @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_getstatus); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport index 908fe55..398b5d1 100755 --- a/x2goserver/lib/x2goinsertport +++ b/x2goserver/lib/x2goinsertport @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_insertport); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession index d0c74cc..8f8a410 100755 --- a/x2goserver/lib/x2goinsertsession +++ b/x2goserver/lib/x2goinsertsession @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_insertsession); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index bfedba6..1a0dcd1 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(dbsys_listsessionsroot_all dbsys_listsessionsroot dbsys_rmsessionsroot); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume index d0c6324..768e751 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2goresume @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_resume); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gormport b/x2goserver/lib/x2gormport index a0c5907..172b504 100755 --- a/x2goserver/lib/x2gormport +++ b/x2goserver/lib/x2gormport @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB; +use X2Go::Server::DB qw(db_rmport); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index f9d813b..56915d9 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); use Getopt::Long; -use Config::Simple; +use Config::Simple; use DBI; use X2Go::Log qw(loglevel); hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-26-gfb1ee65
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via fb1ee65060275cc09d576b7cc6b99705c826b156 (commit) from 73c4040768f7243784650640263fe4e16e71c226 (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 fb1ee65060275cc09d576b7cc6b99705c826b156 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 11:50:50 2012 +0200 x2goserver package: Depend on libx2go-log-perl, libx2go-server-db-perl. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8453eae..a83f152 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low + Priority: optional. + Package X2Go::Log in separate package: libx2go-log-perl. + Package X2Go::Server::DB in separate package: libx2go-server-db-perl. + + x2goserver package: Depend on libx2go-log-perl, libx2go-server-db-perl. [ Oleksandr Shneyder ] * New upstream version (3.2.0.0): diff --git a/debian/control b/debian/control index 03ece03..b845951 100644 --- a/debian/control +++ b/debian/control @@ -52,6 +52,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + libx2go-server-db-perl (>= ${source:Version}), libx2go-server-db-perl (<< ${source:Version}.1~), libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~), x2goagent (>= 2:3.5.0.15-0~), lsof, hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-25-g73c4040
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via 73c4040768f7243784650640263fe4e16e71c226 (commit) via 7936b6458605f3b7ea1bbadedd45fa1179f30ee4 (commit) from ca8d497eb86c55b26e5fc1711aa57047217487b8 (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 73c4040768f7243784650640263fe4e16e71c226 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 11:34:28 2012 +0200 /debian/changelog: typo commit 7936b6458605f3b7ea1bbadedd45fa1179f30ee4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 11:33:51 2012 +0200 Transform x2godbwrapper.pm into proper Perl module X2Go::Server::DB, package X2Go::Server::DB in separate package: libx2go-server-db-perl. ----------------------------------------------------------------------- Summary of changes: .../lib/x2godbwrapper.pm => X2Go/Server/DB.pm | 16 +++++++++++++--- debian/changelog | 4 +++- debian/control | 19 ++++++++++++++++++- debian/libx2go-log-perl.install | 4 ++-- debian/libx2go-server-db-perl.install | 2 ++ x2goserver-printing/bin/x2goprint | 3 +-- x2goserver/Makefile | 1 - x2goserver/bin/x2gogetapps | 1 - x2goserver/bin/x2gogetservers | 3 +-- x2goserver/bin/x2golistdesktops | 1 - x2goserver/bin/x2golistmounts | 3 +-- x2goserver/bin/x2golistsessions | 3 +-- x2goserver/bin/x2gomountdirs | 3 +-- x2goserver/bin/x2gosessionlimit | 1 - x2goserver/bin/x2goshowblocks | 3 +-- x2goserver/bin/x2goumount-session | 3 +-- x2goserver/lib/x2gochangestatus | 3 +-- x2goserver/lib/x2gocreatesession | 3 +-- x2goserver/lib/x2gogetagent | 3 +-- x2goserver/lib/x2gogetdisplays | 3 +-- x2goserver/lib/x2gogetports | 3 +-- x2goserver/lib/x2gogetstatus | 3 +-- x2goserver/lib/x2goinsertport | 3 +-- x2goserver/lib/x2goinsertsession | 3 +-- x2goserver/lib/x2golistsessions_sql | 3 +-- x2goserver/lib/x2goresume | 3 +-- x2goserver/lib/x2gormport | 3 +-- x2goserver/lib/x2gosuspend-agent | 1 - x2goserver/lib/x2gosyslog | 1 - x2goserver/sbin/x2gocleansessions | 1 - 30 files changed, 56 insertions(+), 50 deletions(-) rename x2goserver/lib/x2godbwrapper.pm => X2Go/Server/DB.pm (99%) create mode 100644 debian/libx2go-server-db-perl.install The diff of changes is: diff --git a/x2goserver/lib/x2godbwrapper.pm b/X2Go/Server/DB.pm similarity index 99% rename from x2goserver/lib/x2godbwrapper.pm rename to X2Go/Server/DB.pm index c3f56dd..6a27db0 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/X2Go/Server/DB.pm @@ -18,7 +18,17 @@ # Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -package x2godbwrapper; +package X2Go::DB; + +=head1 NAME + +X2Go::DB - X2Go Session Database modules for Perl + +=head1 DESCRIPTION + +X2Go Session Database modules for X2Go Server. + +=cut use strict; use Config::Simple; @@ -26,8 +36,6 @@ use DBI; use POSIX; use Sys::Syslog qw( :standard :macros ); -my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; -use lib `echo -n \$(x2gobasepath)/lib/x2go`; use X2Go::Log qw(loglevel); setlogmask( LOG_UPTO(loglevel()) ); @@ -35,6 +43,8 @@ setlogmask( LOG_UPTO(loglevel()) ); my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid()); my $Config = new Config::Simple(syntax=>'ini'); +my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; + $Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go/x2gosql/sql"; my $backend=$Config->param("backend"); diff --git a/debian/changelog b/debian/changelog index 260db0a..8453eae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,13 +17,15 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low of Xorg's Xrandr library (partially closes #28). - Make sure when launching desktop session through the Xsession mechanism that the LD_LIBRARY_PATH variable stays intact. Closes #29. - - Transform x2gologlevel.pm into proper Perl module X2Go::Log + - Transform x2gologlevel.pm into proper Perl module X2Go::Log. + - Transform x2godbwrapper.pm into proper Perl module X2Go::Server::DB. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder. + Add rdesktop and pulseaudio-utils to Suggests. + Priority: optional. + Package X2Go::Log in separate package: libx2go-log-perl. + + Package X2Go::Server::DB in separate package: libx2go-server-db-perl. [ Oleksandr Shneyder ] * New upstream version (3.2.0.0): diff --git a/debian/control b/debian/control index ad9b159..03ece03 100644 --- a/debian/control +++ b/debian/control @@ -13,13 +13,30 @@ Homepage: http://code.x2go.org/releases/source/x2goserver Vcs-Git: git://code.x2go.org/x2goserver.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary +Package: libx2go-server-db-perl +Architecture: any +Section: perl +Depends: + ${perl:Depends}, + ${misc:Depends}, +Description: Perl X2Go::Server:DB modules + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This package contains the X2Go::Server::DB Perl modules. + Package: libx2go-log-perl Architecture: any Section: perl Depends: ${perl:Depends}, ${misc:Depends}, -Description: X2Go server daemon scripts +Description: Perl X2Go::Log modules X2Go is a server based computing environment with - session resuming - low bandwidth support diff --git a/debian/libx2go-log-perl.install b/debian/libx2go-log-perl.install index c019a96..ce1fadc 100644 --- a/debian/libx2go-log-perl.install +++ b/debian/libx2go-log-perl.install @@ -1,2 +1,2 @@ -usr/share/perl5/X2Go -usr/share/man/man3 \ No newline at end of file +usr/share/perl5/X2Go/Log.pm +usr/share/man/man3/X2Go::Log* \ No newline at end of file diff --git a/debian/libx2go-server-db-perl.install b/debian/libx2go-server-db-perl.install new file mode 100644 index 0000000..dd30db9 --- /dev/null +++ b/debian/libx2go-server-db-perl.install @@ -0,0 +1,2 @@ +usr/share/perl5/X2Go/Server/DB* +usr/share/man/man3/X2Go::Server::DB* \ No newline at end of file diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint index f1c0d20..3256f40 100755 --- a/x2goserver-printing/bin/x2goprint +++ b/x2goserver-printing/bin/x2goprint @@ -26,8 +26,7 @@ use File::Copy; use File::Path; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 59f2a0a..9065d7f 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -66,7 +66,6 @@ install_scripts: $(INSTALL_PROGRAM) x2gosqlitewrapper $(DESTDIR)$(LIBDIR)/ $(INSTALL_PROGRAM) lib/* $(DESTDIR)$(LIBDIR)/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ - chmod a-x $(DESTDIR)$(LIBDIR)/*.pm getent group x2gouser &>/dev/null && chown root:x2gouser $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper || true chmod 2755 $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index de9c2ec..eee2d1e 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -24,7 +24,6 @@ use strict; use Sys::Syslog qw( :standard :macros ); use MIME::Base64 qw(encode_base64); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers index cd49bfb..a15fada 100755 --- a/x2goserver/bin/x2gogetservers +++ b/x2goserver/bin/x2gogetservers @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops index 3a1b7f1..4a97622 100755 --- a/x2goserver/bin/x2golistdesktops +++ b/x2goserver/bin/x2golistdesktops @@ -24,7 +24,6 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts index a143e04..91e971a 100755 --- a/x2goserver/bin/x2golistmounts +++ b/x2goserver/bin/x2golistmounts @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index aa1b02a..4be77cb 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -24,8 +24,7 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index b04e89e..fb9febd 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit index d2bd978..d4d1b7d 100755 --- a/x2goserver/bin/x2gosessionlimit +++ b/x2goserver/bin/x2gosessionlimit @@ -24,7 +24,6 @@ use strict; use Config::Simple; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks index 457874e..0c3e832 100755 --- a/x2goserver/bin/x2goshowblocks +++ b/x2goserver/bin/x2goshowblocks @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index c1cd044..99524be 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -24,8 +24,7 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus index 17226a9..640e58d 100755 --- a/x2goserver/lib/x2gochangestatus +++ b/x2goserver/lib/x2gochangestatus @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession index ecd9db4..6987b42 100755 --- a/x2goserver/lib/x2gocreatesession +++ b/x2goserver/lib/x2gocreatesession @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent index 02e0144..68e3bd2 100755 --- a/x2goserver/lib/x2gogetagent +++ b/x2goserver/lib/x2gogetagent @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays index 7dd84f2..3893b7a 100755 --- a/x2goserver/lib/x2gogetdisplays +++ b/x2goserver/lib/x2gogetdisplays @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports index 4fe8c5e..fa7c2a0 100755 --- a/x2goserver/lib/x2gogetports +++ b/x2goserver/lib/x2gogetports @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gogetstatus b/x2goserver/lib/x2gogetstatus index 3dfb084..b56d306 100755 --- a/x2goserver/lib/x2gogetstatus +++ b/x2goserver/lib/x2gogetstatus @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport index 920b79c..908fe55 100755 --- a/x2goserver/lib/x2goinsertport +++ b/x2goserver/lib/x2goinsertport @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession index da4f3da..d0c74cc 100755 --- a/x2goserver/lib/x2goinsertsession +++ b/x2goserver/lib/x2goinsertsession @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index 27f1a5d..bfedba6 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume index 501a599..d0c6324 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2goresume @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gormport b/x2goserver/lib/x2gormport index 3d8f5a9..a0c5907 100755 --- a/x2goserver/lib/x2gormport +++ b/x2goserver/lib/x2gormport @@ -23,8 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +use X2Go::Server::DB; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent index 6c50e13..103dcb7 100755 --- a/x2goserver/lib/x2gosuspend-agent +++ b/x2goserver/lib/x2gosuspend-agent @@ -23,7 +23,6 @@ strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gosyslog b/x2goserver/lib/x2gosyslog index 7c47ee1..89b74b4 100755 --- a/x2goserver/lib/x2gosyslog +++ b/x2goserver/lib/x2gosyslog @@ -23,7 +23,6 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; use X2Go::Log qw(loglevel); setlogmask( LOG_UPTO(loglevel()) ); diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index b3e99f9..1019314 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -25,7 +25,6 @@ use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; -use lib `echo -n \$(x2gobasepath)/lib/x2go`; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-23-gca8d497
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via ca8d497eb86c55b26e5fc1711aa57047217487b8 (commit) from 4734598e08e05ec3754f57976e07d9d7f08c56eb (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 ca8d497eb86c55b26e5fc1711aa57047217487b8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 10:58:39 2012 +0200 more fixes for X2GO::* module transistion ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gosessionlimit | 1 - x2goserver/lib/x2godbwrapper.pm | 3 ++- x2goserver/lib/x2gosqlitewrapper.pl | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit index 5a991c7..d2bd978 100755 --- a/x2goserver/bin/x2gosessionlimit +++ b/x2goserver/bin/x2gosessionlimit @@ -30,7 +30,6 @@ use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(loglevel()) ); - syslog('info', "x2gosessionlimit has been called"); my $maxlimit=-1; diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index f290b71..c3f56dd 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -28,8 +28,9 @@ use Sys::Syslog qw( :standard :macros ); my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2gologlevel; +use X2Go::Log qw(loglevel); +setlogmask( LOG_UPTO(loglevel()) ); my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid()); diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index fdccfc9..94d8f91 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -26,14 +26,6 @@ use POSIX; #### NOTE: this script is run setgid <group> and it cannot do system() calls. -#### -#### One consequence of this is... -#### This first part of code that handles syslogging is duplicated from -#### x2gologlevel.pm. This is because we are not able to detect the -#### installation path automatically via the x2gobasepath in this -#### script. -#### - use Config::Simple; use Sys::Syslog qw( :standard :macros ); use X2Go::Log qw(loglevel); hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-22-g4734598
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via 4734598e08e05ec3754f57976e07d9d7f08c56eb (commit) from 984be7f0dc712e298ddc80b85d4965a9f17cf2a6 (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 4734598e08e05ec3754f57976e07d9d7f08c56eb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 10:49:44 2012 +0200 fix function name in X2Go::Log ----------------------------------------------------------------------- Summary of changes: X2Go/Log.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/X2Go/Log.pm b/X2Go/Log.pm index 0312b46..d62c556 100644 --- a/X2Go/Log.pm +++ b/X2Go/Log.pm @@ -37,14 +37,14 @@ use Config::Simple; use Sys::Syslog qw( :standard :macros ); use base 'Exporter'; -our @EXPORT = ( 'x2gologlevel' ); +our @EXPORT = ( 'loglevel' ); my $Config = new Config::Simple(syntax=>'ini'); $Config->read('/etc/x2go/x2goserver.conf' ); my $strloglevel = $Config->param("log.loglevel"); -sub x2gologlevel { +sub loglevel { my $loglevel = LOG_NOTICE; if ( $strloglevel eq "emerg" ) { $loglevel = LOG_EMERG; } elsif ( $strloglevel eq "alert" ) { $loglevel = LOG_ALERT; } hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-21-g984be7f
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via 984be7f0dc712e298ddc80b85d4965a9f17cf2a6 (commit) from ee00478b155558b87456288aded9c77604313bfa (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 984be7f0dc712e298ddc80b85d4965a9f17cf2a6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 10:44:15 2012 +0200 typo fix in x2goserver dependency ----------------------------------------------------------------------- Summary of changes: debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/control b/debian/control index 90953dc..ad9b159 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libx2go-log-perl (>= ${source:Version}), libx2go-perl-log (<< ${source:Version}.1~), + libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~), x2goagent (>= 2:3.5.0.15-0~), lsof, openssh-client, hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-20-gee00478
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via ee00478b155558b87456288aded9c77604313bfa (commit) from 973db626cf5d84e7c62bb6dc58c094f86512db1a (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 ee00478b155558b87456288aded9c77604313bfa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 10:32:55 2012 +0200 * Bump next upstream version to 3.2.0.0. - Transform x2gologlevel.pm into proper Perl module X2Go::Log - Package X2Go::Log in separate package: libx2go-log-perl. ----------------------------------------------------------------------- Summary of changes: Makefile | 20 +++++++++++++++++++- Makefile.PL | 9 +++++++++ x2goserver/lib/x2gologlevel.pm => X2Go/Log.pm | 12 +++++++++++- debian/changelog | 12 ++++++++---- debian/control | 18 ++++++++++++++++++ debian/libx2go-log-perl.install | 2 ++ debian/rules | 6 +++++- x2goserver-compat/Makefile | 2 +- x2goserver-extensions/Makefile | 2 +- x2goserver-fmbindings/Makefile | 2 +- x2goserver-printing/Makefile | 2 +- x2goserver-printing/bin/x2goprint | 4 ++-- x2goserver-pyhoca/Makefile | 2 +- x2goserver-xsession/Makefile | 2 +- x2goserver/Makefile | 2 +- x2goserver/bin/x2gogetapps | 5 ++++- x2goserver/bin/x2gogetservers | 4 ++-- x2goserver/bin/x2golistdesktops | 4 ++-- x2goserver/bin/x2golistmounts | 5 ++--- x2goserver/bin/x2golistsessions | 4 ++-- x2goserver/bin/x2gomountdirs | 4 ++-- x2goserver/bin/x2gosessionlimit | 4 ++-- x2goserver/bin/x2goshowblocks | 4 ++-- x2goserver/bin/x2goumount-session | 7 +++---- x2goserver/lib/x2gochangestatus | 4 ++-- x2goserver/lib/x2gocreatesession | 4 ++-- x2goserver/lib/x2gogetagent | 4 ++-- x2goserver/lib/x2gogetdisplays | 4 ++-- x2goserver/lib/x2gogetports | 4 ++-- x2goserver/lib/x2gogetstatus | 4 ++-- x2goserver/lib/x2goinsertport | 4 ++-- x2goserver/lib/x2goinsertsession | 4 ++-- x2goserver/lib/x2golistsessions_sql | 4 ++-- x2goserver/lib/x2gologlevel | 5 ++--- x2goserver/lib/x2goresume | 4 ++-- x2goserver/lib/x2gormport | 4 ++-- x2goserver/lib/x2gosqlitewrapper.pl | 17 ++++------------- x2goserver/lib/x2gosuspend-agent | 5 ++--- x2goserver/lib/x2gosyslog | 4 ++-- x2goserver/sbin/x2gocleansessions | 5 ++--- x2goserver/sbin/x2godbadmin | 5 ++--- x2goserver/sbin/x2golistsessions_root | 6 ++---- 42 files changed, 140 insertions(+), 89 deletions(-) create mode 100644 Makefile.PL rename x2goserver/lib/x2gologlevel.pm => X2Go/Log.pm (93%) create mode 100644 debian/libx2go-log-perl.install The diff of changes is: diff --git a/Makefile b/Makefile index 3be40f9..df27aa0 100755 --- a/Makefile +++ b/Makefile @@ -4,11 +4,14 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR= -PREFIX=/usr/local +PREFIX ?= /usr/local ETCDIR=/etc/x2go LIBDIR=$(PREFIX)/lib/x2go SHAREDIR=$(PREFIX)/share/x2go +PERL ?= /usr/bin/perl +PERL_INSTALLDIRS ?= + all: build build: build-arch build-indep @@ -24,6 +27,7 @@ build_man2html: $(MAKE) -C x2goserver-pyhoca $@ clean: + -$(MAKE) -f Makefile.perl clean $(MAKE) -C x2goserver $@ $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-compat $@ @@ -32,6 +36,16 @@ clean: $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ +distclean: + -$(MAKE) -f Makefile.perl realclean + $(MAKE) -C x2goserver clean + $(MAKE) -C x2goserver-printing clean + $(MAKE) -C x2goserver-compat clean + $(MAKE) -C x2goserver-extensions clean + $(MAKE) -C x2goserver-xsession clean + $(MAKE) -C x2goserver-fmbindings clean + $(MAKE) -C x2goserver-pyhoca clean + build-arch: $(MAKE) -C x2goserver $@ $(MAKE) -C x2goserver-printing $@ @@ -42,6 +56,8 @@ build-arch: $(MAKE) -C x2goserver-pyhoca $@ build-indep: + $(PERL) Makefile.PL INSTALLDIRS=$(PERL_INSTALLDIRS) + $(MAKE) -f Makefile.perl $(MAKE) -C x2goserver $@ $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-compat $@ @@ -51,6 +67,7 @@ build-indep: $(MAKE) -C x2goserver-pyhoca $@ install: + $(MAKE) -f Makefile.perl install $(MAKE) -C x2goserver $@ $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-compat $@ @@ -60,6 +77,7 @@ install: $(MAKE) -C x2goserver-pyhoca $@ uninstall: + $(MAKE) -f Makefile.perl uninstall $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-xsession $@ diff --git a/Makefile.PL b/Makefile.PL new file mode 100644 index 0000000..68d6fde --- /dev/null +++ b/Makefile.PL @@ -0,0 +1,9 @@ +#!/usr/bin/perl + +use ExtUtils::MakeMaker; + +WriteMakefile(FIRST_MAKEFILE => 'Makefile.perl', + PMLIBDIRS => ['X2Go'], + NAME => '', + VERSION => '3.2.0.0', + ); diff --git a/x2goserver/lib/x2gologlevel.pm b/X2Go/Log.pm similarity index 93% rename from x2goserver/lib/x2gologlevel.pm rename to X2Go/Log.pm index 1183e6c..0312b46 100644 --- a/x2goserver/lib/x2gologlevel.pm +++ b/X2Go/Log.pm @@ -20,7 +20,17 @@ # Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -package x2gologlevel; +package X2Go::Log; + +=head1 NAME + +X2Go::Log - X2Go Logging modules for Perl + +=head1 DESCRIPTION + +X2Go Log module X2Go components. + +=cut use strict; use Config::Simple; diff --git a/debian/changelog b/debian/changelog index 85fecec..260db0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,14 @@ -x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low [ Jan Engelhardt ] - * New upstream version (3.1.1.4): + * New upstream version (3.2.0.0): - Add -pie as linker flag. Fixes non-position-independent-executable (x2gosqlitewrapper.c). The executable is now completely position independent. [ Mike Gabriel ] - * New upstream version (3.1.1.4): + * Bump next upstream version to 3.2.0.0. + * New upstream version (3.2.0.0): - Fix x2gosessionlimit script. - Wrap padsp around rdesktop calls if pulse is used as audio protocol. - Add option ,,-r sound:local'' to rdesktop calls if pulse is enabled. @@ -16,14 +17,17 @@ x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low of Xorg's Xrandr library (partially closes #28). - Make sure when launching desktop session through the Xsession mechanism that the LD_LIBRARY_PATH variable stays intact. Closes #29. + - Transform x2gologlevel.pm into proper Perl module X2Go::Log * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder. + Add rdesktop and pulseaudio-utils to Suggests. + Priority: optional. + + Package X2Go::Log in separate package: libx2go-log-perl. [ Oleksandr Shneyder ] - * remove "-nolisten tcp" option with XDMCP sessions + * New upstream version (3.2.0.0): + - Remove "-nolisten tcp" option with XDMCP sessions. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200 diff --git a/debian/control b/debian/control index 4cfca15..90953dc 100644 --- a/debian/control +++ b/debian/control @@ -13,11 +13,29 @@ Homepage: http://code.x2go.org/releases/source/x2goserver Vcs-Git: git://code.x2go.org/x2goserver.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary +Package: libx2go-log-perl +Architecture: any +Section: perl +Depends: + ${perl:Depends}, + ${misc:Depends}, +Description: X2Go server daemon scripts + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This package contains the X2Go::Log Perl module. + Package: x2goserver Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + libx2go-log-perl (>= ${source:Version}), libx2go-perl-log (<< ${source:Version}.1~), x2goagent (>= 2:3.5.0.15-0~), lsof, openssh-client, diff --git a/debian/libx2go-log-perl.install b/debian/libx2go-log-perl.install new file mode 100644 index 0000000..c019a96 --- /dev/null +++ b/debian/libx2go-log-perl.install @@ -0,0 +1,2 @@ +usr/share/perl5/X2Go +usr/share/man/man3 \ No newline at end of file diff --git a/debian/rules b/debian/rules index b32e08d..959a9e0 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,12 @@ %: dh $@ +override_dh_auto_build: + PERL_INSTALLDIRS=vendor dh_auto_build + override_dh_auto_install: - make -f Makefile build-arch + $(MAKE) -f Makefile build-arch + PREFIX=/usr dh_auto_install override_dh_auto_clean: rm -fv x2gosqlitewrapper diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile index d8a3c95..72619cd 100755 --- a/x2goserver-compat/Makefile +++ b/x2goserver-compat/Makefile @@ -11,7 +11,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR= -PREFIX=/usr/local +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index 13cf560..ae9eae2 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -11,7 +11,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR= -PREFIX=/usr/local +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index 8661e83..4d68485 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -11,7 +11,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR= -PREFIX=/usr/local +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index 1c956f4..0eb6842 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -11,7 +11,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR= -PREFIX=/usr/local +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint index e3f3f8f..f1c0d20 100755 --- a/x2goserver-printing/bin/x2goprint +++ b/x2goserver-printing/bin/x2goprint @@ -28,10 +28,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); syslog('info', "x2goprint has been called with options: @ARGV"); diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile index 95ab06d..6db725e 100755 --- a/x2goserver-pyhoca/Makefile +++ b/x2goserver-pyhoca/Makefile @@ -11,7 +11,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR= -PREFIX=/usr/local +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 50c2818..77cb7f1 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -12,7 +12,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR= -PREFIX=/usr/local +PREFIX ?= /usr/local ETCDIR=/etc/x2go #BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 979283b..59f2a0a 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -11,7 +11,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR= -PREFIX=/usr/local +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index 9460cd3..de9c2ec 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -25,7 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use MIME::Base64 qw(encode_base64); use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2gologlevel; +use X2Go::Log qw(loglevel); + +openlog($0,'cons,pid','user'); +setlogmask( LOG_UPTO(loglevel()) ); my @iconext=("png","svg","jpeg","jpg","xpm","bmp"); diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers index d34cc98..cd49bfb 100755 --- a/x2goserver/bin/x2gogetservers +++ b/x2goserver/bin/x2gogetservers @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); my $servers = join("\n", db_getservers); print $servers; diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops index acdd7c4..3a1b7f1 100755 --- a/x2goserver/bin/x2golistdesktops +++ b/x2goserver/bin/x2golistdesktops @@ -25,10 +25,10 @@ use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); if ( @ARGV ) { diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts index ade0c67..a143e04 100755 --- a/x2goserver/bin/x2golistmounts +++ b/x2goserver/bin/x2golistmounts @@ -25,11 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); - +setlogmask( LOG_UPTO(loglevel()) ); my $session_id=shift or die; diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index e4421b3..aa1b02a 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -26,10 +26,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); if ( @ARGV ) { syslog('info', "x2golistsessions has been called with options: @ARGV"); diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index d4249ad..b04e89e 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); syslog('info', "x2gomountdirs has been called with options: @ARGV"); diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit index 91f747b..5a991c7 100755 --- a/x2goserver/bin/x2gosessionlimit +++ b/x2goserver/bin/x2gosessionlimit @@ -25,10 +25,10 @@ use Config::Simple; use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); syslog('info', "x2gosessionlimit has been called"); diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks index f253a73..457874e 100755 --- a/x2goserver/bin/x2goshowblocks +++ b/x2goserver/bin/x2goshowblocks @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); syslog('info', "x2goshowblocks has been called with options: @ARGV"); diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 01d3857..c1cd044 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -25,12 +25,11 @@ use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; -use x2gologlevel; +use x2godbwrapper; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); - +setlogmask( LOG_UPTO(loglevel()) ); syslog('info', "x2goumount-session has been called with options: @ARGV"); diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus index ce33520..17226a9 100755 --- a/x2goserver/lib/x2gochangestatus +++ b/x2goserver/lib/x2gochangestatus @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); my $status=shift or die; diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession index ceb62a9..ecd9db4 100755 --- a/x2goserver/lib/x2gocreatesession +++ b/x2goserver/lib/x2gocreatesession @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); my $cookie=shift or die; diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent index 7462550..02e0144 100755 --- a/x2goserver/lib/x2gogetagent +++ b/x2goserver/lib/x2gogetagent @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); my $sid=shift or die; my $agent = db_getagent $sid; diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays index db29b5c..7dd84f2 100755 --- a/x2goserver/lib/x2gogetdisplays +++ b/x2goserver/lib/x2gogetdisplays @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); my $host=shift or die; diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports index b269800..4fe8c5e 100755 --- a/x2goserver/lib/x2gogetports +++ b/x2goserver/lib/x2gogetports @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); my $host=shift or die; diff --git a/x2goserver/lib/x2gogetstatus b/x2goserver/lib/x2gogetstatus index d2271a4..3dfb084 100755 --- a/x2goserver/lib/x2gogetstatus +++ b/x2goserver/lib/x2gogetstatus @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); my $status; my $sid=shift or die; diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport index bc18d96..920b79c 100755 --- a/x2goserver/lib/x2goinsertport +++ b/x2goserver/lib/x2goinsertport @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); my $server=shift or die; diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession index 372208b..da4f3da 100755 --- a/x2goserver/lib/x2goinsertsession +++ b/x2goserver/lib/x2goinsertsession @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); my $display=shift or die; diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index 6563705..27f1a5d 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); my $serv=shift; diff --git a/x2goserver/lib/x2gologlevel b/x2goserver/lib/x2gologlevel index 9269097..5d5c49e 100755 --- a/x2goserver/lib/x2gologlevel +++ b/x2goserver/lib/x2gologlevel @@ -22,7 +22,6 @@ use strict; -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2gologlevel; +use X2Go::Log qw(loglevel); -print x2gologlevel(); +print loglevel(); diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume index 7391cd3..501a599 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2goresume @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); my $client=shift or die; diff --git a/x2goserver/lib/x2gormport b/x2goserver/lib/x2gormport index 4ba632d..3d8f5a9 100755 --- a/x2goserver/lib/x2gormport +++ b/x2goserver/lib/x2gormport @@ -25,10 +25,10 @@ use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); my $server=shift or die; diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index f47fdec..fdccfc9 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -36,19 +36,10 @@ use POSIX; use Config::Simple; use Sys::Syslog qw( :standard :macros ); -my $Config = new Config::Simple(syntax=>'ini'); -$Config->read('/etc/x2go/x2goserver.conf' ); -my $strloglevel = $Config->param("log.loglevel"); -my $loglevel = LOG_NOTICE; -if ( $strloglevel eq "emerg" ) { $loglevel = LOG_EMERG; } -elsif ( $strloglevel eq "alert" ) { $loglevel = LOG_ALERT; } -elsif ( $strloglevel eq "crit" ) { $loglevel = LOG_CRIT; } -elsif ( $strloglevel eq "err" ) { $loglevel = LOG_ERR; } -elsif ( $strloglevel eq "warning" ) { $loglevel = LOG_WARNING; } -elsif ( $strloglevel eq "notice" ) { $loglevel = LOG_NOTICE; } -elsif ( $strloglevel eq "info" ) { $loglevel = LOG_INFO; } -elsif ( $strloglevel eq "debug" ) { $loglevel = LOG_DEBUG; } -setlogmask( LOG_UPTO($loglevel) ); +use X2Go::Log qw(loglevel); + +openlog($0,'cons,pid','user'); +setlogmask( LOG_UPTO(loglevel()) ); #### #### end of duplicated syslogging code diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent index 7000281..6c50e13 100755 --- a/x2goserver/lib/x2gosuspend-agent +++ b/x2goserver/lib/x2gosuspend-agent @@ -24,11 +24,10 @@ strict; use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); - +setlogmask( LOG_UPTO(loglevel()) ); shift; shift; diff --git a/x2goserver/lib/x2gosyslog b/x2goserver/lib/x2gosyslog index c7650f7..7c47ee1 100755 --- a/x2goserver/lib/x2gosyslog +++ b/x2goserver/lib/x2gosyslog @@ -24,9 +24,9 @@ use strict; use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2gologlevel; +use X2Go::Log qw(loglevel); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); my $component = shift; my $loglevel = shift; diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index aaed31d..b3e99f9 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -26,11 +26,10 @@ use Sys::Syslog qw( :standard :macros ); my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); - +setlogmask( LOG_UPTO(loglevel()) ); sub check_pid { diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index fc86ca8..f9d813b 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -26,11 +26,10 @@ use Getopt::Long; use Config::Simple; use DBI; -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); +setlogmask( LOG_UPTO(loglevel()) ); sub show_usage() { diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root index 71fc5dd..c065777 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/sbin/x2golistsessions_root @@ -23,12 +23,10 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2gologlevel; +use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); - +setlogmask( LOG_UPTO(loglevel()) ); sub check_stat { 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

x2gobroker.git - master (branch) updated: 1f3029121c54e02b5db037f448dfa79435702b6b
by git-admin＠x2go.org 16 Sep '12

16 Sep '12

The branch, master has been updated via 1f3029121c54e02b5db037f448dfa79435702b6b (commit) from 71137406a700aa09ead9520e41c4a59ab3807405 (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 1f3029121c54e02b5db037f448dfa79435702b6b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 16 22:33:04 2012 +0200 x2gobroker-agent.pl: remove -t option when starting perl ----------------------------------------------------------------------- Summary of changes: lib/x2gobroker-agent.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 0e451c1..02b6b04 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -wtU +#!/usr/bin/perl -wU # This file is part of the X2Go Project - http://www.x2go.org # Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.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 - master (branch) updated: 71137406a700aa09ead9520e41c4a59ab3807405
by git-admin＠x2go.org 16 Sep '12

16 Sep '12

The branch, master has been updated via 71137406a700aa09ead9520e41c4a59ab3807405 (commit) via 9cf0113b91ec37a118c8a5b1aa84d4bc285cc9d5 (commit) from 6e7de2cf944d0e33436e6831e1b813c83d6f0e8f (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 71137406a700aa09ead9520e41c4a59ab3807405 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 16 22:27:40 2012 +0200 fix perl expression, use -t for executing perl commit 9cf0113b91ec37a118c8a5b1aa84d4bc285cc9d5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 16 22:27:16 2012 +0200 no homedir for x2gobroker user ----------------------------------------------------------------------- Summary of changes: debian/x2gobroker-agent.postinst | 2 +- lib/x2gobroker-agent.pl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/x2gobroker-agent.postinst b/debian/x2gobroker-agent.postinst index b811f63..95faece 100755 --- a/debian/x2gobroker-agent.postinst +++ b/debian/x2gobroker-agent.postinst @@ -35,7 +35,7 @@ case "$1" in echo "Creating x2gobroker user." >&2 adduser --system --no-create-home \ --disabled-password --disabled-login \ - --shell /bin/false --group --home /var/lib/x2gobroker x2gobroker + --shell /bin/false --group --home /dev/null x2gobroker else echo "User x2gobroker already exists." >&2 fi diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index aff2258..0e451c1 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -wU +#!/usr/bin/perl -wtU # This file is part of the X2Go Project - http://www.x2go.org # Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> @@ -26,7 +26,7 @@ sub InitX2GoUser { my ($user, $uid, $gid, $home)=@_; - if ( -f /etc/x2go/x2gosql/sql ) + if ( -f "/etc/x2go/x2gosql/sql" ) { # if we use the PostgreSQL session db backend we may have to add the # user to the session database... @@ -34,7 +34,7 @@ sub InitX2GoUser my @buf = <F>; close(F); if ( grep (/^backend=sqlite.*/, @buf) ) { - #if (( ! -e "$home/.x2go/sqlpass" ) + #if ( ! -e "$home/.x2go/sqlpass" ) ### ### FIXME: make the below code robust if homes are on NFS ### 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 - master (branch) updated: 6e7de2cf944d0e33436e6831e1b813c83d6f0e8f
by git-admin＠x2go.org 16 Sep '12

16 Sep '12

The branch, master has been updated via 6e7de2cf944d0e33436e6831e1b813c83d6f0e8f (commit) from 214487c2a586368f4811d813d7c196b293530afc (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 6e7de2cf944d0e33436e6831e1b813c83d6f0e8f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 16 22:06:44 2012 +0200 fixing, securing x2gobroker-agent ----------------------------------------------------------------------- Summary of changes: lib/x2gobroker-agent.pl | 99 ++++++++++++++++++++++++----------------------- 1 files changed, 50 insertions(+), 49 deletions(-) The diff of changes is: diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index be9145c..aff2258 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/perl -wU # This file is part of the X2Go Project - http://www.x2go.org # Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> @@ -22,58 +22,59 @@ use strict; -sub initUser +sub InitX2GoUser { my ($user, $uid, $gid, $home)=@_; - if (! -d "$home") - ### - ### FIXME: it should no be our job to create homes...!!! - ### Use pam_mkhomedir.so or similar or just have a - ### genuine system administration tool... (Mike) - ### - { - mkdir ("$home", 0700); - chown ($uid, $gid, $home); - } - if (! -e "$home/.x2go/sqlpass") - ### - ### FIXME: This code block will fail on most NFS mounted shares - ### and esp. on those mounted via NFSv4+Krb. (Mike) - ### + + if ( -f /etc/x2go/x2gosql/sql ) { - open my $save_out, ">&STDOUT"; - close (STDOUT); - system "/usr/lib/x2go/script/x2godbadmin", "--adduser", $user; - open STDOUT, ">&", $save_out; + # if we use the PostgreSQL session db backend we may have to add the + # user to the session database... + open(F,"/etc/x2go/x2gosql/sql"); + my @buf = <F>; + close(F); + if ( grep (/^backend=sqlite.*/, @buf) ) { + #if (( ! -e "$home/.x2go/sqlpass" ) + ### + ### FIXME: make the below code robust if homes are on NFS + ### + ### + #{ + # open my $save_out, ">&STDOUT"; + # close (STDOUT); + # system "x2godbadmin", "--adduser", $user; + # open STDOUT, ">&", $save_out; + #} + } } } -sub createKey +sub CreateKey { ### - ### FIXME: This bit of code look dangerous... My + ### FIXME: This bit of code looks dangerous... My ### authorized_keys file is starting to get ### scared... (Mike) ### - my ($uid, $gid, $home)=@_; - if (! -d "$home/.ssh") - { - mkdir ("$home/.ssh", 0700); - chown ($uid, $gid, "$home/.ssh"); - } - if( -e "$home/.ssh/authorized_keys") - { - unlink("$home/.ssh/authorized_keys"); - } - open my $save_out, ">&STDOUT"; - close (STDOUT); - system "/usr/bin/ssh-keygen", "-t", "dsa", "-N","","-f","$home/.ssh/authorized_keys"; - open STDOUT, ">&", $save_out; - open (F,"<$home/.ssh/authorized_keys"); - print <F>; - close (F); - unlink("$home/.ssh/authorized_keys"); - rename("$home/.ssh/authorized_keys.pub", "$home/.ssh/authorized_keys"); + #my ($uid, $gid, $home)=@_; + #if ( ! -d "$home/.ssh" ) + #{ + # mkdir ("$home/.ssh", 0700); + # chown ($uid, $gid, "$home/.ssh"); + #} + #if( -e "$home/.ssh/authorized_keys" ) + #{ + # unlink("$home/.ssh/authorized_keys"); + #} + #open my $save_out, ">&STDOUT"; + #close (STDOUT); + #system "/usr/bin/ssh-keygen", "-t", "dsa", "-N","","-f","$home/.ssh/authorized_keys"; + #open STDOUT, ">&", $save_out; + #open (F,"<$home/.ssh/authorized_keys"); + #print <F>; + #close (F); + #unlink("$home/.ssh/authorized_keys"); + #rename("$home/.ssh/authorized_keys.pub", "$home/.ssh/authorized_keys"); } $< = $>; @@ -92,32 +93,32 @@ if($uid < 1000) if($mode eq 'listsessions') { - initUser($name, $uid, $gid, $home); + InitX2GoUser($name, $uid, $gid, $home); print "OK\n"; - system "/bin/su", $name, "-c", "/usr/bin/x2golistsessions --all-servers"; + system "/bin/su", $name, "-c", "x2golistsessions --all-servers"; } if($mode eq 'getservers') { - initUser($name, $uid, $gid, $home); + InitX2GoUser($name, $uid, $gid, $home); print "OK\n"; - system "/bin/su", $name, "-c", "/usr/bin/x2gogetservers"; + system "/bin/su", $name, "-c", "x2gogetservers"; } if($mode eq 'key') { - initUser($name, $uid, $gid, $home); + InitX2GoUser($name, $uid, $gid, $home); print "OK\n"; createKey($uid, $gid, $home); } if($mode eq 'suspend') { - initUser($name, $uid, $gid, $home); + InitX2GoUser($name, $uid, $gid, $home); print "OK\n"; my $sid=shift; - system "/bin/su", $name, "-c", "/usr/bin/x2gosuspend-session $sid"; + system "/bin/su", $name, "-c", "x2gosuspend-session $sid"; } if($mode eq 'ping') 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

← Newer
1
...
8
9
10
11
12
13
14
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2012