This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 620a2b9 x2gobroker.spec: more rpmlintrc improvements new c9077d0 x2gobroker.spec/rpmlint: several more fixes new 487ae65 logrotate configs: Rotated logs via "su x2gobroker adm". The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + logrotate/x2gobroker-authservice | 1 + logrotate/x2gobroker-daemon | 1 + logrotate/x2gobroker-wsgi | 1 + rpm/x2gobroker-rpmlintrc | 4 ++-- x2gobroker.spec | 27 ++++++++++++++------------- 6 files changed, 20 insertions(+), 15 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit c9077d06d453b08b091ba0bfd780474ce6a71918 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 15 07:29:36 2014 +0200 x2gobroker.spec/rpmlint: several more fixes --- rpm/x2gobroker-rpmlintrc | 4 ++-- x2gobroker.spec | 27 ++++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/rpm/x2gobroker-rpmlintrc b/rpm/x2gobroker-rpmlintrc index 9561210..0d70447 100644 --- a/rpm/x2gobroker-rpmlintrc +++ b/rpm/x2gobroker-rpmlintrc @@ -8,5 +8,5 @@ addFilter("non-standard-uid /var/log/x2gobroker x2gobroker"); addFilter("non-standard-uid /var/lib/x2gobroker x2gobroker"); addFilter("non-standard-gid /var/log/x2gobroker x2gobroker"); addFilter("non-standard-gid /var/lib/x2gobroker x2gobroker"); -addFilter("non-standard-gid /usr/bin/x2gobroker-ssh x2gobroker-users"); -addFilter("non-standard-gid /usr/lib/x2go/x2gobroker-agent x2gobroker"); +addFilter("non-standard-gid /usr/bin/x2gobroker-ssh x2gobroker-users"); +addFilter("non-standard-gid /usr/lib/x2go/x2gobroker-agent x2gobroker"); diff --git a/x2gobroker.spec b/x2gobroker.spec index 2b02faf..923385b 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -175,6 +175,7 @@ Group: Productivity/Networking/Remote Desktop Group: Applications/Communications %endif Requires: x2gobroker = %{version}-%{release} +Requires(pre): permissions %description ssh X2Go is a server based computing environment with @@ -295,7 +296,7 @@ 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, +%{_libdir}/x2go/broker/x2gobroker-agent.pl. For running properly, x2gobroker-agent.pl needs setuid root privileges. If you hesitate to install this package, study the code of the named wrapper @@ -387,11 +388,11 @@ fi %if 0%{?suse_version} %post -n python-x2gobroker -%set_permissions /var/log/x2gobroker +%set_permissions %{_localstatedir}/log/x2gobroker %verifyscript -n python-x2gobroker -%verify_permissions -e /var/log/x2gobroker +%verify_permissions -e %{_localstatedir}/log/x2gobroker %endif @@ -414,11 +415,11 @@ if [ "$1" -ge "1" ] ; then fi %endif %if 0%{?suse_version} -%set_permissions /var/log/x2gobroker +%set_permissions %{_localstatedir}/log/x2gobroker %verifyscript authservice -%verify_permissions -e /var/log/x2gobroker +%verify_permissions -e %{_localstatedir}/log/x2gobroker %endif %preun authservice @@ -464,11 +465,11 @@ if [ "$1" -ge "1" ] ; then fi %endif %if 0%{?suse_version} -%set_permissions /var/log/x2gobroker +%set_permissions %{_localstatedir}/log/x2gobroker %verifyscript daemon -%verify_permissions -e /var/log/x2gobroker +%verify_permissions -e %{_localstatedir}/log/x2gobroker %endif %preun daemon @@ -519,23 +520,23 @@ fi %if 0%{?suse_version} %post agent -%set_permissions /usr/lib/x2go/x2gobroker-agent -%set_permissions /var/log/x2gobroker +%set_permissions %{_libdir}/x2go/x2gobroker-agent +%set_permissions %{_localstatedir}/log/x2gobroker %verifyscript agent -%verify_permissions -e /usr/lib/x2go/x2gobroker-agent -%verify_permissions -e /var/log/x2gobroker +%verify_permissions -e %{_libdir}/x2go/x2gobroker-agent +%verify_permissions -e %{_localstatedir}/log/x2gobroker %endif %if 0%{?suse_version} %post wsgi -%set_permissions /var/log/x2gobroker +%set_permissions %{_localstatedir}/log/x2gobroker %verifyscript wsgi -%verify_permissions -e /var/log/x2gobroker +%verify_permissions -e %{_localstatedir}/log/x2gobroker %endif -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 487ae65612bebb86f0a771d5d35cf69e9e792478 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 15 07:30:02 2014 +0200 logrotate configs: Rotated logs via "su x2gobroker adm". --- debian/changelog | 1 + logrotate/x2gobroker-authservice | 1 + logrotate/x2gobroker-daemon | 1 + logrotate/x2gobroker-wsgi | 1 + 4 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 256d1ed..cdb19c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -162,6 +162,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Update README and TODO. - Update copyright holders. Copyright is held only by people who actually contributed to the current code base. + - logrotate configs: Rotated logs via "su x2gobroker adm". * debian/control: + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/logrotate/x2gobroker-authservice b/logrotate/x2gobroker-authservice index d19cc13..a2f499c 100644 --- a/logrotate/x2gobroker-authservice +++ b/logrotate/x2gobroker-authservice @@ -6,6 +6,7 @@ delaycompress notifempty create 640 root adm + su x2gobroker adm sharedscripts postrotate invoke-rc.d x2gobroker-authservice restart > /dev/null diff --git a/logrotate/x2gobroker-daemon b/logrotate/x2gobroker-daemon index 31da1bd..2e07aee 100644 --- a/logrotate/x2gobroker-daemon +++ b/logrotate/x2gobroker-daemon @@ -6,6 +6,7 @@ delaycompress notifempty create 640 x2gobroker adm + su x2gobroker adm sharedscripts postrotate invoke-rc.d x2gobroker-daemon restart > /dev/null diff --git a/logrotate/x2gobroker-wsgi b/logrotate/x2gobroker-wsgi index 63d6342..e5b9173 100644 --- a/logrotate/x2gobroker-wsgi +++ b/logrotate/x2gobroker-wsgi @@ -6,5 +6,6 @@ delaycompress notifempty create 640 x2gobroker adm + su x2gobroker adm sharedscripts } -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git