Merge branch 'master' into f18

FTBFS rawhide, remove f17
2013-08-06 09:03:17 +02:00 · 2013-08-06 08:58:06 +02:00
6 changed files with 31 additions and 218 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,3 @@
 /shellinabox-2.14.tar.gz
 /shellinabox-2.14-git88822c1f.tar.bz2
 /shellinabox-2.14-88822c1.tar.gz
-/shellinabox-2.17.tar.gz
-/shellinabox-2.18.tar.gz
-/shellinabox-2.19.tar.gz
-/shellinabox-2.20.tar.gz
--- a/shellinabox-configure-c99.patch
+++ b/shellinabox-configure-c99.patch
@ -1,21 +0,0 @@
-Define _GNU_SOURCE when probing for updwtmpx.  Otherwise, glibc's
-<utmpx.h> will not declare this function, and the configure probe
-fails with compilers which do not support implicit function
-declarations.
-
-Submitted upstream: <https://github.com/shellinabox/shellinabox/pull/514>
-
-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 <utmpx.h>],
-+  AC_TRY_LINK([#define _GNU_SOURCE
-+	      #include <utmpx.h>],
-               [updwtmpx(0, 0);],
-               [AC_DEFINE(HAVE_UPDWTMPX, 1,
-                          Define to 1 if you have support for updwtmpx)])
--- a/shellinabox-gcc11.patch
+++ b/shellinabox-gcc11.patch
@ -1,13 +0,0 @@
-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 <pthread.h>
-              #include <signal.h>],
-            [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)])
- 
--- a/shellinabox-ssh-options.patch
+++ b/shellinabox-ssh-options.patch
@ -1,15 +0,0 @@
-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
- //          feature, we cannot be sure that it is available on the
- //          target server.  Removing it for the sake of Centos.
--- a/shellinabox.spec
+++ b/shellinabox.spec
@ -1,30 +1,28 @@
+%global commit 88822c1f4c030d5f05ced097eb7b6668ff3d7c6f
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global username shellinabox

-Name:           shellinabox
-Version:        2.20
-Release:        30%{?dist}
-Summary:        Web based AJAX terminal emulator
-# Automatically converted from old format: GPLv2 - review is highly recommended.
-License:        GPL-2.0-only
-URL:            https://github.com/%{name}/%{name}
+%if 0%{?rhel} == 5
+%define _sharedstatedir /var/lib
+%endif

