[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2020-10-03 Thread David Runge via arch-commits 
Date: Saturday, October 3, 2020 @ 07:59:02
  Author: dvzrv
Revision: 397191

upgpkg: apparmor 3.0.0-2: Rebuild to install all binaries to correct location 
(FS#68082).

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-02 22:48:36 UTC (rev 397190)
+++ PKGBUILD2020-10-03 07:59:02 UTC (rev 397191)
@@ -2,7 +2,7 @@
 
 pkgname=apparmor
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -102,7 +102,10 @@
   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 binutils DESTDIR="${pkgdir}" \
+   SBINDIR="${pkgdir}/usr/bin" \
+   USR_SBINDIR="${pkgdir}/usr/bin" \
+   install
   make -C parser -j1 DESTDIR="${pkgdir}" \
  SBINDIR="${pkgdir}/usr/bin" \
  USR_SBINDIR="${pkgdir}/usr/bin" \
@@ -110,6 +113,8 @@
  install install-systemd
   make -C profiles DESTDIR="${pkgdir}" install
   make -C utils DESTDIR="${pkgdir}" \
+SBINDIR="${pkgdir}/usr/bin" \
+USR_SBINDIR="${pkgdir}/usr/bin" \
 BINDIR="${pkgdir}/usr/bin" \
 VIM_INSTALL_PATH="${pkgdir}/usr/share/vim/vimfiles/syntax" \
 install

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2020-06-21 Thread Felix Yan via arch-commits 
Date: Sunday, June 21, 2020 @ 16:23:19
  Author: felixonmars
Revision: 389917

upgpkg: apparmor 2.13.4-6: Perl 5.32 rebuild

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-21 16:22:58 UTC (rev 389916)
+++ PKGBUILD2020-06-21 16:23:19 UTC (rev 389917)
@@ -2,7 +2,7 @@
 
 pkgname=apparmor
 pkgver=2.13.4
-pkgrel=5
+pkgrel=6
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2020-04-23 Thread David Runge via arch-commits 
Date: Thursday, April 23, 2020 @ 18:24:02
  Author: dvzrv
Revision: 381217

upgpkg: apparmor 2.13.4-4: Adding upstream fix for generation of vim files 
(FS#65450).

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-23 17:56:19 UTC (rev 381216)
+++ PKGBUILD2020-04-23 18:24:02 UTC (rev 381217)
@@ -2,7 +2,7 @@
 
 pkgname=apparmor
 pkgver=2.13.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -21,11 +21,13 @@
 'etc/apparmor/severity.db')
 
source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc}
 
"${pkgname}-2.13.4-make4.3.patch::https://gitlab.com/apparmor/apparmor/-/merge_requests/465.patch";
+
"${pkgname}-2.13.4-vim_file.patch::https://gitlab.com/apparmor/apparmor/-/merge_requests/472.patch";
 
"${pkgname}-2.13.4-run_variable.patch::https://gitlab.com/apparmor/apparmor/-/commit/454fca7483eae7b7ee613343c2c02abaa20e37e3.patch";
 
"${pkgname}-2.13.4-fix_systemd_userdb.patch::https://gitlab.com/apparmor/apparmor/-/commit/d4296d217c888e08e10bec300fe35351c2ef2f81.patch";)
 
sha512sums=('d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651'
 'SKIP'
 
'8d0eb65624a7dcc7f019974a7ad10ec0b3e2d61e51a3f9771564b4e0ddaaece17e90f78388933e8f9451ad413a51dd16d479b99733ceef73b86eb8308122a335'
+
'987d2d0dd1148c28796cbb933ea79a14ef2bdf903253a10f369614f0cbbd0309c9848e28dd2f2aa216d8deaf8412e6dd043e867da34466fe39169fc0e44f07ad'
 
'0abe606ad510cc97947152b28750354bd43046b38abcd6b28bbc04916fad39308f78b3626ca8b4a3ec59612fea908bdef2e309376f617595b5fc1aaec2bc6343'
 
'0fde84730115b2854b85d1b72fbbd5c54730e887af333bfff917da529a08a429d3494efdae9d1baa1d05891d925b04d69f079d11d4afb0907cbfefbd0f280583')
 # AppArmor Development Team (AppArmor signing key) 
@@ -37,6 +39,9 @@
   # fix problems in Makefile (header inclusion):
   # https://gitlab.com/apparmor/apparmor/-/issues/74
   patch -Np1 -i "../${pkgname}-2.13.4-make4.3.patch"
+  # fix generating of apparmor.vim:
+  # https://bugs.archlinux.org/task/65450
+  patch -Np1 -i "../${pkgname}-2.13.4-vim_file.patch"
   # fix problems with /run/systemd/userdb access
   # https://bugs.archlinux.org/task/65777
   # https://gitlab.com/apparmor/apparmor/-/issues/82

[arch-commits] Commit in apparmor/trunk (PKGBUILD apparmor-2.13.4-fix_make.patch)

2020-04-23 Thread David Runge via arch-commits 
Date: Thursday, April 23, 2020 @ 17:30:10
  Author: dvzrv
Revision: 381213

upgpkg: apparmor 2.13.4-3: Adding upstream fix for make >= 4.3 (instead of 
local). Adding upstream fixes for systemd userdb (FS#65777).

Modified:
  apparmor/trunk/PKGBUILD
Deleted:
  apparmor/trunk/apparmor-2.13.4-fix_make.patch

+
 PKGBUILD   |   18 +-
 apparmor-2.13.4-fix_make.patch |   22 --
 2 files changed, 13 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-23 17:09:33 UTC (rev 381212)
+++ PKGBUILD2020-04-23 17:30:10 UTC (rev 381213)
@@ -2,7 +2,7 @@
 
 pkgname=apparmor
 pkgver=2.13.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -20,10 +20,14 @@
 '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")
+
"${pkgname}-2.13.4-make4.3.patch::https://gitlab.com/apparmor/apparmor/-/merge_requests/465.patch";
+
"${pkgname}-2.13.4-run_variable.patch::https://gitlab.com/apparmor/apparmor/-/commit/454fca7483eae7b7ee613343c2c02abaa20e37e3.patch";
+
"${pkgname}-2.13.4-fix_systemd_userdb.patch::https://gitlab.com/apparmor/apparmor/-/commit/d4296d217c888e08e10bec300fe35351c2ef2f81.patch";)
 
