selinux: 2.9, 3.0 -> 3.3
These are all released together, so I'm updating them all in a single commit.
This commit is contained in:
parent
20fd3b1002
commit
28625f7861
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "checkpolicy";
|
pname = "checkpolicy";
|
||||||
version = "2.9";
|
version = "3.3";
|
||||||
inherit (libsepol) se_release se_url;
|
inherit (libsepol) se_url;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz";
|
url = "${se_url}/${version}/checkpolicy-${version}.tar.gz";
|
||||||
sha256 = "13jz6f8zdrijvn5w1j102b36fs41z0q8ii74axw48cj550mw6im9";
|
sha256 = "118l8c2vvnnckbd269saslr7adv6rdavr5rv0z5vh2m1lgglxj15";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ bison flex ];
|
nativeBuildInputs = [ bison flex ];
|
||||||
|
|
|
@ -9,14 +9,14 @@ with lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libselinux";
|
pname = "libselinux";
|
||||||
version = "3.0";
|
version = "3.3";
|
||||||
inherit (libsepol) se_release se_url;
|
inherit (libsepol) se_url;
|
||||||
|
|
||||||
outputs = [ "bin" "out" "dev" "man" ] ++ optional enablePython "py";
|
outputs = [ "bin" "out" "dev" "man" ] ++ optional enablePython "py";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${se_url}/${se_release}/libselinux-${version}.tar.gz";
|
url = "${se_url}/${version}/libselinux-${version}.tar.gz";
|
||||||
sha256 = "0cr4p0qkr4qd5z1x677vwhz6mlz55kxyijwi2dmrvbhxcw7v78if";
|
sha256 = "0mvh793g7fg6wb6zqhkdyrv80x6k84ypqwi8ii89c91xcckyxzdc";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ] ++ optionals enablePython [ swig python3 ];
|
nativeBuildInputs = [ pkg-config ] ++ optionals enablePython [ swig python3 ];
|
||||||
|
|
|
@ -6,12 +6,12 @@ with lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libsemanage";
|
pname = "libsemanage";
|
||||||
version = "2.9";
|
version = "3.3";
|
||||||
inherit (libsepol) se_release se_url;
|
inherit (libsepol) se_url;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz";
|
url = "${se_url}/${version}/libsemanage-${version}.tar.gz";
|
||||||
sha256 = "075w6y3l9hiy5hicgwrmijyxmhfyd1r7cnc08qxyg4j46jfk8xi5";
|
sha256 = "1s3wb66l47blc15s6lkqs11j9l8pycdqqbb03x3vpfrlz9dfrl44";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" "man" ] ++ optional enablePython "py";
|
outputs = [ "out" "dev" "man" ] ++ optional enablePython "py";
|
||||||
|
|
|
@ -2,31 +2,16 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libsepol";
|
pname = "libsepol";
|
||||||
version = "3.0";
|
version = "3.3";
|
||||||
se_release = "20191204";
|
|
||||||
se_url = "https://github.com/SELinuxProject/selinux/releases/download";
|
se_url = "https://github.com/SELinuxProject/selinux/releases/download";
|
||||||
|
|
||||||
outputs = [ "bin" "out" "dev" "man" ];
|
outputs = [ "bin" "out" "dev" "man" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${se_url}/${se_release}/libsepol-${version}.tar.gz";
|
url = "${se_url}/${version}/libsepol-${version}.tar.gz";
|
||||||
sha256 = "0ygb6dh5lng91xs6xiqf5v0nxa68qmjc787p0s5h9w89364f2yjv";
|
sha256 = "12r39ygn7aa1kz52wibfr4520m0cp75hlrn3i6rnjqa6p0zdz5rd";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# upstream build fix against -fno-common compilers like >=gcc-10
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/SELinuxProject/selinux/commit/a96e8c59ecac84096d870b42701a504791a8cc8c.patch";
|
|
||||||
sha256 = "0aybv4kzbhx8xq6s82dsh4ib76k59qzh2bgxmk44iq5cjnqn5rd6";
|
|
||||||
stripLen = 1;
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/SELinuxProject/selinux/commit/3d32fc24d6aff360a538c63dad08ca5c957551b0.patch";
|
|
||||||
sha256 = "1mphwdlj4d6mwmsp5xkpf6ci4rxhgbi3fm79d08h4jbzxaf4wny4";
|
|
||||||
stripLen = 1;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
|
postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
|
||||||
substituteInPlace src/Makefile --replace 'all: $(LIBA) $(LIBSO)' 'all: $(LIBA)'
|
substituteInPlace src/Makefile --replace 'all: $(LIBA) $(LIBSO)' 'all: $(LIBA)'
|
||||||
sed -i $'/^\t.*LIBSO/d' src/Makefile
|
sed -i $'/^\t.*LIBSO/d' src/Makefile
|
||||||
|
@ -46,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||||
|
|
||||||
passthru = { inherit se_release se_url; };
|
passthru = { inherit se_url; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "SELinux binary policy manipulation library";
|
description = "SELinux binary policy manipulation library";
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "policycoreutils";
|
pname = "policycoreutils";
|
||||||
version = "2.9";
|
version = "3.3";
|
||||||
inherit (libsepol) se_release se_url;
|
inherit (libsepol) se_url;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz";
|
url = "${se_url}/${version}/policycoreutils-${version}.tar.gz";
|
||||||
sha256 = "0yqg5ws5gbl1cbn8msxdk1c3ilmmx58qg5dx883kqyq0517k8g65";
|
sha256 = "0y0hl32b2ks7r0fhbx3k2j1gqqms5aplyasjs3fz50caxl6096a1";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"PREFIX=$(out)"
|
"PREFIX=$(out)"
|
||||||
"SBINDIR=$(out)/sbin"
|
"SBINDIR=$(out)/bin"
|
||||||
"ETCDIR=$(out)/etc"
|
"ETCDIR=$(out)/etc"
|
||||||
"BASHCOMPLETIONDIR=$out/share/bash-completion/completions"
|
"BASHCOMPLETIONDIR=$out/share/bash-completion/completions"
|
||||||
"LOCALEDIR=$(out)/share/locale"
|
"LOCALEDIR=$(out)/share/locale"
|
||||||
|
|
|
@ -7,13 +7,13 @@ with lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "selinux-python";
|
pname = "selinux-python";
|
||||||
version = "2.9";
|
version = "3.3";
|
||||||
|
|
||||||
inherit (libsepol) se_release se_url;
|
inherit (libsepol) se_url;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${se_url}/${se_release}/selinux-python-${version}.tar.gz";
|
url = "${se_url}/${version}/selinux-python-${version}.tar.gz";
|
||||||
sha256 = "1pjzsyay5535cxcjag7y7k193ajry0s0xc3dqv5905qd7cwval1n";
|
sha256 = "1v244hpb45my303793xa4kcn7qnxjgxn4ja7rdn9k1q361hi1nca";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
@ -49,4 +49,3 @@ stdenv.mkDerivation rec {
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,12 +9,12 @@ with python3.pkgs;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "selinux-sandbox";
|
pname = "selinux-sandbox";
|
||||||
version = "2.9";
|
version = "3.3";
|
||||||
inherit (policycoreutils) se_release se_url;
|
inherit (policycoreutils) se_url;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${se_url}/${se_release}/selinux-sandbox-${version}.tar.gz";
|
url = "${se_url}/${version}/selinux-sandbox-${version}.tar.gz";
|
||||||
sha256 = "0qj20jyi8v1653xdqj5yak3wwbvg5bw8f2jmx8fpahl6y1bmz481";
|
sha256 = "0rw8pxfqhl6ww4w31fbf4hi3zilh1n3b1rfjm7ra76mm78wfyylj";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ wrapPython ];
|
nativeBuildInputs = [ wrapPython ];
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "semodule-utils";
|
pname = "semodule-utils";
|
||||||
version = "2.9";
|
version = "3.3";
|
||||||
|
|
||||||
inherit (libsepol) se_release se_url;
|
inherit (libsepol) se_url;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${se_url}/${se_release}/${pname}-${version}.tar.gz";
|
url = "${se_url}/${version}/${pname}-${version}.tar.gz";
|
||||||
sha256 = "01yrwnd3calmw6r8kdh8ld7i7fb250n2yqqqk9p0ymrlwsg6g0w0";
|
sha256 = "0qvhl40a6jlm8p719nnlw2ghlxbh8lxbcsd59azxp884bxgfr61h";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libsepol ];
|
buildInputs = [ libsepol ];
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
{ lib, stdenv, fetchurl, libsepol, python }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "sepolgen";
|
|
||||||
version = "1.2.2";
|
|
||||||
inherit (libsepol) se_release se_url;
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "${se_url}/${se_release}/sepolgen-${version}.tar.gz";
|
|
||||||
sha256 = "09139kspr41zgksayi4dh982p8080lrfl96p4dld51nknbpaigdy";
|
|
||||||
};
|
|
||||||
|
|
||||||
preBuild = ''
|
|
||||||
makeFlagsArray+=("PREFIX=$out")
|
|
||||||
makeFlagsArray+=("DESTDIR=$out")
|
|
||||||
makeFlagsArray+=("PYTHONLIBDIR=lib/${python.libPrefix}/site-packages")
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
inherit (libsepol.meta) homepage platforms maintainers;
|
|
||||||
description = "SELinux policy generation library";
|
|
||||||
license = licenses.gpl2;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -833,6 +833,7 @@ mapAliases ({
|
||||||
sdlmame = mame; # added 2019-10-30
|
sdlmame = mame; # added 2019-10-30
|
||||||
seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # added 2020-06-21
|
seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # added 2020-06-21
|
||||||
seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)";
|
seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)";
|
||||||
|
sepolgen = throw "sepolgen was merged into selinux-python"; # added 2021-11-11
|
||||||
shared_mime_info = shared-mime-info; # added 2018-02-25
|
shared_mime_info = shared-mime-info; # added 2018-02-25
|
||||||
skrooge2 = skrooge; # added 2017-02-18
|
skrooge2 = skrooge; # added 2017-02-18
|
||||||
sky = throw "sky has been removed from nixpkgs (2020-09-16)";
|
sky = throw "sky has been removed from nixpkgs (2020-09-16)";
|
||||||
|
|
|
@ -22606,8 +22606,6 @@ with pkgs;
|
||||||
|
|
||||||
sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { };
|
sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { };
|
||||||
|
|
||||||
sepolgen = callPackage ../os-specific/linux/sepolgen { };
|
|
||||||
|
|
||||||
setools = callPackage ../os-specific/linux/setools { };
|
setools = callPackage ../os-specific/linux/setools { };
|
||||||
|
|
||||||
seturgent = callPackage ../os-specific/linux/seturgent { };
|
seturgent = callPackage ../os-specific/linux/seturgent { };
|
||||||
|
|
Loading…
Reference in a new issue