diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /sys-apps/apparmor | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'sys-apps/apparmor')
-rw-r--r-- | sys-apps/apparmor/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/apparmor/apparmor-3.0.0.ebuild | 72 | ||||
-rw-r--r-- | sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch | 18 | ||||
-rw-r--r-- | sys-apps/apparmor/files/apparmor-init-1 | 88 |
4 files changed, 182 insertions, 0 deletions
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest index a32c7541f927..7f51aaa55470 100644 --- a/sys-apps/apparmor/Manifest +++ b/sys-apps/apparmor/Manifest @@ -1,9 +1,13 @@ AUX apparmor-2.11.1-dynamic-link.patch 391 BLAKE2B a5326bd6d84b5ebe4a61067490b25c39a326c139437d73b3db5928332776b795b2405b4a1f6ee0b3aee3f496589b2d00b47cd4bba41f044c60fc8ad5d1a86102 SHA512 d0ef56293b556b0af74201321b01de5c763763ecfba8dac930f35c6f733667f148c59295c78edfab9d835893f5518a42aa38f16de7464e218fbd57727726713c AUX apparmor-2.13.1-makefile.patch 884 BLAKE2B 4400b00ab143c0ea3b1c14f996131fd023b66c01e694dcd9306d6e00f561f72a608df7a26e3692a8e851b0c91a227eb84d96fb5145b19535ee50ac61c37ec811 SHA512 c324d1dc2101e073df2bc6c3696396becb45e5c25e4c1d6797145554e0499c79353d3a2ad2cced18f42bb1cc315f8590ea2c1b7ee9a3882d5c483380f7c86c6d +AUX apparmor-3.0.0-makefile.patch 653 BLAKE2B c14bef5b5dd471cfef24303097be44814782e9d533c7e12b4057db1bb3145b86f5f988798fa77dc97976556dbdccf9ee490372e2ce5ce450391841fdf194bcd5 SHA512 8cdd9a0c1489d50f891307b4a9dd13a320b9380b93990630723ae4a7d49766603db2a9568af2ce928d29cc01917b0f5f2e3d6fa0fd72476997fba4b07943b548 AUX apparmor-init 1284 BLAKE2B 3329dadd3343ddbd9276b0a22a401d1cac6bea94abbd5bad897d9b9760742c1cc30dab5136d9a90e9f3068b6879d95d70376f5dec5fe1d13313dffc89a631fbb SHA512 4ee4747ec98a0828beb690bf5e01bc112d958bff4c68d60fc0cbb9f0707bd8daecc011dba3916aa6e6368f460eedce7f2ce42aad9ccea49a5d898dcae3d01148 +AUX apparmor-init-1 1238 BLAKE2B d41ff2534219e60b1495e53aea251d292d87cadd43a53c3d51ec8b49b5428b0ef183073469b2ae3817c306ae377779c98f250bca09d2c93e640350e78528b532 SHA512 0d8bae7b6f77335a34e2371b08f3fb2a7fb7b4684419a1e269a3b5ea37f71a9d173f4bd56abd37d34a45d1faa879663c828b66ebdcbeb202efd33b652ccb4d08 AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86f354126fd044e2da316303b3ba63ad6dbc747d59d423ea8e4df0f131090d0d7b405e0d303b3c32a71 SHA512 f6ba92053a93db0654a4290eb358afae4d7669cb89a02242544576d951fe57437c3570d92ac89ce4e9fd96c04c121f44523dd6bb136d58fea11424064375df31 AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7 AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651 +DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6 EBUILD apparmor-2.13.4.ebuild 1501 BLAKE2B d71174bf84d654ec83b524f29a3b07005a0f635a26b39310c88a1d5a224f87bd51caa9ef6c3464a0ec5efc7fcaaef0501fbf35351995c27c4719285ce3b3dafd SHA512 3f6dc75808586ef5b50a62ac3a77aae2675b7551934b8909443246e41373a231212f6da8e34756b08da88a57deb9162f2bd141fc16d27a34fd7f94819558f919 +EBUILD apparmor-3.0.0.ebuild 1631 BLAKE2B 554f5fbdcdcde96debac49f3ecd615346c17f3f916f24b21ddec5970978d21e08450084cfd80135f273b153fe61596b96c55fd31b5eeef7f2b288c605d63c221 SHA512 4bd655a6fd9f99cfb1b53cba3a8441bccb864ff826f4e27c0bc91a84e7e35e3bd76a97b00f45c87aabf9d196be26b516a02d24f9ea22cccce43eb9ac77623451 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8 diff --git a/sys-apps/apparmor/apparmor-3.0.0.ebuild b/sys-apps/apparmor/apparmor-3.0.0.ebuild new file mode 100644 index 000000000000..36c5b717c4b8 --- /dev/null +++ b/sys-apps/apparmor/apparmor-3.0.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd toolchain-funcs + +MY_PV="$(ver_cut 1-2)" + +DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system" +HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" +SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${MY_PV}/+download/${PN}-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc" + +RESTRICT="test" # bug 675854 + +RDEPEND="~sys-libs/libapparmor-${PV}" +DEPEND="${RDEPEND} + dev-lang/perl + sys-devel/bison + sys-devel/gettext + sys-devel/flex + doc? ( dev-tex/latex2html ) +" + +S=${WORKDIR}/apparmor-${PV}/parser + +PATCHES=( + "${FILESDIR}/${PN}-3.0.0-makefile.patch" + "${FILESDIR}/${PN}-2.11.1-dynamic-link.patch" +) + +src_prepare() { + default + + # remove warning about missing file that controls features + # we don't currently support + sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die + + # bug 634782 + sed -e "s/cpp/$(tc-getCPP) -/" \ + -i ../common/list_capabilities.sh \ + -i ../common/list_af_names.sh || die +} + +src_compile() { + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages + use doc && emake pdf +} + +src_test() { + emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check +} + +src_install() { + emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install + + dodir /etc/apparmor.d/disable + + newinitd "${FILESDIR}/${PN}-init-1" ${PN} + systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service + + use doc && dodoc techdoc.pdf + + exeinto /usr/share/apparmor + doexe "${FILESDIR}/apparmor_load.sh" + doexe "${FILESDIR}/apparmor_unload.sh" +} diff --git a/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch b/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch new file mode 100644 index 000000000000..9c03a4465c36 --- /dev/null +++ b/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch @@ -0,0 +1,18 @@ +* Avoid installing empty /var/lib/apparmor +* Install rc.apparmor.functions to Gentoo-appropriate location + +--- a/Makefile ++++ b/Makefile +@@ -407,10 +407,10 @@ + .PHONY: install-indep + install-indep: indep + install -m 755 -d $(INSTALL_CONFDIR) ++ install -m 755 -d ${DESTDIR}/usr/libexec + install -m 644 parser.conf $(INSTALL_CONFDIR) +- install -m 755 -d ${DESTDIR}/var/lib/apparmor + install -m 755 -d $(APPARMOR_BIN_PREFIX) +- install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX) ++ install -m 755 rc.apparmor.functions ${DESTDIR}/usr/libexec + $(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR} + $(MAKE) install_manpages DESTDIR=${DESTDIR} + diff --git a/sys-apps/apparmor/files/apparmor-init-1 b/sys-apps/apparmor/files/apparmor-init-1 new file mode 100644 index 000000000000..4addaee294b3 --- /dev/null +++ b/sys-apps/apparmor/files/apparmor-init-1 @@ -0,0 +1,88 @@ +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Load all configured profiles for the AppArmor security module." +description_reload="Reload all profiles" + +extra_started_commands="reload" + +aa_action() { + local arg=$1 + local return + + shift + $* + return=$? + + if [ ${return} -eq 0 ]; then + aa_log_success_msg $arg + else + aa_log_failure_msg arg + fi + + return $return +} + +aa_log_action_start() { + ebegin $1 +} + +aa_log_action_end() { + eend $1 +} + +aa_log_success_msg() { + einfo $1 +} + +aa_log_warning_msg() { + ewarn $1 +} + +aa_log_failure_msg() { + eerror $1 +} + +aa_log_skipped_msg() { + einfo $1 +} + +aa_log_daemon_msg() { + einfo $1 +} + +aa_log_end_msg() { + eend $1 +} + +. /usr/libexec/rc.apparmor.functions + +start() { + ebegin "Starting AppArmor" + eindent + + if ! is_apparmor_loaded ; then + eerror "AppArmor kernel support is not present" + eend 1 + return 1 + fi + + parse_profiles load + + eoutdent +} + +stop() { + ebegin "Stopping AppArmor" + eindent + apparmor_stop + eoutdent +} + +reload() { + # todo: split out clean_profiles into its own function upstream + # so we can do parse_profiles reload && clean_profiles + # and do a proper reload instead of restart + apparmor_restart +} |