This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 516e3b51328e12d6189e338568990517e06815c2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 15 06:05:07 2014 +0200 Adapt to building on openSUSE/SLES. --- debian/changelog | 1 + x2gobroker.spec | 139 ++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 121 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index c415446..93e894d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -193,6 +193,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low sub-package. + Builds for EPEL-7 also have to systemd aware. + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + + Adapt to building on openSUSE/SLES. [ Josh Lukens ] * New upstream version (0.0.3.0): diff --git a/x2gobroker.spec b/x2gobroker.spec index 682e554..489e872 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -2,21 +2,32 @@ Name: x2gobroker Version: 0.0.3.0 Release: 0.0x2go1%{?dist} Summary: X2Go Session Broker +%if 0%{?suse_version} License: AGPL-3.0+ +Group: Productivity/Networking/Remote Desktop +%else +License: AGPLv3+ Group: Applications/Communications +%endif Url: http://www.x2go.org/ Source0: http://code.x2go.org/releases/source/%name/%name-%version.tar.gz Source1: x2gobroker-daemon.init Source2: x2gobroker-authservice.init +Source3: x2gobroker-rpmlintrc %if 0%{?el5} BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif +%if 0%{?suse_version} +BuildRequires: python-devel +BuildRequires: fdupes +%else BuildRequires: python2-devel +%endif BuildRequires: python-setuptools -%if 0%{?fedora} || 0%{?el7} +%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 BuildRequires: systemd %endif Requires: logrotate @@ -24,7 +35,12 @@ Requires: python-argparse Requires: python-setproctitle Requires: python-wsgilog Requires(pre): python-x2gobroker = %{version}-%{release} + +%if 0%{?suse_version} +Requires(pre): pwdutils +%else Requires(pre): shadow-utils +%endif %description X2Go is a server based computing environment with @@ -49,8 +65,16 @@ This package contains the x2gobroker executable. %package -n python-x2gobroker Summary: X2Go Session Broker (Python modules) +%if 0%{?suse_version} +Group: Productivity/Networking/Remote Desktop +%else Group: Applications/Communications +%endif +%if 0%{?suse_version} +Requires: python +%else Requires: python2 +%endif Requires: python-pampy Requires: python-netaddr Requires: python-tornado @@ -82,8 +106,16 @@ This package contains the broker's Python library. %package authservice Summary: X2Go Session Broker (PAM authentication service) +%if 0%{?suse_version} +Group: Productivity/Networking/Remote Desktop +%else Group: Applications/Communications +%endif +%if 0%{?suse_version} +Requires: python +%else Requires: python2 +%endif Requires: python-argparse Requires: python-setproctitle Requires: python-pampy @@ -113,7 +145,11 @@ against the PAM system. %package daemon Summary: X2Go Session Broker (standalone daemon) +%if 0%{?suse_version} +Group: Productivity/Networking/Remote Desktop +%else Group: Applications/Communications +%endif Requires: x2gobroker = %{version}-%{release} Requires: x2gobroker-authservice = %{version}-%{release} @@ -143,7 +179,11 @@ daemon. %package ssh Summary: X2Go Session Broker (SSH broker) +%if 0%{?suse_version} +Group: Productivity/Networking/Remote Desktop +%else Group: Applications/Communications +%endif Requires: x2gobroker = %{version}-%{release} %description ssh @@ -171,10 +211,18 @@ Servers). %package wsgi Summary: X2Go Session Broker (WSGI) +%if 0%{?suse_version} +Group: Productivity/Networking/Remote Desktop +%else Group: Applications/Communications +%endif Requires: x2gobroker = %{version}-%{release} Requires: httpd, mod_wsgi +%if 0%{?suse_version} +Requires: python +%else Requires: python2 +%endif Requires: x2gobroker-authservice = %{version}-%{release} %description wsgi @@ -202,9 +250,25 @@ into a running Apache2 httpd. %package agent Summary: X2Go Session Broker (remote agent) +%if 0%{?suse_version} +Group: Productivity/Networking/Remote Desktop +%else Group: Applications/Communications +%endif +%if 0%{?suse_version} +%if 0%{?suse_version} < 1140 +Requires: perl = %{perl_version} +%else +%{perl_requires} +%endif +%else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%endif +%if 0%{?suse_version} +Requires: python +%else Requires: python2 +%endif Requires: python-setproctitle Requires: python-argparse Requires: python-paramiko @@ -280,7 +344,7 @@ ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.conf" \ ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost" \ "$b/%_sysconfdir/httpd/vhosts.d/x2gobroker-wsgi.sample" -%if 0%{?fedora} || 0%{?el7} +%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 # System.d session cleanup script mkdir -p %{buildroot}%{_unitdir} install -pm0644 x2gobroker-daemon.service %{buildroot}%{_unitdir} @@ -296,7 +360,7 @@ install -pm0755 %SOURCE2 \ install -pm0755 %SOURCE1 \ "$b/%_initrddir/x2gobroker-daemon" %endif -%if 0%{?el6} +%if 0%{?el6} || ( 0%{?suse_version} && 0%{?suse_version} < 1140) mkdir -p "$b/%_initddir" install -pm0755 %SOURCE2 \ "$b/%_initddir/x2gobroker-authservice" @@ -315,16 +379,26 @@ install -pm0755 %SOURCE1 \ %pre -n python-x2gobroker if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then - /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null || \ - /usr/sbin/useradd -c "X2Go Broker System User" \ - -d "%_localstatedir/lib/x2gobroker" \ - -g x2gobroker -r -s /bin/bash x2gobroker || :; + if ! /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null; then \ + /usr/sbin/useradd -c "X2Go Broker System User" \ + -d "%_localstatedir/lib/x2gobroker" \ + -g x2gobroker -r -s /bin/bash x2gobroker || :; + fi fi; +%if 0%{?suse_version} >= 1230 +%pre authservice +%service_add_pre x2gobroker-authservice.service +%endif + %post authservice -%if 0%{?fedora} || 0%{?el7} +%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 +%if 0%{?suse_version} +%service_add_post x2gobroker-authservice.service +%else %systemd_post x2gobroker-authservice.service +%endif %else /sbin/chkconfig --add x2gobroker-authservice if [ "$1" -ge "1" ] ; then @@ -333,8 +407,12 @@ fi %endif %preun authservice -%if 0%{?fedora} || 0%{?el7} +%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 +%if 0%{?suse_version} +%service_del_preun x2gobroker-authservice.service +%else %systemd_preun x2gobroker-authservice.service +%endif %else if [ "$1" = 0 ]; then /sbin/service x2gobroker-authservice stop >/dev/null 2>&1 @@ -342,15 +420,28 @@ if [ "$1" = 0 ]; then fi %endif -%if 0%{?fedora} || 0%{?el7} +%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 %postun authservice +%if 0%{?suse_version} +%service_del_postun x2gobroker-authservice.service +%else %systemd_postun x2gobroker-authservice.service %endif +%endif + +%if 0%{?suse_version} >= 1230 +%pre daemon +%service_add_pre x2gobroker-daemon.service +%endif %post daemon -%if 0%{?fedora} || 0%{?el7} +%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 +%if 0%{?suse_version} +%service_add_post x2gobroker-daemon.service +%else %systemd_post x2gobroker-daemon.service +%endif %else /sbin/chkconfig --add x2gobroker-daemon if [ "$1" -ge "1" ] ; then @@ -359,8 +450,12 @@ fi %endif %preun daemon -%if 0%{?fedora} || 0%{?el7} +%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 +%if 0%{?suse_version} +%service_del_preun x2gobroker-daemon.service +%else %systemd_preun x2gobroker-daemon.service +%endif %else if [ "$1" = 0 ]; then /sbin/service x2gobroker-daemon stop >/dev/null 2>&1 @@ -368,10 +463,14 @@ if [ "$1" = 0 ]; then fi %endif -%if 0%{?fedora} || 0%{?el7} +%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 %postun daemon +%if 0%{?suse_version} +%service_del_postun x2gobroker-daemon.service +%else %systemd_postun x2gobroker-daemon.service %endif +%endif %post ssh @@ -382,14 +481,15 @@ fi; %pre agent if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then - /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null || \ - /usr/sbin/useradd -c "X2Go Broker System User" \ - -d "%_localstatedir/lib/x2gobroker" \ - -g x2gobroker -r -s /bin/bash x2gobroker || :; + if ! /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null; then \ + /usr/sbin/useradd -c "X2Go Broker System User" \ + -d "%_localstatedir/lib/x2gobroker" \ + -g x2gobroker -r -s /bin/bash x2gobroker || :; fi; %files +%defattr(-,root,root) %_bindir/x2gobroker %_bindir/x2gobroker-testauth %_sbindir/x2gobroker-keygen @@ -400,6 +500,7 @@ fi; %files -n python-x2gobroker +%defattr(-,root,root) %config(noreplace) %_sysconfdir/x2go %exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf %exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost @@ -419,7 +520,7 @@ fi; %if 0%{?el6} %_initddir/x2gobroker-authservice %endif -%if 0%{?fedora} || 0%{?el7} +%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 %{_unitdir}/x2gobroker-authservice.service %endif %if 0%{?el5} || 0%{?el6} @@ -439,7 +540,7 @@ fi; %if 0%{?el6} %_initddir/x2gobroker-daemon %endif -%if 0%{?fedora} || 0%{?el7} +%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 %{_unitdir}/x2gobroker-daemon.service %endif %if 0%{?el5} || 0%{?el6} -- 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 26b78f819df77f569c85ed964e68331f78f2dc5f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 15 06:10:06 2014 +0200 Rework Description: of bin:package x2gobroker-agent. Imporve line breaks, so that we now have lines that are close to 80 chars long. --- debian/changelog | 2 + x2gobroker.spec | 131 +++++++++++++++++++++++------------------------------- 2 files changed, 57 insertions(+), 76 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93e894d..d7da989 100644 --- a/debian/changelog +++ b/debian/changelog @@ -194,6 +194,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low + Builds for EPEL-7 also have to systemd aware. + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + Adapt to building on openSUSE/SLES. + + Rework Description: of bin:package x2gobroker-agent. Imporve line + breaks, so that we now have lines that are close to 80 chars long. [ Josh Lukens ] * New upstream version (0.0.3.0): diff --git a/x2gobroker.spec b/x2gobroker.spec index 489e872..ade29a0 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -52,14 +52,11 @@ X2Go is a server based computing environment with - 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. +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. +A session broker is most useful in load balanced X2Go server farms. This package contains the x2gobroker executable. @@ -92,14 +89,11 @@ X2Go is a server based computing environment with - 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. +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. +A session broker is most useful in load balanced X2Go server farms. This package contains the broker's Python library. @@ -131,17 +125,13 @@ X2Go is a server based computing environment with - 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. +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. +A session broker is most useful in load balanced X2Go server farms. -This package contains the authentication service -against the PAM system. +This package contains the authentication service against the PAM system. %package daemon Summary: X2Go Session Broker (standalone daemon) @@ -163,18 +153,14 @@ X2Go is a server based computing environment with - 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. +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. +A session broker is most useful in load balanced X2Go server farms. -This package contains the start-stop script that -installs the X2Go Session Broker as standalone -daemon. +This package contains the start-stop script that installs the X2Go Session Broker +as standalone daemon. %package ssh @@ -196,18 +182,15 @@ X2Go is a server based computing environment with - 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. +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. +A session broker is most useful in load balanced X2Go server farms. + +This add-on package provides fully-featured SSH brokerage support (with access +to broker agents on remote X2Go servers). -This add-on package provides fully-featured SSH brokerage -support (with access to broker agents on remote X2Go -Servers). %package wsgi Summary: X2Go Session Broker (WSGI) @@ -235,18 +218,14 @@ X2Go is a server based computing environment with - 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. +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. +A session broker is most useful in load balanced X2Go server farms. -This package contains an Apache2 configuration that -installs the X2Go Session Broker as a WSGI application -into a running Apache2 httpd. +This package contains an Apache2 configuration that installs the X2Go Session +Broker as a WSGI application into a running Apache2 httpd. %package agent Summary: X2Go Session Broker (remote agent) @@ -284,35 +263,35 @@ X2Go is a server based computing environment with - 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. +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. -A session broker is most useful in load balanced -X2Go server farms. +This package contains a setuid agent command that extends X2Go Session Broker +functionality. It has to be installed on X2Go Servers that shall be +controlled via a session broker. -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. +The broker agent provides means to the X2Go Session Broker for controlling +the X2Go Server it is installed on (e.g. suspend/terminate sessions, deploy +SSH login keys, detect server load, detect running/suspended sessions +of connecting users, etc.). 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). +(%{_libdir}/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. +/usr/lib/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 +and the named Perl script beforehand. Note that the X2Go session broker will +lack functionality, but it will work without this x2gobroker-agent component +installed on your to-be-managed X2Go servers. + %prep %setup -q -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git