This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit e1fe83c24755f3b995aee92330760e728d3eb23d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 15 06:52:14 2014 +0200 x2gobroker.spec et al: make rpmlint more happy --- rpm/x2gobroker-rpmlintrc | 6 ++++++ x2gobroker.spec | 38 ++++++++++++++++++++++++++++++++++---- x2gobroker/basicauth.py | 2 -- x2gobroker/tests/runalltests.py | 1 - x2gobroker/web/extras.py | 2 -- x2gobroker/web/json.py | 2 -- x2gobroker/web/plain.py | 2 -- x2gobroker/web/uccs.py | 2 -- 8 files changed, 40 insertions(+), 15 deletions(-) diff --git a/rpm/x2gobroker-rpmlintrc b/rpm/x2gobroker-rpmlintrc index 9dd9472..00af592 100644 --- a/rpm/x2gobroker-rpmlintrc +++ b/rpm/x2gobroker-rpmlintrc @@ -1,3 +1,9 @@ setBadness("permissions-unauthorized-file", 0); setBadness("permissions-file-setuid-bit", 0); addFilter("non-standard-group"); + +addFilter("non-standard-uid /usr/bin/x2gobroker-ssh x2gobroker"); +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"); diff --git a/x2gobroker.spec b/x2gobroker.spec index cd9b60c..eacd6fb 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -30,7 +30,6 @@ BuildRequires: python-setuptools %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 BuildRequires: systemd %endif -Requires: logrotate Requires: python-argparse Requires: python-setproctitle Requires: python-wsgilog @@ -78,6 +77,7 @@ Requires: python-tornado Requires: python-paramiko Requires: python-daemon Requires: python-lockfile +Requires(pre): permissions %description -n python-x2gobroker X2Go is a server based computing environment with @@ -113,6 +113,7 @@ Requires: python2 Requires: python-argparse Requires: python-setproctitle Requires: python-pampy +Requires: logrotate Requires(pre): python-x2gobroker = %{version}-%{release} %description authservice @@ -142,6 +143,7 @@ Group: Applications/Communications %endif Requires: x2gobroker = %{version}-%{release} Requires: x2gobroker-authservice = %{version}-%{release} +Requires: logrotate %description daemon X2Go is a server based computing environment with @@ -207,6 +209,7 @@ Requires: python Requires: python2 %endif Requires: x2gobroker-authservice = %{version}-%{release} +Requires: logrotate %description wsgi X2Go is a server based computing environment with @@ -252,6 +255,7 @@ Requires: python-setproctitle Requires: python-argparse Requires: python-paramiko Requires: perl(File::Which) +Requires(pre): permissions %description agent X2Go is a server based computing environment with @@ -366,6 +370,16 @@ if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/group fi +%if 0%{?suse_version} +%post -n python-x2gobroker +%set_permissions + + +%verifyscript -n python-x2gobroker +%verify_permissions +%endif + + %if 0%{?suse_version} >= 1230 %pre authservice %service_add_pre x2gobroker-authservice.service @@ -456,8 +470,14 @@ fi if ! /usr/bin/getent group x2gobroker-users 1>/dev/null 2>/dev/null; then /usr/sbin/groupadd -r x2gobroker-users fi +%if 0%{?suse_version} +%set_permissions +%verifyscript ssh +%verify_permissions +%endif + %pre agent if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then if ! /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null; then @@ -468,6 +488,16 @@ if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/group fi +%if 0%{?suse_version} +%post agent +%set_permissions + + +%verifyscript agent +%verify_permissions +%endif + + %files %defattr(-,root,root) %_bindir/x2gobroker @@ -491,7 +521,6 @@ fi %python_sitelib/x2gobroker* %attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker %attr(00750,x2gobroker,x2gobroker) %_localstatedir/lib/x2gobroker -%config %_sysconfdir/logrotate.d/x2gobroker-daemon %files authservice @@ -531,6 +560,7 @@ fi %_sbindir/x2gobroker-daemon-debug %_mandir/man1/x2gobroker-daemon.1* %_mandir/man8/x2gobroker-daemon-debug.8* +%config %_sysconfdir/logrotate.d/x2gobroker-daemon %files ssh @@ -542,8 +572,8 @@ fi %files wsgi %defattr(-,root,root) %_sysconfdir/httpd -%_sysconfdir/x2go/x2gobroker-wsgi.apache.conf -%_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost +%config %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf +%config %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost %config %_sysconfdir/logrotate.d/x2gobroker-wsgi diff --git a/x2gobroker/basicauth.py b/x2gobroker/basicauth.py index 6b33c75..2c8a846 100644 --- a/x2gobroker/basicauth.py +++ b/x2gobroker/basicauth.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # This file is part of the X2Go Project - http://www.x2go.org # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # diff --git a/x2gobroker/tests/runalltests.py b/x2gobroker/tests/runalltests.py index 35d978b..1aa49d1 100644 --- a/x2gobroker/tests/runalltests.py +++ b/x2gobroker/tests/runalltests.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # Copyright (C) 2010 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> diff --git a/x2gobroker/web/extras.py b/x2gobroker/web/extras.py index b90f936..bcf1464 100644 --- a/x2gobroker/web/extras.py +++ b/x2gobroker/web/extras.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # This file is part of the X2Go Project - http://www.x2go.org # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # diff --git a/x2gobroker/web/json.py b/x2gobroker/web/json.py index 298082d..1895e00 100644 --- a/x2gobroker/web/json.py +++ b/x2gobroker/web/json.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # This file is part of the X2Go Project - http://www.x2go.org # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 9ed7b52..ed706f5 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # This file is part of the X2Go Project - http://www.x2go.org # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index fa182eb..dd138e1 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # This file is part of the X2Go Project - http://www.x2go.org # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git