[gentoo-commits] proj/musl:master commit in: sys-apps/accountsservice/files/, sys-apps/accountsservice/ - gentoo-commits

From:	Aric Belsito <lluixhi@×××××.com>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/musl:master commit in: sys-apps/accountsservice/files/, sys-apps/accountsservice/
Date:	Wed, 29 Mar 2017 16:47:52
Message-Id:	`1490805600.83a777a5bb4b302be6802cbe8fbd3a1b2dc8baa7.lluixhi@gentoo`

1

commit:     83a777a5bb4b302be6802cbe8fbd3a1b2dc8baa7

2

Author:     Rasmus Thomsen <rasmus.thomsen <AT> live <DOT> de>

3

AuthorDate: Wed Mar 29 14:29:34 2017 +0000

4

Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>

5

CommitDate: Wed Mar 29 16:40:00 2017 +0000

6

URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=83a777a5

7

8

sys-apps/accountsservice: add ebuild with musl fixes

9

10

 sys-apps/accountsservice/Manifest                  |  5 ++

11

 .../accountsservice/accountsservice-0.6.43.ebuild  | 60 ++++++++++++++++++++++

12

 ...ccountsservice-0.6.35-gentoo-system-users.patch | 51 ++++++++++++++++++

13

 .../accountsservice/files/musl-fgetspent_r.patch   | 34 ++++++++++++

14

 sys-apps/accountsservice/metadata.xml              | 12 +++++

15

 5 files changed, 162 insertions(+)

16

17

diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest

18

new file mode 100644

19

index 0000000..745459b

20

--- /dev/null

21

+++ b/sys-apps/accountsservice/Manifest

22

@@ -0,0 +1,5 @@

23

+AUX accountsservice-0.6.35-gentoo-system-users.patch 1122 SHA256 f1a308a364db53ec939505daf1435fb99cf2899789976e21080464720b78297f SHA512 e8ac404aed1da3ab4bb092b476cbb18f2ae7d209bcbe6a30cb9058f50dce0f70d64a3de593108ef5588132389d522d19975384eb1b8414119cb622bc7d738931 WHIRLPOOL 35d8756e1fcff2c08926ecc2864bacccad5542d59a028b0969a4429a4855528d9b607f4cfe5849d04f131db2e142dd1bf9531ca6b79b404e55d97ba0fd6162f8

24

+AUX musl-fgetspent_r.patch 1475 SHA256 97a06c8777ab85deae2633e2b83b865f1c65ded4e4263ef19e7949d8f482d1a0 SHA512 1c8ca5522c7533d105b91180c41f36a9d4a660fb86e275d6428caee70c9102ca61312c1ecb886f490b84f59aea18f630904cb91e1e9cac45dbc700bcd10c0363 WHIRLPOOL c3a1dfebf26d1770e86a679766a15d255e853fd1bf1b1b8b0d96fe9656413807cb21fddf9d6b79d4cdb0bd5b5f53035b55f5fa83113a1981e9780adfbecb0c83

25

+DIST accountsservice-0.6.43.tar.xz 381008 SHA256 ed3ba94aa38ceb822a0e1a1ac71bf1a8123babf90be049397b3a00900e48d6cc SHA512 0673430b7e5fd726397a9358d60d5c34542afaa786b795d3c8b544dc2bdab151c74f9a3daa4bcd94dc7669400a78cd4cddc453cad78ee8e431bf7c1f417138e2 WHIRLPOOL e704d9dcb5b7c0c6ee7c1ab5ed310ab2428e94d061663367f213c5903f68768680492d651524ef1e7594417335de529463d63b8d8a4d1cc8b6445358f1b97a33

26

