diff options
author | William A. Kennington III <william@wkennington.com> | 2013-11-28 02:58:06 -0600 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2013-11-29 02:08:53 -0600 |
commit | 96dc58db9c6a6c25b164b6d0888deddc57bc7216 (patch) | |
tree | 9b63e1a3b83d6ce915ebf0fcc0f39df3407b137d /pkgs/os-specific/linux/policycoreutils | |
parent | 3f449b8ae67e3098fb42ad58f1cd038c8a7220c9 (diff) | |
download | nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.tar nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.tar.gz nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.tar.bz2 nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.tar.lz nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.tar.xz nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.tar.zst nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.zip |
Upgrade selinux from 20100904 -> 20131030
Diffstat (limited to 'pkgs/os-specific/linux/policycoreutils')
-rw-r--r-- | pkgs/os-specific/linux/policycoreutils/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index e49525a42bf..5c7e704390b 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -1,23 +1,24 @@ { stdenv, fetchurl, intltool, pcre, libcap_ng, libcgroup -, libsepol, libselinux, libsemanage +, libsepol, libselinux, libsemanage, setools , python, sepolgen }: stdenv.mkDerivation rec { name = "policycoreutils-${version}"; - version = "2.1.13"; + version = "2.2.4"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz"; - sha256 = "1145nbpwndmhma08vvj1j75bjd8xhjal0vjpazlrw78iyc30y11l"; + sha256 = "08zpd2a2j45j1qkmq9sz084r2xr0fky1cnld45sn8w5xgdw8k81n"; }; patchPhase = '' substituteInPlace po/Makefile --replace /usr/bin/install install + find . -type f -exec sed -i 's,/usr/bin/python,${python}/bin/python,' {} \; ''; buildInputs = [ intltool pcre libcap_ng libcgroup - libsepol libselinux libsemanage + libsepol libselinux libsemanage setools python sepolgen # ToDo? these are optional ]; @@ -25,6 +26,11 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib" && cp -s "${libsepol}/lib/libsepol.a" "$out/lib" ''; + # Creation of the system-config-selinux directory is broken + preInstall = '' + mkdir -p $out/share/system-config-selinux + ''; + NIX_CFLAGS_COMPILE = "-fstack-protector-all"; NIX_LDFLAGS = "-lsepol -lpcre"; |