sha512sums=('d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651'
 'SKIP'
-
'2591da638aabe37d5e32f0002e9b8a4304affe20174c23baab32802025b832a25fd688d58b58d26877dee40f1953c897cda6d4023e5013b4ca3b100ddd3aedd0')
+
'8d0eb65624a7dcc7f019974a7ad10ec0b3e2d61e51a3f9771564b4e0ddaaece17e90f78388933e8f9451ad413a51dd16d479b99733ceef73b86eb8308122a335'
+
'0abe606ad510cc97947152b28750354bd43046b38abcd6b28bbc04916fad39308f78b3626ca8b4a3ec59612fea908bdef2e309376f617595b5fc1aaec2bc6343'
+
'0fde84730115b2854b85d1b72fbbd5c54730e887af333bfff917da529a08a429d3494efdae9d1baa1d05891d925b04d69f079d11d4afb0907cbfefbd0f280583')
 # AppArmor Development Team (AppArmor signing key) 
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
@@ -32,8 +36,12 @@
   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"
-
+  patch -Np1 -i "../${pkgname}-2.13.4-make4.3.patch"
+  # fix problems with /run/systemd/userdb access
+  # https://bugs.archlinux.org/task/65777
+  # https://gitlab.com/apparmor/apparmor/-/issues/82
+  patch -Np1 -i "../${pkgname}-2.13.4-run_variable.patch"
+  patch -Np1 -i "../${pkgname}-2.13.4-fix_systemd_userdb.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)

Deleted: apparmor-2.13.4-fix_make.patch
===
--- apparmor-2.13.4-fix_make.patch  2020-04-23 17:09:33 UTC (rev 381212)
+++ apparmor-2.13.4-fix_make.patch  2020-04-23 17:30:10 UTC (rev 381213)
@@ -1,22 +0,0 @@
-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 " | 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 " | 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 " | 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 " | 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:

[arch-commits] Commit in apparmor/trunk (PKGBUILD apparmor-2.13.4-fix_make.patch)

2020-03-16 Thread David Runge via arch-commits 
Date: Monday, March 16, 2020 @ 09:37:10
  Author: dvzrv
Revision: 32

upgpkg: apparmor 2.13.4-2: Adding fix for FS#65847, which also allows most of 
the tests to pass again.

Added:
  apparmor/trunk/apparmor-2.13.4-fix_make.patch
Modified:
  apparmor/trunk/PKGBUILD

+
 PKGBUILD   |   34 +++---
 apparmor-2.13.4-fix_make.patch |   22 ++
 2 files changed, 37 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-16 09:23:20 UTC (rev 31)
+++ PKGBUILD2020-03-16 09:37:10 UTC (rev 32)
@@ -2,7 +2,7 @@
 
 pkgname=apparmor
 pkgver=2.13.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -19,9 +19,11 @@
 '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})
+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')
+'SKIP'
+
'2591da638aabe37d5e32f0002e9b8a4304affe20174c23baab32802025b832a25fd688d58b58d26877dee40f1953c897cda6d4023e5013b4ca3b100ddd3aedd0')
 # AppArmor Development Team (AppArmor signing key) 
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
@@ -28,6 +30,10 @@
 
 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)
@@ -72,28 +78,18 @@
   make -C libraries/libapparmor check
   echo "INFO: Running check binutils"
   make -C binutils check
+  echo "INFO: Running check parser"
+  make -C parser check
 
-  # disabling parser check as it's broken:
-  # https://gitlab.com/apparmor/apparmor/-/issues/84
-  #  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
 
