From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/files/, sys-auth/elogind/
Date: Sun, 15 Jan 2017 12:17:56 +0000 (UTC) [thread overview]
Message-ID: <1484482652.1f9deebdff205c1ec61f4adb4b0fcc669ee5c394.asturm@gentoo> (raw)
commit: 1f9deebdff205c1ec61f4adb4b0fcc669ee5c394
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 12:09:03 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <vapier@gentoo.org>
+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 <inttypes.h>
+ #include <stdbool.h>
+ #include <sys/param.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+
+ #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 <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <dirent.h>
+ #include <stddef.h>
+ #include <unistd.h>
+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 <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <stdint.h>
+
+ #include "_sd-common.h"
next reply other threads:[~2017-01-15 12:18 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-15 12:17 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-03-21 10:15 [gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/files/, sys-auth/elogind/ Andreas Sturmlechner
2017-03-21 10:15 Andreas Sturmlechner
2017-03-21 19:11 Andreas Sturmlechner
2018-01-10 10:00 Andreas Sturmlechner
2018-01-31 10:22 Andreas Sturmlechner
2018-03-04 10:06 Andreas Sturmlechner
2018-03-05 22:14 Andreas Sturmlechner
2018-06-30 20:47 Andreas Sturmlechner
2018-11-17 7:24 Michael Palimaka
2019-03-16 5:26 Michael Palimaka
2019-04-18 19:14 Jory Pratt
2019-05-15 10:38 Andreas Sturmlechner
2019-11-15 17:37 Andreas Sturmlechner
2019-11-30 12:08 Andreas Sturmlechner
2020-02-02 16:19 Andreas Sturmlechner
2020-03-12 22:15 Andreas Sturmlechner
2020-04-04 9:30 Andreas Sturmlechner
2021-01-10 13:14 Piotr Karbowski
2021-11-22 5:56 Sam James
2022-12-06 6:18 WANG Xuerui
2023-05-16 6:46 Sam James
2023-05-31 0:43 Sam James
2023-05-31 0:43 Sam James
2023-06-10 14:54 Piotr Karbowski
2023-06-12 3:49 Sam James
2024-04-30 16:05 Andreas K. Hüttel
2024-08-28 7:40 Andreas Sturmlechner
2024-11-14 19:51 Andreas Sturmlechner
2024-11-24 10:28 Andreas Sturmlechner
2025-05-19 15:41 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1484482652.1f9deebdff205c1ec61f4adb4b0fcc669ee5c394.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox