diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2022-09-29 08:53:44 +0200 |
|---|---|---|
| committer | Thomas Gerbet <thomas@gerbet.me> | 2022-09-29 08:53:44 +0200 |
| commit | a089c12aa516f4e172ec060c690c6e96752225c1 (patch) | |
| tree | bc322d9f29c9fb70d49cc9632070f095bdb092f0 /pkgs/tools/package-management/rpm/default.nix | |
| parent | e4f48619b2fad668dc2f64c279ba83ac96f4877b (diff) | |
| download | nixpkgs-a089c12aa516f4e172ec060c690c6e96752225c1.tar nixpkgs-a089c12aa516f4e172ec060c690c6e96752225c1.tar.gz nixpkgs-a089c12aa516f4e172ec060c690c6e96752225c1.tar.bz2 nixpkgs-a089c12aa516f4e172ec060c690c6e96752225c1.tar.lz nixpkgs-a089c12aa516f4e172ec060c690c6e96752225c1.tar.xz nixpkgs-a089c12aa516f4e172ec060c690c6e96752225c1.tar.zst nixpkgs-a089c12aa516f4e172ec060c690c6e96752225c1.zip | |
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.
Diffstat (limited to 'pkgs/tools/package-management/rpm/default.nix')
| -rw-r--r-- | pkgs/tools/package-management/rpm/default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index d8207bb4b30..af8032b81a5 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -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' "" ''; |