Add upower-0.9.10

Also adding various dependent packages.

BUG=chromium-os:15600
TEST=Make sure upower can be emerged

Signed-off-by: Simon Que <sque@chromium.org>

Change-Id: Id92d10b8cc2b1e2b84fc5cd965992cc4f8ed4f67
Reviewed-on: http://gerrit.chromium.org/gerrit/1849
Reviewed-by: Benson Leung <bleung@chromium.org>
Tested-by: Benson Leung <bleung@chromium.org>
This commit is contained in:
Simon Que 2011-05-31 14:37:13 -07:00
parent 7fead6142a
commit b98226624b
56 changed files with 4670 additions and 0 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,41 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
AUX glib-1.2.10-automake.patch 827 RMD160 3b1485f89a157b60f31f5ae8ffe2333ab842d217 SHA1 cd40e4dc579190a89e09fad9ac7b209f24b231b3 SHA256 db6d22caf4054c09467b50b6d85566eec7479a29169460950e423c083332ef67
AUX glib-1.2.10-configure-LANG.patch 1464 RMD160 91481ba6b3f7a1d6e22a4ab7003fcee17450f3c1 SHA1 d98cc2f4ac6cc4aae55270ad0e5705af4de9b3ad SHA256 32377819896297caf9628f382c7bba09ee0a049bd977e9ea927314c0c2e669b4
AUX glib-1.2.10-gcc34-fix.patch 2008 RMD160 7e92b8842a8232cada12453d7f5e5a587a2bf496 SHA1 cb9c6e2f5320590713b3fba61f1d984e569d5d08 SHA256 848620bc200c2a42d726744fe6c36e20a396624e82b0c742b726dd72287e6cdd
AUX glib-1.2.10-m4.patch 225 RMD160 65218d0099218a1008827c1364b6e51c073d236b SHA1 e9198bde79320d76ad942d42a0292acb5d216a86 SHA256 c470b3ecc3b8fd6a2d52df816a1c4ccb3ad2d6048e37894f415c8ea9c7925b68
AUX glib-2.10.3-ia64-atomic-ops.patch 1058 RMD160 066e63a99739dc412fbed7f773118323f53ea774 SHA1 13c22e2f75a77e9e0546e495fd28015ddcb8bade SHA256 ad9cad6793626b4e36a59aa6cb839607847aa57ebc37592fd1e273ccd23a53c8
AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d
AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb
AUX glib-2.24-assert-test-failure.patch 724 RMD160 011da2b341281d14741e715eddd401968464608d SHA1 76149f52677a337569dbab1b5f664c8fc16d44ff SHA256 1e3d290455d6bbc3a4f69d7b8abdeb559a01c8cd30dc311641e1cb0b7f84c6af
AUX glib-2.24-punt-python-check.patch 541 RMD160 8783f765b97814bc95a6143b75f317dbbdd8ba0c SHA1 dbaf420d3b8acd7691bc677f1fcc6e2fca04ed54 SHA256 0bdcc11d1434f695a5b5f6ec4c54ab7fa5a9f8a5c22d71b94f97378e92aaff84
AUX glib-2.25-punt-python-check.patch 541 RMD160 93fe958f07c2e03abb3abf95eaa0273b0822d874 SHA1 a9b0b50847f00773254b55238785f65f516ff4ad SHA256 eea2b3a2692b93c98ff06b26b784a264391bc61f8434d101c30cb14802234a3e
AUX glib-2.25-skip-tests-with-dbus-keyring.patch 933 RMD160 20eb4c83cffca42aca845dc74cc2a67803c5df6c SHA1 f845fa3cc991330aa3dcdfbec8426501261a8c70 SHA256 930cdfe8f3b46c20826057b5771f953172c97fed8b3e509f4fde13094ff1c251
AUX glib-2.26.0-disable-locale-sensitive-test.patch 1256 RMD160 2754468a420189f6e8d7ea215b53069a21c14dd0 SHA1 f3008b5db6774b6c9d5a04a4bdbed4a9f553a63e SHA256 f0db01f4198ca3688ece382819d320f39d6b722381e28611df59c880f4d18e02
AUX glib-2.26.0-disable-volumemonitor-broken-test.patch 1181 RMD160 c99e2969a3cab244dc39c81f2dd32bc42677c6e8 SHA1 cc30a7223108fb7fbe1a1c063d9546ffc457b94f SHA256 aa3075f22a9125551fbce6909645fb6b5c5b74282e6fed2ee1d06853b15437d3
AUX glib-2.26.1-deprecation-tests.patch 1396 RMD160 2cda39fa239d9eeb83d179260cfda8ec54b68cab SHA1 0e1eda5351e47feaf249c98aa6988f0608e80a17 SHA256 9d95d7f361900116821f79e2122df4a794af648c0ff9661a937805a5aced2f7a
AUX glib-2.26.1-gatomic-header.patch 269 RMD160 668ded743e0004b671e79d1ee5918c42cc78163d SHA1 db7808b0dfc39d8b415dce071b6a1805cad1a850 SHA256 81046ce8bdb7b1c863aba9cb457443e92b792807b304d0ee8e7dfd2b6fb7b122
AUX glib-2.26.1-gdatetime-test.patch 760 RMD160 05b81043d5bfb0ff54806f4ac96ec135cf7f2898 SHA1 461d462f2d4509d07a70913f1268bd49847608ea SHA256 5f3569050c1fffbb5f312d0a00db9a43ff80446f510ab5d5116220406dfc61e7
AUX glib-2.26.1-gdbus-flushes.patch 2270 RMD160 1bb9668f0df08ce54c16cf476102ca099754af96 SHA1 191e2034fa5eb2097657a82af92680c50509b1a9 SHA256 1adee16f5013695aaab38b8a9130c3ac2f3b8b802405cfa3c7d2ed4767873a07
AUX glib-2.26.1-gsettings-read.patch 784 RMD160 1fa2eb0d8cf57e1724f7ec8738d3bf3606a3b40e SHA1 fe040110bdfdd789a60338edea9091e05f33e7ed SHA256 a43f54e7384c4233026257cd2048c5ad4e470949ad59aad57432f0b9e1a3d49f
AUX glib-2.26.1-gsettings-rules.patch 1414 RMD160 8593654837d8cdd4f01990fdba9ada3c2d7e5c7c SHA1 ec1a9fac96b4e05cd02d2a9ad51a6198af2d8b16 SHA256 9f8d431cd0c7f1ab7559089500baabe275fee85f3b86b0645aeef1b0e913fb74
AUX glib-2.26.1-locked-message.patch 2582 RMD160 3fa459353d46c0aa4add9beccf0737d684b91bc1 SHA1 4e3c9449ccf6ce9d0beb45abffea1742323ff846 SHA256 606e0c52b51343929b3f1f8b15b83321a7b52d31cf2be1325f11eaff7545f110
DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 RMD160 5b7a21da6dc10112409bd885501a6976a2eb894d SHA1 468a7947b7d1688c2e7d61da80d40ca59422fbec SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731
DIST glib-1.2.10.tar.gz 421480 RMD160 f19efe8c87ebeea979a4d36902d8a8209640cd95 SHA1 e5a9361c594608d152d5d9650154c2e3260b87fa SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f
DIST glib-2.26.1.tar.bz2 6704686 RMD160 e8b00fce55aa539ee00588500c0162a8877dc060 SHA1 8d35d5cf41d681dd6480a16be39f7d3cffbd29f0 SHA256 7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5
DIST glib-2.28.5.tar.bz2 6943896 RMD160 939aea42ea77d173712135ffcbcd10e3d01ecd29 SHA1 6cfc1a4e5ed069f0282b90de7635a5704cf7c04c SHA256 8eb4b56b228c6d0bf5021dd23db5b0084d80cc6d8d89d7863073c2da575ec22a
DIST glib-2.28.6.tar.bz2 6955725 RMD160 5858c29829352c0c59fe12dbd6dceba81aabe5f6 SHA1 51996339c823cf36ba28c774c4afad933d5f5744 SHA256 557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578
EBUILD glib-1.2.10-r5.ebuild 1764 RMD160 dc6544841f2acb73d5951100ce9c9182f4d9560e SHA1 e6649f70934720527f69995ab0b8c845032cfb0f SHA256 24442b44089e15432a4f1411d2d59dff9d5c2fbfb91c801b96087588ff71373b
EBUILD glib-2.26.1-r1.ebuild 6043 RMD160 2ee2ee629bd983a44e8f086838343ee73bd97748 SHA1 a1f5bb2a567a583241b5d262ddbe32bb5d3cf515 SHA256 a82428b2be2220ca2a9aa2bf10084812482b5dd2a85b600cfa3e84d83983a2ef
EBUILD glib-2.28.5.ebuild 5358 RMD160 acb21f45ffcbb281364d5f42c2dbb770fd68e147 SHA1 3c42b30fb477653ff6e918dce51caec18b0793aa SHA256 9c3599ebd736f09c285547d0a533b218e30dadff91f2ec985f9fb2b6d1fbd13d
EBUILD glib-2.28.6.ebuild 5350 RMD160 3fd9740f2b032c25c9f67fbb21ec15d603d3d397 SHA1 86383952b25d8333d2ffc789b1a952c57f7890a1 SHA256 9454f27539c4a0035045b5b330e250bbd55ef26625361f44a90247a6b4abcaec
MISC ChangeLog 59633 RMD160 42e02e7cf91280dbc293c6ce33845d3e528b28e2 SHA1 1d4189039d8bcf12a457c7e5929bacaf623d436f SHA256 d00d00d28e5b948830e106b7e68e45edff375caedb5d4fe3c8c51d65114e7648
MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
iEYEARECAAYFAk28SIQACgkQuQc30/atMkAcGQCeNV1KO369Qj1TS3iBSfGCnH6P
jtsAoI02ohDExwIQ+yfhIRXPKStU1NAB
=VeEP
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,29 @@
fix errors with newer automake:
gmodule/Makefile.am:44: testgmodule_LDFLAGS must be set with `=' before using `+='
Makefile.am:73: BUILT_SOURCES multiply defined in condition TRUE ...
Makefile.am:11: ... `BUILT_SOURCES' previously defined here
--- Makefile.am
+++ Makefile.am
@@ -70,7 +70,7 @@
CONFIGURE_DEPENDENCIES = acglib.m4
-BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
+BUILT_SOURCES += stamp-gc-h #note: not glibconfig.h
glibconfig.h: stamp-gc-h
@:
stamp-gc-h: config.status
--- gmodule/Makefile.am
+++ gmodule/Makefile.am
@@ -41,7 +41,7 @@
libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
noinst_PROGRAMS = testgmodule
-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
+testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
.PHONY: files release

View File

@ -0,0 +1,44 @@
The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in
option parsing, it may break.
http://bugs.gentoo.org/133679
--- configure
+++ configure
@@ -54,6 +54,19 @@
infodir='${prefix}/info'
mandir='${prefix}/man'
+# NLS nuisances.
+for as_var in \
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
+do
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+ unset $as_var
+ fi
+done
+
# Initialize some other variables.
subdirs=
MFLAGS= MAKEFLAGS=
@@ -452,16 +463,6 @@
esac
done
-# NLS nuisances.
-# Only set these to C if already set. These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
-
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -rf conftest* confdefs.h
# AIX cpp loses on an empty file, so make sure it contains at least a newline.

View File

@ -0,0 +1,41 @@
--- glib-1.2.10/gstrfuncs.c.orig 2001-02-27 07:00:22.000000000 +0100
+++ glib-1.2.10/gstrfuncs.c 2004-03-01 13:19:49.531603760 +0100
@@ -867,7 +867,7 @@
/* beware of positional parameters
*/
case '$':
- g_warning (G_GNUC_PRETTY_FUNCTION
+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
"(): unable to handle positional parameters (%%n$)");
len += 1024; /* try adding some safety padding */
break;
@@ -1034,7 +1034,7 @@
/* n . dddddddddddddddddddddddd E +- eeee */
conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
if (spec.mod_extra_long)
- g_warning (G_GNUC_PRETTY_FUNCTION
+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
"(): unable to handle long double, collecting double only");
#ifdef HAVE_LONG_DOUBLE
#error need to implement special handling for long double
@@ -1077,7 +1077,7 @@
conv_done = TRUE;
if (spec.mod_long)
{
- g_warning (G_GNUC_PRETTY_FUNCTION
+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
"(): unable to handle wide char strings");
len += 1024; /* try adding some safety padding */
}
@@ -1108,9 +1108,8 @@
conv_len += format - spec_start;
break;
default:
- g_warning (G_GNUC_PRETTY_FUNCTION
- "(): unable to handle `%c' while parsing format",
- c);
+ g_warning ("%s(): unable to handle `%c' while parsing format",
+ G_GNUC_PRETTY_FUNCTION, c);
break;
}
conv_done |= conv_len > 0;

View File

@ -0,0 +1,9 @@
Fix aclocal warning:
/usr/share/aclocal/glib.m4:8: warning: underquoted definition of AM_PATH_GLIB
--- glib-1.2.10/glib.m4
+++ glib-1.2.10/glib.m4
@@ -7,3 +7,3 @@
dnl
-AC_DEFUN(AM_PATH_GLIB,
+AC_DEFUN([AM_PATH_GLIB],
[dnl

View File

@ -0,0 +1,39 @@
From Debian, this one is needed for gcc < 4.1...
--- glib-2.10.0/glib/gatomic.c 2006-02-24 14:02:51.000000000 +0000
+++ glib-2.10.0/glib/gatomic.c 2006-03-06 18:12:06.000000000 +0000
@@ -414,14 +414,14 @@
g_atomic_int_exchange_and_add (volatile gint *atomic,
gint val)
{
- return __sync_fetch_and_add (atomic, val);
+ return __sync_fetch_and_add_si (atomic, val);
}
void
g_atomic_int_add (volatile gint *atomic,
gint val)
{
- __sync_fetch_and_add (atomic, val);
+ __sync_fetch_and_add_si (atomic, val);
}
gboolean
@@ -429,7 +429,7 @@
gint oldval,
gint newval)
{
- return __sync_bool_compare_and_swap (atomic, oldval, newval);
+ return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
}
gboolean
@@ -437,7 +437,7 @@
gpointer oldval,
gpointer newval)
{
- return __sync_bool_compare_and_swap ((long *)atomic,
+ return __sync_bool_compare_and_swap_di ((long *)atomic,
(long)oldval, (long)newval);
}

View File

@ -0,0 +1,21 @@
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodule/gmodule-dl.c glib-2.12.12/gmodule/gmodule-dl.c
--- glib-2.12.12.orig/gmodule/gmodule-dl.c 2007-05-01 19:12:40.000000000 -0400
+++ glib-2.12.12/gmodule/gmodule-dl.c 2007-07-05 20:10:51.000000000 -0400
@@ -106,6 +106,7 @@ _g_module_open (const gchar *file_name,
static gpointer
_g_module_self (void)
{
+#ifndef __FreeBSD__
gpointer handle;
/* to query symbols from the program itself, special link options
@@ -117,6 +118,9 @@ _g_module_self (void)
g_module_set_error (fetch_dlerror (TRUE));
return handle;
+#else
+ return RTLD_DEFAULT;
+#endif
}
static void

View File

@ -0,0 +1,20 @@
Temporary workaround for gio tests failure when ran without FEATURES=userpriv
until upstream bug #552912 is fixed
--- gio/tests/live-g-file.c.orig 2008-09-25 05:44:12.848556034 +0300
+++ gio/tests/live-g-file.c 2008-09-25 06:12:34.248726237 +0300
@@ -769,11 +769,14 @@
if (posix_compat)
{
/* target directory is not accessible (no execute flag) */
+#if 0
+/* Fails when ran as root */
do_copy_move (root, item, TEST_DIR_NO_ACCESS,
TEST_NO_ACCESS);
/* target directory is readonly */
do_copy_move (root, item, TEST_DIR_NO_WRITE,
TEST_NO_ACCESS);
+#endif
}
}
}

View File

@ -0,0 +1,19 @@
Tests fail when upgrading glib from 2.22 to 2.24 if sys-devel/gdb is installed
because gdb is run on .libs/assert-msg-test before LD_LIBRARY_PATH is set. This
causes gdb to use the system-wide glib instead, and fail on the test.
This patch exports LD_LIBRARY_PATH before running gdb
https://bugzilla.gnome.org/621368
---
--- tests/run-assert-msg-test.sh
+++ tests/run-assert-msg-test.sh
@@ -34,6 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then
msg_test="lt-$msg_test"
fi
echo_v "Running gdb on assert-msg-test"
+export LD_LIBRARY_PATH="`dirname $PWD`/glib/.libs:$LD_LIBRARY_PATH"
OUT=$(gdb --batch --ex run --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \
fail "failed to run gdb"

View File

@ -0,0 +1,20 @@
Remove python detection from configure.in, we won't be installing the gdb python
scripts anymore. They use a redhat-specific gdb module that has not been
upstreamed yet.
https://bugs.gentoo.org/291328
https://bugzilla.gnome.org/623552
---
--- configure.in
+++ configure.in
@@ -379,10 +379,6 @@ if test "x$PERL_PATH" = x ; then
fi
AC_SUBST(PERL_PATH)
-# Need suitable python path for greport
-AM_PATH_PYTHON(2.4,,PYTHON="/usr/bin/env python2.4")
-
-
dnl ***********************
dnl *** Tests for iconv ***
dnl ***********************

View File

@ -0,0 +1,20 @@
Remove python detection from configure.in, we won't be installing the gdb python
scripts anymore. They use a redhat-specific gdb module that has not been
upstreamed yet.
https://bugs.gentoo.org/291328
https://bugzilla.gnome.org/623552
---
--- configure.ac
+++ configure.ac
@@ -379,10 +379,6 @@ if test "x$PERL_PATH" = x ; then
fi
AC_SUBST(PERL_PATH)
-# Need suitable python path for greport
-AM_PATH_PYTHON(2.4,,PYTHON="/usr/bin/env python2.4")
-
-
dnl ***********************
dnl *** Tests for iconv ***
dnl ***********************

View File

@ -0,0 +1,22 @@
--- gio/tests/gdbus-peer.c.orig 2010-08-28 20:06:11.000000000 +0300
+++ gio/tests/gdbus-peer.c 2010-08-28 20:06:21.000000000 +0300
@@ -1448,7 +1448,7 @@
g_test_add_func ("/gdbus/peer-to-peer", test_peer);
g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing);
- g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
+ //g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
g_test_add_func ("/gdbus/credentials", test_credentials);
g_test_add_func ("/gdbus/overflow", test_overflow);
--- gio/tests/gdbus-non-socket.c.orig 2010-08-28 20:36:52.000000000 +0300
+++ gio/tests/gdbus-non-socket.c 2010-08-28 20:37:02.000000000 +0300
@@ -336,7 +336,7 @@
/* all the tests rely on a shared main loop */
loop = g_main_loop_new (NULL, FALSE);
- g_test_add_func ("/gdbus/non-socket", test_non_socket);
+ //g_test_add_func ("/gdbus/non-socket", test_non_socket);
ret = g_test_run();

View File

@ -0,0 +1,50 @@
From 3a02a86a0a413304843c1cfad359922322486da6 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Wed, 6 Oct 2010 23:21:01 +0200
Subject: [PATCH 1/2] gsettings: disable locale sensitive test.
---
gio/tests/gsettings.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
index fdadf96..4d19618 100644
--- a/gio/tests/gsettings.c
+++ b/gio/tests/gsettings.c
@@ -625,14 +625,14 @@ test_l10n (void)
g_free (str);
str = NULL;
- setlocale (LC_MESSAGES, "de_DE");
+ /*setlocale (LC_MESSAGES, "de_DE");
str = g_settings_get_string (settings, "error-message");
setlocale (LC_MESSAGES, locale);
g_assert_cmpstr (str, ==, "Unbenannt");
g_object_unref (settings);
g_free (str);
- str = NULL;
+ str = NULL;*/
g_free (locale);
}
@@ -666,14 +666,14 @@ test_l10n_context (void)
g_free (str);
str = NULL;
- setlocale (LC_MESSAGES, "de_DE");
+ /*setlocale (LC_MESSAGES, "de_DE");
g_settings_get (settings, "backspace", "s", &str);
setlocale (LC_MESSAGES, locale);
g_assert_cmpstr (str, ==, "Löschen");
g_object_unref (settings);
g_free (str);
- str = NULL;
+ str = NULL;*/
g_free (locale);
}
--
1.7.3

View File

@ -0,0 +1,43 @@
From 8eb4fb83d0933d09bb6ef0ec1511a6b0eb2cee9b Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Wed, 6 Oct 2010 23:21:22 +0200
Subject: [PATCH 2/2] volumemonitor: disable failing test
---
gio/tests/volumemonitor.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gio/tests/volumemonitor.c b/gio/tests/volumemonitor.c
index 54123ec..df19b58 100644
--- a/gio/tests/volumemonitor.c
+++ b/gio/tests/volumemonitor.c
@@ -112,7 +112,7 @@ test_connected_drives (void)
g_list_free (drives);
}
-static void
+/*static void
test_volumes (void)
{
GList *volumes, *l;
@@ -131,7 +131,7 @@ test_volumes (void)
g_list_foreach (volumes, (GFunc)g_object_unref, NULL);
g_list_free (volumes);
-}
+}*/
static void
test_mounts (void)
@@ -173,7 +173,7 @@ main (int argc, char *argv[])
monitor = g_volume_monitor_get ();
g_test_add_func ("/volumemonitor/connected_drives", test_connected_drives);
- g_test_add_func ("/volumemonitor/volumes", test_volumes);
+ //g_test_add_func ("/volumemonitor/volumes", test_volumes);
g_test_add_func ("/volumemonitor/mounts", test_mounts);
ret = g_test_run ();
--
1.7.3

View File

