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 62514139085 for ; Sun, 15 Jan 2017 12:18:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D59F234064; Sun, 15 Jan 2017 12:17:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58FBD234064 for ; Sun, 15 Jan 2017 12:17:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5BC6341236 for ; Sun, 15 Jan 2017 12:17:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8299F27E2 for ; Sun, 15 Jan 2017 12:17:56 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1484482652.1f9deebdff205c1ec61f4adb4b0fcc669ee5c394.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/files/, sys-auth/elogind/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/elogind/elogind-219.12-r4.ebuild sys-auth/elogind/files/elogind-219.12-glibc.patch X-VCS-Directories: sys-auth/elogind/files/ sys-auth/elogind/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1f9deebdff205c1ec61f4adb4b0fcc669ee5c394 X-VCS-Branch: master Date: Sun, 15 Jan 2017 12:17:56 +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-Archives-Salt: ce462c6c-d266-440d-82fd-84f13887d9d5 X-Archives-Hash: 2c60abb4ddf28374648629a5ebf2962f commit: 1f9deebdff205c1ec61f4adb4b0fcc669ee5c394 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 15 12:09:03 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 15 12:17:32 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f9deebd sys-auth/elogind: Fix DEPENDs, add missing sysmacros.h includes Gentoo-bug: 605744, 605746 Backported systemd patch to fix build with glibc-2.24. Moved policykit to PDEPEND to avoid circular dependency. Package-Manager: portage-2.3.0 sys-auth/elogind/elogind-219.12-r4.ebuild | 8 +++-- sys-auth/elogind/files/elogind-219.12-glibc.patch | 44 +++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/sys-auth/elogind/elogind-219.12-r4.ebuild b/sys-auth/elogind/elogind-219.12-r4.ebuild index 6911b90..177bcb5 100644 --- a/sys-auth/elogind/elogind-219.12-r4.ebuild +++ b/sys-auth/elogind/elogind-219.12-r4.ebuild @@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~arm ~x86" IUSE="acl apparmor pam policykit +seccomp selinux" COMMON_DEPEND=" - sys-libs/libcap sys-apps/util-linux + sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) @@ -27,15 +27,18 @@ COMMON_DEPEND=" " RDEPEND="${COMMON_DEPEND} sys-apps/dbus - policykit? ( sys-auth/polkit ) !sys-auth/systemd " DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets dev-util/gperf dev-util/intltool sys-devel/libtool virtual/pkgconfig " +PDEPEND="policykit? ( sys-auth/polkit )" PATCHES=( "${FILESDIR}/${PN}-docs.patch" @@ -43,6 +46,7 @@ PATCHES=( "${FILESDIR}/${P}-session.patch" "${FILESDIR}/${P}-login1-perms.patch" "${FILESDIR}/${P}-gperf.patch" + "${FILESDIR}/${P}-glibc.patch" # bug 605744 ) pkg_setup() { diff --git a/sys-auth/elogind/files/elogind-219.12-glibc.patch b/sys-auth/elogind/files/elogind-219.12-glibc.patch new file mode 100644 index 00000000..05477c3 --- /dev/null +++ b/sys-auth/elogind/files/elogind-219.12-glibc.patch @@ -0,0 +1,44 @@ +commit 27d13af71c3af6b2f9b60556d2c046dbb6e36e23 +Author: Mike Frysinger +Date: Mon Mar 14 17:44:49 2016 -0400 + + include sys/sysmacros.h in more places + + Since glibc is moving away from implicitly including sys/sysmacros.h + all the time via sys/types.h, include the header directly in more + places. This seems to cover most makedev/major/minor usage. + +diff --git a/src/shared/macro.h b/src/shared/macro.h +index c34441d..b36a956 100644 +--- a/src/shared/macro.h ++++ b/src/shared/macro.h +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + + #define _printf_(a,b) __attribute__ ((format (printf, a, b))) +diff --git a/src/shared/util.h b/src/shared/util.h +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h +--- a/src/systemd/sd-device.h ++++ b/src/systemd/sd-device.h +@@ -22,6 +22,7 @@ + ***/ + ++#include + #include + #include + + #include "_sd-common.h"