dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #216202 from ruuda/libressl-362-354

Browse Source 
LibreSSL: 3.5.3 → 3.5.4, 3.6.1 → 3.6.2
This commit is contained in:
ajs124 2023-02-21 15:54:23 +01:00 committed by GitHub
commit f7475ce895
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/libraries/libressl/default.nix
View File

@ -12,7 +12,13 @@ let
then "DYLD_LIBRARY_PATH" then "DYLD_LIBRARY_PATH"
else "LD_LIBRARY_PATH"; else "LD_LIBRARY_PATH";
generic = { version, hash, patches ? [] }: stdenv.mkDerivation rec { generic =
{ version
, hash
, patches ? []
, knownVulnerabilities ? []
}: stdenv.mkDerivation rec
{
pname = "libressl"; pname = "libressl";
inherit version; inherit version;
@ -80,6 +86,7 @@ let
license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc openssl ]; license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc openssl ];
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice fpletz ]; maintainers = with maintainers; [ thoughtpolice fpletz ];
inherit knownVulnerabilities;
}; };
}; };
@ -87,11 +94,22 @@ in {
libressl_3_4 = generic { libressl_3_4 = generic {
version = "3.4.3"; version = "3.4.3";
hash = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; hash = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0=";
knownVulnerabilities = [ "Support ended 2022-10-14." ];
patches = [
(fetchpatch {
# https://marc.info/?l=libressl&m=167582148932407&w=2
name = "backport-type-confusion-fix.patch";
url = "https://raw.githubusercontent.com/libressl/portable/30dc760ed1d7c70766b135500950d8ca9d17b13a/patches/x509_genn.c.diff";
sha256 = "sha256-N9jsOueqposDWZwaR+n/v/cHgNiZbZ644d8/wKjN2/M=";
stripLen = 2;
extraPrefix = "crypto/";
})
];
}; };
libressl_3_5 = generic { libressl_3_5 = generic {
version = "3.5.3"; version = "3.5.4";
hash = "sha256-OrXl6u9pziDGsXDuZNeFtCI19I8uYrCV/KXXtmcriyg="; hash = "sha256-A3naE0Si9xrUpOO+MO+dgu7N3Of43CrmZjGh3+FDQ6w=";
patches = [ patches = [
# Fix endianness detection on aarch64-darwin, issue #181187 # Fix endianness detection on aarch64-darwin, issue #181187
@ -104,7 +122,7 @@ in {
}; };
libressl_3_6 = generic { libressl_3_6 = generic {
version = "3.6.1"; version = "3.6.2";
hash = "sha256-rPrGExbpO5GcKNYtUwN8pzTehcRrTXA/Gf2Dlc8AZ3Q="; hash = "sha256-S+gP/wc3Rs9QtKjlur4nlayumMaxMqngJRm0Rd+/0DM=";
}; };
} }