* [gentoo-commits] repo/gentoo:master commit in: sys-auth/rtkit/, sys-auth/rtkit/files/
@ 2020-03-29 21:45 Marek Szuba
0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2020-03-29 21:45 UTC (permalink / raw
To: gentoo-commits
commit: 099134914860b99bf27462725a571fcb02c576dc
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 21:42:44 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 21:42:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09913491
sys-auth/rtkit: remove version using non-portable assembly
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-auth/rtkit/files/rtkit-0.12_noexecstack.patch | 10 -----
sys-auth/rtkit/rtkit-0.12.ebuild | 49 -----------------------
2 files changed, 59 deletions(-)
diff --git a/sys-auth/rtkit/files/rtkit-0.12_noexecstack.patch b/sys-auth/rtkit/files/rtkit-0.12_noexecstack.patch
deleted file mode 100644
index f156422f8f6..00000000000
--- a/sys-auth/rtkit/files/rtkit-0.12_noexecstack.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xml-introspection.S
-+++ b/xml-introspection.S
-@@ -1,3 +1,7 @@
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
- .section .rodata
- .global introspect_xml
- .type introspect_xml, @object
diff --git a/sys-auth/rtkit/rtkit-0.12.ebuild b/sys-auth/rtkit/rtkit-0.12.ebuild
deleted file mode 100644
index e37504af139..00000000000
--- a/sys-auth/rtkit/rtkit-0.12.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="Realtime Policy and Watchdog Daemon"
-HOMEPAGE="https://0pointer.de/blog/projects/rtkit"
-SRC_URI="https://github.com/heftig/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="systemd"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="acct-group/rtkit
- acct-user/rtkit
- sys-apps/dbus
- sys-auth/polkit
- sys-libs/libcap
- systemd? ( sys-apps/systemd )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.12_libsystemd_optional.patch
- "${FILESDIR}"/${PN}-0.12_noexecstack.patch
-)
-
-pkg_pretend() {
- if use kernel_linux; then
- CONFIG_CHECK="~!RT_GROUP_SCHED"
- ERROR_RT_GROUP_SCHED="CONFIG_RT_GROUP_SCHED is enabled. rtkit-daemon (or any other "
- ERROR_RT_GROUP_SCHED+="real-time task) will not work unless run as root. Please consider "
- ERROR_RT_GROUP_SCHED+="unsetting this option."
- check_extra_config
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable systemd systemd-integration)
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/rtkit/, sys-auth/rtkit/files/
@ 2020-05-09 11:16 Marek Szuba
0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2020-05-09 11:16 UTC (permalink / raw
To: gentoo-commits
commit: 49b8b811329c5e4b90ccb0c8299597627caf4a8f
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat May 9 10:49:30 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat May 9 11:16:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b8b811
sys-auth/rtkit: remove old
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-auth/rtkit/Manifest | 1 -
sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch | 14 -----
sys-auth/rtkit/files/rtkit-0.11-gettime.patch | 21 --------
sys-auth/rtkit/files/rtkit-0.11-polkit.patch | 36 -------------
sys-auth/rtkit/rtkit-0.11-r2.ebuild | 61 ----------------------
sys-auth/rtkit/rtkit-0.11-r3.ebuild | 58 --------------------
6 files changed, 191 deletions(-)
diff --git a/sys-auth/rtkit/Manifest b/sys-auth/rtkit/Manifest
index 6f7fdc043c6..83ba86e04a2 100644
--- a/sys-auth/rtkit/Manifest
+++ b/sys-auth/rtkit/Manifest
@@ -1,3 +1,2 @@
-DIST rtkit-0.11.tar.xz 126748 BLAKE2B e989f1fb9e33c2e06d7eedbe0aab45982d458b6a80aa8ba9b05ae94ed048ef1351d30f8800859a08d8bb0a53891e7b63f6bda6308b4521da10a61182ca3921f9 SHA512 4641af965dc64c0f498ae469fbee1ceb337204fa7d778fbbb41f2b5c5e88947e633c7e9ad037274fdd778c3c097a4a1dbb0b2add287d74eccbcd2d357cb2da22
DIST rtkit-0.12.tar.xz 127504 BLAKE2B c2132098b98f24c1f1662df08c9940772cdad9a326c0c4b9180aac2e0878b0c71e5917ab2535628aab12ff29546faef1c68f455625c77bc2bac25864dddfa4b6 SHA512 cee48058367b5b8a705203865538d0ab4bda9d2f1d06d155360922cb095b5d6a5b0311fdda6c45d9f33227324394ca5fd3b5a399fc71e11ea4c609eab18a7b04
DIST rtkit-0.13.tar.xz 130796 BLAKE2B 842d04556a47c199bed9fc6bc9281c0d88f83e183f01ef57ecbd80ce72949a301d6682a3aab96e996e71b82d8e8c7a85e1d44524f2ed6fbdffc6bf236cdcadaa SHA512 c058d770a4ccfdf4e2e3a713748b6a705b6d3e148a903b9dbba4bba9d3ded2b819d7dfbfa37b9fad78e57c0a5f10f2f94226f8738f666e692a085ab297a36b36
diff --git a/sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch b/sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch
deleted file mode 100644
index 7a36deeeae7..00000000000
--- a/sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git rtkit-0.11/rtkit-daemon.service.in~ rtkit-0.11/rtkit-daemon.service.in
-index 3dfefa6..d0dc786 100644
---- rtkit-0.11/rtkit-daemon.service.in~
-+++ rtkit-0.11/rtkit-daemon.service.in
-@@ -27,9 +27,5 @@ CapabilityBoundingSet=CAP_SYS_NICE CAP_DAC_READ_SEARCH CAP_SYS_PTRACE CAP_SYS_CH
- PrivateTmp=yes
- PrivateNetwork=yes
-
--# Work around the fact that the Linux currently doesn't assign any RT
--# budget to CPU control groups that have none configured explicitly
--ControlGroup=cpu:/
--
- [Install]
- WantedBy=graphical.target
diff --git a/sys-auth/rtkit/files/rtkit-0.11-gettime.patch b/sys-auth/rtkit/files/rtkit-0.11-gettime.patch
deleted file mode 100644
index 43732081386..00000000000
--- a/sys-auth/rtkit/files/rtkit-0.11-gettime.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Lennart Poettering <lennart@poettering.net>
-Date: Thu, 26 Sep 2013 19:52:58 +0000 (+0200)
-Subject: build-sys: since clock_gettime() moved to libc use mq_open to check for librt
-X-Git-Url: http://git.0pointer.de/?p=rtkit.git;a=commitdiff_plain;h=d550837387e4185ebcde1023702580e35eb441e7
-
-build-sys: since clock_gettime() moved to libc use mq_open to check for librt
----
-
-diff --git a/configure.ac b/configure.ac
-index 5a77363..62c17f5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -111,7 +111,7 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- CC="$PTHREAD_CC"
-
- AC_SEARCH_LIBS([sched_setscheduler], [rt])
--AC_SEARCH_LIBS([clock_gettime], [rt])
-+AC_SEARCH_LIBS([mq_open], [rt])
- AC_SEARCH_LIBS([cap_init], [cap])
-
- PKG_CHECK_MODULES(DBUS, dbus-1)
diff --git a/sys-auth/rtkit/files/rtkit-0.11-polkit.patch b/sys-auth/rtkit/files/rtkit-0.11-polkit.patch
deleted file mode 100644
index ad489c46618..00000000000
--- a/sys-auth/rtkit/files/rtkit-0.11-polkit.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-X-Git-Url: http://git.0pointer.de/?p=rtkit.git;a=blobdiff_plain;f=rtkit-daemon.c;h=3ecc1f7840a0d9bdd3af7f08933c4a62546094eb;hp=2ebe673309315f16bc2bc2e0c51a556fb215bc51;hb=88d4082ef6caf6b071d749dca1c50e7edde914cc;hpb=e86e04865ebc1a92c8fa3007843ebcf9c8fa4c05
-
-diff --git a/rtkit-daemon.c b/rtkit-daemon.c
-index 2ebe673..3ecc1f7 100644
---- a/rtkit-daemon.c
-+++ b/rtkit-daemon.c
-@@ -1170,12 +1170,14 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
- DBusMessage *m = NULL, *r = NULL;
- const char *unix_process = "unix-process";
- const char *pid = "pid";
-+ const char *uid = "uid";
- const char *start_time = "start-time";
- const char *cancel_id = "";
- uint32_t flags = 0;
- uint32_t pid_u32 = p->pid;
-- uint64_t start_time_u64 = p->starttime;
-+ uint32_t uid_u32 = (uint32_t)u->uid;
- DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant;
-+ uint64_t start_time_u64 = p->starttime;
- int ret;
- dbus_bool_t authorized = FALSE;
-
-@@ -1206,6 +1208,13 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
- assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
- assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
-
-+ assert_se(dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict));
-+ assert_se(dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &uid));
-+ assert_se(dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant));
-+ assert_se(dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &uid_u32));
-+ assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
-+ assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
-+
- assert_se(dbus_message_iter_close_container(&iter_struct, &iter_array));
- assert_se(dbus_message_iter_close_container(&iter_msg, &iter_struct));
-
diff --git a/sys-auth/rtkit/rtkit-0.11-r2.ebuild b/sys-auth/rtkit/rtkit-0.11-r2.ebuild
deleted file mode 100644
index f39c932527c..00000000000
--- a/sys-auth/rtkit/rtkit-0.11-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils systemd user autotools linux-info
-
-DESCRIPTION="Realtime Policy and Watchdog Daemon"
-HOMEPAGE="https://0pointer.de/blog/projects/rtkit"
-SRC_URI="https://0pointer.de/public/${P}.tar.xz"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="
- sys-apps/dbus
- sys-auth/polkit
- sys-libs/libcap
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- # Fedora patches
- "${FILESDIR}/${P}-polkit.patch"
- "${FILESDIR}/${P}-gettime.patch"
- "${FILESDIR}/${P}-controlgroup.patch"
-)
-
-pkg_pretend() {
- if use kernel_linux; then
- CONFIG_CHECK="~!RT_GROUP_SCHED"
- ERROR_RT_GROUP_SCHED="CONFIG_RT_GROUP_SCHED is enabled. rtkit-daemon (or any other "
- ERROR_RT_GROUP_SCHED+="real-time task) will not work unless run as root. Please consider "
- ERROR_RT_GROUP_SCHED+="unsetting this option."
- check_extra_config
- fi
-}
-
-pkg_setup() {
- enewgroup rtkit
- enewuser rtkit -1 -1 -1 "rtkit"
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
- default
-
- ./rtkit-daemon --introspect > org.freedesktop.RealtimeKit1.xml
- insinto /usr/share/dbus-1/interfaces
- doins org.freedesktop.RealtimeKit1.xml
-}
diff --git a/sys-auth/rtkit/rtkit-0.11-r3.ebuild b/sys-auth/rtkit/rtkit-0.11-r3.ebuild
deleted file mode 100644
index 67b2970cb4e..00000000000
--- a/sys-auth/rtkit/rtkit-0.11-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils systemd autotools linux-info
-
-DESCRIPTION="Realtime Policy and Watchdog Daemon"
-HOMEPAGE="https://0pointer.de/blog/projects/rtkit"
-SRC_URI="https://0pointer.de/public/${P}.tar.xz"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="acct-group/rtkit
- acct-user/rtkit
- sys-apps/dbus
- sys-auth/polkit
- sys-libs/libcap
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- # Fedora patches
- "${FILESDIR}/${P}-polkit.patch"
- "${FILESDIR}/${P}-gettime.patch"
- "${FILESDIR}/${P}-controlgroup.patch"
-)
-
-pkg_pretend() {
- if use kernel_linux; then
- CONFIG_CHECK="~!RT_GROUP_SCHED"
- ERROR_RT_GROUP_SCHED="CONFIG_RT_GROUP_SCHED is enabled. rtkit-daemon (or any other "
- ERROR_RT_GROUP_SCHED+="real-time task) will not work unless run as root. Please consider "
- ERROR_RT_GROUP_SCHED+="unsetting this option."
- check_extra_config
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
- default
-
- ./rtkit-daemon --introspect > org.freedesktop.RealtimeKit1.xml
- insinto /usr/share/dbus-1/interfaces
- doins org.freedesktop.RealtimeKit1.xml
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-09 11:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-09 11:16 [gentoo-commits] repo/gentoo:master commit in: sys-auth/rtkit/, sys-auth/rtkit/files/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2020-03-29 21:45 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox