git.iko.soy/typeable/nixpkgs
on master help sign in
shellinabox: drop
commit64e026af23a4887a090fd1065af2bc1ff6e03cad authorajs124 <git@ajs124.de> dateWed 15 Dec 2021, 18:06 (5 years ago) parent363ef08
4 files changed+1−82
pkgs/servers/shellinabox/default.nix−50 pkgs/servers/shellinabox/shellinabox-minus.patch−28 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix−4
pkgs/servers/shellinabox/default.nixdeleted−50
@@ -1,50 +0,0 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pam, openssl, openssh, shadow, makeWrapper }:
2−
3−stdenv.mkDerivation rec {
4− version = "2.20";
5− pname = "shellinabox";
6−
7− src = fetchFromGitHub {
8− owner = "shellinabox";
9− repo = "shellinabox";
10− rev = "v${version}";
11− sha256 = "1hmfayh21cks2lyj572944ll0mmgsxbnj981b3hq3nhdg8ywzjfr";
12− };
13−
14− patches = [
15− ./shellinabox-minus.patch
16− (fetchpatch {
17− name = "CVE-2018-16789.patch";
18− url = "https://github.com/shellinabox/shellinabox/commit/4f0ecc31ac6f985e0dd3f5a52cbfc0e9251f6361.patch";
19− sha256 = "1mpm6acxdb0fms9pa2b88fx6hp07ph87ahxi82yyqj2m7p79jx7a";
20− })
21− ];
22−
23− nativeBuildInputs = [ autoreconfHook makeWrapper ];
24− buildInputs = [ pam openssl openssh ];
25−
26− # Disable GSSAPIAuthentication errors. Also, paths in certain source files are
27− # hardcoded. Replace the hardcoded paths with correct paths.
28− preConfigure = ''
29− substituteInPlace ./shellinabox/service.c --replace "-oGSSAPIAuthentication=no" ""
30− substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin"
31− substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login"
32− substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login"
33− substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl.bin}/bin"
34− '';
35−
36− postInstall = ''
37− wrapProgram $out/bin/shellinaboxd \
38− --prefix LD_LIBRARY_PATH : ${openssl.out}/lib
39− mkdir -p $out/lib
40− cp shellinabox/* $out/lib
41− '';
42−
43− meta = with lib; {
44− homepage = "https://github.com/shellinabox/shellinabox";
45− description = "Web based AJAX terminal emulator";
46− license = licenses.gpl2;
47− maintainers = with maintainers; [ tomberek lihop ];
48− platforms = platforms.linux;
49− };
50−}
pkgs/servers/shellinabox/shellinabox-minus.patchdeleted−28
@@ -1,28 +0,0 @@
1−diff -ru shellinabox-2.14/shellinabox/vt100.jspp shellinabox-2.14.new/shellinabox/vt100.jspp
2−--- shellinabox-2.14/shellinabox/vt100.jspp 2012-04-21 21:30:44.000000000 +0400
3−+++ shellinabox-2.14.new/shellinabox/vt100.jspp 2014-03-27 16:33:31.012344164 +0400
4−@@ -2676,6 +2676,7 @@
5− switch (key) {
6− case 33: /* Page Up */ this.scrollBack(); return;
7− case 34: /* Page Down */ this.scrollFore(); return;
8−+ case 173: /* _ */ ch = this.applyModifiers(95, event); break;
9− default: break;
10− }
11− }
12−@@ -2738,6 +2739,7 @@
13− case 123: /* F12 */ ch = '\u001B[24~'; break;
14− case 144: /* Num Lock */ return;
15− case 145: /* Scroll Lock */ return;
16−+ case 173: /* - */ ch = this.applyModifiers(45, event); break;
17− case 186: /* ; */ ch = this.applyModifiers(59, event); break;
18− case 187: /* = */ ch = this.applyModifiers(61, event); break;
19− case 188: /* , */ ch = this.applyModifiers(44, event); break;
20−@@ -2882,6 +2884,7 @@
21− case 109: /* - -> _ */ u = 45; s = 95; break;
22− case 111: /* / -> ? */ u = 47; s = 63; break;
23−
24−+ case 173: /* - -> _ */ u = 45; s = 95; break;
25− case 186: /* ; -> : */ u = 59; s = 58; break;
26− case 187: /* = -> + */ u = 61; s = 43; break;
27− case 188: /* , -> < */ u = 44; s = 60; break;
28−
pkgs/top-level/aliases.nix+1
@@ -951,6 +951,7 @@ mapAliases ({
951951 seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)";
952952 sepolgen = throw "sepolgen was merged into selinux-python"; # added 2021-11-11
953953 shared_mime_info = shared-mime-info; # added 2018-02-25
954+ shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # added 2021-12-15
954955 sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01
955956 sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01
956957 sigurlx = throw "sigurlx has been removed (upstream is gone)"; # added 2022-01-24
pkgs/top-level/all-packages.nix−4
@@ -9642,10 +9642,6 @@ with pkgs;
96429642
96439643 shout = nodePackages.shout;
96449644
9645− shellinabox = callPackage ../servers/shellinabox {
9646− openssl = openssl_1_0_2;
9647− };
9648−
96499645 shrikhand = callPackage ../data/fonts/shrikhand { };
96509646
96519647 shunit2 = callPackage ../tools/misc/shunit2 { };