diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2013-11-07 19:14:07 +0100 |
|---|---|---|
| committer | Ricardo M. Correia <rcorreia@wizy.org> | 2014-05-15 13:25:47 +0200 |
| commit | aab9b733c23c3b900c0f98dc1465aee1a70b8ef0 (patch) | |
| tree | a73b4b5574632fe9c83c4893f7097247e7a52dcd /pkgs/development/libraries/qimageblitz | |
| parent | 1c2aacb5d89a1da7bacbc0979d6a7754dfa2aea1 (diff) | |
qimageblitz: Mark stack as non-executable (patch taken from Gentoo)
This allows applications such as okular and kolourpaint to run in
grsecurity kernels, which disallow executable stacks by default.
Diffstat (limited to 'pkgs/development/libraries/qimageblitz')
| -rw-r--r-- | pkgs/development/libraries/qimageblitz/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 5800b562e6b0..1f820b33e811 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -7,14 +7,16 @@ in stdenv.mkDerivation { name = "${pn}-${v}"; - + src = fetchurl { url = "mirror://sourceforge/${pn}/${pn}-${v}.tar.bz2"; sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; }; - + buildInputs = [ cmake qt4 ]; + patches = [ ./qimageblitz-9999-exec-stack.patch ]; + meta = { description = "Graphical effect and filter library for KDE4"; license = "BSD"; diff --git a/pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch b/pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch new file mode 100644 index 000000000000..8692c240f7bb --- /dev/null +++ b/pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch @@ -0,0 +1,11 @@ +diff -uar qimageblitz/blitz/asm_scale.S qimageblitz~/blitz/asm_scale.S +--- qimageblitz-orig/blitz/asm_scale.S 2007-10-17 01:17:57.000000000 +0200 ++++ qimageblitz/blitz/asm_scale.S 2007-10-17 01:19:12.000000000 +0200 +@@ -814,3 +814,7 @@ + SIZE(qimageScale_mmx_AARGBA) + + #endif ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif ++ |