[shellinabox/el5] Fix SSL support (#973058)
Simone Caronni
slaanesh at fedoraproject.org
Tue Jun 11 12:52:59 UTC 2013
commit 35abf9fccb205242bb7100075291d680fe768117
Author: Simone Caronni <negativo17 at gmail.com>
Date: Tue Jun 11 14:52:12 2013 +0200
Fix SSL support (#973058)
shellinabox.spec | 29 ++++++++++++++++++-----------
1 files 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 <negativo17 at gmail.com> - 2.14-23.git88822c1
+- Fix SSL support (#973058).
+- SPEC file cleanup.
+
* Sat May 11 2013 Simone Caronni <negativo17 at gmail.com> - 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 <negativo17 at gmail.com> - 2.14-9
+* Wed Sep 12 2012 Simone Caronni <negativo17 at gmail.com> - 2.14-9
- Added user/group and confined directory for certificates, based on work from Joel Young.
* Tue Sep 11 2012 Joel Young <jdy at cryregarder.com> - 2.14-8
More information about the scm-commits
mailing list