[gentoo-commits] proj/hardened-dev:master commit in: sys-apps/apparmor-utils/, sys-apps/apparmor-utils/files/

[gentoo-commits] proj/hardened-dev:master commit in: sys-apps/apparmor-utils/, sys-apps/apparmor-utils/files/

[Michael Palimaka]

commit:     d69e5b17e66dbc3935ed396ac6f8f82bd1139701
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 17:57:09 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 17:57:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=d69e5b17

sys-apps/apparmor-utils: fix runtime issue with aa-logprof and hu linguas, wrt bug #472276.

Package-Manager: portage-2.1.12.10
Manifest-Sign-Key: 675D0D2C

---
 ...utils-2.8.1.ebuild => apparmor-utils-2.8.1-r1.ebuild} |  2 ++
 .../apparmor-utils/files/apparmor-utils-2.8.1-hu.patch   | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.8.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.8.1-r1.ebuild
similarity index 97%
rename from sys-apps/apparmor-utils/apparmor-utils-2.8.1.ebuild
rename to sys-apps/apparmor-utils/apparmor-utils-2.8.1-r1.ebuild
index 1975edc..3965b7a 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.8.1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.8.1-r1.ebuild
@@ -42,6 +42,8 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/apparmor-${PV}/utils
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-hu.patch"
+
 	local lang
 	for lang in ${LANGS}; do
 		if ! use linguas_${lang}; then

diff --git a/sys-apps/apparmor-utils/files/apparmor-utils-2.8.1-hu.patch b/sys-apps/apparmor-utils/files/apparmor-utils-2.8.1-hu.patch
new file mode 100644
index 0000000..aa8b661
--- /dev/null
+++ b/sys-apps/apparmor-utils/files/apparmor-utils-2.8.1-hu.patch
@@ -0,0 +1,16 @@
+--- utils/po/hu.po
++++ utils/po/hu.po
+@@ -333,11 +333,11 @@
+ 
+ #: ../AppArmor.pm:1379 ../AppArmor.pm:1419
+ msgid "(Y)es"
+-msgstr "Igen"
++msgstr "(I)gen"
+ 
+ #: ../AppArmor.pm:1380 ../AppArmor.pm:1420
+ msgid "(N)o"
+-msgstr "Nem"
++msgstr "(N)em"
+ 
+ #: ../AppArmor.pm:1383 ../AppArmor.pm:1424
+ msgid "Invalid hotkey for"

[gentoo-commits] proj/hardened-dev:master commit in: sys-apps/apparmor-utils/, sys-apps/apparmor-utils/files/

[Michael Palimaka]

commit:     281cc76254f5b5cd6845d69ca666546e7ae607d0
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 17:48:30 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 17:48:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=281cc762

sys-apps/apparmor-utils: in portage.

---
 .../apparmor-utils/apparmor-utils-2.8.1-r1.ebuild  | 75 ----------------------
 .../files/apparmor-utils-2.8.1-hu.patch            | 16 -----
 sys-apps/apparmor-utils/metadata.xml               | 10 ---
 3 files changed, 101 deletions(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.8.1-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.8.1-r1.ebuild
deleted file mode 100644
index 083a86e..0000000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit eutils perl-module python-r1 versionator
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="http://launchpad.net/apparmor/$(get_version_component_range 1-2)/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-LANGS="af ar bg bn bs ca cs cy da de el en_GB en_US es et fi fr gl
-	gu he hi hr hu id it ja ka km ko lo lt mk mr nb nl pa pl pt
-	pt_BR pt_PT ro ru si sk sl sr sv ta th tr uk vi wa xh zh_CN
-	zh_TW zu"
-
-for X in ${LANGS} ; do
-	IUSE+=" linguas_${X}"
-done
-unset X
-
-DEPEND="dev-lang/perl
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	~sys-libs/libapparmor-${PV}[perl]
-	~sys-apps/apparmor-${PV}
-	dev-perl/Locale-gettext
-	dev-perl/RPC-XML
-	dev-perl/TermReadKey
-	virtual/perl-Data-Dumper
-	virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}/utils
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-hu.patch"
-
-	local lang
-	for lang in ${LANGS}; do
-		if ! use linguas_${lang}; then
-			rm po/${lang}.po || die "failed to remove nls"
-		fi
-	done
-}
-
-src_compile() {
-	python_export_best
-
-	# launches non-make subprocesses causing "make jobserver unavailable"
-	# error messages to appear in generated code
-	emake -j1
-}
-
-src_install() {
-	perlinfo
-	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-	install_python() {
-		"${PYTHON}" "${S}"/python-tools-setup.py install --prefix=/usr \
-			--root="${D}" --version="${PV}"
-	}
-
-	python_foreach_impl install_python
-	python_replicate_script "${D}"/usr/bin/aa-easyprof
-}

diff --git a/sys-apps/apparmor-utils/files/apparmor-utils-2.8.1-hu.patch b/sys-apps/apparmor-utils/files/apparmor-utils-2.8.1-hu.patch
deleted file mode 100644
index aa8b661..0000000
--- a/sys-apps/apparmor-utils/files/apparmor-utils-2.8.1-hu.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- utils/po/hu.po
-+++ utils/po/hu.po
-@@ -333,11 +333,11 @@
- 
- #: ../AppArmor.pm:1379 ../AppArmor.pm:1419
- msgid "(Y)es"
--msgstr "Igen"
-+msgstr "(I)gen"
- 
- #: ../AppArmor.pm:1380 ../AppArmor.pm:1420
- msgid "(N)o"
--msgstr "Nem"
-+msgstr "(N)em"
- 
- #: ../AppArmor.pm:1383 ../AppArmor.pm:1424
- msgid "Invalid hotkey for"

diff --git a/sys-apps/apparmor-utils/metadata.xml b/sys-apps/apparmor-utils/metadata.xml
deleted file mode 100644
index 14820df..0000000
--- a/sys-apps/apparmor-utils/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>kensington@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">apparmor</remote-id>
-	</upstream>
-</pkgmetadata>