JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #66748 from lblasc/selinux29

Browse Source 
selinux: 2.7 -> 2.9
This commit is contained in:
Dmitry Kalinkin 2019-08-30 22:45:36 -04:00 committed by GitHub
commit 9ff46956f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/checkpolicy/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "checkpolicy";
version = "2.7";
version = "2.9";
inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz";
sha256 = "009j9jc0hi4l7k8f21hn8fm25n0mqgzdpd4nk30nds6d3nglf4sl";
sha256 = "13jz6f8zdrijvn5w1j102b36fs41z0q8ii74axw48cj550mw6im9";
};
nativeBuildInputs = [ bison flex ];

9
pkgs/os-specific/linux/libselinux/default.nix
View File

@ -9,14 +9,14 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libselinux";
version = "2.7";
version = "2.9";
inherit (libsepol) se_release se_url;
outputs = [ "bin" "out" "dev" "man" "py" ];
outputs = [ "bin" "out" "dev" "man" ] ++ optional enablePython "py";
src = fetchurl {
url = "${se_url}/${se_release}/libselinux-${version}.tar.gz";
sha256 = "0mwcq78v6ngbq06xmb9dvilpg0jnl2vs9fgrpakhmmiskdvc1znh";
sha256 = "14r69mgmz7najf9wbizvp68q56mqx4yjbkxjlbcqg5a47s3wik0v";
};
nativeBuildInputs = [ pkgconfig ] ++ optionals enablePython [ swig python ];
@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
"MAN3DIR=$(man)/share/man/man3"
"MAN5DIR=$(man)/share/man/man5"
"MAN8DIR=$(man)/share/man/man8"
"PYSITEDIR=$(py)/${python.sitePackages}"
"PYTHON=python"
"PYTHONLIBDIR=$(py)/${python.sitePackages}"
"SBINDIR=$(bin)/sbin"
"SHLIBDIR=$(out)/lib"

24
pkgs/os-specific/linux/libsemanage/default.nix
View File

@ -6,25 +6,29 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libsemanage";
version = "2.7";
version = "2.9";
inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz";
sha256 = "0xnlp1yg8b1aqc6kq3pss1i1nl06rfj4x4pyl5blasnf2ivlgs87";
};
sha256 = "075w6y3l9hiy5hicgwrmijyxmhfyd1r7cnc08qxyg4j46jfk8xi5";
};
outputs = [ "out" "dev" "man" ] ++ optional enablePython "py";
nativeBuildInputs = [ bison flex pkgconfig ];
buildInputs = [ libsepol libselinux bzip2 audit ]
++ optionals enablePython [ swig python ];
preBuild = ''
makeFlagsArray+=("PREFIX=$out")
makeFlagsArray+=("DESTDIR=$out")
makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages")
'';
makeFlags = [
"PREFIX=$(out)"
"INCLUDEDIR=$(dev)/include"
"MAN3DIR=$(man)/share/man/man3"
"MAN5DIR=$(man)/share/man/man5"
"PYTHON=python"
"PYTHONLIBDIR=$(py)/${python.sitePackages}"
"DEFAULT_SEMANAGE_CONF_LOCATION=$(out)/etc/selinux/semanage.conf"
];
installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ];

8
pkgs/os-specific/linux/libsepol/default.nix
View File

