mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 06:45:16 +01:00
rpm: 4.17.1 -> 4.18.0
https://rpm.org/wiki/Releases/4.18.0 Fixes CVE-2021-35937, CVE-2021-35938 and CVE-2021-35939.
This commit is contained in:
parent
e4f48619b2
commit
a089c12aa5
1 changed files with 3 additions and 10 deletions
|
@ -1,16 +1,16 @@
|
|||
{ stdenv, lib
|
||||
, pkg-config, autoreconfHook
|
||||
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages
|
||||
, sqlite, zstd, fetchpatch, libcap
|
||||
, sqlite, zstd, libcap
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rpm";
|
||||
version = "4.17.1";
|
||||
version = "4.18.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.osuosl.org/pub/rpm/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2";
|
||||
hash = "sha256-DBG3k0ZucliFH/gr1lyP/Ywtu8cKzIaaXTQVBUmSbl0=";
|
||||
hash = "sha256-KhcVLXGHqzDt8sL7WGRjvfY4jee1g3SAlVZZ5ekFRVQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
@ -38,13 +38,6 @@ stdenv.mkDerivation rec {
|
|||
"--sharedstatedir=/com"
|
||||
] ++ lib.optional stdenv.isLinux "--with-cap";
|
||||
|
||||
patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fix build for macOS aarch64
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rpm-software-management/rpm/commit/ad87ced3990c7e14b6b593fa411505e99412e248.patch";
|
||||
hash = "sha256-WYlxPGcPB5lGQmkyJ/IpGoqVfAKtMxKzlr5flTqn638=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' ""
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue