Unverified Commit 65f179f9 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

apparmor: 4.0.3 -> 4.1.0, rewrite (#400430)

parents fe0a31ef 5467162f

maintainers/team-list.nix

+10 −0
Original line number Diff line number Diff line
@@ -68,6 +68,16 @@ with lib.maintainers; 
    ];

  };



  apparmor = {

    scope = "AppArmor-related modules, userspace tool packages and profiles";

    shortName = "apparmor";

    members = [

      julm

      thoughtpolice

      grimmauld

    ];

  };



  bazel = {

    members = [

      mboes

nixos/modules/security/apparmor.nix

+2 −5
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ in 
              logfiles = /dev/stdin



              parser = ${pkgs.apparmor-parser}/bin/apparmor_parser

              ldd = ${pkgs.glibc.bin}/bin/ldd

              ldd = ${lib.getExe' pkgs.stdenv.cc.libc "ldd"}

              logger = ${pkgs.util-linux}/bin/logger



              # customize how file ownership permissions are presented
@@ -275,8 +275,5 @@ in 
    };

  };



  meta.maintainers = with lib.maintainers; [

    julm

    grimmauld

  ];

  meta.maintainers = lib.teams.apparmor.members;

}

pkgs/by-name/ap/apparmor-bin-utils/package.nix

0 → 100644
+53 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  pkg-config,

  which,

  buildPackages,



  # apparmor deps

  libapparmor,



  # testing

  perl,

}:

stdenv.mkDerivation {

  pname = "apparmor-bin-utils";

  inherit (libapparmor)

    version

    src

    ;



  sourceRoot = "${libapparmor.src.name}/binutils";



  nativeBuildInputs = [

    pkg-config

    libapparmor

    which

  ];



  buildInputs = [

    libapparmor

  ];



  makeFlags = [

    "LANGS="

    "USE_SYSTEM=1"

    "POD2MAN=${lib.getExe' buildPackages.perl "pod2man"}"

    "POD2HTML=${lib.getExe' buildPackages.perl "pod2html"}"

    "MANDIR=share/man"

  ];



  doCheck = true;

  checkInputs = [ perl ];



  installFlags = [

    "DESTDIR=$(out)"

    "BINDIR=$(out)/bin"

    "SBINDIR=$(out)/bin"

  ];



  meta = libapparmor.meta // {

    description = "Mandatory access control system - binary user-land utilities";

  };

}

pkgs/by-name/ap/apparmor-pam/package.nix

0 → 100644
+40 −0
Original line number Diff line number Diff line 
{

  stdenv,

  pkg-config,

  which,

  pam,



  # apparmor deps

  libapparmor,

}:

stdenv.mkDerivation {

  pname = "apparmor-pam";

  inherit (libapparmor)

    version

    src

    ;



  postPatch = ''

    substituteInPlace Makefile \

      --replace-fail "pkg-config" "$PKG_CONFIG"

  '';



  nativeBuildInputs = [

    pkg-config

    which

  ];



  buildInputs = [

    libapparmor

    pam

  ];



  sourceRoot = "${libapparmor.src.name}/changehat/pam_apparmor";



  makeFlags = [ "USE_SYSTEM=1" ];

  installFlags = [ "DESTDIR=$(out)" ];



  meta = libapparmor.meta // {

    description = "Mandatory access control system - PAM service";

  };

}