Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-auth/elogind/files/, sys-auth/elogind/
Date: Thu, 02 Nov 2017 01:20:20
Message-Id: 1509585591.1c0278510e8dcd758d30a6b70655a9d065b690d9.blueness@gentoo
1 commit: 1c0278510e8dcd758d30a6b70655a9d065b690d9
2 Author: Bjorn Pagen <bjornpagen <AT> gmail <DOT> com>
3 AuthorDate: Wed Nov 1 00:04:01 2017 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 2 01:19:51 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1c027851
7
8 added sys-auth/elogind
9
10 sys-auth/elogind/Manifest | 4 +
11 sys-auth/elogind/elogind-234.4.ebuild | 106 ++++++++++++++++++++++++
12 sys-auth/elogind/files/elogind-226.4-docs.patch | 15 ++++
13 sys-auth/elogind/files/elogind-fix-musl.patch | 38 +++++++++
14 4 files changed, 163 insertions(+)
15
16 diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
17 new file mode 100644
18 index 0000000..a1dd510
19 --- /dev/null
20 +++ b/sys-auth/elogind/Manifest
21 @@ -0,0 +1,4 @@
22 +AUX elogind-226.4-docs.patch 355 SHA256 4fa3a1aa38a9ba23cd023a3ace11c4c8155ee856a6cd7f228ac65cd921629b24 SHA512 dc942f190ea2064e194808db7c6ede618d536778f1b574658ddb9c0aa4a106f6129cc18000eaa63aeca1b16ad28fe5f5dbee441bd93436ae62eb4740236f94ae WHIRLPOOL 45bdbbaa103b6bf94a0e3544978eb1ea0a942162711227f8c9c17f1c606d15d1e1e44f898635b26c80bf96d662c612daf59aed007aa57744baed574b20861a38
23 +AUX elogind-fix-musl.patch 934 SHA256 f1e62001228991fab4b5f3703cbb31933d749010c5ef8c3321d14b0032422b53 SHA512 3d07799d6e13c1c5499e9079d4b35141e3deac0d9bf23c5a999687e233de774c0cfa41d3ecbf0b41950672b443cf6e17a9b3e46f7ef495683af04d34b7c2e49b WHIRLPOOL 922eb5dcf1e0de1a80359e7bb6890ec5f646ab59f6b3cadbc6a8f51cd5256ef6bb2c876d519fae1664c1851017e6a5803e0162372340d3da0149f9931fbfa06a
24 +DIST elogind-234.4.tar.gz 973370 SHA256 ffb465a62c4281c19b07eb7fbb9ad0987f3b726ae1a868a92a3144d7714542f3 SHA512 2df4fa318074d4f5e5dbba353cf817068a2703ffed40cdeae4cba2dea4ee143d1c5fc076b19419f1c4299392088c2c14b430d8aa1ded03b62117311802305d5e WHIRLPOOL 1b735338cb02ef8cffb5837a0702110117ae1d677a4cbf106180c549485f7fb0604f3134e6ff5e14b23485ddfe4d4415a41e69d93b8f099cee41a220d0ea4a69
25 +EBUILD elogind-234.4.ebuild 2858 SHA256 d29413423f2f3b3e7eb5cf7b0171eda8e5a3e12d37af0ac0193e8669a5a47cf6 SHA512 3a5f1f51da798b6954619ddc50f5a32ef2bc8a82610f6b5d6e62813e2f673fb322a7dd89a231f00429f4ef0b142a1244df6d622922efb1a0f6802a9e1bad6caf WHIRLPOOL 254ec63617f1115e538947a123543f7382b4684879779fa43c524f0b7a15fb2c6db4335a81a4e364573401a33f9f8412d156813a601f632fa6b763fea5155436
26
27 diff --git a/sys-auth/elogind/elogind-234.4.ebuild b/sys-auth/elogind/elogind-234.4.ebuild
28 new file mode 100644
29 index 0000000..5125162
30 --- /dev/null
31 +++ b/sys-auth/elogind/elogind-234.4.ebuild
32 @@ -0,0 +1,106 @@
33 +# Copyright 1999-2017 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=6
37 +
38 +inherit autotools linux-info pam udev
39 +
40 +DESCRIPTION="The systemd project's logind, extracted to a standalone package"
41 +HOMEPAGE="https://github.com/elogind/elogind"
42 +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
43 +
44 +LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
45 +SLOT="0"
46 +KEYWORDS="~amd64 ~arm ~x86"
47 +IUSE="acl debug pam policykit selinux"
48 +
49 +RDEPEND="
50 + sys-apps/util-linux
51 + sys-libs/libcap
52 + virtual/libudev:=
53 + acl? ( sys-apps/acl )
54 + pam? ( virtual/pam )
55 + selinux? ( sys-libs/libselinux )
56 + !sys-apps/systemd
57 +"
58 +DEPEND="${RDEPEND}
59 + app-text/docbook-xml-dtd:4.2
60 + app-text/docbook-xml-dtd:4.5
61 + app-text/docbook-xsl-stylesheets
62 + dev-util/gperf
63 + dev-util/intltool
64 + sys-devel/libtool
65 + virtual/pkgconfig
66 +"
67 +PDEPEND="
68 + sys-apps/dbus
69 + policykit? ( sys-auth/polkit )
70 +"
71 +
72 +PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" )
73 +
74 +pkg_setup() {
75 + local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK
76 + ~SIGNALFD ~TIMERFD"
77 +
78 + if use kernel_linux; then
79 + linux-info_pkg_setup
80 + fi
81 +}
82 +
83 +src_prepare() {
84 + default
85 + eapply "${FILESDIR}/${PN}-fix-musl.patch"
86 + eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch"
87 +}
88 +
89 +src_configure() {
90 + econf \
91 + --with-pamlibdir=$(getpam_mod_dir) \
92 + --with-udevrulesdir="$(get_udevdir)"/rules.d \
93 + --libdir="${EPREFIX}"/usr/$(get_libdir) \
94 + --with-rootlibdir="${EPREFIX}"/$(get_libdir) \
95 + --with-rootprefix="${EPREFIX}/" \
96 + --with-rootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \
97 + --enable-smack \
98 + --with-cgroup-controller=openrc \
99 + --disable-lto \
100 + $(use_enable debug debug elogind) \
101 + $(use_enable acl) \
102 + $(use_enable pam) \
103 + $(use_enable selinux)
104 +}
105 +
106 +src_install() {
107 + default
108 + find "${D}" -name '*.la' -delete || die
109 +
110 + newinitd "${FILESDIR}"/${PN}.init ${PN}
111 +
112 + sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
113 + newconfd ${PN}.conf ${PN}
114 +}
115 +
116 +pkg_postinst() {
117 + if [ "$(rc-config list boot | grep elogind)" != "" ]; then
118 + ewarn "elogind is currently started from boot runlevel."
119 + elif [ "$(rc-config list default | grep elogind)" != "" ]; then
120 + ewarn "elogind is currently started from default runlevel."
121 + ewarn "Please remove elogind from the default runlevel and"
122 + ewarn "add it to the boot runlevel by:"
123 + ewarn "# rc-update del elogind default"
124 + ewarn "# rc-update add elogind boot"
125 + else
126 + ewarn "elogind is currently not started from any runlevel."
127 + ewarn "You may add it to the boot runlevel by:"
128 + ewarn "# rc-update add elogind boot"
129 + fi
130 + ewarn "Alternatively you can leave elogind out of any"
131 + ewarn "runlevel. It will then be started automatically"
132 + if use pam; then
133 + ewarn "when the first service calls it via dbus, or the"
134 + ewarn "first user logs into the system."
135 + else
136 + ewarn "when the first service calls it via dbus."
137 + fi
138 +}
139
140 diff --git a/sys-auth/elogind/files/elogind-226.4-docs.patch b/sys-auth/elogind/files/elogind-226.4-docs.patch
141 new file mode 100644
142 index 0000000..4161f63
143 --- /dev/null
144 +++ b/sys-auth/elogind/files/elogind-226.4-docs.patch
145 @@ -0,0 +1,15 @@
146 +--- a/Makefile.am 2017-02-16 13:22:56.764985896 +0100
147 ++++ b/Makefile.am 2017-02-16 13:23:04.998986057 +0100
148 +@@ -194,12 +194,6 @@
149 + bin_PROGRAMS =
150 + rootlibexec_PROGRAMS =
151 +
152 +-dist_doc_DATA = \
153 +- README \
154 +- NEWS \
155 +- LICENSE.LGPL2.1 \
156 +- LICENSE.GPL2
157 +-
158 + @INTLTOOL_POLICY_RULE@
159 +
160 + # ------------------------------------------------------------------------------
161
162 diff --git a/sys-auth/elogind/files/elogind-fix-musl.patch b/sys-auth/elogind/files/elogind-fix-musl.patch
163 new file mode 100644
164 index 0000000..4aba103
165 --- /dev/null
166 +++ b/sys-auth/elogind/files/elogind-fix-musl.patch
167 @@ -0,0 +1,38 @@
168 +--- a/src/test/test-hexdecoct.c
169 ++++ b/src/test/test-hexdecoct.c
170 +@@ -22,6 +22,16 @@
171 + #include "macro.h"
172 + #include "string-util.h"
173 +
174 ++#define strndupa(s, n) \
175 ++ ({ \
176 ++ const char *__in = (s); \
177 ++ size_t __len = strnlen(__in, (n)); \
178 ++ char *__out = (char *)alloca(__len + 1); \
179 ++ __out[__len] = '\0'; \
180 ++ (char *)memcpy(__out, __in, __len); \
181 ++ })
182 ++
183 ++
184 + static void test_hexchar(void) {
185 + assert_se(hexchar(0xa) == 'a');
186 + assert_se(hexchar(0x0) == '0');
187 +--- a/src/test/test-sizeof.c
188 ++++ b/src/test/test-sizeof.c
189 +@@ -48,8 +48,6 @@
190 + info(unsigned);
191 + info(long unsigned);
192 + info(long long unsigned);
193 +- info(__syscall_ulong_t);
194 +- info(__syscall_slong_t);
195 +
196 + info(float);
197 + info(double);
198 +@@ -59,7 +57,6 @@
199 + info(ssize_t);
200 + info(time_t);
201 + info(usec_t);
202 +- info(__time_t);
203 +
204 + info(enum Enum);
205 + info(enum BigEnum);