Merge pull request #157035 from c0bw3b/pkg/rng

Update jitterentropy lib and rng-tools

pkgs/development/libraries/jitterentropy/default.nix

@@ -1,37 +1,31 @@
 { lib, stdenv, fetchFromGitHub }:
+
 stdenv.mkDerivation rec {
   pname = "jitterentropy";
-  version = "2.2.0";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "smuellerDD";
     repo = "jitterentropy-library";
     rev = "v${version}";
-    sha256 = "0n2l1fxr7bynnarpwdjifb2fvlsq8w5wmfh31yk5nrc756cjlgyw";
+    hash = "sha256-go7eGwBoZ58LkgKL7t8oZSc1cFlE6fPOT/ML3Aa8+CM=";
   };
-  patches = [
+
-    # Can be removed when upgrading beyond 2.2.0
+  outputs = [ "out" "dev" ];
-    ./reproducible-manpages.patch
-  ];
 
   enableParallelBuilding = true;
-
+  hardeningDisable = [ "fortify" ]; # avoid warnings
-  preInstall = ''
-    mkdir -p $out/include
-    substituteInPlace Makefile \
-      --replace "install -m 0755 -s" \
-                'install -m 0755 -s --strip-program $(STRIP)'
-  '';
 
   installFlags = [
-    "PREFIX=$(out)"
+    "PREFIX=${placeholder "out"}"
   ];
 
-  meta = {
+  meta = with lib; {
     description = "Provides a noise source using the CPU execution timing jitter";
     homepage = "https://github.com/smuellerDD/jitterentropy-library";
-    license = with lib.licenses; [ gpl2 bsd3 ];
+    changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md";
-    platforms = lib.platforms.linux;
+    license = with licenses; [ bsd3 /* OR */ gpl2Only ];
-    maintainers = with lib.maintainers; [ johnazoidberg ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ johnazoidberg c0bw3b ];
   };
 }

pkgs/development/libraries/jitterentropy/reproducible-manpages.patch

@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 4ff069b..3b8714a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -58,7 +58,7 @@ cppcheck:
- install:
- 	install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
- 	install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
--	gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
-+	gzip -n -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
- 	install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
- 	install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
- 	install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)

pkgs/development/libraries/librtlsdr/default.nix

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config cmake ];
 
-  buildInputs = [ libusb1 ];
+  propagatedBuildInputs = [ libusb1 ];
 
   meta = with lib; {
     description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";

pkgs/tools/security/rng-tools/default.nix

@@ -1,44 +1,53 @@
-{ lib, stdenv, fetchFromGitHub, libtool, autoreconfHook, pkg-config
+{ lib
-, sysfsutils
+, stdenv
-, argp-standalone
+, fetchFromGitHub
+, autoreconfHook
+, libtool
+, pkg-config
+, argp-standalone ? null
+, openssl
+, jitterentropy ? null, withJitterEntropy ? true
   # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS
   # https://www.nist.gov/programs-projects/nist-randomness-beacon
-, curl ? null, libxml2 ? null, openssl ? null, withNistBeacon ? false
+, curl ? null, jansson ? null, libxml2 ? null, withNistBeacon ? false
-  # Systems that support RDRAND but not AES-NI require libgcrypt to use RDRAND as an entropy source
-, libgcrypt ? null, withGcrypt ? true
-, jitterentropy ? null, withJitterEntropy ? true
 , libp11 ? null, opensc ? null, withPkcs11 ? true
+, librtlsdr ? null, withRtlsdr ? true
 }:
 
+assert (stdenv.hostPlatform.isMusl) -> argp-standalone != null;
+assert (withJitterEntropy) -> jitterentropy != null;
+assert (withNistBeacon) -> curl != null && jansson != null && libxml2 != null;
+assert (withPkcs11) -> libp11 != null && opensc != null;
+assert (withRtlsdr) -> librtlsdr != null;
+
 with lib;
 
 stdenv.mkDerivation rec {
   pname = "rng-tools";
-  version = "6.11";
+  version = "6.14";
 
   src = fetchFromGitHub {
     owner = "nhorman";
-    repo = "rng-tools";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-qheJaeVX2zuv0mvKEd6wcbSHFjiJE0t5hVCJiRSKm3M=";
+    hash = "sha256-NTXp2l5gVxKhO4Gqcy4VzomYU5B3HydkefMvdzypK8M=";
   };
 
   nativeBuildInputs = [ autoreconfHook libtool pkg-config ];
 
   configureFlags = [
-    (withFeature   withGcrypt        "libgcrypt")
+    (enableFeature (withJitterEntropy) "jitterentropy")
-    (enableFeature withJitterEntropy "jitterentropy")
+    (withFeature   (withNistBeacon)    "nistbeacon")
-    (withFeature   withNistBeacon    "nistbeacon")
+    (withFeature   (withPkcs11)        "pkcs11")
-    (withFeature   withPkcs11        "pkcs11")
+    (withFeature   (withRtlsdr)        "rtlsdr")
   ];
 
-  # argp-standalone is only used when libc lacks argp parsing (musl)
+  buildInputs = [ openssl ]
-  buildInputs = [ sysfsutils ]
+    ++ optionals (stdenv.hostPlatform.isMusl) [ argp-standalone ]
-    ++ optionals stdenv.hostPlatform.isx86_64 [ argp-standalone ]
+    ++ optionals (withJitterEntropy) [ jitterentropy ]
-    ++ optionals withGcrypt        [ libgcrypt ]
+    ++ optionals (withNistBeacon)    [ curl jansson libxml2 ]
-    ++ optionals withJitterEntropy [ jitterentropy ]
+    ++ optionals (withPkcs11)        [ libp11 openssl ]
-    ++ optionals withNistBeacon    [ curl libxml2 openssl ]
+    ++ optionals (withRtlsdr)        [ librtlsdr ];
-    ++ optionals withPkcs11        [ libp11 openssl ];
 
   enableParallelBuilding = true;
 
@@ -51,9 +60,18 @@ stdenv.mkDerivation rec {
   doCheck = true;
   preCheck = "patchShebangs tests/*.sh";
 
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+    set -o pipefail
+    $out/bin/rngtest --version | grep $version
+    runHook postInstallCheck
+  '';
+
   meta = {
     description = "A random number generator daemon";
     homepage = "https://github.com/nhorman/rng-tools";
+    changelog = "https://github.com/nhorman/rng-tools/releases/tag/v${version}";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ johnazoidberg c0bw3b ];