From 0bf9d3b64e0edf126457a02e2b0c71a6cdbb2ed3 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 29 May 2012 16:34:27 +0200 Subject: [PATCH 01/89] Initial import --- .gitignore | 1 + shellinabox.spec | 136 +++++++++++++++++++++++++++++++++++++++++ shellinaboxd.init | 81 ++++++++++++++++++++++++ shellinaboxd.service | 13 ++++ shellinaboxd.sysconfig | 4 ++ sources | 1 + 6 files changed, 236 insertions(+) create mode 100644 shellinabox.spec create mode 100644 shellinaboxd.init create mode 100644 shellinaboxd.service create mode 100644 shellinaboxd.sysconfig diff --git a/.gitignore b/.gitignore index e69de29..0a936b8 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/shellinabox-2.14.tar.gz diff --git a/shellinabox.spec b/shellinabox.spec new file mode 100644 index 0000000..4ac497c --- /dev/null +++ b/shellinabox.spec @@ -0,0 +1,136 @@ +Name: shellinabox +Version: 2.14 +Release: 3%{?dist} +Summary: Web based AJAX terminal emulator +Group: System Environment/Daemons +License: GPLv2 +URL: http://code.google.com/p/shellinabox/ +Source0: http://shellinabox.googlecode.com/files/%{name}-%{version}.tar.gz +Source1: shellinaboxd.sysconfig +Source2: shellinaboxd.service +Source3: shellinaboxd.init +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: openssl-devel%{?_isa} +BuildRequires: zlib-devel%{?_isa} +BuildRequires: systemd-units + +%if 0%{?fedora} >= 15 || 0%{?rhel} > 6 +Requires(post): systemd-sysv +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +%else +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(postun): /sbin/service +%endif + +%description +Shell In A Box implements a web server that can export arbitrary command line +tools to a web based terminal emulator. This emulator is accessible to any +JavaScript and CSS enabled web browser and does not require any additional +browser plugins. + + +%prep +%setup -q + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig + +install -p -m 755 -D shellinaboxd %{buildroot}%{_sbindir}/shellinaboxd +install -p -m 644 -D shellinaboxd.1 %{buildroot}%{_mandir}/man1/shellinaboxd.1 +install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/shellinaboxd + +%if 0%{?fedora} >= 15 || 0%{?rhel} > 6 + +# Systemd unit files +mkdir -p %{buildroot}%{_unitdir} +install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/shellinaboxd.service + +%else + +# Initscripts +mkdir -p %{buildroot}%{_initrddir} +install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd + +%endif + +%clean +rm -rf %{buildroot} + +%if 0%{?fedora} >= 15 || 0%{?rhel} > 6 + +%post +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi + +%preun +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable shellinaboxd.service > /dev/null 2>&1 || : + /bin/systemctl stop shellinaboxd.service > /dev/null 2>&1 || : +fi + + +%postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart shellinaboxd.service >/dev/null 2>&1 || : +fi + +%else + +%post +/sbin/chkconfig --add shellinaboxd + + +%preun +if [ "$1" = 0 ]; then + /sbin/service shellinaboxd stop >/dev/null 2>&1 || : + /sbin/chkconfig --del shellinaboxd +fi + + +%postun +if [ "$1" -ge "1" ]; then + /sbin/service shellinaboxd condrestart >/dev/null 2>&1 || : +fi + +%endif + + +%files +%doc AUTHORS NEWS README README.Fedora GPL-2 COPYING +%config(noreplace) %{_sysconfdir}/sysconfig/shellinaboxd +%{_mandir}/man1/shellinaboxd.1.* +%{_sbindir}/shellinaboxd +%if 0%{?fedora} >= 15 || 0%{?rhel} > 6 +%{_unitdir}/shellinaboxd.service +%else +%{_initrddir}/shellinaboxd +%endif + + +%changelog +* Tue May 29 2012 Simone Caronni - 2.14-3 +- Spec file changes (changelog, formatting). +- Added license files to doc section. + +* Wed May 09 2012 Simone Caronni - 2.14-2 +- Tags for RHEL building. + +* Wed May 09 2012 Simone Caronni - 2.14-1 +- First build. diff --git a/shellinaboxd.init b/shellinaboxd.init new file mode 100644 index 0000000..9aa5c20 --- /dev/null +++ b/shellinaboxd.init @@ -0,0 +1,81 @@ +#!/bin/bash +# +# shellinaboxd This shell script takes care of starting and stopping +# shellinabox. +# +# chkconfig: - 80 20 +# description: Publish command line shell through AJAX interface. +# processname: shellinaboxd +# config: /etc/sysconfig/shellinaboxd +# pidfile: /var/run/shellinaboxd.pid + +# Source function library. +. /etc/rc.d/init.d/functions + +RETVAL=0 +prog="shellinaboxd" + +# Source configuration. +if [ -f /etc/sysconfig/$prog ] ; then + . /etc/sysconfig/$prog +fi + +OPTS="$OPTS --background=/var/run/$prog.pid" + +start() { + [ "$EUID" != "0" ] && exit 4 + + echo -n "Starting $prog: " + daemon $prog $OPTS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog + return $RETVAL +} + +stop() { + [ "$EUID" != "0" ] && exit 4 + + echo -n "Shutting down $prog: " + killproc $prog + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog + return $RETVAL +} + +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) + start + ;; + stop) + stop + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + restart|force-reload) + stop + start + ;; + *) + echo "Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|status}" + [ "$1" = "usage" ] && exit 0 + exit 2 + ;; +esac +exit $? + diff --git a/shellinaboxd.service b/shellinaboxd.service new file mode 100644 index 0000000..1e934fb --- /dev/null +++ b/shellinaboxd.service @@ -0,0 +1,13 @@ +[Unit] +Description=Shell In A Box daemon +Requires=network.target +After=network.target + +[Service] +EnvironmentFile=-/etc/sysconfig/shellinaboxd +ExecStart=/usr/sbin/shellinaboxd $OPTS +Restart=always + +[Install] +WantedBy=multi-user.target + diff --git a/shellinaboxd.sysconfig b/shellinaboxd.sysconfig new file mode 100644 index 0000000..dce83a8 --- /dev/null +++ b/shellinaboxd.sysconfig @@ -0,0 +1,4 @@ +# Shell in a box daemon configuration +# For details see shellinaboxd man page + +OPTS="-s /:LOGIN" diff --git a/sources b/sources index e69de29..4f6ede7 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +6c63b52edcebc56ee73a108e7211d174 shellinabox-2.14.tar.gz From 2aa8abc8c7a5219014649bdd363b2000dccaa3c4 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 29 May 2012 17:03:00 +0200 Subject: [PATCH 02/89] Move systemd-units BR to proper place --- shellinabox.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 4ac497c..2b13e5f 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -1,6 +1,6 @@ Name: shellinabox Version: 2.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -13,9 +13,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel%{?_isa} BuildRequires: zlib-devel%{?_isa} -BuildRequires: systemd-units %if 0%{?fedora} >= 15 || 0%{?rhel} > 6 +BuildRequires: systemd-units Requires(post): systemd-sysv Requires(post): systemd-units Requires(preun): systemd-units @@ -125,6 +125,9 @@ fi %changelog +* Tue May 29 2012 Simone Caronni - 2.14-4 +- Move systemd-units BR to proper place. + * Tue May 29 2012 Simone Caronni - 2.14-3 - Spec file changes (changelog, formatting). - Added license files to doc section. From 222642ef03ab5c036c676447b75d63dcdb327d35 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 14:32:12 -0500 Subject: [PATCH 03/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 2b13e5f..ef69bb7 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -1,6 +1,6 @@ Name: shellinabox Version: 2.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -125,6 +125,9 @@ fi %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 2.14-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue May 29 2012 Simone Caronni - 2.14-4 - Move systemd-units BR to proper place. From 1f5879eed7aa2540c901e41a8b897d85506bd407 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 30 Aug 2012 14:57:56 +0200 Subject: [PATCH 04/89] Update systemd service file --- shellinabox.spec | 5 ++++- shellinaboxd.service | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index ef69bb7..ec4f0bc 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -1,6 +1,6 @@ Name: shellinabox Version: 2.14 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -125,6 +125,9 @@ fi %changelog +* Thu Aug 30 2012 Simone Caronni - 2.14-6 ++- Add nss-lookup.target requirement and Documentation tag in service file. + * Sat Jul 21 2012 Fedora Release Engineering - 2.14-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/shellinaboxd.service b/shellinaboxd.service index 1e934fb..f497d98 100644 --- a/shellinaboxd.service +++ b/shellinaboxd.service @@ -1,7 +1,8 @@ [Unit] Description=Shell In A Box daemon -Requires=network.target -After=network.target +Documentation=man:shellinaboxd(1) +Requires=network.target nss-lookup.target +After=network.target nss-lookup.target [Service] EnvironmentFile=-/etc/sysconfig/shellinaboxd From 666212584e3982886dbf5edea0a18225db0cf8e1 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 5 Sep 2012 10:10:14 +0200 Subject: [PATCH 05/89] Fix typo in changelog --- shellinabox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index ec4f0bc..beec9a1 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -126,7 +126,7 @@ fi %changelog * Thu Aug 30 2012 Simone Caronni - 2.14-6 -+- Add nss-lookup.target requirement and Documentation tag in service file. +- Add nss-lookup.target requirement and Documentation tag in service file. * Sat Jul 21 2012 Fedora Release Engineering - 2.14-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From e862c3675ad4eb506bcb5f87f35638dd6d34e298 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 5 Sep 2012 13:57:22 +0200 Subject: [PATCH 06/89] Add F18 systemd macros and remove isaed BRs --- shellinabox.spec | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index beec9a1..585d86e 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -1,6 +1,6 @@ Name: shellinabox Version: 2.14 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -11,8 +11,8 @@ Source2: shellinaboxd.service Source3: shellinaboxd.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel%{?_isa} -BuildRequires: zlib-devel%{?_isa} +BuildRequires: openssl-devel +BuildRequires: zlib-devel %if 0%{?fedora} >= 15 || 0%{?rhel} > 6 BuildRequires: systemd-units @@ -70,6 +70,7 @@ rm -rf %{buildroot} %if 0%{?fedora} >= 15 || 0%{?rhel} > 6 + %post if [ $1 -eq 1 ] ; then # Initial installation @@ -83,7 +84,6 @@ if [ $1 -eq 0 ] ; then /bin/systemctl stop shellinaboxd.service > /dev/null 2>&1 || : fi - %postun /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then @@ -91,24 +91,38 @@ if [ $1 -ge 1 ] ; then /bin/systemctl try-restart shellinaboxd.service >/dev/null 2>&1 || : fi + +%elif 0%{?fedora} >= 18 + + +%post +%systemd_post shellinaboxd.service + +%preun +%systemd_preun shellinaboxd.service + +%postun +%systemd_postun_with_restart shellinaboxd.service + + %else + %post /sbin/chkconfig --add shellinaboxd - %preun if [ "$1" = 0 ]; then /sbin/service shellinaboxd stop >/dev/null 2>&1 || : /sbin/chkconfig --del shellinaboxd fi - %postun if [ "$1" -ge "1" ]; then /sbin/service shellinaboxd condrestart >/dev/null 2>&1 || : fi + %endif @@ -125,6 +139,10 @@ fi %changelog +* Wed Sep 05 2012 Simone Caronni - 2.14-7 +- Add Fedora 18 systemd macros. +- Remove isa'ed BuildRequires. + * Thu Aug 30 2012 Simone Caronni - 2.14-6 - Add nss-lookup.target requirement and Documentation tag in service file. From 0d4036a652e3ccef500854cea1a0836c23b89cc2 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 5 Sep 2012 14:02:24 +0200 Subject: [PATCH 07/89] Fix conditions --- shellinabox.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 585d86e..ee330dc 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -70,7 +70,6 @@ rm -rf %{buildroot} %if 0%{?fedora} >= 15 || 0%{?rhel} > 6 - %post if [ $1 -eq 1 ] ; then # Initial installation @@ -91,9 +90,9 @@ if [ $1 -ge 1 ] ; then /bin/systemctl try-restart shellinaboxd.service >/dev/null 2>&1 || : fi +%endif -%elif 0%{?fedora} >= 18 - +%if 0%{?fedora} >= 18 %post %systemd_post shellinaboxd.service @@ -104,9 +103,9 @@ fi %postun %systemd_postun_with_restart shellinaboxd.service +%endif -%else - +%if 0%{?rhel} <= 6 %post /sbin/chkconfig --add shellinaboxd @@ -122,7 +121,6 @@ if [ "$1" -ge "1" ]; then /sbin/service shellinaboxd condrestart >/dev/null 2>&1 || : fi - %endif From be29aa49243f7c1f8fc6c20c22df58ce084de1c5 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 5 Sep 2012 14:08:35 +0200 Subject: [PATCH 08/89] Fix conditions 2nd try --- shellinabox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index ee330dc..02e59af 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -68,7 +68,7 @@ install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd %clean rm -rf %{buildroot} -%if 0%{?fedora} >= 15 || 0%{?rhel} > 6 +%if 0%{?fedora} = 16 || 0%{?fedora} = 17 || 0%{?rhel} > 6 %post if [ $1 -eq 1 ] ; then From 6e957bcb33eab78e93b52d756d3cb157198a9056 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 5 Sep 2012 14:09:18 +0200 Subject: [PATCH 09/89] Fix conditions 3rd try --- shellinabox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 02e59af..e09f535 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -68,7 +68,7 @@ install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd %clean rm -rf %{buildroot} -%if 0%{?fedora} = 16 || 0%{?fedora} = 17 || 0%{?rhel} > 6 +%if 0%{?fedora} == 16 || 0%{?fedora} == 17 || 0%{?rhel} > 6 %post if [ $1 -eq 1 ] ; then From 0d9a994096a20cecb0c082b8d4ea7436d3824396 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 5 Sep 2012 14:35:09 +0200 Subject: [PATCH 10/89] Just learned that a non existing variable is -1, so a check with <= is always true. Doh. --- shellinabox.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index e09f535..cb76172 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -68,7 +68,7 @@ install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd %clean rm -rf %{buildroot} -%if 0%{?fedora} == 16 || 0%{?fedora} == 17 || 0%{?rhel} > 6 +%if 0%{?fedora} == 16 || 0%{?fedora} == 17 %post if [ $1 -eq 1 ] ; then @@ -92,7 +92,7 @@ fi %endif -%if 0%{?fedora} >= 18 +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %post %systemd_post shellinaboxd.service @@ -105,7 +105,7 @@ fi %endif -%if 0%{?rhel} <= 6 +%if 0%{?rhel} == 6 || 0%{?rhel} == 5 %post /sbin/chkconfig --add shellinaboxd From 3334eb8bf12414b29f82dff31a94bc7ff291fb14 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 5 Sep 2012 18:58:07 +0200 Subject: [PATCH 11/89] Temp fix for fedpkg not removing %fedora in the %rhel branches. --- shellinabox.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index cb76172..4580d46 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -37,6 +37,7 @@ browser plugins. %prep %setup -q + %build %configure make %{?_smp_mflags} @@ -68,7 +69,7 @@ install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd %clean rm -rf %{buildroot} -%if 0%{?fedora} == 16 || 0%{?fedora} == 17 +%if (0%{?fedora} == 16 || 0%{?fedora} == 17) && !0%{?rhel} %post if [ $1 -eq 1 ] ; then From 5dd71e1c17f050343a58ac7d678e3795d4217484 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 6 Sep 2012 08:54:20 +0200 Subject: [PATCH 12/89] Add fedpkg comment for conditions --- shellinabox.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shellinabox.spec b/shellinabox.spec index 4580d46..68eb1ac 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -69,6 +69,8 @@ install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd %clean rm -rf %{buildroot} +# Until this is fixed upstream in fedpkg, leave it like this +# http://permalink.gmane.org/gmane.linux.redhat.fedora.devel/168291 %if (0%{?fedora} == 16 || 0%{?fedora} == 17) && !0%{?rhel} %post From 79bdcdbaade325ed18a04078253a133e5126ec42 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 12 Sep 2012 11:18:01 +0200 Subject: [PATCH 13/89] Add patch for Firefox 15 keys --- shellinabox.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 68eb1ac..22d2343 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -1,6 +1,6 @@ Name: shellinabox Version: 2.14 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -11,6 +11,8 @@ Source2: shellinaboxd.service Source3: shellinaboxd.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: %{name}-2.14-fixkeys.patch + BuildRequires: openssl-devel BuildRequires: zlib-devel @@ -36,7 +38,7 @@ browser plugins. %prep %setup -q - +%patch0 -p0 -b .fixkeys %build %configure @@ -140,6 +142,10 @@ fi %changelog +* Tue Sep 11 2012 Joel Young - 2.14-8 +- Fixed bug with firefox 15 ignored key: + http://code.google.com/p/shellinabox/issues/detail?id=202&q=key%20work + * Wed Sep 05 2012 Simone Caronni - 2.14-7 - Add Fedora 18 systemd macros. - Remove isa'ed BuildRequires. From b15565af5a8728dc7e5346244208ed6160a668c0 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 12 Sep 2012 11:47:34 +0200 Subject: [PATCH 14/89] Add user/group and certs directory --- shellinabox.spec | 35 ++++++++++++++++++++++++++++++----- shellinaboxd.sysconfig | 2 +- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 22d2343..88b4628 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -1,6 +1,8 @@ +%global username shellinabox + Name: shellinabox Version: 2.14 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -16,7 +18,7 @@ Patch0: %{name}-2.14-fixkeys.patch BuildRequires: openssl-devel BuildRequires: zlib-devel -%if 0%{?fedora} >= 15 || 0%{?rhel} > 6 +%if 0%{?fedora} || 0%{?rhel} > 6 BuildRequires: systemd-units Requires(post): systemd-sysv Requires(post): systemd-units @@ -28,6 +30,7 @@ Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service %endif +Requires(pre): shadow-utils %description Shell In A Box implements a web server that can export arbitrary command line @@ -49,12 +52,13 @@ make %{?_smp_mflags} rm -rf %{buildroot} mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_sysconfdir}/sysconfig +mkdir -p %{buildroot}%{_localstatedir}/run/%{name} install -p -m 755 -D shellinaboxd %{buildroot}%{_sbindir}/shellinaboxd install -p -m 644 -D shellinaboxd.1 %{buildroot}%{_mandir}/man1/shellinaboxd.1 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/shellinaboxd -%if 0%{?fedora} >= 15 || 0%{?rhel} > 6 +%if 0%{?fedora} || 0%{?rhel} > 6 # Systemd unit files mkdir -p %{buildroot}%{_unitdir} @@ -71,6 +75,13 @@ install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd %clean rm -rf %{buildroot} + +%pre +getent group %username >/dev/null || groupadd -r %username &>/dev/null || : +getent passwd %username >/dev/null || useradd -r -s /sbin/nologin \ + -d /var/run/shellinabox -M -c 'Shellinabox' -g %username %username &>/dev/null || : +exit 0 + # Until this is fixed upstream in fedpkg, leave it like this # http://permalink.gmane.org/gmane.linux.redhat.fedora.devel/168291 %if (0%{?fedora} == 16 || 0%{?fedora} == 17) && !0%{?rhel} @@ -94,6 +105,10 @@ if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall /bin/systemctl try-restart shellinaboxd.service >/dev/null 2>&1 || : fi +test "$1" != 0 || userdel %username &>/dev/null || : +test "$1" != 0 || groupdel %username &>/dev/null || : +exit 0 + %endif @@ -107,6 +122,9 @@ fi %postun %systemd_postun_with_restart shellinaboxd.service +test "$1" != 0 || userdel %username &>/dev/null || : +test "$1" != 0 || groupdel %username &>/dev/null || : +exit 0 %endif @@ -125,6 +143,9 @@ fi if [ "$1" -ge "1" ]; then /sbin/service shellinaboxd condrestart >/dev/null 2>&1 || : fi +test "$1" != 0 || userdel %username &>/dev/null || : +test "$1" != 0 || groupdel %username &>/dev/null || : +exit 0 %endif @@ -134,16 +155,20 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/shellinaboxd %{_mandir}/man1/shellinaboxd.1.* %{_sbindir}/shellinaboxd -%if 0%{?fedora} >= 15 || 0%{?rhel} > 6 +%if 0%{?fedora} || 0%{?rhel} > 6 %{_unitdir}/shellinaboxd.service %else %{_initrddir}/shellinaboxd %endif +%attr(750,%{username},%{username}) %{_localstatedir}/run/%{name} %changelog +* Tue Sep 12 2012 Simone Caronni - 2.14-9 +- Added user/group and confined directory for certificates, based on work from Joel Young. + * Tue Sep 11 2012 Joel Young - 2.14-8 -- Fixed bug with firefox 15 ignored key: +- Fixed bug with firefox 15+ ignored key: http://code.google.com/p/shellinabox/issues/detail?id=202&q=key%20work * Wed Sep 05 2012 Simone Caronni - 2.14-7 diff --git a/shellinaboxd.sysconfig b/shellinaboxd.sysconfig index dce83a8..1903333 100644 --- a/shellinaboxd.sysconfig +++ b/shellinaboxd.sysconfig @@ -1,4 +1,4 @@ # Shell in a box daemon configuration # For details see shellinaboxd man page -OPTS="-s /:LOGIN" +OPTS="--cert=/var/run/shellinabox -u shellinabox -g shellinabox -s /:LOGIN" From ad2a11e8b14dca2516c58a8240484094e8e622ea Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 12 Sep 2012 12:01:43 +0200 Subject: [PATCH 15/89] Really add patch. --- shellinabox-2.14-fixkeys.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 shellinabox-2.14-fixkeys.patch diff --git a/shellinabox-2.14-fixkeys.patch b/shellinabox-2.14-fixkeys.patch new file mode 100644 index 0000000..d6aaf40 --- /dev/null +++ b/shellinabox-2.14-fixkeys.patch @@ -0,0 +1,18 @@ +--- shellinabox/vt100.js.orig 2012-04-21 10:30:44.000000000 -0700 ++++ shellinabox/vt100.js 2012-09-11 16:13:48.145957079 -0700 +@@ -2742,6 +2742,7 @@ + case 187: /* = */ ch = this.applyModifiers(61, event); break; + case 188: /* , */ ch = this.applyModifiers(44, event); break; + case 189: /* - */ ch = this.applyModifiers(45, event); break; ++ case 173: /* - */ ch = this.applyModifiers(45, event); break; + case 190: /* . */ ch = this.applyModifiers(46, event); break; + case 191: /* / */ ch = this.applyModifiers(47, event); break; + // Conflicts with dead key " on Swiss keyboards +@@ -2886,6 +2887,7 @@ + case 187: /* = -> + */ u = 61; s = 43; break; + case 188: /* , -> < */ u = 44; s = 60; break; + case 189: /* - -> _ */ u = 45; s = 95; break; ++ case 173: /* - -> _ */ u = 45; s = 95; break; + case 190: /* . -> > */ u = 46; s = 62; break; + case 191: /* / -> ? */ u = 47; s = 63; break; + case 192: /* ` -> ~ */ u = 96; s = 126; break; From c4bf32be2912ccc69bced8812ccb720a99316c45 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 13 Sep 2012 10:55:17 +0200 Subject: [PATCH 16/89] Add css files, do not remove user on uninstall --- shellinabox.spec | 28 ++++++++++++++++++---------- shellinaboxd.sysconfig | 11 ++++++++++- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 88b4628..3d16dc3 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.14 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -14,6 +14,7 @@ Source3: shellinaboxd.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: %{name}-2.14-fixkeys.patch +Patch1: %{name}-2.14-man-paths.patch BuildRequires: openssl-devel BuildRequires: zlib-devel @@ -42,6 +43,7 @@ browser plugins. %prep %setup -q %patch0 -p0 -b .fixkeys +%patch0 -p1 -b .man-paths %build %configure @@ -50,24 +52,26 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig -mkdir -p %{buildroot}%{_localstatedir}/run/%{name} +mkdir -p %{buildroot}%{_localstatedir}/run/%{name} install -p -m 755 -D shellinaboxd %{buildroot}%{_sbindir}/shellinaboxd install -p -m 644 -D shellinaboxd.1 %{buildroot}%{_mandir}/man1/shellinaboxd.1 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/shellinaboxd +mkdir -p %{buildroot}%{_datadir}/%{name} +install -p -m 644 shellinabox/black-on-white.css %{buildroot}%{_datarootdir}/%{name} +install -p -m 644 shellinabox/white-on-black.css %{buildroot}%{_datarootdir}/%{name} +install -p -m 644 shellinabox/color.css %{buildroot}%{_datarootdir}/%{name} +install -p -m 644 shellinabox/monochrome.css %{buildroot}%{_datarootdir}/%{name} + %if 0%{?fedora} || 0%{?rhel} > 6 # Systemd unit files -mkdir -p %{buildroot}%{_unitdir} install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/shellinaboxd.service %else # Initscripts -mkdir -p %{buildroot}%{_initrddir} install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd %endif @@ -105,10 +109,6 @@ if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall /bin/systemctl try-restart shellinaboxd.service >/dev/null 2>&1 || : fi -test "$1" != 0 || userdel %username &>/dev/null || : -test "$1" != 0 || groupdel %username &>/dev/null || : -exit 0 - %endif @@ -154,6 +154,7 @@ exit 0 %doc AUTHORS NEWS README README.Fedora GPL-2 COPYING %config(noreplace) %{_sysconfdir}/sysconfig/shellinaboxd %{_mandir}/man1/shellinaboxd.1.* +%{_datadir}/%{name} %{_sbindir}/shellinaboxd %if 0%{?fedora} || 0%{?rhel} > 6 %{_unitdir}/shellinaboxd.service @@ -164,6 +165,13 @@ exit 0 %changelog +* Thu Sep 13 2012 Simone Caronni - 2.14-10 +- Fixes from (Joel Young ): + Install supplied css files. + Set menu item to turn off ssl as disabled by default. + Do not remove user on uninstall. +- Simplified spec file. + * Tue Sep 12 2012 Simone Caronni - 2.14-9 - Added user/group and confined directory for certificates, based on work from Joel Young. diff --git a/shellinaboxd.sysconfig b/shellinaboxd.sysconfig index 1903333..039b525 100644 --- a/shellinaboxd.sysconfig +++ b/shellinaboxd.sysconfig @@ -1,4 +1,13 @@ # Shell in a box daemon configuration # For details see shellinaboxd man page -OPTS="--cert=/var/run/shellinabox -u shellinabox -g shellinabox -s /:LOGIN" +# Basic configuration running on port 4200 +OPTS="--cert=/var/run/shellinabox --disable-ssl-menu -u shellinabox -g shellinabox -s /:LOGIN" + +# Examples: + +# Fancy configuration with right-click menu choice for black-on-white and running on port 443 +# OPTS="--user-css Normal:+black-on-white.css,Reverse:-white-on-black.css --port=443 --disable-ssl-menu --cert=/var/run/shellinabox -u shellinabox -g shellinabox -s /:LOGIN" + +# Simple configuration for running it as an SSH console with SSL disabled +# OPTS="--cert=/var/run/shellinabox -u shellinabox -g shellinabox -t -s /:SSH:host.example.com" From b5390ee95c7ca199f4551a102311e26a4a6861dc Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 13 Sep 2012 10:57:28 +0200 Subject: [PATCH 17/89] Patch not yet in --- shellinabox.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 3d16dc3..cd1b2ad 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -14,7 +14,6 @@ Source3: shellinaboxd.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: %{name}-2.14-fixkeys.patch -Patch1: %{name}-2.14-man-paths.patch BuildRequires: openssl-devel BuildRequires: zlib-devel @@ -43,7 +42,7 @@ browser plugins. %prep %setup -q %patch0 -p0 -b .fixkeys -%patch0 -p1 -b .man-paths + %build %configure From 4144dd00aa4d7f91af960166c082b3c1442d8a6d Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 13 Sep 2012 11:13:39 +0200 Subject: [PATCH 18/89] Split options in the daemon config file --- shellinabox.spec | 1 + shellinaboxd.init | 4 +--- shellinaboxd.service | 2 +- shellinaboxd.sysconfig | 19 ++++++++++++------- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index cd1b2ad..4484c31 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -170,6 +170,7 @@ exit 0 Set menu item to turn off ssl as disabled by default. Do not remove user on uninstall. - Simplified spec file. +- Split options in the daemon config file. * Tue Sep 12 2012 Simone Caronni - 2.14-9 - Added user/group and confined directory for certificates, based on work from Joel Young. diff --git a/shellinaboxd.init b/shellinaboxd.init index 9aa5c20..bed1597 100644 --- a/shellinaboxd.init +++ b/shellinaboxd.init @@ -20,13 +20,11 @@ if [ -f /etc/sysconfig/$prog ] ; then . /etc/sysconfig/$prog fi -OPTS="$OPTS --background=/var/run/$prog.pid" - start() { [ "$EUID" != "0" ] && exit 4 echo -n "Starting $prog: " - daemon $prog $OPTS + daemon $prog -u $USER -g $GROUP --certdir=$CERTDIR --port=$PORT --background=/var/run/$prog.pid $OPTS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog diff --git a/shellinaboxd.service b/shellinaboxd.service index f497d98..9fde66d 100644 --- a/shellinaboxd.service +++ b/shellinaboxd.service @@ -6,7 +6,7 @@ After=network.target nss-lookup.target [Service] EnvironmentFile=-/etc/sysconfig/shellinaboxd -ExecStart=/usr/sbin/shellinaboxd $OPTS +ExecStart=/usr/sbin/shellinaboxd -u $USER -g $GROUP --certdir=$CERTDIR --port=$PORT $OPTS Restart=always [Install] diff --git a/shellinaboxd.sysconfig b/shellinaboxd.sysconfig index 039b525..0587cd3 100644 --- a/shellinaboxd.sysconfig +++ b/shellinaboxd.sysconfig @@ -1,13 +1,18 @@ # Shell in a box daemon configuration # For details see shellinaboxd man page -# Basic configuration running on port 4200 -OPTS="--cert=/var/run/shellinabox --disable-ssl-menu -u shellinabox -g shellinabox -s /:LOGIN" +# Basic options +USER=shellinabox +GROUP=shellinabox +CERTDIR=/var/run/shellinabox +PORT=4200 +OPTS="--disable-ssl-menu -s /:LOGIN" -# Examples: -# Fancy configuration with right-click menu choice for black-on-white and running on port 443 -# OPTS="--user-css Normal:+black-on-white.css,Reverse:-white-on-black.css --port=443 --disable-ssl-menu --cert=/var/run/shellinabox -u shellinabox -g shellinabox -s /:LOGIN" +# Additional examples with custom options: -# Simple configuration for running it as an SSH console with SSL disabled -# OPTS="--cert=/var/run/shellinabox -u shellinabox -g shellinabox -t -s /:SSH:host.example.com" +# Fancy configuration with right-click menu choice for black-on-white: +# OPTS="--user-css Normal:+black-on-white.css,Reverse:-white-on-black.css --disable-ssl-menu -s /:LOGIN" + +# Simple configuration for running it as an SSH console with SSL disabled: +# OPTS="-t -s /:SSH:host.example.com" From 1f57bb94ef9134c0e3ac7dbd9fde8fcb50e7466e Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 24 Sep 2012 16:20:21 +0200 Subject: [PATCH 19/89] Fix startup parameter --- shellinaboxd.init | 2 +- shellinaboxd.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shellinaboxd.init b/shellinaboxd.init index bed1597..7acfd4f 100644 --- a/shellinaboxd.init +++ b/shellinaboxd.init @@ -24,7 +24,7 @@ start() { [ "$EUID" != "0" ] && exit 4 echo -n "Starting $prog: " - daemon $prog -u $USER -g $GROUP --certdir=$CERTDIR --port=$PORT --background=/var/run/$prog.pid $OPTS + daemon $prog -u $USER -g $GROUP --cert=$CERTDIR --port=$PORT --background=/var/run/$prog.pid $OPTS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog diff --git a/shellinaboxd.service b/shellinaboxd.service index 9fde66d..4f01c7f 100644 --- a/shellinaboxd.service +++ b/shellinaboxd.service @@ -6,7 +6,7 @@ After=network.target nss-lookup.target [Service] EnvironmentFile=-/etc/sysconfig/shellinaboxd -ExecStart=/usr/sbin/shellinaboxd -u $USER -g $GROUP --certdir=$CERTDIR --port=$PORT $OPTS +ExecStart=/usr/sbin/shellinaboxd -u $USER -g $GROUP --cert=$CERTDIR --port=$PORT $OPTS Restart=always [Install] From 3b4f3f10b3d1c59cb40382d5490999e619426200 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 24 Sep 2012 16:29:12 +0200 Subject: [PATCH 20/89] Set working directory for init scripts --- shellinaboxd.init | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shellinaboxd.init b/shellinaboxd.init index 7acfd4f..66b541a 100644 --- a/shellinaboxd.init +++ b/shellinaboxd.init @@ -13,6 +13,7 @@ . /etc/rc.d/init.d/functions RETVAL=0 +WORKING_DIR=/usr/share/shellinabox prog="shellinaboxd" # Source configuration. @@ -24,6 +25,7 @@ start() { [ "$EUID" != "0" ] && exit 4 echo -n "Starting $prog: " + cd $WORKING_DIR daemon $prog -u $USER -g $GROUP --cert=$CERTDIR --port=$PORT --background=/var/run/$prog.pid $OPTS RETVAL=$? echo From 2189704209c67cb19bedceac03f7720a90412567 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 24 Sep 2012 16:51:32 +0200 Subject: [PATCH 21/89] RHEL 5 does not have _datarootdir macro --- shellinabox.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 4484c31..ea76ce7 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.14 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -58,10 +58,10 @@ install -p -m 644 -D shellinaboxd.1 %{buildroot}%{_mandir}/man1/shellinaboxd.1 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/shellinaboxd mkdir -p %{buildroot}%{_datadir}/%{name} -install -p -m 644 shellinabox/black-on-white.css %{buildroot}%{_datarootdir}/%{name} -install -p -m 644 shellinabox/white-on-black.css %{buildroot}%{_datarootdir}/%{name} -install -p -m 644 shellinabox/color.css %{buildroot}%{_datarootdir}/%{name} -install -p -m 644 shellinabox/monochrome.css %{buildroot}%{_datarootdir}/%{name} +install -p -m 644 shellinabox/black-on-white.css %{buildroot}%{_datadir}/%{name} +install -p -m 644 shellinabox/white-on-black.css %{buildroot}%{_datadir}/%{name} +install -p -m 644 shellinabox/color.css %{buildroot}%{_datadir}/%{name} +install -p -m 644 shellinabox/monochrome.css %{buildroot}%{_datadir}/%{name} %if 0%{?fedora} || 0%{?rhel} > 6 @@ -164,6 +164,9 @@ exit 0 %changelog +* Mon Sep 24 2012 Simone Caronni - 2.14-11 +- Fix RHEL 5 rpm macro. + * Thu Sep 13 2012 Simone Caronni - 2.14-10 - Fixes from (Joel Young ): Install supplied css files. From 6721ae5c77356fa770ba480327c4b4c0845022bc Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 25 Sep 2012 08:26:18 +0200 Subject: [PATCH 22/89] Really add WorkingDirectory to service file --- shellinaboxd.service | 1 + 1 file changed, 1 insertion(+) diff --git a/shellinaboxd.service b/shellinaboxd.service index 4f01c7f..08d2226 100644 --- a/shellinaboxd.service +++ b/shellinaboxd.service @@ -6,6 +6,7 @@ After=network.target nss-lookup.target [Service] EnvironmentFile=-/etc/sysconfig/shellinaboxd +WorkingDirectory=/usr/share/shellinabox ExecStart=/usr/sbin/shellinaboxd -u $USER -g $GROUP --cert=$CERTDIR --port=$PORT $OPTS Restart=always From ad1111f2b73196f4ee8d04f9f2b528d5607d29c2 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 25 Sep 2012 08:39:40 +0200 Subject: [PATCH 23/89] Remove postun user deletion leftovers, add customizable files --- shellinabox.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index ea76ce7..90a20f2 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.14 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -121,9 +121,6 @@ fi %postun %systemd_postun_with_restart shellinaboxd.service -test "$1" != 0 || userdel %username &>/dev/null || : -test "$1" != 0 || groupdel %username &>/dev/null || : -exit 0 %endif @@ -142,15 +139,14 @@ fi if [ "$1" -ge "1" ]; then /sbin/service shellinaboxd condrestart >/dev/null 2>&1 || : fi -test "$1" != 0 || userdel %username &>/dev/null || : -test "$1" != 0 || groupdel %username &>/dev/null || : -exit 0 %endif %files %doc AUTHORS NEWS README README.Fedora GPL-2 COPYING +%doc shellinabox/styles.css shellinabox/print-styles.css +%doc shellinabox/shell_in_a_box.js %config(noreplace) %{_sysconfdir}/sysconfig/shellinaboxd %{_mandir}/man1/shellinaboxd.1.* %{_datadir}/%{name} @@ -164,6 +160,11 @@ exit 0 %changelog +* Tue Sep 25 2012 Simone Caronni - 2.14-12 +- Really add WorkingDirectory to service files. +- Remove postun user deletion leftovers. +- Add static files to be customized (as referenced by the man page) in the doc directory. + * Mon Sep 24 2012 Simone Caronni - 2.14-11 - Fix RHEL 5 rpm macro. From deba4cbc4f87ccf488f47d374d08cfacd5850a9c Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 26 Sep 2012 12:05:02 +0200 Subject: [PATCH 24/89] Change variable expansion --- shellinaboxd.init | 2 +- shellinaboxd.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shellinaboxd.init b/shellinaboxd.init index 66b541a..98180c4 100644 --- a/shellinaboxd.init +++ b/shellinaboxd.init @@ -26,7 +26,7 @@ start() { echo -n "Starting $prog: " cd $WORKING_DIR - daemon $prog -u $USER -g $GROUP --cert=$CERTDIR --port=$PORT --background=/var/run/$prog.pid $OPTS + daemon $prog -u $USER -g $GROUP --cert=${CERTDIR} --port=${PORT} --background=/var/run/$prog.pid $OPTS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog diff --git a/shellinaboxd.service b/shellinaboxd.service index 08d2226..e9c3191 100644 --- a/shellinaboxd.service +++ b/shellinaboxd.service @@ -7,7 +7,7 @@ After=network.target nss-lookup.target [Service] EnvironmentFile=-/etc/sysconfig/shellinaboxd WorkingDirectory=/usr/share/shellinabox -ExecStart=/usr/sbin/shellinaboxd -u $USER -g $GROUP --cert=$CERTDIR --port=$PORT $OPTS +ExecStart=/usr/sbin/shellinaboxd -u $USER -g $GROUP --cert=${CERTDIR} --port=${PORT} $OPTS Restart=always [Install] From e01e0c34c5b91009a3108dbeac72cf78de21650f Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 26 Sep 2012 12:09:02 +0200 Subject: [PATCH 25/89] Bump spec --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 90a20f2..db5d664 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.14 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -160,6 +160,9 @@ fi %changelog +* Wed Sep 26 2012 Joel Young - 2.14-13 +- Fix variable expansions in init script and service file. + * Tue Sep 25 2012 Simone Caronni - 2.14-12 - Really add WorkingDirectory to service files. - Remove postun user deletion leftovers. From d3dab7f7c32b58ad6e105b6bdb2f287e08165fac Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 1 Oct 2012 08:53:05 +0200 Subject: [PATCH 26/89] Move user directory under /var/lib --- shellinabox.spec | 6 +++--- shellinaboxd.sysconfig | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index db5d664..9ae97d1 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -52,7 +52,7 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_localstatedir}/run/%{name} +mkdir -p %{buildroot}%{_sharedstatedir}/%{name} install -p -m 755 -D shellinaboxd %{buildroot}%{_sbindir}/shellinaboxd install -p -m 644 -D shellinaboxd.1 %{buildroot}%{_mandir}/man1/shellinaboxd.1 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/shellinaboxd @@ -82,7 +82,7 @@ rm -rf %{buildroot} %pre getent group %username >/dev/null || groupadd -r %username &>/dev/null || : getent passwd %username >/dev/null || useradd -r -s /sbin/nologin \ - -d /var/run/shellinabox -M -c 'Shellinabox' -g %username %username &>/dev/null || : + -d %{_sharedstatedir}/shellinabox -M -c 'Shellinabox' -g %username %username &>/dev/null || : exit 0 # Until this is fixed upstream in fedpkg, leave it like this @@ -156,7 +156,7 @@ fi %else %{_initrddir}/shellinaboxd %endif -%attr(750,%{username},%{username}) %{_localstatedir}/run/%{name} +%attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog diff --git a/shellinaboxd.sysconfig b/shellinaboxd.sysconfig index 0587cd3..3bdd0c3 100644 --- a/shellinaboxd.sysconfig +++ b/shellinaboxd.sysconfig @@ -4,7 +4,7 @@ # Basic options USER=shellinabox GROUP=shellinabox -CERTDIR=/var/run/shellinabox +CERTDIR=/var/lib/shellinabox PORT=4200 OPTS="--disable-ssl-menu -s /:LOGIN" From 5f1722a53834a9f6745acba8e672dc3bd9d53665 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 1 Oct 2012 08:59:31 +0200 Subject: [PATCH 27/89] Bump spec --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 9ae97d1..1c81a87 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.14 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -160,6 +160,9 @@ fi %changelog +* Mon Oct 01 2012 Simone Caronni - 2.14-14 +- Move user directory and data under /var/lib. + * Wed Sep 26 2012 Joel Young - 2.14-13 - Fix variable expansions in init script and service file. From b1ef160350b86773bdc7d13b59438d8d14671d45 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 17 Oct 2012 10:42:36 +0200 Subject: [PATCH 28/89] Update systemd requirements and refresh distro checks for fedpkg > 1.10 --- shellinabox.spec | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 1c81a87..3e3a044 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -18,18 +18,30 @@ Patch0: %{name}-2.14-fixkeys.patch BuildRequires: openssl-devel BuildRequires: zlib-devel -%if 0%{?fedora} || 0%{?rhel} > 6 +%if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: systemd-units -Requires(post): systemd-sysv +%endif + +%if 0%{?fedora} == 16 || 0%{?fedora} == 17 Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -%else +%endif + +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +Requires(post): systemd-sysv +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%endif + +%if 0%{?rhel} == 5 || 0%{?rhel} == 6 Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service %endif + Requires(pre): shadow-utils %description @@ -63,7 +75,7 @@ install -p -m 644 shellinabox/white-on-black.css %{buildroot}%{_datadir}/%{name} install -p -m 644 shellinabox/color.css %{buildroot}%{_datadir}/%{name} install -p -m 644 shellinabox/monochrome.css %{buildroot}%{_datadir}/%{name} -%if 0%{?fedora} || 0%{?rhel} > 6 +%if 0%{?fedora} || 0%{?rhel} >= 7 # Systemd unit files install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/shellinaboxd.service @@ -85,9 +97,7 @@ getent passwd %username >/dev/null || useradd -r -s /sbin/nologin \ -d %{_sharedstatedir}/shellinabox -M -c 'Shellinabox' -g %username %username &>/dev/null || : exit 0 -# Until this is fixed upstream in fedpkg, leave it like this -# http://permalink.gmane.org/gmane.linux.redhat.fedora.devel/168291 -%if (0%{?fedora} == 16 || 0%{?fedora} == 17) && !0%{?rhel} +%if 0%{?fedora} == 16 || 0%{?fedora} == 17 %post if [ $1 -eq 1 ] ; then @@ -151,7 +161,7 @@ fi %{_mandir}/man1/shellinaboxd.1.* %{_datadir}/%{name} %{_sbindir}/shellinaboxd -%if 0%{?fedora} || 0%{?rhel} > 6 +%if 0%{?fedora} || 0%{?rhel} >= 7 %{_unitdir}/shellinaboxd.service %else %{_initrddir}/shellinaboxd From 110bcef9516926fb078ef44daf7242aaf2a6a2a5 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 17 Oct 2012 10:43:55 +0200 Subject: [PATCH 29/89] Bump spec --- shellinabox.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 3e3a044..e73daef 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.14 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -170,6 +170,11 @@ fi %changelog +* Wed Oct 17 2012 Simone Caronni - 2.14-15 +- Fix fedpkg checks. Requires fedpkg > 1.10: + http://git.fedorahosted.org/cgit/fedpkg.git/commit/?id=11c46c06a3c9cc2f58d68aea964dd37dc028e349 +- Change systemd requirements as per new package guidelines. + * Mon Oct 01 2012 Simone Caronni - 2.14-14 - Move user directory and data under /var/lib. From 5cd45ebe0df03c58b5953de93b3652b1706e25b7 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Fri, 14 Dec 2012 11:02:53 +0100 Subject: [PATCH 30/89] Switch to the properly mantained shellinabox fork. The old shellinabox has not been mantained for a couple of years now, the fork contains a lot of fixes and especially it refactors some code to enable typing all characters in various keyboard layouts. --- .gitignore | 1 + shellinabox.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 0a936b8..07c5ba8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /shellinabox-2.14.tar.gz +/shellinabox-2.14-git88822c1f.tar.bz2 diff --git a/shellinabox.spec b/shellinabox.spec index e73daef..4296336 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -1,20 +1,19 @@ +%global commit git88822c1f %global username shellinabox Name: shellinabox Version: 2.14 -Release: 15%{?dist} +Release: 16%{?dist}.%{commit} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 -URL: http://code.google.com/p/shellinabox/ -Source0: http://shellinabox.googlecode.com/files/%{name}-%{version}.tar.gz +URL: https://github.com/pythonanywhere/shellinabox_fork +Source0: http://shellinabox.googlecode.com/files/%{name}-%{version}-%{commit}.tar.bz2 Source1: shellinaboxd.sysconfig Source2: shellinaboxd.service Source3: shellinaboxd.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: %{name}-2.14-fixkeys.patch - BuildRequires: openssl-devel BuildRequires: zlib-devel @@ -53,7 +52,6 @@ browser plugins. %prep %setup -q -%patch0 -p0 -b .fixkeys %build @@ -170,6 +168,9 @@ fi %changelog +* Fri Dec 14 2012 Simone Caronni - 2.14-16.git88822c1f +- Move source from the original unmantained content to the github fork. + * Wed Oct 17 2012 Simone Caronni - 2.14-15 - Fix fedpkg checks. Requires fedpkg > 1.10: http://git.fedorahosted.org/cgit/fedpkg.git/commit/?id=11c46c06a3c9cc2f58d68aea964dd37dc028e349 diff --git a/sources b/sources index 4f6ede7..b81c4e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c63b52edcebc56ee73a108e7211d174 shellinabox-2.14.tar.gz +75d1a515a0b923889c8beb05fc6bbec8 shellinabox-2.14-git88822c1f.tar.bz2 From 29586ea501328a6a6bb84eb0a4fd93a3c6ea4e61 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Fri, 14 Dec 2012 11:15:11 +0100 Subject: [PATCH 31/89] Add script to recreate source tarball --- shellinabox-git-checkout.sh | 15 +++++++++++++++ shellinabox.spec | 1 + 2 files changed, 16 insertions(+) create mode 100644 shellinabox-git-checkout.sh diff --git a/shellinabox-git-checkout.sh b/shellinabox-git-checkout.sh new file mode 100644 index 0000000..4227f6d --- /dev/null +++ b/shellinabox-git-checkout.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +VERSION=2.14 + +git clone git://github.com/pythonanywhere/shellinabox_fork.git shellinabox +cd shellinabox + +REVISION=$(git log | head -n1 | awk '{print $2}' | cut -c 1-8) + +git archive --format=tar --prefix=shellinabox-${VERSION}/ master | bzip2 > shellinabox-${VERSION}-git${REVISION}.tar.bz2 + +mv -f shellinabox-${VERSION}-git${REVISION}.tar.bz2 .. +cd .. +rm -fr shellinabox + diff --git a/shellinabox.spec b/shellinabox.spec index 4296336..5dc2397 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -12,6 +12,7 @@ Source0: http://shellinabox.googlecode.com/files/%{name}-%{version}-%{com Source1: shellinaboxd.sysconfig Source2: shellinaboxd.service Source3: shellinaboxd.init +Source99: shellinabox-git-checkout.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel From f7cac3f2263408d33c460f7a7f8dce5b8412382c Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Fri, 14 Dec 2012 11:27:14 +0100 Subject: [PATCH 32/89] Fix the commit / dist tags order in the revision --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 5dc2397..efebf73 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -3,7 +3,7 @@ Name: shellinabox Version: 2.14 -Release: 16%{?dist}.%{commit} +Release: 17.%{commit}.%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -169,6 +169,9 @@ fi %changelog +* Fri Dec 14 2012 Simone Caronni - 2.14-17.git88822c1f +- Fix the commit / dist tags order in the revision. + * Fri Dec 14 2012 Simone Caronni - 2.14-16.git88822c1f - Move source from the original unmantained content to the github fork. From 1b559982427f398cf229a6d906e894fd9aa0ddd3 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Fri, 14 Dec 2012 11:28:57 +0100 Subject: [PATCH 33/89] Remove extra dot in dist --- shellinabox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index efebf73..46056a7 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -3,7 +3,7 @@ Name: shellinabox Version: 2.14 -Release: 17.%{commit}.%{?dist} +Release: 17.%{commit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 From 1c82ff78a930e6023d323675ac15339aa72e0b51 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 9 Jan 2013 11:53:57 +0100 Subject: [PATCH 34/89] Fix for #893129 --- shellinabox.spec | 6 ++- shellinaboxd.init | 124 ++++++++++++++++++++++++++++------------------ 2 files changed, 81 insertions(+), 49 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 46056a7..d9c8991 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -3,7 +3,7 @@ Name: shellinabox Version: 2.14 -Release: 17.%{commit}%{?dist} +Release: 18.%{commit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -169,6 +169,10 @@ fi %changelog +* Wed Jan 09 2013 Simone Caronni - 2.14-18.git88822c1f +- Updated init script according to Fedora template (#893129) + https://fedoraproject.org/wiki/Packaging:SysVInitScript?rd=Packaging/SysVInitScript + * Fri Dec 14 2012 Simone Caronni - 2.14-17.git88822c1f - Fix the commit / dist tags order in the revision. diff --git a/shellinaboxd.init b/shellinaboxd.init index 98180c4..bc3b3f3 100644 --- a/shellinaboxd.init +++ b/shellinaboxd.init @@ -1,47 +1,69 @@ -#!/bin/bash +#!/bin/sh # -# shellinaboxd This shell script takes care of starting and stopping -# shellinabox. +# shellinaboxd Takes care of starting and stopping shellinabox. # # chkconfig: - 80 20 # description: Publish command line shell through AJAX interface. -# processname: shellinaboxd + +### BEGIN INIT INFO +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Publish command line shell through AJAX interface. +# Description: Shell In A Box implements a web server that can export arbitrary +# command line tools to a web based terminal emulator. This +# emulator is accessible to any JavaScript and CSS enabled web +# browser and does not require any additional browser plugins. +### END INIT INFO + # config: /etc/sysconfig/shellinaboxd # pidfile: /var/run/shellinaboxd.pid # Source function library. . /etc/rc.d/init.d/functions -RETVAL=0 -WORKING_DIR=/usr/share/shellinabox +exec="/usr/sbin/shellinaboxd" prog="shellinaboxd" +WORKING_DIR=/usr/share/shellinabox -# Source configuration. -if [ -f /etc/sysconfig/$prog ] ; then - . /etc/sysconfig/$prog -fi +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +lockfile=/var/lock/subsys/$prog start() { - [ "$EUID" != "0" ] && exit 4 - - echo -n "Starting $prog: " - cd $WORKING_DIR - daemon $prog -u $USER -g $GROUP --cert=${CERTDIR} --port=${PORT} --background=/var/run/$prog.pid $OPTS - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog - return $RETVAL + [ -x $exec ] || exit 5 + [ -f $config ] || exit 6 + echo -n $"Starting $prog: " + cd $WORKING_DIR + daemon $prog -u $USER -g $GROUP --cert=${CERTDIR} --port=${PORT} --background=/var/run/$prog.pid $OPTS + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval } -stop() { - [ "$EUID" != "0" ] && exit 4 - echo -n "Shutting down $prog: " - killproc $prog - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog - return $RETVAL +stop() { + echo -n $"Stopping $prog: " + # stop it here, often "killproc $prog" + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart } rh_status() { @@ -53,29 +75,35 @@ rh_status_q() { rh_status >/dev/null 2>&1 } + case "$1" in start) - start - ;; - stop) - stop - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - restart|force-reload) - stop - start - ;; - *) - echo "Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|status}" - [ "$1" = "usage" ] && exit 0 - exit 2 + 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 $? - From f8e47f0e334d72aabf4f88f56adffc881daefc38 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 9 Jan 2013 17:09:20 +0100 Subject: [PATCH 35/89] Add missing killproc --- shellinaboxd.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shellinaboxd.init b/shellinaboxd.init index bc3b3f3..db7c55e 100644 --- a/shellinaboxd.init +++ b/shellinaboxd.init @@ -46,7 +46,7 @@ start() { stop() { echo -n $"Stopping $prog: " - # stop it here, often "killproc $prog" + killproc $prog retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile From e90db316c6867448395ea56f1ff7519dcc48d661 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 9 Jan 2013 17:19:27 +0100 Subject: [PATCH 36/89] Bump spec --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index d9c8991..5f481eb 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -3,7 +3,7 @@ Name: shellinabox Version: 2.14 -Release: 18.%{commit}%{?dist} +Release: 19.%{commit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -169,6 +169,9 @@ fi %changelog +* Wed Jan 09 2013 Simone Caronni - 2.14-19.git88822c1f +- Fix SysV init scripts. + * Wed Jan 09 2013 Simone Caronni - 2.14-18.git88822c1f - Updated init script according to Fedora template (#893129) https://fedoraproject.org/wiki/Packaging:SysVInitScript?rd=Packaging/SysVInitScript From 0cc939f74dde8587ce70dd6d31e0752aa00292e6 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 14 Jan 2013 10:30:22 +0100 Subject: [PATCH 37/89] Fix #894903 and update spec to new packaging guidelines --- shellinabox.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 5f481eb..7f86856 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -1,18 +1,22 @@ -%global commit git88822c1f +%global commit 88822c1f4c030d5f05ced097eb7b6668ff3d7c6f +%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global username shellinabox +%if 0%{?rhel} == 5 +%define _sharedstatedir /var/lib +%endif + Name: shellinabox Version: 2.14 -Release: 19.%{commit}%{?dist} +Release: 20.git%{shortcommit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 URL: https://github.com/pythonanywhere/shellinabox_fork -Source0: http://shellinabox.googlecode.com/files/%{name}-%{version}-%{commit}.tar.bz2 +Source0: https://github.com/pythonanywhere/shellinabox_fork/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz Source1: shellinaboxd.sysconfig Source2: shellinaboxd.service Source3: shellinaboxd.init -Source99: shellinabox-git-checkout.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel @@ -52,7 +56,8 @@ browser plugins. %prep -%setup -q +#setup -qn %{name}-%{commit} +%setup -qn %{name}_fork-%{commit} %build @@ -169,6 +174,10 @@ fi %changelog +* Mon Jan 14 2013 Simone Caronni - 2.14-20.git88822c1 +- Added define for RHEL 5 (rhbz#894903). +- Updated spec to new packaging guidelines for github sources. + * Wed Jan 09 2013 Simone Caronni - 2.14-19.git88822c1f - Fix SysV init scripts. From 14d09bb246715ab1987e3a2bcdab2df01064581f Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 14 Jan 2013 10:39:02 +0100 Subject: [PATCH 38/89] Update re-generated sources --- .gitignore | 1 + shellinabox-2.14-fixkeys.patch | 18 ------------------ sources | 2 +- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 shellinabox-2.14-fixkeys.patch diff --git a/.gitignore b/.gitignore index 07c5ba8..f146f58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /shellinabox-2.14.tar.gz /shellinabox-2.14-git88822c1f.tar.bz2 +/shellinabox-2.14-88822c1.tar.gz diff --git a/shellinabox-2.14-fixkeys.patch b/shellinabox-2.14-fixkeys.patch deleted file mode 100644 index d6aaf40..0000000 --- a/shellinabox-2.14-fixkeys.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- shellinabox/vt100.js.orig 2012-04-21 10:30:44.000000000 -0700 -+++ shellinabox/vt100.js 2012-09-11 16:13:48.145957079 -0700 -@@ -2742,6 +2742,7 @@ - case 187: /* = */ ch = this.applyModifiers(61, event); break; - case 188: /* , */ ch = this.applyModifiers(44, event); break; - case 189: /* - */ ch = this.applyModifiers(45, event); break; -+ case 173: /* - */ ch = this.applyModifiers(45, event); break; - case 190: /* . */ ch = this.applyModifiers(46, event); break; - case 191: /* / */ ch = this.applyModifiers(47, event); break; - // Conflicts with dead key " on Swiss keyboards -@@ -2886,6 +2887,7 @@ - case 187: /* = -> + */ u = 61; s = 43; break; - case 188: /* , -> < */ u = 44; s = 60; break; - case 189: /* - -> _ */ u = 45; s = 95; break; -+ case 173: /* - -> _ */ u = 45; s = 95; break; - case 190: /* . -> > */ u = 46; s = 62; break; - case 191: /* / -> ? */ u = 47; s = 63; break; - case 192: /* ` -> ~ */ u = 96; s = 126; break; diff --git a/sources b/sources index b81c4e6..ef32d3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75d1a515a0b923889c8beb05fc6bbec8 shellinabox-2.14-git88822c1f.tar.bz2 +c5829959b5064398d65096281539f3f2 shellinabox-2.14-88822c1.tar.gz From e1f0eb5ce6cc2068970c08c5db7f85e18c91d51f Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 14 Jan 2013 10:44:22 +0100 Subject: [PATCH 39/89] Remove old git-checkout script --- shellinabox-git-checkout.sh | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 shellinabox-git-checkout.sh diff --git a/shellinabox-git-checkout.sh b/shellinabox-git-checkout.sh deleted file mode 100644 index 4227f6d..0000000 --- a/shellinabox-git-checkout.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -VERSION=2.14 - -git clone git://github.com/pythonanywhere/shellinabox_fork.git shellinabox -cd shellinabox - -REVISION=$(git log | head -n1 | awk '{print $2}' | cut -c 1-8) - -git archive --format=tar --prefix=shellinabox-${VERSION}/ master | bzip2 > shellinabox-${VERSION}-git${REVISION}.tar.bz2 - -mv -f shellinabox-${VERSION}-git${REVISION}.tar.bz2 .. -cd .. -rm -fr shellinabox - From 19f9fbe91d077b57c3c2835842dcdb18c2509c0e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 17:52:31 -0600 Subject: [PATCH 40/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 7f86856..584e4af 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -8,7 +8,7 @@ Name: shellinabox Version: 2.14 -Release: 20.git%{shortcommit}%{?dist} +Release: 21.git%{shortcommit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -174,6 +174,9 @@ fi %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 2.14-21.git88822c1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Mon Jan 14 2013 Simone Caronni - 2.14-20.git88822c1 - Added define for RHEL 5 (rhbz#894903). - Updated spec to new packaging guidelines for github sources. From 3de562a8d211ec585b016442564b447814dda4ee Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sat, 11 May 2013 18:58:18 +0200 Subject: [PATCH 41/89] Fix init and service files --- shellinabox.spec | 6 +++++- shellinaboxd.init | 7 ++++--- shellinaboxd.service | 3 +-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 584e4af..35fb2ea 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -8,7 +8,7 @@ Name: shellinabox Version: 2.14 -Release: 21.git%{shortcommit}%{?dist} +Release: 22.git%{shortcommit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -174,6 +174,10 @@ fi %changelog +* Sat May 11 2013 Simone Caronni - 2.14-22.git88822c1 +- Kill daemon by pid on EPEL (#962069). +- Change restart policy in service files and fix service dependencies. + * Thu Feb 14 2013 Fedora Release Engineering - 2.14-21.git88822c1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/shellinaboxd.init b/shellinaboxd.init index db7c55e..2fda3a2 100644 --- a/shellinaboxd.init +++ b/shellinaboxd.init @@ -25,6 +25,7 @@ exec="/usr/sbin/shellinaboxd" prog="shellinaboxd" +pid="/var/run/$prog.pid" WORKING_DIR=/usr/share/shellinabox [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -36,7 +37,7 @@ start() { [ -f $config ] || exit 6 echo -n $"Starting $prog: " cd $WORKING_DIR - daemon $prog -u $USER -g $GROUP --cert=${CERTDIR} --port=${PORT} --background=/var/run/$prog.pid $OPTS + daemon $prog -u $USER -g $GROUP --cert=${CERTDIR} --port=${PORT} --background=$pid $OPTS retval=$? echo [ $retval -eq 0 ] && touch $lockfile @@ -46,7 +47,7 @@ start() { stop() { echo -n $"Stopping $prog: " - killproc $prog + killproc -p $pid $prog retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile @@ -68,7 +69,7 @@ force_reload() { rh_status() { # run checks to determine if the service is running or use generic status - status $prog + status -p $pid $prog } rh_status_q() { diff --git a/shellinaboxd.service b/shellinaboxd.service index e9c3191..9ec2cb9 100644 --- a/shellinaboxd.service +++ b/shellinaboxd.service @@ -1,14 +1,13 @@ [Unit] Description=Shell In A Box daemon Documentation=man:shellinaboxd(1) -Requires=network.target nss-lookup.target After=network.target nss-lookup.target [Service] EnvironmentFile=-/etc/sysconfig/shellinaboxd WorkingDirectory=/usr/share/shellinabox ExecStart=/usr/sbin/shellinaboxd -u $USER -g $GROUP --cert=${CERTDIR} --port=${PORT} $OPTS -Restart=always +Restart=on-failure [Install] WantedBy=multi-user.target From 35abf9fccb205242bb7100075291d680fe768117 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 11 Jun 2013 14:52:12 +0200 Subject: [PATCH 42/89] Fix SSL support (#973058) --- shellinabox.spec | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 35fb2ea..1028bdd 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -8,7 +8,7 @@ Name: shellinabox Version: 2.14 -Release: 22.git%{shortcommit}%{?dist} +Release: 23.git%{shortcommit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -21,12 +21,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel BuildRequires: zlib-devel +Requires: openssl -%if 0%{?fedora} || 0%{?rhel} >= 7 -BuildRequires: systemd-units -%endif - -%if 0%{?fedora} == 16 || 0%{?fedora} == 17 +%if 0%{?fedora} == 17 Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -54,17 +51,23 @@ tools to a web based terminal emulator. This emulator is accessible to any JavaScript and CSS enabled web browser and does not require any additional browser plugins. - %prep #setup -qn %{name}-%{commit} %setup -qn %{name}_fork-%{commit} - %build +# Name of the shared libraries to be loaded at runtime when enabling SSL support +%if 0%{?rhel} == 5 +export SHELLINABOX_LIBSSL_SO=libssl.so.6 +export SHELLINABOX_LICRYPTO_SO=libcrypto.so.6 +%else +export SHELLINABOX_LIBSSL_SO=libssl.so.10 +export SHELLINABOX_LICRYPTO_SO=libcrypto.so.10 +%endif + %configure make %{?_smp_mflags} - %install rm -rf %{buildroot} @@ -101,7 +104,7 @@ getent passwd %username >/dev/null || useradd -r -s /sbin/nologin \ -d %{_sharedstatedir}/shellinabox -M -c 'Shellinabox' -g %username %username &>/dev/null || : exit 0 -%if 0%{?fedora} == 16 || 0%{?fedora} == 17 +%if 0%{?fedora} == 17 %post if [ $1 -eq 1 ] ; then @@ -174,6 +177,10 @@ fi %changelog +* Tue Jun 11 2013 Simone Caronni - 2.14-23.git88822c1 +- Fix SSL support (#973058). +- SPEC file cleanup. + * Sat May 11 2013 Simone Caronni - 2.14-22.git88822c1 - Kill daemon by pid on EPEL (#962069). - Change restart policy in service files and fix service dependencies. @@ -225,7 +232,7 @@ fi - Simplified spec file. - Split options in the daemon config file. -* Tue Sep 12 2012 Simone Caronni - 2.14-9 +* Wed Sep 12 2012 Simone Caronni - 2.14-9 - Added user/group and confined directory for certificates, based on work from Joel Young. * Tue Sep 11 2012 Joel Young - 2.14-8 From 2b4f4344bfc877c2baad0308f1c12146de70184a Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 11 Jun 2013 15:32:50 +0200 Subject: [PATCH 43/89] PROPER fix for SSL support (#973058) --- shellinabox.spec | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 1028bdd..cb9c8b0 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -52,21 +52,12 @@ JavaScript and CSS enabled web browser and does not require any additional browser plugins. %prep -#setup -qn %{name}-%{commit} %setup -qn %{name}_fork-%{commit} %build -# Name of the shared libraries to be loaded at runtime when enabling SSL support -%if 0%{?rhel} == 5 -export SHELLINABOX_LIBSSL_SO=libssl.so.6 -export SHELLINABOX_LICRYPTO_SO=libcrypto.so.6 -%else -export SHELLINABOX_LIBSSL_SO=libssl.so.10 -export SHELLINABOX_LICRYPTO_SO=libcrypto.so.10 -%endif - -%configure +%configure --disable-runtime-loading make %{?_smp_mflags} +chmod 644 %{name}/* %install rm -rf %{buildroot} @@ -77,7 +68,6 @@ install -p -m 644 -D shellinaboxd.1 %{buildroot}%{_mandir}/man1/shellinaboxd.1 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/shellinaboxd mkdir -p %{buildroot}%{_datadir}/%{name} -install -p -m 644 shellinabox/black-on-white.css %{buildroot}%{_datadir}/%{name} install -p -m 644 shellinabox/white-on-black.css %{buildroot}%{_datadir}/%{name} install -p -m 644 shellinabox/color.css %{buildroot}%{_datadir}/%{name} install -p -m 644 shellinabox/monochrome.css %{buildroot}%{_datadir}/%{name} From 5055d142e48fd1b284502518cdfe0cdbfad387e6 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 11 Jun 2013 15:36:12 +0200 Subject: [PATCH 44/89] Bump release --- shellinabox.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index cb9c8b0..7dfd0f0 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -8,7 +8,7 @@ Name: shellinabox Version: 2.14 -Release: 23.git%{shortcommit}%{?dist} +Release: 24.git%{shortcommit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -167,7 +167,7 @@ fi %changelog -* Tue Jun 11 2013 Simone Caronni - 2.14-23.git88822c1 +* Tue Jun 11 2013 Simone Caronni - 2.14-24.git88822c1 - Fix SSL support (#973058). - SPEC file cleanup. From 65d812cb4411651127de51d1d5254ff4afaf81a4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 09:21:19 -0500 Subject: [PATCH 45/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 7dfd0f0..f143ce8 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -8,7 +8,7 @@ Name: shellinabox Version: 2.14 -Release: 24.git%{shortcommit}%{?dist} +Release: 25.git%{shortcommit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -167,6 +167,9 @@ fi %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 2.14-25.git88822c1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jun 11 2013 Simone Caronni - 2.14-24.git88822c1 - Fix SSL support (#973058). - SPEC file cleanup. From d6efb600e123c810c8199f0314d5a02b38670cf1 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 6 Aug 2013 09:02:34 +0200 Subject: [PATCH 46/89] FTBFS rawhide, remove f17 --- shellinabox.spec | 60 +++++++++++++----------------------------------- 1 file changed, 16 insertions(+), 44 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index f143ce8..a91a7de 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -22,29 +22,22 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel BuildRequires: zlib-devel Requires: openssl +Requires(pre): shadow-utils -%if 0%{?fedora} == 17 -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -%endif - -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -Requires(post): systemd-sysv -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%if 0%{?fedora} || 0%{?rhel} >= 7 +BuildRequires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd %endif %if 0%{?rhel} == 5 || 0%{?rhel} == 6 -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(postun): /sbin/service +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(postun): /sbin/service %endif -Requires(pre): shadow-utils - %description Shell In A Box implements a web server that can export arbitrary command line tools to a web based terminal emulator. This emulator is accessible to any @@ -94,31 +87,7 @@ getent passwd %username >/dev/null || useradd -r -s /sbin/nologin \ -d %{_sharedstatedir}/shellinabox -M -c 'Shellinabox' -g %username %username &>/dev/null || : exit 0 -%if 0%{?fedora} == 17 - -%post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - -%preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable shellinaboxd.service > /dev/null 2>&1 || : - /bin/systemctl stop shellinaboxd.service > /dev/null 2>&1 || : -fi - -%postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart shellinaboxd.service >/dev/null 2>&1 || : -fi - -%endif - -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 %post %systemd_post shellinaboxd.service @@ -149,7 +118,6 @@ fi %endif - %files %doc AUTHORS NEWS README README.Fedora GPL-2 COPYING %doc shellinabox/styles.css shellinabox/print-styles.css @@ -165,8 +133,12 @@ fi %endif %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} - %changelog +* Tue Aug 06 2013 Simone Caronni - 2.14-25.git88822c1 +- Add systemd to BuildRequires; not default on Fedora 20+. +- Remove Fedora 17 conditionals, distribution EOL. +- Remove systemd-sysv dependency as per new packaging guidelines. + * Sun Aug 04 2013 Fedora Release Engineering - 2.14-25.git88822c1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From ec4bd04fd421af615451460950fe02e0ee345fb6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:16:40 -0500 Subject: [PATCH 47/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index a91a7de..c4d78ad 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -8,7 +8,7 @@ Name: shellinabox Version: 2.14 -Release: 25.git%{shortcommit}%{?dist} +Release: 26.git%{shortcommit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -134,6 +134,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 2.14-26.git88822c1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue Aug 06 2013 Simone Caronni - 2.14-25.git88822c1 - Add systemd to BuildRequires; not default on Fedora 20+. - Remove Fedora 17 conditionals, distribution EOL. From 425ae02ab30909792056fa1aad772ed8b7ae5358 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 11 Jun 2014 11:43:05 +0200 Subject: [PATCH 48/89] Add additional ssh option ProxyCommand=none (#1013974) --- shellinabox-ssh-options.patch | 11 +++++++++++ shellinabox.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 shellinabox-ssh-options.patch diff --git a/shellinabox-ssh-options.patch b/shellinabox-ssh-options.patch new file mode 100644 index 0000000..a115a7c --- /dev/null +++ b/shellinabox-ssh-options.patch @@ -0,0 +1,11 @@ +diff -Naur shellinabox_fork-88822c1f4c030d5f05ced097eb7b6668ff3d7c6f.old/shellinabox/service.c shellinabox_fork-88822c1f4c030d5f05ced097eb7b6668ff3d7c6f/shellinabox/service.c +--- shellinabox_fork-88822c1f4c030d5f05ced097eb7b6668ff3d7c6f.old/shellinabox/service.c 2014-06-11 11:34:52.304810724 +0200 ++++ shellinabox_fork-88822c1f4c030d5f05ced097eb7b6668ff3d7c6f/shellinabox/service.c 2014-06-11 11:35:18.733619259 +0200 +@@ -159,6 +159,7 @@ + "-oPubkeyAuthentication=no -oRhostsRSAAuthentication=no " + "-oRSAAuthentication=no -oStrictHostKeyChecking=no -oTunnel=no " + "-oUserKnownHostsFile=/dev/null -oVerifyHostKeyDNS=no " ++ "-oProxyCommand=none " + // beewoolie-2012.03.30: while it would be nice to disable this + // feature, we cannot be sure that it is available on the + // target server. Removing it for the sake of Centos. diff --git a/shellinabox.spec b/shellinabox.spec index c4d78ad..ef8820c 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -8,7 +8,7 @@ Name: shellinabox Version: 2.14 -Release: 26.git%{shortcommit}%{?dist} +Release: 27.git%{shortcommit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -17,6 +17,7 @@ Source0: https://github.com/pythonanywhere/shellinabox_fork/archive/%{com Source1: shellinaboxd.sysconfig Source2: shellinaboxd.service Source3: shellinaboxd.init +Patch0: %{name}-ssh-options.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel @@ -46,6 +47,7 @@ browser plugins. %prep %setup -qn %{name}_fork-%{commit} +%patch0 -p1 %build %configure --disable-runtime-loading @@ -134,6 +136,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Wed Jun 11 2014 Simone Caronni - 2.14-27.git88822c1 +- Add additional ssh option ProxyCommand=none (#1013974). + * Sun Jun 08 2014 Fedora Release Engineering - 2.14-26.git88822c1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 131c31c85773eac52c9c665de5c0890bb826f856 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 02:12:48 +0000 Subject: [PATCH 49/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index ef8820c..0571332 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -8,7 +8,7 @@ Name: shellinabox Version: 2.14 -Release: 27.git%{shortcommit}%{?dist} +Release: 28.git%{shortcommit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -136,6 +136,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 2.14-28.git88822c1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Jun 11 2014 Simone Caronni - 2.14-27.git88822c1 - Add additional ssh option ProxyCommand=none (#1013974). From 31160b92f7bf63f4afb1c8d3d74c42ecae886d2a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 00:46:20 +0000 Subject: [PATCH 50/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 0571332..2136c1a 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -8,7 +8,7 @@ Name: shellinabox Version: 2.14 -Release: 28.git%{shortcommit}%{?dist} +Release: 29.git%{shortcommit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -136,6 +136,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 2.14-29.git88822c1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 2.14-28.git88822c1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From cfc834f89b7595710f64e9eeef36d9083c6e0a92 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 26 Aug 2015 18:30:27 +0200 Subject: [PATCH 51/89] First attempt at building 2.17 --- .gitignore | 1 + shellinabox.spec | 31 ++++++++++++++++++++----------- sources | 2 +- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index f146f58..59669c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /shellinabox-2.14.tar.gz /shellinabox-2.14-git88822c1f.tar.bz2 /shellinabox-2.14-88822c1.tar.gz +/shellinabox-2.17.tar.gz diff --git a/shellinabox.spec b/shellinabox.spec index 2136c1a..5fe6589 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -1,5 +1,3 @@ -%global commit 88822c1f4c030d5f05ced097eb7b6668ff3d7c6f -%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global username shellinabox %if 0%{?rhel} == 5 @@ -7,21 +5,25 @@ %endif Name: shellinabox -Version: 2.14 -Release: 29.git%{shortcommit}%{?dist} +Version: 2.17 +Release: 1%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 -URL: https://github.com/pythonanywhere/shellinabox_fork -Source0: https://github.com/pythonanywhere/shellinabox_fork/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz +URL: https://github.com/%{name}/%{name} +Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: shellinaboxd.sysconfig Source2: shellinaboxd.service Source3: shellinaboxd.init Patch0: %{name}-ssh-options.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: openssl-devel BuildRequires: zlib-devel + Requires: openssl Requires(pre): shadow-utils @@ -46,23 +48,26 @@ JavaScript and CSS enabled web browser and does not require any additional browser plugins. %prep -%setup -qn %{name}_fork-%{commit} +%setup -q %patch0 -p1 %build +autoreconf -vif %configure --disable-runtime-loading make %{?_smp_mflags} chmod 644 %{name}/* %install rm -rf %{buildroot} +make install DESTDIR=%{buildroot} -mkdir -p %{buildroot}%{_sharedstatedir}/%{name} -install -p -m 755 -D shellinaboxd %{buildroot}%{_sbindir}/shellinaboxd -install -p -m 644 -D shellinaboxd.1 %{buildroot}%{_mandir}/man1/shellinaboxd.1 -install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/shellinaboxd +# Compatibility with older source that was installing the binary in sbin +mv %{buildroot}%{_bindir} %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_datadir}/%{name} +mkdir -p %{buildroot}%{_sharedstatedir}/%{name} + +install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/shellinaboxd install -p -m 644 shellinabox/white-on-black.css %{buildroot}%{_datadir}/%{name} install -p -m 644 shellinabox/color.css %{buildroot}%{_datadir}/%{name} install -p -m 644 shellinabox/monochrome.css %{buildroot}%{_datadir}/%{name} @@ -136,6 +141,10 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Wed Aug 26 2015 Simone Caronni - 2.17-1 +- Update for new GitHub packaging guidelines. +- Update source from new repository. + * Fri Jun 19 2015 Fedora Release Engineering - 2.14-29.git88822c1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index ef32d3e..954efb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5829959b5064398d65096281539f3f2 shellinabox-2.14-88822c1.tar.gz +8c380883663c406e90c240fa88485b33 shellinabox-2.17.tar.gz From b14e55973eee6345b0fdd7c6b45ec0ad97c8586a Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 26 Aug 2015 18:32:45 +0200 Subject: [PATCH 52/89] Add note --- shellinabox.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/shellinabox.spec b/shellinabox.spec index 5fe6589..2247777 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -144,6 +144,7 @@ fi * Wed Aug 26 2015 Simone Caronni - 2.17-1 - Update for new GitHub packaging guidelines. - Update source from new repository. +- Use make install target now that the source has it. * Fri Jun 19 2015 Fedora Release Engineering - 2.14-29.git88822c1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From bae2f7bdef338deb02d66f0ae7a5ed4901fa8f0f Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 26 Aug 2015 18:51:32 +0200 Subject: [PATCH 53/89] Add license macro and revert to manual installation --- shellinabox.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 2247777..b9b6725 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -6,7 +6,7 @@ Name: shellinabox Version: 2.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -59,14 +59,12 @@ chmod 644 %{name}/* %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} - -# Compatibility with older source that was installing the binary in sbin -mv %{buildroot}%{_bindir} %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_datadir}/%{name} mkdir -p %{buildroot}%{_sharedstatedir}/%{name} +install -p -m 755 -D shellinaboxd %{buildroot}%{_sbindir}/shellinaboxd +install -p -m 644 -D shellinaboxd.1 %{buildroot}%{_mandir}/man1/shellinaboxd.1 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/shellinaboxd install -p -m 644 shellinabox/white-on-black.css %{buildroot}%{_datadir}/%{name} install -p -m 644 shellinabox/color.css %{buildroot}%{_datadir}/%{name} @@ -126,7 +124,9 @@ fi %endif %files -%doc AUTHORS NEWS README README.Fedora GPL-2 COPYING +%{!?_licensedir:%global license %%doc} +%license GPL-2 COPYING +%doc AUTHORS NEWS README README.Fedora %doc shellinabox/styles.css shellinabox/print-styles.css %doc shellinabox/shell_in_a_box.js %config(noreplace) %{_sysconfdir}/sysconfig/shellinaboxd @@ -141,6 +141,11 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Wed Aug 26 2015 Simone Caronni - 2.17-2 +- Add license macro. +- Install files manually, as this simplifies installation of docs in versioned + documentation dirs (CentOS/RHEL). + * Wed Aug 26 2015 Simone Caronni - 2.17-1 - Update for new GitHub packaging guidelines. - Update source from new repository. From 052d5dbbe24acba0965094ddfdc15cdd2480b540 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 31 Aug 2015 13:16:18 +0200 Subject: [PATCH 54/89] Fix epel 5 build --- ...utomake-stuff-for-compatibility-with.patch | 38 +++++++++++++++++++ 0002-Added-explanatory-comments.patch | 37 ++++++++++++++++++ shellinabox.spec | 15 +++++++- 3 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 0001-Added-autoconf-automake-stuff-for-compatibility-with.patch create mode 100644 0002-Added-explanatory-comments.patch diff --git a/0001-Added-autoconf-automake-stuff-for-compatibility-with.patch b/0001-Added-autoconf-automake-stuff-for-compatibility-with.patch new file mode 100644 index 0000000..80a53be --- /dev/null +++ b/0001-Added-autoconf-automake-stuff-for-compatibility-with.patch @@ -0,0 +1,38 @@ +From 284265651b2876a6d6d95ccbcd757befc86f6e0d Mon Sep 17 00:00:00 2001 +From: Benji Wiebe +Date: Fri, 28 Aug 2015 23:15:13 -0500 +Subject: [PATCH 1/2] Added autoconf/automake stuff for compatibility with + older auto* versions + +--- + Makefile.am | 1 + + configure.ac | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 2a59fe2..7a88ccb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -127,6 +127,7 @@ BUILT_SOURCES = shellinabox/beep.h \ + shellinaboxd_LDADD = liblogging.la \ + libhttp.la + shellinaboxd_LDFLAGS = -static ++docdir = ${datadir}/doc/${PACKAGE} + + symbolname = \ + sed -e 's/.*\/\([^.]*\)[.].*/\1/' \ +diff --git a/configure.ac b/configure.ac +index 9a7b1ab..f4e815f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,6 +17,7 @@ CFLAGS="${CFLAGS:--Os}" + AM_INIT_AUTOMAKE([subdir-objects]) + AM_CONFIG_HEADER(config.h) + AC_PROG_CC ++AM_PROG_CC_C_O + AC_LANG_WERROR + AC_PROG_INSTALL + AC_PROG_LIBTOOL +-- +2.4.3 + diff --git a/0002-Added-explanatory-comments.patch b/0002-Added-explanatory-comments.patch new file mode 100644 index 0000000..713cc14 --- /dev/null +++ b/0002-Added-explanatory-comments.patch @@ -0,0 +1,37 @@ +From 36f512cc6335c59ce967a3f05805e6ca0f3a350e Mon Sep 17 00:00:00 2001 +From: Benji Wiebe +Date: Fri, 28 Aug 2015 23:42:09 -0500 +Subject: [PATCH 2/2] Added explanatory comments + +--- + Makefile.am | 1 + + configure.ac | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 7a88ccb..7b8e7ab 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -127,6 +127,7 @@ BUILT_SOURCES = shellinabox/beep.h \ + shellinaboxd_LDADD = liblogging.la \ + libhttp.la + shellinaboxd_LDFLAGS = -static ++## Added this for compatibility with older versions of autoconf/automake + docdir = ${datadir}/doc/${PACKAGE} + + symbolname = \ +diff --git a/configure.ac b/configure.ac +index f4e815f..2a2bdb4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,6 +17,7 @@ CFLAGS="${CFLAGS:--Os}" + AM_INIT_AUTOMAKE([subdir-objects]) + AM_CONFIG_HEADER(config.h) + AC_PROG_CC ++dnl Added this for compatibility with older versions of autoconf/automake + AM_PROG_CC_C_O + AC_LANG_WERROR + AC_PROG_INSTALL +-- +2.4.3 + diff --git a/shellinabox.spec b/shellinabox.spec index b9b6725..dfbed0d 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -6,17 +6,22 @@ Name: shellinabox Version: 2.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 URL: https://github.com/%{name}/%{name} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: shellinaboxd.sysconfig Source2: shellinaboxd.service Source3: shellinaboxd.init + Patch0: %{name}-ssh-options.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# From upstream - https://github.com/shellinabox/shellinabox/pull/340 +Patch1: 0001-Added-autoconf-automake-stuff-for-compatibility-with.patch +Patch2: 0002-Added-explanatory-comments.patch BuildRequires: autoconf BuildRequires: automake @@ -50,6 +55,8 @@ browser plugins. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build autoreconf -vif @@ -141,6 +148,10 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Mon Aug 31 2015 Simone Caronni - 2.17-3 +- Backport patch from upstream: + https://github.com/shellinabox/shellinabox/pull/340 + * Wed Aug 26 2015 Simone Caronni - 2.17-2 - Add license macro. - Install files manually, as this simplifies installation of docs in versioned From 88ce6f8312d9391c8e4ca6bb9f56db8ec6cad431 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 1 Sep 2015 16:14:37 +0200 Subject: [PATCH 55/89] Update to 2.18 --- .gitignore | 1 + ...utomake-stuff-for-compatibility-with.patch | 38 ------------------- 0002-Added-explanatory-comments.patch | 37 ------------------ shellinabox.spec | 13 +++---- sources | 2 +- 5 files changed, 8 insertions(+), 83 deletions(-) delete mode 100644 0001-Added-autoconf-automake-stuff-for-compatibility-with.patch delete mode 100644 0002-Added-explanatory-comments.patch diff --git a/.gitignore b/.gitignore index 59669c6..41a2b46 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /shellinabox-2.14-git88822c1f.tar.bz2 /shellinabox-2.14-88822c1.tar.gz /shellinabox-2.17.tar.gz +/shellinabox-2.18.tar.gz diff --git a/0001-Added-autoconf-automake-stuff-for-compatibility-with.patch b/0001-Added-autoconf-automake-stuff-for-compatibility-with.patch deleted file mode 100644 index 80a53be..0000000 --- a/0001-Added-autoconf-automake-stuff-for-compatibility-with.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 284265651b2876a6d6d95ccbcd757befc86f6e0d Mon Sep 17 00:00:00 2001 -From: Benji Wiebe -Date: Fri, 28 Aug 2015 23:15:13 -0500 -Subject: [PATCH 1/2] Added autoconf/automake stuff for compatibility with - older auto* versions - ---- - Makefile.am | 1 + - configure.ac | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 2a59fe2..7a88ccb 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -127,6 +127,7 @@ BUILT_SOURCES = shellinabox/beep.h \ - shellinaboxd_LDADD = liblogging.la \ - libhttp.la - shellinaboxd_LDFLAGS = -static -+docdir = ${datadir}/doc/${PACKAGE} - - symbolname = \ - sed -e 's/.*\/\([^.]*\)[.].*/\1/' \ -diff --git a/configure.ac b/configure.ac -index 9a7b1ab..f4e815f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -17,6 +17,7 @@ CFLAGS="${CFLAGS:--Os}" - AM_INIT_AUTOMAKE([subdir-objects]) - AM_CONFIG_HEADER(config.h) - AC_PROG_CC -+AM_PROG_CC_C_O - AC_LANG_WERROR - AC_PROG_INSTALL - AC_PROG_LIBTOOL --- -2.4.3 - diff --git a/0002-Added-explanatory-comments.patch b/0002-Added-explanatory-comments.patch deleted file mode 100644 index 713cc14..0000000 --- a/0002-Added-explanatory-comments.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 36f512cc6335c59ce967a3f05805e6ca0f3a350e Mon Sep 17 00:00:00 2001 -From: Benji Wiebe -Date: Fri, 28 Aug 2015 23:42:09 -0500 -Subject: [PATCH 2/2] Added explanatory comments - ---- - Makefile.am | 1 + - configure.ac | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 7a88ccb..7b8e7ab 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -127,6 +127,7 @@ BUILT_SOURCES = shellinabox/beep.h \ - shellinaboxd_LDADD = liblogging.la \ - libhttp.la - shellinaboxd_LDFLAGS = -static -+## Added this for compatibility with older versions of autoconf/automake - docdir = ${datadir}/doc/${PACKAGE} - - symbolname = \ -diff --git a/configure.ac b/configure.ac -index f4e815f..2a2bdb4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -17,6 +17,7 @@ CFLAGS="${CFLAGS:--Os}" - AM_INIT_AUTOMAKE([subdir-objects]) - AM_CONFIG_HEADER(config.h) - AC_PROG_CC -+dnl Added this for compatibility with older versions of autoconf/automake - AM_PROG_CC_C_O - AC_LANG_WERROR - AC_PROG_INSTALL --- -2.4.3 - diff --git a/shellinabox.spec b/shellinabox.spec index dfbed0d..ba84346 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -5,8 +5,8 @@ %endif Name: shellinabox -Version: 2.17 -Release: 3%{?dist} +Version: 2.18 +Release: 1%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -19,9 +19,6 @@ Source2: shellinaboxd.service Source3: shellinaboxd.init Patch0: %{name}-ssh-options.patch -# From upstream - https://github.com/shellinabox/shellinabox/pull/340 -Patch1: 0001-Added-autoconf-automake-stuff-for-compatibility-with.patch -Patch2: 0002-Added-explanatory-comments.patch BuildRequires: autoconf BuildRequires: automake @@ -55,8 +52,6 @@ browser plugins. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build autoreconf -vif @@ -148,6 +143,10 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Mon Aug 31 2015 Simone Caronni - 2.18-1 +- Update to 2.18. +- Remove upstreamed patches. + * Mon Aug 31 2015 Simone Caronni - 2.17-3 - Backport patch from upstream: https://github.com/shellinabox/shellinabox/pull/340 diff --git a/sources b/sources index 954efb9..cb8f43a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c380883663c406e90c240fa88485b33 shellinabox-2.17.tar.gz +2d06e6a910d4f81d000d7b092fde205f shellinabox-2.18.tar.gz From a0a96e09fbda6eaf49dbb1e9172ebf427dbdb93d Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Fri, 11 Dec 2015 11:31:55 +0100 Subject: [PATCH 56/89] Update to 2.19, fixes CVE-2015-8400 (#1287577) --- .gitignore | 1 + shellinabox.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 41a2b46..b2727ff 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /shellinabox-2.14-88822c1.tar.gz /shellinabox-2.17.tar.gz /shellinabox-2.18.tar.gz +/shellinabox-2.19.tar.gz diff --git a/shellinabox.spec b/shellinabox.spec index ba84346..f153295 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -5,7 +5,7 @@ %endif Name: shellinabox -Version: 2.18 +Version: 2.19 Release: 1%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons @@ -143,6 +143,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Fri Dec 11 2015 Simone Caronni - 2.19-1 +- Update to 2.19. Fixes CVE-2015-8400 (#1287577). + * Mon Aug 31 2015 Simone Caronni - 2.18-1 - Update to 2.18. - Remove upstreamed patches. diff --git a/sources b/sources index cb8f43a..7ffc3a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d06e6a910d4f81d000d7b092fde205f shellinabox-2.18.tar.gz +bf2d85f6328f83dda7f8c5ac749187f5 shellinabox-2.19.tar.gz From 61fa79776f87505af48473cc48a3760c3d6d66ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 23:56:50 +0000 Subject: [PATCH 57/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index f153295..32034f1 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -6,7 +6,7 @@ Name: shellinabox Version: 2.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -143,6 +143,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Dec 11 2015 Simone Caronni - 2.19-1 - Update to 2.19. Fixes CVE-2015-8400 (#1287577). From d417e5a45c2522cac8f085c2abba729bef544977 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 13:23:25 +0000 Subject: [PATCH 58/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 32034f1..485b221 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -6,7 +6,7 @@ Name: shellinabox Version: 2.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -143,6 +143,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 2.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From a38ea4c4d601cab6cb6418fcaf4e3d3fc374fc9b Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 9 Mar 2017 13:45:50 +0100 Subject: [PATCH 59/89] Update to 2.20 --- shellinabox.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 485b221..01f475d 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -5,8 +5,8 @@ %endif Name: shellinabox -Version: 2.19 -Release: 3%{?dist} +Version: 2.20 +Release: 1%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -143,6 +143,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Thu Mar 09 2017 Simone Caronni - 2.20-1 +- Update to 2.20. + * Sat Feb 11 2017 Fedora Release Engineering - 2.19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From e012c7f28d0ecbdf8b288cecc72a74970258087a Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 9 Mar 2017 13:50:15 +0100 Subject: [PATCH 60/89] Udpate sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b2727ff..00894cf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /shellinabox-2.17.tar.gz /shellinabox-2.18.tar.gz /shellinabox-2.19.tar.gz +/shellinabox-2.20.tar.gz diff --git a/sources b/sources index 7ffc3a1..b8808d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bf2d85f6328f83dda7f8c5ac749187f5 shellinabox-2.19.tar.gz +SHA512 (shellinabox-2.20.tar.gz) = 369fb6e0041fc3eb52a533f14d1f856a71ec1bf166441e25a5d61bb129f2db5de6b61205ddd0cb08d53384baaf4e087bd2c549f7919b96ee465d4cc3318d2237 From f6c68951a5e82813f5439d65282ca40f027ccf61 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 5 Apr 2017 14:11:19 +0200 Subject: [PATCH 61/89] Remove support for RHEL/CentOS 5 --- shellinabox.spec | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 01f475d..d160013 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -1,17 +1,11 @@ %global username shellinabox -%if 0%{?rhel} == 5 -%define _sharedstatedir /var/lib -%endif - Name: shellinabox Version: 2.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Web based AJAX terminal emulator -Group: System Environment/Daemons License: GPLv2 URL: https://github.com/%{name}/%{name} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: shellinaboxd.sysconfig @@ -36,7 +30,7 @@ Requires(preun): systemd Requires(postun): systemd %endif -%if 0%{?rhel} == 5 || 0%{?rhel} == 6 +%if 0%{?rhel} == 6 Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -60,8 +54,6 @@ make %{?_smp_mflags} chmod 644 %{name}/* %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{_datadir}/%{name} mkdir -p %{buildroot}%{_sharedstatedir}/%{name} @@ -84,10 +76,6 @@ install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd %endif -%clean -rm -rf %{buildroot} - - %pre getent group %username >/dev/null || groupadd -r %username &>/dev/null || : getent passwd %username >/dev/null || useradd -r -s /sbin/nologin \ @@ -107,7 +95,7 @@ exit 0 %endif -%if 0%{?rhel} == 6 || 0%{?rhel} == 5 +%if 0%{?rhel} == 6 %post /sbin/chkconfig --add shellinaboxd @@ -127,7 +115,6 @@ fi %files %{!?_licensedir:%global license %%doc} -%license GPL-2 COPYING %doc AUTHORS NEWS README README.Fedora %doc shellinabox/styles.css shellinabox/print-styles.css %doc shellinabox/shell_in_a_box.js @@ -143,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Thu Mar 09 2017 Simone Caronni - 2.20-2 +- Remove support for RHEL/CentOS 5. + * Thu Mar 09 2017 Simone Caronni - 2.20-1 - Update to 2.20. From faaf1261453d5feba7d3f38e3fdc353ff6b5e428 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 18:32:31 +0000 Subject: [PATCH 62/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index d160013..c45888d 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Mar 09 2017 Simone Caronni - 2.20-2 - Remove support for RHEL/CentOS 5. From 5528a67b538327d7f72d4b54544dc2b71a40d521 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 08:24:39 +0000 Subject: [PATCH 63/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index c45888d..7c7a5f0 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 2.20-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 37c7e3d6d545a4d99a959f38ddc4c369a375de46 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 7 Dec 2017 16:54:21 +0100 Subject: [PATCH 64/89] Disable SSHv1 options --- shellinabox-ssh-options.patch | 16 ++++++++++------ shellinabox.spec | 5 ++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/shellinabox-ssh-options.patch b/shellinabox-ssh-options.patch index a115a7c..7517087 100644 --- a/shellinabox-ssh-options.patch +++ b/shellinabox-ssh-options.patch @@ -1,9 +1,13 @@ -diff -Naur shellinabox_fork-88822c1f4c030d5f05ced097eb7b6668ff3d7c6f.old/shellinabox/service.c shellinabox_fork-88822c1f4c030d5f05ced097eb7b6668ff3d7c6f/shellinabox/service.c ---- shellinabox_fork-88822c1f4c030d5f05ced097eb7b6668ff3d7c6f.old/shellinabox/service.c 2014-06-11 11:34:52.304810724 +0200 -+++ shellinabox_fork-88822c1f4c030d5f05ced097eb7b6668ff3d7c6f/shellinabox/service.c 2014-06-11 11:35:18.733619259 +0200 -@@ -159,6 +159,7 @@ - "-oPubkeyAuthentication=no -oRhostsRSAAuthentication=no " - "-oRSAAuthentication=no -oStrictHostKeyChecking=no -oTunnel=no " +diff -Naur shellinabox-2.20.old/shellinabox/service.c shellinabox-2.20/shellinabox/service.c +--- shellinabox-2.20.old/shellinabox/service.c 2017-12-07 16:51:32.422058845 +0100 ++++ shellinabox-2.20/shellinabox/service.c 2017-12-07 16:52:51.979540100 +0100 +@@ -175,9 +175,9 @@ + "-oHostbasedAuthentication=no -oIdentitiesOnly=yes " + "-oKbdInteractiveAuthentication=yes -oPasswordAuthentication=yes " + "-oPreferredAuthentications=keyboard-interactive,password " +- "-oPubkeyAuthentication=no -oRhostsRSAAuthentication=no " +- "-oRSAAuthentication=no -oStrictHostKeyChecking=no -oTunnel=no " ++ "-oPubkeyAuthentication=no -oStrictHostKeyChecking=no -oTunnel=no " "-oUserKnownHostsFile=/dev/null -oVerifyHostKeyDNS=no " + "-oProxyCommand=none " // beewoolie-2012.03.30: while it would be nice to disable this diff --git a/shellinabox.spec b/shellinabox.spec index 7c7a5f0..f68243e 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Thu Dec 07 2017 Simone Caronni - 2.20-5 +- Disable SSHv1 options. + * Thu Aug 03 2017 Fedora Release Engineering - 2.20-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 01500882f81e56ab51ff8578d1086530cfae9438 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 16:38:30 +0000 Subject: [PATCH 65/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index f68243e..2733f32 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.20-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Dec 07 2017 Simone Caronni - 2.20-5 - Disable SSHv1 options. From e72425def68c8adc7934e1300af6fab5c839ec76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 06:04:07 +0000 Subject: [PATCH 66/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 2733f32..1948aa8 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.20-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 2.20-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 5a3ff32de4f60d93a4312ff0d2c08c846be32e81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 15:19:49 +0000 Subject: [PATCH 67/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 1948aa8..0e55252 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 2.20-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.20-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 180ec9a4f07454001f99eb1ab2aa75bb38c0fd4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:13:21 +0000 Subject: [PATCH 68/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 0e55252..99eca43 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.20-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 2.20-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d2d597dbaebdc5cea382a4044a4154acfd4d4eb2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 18 Aug 2019 14:22:22 +0200 Subject: [PATCH 69/89] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 4da7932315ef149181f718ecdfa4d13a74698940 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:23:06 +0000 Subject: [PATCH 70/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 99eca43..eaab7d4 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 2.20-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 2.20-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From aabaa7085d4758be2ecfb37433451c13650f2c54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:39:48 +0000 Subject: [PATCH 71/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index eaab7d4..9af7910 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.20-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 2.20-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d87707c8844c8fb1d1773ae71c40d1293de089d8 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 29 Jul 2020 12:06:44 -0600 Subject: [PATCH 72/89] Initialize sigset in configure test --- shellinabox-gcc11.patch | 13 +++++++++++++ shellinabox.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 shellinabox-gcc11.patch diff --git a/shellinabox-gcc11.patch b/shellinabox-gcc11.patch new file mode 100644 index 0000000..2b1c8a8 --- /dev/null +++ b/shellinabox-gcc11.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 05ab1bb..56e3b6a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -65,7 +65,7 @@ AC_TRY_LINK([#ifndef _XOPEN_SOURCE + dnl Apparently, some systems define sigwait() but fail to implement it + AC_TRY_LINK([#include + #include ], +- [sigset_t s; int n; sigwait(&s, &n);], ++ [sigset_t s; int n; sigemptyset (&s); sigwait(&s, &n);], + [AC_DEFINE(HAVE_SIGWAIT, 1, + Define to 1 if you have a working sigwait)]) + diff --git a/shellinabox.spec b/shellinabox.spec index 9af7910..087e6d4 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -13,6 +13,7 @@ Source2: shellinaboxd.service Source3: shellinaboxd.init Patch0: %{name}-ssh-options.patch +Patch1: %{name}-gcc11.patch BuildRequires: autoconf BuildRequires: automake @@ -46,6 +47,7 @@ browser plugins. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build autoreconf -vif @@ -130,6 +132,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Wed Jul 29 2020 Jeff Law - 2.20-12 +- Initialize sigset in configure test + * Wed Jul 29 2020 Fedora Release Engineering - 2.20-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a57d5e4191e535cb154759ac1d62a614f6ceef93 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:27:15 +0000 Subject: [PATCH 73/89] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- shellinabox.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/shellinabox.spec b/shellinabox.spec index 087e6d4..607d2c2 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -15,6 +15,7 @@ Source3: shellinaboxd.init Patch0: %{name}-ssh-options.patch Patch1: %{name}-gcc11.patch +BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool From 446c2208c907430de493429f27efb428cb6e7204 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:19:39 +0000 Subject: [PATCH 74/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 607d2c2..93eedc5 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.20-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Jeff Law - 2.20-12 - Initialize sigset in configure test From f3612c826ce6eb73b02ea7eec56d8679025b2214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:19 +0100 Subject: [PATCH 75/89] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- shellinabox.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 93eedc5..f6b5db0 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,10 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.20-14 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 27 2021 Fedora Release Engineering - 2.20-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From be6ca3853794c8456446be98d31c293aadd0e1ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:29:47 +0000 Subject: [PATCH 76/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index f6b5db0..1f338ed 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.20-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.20-14 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 06049adb191cfd75c3679b6051892173a9626c23 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:14:58 +0200 Subject: [PATCH 77/89] Rebuilt with OpenSSL 3.0.0 --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 1f338ed..999f443 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Tue Sep 14 2021 Sahana Prasad - 2.20-16 +- Rebuilt with OpenSSL 3.0.0 + * Fri Jul 23 2021 Fedora Release Engineering - 2.20-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From b5b77d803e17383d914092a4025eb558447ee9cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:49:02 +0000 Subject: [PATCH 78/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 999f443..d545e5b 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.20-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 14 2021 Sahana Prasad - 2.20-16 - Rebuilt with OpenSSL 3.0.0 From 7a8034503ca893785f2c0e3ea3caa3b6aa988da0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:31:20 +0000 Subject: [PATCH 79/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index d545e5b..79eb6fa 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.20-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2.20-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 3736b4d5030ff94104e684760b34a90cc2492c12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:10:00 +0000 Subject: [PATCH 80/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 79eb6fa..e82e640 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.20-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.20-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 748cdd481ce7326700397b96b7f46b8d3c478799 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 26 Apr 2023 06:10:11 +0200 Subject: [PATCH 81/89] Port configure script to C99 Related to: --- shellinabox-configure-c99.patch | 21 +++++++++++++++++++++ shellinabox.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 shellinabox-configure-c99.patch diff --git a/shellinabox-configure-c99.patch b/shellinabox-configure-c99.patch new file mode 100644 index 0000000..382dbbd --- /dev/null +++ b/shellinabox-configure-c99.patch @@ -0,0 +1,21 @@ +Define _GNU_SOURCE when probing for updwtmpx. Otherwise, glibc's + will not declare this function, and the configure probe +fails with compilers which do not support implicit function +declarations. + +Submitted upstream: + +diff --git a/configure.ac b/configure.ac +index 56e3b6a2b510851f..d05d1216dd4a397f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -154,7 +154,8 @@ if test "x$enable_utmp" != xno; then + [updwtmp(0, 0);], + [AC_DEFINE(HAVE_UPDWTMP, 1, + Define to 1 if you have support for updwtmp)]) +- AC_TRY_LINK([#include ], ++ AC_TRY_LINK([#define _GNU_SOURCE ++ #include ], + [updwtmpx(0, 0);], + [AC_DEFINE(HAVE_UPDWTMPX, 1, + Define to 1 if you have support for updwtmpx)]) diff --git a/shellinabox.spec b/shellinabox.spec index e82e640..c4c5427 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -14,6 +14,7 @@ Source3: shellinaboxd.init Patch0: %{name}-ssh-options.patch Patch1: %{name}-gcc11.patch +Patch2: shellinabox-configure-c99.patch BuildRequires: make BuildRequires: autoconf @@ -49,6 +50,7 @@ browser plugins. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build autoreconf -vif @@ -133,6 +135,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Wed Apr 26 2023 Florian Weimer - 2.20-20 +- Port configure script to C99 + * Sat Jan 21 2023 Fedora Release Engineering - 2.20-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f832b3487f9258aa33fc8c26c9d362c15f928285 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:34:32 +0000 Subject: [PATCH 82/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index c4c5427..22116df 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -135,6 +135,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.20-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Apr 26 2023 Florian Weimer - 2.20-20 - Port configure script to C99 From 14567ede3f95b93156a4923fbba4ee00a8afddea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:55:28 +0000 Subject: [PATCH 83/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 22116df..7c0a9d5 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -135,6 +135,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.20-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.20-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ce2b12de6f98e047ce8305aa455871e45297edf5 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 84/89] Eliminate use of obsolete %patchN syntax (#2283636) --- shellinabox.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 7c0a9d5..366de59 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -48,9 +48,9 @@ browser plugins. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 %build autoreconf -vif From 6638880dd6e59fc996b1fce5b3a80d15451e3945 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:26:34 +0000 Subject: [PATCH 85/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 366de59..3bdbe53 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -135,6 +135,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.20-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.20-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b1fc9ce25c0fd7e875da3d6e8c67d59f5fad21f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 12:13:47 +0200 Subject: [PATCH 86/89] convert GPLv2 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- shellinabox.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 3bdbe53..58c5121 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,9 +2,10 @@ Name: shellinabox Version: 2.20 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Web based AJAX terminal emulator -License: GPLv2 +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: https://github.com/%{name}/%{name} Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -135,6 +136,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Mon Jul 29 2024 Miroslav Suchý - 2.20-24 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2.20-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1bf3a14bceb31356b2cafdcad6a4ec36cc5735e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:35:12 +0000 Subject: [PATCH 87/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 58c5121..e66ebd6 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Web based AJAX terminal emulator # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only @@ -136,6 +136,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.20-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jul 29 2024 Miroslav Suchý - 2.20-24 - convert license to SPDX From 5cbe08c0520bed4d284e5d8c8d3a63b601944cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 16:44:36 +0100 Subject: [PATCH 88/89] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- shellinabox.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index e66ebd6..6409471 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Web based AJAX terminal emulator # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only @@ -25,7 +25,6 @@ BuildRequires: openssl-devel BuildRequires: zlib-devel Requires: openssl -Requires(pre): shadow-utils %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: systemd @@ -53,6 +52,11 @@ browser plugins. %patch -P1 -p1 %patch -P2 -p1 +# Create a sysusers.d config file +cat >shellinabox.sysusers.conf </dev/null || groupadd -r %username &>/dev/null || : -getent passwd %username >/dev/null || useradd -r -s /sbin/nologin \ - -d %{_sharedstatedir}/shellinabox -M -c 'Shellinabox' -g %username %username &>/dev/null || : -exit 0 +install -m0644 -D shellinabox.sysusers.conf %{buildroot}%{_sysusersdir}/shellinabox.conf +%pre %if 0%{?fedora} || 0%{?rhel} >= 7 %post @@ -134,8 +135,12 @@ fi %{_initrddir}/shellinaboxd %endif %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} +%{_sysusersdir}/shellinabox.conf %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.20-26 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Jan 19 2025 Fedora Release Engineering - 2.20-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 71d1feb27a065e2055fd93c0d432aaaa37ac9dde Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:14:16 +0000 Subject: [PATCH 89/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 6409471..45af159 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Web based AJAX terminal emulator # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only @@ -138,6 +138,9 @@ fi %{_sysusersdir}/shellinabox.conf %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.20-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.20-26 - Add sysusers.d config file to allow rpm to create users/groups automatically