diff options
| author | Wout Mertens <Wout.Mertens@gmail.com> | 2021-01-17 15:15:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-17 15:15:45 +0100 |
| commit | 57c198236a6c08f01286cfec6a5400383b561850 (patch) | |
| tree | 27cc60fcedeed9760840d70f494a87f806df6b80 /pkgs | |
| parent | 641f22e6e4b1ed8aa36d8632b269b7d8e18b5f05 (diff) | |
| parent | cd0fa5ae486525cda83515a5bb52e1f444202bae (diff) | |
Merge pull request #109452 from wmertens/scponly
scponly: init at 4.8
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/shells/scponly/default.nix | 39 | ||||
| -rw-r--r-- | pkgs/shells/scponly/scponly-fix-make.patch | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 62 insertions, 0 deletions
diff --git a/pkgs/shells/scponly/default.nix b/pkgs/shells/scponly/default.nix new file mode 100644 index 000000000000..c0c39d8e3164 --- /dev/null +++ b/pkgs/shells/scponly/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub, openssh, debugLevel ? 0 }: + +stdenv.mkDerivation { + pname = "scponly"; + version = "4.8"; + + src = fetchFromGitHub { + owner = "scponly"; + repo = "scponly"; + rev = "d8ca58257b9905186aa5706f35813d5f80ea07c1"; + sha256 = "U0K7lOp18ytNjh3KVFmc6vL+/tG4ETnwLEPQEhM4lXE="; + }; + + patches = [ ./scponly-fix-make.patch ]; + + buildInputs = [ openssh ]; + + # Add path to sftp-server so configure finds it + preConfigure = "export PATH=$PATH:${openssh}/libexec"; + + # chroot doesn't seem to work, so not enabling + # rsync could also be optionally enabled + configureFlags = [ "--enable-winscp-compat" ]; + + postInstall = lib.optionalString (debugLevel > 0) '' + mkdir -p $out/etc/scponly && echo ${ + toString debugLevel + } > $out/etc/scponly/debuglevel + ''; + + passthru.shellPath = "/bin/scponly"; + + meta = with lib; { + description = "A shell that only permits scp and sftp-server"; + homepage = "https://github.com/scponly/scponly"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ wmertens ]; + }; +} diff --git a/pkgs/shells/scponly/scponly-fix-make.patch b/pkgs/shells/scponly/scponly-fix-make.patch new file mode 100644 index 000000000000..e8522ec8e6e3 --- /dev/null +++ b/pkgs/shells/scponly/scponly-fix-make.patch @@ -0,0 +1,21 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -41,14 +41,14 @@ + ${INSTALL} -d ${DESTDIR}${bindir} + ${INSTALL} -d ${DESTDIR}${mandir}/man8 + ${INSTALL} -d ${DESTDIR}${CONFDIR} +- ${INSTALL} -o 0 -g 0 scponly ${DESTDIR}${bindir}/scponly +- ${INSTALL} -o 0 -g 0 -m 0644 scponly.8 ${DESTDIR}${mandir}/man8/scponly.8 +- ${INSTALL} -o 0 -g 0 -m 0644 debuglevel ${DESTDIR}${DEBUGFILE} ++ ${INSTALL} scponly ${DESTDIR}${bindir}/scponly ++ ${INSTALL} -m 0644 scponly.8 ${DESTDIR}${mandir}/man8/scponly.8 ++ ${INSTALL} -m 0644 debuglevel ${DESTDIR}${DEBUGFILE} + if test "x${CHROOTED_NAME}" != "x"; then \ + ${INSTALL} -d ${DESTDIR}${sbindir}; \ + rm -f ${DESTDIR}${sbindir}/${CHROOTED_NAME}; \ + cp scponly ${CHROOTED_NAME}; \ +- ${INSTALL} -o 0 -g 0 -m 4755 ${CHROOTED_NAME} ${DESTDIR}${sbindir}/${CHROOTED_NAME}; \ ++ ${INSTALL} ${CHROOTED_NAME} ${DESTDIR}${sbindir}/${CHROOTED_NAME}; \ + fi + + debuglevel: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5396d4d32ba..182c6f904545 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9172,6 +9172,8 @@ in pash = callPackage ../shells/pash { }; + scponly = callPackage ../shells/scponly { }; + tcsh = callPackage ../shells/tcsh { }; rush = callPackage ../shells/rush { }; |