From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- sys-apps/apparmor-utils/Manifest | 6 +- .../apparmor-utils/apparmor-utils-3.0.1.ebuild | 88 ---------------------- .../apparmor-utils/apparmor-utils-3.0.3.ebuild | 8 +- .../apparmor-utils/apparmor-utils-3.0.4.ebuild | 87 +++++++++++++++++++++ 4 files changed, 94 insertions(+), 95 deletions(-) delete mode 100644 sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild create mode 100644 sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild (limited to 'sys-apps/apparmor-utils') diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest index 609124866f00..7fd694e31cfa 100644 --- a/sys-apps/apparmor-utils/Manifest +++ b/sys-apps/apparmor-utils/Manifest @@ -1,5 +1,5 @@ -DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5 -EBUILD apparmor-utils-3.0.1.ebuild 2270 BLAKE2B 2f634eb96254e823dd57e77b41b756dc330914e238876bc54586452d1b215b0b46f27092bd3677f4768c20765ad9132f8578da01f9055409149b6741757757af SHA512 1be4dd0bd8adf724cb48757c3005622c8a58a07655628b4c296dbfc7aa39c9941f30780903a27dbd4f5900d5702799dfc36371df7844cace317903938fdba28b -EBUILD apparmor-utils-3.0.3.ebuild 2253 BLAKE2B 1c00f8270847616ce07d8244aa85cf1b25a2a27ab706581012b9716839241bdd2b9a2f5411ff5efeeab32cb34d3e60175ae083c52217d31eac5a2da448910191 SHA512 4dd7b39d928040f91aae80c3f87cdca2b20b6f28c2c696f5acca124d55b0742a6997ed554494355c8a8a9220cafbc287a5544d279730b5bfd67339fc22fac925 +DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca +EBUILD apparmor-utils-3.0.3.ebuild 2264 BLAKE2B 6e929919d318c0f9ae00dee5a01a27f7fe5a3c1ee020a66d2153fb6755ee74bb6d922e4eb6dafa6145c9051ca7ac23f8ebb17eb360784fd8945dc1d466deacfd SHA512 2a9fe806c3091c1e27d3a792f6c890a33e049639892a54945d743c395bca1c0c2c58ac013e2ed4d3b8f637c8814567a132a103362f9dbdd3becadd2bb353eb43 +EBUILD apparmor-utils-3.0.4.ebuild 2265 BLAKE2B 191c173a77ce2d94cad20703a7e35ee1b5080a17d1f2176b47c9057ffa9cf03fd1bf06d180a5cca0dc73c22454fb0708bb0c434b3b1463cce5b3cb284332a4ef SHA512 2e06fbe024337c8f7146374882f3cef9e22e4df010f3e64485e283d03bbe103df6c6f2239e1771f4749022ee65c8fdb8d7e92f3fdf60377cd33d167901abb3fd MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild deleted file mode 100644 index a60091bfffbc..000000000000 --- a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) -inherit eapi7-ver perl-module python-r1 toolchain-funcs - -MY_PV="$(ver_cut 1-2)" - -DESCRIPTION="Additional userspace utils to assist with AppArmor profile management" -HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" -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" - -COMMON_DEPEND=" - dev-lang/perl - ~sys-libs/libapparmor-${PV} - ${PYTHON_DEPS}" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext -" -RDEPEND="${COMMON_DEPEND} - ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}] - ~sys-apps/apparmor-${PV} - dev-perl/Locale-gettext - dev-perl/RPC-XML - dev-perl/TermReadKey - dev-python/notify2[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - virtual/perl-Data-Dumper - virtual/perl-Getopt-Long" - -S=${WORKDIR}/apparmor-${PV} - -src_prepare() { - default - - sed -i binutils/Makefile \ - -e 's/Bstatic/Bdynamic/g' || die - - sed -i utils/aa-remove-unknown \ - -e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || 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() { - local -x PYTHONDONTWRITEBYTECODE= - "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \ - --root="${D}" --optimize 2 - } - - python_foreach_impl install_python - python_replicate_script "${D}"/usr/bin/aa-easyprof \ - "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,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/apparmor-utils-3.0.3.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild index 00aa102d612f..7db7337d04f3 100644 --- a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild +++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit perl-module python-r1 toolchain-funcs MY_PV="$(ver_cut 1-2)" @@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" @@ -73,7 +73,7 @@ src_install() { install_python() { local -x PYTHONDONTWRITEBYTECODE= "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \ - --root="${D}" --optimize 2 + --root="${D}" --optimize 2 --version=${PV} } python_foreach_impl install_python diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild new file mode 100644 index 000000000000..26e8c7c92a7a --- /dev/null +++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) +inherit perl-module python-r1 toolchain-funcs + +MY_PV="$(ver_cut 1-2)" + +DESCRIPTION="Additional userspace utils to assist with AppArmor profile management" +HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" +SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="test" + +COMMON_DEPEND=" + dev-lang/perl + ~sys-libs/libapparmor-${PV} + ${PYTHON_DEPS}" +DEPEND="${COMMON_DEPEND} + sys-devel/gettext +" +RDEPEND="${COMMON_DEPEND} + ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}] + ~sys-apps/apparmor-${PV} + dev-perl/Locale-gettext + dev-perl/RPC-XML + dev-perl/TermReadKey + dev-python/notify2[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + virtual/perl-Data-Dumper + virtual/perl-Getopt-Long" + +S=${WORKDIR}/apparmor-${PV} + +src_prepare() { + default + + sed -i binutils/Makefile \ + -e 's/Bstatic/Bdynamic/g' || die + + sed -i utils/aa-remove-unknown \ + -e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || 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() { + local -x PYTHONDONTWRITEBYTECODE= + "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \ + --root="${D}" --optimize 2 --version=${PV} + } + + python_foreach_impl install_python + python_replicate_script "${D}"/usr/bin/aa-easyprof \ + "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined} + popd > /dev/null || die + + pushd binutils > /dev/null || die + emake install DESTDIR="${D}" USE_SYSTEM=1 + popd > /dev/null || die +} -- cgit v1.2.3