-  # disabling profiles check-parser as it's broken:
-  # https://gitlab.com/apparmor/apparmor/-/issues/85
-  # echo "INFO: Running check-parser profiles"
-  # make -C profiles check-parser
-
-  # shutil.copytree has a regression
-  # https://gitlab.com/apparmor/apparmor/issues/62
-  # more breakage with apparmor > 2.13.4
-  # https://gitlab.com/apparmor/apparmor/-/issues/86
-  # echo "INFO: Running check utils"
-  # make -C utils check
+  echo "INFO: Running check-parser profiles"
+  make -C profiles check-parser
+  echo "INFO: Running check utils"
+  make -C utils check
 }
 
 package() {

Added: apparmor-2.13.4-fix_make.patch
===
--- apparmor-2.13.4-fix_make.patch  (rev 0)
+++ apparmor-2.13.4-fix_make.patch  2020-03-16 09:37:10 UTC (rev 32)
@@ -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 " | 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 " | 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 " | 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 " | 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:

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2020-03-15 Thread David Runge via arch-commits 
Date: Sunday, March 15, 2020 @ 16:54:58
  Author: dvzrv
Revision: 377642

upgpkg: apparmor 2.13.4-1: Upgrading to 2.13.4. Removing unrequired fixes and 
adding a boatload of tickets upstream, as the working test suites are now down 
to two. :(
The stripping of the perl library is also achieved by chmodding the library 
properly. Further playing the SBINDIR USR_SBINDIR game to get executables to 
where they belong.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |   48 
 1 file changed, 32 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-15 13:50:14 UTC (rev 377641)
+++ PKGBUILD2020-03-15 16:54:58 UTC (rev 377642)
@@ -1,7 +1,8 @@
 # Maintainer: David Runge 
+
 pkgname=apparmor
-pkgver=2.13.3
-pkgrel=4
+pkgver=2.13.4
+pkgrel=1
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -19,7 +20,7 @@
 'etc/apparmor/subdomain.conf'
 'etc/apparmor/severity.db')
 
source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc})
-sha512sums=('137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141'
+sha512sums=('d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651'
 'SKIP')
 # AppArmor Development Team (AppArmor signing key) 
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
@@ -34,13 +35,6 @@
   local libs="${PWD}/libraries/libapparmor/src/.libs"
   sed -e "/PYTHONPATH/ s|utils\ |utils:$path\ LD_LIBRARY_PATH=$libs\ |" \
   -i profiles/Makefile
-  # fix hardcoded install paths: https://gitlab.com/apparmor/apparmor/issues/38
-  sed -e 's|/usr/sbin|/usr/bin|g' \
-  -e 's|/sbin|/usr/bin|g' \
-  -i parser/Makefile
-  # fixing failing autoconf check by removing it
-  sed -e '158,198d' \
-  -i libraries/libapparmor/m4/ac_python_devel.m4
   (
 cd libraries/libapparmor/
 autoreconf -vfi
@@ -74,15 +68,32 @@
 
 check() {
   cd "$pkgname-$pkgver"
+  echo "INFO: Running check: libraries/libapparmor"
   make -C libraries/libapparmor check
+  echo "INFO: Running check binutils"
   make -C binutils check
-  make -C parser check
-  # only running check-parser, as check-logprof (included in check) fails:
+
+  # disabling parser check as it's broken:
+  # https://gitlab.com/apparmor/apparmor/-/issues/84
+  #  echo "INFO: Running check parser"
+  #  make -C parser check
+
+  # check-logprof (included in check) fails:
   # https://gitlab.com/apparmor/apparmor/issues/36
-  make -C profiles check-parser
+  # echo "INFO: Running check-logprof profiles"
+  # make -C profiles check-logprof
+
+  # disabling profiles check-parser as it's broken:
+  # https://gitlab.com/apparmor/apparmor/-/issues/85
+  # echo "INFO: Running check-parser profiles"
+  # make -C profiles check-parser
+
   # shutil.copytree has a regression
   # https://gitlab.com/apparmor/apparmor/issues/62
-  #  make -C utils check
+  # more breakage with apparmor > 2.13.4
+  # https://gitlab.com/apparmor/apparmor/-/issues/86
+  # echo "INFO: Running check utils"
+  # make -C utils check
 }
 
 package() {
@@ -92,6 +103,8 @@
   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
@@ -99,10 +112,13 @@
 BINDIR="${pkgdir}/usr/bin" \
 VIM_INSTALL_PATH="${pkgdir}/usr/share/vim/vimfiles/syntax" \
 install
-  # strip perl library: https://gitlab.com/apparmor/apparmor/issues/34
+
+  # 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 strip --strip-unneeded {} \;
+-exec chmod 755 {} \;
+
   # removing empty core_perl directory:
   # https://gitlab.com/apparmor/apparmor/issues/40
   rm -rv "${pkgdir}"/usr/lib/perl5/*/core_perl

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2019-12-25 Thread Felix Yan via arch-commits 
Date: Thursday, December 26, 2019 @ 01:17:52
  Author: felixonmars
Revision: 372290

Ruby 2.7.0 rebuild

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-12-26 01:05:38 UTC (rev 372289)
+++ PKGBUILD2019-12-26 01:17:52 UTC (rev 372290)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2019-11-05 Thread David Runge via arch-commits 
Date: Tuesday, November 5, 2019 @ 12:31:43
  Author: dvzrv
Revision: 366795

upgpkg: apparmor 2.13.3-3

Rebuilding against python3.8. Making sure the install target for the parser 
component is only run on one core, as it runs into concurrency problems 
somewhere above 8 cores.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-05 11:51:10 UTC (rev 366794)
+++ PKGBUILD2019-11-05 12:31:43 UTC (rev 366795)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -91,9 +91,9 @@
   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}" \
- APPARMOR_BIN_PREFIX="${pkgdir}/usr/lib/apparmor" \
- install install-systemd
+  make -C parser -j1 DESTDIR="${pkgdir}" \
+ 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" \

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2019-11-04 Thread David Runge via arch-commits 
Date: Monday, November 4, 2019 @ 22:45:12
  Author: dvzrv
Revision: 366774

Removing leftover checksum from an unused patch file.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-04 22:23:37 UTC (rev 366773)
+++ PKGBUILD2019-11-04 22:45:12 UTC (rev 366774)
@@ -20,8 +20,7 @@
 'etc/apparmor/severity.db')
 
source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc})
 
sha512sums=('137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141'
-'SKIP'
-
'3bd52b900b360278523aad36945aa84dd5ab1a486b8288979e4e781901c742f50ab3926cb92ceacb0964ee0a17a58808fea2afb308b17889a109976592215f82')
+'SKIP')
 # AppArmor Development Team (AppArmor signing key) 
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2019-11-04 Thread David Runge via arch-commits 
Date: Monday, November 4, 2019 @ 22:23:37
  Author: dvzrv
Revision: 366773

Updating maintainer info. Fixing issues with autoconf not detecting the python 
library correctly and disabling check, that triggers a shutil.copytree 
regression (for now).

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-04 22:00:17 UTC (rev 366772)
+++ PKGBUILD2019-11-04 22:23:37 UTC (rev 366773)
@@ -1,4 +1,4 @@
-# Maintainer: David Runge 
+# Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.3
 pkgrel=2
@@ -20,7 +20,8 @@
 'etc/apparmor/severity.db')
 
source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc})
 
sha512sums=('137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141'
-'SKIP')
+'SKIP'
+
'3bd52b900b360278523aad36945aa84dd5ab1a486b8288979e4e781901c742f50ab3926cb92ceacb0964ee0a17a58808fea2afb308b17889a109976592215f82')
 # AppArmor Development Team (AppArmor signing key) 
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
@@ -38,6 +39,9 @@
   sed -e 's|/usr/sbin|/usr/bin|g' \
   -e 's|/sbin|/usr/bin|g' \
   -i parser/Makefile
+  # fixing failing autoconf check by removing it
+  sed -e '158,198d' \
+  -i libraries/libapparmor/m4/ac_python_devel.m4
   (
 cd libraries/libapparmor/
 autoreconf -vfi
@@ -77,7 +81,9 @@
   # only running check-parser, as check-logprof (included in check) fails:
   # https://gitlab.com/apparmor/apparmor/issues/36
   make -C profiles check-parser
-  make -C utils check
+  # shutil.copytree has a regression
+  # https://gitlab.com/apparmor/apparmor/issues/62
+  #  make -C utils check
 }
 
 package() {

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2019-06-19 Thread David Runge via arch-commits 
Date: Wednesday, June 19, 2019 @ 21:56:20
  Author: dvzrv
Revision: 482434

upgpkg: apparmor 2.13.3-2

Removing the empty core_perl directory in package() and opening a ticket 
upstream about it.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-19 21:16:37 UTC (rev 482433)
+++ PKGBUILD2019-06-19 21:56:20 UTC (rev 482434)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -98,6 +98,9 @@
   find "${pkgdir}/usr/lib/perl5/" \
 -type f -iname "*.so" \
 -exec strip --strip-unneeded {} \;
+  # 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/" \

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2019-06-19 Thread David Runge via arch-commits 
Date: Wednesday, June 19, 2019 @ 21:16:29
  Author: dvzrv
Revision: 482432

upgpkg: apparmor 2.13.3-1

Upgrading to 2.13.3. Removing patch for swig >= 4.0 compatibility (it's 
included now). Switching provides to more explicit libapparmor.so.
Removing unneeded replaces entries. Opening bug reports with upstream for all 
outstanding hacks during prepare() and package().
Simplifying a few sed calls for readibility or by overriding parameters to 
make. Using subshells to not cd so often. Activating all possible tests in 
check().

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |   83 -
 1 file changed, 39 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-19 19:31:49 UTC (rev 482431)
+++ PKGBUILD2019-06-19 21:16:29 UTC (rev 482432)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
-pkgver=2.13.2
-pkgrel=4
+pkgver=2.13.3
+pkgrel=1
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -8,12 +8,10 @@
 license=('GPL2' 'LGPL2.1')
 depends=('audit' 'pam' 'python')
 makedepends=('apache' 'ruby' 'swig')
-checkdepends=('dejagnu' 'python-pyflakes')
+checkdepends=('dejagnu' 'perl-locale-gettext' 'python-pyflakes')
 optdepends=('perl: perl bindings'
 'ruby: ruby bindings')
-provides=('libapparmor')
-replaces=('apparmor-libapparmor' 'apparmor-pam' 'apparmor-parser'
-'apparmor-profiles' 'apparmor-utils' 'apparmor-vim')
+provides=('libapparmor.so')
 backup=('etc/apparmor/easyprof.conf'
 'etc/apparmor/logprof.conf'
 'etc/apparmor/notify.conf'
@@ -20,11 +18,9 @@
 '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')
+source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc})
+sha512sums=('137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141'
+'SKIP')
 # AppArmor Development Team (AppArmor signing key) 
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
@@ -31,43 +27,39 @@
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-  # fix PYTHONPATH for aa-logprof based check
+  # 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
-  # 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
+  # fix hardcoded install paths: https://gitlab.com/apparmor/apparmor/issues/38
   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
+  (
+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 "${pkgname}-${pkgver}/libraries/libapparmor/"
-  ./configure --prefix=/usr \
-  --sbindir=/usr/bin \
-  --with-perl \
-  --with-python \
-  --with-ruby
-  make
-  cd ../..
+  (
+cd "libraries/libapparmor/"
+./configure --prefix=/usr \
+--sbindir=/usr/bin \
+--with-perl \
+--with-python \
+--with-ruby
+make
+  )
   make -C binutils
   make -C parser
   make -C pr

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2019-06-05 Thread David Runge via arch-commits 
Date: Wednesday, June 5, 2019 @ 10:45:10
  Author: dvzrv
Revision: 476964

upgpkg: apparmor 2.13.2-4

Applying upstream patch for swig >= 4.0.0, which broke the 
libraries/libapparmor checks.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-05 10:20:13 UTC (rev 476963)
+++ PKGBUILD2019-06-05 10:45:10 UTC (rev 476964)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -20,9 +20,11 @@
 '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})
+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')
+'SKIP'
+
'd80dfb222b43a6b347cb952ec7672e3bc24d144a8678fab737520823ff84c45d6a4bd997416c5f67679fdf58172843003dd0c8dbed0f30646a6937922683d9ff')
 # AppArmor Development Team (AppArmor signing key) 
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
@@ -46,6 +48,8 @@
   # 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
 }
@@ -75,9 +79,7 @@
 
 check() {
   cd "$pkgname-$pkgver"
-# failing python checks:
-# https://gitlab.com/apparmor/apparmor/issues/33
-#  make -C libraries/libapparmor check
+  make -C libraries/libapparmor check
   make -C binutils check
 # parser checks don't run on non-apparmor enabled kernel
 #  make -C parser check

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2019-06-03 Thread David Runge via arch-commits 
Date: Monday, June 3, 2019 @ 22:14:54
  Author: dvzrv
Revision: 476824

upgpkg: apparmor 2.13.2-3

Rebuilding against perl 5.30. Disabling checks for libraries/libapparmor until 
they are fixed upstream - filed a bug (seems some update to python and/or swig 
broke them).

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-03 22:14:25 UTC (rev 476823)
+++ PKGBUILD2019-06-03 22:14:54 UTC (rev 476824)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -75,7 +75,9 @@
 
 check() {
   cd "$pkgname-$pkgver"
-  make -C libraries/libapparmor check
+# 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

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2019-01-06 Thread Felix Yan via arch-commits 
Date: Monday, January 7, 2019 @ 01:06:23
  Author: felixonmars
Revision: 420830

Ruby 2.6.0 rebuild

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-07 01:06:22 UTC (rev 420829)
+++ PKGBUILD2019-01-07 01:06:23 UTC (rev 420830)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2018-12-22 Thread David Runge via arch-commits 
Date: Saturday, December 22, 2018 @ 22:10:00
  Author: dvzrv
Revision: 417566

upgpkg: apparmor 2.13.2-1

Upgrading to 2.13.2. Removing now included fix for syntax error in 
rc.apparmor.functions. Adding mod_apparmor for apache.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |   21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-22 20:48:19 UTC (rev 417565)
+++ PKGBUILD2018-12-22 22:10:00 UTC (rev 417566)
@@ -1,13 +1,13 @@
 # Maintainer: David Runge 
 pkgname=apparmor
-pkgver=2.13.1
-pkgrel=3
+pkgver=2.13.2
+pkgrel=1
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
-license=('GPL')
+license=('GPL2' 'LGPL2.1')
 depends=('audit' 'pam' 'python')
-makedepends=('swig' 'ruby')
+makedepends=('apache' 'ruby' 'swig')
 checkdepends=('dejagnu' 'python-pyflakes')
 optdepends=('perl: perl bindings'
 'ruby: ruby bindings')
@@ -20,11 +20,9 @@
 '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}
-"https://gitlab.com/${pkgname}/${pkgname}/merge_requests/240.diff";)
-sha512sums=('e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7'
-'SKIP'
-
'f784a6939352d12f9641d70e58447d1cfd018a6986141d4c9e8188032d71532b8c9dd38c4fec99d08bbe464527eb7031c504803de702a9ece4e331a1fea0980a')
+source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc})
+sha512sums=('2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f'
+'SKIP')
 # AppArmor Development Team (AppArmor signing key) 
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
@@ -48,9 +46,6 @@
   # fix default installation path for vim syntax file
   sed -e 's/share\/apparmor/share\/vim\/vimfiles\/syntax/' \
   -i utils/vim/Makefile
-  # fixing syntax error in rc.apparmor.functions:
-  # https://gitlab.com/apparmor/apparmor/merge_requests/240/diffs
-  patch -Np1 -i ../240.diff
   cd libraries/libapparmor/
   autoreconf -vfi
 }
@@ -74,6 +69,7 @@
   make -C profiles
   make -C utils
   make -C changehat/pam_apparmor
+  make -C changehat/mod_apparmor
   make -C utils/vim
 }
 
@@ -92,6 +88,7 @@
   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

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2018-10-15 Thread David Runge via arch-commits 
Date: Monday, October 15, 2018 @ 13:19:09
  Author: dvzrv
Revision: 394126

upgpkg: apparmor 2.13.1-3

Reintroducing the stripping of the perl library.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-15 13:17:44 UTC (rev 394125)
+++ PKGBUILD2018-10-15 13:19:09 UTC (rev 394126)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -97,6 +97,10 @@
   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

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2018-10-15 Thread David Runge via arch-commits 
Date: Monday, October 15, 2018 @ 12:32:51
  Author: dvzrv
Revision: 394106

upgpkg: apparmor 2.13.1-2

Upgrading to 2.13.1 (this time really using the sources...). Adding fix for 
syntax error in rc.apparmor.functions. Removing now unneeded fixes to tests, 
systemd script and perl RPATH.
Removing unneeded chrpath make dependency.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |   28 
 1 file changed, 12 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-15 12:23:34 UTC (rev 394105)
+++ PKGBUILD2018-10-15 12:32:51 UTC (rev 394106)
@@ -1,13 +1,13 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
 license=('GPL')
 depends=('audit' 'pam' 'python')
-makedepends=('swig' 'chrpath' 'ruby')
+makedepends=('swig' 'ruby')
 checkdepends=('dejagnu' 'python-pyflakes')
 optdepends=('perl: perl bindings'
 'ruby: ruby bindings')
@@ -20,15 +20,16 @@
 'etc/apparmor/parser.conf'
 'etc/apparmor/subdomain.conf'
 'etc/apparmor/severity.db')
-source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver%.[0-9]}.tar.gz"{,.asc})
-sha512sums=('f98914713153d4c823a3ea7e96291cc4528bf7c8d3a139286ae0ecd806613e9c34b0ad81f2b258df2193cf6f3157d3252ef72d32d339427948a3fd8ba5651827'
-'SKIP')
+source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc}
+"https://gitlab.com/${pkgname}/${pkgname}/merge_requests/240.diff";)
+sha512sums=('e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7'
+'SKIP'
+
'f784a6939352d12f9641d70e58447d1cfd018a6986141d4c9e8188032d71532b8c9dd38c4fec99d08bbe464527eb7031c504803de702a9ece4e331a1fea0980a')
 # AppArmor Development Team (AppArmor signing key) 
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
 
 prepare() {
-  mv -v "${pkgname}-${pkgver%.[0-9]}" "${pkgname}-${pkgver}"
   cd "${pkgname}-${pkgver}"
   # fix PYTHONPATH for aa-logprof based check
   local _py3_ver=$(python --version | cut -d " " -f2)
@@ -36,20 +37,20 @@
   local libs="${PWD}/libraries/libapparmor/src/.libs"
   sed -e "/PYTHONPATH/ s|utils\ |utils:$path\ LD_LIBRARY_PATH=$libs\ |" \
   -i profiles/Makefile
-  # fix sandbox.py (utils check)
-  sed -e '722i\ \ \ \ \ \ \ \ print(e)' -i utils/apparmor/sandbox.py
   # 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
-  # fix missing executable bit on apparmor.systemd script
-  sed -e 's/sbin/usr\/bin/g' \
+  sed -e 's|/usr/sbin|/usr/bin|g' \
+  -e 's|/sbin|/usr/bin|g' \
   -e 's/\}\/lib\/apparmor/\}\/usr\/lib\/apparmor/' \
-  -e 's/644 apparmor.systemd/755 apparmor.systemd/' \
   -i parser/Makefile
   # fix default installation path for vim syntax file
   sed -e 's/share\/apparmor/share\/vim\/vimfiles\/syntax/' \
   -i utils/vim/Makefile
+  # fixing syntax error in rc.apparmor.functions:
+  # https://gitlab.com/apparmor/apparmor/merge_requests/240/diffs
+  patch -Np1 -i ../240.diff
   cd libraries/libapparmor/
   autoreconf -vfi
 }
@@ -96,11 +97,6 @@
   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 and remove empty rpath
-  find "${pkgdir}/usr/lib/perl5/" \
--type f -iname "*.so" \
--exec strip --strip-unneeded {} \; \
--exec chrpath -d {} \;
   # removing empty core_perl directory
   rm -rv "${pkgdir}"/usr/lib/perl5/*/core_perl
   # move ruby bindings to vendor_ruby

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2018-10-15 Thread David Runge via arch-commits 
Date: Monday, October 15, 2018 @ 09:14:21
  Author: dvzrv
Revision: 393990

upgpkg: apparmor 2.13.1-1

Upgrading to 2.13.1. Removing binmerge patch (now included).

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 4 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-15 08:31:04 UTC (rev 393989)
+++ PKGBUILD2018-10-15 09:14:21 UTC (rev 393990)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
-pkgver=2.13.0
-pkgrel=10
+pkgver=2.13.1
+pkgrel=1
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -20,11 +20,9 @@
 'etc/apparmor/parser.conf'
 'etc/apparmor/subdomain.conf'
 'etc/apparmor/severity.db')
-source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver%.[0-9]}.tar.gz"{,.asc}
-
"binmerge.patch::https://gitlab.com/${pkgname}/${pkgname}/commit/4200932d8fb31cc3782d96dd8312511e807fd09b.patch";)
+source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver%.[0-9]}.tar.gz"{,.asc})
 
