Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/rtkit/, sys-auth/rtkit/files/
Date: Sat, 09 May 2020 11:16:31
Message-Id: 1589022974.49b8b811329c5e4b90ccb0c8299597627caf4a8f.marecki@gentoo
1 commit: 49b8b811329c5e4b90ccb0c8299597627caf4a8f
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 9 10:49:30 2020 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Sat May 9 11:16:14 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b8b811
7
8 sys-auth/rtkit: remove old
9
10 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
11
12 sys-auth/rtkit/Manifest | 1 -
13 sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch | 14 -----
14 sys-auth/rtkit/files/rtkit-0.11-gettime.patch | 21 --------
15 sys-auth/rtkit/files/rtkit-0.11-polkit.patch | 36 -------------
16 sys-auth/rtkit/rtkit-0.11-r2.ebuild | 61 ----------------------
17 sys-auth/rtkit/rtkit-0.11-r3.ebuild | 58 --------------------
18 6 files changed, 191 deletions(-)
19
20 diff --git a/sys-auth/rtkit/Manifest b/sys-auth/rtkit/Manifest
21 index 6f7fdc043c6..83ba86e04a2 100644
22 --- a/sys-auth/rtkit/Manifest
23 +++ b/sys-auth/rtkit/Manifest
24 @@ -1,3 +1,2 @@
25 -DIST rtkit-0.11.tar.xz 126748 BLAKE2B e989f1fb9e33c2e06d7eedbe0aab45982d458b6a80aa8ba9b05ae94ed048ef1351d30f8800859a08d8bb0a53891e7b63f6bda6308b4521da10a61182ca3921f9 SHA512 4641af965dc64c0f498ae469fbee1ceb337204fa7d778fbbb41f2b5c5e88947e633c7e9ad037274fdd778c3c097a4a1dbb0b2add287d74eccbcd2d357cb2da22
26 DIST rtkit-0.12.tar.xz 127504 BLAKE2B c2132098b98f24c1f1662df08c9940772cdad9a326c0c4b9180aac2e0878b0c71e5917ab2535628aab12ff29546faef1c68f455625c77bc2bac25864dddfa4b6 SHA512 cee48058367b5b8a705203865538d0ab4bda9d2f1d06d155360922cb095b5d6a5b0311fdda6c45d9f33227324394ca5fd3b5a399fc71e11ea4c609eab18a7b04
27 DIST rtkit-0.13.tar.xz 130796 BLAKE2B 842d04556a47c199bed9fc6bc9281c0d88f83e183f01ef57ecbd80ce72949a301d6682a3aab96e996e71b82d8e8c7a85e1d44524f2ed6fbdffc6bf236cdcadaa SHA512 c058d770a4ccfdf4e2e3a713748b6a705b6d3e148a903b9dbba4bba9d3ded2b819d7dfbfa37b9fad78e57c0a5f10f2f94226f8738f666e692a085ab297a36b36
28
29 diff --git a/sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch b/sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch
30 deleted file mode 100644
31 index 7a36deeeae7..00000000000
32 --- a/sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch
33 +++ /dev/null
34 @@ -1,14 +0,0 @@
35 -diff --git rtkit-0.11/rtkit-daemon.service.in~ rtkit-0.11/rtkit-daemon.service.in
36 -index 3dfefa6..d0dc786 100644
37 ---- rtkit-0.11/rtkit-daemon.service.in~
38 -+++ rtkit-0.11/rtkit-daemon.service.in
39 -@@ -27,9 +27,5 @@ CapabilityBoundingSet=CAP_SYS_NICE CAP_DAC_READ_SEARCH CAP_SYS_PTRACE CAP_SYS_CH
40 - PrivateTmp=yes
41 - PrivateNetwork=yes
42 -
43 --# Work around the fact that the Linux currently doesn't assign any RT
44 --# budget to CPU control groups that have none configured explicitly
45 --ControlGroup=cpu:/
46 --
47 - [Install]
48 - WantedBy=graphical.target
49
50 diff --git a/sys-auth/rtkit/files/rtkit-0.11-gettime.patch b/sys-auth/rtkit/files/rtkit-0.11-gettime.patch
51 deleted file mode 100644
52 index 43732081386..00000000000
53 --- a/sys-auth/rtkit/files/rtkit-0.11-gettime.patch
54 +++ /dev/null
55 @@ -1,21 +0,0 @@
56 -From: Lennart Poettering <lennart@××××××××××.net>
57 -Date: Thu, 26 Sep 2013 19:52:58 +0000 (+0200)
58 -Subject: build-sys: since clock_gettime() moved to libc use mq_open to check for librt
59 -X-Git-Url: http://git.0pointer.de/?p=rtkit.git;a=commitdiff_plain;h=d550837387e4185ebcde1023702580e35eb441e7
60 -
61 -build-sys: since clock_gettime() moved to libc use mq_open to check for librt
62 ----
63 -
64 -diff --git a/configure.ac b/configure.ac
65 -index 5a77363..62c17f5 100644
66 ---- a/configure.ac
67 -+++ b/configure.ac
68 -@@ -111,7 +111,7 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
69 - CC="$PTHREAD_CC"
70 -
71 - AC_SEARCH_LIBS([sched_setscheduler], [rt])
72 --AC_SEARCH_LIBS([clock_gettime], [rt])
73 -+AC_SEARCH_LIBS([mq_open], [rt])
74 - AC_SEARCH_LIBS([cap_init], [cap])
75 -
76 - PKG_CHECK_MODULES(DBUS, dbus-1)
77
78 diff --git a/sys-auth/rtkit/files/rtkit-0.11-polkit.patch b/sys-auth/rtkit/files/rtkit-0.11-polkit.patch
79 deleted file mode 100644
80 index ad489c46618..00000000000
81 --- a/sys-auth/rtkit/files/rtkit-0.11-polkit.patch
82 +++ /dev/null
83 @@ -1,36 +0,0 @@
84 -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
85 -
86 -diff --git a/rtkit-daemon.c b/rtkit-daemon.c
87 -index 2ebe673..3ecc1f7 100644
88 ---- a/rtkit-daemon.c
89 -+++ b/rtkit-daemon.c
90 -@@ -1170,12 +1170,14 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
91 - DBusMessage *m = NULL, *r = NULL;
92 - const char *unix_process = "unix-process";
93 - const char *pid = "pid";
94 -+ const char *uid = "uid";
95 - const char *start_time = "start-time";
96 - const char *cancel_id = "";
97 - uint32_t flags = 0;
98 - uint32_t pid_u32 = p->pid;
99 -- uint64_t start_time_u64 = p->starttime;
100 -+ uint32_t uid_u32 = (uint32_t)u->uid;
101 - DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant;
102 -+ uint64_t start_time_u64 = p->starttime;
103 - int ret;
104 - dbus_bool_t authorized = FALSE;
105 -
106 -@@ -1206,6 +1208,13 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
107 - assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
108 - assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
109 -
110 -+ assert_se(dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict));
111 -+ assert_se(dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &uid));
112 -+ assert_se(dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant));
113 -+ assert_se(dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &uid_u32));
114 -+ assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
115 -+ assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
116 -+
117 - assert_se(dbus_message_iter_close_container(&iter_struct, &iter_array));
118 - assert_se(dbus_message_iter_close_container(&iter_msg, &iter_struct));
119 -
120
121 diff --git a/sys-auth/rtkit/rtkit-0.11-r2.ebuild b/sys-auth/rtkit/rtkit-0.11-r2.ebuild
122 deleted file mode 100644
123 index f39c932527c..00000000000
124 --- a/sys-auth/rtkit/rtkit-0.11-r2.ebuild
125 +++ /dev/null
126 @@ -1,61 +0,0 @@
127 -# Copyright 1999-2020 Gentoo Authors
128 -# Distributed under the terms of the GNU General Public License v2
129 -
130 -EAPI=6
131 -inherit eutils systemd user autotools linux-info
132 -
133 -DESCRIPTION="Realtime Policy and Watchdog Daemon"
134 -HOMEPAGE="https://0pointer.de/blog/projects/rtkit"
135 -SRC_URI="https://0pointer.de/public/${P}.tar.xz"
136 -
137 -LICENSE="GPL-3 BSD"
138 -SLOT="0"
139 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
140 -IUSE=""
141 -
142 -RDEPEND="
143 - sys-apps/dbus
144 - sys-auth/polkit
145 - sys-libs/libcap
146 -"
147 -DEPEND="${RDEPEND}"
148 -
149 -PATCHES=(
150 - # Fedora patches
151 - "${FILESDIR}/${P}-polkit.patch"
152 - "${FILESDIR}/${P}-gettime.patch"
153 - "${FILESDIR}/${P}-controlgroup.patch"
154 -)
155 -
156 -pkg_pretend() {
157 - if use kernel_linux; then
158 - CONFIG_CHECK="~!RT_GROUP_SCHED"
159 - ERROR_RT_GROUP_SCHED="CONFIG_RT_GROUP_SCHED is enabled. rtkit-daemon (or any other "
160 - ERROR_RT_GROUP_SCHED+="real-time task) will not work unless run as root. Please consider "
161 - ERROR_RT_GROUP_SCHED+="unsetting this option."
162 - check_extra_config
163 - fi
164 -}
165 -
166 -pkg_setup() {
167 - enewgroup rtkit
168 - enewuser rtkit -1 -1 -1 "rtkit"
169 -}
170 -
171 -src_prepare() {
172 - default
173 - eautoreconf
174 -}
175 -
176 -src_configure() {
177 - econf \
178 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
179 -}
180 -
181 -src_install() {
182 - default
183 -
184 - ./rtkit-daemon --introspect > org.freedesktop.RealtimeKit1.xml
185 - insinto /usr/share/dbus-1/interfaces
186 - doins org.freedesktop.RealtimeKit1.xml
187 -}
188
189 diff --git a/sys-auth/rtkit/rtkit-0.11-r3.ebuild b/sys-auth/rtkit/rtkit-0.11-r3.ebuild
190 deleted file mode 100644
191 index 67b2970cb4e..00000000000
192 --- a/sys-auth/rtkit/rtkit-0.11-r3.ebuild
193 +++ /dev/null
194 @@ -1,58 +0,0 @@
195 -# Copyright 1999-2020 Gentoo Authors
196 -# Distributed under the terms of the GNU General Public License v2
197 -
198 -EAPI=7
199 -
200 -inherit eutils systemd autotools linux-info
201 -
202 -DESCRIPTION="Realtime Policy and Watchdog Daemon"
203 -HOMEPAGE="https://0pointer.de/blog/projects/rtkit"
204 -SRC_URI="https://0pointer.de/public/${P}.tar.xz"
205 -
206 -LICENSE="GPL-3 BSD"
207 -SLOT="0"
208 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
209 -IUSE=""
210 -
211 -RDEPEND="acct-group/rtkit
212 - acct-user/rtkit
213 - sys-apps/dbus
214 - sys-auth/polkit
215 - sys-libs/libcap
216 -"
217 -DEPEND="${RDEPEND}"
218 -
219 -PATCHES=(
220 - # Fedora patches
221 - "${FILESDIR}/${P}-polkit.patch"
222 - "${FILESDIR}/${P}-gettime.patch"
223 - "${FILESDIR}/${P}-controlgroup.patch"
224 -)
225 -
226 -pkg_pretend() {
227 - if use kernel_linux; then
228 - CONFIG_CHECK="~!RT_GROUP_SCHED"
229 - ERROR_RT_GROUP_SCHED="CONFIG_RT_GROUP_SCHED is enabled. rtkit-daemon (or any other "
230 - ERROR_RT_GROUP_SCHED+="real-time task) will not work unless run as root. Please consider "
231 - ERROR_RT_GROUP_SCHED+="unsetting this option."
232 - check_extra_config
233 - fi
234 -}
235 -
236 -src_prepare() {
237 - default
238 - eautoreconf
239 -}
240 -
241 -src_configure() {
242 - econf \
243 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
244 -}
245 -
246 -src_install() {
247 - default
248 -
249 - ./rtkit-daemon --introspect > org.freedesktop.RealtimeKit1.xml
250 - insinto /usr/share/dbus-1/interfaces
251 - doins org.freedesktop.RealtimeKit1.xml
252 -}