From cad0c8b3f7babdadd1dbff7d51922cee98692432 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 1 Aug 2013 09:48:38 -0600 Subject: [PATCH 001/113] Initial import --- .gitignore | 1 + sources | 1 + x2gocleansessions.init | 104 ++++++++++++ x2gocleansessions.service | 8 + x2goserver-4.0.1.3-use-pwgen.patch | 21 +++ x2goserver-install.patch | 28 ++++ x2goserver.spec | 244 +++++++++++++++++++++++++++++ 7 files changed, 407 insertions(+) create mode 100644 x2gocleansessions.init create mode 100644 x2gocleansessions.service create mode 100644 x2goserver-4.0.1.3-use-pwgen.patch create mode 100644 x2goserver-install.patch create mode 100644 x2goserver.spec diff --git a/.gitignore b/.gitignore index e69de29..a4c2c36 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/x2goserver-4.0.1.6.tar.gz diff --git a/sources b/sources index e69de29..246e879 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +61f2248fb16bc035f92b9588ab19c35e x2goserver-4.0.1.6.tar.gz diff --git a/x2gocleansessions.init b/x2gocleansessions.init new file mode 100644 index 0000000..7418081 --- /dev/null +++ b/x2gocleansessions.init @@ -0,0 +1,104 @@ +#!/bin/sh +# +# x2gocleansessions - Starts/stop the "x2gocleansessions" daemon +# +# chkconfig: - 99 1 +# description: Cleans the X2Go session database + +### BEGIN INIT INFO +# Provides: x2gocleansessions at batch +# Required-Start: $local_fs +# Required-Stop: $local_fs +# Default-Stop: 016 +# Short-Description: Starts/stop the "x2gocleansessions" daemon +# Description: Cleans the X2Go session database +### END INIT INFO + +# Source function library. +. /etc/rc.d/init.d/functions + +exec=/usr/sbin/x2gocleansessions +prog="x2gocleansessions" +config=/etc/sysconfig/x2gocleansessions + +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +lockfile=/var/lock/subsys/$prog + +start() { + [ -x $exec ] || exit 5 + [ -f $config ] || exit 6 + echo -n $"Starting $prog: " + daemon $exec $OPTS + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile +} + +stop() { + echo -n $"Stopping $prog: " + if [ -n "`pidfileofproc $exec`" ] ; then + killproc $exec + RETVAL=3 + else + failure $"Stopping $prog" + fi + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + # run checks to determine if the service is running or use generic status + status $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? diff --git a/x2gocleansessions.service b/x2gocleansessions.service new file mode 100644 index 0000000..8f382f1 --- /dev/null +++ b/x2gocleansessions.service @@ -0,0 +1,8 @@ +[Unit] +Description=X2go session cleanup + +[Service] +ExecStart=/usr/sbin/x2gocleansessions + +[Install] +WantedBy=multi-user.target diff --git a/x2goserver-4.0.1.3-use-pwgen.patch b/x2goserver-4.0.1.3-use-pwgen.patch new file mode 100644 index 0000000..524aa6a --- /dev/null +++ b/x2goserver-4.0.1.3-use-pwgen.patch @@ -0,0 +1,21 @@ +diff -Nru x2goserver-4.0.1.3.orig/x2goserver/sbin/x2godbadmin x2goserver-4.0.1.3/x2goserver/sbin/x2godbadmin +--- x2goserver-4.0.1.3.orig/x2goserver/sbin/x2godbadmin 2013-07-16 10:40:03.517721364 +0200 ++++ x2goserver-4.0.1.3/x2goserver/sbin/x2godbadmin 2013-07-16 10:41:39.992225121 +0200 +@@ -190,7 +190,7 @@ + } + my $dbadmin=$Config->param("postgres.dbadmin"); + my $x2goadmin="x2godbuser"; +-my $x2goadminpass=`makepasswd`; ++my $x2goadminpass=`pwgen 8 1`; + chomp ($x2goadminpass); + my $db="x2go_sessions"; + +@@ -314,7 +314,7 @@ + print "Can not find user ($user)\n"; + return; + } +- $pass=`makepasswd`; ++ $pass=`pwgen 8 1`; + chomp($pass); + + my $sth=$dbh->prepare("DROP OWNED BY \"x2gouser_$user\""); diff --git a/x2goserver-install.patch b/x2goserver-install.patch new file mode 100644 index 0000000..35efd8f --- /dev/null +++ b/x2goserver-install.patch @@ -0,0 +1,28 @@ +diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile +index 4fe806d..c83d36d 100755 +--- a/x2goserver-xsession/Makefile ++++ b/x2goserver-xsession/Makefile +@@ -20,6 +20,8 @@ LIBDIR=$(PREFIX)/lib/x2go + MANDIR=$(PREFIX)/share/man + SHAREDIR=$(PREFIX)/share/x2go + ++XSESSIONDIR ?= /etc/X11/Xsession.d ++ + #BIN_SCRIPTS=$(shell cd bin && echo *) + #SBIN_SCRIPTS=$(shell cd sbin && echo *) + #LIB_FILES=$(shell cd lib && echo *) +@@ -56,12 +58,9 @@ install_scripts: + install_config: + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) + # provide target dirs for X11 related symlinks +- mkdir -p $(DESTDIR)/etc/X11/Xsession.d +- touch $(DESTDIR)/etc/X11/Xsession.options +- $(INSTALL_FILE) etc/Xsession $(DESTDIR)$(ETCDIR)/ ++ $(INSTALL_PROGRAM) etc/Xsession $(DESTDIR)$(ETCDIR)/ + $(INSTALL_SYMLINK) /etc/X11/Xresources $(DESTDIR)$(ETCDIR)/ +- $(INSTALL_SYMLINK) /etc/X11/Xsession.d $(DESTDIR)$(ETCDIR)/ +- $(INSTALL_SYMLINK) /etc/X11/Xsession.options $(DESTDIR)$(ETCDIR)/ ++ $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d + + + install_man: diff --git a/x2goserver.spec b/x2goserver.spec new file mode 100644 index 0000000..8554cf2 --- /dev/null +++ b/x2goserver.spec @@ -0,0 +1,244 @@ +%global checkout 20130722git65169c9 +Name: x2goserver +Version: 4.0.1.6 +Release: 3%{?dist} +Summary: X2Go server daemon scripts + +Group: Applications/Communications +License: GPLv2+ +URL: http://www.x2go.org +Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz +# git clone git://code.x2go.org/x2goserver +# cd x2goserver +# git archive --prefix=x2goserver-4.1.0.0-20130722git65169c9/ 65169c9d65b117802e50631be0bbd719163d969e | gzip > ../x2goserver-4.1.0.0-20130722git65169c9.tar.gz +#Source0: %{name}/%{name}-%{version}-%{checkout}.tar.gz +Source1: x2gocleansessions.service +Source2: x2gocleansessions.init + +Patch0: x2goserver-4.0.1.3-use-pwgen.patch +Patch1: x2goserver-install.patch + +BuildRequires: perl(ExtUtils::MakeMaker) +%if 0%{?fedora} +BuildRequires: man2html-core +%else +BuildRequires: man +%endif +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: x2goagent +Requires: pwgen +# For /etc/X11/Xresources +Requires: xorg-x11-xinit +Requires: xorg-x11-fonts-misc +# We need a database +Requires: perl(DBD::SQLite) +# For printing, file-sharing +Requires: sshfs +Requires(pre): shadow-utils + +%{?perl_default_filter} + +%description +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 main daemon and tools for X2Go server-side session +administrations. + + +%package printing +Summary: X2Go server printing support +Requires: %{name} = %{version}-%{release} + +%description printing +The X2Go server printing package provides client-side printing support for +X2Go. + +This package has to be installed on X2Go servers that shall be able to pass +X2Go print jobs on to the X2Go client. + +This package co-operates with the cups-x2go CUPS backend. If CUPS server and +X2Go server are hosted on different machines, then make sure you install +this package on the X2Go server(s) (and the cups-x2go package on the CUPS +server). + + +%prep +%setup -q +%patch0 -p1 -b .pwgen +%patch1 -p1 -b .install + +# Set pach +#find -type f | xargs sed -i -r -e '/^((LIBDIR|X2GO_LIB_PATH)=|use lib|my \$x2go_lib_path)/s,/lib/,/%{_lib}/,' +find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' +sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath +# Don't try to be root +sed -i -e 's/-o root -g root//' */Makefile +# Perl pure_install +sed -i -e 's/perl install/perl pure_install/' Makefile + + +%build +export PATH=%{_qt4_bindir}:$PATH +make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} + + +%install +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} XSESSIONDIR=/etc/X11/xinit/Xclients.d + +# Make symbolic link relative +rm %{buildroot}%{_sysconfdir}/x2go/Xresources +ln -s ../X11/Xresources %{buildroot}%{_sysconfdir}/x2go/ + +# Remove placeholder files +rm %{buildroot}%{_libdir}/x2go/extensions/*.d/.placeholder + +# x2gouser homedir, state dir +mkdir -p %{buildroot}%{_sharedstatedir}/x2go +# Create empty session file for %%ghost +touch %{buildroot}%{_sharedstatedir}/x2go/x2go_sessions + +# Printing spool dir +mkdir -p %{buildroot}%{_localstatedir}/spool/x2goprint + +%if 0%{?fedora} +# System.d session cleanup script +mkdir -p %{buildroot}%{_unitdir} +install -pm0644 %SOURCE1 %{buildroot}%{_unitdir} +%else +# SysV session cleanup script +mkdir -p %{buildroot}%{_initddir} +install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2gocleansessions +%endif + +%pre +getent group x2gouser >/dev/null || groupadd -r x2gouser +getent passwd x2gouser >/dev/null || \ + useradd -r -g x2gouser -d /var/lib/x2go -s /sbin/nologin \ + -c "x2go" x2gouser +exit 0 + +%post +# Initialize the session database +[ ! -f %{_sharedstatedir}/x2go/x2go_sessions ] && + %{_sbindir}/x2godbadmin --createdb || : + +%if 0%{?fedora} +%systemd_post x2gocleansessions.service + +%preun +%systemd_preun x2gocleansessions.service + +%postun +%systemd_postun x2gocleansessions.service +%else +/sbin/chkconfig --add x2gocleansessions + +%preun +if [ "$1" = 0 ]; then + /sbin/chkconfig --del x2gocleansessions +fi +%endif + +%pre printing +getent group x2goprint >/dev/null || groupadd -r x2goprint +getent passwd x2goprint >/dev/null || \ + useradd -r -g x2goprint -d /var/spool/x2goprint -s /sbin/nologin \ + -c "x2go" x2goprint +exit 0 + + +%files +%doc debian/copyright +%dir %{_sysconfdir}/x2go/ +%config(noreplace) %{_sysconfdir}/x2go/x* +%{_sysconfdir}/x2go/Xresources +%{_sysconfdir}/x2go/Xsession +%{_sysconfdir}/x2go/Xsession.d +%{_bindir}/x2go* +%exclude %{_bindir}/x2goprint +%dir %{_libdir}/x2go +%{_libdir}/x2go/extensions +%{_libdir}/x2go/x2gosqlitewrapper.pl +%attr(02755,root,x2gouser) %{_libdir}/x2go/x2gosqlitewrapper +%{_libdir}/x2go/x2gochangestatus +%{_libdir}/x2go/x2gocreatesession +%{_libdir}/x2go/x2godbwrapper.pm +%{_libdir}/x2go/x2gogetagent +%{_libdir}/x2go/x2gogetdisplays +%{_libdir}/x2go/x2gogetports +%{_libdir}/x2go/x2gogetstatus +%{_libdir}/x2go/x2goinsertport +%{_libdir}/x2go/x2goinsertsession +%{_libdir}/x2go/x2golistsessions_sql +%{_libdir}/x2go/x2gologlevel +%{_libdir}/x2go/x2gologlevel.pm +%{_libdir}/x2go/x2goresume +%{_libdir}/x2go/x2gormport +%{_libdir}/x2go/x2gosuspend-agent +%{_libdir}/x2go/x2gosyslog +%{_sbindir}/x2go* +%{_mandir}/man8/x2go*.8.gz +%exclude %{_mandir}/man8/x2goprint.8.gz +%{_datadir}/x2go/ +%exclude %{_datadir}/x2go/versions/VERSION.x2goserver-printing +%exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features +%attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/ +%ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions +%if 0%{?fedora} +%{_unitdir}/x2gocleansessions.service +%else +%{_initddir}/x2gocleansessions +%endif + +%files printing +%{_bindir}/x2goprint +%{_mandir}/man8/x2goprint.8.gz +%{_datadir}/x2go/versions/VERSION.x2goserver-printing +%{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features +%attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint + +%changelog +* Tue Jul 30 2013 Orion Poplawski - 4.0.1.6-3 +- Mark /var/lib/x2go as a directory +- Add patch to make the following changes: +- Remove Xsession.options +- Make /etc/x2go/Xsession.d point to /etc/X11/xinit/Xclients.d +- Make /etc/x2go/Xsession executable + +* Mon Jul 29 2013 Orion Poplawski - 4.0.1.6-2 +- Add SysV init script for EL6 + +* Mon Jul 29 2013 Orion Poplawski - 4.0.1.6-1 +- Use 4.0.1.6 release +- Drop patches applied upstream + +* Mon Jul 22 2013 Rok Mandeljc - 4.1.0.0-0.4.20130722git65169c9 +- Update to latest git +- Use PREFIX=%{_prefix} when building, not just when installing. +- Use pwgen instead of makepasswd, which is not available on Fedora. +- Fixed a missing function import in x2golistsessions. +- Added dependencies for xorg-x11-fonts-misc +- Added system.d script for session cleanup on start. +- Fixed x2goruncommand for TERMINAL -> gnome-terminal; the latter seems to return immediately in Fedora 19. + +* Thu May 30 2013 Orion Poplawski - 4.1.0.0-0.3.20130520gitbd2cfe4 +- Update to latest git +- Split out printing sub-package + +* Wed Jan 23 2013 Orion Poplawski - 4.1.0.0-0.2.20130122git +- Add post script to create session database if needed + +* Tue Jan 22 2013 Orion Poplawski - 4.1.0.0-0.1.20130122git +- Update to 4.1.0.0 git + +* Fri Jan 18 2013 Orion Poplawski - 4.0.0.0-1 +- Update to 4.0.0.0 + +* Tue Dec 11 2012 Orion Poplawski - 3.1.1.9-1 +- Initial Fedora package From 8d7afbc1ca6241dab0fb248d9588eaa8d89055d9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 02:28:10 -0500 Subject: [PATCH 002/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 8554cf2..acd245e 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ %global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: X2Go server daemon scripts Group: Applications/Communications @@ -204,6 +204,9 @@ exit 0 %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 4.0.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jul 30 2013 Orion Poplawski - 4.0.1.6-3 - Mark /var/lib/x2go as a directory - Add patch to make the following changes: From 3bb81ad155d84408d370f45a4ea2235338ae64c5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 4 Aug 2013 16:12:30 -0600 Subject: [PATCH 003/113] Add BR systemd on Fedora --- x2goserver.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/x2goserver.spec b/x2goserver.spec index acd245e..b17f26d 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -21,6 +21,7 @@ Patch1: x2goserver-install.patch BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} BuildRequires: man2html-core +BuildRequires: systemd %else BuildRequires: man %endif From df5e571e14dd342d32a356140b2b565257d92e56 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 11 Sep 2013 14:38:52 -0600 Subject: [PATCH 004/113] Add some needed requires --- x2goserver.spec | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index b17f26d..7ed1cfb 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ %global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: X2Go server daemon scripts Group: Applications/Communications @@ -25,16 +25,23 @@ BuildRequires: systemd %else BuildRequires: man %endif +# For x2goruncommand - for now +Requires: bc +# For netstat in x2goresume-session +Requires: net-tools +Requires: openssh-server Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: x2goagent +# We need a database +Requires: perl(DBD::SQLite) +# For killall in x2gosuspend-session +Requires: psmisc Requires: pwgen +# For printing, file-sharing +Requires: sshfs +Requires: x2goagent # For /etc/X11/Xresources Requires: xorg-x11-xinit Requires: xorg-x11-fonts-misc -# We need a database -Requires: perl(DBD::SQLite) -# For printing, file-sharing -Requires: sshfs Requires(pre): shadow-utils %{?perl_default_filter} @@ -205,6 +212,9 @@ exit 0 %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint %changelog +* Wed Sep 11 2013 Orion Poplawski - 4.0.1.6-5 +- Add some needed requires + * Sun Aug 04 2013 Fedora Release Engineering - 4.0.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 2bebf8fd366591ff82151fb680f0285d769b296d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 22 Oct 2013 12:36:13 -0600 Subject: [PATCH 005/113] Fix bug in x2gocleansessions init script, enable by default --- x2gocleansessions.init | 4 ++-- x2goserver.spec | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/x2gocleansessions.init b/x2gocleansessions.init index 7418081..c3a7eda 100644 --- a/x2gocleansessions.init +++ b/x2gocleansessions.init @@ -2,13 +2,14 @@ # # x2gocleansessions - Starts/stop the "x2gocleansessions" daemon # -# chkconfig: - 99 1 +# chkconfig: 2345 99 1 # description: Cleans the X2Go session database ### BEGIN INIT INFO # Provides: x2gocleansessions at batch # Required-Start: $local_fs # Required-Stop: $local_fs +# Default-Start: 2345 # Default-Stop: 016 # Short-Description: Starts/stop the "x2gocleansessions" daemon # Description: Cleans the X2Go session database @@ -27,7 +28,6 @@ lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 echo -n $"Starting $prog: " daemon $exec $OPTS retval=$? diff --git a/x2goserver.spec b/x2goserver.spec index 7ed1cfb..2e2812d 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ %global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: X2Go server daemon scripts Group: Applications/Communications @@ -147,8 +147,14 @@ exit 0 %else /sbin/chkconfig --add x2gocleansessions +%postun +if [ "$1" -ge "1" ] ; then + /sbin/service x2gocleansessions condrestart >/dev/null 2>&1 || : +fi + %preun if [ "$1" = 0 ]; then + /sbin/service x2gocleansessions stop >/dev/null 2>&1 /sbin/chkconfig --del x2gocleansessions fi %endif @@ -212,6 +218,9 @@ exit 0 %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint %changelog +* Tue Oct 22 2013 Orion Poplawski - 4.0.1.6-6 +- Fix bug in x2gocleansessions init script, enable by default + * Wed Sep 11 2013 Orion Poplawski - 4.0.1.6-5 - Add some needed requires From ee0ef31958e5cee3063164c5dc16293800bbaf9d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 23 Nov 2013 20:37:18 -0700 Subject: [PATCH 006/113] Update to 4.0.1.8 --- .gitignore | 1 + sources | 2 +- x2goserver-4.0.1.3-use-pwgen.patch | 21 --------------------- x2goserver-install.patch | 28 ---------------------------- x2goserver-pwgen.patch | 21 +++++++++++++++++++++ x2goserver.spec | 14 ++++++++------ 6 files changed, 31 insertions(+), 56 deletions(-) delete mode 100644 x2goserver-4.0.1.3-use-pwgen.patch delete mode 100644 x2goserver-install.patch create mode 100644 x2goserver-pwgen.patch diff --git a/.gitignore b/.gitignore index a4c2c36..667850e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /x2goserver-4.0.1.6.tar.gz +/x2goserver-4.0.1.8.tar.gz diff --git a/sources b/sources index 246e879..0d65691 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61f2248fb16bc035f92b9588ab19c35e x2goserver-4.0.1.6.tar.gz +754ee94f2b4b57fc08973027a174cf81 x2goserver-4.0.1.8.tar.gz diff --git a/x2goserver-4.0.1.3-use-pwgen.patch b/x2goserver-4.0.1.3-use-pwgen.patch deleted file mode 100644 index 524aa6a..0000000 --- a/x2goserver-4.0.1.3-use-pwgen.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nru x2goserver-4.0.1.3.orig/x2goserver/sbin/x2godbadmin x2goserver-4.0.1.3/x2goserver/sbin/x2godbadmin ---- x2goserver-4.0.1.3.orig/x2goserver/sbin/x2godbadmin 2013-07-16 10:40:03.517721364 +0200 -+++ x2goserver-4.0.1.3/x2goserver/sbin/x2godbadmin 2013-07-16 10:41:39.992225121 +0200 -@@ -190,7 +190,7 @@ - } - my $dbadmin=$Config->param("postgres.dbadmin"); - my $x2goadmin="x2godbuser"; --my $x2goadminpass=`makepasswd`; -+my $x2goadminpass=`pwgen 8 1`; - chomp ($x2goadminpass); - my $db="x2go_sessions"; - -@@ -314,7 +314,7 @@ - print "Can not find user ($user)\n"; - return; - } -- $pass=`makepasswd`; -+ $pass=`pwgen 8 1`; - chomp($pass); - - my $sth=$dbh->prepare("DROP OWNED BY \"x2gouser_$user\""); diff --git a/x2goserver-install.patch b/x2goserver-install.patch deleted file mode 100644 index 35efd8f..0000000 --- a/x2goserver-install.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile -index 4fe806d..c83d36d 100755 ---- a/x2goserver-xsession/Makefile -+++ b/x2goserver-xsession/Makefile -@@ -20,6 +20,8 @@ LIBDIR=$(PREFIX)/lib/x2go - MANDIR=$(PREFIX)/share/man - SHAREDIR=$(PREFIX)/share/x2go - -+XSESSIONDIR ?= /etc/X11/Xsession.d -+ - #BIN_SCRIPTS=$(shell cd bin && echo *) - #SBIN_SCRIPTS=$(shell cd sbin && echo *) - #LIB_FILES=$(shell cd lib && echo *) -@@ -56,12 +58,9 @@ install_scripts: - install_config: - $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) - # provide target dirs for X11 related symlinks -- mkdir -p $(DESTDIR)/etc/X11/Xsession.d -- touch $(DESTDIR)/etc/X11/Xsession.options -- $(INSTALL_FILE) etc/Xsession $(DESTDIR)$(ETCDIR)/ -+ $(INSTALL_PROGRAM) etc/Xsession $(DESTDIR)$(ETCDIR)/ - $(INSTALL_SYMLINK) /etc/X11/Xresources $(DESTDIR)$(ETCDIR)/ -- $(INSTALL_SYMLINK) /etc/X11/Xsession.d $(DESTDIR)$(ETCDIR)/ -- $(INSTALL_SYMLINK) /etc/X11/Xsession.options $(DESTDIR)$(ETCDIR)/ -+ $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d - - - install_man: diff --git a/x2goserver-pwgen.patch b/x2goserver-pwgen.patch new file mode 100644 index 0000000..98cc0d4 --- /dev/null +++ b/x2goserver-pwgen.patch @@ -0,0 +1,21 @@ +diff -up x2goserver-4.0.1.8/x2goserver/sbin/x2godbadmin.pwgen x2goserver-4.0.1.8/x2goserver/sbin/x2godbadmin +--- x2goserver-4.0.1.8/x2goserver/sbin/x2godbadmin.pwgen 2013-11-22 14:17:40.000000000 -0700 ++++ x2goserver-4.0.1.8/x2goserver/sbin/x2godbadmin 2013-11-23 20:33:57.911892193 -0700 +@@ -190,7 +190,7 @@ if (!$sslmode) + } + my $dbadmin=$Config->param("postgres.dbadmin"); + my $x2goadmin="x2godbuser"; +-my $x2goadminpass=`makepasswd`; ++my $x2goadminpass=`pwgen 8 1`; + chomp ($x2goadminpass); + my $db="x2go_sessions"; + +@@ -317,7 +317,7 @@ sub add_user() + print "The super-user \"root\" is not allowed to use X2Go\n"; + return; + } +- $pass=`makepasswd`; ++ $pass=`pwgen 8 1`; + chomp($pass); + + my $sth=$dbh->prepare("DROP OWNED BY \"x2gouser_$user\""); diff --git a/x2goserver.spec b/x2goserver.spec index 2e2812d..a24ca48 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ -%global checkout 20130722git65169c9 +#global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.6 -Release: 6%{?dist} +Version: 4.0.1.8 +Release: 1%{?dist} Summary: X2Go server daemon scripts Group: Applications/Communications @@ -15,8 +15,8 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. Source1: x2gocleansessions.service Source2: x2gocleansessions.init -Patch0: x2goserver-4.0.1.3-use-pwgen.patch -Patch1: x2goserver-install.patch +# Use pwgen instead of makepasswd which is not in Fedora +Patch0: x2goserver-pwgen.patch BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} @@ -79,7 +79,6 @@ server). %prep %setup -q %patch0 -p1 -b .pwgen -%patch1 -p1 -b .install # Set pach #find -type f | xargs sed -i -r -e '/^((LIBDIR|X2GO_LIB_PATH)=|use lib|my \$x2go_lib_path)/s,/lib/,/%{_lib}/,' @@ -218,6 +217,9 @@ exit 0 %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint %changelog +* Sat Nov 23 2013 Orion Poplawski - 4.0.1.8-1 +- Update to 4.0.1.8 + * Tue Oct 22 2013 Orion Poplawski - 4.0.1.6-6 - Fix bug in x2gocleansessions init script, enable by default From b0ac950b0461917efbcfb235a5df1d6cbc1b67ba Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 23 Nov 2013 20:46:58 -0700 Subject: [PATCH 007/113] New files; require sudo for /etc/sudoers.d --- x2goserver.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/x2goserver.spec b/x2goserver.spec index a24ca48..2c3ee34 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -38,6 +38,8 @@ Requires: psmisc Requires: pwgen # For printing, file-sharing Requires: sshfs +# For /etc/sudoers.d +Requires: sudo Requires: x2goagent # For /etc/X11/Xresources Requires: xorg-x11-xinit @@ -168,8 +170,10 @@ exit 0 %files %doc debian/copyright +%config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %dir %{_sysconfdir}/x2go/ %config(noreplace) %{_sysconfdir}/x2go/x* +%config(noreplace) %{_sysconfdir}/x2go/Xsession.options %{_sysconfdir}/x2go/Xresources %{_sysconfdir}/x2go/Xsession %{_sysconfdir}/x2go/Xsession.d From 8b3ac884606ca2394af132d4a465cb75de781210 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 23 Nov 2013 20:50:57 -0700 Subject: [PATCH 008/113] Create /tmp/.X11-unix in x2gocleansessions init script --- x2gocleansessions.init | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/x2gocleansessions.init b/x2gocleansessions.init index c3a7eda..aa551ac 100644 --- a/x2gocleansessions.init +++ b/x2gocleansessions.init @@ -21,6 +21,7 @@ exec=/usr/sbin/x2gocleansessions prog="x2gocleansessions" config=/etc/sysconfig/x2gocleansessions +XSOCKDIR=/tmp/.X11-unix [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -28,6 +29,12 @@ lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 + # Make sure these are created by default so that nobody else can + if [ ! -d $XSOCKDIR ] + then + mkdir $XSOCKDIR + chmod 1777 $XSOCKDIR + fi echo -n $"Starting $prog: " daemon $exec $OPTS retval=$? From 3b55d88d81a06ce53f4b411cc0e338fc95ebf107 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 23 Nov 2013 20:59:24 -0700 Subject: [PATCH 009/113] Fix x2gocleansessions shutdown --- x2gocleansessions.init | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/x2gocleansessions.init b/x2gocleansessions.init index aa551ac..9cbd411 100644 --- a/x2gocleansessions.init +++ b/x2gocleansessions.init @@ -44,15 +44,10 @@ start() { stop() { echo -n $"Stopping $prog: " - if [ -n "`pidfileofproc $exec`" ] ; then - killproc $exec - RETVAL=3 - else - failure $"Stopping $prog" - fi + killproc $exec retval=$? echo - [ $retval -eq 0 ] && rm -f $lockfile + rm -f $lockfile } restart() { From ddcfe0e638938844f5be5b0adf5c4dc6dbff1f62 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 23 Nov 2013 21:03:05 -0700 Subject: [PATCH 010/113] Add changelog entry --- x2goserver.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/x2goserver.spec b/x2goserver.spec index 2c3ee34..5be63f0 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -223,6 +223,7 @@ exit 0 %changelog * Sat Nov 23 2013 Orion Poplawski - 4.0.1.8-1 - Update to 4.0.1.8 +- Fix x2gocleansessions init script for EL6 (bug #1031150) * Tue Oct 22 2013 Orion Poplawski - 4.0.1.6-6 - Fix bug in x2gocleansessions init script, enable by default From 5b885d27722c5c4a5ef11f95159130a51ee04080 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 27 Nov 2013 10:26:07 -0700 Subject: [PATCH 011/113] Use mktemp instead of tempfile --- x2goserver-mktemp.patch | 24 ++++++++++++++++++++++++ x2goserver.spec | 8 +++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 x2goserver-mktemp.patch diff --git a/x2goserver-mktemp.patch b/x2goserver-mktemp.patch new file mode 100644 index 0000000..dad5061 --- /dev/null +++ b/x2goserver-mktemp.patch @@ -0,0 +1,24 @@ +diff -up x2goserver-4.0.1.8/x2goserver-xsession/etc/Xsession.mktemp x2goserver-4.0.1.8/x2goserver-xsession/etc/Xsession +--- x2goserver-4.0.1.8/x2goserver-xsession/etc/Xsession.mktemp 2013-11-25 14:02:26.170734637 -0700 ++++ x2goserver-4.0.1.8/x2goserver-xsession/etc/Xsession 2013-11-25 14:07:54.704734793 -0700 +@@ -74,7 +74,7 @@ ERRFILE=$HOME/.xsession-x2go-errors + if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && + [ ! -L "$ERRFILE" ]; then + chmod 600 "$ERRFILE" +-elif ERRFILE=$(tempfile 2> /dev/null); then ++elif ERRFILE=$(mktemp 2> /dev/null); then + if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-x2go-$USER"; then + message "warning: unable to symlink \"$TMPDIR/xsession-x2go-$USER\" to" \ + "\"$ERRFILE\"; look for session log/errors in" \ +@@ -96,9 +96,9 @@ fi + # Attempt to create a file of non-zero length in /tmp; a full filesystem can + # cause mysterious X session failures. We do not use touch, :, or test -w + # because they won't actually create a file with contents. We also let standard +-# error from tempfile and echo go to the error file to aid the user in ++# error from mktemp and echo go to the error file to aid the user in + # determining what went wrong. +-WRITE_TEST=$(tempfile) ++WRITE_TEST=$(mktemp) + if ! echo "*" >>"$WRITE_TEST"; then + message "warning: unable to write to ${WRITE_TEST%/*}; X session (X2Go) may" \ + "exit with an error" diff --git a/x2goserver.spec b/x2goserver.spec index 5be63f0..70134b1 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go server daemon scripts Group: Applications/Communications @@ -17,6 +17,8 @@ Source2: x2gocleansessions.init # Use pwgen instead of makepasswd which is not in Fedora Patch0: x2goserver-pwgen.patch +# Use mktemp instead of tempfile +Patch1: x2goserver-mktemp.patch BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} @@ -81,6 +83,7 @@ server). %prep %setup -q %patch0 -p1 -b .pwgen +%patch1 -p1 -b .mktemp # Set pach #find -type f | xargs sed -i -r -e '/^((LIBDIR|X2GO_LIB_PATH)=|use lib|my \$x2go_lib_path)/s,/lib/,/%{_lib}/,' @@ -221,6 +224,9 @@ exit 0 %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint %changelog +* Wed Nov 27 2013 Orion Poplawski - 4.0.1.8-2 +- Use mktemp instead of tempfile + * Sat Nov 23 2013 Orion Poplawski - 4.0.1.8-1 - Update to 4.0.1.8 - Fix x2gocleansessions init script for EL6 (bug #1031150) From 346c8672ffa915608401babf8d66723389dcdbcc Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 27 Nov 2013 16:31:32 -0700 Subject: [PATCH 012/113] BR xorg-x11-xinit for Xsession.d link creation --- x2goserver.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x2goserver.spec b/x2goserver.spec index 70134b1..556375b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -27,6 +27,8 @@ BuildRequires: systemd %else BuildRequires: man %endif +# So XSESSIONDIR gets linked +BuildRequires: xorg-x11-xinit # For x2goruncommand - for now Requires: bc # For netstat in x2goresume-session @@ -226,6 +228,7 @@ exit 0 %changelog * Wed Nov 27 2013 Orion Poplawski - 4.0.1.8-2 - Use mktemp instead of tempfile +- BR xorg-x11-xinit for Xsession.d link creation * Sat Nov 23 2013 Orion Poplawski - 4.0.1.8-1 - Update to 4.0.1.8 From e84224c20fa1fe72a230540610bd4c7f0ef05801 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 27 Nov 2013 17:29:46 -0700 Subject: [PATCH 013/113] Add patch to fix keyboard setting (bug #1033876) --- x2goserver-keyboard.patch | 12 ++++++++++++ x2goserver.spec | 5 +++++ 2 files changed, 17 insertions(+) create mode 100644 x2goserver-keyboard.patch diff --git a/x2goserver-keyboard.patch b/x2goserver-keyboard.patch new file mode 100644 index 0000000..0c74541 --- /dev/null +++ b/x2goserver-keyboard.patch @@ -0,0 +1,12 @@ +diff -up x2goserver-4.0.1.8/x2goserver/bin/x2gostartagent.keyboard x2goserver-4.0.1.8/x2goserver/bin/x2gostartagent +--- x2goserver-4.0.1.8/x2goserver/bin/x2gostartagent.keyboard 2013-11-27 16:33:59.710404632 -0700 ++++ x2goserver-4.0.1.8/x2goserver/bin/x2gostartagent 2013-11-27 17:24:00.999159217 -0700 +@@ -331,7 +331,7 @@ X2GO_SND_PORT=1024 + + $X2GO_LIB_PATH/x2gocreatesession "$X2GO_COOKIE" "$X2GO_AGENT_PID" "$X2GO_CLIENT" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" "$SESSION_NAME" > /dev/null + +-if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" != "auto" ]; then ++if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ]; then + $X2GO_LIB_PATH/x2gosyslog "$0" "info" "blocking creation of agent's keyboard file ${SESSION_DIR}/keyboard as requested by session startup command" + mkdir -p ${SESSION_DIR}/keyboard + fi diff --git a/x2goserver.spec b/x2goserver.spec index 556375b..8e49aab 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -19,6 +19,9 @@ Source2: x2gocleansessions.init Patch0: x2goserver-pwgen.patch # Use mktemp instead of tempfile Patch1: x2goserver-mktemp.patch +# Fix keyboard setting +# https://bugzilla.redhat.com/show_bug.cgi?id=1033876 +Patch2: x2goserver-keyboard.patch BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} @@ -86,6 +89,7 @@ server). %setup -q %patch0 -p1 -b .pwgen %patch1 -p1 -b .mktemp +%patch2 -p1 -b .keyboard # Set pach #find -type f | xargs sed -i -r -e '/^((LIBDIR|X2GO_LIB_PATH)=|use lib|my \$x2go_lib_path)/s,/lib/,/%{_lib}/,' @@ -229,6 +233,7 @@ exit 0 * Wed Nov 27 2013 Orion Poplawski - 4.0.1.8-2 - Use mktemp instead of tempfile - BR xorg-x11-xinit for Xsession.d link creation +- Add patch to fix keyboard setting (bug #1033876) * Sat Nov 23 2013 Orion Poplawski - 4.0.1.8-1 - Update to 4.0.1.8 From 5d6738da376d81655e60f5fac78ca4a751e626f9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 2 Dec 2013 15:33:44 -0700 Subject: [PATCH 014/113] - Update to 4.0.1.9 - Drop incorrect keyboard patch --- .gitignore | 1 + sources | 2 +- x2goserver-keyboard.patch | 12 ------------ x2goserver.spec | 12 ++++++------ 4 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 x2goserver-keyboard.patch diff --git a/.gitignore b/.gitignore index 667850e..ce856cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /x2goserver-4.0.1.6.tar.gz /x2goserver-4.0.1.8.tar.gz +/x2goserver-4.0.1.9.tar.gz diff --git a/sources b/sources index 0d65691..81597b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -754ee94f2b4b57fc08973027a174cf81 x2goserver-4.0.1.8.tar.gz +149fa59d130b1b57a39ee06e5e7fbac0 x2goserver-4.0.1.9.tar.gz diff --git a/x2goserver-keyboard.patch b/x2goserver-keyboard.patch deleted file mode 100644 index 0c74541..0000000 --- a/x2goserver-keyboard.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up x2goserver-4.0.1.8/x2goserver/bin/x2gostartagent.keyboard x2goserver-4.0.1.8/x2goserver/bin/x2gostartagent ---- x2goserver-4.0.1.8/x2goserver/bin/x2gostartagent.keyboard 2013-11-27 16:33:59.710404632 -0700 -+++ x2goserver-4.0.1.8/x2goserver/bin/x2gostartagent 2013-11-27 17:24:00.999159217 -0700 -@@ -331,7 +331,7 @@ X2GO_SND_PORT=1024 - - $X2GO_LIB_PATH/x2gocreatesession "$X2GO_COOKIE" "$X2GO_AGENT_PID" "$X2GO_CLIENT" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" "$SESSION_NAME" > /dev/null - --if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" != "auto" ]; then -+if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ]; then - $X2GO_LIB_PATH/x2gosyslog "$0" "info" "blocking creation of agent's keyboard file ${SESSION_DIR}/keyboard as requested by session startup command" - mkdir -p ${SESSION_DIR}/keyboard - fi diff --git a/x2goserver.spec b/x2goserver.spec index 8e49aab..cd4ea85 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.8 -Release: 2%{?dist} +Version: 4.0.1.9 +Release: 1%{?dist} Summary: X2Go server daemon scripts Group: Applications/Communications @@ -19,9 +19,6 @@ Source2: x2gocleansessions.init Patch0: x2goserver-pwgen.patch # Use mktemp instead of tempfile Patch1: x2goserver-mktemp.patch -# Fix keyboard setting -# https://bugzilla.redhat.com/show_bug.cgi?id=1033876 -Patch2: x2goserver-keyboard.patch BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} @@ -89,7 +86,6 @@ server). %setup -q %patch0 -p1 -b .pwgen %patch1 -p1 -b .mktemp -%patch2 -p1 -b .keyboard # Set pach #find -type f | xargs sed -i -r -e '/^((LIBDIR|X2GO_LIB_PATH)=|use lib|my \$x2go_lib_path)/s,/lib/,/%{_lib}/,' @@ -230,6 +226,10 @@ exit 0 %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint %changelog +* Mon Dec 2 2013 Orion Poplawski - 4.0.1.9-1 +- Update to 4.0.1.9 +- Drop incorrect keyboard patch + * Wed Nov 27 2013 Orion Poplawski - 4.0.1.8-2 - Use mktemp instead of tempfile - BR xorg-x11-xinit for Xsession.d link creation From 61cf400b7229802609c6421a14121706727c3972 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 7 Dec 2013 22:32:41 -0700 Subject: [PATCH 015/113] Disable Xsession support for now - Debian specific (Bug #1038834) --- x2goserver.spec | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index cd4ea85..7b5e3fa 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go server daemon scripts Group: Applications/Communications @@ -87,14 +87,15 @@ server). %patch0 -p1 -b .pwgen %patch1 -p1 -b .mktemp -# Set pach -#find -type f | xargs sed -i -r -e '/^((LIBDIR|X2GO_LIB_PATH)=|use lib|my \$x2go_lib_path)/s,/lib/,/%{_lib}/,' +# Set path find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath # Don't try to be root sed -i -e 's/-o root -g root//' */Makefile # Perl pure_install sed -i -e 's/perl install/perl pure_install/' Makefile +# Do not ship xsession - Debian specific +sed -i -e '/xsession/s/^/#/' Makefile %build @@ -105,9 +106,9 @@ make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=% %install make install DESTDIR=%{buildroot} PREFIX=%{_prefix} XSESSIONDIR=/etc/X11/xinit/Xclients.d -# Make symbolic link relative -rm %{buildroot}%{_sysconfdir}/x2go/Xresources -ln -s ../X11/Xresources %{buildroot}%{_sysconfdir}/x2go/ +# Make symbolic link relative (xsession - disabled for now) +#rm %{buildroot}%{_sysconfdir}/x2go/Xresources +#ln -s ../X11/Xresources %{buildroot}%{_sysconfdir}/x2go/ # Remove placeholder files rm %{buildroot}%{_libdir}/x2go/extensions/*.d/.placeholder @@ -178,10 +179,11 @@ exit 0 %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %dir %{_sysconfdir}/x2go/ %config(noreplace) %{_sysconfdir}/x2go/x* -%config(noreplace) %{_sysconfdir}/x2go/Xsession.options -%{_sysconfdir}/x2go/Xresources -%{_sysconfdir}/x2go/Xsession -%{_sysconfdir}/x2go/Xsession.d +# xsession - disabled for now +#%config(noreplace) %{_sysconfdir}/x2go/Xsession.options +#%{_sysconfdir}/x2go/Xresources +#%{_sysconfdir}/x2go/Xsession +#%{_sysconfdir}/x2go/Xsession.d %{_bindir}/x2go* %exclude %{_bindir}/x2goprint %dir %{_libdir}/x2go @@ -226,6 +228,9 @@ exit 0 %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint %changelog +* Sat Dec 7 2013 Orion Poplawski - 4.0.1.9-2 +- Disable Xsession support for now - Debian specific (Bug #1038834) + * Mon Dec 2 2013 Orion Poplawski - 4.0.1.9-1 - Update to 4.0.1.9 - Drop incorrect keyboard patch From b595adf211e9dba98ad383452b5009c87fb65c0f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 31 Dec 2013 10:43:00 -0700 Subject: [PATCH 016/113] Sync some items to upstream spec --- x2goserver.spec | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 7b5e3fa..49e3552 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.0.1.9 Release: 2%{?dist} -Summary: X2Go server daemon scripts +Summary: X2Go Server Group: Applications/Communications License: GPLv2+ @@ -31,6 +31,8 @@ BuildRequires: man BuildRequires: xorg-x11-xinit # For x2goruncommand - for now Requires: bc +# For x2goshowblocks +Requires: lsof # For netstat in x2goresume-session Requires: net-tools Requires: openssh-server @@ -39,6 +41,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi Requires: perl(DBD::SQLite) # For killall in x2gosuspend-session Requires: psmisc +# For x2godbadmin Requires: pwgen # For printing, file-sharing Requires: sshfs @@ -56,7 +59,7 @@ Requires(pre): shadow-utils X2Go is a server based computing environment with - session resuming - low bandwidth support - - LDAP support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick @@ -66,11 +69,11 @@ administrations. %package printing -Summary: X2Go server printing support +Summary: X2Go Server printing support Requires: %{name} = %{version}-%{release} %description printing -The X2Go server printing package provides client-side printing support for +The X2Go Server printing package provides client-side printing support for X2Go. This package has to be installed on X2Go servers that shall be able to pass @@ -140,8 +143,9 @@ exit 0 %post # Initialize the session database -[ ! -f %{_sharedstatedir}/x2go/x2go_sessions ] && - %{_sbindir}/x2godbadmin --createdb || : +[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && + egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 && + %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || : %if 0%{?fedora} %systemd_post x2gocleansessions.service @@ -175,15 +179,10 @@ exit 0 %files -%doc debian/copyright +%doc debian/changelog debian/copyright %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %dir %{_sysconfdir}/x2go/ %config(noreplace) %{_sysconfdir}/x2go/x* -# xsession - disabled for now -#%config(noreplace) %{_sysconfdir}/x2go/Xsession.options -#%{_sysconfdir}/x2go/Xresources -#%{_sysconfdir}/x2go/Xsession -#%{_sysconfdir}/x2go/Xsession.d %{_bindir}/x2go* %exclude %{_bindir}/x2goprint %dir %{_libdir}/x2go @@ -222,10 +221,10 @@ exit 0 %files printing %{_bindir}/x2goprint -%{_mandir}/man8/x2goprint.8.gz %{_datadir}/x2go/versions/VERSION.x2goserver-printing %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint +%{_mandir}/man8/x2goprint.8.gz %changelog * Sat Dec 7 2013 Orion Poplawski - 4.0.1.9-2 From b33a8de14864c0100504fb6f65a59bb6cf6cc120 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 3 Jan 2014 10:41:52 -0700 Subject: [PATCH 017/113] - Update to 4.0.1.10 - Drop pwgen and mktemp patches applied upstream --- .gitignore | 1 + sources | 2 +- x2goserver-mimetype.patch | 12 ++++++ x2goserver-mktemp.patch | 24 ------------ x2goserver-pwgen.patch | 21 ----------- x2goserver.spec | 79 +++++++++++++++++++++++++++++++++------ 6 files changed, 82 insertions(+), 57 deletions(-) create mode 100644 x2goserver-mimetype.patch delete mode 100644 x2goserver-mktemp.patch delete mode 100644 x2goserver-pwgen.patch diff --git a/.gitignore b/.gitignore index ce856cc..3612d65 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /x2goserver-4.0.1.6.tar.gz /x2goserver-4.0.1.8.tar.gz /x2goserver-4.0.1.9.tar.gz +/x2goserver-4.0.1.10.tar.gz diff --git a/sources b/sources index 81597b4..392b180 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -149fa59d130b1b57a39ee06e5e7fbac0 x2goserver-4.0.1.9.tar.gz +d6cd2f7f11e96097d8d0454a89accc4e x2goserver-4.0.1.10.tar.gz diff --git a/x2goserver-mimetype.patch b/x2goserver-mimetype.patch new file mode 100644 index 0000000..2cb8aaf --- /dev/null +++ b/x2goserver-mimetype.patch @@ -0,0 +1,12 @@ +diff -up x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop.mimetype x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop +--- x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop.mimetype 2014-01-03 10:27:31.167601207 -0700 ++++ x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop 2014-01-03 10:28:15.184321072 -0700 +@@ -1,7 +1,7 @@ + [Desktop Entry] + Encoding=UTF-8 + Name=x2gofm +-MimeType=application/sshfsdisk-x2go;application/sshfscdrom-x2go;application/sshfsremovable-x2go ++MimeType=application/sshfsdisk-x2go;application/sshfscdrom-x2go;application/sshfsremovable-x2go; + Exec=x2gofm %f + Type=Application + Terminal=false diff --git a/x2goserver-mktemp.patch b/x2goserver-mktemp.patch deleted file mode 100644 index dad5061..0000000 --- a/x2goserver-mktemp.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up x2goserver-4.0.1.8/x2goserver-xsession/etc/Xsession.mktemp x2goserver-4.0.1.8/x2goserver-xsession/etc/Xsession ---- x2goserver-4.0.1.8/x2goserver-xsession/etc/Xsession.mktemp 2013-11-25 14:02:26.170734637 -0700 -+++ x2goserver-4.0.1.8/x2goserver-xsession/etc/Xsession 2013-11-25 14:07:54.704734793 -0700 -@@ -74,7 +74,7 @@ ERRFILE=$HOME/.xsession-x2go-errors - if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && - [ ! -L "$ERRFILE" ]; then - chmod 600 "$ERRFILE" --elif ERRFILE=$(tempfile 2> /dev/null); then -+elif ERRFILE=$(mktemp 2> /dev/null); then - if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-x2go-$USER"; then - message "warning: unable to symlink \"$TMPDIR/xsession-x2go-$USER\" to" \ - "\"$ERRFILE\"; look for session log/errors in" \ -@@ -96,9 +96,9 @@ fi - # Attempt to create a file of non-zero length in /tmp; a full filesystem can - # cause mysterious X session failures. We do not use touch, :, or test -w - # because they won't actually create a file with contents. We also let standard --# error from tempfile and echo go to the error file to aid the user in -+# error from mktemp and echo go to the error file to aid the user in - # determining what went wrong. --WRITE_TEST=$(tempfile) -+WRITE_TEST=$(mktemp) - if ! echo "*" >>"$WRITE_TEST"; then - message "warning: unable to write to ${WRITE_TEST%/*}; X session (X2Go) may" \ - "exit with an error" diff --git a/x2goserver-pwgen.patch b/x2goserver-pwgen.patch deleted file mode 100644 index 98cc0d4..0000000 --- a/x2goserver-pwgen.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up x2goserver-4.0.1.8/x2goserver/sbin/x2godbadmin.pwgen x2goserver-4.0.1.8/x2goserver/sbin/x2godbadmin ---- x2goserver-4.0.1.8/x2goserver/sbin/x2godbadmin.pwgen 2013-11-22 14:17:40.000000000 -0700 -+++ x2goserver-4.0.1.8/x2goserver/sbin/x2godbadmin 2013-11-23 20:33:57.911892193 -0700 -@@ -190,7 +190,7 @@ if (!$sslmode) - } - my $dbadmin=$Config->param("postgres.dbadmin"); - my $x2goadmin="x2godbuser"; --my $x2goadminpass=`makepasswd`; -+my $x2goadminpass=`pwgen 8 1`; - chomp ($x2goadminpass); - my $db="x2go_sessions"; - -@@ -317,7 +317,7 @@ sub add_user() - print "The super-user \"root\" is not allowed to use X2Go\n"; - return; - } -- $pass=`makepasswd`; -+ $pass=`pwgen 8 1`; - chomp($pass); - - my $sth=$dbh->prepare("DROP OWNED BY \"x2gouser_$user\""); diff --git a/x2goserver.spec b/x2goserver.spec index 49e3552..eb782c3 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.9 -Release: 2%{?dist} +Version: 4.0.1.10 +Release: 1%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -15,10 +15,8 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. Source1: x2gocleansessions.service Source2: x2gocleansessions.init -# Use pwgen instead of makepasswd which is not in Fedora -Patch0: x2goserver-pwgen.patch -# Use mktemp instead of tempfile -Patch1: x2goserver-mktemp.patch +# Fix x2gofm.desktop mimetype +Patch0: x2goserver-mimetype.patch BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} @@ -68,9 +66,41 @@ This package contains the main daemon and tools for X2Go server-side session administrations. +%package fmbindings +Summary: X2Go Server file manager bindings +BuildRequires: desktop-file-utils +Requires: %{name} = %{version}-%{release} +Requires: xdg-utils +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils +Group: Applications/Communications + +%description fmbindings +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains generic MIME type information +for X2Go's local folder sharing. It can be used with all +freedesktop.org compliant desktop shells. + +However, this package can be superseded by other, more specific +destkop binding components, if installed and being used with the +corresponding desktop shell: + - under LXDE by x2golxdebindings + - under GNOMEv2 by x2gognomebindings + - under KDE4 by plasma-widget-x2go + - under MATE by x2gomatebindings + + %package printing Summary: X2Go Server printing support Requires: %{name} = %{version}-%{release} +Group: Applications/Communications %description printing The X2Go Server printing package provides client-side printing support for @@ -87,16 +117,15 @@ server). %prep %setup -q -%patch0 -p1 -b .pwgen -%patch1 -p1 -b .mktemp +%patch0 -p1 -b .mimetype # Set path find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath +sed -i -e 's/\t$(MAKE) -C x2goserver-compat/#\t$(MAKE) -C x2goserver-compat/g' Makefile +sed -i -e 's/\t$(MAKE) -C x2goserver-pyhoca/#\t$(MAKE) -C x2goserver-pyhoca/g' Makefile # Don't try to be root sed -i -e 's/-o root -g root//' */Makefile -# Perl pure_install -sed -i -e 's/perl install/perl pure_install/' Makefile # Do not ship xsession - Debian specific sed -i -e '/xsession/s/^/#/' Makefile @@ -134,6 +163,9 @@ mkdir -p %{buildroot}%{_initddir} install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2gocleansessions %endif +desktop-file-validate %{buildroot}%{_datadir}/applications/x2gofm.desktop + + %pre getent group x2gouser >/dev/null || groupadd -r x2gouser getent passwd x2gouser >/dev/null || \ @@ -170,6 +202,16 @@ if [ "$1" = 0 ]; then fi %endif +%post fmbindings +/usr/bin/update-mime-database /usr/share/mime &>/dev/null || : +/usr/bin/update-desktop-database &>/dev/null || : + +%postun fmbindings +if [ $1 -eq 0 ] ; then + /usr/bin/update-mime-database /usr/share/mime &>/dev/null || : + /usr/bin/update-desktop-database &>/dev/null || : +fi + %pre printing getent group x2goprint >/dev/null || groupadd -r x2goprint getent passwd x2goprint >/dev/null || \ @@ -184,6 +226,7 @@ exit 0 %dir %{_sysconfdir}/x2go/ %config(noreplace) %{_sysconfdir}/x2go/x* %{_bindir}/x2go* +%exclude %{_bindir}/x2gofm %exclude %{_bindir}/x2goprint %dir %{_libdir}/x2go %{_libdir}/x2go/extensions @@ -201,12 +244,14 @@ exit 0 %{_libdir}/x2go/x2golistsessions_sql %{_libdir}/x2go/x2gologlevel %{_libdir}/x2go/x2gologlevel.pm +%{_libdir}/x2go/x2goutils.pm %{_libdir}/x2go/x2goresume %{_libdir}/x2go/x2gormport %{_libdir}/x2go/x2gosuspend-agent %{_libdir}/x2go/x2gosyslog %{_sbindir}/x2go* -%{_mandir}/man8/x2go*.8.gz +%{_mandir}/man5/x2go*.5* +%{_mandir}/man8/x2go*.8* %exclude %{_mandir}/man8/x2goprint.8.gz %{_datadir}/x2go/ %exclude %{_datadir}/x2go/versions/VERSION.x2goserver-printing @@ -219,6 +264,14 @@ exit 0 %{_initddir}/x2gocleansessions %endif +%files fmbindings +%{_bindir}/x2gofm +%{_datadir}/applications/x2gofm.desktop +%{_datadir}/mime/packages/sshfs-x2go.xml +%{_datadir}/x2go/x2gofeature.d/x2goserver-fmbindings.features +%{_datadir}/x2go/versions/VERSION.x2goserver-fmbindings +%{_mandir}/man8/x2gofm.8.gz + %files printing %{_bindir}/x2goprint %{_datadir}/x2go/versions/VERSION.x2goserver-printing @@ -227,6 +280,10 @@ exit 0 %{_mandir}/man8/x2goprint.8.gz %changelog +* Fri Jan 3 2014 Orion Poplawski - 4.0.1.10-1 +- Update to 4.0.1.10 +- Drop pwgen and mktemp patches applied upstream + * Sat Dec 7 2013 Orion Poplawski - 4.0.1.9-2 - Disable Xsession support for now - Debian specific (Bug #1038834) From ff2eb906098075ca77c0b93a504aa289837f952d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 6 Jan 2014 10:37:27 -0700 Subject: [PATCH 018/113] - Update 4.0.1.11 - Drop mimetype patch applied upstream --- .gitignore | 1 + sources | 2 +- x2goserver-mimetype.patch | 12 ------------ x2goserver.spec | 10 +++++----- 4 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 x2goserver-mimetype.patch diff --git a/.gitignore b/.gitignore index 3612d65..01a0538 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /x2goserver-4.0.1.8.tar.gz /x2goserver-4.0.1.9.tar.gz /x2goserver-4.0.1.10.tar.gz +/x2goserver-4.0.1.11.tar.gz diff --git a/sources b/sources index 392b180..e22cf79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d6cd2f7f11e96097d8d0454a89accc4e x2goserver-4.0.1.10.tar.gz +11f130f712d1d5910bb479b5eb599105 x2goserver-4.0.1.11.tar.gz diff --git a/x2goserver-mimetype.patch b/x2goserver-mimetype.patch deleted file mode 100644 index 2cb8aaf..0000000 --- a/x2goserver-mimetype.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop.mimetype x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop ---- x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop.mimetype 2014-01-03 10:27:31.167601207 -0700 -+++ x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop 2014-01-03 10:28:15.184321072 -0700 -@@ -1,7 +1,7 @@ - [Desktop Entry] - Encoding=UTF-8 - Name=x2gofm --MimeType=application/sshfsdisk-x2go;application/sshfscdrom-x2go;application/sshfsremovable-x2go -+MimeType=application/sshfsdisk-x2go;application/sshfscdrom-x2go;application/sshfsremovable-x2go; - Exec=x2gofm %f - Type=Application - Terminal=false diff --git a/x2goserver.spec b/x2goserver.spec index eb782c3..31c34bc 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,6 +1,6 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.10 +Version: 4.0.1.11 Release: 1%{?dist} Summary: X2Go Server @@ -15,9 +15,6 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. Source1: x2gocleansessions.service Source2: x2gocleansessions.init -# Fix x2gofm.desktop mimetype -Patch0: x2goserver-mimetype.patch - BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} BuildRequires: man2html-core @@ -117,7 +114,6 @@ server). %prep %setup -q -%patch0 -p1 -b .mimetype # Set path find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' @@ -280,6 +276,10 @@ exit 0 %{_mandir}/man8/x2goprint.8.gz %changelog +* Mon Jan 6 2014 Orion Poplawski - 4.0.1.11-1 +- Update 4.0.1.11 +- Drop mimetype patch applied upstream + * Fri Jan 3 2014 Orion Poplawski - 4.0.1.10-1 - Update to 4.0.1.10 - Drop pwgen and mktemp patches applied upstream From 699123bca9e999ac97afceb0ed300ed47de63dc2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 7 Jan 2014 10:51:55 -0700 Subject: [PATCH 019/113] Update 4.0.1.12 --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 01a0538..9d691e7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /x2goserver-4.0.1.9.tar.gz /x2goserver-4.0.1.10.tar.gz /x2goserver-4.0.1.11.tar.gz +/x2goserver-4.0.1.12.tar.gz diff --git a/sources b/sources index e22cf79..6e4ab3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11f130f712d1d5910bb479b5eb599105 x2goserver-4.0.1.11.tar.gz +2f41accfb7b7d8b8113eb6f2f686e340 x2goserver-4.0.1.12.tar.gz diff --git a/x2goserver.spec b/x2goserver.spec index 31c34bc..e919b92 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,6 +1,6 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.11 +Version: 4.0.1.12 Release: 1%{?dist} Summary: X2Go Server @@ -276,6 +276,9 @@ exit 0 %{_mandir}/man8/x2goprint.8.gz %changelog +* Tue Jan 7 2014 Orion Poplawski - 4.0.1.12-1 +- Update 4.0.1.12 + * Mon Jan 6 2014 Orion Poplawski - 4.0.1.11-1 - Update 4.0.1.11 - Drop mimetype patch applied upstream From 4ced747b6137f9f49858c73e6f1e7a1d51c1b055 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 26 Jan 2014 20:31:23 -0700 Subject: [PATCH 020/113] Update 4.0.1.13 - Add xsession sub-package --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 52 ++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 9d691e7..f7fdef5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /x2goserver-4.0.1.10.tar.gz /x2goserver-4.0.1.11.tar.gz /x2goserver-4.0.1.12.tar.gz +/x2goserver-4.0.1.13.tar.gz diff --git a/sources b/sources index 6e4ab3d..5f9c58f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f41accfb7b7d8b8113eb6f2f686e340 x2goserver-4.0.1.12.tar.gz +24181098a9c4d7a5ca2c1416b0cee22d x2goserver-4.0.1.13.tar.gz diff --git a/x2goserver.spec b/x2goserver.spec index e919b92..50d4c22 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,6 +1,6 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.12 +Version: 4.0.1.13 Release: 1%{?dist} Summary: X2Go Server @@ -43,8 +43,6 @@ Requires: sshfs # For /etc/sudoers.d Requires: sudo Requires: x2goagent -# For /etc/X11/Xresources -Requires: xorg-x11-xinit Requires: xorg-x11-fonts-misc Requires(pre): shadow-utils @@ -112,6 +110,31 @@ this package on the X2Go server(s) (and the cups-x2go package on the CUPS server). +%package xsession +Summary: X2Go Server Xsession runner +Requires: %{name} = %{version}-%{release} +# Symlinks to xinit files +Requires: xorg-x11-xinit +Group: Applications/Communications + +%description xsession +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This X2Go server add-on enables Xsession script handling +when starting desktop sessions with X2Go. + +Amongst others the parsing of Xsession scripts will +enable desktop-profiles, ssh-agent startups, gpgagent +startups and many more Xsession related features on +X2Go session login automagically. + + %prep %setup -q @@ -122,8 +145,6 @@ sed -i -e 's/\t$(MAKE) -C x2goserver-compat/#\t$(MAKE) -C x2goserver-compat/g' M sed -i -e 's/\t$(MAKE) -C x2goserver-pyhoca/#\t$(MAKE) -C x2goserver-pyhoca/g' Makefile # Don't try to be root sed -i -e 's/-o root -g root//' */Makefile -# Do not ship xsession - Debian specific -sed -i -e '/xsession/s/^/#/' Makefile %build @@ -132,7 +153,7 @@ make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=% %install -make install DESTDIR=%{buildroot} PREFIX=%{_prefix} XSESSIONDIR=/etc/X11/xinit/Xclients.d +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} # Make symbolic link relative (xsession - disabled for now) #rm %{buildroot}%{_sysconfdir}/x2go/Xresources @@ -220,7 +241,11 @@ exit 0 %doc debian/changelog debian/copyright %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %dir %{_sysconfdir}/x2go/ -%config(noreplace) %{_sysconfdir}/x2go/x* +%config(noreplace) %{_sysconfdir}/x2go/x2go_logout +%config(noreplace) %{_sysconfdir}/x2go/x2go_logout.d/ +%config(noreplace) %{_sysconfdir}/x2go/x2goagent.options +%config(noreplace) %{_sysconfdir}/x2go/x2goserver.conf +%config(noreplace) %{_sysconfdir}/x2go/x2gosql/ %{_bindir}/x2go* %exclude %{_bindir}/x2gofm %exclude %{_bindir}/x2goprint @@ -275,7 +300,20 @@ exit 0 %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint %{_mandir}/man8/x2goprint.8.gz +%files xsession +%{_sysconfdir}/x2go/xinitrc.d +%{_sysconfdir}/x2go/Xclients.d +%{_sysconfdir}/x2go/Xresources +%config(noreplace) %{_sysconfdir}/x2go/Xsession +%{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features +%{_datadir}/x2go/versions/VERSION.x2goserver-xsession + + %changelog +* Sun Jan 26 2014 Orion Poplawski - 4.0.1.13-1 +- Update 4.0.1.13 +- Add xsession sub-package + * Tue Jan 7 2014 Orion Poplawski - 4.0.1.12-1 - Update 4.0.1.12 From e549182fccec354419850a379d77149d74ce4096 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 26 Jan 2014 20:49:31 -0700 Subject: [PATCH 021/113] Update conditionals for rhel7 --- x2goserver.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 50d4c22..143412f 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -16,7 +16,7 @@ Source1: x2gocleansessions.service Source2: x2gocleansessions.init BuildRequires: perl(ExtUtils::MakeMaker) -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: man2html-core BuildRequires: systemd %else @@ -170,7 +170,7 @@ touch %{buildroot}%{_sharedstatedir}/x2go/x2go_sessions # Printing spool dir mkdir -p %{buildroot}%{_localstatedir}/spool/x2goprint -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 7 # System.d session cleanup script mkdir -p %{buildroot}%{_unitdir} install -pm0644 %SOURCE1 %{buildroot}%{_unitdir} @@ -196,7 +196,7 @@ exit 0 egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 && %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || : -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 7 %systemd_post x2gocleansessions.service %preun @@ -279,7 +279,7 @@ exit 0 %exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features %attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/ %ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 7 %{_unitdir}/x2gocleansessions.service %else %{_initddir}/x2gocleansessions From 64d1297f4ea27d0c463a979552811cf714986b05 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 27 Jan 2014 11:26:06 -0700 Subject: [PATCH 022/113] Fix xinitrd.d path in Xsession --- x2goserver-xinit.patch | 14 ++++++++++++++ x2goserver.spec | 10 +++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 x2goserver-xinit.patch diff --git a/x2goserver-xinit.patch b/x2goserver-xinit.patch new file mode 100644 index 0000000..8d60c06 --- /dev/null +++ b/x2goserver-xinit.patch @@ -0,0 +1,14 @@ +diff -up x2goserver-4.0.1.13/x2goserver-xsession/etc/Xsession.xinit x2goserver-4.0.1.13/x2goserver-xsession/etc/Xsession +--- x2goserver-4.0.1.13/x2goserver-xsession/etc/Xsession.xinit 2014-01-27 10:41:21.249243220 -0700 ++++ x2goserver-4.0.1.13/x2goserver-xsession/etc/Xsession 2014-01-27 10:45:49.541668747 -0700 +@@ -174,8 +174,8 @@ elif [ -f /etc/redhat-release ]; then + unset XKB_IN_USE + + # run all system xinitrc shell scripts. +- for file in /etc/x2go/xinit/xinitrc.d/* ; do +- . $file ++ for file in /etc/x2go/xinitrc.d/* ; do ++ [ -r "$file" ] && . $file + done + + # Prefix launch of session with ssh-agent if available and not already running. diff --git a/x2goserver.spec b/x2goserver.spec index 143412f..9d6622b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -14,6 +14,10 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. #Source0: %{name}/%{name}-%{version}-%{checkout}.tar.gz Source1: x2gocleansessions.service Source2: x2gocleansessions.init +# Fix xinitrd.d path in Xsession +# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=414 +# https://bugzilla.redhat.com/show_bug.cgi?id=1038834 +Patch0: x2goserver-xinit.patch BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -137,6 +141,7 @@ X2Go session login automagically. %prep %setup -q +%patch0 -p1 -b .xinit # Set path find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' @@ -310,6 +315,9 @@ exit 0 %changelog +* Mon Jan 27 2014 Orion Poplawski - 4.0.1.13-2 +- Fix xinitrd.d path in Xsession + * Sun Jan 26 2014 Orion Poplawski - 4.0.1.13-1 - Update 4.0.1.13 - Add xsession sub-package From fa823b45902145d13a6d85e4fa250c1fb5ed982a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 5 Feb 2014 16:45:46 -0700 Subject: [PATCH 023/113] Fix x2gocleansession.service unit file --- x2gocleansessions.service | 2 ++ x2goserver.spec | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/x2gocleansessions.service b/x2gocleansessions.service index 8f382f1..46efebc 100644 --- a/x2gocleansessions.service +++ b/x2gocleansessions.service @@ -2,7 +2,9 @@ Description=X2go session cleanup [Service] +Type=forking ExecStart=/usr/sbin/x2gocleansessions +PIDFile=/run/x2goserver.pid [Install] WantedBy=multi-user.target diff --git a/x2goserver.spec b/x2goserver.spec index 9d6622b..96ffb8b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -315,6 +315,9 @@ exit 0 %changelog +* Wed Feb 5 2014 Orion Poplawski - 4.0.1.13-3 +- Fix x2gocleansession.service unit file + * Mon Jan 27 2014 Orion Poplawski - 4.0.1.13-2 - Fix xinitrd.d path in Xsession From 3b329860fa25eaa39ee527c1eee5ab4c3674cde9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 24 Mar 2014 11:08:02 -0600 Subject: [PATCH 024/113] Create /tmp/.X11-unix with correct SELinux context (bug #1079772) --- x2gocleansessions.init | 1 + x2goserver.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/x2gocleansessions.init b/x2gocleansessions.init index 9cbd411..5f84735 100644 --- a/x2gocleansessions.init +++ b/x2gocleansessions.init @@ -34,6 +34,7 @@ start() { then mkdir $XSOCKDIR chmod 1777 $XSOCKDIR + restorecon $XSOCKDIR fi echo -n $"Starting $prog: " daemon $exec $OPTS diff --git a/x2goserver.spec b/x2goserver.spec index 96ffb8b..0580051 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -315,6 +315,9 @@ exit 0 %changelog +* Mon Mar 24 2014 Orion Poplawski - 4.0.1.13-4 +- Create /tmp/.X11-unix with correct SELinux context (bug #1079772) + * Wed Feb 5 2014 Orion Poplawski - 4.0.1.13-3 - Fix x2gocleansession.service unit file From 6f7435679905265ef2f0b07694a9b42d9b235336 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 2 Apr 2014 08:40:55 -0600 Subject: [PATCH 025/113] Update to 4.0.1.14 --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 14 ++++++-------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index f7fdef5..b077be0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /x2goserver-4.0.1.11.tar.gz /x2goserver-4.0.1.12.tar.gz /x2goserver-4.0.1.13.tar.gz +/x2goserver-4.0.1.14.tar.gz diff --git a/sources b/sources index 5f9c58f..8ee2b1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24181098a9c4d7a5ca2c1416b0cee22d x2goserver-4.0.1.13.tar.gz +45f44c98b59937952874c7c4fd4c7840 x2goserver-4.0.1.14.tar.gz diff --git a/x2goserver.spec b/x2goserver.spec index 0580051..ec166c0 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.13 -Release: 4%{?dist} +Version: 4.0.1.14 +Release: 1%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -14,10 +14,6 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. #Source0: %{name}/%{name}-%{version}-%{checkout}.tar.gz Source1: x2gocleansessions.service Source2: x2gocleansessions.init -# Fix xinitrd.d path in Xsession -# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=414 -# https://bugzilla.redhat.com/show_bug.cgi?id=1038834 -Patch0: x2goserver-xinit.patch BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -141,7 +137,6 @@ X2Go session login automagically. %prep %setup -q -%patch0 -p1 -b .xinit # Set path find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' @@ -243,7 +238,7 @@ exit 0 %files -%doc debian/changelog debian/copyright +%doc ChangeLog %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %dir %{_sysconfdir}/x2go/ %config(noreplace) %{_sysconfdir}/x2go/x2go_logout @@ -315,6 +310,9 @@ exit 0 %changelog +* Wed Apr 2 2014 Orion Poplawski - 4.0.1.14-1 +- Update to 4.0.1.14 + * Mon Mar 24 2014 Orion Poplawski - 4.0.1.13-4 - Create /tmp/.X11-unix with correct SELinux context (bug #1079772) From 9fb703656ecad6367dd36403e487c450ac2497d4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 3 Apr 2014 22:35:02 -0600 Subject: [PATCH 026/113] Update to 4.0.1.15 --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b077be0..8b137c0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /x2goserver-4.0.1.12.tar.gz /x2goserver-4.0.1.13.tar.gz /x2goserver-4.0.1.14.tar.gz +/x2goserver-4.0.1.15.tar.gz diff --git a/sources b/sources index 8ee2b1e..a13179e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -45f44c98b59937952874c7c4fd4c7840 x2goserver-4.0.1.14.tar.gz +6b1d77f1955103cd59958fc67a0b77e2 x2goserver-4.0.1.15.tar.gz diff --git a/x2goserver.spec b/x2goserver.spec index ec166c0..e46cdda 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,6 +1,6 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.14 +Version: 4.0.1.15 Release: 1%{?dist} Summary: X2Go Server @@ -310,6 +310,9 @@ exit 0 %changelog +* Thu Apr 3 2014 Orion Poplawski - 4.0.1.15-1 +- Update to 4.0.1.15 + * Wed Apr 2 2014 Orion Poplawski - 4.0.1.14-1 - Update to 4.0.1.14 From 725debeca2a669ab1c9bee27ce67bd3bccfffc33 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 3 Apr 2014 22:42:25 -0600 Subject: [PATCH 027/113] Re-add COPYING --- x2goserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index e46cdda..8680588 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -238,7 +238,7 @@ exit 0 %files -%doc ChangeLog +%doc ChangeLog COPYING %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %dir %{_sysconfdir}/x2go/ %config(noreplace) %{_sysconfdir}/x2go/x2go_logout From 8fda1119aaf10f6423c20cdccb8f361ba985c64b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 2 May 2014 13:50:08 -0600 Subject: [PATCH 028/113] Add Requires xorg-x11-xauth --- x2goserver.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 8680588..cef9413 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -44,6 +44,7 @@ Requires: sshfs Requires: sudo Requires: x2goagent Requires: xorg-x11-fonts-misc +Requires: xorg-x11-xauth Requires(pre): shadow-utils %{?perl_default_filter} @@ -310,6 +311,9 @@ exit 0 %changelog +* Fri May 2 2014 Orion Poplawski - 4.0.1.15-2 +- Add Requires xorg-x11-xauth + * Thu Apr 3 2014 Orion Poplawski - 4.0.1.15-1 - Update to 4.0.1.15 From c73b4de7d722022bb3d264691b9a4db384b1b068 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 00:05:56 -0500 Subject: [PATCH 029/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index cef9413..07a4808 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -311,6 +311,9 @@ exit 0 %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 4.0.1.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 2 2014 Orion Poplawski - 4.0.1.15-2 - Add Requires xorg-x11-xauth From a35cc4e1834a2fc0b485f26a647b96887fa571e3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 09:07:22 +0000 Subject: [PATCH 030/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 07a4808..ce0a51a 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.15 -Release: 3%{?dist} +Release: 4%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -311,6 +311,9 @@ exit 0 %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 4.0.1.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 4.0.1.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 37fdc06b5f4ac6f7e3bdbf469a32eb54f4186cc9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 26 Aug 2014 16:02:19 -0600 Subject: [PATCH 031/113] Fix scriptlet requires --- x2goserver.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index ce0a51a..0298e41 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.15 -Release: 4%{?dist} +Release: 5%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -46,6 +46,13 @@ Requires: x2goagent Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth Requires(pre): shadow-utils +Requires(post): grep +Requires(post): perl(DBD::SQLite) +%if 0%{?fedora} || 0%{?rhel} >= 7 +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%endif %{?perl_default_filter} @@ -311,6 +318,9 @@ exit 0 %changelog +* Tue Aug 26 2014 Orion Poplawski - 4.0.1.15-5 +- Fix scriptlet requires + * Mon Aug 18 2014 Fedora Release Engineering - 4.0.1.15-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 6f1e836c7861b1d968c6f3bebfa0a4bdcad952a3 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 27 Aug 2014 12:55:34 +0200 Subject: [PATCH 032/113] Perl 5.20 rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 0298e41..72c637b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.15 -Release: 5%{?dist} +Release: 6%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -318,6 +318,9 @@ exit 0 %changelog +* Wed Aug 27 2014 Jitka Plesnikova - 4.0.1.15-6 +- Perl 5.20 rebuild + * Tue Aug 26 2014 Orion Poplawski - 4.0.1.15-5 - Fix scriptlet requires From 4002daf62a31c75df79ba2e2cc22995a91027d57 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 8 Sep 2014 16:10:25 -0600 Subject: [PATCH 033/113] Move BR desktop-file-utils to main section --- x2goserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 72c637b..c0ecddf 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -15,6 +15,7 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. Source1: x2gocleansessions.service Source2: x2gocleansessions.init +BuildRequires: desktop-file-utils BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: man2html-core @@ -71,7 +72,6 @@ administrations. %package fmbindings Summary: X2Go Server file manager bindings -BuildRequires: desktop-file-utils Requires: %{name} = %{version}-%{release} Requires: xdg-utils Requires(post): desktop-file-utils From 61f7b8bdb6c9beb0370163798ab002dae32f8159 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 8 Sep 2014 17:06:13 -0600 Subject: [PATCH 034/113] Minor specfile tweaks --- x2goserver.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index c0ecddf..df20d39 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -200,7 +200,7 @@ exit 0 %post # Initialize the session database -[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && +[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 && %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || : @@ -281,7 +281,8 @@ exit 0 %{_sbindir}/x2go* %{_mandir}/man5/x2go*.5* %{_mandir}/man8/x2go*.8* -%exclude %{_mandir}/man8/x2goprint.8.gz +%exclude %{_mandir}/man8/x2gofm.8* +%exclude %{_mandir}/man8/x2goprint.8* %{_datadir}/x2go/ %exclude %{_datadir}/x2go/versions/VERSION.x2goserver-printing %exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features @@ -297,16 +298,16 @@ exit 0 %{_bindir}/x2gofm %{_datadir}/applications/x2gofm.desktop %{_datadir}/mime/packages/sshfs-x2go.xml -%{_datadir}/x2go/x2gofeature.d/x2goserver-fmbindings.features %{_datadir}/x2go/versions/VERSION.x2goserver-fmbindings -%{_mandir}/man8/x2gofm.8.gz +%{_datadir}/x2go/x2gofeature.d/x2goserver-fmbindings.features +%{_mandir}/man8/x2gofm.8* %files printing %{_bindir}/x2goprint %{_datadir}/x2go/versions/VERSION.x2goserver-printing %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint -%{_mandir}/man8/x2goprint.8.gz +%{_mandir}/man8/x2goprint.8* %files xsession %{_sysconfdir}/x2go/xinitrc.d From d39e0be7707ddc4c4a9a5ccecbe6b868e5b2b3b5 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 9 Sep 2014 11:18:29 +0200 Subject: [PATCH 035/113] Perl 5.20 mass --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index df20d39..e1b9261 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.15 -Release: 6%{?dist} +Release: 7%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -319,6 +319,9 @@ exit 0 %changelog +* Tue Sep 09 2014 Jitka Plesnikova - 4.0.1.15-7 +- Perl 5.20 mass + * Wed Aug 27 2014 Jitka Plesnikova - 4.0.1.15-6 - Perl 5.20 rebuild From 9564b8e5901ca07b1936530b6d49bd294597646e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 25 Sep 2014 20:31:08 -0600 Subject: [PATCH 036/113] Update to 4.0.1.16 --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8b137c0..9ac7b7f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /x2goserver-4.0.1.13.tar.gz /x2goserver-4.0.1.14.tar.gz /x2goserver-4.0.1.15.tar.gz +/x2goserver-4.0.1.16.tar.gz diff --git a/sources b/sources index a13179e..74a06d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6b1d77f1955103cd59958fc67a0b77e2 x2goserver-4.0.1.15.tar.gz +41453b94dbcd2c6b44501bf517cba2db x2goserver-4.0.1.16.tar.gz diff --git a/x2goserver.spec b/x2goserver.spec index e1b9261..ed0116a 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.15 -Release: 7%{?dist} +Version: 4.0.1.16 +Release: 1%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -247,6 +247,7 @@ exit 0 %files %doc ChangeLog COPYING +%config(noreplace) %{_sysconfdir}/logcheck %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %dir %{_sysconfdir}/x2go/ %config(noreplace) %{_sysconfdir}/x2go/x2go_logout @@ -265,6 +266,7 @@ exit 0 %{_libdir}/x2go/x2gocreatesession %{_libdir}/x2go/x2godbwrapper.pm %{_libdir}/x2go/x2gogetagent +%{_libdir}/x2go/x2gogetagentstate %{_libdir}/x2go/x2gogetdisplays %{_libdir}/x2go/x2gogetports %{_libdir}/x2go/x2gogetstatus @@ -275,6 +277,7 @@ exit 0 %{_libdir}/x2go/x2gologlevel.pm %{_libdir}/x2go/x2goutils.pm %{_libdir}/x2go/x2goresume +%{_libdir}/x2go/x2gormforward %{_libdir}/x2go/x2gormport %{_libdir}/x2go/x2gosuspend-agent %{_libdir}/x2go/x2gosyslog @@ -319,6 +322,9 @@ exit 0 %changelog +* Thu Sep 25 2014 Jitka Plesnikova - 4.0.1.16-1 +- Update to 4.0.1.16 + * Tue Sep 09 2014 Jitka Plesnikova - 4.0.1.15-7 - Perl 5.20 mass From 47b0ac84c4ddb59b4dc9c1b2bdc75c14b725bd8a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 25 Sep 2014 20:32:26 -0600 Subject: [PATCH 037/113] Fix changelog author --- x2goserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index ed0116a..c594ea1 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -322,7 +322,7 @@ exit 0 %changelog -* Thu Sep 25 2014 Jitka Plesnikova - 4.0.1.16-1 +* Thu Sep 25 2014 Orion Poplawski - 4.0.1.16-1 - Update to 4.0.1.16 * Tue Sep 09 2014 Jitka Plesnikova - 4.0.1.15-7 From d3d79b0011ed5c430a6b2709f57b1e596f1fca26 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 2 Oct 2014 18:01:06 -0500 Subject: [PATCH 038/113] fmbindings: update mime scriptlets --- x2goserver.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index c594ea1..b21508f 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -74,8 +74,6 @@ administrations. Summary: X2Go Server file manager bindings Requires: %{name} = %{version}-%{release} Requires: xdg-utils -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils Group: Applications/Communications %description fmbindings @@ -228,15 +226,19 @@ fi %endif %post fmbindings -/usr/bin/update-mime-database /usr/share/mime &>/dev/null || : +touch --no-create %{_datadir}/mime/packages &> /dev/null || : /usr/bin/update-desktop-database &>/dev/null || : %postun fmbindings +/usr/bin/update-desktop-database &>/dev/null || : if [ $1 -eq 0 ] ; then - /usr/bin/update-mime-database /usr/share/mime &>/dev/null || : - /usr/bin/update-desktop-database &>/dev/null || : + /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || : + /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : fi +%posttrans fmbindings +/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : + %pre printing getent group x2goprint >/dev/null || groupadd -r x2goprint getent passwd x2goprint >/dev/null || \ @@ -322,6 +324,9 @@ exit 0 %changelog +* Thu Oct 02 2014 Rex Dieter 4.0.1.16-2 +- -fmbindings: update mime scriptlets + * Thu Sep 25 2014 Orion Poplawski - 4.0.1.16-1 - Update to 4.0.1.16 From 2f686b76d0595880db38e8ee5e133966b6f8c157 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 3 Oct 2014 16:36:14 -0600 Subject: [PATCH 039/113] Update to 4.0.1.17 --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9ac7b7f..cdf6644 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /x2goserver-4.0.1.14.tar.gz /x2goserver-4.0.1.15.tar.gz /x2goserver-4.0.1.16.tar.gz +/x2goserver-4.0.1.17.tar.gz diff --git a/sources b/sources index 74a06d7..b7ac28c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -41453b94dbcd2c6b44501bf517cba2db x2goserver-4.0.1.16.tar.gz +5b02aed3cb2bcdcfa94a22edce180dab x2goserver-4.0.1.17.tar.gz diff --git a/x2goserver.spec b/x2goserver.spec index b21508f..7221247 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.16 -Release: 2%{?dist} +Version: 4.0.1.17 +Release: 1%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -324,6 +324,9 @@ exit 0 %changelog +* Fri Oct 03 2014 Orion Poplawski - 4.0.1.17-1 +- Update to 4.0.1.17 + * Thu Oct 02 2014 Rex Dieter 4.0.1.16-2 - -fmbindings: update mime scriptlets From 9208f60034dee4c89eb767a16932f17bde2454cc Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 6 Oct 2014 20:27:25 -0600 Subject: [PATCH 040/113] Update to 4.0.1.18 --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cdf6644..537f506 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /x2goserver-4.0.1.15.tar.gz /x2goserver-4.0.1.16.tar.gz /x2goserver-4.0.1.17.tar.gz +/x2goserver-4.0.1.18.tar.gz diff --git a/sources b/sources index b7ac28c..71729f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b02aed3cb2bcdcfa94a22edce180dab x2goserver-4.0.1.17.tar.gz +e7bd91b82d7a911d04386e09c4650004 x2goserver-4.0.1.18.tar.gz diff --git a/x2goserver.spec b/x2goserver.spec index 7221247..920809b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,6 +1,6 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.17 +Version: 4.0.1.18 Release: 1%{?dist} Summary: X2Go Server @@ -324,6 +324,9 @@ exit 0 %changelog +* Mon Oct 06 2014 Orion Poplawski - 4.0.1.18-1 +- Update to 4.0.1.18 + * Fri Oct 03 2014 Orion Poplawski - 4.0.1.17-1 - Update to 4.0.1.17 From b2408da5fcfd800ec3f73bf9231969efc2c1cf20 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 24 Oct 2014 10:19:19 -0600 Subject: [PATCH 041/113] Require x2goserver-xession --- x2goserver.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 920809b..e98a8c4 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -43,7 +43,8 @@ Requires: pwgen Requires: sshfs # For /etc/sudoers.d Requires: sudo -Requires: x2goagent +Requires: x2goagent >= 3.5.0.25 +Requires: x2goserver-xession Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth Requires(pre): shadow-utils @@ -324,6 +325,9 @@ exit 0 %changelog +* Fri Oct 24 2014 Orion Poplawski - 4.0.1.18-2 +- Require x2goserver-xession + * Mon Oct 06 2014 Orion Poplawski - 4.0.1.18-1 - Update to 4.0.1.18 From 476f098dd8be199df275aa2a552ad7210a4590a6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 24 Oct 2014 10:55:28 -0600 Subject: [PATCH 042/113] Do not require x2goserver-xession, do not ship feature file in main package --- x2goserver.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index e98a8c4..e440ad1 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -44,7 +44,6 @@ Requires: sshfs # For /etc/sudoers.d Requires: sudo Requires: x2goagent >= 3.5.0.25 -Requires: x2goserver-xession Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth Requires(pre): shadow-utils @@ -289,9 +288,13 @@ exit 0 %{_mandir}/man8/x2go*.8* %exclude %{_mandir}/man8/x2gofm.8* %exclude %{_mandir}/man8/x2goprint.8* -%{_datadir}/x2go/ -%exclude %{_datadir}/x2go/versions/VERSION.x2goserver-printing -%exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features +%dir %{_datadir}/x2go/ +%dir %{_datadir}/x2go/versions +%{_datadir}/x2go/versions/VERSION.x2goserver +%{_datadir}/x2go/versions/VERSION.x2goserver-extensions +%dir %{_datadir}/x2go/x2gofeature.d +%{_datadir}/x2go/x2gofeature.d/x2goserver.features +%{_datadir}/x2go/x2gofeature.d/x2goserver-extensions.features %attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/ %ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -325,6 +328,9 @@ exit 0 %changelog +* Fri Oct 24 2014 Orion Poplawski - 4.0.1.18-3 +- Do not require x2goserver-xession, do not ship feature file in main package + * Fri Oct 24 2014 Orion Poplawski - 4.0.1.18-2 - Require x2goserver-xession From 5b870eff47e904fa05abab88a1f5af98fb02c1b4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 9 Dec 2014 16:17:54 -0700 Subject: [PATCH 043/113] Apply upstream fix for issue with Xsession aborting --- x2goserver-Xsession.patch | 29 +++++++++++++++++++++++++++++ x2goserver-xinit.patch | 14 -------------- x2goserver.spec | 9 ++++++++- 3 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 x2goserver-Xsession.patch delete mode 100644 x2goserver-xinit.patch diff --git a/x2goserver-Xsession.patch b/x2goserver-Xsession.patch new file mode 100644 index 0000000..4ed068b --- /dev/null +++ b/x2goserver-Xsession.patch @@ -0,0 +1,29 @@ +commit 2d602ffb909670f659b18204dddb91e14fce52cc +Author: Mike Gabriel +Date: Wed Oct 8 05:26:30 2014 +0200 + + Prevent bash failures when sourcing external bash scripts beyond our scope. (Fixes: #632). + +index b9ef15e..94692db 100755 +--- a/x2goserver-xsession/etc/Xsession ++++ b/x2goserver-xsession/etc/Xsession +@@ -139,7 +139,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then + + # Set up i18n environment + if [ -r /etc/profile.d/lang.sh ]; then ++ set +e + . /etc/profile.d/lang.sh ++ set -e + fi + + # merge in defaults +@@ -177,7 +179,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then + + # run all system xinitrc shell scripts. + for file in /etc/x2go/xinitrc.d/* ; do ++ set +e + [ -r "$file" ] && . $file ++ set -e + done + + # Prefix launch of session with ssh-agent if available and not already running. diff --git a/x2goserver-xinit.patch b/x2goserver-xinit.patch deleted file mode 100644 index 8d60c06..0000000 --- a/x2goserver-xinit.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up x2goserver-4.0.1.13/x2goserver-xsession/etc/Xsession.xinit x2goserver-4.0.1.13/x2goserver-xsession/etc/Xsession ---- x2goserver-4.0.1.13/x2goserver-xsession/etc/Xsession.xinit 2014-01-27 10:41:21.249243220 -0700 -+++ x2goserver-4.0.1.13/x2goserver-xsession/etc/Xsession 2014-01-27 10:45:49.541668747 -0700 -@@ -174,8 +174,8 @@ elif [ -f /etc/redhat-release ]; then - unset XKB_IN_USE - - # run all system xinitrc shell scripts. -- for file in /etc/x2go/xinit/xinitrc.d/* ; do -- . $file -+ for file in /etc/x2go/xinitrc.d/* ; do -+ [ -r "$file" ] && . $file - done - - # Prefix launch of session with ssh-agent if available and not already running. diff --git a/x2goserver.spec b/x2goserver.spec index e440ad1..af9deae 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -14,6 +14,9 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. #Source0: %{name}/%{name}-%{version}-%{checkout}.tar.gz Source1: x2gocleansessions.service Source2: x2gocleansessions.init +# Fix Xsession issue +# http://code.x2go.org/gitweb?p=x2goserver.git;a=commit;h=2d602ffb909670f659b18204dddb91e14fce52cc +Patch0: x2goserver-Xsession.patch BuildRequires: desktop-file-utils BuildRequires: perl(ExtUtils::MakeMaker) @@ -143,6 +146,7 @@ X2Go session login automagically. %prep %setup -q +%patch0 -p1 # Set path find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' @@ -328,6 +332,9 @@ exit 0 %changelog +* Tue Dec 9 2014 Orion Poplawski - 4.0.1.18-4 +- Apply upstream fix for issue with Xsession aborting + * Fri Oct 24 2014 Orion Poplawski - 4.0.1.18-3 - Do not require x2goserver-xession, do not ship feature file in main package From 9df53481fc1a282d0f9671fe45b5370d9aec35ce Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 8 Jan 2015 14:26:34 -0700 Subject: [PATCH 044/113] Fix local desktop sharing breakage (bug #1180303) --- x2goserver-path.patch | 12 ++++++++++++ x2goserver.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 x2goserver-path.patch diff --git a/x2goserver-path.patch b/x2goserver-path.patch new file mode 100644 index 0000000..1dced42 --- /dev/null +++ b/x2goserver-path.patch @@ -0,0 +1,12 @@ +diff -up x2goserver-4.0.1.18/x2goserver/bin/x2golistdesktops.path x2goserver-4.0.1.18/x2goserver/bin/x2golistdesktops +--- x2goserver-4.0.1.18/x2goserver/bin/x2golistdesktops.path 2015-01-08 14:18:12.440563587 -0700 ++++ x2goserver-4.0.1.18/x2goserver/bin/x2golistdesktops 2015-01-08 14:19:18.224205484 -0700 +@@ -60,7 +60,7 @@ my $rdisp=join("I",@rdisplays); + $rdisp="I${rdisp}I"; + + my $uname=$ENV{'USER'}; +-my $lines=`ss -lxu`; ++my $lines=`/usr/sbin/ss -lxu`; + my @lines=split("\n", "$lines"); + + my @outp = grep ( /(@| )\/tmp\/.X11-unix\/X.*/, @lines); diff --git a/x2goserver.spec b/x2goserver.spec index af9deae..e9bc9f7 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -17,6 +17,10 @@ Source2: x2gocleansessions.init # Fix Xsession issue # http://code.x2go.org/gitweb?p=x2goserver.git;a=commit;h=2d602ffb909670f659b18204dddb91e14fce52cc Patch0: x2goserver-Xsession.patch +# Specify path to /usr/sbin/ss - breaks x2golistdesktops and local desktop access +# https://bugzilla.redhat.com/show_bug.cgi?id=1180303 +# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=727 +Patch1: x2goserver-path.patch BuildRequires: desktop-file-utils BuildRequires: perl(ExtUtils::MakeMaker) @@ -147,6 +151,7 @@ X2Go session login automagically. %prep %setup -q %patch0 -p1 +%patch1 -p1 # Set path find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' @@ -332,6 +337,9 @@ exit 0 %changelog +* Thu Jan 8 2015 Orion Poplawski - 4.0.1.18-5 +- Fix local desktop sharing breakage (bug #1180303) + * Tue Dec 9 2014 Orion Poplawski - 4.0.1.18-4 - Apply upstream fix for issue with Xsession aborting From 5939fcc5e571f7314e818d6d667f9e279048ab0b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 26 Jan 2015 09:33:43 -0700 Subject: [PATCH 045/113] Obsolete x2goserver-extensions to provide upgrade path from upstream rpms --- x2goserver.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index e9bc9f7..e6cfd5b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.18 -Release: 5%{?dist} +Release: 6%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -61,6 +61,9 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd %endif +# Provide upstream path from upstream rpms +# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=755 +Obsoletes: x2goserver-extensions < %{version}-%{release} %{?perl_default_filter} @@ -337,6 +340,9 @@ exit 0 %changelog +* Mon Jan 26 2015 Orion Poplawski - 4.0.1.18-6 +- Obsolete x2goserver-extensions to provide upgrade path from upstream rpms + * Thu Jan 8 2015 Orion Poplawski - 4.0.1.18-5 - Fix local desktop sharing breakage (bug #1180303) From b199780657f891f8d220858b1a74ed4976dfbb1d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 24 Feb 2015 14:43:47 -0700 Subject: [PATCH 046/113] Update to 4.0.1.19 - Drop Xsession and path patches fixed upstream --- .gitignore | 1 + sources | 2 +- x2goserver-Xsession.patch | 29 ----------------------------- x2goserver-path.patch | 12 ------------ x2goserver.spec | 17 ++++++----------- 5 files changed, 8 insertions(+), 53 deletions(-) delete mode 100644 x2goserver-Xsession.patch delete mode 100644 x2goserver-path.patch diff --git a/.gitignore b/.gitignore index 537f506..4140cff 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /x2goserver-4.0.1.16.tar.gz /x2goserver-4.0.1.17.tar.gz /x2goserver-4.0.1.18.tar.gz +/x2goserver-4.0.1.19.tar.gz diff --git a/sources b/sources index 71729f1..a6daa0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7bd91b82d7a911d04386e09c4650004 x2goserver-4.0.1.18.tar.gz +7f1093c4dbc0a273bcc73a2e4b2c8b69 x2goserver-4.0.1.19.tar.gz diff --git a/x2goserver-Xsession.patch b/x2goserver-Xsession.patch deleted file mode 100644 index 4ed068b..0000000 --- a/x2goserver-Xsession.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 2d602ffb909670f659b18204dddb91e14fce52cc -Author: Mike Gabriel -Date: Wed Oct 8 05:26:30 2014 +0200 - - Prevent bash failures when sourcing external bash scripts beyond our scope. (Fixes: #632). - -index b9ef15e..94692db 100755 ---- a/x2goserver-xsession/etc/Xsession -+++ b/x2goserver-xsession/etc/Xsession -@@ -139,7 +139,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then - - # Set up i18n environment - if [ -r /etc/profile.d/lang.sh ]; then -+ set +e - . /etc/profile.d/lang.sh -+ set -e - fi - - # merge in defaults -@@ -177,7 +179,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then - - # run all system xinitrc shell scripts. - for file in /etc/x2go/xinitrc.d/* ; do -+ set +e - [ -r "$file" ] && . $file -+ set -e - done - - # Prefix launch of session with ssh-agent if available and not already running. diff --git a/x2goserver-path.patch b/x2goserver-path.patch deleted file mode 100644 index 1dced42..0000000 --- a/x2goserver-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up x2goserver-4.0.1.18/x2goserver/bin/x2golistdesktops.path x2goserver-4.0.1.18/x2goserver/bin/x2golistdesktops ---- x2goserver-4.0.1.18/x2goserver/bin/x2golistdesktops.path 2015-01-08 14:18:12.440563587 -0700 -+++ x2goserver-4.0.1.18/x2goserver/bin/x2golistdesktops 2015-01-08 14:19:18.224205484 -0700 -@@ -60,7 +60,7 @@ my $rdisp=join("I",@rdisplays); - $rdisp="I${rdisp}I"; - - my $uname=$ENV{'USER'}; --my $lines=`ss -lxu`; -+my $lines=`/usr/sbin/ss -lxu`; - my @lines=split("\n", "$lines"); - - my @outp = grep ( /(@| )\/tmp\/.X11-unix\/X.*/, @lines); diff --git a/x2goserver.spec b/x2goserver.spec index e6cfd5b..471dbc4 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.18 -Release: 6%{?dist} +Version: 4.0.1.19 +Release: 1%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -14,13 +14,6 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. #Source0: %{name}/%{name}-%{version}-%{checkout}.tar.gz Source1: x2gocleansessions.service Source2: x2gocleansessions.init -# Fix Xsession issue -# http://code.x2go.org/gitweb?p=x2goserver.git;a=commit;h=2d602ffb909670f659b18204dddb91e14fce52cc -Patch0: x2goserver-Xsession.patch -# Specify path to /usr/sbin/ss - breaks x2golistdesktops and local desktop access -# https://bugzilla.redhat.com/show_bug.cgi?id=1180303 -# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=727 -Patch1: x2goserver-path.patch BuildRequires: desktop-file-utils BuildRequires: perl(ExtUtils::MakeMaker) @@ -153,8 +146,6 @@ X2Go session login automagically. %prep %setup -q -%patch0 -p1 -%patch1 -p1 # Set path find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' @@ -340,6 +331,10 @@ exit 0 %changelog +* Tue Feb 24 2015 Orion Poplawski - 4.0.1.19-1 +- Update to 4.0.1.19 +- Drop Xsession and path patches fixed upstream + * Mon Jan 26 2015 Orion Poplawski - 4.0.1.18-6 - Obsolete x2goserver-extensions to provide upgrade path from upstream rpms From 393368a265ac52dede6ce07874f57d8e87105066 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 18 Mar 2015 16:03:51 -0600 Subject: [PATCH 047/113] Provide x2goserver-extensions for upstream compatibility --- x2goserver.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 471dbc4..3532fd2 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -57,6 +57,7 @@ Requires(postun): systemd # Provide upstream path from upstream rpms # http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=755 Obsoletes: x2goserver-extensions < %{version}-%{release} +Provides: x2goserver-extensions = %{version}-%{release} %{?perl_default_filter} @@ -331,6 +332,9 @@ exit 0 %changelog +* Wed Mar 18 2015 Orion Poplawski - 4.0.1.19-2 +- Provide x2goserver-extensions for upstream compatibility + * Tue Feb 24 2015 Orion Poplawski - 4.0.1.19-1 - Update to 4.0.1.19 - Drop Xsession and path patches fixed upstream From c7dd45c627121f9e83309e86e4e5ff5e64198abf Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 26 Apr 2015 21:25:00 -0600 Subject: [PATCH 048/113] Install applications symlink by default so that "Published Applications" is populated (bug #1215474) --- x2goserver.spec | 62 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 3532fd2..ad8e4a6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -47,6 +47,7 @@ Requires: x2goagent >= 3.5.0.25 Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth Requires(pre): shadow-utils +Requires(post): coreutils Requires(post): grep Requires(post): perl(DBD::SQLite) %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -192,6 +193,9 @@ install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2gocleansessions desktop-file-validate %{buildroot}%{_datadir}/applications/x2gofm.desktop +# applications link +ln -s ../..%{_datadir}/applications %{buildroot}%{_sysconfdir}/x2go/applications + %pre getent group x2gouser >/dev/null || groupadd -r x2gouser @@ -203,29 +207,44 @@ exit 0 %post # Initialize the session database [ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && - egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 && - %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || : + grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 && + %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || : + +# create /etc/x2go/applications symlink if not already there +# as a regular file, as a symlink, as a special file or as a directory +if ! [ -e %{_sysconfdir}/x2go/applications ]; then + ln -s ../..%{_datadir}/applications %{_sysconfdir}/x2go/applications +fi %if 0%{?fedora} || 0%{?rhel} >= 7 %systemd_post x2gocleansessions.service - -%preun -%systemd_preun x2gocleansessions.service - -%postun -%systemd_postun x2gocleansessions.service %else /sbin/chkconfig --add x2gocleansessions - -%postun -if [ "$1" -ge "1" ] ; then - /sbin/service x2gocleansessions condrestart >/dev/null 2>&1 || : -fi +%endif %preun if [ "$1" = 0 ]; then - /sbin/service x2gocleansessions stop >/dev/null 2>&1 - /sbin/chkconfig --del x2gocleansessions + if [ -L %{_sysconfdir}/x2go/applications ]; then + rm -f %{_sysconfdir}/x2go/applications + fi +fi + +%if 0%{?fedora} || 0%{?rhel} >= 7 +%systemd_preun x2gocleansessions.service +%else +if [ "$1" = 0 ]; then + /sbin/service x2gocleansessions stop >/dev/null 2>&1 + /sbin/chkconfig --del x2gocleansessions +fi +%endif + + +%postun +%if 0%{?fedora} || 0%{?rhel} >= 7 +%systemd_postun x2gocleansessions.service +%else +if [ "$1" -ge "1" ] ; then + /sbin/service x2gocleansessions condrestart >/dev/null 2>&1 || : fi %endif @@ -236,8 +255,8 @@ touch --no-create %{_datadir}/mime/packages &> /dev/null || : %postun fmbindings /usr/bin/update-desktop-database &>/dev/null || : if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || : - /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : + /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || : + /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : fi %posttrans fmbindings @@ -256,6 +275,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/logcheck %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %dir %{_sysconfdir}/x2go/ +%ghost %config(noreplace) %{_sysconfdir}/x2go/applications %config(noreplace) %{_sysconfdir}/x2go/x2go_logout %config(noreplace) %{_sysconfdir}/x2go/x2go_logout.d/ %config(noreplace) %{_sysconfdir}/x2go/x2goagent.options @@ -332,6 +352,10 @@ exit 0 %changelog +* Sun Apr 26 2015 Orion Poplawski - 4.0.1.19-3 +- Install applications symlink by default so that "Published + Applications" is populated (bug #1215474) + * Wed Mar 18 2015 Orion Poplawski - 4.0.1.19-2 - Provide x2goserver-extensions for upstream compatibility @@ -455,7 +479,7 @@ exit 0 * Mon Jul 22 2013 Rok Mandeljc - 4.1.0.0-0.4.20130722git65169c9 - Update to latest git -- Use PREFIX=%{_prefix} when building, not just when installing. +- Use PREFIX=%%{_prefix} when building, not just when installing. - Use pwgen instead of makepasswd, which is not available on Fedora. - Fixed a missing function import in x2golistsessions. - Added dependencies for xorg-x11-fonts-misc From 4b3153a5765a8aeb5da31be1ec08bd42de5b1baf Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 29 Apr 2015 16:18:09 -0600 Subject: [PATCH 049/113] Add requires xorg-x11-xkb-utils --- x2goserver.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index ad8e4a6..a2bb753 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.19 -Release: 3%{?dist} +Release: 4%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -46,6 +46,7 @@ Requires: sudo Requires: x2goagent >= 3.5.0.25 Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth +Requires: xorg-x11-xkb-utils Requires(pre): shadow-utils Requires(post): coreutils Requires(post): grep @@ -352,6 +353,9 @@ exit 0 %changelog +* Wed Apr 29 2015 Orion Poplawski - 4.0.1.19-4 +- Add requires xorg-x11-xkb-utils + * Sun Apr 26 2015 Orion Poplawski - 4.0.1.19-3 - Install applications symlink by default so that "Published Applications" is populated (bug #1215474) From 96f3ecdab64310a214759a2fa1237e778a146d27 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 3 Jun 2015 16:15:10 +0200 Subject: [PATCH 050/113] Perl 5.22 rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index a2bb753..88e8b72 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.19 -Release: 4%{?dist} +Release: 5%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -353,6 +353,9 @@ exit 0 %changelog +* Wed Jun 03 2015 Jitka Plesnikova - 4.0.1.19-5 +- Perl 5.22 rebuild + * Wed Apr 29 2015 Orion Poplawski - 4.0.1.19-4 - Add requires xorg-x11-xkb-utils From 247fd1be123686d845090f3e0801e8ce2e9167c2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 12 Jun 2015 07:41:13 -0600 Subject: [PATCH 051/113] Fix X2Go capitalization in service file (bug #1231177) --- x2gocleansessions.service | 2 +- x2goserver.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/x2gocleansessions.service b/x2gocleansessions.service index 46efebc..17afb9e 100644 --- a/x2gocleansessions.service +++ b/x2gocleansessions.service @@ -1,5 +1,5 @@ [Unit] -Description=X2go session cleanup +Description=X2Go session cleanup [Service] Type=forking diff --git a/x2goserver.spec b/x2goserver.spec index 88e8b72..d0b5394 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.19 -Release: 5%{?dist} +Release: 6%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -353,6 +353,9 @@ exit 0 %changelog +* Fri Jun 12 2015 Orion Poplawski - 4.0.1.19-6 +- Fix X2Go capitalization in service file (bug #1231177) + * Wed Jun 03 2015 Jitka Plesnikova - 4.0.1.19-5 - Perl 5.22 rebuild From 2aa1d8cd00558a45e9cb5bc5dea29e91b8afebdb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 03:40:56 +0000 Subject: [PATCH 052/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index d0b5394..5ea4b36 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.19 -Release: 6%{?dist} +Release: 7%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -353,6 +353,9 @@ exit 0 %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 4.0.1.19-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Jun 12 2015 Orion Poplawski - 4.0.1.19-6 - Fix X2Go capitalization in service file (bug #1231177) From c45bacc4cd4f0e33ef18b6c0d7bbc8d63c51c390 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:14:10 +0000 Subject: [PATCH 053/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 5ea4b36..c373bfa 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.19 -Release: 7%{?dist} +Release: 8%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -353,6 +353,9 @@ exit 0 %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 4.0.1.19-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 4.0.1.19-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 2640b4ab3f9536df60ad57fbe79410f6c312466b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 18 Mar 2016 11:33:45 -0600 Subject: [PATCH 054/113] Add requires grep (bug #1319154) --- x2goserver.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index c373bfa..5f6e067 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.19 -Release: 8%{?dist} +Release: 9%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -27,6 +27,7 @@ BuildRequires: man BuildRequires: xorg-x11-xinit # For x2goruncommand - for now Requires: bc +Requires: grep # For x2goshowblocks Requires: lsof # For netstat in x2goresume-session @@ -353,6 +354,9 @@ exit 0 %changelog +* Fri Mar 18 2016 Orion Poplawski - 4.0.1.19-9 +- Add requires grep (bug #1319154) + * Fri Feb 05 2016 Fedora Release Engineering - 4.0.1.19-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From d8f58b342e9016acf4f7bd425b4a8e090a976404 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 15 May 2016 06:35:56 +0200 Subject: [PATCH 055/113] Perl 5.24 rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 5f6e067..6077338 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.19 -Release: 9%{?dist} +Release: 10%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -354,6 +354,9 @@ exit 0 %changelog +* Sun May 15 2016 Jitka Plesnikova - 4.0.1.19-10 +- Perl 5.24 rebuild + * Fri Mar 18 2016 Orion Poplawski - 4.0.1.19-9 - Add requires grep (bug #1319154) From 9f8d79e3bfaeeb66ec266bd2e0012bd5f3bcc5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 09:50:49 +0200 Subject: [PATCH 056/113] Mandatory Perl build-requires added --- x2goserver.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/x2goserver.spec b/x2goserver.spec index 6077338..c95aa5c 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -16,6 +16,7 @@ Source1: x2gocleansessions.service Source2: x2gocleansessions.init BuildRequires: desktop-file-utils +BuildRequires: perl-generators BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: man2html-core From 267c8f54fde87c85aa7bcde8fb45c1d690031ac2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 24 Jun 2016 14:18:10 -0600 Subject: [PATCH 057/113] Add upstream patch to drop blowfish cipher (bug #1350014) --- x2goserver-blowfish.patch | 37 +++++++++++++++++++++++++++++++++++++ x2goserver.spec | 12 ++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 x2goserver-blowfish.patch diff --git a/x2goserver-blowfish.patch b/x2goserver-blowfish.patch new file mode 100644 index 0000000..7257f6f --- /dev/null +++ b/x2goserver-blowfish.patch @@ -0,0 +1,37 @@ +From 86a0e421c3da850045459af855a33f646828dd68 Mon Sep 17 00:00:00 2001 +From: Mihai Moldovan +Date: Thu, 25 Feb 2016 15:21:04 +0100 +Subject: [PATCH] x2goserver/bin/x2gomountdirs: remove blowfish Cipher spec + hardcoded for sshfs mounts. + +The speed improvement is probably mostly an illusion (unless talking +about high-bandwidth links) and more importantly recent OpenSSH server +versions seem to disable the Blowfish cipher by default, leading to +errors like "Connection reset by peer." +--- + debian/changelog | 5 +++++ + x2goserver/bin/x2gomountdirs | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs +index f0b497e..f39d199 100755 +--- a/x2goserver/bin/x2gomountdirs ++++ b/x2goserver/bin/x2gomountdirs +@@ -304,12 +304,12 @@ for (my $i=0;$i<@dirs;$i++) + { + syslog('debug', "SSH host key has arrived: $key.ident"); + } +- $msg = "timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port"; ++ $msg = "timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port"; + syslog('debug', "executing: $msg"); + print "inserted, $msg\n"; + + # FIXME: this system call should be converted to a multi-argument system call while pertaining the redirect of stderr to the mounts.log file +- if (system("timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 1>>$sessiondir/sshfs-mounts.log 2>&1")==0) ++ if (system("timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 1>>$sessiondir/sshfs-mounts.log 2>&1")==0) + { + print "mount @dirs[$i] ok\n"; + syslog('notice', "successfully mounted $user\@$host:$port@dirs[$i] to $mntpath"); +-- +1.7.9.5 + diff --git a/x2goserver.spec b/x2goserver.spec index c95aa5c..2e74603 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.19 -Release: 10%{?dist} +Release: 11%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -14,6 +14,9 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. #Source0: %{name}/%{name}-%{version}-%{checkout}.tar.gz Source1: x2gocleansessions.service Source2: x2gocleansessions.init +# Upstream patch to drop blowfish cipher +# https://bugzilla.redhat.com/show_bug.cgi?id=1350014 +Patch0: http://code.x2go.org/gitweb?p=x2goserver.git;a=patch;h=86a0e421c3da850045459af855a33f646828dd68#/x2goserver-blowfish.patch BuildRequires: desktop-file-utils BuildRequires: perl-generators @@ -151,6 +154,7 @@ X2Go session login automagically. %prep %setup -q +%patch0 -p1 -b .blowfish # Set path find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' @@ -274,7 +278,8 @@ exit 0 %files -%doc ChangeLog COPYING +%license COPYING +%doc ChangeLog %config(noreplace) %{_sysconfdir}/logcheck %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %dir %{_sysconfdir}/x2go/ @@ -355,6 +360,9 @@ exit 0 %changelog +* Fri Jun 24 2016 Orion Poplawski - 4.0.1.19-11 +- Add upstream patch to drop blowfish cipher (bug #1350014) + * Sun May 15 2016 Jitka Plesnikova - 4.0.1.19-10 - Perl 5.24 rebuild From d432a01e3dff934edcccdce4d8d5c425a61e47a9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 6 Oct 2016 09:45:29 -0600 Subject: [PATCH 058/113] Fix x2golistdesktops on EL7 (bug #1371690) --- x2goserver-ss.patch | 12 ++++++++++++ x2goserver.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 x2goserver-ss.patch diff --git a/x2goserver-ss.patch b/x2goserver-ss.patch new file mode 100644 index 0000000..19cf22f --- /dev/null +++ b/x2goserver-ss.patch @@ -0,0 +1,12 @@ +diff -up x2goserver-4.0.1.19/x2goserver/bin/x2golistdesktops.ss x2goserver-4.0.1.19/x2goserver/bin/x2golistdesktops +--- x2goserver-4.0.1.19/x2goserver/bin/x2golistdesktops.ss 2016-08-19 11:28:28.000000000 -0600 ++++ x2goserver-4.0.1.19/x2goserver/bin/x2golistdesktops 2016-10-06 09:40:21.671506799 -0600 +@@ -65,7 +65,7 @@ my $uname=$ENV{'USER'}; + # -> so we need to tweak the PATH env var a little here... + my $old_PATH=$ENV{'PATH'}; + $ENV{'PATH'}="$ENV{'PATH'}:/usr/sbin:/sbin"; +-my $lines=`ss -lxu`; ++my $lines=`ss -lx`; + $ENV{'PATH'}=$old_PATH; + undef $old_PATH; + diff --git a/x2goserver.spec b/x2goserver.spec index 2e74603..895425f 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.19 -Release: 11%{?dist} +Release: 12%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -17,6 +17,10 @@ Source2: x2gocleansessions.init # Upstream patch to drop blowfish cipher # https://bugzilla.redhat.com/show_bug.cgi?id=1350014 Patch0: http://code.x2go.org/gitweb?p=x2goserver.git;a=patch;h=86a0e421c3da850045459af855a33f646828dd68#/x2goserver-blowfish.patch +# Call ss without -u to fix x2golistdesktops on EL7 +# https://bugzilla.redhat.com/show_bug.cgi?id=1371690 +# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=799 +Patch1: x2goserver-ss.patch BuildRequires: desktop-file-utils BuildRequires: perl-generators @@ -155,6 +159,7 @@ X2Go session login automagically. %prep %setup -q %patch0 -p1 -b .blowfish +%patch1 -p1 -b .ss # Set path find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' @@ -360,6 +365,9 @@ exit 0 %changelog +* Thu Oct 6 2016 Orion Poplawski - 4.0.1.19-12 +- Fix x2golistdesktops on EL7 (bug #1371690) + * Fri Jun 24 2016 Orion Poplawski - 4.0.1.19-11 - Add upstream patch to drop blowfish cipher (bug #1350014) From 48983309026757e05b977fd514b2c4ecbf2b9116 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 20 Nov 2016 22:33:00 -0700 Subject: [PATCH 059/113] Update to 4.0.1.20 - Drop patches applied upstream --- .gitignore | 1 + sources | 2 +- x2goserver-blowfish.patch | 37 ------------------------------------- x2goserver-ss.patch | 12 ------------ x2goserver.spec | 17 ++++++----------- 5 files changed, 8 insertions(+), 61 deletions(-) delete mode 100644 x2goserver-blowfish.patch delete mode 100644 x2goserver-ss.patch diff --git a/.gitignore b/.gitignore index 4140cff..7e343e3 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /x2goserver-4.0.1.17.tar.gz /x2goserver-4.0.1.18.tar.gz /x2goserver-4.0.1.19.tar.gz +/x2goserver-4.0.1.20.tar.gz diff --git a/sources b/sources index a6daa0d..309d134 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f1093c4dbc0a273bcc73a2e4b2c8b69 x2goserver-4.0.1.19.tar.gz +54f165ab50ccf329465d95ae108f6f64 x2goserver-4.0.1.20.tar.gz diff --git a/x2goserver-blowfish.patch b/x2goserver-blowfish.patch deleted file mode 100644 index 7257f6f..0000000 --- a/x2goserver-blowfish.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 86a0e421c3da850045459af855a33f646828dd68 Mon Sep 17 00:00:00 2001 -From: Mihai Moldovan -Date: Thu, 25 Feb 2016 15:21:04 +0100 -Subject: [PATCH] x2goserver/bin/x2gomountdirs: remove blowfish Cipher spec - hardcoded for sshfs mounts. - -The speed improvement is probably mostly an illusion (unless talking -about high-bandwidth links) and more importantly recent OpenSSH server -versions seem to disable the Blowfish cipher by default, leading to -errors like "Connection reset by peer." ---- - debian/changelog | 5 +++++ - x2goserver/bin/x2gomountdirs | 4 ++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs -index f0b497e..f39d199 100755 ---- a/x2goserver/bin/x2gomountdirs -+++ b/x2goserver/bin/x2gomountdirs -@@ -304,12 +304,12 @@ for (my $i=0;$i<@dirs;$i++) - { - syslog('debug', "SSH host key has arrived: $key.ident"); - } -- $msg = "timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port"; -+ $msg = "timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port"; - syslog('debug', "executing: $msg"); - print "inserted, $msg\n"; - - # FIXME: this system call should be converted to a multi-argument system call while pertaining the redirect of stderr to the mounts.log file -- if (system("timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 1>>$sessiondir/sshfs-mounts.log 2>&1")==0) -+ if (system("timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 1>>$sessiondir/sshfs-mounts.log 2>&1")==0) - { - print "mount @dirs[$i] ok\n"; - syslog('notice', "successfully mounted $user\@$host:$port@dirs[$i] to $mntpath"); --- -1.7.9.5 - diff --git a/x2goserver-ss.patch b/x2goserver-ss.patch deleted file mode 100644 index 19cf22f..0000000 --- a/x2goserver-ss.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up x2goserver-4.0.1.19/x2goserver/bin/x2golistdesktops.ss x2goserver-4.0.1.19/x2goserver/bin/x2golistdesktops ---- x2goserver-4.0.1.19/x2goserver/bin/x2golistdesktops.ss 2016-08-19 11:28:28.000000000 -0600 -+++ x2goserver-4.0.1.19/x2goserver/bin/x2golistdesktops 2016-10-06 09:40:21.671506799 -0600 -@@ -65,7 +65,7 @@ my $uname=$ENV{'USER'}; - # -> so we need to tweak the PATH env var a little here... - my $old_PATH=$ENV{'PATH'}; - $ENV{'PATH'}="$ENV{'PATH'}:/usr/sbin:/sbin"; --my $lines=`ss -lxu`; -+my $lines=`ss -lx`; - $ENV{'PATH'}=$old_PATH; - undef $old_PATH; - diff --git a/x2goserver.spec b/x2goserver.spec index 895425f..ddf2278 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.19 -Release: 12%{?dist} +Version: 4.0.1.20 +Release: 1%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -14,13 +14,6 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. #Source0: %{name}/%{name}-%{version}-%{checkout}.tar.gz Source1: x2gocleansessions.service Source2: x2gocleansessions.init -# Upstream patch to drop blowfish cipher -# https://bugzilla.redhat.com/show_bug.cgi?id=1350014 -Patch0: http://code.x2go.org/gitweb?p=x2goserver.git;a=patch;h=86a0e421c3da850045459af855a33f646828dd68#/x2goserver-blowfish.patch -# Call ss without -u to fix x2golistdesktops on EL7 -# https://bugzilla.redhat.com/show_bug.cgi?id=1371690 -# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=799 -Patch1: x2goserver-ss.patch BuildRequires: desktop-file-utils BuildRequires: perl-generators @@ -158,8 +151,6 @@ X2Go session login automagically. %prep %setup -q -%patch0 -p1 -b .blowfish -%patch1 -p1 -b .ss # Set path find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' @@ -365,6 +356,10 @@ exit 0 %changelog +* Sun Nov 20 2016 Orion Poplawski - 4.0.1.20-1 +- Update to 4.0.1.20 +- Drop patches applied upstream + * Thu Oct 6 2016 Orion Poplawski - 4.0.1.19-12 - Fix x2golistdesktops on EL7 (bug #1371690) From 178b54618c8a11d4b37077801eafbd5645ea7f4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:36:56 +0000 Subject: [PATCH 060/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index ddf2278..58fdcbd 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -356,6 +356,9 @@ exit 0 %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 4.0.1.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Nov 20 2016 Orion Poplawski - 4.0.1.20-1 - Update to 4.0.1.20 - Drop patches applied upstream From a19fb4288874802f5675450446a3b1008de5c085 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 4 Jun 2017 07:45:13 +0200 Subject: [PATCH 061/113] Perl 5.26 rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 58fdcbd..edbc108 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -356,6 +356,9 @@ exit 0 %changelog +* Sun Jun 04 2017 Jitka Plesnikova - 4.0.1.20-3 +- Perl 5.26 rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 4.0.1.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From a005c272f1cfde747fd16c930aa5bf4f9b498c52 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:50:40 +0000 Subject: [PATCH 062/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index edbc108..1d6c7b5 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -356,6 +356,9 @@ exit 0 %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 4.0.1.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sun Jun 04 2017 Jitka Plesnikova - 4.0.1.20-3 - Perl 5.26 rebuild From 41c937bc0124b97ab23010491efe2c71daa8c4d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:26:19 +0000 Subject: [PATCH 063/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 1d6c7b5..38a85b6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -356,6 +356,9 @@ exit 0 %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 4.0.1.20-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 4.0.1.20-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 4fcf743ab413947a7a3850e713d46ab5729cb5f4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 9 Nov 2017 08:34:38 -0700 Subject: [PATCH 064/113] Update to 4.0.1.21 --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 20 +++++++++++++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7e343e3..a70fa60 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /x2goserver-4.0.1.18.tar.gz /x2goserver-4.0.1.19.tar.gz /x2goserver-4.0.1.20.tar.gz +/x2goserver-4.0.1.21.tar.gz diff --git a/sources b/sources index 309d134..4ef90f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54f165ab50ccf329465d95ae108f6f64 x2goserver-4.0.1.20.tar.gz +SHA512 (x2goserver-4.0.1.21.tar.gz) = 641421b309baab0941416ccd60dd8b66b0a968a4031252c2d8066fb570c1985787848ad368d731fbdb4737c00ea722a26682fb8cd2820ea19da271c4ecffafa4 diff --git a/x2goserver.spec b/x2goserver.spec index 38a85b6..02e4bb2 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.20 -Release: 5%{?dist} +Version: 4.0.1.21 +Release: 1%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -45,7 +45,7 @@ Requires: pwgen Requires: sshfs # For /etc/sudoers.d Requires: sudo -Requires: x2goagent >= 3.5.0.25 +Requires: x2goagent >= 3.5.0.33 Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth Requires: xorg-x11-xkb-utils @@ -62,6 +62,11 @@ Requires(postun): systemd # http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=755 Obsoletes: x2goserver-extensions < %{version}-%{release} Provides: x2goserver-extensions = %{version}-%{release} +Requires: x2goserver-xsession +%if 0%{?fedora} >= 21 +Suggests: x2goserver-fmbindings +Suggests: x2goserver-printing +%endif %{?perl_default_filter} @@ -129,6 +134,9 @@ Summary: X2Go Server Xsession runner Requires: %{name} = %{version}-%{release} # Symlinks to xinit files Requires: xorg-x11-xinit +%if 0%{?fedora} +Requires: dbus +%endif Group: Applications/Communications %description xsession @@ -244,7 +252,7 @@ fi %postun %if 0%{?fedora} || 0%{?rhel} >= 7 -%systemd_postun x2gocleansessions.service +%systemd_postun_with_restart x2gocleansessions.service %else if [ "$1" -ge "1" ] ; then /sbin/service x2gocleansessions condrestart >/dev/null 2>&1 || : @@ -282,7 +290,6 @@ exit 0 %ghost %config(noreplace) %{_sysconfdir}/x2go/applications %config(noreplace) %{_sysconfdir}/x2go/x2go_logout %config(noreplace) %{_sysconfdir}/x2go/x2go_logout.d/ -%config(noreplace) %{_sysconfdir}/x2go/x2goagent.options %config(noreplace) %{_sysconfdir}/x2go/x2goserver.conf %config(noreplace) %{_sysconfdir}/x2go/x2gosql/ %{_bindir}/x2go* @@ -356,6 +363,9 @@ exit 0 %changelog +* Wed Nov 8 2017 Orion Poplawski - 4.0.1.21-1 +- Update to 4.0.1.21 + * Thu Aug 03 2017 Fedora Release Engineering - 4.0.1.20-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From e42b626e1fde233d516292de2e499173b64a53c1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 11 Nov 2017 18:36:54 -0700 Subject: [PATCH 065/113] Update to 4.0.1.22 --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a70fa60..337b0b2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /x2goserver-4.0.1.19.tar.gz /x2goserver-4.0.1.20.tar.gz /x2goserver-4.0.1.21.tar.gz +/x2goserver-4.0.1.22.tar.gz diff --git a/sources b/sources index 4ef90f9..4063fa2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x2goserver-4.0.1.21.tar.gz) = 641421b309baab0941416ccd60dd8b66b0a968a4031252c2d8066fb570c1985787848ad368d731fbdb4737c00ea722a26682fb8cd2820ea19da271c4ecffafa4 +SHA512 (x2goserver-4.0.1.22.tar.gz) = ba726663f4fdedaa13cd1496a693cc9b0d7c1a815563ef8abdfe9e53b69c83379d0ed6c5569e6e7d77ac792a18a4dfed8c9b12c0a356664a66fe3be917fb7a67 diff --git a/x2goserver.spec b/x2goserver.spec index 02e4bb2..59c44a7 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,6 +1,6 @@ #global checkout 20130722git65169c9 Name: x2goserver -Version: 4.0.1.21 +Version: 4.0.1.22 Release: 1%{?dist} Summary: X2Go Server @@ -363,6 +363,9 @@ exit 0 %changelog +* Sat Nov 11 2017 Orion Poplawski - 4.0.1.22-1 +- Update to 4.0.1.22 + * Wed Nov 8 2017 Orion Poplawski - 4.0.1.21-1 - Update to 4.0.1.21 From cf188982a59d2e3addccc0aaa75c9c905355b2d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:16:33 +0000 Subject: [PATCH 066/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 59c44a7..9f21919 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global checkout 20130722git65169c9 Name: x2goserver Version: 4.0.1.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -363,6 +363,9 @@ exit 0 %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 4.0.1.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Nov 11 2017 Orion Poplawski - 4.0.1.22-1 - Update to 4.0.1.22 From af5961762861480809ac974996235bc1170f9056 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 6 Mar 2018 11:01:03 -0700 Subject: [PATCH 067/113] Update to 4.1.0.0 --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 257 +++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 226 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 337b0b2..db57fc0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /x2goserver-4.0.1.20.tar.gz /x2goserver-4.0.1.21.tar.gz /x2goserver-4.0.1.22.tar.gz +/x2goserver-4.1.0.0.tar.gz diff --git a/sources b/sources index 4063fa2..4c193d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x2goserver-4.0.1.22.tar.gz) = ba726663f4fdedaa13cd1496a693cc9b0d7c1a815563ef8abdfe9e53b69c83379d0ed6c5569e6e7d77ac792a18a4dfed8c9b12c0a356664a66fe3be917fb7a67 +SHA512 (x2goserver-4.1.0.0.tar.gz) = 3f48dced332729d726bffa991a7a203035fc6580dd2e094561f52b327e7c2e48b807daf68219132fbec29b5abcb865021361a35654792e58da1f2e4715ea95d0 diff --git a/x2goserver.spec b/x2goserver.spec index 9f21919..3990e48 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,8 @@ -#global checkout 20130722git65169c9 +%global commit 3a0d285b225207b3eccbb7b0ec3f27a2fbdc5be3 + Name: x2goserver -Version: 4.0.1.22 -Release: 2%{?dist} +Version: 4.1.0.0 +Release: 1%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -11,11 +12,12 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. # git clone git://code.x2go.org/x2goserver # cd x2goserver # git archive --prefix=x2goserver-4.1.0.0-20130722git65169c9/ 65169c9d65b117802e50631be0bbd719163d969e | gzip > ../x2goserver-4.1.0.0-20130722git65169c9.tar.gz -#Source0: %{name}/%{name}-%{version}-%{checkout}.tar.gz +#Source0: %{name}/%{name}-%{version}-%{commit}.tar.gz Source1: x2gocleansessions.service Source2: x2gocleansessions.init BuildRequires: desktop-file-utils +BuildRequires: findutils BuildRequires: perl-generators BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -34,9 +36,6 @@ Requires: lsof # For netstat in x2goresume-session Requires: net-tools Requires: openssh-server -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -# We need a database -Requires: perl(DBD::SQLite) # For killall in x2gosuspend-session Requires: psmisc # For x2godbadmin @@ -45,20 +44,29 @@ Requires: pwgen Requires: sshfs # For /etc/sudoers.d Requires: sudo -Requires: x2goagent >= 3.5.0.33 +Requires: which +Requires: x2goagent = %{version}-%{release} +Requires: x2goserver-common = %{version}-%{release} Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth Requires: xorg-x11-xkb-utils Requires(pre): shadow-utils Requires(post): coreutils Requires(post): grep -Requires(post): perl(DBD::SQLite) +Requires(post): perl-X2Go-Server-DB +Requires(post): x2goserver-common + %if 0%{?fedora} || 0%{?rhel} >= 7 -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{?systemd_requires} %endif -# Provide upstream path from upstream rpms + +%if 0%{?fedora} +Suggests: x2goserver-fmbindings = %{version}-%{release} +Suggests: x2goserver-printing = %{version}-%{release} +%endif +Requires: x2goserver-xsession = %{version}-%{release} + +# Provide upgrade path from upstream rpms # http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=755 Obsoletes: x2goserver-extensions < %{version}-%{release} Provides: x2goserver-extensions = %{version}-%{release} @@ -83,6 +91,27 @@ This package contains the main daemon and tools for X2Go server-side session administrations. +%package common +Summary: X2Go Server (common files) +# for useradd/groupadd +BuildRequires: shadow-utils +Requires(pre): shadow-utils +Group: Applications/Communications +BuildArch: noarch + +%description common +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains common files needed by the X2Go Server +and the X2Go::Server Perl API. + + %package fmbindings Summary: X2Go Server file manager bindings Requires: %{name} = %{version}-%{release} @@ -132,12 +161,15 @@ server). %package xsession Summary: X2Go Server Xsession runner Requires: %{name} = %{version}-%{release} +# Not detected automatically +Requires: perl(Cwd) # Symlinks to xinit files Requires: xorg-x11-xinit %if 0%{?fedora} Requires: dbus %endif Group: Applications/Communications +BuildArch: noarch %description xsession X2Go is a server based computing environment with @@ -157,29 +189,111 @@ startups and many more Xsession related features on X2Go session login automagically. +%package -n perl-X2Go-Server +Summary: Perl X2Go::Server package +Requires: x2goserver-common = %{version}-%{release} +Requires: perl-X2Go-Log = %{version}-%{release} +Requires: perl-X2Go-Server-DB = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Group: Development/Libraries +BuildArch: noarch + +%description -n perl-X2Go-Server +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains the X2Go::Server Perl package. + + +%package -n perl-X2Go-Server-DB +Summary: Perl X2Go::Server::DB package +Requires: x2goserver-common = %{version}-%{release} +Requires: perl-X2Go-Log = %{version}-%{release} +# We need a database +Requires(post): perl(DBD::SQLite) +Requires: perl(DBD::SQLite) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Group: Development/Libraries + +%description -n perl-X2Go-Server-DB +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains the X2Go::Server::DB Perl package. + + +%package -n perl-X2Go-Log +Summary: Perl X2Go::Log package +Requires: x2goserver-common = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Group: Development/Libraries +BuildArch: noarch + +%description -n perl-X2Go-Log +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains the X2Go::Log Perl package. + + +%package -n x2goagent +Group: Applications/System +Summary: X2Go Server's X2Go Agent +Requires: nxagent >= 3.5.99.3 + +%description -n x2goagent +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +X2Go Agent functionality has been completely incorporated into +nxagent's code base. If the nxagent binary is executed under the name +of "x2goagent", the X2Go functionalities get activated. + +The x2goagent package is a wrapper that activates X2Go branding in +nxagent. Please refer to the nxagent package's description for more +information on NX. + + %prep %setup -q # Set path find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath -sed -i -e 's/\t$(MAKE) -C x2goserver-compat/#\t$(MAKE) -C x2goserver-compat/g' Makefile -sed -i -e 's/\t$(MAKE) -C x2goserver-pyhoca/#\t$(MAKE) -C x2goserver-pyhoca/g' Makefile # Don't try to be root sed -i -e 's/-o root -g root//' */Makefile %build export PATH=%{_qt4_bindir}:$PATH -make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} +make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx %install -make install DESTDIR=%{buildroot} PREFIX=%{_prefix} +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx -# Make symbolic link relative (xsession - disabled for now) -#rm %{buildroot}%{_sysconfdir}/x2go/Xresources -#ln -s ../X11/Xresources %{buildroot}%{_sysconfdir}/x2go/ +# Make sure the .packlist file is removed from %%{perl_vendorarch}... +find %{buildroot}%{perl_vendorarch} -name .packlist -delete # Remove placeholder files rm %{buildroot}%{_libdir}/x2go/extensions/*.d/.placeholder @@ -207,8 +321,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/x2gofm.desktop # applications link ln -s ../..%{_datadir}/applications %{buildroot}%{_sysconfdir}/x2go/applications +# Delete tmpfiles.d configuration file on systems not using systemd. +%if 0%{?rhel} && 0%{?rhel} == 6 +rm -f %{buildroot}/etc/tmpfiles.d/x2goserver.conf +%endif -%pre + +%pre common getent group x2gouser >/dev/null || groupadd -r x2gouser getent passwd x2gouser >/dev/null || \ useradd -r -g x2gouser -d /var/lib/x2go -s /sbin/nologin \ @@ -221,6 +340,11 @@ exit 0 grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 && %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || : +# Update the session database +[ -s %{_sharedstatedir}/x2go/x2go_sessions ] && + grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 && + %{_sbindir}/x2godbadmin --updatedb >/dev/null 2>&1 || : + # create /etc/x2go/applications symlink if not already there # as a regular file, as a symlink, as a special file or as a directory if ! [ -e %{_sysconfdir}/x2go/applications ]; then @@ -283,48 +407,46 @@ exit 0 %files %license COPYING -%doc ChangeLog +%doc ChangeLog README.md %config(noreplace) %{_sysconfdir}/logcheck %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %dir %{_sysconfdir}/x2go/ %ghost %config(noreplace) %{_sysconfdir}/x2go/applications -%config(noreplace) %{_sysconfdir}/x2go/x2go_logout -%config(noreplace) %{_sysconfdir}/x2go/x2go_logout.d/ -%config(noreplace) %{_sysconfdir}/x2go/x2goserver.conf -%config(noreplace) %{_sysconfdir}/x2go/x2gosql/ +%config(noreplace) %{_sysconfdir}/x2go/x2goagent.options %{_bindir}/x2go* %exclude %{_bindir}/x2gofm %exclude %{_bindir}/x2goprint +%exclude %{_bindir}/x2goagent %dir %{_libdir}/x2go %{_libdir}/x2go/extensions -%{_libdir}/x2go/x2gosqlitewrapper.pl -%attr(02755,root,x2gouser) %{_libdir}/x2go/x2gosqlitewrapper %{_libdir}/x2go/x2gochangestatus +%{_libdir}/x2go/x2gocheckport %{_libdir}/x2go/x2gocreatesession -%{_libdir}/x2go/x2godbwrapper.pm +%{_libdir}/x2go/x2gocreateshadowsession %{_libdir}/x2go/x2gogetagent %{_libdir}/x2go/x2gogetagentstate %{_libdir}/x2go/x2gogetdisplays +%{_libdir}/x2go/x2gogetfreeport %{_libdir}/x2go/x2gogetports +%{_libdir}/x2go/x2gogetrandomport %{_libdir}/x2go/x2gogetstatus %{_libdir}/x2go/x2goinsertport %{_libdir}/x2go/x2goinsertsession +%{_libdir}/x2go/x2goinsertshadowsession +%{_libdir}/x2go/x2goistrue %{_libdir}/x2go/x2golistsessions_sql %{_libdir}/x2go/x2gologlevel -%{_libdir}/x2go/x2gologlevel.pm -%{_libdir}/x2go/x2goutils.pm +%{_libdir}/x2go/x2goqueryconfig %{_libdir}/x2go/x2goresume %{_libdir}/x2go/x2gormforward %{_libdir}/x2go/x2gormport %{_libdir}/x2go/x2gosuspend-agent %{_libdir}/x2go/x2gosyslog %{_sbindir}/x2go* -%{_mandir}/man5/x2go*.5* %{_mandir}/man8/x2go*.8* %exclude %{_mandir}/man8/x2gofm.8* %exclude %{_mandir}/man8/x2goprint.8* %dir %{_datadir}/x2go/ -%dir %{_datadir}/x2go/versions %{_datadir}/x2go/versions/VERSION.x2goserver %{_datadir}/x2go/versions/VERSION.x2goserver-extensions %dir %{_datadir}/x2go/x2gofeature.d @@ -338,6 +460,23 @@ exit 0 %{_initddir}/x2gocleansessions %endif +%files common +%license COPYING +%doc ChangeLog +%attr(0775,root,x2gouser) %dir %{_localstatedir}/lib/x2go/ +%if 0%{?rhel} != 6 +%config(noreplace) %{_sysconfdir}/tmpfiles.d/x2goserver.conf +%endif +%dir %{_sysconfdir}/x2go/ +%dir %{_sysconfdir}/x2go/x2gosql +%dir %{_sysconfdir}/x2go/x2gosql/passwords +%config(noreplace) %{_sysconfdir}/x2go/x2goserver.conf +%config(noreplace) %{_sysconfdir}/x2go/x2gosql/sql +%config(noreplace) %{_sysconfdir}/x2go/x2go_logout* +%{_mandir}/man5/x2goserver.conf.5.gz +%dir %{_datadir}/x2go/versions +%{_datadir}/x2go/versions/VERSION.x2goserver-common + %files fmbindings %{_bindir}/x2gofm %{_datadir}/applications/x2gofm.desktop @@ -361,8 +500,60 @@ exit 0 %{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features %{_datadir}/x2go/versions/VERSION.x2goserver-xsession +%files -n perl-X2Go-Log +%license COPYING +%doc ChangeLog +%dir %{perl_vendorlib}/X2Go +%{perl_vendorlib}/X2Go/Log.pm +%{_mandir}/man3/X2Go::Log.* + +%files -n perl-X2Go-Server +%license COPYING +%doc ChangeLog +%dir %{perl_vendorlib}/X2Go/Server +%{perl_vendorlib}/X2Go/Config.pm +%{perl_vendorlib}/X2Go/Server.pm +%{perl_vendorlib}/X2Go/SupeReNicer.pm +%{perl_vendorlib}/X2Go/Utils.pm +%{perl_vendorlib}/X2Go/Server/Agent* +%{_mandir}/man3/X2Go::Config.* +%{_mandir}/man3/X2Go::Server.* +%{_mandir}/man3/X2Go::SupeReNicer.* +%{_mandir}/man3/X2Go::Utils.* +%{_mandir}/man3/X2Go::Server::Agent.* +%{_mandir}/man3/X2Go::Server::Agent::* + +%files -n perl-X2Go-Server-DB +%license COPYING +%doc ChangeLog +%dir %{_libdir}/x2go +%{perl_vendorlib}/X2Go/Server/DB* +%attr(2755,root,x2gouser) %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper +%{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper.pl +%{_mandir}/man3/X2Go::Server::DB.* +%{_mandir}/man3/X2Go::Server::DB::* + +%files -n x2goagent +%license COPYING +%doc ChangeLog +%{_bindir}/x2goagent +# %{_libdir}/nx/bin/ is owned by nxagent package... +%{_libdir}/nx/bin/x2goagent +%{_datadir}/x2go/versions/VERSION.x2goserver-x2goagent +%{_datadir}/x2go/rgb +%{_datadir}/pixmaps/x2go.xpm +%{_datadir}/x2go/x2gofeature.d/x2goserver-x2goagent.features +%{_mandir}/man1/x2goagent.1* +%config(noreplace) %{_sysconfdir}/x2go/x2goagent.keyboard +%config(noreplace) %{_sysconfdir}/x2go/x2goagent.options +%config(noreplace) %{_sysconfdir}/x2go/keystrokes.cfg +%config(noreplace) %{_sysconfdir}/x2go/rgb + %changelog +* Mon Mar 5 2018 Orion Poplawski - 4.1.0.0-1 +- Update to 4.1.0.0 + * Fri Feb 09 2018 Fedora Release Engineering - 4.0.1.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 7f62b976076d0e92bbac1916d3bdea62773f888a Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 27 Jun 2018 22:21:09 +0200 Subject: [PATCH 068/113] Perl 5.28 rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 3990e48..f24cddf 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -551,6 +551,9 @@ exit 0 %changelog +* Wed Jun 27 2018 Jitka Plesnikova - 4.1.0.0-2 +- Perl 5.28 rebuild + * Mon Mar 5 2018 Orion Poplawski - 4.1.0.0-1 - Update to 4.1.0.0 From 72a4ca7e4269761e25db22d7f2a9d311354f467d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:03:55 +0000 Subject: [PATCH 069/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index f24cddf..ceb4969 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -551,6 +551,9 @@ exit 0 %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 4.1.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jun 27 2018 Jitka Plesnikova - 4.1.0.0-2 - Perl 5.28 rebuild From 8f19a84f83a49e5c9633937319a39c8af548979c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 20 Jul 2018 15:30:50 -0600 Subject: [PATCH 070/113] Add BR gcc --- x2goserver.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index ceb4969..ca0b5dc 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -16,6 +16,7 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. Source1: x2gocleansessions.service Source2: x2gocleansessions.init +BuildRequires: gcc BuildRequires: desktop-file-utils BuildRequires: findutils BuildRequires: perl-generators @@ -551,6 +552,9 @@ exit 0 %changelog +* Fri Jul 20 2018 Orion Poplawski - 4.1.0.0-4 +- Add BR gcc + * Sat Jul 14 2018 Fedora Release Engineering - 4.1.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From ebce9c7a1678ca75300b38bc1c8b0246b78b9917 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 29 Jul 2018 19:54:03 -0600 Subject: [PATCH 071/113] Update to 4.1.0.1 --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 15 ++++++++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index db57fc0..1788874 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /x2goserver-4.0.1.21.tar.gz /x2goserver-4.0.1.22.tar.gz /x2goserver-4.1.0.0.tar.gz +/x2goserver-4.1.0.1.tar.gz diff --git a/sources b/sources index 4c193d3..0409379 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x2goserver-4.1.0.0.tar.gz) = 3f48dced332729d726bffa991a7a203035fc6580dd2e094561f52b327e7c2e48b807daf68219132fbec29b5abcb865021361a35654792e58da1f2e4715ea95d0 +SHA512 (x2goserver-4.1.0.1.tar.gz) = cd201cef75585d1c918d481710ca03608cadff9c5adba073e48750b5c9dcefe70f1d7ae0d77aa619e2bb3fffa644f8da261bc486e0dced4094d179888ddc9964 diff --git a/x2goserver.spec b/x2goserver.spec index ca0b5dc..bbee62a 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,8 +1,8 @@ -%global commit 3a0d285b225207b3eccbb7b0ec3f27a2fbdc5be3 +#global commit 3a0d285b225207b3eccbb7b0ec3f27a2fbdc5be3 Name: x2goserver -Version: 4.1.0.0 -Release: 4%{?dist} +Version: 4.1.0.1 +Release: 1%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -466,7 +466,7 @@ exit 0 %doc ChangeLog %attr(0775,root,x2gouser) %dir %{_localstatedir}/lib/x2go/ %if 0%{?rhel} != 6 -%config(noreplace) %{_sysconfdir}/tmpfiles.d/x2goserver.conf +%{_tmpfilesdir}/x2goserver.conf %endif %dir %{_sysconfdir}/x2go/ %dir %{_sysconfdir}/x2go/x2gosql @@ -541,17 +541,18 @@ exit 0 # %{_libdir}/nx/bin/ is owned by nxagent package... %{_libdir}/nx/bin/x2goagent %{_datadir}/x2go/versions/VERSION.x2goserver-x2goagent -%{_datadir}/x2go/rgb -%{_datadir}/pixmaps/x2go.xpm +%{_datadir}/pixmaps/x2goagent.xpm %{_datadir}/x2go/x2gofeature.d/x2goserver-x2goagent.features %{_mandir}/man1/x2goagent.1* %config(noreplace) %{_sysconfdir}/x2go/x2goagent.keyboard %config(noreplace) %{_sysconfdir}/x2go/x2goagent.options %config(noreplace) %{_sysconfdir}/x2go/keystrokes.cfg -%config(noreplace) %{_sysconfdir}/x2go/rgb %changelog +* Sun Jul 29 2018 Orion Poplawski - 4.1.0.1-1 +- Update to 4.1.0.1 + * Fri Jul 20 2018 Orion Poplawski - 4.1.0.0-4 - Add BR gcc From c31485456873692f91c3736d943b7681b1283b26 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 31 Jul 2018 13:46:17 +0200 Subject: [PATCH 072/113] Rebuild with fixed binutils --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index bbee62a..cb5a875 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -550,6 +550,9 @@ exit 0 %changelog +* Tue Jul 31 2018 Florian Weimer - 4.1.0.1-2 +- Rebuild with fixed binutils + * Sun Jul 29 2018 Orion Poplawski - 4.1.0.1-1 - Update to 4.1.0.1 From a5111e673974eed51a9d5c51e51c02148b939a71 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 14 Aug 2018 11:31:56 -0600 Subject: [PATCH 073/113] Update to 4.1.0.2 --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1788874..bb0111c 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /x2goserver-4.0.1.22.tar.gz /x2goserver-4.1.0.0.tar.gz /x2goserver-4.1.0.1.tar.gz +/x2goserver-4.1.0.2.tar.gz diff --git a/sources b/sources index 0409379..8f06069 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x2goserver-4.1.0.1.tar.gz) = cd201cef75585d1c918d481710ca03608cadff9c5adba073e48750b5c9dcefe70f1d7ae0d77aa619e2bb3fffa644f8da261bc486e0dced4094d179888ddc9964 +SHA512 (x2goserver-4.1.0.2.tar.gz) = 32f9f38889b79a836bba12bf8df61d0a1530959b1e0da52935a330472a3933288edc611a4843ae145261e954a61e5b61a00a7cb0563b276bcad0587e00c09672 diff --git a/x2goserver.spec b/x2goserver.spec index cb5a875..b527850 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,8 +1,8 @@ #global commit 3a0d285b225207b3eccbb7b0ec3f27a2fbdc5be3 Name: x2goserver -Version: 4.1.0.1 -Release: 2%{?dist} +Version: 4.1.0.2 +Release: 1%{?dist} Summary: X2Go Server Group: Applications/Communications @@ -550,6 +550,9 @@ exit 0 %changelog +* Tue Aug 14 Orion Poplawski - 4.1.0.2-1 +- Update to 4.1.0.2 + * Tue Jul 31 2018 Florian Weimer - 4.1.0.1-2 - Rebuild with fixed binutils From b2c37ffa48d31e5df1ec1a2b5f7883c088a0b666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 27 Aug 2018 08:29:36 +0200 Subject: [PATCH 074/113] Correct changelog entry Malformatted changelog entry breaks rpmbuild: BUILDSTDERR: error: bad date in %changelog: Tue Aug 14 Orion Poplawski - 4.1.0.2-1 --- x2goserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index b527850..617fec9 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -550,7 +550,7 @@ exit 0 %changelog -* Tue Aug 14 Orion Poplawski - 4.1.0.2-1 +* Tue Aug 14 2018 Orion Poplawski - 4.1.0.2-1 - Update to 4.1.0.2 * Tue Jul 31 2018 Florian Weimer - 4.1.0.1-2 From 0abaf0e0cb1ab828a9c773d1bfbe0f858ae1f61d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 29 Nov 2018 22:12:07 -0700 Subject: [PATCH 075/113] Update to 4.1.0.3 --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 53 ++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bb0111c..74a7b1e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /x2goserver-4.1.0.0.tar.gz /x2goserver-4.1.0.1.tar.gz /x2goserver-4.1.0.2.tar.gz +/x2goserver-4.1.0.3.tar.gz diff --git a/sources b/sources index 8f06069..bb16b11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x2goserver-4.1.0.2.tar.gz) = 32f9f38889b79a836bba12bf8df61d0a1530959b1e0da52935a330472a3933288edc611a4843ae145261e954a61e5b61a00a7cb0563b276bcad0587e00c09672 +SHA512 (x2goserver-4.1.0.3.tar.gz) = 9d7257dd454bfedca9e3ef1b07bc38b540cb833fae4535f2225a1f0bfea93c0f04c638d411b57c50e7170106a5ae1d7f41c19f043832129a7a9460dcfd34c56a diff --git a/x2goserver.spec b/x2goserver.spec index 617fec9..21a78ed 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,7 +1,7 @@ #global commit 3a0d285b225207b3eccbb7b0ec3f27a2fbdc5be3 Name: x2goserver -Version: 4.1.0.2 +Version: 4.1.0.3 Release: 1%{?dist} Summary: X2Go Server @@ -85,6 +85,7 @@ X2Go is a server based computing environment with - low bandwidth support - session brokerage support - client side mass storage mounting support + - client side printing support - audio support - authentication by smartcard and USB stick @@ -106,6 +107,7 @@ X2Go is a server based computing environment with - low bandwidth support - session brokerage support - client side mass storage mounting support + - client side printing support - audio support - authentication by smartcard and USB stick @@ -125,6 +127,7 @@ X2Go is a server based computing environment with - low bandwidth support - session brokerage support - client side mass storage mounting support + - client side printing support - audio support - authentication by smartcard and USB stick @@ -159,6 +162,30 @@ this package on the X2Go server(s) (and the cups-x2go package on the CUPS server). +%package desktopsharing +Summary: X2Go Server (Desktop Sharing support) +Requires: %{name} = %{version}-%{release} +Requires: x2godesktopsharing >= 3.2.0.0 +Group: Applications/Communications + +%description desktopsharing +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +X2Go Desktop Sharing is an X2Go add-on feature that allows a user to +grant other X2Go users access to the current session (shadow session +support). The user's current session may be an X2Go session itself or +simply a local X11 session. + +This package contains all the integration and configuration logics +of a system-wide manageable desktop sharing setup. + + %package xsession Summary: X2Go Server Xsession runner Requires: %{name} = %{version}-%{release} @@ -178,6 +205,7 @@ X2Go is a server based computing environment with - low bandwidth support - session brokerage support - client side mass storage mounting support + - client side printing support - audio support - authentication by smartcard and USB stick @@ -205,6 +233,7 @@ X2Go is a server based computing environment with - low bandwidth support - session brokerage support - client side mass storage mounting support + - client side printing support - audio support - authentication by smartcard and USB stick @@ -227,6 +256,7 @@ X2Go is a server based computing environment with - low bandwidth support - session brokerage support - client side mass storage mounting support + - client side printing support - audio support - authentication by smartcard and USB stick @@ -246,6 +276,7 @@ X2Go is a server based computing environment with - low bandwidth support - session brokerage support - client side mass storage mounting support + - client side printing support - audio support - authentication by smartcard and USB stick @@ -255,7 +286,7 @@ This package contains the X2Go::Log Perl package. %package -n x2goagent Group: Applications/System Summary: X2Go Server's X2Go Agent -Requires: nxagent >= 3.5.99.3 +Requires: nxagent >= 3.5.99.17 %description -n x2goagent X2Go is a server based computing environment with @@ -263,6 +294,7 @@ X2Go is a server based computing environment with - low bandwidth support - session brokerage support - client side mass storage mounting support + - client side printing support - audio support - authentication by smartcard and USB stick @@ -287,7 +319,7 @@ sed -i -e 's/-o root -g root//' */Makefile %build export PATH=%{_qt4_bindir}:$PATH -make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx +%make_build CFLAGS="%{optflags}" PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx %install @@ -418,6 +450,7 @@ exit 0 %exclude %{_bindir}/x2gofm %exclude %{_bindir}/x2goprint %exclude %{_bindir}/x2goagent +%exclude %{_bindir}/x2go*-desktopsharing %dir %{_libdir}/x2go %{_libdir}/x2go/extensions %{_libdir}/x2go/x2gochangestatus @@ -447,6 +480,7 @@ exit 0 %{_mandir}/man8/x2go*.8* %exclude %{_mandir}/man8/x2gofm.8* %exclude %{_mandir}/man8/x2goprint.8* +%exclude %{_mandir}/man8/x2go*-desktopsharing.8* %dir %{_datadir}/x2go/ %{_datadir}/x2go/versions/VERSION.x2goserver %{_datadir}/x2go/versions/VERSION.x2goserver-extensions @@ -478,6 +512,16 @@ exit 0 %dir %{_datadir}/x2go/versions %{_datadir}/x2go/versions/VERSION.x2goserver-common +%files desktopsharing +%license COPYING +%doc ChangeLog +%{_bindir}/x2go*-desktopsharing +%{_datadir}/x2go/versions/VERSION.x2goserver-desktopsharing +%{_datadir}/x2go/x2gofeature.d/x2goserver-desktopsharing.features +%{_mandir}/man8/x2go*-desktopsharing.8* +%dir %{_sysconfdir}/x2go/desktopsharing +%config(noreplace) %{_sysconfdir}/x2go/desktopsharing/settings + %files fmbindings %{_bindir}/x2gofm %{_datadir}/applications/x2gofm.desktop @@ -550,6 +594,9 @@ exit 0 %changelog +* Thu Nov 29 2018 Orion Poplawski - 4.1.0.3-1 +- Update to 4.1.0.3 + * Tue Aug 14 2018 Orion Poplawski - 4.1.0.2-1 - Update to 4.1.0.2 From 6b08474d5d70f77f681ee67e2ae05e079917ea8a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 076/113] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- x2goserver.spec | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 21a78ed..53cc788 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -5,7 +5,6 @@ Version: 4.1.0.3 Release: 1%{?dist} Summary: X2Go Server -Group: Applications/Communications License: GPLv2+ URL: http://www.x2go.org Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz @@ -98,7 +97,6 @@ Summary: X2Go Server (common files) # for useradd/groupadd BuildRequires: shadow-utils Requires(pre): shadow-utils -Group: Applications/Communications BuildArch: noarch %description common @@ -119,7 +117,6 @@ and the X2Go::Server Perl API. Summary: X2Go Server file manager bindings Requires: %{name} = %{version}-%{release} Requires: xdg-utils -Group: Applications/Communications %description fmbindings X2Go is a server based computing environment with @@ -147,7 +144,6 @@ corresponding desktop shell: %package printing Summary: X2Go Server printing support Requires: %{name} = %{version}-%{release} -Group: Applications/Communications %description printing The X2Go Server printing package provides client-side printing support for @@ -166,7 +162,6 @@ server). Summary: X2Go Server (Desktop Sharing support) Requires: %{name} = %{version}-%{release} Requires: x2godesktopsharing >= 3.2.0.0 -Group: Applications/Communications %description desktopsharing X2Go is a server based computing environment with @@ -196,7 +191,6 @@ Requires: xorg-x11-xinit %if 0%{?fedora} Requires: dbus %endif -Group: Applications/Communications BuildArch: noarch %description xsession @@ -224,7 +218,6 @@ Requires: x2goserver-common = %{version}-%{release} Requires: perl-X2Go-Log = %{version}-%{release} Requires: perl-X2Go-Server-DB = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Group: Development/Libraries BuildArch: noarch %description -n perl-X2Go-Server @@ -248,7 +241,6 @@ Requires: perl-X2Go-Log = %{version}-%{release} Requires(post): perl(DBD::SQLite) Requires: perl(DBD::SQLite) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Group: Development/Libraries %description -n perl-X2Go-Server-DB X2Go is a server based computing environment with @@ -267,7 +259,6 @@ This package contains the X2Go::Server::DB Perl package. Summary: Perl X2Go::Log package Requires: x2goserver-common = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Group: Development/Libraries BuildArch: noarch %description -n perl-X2Go-Log @@ -284,7 +275,6 @@ This package contains the X2Go::Log Perl package. %package -n x2goagent -Group: Applications/System Summary: X2Go Server's X2Go Agent Requires: nxagent >= 3.5.99.17 From c39c78443ba5aa361be3c14311f13f722b1920fb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 29 Jan 2019 06:05:40 +0100 Subject: [PATCH 077/113] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- x2goserver.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 53cc788..c076f52 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -406,20 +406,6 @@ if [ "$1" -ge "1" ] ; then fi %endif -%post fmbindings -touch --no-create %{_datadir}/mime/packages &> /dev/null || : -/usr/bin/update-desktop-database &>/dev/null || : - -%postun fmbindings -/usr/bin/update-desktop-database &>/dev/null || : -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || : - /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : -fi - -%posttrans fmbindings -/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : - %pre printing getent group x2goprint >/dev/null || groupadd -r x2goprint getent passwd x2goprint >/dev/null || \ From 33419e8e4b65a16ec66e0a36510be260baa03d78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:02:53 +0000 Subject: [PATCH 078/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index c076f52..da18833 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go Server License: GPLv2+ @@ -570,6 +570,9 @@ exit 0 %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 4.1.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Nov 29 2018 Orion Poplawski - 4.1.0.3-1 - Update to 4.1.0.3 From 9b768842ed10208a9e842ebc1f876e19303519ba Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 18 Apr 2019 20:17:09 -0600 Subject: [PATCH 079/113] Upstream replaced netstat with ss in 4.1.0.0 (bugz#1496167) --- x2goserver.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index da18833..051e992 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: X2Go Server License: GPLv2+ @@ -31,10 +31,10 @@ BuildRequires: xorg-x11-xinit # For x2goruncommand - for now Requires: bc Requires: grep +# For ss in x2gogetfreeport +Requires: iproute # For x2goshowblocks Requires: lsof -# For netstat in x2goresume-session -Requires: net-tools Requires: openssh-server # For killall in x2gosuspend-session Requires: psmisc @@ -570,6 +570,9 @@ exit 0 %changelog +* Thu Apr 18 2019 Orion Poplawski - 4.1.0.3-3 +- Upstream replaced netstat with ss in 4.1.0.0 (bugz#1496167) + * Sun Feb 03 2019 Fedora Release Engineering - 4.1.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 3b80d9fb7c9c7de392390175a36d574fa36ee847 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 30 May 2019 13:57:15 +0200 Subject: [PATCH 080/113] Perl 5.30 rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 051e992..060035f 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: X2Go Server License: GPLv2+ @@ -570,6 +570,9 @@ exit 0 %changelog +* Thu May 30 2019 Jitka Plesnikova - 4.1.0.3-4 +- Perl 5.30 rebuild + * Thu Apr 18 2019 Orion Poplawski - 4.1.0.3-3 - Upstream replaced netstat with ss in 4.1.0.0 (bugz#1496167) From b26d2b450c5be5ac71b147fe6bb5d75ca4ac72fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:49:21 +0000 Subject: [PATCH 081/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 060035f..b613db8 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: X2Go Server License: GPLv2+ @@ -570,6 +570,9 @@ exit 0 %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 4.1.0.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu May 30 2019 Jitka Plesnikova - 4.1.0.3-4 - Perl 5.30 rebuild From 48ada19b6c21bce3406e3b44ea9a8debb340cad6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:03:04 +0000 Subject: [PATCH 082/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index b613db8..97ab82c 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: X2Go Server License: GPLv2+ @@ -570,6 +570,9 @@ exit 0 %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 4.1.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 4.1.0.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 40c31d4f77089112a0d992e284507989f8bc2496 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 22 Jun 2020 19:11:40 +0200 Subject: [PATCH 083/113] Perl 5.32 rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 97ab82c..28f19b3 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: X2Go Server License: GPLv2+ @@ -570,6 +570,9 @@ exit 0 %changelog +* Mon Jun 22 2020 Jitka Plesnikova - 4.1.0.3-7 +- Perl 5.32 rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 4.1.0.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 3c63505d7aeabafd7d7a7f6cc45c49c7f8199998 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:24:58 +0000 Subject: [PATCH 084/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 28f19b3..b0f5b23 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: X2Go Server License: GPLv2+ @@ -570,6 +570,9 @@ exit 0 %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 4.1.0.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jun 22 2020 Jitka Plesnikova - 4.1.0.3-7 - Perl 5.32 rebuild From cc3610b7ecd934d481e133d48c0060387352ec7d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 5 Nov 2020 19:04:55 -0700 Subject: [PATCH 085/113] Change requires from xorg-x11-xkb-utils to setxkbmap (bz#1894794) --- x2goserver.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index b0f5b23..ecf02f7 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: X2Go Server License: GPLv2+ @@ -40,6 +40,7 @@ Requires: openssh-server Requires: psmisc # For x2godbadmin Requires: pwgen +Requires: setxkbmap # For printing, file-sharing Requires: sshfs # For /etc/sudoers.d @@ -49,7 +50,6 @@ Requires: x2goagent = %{version}-%{release} Requires: x2goserver-common = %{version}-%{release} Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth -Requires: xorg-x11-xkb-utils Requires(pre): shadow-utils Requires(post): coreutils Requires(post): grep @@ -570,6 +570,9 @@ exit 0 %changelog +* Fri Nov 06 2020 Orion Poplawski - 4.1.0.3-9 +- Change requires from xorg-x11-xkb-utils to setxkbmap (bz#1894794) + * Wed Jul 29 2020 Fedora Release Engineering - 4.1.0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 660367f4f37ae8f022b3c8e4d0ee9765a4563c93 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:05:46 +0000 Subject: [PATCH 086/113] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- x2goserver.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/x2goserver.spec b/x2goserver.spec index ecf02f7..7a54715 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -15,6 +15,7 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. Source1: x2gocleansessions.service Source2: x2gocleansessions.init +BuildRequires: make BuildRequires: gcc BuildRequires: desktop-file-utils BuildRequires: findutils From a517ee2cb786df699e70a26c5e3726a8dad334d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:45:30 +0000 Subject: [PATCH 087/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 7a54715..83d2b76 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: X2Go Server License: GPLv2+ @@ -571,6 +571,9 @@ exit 0 %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 4.1.0.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Nov 06 2020 Orion Poplawski - 4.1.0.3-9 - Change requires from xorg-x11-xkb-utils to setxkbmap (bz#1894794) From da33243a8bebdc88a2ca06eb5a4836034dd98f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:01 +0100 Subject: [PATCH 088/113] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- x2goserver.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 83d2b76..251e5f6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: X2Go Server License: GPLv2+ @@ -571,6 +571,10 @@ exit 0 %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 4.1.0.3-11 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 27 2021 Fedora Release Engineering - 4.1.0.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 26149cb2f6a8d308ef8fd2e9da82e1f819285030 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 12:22:11 +0200 Subject: [PATCH 089/113] Perl 5.34 rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 251e5f6..88f9ded 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: X2Go Server License: GPLv2+ @@ -571,6 +571,9 @@ exit 0 %changelog +* Fri May 21 2021 Jitka Plesnikova - 4.1.0.3-12 +- Perl 5.34 rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 4.1.0.3-11 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 9f5cb7131d9d7d009c1bb1ddabfebf730d78e403 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:14:36 +0000 Subject: [PATCH 090/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 88f9ded..72d8489 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: X2Go Server License: GPLv2+ @@ -571,6 +571,9 @@ exit 0 %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.1.0.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri May 21 2021 Jitka Plesnikova - 4.1.0.3-12 - Perl 5.34 rebuild From 203c6a0e81082a37179a3b681a0a8915cf963d62 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 16 Nov 2021 20:24:23 -0700 Subject: [PATCH 091/113] fix typing mistakes --- x2goserver.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 72d8489..5dc8fd3 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: X2Go Server License: GPLv2+ @@ -134,7 +134,7 @@ for X2Go's local folder sharing. It can be used with all freedesktop.org compliant desktop shells. However, this package can be superseded by other, more specific -destkop binding components, if installed and being used with the +desktop binding components, if installed and being used with the corresponding desktop shell: - under LXDE by x2golxdebindings - under GNOMEv2 by x2gognomebindings @@ -331,7 +331,7 @@ touch %{buildroot}%{_sharedstatedir}/x2go/x2go_sessions mkdir -p %{buildroot}%{_localstatedir}/spool/x2goprint %if 0%{?fedora} || 0%{?rhel} >= 7 -# System.d session cleanup script +# systemd session cleanup script mkdir -p %{buildroot}%{_unitdir} install -pm0644 %SOURCE1 %{buildroot}%{_unitdir} %else @@ -571,6 +571,9 @@ exit 0 %changelog +* Tue Nov 16 2021 René Genz - 4.1.0.3-14 +- fix typing mistakes + * Fri Jul 23 2021 Fedora Release Engineering - 4.1.0.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild @@ -815,7 +818,7 @@ exit 0 - Use pwgen instead of makepasswd, which is not available on Fedora. - Fixed a missing function import in x2golistsessions. - Added dependencies for xorg-x11-fonts-misc -- Added system.d script for session cleanup on start. +- Added systemd script for session cleanup on start. - Fixed x2goruncommand for TERMINAL -> gnome-terminal; the latter seems to return immediately in Fedora 19. * Thu May 30 2013 Orion Poplawski - 4.1.0.0-0.3.20130520gitbd2cfe4 From 25edbb4b2d4091e612a4cd952ab61182a1fa61dd Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 18 Jan 2022 21:14:04 -0700 Subject: [PATCH 092/113] Add Requires on xwininfo and xmessage (bz#2025390) --- x2goserver.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 5dc8fd3..7fbce60 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 14%{?dist} +Release: 15%{?dist} Summary: X2Go Server License: GPLv2+ @@ -51,6 +51,7 @@ Requires: x2goagent = %{version}-%{release} Requires: x2goserver-common = %{version}-%{release} Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth +Requires: xwininfo Requires(pre): shadow-utils Requires(post): coreutils Requires(post): grep @@ -187,6 +188,7 @@ Summary: X2Go Server Xsession runner Requires: %{name} = %{version}-%{release} # Not detected automatically Requires: perl(Cwd) +Requires: xmessage # Symlinks to xinit files Requires: xorg-x11-xinit %if 0%{?fedora} @@ -571,6 +573,9 @@ exit 0 %changelog +* Wed Jan 19 2022 Orion Poplawski - 4.1.0.3-15 +- Add Requires on xwininfo and xmessage (bz#2025390) + * Tue Nov 16 2021 René Genz - 4.1.0.3-14 - fix typing mistakes From 66971e03055d6fb721de0ba7760af8bbad6736ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:46:12 +0000 Subject: [PATCH 093/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 7fbce60..6e1f8fe 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: X2Go Server License: GPLv2+ @@ -573,6 +573,9 @@ exit 0 %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.1.0.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jan 19 2022 Orion Poplawski - 4.1.0.3-15 - Add Requires on xwininfo and xmessage (bz#2025390) From 6d48e7f4ee662c0a9bb04f7be1dc0a72f0ae6f8a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 3 Feb 2022 19:50:31 -0700 Subject: [PATCH 094/113] Add upstream patch to fix x2goversion (bz#2050350) --- ...situations-where-compfile-contains-a.patch | 26 +++++++++++++++++++ x2goserver.spec | 11 +++++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 0001-x2goversion-Fix-situations-where-compfile-contains-a.patch diff --git a/0001-x2goversion-Fix-situations-where-compfile-contains-a.patch b/0001-x2goversion-Fix-situations-where-compfile-contains-a.patch new file mode 100644 index 0000000..0cdfeb9 --- /dev/null +++ b/0001-x2goversion-Fix-situations-where-compfile-contains-a.patch @@ -0,0 +1,26 @@ +From c80103788eebe0445efc2cefb56b074231b76f39 Mon Sep 17 00:00:00 2001 +From: Mike Gabriel +Date: Sat, 1 Dec 2018 11:42:40 +0100 +Subject: [PATCH] x2goversion: Fix situations where ${compfile} contains a + non-absolute path (e.g. it contains '../'). + +--- + x2goserver/bin/x2goversion | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion +index aa960a28..50e45c09 100755 +--- a/x2goserver/bin/x2goversion ++++ b/x2goserver/bin/x2goversion +@@ -42,7 +42,7 @@ if [ -n "${1}" ]; then + else + cd "${X2GO_VERSIONS_BASEPATH}" + for compfile in "${X2GO_VERSIONS_BASEPATH}"/*; do +- X2GO_COMPONENT="$(echo "${compfile}" | cut -d '.' -f '2')" ++ X2GO_COMPONENT="$(echo "$(basename ${compfile})" | cut -d '.' -f '2')" + X2GO_COMPONENT_VERSION="$(get_version "${compfile}")" + echo "${X2GO_COMPONENT}: ${X2GO_COMPONENT_VERSION}" + done +-- +2.11.0 + diff --git a/x2goserver.spec b/x2goserver.spec index 6e1f8fe..d569f4e 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 16%{?dist} +Release: 17%{?dist} Summary: X2Go Server License: GPLv2+ @@ -14,9 +14,11 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. #Source0: %{name}/%{name}-%{version}-%{commit}.tar.gz Source1: x2gocleansessions.service Source2: x2gocleansessions.init +# Upstream patch to fix x2goversion output +Patch0: 0001-x2goversion-Fix-situations-where-compfile-contains-a.patch -BuildRequires: make BuildRequires: gcc +BuildRequires: make BuildRequires: desktop-file-utils BuildRequires: findutils BuildRequires: perl-generators @@ -301,7 +303,7 @@ information on NX. %prep -%setup -q +%autosetup -p1 # Set path find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' @@ -573,6 +575,9 @@ exit 0 %changelog +* Fri Feb 04 2022 Orion Poplawski - 4.1.0.3-17 +- Add upstream patch to fix x2goversion (bz#2050350) + * Sat Jan 22 2022 Fedora Release Engineering - 4.1.0.3-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a5c502733d200d2a463812185b245880d4e6afe7 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 30 May 2022 20:21:54 +0200 Subject: [PATCH 095/113] Perl 5.36 rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index d569f4e..e999d93 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 17%{?dist} +Release: 18%{?dist} Summary: X2Go Server License: GPLv2+ @@ -575,6 +575,9 @@ exit 0 %changelog +* Mon May 30 2022 Jitka Plesnikova - 4.1.0.3-18 +- Perl 5.36 rebuild + * Fri Feb 04 2022 Orion Poplawski - 4.1.0.3-17 - Add upstream patch to fix x2goversion (bz#2050350) From 3e1017ba864ebc8f1874c507bdffdd96512a1126 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:44:30 +0000 Subject: [PATCH 096/113] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index e999d93..e2f1273 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 18%{?dist} +Release: 19%{?dist} Summary: X2Go Server License: GPLv2+ @@ -575,6 +575,9 @@ exit 0 %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.1.0.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon May 30 2022 Jitka Plesnikova - 4.1.0.3-18 - Perl 5.36 rebuild From 333dd201c96cd27480460129fcda9d5fd3d5aae3 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 21:18:48 +0100 Subject: [PATCH 097/113] Remove perl(MODULE_COMPAT), it will be replaced by generators --- x2goserver.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index e2f1273..e87dd43 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -222,7 +222,6 @@ Summary: Perl X2Go::Server package Requires: x2goserver-common = %{version}-%{release} Requires: perl-X2Go-Log = %{version}-%{release} Requires: perl-X2Go-Server-DB = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch %description -n perl-X2Go-Server @@ -245,7 +244,6 @@ Requires: perl-X2Go-Log = %{version}-%{release} # We need a database Requires(post): perl(DBD::SQLite) Requires: perl(DBD::SQLite) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -n perl-X2Go-Server-DB X2Go is a server based computing environment with @@ -263,7 +261,6 @@ This package contains the X2Go::Server::DB Perl package. %package -n perl-X2Go-Log Summary: Perl X2Go::Log package Requires: x2goserver-common = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch %description -n perl-X2Go-Log From bc937d9569a8714f6d27f1ba49d58377429ec5bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:06:18 +0000 Subject: [PATCH 098/113] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index e87dd43..102ab53 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 19%{?dist} +Release: 20%{?dist} Summary: X2Go Server License: GPLv2+ @@ -572,6 +572,9 @@ exit 0 %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.1.0.3-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 4.1.0.3-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 26724d80b234b2886531754713d9324d317de059 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 30 May 2023 13:30:59 -0600 Subject: [PATCH 099/113] Update to 4.1.0.4 --- .gitignore | 1 + ...situations-where-compfile-contains-a.patch | 26 -------- sources | 2 +- x2goserver.spec | 64 ++++++++++++++----- 4 files changed, 49 insertions(+), 44 deletions(-) delete mode 100644 0001-x2goversion-Fix-situations-where-compfile-contains-a.patch diff --git a/.gitignore b/.gitignore index 74a7b1e..49c9c47 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /x2goserver-4.1.0.1.tar.gz /x2goserver-4.1.0.2.tar.gz /x2goserver-4.1.0.3.tar.gz +/x2goserver-4.1.0.4.tar.gz diff --git a/0001-x2goversion-Fix-situations-where-compfile-contains-a.patch b/0001-x2goversion-Fix-situations-where-compfile-contains-a.patch deleted file mode 100644 index 0cdfeb9..0000000 --- a/0001-x2goversion-Fix-situations-where-compfile-contains-a.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c80103788eebe0445efc2cefb56b074231b76f39 Mon Sep 17 00:00:00 2001 -From: Mike Gabriel -Date: Sat, 1 Dec 2018 11:42:40 +0100 -Subject: [PATCH] x2goversion: Fix situations where ${compfile} contains a - non-absolute path (e.g. it contains '../'). - ---- - x2goserver/bin/x2goversion | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion -index aa960a28..50e45c09 100755 ---- a/x2goserver/bin/x2goversion -+++ b/x2goserver/bin/x2goversion -@@ -42,7 +42,7 @@ if [ -n "${1}" ]; then - else - cd "${X2GO_VERSIONS_BASEPATH}" - for compfile in "${X2GO_VERSIONS_BASEPATH}"/*; do -- X2GO_COMPONENT="$(echo "${compfile}" | cut -d '.' -f '2')" -+ X2GO_COMPONENT="$(echo "$(basename ${compfile})" | cut -d '.' -f '2')" - X2GO_COMPONENT_VERSION="$(get_version "${compfile}")" - echo "${X2GO_COMPONENT}: ${X2GO_COMPONENT_VERSION}" - done --- -2.11.0 - diff --git a/sources b/sources index bb16b11..32e823e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x2goserver-4.1.0.3.tar.gz) = 9d7257dd454bfedca9e3ef1b07bc38b540cb833fae4535f2225a1f0bfea93c0f04c638d411b57c50e7170106a5ae1d7f41c19f043832129a7a9460dcfd34c56a +SHA512 (x2goserver-4.1.0.4.tar.gz) = 0bc52491e35913504bb884e4f60b80894332625d550f15926c857d33984fc842cebbb1e0f2b6f7ce9d877be5b0abe67d3579e9dcc6a4029eb7a716f655aadfd8 diff --git a/x2goserver.spec b/x2goserver.spec index 102ab53..bc328f6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,8 +1,8 @@ #global commit 3a0d285b225207b3eccbb7b0ec3f27a2fbdc5be3 Name: x2goserver -Version: 4.1.0.3 -Release: 20%{?dist} +Version: 4.1.0.4 +Release: 1%{?dist} Summary: X2Go Server License: GPLv2+ @@ -14,8 +14,6 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. #Source0: %{name}/%{name}-%{version}-%{commit}.tar.gz Source1: x2gocleansessions.service Source2: x2gocleansessions.init -# Upstream patch to fix x2goversion output -Patch0: 0001-x2goversion-Fix-situations-where-compfile-contains-a.patch BuildRequires: gcc BuildRequires: make @@ -277,7 +275,7 @@ This package contains the X2Go::Log Perl package. %package -n x2goagent -Summary: X2Go Server's X2Go Agent +Summary: X2Go Server's X2Go Agent Xserver Requires: nxagent >= 3.5.99.17 %description -n x2goagent @@ -290,32 +288,53 @@ X2Go is a server based computing environment with - audio support - authentication by smartcard and USB stick -X2Go Agent functionality has been completely incorporated into -nxagent's code base. If the nxagent binary is executed under the name -of "x2goagent", the X2Go functionalities get activated. +X2Go agent functionality has been completely incorporated into NX +agent's code base. If the nxagent binary is executed under the name of +`x2goagent', the X2Go functionalities get activated. -The x2goagent package is a wrapper that activates X2Go branding in -nxagent. Please refer to the nxagent package's description for more -information on NX. +This package is a wrapper that activates X2Go branding in nxagent. +Please refer to the nxagent package's description for more information +on NX. + + +%package x2gokdrive +Summary: X2Go Server's X2Go KDrive Xserver +Requires: xorg-x11-server-x2gokdrive + +%description x2gokdrive +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - client side printing support + - audio support + - authentication by smartcard and USB stick + +X2Go KDrive technology implements a remote X11 Xserver backend for +modern desktop environments, namely desktops derived from the GNOME +desktop shell. + +X2Go KDrive does not require an XServer on the client-side, only the +X11-independent x2gokdriveclient. esktop session data transfers from +server to client use differential image compression and image data gets +cached client-side. %prep %autosetup -p1 -# Set path -find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' -sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath # Don't try to be root sed -i -e 's/-o root -g root//' */Makefile %build export PATH=%{_qt4_bindir}:$PATH -%make_build CFLAGS="%{optflags}" PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx +%make_build CFLAGS="%{optflags}" PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx LIBDIR=%{_libdir}/x2go %install -make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx LIBDIR=%{_libdir}/x2go # Make sure the .packlist file is removed from %%{perl_vendorarch}... find %{buildroot}%{perl_vendorarch} -name .packlist -delete @@ -445,6 +464,7 @@ exit 0 %{_libdir}/x2go/x2goinsertport %{_libdir}/x2go/x2goinsertsession %{_libdir}/x2go/x2goinsertshadowsession +%{_libdir}/x2go/x2goisint %{_libdir}/x2go/x2goistrue %{_libdir}/x2go/x2golistsessions_sql %{_libdir}/x2go/x2gologlevel @@ -455,6 +475,7 @@ exit 0 %{_libdir}/x2go/x2gosuspend-agent %{_libdir}/x2go/x2gosyslog %{_sbindir}/x2go* +%{_mandir}/man1/x2gooptionsstring.1* %{_mandir}/man8/x2go*.8* %exclude %{_mandir}/man8/x2gofm.8* %exclude %{_mandir}/man8/x2goprint.8* @@ -566,12 +587,21 @@ exit 0 %{_datadir}/pixmaps/x2goagent.xpm %{_datadir}/x2go/x2gofeature.d/x2goserver-x2goagent.features %{_mandir}/man1/x2goagent.1* -%config(noreplace) %{_sysconfdir}/x2go/x2goagent.keyboard %config(noreplace) %{_sysconfdir}/x2go/x2goagent.options %config(noreplace) %{_sysconfdir}/x2go/keystrokes.cfg +%files x2gokdrive +%license COPYING +%doc ChangeLog +%{_datadir}/x2go/versions/VERSION.x2goserver-x2gokdrive +%{_datadir}/x2go/x2gofeature.d/x2goserver-x2gokdrive.features +%config(noreplace) %{_sysconfdir}/x2go/x2gokdrive.options + %changelog +* Tue May 30 2023 Orion Poplawski - 4.1.0.4-1 +- Update to 4.1.0.4 + * Sat Jan 21 2023 Fedora Release Engineering - 4.1.0.3-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 47ab04c96e0384a93896ed160e523b91dcc41a5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:28:38 +0000 Subject: [PATCH 100/113] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index bc328f6..f299449 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go Server License: GPLv2+ @@ -599,6 +599,9 @@ exit 0 %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.1.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue May 30 2023 Orion Poplawski - 4.1.0.4-1 - Update to 4.1.0.4 From 751b3e84baa73ad05c801d6e0190b221b73682f5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 17 Aug 2023 22:23:54 -0600 Subject: [PATCH 101/113] Update to 4.1.0.6 --- .gitignore | 1 + sources | 2 +- x2goserver.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 49c9c47..691bb4d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /x2goserver-4.1.0.2.tar.gz /x2goserver-4.1.0.3.tar.gz /x2goserver-4.1.0.4.tar.gz +/x2goserver-4.1.0.6.tar.gz diff --git a/sources b/sources index 32e823e..9382efe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x2goserver-4.1.0.4.tar.gz) = 0bc52491e35913504bb884e4f60b80894332625d550f15926c857d33984fc842cebbb1e0f2b6f7ce9d877be5b0abe67d3579e9dcc6a4029eb7a716f655aadfd8 +SHA512 (x2goserver-4.1.0.6.tar.gz) = 3c82ae5bd86dd938bedc70aa01d2d9123d749a36396f44100a7a94e58e5dba2d347fc967691fe0978b55e42b7fb90ddd065eafaba88dc6faee83c14645447e1b diff --git a/x2goserver.spec b/x2goserver.spec index f299449..bbf9f95 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,8 +1,8 @@ #global commit 3a0d285b225207b3eccbb7b0ec3f27a2fbdc5be3 Name: x2goserver -Version: 4.1.0.4 -Release: 2%{?dist} +Version: 4.1.0.6 +Release: 1%{?dist} Summary: X2Go Server License: GPLv2+ @@ -599,6 +599,9 @@ exit 0 %changelog +* Fri Aug 18 2023 Orion Poplawski - 4.1.0.6-1 +- Update to 4.1.0.6 + * Sat Jul 22 2023 Fedora Release Engineering - 4.1.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 809ada9fcdfbd43deffe00a20f17af04e3990357 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 25 Nov 2023 13:59:48 -0700 Subject: [PATCH 102/113] Fix typo in description (bz#2251291) --- x2goserver.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index bbf9f95..b215ae9 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X2Go Server License: GPLv2+ @@ -316,7 +316,7 @@ modern desktop environments, namely desktops derived from the GNOME desktop shell. X2Go KDrive does not require an XServer on the client-side, only the -X11-independent x2gokdriveclient. esktop session data transfers from +X11-independent x2gokdriveclient. Desktop session data transfers from server to client use differential image compression and image data gets cached client-side. @@ -581,7 +581,7 @@ exit 0 %license COPYING %doc ChangeLog %{_bindir}/x2goagent -# %{_libdir}/nx/bin/ is owned by nxagent package... +# %%{_libdir}/nx/bin/ is owned by nxagent package... %{_libdir}/nx/bin/x2goagent %{_datadir}/x2go/versions/VERSION.x2goserver-x2goagent %{_datadir}/pixmaps/x2goagent.xpm @@ -599,6 +599,9 @@ exit 0 %changelog +* Sat Nov 25 2023 Orion Poplawski - 4.1.0.6-2 +- Fix typo in description (bz#2251291) + * Fri Aug 18 2023 Orion Poplawski - 4.1.0.6-1 - Update to 4.1.0.6 From 28c93eaabd58b730f427c25bb18b45007b7d1c6a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:16:59 +0000 Subject: [PATCH 103/113] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index b215ae9..230aecd 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: X2Go Server License: GPLv2+ @@ -599,6 +599,9 @@ exit 0 %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.1.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Nov 25 2023 Orion Poplawski - 4.1.0.6-2 - Fix typo in description (bz#2251291) From aaeb0b95618fd5017685f8ebbc97c56e5bfee1be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:39:47 +0000 Subject: [PATCH 104/113] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 230aecd..3d6d8a2 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: X2Go Server License: GPLv2+ @@ -599,6 +599,9 @@ exit 0 %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.1.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 4.1.0.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 01c3b85d3390069add8e743dd4958d4d9404974d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 04:02:26 +0200 Subject: [PATCH 105/113] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- x2goserver.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 3d6d8a2..ad1588f 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,10 +2,11 @@ Name: x2goserver Version: 4.1.0.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: X2Go Server -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://www.x2go.org Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz # git clone git://code.x2go.org/x2goserver @@ -599,6 +600,9 @@ exit 0 %changelog +* Fri Jul 26 2024 Miroslav Suchý - 4.1.0.6-5 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 4.1.0.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f82646372d93dc2de342e9031f7e5167439e3509 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:22:25 +0000 Subject: [PATCH 106/113] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index ad1588f..a3acf88 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: X2Go Server # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -600,6 +600,9 @@ exit 0 %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.1.0.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 4.1.0.6-5 - convert license to SPDX From ed0f9121ba27ac7dcf338bf51f6d9fb9844a7b4b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 23 Jan 2025 17:53:30 -0700 Subject: [PATCH 107/113] Define SBINDIR for sbin merge (FTBFS rhbz#2341558) --- x2goserver.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index a3acf88..64c4f10 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: X2Go Server # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -331,11 +331,11 @@ sed -i -e 's/-o root -g root//' */Makefile %build export PATH=%{_qt4_bindir}:$PATH -%make_build CFLAGS="%{optflags}" PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx LIBDIR=%{_libdir}/x2go +%make_build CFLAGS="%{optflags}" PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx LIBDIR=%{_libdir}/x2go SBINDIR=%{_sbindir} %install -make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx LIBDIR=%{_libdir}/x2go +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx LIBDIR=%{_libdir}/x2go SBINDIR=%{_sbindir} # Make sure the .packlist file is removed from %%{perl_vendorarch}... find %{buildroot}%{perl_vendorarch} -name .packlist -delete @@ -600,6 +600,9 @@ exit 0 %changelog +* Fri Jan 24 2025 Orion Poplawski - 4.1.0.6-7 +- Define SBINDIR for sbin merge (FTBFS rhbz#2341558) + * Sun Jan 19 2025 Fedora Release Engineering - 4.1.0.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 36f050255ffc6bae8e04b83350698a8e2d1d1b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:13 +0100 Subject: [PATCH 108/113] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- x2goserver.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 64c4f10..6726654 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: X2Go Server # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -53,7 +53,6 @@ Requires: x2goserver-common = %{version}-%{release} Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth Requires: xwininfo -Requires(pre): shadow-utils Requires(post): coreutils Requires(post): grep Requires(post): perl-X2Go-Server-DB @@ -99,7 +98,6 @@ administrations. Summary: X2Go Server (common files) # for useradd/groupadd BuildRequires: shadow-utils -Requires(pre): shadow-utils BuildArch: noarch %description common @@ -328,6 +326,11 @@ cached client-side. # Don't try to be root sed -i -e 's/-o root -g root//' */Makefile +# Create a sysusers.d config file +cat >x2goserver.sysusers.conf </dev/null || groupadd -r x2gouser -getent passwd x2gouser >/dev/null || \ - useradd -r -g x2gouser -d /var/lib/x2go -s /sbin/nologin \ - -c "x2go" x2gouser -exit 0 %post # Initialize the session database @@ -511,6 +510,7 @@ exit 0 %{_mandir}/man5/x2goserver.conf.5.gz %dir %{_datadir}/x2go/versions %{_datadir}/x2go/versions/VERSION.x2goserver-common +%{_sysusersdir}/x2goserver.conf %files desktopsharing %license COPYING @@ -600,6 +600,9 @@ exit 0 %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 4.1.0.6-8 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Fri Jan 24 2025 Orion Poplawski - 4.1.0.6-7 - Define SBINDIR for sbin merge (FTBFS rhbz#2341558) From b27889f76d5357b2701b240c1f273f33dd23ba6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:36:06 +0000 Subject: [PATCH 109/113] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- x2goserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 6726654..68d8ef6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: X2Go Server # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -600,6 +600,9 @@ exit 0 %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.1.0.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 4.1.0.6-8 - Add sysusers.d config file to allow rpm to create users/groups automatically From 15f127616dbd386188c7fb775cd66ba4ba5e1a22 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 19 Aug 2025 20:30:59 -0600 Subject: [PATCH 110/113] Cleanup old conditionals --- x2goserver.spec | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 68d8ef6..d1a2850 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -22,12 +22,8 @@ BuildRequires: desktop-file-utils BuildRequires: findutils BuildRequires: perl-generators BuildRequires: perl(ExtUtils::MakeMaker) -%if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: man2html-core BuildRequires: systemd -%else -BuildRequires: man -%endif # So XSESSIONDIR gets linked BuildRequires: xorg-x11-xinit # For x2goruncommand - for now @@ -58,14 +54,10 @@ Requires(post): grep Requires(post): perl-X2Go-Server-DB Requires(post): x2goserver-common -%if 0%{?fedora} || 0%{?rhel} >= 7 %{?systemd_requires} -%endif -%if 0%{?fedora} Suggests: x2goserver-fmbindings = %{version}-%{release} Suggests: x2goserver-printing = %{version}-%{release} -%endif Requires: x2goserver-xsession = %{version}-%{release} # Provide upgrade path from upstream rpms @@ -73,10 +65,8 @@ Requires: x2goserver-xsession = %{version}-%{release} Obsoletes: x2goserver-extensions < %{version}-%{release} Provides: x2goserver-extensions = %{version}-%{release} Requires: x2goserver-xsession -%if 0%{?fedora} >= 21 Suggests: x2goserver-fmbindings Suggests: x2goserver-printing -%endif %{?perl_default_filter} @@ -190,9 +180,7 @@ Requires: perl(Cwd) Requires: xmessage # Symlinks to xinit files Requires: xorg-x11-xinit -%if 0%{?fedora} Requires: dbus -%endif BuildArch: noarch %description xsession @@ -354,30 +342,18 @@ touch %{buildroot}%{_sharedstatedir}/x2go/x2go_sessions # Printing spool dir mkdir -p %{buildroot}%{_localstatedir}/spool/x2goprint -%if 0%{?fedora} || 0%{?rhel} >= 7 # systemd session cleanup script mkdir -p %{buildroot}%{_unitdir} install -pm0644 %SOURCE1 %{buildroot}%{_unitdir} -%else -# SysV session cleanup script -mkdir -p %{buildroot}%{_initddir} -install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2gocleansessions -%endif desktop-file-validate %{buildroot}%{_datadir}/applications/x2gofm.desktop # applications link ln -s ../..%{_datadir}/applications %{buildroot}%{_sysconfdir}/x2go/applications -# Delete tmpfiles.d configuration file on systems not using systemd. -%if 0%{?rhel} && 0%{?rhel} == 6 -rm -f %{buildroot}/etc/tmpfiles.d/x2goserver.conf -%endif - install -m0644 -D x2goserver.sysusers.conf %{buildroot}%{_sysusersdir}/x2goserver.conf - %post # Initialize the session database [ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && @@ -395,11 +371,7 @@ if ! [ -e %{_sysconfdir}/x2go/applications ]; then ln -s ../..%{_datadir}/applications %{_sysconfdir}/x2go/applications fi -%if 0%{?fedora} || 0%{?rhel} >= 7 %systemd_post x2gocleansessions.service -%else -/sbin/chkconfig --add x2gocleansessions -%endif %preun if [ "$1" = 0 ]; then @@ -408,24 +380,11 @@ if [ "$1" = 0 ]; then fi fi -%if 0%{?fedora} || 0%{?rhel} >= 7 %systemd_preun x2gocleansessions.service -%else -if [ "$1" = 0 ]; then - /sbin/service x2gocleansessions stop >/dev/null 2>&1 - /sbin/chkconfig --del x2gocleansessions -fi -%endif %postun -%if 0%{?fedora} || 0%{?rhel} >= 7 %systemd_postun_with_restart x2gocleansessions.service -%else -if [ "$1" -ge "1" ] ; then - /sbin/service x2gocleansessions condrestart >/dev/null 2>&1 || : -fi -%endif %pre printing getent group x2goprint >/dev/null || groupadd -r x2goprint @@ -488,19 +447,13 @@ exit 0 %{_datadir}/x2go/x2gofeature.d/x2goserver-extensions.features %attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/ %ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions -%if 0%{?fedora} || 0%{?rhel} >= 7 %{_unitdir}/x2gocleansessions.service -%else -%{_initddir}/x2gocleansessions -%endif %files common %license COPYING %doc ChangeLog %attr(0775,root,x2gouser) %dir %{_localstatedir}/lib/x2go/ -%if 0%{?rhel} != 6 %{_tmpfilesdir}/x2goserver.conf -%endif %dir %{_sysconfdir}/x2go/ %dir %{_sysconfdir}/x2go/x2gosql %dir %{_sysconfdir}/x2go/x2gosql/passwords From dd81eff20f41f3fad8193df24af270656bcbedb8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 19 Aug 2025 20:48:01 -0600 Subject: [PATCH 111/113] Handle F42 sbin merge --- x2goserver.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index d1a2850..e8496ed 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -433,12 +433,14 @@ exit 0 %{_libdir}/x2go/x2gormport %{_libdir}/x2go/x2gosuspend-agent %{_libdir}/x2go/x2gosyslog -%{_sbindir}/x2go* %{_mandir}/man1/x2gooptionsstring.1* %{_mandir}/man8/x2go*.8* %exclude %{_mandir}/man8/x2gofm.8* %exclude %{_mandir}/man8/x2goprint.8* %exclude %{_mandir}/man8/x2go*-desktopsharing.8* +%if 0%{?fedora} && 0%{?fedora} < 42 || 0%{?rhel} && 0%{?rhel} < 11 +%{_sbindir}/x2go* +%endif %dir %{_datadir}/x2go/ %{_datadir}/x2go/versions/VERSION.x2goserver %{_datadir}/x2go/versions/VERSION.x2goserver-extensions From ddd9a19a351d060bbf9a0ccbd6593047d4975f31 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 19 Aug 2025 21:22:32 -0600 Subject: [PATCH 112/113] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 316 +++++++++++++++++++++++++++++++++++++++++++++++ x2goserver.spec | 319 +----------------------------------------------- 2 files changed, 318 insertions(+), 317 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..07615dc --- /dev/null +++ b/changelog @@ -0,0 +1,316 @@ +* Fri Jul 25 2025 Fedora Release Engineering - 4.1.0.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 4.1.0.6-8 +- Add sysusers.d config file to allow rpm to create users/groups automatically + +* Fri Jan 24 2025 Orion Poplawski - 4.1.0.6-7 +- Define SBINDIR for sbin merge (FTBFS rhbz#2341558) + +* Sun Jan 19 2025 Fedora Release Engineering - 4.1.0.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 26 2024 Miroslav Suchý - 4.1.0.6-5 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 4.1.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 4.1.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Nov 25 2023 Orion Poplawski - 4.1.0.6-2 +- Fix typo in description (bz#2251291) + +* Fri Aug 18 2023 Orion Poplawski - 4.1.0.6-1 +- Update to 4.1.0.6 + +* Sat Jul 22 2023 Fedora Release Engineering - 4.1.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue May 30 2023 Orion Poplawski - 4.1.0.4-1 +- Update to 4.1.0.4 + +* Sat Jan 21 2023 Fedora Release Engineering - 4.1.0.3-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 4.1.0.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon May 30 2022 Jitka Plesnikova - 4.1.0.3-18 +- Perl 5.36 rebuild + +* Fri Feb 04 2022 Orion Poplawski - 4.1.0.3-17 +- Add upstream patch to fix x2goversion (bz#2050350) + +* Sat Jan 22 2022 Fedora Release Engineering - 4.1.0.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 19 2022 Orion Poplawski - 4.1.0.3-15 +- Add Requires on xwininfo and xmessage (bz#2025390) + +* Tue Nov 16 2021 René Genz - 4.1.0.3-14 +- fix typing mistakes + +* Fri Jul 23 2021 Fedora Release Engineering - 4.1.0.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 4.1.0.3-12 +- Perl 5.34 rebuild + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 4.1.0.3-11 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Wed Jan 27 2021 Fedora Release Engineering - 4.1.0.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Nov 06 2020 Orion Poplawski - 4.1.0.3-9 +- Change requires from xorg-x11-xkb-utils to setxkbmap (bz#1894794) + +* Wed Jul 29 2020 Fedora Release Engineering - 4.1.0.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 22 2020 Jitka Plesnikova - 4.1.0.3-7 +- Perl 5.32 rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 4.1.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 4.1.0.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 30 2019 Jitka Plesnikova - 4.1.0.3-4 +- Perl 5.30 rebuild + +* Thu Apr 18 2019 Orion Poplawski - 4.1.0.3-3 +- Upstream replaced netstat with ss in 4.1.0.0 (bugz#1496167) + +* Sun Feb 03 2019 Fedora Release Engineering - 4.1.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Nov 29 2018 Orion Poplawski - 4.1.0.3-1 +- Update to 4.1.0.3 + +* Tue Aug 14 2018 Orion Poplawski - 4.1.0.2-1 +- Update to 4.1.0.2 + +* Tue Jul 31 2018 Florian Weimer - 4.1.0.1-2 +- Rebuild with fixed binutils + +* Sun Jul 29 2018 Orion Poplawski - 4.1.0.1-1 +- Update to 4.1.0.1 + +* Fri Jul 20 2018 Orion Poplawski - 4.1.0.0-4 +- Add BR gcc + +* Sat Jul 14 2018 Fedora Release Engineering - 4.1.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jun 27 2018 Jitka Plesnikova - 4.1.0.0-2 +- Perl 5.28 rebuild + +* Mon Mar 5 2018 Orion Poplawski - 4.1.0.0-1 +- Update to 4.1.0.0 + +* Fri Feb 09 2018 Fedora Release Engineering - 4.0.1.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Nov 11 2017 Orion Poplawski - 4.0.1.22-1 +- Update to 4.0.1.22 + +* Wed Nov 8 2017 Orion Poplawski - 4.0.1.21-1 +- Update to 4.0.1.21 + +* Thu Aug 03 2017 Fedora Release Engineering - 4.0.1.20-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 4.0.1.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sun Jun 04 2017 Jitka Plesnikova - 4.0.1.20-3 +- Perl 5.26 rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 4.0.1.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Nov 20 2016 Orion Poplawski - 4.0.1.20-1 +- Update to 4.0.1.20 +- Drop patches applied upstream + +* Thu Oct 6 2016 Orion Poplawski - 4.0.1.19-12 +- Fix x2golistdesktops on EL7 (bug #1371690) + +* Fri Jun 24 2016 Orion Poplawski - 4.0.1.19-11 +- Add upstream patch to drop blowfish cipher (bug #1350014) + +* Sun May 15 2016 Jitka Plesnikova - 4.0.1.19-10 +- Perl 5.24 rebuild + +* Fri Mar 18 2016 Orion Poplawski - 4.0.1.19-9 +- Add requires grep (bug #1319154) + +* Fri Feb 05 2016 Fedora Release Engineering - 4.0.1.19-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 4.0.1.19-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jun 12 2015 Orion Poplawski - 4.0.1.19-6 +- Fix X2Go capitalization in service file (bug #1231177) + +* Wed Jun 03 2015 Jitka Plesnikova - 4.0.1.19-5 +- Perl 5.22 rebuild + +* Wed Apr 29 2015 Orion Poplawski - 4.0.1.19-4 +- Add requires xorg-x11-xkb-utils + +* Sun Apr 26 2015 Orion Poplawski - 4.0.1.19-3 +- Install applications symlink by default so that "Published + Applications" is populated (bug #1215474) + +* Wed Mar 18 2015 Orion Poplawski - 4.0.1.19-2 +- Provide x2goserver-extensions for upstream compatibility + +* Tue Feb 24 2015 Orion Poplawski - 4.0.1.19-1 +- Update to 4.0.1.19 +- Drop Xsession and path patches fixed upstream + +* Mon Jan 26 2015 Orion Poplawski - 4.0.1.18-6 +- Obsolete x2goserver-extensions to provide upgrade path from upstream rpms + +* Thu Jan 8 2015 Orion Poplawski - 4.0.1.18-5 +- Fix local desktop sharing breakage (bug #1180303) + +* Tue Dec 9 2014 Orion Poplawski - 4.0.1.18-4 +- Apply upstream fix for issue with Xsession aborting + +* Fri Oct 24 2014 Orion Poplawski - 4.0.1.18-3 +- Do not require x2goserver-xession, do not ship feature file in main package + +* Fri Oct 24 2014 Orion Poplawski - 4.0.1.18-2 +- Require x2goserver-xession + +* Mon Oct 06 2014 Orion Poplawski - 4.0.1.18-1 +- Update to 4.0.1.18 + +* Fri Oct 03 2014 Orion Poplawski - 4.0.1.17-1 +- Update to 4.0.1.17 + +* Thu Oct 02 2014 Rex Dieter 4.0.1.16-2 +- -fmbindings: update mime scriptlets + +* Thu Sep 25 2014 Orion Poplawski - 4.0.1.16-1 +- Update to 4.0.1.16 + +* Tue Sep 09 2014 Jitka Plesnikova - 4.0.1.15-7 +- Perl 5.20 mass + +* Wed Aug 27 2014 Jitka Plesnikova - 4.0.1.15-6 +- Perl 5.20 rebuild + +* Tue Aug 26 2014 Orion Poplawski - 4.0.1.15-5 +- Fix scriptlet requires + +* Mon Aug 18 2014 Fedora Release Engineering - 4.0.1.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 4.0.1.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 2 2014 Orion Poplawski - 4.0.1.15-2 +- Add Requires xorg-x11-xauth + +* Thu Apr 3 2014 Orion Poplawski - 4.0.1.15-1 +- Update to 4.0.1.15 + +* Wed Apr 2 2014 Orion Poplawski - 4.0.1.14-1 +- Update to 4.0.1.14 + +* Mon Mar 24 2014 Orion Poplawski - 4.0.1.13-4 +- Create /tmp/.X11-unix with correct SELinux context (bug #1079772) + +* Wed Feb 5 2014 Orion Poplawski - 4.0.1.13-3 +- Fix x2gocleansession.service unit file + +* Mon Jan 27 2014 Orion Poplawski - 4.0.1.13-2 +- Fix xinitrd.d path in Xsession + +* Sun Jan 26 2014 Orion Poplawski - 4.0.1.13-1 +- Update 4.0.1.13 +- Add xsession sub-package + +* Tue Jan 7 2014 Orion Poplawski - 4.0.1.12-1 +- Update 4.0.1.12 + +* Mon Jan 6 2014 Orion Poplawski - 4.0.1.11-1 +- Update 4.0.1.11 +- Drop mimetype patch applied upstream + +* Fri Jan 3 2014 Orion Poplawski - 4.0.1.10-1 +- Update to 4.0.1.10 +- Drop pwgen and mktemp patches applied upstream + +* Sat Dec 7 2013 Orion Poplawski - 4.0.1.9-2 +- Disable Xsession support for now - Debian specific (Bug #1038834) + +* Mon Dec 2 2013 Orion Poplawski - 4.0.1.9-1 +- Update to 4.0.1.9 +- Drop incorrect keyboard patch + +* Wed Nov 27 2013 Orion Poplawski - 4.0.1.8-2 +- Use mktemp instead of tempfile +- BR xorg-x11-xinit for Xsession.d link creation +- Add patch to fix keyboard setting (bug #1033876) + +* Sat Nov 23 2013 Orion Poplawski - 4.0.1.8-1 +- Update to 4.0.1.8 +- Fix x2gocleansessions init script for EL6 (bug #1031150) + +* Tue Oct 22 2013 Orion Poplawski - 4.0.1.6-6 +- Fix bug in x2gocleansessions init script, enable by default + +* Wed Sep 11 2013 Orion Poplawski - 4.0.1.6-5 +- Add some needed requires + +* Sun Aug 04 2013 Fedora Release Engineering - 4.0.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 30 2013 Orion Poplawski - 4.0.1.6-3 +- Mark /var/lib/x2go as a directory +- Add patch to make the following changes: +- Remove Xsession.options +- Make /etc/x2go/Xsession.d point to /etc/X11/xinit/Xclients.d +- Make /etc/x2go/Xsession executable + +* Mon Jul 29 2013 Orion Poplawski - 4.0.1.6-2 +- Add SysV init script for EL6 + +* Mon Jul 29 2013 Orion Poplawski - 4.0.1.6-1 +- Use 4.0.1.6 release +- Drop patches applied upstream + +* Mon Jul 22 2013 Rok Mandeljc - 4.1.0.0-0.4.20130722git65169c9 +- Update to latest git +- Use PREFIX=%%{_prefix} when building, not just when installing. +- Use pwgen instead of makepasswd, which is not available on Fedora. +- Fixed a missing function import in x2golistsessions. +- Added dependencies for xorg-x11-fonts-misc +- Added systemd script for session cleanup on start. +- Fixed x2goruncommand for TERMINAL -> gnome-terminal; the latter seems to return immediately in Fedora 19. + +* Thu May 30 2013 Orion Poplawski - 4.1.0.0-0.3.20130520gitbd2cfe4 +- Update to latest git +- Split out printing sub-package + +* Wed Jan 23 2013 Orion Poplawski - 4.1.0.0-0.2.20130122git +- Add post script to create session database if needed + +* Tue Jan 22 2013 Orion Poplawski - 4.1.0.0-0.1.20130122git +- Update to 4.1.0.0 git + +* Fri Jan 18 2013 Orion Poplawski - 4.0.0.0-1 +- Update to 4.0.0.0 + +* Tue Dec 11 2012 Orion Poplawski - 3.1.1.9-1 +- Initial Fedora package diff --git a/x2goserver.spec b/x2goserver.spec index e8496ed..1f10834 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.6 -Release: 9%{?dist} +Release: %autorelease Summary: X2Go Server # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -555,319 +555,4 @@ exit 0 %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 4.1.0.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 4.1.0.6-8 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Fri Jan 24 2025 Orion Poplawski - 4.1.0.6-7 -- Define SBINDIR for sbin merge (FTBFS rhbz#2341558) - -* Sun Jan 19 2025 Fedora Release Engineering - 4.1.0.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 4.1.0.6-5 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 4.1.0.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 4.1.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Nov 25 2023 Orion Poplawski - 4.1.0.6-2 -- Fix typo in description (bz#2251291) - -* Fri Aug 18 2023 Orion Poplawski - 4.1.0.6-1 -- Update to 4.1.0.6 - -* Sat Jul 22 2023 Fedora Release Engineering - 4.1.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue May 30 2023 Orion Poplawski - 4.1.0.4-1 -- Update to 4.1.0.4 - -* Sat Jan 21 2023 Fedora Release Engineering - 4.1.0.3-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 4.1.0.3-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon May 30 2022 Jitka Plesnikova - 4.1.0.3-18 -- Perl 5.36 rebuild - -* Fri Feb 04 2022 Orion Poplawski - 4.1.0.3-17 -- Add upstream patch to fix x2goversion (bz#2050350) - -* Sat Jan 22 2022 Fedora Release Engineering - 4.1.0.3-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jan 19 2022 Orion Poplawski - 4.1.0.3-15 -- Add Requires on xwininfo and xmessage (bz#2025390) - -* Tue Nov 16 2021 René Genz - 4.1.0.3-14 -- fix typing mistakes - -* Fri Jul 23 2021 Fedora Release Engineering - 4.1.0.3-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri May 21 2021 Jitka Plesnikova - 4.1.0.3-12 -- Perl 5.34 rebuild - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 4.1.0.3-11 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Wed Jan 27 2021 Fedora Release Engineering - 4.1.0.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Nov 06 2020 Orion Poplawski - 4.1.0.3-9 -- Change requires from xorg-x11-xkb-utils to setxkbmap (bz#1894794) - -* Wed Jul 29 2020 Fedora Release Engineering - 4.1.0.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jun 22 2020 Jitka Plesnikova - 4.1.0.3-7 -- Perl 5.32 rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 4.1.0.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 4.1.0.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu May 30 2019 Jitka Plesnikova - 4.1.0.3-4 -- Perl 5.30 rebuild - -* Thu Apr 18 2019 Orion Poplawski - 4.1.0.3-3 -- Upstream replaced netstat with ss in 4.1.0.0 (bugz#1496167) - -* Sun Feb 03 2019 Fedora Release Engineering - 4.1.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Nov 29 2018 Orion Poplawski - 4.1.0.3-1 -- Update to 4.1.0.3 - -* Tue Aug 14 2018 Orion Poplawski - 4.1.0.2-1 -- Update to 4.1.0.2 - -* Tue Jul 31 2018 Florian Weimer - 4.1.0.1-2 -- Rebuild with fixed binutils - -* Sun Jul 29 2018 Orion Poplawski - 4.1.0.1-1 -- Update to 4.1.0.1 - -* Fri Jul 20 2018 Orion Poplawski - 4.1.0.0-4 -- Add BR gcc - -* Sat Jul 14 2018 Fedora Release Engineering - 4.1.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jun 27 2018 Jitka Plesnikova - 4.1.0.0-2 -- Perl 5.28 rebuild - -* Mon Mar 5 2018 Orion Poplawski - 4.1.0.0-1 -- Update to 4.1.0.0 - -* Fri Feb 09 2018 Fedora Release Engineering - 4.0.1.22-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Nov 11 2017 Orion Poplawski - 4.0.1.22-1 -- Update to 4.0.1.22 - -* Wed Nov 8 2017 Orion Poplawski - 4.0.1.21-1 -- Update to 4.0.1.21 - -* Thu Aug 03 2017 Fedora Release Engineering - 4.0.1.20-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 4.0.1.20-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sun Jun 04 2017 Jitka Plesnikova - 4.0.1.20-3 -- Perl 5.26 rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 4.0.1.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Nov 20 2016 Orion Poplawski - 4.0.1.20-1 -- Update to 4.0.1.20 -- Drop patches applied upstream - -* Thu Oct 6 2016 Orion Poplawski - 4.0.1.19-12 -- Fix x2golistdesktops on EL7 (bug #1371690) - -* Fri Jun 24 2016 Orion Poplawski - 4.0.1.19-11 -- Add upstream patch to drop blowfish cipher (bug #1350014) - -* Sun May 15 2016 Jitka Plesnikova - 4.0.1.19-10 -- Perl 5.24 rebuild - -* Fri Mar 18 2016 Orion Poplawski - 4.0.1.19-9 -- Add requires grep (bug #1319154) - -* Fri Feb 05 2016 Fedora Release Engineering - 4.0.1.19-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 4.0.1.19-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Jun 12 2015 Orion Poplawski - 4.0.1.19-6 -- Fix X2Go capitalization in service file (bug #1231177) - -* Wed Jun 03 2015 Jitka Plesnikova - 4.0.1.19-5 -- Perl 5.22 rebuild - -* Wed Apr 29 2015 Orion Poplawski - 4.0.1.19-4 -- Add requires xorg-x11-xkb-utils - -* Sun Apr 26 2015 Orion Poplawski - 4.0.1.19-3 -- Install applications symlink by default so that "Published - Applications" is populated (bug #1215474) - -* Wed Mar 18 2015 Orion Poplawski - 4.0.1.19-2 -- Provide x2goserver-extensions for upstream compatibility - -* Tue Feb 24 2015 Orion Poplawski - 4.0.1.19-1 -- Update to 4.0.1.19 -- Drop Xsession and path patches fixed upstream - -* Mon Jan 26 2015 Orion Poplawski - 4.0.1.18-6 -- Obsolete x2goserver-extensions to provide upgrade path from upstream rpms - -* Thu Jan 8 2015 Orion Poplawski - 4.0.1.18-5 -- Fix local desktop sharing breakage (bug #1180303) - -* Tue Dec 9 2014 Orion Poplawski - 4.0.1.18-4 -- Apply upstream fix for issue with Xsession aborting - -* Fri Oct 24 2014 Orion Poplawski - 4.0.1.18-3 -- Do not require x2goserver-xession, do not ship feature file in main package - -* Fri Oct 24 2014 Orion Poplawski - 4.0.1.18-2 -- Require x2goserver-xession - -* Mon Oct 06 2014 Orion Poplawski - 4.0.1.18-1 -- Update to 4.0.1.18 - -* Fri Oct 03 2014 Orion Poplawski - 4.0.1.17-1 -- Update to 4.0.1.17 - -* Thu Oct 02 2014 Rex Dieter 4.0.1.16-2 -- -fmbindings: update mime scriptlets - -* Thu Sep 25 2014 Orion Poplawski - 4.0.1.16-1 -- Update to 4.0.1.16 - -* Tue Sep 09 2014 Jitka Plesnikova - 4.0.1.15-7 -- Perl 5.20 mass - -* Wed Aug 27 2014 Jitka Plesnikova - 4.0.1.15-6 -- Perl 5.20 rebuild - -* Tue Aug 26 2014 Orion Poplawski - 4.0.1.15-5 -- Fix scriptlet requires - -* Mon Aug 18 2014 Fedora Release Engineering - 4.0.1.15-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 4.0.1.15-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 2 2014 Orion Poplawski - 4.0.1.15-2 -- Add Requires xorg-x11-xauth - -* Thu Apr 3 2014 Orion Poplawski - 4.0.1.15-1 -- Update to 4.0.1.15 - -* Wed Apr 2 2014 Orion Poplawski - 4.0.1.14-1 -- Update to 4.0.1.14 - -* Mon Mar 24 2014 Orion Poplawski - 4.0.1.13-4 -- Create /tmp/.X11-unix with correct SELinux context (bug #1079772) - -* Wed Feb 5 2014 Orion Poplawski - 4.0.1.13-3 -- Fix x2gocleansession.service unit file - -* Mon Jan 27 2014 Orion Poplawski - 4.0.1.13-2 -- Fix xinitrd.d path in Xsession - -* Sun Jan 26 2014 Orion Poplawski - 4.0.1.13-1 -- Update 4.0.1.13 -- Add xsession sub-package - -* Tue Jan 7 2014 Orion Poplawski - 4.0.1.12-1 -- Update 4.0.1.12 - -* Mon Jan 6 2014 Orion Poplawski - 4.0.1.11-1 -- Update 4.0.1.11 -- Drop mimetype patch applied upstream - -* Fri Jan 3 2014 Orion Poplawski - 4.0.1.10-1 -- Update to 4.0.1.10 -- Drop pwgen and mktemp patches applied upstream - -* Sat Dec 7 2013 Orion Poplawski - 4.0.1.9-2 -- Disable Xsession support for now - Debian specific (Bug #1038834) - -* Mon Dec 2 2013 Orion Poplawski - 4.0.1.9-1 -- Update to 4.0.1.9 -- Drop incorrect keyboard patch - -* Wed Nov 27 2013 Orion Poplawski - 4.0.1.8-2 -- Use mktemp instead of tempfile -- BR xorg-x11-xinit for Xsession.d link creation -- Add patch to fix keyboard setting (bug #1033876) - -* Sat Nov 23 2013 Orion Poplawski - 4.0.1.8-1 -- Update to 4.0.1.8 -- Fix x2gocleansessions init script for EL6 (bug #1031150) - -* Tue Oct 22 2013 Orion Poplawski - 4.0.1.6-6 -- Fix bug in x2gocleansessions init script, enable by default - -* Wed Sep 11 2013 Orion Poplawski - 4.0.1.6-5 -- Add some needed requires - -* Sun Aug 04 2013 Fedora Release Engineering - 4.0.1.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 30 2013 Orion Poplawski - 4.0.1.6-3 -- Mark /var/lib/x2go as a directory -- Add patch to make the following changes: -- Remove Xsession.options -- Make /etc/x2go/Xsession.d point to /etc/X11/xinit/Xclients.d -- Make /etc/x2go/Xsession executable - -* Mon Jul 29 2013 Orion Poplawski - 4.0.1.6-2 -- Add SysV init script for EL6 - -* Mon Jul 29 2013 Orion Poplawski - 4.0.1.6-1 -- Use 4.0.1.6 release -- Drop patches applied upstream - -* Mon Jul 22 2013 Rok Mandeljc - 4.1.0.0-0.4.20130722git65169c9 -- Update to latest git -- Use PREFIX=%%{_prefix} when building, not just when installing. -- Use pwgen instead of makepasswd, which is not available on Fedora. -- Fixed a missing function import in x2golistsessions. -- Added dependencies for xorg-x11-fonts-misc -- Added systemd script for session cleanup on start. -- Fixed x2goruncommand for TERMINAL -> gnome-terminal; the latter seems to return immediately in Fedora 19. - -* Thu May 30 2013 Orion Poplawski - 4.1.0.0-0.3.20130520gitbd2cfe4 -- Update to latest git -- Split out printing sub-package - -* Wed Jan 23 2013 Orion Poplawski - 4.1.0.0-0.2.20130122git -- Add post script to create session database if needed - -* Tue Jan 22 2013 Orion Poplawski - 4.1.0.0-0.1.20130122git -- Update to 4.1.0.0 git - -* Fri Jan 18 2013 Orion Poplawski - 4.0.0.0-1 -- Update to 4.0.0.0 - -* Tue Dec 11 2012 Orion Poplawski - 3.1.1.9-1 -- Initial Fedora package +%autochangelog From 246185bec821f35d261a250a34cf0121cebd7c81 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 19 Aug 2025 21:30:05 -0600 Subject: [PATCH 113/113] Add sysusers config for x2goprint user (fixes FTI rhbz#2383859) --- x2goserver.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 1f10834..1104fb7 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -319,6 +319,11 @@ cat >x2goserver.sysusers.conf <x2goprint.sysusers.conf </dev/null || groupadd -r x2goprint -getent passwd x2goprint >/dev/null || \ - useradd -r -g x2goprint -d /var/spool/x2goprint -s /sbin/nologin \ - -c "x2go" x2goprint -exit 0 - %files %license COPYING @@ -491,6 +490,7 @@ exit 0 %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint %{_mandir}/man8/x2goprint.8* +%{_sysusersdir}/x2goprint.conf %files xsession %{_sysconfdir}/x2go/xinitrc.d