Merge pull request #265930 from delroth/sudo-1.9.15

sudo: 1.9.14p3 -> 1.9.15
This commit is contained in:
Pierre Bourdon 2023-11-07 20:14:07 +01:00 committed by GitHub
commit b8eceddcad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
, buildPackages , buildPackages
, coreutils , coreutils
, pam , pam
@ -15,28 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sudo"; pname = "sudo";
version = "1.9.14p3"; version = "1.9.15";
src = fetchurl { src = fetchurl {
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
hash = "sha256-oIMYscS8hYLABNTNmuKQOrxUnn5GuoFeQf6B0cB4K2I="; hash = "sha256-/Q4lSHDpLoc7UIuhY4L1rDr4Glo40eqc+XNgbbQmJYk=";
}; };
patches = [
# Extra bugfix not included in 1.9.14p3 to address a bug that impacts the
# NixOS test suite for sudo.
(fetchpatch {
url = "https://github.com/sudo-project/sudo/commit/760c9c11074cb921ecc0da9fbb5f0a12afd46233.patch";
hash = "sha256-smwyoYEkaqfQYz9C4VVz59YMtKabOPpwhS+RBwXbWuE=";
})
# Fix for the patch above:
# https://bugzilla.sudo.ws/show_bug.cgi?id=1057
(fetchpatch {
url = "https://github.com/sudo-project/sudo/commit/d148e7d8f9a98726dd4fde6f187c7d614e1258c7.patch";
hash = "sha256-3I3PnuAHlBs3JOn0Ul900aFxuUkDGV4sM3S5DNtW7bE=";
})
];
prePatch = '' prePatch = ''
# do not set sticky bit in nix store # do not set sticky bit in nix store
substituteInPlace src/Makefile.in --replace 04755 0755 substituteInPlace src/Makefile.in --replace 04755 0755