+EBUILD accountsservice-0.6.43.ebuild 1497 SHA256 81c71c962f51ef316f072983dc7ba1bb847826fea69a1a323f8828c73a54283e SHA512 3cde07f954c2db1a17c5475d4802b3cfd5381fa9d359e26fa389ab868137f5be7dad420e086d275004902b27ca77d973c53d565e2c16a2686efbdb20247d1e84 WHIRLPOOL 4e5ac23047ef83656d83e074952cf021893be66dd29451d5b550e1ff4b642d5b20869c0df29c27bb5437d6ac06b458398e8a374db9583de19b5c98e99849e6c2

27

+MISC metadata.xml 396 SHA256 51257c7b97ea8af47f6485adee93352a26dc901024f316b3a1dcf8c2cbcd62bf SHA512 e523489c63c11a5ed2d060f9bfdf5cf5d47813c1289823032e9b45ed2dfdd1ef9d11a863403cd1492696f4ea0070a61ca3a8d8780d1bdba9ed710a035ef1a5ce WHIRLPOOL c4687da67a3971a43863ce13a2bba326a8271e392d5253024ecf0abe55977c09f81e06da7b5c4506a232a2abb1a8b13bd41ffa4a128f0c8fcb22f43c20de5e4c

28

29

diff --git a/sys-apps/accountsservice/accountsservice-0.6.43.ebuild b/sys-apps/accountsservice/accountsservice-0.6.43.ebuild

30

new file mode 100644

31

index 0000000..1e28d31

32

--- /dev/null

33

+++ b/sys-apps/accountsservice/accountsservice-0.6.43.ebuild

34

@@ -0,0 +1,60 @@

35

+# Copyright 1999-2017 Gentoo Foundation

36

+# Distributed under the terms of the GNU General Public License v2

37

+

38

+EAPI=6

39

+inherit gnome2 systemd

40

+

41

+DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"

42

+HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/"

43

+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"

44

+

45

+LICENSE="GPL-3+"

46

+SLOT="0"

47

+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"

48

+

49

+IUSE="doc +introspection selinux systemd"

50

+

51

+CDEPEND="

52

+	>=dev-libs/glib-2.37.3:2

53

+	sys-auth/polkit

54

+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )

55

+	systemd? ( >=sys-apps/systemd-186:0= )

56

+	!systemd? ( sys-auth/consolekit )

57

+"

58

+DEPEND="${CDEPEND}

59

+	dev-libs/libxslt

60

+	dev-util/gdbus-codegen

61

+	>=dev-util/gtk-doc-am-1.15

62

+	>=dev-util/intltool-0.40

63

+	sys-devel/gettext

64

+	virtual/pkgconfig

65

+	doc? (

66

+		app-text/docbook-xml-dtd:4.1.2

67

+		app-text/xmlto )

68

+"

69

+RDEPEND="${CDEPEND}

70

+	selinux? ( sec-policy/selinux-accountsd )

71

+"

72

+

73

+PATCHES=(

74

+	"${FILESDIR}/${PN}-0.6.35-gentoo-system-users.patch"

75

+	"${FILESDIR}/musl-fgetspent_r.patch"

76

+)

77

+

78

+src_prepare() {

79

+	default

80

+	sed -i configure -e "s;utx\.log;wtmp;g"

81

+	export ac_cv_file__var_log_utx_log=yes

82

+}

83

+

84

+src_configure() {

85

+	gnome2_src_configure \

86

+		--disable-static \

87

+		--disable-more-warnings \

88

+		--localstatedir="${EPREFIX}"/var \

89

+		--enable-admin-group="wheel" \

90

+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \

91

+		$(use_enable doc docbook-docs) \

92

+		$(use_enable introspection) \

93

+		$(use_enable systemd)

94

+}

95

96

diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.35-gentoo-system-users.patch b/sys-apps/accountsservice/files/accountsservice-0.6.35-gentoo-system-users.patch

97

new file mode 100644

98

index 0000000..39ebf42

99

--- /dev/null

100

+++ b/sys-apps/accountsservice/files/accountsservice-0.6.35-gentoo-system-users.patch

101

@@ -0,0 +1,51 @@

102

+--- a/src/user-classify.c.old	2013-12-04 20:29:48.944454769 +0100

