mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 15:11:25 +00:00
Fix SSL/TLS support for shellinaboxd
shellinboxd was not finding libssl.so in it's library path, so it was falling back to ssl disabled mode. Also, the path to openssl was hardcoded to /usr/bin/openssl, so shellinaboxd could not generate SSL certificates once libssl.so was added to LD_LIBRARY_PATH.
This commit is contained in:
parent
c45b5aba92
commit
d0633a28ff
@ -1,29 +1,38 @@
|
||||
{ stdenv, fetchurl, pam, openssl, openssh, shadow }:
|
||||
{ stdenv, fetchurl, pam, openssl, openssh, shadow, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "shellinabox-2.14";
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.14";
|
||||
name = "shellinabox-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://shellinabox.googlecode.com/files/shellinabox-2.14.tar.gz";
|
||||
url = "https://shellinabox.googlecode.com/files/shellinabox-${version}.tar.gz";
|
||||
sha1 = "9e01f58c68cb53211b83d0f02e676e0d50deb781";
|
||||
};
|
||||
|
||||
buildInputs = [pam openssl openssh];
|
||||
buildInputs = [ pam openssl openssh makeWrapper ];
|
||||
|
||||
patches = [ ./shellinabox-minus.patch ];
|
||||
|
||||
# Disable GSSAPIAuthentication errors as well as correct hardcoded path. Take /usr/games's place.
|
||||
# Disable GSSAPIAuthentication errors. Also, paths in certain source files are
|
||||
# hardcoded. Replace the hardcoded paths with correct paths.
|
||||
preConfigure = ''
|
||||
substituteInPlace ./shellinabox/service.c --replace "-oGSSAPIAuthentication=no" ""
|
||||
substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin"
|
||||
substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login"
|
||||
substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login"
|
||||
'';
|
||||
meta = {
|
||||
substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl}/bin"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/shellinaboxd \
|
||||
--prefix LD_LIBRARY_PATH : ${openssl}/lib
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://code.google.com/p/shellinabox;
|
||||
description = "Web based AJAX terminal emulator";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [stdenv.lib.maintainers.tomberek];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ tomberek lihop ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user