[arch-commits] Commit in apparmor/repos (3 files)

David Runge dvzrv at archlinux.org
Mon Mar 16 09:38:04 UTC 2020 

    Date: Monday, March 16, 2020 @ 09:38:03
  Author: dvzrv
Revision: 377773

archrelease: copy trunk to community-testing-x86_64

Added:
  apparmor/repos/community-testing-x86_64/
  apparmor/repos/community-testing-x86_64/PKGBUILD
    (from rev 377772, apparmor/trunk/PKGBUILD)
  apparmor/repos/community-testing-x86_64/apparmor-2.13.4-fix_make.patch
    (from rev 377772, apparmor/trunk/apparmor-2.13.4-fix_make.patch)

--------------------------------+
 PKGBUILD                       |  130 +++++++++++++++++++++++++++++++++++++++
 apparmor-2.13.4-fix_make.patch |   22 ++++++
 2 files changed, 152 insertions(+)

Copied: apparmor/repos/community-testing-x86_64/PKGBUILD (from rev 377772, apparmor/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2020-03-16 09:38:03 UTC (rev 377773)
@@ -0,0 +1,130 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+pkgname=apparmor
+pkgver=2.13.4
+pkgrel=2
+pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
+arch=('x86_64')
+url="https://gitlab.com/apparmor/apparmor"
+license=('GPL2' 'LGPL2.1')
+depends=('audit' 'pam' 'python')
+makedepends=('apache' 'ruby' 'swig')
+checkdepends=('dejagnu' 'perl-locale-gettext' 'python-pyflakes')
+optdepends=('perl: perl bindings'
+            'ruby: ruby bindings')
+provides=('libapparmor.so')
+backup=('etc/apparmor/easyprof.conf'
+        'etc/apparmor/logprof.conf'
+        'etc/apparmor/notify.conf'
+        'etc/apparmor/parser.conf'
+        'etc/apparmor/subdomain.conf'
+        'etc/apparmor/severity.db')
+source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        "${pkgname}-2.13.4-fix_make.patch")
+sha512sums=('d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651'
+            'SKIP'
+            '2591da638aabe37d5e32f0002e9b8a4304affe20174c23baab32802025b832a25fd688d58b58d26877dee40f1953c897cda6d4023e5013b4ca3b100ddd3aedd0')
+# AppArmor Development Team (AppArmor signing key) <apparmor at lists.ubuntu.com>
+validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
+_core_perl="/usr/bin/core_perl"
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  # fix problems in Makefile (header inclusion):
+  # https://gitlab.com/apparmor/apparmor/-/issues/74
+  patch -Np1 -i "../${pkgname}-2.13.4-fix_make.patch"
+
+  # fix PYTHONPATH and add LD_LIBRARY_PATH for aa-logprof based check:
+  # https://gitlab.com/apparmor/apparmor/issues/39
+  local _py3_ver=$(python --version | cut -d " " -f2)
+  local path="${PWD}/libraries/libapparmor/swig/python/build/lib.linux-${CARCH}-${_py3_ver%"."*}/LibAppArmor"
+  local libs="${PWD}/libraries/libapparmor/src/.libs"
+  sed -e "/PYTHONPATH/ s|utils\ |utils:$path\ LD_LIBRARY_PATH=$libs\ |" \
+      -i profiles/Makefile
+  (
+    cd libraries/libapparmor/
+    autoreconf -vfi
+  )
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  # export required perl executable locations
+  export MAKEFLAGS+=" POD2MAN=${_core_perl}/pod2man"
+  export MAKEFLAGS+=" POD2HTML=${_core_perl}/pod2html"
+  export MAKEFLAGS+=" PODCHECKER=${_core_perl}/podchecker"
+  export MAKEFLAGS+=" PROVE=${_core_perl}/prove"
+  (
+    cd "libraries/libapparmor/"
+    ./configure --prefix=/usr \
+                --sbindir=/usr/bin \
+                --with-perl \
+                --with-python \
+                --with-ruby
+    make
+  )
+  make -C binutils
+  make -C parser
+  make -C profiles
+  make -C utils
+  make -C changehat/pam_apparmor
+  make -C changehat/mod_apparmor
+  make -C utils/vim
+}
+
+check() {
+  cd "$pkgname-$pkgver"
+  echo "INFO: Running check: libraries/libapparmor"
+  make -C libraries/libapparmor check
+  echo "INFO: Running check binutils"
+  make -C binutils check
+  echo "INFO: Running check parser"
+  make -C parser check
+
+  # check-logprof (included in check) fails:
+  # https://gitlab.com/apparmor/apparmor/issues/36
+  # echo "INFO: Running check-logprof profiles"
+  # make -C profiles check-logprof
+
+  echo "INFO: Running check-parser profiles"
+  make -C profiles check-parser
+  echo "INFO: Running check utils"
+  make -C utils check
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make -C libraries/libapparmor DESTDIR="${pkgdir}" install
+  make -C changehat/pam_apparmor DESTDIR="${pkgdir}/usr" install
+  make -C changehat/mod_apparmor DESTDIR="${pkgdir}" install
+  make -C binutils DESTDIR="${pkgdir}" install
+  make -C parser -j1 DESTDIR="${pkgdir}" \
+                     SBINDIR="${pkgdir}/usr/bin" \
+                     USR_SBINDIR="${pkgdir}/usr/bin" \
+                     APPARMOR_BIN_PREFIX="${pkgdir}/usr/lib/apparmor" \
+                     install install-systemd
+  make -C profiles DESTDIR="${pkgdir}" install
+  make -C utils DESTDIR="${pkgdir}" \
+                BINDIR="${pkgdir}/usr/bin" \
+                VIM_INSTALL_PATH="${pkgdir}/usr/share/vim/vimfiles/syntax" \
+                install
+
+  # set file mode to allow the perl library to be stripped:
+  # https://gitlab.com/apparmor/apparmor/issues/34
+  find "${pkgdir}/usr/lib/perl5/" \
+    -type f -iname "*.so" \
+    -exec chmod 755 {} \;
+
+  # removing empty core_perl directory:
+  # https://gitlab.com/apparmor/apparmor/issues/40
+  rm -rv "${pkgdir}"/usr/lib/perl5/*/core_perl
+  # move ruby bindings to vendor_ruby:
+  # https://gitlab.com/apparmor/apparmor/issues/35
+  mv -v "${pkgdir}/usr/lib/ruby/site_ruby/" \
+    "${pkgdir}/usr/lib/ruby/vendor_ruby/"
+  # adding files below /etc/apparmor.d to backup array
+  cd "${pkgdir}"
+  # tricking extract_function_variable() in makepkg into not detecting the
+  # backup array modification and adding remaining configuration files
+  [[ /usr/bin/true ]] && backup=( ${backup[@]} $(find "etc/${pkgname}.d/" -type f) )
+}

Copied: apparmor/repos/community-testing-x86_64/apparmor-2.13.4-fix_make.patch (from rev 377772, apparmor/trunk/apparmor-2.13.4-fix_make.patch)
===================================================================
--- community-testing-x86_64/apparmor-2.13.4-fix_make.patch	                        (rev 0)
+++ community-testing-x86_64/apparmor-2.13.4-fix_make.patch	2020-03-16 09:38:03 UTC (rev 377773)
@@ -0,0 +1,22 @@
+diff --git a/common/Make.rules b/common/Make.rules
+index d2149fc..efb1f38 100644
+--- a/common/Make.rules
++++ b/common/Make.rules
+@@ -81,7 +81,7 @@ pod_clean:
+ # =====================
+ 
+ # emits defined capabilities in a simple list, e.g. "CAP_NAME CAP_NAME2"
+-CAPABILITIES=$(shell echo "\#include <linux/capability.h>" | cpp -dM | LC_ALL=C sed -n -e '/CAP_EMPTY_SET/d' -e 's/^\#define[ \t]\+CAP_\([A-Z0-9_]\+\)[ \t]\+\([0-9xa-f]\+\)\(.*\)$$/CAP_\1/p' | LC_ALL=C sort)
++CAPABILITIES=$(shell echo "#include <linux/capability.h>" | cpp -dM | LC_ALL=C sed -n -e '/CAP_EMPTY_SET/d' -e 's/^#define[ \t]\+CAP_\([A-Z0-9_]\+\)[ \t]\+\([0-9xa-f]\+\)\(.*\)$$/CAP_\1/p' | LC_ALL=C sort)
+ 
+ .PHONY: list_capabilities
+ list_capabilities: /usr/include/linux/capability.h
+@@ -102,7 +102,7 @@ FILTER_FAMILIES=PF_UNIX
+ __FILTER=$(shell echo $(strip $(FILTER_FAMILIES)) | sed -e 's/ /\\\|/g')
+ 
+ # emits the AF names in a "AF_NAME NUMBER," pattern
+-AF_NAMES=$(shell echo "\#include <sys/socket.h>" | cpp -dM | LC_ALL=C sed -n -e '/$(__FILTER)/d' -e 's/PF_LOCAL/PF_UNIX/' -e 's/^\#define[ \t]\+PF_\([A-Z0-9_]\+\)[ \t]\+\([0-9]\+\).*$$/AF_\1 \2,/p' | sort -n -k2)
++AF_NAMES=$(shell echo "#include <sys/socket.h>" | cpp -dM | LC_ALL=C sed -n -e '/$(__FILTER)/d' -e 's/PF_LOCAL/PF_UNIX/' -e 's/^#define[ \t]\+PF_\([A-Z0-9_]\+\)[ \t]\+\([0-9]\+\).*$$/AF_\1 \2,/p' | sort -n -k2)
+ 
+ .PHONY: list_af_names
+ list_af_names:

More information about the arch-commits mailing list