Merge pull request #39634 from matthewbauer/remove-openbsd-netcat

Replace netcat-openbsd with libressl
This commit is contained in:
Matthew Justin Bauer 2018-04-29 14:48:22 -05:00 committed by GitHub
commit 6583ec598b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 57 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
let
@ -11,13 +11,20 @@ let
inherit sha256;
};
configureFlags = [ "--enable-nc" ];
enableParallelBuilding = true;
outputs = [ "bin" "dev" "out" "man" ];
outputs = [ "bin" "dev" "out" "man" "nc" ];
postFixup = ''
moveToOutput "bin/nc" "$nc"
moveToOutput "share/man/man1/nc.1${lib.optionalString (!dontGzipMan) ".gz"}" "$nc"
'';
dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong
meta = with stdenv.lib; {
meta = with lib; {
description = "Free TLS/SSL implementation";
homepage = "http://www.libressl.org";
platforms = platforms.all;

View file

@ -1,51 +0,0 @@
{stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}:
stdenv.mkDerivation rec {
version = "1.190";
deb-version = "${version}-1";
name = "netcat-openbsd-${version}";
srcs = [
(fetchurl {
url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz";
sha256 = "0dp571m42zc7wvb9bf4hz5a08rcc5fknf0gdp98yq19c754c9k38";
})
(fetchurl {
url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz";
sha256 = "0plgrri85sghzn499jzd9d3h7w61ksqj0amkwmcah8dmfkp7jrgv";
})
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libbsd ];
sourceRoot = name;
prePatch = ''
for i in $(cat ../debian/patches/series); do
patch -p1 < "../debian/patches/$i"
done
'';
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [
(fetchpatch {
url = "https://gitweb.gentoo.org/proj/musl.git/plain/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch?id=4a5864922232c7df550c21f2a7b77fe6f8ffc6d6";
sha256 = "1cgqb6fxas5yiwf26hq57v627hhmcskl5j6rx30090ha2ksjqyvr";
})
];
installPhase = ''
runHook preInstall
install -Dm0755 nc $out/bin/nc
install -Dm0644 nc.1 $out/share/man/man1/nc.1
runHook postInstall
'';
meta = with stdenv.lib; {
homepage = https://packages.debian.org/netcat-openbsd;
description = "TCP/IP swiss army knife, OpenBSD variant";
platforms = platforms.linux;
maintainers = with maintainers; [ willibutz ];
};
}

View file

@ -138,6 +138,7 @@ mapAliases (rec {
mupen64plus1_5 = mupen64plus; # added 2016-02-12
mysqlWorkbench = mysql-workbench; # added 2017-01-19
ncat = nmap; # added 2016-01-26
netcat-openbsd = libressl.nc; # added 2018-04-25
networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
networkmanager_iodine = networkmanager-iodine; # added 2018-02-25
networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25

View file

@ -3879,9 +3879,7 @@ with pkgs;
netcat = netcat-openbsd;
netcat-gnu = callPackage ../tools/networking/netcat-gnu { };
netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { };
netcat-gnu = callPackage ../tools/networking/netcat { };
nethogs = callPackage ../tools/networking/nethogs { };