Date: Wednesday, June 5, 2019 @ 10:45:15
  Author: dvzrv
Revision: 476965

archrelease: copy trunk to community-staging-x86_64

Added:
  apparmor/repos/community-staging-x86_64/PKGBUILD
    (from rev 476964, apparmor/trunk/PKGBUILD)
Deleted:
  apparmor/repos/community-staging-x86_64/PKGBUILD

----------+
 PKGBUILD |  228 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 115 insertions(+), 113 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2019-06-05 10:45:10 UTC (rev 476964)
+++ PKGBUILD    2019-06-05 10:45:15 UTC (rev 476965)
@@ -1,113 +0,0 @@
-# Maintainer: David Runge <d...@sleepmap.de>
-pkgname=apparmor
-pkgver=2.13.2
-pkgrel=3
-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' 'python-pyflakes')
-optdepends=('perl: perl bindings'
-            'ruby: ruby bindings')
-provides=('libapparmor')
-replaces=('apparmor-libapparmor' 'apparmor-pam' 'apparmor-parser'
-'apparmor-profiles' 'apparmor-utils' 'apparmor-vim')
-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})
-sha512sums=('2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f'
-            'SKIP')
-# AppArmor Development Team (AppArmor signing key) <appar...@lists.ubuntu.com>
-validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
-_core_perl="/usr/bin/core_perl"
-
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  # fix PYTHONPATH for aa-logprof based check
-  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
-  # remove test-aa.py (utils check), producing too many fails
-  rm -v utils/test/test-aa.py
-  # fix bin directory for parser install target
-  # fix lib dir location
-  sed -e 's|/usr/sbin|/usr/bin|g' \
-      -e 's|/sbin|/usr/bin|g' \
-      -e 's/\}\/lib\/apparmor/\}\/usr\/lib\/apparmor/' \
-      -i parser/Makefile
-  # fix default installation path for vim syntax file
-  sed -e 's/share\/apparmor/share\/vim\/vimfiles\/syntax/' \
-      -i utils/vim/Makefile
-  cd libraries/libapparmor/
-  autoreconf -vfi
-}
-
-build() {
-  # 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 "${pkgname}-${pkgver}/libraries/libapparmor/"
-  ./configure --prefix=/usr \
-              --sbindir=/usr/bin \
-              --with-perl \
-              --with-python \
-              --with-ruby
-  make
-  cd ../..
-  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"
-# failing python checks:
-# https://gitlab.com/apparmor/apparmor/issues/33
-#  make -C libraries/libapparmor check
-  make -C binutils check
-# parser checks don't run on non-apparmor enabled kernel
-#  make -C parser check
-# profiles check need to be run on a system with aa installed?
-#  make -C profiles check
-  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 DESTDIR="${pkgdir}" install
-  make -C parser DESTDIR="${pkgdir}" install-systemd
-  make -C profiles DESTDIR="${pkgdir}" install
-  make -C utils DESTDIR="${pkgdir}" BINDIR="${pkgdir}/usr/bin" install
-  # strip perl library
-  find "${pkgdir}/usr/lib/perl5/" \
-    -type f -iname "*.so" \
-    -exec strip --strip-unneeded {} \;
-  # removing empty core_perl directory
-  rm -rv "${pkgdir}"/usr/lib/perl5/*/core_perl
-  # move ruby bindings to vendor_ruby
-  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
-  [[ /usr/bin/true ]] && backup=( ${backup[@]} $(find "etc/${pkgname}.d/" 
-type f) )
-}

Copied: apparmor/repos/community-staging-x86_64/PKGBUILD (from rev 476964, 
apparmor/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2019-06-05 10:45:15 UTC (rev 476965)
@@ -0,0 +1,115 @@
+# Maintainer: David Runge <d...@sleepmap.de>
+pkgname=apparmor
+pkgver=2.13.2
+pkgrel=4
+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' 'python-pyflakes')
+optdepends=('perl: perl bindings'
+            'ruby: ruby bindings')
+provides=('libapparmor')
+replaces=('apparmor-libapparmor' 'apparmor-pam' 'apparmor-parser'
+'apparmor-profiles' 'apparmor-utils' 'apparmor-vim')
+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.2-swig4.patch::https://gitlab.com/apparmor/apparmor/merge_requests/384.patch";)
+sha512sums=('2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f'
+            'SKIP'
+            
'd80dfb222b43a6b347cb952ec7672e3bc24d144a8678fab737520823ff84c45d6a4bd997416c5f67679fdf58172843003dd0c8dbed0f30646a6937922683d9ff')
+# AppArmor Development Team (AppArmor signing key) <appar...@lists.ubuntu.com>
+validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
+_core_perl="/usr/bin/core_perl"
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  # fix PYTHONPATH for aa-logprof based check
+  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
+  # remove test-aa.py (utils check), producing too many fails
+  rm -v utils/test/test-aa.py
+  # fix bin directory for parser install target
+  # fix lib dir location
+  sed -e 's|/usr/sbin|/usr/bin|g' \
+      -e 's|/sbin|/usr/bin|g' \
+      -e 's/\}\/lib\/apparmor/\}\/usr\/lib\/apparmor/' \
+      -i parser/Makefile
+  # fix default installation path for vim syntax file
+  sed -e 's/share\/apparmor/share\/vim\/vimfiles\/syntax/' \
+      -i utils/vim/Makefile
+  # fix issue with swig >= 4.0.0: 
https://gitlab.com/apparmor/apparmor/issues/33
+  patch -Np1 -i "../${pkgname}-2.13.2-swig4.patch"
+  cd libraries/libapparmor/
+  autoreconf -vfi
+}
+
+build() {
+  # 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 "${pkgname}-${pkgver}/libraries/libapparmor/"
+  ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
+              --with-perl \
+              --with-python \
+              --with-ruby
+  make
+  cd ../..
+  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"
+  make -C libraries/libapparmor check
+  make -C binutils check
+# parser checks don't run on non-apparmor enabled kernel
+#  make -C parser check
+# profiles check need to be run on a system with aa installed?
+#  make -C profiles check
+  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 DESTDIR="${pkgdir}" install
+  make -C parser DESTDIR="${pkgdir}" install-systemd
+  make -C profiles DESTDIR="${pkgdir}" install
+  make -C utils DESTDIR="${pkgdir}" BINDIR="${pkgdir}/usr/bin" install
+  # strip perl library
+  find "${pkgdir}/usr/lib/perl5/" \
+    -type f -iname "*.so" \
+    -exec strip --strip-unneeded {} \;
+  # removing empty core_perl directory
+  rm -rv "${pkgdir}"/usr/lib/perl5/*/core_perl
+  # move ruby bindings to vendor_ruby
+  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
+  [[ /usr/bin/true ]] && backup=( ${backup[@]} $(find "etc/${pkgname}.d/" 
-type f) )
+}

Reply via email to