Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-games/files: gnome-games-2.26.2-parallel-make.patch
Date: Sun, 31 May 2009 12:40:37
Message-Id: E1MAkL4-0003dt-AE@stork.gentoo.org
1 eva 09/05/31 12:40:34
2
3 Added: gnome-games-2.26.2-parallel-make.patch
4 Log:
5 Bump to 2.26.2-r1. Make sound output selectable, bug #269780. Fix installation of setgid binaries, bug #267041.
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 gnome-extra/gnome-games/files/gnome-games-2.26.2-parallel-make.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-games/files/gnome-games-2.26.2-parallel-make.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-games/files/gnome-games-2.26.2-parallel-make.patch?rev=1.1&content-type=text/plain
13
14 Index: gnome-games-2.26.2-parallel-make.patch
15 ===================================================================
16 From 576a63f9c11eb0357e10fc851aab309bc6053e0e Mon Sep 17 00:00:00 2001
17 From: Gilles Dartiguelongue <eva@g.o>
18 Date: Sun, 31 May 2009 12:47:09 +0200
19 Subject: [PATCH] Fix parallel make install setgid race condition.
20
21 Use install-data-exec-hook for data kind of files and install-exec-hook
22 for binary files.
23 ---
24 glines/Makefile.am | 13 +++++++++----
25 gnibbles/Makefile.am | 10 +++++++---
26 gnobots2/Makefile.am | 8 ++++++--
27 gnometris/Makefile.am | 8 ++++++--
28 gnomine/Makefile.am | 8 ++++++--
29 gnotravex/Makefile.am | 12 ++++++++----
30 gnotski/Makefile.am | 12 ++++++++----
31 gtali/Makefile.am | 10 +++++++---
32 mahjongg/Makefile.am | 12 ++++++++----
33 same-gnome/Makefile.am | 12 ++++++++----
34 10 files changed, 73 insertions(+), 32 deletions(-)
35
36 diff --git a/glines/Makefile.am b/glines/Makefile.am
37 index 6fb9542..b75d20e 100644
38 --- a/glines/Makefile.am
39 +++ b/glines/Makefile.am
40 @@ -68,7 +68,7 @@ SCOREFILES = \
41 Large \
42 $(NULL)
43
44 -install-schemas-local: $(schema_DATA)
45 +install-schemas-hook: $(schema_DATA)
46 if GCONF_SCHEMAS_INSTALL
47 if test -z "$(DESTDIR)" ; then \
48 for p in $^ ; do \
49 @@ -77,7 +77,7 @@ if GCONF_SCHEMAS_INSTALL
50 fi
51 endif
52
53 -install-scorefiles-local:
54 +install-scorefiles-hook:
55 -$(mkinstalldirs) $(DESTDIR)$(scoredir)
56 ## Migrate to the new scoring system (with a link for dual-version
57 ## installs).
58 @@ -90,6 +90,11 @@ install-scorefiles-local:
59 chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/glines.$$i.scores; \
60 chmod 664 $(DESTDIR)$(scoredir)/glines.$$i.scores; \
61 done
62 - -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/glines && chmod 2555 $(DESTDIR)$(bindir)/glines ; fi
63
64 -install-data-local: install-schemas-local install-scorefiles-local
65 +install-data-hook: install-schemas-hook install-scorefiles-hook
66 +
67 +install-exec-hook:
68 + -if test "x$(setgid)" = "xtrue"; then \
69 + chgrp $(scores_group) $(DESTDIR)$(bindir)/glines && chmod 2555 $(DESTDIR)$(bindir)/glines ;\
70 + fi
71 +
72 diff --git a/gnibbles/Makefile.am b/gnibbles/Makefile.am
73 index c75def3..71ddc0d 100644
74 --- a/gnibbles/Makefile.am
75 +++ b/gnibbles/Makefile.am
76 @@ -168,7 +168,7 @@ DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
77
78 SCOREFILES = 4.0 3.0 2.0 1.0 4.1 3.1 2.1 1.1
79
80 -install-data-local: $(ggzclient_dsc_in_files:.dsc.in=.dsc)
81 +install-data-hook: $(ggzclient_dsc_in_files:.dsc.in=.dsc)
82 if GCONF_SCHEMAS_INSTALL
83 GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnibbles/$(schema_DATA)
84 endif
85 @@ -181,9 +181,13 @@ endif
86 chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gnibbles.$$i.scores; \
87 chmod 664 $(DESTDIR)$(scoredir)/gnibbles.$$i.scores; \
88 done
89 - -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gnibbles && chmod 2555 $(DESTDIR)$(bindir)/gnibbles ; fi
90
91 -uninstall-local:
92 +install-exec-hook:
93 + -if test "x$(setgid)" = "xtrue"; then \
94 + chgrp $(scores_group) $(DESTDIR)$(bindir)/gnibbles && chmod 2555 $(DESTDIR)$(bindir)/gnibbles ;\
95 + fi
96 +
97 +uninstall-hook:
98 if GGZ_CLIENT
99 -$(GGZ_CONFIG) -D --remove --modfile=gnibbles-client.dsc
100 endif
101 diff --git a/gnobots2/Makefile.am b/gnobots2/Makefile.am
102 index 377ad20..c60eb48 100644
103 --- a/gnobots2/Makefile.am
104 +++ b/gnobots2/Makefile.am
105 @@ -86,7 +86,7 @@ EXTRA_DIST = AUTHORS \
106 $(config_DATA) \
107 $(schema_in_files)
108
109 -install-data-local:
110 +install-data-hook:
111 if GCONF_SCHEMAS_INSTALL
112 GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnobots2/$(schema_DATA)
113 endif
114 @@ -100,6 +100,10 @@ endif
115 touch $$fname2; chmod 664 $$fname2; chown $(scores_user):$(scores_group) $$fname2; \
116 touch $$fname3; chmod 664 $$fname3; chown $(scores_user):$(scores_group) $$fname3; \
117 done
118 - -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gnobots2 && chmod 2555 $(DESTDIR)$(bindir)/gnobots2 ; fi
119 +
120 +install-exec-hook:
121 + -if test "x$(setgid)" = "xtrue"; then \
122 + chgrp $(scores_group) $(DESTDIR)$(bindir)/gnobots2 && chmod 2555 $(DESTDIR)$(bindir)/gnobots2 ;\
123 + fi
124
125 DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
126 diff --git a/gnometris/Makefile.am b/gnometris/Makefile.am
127 index 14c72b0..e819e34 100644
128 --- a/gnometris/Makefile.am
129 +++ b/gnometris/Makefile.am
130 @@ -108,7 +108,7 @@ EXTRA_DIST = AUTHORS \
131 $(pixmap_DATA) \
132 $(schema_in_files)
133
134 -install-data-local:
135 +install-data-hook:
136 if GCONF_SCHEMAS_INSTALL
137 GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnometris/$(schema_DATA)
138 endif
139 @@ -116,6 +116,10 @@ endif
140 -touch $(DESTDIR)$(scoredir)/gnometris.scores
141 -chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gnometris.scores
142 -chmod 664 $(DESTDIR)$(scoredir)/gnometris.scores
143 - -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gnometris && chmod 2555 $(DESTDIR)$(bindir)/gnometris ; fi
144 +
145 +install-exec-hook:
146 + -if test "x$(setgid)" = "xtrue"; then \
147 + chgrp $(scores_group) $(DESTDIR)$(bindir)/gnometris && chmod 2555 $(DESTDIR)$(bindir)/gnometris ;\
148 + fi
149
150 DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
151 diff --git a/gnomine/Makefile.am b/gnomine/Makefile.am
152 index d11ce97..acb4077 100644
153 --- a/gnomine/Makefile.am
154 +++ b/gnomine/Makefile.am
155 @@ -54,7 +54,7 @@ Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
156
157 SCOREFILES = Small Medium Large Custom
158
159 -install-data-local:
160 +install-data-hook:
161 if GCONF_SCHEMAS_INSTALL
162 GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnomine/$(schema_DATA)
163 endif
164 @@ -68,6 +68,10 @@ endif
165 chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gnomine.$$i.scores; \
166 chmod 664 $(DESTDIR)$(scoredir)/gnomine.$$i.scores; \
167 done
168 - -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gnomine && chmod 2555 $(DESTDIR)$(bindir)/gnomine ; fi
169 +
170 +install-exec-hook:
171 + -if test "x$(setgid)" = "xtrue"; then \
172 + chgrp $(scores_group) $(DESTDIR)$(bindir)/gnomine && chmod 2555 $(DESTDIR)$(bindir)/gnomine ;\
173 + fi
174
175 DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
176 diff --git a/gnotravex/Makefile.am b/gnotravex/Makefile.am
177 index 865f11c..f75a91e 100644
178 --- a/gnotravex/Makefile.am
179 +++ b/gnotravex/Makefile.am
180 @@ -55,7 +55,7 @@ EXTRA_DIST = \
181 CLEANFILES = $(desktop_DATA) $(schema_DATA)
182 DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
183
184 -install-schemas-local: $(schema_DATA)
185 +install-schemas-hook: $(schema_DATA)
186 if GCONF_SCHEMAS_INSTALL
187 if test -z "$(DESTDIR)" ; then \
188 for p in $^ ; do \
189 @@ -66,13 +66,17 @@ endif
190
191 SCOREFILES = 2 3 4 5 6
192
193 -install-scorefiles-local:
194 +install-scorefiles-hook:
195 -$(mkinstalldirs) $(DESTDIR)$(scoredir)
196 -for i in ${SCOREFILES} ; do \
197 touch $(DESTDIR)$(scoredir)/gnotravex."$$i"x"$$i".scores; \
198 chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gnotravex."$$i"x"$$i".scores; \
199 chmod 664 $(DESTDIR)$(scoredir)/gnotravex."$$i"x"$$i".scores; \
200 done
201 - -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gnotravex && chmod 2555 $(DESTDIR)$(bindir)/gnotravex ; fi
202
203 -install-data-local: install-schemas-local install-scorefiles-local
204 +install-exec-hook:
205 + -if test "x$(setgid)" = "xtrue"; then \
206 + chgrp $(scores_group) $(DESTDIR)$(bindir)/gnotravex && chmod 2555 $(DESTDIR)$(bindir)/gnotravex ;\
207 + fi
208 +
209 +install-data-hook: install-schemas-hook install-scorefiles-hook
210 diff --git a/gnotski/Makefile.am b/gnotski/Makefile.am
211 index 08efd17..3863937 100644
212 --- a/gnotski/Makefile.am
213 +++ b/gnotski/Makefile.am
214 @@ -62,7 +62,7 @@ EXTRA_DIST = \
215 CLEANFILES = $(desktop_DATA) $(schema_DATA)
216 DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
217
218 -install-schemas-local: $(schema_DATA)
219 +install-schemas-hook: $(schema_DATA)
220 if GCONF_SCHEMAS_INSTALL
221 if test -z "$(DESTDIR)" ; then \
222 for p in $^ ; do \
223 @@ -71,16 +71,20 @@ if GCONF_SCHEMAS_INSTALL
224 fi
225 endif
226
227 -install-scorefiles-local:
228 +install-scorefiles-hook:
229 -$(mkinstalldirs) $(DESTDIR)$(scoredir)
230 - -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gnotski && chmod 2555 $(DESTDIR)$(bindir)/gnotski ; fi
231 -for i in ${SCOREFILES} ; do \
232 touch $(DESTDIR)$(scoredir)/gnotski.$$i.scores; \
233 chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gnotski.$$i.scores; \
234 chmod 664 $(DESTDIR)$(scoredir)/gnotski.$$i.scores; \
235 done
236
237 -install-data-local: install-schemas-local install-scorefiles-local
238 +install-data-hook: install-schemas-hook install-scorefiles-hook
239 +
240 +install-exec-hook:
241 + -if test "x$(setgid)" = "xtrue"; then \
242 + chgrp $(scores_group) $(DESTDIR)$(bindir)/gnotski && chmod 2555 $(DESTDIR)$(bindir)/gnotski ;\
243 + fi
244
245 @INTLTOOL_SCHEMAS_RULE@
246 @INTLTOOL_DESKTOP_RULE@
247 diff --git a/gtali/Makefile.am b/gtali/Makefile.am
248 index ca0ae91..ee6b0d5 100644
249 --- a/gtali/Makefile.am
250 +++ b/gtali/Makefile.am
251 @@ -53,7 +53,7 @@ Games_in_files = gtali.desktop.in.in
252 Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
253 @INTLTOOL_DESKTOP_RULE@
254
255 -install-data-local:
256 +install-data-hook:
257 if GCONF_SCHEMAS_INSTALL
258 -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gtali/$(schema_DATA)
259 endif
260 @@ -64,7 +64,11 @@ endif
261 -chmod 664 $(DESTDIR)$(scoredir)/gtali.Regular.scores
262 -touch $(DESTDIR)$(scoredir)/gtali.Colors.scores
263 -chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gtali.Colors.scores
264 - -chmod 664 $(DESTDIR)$(scoredir)/gtali.Colors.scores
265 - -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gtali && chmod 2555 $(DESTDIR)$(bindir)/gtali ; fi
266 + -chmod 664 $(DESTDIR)$(scoredir)/gtali.Colors.scores
267 +
268 +install-exec-hook:
269 + -if test "x$(setgid)" = "xtrue"; then \
270 + chgrp $(scores_group) $(DESTDIR)$(bindir)/gtali && chmod 2555 $(DESTDIR)$(bindir)/gtali ;\
271 + fi
272
273 DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
274 diff --git a/mahjongg/Makefile.am b/mahjongg/Makefile.am
275 index 8da5b46..d378de7 100644
276 --- a/mahjongg/Makefile.am
277 +++ b/mahjongg/Makefile.am
278 @@ -73,7 +73,7 @@ EXTRA_DIST = \
279 CLEANFILES = $(desktop_DATA) $(schema_DATA)
280 DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
281
282 -install-schemas-local: $(schema_DATA)
283 +install-schemas-hook: $(schema_DATA)
284 if GCONF_SCHEMAS_INSTALL
285 if test -z "$(DESTDIR)" ; then \
286 for p in $^ ; do \
287 @@ -82,16 +82,20 @@ if GCONF_SCHEMAS_INSTALL
288 fi
289 endif
290
291 -install-scorefiles-local:
292 +install-scorefiles-hook:
293 -$(mkinstalldirs) $(DESTDIR)$(scoredir)
294 -for i in easy difficult confounding pyramid tictactoe cloud dragon bridges ziggurat; do \
295 touch $(DESTDIR)$(scoredir)/mahjongg.$$i.scores; \
296 chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/mahjongg.$$i.scores; \
297 chmod 664 $(DESTDIR)$(scoredir)/mahjongg.$$i.scores; \
298 done
299 - -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/mahjongg && chmod 2555 $(DESTDIR)$(bindir)/mahjongg ; fi
300
301 -install-data-local: install-schemas-local install-scorefiles-local
302 +install-exec-hook:
303 + -if test "x$(setgid)" = "xtrue"; then \
304 + chgrp $(scores_group) $(DESTDIR)$(bindir)/mahjongg && chmod 2555 $(DESTDIR)$(bindir)/mahjongg ;\
305 + fi
306 +
307 +install-data-hook: install-schemas-hook install-scorefiles-hook
308
309 @INTLTOOL_DESKTOP_RULE@
310 @INTLTOOL_SCHEMAS_RULE@
311 diff --git a/same-gnome/Makefile.am b/same-gnome/Makefile.am
312 index e147957..406a3de 100644
313 --- a/same-gnome/Makefile.am
314 +++ b/same-gnome/Makefile.am
315 @@ -69,7 +69,7 @@ DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
316
317 SCOREFILES = Small Medium Large
318
319 -install-schemas-local: $(schema_DATA)
320 +install-schemas-hook: $(schema_DATA)
321 if GCONF_SCHEMAS_INSTALL
322 if test -z "$(DESTDIR)" ; then \
323 for p in $^ ; do \
324 @@ -78,7 +78,7 @@ if GCONF_SCHEMAS_INSTALL
325 fi
326 endif
327
328 -install-scorefiles-local:
329 +install-scorefiles-hook:
330 -$(mkinstalldirs) $(DESTDIR)$(scoredir)
331 ## Migrate to the new scoring system (with a link for dual-version
332 ## installs).
333 @@ -91,9 +91,13 @@ install-scorefiles-local:
334 chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/same-gnome.$$i.scores; \
335 chmod 664 $(DESTDIR)$(scoredir)/same-gnome.$$i.scores; \
336 done
337 - -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/same-gnome && chmod 2555 $(DESTDIR)$(bindir)/same-gnome ; fi
338
339 -install-data-local: install-schemas-local install-scorefiles-local
340 +install-exec-hook:
341 + -if test "x$(setgid)" = "xtrue"; then \
342 + chgrp $(scores_group) $(DESTDIR)$(bindir)/same-gnome && chmod 2555 $(DESTDIR)$(bindir)/same-gnome ;\
343 + fi
344 +
345 +install-data-hook: install-schemas-hook install-scorefiles-hook
346
347 @INTLTOOL_SCHEMAS_RULE@
348 @INTLTOOL_DESKTOP_RULE@
349 --
350 1.6.3.1