From b3e11396652068306f6c9a016a46dbc9b07ac6f0 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Mon, 18 May 2015 05:54:55 -0500 Subject: apparmor-2.9.2-1: updating version --- pcr/apparmor/PKGBUILD | 24 ++++--- pcr/apparmor/PKGBUILD.save | 161 ------------------------------------------ pcr/apparmor/apparmor.service | 1 + 3 files changed, 14 insertions(+), 172 deletions(-) delete mode 100644 pcr/apparmor/PKGBUILD.save diff --git a/pcr/apparmor/PKGBUILD b/pcr/apparmor/PKGBUILD index ad6cbcdf9..9d7c27515 100644 --- a/pcr/apparmor/PKGBUILD +++ b/pcr/apparmor/PKGBUILD @@ -1,13 +1,13 @@ -# Maintainer : Aurelien Desbrieres -# Contributor: Thomas Kuther -# Contributor: Gianni Vialetto -# Contributor: Paul N. Maxwell -# Contributor: Thomas Mudrunka -# Contributor: Max Fierke +# Contributor (Arch): Thomas Kuther +# Contributor (Arch): Gianni Vialetto +# Contributor (Arch): Paul N. Maxwell +# Contributor (Arch): Thomas Mudrunka +# Contributor (Arch): Max Fierke +# Maintainer : Aurelien Desbrieres pkgbase=apparmor pkgname=($pkgbase apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim) -pkgver=2.9.1 +pkgver=2.9.2 #_majorver=${pkgver%.*} # bleh, AUR... _majorver=2.9 pkgrel=1 @@ -22,6 +22,11 @@ source=("https://launchpad.net/$pkgname/${_majorver}/$pkgver/+download/$pkgname- "apparmor_unload.sh" "apparmor.service") +md5sums=('3af6ef84881016bf8d9100f3f8ab036b' + 'a657bc9e2670509e489615e63ba718c9' + 'f083aa1926430bc48eb332f1b77fca08' + 'cb226668bb3e0c9a62e672c11f8a012b') + #Configuration core_perl_dir='/usr/bin/core_perl' export MAKEFLAGS+=" POD2MAN=${core_perl_dir}/pod2man" @@ -83,7 +88,7 @@ build() { package_apparmor() { pkgdesc='Linux application security framework - mandatory access control for programs (metapackage)' depends=(apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim) - optdepends=('linux-apparmor: an arch kernel with AppArmor patches') + #optdepends=('linux-apparmor: an arch kernel with AppArmor patches') install='apparmor.install' } @@ -109,7 +114,6 @@ package_apparmor-libapparmor() { package_apparmor-utils() { pkgdesc='AppArmor userspace utilities' - arch=('any') depends=('perl' 'perl-locale-gettext' 'perl-term-readkey' 'perl-file-tail' 'perl-rpc-xml' 'python' 'bash') install='apparmor-utils.install' @@ -124,7 +128,6 @@ package_apparmor-utils() { package_apparmor-profiles() { pkgdesc='AppArmor sample pre-made profiles' depends=(apparmor-parser) - arch=('any') # backup /etc/apparmor.d/* so using logprof is safe cd "${srcdir}/${pkgbase}-${pkgver}/profiles/apparmor.d" @@ -145,7 +148,6 @@ package_apparmor-pam() { } package_apparmor-vim() { pkgdesc='AppArmor VIM support' - arch=('any') depends=('vim') cd "${srcdir}/${pkgbase}-${pkgver}/utils/vim" diff --git a/pcr/apparmor/PKGBUILD.save b/pcr/apparmor/PKGBUILD.save deleted file mode 100644 index 24377b098..000000000 --- a/pcr/apparmor/PKGBUILD.save +++ /dev/null @@ -1,161 +0,0 @@ -# Maintainer : Aurelien Desbriers -# Contributor: Thomas Kuther -# Contributor: Gianni Vialetto -# Contributor: Paul N. Maxwell -# Contributor: Thomas Mudrunka -# Contributor: Max Fierke - -pkgbase=apparmor -pkgname=($pkgbase apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim) -pkgver=2.9.1 -#_majorver=${pkgver%.*} # bleh, AUR... -_majorver=2.9 -pkgrel=1 -pkgdesc='Linux application security framework - mandatory access control for programs' -arch=('i686' 'x86_64') -license=('GPL') -url='http://wiki.apparmor.net/index.php/Main_Page' -makedepends=('bzr' 'flex' 'swig' 'perl' 'python' 'perl-locale-gettext' 'perl-rpc-xml' 'audit') - -source=("https://launchpad.net/$pkgname/${_majorver}/$pkgver/+download/$pkgname-$pkgver.tar.gz" - "apparmor_load.sh" - "apparmor_unload.sh" - "apparmor.service") - -md5sums=('0e036d69d7ebfb9cc113ed301b8a6c5d' - 'a657bc9e2670509e489615e63ba718c9' - 'f083aa1926430bc48eb332f1b77fca08' - '872f48da4f60f669f89e6f79f8c67171') - -#Configuration -core_perl_dir='/usr/bin/core_perl' -export MAKEFLAGS+=" POD2MAN=${core_perl_dir}/pod2man" -export MAKEFLAGS+=" POD2HTML=${core_perl_dir}/pod2html" -export MAKEFLAGS+=" PROVE=${core_perl_dir}/prove" -export MAKEFLAGS+=" PYTHON=python3" - - -prepare() { - cd "${srcdir}/${pkgbase}-${pkgver}/parser" - # avoid depend on texlive-latex - sed -i -e 's/pdflatex/true/g' Makefile - - cd "${srcdir}/${pkgbase}-${pkgver}/utils" - # Set Arch paths - sed -e '/logfiles/ s/syslog /syslog.log /g' \ - -e '/logfiles/ s/messages/messages.log/g' \ - -e '/parser/ s# /sbin/# /usr/bin/#g' \ - -i logprof.conf - # do not build/install vim file with utils package (causes ref to $srcdir and wrong location) - sed -i '/vim/d' Makefile - - cd "${srcdir}/${pkgbase}-${pkgver}/profiles/apparmor.d" - # /usr merge vs. profiles - for i in `find . -name "*sbin*"`; do sed -i -e 's@sbin@bin@g' ${i} && mv ${i} ${i/sbin/bin}; done - for i in klogd ping syslog-ng syslogd; do - sed -e "s@/bin/${i}@/usr/bin/${i}@g" \ - -e "s@bin\.${i}@usr\.bin\.${i}@g" \ - -i bin.${i} && \ - mv bin.${i} usr.bin.${i} - done -} - -build() { - msg2 "Building: apparmor-libapparmor" - cd "${srcdir}/${pkgbase}-${pkgver}/libraries/libapparmor" - unset PERL_MM_OPT - NOCONFIGURE=1 ./autogen.sh - ./configure --prefix=/usr --sbindir=/usr/bin --with-perl --with-python - make - - cd "${srcdir}/${pkgbase}-${pkgver}" - msg2 "Building: apparmor-parser" - make -C parser - - msg2 "Building: apparmor-utils" - make -C utils - - msg2 "Building: apparmor-profiles" - make -C profiles - - msg2 "Building: apparmor-pam" - make -C changehat/pam_apparmor - - msg2 "Building: apparmor-vim" - make -C utils/vim -j1 -} - -package_apparmor() { - pkgdesc='Linux application security framework - mandatory access control for programs (metapackage)' - depends=(apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim) - optdepends=('linux-apparmor: an arch kernel with AppArmor patches') - install='apparmor.install' -} - -package_apparmor-parser() { - pkgdesc='AppArmor parser - loads AA profiles to kernel module' - depends=('apparmor-libapparmor' 'bash') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C parser install DESTDIR=${pkgdir} - mv "${pkgdir}/lib" "${pkgdir}/usr/lib" - mv "${pkgdir}/sbin" "${pkgdir}/usr/bin" -} - -package_apparmor-libapparmor() { - pkgdesc='AppArmor library' - makedepends=('swig' 'perl' 'python') - depends=('python') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C libraries/libapparmor install DESTDIR=${pkgdir} - install -D -m644 "libraries/libapparmor/swig/perl/LibAppArmor.pm" "${pkgdir}/usr/lib/perl5/vendor_perl/" -} - -package_apparmor-utils() { - pkgdesc='AppArmor userspace utilities' - arch=('any') - depends=('perl' 'perl-locale-gettext' 'perl-term-readkey' - 'perl-file-tail' 'perl-rpc-xml' 'python' 'bash') - install='apparmor-utils.install' - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C utils install DESTDIR=${pkgdir} BINDIR=${pkgdir}/usr/bin - install -D -m755 "${srcdir}/apparmor_load.sh" "${pkgdir}/usr/bin/apparmor_load.sh" - install -D -m755 "${srcdir}/apparmor_unload.sh" "${pkgdir}/usr/bin/apparmor_unload.sh" - install -D -m644 "${srcdir}/apparmor.service" "${pkgdir}/usr/lib/systemd/system/apparmor.service" -} - -package_apparmor-profiles() { - pkgdesc='AppArmor sample pre-made profiles' - depends=(apparmor-parser) - arch=('any') - - # backup /etc/apparmor.d/* so using logprof is safe - cd "${srcdir}/${pkgbase}-${pkgver}/profiles/apparmor.d" - declare -a _profiles=(`find -type f|sed 's@./@etc/apparmor.d/@'`) - backup=(`echo ${_profiles[@]}`) - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C profiles install DESTDIR=${pkgdir} -} - -package_apparmor-pam() { - pkgdesc='AppArmor PAM library' - depends=('apparmor-libapparmor' 'pam') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C changehat/pam_apparmor install DESTDIR=${pkgdir}/usr - install -D -m644 changehat/pam_apparmor/README "${pkgdir}/usr/share/doc/apparmor/README.pam_apparmor" -} -package_apparmor-vim() { - pkgdesc='AppArmor VIM support' - arch=('any') - depends=('vim') - - cd "${srcdir}/${pkgbase}-${pkgver}/utils/vim" - install -D -m644 apparmor.vim \ - "${pkgdir}/usr/share/vim/vimfiles/syntax/apparmor.vim" -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/apparmor/apparmor.service b/pcr/apparmor/apparmor.service index 200d9be74..93f273a0d 100644 --- a/pcr/apparmor/apparmor.service +++ b/pcr/apparmor/apparmor.service @@ -1,6 +1,7 @@ [Unit] Description=AppArmor profiles DefaultDependencies=no +After=local-fs.target Before=sysinit.target [Service] -- cgit v1.2.3