@ -2,15 +2,15 @@
stdenv.mkDerivation rec {
pname = "libsepol";
version = "2.7";
se_release = "20170804";
se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
version = "2.9";
se_release = "20190315";
se_url = "https://github.com/SELinuxProject/selinux/releases/download";
outputs = [ "bin" "out" "dev" "man" ];
src = fetchurl {
url = "${se_url}/${se_release}/libsepol-${version}.tar.gz";
sha256 = "1rzr90d3f1g5wy1b8sh6fgnqb9migys2zgpjmpakn6lhxkc3p7fn";
sha256 = "0p8x7w73jn1nysx1d7416wqrhbi0r6isrjxib7jf68fi72q14jx3";
};
nativeBuildInputs = [ flex ];

19
pkgs/os-specific/linux/policycoreutils/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "policycoreutils";
version = "2.7";
version = "2.9";
inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz";
sha256 = "1x742c7lkw30namhkw87yg7z384qzqjz0pvmqs0lk19v6958l6qa";
sha256 = "0yqg5ws5gbl1cbn8msxdk1c3ilmmx58qg5dx883kqyq0517k8g65";
};
postPatch = ''
@ -20,13 +20,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext ];
buildInputs = [ libsepol libselinux libsemanage ];
preBuild = ''
makeFlagsArray+=("PREFIX=$out")
makeFlagsArray+=("DESTDIR=$out")
makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions")
makeFlagsArray+=("LOCALEDIR=$out/share/locale")
makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
'';
makeFlags = [
"PREFIX=$(out)"
"SBINDIR=$(out)/sbin"
"ETCDIR=$(out)/etc"
"BASHCOMPLETIONDIR=$out/share/bash-completion/completions"
"LOCALEDIR=$(out)/share/locale"
"MAN5DIR=$(out)/share/man/man5"
];
meta = with stdenv.lib; {
description = "SELinux policy core utilities";

28
pkgs/os-specific/linux/selinux-python/default.nix
View File

@ -8,13 +8,13 @@ with python3.pkgs;
stdenv.mkDerivation rec {
pname = "selinux-python";
version = "2.7";
se_release = "20170804";
se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
version = "2.9";
inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/selinux-python-${version}.tar.gz";
sha256 = "1va0y4b7cah7rprh04b3ylmwqgnivpkw5z2zw68nrafdbsbcn5s2";
sha256 = "1pjzsyay5535cxcjag7y7k193ajry0s0xc3dqv5905qd7cwval1n";
};
nativeBuildInputs = [ wrapPython ];
@ -23,17 +23,19 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace sepolicy/Makefile --replace "echo --root" "echo --prefix"
substituteInPlace sepolgen/src/share/Makefile --replace "/var/lib/sepolgen" \
"\$PREFIX/var/lib/sepolgen"
'';
preBuild = ''
makeFlagsArray+=("PREFIX=$out")
makeFlagsArray+=("DESTDIR=$out")
makeFlagsArray+=("LOCALEDIR=$out/share/locale")
makeFlagsArray+=("LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a")
makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions")
makeFlagsArray+=("PYTHON=${python3}/bin/python")
makeFlagsArray+=("PYTHONLIBDIR=lib/${python3.libPrefix}/site-packages")
'';
makeFlags = [
"PREFIX=$(out)"
"LOCALEDIR=$(out)/share/locale"
"BASHCOMPLETIONDIR=$(out)/share/bash-completion/completions"
"PYTHON=python"
"PYTHONLIBDIR=$(out)/${python.sitePackages}"
"LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a"
];
postFixup = ''
wrapPythonPrograms

16
pkgs/os-specific/linux/selinux-sandbox/default.nix
View File

@ -9,12 +9,12 @@ with python3.pkgs;
stdenv.mkDerivation rec {
pname = "selinux-sandbox";
version = "2.7";
se_release = "20170804";
version = "2.9";
inherit (policycoreutils) se_release se_url;
src = fetchurl {
url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${se_release}/selinux-sandbox-${version}.tar.gz";
sha256 = "0hf5chm90iapb42njaps6p5460ys3ajh5446ja544vdbh01n544l";
url = "${se_url}/${se_release}/selinux-sandbox-${version}.tar.gz";
sha256 = "0qj20jyi8v1653xdqj5yak3wwbvg5bw8f2jmx8fpahl6y1bmz481";
};
nativeBuildInputs = [ wrapPython ];
@ -42,10 +42,10 @@ stdenv.mkDerivation rec {
--replace "/usr/bin/test" "${coreutils}/bin/test" \
'';
preBuild = ''
makeFlagsArray+=("PREFIX=$out")
makeFlagsArray+=("DESTDIR=$out")
'';
makeFlags = [
"PREFIX=$(out)"
"SYSCONFDIR=$(out)/etc/sysconfig"
];
postFixup = ''
wrapPythonPrograms

4
pkgs/os-specific/linux/semodule-utils/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "semodule-utils";
version = "2.7";
version = "2.9";
inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/${pname}-${version}.tar.gz";
sha256 = "1fl60x4w8rn5bcwy68sy48aydwsn1a17d48slni4sfx4c8rqpjch";
sha256 = "01yrwnd3calmw6r8kdh8ld7i7fb250n2yqqqk9p0ymrlwsg6g0w0";
};
buildInputs = [ libsepol ];