diff options
| author | ajs124 <git@ajs124.de> | 2020-03-12 17:29:15 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-03-12 23:42:43 +0000 |
| commit | 2d364c6793b40245249f5cc1220d58103e4f6387 (patch) | |
| tree | 043695d921e3c204fd71bda90aa745b913eac8ce /pkgs/os-specific/linux/apparmor | |
| parent | 18ac6ba903828b388c9cfb5bb80bd3fc8667c5ca (diff) | |
| download | nixpkgs-2d364c6793b40245249f5cc1220d58103e4f6387.tar nixpkgs-2d364c6793b40245249f5cc1220d58103e4f6387.tar.gz nixpkgs-2d364c6793b40245249f5cc1220d58103e4f6387.tar.bz2 nixpkgs-2d364c6793b40245249f5cc1220d58103e4f6387.tar.lz nixpkgs-2d364c6793b40245249f5cc1220d58103e4f6387.tar.xz nixpkgs-2d364c6793b40245249f5cc1220d58103e4f6387.tar.zst nixpkgs-2d364c6793b40245249f5cc1220d58103e4f6387.zip | |
apparmor: 2.13.3 -> 2.13.4
drop patches that were merged upstream
Diffstat (limited to 'pkgs/os-specific/linux/apparmor')
| -rw-r--r-- | pkgs/os-specific/linux/apparmor/cross.patch | 19 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/apparmor/default.nix | 11 |
2 files changed, 2 insertions, 28 deletions
diff --git a/pkgs/os-specific/linux/apparmor/cross.patch b/pkgs/os-specific/linux/apparmor/cross.patch deleted file mode 100644 index f7e95ecfb40..00000000000 --- a/pkgs/os-specific/linux/apparmor/cross.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/parser/libapparmor_re/Makefile 2018-10-14 07:38:06.000000000 +0800 -+++ b/parser/libapparmor_re/Makefile 2019-06-28 16:16:33.741916660 +0800 -@@ -10,6 +10,7 @@ - - TARGET=libapparmor_re.a - -+AR ?= ar - CFLAGS ?= -g -Wall -O2 ${EXTRA_CFLAGS} -std=gnu++0x - CXXFLAGS := ${CFLAGS} ${INCLUDE_APPARMOR} - -@@ -22,7 +23,7 @@ - UNITTESTS = tst_parse - - libapparmor_re.a: parse.o expr-tree.o hfa.o chfa.o aare_rules.o -- ar ${ARFLAGS} $@ $^ -+ ${AR} ${ARFLAGS} $@ $^ - - expr-tree.o: expr-tree.cc expr-tree.h - diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index de9601dc85e..9bdd1ae029f 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -14,7 +14,7 @@ let apparmor-series = "2.13"; - apparmor-patchver = "3"; + apparmor-patchver = "4"; apparmor-version = apparmor-series + "." + apparmor-patchver; apparmor-meta = component: with stdenv.lib; { @@ -27,7 +27,7 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "0fbnk9fzjsffwcijsv2wwykmybvfdckpqk99qlib3kb89him6w16"; + sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh"; }; prePatchCommon = '' @@ -49,13 +49,6 @@ let sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4"; }) # (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12) - ] ++ [ - ./cross.patch - # Support Python 3.8 - (fetchpatch { - url = https://gitlab.com/apparmor/apparmor/commit/ccbf1e0bf1bf5c3bbab47029fbbc5415ef73bac1.patch; - sha256 = "0kfzc0wyjybj38n10yvwakaaqvglalzigd3kk7gcrbp1xdn70pq2"; - }) ]; # Set to `true` after the next FIXME gets fixed or this gets some |