sha512sums=('f98914713153d4c823a3ea7e96291cc4528bf7c8d3a139286ae0ecd806613e9c34b0ad81f2b258df2193cf6f3157d3252ef72d32d339427948a3fd8ba5651827'
-'SKIP'
-
'f8f083b43970f2273a79efd08841c50b0333d526e32f85a66a6099e70fd8f36eb8f1c4433e1b37ac99bdfa8fcb2c541704f286ecc9fd5daf978996889b4d2286')
+'SKIP')
 # AppArmor Development Team (AppArmor signing key) 
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
@@ -42,11 +40,6 @@
   sed -e '722i\ \ \ \ \ \ \ \ print(e)' -i utils/apparmor/sandbox.py
   # remove test-aa.py (utils check), producing too many fails
   rm -v utils/test/test-aa.py
-
-  # backport upstream 'binmerge' patch
-  patch -Np1 -i ../binmerge.patch
-  #removing stale file
-  rm -v profiles/apparmor.d/usr.sbin.smbd.orig
   # fix bin directory for parser install target
   # fix lib dir location
   # fix missing executable bit on apparmor.systemd script

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2018-10-03 Thread David Runge via arch-commits 
Date: Wednesday, October 3, 2018 @ 19:37:50
  Author: dvzrv
Revision: 389288

