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

apparmor: 2.13.4 -> 2.13.5

Browse Source
This commit is contained in:
ajs124 2020-10-17 17:47:29 +02:00 committed by Frederik Rietdijk
parent 70a924fa80
commit b2602d1a39
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/apparmor/default.nix
View File

@ -14,7 +14,7 @@
let let
apparmor-series = "2.13"; apparmor-series = "2.13";
apparmor-patchver = "4"; apparmor-patchver = "5";
apparmor-version = apparmor-series + "." + apparmor-patchver; apparmor-version = apparmor-series + "." + apparmor-patchver;
apparmor-meta = component: with stdenv.lib; { apparmor-meta = component: with stdenv.lib; {
@ -27,19 +27,10 @@ let
apparmor-sources = fetchurl { apparmor-sources = fetchurl {
url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";
sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh"; sha256 = "05x7r99k00r97v1cq2f711lv6yqzhbl8zp1i1c7kxra4v0a2lzk3";
};
# See <https://gitlab.com/apparmor/apparmor/-/issues/74> This and the
# accompanying application in prePatchCommon should be removed in 2.13.5
gnumake43Patch = fetchpatch {
url = "https://gitlab.com/apparmor/apparmor/-/merge_requests/465.patch";
name = "2-23-fix-build-with-make-4.3.patch";
sha256 = "0xw028iqp69j9mxv0kbwraplgkj5i5djdlgf0anpkc5cdbsf96r9";
}; };
prePatchCommon = '' prePatchCommon = ''
patch -p1 < ${gnumake43Patch}
chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh
patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh
substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man" substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man"