summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/apparmor-utils/ChangeLog7
-rw-r--r--sys-apps/apparmor-utils/Manifest7
-rw-r--r--sys-apps/apparmor-utils/apparmor-utils-2.7.0.ebuild (renamed from sys-apps/apparmor-utils/apparmor-utils-2.6.1.ebuild)4
-rw-r--r--sys-apps/apparmor-utils/files/apparmor-utils-2.6.1-jobserver.patch40
4 files changed, 10 insertions, 48 deletions
diff --git a/sys-apps/apparmor-utils/ChangeLog b/sys-apps/apparmor-utils/ChangeLog
index 09235a061..b0227772a 100644
--- a/sys-apps/apparmor-utils/ChangeLog
+++ b/sys-apps/apparmor-utils/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*apparmor-utils-2.7.0 (18 Dec 2011)
+
+ 18 Dec 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>
+ -apparmor-utils-2.6.1.ebuild, -files/apparmor-utils-2.6.1-jobserver.patch,
+ +apparmor-utils-2.7.0.ebuild:
+ Version bump. Thanks to Tommy[D] for review.
+
13 Nov 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>
+apparmor-utils-2.6.1.ebuild, +files/apparmor-utils-2.6.1-jobserver.patch,
+metadata.xml:
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 75ce2aecc..d6f5c57a0 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,5 +1,4 @@
-AUX apparmor-utils-2.6.1-jobserver.patch 1077 RMD160 12e0c91703c05a010cbbeefa770f53dd16976b97 SHA1 f26f51aaa59553a5fbef713d8f626dcf2373e34a SHA256 e876fba937269c2b647c5e50808822d011c7a5773cf3399d1b752393ad05f7c0
-DIST apparmor-2.6.1.tar.gz 1612637 RMD160 241f0ba363b7f7c2d7e25cba4f6d7f6eb2c6f3f9 SHA1 c8837b1e0c4bd90858579cb9758af203122889aa SHA256 9cb015d8c1023d7549621d1caeea0cd92a33c48dba0762d75385f9ff7a11e2f4
-EBUILD apparmor-utils-2.6.1.ebuild 881 RMD160 e742aaf8b779013c3b0ca0a2dcd7a38ffe63b6d3 SHA1 cd04c172ed5bea14357767ed2b8b45693dcd2712 SHA256 2a6e321bfab82d2133b174e79cebd465bfe7ee254cc52a3063f255bf7047a450
-MISC ChangeLog 355 RMD160 27761e13d14905d38eeb4b4b08df56f2695c63bd SHA1 8792a8f826000dc862ece273a554a24cc9d47aa3 SHA256 6eacb0a55253af32b743bc4459305834fcf1adfc3d635a066e00ddb6a91435cc
+DIST apparmor-2.7.0.tar.gz 1399442 RMD160 13e74c631baef1155d664b68465c655bd32f8570 SHA1 9428e466e242b9381ac152dafb58d488c8a01921 SHA256 ff8a2f49f902faa78e502590c65d3850fb9a2a3453bef0dc1f99e947c52fc60f
+EBUILD apparmor-utils-2.7.0.ebuild 803 RMD160 ad3fa4ba6859b830feb111b68619ed53ad81ae57 SHA1 4be583588daae5af974d6c8700c5612923b55672 SHA256 3e3238e20c1c5fce76d85821a3a7ae4b99dc78bed535830e2540475466da7ab2
+MISC ChangeLog 623 RMD160 a346531705ba0a3cd3814d12d8b7e8ffe54c57ff SHA1 f9b366b2ce0a53062330a991449c73ef1c14e22e SHA256 2bdbc594b2d47d13c4173301bf697af124e5820fd15be2a2b169d59bf3d7462b
MISC metadata.xml 209 RMD160 184537d7a401571abe0e5cbf9258ba3947d19382 SHA1 f2ea13baedca19e24be6ed7c3e6b765f7ff67cba SHA256 b0f0595f625235a62d9d40753827ae160e42156371fd9568bd2779042517f5e8
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.6.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.7.0.ebuild
index 550bda26e..816c496f6 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.6.1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.7.0.ebuild
@@ -27,10 +27,6 @@ RDEPEND="${DEPEND}
S=${WORKDIR}/apparmor-${PV}/utils
-src_prepare() {
- epatch "${FILESDIR}"/apparmor-utils-2.6.1-jobserver.patch
-}
-
src_install() {
perlinfo
emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" install
diff --git a/sys-apps/apparmor-utils/files/apparmor-utils-2.6.1-jobserver.patch b/sys-apps/apparmor-utils/files/apparmor-utils-2.6.1-jobserver.patch
deleted file mode 100644
index 71a443f0c..000000000
--- a/sys-apps/apparmor-utils/files/apparmor-utils-2.6.1-jobserver.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -36,7 +36,7 @@
- MANPAGES = ${TOOLS:=.8} logprof.conf.5
-
- all: ${MANPAGES} ${HTMLMANPAGES}
-- make -C po all
-+ $(MAKE) -C po all
-
- # need some better way of determining this
- DESTDIR=/
-@@ -46,7 +46,7 @@
- PERLDIR=${DESTDIR}${VENDOR_PERL}/${MODDIR}
-
- po/${NAME}.pot: ${TOOLS}
-- make -C po ${NAME}.pot NAME=${NAME} SOURCES="${TOOLS} ${MODULES}"
-+ $(MAKE) -C po ${NAME}.pot NAME=${NAME} SOURCES="${TOOLS} ${MODULES}"
-
- .PHONY: install
- install: ${MANPAGES} ${HTMLMANPAGES}
-@@ -57,8 +57,8 @@
- install -m 755 ${TOOLS} ${BINDIR}
- install -d ${PERLDIR}
- install -m 755 ${MODULES} ${PERLDIR}
-- make -C po install DESTDIR=${DESTDIR} NAME=${NAME}
-- make install_manpages DESTDIR=${DESTDIR}
-+ $(MAKE) -C po install DESTDIR=${DESTDIR} NAME=${NAME}
-+ $(MAKE) install_manpages DESTDIR=${DESTDIR}
- ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8
-
- .PHONY: clean
-@@ -66,7 +66,7 @@
- clean: _clean
- rm -f core core.* *.o *.s *.a *~
- rm -f Make.rules
-- make -C po clean
-+ $(MAKE) -C po clean
-
- check:
- for i in ${MODULES} ${PERLTOOLS} ; do \