Synthesized commit during git-svn import combining previous Mandriva history with Magiea.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r818 | dmorgan | 2011-04-04 00:30:37 +0100 (Mon, 04 Apr 2011) | 1 line

Add drakguard
------------------------------------------------------------------------

In addition to the above commits, the following cleaning work has been recorded:

- License is GPL according to the relevant rpm spec written by Mandriva
- bin/drakguard: replaced Mandriva by Mageia in "blocked by Mandriva parental control tool"
- Icons in data/icons will need to be replaced

1 files changed, 4 insertions, 2 deletions

diff --git a/bin/drakguard b/bin/drakguard
index 8d987a8..dfa7c3c 100755
--- a/bin/drakguard
+++ b/bin/drakguard
@@ -230,6 +230,8 @@ gtkadd($w->{window},
                                       })),
                                0, gtknew('Button', text => N("Add"), clicked => sub {
                                           my $text = $entry->get_text;
+		   			  my $exec;
+		   			  my $args;
 					  $text =~ s,^[^:]+://,,g; #- strip protocol
 					  if ($url_list->{tab_title} eq N("Block programs")) {
 					      $text =~ s,(\W?)$,,g; #- remove unknown caracters
@@ -242,7 +244,7 @@ gtkadd($w->{window},
 						  $locale = lc($locale->{country});
 						  my @system_name = grep { $_ && m/^GenericName(\[$locale\])?=(.*)\s*/g} chomp_(cat_($text));
 					          foreach (@exec_line){
-						      my ($exec, $text, $args) = /(^Exec=)(\w+)\s*(.*)/;
+						      ($exec, $text, $args) = /(^Exec=)(\w+)\s*(.*)/;
 						      if ($text eq ""){
 						          ($exec, $text, $args) = /(^Exec=)(.*+)\s*(.*)/;}
 					          }
@@ -649,7 +651,7 @@ sub read_program_user_list {
 sub apply_blacklist {
     my @addr = @_;
     my $blacklist_top = "/etc/dansguardian/lists/bannedsitelist";
-    my $blacklist_category = "blocked by Mandriva parental control tool";
+    my $blacklist_category = "blocked by Mageia parental control tool";
     output_p($blacklist_url_file, map { $_ . "\n" }
                qq(#listcategory: "$blacklist_category"), @addr);
     include_guardian_file($blacklist_top, $blacklist_url_file);