5 files changed, 61 insertions, 69 deletions

diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 415007b1ed88..d38d86a52c39 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/sysutils/system-tools-backends/Makefile,v 1.1 2009/04/16 08:56:17 kwm Exp $
+#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.54 2009/10/11 19:13:30 marcus Exp $
 #
 
 PORTNAME=	system-tools-backends
-PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTVERSION=	2.8.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,7 +17,7 @@ COMMENT=	Backend system admin scripts for gnome-system-tools
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		polkit-dbus.2:${PORTSDIR}/sysutils/policykit
+		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
 
 USE_BZIP2=	yes
diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo
index 43e2f1c0fc1b..d5b28d398ae7 100644
--- a/sysutils/system-tools-backends/distinfo
+++ b/sysutils/system-tools-backends/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/system-tools-backends-2.6.1.tar.bz2) = c82a9d305c3a1bf924bba6b1bced3e86
-SHA256 (gnome2/system-tools-backends-2.6.1.tar.bz2) = 7f56dd08cf5425218b697d5db82e6ce03aff4f7b57f58d3053f0a7af632b3747
-SIZE (gnome2/system-tools-backends-2.6.1.tar.bz2) = 441586
+MD5 (gnome2/system-tools-backends-2.8.2.tar.bz2) = 689c79b36d2929b264c29ff39db4b10b
+SHA256 (gnome2/system-tools-backends-2.8.2.tar.bz2) = bbbef8a0d160c6dfd44d60a5026a6c51ac97818d18febcf716e218983af4bf6c
+SIZE (gnome2/system-tools-backends-2.8.2.tar.bz2) = 458579
diff --git a/sysutils/system-tools-backends/files/patch-Users_Users.pm b/sysutils/system-tools-backends/files/patch-Users_Users.pm
index 5e2598972c24..909f28dff134 100644
--- a/sysutils/system-tools-backends/files/patch-Users_Users.pm
+++ b/sysutils/system-tools-backends/files/patch-Users_Users.pm
@@ -1,42 +1,42 @@
---- Users/Users.pm.orig	Thu Oct  5 09:27:21 2006
-+++ Users/Users.pm	Sun Apr 22 23:05:41 2007
-@@ -458,7 +458,7 @@
+--- Users/Users.pm.orig	2009-09-28 05:49:10.000000000 -0400
++++ Users/Users.pm	2009-10-11 15:09:31.000000000 -0400
+@@ -443,7 +443,7 @@ sub del_user
  	
    if ($Utils::Backend::tool{"system"} eq "FreeBSD")
    {
--    $command = "$cmd_pw userdel -n \'" . $$user[$LOGIN] . "\' ";
-+    $command = "$cmd_pw userdel -n \'" . $$user[$LOGIN] . "\' -r ";
+-    @command = ($cmd_pw, "userdel", "-n", $$user[$LOGIN]);
++    @command = ($cmd_pw, "userdel", "-n", $$user[$LOGIN], "-r");
    }
    else
    {
-@@ -538,10 +538,10 @@
-   {
+@@ -551,9 +551,7 @@ sub add_user
      my $pwdpipe;
      my $home;
-+    my $user;
  
 -    # FreeBSD doesn't create the home directory
      $home = $$user[$HOME];
--    &Utils::File::run ("$tool_mkdir -p $home");
-+    $user = $$user[$LOGIN];
+-    &Utils::File::run ($tool_mkdir, "-p", $home);
  
      $command = "$cmd_pw useradd " .
          " -n \'" . $$user[$LOGIN] . "\'" .
-@@ -549,11 +549,12 @@
+@@ -561,7 +559,7 @@ sub add_user
          " -d \'" . $$user[$HOME]  . "\'" .
          " -g \'" . $$user[$GID]   . "\'" .
          " -s \'" . $$user[$SHELL] . "\'" .
 -        " -H 0"; # pw(8) reads password from STDIN
 +        " -m -h 0"; # pw(8) reads password from STDIN
  
+ #    @command = ($cmd_pw, "useradd", "-n", $$user[$LOGIN],
+ #                                    "-u", $$user[$UID],
+@@ -573,6 +571,7 @@ sub add_user
      $pwdpipe = &Utils::File::run_pipe_write ($command);
      print $pwdpipe $$user[$PASSWD];
      &Utils::File::close_file ($pwdpipe);
-+    &Utils::File::run ("chown -R $user $home");
++    &Utils::File::run ("chown -R " . $$user[$LOGIN] . " $home");
    }
    elsif ($Utils::Backend::tool{"system"} eq "SunOS")
    {
-@@ -629,7 +630,7 @@
+@@ -651,7 +650,7 @@ sub change_user
          " -d \'" . $$new_user[$HOME]  . "\'" .
          " -g \'" . $$new_user[$GID]   . "\'" .
          " -s \'" . $$new_user[$SHELL] . "\'" .
diff --git a/sysutils/system-tools-backends/files/patch-policykit b/sysutils/system-tools-backends/files/patch-policykit
deleted file mode 100644
index aaac9aa69979..000000000000
--- a/sysutils/system-tools-backends/files/patch-policykit
+++ /dev/null
@@ -1,46 +0,0 @@
-Allow root to send messages to all the system tools backends, so they 
-work even when CVE-2008-4311 has been fixed.
-    
-Also disallow normal user access by destination, not by interface (fd.o 
-#18961).
-
-Original patch by Simon McVittie, updated for the PolicyKit version by 
-Josselin Mouette with advice from Colin Walters.
-
-Index: system-tools-backends-2.6.0/system-tools-backends.conf
-===================================================================
---- system-tools-backends.conf	2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends.conf	2009-03-11 22:21:09.145371060 +0100
-@@ -22,11 +22,7 @@
-     <allow send_interface="org.freedesktop.SystemToolsBackends.Platform" send_member="getPlatform"/>
-     -->
- 
--    <!-- configuration modules can't be accessed directly... -->
--    <deny send_interface="org.freedesktop.SystemToolsBackends"/>
--    <deny send_interface="org.freedesktop.SystemToolsBackends.Platform"/>
--
--    <!-- ...so petitions go through the dispatcher instead -->
-+    <!-- Only allow talking to the dispatcher -->
-     <allow send_destination="org.freedesktop.SystemToolsBackends"/>
-   </policy>
- 
-@@ -49,7 +45,17 @@
- 
-     <!-- be able to speak to configuration modules,
-          so any message to them has to go through the dispatcher -->
--    <allow send_interface="org.freedesktop.SystemToolsBackends"/>
--    <allow send_interface="org.freedesktop.SystemToolsBackends.Platform"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.Platform"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.GroupsConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.HostsConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.IfacesConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.NFSConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.NTPConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.ServicesConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.SMBConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.TimeConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.UserConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.UsersConfig"/>
-   </policy>
- </busconfig>
diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist
index 26aca35ca483..b300daf2d77c 100644
--- a/sysutils/system-tools-backends/pkg-plist
+++ b/sysutils/system-tools-backends/pkg-plist
@@ -1,7 +1,6 @@
-bin/system-tools-backends
-etc/dbus-1/system.d/system-tools-backends.conf
+etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf
+sbin/system-tools-backends
 libdata/pkgconfig/system-tools-backends-2.0.pc
-share/PolicyKit/policy/system-tools-backends.policy
 share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupsConfig.service
 share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.HostsConfig.service
 share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.IfacesConfig.service
@@ -14,23 +13,47 @@ share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.TimeConfig.serv
 share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UserConfig.service
 share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UsersConfig.service
 share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.service
+share/locale/ar/LC_MESSAGES/system-tools-backends.mo
 share/locale/bg/LC_MESSAGES/system-tools-backends.mo
+share/locale/bn_IN/LC_MESSAGES/system-tools-backends.mo
 share/locale/ca/LC_MESSAGES/system-tools-backends.mo
+share/locale/cs/LC_MESSAGES/system-tools-backends.mo
 share/locale/da/LC_MESSAGES/system-tools-backends.mo
 share/locale/de/LC_MESSAGES/system-tools-backends.mo
 share/locale/el/LC_MESSAGES/system-tools-backends.mo
+share/locale/en_GB/LC_MESSAGES/system-tools-backends.mo
 share/locale/es/LC_MESSAGES/system-tools-backends.mo
+share/locale/et/LC_MESSAGES/system-tools-backends.mo
+share/locale/eu/LC_MESSAGES/system-tools-backends.mo
 share/locale/fi/LC_MESSAGES/system-tools-backends.mo
 share/locale/fr/LC_MESSAGES/system-tools-backends.mo
+share/locale/gl/LC_MESSAGES/system-tools-backends.mo
+share/locale/gu/LC_MESSAGES/system-tools-backends.mo
 share/locale/he/LC_MESSAGES/system-tools-backends.mo
+share/locale/hi/LC_MESSAGES/system-tools-backends.mo
 share/locale/hu/LC_MESSAGES/system-tools-backends.mo
 share/locale/it/LC_MESSAGES/system-tools-backends.mo
+share/locale/ja/LC_MESSAGES/system-tools-backends.mo
+share/locale/kn/LC_MESSAGES/system-tools-backends.mo
+share/locale/or/LC_MESSAGES/system-tools-backends.mo
+share/locale/pa/LC_MESSAGES/system-tools-backends.mo
 share/locale/pl/LC_MESSAGES/system-tools-backends.mo
+share/locale/pt/LC_MESSAGES/system-tools-backends.mo
 share/locale/pt_BR/LC_MESSAGES/system-tools-backends.mo
 share/locale/ro/LC_MESSAGES/system-tools-backends.mo
 share/locale/sl/LC_MESSAGES/system-tools-backends.mo
+share/locale/sr/LC_MESSAGES/system-tools-backends.mo
+share/locale/sr@latin/LC_MESSAGES/system-tools-backends.mo
 share/locale/sv/LC_MESSAGES/system-tools-backends.mo
+share/locale/ta/LC_MESSAGES/system-tools-backends.mo
+share/locale/te/LC_MESSAGES/system-tools-backends.mo
+share/locale/th/LC_MESSAGES/system-tools-backends.mo
+share/locale/tr/LC_MESSAGES/system-tools-backends.mo
+share/locale/uk/LC_MESSAGES/system-tools-backends.mo
 share/locale/zh_CN/LC_MESSAGES/system-tools-backends.mo
+share/locale/zh_HK/LC_MESSAGES/system-tools-backends.mo
+share/locale/zh_TW/LC_MESSAGES/system-tools-backends.mo
+share/polkit-1/actions/org.freedesktop.SystemToolsBackends.policy
 share/system-tools-backends-2.0/files/general_gprs_chatscript
 share/system-tools-backends-2.0/files/general_isdn_ppp_options
 share/system-tools-backends-2.0/files/general_pppoe_ppp_options
@@ -77,17 +100,33 @@ share/system-tools-backends-2.0/scripts/Utils/XML.pm
 @dirrm share/system-tools-backends-2.0/scripts
 @dirrm share/system-tools-backends-2.0/files
 @dirrm share/system-tools-backends-2.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/zh_CN/LC_MESSAGES
 @dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/sl/LC_MESSAGES
 @dirrmtry share/locale/sl
 @dirrmtry share/locale/ro/LC_MESSAGES
 @dirrmtry share/locale/ro
 @dirrmtry share/locale/pl/LC_MESSAGES
 @dirrmtry share/locale/pl
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
 @dirrmtry share/locale/fi/LC_MESSAGES
 @dirrmtry share/locale/fi
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN