From: Michael Tremer Date: Fri, 12 Jun 2015 09:56:43 +0000 (+0200) Subject: Merge remote-tracking branch 'earl/tor' into next X-Git-Tag: v2.17-core92~10^2~52 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=31a849dd53128b3460f3d6f620a9ca286379e729;hp=57a3100d2dc91fd7dea7204e3c77d17d723d66d1 Merge remote-tracking branch 'earl/tor' into next Signed-off-by: Michael Tremer Conflicts: lfs/tor --- 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/cyrus-imapd b/config/backup/includes/cyrus-imapd new file mode 100644 index 0000000000..bb1bb3b1ce --- /dev/null +++ b/config/backup/includes/cyrus-imapd @@ -0,0 +1,4 @@ +/usr/sieve +/var/imap +/var/ipfire/cyrusimap +/var/log/imap 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/netsnmpd b/config/backup/includes/netsnmpd new file mode 100644 index 0000000000..78ac6acf75 --- /dev/null +++ b/config/backup/includes/netsnmpd @@ -0,0 +1 @@ +/etc/snmpd.conf 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/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/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 97b8897af8..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,13 +369,17 @@ 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)); } # Prepare destination options. my @destination_options = (); - if ($destination) { + if ($destination =~ /-m geoip/) { + push(@destination_options, $destination); + } elsif ($destination) { push(@destination_options, ("-d", $destination)); } @@ -512,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. @@ -573,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 index 324ad5e229..9d372f63fb 100644 --- a/config/haproxy/haproxy.cfg +++ b/config/haproxy/haproxy.cfg @@ -28,8 +28,8 @@ global chroot /var/lib/haproxy pidfile /var/run/haproxy.pid maxconn 4000 - user haproxy - group haproxy + user nobody + group nobody daemon # turn on stats unix socket 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 18ffcd77c7..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.30 Kernel Configuration +# Linux/arm 3.14.37 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -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 e3fa93e9d6..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.30 Kernel Configuration +# Linux/arm 3.14.37 Kernel Configuration # CONFIG_ARM=y CONFIG_MIGHT_HAVE_PCI=y @@ -5530,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 @@ -5764,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 17a7305ebd..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.30 Kernel Configuration +# Linux/arm 3.14.37 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -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 87687d962e..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.30 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 @@ -5494,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 @@ -5766,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 c5a437a596..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.30 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 @@ -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/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 index 52487669ae..b4cd8f8571 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -61,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 @@ -91,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 @@ -229,6 +231,7 @@ 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-multi b/config/rootfiles/common/armv5tel/linux-multi index fa07629b8d..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 diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd index 72b2dee033..cac4c3de14 100644 --- a/config/rootfiles/common/collectd +++ b/config/rootfiles/common/collectd @@ -218,11 +218,11 @@ usr/lib/libcollectdclient.so.0.0.0 #usr/lib/perl5/Collectd/Plugins #usr/lib/perl5/Collectd/Plugins/OpenVZ.pm #usr/lib/perl5/Collectd/Unixsock.pm -#usr/lib/perl5/i586-linux-thread-multi -#usr/lib/perl5/i586-linux-thread-multi/auto -#usr/lib/perl5/i586-linux-thread-multi/auto/Collectd -#usr/lib/perl5/i586-linux-thread-multi/auto/Collectd/.packlist -#usr/lib/perl5/i586-linux-thread-multi/perllocal.pod +#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 @@ -243,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/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/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 index 845ae504b3..878ba667e5 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -63,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 @@ -93,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 @@ -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/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 7f3e709ead..8ef728c94a 100644 --- a/config/rootfiles/common/logrotate +++ b/config/rootfiles/common/logrotate @@ -1,5 +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/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/pcre b/config/rootfiles/common/pcre index 78ac2a24fb..8c4cc2ac25 100644 --- a/config/rootfiles/common/pcre +++ b/config/rootfiles/common/pcre @@ -10,7 +10,7 @@ #usr/lib/libpcre.la usr/lib/libpcre.so usr/lib/libpcre.so.1 -usr/lib/libpcre.so.1.2.4 +usr/lib/libpcre.so.1.2.5 #usr/lib/libpcrecpp.la usr/lib/libpcrecpp.so usr/lib/libpcrecpp.so.0 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/slang b/config/rootfiles/common/slang index 0ebef78c70..71802d4436 100644 --- a/config/rootfiles/common/slang +++ b/config/rootfiles/common/slang @@ -4,21 +4,26 @@ #usr/include/slcurses.h #usr/lib/libslang.so usr/lib/libslang.so.2 -usr/lib/libslang.so.2.2.4 +usr/lib/libslang.so.2.3.0 #usr/lib/pkgconfig/slang.pc #usr/lib/slang #usr/lib/slang/v2 #usr/lib/slang/v2/modules +usr/lib/slang/v2/modules/base64-module.so +usr/lib/slang/v2/modules/chksum-module.so usr/lib/slang/v2/modules/csv-module.so usr/lib/slang/v2/modules/fcntl-module.so usr/lib/slang/v2/modules/fork-module.so +usr/lib/slang/v2/modules/histogram-module.so usr/lib/slang/v2/modules/iconv-module.so +usr/lib/slang/v2/modules/json-module.so usr/lib/slang/v2/modules/pcre-module.so usr/lib/slang/v2/modules/png-module.so usr/lib/slang/v2/modules/rand-module.so usr/lib/slang/v2/modules/select-module.so usr/lib/slang/v2/modules/slsmg-module.so usr/lib/slang/v2/modules/socket-module.so +usr/lib/slang/v2/modules/stats-module.so usr/lib/slang/v2/modules/sysconf-module.so usr/lib/slang/v2/modules/termios-module.so usr/lib/slang/v2/modules/varray-module.so @@ -35,6 +40,10 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/doc/slsh #usr/share/doc/slsh/html #usr/share/doc/slsh/html/slshfun-1.html +#usr/share/doc/slsh/html/slshfun-10.html +#usr/share/doc/slsh/html/slshfun-11.html +#usr/share/doc/slsh/html/slshfun-12.html +#usr/share/doc/slsh/html/slshfun-13.html #usr/share/doc/slsh/html/slshfun-2.html #usr/share/doc/slsh/html/slshfun-3.html #usr/share/doc/slsh/html/slshfun-4.html @@ -48,13 +57,18 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh #usr/share/slsh/arrayfuns.sl #usr/share/slsh/autoload.sl +#usr/share/slsh/base64.sl +#usr/share/slsh/chksum.sl #usr/share/slsh/cmaps #usr/share/slsh/cmaps/cool.map #usr/share/slsh/cmaps/coolwarm.map #usr/share/slsh/cmaps/copper.map +#usr/share/slsh/cmaps/cubicl.map +#usr/share/slsh/cmaps/cubicyf.map #usr/share/slsh/cmaps/drywet.map #usr/share/slsh/cmaps/ds9b.map #usr/share/slsh/cmaps/ds9sls.map +#usr/share/slsh/cmaps/edge.map #usr/share/slsh/cmaps/gebco.map #usr/share/slsh/cmaps/globe.map #usr/share/slsh/cmaps/gray.map @@ -76,13 +90,20 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh/csv.sl #usr/share/slsh/fcntl.sl #usr/share/slsh/fork.sl +#usr/share/slsh/fswalk.sl #usr/share/slsh/glob.sl #usr/share/slsh/help #usr/share/slsh/help/arrayfuns.hlp +#usr/share/slsh/help/base64funs.hlp +#usr/share/slsh/help/chksumfuns.hlp #usr/share/slsh/help/cmdopt.hlp #usr/share/slsh/help/csvfuns.hlp #usr/share/slsh/help/forkfuns.hlp +#usr/share/slsh/help/fswalk.hlp #usr/share/slsh/help/glob.hlp +#usr/share/slsh/help/histfuns.hlp +#usr/share/slsh/help/jsonfuns.hlp +#usr/share/slsh/help/listfuns.hlp #usr/share/slsh/help/onigfuns.hlp #usr/share/slsh/help/pcrefuns.hlp #usr/share/slsh/help/pngfuns.hlp @@ -95,8 +116,12 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh/help/setfuns.hlp #usr/share/slsh/help/slsmg.hlp #usr/share/slsh/help/sockfuns.hlp +#usr/share/slsh/help/statsfuns.hlp #usr/share/slsh/help/structfuns.hlp +#usr/share/slsh/histogram.sl #usr/share/slsh/iconv.sl +#usr/share/slsh/json.sl +#usr/share/slsh/listfuns.sl #usr/share/slsh/local-packages #usr/share/slsh/onig.sl #usr/share/slsh/pcre.sl @@ -132,6 +157,7 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh/slshrl.sl #usr/share/slsh/slsmg.sl #usr/share/slsh/socket.sl +#usr/share/slsh/stats.sl #usr/share/slsh/stkcheck.sl #usr/share/slsh/structfuns.sl #usr/share/slsh/sysconf.sl 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 44f24b4369..90e28d9c4c 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -101,6 +101,8 @@ usr/local/bin/timecheck usr/local/bin/timezone-transition 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 @@ -120,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 @@ -141,6 +145,7 @@ usr/share/doc/licenses/GPLv3 #usr/share/man/man8 #usr/share/misc #usr/share/terminfo +#usr/share/xt_geoip #usr/share/zoneinfo #var #var/cache 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/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..3f22b725c4 --- /dev/null +++ b/config/rootfiles/common/web-user-interface @@ -0,0 +1,360 @@ +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 +srv/web/ipfire/html/accounting +srv/web/ipfire/html/graphs 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/89/filelists/files b/config/rootfiles/core/89/filelists/files index f344208d59..70c5f3d9b1 100644 --- a/config/rootfiles/core/89/filelists/files +++ b/config/rootfiles/core/89/filelists/files @@ -11,7 +11,10 @@ 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 diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh index f3de863ec5..13c645a1a2 100644 --- a/config/rootfiles/core/89/update.sh +++ b/config/rootfiles/core/89/update.sh @@ -35,10 +35,22 @@ done /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 @@ -56,6 +68,33 @@ 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 +for i in /var/ipfire/ovpn/n2nconf/*/*.conf; do + name="${i##*/}" + name="${name%*.conf}" + + if ! grep -qE "^status-version" ${i}; then + echo "# Logfile" >> ${i} + echo "status-version 1" >> ${i} + fi + + if ! grep -qE "^status " ${i}; then + echo "status /var/run/openvpn/${name}-n2n 10" >> ${i} + 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 diff --git a/config/rootfiles/core/90/exclude b/config/rootfiles/core/90/exclude new file mode 100644 index 0000000000..73b7b73e63 --- /dev/null +++ b/config/rootfiles/core/90/exclude @@ -0,0 +1,27 @@ +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 +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/90/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000000..72171071e6 --- /dev/null +++ b/config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/armv5tel/linux-multi b/config/rootfiles/core/90/filelists/armv5tel/linux-multi new file mode 120000 index 0000000000..204eb4c437 --- /dev/null +++ b/config/rootfiles/core/90/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/armv5tel/linux-rpi b/config/rootfiles/core/90/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000000..a651a498fe --- /dev/null +++ b/config/rootfiles/core/90/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file 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/90/filelists/dracut b/config/rootfiles/core/90/filelists/dracut new file mode 120000 index 0000000000..160869946d --- /dev/null +++ b/config/rootfiles/core/90/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file 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..ee596a0701 --- /dev/null +++ b/config/rootfiles/core/90/filelists/files @@ -0,0 +1,38 @@ +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 +opt/pakfire/pakfire +opt/pakfire/lib/functions.pl +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/90/filelists/i586/glibc b/config/rootfiles/core/90/filelists/i586/glibc new file mode 120000 index 0000000000..943021f19a --- /dev/null +++ b/config/rootfiles/core/90/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/linux b/config/rootfiles/core/90/filelists/i586/linux new file mode 120000 index 0000000000..693ec4bbf9 --- /dev/null +++ b/config/rootfiles/core/90/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/linux-initrd b/config/rootfiles/core/90/filelists/i586/linux-initrd new file mode 120000 index 0000000000..32a03e6a90 --- /dev/null +++ b/config/rootfiles/core/90/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file 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/openldap b/config/rootfiles/core/90/filelists/openldap new file mode 120000 index 0000000000..80c324f768 --- /dev/null +++ b/config/rootfiles/core/90/filelists/openldap @@ -0,0 +1 @@ +../../../common/openldap \ 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/90/filelists/wpa_supplicant b/config/rootfiles/core/90/filelists/wpa_supplicant new file mode 120000 index 0000000000..1d04c03c01 --- /dev/null +++ b/config/rootfiles/core/90/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file 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/90/meta b/config/rootfiles/core/90/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/core/90/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh new file mode 100644 index 0000000000..34dacf1134 --- /dev/null +++ b/config/rootfiles/core/90/update.sh @@ -0,0 +1,297 @@ +#!/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" + +# Remove old udev configuration +rm -vf /etc/udev/rules.d/30-persistent-network.rules + +# Remove pids from dhcp client because it hang at normal shutdown +# so let the sysvinit kill it +rm -f /run/dhcpcd-*.pid + +# +# 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 + +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig > /boot/grub/grub.cfg +fi + +# 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/installed/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 +# rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null + 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/91/exclude b/config/rootfiles/core/91/exclude new file mode 100644 index 0000000000..18e9b4d243 --- /dev/null +++ b/config/rootfiles/core/91/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/91/filelists/files b/config/rootfiles/core/91/filelists/files new file mode 100644 index 0000000000..7cc5aa2242 --- /dev/null +++ b/config/rootfiles/core/91/filelists/files @@ -0,0 +1,7 @@ +etc/system-release +etc/issue +opt/pakfire/lib/functions.pl +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/91/filelists/i586/openssl-sse2 b/config/rootfiles/core/91/filelists/i586/openssl-sse2 new file mode 120000 index 0000000000..f424713d6c --- /dev/null +++ b/config/rootfiles/core/91/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/i586/strongswan-padlock b/config/rootfiles/core/91/filelists/i586/strongswan-padlock new file mode 120000 index 0000000000..2412824fb2 --- /dev/null +++ b/config/rootfiles/core/91/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ 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/91/filelists/newt b/config/rootfiles/core/91/filelists/newt new file mode 120000 index 0000000000..fb3eb20c3e --- /dev/null +++ b/config/rootfiles/core/91/filelists/newt @@ -0,0 +1 @@ +../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/openssh b/config/rootfiles/core/91/filelists/openssh new file mode 120000 index 0000000000..d8c77fd8e7 --- /dev/null +++ b/config/rootfiles/core/91/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/openssl b/config/rootfiles/core/91/filelists/openssl new file mode 120000 index 0000000000..e011a9266c --- /dev/null +++ b/config/rootfiles/core/91/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/pcre b/config/rootfiles/core/91/filelists/pcre new file mode 120000 index 0000000000..b390d9a367 --- /dev/null +++ b/config/rootfiles/core/91/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/slang b/config/rootfiles/core/91/filelists/slang new file mode 120000 index 0000000000..228e45ed4c --- /dev/null +++ b/config/rootfiles/core/91/filelists/slang @@ -0,0 +1 @@ +../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/strongswan b/config/rootfiles/core/91/filelists/strongswan new file mode 120000 index 0000000000..90c727e265 --- /dev/null +++ b/config/rootfiles/core/91/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file 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..1e55e8bd5d --- /dev/null +++ b/config/rootfiles/core/91/update.sh @@ -0,0 +1,65 @@ +#!/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 + +# Stop services +/etc/init.d/ipsec stop + +# Extract files +extract_files + +# Create some missing graphs folders (core90) +mkdir -p /srv/web/ipfire/html/{accounting,graphs} +chmod 777 /srv/web/ipfire/html/{accounting,graphs} + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + +sync + +# Start services +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# 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/packages/clamav b/config/rootfiles/packages/clamav index 7353313005..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.25 +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.25 +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.25 +usr/lib/libclamunrar_iface.so.6.1.26 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/config/rootfiles/packages/cyrus-imapd b/config/rootfiles/packages/cyrus-imapd index 0c0485e4ef..bbaec3ffb0 100644 --- a/config/rootfiles/packages/cyrus-imapd +++ b/config/rootfiles/packages/cyrus-imapd @@ -146,6 +146,7 @@ var/imap/msg var/imap/proc var/imap/ptclient var/imap/socket +var/ipfire/backup/addons/includes/cyrus-imapd var/ipfire/cyrusimap var/ipfire/cyrusimap/cyrus.conf var/ipfire/cyrusimap/imapd.conf diff --git a/config/rootfiles/packages/libsrtp b/config/rootfiles/packages/libsrtp index 105f3f00e7..3ee2e3b64c 100644 --- a/config/rootfiles/packages/libsrtp +++ b/config/rootfiles/packages/libsrtp @@ -37,4 +37,5 @@ #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/netsnmpd b/config/rootfiles/packages/netsnmpd index 30dbf93bce..6328949222 100644 --- a/config/rootfiles/packages/netsnmpd +++ b/config/rootfiles/packages/netsnmpd @@ -2,12 +2,16 @@ etc/rc.d/rc0.d/K02netsnmpd etc/rc.d/rc3.d/S65netsnmpd etc/rc.d/rc6.d/K02netsnmpd etc/snmpd.conf +usr/bin/agentxtrap usr/bin/encode_keychange usr/bin/fixproc usr/bin/ipf-mod.pl usr/bin/mib2c usr/bin/mib2c-update +usr/bin/net-snmp-cert usr/bin/net-snmp-config +usr/bin/net-snmp-create-v3-user +usr/bin/snmp-bridge-mib usr/bin/snmpbulkget usr/bin/snmpbulkwalk usr/bin/snmpcheck @@ -37,6 +41,7 @@ usr/bin/traptoemail #usr/include/net-snmp/agent/agent_module_config.h #usr/include/net-snmp/agent/agent_read_config.h #usr/include/net-snmp/agent/agent_registry.h +#usr/include/net-snmp/agent/agent_sysORTable.h #usr/include/net-snmp/agent/agent_trap.h #usr/include/net-snmp/agent/all_helpers.h #usr/include/net-snmp/agent/auto_nlist.h @@ -62,9 +67,12 @@ usr/bin/traptoemail #usr/include/net-snmp/agent/serialize.h #usr/include/net-snmp/agent/set_helper.h #usr/include/net-snmp/agent/snmp_agent.h +#usr/include/net-snmp/agent/snmp_get_statistic.h #usr/include/net-snmp/agent/snmp_vars.h #usr/include/net-snmp/agent/stash_cache.h #usr/include/net-snmp/agent/stash_to_next.h +#usr/include/net-snmp/agent/struct.h +#usr/include/net-snmp/agent/sysORTable.h #usr/include/net-snmp/agent/table.h #usr/include/net-snmp/agent/table_array.h #usr/include/net-snmp/agent/table_container.h @@ -72,7 +80,11 @@ usr/bin/traptoemail #usr/include/net-snmp/agent/table_dataset.h #usr/include/net-snmp/agent/table_iterator.h #usr/include/net-snmp/agent/table_tdata.h +#usr/include/net-snmp/agent/util_funcs #usr/include/net-snmp/agent/util_funcs.h +#usr/include/net-snmp/agent/util_funcs/MIB_STATS_CACHE_TIMEOUT.h +#usr/include/net-snmp/agent/util_funcs/header_generic.h +#usr/include/net-snmp/agent/util_funcs/header_simple_table.h #usr/include/net-snmp/agent/var_struct.h #usr/include/net-snmp/agent/watcher.h #usr/include/net-snmp/config_api.h @@ -81,8 +93,8 @@ usr/bin/traptoemail #usr/include/net-snmp/library/README #usr/include/net-snmp/library/asn1.h #usr/include/net-snmp/library/callback.h +#usr/include/net-snmp/library/cert_util.h #usr/include/net-snmp/library/check_varbind.h -#usr/include/net-snmp/library/cmu_compat.h #usr/include/net-snmp/library/container.h #usr/include/net-snmp/library/container_binary_array.h #usr/include/net-snmp/library/container_iterator.h @@ -90,25 +102,34 @@ usr/bin/traptoemail #usr/include/net-snmp/library/container_null.h #usr/include/net-snmp/library/data_list.h #usr/include/net-snmp/library/default_store.h +#usr/include/net-snmp/library/dir_utils.h #usr/include/net-snmp/library/factory.h #usr/include/net-snmp/library/fd_event_manager.h #usr/include/net-snmp/library/file_utils.h #usr/include/net-snmp/library/getopt.h #usr/include/net-snmp/library/int64.h #usr/include/net-snmp/library/keytools.h +#usr/include/net-snmp/library/large_fd_set.h #usr/include/net-snmp/library/lcd_time.h #usr/include/net-snmp/library/md5.h #usr/include/net-snmp/library/mib.h #usr/include/net-snmp/library/mt_support.h +#usr/include/net-snmp/library/oid.h #usr/include/net-snmp/library/oid_stash.h #usr/include/net-snmp/library/parse.h #usr/include/net-snmp/library/read_config.h #usr/include/net-snmp/library/scapi.h #usr/include/net-snmp/library/snmp-tc.h #usr/include/net-snmp/library/snmp.h +#usr/include/net-snmp/library/snmpAliasDomain.h #usr/include/net-snmp/library/snmpCallbackDomain.h +#usr/include/net-snmp/library/snmpIPv4BaseDomain.h +#usr/include/net-snmp/library/snmpSocketBaseDomain.h +#usr/include/net-snmp/library/snmpTCPBaseDomain.h #usr/include/net-snmp/library/snmpTCPDomain.h +#usr/include/net-snmp/library/snmpUDPBaseDomain.h #usr/include/net-snmp/library/snmpUDPDomain.h +#usr/include/net-snmp/library/snmpUDPIPv4BaseDomain.h #usr/include/net-snmp/library/snmpUnixDomain.h #usr/include/net-snmp/library/snmp_alarm.h #usr/include/net-snmp/library/snmp_api.h @@ -129,6 +150,7 @@ usr/bin/traptoemail #usr/include/net-snmp/library/text_utils.h #usr/include/net-snmp/library/tools.h #usr/include/net-snmp/library/transform_oids.h +#usr/include/net-snmp/library/types.h #usr/include/net-snmp/library/ucd_compat.h #usr/include/net-snmp/library/vacm.h #usr/include/net-snmp/library/winpipe.h @@ -137,6 +159,7 @@ usr/bin/traptoemail #usr/include/net-snmp/machine/generic.h #usr/include/net-snmp/mib_api.h #usr/include/net-snmp/net-snmp-config.h +#usr/include/net-snmp/net-snmp-features.h #usr/include/net-snmp/net-snmp-includes.h #usr/include/net-snmp/output_api.h #usr/include/net-snmp/pdu_api.h @@ -150,17 +173,24 @@ usr/bin/traptoemail #usr/include/net-snmp/system/bsdi4.h #usr/include/net-snmp/system/cygwin.h #usr/include/net-snmp/system/darwin.h +#usr/include/net-snmp/system/darwin10.h #usr/include/net-snmp/system/darwin7.h #usr/include/net-snmp/system/darwin8.h #usr/include/net-snmp/system/darwin9.h #usr/include/net-snmp/system/dragonfly.h #usr/include/net-snmp/system/dynix.h #usr/include/net-snmp/system/freebsd.h +#usr/include/net-snmp/system/freebsd10.h +#usr/include/net-snmp/system/freebsd11.h +#usr/include/net-snmp/system/freebsd12.h #usr/include/net-snmp/system/freebsd2.h #usr/include/net-snmp/system/freebsd3.h #usr/include/net-snmp/system/freebsd4.h #usr/include/net-snmp/system/freebsd5.h #usr/include/net-snmp/system/freebsd6.h +#usr/include/net-snmp/system/freebsd7.h +#usr/include/net-snmp/system/freebsd8.h +#usr/include/net-snmp/system/freebsd9.h #usr/include/net-snmp/system/generic.h #usr/include/net-snmp/system/hpux.h #usr/include/net-snmp/system/irix.h @@ -169,6 +199,8 @@ usr/bin/traptoemail #usr/include/net-snmp/system/mips.h #usr/include/net-snmp/system/netbsd.h #usr/include/net-snmp/system/openbsd.h +#usr/include/net-snmp/system/openbsd4.h +#usr/include/net-snmp/system/openbsd5.h #usr/include/net-snmp/system/osf5.h #usr/include/net-snmp/system/solaris.h #usr/include/net-snmp/system/solaris2.3.h @@ -186,28 +218,28 @@ usr/bin/traptoemail #usr/lib/libnetsnmp.a #usr/lib/libnetsnmp.la usr/lib/libnetsnmp.so -usr/lib/libnetsnmp.so.15 -usr/lib/libnetsnmp.so.15.1.2 +usr/lib/libnetsnmp.so.30 +usr/lib/libnetsnmp.so.30.0.3 #usr/lib/libnetsnmpagent.a #usr/lib/libnetsnmpagent.la usr/lib/libnetsnmpagent.so -usr/lib/libnetsnmpagent.so.15 -usr/lib/libnetsnmpagent.so.15.1.2 +usr/lib/libnetsnmpagent.so.30 +usr/lib/libnetsnmpagent.so.30.0.3 #usr/lib/libnetsnmphelpers.a #usr/lib/libnetsnmphelpers.la usr/lib/libnetsnmphelpers.so -usr/lib/libnetsnmphelpers.so.15 -usr/lib/libnetsnmphelpers.so.15.1.2 +usr/lib/libnetsnmphelpers.so.30 +usr/lib/libnetsnmphelpers.so.30.0.3 #usr/lib/libnetsnmpmibs.a #usr/lib/libnetsnmpmibs.la usr/lib/libnetsnmpmibs.so -usr/lib/libnetsnmpmibs.so.15 -usr/lib/libnetsnmpmibs.so.15.1.2 +usr/lib/libnetsnmpmibs.so.30 +usr/lib/libnetsnmpmibs.so.30.0.3 #usr/lib/libnetsnmptrapd.a #usr/lib/libnetsnmptrapd.la usr/lib/libnetsnmptrapd.so -usr/lib/libnetsnmptrapd.so.15 -usr/lib/libnetsnmptrapd.so.15.1.2 +usr/lib/libnetsnmptrapd.so.30 +usr/lib/libnetsnmptrapd.so.30.0.3 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/Makefile.subs.pl #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP @@ -253,159 +285,37 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/default_s #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.bs usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.so #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/autosplit.ix -#usr/man/man1/encode_keychange.1 -#usr/man/man1/fixproc.1 -#usr/man/man1/mib2c-update.1 -#usr/man/man1/mib2c.1 -#usr/man/man1/net-snmp-config.1 -#usr/man/man1/snmpbulkget.1 -#usr/man/man1/snmpbulkwalk.1 -#usr/man/man1/snmpcmd.1 -#usr/man/man1/snmpconf.1 -#usr/man/man1/snmpdelta.1 -#usr/man/man1/snmpdf.1 -#usr/man/man1/snmpget.1 -#usr/man/man1/snmpgetnext.1 -#usr/man/man1/snmpinform.1 -#usr/man/man1/snmpnetstat.1 -#usr/man/man1/snmpset.1 -#usr/man/man1/snmpstatus.1 -#usr/man/man1/snmptable.1 -#usr/man/man1/snmptest.1 -#usr/man/man1/snmptranslate.1 -#usr/man/man1/snmptrap.1 -#usr/man/man1/snmpusm.1 -#usr/man/man1/snmpvacm.1 -#usr/man/man1/snmpwalk.1 -#usr/man/man1/tkmib.1 -#usr/man/man1/traptoemail.1 -#usr/man/man3/add_mibdir.3 -#usr/man/man3/add_module_replacement.3 -#usr/man/man3/config_perror.3 -#usr/man/man3/config_pwarn.3 -#usr/man/man3/default_store.3 -#usr/man/man3/fprint_description.3 -#usr/man/man3/fprint_objid.3 -#usr/man/man3/fprint_value.3 -#usr/man/man3/fprint_variable.3 -#usr/man/man3/get_module_node.3 -#usr/man/man3/init_mib.3 -#usr/man/man3/init_mib_internals.3 -#usr/man/man3/mib_api.3 -#usr/man/man3/netsnmp_Container_iterator.3 -#usr/man/man3/netsnmp_agent.3 -#usr/man/man3/netsnmp_baby_steps.3 -#usr/man/man3/netsnmp_bulk_to_next.3 -#usr/man/man3/netsnmp_cache_handler.3 -#usr/man/man3/netsnmp_container.3 -#usr/man/man3/netsnmp_debug.3 -#usr/man/man3/netsnmp_ds_get_boolean.3 -#usr/man/man3/netsnmp_ds_get_int.3 -#usr/man/man3/netsnmp_ds_get_string.3 -#usr/man/man3/netsnmp_ds_register_config.3 -#usr/man/man3/netsnmp_ds_register_premib.3 -#usr/man/man3/netsnmp_ds_set_boolean.3 -#usr/man/man3/netsnmp_ds_set_int.3 -#usr/man/man3/netsnmp_ds_set_string.3 -#usr/man/man3/netsnmp_ds_shutdown.3 -#usr/man/man3/netsnmp_example_scalar_int.3 -#usr/man/man3/netsnmp_handler.3 -#usr/man/man3/netsnmp_instance.3 -#usr/man/man3/netsnmp_iterator_info_s.3 -#usr/man/man3/netsnmp_leaf.3 -#usr/man/man3/netsnmp_library.3 -#usr/man/man3/netsnmp_mib_handler_methods.3 -#usr/man/man3/netsnmp_mib_utilities.3 -#usr/man/man3/netsnmp_mode_end_call.3 -#usr/man/man3/netsnmp_multiplexer.3 -#usr/man/man3/netsnmp_old_api.3 -#usr/man/man3/netsnmp_read_only.3 -#usr/man/man3/netsnmp_row_merge.3 -#usr/man/man3/netsnmp_scalar.3 -#usr/man/man3/netsnmp_scalar_group_group.3 -#usr/man/man3/netsnmp_serialize.3 -#usr/man/man3/netsnmp_stash_cache.3 -#usr/man/man3/netsnmp_table.3 -#usr/man/man3/netsnmp_table_array.3 -#usr/man/man3/netsnmp_table_data.3 -#usr/man/man3/netsnmp_table_dataset.3 -#usr/man/man3/netsnmp_table_iterator.3 -#usr/man/man3/netsnmp_utilities.3 -#usr/man/man3/netsnmp_watcher.3 -#usr/man/man3/print_description.3 -#usr/man/man3/print_mib.3 -#usr/man/man3/print_objid.3 -#usr/man/man3/print_value.3 -#usr/man/man3/print_variable.3 -#usr/man/man3/read_all_mibs.3 -#usr/man/man3/read_config.3 -#usr/man/man3/read_config_print_usage.3 -#usr/man/man3/read_configs.3 -#usr/man/man3/read_mib.3 -#usr/man/man3/read_module.3 -#usr/man/man3/read_module_node.3 -#usr/man/man3/read_objid.3 -#usr/man/man3/read_premib_configs.3 -#usr/man/man3/register_app_config_handler.3 -#usr/man/man3/register_app_premib_handler.3 -#usr/man/man3/register_config_handler.3 -#usr/man/man3/register_mib_handlers.3 -#usr/man/man3/register_premib_handler.3 -#usr/man/man3/send_easy_trap.3 -#usr/man/man3/send_trap_vars.3 -#usr/man/man3/send_v2trap.3 -#usr/man/man3/shutdown_mib.3 -#usr/man/man3/snmp_agent_api.3 -#usr/man/man3/snmp_alarm.3 -#usr/man/man3/snmp_alarm_register.3 -#usr/man/man3/snmp_alarm_register_hr.3 -#usr/man/man3/snmp_alarm_unregister.3 -#usr/man/man3/snmp_api.3 -#usr/man/man3/snmp_api_errstring.3 -#usr/man/man3/snmp_close.3 -#usr/man/man3/snmp_error.3 -#usr/man/man3/snmp_free_pdu.3 -#usr/man/man3/snmp_open.3 -#usr/man/man3/snmp_perror.3 -#usr/man/man3/snmp_read.3 -#usr/man/man3/snmp_select_info.3 -#usr/man/man3/snmp_send.3 -#usr/man/man3/snmp_sess_api.3 -#usr/man/man3/snmp_sess_async_send.3 -#usr/man/man3/snmp_sess_close.3 -#usr/man/man3/snmp_sess_error.3 -#usr/man/man3/snmp_sess_init.3 -#usr/man/man3/snmp_sess_open.3 -#usr/man/man3/snmp_sess_perror.3 -#usr/man/man3/snmp_sess_read.3 -#usr/man/man3/snmp_sess_select_info.3 -#usr/man/man3/snmp_sess_send.3 -#usr/man/man3/snmp_sess_session.3 -#usr/man/man3/snmp_sess_timeout.3 -#usr/man/man3/snmp_set_mib_warnings.3 -#usr/man/man3/snmp_set_save_descriptions.3 -#usr/man/man3/snmp_timeout.3 -#usr/man/man3/snmp_trap_api.3 -#usr/man/man3/snprint_objid.3 -#usr/man/man3/snprint_value.3 -#usr/man/man3/snprint_variable.3 -#usr/man/man3/sprint_realloc_objid.3 -#usr/man/man3/sprint_realloc_value.3 -#usr/man/man3/sprint_realloc_variable.3 -#usr/man/man3/unregister_app_config_handler.3 -#usr/man/man3/unregister_config_handler.3 -#usr/man/man5/mib2c.conf.5 -#usr/man/man5/snmp.conf.5 -#usr/man/man5/snmp_config.5 -#usr/man/man5/snmpd.conf.5 -#usr/man/man5/snmpd.examples.5 -#usr/man/man5/snmpd.internal.5 -#usr/man/man5/snmptrapd.conf.5 -#usr/man/man5/variables.5 -#usr/man/man8/snmpd.8 -#usr/man/man8/snmptrapd.8 usr/sbin/snmpd usr/sbin/snmptrapd +#usr/share/man/man1/agentxtrap.1 +#usr/share/man/man1/encode_keychange.1 +#usr/share/man/man1/fixproc.1 +#usr/share/man/man1/mib2c-update.1 +#usr/share/man/man1/mib2c.1 +#usr/share/man/man1/net-snmp-config.1 +#usr/share/man/man1/net-snmp-create-v3-user.1 +#usr/share/man/man1/snmp-bridge-mib.1 +#usr/share/man/man1/snmpbulkget.1 +#usr/share/man/man1/snmpbulkwalk.1 +#usr/share/man/man1/snmpcmd.1 +#usr/share/man/man1/snmpconf.1 +#usr/share/man/man1/snmpdelta.1 +#usr/share/man/man1/snmpdf.1 +#usr/share/man/man1/snmpget.1 +#usr/share/man/man1/snmpgetnext.1 +#usr/share/man/man1/snmpinform.1 +#usr/share/man/man1/snmpnetstat.1 +#usr/share/man/man1/snmpset.1 +#usr/share/man/man1/snmpstatus.1 +#usr/share/man/man1/snmptable.1 +#usr/share/man/man1/snmptest.1 +#usr/share/man/man1/snmptranslate.1 +#usr/share/man/man1/snmptrap.1 +#usr/share/man/man1/snmpusm.1 +#usr/share/man/man1/snmpvacm.1 +#usr/share/man/man1/snmpwalk.1 +#usr/share/man/man1/tkmib.1 +#usr/share/man/man1/traptoemail.1 #usr/share/man/man3/NetSNMP::ASN.3 #usr/share/man/man3/NetSNMP::OID.3 #usr/share/man/man3/NetSNMP::TrapReceiver.3 @@ -414,6 +324,109 @@ usr/sbin/snmptrapd #usr/share/man/man3/NetSNMP::default_store.3 #usr/share/man/man3/NetSNMP::netsnmp_request_infoPtr.3 #usr/share/man/man3/SNMP.3 +#usr/share/man/man3/add_mibdir.3 +#usr/share/man/man3/add_module_replacement.3 +#usr/share/man/man3/config_perror.3 +#usr/share/man/man3/config_pwarn.3 +#usr/share/man/man3/default_store.3 +#usr/share/man/man3/fprint_description.3 +#usr/share/man/man3/fprint_objid.3 +#usr/share/man/man3/fprint_value.3 +#usr/share/man/man3/fprint_variable.3 +#usr/share/man/man3/get_module_node.3 +#usr/share/man/man3/netsnmp_agent_api.3 +#usr/share/man/man3/netsnmp_config_api.3 +#usr/share/man/man3/netsnmp_init_mib.3 +#usr/share/man/man3/netsnmp_mib_api.3 +#usr/share/man/man3/netsnmp_pdu_api.3 +#usr/share/man/man3/netsnmp_read_module.3 +#usr/share/man/man3/netsnmp_sess_api.3 +#usr/share/man/man3/netsnmp_session_api.3 +#usr/share/man/man3/netsnmp_trap_api.3 +#usr/share/man/man3/netsnmp_varbind_api.3 +#usr/share/man/man3/print_description.3 +#usr/share/man/man3/print_mib.3 +#usr/share/man/man3/print_objid.3 +#usr/share/man/man3/print_value.3 +#usr/share/man/man3/print_variable.3 +#usr/share/man/man3/read_all_mibs.3 +#usr/share/man/man3/read_config_print_usage.3 +#usr/share/man/man3/read_configs.3 +#usr/share/man/man3/read_mib.3 +#usr/share/man/man3/read_objid.3 +#usr/share/man/man3/read_premib_configs.3 +#usr/share/man/man3/register_app_config_handler.3 +#usr/share/man/man3/register_app_prenetsnmp_mib_handler.3 +#usr/share/man/man3/register_config_handler.3 +#usr/share/man/man3/register_const_config_handler.3 +#usr/share/man/man3/register_mib_handlers.3 +#usr/share/man/man3/register_prenetsnmp_mib_handler.3 +#usr/share/man/man3/send_easy_trap.3 +#usr/share/man/man3/send_trap_vars.3 +#usr/share/man/man3/send_v2trap.3 +#usr/share/man/man3/shutdown_mib.3 +#usr/share/man/man3/snmp_add_null_var.3 +#usr/share/man/man3/snmp_alarm.3 +#usr/share/man/man3/snmp_alarm_register.3 +#usr/share/man/man3/snmp_alarm_register_hr.3 +#usr/share/man/man3/snmp_alarm_unregister.3 +#usr/share/man/man3/snmp_api_errstring.3 +#usr/share/man/man3/snmp_async_send.3 +#usr/share/man/man3/snmp_clone_pdu.3 +#usr/share/man/man3/snmp_clone_varbind.3 +#usr/share/man/man3/snmp_close.3 +#usr/share/man/man3/snmp_error.3 +#usr/share/man/man3/snmp_fix_pdu.3 +#usr/share/man/man3/snmp_free_pdu.3 +#usr/share/man/man3/snmp_free_var.3 +#usr/share/man/man3/snmp_free_varbind.3 +#usr/share/man/man3/snmp_open.3 +#usr/share/man/man3/snmp_parse_oid.3 +#usr/share/man/man3/snmp_pdu_add_variable.3 +#usr/share/man/man3/snmp_pdu_create.3 +#usr/share/man/man3/snmp_perror.3 +#usr/share/man/man3/snmp_read.3 +#usr/share/man/man3/snmp_select_info.3 +#usr/share/man/man3/snmp_send.3 +#usr/share/man/man3/snmp_sess_async_send.3 +#usr/share/man/man3/snmp_sess_close.3 +#usr/share/man/man3/snmp_sess_error.3 +#usr/share/man/man3/snmp_sess_init.3 +#usr/share/man/man3/snmp_sess_open.3 +#usr/share/man/man3/snmp_sess_perror.3 +#usr/share/man/man3/snmp_sess_read.3 +#usr/share/man/man3/snmp_sess_select_info.3 +#usr/share/man/man3/snmp_sess_send.3 +#usr/share/man/man3/snmp_sess_session.3 +#usr/share/man/man3/snmp_sess_synch_response.3 +#usr/share/man/man3/snmp_sess_timeout.3 +#usr/share/man/man3/snmp_set_mib_errors.3 +#usr/share/man/man3/snmp_set_mib_warnings.3 +#usr/share/man/man3/snmp_set_save_descriptions.3 +#usr/share/man/man3/snmp_set_var_objid.3 +#usr/share/man/man3/snmp_set_var_typed_integer.3 +#usr/share/man/man3/snmp_set_var_typed_value.3 +#usr/share/man/man3/snmp_set_var_value.3 +#usr/share/man/man3/snmp_synch_response.3 +#usr/share/man/man3/snmp_timeout.3 +#usr/share/man/man3/snmp_varlist_add_variable.3 +#usr/share/man/man3/snprint_description.3 +#usr/share/man/man3/snprint_objid.3 +#usr/share/man/man3/snprint_value.3 +#usr/share/man/man3/snprint_variable.3 +#usr/share/man/man3/unregister_all_config_handlers.3 +#usr/share/man/man3/unregister_app_config_handler.3 +#usr/share/man/man3/unregister_config_handler.3 +#usr/share/man/man5/mib2c.conf.5 +#usr/share/man/man5/snmp.conf.5 +#usr/share/man/man5/snmp_config.5 +#usr/share/man/man5/snmpd.conf.5 +#usr/share/man/man5/snmpd.examples.5 +#usr/share/man/man5/snmpd.internal.5 +#usr/share/man/man5/snmptrapd.conf.5 +#usr/share/man/man5/variables.5 +#usr/share/man/man8/snmpd.8 +#usr/share/man/man8/snmptrapd.8 usr/share/snmp usr/share/snmp/mib2c-data usr/share/snmp/mib2c-data/default-mfd-top.m2c @@ -425,6 +438,7 @@ usr/share/snmp/mib2c-data/generic-ctx-get.m2i usr/share/snmp/mib2c-data/generic-ctx-set.m2i usr/share/snmp/mib2c-data/generic-data-allocate.m2i usr/share/snmp/mib2c-data/generic-data-context.m2i +usr/share/snmp/mib2c-data/generic-get-U64.m2i usr/share/snmp/mib2c-data/generic-get-char.m2i usr/share/snmp/mib2c-data/generic-get-decl-bot.m2i usr/share/snmp/mib2c-data/generic-get-decl.m2i @@ -500,10 +514,12 @@ usr/share/snmp/mib2c.mfd.conf usr/share/snmp/mib2c.notify.conf usr/share/snmp/mib2c.old-api.conf usr/share/snmp/mib2c.perl.conf +usr/share/snmp/mib2c.raw-table.conf usr/share/snmp/mib2c.scalar.conf usr/share/snmp/mib2c.table_data.conf usr/share/snmp/mibs usr/share/snmp/mibs/AGENTX-MIB.txt +usr/share/snmp/mibs/BRIDGE-MIB.txt usr/share/snmp/mibs/DISMAN-EVENT-MIB.txt usr/share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt usr/share/snmp/mibs/DISMAN-SCRIPT-MIB.txt @@ -520,6 +536,7 @@ usr/share/snmp/mibs/IF-MIB.txt usr/share/snmp/mibs/INET-ADDRESS-MIB.txt usr/share/snmp/mibs/IP-FORWARD-MIB.txt usr/share/snmp/mibs/IP-MIB.txt +usr/share/snmp/mibs/IPV6-FLOW-LABEL-MIB.txt usr/share/snmp/mibs/IPV6-ICMP-MIB.txt usr/share/snmp/mibs/IPV6-MIB.txt usr/share/snmp/mibs/IPV6-TC.txt @@ -529,6 +546,7 @@ usr/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt usr/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt usr/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt usr/share/snmp/mibs/NET-SNMP-MIB.txt +usr/share/snmp/mibs/NET-SNMP-PASS-MIB.txt usr/share/snmp/mibs/NET-SNMP-TC.txt usr/share/snmp/mibs/NET-SNMP-VACM-MIB.txt usr/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt @@ -544,6 +562,8 @@ usr/share/snmp/mibs/SNMP-MPD-MIB.txt usr/share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt usr/share/snmp/mibs/SNMP-PROXY-MIB.txt usr/share/snmp/mibs/SNMP-TARGET-MIB.txt +usr/share/snmp/mibs/SNMP-TLS-TM-MIB.txt +usr/share/snmp/mibs/SNMP-TSM-MIB.txt usr/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt usr/share/snmp/mibs/SNMP-USM-AES-MIB.txt usr/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt @@ -555,6 +575,7 @@ usr/share/snmp/mibs/SNMPv2-TC.txt usr/share/snmp/mibs/SNMPv2-TM.txt usr/share/snmp/mibs/TCP-MIB.txt usr/share/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt +usr/share/snmp/mibs/TUNNEL-MIB.txt usr/share/snmp/mibs/UCD-DEMO-MIB.txt usr/share/snmp/mibs/UCD-DISKIO-MIB.txt usr/share/snmp/mibs/UCD-DLMOD-MIB.txt @@ -586,4 +607,5 @@ usr/share/snmp/snmpconf-data/snmptrapd-data/logging usr/share/snmp/snmpconf-data/snmptrapd-data/runtime usr/share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config usr/share/snmp/snmpconf-data/snmptrapd-data/traphandle +var/ipfire/backup/addons/includes/netsnmpd etc/rc.d/init.d/netsnmpd 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/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/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/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="$("; -print "$Lang::tr{'flag'}"; -print "$Lang::tr{'countrycode'}"; -print "$Lang::tr{'country'}"; -print " "; -print "$Lang::tr{'flag'}"; -print "$Lang::tr{'countrycode'}"; -print "$Lang::tr{'country'}"; - -@flaglist = <$flagdir/*>; - -undef @flaglistfiles; - -foreach (@flaglist) -{ - if (!-d) { push(@flaglistfiles,substr($_,rindex($_,"/")+1)); } -} -my $col=""; -foreach $flag (@flaglistfiles) -{ + +print< + + $Lang::tr{'flag'} + $Lang::tr{'countrycode'} + $Lang::tr{'country'} +   + $Lang::tr{'flag'} + $Lang::tr{'countrycode'} + $Lang::tr{'country'} + +END + +# Get a list of all supported country codes. +my @countries = Locale::Codes::Country::all_country_codes(); + +# Loop through whole country list. +foreach my $country (@countries) { $lines++; - my $flagcode = uc(substr($flag, 0, 2)); - my $fcode = lc($flagcode); - 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'; } + # Convert country code into upper case. + my $country_uc = uc($country); + + # Get flag icon for of the country. + my $flag_icon = &GeoIP::get_flag_icon($country); + + # Get country name. + my $name = &GeoIP::get_full_country_name($country); + if ($lines % 2) { - print "$flagcode"; - print "$flagcode"; - print "$country\n"; - } - else { + print "$country_uc"; + print "$country_uc"; + print "$name\n"; + } else { $lines2++; if($lines2 % 2) { $col="style='background-color:${Header::table2colour};'"; @@ -81,25 +80,25 @@ foreach $flag (@flaglistfiles) $col="style='background-color:${Header::table1colour};'"; } print ""; - print "$flagcode"; - print "$flagcode"; - print "$country"; + print "$country_uc"; + print "$country_uc"; + print "$name"; print " "; + + # Finish column when the last element in the array has passed and we have an uneven amount of items. + if ( $country eq $countries[-1] ) { + print " \n"; + print " \n"; + print " \n"; + } } } - - print ""; &Header::closebox(); &Header::closebigbox(); -print < -$Lang::tr{'back'} - -END -; +print "\n"; &Header::closepage(); diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 044aa97184..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 = ''; @@ -700,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/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 9a7d983eef..dd48d58cb0 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -438,6 +438,9 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'2') { if ($dhcpsettings{'KEY2'} eq '') { #add or edit ? unshift (@current2, "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n"); &General::log($Lang::tr{'fixed ip lease added'}); + + # Enter edit mode + $dhcpsettings{'KEY2'} = $key; } else { @current2[$dhcpsettings{'KEY2'}] = "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n"; $dhcpsettings{'KEY2'} = ''; # End edit mode @@ -857,12 +860,31 @@ print < +
END ; #Edited line number (KEY2) passed until cleared by 'save' or 'remove' or 'new sort order' +# Search for static leases +my $search_query = $dhcpsettings{'q'}; + +if (scalar @current2 >= 10) { + print < + + + + + +
+ + +
+ +END +} + print < @@ -918,6 +940,11 @@ foreach my $line (@current2) { $gdesc = $Lang::tr{'click to enable'}; } + # Skip all entries that do not match the search query + if ($search_query ne "") { + next if (!grep(/$search_query/, @temp)); + } + if ($dhcpsettings{'KEY2'} eq $key) { print ""; $col="bgcolor='${Header::colouryellow}'"; diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 39b732ce36..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=(); @@ -74,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"; @@ -154,6 +157,19 @@ print<"; } + # geoip locations / groups. + my @geoip_locations = &fwlib::get_geoip_locations(); + + print "\n"; + print "\n"; + print "\n"; + print "\n"; + #End left table. start right table (vpn) print"
$Lang::tr{'mac address'}
$Lang::tr{'geoip'}
"; # CCD networks @@ -1397,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=(); @@ -1591,7 +1656,7 @@ END $Lang::tr{'fwdfw use nat'}
-
+
+ - +
@@ -1603,9 +1668,9 @@ END END print <$Lang::tr{'dnat address'}:$Lang::tr{'dnat address'}: - END @@ -1636,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) { @@ -2525,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'){ @@ -2601,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'){ @@ -2618,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 f42947e8c7..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; @@ -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..056b333e8c --- /dev/null +++ b/html/cgi-bin/geoip-block.cgi @@ -0,0 +1,272 @@ +#!/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"; + + # Finish column when the last element in the array has passed and we have an uneven amount of items. + if(! ($lines2 % 2) && ($location eq $locations[-1] )) { + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\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/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 33f521e756..59677a4d11 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -793,15 +793,15 @@ print <$Lang::tr{'pptp settings'}
 
 
-        Peer
+        $Lang::tr{'pptp peer'}:
         
 
 
-        My Netconfig
+        $Lang::tr{'pptp netconfig'}:
         
 
 
-        PPTP Route *
+        $Lang::tr{'pptp route'}: *
         
 
 
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 "
 					
 					
+					
 					
 					
-					
 				
 			
 			
@@ -2445,9 +2454,9 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
 					
 					
 					
+					
 					
 					
-					
 				
 			
 		
@@ -2465,14 +2474,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