* [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/files/, sys-apps/apparmor-utils/
@ 2016-01-12 16:11 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2016-01-12 16:11 UTC (permalink / raw
To: gentoo-commits
commit: 8748202605d13dd9f9d7111955cabd1cea1d1bde
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 11:51:31 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 16:10:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87482026
sys-apps/apparmor-utils: fix python handling
sys-apps/apparmor-utils/apparmor-utils-2.10.ebuild | 14 ++-
.../files/apparmor-utils-2.10-python2.patch | 132 +++++++++++++++++++++
.../files/apparmor-utils-2.10-shebang.patch | 16 +++
3 files changed, 158 insertions(+), 4 deletions(-)
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.10.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.10.ebuild
index 4dbe8b1..a034f03 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.10.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.10.ebuild
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4} )
inherit perl-module python-r1 versionator
DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
@@ -29,8 +29,13 @@ RDEPEND="${DEPEND}
S=${WORKDIR}/apparmor-${PV}/utils
+PATCHES=(
+ "${FILESDIR}/${PN}-2.10-python2.patch"
+ "${FILESDIR}/${PN}-2.10-shebang.patch"
+)
+
src_compile() {
- python_export_best
+ python_setup
# launches non-make subprocesses causing "make jobserver unavailable"
# error messages to appear in generated code
@@ -48,5 +53,6 @@ src_install() {
}
python_foreach_impl install_python
- python_replicate_script "${D}"/usr/bin/aa-easyprof
+ python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \
+ "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
}
diff --git a/sys-apps/apparmor-utils/files/apparmor-utils-2.10-python2.patch b/sys-apps/apparmor-utils/files/apparmor-utils-2.10-python2.patch
new file mode 100644
index 0000000..412c13c
--- /dev/null
+++ b/sys-apps/apparmor-utils/files/apparmor-utils-2.10-python2.patch
@@ -0,0 +1,132 @@
+Backport from upstream fixing runtime failure with python-2.
+
+https://bugs.launchpad.net/apparmor/+bug/1513880
+
+--- a/apparmor/common.py
++++ b/apparmor/common.py
+@@ -245,6 +245,15 @@
+ return False
+ return True
+
++def type_is_str(var):
++ ''' returns True if the given variable is a str (or unicode string when using python 2)'''
++ if type(var) == str:
++ return True
++ elif sys.version_info[0] < 3 and type(var) == unicode: # python 2 sometimes uses the 'unicode' type
++ return True
++ else:
++ return False
++
+ class DebugLogger(object):
+ def __init__(self, module_name=__name__):
+ self.debugging = False
+
+--- a/apparmor/rule/capability.py
++++ b/apparmor/rule/capability.py
+@@ -14,7 +14,7 @@
+ # ----------------------------------------------------------------------
+
+ from apparmor.regex import RE_PROFILE_CAP
+-from apparmor.common import AppArmorBug, AppArmorException
++from apparmor.common import AppArmorBug, AppArmorException, type_is_str
+ from apparmor.rule import BaseRule, BaseRuleset, parse_modifiers
+ import re
+
+@@ -47,7 +47,7 @@
+ self.all_caps = True
+ self.capability = set()
+ else:
+- if type(cap_list) == str:
++ if type_is_str(cap_list):
+ self.capability = {cap_list}
+ elif type(cap_list) == list and len(cap_list) > 0:
+ self.capability = set(cap_list)
+
+--- a/apparmor/rule/change_profile.py
++++ b/apparmor/rule/change_profile.py
+@@ -14,7 +14,7 @@
+ # ----------------------------------------------------------------------
+
+ from apparmor.regex import RE_PROFILE_CHANGE_PROFILE, strip_quotes
+-from apparmor.common import AppArmorBug, AppArmorException
++from apparmor.common import AppArmorBug, AppArmorException, type_is_str
+ from apparmor.rule import BaseRule, BaseRuleset, parse_modifiers, quote_if_needed
+
+ # setup module translations
+@@ -48,7 +48,7 @@
+ self.all_execconds = False
+ if execcond == ChangeProfileRule.ALL:
+ self.all_execconds = True
+- elif type(execcond) == str:
++ elif type_is_str(execcond):
+ if not execcond.strip():
+ raise AppArmorBug('Empty exec condition in change_profile rule')
+ elif execcond.startswith('/') or execcond.startswith('@'):
+@@ -62,7 +62,7 @@
+ self.all_targetprofiles = False
+ if targetprofile == ChangeProfileRule.ALL:
+ self.all_targetprofiles = True
+- elif type(targetprofile) == str:
++ elif type_is_str(targetprofile):
+ if targetprofile.strip():
+ self.targetprofile = targetprofile
+ else:
+
+--- a/apparmor/rule/network.py
++++ b/apparmor/rule/network.py
+@@ -16,7 +16,7 @@
+ import re
+
+ from apparmor.regex import RE_PROFILE_NETWORK
+-from apparmor.common import AppArmorBug, AppArmorException
++from apparmor.common import AppArmorBug, AppArmorException, type_is_str
+ from apparmor.rule import BaseRule, BaseRuleset, parse_modifiers
+
+ # setup module translations
+@@ -66,7 +66,7 @@
+ self.all_domains = False
+ if domain == NetworkRule.ALL:
+ self.all_domains = True
+- elif type(domain) == str:
++ elif type_is_str(domain):
+ if domain in network_domain_keywords:
+ self.domain = domain
+ else:
+@@ -78,7 +78,7 @@
+ self.all_type_or_protocols = False
+ if type_or_protocol == NetworkRule.ALL:
+ self.all_type_or_protocols = True
+- elif type(type_or_protocol) == str:
++ elif type_is_str(type_or_protocol):
+ if type_or_protocol in network_protocol_keywords:
+ self.type_or_protocol = type_or_protocol
+ elif type_or_protocol in network_type_keywords:
+
+--- a/apparmor/rule/rlimit.py
++++ b/apparmor/rule/rlimit.py
+@@ -16,7 +16,7 @@
+ import re
+
+ from apparmor.regex import RE_PROFILE_RLIMIT, strip_quotes
+-from apparmor.common import AppArmorBug, AppArmorException
++from apparmor.common import AppArmorBug, AppArmorException, type_is_str
+ from apparmor.rule import BaseRule, BaseRuleset, parse_comment, quote_if_needed
+
+ # setup module translations
+@@ -57,7 +57,7 @@
+ if audit or deny or allow_keyword:
+ raise AppArmorBug('The audit, allow or deny keywords are not allowed in rlimit rules.')
+
+- if type(rlimit) == str:
++ if type_is_str(rlimit):
+ if rlimit in rlimit_all:
+ self.rlimit = rlimit
+ else:
+@@ -70,7 +70,7 @@
+ self.all_values = False
+ if value == RlimitRule.ALL:
+ self.all_values = True
+- elif type(value) == str:
++ elif type_is_str(value):
+ if not value.strip():
+ raise AppArmorBug('Empty value in rlimit rule')
diff --git a/sys-apps/apparmor-utils/files/apparmor-utils-2.10-shebang.patch b/sys-apps/apparmor-utils/files/apparmor-utils-2.10-shebang.patch
new file mode 100644
index 0000000..19b8892
--- /dev/null
+++ b/sys-apps/apparmor-utils/files/apparmor-utils-2.10-shebang.patch
@@ -0,0 +1,16 @@
+Avoid rewriting the shebang.
+
+The ebuild will take care of this when replicating the script for each of the
+supported python implementations.
+
+--- a/python-tools-setup.py
++++ b/python-tools-setup.py
+@@ -43,7 +43,7 @@
+ f = prefix + s
+ # If we have a defined python version, use it instead of the system
+ # default
+- if 'PYTHON' in os.environ:
++ if False:
+ lines = open(os.path.basename(s)).readlines()
+ lines[0] = '#! /usr/bin/env %s\n' % os.environ['PYTHON']
+ open(f, 'w').write("".join(lines))
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/files/, sys-apps/apparmor-utils/
@ 2016-07-27 15:50 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2016-07-27 15:50 UTC (permalink / raw
To: gentoo-commits
commit: 27ca732a18d9c5b2299cc32c4412dbc71191c353
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 15:49:49 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 15:50:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27ca732a
sys-apps/apparmor-utils: remove old
Package-Manager: portage-2.3.0
sys-apps/apparmor-utils/Manifest | 1 -
sys-apps/apparmor-utils/apparmor-utils-2.10.ebuild | 58 ---------
.../files/apparmor-utils-2.10-python2.patch | 132 ---------------------
3 files changed, 191 deletions(-)
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index e3a788d..c80bc76 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,2 +1 @@
DIST apparmor-2.10.1.tar.gz 4494037 SHA256 07a76f338304baadc4ad69d025fe000b1ab4779a251ae8f338afdc13ef1e0f24 SHA512 93992c25f77bb46389160df8324c811b4c2f0fad4b425902b30ce31d6e1f3a0efe6b359c6f8348ef646f8b527584e1f19eb4f46b27fb1ba742489ad09d171278 WHIRLPOOL d59d935db520d3c59bd0398727a1151b3280c2bf56e8f978c3595f50ff06cb70aaddc0313a7d16705b8eadeb2018aeef7ce585423c3a6ed7c34dfd4e06df9c25
-DIST apparmor-2.10.tar.gz 2421759 SHA256 4d0e224257a29671b694bd9054edf0dd213aa690fd02844ecf3329b86ac506f4 SHA512 f659bc0efca3b0cf30dd5420427f0756a86bb9d5bbb12abe82aa60eb4a7ead7848a2b2d9d9ca9cea28161a9e998c9923cdea55d38755144e3d34da1a5ad52fdd WHIRLPOOL 762e2e12c6b6a9110c91a11578ef4d83a9a774b3a882a3a08ab4a5af3a16e53f66211fc6b4e68c8ef2a47ec0c312287864584640b0d2fe3c327d95525be710f8
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.10.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.10.ebuild
deleted file mode 100644
index a034f03..0000000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-inherit perl-module python-r1 versionator
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/apparmor/$(get_version_component_range 1-2)/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-lang/perl
- ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- ~sys-libs/libapparmor-${PV}[perl,python]
- ~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
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.10-python2.patch"
- "${FILESDIR}/${PN}-2.10-shebang.patch"
-)
-
-src_compile() {
- python_setup
-
- # launches non-make subprocesses causing "make jobserver unavailable"
- # error messages to appear in generated code
- emake -j1
-}
-
-src_install() {
- perl_set_version
- 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 "${D}"/usr/sbin/apparmor_status \
- "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
-}
diff --git a/sys-apps/apparmor-utils/files/apparmor-utils-2.10-python2.patch b/sys-apps/apparmor-utils/files/apparmor-utils-2.10-python2.patch
deleted file mode 100644
index 412c13c..0000000
--- a/sys-apps/apparmor-utils/files/apparmor-utils-2.10-python2.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-Backport from upstream fixing runtime failure with python-2.
-
-https://bugs.launchpad.net/apparmor/+bug/1513880
-
---- a/apparmor/common.py
-+++ b/apparmor/common.py
-@@ -245,6 +245,15 @@
- return False
- return True
-
-+def type_is_str(var):
-+ ''' returns True if the given variable is a str (or unicode string when using python 2)'''
-+ if type(var) == str:
-+ return True
-+ elif sys.version_info[0] < 3 and type(var) == unicode: # python 2 sometimes uses the 'unicode' type
-+ return True
-+ else:
-+ return False
-+
- class DebugLogger(object):
- def __init__(self, module_name=__name__):
- self.debugging = False
-
---- a/apparmor/rule/capability.py
-+++ b/apparmor/rule/capability.py
-@@ -14,7 +14,7 @@
- # ----------------------------------------------------------------------
-
- from apparmor.regex import RE_PROFILE_CAP
--from apparmor.common import AppArmorBug, AppArmorException
-+from apparmor.common import AppArmorBug, AppArmorException, type_is_str
- from apparmor.rule import BaseRule, BaseRuleset, parse_modifiers
- import re
-
-@@ -47,7 +47,7 @@
- self.all_caps = True
- self.capability = set()
- else:
-- if type(cap_list) == str:
-+ if type_is_str(cap_list):
- self.capability = {cap_list}
- elif type(cap_list) == list and len(cap_list) > 0:
- self.capability = set(cap_list)
-
---- a/apparmor/rule/change_profile.py
-+++ b/apparmor/rule/change_profile.py
-@@ -14,7 +14,7 @@
- # ----------------------------------------------------------------------
-
- from apparmor.regex import RE_PROFILE_CHANGE_PROFILE, strip_quotes
--from apparmor.common import AppArmorBug, AppArmorException
-+from apparmor.common import AppArmorBug, AppArmorException, type_is_str
- from apparmor.rule import BaseRule, BaseRuleset, parse_modifiers, quote_if_needed
-
- # setup module translations
-@@ -48,7 +48,7 @@
- self.all_execconds = False
- if execcond == ChangeProfileRule.ALL:
- self.all_execconds = True
-- elif type(execcond) == str:
-+ elif type_is_str(execcond):
- if not execcond.strip():
- raise AppArmorBug('Empty exec condition in change_profile rule')
- elif execcond.startswith('/') or execcond.startswith('@'):
-@@ -62,7 +62,7 @@
- self.all_targetprofiles = False
- if targetprofile == ChangeProfileRule.ALL:
- self.all_targetprofiles = True
-- elif type(targetprofile) == str:
-+ elif type_is_str(targetprofile):
- if targetprofile.strip():
- self.targetprofile = targetprofile
- else:
-
---- a/apparmor/rule/network.py
-+++ b/apparmor/rule/network.py
-@@ -16,7 +16,7 @@
- import re
-
- from apparmor.regex import RE_PROFILE_NETWORK
--from apparmor.common import AppArmorBug, AppArmorException
-+from apparmor.common import AppArmorBug, AppArmorException, type_is_str
- from apparmor.rule import BaseRule, BaseRuleset, parse_modifiers
-
- # setup module translations
-@@ -66,7 +66,7 @@
- self.all_domains = False
- if domain == NetworkRule.ALL:
- self.all_domains = True
-- elif type(domain) == str:
-+ elif type_is_str(domain):
- if domain in network_domain_keywords:
- self.domain = domain
- else:
-@@ -78,7 +78,7 @@
- self.all_type_or_protocols = False
- if type_or_protocol == NetworkRule.ALL:
- self.all_type_or_protocols = True
-- elif type(type_or_protocol) == str:
-+ elif type_is_str(type_or_protocol):
- if type_or_protocol in network_protocol_keywords:
- self.type_or_protocol = type_or_protocol
- elif type_or_protocol in network_type_keywords:
-
---- a/apparmor/rule/rlimit.py
-+++ b/apparmor/rule/rlimit.py
-@@ -16,7 +16,7 @@
- import re
-
- from apparmor.regex import RE_PROFILE_RLIMIT, strip_quotes
--from apparmor.common import AppArmorBug, AppArmorException
-+from apparmor.common import AppArmorBug, AppArmorException, type_is_str
- from apparmor.rule import BaseRule, BaseRuleset, parse_comment, quote_if_needed
-
- # setup module translations
-@@ -57,7 +57,7 @@
- if audit or deny or allow_keyword:
- raise AppArmorBug('The audit, allow or deny keywords are not allowed in rlimit rules.')
-
-- if type(rlimit) == str:
-+ if type_is_str(rlimit):
- if rlimit in rlimit_all:
- self.rlimit = rlimit
- else:
-@@ -70,7 +70,7 @@
- self.all_values = False
- if value == RlimitRule.ALL:
- self.all_values = True
-- elif type(value) == str:
-+ elif type_is_str(value):
- if not value.strip():
- raise AppArmorBug('Empty value in rlimit rule')
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/files/, sys-apps/apparmor-utils/
@ 2018-11-09 8:57 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2018-11-09 8:57 UTC (permalink / raw
To: gentoo-commits
commit: bef2e69aa258bede81195893d4b9f8846ce1565c
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 9 08:54:51 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Nov 9 08:56:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bef2e69a
sys-apps/apparmor-utils: remove 2.11.1
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
sys-apps/apparmor-utils/Manifest | 1 -
.../apparmor-utils/apparmor-utils-2.11.1.ebuild | 82 ----------------------
.../files/apparmor-utils-2.11-shebang.patch | 16 -----
3 files changed, 99 deletions(-)
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 10e4fbc530b..0a6a3ee99d9 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
DIST apparmor-2.12.tar.gz 7258450 BLAKE2B c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c SHA512 d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.11.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.11.1.ebuild
deleted file mode 100644
index 310ca84e60e..00000000000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.11.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit perl-module python-r1 toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-DEPEND="dev-lang/perl
- ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- ~sys-libs/libapparmor-${PV}[perl,python]
- ~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}
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.11-shebang.patch"
-)
-
-src_prepare() {
- default
-
- sed -i binutils/Makefile \
- -e 's/Bstatic/Bdynamic/g' \
- -e 's/EXTRA_CFLAGS = /& ${CFLAGS}/' || die
-}
-
-src_compile() {
- python_setup
-
- pushd utils > /dev/null || die
- # launches non-make subprocesses causing "make jobserver unavailable"
- # error messages to appear in generated code
- emake -j1
- popd > /dev/null || die
-
- pushd binutils > /dev/null || die
- export EXTRA_CFLAGS="${CFLAGS}"
- emake CC="$(tc-getCC)" USE_SYSTEM=1
- popd > /dev/null || die
-}
-
-src_install() {
- pushd utils > /dev/null || die
- perl_set_version
- emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
- VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
- install_python() {
- "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
- --root="${D}" --version="${PV}"
- }
-
- python_foreach_impl install_python
- python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \
- "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
- popd > /dev/null || die
-
- pushd binutils > /dev/null || die
- emake install DESTDIR="${D}" USE_SYSTEM=1
- popd > /dev/null || die
-}
diff --git a/sys-apps/apparmor-utils/files/apparmor-utils-2.11-shebang.patch b/sys-apps/apparmor-utils/files/apparmor-utils-2.11-shebang.patch
deleted file mode 100644
index 3dce7c26168..00000000000
--- a/sys-apps/apparmor-utils/files/apparmor-utils-2.11-shebang.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid rewriting the shebang.
-
-The ebuild will take care of this when replicating the script for each of the
-supported python implementations.
-
---- a/utils/python-tools-setup.py
-+++ b/utils/python-tools-setup.py
-@@ -43,7 +43,7 @@
- f = prefix + s
- # If we have a defined python version, use it instead of the system
- # default
-- if 'PYTHON' in os.environ:
-+ if False:
- lines = open(os.path.basename(s)).readlines()
- lines[0] = '#! /usr/bin/env %s\n' % os.environ['PYTHON']
- open(f, 'w').write("".join(lines))
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-11-09 8:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-09 8:57 [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/files/, sys-apps/apparmor-utils/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2016-07-27 15:50 Michael Palimaka
2016-01-12 16:11 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox