From 479921825a5c44a5fbcd5441f00ee98e54db9bac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Dec 2023 13:34:50 +0000 Subject: gentoo auto-resync : 25:12:2023 - 13:34:50 --- sys-apps/Manifest.gz | Bin 49753 -> 49749 bytes sys-apps/dbus-broker/Manifest | 7 +-- sys-apps/dbus-broker/dbus-broker-32.ebuild | 65 --------------------- sys-apps/dbus-broker/dbus-broker-35.ebuild | 61 +++++++++++++++++++ sys-apps/dbus-broker/dbus-broker-9999.ebuild | 4 -- .../files/dbus-broker-32-apparmor-libaudit.patch | 26 --------- 6 files changed, 64 insertions(+), 99 deletions(-) delete mode 100644 sys-apps/dbus-broker/dbus-broker-32.ebuild create mode 100644 sys-apps/dbus-broker/dbus-broker-35.ebuild delete mode 100644 sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 3ba49f76f837..9111671a296c 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest index 521c18ecda26..2030db65938f 100644 --- a/sys-apps/dbus-broker/Manifest +++ b/sys-apps/dbus-broker/Manifest @@ -1,9 +1,8 @@ -AUX dbus-broker-32-apparmor-libaudit.patch 766 BLAKE2B 4cbca2ae01f7e63048f303953a131ea2a927cc372abadd5bf2a23ef5f5618e4045ce587eb9983b3d6040a70c6f4fba10acfd775fdda62ef976b3899f141d9d36 SHA512 750f68436845765db7a7ff12b42045fb2e25f15c177e4f08ed17bd4919e60d856837a54145920c276a7dff772e32e6ce48e4f1eac803cb4cdf05fc9e49ed6c22 AUX dbus-broker-33-strict-aliasing.patch 10322 BLAKE2B b89244315d09621876fcdc4b6d4fce34a351669ff5dcb136dd14e7b23156912a2aa32cadcb56491781cbeacc1f0e2aae3821fe5dc982639eebd5bcbc4936036a SHA512 2534520b8c54c74abc80c7834cbf89b7f36552097dff8be128747de197966d432fb33620090b60f98ad6e026d6ec8f5676a2f43ecf4a477154de582b4b683bc7 -DIST dbus-broker-32.tar.xz 248196 BLAKE2B 511159673f0e3a2260e611b85b80719506e9eafe9d93d743891be664e4a79e3ade48f6ec047fa085c414087673290d6b958eec30d3b0d27048e2c1a1521d6c10 SHA512 aa23d058771f56e6378df0a17ac413813b6350b77e61128c0887f35a546f10534b1a6d598868e9f5c642244c3632a8ce5e315e6794305a56f5abbebd36bf822c DIST dbus-broker-33.tar.xz 253172 BLAKE2B 2b1773999af5caa435acb9dca848c96863b8d738dee6c3542e492d031555c0251a07d371465cd5dc071c0198b33251bf8233f18ddaa7ae34dc9b5df938ca9298 SHA512 776684a5d19a6c25fc46dff19821014a32d967f8132385b86c5281f2d69192dce64b3ad92ae6a158d1d64753e89d918385a1a31f32811f54060504113f065baa -EBUILD dbus-broker-32.ebuild 1232 BLAKE2B 239580fb9a9e2b550051277c65ce6a5d7d936d81fe85a90310e318df57c4710fbe33083330c7cd581714055814399477caa4a4d187cac620850b3e09428a415d SHA512 38099a8a113cadfe8b3c24086dec2b58c015fd78ffe2cf4cc8121bcb9157d721593d7ae3c82a57fa2eaff7821b24c22d144a9758e5add144bbe0f8faa959c447 +DIST dbus-broker-35.tar.xz 263388 BLAKE2B 2c270197d76ec157bf2fd8eb561b49cea2739d656fac8129c4ecdd0bbd5804f8e4e427414cb5f209eef4c22cf9559fc409170476d8df0e1d252c0b5aa2288e01 SHA512 409e415889bd53b78e92ba077455e5583852a071e233e4b23dcbb23d8a367f177d6c8138e6fc113dcfe48440b68d594c1a076cb43ef445d472645f671d5ae033 EBUILD dbus-broker-33-r1.ebuild 1297 BLAKE2B bb3cd910bca3b692203185d5d142dad91ee441768f498608d5ba729024f21e081dfbb776ad4f26d84c04f8e5824791b6ec4e5c3a55de12e0d221838abfd4ef65 SHA512 294b7867ebfd4e74cef21eea865d9622c6125abe154f7d2656499261b3715faf4729c050ea0c287b17adddb7de7ada9279f89e6808a9f3ca8300cb78a8c8796a EBUILD dbus-broker-33-r2.ebuild 1227 BLAKE2B 6c82b46ba49e0011b7466503fc8e199dd3e72c56c7276cdbfc2fadc3258cc4a58af6050c8b3ce2b9190745441a1e2be9dd954e7d526e5331b81b4c624053f05f SHA512 4250788c76eaaa0bec0eeee709fd37b5908c9ee511e1b6bb1b4a43243dd48381fad72ad02f46028ab2b5420825790242aa052f419cb19716688f592806dee4f1 -EBUILD dbus-broker-9999.ebuild 1227 BLAKE2B 6c82b46ba49e0011b7466503fc8e199dd3e72c56c7276cdbfc2fadc3258cc4a58af6050c8b3ce2b9190745441a1e2be9dd954e7d526e5331b81b4c624053f05f SHA512 4250788c76eaaa0bec0eeee709fd37b5908c9ee511e1b6bb1b4a43243dd48381fad72ad02f46028ab2b5420825790242aa052f419cb19716688f592806dee4f1 +EBUILD dbus-broker-35.ebuild 1168 BLAKE2B 257e047167eb304c53601c1a022bbb91ed28e585d782a6a62fda58727432abdf84460d145d23c89ed5061f3d4f3a71014ba716836856748c3fa5083ebb2e35d5 SHA512 f743e5e0f7e4a90fe6911ae53402ad0a47e46d1efe109d61e503a7e26172865ce630d9b8c8cbc5de548921b55bbc80188ce5f2f199f0d54f128b8eba18b2adda +EBUILD dbus-broker-9999.ebuild 1168 BLAKE2B 257e047167eb304c53601c1a022bbb91ed28e585d782a6a62fda58727432abdf84460d145d23c89ed5061f3d4f3a71014ba716836856748c3fa5083ebb2e35d5 SHA512 f743e5e0f7e4a90fe6911ae53402ad0a47e46d1efe109d61e503a7e26172865ce630d9b8c8cbc5de548921b55bbc80188ce5f2f199f0d54f128b8eba18b2adda MISC metadata.xml 409 BLAKE2B 47bd4b617aaf73c385f1c321592abf3cb4fe06dbc35a574a9cd8f65417a6554314e7034a47d36c04a7f90264c6087103ac3cbcd051d5177b38f22550553b07c0 SHA512 048e0790b2c9e8dbbf446d4ce2651124245976194260b1813b3e1807366ba09cdb204a9787dc77bca0f9bc4400fe94422cfdbe63d729c3333b67c98a6a20a1c3 diff --git a/sys-apps/dbus-broker/dbus-broker-32.ebuild b/sys-apps/dbus-broker/dbus-broker-32.ebuild deleted file mode 100644 index 9df469803b74..000000000000 --- a/sys-apps/dbus-broker/dbus-broker-32.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2017-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git" -else - SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="amd64 arm64 ppc64 ~riscv" -fi - -DESCRIPTION="Linux D-Bus Message Broker" -HOMEPAGE="https://github.com/bus1/dbus-broker/wiki" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="apparmor audit doc +launcher selinux" - -DEPEND=" - apparmor? ( - >=sys-libs/libapparmor-3.0 - ) - audit? ( - >=sys-process/audit-3.0 - >=sys-libs/libcap-ng-0.6 - ) - launcher? ( - >=dev-libs/expat-2.2 - >=sys-apps/systemd-230:0= - ) - selinux? ( >=sys-libs/libselinux-3.2 ) -" -RDEPEND="${DEPEND} - launcher? ( sys-apps/dbus )" -BDEPEND=" - doc? ( dev-python/docutils ) - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/dbus-broker-32-apparmor-libaudit.patch" -) - -if [[ ${PV} == 9999 ]]; then -src_unpack() { - git-r3_src_unpack - cd "${P}" || die - meson subprojects download || die -} -fi - -src_configure() { - local emesonargs=( - $(meson_use apparmor) - $(meson_use audit) - $(meson_use doc docs) - $(meson_use launcher) - $(meson_use selinux) - ) - meson_src_configure -} diff --git a/sys-apps/dbus-broker/dbus-broker-35.ebuild b/sys-apps/dbus-broker/dbus-broker-35.ebuild new file mode 100644 index 000000000000..5a5836b5b997 --- /dev/null +++ b/sys-apps/dbus-broker/dbus-broker-35.ebuild @@ -0,0 +1,61 @@ +# Copyright 2017-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git" +else + SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +DESCRIPTION="Linux D-Bus Message Broker" +HOMEPAGE="https://github.com/bus1/dbus-broker/wiki" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="apparmor audit doc +launcher selinux" + +DEPEND=" + apparmor? ( + >=sys-libs/libapparmor-3.0 + ) + audit? ( + >=sys-process/audit-3.0 + >=sys-libs/libcap-ng-0.6 + ) + launcher? ( + >=dev-libs/expat-2.2 + >=sys-apps/systemd-230:0= + ) + selinux? ( >=sys-libs/libselinux-3.2 ) +" +RDEPEND="${DEPEND} + launcher? ( sys-apps/dbus )" +BDEPEND=" + doc? ( dev-python/docutils ) + virtual/pkgconfig +" + +if [[ ${PV} == 9999 ]]; then +src_unpack() { + git-r3_src_unpack + cd "${P}" || die + meson subprojects download || die +} +fi + +src_configure() { + local emesonargs=( + $(meson_use apparmor) + $(meson_use audit) + $(meson_use doc docs) + $(meson_use launcher) + $(meson_use selinux) + ) + meson_src_configure +} diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild index e1bb5c68ca07..5a5836b5b997 100644 --- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild +++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild @@ -41,10 +41,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}"/${PN}-33-strict-aliasing.patch -) - if [[ ${PV} == 9999 ]]; then src_unpack() { git-r3_src_unpack diff --git a/sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch b/sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch deleted file mode 100644 index 95bdb9a407e0..000000000000 --- a/sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ef1c9f03a6be40474486044b6a28780d12107d9b Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Mon, 26 Sep 2022 14:07:29 -0400 -Subject: [PATCH] Drop '#include ' from src/util/apparmor.c - -This header does not seem to be required. -Tested with -Dapparmor=true and -Daudit=true/-Daudit=false. - -Bug: https://bugs.gentoo.org/873082 -Signed-off-by: Mike Gilbert ---- - src/util/apparmor.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/util/apparmor.c b/src/util/apparmor.c -index f319ffcf..4b7a7809 100644 ---- a/src/util/apparmor.c -+++ b/src/util/apparmor.c -@@ -8,7 +8,6 @@ - - #include - #include --#include - #include - #include - #include -- cgit v1.2.3