| 1 |
eva 08/10/13 21:27:22 |
| 2 |
|
| 3 |
Added: system-tools-backends-2.6.0-services.patch |
| 4 |
system-tools-backends-2.6.0-users.patch |
| 5 |
system-tools-backends-2.6.0-automagic-polkit.patch |
| 6 |
Log: |
| 7 |
bump to 2.6.0-r1. Integrate patch from bug #214265, thanks to Jeremy Guitton and fix policykit automagic dependency. |
| 8 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-admin/system-tools-backends/files/system-tools-backends-2.6.0-services.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-services.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-services.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: system-tools-backends-2.6.0-services.patch |
| 17 |
=================================================================== |
| 18 |
diff --git Init/Services.pm Init/Services.pm |
| 19 |
index c1d2620..a76f5dc 100644 |
| 20 |
--- Init/Services.pm |
| 21 |
+++ Init/Services.pm |
| 22 |
@@ -659,7 +659,7 @@ sub get_gentoo_runlevels |
| 23 |
sub get_gentoo_services_for_runlevel |
| 24 |
{ |
| 25 |
my($runlevel) = @_; |
| 26 |
- my($raw_output) = Utils::File::run_backtick("rc-status -nocolor $runlevel"); |
| 27 |
+ my($raw_output) = Utils::File::run_backtick("rc-status --nocolor $runlevel"); |
| 28 |
my(@raw_lines) = split(/\n/,$raw_output); |
| 29 |
my($line, $service); |
| 30 |
my(%services); |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
1.1 app-admin/system-tools-backends/files/system-tools-backends-2.6.0-users.patch |
| 35 |
|
| 36 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-users.patch?rev=1.1&view=markup |
| 37 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-users.patch?rev=1.1&content-type=text/plain |
| 38 |
|
| 39 |
Index: system-tools-backends-2.6.0-users.patch |
| 40 |
=================================================================== |
| 41 |
diff --git Users/Users.pm Users/Users.pm |
| 42 |
index 6703d0f..bd0603a 100644 |
| 43 |
--- Users/Users.pm |
| 44 |
+++ Users/Users.pm |
| 45 |
@@ -591,7 +591,8 @@ sub add_user |
| 46 |
if ($cmd_adduser && |
| 47 |
$Utils::Backend::tool{"platform"} !~ /^slackware/ && |
| 48 |
$Utils::Backend::tool{"platform"} !~ /^archlinux/ && |
| 49 |
- $Utils::Backend::tool{"platform"} !~ /^redhat/) |
| 50 |
+ $Utils::Backend::tool{"platform"} !~ /^redhat/ && |
| 51 |
+ $Utils::Backend::tool{"platform"} !~ /^gentoo/) |
| 52 |
{ |
| 53 |
# use adduser if available and valid (slackware one is b0rk) |
| 54 |
# set empty gecos fields and password, they will be filled out later |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.1 app-admin/system-tools-backends/files/system-tools-backends-2.6.0-automagic-polkit.patch |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-automagic-polkit.patch?rev=1.1&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-automagic-polkit.patch?rev=1.1&content-type=text/plain |
| 62 |
|
| 63 |
Index: system-tools-backends-2.6.0-automagic-polkit.patch |
| 64 |
=================================================================== |
| 65 |
--- configure.in.old 2008-10-13 22:48:51.000000000 +0200 |
| 66 |
+++ configure.in 2008-10-13 22:53:59.000000000 +0200 |
| 67 |
@@ -1,4 +1,4 @@ |
| 68 |
-AC_PREREQ(2.52) |
| 69 |
+AC_PREREQ(2.60) |
| 70 |
dnl ============================================================== |
| 71 |
dnl Process this file with autoconf to produce a configure script. |
| 72 |
dnl ============================================================== |
| 73 |
@@ -122,10 +122,19 @@ |
| 74 |
AC_SUBST(DISPATCHER_CFLAGS) |
| 75 |
|
| 76 |
dnl check for PolicyKit |
| 77 |
-PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLICYKIT_REQUIRED, have_polkit=yes, have_polkit=no) |
| 78 |
|
| 79 |
-if test "$have_polkit" = "yes"; then |
| 80 |
- AC_DEFINE(HAVE_POLKIT, [1], [whether PolicyKit was found]) |
| 81 |
+have_polkit=no |
| 82 |
+AC_ARG_ENABLE(polkit, |
| 83 |
+ AS_HELP_STRING([--enable-polkit],[Enable policykit support])) |
| 84 |
+ |
| 85 |
+if test "x$enable_polkit" = "xyes"; then |
| 86 |
+ PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLICYKIT_REQUIRED, have_polkit=yes) |
| 87 |
+ |
| 88 |
+ if test "$have_polkit" = "yes"; then |
| 89 |
+ AC_DEFINE(HAVE_POLKIT, [1], [whether PolicyKit was found]) |
| 90 |
+ else |
| 91 |
+ AC_MSG_ERROR([policykit support requested but not found]) |
| 92 |
+ fi |
| 93 |
fi |
| 94 |
|
| 95 |
AC_SUBST(POLKIT_LIBS) |
Archives