diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-14 17:55:12 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-14 17:59:00 +0200 |
| commit | a4e1c7df08c8624bbdede78df19db63faa6f56e3 (patch) | |
| tree | 547df2e90766f4e6bb1862bf4142f4c66af72606 /pkgs/os-specific/linux/setools | |
| parent | 0431a7112dfbffae54265f26a16aa5db7e6f914c (diff) | |
| download | nixpkgs-a4e1c7df08c8624bbdede78df19db63faa6f56e3.tar nixpkgs-a4e1c7df08c8624bbdede78df19db63faa6f56e3.tar.gz nixpkgs-a4e1c7df08c8624bbdede78df19db63faa6f56e3.tar.bz2 nixpkgs-a4e1c7df08c8624bbdede78df19db63faa6f56e3.tar.lz nixpkgs-a4e1c7df08c8624bbdede78df19db63faa6f56e3.tar.xz nixpkgs-a4e1c7df08c8624bbdede78df19db63faa6f56e3.tar.zst nixpkgs-a4e1c7df08c8624bbdede78df19db63faa6f56e3.zip | |
selinux: update to 2014-05-06
Sadly, policycoreutils still fails on i686-linux.
Diffstat (limited to 'pkgs/os-specific/linux/setools')
| -rw-r--r-- | pkgs/os-specific/linux/setools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/setools/ftbfs-invalid-operands-of-types.patch | 15 |
2 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index cc1363156dd..63a43b2b5e9 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, bison, flex +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, bison, flex , python, swig2, tcl, libsepol, libselinux, libxml2, sqlite, bzip2 }: stdenv.mkDerivation rec { @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "16g987ijaxabc30zyjzia4nafq49rm038y1pm4vca7i3kb67wf24"; }; + patches = [ ./ftbfs-invalid-operands-of-types.patch ]; + # SWIG-TCL is broken in 3.3.8 configureFlags = '' --with-tcl=${tcl}/lib diff --git a/pkgs/os-specific/linux/setools/ftbfs-invalid-operands-of-types.patch b/pkgs/os-specific/linux/setools/ftbfs-invalid-operands-of-types.patch new file mode 100644 index 00000000000..97a5727f05b --- /dev/null +++ b/pkgs/os-specific/linux/setools/ftbfs-invalid-operands-of-types.patch @@ -0,0 +1,15 @@ +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750331 + +Index: setools-git/secmds/replcon.cc +=================================================================== +--- setools-git.orig/secmds/replcon.cc ++++ setools-git/secmds/replcon.cc +@@ -60,7 +60,7 @@ static struct option const longopts[] = + {NULL, 0, NULL, 0} + }; + +-extern int lsetfilecon_raw(const char *, security_context_t) __attribute__ ((weak)); ++extern int lsetfilecon_raw(const char *, const char *) __attribute__ ((weak)); + + /** + * As that setools must work with older libselinux versions that may |