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

Revert "audit: 2.9.1 -> 2.9.2"

Browse Source 
This reverts commit 7e126ac83e.
This commit is contained in:
Eelco Dolstra 2015-06-01 21:35:08 +02:00
parent 5931932f05
commit 4c16c271f6
3 changed files with 16 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
pkgs/os-specific/linux/audit/default.nix
View File

@ -1,61 +1,29 @@
{ stdenv, fetchurl
, libcap_ng
# Optional Dependencies
, openldap ? null, python ? null, go ? null, krb5 ? null, tcp_wrappers ? null
# Extra arguments
, prefix ? ""
{ stdenv, fetchurl, openldap
, enablePython ? false, python ? null
}:
with stdenv;
let
libOnly = prefix == "lib";
assert enablePython -> python != null;
optOpenldap = if libOnly then null else shouldUsePkg openldap;
optPython = shouldUsePkg python;
optGo = shouldUsePkg go;
optKrb5 = if libOnly then null else shouldUsePkg krb5;
optTcp_wrappers = if libOnly then null else shouldUsePkg tcp_wrappers;
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "${prefix}audit-${version}";
version = "2.4.2";
name = "audit-2.4.1";
src = fetchurl {
url = "http://people.redhat.com/sgrubb/audit/audit-${version}.tar.gz";
sha256 = "08j134s4509rxfi3hwsp8yyxzlqqxl8kqgv2rfv6p3qng5pjd80j";
url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz";
sha256 = "09ihn392pmac1pyjrs22966csia83yr84hq5ri6sybwj1vx4d4q5";
};
buildInputs = [ libcap_ng optOpenldap optPython optGo optKrb5 optTcp_wrappers ];
buildInputs = [ openldap ]
++ stdenv.lib.optional enablePython python;
# For libs only build and install the lib portion
preBuild = optionalString libOnly ''
cd lib
configureFlags = ''
${if enablePython then "--with-python" else "--without-python"}
'';
configureFlags = [
(mkWith (optPython != null) "python" null)
(mkWith (optGo != null) "golang" null)
(mkEnable (!libOnly) "listener" null)
(mkEnable (optKrb5 != null) "gssapi-krb5" null)
(mkEnable false "systemd" null)
(mkWith false "debug" null)
(mkWith false "warn" null)
(mkWith false "alpha" null) # TODO: Support
(mkWith false "arm" null) # TODO: Support
(mkWith false "aarch64" null) # TODO: Support
(mkWith (!libOnly) "apparmor" null)
(mkWith false "prelude" null)
(mkWith (optTcp_wrappers != null) "libwrap" optTcp_wrappers)
];
meta = {
description = "Audit Library";
homepage = "http://people.redhat.com/sgrubb/audit/";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ fuuzetsu wkennington ];
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}

4
pkgs/os-specific/linux/libsemanage/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, libaudit }:
{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, audit }:
stdenv.mkDerivation rec {
name = "libsemanage-${version}";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-fstack-protector-all";
NIX_CFLAGS_LINK = "-lsepol";
buildInputs = [ libsepol libselinux ustr bzip2 bison flex libaudit ];
buildInputs = [ libsepol libselinux ustr bzip2 bison flex audit ];
meta = with stdenv.lib; {
inherit (libsepol.meta) homepage platforms maintainers;

8
pkgs/top-level/all-packages.nix
View File

@ -9190,13 +9190,7 @@ let
atop = callPackage ../os-specific/linux/atop { };
audit = callPackage ../os-specific/linux/audit {
python = null;
go = null;
};
libaudit = audit.override {
prefix = "lib";
};
audit = callPackage ../os-specific/linux/audit { };
b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { };