From a8bf94f371a5771e15c76fcd8ba3b23e70292895 Mon Sep 17 00:00:00 2001 From: Fredrik Eriksson Date: Sun, 15 Nov 2026 16:42:26 +0100 Subject: [PATCH] bump and fix selinux policies for sysutisl --- sec-policy/selinux-eix/Manifest | 2 +- sec-policy/selinux-eix/files/eix.te | 1 + sec-policy/selinux-sau/Manifest | 4 +- ...-1.6.0.ebuild => selinux-sau-1.6.1.ebuild} | 0 sec-policy/selinux-zsnapper/Manifest | 5 +++ sec-policy/selinux-zsnapper/files/zsnapper.fc | 3 ++ sec-policy/selinux-zsnapper/files/zsnapper.te | 44 +++++++++++++++++++ .../selinux-zsnapper-2.20260616_p1.ebuild | 23 ++++++++++ sys-apps/sau/Manifest | 4 +- .../{sau-1.6.0.ebuild => sau-1.6.1.ebuild} | 0 sys-apps/zsnapper/Manifest | 4 +- ...-0.3.6-r1.ebuild => zsnapper-0.3.7.ebuild} | 8 ++-- 12 files changed, 88 insertions(+), 10 deletions(-) rename sec-policy/selinux-sau/{selinux-sau-1.6.0.ebuild => selinux-sau-1.6.1.ebuild} (100%) create mode 100644 sec-policy/selinux-zsnapper/Manifest create mode 100644 sec-policy/selinux-zsnapper/files/zsnapper.fc create mode 100644 sec-policy/selinux-zsnapper/files/zsnapper.te create mode 100644 sec-policy/selinux-zsnapper/selinux-zsnapper-2.20260616_p1.ebuild rename sys-apps/sau/{sau-1.6.0.ebuild => sau-1.6.1.ebuild} (100%) rename sys-apps/zsnapper/{zsnapper-0.3.6-r1.ebuild => zsnapper-0.3.7.ebuild} (79%) diff --git a/sec-policy/selinux-eix/Manifest b/sec-policy/selinux-eix/Manifest index ca44315..74a3781 100644 --- a/sec-policy/selinux-eix/Manifest +++ b/sec-policy/selinux-eix/Manifest @@ -1,6 +1,6 @@ AUX eix.fc 213 BLAKE2B 5f2cfa1a12b5cd1ab79e6ccefd81e8b5107e506c2a93d9665e947a16010622ef1a10742f486ce2bcfd3b9e7c64b14f6ff8e7becce7017ef8b9b1639671e3a448 SHA512 1c6d6425a45e6154631cb22d268012cfb31bc6f1b33a5c7e8fb2d97415ffcd59babe94425e0f8fe92f237d214ef107a82e2996622a822b90bd0da3e19e05101e AUX eix.if 183 BLAKE2B 354678a2b5d32d235bab5e7ede349e89d2ab5c3bbdf657dac58a3674ebca2e7f6c2c1a254c319e2f6c89211f5e76410f8e256b493e64979438047dbed2d86ae3 SHA512 e7b5740060a9933dd5be4367047541a297f023dd24754045422bffe3104a859f2a7c012abc031537130b61e0cc0980412982584ffdaf2c0f9bdef8b1c2346de5 -AUX eix.te 1755 BLAKE2B 542f0b139a9a3981781712cf0c03ba9f2fc32faad5217937f38811d8c3aad4acc74ef75f4748607fe0d7fd259c3d09ad420a37a952ebe100372ebe1782c649a3 SHA512 22d501bc9f0d6dee4ec91ea6388708d79dd2ae168917c28392275a987e857223b6f325d494d9480f61ba21365c490ccdfb3163f55664b63881a46bd683023411 +AUX eix.te 1793 BLAKE2B bd9add385da21a6fdfe70d52f74724e16231a29c16abcffb96153fc447c20de0c00705b34f0a5f6fe3b871519507455a9551a2de2ec87a1dde745f53c3480cc4 SHA512 a5a06148828239c4b63406f6f48e5532f84be2efcc858ab85fe6df1fe9fa2c908cfecc2b62bb3b0b20877828d67a8aece79833a9ae1a7f71d5e8c93a02a2f3b6 DIST patchbundle-selinux-base-policy-2.20260616_p1.tar.bz2 297301 BLAKE2B a0fb3505d10044e02e34b5d72cc88dac7e9d1234a504d2cfb894827573a1cd69020722ef8023f2d37ad33e571ddeb00d377f5f37d9bed1925e0ab750235574c2 SHA512 dcf1becdf8bf75c4cf4f3e9b96a39fecd329d5f9accb2bb39fd6f61df511654fbe6f9c34094dbf0f8ae4e5e24faa59502df0a80af80a0d29adfdfb9b8be10ddd DIST refpolicy-2.20260616.tar.bz2 655092 BLAKE2B b8dbfce78d68bb771f7f3795b00bee063d84d3eb4025e1ddb97592bfd25d8ae42868e9c03a0e2d86fb981c724f25e2d0dca73e21f978e3dffd1947ae2aa21064 SHA512 14336a518ac074e03ece3a97d61ba2e1e1edac270a80feb605c56a0d871166989043142534511c70c151c78b4ad5748c3aea9d77125538acdebdab8f2e06f21f EBUILD selinux-eix-2.20260616_p1.ebuild 405 BLAKE2B 0e8e105493a2f44927a7851fb301356f0d082f9404afc47bfcab27560e51f74156ffcda405c2425356d25f036ce22aaca81c243c95c6b1b46952f875b8131110 SHA512 2d9ca2d5c12c387c93207355534aa3f7f317725bbf3d7b2823ae13ac85478ed3a1d1aa2379536e92282255828fd095c34400f4af6fc654c50dd369b2ea0da7e2 diff --git a/sec-policy/selinux-eix/files/eix.te b/sec-policy/selinux-eix/files/eix.te index 41e8821..95cf7e7 100644 --- a/sec-policy/selinux-eix/files/eix.te +++ b/sec-policy/selinux-eix/files/eix.te @@ -33,6 +33,7 @@ corecmd_exec_shell(eix_t) miscfiles_read_localization(eix_t) allow eix_t self:fifo_file rw_fifo_file_perms; corecmd_exec_bin(eix_t) +allow eix_t eix_exec_t:lnk_file read; files_read_usr_files(eix_t) files_map_usr_files(eix_t) can_exec(eix_t, eix_exec_t) diff --git a/sec-policy/selinux-sau/Manifest b/sec-policy/selinux-sau/Manifest index c51be05..670f193 100644 --- a/sec-policy/selinux-sau/Manifest +++ b/sec-policy/selinux-sau/Manifest @@ -1,2 +1,2 @@ -DIST sau-v1.6.0.tar.gz 11971 BLAKE2B 0d4eaca2bda4a9a01a5a21eae831c7b534e6dbf02394ad1f2760a3fc5f1b12808ab7d4bdf2ca1052a42bf0776ddc97b7b1999b6c7ea0bb415dc7c240137bb000 SHA512 841be36587973317f9eca2e348c402ddca66f83c94ee7d09d63b46abe6c71a92138d63ee670520c2dc3129ba623399f0305366fddcbc5eea4db8db04a3687327 -EBUILD selinux-sau-1.6.0.ebuild 1097 BLAKE2B 3056e629542f21e726659f7832de21464de2c62fc7382415dfed5a21e3718be52f4d42c995518417e39aead9dd5ae517f684edb1e04e994da133a75ee64567c9 SHA512 2d541189acbbba8f9f80db9457352e08504ceb5eb8c0002123cfe413a9efc903cffb87d5690dfebe5167c543cd9c54ea617a0363c8a0f195b20612ce8577f9c0 +DIST sau-v1.6.1.tar.gz 12110 BLAKE2B 1cf2fb5ddb5b8fe2e494cccb93e1be9394c4e82250dd594c4d1aaa3ea59dc22bb2fca32ea46426bc84842393c20a9329ef51da970b471ef61af0929895c0ac6e SHA512 c4c7f332485eff155cb049bc9b7948d5c75a6390698b45bccc2369f0f1094dbdb2701f199c5a8eccab3dd6413127983928a19cabdfeca2ef165b4c8c10ef8390 +EBUILD selinux-sau-1.6.1.ebuild 1097 BLAKE2B 3056e629542f21e726659f7832de21464de2c62fc7382415dfed5a21e3718be52f4d42c995518417e39aead9dd5ae517f684edb1e04e994da133a75ee64567c9 SHA512 2d541189acbbba8f9f80db9457352e08504ceb5eb8c0002123cfe413a9efc903cffb87d5690dfebe5167c543cd9c54ea617a0363c8a0f195b20612ce8577f9c0 diff --git a/sec-policy/selinux-sau/selinux-sau-1.6.0.ebuild b/sec-policy/selinux-sau/selinux-sau-1.6.1.ebuild similarity index 100% rename from sec-policy/selinux-sau/selinux-sau-1.6.0.ebuild rename to sec-policy/selinux-sau/selinux-sau-1.6.1.ebuild diff --git a/sec-policy/selinux-zsnapper/Manifest b/sec-policy/selinux-zsnapper/Manifest new file mode 100644 index 0000000..c8f5d03 --- /dev/null +++ b/sec-policy/selinux-zsnapper/Manifest @@ -0,0 +1,5 @@ +AUX zsnapper.fc 233 BLAKE2B 3636369e203cb86d3d8c60f7b0007a38e0898e3e87f635a7207d3631f2e58bede12c2e1f15990af9a9564986971b8c5fbe79b8eac741209bdca9cbaaab1a7108 SHA512 78ae14784bd17c75cada884b8105eda41ecbbd77de0beb497d15d4d5e8b562f003f2b4cce54410dd4a5105be2f690e187accae319dfc62d46bf58b27b066375b +AUX zsnapper.te 1078 BLAKE2B 4913f19f71c2d6ea721c1b3d8e3a82e722f2c679de19813398a83310aa76a966c8a37b90076496d5d7ba48652aa3f8448721a23bc99cf1b4b57a1bc6209011f1 SHA512 82d02467949f07341f665fa0a90fdd66491bdaebaaacca2b56c684dbc1627217213e24912059804ef6f30b0d34f084b8508b58a1162e70f05a3eb6c5aecbd45f +DIST patchbundle-selinux-base-policy-2.20260616_p1.tar.bz2 297301 BLAKE2B a0fb3505d10044e02e34b5d72cc88dac7e9d1234a504d2cfb894827573a1cd69020722ef8023f2d37ad33e571ddeb00d377f5f37d9bed1925e0ab750235574c2 SHA512 dcf1becdf8bf75c4cf4f3e9b96a39fecd329d5f9accb2bb39fd6f61df511654fbe6f9c34094dbf0f8ae4e5e24faa59502df0a80af80a0d29adfdfb9b8be10ddd +DIST refpolicy-2.20260616.tar.bz2 655092 BLAKE2B b8dbfce78d68bb771f7f3795b00bee063d84d3eb4025e1ddb97592bfd25d8ae42868e9c03a0e2d86fb981c724f25e2d0dca73e21f978e3dffd1947ae2aa21064 SHA512 14336a518ac074e03ece3a97d61ba2e1e1edac270a80feb605c56a0d871166989043142534511c70c151c78b4ad5748c3aea9d77125538acdebdab8f2e06f21f +EBUILD selinux-zsnapper-2.20260616_p1.ebuild 413 BLAKE2B 5fa2b7fb16db70a9796f4622d1593c72bb2aea812971e0e35e586555ebe4f145ec13937d227ebbde170ffca003de257cacad0f44a21499de061ad103ee99809c SHA512 58e22455630fe34df1ac2ef8fc4a289d762d2c9af24a6eb7cdfb3fc91533a878a3287ccdba9445310c1a0a3c8624953b09703329146ddf2cef73c50d43ca390d diff --git a/sec-policy/selinux-zsnapper/files/zsnapper.fc b/sec-policy/selinux-zsnapper/files/zsnapper.fc new file mode 100644 index 0000000..009d97f --- /dev/null +++ b/sec-policy/selinux-zsnapper/files/zsnapper.fc @@ -0,0 +1,3 @@ +/usr/bin/zsnapper gen_context(system_u:object_r:zsnapper_exec_t,s0) +/usr/local/bin/zsnapper-.* gen_context(system_u:object_r:zsnapper_exec_t,s0) +/etc/zsnapper.ini gen_context(system_u:object_r:zsnapper_config_t,s0) diff --git a/sec-policy/selinux-zsnapper/files/zsnapper.te b/sec-policy/selinux-zsnapper/files/zsnapper.te new file mode 100644 index 0000000..f8439b6 --- /dev/null +++ b/sec-policy/selinux-zsnapper/files/zsnapper.te @@ -0,0 +1,44 @@ +policy_module(zsnapper) + +gen_require(` + attribute admindomain; + + type etc_t; + + role sysadm_r; +') + +type zsnapper_t; +type zsnapper_exec_t; +type zsnapper_config_t; +type zsnapper_tmp_t; + +files_config_file(zsnapper_config_t) +files_tmp_file(zsnapper_tmp_t) +files_tmp_filetrans(zsnapper_t, zsnapper_tmp_t, file) + +init_domain(zsnapper_t, zsnapper_exec_t) + +role sysadm_r types zsnapper_t; +domtrans_pattern(admindomain, zsnapper_exec_t, zsnapper_t) + +domain_use_interactive_fds(zsnapper_t) +userdom_use_inherited_user_terminals(zsnapper_t) + +read_files_pattern(zsnapper_t, etc_t, zsnapper_config_t) +zfs_domtrans(zsnapper_t) +corecmd_exec_bin(zsnapper_t) +miscfiles_read_localization(zsnapper_t) +logging_send_syslog_msg(zsnapper_t) + +rw_fifo_files_pattern(zsnapper_t, zsnapper_t, zsnapper_t) +manage_files_pattern(zsnapper_t, tmp_t, zsnapper_tmp_t) + +gen_tunable(zsnapper_link_portage, false) +tunable_policy(`zsnapper_link_portage', ` + gen_require(` + type portage_ebuild_t; + ') + manage_lnk_files_pattern(zsnapper_t, portage_ebuild_t, portage_ebuild_t) + corecmd_exec_shell(zsnapper_t) +') diff --git a/sec-policy/selinux-zsnapper/selinux-zsnapper-2.20260616_p1.ebuild b/sec-policy/selinux-zsnapper/selinux-zsnapper-2.20260616_p1.ebuild new file mode 100644 index 0000000..4af97f5 --- /dev/null +++ b/sec-policy/selinux-zsnapper/selinux-zsnapper-2.20260616_p1.ebuild @@ -0,0 +1,23 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="SELinux policies required by feffe for various reasons" +HOMEPAGE="https://fulh.ax/feffe" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86 arm64" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" +BDEPEND="" + +MODS="zsnapper" +BASEPOL="${PVR}" +POLICY_FILES=( zsnapper.te zsnapper.fc ) + +inherit selinux-policy-2 + diff --git a/sys-apps/sau/Manifest b/sys-apps/sau/Manifest index 8c7e79e..3b70b02 100644 --- a/sys-apps/sau/Manifest +++ b/sys-apps/sau/Manifest @@ -1,3 +1,3 @@ -DIST sau-1.6.0.tar.gz 11971 BLAKE2B 0d4eaca2bda4a9a01a5a21eae831c7b534e6dbf02394ad1f2760a3fc5f1b12808ab7d4bdf2ca1052a42bf0776ddc97b7b1999b6c7ea0bb415dc7c240137bb000 SHA512 841be36587973317f9eca2e348c402ddca66f83c94ee7d09d63b46abe6c71a92138d63ee670520c2dc3129ba623399f0305366fddcbc5eea4db8db04a3687327 -EBUILD sau-1.6.0.ebuild 740 BLAKE2B 15a521d7e0e5c97b10adf227aa73f0cba9684192318ba316791b7a5cc8294a553b2a8f6a669dc876713dcad5308eb4af202126c8c999ad2efa76b69737876f40 SHA512 51aceac32832da0a3212b1b52d04581f663cd351f815a4c63e516bce35532001e2c44e959a8600c53ea87c4d02d948f0f6efb17d87e4045c298eeee769bb80c9 +DIST sau-1.6.1.tar.gz 12110 BLAKE2B 1cf2fb5ddb5b8fe2e494cccb93e1be9394c4e82250dd594c4d1aaa3ea59dc22bb2fca32ea46426bc84842393c20a9329ef51da970b471ef61af0929895c0ac6e SHA512 c4c7f332485eff155cb049bc9b7948d5c75a6390698b45bccc2369f0f1094dbdb2701f199c5a8eccab3dd6413127983928a19cabdfeca2ef165b4c8c10ef8390 +EBUILD sau-1.6.1.ebuild 740 BLAKE2B 15a521d7e0e5c97b10adf227aa73f0cba9684192318ba316791b7a5cc8294a553b2a8f6a669dc876713dcad5308eb4af202126c8c999ad2efa76b69737876f40 SHA512 51aceac32832da0a3212b1b52d04581f663cd351f815a4c63e516bce35532001e2c44e959a8600c53ea87c4d02d948f0f6efb17d87e4045c298eeee769bb80c9 EBUILD sau-9999.ebuild 716 BLAKE2B 32f250522bd52a22077bab70cebb6edc1c9c76cc38046c1c38e39486383a3bf32cbbd4e46f418069a31ca67eb920e35d5efc309dab30b6236a1e2a5d1c13c0d5 SHA512 6f848c0198260491ff2cc7fd46b5aaa52b202c78714a940e6cc2141396203a28a7bff461d6cad61b5c627ae50ebd5d42d089b84f440478bd385898c315c887a7 diff --git a/sys-apps/sau/sau-1.6.0.ebuild b/sys-apps/sau/sau-1.6.1.ebuild similarity index 100% rename from sys-apps/sau/sau-1.6.0.ebuild rename to sys-apps/sau/sau-1.6.1.ebuild diff --git a/sys-apps/zsnapper/Manifest b/sys-apps/zsnapper/Manifest index 42e0f43..2ebaa0e 100644 --- a/sys-apps/zsnapper/Manifest +++ b/sys-apps/zsnapper/Manifest @@ -1,3 +1,3 @@ -DIST zsnapper-0.3.6.tar.gz 11757 BLAKE2B 3bda24c71f7176732ed0d2a29f49378833c2111561aeca43333a3ee46aa097f3805633c7d598125d5933128aadce770136a9bb4e64efd0b594f1ad8b1934ac2a SHA512 d0e801ceece9f8833acd07af367c387fb4fd4a1fe91a1768dcf6f0fa4602c44864bc63e8a893e61c2b85c333b56220bdc9ed08ba4be02fd5347586b1db9d798d -EBUILD zsnapper-0.3.6-r1.ebuild 645 BLAKE2B 1353eb483d962dbe9acc178a1b843bcc14e7151ad7cb7a9927d943e2a6a0c6bb2a9a9e7a0491db8825fcbc35c83df2bcba92f394c86de881974c6e1f4ef136e8 SHA512 6a41ca5858274ddcf19401c7f2dd8092e03aff66877ff4a38186aba90b2c962bb72fba838dc9132364c1241bafaf2152098a9211118f00eff8220409808786b6 +DIST zsnapper-0.3.7.tar.gz 11776 BLAKE2B aa546760b4ff3f2eded37e7ce62044bde2b9586ef6268bf4a74d58830d215bf6605b277de4e31e72f7f828091226fc63da288b5c5328028b19fe3208de5b11eb SHA512 d631e2ba9d750a2356e4420a2a2d250fbcfb140d1b59ac490d399d9b3749d1bb45512d8e0d41f6ba24bdf6a838c63bdcdeece5cb24c48daee9e3f3589b3ddbbd +EBUILD zsnapper-0.3.7.ebuild 732 BLAKE2B 79b628464e49705edaf7df38bfb8390fddb2945bf02015142d02cb54f76dea7d0a6387347e7cf49f4e0fa2dbd088c8da5afe28cd725c923030be8c17104223c7 SHA512 c66accfc824fbd158441e189f48ef6b73441ca465975a22ed86affef9274b8cfb69eb3f281c9fe24b17ce581bd5fa0105b373c8612e6219474cfdeaf6b19f58f EBUILD zsnapper-9999.ebuild 645 BLAKE2B 1353eb483d962dbe9acc178a1b843bcc14e7151ad7cb7a9927d943e2a6a0c6bb2a9a9e7a0491db8825fcbc35c83df2bcba92f394c86de881974c6e1f4ef136e8 SHA512 6a41ca5858274ddcf19401c7f2dd8092e03aff66877ff4a38186aba90b2c962bb72fba838dc9132364c1241bafaf2152098a9211118f00eff8220409808786b6 diff --git a/sys-apps/zsnapper/zsnapper-0.3.6-r1.ebuild b/sys-apps/zsnapper/zsnapper-0.3.7.ebuild similarity index 79% rename from sys-apps/zsnapper/zsnapper-0.3.6-r1.ebuild rename to sys-apps/zsnapper/zsnapper-0.3.7.ebuild index 98dc0be..cf0e411 100644 --- a/sys-apps/zsnapper/zsnapper-0.3.6-r1.ebuild +++ b/sys-apps/zsnapper/zsnapper-0.3.7.ebuild @@ -3,13 +3,15 @@ EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{13,14} ) inherit distutils-r1 -DESCRIPTION="Tool for automatic upgrades" +DESCRIPTION="Tool for automatic zfs snapshot management" HOMEPAGE="https://gitea.fulh.ax/feffe/zsnapper" if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://gitea.fulh.ax/feffe/zsnapper.git" @@ -25,8 +27,8 @@ fi RESTRICT="mirror" LICENSE="BSD" SLOT="0" -IUSE="" +IUSE="selinux" -DEPEND="" +DEPEND="selinux? ( sec-policy/selinux-zsnapper )" RDEPEND="" BDEPEND=""