upgpkg: apparmor 2.13.0-10

Adding binutils (aa-{enabled,exec}). Removing empty core_perl dir. Fixing and 
running some checks.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |   31 +--
 1 file changed, 29 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-03 19:29:41 UTC (rev 389287)
+++ PKGBUILD2018-10-03 19:37:50 UTC (rev 389288)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.0
-pkgrel=9
+pkgrel=10
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -8,6 +8,7 @@
 license=('GPL')
 depends=('audit' 'pam' 'python')
 makedepends=('swig' 'chrpath' 'ruby')
+checkdepends=('dejagnu' 'python-pyflakes')
 optdepends=('perl: perl bindings'
 'ruby: ruby bindings')
 provides=('libapparmor')
@@ -31,6 +32,17 @@
 prepare() {
   mv -v "${pkgname}-${pkgver%.[0-9]}" "${pkgname}-${pkgver}"
   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
+  # fix sandbox.py (utils check)
+  sed -e '722i\ \ \ \ \ \ \ \ print(e)' -i utils/apparmor/sandbox.py
+  # remove test-aa.py (utils check), producing too many fails
+  rm -v utils/test/test-aa.py
+
   # backport upstream 'binmerge' patch
   patch -Np1 -i ../binmerge.patch
   #removing stale file
@@ -42,7 +54,7 @@
   -e 's/\}\/lib\/apparmor/\}\/usr\/lib\/apparmor/' \
   -e 's/644 apparmor.systemd/755 apparmor.systemd/' \
   -i parser/Makefile
-  # fix default vim syntax file installation path
+  # fix default installation path for vim syntax file
   sed -e 's/share\/apparmor/share\/vim\/vimfiles\/syntax/' \
   -i utils/vim/Makefile
   cd libraries/libapparmor/
@@ -63,6 +75,7 @@
   --with-ruby
   make
   cd ../..
+  make -C binutils
   make -C parser
   make -C profiles
   make -C utils
@@ -70,10 +83,22 @@
   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 binutils DESTDIR="${pkgdir}" install
   make -C parser DESTDIR="${pkgdir}" install
   make -C parser DESTDIR="${pkgdir}" install-systemd
   make -C profiles DESTDIR="${pkgdir}" install
@@ -83,6 +108,8 @@
 -type f -iname "*.so" \
 -exec strip --strip-unneeded {} \; \
 -exec chrpath -d {} \;
+  # 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/"

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2018-09-29 Thread David Runge via arch-commits 
Date: Saturday, September 29, 2018 @ 21:37:47
  Author: dvzrv
Revision: 388035

upgpkg: apparmor 2.13.0-9

Fixing dynamic assignment of backup array (by hack), before pkgdir is created.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-29 21:03:42 UTC (rev 388034)
+++ PKGBUILD2018-09-29 21:37:47 UTC (rev 388035)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.0
-pkgrel=8
+pkgrel=9
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -88,5 +88,7 @@
 "${pkgdir}/usr/lib/ruby/vendor_ruby/"
   # adding files below /etc/apparmor.d to backup array
   cd "${pkgdir}"
-  backup=( ${backup[@]} $(find "etc/${pkgname}.d/" -type f) )
+  # tricking extract_function_variable() in makepkg into not detecting the
+  # backup array modification
+  [[ /usr/bin/true ]] && backup=( ${backup[@]} $(find "etc/${pkgname}.d/" 
-type f) )
 }

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2018-09-27 Thread David Runge via arch-commits 
Date: Thursday, September 27, 2018 @ 21:46:10
  Author: dvzrv
