Geändert:

  * URL-Filter gefixt.
  * Überblendungen sind an- und ausschaltbar.
  * GLIB in ISO für MC.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@188 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/urlfilter/autoupdate.pl b/config/urlfilter/autoupdate.pl
index 9e61b44c4317a1c072eca2c404178cf690c363f9..f9af67edfc674a83ba3734c7bf0252027ee18160 100644 (file)
--- a/config/urlfilter/autoupdate.pl
+++ b/config/urlfilter/autoupdate.pl
@@ -172,351 +172,3 @@ sub readhash
 }
 
 # -------------------------------------------------------------------
-#!/usr/bin/perl
-
-#
-# $Id: autoupdate.pl,v 1.0 2005/06/15 00:00:00 marco Exp $
-#
-use strict;
-
-my $make_clean = 1;
-
-my $swroot = "/var/ipfire";
-my $target = "$swroot/urlfilter/download";
-my $dbdir  = "$swroot/urlfilter/blacklists";
-
-my $sourceurlfile = "$swroot/urlfilter/autoupdate/autoupdate.urls";
-my $updconffile = "$swroot/urlfilter/autoupdate/autoupdate.conf";
-my $updflagfile = "$swroot/urlfilter/blacklists/.autoupdate.last";
-
-my %cgiparams;
-my %updatesettings;
-my $blacklist_url;
-my $blacklist_src;
-my $source_url;
-my $source_name;
-my @source_urllist;
-
-my $blacklist;
-my $category;
-
-my $exitcode = 1;
-
-if (-e "$sourceurlfile")
-{
-       open(FILE, $sourceurlfile);
-       @source_urllist = <FILE>;
-       close(FILE);
-}
-
-if (-e "$updconffile") { &readhash("$updconffile", \%updatesettings); }
-
-if (@ARGV[0] =~ m@^(f|h)tt?ps?://@) { $updatesettings{'UPDATE_SOURCE'} = @ARGV[0]; }
-
-if ($updatesettings{'UPDATE_SOURCE'} eq 'custom')
-{
-       $blacklist_url=$updatesettings{'CUSTOM_UPDATE_URL'};
-} else {
-       $blacklist_url=$updatesettings{'UPDATE_SOURCE'};
-       foreach (@source_urllist)
-       {
-               chomp;
-               $source_name = substr($_,0,rindex($_,","));
-               $source_url = substr($_,index($_,",")+1);
-               if ($blacklist_url eq $source_url) { $blacklist_src=$source_name; }
-       }
-}
-
-if ($blacklist_src eq '') { $blacklist_src="custom source URL"; }
-
-$blacklist_url =~ s/\&/\\\&/;
-
-$blacklist=substr($blacklist_url,rindex($blacklist_url,"/")+1);
-if (($blacklist =~ /\?/) || (!($blacklist =~ /\.t(ar\.)?gz$/))) { $blacklist = 'blacklist.tar.gz'; }
-$blacklist=$target.'/'.$blacklist;
-
-unless ($blacklist_url eq '')
-{
-
-       if (-d $target) { system("rm -rf $target"); }
-       system("mkdir $target");
-
-       system("/usr/bin/wget -o $target/wget.log -O $blacklist $blacklist_url");
-
-       if (-e $blacklist)
-       {
-               system("/bin/tar --no-same-owner -xzf $blacklist -C $target");
-               if (-d "$target/blacklists")
-               {
-                       open(FILE, ">$target/update.conf");
-                       flock FILE, 2;
-                       print FILE "logdir $target\n";
-                       print FILE "dbhome $target/blacklists\n\n";
-
-                       foreach (<$target/blacklists/*>)
-                       {
-                               if ((-d $_) && ((-s "$_/domains") || (-s "$_/urls")))
-                               {
-                                       $category=substr($_,rindex($_,"/")+1);
-                                       print FILE "dest $category {\n";
-                                       if (-s "$_/domains") { print FILE "    domainlist  $category/domains\n"; }
-                                       if (-s "$_/urls")    { print FILE "    urllist     $category/urls\n"; }
-                                       print FILE "}\n\n";
-                               }
-                       }
-                       print FILE "acl {\n";
-                       print FILE "    default {\n";
-                       print FILE "        pass none\n";
-                       print FILE "    }\n";
-                       print FILE "}\n";
-                       close FILE;
-
-                       system("/usr/sbin/squidGuard -d -c $target/update.conf -C all");
-
-                       system("cp -r $target/blacklists/* $dbdir");
-
-                       system("chown -R nobody.nobody $dbdir");
-
-                       foreach $category (<$dbdir/*>)
-                       {
-                               if (-d $category)
-                               {
-                                       system("chmod 755 $category &> /dev/null");
-                                       foreach $blacklist (<$category/*>)
-                                       {
-                                               if (-f $blacklist){ system("chmod 644 $blacklist &> /dev/null"); }
-                                               if (-d $blacklist){ system("chmod 755 $blacklist &> /dev/null"); }
-                                       }
-                                       system("chmod 666 $category/*.db &> /dev/null");
-                               }
-                       }
-
-                       system("touch $updflagfile");
-                       system("chown nobody.nobody $updflagfile");
-
-                       system("/usr/local/bin/restartsquid");
-
-                       system("logger -t installpackage[urlfilter] \"URL filter blacklist - Update from $blacklist_src completed\"");
-
-                       $exitcode = 0;
-
-               } else {
-                       system("logger -t installpackage[urlfilter] \"URL filter blacklist - ERROR: Not a valid URL filter blacklist\"");
-               }
-       } else {
-               system("logger -t installpackage[urlfilter] \"URL filter blacklist - ERROR: Unable to retrieve blacklist from $blacklist_src\"");
-       }
-
-} else {
-       system("logger -t installpackage[urlfilter] \"URL filter blacklist - ERROR: No update source defined\"");
-}
-
-if ((-d $target) && ($make_clean)) { system("rm -rf $target"); }
-
-exit $exitcode;
-
-# -------------------------------------------------------------------
-
-sub readhash
-{
-       my $filename = $_[0];
-       my $hash = $_[1];
-       my ($var, $val);
-
-       if (-e $filename)
-       {
-               open(FILE, $filename) or die "Unable to read file $filename";
-               while (<FILE>)
-               {
-                       chop;
-                       ($var, $val) = split /=/, $_, 2;
-                       if ($var)
-                       {
-                               $val =~ s/^\'//g;
-                               $val =~ s/\'$//g;
-       
-                               # Untaint variables read from hash
-                               $var =~ /([A-Za-z0-9_-]*)/;        $var = $1;
-                               $val =~ /([\w\W]*)/; $val = $1;
-                               $hash->{$var} = $val;
-                       }
-               }
-               close FILE;
-       }
-}
-
-# -------------------------------------------------------------------
-#!/usr/bin/perl
-
-#
-# $Id: autoupdate.pl,v 1.0 2005/06/15 00:00:00 marco Exp $
-#
-use strict;
-
-my $make_clean = 1;
-
-my $swroot = "/var/ipfire";
-my $target = "$swroot/urlfilter/download";
-my $dbdir  = "$swroot/urlfilter/blacklists";
-
-my $sourceurlfile = "$swroot/urlfilter/autoupdate/autoupdate.urls";
-my $updconffile = "$swroot/urlfilter/autoupdate/autoupdate.conf";
-my $updflagfile = "$swroot/urlfilter/blacklists/.autoupdate.last";
-
-my %cgiparams;
-my %updatesettings;
-my $blacklist_url;
-my $blacklist_src;
-my $source_url;
-my $source_name;
-my @source_urllist;
-
-my $blacklist;
-my $category;
-
-my $exitcode = 1;
-
-if (-e "$sourceurlfile")
-{
-       open(FILE, $sourceurlfile);
-       @source_urllist = <FILE>;
-       close(FILE);
-}
-
-if (-e "$updconffile") { &readhash("$updconffile", \%updatesettings); }
-
-if (@ARGV[0] =~ m@^(f|h)tt?ps?://@) { $updatesettings{'UPDATE_SOURCE'} = @ARGV[0]; }
-
-if ($updatesettings{'UPDATE_SOURCE'} eq 'custom')
-{
-       $blacklist_url=$updatesettings{'CUSTOM_UPDATE_URL'};
-} else {
-       $blacklist_url=$updatesettings{'UPDATE_SOURCE'};
-       foreach (@source_urllist)
-       {
-               chomp;
-               $source_name = substr($_,0,rindex($_,","));
-               $source_url = substr($_,index($_,",")+1);
-               if ($blacklist_url eq $source_url) { $blacklist_src=$source_name; }
-       }
-}
-
-if ($blacklist_src eq '') { $blacklist_src="custom source URL"; }
-
-$blacklist_url =~ s/\&/\\\&/;
-
-$blacklist=substr($blacklist_url,rindex($blacklist_url,"/")+1);
-if (($blacklist =~ /\?/) || (!($blacklist =~ /\.t(ar\.)?gz$/))) { $blacklist = 'blacklist.tar.gz'; }
-$blacklist=$target.'/'.$blacklist;
-
-unless ($blacklist_url eq '')
-{
-
-       if (-d $target) { system("rm -rf $target"); }
-       system("mkdir $target");
-
-       system("/usr/bin/wget -o $target/wget.log -O $blacklist $blacklist_url");
-
-       if (-e $blacklist)
-       {
-               system("/bin/tar --no-same-owner -xzf $blacklist -C $target");
-               if (-d "$target/blacklists")
-               {
-                       open(FILE, ">$target/update.conf");
-                       flock FILE, 2;
-                       print FILE "logdir $target\n";
-                       print FILE "dbhome $target/blacklists\n\n";
-
-                       foreach (<$target/blacklists/*>)
-                       {
-                               if ((-d $_) && ((-s "$_/domains") || (-s "$_/urls")))
-                               {
-                                       $category=substr($_,rindex($_,"/")+1);
-                                       print FILE "dest $category {\n";
-                                       if (-s "$_/domains") { print FILE "    domainlist  $category/domains\n"; }
-                                       if (-s "$_/urls")    { print FILE "    urllist     $category/urls\n"; }
-                                       print FILE "}\n\n";
-                               }
-                       }
-                       print FILE "acl {\n";
-                       print FILE "    default {\n";
-                       print FILE "        pass none\n";
-                       print FILE "    }\n";
-                       print FILE "}\n";
-                       close FILE;
-
-                       system("/usr/sbin/squidGuard -d -c $target/update.conf -C all");
-
-                       system("cp -r $target/blacklists/* $dbdir");
-
-                       system("chown -R nobody.nobody $dbdir");
-
-                       foreach $category (<$dbdir/*>)
-                       {
-                               if (-d $category)
-                               {
-                                       system("chmod 755 $category &> /dev/null");
-                                       foreach $blacklist (<$category/*>)
-                                       {
-                                               if (-f $blacklist){ system("chmod 644 $blacklist &> /dev/null"); }
-                                               if (-d $blacklist){ system("chmod 755 $blacklist &> /dev/null"); }
-                                       }
-                                       system("chmod 666 $category/*.db &> /dev/null");
-                               }
-                       }
-
-                       system("touch $updflagfile");
-                       system("chown nobody.nobody $updflagfile");
-
-                       system("/usr/local/bin/restartsquid");
-
-                       system("logger -t installpackage[urlfilter] \"URL filter blacklist - Update from $blacklist_src completed\"");
-
-                       $exitcode = 0;
-
-               } else {
-                       system("logger -t installpackage[urlfilter] \"URL filter blacklist - ERROR: Not a valid URL filter blacklist\"");
-               }
-       } else {
-               system("logger -t installpackage[urlfilter] \"URL filter blacklist - ERROR: Unable to retrieve blacklist from $blacklist_src\"");
-       }
-
-} else {
-       system("logger -t installpackage[urlfilter] \"URL filter blacklist - ERROR: No update source defined\"");
-}
-
-if ((-d $target) && ($make_clean)) { system("rm -rf $target"); }
-
-exit $exitcode;
-
-# -------------------------------------------------------------------
-
-sub readhash
-{
-       my $filename = $_[0];
-       my $hash = $_[1];
-       my ($var, $val);
-
-       if (-e $filename)
-       {
-               open(FILE, $filename) or die "Unable to read file $filename";
-               while (<FILE>)
-               {
-                       chop;
-                       ($var, $val) = split /=/, $_, 2;
-                       if ($var)
-                       {
-                               $val =~ s/^\'//g;
-                               $val =~ s/\'$//g;
-       
-                               # Untaint variables read from hash
-                               $var =~ /([A-Za-z0-9_-]*)/;        $var = $1;
-                               $val =~ /([\w\W]*)/; $val = $1;
-                               $hash->{$var} = $val;
-                       }
-               }
-               close FILE;
-       }
-}
-
-# -------------------------------------------------------------------

diff --git a/config/urlfilter/autoupdate.urls b/config/urlfilter/autoupdate.urls
index 925465985af698ab3833ddedc67529061bf96f50..33b62d56504432fbcdf1b0bbe3b435812b4d30f1 100644 (file)
--- a/config/urlfilter/autoupdate.urls
+++ b/config/urlfilter/autoupdate.urls
@@ -1,9 +1,3 @@
 squidGuard,http://ftp.teledanmark.no/pub/www/proxy/squidGuard/contrib/blacklists.tar.gz
 MESD,http://squidguard.mesd.k12.or.us/blacklists.tgz
 Univ. Toulouse,ftp://ftp.univ-tlse1.fr/pub/reseau/cache/squidguard_contrib/blacklists.tar.gz
-squidGuard,http://ftp.teledanmark.no/pub/www/proxy/squidGuard/contrib/blacklists.tar.gz
-MESD,http://squidguard.mesd.k12.or.us/blacklists.tgz
-Univ. Toulouse,ftp://ftp.univ-tlse1.fr/pub/reseau/cache/squidguard_contrib/blacklists.tar.gz
-squidGuard,http://ftp.teledanmark.no/pub/www/proxy/squidGuard/contrib/blacklists.tar.gz
-MESD,http://squidguard.mesd.k12.or.us/blacklists.tgz
-Univ. Toulouse,ftp://ftp.univ-tlse1.fr/pub/reseau/cache/squidguard_contrib/blacklists.tar.gz

diff --git a/config/urlfilter/prebuild.pl b/config/urlfilter/prebuild.pl
index 87b9e721acd927a176fe160459fd902cc1fbdd58..b95ca895d9c201820f3552641b7e25d996bc41d4 100644 (file)
--- a/config/urlfilter/prebuild.pl
+++ b/config/urlfilter/prebuild.pl
@@ -30,67 +30,3 @@ foreach $category (<$dbdir/*>)
                system("chmod 666 $category/*.db &> /dev/null");
         }
 }
-#!/usr/bin/perl
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) written from scratch
-#
-# $Id: prebuild.pl,v 0.3 2005/04/16 00:00:00 marco Exp $
-#
-
-$dbdir="/var/ipfire/urlfilter/blacklists";
-
-system("/usr/bin/squidGuard -C all");
-
-if (-e "$dbdir/custom/allowed/domains.db") { unlink("$dbdir/custom/allowed/domains.db"); }
-if (-e "$dbdir/custom/allowed/urls.db")    { unlink("$dbdir/custom/allowed/urls.db"); }
-if (-e "$dbdir/custom/blocked/domains.db") { unlink("$dbdir/custom/blocked/domains.db"); }
-if (-e "$dbdir/custom/blocked/urls.db")    { unlink("$dbdir/custom/blocked/urls.db"); }
-
-system("chown -R nobody.nobody $dbdir");
-
-foreach $category (<$dbdir/*>)
-{
-         if (-d $category){
-               system("chmod 755 $category &> /dev/null");
-               foreach $blacklist (<$category/*>)
-               {
-                       if (-f $blacklist){ system("chmod 644 $blacklist &> /dev/null"); }
-                       if (-d $blacklist){ system("chmod 755 $blacklist &> /dev/null"); }
-               }
-               system("chmod 666 $category/*.db &> /dev/null");
-        }
-}
-#!/usr/bin/perl
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) written from scratch
-#
-# $Id: prebuild.pl,v 0.3 2005/04/16 00:00:00 marco Exp $
-#
-
-$dbdir="/var/ipfire/urlfilter/blacklists";
-
-system("/usr/bin/squidGuard -C all");
-
-if (-e "$dbdir/custom/allowed/domains.db") { unlink("$dbdir/custom/allowed/domains.db"); }
-if (-e "$dbdir/custom/allowed/urls.db")    { unlink("$dbdir/custom/allowed/urls.db"); }
-if (-e "$dbdir/custom/blocked/domains.db") { unlink("$dbdir/custom/blocked/domains.db"); }
-if (-e "$dbdir/custom/blocked/urls.db")    { unlink("$dbdir/custom/blocked/urls.db"); }
-
-system("chown -R nobody.nobody $dbdir");
-
-foreach $category (<$dbdir/*>)
-{
-         if (-d $category){
-               system("chmod 755 $category &> /dev/null");
-               foreach $blacklist (<$category/*>)
-               {
-                       if (-f $blacklist){ system("chmod 644 $blacklist &> /dev/null"); }
-                       if (-d $blacklist){ system("chmod 755 $blacklist &> /dev/null"); }
-               }
-               system("chmod 666 $category/*.db &> /dev/null");
-        }
-}

diff --git a/config/urlfilter/squidGuard.conf b/config/urlfilter/squidGuard.conf
index 22454f55fd1de9070fccdfe0693c104c39ecf4a6..0232eadb8c4c6c96db733f2831d2fd69f85ac943 100644 (file)
--- a/config/urlfilter/squidGuard.conf
+++ b/config/urlfilter/squidGuard.conf
@@ -1,24 +1,8 @@
-logdir /var/log/squidGuard\r
-dbhome /var/ipfire/urlfilter/blacklists\r
-\r
-acl {\r
-    default {\r
-        pass all\r
-    }\r
-}\r
-logdir /var/log/squidGuard\r
-dbhome /var/ipfire/urlfilter/blacklists\r
-\r
-acl {\r
-    default {\r
-        pass all\r
-    }\r
-}\r
-logdir /var/log/squidGuard\r
-dbhome /var/ipfire/urlfilter/blacklists\r
-\r
-acl {\r
-    default {\r
-        pass all\r
-    }\r
-}\r
+logdir /var/log/squidGuard
+dbhome /var/ipfire/urlfilter/blacklists
+
+acl {
+    default {
+        pass all
+    }
+}

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 3cfdc4ca7b428760694f506752545ba3ad176929..fdfda37ab34e039e3e27b02ee0c21e7603b45847 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -29,7 +29,6 @@
   * Text-Tabs+Wrap-2005.0824
   * URI-1.35
   * Unix-Syslog-0.100
-  * amavisd-new-2.4.1
   * amedyn-2004-08-04
   * apache_1.3.34
   * applejuice-0.30
@@ -94,7 +93,6 @@
   * gdbm-1.8.3
   * gettext-0.14.1
   * glib-2.9.6
-  * glib-2.9.6_old
   * glibc-2.3.3-lfs-5.1
   * gmp-4.1.2
   * gnump3d-2.9.8
@@ -184,7 +182,6 @@
   * popt-1.7
   * portmap_5beta
   * postfix-2.2.10
-  * postfix-2.2.10_old
   * ppp-2.4.2
   * pptp-1.6.0
   * procinfo-18

diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi
index 6d7c1010e739c7413e62798d7f052eecc867c174..6e2bfbc8c2f08c630e8783116ac7cf5c33088fe3 100644 (file)
--- a/html/cgi-bin/gui.cgi
+++ b/html/cgi-bin/gui.cgi
@@ -25,7 +25,7 @@ my %checked=();
 my $errormessage='';
 
 
-$cgiparams{'JAVASCRIPT'} = 'off';
+$cgiparams{'FX'} = 'off';
 $cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
 $cgiparams{'REFRESHINDEX'} = 'off';
 $cgiparams{'ACTION'} = '';
@@ -76,6 +76,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
        $mainsettings{'LANGUAGE'} = $cgiparams{'lang'};
        $mainsettings{'WINDOWWITHHOSTNAME'} = $cgiparams{'WINDOWWITHHOSTNAME'};
        $mainsettings{'PPPUPDOWNBEEP'} = $cgiparams{'PPPUPDOWNBEEP'};
+       $mainsettings{'FX'} = $cgiparams{'FX'};
        $mainsettings{'REFRESHINDEX'} = $cgiparams{'REFRESHINDEX'};
        &General::writehash("${General::swroot}/main/settings", \%mainsettings);
        &Lang::reload($cgiparams{'lang'});
@@ -93,6 +94,12 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
                $cgiparams{'PPPUPDOWNBEEP'} = 'on';
        }
 
+       if ($mainsettings{'FX'}) {
+               $cgiparams{'FX'} = $mainsettings{'FX'};
+       } else {
+               $cgiparams{'FX'} = 'on';
+       }
+
        if($mainsettings{'REFRESHINDEX'}) {
                $cgiparams{'REFRESHINDEX'} = $mainsettings{'REFRESHINDEX'};
        } else {
@@ -106,6 +113,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'restore defaults'}")
        $cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
        $cgiparams{'PPPUPDOWNBEEP'} = 'on';
        $cgiparams{'REFRESHINDEX'} = 'off';
+       $cgiparams{'FX'} = 'on';
 }
 
 $checked{'WINDOWWITHHOSTNAME'}{'off'} = '';
@@ -120,6 +128,10 @@ $checked{'REFRESHINDEX'}{'off'} = '';
 $checked{'REFRESHINDEX'}{'on'} = '';
 $checked{'REFRESHINDEX'}{$cgiparams{'REFRESHINDEX'}} = "checked='checked'";
 
+$checked{'FX'}{'off'} = '';
+$checked{'FX'}{'on'} = '';
+$checked{'FX'}{$cgiparams{'FX'}} = "checked='checked'";
+
 &Header::openpage($Lang::tr{'gui settings'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
@@ -137,6 +149,10 @@ print <<END
 <tr>
     <td colspan='2'><p><b>$Lang::tr{'display'}</b></td>
 </tr>
+<tr>
+    <td><input type='checkbox' name='FX' $checked{'FX'}{'on'} /></td>
+    <td>$Lang::tr{'display webinterface effects'}</td>
+</tr>
 <tr>
     <td><input type='checkbox' name='WINDOWWITHHOSTNAME' $checked{'WINDOWWITHHOSTNAME'}{'on'} /></td>
     <td>$Lang::tr{'display hostname in window title'}</td>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 41fef851cf4fa18a3c61b714e0594b4d63ef7131..74636dc546ef74e7097a4e8ecb6686cd6cd7fd23 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1474,6 +1474,7 @@
 'urlfilter export error' => 'Kann Exportdatei nicht erstellen',
 'urlfilter update notification' => 'Update-Benachrichtigung!',
 'urlfilter update information' => 'Eine aktualisierte Version steht zum Download bereit. Besuchen Sie <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> für weitere Informationen.',
+'display webinterface effects' => 'Überblendeffekte einschalten',
 
 ); 
 

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 64f1566abe94ad95a5fc545580e15704618eff9f..d740d95c39343afb295fe760651799ae0c44cbeb 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1507,5 +1507,6 @@
 'urlfilter export error' => 'Unable to create export file',
 'urlfilter update notification' => 'Update notification!',
 'urlfilter update information' => 'There is an updated version available for download. Visit <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> for more information.',
+'display webinterface effects' => 'Activate effects',
 
 );

diff --git a/lfs/squid b/lfs/squid
index 609a41977c05705601ab9030f6c8246fe37dc048..cbae8e03908a87f83a954d5a86976808cc4bfd96 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -103,27 +103,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        touch /var/log/squid/access.log
        chown -R squid:squid /var/log/squid /var/log/cache
 
-       # URL-Filter
-       -mkdir /etc/squidGuard /home/httpd/html/repository
-       cp -f  $(DIR_CONF)/urlfilter/autoupdate.urls /var/ipfire/urlfilter/autoupdate/autoupdate.urls
-       ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.daily
-       ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.weekly
-       ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.monthly
-       cp -f  $(DIR_CONF)/urlfilter/squidGuard.conf /var/ipfire/urlfilter/squidGuard.conf
-       ln -fs /var/ipfire/urlfilter/squidGuard.conf /etc/squidGuard/squidGuard.conf
-       cp -f  $(DIR_CONF)/urlfilter/prebuild.pl /var/ipfire/urlfilter/bin/prebuild.pl
-       chmod 755 /var/ipfire/urlfilter/bin/prebuild.pl
-       cp -f  $(DIR_CONF)/urlfilter/autoupdate.pl /var/ipfire/urlfilter/bin/autoupdate.pl
-       chmod 755 /var/ipfire/urlfilter/bin/autoupdate.pl
-       echo "1.7.1" > /var/ipfire/urlfilter/version
-
-       /bin/tar --no-same-owner -xzf $(DIR_CONF)/urlfilter/blacklists.tar.gz -C /var/ipfire/urlfilter
-       /usr/bin/perl $(DIR_CONF)/urlfilter/makeconf.pl
-       chown -R nobody:nobody /var/ipfire/urlfilter
-       chown -R nobody:nobody /home/httpd/html/images/urlfilter
-       chown -R nobody:nobody /home/httpd/html/repository
-       touch /var/log/squidGuard
-       chown -R squid:squid /var/log/squidGuard
-
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/squidguard b/lfs/squidguard
index e54623bed16b75618c2e04c8ba5c8a0c9007df0d..9f24478f90b1c7c8b297944f5aa05902416b685f 100644 (file)
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -76,9 +76,31 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share \
                --sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man  \
                --with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \
-               --with-sg-logdir=/var/log/squidguard --with-sg-dbhome=/var/lib/squidguard \
+               --with-sg-logdir=/var/log/squidGuard --with-sg-dbhome=/var/lib/squidguard \
                --with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
+
+       # URL-Filter
+       -mkdir /etc/squidGuard /home/httpd/html/repository
+       cp -f  $(DIR_CONF)/urlfilter/autoupdate.urls /var/ipfire/urlfilter/autoupdate/autoupdate.urls
+       ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.daily
+       ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.weekly
+       ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.monthly
+       cp -f  $(DIR_CONF)/urlfilter/squidGuard.conf /var/ipfire/urlfilter/squidGuard.conf
+       ln -fs /var/ipfire/urlfilter/squidGuard.conf /etc/squidGuard/squidGuard.conf
+       cp -f  $(DIR_CONF)/urlfilter/prebuild.pl /var/ipfire/urlfilter/bin/prebuild.pl
+       chmod 755 /var/ipfire/urlfilter/bin/prebuild.pl
+       cp -f  $(DIR_CONF)/urlfilter/autoupdate.pl /var/ipfire/urlfilter/bin/autoupdate.pl
+       chmod 755 /var/ipfire/urlfilter/bin/autoupdate.pl
+       echo "1.7.1" > /var/ipfire/urlfilter/version
+
+       /bin/tar --no-same-owner -xzf $(DIR_CONF)/urlfilter/blacklists.tar.gz -C /var/ipfire/urlfilter
+       /usr/bin/perl $(DIR_CONF)/urlfilter/makeconf.pl
+       chown -R nobody:nobody /var/ipfire/urlfilter
+       chown -R nobody:nobody /home/httpd/html/images/urlfilter
+       chown -R nobody:nobody /home/httpd/html/repository
+       chown -R squid:squid /var/log/squidGuard
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 7da8d788ae60e2ecd8647ba58e436e6ad1878596..ddb40c87c0daef4892f403b89cdb9cebe6752bec 100644 (file)
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -21023,6 +21023,11 @@ home/httpd/cgi-bin/logs.cgi/ids.dat
 home/httpd/cgi-bin/logs.cgi/log.dat
 home/httpd/cgi-bin/logs.cgi/proxylog.dat
 home/httpd/cgi-bin/logs.cgi/summary.dat
+home/httpd/cgi-bin/logs.cgi/urlfilter.dat
+#home/httpd/cgi-bin/asterisk.cgi
+home/httpd/cgi-bin/asterisk.cgi/calls
+home/httpd/cgi-bin/asterisk.cgi/conf
+home/httpd/cgi-bin/asterisk.cgi/status
 home/httpd/cgi-bin/modem.cgi
 home/httpd/cgi-bin/netstatus.cgi
 #home/httpd/cgi-bin/networks.cgi
@@ -21032,6 +21037,7 @@ home/httpd/cgi-bin/pppsetup.cgi
 #home/httpd/cgi-bin/printenv
 home/httpd/cgi-bin/proxy.cgi
 home/httpd/cgi-bin/proxygraphs.cgi
+home/httpd/cgi-bin/redirect.cgi
 home/httpd/cgi-bin/remote.cgi
 #home/httpd/cgi-bin/services.cgi
 home/httpd/cgi-bin/shaping.cgi
@@ -21041,6 +21047,7 @@ home/httpd/cgi-bin/status.cgi
 home/httpd/cgi-bin/time.cgi
 #home/httpd/cgi-bin/updates.cgi
 home/httpd/cgi-bin/upload.cgi
+home/httpd/cgi-bin/urlfilter.cgi
 home/httpd/cgi-bin/vpnmain.cgi
 home/httpd/cgi-bin/webaccess.cgi
 home/httpd/cgi-bin/wireless.cgi
@@ -27138,4 +27145,429 @@ usr/share/mc/syntax/syntax.syntax
 usr/share/mc/syntax/tcl.syntax
 usr/share/mc/syntax/texinfo.syntax
 usr/share/mc/syntax/unknown.syntax
-usr/share/mc/syntax/xml.syntax
\ No newline at end of file
+usr/share/mc/syntax/xml.syntax
+usr/bin/glib-genmarshal
+usr/bin/glib-gettextize
+usr/bin/glib-mkenums
+usr/bin/gobject-query
+#usr/include/glib-2.0
+#usr/include/glib-2.0/glib
+#usr/include/glib-2.0/glib-object.h
+#usr/include/glib-2.0/glib.h
+#usr/include/glib-2.0/glib/galloca.h
+#usr/include/glib-2.0/glib/garray.h
+#usr/include/glib-2.0/glib/gasyncqueue.h
+#usr/include/glib-2.0/glib/gatomic.h
+#usr/include/glib-2.0/glib/gbacktrace.h
+#usr/include/glib-2.0/glib/gcache.h
+#usr/include/glib-2.0/glib/gcompletion.h
+#usr/include/glib-2.0/glib/gconvert.h
+#usr/include/glib-2.0/glib/gdataset.h
+#usr/include/glib-2.0/glib/gdate.h
+#usr/include/glib-2.0/glib/gdir.h
+#usr/include/glib-2.0/glib/gerror.h
+#usr/include/glib-2.0/glib/gfileutils.h
+#usr/include/glib-2.0/glib/ghash.h
+#usr/include/glib-2.0/glib/ghook.h
+#usr/include/glib-2.0/glib/gi18n-lib.h
+#usr/include/glib-2.0/glib/gi18n.h
+#usr/include/glib-2.0/glib/giochannel.h
+#usr/include/glib-2.0/glib/gkeyfile.h
+#usr/include/glib-2.0/glib/glist.h
+#usr/include/glib-2.0/glib/gmacros.h
+#usr/include/glib-2.0/glib/gmain.h
+#usr/include/glib-2.0/glib/gmappedfile.h
+#usr/include/glib-2.0/glib/gmarkup.h
+#usr/include/glib-2.0/glib/gmem.h
+#usr/include/glib-2.0/glib/gmessages.h
+#usr/include/glib-2.0/glib/gnode.h
+#usr/include/glib-2.0/glib/goption.h
+#usr/include/glib-2.0/glib/gpattern.h
+#usr/include/glib-2.0/glib/gprimes.h
+#usr/include/glib-2.0/glib/gprintf.h
+#usr/include/glib-2.0/glib/gqsort.h
+#usr/include/glib-2.0/glib/gquark.h
+#usr/include/glib-2.0/glib/gqueue.h
+#usr/include/glib-2.0/glib/grand.h
+#usr/include/glib-2.0/glib/grel.h
+#usr/include/glib-2.0/glib/gscanner.h
+#usr/include/glib-2.0/glib/gshell.h
+#usr/include/glib-2.0/glib/gslice.h
+#usr/include/glib-2.0/glib/gslist.h
+#usr/include/glib-2.0/glib/gspawn.h
+#usr/include/glib-2.0/glib/gstdio.h
+#usr/include/glib-2.0/glib/gstrfuncs.h
+#usr/include/glib-2.0/glib/gstring.h
+#usr/include/glib-2.0/glib/gthread.h
+#usr/include/glib-2.0/glib/gthreadpool.h
+#usr/include/glib-2.0/glib/gtimer.h
+#usr/include/glib-2.0/glib/gtree.h
+#usr/include/glib-2.0/glib/gtypes.h
+#usr/include/glib-2.0/glib/gunicode.h
+#usr/include/glib-2.0/glib/gutils.h
+#usr/include/glib-2.0/glib/gwin32.h
+#usr/include/glib-2.0/gmodule.h
+#usr/include/glib-2.0/gobject
+#usr/include/glib-2.0/gobject/gboxed.h
+#usr/include/glib-2.0/gobject/gclosure.h
+#usr/include/glib-2.0/gobject/genums.h
+#usr/include/glib-2.0/gobject/gmarshal.h
+#usr/include/glib-2.0/gobject/gobject.h
+#usr/include/glib-2.0/gobject/gobjectnotifyqueue.c
+#usr/include/glib-2.0/gobject/gparam.h
+#usr/include/glib-2.0/gobject/gparamspecs.h
+#usr/include/glib-2.0/gobject/gsignal.h
+#usr/include/glib-2.0/gobject/gsourceclosure.h
+#usr/include/glib-2.0/gobject/gtype.h
+#usr/include/glib-2.0/gobject/gtypemodule.h
+#usr/include/glib-2.0/gobject/gtypeplugin.h
+#usr/include/glib-2.0/gobject/gvalue.h
+#usr/include/glib-2.0/gobject/gvaluearray.h
+#usr/include/glib-2.0/gobject/gvaluecollector.h
+#usr/include/glib-2.0/gobject/gvaluetypes.h
+#usr/lib/glib-2.0
+#usr/lib/glib-2.0/include
+#usr/lib/glib-2.0/include/glibconfig.h
+#usr/lib/libglib-2.0.la
+usr/lib/libglib-2.0.so
+usr/lib/libglib-2.0.so.0
+usr/lib/libglib-2.0.so.0.902.4
+#usr/lib/libgmodule-2.0.la
+usr/lib/libgmodule-2.0.so
+usr/lib/libgmodule-2.0.so.0
+usr/lib/libgmodule-2.0.so.0.902.4
+#usr/lib/libgobject-2.0.la
+usr/lib/libgobject-2.0.so
+usr/lib/libgobject-2.0.so.0
+usr/lib/libgobject-2.0.so.0.902.4
+#usr/lib/libgthread-2.0.la
+usr/lib/libgthread-2.0.so
+usr/lib/libgthread-2.0.so.0
+usr/lib/libgthread-2.0.so.0.902.4
+#usr/lib/pkgconfig/glib-2.0.pc
+#usr/lib/pkgconfig/gmodule-2.0.pc
+#usr/lib/pkgconfig/gmodule-export-2.0.pc
+#usr/lib/pkgconfig/gmodule-no-export-2.0.pc
+#usr/lib/pkgconfig/gobject-2.0.pc
+#usr/lib/pkgconfig/gthread-2.0.pc
+#usr/share/aclocal/glib-2.0.m4
+#usr/share/aclocal/glib-gettext.m4
+#usr/share/glib-2.0
+#usr/share/glib-2.0/gettext
+#usr/share/glib-2.0/gettext/mkinstalldirs
+#usr/share/glib-2.0/gettext/po
+#usr/share/glib-2.0/gettext/po/Makefile.in.in
+#usr/share/gtk-doc/html/glib
+#usr/share/gtk-doc/html/glib/file-name-encodings.png
+#usr/share/gtk-doc/html/glib/glib-Arrays.html
+#usr/share/gtk-doc/html/glib/glib-Asynchronous-Queues.html
+#usr/share/gtk-doc/html/glib/glib-Atomic-Operations.html
+#usr/share/gtk-doc/html/glib/glib-Automatic-String-Completion.html
+#usr/share/gtk-doc/html/glib/glib-Balanced-Binary-Trees.html
+#usr/share/gtk-doc/html/glib/glib-Basic-Types.html
+#usr/share/gtk-doc/html/glib/glib-Byte-Arrays.html
+#usr/share/gtk-doc/html/glib/glib-Byte-Order-Macros.html
+#usr/share/gtk-doc/html/glib/glib-Caches.html
+#usr/share/gtk-doc/html/glib/glib-Character-Set-Conversion.html
+#usr/share/gtk-doc/html/glib/glib-Commandline-option-parser.html
+#usr/share/gtk-doc/html/glib/glib-Datasets.html
+#usr/share/gtk-doc/html/glib/glib-Date-and-Time-Functions.html
+#usr/share/gtk-doc/html/glib/glib-Double-ended-Queues.html
+#usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html
+#usr/share/gtk-doc/html/glib/glib-Dynamic-Loading-of-Modules.html
+#usr/share/gtk-doc/html/glib/glib-Error-Reporting.html
+#usr/share/gtk-doc/html/glib/glib-File-Utilities.html
+#usr/share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
+#usr/share/gtk-doc/html/glib/glib-Hash-Tables.html
+#usr/share/gtk-doc/html/glib/glib-Hook-Functions.html
+#usr/share/gtk-doc/html/glib/glib-I18N.html
+#usr/share/gtk-doc/html/glib/glib-IO-Channels.html
+#usr/share/gtk-doc/html/glib/glib-Key-value-file-parser.html
+#usr/share/gtk-doc/html/glib/glib-Keyed-Data-Lists.html
+#usr/share/gtk-doc/html/glib/glib-Lexical-Scanner.html
+#usr/share/gtk-doc/html/glib/glib-Limits-of-Basic-Types.html
+#usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html
+#usr/share/gtk-doc/html/glib/glib-Memory-Allocators.html
+#usr/share/gtk-doc/html/glib/glib-Memory-Chunks.html
+#usr/share/gtk-doc/html/glib/glib-Memory-Slices.html
+#usr/share/gtk-doc/html/glib/glib-Message-Logging.html
+#usr/share/gtk-doc/html/glib/glib-Miscellaneous-Macros.html
+#usr/share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html
+#usr/share/gtk-doc/html/glib/glib-N-ary-Trees.html
+#usr/share/gtk-doc/html/glib/glib-Numerical-Definitions.html
+#usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html
+#usr/share/gtk-doc/html/glib/glib-Quarks.html
+#usr/share/gtk-doc/html/glib/glib-Random-Numbers.html
+#usr/share/gtk-doc/html/glib/glib-Relations-and-Tuples.html
+#usr/share/gtk-doc/html/glib/glib-Shell-related-Utilities.html
+#usr/share/gtk-doc/html/glib/glib-Simple-XML-Subset-Parser.html
+#usr/share/gtk-doc/html/glib/glib-Singly-Linked-Lists.html
+#usr/share/gtk-doc/html/glib/glib-Spawning-Processes.html
+#usr/share/gtk-doc/html/glib/glib-Standard-Macros.html
+#usr/share/gtk-doc/html/glib/glib-String-Chunks.html
+#usr/share/gtk-doc/html/glib/glib-String-Utility-Functions.html
+#usr/share/gtk-doc/html/glib/glib-Strings.html
+#usr/share/gtk-doc/html/glib/glib-The-Main-Event-Loop.html
+#usr/share/gtk-doc/html/glib/glib-Thread-Pools.html
+#usr/share/gtk-doc/html/glib/glib-Threads.html
+#usr/share/gtk-doc/html/glib/glib-Timers.html
+#usr/share/gtk-doc/html/glib/glib-Trash-Stacks.html
+#usr/share/gtk-doc/html/glib/glib-Type-Conversion-Macros.html
+#usr/share/gtk-doc/html/glib/glib-Unicode-Manipulation.html
+#usr/share/gtk-doc/html/glib/glib-Version-Information.html
+#usr/share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html
+#usr/share/gtk-doc/html/glib/glib-Windows-Compatibility-Functions.html
+#usr/share/gtk-doc/html/glib/glib-building.html
+#usr/share/gtk-doc/html/glib/glib-changes.html
+#usr/share/gtk-doc/html/glib/glib-compiling.html
+#usr/share/gtk-doc/html/glib/glib-core.html
+#usr/share/gtk-doc/html/glib/glib-cross-compiling.html
+#usr/share/gtk-doc/html/glib/glib-data-types.html
+#usr/share/gtk-doc/html/glib/glib-fundamentals.html
+#usr/share/gtk-doc/html/glib/glib-gettextize.html
+#usr/share/gtk-doc/html/glib/glib-resources.html
+#usr/share/gtk-doc/html/glib/glib-running.html
+#usr/share/gtk-doc/html/glib/glib-utilities.html
+#usr/share/gtk-doc/html/glib/glib.devhelp
+#usr/share/gtk-doc/html/glib/glib.devhelp2
+#usr/share/gtk-doc/html/glib/glib.html
+#usr/share/gtk-doc/html/glib/home.png
+#usr/share/gtk-doc/html/glib/index.html
+#usr/share/gtk-doc/html/glib/index.sgml
+#usr/share/gtk-doc/html/glib/ix01.html
+#usr/share/gtk-doc/html/glib/ix02.html
+#usr/share/gtk-doc/html/glib/ix03.html
+#usr/share/gtk-doc/html/glib/ix04.html
+#usr/share/gtk-doc/html/glib/ix05.html
+#usr/share/gtk-doc/html/glib/ix06.html
+#usr/share/gtk-doc/html/glib/ix07.html
+#usr/share/gtk-doc/html/glib/left.png
+#usr/share/gtk-doc/html/glib/mainloop-states.gif
+#usr/share/gtk-doc/html/glib/right.png
+#usr/share/gtk-doc/html/glib/style.css
+#usr/share/gtk-doc/html/glib/tools.html
+#usr/share/gtk-doc/html/glib/up.png
+#usr/share/gtk-doc/html/gobject
+#usr/share/gtk-doc/html/gobject/GTypeModule.html
+#usr/share/gtk-doc/html/gobject/GTypePlugin.html
+#usr/share/gtk-doc/html/gobject/ch01.html
+#usr/share/gtk-doc/html/gobject/ch01s02.html
+#usr/share/gtk-doc/html/gobject/ch02.html
+#usr/share/gtk-doc/html/gobject/ch06s03.html
+#usr/share/gtk-doc/html/gobject/ch07s02.html
+#usr/share/gtk-doc/html/gobject/ch07s03.html
+#usr/share/gtk-doc/html/gobject/chapter-gobject.html
+#usr/share/gtk-doc/html/gobject/chapter-signal.html
+#usr/share/gtk-doc/html/gobject/glib-genmarshal.html
+#usr/share/gtk-doc/html/gobject/glib-mkenums.html
+#usr/share/gtk-doc/html/gobject/glue.png
+#usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html
+#usr/share/gtk-doc/html/gobject/gobject-Closures.html
+#usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html
+#usr/share/gtk-doc/html/gobject/gobject-GParamSpec.html
+#usr/share/gtk-doc/html/gobject/gobject-Generic-values.html
+#usr/share/gtk-doc/html/gobject/gobject-Signals.html
+#usr/share/gtk-doc/html/gobject/gobject-Standard-Parameter-and-Value-Types.html
+#usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html
+#usr/share/gtk-doc/html/gobject/gobject-Type-Information.html
+#usr/share/gtk-doc/html/gobject/gobject-Value-arrays.html
+#usr/share/gtk-doc/html/gobject/gobject-Varargs-Value-Collection.html
+#usr/share/gtk-doc/html/gobject/gobject-memory.html
+#usr/share/gtk-doc/html/gobject/gobject-properties.html
+#usr/share/gtk-doc/html/gobject/gobject-query.html
+#usr/share/gtk-doc/html/gobject/gobject.devhelp
+#usr/share/gtk-doc/html/gobject/gobject.devhelp2
+#usr/share/gtk-doc/html/gobject/gtype-conventions.html
+#usr/share/gtk-doc/html/gobject/gtype-instantiable-classed.html
+#usr/share/gtk-doc/html/gobject/gtype-non-instantiable-classed.html
+#usr/share/gtk-doc/html/gobject/gtype-non-instantiable.html
+#usr/share/gtk-doc/html/gobject/home.png
+#usr/share/gtk-doc/html/gobject/howto-gobject-chainup.html
+#usr/share/gtk-doc/html/gobject/howto-gobject-code.html
+#usr/share/gtk-doc/html/gobject/howto-gobject-construction.html
+#usr/share/gtk-doc/html/gobject/howto-gobject-destruction.html
+#usr/share/gtk-doc/html/gobject/howto-gobject-methods.html
+#usr/share/gtk-doc/html/gobject/howto-gobject.html
+#usr/share/gtk-doc/html/gobject/howto-interface-implement.html
+#usr/share/gtk-doc/html/gobject/howto-interface-properties.html
+#usr/share/gtk-doc/html/gobject/howto-interface.html
+#usr/share/gtk-doc/html/gobject/howto-signals.html
+#usr/share/gtk-doc/html/gobject/index.html
+#usr/share/gtk-doc/html/gobject/index.sgml
+#usr/share/gtk-doc/html/gobject/ix01.html
+#usr/share/gtk-doc/html/gobject/ix02.html
+#usr/share/gtk-doc/html/gobject/ix03.html
+#usr/share/gtk-doc/html/gobject/ix04.html
+#usr/share/gtk-doc/html/gobject/ix05.html
+#usr/share/gtk-doc/html/gobject/ix06.html
+#usr/share/gtk-doc/html/gobject/ix07.html
+#usr/share/gtk-doc/html/gobject/left.png
+#usr/share/gtk-doc/html/gobject/pr01.html
+#usr/share/gtk-doc/html/gobject/pt01.html
+#usr/share/gtk-doc/html/gobject/pt02.html
+#usr/share/gtk-doc/html/gobject/pt03.html
+#usr/share/gtk-doc/html/gobject/right.png
+#usr/share/gtk-doc/html/gobject/rn01.html
+#usr/share/gtk-doc/html/gobject/rn02.html
+#usr/share/gtk-doc/html/gobject/signal.html
+#usr/share/gtk-doc/html/gobject/style.css
+#usr/share/gtk-doc/html/gobject/tools-ginspector.html
+#usr/share/gtk-doc/html/gobject/tools-gob.html
+#usr/share/gtk-doc/html/gobject/tools-gtkdoc.html
+#usr/share/gtk-doc/html/gobject/tools-refdb.html
+#usr/share/gtk-doc/html/gobject/up.png
+#usr/share/locale/am
+#usr/share/locale/am/LC_MESSAGES
+#usr/share/locale/am/LC_MESSAGES/glib20.mo
+#usr/share/locale/ar
+#usr/share/locale/ar/LC_MESSAGES
+#usr/share/locale/ar/LC_MESSAGES/glib20.mo
+#usr/share/locale/az
+#usr/share/locale/az/LC_MESSAGES
+#usr/share/locale/az/LC_MESSAGES/glib20.mo
+#usr/share/locale/be/LC_MESSAGES/glib20.mo
+#usr/share/locale/bg
+#usr/share/locale/bg/LC_MESSAGES
+#usr/share/locale/bg/LC_MESSAGES/glib20.mo
+#usr/share/locale/bn
+#usr/share/locale/bn/LC_MESSAGES
+#usr/share/locale/bn/LC_MESSAGES/glib20.mo
+#usr/share/locale/bs/LC_MESSAGES/glib20.mo
+#usr/share/locale/ca/LC_MESSAGES/glib20.mo
+#usr/share/locale/cs/LC_MESSAGES/glib20.mo
+#usr/share/locale/cy
+#usr/share/locale/cy/LC_MESSAGES
+#usr/share/locale/cy/LC_MESSAGES/glib20.mo
+#usr/share/locale/da/LC_MESSAGES/glib20.mo
+#usr/share/locale/de/LC_MESSAGES/glib20.mo
+#usr/share/locale/el/LC_MESSAGES/glib20.mo
+#usr/share/locale/en_CA
+#usr/share/locale/en_CA/LC_MESSAGES
+#usr/share/locale/en_CA/LC_MESSAGES/glib20.mo
+#usr/share/locale/en_GB/LC_MESSAGES/glib20.mo
+#usr/share/locale/eo
+#usr/share/locale/eo/LC_MESSAGES
+#usr/share/locale/eo/LC_MESSAGES/glib20.mo
+#usr/share/locale/es/LC_MESSAGES/glib20.mo
+#usr/share/locale/et/LC_MESSAGES/glib20.mo
+#usr/share/locale/eu
+#usr/share/locale/eu/LC_MESSAGES
+#usr/share/locale/eu/LC_MESSAGES/glib20.mo
+#usr/share/locale/fa
+#usr/share/locale/fa/LC_MESSAGES
+#usr/share/locale/fa/LC_MESSAGES/glib20.mo
+#usr/share/locale/fi/LC_MESSAGES/glib20.mo
+#usr/share/locale/fr/LC_MESSAGES/glib20.mo
+#usr/share/locale/ga
+#usr/share/locale/ga/LC_MESSAGES
+#usr/share/locale/ga/LC_MESSAGES/glib20.mo
+#usr/share/locale/gl/LC_MESSAGES/glib20.mo
+#usr/share/locale/gu
+#usr/share/locale/gu/LC_MESSAGES
+#usr/share/locale/gu/LC_MESSAGES/glib20.mo
+#usr/share/locale/he
+#usr/share/locale/he/LC_MESSAGES
+#usr/share/locale/he/LC_MESSAGES/glib20.mo
+#usr/share/locale/hi
+#usr/share/locale/hi/LC_MESSAGES
+#usr/share/locale/hi/LC_MESSAGES/glib20.mo
+#usr/share/locale/hr/LC_MESSAGES/glib20.mo
+#usr/share/locale/hu/LC_MESSAGES/glib20.mo
+#usr/share/locale/id/LC_MESSAGES/glib20.mo
+#usr/share/locale/is/LC_MESSAGES/glib20.mo
+#usr/share/locale/it/LC_MESSAGES/glib20.mo
+#usr/share/locale/ja/LC_MESSAGES/glib20.mo
+#usr/share/locale/ko/LC_MESSAGES/glib20.mo
+#usr/share/locale/ku
+#usr/share/locale/ku/LC_MESSAGES
+#usr/share/locale/ku/LC_MESSAGES/glib20.mo
+#usr/share/locale/lt
+#usr/share/locale/lt/LC_MESSAGES
+#usr/share/locale/lt/LC_MESSAGES/glib20.mo
+#usr/share/locale/lv
+#usr/share/locale/lv/LC_MESSAGES
+#usr/share/locale/lv/LC_MESSAGES/glib20.mo
+#usr/share/locale/mk
+#usr/share/locale/mk/LC_MESSAGES
+#usr/share/locale/mk/LC_MESSAGES/glib20.mo
+#usr/share/locale/ml
+#usr/share/locale/ml/LC_MESSAGES
+#usr/share/locale/ml/LC_MESSAGES/glib20.mo
+#usr/share/locale/mn
+#usr/share/locale/mn/LC_MESSAGES
+#usr/share/locale/mn/LC_MESSAGES/glib20.mo
+#usr/share/locale/ms
+#usr/share/locale/ms/LC_MESSAGES
+#usr/share/locale/ms/LC_MESSAGES/glib20.mo
+#usr/share/locale/nb
+#usr/share/locale/nb/LC_MESSAGES
+#usr/share/locale/nb/LC_MESSAGES/glib20.mo
+#usr/share/locale/ne
+#usr/share/locale/ne/LC_MESSAGES
+#usr/share/locale/ne/LC_MESSAGES/glib20.mo
+#usr/share/locale/nl/LC_MESSAGES/glib20.mo
+#usr/share/locale/nn/LC_MESSAGES/glib20.mo
+#usr/share/locale/no/LC_MESSAGES/glib20.mo
+#usr/share/locale/or
+#usr/share/locale/or/LC_MESSAGES
+#usr/share/locale/or/LC_MESSAGES/glib20.mo
+#usr/share/locale/pa
+#usr/share/locale/pa/LC_MESSAGES
+#usr/share/locale/pa/LC_MESSAGES/glib20.mo
+#usr/share/locale/pl/LC_MESSAGES/glib20.mo
+#usr/share/locale/pt/LC_MESSAGES/glib20.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/glib20.mo
+#usr/share/locale/ro/LC_MESSAGES/glib20.mo
+#usr/share/locale/ru/LC_MESSAGES/glib20.mo
+#usr/share/locale/rw
+#usr/share/locale/rw/LC_MESSAGES
+#usr/share/locale/rw/LC_MESSAGES/glib20.mo
+#usr/share/locale/sk/LC_MESSAGES/glib20.mo
+#usr/share/locale/sl/LC_MESSAGES/glib20.mo
+#usr/share/locale/sq
+#usr/share/locale/sq/LC_MESSAGES
+#usr/share/locale/sq/LC_MESSAGES/glib20.mo
+#usr/share/locale/sr/LC_MESSAGES/glib20.mo
+#usr/share/locale/sr@Latn
+#usr/share/locale/sr@Latn/LC_MESSAGES
+#usr/share/locale/sr@Latn/LC_MESSAGES/glib20.mo
+#usr/share/locale/sr@ije
+#usr/share/locale/sr@ije/LC_MESSAGES
+#usr/share/locale/sr@ije/LC_MESSAGES/glib20.mo
+#usr/share/locale/sv/LC_MESSAGES/glib20.mo
+#usr/share/locale/ta
+#usr/share/locale/ta/LC_MESSAGES
+#usr/share/locale/ta/LC_MESSAGES/glib20.mo
+#usr/share/locale/te
+#usr/share/locale/te/LC_MESSAGES
+#usr/share/locale/te/LC_MESSAGES/glib20.mo
+#usr/share/locale/th
+#usr/share/locale/th/LC_MESSAGES
+#usr/share/locale/th/LC_MESSAGES/glib20.mo
+#usr/share/locale/tl
+#usr/share/locale/tl/LC_MESSAGES
+#usr/share/locale/tl/LC_MESSAGES/glib20.mo
+#usr/share/locale/tr/LC_MESSAGES/glib20.mo
+#usr/share/locale/tt
+#usr/share/locale/tt/LC_MESSAGES
+#usr/share/locale/tt/LC_MESSAGES/glib20.mo
+#usr/share/locale/uk/LC_MESSAGES/glib20.mo
+#usr/share/locale/vi
+#usr/share/locale/vi/LC_MESSAGES
+#usr/share/locale/vi/LC_MESSAGES/glib20.mo
+#usr/share/locale/wa/LC_MESSAGES/glib20.mo
+#usr/share/locale/xh
+#usr/share/locale/xh/LC_MESSAGES
+#usr/share/locale/xh/LC_MESSAGES/glib20.mo
+#usr/share/locale/yi
+#usr/share/locale/yi/LC_MESSAGES
+#usr/share/locale/yi/LC_MESSAGES/glib20.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo
+#usr/share/locale/zh_HK
+#usr/share/locale/zh_HK/LC_MESSAGES
+#usr/share/locale/zh_HK/LC_MESSAGES/glib20.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
+#usr/share/man/man1/glib-genmarshal.1
+#usr/share/man/man1/glib-gettextize.1
+#usr/share/man/man1/glib-mkenums.1
+#usr/share/man/man1/gobject-query.1