-Source0:        https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Name:           shellinabox
+Version:        2.14
+Release:        25.git%{shortcommit}%{?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
 Source1:        shellinaboxd.sysconfig
 Source2:        shellinaboxd.service
 Source3:        shellinaboxd.init
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

-Patch0:         %{name}-ssh-options.patch
-Patch1:         %{name}-gcc11.patch
-Patch2: shellinabox-configure-c99.patch
-
-BuildRequires: make
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
-
 Requires:       openssl
+Requires(pre):  shadow-utils

 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:      systemd
@ -33,7 +31,7 @@ Requires(preun):    systemd
 Requires(postun):   systemd
 %endif

-%if 0%{?rhel} == 6
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
 Requires(post):     /sbin/chkconfig
 Requires(preun):    /sbin/chkconfig
 Requires(preun):    /sbin/service
@ -47,29 +45,22 @@ JavaScript and CSS enabled web browser and does not require any additional
 browser plugins.

 %prep
-%setup -q
-%patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
-
-# Create a sysusers.d config file
-cat >shellinabox.sysusers.conf <<EOF
-u shellinabox - 'Shellinabox' %{_sharedstatedir}/shellinabox -
-EOF
+%setup -qn %{name}_fork-%{commit}

 %build
-autoreconf -vif
 %configure --disable-runtime-loading
 make %{?_smp_mflags}
 chmod 644 %{name}/*

 %install
-mkdir -p %{buildroot}%{_datadir}/%{name}
-mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
+rm -rf %{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
+
+mkdir -p %{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}
@ -86,9 +77,16 @@ install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd

 %endif

-install -m0644 -D shellinabox.sysusers.conf %{buildroot}%{_sysusersdir}/shellinabox.conf
+%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 %{_sharedstatedir}/shellinabox -M -c 'Shellinabox' -g %username %username &>/dev/null || :
+exit 0
+
 %if 0%{?fedora} || 0%{?rhel} >= 7

 %post
@ -102,7 +100,7 @@ install -m0644 -D shellinabox.sysusers.conf %{buildroot}%{_sysusersdir}/shellina

 %endif

-%if 0%{?rhel} == 6
+%if 0%{?rhel} == 6 || 0%{?rhel} == 5

 %post
 /sbin/chkconfig --add shellinaboxd
@ -121,8 +119,7 @@ fi
 %endif

 %files
-%{!?_licensedir:%global license %%doc}
-%doc AUTHORS NEWS README README.Fedora
+%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
@ -135,139 +132,8 @@ fi
 %{_initrddir}/shellinaboxd
 %endif
 %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name}
-%{_sysusersdir}/shellinabox.conf

 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 2.20-29
- Rebuilt for openssl 4.0
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.20-26
- Add sysusers.d config file to allow rpm to create users/groups automatically
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 2.20-24
- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Apr 26 2023 Florian Weimer <fweimer@redhat.com> - 2.20-20
- Port configure script to C99
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.20-16
- Rebuilt with OpenSSL 3.0.0
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.20-14
- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Jeff Law <law@redhat.com> - 2.20-12
- Initialize sigset in configure test
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Dec 07 2017 Simone Caronni <negativo17@gmail.com> - 2.20-5
- Disable SSHv1 options.
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Mar 09 2017 Simone Caronni <negativo17@gmail.com> - 2.20-2
- Remove support for RHEL/CentOS 5.
-
-* Thu Mar 09 2017 Simone Caronni <negativo17@gmail.com> - 2.20-1
- Update to 2.20.
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Dec 11 2015 Simone Caronni <negativo17@gmail.com> - 2.19-1
- Update to 2.19. Fixes CVE-2015-8400 (#1287577).
-
-* Mon Aug 31 2015 Simone Caronni <negativo17@gmail.com> - 2.18-1
- Update to 2.18.
- Remove upstreamed patches.
-
-* Mon Aug 31 2015 Simone Caronni <negativo17@gmail.com> - 2.17-3
- Backport patch from upstream:
-  https://github.com/shellinabox/shellinabox/pull/340
-
-* Wed Aug 26 2015 Simone Caronni <negativo17@gmail.com> - 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 <negativo17@gmail.com> - 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 <rel-eng@lists.fedoraproject.org> - 2.14-29.git88822c1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.14-28.git88822c1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Wed Jun 11 2014 Simone Caronni <negativo17@gmail.com> - 2.14-27.git88822c1
- Add additional ssh option ProxyCommand=none (#1013974).
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.14-26.git88822c1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
 * Tue Aug 06 2013 Simone Caronni <negativo17@gmail.com> - 2.14-25.git88822c1
 - Add systemd to BuildRequires; not default on Fedora 20+.
 - Remove Fedora 17 conditionals, distribution EOL.
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (shellinabox-2.20.tar.gz) = 369fb6e0041fc3eb52a533f14d1f856a71ec1bf166441e25a5d61bb129f2db5de6b61205ddd0cb08d53384baaf4e087bd2c549f7919b96ee465d4cc3318d2237
+c5829959b5064398d65096281539f3f2  shellinabox-2.14-88822c1.tar.gz
Author	SHA1	Message	Date
Simone Caronni	c989721c9a	Merge branch 'master' into f18	2013-08-06 09:03:17 +02:00
Simone Caronni	7e7462beb6	FTBFS rawhide, remove f17	2013-08-06 08:58:06 +02:00