Revision: 386762

upgpkg: apparmor 2.13.0-8

Removing modifications of profiles (by including latest upstream 'binmerge' 
patch). Removing unnecessary logprof.conf modifications (which only concerned 
legacy files, not available on Arch).

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |   31 +--
 1 file changed, 9 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-27 21:31:08 UTC (rev 386761)
+++ PKGBUILD2018-09-27 21:46:10 UTC (rev 386762)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.0
-pkgrel=7
+pkgrel=8
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor";
@@ -19,9 +19,11 @@
 'etc/apparmor/parser.conf'
 'etc/apparmor/subdomain.conf'
 'etc/apparmor/severity.db')
-source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver%.[0-9]}.tar.gz"{,.asc})
+source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver%.[0-9]}.tar.gz"{,.asc}
+
"binmerge.patch::https://gitlab.com/${pkgname}/${pkgname}/commit/4200932d8fb31cc3782d96dd8312511e807fd09b.patch";)
 
sha512sums=('f98914713153d4c823a3ea7e96291cc4528bf7c8d3a139286ae0ecd806613e9c34b0ad81f2b258df2193cf6f3157d3252ef72d32d339427948a3fd8ba5651827'
-'SKIP')
+'SKIP'
+
'f8f083b43970f2273a79efd08841c50b0333d526e32f85a66a6099e70fd8f36eb8f1c4433e1b37ac99bdfa8fcb2c541704f286ecc9fd5daf978996889b4d2286')
 # AppArmor Development Team (AppArmor signing key) 
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
@@ -29,6 +31,10 @@
 prepare() {
   mv -v "${pkgname}-${pkgver%.[0-9]}" "${pkgname}-${pkgver}"
   cd "${pkgname}-${pkgver}"
+  # backport upstream 'binmerge' patch
+  patch -Np1 -i ../binmerge.patch
+  #removing stale file
+  rm -v profiles/apparmor.d/usr.sbin.smbd.orig
   # fix bin directory for parser install target
   # fix lib dir location
   # fix missing executable bit on apparmor.systemd script
@@ -39,25 +45,6 @@
   # fix default vim syntax file installation path
   sed -e 's/share\/apparmor/share\/vim\/vimfiles\/syntax/' \
   -i utils/vim/Makefile
-  # fix syslog.log location
-  # fix messages.log location
-  # fixing location of {apparmormor,subdomain}_parser
-  # adding aa- prefix to {genprof,logprof}
-  # replace the use of /sbin and /usr/sbin with /bin and /usr/bin 
(respectively)
-  sed -e '/logfiles/ s/syslog /syslog.log /g' \
-  -e '/logfiles/ s/messages/messages.log/g' \
-  -e 's| /sbin/apparmor_parser| /usr/bin/apparmor_parser|g' \
-  -e 's|parser /sbin/subdomain|parser /usr/bin/subdomain|g' \
-  -e 's|/genprof|/aa-genprof|g' \
-  -e 's|/logprof|/aa-logprof|g' \
-  -e 's/sbin/bin/g' \
-  -i utils/logprof.conf
-  # replace the use of /sbin /usr/sbin and /bin with /usr/bin in all profiles
-  find profiles -type f \
--exec sed -e 's| /sbin/| /usr/bin/|g' \
-  -e 's|/sbin/|/bin/|g' \
-  -e 's| /bin/| /usr/bin/|g' \
-  -i {} +
   cd libraries/libapparmor/
   autoreconf -vfi
 }

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2018-09-22 Thread David Runge via arch-commits 
Date: Saturday, September 22, 2018 @ 19:53:23
  Author: dvzrv
