moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

apparmor: update to 2.13.1.

Browse source 
Also cleanup the template a little
This commit is contained in:
Rasmus Thomsen 2018-10-21 14:22:17 +02:00 • committed by maxice8
parent c280da2e44
commit 485822d38b
2 changed files with 17 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

19
srcpkgs/apparmor/files/profiles/usr.bin.iputils-ping
View file

@ -1,19 +0,0 @@
# vim:syntax=apparmor
#include <tunables/global>
profile ping /{usr/,}bin/iputils-ping {
#include <abstractions/base>
#include <abstractions/consoles>
#include <abstractions/nameservice>
capability net_raw,
capability setuid,
network inet raw,
network inet6 raw,
/{usr/,}bin/iputils-ping mixr,
/etc/modules.conf r,
# Site-specific additions and overrides. See local/README for details.
#include <local/usr.bin.iputils-ping>
}

46
srcpkgs/apparmor/template
View file

@ -1,15 +1,16 @@
# Template file for 'apparmor' # Template file for 'apparmor'
pkgname=apparmor pkgname=apparmor
version=2.13.0 version=2.13.1
revision=7 revision=1
build_style=gnu-configure build_style=gnu-configure
_short_ver=${version%\.*} _short_ver=${version%\.*}
wrksrc="${pkgname}-v${_short_ver}" wrksrc="${pkgname}-v${_short_ver}"
build_wrksrc="libraries/libapparmor" build_wrksrc=libraries/libapparmor
patch_args="-Np1" patch_args="-Np1"
hostmakedepends="bison flex autoconf automake libtool swig python3" hostmakedepends="bison flex autoconf automake libtool swig python3"
makedepends="perl python3-devel" makedepends="perl python3-devel"
depends="runit-void-apparmor python3 libapparmor" depends="runit-void-apparmor python3 libapparmor"
checkdepends="dejagnu"
short_desc="Mandatory access control to restrict programs" short_desc="Mandatory access control to restrict programs"
maintainer="Olivier Mauras <olivier@mauras.ch>" maintainer="Olivier Mauras <olivier@mauras.ch>"
license="GPL-2.0-only, LGPL-2.1-only" license="GPL-2.0-only, LGPL-2.1-only"
@ -24,7 +25,7 @@ if [ -z "$CROSS_BUILD" ]; then
fi fi
pre_configure() { pre_configure() {
NOCONFIGURE=1 ./autogen.sh autoreconf -if
} }
pre_build() { pre_build() {
@ -33,37 +34,24 @@ pre_build() {
# Put in place our own profiles # Put in place our own profiles
cp ${FILESDIR}/profiles/* profiles/apparmor.d/ cp ${FILESDIR}/profiles/* profiles/apparmor.d/
mv profiles/apparmor.d/bin.ping profiles/apparmor/profiles/extras/
} }
post_build() { post_build() {
cd ${wrksrc}/binutils cd ${wrksrc}
make ${makejobs} sed -i 's#$(DESTDIR)/sbin#$(DESTDIR)/usr/bin#g' parser/Makefile
make ${makejobs} -C binutils
cd ${wrksrc}/utils make ${makejobs} -C utils
make ${makejobs} make ${makejobs} -C parser
make ${makejobs} -C profiles
cd ${wrksrc}/parser
sed -i 's#$(DESTDIR)/sbin#$(DESTDIR)/usr/bin#g' Makefile
sed -i 's#${DESTDIR}/lib#${DESTDIR}/usr/lib#g' Makefile
make ${makejobs}
cd ${wrksrc}/profiles
make ${makejobs}
} }
post_install() { post_install() {
cd ${wrksrc}/binutils cd ${wrksrc}
make DESTDIR=${DESTDIR} install make DESTDIR=${DESTDIR} install -C binutils
make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin install -C utils
cd ${wrksrc}/utils make DESTDIR=${DESTDIR} APPARMOR_BIN_PREFIX=${DESTDIR}/usr/lib/apparmor \
make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin install SBINDIR=${DESTDIR}/usr/bin USR_SBINDIR=${DESTDIR}/usr/bin install -C parser
make DESTDIR=${DESTDIR} install -C profiles
cd ${wrksrc}/parser
make DESTDIR=${DESTDIR} install
cd ${wrksrc}/profiles
make DESTDIR=${DESTDIR} install
# Put Vim syntax in the correct place # Put Vim syntax in the correct place
mkdir -p ${DESTDIR}/usr/share/vim/vim80/syntax/ mkdir -p ${DESTDIR}/usr/share/vim/vim80/syntax/