From: Michael Tremer Date: Tue, 26 May 2015 12:27:32 +0000 (+0200) Subject: Merge remote-tracking branch 'mfischer/slang' into next X-Git-Tag: v2.17-core91~40 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=f042e1d398bf4bade415773fe5849791f864444c;hp=c199aa774cccd349713c6c917cf5e8f209a713c5 Merge remote-tracking branch 'mfischer/slang' into next --- diff --git a/config/backup/backup.pl b/config/backup/backup.pl index f4823fcfbd..d430f34674 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -160,12 +160,10 @@ sub createinclude(){ close(DATEI); foreach (@Zeilen){ - if ( $_ =~ /\*/){ - my @files = `ls $_`; + chomp($_); + my @files = `find $_ -maxdepth 0 2>/dev/null`; foreach (@files){ push(@include,$_); - } - } - else {push(@include,$_);} + } } } diff --git a/config/backup/include b/config/backup/include index cc9546f8ef..159ff9a583 100644 --- a/config/backup/include +++ b/config/backup/include @@ -4,6 +4,7 @@ /var/ipfire/*/config /var/ipfire/*/enable /var/ipfire/*/*enable* +/var/ipfire/ovpn/collectd.vpn /etc/passwd /etc/shadow /etc/group @@ -12,6 +13,7 @@ /etc/hosts* /etc/httpd/* /etc/ssh/ssh_host* +/etc/ssh/sshd_config /etc/logrotate.d /var/ipfire/auth/users /var/ipfire/dhcp/* diff --git a/config/backup/includes/esniper b/config/backup/includes/esniper deleted file mode 100644 index 14434aaae3..0000000000 --- a/config/backup/includes/esniper +++ /dev/null @@ -1,5 +0,0 @@ -/srv/web/esniper/.htaccess -/srv/web/esniper/.config.php -/srv/web/esniper/.config.state.php -/srv/web/esniper/local/ -/srv/web/esniper/.run/ diff --git a/config/backup/includes/haproxy b/config/backup/includes/haproxy new file mode 100644 index 0000000000..4516e18ac6 --- /dev/null +++ b/config/backup/includes/haproxy @@ -0,0 +1 @@ +/etc/haproxy/haproxy.cfg diff --git a/config/backup/includes/teamspeak b/config/backup/includes/teamspeak deleted file mode 100644 index 13705d31e9..0000000000 --- a/config/backup/includes/teamspeak +++ /dev/null @@ -1,7 +0,0 @@ -/opt/teamspeak/bad_names.txt -/opt/teamspeak/server.dbs -/opt/teamspeak/server.ini -/opt/teamspeak/server.log -/opt/teamspeak/whitelist.txt - - diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 35ae7c0930..2b5cd1977f 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -17,6 +17,7 @@ package General; use strict; use Socket; use IO::Socket; +use Locale::Codes::Country; use Net::SSLeay; use Net::IPv4Addr qw(:all); $|=1; # line buffering diff --git a/config/cfgroot/geoip-functions.pl b/config/cfgroot/geoip-functions.pl new file mode 100644 index 0000000000..fc2dfdd342 --- /dev/null +++ b/config/cfgroot/geoip-functions.pl @@ -0,0 +1,105 @@ +#!/usr/bin/perl -w +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2015 IPFire Team . # +# # +############################################################################ + +package GeoIP; + +use Locale::Codes::Country; + +# Function to get the flag icon for a specified country code. +sub get_flag_icon($) { + my ($input) = @_; + + # Webserver's root dir. (Required for generating full path) + my $webroot = "/srv/web/ipfire/html"; + + # Directory which contains the flag icons. + my $flagdir = "/images/flags"; + + # File extension of the country flags. + my $ext = "png"; + + # Remove whitespaces. + chomp($input); + + # Convert given country code to upper case. + my $ccode = uc($input); + + # Generate filename, based on the contry code in lower case + # and the defined file extension. + my $file = join('.', $ccode,$ext); + + # Generate path inside webroot to the previously generated file. + my $flag_icon = join('/', $flagdir,$file); + + # Generate absolute path to the icon file. + my $absolute_path = join('', $webroot,$flag_icon); + + # Check if the a icon file exists. + if (-e "$absolute_path") { + # Return content of flag_icon. + return $flag_icon; + } else { + # If no icon for the specified country exists, try to use + # the icon for "unknown". + my $ccode = "unknown"; + + # Redoing all the stuff from abouve for the "unknown" icon. + my $file = join('.', $ccode,$ext); + my $flag_icon = join('/', $flagdir,$file); + my $absolute_path = join('', $webroot,$flag_icon); + + # Check if the icon is present. + if (-e "$absolute_path") { + # Return "unknown" icon. + return $flag_icon; + } + } +} + +# Function to get the county name by a given country code. +sub get_full_country_name($) { + my ($input) = @_; + my $name; + + # Remove whitespaces. + chomp($input); + + # Convert input into lower case format. + my $code = lc($input); + + # Handle country codes which are not in the list. + if ($code eq "a1") { $name = "Anonymous Proxy" } + elsif ($code eq "a2") { $name = "Satellite Provider" } + elsif ($code eq "o1") { $name = "Other Country" } + elsif ($code eq "ap") { $name = "Asia/Pacific Region" } + elsif ($code eq "eu") { $name = "Europe" } + elsif ($code eq "yu") { $name = "Yugoslavia" } + else { + # Use perl built-in module to get the country code. + $name = &Locale::Codes::Country::code2country($code); + } + + return $name; +} + +1; diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 5e6fddbf6e..40c1bc87eb 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -664,32 +664,32 @@ sub updatevpnn2ngraph { "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), "COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j", - "AREA:incoming#00dd00:".sprintf("%-20s",$Lang::tr{'incoming traffic in bytes per second'}), + "AREA:incoming#00dd00:".sprintf("%-23s",$Lang::tr{'incoming traffic in bytes per second'}), "GPRINT:incoming:MAX:%8.1lf %sBps", "GPRINT:incoming:AVERAGE:%8.1lf %sBps", "GPRINT:incoming:MIN:%8.1lf %sBps", "GPRINT:incoming:LAST:%8.1lf %sBps\\j", - "STACK:overhead_in#116B11:".sprintf("%-20s",$Lang::tr{'incoming overhead in bytes per second'}), + "STACK:overhead_in#116B11:".sprintf("%-23s",$Lang::tr{'incoming overhead in bytes per second'}), "GPRINT:overhead_in:MAX:%8.1lf %sBps", "GPRINT:overhead_in:AVERAGE:%8.1lf %sBps", "GPRINT:overhead_in:MIN:%8.1lf %sBps", "GPRINT:overhead_in:LAST:%8.1lf %sBps\\j", - "LINE1:compression_in#ff00ff:".sprintf("%-20s",$Lang::tr{'incoming compression in bytes per second'}), + "LINE1:compression_in#ff00ff:".sprintf("%-23s",$Lang::tr{'incoming compression in bytes per second'}), "GPRINT:compression_in:MAX:%8.1lf %sBps", "GPRINT:compression_in:AVERAGE:%8.1lf %sBps", "GPRINT:compression_in:MIN:%8.1lf %sBps", "GPRINT:compression_in:LAST:%8.1lf %sBps\\j", - "AREA:outgoingn#dd0000:".sprintf("%-20s",$Lang::tr{'outgoing traffic in bytes per second'}), + "AREA:outgoingn#dd0000:".sprintf("%-23s",$Lang::tr{'outgoing traffic in bytes per second'}), "GPRINT:outgoing:MAX:%8.1lf %sBps", "GPRINT:outgoing:AVERAGE:%8.1lf %sBps", "GPRINT:outgoing:MIN:%8.1lf %sBps", "GPRINT:outgoing:LAST:%8.1lf %sBps\\j", - "STACK:overhead_outn#870C0C:".sprintf("%-20s",$Lang::tr{'outgoing overhead in bytes per second'}), + "STACK:overhead_outn#870C0C:".sprintf("%-23s",$Lang::tr{'outgoing overhead in bytes per second'}), "GPRINT:overhead_out:MAX:%8.1lf %sBps", "GPRINT:overhead_out:AVERAGE:%8.1lf %sBps", "GPRINT:overhead_out:MIN:%8.1lf %sBps", "GPRINT:overhead_out:LAST:%8.1lf %sBps\\j", - "LINE1:compression_outn#000000:".sprintf("%-20s",$Lang::tr{'outgoing compression in bytes per second'}), + "LINE1:compression_outn#000000:".sprintf("%-23s",$Lang::tr{'outgoing compression in bytes per second'}), "GPRINT:compression_out:MAX:%8.1lf %sBps", "GPRINT:compression_out:AVERAGE:%8.1lf %sBps", "GPRINT:compression_out:MIN:%8.1lf %sBps", diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index cf895bf246..974c4d8b22 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -263,7 +263,7 @@ sub getcgihash { return if ($ENV{'REQUEST_METHOD'} ne 'POST'); if (!$params->{'wantfile'}) { $CGI::DISABLE_UPLOADS = 1; - $CGI::POST_MAX = 512 * 1024; + $CGI::POST_MAX = 1024 * 1024; } else { $CGI::POST_MAX = 10 * 1024 * 1024; } diff --git a/config/cfgroot/lang.pl b/config/cfgroot/lang.pl index 3b001ad9d4..c77e0a0665 100644 --- a/config/cfgroot/lang.pl +++ b/config/cfgroot/lang.pl @@ -169,6 +169,9 @@ sub FindWebLanguage() { my ($language, $country) = split(/_/, $shortlang); push(@options, $language); + # Add English as fallback + push(@options, "en"); + foreach my $option (@options) { return $option if (-e "${General::swroot}/langs/$option.pl"); } diff --git a/config/cron/crontab b/config/cron/crontab index d78d08f593..d5e5d7e9f0 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -57,3 +57,6 @@ HOME=/ # Re-read firewall rules every Sunday in March, October and November to take care of daylight saving time 00 3 * 3 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl 00 2 * 10-11 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl + +# Update GeoIP database once a month. +%monthly,random * * * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/xt_geoip_update >/dev/null 2>&1 diff --git a/config/etc/modprobe.d/btmrvl_sdio.conf b/config/etc/modprobe.d/btmrvl_sdio.conf new file mode 100644 index 0000000000..66cd021104 --- /dev/null +++ b/config/etc/modprobe.d/btmrvl_sdio.conf @@ -0,0 +1,2 @@ +# seems to crash often +blacklist btmrvl_sdio diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl old mode 100755 new mode 100644 index f3cd67fb09..b389fac3c3 --- a/config/firewall/firewall-lib.pl +++ b/config/firewall/firewall-lib.pl @@ -27,6 +27,7 @@ package fwlib; my %customnetwork=(); my %customhost=(); my %customgrp=(); +my %customgeoipgrp=(); my %customservice=(); my %customservicegrp=(); my %ccdnet=(); @@ -42,6 +43,7 @@ require '/var/ipfire/general-functions.pl'; my $confignet = "${General::swroot}/fwhosts/customnetworks"; my $confighost = "${General::swroot}/fwhosts/customhosts"; my $configgrp = "${General::swroot}/fwhosts/customgroups"; +my $configgeoipgrp = "${General::swroot}/fwhosts/customgeoipgrp"; my $configsrv = "${General::swroot}/fwhosts/customservices"; my $configsrvgrp = "${General::swroot}/fwhosts/customservicegrp"; my $configccdnet = "${General::swroot}/ovpn/ccd.conf"; @@ -59,6 +61,7 @@ my $netsettings = "${General::swroot}/ethernet/settings"; &General::readhasharray("$confignet", \%customnetwork); &General::readhasharray("$confighost", \%customhost); &General::readhasharray("$configgrp", \%customgrp); +&General::readhasharray("$configgeoipgrp", \%customgeoipgrp); &General::readhasharray("$configccdnet", \%ccdnet); &General::readhasharray("$configccdhost", \%ccdhost); &General::readhasharray("$configipsec", \%ipsecconf); @@ -295,6 +298,17 @@ sub get_addresses if ($customgrp{$grp}[0] eq $value) { my @address = &get_address($customgrp{$grp}[3], $customgrp{$grp}[2], $type); + if (@address) { + push(@addresses, @address); + } + } + } + }elsif ($addr_type ~~ ["cust_geoip_src", "cust_geoip_tgt"] && $value =~ "group:") { + $value=substr($value,6); + foreach my $grp (sort {$a <=> $b} keys %customgeoipgrp) { + if ($customgeoipgrp{$grp}[0] eq $value) { + my @address = &get_address($addr_type, $customgeoipgrp{$grp}[2], $type); + if (@address) { push(@addresses, @address); } @@ -414,6 +428,20 @@ sub get_address } } + # Handle rule options with GeoIP as source. + } elsif ($key eq "cust_geoip_src") { + # Get external interface. + my $external_interface = &get_external_interface(); + + push(@ret, ["-m geoip --src-cc $value", "$external_interface"]); + + # Handle rule options with GeoIP as target. + } elsif ($key eq "cust_geoip_tgt") { + # Get external interface. + my $external_interface = &get_external_interface(); + + push(@ret, ["-m geoip --dst-cc $value", "$external_interface"]); + # If nothing was selected, we assume "any". } else { push(@ret, ["0/0", ""]); @@ -552,4 +580,37 @@ sub get_internal_firewall_ip_address return 0; } +sub get_geoip_locations() { + # Path to the directory which contains the binary geoip + # databases. + my $directory="/usr/share/xt_geoip/LE"; + + # Array to store the final country list. + my @country_codes = (); + + # Open location and do a directory listing. + opendir(DIR, "$directory"); + my @locations = readdir(DIR); + closedir(DIR); + + # Loop through the directory listing, and cut of the file extensions. + foreach my $location (sort @locations) { + # skip . and .. + next if($location =~ /^\.$/); + next if($location =~ /^\.\.$/); + + # Remove whitespaces. + chomp($location); + + # Cut-off file extension. + my ($country_code, $extension) = split(/\./, $location); + + # Add country code to array. + push(@country_codes, $country_code); + } + + # Return final array. + return @country_codes; +} + return 1; diff --git a/config/firewall/geoipblock b/config/firewall/geoipblock new file mode 100644 index 0000000000..4d483d3b89 --- /dev/null +++ b/config/firewall/geoipblock @@ -0,0 +1 @@ +GEOIPBLOCK_ENABLED=off diff --git a/config/firewall/p2protocols b/config/firewall/p2protocols index 7000581268..d8998095c1 100644 --- a/config/firewall/p2protocols +++ b/config/firewall/p2protocols @@ -1,9 +1,9 @@ -Applejuice;apple;off; -Ares;ares;off; -Bittorrent;bit;off; -DirectConnect;dc;off; -Edonkey;edk;off; -Gnutella;gnu;off; -KaZaA;kazaa;off; -SoulSeek;soul;off; -WinMX;winmx;off; +Applejuice;apple;on; +Ares;ares;on; +Bittorrent;bit;on; +DirectConnect;dc;on; +Edonkey;edk;on; +Gnutella;gnu;on; +KaZaA;kazaa;on; +SoulSeek;soul;on; +WinMX;winmx;on; diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl old mode 100755 new mode 100644 index a475e2d60e..daa95651bb --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -60,6 +60,7 @@ my $configfwdfw = "${General::swroot}/firewall/config"; my $configinput = "${General::swroot}/firewall/input"; my $configoutgoing = "${General::swroot}/firewall/outgoing"; my $p2pfile = "${General::swroot}/firewall/p2protocols"; +my $geoipfile = "${General::swroot}/firewall/geoipblock"; my $configgrp = "${General::swroot}/fwhosts/customgroups"; my $netsettings = "${General::swroot}/ethernet/settings"; @@ -88,14 +89,30 @@ sub main { # Flush all chains. &flush(); - # Reload firewall rules. - &preparerules(); + # Prepare firewall rules. + if (! -z "${General::swroot}/firewall/input"){ + &buildrules(\%configinputfw); + } + if (! -z "${General::swroot}/firewall/outgoing"){ + &buildrules(\%configoutgoingfw); + } + if (! -z "${General::swroot}/firewall/config"){ + &buildrules(\%configfwdfw); + } # Load P2P block rules. &p2pblock(); + # Load GeoIP block rules. + &geoipblock(); + # Reload firewall policy. run("/usr/sbin/firewall-policy"); + + #Reload firewall.local if present + if ( -f '/etc/sysconfig/firewall.local'){ + run("/etc/sysconfig/firewall.local reload"); + } } sub run { @@ -146,18 +163,6 @@ sub flush { run("$IPTABLES -t mangle -F $CHAIN_MANGLE_NAT_DESTINATION_FIX"); } -sub preparerules { - if (! -z "${General::swroot}/firewall/input"){ - &buildrules(\%configinputfw); - } - if (! -z "${General::swroot}/firewall/outgoing"){ - &buildrules(\%configoutgoingfw); - } - if (! -z "${General::swroot}/firewall/config"){ - &buildrules(\%configfwdfw); - } -} - sub buildrules { my $hash = shift; @@ -364,24 +369,20 @@ sub buildrules { my @source_options = (); if ($source =~ /mac/) { push(@source_options, $source); - } elsif ($source) { + } elsif ($source =~ /-m geoip/) { + push(@source_options, $source); + } elsif($source) { push(@source_options, ("-s", $source)); } - if ($source_intf) { - push(@source_options, ("-i", $source_intf)); - } - # Prepare destination options. my @destination_options = (); - if ($destination) { + if ($destination =~ /-m geoip/) { + push(@destination_options, $destination); + } elsif ($destination) { push(@destination_options, ("-d", $destination)); } - if ($destination_intf) { - push(@destination_options, ("-o", $destination_intf)); - } - # Add time constraint options. push(@options, @time_options); @@ -476,6 +477,17 @@ sub buildrules { } } + # Add source and destination interface to the filter rules. + # These are supposed to help filtering forged packets that originate + # from BLUE with an IP address from GREEN for instance. + if ($source_intf) { + push(@source_options, ("-i", $source_intf)); + } + + if ($destination_intf) { + push(@destination_options, ("-o", $destination_intf)); + } + push(@options, @source_options); push(@options, @destination_options); @@ -509,10 +521,6 @@ sub buildrules { } } } - #Reload firewall.local if present - if ( -f '/etc/sysconfig/firewall.local'){ - run("/etc/sysconfig/firewall.local reload"); - } } # Formats the given timestamp into the iptables format which is "hh:mm" UTC. @@ -570,6 +578,38 @@ sub p2pblock { } } +sub geoipblock { + my %geoipsettings = (); + $geoipsettings{'GEOIPBLOCK_ENABLED'} = "off"; + + # Flush iptables chain. + run("$IPTABLES -F GEOIPBLOCK"); + + # Check if the geoip settings file exists + if (-e "$geoipfile") { + # Read settings file + &General::readhash("$geoipfile", \%geoipsettings); + } + + # If geoip blocking is not enabled, we are finished here. + if ($geoipsettings{'GEOIPBLOCK_ENABLED'} ne "on") { + # Exit submodule. Process remaining script. + return; + } + + # Get supported locations. + my @locations = &fwlib::get_geoip_locations(); + + # Loop through all supported geoip locations and + # create iptables rules, if blocking this country + # is enabled. + foreach my $location (@locations) { + if($geoipsettings{$location} eq "on") { + run("$IPTABLES -A GEOIPBLOCK -m geoip --src-cc $location -j DROP"); + } + } +} + sub get_protocols { my $hash = shift; my $key = shift; diff --git a/config/haproxy/haproxy.cfg b/config/haproxy/haproxy.cfg new file mode 100644 index 0000000000..9d372f63fb --- /dev/null +++ b/config/haproxy/haproxy.cfg @@ -0,0 +1,86 @@ +#--------------------------------------------------------------------- +# Example configuration for a possible web application. See the +# full configuration options online. +# +# http://haproxy.1wt.eu/download/1.4/doc/configuration.txt +# +#--------------------------------------------------------------------- + +#--------------------------------------------------------------------- +# Global settings +#--------------------------------------------------------------------- +global + # to have these messages end up in /var/log/haproxy.log you will + # need to: + # + # 1) configure syslog to accept network log events. This is done + # by adding the '-r' option to the SYSLOGD_OPTIONS in + # /etc/sysconfig/syslog + # + # 2) configure local2 events to go to the /var/log/haproxy.log + # file. A line like the following can be added to + # /etc/sysconfig/syslog + # + # local2.* /var/log/haproxy.log + # + log 127.0.0.1 local2 + + chroot /var/lib/haproxy + pidfile /var/run/haproxy.pid + maxconn 4000 + user nobody + group nobody + daemon + + # turn on stats unix socket + stats socket /var/lib/haproxy/stats + +#--------------------------------------------------------------------- +# common defaults that all the 'listen' and 'backend' sections will +# use if not designated in their block +#--------------------------------------------------------------------- +defaults + mode http + log global + option httplog + option dontlognull + option http-server-close + option forwardfor except 127.0.0.0/8 + option redispatch + retries 3 + timeout http-request 10s + timeout queue 1m + timeout connect 10s + timeout client 1m + timeout server 1m + timeout http-keep-alive 10s + timeout check 10s + maxconn 3000 + +#--------------------------------------------------------------------- +# main frontend which proxys to the backends +#--------------------------------------------------------------------- +frontend main *:5000 + acl url_static path_beg -i /static /images /javascript /stylesheets + acl url_static path_end -i .jpg .gif .png .css .js + + use_backend static if url_static + default_backend app + +#--------------------------------------------------------------------- +# static backend for serving up images, stylesheets and such +#--------------------------------------------------------------------- +backend static + balance roundrobin + server static 127.0.0.1:4331 check + +#--------------------------------------------------------------------- +# round robin balancing between the various backends +#--------------------------------------------------------------------- +backend app + balance roundrobin + server app1 127.0.0.1:5001 check + server app2 127.0.0.1:5002 check + server app3 127.0.0.1:5003 check + server app4 127.0.0.1:5004 check + diff --git a/config/hostapd/config b/config/hostapd/config index 1cd76765a9..c3672c5242 100644 --- a/config/hostapd/config +++ b/config/hostapd/config @@ -15,10 +15,6 @@ CONFIG_DRIVER_HOSTAP=y # Driver interface for wired authenticator #CONFIG_DRIVER_WIRED=y -# Driver interface for madwifi driver -#CONFIG_DRIVER_MADWIFI=y -#CFLAGS += -I../../madwifi # change to the madwifi source directory - # Driver interface for Prism54 driver CONFIG_DRIVER_PRISM54=y @@ -49,14 +45,14 @@ CONFIG_RSN_PREAUTH=y CONFIG_PEERKEY=y # IEEE 802.11w (management frame protection) -# This version is an experimental implementation based on IEEE 802.11w/D1.0 -# draft and is subject to change since the standard has not yet been finalized. -# Driver support is also needed for IEEE 802.11w. -#CONFIG_IEEE80211W=y +CONFIG_IEEE80211W=y # Integrated EAP server CONFIG_EAP=y +# EAP Re-authentication Protocol (ERP) in integrated EAP server +CONFIG_ERP=y + # EAP-MD5 for the integrated EAP server CONFIG_EAP_MD5=y @@ -91,6 +87,9 @@ CONFIG_EAP_TTLS=y # EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) #CONFIG_EAP_PSK=y +# EAP-pwd for the integrated EAP server (secure authentication with a password) +#CONFIG_EAP_PWD=y + # EAP-SAKE for the integrated EAP server #CONFIG_EAP_SAKE=y @@ -110,6 +109,8 @@ CONFIG_EAP_TTLS=y CONFIG_WPS=y # Enable UPnP support for external WPS Registrars CONFIG_WPS_UPNP=y +# Enable WPS support with NFC config method +#CONFIG_WPS_NFC=y # EAP-IKEv2 CONFIG_EAP_IKEV2=y @@ -117,6 +118,9 @@ CONFIG_EAP_IKEV2=y # Trusted Network Connect (EAP-TNC) CONFIG_EAP_TNC=y +# EAP-EKE for the integrated EAP server +#CONFIG_EAP_EKE=y + # PKCS#12 (PFX) support (used to read private key and certificate file from # a file that usually has extension .p12 or .pfx) CONFIG_PKCS12=y @@ -138,14 +142,171 @@ CONFIG_IEEE80211R=y # IEEE 802.11n (High Throughput) support CONFIG_IEEE80211N=y +# Wireless Network Management (IEEE Std 802.11v-2011) +# Note: This is experimental and not complete implementation. +#CONFIG_WNM=y + +# IEEE 802.11ac (Very High Throughput) support +CONFIG_IEEE80211AC=y + # Remove debugging code that is printing out debug messages to stdout. # This can be used to reduce the size of the hostapd considerably if debugging # code is not needed. CONFIG_NO_STDOUT_DEBUG=y -# IEEE 802.11ac (Very High Throughput) support -CONFIG_IEEE80211AC=y -# Enable AUTO_CHANNEL_SELECTION -# This is needed for dfs (radar detection) channels +# Add support for writing debug log to a file: -f /tmp/hostapd.log +# Disabled by default. +#CONFIG_DEBUG_FILE=y + +# Add support for sending all debug messages (regardless of debug verbosity) +# to the Linux kernel tracing facility. This helps debug the entire stack by +# making it easy to record everything happening from the driver up into the +# same file, e.g., using trace-cmd. +#CONFIG_DEBUG_LINUX_TRACING=y + +# Remove support for RADIUS accounting +#CONFIG_NO_ACCOUNTING=y + +# Remove support for RADIUS +#CONFIG_NO_RADIUS=y + +# Remove support for VLANs +#CONFIG_NO_VLAN=y + +# Enable support for fully dynamic VLANs. This enables hostapd to +# automatically create bridge and VLAN interfaces if necessary. +#CONFIG_FULL_DYNAMIC_VLAN=y + +# Use netlink-based kernel API for VLAN operations instead of ioctl() +# Note: This requires libnl 3.1 or newer. +#CONFIG_VLAN_NETLINK=y + +# Remove support for dumping internal state through control interface commands +# This can be used to reduce binary size at the cost of disabling a debugging +# option. +#CONFIG_NO_DUMP_STATE=y + +# Enable tracing code for developer debugging +# This tracks use of memory allocations and other registrations and reports +# incorrect use with a backtrace of call (or allocation) location. +#CONFIG_WPA_TRACE=y +# For BSD, comment out these. +#LIBS += -lexecinfo +#LIBS_p += -lexecinfo +#LIBS_c += -lexecinfo + +# Use libbfd to get more details for developer debugging +# This enables use of libbfd to get more detailed symbols for the backtraces +# generated by CONFIG_WPA_TRACE=y. +#CONFIG_WPA_TRACE_BFD=y +# For BSD, comment out these. +#LIBS += -lbfd -liberty -lz +#LIBS_p += -lbfd -liberty -lz +#LIBS_c += -lbfd -liberty -lz + +# hostapd depends on strong random number generation being available from the +# operating system. os_get_random() function is used to fetch random data when +# needed, e.g., for key generation. On Linux and BSD systems, this works by +# reading /dev/urandom. It should be noted that the OS entropy pool needs to be +# properly initialized before hostapd is started. This is important especially +# on embedded devices that do not have a hardware random number generator and +# may by default start up with minimal entropy available for random number +# generation. +# +# As a safety net, hostapd is by default trying to internally collect +# additional entropy for generating random data to mix in with the data +# fetched from the OS. This by itself is not considered to be very strong, but +# it may help in cases where the system pool is not initialized properly. +# However, it is very strongly recommended that the system pool is initialized +# with enough entropy either by using hardware assisted random number +# generator or by storing state over device reboots. +# +# hostapd can be configured to maintain its own entropy store over restarts to +# enhance random number generation. This is not perfect, but it is much more +# secure than using the same sequence of random numbers after every reboot. +# This can be enabled with -e command line option. The specified +# file needs to be readable and writable by hostapd. +# +# If the os_get_random() is known to provide strong random data (e.g., on +# Linux/BSD, the board in question is known to have reliable source of random +# data from /dev/urandom), the internal hostapd random pool can be disabled. +# This will save some in binary size and CPU use. However, this should only be +# considered for builds that are known to be used on devices that meet the +# requirements described above. +#CONFIG_NO_RANDOM_POOL=y + +# Select TLS implementation +# openssl = OpenSSL (default) +# gnutls = GnuTLS +# internal = Internal TLSv1 implementation (experimental) +# none = Empty template +#CONFIG_TLS=openssl + +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) +# can be enabled to get a stronger construction of messages when block ciphers +# are used. +#CONFIG_TLSV11=y + +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2) +# can be enabled to enable use of stronger crypto algorithms. +#CONFIG_TLSV12=y + +# If CONFIG_TLS=internal is used, additional library and include paths are +# needed for LibTomMath. Alternatively, an integrated, minimal version of +# LibTomMath can be used. See beginning of libtommath.c for details on benefits +# and drawbacks of this option. +#CONFIG_INTERNAL_LIBTOMMATH=y +#ifndef CONFIG_INTERNAL_LIBTOMMATH +#LTM_PATH=/usr/src/libtommath-0.39 +#CFLAGS += -I$(LTM_PATH) +#LIBS += -L$(LTM_PATH) +#LIBS_p += -L$(LTM_PATH) +#endif +# At the cost of about 4 kB of additional binary size, the internal LibTomMath +# can be configured to include faster routines for exptmod, sqr, and div to +# speed up DH and RSA calculation considerably +#CONFIG_INTERNAL_LIBTOMMATH_FAST=y + +# Interworking (IEEE 802.11u) +# This can be used to enable functionality to improve interworking with +# external networks. +#CONFIG_INTERWORKING=y + +# Hotspot 2.0 +#CONFIG_HS20=y + +# Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file +#CONFIG_SQLITE=y + +# Testing options +# This can be used to enable some testing options (see also the example +# configuration file) that are really useful only for testing clients that +# connect to this hostapd. These options allow, for example, to drop a +# certain percentage of probe requests or auth/(re)assoc frames. +# +#CONFIG_TESTING_OPTIONS=y + +# Automatic Channel Selection +# This will allow hostapd to pick the channel automatically when channel is set +# to "acs_survey" or "0". Eventually, other ACS algorithms can be added in +# similar way. +# +# Automatic selection is currently only done through initialization, later on +# we hope to do background checks to keep us moving to more ideal channels as +# time goes by. ACS is currently only supported through the nl80211 driver and +# your driver must have survey dump capability that is filled by the driver +# during scanning. +# +# You can customize the ACS survey algorithm with the hostapd.conf variable +# acs_num_scans. +# +# Supported ACS drivers: +# * ath9k +# * ath5k +# * ath10k +# +# For more details refer to: +# http://wireless.kernel.org/en/users/Documentation/acs +# CONFIG_ACS=y diff --git a/config/httpd/global.conf b/config/httpd/global.conf index a977026436..3fbd5e2946 100644 --- a/config/httpd/global.conf +++ b/config/httpd/global.conf @@ -1,7 +1,7 @@ Timeout 300 ServerSignature on UseCanonicalName off -ServerTokens Full +ServerTokens Prod LogLevel warn CustomLog /var/log/httpd/access_log combined Include /etc/httpd/conf/hostname.conf diff --git a/config/httpd/httpd.conf b/config/httpd/httpd.conf index 7e00b88268..9c1fb2b100 100644 --- a/config/httpd/httpd.conf +++ b/config/httpd/httpd.conf @@ -117,4 +117,5 @@ Include /etc/httpd/conf/default-server.conf # Include /etc/httpd/conf/vhosts.d/*.conf - +# Dummy LoadModule directive to aid module installations +#LoadModule dummy_module /usr/lib/apache2/modules/mod_dummy.so diff --git a/config/httpd/vhosts.d/esniper.conf b/config/httpd/vhosts.d/esniper.conf deleted file mode 100644 index e1c4dd48bc..0000000000 --- a/config/httpd/vhosts.d/esniper.conf +++ /dev/null @@ -1,22 +0,0 @@ -Listen 1006 - - - - SSLEngine on - SSLProtocol all -SSLv2 - SSLCipherSuite ALL:!ADH:!EXPORT56:!eNULL:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP - SSLCertificateFile /etc/httpd/server.crt - SSLCertificateKeyFile /etc/httpd/server.key - - DocumentRoot /srv/web/esniper - - Include /etc/httpd/conf/conf.d/php*.conf - - - Options None - AllowOverride None - Order allow,deny - Allow from all - - - diff --git a/config/httpd/vhosts.d/phpaj.conf b/config/httpd/vhosts.d/phpaj.conf deleted file mode 100644 index a6b764ea1f..0000000000 --- a/config/httpd/vhosts.d/phpaj.conf +++ /dev/null @@ -1,16 +0,0 @@ -Listen 1002 - - - - DocumentRoot /srv/web/phpaj - - Include /etc/httpd/conf/conf.d/php*.conf - - - Options None - AllowOverride None - Order allow,deny - Allow from all - - - diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index fbfc05c756..cf44486e5a 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.22 Kernel Configuration +# Linux/arm 3.14.37 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -3393,7 +3393,7 @@ CONFIG_SMS_SIANO_RC=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_ATTACH=y -CONFIG_VIDEO_IR_I2C=y +CONFIG_VIDEO_IR_I2C=m # # Audio decoders, processors and mixers @@ -3480,24 +3480,24 @@ CONFIG_SOC_CAMERA_OV9640=m CONFIG_SOC_CAMERA_OV9740=m CONFIG_SOC_CAMERA_RJ54N1=m CONFIG_SOC_CAMERA_TW9910=m -CONFIG_MEDIA_TUNER=y -CONFIG_MEDIA_TUNER_SIMPLE=y -CONFIG_MEDIA_TUNER_TDA8290=y -CONFIG_MEDIA_TUNER_TDA827X=y -CONFIG_MEDIA_TUNER_TDA18271=y -CONFIG_MEDIA_TUNER_TDA9887=y -CONFIG_MEDIA_TUNER_MT20XX=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_MT20XX=m CONFIG_MEDIA_TUNER_MT2060=m CONFIG_MEDIA_TUNER_MT2063=m CONFIG_MEDIA_TUNER_MT2266=m CONFIG_MEDIA_TUNER_MT2131=m CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=y -CONFIG_MEDIA_TUNER_XC5000=y -CONFIG_MEDIA_TUNER_XC4000=y +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=y +CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_MEDIA_TUNER_TDA18218=m CONFIG_MEDIA_TUNER_FC0011=m @@ -5042,7 +5042,6 @@ CONFIG_DEBUG_KERNEL=y # # Memory Debugging # -# CONFIG_DEBUG_PAGEALLOC is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set @@ -5275,6 +5274,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y CONFIG_GRKERNSEC_CHROOT_FINDTASK=y CONFIG_GRKERNSEC_CHROOT_NICE=y CONFIG_GRKERNSEC_CHROOT_SYSCTL=y +CONFIG_GRKERNSEC_CHROOT_RENAME=y # CONFIG_GRKERNSEC_CHROOT_CAPS is not set CONFIG_GRKERNSEC_CHROOT_INITRD=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 8249d2c8de..25de266d51 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.25 Kernel Configuration +# Linux/arm 3.14.37 Kernel Configuration # CONFIG_ARM=y CONFIG_MIGHT_HAVE_PCI=y @@ -2053,8 +2053,8 @@ CONFIG_IP1000=m CONFIG_JME=m CONFIG_NET_VENDOR_MARVELL=y CONFIG_MV643XX_ETH=m -CONFIG_MVMDIO=m -CONFIG_MVNETA=m +CONFIG_MVMDIO=y +CONFIG_MVNETA=y CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set CONFIG_SKGE_GENESIS=y @@ -2155,6 +2155,8 @@ CONFIG_XILINX_EMACLITE=m # CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_PHYLIB=y +CONFIG_SWCONFIG=m +# CONFIG_SWCONFIG_LEDS is not set # # MII PHY device drivers @@ -2178,12 +2180,17 @@ CONFIG_LSI_ET1011C_PHY=m CONFIG_MICREL_PHY=m CONFIG_FIXED_PHY=y CONFIG_MDIO_BITBANG=m -# CONFIG_MDIO_GPIO is not set +CONFIG_MDIO_GPIO=m CONFIG_MDIO_SUN4I=m CONFIG_MDIO_BUS_MUX=m CONFIG_MDIO_BUS_MUX_GPIO=m CONFIG_MDIO_BUS_MUX_MMIOREG=m CONFIG_GATEWORKS_GW16083=m +CONFIG_B53=m +CONFIG_B53_PHY_DRIVER=m +# CONFIG_B53_MMAP_DRIVER is not set +# CONFIG_B53_SRAB_DRIVER is not set +CONFIG_B53_PHY_FIXUP=y # CONFIG_PLIP is not set CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -3348,10 +3355,10 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_TUNER=m CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF_GEN=y +CONFIG_VIDEOBUF_GEN=m CONFIG_VIDEOBUF_DMA_SG=m CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DMA_CONTIG=y +CONFIG_VIDEOBUF_DMA_CONTIG=m CONFIG_VIDEOBUF_DVB=m CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m @@ -3603,9 +3610,11 @@ CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_VIDEO_CAFE_CCIC is not set # CONFIG_VIDEO_DM6446_CCDC is not set CONFIG_VIDEO_OMAP2_VOUT_VRFB=y -CONFIG_VIDEO_OMAP2_VOUT=y +CONFIG_VIDEO_OMAP2_VOUT=m CONFIG_VIDEO_TIMBERDALE=m CONFIG_SOC_CAMERA=m +CONFIG_SOC_CAMERA_SCALE_CROP=m +CONFIG_SOC_CAMERA_PLATFORM=m CONFIG_VIDEO_MX3=m CONFIG_VIDEO_RCAR_VIN=m # CONFIG_VIDEO_SH_MOBILE_CSI2 is not set @@ -3649,7 +3658,7 @@ CONFIG_SMS_SIANO_RC=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_ATTACH=y -CONFIG_VIDEO_IR_I2C=y +CONFIG_VIDEO_IR_I2C=m # # Audio decoders, processors and mixers @@ -3735,24 +3744,24 @@ CONFIG_SOC_CAMERA_OV9640=m CONFIG_SOC_CAMERA_OV9740=m CONFIG_SOC_CAMERA_RJ54N1=m CONFIG_SOC_CAMERA_TW9910=m -CONFIG_MEDIA_TUNER=y -CONFIG_MEDIA_TUNER_SIMPLE=y -CONFIG_MEDIA_TUNER_TDA8290=y -CONFIG_MEDIA_TUNER_TDA827X=y -CONFIG_MEDIA_TUNER_TDA18271=y -CONFIG_MEDIA_TUNER_TDA9887=y -CONFIG_MEDIA_TUNER_MT20XX=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_MT20XX=m CONFIG_MEDIA_TUNER_MT2060=m CONFIG_MEDIA_TUNER_MT2063=m CONFIG_MEDIA_TUNER_MT2266=m CONFIG_MEDIA_TUNER_MT2131=m CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=y -CONFIG_MEDIA_TUNER_XC5000=y -CONFIG_MEDIA_TUNER_XC4000=y +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=y +CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_MEDIA_TUNER_TDA18218=m CONFIG_MEDIA_TUNER_FC0011=m @@ -4850,7 +4859,7 @@ CONFIG_RTC_DRV_PL030=m CONFIG_RTC_DRV_PL031=m CONFIG_RTC_DRV_VT8500=m CONFIG_RTC_DRV_SUNXI=y -CONFIG_RTC_DRV_MV=m +CONFIG_RTC_DRV_MV=y CONFIG_RTC_DRV_MXC=m CONFIG_RTC_DRV_SNVS=m CONFIG_RTC_DRV_MOXART=m @@ -5521,7 +5530,6 @@ CONFIG_DEBUG_KERNEL=y # # Memory Debugging # -# CONFIG_DEBUG_PAGEALLOC is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_STATS is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y @@ -5755,6 +5763,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y CONFIG_GRKERNSEC_CHROOT_FINDTASK=y CONFIG_GRKERNSEC_CHROOT_NICE=y CONFIG_GRKERNSEC_CHROOT_SYSCTL=y +CONFIG_GRKERNSEC_CHROOT_RENAME=y # CONFIG_GRKERNSEC_CHROOT_CAPS is not set CONFIG_GRKERNSEC_CHROOT_INITRD=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi index b02167d311..b25210a17c 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-rpi +++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.22 Kernel Configuration +# Linux/arm 3.14.37 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1325,7 +1325,7 @@ CONFIG_DM_DELAY=m # CONFIG_DM_SWITCH is not set # CONFIG_TARGET_CORE is not set CONFIG_NETDEVICES=y -CONFIG_MII=y +CONFIG_MII=m CONFIG_NET_CORE=y CONFIG_BONDING=m CONFIG_DUMMY=m @@ -1465,7 +1465,7 @@ CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_SR9700=m CONFIG_USB_NET_SR9800=m CONFIG_USB_NET_SMSC75XX=m -CONFIG_USB_NET_SMSC95XX=y +CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m @@ -3643,7 +3643,6 @@ CONFIG_DEBUG_KERNEL=y # # Memory Debugging # -# CONFIG_DEBUG_PAGEALLOC is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set @@ -3858,6 +3857,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y CONFIG_GRKERNSEC_CHROOT_FINDTASK=y CONFIG_GRKERNSEC_CHROOT_NICE=y CONFIG_GRKERNSEC_CHROOT_SYSCTL=y +CONFIG_GRKERNSEC_CHROOT_RENAME=y # CONFIG_GRKERNSEC_CHROOT_CAPS is not set CONFIG_GRKERNSEC_CHROOT_INITRD=y diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 5869b8818b..f5ff73efb8 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.22 Kernel Configuration +# Linux/x86 3.14.37 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -410,6 +410,7 @@ CONFIG_SCHED_MC=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set +CONFIG_X86_UP_APIC_MSI=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y @@ -421,8 +422,6 @@ CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y CONFIG_VM86=y -CONFIG_X86_16BIT=y -CONFIG_X86_ESPFIX32=y CONFIG_TOSHIBA=m CONFIG_I8K=m # CONFIG_X86_REBOOTFIXUPS is not set @@ -724,6 +723,7 @@ CONFIG_HAVE_AOUT=y CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_IOSF_MBI=m CONFIG_NET=y # @@ -5495,7 +5495,6 @@ CONFIG_DEBUG_KERNEL=y # # Memory Debugging # -# CONFIG_DEBUG_PAGEALLOC is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set @@ -5767,6 +5766,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y CONFIG_GRKERNSEC_CHROOT_FINDTASK=y CONFIG_GRKERNSEC_CHROOT_NICE=y CONFIG_GRKERNSEC_CHROOT_SYSCTL=y +CONFIG_GRKERNSEC_CHROOT_RENAME=y # CONFIG_GRKERNSEC_CHROOT_CAPS is not set CONFIG_GRKERNSEC_CHROOT_INITRD=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 54cfb0642b..8e7220184a 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.22 Kernel Configuration +# Linux/x86 3.14.37 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -420,6 +420,7 @@ CONFIG_SCHED_MC=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set +CONFIG_X86_UP_APIC_MSI=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y @@ -431,8 +432,6 @@ CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y CONFIG_VM86=y -CONFIG_X86_16BIT=y -CONFIG_X86_ESPFIX32=y CONFIG_TOSHIBA=m CONFIG_I8K=m # CONFIG_X86_REBOOTFIXUPS is not set @@ -738,6 +737,7 @@ CONFIG_HAVE_AOUT=y CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_IOSF_MBI=m CONFIG_NET=y # @@ -3832,7 +3832,6 @@ CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_CX24117=m -CONFIG_DVB_M88DC2800=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -3914,6 +3913,8 @@ CONFIG_DVB_A8293=m CONFIG_DVB_LGS8GXX=m CONFIG_DVB_ATBM8830=m CONFIG_DVB_TDA665x=m +CONFIG_DVB_DVBSKY_M88DS3103=m +CONFIG_DVB_M88DC2800=m CONFIG_DVB_IX2505V=m CONFIG_DVB_IT913X_FE=m CONFIG_DVB_M88RS2000=m @@ -5537,7 +5538,6 @@ CONFIG_DEBUG_KERNEL=y # # Memory Debugging # -# CONFIG_DEBUG_PAGEALLOC is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set @@ -5807,6 +5807,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y CONFIG_GRKERNSEC_CHROOT_FINDTASK=y CONFIG_GRKERNSEC_CHROOT_NICE=y CONFIG_GRKERNSEC_CHROOT_SYSCTL=y +CONFIG_GRKERNSEC_CHROOT_RENAME=y # CONFIG_GRKERNSEC_CHROOT_CAPS is not set CONFIG_GRKERNSEC_CHROOT_INITRD=y diff --git a/config/lib/firmware/brcm/brcmfmac43362-sdio.txt b/config/lib/firmware/brcm/brcmfmac43362-sdio.txt new file mode 100644 index 0000000000..d967bfeae9 --- /dev/null +++ b/config/lib/firmware/brcm/brcmfmac43362-sdio.txt @@ -0,0 +1,58 @@ +# bcm43362 NVRAM file for LeMaker Banana Pro and Cubietruck +#AP6210_NVRAM_V1.2_03192013 + +manfid=0x2d0 +prodid=0x492 +vendid=0x14e4 +devid=0x4343 +boardtype=0x0598 + +# Board Revision is P307, same nvram file can be used for P304, P305, P306 and P307 as the tssi pa params used are same +#Please force the automatic RX PER data to the respective board directory if not using P307 board, for e.g. for P305 boards force the data into the following directory /projects/BCM43362/a1_labdata/boardtests/results/sdg_rev0305 +boardrev=0x1307 +boardnum=777 +xtalfreq=26000 +boardflags=0x80201 +boardflags2=0x80 +sromrev=3 +wl0id=0x431b +macaddr=DE:AD:BE:EF:00:00 +aa2g=1 +ag0=2 +maxp2ga0=74 +cck2gpo=0x2222 +ofdm2gpo=0x44444444 +mcs2gpo0=0x6666 +mcs2gpo1=0x6666 +pa0maxpwr=56 + +#P207 PA params +#pa0b0=5447 +#pa0b1=-658 +#pa0b2=-175
+ +#Same PA params for P304,P305, P306, P307 + +pa0b0=5447 +pa0b1=-607 +pa0b2=-160 +pa0itssit=62 +pa1itssit=62 + + +cckPwrOffset=5 +ccode=0 +rssismf2g=0xa +rssismc2g=0x3 +rssisav2g=0x7 +triso2g=0 +noise_cal_enable_2g=0 +noise_cal_po_2g=0 +swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x010101,0x1ff +temp_add=29767 +temp_mult=425 + +btc_flags=0x6 +btc_params0=5000 +btc_params1=1000 +btc_params6=63 diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index 802885ee3a..2bcf0d5e8d 100644 --- a/config/menu/20-status.menu +++ b/config/menu/20-status.menu @@ -41,15 +41,15 @@ 'enabled' => 1, }; $substatus->{'53.networkovpn'} = { - 'caption' => "$Lang::tr{'openvpn client'}", + 'caption' => "$Lang::tr{'vpn statistic rw'}", 'uri' => '/cgi-bin/netovpnrw.cgi', - 'title' => "$Lang::tr{'openvpn client'}", + 'title' => "$Lang::tr{'vpn statistic rw'}", 'enabled' => 1, }; $substatus->{'54.networkovpnsrv'} = { - 'caption' => "$Lang::tr{'openvpn server'}", + 'caption' => "$Lang::tr{'vpn statistic n2n'}", 'uri' => '/cgi-bin/netovpnsrv.cgi', - 'title' => "$Lang::tr{'openvpn server'}", + 'title' => "$Lang::tr{'vpn statistics n2n'}", 'enabled' => 1, }; $substatus->{'60.hardwaregraphs'} = { diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu index e872e6428c..7271b32121 100644 --- a/config/menu/50-firewall.menu +++ b/config/menu/50-firewall.menu @@ -22,6 +22,12 @@ 'title' => "P2P-Block", 'enabled' => 1, }; + $subfirewall->{'50.geoipblock'} = { + 'caption' => $Lang::tr{'geoipblock'}, + 'uri' => '/cgi-bin/geoip-block.cgi', + 'title' => $Lang::tr{'geoipblock'}, + 'enabled' => 1, + }; $subfirewall->{'60.wireless'} = { 'caption' => $Lang::tr{'blue access'}, 'uri' => '/cgi-bin/wireless.cgi', diff --git a/config/qemu/qemu b/config/qemu/qemu new file mode 100644 index 0000000000..64b458a3a4 --- /dev/null +++ b/config/qemu/qemu @@ -0,0 +1,10 @@ +#!/bin/bash +# +# QEMU wrapper to enable kvm as default like old qemu-kvm... +# +if [[ $* == *" -no-kvm"* ]]; then + qemu-system-i386 $* +else + qemu-system-i386 -enable-kvm $* +fi +exit ${?} diff --git a/config/rootfiles/common/Locale-Country b/config/rootfiles/common/Locale-Country index bbe51eee77..58c240625a 100644 --- a/config/rootfiles/common/Locale-Country +++ b/config/rootfiles/common/Locale-Country @@ -1,13 +1,50 @@ -#usr/lib/perl5/site_perl/5.12.3/Locale -usr/lib/perl5/site_perl/5.12.3/Locale/Constants.pm -usr/lib/perl5/site_perl/5.12.3/Locale/Constants.pod -usr/lib/perl5/site_perl/5.12.3/Locale/Country.pm -usr/lib/perl5/site_perl/5.12.3/Locale/Country.pod -usr/lib/perl5/site_perl/5.12.3/Locale/Currency.pm -usr/lib/perl5/site_perl/5.12.3/Locale/Currency.pod -usr/lib/perl5/site_perl/5.12.3/Locale/Language.pm -usr/lib/perl5/site_perl/5.12.3/Locale/Language.pod -usr/lib/perl5/site_perl/5.12.3/Locale/Script.pm -usr/lib/perl5/site_perl/5.12.3/Locale/Script.pod -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Locale-Codes -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Locale-Codes/.packlist +#usr/lib/perl5/5.12.3/Locale/Codes +usr/lib/perl5/5.12.3/Locale/Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes.pod +usr/lib/perl5/5.12.3/Locale/Codes/API.pod +usr/lib/perl5/5.12.3/Locale/Codes/Changes.pod +usr/lib/perl5/5.12.3/Locale/Codes/Constants.pm +usr/lib/perl5/5.12.3/Locale/Codes/Constants.pod +usr/lib/perl5/5.12.3/Locale/Codes/Country.pm +usr/lib/perl5/5.12.3/Locale/Codes/Country.pod +usr/lib/perl5/5.12.3/Locale/Codes/Country_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/Country_Retired.pm +usr/lib/perl5/5.12.3/Locale/Codes/Currency.pm +usr/lib/perl5/5.12.3/Locale/Codes/Currency.pod +usr/lib/perl5/5.12.3/Locale/Codes/Currency_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/Currency_Retired.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangExt.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangExt.pod +usr/lib/perl5/5.12.3/Locale/Codes/LangExt_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangExt_Retired.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangFam.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangFam.pod +usr/lib/perl5/5.12.3/Locale/Codes/LangFam_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangFam_Retired.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangVar.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangVar.pod +usr/lib/perl5/5.12.3/Locale/Codes/LangVar_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangVar_Retired.pm +usr/lib/perl5/5.12.3/Locale/Codes/Language.pm +usr/lib/perl5/5.12.3/Locale/Codes/Language.pod +usr/lib/perl5/5.12.3/Locale/Codes/Language_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/Language_Retired.pm +usr/lib/perl5/5.12.3/Locale/Codes/Script.pm +usr/lib/perl5/5.12.3/Locale/Codes/Script.pod +usr/lib/perl5/5.12.3/Locale/Codes/Script_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/Script_Retired.pm +#usr/lib/perl5/5.12.3/MACHINE-linux-thread-multi/auto/Locale +#usr/lib/perl5/5.12.3/MACHINE-linux-thread-multi/auto/Locale/Codes +#usr/lib/perl5/5.12.3/MACHINE-linux-thread-multi/auto/Locale/Codes/.packlist +#usr/share/man/man3/Locale::Codes.3 +#usr/share/man/man3/Locale::Codes::API.3 +#usr/share/man/man3/Locale::Codes::Changes.3 +#usr/share/man/man3/Locale::Codes::Constants.3 +#usr/share/man/man3/Locale::Codes::Country.3 +#usr/share/man/man3/Locale::Codes::Currency.3 +#usr/share/man/man3/Locale::Codes::LangExt.3 +#usr/share/man/man3/Locale::Codes::LangFam.3 +#usr/share/man/man3/Locale::Codes::LangFam_Retired.3 +#usr/share/man/man3/Locale::Codes::LangVar.3 +#usr/share/man/man3/Locale::Codes::Language.3 +#usr/share/man/man3/Locale::Codes::Script.3 diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 3eabe9f769..7e33a155ee 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1,5 +1,8 @@ #etc/httpd #etc/httpd/conf +#etc/httpd/conf/conf.d +etc/httpd/conf/conf.d/php5.conf +etc/httpd/conf/default-server.conf #etc/httpd/conf/extra #etc/httpd/conf/extra/httpd-autoindex.conf #etc/httpd/conf/extra/httpd-dav.conf @@ -12,9 +15,14 @@ #etc/httpd/conf/extra/httpd-ssl.conf #etc/httpd/conf/extra/httpd-userdir.conf #etc/httpd/conf/extra/httpd-vhosts.conf +etc/httpd/conf/global.conf +etc/httpd/conf/hostname.conf etc/httpd/conf/httpd.conf +etc/httpd/conf/listen.conf +etc/httpd/conf/loadmodule.conf etc/httpd/conf/magic etc/httpd/conf/mime.types +etc/httpd/conf/mod_log_config.conf #etc/httpd/conf/original #etc/httpd/conf/original/extra #etc/httpd/conf/original/extra/httpd-autoindex.conf @@ -29,6 +37,14 @@ etc/httpd/conf/mime.types #etc/httpd/conf/original/extra/httpd-userdir.conf #etc/httpd/conf/original/extra/httpd-vhosts.conf #etc/httpd/conf/original/httpd.conf +etc/httpd/conf/server-tuning.conf +etc/httpd/conf/ssl-global.conf +etc/httpd/conf/uid.conf +#etc/httpd/conf/vhosts.d +etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf +etc/httpd/conf/vhosts.d/ipfire-interface.conf +#etc/httpd/conf/vhosts.d/nagios.conf +#etc/httpd/conf/vhosts.d/openmailadmin.conf #srv/web #srv/web/ipfire #srv/web/ipfire/cgi-bin @@ -1336,7 +1352,7 @@ usr/lib/apr-util-1/apr_dbd_sqlite3.so #usr/lib/libapr-1.la usr/lib/libapr-1.so usr/lib/libapr-1.so.0 -usr/lib/libapr-1.so.0.5.0 +usr/lib/libapr-1.so.0.5.1 #usr/lib/libaprutil-1.a #usr/lib/libaprutil-1.la usr/lib/libaprutil-1.so @@ -1373,76 +1389,3 @@ usr/sbin/httpd #usr/share/man/man8/rotatelogs.8 #usr/share/man/man8/suexec.8 var/log/httpd -etc/httpd/conf/conf.d -etc/httpd/conf/default-server.conf -etc/httpd/conf/global.conf -etc/httpd/conf/hostname.conf -etc/httpd/conf/listen.conf -etc/httpd/conf/loadmodule.conf -etc/httpd/conf/mod_log_config.conf -etc/httpd/conf/server-tuning.conf -etc/httpd/conf/ssl-global.conf -etc/httpd/conf/uid.conf -etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf -etc/httpd/conf/vhosts.d/ipfire-interface.conf -srv/web/ipfire/cgi-bin/aliases.cgi -srv/web/ipfire/cgi-bin/atm-status.cgi -srv/web/ipfire/cgi-bin/backup.cgi -srv/web/ipfire/cgi-bin/chpasswd.cgi -srv/web/ipfire/cgi-bin/connections.cgi -srv/web/ipfire/cgi-bin/connscheduler.cgi -srv/web/ipfire/cgi-bin/country.cgi -srv/web/ipfire/cgi-bin/credits.cgi -srv/web/ipfire/cgi-bin/dns.cgi -srv/web/ipfire/cgi-bin/dnsforward.cgi -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/dhcp.cgi -srv/web/ipfire/cgi-bin/entropy.cgi -srv/web/ipfire/cgi-bin/extrahd.cgi -srv/web/ipfire/cgi-bin/fireinfo.cgi -srv/web/ipfire/cgi-bin/firewall.cgi -srv/web/ipfire/cgi-bin/fwhosts.cgi -srv/web/ipfire/cgi-bin/gpl.cgi -srv/web/ipfire/cgi-bin/gui.cgi -srv/web/ipfire/cgi-bin/hardwaregraphs.cgi -srv/web/ipfire/cgi-bin/hosts.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/ipinfo.cgi -srv/web/ipfire/cgi-bin/iptables.cgi -srv/web/ipfire/cgi-bin/logs.cgi -srv/web/ipfire/cgi-bin/mac.cgi -srv/web/ipfire/cgi-bin/media.cgi -srv/web/ipfire/cgi-bin/memory.cgi -srv/web/ipfire/cgi-bin/modem.cgi -srv/web/ipfire/cgi-bin/modem-status.cgi -srv/web/ipfire/cgi-bin/netexternal.cgi -srv/web/ipfire/cgi-bin/netinternal.cgi -srv/web/ipfire/cgi-bin/netother.cgi -srv/web/ipfire/cgi-bin/netovpnrw.cgi -srv/web/ipfire/cgi-bin/netovpnsrv.cgi -srv/web/ipfire/cgi-bin/optionsfw.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/p2p-block.cgi -srv/web/ipfire/cgi-bin/pakfire.cgi -srv/web/ipfire/cgi-bin/pppsetup.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/qos.cgi -srv/web/ipfire/cgi-bin/remote.cgi -srv/web/ipfire/cgi-bin/routing.cgi -srv/web/ipfire/cgi-bin/services.cgi -srv/web/ipfire/cgi-bin/shutdown.cgi -srv/web/ipfire/cgi-bin/speed.cgi -srv/web/ipfire/cgi-bin/system.cgi -srv/web/ipfire/cgi-bin/time.cgi -srv/web/ipfire/cgi-bin/traffic.cgi -srv/web/ipfire/cgi-bin/updatexlrator.cgi -srv/web/ipfire/cgi-bin/upnp.cgi -srv/web/ipfire/cgi-bin/urlfilter.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -srv/web/ipfire/cgi-bin/wakeonlan.cgi -srv/web/ipfire/cgi-bin/webaccess.cgi -srv/web/ipfire/cgi-bin/wireless.cgi -srv/web/ipfire/cgi-bin/wirelessclient.cgi -srv/web/ipfire/html -var/updatecache diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts old mode 100755 new mode 100644 index e529e6644f..b4cd8f8571 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -34,6 +34,7 @@ etc/rc.d/init.d/firstsetup etc/rc.d/init.d/functions #etc/rc.d/init.d/gnump3d etc/rc.d/init.d/halt +#etc/rc.d/init.d/haproxy #etc/rc.d/init.d/hostapd #etc/rc.d/init.d/imspector etc/rc.d/init.d/ipsec @@ -60,6 +61,7 @@ etc/rc.d/init.d/mounttmpfs #etc/rc.d/init.d/mysql #etc/rc.d/init.d/netsnmpd etc/rc.d/init.d/network +etc/rc.d/init.d/network-trigger etc/rc.d/init.d/network-vlans #etc/rc.d/init.d/networking etc/rc.d/init.d/networking/any @@ -90,6 +92,7 @@ etc/rc.d/init.d/networking/red.up/50-ipsec etc/rc.d/init.d/networking/red.up/50-ovpn etc/rc.d/init.d/networking/red.up/98-leds etc/rc.d/init.d/networking/red.up/99-fireinfo +etc/rc.d/init.d/networking/red.up/99-geoip-database etc/rc.d/init.d/networking/red.up/99-pakfire-update etc/rc.d/init.d/networking/wpa_supplicant.exe #etc/rc.d/init.d/nfs-server @@ -118,9 +121,9 @@ etc/rc.d/init.d/sshd etc/rc.d/init.d/static-routes #etc/rc.d/init.d/stunnel etc/rc.d/init.d/swap +etc/rc.d/init.d/swconfig etc/rc.d/init.d/sysctl etc/rc.d/init.d/sysklogd -etc/rc.d/init.d/teamspeak etc/rc.d/init.d/template #etc/rc.d/init.d/tftpd etc/rc.d/init.d/tmpfs @@ -224,9 +227,11 @@ etc/rc.d/rcsysinit.d/S45udev_retry etc/rc.d/rcsysinit.d/S50cleanfs etc/rc.d/rcsysinit.d/S60setclock etc/rc.d/rcsysinit.d/S70console +etc/rc.d/rcsysinit.d/S73swconfig etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S85firewall +etc/rc.d/rcsysinit.d/S90network-trigger etc/rc.d/rcsysinit.d/S91network-vlans etc/rc.d/rcsysinit.d/S92rngd etc/rc.d/rc3.d/S15fireinfo diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood index 50ac43471b..f5ae58567f 100644 --- a/config/rootfiles/common/armv5tel/linux-kirkwood +++ b/config/rootfiles/common/armv5tel/linux-kirkwood @@ -548,6 +548,8 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/siano/smsdvb.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/siano/smsmdtv.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tveeprom.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-core +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-core/dvb-core.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/a8293.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/af9013.ko @@ -649,6 +651,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/cs53l32a.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/cx25840 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/cx25840/cx25840.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/ir-kbd-i2c.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/m52790.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/msp3400.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/mt9v011.ko @@ -684,6 +687,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/vp27smpx.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/wm8739.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/wm8775.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/media.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/b2c2 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/b2c2/b2c2-flexcop-pci.ko @@ -878,6 +882,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-winfast.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/lirc_dev.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/mceusb.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/rc-core.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/rc-loopback.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/redrat3.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/streamzap.ko @@ -890,8 +895,10 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/fc2580.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/m88ts2022.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/max2165.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mc44s803.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt2060.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt2063.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt20xx.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt2131.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt2266.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mxl5005s.ko @@ -900,8 +907,17 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/r820t.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda18212.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda18218.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda18271.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda827x.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda8290.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda9887.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tua9001.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tuner-simple.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tuner-types.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tuner-xc2028.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tuner_it913x.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/xc4000.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/xc5000.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/au0828 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/au0828/au0828.ko @@ -1049,6 +1065,8 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/zr364xx/zr364xx.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/tuner.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/v4l2-common.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/v4l2-dv-timings.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/v4l2-mem2mem.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf-core.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf-dma-contig.ko @@ -1059,6 +1077,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf2-dma-contig.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf2-memops.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videodev.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/core #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/core/memstick.ko diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index eee6ad22ce..c2d3cd2765 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -53,6 +53,7 @@ boot/dtb-KVER-ipfire-multi #boot/dtb-KVER-ipfire-multi/imx6dl-sabresd.dtb #boot/dtb-KVER-ipfire-multi/imx6dl-wandboard.dtb #boot/dtb-KVER-ipfire-multi/imx6q-arm2.dtb +#boot/dtb-KVER-ipfire-multi/imx6q-cm-fx6.dtb #boot/dtb-KVER-ipfire-multi/imx6q-cubox-i.dtb #boot/dtb-KVER-ipfire-multi/imx6q-gw51xx.dtb #boot/dtb-KVER-ipfire-multi/imx6q-gw52xx.dtb @@ -110,8 +111,10 @@ boot/dtb-KVER-ipfire-multi #boot/dtb-KVER-ipfire-multi/sun5i-a13-olinuxino.dtb #boot/dtb-KVER-ipfire-multi/sun6i-a31-colombus.dtb #boot/dtb-KVER-ipfire-multi/sun7i-a20-bananapi.dtb +#boot/dtb-KVER-ipfire-multi/sun7i-a20-bananapro.dtb #boot/dtb-KVER-ipfire-multi/sun7i-a20-cubieboard2.dtb #boot/dtb-KVER-ipfire-multi/sun7i-a20-cubietruck.dtb +#boot/dtb-KVER-ipfire-multi/sun7i-a20-lamobo-r1.dtb #boot/dtb-KVER-ipfire-multi/sun7i-a20-olinuxino-micro.dtb #boot/dtb-KVER-ipfire-multi/sun7i-a20-pcduino3.dtb #boot/dtb-KVER-ipfire-multi/vexpress-v2p-ca15-tc1.dtb @@ -596,6 +599,8 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/media/common/siano/smsdvb.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/common/siano/smsmdtv.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/common/tveeprom.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-core +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-core/dvb-core.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/a8293.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/af9013.ko @@ -694,6 +699,7 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/cs53l32a.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/cx25840 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/cx25840/cx25840.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/ir-kbd-i2c.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/m52790.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/msp3400.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/mt9v011.ko @@ -728,6 +734,7 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/vp27smpx.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/wm8739.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/wm8775.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/media.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/b2c2 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/b2c2/b2c2-flexcop-pci.ko @@ -793,6 +800,8 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/ttpci/ttpci-eeprom.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/m2m-deinterlace.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/omap +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/omap/omap-vout.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/sh_veu.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/soc_camera #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/soc_camera/mx3_camera.ko @@ -925,6 +934,7 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/keymaps/rc-winfast.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/lirc_dev.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/mceusb.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/rc-core.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/rc-loopback.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/redrat3.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/streamzap.ko @@ -938,8 +948,10 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/fc2580.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/m88ts2022.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/max2165.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mc44s803.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mt2060.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mt2063.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mt20xx.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mt2131.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mt2266.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mxl5005s.ko @@ -948,8 +960,17 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/r820t.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tda18212.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tda18218.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tda18271.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tda827x.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tda8290.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tda9887.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tua9001.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tuner-simple.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tuner-types.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tuner-xc2028.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tuner_it913x.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/xc4000.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/xc5000.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/au0828 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/au0828/au0828.ko @@ -1092,7 +1113,11 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/zr364xx/zr364xx.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/tuner.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/v4l2-common.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/v4l2-dv-timings.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/v4l2-mem2mem.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-core.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-dma-contig.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-dma-sg.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-dvb.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-vmalloc.ko @@ -1100,6 +1125,7 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf2-dma-contig.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf2-memops.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videodev.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/memstick #lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/core #lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/core/memstick.ko @@ -1261,8 +1287,6 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/jme.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/mv643xx_eth.ko -#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/mvmdio.ko -#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/mvneta.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/skge.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/sky2.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/mellanox @@ -1352,6 +1376,9 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/amd.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/at803x.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/b53 +#lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/b53/b53_common.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/b53/b53_mdio.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/bcm87xx.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/broadcom.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/cicada.ko @@ -1362,6 +1389,7 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/lxt.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/marvell.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/mdio-bitbang.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/mdio-gpio.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/mdio-mux-gpio.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/mdio-mux-mmioreg.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/mdio-mux.ko @@ -1372,6 +1400,7 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/realtek.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/smsc.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/ste10Xp.ko +#lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/swconfig.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/vitesse.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ppp #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ppp/bsd_comp.ko @@ -1605,7 +1634,6 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-max6900.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-moxart.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-msm6242.ko -#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-mv.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-mxc.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-pcf2127.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-pcf8523.ko @@ -2684,4 +2712,5 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/modules.symbols #lib/modules/KVER-ipfire-multi/modules.symbols.bin #lib/modules/KVER-ipfire-multi/source +usr/include/linux/switch.h boot/uInit-ipfire-multi diff --git a/config/rootfiles/common/armv5tel/linux-rpi b/config/rootfiles/common/armv5tel/linux-rpi index ee74ac3452..dbde8c05b8 100644 --- a/config/rootfiles/common/armv5tel/linux-rpi +++ b/config/rootfiles/common/armv5tel/linux-rpi @@ -778,6 +778,7 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ifb.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/imq.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/macvlan.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/mii.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/netconsole.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/libphy.ko @@ -824,8 +825,10 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/rtl8150.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/sierra_net.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/smsc75xx.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/smsc95xx.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/sr9700.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/sr9800.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/usbnet.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/zaurus.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/veth.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless diff --git a/config/rootfiles/common/armv5tel/swconfig b/config/rootfiles/common/armv5tel/swconfig new file mode 100644 index 0000000000..720791e5c7 --- /dev/null +++ b/config/rootfiles/common/armv5tel/swconfig @@ -0,0 +1 @@ +usr/bin/swconfig diff --git a/config/rootfiles/common/armv5tel/util-linux b/config/rootfiles/common/armv5tel/util-linux index 0f36409508..2675dd0a8f 100644 --- a/config/rootfiles/common/armv5tel/util-linux +++ b/config/rootfiles/common/armv5tel/util-linux @@ -74,7 +74,7 @@ usr/bin/renice #usr/bin/setarch usr/bin/setsid #usr/bin/setterm -#usr/bin/tailf +usr/bin/tailf #usr/bin/taskset #usr/bin/ul #usr/bin/unshare diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd index 5c2064dbdc..cac4c3de14 100644 --- a/config/rootfiles/common/collectd +++ b/config/rootfiles/common/collectd @@ -213,15 +213,18 @@ usr/lib/collectd/write_http.so usr/lib/libcollectdclient.so usr/lib/libcollectdclient.so.0 usr/lib/libcollectdclient.so.0.0.0 -#usr/lib/perl5/site_perl/5.12.3/Collectd -#usr/lib/perl5/site_perl/5.12.3/Collectd.pm -#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins -#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins/Monitorus.pm -#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins/OpenVZ.pm -#usr/lib/perl5/site_perl/5.12.3/Collectd/Unixsock.pm -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Collectd -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Collectd/.packlist +#usr/lib/perl5/Collectd +#usr/lib/perl5/Collectd.pm +#usr/lib/perl5/Collectd/Plugins +#usr/lib/perl5/Collectd/Plugins/OpenVZ.pm +#usr/lib/perl5/Collectd/Unixsock.pm +#usr/lib/perl5/MACHINE-linux-thread-multi +#usr/lib/perl5/MACHINE-linux-thread-multi/auto +#usr/lib/perl5/MACHINE-linux-thread-multi/auto/Collectd +#usr/lib/perl5/MACHINE-linux-thread-multi/auto/Collectd/.packlist +#usr/lib/perl5/MACHINE-linux-thread-multi/perllocal.pod #usr/lib/pkgconfig/libcollectdclient.pc +#usr/man/man3/Collectd::Unixsock.3 usr/sbin/collectd usr/sbin/collectdmon #usr/share/collectd @@ -230,7 +233,6 @@ usr/share/collectd/types.db #usr/share/man/man1/collectd-nagios.1 #usr/share/man/man1/collectd.1 #usr/share/man/man1/collectdmon.1 -#usr/share/man/man3/Collectd::Unixsock.3 #usr/share/man/man5/collectd-email.5 #usr/share/man/man5/collectd-exec.5 #usr/share/man/man5/collectd-java.5 @@ -241,3 +243,4 @@ usr/share/collectd/types.db #usr/share/man/man5/collectd.conf.5 #usr/share/man/man5/types.db.5 #var/lib/collectd +var/ipfire/ovpn/collectd.vpn diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index eaf1af6ed8..f6cbb61efd 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -52,6 +52,7 @@ var/ipfire/extrahd var/ipfire/firewall #var/ipfire/firewall/config #var/ipfire/firewall/dmz +#var/ipfire/firewall/geoipblock #var/ipfire/firewall/input #var/ipfire/firewall/nat #var/ipfire/firewall/outgoing @@ -59,6 +60,7 @@ var/ipfire/firewall #var/ipfire/firewall/settings var/ipfire/fwhosts #var/ipfire/fwhosts/customgroups +#var/ipfire/fwhosts/customgeoipgrp #var/ipfire/fwhosts/customhosts #var/ipfire/fwhosts/customnetworks #var/ipfire/fwhosts/customservicegrp @@ -69,6 +71,7 @@ var/ipfire/fwlogs #var/ipfire/fwlogs/ipsettings #var/ipfire/fwlogs/portsettings var/ipfire/general-functions.pl +var/ipfire/geoip-functions.pl var/ipfire/graphs.pl var/ipfire/header.pl var/ipfire/isdn diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda index 74f0850ed2..1e6f6025a4 100644 --- a/config/rootfiles/common/crda +++ b/config/rootfiles/common/crda @@ -1,8 +1,8 @@ lib/udev/rules.d/85-regulatory.rules #root/.python-eggs -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-i586.egg-tmp -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-i586.egg-tmp/M2Crypto -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-i586.egg-tmp/M2Crypto/__m2crypto.so +#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-MACHINE.egg-tmp +#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-MACHINE.egg-tmp/M2Crypto +#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-MACHINE.egg-tmp/M2Crypto/__m2crypto.so sbin/crda sbin/regdbdump #usr/include/reglib diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl index c5567519b6..af32dfa6a1 100644 --- a/config/rootfiles/common/curl +++ b/config/rootfiles/common/curl @@ -10,7 +10,6 @@ usr/bin/curl #usr/include/curl/multi.h #usr/include/curl/stdcheaders.h #usr/include/curl/typecheck-gcc.h -#usr/include/curl/types.h #usr/lib/libcurl.a #usr/lib/libcurl.la usr/lib/libcurl.so @@ -18,9 +17,233 @@ usr/lib/libcurl.so.3 usr/lib/libcurl.so.4 usr/lib/libcurl.so.4.3.0 #usr/lib/pkgconfig/libcurl.pc +#usr/share/aclocal/libcurl.m4 #usr/share/man/man1/curl-config.1 #usr/share/man/man1/curl.1 -#usr/share/man/man1/mk-ca-bundle.1 +#usr/share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3 +#usr/share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3 +#usr/share/man/man3/CURLMOPT_MAXCONNECTS.3 +#usr/share/man/man3/CURLMOPT_MAX_HOST_CONNECTIONS.3 +#usr/share/man/man3/CURLMOPT_MAX_PIPELINE_LENGTH.3 +#usr/share/man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3 +#usr/share/man/man3/CURLMOPT_PIPELINING.3 +#usr/share/man/man3/CURLMOPT_PIPELINING_SERVER_BL.3 +#usr/share/man/man3/CURLMOPT_PIPELINING_SITE_BL.3 +#usr/share/man/man3/CURLMOPT_SOCKETDATA.3 +#usr/share/man/man3/CURLMOPT_SOCKETFUNCTION.3 +#usr/share/man/man3/CURLMOPT_TIMERDATA.3 +#usr/share/man/man3/CURLMOPT_TIMERFUNCTION.3 +#usr/share/man/man3/CURLOPT_ACCEPTTIMEOUT_MS.3 +#usr/share/man/man3/CURLOPT_ACCEPT_ENCODING.3 +#usr/share/man/man3/CURLOPT_ADDRESS_SCOPE.3 +#usr/share/man/man3/CURLOPT_APPEND.3 +#usr/share/man/man3/CURLOPT_AUTOREFERER.3 +#usr/share/man/man3/CURLOPT_BUFFERSIZE.3 +#usr/share/man/man3/CURLOPT_CAINFO.3 +#usr/share/man/man3/CURLOPT_CAPATH.3 +#usr/share/man/man3/CURLOPT_CERTINFO.3 +#usr/share/man/man3/CURLOPT_CHUNK_BGN_FUNCTION.3 +#usr/share/man/man3/CURLOPT_CHUNK_DATA.3 +#usr/share/man/man3/CURLOPT_CHUNK_END_FUNCTION.3 +#usr/share/man/man3/CURLOPT_CLOSESOCKETDATA.3 +#usr/share/man/man3/CURLOPT_CLOSESOCKETFUNCTION.3 +#usr/share/man/man3/CURLOPT_CONNECTTIMEOUT.3 +#usr/share/man/man3/CURLOPT_CONNECTTIMEOUT_MS.3 +#usr/share/man/man3/CURLOPT_CONNECT_ONLY.3 +#usr/share/man/man3/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3 +#usr/share/man/man3/CURLOPT_CONV_FROM_UTF8_FUNCTION.3 +#usr/share/man/man3/CURLOPT_CONV_TO_NETWORK_FUNCTION.3 +#usr/share/man/man3/CURLOPT_COOKIE.3 +#usr/share/man/man3/CURLOPT_COOKIEFILE.3 +#usr/share/man/man3/CURLOPT_COOKIEJAR.3 +#usr/share/man/man3/CURLOPT_COOKIELIST.3 +#usr/share/man/man3/CURLOPT_COOKIESESSION.3 +#usr/share/man/man3/CURLOPT_COPYPOSTFIELDS.3 +#usr/share/man/man3/CURLOPT_CRLF.3 +#usr/share/man/man3/CURLOPT_CRLFILE.3 +#usr/share/man/man3/CURLOPT_CUSTOMREQUEST.3 +#usr/share/man/man3/CURLOPT_DEBUGDATA.3 +#usr/share/man/man3/CURLOPT_DEBUGFUNCTION.3 +#usr/share/man/man3/CURLOPT_DIRLISTONLY.3 +#usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3 +#usr/share/man/man3/CURLOPT_DNS_INTERFACE.3 +#usr/share/man/man3/CURLOPT_DNS_LOCAL_IP4.3 +#usr/share/man/man3/CURLOPT_DNS_LOCAL_IP6.3 +#usr/share/man/man3/CURLOPT_DNS_SERVERS.3 +#usr/share/man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3 +#usr/share/man/man3/CURLOPT_EGDSOCKET.3 +#usr/share/man/man3/CURLOPT_ERRORBUFFER.3 +#usr/share/man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3 +#usr/share/man/man3/CURLOPT_FAILONERROR.3 +#usr/share/man/man3/CURLOPT_FILETIME.3 +#usr/share/man/man3/CURLOPT_FNMATCH_DATA.3 +#usr/share/man/man3/CURLOPT_FNMATCH_FUNCTION.3 +#usr/share/man/man3/CURLOPT_FOLLOWLOCATION.3 +#usr/share/man/man3/CURLOPT_FORBID_REUSE.3 +#usr/share/man/man3/CURLOPT_FRESH_CONNECT.3 +#usr/share/man/man3/CURLOPT_FTPPORT.3 +#usr/share/man/man3/CURLOPT_FTPSSLAUTH.3 +#usr/share/man/man3/CURLOPT_FTP_ACCOUNT.3 +#usr/share/man/man3/CURLOPT_FTP_ALTERNATIVE_TO_USER.3 +#usr/share/man/man3/CURLOPT_FTP_CREATE_MISSING_DIRS.3 +#usr/share/man/man3/CURLOPT_FTP_FILEMETHOD.3 +#usr/share/man/man3/CURLOPT_FTP_RESPONSE_TIMEOUT.3 +#usr/share/man/man3/CURLOPT_FTP_SKIP_PASV_IP.3 +#usr/share/man/man3/CURLOPT_FTP_SSL_CCC.3 +#usr/share/man/man3/CURLOPT_FTP_USE_EPRT.3 +#usr/share/man/man3/CURLOPT_FTP_USE_EPSV.3 +#usr/share/man/man3/CURLOPT_FTP_USE_PRET.3 +#usr/share/man/man3/CURLOPT_GSSAPI_DELEGATION.3 +#usr/share/man/man3/CURLOPT_HEADER.3 +#usr/share/man/man3/CURLOPT_HEADERDATA.3 +#usr/share/man/man3/CURLOPT_HEADERFUNCTION.3 +#usr/share/man/man3/CURLOPT_HEADEROPT.3 +#usr/share/man/man3/CURLOPT_HTTP200ALIASES.3 +#usr/share/man/man3/CURLOPT_HTTPAUTH.3 +#usr/share/man/man3/CURLOPT_HTTPGET.3 +#usr/share/man/man3/CURLOPT_HTTPHEADER.3 +#usr/share/man/man3/CURLOPT_HTTPPOST.3 +#usr/share/man/man3/CURLOPT_HTTPPROXYTUNNEL.3 +#usr/share/man/man3/CURLOPT_HTTP_CONTENT_DECODING.3 +#usr/share/man/man3/CURLOPT_HTTP_TRANSFER_DECODING.3 +#usr/share/man/man3/CURLOPT_HTTP_VERSION.3 +#usr/share/man/man3/CURLOPT_IGNORE_CONTENT_LENGTH.3 +#usr/share/man/man3/CURLOPT_INFILESIZE.3 +#usr/share/man/man3/CURLOPT_INFILESIZE_LARGE.3 +#usr/share/man/man3/CURLOPT_INTERFACE.3 +#usr/share/man/man3/CURLOPT_INTERLEAVEDATA.3 +#usr/share/man/man3/CURLOPT_INTERLEAVEFUNCTION.3 +#usr/share/man/man3/CURLOPT_IOCTLDATA.3 +#usr/share/man/man3/CURLOPT_IOCTLFUNCTION.3 +#usr/share/man/man3/CURLOPT_IPRESOLVE.3 +#usr/share/man/man3/CURLOPT_ISSUERCERT.3 +#usr/share/man/man3/CURLOPT_KEYPASSWD.3 +#usr/share/man/man3/CURLOPT_KRBLEVEL.3 +#usr/share/man/man3/CURLOPT_LOCALPORT.3 +#usr/share/man/man3/CURLOPT_LOCALPORTRANGE.3 +#usr/share/man/man3/CURLOPT_LOGIN_OPTIONS.3 +#usr/share/man/man3/CURLOPT_LOW_SPEED_LIMIT.3 +#usr/share/man/man3/CURLOPT_LOW_SPEED_TIME.3 +#usr/share/man/man3/CURLOPT_MAIL_AUTH.3 +#usr/share/man/man3/CURLOPT_MAIL_FROM.3 +#usr/share/man/man3/CURLOPT_MAIL_RCPT.3 +#usr/share/man/man3/CURLOPT_MAXCONNECTS.3 +#usr/share/man/man3/CURLOPT_MAXFILESIZE.3 +#usr/share/man/man3/CURLOPT_MAXFILESIZE_LARGE.3 +#usr/share/man/man3/CURLOPT_MAXREDIRS.3 +#usr/share/man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3 +#usr/share/man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3 +#usr/share/man/man3/CURLOPT_NETRC.3 +#usr/share/man/man3/CURLOPT_NETRC_FILE.3 +#usr/share/man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3 +#usr/share/man/man3/CURLOPT_NEW_FILE_PERMS.3 +#usr/share/man/man3/CURLOPT_NOBODY.3 +#usr/share/man/man3/CURLOPT_NOPROGRESS.3 +#usr/share/man/man3/CURLOPT_NOPROXY.3 +#usr/share/man/man3/CURLOPT_NOSIGNAL.3 +#usr/share/man/man3/CURLOPT_OPENSOCKETDATA.3 +#usr/share/man/man3/CURLOPT_OPENSOCKETFUNCTION.3 +#usr/share/man/man3/CURLOPT_PASSWORD.3 +#usr/share/man/man3/CURLOPT_PORT.3 +#usr/share/man/man3/CURLOPT_POST.3 +#usr/share/man/man3/CURLOPT_POSTFIELDS.3 +#usr/share/man/man3/CURLOPT_POSTFIELDSIZE.3 +#usr/share/man/man3/CURLOPT_POSTFIELDSIZE_LARGE.3 +#usr/share/man/man3/CURLOPT_POSTQUOTE.3 +#usr/share/man/man3/CURLOPT_POSTREDIR.3 +#usr/share/man/man3/CURLOPT_PREQUOTE.3 +#usr/share/man/man3/CURLOPT_PRIVATE.3 +#usr/share/man/man3/CURLOPT_PROGRESSDATA.3 +#usr/share/man/man3/CURLOPT_PROGRESSFUNCTION.3 +#usr/share/man/man3/CURLOPT_PROTOCOLS.3 +#usr/share/man/man3/CURLOPT_PROXY.3 +#usr/share/man/man3/CURLOPT_PROXYAUTH.3 +#usr/share/man/man3/CURLOPT_PROXYHEADER.3 +#usr/share/man/man3/CURLOPT_PROXYPASSWORD.3 +#usr/share/man/man3/CURLOPT_PROXYPORT.3 +#usr/share/man/man3/CURLOPT_PROXYTYPE.3 +#usr/share/man/man3/CURLOPT_PROXYUSERNAME.3 +#usr/share/man/man3/CURLOPT_PROXYUSERPWD.3 +#usr/share/man/man3/CURLOPT_PROXY_TRANSFER_MODE.3 +#usr/share/man/man3/CURLOPT_PUT.3 +#usr/share/man/man3/CURLOPT_QUOTE.3 +#usr/share/man/man3/CURLOPT_RANDOM_FILE.3 +#usr/share/man/man3/CURLOPT_RANGE.3 +#usr/share/man/man3/CURLOPT_READDATA.3 +#usr/share/man/man3/CURLOPT_READFUNCTION.3 +#usr/share/man/man3/CURLOPT_REDIR_PROTOCOLS.3 +#usr/share/man/man3/CURLOPT_REFERER.3 +#usr/share/man/man3/CURLOPT_RESOLVE.3 +#usr/share/man/man3/CURLOPT_RESUME_FROM.3 +#usr/share/man/man3/CURLOPT_RESUME_FROM_LARGE.3 +#usr/share/man/man3/CURLOPT_RTSP_CLIENT_CSEQ.3 +#usr/share/man/man3/CURLOPT_RTSP_REQUEST.3 +#usr/share/man/man3/CURLOPT_RTSP_SERVER_CSEQ.3 +#usr/share/man/man3/CURLOPT_RTSP_SESSION_ID.3 +#usr/share/man/man3/CURLOPT_RTSP_STREAM_URI.3 +#usr/share/man/man3/CURLOPT_RTSP_TRANSPORT.3 +#usr/share/man/man3/CURLOPT_SASL_IR.3 +#usr/share/man/man3/CURLOPT_SEEKDATA.3 +#usr/share/man/man3/CURLOPT_SEEKFUNCTION.3 +#usr/share/man/man3/CURLOPT_SHARE.3 +#usr/share/man/man3/CURLOPT_SOCKOPTDATA.3 +#usr/share/man/man3/CURLOPT_SOCKOPTFUNCTION.3 +#usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3 +#usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3 +#usr/share/man/man3/CURLOPT_SSH_AUTH_TYPES.3 +#usr/share/man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3 +#usr/share/man/man3/CURLOPT_SSH_KEYDATA.3 +#usr/share/man/man3/CURLOPT_SSH_KEYFUNCTION.3 +#usr/share/man/man3/CURLOPT_SSH_KNOWNHOSTS.3 +#usr/share/man/man3/CURLOPT_SSH_PRIVATE_KEYFILE.3 +#usr/share/man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3 +#usr/share/man/man3/CURLOPT_SSLCERT.3 +#usr/share/man/man3/CURLOPT_SSLCERTTYPE.3 +#usr/share/man/man3/CURLOPT_SSLENGINE.3 +#usr/share/man/man3/CURLOPT_SSLENGINE_DEFAULT.3 +#usr/share/man/man3/CURLOPT_SSLKEY.3 +#usr/share/man/man3/CURLOPT_SSLKEYTYPE.3 +#usr/share/man/man3/CURLOPT_SSLVERSION.3 +#usr/share/man/man3/CURLOPT_SSL_CIPHER_LIST.3 +#usr/share/man/man3/CURLOPT_SSL_CTX_DATA.3 +#usr/share/man/man3/CURLOPT_SSL_CTX_FUNCTION.3 +#usr/share/man/man3/CURLOPT_SSL_ENABLE_ALPN.3 +#usr/share/man/man3/CURLOPT_SSL_ENABLE_NPN.3 +#usr/share/man/man3/CURLOPT_SSL_OPTIONS.3 +#usr/share/man/man3/CURLOPT_SSL_SESSIONID_CACHE.3 +#usr/share/man/man3/CURLOPT_SSL_VERIFYHOST.3 +#usr/share/man/man3/CURLOPT_SSL_VERIFYPEER.3 +#usr/share/man/man3/CURLOPT_STDERR.3 +#usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3 +#usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3 +#usr/share/man/man3/CURLOPT_TCP_KEEPINTVL.3 +#usr/share/man/man3/CURLOPT_TCP_NODELAY.3 +#usr/share/man/man3/CURLOPT_TELNETOPTIONS.3 +#usr/share/man/man3/CURLOPT_TFTP_BLKSIZE.3 +#usr/share/man/man3/CURLOPT_TIMECONDITION.3 +#usr/share/man/man3/CURLOPT_TIMEOUT.3 +#usr/share/man/man3/CURLOPT_TIMEOUT_MS.3 +#usr/share/man/man3/CURLOPT_TIMEVALUE.3 +#usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3 +#usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3 +#usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3 +#usr/share/man/man3/CURLOPT_TRANSFERTEXT.3 +#usr/share/man/man3/CURLOPT_TRANSFER_ENCODING.3 +#usr/share/man/man3/CURLOPT_UNIX_SOCKET_PATH.3 +#usr/share/man/man3/CURLOPT_UNRESTRICTED_AUTH.3 +#usr/share/man/man3/CURLOPT_UPLOAD.3 +#usr/share/man/man3/CURLOPT_URL.3 +#usr/share/man/man3/CURLOPT_USERAGENT.3 +#usr/share/man/man3/CURLOPT_USERNAME.3 +#usr/share/man/man3/CURLOPT_USERPWD.3 +#usr/share/man/man3/CURLOPT_USE_SSL.3 +#usr/share/man/man3/CURLOPT_VERBOSE.3 +#usr/share/man/man3/CURLOPT_WILDCARDMATCH.3 +#usr/share/man/man3/CURLOPT_WRITEDATA.3 +#usr/share/man/man3/CURLOPT_WRITEFUNCTION.3 +#usr/share/man/man3/CURLOPT_XFERINFODATA.3 +#usr/share/man/man3/CURLOPT_XFERINFOFUNCTION.3 +#usr/share/man/man3/CURLOPT_XOAUTH2_BEARER.3 #usr/share/man/man3/curl_easy_cleanup.3 #usr/share/man/man3/curl_easy_duphandle.3 #usr/share/man/man3/curl_easy_escape.3 diff --git a/config/rootfiles/common/cyrus-sasl b/config/rootfiles/common/cyrus-sasl index 08a732182b..7934c1cf98 100644 --- a/config/rootfiles/common/cyrus-sasl +++ b/config/rootfiles/common/cyrus-sasl @@ -1,4 +1,3 @@ -etc/rc.d/init.d/cyrus-sasl #usr/include/sasl #usr/include/sasl/hmac-md5.h #usr/include/sasl/md5.h @@ -9,39 +8,44 @@ etc/rc.d/init.d/cyrus-sasl #usr/include/sasl/saslutil.h #usr/lib/libsasl2.la usr/lib/libsasl2.so -usr/lib/libsasl2.so.2 -usr/lib/libsasl2.so.2.0.21 +usr/lib/libsasl2.so.3 +usr/lib/libsasl2.so.3.0.0 +#usr/lib/pkgconfig/libsasl2.pc #usr/lib/sasl2 #usr/lib/sasl2/libanonymous.la usr/lib/sasl2/libanonymous.so -usr/lib/sasl2/libanonymous.so.2 -usr/lib/sasl2/libanonymous.so.2.0.21 +usr/lib/sasl2/libanonymous.so.3 +usr/lib/sasl2/libanonymous.so.3.0.0 #usr/lib/sasl2/libcrammd5.la usr/lib/sasl2/libcrammd5.so -usr/lib/sasl2/libcrammd5.so.2 -usr/lib/sasl2/libcrammd5.so.2.0.21 +usr/lib/sasl2/libcrammd5.so.3 +usr/lib/sasl2/libcrammd5.so.3.0.0 #usr/lib/sasl2/libdigestmd5.la usr/lib/sasl2/libdigestmd5.so -usr/lib/sasl2/libdigestmd5.so.2 -usr/lib/sasl2/libdigestmd5.so.2.0.21 +usr/lib/sasl2/libdigestmd5.so.3 +usr/lib/sasl2/libdigestmd5.so.3.0.0 #usr/lib/sasl2/libotp.la usr/lib/sasl2/libotp.so -usr/lib/sasl2/libotp.so.2 -usr/lib/sasl2/libotp.so.2.0.21 +usr/lib/sasl2/libotp.so.3 +usr/lib/sasl2/libotp.so.3.0.0 #usr/lib/sasl2/libplain.la usr/lib/sasl2/libplain.so -usr/lib/sasl2/libplain.so.2 -usr/lib/sasl2/libplain.so.2.0.21 +usr/lib/sasl2/libplain.so.3 +usr/lib/sasl2/libplain.so.3.0.0 #usr/lib/sasl2/libsasldb.la usr/lib/sasl2/libsasldb.so -usr/lib/sasl2/libsasldb.so.2 -usr/lib/sasl2/libsasldb.so.2.0.21 +usr/lib/sasl2/libsasldb.so.3 +usr/lib/sasl2/libsasldb.so.3.0.0 +#usr/lib/sasl2/libscram.la +usr/lib/sasl2/libscram.so +usr/lib/sasl2/libscram.so.3 +usr/lib/sasl2/libscram.so.3.0.0 usr/lib/sasl2/smtpd.conf -#usr/man/cat8 -#usr/man/cat8/saslauthd.8 +usr/sbin/pluginviewer usr/sbin/saslauthd usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2 +usr/sbin/testsaslauthd #usr/share/man/man3/sasl.3 #usr/share/man/man3/sasl_authorize_t.3 #usr/share/man/man3/sasl_auxprop.3 @@ -64,6 +68,7 @@ usr/sbin/saslpasswd2 #usr/share/man/man3/sasl_errdetail.3 #usr/share/man/man3/sasl_errors.3 #usr/share/man/man3/sasl_errstring.3 +#usr/share/man/man3/sasl_getconfpath_t.3 #usr/share/man/man3/sasl_getopt_t.3 #usr/share/man/man3/sasl_getpath_t.3 #usr/share/man/man3/sasl_getprop.3 @@ -84,6 +89,9 @@ usr/sbin/saslpasswd2 #usr/share/man/man3/sasl_setprop.3 #usr/share/man/man3/sasl_user_exists.3 #usr/share/man/man3/sasl_verifyfile_t.3 +#usr/share/man/man8/pluginviewer.8 +#usr/share/man/man8/saslauthd.8 #usr/share/man/man8/sasldblistusers2.8 #usr/share/man/man8/saslpasswd2.8 var/lib/sasl +etc/rc.d/init.d/cyrus-sasl diff --git a/config/rootfiles/common/dhcp b/config/rootfiles/common/dhcp index 2c2cfeeb38..ff225a5714 100644 --- a/config/rootfiles/common/dhcp +++ b/config/rootfiles/common/dhcp @@ -1,6 +1,7 @@ #etc/dhcp -#etc/dhcp/dhclient.conf +#etc/dhcp/dhclient.conf.example etc/dhcp/dhcpd.conf +#etc/dhcp/dhcpd.conf.example #usr/bin/omshell #usr/include/dhcpctl #usr/include/dhcpctl/dhcpctl.h diff --git a/config/rootfiles/common/dhcpcd b/config/rootfiles/common/dhcpcd index 3f62fc6559..ffbe04ae4d 100644 --- a/config/rootfiles/common/dhcpcd +++ b/config/rootfiles/common/dhcpcd @@ -1,3 +1,6 @@ +#lib/dhcpcd +#lib/dhcpcd/dev +#lib/dhcpcd/dev/udev.so sbin/dhcpcd #usr/share/man/man5/dhcpcd.conf.5 #usr/share/man/man8/dhcpcd-run-hooks.8 @@ -6,6 +9,8 @@ var/ipfire/dhcpc/dhcpcd-hooks #var/ipfire/dhcpc/dhcpcd-hooks/01-test #var/ipfire/dhcpc/dhcpcd-hooks/02-dump #var/ipfire/dhcpc/dhcpcd-hooks/10-mtu +#var/ipfire/dhcpc/dhcpcd-hooks/10-wpa_supplicant +#var/ipfire/dhcpc/dhcpcd-hooks/15-timezone #var/ipfire/dhcpc/dhcpcd-hooks/29-lookup-hostname #var/ipfire/dhcpc/dhcpcd-hooks/30-hostname #var/ipfire/dhcpc/dhcpcd-hooks/70-dhcpcd.exe diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat index 17081c415f..aaa8265cc3 100644 --- a/config/rootfiles/common/expat +++ b/config/rootfiles/common/expat @@ -5,10 +5,11 @@ #usr/lib/libexpat.la usr/lib/libexpat.so usr/lib/libexpat.so.1 -usr/lib/libexpat.so.1.5.0 -#usr/man/man1/xmlwf.1 -#usr/share/doc/expat-2.0.0 -#usr/share/doc/expat-2.0.0/expat.png -#usr/share/doc/expat-2.0.0/reference.html -#usr/share/doc/expat-2.0.0/style.css -#usr/share/doc/expat-2.0.0/valid-xhtml10.png +usr/lib/libexpat.so.1.6.0 +#usr/lib/pkgconfig/expat.pc +#usr/share/doc/expat-2.1.0 +#usr/share/doc/expat-2.1.0/expat.png +#usr/share/doc/expat-2.1.0/reference.html +#usr/share/doc/expat-2.1.0/style.css +#usr/share/doc/expat-2.1.0/valid-xhtml10.png +#usr/share/man/man1/xmlwf.1 diff --git a/config/rootfiles/common/flag-icons b/config/rootfiles/common/flag-icons new file mode 100644 index 0000000000..eee2c0ce86 --- /dev/null +++ b/config/rootfiles/common/flag-icons @@ -0,0 +1,243 @@ +srv/web/ipfire/html/images/flags +#srv/web/ipfire/html/images/flags/AD.png +#srv/web/ipfire/html/images/flags/AE.png +#srv/web/ipfire/html/images/flags/AF.png +#srv/web/ipfire/html/images/flags/AG.png +#srv/web/ipfire/html/images/flags/AI.png +#srv/web/ipfire/html/images/flags/AL.png +#srv/web/ipfire/html/images/flags/AM.png +#srv/web/ipfire/html/images/flags/AN.png +#srv/web/ipfire/html/images/flags/AO.png +#srv/web/ipfire/html/images/flags/AQ.png +#srv/web/ipfire/html/images/flags/AR.png +#srv/web/ipfire/html/images/flags/AS.png +#srv/web/ipfire/html/images/flags/AT.png +#srv/web/ipfire/html/images/flags/AU.png +#srv/web/ipfire/html/images/flags/AW.png +#srv/web/ipfire/html/images/flags/AX.png +#srv/web/ipfire/html/images/flags/AZ.png +#srv/web/ipfire/html/images/flags/BA.png +#srv/web/ipfire/html/images/flags/BB.png +#srv/web/ipfire/html/images/flags/BD.png +#srv/web/ipfire/html/images/flags/BE.png +#srv/web/ipfire/html/images/flags/BF.png +#srv/web/ipfire/html/images/flags/BG.png +#srv/web/ipfire/html/images/flags/BH.png +#srv/web/ipfire/html/images/flags/BI.png +#srv/web/ipfire/html/images/flags/BJ.png +#srv/web/ipfire/html/images/flags/BL.png +#srv/web/ipfire/html/images/flags/BM.png +#srv/web/ipfire/html/images/flags/BN.png +#srv/web/ipfire/html/images/flags/BO.png +#srv/web/ipfire/html/images/flags/BR.png +#srv/web/ipfire/html/images/flags/BS.png +#srv/web/ipfire/html/images/flags/BT.png +#srv/web/ipfire/html/images/flags/BW.png +#srv/web/ipfire/html/images/flags/BY.png +#srv/web/ipfire/html/images/flags/BZ.png +#srv/web/ipfire/html/images/flags/CA.png +#srv/web/ipfire/html/images/flags/CC.png +#srv/web/ipfire/html/images/flags/CD.png +#srv/web/ipfire/html/images/flags/CF.png +#srv/web/ipfire/html/images/flags/CG.png +#srv/web/ipfire/html/images/flags/CH.png +#srv/web/ipfire/html/images/flags/CI.png +#srv/web/ipfire/html/images/flags/CK.png +#srv/web/ipfire/html/images/flags/CL.png +#srv/web/ipfire/html/images/flags/CM.png +#srv/web/ipfire/html/images/flags/CN.png +#srv/web/ipfire/html/images/flags/CO.png +#srv/web/ipfire/html/images/flags/CR.png +#srv/web/ipfire/html/images/flags/CU.png +#srv/web/ipfire/html/images/flags/CV.png +#srv/web/ipfire/html/images/flags/CW.png +#srv/web/ipfire/html/images/flags/CX.png +#srv/web/ipfire/html/images/flags/CY.png +#srv/web/ipfire/html/images/flags/CZ.png +#srv/web/ipfire/html/images/flags/DE.png +#srv/web/ipfire/html/images/flags/DJ.png +#srv/web/ipfire/html/images/flags/DK.png +#srv/web/ipfire/html/images/flags/DM.png +#srv/web/ipfire/html/images/flags/DO.png +#srv/web/ipfire/html/images/flags/DZ.png +#srv/web/ipfire/html/images/flags/EC.png +#srv/web/ipfire/html/images/flags/EE.png +#srv/web/ipfire/html/images/flags/EG.png +#srv/web/ipfire/html/images/flags/EH.png +#srv/web/ipfire/html/images/flags/ER.png +#srv/web/ipfire/html/images/flags/ES.png +#srv/web/ipfire/html/images/flags/ET.png +#srv/web/ipfire/html/images/flags/EU.png +#srv/web/ipfire/html/images/flags/FI.png +#srv/web/ipfire/html/images/flags/FJ.png +#srv/web/ipfire/html/images/flags/FK.png +#srv/web/ipfire/html/images/flags/FM.png +#srv/web/ipfire/html/images/flags/FO.png +#srv/web/ipfire/html/images/flags/FR.png +#srv/web/ipfire/html/images/flags/GA.png +#srv/web/ipfire/html/images/flags/GB.png +#srv/web/ipfire/html/images/flags/GD.png +#srv/web/ipfire/html/images/flags/GE.png +#srv/web/ipfire/html/images/flags/GG.png +#srv/web/ipfire/html/images/flags/GH.png +#srv/web/ipfire/html/images/flags/GI.png +#srv/web/ipfire/html/images/flags/GL.png +#srv/web/ipfire/html/images/flags/GM.png +#srv/web/ipfire/html/images/flags/GN.png +#srv/web/ipfire/html/images/flags/GQ.png +#srv/web/ipfire/html/images/flags/GR.png +#srv/web/ipfire/html/images/flags/GS.png +#srv/web/ipfire/html/images/flags/GT.png +#srv/web/ipfire/html/images/flags/GU.png +#srv/web/ipfire/html/images/flags/GW.png +#srv/web/ipfire/html/images/flags/GY.png +#srv/web/ipfire/html/images/flags/HK.png +#srv/web/ipfire/html/images/flags/HN.png +#srv/web/ipfire/html/images/flags/HR.png +#srv/web/ipfire/html/images/flags/HT.png +#srv/web/ipfire/html/images/flags/HU.png +#srv/web/ipfire/html/images/flags/IC.png +#srv/web/ipfire/html/images/flags/ID.png +#srv/web/ipfire/html/images/flags/IE.png +#srv/web/ipfire/html/images/flags/IL.png +#srv/web/ipfire/html/images/flags/IM.png +#srv/web/ipfire/html/images/flags/IN.png +#srv/web/ipfire/html/images/flags/IQ.png +#srv/web/ipfire/html/images/flags/IR.png +#srv/web/ipfire/html/images/flags/IS.png +#srv/web/ipfire/html/images/flags/IT.png +#srv/web/ipfire/html/images/flags/JE.png +#srv/web/ipfire/html/images/flags/JM.png +#srv/web/ipfire/html/images/flags/JO.png +#srv/web/ipfire/html/images/flags/JP.png +#srv/web/ipfire/html/images/flags/KE.png +#srv/web/ipfire/html/images/flags/KG.png +#srv/web/ipfire/html/images/flags/KH.png +#srv/web/ipfire/html/images/flags/KI.png +#srv/web/ipfire/html/images/flags/KM.png +#srv/web/ipfire/html/images/flags/KN.png +#srv/web/ipfire/html/images/flags/KP.png +#srv/web/ipfire/html/images/flags/KR.png +#srv/web/ipfire/html/images/flags/KW.png +#srv/web/ipfire/html/images/flags/KY.png +#srv/web/ipfire/html/images/flags/KZ.png +#srv/web/ipfire/html/images/flags/LA.png +#srv/web/ipfire/html/images/flags/LB.png +#srv/web/ipfire/html/images/flags/LC.png +#srv/web/ipfire/html/images/flags/LI.png +#srv/web/ipfire/html/images/flags/LK.png +#srv/web/ipfire/html/images/flags/LR.png +#srv/web/ipfire/html/images/flags/LS.png +#srv/web/ipfire/html/images/flags/LT.png +#srv/web/ipfire/html/images/flags/LU.png +#srv/web/ipfire/html/images/flags/LV.png +#srv/web/ipfire/html/images/flags/LY.png +#srv/web/ipfire/html/images/flags/MA.png +#srv/web/ipfire/html/images/flags/MC.png +#srv/web/ipfire/html/images/flags/MD.png +#srv/web/ipfire/html/images/flags/ME.png +#srv/web/ipfire/html/images/flags/MF.png +#srv/web/ipfire/html/images/flags/MG.png +#srv/web/ipfire/html/images/flags/MH.png +#srv/web/ipfire/html/images/flags/MK.png +#srv/web/ipfire/html/images/flags/ML.png +#srv/web/ipfire/html/images/flags/MM.png +#srv/web/ipfire/html/images/flags/MN.png +#srv/web/ipfire/html/images/flags/MO.png +#srv/web/ipfire/html/images/flags/MP.png +#srv/web/ipfire/html/images/flags/MQ.png +#srv/web/ipfire/html/images/flags/MR.png +#srv/web/ipfire/html/images/flags/MS.png +#srv/web/ipfire/html/images/flags/MT.png +#srv/web/ipfire/html/images/flags/MU.png +#srv/web/ipfire/html/images/flags/MV.png +#srv/web/ipfire/html/images/flags/MW.png +#srv/web/ipfire/html/images/flags/MX.png +#srv/web/ipfire/html/images/flags/MY.png +#srv/web/ipfire/html/images/flags/MZ.png +#srv/web/ipfire/html/images/flags/NA.png +#srv/web/ipfire/html/images/flags/NC.png +#srv/web/ipfire/html/images/flags/NE.png +#srv/web/ipfire/html/images/flags/NF.png +#srv/web/ipfire/html/images/flags/NG.png +#srv/web/ipfire/html/images/flags/NI.png +#srv/web/ipfire/html/images/flags/NL.png +#srv/web/ipfire/html/images/flags/NO.png +#srv/web/ipfire/html/images/flags/NP.png +#srv/web/ipfire/html/images/flags/NR.png +#srv/web/ipfire/html/images/flags/NU.png +#srv/web/ipfire/html/images/flags/NZ.png +#srv/web/ipfire/html/images/flags/OM.png +#srv/web/ipfire/html/images/flags/PA.png +#srv/web/ipfire/html/images/flags/PE.png +#srv/web/ipfire/html/images/flags/PF.png +#srv/web/ipfire/html/images/flags/PG.png +#srv/web/ipfire/html/images/flags/PH.png +#srv/web/ipfire/html/images/flags/PK.png +#srv/web/ipfire/html/images/flags/PL.png +#srv/web/ipfire/html/images/flags/PN.png +#srv/web/ipfire/html/images/flags/PR.png +#srv/web/ipfire/html/images/flags/PS.png +#srv/web/ipfire/html/images/flags/PT.png +#srv/web/ipfire/html/images/flags/PW.png +#srv/web/ipfire/html/images/flags/PY.png +#srv/web/ipfire/html/images/flags/QA.png +#srv/web/ipfire/html/images/flags/RO.png +#srv/web/ipfire/html/images/flags/RS.png +#srv/web/ipfire/html/images/flags/RU.png +#srv/web/ipfire/html/images/flags/RW.png +#srv/web/ipfire/html/images/flags/SA.png +#srv/web/ipfire/html/images/flags/SB.png +#srv/web/ipfire/html/images/flags/SC.png +#srv/web/ipfire/html/images/flags/SD.png +#srv/web/ipfire/html/images/flags/SE.png +#srv/web/ipfire/html/images/flags/SG.png +#srv/web/ipfire/html/images/flags/SH.png +#srv/web/ipfire/html/images/flags/SI.png +#srv/web/ipfire/html/images/flags/SK.png +#srv/web/ipfire/html/images/flags/SL.png +#srv/web/ipfire/html/images/flags/SM.png +#srv/web/ipfire/html/images/flags/SN.png +#srv/web/ipfire/html/images/flags/SO.png +#srv/web/ipfire/html/images/flags/SR.png +#srv/web/ipfire/html/images/flags/SS.png +#srv/web/ipfire/html/images/flags/ST.png +#srv/web/ipfire/html/images/flags/SV.png +#srv/web/ipfire/html/images/flags/SY.png +#srv/web/ipfire/html/images/flags/SZ.png +#srv/web/ipfire/html/images/flags/TC.png +#srv/web/ipfire/html/images/flags/TD.png +#srv/web/ipfire/html/images/flags/TF.png +#srv/web/ipfire/html/images/flags/TG.png +#srv/web/ipfire/html/images/flags/TH.png +#srv/web/ipfire/html/images/flags/TJ.png +#srv/web/ipfire/html/images/flags/TK.png +#srv/web/ipfire/html/images/flags/TL.png +#srv/web/ipfire/html/images/flags/TM.png +#srv/web/ipfire/html/images/flags/TN.png +#srv/web/ipfire/html/images/flags/TO.png +#srv/web/ipfire/html/images/flags/TR.png +#srv/web/ipfire/html/images/flags/TT.png +#srv/web/ipfire/html/images/flags/TV.png +#srv/web/ipfire/html/images/flags/TW.png +#srv/web/ipfire/html/images/flags/TZ.png +#srv/web/ipfire/html/images/flags/UA.png +#srv/web/ipfire/html/images/flags/UG.png +#srv/web/ipfire/html/images/flags/US.png +#srv/web/ipfire/html/images/flags/UY.png +#srv/web/ipfire/html/images/flags/UZ.png +#srv/web/ipfire/html/images/flags/VA.png +#srv/web/ipfire/html/images/flags/VC.png +#srv/web/ipfire/html/images/flags/VE.png +#srv/web/ipfire/html/images/flags/VG.png +#srv/web/ipfire/html/images/flags/VI.png +#srv/web/ipfire/html/images/flags/VN.png +#srv/web/ipfire/html/images/flags/VU.png +#srv/web/ipfire/html/images/flags/WF.png +#srv/web/ipfire/html/images/flags/WS.png +#srv/web/ipfire/html/images/flags/YE.png +#srv/web/ipfire/html/images/flags/YT.png +#srv/web/ipfire/html/images/flags/ZA.png +#srv/web/ipfire/html/images/flags/ZM.png +#srv/web/ipfire/html/images/flags/ZW.png +#srv/web/ipfire/html/images/flags/unknown.png diff --git a/config/rootfiles/common/fuse b/config/rootfiles/common/fuse index 3b7ad597f2..1ab1d4810a 100644 --- a/config/rootfiles/common/fuse +++ b/config/rootfiles/common/fuse @@ -1,5 +1,6 @@ #etc/init.d #etc/init.d/fuse +#etc/rc.d/init.d/fuse etc/udev/rules.d/99-fuse.rules sbin/mount.fuse usr/bin/fusermount @@ -19,10 +20,13 @@ usr/bin/ulockmgr_server #usr/lib/libfuse.la usr/lib/libfuse.so usr/lib/libfuse.so.2 -usr/lib/libfuse.so.2.8.3 +usr/lib/libfuse.so.2.9.3 #usr/lib/libulockmgr.a #usr/lib/libulockmgr.la usr/lib/libulockmgr.so usr/lib/libulockmgr.so.1 usr/lib/libulockmgr.so.1.0.1 #usr/lib/pkgconfig/fuse.pc +#usr/share/man/man1/fusermount.1 +#usr/share/man/man1/ulockmgr_server.1 +#usr/share/man/man8/mount.fuse.8 diff --git a/config/rootfiles/common/groff b/config/rootfiles/common/groff index c27e5947e0..de5908498b 100644 --- a/config/rootfiles/common/groff +++ b/config/rootfiles/common/groff @@ -5,6 +5,9 @@ #usr/bin/eqn2graph #usr/bin/gdiffmk #usr/bin/geqn +#usr/bin/glilypond +#usr/bin/gperl +#usr/bin/gpinyin #usr/bin/grap2graph #usr/bin/grn #usr/bin/grodvi @@ -13,6 +16,7 @@ #usr/bin/grog #usr/bin/grolbp #usr/bin/grolj4 +#usr/bin/gropdf #usr/bin/grops #usr/bin/grotty #usr/bin/gtbl @@ -23,6 +27,7 @@ #usr/bin/mmroff #usr/bin/neqn #usr/bin/nroff +#usr/bin/pdfmom #usr/bin/pdfroff #usr/bin/pfbtops #usr/bin/pic @@ -42,482 +47,530 @@ #usr/bin/tfmtodit #usr/bin/troff #usr/lib/groff +#usr/lib/groff/glilypond +#usr/lib/groff/glilypond/args.pl +#usr/lib/groff/glilypond/oop_fh.pl +#usr/lib/groff/glilypond/subs.pl +#usr/lib/groff/gpinyin +#usr/lib/groff/gpinyin/subs.pl +#usr/lib/groff/groff_opts_no_arg.txt +#usr/lib/groff/groff_opts_with_arg.txt #usr/lib/groff/groffer -#usr/lib/groff/groffer/func.pl +#usr/lib/groff/groffer/main_subs.pl #usr/lib/groff/groffer/man.pl -#usr/lib/groff/groffer/perl_test.pl #usr/lib/groff/groffer/split_env.sh +#usr/lib/groff/groffer/subs.pl #usr/lib/groff/groffer/version.sh +#usr/lib/groff/grog +#usr/lib/groff/grog/subs.pl +#usr/lib/groff/refer #usr/lib/groff/site-tmac -#usr/share/doc/groff-1.21 -#usr/share/doc/groff-1.21/examples -#usr/share/doc/groff-1.21/examples/chem -#usr/share/doc/groff-1.21/examples/chem/122 -#usr/share/doc/groff-1.21/examples/chem/122/README -#usr/share/doc/groff-1.21/examples/chem/122/ch2a_ethyl.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch2b_benzene.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch2c_benzene_right.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4a_stick.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4b_methyl_acetate.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4c_colon.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4d_HCl.H2O.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4e_CaSO4.2H2O.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4f_C.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4g_BP.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4h_methacrylate.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4i_cyclo.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4j_ring4.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4k_ring3.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4l_vertex.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4m_double.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4n_triple.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4o_aromatic.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4p_cholestanol.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4q_rings.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4r_spiro.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4s_heteroatoms.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4t_polycyclic.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4u_nicotine.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4v_histidine.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4w_lsd.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4x_anisole.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4y_reserpine.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4z1_eqn_glutamic.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch4z2_text.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch5a_size.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch6a_pic.chem -#usr/share/doc/groff-1.21/examples/chem/122/ch6b_dna.chem -#usr/share/doc/groff-1.21/examples/chem/122/chAa_polymer.chem -#usr/share/doc/groff-1.21/examples/chem/122/chAb_vinyl_chloro.chem -#usr/share/doc/groff-1.21/examples/chem/122/chAc_morphine.chem -#usr/share/doc/groff-1.21/examples/chem/122/chAd_chlorophyll.chem -#usr/share/doc/groff-1.21/examples/chem/122/chAe_chair.chem -#usr/share/doc/groff-1.21/examples/chem/122/chAf_arrow.chem -#usr/share/doc/groff-1.21/examples/chem/122/chAg_circle.chem -#usr/share/doc/groff-1.21/examples/chem/122/chAh_brackets.chem -#usr/share/doc/groff-1.21/examples/chem/122/chAi_poly_vinyl_chloride.chem -#usr/share/doc/groff-1.21/examples/chem/122/chBa_jump.chem -#usr/share/doc/groff-1.21/examples/chem/122/chBb_bonds.chem -#usr/share/doc/groff-1.21/examples/chem/122/chBc_rings.chem -#usr/share/doc/groff-1.21/examples/chem/README -#usr/share/doc/groff-1.21/examples/chem/atp.chem -#usr/share/doc/groff-1.21/examples/chem/cholesterin.chem -#usr/share/doc/groff-1.21/examples/chem/ethamivan.chem -#usr/share/doc/groff-1.21/examples/chem/lsd.chem -#usr/share/doc/groff-1.21/examples/chem/morphine.chem -#usr/share/doc/groff-1.21/examples/chem/penicillin.chem -#usr/share/doc/groff-1.21/examples/chem/reserpine.chem -#usr/share/doc/groff-1.21/examples/gnu.eps -#usr/share/doc/groff-1.21/examples/grnexmpl.g -#usr/share/doc/groff-1.21/examples/grnexmpl.me -#usr/share/doc/groff-1.21/examples/grnexmpl.ps -#usr/share/doc/groff-1.21/examples/groff.css -#usr/share/doc/groff-1.21/examples/hdtbl -#usr/share/doc/groff-1.21/examples/hdtbl/chess_board.ps -#usr/share/doc/groff-1.21/examples/hdtbl/chess_board.roff -#usr/share/doc/groff-1.21/examples/hdtbl/col_rowspan_colors.ps -#usr/share/doc/groff-1.21/examples/hdtbl/col_rowspan_colors.roff -#usr/share/doc/groff-1.21/examples/hdtbl/color_boxes.ps -#usr/share/doc/groff-1.21/examples/hdtbl/color_boxes.roff -#usr/share/doc/groff-1.21/examples/hdtbl/color_nested_tables.ps -#usr/share/doc/groff-1.21/examples/hdtbl/color_nested_tables.roff -#usr/share/doc/groff-1.21/examples/hdtbl/color_table_cells.ps -#usr/share/doc/groff-1.21/examples/hdtbl/color_table_cells.roff -#usr/share/doc/groff-1.21/examples/hdtbl/color_transitions.ps -#usr/share/doc/groff-1.21/examples/hdtbl/color_transitions.roff -#usr/share/doc/groff-1.21/examples/hdtbl/common.roff -#usr/share/doc/groff-1.21/examples/hdtbl/fonts_n.ps -#usr/share/doc/groff-1.21/examples/hdtbl/fonts_n.roff -#usr/share/doc/groff-1.21/examples/hdtbl/fonts_x.ps -#usr/share/doc/groff-1.21/examples/hdtbl/fonts_x.roff -#usr/share/doc/groff-1.21/examples/hdtbl/gnu.eps -#usr/share/doc/groff-1.21/examples/hdtbl/mixed_pickles.ps -#usr/share/doc/groff-1.21/examples/hdtbl/mixed_pickles.roff -#usr/share/doc/groff-1.21/examples/hdtbl/rainbow.ps -#usr/share/doc/groff-1.21/examples/hdtbl/rainbow.roff -#usr/share/doc/groff-1.21/examples/hdtbl/short_reference.ps -#usr/share/doc/groff-1.21/examples/hdtbl/short_reference.roff -#usr/share/doc/groff-1.21/examples/mom -#usr/share/doc/groff-1.21/examples/mom/README.txt -#usr/share/doc/groff-1.21/examples/mom/elvis_syntax -#usr/share/doc/groff-1.21/examples/mom/elvis_syntax.new -#usr/share/doc/groff-1.21/examples/mom/letter.mom -#usr/share/doc/groff-1.21/examples/mom/letter.ps -#usr/share/doc/groff-1.21/examples/mom/penguin.ps -#usr/share/doc/groff-1.21/examples/mom/sample_docs.mom -#usr/share/doc/groff-1.21/examples/mom/sample_docs.ps -#usr/share/doc/groff-1.21/examples/mom/typesetting.mom -#usr/share/doc/groff-1.21/examples/mom/typesetting.ps -#usr/share/doc/groff-1.21/examples/webpage.ms -#usr/share/doc/groff-1.21/examples/webpage.ps -#usr/share/doc/groff-1.21/html -#usr/share/doc/groff-1.21/html/mom -#usr/share/doc/groff-1.21/html/mom/appendices.html -#usr/share/doc/groff-1.21/html/mom/color.html -#usr/share/doc/groff-1.21/html/mom/cover.html -#usr/share/doc/groff-1.21/html/mom/definitions.html -#usr/share/doc/groff-1.21/html/mom/docelement.html -#usr/share/doc/groff-1.21/html/mom/docprocessing.html -#usr/share/doc/groff-1.21/html/mom/goodies.html -#usr/share/doc/groff-1.21/html/mom/graphical.html -#usr/share/doc/groff-1.21/html/mom/headfootpage.html -#usr/share/doc/groff-1.21/html/mom/images.html -#usr/share/doc/groff-1.21/html/mom/inlines.html -#usr/share/doc/groff-1.21/html/mom/intro.html -#usr/share/doc/groff-1.21/html/mom/letters.html -#usr/share/doc/groff-1.21/html/mom/macrolist.html -#usr/share/doc/groff-1.21/html/mom/rectoverso.html -#usr/share/doc/groff-1.21/html/mom/refer.html -#usr/share/doc/groff-1.21/html/mom/reserved.html -#usr/share/doc/groff-1.21/html/mom/stylesheet.css -#usr/share/doc/groff-1.21/html/mom/tables-of-contents.html -#usr/share/doc/groff-1.21/html/mom/toc.html -#usr/share/doc/groff-1.21/html/mom/typesetting.html -#usr/share/doc/groff-1.21/html/mom/using.html -#usr/share/doc/groff-1.21/meintro.me -#usr/share/doc/groff-1.21/meintro.ps -#usr/share/doc/groff-1.21/meref.me -#usr/share/doc/groff-1.21/meref.ps -#usr/share/doc/groff-1.21/pic.ms -#usr/share/doc/groff-1.21/pic.ps +#usr/share/doc/groff-1.22.3 +#usr/share/doc/groff-1.22.3/examples +#usr/share/doc/groff-1.22.3/examples/chem +#usr/share/doc/groff-1.22.3/examples/chem/122 +#usr/share/doc/groff-1.22.3/examples/chem/122/README +#usr/share/doc/groff-1.22.3/examples/chem/122/ch2a_ethyl.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch2b_benzene.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch2c_benzene_right.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4a_stick.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4b_methyl_acetate.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4c_colon.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4d_HCl.H2O.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4e_CaSO4.2H2O.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4f_C.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4g_BP.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4h_methacrylate.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4i_cyclo.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4j_ring4.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4k_ring3.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4l_vertex.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4m_double.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4n_triple.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4o_aromatic.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4p_cholestanol.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4q_rings.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4r_spiro.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4s_heteroatoms.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4t_polycyclic.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4u_nicotine.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4v_histidine.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4w_lsd.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4x_anisole.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4y_reserpine.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4z1_eqn_glutamic.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch4z2_text.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch5a_size.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch6a_pic.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/ch6b_dna.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/chAa_polymer.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/chAb_vinyl_chloro.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/chAc_morphine.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/chAd_chlorophyll.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/chAe_chair.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/chAf_arrow.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/chAg_circle.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/chAh_brackets.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/chAi_poly_vinyl_chloride.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/chBa_jump.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/chBb_bonds.chem +#usr/share/doc/groff-1.22.3/examples/chem/122/chBc_rings.chem +#usr/share/doc/groff-1.22.3/examples/chem/README +#usr/share/doc/groff-1.22.3/examples/chem/atp.chem +#usr/share/doc/groff-1.22.3/examples/chem/cholesterin.chem +#usr/share/doc/groff-1.22.3/examples/chem/ethamivan.chem +#usr/share/doc/groff-1.22.3/examples/chem/lsd.chem +#usr/share/doc/groff-1.22.3/examples/chem/morphine.chem +#usr/share/doc/groff-1.22.3/examples/chem/penicillin.chem +#usr/share/doc/groff-1.22.3/examples/chem/reserpine.chem +#usr/share/doc/groff-1.22.3/examples/gnu.eps +#usr/share/doc/groff-1.22.3/examples/grnexmpl.g +#usr/share/doc/groff-1.22.3/examples/grnexmpl.me +#usr/share/doc/groff-1.22.3/examples/grnexmpl.ps +#usr/share/doc/groff-1.22.3/examples/groff.css +#usr/share/doc/groff-1.22.3/examples/hdtbl +#usr/share/doc/groff-1.22.3/examples/hdtbl/chess_board.ps +#usr/share/doc/groff-1.22.3/examples/hdtbl/chess_board.roff +#usr/share/doc/groff-1.22.3/examples/hdtbl/col_rowspan_colors.ps +#usr/share/doc/groff-1.22.3/examples/hdtbl/col_rowspan_colors.roff +#usr/share/doc/groff-1.22.3/examples/hdtbl/color_boxes.ps +#usr/share/doc/groff-1.22.3/examples/hdtbl/color_boxes.roff +#usr/share/doc/groff-1.22.3/examples/hdtbl/color_nested_tables.ps +#usr/share/doc/groff-1.22.3/examples/hdtbl/color_nested_tables.roff +#usr/share/doc/groff-1.22.3/examples/hdtbl/color_table_cells.ps +#usr/share/doc/groff-1.22.3/examples/hdtbl/color_table_cells.roff +#usr/share/doc/groff-1.22.3/examples/hdtbl/color_transitions.ps +#usr/share/doc/groff-1.22.3/examples/hdtbl/color_transitions.roff +#usr/share/doc/groff-1.22.3/examples/hdtbl/common.roff +#usr/share/doc/groff-1.22.3/examples/hdtbl/fonts_n.ps +#usr/share/doc/groff-1.22.3/examples/hdtbl/fonts_n.roff +#usr/share/doc/groff-1.22.3/examples/hdtbl/fonts_x.ps +#usr/share/doc/groff-1.22.3/examples/hdtbl/fonts_x.roff +#usr/share/doc/groff-1.22.3/examples/hdtbl/gnu.eps +#usr/share/doc/groff-1.22.3/examples/hdtbl/mixed_pickles.ps +#usr/share/doc/groff-1.22.3/examples/hdtbl/mixed_pickles.roff +#usr/share/doc/groff-1.22.3/examples/hdtbl/rainbow.ps +#usr/share/doc/groff-1.22.3/examples/hdtbl/rainbow.roff +#usr/share/doc/groff-1.22.3/examples/hdtbl/short_reference.ps +#usr/share/doc/groff-1.22.3/examples/hdtbl/short_reference.roff +#usr/share/doc/groff-1.22.3/examples/mom +#usr/share/doc/groff-1.22.3/examples/mom/README.txt +#usr/share/doc/groff-1.22.3/examples/mom/elvis_syntax +#usr/share/doc/groff-1.22.3/examples/mom/elvis_syntax.new +#usr/share/doc/groff-1.22.3/examples/mom/letter.mom +#usr/share/doc/groff-1.22.3/examples/mom/mom-pdf.mom +#usr/share/doc/groff-1.22.3/examples/mom/mom.vim +#usr/share/doc/groff-1.22.3/examples/mom/penguin.pdf +#usr/share/doc/groff-1.22.3/examples/mom/penguin.ps +#usr/share/doc/groff-1.22.3/examples/mom/sample_docs.mom +#usr/share/doc/groff-1.22.3/examples/mom/typesetting.mom +#usr/share/doc/groff-1.22.3/examples/webpage.ms +#usr/share/doc/groff-1.22.3/examples/webpage.ps +#usr/share/doc/groff-1.22.3/html +#usr/share/doc/groff-1.22.3/html/mom +#usr/share/doc/groff-1.22.3/html/mom/appendices.html +#usr/share/doc/groff-1.22.3/html/mom/color.html +#usr/share/doc/groff-1.22.3/html/mom/cover.html +#usr/share/doc/groff-1.22.3/html/mom/definitions.html +#usr/share/doc/groff-1.22.3/html/mom/docelement.html +#usr/share/doc/groff-1.22.3/html/mom/docprocessing.html +#usr/share/doc/groff-1.22.3/html/mom/goodies.html +#usr/share/doc/groff-1.22.3/html/mom/graphical.html +#usr/share/doc/groff-1.22.3/html/mom/headfootpage.html +#usr/share/doc/groff-1.22.3/html/mom/images.html +#usr/share/doc/groff-1.22.3/html/mom/inlines.html +#usr/share/doc/groff-1.22.3/html/mom/intro.html +#usr/share/doc/groff-1.22.3/html/mom/letters.html +#usr/share/doc/groff-1.22.3/html/mom/macrolist.html +#usr/share/doc/groff-1.22.3/html/mom/rectoverso.html +#usr/share/doc/groff-1.22.3/html/mom/refer.html +#usr/share/doc/groff-1.22.3/html/mom/reserved.html +#usr/share/doc/groff-1.22.3/html/mom/stylesheet.css +#usr/share/doc/groff-1.22.3/html/mom/tables-of-contents.html +#usr/share/doc/groff-1.22.3/html/mom/toc.html +#usr/share/doc/groff-1.22.3/html/mom/typesetting.html +#usr/share/doc/groff-1.22.3/html/mom/using.html +#usr/share/doc/groff-1.22.3/html/mom/version-2.html +#usr/share/doc/groff-1.22.3/meintro.me +#usr/share/doc/groff-1.22.3/meintro.ps +#usr/share/doc/groff-1.22.3/meintro_fr.me +#usr/share/doc/groff-1.22.3/meintro_fr.ps +#usr/share/doc/groff-1.22.3/meref.me +#usr/share/doc/groff-1.22.3/meref.ps +#usr/share/doc/groff-1.22.3/pic.ms +#usr/share/doc/groff-1.22.3/pic.ps #usr/share/groff -#usr/share/groff/1.21 -#usr/share/groff/1.21/eign -#usr/share/groff/1.21/font -#usr/share/groff/1.21/font/devascii -#usr/share/groff/1.21/font/devascii/B -#usr/share/groff/1.21/font/devascii/BI -#usr/share/groff/1.21/font/devascii/DESC -#usr/share/groff/1.21/font/devascii/I -#usr/share/groff/1.21/font/devascii/R -#usr/share/groff/1.21/font/devdvi -#usr/share/groff/1.21/font/devdvi/CW -#usr/share/groff/1.21/font/devdvi/CWEC -#usr/share/groff/1.21/font/devdvi/CWI -#usr/share/groff/1.21/font/devdvi/CWIEC -#usr/share/groff/1.21/font/devdvi/CWITC -#usr/share/groff/1.21/font/devdvi/CWTC -#usr/share/groff/1.21/font/devdvi/DESC -#usr/share/groff/1.21/font/devdvi/EX -#usr/share/groff/1.21/font/devdvi/HB -#usr/share/groff/1.21/font/devdvi/HBEC -#usr/share/groff/1.21/font/devdvi/HBI -#usr/share/groff/1.21/font/devdvi/HBIEC -#usr/share/groff/1.21/font/devdvi/HBITC -#usr/share/groff/1.21/font/devdvi/HBTC -#usr/share/groff/1.21/font/devdvi/HI -#usr/share/groff/1.21/font/devdvi/HIEC -#usr/share/groff/1.21/font/devdvi/HITC -#usr/share/groff/1.21/font/devdvi/HR -#usr/share/groff/1.21/font/devdvi/HREC -#usr/share/groff/1.21/font/devdvi/HRTC -#usr/share/groff/1.21/font/devdvi/MI -#usr/share/groff/1.21/font/devdvi/S -#usr/share/groff/1.21/font/devdvi/SA -#usr/share/groff/1.21/font/devdvi/SB -#usr/share/groff/1.21/font/devdvi/SC -#usr/share/groff/1.21/font/devdvi/TB -#usr/share/groff/1.21/font/devdvi/TBEC -#usr/share/groff/1.21/font/devdvi/TBI -#usr/share/groff/1.21/font/devdvi/TBIEC -#usr/share/groff/1.21/font/devdvi/TBITC -#usr/share/groff/1.21/font/devdvi/TBTC -#usr/share/groff/1.21/font/devdvi/TI -#usr/share/groff/1.21/font/devdvi/TIEC -#usr/share/groff/1.21/font/devdvi/TITC -#usr/share/groff/1.21/font/devdvi/TR -#usr/share/groff/1.21/font/devdvi/TREC -#usr/share/groff/1.21/font/devdvi/TRTC -#usr/share/groff/1.21/font/devdvi/generate -#usr/share/groff/1.21/font/devdvi/generate/CompileFonts -#usr/share/groff/1.21/font/devdvi/generate/Makefile -#usr/share/groff/1.21/font/devdvi/generate/ec.map -#usr/share/groff/1.21/font/devdvi/generate/msam.map -#usr/share/groff/1.21/font/devdvi/generate/msbm.map -#usr/share/groff/1.21/font/devdvi/generate/tc.map -#usr/share/groff/1.21/font/devdvi/generate/texb.map -#usr/share/groff/1.21/font/devdvi/generate/texex.map -#usr/share/groff/1.21/font/devdvi/generate/texi.map -#usr/share/groff/1.21/font/devdvi/generate/texmi.map -#usr/share/groff/1.21/font/devdvi/generate/texr.map -#usr/share/groff/1.21/font/devdvi/generate/texsy.map -#usr/share/groff/1.21/font/devdvi/generate/textex.map -#usr/share/groff/1.21/font/devdvi/generate/textt.map -#usr/share/groff/1.21/font/devhtml -#usr/share/groff/1.21/font/devhtml/B -#usr/share/groff/1.21/font/devhtml/BI -#usr/share/groff/1.21/font/devhtml/CB -#usr/share/groff/1.21/font/devhtml/CBI -#usr/share/groff/1.21/font/devhtml/CI -#usr/share/groff/1.21/font/devhtml/CR -#usr/share/groff/1.21/font/devhtml/DESC -#usr/share/groff/1.21/font/devhtml/I -#usr/share/groff/1.21/font/devhtml/R -#usr/share/groff/1.21/font/devhtml/S -#usr/share/groff/1.21/font/devlatin1 -#usr/share/groff/1.21/font/devlatin1/B -#usr/share/groff/1.21/font/devlatin1/BI -#usr/share/groff/1.21/font/devlatin1/DESC -#usr/share/groff/1.21/font/devlatin1/I -#usr/share/groff/1.21/font/devlatin1/R -#usr/share/groff/1.21/font/devlbp -#usr/share/groff/1.21/font/devlbp/CB -#usr/share/groff/1.21/font/devlbp/CI -#usr/share/groff/1.21/font/devlbp/CR -#usr/share/groff/1.21/font/devlbp/DESC -#usr/share/groff/1.21/font/devlbp/EB -#usr/share/groff/1.21/font/devlbp/EI -#usr/share/groff/1.21/font/devlbp/ER -#usr/share/groff/1.21/font/devlbp/HB -#usr/share/groff/1.21/font/devlbp/HBI -#usr/share/groff/1.21/font/devlbp/HI -#usr/share/groff/1.21/font/devlbp/HNB -#usr/share/groff/1.21/font/devlbp/HNBI -#usr/share/groff/1.21/font/devlbp/HNI -#usr/share/groff/1.21/font/devlbp/HNR -#usr/share/groff/1.21/font/devlbp/HR -#usr/share/groff/1.21/font/devlbp/TB -#usr/share/groff/1.21/font/devlbp/TBI -#usr/share/groff/1.21/font/devlbp/TI -#usr/share/groff/1.21/font/devlbp/TR -#usr/share/groff/1.21/font/devlj4 -#usr/share/groff/1.21/font/devlj4/AB -#usr/share/groff/1.21/font/devlj4/ABI -#usr/share/groff/1.21/font/devlj4/AI -#usr/share/groff/1.21/font/devlj4/ALBB -#usr/share/groff/1.21/font/devlj4/ALBR -#usr/share/groff/1.21/font/devlj4/AOB -#usr/share/groff/1.21/font/devlj4/AOI -#usr/share/groff/1.21/font/devlj4/AOR -#usr/share/groff/1.21/font/devlj4/AR -#usr/share/groff/1.21/font/devlj4/CB -#usr/share/groff/1.21/font/devlj4/CBI -#usr/share/groff/1.21/font/devlj4/CI -#usr/share/groff/1.21/font/devlj4/CLARENDON -#usr/share/groff/1.21/font/devlj4/CORONET -#usr/share/groff/1.21/font/devlj4/CR -#usr/share/groff/1.21/font/devlj4/DESC -#usr/share/groff/1.21/font/devlj4/GB -#usr/share/groff/1.21/font/devlj4/GBI -#usr/share/groff/1.21/font/devlj4/GI -#usr/share/groff/1.21/font/devlj4/GR -#usr/share/groff/1.21/font/devlj4/LGB -#usr/share/groff/1.21/font/devlj4/LGI -#usr/share/groff/1.21/font/devlj4/LGR -#usr/share/groff/1.21/font/devlj4/MARIGOLD -#usr/share/groff/1.21/font/devlj4/OB -#usr/share/groff/1.21/font/devlj4/OBI -#usr/share/groff/1.21/font/devlj4/OI -#usr/share/groff/1.21/font/devlj4/OR -#usr/share/groff/1.21/font/devlj4/S -#usr/share/groff/1.21/font/devlj4/SYMBOL -#usr/share/groff/1.21/font/devlj4/TB -#usr/share/groff/1.21/font/devlj4/TBI -#usr/share/groff/1.21/font/devlj4/TI -#usr/share/groff/1.21/font/devlj4/TNRB -#usr/share/groff/1.21/font/devlj4/TNRBI -#usr/share/groff/1.21/font/devlj4/TNRI -#usr/share/groff/1.21/font/devlj4/TNRR -#usr/share/groff/1.21/font/devlj4/TR -#usr/share/groff/1.21/font/devlj4/UB -#usr/share/groff/1.21/font/devlj4/UBI -#usr/share/groff/1.21/font/devlj4/UCB -#usr/share/groff/1.21/font/devlj4/UCBI -#usr/share/groff/1.21/font/devlj4/UCI -#usr/share/groff/1.21/font/devlj4/UCR -#usr/share/groff/1.21/font/devlj4/UI -#usr/share/groff/1.21/font/devlj4/UR -#usr/share/groff/1.21/font/devlj4/WINGDINGS -#usr/share/groff/1.21/font/devlj4/generate -#usr/share/groff/1.21/font/devlj4/generate/Makefile -#usr/share/groff/1.21/font/devlj4/generate/special.awk -#usr/share/groff/1.21/font/devlj4/generate/special.map -#usr/share/groff/1.21/font/devlj4/generate/symbol.map -#usr/share/groff/1.21/font/devlj4/generate/text.map -#usr/share/groff/1.21/font/devlj4/generate/wingdings.map -#usr/share/groff/1.21/font/devps -#usr/share/groff/1.21/font/devps/AB -#usr/share/groff/1.21/font/devps/ABI -#usr/share/groff/1.21/font/devps/AI -#usr/share/groff/1.21/font/devps/AR -#usr/share/groff/1.21/font/devps/BMB -#usr/share/groff/1.21/font/devps/BMBI -#usr/share/groff/1.21/font/devps/BMI -#usr/share/groff/1.21/font/devps/BMR -#usr/share/groff/1.21/font/devps/CB -#usr/share/groff/1.21/font/devps/CBI -#usr/share/groff/1.21/font/devps/CI -#usr/share/groff/1.21/font/devps/CR -#usr/share/groff/1.21/font/devps/DESC -#usr/share/groff/1.21/font/devps/EURO -#usr/share/groff/1.21/font/devps/HB -#usr/share/groff/1.21/font/devps/HBI -#usr/share/groff/1.21/font/devps/HI -#usr/share/groff/1.21/font/devps/HNB -#usr/share/groff/1.21/font/devps/HNBI -#usr/share/groff/1.21/font/devps/HNI -#usr/share/groff/1.21/font/devps/HNR -#usr/share/groff/1.21/font/devps/HR -#usr/share/groff/1.21/font/devps/NB -#usr/share/groff/1.21/font/devps/NBI -#usr/share/groff/1.21/font/devps/NI -#usr/share/groff/1.21/font/devps/NR -#usr/share/groff/1.21/font/devps/PB -#usr/share/groff/1.21/font/devps/PBI -#usr/share/groff/1.21/font/devps/PI -#usr/share/groff/1.21/font/devps/PR -#usr/share/groff/1.21/font/devps/S -#usr/share/groff/1.21/font/devps/SS -#usr/share/groff/1.21/font/devps/TB -#usr/share/groff/1.21/font/devps/TBI -#usr/share/groff/1.21/font/devps/TI -#usr/share/groff/1.21/font/devps/TR -#usr/share/groff/1.21/font/devps/ZCMI -#usr/share/groff/1.21/font/devps/ZD -#usr/share/groff/1.21/font/devps/ZDR -#usr/share/groff/1.21/font/devps/download -#usr/share/groff/1.21/font/devps/freeeuro.afm -#usr/share/groff/1.21/font/devps/freeeuro.pfa -#usr/share/groff/1.21/font/devps/generate -#usr/share/groff/1.21/font/devps/generate/Makefile -#usr/share/groff/1.21/font/devps/generate/afmname -#usr/share/groff/1.21/font/devps/generate/dingbats.map -#usr/share/groff/1.21/font/devps/generate/dingbats.rmap -#usr/share/groff/1.21/font/devps/generate/lgreekmap -#usr/share/groff/1.21/font/devps/generate/symbol.sed -#usr/share/groff/1.21/font/devps/generate/symbolchars -#usr/share/groff/1.21/font/devps/generate/symbolsl.afm -#usr/share/groff/1.21/font/devps/generate/textmap -#usr/share/groff/1.21/font/devps/prologue -#usr/share/groff/1.21/font/devps/symbolsl.pfa -#usr/share/groff/1.21/font/devps/text.enc -#usr/share/groff/1.21/font/devps/zapfdr.pfa -#usr/share/groff/1.21/font/devutf8 -#usr/share/groff/1.21/font/devutf8/B -#usr/share/groff/1.21/font/devutf8/BI -#usr/share/groff/1.21/font/devutf8/DESC -#usr/share/groff/1.21/font/devutf8/I -#usr/share/groff/1.21/font/devutf8/R -#usr/share/groff/1.21/oldfont -#usr/share/groff/1.21/oldfont/devps -#usr/share/groff/1.21/oldfont/devps/CB -#usr/share/groff/1.21/oldfont/devps/CBI -#usr/share/groff/1.21/oldfont/devps/CI -#usr/share/groff/1.21/oldfont/devps/CR -#usr/share/groff/1.21/oldfont/devps/HB -#usr/share/groff/1.21/oldfont/devps/HBI -#usr/share/groff/1.21/oldfont/devps/HI -#usr/share/groff/1.21/oldfont/devps/HNB -#usr/share/groff/1.21/oldfont/devps/HNBI -#usr/share/groff/1.21/oldfont/devps/HNI -#usr/share/groff/1.21/oldfont/devps/HNR -#usr/share/groff/1.21/oldfont/devps/HR -#usr/share/groff/1.21/oldfont/devps/NB -#usr/share/groff/1.21/oldfont/devps/NBI -#usr/share/groff/1.21/oldfont/devps/NI -#usr/share/groff/1.21/oldfont/devps/NR -#usr/share/groff/1.21/oldfont/devps/PB -#usr/share/groff/1.21/oldfont/devps/PBI -#usr/share/groff/1.21/oldfont/devps/PI -#usr/share/groff/1.21/oldfont/devps/PR -#usr/share/groff/1.21/oldfont/devps/S -#usr/share/groff/1.21/oldfont/devps/SS -#usr/share/groff/1.21/oldfont/devps/TB -#usr/share/groff/1.21/oldfont/devps/TBI -#usr/share/groff/1.21/oldfont/devps/TI -#usr/share/groff/1.21/oldfont/devps/TR -#usr/share/groff/1.21/oldfont/devps/symbol.afm -#usr/share/groff/1.21/oldfont/devps/symbolsl.afm -#usr/share/groff/1.21/oldfont/devps/zapfdr.afm -#usr/share/groff/1.21/oldfont/devps/zapfdr.ps -#usr/share/groff/1.21/pic -#usr/share/groff/1.21/pic/chem.pic -#usr/share/groff/1.21/tmac -#usr/share/groff/1.21/tmac/62bit.tmac -#usr/share/groff/1.21/tmac/X.tmac -#usr/share/groff/1.21/tmac/Xps.tmac -#usr/share/groff/1.21/tmac/a4.tmac -#usr/share/groff/1.21/tmac/an-ext.tmac -#usr/share/groff/1.21/tmac/an-old.tmac -#usr/share/groff/1.21/tmac/an.tmac -#usr/share/groff/1.21/tmac/andoc.tmac -#usr/share/groff/1.21/tmac/composite.tmac -#usr/share/groff/1.21/tmac/cp1047.tmac -#usr/share/groff/1.21/tmac/cs.tmac -#usr/share/groff/1.21/tmac/de.tmac -#usr/share/groff/1.21/tmac/den.tmac -#usr/share/groff/1.21/tmac/devtag.tmac -#usr/share/groff/1.21/tmac/doc-old.tmac -#usr/share/groff/1.21/tmac/doc.tmac -#usr/share/groff/1.21/tmac/dvi.tmac -#usr/share/groff/1.21/tmac/e.tmac -#usr/share/groff/1.21/tmac/ec.tmac -#usr/share/groff/1.21/tmac/eqnrc -#usr/share/groff/1.21/tmac/europs.tmac -#usr/share/groff/1.21/tmac/fr.tmac -#usr/share/groff/1.21/tmac/hdmisc.tmac -#usr/share/groff/1.21/tmac/hdtbl.tmac -#usr/share/groff/1.21/tmac/html-end.tmac -#usr/share/groff/1.21/tmac/html.tmac -#usr/share/groff/1.21/tmac/hyphen.cs -#usr/share/groff/1.21/tmac/hyphen.den -#usr/share/groff/1.21/tmac/hyphen.det -#usr/share/groff/1.21/tmac/hyphen.fr -#usr/share/groff/1.21/tmac/hyphen.sv -#usr/share/groff/1.21/tmac/hyphen.us -#usr/share/groff/1.21/tmac/hyphenex.cs -#usr/share/groff/1.21/tmac/hyphenex.det -#usr/share/groff/1.21/tmac/hyphenex.us -#usr/share/groff/1.21/tmac/ja.tmac -#usr/share/groff/1.21/tmac/latin1.tmac -#usr/share/groff/1.21/tmac/latin2.tmac -#usr/share/groff/1.21/tmac/latin5.tmac -#usr/share/groff/1.21/tmac/latin9.tmac -#usr/share/groff/1.21/tmac/lbp.tmac -#usr/share/groff/1.21/tmac/lj4.tmac -#usr/share/groff/1.21/tmac/m.tmac -#usr/share/groff/1.21/tmac/man.tmac -#usr/share/groff/1.21/tmac/mandoc.tmac -#usr/share/groff/1.21/tmac/mdoc -#usr/share/groff/1.21/tmac/mdoc.tmac -#usr/share/groff/1.21/tmac/mdoc/doc-common -#usr/share/groff/1.21/tmac/mdoc/doc-ditroff -#usr/share/groff/1.21/tmac/mdoc/doc-nroff -#usr/share/groff/1.21/tmac/mdoc/doc-syms -#usr/share/groff/1.21/tmac/me.tmac -#usr/share/groff/1.21/tmac/mm -#usr/share/groff/1.21/tmac/mm.tmac -#usr/share/groff/1.21/tmac/mm/0.MT -#usr/share/groff/1.21/tmac/mm/4.MT -#usr/share/groff/1.21/tmac/mm/5.MT -#usr/share/groff/1.21/tmac/mm/locale -#usr/share/groff/1.21/tmac/mm/ms.cov -#usr/share/groff/1.21/tmac/mm/se_locale -#usr/share/groff/1.21/tmac/mm/se_ms.cov -#usr/share/groff/1.21/tmac/mmse.tmac -#usr/share/groff/1.21/tmac/mom.tmac -#usr/share/groff/1.21/tmac/ms.tmac -#usr/share/groff/1.21/tmac/mse.tmac -#usr/share/groff/1.21/tmac/om.tmac -#usr/share/groff/1.21/tmac/papersize.tmac -#usr/share/groff/1.21/tmac/pdfmark.tmac -#usr/share/groff/1.21/tmac/pic.tmac -#usr/share/groff/1.21/tmac/ps.tmac -#usr/share/groff/1.21/tmac/psatk.tmac -#usr/share/groff/1.21/tmac/psold.tmac -#usr/share/groff/1.21/tmac/pspic.tmac -#usr/share/groff/1.21/tmac/s.tmac -#usr/share/groff/1.21/tmac/safer.tmac -#usr/share/groff/1.21/tmac/spdf.tmac -#usr/share/groff/1.21/tmac/sv.tmac -#usr/share/groff/1.21/tmac/trace.tmac -#usr/share/groff/1.21/tmac/trans.tmac -#usr/share/groff/1.21/tmac/troffrc -#usr/share/groff/1.21/tmac/troffrc-end -#usr/share/groff/1.21/tmac/tty-char.tmac -#usr/share/groff/1.21/tmac/tty.tmac -#usr/share/groff/1.21/tmac/unicode.tmac -#usr/share/groff/1.21/tmac/www.tmac +#usr/share/groff/1.22.3 +#usr/share/groff/1.22.3/eign +#usr/share/groff/1.22.3/font +#usr/share/groff/1.22.3/font/devascii +#usr/share/groff/1.22.3/font/devascii/B +#usr/share/groff/1.22.3/font/devascii/BI +#usr/share/groff/1.22.3/font/devascii/DESC +#usr/share/groff/1.22.3/font/devascii/I +#usr/share/groff/1.22.3/font/devascii/R +#usr/share/groff/1.22.3/font/devdvi +#usr/share/groff/1.22.3/font/devdvi/CW +#usr/share/groff/1.22.3/font/devdvi/CWEC +#usr/share/groff/1.22.3/font/devdvi/CWI +#usr/share/groff/1.22.3/font/devdvi/CWIEC +#usr/share/groff/1.22.3/font/devdvi/CWITC +#usr/share/groff/1.22.3/font/devdvi/CWTC +#usr/share/groff/1.22.3/font/devdvi/DESC +#usr/share/groff/1.22.3/font/devdvi/EX +#usr/share/groff/1.22.3/font/devdvi/HB +#usr/share/groff/1.22.3/font/devdvi/HBEC +#usr/share/groff/1.22.3/font/devdvi/HBI +#usr/share/groff/1.22.3/font/devdvi/HBIEC +#usr/share/groff/1.22.3/font/devdvi/HBITC +#usr/share/groff/1.22.3/font/devdvi/HBTC +#usr/share/groff/1.22.3/font/devdvi/HI +#usr/share/groff/1.22.3/font/devdvi/HIEC +#usr/share/groff/1.22.3/font/devdvi/HITC +#usr/share/groff/1.22.3/font/devdvi/HR +#usr/share/groff/1.22.3/font/devdvi/HREC +#usr/share/groff/1.22.3/font/devdvi/HRTC +#usr/share/groff/1.22.3/font/devdvi/MI +#usr/share/groff/1.22.3/font/devdvi/S +#usr/share/groff/1.22.3/font/devdvi/SA +#usr/share/groff/1.22.3/font/devdvi/SB +#usr/share/groff/1.22.3/font/devdvi/SC +#usr/share/groff/1.22.3/font/devdvi/TB +#usr/share/groff/1.22.3/font/devdvi/TBEC +#usr/share/groff/1.22.3/font/devdvi/TBI +#usr/share/groff/1.22.3/font/devdvi/TBIEC +#usr/share/groff/1.22.3/font/devdvi/TBITC +#usr/share/groff/1.22.3/font/devdvi/TBTC +#usr/share/groff/1.22.3/font/devdvi/TI +#usr/share/groff/1.22.3/font/devdvi/TIEC +#usr/share/groff/1.22.3/font/devdvi/TITC +#usr/share/groff/1.22.3/font/devdvi/TR +#usr/share/groff/1.22.3/font/devdvi/TREC +#usr/share/groff/1.22.3/font/devdvi/TRTC +#usr/share/groff/1.22.3/font/devdvi/generate +#usr/share/groff/1.22.3/font/devdvi/generate/CompileFonts +#usr/share/groff/1.22.3/font/devdvi/generate/Makefile +#usr/share/groff/1.22.3/font/devdvi/generate/ec.map +#usr/share/groff/1.22.3/font/devdvi/generate/msam.map +#usr/share/groff/1.22.3/font/devdvi/generate/msbm.map +#usr/share/groff/1.22.3/font/devdvi/generate/tc.map +#usr/share/groff/1.22.3/font/devdvi/generate/texb.map +#usr/share/groff/1.22.3/font/devdvi/generate/texex.map +#usr/share/groff/1.22.3/font/devdvi/generate/texi.map +#usr/share/groff/1.22.3/font/devdvi/generate/texmi.map +#usr/share/groff/1.22.3/font/devdvi/generate/texr.map +#usr/share/groff/1.22.3/font/devdvi/generate/texsy.map +#usr/share/groff/1.22.3/font/devdvi/generate/textex.map +#usr/share/groff/1.22.3/font/devdvi/generate/textt.map +#usr/share/groff/1.22.3/font/devhtml +#usr/share/groff/1.22.3/font/devhtml/B +#usr/share/groff/1.22.3/font/devhtml/BI +#usr/share/groff/1.22.3/font/devhtml/CB +#usr/share/groff/1.22.3/font/devhtml/CBI +#usr/share/groff/1.22.3/font/devhtml/CI +#usr/share/groff/1.22.3/font/devhtml/CR +#usr/share/groff/1.22.3/font/devhtml/DESC +#usr/share/groff/1.22.3/font/devhtml/I +#usr/share/groff/1.22.3/font/devhtml/R +#usr/share/groff/1.22.3/font/devhtml/S +#usr/share/groff/1.22.3/font/devlatin1 +#usr/share/groff/1.22.3/font/devlatin1/B +#usr/share/groff/1.22.3/font/devlatin1/BI +#usr/share/groff/1.22.3/font/devlatin1/DESC +#usr/share/groff/1.22.3/font/devlatin1/I +#usr/share/groff/1.22.3/font/devlatin1/R +#usr/share/groff/1.22.3/font/devlbp +#usr/share/groff/1.22.3/font/devlbp/CB +#usr/share/groff/1.22.3/font/devlbp/CI +#usr/share/groff/1.22.3/font/devlbp/CR +#usr/share/groff/1.22.3/font/devlbp/DESC +#usr/share/groff/1.22.3/font/devlbp/EB +#usr/share/groff/1.22.3/font/devlbp/EI +#usr/share/groff/1.22.3/font/devlbp/ER +#usr/share/groff/1.22.3/font/devlbp/HB +#usr/share/groff/1.22.3/font/devlbp/HBI +#usr/share/groff/1.22.3/font/devlbp/HI +#usr/share/groff/1.22.3/font/devlbp/HNB +#usr/share/groff/1.22.3/font/devlbp/HNBI +#usr/share/groff/1.22.3/font/devlbp/HNI +#usr/share/groff/1.22.3/font/devlbp/HNR +#usr/share/groff/1.22.3/font/devlbp/HR +#usr/share/groff/1.22.3/font/devlbp/TB +#usr/share/groff/1.22.3/font/devlbp/TBI +#usr/share/groff/1.22.3/font/devlbp/TI +#usr/share/groff/1.22.3/font/devlbp/TR +#usr/share/groff/1.22.3/font/devlj4 +#usr/share/groff/1.22.3/font/devlj4/AB +#usr/share/groff/1.22.3/font/devlj4/ABI +#usr/share/groff/1.22.3/font/devlj4/AI +#usr/share/groff/1.22.3/font/devlj4/ALBB +#usr/share/groff/1.22.3/font/devlj4/ALBR +#usr/share/groff/1.22.3/font/devlj4/AOB +#usr/share/groff/1.22.3/font/devlj4/AOI +#usr/share/groff/1.22.3/font/devlj4/AOR +#usr/share/groff/1.22.3/font/devlj4/AR +#usr/share/groff/1.22.3/font/devlj4/CB +#usr/share/groff/1.22.3/font/devlj4/CBI +#usr/share/groff/1.22.3/font/devlj4/CI +#usr/share/groff/1.22.3/font/devlj4/CLARENDON +#usr/share/groff/1.22.3/font/devlj4/CORONET +#usr/share/groff/1.22.3/font/devlj4/CR +#usr/share/groff/1.22.3/font/devlj4/DESC +#usr/share/groff/1.22.3/font/devlj4/GB +#usr/share/groff/1.22.3/font/devlj4/GBI +#usr/share/groff/1.22.3/font/devlj4/GI +#usr/share/groff/1.22.3/font/devlj4/GR +#usr/share/groff/1.22.3/font/devlj4/LGB +#usr/share/groff/1.22.3/font/devlj4/LGI +#usr/share/groff/1.22.3/font/devlj4/LGR +#usr/share/groff/1.22.3/font/devlj4/MARIGOLD +#usr/share/groff/1.22.3/font/devlj4/OB +#usr/share/groff/1.22.3/font/devlj4/OBI +#usr/share/groff/1.22.3/font/devlj4/OI +#usr/share/groff/1.22.3/font/devlj4/OR +#usr/share/groff/1.22.3/font/devlj4/S +#usr/share/groff/1.22.3/font/devlj4/SYMBOL +#usr/share/groff/1.22.3/font/devlj4/TB +#usr/share/groff/1.22.3/font/devlj4/TBI +#usr/share/groff/1.22.3/font/devlj4/TI +#usr/share/groff/1.22.3/font/devlj4/TNRB +#usr/share/groff/1.22.3/font/devlj4/TNRBI +#usr/share/groff/1.22.3/font/devlj4/TNRI +#usr/share/groff/1.22.3/font/devlj4/TNRR +#usr/share/groff/1.22.3/font/devlj4/TR +#usr/share/groff/1.22.3/font/devlj4/UB +#usr/share/groff/1.22.3/font/devlj4/UBI +#usr/share/groff/1.22.3/font/devlj4/UCB +#usr/share/groff/1.22.3/font/devlj4/UCBI +#usr/share/groff/1.22.3/font/devlj4/UCI +#usr/share/groff/1.22.3/font/devlj4/UCR +#usr/share/groff/1.22.3/font/devlj4/UI +#usr/share/groff/1.22.3/font/devlj4/UR +#usr/share/groff/1.22.3/font/devlj4/WINGDINGS +#usr/share/groff/1.22.3/font/devlj4/generate +#usr/share/groff/1.22.3/font/devlj4/generate/Makefile +#usr/share/groff/1.22.3/font/devlj4/generate/special.awk +#usr/share/groff/1.22.3/font/devlj4/generate/special.map +#usr/share/groff/1.22.3/font/devlj4/generate/symbol.map +#usr/share/groff/1.22.3/font/devlj4/generate/text.map +#usr/share/groff/1.22.3/font/devlj4/generate/wingdings.map +#usr/share/groff/1.22.3/font/devpdf +#usr/share/groff/1.22.3/font/devpdf/CB +#usr/share/groff/1.22.3/font/devpdf/CBI +#usr/share/groff/1.22.3/font/devpdf/CI +#usr/share/groff/1.22.3/font/devpdf/CR +#usr/share/groff/1.22.3/font/devpdf/DESC +#usr/share/groff/1.22.3/font/devpdf/EURO +#usr/share/groff/1.22.3/font/devpdf/Foundry +#usr/share/groff/1.22.3/font/devpdf/HB +#usr/share/groff/1.22.3/font/devpdf/HBI +#usr/share/groff/1.22.3/font/devpdf/HI +#usr/share/groff/1.22.3/font/devpdf/HR +#usr/share/groff/1.22.3/font/devpdf/S +#usr/share/groff/1.22.3/font/devpdf/TB +#usr/share/groff/1.22.3/font/devpdf/TBI +#usr/share/groff/1.22.3/font/devpdf/TI +#usr/share/groff/1.22.3/font/devpdf/TR +#usr/share/groff/1.22.3/font/devpdf/ZD +#usr/share/groff/1.22.3/font/devpdf/download +#usr/share/groff/1.22.3/font/devpdf/enc +#usr/share/groff/1.22.3/font/devpdf/enc/text.enc +#usr/share/groff/1.22.3/font/devpdf/map +#usr/share/groff/1.22.3/font/devpdf/map/dingbats.map +#usr/share/groff/1.22.3/font/devpdf/map/symbolchars +#usr/share/groff/1.22.3/font/devpdf/map/symbolmap +#usr/share/groff/1.22.3/font/devpdf/map/textmap +#usr/share/groff/1.22.3/font/devpdf/util +#usr/share/groff/1.22.3/font/devpdf/util/BuildFoundries +#usr/share/groff/1.22.3/font/devps +#usr/share/groff/1.22.3/font/devps/AB +#usr/share/groff/1.22.3/font/devps/ABI +#usr/share/groff/1.22.3/font/devps/AI +#usr/share/groff/1.22.3/font/devps/AR +#usr/share/groff/1.22.3/font/devps/BMB +#usr/share/groff/1.22.3/font/devps/BMBI +#usr/share/groff/1.22.3/font/devps/BMI +#usr/share/groff/1.22.3/font/devps/BMR +#usr/share/groff/1.22.3/font/devps/CB +#usr/share/groff/1.22.3/font/devps/CBI +#usr/share/groff/1.22.3/font/devps/CI +#usr/share/groff/1.22.3/font/devps/CR +#usr/share/groff/1.22.3/font/devps/DESC +#usr/share/groff/1.22.3/font/devps/EURO +#usr/share/groff/1.22.3/font/devps/HB +#usr/share/groff/1.22.3/font/devps/HBI +#usr/share/groff/1.22.3/font/devps/HI +#usr/share/groff/1.22.3/font/devps/HNB +#usr/share/groff/1.22.3/font/devps/HNBI +#usr/share/groff/1.22.3/font/devps/HNI +#usr/share/groff/1.22.3/font/devps/HNR +#usr/share/groff/1.22.3/font/devps/HR +#usr/share/groff/1.22.3/font/devps/NB +#usr/share/groff/1.22.3/font/devps/NBI +#usr/share/groff/1.22.3/font/devps/NI +#usr/share/groff/1.22.3/font/devps/NR +#usr/share/groff/1.22.3/font/devps/PB +#usr/share/groff/1.22.3/font/devps/PBI +#usr/share/groff/1.22.3/font/devps/PI +#usr/share/groff/1.22.3/font/devps/PR +#usr/share/groff/1.22.3/font/devps/S +#usr/share/groff/1.22.3/font/devps/SS +#usr/share/groff/1.22.3/font/devps/TB +#usr/share/groff/1.22.3/font/devps/TBI +#usr/share/groff/1.22.3/font/devps/TI +#usr/share/groff/1.22.3/font/devps/TR +#usr/share/groff/1.22.3/font/devps/ZCMI +#usr/share/groff/1.22.3/font/devps/ZD +#usr/share/groff/1.22.3/font/devps/ZDR +#usr/share/groff/1.22.3/font/devps/download +#usr/share/groff/1.22.3/font/devps/freeeuro.afm +#usr/share/groff/1.22.3/font/devps/freeeuro.pfa +#usr/share/groff/1.22.3/font/devps/generate +#usr/share/groff/1.22.3/font/devps/generate/Makefile +#usr/share/groff/1.22.3/font/devps/generate/afmname +#usr/share/groff/1.22.3/font/devps/generate/dingbats.map +#usr/share/groff/1.22.3/font/devps/generate/dingbats.rmap +#usr/share/groff/1.22.3/font/devps/generate/lgreekmap +#usr/share/groff/1.22.3/font/devps/generate/symbol.sed +#usr/share/groff/1.22.3/font/devps/generate/symbolchars +#usr/share/groff/1.22.3/font/devps/generate/symbolsl.afm +#usr/share/groff/1.22.3/font/devps/generate/textmap +#usr/share/groff/1.22.3/font/devps/prologue +#usr/share/groff/1.22.3/font/devps/symbolsl.pfa +#usr/share/groff/1.22.3/font/devps/text.enc +#usr/share/groff/1.22.3/font/devps/zapfdr.pfa +#usr/share/groff/1.22.3/font/devutf8 +#usr/share/groff/1.22.3/font/devutf8/B +#usr/share/groff/1.22.3/font/devutf8/BI +#usr/share/groff/1.22.3/font/devutf8/DESC +#usr/share/groff/1.22.3/font/devutf8/I +#usr/share/groff/1.22.3/font/devutf8/R +#usr/share/groff/1.22.3/oldfont +#usr/share/groff/1.22.3/oldfont/devps +#usr/share/groff/1.22.3/oldfont/devps/CB +#usr/share/groff/1.22.3/oldfont/devps/CBI +#usr/share/groff/1.22.3/oldfont/devps/CI +#usr/share/groff/1.22.3/oldfont/devps/CR +#usr/share/groff/1.22.3/oldfont/devps/HB +#usr/share/groff/1.22.3/oldfont/devps/HBI +#usr/share/groff/1.22.3/oldfont/devps/HI +#usr/share/groff/1.22.3/oldfont/devps/HNB +#usr/share/groff/1.22.3/oldfont/devps/HNBI +#usr/share/groff/1.22.3/oldfont/devps/HNI +#usr/share/groff/1.22.3/oldfont/devps/HNR +#usr/share/groff/1.22.3/oldfont/devps/HR +#usr/share/groff/1.22.3/oldfont/devps/NB +#usr/share/groff/1.22.3/oldfont/devps/NBI +#usr/share/groff/1.22.3/oldfont/devps/NI +#usr/share/groff/1.22.3/oldfont/devps/NR +#usr/share/groff/1.22.3/oldfont/devps/PB +#usr/share/groff/1.22.3/oldfont/devps/PBI +#usr/share/groff/1.22.3/oldfont/devps/PI +#usr/share/groff/1.22.3/oldfont/devps/PR +#usr/share/groff/1.22.3/oldfont/devps/S +#usr/share/groff/1.22.3/oldfont/devps/SS +#usr/share/groff/1.22.3/oldfont/devps/TB +#usr/share/groff/1.22.3/oldfont/devps/TBI +#usr/share/groff/1.22.3/oldfont/devps/TI +#usr/share/groff/1.22.3/oldfont/devps/TR +#usr/share/groff/1.22.3/oldfont/devps/symbol.afm +#usr/share/groff/1.22.3/oldfont/devps/symbolsl.afm +#usr/share/groff/1.22.3/oldfont/devps/zapfdr.afm +#usr/share/groff/1.22.3/oldfont/devps/zapfdr.ps +#usr/share/groff/1.22.3/pic +#usr/share/groff/1.22.3/pic/chem.pic +#usr/share/groff/1.22.3/tmac +#usr/share/groff/1.22.3/tmac/62bit.tmac +#usr/share/groff/1.22.3/tmac/X.tmac +#usr/share/groff/1.22.3/tmac/Xps.tmac +#usr/share/groff/1.22.3/tmac/a4.tmac +#usr/share/groff/1.22.3/tmac/an-ext.tmac +#usr/share/groff/1.22.3/tmac/an-old.tmac +#usr/share/groff/1.22.3/tmac/an.tmac +#usr/share/groff/1.22.3/tmac/andoc.tmac +#usr/share/groff/1.22.3/tmac/composite.tmac +#usr/share/groff/1.22.3/tmac/cp1047.tmac +#usr/share/groff/1.22.3/tmac/cs.tmac +#usr/share/groff/1.22.3/tmac/de.tmac +#usr/share/groff/1.22.3/tmac/den.tmac +#usr/share/groff/1.22.3/tmac/devtag.tmac +#usr/share/groff/1.22.3/tmac/doc-old.tmac +#usr/share/groff/1.22.3/tmac/doc.tmac +#usr/share/groff/1.22.3/tmac/dvi.tmac +#usr/share/groff/1.22.3/tmac/e.tmac +#usr/share/groff/1.22.3/tmac/ec.tmac +#usr/share/groff/1.22.3/tmac/eqnrc +#usr/share/groff/1.22.3/tmac/europs.tmac +#usr/share/groff/1.22.3/tmac/fallbacks.tmac +#usr/share/groff/1.22.3/tmac/fr.tmac +#usr/share/groff/1.22.3/tmac/hdmisc.tmac +#usr/share/groff/1.22.3/tmac/hdtbl.tmac +#usr/share/groff/1.22.3/tmac/html-end.tmac +#usr/share/groff/1.22.3/tmac/html.tmac +#usr/share/groff/1.22.3/tmac/hyphen.cs +#usr/share/groff/1.22.3/tmac/hyphen.den +#usr/share/groff/1.22.3/tmac/hyphen.det +#usr/share/groff/1.22.3/tmac/hyphen.fr +#usr/share/groff/1.22.3/tmac/hyphen.sv +#usr/share/groff/1.22.3/tmac/hyphen.us +#usr/share/groff/1.22.3/tmac/hyphenex.cs +#usr/share/groff/1.22.3/tmac/hyphenex.det +#usr/share/groff/1.22.3/tmac/hyphenex.us +#usr/share/groff/1.22.3/tmac/ja.tmac +#usr/share/groff/1.22.3/tmac/latin1.tmac +#usr/share/groff/1.22.3/tmac/latin2.tmac +#usr/share/groff/1.22.3/tmac/latin5.tmac +#usr/share/groff/1.22.3/tmac/latin9.tmac +#usr/share/groff/1.22.3/tmac/lbp.tmac +#usr/share/groff/1.22.3/tmac/lj4.tmac +#usr/share/groff/1.22.3/tmac/m.tmac +#usr/share/groff/1.22.3/tmac/man.tmac +#usr/share/groff/1.22.3/tmac/mandoc.tmac +#usr/share/groff/1.22.3/tmac/mdoc +#usr/share/groff/1.22.3/tmac/mdoc.tmac +#usr/share/groff/1.22.3/tmac/mdoc/doc-common +#usr/share/groff/1.22.3/tmac/mdoc/doc-ditroff +#usr/share/groff/1.22.3/tmac/mdoc/doc-nroff +#usr/share/groff/1.22.3/tmac/mdoc/doc-syms +#usr/share/groff/1.22.3/tmac/me.tmac +#usr/share/groff/1.22.3/tmac/mm +#usr/share/groff/1.22.3/tmac/mm.tmac +#usr/share/groff/1.22.3/tmac/mm/0.MT +#usr/share/groff/1.22.3/tmac/mm/4.MT +#usr/share/groff/1.22.3/tmac/mm/5.MT +#usr/share/groff/1.22.3/tmac/mm/locale +#usr/share/groff/1.22.3/tmac/mm/ms.cov +#usr/share/groff/1.22.3/tmac/mm/se_locale +#usr/share/groff/1.22.3/tmac/mm/se_ms.cov +#usr/share/groff/1.22.3/tmac/mmse.tmac +#usr/share/groff/1.22.3/tmac/mom.tmac +#usr/share/groff/1.22.3/tmac/ms.tmac +#usr/share/groff/1.22.3/tmac/mse.tmac +#usr/share/groff/1.22.3/tmac/om.tmac +#usr/share/groff/1.22.3/tmac/papersize.tmac +#usr/share/groff/1.22.3/tmac/pdf.tmac +#usr/share/groff/1.22.3/tmac/pdfmark.tmac +#usr/share/groff/1.22.3/tmac/pic.tmac +#usr/share/groff/1.22.3/tmac/ps.tmac +#usr/share/groff/1.22.3/tmac/psatk.tmac +#usr/share/groff/1.22.3/tmac/psold.tmac +#usr/share/groff/1.22.3/tmac/pspic.tmac +#usr/share/groff/1.22.3/tmac/refer-me.tmac +#usr/share/groff/1.22.3/tmac/refer-mm.tmac +#usr/share/groff/1.22.3/tmac/refer-ms.tmac +#usr/share/groff/1.22.3/tmac/refer.tmac +#usr/share/groff/1.22.3/tmac/s.tmac +#usr/share/groff/1.22.3/tmac/safer.tmac +#usr/share/groff/1.22.3/tmac/spdf.tmac +#usr/share/groff/1.22.3/tmac/sv.tmac +#usr/share/groff/1.22.3/tmac/trace.tmac +#usr/share/groff/1.22.3/tmac/trans.tmac +#usr/share/groff/1.22.3/tmac/troffrc +#usr/share/groff/1.22.3/tmac/troffrc-end +#usr/share/groff/1.22.3/tmac/tty-char.tmac +#usr/share/groff/1.22.3/tmac/tty.tmac +#usr/share/groff/1.22.3/tmac/unicode.tmac +#usr/share/groff/1.22.3/tmac/www.tmac #usr/share/groff/current #usr/share/groff/site-font #usr/share/groff/site-tmac @@ -526,13 +579,15 @@ #usr/share/info/groff.info #usr/share/info/groff.info-1 #usr/share/info/groff.info-2 -#usr/share/info/groff.info-3 #usr/share/man/man1/addftinfo.1 #usr/share/man/man1/afmtodit.1 #usr/share/man/man1/chem.1 #usr/share/man/man1/eqn.1 #usr/share/man/man1/eqn2graph.1 #usr/share/man/man1/gdiffmk.1 +#usr/share/man/man1/glilypond.1 +#usr/share/man/man1/gperl.1 +#usr/share/man/man1/gpinyin.1 #usr/share/man/man1/grap2graph.1 #usr/share/man/man1/grn.1 #usr/share/man/man1/grodvi.1 @@ -542,6 +597,7 @@ #usr/share/man/man1/grohtml.1 #usr/share/man/man1/grolbp.1 #usr/share/man/man1/grolj4.1 +#usr/share/man/man1/gropdf.1 #usr/share/man/man1/grops.1 #usr/share/man/man1/grotty.1 #usr/share/man/man1/hpftodit.1 @@ -551,6 +607,7 @@ #usr/share/man/man1/mmroff.1 #usr/share/man/man1/neqn.1 #usr/share/man/man1/nroff.1 +#usr/share/man/man1/pdfmom.1 #usr/share/man/man1/pdfroff.1 #usr/share/man/man1/pfbtops.1 #usr/share/man/man1/pic.1 @@ -575,6 +632,7 @@ #usr/share/man/man7/groff.7 #usr/share/man/man7/groff_char.7 #usr/share/man/man7/groff_diff.7 +#usr/share/man/man7/groff_filenames.7 #usr/share/man/man7/groff_hdtbl.7 #usr/share/man/man7/groff_man.7 #usr/share/man/man7/groff_mdoc.7 diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts old mode 100755 new mode 100644 index 58b67c88fb..878ba667e5 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -36,6 +36,7 @@ etc/rc.d/init.d/firstsetup etc/rc.d/init.d/functions #etc/rc.d/init.d/gnump3d etc/rc.d/init.d/halt +#etc/rc.d/init.d/haproxy #etc/rc.d/init.d/hostapd #etc/rc.d/init.d/imspector etc/rc.d/init.d/ipsec @@ -62,6 +63,7 @@ etc/rc.d/init.d/mounttmpfs #etc/rc.d/init.d/mysql #etc/rc.d/init.d/netsnmpd etc/rc.d/init.d/network +etc/rc.d/init.d/network-trigger etc/rc.d/init.d/network-vlans #etc/rc.d/init.d/networking etc/rc.d/init.d/networking/any @@ -92,6 +94,7 @@ etc/rc.d/init.d/networking/red.up/50-ipsec etc/rc.d/init.d/networking/red.up/50-ovpn etc/rc.d/init.d/networking/red.up/98-leds etc/rc.d/init.d/networking/red.up/99-fireinfo +etc/rc.d/init.d/networking/red.up/99-geoip-database etc/rc.d/init.d/networking/red.up/99-pakfire-update etc/rc.d/init.d/networking/wpa_supplicant.exe #etc/rc.d/init.d/nfs-server @@ -122,7 +125,6 @@ etc/rc.d/init.d/static-routes etc/rc.d/init.d/swap etc/rc.d/init.d/sysctl etc/rc.d/init.d/sysklogd -etc/rc.d/init.d/teamspeak etc/rc.d/init.d/template #etc/rc.d/init.d/tftpd etc/rc.d/init.d/tmpfs @@ -234,6 +236,7 @@ etc/rc.d/rcsysinit.d/S70console etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S85firewall +etc/rc.d/rcsysinit.d/S90network-trigger etc/rc.d/rcsysinit.d/S91network-vlans etc/rc.d/rcsysinit.d/S92rngd etc/rc.d/rc3.d/S15fireinfo diff --git a/config/rootfiles/common/i586/openssl-sse2 b/config/rootfiles/common/i586/openssl-sse2 new file mode 100644 index 0000000000..7f6ddd69ba --- /dev/null +++ b/config/rootfiles/common/i586/openssl-sse2 @@ -0,0 +1 @@ +usr/lib/sse2/libcrypto.so.10 diff --git a/config/rootfiles/common/i586/util-linux b/config/rootfiles/common/i586/util-linux index 34c87f2769..9b8d484e3c 100644 --- a/config/rootfiles/common/i586/util-linux +++ b/config/rootfiles/common/i586/util-linux @@ -75,7 +75,7 @@ usr/bin/renice #usr/bin/setarch usr/bin/setsid #usr/bin/setterm -#usr/bin/tailf +usr/bin/tailf #usr/bin/taskset #usr/bin/ul #usr/bin/unshare diff --git a/config/rootfiles/common/installer b/config/rootfiles/common/installer index a0cb093434..63a072fa12 100644 --- a/config/rootfiles/common/installer +++ b/config/rootfiles/common/installer @@ -1,7 +1,7 @@ #usr/bin/downloadsource.sh #usr/bin/execute-postinstall.sh -#usr/bin/start-networking.sh #usr/bin/installer +#usr/bin/start-networking.sh #usr/lib/dracut/modules.d/99installer #usr/lib/dracut/modules.d/99installer/70-dhcpcd.exe #usr/lib/dracut/modules.d/99installer/fake-root.sh @@ -16,10 +16,12 @@ #usr/share/locale/es/LC_MESSAGES/installer.mo #usr/share/locale/fa/LC_MESSAGES/installer.mo #usr/share/locale/fr/LC_MESSAGES/installer.mo +#usr/share/locale/hr/LC_MESSAGES/installer.mo #usr/share/locale/hu/LC_MESSAGES/installer.mo #usr/share/locale/id/LC_MESSAGES/installer.mo #usr/share/locale/it/LC_MESSAGES/installer.mo #usr/share/locale/ja/LC_MESSAGES/installer.mo +#usr/share/locale/jv/LC_MESSAGES/installer.mo #usr/share/locale/km_KH/LC_MESSAGES/installer.mo #usr/share/locale/nl/LC_MESSAGES/installer.mo #usr/share/locale/pl/LC_MESSAGES/installer.mo @@ -27,8 +29,11 @@ #usr/share/locale/pt_PT/LC_MESSAGES/installer.mo #usr/share/locale/ro_RO/LC_MESSAGES/installer.mo #usr/share/locale/ru/LC_MESSAGES/installer.mo +#usr/share/locale/rw/LC_MESSAGES/installer.mo #usr/share/locale/sk/LC_MESSAGES/installer.mo #usr/share/locale/sq/LC_MESSAGES/installer.mo +#usr/share/locale/sr/LC_MESSAGES/installer.mo +#usr/share/locale/su/LC_MESSAGES/installer.mo #usr/share/locale/sv/LC_MESSAGES/installer.mo #usr/share/locale/th/LC_MESSAGES/installer.mo #usr/share/locale/tk/LC_MESSAGES/installer.mo diff --git a/config/rootfiles/common/libnet b/config/rootfiles/common/libnet index 8fe7c1791e..e36695e93d 100644 --- a/config/rootfiles/common/libnet +++ b/config/rootfiles/common/libnet @@ -1,3 +1,4 @@ +#usr/bin/libnet-config #usr/include/libnet #usr/include/libnet.h #usr/include/libnet/libnet-asn1.h @@ -7,3 +8,10 @@ #usr/include/libnet/libnet-structures.h #usr/include/libnet/libnet-types.h #usr/lib/libnet.a +#usr/lib/libnet.la +#usr/lib/libnet.so +#usr/lib/libnet.so.1 +#usr/lib/libnet.so.1.7.0 +#usr/share/man/man3/libnet-functions.h.3 +#usr/share/man/man3/libnet-macros.h.3 +#usr/share/man/man3/libnet.h.3 diff --git a/config/rootfiles/common/libtool b/config/rootfiles/common/libtool index 5646be25ab..23753c79ee 100644 --- a/config/rootfiles/common/libtool +++ b/config/rootfiles/common/libtool @@ -9,9 +9,10 @@ #usr/lib/libltdl.la usr/lib/libltdl.so usr/lib/libltdl.so.7 -usr/lib/libltdl.so.7.3.0 +usr/lib/libltdl.so.7.3.1 #usr/share/aclocal/argz.m4 #usr/share/aclocal/libtool.m4 +#usr/share/aclocal/ltargz.m4 #usr/share/aclocal/ltdl.m4 #usr/share/aclocal/ltoptions.m4 #usr/share/aclocal/ltsugar.m4 @@ -21,6 +22,32 @@ usr/lib/libltdl.so.7.3.0 #usr/share/info/libtool.info-1 #usr/share/info/libtool.info-2 #usr/share/libtool +#usr/share/libtool/config-h.in +#usr/share/libtool/configure +#usr/share/libtool/configure.ac +#usr/share/libtool/COPYING.LIB +#usr/share/libtool/Makefile.am +#usr/share/libtool/Makefile.in +#usr/share/libtool/README +#usr/share/libtool/aclocal.m4 +#usr/share/libtool/lt__alloc.c +#usr/share/libtool/lt__argz.c +#usr/share/libtool/lt__dirent.c +#usr/share/libtool/lt__strl.c +#usr/share/libtool/lt_dlloader.c +#usr/share/libtool/lt_error.c +#usr/share/libtool/ltdl.c +#usr/share/libtool/ltdl.h +#usr/share/libtool/ltdl.mk +#usr/share/libtool/slist.c +#usr/share/libtool/build-aux +#usr/share/libtool/build-aux/compile +#usr/share/libtool/build-aux/config.guess +#usr/share/libtool/build-aux/config.sub +#usr/share/libtool/build-aux/depcomp +#usr/share/libtool/build-aux/install-sh +#usr/share/libtool/build-aux/ltmain.sh +#usr/share/libtool/build-aux/missing #usr/share/libtool/config #usr/share/libtool/config/compile #usr/share/libtool/config/config.guess @@ -41,6 +68,24 @@ usr/lib/libltdl.so.7.3.0 #usr/share/libtool/libltdl/config-h.in #usr/share/libtool/libltdl/configure #usr/share/libtool/libltdl/configure.ac +#usr/share/libtool/libltdl/lt__alloc.c +#usr/share/libtool/libltdl/lt__dirent.c +#usr/share/libtool/libltdl/lt__strl.c +#usr/share/libtool/libltdl/lt_dlloader.c +#usr/share/libtool/libltdl/lt_error.c +#usr/share/libtool/libltdl/ltdl.c +#usr/share/libtool/libltdl/ltdl.h +#usr/share/libtool/libltdl/slist.c +#usr/share/libtool/libltdl/lt__alloc.h +#usr/share/libtool/libltdl/lt__argz_.h +#usr/share/libtool/libltdl/lt__dirent.h +#usr/share/libtool/libltdl/lt__glibc.h +#usr/share/libtool/libltdl/lt__private.h +#usr/share/libtool/libltdl/lt__strl.h +#usr/share/libtool/libltdl/lt_dlloader.h +#usr/share/libtool/libltdl/lt_error.h +#usr/share/libtool/libltdl/lt_system.h +#usr/share/libtool/libltdl/slist.h #usr/share/libtool/libltdl/libltdl #usr/share/libtool/libltdl/libltdl/lt__alloc.h #usr/share/libtool/libltdl/libltdl/lt__dirent.h @@ -59,13 +104,13 @@ usr/lib/libltdl.so.7.3.0 #usr/share/libtool/libltdl/loaders/loadlibrary.c #usr/share/libtool/libltdl/loaders/preopen.c #usr/share/libtool/libltdl/loaders/shl_load.c -#usr/share/libtool/libltdl/lt__alloc.c -#usr/share/libtool/libltdl/lt__dirent.c -#usr/share/libtool/libltdl/lt__strl.c -#usr/share/libtool/libltdl/lt_dlloader.c -#usr/share/libtool/libltdl/lt_error.c -#usr/share/libtool/libltdl/ltdl.c -#usr/share/libtool/libltdl/ltdl.h -#usr/share/libtool/libltdl/slist.c +#usr/share/libtool/loaders +#usr/share/libtool/loaders/dld_link.c +#usr/share/libtool/loaders/dlopen.c +#usr/share/libtool/loaders/dyld.c +#usr/share/libtool/loaders/load_add_on.c +#usr/share/libtool/loaders/loadlibrary.c +#usr/share/libtool/loaders/preopen.c +#usr/share/libtool/loaders/shl_load.c #usr/share/man/man1/libtool.1 #usr/share/man/man1/libtoolize.1 diff --git a/config/rootfiles/common/libxml2 b/config/rootfiles/common/libxml2 index 07c1edda52..1298651712 100644 --- a/config/rootfiles/common/libxml2 +++ b/config/rootfiles/common/libxml2 @@ -50,11 +50,14 @@ #usr/include/libxml2/libxml/xpath.h #usr/include/libxml2/libxml/xpathInternals.h #usr/include/libxml2/libxml/xpointer.h +#usr/lib/cmake +#usr/lib/cmake/libxml2 +#usr/lib/cmake/libxml2/libxml2-config.cmake #usr/lib/libxml2.a #usr/lib/libxml2.la usr/lib/libxml2.so usr/lib/libxml2.so.2 -usr/lib/libxml2.so.2.6.32 +usr/lib/libxml2.so.2.9.2 #usr/lib/pkgconfig/libxml-2.0.pc usr/lib/python2.7/site-packages/drv_libxml2.py usr/lib/python2.7/site-packages/libxml2.py @@ -63,218 +66,220 @@ usr/lib/python2.7/site-packages/libxml2.py usr/lib/python2.7/site-packages/libxml2mod.so #usr/lib/xml2Conf.sh #usr/share/aclocal/libxml.m4 -#usr/share/doc/libxml2-2.6.32 -#usr/share/doc/libxml2-2.6.32/Copyright -#usr/share/doc/libxml2-2.6.32/examples -#usr/share/doc/libxml2-2.6.32/examples/testHTML.c -#usr/share/doc/libxml2-2.6.32/examples/testSAX.c -#usr/share/doc/libxml2-2.6.32/examples/testXPath.c -#usr/share/doc/libxml2-2.6.32/examples/xmllint.c -#usr/share/doc/libxml2-2.6.32/html -#usr/share/doc/libxml2-2.6.32/html/DOM.gif -#usr/share/doc/libxml2-2.6.32/html/FAQ.html -#usr/share/doc/libxml2-2.6.32/html/Libxml2-Logo-180x168.gif -#usr/share/doc/libxml2-2.6.32/html/Libxml2-Logo-90x34.gif -#usr/share/doc/libxml2-2.6.32/html/encoding.html -#usr/share/doc/libxml2-2.6.32/html/examples.xml -#usr/share/doc/libxml2-2.6.32/html/examples.xsl -#usr/share/doc/libxml2-2.6.32/html/html -#usr/share/doc/libxml2-2.6.32/html/html/book1.html -#usr/share/doc/libxml2-2.6.32/html/html/home.png -#usr/share/doc/libxml2-2.6.32/html/html/index.html -#usr/share/doc/libxml2-2.6.32/html/html/left.png -#usr/share/doc/libxml2-2.6.32/html/html/libxml-DOCBparser.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-HTMLparser.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-HTMLtree.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-SAX.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-SAX2.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-c14n.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-catalog.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-chvalid.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-debugXML.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-dict.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-encoding.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-entities.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-globals.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-hash.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-lib.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-list.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-nanoftp.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-nanohttp.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-parser.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-parserInternals.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-pattern.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-relaxng.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-schemasInternals.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-schematron.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-threads.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-tree.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-uri.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-valid.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xinclude.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xlink.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlIO.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlautomata.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlerror.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlexports.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlmemory.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlmodule.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlreader.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlregexp.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlsave.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlschemas.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlschemastypes.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlstring.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlunicode.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlversion.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlwriter.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpath.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpathInternals.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpointer.html -#usr/share/doc/libxml2-2.6.32/html/html/right.png -#usr/share/doc/libxml2-2.6.32/html/html/up.png -#usr/share/doc/libxml2-2.6.32/html/io1.c -#usr/share/doc/libxml2-2.6.32/html/io1.res -#usr/share/doc/libxml2-2.6.32/html/io2.c -#usr/share/doc/libxml2-2.6.32/html/io2.res -#usr/share/doc/libxml2-2.6.32/html/libxml.gif -#usr/share/doc/libxml2-2.6.32/html/parse1.c -#usr/share/doc/libxml2-2.6.32/html/parse2.c -#usr/share/doc/libxml2-2.6.32/html/parse3.c -#usr/share/doc/libxml2-2.6.32/html/parse4.c -#usr/share/doc/libxml2-2.6.32/html/reader1.c -#usr/share/doc/libxml2-2.6.32/html/reader1.res -#usr/share/doc/libxml2-2.6.32/html/reader2.c -#usr/share/doc/libxml2-2.6.32/html/reader3.c -#usr/share/doc/libxml2-2.6.32/html/reader3.res -#usr/share/doc/libxml2-2.6.32/html/reader4.c -#usr/share/doc/libxml2-2.6.32/html/reader4.res -#usr/share/doc/libxml2-2.6.32/html/redhat.gif -#usr/share/doc/libxml2-2.6.32/html/smallfootonly.gif -#usr/share/doc/libxml2-2.6.32/html/structure.gif -#usr/share/doc/libxml2-2.6.32/html/test1.xml -#usr/share/doc/libxml2-2.6.32/html/test2.xml -#usr/share/doc/libxml2-2.6.32/html/test3.xml -#usr/share/doc/libxml2-2.6.32/html/testWriter.c -#usr/share/doc/libxml2-2.6.32/html/tree1.c -#usr/share/doc/libxml2-2.6.32/html/tree1.res -#usr/share/doc/libxml2-2.6.32/html/tree2.c -#usr/share/doc/libxml2-2.6.32/html/tree2.res -#usr/share/doc/libxml2-2.6.32/html/tst.xml -#usr/share/doc/libxml2-2.6.32/html/tutorial -#usr/share/doc/libxml2-2.6.32/html/tutorial/apa.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apb.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apc.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apd.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ape.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apf.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apg.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/aph.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/api.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s02.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s03.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s04.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s05.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s06.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s07.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s08.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s09.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/images -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/blank.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/1.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/10.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/2.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/3.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/4.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/5.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/6.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/7.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/8.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/9.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/caution.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/draft.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/home.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/important.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/next.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/note.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/prev.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/tip.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-blank.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-minus.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-plus.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/up.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/warning.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/includeaddattribute.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includeaddkeyword.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includeconvert.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includegetattribute.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includekeyword.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includexpath.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/index.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ix01.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/xmltutorial.pdf -#usr/share/doc/libxml2-2.6.32/html/w3c.png -#usr/share/doc/libxml2-2.6.32/html/writer.xml -#usr/share/doc/libxml2-2.6.32/html/xml.html -#usr/share/doc/libxml2-2.6.32/html/xpath1.c -#usr/share/doc/libxml2-2.6.32/html/xpath1.res -#usr/share/doc/libxml2-2.6.32/html/xpath2.c -#usr/share/doc/libxml2-2.6.32/html/xpath2.res -#usr/share/doc/libxml2-python-2.6.32 -#usr/share/doc/libxml2-python-2.6.32/TODO -#usr/share/doc/libxml2-python-2.6.32/examples -#usr/share/doc/libxml2-python-2.6.32/examples/attribs.py -#usr/share/doc/libxml2-python-2.6.32/examples/build.py -#usr/share/doc/libxml2-python-2.6.32/examples/compareNodes.py -#usr/share/doc/libxml2-python-2.6.32/examples/ctxterror.py -#usr/share/doc/libxml2-python-2.6.32/examples/cutnpaste.py -#usr/share/doc/libxml2-python-2.6.32/examples/dtdvalid.py -#usr/share/doc/libxml2-python-2.6.32/examples/error.py -#usr/share/doc/libxml2-python-2.6.32/examples/inbuf.py -#usr/share/doc/libxml2-python-2.6.32/examples/indexes.py -#usr/share/doc/libxml2-python-2.6.32/examples/invalid.xml -#usr/share/doc/libxml2-python-2.6.32/examples/nsdel.py -#usr/share/doc/libxml2-python-2.6.32/examples/outbuf.py -#usr/share/doc/libxml2-python-2.6.32/examples/push.py -#usr/share/doc/libxml2-python-2.6.32/examples/pushSAX.py -#usr/share/doc/libxml2-python-2.6.32/examples/pushSAXhtml.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader2.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader3.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader4.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader5.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader6.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader7.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader8.py -#usr/share/doc/libxml2-python-2.6.32/examples/readererr.py -#usr/share/doc/libxml2-python-2.6.32/examples/readernext.py -#usr/share/doc/libxml2-python-2.6.32/examples/regexp.py -#usr/share/doc/libxml2-python-2.6.32/examples/relaxng.py -#usr/share/doc/libxml2-python-2.6.32/examples/resolver.py -#usr/share/doc/libxml2-python-2.6.32/examples/schema.py -#usr/share/doc/libxml2-python-2.6.32/examples/serialize.py -#usr/share/doc/libxml2-python-2.6.32/examples/sync.py -#usr/share/doc/libxml2-python-2.6.32/examples/test.dtd -#usr/share/doc/libxml2-python-2.6.32/examples/thread2.py -#usr/share/doc/libxml2-python-2.6.32/examples/tst.py -#usr/share/doc/libxml2-python-2.6.32/examples/tst.xml -#usr/share/doc/libxml2-python-2.6.32/examples/tstLastError.py -#usr/share/doc/libxml2-python-2.6.32/examples/tstURI.py -#usr/share/doc/libxml2-python-2.6.32/examples/tstmem.py -#usr/share/doc/libxml2-python-2.6.32/examples/tstxpath.py -#usr/share/doc/libxml2-python-2.6.32/examples/valid.xml -#usr/share/doc/libxml2-python-2.6.32/examples/validDTD.py -#usr/share/doc/libxml2-python-2.6.32/examples/validRNG.py -#usr/share/doc/libxml2-python-2.6.32/examples/validSchemas.py -#usr/share/doc/libxml2-python-2.6.32/examples/validate.py -#usr/share/doc/libxml2-python-2.6.32/examples/walker.py -#usr/share/doc/libxml2-python-2.6.32/examples/xpath.py -#usr/share/doc/libxml2-python-2.6.32/examples/xpathext.py -#usr/share/doc/libxml2-python-2.6.32/examples/xpathns.py -#usr/share/doc/libxml2-python-2.6.32/examples/xpathret.py -#usr/share/gtk-doc -#usr/share/gtk-doc/html +#usr/share/doc/libxml2-2.9.2 +#usr/share/doc/libxml2-2.9.2/Copyright +#usr/share/doc/libxml2-2.9.2/examples +#usr/share/doc/libxml2-2.9.2/examples/testHTML.c +#usr/share/doc/libxml2-2.9.2/examples/testSAX.c +#usr/share/doc/libxml2-2.9.2/examples/testXPath.c +#usr/share/doc/libxml2-2.9.2/examples/xmllint.c +#usr/share/doc/libxml2-2.9.2/html +#usr/share/doc/libxml2-2.9.2/html/DOM.gif +#usr/share/doc/libxml2-2.9.2/html/FAQ.html +#usr/share/doc/libxml2-2.9.2/html/Libxml2-Logo-180x168.gif +#usr/share/doc/libxml2-2.9.2/html/Libxml2-Logo-90x34.gif +#usr/share/doc/libxml2-2.9.2/html/encoding.html +#usr/share/doc/libxml2-2.9.2/html/examples.xml +#usr/share/doc/libxml2-2.9.2/html/examples.xsl +#usr/share/doc/libxml2-2.9.2/html/html +#usr/share/doc/libxml2-2.9.2/html/html/book1.html +#usr/share/doc/libxml2-2.9.2/html/html/home.png +#usr/share/doc/libxml2-2.9.2/html/html/index.html +#usr/share/doc/libxml2-2.9.2/html/html/left.png +#usr/share/doc/libxml2-2.9.2/html/html/libxml-DOCBparser.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-HTMLparser.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-HTMLtree.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-SAX.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-SAX2.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-c14n.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-catalog.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-chvalid.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-debugXML.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-dict.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-encoding.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-entities.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-globals.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-hash.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-lib.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-list.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-nanoftp.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-nanohttp.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-parser.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-parserInternals.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-pattern.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-relaxng.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-schemasInternals.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-schematron.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-threads.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-tree.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-uri.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-valid.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xinclude.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xlink.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlIO.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlautomata.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlerror.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlexports.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlmemory.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlmodule.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlreader.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlregexp.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlsave.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlschemas.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlschemastypes.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlstring.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlunicode.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlversion.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlwriter.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpath.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpathInternals.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpointer.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xzlib.html +#usr/share/doc/libxml2-2.9.2/html/html/right.png +#usr/share/doc/libxml2-2.9.2/html/html/up.png +#usr/share/doc/libxml2-2.9.2/html/index.html +#usr/share/doc/libxml2-2.9.2/html/io1.c +#usr/share/doc/libxml2-2.9.2/html/io1.res +#usr/share/doc/libxml2-2.9.2/html/io2.c +#usr/share/doc/libxml2-2.9.2/html/io2.res +#usr/share/doc/libxml2-2.9.2/html/libxml.gif +#usr/share/doc/libxml2-2.9.2/html/parse1.c +#usr/share/doc/libxml2-2.9.2/html/parse2.c +#usr/share/doc/libxml2-2.9.2/html/parse3.c +#usr/share/doc/libxml2-2.9.2/html/parse4.c +#usr/share/doc/libxml2-2.9.2/html/reader1.c +#usr/share/doc/libxml2-2.9.2/html/reader1.res +#usr/share/doc/libxml2-2.9.2/html/reader2.c +#usr/share/doc/libxml2-2.9.2/html/reader3.c +#usr/share/doc/libxml2-2.9.2/html/reader3.res +#usr/share/doc/libxml2-2.9.2/html/reader4.c +#usr/share/doc/libxml2-2.9.2/html/reader4.res +#usr/share/doc/libxml2-2.9.2/html/redhat.gif +#usr/share/doc/libxml2-2.9.2/html/smallfootonly.gif +#usr/share/doc/libxml2-2.9.2/html/structure.gif +#usr/share/doc/libxml2-2.9.2/html/test1.xml +#usr/share/doc/libxml2-2.9.2/html/test2.xml +#usr/share/doc/libxml2-2.9.2/html/test3.xml +#usr/share/doc/libxml2-2.9.2/html/testWriter.c +#usr/share/doc/libxml2-2.9.2/html/tree1.c +#usr/share/doc/libxml2-2.9.2/html/tree1.res +#usr/share/doc/libxml2-2.9.2/html/tree2.c +#usr/share/doc/libxml2-2.9.2/html/tree2.res +#usr/share/doc/libxml2-2.9.2/html/tst.xml +#usr/share/doc/libxml2-2.9.2/html/tutorial +#usr/share/doc/libxml2-2.9.2/html/tutorial/apa.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apb.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apc.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apd.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ape.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apf.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apg.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/aph.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/api.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s02.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s03.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s04.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s05.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s06.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s07.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s08.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s09.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/images +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/blank.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/1.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/10.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/2.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/3.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/4.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/5.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/6.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/7.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/8.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/9.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/caution.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/draft.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/home.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/important.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/next.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/note.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/prev.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/tip.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-blank.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-minus.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-plus.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/up.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/warning.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/includeaddattribute.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includeaddkeyword.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includeconvert.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includegetattribute.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includekeyword.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includexpath.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/index.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ix01.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/xmltutorial.pdf +#usr/share/doc/libxml2-2.9.2/html/w3c.png +#usr/share/doc/libxml2-2.9.2/html/writer.xml +#usr/share/doc/libxml2-2.9.2/html/xml.html +#usr/share/doc/libxml2-2.9.2/html/xpath1.c +#usr/share/doc/libxml2-2.9.2/html/xpath1.res +#usr/share/doc/libxml2-2.9.2/html/xpath2.c +#usr/share/doc/libxml2-2.9.2/html/xpath2.res +#usr/share/doc/libxml2-python-2.9.2 +#usr/share/doc/libxml2-python-2.9.2/TODO +#usr/share/doc/libxml2-python-2.9.2/examples +#usr/share/doc/libxml2-python-2.9.2/examples/attribs.py +#usr/share/doc/libxml2-python-2.9.2/examples/build.py +#usr/share/doc/libxml2-python-2.9.2/examples/compareNodes.py +#usr/share/doc/libxml2-python-2.9.2/examples/ctxterror.py +#usr/share/doc/libxml2-python-2.9.2/examples/cutnpaste.py +#usr/share/doc/libxml2-python-2.9.2/examples/dtdvalid.py +#usr/share/doc/libxml2-python-2.9.2/examples/error.py +#usr/share/doc/libxml2-python-2.9.2/examples/inbuf.py +#usr/share/doc/libxml2-python-2.9.2/examples/indexes.py +#usr/share/doc/libxml2-python-2.9.2/examples/input_callback.py +#usr/share/doc/libxml2-python-2.9.2/examples/invalid.xml +#usr/share/doc/libxml2-python-2.9.2/examples/nsdel.py +#usr/share/doc/libxml2-python-2.9.2/examples/outbuf.py +#usr/share/doc/libxml2-python-2.9.2/examples/push.py +#usr/share/doc/libxml2-python-2.9.2/examples/pushSAX.py +#usr/share/doc/libxml2-python-2.9.2/examples/pushSAXhtml.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader2.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader3.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader4.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader5.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader6.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader7.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader8.py +#usr/share/doc/libxml2-python-2.9.2/examples/readererr.py +#usr/share/doc/libxml2-python-2.9.2/examples/readernext.py +#usr/share/doc/libxml2-python-2.9.2/examples/regexp.py +#usr/share/doc/libxml2-python-2.9.2/examples/relaxng.py +#usr/share/doc/libxml2-python-2.9.2/examples/resolver.py +#usr/share/doc/libxml2-python-2.9.2/examples/schema.py +#usr/share/doc/libxml2-python-2.9.2/examples/serialize.py +#usr/share/doc/libxml2-python-2.9.2/examples/sync.py +#usr/share/doc/libxml2-python-2.9.2/examples/test.dtd +#usr/share/doc/libxml2-python-2.9.2/examples/thread2.py +#usr/share/doc/libxml2-python-2.9.2/examples/tst.py +#usr/share/doc/libxml2-python-2.9.2/examples/tst.xml +#usr/share/doc/libxml2-python-2.9.2/examples/tstLastError.py +#usr/share/doc/libxml2-python-2.9.2/examples/tstURI.py +#usr/share/doc/libxml2-python-2.9.2/examples/tstmem.py +#usr/share/doc/libxml2-python-2.9.2/examples/tstxpath.py +#usr/share/doc/libxml2-python-2.9.2/examples/valid.xml +#usr/share/doc/libxml2-python-2.9.2/examples/validDTD.py +#usr/share/doc/libxml2-python-2.9.2/examples/validRNG.py +#usr/share/doc/libxml2-python-2.9.2/examples/validSchemas.py +#usr/share/doc/libxml2-python-2.9.2/examples/validate.py +#usr/share/doc/libxml2-python-2.9.2/examples/walker.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpath.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpathext.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpathleak.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpathns.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpathret.py #usr/share/gtk-doc/html/libxml2 #usr/share/gtk-doc/html/libxml2/general.html #usr/share/gtk-doc/html/libxml2/home.png diff --git a/config/rootfiles/common/libxslt b/config/rootfiles/common/libxslt index a6e2ab39a3..be00b2426c 100644 --- a/config/rootfiles/common/libxslt +++ b/config/rootfiles/common/libxslt @@ -24,18 +24,19 @@ usr/bin/xsltproc #usr/include/libxslt/xsltInternals.h #usr/include/libxslt/xsltconfig.h #usr/include/libxslt/xsltexports.h +#usr/include/libxslt/xsltlocale.h #usr/include/libxslt/xsltutils.h #usr/lib/libexslt.a #usr/lib/libexslt.la usr/lib/libexslt.so usr/lib/libexslt.so.0 -usr/lib/libexslt.so.0.8.13 +usr/lib/libexslt.so.0.8.17 #usr/lib/libxslt-plugins #usr/lib/libxslt.a #usr/lib/libxslt.la usr/lib/libxslt.so usr/lib/libxslt.so.1 -usr/lib/libxslt.so.1.1.17 +usr/lib/libxslt.so.1.1.28 #usr/lib/pkgconfig/libexslt.pc #usr/lib/pkgconfig/libxslt.pc usr/lib/python2.7/site-packages/libxml2.pyc @@ -44,108 +45,113 @@ usr/lib/python2.7/site-packages/libxml2.pyc #usr/lib/python2.7/site-packages/libxsltmod.la usr/lib/python2.7/site-packages/libxsltmod.so #usr/lib/xsltConf.sh -#usr/man/man1/xsltproc.1 -#usr/man/man3/libexslt.3 -#usr/man/man3/libxslt.3 #usr/share/aclocal/libxslt.m4 -#usr/share/doc/libxslt-1.1.17 -#usr/share/doc/libxslt-1.1.17/html -#usr/share/doc/libxslt-1.1.17/html/API.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk0.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk1.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk2.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk3.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk4.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk5.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk6.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk7.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk8.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk9.html -#usr/share/doc/libxslt-1.1.17/html/APIconstructors.html -#usr/share/doc/libxslt-1.1.17/html/APIfiles.html -#usr/share/doc/libxslt-1.1.17/html/APIfunctions.html -#usr/share/doc/libxslt-1.1.17/html/APIsymbols.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIchunk0.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIconstructors.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIfiles.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIfunctions.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIsymbols.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/bugs.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/docs.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/downloads.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/exslt.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/help.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/index.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/intro.html -#usr/share/doc/libxslt-1.1.17/html/FAQ.html -#usr/share/doc/libxslt-1.1.17/html/Libxslt-Logo-180x168.gif -#usr/share/doc/libxslt-1.1.17/html/Libxslt-Logo-90x34.gif -#usr/share/doc/libxslt-1.1.17/html/bugs.html -#usr/share/doc/libxslt-1.1.17/html/contexts.gif -#usr/share/doc/libxslt-1.1.17/html/contribs.html -#usr/share/doc/libxslt-1.1.17/html/docbook.html -#usr/share/doc/libxslt-1.1.17/html/docs.html -#usr/share/doc/libxslt-1.1.17/html/downloads.html -#usr/share/doc/libxslt-1.1.17/html/extensions.html -#usr/share/doc/libxslt-1.1.17/html/help.html -#usr/share/doc/libxslt-1.1.17/html/html -#usr/share/doc/libxslt-1.1.17/html/html/book1.html -#usr/share/doc/libxslt-1.1.17/html/html/home.png -#usr/share/doc/libxslt-1.1.17/html/html/index.html -#usr/share/doc/libxslt-1.1.17/html/html/left.png -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-attributes.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-documents.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-extensions.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-extra.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-functions.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-imports.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-keys.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-lib.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-namespaces.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-numbersInternals.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-pattern.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-preproc.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-security.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-templates.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-transform.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-variables.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xslt.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xsltInternals.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xsltexports.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xsltutils.html -#usr/share/doc/libxslt-1.1.17/html/html/right.png -#usr/share/doc/libxslt-1.1.17/html/html/up.png -#usr/share/doc/libxslt-1.1.17/html/index.html -#usr/share/doc/libxslt-1.1.17/html/internals.html -#usr/share/doc/libxslt-1.1.17/html/intro.html -#usr/share/doc/libxslt-1.1.17/html/news.html -#usr/share/doc/libxslt-1.1.17/html/node.gif -#usr/share/doc/libxslt-1.1.17/html/object.gif -#usr/share/doc/libxslt-1.1.17/html/processing.gif -#usr/share/doc/libxslt-1.1.17/html/python.html -#usr/share/doc/libxslt-1.1.17/html/redhat.gif -#usr/share/doc/libxslt-1.1.17/html/smallfootonly.gif -#usr/share/doc/libxslt-1.1.17/html/stylesheet.gif -#usr/share/doc/libxslt-1.1.17/html/templates.gif -#usr/share/doc/libxslt-1.1.17/html/tutorial -#usr/share/doc/libxslt-1.1.17/html/tutorial/libxslt_tutorial.c -#usr/share/doc/libxslt-1.1.17/html/tutorial/libxslttutorial.html -#usr/share/doc/libxslt-1.1.17/html/tutorial/libxslttutorial.xml -#usr/share/doc/libxslt-1.1.17/html/tutorial2 -#usr/share/doc/libxslt-1.1.17/html/tutorial2/libxslt_pipes.c -#usr/share/doc/libxslt-1.1.17/html/tutorial2/libxslt_pipes.html -#usr/share/doc/libxslt-1.1.17/html/tutorial2/libxslt_pipes.xml -#usr/share/doc/libxslt-1.1.17/html/xslt.html -#usr/share/doc/libxslt-1.1.17/html/xsltproc.html -#usr/share/doc/libxslt-1.1.17/html/xsltproc2.html -#usr/share/doc/libxslt-python-1.1.17 -#usr/share/doc/libxslt-python-1.1.17/TODO -#usr/share/doc/libxslt-python-1.1.17/examples -#usr/share/doc/libxslt-python-1.1.17/examples/basic.py -#usr/share/doc/libxslt-python-1.1.17/examples/exslt.py -#usr/share/doc/libxslt-python-1.1.17/examples/extelem.py -#usr/share/doc/libxslt-python-1.1.17/examples/extfunc.py -#usr/share/doc/libxslt-python-1.1.17/examples/pyxsltproc.py -#usr/share/doc/libxslt-python-1.1.17/examples/test.xml -#usr/share/doc/libxslt-python-1.1.17/examples/test.xsl +#usr/share/doc/libxslt-1.1.28 +#usr/share/doc/libxslt-1.1.28/html +#usr/share/doc/libxslt-1.1.28/html/API.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk0.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk1.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk10.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk11.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk12.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk13.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk2.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk3.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk4.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk5.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk6.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk7.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk8.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk9.html +#usr/share/doc/libxslt-1.1.28/html/APIconstructors.html +#usr/share/doc/libxslt-1.1.28/html/APIfiles.html +#usr/share/doc/libxslt-1.1.28/html/APIfunctions.html +#usr/share/doc/libxslt-1.1.28/html/APIsymbols.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIchunk0.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIconstructors.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIfiles.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIfunctions.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIsymbols.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/bugs.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/docs.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/downloads.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/exslt.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/help.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/index.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/intro.html +#usr/share/doc/libxslt-1.1.28/html/FAQ.html +#usr/share/doc/libxslt-1.1.28/html/Libxslt-Logo-180x168.gif +#usr/share/doc/libxslt-1.1.28/html/Libxslt-Logo-90x34.gif +#usr/share/doc/libxslt-1.1.28/html/bugs.html +#usr/share/doc/libxslt-1.1.28/html/contexts.gif +#usr/share/doc/libxslt-1.1.28/html/contribs.html +#usr/share/doc/libxslt-1.1.28/html/docbook.html +#usr/share/doc/libxslt-1.1.28/html/docs.html +#usr/share/doc/libxslt-1.1.28/html/downloads.html +#usr/share/doc/libxslt-1.1.28/html/extensions.html +#usr/share/doc/libxslt-1.1.28/html/help.html +#usr/share/doc/libxslt-1.1.28/html/html +#usr/share/doc/libxslt-1.1.28/html/html/book1.html +#usr/share/doc/libxslt-1.1.28/html/html/home.png +#usr/share/doc/libxslt-1.1.28/html/html/index.html +#usr/share/doc/libxslt-1.1.28/html/html/left.png +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-attributes.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-documents.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-extensions.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-extra.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-functions.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-imports.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-keys.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-lib.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-namespaces.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-numbersInternals.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-pattern.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-preproc.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-security.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-templates.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-transform.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-variables.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xslt.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltInternals.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltexports.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltlocale.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltutils.html +#usr/share/doc/libxslt-1.1.28/html/html/right.png +#usr/share/doc/libxslt-1.1.28/html/html/up.png +#usr/share/doc/libxslt-1.1.28/html/index.html +#usr/share/doc/libxslt-1.1.28/html/internals.html +#usr/share/doc/libxslt-1.1.28/html/intro.html +#usr/share/doc/libxslt-1.1.28/html/news.html +#usr/share/doc/libxslt-1.1.28/html/node.gif +#usr/share/doc/libxslt-1.1.28/html/object.gif +#usr/share/doc/libxslt-1.1.28/html/processing.gif +#usr/share/doc/libxslt-1.1.28/html/python.html +#usr/share/doc/libxslt-1.1.28/html/redhat.gif +#usr/share/doc/libxslt-1.1.28/html/smallfootonly.gif +#usr/share/doc/libxslt-1.1.28/html/stylesheet.gif +#usr/share/doc/libxslt-1.1.28/html/templates.gif +#usr/share/doc/libxslt-1.1.28/html/tutorial +#usr/share/doc/libxslt-1.1.28/html/tutorial/libxslt_tutorial.c +#usr/share/doc/libxslt-1.1.28/html/tutorial/libxslttutorial.html +#usr/share/doc/libxslt-1.1.28/html/tutorial/libxslttutorial.xml +#usr/share/doc/libxslt-1.1.28/html/tutorial2 +#usr/share/doc/libxslt-1.1.28/html/tutorial2/libxslt_pipes.c +#usr/share/doc/libxslt-1.1.28/html/tutorial2/libxslt_pipes.html +#usr/share/doc/libxslt-1.1.28/html/tutorial2/libxslt_pipes.xml +#usr/share/doc/libxslt-1.1.28/html/xslt.html +#usr/share/doc/libxslt-1.1.28/html/xsltproc.html +#usr/share/doc/libxslt-1.1.28/html/xsltproc2.html +#usr/share/doc/libxslt-python-1.1.28 +#usr/share/doc/libxslt-python-1.1.28/TODO +#usr/share/doc/libxslt-python-1.1.28/examples +#usr/share/doc/libxslt-python-1.1.28/examples/basic.py +#usr/share/doc/libxslt-python-1.1.28/examples/exslt.py +#usr/share/doc/libxslt-python-1.1.28/examples/extelem.py +#usr/share/doc/libxslt-python-1.1.28/examples/extfunc.py +#usr/share/doc/libxslt-python-1.1.28/examples/pyxsltproc.py +#usr/share/doc/libxslt-python-1.1.28/examples/test.xml +#usr/share/doc/libxslt-python-1.1.28/examples/test.xsl +#usr/share/man/man1/xsltproc.1 +#usr/share/man/man3/libexslt.3 +#usr/share/man/man3/libxslt.3 diff --git a/config/rootfiles/common/logrotate b/config/rootfiles/common/logrotate index 8410c395f7..8ef728c94a 100644 --- a/config/rootfiles/common/logrotate +++ b/config/rootfiles/common/logrotate @@ -1,3 +1,6 @@ +#etc/logrotate.d +etc/logrotate.d/.empty +#usr/man/man5/logrotate.conf.5 #usr/man/man8/logrotate.8 usr/sbin/logrotate var/lib/logrotate.status diff --git a/config/rootfiles/common/logwatch b/config/rootfiles/common/logwatch index 59d3a7ada4..998ab8ae2a 100644 --- a/config/rootfiles/common/logwatch +++ b/config/rootfiles/common/logwatch @@ -1,6 +1,6 @@ #etc/logwatch etc/logwatch/conf -#etc/logwatch/conf/html +#etc/logwatch/logwatch.cron #etc/logwatch/conf/ignore.conf #etc/logwatch/conf/logfiles #etc/logwatch/conf/logwatch.conf @@ -18,13 +18,17 @@ usr/sbin/logwatch #usr/share/logwatch/default.conf/html/header.html usr/share/logwatch/default.conf/ignore.conf #usr/share/logwatch/default.conf/logfiles +#usr/share/logwatch/default.conf/logfiles/audit_log.conf #usr/share/logwatch/default.conf/logfiles/autorpm.conf #usr/share/logwatch/default.conf/logfiles/bfd.conf #usr/share/logwatch/default.conf/logfiles/cisco.conf +#usr/share/logwatch/default.conf/logfiles/citadel.conf usr/share/logwatch/default.conf/logfiles/clam-update.conf +#usr/share/logwatch/default.conf/logfiles/clamav.conf usr/share/logwatch/default.conf/logfiles/cron.conf #usr/share/logwatch/default.conf/logfiles/daemon.conf #usr/share/logwatch/default.conf/logfiles/denyhosts.conf +#usr/share/logwatch/default.conf/logfiles/dirsrv.conf #usr/share/logwatch/default.conf/logfiles/dnssec.conf #usr/share/logwatch/default.conf/logfiles/dpkg.conf #usr/share/logwatch/default.conf/logfiles/emerge.conf @@ -32,15 +36,20 @@ usr/share/logwatch/default.conf/logfiles/cron.conf #usr/share/logwatch/default.conf/logfiles/exim.conf #usr/share/logwatch/default.conf/logfiles/extreme-networks.conf #usr/share/logwatch/default.conf/logfiles/fail2ban.conf +#usr/share/logwatch/default.conf/logfiles/freeradius.conf +#usr/share/logwatch/default.conf/logfiles/http-error.conf usr/share/logwatch/default.conf/logfiles/http.conf usr/share/logwatch/default.conf/logfiles/iptables.conf usr/share/logwatch/default.conf/logfiles/kernel.conf usr/share/logwatch/default.conf/logfiles/maillog.conf usr/share/logwatch/default.conf/logfiles/messages.conf +#usr/share/logwatch/default.conf/logfiles/mysql-mmm.conf +#usr/share/logwatch/default.conf/logfiles/mysql.conf #usr/share/logwatch/default.conf/logfiles/netopia.conf #usr/share/logwatch/default.conf/logfiles/netscreen.conf usr/share/logwatch/default.conf/logfiles/php.conf #usr/share/logwatch/default.conf/logfiles/pix.conf +#usr/share/logwatch/default.conf/logfiles/postgresql.conf #usr/share/logwatch/default.conf/logfiles/pureftp.conf #usr/share/logwatch/default.conf/logfiles/qmail-pop3d-current.conf #usr/share/logwatch/default.conf/logfiles/qmail-pop3ds-current.conf @@ -51,13 +60,17 @@ usr/share/logwatch/default.conf/logfiles/resolver.conf usr/share/logwatch/default.conf/logfiles/samba.conf #usr/share/logwatch/default.conf/logfiles/secure.conf #usr/share/logwatch/default.conf/logfiles/sonicwall.conf +#usr/share/logwatch/default.conf/logfiles/spamassassin.conf usr/share/logwatch/default.conf/logfiles/syslog.conf #usr/share/logwatch/default.conf/logfiles/tac_acc.conf +#usr/share/logwatch/default.conf/logfiles/tivoli-smc.conf #usr/share/logwatch/default.conf/logfiles/up2date.conf +#usr/share/logwatch/default.conf/logfiles/vdr.conf usr/share/logwatch/default.conf/logfiles/vsftpd.conf usr/share/logwatch/default.conf/logfiles/windows.conf usr/share/logwatch/default.conf/logfiles/xferlog.conf #usr/share/logwatch/default.conf/logfiles/yum.conf +#usr/share/logwatch/default.conf/logfiles/zypp.conf usr/share/logwatch/default.conf/logwatch.conf usr/share/logwatch/default.conf/services #usr/share/logwatch/default.conf/services/afpd.conf @@ -66,8 +79,10 @@ usr/share/logwatch/default.conf/services/amavis.conf #usr/share/logwatch/default.conf/services/audit.conf #usr/share/logwatch/default.conf/services/automount.conf #usr/share/logwatch/default.conf/services/autorpm.conf +#usr/share/logwatch/default.conf/services/barracuda.conf #usr/share/logwatch/default.conf/services/bfd.conf #usr/share/logwatch/default.conf/services/cisco.conf +#usr/share/logwatch/default.conf/services/citadel.conf usr/share/logwatch/default.conf/services/clam-update.conf #usr/share/logwatch/default.conf/services/clamav-milter.conf usr/share/logwatch/default.conf/services/clamav.conf @@ -75,6 +90,7 @@ usr/share/logwatch/default.conf/services/clamav.conf usr/share/logwatch/default.conf/services/cron.conf #usr/share/logwatch/default.conf/services/denyhosts.conf usr/share/logwatch/default.conf/services/dhcpd.conf +#usr/share/logwatch/default.conf/services/dirsrv.conf #usr/share/logwatch/default.conf/services/dnssec.conf #usr/share/logwatch/default.conf/services/dovecot.conf #usr/share/logwatch/default.conf/services/dpkg.conf @@ -86,8 +102,11 @@ usr/share/logwatch/default.conf/services/dhcpd.conf #usr/share/logwatch/default.conf/services/eximstats.conf #usr/share/logwatch/default.conf/services/extreme-networks.conf #usr/share/logwatch/default.conf/services/fail2ban.conf +#usr/share/logwatch/default.conf/services/fetchmail.conf +#usr/share/logwatch/default.conf/services/freeradius.conf #usr/share/logwatch/default.conf/services/ftpd-messages.conf #usr/share/logwatch/default.conf/services/ftpd-xferlog.conf +#usr/share/logwatch/default.conf/services/http-error.conf usr/share/logwatch/default.conf/services/http.conf #usr/share/logwatch/default.conf/services/identd.conf usr/share/logwatch/default.conf/services/imapd.conf @@ -96,13 +115,20 @@ usr/share/logwatch/default.conf/services/init.conf usr/share/logwatch/default.conf/services/ipop3d.conf usr/share/logwatch/default.conf/services/iptables.conf usr/share/logwatch/default.conf/services/kernel.conf +#usr/share/logwatch/default.conf/services/knockd.conf +#usr/share/logwatch/default.conf/services/lvm.conf #usr/share/logwatch/default.conf/services/mailscanner.conf +#usr/share/logwatch/default.conf/services/mdadm.conf +#usr/share/logwatch/default.conf/services/mod_security2.conf usr/share/logwatch/default.conf/services/modprobe.conf #usr/share/logwatch/default.conf/services/mountd.conf +#usr/share/logwatch/default.conf/services/mysql-mmm.conf +#usr/share/logwatch/default.conf/services/mysql.conf #usr/share/logwatch/default.conf/services/named.conf #usr/share/logwatch/default.conf/services/netopia.conf #usr/share/logwatch/default.conf/services/netscreen.conf #usr/share/logwatch/default.conf/services/oidentd.conf +#usr/share/logwatch/default.conf/services/omsa.conf usr/share/logwatch/default.conf/services/openvpn.conf usr/share/logwatch/default.conf/services/pam.conf usr/share/logwatch/default.conf/services/pam_pwdb.conf @@ -113,8 +139,10 @@ usr/share/logwatch/default.conf/services/pluto.conf usr/share/logwatch/default.conf/services/pop3.conf #usr/share/logwatch/default.conf/services/portsentry.conf usr/share/logwatch/default.conf/services/postfix.conf +#usr/share/logwatch/default.conf/services/postgresql.conf #usr/share/logwatch/default.conf/services/pound.conf #usr/share/logwatch/default.conf/services/proftpd-messages.conf +#usr/share/logwatch/default.conf/services/puppet.conf #usr/share/logwatch/default.conf/services/pureftpd.conf #usr/share/logwatch/default.conf/services/qmail-pop3d.conf #usr/share/logwatch/default.conf/services/qmail-pop3ds.conf @@ -123,6 +151,7 @@ usr/share/logwatch/default.conf/services/postfix.conf #usr/share/logwatch/default.conf/services/qmail.conf #usr/share/logwatch/default.conf/services/raid.conf usr/share/logwatch/default.conf/services/resolver.conf +#usr/share/logwatch/default.conf/services/rsyslogd.conf #usr/share/logwatch/default.conf/services/rt314.conf usr/share/logwatch/default.conf/services/samba.conf usr/share/logwatch/default.conf/services/saslauthd.conf @@ -134,23 +163,30 @@ usr/share/logwatch/default.conf/services/scsi.conf #usr/share/logwatch/default.conf/services/slon.conf #usr/share/logwatch/default.conf/services/smartd.conf #usr/share/logwatch/default.conf/services/sonicwall.conf +#usr/share/logwatch/default.conf/services/spamassassin.conf usr/share/logwatch/default.conf/services/sshd.conf usr/share/logwatch/default.conf/services/sshd2.conf #usr/share/logwatch/default.conf/services/stunnel.conf usr/share/logwatch/default.conf/services/sudo.conf +#usr/share/logwatch/default.conf/services/syslog-ng.conf usr/share/logwatch/default.conf/services/syslogd.conf #usr/share/logwatch/default.conf/services/tac_acc.conf +#usr/share/logwatch/default.conf/services/tivoli-smc.conf #usr/share/logwatch/default.conf/services/up2date.conf +#usr/share/logwatch/default.conf/services/vdr.conf #usr/share/logwatch/default.conf/services/vpopmail.conf usr/share/logwatch/default.conf/services/vsftpd.conf usr/share/logwatch/default.conf/services/windows.conf #usr/share/logwatch/default.conf/services/xntpd.conf #usr/share/logwatch/default.conf/services/yum.conf +#usr/share/logwatch/default.conf/services/zypp.conf usr/share/logwatch/default.conf/services/zz-disk_space.conf #usr/share/logwatch/default.conf/services/zz-fortune.conf +#usr/share/logwatch/default.conf/services/zz-lm_sensors.conf usr/share/logwatch/default.conf/services/zz-network.conf usr/share/logwatch/default.conf/services/zz-runtime.conf #usr/share/logwatch/default.conf/services/zz-sys.conf +#usr/share/logwatch/default.conf/services/zz-zfs.conf #usr/share/logwatch/dist.conf usr/share/logwatch/dist.conf/logfiles usr/share/logwatch/dist.conf/services @@ -184,8 +220,10 @@ usr/share/logwatch/scripts/services/amavis #usr/share/logwatch/scripts/services/audit #usr/share/logwatch/scripts/services/automount #usr/share/logwatch/scripts/services/autorpm +#usr/share/logwatch/scripts/services/barracuda #usr/share/logwatch/scripts/services/bfd #usr/share/logwatch/scripts/services/cisco +#usr/share/logwatch/scripts/services/citadel usr/share/logwatch/scripts/services/clam-update usr/share/logwatch/scripts/services/clamav #usr/share/logwatch/scripts/services/clamav-milter @@ -194,6 +232,7 @@ usr/share/logwatch/scripts/services/cron #usr/share/logwatch/scripts/services/denyhosts usr/share/logwatch/scripts/services/dhcpd usr/share/logwatch/scripts/services/dialup +#usr/share/logwatch/scripts/services/dirsrv #usr/share/logwatch/scripts/services/dnssec #usr/share/logwatch/scripts/services/dovecot #usr/share/logwatch/scripts/services/dpkg @@ -205,9 +244,12 @@ usr/share/logwatch/scripts/services/dialup #usr/share/logwatch/scripts/services/eximstats #usr/share/logwatch/scripts/services/extreme-networks #usr/share/logwatch/scripts/services/fail2ban +#usr/share/logwatch/scripts/services/fetchmail +#usr/share/logwatch/scripts/services/freeradius #usr/share/logwatch/scripts/services/ftpd-messages #usr/share/logwatch/scripts/services/ftpd-xferlog usr/share/logwatch/scripts/services/http +#usr/share/logwatch/scripts/services/http-error #usr/share/logwatch/scripts/services/identd usr/share/logwatch/scripts/services/imapd #usr/share/logwatch/scripts/services/in.qpopper @@ -215,13 +257,20 @@ usr/share/logwatch/scripts/services/init usr/share/logwatch/scripts/services/ipop3d usr/share/logwatch/scripts/services/iptables usr/share/logwatch/scripts/services/kernel +#usr/share/logwatch/scripts/services/knockd +#usr/share/logwatch/scripts/services/lvm #usr/share/logwatch/scripts/services/mailscanner +#usr/share/logwatch/scripts/services/mdadm +#usr/share/logwatch/scripts/services/mod_security2 usr/share/logwatch/scripts/services/modprobe #usr/share/logwatch/scripts/services/mountd +#usr/share/logwatch/scripts/services/mysql +#usr/share/logwatch/scripts/services/mysql-mmm #usr/share/logwatch/scripts/services/named #usr/share/logwatch/scripts/services/netopia #usr/share/logwatch/scripts/services/netscreen #usr/share/logwatch/scripts/services/oidentd +#usr/share/logwatch/scripts/services/omsa usr/share/logwatch/scripts/services/openvpn usr/share/logwatch/scripts/services/pam usr/share/logwatch/scripts/services/pam_pwdb @@ -232,8 +281,10 @@ usr/share/logwatch/scripts/services/pluto usr/share/logwatch/scripts/services/pop3 #usr/share/logwatch/scripts/services/portsentry usr/share/logwatch/scripts/services/postfix +#usr/share/logwatch/scripts/services/postgresql #usr/share/logwatch/scripts/services/pound #usr/share/logwatch/scripts/services/proftpd-messages +#usr/share/logwatch/scripts/services/puppet #usr/share/logwatch/scripts/services/pureftpd #usr/share/logwatch/scripts/services/qmail #usr/share/logwatch/scripts/services/qmail-pop3d @@ -242,6 +293,7 @@ usr/share/logwatch/scripts/services/postfix #usr/share/logwatch/scripts/services/qmail-smtpd #usr/share/logwatch/scripts/services/raid #usr/share/logwatch/scripts/services/resolver +#usr/share/logwatch/scripts/services/rsyslogd #usr/share/logwatch/scripts/services/rt314 usr/share/logwatch/scripts/services/samba usr/share/logwatch/scripts/services/saslauthd @@ -253,23 +305,30 @@ usr/share/logwatch/scripts/services/scsi #usr/share/logwatch/scripts/services/slon #usr/share/logwatch/scripts/services/smartd #usr/share/logwatch/scripts/services/sonicwall +#usr/share/logwatch/scripts/services/spamassassin usr/share/logwatch/scripts/services/sshd usr/share/logwatch/scripts/services/sshd2 #usr/share/logwatch/scripts/services/stunnel usr/share/logwatch/scripts/services/sudo +#usr/share/logwatch/scripts/services/syslog-ng usr/share/logwatch/scripts/services/syslogd #usr/share/logwatch/scripts/services/tac_acc +#usr/share/logwatch/scripts/services/tivoli-smc #usr/share/logwatch/scripts/services/up2date +#usr/share/logwatch/scripts/services/vdr #usr/share/logwatch/scripts/services/vpopmail usr/share/logwatch/scripts/services/vsftpd usr/share/logwatch/scripts/services/windows #usr/share/logwatch/scripts/services/xntpd #usr/share/logwatch/scripts/services/yum +#usr/share/logwatch/scripts/services/zypp usr/share/logwatch/scripts/services/zz-disk_space #usr/share/logwatch/scripts/services/zz-fortune +#usr/share/logwatch/scripts/services/zz-lm_sensors usr/share/logwatch/scripts/services/zz-network usr/share/logwatch/scripts/services/zz-runtime #usr/share/logwatch/scripts/services/zz-sys +#usr/share/logwatch/scripts/services/zz-zfs #usr/share/logwatch/scripts/shared usr/share/logwatch/scripts/shared/applybinddate usr/share/logwatch/scripts/shared/applyeurodate @@ -289,6 +348,11 @@ usr/share/logwatch/scripts/shared/onlyservice usr/share/logwatch/scripts/shared/remove usr/share/logwatch/scripts/shared/removeheaders usr/share/logwatch/scripts/shared/removeservice +#usr/share/man/man1/amavis-logwatch.1 +#usr/share/man/man1/postfix-logwatch.1 +#usr/share/man/man5/ignore.conf.5 +#usr/share/man/man5/logwatch.conf.5 +#usr/share/man/man5/override.conf.5 #usr/share/man/man8/logwatch.8 var/cache/logwatch var/log/logwatch diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs index 1ab4dec5f1..349aac76cb 100644 --- a/config/rootfiles/common/misc-progs +++ b/config/rootfiles/common/misc-progs @@ -2,6 +2,8 @@ usr/local/bin/addonctrl #usr/local/bin/applejuicectrl usr/local/bin/backupctrl #usr/local/bin/clamavctrl +usr/local/bin/collectdctrl +usr/local/bin/ddnsctrl usr/local/bin/dhcpctrl usr/local/bin/dnsmasqctrl usr/local/bin/extrahdctrl diff --git a/config/rootfiles/common/newt b/config/rootfiles/common/newt index 2fbd2b34c8..adc9b75813 100644 --- a/config/rootfiles/common/newt +++ b/config/rootfiles/common/newt @@ -3,7 +3,7 @@ usr/bin/whiptail #usr/lib/libnewt.a #usr/lib/libnewt.so usr/lib/libnewt.so.0.52 -usr/lib/libnewt.so.0.52.17 +usr/lib/libnewt.so.0.52.18 #usr/lib/pkgconfig/libnewt.pc #usr/lib/python2.7/site-packages/_snack.so #usr/lib/python2.7/site-packages/snack.py @@ -13,8 +13,6 @@ usr/lib/libnewt.so.0.52.17 #usr/share/locale/as #usr/share/locale/as/LC_MESSAGES #usr/share/locale/as/LC_MESSAGES/newt.mo -#usr/share/locale/ast -#usr/share/locale/ast/LC_MESSAGES #usr/share/locale/ast/LC_MESSAGES/newt.mo #usr/share/locale/bal #usr/share/locale/bal/LC_MESSAGES @@ -102,8 +100,6 @@ usr/lib/libnewt.so.0.52.17 #usr/share/locale/nn #usr/share/locale/nn/LC_MESSAGES #usr/share/locale/nn/LC_MESSAGES/newt.mo -#usr/share/locale/pa -#usr/share/locale/pa/LC_MESSAGES #usr/share/locale/pa/LC_MESSAGES/newt.mo #usr/share/locale/pl/LC_MESSAGES/newt.mo #usr/share/locale/pt/LC_MESSAGES/newt.mo diff --git a/config/rootfiles/common/ntfs-3g b/config/rootfiles/common/ntfs-3g index 186e12be27..44f13c389d 100644 --- a/config/rootfiles/common/ntfs-3g +++ b/config/rootfiles/common/ntfs-3g @@ -1,13 +1,20 @@ bin/lowntfs-3g bin/ntfs-3g -lib/libntfs-3g.so -lib/libntfs-3g.so.80 -lib/libntfs-3g.so.80.0.0 +#lib/libntfs-3g.so +lib/libntfs-3g.so.85 +lib/libntfs-3g.so.85.0.0 +sbin/mkfs.ntfs sbin/mount.lowntfs-3g sbin/mount.ntfs-3g usr/bin/ntfs-3g.probe usr/bin/ntfs-3g.secaudit usr/bin/ntfs-3g.usermap +usr/bin/ntfscat +usr/bin/ntfscluster +usr/bin/ntfscmp +usr/bin/ntfsfix +usr/bin/ntfsinfo +usr/bin/ntfsls #usr/include/ntfs-3g #usr/include/ntfs-3g/acls.h #usr/include/ntfs-3g/attrib.h @@ -36,6 +43,7 @@ usr/bin/ntfs-3g.usermap #usr/include/ntfs-3g/ntfstime.h #usr/include/ntfs-3g/object_id.h #usr/include/ntfs-3g/param.h +#usr/include/ntfs-3g/realpath.h #usr/include/ntfs-3g/reparse.h #usr/include/ntfs-3g/runlist.h #usr/include/ntfs-3g/security.h @@ -46,13 +54,33 @@ usr/bin/ntfs-3g.usermap #usr/include/ntfs-3g/xattrs.h #usr/lib/libntfs-3g.a #usr/lib/libntfs-3g.la -usr/lib/libntfs-3g.so +#usr/lib/libntfs-3g.so usr/lib/pkgconfig/libntfs-3g.pc +usr/sbin/mkntfs +usr/sbin/ntfsclone +usr/sbin/ntfscp +usr/sbin/ntfslabel +usr/sbin/ntfsresize +usr/sbin/ntfsundelete #usr/share/doc/ntfs-3g #usr/share/doc/ntfs-3g/README +#usr/share/man/man8/mkfs.ntfs.8 +#usr/share/man/man8/mkntfs.8 #usr/share/man/man8/mount.lowntfs-3g.8 #usr/share/man/man8/mount.ntfs-3g.8 #usr/share/man/man8/ntfs-3g.8 #usr/share/man/man8/ntfs-3g.probe.8 #usr/share/man/man8/ntfs-3g.secaudit.8 #usr/share/man/man8/ntfs-3g.usermap.8 +#usr/share/man/man8/ntfscat.8 +#usr/share/man/man8/ntfsclone.8 +#usr/share/man/man8/ntfscluster.8 +#usr/share/man/man8/ntfscmp.8 +#usr/share/man/man8/ntfscp.8 +#usr/share/man/man8/ntfsfix.8 +#usr/share/man/man8/ntfsinfo.8 +#usr/share/man/man8/ntfslabel.8 +#usr/share/man/man8/ntfsls.8 +#usr/share/man/man8/ntfsprogs.8 +#usr/share/man/man8/ntfsresize.8 +#usr/share/man/man8/ntfsundelete.8 diff --git a/config/rootfiles/common/openssl-compat b/config/rootfiles/common/openssl-compat deleted file mode 100644 index ccf89d0193..0000000000 --- a/config/rootfiles/common/openssl-compat +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libcrypto.so.0.9.8 -usr/lib/libssl.so.0.9.8 diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index d1b836a1b4..b58e30c535 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -17,7 +17,6 @@ usr/sbin/openvpn #usr/share/doc/openvpn/README.polarssl #usr/share/doc/openvpn/management-notes.txt #usr/share/man/man8/openvpn.8 -var/ipfire/ovpn var/ipfire/ovpn/ca var/ipfire/ovpn/caconfig var/ipfire/ovpn/ccd @@ -32,3 +31,4 @@ var/ipfire/ovpn/ovpn-leases.db var/ipfire/ovpn/ovpnconfig var/ipfire/ovpn/scripts var/ipfire/ovpn/settings +var/log/openvpn diff --git a/config/rootfiles/common/perl-Text-CSV_XS b/config/rootfiles/common/perl-Text-CSV_XS new file mode 100644 index 0000000000..bbc7d9b2b6 --- /dev/null +++ b/config/rootfiles/common/perl-Text-CSV_XS @@ -0,0 +1,8 @@ +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Text +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Text/CSV_XS.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Text +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Text/CSV_XS +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Text/CSV_XS/.packlist +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Text/CSV_XS/CSV_XS.bs +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Text/CSV_XS/CSV_XS.so +#usr/share/man/man3/Text::CSV_XS.3 diff --git a/config/rootfiles/common/setup b/config/rootfiles/common/setup index 334c243a4e..6e4d351c9d 100644 --- a/config/rootfiles/common/setup +++ b/config/rootfiles/common/setup @@ -1,3 +1,57 @@ usr/bin/probenic.sh usr/sbin/setup +usr/share/locale/ar/LC_MESSAGES/setup.mo +usr/share/locale/ca/LC_MESSAGES/setup.mo +#usr/share/locale/cs_CZ +#usr/share/locale/cs_CZ/LC_MESSAGES +usr/share/locale/cs_CZ/LC_MESSAGES/setup.mo +usr/share/locale/da/LC_MESSAGES/setup.mo usr/share/locale/de/LC_MESSAGES/setup.mo +#usr/share/locale/el_GR +#usr/share/locale/el_GR/LC_MESSAGES +usr/share/locale/el_GR/LC_MESSAGES/setup.mo +usr/share/locale/es/LC_MESSAGES/setup.mo +usr/share/locale/fa/LC_MESSAGES/setup.mo +usr/share/locale/fr/LC_MESSAGES/setup.mo +usr/share/locale/hr/LC_MESSAGES/setup.mo +usr/share/locale/hu/LC_MESSAGES/setup.mo +usr/share/locale/id/LC_MESSAGES/setup.mo +usr/share/locale/it/LC_MESSAGES/setup.mo +usr/share/locale/ja/LC_MESSAGES/setup.mo +#usr/share/locale/jv +#usr/share/locale/jv/LC_MESSAGES +usr/share/locale/jv/LC_MESSAGES/setup.mo +#usr/share/locale/km_KH +#usr/share/locale/km_KH/LC_MESSAGES +usr/share/locale/km_KH/LC_MESSAGES/setup.mo +usr/share/locale/nl/LC_MESSAGES/setup.mo +usr/share/locale/pl/LC_MESSAGES/setup.mo +usr/share/locale/pt_BR/LC_MESSAGES/setup.mo +#usr/share/locale/pt_PT +#usr/share/locale/pt_PT/LC_MESSAGES +usr/share/locale/pt_PT/LC_MESSAGES/setup.mo +#usr/share/locale/ro_RO +#usr/share/locale/ro_RO/LC_MESSAGES +usr/share/locale/ro_RO/LC_MESSAGES/setup.mo +usr/share/locale/ru/LC_MESSAGES/setup.mo +usr/share/locale/rw/LC_MESSAGES/setup.mo +usr/share/locale/sk/LC_MESSAGES/setup.mo +usr/share/locale/sq/LC_MESSAGES/setup.mo +usr/share/locale/sr/LC_MESSAGES/setup.mo +#usr/share/locale/su +#usr/share/locale/su/LC_MESSAGES +usr/share/locale/su/LC_MESSAGES/setup.mo +usr/share/locale/sv/LC_MESSAGES/setup.mo +usr/share/locale/th/LC_MESSAGES/setup.mo +#usr/share/locale/tk +#usr/share/locale/tk/LC_MESSAGES +usr/share/locale/tk/LC_MESSAGES/setup.mo +usr/share/locale/tr/LC_MESSAGES/setup.mo +usr/share/locale/uk/LC_MESSAGES/setup.mo +#usr/share/locale/uz@Latn +#usr/share/locale/uz@Latn/LC_MESSAGES +usr/share/locale/uz@Latn/LC_MESSAGES/setup.mo +usr/share/locale/vi/LC_MESSAGES/setup.mo +#usr/share/locale/zh +#usr/share/locale/zh/LC_MESSAGES +usr/share/locale/zh/LC_MESSAGES/setup.mo diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index 76abbe8516..1b78c8e0cf 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -34,7 +34,6 @@ usr/lib/squid/basic_smb_auth usr/lib/squid/basic_smb_auth.sh #usr/lib/squid/cachemgr.cgi usr/lib/squid/cert_tool -usr/lib/squid/cert_valid.pl usr/lib/squid/digest_file_auth usr/lib/squid/digest_ldap_auth usr/lib/squid/diskd diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 9a4d8ed975..90e28d9c4c 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -20,6 +20,7 @@ etc/ld.so.conf etc/logrotate.conf etc/mime.types etc/modprobe.d +etc/modprobe.d/btmrvl_sdio.conf etc/modprobe.d/cfg80211.conf etc/modprobe.d/pcspeaker.conf etc/modules.conf @@ -45,6 +46,9 @@ etc/system-release #home home/nobody #lib +#lib/firmware +#lib/firmware/brcm +lib/firmware/brcm/brcmfmac43362-sdio.txt #media media/cdrom media/floppy @@ -60,6 +64,7 @@ root/.bash_logout root/.bash_profile root/.bashrc root/ipfire +run #sbin #srv #usr/bin @@ -94,9 +99,10 @@ usr/local/bin/scanhd usr/local/bin/settime usr/local/bin/timecheck usr/local/bin/timezone-transition -#usr/local/bin/uname usr/local/bin/update-bootloader usr/local/bin/update-lang-cache +usr/local/bin/xt_geoip_build +usr/local/bin/xt_geoip_update #usr/local/include #usr/local/lib #usr/local/lib/sse2 @@ -116,10 +122,12 @@ usr/local/bin/update-lang-cache #usr/local/share/man/man8 #usr/local/share/misc #usr/local/share/terminfo +#usr/local/share/xt_geoip #usr/local/share/zoneinfo #usr/local/src #usr/sbin usr/sbin/ovpn-ccd-convert +usr/sbin/ovpn-collectd-convert #usr/share #usr/share/doc #usr/share/doc/licenses @@ -137,8 +145,8 @@ usr/share/doc/licenses/GPLv3 #usr/share/man/man8 #usr/share/misc #usr/share/terminfo +#usr/share/xt_geoip #usr/share/zoneinfo -run #var #var/cache var/empty diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index e55c43c03b..7564d38c8b 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -16,8 +16,10 @@ etc/strongswan.d/charon-logging.conf etc/strongswan.d/charon.conf etc/strongswan.d/charon/aes.conf etc/strongswan.d/charon/attr.conf +etc/strongswan.d/charon/ccm.conf etc/strongswan.d/charon/cmac.conf etc/strongswan.d/charon/constraints.conf +etc/strongswan.d/charon/ctr.conf etc/strongswan.d/charon/curl.conf etc/strongswan.d/charon/des.conf etc/strongswan.d/charon/dhcp.conf @@ -30,6 +32,7 @@ etc/strongswan.d/charon/eap-tls.conf etc/strongswan.d/charon/eap-ttls.conf etc/strongswan.d/charon/farp.conf etc/strongswan.d/charon/fips-prf.conf +etc/strongswan.d/charon/gcm.conf etc/strongswan.d/charon/gcrypt.conf etc/strongswan.d/charon/gmp.conf etc/strongswan.d/charon/hmac.conf @@ -93,8 +96,10 @@ usr/lib/ipsec/libtls.so.0.0.0 #usr/lib/ipsec/plugins usr/lib/ipsec/plugins/libstrongswan-aes.so usr/lib/ipsec/plugins/libstrongswan-attr.so +usr/lib/ipsec/plugins/libstrongswan-ccm.so usr/lib/ipsec/plugins/libstrongswan-cmac.so usr/lib/ipsec/plugins/libstrongswan-constraints.so +usr/lib/ipsec/plugins/libstrongswan-ctr.so usr/lib/ipsec/plugins/libstrongswan-curl.so usr/lib/ipsec/plugins/libstrongswan-dhcp.so usr/lib/ipsec/plugins/libstrongswan-des.so @@ -107,6 +112,7 @@ usr/lib/ipsec/plugins/libstrongswan-eap-tls.so usr/lib/ipsec/plugins/libstrongswan-eap-ttls.so usr/lib/ipsec/plugins/libstrongswan-farp.so usr/lib/ipsec/plugins/libstrongswan-fips-prf.so +usr/lib/ipsec/plugins/libstrongswan-gcm.so usr/lib/ipsec/plugins/libstrongswan-gcrypt.so usr/lib/ipsec/plugins/libstrongswan-gmp.so usr/lib/ipsec/plugins/libstrongswan-hmac.so @@ -141,7 +147,6 @@ usr/lib/ipsec/plugins/libstrongswan-xcbc.so #usr/libexec/ipsec usr/libexec/ipsec/_copyright usr/libexec/ipsec/_updown -usr/libexec/ipsec/_updown_espmark usr/libexec/ipsec/charon usr/libexec/ipsec/scepclient usr/libexec/ipsec/starter @@ -163,7 +168,6 @@ usr/sbin/ipsec #usr/share/man/man5/ipsec.secrets.5 #usr/share/man/man5/strongswan.conf.5 #usr/share/man/man8/_updown.8 -#usr/share/man/man8/_updown_espmark.8 #usr/share/man/man8/ipsec.8 #usr/share/man/man8/openac.8 #usr/share/man/man8/scepclient.8 @@ -173,8 +177,10 @@ usr/sbin/ipsec #usr/share/strongswan/templates/config/plugins #usr/share/strongswan/templates/config/plugins/aes.conf #usr/share/strongswan/templates/config/plugins/attr.conf +#usr/share/strongswan/templates/config/plugins/ccm.conf #usr/share/strongswan/templates/config/plugins/cmac.conf #usr/share/strongswan/templates/config/plugins/constraints.conf +#usr/share/strongswan/templates/config/plugins/ctr.conf #usr/share/strongswan/templates/config/plugins/curl.conf #usr/share/strongswan/templates/config/plugins/des.conf #usr/share/strongswan/templates/config/plugins/dhcp.conf @@ -187,6 +193,7 @@ usr/sbin/ipsec #usr/share/strongswan/templates/config/plugins/eap-ttls.conf #usr/share/strongswan/templates/config/plugins/farp.conf #usr/share/strongswan/templates/config/plugins/fips-prf.conf +#usr/share/strongswan/templates/config/plugins/gcm.conf #usr/share/strongswan/templates/config/plugins/gcrypt.conf #usr/share/strongswan/templates/config/plugins/gmp.conf #usr/share/strongswan/templates/config/plugins/hmac.conf diff --git a/config/rootfiles/common/sysklogd b/config/rootfiles/common/sysklogd index 14320a6a90..9792097ceb 100644 --- a/config/rootfiles/common/sysklogd +++ b/config/rootfiles/common/sysklogd @@ -4,4 +4,3 @@ usr/sbin/syslogd #usr/share/man/man8/sysklogd.8 var/log/dhcpcd.log var/log/messages -var/log/ovpnserver.log diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev index bc1cdaa1ff..d01c461015 100644 --- a/config/rootfiles/common/udev +++ b/config/rootfiles/common/udev @@ -2,7 +2,6 @@ bin/udevadm etc/modprobe.d/blacklist.conf etc/udev #etc/udev/rules.d -#etc/udev/rules.d/30-persistent-network.rules #etc/udev/rules.d/55-lfs.rules #etc/udev/rules.d/81-cdrom.rules #etc/udev/rules.d/83-cdrom-symlinks.rules @@ -29,6 +28,7 @@ lib/udev #lib/udev/hwdb.d/60-keyboard.hwdb #lib/udev/init-net-rules.sh #lib/udev/mtd_probe +#lib/udev/network-hotplug-rename #lib/udev/rule_generator.functions #lib/udev/rules.d #lib/udev/rules.d/25-alsa.rules @@ -37,6 +37,7 @@ lib/udev #lib/udev/rules.d/50-udev-default.rules #lib/udev/rules.d/60-cdrom_id.rules #lib/udev/rules.d/60-keyboard.rules +#lib/udev/rules.d/60-net.rules #lib/udev/rules.d/60-persistent-alsa.rules #lib/udev/rules.d/60-persistent-input.rules #lib/udev/rules.d/60-persistent-serial.rules diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface new file mode 100644 index 0000000000..5da892bbdf --- /dev/null +++ b/config/rootfiles/common/web-user-interface @@ -0,0 +1,358 @@ +srv/web/ipfire/cgi-bin/aliases.cgi +#srv/web/ipfire/cgi-bin/asterisk +#srv/web/ipfire/cgi-bin/asterisk/calls.cgi +#srv/web/ipfire/cgi-bin/asterisk/conf +#srv/web/ipfire/cgi-bin/asterisk/conf.cgi +#srv/web/ipfire/cgi-bin/asterisk/conf/telbook.conf +#srv/web/ipfire/cgi-bin/asterisk/status.cgi +srv/web/ipfire/cgi-bin/atm-status.cgi +srv/web/ipfire/cgi-bin/backup.cgi +srv/web/ipfire/cgi-bin/bluetooth.cgi +srv/web/ipfire/cgi-bin/chpasswd.cgi +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/connscheduler.cgi +srv/web/ipfire/cgi-bin/country.cgi +srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/dns.cgi +srv/web/ipfire/cgi-bin/dnsforward.cgi +srv/web/ipfire/cgi-bin/entropy.cgi +srv/web/ipfire/cgi-bin/extrahd.cgi +srv/web/ipfire/cgi-bin/fireinfo.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/geoip-block.cgi +srv/web/ipfire/cgi-bin/gpl.cgi +srv/web/ipfire/cgi-bin/gui.cgi +srv/web/ipfire/cgi-bin/hardwaregraphs.cgi +srv/web/ipfire/cgi-bin/hosts.cgi +srv/web/ipfire/cgi-bin/ids.cgi +#srv/web/ipfire/cgi-bin/imspector.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ipinfo.cgi +srv/web/ipfire/cgi-bin/iptables.cgi +srv/web/ipfire/cgi-bin/logs.cgi +srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat +srv/web/ipfire/cgi-bin/logs.cgi/config.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogport.dat +srv/web/ipfire/cgi-bin/logs.cgi/ids.dat +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat +srv/web/ipfire/cgi-bin/logs.cgi/summary.dat +srv/web/ipfire/cgi-bin/logs.cgi/urlfilter.dat +srv/web/ipfire/cgi-bin/mac.cgi +srv/web/ipfire/cgi-bin/mdstat.cgi +srv/web/ipfire/cgi-bin/media.cgi +srv/web/ipfire/cgi-bin/memory.cgi +srv/web/ipfire/cgi-bin/modem-status.cgi +srv/web/ipfire/cgi-bin/modem.cgi +#srv/web/ipfire/cgi-bin/mpfire.cgi +srv/web/ipfire/cgi-bin/netexternal.cgi +srv/web/ipfire/cgi-bin/netinternal.cgi +srv/web/ipfire/cgi-bin/netother.cgi +srv/web/ipfire/cgi-bin/netovpnrw.cgi +srv/web/ipfire/cgi-bin/netovpnsrv.cgi +srv/web/ipfire/cgi-bin/optionsfw.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/p2p-block.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/qos.cgi +srv/web/ipfire/cgi-bin/remote.cgi +srv/web/ipfire/cgi-bin/routing.cgi +#srv/web/ipfire/cgi-bin/samba.cgi +#srv/web/ipfire/cgi-bin/sambahlp.cgi +srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/shutdown.cgi +srv/web/ipfire/cgi-bin/speed.cgi +srv/web/ipfire/cgi-bin/system.cgi +srv/web/ipfire/cgi-bin/time.cgi +#srv/web/ipfire/cgi-bin/tor.cgi +srv/web/ipfire/cgi-bin/traffic.cgi +#srv/web/ipfire/cgi-bin/tripwire.cgi +srv/web/ipfire/cgi-bin/updatexlrator.cgi +#srv/web/ipfire/cgi-bin/upnp.cgi +srv/web/ipfire/cgi-bin/urlfilter.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/wakeonlan.cgi +srv/web/ipfire/cgi-bin/webaccess.cgi +srv/web/ipfire/cgi-bin/wireless.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi +srv/web/ipfire/cgi-bin/wlanap.cgi +#srv/web/ipfire/html +srv/web/ipfire/html/blob.gif +srv/web/ipfire/html/clwarn.cgi +srv/web/ipfire/html/dial.cgi +srv/web/ipfire/html/favicon.ico +#srv/web/ipfire/html/images +srv/web/ipfire/html/images/IPFire.png +srv/web/ipfire/html/images/add.gif +srv/web/ipfire/html/images/addblue.gif +srv/web/ipfire/html/images/addgreen.gif +srv/web/ipfire/html/images/address-book-new.png +srv/web/ipfire/html/images/application-certificate.png +srv/web/ipfire/html/images/application-x-executable.png +srv/web/ipfire/html/images/applications-accessories.png +srv/web/ipfire/html/images/applications-development.png +srv/web/ipfire/html/images/applications-games.png +srv/web/ipfire/html/images/applications-graphics.png +srv/web/ipfire/html/images/applications-internet.png +srv/web/ipfire/html/images/applications-multimedia.png +srv/web/ipfire/html/images/applications-office.png +srv/web/ipfire/html/images/applications-other.png +srv/web/ipfire/html/images/applications-system.png +srv/web/ipfire/html/images/appointment-new.png +srv/web/ipfire/html/images/audio-volume-high-red.png +srv/web/ipfire/html/images/audio-volume-high.png +srv/web/ipfire/html/images/audio-volume-low-red.png +srv/web/ipfire/html/images/audio-volume-low.png +srv/web/ipfire/html/images/audio-x-generic-red.png +srv/web/ipfire/html/images/audio-x-generic.png +srv/web/ipfire/html/images/background.gif +srv/web/ipfire/html/images/bookmark-new.png +srv/web/ipfire/html/images/clock.gif +srv/web/ipfire/html/images/computer.png +srv/web/ipfire/html/images/delete.gif +srv/web/ipfire/html/images/dialog-error.png +srv/web/ipfire/html/images/dialog-information.png +srv/web/ipfire/html/images/dialog-warning.png +srv/web/ipfire/html/images/dns_link.png +srv/web/ipfire/html/images/document-new.png +srv/web/ipfire/html/images/document-open.png +srv/web/ipfire/html/images/document-print-preview.png +srv/web/ipfire/html/images/document-print.png +srv/web/ipfire/html/images/document-properties.png +srv/web/ipfire/html/images/document-save-as.png +srv/web/ipfire/html/images/document-save.png +srv/web/ipfire/html/images/down.gif +srv/web/ipfire/html/images/drive-harddisk.png +srv/web/ipfire/html/images/drive-optical.png +srv/web/ipfire/html/images/drive-removable-media.png +srv/web/ipfire/html/images/edit-find.png +srv/web/ipfire/html/images/edit-redo.png +srv/web/ipfire/html/images/edit.gif +srv/web/ipfire/html/images/floppy.gif +srv/web/ipfire/html/images/folder-drag-accept.png +srv/web/ipfire/html/images/folder-new.png +srv/web/ipfire/html/images/folder-open.png +srv/web/ipfire/html/images/folder-remote.png +srv/web/ipfire/html/images/folder-saved-search.png +srv/web/ipfire/html/images/folder-visiting.png +srv/web/ipfire/html/images/folder.png +srv/web/ipfire/html/images/format-indent-less.png +srv/web/ipfire/html/images/format-indent-more.png +srv/web/ipfire/html/images/format-justify-center.png +srv/web/ipfire/html/images/format-justify-fill.png +srv/web/ipfire/html/images/format-justify-left.png +srv/web/ipfire/html/images/format-justify-right.png +srv/web/ipfire/html/images/forward.gif +srv/web/ipfire/html/images/go-bottom.png +srv/web/ipfire/html/images/go-down.png +srv/web/ipfire/html/images/go-first.png +srv/web/ipfire/html/images/go-home.png +srv/web/ipfire/html/images/go-jump.png +srv/web/ipfire/html/images/go-last.png +srv/web/ipfire/html/images/go-next.png +srv/web/ipfire/html/images/go-previous.png +srv/web/ipfire/html/images/go-top.png +srv/web/ipfire/html/images/go-up.png +srv/web/ipfire/html/images/help-browser.png +srv/web/ipfire/html/images/help.gif +srv/web/ipfire/html/images/image-loading.png +srv/web/ipfire/html/images/image-missing.png +srv/web/ipfire/html/images/image-x-generic.png +srv/web/ipfire/html/images/indicator.gif +srv/web/ipfire/html/images/info.gif +srv/web/ipfire/html/images/input-gaming.png +srv/web/ipfire/html/images/input-keyboard.png +srv/web/ipfire/html/images/input-mouse.png +srv/web/ipfire/html/images/internet-group-chat.png +srv/web/ipfire/html/images/internet-mail.png +srv/web/ipfire/html/images/internet-news-reader.png +srv/web/ipfire/html/images/internet-web-browser.png +srv/web/ipfire/html/images/list-add.png +srv/web/ipfire/html/images/list-remove.png +srv/web/ipfire/html/images/mail-attachment.png +srv/web/ipfire/html/images/mail-forward.png +srv/web/ipfire/html/images/mail-mark-junk.png +srv/web/ipfire/html/images/mail-mark-not-junk.png +srv/web/ipfire/html/images/mail-message-new.png +srv/web/ipfire/html/images/mail-reply-all.png +srv/web/ipfire/html/images/mail-reply-sender.png +srv/web/ipfire/html/images/mail-send-receive.png +srv/web/ipfire/html/images/media-flash.png +srv/web/ipfire/html/images/media-floppy.png +srv/web/ipfire/html/images/media-optical.png +srv/web/ipfire/html/images/media-playback-start-all.png +srv/web/ipfire/html/images/media-playback-start.png +srv/web/ipfire/html/images/media-playback-stop.png +srv/web/ipfire/html/images/media-repeat.png +srv/web/ipfire/html/images/media-resume.png +srv/web/ipfire/html/images/media-shuffle.png +srv/web/ipfire/html/images/media-skip-backward.png +srv/web/ipfire/html/images/media-skip-forward.png +srv/web/ipfire/html/images/mpfire +srv/web/ipfire/html/images/mpfire/box.png +srv/web/ipfire/html/images/network-error.png +srv/web/ipfire/html/images/network-idle.png +srv/web/ipfire/html/images/network-offline.png +srv/web/ipfire/html/images/network-receive.png +srv/web/ipfire/html/images/network-server.png +srv/web/ipfire/html/images/network-transmit-receive.png +srv/web/ipfire/html/images/network-transmit.png +srv/web/ipfire/html/images/network-wired.png +srv/web/ipfire/html/images/network-wireless-encrypted.png +srv/web/ipfire/html/images/network-wireless.png +srv/web/ipfire/html/images/network-workgroup.png +srv/web/ipfire/html/images/network.png +srv/web/ipfire/html/images/null.gif +srv/web/ipfire/html/images/off.gif +srv/web/ipfire/html/images/on.gif +srv/web/ipfire/html/images/openvpn.gif +srv/web/ipfire/html/images/openvpn.png +srv/web/ipfire/html/images/package-x-generic.png +srv/web/ipfire/html/images/printer-error.png +srv/web/ipfire/html/images/printer.png +srv/web/ipfire/html/images/process-stop.png +srv/web/ipfire/html/images/process-working.png +srv/web/ipfire/html/images/reload.gif +srv/web/ipfire/html/images/start-here.png +srv/web/ipfire/html/images/stock_down-16.png +srv/web/ipfire/html/images/stock_ok.png +srv/web/ipfire/html/images/stock_stop.png +srv/web/ipfire/html/images/stock_up-16.png +srv/web/ipfire/html/images/system-file-manager.png +srv/web/ipfire/html/images/system-installer.png +srv/web/ipfire/html/images/system-lock-screen.png +srv/web/ipfire/html/images/system-log-out.png +srv/web/ipfire/html/images/system-search.png +srv/web/ipfire/html/images/system-shutdown.png +srv/web/ipfire/html/images/system-software-update.png +srv/web/ipfire/html/images/system-users.png +srv/web/ipfire/html/images/tab-new.png +srv/web/ipfire/html/images/table-header.gif +srv/web/ipfire/html/images/text-html.png +srv/web/ipfire/html/images/text-x-generic-template.png +srv/web/ipfire/html/images/text-x-generic.png +srv/web/ipfire/html/images/text-x-script.png +srv/web/ipfire/html/images/tux.png +srv/web/ipfire/html/images/up.gif +srv/web/ipfire/html/images/updbooster +srv/web/ipfire/html/images/updbooster/updxl-globe.gif +srv/web/ipfire/html/images/updbooster/updxl-gr.gif +srv/web/ipfire/html/images/updbooster/updxl-led-blue.gif +srv/web/ipfire/html/images/updbooster/updxl-led-gray.gif +srv/web/ipfire/html/images/updbooster/updxl-led-green.gif +srv/web/ipfire/html/images/updbooster/updxl-led-red.gif +srv/web/ipfire/html/images/updbooster/updxl-led-yellow.gif +srv/web/ipfire/html/images/updbooster/updxl-rd.gif +srv/web/ipfire/html/images/updbooster/updxl-src-adobe.gif +srv/web/ipfire/html/images/updbooster/updxl-src-apple.gif +srv/web/ipfire/html/images/updbooster/updxl-src-avast.gif +srv/web/ipfire/html/images/updbooster/updxl-src-avg.gif +srv/web/ipfire/html/images/updbooster/updxl-src-avira.gif +srv/web/ipfire/html/images/updbooster/updxl-src-kaspersky.gif +srv/web/ipfire/html/images/updbooster/updxl-src-linux.gif +srv/web/ipfire/html/images/updbooster/updxl-src-microsoft.gif +srv/web/ipfire/html/images/updbooster/updxl-src-symantec.gif +srv/web/ipfire/html/images/updbooster/updxl-src-trendmicro.gif +srv/web/ipfire/html/images/updbooster/updxl-src-unknown.gif +srv/web/ipfire/html/images/updbooster/updxl-src-windows.gif +srv/web/ipfire/html/images/updbooster/updxl-yl.gif +srv/web/ipfire/html/images/urlfilter +srv/web/ipfire/html/images/urlfilter/1x1.gif +srv/web/ipfire/html/images/urlfilter/bg_cool_tux.jpg +srv/web/ipfire/html/images/urlfilter/bgcool.gif +srv/web/ipfire/html/images/urlfilter/copy.gif +srv/web/ipfire/html/images/urlfilter/gmg_tux_ip_fire.gif +srv/web/ipfire/html/images/urlfilter/led-green.gif +srv/web/ipfire/html/images/urlfilter/led-red.gif +srv/web/ipfire/html/images/user-home.png +srv/web/ipfire/html/images/user-multiple.png +srv/web/ipfire/html/images/user-option-add.png +srv/web/ipfire/html/images/user-option-remove.png +srv/web/ipfire/html/images/user-trash-full.png +srv/web/ipfire/html/images/user-trash.png +srv/web/ipfire/html/images/utilities-system-monitor.png +srv/web/ipfire/html/images/utilities-terminal.png +srv/web/ipfire/html/images/view-fullscreen.png +srv/web/ipfire/html/images/view-refresh.png +srv/web/ipfire/html/images/wakeup.gif +srv/web/ipfire/html/images/window-new.png +srv/web/ipfire/html/include +srv/web/ipfire/html/include/snortupdateutility.js +srv/web/ipfire/html/index.cgi +srv/web/ipfire/html/redirect-templates +srv/web/ipfire/html/redirect-templates/legacy +srv/web/ipfire/html/redirect-templates/legacy/template.html +srv/web/ipfire/html/redirect.cgi +srv/web/ipfire/html/themes +srv/web/ipfire/html/themes/darkdos +srv/web/ipfire/html/themes/darkdos/images +srv/web/ipfire/html/themes/darkdos/images/IPFire.png +srv/web/ipfire/html/themes/darkdos/images/b1.gif +srv/web/ipfire/html/themes/darkdos/images/b2.gif +srv/web/ipfire/html/themes/darkdos/images/b3.gif +srv/web/ipfire/html/themes/darkdos/images/b4.gif +srv/web/ipfire/html/themes/darkdos/images/b5.gif +srv/web/ipfire/html/themes/darkdos/images/b6.gif +srv/web/ipfire/html/themes/darkdos/images/spacer.gif +srv/web/ipfire/html/themes/darkdos/include +srv/web/ipfire/html/themes/darkdos/include/colors.txt +srv/web/ipfire/html/themes/darkdos/include/functions.pl +srv/web/ipfire/html/themes/darkdos/include/style.css +srv/web/ipfire/html/themes/ipfire +srv/web/ipfire/html/themes/ipfire-legacy +srv/web/ipfire/html/themes/ipfire-legacy/images +srv/web/ipfire/html/themes/ipfire-legacy/images/n1.gif +srv/web/ipfire/html/themes/ipfire-legacy/images/n2.gif +srv/web/ipfire/html/themes/ipfire-legacy/images/n3.gif +srv/web/ipfire/html/themes/ipfire-legacy/images/n4.gif +srv/web/ipfire/html/themes/ipfire-legacy/images/n5.gif +srv/web/ipfire/html/themes/ipfire-legacy/images/n6.gif +srv/web/ipfire/html/themes/ipfire-legacy/images/spacer.gif +srv/web/ipfire/html/themes/ipfire-legacy/include +srv/web/ipfire/html/themes/ipfire-legacy/include/colors.txt +srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl +srv/web/ipfire/html/themes/ipfire-legacy/include/style.css +srv/web/ipfire/html/themes/ipfire-rounded +srv/web/ipfire/html/themes/ipfire/images +srv/web/ipfire/html/themes/ipfire/images/n2.gif +srv/web/ipfire/html/themes/ipfire/images/n3.gif +srv/web/ipfire/html/themes/ipfire/images/n5.gif +srv/web/ipfire/html/themes/ipfire/images/n6.gif +srv/web/ipfire/html/themes/ipfire/images/tux2.png +srv/web/ipfire/html/themes/ipfire/include +srv/web/ipfire/html/themes/ipfire/include/colors.txt +srv/web/ipfire/html/themes/ipfire/include/css +srv/web/ipfire/html/themes/ipfire/include/css/style-rounded.css +srv/web/ipfire/html/themes/ipfire/include/css/style.css +srv/web/ipfire/html/themes/ipfire/include/functions.pl +srv/web/ipfire/html/themes/ipfire/include/js +srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js +srv/web/ipfire/html/themes/maniac +srv/web/ipfire/html/themes/maniac/images +srv/web/ipfire/html/themes/maniac/images/IPFire.png +srv/web/ipfire/html/themes/maniac/images/Thumbs.db +srv/web/ipfire/html/themes/maniac/images/b1.gif +srv/web/ipfire/html/themes/maniac/images/b2.gif +srv/web/ipfire/html/themes/maniac/images/b3.gif +srv/web/ipfire/html/themes/maniac/images/b4.gif +srv/web/ipfire/html/themes/maniac/images/b5.gif +srv/web/ipfire/html/themes/maniac/images/b6.gif +srv/web/ipfire/html/themes/maniac/images/spacer.gif +srv/web/ipfire/html/themes/maniac/include +srv/web/ipfire/html/themes/maniac/include/colors.txt +srv/web/ipfire/html/themes/maniac/include/functions.pl +srv/web/ipfire/html/themes/maniac/include/style.css +var/updatecache +var/updatecache/download +var/updatecache/metadata diff --git a/config/rootfiles/common/xtables-addons b/config/rootfiles/common/xtables-addons new file mode 100644 index 0000000000..f6e85aeeda --- /dev/null +++ b/config/rootfiles/common/xtables-addons @@ -0,0 +1,33 @@ +lib/xtables/libxt_ACCOUNT.so +lib/xtables/libxt_CHAOS.so +lib/xtables/libxt_DELUDE.so +lib/xtables/libxt_DHCPMAC.so +lib/xtables/libxt_DNETMAP.so +lib/xtables/libxt_ECHO.so +lib/xtables/libxt_IPMARK.so +lib/xtables/libxt_LOGMARK.so +lib/xtables/libxt_TARPIT.so +lib/xtables/libxt_condition.so +lib/xtables/libxt_dhcpmac.so +lib/xtables/libxt_fuzzy.so +lib/xtables/libxt_geoip.so +lib/xtables/libxt_iface.so +lib/xtables/libxt_ipp2p.so +lib/xtables/libxt_ipv4options.so +lib/xtables/libxt_length2.so +lib/xtables/libxt_lscan.so +lib/xtables/libxt_pknock.so +lib/xtables/libxt_psd.so +lib/xtables/libxt_quota2.so +#usr/lib/libxt_ACCOUNT_cl.la +#usr/lib/libxt_ACCOUNT_cl.so +usr/lib/libxt_ACCOUNT_cl.so.0 +usr/lib/libxt_ACCOUNT_cl.so.0.0.0 +#usr/libexec/xtables-addons +usr/libexec/xtables-addons/xt_geoip_build +usr/libexec/xtables-addons/xt_geoip_dl +usr/sbin/iptaccount +#usr/share/man/man1/xt_geoip_build.1 +#usr/share/man/man1/xt_geoip_dl.1 +#usr/share/man/man8/iptaccount.8 +#usr/share/man/man8/xtables-addons.8 diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz index 7c83de7c76..b4053d9b71 100644 --- a/config/rootfiles/common/xz +++ b/config/rootfiles/common/xz @@ -33,7 +33,7 @@ usr/bin/xzmore #usr/include/lzma/hardware.h #usr/include/lzma/index.h #usr/include/lzma/index_hash.h -#usr/include/lzma/lzma.h +#usr/include/lzma/lzma12.h #usr/include/lzma/stream_flags.h #usr/include/lzma/version.h #usr/include/lzma/vli.h @@ -41,7 +41,7 @@ usr/bin/xzmore #usr/lib/liblzma.la usr/lib/liblzma.so usr/lib/liblzma.so.5 -usr/lib/liblzma.so.5.0.5 +usr/lib/liblzma.so.5.2.1 #usr/lib/pkgconfig/liblzma.pc #usr/share/doc/xz #usr/share/doc/xz/AUTHORS @@ -56,6 +56,7 @@ usr/lib/liblzma.so.5.0.5 #usr/share/doc/xz/examples/01_compress_easy.c #usr/share/doc/xz/examples/02_decompress.c #usr/share/doc/xz/examples/03_compress_custom.c +#usr/share/doc/xz/examples/04_compress_easy_mt.c #usr/share/doc/xz/examples/Makefile #usr/share/doc/xz/examples_old #usr/share/doc/xz/examples_old/xz_pipe_comp.c @@ -69,6 +70,7 @@ usr/lib/liblzma.so.5.0.5 #usr/share/locale/fr/LC_MESSAGES/xz.mo #usr/share/locale/it/LC_MESSAGES/xz.mo #usr/share/locale/pl/LC_MESSAGES/xz.mo +#usr/share/locale/vi/LC_MESSAGES/xz.mo #usr/share/man/man1/lzcat.1 #usr/share/man/man1/lzcmp.1 #usr/share/man/man1/lzdiff.1 diff --git a/config/rootfiles/core/87/filelists/files b/config/rootfiles/core/87/filelists/files deleted file mode 100644 index 971e9e9c71..0000000000 --- a/config/rootfiles/core/87/filelists/files +++ /dev/null @@ -1,4 +0,0 @@ -etc/system-release -etc/issue -srv/web/ipfire/cgi-bin/ovpnmain.cgi -var/ipfire/langs diff --git a/config/rootfiles/core/85/exclude b/config/rootfiles/core/88/exclude similarity index 100% rename from config/rootfiles/core/85/exclude rename to config/rootfiles/core/88/exclude diff --git a/config/rootfiles/core/88/filelists/files b/config/rootfiles/core/88/filelists/files new file mode 100644 index 0000000000..409e5fe8ac --- /dev/null +++ b/config/rootfiles/core/88/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/86/filelists/fireinfo b/config/rootfiles/core/88/filelists/fireinfo similarity index 100% rename from config/rootfiles/core/86/filelists/fireinfo rename to config/rootfiles/core/88/filelists/fireinfo diff --git a/config/rootfiles/core/88/filelists/openssh b/config/rootfiles/core/88/filelists/openssh new file mode 120000 index 0000000000..d8c77fd8e7 --- /dev/null +++ b/config/rootfiles/core/88/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/85/filelists/openssl b/config/rootfiles/core/88/filelists/openssl similarity index 100% rename from config/rootfiles/core/85/filelists/openssl rename to config/rootfiles/core/88/filelists/openssl diff --git a/config/rootfiles/core/85/filelists/openssl-compat b/config/rootfiles/core/88/filelists/openssl-compat similarity index 100% rename from config/rootfiles/core/85/filelists/openssl-compat rename to config/rootfiles/core/88/filelists/openssl-compat diff --git a/config/rootfiles/core/85/meta b/config/rootfiles/core/88/meta similarity index 100% rename from config/rootfiles/core/85/meta rename to config/rootfiles/core/88/meta diff --git a/config/rootfiles/core/87/update.sh b/config/rootfiles/core/88/update.sh similarity index 92% rename from config/rootfiles/core/87/update.sh rename to config/rootfiles/core/88/update.sh index f21fc037ac..6ef1f483ee 100644 --- a/config/rootfiles/core/87/update.sh +++ b/config/rootfiles/core/88/update.sh @@ -25,7 +25,7 @@ /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # Remove old core updates from pakfire cache to save space... -core=87 +core=88 for (( i=1; i<=$core; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire @@ -41,12 +41,8 @@ extract_files # Start services # Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" -# Uninstall the sqlite package. -rm -f \ - /opt/pakfire/db/installed/meta-sqlite \ - /opt/pakfire/db/rootfiles/sqlite sync diff --git a/config/rootfiles/core/86/exclude b/config/rootfiles/core/89/exclude similarity index 100% rename from config/rootfiles/core/86/exclude rename to config/rootfiles/core/89/exclude diff --git a/config/rootfiles/core/89/filelists/collectd b/config/rootfiles/core/89/filelists/collectd new file mode 120000 index 0000000000..871b32f14b --- /dev/null +++ b/config/rootfiles/core/89/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/daq b/config/rootfiles/core/89/filelists/daq similarity index 100% rename from config/rootfiles/core/87/filelists/daq rename to config/rootfiles/core/89/filelists/daq diff --git a/config/rootfiles/core/87/filelists/ddns b/config/rootfiles/core/89/filelists/ddns similarity index 100% rename from config/rootfiles/core/87/filelists/ddns rename to config/rootfiles/core/89/filelists/ddns diff --git a/config/rootfiles/core/87/filelists/dnsmasq b/config/rootfiles/core/89/filelists/dnsmasq similarity index 100% rename from config/rootfiles/core/87/filelists/dnsmasq rename to config/rootfiles/core/89/filelists/dnsmasq diff --git a/config/rootfiles/core/87/filelists/ethtool b/config/rootfiles/core/89/filelists/ethtool similarity index 100% rename from config/rootfiles/core/87/filelists/ethtool rename to config/rootfiles/core/89/filelists/ethtool diff --git a/config/rootfiles/core/87/filelists/fcron b/config/rootfiles/core/89/filelists/fcron similarity index 100% rename from config/rootfiles/core/87/filelists/fcron rename to config/rootfiles/core/89/filelists/fcron diff --git a/config/rootfiles/core/87/filelists/file b/config/rootfiles/core/89/filelists/file similarity index 100% rename from config/rootfiles/core/87/filelists/file rename to config/rootfiles/core/89/filelists/file diff --git a/config/rootfiles/core/89/filelists/files b/config/rootfiles/core/89/filelists/files new file mode 100644 index 0000000000..70c5f3d9b1 --- /dev/null +++ b/config/rootfiles/core/89/filelists/files @@ -0,0 +1,22 @@ +etc/system-release +etc/issue +etc/collectd.conf +etc/collectd.vpn +etc/rc.d/init.d/dnsmasq +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/netovpnrw.cgi +srv/web/ipfire/cgi-bin/netovpnsrv.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/local/bin/collectdctrl +usr/local/bin/openvpnctrl +usr/sbin/ovpn-collectd-convert +usr/sbin/setup +var/ipfire/backup/bin/backup.pl +var/ipfire/graphs.pl +var/ipfire/langs +var/ipfire/lang.pl +var/ipfire/menu.d/20-status.menu diff --git a/config/rootfiles/core/89/filelists/fuse b/config/rootfiles/core/89/filelists/fuse new file mode 120000 index 0000000000..570edaadef --- /dev/null +++ b/config/rootfiles/core/89/filelists/fuse @@ -0,0 +1 @@ +../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/gnupg b/config/rootfiles/core/89/filelists/gnupg similarity index 100% rename from config/rootfiles/core/87/filelists/gnupg rename to config/rootfiles/core/89/filelists/gnupg diff --git a/config/rootfiles/core/87/filelists/grep b/config/rootfiles/core/89/filelists/grep similarity index 100% rename from config/rootfiles/core/87/filelists/grep rename to config/rootfiles/core/89/filelists/grep diff --git a/config/rootfiles/core/87/filelists/hdparm b/config/rootfiles/core/89/filelists/hdparm similarity index 100% rename from config/rootfiles/core/87/filelists/hdparm rename to config/rootfiles/core/89/filelists/hdparm diff --git a/config/rootfiles/core/87/filelists/libart b/config/rootfiles/core/89/filelists/libart similarity index 100% rename from config/rootfiles/core/87/filelists/libart rename to config/rootfiles/core/89/filelists/libart diff --git a/config/rootfiles/core/86/filelists/libcap b/config/rootfiles/core/89/filelists/libcap similarity index 100% rename from config/rootfiles/core/86/filelists/libcap rename to config/rootfiles/core/89/filelists/libcap diff --git a/config/rootfiles/core/87/filelists/libffi b/config/rootfiles/core/89/filelists/libffi similarity index 100% rename from config/rootfiles/core/87/filelists/libffi rename to config/rootfiles/core/89/filelists/libffi diff --git a/config/rootfiles/core/87/filelists/libpcap b/config/rootfiles/core/89/filelists/libpcap similarity index 100% rename from config/rootfiles/core/87/filelists/libpcap rename to config/rootfiles/core/89/filelists/libpcap diff --git a/config/rootfiles/core/89/filelists/ntfs-3g b/config/rootfiles/core/89/filelists/ntfs-3g new file mode 120000 index 0000000000..d93adc2a18 --- /dev/null +++ b/config/rootfiles/core/89/filelists/ntfs-3g @@ -0,0 +1 @@ +../../../common/ntfs-3g \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/openssh b/config/rootfiles/core/89/filelists/openssh new file mode 120000 index 0000000000..d8c77fd8e7 --- /dev/null +++ b/config/rootfiles/core/89/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/openssl b/config/rootfiles/core/89/filelists/openssl similarity index 100% rename from config/rootfiles/core/86/filelists/openssl rename to config/rootfiles/core/89/filelists/openssl diff --git a/config/rootfiles/core/86/filelists/openssl-compat b/config/rootfiles/core/89/filelists/openssl-compat similarity index 100% rename from config/rootfiles/core/86/filelists/openssl-compat rename to config/rootfiles/core/89/filelists/openssl-compat diff --git a/config/rootfiles/core/87/filelists/pcre b/config/rootfiles/core/89/filelists/pcre similarity index 100% rename from config/rootfiles/core/87/filelists/pcre rename to config/rootfiles/core/89/filelists/pcre diff --git a/config/rootfiles/core/87/filelists/screen b/config/rootfiles/core/89/filelists/screen similarity index 100% rename from config/rootfiles/core/87/filelists/screen rename to config/rootfiles/core/89/filelists/screen diff --git a/config/rootfiles/core/86/filelists/setup b/config/rootfiles/core/89/filelists/setup similarity index 100% rename from config/rootfiles/core/86/filelists/setup rename to config/rootfiles/core/89/filelists/setup diff --git a/config/rootfiles/core/87/filelists/smartmontools b/config/rootfiles/core/89/filelists/smartmontools similarity index 100% rename from config/rootfiles/core/87/filelists/smartmontools rename to config/rootfiles/core/89/filelists/smartmontools diff --git a/config/rootfiles/core/87/filelists/snort b/config/rootfiles/core/89/filelists/snort similarity index 100% rename from config/rootfiles/core/87/filelists/snort rename to config/rootfiles/core/89/filelists/snort diff --git a/config/rootfiles/core/87/filelists/sqlite b/config/rootfiles/core/89/filelists/sqlite similarity index 100% rename from config/rootfiles/core/87/filelists/sqlite rename to config/rootfiles/core/89/filelists/sqlite diff --git a/config/rootfiles/core/87/filelists/squid b/config/rootfiles/core/89/filelists/squid similarity index 100% rename from config/rootfiles/core/87/filelists/squid rename to config/rootfiles/core/89/filelists/squid diff --git a/config/rootfiles/core/86/filelists/strongswan b/config/rootfiles/core/89/filelists/strongswan similarity index 100% rename from config/rootfiles/core/86/filelists/strongswan rename to config/rootfiles/core/89/filelists/strongswan diff --git a/config/rootfiles/core/87/filelists/tar b/config/rootfiles/core/89/filelists/tar similarity index 100% rename from config/rootfiles/core/87/filelists/tar rename to config/rootfiles/core/89/filelists/tar diff --git a/config/rootfiles/core/86/filelists/tzdata b/config/rootfiles/core/89/filelists/tzdata similarity index 100% rename from config/rootfiles/core/86/filelists/tzdata rename to config/rootfiles/core/89/filelists/tzdata diff --git a/config/rootfiles/core/87/filelists/wget b/config/rootfiles/core/89/filelists/wget similarity index 100% rename from config/rootfiles/core/87/filelists/wget rename to config/rootfiles/core/89/filelists/wget diff --git a/config/rootfiles/core/87/filelists/zlib b/config/rootfiles/core/89/filelists/zlib similarity index 100% rename from config/rootfiles/core/87/filelists/zlib rename to config/rootfiles/core/89/filelists/zlib diff --git a/config/rootfiles/core/86/meta b/config/rootfiles/core/89/meta similarity index 100% rename from config/rootfiles/core/86/meta rename to config/rootfiles/core/89/meta diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh new file mode 100644 index 0000000000..90a6d776b0 --- /dev/null +++ b/config/rootfiles/core/89/update.sh @@ -0,0 +1,109 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=89 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/etc/init.d/ipsec stop + +# Remove old files +rm -f /usr/local/sbin/setup + +# Extract files +extract_files + +# Update /etc/sysconfig/createfiles +cat <> /etc/sysconfig/createfiles +/var/run/ovpnserver.log file 644 nobody nobody +/var/run/openvpn dir 644 nobody nobody +EOF + +# Update /etc/collectd.conf +if ! grep -q "collectd.vpn" /etc/collectd.conf; then + echo "include \"/etc/collectd.vpn\"" >> /etc/collectd.conf +fi + +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi + +# Start services +/etc/init.d/dnsmasq restart +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Prevent uninstall sqlite (now common package). +rm -f \ + /opt/pakfire/db/*/meta-sqlite \ + /opt/pakfire/db/rootfiles/sqlite + +mkdir -p /var/run/openvpn +touch /var/run/ovpnserver.log +chown nobody.nobody \ + /var/run/openvpn \ + /var/run/ovpnserver.log + +# Update OpenVPN/collectd configuration +files=`find /var/ipfire/ovpn/n2nconf/ -type d` +for i in $files; +do + if ! grep -q "status-version" $i/${i##*/}.conf; then + echo "# Logfile" >> $i/${i##*/}.conf + echo "status-version 1" >> $i/${i##*/}.conf + fi + if ! grep -q "status " $i/${i##*/}.conf; then + echo "status /var/run/openvpn/${i##*/}-n2n 10" >> $i/${i##*/}.conf + fi +done + +/usr/sbin/ovpn-collectd-convert +chown nobody.nobody /var/ipfire/ovpn/collectd.vpn + +# Fix permissions +chown nobody.nobody /var/ipfire/dns + +# Fix #10625 +mkdir -p /etc/logrotate.d + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/core/90/exclude b/config/rootfiles/core/90/exclude new file mode 100644 index 0000000000..56e840d8cc --- /dev/null +++ b/config/rootfiles/core/90/exclude @@ -0,0 +1,28 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/rc.d/rcsysinit.d/S19checkfstab +etc/rc.d/rcsysinit.d/S70console +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/modules +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/firewall/geoipblock +var/ipfire/fwhosts/custmgeoipgrp +var/ipfire/ovpn/ccd.conf +var/ipfire/ovpn/ccdroute +var/ipfire/ovpn/ccdroute2 +var/ipfire/time +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/90/filelists/Locale-Country b/config/rootfiles/core/90/filelists/Locale-Country new file mode 120000 index 0000000000..025c278788 --- /dev/null +++ b/config/rootfiles/core/90/filelists/Locale-Country @@ -0,0 +1 @@ +../../../common/Locale-Country \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/apache2 b/config/rootfiles/core/90/filelists/apache2 new file mode 120000 index 0000000000..eef95efa72 --- /dev/null +++ b/config/rootfiles/core/90/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/armv5tel/glibc b/config/rootfiles/core/90/filelists/armv5tel/glibc new file mode 120000 index 0000000000..4c70d724b4 --- /dev/null +++ b/config/rootfiles/core/90/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/86/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/86/filelists/armv5tel/linux-multi b/config/rootfiles/core/90/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/86/filelists/armv5tel/linux-multi rename to config/rootfiles/core/90/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/86/filelists/armv5tel/linux-rpi b/config/rootfiles/core/90/filelists/armv5tel/linux-rpi similarity index 100% rename from config/rootfiles/core/86/filelists/armv5tel/linux-rpi rename to config/rootfiles/core/90/filelists/armv5tel/linux-rpi diff --git a/config/rootfiles/core/90/filelists/curl b/config/rootfiles/core/90/filelists/curl new file mode 120000 index 0000000000..4b84bef53a --- /dev/null +++ b/config/rootfiles/core/90/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/cyrus-sasl b/config/rootfiles/core/90/filelists/cyrus-sasl new file mode 120000 index 0000000000..bb51b4c92c --- /dev/null +++ b/config/rootfiles/core/90/filelists/cyrus-sasl @@ -0,0 +1 @@ +../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/ddns b/config/rootfiles/core/90/filelists/ddns new file mode 120000 index 0000000000..739516420f --- /dev/null +++ b/config/rootfiles/core/90/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dhcp b/config/rootfiles/core/90/filelists/dhcp new file mode 120000 index 0000000000..32d8da443d --- /dev/null +++ b/config/rootfiles/core/90/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dhcpcd b/config/rootfiles/core/90/filelists/dhcpcd new file mode 120000 index 0000000000..1e799dabb4 --- /dev/null +++ b/config/rootfiles/core/90/filelists/dhcpcd @@ -0,0 +1 @@ +../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dnsmasq b/config/rootfiles/core/90/filelists/dnsmasq new file mode 120000 index 0000000000..d469c74631 --- /dev/null +++ b/config/rootfiles/core/90/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/dracut b/config/rootfiles/core/90/filelists/dracut similarity index 100% rename from config/rootfiles/core/86/filelists/dracut rename to config/rootfiles/core/90/filelists/dracut diff --git a/config/rootfiles/core/90/filelists/expat b/config/rootfiles/core/90/filelists/expat new file mode 120000 index 0000000000..e1923cf639 --- /dev/null +++ b/config/rootfiles/core/90/filelists/expat @@ -0,0 +1 @@ +../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files new file mode 100644 index 0000000000..431dcd61c0 --- /dev/null +++ b/config/rootfiles/core/90/filelists/files @@ -0,0 +1,36 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/firewall +etc/rc.d/init.d/network-trigger +etc/rc.d/init.d/networking/functions.network +etc/rc.d/init.d/networking/red.up/99-geoip-database +etc/rc.d/rcsysinit.d/S90network-trigger +srv/web/ipfire/cgi-bin/country.cgi +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/geoip-block.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat +srv/web/ipfire/cgi-bin/netovpnsrv.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/html/themes/darkdos/include/style.css +srv/web/ipfire/html/themes/ipfire-legacy/include/style.css +srv/web/ipfire/html/themes/ipfire/include/css/style.css +srv/web/ipfire/html/themes/maniac/include/style.css +usr/lib/firewall/firewall-lib.pl +usr/lib/firewall/rules.pl +usr/local/bin/backupiso +usr/local/bin/ddnsctrl +usr/local/bin/ipsecctrl +usr/local/bin/xt_geoip_build +usr/local/bin/xt_geoip_update +var/ipfire/general-functions.pl +var/ipfire/geoip-functions.pl +var/ipfire/header.pl +var/ipfire/backup/include +var/ipfire/langs +var/ipfire/menu.d/50-firewall.menu diff --git a/config/rootfiles/core/90/filelists/fireinfo b/config/rootfiles/core/90/filelists/fireinfo new file mode 120000 index 0000000000..c46115521f --- /dev/null +++ b/config/rootfiles/core/90/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/flag-icons b/config/rootfiles/core/90/filelists/flag-icons new file mode 120000 index 0000000000..8776b6b790 --- /dev/null +++ b/config/rootfiles/core/90/filelists/flag-icons @@ -0,0 +1 @@ +../../../common/flag-icons \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/groff b/config/rootfiles/core/90/filelists/groff new file mode 120000 index 0000000000..232291e521 --- /dev/null +++ b/config/rootfiles/core/90/filelists/groff @@ -0,0 +1 @@ +../../../common/groff \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/acpid b/config/rootfiles/core/90/filelists/i586/acpid new file mode 120000 index 0000000000..21d36ee1dd --- /dev/null +++ b/config/rootfiles/core/90/filelists/i586/acpid @@ -0,0 +1 @@ +../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/i586/glibc b/config/rootfiles/core/90/filelists/i586/glibc similarity index 100% rename from config/rootfiles/core/86/filelists/i586/glibc rename to config/rootfiles/core/90/filelists/i586/glibc diff --git a/config/rootfiles/core/86/filelists/i586/linux b/config/rootfiles/core/90/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/86/filelists/i586/linux rename to config/rootfiles/core/90/filelists/i586/linux diff --git a/config/rootfiles/core/86/filelists/i586/linux-initrd b/config/rootfiles/core/90/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/86/filelists/i586/linux-initrd rename to config/rootfiles/core/90/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/90/filelists/i586/openssl-sse2 b/config/rootfiles/core/90/filelists/i586/openssl-sse2 new file mode 120000 index 0000000000..f424713d6c --- /dev/null +++ b/config/rootfiles/core/90/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/iptables b/config/rootfiles/core/90/filelists/iptables new file mode 120000 index 0000000000..8caf12bccb --- /dev/null +++ b/config/rootfiles/core/90/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/iputils b/config/rootfiles/core/90/filelists/iputils new file mode 120000 index 0000000000..361c28f71a --- /dev/null +++ b/config/rootfiles/core/90/filelists/iputils @@ -0,0 +1 @@ +../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/libjpeg b/config/rootfiles/core/90/filelists/libjpeg new file mode 120000 index 0000000000..3b1a782fb1 --- /dev/null +++ b/config/rootfiles/core/90/filelists/libjpeg @@ -0,0 +1 @@ +../../../common/libjpeg \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/logrotate b/config/rootfiles/core/90/filelists/logrotate new file mode 120000 index 0000000000..bc192c05db --- /dev/null +++ b/config/rootfiles/core/90/filelists/logrotate @@ -0,0 +1 @@ +../../../common/logrotate \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/logwatch b/config/rootfiles/core/90/filelists/logwatch new file mode 120000 index 0000000000..f14eabda99 --- /dev/null +++ b/config/rootfiles/core/90/filelists/logwatch @@ -0,0 +1 @@ +../../../common/logwatch \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/openssl b/config/rootfiles/core/90/filelists/openssl new file mode 120000 index 0000000000..e011a9266c --- /dev/null +++ b/config/rootfiles/core/90/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/openssl-0.9.8-files b/config/rootfiles/core/90/filelists/openssl-0.9.8-files new file mode 100644 index 0000000000..e80a57d13a --- /dev/null +++ b/config/rootfiles/core/90/filelists/openssl-0.9.8-files @@ -0,0 +1,19 @@ +lib/security/pam_mysql.so +usr/lib/gnupg/gpgkeys_ldap +usr/lib/gnupg/gpgkeys_hkp +usr/lib/gnupg/gpgkeys_curl +usr/lib/apache/libphp5.so +usr/lib/squid/digest_ldap_auth +usr/lib/squid/basic_ldap_auth +usr/lib/squid/ext_kerberos_ldap_group_acl +usr/lib/squid/ext_edirectory_userip_acl +usr/lib/squid/ext_ldap_group_acl +usr/lib/python2.7/lib-dynload/_ssl.so +usr/lib/python2.7/lib-dynload/_hashlib.so +usr/lib/collectd/write_http.so +usr/lib/collectd/ascent.so +usr/lib/collectd/curl_xml.so +usr/lib/collectd/apache.so +usr/lib/collectd/bind.so +usr/lib/collectd/curl.so +usr/bin/php diff --git a/config/rootfiles/core/90/filelists/perl-Text-CSV_XS b/config/rootfiles/core/90/filelists/perl-Text-CSV_XS new file mode 120000 index 0000000000..ec1202f07b --- /dev/null +++ b/config/rootfiles/core/90/filelists/perl-Text-CSV_XS @@ -0,0 +1 @@ +../../../common/perl-Text-CSV_XS \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/squid b/config/rootfiles/core/90/filelists/squid new file mode 120000 index 0000000000..2dc8372a0e --- /dev/null +++ b/config/rootfiles/core/90/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/strongswan b/config/rootfiles/core/90/filelists/strongswan new file mode 120000 index 0000000000..90c727e265 --- /dev/null +++ b/config/rootfiles/core/90/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/tzdata b/config/rootfiles/core/90/filelists/tzdata new file mode 120000 index 0000000000..5a6e3252f3 --- /dev/null +++ b/config/rootfiles/core/90/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/udev b/config/rootfiles/core/90/filelists/udev new file mode 120000 index 0000000000..e967a1c925 --- /dev/null +++ b/config/rootfiles/core/90/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/wpa_supplicant b/config/rootfiles/core/90/filelists/wpa_supplicant similarity index 100% rename from config/rootfiles/core/86/filelists/wpa_supplicant rename to config/rootfiles/core/90/filelists/wpa_supplicant diff --git a/config/rootfiles/core/90/filelists/xtables-addons b/config/rootfiles/core/90/filelists/xtables-addons new file mode 120000 index 0000000000..2e24c4298b --- /dev/null +++ b/config/rootfiles/core/90/filelists/xtables-addons @@ -0,0 +1 @@ +../../../common/xtables-addons \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/xz b/config/rootfiles/core/90/filelists/xz new file mode 120000 index 0000000000..734e926c7e --- /dev/null +++ b/config/rootfiles/core/90/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/87/meta b/config/rootfiles/core/90/meta similarity index 100% rename from config/rootfiles/core/87/meta rename to config/rootfiles/core/90/meta diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh new file mode 100644 index 0000000000..4835c5a29c --- /dev/null +++ b/config/rootfiles/core/90/update.sh @@ -0,0 +1,305 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + + +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + +# +# Remove old core updates from pakfire cache to save space... +core=90 +for (( i=1; i<=${core}; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire-versatile ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. versatile support is dropped." + # Report no error to pakfire. So it does not try to install it again. + exit 0 + ;; + *-ipfire* ) + # Ok. + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. No IPFire Kernel." + exit 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update because not enough free space on root." + exit 2 +fi + + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi + ;; +esac + +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + +# Drop old flag icons, before extracting the new ones. +rm /srv/web/ipfire/html/images/flags/* + +# +#Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# +# restart init because glibc was updated. +telinit u + +# Remove old openssl libraries +rm -vf /usr/lib/libcrypto.so.0.9.8 /usr/lib/libssl.so.0.9.8 + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." + /etc/init.d/apache start + exit 4 + ;; + esac +fi + +# Create GeoIP related files if they do not exist yet. +if [ ! -e "/var/ipfire/firewall/geoipblock" ]; then + touch /var/ipfire/firewall/geoipblock + chown nobody:nobody /var/ipfire/firewall/geoipblock + + # Insert default value into file. + echo "GEOIPBLOCK_ENABLED=off" >> /var/ipfire/firewall/geoipblock +fi +if [ ! -e "/var/ipfire/fwhosts/customgeoipgrp" ]; then + touch /var/ipfire/fwhosts/customgeoipgrp + chown nobody:nobody /var/ipfire/fwhosts/customgeoipgrp +fi + +#Fix BUG10812 (openvpn server.conf has wrong collectd logfile path) +if grep -q "status /var/log/ovpnserver.log 30" /var/ipfire/ovpn/server.conf; then + sed -i "s/\/var\/log\/ovpnserver.log 30/\/var\/run\/ovpnserver.log 30/" /var/ipfire/ovpn/server.conf +fi + +# Download/Update GeoIP databases. +/usr/local/bin/xt_geoip_update + +# Update crontab +grep -q /usr/local/bin/xt_geoip_update /var/spool/cron/root.orig || cat <> /var/spool/cron/root.orig + +# Update GeoIP database once a month. +%monthly,random * * * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/xt_geoip_update >/dev/null 2>&1 +EOF + +fcrontab -z &>/dev/null + +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi + +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# +# Start services +# +/etc/init.d/apache start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +case "$(uname -m)" in + i?86) + case "$(find_device "/")" in + xvd* ) + echo Skip remove grub2 files, because pygrub fail. + rm -f /boot/grub/* + echo config will recreated by linux-pae install. + ;; + * ) + # + # Update to GRUB2 config + # + grub-mkconfig > /boot/grub/grub.cfg + ;; + esac +esac + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + + +# Force (re)install pae kernel if pae is supported +rm -rf /opt/pakfire/db/*/meta-linux-pae +if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae + fi +fi + +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# +#Finish +( + /etc/init.d/fireinfo start + sendprofile +) >/dev/null 2>&1 & + +echo +echo Please wait until pakfire has ended... +echo + +# Don't report the exitcode last command +exit 0 + diff --git a/config/rootfiles/core/87/exclude b/config/rootfiles/core/91/exclude similarity index 100% rename from config/rootfiles/core/87/exclude rename to config/rootfiles/core/91/exclude diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files new file mode 100644 index 0000000000..95f6e10005 --- /dev/null +++ b/config/rootfiles/core/91/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libnet b/config/rootfiles/core/91/filelists/libnet new file mode 120000 index 0000000000..26e5f7924a --- /dev/null +++ b/config/rootfiles/core/91/filelists/libnet @@ -0,0 +1 @@ +../../../common/libnet \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libtool b/config/rootfiles/core/91/filelists/libtool new file mode 120000 index 0000000000..54f5666f89 --- /dev/null +++ b/config/rootfiles/core/91/filelists/libtool @@ -0,0 +1 @@ +../../../common/libtool \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libxml2 b/config/rootfiles/core/91/filelists/libxml2 new file mode 120000 index 0000000000..242e69fa35 --- /dev/null +++ b/config/rootfiles/core/91/filelists/libxml2 @@ -0,0 +1 @@ +../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libxslt b/config/rootfiles/core/91/filelists/libxslt new file mode 120000 index 0000000000..bf9d76609b --- /dev/null +++ b/config/rootfiles/core/91/filelists/libxslt @@ -0,0 +1 @@ +../../../common/libxslt \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/newt b/config/rootfiles/core/91/filelists/newt similarity index 100% rename from config/rootfiles/core/86/filelists/newt rename to config/rootfiles/core/91/filelists/newt diff --git a/config/rootfiles/core/91/meta b/config/rootfiles/core/91/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/core/91/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh new file mode 100644 index 0000000000..dfacbfe81a --- /dev/null +++ b/config/rootfiles/core/91/update.sh @@ -0,0 +1,50 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2015 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=91 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Extract files +extract_files + +# Update Language cache +update-lang-cache + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/85/exclude b/config/rootfiles/oldcore/85/exclude new file mode 100644 index 0000000000..18e9b4d243 --- /dev/null +++ b/config/rootfiles/oldcore/85/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/85/filelists/files b/config/rootfiles/oldcore/85/filelists/files similarity index 100% rename from config/rootfiles/core/85/filelists/files rename to config/rootfiles/oldcore/85/filelists/files diff --git a/config/rootfiles/oldcore/85/filelists/openssl b/config/rootfiles/oldcore/85/filelists/openssl new file mode 120000 index 0000000000..e011a9266c --- /dev/null +++ b/config/rootfiles/oldcore/85/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/85/filelists/openssl-compat b/config/rootfiles/oldcore/85/filelists/openssl-compat new file mode 120000 index 0000000000..c9fa421324 --- /dev/null +++ b/config/rootfiles/oldcore/85/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/oldcore/85/meta b/config/rootfiles/oldcore/85/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/85/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/85/update.sh b/config/rootfiles/oldcore/85/update.sh similarity index 100% rename from config/rootfiles/core/85/update.sh rename to config/rootfiles/oldcore/85/update.sh diff --git a/config/rootfiles/oldcore/86/filelists/hwdata b/config/rootfiles/oldcore/86/filelists/hwdata new file mode 120000 index 0000000000..ced9116661 --- /dev/null +++ b/config/rootfiles/oldcore/86/filelists/hwdata @@ -0,0 +1 @@ +../../../common/hwdata \ No newline at end of file diff --git a/config/rootfiles/oldcore/87/exclude b/config/rootfiles/oldcore/87/exclude new file mode 100644 index 0000000000..5be5371aaf --- /dev/null +++ b/config/rootfiles/oldcore/87/exclude @@ -0,0 +1,26 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/rc.d/rcsysinit.d/S19checkfstab +etc/rc.d/rcsysinit.d/S70console +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/modules +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/time +var/ipfire/ovpn/ccd.conf +var/ipfire/ovpn/ccdroute +var/ipfire/ovpn/ccdroute2 +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/87/filelists/armv5tel/glibc b/config/rootfiles/oldcore/87/filelists/armv5tel/glibc new file mode 120000 index 0000000000..4c70d724b4 --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/armv5tel/initscripts b/config/rootfiles/oldcore/87/filelists/armv5tel/initscripts similarity index 100% rename from config/rootfiles/core/86/filelists/armv5tel/initscripts rename to config/rootfiles/oldcore/87/filelists/armv5tel/initscripts diff --git a/config/rootfiles/oldcore/87/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/87/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000000..72171071e6 --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/oldcore/87/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/87/filelists/armv5tel/linux-multi new file mode 120000 index 0000000000..204eb4c437 --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/oldcore/87/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/87/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000000..a651a498fe --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/oldcore/87/filelists/armv5tel/swconfig b/config/rootfiles/oldcore/87/filelists/armv5tel/swconfig new file mode 120000 index 0000000000..e5606edf71 --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/armv5tel/swconfig @@ -0,0 +1 @@ +../../../../common/armv5tel/swconfig \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/armv5tel/u-boot b/config/rootfiles/oldcore/87/filelists/armv5tel/u-boot similarity index 100% rename from config/rootfiles/core/86/filelists/armv5tel/u-boot rename to config/rootfiles/oldcore/87/filelists/armv5tel/u-boot diff --git a/config/rootfiles/core/86/filelists/bash b/config/rootfiles/oldcore/87/filelists/bash similarity index 100% rename from config/rootfiles/core/86/filelists/bash rename to config/rootfiles/oldcore/87/filelists/bash diff --git a/config/rootfiles/core/86/filelists/coreutils b/config/rootfiles/oldcore/87/filelists/coreutils similarity index 100% rename from config/rootfiles/core/86/filelists/coreutils rename to config/rootfiles/oldcore/87/filelists/coreutils diff --git a/config/rootfiles/core/86/filelists/crda b/config/rootfiles/oldcore/87/filelists/crda similarity index 100% rename from config/rootfiles/core/86/filelists/crda rename to config/rootfiles/oldcore/87/filelists/crda diff --git a/config/rootfiles/oldcore/87/filelists/dracut b/config/rootfiles/oldcore/87/filelists/dracut new file mode 120000 index 0000000000..160869946d --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/files b/config/rootfiles/oldcore/87/filelists/files similarity index 50% rename from config/rootfiles/core/86/filelists/files rename to config/rootfiles/oldcore/87/filelists/files index dcdb65c960..f0c3708251 100644 --- a/config/rootfiles/core/86/filelists/files +++ b/config/rootfiles/oldcore/87/filelists/files @@ -1,8 +1,14 @@ etc/system-release etc/issue +etc/modprobe.d/btmrvl_sdio.conf +etc/rc.d/init.d/collectd +etc/rc.d/init.d/leds opt/pakfire/etc/pakfire.conf usr/lib/firewall/rules.pl +usr/local/bin/backupiso usr/local/bin/update-bootloader +usr/local/share/GeoIP/GeoIP.dat var/ipfire/header.pl var/ipfire/langs var/ipfire/lang.pl +var/ipfire/ovpn/openssl/ovpn.cnf diff --git a/config/rootfiles/oldcore/87/filelists/fireinfo b/config/rootfiles/oldcore/87/filelists/fireinfo new file mode 120000 index 0000000000..c46115521f --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/oldcore/87/filelists/hwdata b/config/rootfiles/oldcore/87/filelists/hwdata new file mode 120000 index 0000000000..ced9116661 --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/hwdata @@ -0,0 +1 @@ +../../../common/hwdata \ No newline at end of file diff --git a/config/rootfiles/oldcore/87/filelists/i586/glibc b/config/rootfiles/oldcore/87/filelists/i586/glibc new file mode 120000 index 0000000000..943021f19a --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/i586/grub b/config/rootfiles/oldcore/87/filelists/i586/grub similarity index 100% rename from config/rootfiles/core/86/filelists/i586/grub rename to config/rootfiles/oldcore/87/filelists/i586/grub diff --git a/config/rootfiles/core/86/filelists/i586/initscripts b/config/rootfiles/oldcore/87/filelists/i586/initscripts similarity index 100% rename from config/rootfiles/core/86/filelists/i586/initscripts rename to config/rootfiles/oldcore/87/filelists/i586/initscripts diff --git a/config/rootfiles/oldcore/87/filelists/i586/linux b/config/rootfiles/oldcore/87/filelists/i586/linux new file mode 120000 index 0000000000..693ec4bbf9 --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/87/filelists/i586/linux-initrd b/config/rootfiles/oldcore/87/filelists/i586/linux-initrd new file mode 120000 index 0000000000..32a03e6a90 --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/iw b/config/rootfiles/oldcore/87/filelists/iw similarity index 100% rename from config/rootfiles/core/86/filelists/iw rename to config/rootfiles/oldcore/87/filelists/iw diff --git a/config/rootfiles/core/86/filelists/kbd b/config/rootfiles/oldcore/87/filelists/kbd similarity index 100% rename from config/rootfiles/core/86/filelists/kbd rename to config/rootfiles/oldcore/87/filelists/kbd diff --git a/config/rootfiles/core/87/filelists/libcap b/config/rootfiles/oldcore/87/filelists/libcap similarity index 100% rename from config/rootfiles/core/87/filelists/libcap rename to config/rootfiles/oldcore/87/filelists/libcap diff --git a/config/rootfiles/core/86/filelists/libsmooth b/config/rootfiles/oldcore/87/filelists/libsmooth similarity index 100% rename from config/rootfiles/core/86/filelists/libsmooth rename to config/rootfiles/oldcore/87/filelists/libsmooth diff --git a/config/rootfiles/core/86/filelists/lvm2 b/config/rootfiles/oldcore/87/filelists/lvm2 similarity index 100% rename from config/rootfiles/core/86/filelists/lvm2 rename to config/rootfiles/oldcore/87/filelists/lvm2 diff --git a/config/rootfiles/core/86/filelists/mdadm b/config/rootfiles/oldcore/87/filelists/mdadm similarity index 100% rename from config/rootfiles/core/86/filelists/mdadm rename to config/rootfiles/oldcore/87/filelists/mdadm diff --git a/config/rootfiles/core/86/filelists/misc-progs b/config/rootfiles/oldcore/87/filelists/misc-progs similarity index 100% rename from config/rootfiles/core/86/filelists/misc-progs rename to config/rootfiles/oldcore/87/filelists/misc-progs diff --git a/config/rootfiles/core/86/filelists/multipath-tools b/config/rootfiles/oldcore/87/filelists/multipath-tools similarity index 100% rename from config/rootfiles/core/86/filelists/multipath-tools rename to config/rootfiles/oldcore/87/filelists/multipath-tools diff --git a/config/rootfiles/oldcore/87/filelists/newt b/config/rootfiles/oldcore/87/filelists/newt new file mode 120000 index 0000000000..fb3eb20c3e --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/newt @@ -0,0 +1 @@ +../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/ntp b/config/rootfiles/oldcore/87/filelists/ntp similarity index 100% rename from config/rootfiles/core/86/filelists/ntp rename to config/rootfiles/oldcore/87/filelists/ntp diff --git a/config/rootfiles/oldcore/87/filelists/openssl b/config/rootfiles/oldcore/87/filelists/openssl new file mode 120000 index 0000000000..e011a9266c --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/87/filelists/openssl-compat b/config/rootfiles/oldcore/87/filelists/openssl-compat new file mode 120000 index 0000000000..c9fa421324 --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/openvpn b/config/rootfiles/oldcore/87/filelists/openvpn similarity index 100% rename from config/rootfiles/core/86/filelists/openvpn rename to config/rootfiles/oldcore/87/filelists/openvpn diff --git a/config/rootfiles/core/86/filelists/parted b/config/rootfiles/oldcore/87/filelists/parted similarity index 100% rename from config/rootfiles/core/86/filelists/parted rename to config/rootfiles/oldcore/87/filelists/parted diff --git a/config/rootfiles/core/86/filelists/patch b/config/rootfiles/oldcore/87/filelists/patch similarity index 100% rename from config/rootfiles/core/86/filelists/patch rename to config/rootfiles/oldcore/87/filelists/patch diff --git a/config/rootfiles/core/86/filelists/pigz b/config/rootfiles/oldcore/87/filelists/pigz similarity index 100% rename from config/rootfiles/core/86/filelists/pigz rename to config/rootfiles/oldcore/87/filelists/pigz diff --git a/config/rootfiles/oldcore/87/filelists/setup b/config/rootfiles/oldcore/87/filelists/setup new file mode 120000 index 0000000000..209374bbcf --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/slang b/config/rootfiles/oldcore/87/filelists/slang similarity index 100% rename from config/rootfiles/core/86/filelists/slang rename to config/rootfiles/oldcore/87/filelists/slang diff --git a/config/rootfiles/oldcore/87/filelists/strongswan b/config/rootfiles/oldcore/87/filelists/strongswan new file mode 120000 index 0000000000..90c727e265 --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/87/filelists/tzdata b/config/rootfiles/oldcore/87/filelists/tzdata new file mode 120000 index 0000000000..5a6e3252f3 --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/updated-firmwares b/config/rootfiles/oldcore/87/filelists/updated-firmwares similarity index 99% rename from config/rootfiles/core/86/filelists/updated-firmwares rename to config/rootfiles/oldcore/87/filelists/updated-firmwares index 6a7a43ca16..172312f33f 100644 --- a/config/rootfiles/core/86/filelists/updated-firmwares +++ b/config/rootfiles/oldcore/87/filelists/updated-firmwares @@ -200,3 +200,4 @@ lib/firmware/ti-connectivity/wl18xx-fw-3.bin lib/firmware/ti-connectivity/wl18xx-fw-4.bin lib/firmware/v4l-cx23885-enc-broken.fw lib/firmware/WHENCE +lib/firmware/brcm/brcmfmac43362-sdio.txt diff --git a/config/rootfiles/core/86/filelists/wireless-regdb b/config/rootfiles/oldcore/87/filelists/wireless-regdb similarity index 100% rename from config/rootfiles/core/86/filelists/wireless-regdb rename to config/rootfiles/oldcore/87/filelists/wireless-regdb diff --git a/config/rootfiles/oldcore/87/filelists/wpa_supplicant b/config/rootfiles/oldcore/87/filelists/wpa_supplicant new file mode 120000 index 0000000000..1d04c03c01 --- /dev/null +++ b/config/rootfiles/oldcore/87/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/xfsprogs b/config/rootfiles/oldcore/87/filelists/xfsprogs similarity index 100% rename from config/rootfiles/core/86/filelists/xfsprogs rename to config/rootfiles/oldcore/87/filelists/xfsprogs diff --git a/config/rootfiles/oldcore/87/meta b/config/rootfiles/oldcore/87/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/87/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/86/update.sh b/config/rootfiles/oldcore/87/update.sh similarity index 75% rename from config/rootfiles/core/86/update.sh rename to config/rootfiles/oldcore/87/update.sh index bdb96fc6e4..172d854ec7 100644 --- a/config/rootfiles/core/86/update.sh +++ b/config/rootfiles/oldcore/87/update.sh @@ -24,18 +24,40 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 -function add_to_backup () -{ - # Add path to ROOTFILES but remove old entries to prevent double - # files in the tar - grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp - mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES - echo $1 >> /opt/pakfire/tmp/ROOTFILES + +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 } + # # Remove old core updates from pakfire cache to save space... -core=86 +core=87 for (( i=1; i<=${core}; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire @@ -65,23 +87,6 @@ esac # KVER="xxxKVERxxx" -# -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ - /var/ipfire/backup/core-upgrade${core}_${KVER}-old.tar.xz -fi -echo First we made a backup of all files that was inside of the -echo update archive. This may take a while ... -# Add some files that are not in the package to backup -add_to_backup lib/modules -add_to_backup boot - -# Backup the files -tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ - -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 - # Check diskspace on root ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` @@ -95,7 +100,7 @@ fi echo echo Update Kernel to $KVER ... # -# Remove old kernel, configs, initrd, modules ... +# Remove old kernel, configs, initrd, modules, dtb's ... # rm -rf /boot/System.map-* rm -rf /boot/config-* @@ -104,17 +109,37 @@ rm -rf /boot/initramfs-* rm -rf /boot/vmlinuz-* rm -rf /boot/uImage-ipfire-* rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* rm -rf /lib/modules case "$(uname -m)" in i?86) - # Backup grub.conf - cp -vf /boot/grub/grub.conf /boot/grub-legacy.conf + # Backup old grub config + if [ -f /boot/grub/grub.conf ]; then + cp -vf /boot/grub/grub.conf /boot/old-grub-config + fi + if [ -f /boot/grub/menu.lst ]; then + cp -vf /boot/grub/menu.lst /boot/old-grub-config + fi + if [ -f /boot/grub/grub.cfg ]; then + cp -vf /boot/grub/grub.cfg /boot/old-grub-config + fi # Remove all files that belong to GRUB-legacy rm -rfv /boot/grub ;; + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi + ;; esac + # #Stop services /etc/init.d/snort stop @@ -139,6 +164,8 @@ if [ $BOOTSPACE -lt 1000 ]; then # Special handling for old kirkwood images. # (install only kirkwood kernel) rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ --numeric-owner -C / --wildcards 'boot/*-kirkwood*' ;; @@ -169,23 +196,31 @@ fi case "$(uname -m)" in i?86) - # - # Update to GRUB2 - # - echo - echo Update grub configuration ... - if grep -qE "^serial" /boot/grub-legacy.conf; then - sed -i /etc/default/grub \ - -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" - echo "GRUB_TERMINAL=\"serial\"" >> /etc/default/grub - echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> /etc/default/grub - fi + case "$(find_device "/")" in + xvd* ) + echo Skip remove grub2 files, because pygrub fail. + rm -f /boot/grub/* + echo config will recreated by linux-pae install. + ;; + * ) + # + # Update to GRUB2 + # + echo + echo Update grub configuration ... + if grep -qE "^serial" /boot/old-grub-config; then + sed -i /etc/default/grub \ + -e "s|panic=10|& console=ttyS0,115200n8|g" + echo "GRUB_TERMINAL=\"serial\"" >> /etc/default/grub + echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> /etc/default/grub + fi - if ! /usr/local/bin/update-bootloader; then - logger -p syslog.emerg -t ipfire \ - "Could not update the bootloader!" - fi - ;; + if ! /usr/local/bin/update-bootloader; then + logger -p syslog.emerg -t ipfire \ + "Could not update the bootloader!" + fi + ;; + esac esac # Force (re)install pae kernel if pae is supported @@ -206,18 +241,6 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then fi fi -# Force reinstall xen kernel if it was installed -if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then - echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-xen - # Add xvc0 to /etc/securetty - echo "xvc0" >> /etc/securetty -fi - # # After pakfire has ended run it again and update the lists and do upgrade # @@ -232,7 +255,7 @@ echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update echo 'touch /var/run/need_reboot ' >> /tmp/pak_update diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk index 332c22b96c..6654621a20 100755 --- a/config/rootfiles/packages/asterisk +++ b/config/rootfiles/packages/asterisk @@ -1,6 +1,6 @@ -usr/lib/libsrtp.so etc/asterisk etc/logrotate.d/asterisk +etc/rc.d/init.d/asterisk etc/rc.d/rc0.d/K30asterisk etc/rc.d/rc3.d/S30asterisk etc/rc.d/rc6.d/K30asterisk @@ -156,38 +156,6 @@ etc/rc.d/rc6.d/K30asterisk #usr/include/asterisk/xml.h #usr/include/asterisk/xmldoc.h #usr/include/asterisk/xmpp.h -#usr/include/srtp -#usr/include/srtp/aes.h -#usr/include/srtp/aes_cbc.h -#usr/include/srtp/aes_icm.h -#usr/include/srtp/alloc.h -#usr/include/srtp/auth.h -#usr/include/srtp/cipher.h -#usr/include/srtp/config.h -#usr/include/srtp/crypto.h -#usr/include/srtp/crypto_kernel.h -#usr/include/srtp/crypto_math.h -#usr/include/srtp/crypto_types.h -#usr/include/srtp/cryptoalg.h -#usr/include/srtp/datatypes.h -#usr/include/srtp/err.h -#usr/include/srtp/gf2_8.h -#usr/include/srtp/hmac.h -#usr/include/srtp/integers.h -#usr/include/srtp/kernel_compat.h -#usr/include/srtp/key.h -#usr/include/srtp/null_auth.h -#usr/include/srtp/null_cipher.h -#usr/include/srtp/prng.h -#usr/include/srtp/rand_source.h -#usr/include/srtp/rdb.h -#usr/include/srtp/rdbx.h -#usr/include/srtp/rtp.h -#usr/include/srtp/sha1.h -#usr/include/srtp/srtp.h -#usr/include/srtp/stat.h -#usr/include/srtp/ut_sim.h -#usr/include/srtp/xfm.h #usr/lib/asterisk #usr/lib/asterisk/modules usr/lib/asterisk/modules/app_adsiprog.so @@ -298,7 +266,6 @@ usr/lib/asterisk/modules/format_h263.so usr/lib/asterisk/modules/format_h264.so usr/lib/asterisk/modules/format_ilbc.so usr/lib/asterisk/modules/format_jpeg.so -#usr/lib/asterisk/modules/format_ogg_vorbis.so usr/lib/asterisk/modules/format_pcm.so usr/lib/asterisk/modules/format_siren14.so usr/lib/asterisk/modules/format_siren7.so @@ -370,7 +337,6 @@ usr/lib/asterisk/modules/res_convert.so usr/lib/asterisk/modules/res_crypto.so usr/lib/asterisk/modules/res_curl.so usr/lib/asterisk/modules/res_fax.so -#usr/lib/asterisk/modules/res_fax_spandsp.so usr/lib/asterisk/modules/res_format_attr_celt.so usr/lib/asterisk/modules/res_format_attr_h263.so usr/lib/asterisk/modules/res_format_attr_h264.so @@ -393,7 +359,6 @@ usr/lib/asterisk/modules/res_timing_pthread.so usr/lib/asterisk/modules/res_timing_timerfd.so usr/lib/libasteriskssl.so usr/lib/libasteriskssl.so.1 -#usr/lib/libsrtp.a #usr/lib/pkgconfig/asterisk.pc usr/sbin/astcanary usr/sbin/astdb2bdb @@ -420,7 +385,7 @@ var/ipfire/asterisk/app_mysql.conf var/ipfire/asterisk/app_skel.conf var/ipfire/asterisk/asterisk.adsi var/ipfire/asterisk/asterisk.conf -#var/ipfire/asterisk/asterisk.makeopts +var/ipfire/asterisk/asterisk.logrotate var/ipfire/asterisk/calendar.conf var/ipfire/asterisk/ccss.conf var/ipfire/asterisk/cdr.conf @@ -874,6 +839,12 @@ var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.26 var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.4.15 var/lib/asterisk/sounds/en/1-for-am-2-for-pm.gsm var/lib/asterisk/sounds/en/1-yes-2-no.gsm +#var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.26 +#var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15 +#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.26 +#var/lib/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15 +#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.26 +#var/lib/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15 var/lib/asterisk/sounds/en/OfficeSpace.gsm var/lib/asterisk/sounds/en/Randulo-allison.gsm var/lib/asterisk/sounds/en/SIP_Test_Failure.gsm @@ -2884,4 +2855,3 @@ var/spool/asterisk/voicemail/default/1234/INBOX var/spool/asterisk/voicemail/default/1234/en var/spool/asterisk/voicemail/default/1234/en/busy.gsm var/spool/asterisk/voicemail/default/1234/en/unavail.gsm -etc/rc.d/init.d/asterisk diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 60a3a9fa83..d79f6e6aaf 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -11,15 +11,15 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.22 +usr/lib/libclamav.so.6.1.26 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.22 +usr/lib/libclamunrar.so.6.1.26 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.22 +usr/lib/libclamunrar_iface.so.6.1.26 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav @@ -41,6 +41,5 @@ var/ipfire/clamav/clamd.conf var/ipfire/clamav/clamd.conf.sample var/ipfire/clamav/freshclam.conf var/ipfire/clamav/freshclam.conf.sample -#var/run/clamav etc/rc.d/init.d/clamav usr/local/bin/clamavctrl diff --git a/config/rootfiles/packages/haproxy b/config/rootfiles/packages/haproxy new file mode 100644 index 0000000000..515145d588 --- /dev/null +++ b/config/rootfiles/packages/haproxy @@ -0,0 +1,8 @@ +#etc/haproxy +etc/haproxy/haproxy.cfg +etc/rc.d/init.d/haproxy +usr/sbin/haproxy +#usr/sbin/haproxy-systemd-wrapper +#usr/share/man/man1/haproxy.1 +var/ipfire/backup/addons/includes/haproxy +var/lib/haproxy diff --git a/config/rootfiles/packages/libsrtp b/config/rootfiles/packages/libsrtp new file mode 100644 index 0000000000..3ee2e3b64c --- /dev/null +++ b/config/rootfiles/packages/libsrtp @@ -0,0 +1,41 @@ +#usr/include/srtp +#usr/include/srtp/aes.h +#usr/include/srtp/aes_cbc.h +#usr/include/srtp/aes_gcm_ossl.h +#usr/include/srtp/aes_icm.h +#usr/include/srtp/aes_icm_ossl.h +#usr/include/srtp/alloc.h +#usr/include/srtp/auth.h +#usr/include/srtp/cipher.h +#usr/include/srtp/config.h +#usr/include/srtp/crypto.h +#usr/include/srtp/crypto_kernel.h +#usr/include/srtp/crypto_math.h +#usr/include/srtp/crypto_types.h +#usr/include/srtp/cryptoalg.h +#usr/include/srtp/datatypes.h +#usr/include/srtp/ekt.h +#usr/include/srtp/err.h +#usr/include/srtp/getopt_s.h +#usr/include/srtp/gf2_8.h +#usr/include/srtp/hmac.h +#usr/include/srtp/integers.h +#usr/include/srtp/kernel_compat.h +#usr/include/srtp/key.h +#usr/include/srtp/null_auth.h +#usr/include/srtp/null_cipher.h +#usr/include/srtp/prng.h +#usr/include/srtp/rand_source.h +#usr/include/srtp/rdb.h +#usr/include/srtp/rdbx.h +#usr/include/srtp/rtp.h +#usr/include/srtp/rtp_priv.h +#usr/include/srtp/sha1.h +#usr/include/srtp/srtp.h +#usr/include/srtp/srtp_priv.h +#usr/include/srtp/stat.h +#usr/include/srtp/ut_sim.h +#usr/include/srtp/xfm.h +usr/lib/libsrtp.so +usr/lib/libsrtp.so.1 +#usr/lib/pkgconfig/libsrtp.pc diff --git a/config/rootfiles/packages/monit b/config/rootfiles/packages/monit index 049bab351a..4477ea3d20 100644 --- a/config/rootfiles/packages/monit +++ b/config/rootfiles/packages/monit @@ -1,6 +1,7 @@ etc/monitrc usr/bin/monit #usr/share/man/man1/monit.1 +var/lib/monit var/ipfire/backup/addons/includes/monit etc/rc.d/init.d/monit etc/rc.d/rc0.d/K40monit diff --git a/config/rootfiles/packages/owncloud b/config/rootfiles/packages/owncloud index fed3b09c44..5ce778929d 100644 --- a/config/rootfiles/packages/owncloud +++ b/config/rootfiles/packages/owncloud @@ -858,80 +858,6 @@ srv/web/owncloud #srv/web/owncloud/3rdparty/fontawesome/font/fontawesome-webfont.svg #srv/web/owncloud/3rdparty/fontawesome/font/fontawesome-webfont.ttf #srv/web/owncloud/3rdparty/fontawesome/font/fontawesome-webfont.woff -#srv/web/owncloud/3rdparty/getid3 -#srv/web/owncloud/3rdparty/getid3/extension.cache.dbm.php -#srv/web/owncloud/3rdparty/getid3/extension.cache.mysql.php -#srv/web/owncloud/3rdparty/getid3/extension.cache.sqlite3.php -#srv/web/owncloud/3rdparty/getid3/getid3.lib.php -#srv/web/owncloud/3rdparty/getid3/getid3.php -#srv/web/owncloud/3rdparty/getid3/license.txt -#srv/web/owncloud/3rdparty/getid3/module.archive.gzip.php -#srv/web/owncloud/3rdparty/getid3/module.archive.rar.php -#srv/web/owncloud/3rdparty/getid3/module.archive.szip.php -#srv/web/owncloud/3rdparty/getid3/module.archive.tar.php -#srv/web/owncloud/3rdparty/getid3/module.archive.zip.php -#srv/web/owncloud/3rdparty/getid3/module.audio-video.asf.php -#srv/web/owncloud/3rdparty/getid3/module.audio-video.bink.php -#srv/web/owncloud/3rdparty/getid3/module.audio-video.flv.php -#srv/web/owncloud/3rdparty/getid3/module.audio-video.matroska.php -#srv/web/owncloud/3rdparty/getid3/module.audio-video.mpeg.php -#srv/web/owncloud/3rdparty/getid3/module.audio-video.nsv.php -#srv/web/owncloud/3rdparty/getid3/module.audio-video.quicktime.php -#srv/web/owncloud/3rdparty/getid3/module.audio-video.real.php -#srv/web/owncloud/3rdparty/getid3/module.audio-video.riff.php -#srv/web/owncloud/3rdparty/getid3/module.audio-video.swf.php -#srv/web/owncloud/3rdparty/getid3/module.audio-video.ts.php -#srv/web/owncloud/3rdparty/getid3/module.audio.aa.php -#srv/web/owncloud/3rdparty/getid3/module.audio.aac.php -#srv/web/owncloud/3rdparty/getid3/module.audio.ac3.php -#srv/web/owncloud/3rdparty/getid3/module.audio.au.php -#srv/web/owncloud/3rdparty/getid3/module.audio.avr.php -#srv/web/owncloud/3rdparty/getid3/module.audio.bonk.php -#srv/web/owncloud/3rdparty/getid3/module.audio.dss.php -#srv/web/owncloud/3rdparty/getid3/module.audio.dts.php -#srv/web/owncloud/3rdparty/getid3/module.audio.flac.php -#srv/web/owncloud/3rdparty/getid3/module.audio.la.php -#srv/web/owncloud/3rdparty/getid3/module.audio.lpac.php -#srv/web/owncloud/3rdparty/getid3/module.audio.midi.php -#srv/web/owncloud/3rdparty/getid3/module.audio.mod.php -#srv/web/owncloud/3rdparty/getid3/module.audio.monkey.php -#srv/web/owncloud/3rdparty/getid3/module.audio.mp3.php -#srv/web/owncloud/3rdparty/getid3/module.audio.mpc.php -#srv/web/owncloud/3rdparty/getid3/module.audio.ogg.php -#srv/web/owncloud/3rdparty/getid3/module.audio.optimfrog.php -#srv/web/owncloud/3rdparty/getid3/module.audio.rkau.php -#srv/web/owncloud/3rdparty/getid3/module.audio.shorten.php -#srv/web/owncloud/3rdparty/getid3/module.audio.tta.php -#srv/web/owncloud/3rdparty/getid3/module.audio.voc.php -#srv/web/owncloud/3rdparty/getid3/module.audio.vqf.php -#srv/web/owncloud/3rdparty/getid3/module.audio.wavpack.php -#srv/web/owncloud/3rdparty/getid3/module.graphic.bmp.php -#srv/web/owncloud/3rdparty/getid3/module.graphic.efax.php -#srv/web/owncloud/3rdparty/getid3/module.graphic.gif.php -#srv/web/owncloud/3rdparty/getid3/module.graphic.jpg.php -#srv/web/owncloud/3rdparty/getid3/module.graphic.pcd.php -#srv/web/owncloud/3rdparty/getid3/module.graphic.png.php -#srv/web/owncloud/3rdparty/getid3/module.graphic.svg.php -#srv/web/owncloud/3rdparty/getid3/module.graphic.tiff.php -#srv/web/owncloud/3rdparty/getid3/module.misc.cue.php -#srv/web/owncloud/3rdparty/getid3/module.misc.exe.php -#srv/web/owncloud/3rdparty/getid3/module.misc.iso.php -#srv/web/owncloud/3rdparty/getid3/module.misc.msoffice.php -#srv/web/owncloud/3rdparty/getid3/module.misc.par2.php -#srv/web/owncloud/3rdparty/getid3/module.misc.pdf.php -#srv/web/owncloud/3rdparty/getid3/module.tag.apetag.php -#srv/web/owncloud/3rdparty/getid3/module.tag.id3v1.php -#srv/web/owncloud/3rdparty/getid3/module.tag.id3v2.php -#srv/web/owncloud/3rdparty/getid3/module.tag.lyrics3.php -#srv/web/owncloud/3rdparty/getid3/module.tag.xmp.php -#srv/web/owncloud/3rdparty/getid3/write.apetag.php -#srv/web/owncloud/3rdparty/getid3/write.id3v1.php -#srv/web/owncloud/3rdparty/getid3/write.id3v2.php -#srv/web/owncloud/3rdparty/getid3/write.lyrics3.php -#srv/web/owncloud/3rdparty/getid3/write.metaflac.php -#srv/web/owncloud/3rdparty/getid3/write.php -#srv/web/owncloud/3rdparty/getid3/write.real.php -#srv/web/owncloud/3rdparty/getid3/write.vorbiscomment.php #srv/web/owncloud/3rdparty/guzzle #srv/web/owncloud/3rdparty/guzzle/common #srv/web/owncloud/3rdparty/guzzle/common/Guzzle @@ -1041,26 +967,97 @@ srv/web/owncloud #srv/web/owncloud/3rdparty/guzzle/stream/Guzzle/Stream/StreamInterface.php #srv/web/owncloud/3rdparty/guzzle/stream/Guzzle/Stream/StreamRequestFactoryInterface.php #srv/web/owncloud/3rdparty/guzzle/stream/Guzzle/Stream/composer.json -#srv/web/owncloud/3rdparty/isoft -#srv/web/owncloud/3rdparty/isoft/mssql-bundle -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Driver -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Driver/PDODblib -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Driver/PDODblib/Connection.php -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Driver/PDODblib/Driver.php -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Platforms -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Platforms/DblibPlatform.php -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Readme.md -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/RealestateMssqlBundle.php -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Schema -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Schema/DblibSchemaManager.php -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Types -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Types/DateTimeType.php -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Types/DateType.php -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Types/RealestateDateTime.php -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Types/UniqueidentifierType.php -#srv/web/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/composer.json +#srv/web/owncloud/3rdparty/james-heinrich +#srv/web/owncloud/3rdparty/james-heinrich/getid3 +#srv/web/owncloud/3rdparty/james-heinrich/getid3/.gitattributes +#srv/web/owncloud/3rdparty/james-heinrich/getid3/README.md +#srv/web/owncloud/3rdparty/james-heinrich/getid3/changelog.txt +#srv/web/owncloud/3rdparty/james-heinrich/getid3/composer.json +#srv/web/owncloud/3rdparty/james-heinrich/getid3/dependencies.txt +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3 +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/extension.cache.dbm.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/extension.cache.mysql.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/extension.cache.sqlite3.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/getid3.lib.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/getid3.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.archive.gzip.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.archive.rar.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.archive.szip.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.archive.tar.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.archive.zip.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio-video.asf.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio-video.bink.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio-video.flv.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio-video.matroska.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio-video.mpeg.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio-video.nsv.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio-video.quicktime.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio-video.real.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio-video.riff.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio-video.swf.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio-video.ts.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.aa.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.aac.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.ac3.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.amr.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.au.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.avr.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.bonk.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.dss.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.dts.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.flac.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.la.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.lpac.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.midi.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.mod.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.monkey.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.mp3.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.mpc.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.ogg.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.optimfrog.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.rkau.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.shorten.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.tta.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.voc.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.vqf.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.audio.wavpack.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.graphic.bmp.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.graphic.efax.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.graphic.gif.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.graphic.jpg.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.graphic.pcd.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.graphic.png.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.graphic.svg.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.graphic.tiff.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.misc.cue.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.misc.exe.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.misc.iso.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.misc.msoffice.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.misc.par2.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.misc.pdf.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.tag.apetag.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.tag.id3v1.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.tag.id3v2.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.tag.lyrics3.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/module.tag.xmp.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/write.apetag.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/write.id3v1.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/write.id3v2.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/write.lyrics3.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/write.metaflac.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/write.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/write.real.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/getid3/write.vorbiscomment.php +#srv/web/owncloud/3rdparty/james-heinrich/getid3/license.txt +#srv/web/owncloud/3rdparty/james-heinrich/getid3/licenses +#srv/web/owncloud/3rdparty/james-heinrich/getid3/licenses/licence.gpl-10.txt +#srv/web/owncloud/3rdparty/james-heinrich/getid3/licenses/licence.gpl-20.txt +#srv/web/owncloud/3rdparty/james-heinrich/getid3/licenses/licence.gpl-30.txt +#srv/web/owncloud/3rdparty/james-heinrich/getid3/licenses/licence.lgpl-30.txt +#srv/web/owncloud/3rdparty/james-heinrich/getid3/licenses/licence.mpl-20.txt +#srv/web/owncloud/3rdparty/james-heinrich/getid3/licenses/license.commercial.txt +#srv/web/owncloud/3rdparty/james-heinrich/getid3/readme.txt +#srv/web/owncloud/3rdparty/james-heinrich/getid3/structure.txt #srv/web/owncloud/3rdparty/js #srv/web/owncloud/3rdparty/js/chosen #srv/web/owncloud/3rdparty/js/chosen/LICENSE.md @@ -1419,9 +1416,6 @@ srv/web/owncloud #srv/web/owncloud/3rdparty/patches.txt #srv/web/owncloud/3rdparty/phpass #srv/web/owncloud/3rdparty/phpass/PasswordHash.php -#srv/web/owncloud/3rdparty/phpass/c -#srv/web/owncloud/3rdparty/phpass/c/Makefile -#srv/web/owncloud/3rdparty/phpass/c/crypt_private.c #srv/web/owncloud/3rdparty/phpass/test.php #srv/web/owncloud/3rdparty/phpmailer #srv/web/owncloud/3rdparty/phpmailer/phpmailer @@ -3206,17 +3200,16 @@ srv/web/owncloud #srv/web/owncloud/apps/activity/l10n/hy.php #srv/web/owncloud/apps/activity/l10n/ia.php #srv/web/owncloud/apps/activity/l10n/id.php +#srv/web/owncloud/apps/activity/l10n/io.php #srv/web/owncloud/apps/activity/l10n/is.php #srv/web/owncloud/apps/activity/l10n/it.php #srv/web/owncloud/apps/activity/l10n/ja.php -#srv/web/owncloud/apps/activity/l10n/ja_JP.php #srv/web/owncloud/apps/activity/l10n/jv.php #srv/web/owncloud/apps/activity/l10n/ka_GE.php #srv/web/owncloud/apps/activity/l10n/km.php #srv/web/owncloud/apps/activity/l10n/kn.php #srv/web/owncloud/apps/activity/l10n/ko.php #srv/web/owncloud/apps/activity/l10n/ku_IQ.php -#srv/web/owncloud/apps/activity/l10n/l10n.pl #srv/web/owncloud/apps/activity/l10n/lb.php #srv/web/owncloud/apps/activity/l10n/lt_LT.php #srv/web/owncloud/apps/activity/l10n/lv.php @@ -3300,6 +3293,7 @@ srv/web/owncloud #srv/web/owncloud/apps/activity/tests/hooksdeleteusertest.php #srv/web/owncloud/apps/activity/tests/mailqueuehandlertest.php #srv/web/owncloud/apps/activity/tests/navigationtest.php +#srv/web/owncloud/apps/activity/tests/parameterhelpertest.php #srv/web/owncloud/apps/activity/tests/phpunit.xml #srv/web/owncloud/apps/activity/tests/usersettingstest.php #srv/web/owncloud/apps/admin_dependencies_chk @@ -3416,330 +3410,212 @@ srv/web/owncloud #srv/web/owncloud/apps/bookmarks/js/full_tags.php #srv/web/owncloud/apps/bookmarks/js/settings.js #srv/web/owncloud/apps/bookmarks/l10n -#srv/web/owncloud/apps/bookmarks/l10n/ach -#srv/web/owncloud/apps/bookmarks/l10n/ach/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ady -#srv/web/owncloud/apps/bookmarks/l10n/ady/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/af -#srv/web/owncloud/apps/bookmarks/l10n/af/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/af_ZA #srv/web/owncloud/apps/bookmarks/l10n/af_ZA.php -#srv/web/owncloud/apps/bookmarks/l10n/af_ZA/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ak -#srv/web/owncloud/apps/bookmarks/l10n/ak/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/am_ET -#srv/web/owncloud/apps/bookmarks/l10n/am_ET/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ar +#srv/web/owncloud/apps/bookmarks/l10n/ar.js +#srv/web/owncloud/apps/bookmarks/l10n/ar.json #srv/web/owncloud/apps/bookmarks/l10n/ar.php -#srv/web/owncloud/apps/bookmarks/l10n/ar/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ast +#srv/web/owncloud/apps/bookmarks/l10n/ast.js +#srv/web/owncloud/apps/bookmarks/l10n/ast.json #srv/web/owncloud/apps/bookmarks/l10n/ast.php -#srv/web/owncloud/apps/bookmarks/l10n/ast/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/az -#srv/web/owncloud/apps/bookmarks/l10n/az/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/be +#srv/web/owncloud/apps/bookmarks/l10n/az.js +#srv/web/owncloud/apps/bookmarks/l10n/az.json +#srv/web/owncloud/apps/bookmarks/l10n/az.php #srv/web/owncloud/apps/bookmarks/l10n/be.php -#srv/web/owncloud/apps/bookmarks/l10n/be/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/bg_BG +#srv/web/owncloud/apps/bookmarks/l10n/bg_BG.js +#srv/web/owncloud/apps/bookmarks/l10n/bg_BG.json #srv/web/owncloud/apps/bookmarks/l10n/bg_BG.php -#srv/web/owncloud/apps/bookmarks/l10n/bg_BG/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/bn_BD +#srv/web/owncloud/apps/bookmarks/l10n/bn_BD.js +#srv/web/owncloud/apps/bookmarks/l10n/bn_BD.json #srv/web/owncloud/apps/bookmarks/l10n/bn_BD.php -#srv/web/owncloud/apps/bookmarks/l10n/bn_BD/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/bn_IN -#srv/web/owncloud/apps/bookmarks/l10n/bn_IN/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/bs +#srv/web/owncloud/apps/bookmarks/l10n/bn_IN.js +#srv/web/owncloud/apps/bookmarks/l10n/bn_IN.json +#srv/web/owncloud/apps/bookmarks/l10n/bn_IN.php #srv/web/owncloud/apps/bookmarks/l10n/bs.php -#srv/web/owncloud/apps/bookmarks/l10n/bs/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ca +#srv/web/owncloud/apps/bookmarks/l10n/ca.js +#srv/web/owncloud/apps/bookmarks/l10n/ca.json #srv/web/owncloud/apps/bookmarks/l10n/ca.php -#srv/web/owncloud/apps/bookmarks/l10n/ca/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ca@valencia -#srv/web/owncloud/apps/bookmarks/l10n/ca@valencia/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/cs_CZ +#srv/web/owncloud/apps/bookmarks/l10n/cs_CZ.js +#srv/web/owncloud/apps/bookmarks/l10n/cs_CZ.json #srv/web/owncloud/apps/bookmarks/l10n/cs_CZ.php -#srv/web/owncloud/apps/bookmarks/l10n/cs_CZ/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/cy_GB +#srv/web/owncloud/apps/bookmarks/l10n/cy_GB.js +#srv/web/owncloud/apps/bookmarks/l10n/cy_GB.json #srv/web/owncloud/apps/bookmarks/l10n/cy_GB.php -#srv/web/owncloud/apps/bookmarks/l10n/cy_GB/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/da +#srv/web/owncloud/apps/bookmarks/l10n/da.js +#srv/web/owncloud/apps/bookmarks/l10n/da.json #srv/web/owncloud/apps/bookmarks/l10n/da.php -#srv/web/owncloud/apps/bookmarks/l10n/da/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/de +#srv/web/owncloud/apps/bookmarks/l10n/de.js +#srv/web/owncloud/apps/bookmarks/l10n/de.json #srv/web/owncloud/apps/bookmarks/l10n/de.php -#srv/web/owncloud/apps/bookmarks/l10n/de/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/de_AT #srv/web/owncloud/apps/bookmarks/l10n/de_AT.php -#srv/web/owncloud/apps/bookmarks/l10n/de_AT/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/de_CH +#srv/web/owncloud/apps/bookmarks/l10n/de_CH.js +#srv/web/owncloud/apps/bookmarks/l10n/de_CH.json #srv/web/owncloud/apps/bookmarks/l10n/de_CH.php -#srv/web/owncloud/apps/bookmarks/l10n/de_CH/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/de_DE +#srv/web/owncloud/apps/bookmarks/l10n/de_DE.js +#srv/web/owncloud/apps/bookmarks/l10n/de_DE.json #srv/web/owncloud/apps/bookmarks/l10n/de_DE.php -#srv/web/owncloud/apps/bookmarks/l10n/de_DE/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/el +#srv/web/owncloud/apps/bookmarks/l10n/el.js +#srv/web/owncloud/apps/bookmarks/l10n/el.json #srv/web/owncloud/apps/bookmarks/l10n/el.php -#srv/web/owncloud/apps/bookmarks/l10n/el/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/en@pirate -#srv/web/owncloud/apps/bookmarks/l10n/en@pirate/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/en_GB +#srv/web/owncloud/apps/bookmarks/l10n/en_GB.js +#srv/web/owncloud/apps/bookmarks/l10n/en_GB.json #srv/web/owncloud/apps/bookmarks/l10n/en_GB.php -#srv/web/owncloud/apps/bookmarks/l10n/en_GB/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/en_NZ -#srv/web/owncloud/apps/bookmarks/l10n/en_NZ/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/eo +#srv/web/owncloud/apps/bookmarks/l10n/eo.js +#srv/web/owncloud/apps/bookmarks/l10n/eo.json #srv/web/owncloud/apps/bookmarks/l10n/eo.php -#srv/web/owncloud/apps/bookmarks/l10n/eo/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/es +#srv/web/owncloud/apps/bookmarks/l10n/es.js +#srv/web/owncloud/apps/bookmarks/l10n/es.json #srv/web/owncloud/apps/bookmarks/l10n/es.php -#srv/web/owncloud/apps/bookmarks/l10n/es/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/es_AR +#srv/web/owncloud/apps/bookmarks/l10n/es_AR.js +#srv/web/owncloud/apps/bookmarks/l10n/es_AR.json #srv/web/owncloud/apps/bookmarks/l10n/es_AR.php -#srv/web/owncloud/apps/bookmarks/l10n/es_AR/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/es_BO -#srv/web/owncloud/apps/bookmarks/l10n/es_BO/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/es_CL #srv/web/owncloud/apps/bookmarks/l10n/es_CL.php -#srv/web/owncloud/apps/bookmarks/l10n/es_CL/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/es_CO -#srv/web/owncloud/apps/bookmarks/l10n/es_CO/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/es_CR -#srv/web/owncloud/apps/bookmarks/l10n/es_CR/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/es_EC -#srv/web/owncloud/apps/bookmarks/l10n/es_EC/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/es_MX +#srv/web/owncloud/apps/bookmarks/l10n/es_MX.js +#srv/web/owncloud/apps/bookmarks/l10n/es_MX.json #srv/web/owncloud/apps/bookmarks/l10n/es_MX.php -#srv/web/owncloud/apps/bookmarks/l10n/es_MX/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/es_PE -#srv/web/owncloud/apps/bookmarks/l10n/es_PE/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/es_PY -#srv/web/owncloud/apps/bookmarks/l10n/es_PY/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/es_US -#srv/web/owncloud/apps/bookmarks/l10n/es_US/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/es_UY -#srv/web/owncloud/apps/bookmarks/l10n/es_UY/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/et_EE +#srv/web/owncloud/apps/bookmarks/l10n/et_EE.js +#srv/web/owncloud/apps/bookmarks/l10n/et_EE.json #srv/web/owncloud/apps/bookmarks/l10n/et_EE.php -#srv/web/owncloud/apps/bookmarks/l10n/et_EE/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/eu +#srv/web/owncloud/apps/bookmarks/l10n/eu.js +#srv/web/owncloud/apps/bookmarks/l10n/eu.json #srv/web/owncloud/apps/bookmarks/l10n/eu.php -#srv/web/owncloud/apps/bookmarks/l10n/eu/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/eu_ES #srv/web/owncloud/apps/bookmarks/l10n/eu_ES.php -#srv/web/owncloud/apps/bookmarks/l10n/eu_ES/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/fa +#srv/web/owncloud/apps/bookmarks/l10n/fa.js +#srv/web/owncloud/apps/bookmarks/l10n/fa.json #srv/web/owncloud/apps/bookmarks/l10n/fa.php -#srv/web/owncloud/apps/bookmarks/l10n/fa/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/fi #srv/web/owncloud/apps/bookmarks/l10n/fi.php -#srv/web/owncloud/apps/bookmarks/l10n/fi/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/fi_FI +#srv/web/owncloud/apps/bookmarks/l10n/fi_FI.js +#srv/web/owncloud/apps/bookmarks/l10n/fi_FI.json #srv/web/owncloud/apps/bookmarks/l10n/fi_FI.php -#srv/web/owncloud/apps/bookmarks/l10n/fi_FI/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/fr +#srv/web/owncloud/apps/bookmarks/l10n/fr.js +#srv/web/owncloud/apps/bookmarks/l10n/fr.json #srv/web/owncloud/apps/bookmarks/l10n/fr.php -#srv/web/owncloud/apps/bookmarks/l10n/fr/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/fr_CA -#srv/web/owncloud/apps/bookmarks/l10n/fr_CA/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/gl +#srv/web/owncloud/apps/bookmarks/l10n/gl.js +#srv/web/owncloud/apps/bookmarks/l10n/gl.json #srv/web/owncloud/apps/bookmarks/l10n/gl.php -#srv/web/owncloud/apps/bookmarks/l10n/gl/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/he +#srv/web/owncloud/apps/bookmarks/l10n/he.js +#srv/web/owncloud/apps/bookmarks/l10n/he.json #srv/web/owncloud/apps/bookmarks/l10n/he.php -#srv/web/owncloud/apps/bookmarks/l10n/he/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/hi #srv/web/owncloud/apps/bookmarks/l10n/hi.php -#srv/web/owncloud/apps/bookmarks/l10n/hi/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/hi_IN -#srv/web/owncloud/apps/bookmarks/l10n/hi_IN/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/hr #srv/web/owncloud/apps/bookmarks/l10n/hr.php -#srv/web/owncloud/apps/bookmarks/l10n/hr/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/hu_HU +#srv/web/owncloud/apps/bookmarks/l10n/hu_HU.js +#srv/web/owncloud/apps/bookmarks/l10n/hu_HU.json #srv/web/owncloud/apps/bookmarks/l10n/hu_HU.php -#srv/web/owncloud/apps/bookmarks/l10n/hu_HU/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/hy #srv/web/owncloud/apps/bookmarks/l10n/hy.php -#srv/web/owncloud/apps/bookmarks/l10n/hy/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ia +#srv/web/owncloud/apps/bookmarks/l10n/ia.js +#srv/web/owncloud/apps/bookmarks/l10n/ia.json #srv/web/owncloud/apps/bookmarks/l10n/ia.php -#srv/web/owncloud/apps/bookmarks/l10n/ia/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/id +#srv/web/owncloud/apps/bookmarks/l10n/id.js +#srv/web/owncloud/apps/bookmarks/l10n/id.json #srv/web/owncloud/apps/bookmarks/l10n/id.php -#srv/web/owncloud/apps/bookmarks/l10n/id/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/is +#srv/web/owncloud/apps/bookmarks/l10n/is.js +#srv/web/owncloud/apps/bookmarks/l10n/is.json #srv/web/owncloud/apps/bookmarks/l10n/is.php -#srv/web/owncloud/apps/bookmarks/l10n/is/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/it +#srv/web/owncloud/apps/bookmarks/l10n/it.js +#srv/web/owncloud/apps/bookmarks/l10n/it.json #srv/web/owncloud/apps/bookmarks/l10n/it.php -#srv/web/owncloud/apps/bookmarks/l10n/it/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ja +#srv/web/owncloud/apps/bookmarks/l10n/ja.js +#srv/web/owncloud/apps/bookmarks/l10n/ja.json #srv/web/owncloud/apps/bookmarks/l10n/ja.php -#srv/web/owncloud/apps/bookmarks/l10n/ja/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ja_JP.php -#srv/web/owncloud/apps/bookmarks/l10n/jv #srv/web/owncloud/apps/bookmarks/l10n/jv.php -#srv/web/owncloud/apps/bookmarks/l10n/jv/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ka -#srv/web/owncloud/apps/bookmarks/l10n/ka/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ka_GE +#srv/web/owncloud/apps/bookmarks/l10n/ka_GE.js +#srv/web/owncloud/apps/bookmarks/l10n/ka_GE.json #srv/web/owncloud/apps/bookmarks/l10n/ka_GE.php -#srv/web/owncloud/apps/bookmarks/l10n/ka_GE/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/km +#srv/web/owncloud/apps/bookmarks/l10n/km.js +#srv/web/owncloud/apps/bookmarks/l10n/km.json #srv/web/owncloud/apps/bookmarks/l10n/km.php -#srv/web/owncloud/apps/bookmarks/l10n/km/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/kn -#srv/web/owncloud/apps/bookmarks/l10n/kn/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ko +#srv/web/owncloud/apps/bookmarks/l10n/ko.js +#srv/web/owncloud/apps/bookmarks/l10n/ko.json #srv/web/owncloud/apps/bookmarks/l10n/ko.php -#srv/web/owncloud/apps/bookmarks/l10n/ko/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ku_IQ #srv/web/owncloud/apps/bookmarks/l10n/ku_IQ.php -#srv/web/owncloud/apps/bookmarks/l10n/ku_IQ/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/l10n.pl -#srv/web/owncloud/apps/bookmarks/l10n/lb +#srv/web/owncloud/apps/bookmarks/l10n/lb.js +#srv/web/owncloud/apps/bookmarks/l10n/lb.json #srv/web/owncloud/apps/bookmarks/l10n/lb.php -#srv/web/owncloud/apps/bookmarks/l10n/lb/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/lt_LT +#srv/web/owncloud/apps/bookmarks/l10n/lt_LT.js +#srv/web/owncloud/apps/bookmarks/l10n/lt_LT.json #srv/web/owncloud/apps/bookmarks/l10n/lt_LT.php -#srv/web/owncloud/apps/bookmarks/l10n/lt_LT/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/lv +#srv/web/owncloud/apps/bookmarks/l10n/lv.js +#srv/web/owncloud/apps/bookmarks/l10n/lv.json #srv/web/owncloud/apps/bookmarks/l10n/lv.php -#srv/web/owncloud/apps/bookmarks/l10n/lv/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/mk +#srv/web/owncloud/apps/bookmarks/l10n/mk.js +#srv/web/owncloud/apps/bookmarks/l10n/mk.json #srv/web/owncloud/apps/bookmarks/l10n/mk.php -#srv/web/owncloud/apps/bookmarks/l10n/mk/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ml -#srv/web/owncloud/apps/bookmarks/l10n/ml/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ml_IN -#srv/web/owncloud/apps/bookmarks/l10n/ml_IN/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/mn -#srv/web/owncloud/apps/bookmarks/l10n/mn/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ms_MY #srv/web/owncloud/apps/bookmarks/l10n/ms_MY.php -#srv/web/owncloud/apps/bookmarks/l10n/ms_MY/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/my_MM #srv/web/owncloud/apps/bookmarks/l10n/my_MM.php -#srv/web/owncloud/apps/bookmarks/l10n/my_MM/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/nb_NO +#srv/web/owncloud/apps/bookmarks/l10n/nb_NO.js +#srv/web/owncloud/apps/bookmarks/l10n/nb_NO.json #srv/web/owncloud/apps/bookmarks/l10n/nb_NO.php -#srv/web/owncloud/apps/bookmarks/l10n/nb_NO/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/nds -#srv/web/owncloud/apps/bookmarks/l10n/nds/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ne -#srv/web/owncloud/apps/bookmarks/l10n/ne/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/nl +#srv/web/owncloud/apps/bookmarks/l10n/nl.js +#srv/web/owncloud/apps/bookmarks/l10n/nl.json #srv/web/owncloud/apps/bookmarks/l10n/nl.php -#srv/web/owncloud/apps/bookmarks/l10n/nl/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/nn_NO +#srv/web/owncloud/apps/bookmarks/l10n/nn_NO.js +#srv/web/owncloud/apps/bookmarks/l10n/nn_NO.json #srv/web/owncloud/apps/bookmarks/l10n/nn_NO.php -#srv/web/owncloud/apps/bookmarks/l10n/nn_NO/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/nqo -#srv/web/owncloud/apps/bookmarks/l10n/nqo/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/oc #srv/web/owncloud/apps/bookmarks/l10n/oc.php -#srv/web/owncloud/apps/bookmarks/l10n/oc/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/or_IN -#srv/web/owncloud/apps/bookmarks/l10n/or_IN/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/pa #srv/web/owncloud/apps/bookmarks/l10n/pa.php -#srv/web/owncloud/apps/bookmarks/l10n/pa/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/pl +#srv/web/owncloud/apps/bookmarks/l10n/pl.js +#srv/web/owncloud/apps/bookmarks/l10n/pl.json #srv/web/owncloud/apps/bookmarks/l10n/pl.php -#srv/web/owncloud/apps/bookmarks/l10n/pl/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/pl_PL #srv/web/owncloud/apps/bookmarks/l10n/pl_PL.php -#srv/web/owncloud/apps/bookmarks/l10n/pl_PL/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/pt_BR +#srv/web/owncloud/apps/bookmarks/l10n/pt_BR.js +#srv/web/owncloud/apps/bookmarks/l10n/pt_BR.json #srv/web/owncloud/apps/bookmarks/l10n/pt_BR.php -#srv/web/owncloud/apps/bookmarks/l10n/pt_BR/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/pt_PT +#srv/web/owncloud/apps/bookmarks/l10n/pt_PT.js +#srv/web/owncloud/apps/bookmarks/l10n/pt_PT.json #srv/web/owncloud/apps/bookmarks/l10n/pt_PT.php -#srv/web/owncloud/apps/bookmarks/l10n/pt_PT/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ro +#srv/web/owncloud/apps/bookmarks/l10n/ro.js +#srv/web/owncloud/apps/bookmarks/l10n/ro.json #srv/web/owncloud/apps/bookmarks/l10n/ro.php -#srv/web/owncloud/apps/bookmarks/l10n/ro/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ru +#srv/web/owncloud/apps/bookmarks/l10n/ru.js +#srv/web/owncloud/apps/bookmarks/l10n/ru.json #srv/web/owncloud/apps/bookmarks/l10n/ru.php -#srv/web/owncloud/apps/bookmarks/l10n/ru/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ru_RU #srv/web/owncloud/apps/bookmarks/l10n/ru_RU.php -#srv/web/owncloud/apps/bookmarks/l10n/ru_RU/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/si_LK +#srv/web/owncloud/apps/bookmarks/l10n/si_LK.js +#srv/web/owncloud/apps/bookmarks/l10n/si_LK.json #srv/web/owncloud/apps/bookmarks/l10n/si_LK.php -#srv/web/owncloud/apps/bookmarks/l10n/si_LK/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/sk #srv/web/owncloud/apps/bookmarks/l10n/sk.php -#srv/web/owncloud/apps/bookmarks/l10n/sk/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/sk_SK +#srv/web/owncloud/apps/bookmarks/l10n/sk_SK.js +#srv/web/owncloud/apps/bookmarks/l10n/sk_SK.json #srv/web/owncloud/apps/bookmarks/l10n/sk_SK.php -#srv/web/owncloud/apps/bookmarks/l10n/sk_SK/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/sl +#srv/web/owncloud/apps/bookmarks/l10n/sl.js +#srv/web/owncloud/apps/bookmarks/l10n/sl.json #srv/web/owncloud/apps/bookmarks/l10n/sl.php -#srv/web/owncloud/apps/bookmarks/l10n/sl/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/sq #srv/web/owncloud/apps/bookmarks/l10n/sq.php -#srv/web/owncloud/apps/bookmarks/l10n/sq/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/sr +#srv/web/owncloud/apps/bookmarks/l10n/sr.js +#srv/web/owncloud/apps/bookmarks/l10n/sr.json #srv/web/owncloud/apps/bookmarks/l10n/sr.php -#srv/web/owncloud/apps/bookmarks/l10n/sr/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/sr@latin #srv/web/owncloud/apps/bookmarks/l10n/sr@latin.php -#srv/web/owncloud/apps/bookmarks/l10n/sr@latin/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/su -#srv/web/owncloud/apps/bookmarks/l10n/su/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/sv +#srv/web/owncloud/apps/bookmarks/l10n/sv.js +#srv/web/owncloud/apps/bookmarks/l10n/sv.json #srv/web/owncloud/apps/bookmarks/l10n/sv.php -#srv/web/owncloud/apps/bookmarks/l10n/sv/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/sw_KE -#srv/web/owncloud/apps/bookmarks/l10n/sw_KE/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ta_IN -#srv/web/owncloud/apps/bookmarks/l10n/ta_IN/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ta_LK +#srv/web/owncloud/apps/bookmarks/l10n/ta_IN.php +#srv/web/owncloud/apps/bookmarks/l10n/ta_LK.js +#srv/web/owncloud/apps/bookmarks/l10n/ta_LK.json #srv/web/owncloud/apps/bookmarks/l10n/ta_LK.php -#srv/web/owncloud/apps/bookmarks/l10n/ta_LK/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/te #srv/web/owncloud/apps/bookmarks/l10n/te.php -#srv/web/owncloud/apps/bookmarks/l10n/te/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/templates -#srv/web/owncloud/apps/bookmarks/l10n/templates/bookmarks.pot -#srv/web/owncloud/apps/bookmarks/l10n/th_TH +#srv/web/owncloud/apps/bookmarks/l10n/th_TH.js +#srv/web/owncloud/apps/bookmarks/l10n/th_TH.json #srv/web/owncloud/apps/bookmarks/l10n/th_TH.php -#srv/web/owncloud/apps/bookmarks/l10n/th_TH/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/tr +#srv/web/owncloud/apps/bookmarks/l10n/tr.js +#srv/web/owncloud/apps/bookmarks/l10n/tr.json #srv/web/owncloud/apps/bookmarks/l10n/tr.php -#srv/web/owncloud/apps/bookmarks/l10n/tr/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/tzm -#srv/web/owncloud/apps/bookmarks/l10n/tzm/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ug +#srv/web/owncloud/apps/bookmarks/l10n/ug.js +#srv/web/owncloud/apps/bookmarks/l10n/ug.json #srv/web/owncloud/apps/bookmarks/l10n/ug.php -#srv/web/owncloud/apps/bookmarks/l10n/ug/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/uk +#srv/web/owncloud/apps/bookmarks/l10n/uk.js +#srv/web/owncloud/apps/bookmarks/l10n/uk.json #srv/web/owncloud/apps/bookmarks/l10n/uk.php -#srv/web/owncloud/apps/bookmarks/l10n/uk/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ur -#srv/web/owncloud/apps/bookmarks/l10n/ur/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/ur_PK #srv/web/owncloud/apps/bookmarks/l10n/ur_PK.php -#srv/web/owncloud/apps/bookmarks/l10n/ur_PK/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/uz -#srv/web/owncloud/apps/bookmarks/l10n/uz/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/vi +#srv/web/owncloud/apps/bookmarks/l10n/vi.js +#srv/web/owncloud/apps/bookmarks/l10n/vi.json #srv/web/owncloud/apps/bookmarks/l10n/vi.php -#srv/web/owncloud/apps/bookmarks/l10n/vi/bookmarks.po #srv/web/owncloud/apps/bookmarks/l10n/xgettextfiles -#srv/web/owncloud/apps/bookmarks/l10n/zh_CN -#srv/web/owncloud/apps/bookmarks/l10n/zh_CN.GB2312 -#srv/web/owncloud/apps/bookmarks/l10n/zh_CN.GB2312.php -#srv/web/owncloud/apps/bookmarks/l10n/zh_CN.GB2312/bookmarks.po +#srv/web/owncloud/apps/bookmarks/l10n/zh_CN.js +#srv/web/owncloud/apps/bookmarks/l10n/zh_CN.json #srv/web/owncloud/apps/bookmarks/l10n/zh_CN.php -#srv/web/owncloud/apps/bookmarks/l10n/zh_CN/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/zh_HK #srv/web/owncloud/apps/bookmarks/l10n/zh_HK.php -#srv/web/owncloud/apps/bookmarks/l10n/zh_HK/bookmarks.po -#srv/web/owncloud/apps/bookmarks/l10n/zh_TW +#srv/web/owncloud/apps/bookmarks/l10n/zh_TW.js +#srv/web/owncloud/apps/bookmarks/l10n/zh_TW.json #srv/web/owncloud/apps/bookmarks/l10n/zh_TW.php -#srv/web/owncloud/apps/bookmarks/l10n/zh_TW/bookmarks.po #srv/web/owncloud/apps/bookmarks/lib #srv/web/owncloud/apps/bookmarks/lib/bookmarks.php #srv/web/owncloud/apps/bookmarks/lib/search.php @@ -3749,7 +3625,9 @@ srv/web/owncloud #srv/web/owncloud/apps/bookmarks/templates/list.php #srv/web/owncloud/apps/bookmarks/templates/settings.php #srv/web/owncloud/apps/bookmarks/tests -#srv/web/owncloud/apps/bookmarks/tests/lib_bookmark.php +#srv/web/owncloud/apps/bookmarks/tests/bootstrap.php +#srv/web/owncloud/apps/bookmarks/tests/lib_bookmark_test.php +#srv/web/owncloud/apps/bookmarks/tests/phpunit.xml #srv/web/owncloud/apps/calendar #srv/web/owncloud/apps/calendar/3rdparty #srv/web/owncloud/apps/calendar/3rdparty/fullcalendar @@ -4624,7 +4502,9 @@ srv/web/owncloud #srv/web/owncloud/apps/contacts/lib/jsonresponse.php #srv/web/owncloud/apps/contacts/lib/middleware #srv/web/owncloud/apps/contacts/lib/middleware/http.php -#srv/web/owncloud/apps/contacts/lib/searchprovider.php +#srv/web/owncloud/apps/contacts/lib/search +#srv/web/owncloud/apps/contacts/lib/search/contact.php +#srv/web/owncloud/apps/contacts/lib/search/provider.php #srv/web/owncloud/apps/contacts/lib/share #srv/web/owncloud/apps/contacts/lib/share/addressbook.php #srv/web/owncloud/apps/contacts/lib/share/contact.php @@ -6973,6 +6853,7 @@ srv/web/owncloud #srv/web/owncloud/apps/files_external/ajax #srv/web/owncloud/apps/files_external/ajax/addMountPoint.php #srv/web/owncloud/apps/files_external/ajax/addRootCertificate.php +#srv/web/owncloud/apps/files_external/ajax/applicable.php #srv/web/owncloud/apps/files_external/ajax/dropbox.php #srv/web/owncloud/apps/files_external/ajax/google.php #srv/web/owncloud/apps/files_external/ajax/removeMountPoint.php @@ -7077,6 +6958,7 @@ srv/web/owncloud #srv/web/owncloud/apps/files_external/lib/api.php #srv/web/owncloud/apps/files_external/lib/config.php #srv/web/owncloud/apps/files_external/lib/dropbox.php +#srv/web/owncloud/apps/files_external/lib/etagpropagator.php #srv/web/owncloud/apps/files_external/lib/ftp.php #srv/web/owncloud/apps/files_external/lib/google.php #srv/web/owncloud/apps/files_external/lib/owncloud.php @@ -7094,16 +6976,19 @@ srv/web/owncloud #srv/web/owncloud/apps/files_external/templates/settings.php #srv/web/owncloud/apps/files_external/tests #srv/web/owncloud/apps/files_external/tests/amazons3.php +#srv/web/owncloud/apps/files_external/tests/amazons3migration.php #srv/web/owncloud/apps/files_external/tests/appSpec.js #srv/web/owncloud/apps/files_external/tests/config.php #srv/web/owncloud/apps/files_external/tests/dropbox.php #srv/web/owncloud/apps/files_external/tests/dynamicmountconfig.php +#srv/web/owncloud/apps/files_external/tests/etagpropagator.php #srv/web/owncloud/apps/files_external/tests/ftp.php #srv/web/owncloud/apps/files_external/tests/google.php #srv/web/owncloud/apps/files_external/tests/js #srv/web/owncloud/apps/files_external/tests/js/mountsfilelistSpec.js #srv/web/owncloud/apps/files_external/tests/mountconfig.php #srv/web/owncloud/apps/files_external/tests/owncloud.php +#srv/web/owncloud/apps/files_external/tests/owncloudfunctions.php #srv/web/owncloud/apps/files_external/tests/sftp.php #srv/web/owncloud/apps/files_external/tests/smb.php #srv/web/owncloud/apps/files_external/tests/smbfunctions.php @@ -7383,6 +7268,7 @@ srv/web/owncloud #srv/web/owncloud/apps/files_sharing/lib/cache.php #srv/web/owncloud/apps/files_sharing/lib/connector #srv/web/owncloud/apps/files_sharing/lib/connector/publicauth.php +#srv/web/owncloud/apps/files_sharing/lib/exceptions.php #srv/web/owncloud/apps/files_sharing/lib/external #srv/web/owncloud/apps/files_sharing/lib/external/cache.php #srv/web/owncloud/apps/files_sharing/lib/external/manager.php @@ -7414,9 +7300,11 @@ srv/web/owncloud #srv/web/owncloud/apps/files_sharing/templates/settings-admin.php #srv/web/owncloud/apps/files_sharing/tests #srv/web/owncloud/apps/files_sharing/tests/api.php +#srv/web/owncloud/apps/files_sharing/tests/backend.php #srv/web/owncloud/apps/files_sharing/tests/base.php #srv/web/owncloud/apps/files_sharing/tests/cache.php #srv/web/owncloud/apps/files_sharing/tests/externalstorage.php +#srv/web/owncloud/apps/files_sharing/tests/helper.php #srv/web/owncloud/apps/files_sharing/tests/js #srv/web/owncloud/apps/files_sharing/tests/js/appSpec.js #srv/web/owncloud/apps/files_sharing/tests/js/shareSpec.js @@ -8812,9 +8700,11 @@ srv/web/owncloud #srv/web/owncloud/apps/updater/admin.php #srv/web/owncloud/apps/updater/ajax #srv/web/owncloud/apps/updater/ajax/backup +#srv/web/owncloud/apps/updater/ajax/backup.php #srv/web/owncloud/apps/updater/ajax/backup/delete.php #srv/web/owncloud/apps/updater/ajax/backup/download.php #srv/web/owncloud/apps/updater/ajax/backup/list.php +#srv/web/owncloud/apps/updater/ajax/download.php #srv/web/owncloud/apps/updater/ajax/update.php #srv/web/owncloud/apps/updater/appinfo #srv/web/owncloud/apps/updater/appinfo/app.php @@ -8911,13 +8801,16 @@ srv/web/owncloud #srv/web/owncloud/apps/updater/lib #srv/web/owncloud/apps/updater/lib/app.php #srv/web/owncloud/apps/updater/lib/backup.php +#srv/web/owncloud/apps/updater/lib/collection.php #srv/web/owncloud/apps/updater/lib/downloader.php +#srv/web/owncloud/apps/updater/lib/fsexception.php #srv/web/owncloud/apps/updater/lib/helper.php #srv/web/owncloud/apps/updater/lib/location #srv/web/owncloud/apps/updater/lib/location.php #srv/web/owncloud/apps/updater/lib/location/3rdparty.php #srv/web/owncloud/apps/updater/lib/location/apps.php #srv/web/owncloud/apps/updater/lib/location/core.php +#srv/web/owncloud/apps/updater/lib/permissionexception.php #srv/web/owncloud/apps/updater/lib/updater.php #srv/web/owncloud/apps/updater/templates #srv/web/owncloud/apps/updater/templates/admin.php @@ -8966,6 +8859,7 @@ srv/web/owncloud #srv/web/owncloud/apps/user_ldap/group_ldap.php #srv/web/owncloud/apps/user_ldap/group_proxy.php #srv/web/owncloud/apps/user_ldap/js +#srv/web/owncloud/apps/user_ldap/js/experiencedAdmin.js #srv/web/owncloud/apps/user_ldap/js/ldapFilter.js #srv/web/owncloud/apps/user_ldap/js/settings.js #srv/web/owncloud/apps/user_ldap/l10n @@ -9118,6 +9012,7 @@ srv/web/owncloud #srv/web/owncloud/apps/user_ldap/tests/data #srv/web/owncloud/apps/user_ldap/tests/data/sid.dat #srv/web/owncloud/apps/user_ldap/tests/group_ldap.php +#srv/web/owncloud/apps/user_ldap/tests/helper.php #srv/web/owncloud/apps/user_ldap/tests/user #srv/web/owncloud/apps/user_ldap/tests/user/manager.php #srv/web/owncloud/apps/user_ldap/tests/user/user.php @@ -9266,155 +9161,54 @@ srv/web/owncloud #srv/web/owncloud/core/css/jquery.ocdialog.css #srv/web/owncloud/core/css/mobile.css #srv/web/owncloud/core/css/multiselect.css +#srv/web/owncloud/core/css/select2 +#srv/web/owncloud/core/css/select2/select2-spinner.gif +#srv/web/owncloud/core/css/select2/select2.css +#srv/web/owncloud/core/css/select2/select2.png +#srv/web/owncloud/core/css/select2/select2x2.png #srv/web/owncloud/core/css/share.css #srv/web/owncloud/core/css/styles.css #srv/web/owncloud/core/doc #srv/web/owncloud/core/doc/admin #srv/web/owncloud/core/doc/admin/_images -#srv/web/owncloud/core/doc/admin/_images/100000000000003800000018D49F1CE7.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000050000000DB83B8FA5B.png -#srv/web/owncloud/core/doc/admin/_images/10000000000000950000004412998BE7.png -#srv/web/owncloud/core/doc/admin/_images/10000000000000A800000073F49785A6.png -#srv/web/owncloud/core/doc/admin/_images/10000000000000B600000120706C3C75.png -#srv/web/owncloud/core/doc/admin/_images/10000000000000CD000000ECA8DE7780.png -#srv/web/owncloud/core/doc/admin/_images/10000000000000F1000000F56125BDBA.png -#srv/web/owncloud/core/doc/admin/_images/10000000000000F1000000F6704F46D3.png -#srv/web/owncloud/core/doc/admin/_images/10000000000000F300000068AF0ECD53.png -#srv/web/owncloud/core/doc/admin/_images/10000000000000F40000019A110DD159.png -#srv/web/owncloud/core/doc/admin/_images/10000000000000F5000000675DC5F68C.png -#srv/web/owncloud/core/doc/admin/_images/10000000000000F500000067A8845EF8.png -#srv/web/owncloud/core/doc/admin/_images/10000000000000F60000006754ED2A1E.png -#srv/web/owncloud/core/doc/admin/_images/10000000000000F6000000685DFB3767.png -#srv/web/owncloud/core/doc/admin/_images/100000000000012C0000009C444B4720.png -#srv/web/owncloud/core/doc/admin/_images/100000000000013C0000017D4FC6CEF5.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001400000008A557EF7E3.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001440000005A2989832F.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000160000000DBB2FB0223.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000165000000D3FF2168AB.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000167000000B43E4BF478.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001800000009A9494E037.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001880000007EA4444400.png -#srv/web/owncloud/core/doc/admin/_images/100000000000018B000000A090F31164.png -#srv/web/owncloud/core/doc/admin/_images/100000000000018E000000C4BA62B2A3.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000193000001AE9AB8B0A2.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000194000000498325A766.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000194000000FAD39BC0D8.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001980000009271BE0D26.png -#srv/web/owncloud/core/doc/admin/_images/100000000000019E0000004CD2A0F407.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001A3000000AAFE82893A.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001AC000000477C76808F.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001BF00000012349EAE2F.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001C1000000FE663748B2.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001C9000000AF9C1CE57F.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001CF00000176B0BE1EBC.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001D30000014DC251C948.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001E50000006E3ECDC427.png -#srv/web/owncloud/core/doc/admin/_images/10000000000001FD000000DF8D2D7546.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000200000000BCCCC35DEB.png -#srv/web/owncloud/core/doc/admin/_images/10000000000002170000004A27056037.png -#srv/web/owncloud/core/doc/admin/_images/100000000000021C0000004CACBF786C.png -#srv/web/owncloud/core/doc/admin/_images/10000000000002210000002DE3BE7515.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000227000000935D9B1EF6.png -#srv/web/owncloud/core/doc/admin/_images/100000000000023B000000125381F51B.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000247000000A77440E4D3.png -#srv/web/owncloud/core/doc/admin/_images/10000000000002720000013FB6EDA793.png -#srv/web/owncloud/core/doc/admin/_images/100000000000027B0000011D10F70F88.png -#srv/web/owncloud/core/doc/admin/_images/10000000000002840000016729388B7F.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000288000001A1D5BE4881.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000289000001A9D7F3941F.png -#srv/web/owncloud/core/doc/admin/_images/10000000000002910000018B31D51F03.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000291000001951B69B9A6.png -#srv/web/owncloud/core/doc/admin/_images/10000000000002950000019EF5732E36.png -#srv/web/owncloud/core/doc/admin/_images/10000000000002950000021E245F6883.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000298000001870B0581FA.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000298000001874D3CA506.png -#srv/web/owncloud/core/doc/admin/_images/100000000000029B0000018885B5282E.png -#srv/web/owncloud/core/doc/admin/_images/10000000000002A6000000BFBE298238.png -#srv/web/owncloud/core/doc/admin/_images/10000000000002B1000002258C08D304.png -#srv/web/owncloud/core/doc/admin/_images/10000000000002B3000000365E1CD00D.png -#srv/web/owncloud/core/doc/admin/_images/10000000000002BB000000266DB6AD1A.png -#srv/web/owncloud/core/doc/admin/_images/10000000000002F3000000926CA65D02.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000304000001B964698779.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000336000000F38C3FAF84.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000372000002AF943ADDA0.png -#srv/web/owncloud/core/doc/admin/_images/10000000000003730000002B6865E951.png -#srv/web/owncloud/core/doc/admin/_images/10000000000003A60000011E274A1A28.png -#srv/web/owncloud/core/doc/admin/_images/10000000000003A6000002A9C7A660BE.png -#srv/web/owncloud/core/doc/admin/_images/10000000000003A800000039364066E4.png -#srv/web/owncloud/core/doc/admin/_images/10000000000003B30000021B5EE5D338.png -#srv/web/owncloud/core/doc/admin/_images/10000000000003DF00000071A41D8A1F.png -#srv/web/owncloud/core/doc/admin/_images/10000000000003DF000000D953A456B6.png -#srv/web/owncloud/core/doc/admin/_images/10000000000003E8000001524A147A04.png -#srv/web/owncloud/core/doc/admin/_images/10000000000003EC000000AB60616FA7.png -#srv/web/owncloud/core/doc/admin/_images/10000000000003FB000002359BAFB40E.png -#srv/web/owncloud/core/doc/admin/_images/10000000000004010000017E4A6552BC.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000403000001632F0B76F6.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000404000000FCFC13E732.png -#srv/web/owncloud/core/doc/admin/_images/10000000000004100000005657010336.png -#srv/web/owncloud/core/doc/admin/_images/10000000000004170000016ACB5E15AE.png -#srv/web/owncloud/core/doc/admin/_images/100000000000041D0000017D8D1BC4D9.png -#srv/web/owncloud/core/doc/admin/_images/100000000000042500000163D2B339D5.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000427000000324F58266D.png -#srv/web/owncloud/core/doc/admin/_images/100000000000042E000001D3EEB9978B.png -#srv/web/owncloud/core/doc/admin/_images/100000000000042F000000CC3EDDE79E.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000430000000AF9D6E724E.png -#srv/web/owncloud/core/doc/admin/_images/100000000000043000000164DA0CE8C9.png -#srv/web/owncloud/core/doc/admin/_images/100000000000043200000169BCD20493.png -#srv/web/owncloud/core/doc/admin/_images/100000000000044C000002B0B421E27E.png -#srv/web/owncloud/core/doc/admin/_images/100000000000045800000197FE462F2B.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000462000000D44541CF9A.png -#srv/web/owncloud/core/doc/admin/_images/100000000000046C000000C2D3E5CF30.png -#srv/web/owncloud/core/doc/admin/_images/10000000000004770000008AAF3CFFDB.png -#srv/web/owncloud/core/doc/admin/_images/10000000000004920000028D9C8DC2CB.png -#srv/web/owncloud/core/doc/admin/_images/10000000000004C0000000795BB2C146.png -#srv/web/owncloud/core/doc/admin/_images/10000000000004CA000002B52116BE0C.png -#srv/web/owncloud/core/doc/admin/_images/10000000000004ED000000BE3B9E25D5.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000523000000C6F786381C.png -#srv/web/owncloud/core/doc/admin/_images/100000000000052500000088DBB95005.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000525000000BE30CF0423.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000527000000A7AB409FE0.png -#srv/web/owncloud/core/doc/admin/_images/100000000000052F000000C2867B7294.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000530000001410CF0028A.png -#srv/web/owncloud/core/doc/admin/_images/100000000000053100000142D9A4C916.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000532000000285DDBBF37.png -#srv/web/owncloud/core/doc/admin/_images/100000000000053A00000067708C8F53.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000552000000BF22E90239.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000557000002E148BAB6D4.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005970000006AE23997C9.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005AF00000074604B1A67.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005B90000007866D92D14.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005BB0000007C1DF71FA7.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005C30000006CAFFAAD61.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005D00000003B29340A7A.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005D50000009458C5EE48.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005E20000009B1BA5A8CF.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005E6000000676902E040.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005EB000000A68BA73E2D.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005EC00000073E678DFEC.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005F30000030F1372448D.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005F70000005F0912E904.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005F70000007E43DB8026.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005FA0000005CE8491B77.png -#srv/web/owncloud/core/doc/admin/_images/10000000000005FF0000005F35710398.png -#srv/web/owncloud/core/doc/admin/_images/10000000000006000000005EDA7B96BE.png -#srv/web/owncloud/core/doc/admin/_images/100000000000060300000065DF96536B.png -#srv/web/owncloud/core/doc/admin/_images/10000000000006060000006A0106CA0C.png -#srv/web/owncloud/core/doc/admin/_images/100000000000061A0000006FC014C3A4.png -#srv/web/owncloud/core/doc/admin/_images/100000000000061D0000007047877972.png -#srv/web/owncloud/core/doc/admin/_images/100000000000061E0000006BCF9ECC0B.png -#srv/web/owncloud/core/doc/admin/_images/100000000000062A0000005F61A18950.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000631000000E19D116AA0.png -#srv/web/owncloud/core/doc/admin/_images/100000000000063F00000090AAE1FA4A.png -#srv/web/owncloud/core/doc/admin/_images/1000000000000668000002D29EAD9899.png -#srv/web/owncloud/core/doc/admin/_images/100000000000066D000001AAD8CE8256.png -#srv/web/owncloud/core/doc/admin/_images/10000201000002FC000001DC2DDAD2F1.png -#srv/web/owncloud/core/doc/admin/_images/1000020100000359000000A8B848DE68.png -#srv/web/owncloud/core/doc/admin/_images/10000201000005F90000029D8BA200FB.png -#srv/web/owncloud/core/doc/admin/_images/custom_mount_config_gui-1.png -#srv/web/owncloud/core/doc/admin/_images/custom_mount_config_gui-2.png -#srv/web/owncloud/core/doc/admin/_images/custom_mount_config_gui-3.png -#srv/web/owncloud/core/doc/admin/_images/custom_mount_config_gui-4.png -#srv/web/owncloud/core/doc/admin/_images/edit_encrypted_file.png +#srv/web/owncloud/core/doc/admin/_images/antivirus-app.png +#srv/web/owncloud/core/doc/admin/_images/antivirus-config.png +#srv/web/owncloud/core/doc/admin/_images/antivirus-daemon-socket.png +#srv/web/owncloud/core/doc/admin/_images/antivirus-executable.png +#srv/web/owncloud/core/doc/admin/_images/antivirus-logging.png +#srv/web/owncloud/core/doc/admin/_images/create_public_share.png +#srv/web/owncloud/core/doc/admin/_images/documents_app_enable.png +#srv/web/owncloud/core/doc/admin/_images/encryption1.png +#srv/web/owncloud/core/doc/admin/_images/encryption2.png +#srv/web/owncloud/core/doc/admin/_images/encryption3.png +#srv/web/owncloud/core/doc/admin/_images/encryption4.png +#srv/web/owncloud/core/doc/admin/_images/encryption5.png +#srv/web/owncloud/core/doc/admin/_images/encryption6.png +#srv/web/owncloud/core/doc/admin/_images/encryption7.png +#srv/web/owncloud/core/doc/admin/_images/encryption8.png +#srv/web/owncloud/core/doc/admin/_images/encryption9.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-amazons3.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-app-add.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-app-enable.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-app-local.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-app-usermounts.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-dropbox-allowshare.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-dropbox-app.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-dropbox-configapp.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-dropbox-oc.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-dropbox.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-ftp.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-google-drive-0auth.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-google-drive-9.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-google-drive-sdk.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-google-drive.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-google-drive1.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-google-drive2.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-google-drive5.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-google-drive7.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-google-drive8.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-smb.png +#srv/web/owncloud/core/doc/admin/_images/external-storage-webdav.png #srv/web/owncloud/core/doc/admin/_images/install-wizard-advanced.png #srv/web/owncloud/core/doc/admin/_images/install-wizard.png #srv/web/owncloud/core/doc/admin/_images/ldap-advanced-1-connection.png @@ -9428,84 +9222,73 @@ srv/web/owncloud #srv/web/owncloud/core/doc/admin/_images/ldap-wizard-2-user.png #srv/web/owncloud/core/doc/admin/_images/ldap-wizard-3-login.png #srv/web/owncloud/core/doc/admin/_images/ldap-wizard-4-group.png +#srv/web/owncloud/core/doc/admin/_images/lucene-search-enable.png +#srv/web/owncloud/core/doc/admin/_images/lucene-search-user.png #srv/web/owncloud/core/doc/admin/_images/oc_admin_app_page.png -#srv/web/owncloud/core/doc/admin/_images/oc_admin_user_manage.png +#srv/web/owncloud/core/doc/admin/_images/preview_images.png +#srv/web/owncloud/core/doc/admin/_images/remote_shares.png +#srv/web/owncloud/core/doc/admin/_images/sharing-admin.png +#srv/web/owncloud/core/doc/admin/_images/sharing-user-local.png +#srv/web/owncloud/core/doc/admin/_images/sharing-user.png +#srv/web/owncloud/core/doc/admin/_images/smtp-config-php-sendmail.png +#srv/web/owncloud/core/doc/admin/_images/smtp-config-smtp.png +#srv/web/owncloud/core/doc/admin/_images/smtp-config-wizard.png #srv/web/owncloud/core/doc/admin/_images/ucs-app-center-install.png #srv/web/owncloud/core/doc/admin/_images/ucs-app-center-module.png #srv/web/owncloud/core/doc/admin/_images/ucsint.png #srv/web/owncloud/core/doc/admin/_images/ucsint1.png #srv/web/owncloud/core/doc/admin/_images/ucsint2.png #srv/web/owncloud/core/doc/admin/_images/untrusted-domain.png +#srv/web/owncloud/core/doc/admin/_images/updater-1.png +#srv/web/owncloud/core/doc/admin/_images/updater-2.png +#srv/web/owncloud/core/doc/admin/_images/updater-3.png +#srv/web/owncloud/core/doc/admin/_images/updater-4.png +#srv/web/owncloud/core/doc/admin/_images/updater-5.png +#srv/web/owncloud/core/doc/admin/_images/updater-6.png +#srv/web/owncloud/core/doc/admin/_images/updater-7.png +#srv/web/owncloud/core/doc/admin/_images/users-config.png +#srv/web/owncloud/core/doc/admin/_images/users-create.png +#srv/web/owncloud/core/doc/admin/_images/users-groups.png #srv/web/owncloud/core/doc/admin/_images/win7features.jpg #srv/web/owncloud/core/doc/admin/_images/winserverroles.jpg #srv/web/owncloud/core/doc/admin/_sources -#srv/web/owncloud/core/doc/admin/_sources/apps -#srv/web/owncloud/core/doc/admin/_sources/apps/activity -#srv/web/owncloud/core/doc/admin/_sources/apps/activity/index.txt -#srv/web/owncloud/core/doc/admin/_sources/apps/admin_dependencies_chk -#srv/web/owncloud/core/doc/admin/_sources/apps/admin_dependencies_chk/index.txt -#srv/web/owncloud/core/doc/admin/_sources/apps/files_antivirus -#srv/web/owncloud/core/doc/admin/_sources/apps/files_antivirus/index.txt -#srv/web/owncloud/core/doc/admin/_sources/apps/files_encryption -#srv/web/owncloud/core/doc/admin/_sources/apps/files_encryption/index.txt -#srv/web/owncloud/core/doc/admin/_sources/apps/files_external -#srv/web/owncloud/core/doc/admin/_sources/apps/files_external/index.txt -#srv/web/owncloud/core/doc/admin/_sources/apps/files_sharing -#srv/web/owncloud/core/doc/admin/_sources/apps/files_sharing/index.txt -#srv/web/owncloud/core/doc/admin/_sources/apps/files_trashbin -#srv/web/owncloud/core/doc/admin/_sources/apps/files_trashbin/index.txt -#srv/web/owncloud/core/doc/admin/_sources/apps/files_versions -#srv/web/owncloud/core/doc/admin/_sources/apps/files_versions/index.txt -#srv/web/owncloud/core/doc/admin/_sources/apps/firstrunwizard -#srv/web/owncloud/core/doc/admin/_sources/apps/firstrunwizard/index.txt -#srv/web/owncloud/core/doc/admin/_sources/apps/index.txt -#srv/web/owncloud/core/doc/admin/_sources/apps/user_ldap -#srv/web/owncloud/core/doc/admin/_sources/apps/user_ldap/index.txt -#srv/web/owncloud/core/doc/admin/_sources/apps/viewers -#srv/web/owncloud/core/doc/admin/_sources/apps/viewers/index.txt -#srv/web/owncloud/core/doc/admin/_sources/config -#srv/web/owncloud/core/doc/admin/_sources/config/apps.txt -#srv/web/owncloud/core/doc/admin/_sources/config/code_locations.txt -#srv/web/owncloud/core/doc/admin/_sources/config/default_parameters.txt -#srv/web/owncloud/core/doc/admin/_sources/config/deleted_items.txt -#srv/web/owncloud/core/doc/admin/_sources/config/index.txt -#srv/web/owncloud/core/doc/admin/_sources/config/logging.txt -#srv/web/owncloud/core/doc/admin/_sources/config/mail_parameters.txt -#srv/web/owncloud/core/doc/admin/_sources/config/maintenance.txt -#srv/web/owncloud/core/doc/admin/_sources/config/miscellaneous.txt -#srv/web/owncloud/core/doc/admin/_sources/config/previews.txt -#srv/web/owncloud/core/doc/admin/_sources/config/reverse_proxy_configurations.txt -#srv/web/owncloud/core/doc/admin/_sources/config/session_info.txt -#srv/web/owncloud/core/doc/admin/_sources/config/user_experience.txt -#srv/web/owncloud/core/doc/admin/_sources/config/verification.txt #srv/web/owncloud/core/doc/admin/_sources/configuration #srv/web/owncloud/core/doc/admin/_sources/configuration/auth_ldap.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/background_jobs.txt +#srv/web/owncloud/core/doc/admin/_sources/configuration/configuration-antivirus.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_3rdparty.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_apps.txt +#srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_assets.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_automation.txt +#srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_config_sample_php.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_custom_clients.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_database.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_encryption.txt +#srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_file_sharing.txt +#srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_files_locking.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_knowledgebase.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_language.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_logging.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_mail.txt -#srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_maintenance.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_preview.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_reverseproxy.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuration_users.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/configuring_big_file_upload.txt +#srv/web/owncloud/core/doc/admin/_sources/configuration/configuring_documents.txt +#srv/web/owncloud/core/doc/admin/_sources/configuration/configuring_search.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/custom_mount_config.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/custom_mount_config_gui.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/custom_user_backend.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/index.txt +#srv/web/owncloud/core/doc/admin/_sources/configuration/server_to_server_managing.txt #srv/web/owncloud/core/doc/admin/_sources/configuration/xsendfile.txt #srv/web/owncloud/core/doc/admin/_sources/contents.txt -#srv/web/owncloud/core/doc/admin/_sources/cron -#srv/web/owncloud/core/doc/admin/_sources/cron/index.txt #srv/web/owncloud/core/doc/admin/_sources/index.txt #srv/web/owncloud/core/doc/admin/_sources/installation +#srv/web/owncloud/core/doc/admin/_sources/installation/configuration_hiawatha.txt +#srv/web/owncloud/core/doc/admin/_sources/installation/configuration_lighttpd.txt +#srv/web/owncloud/core/doc/admin/_sources/installation/configuration_nginx.txt +#srv/web/owncloud/core/doc/admin/_sources/installation/configuration_yaws.txt #srv/web/owncloud/core/doc/admin/_sources/installation/index.txt #srv/web/owncloud/core/doc/admin/_sources/installation/installation_appliance.txt #srv/web/owncloud/core/doc/admin/_sources/installation/installation_linux.txt @@ -9519,19 +9302,14 @@ srv/web/owncloud #srv/web/owncloud/core/doc/admin/_sources/issues/index.txt #srv/web/owncloud/core/doc/admin/_sources/maintenance #srv/web/owncloud/core/doc/admin/_sources/maintenance/backup.txt +#srv/web/owncloud/core/doc/admin/_sources/maintenance/convert_db.txt +#srv/web/owncloud/core/doc/admin/_sources/maintenance/enable_maintenance.txt #srv/web/owncloud/core/doc/admin/_sources/maintenance/index.txt #srv/web/owncloud/core/doc/admin/_sources/maintenance/migrating.txt #srv/web/owncloud/core/doc/admin/_sources/maintenance/restore.txt #srv/web/owncloud/core/doc/admin/_sources/maintenance/update.txt -#srv/web/owncloud/core/doc/admin/_sources/quota -#srv/web/owncloud/core/doc/admin/_sources/quota/index.txt -#srv/web/owncloud/core/doc/admin/_sources/sharing_api -#srv/web/owncloud/core/doc/admin/_sources/sharing_api/create_a_new_share.txt -#srv/web/owncloud/core/doc/admin/_sources/sharing_api/delete_share.txt -#srv/web/owncloud/core/doc/admin/_sources/sharing_api/get_all_shares.txt -#srv/web/owncloud/core/doc/admin/_sources/sharing_api/get_information_about_a_known_share.txt -#srv/web/owncloud/core/doc/admin/_sources/sharing_api/get_shares_from_a_specific_file_or_folder.txt -#srv/web/owncloud/core/doc/admin/_sources/sharing_api/index.txt +#srv/web/owncloud/core/doc/admin/_sources/maintenance/upgrade.txt +#srv/web/owncloud/core/doc/admin/_sources/whats_new_admin.txt #srv/web/owncloud/core/doc/admin/_static #srv/web/owncloud/core/doc/admin/_static/ajax-loader.gif #srv/web/owncloud/core/doc/admin/_static/basic.css @@ -9563,74 +9341,44 @@ srv/web/owncloud #srv/web/owncloud/core/doc/admin/_static/up-pressed.png #srv/web/owncloud/core/doc/admin/_static/up.png #srv/web/owncloud/core/doc/admin/_static/websupport.js -#srv/web/owncloud/core/doc/admin/apps -#srv/web/owncloud/core/doc/admin/apps/activity -#srv/web/owncloud/core/doc/admin/apps/activity/index.html -#srv/web/owncloud/core/doc/admin/apps/admin_dependencies_chk -#srv/web/owncloud/core/doc/admin/apps/admin_dependencies_chk/index.html -#srv/web/owncloud/core/doc/admin/apps/files_antivirus -#srv/web/owncloud/core/doc/admin/apps/files_antivirus/index.html -#srv/web/owncloud/core/doc/admin/apps/files_encryption -#srv/web/owncloud/core/doc/admin/apps/files_encryption/index.html -#srv/web/owncloud/core/doc/admin/apps/files_external -#srv/web/owncloud/core/doc/admin/apps/files_external/index.html -#srv/web/owncloud/core/doc/admin/apps/files_sharing -#srv/web/owncloud/core/doc/admin/apps/files_sharing/index.html -#srv/web/owncloud/core/doc/admin/apps/files_trashbin -#srv/web/owncloud/core/doc/admin/apps/files_trashbin/index.html -#srv/web/owncloud/core/doc/admin/apps/files_versions -#srv/web/owncloud/core/doc/admin/apps/files_versions/index.html -#srv/web/owncloud/core/doc/admin/apps/firstrunwizard -#srv/web/owncloud/core/doc/admin/apps/firstrunwizard/index.html -#srv/web/owncloud/core/doc/admin/apps/index.html -#srv/web/owncloud/core/doc/admin/apps/user_ldap -#srv/web/owncloud/core/doc/admin/apps/user_ldap/index.html -#srv/web/owncloud/core/doc/admin/apps/viewers -#srv/web/owncloud/core/doc/admin/apps/viewers/index.html -#srv/web/owncloud/core/doc/admin/config -#srv/web/owncloud/core/doc/admin/config/apps.html -#srv/web/owncloud/core/doc/admin/config/code_locations.html -#srv/web/owncloud/core/doc/admin/config/default_parameters.html -#srv/web/owncloud/core/doc/admin/config/deleted_items.html -#srv/web/owncloud/core/doc/admin/config/index.html -#srv/web/owncloud/core/doc/admin/config/logging.html -#srv/web/owncloud/core/doc/admin/config/mail_parameters.html -#srv/web/owncloud/core/doc/admin/config/maintenance.html -#srv/web/owncloud/core/doc/admin/config/miscellaneous.html -#srv/web/owncloud/core/doc/admin/config/previews.html -#srv/web/owncloud/core/doc/admin/config/reverse_proxy_configurations.html -#srv/web/owncloud/core/doc/admin/config/session_info.html -#srv/web/owncloud/core/doc/admin/config/user_experience.html -#srv/web/owncloud/core/doc/admin/config/verification.html #srv/web/owncloud/core/doc/admin/configuration #srv/web/owncloud/core/doc/admin/configuration/auth_ldap.html #srv/web/owncloud/core/doc/admin/configuration/background_jobs.html +#srv/web/owncloud/core/doc/admin/configuration/configuration-antivirus.html #srv/web/owncloud/core/doc/admin/configuration/configuration_3rdparty.html #srv/web/owncloud/core/doc/admin/configuration/configuration_apps.html +#srv/web/owncloud/core/doc/admin/configuration/configuration_assets.html #srv/web/owncloud/core/doc/admin/configuration/configuration_automation.html +#srv/web/owncloud/core/doc/admin/configuration/configuration_config_sample_php.html #srv/web/owncloud/core/doc/admin/configuration/configuration_custom_clients.html #srv/web/owncloud/core/doc/admin/configuration/configuration_database.html #srv/web/owncloud/core/doc/admin/configuration/configuration_encryption.html +#srv/web/owncloud/core/doc/admin/configuration/configuration_file_sharing.html +#srv/web/owncloud/core/doc/admin/configuration/configuration_files_locking.html #srv/web/owncloud/core/doc/admin/configuration/configuration_knowledgebase.html #srv/web/owncloud/core/doc/admin/configuration/configuration_language.html #srv/web/owncloud/core/doc/admin/configuration/configuration_logging.html #srv/web/owncloud/core/doc/admin/configuration/configuration_mail.html -#srv/web/owncloud/core/doc/admin/configuration/configuration_maintenance.html #srv/web/owncloud/core/doc/admin/configuration/configuration_preview.html #srv/web/owncloud/core/doc/admin/configuration/configuration_reverseproxy.html #srv/web/owncloud/core/doc/admin/configuration/configuration_users.html #srv/web/owncloud/core/doc/admin/configuration/configuring_big_file_upload.html +#srv/web/owncloud/core/doc/admin/configuration/configuring_documents.html +#srv/web/owncloud/core/doc/admin/configuration/configuring_search.html #srv/web/owncloud/core/doc/admin/configuration/custom_mount_config.html #srv/web/owncloud/core/doc/admin/configuration/custom_mount_config_gui.html #srv/web/owncloud/core/doc/admin/configuration/custom_user_backend.html #srv/web/owncloud/core/doc/admin/configuration/index.html +#srv/web/owncloud/core/doc/admin/configuration/server_to_server_managing.html #srv/web/owncloud/core/doc/admin/configuration/xsendfile.html #srv/web/owncloud/core/doc/admin/contents.html -#srv/web/owncloud/core/doc/admin/cron -#srv/web/owncloud/core/doc/admin/cron/index.html #srv/web/owncloud/core/doc/admin/genindex.html #srv/web/owncloud/core/doc/admin/index.html #srv/web/owncloud/core/doc/admin/installation +#srv/web/owncloud/core/doc/admin/installation/configuration_hiawatha.html +#srv/web/owncloud/core/doc/admin/installation/configuration_lighttpd.html +#srv/web/owncloud/core/doc/admin/installation/configuration_nginx.html +#srv/web/owncloud/core/doc/admin/installation/configuration_yaws.html #srv/web/owncloud/core/doc/admin/installation/index.html #srv/web/owncloud/core/doc/admin/installation/installation_appliance.html #srv/web/owncloud/core/doc/admin/installation/installation_linux.html @@ -9644,70 +9392,58 @@ srv/web/owncloud #srv/web/owncloud/core/doc/admin/issues/index.html #srv/web/owncloud/core/doc/admin/maintenance #srv/web/owncloud/core/doc/admin/maintenance/backup.html +#srv/web/owncloud/core/doc/admin/maintenance/convert_db.html +#srv/web/owncloud/core/doc/admin/maintenance/enable_maintenance.html #srv/web/owncloud/core/doc/admin/maintenance/index.html #srv/web/owncloud/core/doc/admin/maintenance/migrating.html #srv/web/owncloud/core/doc/admin/maintenance/restore.html #srv/web/owncloud/core/doc/admin/maintenance/update.html +#srv/web/owncloud/core/doc/admin/maintenance/upgrade.html #srv/web/owncloud/core/doc/admin/objects.inv -#srv/web/owncloud/core/doc/admin/quota -#srv/web/owncloud/core/doc/admin/quota/index.html #srv/web/owncloud/core/doc/admin/search.html #srv/web/owncloud/core/doc/admin/searchindex.js -#srv/web/owncloud/core/doc/admin/sharing_api -#srv/web/owncloud/core/doc/admin/sharing_api/create_a_new_share.html -#srv/web/owncloud/core/doc/admin/sharing_api/delete_share.html -#srv/web/owncloud/core/doc/admin/sharing_api/get_all_shares.html -#srv/web/owncloud/core/doc/admin/sharing_api/get_information_about_a_known_share.html -#srv/web/owncloud/core/doc/admin/sharing_api/get_shares_from_a_specific_file_or_folder.html -#srv/web/owncloud/core/doc/admin/sharing_api/index.html +#srv/web/owncloud/core/doc/admin/whats_new_admin.html #srv/web/owncloud/core/doc/user #srv/web/owncloud/core/doc/user/_images -#srv/web/owncloud/core/doc/user/_images/1000000000000163000000E9CDA84C92.png -#srv/web/owncloud/core/doc/user/_images/1000000000000175000000FAB2A2B294.png -#srv/web/owncloud/core/doc/user/_images/1000000000000195000000EF7E44082C.png -#srv/web/owncloud/core/doc/user/_images/10000000000001CE000000F2E2084BA1.png -#srv/web/owncloud/core/doc/user/_images/100000000000041D0000003D52225C0D.png -#srv/web/owncloud/core/doc/user/_images/1000000000000453000001BFFCF48776.png -#srv/web/owncloud/core/doc/user/_images/1000000000000467000002B63162E59B.png -#srv/web/owncloud/core/doc/user/_images/10000000000004690000026615360BEB.png -#srv/web/owncloud/core/doc/user/_images/100000000000046D0000015F4B5494A9.png -#srv/web/owncloud/core/doc/user/_images/100000000000046F000000DEA2BFCD9B.png -#srv/web/owncloud/core/doc/user/_images/1000000000000470000001B68AE60DD3.png -#srv/web/owncloud/core/doc/user/_images/10000000000004710000014BBC34499D.png -#srv/web/owncloud/core/doc/user/_images/100000000000047200000129CB014025.png -#srv/web/owncloud/core/doc/user/_images/100000000000047700000219A3013A92.png -#srv/web/owncloud/core/doc/user/_images/1000000000000479000002887E7F48EA.png -#srv/web/owncloud/core/doc/user/_images/100000000000047A000000B727198874.png -#srv/web/owncloud/core/doc/user/_images/100000000000047A000000FB86FF2A9A.png -#srv/web/owncloud/core/doc/user/_images/100000000000047A0000011C6682A254.png -#srv/web/owncloud/core/doc/user/_images/100000000000048100000245268CDB7A.png #srv/web/owncloud/core/doc/user/_images/bookmark_addurl.png #srv/web/owncloud/core/doc/user/_images/bookmark_setting.png -#srv/web/owncloud/core/doc/user/_images/calendar_createevent.png +#srv/web/owncloud/core/doc/user/_images/calendar_create_event.png +#srv/web/owncloud/core/doc/user/_images/calendar_create_event_repeat.png +#srv/web/owncloud/core/doc/user/_images/calendar_create_event_share.png +#srv/web/owncloud/core/doc/user/_images/calendar_create_new.png +#srv/web/owncloud/core/doc/user/_images/calendar_default.png +#srv/web/owncloud/core/doc/user/_images/calendar_edit_event.png #srv/web/owncloud/core/doc/user/_images/calendar_export.png #srv/web/owncloud/core/doc/user/_images/calendar_import.png -#srv/web/owncloud/core/doc/user/_images/calendar_manage-calendars.png #srv/web/owncloud/core/doc/user/_images/calendar_newtimezone1.png +#srv/web/owncloud/core/doc/user/_images/calendar_settings.png +#srv/web/owncloud/core/doc/user/_images/contact_address_book_add.png #srv/web/owncloud/core/doc/user/_images/contact_bottombar.png #srv/web/owncloud/core/doc/user/_images/contact_crop.jpg -#srv/web/owncloud/core/doc/user/_images/contact_del_ab.png -#srv/web/owncloud/core/doc/user/_images/contact_emptycontact.png -#srv/web/owncloud/core/doc/user/_images/contact_picture.jpg +#srv/web/owncloud/core/doc/user/_images/contact_new.png +#srv/web/owncloud/core/doc/user/_images/contact_picture.png +#srv/web/owncloud/core/doc/user/_images/contact_picture_default.png #srv/web/owncloud/core/doc/user/_images/contact_syncopt.jpg #srv/web/owncloud/core/doc/user/_images/contact_thunderbird-Symbol_Gear.jpg #srv/web/owncloud/core/doc/user/_images/contact_thunderbird-Symbol_Impeller.jpg #srv/web/owncloud/core/doc/user/_images/contact_thunderbird-URL_config.jpg #srv/web/owncloud/core/doc/user/_images/contact_uploadbutton.png #srv/web/owncloud/core/doc/user/_images/contact_vcfpick.jpg +#srv/web/owncloud/core/doc/user/_images/contacts_empty.png +#srv/web/owncloud/core/doc/user/_images/contacts_settings.png +#srv/web/owncloud/core/doc/user/_images/deleted_files.png +#srv/web/owncloud/core/doc/user/_images/documents_personal_settings.png #srv/web/owncloud/core/doc/user/_images/dolphin_webdav.png +#srv/web/owncloud/core/doc/user/_images/download.png +#srv/web/owncloud/core/doc/user/_images/email_address_personal_settings.png +#srv/web/owncloud/core/doc/user/_images/encryption1.png +#srv/web/owncloud/core/doc/user/_images/encryption2.png +#srv/web/owncloud/core/doc/user/_images/encryption3.png +#srv/web/owncloud/core/doc/user/_images/encryption4.png +#srv/web/owncloud/core/doc/user/_images/event_export.png #srv/web/owncloud/core/doc/user/_images/explorer_webdav.png -#srv/web/owncloud/core/doc/user/_images/external_google_drive_1_sign_in.png -#srv/web/owncloud/core/doc/user/_images/external_google_drive_2_verify.png -#srv/web/owncloud/core/doc/user/_images/external_google_drive_3_create_project.png -#srv/web/owncloud/core/doc/user/_images/external_google_drive_4_enable_api.png -#srv/web/owncloud/core/doc/user/_images/external_google_drive_5_setup_ownCloud.png -#srv/web/owncloud/core/doc/user/_images/external_google_drive_6_accept.png #srv/web/owncloud/core/doc/user/_images/files_versioning.png +#srv/web/owncloud/core/doc/user/_images/full_name.png #srv/web/owncloud/core/doc/user/_images/gnome3_nautilus_webdav.png #srv/web/owncloud/core/doc/user/_images/kdes.png #srv/web/owncloud/core/doc/user/_images/kdes1.png @@ -9718,19 +9454,36 @@ srv/web/owncloud #srv/web/owncloud/core/doc/user/_images/kdes6.png #srv/web/owncloud/core/doc/user/_images/kdes7.png #srv/web/owncloud/core/doc/user/_images/kdes9.png +#srv/web/owncloud/core/doc/user/_images/language_personal_settings.png +#srv/web/owncloud/core/doc/user/_images/notifications_personal_settings.png #srv/web/owncloud/core/doc/user/_images/oc_connect.png #srv/web/owncloud/core/doc/user/_images/oc_documents.png #srv/web/owncloud/core/doc/user/_images/oc_documents_col_edit.png #srv/web/owncloud/core/doc/user/_images/oc_documents_edit.png #srv/web/owncloud/core/doc/user/_images/oc_documents_share.png -#srv/web/owncloud/core/doc/user/_images/oc_files_share.png -#srv/web/owncloud/core/doc/user/_images/oc_filesweb.png #srv/web/owncloud/core/doc/user/_images/oc_filesweb_navigate.png #srv/web/owncloud/core/doc/user/_images/oc_filesweb_new.png -#srv/web/owncloud/core/doc/user/_images/oc_ui.png -#srv/web/owncloud/core/doc/user/_images/oc_user_preferences.png +#srv/web/owncloud/core/doc/user/_images/oc_main_web.png +#srv/web/owncloud/core/doc/user/_images/oc_main_web_labelled.png +#srv/web/owncloud/core/doc/user/_images/oc_personal_settings_dropdown.png #srv/web/owncloud/core/doc/user/_images/osx_webdav1.png #srv/web/owncloud/core/doc/user/_images/osx_webdav2.png +#srv/web/owncloud/core/doc/user/_images/password_change.png +#srv/web/owncloud/core/doc/user/_images/personal_settings.png +#srv/web/owncloud/core/doc/user/_images/profile_picture_personal_settings.png +#srv/web/owncloud/core/doc/user/_images/quota1.png +#srv/web/owncloud/core/doc/user/_images/s2s-add-remote-share.png +#srv/web/owncloud/core/doc/user/_images/s2s-connect-to-remote-share.png +#srv/web/owncloud/core/doc/user/_images/s2s-create_public_share.png +#srv/web/owncloud/core/doc/user/_images/s2s-remote-share-labeled.png +#srv/web/owncloud/core/doc/user/_images/usage_indicator.png +#srv/web/owncloud/core/doc/user/_images/users-files.png +#srv/web/owncloud/core/doc/user/_images/users-overlays-sharepoint.png +#srv/web/owncloud/core/doc/user/_images/users-overlays-win-net-drive.png +#srv/web/owncloud/core/doc/user/_images/users-overlays.png +#srv/web/owncloud/core/doc/user/_images/users-share-local.png +#srv/web/owncloud/core/doc/user/_images/users-share-local2.png +#srv/web/owncloud/core/doc/user/_images/users-share-public.png #srv/web/owncloud/core/doc/user/_sources #srv/web/owncloud/core/doc/user/_sources/bookmarks.txt #srv/web/owncloud/core/doc/user/_sources/contents.txt @@ -9745,10 +9498,11 @@ srv/web/owncloud #srv/web/owncloud/core/doc/user/_sources/files/filesweb.txt #srv/web/owncloud/core/doc/user/_sources/files/index.txt #srv/web/owncloud/core/doc/user/_sources/files/quota.txt +#srv/web/owncloud/core/doc/user/_sources/files/server_to_server_using.txt #srv/web/owncloud/core/doc/user/_sources/files/sync.txt #srv/web/owncloud/core/doc/user/_sources/files/versioncontrol.txt #srv/web/owncloud/core/doc/user/_sources/index.txt -#srv/web/owncloud/core/doc/user/_sources/migration.txt +#srv/web/owncloud/core/doc/user/_sources/installing_apps.txt #srv/web/owncloud/core/doc/user/_sources/pim #srv/web/owncloud/core/doc/user/_sources/pim/calendar.txt #srv/web/owncloud/core/doc/user/_sources/pim/contacts.txt @@ -9759,9 +9513,8 @@ srv/web/owncloud #srv/web/owncloud/core/doc/user/_sources/pim/sync_thunderbird.txt #srv/web/owncloud/core/doc/user/_sources/pim/troubleshooting.txt #srv/web/owncloud/core/doc/user/_sources/userpreferences.txt -#srv/web/owncloud/core/doc/user/_sources/web_guide -#srv/web/owncloud/core/doc/user/_sources/web_guide/index.txt #srv/web/owncloud/core/doc/user/_sources/webinterface.txt +#srv/web/owncloud/core/doc/user/_sources/whats_new.txt #srv/web/owncloud/core/doc/user/_static #srv/web/owncloud/core/doc/user/_static/ajax-loader.gif #srv/web/owncloud/core/doc/user/_static/basic.css @@ -9806,11 +9559,12 @@ srv/web/owncloud #srv/web/owncloud/core/doc/user/files/filesweb.html #srv/web/owncloud/core/doc/user/files/index.html #srv/web/owncloud/core/doc/user/files/quota.html +#srv/web/owncloud/core/doc/user/files/server_to_server_using.html #srv/web/owncloud/core/doc/user/files/sync.html #srv/web/owncloud/core/doc/user/files/versioncontrol.html #srv/web/owncloud/core/doc/user/genindex.html #srv/web/owncloud/core/doc/user/index.html -#srv/web/owncloud/core/doc/user/migration.html +#srv/web/owncloud/core/doc/user/installing_apps.html #srv/web/owncloud/core/doc/user/objects.inv #srv/web/owncloud/core/doc/user/pim #srv/web/owncloud/core/doc/user/pim/calendar.html @@ -9824,9 +9578,8 @@ srv/web/owncloud #srv/web/owncloud/core/doc/user/search.html #srv/web/owncloud/core/doc/user/searchindex.js #srv/web/owncloud/core/doc/user/userpreferences.html -#srv/web/owncloud/core/doc/user/web_guide -#srv/web/owncloud/core/doc/user/web_guide/index.html #srv/web/owncloud/core/doc/user/webinterface.html +#srv/web/owncloud/core/doc/user/whats_new.html #srv/web/owncloud/core/fonts #srv/web/owncloud/core/fonts/LICENSE.txt #srv/web/owncloud/core/fonts/OpenSans-Bold.woff @@ -9890,6 +9643,8 @@ srv/web/owncloud #srv/web/owncloud/core/img/actions/public.svg #srv/web/owncloud/core/img/actions/rename.png #srv/web/owncloud/core/img/actions/rename.svg +#srv/web/owncloud/core/img/actions/search-white.png +#srv/web/owncloud/core/img/actions/search-white.svg #srv/web/owncloud/core/img/actions/search.png #srv/web/owncloud/core/img/actions/search.svg #srv/web/owncloud/core/img/actions/settings.png @@ -10083,7 +9838,63 @@ srv/web/owncloud #srv/web/owncloud/core/js/octemplate.js #srv/web/owncloud/core/js/placeholder.js #srv/web/owncloud/core/js/placeholders.js +#srv/web/owncloud/core/js/select2 +#srv/web/owncloud/core/js/select2/LICENSE +#srv/web/owncloud/core/js/select2/README.md +#srv/web/owncloud/core/js/select2/bower.json +#srv/web/owncloud/core/js/select2/component.json +#srv/web/owncloud/core/js/select2/composer.json +#srv/web/owncloud/core/js/select2/package.json +#srv/web/owncloud/core/js/select2/release.sh +#srv/web/owncloud/core/js/select2/select2-bootstrap.css +#srv/web/owncloud/core/js/select2/select2.jquery.json +#srv/web/owncloud/core/js/select2/select2.js +#srv/web/owncloud/core/js/select2/select2_locale_ar.js +#srv/web/owncloud/core/js/select2/select2_locale_bg.js +#srv/web/owncloud/core/js/select2/select2_locale_ca.js +#srv/web/owncloud/core/js/select2/select2_locale_cs.js +#srv/web/owncloud/core/js/select2/select2_locale_da.js +#srv/web/owncloud/core/js/select2/select2_locale_de.js +#srv/web/owncloud/core/js/select2/select2_locale_el.js +#srv/web/owncloud/core/js/select2/select2_locale_en.js.template +#srv/web/owncloud/core/js/select2/select2_locale_es.js +#srv/web/owncloud/core/js/select2/select2_locale_et.js +#srv/web/owncloud/core/js/select2/select2_locale_eu.js +#srv/web/owncloud/core/js/select2/select2_locale_fa.js +#srv/web/owncloud/core/js/select2/select2_locale_fi.js +#srv/web/owncloud/core/js/select2/select2_locale_fr.js +#srv/web/owncloud/core/js/select2/select2_locale_gl.js +#srv/web/owncloud/core/js/select2/select2_locale_he.js +#srv/web/owncloud/core/js/select2/select2_locale_hr.js +#srv/web/owncloud/core/js/select2/select2_locale_hu.js +#srv/web/owncloud/core/js/select2/select2_locale_id.js +#srv/web/owncloud/core/js/select2/select2_locale_is.js +#srv/web/owncloud/core/js/select2/select2_locale_it.js +#srv/web/owncloud/core/js/select2/select2_locale_ja.js +#srv/web/owncloud/core/js/select2/select2_locale_ka.js +#srv/web/owncloud/core/js/select2/select2_locale_ko.js +#srv/web/owncloud/core/js/select2/select2_locale_lt.js +#srv/web/owncloud/core/js/select2/select2_locale_lv.js +#srv/web/owncloud/core/js/select2/select2_locale_mk.js +#srv/web/owncloud/core/js/select2/select2_locale_ms.js +#srv/web/owncloud/core/js/select2/select2_locale_nl.js +#srv/web/owncloud/core/js/select2/select2_locale_no.js +#srv/web/owncloud/core/js/select2/select2_locale_pl.js +#srv/web/owncloud/core/js/select2/select2_locale_pt-BR.js +#srv/web/owncloud/core/js/select2/select2_locale_pt-PT.js +#srv/web/owncloud/core/js/select2/select2_locale_ro.js +#srv/web/owncloud/core/js/select2/select2_locale_rs.js +#srv/web/owncloud/core/js/select2/select2_locale_ru.js +#srv/web/owncloud/core/js/select2/select2_locale_sk.js +#srv/web/owncloud/core/js/select2/select2_locale_sv.js +#srv/web/owncloud/core/js/select2/select2_locale_th.js +#srv/web/owncloud/core/js/select2/select2_locale_tr.js +#srv/web/owncloud/core/js/select2/select2_locale_uk.js +#srv/web/owncloud/core/js/select2/select2_locale_vi.js +#srv/web/owncloud/core/js/select2/select2_locale_zh-CN.js +#srv/web/owncloud/core/js/select2/select2_locale_zh-TW.js #srv/web/owncloud/core/js/setup.js +#srv/web/owncloud/core/js/setupchecks.js #srv/web/owncloud/core/js/share.js #srv/web/owncloud/core/js/singleselect.js #srv/web/owncloud/core/js/snap.js @@ -10269,6 +10080,7 @@ srv/web/owncloud #srv/web/owncloud/core/templates/message.html #srv/web/owncloud/core/templates/singleuser.user.php #srv/web/owncloud/core/templates/tags.html +#srv/web/owncloud/core/templates/untrustedDomain.php #srv/web/owncloud/core/templates/update.admin.php #srv/web/owncloud/core/templates/update.user.php #srv/web/owncloud/cron.php @@ -11920,11 +11732,14 @@ srv/web/owncloud #srv/web/owncloud/lib/private/connector/sabre/quotaplugin.php #srv/web/owncloud/lib/private/connector/sabre/request.php #srv/web/owncloud/lib/private/connector/sabre/server.php +#srv/web/owncloud/lib/private/contacts +#srv/web/owncloud/lib/private/contacts/localaddressbook.php #srv/web/owncloud/lib/private/contactsmanager.php #srv/web/owncloud/lib/private/davclient.php #srv/web/owncloud/lib/private/db #srv/web/owncloud/lib/private/db.php #srv/web/owncloud/lib/private/db/adapter.php +#srv/web/owncloud/lib/private/db/adaptermysql.php #srv/web/owncloud/lib/private/db/adapteroci8.php #srv/web/owncloud/lib/private/db/adapterpgsql.php #srv/web/owncloud/lib/private/db/adaptersqlite.php @@ -11937,12 +11752,14 @@ srv/web/owncloud #srv/web/owncloud/lib/private/db/mdb2schemawriter.php #srv/web/owncloud/lib/private/db/migrationexception.php #srv/web/owncloud/lib/private/db/migrator.php +#srv/web/owncloud/lib/private/db/mssqlmigrator.php #srv/web/owncloud/lib/private/db/mysqlmigrator.php #srv/web/owncloud/lib/private/db/nocheckmigrator.php #srv/web/owncloud/lib/private/db/oracleconnection.php #srv/web/owncloud/lib/private/db/oraclemigrator.php #srv/web/owncloud/lib/private/db/pgsqltools.php #srv/web/owncloud/lib/private/db/sqlitemigrator.php +#srv/web/owncloud/lib/private/db/sqlitesessioninit.php #srv/web/owncloud/lib/private/db/statementwrapper.php #srv/web/owncloud/lib/private/defaults.php #srv/web/owncloud/lib/private/eventsource.php @@ -12025,6 +11842,7 @@ srv/web/owncloud #srv/web/owncloud/lib/private/hooks/forwardingemitter.php #srv/web/owncloud/lib/private/hooks/legacyemitter.php #srv/web/owncloud/lib/private/hooks/publicemitter.php +#srv/web/owncloud/lib/private/httphelper.php #srv/web/owncloud/lib/private/image.php #srv/web/owncloud/lib/private/installer.php #srv/web/owncloud/lib/private/json.php @@ -12065,6 +11883,7 @@ srv/web/owncloud #srv/web/owncloud/lib/private/migration/provider.php #srv/web/owncloud/lib/private/mimetypes.list.php #srv/web/owncloud/lib/private/navigationmanager.php +#srv/web/owncloud/lib/private/needsupdateexception.php #srv/web/owncloud/lib/private/notsquareexception.php #srv/web/owncloud/lib/private/ocs #srv/web/owncloud/lib/private/ocs.php @@ -12086,7 +11905,6 @@ srv/web/owncloud #srv/web/owncloud/lib/private/preview/provider.php #srv/web/owncloud/lib/private/preview/svg.php #srv/web/owncloud/lib/private/preview/txt.php -#srv/web/owncloud/lib/private/preview/unknown.php #srv/web/owncloud/lib/private/previewmanager.php #srv/web/owncloud/lib/private/repair.php #srv/web/owncloud/lib/private/repairstep.php @@ -12106,6 +11924,7 @@ srv/web/owncloud #srv/web/owncloud/lib/private/search/result/folder.php #srv/web/owncloud/lib/private/search/result/image.php #srv/web/owncloud/lib/private/server.php +#srv/web/owncloud/lib/private/serviceunavailableexception.php #srv/web/owncloud/lib/private/session #srv/web/owncloud/lib/private/session/internal.php #srv/web/owncloud/lib/private/session/memory.php @@ -12224,6 +12043,8 @@ srv/web/owncloud #srv/web/owncloud/lib/public/icontainer.php #srv/web/owncloud/lib/public/idb.php #srv/web/owncloud/lib/public/idbconnection.php +#srv/web/owncloud/lib/public/igroup.php +#srv/web/owncloud/lib/public/igroupmanager.php #srv/web/owncloud/lib/public/ihelper.php #srv/web/owncloud/lib/public/il10n.php #srv/web/owncloud/lib/public/ilogger.php @@ -12256,7 +12077,9 @@ srv/web/owncloud #srv/web/owncloud/lib/repair #srv/web/owncloud/lib/repair/collation.php #srv/web/owncloud/lib/repair/innodb.php +#srv/web/owncloud/lib/repair/preview.php #srv/web/owncloud/lib/repair/repairmimetypes.php +#srv/web/owncloud/lib/repair/searchlucenetables.php #srv/web/owncloud/occ #srv/web/owncloud/ocs #srv/web/owncloud/ocs/providers.php @@ -12275,20 +12098,19 @@ srv/web/owncloud #srv/web/owncloud/search/templates #srv/web/owncloud/search/templates/part.results.php #srv/web/owncloud/settings -#srv/web/owncloud/settings/admin #srv/web/owncloud/settings/admin.php -#srv/web/owncloud/settings/admin/controller.php #srv/web/owncloud/settings/ajax #srv/web/owncloud/settings/ajax/apps #srv/web/owncloud/settings/ajax/apps/ocs.php #srv/web/owncloud/settings/ajax/changedisplayname.php +#srv/web/owncloud/settings/ajax/checksetup.php #srv/web/owncloud/settings/ajax/creategroup.php #srv/web/owncloud/settings/ajax/createuser.php #srv/web/owncloud/settings/ajax/decryptall.php #srv/web/owncloud/settings/ajax/deletekeys.php #srv/web/owncloud/settings/ajax/disableapp.php #srv/web/owncloud/settings/ajax/enableapp.php -#srv/web/owncloud/settings/ajax/excludegroups.php +#srv/web/owncloud/settings/ajax/geteveryonecount.php #srv/web/owncloud/settings/ajax/getlog.php #srv/web/owncloud/settings/ajax/grouplist.php #srv/web/owncloud/settings/ajax/installapp.php @@ -12306,9 +12128,12 @@ srv/web/owncloud #srv/web/owncloud/settings/ajax/uninstallapp.php #srv/web/owncloud/settings/ajax/updateapp.php #srv/web/owncloud/settings/ajax/userlist.php +#srv/web/owncloud/settings/application.php #srv/web/owncloud/settings/apps.php #srv/web/owncloud/settings/changepassword #srv/web/owncloud/settings/changepassword/controller.php +#srv/web/owncloud/settings/controller +#srv/web/owncloud/settings/controller/mailsettingscontroller.php #srv/web/owncloud/settings/css #srv/web/owncloud/settings/css/settings.css #srv/web/owncloud/settings/help.php @@ -12330,6 +12155,7 @@ srv/web/owncloud #srv/web/owncloud/settings/js/apps.js #srv/web/owncloud/settings/js/log.js #srv/web/owncloud/settings/js/personal.js +#srv/web/owncloud/settings/js/settings.js #srv/web/owncloud/settings/js/users #srv/web/owncloud/settings/js/users/deleteHandler.js #srv/web/owncloud/settings/js/users/filter.js @@ -12434,6 +12260,10 @@ srv/web/owncloud #srv/web/owncloud/settings/templates/users/part.grouplist.php #srv/web/owncloud/settings/templates/users/part.setquota.php #srv/web/owncloud/settings/templates/users/part.userlist.php +#srv/web/owncloud/settings/tests +#srv/web/owncloud/settings/tests/js +#srv/web/owncloud/settings/tests/js/users +#srv/web/owncloud/settings/tests/js/users/deleteHandlerSpec.js #srv/web/owncloud/settings/users.php #srv/web/owncloud/status.php #srv/web/owncloud/themes diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 50620663a0..9896139ce2 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -7,19 +7,33 @@ usr/bin/qemu-img usr/bin/qemu-io usr/bin/qemu-nbd usr/bin/qemu-system-arm +usr/bin/qemu-system-i386 +usr/libexec/qemu-bridge-helper #usr/share/doc/qemu #usr/share/doc/qemu/qemu-doc.html #usr/share/doc/qemu/qemu-tech.html +#usr/share/doc/qemu/qmp-commands.txt #usr/share/man/man1/qemu-img.1 #usr/share/man/man1/qemu.1 #usr/share/man/man8/qemu-nbd.8 -usr/share/qemu +#usr/share/qemu +usr/share/qemu/QEMU,cgthree.bin +usr/share/qemu/QEMU,tcx.bin +usr/share/qemu/acpi-dsdt.aml usr/share/qemu/bamboo.dtb +usr/share/qemu/bios-256k.bin usr/share/qemu/bios.bin -usr/share/qemu/extboot.bin +usr/share/qemu/efi-e1000.rom +usr/share/qemu/efi-eepro100.rom +usr/share/qemu/efi-ne2k_pci.rom +usr/share/qemu/efi-pcnet.rom +usr/share/qemu/efi-rtl8139.rom +usr/share/qemu/efi-virtio.rom usr/share/qemu/keymaps usr/share/qemu/keymaps/ar +usr/share/qemu/keymaps/bepo usr/share/qemu/keymaps/common +usr/share/qemu/keymaps/cz usr/share/qemu/keymaps/da usr/share/qemu/keymaps/de usr/share/qemu/keymaps/de-ch @@ -53,12 +67,13 @@ usr/share/qemu/keymaps/sl usr/share/qemu/keymaps/sv usr/share/qemu/keymaps/th usr/share/qemu/keymaps/tr +usr/share/qemu/kvmvapic.bin usr/share/qemu/linuxboot.bin -usr/share/qemu/mpc8544ds.dtb usr/share/qemu/multiboot.bin usr/share/qemu/openbios-ppc usr/share/qemu/openbios-sparc32 usr/share/qemu/openbios-sparc64 +usr/share/qemu/palcode-clipper usr/share/qemu/petalogix-ml605.dtb usr/share/qemu/petalogix-s3adsp1800.dtb usr/share/qemu/ppc_rom.bin @@ -68,12 +83,19 @@ usr/share/qemu/pxe-ne2k_pci.rom usr/share/qemu/pxe-pcnet.rom usr/share/qemu/pxe-rtl8139.rom usr/share/qemu/pxe-virtio.rom +usr/share/qemu/q35-acpi-dsdt.aml +usr/share/qemu/qemu-icon.bmp +usr/share/qemu/qemu_logo_no_text.svg +usr/share/qemu/s390-ccw.img usr/share/qemu/s390-zipl.rom +usr/share/qemu/sgabios.bin usr/share/qemu/slof.bin usr/share/qemu/spapr-rtas.bin -usr/share/qemu/vapic.bin +usr/share/qemu/trace-events +usr/share/qemu/u-boot.e500 usr/share/qemu/vgabios-cirrus.bin usr/share/qemu/vgabios-qxl.bin usr/share/qemu/vgabios-stdvga.bin usr/share/qemu/vgabios-vmware.bin usr/share/qemu/vgabios.bin +#usr/var/run diff --git a/config/rootfiles/packages/teamspeak b/config/rootfiles/packages/teamspeak deleted file mode 100644 index b7c235882b..0000000000 --- a/config/rootfiles/packages/teamspeak +++ /dev/null @@ -1,3 +0,0 @@ -etc/rc.d/init.d/teamspeak -opt/teamspeak -var/ipfire/backup/addons/includes/teamspeak diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor index f9c657c881..972b207758 100644 --- a/config/rootfiles/packages/tor +++ b/config/rootfiles/packages/tor @@ -1,11 +1,9 @@ -#etc/logrotate.d etc/logrotate.d/tor etc/rc.d/init.d/tor etc/rc.d/rc0.d/K40tor etc/rc.d/rc3.d/S60tor etc/rc.d/rc6.d/K40tor #etc/tor -#etc/tor/tor-tsocks.conf etc/tor/torrc srv/web/ipfire/cgi-bin/tor.cgi usr/bin/tor diff --git a/config/ssl/openssl.cnf b/config/ssl/openssl.cnf index f0906e5470..9d1e6e1ff5 100644 --- a/config/ssl/openssl.cnf +++ b/config/ssl/openssl.cnf @@ -21,7 +21,7 @@ RANDFILE = $dir/tmp/.rand x509_extensions = usr_cert default_days = 999999 default_crl_days= 30 -default_md = md5 +default_md = sha256 preserve = no policy = policy_match email_in_dn = no @@ -35,7 +35,7 @@ commonName = supplied emailAddress = optional [ req ] -default_bits = 1024 +default_bits = 2048 default_keyfile = privkey.pem distinguished_name = req_distinguished_name attributes = req_attributes diff --git a/config/strongswan/charon.conf b/config/strongswan/charon.conf new file mode 100644 index 0000000000..a5ff0bee51 --- /dev/null +++ b/config/strongswan/charon.conf @@ -0,0 +1,302 @@ +# Options for the charon IKE daemon. +charon { + # Accept unencrypted ID and HASH payloads in IKEv1 Main Mode. + accept_unencrypted_mainmode_messages = yes + + # Maximum number of half-open IKE_SAs for a single peer IP. + # block_threshold = 5 + + # Whether relations in validated certificate chains should be cached in + # memory. + # cert_cache = yes + + # Send Cisco Unity vendor ID payload (IKEv1 only). + cisco_unity = yes + + # Close the IKE_SA if setup of the CHILD_SA along with IKE_AUTH failed. + # close_ike_on_child_failure = no + + # Number of half-open IKE_SAs that activate the cookie mechanism. + # cookie_threshold = 10 + + # Use ANSI X9.42 DH exponent size or optimum size matched to cryptographic + # strength. + # dh_exponent_ansi_x9_42 = yes + + # DNS server assigned to peer via configuration payload (CP). + # dns1 = + + # DNS server assigned to peer via configuration payload (CP). + # dns2 = + + # Enable Denial of Service protection using cookies and aggressiveness + # checks. + # dos_protection = yes + + # Compliance with the errata for RFC 4753. + # ecp_x_coordinate_only = yes + + # Free objects during authentication (might conflict with plugins). + # flush_auth_cfg = no + + # Maximum size (complete IP datagram size in bytes) of a sent IKE fragment + # when using proprietary IKEv1 or standardized IKEv2 fragmentation (0 for + # address family specific default values). If specified this limit is + # used for both IPv4 and IPv6. + # fragment_size = 0 + + # Name of the group the daemon changes to after startup. + # group = + + # Timeout in seconds for connecting IKE_SAs (also see IKE_SA_INIT DROPPING). + # half_open_timeout = 30 + + # Enable hash and URL support. + # hash_and_url = no + + # Allow IKEv1 Aggressive Mode with pre-shared keys as responder. + # i_dont_care_about_security_and_use_aggressive_mode_psk = no + + # A space-separated list of routing tables to be excluded from route + # lookups. + # ignore_routing_tables = + + # Maximum number of IKE_SAs that can be established at the same time before + # new connection attempts are blocked. + # ikesa_limit = 0 + + # Number of exclusively locked segments in the hash table. + ikesa_table_segments = 4 + + # Size of the IKE_SA hash table. + ikesa_table_size = 32 + + # Whether to close IKE_SA if the only CHILD_SA closed due to inactivity. + # inactivity_close_ike = no + + # Limit new connections based on the current number of half open IKE_SAs, + # see IKE_SA_INIT DROPPING in strongswan.conf(5). + init_limit_half_open = 1000 + + # Limit new connections based on the number of queued jobs. + # init_limit_job_load = 0 + + # Causes charon daemon to ignore IKE initiation requests. + # initiator_only = no + + # Install routes into a separate routing table for established IPsec + # tunnels. + # install_routes = yes + + # Install virtual IP addresses. + # install_virtual_ip = yes + + # The name of the interface on which virtual IP addresses should be + # installed. + # install_virtual_ip_on = + + # Check daemon, libstrongswan and plugin integrity at startup. + # integrity_test = no + + # A comma-separated list of network interfaces that should be ignored, if + # interfaces_use is specified this option has no effect. + # interfaces_ignore = + + # A comma-separated list of network interfaces that should be used by + # charon. All other interfaces are ignored. + # interfaces_use = + + # NAT keep alive interval. + # keep_alive = 20s + + # Plugins to load in the IKE daemon charon. + # load = + + # Determine plugins to load via each plugin's load option. + # load_modular = no + + # Maximum packet size accepted by charon. + # max_packet = 10000 + + # Enable multiple authentication exchanges (RFC 4739). + # multiple_authentication = yes + + # WINS servers assigned to peer via configuration payload (CP). + # nbns1 = + + # WINS servers assigned to peer via configuration payload (CP). + # nbns2 = + + # UDP port used locally. If set to 0 a random port will be allocated. + # port = 500 + + # UDP port used locally in case of NAT-T. If set to 0 a random port will be + # allocated. Has to be different from charon.port, otherwise a random port + # will be allocated. + # port_nat_t = 4500 + + # By default public IPv6 addresses are preferred over temporary ones (RFC + # 4941), to make connections more stable. Enable this option to reverse + # this. + # prefer_temporary_addrs = no + + # Process RTM_NEWROUTE and RTM_DELROUTE events. + # process_route = yes + + # Delay in ms for receiving packets, to simulate larger RTT. + # receive_delay = 0 + + # Delay request messages. + # receive_delay_request = yes + + # Delay response messages. + # receive_delay_response = yes + + # Specific IKEv2 message type to delay, 0 for any. + # receive_delay_type = 0 + + # Size of the AH/ESP replay window, in packets. + # replay_window = 32 + + # Base to use for calculating exponential back off, see IKEv2 RETRANSMISSION + # in strongswan.conf(5). + # retransmit_base = 1.8 + + # Timeout in seconds before sending first retransmit. + # retransmit_timeout = 4.0 + + # Number of times to retransmit a packet before giving up. + # retransmit_tries = 5 + + # Interval to use when retrying to initiate an IKE_SA (e.g. if DNS + # resolution failed), 0 to disable retries. + # retry_initiate_interval = 0 + + # Initiate CHILD_SA within existing IKE_SAs. + # reuse_ikesa = yes + + # Numerical routing table to install routes to. + # routing_table = + + # Priority of the routing table. + # routing_table_prio = + + # Delay in ms for sending packets, to simulate larger RTT. + # send_delay = 0 + + # Delay request messages. + # send_delay_request = yes + + # Delay response messages. + # send_delay_response = yes + + # Specific IKEv2 message type to delay, 0 for any. + # send_delay_type = 0 + + # Send strongSwan vendor ID payload + # send_vendor_id = no + + # Number of worker threads in charon. + # threads = 16 + + # Name of the user the daemon changes to after startup. + # user = + + crypto_test { + + # Benchmark crypto algorithms and order them by efficiency. + # bench = no + + # Buffer size used for crypto benchmark. + # bench_size = 1024 + + # Number of iterations to test each algorithm. + # bench_time = 50 + + # Test crypto algorithms during registration (requires test vectors + # provided by the test-vectors plugin). + # on_add = no + + # Test crypto algorithms on each crypto primitive instantiation. + # on_create = no + + # Strictly require at least one test vector to enable an algorithm. + # required = no + + # Whether to test RNG with TRUE quality; requires a lot of entropy. + # rng_true = no + + } + + host_resolver { + + # Maximum number of concurrent resolver threads (they are terminated if + # unused). + # max_threads = 3 + + # Minimum number of resolver threads to keep around. + # min_threads = 0 + + } + + leak_detective { + + # Includes source file names and line numbers in leak detective output. + # detailed = yes + + # Threshold in bytes for leaks to be reported (0 to report all). + # usage_threshold = 10240 + + # Threshold in number of allocations for leaks to be reported (0 to + # report all). + # usage_threshold_count = 0 + + } + + processor { + + # Section to configure the number of reserved threads per priority class + # see JOB PRIORITY MANAGEMENT in strongswan.conf(5). + priority_threads { + + } + + } + + # Section containing a list of scripts (name = path) that are executed when + # the daemon is started. + start-scripts { + + } + + # Section containing a list of scripts (name = path) that are executed when + # the daemon is terminated. + stop-scripts { + + } + + tls { + + # List of TLS encryption ciphers. + # cipher = + + # List of TLS key exchange methods. + # key_exchange = + + # List of TLS MAC algorithms. + # mac = + + # List of TLS cipher suites. + # suites = + + } + + x509 { + + # Discard certificates with unsupported or unknown critical extensions. + # enforce_critical = yes + + } + +} + diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg index cfb8113cf6..39521675da 100644 --- a/config/syslinux/syslinux.cfg +++ b/config/syslinux/syslinux.cfg @@ -50,6 +50,7 @@ Run the installer in text mode. ENDTEXT KERNEL vmlinuz INITRD instroot + APPEND novga LABEL unattended MENU LABEL Unattended installation diff --git a/config/u-boot/uEnv.txt b/config/u-boot/uEnv.txt index bc3faccaf8..66ab24fd55 100755 --- a/config/u-boot/uEnv.txt +++ b/config/u-boot/uEnv.txt @@ -1,4 +1,5 @@ -uenvcmd=if test "$board" = "panda" ;then run bootpanda; else run bootbananapi; fi; KVER=xxxKVERxxx -bootpanda=setenv initrd_high 90000000; fatload mmc 0:1 0x82000000 zImage-ipfire-multi; fatload mmc 0:1 ${fdtaddr} dtb-${KVER}-ipfire-multi/${fdtfile}; setenv bootargs video=800x600 console=tty1 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 ro; bootz 0x82000000 - ${fdtaddr}; -bootbananapi=setenv fdt_high ffffffff; fatload mmc 0:1 0x46000000 zImage-ipfire-multi; fatload mmc 0:1 0x49000000 dtb-${KVER}-ipfire-multi/sun7i-a20-bananapi.dtb; setenv bootargs console=ttyS0,115200n8 rootwait root=/dev/mmcblk0p3 rootwait; bootz 0x46000000 - 0x49000000; +DTBSUNXI=sun7i-a20-bananapi.dtb +uenvcmd=if test "$board" = "panda" ;then run bootpanda; else run bootsunxi; fi; +bootpanda=setenv initrd_high 90000000; fatload mmc 0:1 0x82000000 zImage-ipfire-multi; fatload mmc 0:1 ${fdtaddr} dtb-${KVER}-ipfire-multi/${fdtfile}; setenv bootargs video=800x600 console=tty1 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3; bootz 0x82000000 - ${fdtaddr}; +bootsunxi=setenv fdt_high ffffffff; fatload mmc 0:1 0x46000000 zImage-ipfire-multi; fatload mmc 0:1 0x49000000 dtb-${KVER}-ipfire-multi/${DTBSUNXI}; fatload mmc 0:1 0x49100000 uInit-ipfire-multi; setenv bootargs console=ttyS0,115200n8 rootwait root=/dev/mmcblk0p3 rootwait; bootz 0x46000000 0x49100000 0x49000000; diff --git a/config/udev/60-net.rules b/config/udev/60-net.rules new file mode 100644 index 0000000000..4f22a1e306 --- /dev/null +++ b/config/udev/60-net.rules @@ -0,0 +1,3 @@ +# Call a script that checks for the right name of the new device. +# If it matches the configuration it will be renamed accordingly. +ACTION=="add", SUBSYSTEM=="net", PROGRAM="/lib/udev/network-hotplug-rename", RESULT=="?*", NAME="$result" diff --git a/config/udev/network-hotplug-rename b/config/udev/network-hotplug-rename new file mode 100644 index 0000000000..331b788185 --- /dev/null +++ b/config/udev/network-hotplug-rename @@ -0,0 +1,75 @@ +#!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2015 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +# Check if all appropriate variables are set +[ -n "${INTERFACE}" ] || exit 2 + +# Ignore virtual interfaces, etc. +case "${INTERFACE}" in + lo) + exit 0 + ;; + tun*) + exit 0 + ;; + ppp*) + exit 0 + ;; +esac + +# Check if INTERFACE actually exists +[ -d "/sys/class/net/${INTERFACE}" ] || exit 1 + +# If the network configuration is not readable, +# we cannot go on. +if [ ! -r "/var/ipfire/ethernet/settings" ]; then + exit 1 +fi + +# Read network settings +eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) + +# Standard zones +ZONES="RED GREEN ORANGE BLUE" + +# Determine the address of INTERFACE +ADDRESS="$( $TMPDIR/$SNAME-$VERSION.tar +xz -d < $ISODIR/distro.img > $TMPDIR/$SNAME-$VERSION.tar tar -C $MNThdd/ -xvf $TMPDIR/$SNAME-$VERSION.tar \ --exclude=lib/modules* --exclude=boot* --numeric-owner @@ -130,9 +130,9 @@ mkdir $MNThdd/boot/grub echo "timeout 10" > $MNThdd/boot/grub/grub.conf echo "default 0" >> $MNThdd/boot/grub/grub.conf echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf -echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/$P3 rootdelay=10 panic=10 console=$CONSOLE ro" \ +echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/$P3 rootdelay=10 panic=10 console=$CONSOLE" \ >> $MNThdd/boot/grub/grub.conf -echo " initrd /ipfirerd-$KVER-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf +echo " initrd /initramfs-$KVER-ipfire-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf echo "# savedefault 0" >> $MNThdd/boot/grub/grub.conf ln -s grub.conf $MNThdd/boot/grub/menu.lst @@ -159,12 +159,13 @@ mount --bind /proc $MNThdd/proc mount --bind /dev $MNThdd/dev mount --bind /sys $MNThdd/sys chroot $MNThdd /usr/bin/perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" -sed -i -e "s|DEVICE1|/dev/$P1|g" $MNThdd/etc/fstab -sed -i -e "s|DEVICE2|/dev/$P2|g" $MNThdd/etc/fstab -sed -i -e "s|DEVICE3|/dev/$P3|g" $MNThdd/etc/fstab -sed -i -e "s|DEVICE4|/dev/$P4|g" $MNThdd/etc/fstab -sed -i -e "s|FSTYPE|$FSTYPE|g" $MNThdd/etc/fstab +# create fstab +echo "/dev/$P1 /boot auto defaults 1 3" > $MNThdd/etc/fstab +echo "/dev/$P2 swap swap defaults 0 0" >> $MNThdd/etc/fstab +echo "/dev/$P3 / auto defaults 1 1" >> $MNThdd/etc/fstab +echo "/dev/$P4 /var auto defaults 1 2" >> $MNThdd/etc/fstab + #Remove root / fstab check rm -rf $MNThdd/etc/rc.d/rcsysinit.d/S19checkfstab diff --git a/config/xtables-addons/mconfig b/config/xtables-addons/mconfig new file mode 100644 index 0000000000..933d717a64 --- /dev/null +++ b/config/xtables-addons/mconfig @@ -0,0 +1,24 @@ +# -*- Makefile -*- +# +build_ACCOUNT=m +build_CHAOS=m +build_DELUDE=m +build_DHCPMAC=m +build_DNETMAP=m +build_ECHO=m +build_IPMARK=m +build_LOGMARK=m +build_SYSRQ=n +build_TARPIT=m +build_condition=m +build_fuzzy=m +build_geoip=m +build_gradm=n +build_iface=m +build_ipp2p=m +build_ipv4options=m +build_length2=m +build_lscan=m +build_pknock=m +build_psd=m +build_quota2=m diff --git a/doc/language_issues.de b/doc/language_issues.de index e41f48b777..1ccc654128 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -75,6 +75,7 @@ WARNING: translation string unused: bad characters in WARNING: translation string unused: behind a proxy WARNING: translation string unused: bitrate WARNING: translation string unused: bleeding rules +WARNING: translation string unused: block WARNING: translation string unused: blue access use hint WARNING: translation string unused: blue interface WARNING: translation string unused: cache management @@ -243,6 +244,7 @@ WARNING: translation string unused: fwhost Standard Network WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue WARNING: translation string unused: fwhost changeremark +WARNING: translation string unused: fwhost cust geoip WARNING: translation string unused: fwhost err addrgrp WARNING: translation string unused: fwhost err hostorip WARNING: translation string unused: fwhost err mac @@ -258,6 +260,9 @@ WARNING: translation string unused: fwhost wo subnet WARNING: translation string unused: gen static key WARNING: translation string unused: generate WARNING: translation string unused: genkey +WARNING: translation string unused: geoipblock country code +WARNING: translation string unused: geoipblock country name +WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key WARNING: translation string unused: hint @@ -275,6 +280,7 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -575,6 +581,8 @@ WARNING: translation string unused: transfer limits WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug +WARNING: translation string unused: unblock +WARNING: translation string unused: unblock all WARNING: translation string unused: unencrypted WARNING: translation string unused: update transcript WARNING: translation string unused: updates @@ -631,7 +639,9 @@ WARNING: untranslated string: bytes WARNING: untranslated string: community rules WARNING: untranslated string: dead peer detection WARNING: untranslated string: emerging rules +WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: no data WARNING: untranslated string: qos add subclass WARNING: untranslated string: route config changed @@ -639,3 +649,4 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: show tls-auth key +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.en b/doc/language_issues.en index 290da0275e..b7be8627b3 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -93,6 +93,7 @@ WARNING: translation string unused: bewan adsl pci st WARNING: translation string unused: bewan adsl usb WARNING: translation string unused: bitrate WARNING: translation string unused: bleeding rules +WARNING: translation string unused: block WARNING: translation string unused: blue access use hint WARNING: translation string unused: blue interface WARNING: translation string unused: cache management @@ -266,6 +267,7 @@ WARNING: translation string unused: fwhost Standard Network WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue WARNING: translation string unused: fwhost changeremark +WARNING: translation string unused: fwhost cust geoip WARNING: translation string unused: fwhost err addrgrp WARNING: translation string unused: fwhost err hostorip WARNING: translation string unused: fwhost err mac @@ -283,6 +285,9 @@ WARNING: translation string unused: g.lite WARNING: translation string unused: gen static key WARNING: translation string unused: generate WARNING: translation string unused: genkey +WARNING: translation string unused: geoipblock country code +WARNING: translation string unused: geoipblock country name +WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key WARNING: translation string unused: hint @@ -300,6 +305,7 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -608,6 +614,8 @@ WARNING: translation string unused: transfer limits WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug +WARNING: translation string unused: unblock +WARNING: translation string unused: unblock all WARNING: translation string unused: unencrypted WARNING: translation string unused: update transcript WARNING: translation string unused: updates @@ -663,9 +671,12 @@ WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes +WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: no data WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.es b/doc/language_issues.es index c93d40cb4f..086dfbdc94 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -233,6 +233,9 @@ WARNING: translation string unused: g.lite WARNING: translation string unused: gen static key WARNING: translation string unused: generate WARNING: translation string unused: genkey +WARNING: translation string unused: geoipblock country code +WARNING: translation string unused: geoipblock country name +WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key WARNING: translation string unused: hint @@ -250,6 +253,7 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -649,6 +653,7 @@ WARNING: untranslated string: ccd none WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used +WARNING: untranslated string: check all WARNING: untranslated string: count WARNING: untranslated string: countries WARNING: untranslated string: country codes and flags @@ -793,6 +798,7 @@ WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed WARNING: untranslated string: fwhost OpenVPN N-2-N +WARNING: untranslated string: fwhost addgeoipgrp WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@ -805,6 +811,9 @@ WARNING: untranslated string: fwhost ccdhost WARNING: untranslated string: fwhost ccdnet WARNING: untranslated string: fwhost change WARNING: untranslated string: fwhost cust addr +WARNING: untranslated string: fwhost cust geoipgroup +WARNING: untranslated string: fwhost cust geoipgrp +WARNING: untranslated string: fwhost cust geoiplocation WARNING: untranslated string: fwhost cust grp WARNING: untranslated string: fwhost cust net WARNING: untranslated string: fwhost cust service @@ -844,6 +853,7 @@ WARNING: untranslated string: fwhost ip_mac WARNING: untranslated string: fwhost ipsec net WARNING: untranslated string: fwhost menu WARNING: untranslated string: fwhost netaddress +WARNING: untranslated string: fwhost newgeoipgrp WARNING: untranslated string: fwhost newgrp WARNING: untranslated string: fwhost newhost WARNING: untranslated string: fwhost newnet @@ -862,6 +872,7 @@ WARNING: untranslated string: gen dh WARNING: untranslated string: generate dh key WARNING: untranslated string: grouptype WARNING: untranslated string: hardware support +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: imei WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second @@ -1023,6 +1034,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uncheck all WARNING: untranslated string: uplink WARNING: untranslated string: upload dh key WARNING: untranslated string: uptime load average @@ -1030,6 +1042,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.fr b/doc/language_issues.fr index c1dedc59c3..47ee3fb3f0 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -250,6 +250,7 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -659,6 +660,7 @@ WARNING: untranslated string: ccd none WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used +WARNING: untranslated string: check all WARNING: untranslated string: count WARNING: untranslated string: countries WARNING: untranslated string: country codes and flags @@ -804,6 +806,7 @@ WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed WARNING: untranslated string: fwhost OpenVPN N-2-N +WARNING: untranslated string: fwhost addgeoipgrp WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@ -816,6 +819,9 @@ WARNING: untranslated string: fwhost ccdhost WARNING: untranslated string: fwhost ccdnet WARNING: untranslated string: fwhost change WARNING: untranslated string: fwhost cust addr +WARNING: untranslated string: fwhost cust geoipgroup +WARNING: untranslated string: fwhost cust geoipgrp +WARNING: untranslated string: fwhost cust geoiplocation WARNING: untranslated string: fwhost cust grp WARNING: untranslated string: fwhost cust net WARNING: untranslated string: fwhost cust service @@ -855,6 +861,7 @@ WARNING: untranslated string: fwhost ip_mac WARNING: untranslated string: fwhost ipsec net WARNING: untranslated string: fwhost menu WARNING: untranslated string: fwhost netaddress +WARNING: untranslated string: fwhost newgeoipgrp WARNING: untranslated string: fwhost newgrp WARNING: untranslated string: fwhost newhost WARNING: untranslated string: fwhost newnet @@ -871,8 +878,16 @@ WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome WARNING: untranslated string: gen dh WARNING: untranslated string: generate dh key +WARNING: untranslated string: geoip +WARNING: untranslated string: geoipblock +WARNING: untranslated string: geoipblock block countries +WARNING: untranslated string: geoipblock configuration +WARNING: untranslated string: geoipblock country is allowed +WARNING: untranslated string: geoipblock country is blocked +WARNING: untranslated string: geoipblock enable feature WARNING: untranslated string: grouptype WARNING: untranslated string: hardware support +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: imei WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second @@ -1031,6 +1046,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uncheck all WARNING: untranslated string: uplink WARNING: untranslated string: upload dh key WARNING: untranslated string: upload new ruleset @@ -1041,6 +1057,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.it b/doc/language_issues.it new file mode 100644 index 0000000000..098f4401e4 --- /dev/null +++ b/doc/language_issues.it @@ -0,0 +1,719 @@ +WARNING: translation string unused: Client status and controlc +WARNING: translation string unused: ConnSched scheduler +WARNING: translation string unused: ConnSched select profile +WARNING: translation string unused: HDD temperature +WARNING: translation string unused: Level7 rule +WARNING: translation string unused: Local VPN IP +WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght +WARNING: translation string unused: Remote IP +WARNING: translation string unused: Remote VPN IP +WARNING: translation string unused: Resolv +WARNING: translation string unused: TOS Bits +WARNING: translation string unused: Verbose +WARNING: translation string unused: access allowed +WARNING: translation string unused: access refused with this oinkcode +WARNING: translation string unused: add a new rule +WARNING: translation string unused: add network +WARNING: translation string unused: add new ovpn +WARNING: translation string unused: add service +WARNING: translation string unused: add xtaccess +WARNING: translation string unused: add-route +WARNING: translation string unused: admin user password has been changed +WARNING: translation string unused: administrator user password +WARNING: translation string unused: advproxy LDAP auth +WARNING: translation string unused: advproxy NTLM auth +WARNING: translation string unused: advproxy advanced proxy +WARNING: translation string unused: advproxy chgwebpwd ERROR +WARNING: translation string unused: advproxy chgwebpwd SUCCESS +WARNING: translation string unused: advproxy chgwebpwd change password +WARNING: translation string unused: advproxy chgwebpwd change web password +WARNING: translation string unused: advproxy chgwebpwd new password +WARNING: translation string unused: advproxy chgwebpwd new password confirm +WARNING: translation string unused: advproxy chgwebpwd old password +WARNING: translation string unused: advproxy chgwebpwd username +WARNING: translation string unused: advproxy cre disabled +WARNING: translation string unused: advproxy errmsg change fail +WARNING: translation string unused: advproxy errmsg change success +WARNING: translation string unused: advproxy errmsg invalid user +WARNING: translation string unused: advproxy errmsg no password +WARNING: translation string unused: advproxy errmsg password incorrect +WARNING: translation string unused: advproxy no cre groups +WARNING: translation string unused: advproxy ssadvanced proxy +WARNING: translation string unused: advproxy update information +WARNING: translation string unused: advproxy update notification +WARNING: translation string unused: again +WARNING: translation string unused: age seconds +WARNING: translation string unused: age shour +WARNING: translation string unused: age sminute +WARNING: translation string unused: age ssecond +WARNING: translation string unused: alcatelusb help +WARNING: translation string unused: alcatelusb upload +WARNING: translation string unused: all interfaces +WARNING: translation string unused: all updates installed +WARNING: translation string unused: allmsg +WARNING: translation string unused: alt information +WARNING: translation string unused: alt ovpn +WARNING: translation string unused: alt vpn +WARNING: translation string unused: and +WARNING: translation string unused: ansi t1.483 +WARNING: translation string unused: apply +WARNING: translation string unused: archive not exist +WARNING: translation string unused: attemps +WARNING: translation string unused: available updates +WARNING: translation string unused: avoid dod +WARNING: translation string unused: backup archive +WARNING: translation string unused: backup clear archive +WARNING: translation string unused: backup config floppy +WARNING: translation string unused: backup configuration +WARNING: translation string unused: backup erase key +WARNING: translation string unused: backup explain key +WARNING: translation string unused: backup explain key li1 +WARNING: translation string unused: backup explain key li2 +WARNING: translation string unused: backup explain key li3 +WARNING: translation string unused: backup explain key no1 +WARNING: translation string unused: backup explain key no2 +WARNING: translation string unused: backup export key +WARNING: translation string unused: backup extract key +WARNING: translation string unused: backup generate key +WARNING: translation string unused: backup import dat file +WARNING: translation string unused: backup import key +WARNING: translation string unused: backup key +WARNING: translation string unused: backup key file +WARNING: translation string unused: backup key info +WARNING: translation string unused: backup media info +WARNING: translation string unused: backup missing key +WARNING: translation string unused: backup password +WARNING: translation string unused: backup protect key password +WARNING: translation string unused: backup sets +WARNING: translation string unused: backup to floppy +WARNING: translation string unused: bad characters in +WARNING: translation string unused: behind a proxy +WARNING: translation string unused: bewan adsl pci st +WARNING: translation string unused: bewan adsl usb +WARNING: translation string unused: bitrate +WARNING: translation string unused: bleeding rules +WARNING: translation string unused: blue access use hint +WARNING: translation string unused: blue interface +WARNING: translation string unused: cache management +WARNING: translation string unused: cache size +WARNING: translation string unused: calamaris report interval (in minutes) +WARNING: translation string unused: calc traffic all x minutes +WARNING: translation string unused: cant enable xtaccess +WARNING: translation string unused: capsinactive +WARNING: translation string unused: ccd err iroute +WARNING: translation string unused: ccd err netadr +WARNING: translation string unused: cfg restart +WARNING: translation string unused: check for net traffic update +WARNING: translation string unused: choose config +WARNING: translation string unused: choose media +WARNING: translation string unused: clear cache +WARNING: translation string unused: compression +WARNING: translation string unused: connect +WARNING: translation string unused: connect the modem +WARNING: translation string unused: core notice 1 +WARNING: translation string unused: core notice 2 +WARNING: translation string unused: core notice 3 +WARNING: translation string unused: could not connect to +WARNING: translation string unused: could not connect to www ipcop org +WARNING: translation string unused: could not connect to www ipfire org +WARNING: translation string unused: could not create directory +WARNING: translation string unused: could not download latest patch list +WARNING: translation string unused: could not download the available updates list +WARNING: translation string unused: could not open available updates file +WARNING: translation string unused: could not open installed updates file +WARNING: translation string unused: could not open update information file +WARNING: translation string unused: create +WARNING: translation string unused: create new backup +WARNING: translation string unused: current dynamic leases +WARNING: translation string unused: current media +WARNING: translation string unused: current ovpn +WARNING: translation string unused: current profile +WARNING: translation string unused: custom networks +WARNING: translation string unused: custom services +WARNING: translation string unused: daily firewallhits +WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph +WARNING: translation string unused: dbfile +WARNING: translation string unused: ddns help dnsmadeeasy +WARNING: translation string unused: ddns help freedns +WARNING: translation string unused: ddns help plus +WARNING: translation string unused: ddns minimize updates +WARNING: translation string unused: ddns noip prefix +WARNING: translation string unused: debugme +WARNING: translation string unused: deep scan directories +WARNING: translation string unused: default ip +WARNING: translation string unused: default networks +WARNING: translation string unused: default services +WARNING: translation string unused: description +WARNING: translation string unused: destination ip bad +WARNING: translation string unused: destination ip or net +WARNING: translation string unused: destination net +WARNING: translation string unused: destination port overlaps +WARNING: translation string unused: dh name is invalid +WARNING: translation string unused: dhcp base ip fixed lease +WARNING: translation string unused: dhcp create fixed leases +WARNING: translation string unused: dhcp fixed lease err1 +WARNING: translation string unused: dhcp fixed lease help1 +WARNING: translation string unused: dhcp mode +WARNING: translation string unused: dhcp server disabled on blue interface +WARNING: translation string unused: dhcp server enabled on blue interface +WARNING: translation string unused: dial user password +WARNING: translation string unused: dial user password has been changed +WARNING: translation string unused: dialup settings +WARNING: translation string unused: disconnect +WARNING: translation string unused: disconnects +WARNING: translation string unused: display traffic at home +WARNING: translation string unused: display webinterface effects +WARNING: translation string unused: dmz pinhole configuration +WARNING: translation string unused: dmz pinhole rule added +WARNING: translation string unused: dmz pinhole rule removed +WARNING: translation string unused: dmzpinholes for same net not necessary +WARNING: translation string unused: dns server +WARNING: translation string unused: do not log this port list +WARNING: translation string unused: domain not set +WARNING: translation string unused: donation-link +WARNING: translation string unused: done +WARNING: translation string unused: download dh parameter +WARNING: translation string unused: driver +WARNING: translation string unused: dstprt range overlaps +WARNING: translation string unused: dstprt within existing +WARNING: translation string unused: dynamic dns client +WARNING: translation string unused: eciadsl help +WARNING: translation string unused: eciadsl upload +WARNING: translation string unused: edit a rule +WARNING: translation string unused: edit network +WARNING: translation string unused: edit service +WARNING: translation string unused: editor +WARNING: translation string unused: eg +WARNING: translation string unused: email server can not be empty +WARNING: translation string unused: enable javascript +WARNING: translation string unused: enable wildcards +WARNING: translation string unused: enabled on +WARNING: translation string unused: enabledtitle +WARNING: translation string unused: encrypted +WARNING: translation string unused: err bk 1 +WARNING: translation string unused: err bk 10 password +WARNING: translation string unused: err bk 2 key +WARNING: translation string unused: err bk 3 tar +WARNING: translation string unused: err bk 4 gz +WARNING: translation string unused: err bk 5 encrypt +WARNING: translation string unused: err rs 1 +WARNING: translation string unused: err rs 6 decrypt +WARNING: translation string unused: err rs 7 untartst +WARNING: translation string unused: err rs 8 untar +WARNING: translation string unused: error config +WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife +WARNING: translation string unused: expected +WARNING: translation string unused: expertoptions +WARNING: translation string unused: exportkey +WARNING: translation string unused: external access +WARNING: translation string unused: external access configuration +WARNING: translation string unused: external access rule added +WARNING: translation string unused: external access rule changed +WARNING: translation string unused: external access rule removed +WARNING: translation string unused: extrahd +WARNING: translation string unused: extrahd unable to read +WARNING: translation string unused: extrahd unable to write +WARNING: translation string unused: filename +WARNING: translation string unused: firewall graphs +WARNING: translation string unused: firewall log viewer +WARNING: translation string unused: firmware +WARNING: translation string unused: firmware upload +WARNING: translation string unused: force update +WARNING: translation string unused: forward firewall +WARNING: translation string unused: forwarding rule added +WARNING: translation string unused: forwarding rule removed +WARNING: translation string unused: forwarding rule updated +WARNING: translation string unused: frequency +WARNING: translation string unused: fritzdsl help +WARNING: translation string unused: fritzdsl upload +WARNING: translation string unused: from email adr +WARNING: translation string unused: from email pw +WARNING: translation string unused: from email server +WARNING: translation string unused: from email user +WARNING: translation string unused: from warn email bad +WARNING: translation string unused: fwdfw MODE1 +WARNING: translation string unused: fwdfw MODE2 +WARNING: translation string unused: fwdfw addrule +WARNING: translation string unused: fwdfw err nosrcip +WARNING: translation string unused: fwdfw err notgtip +WARNING: translation string unused: fwdfw err prot_port1 +WARNING: translation string unused: fwdfw final_rule +WARNING: translation string unused: fwdfw from +WARNING: translation string unused: fwdfw ipsec network +WARNING: translation string unused: fwdfw man port +WARNING: translation string unused: fwdfw menu +WARNING: translation string unused: fwdfw natport used +WARNING: translation string unused: fwdfw p2p txt +WARNING: translation string unused: fwdfw rule action +WARNING: translation string unused: fwdfw rules +WARNING: translation string unused: fwdfw std network +WARNING: translation string unused: fwdfw till +WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw xt access +WARNING: translation string unused: fwhost Custom Host +WARNING: translation string unused: fwhost Custom Network +WARNING: translation string unused: fwhost IpSec Host +WARNING: translation string unused: fwhost IpSec Network +WARNING: translation string unused: fwhost OpenVPN static host +WARNING: translation string unused: fwhost OpenVPN static network +WARNING: translation string unused: fwhost Standard Network +WARNING: translation string unused: fwhost attention +WARNING: translation string unused: fwhost blue +WARNING: translation string unused: fwhost changeremark +WARNING: translation string unused: fwhost err addrgrp +WARNING: translation string unused: fwhost err hostorip +WARNING: translation string unused: fwhost err mac +WARNING: translation string unused: fwhost err partofnet +WARNING: translation string unused: fwhost green +WARNING: translation string unused: fwhost hosts +WARNING: translation string unused: fwhost ipadr +WARNING: translation string unused: fwhost ipsec host +WARNING: translation string unused: fwhost orange +WARNING: translation string unused: fwhost reread +WARNING: translation string unused: fwhost reset +WARNING: translation string unused: fwhost wo subnet +WARNING: translation string unused: g.dtm +WARNING: translation string unused: g.lite +WARNING: translation string unused: gen static key +WARNING: translation string unused: generate +WARNING: translation string unused: genkey +WARNING: translation string unused: green interface +WARNING: translation string unused: gz with key +WARNING: translation string unused: hint +WARNING: translation string unused: host +WARNING: translation string unused: host configuration +WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph +WARNING: translation string unused: hours2 +WARNING: translation string unused: ibod for dual isdn only +WARNING: translation string unused: icmp selected but no type +WARNING: translation string unused: icmp type +WARNING: translation string unused: id +WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours +WARNING: translation string unused: import +WARNING: translation string unused: importkey +WARNING: translation string unused: in +WARNING: translation string unused: incorrect password +WARNING: translation string unused: insert floppy +WARNING: translation string unused: insert removable device +WARNING: translation string unused: install new update +WARNING: translation string unused: installed +WARNING: translation string unused: installed updates +WARNING: translation string unused: intrusion detection system log viewer +WARNING: translation string unused: intrusion detection system2 +WARNING: translation string unused: invalid cache size +WARNING: translation string unused: invalid date entered +WARNING: translation string unused: invalid downlink speed +WARNING: translation string unused: invalid loaded file +WARNING: translation string unused: invalid md5sum +WARNING: translation string unused: invalid port list +WARNING: translation string unused: invalid time entered +WARNING: translation string unused: invalid uplink speed +WARNING: translation string unused: invalid upstream proxy username or password setting +WARNING: translation string unused: invert +WARNING: translation string unused: ip address in use +WARNING: translation string unused: ipfire side +WARNING: translation string unused: ipsec no connections +WARNING: translation string unused: iptable rules +WARNING: translation string unused: isdn +WARNING: translation string unused: isdn settings +WARNING: translation string unused: isdn1 +WARNING: translation string unused: isdn2 +WARNING: translation string unused: javascript menu error1 +WARNING: translation string unused: javascript menu error2 +WARNING: translation string unused: kernel version +WARNING: translation string unused: key stuff +WARNING: translation string unused: lateprompting +WARNING: translation string unused: length +WARNING: translation string unused: line +WARNING: translation string unused: loaded modules +WARNING: translation string unused: local hard disk +WARNING: translation string unused: localkeyfile +WARNING: translation string unused: log enabled +WARNING: translation string unused: log viewer +WARNING: translation string unused: logging +WARNING: translation string unused: loosedirectorychecking +WARNING: translation string unused: ls_dhcpd +WARNING: translation string unused: ls_disk space +WARNING: translation string unused: ls_free/swan +WARNING: translation string unused: ls_httpd +WARNING: translation string unused: ls_init +WARNING: translation string unused: ls_kernel +WARNING: translation string unused: ls_modprobe +WARNING: translation string unused: ls_pam_unix +WARNING: translation string unused: ls_sshd +WARNING: translation string unused: ls_syslogd +WARNING: translation string unused: mac address error not 00 +WARNING: translation string unused: manage ovpn +WARNING: translation string unused: manual control and status +WARNING: translation string unused: marked +WARNING: translation string unused: max incoming size +WARNING: translation string unused: max outgoing size +WARNING: translation string unused: max size +WARNING: translation string unused: mbmon fan in +WARNING: translation string unused: mbmon graphs +WARNING: translation string unused: mbmon temp in +WARNING: translation string unused: mbmon value +WARNING: translation string unused: min size +WARNING: translation string unused: missing dat +WARNING: translation string unused: missing gz +WARNING: translation string unused: mode +WARNING: translation string unused: modem on com1 +WARNING: translation string unused: modem on com2 +WARNING: translation string unused: modem on com3 +WARNING: translation string unused: modem on com4 +WARNING: translation string unused: modem on com5 +WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph +WARNING: translation string unused: monthly firewallhits +WARNING: translation string unused: monthly start day bad +WARNING: translation string unused: monthly traffic bad +WARNING: translation string unused: monthly volume +WARNING: translation string unused: monthly volume start day +WARNING: translation string unused: monthly volume start day short +WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS +WARNING: translation string unused: nat-traversal +WARNING: translation string unused: net +WARNING: translation string unused: net address +WARNING: translation string unused: net config type +WARNING: translation string unused: net config type help +WARNING: translation string unused: net-traffic configuration +WARNING: translation string unused: network added +WARNING: translation string unused: network configuration +WARNING: translation string unused: network removed +WARNING: translation string unused: network status information +WARNING: translation string unused: network time +WARNING: translation string unused: network traffic graphs +WARNING: translation string unused: network updated +WARNING: translation string unused: networks settings +WARNING: translation string unused: never +WARNING: translation string unused: new optionsfw must boot +WARNING: translation string unused: no alcatelusb firmware +WARNING: translation string unused: no cfg upload +WARNING: translation string unused: no eciadsl synch.bin file +WARNING: translation string unused: no fritzdsl driver +WARNING: translation string unused: no information available +WARNING: translation string unused: no modem selected +WARNING: translation string unused: no set selected +WARNING: translation string unused: nonetworkname +WARNING: translation string unused: noservicename +WARNING: translation string unused: notes +WARNING: translation string unused: o-no +WARNING: translation string unused: o-yes +WARNING: translation string unused: online help en +WARNING: translation string unused: only red +WARNING: translation string unused: open to all +WARNING: translation string unused: openvpn disabled +WARNING: translation string unused: openvpn enabled +WARNING: translation string unused: optional data +WARNING: translation string unused: optionsfw portlist hint +WARNING: translation string unused: optionsfw warning +WARNING: translation string unused: or +WARNING: translation string unused: original +WARNING: translation string unused: our donors +WARNING: translation string unused: out +WARNING: translation string unused: outgoing firewall +WARNING: translation string unused: outgoing firewall add ip group +WARNING: translation string unused: outgoing firewall add mac group +WARNING: translation string unused: outgoing firewall edit ip group +WARNING: translation string unused: outgoing firewall edit mac group +WARNING: translation string unused: outgoing firewall group error +WARNING: translation string unused: outgoing firewall groups +WARNING: translation string unused: outgoing firewall ip groups +WARNING: translation string unused: outgoing firewall mac groups +WARNING: translation string unused: outgoing firewall mode0 +WARNING: translation string unused: outgoing firewall mode1 +WARNING: translation string unused: outgoing firewall mode2 +WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname +WARNING: translation string unused: outgoing firewall p2p description 1 +WARNING: translation string unused: outgoing firewall p2p description 2 +WARNING: translation string unused: outgoing firewall p2p description 3 +WARNING: translation string unused: outgoing firewall reset +WARNING: translation string unused: outgoing firewall view group +WARNING: translation string unused: outgoing firewall warning +WARNING: translation string unused: override mtu +WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn dl +WARNING: translation string unused: ovpn engines +WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn reneg sec +WARNING: translation string unused: ovpn_fastio +WARNING: translation string unused: ovpn_mssfix +WARNING: translation string unused: ovpn_mtudisc +WARNING: translation string unused: ovpn_processprio +WARNING: translation string unused: ovpn_processprioD +WARNING: translation string unused: ovpn_processprioED +WARNING: translation string unused: ovpn_processprioEH +WARNING: translation string unused: ovpn_processprioEN +WARNING: translation string unused: ovpn_processprioH +WARNING: translation string unused: ovpn_processprioLN +WARNING: translation string unused: ovpn_processprioN +WARNING: translation string unused: ovpn_processprioVD +WARNING: translation string unused: ovpn_processprioVH +WARNING: translation string unused: ovpnstatus log +WARNING: translation string unused: ovpnsys log +WARNING: translation string unused: package failed to install +WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire updates +WARNING: translation string unused: password contains illegal characters +WARNING: translation string unused: password crypting key +WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group +WARNING: translation string unused: phonebook entry +WARNING: translation string unused: ping disabled +WARNING: translation string unused: polfile +WARNING: translation string unused: port forwarding configuration +WARNING: translation string unused: ports +WARNING: translation string unused: pots +WARNING: translation string unused: pppoe +WARNING: translation string unused: present +WARNING: translation string unused: profiles +WARNING: translation string unused: proxy +WARNING: translation string unused: proxy access graphs +WARNING: translation string unused: proxy no proxy extend +WARNING: translation string unused: proxy no proxy local +WARNING: translation string unused: proxy port +WARNING: translation string unused: psk +WARNING: translation string unused: quick control +WARNING: translation string unused: reboot ask +WARNING: translation string unused: reboot question +WARNING: translation string unused: reboot schedule +WARNING: translation string unused: reboot sure +WARNING: translation string unused: refresh update list +WARNING: translation string unused: released +WARNING: translation string unused: removable device advice +WARNING: translation string unused: reportfile +WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port +WARNING: translation string unused: restore hardware settings +WARNING: translation string unused: root +WARNING: translation string unused: root path +WARNING: translation string unused: root user password +WARNING: translation string unused: route subnet is invalid +WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap +WARNING: translation string unused: rules already up to date +WARNING: translation string unused: safe removal of umounted device +WARNING: translation string unused: save error +WARNING: translation string unused: select dest net +WARNING: translation string unused: select media +WARNING: translation string unused: select source net +WARNING: translation string unused: selecttraffic +WARNING: translation string unused: send email notification +WARNING: translation string unused: send test mail +WARNING: translation string unused: server reserved +WARNING: translation string unused: service added +WARNING: translation string unused: service removed +WARNING: translation string unused: service updated +WARNING: translation string unused: servicename +WARNING: translation string unused: services settings +WARNING: translation string unused: shaping add options +WARNING: translation string unused: shaping list options +WARNING: translation string unused: show areas +WARNING: translation string unused: show lines +WARNING: translation string unused: shutdown ask +WARNING: translation string unused: shutdown sure +WARNING: translation string unused: shutdown2 +WARNING: translation string unused: sitekeyfile +WARNING: translation string unused: smbreload +WARNING: translation string unused: source ip bad +WARNING: translation string unused: source ip in use +WARNING: translation string unused: source ip or net +WARNING: translation string unused: source net +WARNING: translation string unused: source network +WARNING: translation string unused: source port in use +WARNING: translation string unused: source port overlaps +WARNING: translation string unused: squid extension methods +WARNING: translation string unused: squid extension methods invalid +WARNING: translation string unused: squid fix cache +WARNING: translation string unused: srcprt range overlaps +WARNING: translation string unused: srcprt within existing +WARNING: translation string unused: ssdmz pinholes +WARNING: translation string unused: ssh access tip +WARNING: translation string unused: ssh1 disabled +WARNING: translation string unused: ssh1 enabled +WARNING: translation string unused: ssh1 support +WARNING: translation string unused: ssnetwork status +WARNING: translation string unused: sspasswords +WARNING: translation string unused: ssport forwarding +WARNING: translation string unused: ssproxy graphs +WARNING: translation string unused: sssystem status +WARNING: translation string unused: sstraffic graphs +WARNING: translation string unused: subject test +WARNING: translation string unused: subject warn +WARNING: translation string unused: subnet +WARNING: translation string unused: subnet is invalid +WARNING: translation string unused: successfully refreshed updates list +WARNING: translation string unused: system graphs +WARNING: translation string unused: system log viewer +WARNING: translation string unused: system status information +WARNING: translation string unused: teovpn_fragment +WARNING: translation string unused: test +WARNING: translation string unused: test email could not be sent +WARNING: translation string unused: test email was sent +WARNING: translation string unused: the following update was successfully installed +WARNING: translation string unused: there are updates +WARNING: translation string unused: there are updates available +WARNING: translation string unused: this feature has been sponsored by +WARNING: translation string unused: this is not a valid archive +WARNING: translation string unused: this is not an authorised update +WARNING: translation string unused: this months volume +WARNING: translation string unused: this update is already installed +WARNING: translation string unused: this weeks volume +WARNING: translation string unused: time date manually reset +WARNING: translation string unused: to email adr +WARNING: translation string unused: to install an update +WARNING: translation string unused: to warn email bad +WARNING: translation string unused: too long 80 char max +WARNING: translation string unused: tor 0 = disabled +WARNING: translation string unused: tor accounting period daily +WARNING: translation string unused: tor accounting period monthly +WARNING: translation string unused: tor accounting period weekly +WARNING: translation string unused: tor bridge enabled +WARNING: translation string unused: tor errmsg invalid node id +WARNING: translation string unused: tor exit country +WARNING: translation string unused: total connection time +WARNING: translation string unused: traffic back +WARNING: translation string unused: traffic calc time +WARNING: translation string unused: traffic calc time bad +WARNING: translation string unused: traffic info messages +WARNING: translation string unused: traffic monitor +WARNING: translation string unused: traffic shaping +WARNING: translation string unused: traffic shaping settings +WARNING: translation string unused: traffic warn level bad +WARNING: translation string unused: trafficblue +WARNING: translation string unused: trafficdate +WARNING: translation string unused: trafficfrom +WARNING: translation string unused: trafficgreen +WARNING: translation string unused: trafficin +WARNING: translation string unused: trafficorange +WARNING: translation string unused: trafficout +WARNING: translation string unused: trafficred +WARNING: translation string unused: trafficsum +WARNING: translation string unused: trafficto +WARNING: translation string unused: transfer limits +WARNING: translation string unused: transparent on +WARNING: translation string unused: umount +WARNING: translation string unused: umount removable media before to unplug +WARNING: translation string unused: unencrypted +WARNING: translation string unused: update transcript +WARNING: translation string unused: updates +WARNING: translation string unused: updates is old1 +WARNING: translation string unused: updates is old2 +WARNING: translation string unused: updxlrtr children +WARNING: translation string unused: updxlrtr invalid num of children +WARNING: translation string unused: updxlrtr sources +WARNING: translation string unused: updxlrtr standard view +WARNING: translation string unused: updxlrtr unknown +WARNING: translation string unused: updxlrtr update information +WARNING: translation string unused: updxlrtr update notification +WARNING: translation string unused: updxlrtr used by +WARNING: translation string unused: upload fcdsl.o +WARNING: translation string unused: upload file +WARNING: translation string unused: upload static key +WARNING: translation string unused: upload successful +WARNING: translation string unused: upload synch.bin +WARNING: translation string unused: upload update file +WARNING: translation string unused: upstream password +WARNING: translation string unused: upstream proxy host:port +WARNING: translation string unused: upstream username +WARNING: translation string unused: uptime +WARNING: translation string unused: uptime and users +WARNING: translation string unused: urlfilter background image +WARNING: translation string unused: urlfilter background text +WARNING: translation string unused: urlfilter enable jpeg +WARNING: translation string unused: urlfilter update information +WARNING: translation string unused: urlfilter update notification +WARNING: translation string unused: urlfilter update results +WARNING: translation string unused: urlfilter upload background +WARNING: translation string unused: use +WARNING: translation string unused: use dov +WARNING: translation string unused: use ibod +WARNING: translation string unused: view log +WARNING: translation string unused: vpn aggrmode +WARNING: translation string unused: vpn configuration main +WARNING: translation string unused: vpn incompatible use of defaultroute +WARNING: translation string unused: vpn mtu invalid +WARNING: translation string unused: vpn on blue +WARNING: translation string unused: vpn on green +WARNING: translation string unused: vpn on orange +WARNING: translation string unused: vpn watch +WARNING: translation string unused: warn when traffic reaches +WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph +WARNING: translation string unused: weekly firewallhits +WARNING: translation string unused: wildcards +WARNING: translation string unused: wlanap wlan services +WARNING: translation string unused: xtaccess all error +WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph +WARNING: translation string unused: yearly firewallhits +WARNING: untranslated string: MTU settings +WARNING: untranslated string: Number of Countries for the pie chart +WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: administrator password +WARNING: untranslated string: administrator username +WARNING: untranslated string: advproxy AUTH method ntlm auth +WARNING: untranslated string: advproxy basic authentication +WARNING: untranslated string: advproxy group access control +WARNING: untranslated string: advproxy group required +WARNING: untranslated string: bytes +WARNING: untranslated string: check all +WARNING: untranslated string: fwdfw err concon +WARNING: untranslated string: fwdfw err ratecon +WARNING: untranslated string: fwdfw limitconcon +WARNING: untranslated string: fwdfw maxconcon +WARNING: untranslated string: fwdfw numcon +WARNING: untranslated string: fwdfw ratelimit +WARNING: untranslated string: fwhost addgeoipgrp +WARNING: untranslated string: fwhost cust geoipgroup +WARNING: untranslated string: fwhost cust geoipgrp +WARNING: untranslated string: fwhost cust geoiplocation +WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: fwhost newgeoipgrp +WARNING: untranslated string: geoip +WARNING: untranslated string: geoipblock +WARNING: untranslated string: geoipblock block countries +WARNING: untranslated string: geoipblock configuration +WARNING: untranslated string: geoipblock country is allowed +WARNING: untranslated string: geoipblock country is blocked +WARNING: untranslated string: geoipblock enable feature +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours +WARNING: untranslated string: incoming compression in bytes per second +WARNING: untranslated string: incoming overhead in bytes per second +WARNING: untranslated string: invalid input for valid till days +WARNING: untranslated string: masquerade blue +WARNING: untranslated string: masquerade green +WARNING: untranslated string: masquerade orange +WARNING: untranslated string: masquerading +WARNING: untranslated string: masquerading disabled +WARNING: untranslated string: masquerading enabled +WARNING: untranslated string: messages +WARNING: untranslated string: no data +WARNING: untranslated string: outgoing compression in bytes per second +WARNING: untranslated string: outgoing overhead in bytes per second +WARNING: untranslated string: ovpn add conf +WARNING: untranslated string: route config changed +WARNING: untranslated string: routing config added +WARNING: untranslated string: routing config changed +WARNING: untranslated string: routing table +WARNING: untranslated string: samba join a domain +WARNING: untranslated string: samba join domain +WARNING: untranslated string: uncheck all +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 859cc1fd16..602441d0b7 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -299,6 +299,7 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -670,6 +671,7 @@ WARNING: untranslated string: advproxy group required WARNING: untranslated string: atm device WARNING: untranslated string: bytes WARNING: untranslated string: capabilities +WARNING: untranslated string: check all WARNING: untranslated string: default WARNING: untranslated string: dh WARNING: untranslated string: dh key move failed @@ -690,9 +692,22 @@ WARNING: untranslated string: fwdfw limitconcon WARNING: untranslated string: fwdfw maxconcon WARNING: untranslated string: fwdfw numcon WARNING: untranslated string: fwdfw ratelimit +WARNING: untranslated string: fwhost addgeoipgrp +WARNING: untranslated string: fwhost cust geoipgroup +WARNING: untranslated string: fwhost cust geoipgrp +WARNING: untranslated string: fwhost cust geoiplocation WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: fwhost newgeoipgrp WARNING: untranslated string: gen dh WARNING: untranslated string: generate dh key +WARNING: untranslated string: geoip +WARNING: untranslated string: geoipblock +WARNING: untranslated string: geoipblock block countries +WARNING: untranslated string: geoipblock configuration +WARNING: untranslated string: geoipblock country is allowed +WARNING: untranslated string: geoipblock country is blocked +WARNING: untranslated string: geoipblock enable feature +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: imei WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second @@ -745,5 +760,9 @@ WARNING: untranslated string: show tls-auth key WARNING: untranslated string: software version WARNING: untranslated string: source ip country WARNING: untranslated string: ta key +WARNING: untranslated string: uncheck all WARNING: untranslated string: upload dh key WARNING: untranslated string: vendor +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.pl b/doc/language_issues.pl index c93d40cb4f..086dfbdc94 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -233,6 +233,9 @@ WARNING: translation string unused: g.lite WARNING: translation string unused: gen static key WARNING: translation string unused: generate WARNING: translation string unused: genkey +WARNING: translation string unused: geoipblock country code +WARNING: translation string unused: geoipblock country name +WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key WARNING: translation string unused: hint @@ -250,6 +253,7 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -649,6 +653,7 @@ WARNING: untranslated string: ccd none WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used +WARNING: untranslated string: check all WARNING: untranslated string: count WARNING: untranslated string: countries WARNING: untranslated string: country codes and flags @@ -793,6 +798,7 @@ WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed WARNING: untranslated string: fwhost OpenVPN N-2-N +WARNING: untranslated string: fwhost addgeoipgrp WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@ -805,6 +811,9 @@ WARNING: untranslated string: fwhost ccdhost WARNING: untranslated string: fwhost ccdnet WARNING: untranslated string: fwhost change WARNING: untranslated string: fwhost cust addr +WARNING: untranslated string: fwhost cust geoipgroup +WARNING: untranslated string: fwhost cust geoipgrp +WARNING: untranslated string: fwhost cust geoiplocation WARNING: untranslated string: fwhost cust grp WARNING: untranslated string: fwhost cust net WARNING: untranslated string: fwhost cust service @@ -844,6 +853,7 @@ WARNING: untranslated string: fwhost ip_mac WARNING: untranslated string: fwhost ipsec net WARNING: untranslated string: fwhost menu WARNING: untranslated string: fwhost netaddress +WARNING: untranslated string: fwhost newgeoipgrp WARNING: untranslated string: fwhost newgrp WARNING: untranslated string: fwhost newhost WARNING: untranslated string: fwhost newnet @@ -862,6 +872,7 @@ WARNING: untranslated string: gen dh WARNING: untranslated string: generate dh key WARNING: untranslated string: grouptype WARNING: untranslated string: hardware support +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: imei WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second @@ -1023,6 +1034,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uncheck all WARNING: untranslated string: uplink WARNING: untranslated string: upload dh key WARNING: untranslated string: uptime load average @@ -1030,6 +1042,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 17e3199b11..94724d4c29 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -245,6 +245,7 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -652,6 +653,7 @@ WARNING: untranslated string: ccd none WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used +WARNING: untranslated string: check all WARNING: untranslated string: community rules WARNING: untranslated string: count WARNING: untranslated string: countries @@ -788,6 +790,7 @@ WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed WARNING: untranslated string: fwhost OpenVPN N-2-N +WARNING: untranslated string: fwhost addgeoipgrp WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@ -800,6 +803,9 @@ WARNING: untranslated string: fwhost ccdhost WARNING: untranslated string: fwhost ccdnet WARNING: untranslated string: fwhost change WARNING: untranslated string: fwhost cust addr +WARNING: untranslated string: fwhost cust geoipgroup +WARNING: untranslated string: fwhost cust geoipgrp +WARNING: untranslated string: fwhost cust geoiplocation WARNING: untranslated string: fwhost cust grp WARNING: untranslated string: fwhost cust net WARNING: untranslated string: fwhost cust service @@ -839,6 +845,7 @@ WARNING: untranslated string: fwhost ip_mac WARNING: untranslated string: fwhost ipsec net WARNING: untranslated string: fwhost menu WARNING: untranslated string: fwhost netaddress +WARNING: untranslated string: fwhost newgeoipgrp WARNING: untranslated string: fwhost newgrp WARNING: untranslated string: fwhost newhost WARNING: untranslated string: fwhost newnet @@ -855,8 +862,16 @@ WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome WARNING: untranslated string: gen dh WARNING: untranslated string: generate dh key +WARNING: untranslated string: geoip +WARNING: untranslated string: geoipblock +WARNING: untranslated string: geoipblock block countries +WARNING: untranslated string: geoipblock configuration +WARNING: untranslated string: geoipblock country is allowed +WARNING: untranslated string: geoipblock country is blocked +WARNING: untranslated string: geoipblock enable feature WARNING: untranslated string: grouptype WARNING: untranslated string: hardware support +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: imei WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second @@ -1012,6 +1027,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uncheck all WARNING: untranslated string: uplink WARNING: untranslated string: upload dh key WARNING: untranslated string: uptime load average @@ -1019,6 +1035,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 0ebd3988f9..6f846c738c 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -300,6 +300,7 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime +WARNING: translation string unused: ike lifetime should be between 1 and 24 hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -663,7 +664,21 @@ WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes +WARNING: untranslated string: check all +WARNING: untranslated string: fwhost addgeoipgrp +WARNING: untranslated string: fwhost cust geoipgroup +WARNING: untranslated string: fwhost cust geoipgrp +WARNING: untranslated string: fwhost cust geoiplocation WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: fwhost newgeoipgrp +WARNING: untranslated string: geoip +WARNING: untranslated string: geoipblock +WARNING: untranslated string: geoipblock block countries +WARNING: untranslated string: geoipblock configuration +WARNING: untranslated string: geoipblock country is allowed +WARNING: untranslated string: geoipblock country is blocked +WARNING: untranslated string: geoipblock enable feature +WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming overhead in bytes per second WARNING: untranslated string: invalid input for valid till days @@ -675,3 +690,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: uncheck all +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_missings b/doc/language_missings index 05798b9114..9fdc0d2761 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -29,6 +29,7 @@ < atm device < attention < bit +< block < capabilities < ccd add < ccd choose net @@ -70,6 +71,7 @@ < ccd routes < ccd subnet < ccd used +< check all < ConnSched dial < ConnSched hangup < ConnSched reboot @@ -233,6 +235,7 @@ < fwdfw wd_tue < fwdfw wd_wed < fwdfw xt access +< fwhost addgeoipgrp < fwhost addgrp < fwhost addgrpname < fwhost addhost @@ -248,6 +251,9 @@ < fwhost change < fwhost changeremark < fwhost cust addr +< fwhost cust geoip +< fwhost cust geoipgroup +< fwhost cust geoiplocation < fwhost cust grp < fwhost cust net < fwhost Custom Host @@ -298,6 +304,7 @@ < fwhost IpSec Network < fwhost menu < fwhost netaddress +< fwhost newgeoipgrp < fwhost newgrp < fwhost newhost < fwhost newnet @@ -327,6 +334,16 @@ < fw settings ruletable < gen dh < generate dh key +< geoip +< geoipblock +< geoipblock block countries +< geoipblock configuration +< geoipblock country code +< geoipblock country is allowed +< geoipblock country is blocked +< geoipblock country name +< geoipblock enable feature +< geoipblock flag < grouptype < hardware support < imei @@ -496,6 +513,9 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< unblock +< unblock all +< uncheck all < updxlrtr sources < updxlrtr standard view < uplink @@ -509,6 +529,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap access point < wlanap channel < wlanap country @@ -587,6 +609,7 @@ < atm device < attention < bit +< block < capabilities < ccd add < ccd choose net @@ -628,6 +651,7 @@ < ccd routes < ccd subnet < ccd used +< check all < ConnSched dial < ConnSched hangup < ConnSched reboot @@ -790,6 +814,7 @@ < fwdfw wd_tue < fwdfw wd_wed < fwdfw xt access +< fwhost addgeoipgrp < fwhost addgrp < fwhost addgrpname < fwhost addhost @@ -805,6 +830,9 @@ < fwhost change < fwhost changeremark < fwhost cust addr +< fwhost cust geoip +< fwhost cust geoipgroup +< fwhost cust geoiplocation < fwhost cust grp < fwhost cust net < fwhost Custom Host @@ -855,6 +883,7 @@ < fwhost IpSec Network < fwhost menu < fwhost netaddress +< fwhost newgeoipgrp < fwhost newgrp < fwhost newhost < fwhost newnet @@ -1069,6 +1098,9 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< unblock +< unblock all +< uncheck all < updxlrtr sources < updxlrtr standard view < uplink @@ -1079,6 +1111,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap country < wlan client < wlan client advanced settings @@ -1136,6 +1170,7 @@ < atm device < attention < bit +< block < capabilities < ccd add < ccd choose net @@ -1177,6 +1212,7 @@ < ccd routes < ccd subnet < ccd used +< check all < ConnSched dial < ConnSched hangup < ConnSched reboot @@ -1331,6 +1367,7 @@ < fwdfw wd_tue < fwdfw wd_wed < fwdfw xt access +< fwhost addgeoipgrp < fwhost addgrp < fwhost addgrpname < fwhost addhost @@ -1346,6 +1383,9 @@ < fwhost change < fwhost changeremark < fwhost cust addr +< fwhost cust geoip +< fwhost cust geoipgroup +< fwhost cust geoiplocation < fwhost cust grp < fwhost cust net < fwhost Custom Host @@ -1396,6 +1436,7 @@ < fwhost IpSec Network < fwhost menu < fwhost netaddress +< fwhost newgeoipgrp < fwhost newgrp < fwhost newhost < fwhost newnet @@ -1425,6 +1466,16 @@ < fw settings ruletable < gen dh < generate dh key +< geoip +< geoipblock +< geoipblock block countries +< geoipblock configuration +< geoipblock country code +< geoipblock country is allowed +< geoipblock country is blocked +< geoipblock country name +< geoipblock enable feature +< geoipblock flag < grouptype < hardware support < imei @@ -1594,6 +1645,9 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< unblock +< unblock all +< uncheck all < updxlrtr sources < updxlrtr standard view < uplink @@ -1604,6 +1658,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap country < wlan client < wlan client advanced settings @@ -1662,6 +1718,7 @@ < atm device < attention < bit +< block < capabilities < ccd add < ccd choose net @@ -1703,6 +1760,7 @@ < ccd routes < ccd subnet < ccd used +< check all < ConnSched dial < ConnSched hangup < ConnSched reboot @@ -1861,6 +1919,7 @@ < fwdfw wd_tue < fwdfw wd_wed < fwdfw xt access +< fwhost addgeoipgrp < fwhost addgrp < fwhost addgrpname < fwhost addhost @@ -1876,6 +1935,9 @@ < fwhost change < fwhost changeremark < fwhost cust addr +< fwhost cust geoip +< fwhost cust geoipgroup +< fwhost cust geoiplocation < fwhost cust grp < fwhost cust net < fwhost Custom Host @@ -1926,6 +1988,7 @@ < fwhost IpSec Network < fwhost menu < fwhost netaddress +< fwhost newgeoipgrp < fwhost newgrp < fwhost newhost < fwhost newnet @@ -1955,6 +2018,16 @@ < fw settings ruletable < gen dh < generate dh key +< geoip +< geoipblock +< geoipblock block countries +< geoipblock configuration +< geoipblock country code +< geoipblock country is allowed +< geoipblock country is blocked +< geoipblock country name +< geoipblock enable feature +< geoipblock flag < grouptype < hardware support < hour-graph @@ -2124,6 +2197,9 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< unblock +< unblock all +< uncheck all < updxlrtr sources < updxlrtr standard view < uplink @@ -2134,6 +2210,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < week-graph < wlanap country < wlan client diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index f1ed2125a2..5c17d33e27 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -520,7 +520,8 @@ foreach my $line (@conntrack) { } my $sip_colour = ipcolour($sip); - my $dip_colour = ipcolour($dip); + # use colour of destination network for DNAT + my $dip_colour = $dip ne $dip_ret ? ipcolour($dip_ret) : ipcolour($dip); my $sserv = ''; if ($sport < 1024) { diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index 76035fb46d..60c2e5869e 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -21,7 +21,7 @@ use strict; -use Locale::Country; +use Locale::Codes::Country; my $flagdir = '/srv/web/ipfire/html/images/flags'; my $lines = '1'; @@ -31,6 +31,7 @@ my @flaglistfiles=(); my $flag = ''; require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/geoip-functions.pl"; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; @@ -64,12 +65,16 @@ foreach $flag (@flaglistfiles) my $flagcode = uc(substr($flag, 0, 2)); my $fcode = lc($flagcode); + + # Get flag icon for of the country. + my $flag_icon = &GeoIP::get_flag_icon($fcode); + my $country = Locale::Country::code2country($fcode); if($fcode eq 'eu') { $country = 'Europe'; } if($fcode eq 'tp') { $country = 'East Timor'; } if($fcode eq 'yu') { $country = 'Yugoslavia'; } if ($lines % 2) { - print "$flagcode"; + print "$flagcode"; print "$flagcode"; print "$country\n"; } @@ -81,7 +86,7 @@ foreach $flag (@flaglistfiles) $col="style='background-color:${Header::table1colour};'"; } print ""; - print "$flagcode"; + print "$flagcode"; print "$flagcode"; print "$country"; print " "; diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index ea30319362..73a41d903f 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -44,10 +44,8 @@ my $settingsfile = "${General::swroot}/ddns/settings"; # Config file to store the configured ddns providers. my $datafile = "${General::swroot}/ddns/config"; -# Dynamic ddns programm call. -my @ddnsprog = ("/usr/bin/ddns", "--config", - "/var/ipfire/ddns/ddns.conf", - "update-all"); +# Call the ddnsctrl helper binary to perform the update. +my @ddnsprog = ("/usr/local/bin/ddnsctrl", "update-all"); my %settings=(); my $errormessage = ''; @@ -667,7 +665,8 @@ sub GenerateDDNSConfigFile { my $use_token = 0; # Handle token based auth for various providers. - if ($provider ~~ ["dns.lightningwirelabs.com", "entrydns.net", "regfish.com", "spdns.de"] && $username eq "token") { + if ($provider ~~ ["dns.lightningwirelabs.com", "entrydns.net", "regfish.com", + "spdns.de", "zzzz.io"] && $username eq "token") { $use_token = 1; # Handle token auth for freedns.afraid.org and regfish.com. @@ -699,11 +698,6 @@ sub GenerateDDNSConfigFile { print FILE "password = $password\n"; } - # These providers need to be set to only use IPv4. - if ($provider ~~ ["freedns.afraid.org", "nsupdate.info", "opendns.com", "variomedia.de", "zoneedit.com"]) { - print FILE "proto = ipv4\n"; - } - print FILE "\n"; } diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index d2227a421e..c207ec7487 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -33,6 +33,7 @@ no warnings 'uninitialized'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +require "${General::swroot}/geoip-functions.pl"; require "/usr/lib/firewall/firewall-lib.pl"; unless (-d "${General::swroot}/firewall") { system("mkdir ${General::swroot}/firewall"); } @@ -47,6 +48,7 @@ my %defaultNetworks=(); my %netsettings=(); my %customhost=(); my %customgrp=(); +my %customgeoipgrp=(); my %customnetworks=(); my %customservice=(); my %customservicegrp=(); @@ -66,6 +68,7 @@ my %ipsecsettings=(); my %aliases=(); my %optionsfw=(); my %ifaces=(); +my %rulehash=(); my @PROTOCOLS = ("TCP", "UDP", "ICMP", "IGMP", "AH", "ESP", "GRE","IPv6","IPIP"); @@ -73,6 +76,7 @@ my $color; my $confignet = "${General::swroot}/fwhosts/customnetworks"; my $confighost = "${General::swroot}/fwhosts/customhosts"; my $configgrp = "${General::swroot}/fwhosts/customgroups"; +my $configgeoipgrp = "${General::swroot}/fwhosts/customgeoipgrp"; my $configsrv = "${General::swroot}/fwhosts/customservices"; my $configsrvgrp = "${General::swroot}/fwhosts/customservicegrp"; my $configccdnet = "${General::swroot}/ovpn/ccd.conf"; @@ -153,6 +157,19 @@ print<"; - } - if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){ - $errormessage=''; - } - if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){ - $fwdfwsettings{'nosave'} = 'on'; - } - } - } - } - #check Rulepos on new Rule - if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){ - $fwdfwsettings{'oldrulenumber'}=$maxkey; - foreach my $key (sort keys %configinputfw){ - if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}" - eq "$configinputfw{$key}[0],$configinputfw{$key}[2],$configinputfw{$key}[3],$configinputfw{$key}[4],$configinputfw{$key}[5],$configinputfw{$key}[6],$configinputfw{$key}[7],$configinputfw{$key}[8],$configinputfw{$key}[9],$configinputfw{$key}[10],$configinputfw{$key}[11],$configinputfw{$key}[12],$configinputfw{$key}[13],$configinputfw{$key}[14],$configinputfw{$key}[15],$configinputfw{$key}[17],$configinputfw{$key}[18],$configinputfw{$key}[19],$configinputfw{$key}[20],$configinputfw{$key}[21],$configinputfw{$key}[22],$configinputfw{$key}[23],$configinputfw{$key}[24],$configinputfw{$key}[25],$configinputfw{$key}[26],$configinputfw{$key}[27],$configinputfw{$key}[28],$configinputfw{$key}[29],$configinputfw{$key}[30],$configinputfw{$key}[31],$configinputfw{$key}[32],$configinputfw{$key}[33],$configinputfw{$key}[34],$configinputfw{$key}[35],$configinputfw{$key}[36]"){ - $errormessage.=$Lang::tr{'fwdfw err ruleexists'}; - } - } - } - #check if we just close a rule - if( $fwdfwsettings{'oldgrp1a'} eq $fwdfwsettings{'grp1'} && $fwdfwsettings{'oldgrp1b'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'oldgrp2a'} eq $fwdfwsettings{'grp2'} && $fwdfwsettings{'oldgrp2b'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'oldgrp3a'} eq $fwdfwsettings{'grp3'} && $fwdfwsettings{'oldgrp3b'} eq $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'oldruletype'} eq $fwdfwsettings{'chain'} ) { - if($fwdfwsettings{'nosave'} eq 'on' && $fwdfwsettings{'updatefwrule'} eq 'on'){ - $errormessage=''; - $fwdfwsettings{'nosave2'} = 'on'; - } - } - if (!$errormessage){ - if($fwdfwsettings{'nosave2'} ne 'on'){ - &saverule(\%configinputfw,$configinput); - } - } - }elsif($fwdfwsettings{'grp1'} eq 'ipfire_src' ){ + $maxkey=&General::findhasharraykey(\%configinputfw); + %rulehash=%configinputfw; + }elsif ($fwdfwsettings{'grp1'} eq 'ipfire_src' ){ # OUTGOING PART $fwdfwsettings{'config'}=$configoutgoing; $fwdfwsettings{'chain'} = 'OUTGOINGFW'; - my $maxkey=&General::findhasharraykey(\%configoutgoingfw); - if($fwdfwsettings{'oldrulenumber'} eq $fwdfwsettings{'rulepos'}){ - foreach my $key (sort keys %configoutgoingfw){ - if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}" - eq "$configoutgoingfw{$key}[0],$configoutgoingfw{$key}[2],$configoutgoingfw{$key}[3],$configoutgoingfw{$key}[4],$configoutgoingfw{$key}[5],$configoutgoingfw{$key}[6],$configoutgoingfw{$key}[7],$configoutgoingfw{$key}[8],$configoutgoingfw{$key}[9],$configoutgoingfw{$key}[10],$configoutgoingfw{$key}[11],$configoutgoingfw{$key}[12],$configoutgoingfw{$key}[13],$configoutgoingfw{$key}[14],$configoutgoingfw{$key}[15],$configoutgoingfw{$key}[17],$configoutgoingfw{$key}[18],$configoutgoingfw{$key}[19],$configoutgoingfw{$key}[20],$configoutgoingfw{$key}[21],$configoutgoingfw{$key}[22],$configoutgoingfw{$key}[23],$configoutgoingfw{$key}[24],$configoutgoingfw{$key}[25],$configoutgoingfw{$key}[26],$configoutgoingfw{$key}[27],$configoutgoingfw{$key}[28],$configoutgoingfw{$key}[29],$configoutgoingfw{$key}[30],$configoutgoingfw{$key}[31],$configoutgoingfw{$key}[32],$configoutgoingfw{$key}[33],$configoutgoingfw{$key}[34],$configoutgoingfw{$key}[35],$configoutgoingfw{$key}[36]"){ - $errormessage.=$Lang::tr{'fwdfw err ruleexists'}; - if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){ - $errormessage=$Lang::tr{'fwdfw err remark'}."
"; - } - if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){ - $errormessage=''; - } - if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){ - $fwdfwsettings{'nosave'} = 'on'; - } - } - } - } - #check Rulepos on new Rule - if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){ - $fwdfwsettings{'oldrulenumber'}=$maxkey; - foreach my $key (sort keys %configoutgoingfw){ - if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}" - eq "$configoutgoingfw{$key}[0],$configoutgoingfw{$key}[2],$configoutgoingfw{$key}[3],$configoutgoingfw{$key}[4],$configoutgoingfw{$key}[5],$configoutgoingfw{$key}[6],$configoutgoingfw{$key}[7],$configoutgoingfw{$key}[8],$configoutgoingfw{$key}[9],$configoutgoingfw{$key}[10],$configoutgoingfw{$key}[11],$configoutgoingfw{$key}[12],$configoutgoingfw{$key}[13],$configoutgoingfw{$key}[14],$configoutgoingfw{$key}[15],$configoutgoingfw{$key}[17],$configoutgoingfw{$key}[18],$configoutgoingfw{$key}[19],$configoutgoingfw{$key}[20],$configoutgoingfw{$key}[21],$configoutgoingfw{$key}[22],$configoutgoingfw{$key}[23],$configoutgoingfw{$key}[24],$configoutgoingfw{$key}[25],$configoutgoingfw{$key}[26],$configoutgoingfw{$key}[27],$configoutgoingfw{$key}[28],$configoutgoingfw{$key}[29],$configoutgoingfw{$key}[30],$configoutgoingfw{$key}[31],$configoutgoingfw{$key}[32],$configoutgoingfw{$key}[33],$configoutgoingfw{$key}[34],$configoutgoingfw{$key}[35],$configoutgoingfw{$key}[36]"){ - $errormessage.=$Lang::tr{'fwdfw err ruleexists'}; - } - } - } - #check if we just close a rule - if( $fwdfwsettings{'oldgrp1a'} eq $fwdfwsettings{'grp1'} && $fwdfwsettings{'oldgrp1b'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'oldgrp2a'} eq $fwdfwsettings{'grp2'} && $fwdfwsettings{'oldgrp2b'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'oldgrp3a'} eq $fwdfwsettings{'grp3'} && $fwdfwsettings{'oldgrp3b'} eq $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'oldruletype'} eq $fwdfwsettings{'chain'} ) { - if($fwdfwsettings{'nosave'} eq 'on' && $fwdfwsettings{'updatefwrule'} eq 'on'){ - $fwdfwsettings{'nosave2'} = 'on'; - $errormessage=''; - } - } - #increase counters - if (!$errormessage){ - if ($fwdfwsettings{'nosave2'} ne 'on'){ - &saverule(\%configoutgoingfw,$configoutgoing); - } - } - }else{ - #FORWARD PART + $maxkey=&General::findhasharraykey(\%configoutgoingfw); + %rulehash=%configoutgoingfw; + }else { + # FORWARD PART $fwdfwsettings{'config'}=$configfwdfw; $fwdfwsettings{'chain'} = 'FORWARDFW'; - my $maxkey=&General::findhasharraykey(\%configfwdfw); - if($fwdfwsettings{'oldrulenumber'} eq $fwdfwsettings{'rulepos'}){ - #check if we have an identical rule already - foreach my $key (sort keys %configfwdfw){ - if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}" - eq "$configfwdfw{$key}[0],$configfwdfw{$key}[2],$configfwdfw{$key}[3],$configfwdfw{$key}[4],$configfwdfw{$key}[5],$configfwdfw{$key}[6],$configfwdfw{$key}[7],$configfwdfw{$key}[8],$configfwdfw{$key}[9],$configfwdfw{$key}[10],$configfwdfw{$key}[11],$configfwdfw{$key}[12],$configfwdfw{$key}[13],$configfwdfw{$key}[14],$configfwdfw{$key}[15],$configfwdfw{$key}[18],$configfwdfw{$key}[19],$configfwdfw{$key}[20],$configfwdfw{$key}[21],$configfwdfw{$key}[22],$configfwdfw{$key}[23],$configfwdfw{$key}[24],$configfwdfw{$key}[25],$configfwdfw{$key}[26],$configfwdfw{$key}[27],$configfwdfw{$key}[28],$configfwdfw{$key}[29],$configfwdfw{$key}[30],$configfwdfw{$key}[31],$configfwdfw{$key}[32],$configfwdfw{$key}[33],$configfwdfw{$key}[34],$configfwdfw{$key}[35],$configfwdfw{$key}[36]"){ - $errormessage.=$Lang::tr{'fwdfw err ruleexists'}; - if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){ - $errormessage=$Lang::tr{'fwdfw err remark'}."
"; - } - if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){ - $errormessage=''; - } - if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){ - $fwdfwsettings{'nosave'} = 'on'; - } - } + $maxkey=&General::findhasharraykey(\%configfwdfw); + %rulehash=%configfwdfw; + } + #check if we have an identical rule already + if($fwdfwsettings{'oldrulenumber'} eq $fwdfwsettings{'rulepos'}){ + foreach my $key (sort keys %rulehash){ + if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'ruleremark'},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}" + eq "$rulehash{$key}[0],$rulehash{$key}[2],$rulehash{$key}[3],$rulehash{$key}[4],$rulehash{$key}[5],$rulehash{$key}[6],$rulehash{$key}[7],$rulehash{$key}[8],$rulehash{$key}[9],$rulehash{$key}[10],$rulehash{$key}[11],$rulehash{$key}[12],$rulehash{$key}[13],$rulehash{$key}[14],$rulehash{$key}[15],$rulehash{$key}[16],$rulehash{$key}[17],$rulehash{$key}[18],$rulehash{$key}[19],$rulehash{$key}[20],$rulehash{$key}[21],$rulehash{$key}[22],$rulehash{$key}[23],$rulehash{$key}[24],$rulehash{$key}[25],$rulehash{$key}[26],$rulehash{$key}[27],$rulehash{$key}[28],$rulehash{$key}[29],$rulehash{$key}[30],$rulehash{$key}[31],$rulehash{$key}[32],$rulehash{$key}[33],$rulehash{$key}[34],$rulehash{$key}[35],$rulehash{$key}[36]"){ + $errormessage.=$Lang::tr{'fwdfw err ruleexists'}; + if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){ + $errormessage=$Lang::tr{'fwdfw err remark'}."
"; + } + if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){ + $errormessage=''; + } + if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){ + $fwdfwsettings{'nosave'} = 'on'; + } } } - #check Rulepos on new Rule - if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){ - $fwdfwsettings{'oldrulenumber'}=$maxkey; - foreach my $key (sort keys %configfwdfw){ - if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}" - eq "$configfwdfw{$key}[0],$configfwdfw{$key}[2],$configfwdfw{$key}[3],$configfwdfw{$key}[4],$configfwdfw{$key}[5],$configfwdfw{$key}[6],$configfwdfw{$key}[7],$configfwdfw{$key}[8],$configfwdfw{$key}[9],$configfwdfw{$key}[10],$configfwdfw{$key}[11],$configfwdfw{$key}[12],$configfwdfw{$key}[13],$configfwdfw{$key}[14],$configfwdfw{$key}[15],$configfwdfw{$key}[18],$configfwdfw{$key}[19],$configfwdfw{$key}[20],$configfwdfw{$key}[21],$configfwdfw{$key}[22],$configfwdfw{$key}[23],$configfwdfw{$key}[24],$configfwdfw{$key}[25],$configfwdfw{$key}[26],$configfwdfw{$key}[27],$configfwdfw{$key}[28],$configfwdfw{$key}[29],$configfwdfw{$key}[30],$configfwdfw{$key}[31],$configfwdfw{$key}[32],$configfwdfw{$key}[33],$configfwdfw{$key}[34],$configfwdfw{$key}[35],$configfwdfw{$key}[36]"){ - $errormessage.=$Lang::tr{'fwdfw err ruleexists'}; - } + } + #check Rulepos on new Rule + if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){ + $fwdfwsettings{'oldrulenumber'}=$maxkey; + foreach my $key (sort keys %rulehash){ + if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}" + eq "$rulehash{$key}[0],$rulehash{$key}[2],$rulehash{$key}[3],$rulehash{$key}[4],$rulehash{$key}[5],$rulehash{$key}[6],$rulehash{$key}[7],$rulehash{$key}[8],$rulehash{$key}[9],$rulehash{$key}[10],$rulehash{$key}[11],$rulehash{$key}[12],$rulehash{$key}[13],$rulehash{$key}[14],$rulehash{$key}[15],$rulehash{$key}[18],$rulehash{$key}[19],$rulehash{$key}[20],$rulehash{$key}[21],$rulehash{$key}[22],$rulehash{$key}[23],$rulehash{$key}[24],$rulehash{$key}[25],$rulehash{$key}[26],$rulehash{$key}[27],$rulehash{$key}[28],$rulehash{$key}[29],$rulehash{$key}[30],$rulehash{$key}[31],$rulehash{$key}[32],$rulehash{$key}[33],$rulehash{$key}[34],$rulehash{$key}[35],$rulehash{$key}[36]"){ + $errormessage.=$Lang::tr{'fwdfw err ruleexists'}; } } - #check if we just close a rule - if( $fwdfwsettings{'oldgrp1a'} eq $fwdfwsettings{'grp1'} && $fwdfwsettings{'oldgrp1b'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'oldgrp2a'} eq $fwdfwsettings{'grp2'} && $fwdfwsettings{'oldgrp2b'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'oldgrp3a'} eq $fwdfwsettings{'grp3'} && $fwdfwsettings{'oldgrp3b'} eq $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'oldruletype'} eq $fwdfwsettings{'chain'}){ - if($fwdfwsettings{'nosave'} eq 'on' && $fwdfwsettings{'updatefwrule'} eq 'on'){ - $fwdfwsettings{'nosave2'} = 'on'; - $errormessage=''; - } + } + #check if we just close a rule + if( $fwdfwsettings{'oldgrp1a'} eq $fwdfwsettings{'grp1'} && $fwdfwsettings{'oldgrp1b'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'oldgrp2a'} eq $fwdfwsettings{'grp2'} && $fwdfwsettings{'oldgrp2b'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'oldgrp3a'} eq $fwdfwsettings{'grp3'} && $fwdfwsettings{'oldgrp3b'} eq $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'oldruletype'} eq $fwdfwsettings{'chain'}){ + if($fwdfwsettings{'nosave'} eq 'on' && $fwdfwsettings{'updatefwrule'} eq 'on'){ + $fwdfwsettings{'nosave2'} = 'on'; + $errormessage=''; } - #check max concurrent connections per ip address - if ($fwdfwsettings{'LIMIT_CON_CON'} eq 'ON'){ - if (!($fwdfwsettings{'concon'} =~ /^(\d+)$/)) { - $errormessage.=$Lang::tr{'fwdfw err concon'}; - } - }else{ - $fwdfwsettings{'concon'}=''; + } + #check max concurrent connections per ip address + if ($fwdfwsettings{'LIMIT_CON_CON'} eq 'ON'){ + if (!($fwdfwsettings{'concon'} =~ /^(\d+)$/)) { + $errormessage.=$Lang::tr{'fwdfw err concon'}; } - #check ratelimit value - if ($fwdfwsettings{'RATE_LIMIT'} eq 'ON'){ - if (!($fwdfwsettings{'ratecon'} =~ /^(\d+)$/)) { - $errormessage.=$Lang::tr{'fwdfw err ratecon'}; - } - }else{ - $fwdfwsettings{'ratecon'}=''; + }else{ + $fwdfwsettings{'concon'}=''; + } + #check ratelimit value + if ($fwdfwsettings{'RATE_LIMIT'} eq 'ON'){ + if (!($fwdfwsettings{'ratecon'} =~ /^(\d+)$/)) { + $errormessage.=$Lang::tr{'fwdfw err ratecon'}; } - #increase counters - if (!$errormessage){ - if ($fwdfwsettings{'nosave2'} ne 'on'){ - &saverule(\%configfwdfw,$configfwdfw); - } + }else{ + $fwdfwsettings{'ratecon'}=''; + } + #increase counters + if (!$errormessage){ + if ($fwdfwsettings{'nosave2'} ne 'on'){ + &saverule(\%rulehash,$fwdfwsettings{'config'}); } } if ($errormessage){ @@ -1135,6 +1076,54 @@ END } print""; } + # geoip locations / groups. + my @geoip_locations = &fwlib::get_geoip_locations(); + + print "\n"; + print "\n"; + print "$Lang::tr{'geoip'}\n"; + print "\n"; + #End left table. start right table (vpn) print""; # CCD networks @@ -1472,6 +1461,7 @@ sub newrule &General::readhasharray("$confighost", \%customhost); &General::readhasharray("$configccdhost", \%ccdhost); &General::readhasharray("$configgrp", \%customgrp); + &General::readhasharray("$configgeoipgrp", \%customgeoipgrp); &General::readhasharray("$configipsec", \%ipsecconf); &General::get_aliases(\%aliases); my %checked=(); @@ -1666,7 +1656,7 @@ END $Lang::tr{'fwdfw use nat'}
-
+
+ - +
@@ -1678,9 +1668,9 @@ END END print <$Lang::tr{'dnat address'}:$Lang::tr{'dnat address'}: - END @@ -1711,9 +1701,9 @@ END $Lang::tr{'fwdfw snat'} $Lang::tr{'snat new source ip address'}:$Lang::tr{'snat new source ip address'}: - END foreach my $alias (sort keys %aliases) { @@ -2600,6 +2590,13 @@ END }else{ print $$hash{$key}[4]; } + }elsif ($$hash{$key}[3] eq 'cust_geoip_src') { + my ($split1,$split2) = split(":", $$hash{$key}[4]); + if ($split2) { + print "$split2\n"; + }else{ + print "$Lang::tr{'geoip'}: $$hash{$key}[4]\n"; + } }elsif ($$hash{$key}[4] eq 'RED1'){ print "$ipfireiface $Lang::tr{'fwdfw red'}"; }elsif ($$hash{$key}[4] eq 'ALL'){ @@ -2676,6 +2673,13 @@ END }else{ print $$hash{$key}[6]; } + }elsif ($$hash{$key}[5] eq 'cust_geoip_tgt') { + my ($split1,$split2) = split(":", $$hash{$key}[6]); + if ($split2) { + print "$split2\n"; + }else{ + print "$Lang::tr{'geoip'}: $$hash{$key}[6]\n"; + } }elsif ($$hash{$key}[5] eq 'tgt_addr'){ my ($split1,$split2) = split("/",$$hash{$key}[6]); if ($split2 eq '32'){ @@ -2693,7 +2697,6 @@ END #RULE ACTIVE if($$hash{$key}[2] eq 'ON'){ $gif="/images/on.gif" - }else{ $gif="/images/off.gif" } diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index c3642f0f0e..994a50a104 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -27,6 +27,8 @@ use Sort::Naturally; use CGI::Carp 'fatalsToBrowser'; no warnings 'uninitialized'; require '/var/ipfire/general-functions.pl'; +require "/var/ipfire/geoip-functions.pl"; +require "/usr/lib/firewall/firewall-lib.pl"; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; @@ -36,6 +38,7 @@ my %customhost=(); my %customgrp=(); my %customservice=(); my %customservicegrp=(); +my %customgeoipgrp=(); my %ccdnet=(); my %ccdhost=(); my %ipsecconf=(); @@ -62,6 +65,7 @@ my $configccdhost = "${General::swroot}/ovpn/ovpnconfig"; my $configipsec = "${General::swroot}/vpn/config"; my $configsrv = "${General::swroot}/fwhosts/customservices"; my $configsrvgrp = "${General::swroot}/fwhosts/customservicegrp"; +my $configgeoipgrp = "${General::swroot}/fwhosts/customgeoipgrp"; my $fwconfigfwd = "${General::swroot}/firewall/config"; my $fwconfiginp = "${General::swroot}/firewall/input"; my $fwconfigout = "${General::swroot}/firewall/outgoing"; @@ -73,6 +77,7 @@ unless (-e $confighost) { system("touch $confighost"); } unless (-e $configgrp) { system("touch $configgrp"); } unless (-e $configsrv) { system("touch $configsrv"); } unless (-e $configsrvgrp) { system("touch $configsrvgrp"); } +unless (-e $configgeoipgrp) { system("touch $configgeoipgrp"); } &General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); @@ -671,6 +676,87 @@ if ($fwhostsettings{'ACTION'} eq 'savegrp') &addgrp; &viewtablegrp; } +if ($fwhostsettings{'ACTION'} eq 'savegeoipgrp') +{ + my $grp=$fwhostsettings{'grp_name'}; + my $rem=$fwhostsettings{'remark'}; + my $count; + my $type; + my @target; + my @newgrp; + &General::readhasharray("$configgeoipgrp", \%customgeoipgrp); + &General::readhasharray("$fwconfigfwd", \%fwfwd); + &General::readhasharray("$fwconfiginp", \%fwinp); + &General::readhasharray("$fwconfigout", \%fwout); + + # Check for existing group name. + if (!&checkgroup($grp) && $fwhostsettings{'update'} ne 'on'){ + $errormessage = $Lang::tr{'fwhost err grpexist'}; + } + + # Check remark. + if ($rem ne '' && !&validremark($rem) && $fwhostsettings{'update'} ne 'on'){ + $errormessage = $Lang::tr{'fwhost err remark'}; + } + + if ($fwhostsettings{'update'} eq 'on'){ + @target=$fwhostsettings{'COUNTRY_CODE'}; + $type='GeoIP Group'; + + #check if host/net exists in grp + my $test="$grp,$fwhostsettings{'oldremark'},@target"; + foreach my $key (keys %customgeoipgrp) { + my $test1="$customgeoipgrp{$key}[0],$customgeoipgrp{$key}[1],$customgeoipgrp{$key}[2]"; + if ($test1 eq $test){ + $errormessage=$Lang::tr{'fwhost err isingrp'}; + $fwhostsettings{'update'} = 'on'; + } + } + } + + if (!$errormessage){ + #on first save, we have an empty @target, so fill it with nothing + my $targetvalues=@target; + if ($targetvalues == '0'){ + @target="none"; + } + #on update, we have to delete the dummy entry + foreach my $key (keys %customgeoipgrp){ + if ($customgeoipgrp{$key}[0] eq $grp && $customgeoipgrp{$key}[2] eq "none"){ + delete $customgeoipgrp{$key}; + last; + } + } + &General::writehasharray("$configgeoipgrp", \%customgeoipgrp); + &General::readhasharray("$configgeoipgrp", \%customgeoipgrp); + #create array with new lines + foreach my $line (@target){ + push (@newgrp,"$grp,$rem,$line"); + } + #append new entries + my $key = &General::findhasharraykey (\%customgeoipgrp); + foreach my $line (@newgrp){ + foreach my $i (0 .. 3) { $customgeoipgrp{$key}[$i] = "";} + my ($a,$b,$c,$d) = split (",",$line); + $customgeoipgrp{$key}[0] = $a; + $customgeoipgrp{$key}[1] = $b; + $customgeoipgrp{$key}[2] = $c; + $customgeoipgrp{$key}[3] = $type; + } + &General::writehasharray("$configgeoipgrp", \%customgeoipgrp); + #update counter in Host/Net + $fwhostsettings{'update'}='on'; + } + #check if ruleupdate is needed + my $geoipgrpcount=0; + $geoipgrpcount=&getgeoipcount($grp); + if($geoipgrpcount > 0 ) + { + &General::firewall_config_changed(); + } + &addgeoipgrp; + &viewtablegeoipgrp; +} if ($fwhostsettings{'ACTION'} eq 'saveservice') { my $ICMP; @@ -728,10 +814,10 @@ if ($fwhostsettings{'ACTION'} eq 'saveservicegrp') } } } - if ($tcpcounter > 15){ + if ($tcpcounter > 14){ $errormessage=$Lang::tr{'fwhost err maxservicetcp'}; } - if ($udpcounter > 15){ + if ($udpcounter > 14){ $errormessage=$Lang::tr{'fwhost err maxserviceudp'}; } $tcpcounter=0; @@ -798,6 +884,12 @@ if ($fwhostsettings{'ACTION'} eq 'editgrp') &addgrp; &viewtablegrp; } +if ($fwhostsettings{'ACTION'} eq 'editgeoipgrp') +{ + $fwhostsettings{'update'}='on'; + &addgeoipgrp; + &viewtablegeoipgrp; +} if ($fwhostsettings{'ACTION'} eq 'editservice') { $fwhostsettings{'updatesrv'}='on'; @@ -830,6 +922,12 @@ if ($fwhostsettings{'ACTION'} eq 'resetgrp') $fwhostsettings{'remark'} =""; &showmenu; } +if ($fwhostsettings{'ACTION'} eq 'resetgeoipgrp') +{ + $fwhostsettings{'grp_name'} =""; + $fwhostsettings{'remark'} =""; + &showmenu; +} # delete if ($fwhostsettings{'ACTION'} eq 'delnet') { @@ -887,6 +985,37 @@ if ($fwhostsettings{'ACTION'} eq 'deletegrphost') &addgrp; &viewtablegrp; } +if ($fwhostsettings{'ACTION'} eq 'deletegeoipgrpentry') +{ + my $grpremark; + my $grpname; + &General::readhasharray("$configgeoipgrp", \%customgeoipgrp); + foreach my $key (keys %customgeoipgrp){ + if($customgeoipgrp{$key}[0].",".$customgeoipgrp{$key}[1].",".$customgeoipgrp{$key}[2].",".$customgeoipgrp{$key}[3] eq $fwhostsettings{'delentry'}){ + $grpname=$customgeoipgrp{$key}[0]; + $grpremark=$customgeoipgrp{$key}[1]; + #check if we delete the last entry, then generate dummy + if ($fwhostsettings{'last'} eq 'on'){ + $customgeoipgrp{$key}[1] = ''; + $customgeoipgrp{$key}[2] = 'none'; + $customgeoipgrp{$key}[3] = ''; + $fwhostsettings{'last'}=''; + last; + }else{ + delete $customgeoipgrp{$key}; + } + } + } + &General::writehasharray("$configgeoipgrp", \%customgeoipgrp); + &General::firewall_config_changed(); + if ($fwhostsettings{'update'} eq 'on'){ + $fwhostsettings{'remark'}= $grpremark; + $fwhostsettings{'grp_name'}=$grpname; + } + &addgeoipgrp; + &viewtablegeoipgrp; +} + if ($fwhostsettings{'ACTION'} eq 'delgrp') { &General::readhasharray("$configgrp", \%customgrp); @@ -903,6 +1032,22 @@ if ($fwhostsettings{'ACTION'} eq 'delgrp') &addgrp; &viewtablegrp; } +if ($fwhostsettings{'ACTION'} eq 'delgeoipgrp') +{ + &General::readhasharray("$configgeoipgrp", \%customgeoipgrp); + &decrease($fwhostsettings{'grp_name'}); + foreach my $key (sort keys %customgeoipgrp) + { + if($customgeoipgrp{$key}[0] eq $fwhostsettings{'grp_name'}) + { + delete $customgeoipgrp{$key}; + } + } + &General::writehasharray("$configgeoipgrp", \%customgeoipgrp); + $fwhostsettings{'grp_name'}=''; + &addgeoipgrp; + &viewtablegeoipgrp; +} if ($fwhostsettings{'ACTION'} eq 'delservice') { &General::readhasharray("$configsrv", \%customservice); @@ -977,6 +1122,11 @@ if ($fwhostsettings{'ACTION'} eq $Lang::tr{'fwhost newgrp'}) &addgrp; &viewtablegrp; } +if ($fwhostsettings{'ACTION'} eq $Lang::tr{'fwhost newgeoipgrp'}) +{ + &addgeoipgrp; + &viewtablegeoipgrp; +} if ($fwhostsettings{'ACTION'} eq $Lang::tr{'fwhost newservice'}) { &addservice; @@ -1011,6 +1161,31 @@ if ($fwhostsettings{'ACTION'} eq 'changegrpremark') &addgrp; &viewtablegrp; } +if ($fwhostsettings{'ACTION'} eq 'changegeoipgrpremark') +{ + &General::readhasharray("$configgeoipgrp", \%customgeoipgrp); + if ($fwhostsettings{'oldrem'} ne $fwhostsettings{'newrem'} && (&validremark($fwhostsettings{'newrem'}) || $fwhostsettings{'newrem'} eq '')){ + foreach my $key (sort keys %customgeoipgrp) + { + if($customgeoipgrp{$key}[0] eq $fwhostsettings{'grp'} && $customgeoipgrp{$key}[1] eq $fwhostsettings{'oldrem'}) + { + $customgeoipgrp{$key}[1]=''; + $customgeoipgrp{$key}[1]=$fwhostsettings{'newrem'}; + } + } + &General::writehasharray("$configgeoipgrp", \%customgeoipgrp); + $fwhostsettings{'update'}='on'; + $fwhostsettings{'remark'}=$fwhostsettings{'newrem'}; + }else{ + $errormessage=$Lang::tr{'fwhost err remark'}; + $fwhostsettings{'remark'}=$fwhostsettings{'oldrem'}; + $fwhostsettings{'grp_name'}=$fwhostsettings{'grp'}; + $fwhostsettings{'update'} = 'on'; + } + $fwhostsettings{'grp_name'}=$fwhostsettings{'grp'}; + &addgeoipgrp; + &viewtablegeoipgrp; +} if ($fwhostsettings{'ACTION'} eq 'changesrvgrpremark') { &General::readhasharray("$configsrvgrp", \%customservicegrp ); @@ -1085,6 +1260,29 @@ if ($fwhostsettings{'ACTION'} eq 'changegrpname') &addgrp; &viewtablegrp; } +if ($fwhostsettings{'ACTION'} eq 'changegeoipgrpname') +{ + &General::readhasharray("$configgeoipgrp", \%customgeoipgrp ); + if ($fwhostsettings{'oldgrpname'} ne $fwhostsettings{'grp'}){ + #Check new groupname + if (!&validhostname($fwhostsettings{'grp'})){ + $errormessage.=$Lang::tr{'fwhost err name'}."
"; + } + if (!$errormessage){ + # Rename group. + foreach my $key (keys %customgeoipgrp) { + if($customgeoipgrp{$key}[0] eq $fwhostsettings{'oldgrpname'}){ + $customgeoipgrp{$key}[0]=$fwhostsettings{'grp'}; + } + } + &General::writehasharray("$configgeoipgrp", \%customgeoipgrp ); + #change name in FW Rules + &changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},6); + } + } + &addgeoipgrp; + &viewtablegeoipgrp; +} ### VIEW ### if($fwhostsettings{'ACTION'} eq '') { @@ -1096,7 +1294,7 @@ sub showmenu { print "$Lang::tr{'fwhost welcome'}"; print<
- +
END @@ -1381,6 +1579,113 @@ END print"
"; &Header::closebox(); } +sub addgeoipgrp +{ + &hint; + &error; + &showmenu; + &Header::openbox('100%', 'left', $Lang::tr{'fwhost addgeoipgrp'}); + + my %checked=(); + my $show=''; + $checked{'check1'}{'off'} = ''; + $checked{'check1'}{'on'} = ''; + $checked{'grp2'}{$fwhostsettings{'grp2'}} = 'CHECKED'; + $fwhostsettings{'oldremark'}=$fwhostsettings{'remark'}; + $fwhostsettings{'oldgrpname'}=$fwhostsettings{'grp_name'}; + my $grp=$fwhostsettings{'grp_name'}; + my $rem=$fwhostsettings{'remark'}; + if ($fwhostsettings{'update'} eq ''){ + print< + + $Lang::tr{'fwhost addgrpname'} +
+ + + $Lang::tr{'remark'}: + + + +
+ + +END + } else { + print< + + $Lang::tr{'fwhost addgrpname'} + + + + + + + + +
+ $Lang::tr{'remark'}: + + + + + + + + + +
+ +

+END + } + if ($fwhostsettings{'update'} eq 'on') { + my @geoip_locations = &fwlib::get_geoip_locations(); + + print< + + + + + + + +
+
+

+END + } + print < + + + + + + + +
+ + + + +
+ +END + &Header::closebox(); +} sub addservice { &error; @@ -1838,6 +2143,195 @@ sub viewtablegrp &Header::closebox(); } +} +sub viewtablegeoipgrp +{ + # If our filesize is "zero" there is nothing to read-in. + if (-z "$configgeoipgrp") { + return; + } + + &Header::openbox('100%', 'left', $Lang::tr{'fwhost cust geoipgrp'}); + &General::readhasharray("$configgeoipgrp", \%customgeoipgrp); + &General::readhasharray("$fwconfigfwd", \%fwfwd); + &General::readhasharray("$fwconfiginp", \%fwinp); + &General::readhasharray("$fwconfigout", \%fwout); + my @grp=(); + my $helper=''; + my $count=1; + my $country_code; + my $grpname; + my $remark; + my $number; + my $delflag; + my @counter; + my %hash; + + # If there are no groups we are finished here. + if (!keys %customgeoipgrp) { + print "
$Lang::tr{'fwhost err emptytable'}"; + return; + } + + # Put all groups in a hash. + foreach my $key (sort { ncmp($customgeoipgrp{$a}[0],$customgeoipgrp{$b}[0]) } + sort { ncmp($customgeoipgrp{$a}[2],$customgeoipgrp{$b}[2]) } keys %customgeoipgrp) { + push (@counter,$customgeoipgrp{$key}[0]); + } + + # Increase current used key. + foreach my $key1 (@counter) { + $hash{$key1}++ ; + } + + # Sort hash. + foreach my $key (sort { ncmp($customgeoipgrp{$a}[0],$customgeoipgrp{$b}[0]) } + sort { ncmp($customgeoipgrp{$a}[2],$customgeoipgrp{$b}[2]) } keys %customgeoipgrp) { + $count++; + if ($helper ne $customgeoipgrp{$key}[0]) { + $delflag='0'; + + foreach my $key1 (sort { ncmp($customgeoipgrp{$a}[0],$customgeoipgrp{$b}[0]) } + sort { ncmp($customgeoipgrp{$a}[2],$customgeoipgrp{$b}[2]) } keys %customgeoipgrp) { + + if ($customgeoipgrp{$key}[0] eq $customgeoipgrp{$key1}[0]) + { + $delflag++; + } + if($delflag > 1){ + last; + } + } + + $number=1; + + # Groupname. + $grpname=$customgeoipgrp{$key}[0]; + + # Group remark. + $remark="$customgeoipgrp{$key}[1]"; + + # Country code. + $country_code="$customgeoipgrp{$key}[2]"; + + if ($count gt 1){ + print""; + $count=1; + } + + # Display groups header. + print "
$grpname   \n"; + print "$Lang::tr{'remark'}:  $remark  \n" if ($remark ne ''); + + # Get group count. + my $geoipgrpcount=&getgeoipcount($grpname); + print "$Lang::tr{'used'}: $geoipgrpcount x"; + + # Only display delete icon, if the group is not used by a firewall rule. + if($geoipgrpcount == '0') { + print"
\n"; + print"\n"; + print"\n"; + print"\n"; + print"
"; + } + + # Icon for group editing. +print < + + + + + + + +END + # Display headlines if the group contains any entries. + if ($country_code ne "none") { +print < + + + + + + + + +END + } + } + + # Check if our group contains any entries. + if ($country_code eq "none") { + print "\n"; + } else { + # Check if we are currently editing a group and assign column backgound colors. + my $col=''; + if ( ($fwhostsettings{'ACTION'} eq 'editgeoipgrp' || $fwhostsettings{'update'} ne '') + && $fwhostsettings{'grp_name'} eq $customgeoipgrp{$key}[0]) { + $col="bgcolor='${Header::colouryellow}'"; + } elsif ($count %2 == 0){ + $col="bgcolor='$color{'color20'}'"; + } else { + $col="bgcolor='$color{'color22'}'"; + } + + # Get country flag. + my $icon = &GeoIP::get_flag_icon($customgeoipgrp{$key}[2]); + + # Print column with flag icon. + my $col_content; + if ($icon) { + $col_content = "$customgeoipgrp{$key}[2]"; + } else { + $col_content = "N/A"; + } + + print "\n"; + + # Print column with country code. + print "\n"; + + # Print column with full country name. + my $country_name = &GeoIP::get_full_country_name($customgeoipgrp{$key}[2]); + print "\n"; + + # Generate from for removing entries from a group. + print "\n"; + print "\n"; + } + + $helper=$customgeoipgrp{$key}[0]; + $number++; + } + + print"
+ $Lang::tr{'flag'} + + $Lang::tr{'countrycode'} + + $Lang::tr{'country'} +
$Lang::tr{'fwhost err emptytable'}
$col_content$customgeoipgrp{$key}[2]$country_name
\n"; + + if ($delflag > 0){ + print"\n"; + + # Check if this group only has a single entry. + foreach my $key2 (keys %hash) { + if ($hash{$key2}<2 && $key2 eq $customgeoipgrp{$key}[0]){ + print "" ; + } + } + } + + print "\n"; + print "\n"; + print "\n"; + print "
\n"; + print "
\n"; + &Header::closebox(); } sub viewtableservice { @@ -2196,6 +2690,44 @@ sub gethostcount } return $srvcounter; } +sub getgeoipcount +{ + my $groupname=shift; + my $counter=0; + + # GeoIP groups are stored as "group:groupname" in the + # firewall settings files. + my $searchstring = join(':', "group",$groupname); + + # Count services used in firewall - forward + foreach my $key1 (keys %fwfwd) { + if($fwfwd{$key1}[4] eq $searchstring){ + $counter++; + } + if($fwfwd{$key1}[6] eq $searchstring){ + $counter++; + } + } + #Count services used in firewall - input + foreach my $key2 (keys %fwinp) { + if($fwinp{$key2}[4] eq $searchstring){ + $counter++; + } + if($fwinp{$key2}[6] eq $searchstring){ + $counter++; + } + } + #Count services used in firewall - outgoing + foreach my $key3 (keys %fwout) { + if($fwout{$key3}[4] eq $searchstring){ + $counter++; + } + if($fwout{$key3}[6] eq $searchstring){ + $counter++; + } + } + return $counter; +} sub getnetcount { my $searchstring=shift; diff --git a/html/cgi-bin/geoip-block.cgi b/html/cgi-bin/geoip-block.cgi new file mode 100644 index 0000000000..ccbfa926a0 --- /dev/null +++ b/html/cgi-bin/geoip-block.cgi @@ -0,0 +1,263 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2014 IPFire Developemnt Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +use strict; +# enable only the following on debugging purpose +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; + +require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/geoip-functions.pl"; +require "${General::swroot}/lang.pl"; +require "${General::swroot}/header.pl"; +require "/usr/lib/firewall/firewall-lib.pl"; + +my $notice; +my $settingsfile = "${General::swroot}/firewall/geoipblock"; + +my %color = (); +my %mainsettings = (); +my %settings = (); +my %cgiparams = (); + +# Read configuration file. +&General::readhash("$settingsfile", \%settings); + +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); + +&Header::showhttpheaders(); + +#Get GUI values +&Header::getcgihash(\%cgiparams); + +# Call subfunction to get all available locations. +my @locations = &fwlib::get_geoip_locations(); + +if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { + # Check if we want to disable geoipblock. + if (exists $cgiparams{'GEOIPBLOCK_ENABLED'}) { + $settings{'GEOIPBLOCK_ENABLED'} = "on"; + } else { + $settings{'GEOIPBLOCK_ENABLED'} = "off"; + } + + # Loop through our locations array to prevent from + # non existing countries or code. + foreach my $cn (@locations) { + # Check if blocking for this country should be enabled/disabled. + if (exists $cgiparams{$cn}) { + $settings{$cn} = "on"; + } else { + $settings{$cn} = "off"; + } + } + + &General::writehash("$settingsfile", \%settings); + + # Mark the firewall config as changed. + &General::firewall_config_changed(); + + # Assign reload notice. We directly can use + # the notice from p2p block. + $notice = $Lang::tr{'p2p block save notice'}; +} + +&Header::openpage($Lang::tr{'geoipblock configuration'}, 1, ''); + +# Print notice that a firewall reload is required. +if ($notice) { + &Header::openbox('100%', 'left', $Lang::tr{'notice'}); + print "$notice"; + &Header::closebox(); +} + +# Checkbox pre-selection. +my $checked; +if ($settings{'GEOIPBLOCK_ENABLED'} eq "on") { + $checked = "checked='checked'"; +} + +# Print box to enable/disable geoipblock. +print"
\n"; + +&Header::openbox('100%', 'center', $Lang::tr{'geoipblock'}); +print < + + $Lang::tr{'geoipblock enable feature'} + + + +
+ + + +
+ + + + + +
+END + +&Header::closebox(); + +&Header::openbox('100%', 'center', $Lang::tr{'geoipblock block countries'}); +### JAVA SCRIPT ### +print < + // Function to allow checking all checkboxes at once. + function check_all() { + \$("#countries").find(":checkbox").prop("checked", true); + } + + function uncheck_all() { + \$("#countries").find(":checkbox").prop("checked", false); + } + + + + + + + + + + + + + + + + +END + +my $lines; +my $lines2; +my $col; +foreach my $location (@locations) { + # Country code in upper case. (DE) + my $ccode_uc = $location; + + # County code in lower case. (de) + my $ccode_lc = lc($location); + + # Full name of the country based on the country code. + my $cname = &GeoIP::get_full_country_name($ccode_lc); + + # Get flag icon for of the country. + my $flag_icon = &GeoIP::get_flag_icon($ccode_uc); + + my $flag; + # Check if a flag for the country is available. + if ($flag_icon) { + $flag="$ccode_uc"; + } else { + $flag="N/A"; + } + + # Checkbox pre-selection. + my $checked; + if ($settings{$ccode_uc} eq "on") { + $checked = "checked='checked'"; + } + + # Colour lines. + if ($lines % 2) { + $col="bgcolor='$color{'color20'}'"; + } else { + $col="bgcolor='$color{'color22'}'"; + } + + # Grouping elements. + my $line_start; + my $line_end; + if ($lines2 % 2) { + # Increase lines (background color by once. + $lines++; + + # Add empty column in front. + $line_start=""; + + # When the line number can be diveded by "2", + # we are going to close the line. + $line_end=""; + } else { + # When the line number is not divideable by "2", + # we are starting a new line. + $line_start=""; + $line_end; + } + + print "$line_start\n"; + print "\n"; + print "\n"; + print "$line_end\n"; + +$lines2++; +} + +print < + +
+ $Lang::tr{'flag'} + + $Lang::tr{'countrycode'} + + $Lang::tr{'country'} +   + $Lang::tr{'flag'} + + $Lang::tr{'countrycode'} + + $Lang::tr{'country'} +
 
$flag$ccode_uc$cname
+ + + + + + +
+ $Lang::tr{'check all'} / + $Lang::tr{'uncheck all'} +
+ +
+ + + + + + + + +
$Lang::tr{'geoipblock country is blocked'}$Lang::tr{'geoipblock country is allowed'}
+END + +&Header::closebox(); +print"\n"; + +&Header::closebigbox(); +&Header::closepage(); diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 53adeacce8..eafbdb1376 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -301,7 +301,7 @@ END print ''; print ''; } -if ( $netsettings{'BLUE_DEV'} ) { +if (&Header::blue_used()) { my $sub=&General::iporsubtocidr($netsettings{'BLUE_NETMASK'}); print < @@ -318,7 +318,7 @@ END print ''; print ''; } -if ( $netsettings{'ORANGE_DEV'} ) { +if (&Header::orange_used()) { my $sub=&General::iporsubtocidr($netsettings{'ORANGE_NETMASK'}); print < diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 8bb4900638..5a584d60de 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -21,6 +21,7 @@ use Getopt::Std; #use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/geoip-functions.pl"; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; @@ -334,13 +335,14 @@ foreach $_ (@log) my $comment = $3; my $packet = $4; - $packet =~ /IN=(\w+)/; my $iface=$1; if ( $1 =~ /2./ ){ $iface="";} - $packet =~ /SRC=([\d\.]+)/; my $srcaddr=$1; - $packet =~ /DST=([\d\.]+)/; my $dstaddr=$1; - $packet =~ /MAC=([\w+\:]+)/; my $macaddr=$1; - $packet =~ /PROTO=(\w+)/; my $proto=$1; - $packet =~ /SPT=(\d+)/; my $srcport=$1; - $packet =~ /DPT=(\d+)/; my $dstport=$1; + my ($iface, $srcaddr, $dstaddr, $macaddr, $proto, $srcport, $dstport); + $iface=$1 if $packet =~ /IN=(\w+)/; + $srcaddr=$1 if $packet =~ /SRC=([\d\.]+)/; + $dstaddr=$1 if $packet =~ /DST=([\d\.]+)/; + $macaddr=$1 if $packet =~ /MAC=([\w+\:]+)/; + $proto=$1 if $packet =~ /PROTO=(\w+)/; + $srcport=$1 if $packet =~ /SPT=(\d+)/; + $dstport=$1 if $packet =~ /DPT=(\d+)/; my $gi = Geo::IP::PurePerl->new(); my $ccode = $gi->country_code_by_name($srcaddr); @@ -371,10 +373,15 @@ foreach $_ (@log) $srcport
$dstport END ; - if ( $fcode ne "" ){ - print "$ccode";} - else { - print "";} + # Get flag icon for of the country. + my $flag_icon = &GeoIP::get_flag_icon($fcode); + + if ( $flag_icon) { + print "$ccode"; + } else { + print ""; + } + print <$macaddr diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat index 3a774f9229..29c0842188 100644 --- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat +++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat @@ -19,6 +19,7 @@ use Getopt::Std; #use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/geoip-functions.pl"; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; @@ -460,11 +461,15 @@ for($s=0;$s<$lines;$s++) print "$key[$s]"; } else { - if($key[$s] ne 'unknown' ) { - my $fcode = lc($key[$s]); - print "$key[$s]";} - else { - print "$key[$s]"; + my $fcode = lc($key[$s]); + + # Get flag icon for of the country. + my $flag_icon = &GeoIP::get_flag_icon($fcode); + + if($flag_icon) { + print "$key[$s]"; + } else { + print "$key[$s]"; } } print "$value[$s]"; diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat index 07bcc77f81..7d82d20e72 100644 --- a/html/cgi-bin/logs.cgi/firewalllogip.dat +++ b/html/cgi-bin/logs.cgi/firewalllogip.dat @@ -19,6 +19,7 @@ use Getopt::Std; #use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/geoip-functions.pl"; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; @@ -441,13 +442,19 @@ for($s=0;$s<$lines;$s++) $color++; print "
"; print "$key[$s]"; - if ( $fcode ne "" ){ - print "$ccode";} - else { - print "";} - print "$value[$s]"; - print "$percent"; - print ""; + + # Get flag icon for of the country. + my $flag_icon = &GeoIP::get_flag_icon($ccode); + + if ( $flag_icon ) { + print "$ccode"; + } else { + print ""; + } + + print "$value[$s]"; + print "$percent"; + print ""; } if($cgiparams{'otherspie'} == 2 ){} diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi index f775b23dcc..cae7770bb0 100755 --- a/html/cgi-bin/netovpnrw.cgi +++ b/html/cgi-bin/netovpnrw.cgi @@ -20,7 +20,7 @@ ############################################################################### use strict; - +use URI::Escape; # enable only the following on debugging purpose #use warnings; #use CGI::Carp 'fatalsToBrowser'; @@ -37,7 +37,7 @@ my %mainsettings = (); my @vpns=(); -my @querry = split(/\?/,$ENV{'QUERY_STRING'}); +my @querry = split(/\?/,uri_unescape($ENV{'QUERY_STRING'})); $querry[0] = '' unless defined $querry[0]; $querry[1] = 'week' unless defined $querry[1]; @@ -47,10 +47,10 @@ if ( $querry[0] ne "" && $querry[0] ne "UNDEF"){ &Graphs::updatevpngraph($querry[0],$querry[1]); }else{ &Header::showhttpheaders(); - &Header::openpage($Lang::tr{'host to net vpn'}, 1, ''); + &Header::openpage($Lang::tr{'vpn statistic rw'}, 1, ''); &Header::openbigbox('100%', 'left'); - my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*/ -not -path *openvpn-UNDEF* -not -path *openvpn-*n2n* -name *.rrd|sort`; + my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*/ -not -path *openvpn-UNDEF* -not -path *openvpn-*n2n* -name *.rrd 2>/dev/null|sort`; foreach (@vpngraphs){ if($_ =~ /(.*)\/openvpn-(.*)\/if_octets_derive.rrd/){ push(@vpns,$2); @@ -59,7 +59,7 @@ if ( $querry[0] ne "" && $querry[0] ne "UNDEF"){ if(@vpns){ foreach (@vpns) { &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); - &Graphs::makegraphbox("netovpnrw.cgi",$_,"week"); + &Graphs::makegraphbox("netovpnrw.cgi",$_, "day"); &Header::closebox(); } }else{ diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi index 0ec9c679d5..15a95b6b9f 100755 --- a/html/cgi-bin/netovpnsrv.cgi +++ b/html/cgi-bin/netovpnsrv.cgi @@ -47,10 +47,10 @@ if ( $querry[0] ne ""){ &Graphs::updatevpnn2ngraph($querry[0],$querry[1]); }else{ &Header::showhttpheaders(); - &Header::openpage($Lang::tr{'openvpn server'}, 1, ''); + &Header::openpage($Lang::tr{'vpn statistic n2n'}, 1, ''); &Header::openbigbox('100%', 'left'); - my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*-n2n/ -not -path *openvpn-UNDEF* -name *traffic.rrd|sort`; + my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*-n2n/ -not -path *openvpn-UNDEF* -name *traffic.rrd 2>/dev/null|sort`; foreach (@vpngraphs){ if($_ =~ /(.*)\/openvpn-(.*)\/if_octets_derive-traffic.rrd/){ push(@vpns,$2); @@ -59,7 +59,7 @@ if ( $querry[0] ne ""){ if (@vpns){ foreach (@vpns) { &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); - &Graphs::makegraphbox("netovpnsrv.cgi",$_,"week"); + &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day",320); &Header::closebox(); } }else{ diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 1e074928f2..fb52e68016 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -213,7 +213,7 @@ sub writeserverconf { print CONF "writepid /var/run/openvpn.pid\n"; print CONF "#DAN prepare OpenVPN for listening on blue and orange\n"; print CONF ";local $sovpnsettings{'VPN_IP'}\n"; - print CONF "dev $sovpnsettings{'DDEVICE'}\n"; + print CONF "dev tun\n"; print CONF "proto $sovpnsettings{'DPROTOCOL'}\n"; print CONF "port $sovpnsettings{'DDEST_PORT'}\n"; print CONF "script-security 3 system\n"; @@ -231,15 +231,15 @@ sub writeserverconf { # Check if we are using mssfix, fragment or mtu-disc and set the corretct mtu of 1500. # If we doesn't use one of them, we can use the configured mtu value. if ($sovpnsettings{'MSSFIX'} eq 'on') - { print CONF "$sovpnsettings{'DDEVICE'}-mtu 1500\n"; } + { print CONF "tun-mtu 1500\n"; } elsif ($sovpnsettings{'FRAGMENT'} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') - { print CONF "$sovpnsettings{'DDEVICE'}-mtu 1500\n"; } + { print CONF "tun-mtu 1500\n"; } elsif (($sovpnsettings{'PMTU_DISCOVERY'} eq 'yes') || ($sovpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || ($sovpnsettings{'PMTU_DISCOVERY'} eq 'no' )) - { print CONF "$sovpnsettings{'DDEVICE'}-mtu 1500\n"; } + { print CONF "tun-mtu 1500\n"; } else - { print CONF "$sovpnsettings{'DDEVICE'}-mtu $sovpnsettings{'DMTU'}\n"; } + { print CONF "tun-mtu $sovpnsettings{'DMTU'}\n"; } if ($vpnsettings{'ROUTES_PUSH'} ne '') { @temp = split(/\n/,$vpnsettings{'ROUTES_PUSH'}); @@ -668,6 +668,29 @@ sub read_routepushfile } } +sub writecollectdconf { + my $vpncollectd; + my %ccdhash=(); + + open(COLLECTDVPN, ">${General::swroot}/ovpn/collectd.vpn") or die "Unable to open collectd.vpn: $!"; + print COLLECTDVPN "Loadplugin openvpn\n"; + print COLLECTDVPN "\n"; + print COLLECTDVPN "\n"; + print COLLECTDVPN "Statusfile \"/var/run/ovpnserver.log\"\n"; + + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); + foreach my $key (keys %ccdhash) { + if ($ccdhash{$key}[0] eq 'on' && $ccdhash{$key}[3] eq 'net') { + print COLLECTDVPN "Statusfile \"/var/run/openvpn/$ccdhash{$key}[1]-n2n\"\n"; + } + } + + print COLLECTDVPN "\n"; + close(COLLECTDVPN); + + # Reload collectd afterwards + system("/usr/local/bin/collectdctrl restart &>/dev/null"); +} #hier die refresh page if ( -e "${General::swroot}/ovpn/gencanow") { @@ -1144,7 +1167,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg $vpnsettings{'VPN_IP'} = $cgiparams{'VPN_IP'}; #new settings for daemon $vpnsettings{'DOVPN_SUBNET'} = $cgiparams{'DOVPN_SUBNET'}; - $vpnsettings{'DDEVICE'} = $cgiparams{'DDEVICE'}; $vpnsettings{'DPROTOCOL'} = $cgiparams{'DPROTOCOL'}; $vpnsettings{'DDEST_PORT'} = $cgiparams{'DDEST_PORT'}; $vpnsettings{'DMTU'} = $cgiparams{'DMTU'}; @@ -1166,10 +1188,17 @@ SETTINGS_ERROR: my $file = ''; &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + # Kill all N2N connections + system("/usr/local/bin/openvpnctrl -kn2n &>/dev/null"); + foreach my $key (keys %confighash) { + my $name = $confighash{$cgiparams{'$key'}}[1]; + if ($confighash{$key}[4] eq 'cert') { delete $confighash{$cgiparams{'$key'}}; } + + system ("/usr/local/bin/openvpnctrl -drrd $name"); } while ($file = glob("${General::swroot}/ovpn/ca/*")) { unlink $file; @@ -1196,11 +1225,6 @@ SETTINGS_ERROR: while ($file = glob("${General::swroot}/ovpn/ccd/*")) { unlink $file } -# Delete all RRD files for Roadwarrior connections - chdir('/var/ipfire/ovpn/ccd'); - while ($file = glob("*")) { - system ("/usr/local/bin/openvpnctrl -drrd $file"); - } while ($file = glob("${General::swroot}/ovpn/ccd/*")) { unlink $file } @@ -1216,6 +1240,9 @@ SETTINGS_ERROR: system ("rm -rf $file"); } + # Remove everything from the collectd configuration + &writecollectdconf(); + #&writeserverconf(); ### ### Reset all step 1 @@ -2041,7 +2068,8 @@ END &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ - system('/usr/local/bin/openvpnctrl', '-sn2n', $confighash{$cgiparams{'KEY'}}[1]); + system('/usr/local/bin/openvpnctrl', '-sn2n', $confighash{$cgiparams{'KEY'}}[1]); + &writecollectdconf(); } } else { @@ -2049,14 +2077,15 @@ END &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ - if ($n2nactive ne ''){ - system('/usr/local/bin/openvpnctrl', '-kn2n', $confighash{$cgiparams{'KEY'}}[1]); - } + if ($n2nactive ne '') { + system('/usr/local/bin/openvpnctrl', '-kn2n', $confighash{$cgiparams{'KEY'}}[1]); + &writecollectdconf(); + } } else { - $errormessage = $Lang::tr{'invalid key'}; + $errormessage = $Lang::tr{'invalid key'}; } - } + } } ### @@ -2108,7 +2137,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "# Server Gateway Network\n"; print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; print CLIENTCONF "# tun Device\n"; - print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\n"; + print CLIENTCONF "dev tun\n"; print CLIENTCONF "# Port and Protokoll\n"; print CLIENTCONF "port $confighash{$cgiparams{'KEY'}}[29]\n"; @@ -2200,21 +2229,21 @@ else print CLIENTCONF "tls-client\r\n"; print CLIENTCONF "client\r\n"; print CLIENTCONF "nobind\r\n"; - print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\r\n"; + print CLIENTCONF "dev tun\r\n"; print CLIENTCONF "proto $vpnsettings{'DPROTOCOL'}\r\n"; # Check if we are using fragment, mssfix or mtu-disc and set MTU to 1500 # or use configured value. if ($vpnsettings{FRAGMENT} ne '' && $vpnsettings{DPROTOCOL} ne 'tcp' ) - { print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\r\n"; } + { print CLIENTCONF "tun-mtu 1500\r\n"; } elsif ($vpnsettings{MSSFIX} eq 'on') - { print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\r\n"; } + { print CLIENTCONF "tun-mtu 1500\r\n"; } elsif (($vpnsettings{'PMTU_DISCOVERY'} eq 'yes') || ($vpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || ($vpnsettings{'PMTU_DISCOVERY'} eq 'no' )) - { print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\r\n"; } + { print CLIENTCONF "tun-mtu 1500\r\n"; } else - { print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu $vpnsettings{'DMTU'}\r\n"; } + { print CLIENTCONF "tun-mtu $vpnsettings{'DMTU'}\r\n"; } if ( $vpnsettings{'ENABLED'} eq 'on'){ print CLIENTCONF "remote $vpnsettings{'VPN_IP'} $vpnsettings{'DDEST_PORT'}\r\n"; @@ -2313,75 +2342,71 @@ else } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'remove'}) { - &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); - &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - if ($confighash{$cgiparams{'KEY'}}) { -# if ($vpnsettings{'ENABLED'} eq 'on' || -# $vpnsettings{'ENABLED_BLUE'} eq 'on') { -# system('/usr/local/bin/ipsecctrl', 'D', $cgiparams{'KEY'}); -# } -# - my $temp = `/usr/bin/openssl ca -revoke ${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`; + if ($confighash{$cgiparams{'KEY'}}) { + # Revoke certificate if certificate was deleted and rewrite the CRL + my $temp = `/usr/bin/openssl ca -revoke ${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`; + my $tempA = `/usr/bin/openssl ca -gencrl -out ${General::swroot}/ovpn/crls/cacrl.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`; ### # m.a.d net2net ### -if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { - my $conffile = glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]/$confighash{$cgiparams{'KEY'}}[1].conf"); - my $certfile = glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); - unlink ($certfile); - unlink ($conffile); + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { + # Stop the N2N connection before it is removed + system("/usr/local/bin/openvpnctrl -kn2n $confighash{$cgiparams{'KEY'}}[1] &>/dev/null"); - if (-e "${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") { - rmdir ("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") || die "Kann Verzeichnis nicht loeschen: $!"; - } -} + my $conffile = glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]/$confighash{$cgiparams{'KEY'}}[1].conf"); + my $certfile = glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); + unlink ($certfile); + unlink ($conffile); + + if (-e "${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") { + rmdir ("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") || die "Kann Verzeichnis nicht loeschen: $!"; + } + } - unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); - unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); + unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); + unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); # A.Marx CCD delete ccd files and routes - - if (-f "${General::swroot}/ovpn/ccd/$confighash{$cgiparams{'KEY'}}[2]") - { - unlink "${General::swroot}/ovpn/ccd/$confighash{$cgiparams{'KEY'}}[2]"; - } - - &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - foreach my $key (keys %ccdroutehash) { - if ($ccdroutehash{$key}[0] eq $confighash{$cgiparams{'KEY'}}[1]){ - delete $ccdroutehash{$key}; + if (-f "${General::swroot}/ovpn/ccd/$confighash{$cgiparams{'KEY'}}[2]") + { + unlink "${General::swroot}/ovpn/ccd/$confighash{$cgiparams{'KEY'}}[2]"; } - } - &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - &General::readhasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); - foreach my $key (keys %ccdroute2hash) { - if ($ccdroute2hash{$key}[0] eq $confighash{$cgiparams{'KEY'}}[1]){ - delete $ccdroute2hash{$key}; + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + foreach my $key (keys %ccdroutehash) { + if ($ccdroutehash{$key}[0] eq $confighash{$cgiparams{'KEY'}}[1]){ + delete $ccdroutehash{$key}; + } } - } - &General::writehasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); - &writeserverconf; - + &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); -# CCD end + &General::readhasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + foreach my $key (keys %ccdroute2hash) { + if ($ccdroute2hash{$key}[0] eq $confighash{$cgiparams{'KEY'}}[1]){ + delete $ccdroute2hash{$key}; + } + } + &General::writehasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + &writeserverconf; -### -### Delete all RRD's for client -### - system ("/usr/local/bin/openvpnctrl -drrd $confighash{$cgiparams{'KEY'}}[1]"); - delete $confighash{$cgiparams{'KEY'}}; - my $temp2 = `/usr/bin/openssl ca -gencrl -out ${General::swroot}/ovpn/crls/cacrl.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`; - &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); +# CCD end + # Update collectd configuration and delete all RRD files of the removed connection + &writecollectdconf(); + system ("/usr/local/bin/openvpnctrl -drrd $confighash{$cgiparams{'KEY'}}[1]"); - #&writeserverconf(); - } else { - $errormessage = $Lang::tr{'invalid key'}; - } + delete $confighash{$cgiparams{'KEY'}}; + my $temp2 = `/usr/bin/openssl ca -gencrl -out ${General::swroot}/ovpn/crls/cacrl.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`; + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + + } else { + $errormessage = $Lang::tr{'invalid key'}; + } &General::firewall_reload(); ### @@ -3053,32 +3078,6 @@ END $errormessage = $Lang::tr{'invalid key'}; } -### -### Remove connection -### -} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'remove'}) { - &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); - &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - - if ($confighash{$cgiparams{'KEY'}}) { -# if ($vpnsettings{'ENABLED'} eq 'on' || -# $vpnsettings{'ENABLED_BLUE'} eq 'on') { -# system('/usr/local/bin/ipsecctrl', 'D', $cgiparams{'KEY'}); -# } - unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); - unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); - delete $confighash{$cgiparams{'KEY'}}; - &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - #&writeserverconf(); - } else { - $errormessage = $Lang::tr{'invalid key'}; - } -#test33 - -### -### Choose between adding a host-net or net-net connection -### - ### # m.a.d net2net ### @@ -3200,7 +3199,6 @@ END @firen2nconf = ; close (FILE); chomp(@firen2nconf); - } else { $errormessage = "Filecount does not match only 2 files are allowed\n"; @@ -3241,6 +3239,13 @@ END unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} unless(-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]"){mkdir "${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770 or die "Unable to create dir $!";} + #Add collectd settings to configfile + open(FILE, ">> $tempdir/$uplconffilename") or die 'Unable to open config file.'; + print FILE "# Logfile\n"; + print FILE "status-version 1\n"; + print FILE "status /var/run/openvpn/$n2nname[0]-n2n 10\n"; + close FILE; + move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname[0]/$uplconffilename2"); if ($? ne 0) { @@ -4953,9 +4958,6 @@ END $checked{'ENABLED_ORANGE'}{'off'} = ''; $checked{'ENABLED_ORANGE'}{'on'} = ''; $checked{'ENABLED_ORANGE'}{$cgiparams{'ENABLED_ORANGE'}} = 'CHECKED'; - $selected{'DDEVICE'}{'tun'} = ''; - $selected{'DDEVICE'}{'tap'} = ''; - $selected{'DDEVICE'}{$cgiparams{'DDEVICE'}} = 'SELECTED'; $selected{'DPROTOCOL'}{'udp'} = ''; $selected{'DPROTOCOL'}{'tcp'} = ''; @@ -5047,10 +5049,6 @@ END print <$Lang::tr{'local vpn hostname/ip'}:
$Lang::tr{'ovpn subnet'}
- $Lang::tr{'ovpn device'} - @@ -5551,42 +5549,49 @@ END } print < + +

+
- - - - - - - - - +
$Lang::tr{'upload ca certificate'}
$Lang::tr{'ca name'}: -
+ + + - - - + + + + + - - - - + + + + +
$Lang::tr{'upload ca certificate'}
$Lang::tr{'ca name'}: +
$Lang::tr{'ovpn dh parameters'}
 
- - $Lang::tr{'ovpn dh upload'}: - - - - - - $Lang::tr{'ovpn dh new key'}: - - - - +
+ + + + + + + + + + + + + + + +
$Lang::tr{'ovpn dh parameters'}
$Lang::tr{'ovpn dh upload'}: +
$Lang::tr{'ovpn dh new key'}:
+ -
+
END ; diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 2a7ca8407f..143f123b7f 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -191,14 +191,14 @@ if ($return) {
- 
+		
 END
 	my @output = `grep pakfire /var/log/messages | tail -20`;
 	foreach (@output) {
-		print "$_";
+		print "$_
";
 	}
 	print <
+			
 		
 END
 	&Header::closebox();
diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 6bfa5bbbe8..76bd9edebc 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -188,6 +188,9 @@ END
 			# mdadm should not stopped with webif because this could crash the system
 			#
 			chomp($_);
+			if ( $_ eq 'squid' ) {
+				next;
+			}
 			if ( ($_ ne "alsa") && ($_ ne "mdadm") ) {
 				$lines++;
 				if ($lines % 2){
diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 228b5d48c2..e00bc5fd50 100644
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -20,7 +20,7 @@
 ###############################################################################
 
 use strict;
-use Locale::Country;
+use Locale::Codes::Country;
 
 # enable only the following on debugging purpose
 use warnings;
@@ -323,9 +323,9 @@ END
 						
 END
 
-		my @country_names = Locale::Country::all_country_names();
+		my @country_names = Locale::Codes::Country::all_country_names();
 		foreach my $country_name (sort @country_names) {
-			my $country_code = Locale::Country::country2code($country_name);
+			my $country_code = Locale::Codes::Country::country2code($country_name);
 			$country_code = uc($country_code);
 			print "
 					
 					
+					
 					
 					
-					
 				
 			
 			
@@ -2437,9 +2444,9 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
 					
 					
 					
+					
 					
 					
-					
 				
 			
 		
@@ -2457,14 +2464,14 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
 			
 				
-Tx Power: 
-END
-;
-
-if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
-	print "";
-} else {
-	print ""
-}
-print <Tx Power: 
 Loglevel (hostapd): 
 	
 END
-	for (my $j=2014;$j<=($year);$j++){
+	for (my $j=2014;$j<=($year1);$j++){
 		if(($_[1]) eq $j){
 			print"";
 		}else{
@@ -2011,7 +2011,12 @@ END
 		
 	
 END
-	my $res = $dbh->selectall_arrayref("SELECT SUM(BYTES),min(TIME_RUN),max(TIME_RUN),NAME from ACCT where TIME_RUN between ".$from." and ".$till." group by NAME;");
+	my $res;
+	if (($mon)+1 == $mon1 && ($year)+1900 == $year1){
+		$res = $dbh->selectall_arrayref("SELECT SUM(BYTES),min(TIME_RUN),max(TIME_RUN),NAME from ACCT where TIME_RUN between ".$from." and ".$till." group by NAME;");
+	}else{
+		$res = $dbh->selectall_arrayref("SELECT SUM(BYTES),min(strftime('%s',TIME_RUN)),max(strftime('%s',TIME_RUN)),NAME from ACCT_HIST where date(TIME_RUN) > date($from,'unixepoch') and date(TIME_RUN) < date($till,'unixepoch') group by NAME;");
+	}
 	my $sumbytes;
 	my $type;
 	my $lineval;
@@ -2036,8 +2041,8 @@ END
 					
 					
 					
-					
-					
+					
+					
 					
 					
 					
diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl
index 7969a50239..58b154a345 100644
--- a/src/squid-accounting/acct-lib.pl
+++ b/src/squid-accounting/acct-lib.pl
@@ -93,8 +93,10 @@ sub delbefore {
 }
 
 sub movedbdata {
-	$dbh->do("insert into ACCT_HIST select datetime(TIME_RUN,'unixepoch'),NAME,SUM(BYTES) from ACCT where  date(TIME_RUN,'unixepoch') < date('now','-2 months') group by NAME,date(TIME_RUN,'unixepoch');");
-	$dbh->do("DELETE FROM ACCT WHERE datetime(TIME_RUN,'unixepoch') < date('now','-2 months');");
+	&connectdb;
+	$dbh->do("insert into ACCT_HIST select datetime(TIME_RUN,'unixepoch'),NAME,SUM(BYTES) from ACCT where datetime(TIME_RUN,'unixepoch') < datetime('now','start of month') group by NAME,datetime(TIME_RUN,'unixepoch');");
+	$dbh->do("DELETE FROM ACCT WHERE datetime(TIME_RUN,'unixepoch') < date('now','start of month');");
+	&closedb;
 }
 
 sub gethourgraphdata {
@@ -119,10 +121,10 @@ sub getmonthgraphdata {
 	my $name=$_[3];
 	my $res;
 	$dbh=connectdb;
-	if ($table eq 'ACCT'){
-		$res = $dbh->selectall_arrayref( "SELECT  strftime('%d.%m.%Y',xx.tag),(SELECT SUM(BYTES)/1024/1024 FROM ACCT WHERE date(TIME_RUN,'unixepoch') <= xx.tag and NAME = '".$name."') kum_bytes FROM (SELECT date(TIME_RUN,'unixepoch') tag,SUM(BYTES)/1024/1024 sbytes FROM ACCT WHERE NAME='".$name."' and TIME_RUN between ".$from." and ".$till." GROUP by date(TIME_RUN,'unixepoch')) xx;");
+	if ($table eq 'ACCT_HIST'){
+		$res = $dbh->selectall_arrayref( "SELECT strftime('%d.%m.%Y',TIME_RUN),(SELECT SUM(BYTES)/1024/1024 FROM ACCT_HIST WHERE TIME_RUN <= ah.TIME_RUN and TIME_RUN > date($from,'unixepoch') and NAME = '".$name."') kum_bytes FROM ACCT_HIST ah WHERE date(TIME_RUN) > date(".$from.",'unixepoch') AND date(TIME_RUN) < date(".$till.",'unixepoch') AND NAME = '".$name."' group by date(TIME_RUN);");
 	}else{
-		$res = $dbh->selectall_arrayref( "SELECT TIME_RUN, (SELECT SUM(BYTES)/1024/1024 FROM ACCT_HIST WHERE TIME_RUN <= ah.TIME_RUN and NAME = '".$name."') kum_bytes FROM ACCT_HIST ah WHERE TIME_RUN BETWEEN date(".$from.",'unixepoch') AND date(".$till.",'unixepoch') AND NAME = '".$name."' group by TIME_RUN;");
+		$res = $dbh->selectall_arrayref( "SELECT strftime('%d.%m.%Y',xx.tag),(SELECT SUM(BYTES)/1024/1024 FROM ACCT WHERE date(TIME_RUN,'unixepoch') <= xx.tag and TIME_RUN > ".$from." and NAME = '".$name."') kum_bytes FROM (SELECT NAME,date(TIME_RUN,'unixepoch') tag,SUM(BYTES)/1024/1024 sbytes FROM ACCT WHERE NAME='".$name."' and TIME_RUN between ".$from." and ".$till." GROUP by NAME,date(TIME_RUN,'unixepoch')) xx;");
 	}
 	$dbh=closedb;
 	return $res;
diff --git a/src/squid-accounting/acct.pl b/src/squid-accounting/acct.pl
index 79fc7bae43..7222689458 100755
--- a/src/squid-accounting/acct.pl
+++ b/src/squid-accounting/acct.pl
@@ -100,7 +100,7 @@ if (-f $proxyenabled && $proxylog eq $Lang::tr{'running'}){
 		open (FH,">/var/log/accounting.log");
 		close (FH);
 		chmod 0755, "/var/log/accounting.log";
-		#move all db entries older than 2 months to second table and cumulate them hourly
+		#move all db entries older than this month to second table and cumulate them daily
 		&ACCT::movedbdata;
 		&ACCT::logger($settings{'LOG'},"New Month. Old trafficvalues moved to ACCT_HIST Table\n");
 		if ($settings{'USEMAIL'} eq 'on'){
diff --git a/tools/checkwronginitlinks b/tools/checkrootfiles
similarity index 76%
rename from tools/checkwronginitlinks
rename to tools/checkrootfiles
index 65fc946b68..74fab3e023 100755
--- a/tools/checkwronginitlinks
+++ b/tools/checkrootfiles
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  info@ipfire.org                       #
+# Copyright (C) 2007-2015  IPFire Team  info@ipfire.org                       #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,3 +32,17 @@ if [ "${?}" == "0" ]; then
 	grep -r "^var/run//*" ./config/rootfiles/
 	echo "Comment this and create it at initskript if needed !"
 fi
+
+grep -r "/i586" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore >/dev/null 2>&1
+if [ "${?}" == "0" ]; then
+	echo "Error! '/i586' in rootfiles files found!"
+	grep -r "/i586" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore
+	echo "Replace by MACHINE !"
+fi
+
+grep -r "/armv5tel" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore >/dev/null 2>&1
+if [ "${?}" == "0" ]; then
+	echo "Error! '/armv5tel' in rootfiles files found!"
+	grep -r "/armv5tel" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore
+	echo "Replace by MACHINE !"
+fi
diff --git a/tools/make-functions b/tools/make-functions
index 356d7a6174..4fbb530f45 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -738,4 +738,19 @@ update_langs() {
 		$BASEDIR/tools/check_strings.pl it > $BASEDIR/doc/language_issues.it
 		$BASEDIR/tools/check_langs.sh > $BASEDIR/doc/language_missings
 		beautify message DONE
+
+		echo -ne "Updating language lists..."
+		update_language_list ${BASEDIR}/src/installer/po
+		update_language_list ${BASEDIR}/src/setup/po
+		beautify message DONE
+}
+
+update_language_list() {
+	local path="${1}"
+
+	local lang
+	for lang in ${path}/*.po; do
+		lang="$(basename "${lang}")"
+		echo "${lang%*.po}"
+	done | sort -u > "${path}/LINGUAS"
 }