Revision: 384170

upgpkg: apparmor 2.13.0-7

Fixing the use of subdomain_parser (wherever that is actually coming from) in 
logprof.conf. Adding aa- prefix to genprof and logprof (as the binaries are 
actually called that way) in logprof.conf. Setting url to gitlab repo of the 
project.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-22 19:28:33 UTC (rev 384169)
+++ PKGBUILD2018-09-22 19:53:23 UTC (rev 384170)
@@ -1,10 +1,10 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
-url="https://launchpad.net/apparmor";
+url="https://gitlab.com/apparmor/apparmor";
 license=('GPL')
 depends=('audit' 'pam' 'python')
 makedepends=('swig' 'chrpath' 'ruby')
@@ -42,11 +42,14 @@
   # fix syslog.log location
   # fix messages.log location
   # fixing location of {apparmormor,subdomain}_parser
+  # adding aa- prefix to {genprof,logprof}
   # replace the use of /sbin and /usr/sbin with /bin and /usr/bin 
(respectively)
   sed -e '/logfiles/ s/syslog /syslog.log /g' \
   -e '/logfiles/ s/messages/messages.log/g' \
   -e 's| /sbin/apparmor_parser| /usr/bin/apparmor_parser|g' \
-  -e 's| /sbin/subdomain_parser| /usr/bin/subdomain_parser|g' \
+  -e 's|parser /sbin/subdomain|parser /usr/bin/subdomain|g' \
+  -e 's|/genprof|/aa-genprof|g' \
+  -e 's|/logprof|/aa-logprof|g' \
   -e 's/sbin/bin/g' \
   -i utils/logprof.conf
   # replace the use of /sbin /usr/sbin and /bin with /usr/bin in all profiles

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2018-09-22 Thread David Runge via arch-commits 
Date: Saturday, September 22, 2018 @ 15:39:09
  Author: dvzrv
Revision: 384166

upgpkg: apparmor 2.13.0-6

Being more careful as to where and how to replace {,/usr}/sbin in logprof.conf. 
Not replacing the use of /bin in logprof.conf, as that leads to duplicate 
entries.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-22 15:34:41 UTC (rev 384165)
+++ PKGBUILD2018-09-22 15:39:09 UTC (rev 384166)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://launchpad.net/apparmor";
@@ -39,11 +39,15 @@
   # fix default vim syntax file installation path
   sed -e 's/share\/apparmor/share\/vim\/vimfiles\/syntax/' \
   -i utils/vim/Makefile
-  # fix paths in logprof.conf
+  # fix syslog.log location
+  # fix messages.log location
+  # fixing location of {apparmormor,subdomain}_parser
+  # replace the use of /sbin and /usr/sbin with /bin and /usr/bin 
(respectively)
   sed -e '/logfiles/ s/syslog /syslog.log /g' \
   -e '/logfiles/ s/messages/messages.log/g' \
+  -e 's| /sbin/apparmor_parser| /usr/bin/apparmor_parser|g' \
+  -e 's| /sbin/subdomain_parser| /usr/bin/subdomain_parser|g' \
   -e 's/sbin/bin/g' \
-  -e 's| /bin/| /usr/bin/|g' \
   -i utils/logprof.conf
   # replace the use of /sbin /usr/sbin and /bin with /usr/bin in all profiles
   find profiles -type f \

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2018-09-20 Thread David Runge via arch-commits 
Date: Thursday, September 20, 2018 @ 18:36:31
  Author: dvzrv
Revision: 383763

upgpkg: apparmor 2.13.0-5

Only replacing the use of /sbin/ /bin/ and /usr/sbin/ with /usr/bin in all 
profiles, instead of renaming the files.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |   20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-20 17:54:27 UTC (rev 383762)
+++ PKGBUILD2018-09-20 18:36:31 UTC (rev 383763)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://launchpad.net/apparmor";
@@ -45,18 +45,12 @@
   -e 's/sbin/bin/g' \
   -e 's| /bin/| /usr/bin/|g' \
   -i utils/logprof.conf
