From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3E179138350 for ; Fri, 13 Mar 2020 13:31:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46C6DE0BEB; Fri, 13 Mar 2020 13:31:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1BE4CE0BEB for ; Fri, 13 Mar 2020 13:31:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A857234EF56 for ; Fri, 13 Mar 2020 13:31:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB9299C for ; Fri, 13 Mar 2020 13:31:02 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1584106029.fc5f59cf4c173ffd522ffd05c5fb39c048e58f29.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/rtkit/files/, sys-auth/rtkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/rtkit/Manifest sys-auth/rtkit/files/rtkit-0.12_libsystemd_optional.patch sys-auth/rtkit/files/rtkit-0.12_noexecstack.patch sys-auth/rtkit/rtkit-0.12.ebuild X-VCS-Directories: sys-auth/rtkit/files/ sys-auth/rtkit/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: fc5f59cf4c173ffd522ffd05c5fb39c048e58f29 X-VCS-Branch: master Date: Fri, 13 Mar 2020 13:31:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 785bdeed-5a73-4ad6-b856-032c19fd16b3 X-Archives-Hash: 5dbbc9c81876c5c3848c3e7777793c16 commit: fc5f59cf4c173ffd522ffd05c5fb39c048e58f29 Author: Marek Szuba gentoo org> AuthorDate: Fri Mar 13 13:01:23 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Fri Mar 13 13:27:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc5f59cf sys-auth/rtkit: bump to 0.12 While I haven't heard anything official about Jan Steffens having taken over rtkit maintenance from Lennart, if Debian* approves it's good enough for me. * as well as other distros Signed-off-by: Marek Szuba gentoo.org> sys-auth/rtkit/Manifest | 1 + .../files/rtkit-0.12_libsystemd_optional.patch | 63 ++++++++++++++++++++++ sys-auth/rtkit/files/rtkit-0.12_noexecstack.patch | 10 ++++ sys-auth/rtkit/rtkit-0.12.ebuild | 49 +++++++++++++++++ 4 files changed, 123 insertions(+) diff --git a/sys-auth/rtkit/Manifest b/sys-auth/rtkit/Manifest index 93133abc2da..c99b0539358 100644 --- a/sys-auth/rtkit/Manifest +++ b/sys-auth/rtkit/Manifest @@ -1 +1,2 @@ DIST rtkit-0.11.tar.xz 126748 BLAKE2B e989f1fb9e33c2e06d7eedbe0aab45982d458b6a80aa8ba9b05ae94ed048ef1351d30f8800859a08d8bb0a53891e7b63f6bda6308b4521da10a61182ca3921f9 SHA512 4641af965dc64c0f498ae469fbee1ceb337204fa7d778fbbb41f2b5c5e88947e633c7e9ad037274fdd778c3c097a4a1dbb0b2add287d74eccbcd2d357cb2da22 +DIST rtkit-0.12.tar.xz 127504 BLAKE2B c2132098b98f24c1f1662df08c9940772cdad9a326c0c4b9180aac2e0878b0c71e5917ab2535628aab12ff29546faef1c68f455625c77bc2bac25864dddfa4b6 SHA512 cee48058367b5b8a705203865538d0ab4bda9d2f1d06d155360922cb095b5d6a5b0311fdda6c45d9f33227324394ca5fd3b5a399fc71e11ea4c609eab18a7b04 diff --git a/sys-auth/rtkit/files/rtkit-0.12_libsystemd_optional.patch b/sys-auth/rtkit/files/rtkit-0.12_libsystemd_optional.patch new file mode 100644 index 00000000000..9d61f4e5685 --- /dev/null +++ b/sys-auth/rtkit/files/rtkit-0.12_libsystemd_optional.patch @@ -0,0 +1,63 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -116,7 +116,15 @@ + AC_SEARCH_LIBS([cap_init], [cap]) + + PKG_CHECK_MODULES(DBUS, dbus-1) +-PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd) ++ ++AC_ARG_ENABLE(systemd-integration, ++ AS_HELP_STRING([--enable-systemd-integration], [use the sd-daemon API to communicate with systemd]), ++ [enable_libsystemd=$enableval], ++ [enable_libsystemd=yes]) ++if test "x${enable_libsystemd}" != "xno"; then ++ PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd) ++ AC_DEFINE([HAVE_LIBSYSTEMD], [1], [Define to 1 if you have libsystemd and its header files]) ++fi + + AC_ARG_WITH([systemdsystemunitdir], + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), +@@ -142,5 +150,6 @@ + localstatedir: ${localstatedir} + Compiler: ${CC} + CFLAGS: ${CFLAGS} ++ systemd integration: ${enable_libsystemd} + systemd unit directory: ${systemdsystemunitdir} + " +--- a/rtkit-daemon.c ++++ b/rtkit-daemon.c +@@ -50,7 +50,10 @@ + #include + #include + #include ++ ++#ifdef HAVE_LIBSYSTEMD + #include ++#endif + + #include "rtkit.h" + +@@ -1432,11 +1435,13 @@ + n_total_processes, + n_users); + ++#ifdef HAVE_LIBSYSTEMD + sd_notifyf(0, + "STATUS=Supervising %u threads of %u processes of %u users.", + n_total_threads, + n_total_processes, + n_users); ++#endif + + finish: + if (r) { +@@ -2304,7 +2309,9 @@ + + syslog(LOG_DEBUG, "Running.\n"); + ++#ifdef HAVE_LIBSYSTEMD + sd_notify(0, "STATUS=Running."); ++#endif + + dbus_connection_set_exit_on_disconnect(bus, FALSE); + diff --git a/sys-auth/rtkit/files/rtkit-0.12_noexecstack.patch b/sys-auth/rtkit/files/rtkit-0.12_noexecstack.patch new file mode 100644 index 00000000000..f156422f8f6 --- /dev/null +++ b/sys-auth/rtkit/files/rtkit-0.12_noexecstack.patch @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 00000000000..125517d132b --- /dev/null +++ b/sys-auth/rtkit/rtkit-0.12.ebuild @@ -0,0 +1,49 @@ +# 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 ~sh ~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) +}