@ -0,0 +1,43 @@
From cae0b1c57f0f8ce73f4f117f8abb61c68e34a0e7 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue, 30 Nov 2010 02:28:00 +0000
Subject: Bug635093: Deprecation check in tests/testglib.c
The Relation API in glib/grel.h has been marked as
deprecated (G_DISABLE_DEPRECATED), so added check for
that macro in this source file and added label to indicate
deprecation
---
diff --git a/tests/testglib.c b/tests/testglib.c
index b4e29f0..158808a 100644
--- a/tests/testglib.c
+++ b/tests/testglib.c
@@ -1038,6 +1038,7 @@ hash_table_tests (void)
g_hash_table_destroy (hash_table);
}
+#ifndef G_DISABLE_DEPRECATED
static void
relation_test (void)
{
@@ -1110,6 +1111,7 @@ relation_test (void)
relation = NULL;
}
+#endif
static void
gstring_tests (void)
@@ -1539,7 +1541,9 @@ main (int argc,
g_test_add_func ("/testglib/GTree", binary_tree_test);
g_test_add_func ("/testglib/Arrays", test_arrays);
g_test_add_func ("/testglib/GHashTable", hash_table_tests);
- g_test_add_func ("/testglib/Relation", relation_test);
+#ifndef G_DISABLE_DEPRECATED
+ g_test_add_func ("/testglib/Relation (deprecated)", relation_test);
+#endif
g_test_add_func ("/testglib/File Paths", test_paths);
g_test_add_func ("/testglib/File Functions", test_file_functions);
g_test_add_func ("/testglib/Parse Debug Strings", test_g_parse_debug_string);
--
cgit v0.8.3.1

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-glib_gatomic_c,v 1.1 2010/10/10 10:52:04 kili Exp $
--- glib/gatomic.c.orig Thu Sep 23 17:26:45 2010
+++ glib/gatomic.c Sun Oct 10 11:50:01 2010
@@ -28,6 +28,7 @@
#endif
#include "gatomic.h"
+#include "gthread.h"
#include "gthreadprivate.h"
/**

View File

@ -0,0 +1,21 @@
From 3f059a6a123dd62257f224b9af7701078783060e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 22 Jan 2011 04:41:12 +0000
Subject: Remove a test that seems to fail depending on time of day
---
diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
index 01f08de..619bb02 100644
--- a/glib/tests/gdatetime.c
+++ b/glib/tests/gdatetime.c
@@ -804,7 +804,7 @@ GDateTime *__dt = g_date_time_new_local (2009, 10, 24, 0, 0, 0);\
TEST_PRINTF_TIME (13, 13, 13, "%r", "01:13:13 PM");
TEST_PRINTF ("%R", "00:00");
TEST_PRINTF_TIME (13, 13, 31, "%R", "13:13");
- TEST_PRINTF ("%s", t_str);
+ //TEST_PRINTF ("%s", t_str);
TEST_PRINTF ("%S", "00");
TEST_PRINTF ("%t", " ");
TEST_PRINTF ("%W", "42");
--
cgit v0.8.3.1

View File

@ -0,0 +1,64 @@
From b2315084cb21a1ef072a48b0238a2e614af78be3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 13 Dec 2010 18:33:15 +0000
Subject: Bug 635626 GDBus message idle can execute while flushes are pending
https://bugzilla.gnome.org/show_bug.cgi?id=635626
Signed-off-by: David Zeuthen <davidz@redhat.com>
---
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index dd9d58a..228c28c 100644
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
@@ -431,6 +431,7 @@ struct GDBusWorker
gint num_writes_pending;
guint64 write_num_messages_written;
GList *write_pending_flushes;
+ gboolean flush_pending;
};
/* ---------------------------------------------------------------------------------------------------- */
@@ -1158,6 +1159,12 @@ ostream_flush_cb (GObject *source_object,
if (error != NULL)
g_error_free (error);
+ /* Make sure we tell folks that we don't have additional
+ flushes pending */
+ g_mutex_lock (data->worker->write_lock);
+ data->worker->flush_pending = FALSE;
+ g_mutex_unlock (data->worker->write_lock);
+
/* OK, cool, finally kick off the next write */
maybe_write_next_message (data->worker);
@@ -1210,6 +1217,10 @@ message_written (GDBusWorker *worker,
worker->write_pending_flushes = g_list_delete_link (worker->write_pending_flushes, l);
}
}
+ if (flushers != NULL)
+ {
+ worker->flush_pending = TRUE;
+ }
g_mutex_unlock (worker->write_lock);
if (flushers != NULL)
@@ -1344,7 +1355,7 @@ static gboolean
write_message_in_idle_cb (gpointer user_data)
{
GDBusWorker *worker = user_data;
- if (worker->num_writes_pending == 0)
+ if (worker->num_writes_pending == 0 && !worker->flush_pending)
maybe_write_next_message (worker);
return FALSE;
}
@@ -1427,6 +1438,7 @@ _g_dbus_worker_new (GIOStream *stream,
worker->stream = g_object_ref (stream);
worker->capabilities = capabilities;
worker->cancellable = g_cancellable_new ();
+ worker->flush_pending = FALSE;
worker->frozen = initially_frozen;
worker->received_messages_while_frozen = g_queue_new ();
--
cgit v0.8.3.1

View File

@ -0,0 +1,25 @@
From 900a4c853f8dbf0887c66155ba489ff4570e5948 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 01 Dec 2010 00:19:12 +0000
Subject: Bug 636100 - Can't read GSettings:backend property
The PROP_BACKEND case was missing from the switch statement in
g_settings_get_property().
---
diff --git a/gio/gsettings.c b/gio/gsettings.c
index 94d1f3a..7f775a0 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -417,6 +417,10 @@ g_settings_get_property (GObject *object,
g_value_set_string (value, settings->priv->schema_name);
break;
+ case PROP_BACKEND:
+ g_value_set_object (value, settings->priv->backend);
+ break;
+
case PROP_PATH:
g_value_set_string (value, settings->priv->path);
break;
--
cgit v0.8.3.1

View File

@ -0,0 +1,33 @@
From 393834ac6f32633a31e52441b051dc7d3969a530 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Thu, 04 Nov 2010 19:23:22 +0000
Subject: gsettings.m4: Fix rules to work when there are no schemas
If there are no schemas, don't try to install "" at install time.
(In particular, automake conditionals don't work properly with
@-expanded rules, so if you conditionally build a schema, you'll
still unconditionally get the install rule.)
https://bugzilla.gnome.org/show_bug.cgi?id=633381
---
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4
index 4e4352f..f0ed838 100644
--- a/m4macros/gsettings.m4
+++ b/m4macros/gsettings.m4
@@ -47,9 +47,11 @@ install-data-am: install-gsettings-schemas
install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
@$(NORMAL_INSTALL)
- test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
- $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
- test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+ if test -n "$^"; then \
+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+ fi
uninstall-gsettings-schemas:
@$(NORMAL_UNINSTALL)
--
cgit v0.8.3.1

View File

@ -0,0 +1,68 @@
From 62476cd0f7ca7d3becf81243fb7ac1b97cf7db51 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Mon, 13 Dec 2010 18:09:38 +0000
Subject: Bug 632544 Cannot send a locked message with PRESERVE_SERIAL flag
https://bugzilla.gnome.org/show_bug.cgi?id=632544
Signed-off-by: David Zeuthen <davidz@redhat.com>
---
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index da2b9f9..cf12f41 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -1449,7 +1449,8 @@ g_dbus_connection_send_message_unlocked (GDBusConnection *connection,
if (out_serial != NULL)
*out_serial = serial_to_use;
- g_dbus_message_set_serial (message, serial_to_use);
+ if (!(flags & G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL))
+ g_dbus_message_set_serial (message, serial_to_use);
g_dbus_message_lock (message);
_g_dbus_worker_send_message (connection->worker,
diff --git a/gio/tests/gdbus-connection.c b/gio/tests/gdbus-connection.c
index 866e27c..5c2939e 100644
--- a/gio/tests/gdbus-connection.c
+++ b/gio/tests/gdbus-connection.c
@@ -880,6 +880,18 @@ test_connection_filter (void)
m2 = g_dbus_message_copy (m, &error);
g_assert_no_error (error);
+ g_dbus_message_set_serial (m2, data.serial);
+ /* lock the message to test PRESERVE_SERIAL flag. */
+ g_dbus_message_lock (m2);
+ g_dbus_connection_send_message (c, m2, G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL, &data.serial, &error);
+ g_object_unref (m2);
+ g_assert_no_error (error);
+
+ while (data.num_handled == 2)
+ g_thread_yield ();
+
+ m2 = g_dbus_message_copy (m, &error);
+ g_assert_no_error (error);
r = g_dbus_connection_send_message_with_reply_sync (c,
m2,
G_DBUS_SEND_MESSAGE_FLAGS_NONE,
@@ -891,7 +903,7 @@ test_connection_filter (void)
g_assert_no_error (error);
g_assert (r != NULL);
g_object_unref (r);
- g_assert_cmpint (data.num_handled, ==, 3);
+ g_assert_cmpint (data.num_handled, ==, 4);
g_dbus_connection_remove_filter (c, filter_id);
@@ -908,8 +920,8 @@ test_connection_filter (void)
g_assert_no_error (error);
g_assert (r != NULL);
g_object_unref (r);
- g_assert_cmpint (data.num_handled, ==, 3);
- g_assert_cmpint (data.num_outgoing, ==, 3);
+ g_assert_cmpint (data.num_handled, ==, 4);
+ g_assert_cmpint (data.num_outgoing, ==, 4);
/* this is safe; testserver will exit once the bus goes away */
g_assert (g_spawn_command_line_async (SRCDIR "/gdbus-testserver.py", NULL));
--
cgit v0.8.3.1

View File

@ -0,0 +1,65 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.53 2008/08/03 22:36:31 eva Exp $
inherit autotools libtool flag-o-matic eutils portability
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/${P}.tar.gz
mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2"
LICENSE="LGPL-2.1"
SLOT="1"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE="hardened"
DEPEND=""
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-automake.patch
epatch "${FILESDIR}"/${P}-m4.patch
epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679
# Allow glib to build with gcc-3.4.x #47047
epatch "${FILESDIR}"/${P}-gcc34-fix.patch
# Fix for -Wl,--as-needed (bug #133818)
epatch "${DISTDIR}"/glib-1.2.10-r1-as-needed.patch.bz2
use ppc64 && use hardened && replace-flags -O[2-3] -O1
append-ldflags $(dlopen_lib)
rm -f acinclude.m4 #168198
eautoreconf
elibtoolize
}
src_compile() {
# Bug 48839: pam fails to build on ia64
# The problem is that it attempts to link a shared object against
# libglib.a; this library needs to be built with -fPIC. Since
# this package doesn't contain any significant binaries, build the
# whole thing with -fPIC (23 Apr 2004 agriffis)
append-flags -fPIC
econf \
--with-threads=posix \
--enable-debug=yes \
|| die
emake || die
}
src_install() {
make install DESTDIR="${D}" || die
dodoc AUTHORS ChangeLog README* INSTALL NEWS
dohtml -r docs
cd "${D}"/usr/$(get_libdir) || die
chmod 755 libgmodule-1.2.so.*
}

View File

@ -0,0 +1,185 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.26.1-r1.ebuild,v 1.9 2011/03/22 18:51:01 ranger Exp $
EAPI="3"
inherit autotools gnome.org libtool eutils flag-o-matic pax-utils
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
LICENSE="LGPL-2"
SLOT="2"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="debug doc fam +introspection selinux +static-libs test xattr"
RDEPEND="virtual/libiconv
sys-libs/zlib
xattr? ( sys-apps/attr )
fam? ( virtual/fam )"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.16
>=sys-devel/gettext-0.11
>=dev-util/gtk-doc-am-1.13
doc? (
>=dev-libs/libxslt-1.0
>=dev-util/gtk-doc-1.13
~app-text/docbook-xml-dtd-4.1.2 )
test? ( >=sys-apps/dbus-1.2.14 )"
PDEPEND="introspection? ( dev-libs/gobject-introspection )"
# eautoreconf needs gtk-doc-am
# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
src_prepare() {
if use ia64 ; then
# Only apply for < 4.1
local major=$(gcc-major-version)
local minor=$(gcc-minor-version)
if (( major < 4 || ( major == 4 && minor == 0 ) )); then
epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
fi
fi
# gsettings.m4: Fix rules to work when there are no schemas, bug #350020
epatch "${FILESDIR}/${PN}-2.26.1-gsettings-rules.patch"
# Fix compilation on several arches, bug #351387
epatch "${FILESDIR}/${PN}-2.26.1-gatomic-header.patch"
# Remove a test that seems to fail depending on time of day
epatch "${FILESDIR}/${PN}-2.26.1-gdatetime-test.patch"
# Deprecation check in tests/testglib.c, upstream bug #635093
epatch "${FILESDIR}/${P}-deprecation-tests.patch"
# Can't read GSettings:backend property, upstream bug #636100
epatch "${FILESDIR}/${P}-gsettings-read.patch"
# Cannot send a locked message with PRESERVE_SERIAL flag, upstream bug #632544
epatch "${FILESDIR}/${P}-locked-message.patch"
# GDBus message idle can execute while flushes are pending, upstream bug #635626
epatch "${FILESDIR}/${P}-gdbus-flushes.patch"
# Don't fail gio tests when ran without userpriv, upstream bug 552912
# This is only a temporary workaround, remove as soon as possible
epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
# Fix gmodule issues on fbsd; bug #184301
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
# Don't check for python, hence removing the build-time python dep.
# We remove the gdb python scripts in src_install due to bug 291328
epatch "${FILESDIR}/${PN}-2.25-punt-python-check.patch"
# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
# skip tests that require writing to /root/.dbus, upstream bug ???
epatch "${FILESDIR}/${PN}-2.25-skip-tests-with-dbus-keyring.patch"
# Do not try to remove files on live filesystem, upstream bug #619274
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
# Disable failing tests, upstream bug #???
epatch "${FILESDIR}/${PN}-2.26.0-disable-locale-sensitive-test.patch"
epatch "${FILESDIR}/${PN}-2.26.0-disable-volumemonitor-broken-test.patch"
if ! use test; then
# don't waste time building tests
sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
|| die "sed failed"
fi
# Needed for the punt-python-check patch.
# Also needed to prevent croscompile failures, see bug #267603
eautoreconf
[[ ${CHOST} == *-freebsd* ]] && elibtoolize
epunt_cxx
}
src_configure() {
local myconf
# Building with --disable-debug highly unrecommended. It will build glib in
# an unusable form as it disables some commonly used API. Please do not
# convert this to the use_enable form, as it results in a broken build.
# -- compnerd (3/27/06)
# disable-visibility needed for reference debug, bug #274647
use debug && myconf="--enable-debug --disable-visibility"
# Always use internal libpcre, bug #254659
econf ${myconf} \
$(use_enable xattr) \
$(use_enable doc man) \
$(use_enable doc gtk-doc) \
$(use_enable fam) \
$(use_enable selinux) \
$(use_enable static-libs static) \
--enable-regex \
--with-pcre=internal \
--with-threads=posix \
--disable-dtrace \
--disable-systemtap
}
src_install() {
local f
emake DESTDIR="${D}" install || die "Installation failed"
# Do not install charset.alias even if generated, leave it to libiconv
rm -f "${ED}/usr/lib/charset.alias"
# Don't install gdb python macros, bug 291328
rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
insinto /usr/share/bash-completion
for f in gdbus gsettings; do
newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
done
rm -rf "${ED}/etc"
}
src_test() {
unset DBUS_SESSION_BUS_ADDRESS
export XDG_CONFIG_DIRS=/etc/xdg
export XDG_DATA_DIRS=/usr/local/share:/usr/share
export XDG_DATA_HOME="${T}"
unset GSETTINGS_BACKEND # bug 352451
# Hardened: gdb needs this, bug #338891
if host-is-pax ; then
pax-mark -mr "${S}"/tests/.libs/assert-msg-test \
|| die "Hardened adjustment failed"
fi
emake check || die "tests failed"
}
pkg_preinst() {
# Only give the introspection message if:
# * The user has it enabled
# * Has glib already installed
# * Previous version was different from new version
if use introspection && has_version "${CATEGORY}/${PN}"; then
if ! has_version "=${CATEGORY}/${PF}"; then
ewarn "You must rebuild gobject-introspection so that the installed"
ewarn "typelibs and girs are regenerated for the new APIs in glib"
fi
fi
}
pkg_postinst() {
# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
if has_version dev-libs/dbus-glib; then
ewarn "If you experience a breakage after updating dev-libs/glib try"
ewarn "rebuilding dev-libs/dbus-glib"
fi
}

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>gnome</herd>
<use>
<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
for introspection</flag>
</use>
</pkgmetadata>

View File

@ -0,0 +1,100 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.2 2011/05/04 16:02:10 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
# mgorny@gentoo.org
# @BLURB: helper functions to install systemd units
# @DESCRIPTION:
# This eclass provides a set of functions to install unit files for
# sys-apps/systemd within ebuilds.
# @EXAMPLE:
#
# @CODE
# inherit autotools-utils systemd
#
# src_configure() {
# local myeconfargs=(
# --enable-foo
# --disable-bar
# )
#
# systemd_to_myeconfargs
# autotools-utils_src_configure
# }
# @CODE
case ${EAPI:-0} in
0|1|2|3|4) ;;
*) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established."
esac
# @FUNCTION: systemd_get_unitdir
# @DESCRIPTION:
# Output the path for the systemd unit directory (not including ${D}).
# This function always succeeds, even if systemd is not installed.
systemd_get_unitdir() {
debug-print-function ${FUNCNAME} "${@}"
echo -n /lib/systemd/system
}
# @FUNCTION: systemd_dounit
# @USAGE: unit1 [...]
# @DESCRIPTION:
# Install systemd unit(s). Uses doins, thus it is fatal in EAPI 4
# and non-fatal in earlier EAPIs.
systemd_dounit() {
debug-print-function ${FUNCNAME} "${@}"
(
insinto "$(systemd_get_unitdir)"
doins "${@}"
)
}
# @FUNCTION: systemd_enable_service
# @USAGE: target service
# @DESCRIPTION:
# Enable service in desired target, e.g. install a symlink for it.
# Uses dosym, thus it is fatal in EAPI 4 and non-fatal in earlier
# EAPIs.
systemd_enable_service() {
debug-print-function ${FUNCNAME} "${@}"
[[ ${#} -eq 2 ]] || die "Synopsis: systemd_enable_service target service"
local target=${1}
local service=${2}
local ud=$(systemd_get_unitdir)
dodir "${ud}"/"${target}".wants && \
dosym ../"${service}" "${ud}"/"${target}".wants
}
# @FUNCTION: systemd_with_unitdir
# @DESCRIPTION:
# Output '--with-systemdsystemunitdir' as expected by systemd-aware configure
# scripts. This function always succeeds. Its output may be quoted in order
# to preserve whitespace in paths. systemd_to_myeconfargs() is preferred over
# this function.
systemd_with_unitdir() {
debug-print-function ${FUNCNAME} "${@}"
echo -n --with-systemdsystemunitdir="$(systemd_get_unitdir)"
}
# @FUNCTION: systemd_to_myeconfargs
# @DESCRIPTION:
# Add '--with-systemdsystemunitdir' as expected by systemd-aware configure
# scripts to the myeconfargs variable used by autotools-utils eclass. Handles
# quoting automatically.
systemd_to_myeconfargs() {
debug-print-function ${FUNCNAME} "${@}"
myeconfargs=(
"${myeconfargs[@]}"
--with-systemdsystemunitdir="$(systemd_get_unitdir)"
)
}

View File

@ -0,0 +1,434 @@
# ChangeLog for sys-auth/consolekit
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.104 2011/05/15 07:14:20 ssuominen Exp $
*consolekit-0.4.5 (15 May 2011)
15 May 2011; Samuli Suominen <ssuominen@gentoo.org> +consolekit-0.4.5.ebuild:
Version bump.
*consolekit-0.4.4-r1 (05 May 2011)
05 May 2011; Samuli Suominen <ssuominen@gentoo.org>
+consolekit-0.4.4-r1.ebuild:
Use systemd.eclass to get path for unit files wrt #366111 by Michal Górny.
23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> consolekit-0.4.4.ebuild:
ppc64 stable wrt #360769
23 Apr 2011; Raúl Porcel <armin76@gentoo.org> consolekit-0.4.4.ebuild:
alpha/ia64/sh/sparc stable wrt #360769
15 Apr 2011; Christian Faulhammer <fauli@gentoo.org>
consolekit-0.4.4.ebuild:
stable x86, bug 360769
12 Apr 2011; Jeroen Roovers <jer@gentoo.org> consolekit-0.4.4.ebuild:
Stable for HPPA (bug #360769).
10 Apr 2011; Markus Meier <maekke@gentoo.org> consolekit-0.4.4.ebuild:
arm stable, bug #360769
27 Mar 2011; Christoph Mende <angelos@gentoo.org> consolekit-0.4.4.ebuild:
Stable on amd64 wrt bug #360769
27 Mar 2011; Brent Baude <ranger@gentoo.org> consolekit-0.4.4.ebuild:
Marking consolekit-0.4.4 ppc for bug 360769
*consolekit-0.4.4 (26 Feb 2011)
26 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> +consolekit-0.4.4.ebuild:
Version bump.
13 Jan 2011; Jeroen Roovers <jer@gentoo.org> consolekit-0.4.3.ebuild:
Stable for HPPA (bug #349052).
11 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
consolekit-0.4.3.ebuild:
ppc stable wrt #349052
08 Jan 2011; Raúl Porcel <armin76@gentoo.org> consolekit-0.4.3.ebuild:
alpha/ia64/sh/sparc stable wrt #349052
27 Dec 2010; Markus Meier <maekke@gentoo.org> consolekit-0.4.3.ebuild:
arm stable, bug #349052
22 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> consolekit-0.4.3.ebuild:
amd64/x86 stable wrt #349052
19 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> consolekit-0.4.3.ebuild:
ppc64 stable wrt #349052
27 Nov 2010; Raúl Porcel <armin76@gentoo.org> consolekit-0.4.2-r4.ebuild:
alpha/ia64/sh/sparc stable wrt #343097
*consolekit-0.4.3 (25 Nov 2010)
25 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> +consolekit-0.4.3.ebuild:
Version bump.
04 Nov 2010; Markus Meier <maekke@gentoo.org> consolekit-0.4.2-r4.ebuild:
arm stable, bug #343097
01 Nov 2010; Jeroen Roovers <jer@gentoo.org> consolekit-0.4.2-r4.ebuild:
Stable for HPPA PPC (bug #343097).
01 Nov 2010; Christian Faulhammer <fauli@gentoo.org>
consolekit-0.4.2-r4.ebuild:
stable x86, bug 343097
30 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
consolekit-0.4.2-r4.ebuild:
ppc64 stable wrt #343097
29 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
consolekit-0.4.2-r4.ebuild:
Stable on amd64 wrt bug #343097
28 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
consolekit-0.4.2-r4.ebuild:
Block <pambase-20101024 because of missing pam_loginuid.so.
*consolekit-0.4.2-r4 (28 Oct 2010)
28 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+consolekit-0.4.2-r4.ebuild, +files/90-consolekit-3:
Change variable "STARTUP" to "command" wrt #343033 by Matthew Turnbull.
27 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
consolekit-0.4.2-r3.ebuild:
Check CONFIG_AUDITSYSCALL for /proc/<pid>/sessionid wrt #342291.
*consolekit-0.4.2-r3 (21 Oct 2010)
21 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+consolekit-0.4.2-r3.ebuild, +files/90-consolekit-2:
Update /etc/X11/xinit/xinitrc.d/90-consolekit from Debian. Remove
-revert.patch and block broken sys-apps/shadow instead wrt #336634.
*consolekit-0.4.2-r2 (21 Oct 2010)
21 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+consolekit-0.4.2-r2.ebuild,
+files/consolekit-0.4.2-check-for-VT_WAITEVENT-ioctl-during-runtime.patch:
Check for VT_WAITEVENT ioctl during runtime.
*consolekit-0.4.2-r1 (09 Sep 2010)
09 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+consolekit-0.4.2-r1.ebuild, +files/consolekit-0.4.2-revert.patch:
Revert upstream "Only set sessions to be is-local=true if set by a trusted
party" wrt #336634.
*consolekit-0.4.2 (07 Sep 2010)
07 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+consolekit-0.4.2.ebuild:
Version bump.
*consolekit-0.4.1-r1 (21 Aug 2010)
21 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+consolekit-0.4.1-r1.ebuild, +files/consolekit-0.4.1-nodaemon.patch,
+files/consolekit-0.4.1-reorder-initialization.patch:
Don't take bus name until ready wrt #333349. Don't daemonize when
activated.
18 Aug 2010; Markus Meier <maekke@gentoo.org> consolekit-0.4.1.ebuild:
arm stable, bug #314899
14 Aug 2010; Raúl Porcel <armin76@gentoo.org> consolekit-0.4.1.ebuild:
ia64/sh/sparc stable
09 Aug 2010; Joseph Jezak <josejx@gentoo.org> consolekit-0.4.1.ebuild:
Marked ppc/ppc64 stable.
25 Jul 2010; Tobias Klausmann <klausman@gentoo.org>
consolekit-0.4.1.ebuild:
Stable on alpha, bug #329621
20 Jul 2010; Jeroen Roovers <jer@gentoo.org> consolekit-0.4.1.ebuild:
Stable for HPPA (bug #314899).
04 Jun 2010; Markus Meier <maekke@gentoo.org> consolekit-0.4.1.ebuild:
x86 stable, bug #314899
09 May 2010; Raúl Porcel <armin76@gentoo.org> consolekit-0.3.0-r2.ebuild:
sh stable
03 May 2010; Olivier Crête <tester@gentoo.org> consolekit-0.4.1.ebuild:
amd64 stable, bug #314899
25 Apr 2010; Raúl Porcel <armin76@gentoo.org> consolekit-0.3.0-r2.ebuild,
consolekit-0.4.1.ebuild:
Add ~sh
13 Apr 2010; Alexis Ballier <aballier@gentoo.org> consolekit-0.4.1.ebuild:
keyword ~x86-fbsd
30 Mar 2010; Jonathan Callen <abcd@gentoo.org> consolekit-0.3.0-r2.ebuild,
consolekit-0.4.1.ebuild:
Bump to EAPI=3, add prefix keywords
28 Feb 2010; Raúl Porcel <armin76@gentoo.org> consolekit-0.4.1.ebuild:
Add ~alpha/~arm/~ia64/~sparc
17 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org>
consolekit-0.4.1.ebuild:
Raise dbus-glib dependency, bug #298924.
16 Feb 2010; Joseph Jezak <josejx@gentoo.org> consolekit-0.4.1.ebuild:
Marked ~ppc/~ppc64 for bug #296548.
06 Jan 2010; Jeroen Roovers <jer@gentoo.org> consolekit-0.4.1.ebuild:
Marked ~hppa (bug #296548).
*consolekit-0.4.1 (29 Oct 2009)
29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> files/90-consolekit,
-consolekit-0.2.3.ebuild, -files/consolekit-0.2.3-freebsd.patch,
-consolekit-0.2.10.ebuild, -consolekit-0.2.10-r1.ebuild,
-consolekit-0.3.0.ebuild, +files/consolekit-0.4.0-multilib.patch,
+files/consolekit-0.4.0-polkit-automagic.patch, +consolekit-0.4.1.ebuild,
+files/consolekit-0.4.1-shutdown-reboot-without-policies.patch:
New version for GNOME 2.28. Clean up old revision. Fix xinitrc script.
28 Oct 2009; Raúl Porcel <armin76@gentoo.org> consolekit-0.3.0-r2.ebuild:
ia64/m68k/s390/sh/sparc stable wrt #278181
03 Oct 2009; Markus Meier <maekke@gentoo.org> consolekit-0.3.0-r2.ebuild:
arm stable, bug #278181
29 Sep 2009; Tobias Klausmann <klausman@gentoo.org>
consolekit-0.3.0-r2.ebuild:
Stable on alpha, bug #278181
27 Sep 2009; nixnut <nixnut@gentoo.org> consolekit-0.3.0-r2.ebuild:
ppc stable #278181
22 Sep 2009; Jeroen Roovers <jer@gentoo.org> consolekit-0.3.0-r2.ebuild:
Stable for HPPA (bug #278181).
19 Sep 2009; Romain Perier <mrpouet@gentoo.org>
consolekit-0.3.0-r2.ebuild:
Stable for amd64 per bug #278181.
16 Sep 2009; Christian Faulhammer <fauli@gentoo.org>
consolekit-0.3.0-r2.ebuild:
stable x86, bug 278181
14 Sep 2009; Tom Gall <tgall@gentoo.org> consolekit-0.3.0-r2:
stable on ppc64, bug #278181
*consolekit-0.3.0-r2 (12 Sep 2009)
12 Sep 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
files/consolekit-0.1.rc, -consolekit-0.3.0-r1.ebuild,
+consolekit-0.3.0-r2.ebuild:
Use the (correct) pid file to control ConsoleKit start/stop. Also, do a
blank -r2 bump so users get the new init script.
12 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org>
consolekit-0.3.0-r1.ebuild:
Make consolekit init script executable by default, closes: #260842.
09 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
consolekit-0.3.0-r1.ebuild,
+files/consolekit-0.3.0-skip_xmlto_validation.patch:
Skip xmlto validation because 0.0.22 adds --noent to xmllint options and
documentation doesn't validate anymore wrt #271678, thanks to Darren Dale
for reporting.
*consolekit-0.3.0-r1 (27 Apr 2009)
27 Apr 2009; Daniel Gryniewicz <dang@gentoo.org>
+files/consolekit-0.3.0-allow-setidle.patch, +consolekit-0.3.0-r1.ebuild:
Bump to consolekit-0.3.0-r1
- Add SetIdleHint to the dbus policy to handle the new default-deny on
dbus
17 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
consolekit-0.2.10.ebuild, consolekit-0.2.10-r1.ebuild,
consolekit-0.3.0.ebuild:
Bump dev-libs/glib dependency, since GRegex (added in glib-2.14) is used
by consolekit. Choose 2.16 so we don't have to bump it for a while. Bug
262853.
06 Mar 2009; Jeroen Roovers <jer@gentoo.org> consolekit-0.2.10.ebuild:
Stable for HPPA (bug #242270).
25 Feb 2009; Joseph Jezak <josejx@gentoo.org> consolekit-0.2.10.ebuild:
Marked ppc stable for bug #242270.
*consolekit-0.3.0 (18 Feb 2009)
18 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+files/consolekit-0.3.0-shutdown.patch, metadata.xml,
+consolekit-0.3.0.ebuild:
Bump to 0.3.
17 Feb 2009; Raúl Porcel <armin76@gentoo.org> consolekit-0.2.10.ebuild:
arm/ia64/s390/sh/sparc stable wrt #242270
*consolekit-0.2.10-r1 (15 Feb 2009)
15 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+files/consolekit-0.2.10-directory-leak.patch, +files/90-consolekit,
+files/consolekit-0.2.10-cleanup_console_tags.patch,
+files/consolekit-0.2.10-pam-add-nox11.patch,
+files/consolekit-0.2.10-polkit-automagic.patch,
+files/pam-foreground-compat.ck, -consolekit-0.2.1.ebuild,
+consolekit-0.2.10-r1.ebuild:
Bump to 0.2.10-r1.
* Add compatibility script for at_console dependant programs, bug #257761.
* Remove unneeded rm, bug #259096.
* Add a Xsession script for people not using gdm, bug #257763.
* Plug a leak, bug #258685.
* Add keepdirs and fix localstatedir, bug #257164.
15 Feb 2009; Markus Meier <maekke@gentoo.org> consolekit-0.2.10.ebuild:
x86 stable, bug #242270
12 Feb 2009; Brent Baude <ranger@gentoo.org> consolekit-0.2.10.ebuild:
stable ppc64, bug 242270
12 Feb 2009; Jeremy Olexa <darkside@gentoo.org> consolekit-0.2.10.ebuild:
amd64 stable, bug 242270
09 Feb 2009; Tobias Klausmann <klausman@gentoo.org>
consolekit-0.2.10.ebuild:
Stable on alpha, bug #242270
13 Jan 2009; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
gentopia is becoming freedesktop
09 Dec 2008; Alexis Ballier <aballier@gentoo.org>
consolekit-0.2.10.ebuild:
drop bsd patch that doesnt apply anymore, bug #231910
*consolekit-0.2.10 (21 Jun 2008)
21 Jun 2008; Ben de Groot <yngwin@gentoo.org> +consolekit-0.2.10.ebuild:
Version bump. Fixes compilation with glibc-2.8, bug 225405.
06 Dec 2007; Steve Dibb <beandog@gentoo.org> consolekit-0.2.3.ebuild:
amd64 stable, bug 201103
06 Dec 2007; Raúl Porcel <armin76@gentoo.org> consolekit-0.2.3.ebuild:
alpha/ia64/sparc stable wrt #201103
05 Dec 2007; Jeroen Roovers <jer@gentoo.org> consolekit-0.2.3.ebuild:
Stable for HPPA (bug #201103).
04 Dec 2007; Markus Rothe <corsair@gentoo.org> consolekit-0.2.3.ebuild:
Stable on ppc64; bug #201103
04 Dec 2007; nixnut <nixnut@gentoo.org> consolekit-0.2.3.ebuild:
Stable on ppc wrt bug 201103
04 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
consolekit-0.2.3.ebuild:
stable x86, bug 201103
19 Nov 2007; Joshua Kinard <kumba@gentoo.org> consolekit-0.2.1.ebuild:
Stable on mips.
31 Oct 2007; Roy Marples <uberlord@gentoo.org>
+files/consolekit-0.2.3-freebsd.patch, consolekit-0.2.3.ebuild:
Add a workaround for a FreeBSD kernel bug so consolekit stops when in use.
18 Oct 2007; Roy Marples <uberlord@gentoo.org> consolekit-0.2.3.ebuild:
Keyworded ~x86-fbsd
15 Oct 2007; Doug Goldstein <cardoe@gentoo.org> consolekit-0.2.1.ebuild,
consolekit-0.2.3.ebuild:
if we're using glibc, we can't use version 2.4 because of missing defines
bug #195537
22 Sep 2007; Tom Gall <tgall@gentoo.org> consolekit-0.2.1.ebuild:
stable on ppc64
*consolekit-0.2.3 (19 Sep 2007)
19 Sep 2007; Doug Goldstein <cardoe@gentoo.org> +consolekit-0.2.3.ebuild:
add latest ConsoleKit from Gentopia
06 Sep 2007; Doug Goldstein <cardoe@gentoo.org>
-files/consolekit-0.2.0-gdk-to-x11.patch,
-files/consolekit-0.2.0-pam-lib-fix.patch, -consolekit-0.2.0-r1.ebuild,
consolekit-0.2.1.ebuild:
remove old version. got Jon to make a website for it.
28 Aug 2007; Jeroen Roovers <jer@gentoo.org> consolekit-0.2.1.ebuild:
Stable for HPPA (bug #185823).
11 Aug 2007; Andrej Kacian <ticho@gentoo.org> consolekit-0.2.1.ebuild:
Stable on x86, bug #185823.
10 Aug 2007; Christoph Mende <angelos@gentoo.org> consolekit-0.2.1.ebuild:
Stable on amd64 wrt bug #185823
08 Aug 2007; Raúl Porcel <armin76@gentoo.org> consolekit-0.2.1.ebuild:
alpha/ia64 stable wrt #185823
07 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
consolekit-0.2.1.ebuild:
Stable on ppc wrt bug #185823.
07 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
consolekit-0.2.1.ebuild:
Stable on sparc wrt #185823
06 Aug 2007; Joshua Kinard <kumba@gentoo.org> consolekit-0.2.1.ebuild:
Marked unstable on mips.
19 May 2007; Raúl Porcel <armin76@gentoo.org> consolekit-0.2.1.ebuild:
Add ~alpha wrt #176517
11 Apr 2007; Doug Goldstein <cardoe@gentoo.org> consolekit-0.2.1.ebuild:
oops. left in some patches
11 Apr 2007; Doug Goldstein <cardoe@gentoo.org> consolekit-0.2.1.ebuild:
multilib fix for pam module
*consolekit-0.2.1 (11 Apr 2007)
11 Apr 2007; Doug Goldstein <cardoe@gentoo.org> +consolekit-0.2.1.ebuild:
rev bump
10 Apr 2007; Doug Goldstein <cardoe@gentoo.org> -consolekit-0.2.0.ebuild,
consolekit-0.2.0-r1.ebuild:
sys-libs/pam -> virtual/pam for FreeBSD.
02 Apr 2007; Raúl Porcel <armin76@gentoo.org> consolekit-0.2.0-r1.ebuild:
Add ~ia64 wrt bug 172097
02 Apr 2007; Jeroen Roovers <jer@gentoo.org> consolekit-0.2.0-r1.ebuild:
Marked ~hppa (bug #172097).
*consolekit-0.2.0-r1 (29 Mar 2007)
29 Mar 2007; Doug Goldstein <cardoe@gentoo.org>
+files/consolekit-0.2.0-gdk-to-x11.patch,
+files/consolekit-0.2.0-pam-lib-fix.patch, +consolekit-0.2.0-r1.ebuild:
Change GTK+ depend to X11. Fix /lib/ issues.
26 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org>
consolekit-0.2.0.ebuild:
Keyworded ~sparc wrt #172097
25 Mar 2007; Markus Rothe <corsair@gentoo.org> consolekit-0.2.0.ebuild:
Added ~ppc64; bug #172097
24 Mar 2007; Steev Klimaszewski <steev@gentoo.org>
consolekit-0.2.0.ebuild:
Add ~ppc (builds and works on my Efika) and add MAKEOPTS="$MAKEOPTS -j1" as it
doesn't appear to be parallel make safe.
*consolekit-0.2.0 (24 Mar 2007)
24 Mar 2007; Steev Klimaszewski <steev@gentoo.org>
+files/consolekit-0.1.rc, +metadata.xml, +consolekit-0.2.0.ebuild:
New package, needed for GDM, but will hopefully soon replace pam_console

View File

@ -0,0 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
AUX 90-consolekit-3 1027 RMD160 79246172e49653eeb6e73c0e26ea33d90d70eb2c SHA1 8195f7c2fc6c25ea940bcc516f705ae363423363 SHA256 91e0900995f7db536220065959d236fb75ec2c77096981a142e2e948518d9761
AUX consolekit-0.1.rc 586 RMD160 04282efee7a8abb69ddd787ea4b9f180e6954d86 SHA1 4ca9cb3f4d33d08c2dadcd7a9884ed351990376f SHA256 af61c7d61bfda4d7c30f3f4142a9e8dc26bfdd4e14c57d7ff8bfef5febdcee1f
AUX consolekit-0.2.10-cleanup_console_tags.patch 1728 RMD160 d1fffa6524eec4f3ad8c1412c9ad9bfeae179a1c SHA1 c07d848591fafbe79709a3313bfaffd3e601f309 SHA256 884c8cd1186b26746ec6e4cfdb13771e62e54c892979501e231ba6a6611b5449
AUX consolekit-0.4.0-multilib.patch 4378 RMD160 ef80a5e681e7d036be4de1dff40a550c3b422087 SHA1 221d6b04e35fca3bc42ec97f9bccb7c3792a0788 SHA256 1b00d28b62c0c71648978a48e65bd1bac08d230945c933e3f7cfd74cf59f337d
AUX consolekit-0.4.0-polkit-automagic.patch 841 RMD160 59f6f8d13a6f030107908b5926e2f49439ae2f6e SHA1 6c1442f4cc860bd5e828997a6fb44cc891028e1c SHA256 965ea7e3a2868ae8fa3d0ee6c48a5b06149c08d273e8f4a8e6afa9eec0a26357
AUX consolekit-0.4.1-shutdown-reboot-without-policies.patch 1166 RMD160 946969cbc2c86bf81f151cbefae022ea95971a57 SHA1 1db7f74e84146c738d5de4b5f835376a1a394280 SHA256 78e7e3b71c34c9a0b2eef58c55c8ac6e34fd4ee0ddb03d20c9adf138d2dafbc9
AUX pam-foreground-compat.ck 389 RMD160 b72a66d5fde612a825fb60f0f1402a0665cc6d81 SHA1 25c3e54e326606e6c476e0dbb9637e2e551a6ccc SHA256 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9
DIST ConsoleKit-0.4.4.tar.bz2 424699 RMD160 e9a37d8c71a9c8d09646be5d105ed9ecf45e9b5a SHA1 163ee0e6308b94dd4712cc64d5a34e8c9007d5d4 SHA256 f0c00969fb6fe7d628071f0f43ac0d411982a5e798d7dc31747caa772c9716ae
DIST ConsoleKit-0.4.5.tar.bz2 425423 RMD160 2eba158e321778a4c17bf765d0106d214b93fe53 SHA1 6f090c1ce0d459dd6904854532554323755bdeca SHA256 43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b223686b9c38
EBUILD consolekit-0.4.4.ebuild 2727 RMD160 8aed4bf5e32598fc2c21cd9b7d953b7d0d31abe0 SHA1 afdd07f633f77993e3578351dc28b8fa426d4459 SHA256 e8f6f403fe3c78150e709f8239a4bb164356321ddf79aade18c9f26057c7d44e
EBUILD consolekit-0.4.5.ebuild 2755 RMD160 8e380bf7c2dd8f1c66fb107c6e6bec55926ba98e SHA1 1992a34943f79702bd87cd6c6e55e5258cab7577 SHA256 c029588ef5993d0eb4b3ecc4f3ac29bb68987cdf89e80bc57a0736694efbe608
MISC ChangeLog 15177 RMD160 f732d71ae31ea37c74ea312ef7ba5c4529db3a24 SHA1 eb656a758331e8f9eacb175d364d9acb4856c7ee SHA256 912548a7d8f21eabe219336bf94c9c8026ec901fb4cf21206ac8b9deb07d6586
MISC metadata.xml 313 RMD160 d6625d48d47f8417bccec2c9ccf0524b5bbd58e5 SHA1 7934855c56b41e669b8070577a7838e3037dd1a1 SHA256 a59fecba81d8bb5f8cc5d32815107f8087d3c1274c72dc42061bc0a720b0504b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
iF4EAREIAAYFAk3PfS4ACgkQXkR9YqOcLPGd8AEApsDd1mx+Mqd4L/7pwZBiukKs
8tM7GHKI66LFyYWHguABAJdZ283DlKnzY98wxXlso0YYITq8DjUCRODP7W+TjL59
=MyvB
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,93 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.4.ebuild,v 1.8 2011/04/23 16:58:35 ssuominen Exp $
EAPI=3
inherit autotools eutils linux-info multilib pam
MY_PN=ConsoleKit
MY_P=${MY_PN}-${PV}
DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
SRC_URI="http://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="debug doc kernel_linux pam policykit test"
RDEPEND=">=dev-libs/dbus-glib-0.88
>=dev-libs/glib-2.20:2
sys-libs/zlib
x11-libs/libX11
pam? ( virtual/pam )
policykit? ( >=sys-auth/polkit-0.96-r1 )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
dev-libs/libxslt
doc? ( app-text/xmlto )
test? ( app-text/docbook-xml-dtd:4.1.2 )"
S=${WORKDIR}/${MY_P}
pkg_setup() {
# This is required to get login-session-id string with pam_ck_connector.so
if use pam && use kernel_linux; then
CONFIG_CHECK="~AUDITSYSCALL"
linux-info_pkg_setup
fi
}
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-0.2.10-cleanup_console_tags.patch \
"${FILESDIR}"/${PN}-0.4.0-polkit-automagic.patch \
"${FILESDIR}"/${PN}-0.4.0-multilib.patch \
"${FILESDIR}"/${PN}-0.4.1-shutdown-reboot-without-policies.patch
eautoreconf
}
src_configure() {
econf \
XMLTO_FLAGS="--skip-validation" \
--localstatedir="${EPREFIX}"/var \
$(use_enable pam pam-module) \
$(use_enable doc docbook-docs) \
$(use_enable debug) \
$(use_enable policykit polkit) \
--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
--with-pam-module-dir=$(getpam_mod_dir)
}
src_install() {
emake \
DESTDIR="${D}" \
htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
install || die
dodoc AUTHORS ChangeLog HACKING NEWS README TODO
newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit
keepdir /usr/$(get_libdir)/ConsoleKit/run-session.d
keepdir /etc/ConsoleKit/run-session.d
keepdir /var/run/ConsoleKit
keepdir /var/log/ConsoleKit
exeinto /etc/X11/xinit/xinitrc.d
newexe "${FILESDIR}"/90-consolekit-3 90-consolekit || die
exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d
doexe "${FILESDIR}"/pam-foreground-compat.ck || die
find "${ED}" -name '*.la' -exec rm -f {} +
}
pkg_postinst() {
ewarn "You need to restart ConsoleKit to get the new features."
ewarn "This can be done with /etc/init.d/consolekit restart"
ewarn "but make sure you do this and then restart your session"
ewarn "otherwise you will get access denied for certain actions"
}

View File

@ -0,0 +1,94 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.5.ebuild,v 1.1 2011/05/15 07:14:20 ssuominen Exp $
EAPI=4
inherit autotools eutils linux-info multilib pam systemd
MY_PN=ConsoleKit
MY_P=${MY_PN}-${PV}
DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
SRC_URI="http://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="debug doc kernel_linux pam policykit test"
RDEPEND=">=dev-libs/dbus-glib-0.88
>=dev-libs/glib-2.20:2
sys-libs/zlib
x11-libs/libX11
pam? ( virtual/pam )
policykit? ( >=sys-auth/polkit-0.101-r1 )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
dev-libs/libxslt
doc? ( app-text/xmlto )
test? ( app-text/docbook-xml-dtd:4.1.2 )"
S=${WORKDIR}/${MY_P}
pkg_setup() {
# This is required to get login-session-id string with pam_ck_connector.so
if use pam && use kernel_linux; then
CONFIG_CHECK="~AUDITSYSCALL"
linux-info_pkg_setup
fi
}
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-0.2.10-cleanup_console_tags.patch \
"${FILESDIR}"/${PN}-0.4.0-polkit-automagic.patch \
"${FILESDIR}"/${PN}-0.4.0-multilib.patch \
"${FILESDIR}"/${PN}-0.4.1-shutdown-reboot-without-policies.patch
eautoreconf
}
src_configure() {
econf \
XMLTO_FLAGS="--skip-validation" \
--localstatedir="${EPREFIX}"/var \
$(use_enable pam pam-module) \
$(use_enable doc docbook-docs) \
$(use_enable debug) \
$(use_enable policykit polkit) \
--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
--with-pam-module-dir=$(getpam_mod_dir) \
"$(systemd_with_unitdir)"
}
src_install() {
emake \
DESTDIR="${D}" \
htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
install
dodoc AUTHORS ChangeLog HACKING NEWS README TODO
newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit
keepdir /usr/$(get_libdir)/ConsoleKit/run-session.d
keepdir /etc/ConsoleKit/run-session.d
keepdir /var/run/ConsoleKit
keepdir /var/log/ConsoleKit
exeinto /etc/X11/xinit/xinitrc.d
newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d
doexe "${FILESDIR}"/pam-foreground-compat.ck
find "${ED}" -name '*.la' -exec rm -f {} +
}
pkg_postinst() {
ewarn "You need to restart ConsoleKit to get the new features."
ewarn "This can be done with /etc/init.d/consolekit restart"
ewarn "but make sure you do this and then restart your session"
ewarn "otherwise you will get access denied for certain actions"
}

View File

@ -0,0 +1,32 @@
# -*- sh -*-
# Xsession.d script for ck-launch-session.
#
#
# This file is sourced by Xsession(5), not executed.
CK_LAUNCH_SESSION=/usr/bin/ck-launch-session
is_on_console() {
session=$(dbus-send --system --dest=org.freedesktop.ConsoleKit \
--type=method_call --print-reply --reply-timeout=2000 \
/org/freedesktop/ConsoleKit/Manager \
org.freedesktop.ConsoleKit.Manager.GetCurrentSession \
| grep path | awk '{print $3}' | sed s/\"//g)
x11_display=$(dbus-send --system --dest=org.freedesktop.ConsoleKit \
--type=method_call --print-reply --reply-timeout=2000 \
$session org.freedesktop.ConsoleKit.Session.GetX11Display \
| grep string | awk '{print $2}' | sed s/\"//g)
if [ -z "$x11_display" ] ; then
return 0
else
return 1
fi
}
# gdm already creates a CK session for us, so do not run the expensive D-Bus
# calls if we have $GDMSESSION
if [ -z "$GDMSESSION" ] && [ -x "$CK_LAUNCH_SESSION" ] && \
( [ -z "$XDG_SESSION_COOKIE" ] || is_on_console ) ; then
command="$CK_LAUNCH_SESSION $command"
fi

View File

@ -0,0 +1,24 @@
#!/sbin/runscript
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/files/consolekit-0.1.rc,v 1.2 2009/09/12 19:46:19 nirbheek Exp $
depend() {
need dbus
use logger
}
start() {
ebegin "Starting ConsoleKit daemon"
start-stop-daemon --start -q \
--pidfile /var/run/ConsoleKit/pid \
--exec /usr/sbin/console-kit-daemon --
eend $?
}
stop() {
ebegin "Stopping ConsoleKit daemon"
start-stop-daemon --stop -q --pidfile /var/run/ConsoleKit/pid
eend $?
}

View File

@ -0,0 +1,66 @@
# Clean up at_console compat files, bug #257761
# http://patches.ubuntu.com/by-release/extracted/ubuntu/c/consolekit/0.2.10-1ubuntu9/
--- a/src/main.c 2008-07-25 03:19:34.000000000 +0200
+++ b/src/main.c 2008-07-26 00:25:13.000000000 +0200
@@ -149,6 +149,43 @@
unlink (CONSOLE_KIT_PID_FILE);
}
+#define CONSOLE_TAGS_DIR "/var/run/console"
+
+static void
+delete_console_tags (void)
+{
+ GDir *dir;
+ GError *error = NULL;
+ const gchar *name;
+
+ g_debug ("Cleaning up %s", CONSOLE_TAGS_DIR);
+
+ dir = g_dir_open (CONSOLE_TAGS_DIR, 0, &error);
+ if (dir == NULL) {
+ g_debug ("Couldn't open directory %s: %s", CONSOLE_TAGS_DIR,
+ error->message);
+ g_error_free (error);
+ return;
+ }
+ while ((name = g_dir_read_name (dir)) != NULL) {
+ gchar *file;
+ file = g_build_filename (CONSOLE_TAGS_DIR, name, NULL);
+
+ g_debug ("Removing tag file: %s", file);
+ if (unlink (file) == -1) {
+ g_warning ("Couldn't delete tag file: %s", file);
+ }
+ g_free (file);
+ }
+}
+
+static void
+cleanup (void)
+{
+ delete_console_tags ();
+ delete_pid ();
+}
+
/* copied from nautilus */
static int debug_log_pipes[2];
@@ -229,7 +266,7 @@
snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ());
written = write (pf, pid, strlen (pid));
close (pf);
- g_atexit (delete_pid);
+ g_atexit (cleanup);
} else {
g_warning ("Unable to write pid file %s: %s",
CONSOLE_KIT_PID_FILE,
@@ -312,6 +349,8 @@
g_debug ("initializing console-kit-daemon %s", VERSION);
+ delete_console_tags ();
+
create_pid_file ();
manager = ck_manager_new ();

View File

@ -0,0 +1,120 @@
From c4ba8b276bf95faf2f643e42988709ed6cb0b2f0 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Sun, 18 Oct 2009 23:30:36 +0200
Subject: [PATCH] respect multilib
---
src/Makefile.am | 4 ++--
src/ck-manager.c | 4 ++--
src/ck-seat.c | 2 +-
src/ck-session.c | 2 +-
tools/freebsd/Makefile.am | 2 +-
tools/linux/Makefile.am | 2 +-
tools/solaris/Makefile.am | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6ab05c8..d6fb810 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -204,8 +204,8 @@ MAINTAINERCLEANFILES = \
install-data-local:
-mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-session.d
- -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d
+ -mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-session.d
-mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-seat.d
- -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+ -mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
-mkdir -p $(DESTDIR)$(localstatedir)/run/ConsoleKit
-mkdir -p $(DESTDIR)$(localstatedir)/log/ConsoleKit
diff --git a/src/ck-manager.c b/src/ck-manager.c
index 99693a3..e65e25b 100644
--- a/src/ck-manager.c
+++ b/src/ck-manager.c
@@ -1083,7 +1083,7 @@ do_restart (CkManager *manager,
log_system_restart_event (manager);
error = NULL;
- res = g_spawn_command_line_async (PREFIX "/lib/ConsoleKit/scripts/ck-system-restart",
+ res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-restart",
&error);
if (! res) {
GError *new_error;
@@ -1164,7 +1164,7 @@ do_stop (CkManager *manager,
log_system_stop_event (manager);
error = NULL;
- res = g_spawn_command_line_async (PREFIX "/lib/ConsoleKit/scripts/ck-system-stop",
+ res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-stop",
&error);
if (! res) {
GError *new_error;
diff --git a/src/ck-seat.c b/src/ck-seat.c
index af7db59..d089f29 100644
--- a/src/ck-seat.c
+++ b/src/ck-seat.c
@@ -1278,7 +1278,7 @@ ck_seat_run_programs (CkSeat *seat,
g_assert(n <= G_N_ELEMENTS(extra_env));
ck_run_programs (SYSCONFDIR "/ConsoleKit/run-seat.d", action, extra_env);
- ck_run_programs (PREFIX "/lib/ConsoleKit/run-seat.d", action, extra_env);
+ ck_run_programs (LIBDIR "/ConsoleKit/run-seat.d", action, extra_env);
for (n = 0; extra_env[n] != NULL; n++) {
g_free (extra_env[n]);
diff --git a/src/ck-session.c b/src/ck-session.c
index d8db9dd..c2fc320 100644
--- a/src/ck-session.c
+++ b/src/ck-session.c
@@ -1287,7 +1287,7 @@ ck_session_run_programs (CkSession *session,
g_assert(n <= G_N_ELEMENTS(extra_env));
ck_run_programs (SYSCONFDIR "/ConsoleKit/run-session.d", action, extra_env);
- ck_run_programs (PREFIX "/lib/ConsoleKit/run-session.d", action, extra_env);
+ ck_run_programs (LIBDIR "/ConsoleKit/run-session.d", action, extra_env);
for (n = 0; extra_env[n] != NULL; n++) {
g_free (extra_env[n]);
diff --git a/tools/freebsd/Makefile.am b/tools/freebsd/Makefile.am
index f668722..d25930e 100644
--- a/tools/freebsd/Makefile.am
+++ b/tools/freebsd/Makefile.am
@@ -6,7 +6,7 @@ NULL =
SUBDIRS = \
$(NULL)
-scriptdir = $(prefix)/lib/ConsoleKit/scripts
+scriptdir = $(libdir)/ConsoleKit/scripts
script_SCRIPTS = \
ck-system-stop \
ck-system-restart \
diff --git a/tools/linux/Makefile.am b/tools/linux/Makefile.am
index 5a95942..51196c0 100644
--- a/tools/linux/Makefile.am
+++ b/tools/linux/Makefile.am
@@ -6,7 +6,7 @@ NULL =
SUBDIRS = \
$(NULL)
-scriptdir = $(prefix)/lib/ConsoleKit/scripts
+scriptdir = $(libdir)/ConsoleKit/scripts
script_SCRIPTS = \
ck-system-stop \
ck-system-restart \
diff --git a/tools/solaris/Makefile.am b/tools/solaris/Makefile.am
index f668722..d25930e 100644
--- a/tools/solaris/Makefile.am
+++ b/tools/solaris/Makefile.am
@@ -6,7 +6,7 @@ NULL =
SUBDIRS = \
$(NULL)
-scriptdir = $(prefix)/lib/ConsoleKit/scripts
+scriptdir = $(libdir)/ConsoleKit/scripts
script_SCRIPTS = \
ck-system-stop \
ck-system-restart \
--
1.6.5.rc1

View File

@ -0,0 +1,31 @@
Automagic polkit
---
--- configure.ac
+++ configure.ac
@@ -55,10 +55,21 @@
gthread-2.0 >= $GLIB_REQUIRED_VERSION
)
-PKG_CHECK_MODULES(POLKIT,
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
- have_polkit=yes,
- have_polkit=no)
+AC_ARG_ENABLE([polkit],
+ AC_HELP_STRING([--enable-polkit], [Enable PolicyKit support (default auto)]),
+ enable_polkit=$enableval,
+ enable_polkit=auto)
+
+if test "x$enable_polkit" != "xno"; then
+ PKG_CHECK_MODULES(POLKIT,
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
+ have_polkit=yes,
+ have_polkit=no)
+ if test "x$enable_polkit" = "xyes" -a "x$have_polkit" = "xno"; then
+ AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
+ fi
+fi
+
if test "x$have_polkit" = "xyes" ; then
AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
fi

View File

@ -0,0 +1,35 @@
From: Romain Perier <mrpouet@gentoo.org>
Date: Sat, 24 Oct 2009 18:43:43 +0200
Subject: [PATCH] Be able to shutdown or reboot even without polkit or RBAC supports
Ck does NOTHING at the origin if its built without polkit or RBAC supports, except
display a warning using g_warning() (which does not make sense).
The trick is to to call do_stop()/do_restart() in the #else directive :)
---
src/ck-manager.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/ck-manager.c b/src/ck-manager.c
index 99693a3..181df0d 100644
--- a/src/ck-manager.c
+++ b/src/ck-manager.c
@@ -1129,6 +1129,7 @@ ck_manager_restart (CkManager *manager,
check_rbac_permissions (manager, context, do_restart);
#else
g_warning ("Compiled without PolicyKit or RBAC support!");
+ do_restart(manager, context);
#endif
return TRUE;
@@ -1200,6 +1201,7 @@ ck_manager_stop (CkManager *manager,
check_rbac_permissions (manager, context, do_stop);
#else
g_warning ("Compiled without PolicyKit or RBAC support!");
+ do_stop(manager, context);
#endif
return TRUE;
--
1.6.5.1

View File

@ -0,0 +1,17 @@
#!/bin/sh
TAGDIR=/var/run/console
[ -n "$CK_SESSION_USER_UID" ] || exit 1
TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
if [ "$1" = "session_added" ]; then
mkdir -p "$TAGDIR"
echo "$CK_SESSION_ID" >> "$TAGFILE"
fi
if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
[ -s "$TAGFILE" ] || rm -f "$TAGFILE"
fi

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>freedesktop</herd>
<use>
<flag name="policykit">
Use the PolicyKit framework (<pkg>sys-auth/polkit</pkg>) to get
authorization for suspend/shutdown.
</flag>
</use>
</pkgmetadata>

View File

@ -0,0 +1,22 @@
https://bugs.gentoo.org/show_bug.cgi?id=309457
https://bugs.freedesktop.org/show_bug.cgi?id=27081
--- src/programs/pkexec.c
+++ src/programs/pkexec.c
@@ -375,6 +375,7 @@
gchar *path;
struct passwd pwstruct;
gchar pwbuf[8192];
+ gchar cwdbuf[PATH_MAX];
gchar *s;
const gchar *environment_variables_to_save[] = {
"SHELL",
@@ -438,7 +439,7 @@
goto out;
}
- original_cwd = g_strdup (get_current_dir_name ());
+ original_cwd = g_strdup (getcwd(cwdbuf,PATH_MAX));
if (original_cwd == NULL)
{
g_printerr ("Error getting cwd.\n");

View File

@ -0,0 +1,99 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/Attic/polkit-0.100.ebuild,v 1.3 2011/04/25 10:13:13 nirbheek dead $
EAPI="3"
inherit eutils pam
DESCRIPTION="Policy framework for controlling privileges for system-wide services"
HOMEPAGE="http://hal.freedesktop.org/docs/polkit/"
SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="debug doc examples gtk +introspection kde nls pam"
RDEPEND=">=dev-libs/glib-2.25.12
dev-libs/expat
introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
pam? ( virtual/pam )"
DEPEND="${RDEPEND}
!!>=sys-auth/policykit-0.92
!<sys-auth/policykit-0.92
dev-libs/libxslt
app-text/docbook-xsl-stylesheets
dev-util/pkgconfig
>=dev-util/intltool-0.36
doc? ( >=dev-util/gtk-doc-1.13 )"
PDEPEND=">=sys-auth/consolekit-0.4[policykit]
gtk? ( || ( >=gnome-extra/polkit-gnome-0.96-r1 lxde-base/lxpolkit ) )
kde? ( || ( sys-auth/polkit-kde-agent sys-auth/polkit-kde ) )"
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.96-getcwd.patch
}
src_configure() {
local myauth="--with-authfw=shadow"
use pam && myauth="--with-authfw=pam --with-pam-module-dir=$(getpam_mod_dir)"
econf \
--localstatedir="${EPREFIX}"/var \
--disable-dependency-tracking \
--disable-static \
$(use_enable debug verbose-mode) \
--enable-man-pages \
$(use_enable doc gtk-doc) \
$(use_enable introspection) \
--disable-examples \
$(use_enable nls) \
--with-os-type=gentoo \
${myauth}
}
src_install() {
emake DESTDIR="${D}" install || die
dodoc docs/TODO HACKING NEWS README
find "${D}" -name '*.la' -exec rm -f '{}' +
# We disable example compilation above, and handle it here
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins src/examples/{*.c,*.policy*}
fi
# Need to keep a few directories around...
diropts -m0700 -o root -g root
keepdir /var/run/polkit-1
keepdir /var/lib/polkit-1
}
pkg_postinst() {
# Make sure that the user has consolekit sessions working so that the
# 'allow_active' directive in polkit action policies works
if has_version 'gnome-base/gdm' && ! has_version 'gnome-base/gdm[consolekit]'; then
# If user has GDM installed, but USE=-consolekit, warn them
ewarn "You have GDM installed, but it does not have USE=consolekit"
ewarn "If you login using GDM, polkit authorizations will not work"
ewarn "unless you enable USE=consolekit"
einfo
fi
if has_version 'kde-base/kdm' && ! has_version 'kde-base/kdm[consolekit]'; then
# If user has KDM installed, but USE=-consolekit, warn them
ewarn "You have KDM installed, but it does not have USE=consolekit"
ewarn "If you login using KDM, polkit authorizations will not work"
ewarn "unless you enable USE=consolekit"
einfo
fi
if ! has_version 'gnome-base/gdm[consolekit]' && \
! has_version 'kde-base/kdm[consolekit]'; then
# Inform user about the alternative method
ewarn "If you don't use GDM or KDM for logging in,"
ewarn "you must start your desktop environment (DE) as follows:"
ewarn " ck-launch-session \$STARTGUI"
ewarn "Where \$STARTGUI is a DE-starting command such as 'gnome-session'."
ewarn "You should add this to your ~/.xinitrc if you use startx."
fi
}

View File

@ -0,0 +1,22 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-quirks/pm-quirks-20100619.ebuild,v 1.7 2010/12/12 16:47:31 armin76 Exp $
EAPI=3
inherit multilib
DESCRIPTION="Video Quirks database for pm-utils"
HOMEPAGE="http://pm-utils.freedesktop.org/"
SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
IUSE=""
S=${WORKDIR}
src_install() {
insinto /usr/$(get_libdir)/pm-utils
doins -r video-quirks || die
}

View File

@ -0,0 +1,262 @@
# ChangeLog for sys-power/pm-utils
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.58 2011/04/21 15:03:19 scarabeus Exp $
*pm-utils-1.4.1-r2 (21 Apr 2011)
21 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+files/1.4.1-bluetooth-sync.patch, +files/1.4.1-disable-sata-alpm.patch,
+files/1.4.1-fix-intel-audio-powersave-hook.patch, -pm-utils-1.4.1-r1.ebuild,
+files/1.4.1-logging-append.patch, +pm-utils-1.4.1-r2.ebuild:
Backport some patches to fix issues with bluetooth/sata/... Per bug #336654.
12 Dec 2010; Raúl Porcel <armin76@gentoo.org> pm-utils-1.4.1.ebuild,
pm-utils-1.4.1-r1.ebuild:
sparc stable
13 Nov 2010; Raúl Porcel <armin76@gentoo.org> pm-utils-1.4.1.ebuild,
pm-utils-1.4.1-r1.ebuild:
alpha/ia64 stable wrt #338988
*pm-utils-1.4.1-r1 (10 Nov 2010)
10 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
+pm-utils-1.4.1-r1.ebuild:
Remove USE="networkmanager" and 55NetworkManager because NetworkManager >=
0.8.2 is handling suspend/resume on it's own with UPower.
09 Sep 2010; Joseph Jezak <josejx@gentoo.org> pm-utils-1.4.1.ebuild:
Marked ppc/ppc64 stable for bug #329625.
21 Aug 2010; Markus Meier <maekke@gentoo.org> pm-utils-1.4.1.ebuild:
arm stable, bug #329625
30 Jul 2010; Markos Chandras <hwoarang@gentoo.org> pm-utils-1.4.1.ebuild:
Stable on amd64 wrt bug #329625
25 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
pm-utils-1.4.1.ebuild:
stable x86, bug 329625
08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pm-utils-1.4.1.ebuild:
Block only conflicting laptop-mode-tools wrt #327443.
08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pm-utils-1.4.1.ebuild:
Don't block sys-power/powermgmt-base anymore if USE="pm-utils" is enabled
wrt #255249.
*pm-utils-1.4.1 (08 Jul 2010)
08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+pm-utils-1.4.1.ebuild:
Version bump.
08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pm-utils-1.4.0.ebuild:
Block app-laptop/laptop-mode-tools wrt upstream ChangeLog; "Update git
tree packaging to conflict with laptop-mode-tools. The new powermanagement
scripts conflict with laptop-mode-tools. Make sure both are not installed
at the same time."
03 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
pm-utils-1.3.0-r2.ebuild:
ppc64 stable wrt #318209
23 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> pm-utils-1.4.0.ebuild:
Make net-misc/openntpd option for USE="ntp" wrt #314891 by Thomas Kahle.
*pm-utils-1.4.0 (23 Jun 2010)
23 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+pm-utils-1.4.0.ebuild:
Version bump.
05 Jun 2010; Raúl Porcel <armin76@gentoo.org> pm-utils-1.3.0-r2.ebuild,
pm-utils-1.3.0-r3.ebuild:
Add ~arm
05 Jun 2010; Raúl Porcel <armin76@gentoo.org> pm-utils-1.2.5.ebuild,
pm-utils-1.3.0-r2.ebuild, pm-utils-1.3.0-r3.ebuild:
Add ~arm
20 May 2010; Samuli Suominen <ssuominen@gentoo.org>
pm-utils-1.3.0-r3.ebuild, +files/1.3.0-fix_autotools-2.patch:
Use pregenerated manpages wrt #320731 by Martin Väth.
17 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
pm-utils-1.3.0-r2.ebuild:
x86 stable wrt bug #318209
*pm-utils-1.3.0-r3 (14 May 2010)
14 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+pm-utils-1.3.0-r3.ebuild:
Don't hardcode /usr/local/lib in import-fdi-quirkdb script wrt #319139 by
Peter Gantner.
10 May 2010; nixnut <nixnut@gentoo.org> pm-utils-1.3.0-r2.ebuild:
ppc stable #318209
03 May 2010; Samuli Suominen <ssuominen@gentoo.org>
pm-utils-1.3.0-r2.ebuild:
amd64 stable wrt #318209
03 May 2010; Samuli Suominen <ssuominen@gentoo.org>
files/1.3.0-fix_autotools.patch, pm-utils-1.3.0-r2.ebuild:
Change patch from --enable-doc to --enable-manpages and always build them
(no point in avoiding small xmlto depend).
20 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
pm-utils-1.3.0-r2.ebuild:
Fix documentation directory wrt #316423 by Chris Mayo.
*pm-utils-1.3.0-r2 (17 Apr 2010)
17 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+files/1.3.0-on_ac_power-upower.patch, +pm-utils-1.3.0-r2.ebuild:
Try UPower for on_ac_power before DeviceKit-power and HAL wrt #315663.
07 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
pm-utils-1.3.0-r1.ebuild:
Update Description field.
07 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
files/1.3.0-fix_autotools.patch:
Fix typo in patch description.
*pm-utils-1.3.0-r1 (05 Apr 2010)
05 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-pm-utils-1.3.0.ebuild, +pm-utils-1.3.0-r1.ebuild:
Add wrongly removed deps for video_cards. Revbump for that. Per bug
#313211.
04 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
files/1.3.0-fix_autotools.patch:
Update patch to work with +doc.
*pm-utils-1.3.0 (04 Apr 2010)
04 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+files/1.3.0-fix_autotools.patch, +pm-utils-1.3.0.ebuild, metadata.xml:
Version bump per bug #311059.
*pm-utils-1.2.6.1 (24 Jan 2010)
24 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
-pm-utils-1.1.1.ebuild, -pm-utils-1.1.2.1.ebuild, -pm-utils-1.2.3.ebuild,
-pm-utils-1.2.3-r1.ebuild, -files/pm-utils-1.2.3-service-status.patch,
-pm-utils-1.2.4.ebuild, +pm-utils-1.2.6.1.ebuild:
Version bump, bug #295867. Clean up old revisions.
30 Nov 2009; Joseph Jezak <josejx@gentoo.org> pm-utils-1.2.5.ebuild:
Marked ppc64 stable.
08 Nov 2009; Joseph Jezak <josejx@gentoo.org> pm-utils-1.2.5.ebuild:
Marked ~ppc64.
09 Aug 2009; nixnut <nixnut@gentoo.org> pm-utils-1.2.5.ebuild:
ppc stable #276217
11 Jul 2009; <chainsaw@gentoo.org> pm-utils-1.2.5.ebuild:
Marked stable on AMD64 for bug #276217; tested on a dual Opteron 2354.
08 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
pm-utils-1.2.5.ebuild:
stable x86, bug 276217
12 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org> pm-utils-1.2.5.ebuild:
Fix bug 269339 -- app-text/xmlto isn't compulsary (but still automagic)
26 Apr 2009; Brent Baude <ranger@gentoo.org> pm-utils-1.2.4.ebuild:
stable ppc, bug 266698
23 Apr 2009; Markus Meier <maekke@gentoo.org> pm-utils-1.2.4:
amd64/x86 stable, bug #266698
*pm-utils-1.2.5 (20 Apr 2009)
20 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org>
+pm-utils-1.2.5.ebuild:
Bump to 1.2.5. Add support for KMS.
22 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org> pm-utils-1.2.4.ebuild:
Remove -Werror from configure, bug #260943.
16 Feb 2009; <chainsaw@gentoo.org> pm-utils-1.2.3-r1.ebuild:
Stable on PowerPC for bug #259080, based on arch testing by Christian
Schmitt <chrschmitt@gmail.com>.
*pm-utils-1.2.4 (15 Feb 2009)
15 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+pm-utils-1.2.4.ebuild:
Bump to 1.2.4. Integrate service status patch and pkg-config fix.
15 Feb 2009; Markus Meier <maekke@gentoo.org> pm-utils-1.2.3-r1.ebuild:
amd64/x86 stable, bug #258482
18 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+files/pm-utils-1.2.3-service-status.patch, pm-utils-1.2.3-r1.ebuild:
Fix service status detection, bug #255431.
*pm-utils-1.2.3-r1 (18 Jan 2009)
18 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
-pm-utils-0.99.4.ebuild, +pm-utils-1.2.3-r1.ebuild:
Fix pkgconfig file, bug #254492. Fix generation of hook exception file,
bug #253835. Kill pm-utils-0.99.4, bug #240720.
15 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> metadata.xml:
Compnerd retired.
15 Jan 2009; Markus Meier <maekke@gentoo.org> pm-utils-1.1.1.ebuild:
amd64/x86 stable, bug #252625
13 Jan 2009; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
gentopia is becoming freedesktop
09 Jan 2009; Joseph Jezak <josejx@gentoo.org> pm-utils-1.2.3.ebuild:
Marked ~ppc and added Christian Schmitt's change to prevent depending on x86
only apps. See bug #253868 for details.
*pm-utils-1.2.3 (10 Dec 2008)
10 Dec 2008; Jeremy Olexa <darkside@gentoo.org> +pm-utils-1.2.3.ebuild:
(non maintainer commit) Version bump, bug 225443 with the removal of alsa
USE flag because upstream dropped support for it
23 Oct 2008; Rémi Cardona <remi@gentoo.org> pm-utils-1.1.1.ebuild,
pm-utils-1.1.2.1.ebuild:
pkgmove from xf86-video-i810 to xf86-video-intel
16 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
add GLEP 56 USE flag desc from use.local.desc
28 Jul 2008; Raúl Porcel <armin76@gentoo.org> pm-utils-0.99.4.ebuild:
x86 stable wrt #222219
19 Jun 2008; Olivier Crête <tester@gentoo.org> pm-utils-0.99.4.ebuild:
amd64 stable, bug #222219
*pm-utils-1.1.2.1 (29 May 2008)
29 May 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+pm-utils-1.1.2.1.ebuild:
Version bump from upstream
*pm-utils-1.1.1 (20 May 2008)
20 May 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+pm-utils-1.1.1.ebuild:
Version bump from upstream
23 Nov 2007; Saleem Abdulrasool <compnerd@gentoo.org>
pm-utils-0.99.4.ebuild:
Add missing useflag
*pm-utils-0.99.4 (23 Nov 2007)
23 Nov 2007; Saleem Abdulrasool <compnerd@gentoo.org> +metadata.xml,
+pm-utils-0.99.4.ebuild:
Initial commit of pm-utils for HAL 0.5.10

View File

@ -0,0 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
AUX 1.4.1-bluetooth-sync.patch 1504 RMD160 244c9ffefa49975f669bb7845dc908e2fe0190fd SHA1 95898d1184cc81bb561ce557247bcb5a98e86250 SHA256 2af763812d609f384c818635028791c875e3e56a1fa387e80b7f1ca5afc3c4e3
AUX 1.4.1-disable-sata-alpm.patch 778 RMD160 5f162c05ed2be3f39fc20b76549ddc939c7ef4ea SHA1 c4cd214ae098f0573183017ae4a7324e383a9e02 SHA256 c995912f25fd1f0c30c90136c36ac49e2d3a5fdb94ef1710a7e0426dd10dad8a
AUX 1.4.1-fix-intel-audio-powersave-hook.patch 1412 RMD160 09d3f8cc95e893b86728c393b1786dd354c444c6 SHA1 9222d73eef1979667d4ecbe4d68d7d6428533aa6 SHA256 16d5355d1c5cff6316fef11768673434394582c67039c79e8b86aafe2d2f7797
AUX 1.4.1-logging-append.patch 683 RMD160 a8ed4297f3f2536313004dfd765357b245714937 SHA1 3f25b0cb916ee060922c076667f26e331820e924 SHA256 5622a42167a5f6b725ecbe473d8f0994c4b3ac32e5c6607ce1fab0888894f139
DIST pm-utils-1.4.1.tar.gz 208687 RMD160 04798d6d3aa3bbbfbca6dc48037916b425714108 SHA1 9aacb9b4a5f11f751d94f5257c6c54460f106197 SHA256 8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4370c0b
EBUILD pm-utils-1.4.1-r2.ebuild 1692 RMD160 7e08397a732ab80bb4956979ad555feadb0c4686 SHA1 61a2b271a80a3fe540b00f3403c63564161677dd SHA256 bba79eda31721384c17e7872340dad3f9d93a4834e21441051a71dade50aa71e
EBUILD pm-utils-1.4.1.ebuild 1581 RMD160 4e3204b517e5efe0d7d61a3d658e6c2d18d951a0 SHA1 21a1c0b52d94082474e9633221a4007fcacce43a SHA256 d29333f16893b48c1ad3af0072c0f90e2afe6f2544137faa3509be776906ef18
MISC ChangeLog 9140 RMD160 ed0f0b7b2a00851cad4d3981987ae247b3c001c0 SHA1 3fda53467f8aab3f6d4581efdcf372c5128055b4 SHA256 fc8c08d92156b7a23d703154bce6c3be3f91423d3110a914d3f63879fd385f6d
MISC metadata.xml 333 RMD160 28ff42d27d929095e83151b3a6bc06e9acdc1a10 SHA1 bd2334f7ff7c962f0d98678472e7feb673b942b6 SHA256 f06c34f767b411fcbc763a18bfd022d40fd4eb7fb38d3d14473a47064685bbda
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
iEYEARECAAYFAk2wRxkACgkQHB6c3gNBRYd1twCglebEq7FFuSysW2CLL6ijsb9x
03AAniZ/cHE4O7NKwSA8P8JKUWCdyHvR
=hGOg
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,43 @@
From 640b53438c20818b3e344343b58b1f1765606a85 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Mon, 31 Jan 2011 15:30:01 +0100
Subject: [PATCH] 49bluetooth: Wait for btusb module to get unused
The 49bluetooth hook disables /proc/acpi/ibm/bluetooth but this isn't
synchronous, i. e. it doesn't wait until the module usage count actually drops
to 0. Due to that, it's impossible to add btusb to SUSPEND_MODULES (on some
models/older kernels you need to do that to fix suspend problems), as at that
point the module is still in use.
On my system (ThinkPad X201) the module takes between 0.3 and 0.5 seconds to
unload, so use 100 ms wait steps with a timeout of 2 seconds.
Bug: https://bugs.freedesktop.org//show_bug.cgi?id=33759
Bug-Ubuntu: https://launchpad.net/bugs/698331
---
pm/sleep.d/49bluetooth | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/pm/sleep.d/49bluetooth b/pm/sleep.d/49bluetooth
index d46ba49..0dc1909 100755
--- a/pm/sleep.d/49bluetooth
+++ b/pm/sleep.d/49bluetooth
@@ -12,6 +12,15 @@ suspend_bluetooth()
if grep -q enabled /proc/acpi/ibm/bluetooth; then
savestate ibm_bluetooth enable
echo disable > /proc/acpi/ibm/bluetooth
+
+ # wait for up to 2 seconds for the module to actually get
+ # unused
+ TIMEOUT=20
+ while [ $TIMEOUT -ge 0 ]; do
+ [ `cat /sys/module/btusb/refcnt` = 0 ] && break
+ TIMEOUT=$((TIMEOUT-1))
+ sleep 0.1
+ done
else
savestate ibm_bluetooth disable
fi
--
1.7.2.3

View File

@ -0,0 +1,26 @@
Description: Disable SATA link power management by default, as it still causes disk errors and corruptions on many hardware.
Author: Martin Pitt <martin.pitt@ubuntu.com>
Bug-Ubuntu: https://launchpad.net/bugs/539467
Index: pm-utils/pm/power.d/sata_alpm
===================================================================
--- pm-utils.orig/pm/power.d/sata_alpm 2011-02-01 15:53:09.164867778 +0100
+++ pm-utils/pm/power.d/sata_alpm 2011-02-01 15:53:28.954867786 +0100
@@ -2,7 +2,7 @@
. "${PM_FUNCTIONS}"
-SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-true}
+SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-false}
help() {
cat <<EOF
@@ -16,7 +16,7 @@
This hook has 1 parameter:
SATA_ALPM_ENABLE = whether to use SATA ALPM on battery.
-Defaults to "true".
+Defaults to "false".
EOF
}

View File

@ -0,0 +1,40 @@
From: Florian Kriener <florian@kriener.org>
To: submit@bugs.debian.org
Subject: [pm-utils] wrong path in intel-audio-powersave (and a small bug)
Date: Sat, 25 Sep 2010 11:27:30 +0200
In the script intel-audio-powersave is this loop
for dev in /sys/module/snd_*/parameters/power_save; do
[ -w "$dev/parameters/power_save" ] || continue
printf "Setting power savings for $s to %d..." "$dev##*/" "$1"
echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
done
I think it should be
for dev in /sys/module/snd_*; do
[ -w "$dev/parameters/power_save" ] || continue
printf "Setting power savings for %s to %d..." "${dev##*/}" "$1"
echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
done
This fixes the two bugs.
diff --git a/pm/power.d/intel-audio-powersave b/pm/power.d/intel-audio-powersave
index 36675a8..da63e40 100644
--- a/pm/power.d/intel-audio-powersave
+++ b/pm/power.d/intel-audio-powersave
@@ -20,9 +20,9 @@ EOF
audio_powersave() {
[ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA
- for dev in /sys/module/snd_*/parameters/power_save; do
+ for dev in /sys/module/snd_*; do
[ -w "$dev/parameters/power_save" ] || continue
- printf "Setting power savings for $s to %d..." "$dev##*/" "$1"
+ printf "Setting power savings for %s to %d..." "${dev##*/}" "$1"
echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
done
}

View File

@ -0,0 +1,19 @@
Author: James Westby <james.westby@ubuntu.com>
Description: Do not clear the log file on each operation, but instead append to it.
This makes debugging of several suspends much easier.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25255
Bug-Ubuntu: https://launchpad.net/bugs/410352
Index: pm-utils/pm/pm-functions.in
===================================================================
--- pm-utils.orig/pm/pm-functions.in 2010-07-05 18:41:21.118322244 +0200
+++ pm-utils/pm/pm-functions.in 2010-07-05 18:41:24.126325221 +0200
@@ -271,7 +271,7 @@
return 1
fi
export LOGGING=true
- exec > "$1" 2>&1
+ exec >> "$1" 2>&1
}
check_suspend() { [ -n "$SUSPEND_MODULE" ]; }

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
<use>
<flag name="ntp">Install support for <pkg>net-misc/ntp</pkg></flag>
</use>
</pkgmetadata>

View File

@ -0,0 +1,60 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.4.1-r2.ebuild,v 1.1 2011/04/21 15:03:19 scarabeus Exp $
EAPI=4
inherit eutils
DESCRIPTION="Suspend and hibernation utilities"
HOMEPAGE="http://pm-utils.freedesktop.org/"
SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="alsa debug ntp video_cards_intel video_cards_radeon"
vbetool="!video_cards_intel? ( sys-apps/vbetool )"
RDEPEND="!<app-laptop/laptop-mode-tools-1.55-r1
!sys-power/powermgmt-base[-pm-utils(+)]
sys-apps/dbus
>=sys-apps/util-linux-2.13
sys-power/pm-quirks
alsa? ( media-sound/alsa-utils )
ntp? ( || ( net-misc/ntp net-misc/openntpd ) )
amd64? ( ${vbetool} )
x86? ( ${vbetool} )
video_cards_radeon? ( app-laptop/radeontool )"
DEPEND="${RDEPEND}"
src_prepare() {
local ignore="01grub"
use ntp || ignore+=" 90clock"
use debug && echo 'PM_DEBUG="true"' > "${T}"/gentoo
echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${T}"/gentoo
epatch "${FILESDIR}"/${PV}-bluetooth-sync.patch \
"${FILESDIR}"/${PV}-disable-sata-alpm.patch \
"${FILESDIR}"/${PV}-fix-intel-audio-powersave-hook.patch \
"${FILESDIR}"/${PV}-logging-append.patch
}
src_configure() {
econf \
--disable-doc
}
src_install() {
emake DESTDIR="${D}" install
dodoc AUTHORS ChangeLog NEWS pm/HOWTO* README* TODO
doman man/*.{1,8}
insinto /etc/pm/config.d
doins "${T}"/gentoo
# NetworkManager 0.8.2 is handling suspend/resume on it's own with UPower
find "${D}" -type f -name 55NetworkManager -exec rm -f '{}' +
}

View File

@ -0,0 +1,55 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.4.1.ebuild,v 1.10 2010/12/12 16:50:12 armin76 Exp $
EAPI=2
inherit multilib
DESCRIPTION="Suspend and hibernation utilities"
HOMEPAGE="http://pm-utils.freedesktop.org/"
SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
vbetool="!video_cards_intel? ( sys-apps/vbetool )"
DEPEND="!<app-laptop/laptop-mode-tools-1.55-r1
!<sys-power/powermgmt-base-1.31
!>=sys-power/powermgmt-base-1.31[-pm-utils]"
RDEPEND="${DEPEND}
sys-apps/dbus
>=sys-apps/util-linux-2.13
sys-power/pm-quirks
alsa? ( media-sound/alsa-utils )
networkmanager? ( net-misc/networkmanager )
ntp? ( || ( net-misc/ntp net-misc/openntpd ) )
amd64? ( ${vbetool} )
x86? ( ${vbetool} )
video_cards_radeon? ( app-laptop/radeontool )"
src_prepare() {
local ignore="01grub"
use networkmanager || ignore+=" 55NetworkManager"
use ntp || ignore+=" 90clock"
use debug && echo 'PM_DEBUG="true"' > "${T}"/gentoo
echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${T}"/gentoo
}
src_configure() {
econf \
--docdir=/usr/share/doc/${PF} \
--disable-dependency-tracking \
--disable-doc
}
src_install() {
emake DESTDIR="${D}" install || die
dodoc AUTHORS ChangeLog NEWS pm/HOWTO* README* TODO || die
doman man/*.{1,8} || die
insinto /etc/pm/config.d
doins "${T}"/gentoo || die
}

View File

@ -0,0 +1,82 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.8.ebuild,v 1.11 2011/03/27 21:59:50 ssuominen Exp $
EAPI=3
inherit linux-info
DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
HOMEPAGE="http://upower.freedesktop.org/"
SRC_URI="http://upower.freedesktop.org/releases/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="debug doc +introspection ios kernel_FreeBSD kernel_linux"
COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
>=dev-libs/glib-2.21.5:2
>=sys-apps/dbus-1
>=sys-auth/polkit-0.97
introspection? ( dev-libs/gobject-introspection )
kernel_linux? ( >=sys-fs/udev-151[extras]
virtual/libusb:1
ios? ( >=app-pda/libimobiledevice-0.9.7
>=app-pda/libplist-0.12 ) )
!sys-apps/devicekit-power"
RDEPEND="${COMMON_DEPEND}
kernel_linux? ( >=sys-power/pm-utils-1.4.1 )"
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
app-text/docbook-xsl-stylesheets
>=dev-util/intltool-0.40.0
dev-util/pkgconfig
doc? ( dev-util/gtk-doc
app-text/docbook-xml-dtd:4.1.2 )"
RESTRICT="test"
pkg_setup() {
if use kernel_linux && kernel_is lt 2 6 37; then
if use amd64 || use x86; then
CONFIG_CHECK="~ACPI_SYSFS_POWER"
linux-info_pkg_setup
fi
fi
}
src_prepare() {
sed -i -e '/DISABLE_DEPRECATED/d' configure || die
}
src_configure() {
local backend
if use kernel_linux; then
backend=linux
elif use kernel_FreeBSD; then
backend=freebsd
else
backend=dummy
fi
econf \
--localstatedir="${EPREFIX}/var" \
$(use_enable introspection) \
--disable-dependency-tracking \
--disable-static \
$(use_enable debug verbose-mode) \
--enable-man-pages \
$(use_enable doc gtk-doc) \
--disable-tests \
--with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html" \
--with-backend=${backend} \
$(use_with ios idevice)
}
src_install() {
emake DESTDIR="${D}" install || die
dodoc AUTHORS HACKING NEWS README
find "${ED}" -name '*.la' -exec rm -f {} +
}

View File

@ -0,0 +1,76 @@
# ChangeLog for virtual/libusb
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.18 2011/02/06 12:00:59 leio Exp $
06 Feb 2011; Mart Raudsepp <leio@gentoo.org> libusb-0.ebuild:
Drop to ~mips
12 Oct 2010; Raúl Porcel <armin76@gentoo.org> libusb-1.ebuild:
sparc stable wrt #304149
09 Oct 2010; Mike Frysinger <vapier@gentoo.org> libusb-1.ebuild:
Mark ia64/s390/sh stable #304149.
29 Sep 2010; Jeroen Roovers <jer@gentoo.org> libusb-1.ebuild:
Stable for HPPA (bug #304149).
10 Sep 2010; Tobias Klausmann <klausman@gentoo.org> libusb-1.ebuild:
Stable on alpha, bug #304149
21 Aug 2010; Markus Meier <maekke@gentoo.org> libusb-1.ebuild:
arm stable, bug #304149
11 Aug 2010; Joseph Jezak <josejx@gentoo.org> libusb-1.ebuild:
Marked ppc/ppc64 stable for bug #304149.
31 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> libusb-1.ebuild:
x86 stable wrt bug #304149
31 Jul 2010; Pacho Ramos <pacho@gentoo.org> libusb-1.ebuild:
amd64 stable, bug 304149
13 Apr 2010; Alexis Ballier <aballier@gentoo.org> libusb-0.ebuild:
freebsd-lib-8.0 provides a libusb compatible layer. We cant rip it out
because some FreeBSD usb utilities require some of its additions; FreeBSD
people claim it has a compatible API so that should be fine to have it as
a provider too.
18 Feb 2010; Jeremy Olexa <darkside@gentoo.org> libusb-0.ebuild,
libusb-1.ebuild:
Add ~x86-macos keywords because dev-libs/libusb was tested in the prefix
overlay
11 Jan 2010; Ulrich Mueller <ulm@gentoo.org> libusb-0.ebuild,
libusb-1.ebuild:
Set empty HOMEPAGE and LICENSE.
15 Dec 2009; Jonathan Callen <abcd@gentoo.org> libusb-0.ebuild,
libusb-1.ebuild:
QA: Add prefix keywords
11 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> libusb-1.ebuild:
Raise the minimum version of libusb-1 used to resolve some issues with the
early releases (eg bug #282532).
16 May 2009; Robin H. Johnson <robbat2@gentoo.org> libusb-0.ebuild:
Include the current stable of dev-libs/libusb-0* in the version
specification, so that we can replace the version dependancy in other
ebuilds when migrating them to the virtual.
15 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
libusb-1.ebuild:
Fix SLOT.
15 May 2009; Robin H. Johnson <robbat2@gentoo.org> libusb-0.ebuild:
Use the keywords from the latest stable dev-libs/libusb:0 ebuild so that
we can change other stable packages safely.
*libusb-1 (14 May 2009)
*libusb-0 (14 May 2009)
14 May 2009; Robin H. Johnson <robbat2@gentoo.org> +libusb-0.ebuild,
+libusb-1.ebuild, +metadata.xml:
Bug #247687: virtual for libusb support. Based on final design choices in
the bug, as agreed on by Tiziano Müller <dev-zero@gentoo.org> and Robert
Buchholz <rbu@gentoo.org>.

View File

@ -0,0 +1,4 @@
EBUILD libusb-0.ebuild 577 RMD160 783abf12528a9d384570ca77eb3847705099daa0 SHA1 23db4c8b5572354aa89fa3e469fe87ac567a9870 SHA256 8b3a59b3eaa16793f7d20ebdf0a06f13f64b234b19bf46f860323c9ddc2d59a3
EBUILD libusb-1.ebuild 512 RMD160 817cba7913e6a0f9ad2bc58bd5452cb5df26dc5c SHA1 57b1bcb904073445d6fc7eca81ce13d53308632b SHA256 cde5558600ada6c9bd0098bccc125bb983ae7ad3d5d0f83ee48d56985fb03a36
MISC ChangeLog 2861 RMD160 2901b894df9d16edd04c82bbf50f64601250f1e9 SHA1 8923584049744a6a4a8187aec0b7587a327ac861 SHA256 8d63ef308d3be8af1fd56b0a31783ee5b6900291c9edb557be57d7b3a12ddf41
MISC metadata.xml 226 RMD160 648b1f4c4f30d91596a8bb5ee6713abbe558d1ee SHA1 454eb537623437bf8d58ae3cd0418e6a898bac61 SHA256 32bd7ea3d52eaade1cad03a261cd0f75ae3b0d10787fe646ece11c752b1cdfd2

View File

@ -0,0 +1,17 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/libusb-0.ebuild,v 1.8 2011/02/06 12:00:59 leio Exp $
EAPI=2
DESCRIPTION="Virtual for libusb"
HOMEPAGE=""
SRC_URI=""
LICENSE=""
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DEPEND=""
RDEPEND="|| ( >=dev-libs/libusb-0.1.12-r1:0 dev-libs/libusb-compat >=sys-freebsd/freebsd-lib-8.0[usb] )"

View File

@ -0,0 +1,17 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/libusb-1.ebuild,v 1.14 2010/10/12 16:45:50 armin76 Exp $
EAPI=2
DESCRIPTION="Virtual for libusb"
HOMEPAGE=""
SRC_URI=""
LICENSE=""
SLOT="1"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DEPEND=""
RDEPEND=">=dev-libs/libusb-1.0.4:1"

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>no-herd</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
</pkgmetadata>