103

++++ b/src/user-classify.c	2013-12-04 20:32:59.728283477 +0100

104

+@@ -55,6 +55,48 @@

105

+         "at",

106

+         "gdm",

107

+         "gnome-initial-setup"

108

++        /* Additional Gentoo system users with non-trivial login shell */

109

++        "amanda",

110

++        "backuppc",

111

++        "drqueue",

112

++        "firebird",

113

++        "flexlm",

114

++        "foldingathome",

115

++        "geneweb",

116

++        "git",

117

++        "gnump3d",

118

++        "hacluster",

119

++        "hg",

120

++        "hsqldb",

121

++        "infinote",

122

++        "foldingathome",

123

++        "geneweb",

124

++        "git",

125

++        "gnump3d",

126

++        "hacluster",

127

++        "hg",

128

++        "hsqldb",

129

++        "infinote",

130

++        "jffnms",

131

++        "klive",

132

++        "mailman",

133

++        "mpd",

134

++        "mythtv",

135

++        "nagios",

136

++        "nx",

137

++        "oneadmin",

138

++        "openvpn",

139

++        "p2p",

140

++        "phxd",

141

++        "resin",

142

++        "rplayd",

143

++        "scponly",

144

++        "secoff",

145

++        "tinyproxy",

146

++        "ttrssd",

147

++        "vboxguest",

148

++        "vdr",

149

++        "vdradmin",

150

+ };

151

+

152

+ #define PATH_NOLOGIN "/sbin/nologin"

153

154

diff --git a/sys-apps/accountsservice/files/musl-fgetspent_r.patch b/sys-apps/accountsservice/files/musl-fgetspent_r.patch

155

new file mode 100644

156

index 0000000..c365065

157

--- /dev/null

158

+++ b/sys-apps/accountsservice/files/musl-fgetspent_r.patch

159

@@ -0,0 +1,34 @@

160

+Musl libc does not support fgetspent_r(), so fall back

161

+to using the non-thread-safe fgetspent() function.

162

+

163

+--- a/src/daemon.c	2016-09-06 21:48:50.000000000 +0200

164

++++ b/src/daemon.c	2016-11-25 10:41:01.614534302 +0100

165

+@@ -174,7 +174,7 @@

166

+                         int ret = 0;

167

+

168

+                         shadow_entry_buffers = g_malloc0 (sizeof (*shadow_entry_buffers));

169

+-

170

++#if defined(__GLIBC__)

171

+                         ret = fgetspent_r (fp, &shadow_entry_buffers->spbuf, shadow_entry_buffers->buf, sizeof (shadow_entry_buffers->buf), &shadow_entry);

172

+                         if (ret == 0) {

173

+                                 g_hash_table_insert (shadow_users, g_strdup (shadow_entry->sp_namp), shadow_entry_buffers);

174

+@@ -185,6 +185,19 @@

175

+                                         break;

176

+                                 }

177

+                         }

178

++#else

179

++                        /* Musl libc does not support fgetspent_r(), so fall back

180

++                         * to using the non-thread-safe fgetspent() function.

181

++                         */

182

++                        shadow_entry = fgetspent(fp);

183

++                        if (shadow_entry == NULL) {

184

++                                g_free (shadow_entry_buffers);

185

++

186

++                                if (errno != EINTR) {

187

++                                        break;

188

++                                }

189

++                        }

190

++#endif

191

+                 } while (shadow_entry != NULL);

192

+

193

+                 fclose (fp);

194

195

diff --git a/sys-apps/accountsservice/metadata.xml b/sys-apps/accountsservice/metadata.xml

196

new file mode 100644

197

index 0000000..df1259a

198

--- /dev/null

199

+++ b/sys-apps/accountsservice/metadata.xml

200

@@ -0,0 +1,12 @@

201

+<?xml version="1.0" encoding="UTF-8"?>

202

+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">

203

+<pkgmetadata>

