Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-auth/consolekit/files: 90-consolekit consolekit-0.4.0-multilib.patch consolekit-0.4.1-shutdown-reboot-without-policies.patch consolekit-0.4.0-polkit-automagic.patch consolekit-0.2.3-freebsd.patch
Date: Thu, 29 Oct 2009 23:33:53
Message-Id: E1N3eV0-0002SL-IH@stork.gentoo.org
1 eva 09/10/29 23:33:46
2
3 Modified: 90-consolekit
4 Added: consolekit-0.4.0-multilib.patch
5 consolekit-0.4.1-shutdown-reboot-without-policies.patch
6 consolekit-0.4.0-polkit-automagic.patch
7 Removed: consolekit-0.2.3-freebsd.patch
8 Log:
9 New version for GNOME 2.28. Clean up old revision. Fix xinitrc script.
10 (Portage version: 2.2_rc46/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.2 sys-auth/consolekit/files/90-consolekit
14
15 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/consolekit/files/90-consolekit?rev=1.2&view=markup
16 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/consolekit/files/90-consolekit?rev=1.2&content-type=text/plain
17 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/consolekit/files/90-consolekit?r1=1.1&r2=1.2
18
19 Index: 90-consolekit
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/sys-auth/consolekit/files/90-consolekit,v
22 retrieving revision 1.1
23 retrieving revision 1.2
24 diff -u -r1.1 -r1.2
25 --- 90-consolekit 15 Feb 2009 22:33:16 -0000 1.1
26 +++ 90-consolekit 29 Oct 2009 23:33:45 -0000 1.2
27 @@ -7,6 +7,6 @@
28 CK_LAUNCH_SESSION=/usr/bin/ck-launch-session
29
30 if [ -z "$XDG_SESSION_COOKIE" ] && [ -x "$CK_LAUNCH_SESSION" ]; then
31 - STARTUP="$CK_LAUNCH_SESSION $STARTUP"
32 + command="$CK_LAUNCH_SESSION $command"
33 fi
34
35
36
37
38 1.1 sys-auth/consolekit/files/consolekit-0.4.0-multilib.patch
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/consolekit/files/consolekit-0.4.0-multilib.patch?rev=1.1&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/consolekit/files/consolekit-0.4.0-multilib.patch?rev=1.1&content-type=text/plain
42
43 Index: consolekit-0.4.0-multilib.patch
44 ===================================================================
45 From c4ba8b276bf95faf2f643e42988709ed6cb0b2f0 Mon Sep 17 00:00:00 2001
46 From: Gilles Dartiguelongue <eva@g.o>
47 Date: Sun, 18 Oct 2009 23:30:36 +0200
48 Subject: [PATCH] respect multilib
49
50 ---
51 src/Makefile.am | 4 ++--
52 src/ck-manager.c | 4 ++--
53 src/ck-seat.c | 2 +-
54 src/ck-session.c | 2 +-
55 tools/freebsd/Makefile.am | 2 +-
56 tools/linux/Makefile.am | 2 +-
57 tools/solaris/Makefile.am | 2 +-
58 7 files changed, 9 insertions(+), 9 deletions(-)
59
60 diff --git a/src/Makefile.am b/src/Makefile.am
61 index 6ab05c8..d6fb810 100644
62 --- a/src/Makefile.am
63 +++ b/src/Makefile.am
64 @@ -204,8 +204,8 @@ MAINTAINERCLEANFILES = \
65
66 install-data-local:
67 -mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-session.d
68 - -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d
69 + -mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-session.d
70 -mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-seat.d
71 - -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
72 + -mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
73 -mkdir -p $(DESTDIR)$(localstatedir)/run/ConsoleKit
74 -mkdir -p $(DESTDIR)$(localstatedir)/log/ConsoleKit
75 diff --git a/src/ck-manager.c b/src/ck-manager.c
76 index 99693a3..e65e25b 100644
77 --- a/src/ck-manager.c
78 +++ b/src/ck-manager.c
79 @@ -1083,7 +1083,7 @@ do_restart (CkManager *manager,
80 log_system_restart_event (manager);
81
82 error = NULL;
83 - res = g_spawn_command_line_async (PREFIX "/lib/ConsoleKit/scripts/ck-system-restart",
84 + res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-restart",
85 &error);
86 if (! res) {
87 GError *new_error;
88 @@ -1164,7 +1164,7 @@ do_stop (CkManager *manager,
89 log_system_stop_event (manager);
90
91 error = NULL;
92 - res = g_spawn_command_line_async (PREFIX "/lib/ConsoleKit/scripts/ck-system-stop",
93 + res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-stop",
94 &error);
95 if (! res) {
96 GError *new_error;
97 diff --git a/src/ck-seat.c b/src/ck-seat.c
98 index af7db59..d089f29 100644
99 --- a/src/ck-seat.c
100 +++ b/src/ck-seat.c
101 @@ -1278,7 +1278,7 @@ ck_seat_run_programs (CkSeat *seat,
102 g_assert(n <= G_N_ELEMENTS(extra_env));
103
104 ck_run_programs (SYSCONFDIR "/ConsoleKit/run-seat.d", action, extra_env);
105 - ck_run_programs (PREFIX "/lib/ConsoleKit/run-seat.d", action, extra_env);
106 + ck_run_programs (LIBDIR "/ConsoleKit/run-seat.d", action, extra_env);
107
108 for (n = 0; extra_env[n] != NULL; n++) {
109 g_free (extra_env[n]);
110 diff --git a/src/ck-session.c b/src/ck-session.c
111 index d8db9dd..c2fc320 100644
112 --- a/src/ck-session.c
113 +++ b/src/ck-session.c
114 @@ -1287,7 +1287,7 @@ ck_session_run_programs (CkSession *session,
115 g_assert(n <= G_N_ELEMENTS(extra_env));
116
117 ck_run_programs (SYSCONFDIR "/ConsoleKit/run-session.d", action, extra_env);
118 - ck_run_programs (PREFIX "/lib/ConsoleKit/run-session.d", action, extra_env);
119 + ck_run_programs (LIBDIR "/ConsoleKit/run-session.d", action, extra_env);
120
121 for (n = 0; extra_env[n] != NULL; n++) {
122 g_free (extra_env[n]);
123 diff --git a/tools/freebsd/Makefile.am b/tools/freebsd/Makefile.am
124 index f668722..d25930e 100644
125 --- a/tools/freebsd/Makefile.am
126 +++ b/tools/freebsd/Makefile.am
127 @@ -6,7 +6,7 @@ NULL =
128 SUBDIRS = \
129 $(NULL)
130
131 -scriptdir = $(prefix)/lib/ConsoleKit/scripts
132 +scriptdir = $(libdir)/ConsoleKit/scripts
133 script_SCRIPTS = \
134 ck-system-stop \
135 ck-system-restart \
136 diff --git a/tools/linux/Makefile.am b/tools/linux/Makefile.am
137 index 5a95942..51196c0 100644
138 --- a/tools/linux/Makefile.am
139 +++ b/tools/linux/Makefile.am
140 @@ -6,7 +6,7 @@ NULL =
141 SUBDIRS = \
142 $(NULL)
143
144 -scriptdir = $(prefix)/lib/ConsoleKit/scripts
145 +scriptdir = $(libdir)/ConsoleKit/scripts
146 script_SCRIPTS = \
147 ck-system-stop \
148 ck-system-restart \
149 diff --git a/tools/solaris/Makefile.am b/tools/solaris/Makefile.am
150 index f668722..d25930e 100644
151 --- a/tools/solaris/Makefile.am
152 +++ b/tools/solaris/Makefile.am
153 @@ -6,7 +6,7 @@ NULL =
154 SUBDIRS = \
155 $(NULL)
156
157 -scriptdir = $(prefix)/lib/ConsoleKit/scripts
158 +scriptdir = $(libdir)/ConsoleKit/scripts
159 script_SCRIPTS = \
160 ck-system-stop \
161 ck-system-restart \
162 --
163 1.6.5.rc1
164
165
166
167
168 1.1 sys-auth/consolekit/files/consolekit-0.4.1-shutdown-reboot-without-policies.patch
169
170 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/consolekit/files/consolekit-0.4.1-shutdown-reboot-without-policies.patch?rev=1.1&view=markup
171 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/consolekit/files/consolekit-0.4.1-shutdown-reboot-without-policies.patch?rev=1.1&content-type=text/plain
172
173 Index: consolekit-0.4.1-shutdown-reboot-without-policies.patch
174 ===================================================================
175 From: Romain Perier <mrpouet@g.o>
176 Date: Sat, 24 Oct 2009 18:43:43 +0200
177 Subject: [PATCH] Be able to shutdown or reboot even without polkit or RBAC supports
178
179 Ck does NOTHING at the origin if its built without polkit or RBAC supports, except
180 display a warning using g_warning() (which does not make sense).
181 The trick is to to call do_stop()/do_restart() in the #else directive :)
182
183 ---
184 src/ck-manager.c | 2 ++
185 1 files changed, 2 insertions(+), 0 deletions(-)
186
187 diff --git a/src/ck-manager.c b/src/ck-manager.c
188 index 99693a3..181df0d 100644
189 --- a/src/ck-manager.c
190 +++ b/src/ck-manager.c
191 @@ -1129,6 +1129,7 @@ ck_manager_restart (CkManager *manager,
192 check_rbac_permissions (manager, context, do_restart);
193 #else
194 g_warning ("Compiled without PolicyKit or RBAC support!");
195 + do_restart(manager, context);
196 #endif
197
198 return TRUE;
199 @@ -1200,6 +1201,7 @@ ck_manager_stop (CkManager *manager,
200 check_rbac_permissions (manager, context, do_stop);
201 #else
202 g_warning ("Compiled without PolicyKit or RBAC support!");
203 + do_stop(manager, context);
204 #endif
205
206 return TRUE;
207 --
208 1.6.5.1
209
210
211
212
213 1.1 sys-auth/consolekit/files/consolekit-0.4.0-polkit-automagic.patch
214
215 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/consolekit/files/consolekit-0.4.0-polkit-automagic.patch?rev=1.1&view=markup
216 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/consolekit/files/consolekit-0.4.0-polkit-automagic.patch?rev=1.1&content-type=text/plain
217
218 Index: consolekit-0.4.0-polkit-automagic.patch
219 ===================================================================
220 Automagic polkit
221
222 ---
223 --- configure.ac
224 +++ configure.ac
225 @@ -55,10 +55,21 @@
226 gthread-2.0 >= $GLIB_REQUIRED_VERSION
227 )
228
229 -PKG_CHECK_MODULES(POLKIT,
230 - polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
231 - have_polkit=yes,
232 - have_polkit=no)
233 +AC_ARG_ENABLE([polkit],
234 + AC_HELP_STRING([--enable-polkit], [Enable PolicyKit support (default auto)]),
235 + enable_polkit=$enableval,
236 + enable_polkit=auto)
237 +
238 +if test "x$enable_polkit" != "xno"; then
239 + PKG_CHECK_MODULES(POLKIT,
240 + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
241 + have_polkit=yes,
242 + have_polkit=no)
243 + if test "x$enable_polkit" = "xyes" -a "x$have_polkit" = "xno"; then
244 + AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
245 + fi
246 +fi
247 +
248 if test "x$have_polkit" = "xyes" ; then
249 AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
250 fi