diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-31 15:14:58 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-31 17:11:11 -0700 |
| commit | 3ada013455862eeea16a224a140be20aa7e6dbcd (patch) | |
| tree | 67142d2750444c17e35c41e47939e9d4ec14aa16 /pkgs/os-specific/linux/setools | |
| parent | b7389a2d1ae56ce19b9dfaf556f183e46d7fc5ae (diff) | |
| download | nixpkgs-3ada013455862eeea16a224a140be20aa7e6dbcd.tar nixpkgs-3ada013455862eeea16a224a140be20aa7e6dbcd.tar.gz nixpkgs-3ada013455862eeea16a224a140be20aa7e6dbcd.tar.bz2 nixpkgs-3ada013455862eeea16a224a140be20aa7e6dbcd.tar.lz nixpkgs-3ada013455862eeea16a224a140be20aa7e6dbcd.tar.xz nixpkgs-3ada013455862eeea16a224a140be20aa7e6dbcd.tar.zst nixpkgs-3ada013455862eeea16a224a140be20aa7e6dbcd.zip | |
setools: 3.3.8 -> 2015-02-12
Diffstat (limited to 'pkgs/os-specific/linux/setools')
| -rw-r--r-- | pkgs/os-specific/linux/setools/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/setools/ftbfs-invalid-operands-of-types.patch | 15 |
2 files changed, 17 insertions, 32 deletions
diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 63a43b2b5e9..bb17683800f 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -1,28 +1,28 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, bison, flex +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, bison, flex , python, swig2, tcl, libsepol, libselinux, libxml2, sqlite, bzip2 }: stdenv.mkDerivation rec { - name = "setools-3.3.8"; + name = "setools-2015-02-12"; - src = fetchurl { - url = "http://oss.tresys.com/projects/setools/chrome/site/dists/${name}/${name}.tar.bz2"; - sha256 = "16g987ijaxabc30zyjzia4nafq49rm038y1pm4vca7i3kb67wf24"; + src = fetchFromGitHub { + owner = "TresysTechnology"; + repo = "setools3"; + rev = "f1e5b208d507171968ca4d2eeefd7980f1004a3c"; + sha256 = "02gzy2kpszhr13f0d9qfiwh2hj4201g2x366j53v5n5qz481aykd"; }; - patches = [ ./ftbfs-invalid-operands-of-types.patch ]; + configureFlags = [ + "--disable-gui" + "--with-sepol-devel=${libsepol}" + "--with-selinux-devel=${libselinux}" + "--with-tcl=${tcl}/lib" + ]; - # SWIG-TCL is broken in 3.3.8 - configureFlags = '' - --with-tcl=${tcl}/lib - --with-sepol-devel=${libsepol} - --with-selinux-devel=${libselinux} - --disable-gui - --disable-swig-tcl - ''; + NIX_CFLAGS_COMPILE = "-fstack-protector-all"; + NIX_LDFLAGS = "-L${libsepol}/lib -L${libselinux}/lib"; - buildInputs = [ autoreconfHook pkgconfig bison flex python swig2 ]; - - nativeBuildInputs = [ tcl libsepol libselinux libxml2 sqlite bzip2 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig python swig2 bison flex ]; + buildInputs = [ tcl libxml2 sqlite bzip2 ]; meta = { description = "SELinux Tools"; 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 deleted file mode 100644 index 97a5727f05b..00000000000 --- a/pkgs/os-specific/linux/setools/ftbfs-invalid-operands-of-types.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 |