This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from e1fe83c x2gobroker.spec et al: make rpmlint more happy new 84ab4c7 x2gobroker.spec: On SUSE, we have /etc/apache2, not /etc/httpd. new 1ed4719 x2gobroker-rpmlintrc: Add more filters, set badness for setuid directory. 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 + rpm/x2gobroker-rpmlintrc | 3 +++ x2gobroker.spec | 16 ++++++++++++++++ 3 files changed, 20 insertions(+) -- 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 84ab4c749e804fd9f4651e8ec9c92e7b8286935b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 15 07:02:15 2014 +0200 x2gobroker.spec: On SUSE, we have /etc/apache2, not /etc/httpd. --- debian/changelog | 1 + x2gobroker.spec | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5266d2b..256d1ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -199,6 +199,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low + Add x2gobroker-rpmlintrc file. + Don't package x2gobroker-daemon.1 nor x2gobroker-ssh.1 man pages twice. + + On SUSE, we have /etc/apache2, not /etc/httpd. [ Josh Lukens ] * New upstream version (0.0.3.0): diff --git a/x2gobroker.spec b/x2gobroker.spec index eacd6fb..fc0d92c 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -202,7 +202,11 @@ Group: Productivity/Networking/Remote Desktop Group: Applications/Communications %endif Requires: x2gobroker = %{version}-%{release} +%if 0%{?suse_version} +Requires: apache2, apache2-mod_wsgi +%else Requires: httpd, mod_wsgi +%endif %if 0%{?suse_version} Requires: python %else @@ -321,11 +325,19 @@ make install PREFIX="%_prefix" LIBDIR="%_libexecdir/x2go" DESTDIR="$b" # Somewhat distro specific (especially the paths), thus this was not # done in the shipped tarball's Makefile # +%if 0%{?suse_version} +mkdir -p "$b/%_sysconfdir/apache2"/{conf.d,vhosts.d} +ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.conf" \ + "$b/%_sysconfdir/apache2/conf.d/x2gobroker-wsgi.conf" +ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost" \ + "$b/%_sysconfdir/apache2/vhosts.d/x2gobroker-wsgi.sample" +%else mkdir -p "$b/%_sysconfdir/httpd"/{conf.d,vhosts.d} ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.conf" \ "$b/%_sysconfdir/httpd/conf.d/x2gobroker-wsgi.conf" ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost" \ "$b/%_sysconfdir/httpd/vhosts.d/x2gobroker-wsgi.sample" +%endif %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 # System.d session cleanup script @@ -571,7 +583,11 @@ fi %files wsgi %defattr(-,root,root) +%if 0%{suse_version} +%_sysconfdir/apache2 +%else %_sysconfdir/httpd +%endif %config %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf %config %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost %config %_sysconfdir/logrotate.d/x2gobroker-wsgi -- 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 1ed47195d23846f02a91a4e234bf79674408ecc0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 15 07:02:41 2014 +0200 x2gobroker-rpmlintrc: Add more filters, set badness for setuid directory. --- rpm/x2gobroker-rpmlintrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rpm/x2gobroker-rpmlintrc b/rpm/x2gobroker-rpmlintrc index 00af592..9561210 100644 --- a/rpm/x2gobroker-rpmlintrc +++ b/rpm/x2gobroker-rpmlintrc @@ -1,5 +1,6 @@ setBadness("permissions-unauthorized-file", 0); setBadness("permissions-file-setuid-bit", 0); +setBadness("permissions-directory-setuid-bit", 0); addFilter("non-standard-group"); addFilter("non-standard-uid /usr/bin/x2gobroker-ssh x2gobroker"); @@ -7,3 +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"); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org