-  # rename profiles (to use usr.bin prefix)
-  for profile in $(ls 
profiles/{${pkgname}/profiles/extras,${pkgname}.d}/{bin,sbin,usr.sbin}*); do
-mv -v $profile \
-  $(echo $profile| \
-sed -e 's|/bin|/usr.bin|;s|/sbin|/usr.bin|;s|/usr.sbin|/usr.bin|')
-  done
-  # overwrite usage of sbin with bin in all profiles
-  # overwrite local bin includes with usr.bin
-  sed -e 's/sbin/bin/g' \
-  -e 's|local/bin|local/usr.bin|' \
-  -i profiles/${pkgname}/profiles/extras/usr.* \
-  profiles/${pkgname}.d/{abstractions/*-{helpers,common},usr.*}
+  # replace the use of /sbin /usr/sbin and /bin with /usr/bin in all profiles
+  find profiles -type f \
+-exec sed -e 's| /sbin/| /usr/bin/|g' \
+  -e 's|/sbin/|/bin/|g' \
+  -e 's| /bin/| /usr/bin/|g' \
+  -i {} +
   cd libraries/libapparmor/
   autoreconf -vfi
 }

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2018-09-13 Thread David Runge via arch-commits 
Date: Thursday, September 13, 2018 @ 18:24:47
  Author: dvzrv
Revision: 380476

upgpkg: apparmor 2.13.0-4

Removing sed search/replace when adding configuration files to backup array by 
going to pkgdir first.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-13 18:23:39 UTC (rev 380475)
+++ PKGBUILD2018-09-13 18:24:47 UTC (rev 380476)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://launchpad.net/apparmor";
@@ -99,6 +99,6 @@
   mv -v "${pkgdir}/usr/lib/ruby/site_ruby/" \
 "${pkgdir}/usr/lib/ruby/vendor_ruby/"
   # adding files below /etc/apparmor.d to backup array
-  backup=( ${backup[@]} $(find "${pkgdir}/etc/${pkgname}.d/" \
--type f |sed "s|${pkgdir}/||") )
+  cd "${pkgdir}"
+  backup=( ${backup[@]} $(find "etc/${pkgname}.d/" -type f) )
 }

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2018-09-13 Thread David Runge via arch-commits 
Date: Thursday, September 13, 2018 @ 17:50:09
  Author: dvzrv
Revision: 380452

upgpkg: apparmor 2.13.0-3

Shortening pkgdesc. Adding chrpath and ruby to makedepends. Adding perl and 
ruby to optdepends.
Removing unused CFLAGS/LDFLAGS. Moving export of MAKEFLAGS to build(). Removing 
empty RPATH from perl module (when stripping it).
Moving added ruby module to vendor_ruby. Adding profiles to backup array by 
using files from pkgdir.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |   41 -
 1 file changed, 24 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-13 17:42:00 UTC (rev 380451)
+++ PKGBUILD2018-09-13 17:50:09 UTC (rev 380452)
@@ -1,14 +1,15 @@
 # Maintainer: David Runge 
 pkgname=apparmor
 pkgver=2.13.0
-pkgrel=2
-pkgdesc="Mandatory Access Control (MAC) mechanism using the Linux Security
-Module (LSM) framework."
+pkgrel=3
+pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://launchpad.net/apparmor";
 license=('GPL')
 depends=('audit' 'pam' 'python')
-makedepends=('swig')
+makedepends=('swig' 'chrpath' 'ruby')
+optdepends=('perl: perl bindings'
+'ruby: ruby bindings')
 provides=('libapparmor')
 replaces=('apparmor-libapparmor' 'apparmor-pam' 'apparmor-parser'
 'apparmor-profiles' 'apparmor-utils' 'apparmor-vim')
@@ -21,14 +22,11 @@
 
source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver%.[0-9]}.tar.gz"{,.asc})
 
sha512sums=('f98914713153d4c823a3ea7e96291cc4528bf7c8d3a139286ae0ecd806613e9c34b0ad81f2b258df2193cf6f3157d3252ef72d32d339427948a3fd8ba5651827'
 'SKIP')
-# 3D3664BB: AppArmor Development Team (AppArmor signing key) 

+# AppArmor Development Team (AppArmor signing key) 
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
 
 prepare() {
-  # use PIE
-  export CFLAGS+=" -fpic -fpie"
-  export LDFLAGS+=" -fpic -fpie"
   mv -v "${pkgname}-${pkgver%.[0-9]}" "${pkgname}-${pkgver}"
   cd "${pkgname}-${pkgver}"
   # fix bin directory for parser install target
@@ -49,7 +47,9 @@
   -i utils/logprof.conf
   # rename profiles (to use usr.bin prefix)
   for profile in $(ls 
profiles/{${pkgname}/profiles/extras,${pkgname}.d}/{bin,sbin,usr.sbin}*); do
-mv -v $profile $(echo $profile| sed -e 
's|/bin|/usr.bin|;s|/sbin|/usr.bin|g;s|/usr.sbin|/usr.bin|')
+mv -v $profile \
+  $(echo $profile| \
+sed -e 's|/bin|/usr.bin|;s|/sbin|/usr.bin|;s|/usr.sbin|/usr.bin|')
   done
   # overwrite usage of sbin with bin in all profiles
   # overwrite local bin includes with usr.bin
@@ -59,19 +59,20 @@
   profiles/${pkgname}.d/{abstractions/*-{helpers,common},usr.*}
   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"
-}
-
-build() {
   cd "${pkgname}-${pkgver}/libraries/libapparmor/"
   ./configure --prefix=/usr \
   --sbindir=/usr/bin \
   --with-perl \
-  --with-python
+  --with-python \
+  --with-ruby
   make
   cd ../..
   make -C parser
@@ -89,9 +90,15 @@
   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 {} \;
+  # strip perl library and remove empty rpath
+  find "${pkgdir}/usr/lib/perl5/" \
+-type f -iname "*.so" \
+-exec strip --strip-unneeded {} \; \
+-exec chrpath -d {} \;
+  # 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 profiles/${pkgname}.d/
-  backup=( ${backup[@]} $(find . -type f |sed 's|./|etc/apparmor.d/|') )
+  backup=( ${backup[@]} $(find "${pkgdir}/etc/${pkgname}.d/" \
+-type f |sed "s|${pkgdir}/||") )
 }

[arch-commits] Commit in apparmor/trunk (PKGBUILD)

2018-09-12 Thread David Runge via arch-commits 
Date: Wednesday, September 12, 2018 @ 22:38:08
  Author: dvzrv
Revision: 380066

upgpkg: apparmor 2.13.0-2

Adding apparmor 2.13.0.

Modified:
  apparmor/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-12 22:25:52 UTC (rev 380065)
+++ PKGBUILD2018-09-12 22:38:08 UTC (rev 380066)
@@ -7,7 +7,7 @@
 arch=('x86_64')
 url="https://launchpad.net/apparmor";
 license=('GPL')
-depends=('audit' 'pam' 'python' 'perl')
+depends=('audit' 'pam' 'python')
 makedepends=('swig')
 provides=('libapparmor')
 replaces=('apparmor-libapparmor' 'apparmor-pam' 'apparmor-parser'
@@ -89,6 +89,8 @@
   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 {} \;
   # adding files below /etc/apparmor.d to backup array
   cd profiles/${pkgname}.d/
   backup=( ${backup[@]} $(find . -type f |sed 's|./|etc/apparmor.d/|') )