204

+	<maintainer type="project">

205

+		<email>gnome@g.o</email>

206

+		<name>Gentoo GNOME Desktop</name>

207

+	</maintainer>

208

+	<use>

209

+		<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of

210

+			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>

211

+	</use>

212

+</pkgmetadata>

1	commit: 83a777a5bb4b302be6802cbe8fbd3a1b2dc8baa7
2	Author: Rasmus Thomsen <rasmus.thomsen <AT> live <DOT> de>
3	AuthorDate: Wed Mar 29 14:29:34 2017 +0000
4	Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5	CommitDate: Wed Mar 29 16:40:00 2017 +0000
6	URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=83a777a5
7
8	sys-apps/accountsservice: add ebuild with musl fixes
9
10	sys-apps/accountsservice/Manifest \| 5 ++
11	.../accountsservice/accountsservice-0.6.43.ebuild \| 60 ++++++++++++++++++++++
12	...ccountsservice-0.6.35-gentoo-system-users.patch \| 51 ++++++++++++++++++
13	.../accountsservice/files/musl-fgetspent_r.patch \| 34 ++++++++++++
14	sys-apps/accountsservice/metadata.xml \| 12 +++++
15	5 files changed, 162 insertions(+)
16
17	diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
18	new file mode 100644
19	index 0000000..745459b
20	--- /dev/null
21	+++ b/sys-apps/accountsservice/Manifest
22	@@ -0,0 +1,5 @@
23	+AUX accountsservice-0.6.35-gentoo-system-users.patch 1122 SHA256 f1a308a364db53ec939505daf1435fb99cf2899789976e21080464720b78297f SHA512 e8ac404aed1da3ab4bb092b476cbb18f2ae7d209bcbe6a30cb9058f50dce0f70d64a3de593108ef5588132389d522d19975384eb1b8414119cb622bc7d738931 WHIRLPOOL 35d8756e1fcff2c08926ecc2864bacccad5542d59a028b0969a4429a4855528d9b607f4cfe5849d04f131db2e142dd1bf9531ca6b79b404e55d97ba0fd6162f8
24	+AUX musl-fgetspent_r.patch 1475 SHA256 97a06c8777ab85deae2633e2b83b865f1c65ded4e4263ef19e7949d8f482d1a0 SHA512 1c8ca5522c7533d105b91180c41f36a9d4a660fb86e275d6428caee70c9102ca61312c1ecb886f490b84f59aea18f630904cb91e1e9cac45dbc700bcd10c0363 WHIRLPOOL c3a1dfebf26d1770e86a679766a15d255e853fd1bf1b1b8b0d96fe9656413807cb21fddf9d6b79d4cdb0bd5b5f53035b55f5fa83113a1981e9780adfbecb0c83
25	+DIST accountsservice-0.6.43.tar.xz 381008 SHA256 ed3ba94aa38ceb822a0e1a1ac71bf1a8123babf90be049397b3a00900e48d6cc SHA512 0673430b7e5fd726397a9358d60d5c34542afaa786b795d3c8b544dc2bdab151c74f9a3daa4bcd94dc7669400a78cd4cddc453cad78ee8e431bf7c1f417138e2 WHIRLPOOL e704d9dcb5b7c0c6ee7c1ab5ed310ab2428e94d061663367f213c5903f68768680492d651524ef1e7594417335de529463d63b8d8a4d1cc8b6445358f1b97a33
26	+EBUILD accountsservice-0.6.43.ebuild 1497 SHA256 81c71c962f51ef316f072983dc7ba1bb847826fea69a1a323f8828c73a54283e SHA512 3cde07f954c2db1a17c5475d4802b3cfd5381fa9d359e26fa389ab868137f5be7dad420e086d275004902b27ca77d973c53d565e2c16a2686efbdb20247d1e84 WHIRLPOOL 4e5ac23047ef83656d83e074952cf021893be66dd29451d5b550e1ff4b642d5b20869c0df29c27bb5437d6ac06b458398e8a374db9583de19b5c98e99849e6c2
27	+MISC metadata.xml 396 SHA256 51257c7b97ea8af47f6485adee93352a26dc901024f316b3a1dcf8c2cbcd62bf SHA512 e523489c63c11a5ed2d060f9bfdf5cf5d47813c1289823032e9b45ed2dfdd1ef9d11a863403cd1492696f4ea0070a61ca3a8d8780d1bdba9ed710a035ef1a5ce WHIRLPOOL c4687da67a3971a43863ce13a2bba326a8271e392d5253024ecf0abe55977c09f81e06da7b5c4506a232a2abb1a8b13bd41ffa4a128f0c8fcb22f43c20de5e4c
28
29	diff --git a/sys-apps/accountsservice/accountsservice-0.6.43.ebuild b/sys-apps/accountsservice/accountsservice-0.6.43.ebuild
30	new file mode 100644
31	index 0000000..1e28d31
32	--- /dev/null
33	+++ b/sys-apps/accountsservice/accountsservice-0.6.43.ebuild
34	@@ -0,0 +1,60 @@
35	+# Copyright 1999-2017 Gentoo Foundation
36	+# Distributed under the terms of the GNU General Public License v2
37	+
38	+EAPI=6
39	+inherit gnome2 systemd
40	+
41	+DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
42	+HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/"
43	+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
44	+
45	+LICENSE="GPL-3+"
46	+SLOT="0"
47	+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
48	+
49	+IUSE="doc +introspection selinux systemd"
50	+
51	+CDEPEND="
52	+ >=dev-libs/glib-2.37.3:2
53	+ sys-auth/polkit
54	+ introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
55	+ systemd? ( >=sys-apps/systemd-186:0= )
56	+ !systemd? ( sys-auth/consolekit )
57	+"
58	+DEPEND="${CDEPEND}
59	+ dev-libs/libxslt
60	+ dev-util/gdbus-codegen
61	+ >=dev-util/gtk-doc-am-1.15
62	+ >=dev-util/intltool-0.40
63	+ sys-devel/gettext
64	+ virtual/pkgconfig
65	+ doc? (
66	+ app-text/docbook-xml-dtd:4.1.2
67	+ app-text/xmlto )
68	+"
69	+RDEPEND="${CDEPEND}
70	+ selinux? ( sec-policy/selinux-accountsd )
71	+"
72	+
73	+PATCHES=(
74	+ "${FILESDIR}/${PN}-0.6.35-gentoo-system-users.patch"
75	+ "${FILESDIR}/musl-fgetspent_r.patch"
76	+)
77	+
78	+src_prepare() {
79	+ default
80	+ sed -i configure -e "s;utx\.log;wtmp;g"
81	+ export ac_cv_file__var_log_utx_log=yes
82	+}
83	+
84	+src_configure() {
85	+ gnome2_src_configure \
86	+ --disable-static \
87	+ --disable-more-warnings \
88	+ --localstatedir="${EPREFIX}"/var \
89	+ --enable-admin-group="wheel" \
90	+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
91	+ $(use_enable doc docbook-docs) \
92	+ $(use_enable introspection) \
93	+ $(use_enable systemd)
94	+}
95
96	diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.35-gentoo-system-users.patch b/sys-apps/accountsservice/files/accountsservice-0.6.35-gentoo-system-users.patch
97	new file mode 100644
98	index 0000000..39ebf42
99	--- /dev/null
100	+++ b/sys-apps/accountsservice/files/accountsservice-0.6.35-gentoo-system-users.patch
101	@@ -0,0 +1,51 @@
102	+--- a/src/user-classify.c.old 2013-12-04 20:29:48.944454769 +0100
103	++++ b/src/user-classify.c 2013-12-04 20:32:59.728283477 +0100
104	+@@ -55,6 +55,48 @@
105	+ "at",
106	+ "gdm",
107	+ "gnome-initial-setup"
108	++ /* Additional Gentoo system users with non-trivial login shell */
109	++ "amanda",
110	++ "backuppc",
111	++ "drqueue",
112	++ "firebird",
113	++ "flexlm",
114	++ "foldingathome",
115	++ "geneweb",
116	++ "git",
117	++ "gnump3d",
118	++ "hacluster",
119	++ "hg",
120	++ "hsqldb",
121	++ "infinote",
122	++ "foldingathome",
123	++ "geneweb",
124	++ "git",
125	++ "gnump3d",
126	++ "hacluster",
127	++ "hg",
128	++ "hsqldb",
129	++ "infinote",
130	++ "jffnms",
131	++ "klive",
132	++ "mailman",
133	++ "mpd",
134	++ "mythtv",
135	++ "nagios",
136	++ "nx",
137	++ "oneadmin",
138	++ "openvpn",
139	++ "p2p",
140	++ "phxd",
141	++ "resin",
142	++ "rplayd",
143	++ "scponly",
144	++ "secoff",
145	++ "tinyproxy",
146	++ "ttrssd",
147	++ "vboxguest",
148	++ "vdr",
149	++ "vdradmin",
150	+ };
151	+
152	+ #define PATH_NOLOGIN "/sbin/nologin"
153
154	diff --git a/sys-apps/accountsservice/files/musl-fgetspent_r.patch b/sys-apps/accountsservice/files/musl-fgetspent_r.patch
155	new file mode 100644
156	index 0000000..c365065
157	--- /dev/null
158	+++ b/sys-apps/accountsservice/files/musl-fgetspent_r.patch
159	@@ -0,0 +1,34 @@
160	+Musl libc does not support fgetspent_r(), so fall back
161	+to using the non-thread-safe fgetspent() function.
162	+
163	+--- a/src/daemon.c 2016-09-06 21:48:50.000000000 +0200
164	++++ b/src/daemon.c 2016-11-25 10:41:01.614534302 +0100
165	+@@ -174,7 +174,7 @@
166	+ int ret = 0;
167	+
168	+ shadow_entry_buffers = g_malloc0 (sizeof (*shadow_entry_buffers));
169	+-
170	++#if defined(__GLIBC__)
171	+ ret = fgetspent_r (fp, &shadow_entry_buffers->spbuf, shadow_entry_buffers->buf, sizeof (shadow_entry_buffers->buf), &shadow_entry);
172	+ if (ret == 0) {
173	+ g_hash_table_insert (shadow_users, g_strdup (shadow_entry->sp_namp), shadow_entry_buffers);
174	+@@ -185,6 +185,19 @@
175	+ break;
176	+ }
177	+ }
178	++#else
179	++ /* Musl libc does not support fgetspent_r(), so fall back
180	++ * to using the non-thread-safe fgetspent() function.
181	++ */
182	++ shadow_entry = fgetspent(fp);
183	++ if (shadow_entry == NULL) {
184	++ g_free (shadow_entry_buffers);
185	++
186	++ if (errno != EINTR) {
187	++ break;
188	++ }
189	++ }
190	++#endif
191	+ } while (shadow_entry != NULL);
192	+
193	+ fclose (fp);
194
195	diff --git a/sys-apps/accountsservice/metadata.xml b/sys-apps/accountsservice/metadata.xml
196	new file mode 100644
197	index 0000000..df1259a
198	--- /dev/null
199	+++ b/sys-apps/accountsservice/metadata.xml
200	@@ -0,0 +1,12 @@
201	+<?xml version="1.0" encoding="UTF-8"?>
202	+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
203	+<pkgmetadata>
204	+ <maintainer type="project">
205	+ <email>gnome@g.o</email>
206	+ <name>Gentoo GNOME Desktop</name>
207	+ </maintainer>
208	+ <use>
209	+ <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
210	+ <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
211	+ </use>
212	+</pkgmetadata>

Gentoo Archives: gentoo-commits