Merge commit 'ms/openvpn-n2n' into next

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 1961246146dcf036df808dc4ffbc890163804b5c..8d047c2a50e582de6c53e8c75778cab80e16f83f 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -257,11 +257,11 @@ sub updateloadgraph {
                "DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE",
                "DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE",
                "DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE",
-               "AREA:load1".$color{"color13"}."A0:1 Minute:",
+               "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}.":",
                "GPRINT:load1:LAST:%5.2lf",
-               "AREA:load5".$color{"color18"}."A0:5 Minuten:",
+               "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":",
                "GPRINT:load5:LAST:%5.2lf",
-               "AREA:load15".$color{"color14"}."A0:15 Minuten:",
+               "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":",
                "GPRINT:load15:LAST:%5.2lf\\j",
                "LINE1:load5".$color{"color13"},
                "LINE1:load1".$color{"color18"},
@@ -1009,7 +1009,6 @@ sub updatecpufreqgraph {
                "--alt-y-grid",
                "-w 600",
                "-h 125",
-               "-l 0",
                "-r",
                "-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period},
                "-v MHz",

diff --git a/config/cfgroot/useragents b/config/cfgroot/useragents
index 9ddd6d82bc4d360373658478e8743e59fc05d8b9..5fe3446c6176ade7b7bda41f5cc79b810623aaf8 100644 (file)
--- a/config/cfgroot/useragents
+++ b/config/cfgroot/useragents
@@ -11,6 +11,7 @@ GOZILLA,Go!Zilla,(Go!Zilla)
 GOOGLE,Google Toolbar,(Google\sToolbar)
 JAVA,Java,(Java)
 KONQUEROR,Konqueror,(Konqueror)
+LIBWWWPERL,libwww-perl,(libww-perl)
 LYNX,Lynx,(Lynx)
 MSIE,Internet Explorer,(MSIE.*[)]$)
 NETSCAPE,Netscape,(^Mozilla\/4.[7|8])|(Netscape)

diff --git a/config/client175/site.conf b/config/client175/site.conf
index f98d8e8dd824bf54e20c158739fd1bdb7af4fb86..9abe832a18cec6815c323887fd32cd26c05e3d08 100644 (file)
--- a/config/client175/site.conf
+++ b/config/client175/site.conf
@@ -1,7 +1,4 @@
 # Edit this file as needed and save it as: site.conf
-# # and ; at the begining of lines indicate comments.  Remove the ; to 
-# activate a setting.
-#
 # The application will work without it but tag editing will not work
 # without saving this file as site.conf with the correct music_directory
 # set.
@@ -12,6 +9,7 @@
 # from this server via the music_directory option configured below.
 mpd_host: "localhost"
 mpd_port: 6600
+;server_root: "/client175"
 
 # Location of the music directory, required for editing tags.  This variable
 # is also used to identify the folder for a given file in local cover lookups.
@@ -21,17 +19,17 @@ music_directory: "/var/mp3"
 # to limit which one it listens on.  "0.0.0.0" listens on all interfaces.
 server.socket_host: "0.0.0.0"
 
-# Don't run this as root in order to use port 80!  This app was not built 
+# Don't run this as root in order to use port 80!  This app was not built
 # to be secure, it must be run with limited access.  Default is port 8080.
 server.socket_port: 8800
 
 # Setting the 'run_as' variable will allow you to start the process as root
 # and drop the privelages to a restricted user account during server startup.
-# This feature is useful when starting client175 during the init process 
+# This feature is useful when starting client175 during the init process
 # and/or when starting as root to run on port 80.
 ;run_as: "user"
 
-# Setting environment to production removes the verbose console output 
+# Setting environment to production removes the verbose console output
 # and disables auto-reload on file changes.
 environment: "production"
 
@@ -41,7 +39,7 @@ environment: "production"
 include_playlist_counts: True
 
 # List of local locations to search for cover art.  The server will check
-# these locations for covers before using web services.  The following 
+# these locations for covers before using web services.  The following
 # variables are available fo substitution:
 #   {folder}   Folder a given file is in
 #   {artist}   Artist name

diff --git a/config/etc/modprobe.d/cfg80211 b/config/etc/modprobe.d/cfg80211
index 3339ea8fdd4ceb44260f1a5ad0817df8ad139da0..9e04ea6717ef936e6b9e88954b30948488711189 100644 (file)
--- a/config/etc/modprobe.d/cfg80211
+++ b/config/etc/modprobe.d/cfg80211
@@ -1,2 +1,2 @@
-options cfg80211 ieee80211_regdom=EU
+#options cfg80211 ieee80211_regdom=DE
 blacklist ieee80211

diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf
index 8855e3206e4b8ded1b161cd3ca26aa3abf064657..105feaa0acd34872c9a8982f36840a7e05281fa8 100644 (file)
--- a/config/etc/sysctl.conf
+++ b/config/etc/sysctl.conf
@@ -3,19 +3,18 @@ net.ipv4.ip_dynaddr = 1
 net.ipv4.icmp_echo_ignore_broadcasts = 1
 net.ipv4.icmp_ignore_bogus_error_responses = 1
 
-net.ipv4.tcp_sack = 0
-net.ipv4.tcp_timestamps = 0
 net.ipv4.tcp_syncookies = 1
 net.ipv4.tcp_fin_timeout = 30
-net.ipv4.tcp_window_scaling = 0
 net.ipv4.tcp_syn_retries = 3
 net.ipv4.tcp_synack_retries = 3
 
+net.ipv4.conf.default.arp_filter = 1
 net.ipv4.conf.default.rp_filter = 0
 net.ipv4.conf.default.accept_redirects = 0
 net.ipv4.conf.default.accept_source_route = 0
 net.ipv4.conf.default.log_martians = 1
 
+net.ipv4.conf.all.arp_filter = 1
 net.ipv4.conf.all.rp_filter = 0
 net.ipv4.conf.all.accept_redirects = 0
 net.ipv4.conf.all.accept_source_route = 0

diff --git a/config/httpd/server-tuning.conf b/config/httpd/server-tuning.conf
index 9cb766232787f8d6ad1581b6d53c31a64d0f4cc9..183ce80fa046eea79331630323544e61a56e9d9c 100644 (file)
--- a/config/httpd/server-tuning.conf
+++ b/config/httpd/server-tuning.conf
@@ -18,8 +18,8 @@ MaxKeepAliveRequests 100
 KeepAliveTimeout 15
 
 MinSpareServers 1
-MaxSpareServers 2
-StartServers 2
+MaxSpareServers 10
+StartServers 1
 MaxClients 10
 MaxRequestsPerChild 100
 

diff --git a/config/install/profile b/config/install/profile
index 7f830af6c28a53f6044cd7946f291cf3de861afe..02c63b9b7e9611761747276961b39760a40eebf2 100644 (file)
--- a/config/install/profile
+++ b/config/install/profile
@@ -4,4 +4,4 @@ TERM=linux
 LANG=en_US.UTF-8
 export TERM LANG
 
-/bin/unicode_start lat0-16
+/usr/bin/unicode_start

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 3fd80c88648519f0e11f5dbd8e265585a2241127..2c08a1bd29af2250398109cc2ff8fd36e1bd812c 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32.27-ipfire
-# Thu Dec 30 13:29:23 2010
+# Linux kernel version: 2.6.32.41-ipfire
+# Tue May 31 14:26:02 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -96,7 +96,6 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-# CONFIG_GROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
@@ -277,9 +276,9 @@ CONFIG_DMI=y
 # CONFIG_IOMMU_HELPER is not set
 CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=8
-CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -1686,13 +1685,8 @@ CONFIG_WLAN=y
 # CONFIG_WLAN_PRE80211 is not set
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
 CONFIG_AIRO=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
@@ -1700,100 +1694,32 @@ CONFIG_PCMCIA_ATMEL=m
 CONFIG_AT76C50X_USB=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
+# CONFIG_PRISM54 is not set
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
+# CONFIG_RTL8180 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_ADM8211 is not set
 # CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_LEDS=y
-CONFIG_ATH_COMMON=m
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH9K=m
-# CONFIG_ATH9K_DEBUG is not set
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
-CONFIG_IPW2100=m
-# CONFIG_IPW2100_MONITOR is not set
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-# CONFIG_IPW2200_MONITOR is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
+# CONFIG_MWL8K is not set
+# CONFIG_P54_COMMON is not set
+# CONFIG_ATH_COMMON is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+# CONFIG_IWLWIFI is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_HT=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_HERMES=m
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_WL12XX=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_IWM=m
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_ZD1211RW is not set
+# CONFIG_RT2X00 is not set
+# CONFIG_HERMES is not set
+# CONFIG_WL12XX is not set
+# CONFIG_IWM is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -2498,10 +2424,9 @@ CONFIG_SSB_POSSIBLE=y
 #
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
+# CONFIG_SSB_B43_PCI_BRIDGE is not set
 CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
 CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST_POSSIBLE=y

diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 6d82de48b3bc975f6d3d96d6a03ef5fdfc12f582..4b23df337a261c302f4087c9c72862f8a76994f5 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32.27-ipfire
-# Thu Dec 30 13:35:50 2010
+# Linux kernel version: 2.6.32.41-ipfire-pae
+# Sat May 31 15:00:00 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -96,7 +96,6 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-# CONFIG_GROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
@@ -203,8 +202,9 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_SMP=y
 CONFIG_SPARSE_IRQ=y
+CONFIG_NUMA_IRQ_DESC=y
 CONFIG_X86_MPPARSE=y
-# CONFIG_X86_BIGSMP is not set
+CONFIG_X86_BIGSMP=y
 CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_MRST is not set
@@ -280,10 +280,10 @@ CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
 # CONFIG_IOMMU_HELPER is not set
 CONFIG_IOMMU_API=y
-CONFIG_NR_CPUS=8
-CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_NR_CPUS=256
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -314,19 +314,29 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
 CONFIG_X86_PAE=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=3
+CONFIG_HAVE_ARCH_BOOTMEM=y
+CONFIG_ARCH_HAVE_MEMORY_PRESENT=y
+CONFIG_NEED_NODE_MEMMAP_SIZE=y
+CONFIG_HAVE_ARCH_ALLOC_REMAP=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_DISCONTIGMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
+CONFIG_DISCONTIGMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
@@ -363,6 +373,7 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_COMPAT_VDSO=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+# CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID is not set
 
 #
 # Power management and ACPI options
@@ -392,6 +403,7 @@ CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_NUMA is not set
 CONFIG_ACPI_CUSTOM_DSDT_FILE=""
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
@@ -1692,13 +1704,8 @@ CONFIG_WLAN=y
 # CONFIG_WLAN_PRE80211 is not set
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
 CONFIG_AIRO=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
@@ -1706,100 +1713,32 @@ CONFIG_PCMCIA_ATMEL=m
 CONFIG_AT76C50X_USB=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
+# CONFIG_PRISM54 is not set
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
+# CONFIG_RTL8180 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_ADM8211 is not set
 # CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_LEDS=y
-CONFIG_ATH_COMMON=m
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH9K=m
-# CONFIG_ATH9K_DEBUG is not set
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
-CONFIG_IPW2100=m
-# CONFIG_IPW2100_MONITOR is not set
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-# CONFIG_IPW2200_MONITOR is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
+# CONFIG_MWL8K is not set
+# CONFIG_P54_COMMON is not set
+# CONFIG_ATH_COMMON is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+# CONFIG_IWLWIFI is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_HT=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_HERMES=m
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_WL12XX=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_IWM=m
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_ZD1211RW is not set
+# CONFIG_RT2X00 is not set
+# CONFIG_HERMES is not set
+# CONFIG_WL12XX is not set
+# CONFIG_IWM is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers

diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen
index e5122a97d2ba1cd6e53382014745ae2fbe7c0c64..72fd49098ce4a9b9a1aecdd8010416d02b88d5f1 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32.33
-# Mon Mar 21 14:20:43 2011
+# Linux kernel version: 2.6.32.41-ipfire-xen
+# Mon May 31 15:00:00 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1482,13 +1482,8 @@ CONFIG_WLAN=y
 # CONFIG_WLAN_PRE80211 is not set
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
 CONFIG_AIRO=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
@@ -1496,100 +1491,32 @@ CONFIG_PCMCIA_ATMEL=m
 CONFIG_AT76C50X_USB=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
+# CONFIG_PRISM54 is not set
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
+# CONFIG_RTL8180 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_ADM8211 is not set
 # CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_LEDS=y
-CONFIG_ATH_COMMON=m
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH9K=m
-# CONFIG_ATH9K_DEBUG is not set
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
-CONFIG_IPW2100=m
-# CONFIG_IPW2100_MONITOR is not set
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-# CONFIG_IPW2200_MONITOR is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
+# CONFIG_MWL8K is not set
+# CONFIG_P54_COMMON is not set
+# CONFIG_ATH_COMMON is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+# CONFIG_IWLWIFI is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_HT=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_HERMES=m
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_WL12XX=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_IWM=m
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_ZD1211RW is not set
+# CONFIG_RT2X00 is not set
+# CONFIG_HERMES is not set
+# CONFIG_WL12XX is not set
+# CONFIG_IWM is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers

diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu
index abc6bc6afb5973da8fcfc92e82079b74fdd896ae..f4645b8fc7647882bc006572998f08f5263a674f 100644 (file)
--- a/config/menu/30-network.menu
+++ b/config/menu/30-network.menu
@@ -35,6 +35,12 @@
                                 'title' => "$Lang::tr{'edit hosts'}",
                                 'enabled' => 1,
                                 };
+    $subnetwork->{'51.routes'} = {
+                                'caption' => $Lang::tr{'static routes'},
+                                'uri' => '/cgi-bin/routing.cgi',
+                                'title' => "$Lang::tr{'static routes'}",
+                                'enabled' => 1,
+                                };
     $subnetwork->{'60.upload'} = {
                                  'caption' => $Lang::tr{'upload'},
                                  'uri' => '/cgi-bin/upload.cgi',

diff --git a/config/mpfire/mpd.conf b/config/mpfire/mpd.conf
index 10da064c30a7f447f5b8715737be4fae394ffb1f..d66481ecfdd6ef7ad33755a70876961f0b637f01 100644 (file)
--- a/config/mpfire/mpd.conf
+++ b/config/mpfire/mpd.conf
@@ -7,7 +7,6 @@ port "6600"
 music_directory "/var/mp3"
 playlist_directory "/var/ipfire/mpfire"
 log_file "/var/log/mpd.log"
-error_file "/var/log/mpd.error.log"
 pid_file "/var/run/mpd.pid"
 ##########################################################
 

diff --git a/config/mpfire/webradio b/config/mpfire/webradio
index e11f6e362e224c7f8b2b1ff32c358e05ce1a284e..402c31a4cc79a172e5da489783bb60fa1e68b87f 100644 (file)
--- a/config/mpfire/webradio
+++ b/config/mpfire/webradio
@@ -10,4 +10,5 @@ rmnradio.powerstream.de:8022|RMNradio|http://www.rmnradio.de/
 relay.radio.ethz.ch:8000/kohina.ogg|Kohina|http://www.kohina.com
 relay1.slayradio.org:8000|Slay Radio|http://www.slayradio.com/
 demovibes.de:8000/necta128.ogg|Nectarine Demoscene Radio|http://www.scenemusic.eu/
+r1.scenesat.com:8000/scenesathi|SceneSat Radio|http://www.scenesat.com
 radioparadise.steadyhost.com:8060|Radio Paradise|http://www.radioparadise.com/

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index be4648b0a833d794c518a1eca48ffe7e1e765e09..2eab3b5e72b5eb9fc9e41be9499f5bf0a291ebc8 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -323,12 +323,14 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/developer/debugging.html.en
 #srv/web/ipfire/manual/developer/documenting.html
 #srv/web/ipfire/manual/developer/documenting.html.en
+#srv/web/ipfire/manual/developer/documenting.html.zh-cn
 #srv/web/ipfire/manual/developer/filters.html
 #srv/web/ipfire/manual/developer/filters.html.en
 #srv/web/ipfire/manual/developer/hooks.html
 #srv/web/ipfire/manual/developer/hooks.html.en
 #srv/web/ipfire/manual/developer/index.html
 #srv/web/ipfire/manual/developer/index.html.en
+#srv/web/ipfire/manual/developer/index.html.zh-cn
 #srv/web/ipfire/manual/developer/modules.html
 #srv/web/ipfire/manual/developer/modules.html.en
 #srv/web/ipfire/manual/developer/modules.html.ja.utf8
@@ -355,6 +357,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/faq/index.html
 #srv/web/ipfire/manual/faq/index.html.en
 #srv/web/ipfire/manual/faq/index.html.tr.utf8
+#srv/web/ipfire/manual/faq/index.html.zh-cn
 #srv/web/ipfire/manual/filter.html
 #srv/web/ipfire/manual/filter.html.en
 #srv/web/ipfire/manual/filter.html.es
@@ -378,11 +381,13 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/handler.html.ko.euc-kr
 #srv/web/ipfire/manual/handler.html.ru.koi8-r
 #srv/web/ipfire/manual/handler.html.tr.utf8
+#srv/web/ipfire/manual/handler.html.zh-cn
 #srv/web/ipfire/manual/howto
 #srv/web/ipfire/manual/howto/access.html
 #srv/web/ipfire/manual/howto/access.html.en
 #srv/web/ipfire/manual/howto/auth.html
 #srv/web/ipfire/manual/howto/auth.html.en
+#srv/web/ipfire/manual/howto/auth.html.fr
 #srv/web/ipfire/manual/howto/auth.html.ja.utf8
 #srv/web/ipfire/manual/howto/auth.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/auth.html.tr.utf8
@@ -392,6 +397,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/howto/cgi.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/htaccess.html
 #srv/web/ipfire/manual/howto/htaccess.html.en
+#srv/web/ipfire/manual/howto/htaccess.html.fr
 #srv/web/ipfire/manual/howto/htaccess.html.ja.utf8
 #srv/web/ipfire/manual/howto/htaccess.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/htaccess.html.pt-br
@@ -399,6 +405,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/howto/index.html.en
 #srv/web/ipfire/manual/howto/index.html.ja.utf8
 #srv/web/ipfire/manual/howto/index.html.ko.euc-kr
+#srv/web/ipfire/manual/howto/index.html.zh-cn
 #srv/web/ipfire/manual/howto/public_html.html
 #srv/web/ipfire/manual/howto/public_html.html.en
 #srv/web/ipfire/manual/howto/public_html.html.ja.utf8
@@ -432,6 +439,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/images/mod_rewrite_fig2.gif
 #srv/web/ipfire/manual/images/mod_rewrite_fig2.png
 #srv/web/ipfire/manual/images/pixel.gif
+#srv/web/ipfire/manual/images/rewrite_rule_flow.png
 #srv/web/ipfire/manual/images/right.gif
 #srv/web/ipfire/manual/images/ssl_intro_fig1.gif
 #srv/web/ipfire/manual/images/ssl_intro_fig1.png
@@ -440,6 +448,8 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/images/ssl_intro_fig3.gif
 #srv/web/ipfire/manual/images/ssl_intro_fig3.png
 #srv/web/ipfire/manual/images/sub.gif
+#srv/web/ipfire/manual/images/syntax_rewritecond.png
+#srv/web/ipfire/manual/images/syntax_rewriterule.png
 #srv/web/ipfire/manual/images/up.gif
 #srv/web/ipfire/manual/index.html
 #srv/web/ipfire/manual/index.html.de
@@ -450,6 +460,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/index.html.ko.euc-kr
 #srv/web/ipfire/manual/index.html.pt-br
 #srv/web/ipfire/manual/index.html.tr.utf8
+#srv/web/ipfire/manual/index.html.zh-cn
 #srv/web/ipfire/manual/install.html
 #srv/web/ipfire/manual/install.html.de
 #srv/web/ipfire/manual/install.html.en
@@ -479,6 +490,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/misc/index.html.en
 #srv/web/ipfire/manual/misc/index.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/index.html.tr.utf8
+#srv/web/ipfire/manual/misc/index.html.zh-cn
 #srv/web/ipfire/manual/misc/password_encryptions.html
 #srv/web/ipfire/manual/misc/password_encryptions.html.en
 #srv/web/ipfire/manual/misc/perf-tuning.html
@@ -504,6 +516,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/core.html
 #srv/web/ipfire/manual/mod/core.html.de
 #srv/web/ipfire/manual/mod/core.html.en
+#srv/web/ipfire/manual/mod/core.html.fr
 #srv/web/ipfire/manual/mod/core.html.ja.utf8
 #srv/web/ipfire/manual/mod/core.html.tr.utf8
 #srv/web/ipfire/manual/mod/directive-dict.html
@@ -519,6 +532,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/directives.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/directives.html.ru.koi8-r
 #srv/web/ipfire/manual/mod/directives.html.tr.utf8
+#srv/web/ipfire/manual/mod/directives.html.zh-cn
 #srv/web/ipfire/manual/mod/event.html
 #srv/web/ipfire/manual/mod/event.html.en
 #srv/web/ipfire/manual/mod/index.html
@@ -528,6 +542,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/index.html.ja.utf8
 #srv/web/ipfire/manual/mod/index.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/index.html.tr.utf8
+#srv/web/ipfire/manual/mod/index.html.zh-cn
 #srv/web/ipfire/manual/mod/mod_actions.html
 #srv/web/ipfire/manual/mod/mod_actions.html.de
 #srv/web/ipfire/manual/mod/mod_actions.html.en
@@ -544,13 +559,16 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/mod_asis.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_auth_basic.html
 #srv/web/ipfire/manual/mod/mod_auth_basic.html.en
+#srv/web/ipfire/manual/mod/mod_auth_basic.html.fr
 #srv/web/ipfire/manual/mod/mod_auth_basic.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_auth_basic.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_auth_digest.html
 #srv/web/ipfire/manual/mod/mod_auth_digest.html.en
+#srv/web/ipfire/manual/mod/mod_auth_digest.html.fr
 #srv/web/ipfire/manual/mod/mod_auth_digest.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authn_alias.html
 #srv/web/ipfire/manual/mod/mod_authn_alias.html.en
+#srv/web/ipfire/manual/mod/mod_authn_alias.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_anon.html
 #srv/web/ipfire/manual/mod/mod_authn_anon.html.en
 #srv/web/ipfire/manual/mod/mod_authn_anon.html.ja.utf8
@@ -567,10 +585,12 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/mod_authn_default.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authn_file.html
 #srv/web/ipfire/manual/mod/mod_authn_file.html.en
+#srv/web/ipfire/manual/mod/mod_authn_file.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_file.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authn_file.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authnz_ldap.html
 #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.en
+#srv/web/ipfire/manual/mod/mod_authnz_ldap.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_dbm.html
 #srv/web/ipfire/manual/mod/mod_authz_dbm.html.en
 #srv/web/ipfire/manual/mod/mod_authz_dbm.html.ko.euc-kr
@@ -596,6 +616,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/mod_authz_user.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_autoindex.html
 #srv/web/ipfire/manual/mod/mod_autoindex.html.en
+#srv/web/ipfire/manual/mod/mod_autoindex.html.fr
 #srv/web/ipfire/manual/mod/mod_autoindex.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_autoindex.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_autoindex.html.tr.utf8
@@ -724,6 +745,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/mod_nw_ssl.html.en
 #srv/web/ipfire/manual/mod/mod_proxy.html
 #srv/web/ipfire/manual/mod/mod_proxy.html.en
+#srv/web/ipfire/manual/mod/mod_proxy.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_ajp.html
 #srv/web/ipfire/manual/mod/mod_proxy_ajp.html.en
@@ -738,12 +760,14 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/mod_proxy_ftp.html.en
 #srv/web/ipfire/manual/mod/mod_proxy_http.html
 #srv/web/ipfire/manual/mod/mod_proxy_http.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_http.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en
 #srv/web/ipfire/manual/mod/mod_reqtimeout.html
 #srv/web/ipfire/manual/mod/mod_reqtimeout.html.en
 #srv/web/ipfire/manual/mod/mod_rewrite.html
 #srv/web/ipfire/manual/mod/mod_rewrite.html.en
+#srv/web/ipfire/manual/mod/mod_rewrite.html.fr
 #srv/web/ipfire/manual/mod/mod_setenvif.html
 #srv/web/ipfire/manual/mod/mod_setenvif.html.en
 #srv/web/ipfire/manual/mod/mod_setenvif.html.ja.utf8
@@ -769,6 +793,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/mod_substitute.html.en
 #srv/web/ipfire/manual/mod/mod_suexec.html
 #srv/web/ipfire/manual/mod/mod_suexec.html.en
+#srv/web/ipfire/manual/mod/mod_suexec.html.fr
 #srv/web/ipfire/manual/mod/mod_suexec.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_suexec.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_suexec.html.tr.utf8
@@ -821,6 +846,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/quickreference.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/quickreference.html.ru.koi8-r
 #srv/web/ipfire/manual/mod/quickreference.html.tr.utf8
+#srv/web/ipfire/manual/mod/quickreference.html.zh-cn
 #srv/web/ipfire/manual/mod/worker.html
 #srv/web/ipfire/manual/mod/worker.html.de
 #srv/web/ipfire/manual/mod/worker.html.en
@@ -834,6 +860,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mpm.html.ja.utf8
 #srv/web/ipfire/manual/mpm.html.ko.euc-kr
 #srv/web/ipfire/manual/mpm.html.tr.utf8
+#srv/web/ipfire/manual/mpm.html.zh-cn
 #srv/web/ipfire/manual/new_features_2_0.html
 #srv/web/ipfire/manual/new_features_2_0.html.de
 #srv/web/ipfire/manual/new_features_2_0.html.en
@@ -856,6 +883,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/platform/index.html
 #srv/web/ipfire/manual/platform/index.html.en
 #srv/web/ipfire/manual/platform/index.html.ko.euc-kr
+#srv/web/ipfire/manual/platform/index.html.zh-cn
 #srv/web/ipfire/manual/platform/netware.html
 #srv/web/ipfire/manual/platform/netware.html.en
 #srv/web/ipfire/manual/platform/netware.html.ko.euc-kr
@@ -917,6 +945,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/programs/index.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/index.html.ru.koi8-r
 #srv/web/ipfire/manual/programs/index.html.tr.utf8
+#srv/web/ipfire/manual/programs/index.html.zh-cn
 #srv/web/ipfire/manual/programs/logresolve.html
 #srv/web/ipfire/manual/programs/logresolve.html.en
 #srv/web/ipfire/manual/programs/logresolve.html.ko.euc-kr
@@ -934,19 +963,36 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/programs/suexec.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/suexec.html.tr.utf8
 #srv/web/ipfire/manual/rewrite
+#srv/web/ipfire/manual/rewrite/access.html
+#srv/web/ipfire/manual/rewrite/access.html.en
+#srv/web/ipfire/manual/rewrite/advanced.html
+#srv/web/ipfire/manual/rewrite/advanced.html.en
+#srv/web/ipfire/manual/rewrite/avoid.html
+#srv/web/ipfire/manual/rewrite/avoid.html.en
+#srv/web/ipfire/manual/rewrite/flags.html
+#srv/web/ipfire/manual/rewrite/flags.html.en
+#srv/web/ipfire/manual/rewrite/flags.html.fr
+#srv/web/ipfire/manual/rewrite/htaccess.html
+#srv/web/ipfire/manual/rewrite/htaccess.html.en
 #srv/web/ipfire/manual/rewrite/index.html
 #srv/web/ipfire/manual/rewrite/index.html.en
+#srv/web/ipfire/manual/rewrite/index.html.fr
 #srv/web/ipfire/manual/rewrite/index.html.tr.utf8
-#srv/web/ipfire/manual/rewrite/rewrite_flags.html
-#srv/web/ipfire/manual/rewrite/rewrite_flags.html.en
-#srv/web/ipfire/manual/rewrite/rewrite_guide.html
-#srv/web/ipfire/manual/rewrite/rewrite_guide.html.en
-#srv/web/ipfire/manual/rewrite/rewrite_guide_advanced.html
-#srv/web/ipfire/manual/rewrite/rewrite_guide_advanced.html.en
-#srv/web/ipfire/manual/rewrite/rewrite_intro.html
-#srv/web/ipfire/manual/rewrite/rewrite_intro.html.en
-#srv/web/ipfire/manual/rewrite/rewrite_tech.html
-#srv/web/ipfire/manual/rewrite/rewrite_tech.html.en
+#srv/web/ipfire/manual/rewrite/index.html.zh-cn
+#srv/web/ipfire/manual/rewrite/intro.html
+#srv/web/ipfire/manual/rewrite/intro.html.en
+#srv/web/ipfire/manual/rewrite/intro.html.fr
+#srv/web/ipfire/manual/rewrite/proxy.html
+#srv/web/ipfire/manual/rewrite/proxy.html.en
+#srv/web/ipfire/manual/rewrite/remapping.html
+#srv/web/ipfire/manual/rewrite/remapping.html.en
+#srv/web/ipfire/manual/rewrite/rewritemap.html
+#srv/web/ipfire/manual/rewrite/rewritemap.html.en
+#srv/web/ipfire/manual/rewrite/tech.html
+#srv/web/ipfire/manual/rewrite/tech.html.en
+#srv/web/ipfire/manual/rewrite/tech.html.fr
+#srv/web/ipfire/manual/rewrite/vhosts.html
+#srv/web/ipfire/manual/rewrite/vhosts.html.en
 #srv/web/ipfire/manual/sections.html
 #srv/web/ipfire/manual/sections.html.en
 #srv/web/ipfire/manual/sections.html.fr
@@ -965,11 +1011,13 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/sitemap.html.ja.utf8
 #srv/web/ipfire/manual/sitemap.html.ko.euc-kr
 #srv/web/ipfire/manual/sitemap.html.tr.utf8
+#srv/web/ipfire/manual/sitemap.html.zh-cn
 #srv/web/ipfire/manual/ssl
 #srv/web/ipfire/manual/ssl/index.html
 #srv/web/ipfire/manual/ssl/index.html.en
 #srv/web/ipfire/manual/ssl/index.html.ja.utf8
 #srv/web/ipfire/manual/ssl/index.html.tr.utf8
+#srv/web/ipfire/manual/ssl/index.html.zh-cn
 #srv/web/ipfire/manual/ssl/ssl_compat.html
 #srv/web/ipfire/manual/ssl/ssl_compat.html.en
 #srv/web/ipfire/manual/ssl/ssl_faq.html
@@ -1010,6 +1058,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/style/xsl/util
 #srv/web/ipfire/manual/suexec.html
 #srv/web/ipfire/manual/suexec.html.en
+#srv/web/ipfire/manual/suexec.html.fr
 #srv/web/ipfire/manual/suexec.html.ja.utf8
 #srv/web/ipfire/manual/suexec.html.ko.euc-kr
 #srv/web/ipfire/manual/suexec.html.tr.utf8
@@ -1048,6 +1097,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/vhosts/index.html.ko.euc-kr
 #srv/web/ipfire/manual/vhosts/index.html.ru.koi8-r
 #srv/web/ipfire/manual/vhosts/index.html.tr.utf8
+#srv/web/ipfire/manual/vhosts/index.html.zh-cn
 #srv/web/ipfire/manual/vhosts/ip-based.html
 #srv/web/ipfire/manual/vhosts/ip-based.html.en
 #srv/web/ipfire/manual/vhosts/ip-based.html.fr
@@ -1256,18 +1306,23 @@ usr/lib/apache/mod_userdir.so
 usr/lib/apache/mod_usertrack.so
 usr/lib/apache/mod_version.so
 usr/lib/apache/mod_vhost_alias.so
+#usr/lib/apr-util-1
+usr/lib/apr-util-1/apr_dbd_sqlite3-1.so
+#usr/lib/apr-util-1/apr_dbd_sqlite3.a
+#usr/lib/apr-util-1/apr_dbd_sqlite3.la
+usr/lib/apr-util-1/apr_dbd_sqlite3.so
 #usr/lib/apr.exp
 #usr/lib/aprutil.exp
 #usr/lib/libapr-1.a
 #usr/lib/libapr-1.la
 usr/lib/libapr-1.so
 usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.4.2
+usr/lib/libapr-1.so.0.4.5
 #usr/lib/libaprutil-1.a
 #usr/lib/libaprutil-1.la
 usr/lib/libaprutil-1.so
 usr/lib/libaprutil-1.so.0
-usr/lib/libaprutil-1.so.0.3.10
+usr/lib/libaprutil-1.so.0.3.12
 #usr/lib/pkgconfig/apr-1.pc
 #usr/lib/pkgconfig/apr-util-1.pc
 #usr/sbin/ab
@@ -1333,7 +1388,6 @@ 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/mdstat.cgi
 srv/web/ipfire/cgi-bin/media.cgi
 srv/web/ipfire/cgi-bin/memory.cgi
 srv/web/ipfire/cgi-bin/modem.cgi
@@ -1350,6 +1404,7 @@ 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/speed.cgi
 srv/web/ipfire/cgi-bin/system.cgi

diff --git a/config/rootfiles/common/binutils b/config/rootfiles/common/binutils
index b4a1e499bfafa27154d2e09165a0ea867db964f0..0cd5af9150be3dd10c06207bccebb507ee98ad3d 100644 (file)
--- a/config/rootfiles/common/binutils
+++ b/config/rootfiles/common/binutils
@@ -44,12 +44,12 @@
 #usr/lib/ldscripts/i386linux.xn
 #usr/lib/ldscripts/i386linux.xr
 #usr/lib/ldscripts/i386linux.xu
-#usr/lib/libbfd-2.17.so
+#usr/lib/libbfd-2.18.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
 #usr/lib/libiberty.a
-#usr/lib/libopcodes-2.17.so
+#usr/lib/libopcodes-2.18.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so
@@ -71,4 +71,5 @@
 #usr/man/man1/size.1
 #usr/man/man1/strings.1
 #usr/man/man1/strip.1
+#usr/man/man1/windmc.1
 #usr/man/man1/windres.1

diff --git a/config/rootfiles/common/cmake b/config/rootfiles/common/cmake
index 8cefc88d889454a36bc78ed2a33030427b586b5f..4a1d702c095f375d148241c2512cd46988296d69 100644 (file)
--- a/config/rootfiles/common/cmake
+++ b/config/rootfiles/common/cmake
@@ -3,278 +3,422 @@
 #usr/local/bin/cpack
 #usr/local/bin/ctest
 #usr/local/doc
-#usr/local/doc/cmake-2.4
-#usr/local/doc/cmake-2.4/Copyright.txt
-#usr/local/doc/cmake-2.4/ccmake.html
-#usr/local/doc/cmake-2.4/ccmake.txt
-#usr/local/doc/cmake-2.4/cmake.html
-#usr/local/doc/cmake-2.4/cmake.txt
-#usr/local/doc/cmake-2.4/ctest.html
-#usr/local/doc/cmake-2.4/ctest.txt
+#usr/local/doc/cmake-2.6
+#usr/local/doc/cmake-2.6/ccmake.docbook
+#usr/local/doc/cmake-2.6/ccmake.html
+#usr/local/doc/cmake-2.6/ccmake.txt
+#usr/local/doc/cmake-2.6/cmake-commands.html
+#usr/local/doc/cmake-2.6/cmake-commands.txt
+#usr/local/doc/cmake-2.6/cmake-compatcommands.html
+#usr/local/doc/cmake-2.6/cmake-compatcommands.txt
+#usr/local/doc/cmake-2.6/cmake-modules.html
+#usr/local/doc/cmake-2.6/cmake-modules.txt
+#usr/local/doc/cmake-2.6/cmake-policies.html
+#usr/local/doc/cmake-2.6/cmake-policies.txt
+#usr/local/doc/cmake-2.6/cmake-properties.html
+#usr/local/doc/cmake-2.6/cmake-properties.txt
+#usr/local/doc/cmake-2.6/cmake-variables.html
+#usr/local/doc/cmake-2.6/cmake-variables.txt
+#usr/local/doc/cmake-2.6/cmake.docbook
+#usr/local/doc/cmake-2.6/cmake.html
+#usr/local/doc/cmake-2.6/cmake.txt
+#usr/local/doc/cmake-2.6/cpack.docbook
+#usr/local/doc/cmake-2.6/cpack.html
+#usr/local/doc/cmake-2.6/cpack.txt
+#usr/local/doc/cmake-2.6/ctest.docbook
+#usr/local/doc/cmake-2.6/ctest.html
+#usr/local/doc/cmake-2.6/ctest.txt
 #usr/local/man
 #usr/local/man/man1
 #usr/local/man/man1/ccmake.1
 #usr/local/man/man1/cmake.1
+#usr/local/man/man1/cmakecommands.1
+#usr/local/man/man1/cmakecompat.1
+#usr/local/man/man1/cmakemodules.1
+#usr/local/man/man1/cmakepolicies.1
+#usr/local/man/man1/cmakeprops.1
+#usr/local/man/man1/cmakevars.1
+#usr/local/man/man1/cpack.1
 #usr/local/man/man1/ctest.1
-#usr/local/share/cmake-2.4
-#usr/local/share/cmake-2.4/Modules
-#usr/local/share/cmake-2.4/Modules/AddFileDependencies.cmake
-#usr/local/share/cmake-2.4/Modules/CMake.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeBackwardCompatibilityC.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeBackwardCompatibilityCXX.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeBorlandFindMake.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeBuildSettings.cmake.in
-#usr/local/share/cmake-2.4/Modules/CMakeCCompiler.cmake.in
-#usr/local/share/cmake-2.4/Modules/CMakeCInformation.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeCXXCompiler.cmake.in
-#usr/local/share/cmake-2.4/Modules/CMakeCXXInformation.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeCommonLanguageInclude.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeConfigurableFile.in
-#usr/local/share/cmake-2.4/Modules/CMakeDependentOption.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeDetermineCCompiler.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeDetermineCXXCompiler.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeDetermineFortranCompiler.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeDetermineJavaCompiler.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeDetermineRCCompiler.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeDetermineSystem.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeExportBuildSettings.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeFindFrameworks.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeFindWMake.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeFindXCode.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeFortranCompiler.cmake.in
-#usr/local/share/cmake-2.4/Modules/CMakeFortranInformation.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeGenericSystem.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeImportBuildSettings.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeJavaCompiler.cmake.in
-#usr/local/share/cmake-2.4/Modules/CMakeJavaInformation.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeMSYSFindMake.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeMinGWFindMake.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeNMakeFindMake.cmake
-#usr/local/share/cmake-2.4/Modules/CMakePrintSystemInformation.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeRCCompiler.cmake.in
-#usr/local/share/cmake-2.4/Modules/CMakeRCInformation.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeSystem.cmake.in
-#usr/local/share/cmake-2.4/Modules/CMakeSystemSpecificInformation.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeTestCCompiler.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeTestCXXCompiler.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeTestForFreeVC.cxx
-#usr/local/share/cmake-2.4/Modules/CMakeTestFortranCompiler.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeTestGNU.c
-#usr/local/share/cmake-2.4/Modules/CMakeTestJavaCompiler.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeTestNMakeCLVersion.c
-#usr/local/share/cmake-2.4/Modules/CMakeTestRCCompiler.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeUnixFindMake.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeVCManifest.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeVCManifestExe.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeVS6BackwardCompatibility.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeVS6FindMake.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeVS71FindMake.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeVS7BackwardCompatibility.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeVS7FindMake.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeVS8FindMake.cmake
-#usr/local/share/cmake-2.4/Modules/CMakeVS9FindMake.cmake
-#usr/local/share/cmake-2.4/Modules/CPack.Description.plist.in
-#usr/local/share/cmake-2.4/Modules/CPack.Info.plist.in
-#usr/local/share/cmake-2.4/Modules/CPack.STGZ_Header.sh.in
-#usr/local/share/cmake-2.4/Modules/CPack.cmake
-#usr/local/share/cmake-2.4/Modules/CTest.cmake
-#usr/local/share/cmake-2.4/Modules/CTestTargets.cmake
-#usr/local/share/cmake-2.4/Modules/CheckCCompilerFlag.cmake
-#usr/local/share/cmake-2.4/Modules/CheckCSourceCompiles.cmake
-#usr/local/share/cmake-2.4/Modules/CheckCSourceRuns.cmake
-#usr/local/share/cmake-2.4/Modules/CheckCXXCompilerFlag.cmake
-#usr/local/share/cmake-2.4/Modules/CheckCXXSourceCompiles.cmake
-#usr/local/share/cmake-2.4/Modules/CheckCXXSourceRuns.cmake
-#usr/local/share/cmake-2.4/Modules/CheckForPthreads.c
-#usr/local/share/cmake-2.4/Modules/CheckFunctionExists.c
-#usr/local/share/cmake-2.4/Modules/CheckFunctionExists.cmake
-#usr/local/share/cmake-2.4/Modules/CheckIncludeFile.c.in
-#usr/local/share/cmake-2.4/Modules/CheckIncludeFile.cmake
-#usr/local/share/cmake-2.4/Modules/CheckIncludeFile.cxx.in
-#usr/local/share/cmake-2.4/Modules/CheckIncludeFileCXX.cmake
-#usr/local/share/cmake-2.4/Modules/CheckIncludeFiles.cmake
-#usr/local/share/cmake-2.4/Modules/CheckLibraryExists.cmake
-#usr/local/share/cmake-2.4/Modules/CheckLibraryExists.lists.in
-#usr/local/share/cmake-2.4/Modules/CheckSizeOf.cmake
-#usr/local/share/cmake-2.4/Modules/CheckSymbolExists.cmake
-#usr/local/share/cmake-2.4/Modules/CheckTypeSize.c.in
-#usr/local/share/cmake-2.4/Modules/CheckTypeSize.cmake
-#usr/local/share/cmake-2.4/Modules/CheckVariableExists.c
-#usr/local/share/cmake-2.4/Modules/CheckVariableExists.cmake
-#usr/local/share/cmake-2.4/Modules/Dart.cmake
-#usr/local/share/cmake-2.4/Modules/DartConfiguration.tcl.in
-#usr/local/share/cmake-2.4/Modules/Documentation.cmake
-#usr/local/share/cmake-2.4/Modules/DummyCXXFile.cxx
-#usr/local/share/cmake-2.4/Modules/FindASPELL.cmake
-#usr/local/share/cmake-2.4/Modules/FindAVIFile.cmake
-#usr/local/share/cmake-2.4/Modules/FindBZip2.cmake
-#usr/local/share/cmake-2.4/Modules/FindBoost.cmake
-#usr/local/share/cmake-2.4/Modules/FindCABLE.cmake
-#usr/local/share/cmake-2.4/Modules/FindCURL.cmake
-#usr/local/share/cmake-2.4/Modules/FindCurses.cmake
-#usr/local/share/cmake-2.4/Modules/FindCygwin.cmake
-#usr/local/share/cmake-2.4/Modules/FindDCMTK.cmake
-#usr/local/share/cmake-2.4/Modules/FindDart.cmake
-#usr/local/share/cmake-2.4/Modules/FindDoxygen.cmake
-#usr/local/share/cmake-2.4/Modules/FindEXPAT.cmake
-#usr/local/share/cmake-2.4/Modules/FindFLTK.cmake
-#usr/local/share/cmake-2.4/Modules/FindGCCXML.cmake
-#usr/local/share/cmake-2.4/Modules/FindGLU.cmake
-#usr/local/share/cmake-2.4/Modules/FindGLUT.cmake
-#usr/local/share/cmake-2.4/Modules/FindGTK.cmake
-#usr/local/share/cmake-2.4/Modules/FindGnuplot.cmake
-#usr/local/share/cmake-2.4/Modules/FindHSPELL.cmake
-#usr/local/share/cmake-2.4/Modules/FindHTMLHelp.cmake
-#usr/local/share/cmake-2.4/Modules/FindITK.cmake
-#usr/local/share/cmake-2.4/Modules/FindImageMagick.cmake
-#usr/local/share/cmake-2.4/Modules/FindJNI.cmake
-#usr/local/share/cmake-2.4/Modules/FindJPEG.cmake
-#usr/local/share/cmake-2.4/Modules/FindJasper.cmake
-#usr/local/share/cmake-2.4/Modules/FindJava.cmake
-#usr/local/share/cmake-2.4/Modules/FindKDE.cmake
-#usr/local/share/cmake-2.4/Modules/FindKDE3.cmake
-#usr/local/share/cmake-2.4/Modules/FindKDE4.cmake
-#usr/local/share/cmake-2.4/Modules/FindLATEX.cmake
-#usr/local/share/cmake-2.4/Modules/FindLibXml2.cmake
-#usr/local/share/cmake-2.4/Modules/FindLibXslt.cmake
-#usr/local/share/cmake-2.4/Modules/FindMFC.cmake
-#usr/local/share/cmake-2.4/Modules/FindMPEG.cmake
-#usr/local/share/cmake-2.4/Modules/FindMPEG2.cmake
-#usr/local/share/cmake-2.4/Modules/FindMPI.cmake
-#usr/local/share/cmake-2.4/Modules/FindMatlab.cmake
-#usr/local/share/cmake-2.4/Modules/FindMotif.cmake
-#usr/local/share/cmake-2.4/Modules/FindOpenAL.cmake
-#usr/local/share/cmake-2.4/Modules/FindOpenGL.cmake
-#usr/local/share/cmake-2.4/Modules/FindOpenSSL.cmake
-#usr/local/share/cmake-2.4/Modules/FindPHP4.cmake
-#usr/local/share/cmake-2.4/Modules/FindPNG.cmake
-#usr/local/share/cmake-2.4/Modules/FindPerl.cmake
-#usr/local/share/cmake-2.4/Modules/FindPerlLibs.cmake
-#usr/local/share/cmake-2.4/Modules/FindPhysFS.cmake
-#usr/local/share/cmake-2.4/Modules/FindPike.cmake
-#usr/local/share/cmake-2.4/Modules/FindPkgConfig.cmake
-#usr/local/share/cmake-2.4/Modules/FindPythonInterp.cmake
-#usr/local/share/cmake-2.4/Modules/FindPythonLibs.cmake
-#usr/local/share/cmake-2.4/Modules/FindQt.cmake
-#usr/local/share/cmake-2.4/Modules/FindQt3.cmake
-#usr/local/share/cmake-2.4/Modules/FindQt4.cmake
-#usr/local/share/cmake-2.4/Modules/FindRuby.cmake
-#usr/local/share/cmake-2.4/Modules/FindSDL.cmake
-#usr/local/share/cmake-2.4/Modules/FindSDL_image.cmake
-#usr/local/share/cmake-2.4/Modules/FindSDL_mixer.cmake
-#usr/local/share/cmake-2.4/Modules/FindSDL_net.cmake
-#usr/local/share/cmake-2.4/Modules/FindSDL_sound.cmake
-#usr/local/share/cmake-2.4/Modules/FindSDL_ttf.cmake
-#usr/local/share/cmake-2.4/Modules/FindSWIG.cmake
-#usr/local/share/cmake-2.4/Modules/FindSelfPackers.cmake
-#usr/local/share/cmake-2.4/Modules/FindSubversion.cmake
-#usr/local/share/cmake-2.4/Modules/FindTCL.cmake
-#usr/local/share/cmake-2.4/Modules/FindTIFF.cmake
-#usr/local/share/cmake-2.4/Modules/FindTclsh.cmake
-#usr/local/share/cmake-2.4/Modules/FindThreads.cmake
-#usr/local/share/cmake-2.4/Modules/FindUnixCommands.cmake
-#usr/local/share/cmake-2.4/Modules/FindVTK.cmake
-#usr/local/share/cmake-2.4/Modules/FindWget.cmake
-#usr/local/share/cmake-2.4/Modules/FindWish.cmake
-#usr/local/share/cmake-2.4/Modules/FindX11.cmake
-#usr/local/share/cmake-2.4/Modules/FindXMLRPC.cmake
-#usr/local/share/cmake-2.4/Modules/FindZLIB.cmake
-#usr/local/share/cmake-2.4/Modules/FindwxWidgets.cmake
-#usr/local/share/cmake-2.4/Modules/FindwxWindows.cmake
-#usr/local/share/cmake-2.4/Modules/InstallRequiredSystemLibraries.cmake
-#usr/local/share/cmake-2.4/Modules/KDE3Macros.cmake
-#usr/local/share/cmake-2.4/Modules/MacOSXBundleInfo.plist.in
-#usr/local/share/cmake-2.4/Modules/MacroAddFileDependencies.cmake
-#usr/local/share/cmake-2.4/Modules/NSIS.InstallOptions.ini.in
-#usr/local/share/cmake-2.4/Modules/NSIS.template.in
-#usr/local/share/cmake-2.4/Modules/Platform
-#usr/local/share/cmake-2.4/Modules/Platform/AIX.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/BSDOS.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/CYGWIN-g77.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/CYGWIN.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Darwin-xlc.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Darwin.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/DragonFly.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/FreeBSD.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/GNU.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/HP-UX.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/IRIX.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/IRIX64.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Linux-como.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Linux-icpc.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Linux-ifort.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Linux.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/MP-RAS.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/NetBSD.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/OSF1.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/OpenBSD.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/QNX.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/RISCos.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/SCO_SV.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/SINIX.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/SunOS.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Tru64.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/ULTRIX.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/UNIX_SV.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/UnixPaths.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/UnixWare.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Windows-bcc32.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Windows-cl.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Windows-cl.cmake.in
-#usr/local/share/cmake-2.4/Modules/Platform/Windows-g++.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Windows-g77.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Windows-gcc.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Windows-icl.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Windows-ifort.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Windows-wcl386.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Windows.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/WindowsPaths.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/Xenix.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/g77.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/gcc.cmake
-#usr/local/share/cmake-2.4/Modules/Platform/kFreeBSD.cmake
-#usr/local/share/cmake-2.4/Modules/TestBigEndian.c
-#usr/local/share/cmake-2.4/Modules/TestBigEndian.cmake
-#usr/local/share/cmake-2.4/Modules/TestCXXAcceptsFlag.cmake
-#usr/local/share/cmake-2.4/Modules/TestForANSIForScope.cmake
-#usr/local/share/cmake-2.4/Modules/TestForANSIStreamHeaders.cmake
-#usr/local/share/cmake-2.4/Modules/TestForANSIStreamHeaders.cxx
-#usr/local/share/cmake-2.4/Modules/TestForAnsiForScope.cxx
-#usr/local/share/cmake-2.4/Modules/TestForSSTREAM.cmake
-#usr/local/share/cmake-2.4/Modules/TestForSSTREAM.cxx
-#usr/local/share/cmake-2.4/Modules/TestForSTDNamespace.cmake
-#usr/local/share/cmake-2.4/Modules/TestForSTDNamespace.cxx
-#usr/local/share/cmake-2.4/Modules/UseEcos.cmake
-#usr/local/share/cmake-2.4/Modules/UsePkgConfig.cmake
-#usr/local/share/cmake-2.4/Modules/UseQt4.cmake
-#usr/local/share/cmake-2.4/Modules/UseSWIG.cmake
-#usr/local/share/cmake-2.4/Modules/UseVTK40.cmake
-#usr/local/share/cmake-2.4/Modules/UseVTKBuildSettings40.cmake
-#usr/local/share/cmake-2.4/Modules/UseVTKConfig40.cmake
-#usr/local/share/cmake-2.4/Modules/Use_wxWindows.cmake
-#usr/local/share/cmake-2.4/Modules/UsewxWidgets.cmake
-#usr/local/share/cmake-2.4/Modules/VTKCompatibility.cmake
-#usr/local/share/cmake-2.4/Modules/kde3init_dummy.cpp.in
-#usr/local/share/cmake-2.4/Modules/kde3uic.cmake
-#usr/local/share/cmake-2.4/Modules/readme.txt
-#usr/local/share/cmake-2.4/Templates
-#usr/local/share/cmake-2.4/Templates/CMakeLists.txt
-#usr/local/share/cmake-2.4/Templates/CMakeVisualStudio6Configurations.cmake
-#usr/local/share/cmake-2.4/Templates/CMakeWindowsSystemConfig.cmake
-#usr/local/share/cmake-2.4/Templates/CPack.GenericDescription.txt
-#usr/local/share/cmake-2.4/Templates/CPack.GenericLicense.txt
-#usr/local/share/cmake-2.4/Templates/CPack.GenericWelcome.txt
-#usr/local/share/cmake-2.4/Templates/CPackConfig.cmake.in
-#usr/local/share/cmake-2.4/Templates/CTestScript.cmake.in
-#usr/local/share/cmake-2.4/Templates/DLLFooter.dsptemplate
-#usr/local/share/cmake-2.4/Templates/DLLHeader.dsptemplate
-#usr/local/share/cmake-2.4/Templates/EXEFooter.dsptemplate
-#usr/local/share/cmake-2.4/Templates/EXEHeader.dsptemplate
-#usr/local/share/cmake-2.4/Templates/EXEWinHeader.dsptemplate
-#usr/local/share/cmake-2.4/Templates/TestDriver.cxx.in
-#usr/local/share/cmake-2.4/Templates/UtilityFooter.dsptemplate
-#usr/local/share/cmake-2.4/Templates/UtilityHeader.dsptemplate
-#usr/local/share/cmake-2.4/Templates/staticLibFooter.dsptemplate
-#usr/local/share/cmake-2.4/Templates/staticLibHeader.dsptemplate
-#usr/local/share/cmake-2.4/include
-#usr/local/share/cmake-2.4/include/cmCPluginAPI.h
+#usr/local/share/cmake-2.6
+#usr/local/share/cmake-2.6/Modules
+#usr/local/share/cmake-2.6/Modules/AddFileDependencies.cmake
+#usr/local/share/cmake-2.6/Modules/BundleUtilities.cmake
+#usr/local/share/cmake-2.6/Modules/CMake.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeASM-ATTInformation.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeASMCompiler.cmake.in
+#usr/local/share/cmake-2.6/Modules/CMakeASMInformation.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeASM_MASMInformation.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeBackwardCompatibilityC.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeBackwardCompatibilityCXX.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeBorlandFindMake.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeBuildSettings.cmake.in
+#usr/local/share/cmake-2.6/Modules/CMakeCCompiler.cmake.in
+#usr/local/share/cmake-2.6/Modules/CMakeCCompilerABI.c
+#usr/local/share/cmake-2.6/Modules/CMakeCCompilerId.c.in
+#usr/local/share/cmake-2.6/Modules/CMakeCInformation.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeCXXCompiler.cmake.in
+#usr/local/share/cmake-2.6/Modules/CMakeCXXCompilerABI.cpp
+#usr/local/share/cmake-2.6/Modules/CMakeCXXCompilerId.cpp.in
+#usr/local/share/cmake-2.6/Modules/CMakeCXXInformation.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeCommonLanguageInclude.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeCompilerABI.h
+#usr/local/share/cmake-2.6/Modules/CMakeConfigurableFile.in
+#usr/local/share/cmake-2.6/Modules/CMakeDependentOption.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeDetermineASM-ATTCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeDetermineASMCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeDetermineASM_MASMCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeDetermineCCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeDetermineCXXCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeDetermineCompilerABI.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeDetermineCompilerId.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeDetermineFortranCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeDetermineJavaCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeDetermineRCCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeDetermineSystem.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeExportBuildSettings.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeFindBinUtils.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeFindFrameworks.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeFindWMake.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeFindXCode.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeForceCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeFortranCompiler.cmake.in
+#usr/local/share/cmake-2.6/Modules/CMakeFortranCompilerId.F90.in
+#usr/local/share/cmake-2.6/Modules/CMakeFortranInformation.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeGenericSystem.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeImportBuildSettings.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeJavaCompiler.cmake.in
+#usr/local/share/cmake-2.6/Modules/CMakeJavaInformation.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeMSYSFindMake.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeMinGWFindMake.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeNMakeFindMake.cmake
+#usr/local/share/cmake-2.6/Modules/CMakePlatformId.h.in
+#usr/local/share/cmake-2.6/Modules/CMakePrintSystemInformation.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeRCCompiler.cmake.in
+#usr/local/share/cmake-2.6/Modules/CMakeRCInformation.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeSystem.cmake.in
+#usr/local/share/cmake-2.6/Modules/CMakeSystemSpecificInformation.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeTestASM-ATTCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeTestASMCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeTestASM_MASMCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeTestCCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeTestCXXCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeTestForFreeVC.cxx
+#usr/local/share/cmake-2.6/Modules/CMakeTestFortranCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeTestGNU.c
+#usr/local/share/cmake-2.6/Modules/CMakeTestJavaCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeTestNMakeCLVersion.c
+#usr/local/share/cmake-2.6/Modules/CMakeTestRCCompiler.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeUnixFindMake.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeVS6BackwardCompatibility.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeVS6FindMake.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeVS71FindMake.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeVS7BackwardCompatibility.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeVS7FindMake.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeVS8FindMake.cmake
+#usr/local/share/cmake-2.6/Modules/CMakeVS9FindMake.cmake
+#usr/local/share/cmake-2.6/Modules/CPack.DS_Store.in
+#usr/local/share/cmake-2.6/Modules/CPack.Description.plist.in
+#usr/local/share/cmake-2.6/Modules/CPack.Info.plist.in
+#usr/local/share/cmake-2.6/Modules/CPack.OSXScriptLauncher.in
+#usr/local/share/cmake-2.6/Modules/CPack.OSXScriptLauncher.rsrc.in
+#usr/local/share/cmake-2.6/Modules/CPack.OSXX11.Info.plist.in
+#usr/local/share/cmake-2.6/Modules/CPack.OSXX11.main.scpt.in
+#usr/local/share/cmake-2.6/Modules/CPack.RuntimeScript.in
+#usr/local/share/cmake-2.6/Modules/CPack.STGZ_Header.sh.in
+#usr/local/share/cmake-2.6/Modules/CPack.VolumeIcon.icns.in
+#usr/local/share/cmake-2.6/Modules/CPack.background.png.in
+#usr/local/share/cmake-2.6/Modules/CPack.cmake
+#usr/local/share/cmake-2.6/Modules/CPack.distribution.dist.in
+#usr/local/share/cmake-2.6/Modules/CPackDeb.cmake
+#usr/local/share/cmake-2.6/Modules/CPackRPM.cmake
+#usr/local/share/cmake-2.6/Modules/CPackZIP.cmake
+#usr/local/share/cmake-2.6/Modules/CTest.cmake
+#usr/local/share/cmake-2.6/Modules/CTestTargets.cmake
+#usr/local/share/cmake-2.6/Modules/CheckCCompilerFlag.cmake
+#usr/local/share/cmake-2.6/Modules/CheckCSourceCompiles.cmake
+#usr/local/share/cmake-2.6/Modules/CheckCSourceRuns.cmake
+#usr/local/share/cmake-2.6/Modules/CheckCXXCompilerFlag.cmake
+#usr/local/share/cmake-2.6/Modules/CheckCXXSourceCompiles.cmake
+#usr/local/share/cmake-2.6/Modules/CheckCXXSourceRuns.cmake
+#usr/local/share/cmake-2.6/Modules/CheckForPthreads.c
+#usr/local/share/cmake-2.6/Modules/CheckFortranFunctionExists.cmake
+#usr/local/share/cmake-2.6/Modules/CheckFunctionExists.c
+#usr/local/share/cmake-2.6/Modules/CheckFunctionExists.cmake
+#usr/local/share/cmake-2.6/Modules/CheckIncludeFile.c.in
+#usr/local/share/cmake-2.6/Modules/CheckIncludeFile.cmake
+#usr/local/share/cmake-2.6/Modules/CheckIncludeFile.cxx.in
+#usr/local/share/cmake-2.6/Modules/CheckIncludeFileCXX.cmake
+#usr/local/share/cmake-2.6/Modules/CheckIncludeFiles.cmake
+#usr/local/share/cmake-2.6/Modules/CheckLibraryExists.cmake
+#usr/local/share/cmake-2.6/Modules/CheckLibraryExists.lists.in
+#usr/local/share/cmake-2.6/Modules/CheckSizeOf.cmake
+#usr/local/share/cmake-2.6/Modules/CheckStructHasMember.cmake
+#usr/local/share/cmake-2.6/Modules/CheckSymbolExists.cmake
+#usr/local/share/cmake-2.6/Modules/CheckTypeSize.cmake
+#usr/local/share/cmake-2.6/Modules/CheckTypeSizeC.c.in
+#usr/local/share/cmake-2.6/Modules/CheckVariableExists.c
+#usr/local/share/cmake-2.6/Modules/CheckVariableExists.cmake
+#usr/local/share/cmake-2.6/Modules/Dart.cmake
+#usr/local/share/cmake-2.6/Modules/DartConfiguration.tcl.in
+#usr/local/share/cmake-2.6/Modules/Documentation.cmake
+#usr/local/share/cmake-2.6/Modules/DummyCXXFile.cxx
+#usr/local/share/cmake-2.6/Modules/FLTKCompatibility.cmake
+#usr/local/share/cmake-2.6/Modules/FeatureSummary.cmake
+#usr/local/share/cmake-2.6/Modules/FindASPELL.cmake
+#usr/local/share/cmake-2.6/Modules/FindAVIFile.cmake
+#usr/local/share/cmake-2.6/Modules/FindBLAS.cmake
+#usr/local/share/cmake-2.6/Modules/FindBZip2.cmake
+#usr/local/share/cmake-2.6/Modules/FindBoost.cmake
+#usr/local/share/cmake-2.6/Modules/FindCABLE.cmake
+#usr/local/share/cmake-2.6/Modules/FindCURL.cmake
+#usr/local/share/cmake-2.6/Modules/FindCVS.cmake
+#usr/local/share/cmake-2.6/Modules/FindCoin3D.cmake
+#usr/local/share/cmake-2.6/Modules/FindCups.cmake
+#usr/local/share/cmake-2.6/Modules/FindCurses.cmake
+#usr/local/share/cmake-2.6/Modules/FindCxxTest.cmake
+#usr/local/share/cmake-2.6/Modules/FindCygwin.cmake
+#usr/local/share/cmake-2.6/Modules/FindDCMTK.cmake
+#usr/local/share/cmake-2.6/Modules/FindDart.cmake
+#usr/local/share/cmake-2.6/Modules/FindDevIL.cmake
+#usr/local/share/cmake-2.6/Modules/FindDoxygen.cmake
+#usr/local/share/cmake-2.6/Modules/FindEXPAT.cmake
+#usr/local/share/cmake-2.6/Modules/FindFLTK.cmake
+#usr/local/share/cmake-2.6/Modules/FindFLTK2.cmake
+#usr/local/share/cmake-2.6/Modules/FindFreetype.cmake
+#usr/local/share/cmake-2.6/Modules/FindGCCXML.cmake
+#usr/local/share/cmake-2.6/Modules/FindGDAL.cmake
+#usr/local/share/cmake-2.6/Modules/FindGIF.cmake
+#usr/local/share/cmake-2.6/Modules/FindGLU.cmake
+#usr/local/share/cmake-2.6/Modules/FindGLUT.cmake
+#usr/local/share/cmake-2.6/Modules/FindGTK.cmake
+#usr/local/share/cmake-2.6/Modules/FindGettext.cmake
+#usr/local/share/cmake-2.6/Modules/FindGnuplot.cmake
+#usr/local/share/cmake-2.6/Modules/FindHSPELL.cmake
+#usr/local/share/cmake-2.6/Modules/FindHTMLHelp.cmake
+#usr/local/share/cmake-2.6/Modules/FindITK.cmake
+#usr/local/share/cmake-2.6/Modules/FindImageMagick.cmake
+#usr/local/share/cmake-2.6/Modules/FindJNI.cmake
+#usr/local/share/cmake-2.6/Modules/FindJPEG.cmake
+#usr/local/share/cmake-2.6/Modules/FindJasper.cmake
+#usr/local/share/cmake-2.6/Modules/FindJava.cmake
+#usr/local/share/cmake-2.6/Modules/FindKDE3.cmake
+#usr/local/share/cmake-2.6/Modules/FindKDE4.cmake
+#usr/local/share/cmake-2.6/Modules/FindLAPACK.cmake
+#usr/local/share/cmake-2.6/Modules/FindLATEX.cmake
+#usr/local/share/cmake-2.6/Modules/FindLibXml2.cmake
+#usr/local/share/cmake-2.6/Modules/FindLibXslt.cmake
+#usr/local/share/cmake-2.6/Modules/FindLua50.cmake
+#usr/local/share/cmake-2.6/Modules/FindLua51.cmake
+#usr/local/share/cmake-2.6/Modules/FindMFC.cmake
+#usr/local/share/cmake-2.6/Modules/FindMPEG.cmake
+#usr/local/share/cmake-2.6/Modules/FindMPEG2.cmake
+#usr/local/share/cmake-2.6/Modules/FindMPI.cmake
+#usr/local/share/cmake-2.6/Modules/FindMatlab.cmake
+#usr/local/share/cmake-2.6/Modules/FindMotif.cmake
+#usr/local/share/cmake-2.6/Modules/FindOpenAL.cmake
+#usr/local/share/cmake-2.6/Modules/FindOpenGL.cmake
+#usr/local/share/cmake-2.6/Modules/FindOpenMP.cmake
+#usr/local/share/cmake-2.6/Modules/FindOpenSSL.cmake
+#usr/local/share/cmake-2.6/Modules/FindOpenSceneGraph.cmake
+#usr/local/share/cmake-2.6/Modules/FindOpenThreads.cmake
+#usr/local/share/cmake-2.6/Modules/FindPHP4.cmake
+#usr/local/share/cmake-2.6/Modules/FindPNG.cmake
+#usr/local/share/cmake-2.6/Modules/FindPackageHandleStandardArgs.cmake
+#usr/local/share/cmake-2.6/Modules/FindPackageMessage.cmake
+#usr/local/share/cmake-2.6/Modules/FindPerl.cmake
+#usr/local/share/cmake-2.6/Modules/FindPerlLibs.cmake
+#usr/local/share/cmake-2.6/Modules/FindPhysFS.cmake
+#usr/local/share/cmake-2.6/Modules/FindPike.cmake
+#usr/local/share/cmake-2.6/Modules/FindPkgConfig.cmake
+#usr/local/share/cmake-2.6/Modules/FindProducer.cmake
+#usr/local/share/cmake-2.6/Modules/FindPythonInterp.cmake
+#usr/local/share/cmake-2.6/Modules/FindPythonLibs.cmake
+#usr/local/share/cmake-2.6/Modules/FindQt.cmake
+#usr/local/share/cmake-2.6/Modules/FindQt3.cmake
+#usr/local/share/cmake-2.6/Modules/FindQt4.cmake
+#usr/local/share/cmake-2.6/Modules/FindQuickTime.cmake
+#usr/local/share/cmake-2.6/Modules/FindRTI.cmake
+#usr/local/share/cmake-2.6/Modules/FindRuby.cmake
+#usr/local/share/cmake-2.6/Modules/FindSDL.cmake
+#usr/local/share/cmake-2.6/Modules/FindSDL_image.cmake
+#usr/local/share/cmake-2.6/Modules/FindSDL_mixer.cmake
+#usr/local/share/cmake-2.6/Modules/FindSDL_net.cmake
+#usr/local/share/cmake-2.6/Modules/FindSDL_sound.cmake
+#usr/local/share/cmake-2.6/Modules/FindSDL_ttf.cmake
+#usr/local/share/cmake-2.6/Modules/FindSWIG.cmake
+#usr/local/share/cmake-2.6/Modules/FindSelfPackers.cmake
+#usr/local/share/cmake-2.6/Modules/FindSquish.cmake
+#usr/local/share/cmake-2.6/Modules/FindSubversion.cmake
+#usr/local/share/cmake-2.6/Modules/FindTCL.cmake
+#usr/local/share/cmake-2.6/Modules/FindTIFF.cmake
+#usr/local/share/cmake-2.6/Modules/FindTclStub.cmake
+#usr/local/share/cmake-2.6/Modules/FindTclsh.cmake
+#usr/local/share/cmake-2.6/Modules/FindThreads.cmake
+#usr/local/share/cmake-2.6/Modules/FindUnixCommands.cmake
+#usr/local/share/cmake-2.6/Modules/FindVTK.cmake
+#usr/local/share/cmake-2.6/Modules/FindWget.cmake
+#usr/local/share/cmake-2.6/Modules/FindWish.cmake
+#usr/local/share/cmake-2.6/Modules/FindX11.cmake
+#usr/local/share/cmake-2.6/Modules/FindXMLRPC.cmake
+#usr/local/share/cmake-2.6/Modules/FindZLIB.cmake
+#usr/local/share/cmake-2.6/Modules/Findosg.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgAnimation.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgDB.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgFX.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgGA.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgIntrospection.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgManipulator.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgParticle.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgProducer.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgShadow.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgSim.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgTerrain.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgText.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgUtil.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgViewer.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgVolume.cmake
+#usr/local/share/cmake-2.6/Modules/FindosgWidget.cmake
+#usr/local/share/cmake-2.6/Modules/Findosg_functions.cmake
+#usr/local/share/cmake-2.6/Modules/FindwxWidgets.cmake
+#usr/local/share/cmake-2.6/Modules/FindwxWindows.cmake
+#usr/local/share/cmake-2.6/Modules/FortranCInterface.cmake
+#usr/local/share/cmake-2.6/Modules/FortranCInterface.h.in
+#usr/local/share/cmake-2.6/Modules/GetPrerequisites.cmake
+#usr/local/share/cmake-2.6/Modules/ITKCompatibility.cmake
+#usr/local/share/cmake-2.6/Modules/InstallRequiredSystemLibraries.cmake
+#usr/local/share/cmake-2.6/Modules/KDE3Macros.cmake
+#usr/local/share/cmake-2.6/Modules/MacOSXBundleInfo.plist.in
+#usr/local/share/cmake-2.6/Modules/MacOSXFrameworkInfo.plist.in
+#usr/local/share/cmake-2.6/Modules/MacroAddFileDependencies.cmake
+#usr/local/share/cmake-2.6/Modules/NSIS.InstallOptions.ini.in
+#usr/local/share/cmake-2.6/Modules/NSIS.template.in
+#usr/local/share/cmake-2.6/Modules/Platform
+#usr/local/share/cmake-2.6/Modules/Platform/AIX-VisualAge-Fortran.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/AIX.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/BSDOS.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/BeOS.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/BlueGeneL.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/CYGWIN-g77.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/CYGWIN.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Catamount.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Darwin-icc.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Darwin-icpc.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Darwin-xlc.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Darwin.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/DragonFly.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/FreeBSD.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/GNU.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Generic-ADSP-ASM.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Generic-ADSP-C.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Generic-ADSP-CXX.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Generic-ADSP-Common.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Generic-SDCC-C.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Generic.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/HP-UX.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Haiku.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/IRIX.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/IRIX64.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-GNU-Fortran.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-Intel-C.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-Intel-CXX.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-Intel-Fortran.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-PGI-C.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-PGI-CXX.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-PGI-Fortran.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-SunPro-C.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-SunPro-CXX.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-SunPro-Fortran.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-VisualAge-C.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-VisualAge-Fortran.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-como.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-icpc.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux-ifort.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Linux.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/MP-RAS.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/NetBSD.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/OSF1.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/OpenBSD.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/QNX.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/RISCos.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/SCO_SV.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/SINIX.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/SunOS-SunPro-Fortran.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/SunOS.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Tru64.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/ULTRIX.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/UNIX_SV.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/UnixPaths.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/UnixWare.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Windows-bcc32.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Windows-cl.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Windows-cl.cmake.in
+#usr/local/share/cmake-2.6/Modules/Platform/Windows-df.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Windows-g++.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Windows-g77.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Windows-gcc.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Windows-icl.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Windows-ifort.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Windows-wcl386.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Windows.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/WindowsPaths.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/Xenix.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/cl.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/eCos.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/g77.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/gas.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/gcc.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/kFreeBSD.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/syllable.cmake
+#usr/local/share/cmake-2.6/Modules/Platform/xlf.cmake
+#usr/local/share/cmake-2.6/Modules/SquishTestScript.cmake
+#usr/local/share/cmake-2.6/Modules/SystemInformation.cmake
+#usr/local/share/cmake-2.6/Modules/SystemInformation.in
+#usr/local/share/cmake-2.6/Modules/TestBigEndian.cmake
+#usr/local/share/cmake-2.6/Modules/TestCXXAcceptsFlag.cmake
+#usr/local/share/cmake-2.6/Modules/TestEndianess.c.in
+#usr/local/share/cmake-2.6/Modules/TestForANSIForScope.cmake
+#usr/local/share/cmake-2.6/Modules/TestForANSIStreamHeaders.cmake
+#usr/local/share/cmake-2.6/Modules/TestForANSIStreamHeaders.cxx
+#usr/local/share/cmake-2.6/Modules/TestForAnsiForScope.cxx
+#usr/local/share/cmake-2.6/Modules/TestForSSTREAM.cmake
+#usr/local/share/cmake-2.6/Modules/TestForSSTREAM.cxx
+#usr/local/share/cmake-2.6/Modules/TestForSTDNamespace.cmake
+#usr/local/share/cmake-2.6/Modules/TestForSTDNamespace.cxx
+#usr/local/share/cmake-2.6/Modules/UseEcos.cmake
+#usr/local/share/cmake-2.6/Modules/UsePkgConfig.cmake
+#usr/local/share/cmake-2.6/Modules/UseQt4.cmake
+#usr/local/share/cmake-2.6/Modules/UseSWIG.cmake
+#usr/local/share/cmake-2.6/Modules/UseVTK40.cmake
+#usr/local/share/cmake-2.6/Modules/UseVTKBuildSettings40.cmake
+#usr/local/share/cmake-2.6/Modules/UseVTKConfig40.cmake
+#usr/local/share/cmake-2.6/Modules/Use_wxWindows.cmake
+#usr/local/share/cmake-2.6/Modules/UsewxWidgets.cmake
+#usr/local/share/cmake-2.6/Modules/VTKCompatibility.cmake
+#usr/local/share/cmake-2.6/Modules/ecos_clean.cmake
+#usr/local/share/cmake-2.6/Modules/kde3init_dummy.cpp.in
+#usr/local/share/cmake-2.6/Modules/kde3uic.cmake
+#usr/local/share/cmake-2.6/Modules/readme.txt
+#usr/local/share/cmake-2.6/Templates
+#usr/local/share/cmake-2.6/Templates/CMakeLists.txt
+#usr/local/share/cmake-2.6/Templates/CMakeVSMacros1.vsmacros
+#usr/local/share/cmake-2.6/Templates/CMakeVSMacros2.vsmacros
+#usr/local/share/cmake-2.6/Templates/CMakeVisualStudio6Configurations.cmake
+#usr/local/share/cmake-2.6/Templates/CPack.GenericDescription.txt
+#usr/local/share/cmake-2.6/Templates/CPack.GenericLicense.txt
+#usr/local/share/cmake-2.6/Templates/CPack.GenericWelcome.txt
+#usr/local/share/cmake-2.6/Templates/CPackConfig.cmake.in
+#usr/local/share/cmake-2.6/Templates/CTestScript.cmake.in
+#usr/local/share/cmake-2.6/Templates/DLLFooter.dsptemplate
+#usr/local/share/cmake-2.6/Templates/DLLHeader.dsptemplate
+#usr/local/share/cmake-2.6/Templates/EXEFooter.dsptemplate
+#usr/local/share/cmake-2.6/Templates/EXEHeader.dsptemplate
+#usr/local/share/cmake-2.6/Templates/EXEWinHeader.dsptemplate
+#usr/local/share/cmake-2.6/Templates/TestDriver.cxx.in
+#usr/local/share/cmake-2.6/Templates/UtilityFooter.dsptemplate
+#usr/local/share/cmake-2.6/Templates/UtilityHeader.dsptemplate
+#usr/local/share/cmake-2.6/Templates/cygwin-package.sh.in
+#usr/local/share/cmake-2.6/Templates/staticLibFooter.dsptemplate
+#usr/local/share/cmake-2.6/Templates/staticLibHeader.dsptemplate
+#usr/local/share/cmake-2.6/include
+#usr/local/share/cmake-2.6/include/cmCPluginAPI.h

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 5cfdf20307a9d313df8e418c85fdc3dff8747275..6cf7a7186afc223bdda9e7414e228840cc69244b 100644 (file)
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -11,196 +11,134 @@ etc/rc.d/rc6.d/K50collectd
 #usr/include/collectd/client.h
 #usr/include/collectd/lcc_features.h
 #usr/lib/collectd
-#usr/lib/collectd/apache.a
 #usr/lib/collectd/apache.la
 usr/lib/collectd/apache.so
-#usr/lib/collectd/apcups.a
 #usr/lib/collectd/apcups.la
 usr/lib/collectd/apcups.so
-#usr/lib/collectd/ascent.a
 #usr/lib/collectd/ascent.la
 usr/lib/collectd/ascent.so
-#usr/lib/collectd/battery.a
 #usr/lib/collectd/battery.la
 usr/lib/collectd/battery.so
-#usr/lib/collectd/bind.a
 #usr/lib/collectd/bind.la
 usr/lib/collectd/bind.so
-#usr/lib/collectd/conntrack.a
 #usr/lib/collectd/conntrack.la
 usr/lib/collectd/conntrack.so
-#usr/lib/collectd/contextswitch.a
 #usr/lib/collectd/contextswitch.la
 usr/lib/collectd/contextswitch.so
-#usr/lib/collectd/cpu.a
 #usr/lib/collectd/cpu.la
 usr/lib/collectd/cpu.so
-#usr/lib/collectd/cpufreq.a
 #usr/lib/collectd/cpufreq.la
 usr/lib/collectd/cpufreq.so
-#usr/lib/collectd/curl.a
 #usr/lib/collectd/curl.la
 usr/lib/collectd/curl.so
-#usr/lib/collectd/df.a
+#usr/lib/collectd/curl_xml.la
+usr/lib/collectd/curl_xml.so
 #usr/lib/collectd/df.la
 usr/lib/collectd/df.so
-#usr/lib/collectd/disk.a
 #usr/lib/collectd/disk.la
 usr/lib/collectd/disk.so
-#usr/lib/collectd/dns.a
 #usr/lib/collectd/dns.la
 usr/lib/collectd/dns.so
-#usr/lib/collectd/email.a
 #usr/lib/collectd/email.la
 usr/lib/collectd/email.so
-#usr/lib/collectd/entropy.a
 #usr/lib/collectd/entropy.la
 usr/lib/collectd/entropy.so
-#usr/lib/collectd/exec.a
 #usr/lib/collectd/exec.la
 usr/lib/collectd/exec.so
-#usr/lib/collectd/filecount.a
 #usr/lib/collectd/filecount.la
 usr/lib/collectd/filecount.so
-#usr/lib/collectd/fscache.a
 #usr/lib/collectd/fscache.la
 usr/lib/collectd/fscache.so
-#usr/lib/collectd/hddtemp.a
 #usr/lib/collectd/hddtemp.la
 usr/lib/collectd/hddtemp.so
-#usr/lib/collectd/interface.a
 #usr/lib/collectd/interface.la
 usr/lib/collectd/interface.so
-#usr/lib/collectd/iptables.a
 #usr/lib/collectd/iptables.la
 usr/lib/collectd/iptables.so
-#usr/lib/collectd/irq.a
 #usr/lib/collectd/irq.la
 usr/lib/collectd/irq.so
-#usr/lib/collectd/load.a
 #usr/lib/collectd/load.la
 usr/lib/collectd/load.so
-#usr/lib/collectd/logfile.a
 #usr/lib/collectd/logfile.la
 usr/lib/collectd/logfile.so
-#usr/lib/collectd/madwifi.a
 #usr/lib/collectd/madwifi.la
 usr/lib/collectd/madwifi.so
-#usr/lib/collectd/match_empty_counter.a
 #usr/lib/collectd/match_empty_counter.la
 usr/lib/collectd/match_empty_counter.so
-#usr/lib/collectd/match_hashed.a
 #usr/lib/collectd/match_hashed.la
 usr/lib/collectd/match_hashed.so
-#usr/lib/collectd/match_regex.a
 #usr/lib/collectd/match_regex.la
 usr/lib/collectd/match_regex.so
-#usr/lib/collectd/match_timediff.a
 #usr/lib/collectd/match_timediff.la
 usr/lib/collectd/match_timediff.so
-#usr/lib/collectd/match_value.a
 #usr/lib/collectd/match_value.la
 usr/lib/collectd/match_value.so
-#usr/lib/collectd/memory.a
 #usr/lib/collectd/memory.la
 usr/lib/collectd/memory.so
-#usr/lib/collectd/multimeter.a
 #usr/lib/collectd/multimeter.la
 usr/lib/collectd/multimeter.so
-#usr/lib/collectd/network.a
 #usr/lib/collectd/network.la
 usr/lib/collectd/network.so
-#usr/lib/collectd/nfs.a
 #usr/lib/collectd/nfs.la
 usr/lib/collectd/nfs.so
-#usr/lib/collectd/ntpd.a
 #usr/lib/collectd/ntpd.la
 usr/lib/collectd/ntpd.so
-#usr/lib/collectd/olsrd.a
 #usr/lib/collectd/olsrd.la
 usr/lib/collectd/olsrd.so
-#usr/lib/collectd/openvpn.a
 #usr/lib/collectd/openvpn.la
 usr/lib/collectd/openvpn.so
-#usr/lib/collectd/ping.a
 #usr/lib/collectd/ping.la
 usr/lib/collectd/ping.so
-#usr/lib/collectd/powerdns.a
 #usr/lib/collectd/powerdns.la
 usr/lib/collectd/powerdns.so
-#usr/lib/collectd/processes.a
 #usr/lib/collectd/processes.la
 usr/lib/collectd/processes.so
-#usr/lib/collectd/protocols.a
 #usr/lib/collectd/protocols.la
 usr/lib/collectd/protocols.so
-#usr/lib/collectd/python.a
 #usr/lib/collectd/python.la
 usr/lib/collectd/python.so
-#usr/lib/collectd/rrdtool.a
 #usr/lib/collectd/rrdtool.la
 usr/lib/collectd/rrdtool.so
-#usr/lib/collectd/sensors.a
 #usr/lib/collectd/sensors.la
 usr/lib/collectd/sensors.so
-#usr/lib/collectd/swap.a
 #usr/lib/collectd/swap.la
 usr/lib/collectd/swap.so
-#usr/lib/collectd/syslog.a
 #usr/lib/collectd/syslog.la
 usr/lib/collectd/syslog.so
-#usr/lib/collectd/table.a
 #usr/lib/collectd/table.la
 usr/lib/collectd/table.so
-#usr/lib/collectd/tail.a
 #usr/lib/collectd/tail.la
 usr/lib/collectd/tail.so
-#usr/lib/collectd/target_notification.a
 #usr/lib/collectd/target_notification.la
 usr/lib/collectd/target_notification.so
-#usr/lib/collectd/target_replace.a
 #usr/lib/collectd/target_replace.la
 usr/lib/collectd/target_replace.so
-#usr/lib/collectd/target_scale.a
 #usr/lib/collectd/target_scale.la
 usr/lib/collectd/target_scale.so
-#usr/lib/collectd/target_set.a
 #usr/lib/collectd/target_set.la
 usr/lib/collectd/target_set.so
-#usr/lib/collectd/tcpconns.a
 #usr/lib/collectd/tcpconns.la
 usr/lib/collectd/tcpconns.so
-#usr/lib/collectd/teamspeak2.a
 #usr/lib/collectd/teamspeak2.la
 usr/lib/collectd/teamspeak2.so
-#usr/lib/collectd/ted.a
 #usr/lib/collectd/ted.la
 usr/lib/collectd/ted.so
-#usr/lib/collectd/thermal.a
 #usr/lib/collectd/thermal.la
 usr/lib/collectd/thermal.so
-#usr/lib/collectd/unixsock.a
 #usr/lib/collectd/unixsock.la
 usr/lib/collectd/unixsock.so
-#usr/lib/collectd/uptime.a
 #usr/lib/collectd/uptime.la
 usr/lib/collectd/uptime.so
-#usr/lib/collectd/users.a
 #usr/lib/collectd/users.la
 usr/lib/collectd/users.so
-#usr/lib/collectd/uuid.a
 #usr/lib/collectd/uuid.la
 usr/lib/collectd/uuid.so
-#usr/lib/collectd/vmem.a
 #usr/lib/collectd/vmem.la
 usr/lib/collectd/vmem.so
-#usr/lib/collectd/wireless.a
 #usr/lib/collectd/wireless.la
 usr/lib/collectd/wireless.so
-#usr/lib/collectd/write_http.a
 #usr/lib/collectd/write_http.la
 usr/lib/collectd/write_http.so
-#usr/lib/libcollectdclient.a
 #usr/lib/libcollectdclient.la
 usr/lib/libcollectdclient.so
 usr/lib/libcollectdclient.so.0

diff --git a/config/rootfiles/common/compat-wireless b/config/rootfiles/common/compat-wireless
index adc4ab3339862f7112323d6f818a67f12752988a..80018c84d1a323a95040a7d3a4684fc9447a36fd 100644 (file)
--- a/config/rootfiles/common/compat-wireless
+++ b/config/rootfiles/common/compat-wireless
@@ -1,3 +1,2 @@
-etc/modprobe.d/ralink_wireless
 etc/udev/rules.d/50-compat_firmware.rules
 lib/udev/compat_firmware.sh

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 5f0faf3a08c4a4902e4abbb9d4f0c9d26b474aac..5ac578a909421df5e469147e342002b3ea733983 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -57,6 +57,8 @@ var/ipfire/langs
 #var/ipfire/langs/en.pl
 #var/ipfire/langs/es.pl
 #var/ipfire/langs/fr.pl
+#var/ipfire/langs/pl.pl
+#var/ipfire/langs/ru.pl
 #var/ipfire/langs/list
 var/ipfire/logging
 #var/ipfire/logging/settings

diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda
index abda70176e10e33aa1508fcdae372884b7b195ae..3c932a154baa8ee4b0825848e38b7288c136e9cc 100644 (file)
--- a/config/rootfiles/common/crda
+++ b/config/rootfiles/common/crda
@@ -5,7 +5,5 @@ lib/udev/rules.d/85-regulatory.rules
 #root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-i686.egg-tmp/M2Crypto/__m2crypto.so
 sbin/crda
 sbin/regdbdump
-#usr/lib/crda
-usr/lib/crda/regulatory.bin
 #usr/share/man/man8/crda.8.gz
 #usr/share/man/man8/regdbdump.8.gz

diff --git a/config/rootfiles/common/gcc b/config/rootfiles/common/gcc
index da0c39d338cbc46929ab7fd12d1e3808be717ca5..cde9e4f424244dc4fb9b61a493064316b9cd300c 100644 (file)
--- a/config/rootfiles/common/gcc
+++ b/config/rootfiles/common/gcc
@@ -9,256 +9,491 @@
 #usr/bin/i586-pc-linux-gnu-c++
 #usr/bin/i586-pc-linux-gnu-g++
 #usr/bin/i586-pc-linux-gnu-gcc
-#usr/bin/i586-pc-linux-gnu-gcc-4.0.4
+#usr/bin/i586-pc-linux-gnu-gcc-4.1.2
 #usr/include/c++
-#usr/include/c++/4.0.4
-#usr/include/c++/4.0.4/algorithm
-#usr/include/c++/4.0.4/backward
-#usr/include/c++/4.0.4/backward/algo.h
-#usr/include/c++/4.0.4/backward/algobase.h
-#usr/include/c++/4.0.4/backward/alloc.h
-#usr/include/c++/4.0.4/backward/backward_warning.h
-#usr/include/c++/4.0.4/backward/bvector.h
-#usr/include/c++/4.0.4/backward/complex.h
-#usr/include/c++/4.0.4/backward/defalloc.h
-#usr/include/c++/4.0.4/backward/deque.h
-#usr/include/c++/4.0.4/backward/fstream.h
-#usr/include/c++/4.0.4/backward/function.h
-#usr/include/c++/4.0.4/backward/hash_map.h
-#usr/include/c++/4.0.4/backward/hash_set.h
-#usr/include/c++/4.0.4/backward/hashtable.h
-#usr/include/c++/4.0.4/backward/heap.h
-#usr/include/c++/4.0.4/backward/iomanip.h
-#usr/include/c++/4.0.4/backward/iostream.h
-#usr/include/c++/4.0.4/backward/istream.h
-#usr/include/c++/4.0.4/backward/iterator.h
-#usr/include/c++/4.0.4/backward/list.h
-#usr/include/c++/4.0.4/backward/map.h
-#usr/include/c++/4.0.4/backward/multimap.h
-#usr/include/c++/4.0.4/backward/multiset.h
-#usr/include/c++/4.0.4/backward/new.h
-#usr/include/c++/4.0.4/backward/ostream.h
-#usr/include/c++/4.0.4/backward/pair.h
-#usr/include/c++/4.0.4/backward/queue.h
-#usr/include/c++/4.0.4/backward/rope.h
-#usr/include/c++/4.0.4/backward/set.h
-#usr/include/c++/4.0.4/backward/slist.h
-#usr/include/c++/4.0.4/backward/stack.h
-#usr/include/c++/4.0.4/backward/stream.h
-#usr/include/c++/4.0.4/backward/streambuf.h
-#usr/include/c++/4.0.4/backward/strstream
-#usr/include/c++/4.0.4/backward/tempbuf.h
-#usr/include/c++/4.0.4/backward/tree.h
-#usr/include/c++/4.0.4/backward/vector.h
-#usr/include/c++/4.0.4/bits
-#usr/include/c++/4.0.4/bits/allocator.h
-#usr/include/c++/4.0.4/bits/atomicity.h
-#usr/include/c++/4.0.4/bits/basic_ios.h
-#usr/include/c++/4.0.4/bits/basic_ios.tcc
-#usr/include/c++/4.0.4/bits/basic_string.h
-#usr/include/c++/4.0.4/bits/basic_string.tcc
-#usr/include/c++/4.0.4/bits/boost_concept_check.h
-#usr/include/c++/4.0.4/bits/char_traits.h
-#usr/include/c++/4.0.4/bits/cmath.tcc
-#usr/include/c++/4.0.4/bits/codecvt.h
-#usr/include/c++/4.0.4/bits/concept_check.h
-#usr/include/c++/4.0.4/bits/concurrence.h
-#usr/include/c++/4.0.4/bits/cpp_type_traits.h
-#usr/include/c++/4.0.4/bits/deque.tcc
-#usr/include/c++/4.0.4/bits/fstream.tcc
-#usr/include/c++/4.0.4/bits/functexcept.h
-#usr/include/c++/4.0.4/bits/gslice.h
-#usr/include/c++/4.0.4/bits/gslice_array.h
-#usr/include/c++/4.0.4/bits/indirect_array.h
-#usr/include/c++/4.0.4/bits/ios_base.h
-#usr/include/c++/4.0.4/bits/istream.tcc
-#usr/include/c++/4.0.4/bits/list.tcc
-#usr/include/c++/4.0.4/bits/locale_classes.h
-#usr/include/c++/4.0.4/bits/locale_facets.h
-#usr/include/c++/4.0.4/bits/locale_facets.tcc
-#usr/include/c++/4.0.4/bits/localefwd.h
-#usr/include/c++/4.0.4/bits/mask_array.h
-#usr/include/c++/4.0.4/bits/ostream.tcc
-#usr/include/c++/4.0.4/bits/postypes.h
-#usr/include/c++/4.0.4/bits/slice_array.h
-#usr/include/c++/4.0.4/bits/sstream.tcc
-#usr/include/c++/4.0.4/bits/stl_algo.h
-#usr/include/c++/4.0.4/bits/stl_algobase.h
-#usr/include/c++/4.0.4/bits/stl_bvector.h
-#usr/include/c++/4.0.4/bits/stl_construct.h
-#usr/include/c++/4.0.4/bits/stl_deque.h
-#usr/include/c++/4.0.4/bits/stl_function.h
-#usr/include/c++/4.0.4/bits/stl_heap.h
-#usr/include/c++/4.0.4/bits/stl_iterator.h
-#usr/include/c++/4.0.4/bits/stl_iterator_base_funcs.h
-#usr/include/c++/4.0.4/bits/stl_iterator_base_types.h
-#usr/include/c++/4.0.4/bits/stl_list.h
-#usr/include/c++/4.0.4/bits/stl_map.h
-#usr/include/c++/4.0.4/bits/stl_multimap.h
-#usr/include/c++/4.0.4/bits/stl_multiset.h
-#usr/include/c++/4.0.4/bits/stl_numeric.h
-#usr/include/c++/4.0.4/bits/stl_pair.h
-#usr/include/c++/4.0.4/bits/stl_queue.h
-#usr/include/c++/4.0.4/bits/stl_raw_storage_iter.h
-#usr/include/c++/4.0.4/bits/stl_relops.h
-#usr/include/c++/4.0.4/bits/stl_set.h
-#usr/include/c++/4.0.4/bits/stl_stack.h
-#usr/include/c++/4.0.4/bits/stl_tempbuf.h
-#usr/include/c++/4.0.4/bits/stl_tree.h
-#usr/include/c++/4.0.4/bits/stl_uninitialized.h
-#usr/include/c++/4.0.4/bits/stl_vector.h
-#usr/include/c++/4.0.4/bits/stream_iterator.h
-#usr/include/c++/4.0.4/bits/streambuf.tcc
-#usr/include/c++/4.0.4/bits/streambuf_iterator.h
-#usr/include/c++/4.0.4/bits/stringfwd.h
-#usr/include/c++/4.0.4/bits/valarray_after.h
-#usr/include/c++/4.0.4/bits/valarray_array.h
-#usr/include/c++/4.0.4/bits/valarray_array.tcc
-#usr/include/c++/4.0.4/bits/valarray_before.h
-#usr/include/c++/4.0.4/bits/vector.tcc
-#usr/include/c++/4.0.4/bitset
-#usr/include/c++/4.0.4/cassert
-#usr/include/c++/4.0.4/cctype
-#usr/include/c++/4.0.4/cerrno
-#usr/include/c++/4.0.4/cfloat
-#usr/include/c++/4.0.4/ciso646
-#usr/include/c++/4.0.4/climits
-#usr/include/c++/4.0.4/clocale
-#usr/include/c++/4.0.4/cmath
-#usr/include/c++/4.0.4/complex
-#usr/include/c++/4.0.4/csetjmp
-#usr/include/c++/4.0.4/csignal
-#usr/include/c++/4.0.4/cstdarg
-#usr/include/c++/4.0.4/cstddef
-#usr/include/c++/4.0.4/cstdio
-#usr/include/c++/4.0.4/cstdlib
-#usr/include/c++/4.0.4/cstring
-#usr/include/c++/4.0.4/ctime
-#usr/include/c++/4.0.4/cwchar
-#usr/include/c++/4.0.4/cwctype
-#usr/include/c++/4.0.4/cxxabi.h
-#usr/include/c++/4.0.4/debug
-#usr/include/c++/4.0.4/debug/bitset
-#usr/include/c++/4.0.4/debug/debug.h
-#usr/include/c++/4.0.4/debug/deque
-#usr/include/c++/4.0.4/debug/formatter.h
-#usr/include/c++/4.0.4/debug/hash_map
-#usr/include/c++/4.0.4/debug/hash_map.h
-#usr/include/c++/4.0.4/debug/hash_multimap.h
-#usr/include/c++/4.0.4/debug/hash_multiset.h
-#usr/include/c++/4.0.4/debug/hash_set
-#usr/include/c++/4.0.4/debug/hash_set.h
-#usr/include/c++/4.0.4/debug/list
-#usr/include/c++/4.0.4/debug/map
-#usr/include/c++/4.0.4/debug/map.h
-#usr/include/c++/4.0.4/debug/multimap.h
-#usr/include/c++/4.0.4/debug/multiset.h
-#usr/include/c++/4.0.4/debug/safe_base.h
-#usr/include/c++/4.0.4/debug/safe_iterator.h
-#usr/include/c++/4.0.4/debug/safe_iterator.tcc
-#usr/include/c++/4.0.4/debug/safe_sequence.h
-#usr/include/c++/4.0.4/debug/set
-#usr/include/c++/4.0.4/debug/set.h
-#usr/include/c++/4.0.4/debug/string
-#usr/include/c++/4.0.4/debug/vector
-#usr/include/c++/4.0.4/deque
-#usr/include/c++/4.0.4/exception
-#usr/include/c++/4.0.4/exception_defines.h
-#usr/include/c++/4.0.4/ext
-#usr/include/c++/4.0.4/ext/algorithm
-#usr/include/c++/4.0.4/ext/array_allocator.h
-#usr/include/c++/4.0.4/ext/bitmap_allocator.h
-#usr/include/c++/4.0.4/ext/codecvt_specializations.h
-#usr/include/c++/4.0.4/ext/debug_allocator.h
-#usr/include/c++/4.0.4/ext/functional
-#usr/include/c++/4.0.4/ext/hash_fun.h
-#usr/include/c++/4.0.4/ext/hash_map
-#usr/include/c++/4.0.4/ext/hash_set
-#usr/include/c++/4.0.4/ext/hashtable.h
-#usr/include/c++/4.0.4/ext/iterator
-#usr/include/c++/4.0.4/ext/malloc_allocator.h
-#usr/include/c++/4.0.4/ext/memory
-#usr/include/c++/4.0.4/ext/mt_allocator.h
-#usr/include/c++/4.0.4/ext/new_allocator.h
-#usr/include/c++/4.0.4/ext/numeric
-#usr/include/c++/4.0.4/ext/pod_char_traits.h
-#usr/include/c++/4.0.4/ext/pool_allocator.h
-#usr/include/c++/4.0.4/ext/rb_tree
-#usr/include/c++/4.0.4/ext/rope
-#usr/include/c++/4.0.4/ext/ropeimpl.h
-#usr/include/c++/4.0.4/ext/slist
-#usr/include/c++/4.0.4/ext/stdio_filebuf.h
-#usr/include/c++/4.0.4/ext/stdio_sync_filebuf.h
-#usr/include/c++/4.0.4/fstream
-#usr/include/c++/4.0.4/functional
-#usr/include/c++/4.0.4/i586-pc-linux-gnu
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/atomic_word.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/basic_file.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/c++allocator.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/c++config.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/c++io.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/c++locale.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/ctype_base.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/ctype_inline.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/ctype_noninline.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/cxxabi_tweaks.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/gthr-default.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/gthr-posix.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/gthr-single.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/gthr-tpf.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/gthr.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/messages_members.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/os_defines.h
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/stdc++.h.gch
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/stdc++.h.gch/O0g.gch
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/stdc++.h.gch/O2g.gch
-#usr/include/c++/4.0.4/i586-pc-linux-gnu/bits/time_members.h
-#usr/include/c++/4.0.4/iomanip
-#usr/include/c++/4.0.4/ios
-#usr/include/c++/4.0.4/iosfwd
-#usr/include/c++/4.0.4/iostream
-#usr/include/c++/4.0.4/istream
-#usr/include/c++/4.0.4/iterator
-#usr/include/c++/4.0.4/limits
-#usr/include/c++/4.0.4/list
-#usr/include/c++/4.0.4/locale
-#usr/include/c++/4.0.4/map
-#usr/include/c++/4.0.4/memory
-#usr/include/c++/4.0.4/new
-#usr/include/c++/4.0.4/numeric
-#usr/include/c++/4.0.4/ostream
-#usr/include/c++/4.0.4/queue
-#usr/include/c++/4.0.4/set
-#usr/include/c++/4.0.4/sstream
-#usr/include/c++/4.0.4/stack
-#usr/include/c++/4.0.4/stdexcept
-#usr/include/c++/4.0.4/streambuf
-#usr/include/c++/4.0.4/string
-#usr/include/c++/4.0.4/tr1
-#usr/include/c++/4.0.4/tr1/array
-#usr/include/c++/4.0.4/tr1/bind_iterate.h
-#usr/include/c++/4.0.4/tr1/bind_repeat.h
-#usr/include/c++/4.0.4/tr1/boost_shared_ptr.h
-#usr/include/c++/4.0.4/tr1/functional
-#usr/include/c++/4.0.4/tr1/functional_iterate.h
-#usr/include/c++/4.0.4/tr1/hashtable
-#usr/include/c++/4.0.4/tr1/memory
-#usr/include/c++/4.0.4/tr1/mu_iterate.h
-#usr/include/c++/4.0.4/tr1/ref_fwd.h
-#usr/include/c++/4.0.4/tr1/ref_wrap_iterate.h
-#usr/include/c++/4.0.4/tr1/repeat.h
-#usr/include/c++/4.0.4/tr1/tuple
-#usr/include/c++/4.0.4/tr1/tuple_iterate.h
-#usr/include/c++/4.0.4/tr1/type_traits
-#usr/include/c++/4.0.4/tr1/type_traits_fwd.h
-#usr/include/c++/4.0.4/tr1/unordered_map
-#usr/include/c++/4.0.4/tr1/unordered_set
-#usr/include/c++/4.0.4/tr1/utility
-#usr/include/c++/4.0.4/typeinfo
-#usr/include/c++/4.0.4/utility
-#usr/include/c++/4.0.4/valarray
-#usr/include/c++/4.0.4/vector
+#usr/include/c++/4.1.2
+#usr/include/c++/4.1.2/algorithm
+#usr/include/c++/4.1.2/backward
+#usr/include/c++/4.1.2/backward/algo.h
+#usr/include/c++/4.1.2/backward/algobase.h
+#usr/include/c++/4.1.2/backward/alloc.h
+#usr/include/c++/4.1.2/backward/backward_warning.h
+#usr/include/c++/4.1.2/backward/bvector.h
+#usr/include/c++/4.1.2/backward/complex.h
+#usr/include/c++/4.1.2/backward/defalloc.h
+#usr/include/c++/4.1.2/backward/deque.h
+#usr/include/c++/4.1.2/backward/fstream.h
+#usr/include/c++/4.1.2/backward/function.h
+#usr/include/c++/4.1.2/backward/hash_map.h
+#usr/include/c++/4.1.2/backward/hash_set.h
+#usr/include/c++/4.1.2/backward/hashtable.h
+#usr/include/c++/4.1.2/backward/heap.h
+#usr/include/c++/4.1.2/backward/iomanip.h
+#usr/include/c++/4.1.2/backward/iostream.h
+#usr/include/c++/4.1.2/backward/istream.h
+#usr/include/c++/4.1.2/backward/iterator.h
+#usr/include/c++/4.1.2/backward/list.h
+#usr/include/c++/4.1.2/backward/map.h
+#usr/include/c++/4.1.2/backward/multimap.h
+#usr/include/c++/4.1.2/backward/multiset.h
+#usr/include/c++/4.1.2/backward/new.h
+#usr/include/c++/4.1.2/backward/ostream.h
+#usr/include/c++/4.1.2/backward/pair.h
+#usr/include/c++/4.1.2/backward/queue.h
+#usr/include/c++/4.1.2/backward/rope.h
+#usr/include/c++/4.1.2/backward/set.h
+#usr/include/c++/4.1.2/backward/slist.h
+#usr/include/c++/4.1.2/backward/stack.h
+#usr/include/c++/4.1.2/backward/stream.h
+#usr/include/c++/4.1.2/backward/streambuf.h
+#usr/include/c++/4.1.2/backward/strstream
+#usr/include/c++/4.1.2/backward/tempbuf.h
+#usr/include/c++/4.1.2/backward/tree.h
+#usr/include/c++/4.1.2/backward/vector.h
+#usr/include/c++/4.1.2/bits
+#usr/include/c++/4.1.2/bits/allocator.h
+#usr/include/c++/4.1.2/bits/atomicity.h
+#usr/include/c++/4.1.2/bits/basic_ios.h
+#usr/include/c++/4.1.2/bits/basic_ios.tcc
+#usr/include/c++/4.1.2/bits/basic_string.h
+#usr/include/c++/4.1.2/bits/basic_string.tcc
+#usr/include/c++/4.1.2/bits/boost_concept_check.h
+#usr/include/c++/4.1.2/bits/char_traits.h
+#usr/include/c++/4.1.2/bits/cmath.tcc
+#usr/include/c++/4.1.2/bits/codecvt.h
+#usr/include/c++/4.1.2/bits/concept_check.h
+#usr/include/c++/4.1.2/bits/concurrence.h
+#usr/include/c++/4.1.2/bits/cpp_type_traits.h
+#usr/include/c++/4.1.2/bits/deque.tcc
+#usr/include/c++/4.1.2/bits/fstream.tcc
+#usr/include/c++/4.1.2/bits/functexcept.h
+#usr/include/c++/4.1.2/bits/gslice.h
+#usr/include/c++/4.1.2/bits/gslice_array.h
+#usr/include/c++/4.1.2/bits/indirect_array.h
+#usr/include/c++/4.1.2/bits/ios_base.h
+#usr/include/c++/4.1.2/bits/istream.tcc
+#usr/include/c++/4.1.2/bits/list.tcc
+#usr/include/c++/4.1.2/bits/locale_classes.h
+#usr/include/c++/4.1.2/bits/locale_facets.h
+#usr/include/c++/4.1.2/bits/locale_facets.tcc
+#usr/include/c++/4.1.2/bits/localefwd.h
+#usr/include/c++/4.1.2/bits/mask_array.h
+#usr/include/c++/4.1.2/bits/ostream.tcc
+#usr/include/c++/4.1.2/bits/postypes.h
+#usr/include/c++/4.1.2/bits/slice_array.h
+#usr/include/c++/4.1.2/bits/sstream.tcc
+#usr/include/c++/4.1.2/bits/stl_algo.h
+#usr/include/c++/4.1.2/bits/stl_algobase.h
+#usr/include/c++/4.1.2/bits/stl_bvector.h
+#usr/include/c++/4.1.2/bits/stl_construct.h
+#usr/include/c++/4.1.2/bits/stl_deque.h
+#usr/include/c++/4.1.2/bits/stl_function.h
+#usr/include/c++/4.1.2/bits/stl_heap.h
+#usr/include/c++/4.1.2/bits/stl_iterator.h
+#usr/include/c++/4.1.2/bits/stl_iterator_base_funcs.h
+#usr/include/c++/4.1.2/bits/stl_iterator_base_types.h
+#usr/include/c++/4.1.2/bits/stl_list.h
+#usr/include/c++/4.1.2/bits/stl_map.h
+#usr/include/c++/4.1.2/bits/stl_multimap.h
+#usr/include/c++/4.1.2/bits/stl_multiset.h
+#usr/include/c++/4.1.2/bits/stl_numeric.h
+#usr/include/c++/4.1.2/bits/stl_pair.h
+#usr/include/c++/4.1.2/bits/stl_queue.h
+#usr/include/c++/4.1.2/bits/stl_raw_storage_iter.h
+#usr/include/c++/4.1.2/bits/stl_relops.h
+#usr/include/c++/4.1.2/bits/stl_set.h
+#usr/include/c++/4.1.2/bits/stl_stack.h
+#usr/include/c++/4.1.2/bits/stl_tempbuf.h
+#usr/include/c++/4.1.2/bits/stl_tree.h
+#usr/include/c++/4.1.2/bits/stl_uninitialized.h
+#usr/include/c++/4.1.2/bits/stl_vector.h
+#usr/include/c++/4.1.2/bits/stream_iterator.h
+#usr/include/c++/4.1.2/bits/streambuf.tcc
+#usr/include/c++/4.1.2/bits/streambuf_iterator.h
+#usr/include/c++/4.1.2/bits/stringfwd.h
+#usr/include/c++/4.1.2/bits/valarray_after.h
+#usr/include/c++/4.1.2/bits/valarray_array.h
+#usr/include/c++/4.1.2/bits/valarray_array.tcc
+#usr/include/c++/4.1.2/bits/valarray_before.h
+#usr/include/c++/4.1.2/bits/vector.tcc
+#usr/include/c++/4.1.2/bitset
+#usr/include/c++/4.1.2/cassert
+#usr/include/c++/4.1.2/cctype
+#usr/include/c++/4.1.2/cerrno
+#usr/include/c++/4.1.2/cfloat
+#usr/include/c++/4.1.2/ciso646
+#usr/include/c++/4.1.2/climits
+#usr/include/c++/4.1.2/clocale
+#usr/include/c++/4.1.2/cmath
+#usr/include/c++/4.1.2/complex
+#usr/include/c++/4.1.2/csetjmp
+#usr/include/c++/4.1.2/csignal
+#usr/include/c++/4.1.2/cstdarg
+#usr/include/c++/4.1.2/cstddef
+#usr/include/c++/4.1.2/cstdio
+#usr/include/c++/4.1.2/cstdlib
+#usr/include/c++/4.1.2/cstring
+#usr/include/c++/4.1.2/ctime
+#usr/include/c++/4.1.2/cwchar
+#usr/include/c++/4.1.2/cwctype
+#usr/include/c++/4.1.2/cxxabi.h
+#usr/include/c++/4.1.2/debug
+#usr/include/c++/4.1.2/debug/bitset
+#usr/include/c++/4.1.2/debug/debug.h
+#usr/include/c++/4.1.2/debug/deque
+#usr/include/c++/4.1.2/debug/formatter.h
+#usr/include/c++/4.1.2/debug/functions.h
+#usr/include/c++/4.1.2/debug/hash_map
+#usr/include/c++/4.1.2/debug/hash_map.h
+#usr/include/c++/4.1.2/debug/hash_multimap.h
+#usr/include/c++/4.1.2/debug/hash_multiset.h
+#usr/include/c++/4.1.2/debug/hash_set
+#usr/include/c++/4.1.2/debug/hash_set.h
+#usr/include/c++/4.1.2/debug/list
+#usr/include/c++/4.1.2/debug/macros.h
+#usr/include/c++/4.1.2/debug/map
+#usr/include/c++/4.1.2/debug/map.h
+#usr/include/c++/4.1.2/debug/multimap.h
+#usr/include/c++/4.1.2/debug/multiset.h
+#usr/include/c++/4.1.2/debug/safe_base.h
+#usr/include/c++/4.1.2/debug/safe_iterator.h
+#usr/include/c++/4.1.2/debug/safe_iterator.tcc
+#usr/include/c++/4.1.2/debug/safe_sequence.h
+#usr/include/c++/4.1.2/debug/set
+#usr/include/c++/4.1.2/debug/set.h
+#usr/include/c++/4.1.2/debug/string
+#usr/include/c++/4.1.2/debug/vector
+#usr/include/c++/4.1.2/deque
+#usr/include/c++/4.1.2/exception
+#usr/include/c++/4.1.2/exception_defines.h
+#usr/include/c++/4.1.2/ext
+#usr/include/c++/4.1.2/ext/algorithm
+#usr/include/c++/4.1.2/ext/array_allocator.h
+#usr/include/c++/4.1.2/ext/bitmap_allocator.h
+#usr/include/c++/4.1.2/ext/codecvt_specializations.h
+#usr/include/c++/4.1.2/ext/debug_allocator.h
+#usr/include/c++/4.1.2/ext/functional
+#usr/include/c++/4.1.2/ext/hash_fun.h
+#usr/include/c++/4.1.2/ext/hash_map
+#usr/include/c++/4.1.2/ext/hash_set
+#usr/include/c++/4.1.2/ext/hashtable.h
+#usr/include/c++/4.1.2/ext/iterator
+#usr/include/c++/4.1.2/ext/malloc_allocator.h
+#usr/include/c++/4.1.2/ext/memory
+#usr/include/c++/4.1.2/ext/mt_allocator.h
+#usr/include/c++/4.1.2/ext/new_allocator.h
+#usr/include/c++/4.1.2/ext/numeric
+#usr/include/c++/4.1.2/ext/pb_assoc
+#usr/include/c++/4.1.2/ext/pb_assoc/assoc_cntnr.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/data_type.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/assoc_cntnr_base.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/constructor_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/constructors_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/d_extract_key.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/d_find_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/d_insert_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/erase_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/extract_key.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/info_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/insert_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/iterators_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_hash_assoc_cntnr
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_hash_assoc_cntnr/constructors_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_hash_assoc_cntnr/resize_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/constructor_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/constructors_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/erase_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/node_iteration_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/policy_access_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/r_erase_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/r_range_iteration_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/range_iteration_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/split_join_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/bin_search_tree_.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/debug_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/erase_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/find_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/find_iterators.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/info_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/insert_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/iterators_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/node_iterators.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/r_erase_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/rotate_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/split_join_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_hash_assoc_cntnr
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/cc_ht_map_.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/cmp_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/cond_key_dtor_entry_dealtor.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/constructor_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/constructor_destructor_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/debug_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/debug_no_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/debug_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/entry_list_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/erase_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/erase_no_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/erase_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/find_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/find_no_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/find_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/info_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/insert_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/insert_no_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/insert_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/iterators_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/policy_access_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/resize_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/resize_no_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/resize_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/size_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/standard_policies.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/cond_dealtor.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/constructors_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ds_trait_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/eq_fn
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/eq_fn/eq_by_less.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/eq_fn/hash_eq_fn.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_hash_assoc_cntnr
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/constructor_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/constructor_destructor_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/debug_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/debug_no_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/debug_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/erase_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/erase_no_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/erase_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/find_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/find_no_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/find_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/gp_ht_map_.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/info_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/insert_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/insert_no_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/insert_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/iterator_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/policy_access_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/resize_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/resize_no_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/resize_store_hash_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/direct_mask_range_hashing_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/direct_mod_range_hashing_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/linear_probe_fn_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/mask_based_range_hashing.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/mod_based_range_hashing.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/probe_fn_base.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/quadratic_probe_fn_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/ranged_hash_fn.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/ranged_probe_fn.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_types_traits.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_assoc_cntnr
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_assoc_cntnr/constructor_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_assoc_cntnr/policy_access_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/constructor_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/debug_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/erase_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/find_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/info_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/insert_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/iterators_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/lu_map_.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/policy_access_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_policy
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_policy/counter_lu_metadata_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_policy/counter_lu_policy_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_policy/mtf_lu_policy_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/map_debug_base.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/mapping_level_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ms_category_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ms_trait_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/order_statistics_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/cond_dtor.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/debug_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/erase_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/find_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/info_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/insert_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/iterators_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/node_iterators.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/ov_tree_map_.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/split_join_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/debug_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/erase_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/find_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/info_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/insert_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/node.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/rb_tree_.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/split_join_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/cc_hash_max_collision_resize_trigger_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/hash_exponential_size_policy_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/hash_prime_size_policy_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/hash_standard_resize_policy_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/ht_prime_size_policy_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/size_base.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/constructors_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/debug_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/erase_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/find_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/info_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/insert_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/node.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/splay_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/splay_tree_.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/split_join_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/standard_policies.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/standard_sizes.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/tree_assoc_cntnr
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/tree_assoc_cntnr/constructor_destructor_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/tree_policy
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/tree_policy/null_node_updator_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/tree_policy/order_statistics_imp.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/type_utils.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_append.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_apply.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_at_index.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_contains.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_filter.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_transform.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_typelist_append.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/types_traits.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/unordered_iterator
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/unordered_iterator/const_find_iterator.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/unordered_iterator/const_iterator.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/unordered_iterator/find_iterator.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/unordered_iterator/iterator.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/constructor_destructor_and_related.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/erase_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/erase_if_pred.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/find_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/info_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/insert_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/invalidation_guarantee_selector.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/it_value_type_traits.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/iterator.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/iterator_fn_imps.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/ref_pair.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/value_type_adapter.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/value_type_traits.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/ds_trait.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/exception.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/hash_policy.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/lu_policy.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/ms_trait.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/tree_policy.hpp
+#usr/include/c++/4.1.2/ext/pb_assoc/trivial_iterator_def.hpp
+#usr/include/c++/4.1.2/ext/pod_char_traits.h
+#usr/include/c++/4.1.2/ext/pool_allocator.h
+#usr/include/c++/4.1.2/ext/rb_tree
+#usr/include/c++/4.1.2/ext/rc_string_base.h
+#usr/include/c++/4.1.2/ext/rope
+#usr/include/c++/4.1.2/ext/ropeimpl.h
+#usr/include/c++/4.1.2/ext/slist
+#usr/include/c++/4.1.2/ext/sso_string_base.h
+#usr/include/c++/4.1.2/ext/stdio_filebuf.h
+#usr/include/c++/4.1.2/ext/stdio_sync_filebuf.h
+#usr/include/c++/4.1.2/ext/typelist.h
+#usr/include/c++/4.1.2/ext/vstring.h
+#usr/include/c++/4.1.2/ext/vstring.tcc
+#usr/include/c++/4.1.2/ext/vstring_fwd.h
+#usr/include/c++/4.1.2/ext/vstring_util.h
+#usr/include/c++/4.1.2/fstream
+#usr/include/c++/4.1.2/functional
+#usr/include/c++/4.1.2/i586-pc-linux-gnu
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/atomic_word.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/basic_file.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/c++allocator.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/c++config.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/c++io.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/c++locale.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/cpu_defines.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/ctype_base.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/ctype_inline.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/ctype_noninline.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/cxxabi_tweaks.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/gthr-default.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/gthr-posix.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/gthr-single.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/gthr-tpf.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/gthr.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/messages_members.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/os_defines.h
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/stdc++.h.gch
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/stdc++.h.gch/O0g.gch
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/stdc++.h.gch/O2g.gch
+#usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/time_members.h
+#usr/include/c++/4.1.2/iomanip
+#usr/include/c++/4.1.2/ios
+#usr/include/c++/4.1.2/iosfwd
+#usr/include/c++/4.1.2/iostream
+#usr/include/c++/4.1.2/istream
+#usr/include/c++/4.1.2/iterator
+#usr/include/c++/4.1.2/limits
+#usr/include/c++/4.1.2/list
+#usr/include/c++/4.1.2/locale
+#usr/include/c++/4.1.2/map
+#usr/include/c++/4.1.2/memory
+#usr/include/c++/4.1.2/new
+#usr/include/c++/4.1.2/numeric
+#usr/include/c++/4.1.2/ostream
+#usr/include/c++/4.1.2/queue
+#usr/include/c++/4.1.2/set
+#usr/include/c++/4.1.2/sstream
+#usr/include/c++/4.1.2/stack
+#usr/include/c++/4.1.2/stdexcept
+#usr/include/c++/4.1.2/streambuf
+#usr/include/c++/4.1.2/string
+#usr/include/c++/4.1.2/tr1
+#usr/include/c++/4.1.2/tr1/array
+#usr/include/c++/4.1.2/tr1/bind_iterate.h
+#usr/include/c++/4.1.2/tr1/bind_repeat.h
+#usr/include/c++/4.1.2/tr1/boost_shared_ptr.h
+#usr/include/c++/4.1.2/tr1/functional
+#usr/include/c++/4.1.2/tr1/functional_iterate.h
+#usr/include/c++/4.1.2/tr1/hashtable
+#usr/include/c++/4.1.2/tr1/memory
+#usr/include/c++/4.1.2/tr1/mu_iterate.h
+#usr/include/c++/4.1.2/tr1/ref_fwd.h
+#usr/include/c++/4.1.2/tr1/ref_wrap_iterate.h
+#usr/include/c++/4.1.2/tr1/repeat.h
+#usr/include/c++/4.1.2/tr1/tuple
+#usr/include/c++/4.1.2/tr1/tuple_iterate.h
+#usr/include/c++/4.1.2/tr1/type_traits
+#usr/include/c++/4.1.2/tr1/type_traits_fwd.h
+#usr/include/c++/4.1.2/tr1/unordered_map
+#usr/include/c++/4.1.2/tr1/unordered_set
+#usr/include/c++/4.1.2/tr1/utility
+#usr/include/c++/4.1.2/typeinfo
+#usr/include/c++/4.1.2/utility
+#usr/include/c++/4.1.2/valarray
+#usr/include/c++/4.1.2/vector
 #usr/include/mf-runtime.h
 #usr/info/cpp.info
 #usr/info/cppinternals.info
@@ -267,73 +502,86 @@
 #usr/info/gccint.info
 #usr/lib/gcc
 #usr/lib/gcc/i586-pc-linux-gnu
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/cc1
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/cc1plus
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/collect2
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/crtbegin.o
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/crtbeginS.o
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/crtbeginT.o
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/crtend.o
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/crtendS.o
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/README
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/emmintrin.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/float.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/iso646.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/limits.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/mm3dnow.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/mm_malloc.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/mmintrin.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/pmmintrin.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/stdarg.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/stdbool.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/stddef.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/syslimits.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/unwind.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/varargs.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/include/xmmintrin.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/fixinc.sh
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/fixincl
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/gsyslimits.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/README
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/emmintrin.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/float.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/iso646.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/limits.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/mm3dnow.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/mm_malloc.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/mmintrin.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/pmmintrin.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/stdarg.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/stdbool.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/stddef.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/unwind.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/varargs.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/include/xmmintrin.h
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/macro_list
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/mkheaders
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/install-tools/mkheaders.conf
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/libgcc.a
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/libgcc_eh.a
-#usr/lib/gcc/i586-pc-linux-gnu/4.0.4/libgcov.a
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/cc1
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/cc1plus
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/collect2
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/crtbegin.o
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/crtbeginS.o
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/crtbeginT.o
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/crtend.o
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/crtendS.o
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/crtfastmath.o
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/README
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/emmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/float.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/iso646.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/limits.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/mm3dnow.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/mm_malloc.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/mmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/pmmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/ssp
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/ssp/ssp.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/ssp/stdio.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/ssp/string.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/ssp/unistd.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/stdarg.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/stdbool.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/stddef.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/syslimits.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/unwind.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/varargs.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/xmmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/fixinc.sh
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/fixincl
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/gsyslimits.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/README
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/emmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/float.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/iso646.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/limits.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/mm3dnow.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/mm_malloc.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/mmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/pmmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/stdarg.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/stdbool.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/stddef.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/unwind.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/varargs.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/xmmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/macro_list
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/mkheaders
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/mkheaders.conf
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/libgcc.a
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/libgcc_eh.a
+#usr/lib/gcc/i586-pc-linux-gnu/4.1.2/libgcov.a
 #usr/lib/libmudflap.a
 #usr/lib/libmudflap.la
-#usr/lib/libmudflap.so
-#usr/lib/libmudflap.so.0
-#usr/lib/libmudflap.so.0.0.0
+usr/lib/libmudflap.so
+usr/lib/libmudflap.so.0
+usr/lib/libmudflap.so.0.0.0
 #usr/lib/libmudflapth.a
 #usr/lib/libmudflapth.la
-#usr/lib/libmudflapth.so
-#usr/lib/libmudflapth.so.0
-#usr/lib/libmudflapth.so.0.0.0
+usr/lib/libmudflapth.so
+usr/lib/libmudflapth.so.0
+usr/lib/libmudflapth.so.0.0.0
+#usr/lib/libssp.a
+#usr/lib/libssp.la
+usr/lib/libssp.so
+usr/lib/libssp.so.0
+usr/lib/libssp.so.0.0.0
+#usr/lib/libssp_nonshared.a
+#usr/lib/libssp_nonshared.la
 #usr/lib/libstdc++.a
 #usr/lib/libstdc++.la
 usr/lib/libstdc++.so
 usr/lib/libstdc++.so.6
-usr/lib/libstdc++.so.6.0.7
+usr/lib/libstdc++.so.6.0.8
 #usr/lib/libsupc++.a
 #usr/lib/libsupc++.la
 #usr/man/man1/cpp.1

diff --git a/config/rootfiles/common/gettext b/config/rootfiles/common/gettext
index 6a927cad0c133fb85f965a81aaed8c592a3f37ae..915985b5aef150b18902741c9d04efa95e328e38 100644 (file)
--- a/config/rootfiles/common/gettext
+++ b/config/rootfiles/common/gettext
@@ -1,24 +1,24 @@
-#usr/bin/autopoint
-#usr/bin/envsubst
-#usr/bin/gettext
-#usr/bin/gettext.sh
-#usr/bin/gettextize
-#usr/bin/msgattrib
-#usr/bin/msgcat
-#usr/bin/msgcmp
-#usr/bin/msgcomm
-#usr/bin/msgconv
-#usr/bin/msgen
-#usr/bin/msgexec
-#usr/bin/msgfilter
-#usr/bin/msgfmt
-#usr/bin/msggrep
-#usr/bin/msginit
-#usr/bin/msgmerge
-#usr/bin/msgunfmt
-#usr/bin/msguniq
-#usr/bin/ngettext
-#usr/bin/xgettext
+usr/bin/autopoint
+usr/bin/envsubst
+usr/bin/gettext
+usr/bin/gettext.sh
+usr/bin/gettextize
+usr/bin/msgattrib
+usr/bin/msgcat
+usr/bin/msgcmp
+usr/bin/msgcomm
+usr/bin/msgconv
+usr/bin/msgen
+usr/bin/msgexec
+usr/bin/msgfilter
+usr/bin/msgfmt
+usr/bin/msggrep
+usr/bin/msginit
+usr/bin/msgmerge
+usr/bin/msgunfmt
+usr/bin/msguniq
+usr/bin/ngettext
+usr/bin/xgettext
 #usr/include/autosprintf.h
 #usr/include/gettext-po.h
 #usr/info/autosprintf.info
@@ -30,21 +30,21 @@
 #usr/lib/gettext/user-email
 #usr/lib/libasprintf.a
 #usr/lib/libasprintf.la
-#usr/lib/libasprintf.so
-#usr/lib/libasprintf.so.0
-#usr/lib/libasprintf.so.0.0.0
-#usr/lib/libgettextlib-0.14.5.so
+usr/lib/libasprintf.so
+usr/lib/libasprintf.so.0
+usr/lib/libasprintf.so.0.0.0
+usr/lib/libgettextlib-0.14.5.so
 #usr/lib/libgettextlib.la
-#usr/lib/libgettextlib.so
+usr/lib/libgettextlib.so
 #usr/lib/libgettextpo.a
 #usr/lib/libgettextpo.la
-#usr/lib/libgettextpo.so
-#usr/lib/libgettextpo.so.0
-#usr/lib/libgettextpo.so.0.1.0
-#usr/lib/libgettextsrc-0.14.5.so
+usr/lib/libgettextpo.so
+usr/lib/libgettextpo.so.0
+usr/lib/libgettextpo.so.0.1.0
+usr/lib/libgettextsrc-0.14.5.so
 #usr/lib/libgettextsrc.la
-#usr/lib/libgettextsrc.so
-#usr/lib/preloadable_libintl.so
+usr/lib/libgettextsrc.so
+usr/lib/preloadable_libintl.so
 #usr/share/aclocal/codeset.m4
 #usr/share/aclocal/gettext.m4
 #usr/share/aclocal/glibc2.m4

diff --git a/config/rootfiles/common/groff b/config/rootfiles/common/groff
index 345de37ab0faba210e1810f4ff4b6fd9681eacf5..c27e5947e03a66b38fb32ccb6116482184ea0c8c 100644 (file)
--- a/config/rootfiles/common/groff
+++ b/config/rootfiles/common/groff
@@ -1,8 +1,11 @@
 #usr/bin/addftinfo
 #usr/bin/afmtodit
+#usr/bin/chem
 #usr/bin/eqn
 #usr/bin/eqn2graph
+#usr/bin/gdiffmk
 #usr/bin/geqn
+#usr/bin/grap2graph
 #usr/bin/grn
 #usr/bin/grodvi
 #usr/bin/groff
@@ -20,488 +23,566 @@
 #usr/bin/mmroff
 #usr/bin/neqn
 #usr/bin/nroff
+#usr/bin/pdfroff
 #usr/bin/pfbtops
 #usr/bin/pic
 #usr/bin/pic2graph
 #usr/bin/post-grohtml
 #usr/bin/pre-grohtml
+#usr/bin/preconv
 #usr/bin/refer
+#usr/bin/roff2dvi
+#usr/bin/roff2html
+#usr/bin/roff2pdf
+#usr/bin/roff2ps
+#usr/bin/roff2text
+#usr/bin/roff2x
 #usr/bin/soelim
 #usr/bin/tbl
 #usr/bin/tfmtodit
 #usr/bin/troff
-#usr/info/groff
-#usr/info/groff-1
-#usr/info/groff-10
-#usr/info/groff-11
-#usr/info/groff-2
-#usr/info/groff-3
-#usr/info/groff-4
-#usr/info/groff-5
-#usr/info/groff-6
-#usr/info/groff-7
-#usr/info/groff-8
-#usr/info/groff-9
 #usr/lib/groff
+#usr/lib/groff/groffer
+#usr/lib/groff/groffer/func.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/version.sh
 #usr/lib/groff/site-tmac
-#usr/man/man1/addftinfo.1
-#usr/man/man1/afmtodit.1
-#usr/man/man1/eqn.1
-#usr/man/man1/eqn2graph.1
-#usr/man/man1/grn.1
-#usr/man/man1/grodvi.1
-#usr/man/man1/groff.1
-#usr/man/man1/groffer.1
-#usr/man/man1/grog.1
-#usr/man/man1/grohtml.1
-#usr/man/man1/grolbp.1
-#usr/man/man1/grolj4.1
-#usr/man/man1/grops.1
-#usr/man/man1/grotty.1
-#usr/man/man1/hpftodit.1
-#usr/man/man1/indxbib.1
-#usr/man/man1/lkbib.1
-#usr/man/man1/lookbib.1
-#usr/man/man1/mmroff.1
-#usr/man/man1/neqn.1
-#usr/man/man1/nroff.1
-#usr/man/man1/pfbtops.1
-#usr/man/man1/pic.1
-#usr/man/man1/pic2graph.1
-#usr/man/man1/refer.1
-#usr/man/man1/soelim.1
-#usr/man/man1/tbl.1
-#usr/man/man1/tfmtodit.1
-#usr/man/man1/troff.1
-#usr/man/man5/groff_font.5
-#usr/man/man5/groff_out.5
-#usr/man/man5/groff_tmac.5
-#usr/man/man7/ditroff.7
-#usr/man/man7/groff.7
-#usr/man/man7/groff_char.7
-#usr/man/man7/groff_diff.7
-#usr/man/man7/groff_man.7
-#usr/man/man7/groff_mdoc.7
-#usr/man/man7/groff_me.7
-#usr/man/man7/groff_mm.7
-#usr/man/man7/groff_mmse.7
-#usr/man/man7/groff_mom.7
-#usr/man/man7/groff_ms.7
-#usr/man/man7/groff_trace.7
-#usr/man/man7/groff_www.7
-#usr/man/man7/roff.7
-#usr/share/doc/groff
-#usr/share/doc/groff/1.18.1
-#usr/share/doc/groff/1.18.1/examples
-#usr/share/doc/groff/1.18.1/examples/README.mom
-#usr/share/doc/groff/1.18.1/examples/elvis_syntax
-#usr/share/doc/groff/1.18.1/examples/grnexmpl.g
-#usr/share/doc/groff/1.18.1/examples/grnexmpl.me
-#usr/share/doc/groff/1.18.1/examples/grnexmpl.ps
-#usr/share/doc/groff/1.18.1/examples/letter.mom
-#usr/share/doc/groff/1.18.1/examples/letter.ps
-#usr/share/doc/groff/1.18.1/examples/macros.mom
-#usr/share/doc/groff/1.18.1/examples/macros.ps
-#usr/share/doc/groff/1.18.1/examples/penguin.ps
-#usr/share/doc/groff/1.18.1/examples/typeset.mom
-#usr/share/doc/groff/1.18.1/examples/typeset.ps
-#usr/share/doc/groff/1.18.1/examples/typewrite.mom
-#usr/share/doc/groff/1.18.1/examples/typewrite.ps
-#usr/share/doc/groff/1.18.1/examples/webpage.ms
-#usr/share/doc/groff/1.18.1/examples/webpage.ps
-#usr/share/doc/groff/1.18.1/html
-#usr/share/doc/groff/1.18.1/html/momdoc
-#usr/share/doc/groff/1.18.1/html/momdoc/appendices.html
-#usr/share/doc/groff/1.18.1/html/momdoc/cover.html
-#usr/share/doc/groff/1.18.1/html/momdoc/definitions.html
-#usr/share/doc/groff/1.18.1/html/momdoc/docelement.html
-#usr/share/doc/groff/1.18.1/html/momdoc/docprocessing.html
-#usr/share/doc/groff/1.18.1/html/momdoc/goodies.html
-#usr/share/doc/groff/1.18.1/html/momdoc/headfootpage.html
-#usr/share/doc/groff/1.18.1/html/momdoc/inlines.html
-#usr/share/doc/groff/1.18.1/html/momdoc/intro.html
-#usr/share/doc/groff/1.18.1/html/momdoc/letters.html
-#usr/share/doc/groff/1.18.1/html/momdoc/rectoverso.html
-#usr/share/doc/groff/1.18.1/html/momdoc/reserved.html
-#usr/share/doc/groff/1.18.1/html/momdoc/toc.html
-#usr/share/doc/groff/1.18.1/html/momdoc/typemacdoc.html
-#usr/share/doc/groff/1.18.1/html/momdoc/typesetting.html
-#usr/share/doc/groff/1.18.1/html/momdoc/using.html
-#usr/share/doc/groff/1.18.1/meintro.me
-#usr/share/doc/groff/1.18.1/meintro.ps
-#usr/share/doc/groff/1.18.1/meref.me
-#usr/share/doc/groff/1.18.1/meref.ps
-#usr/share/doc/groff/1.18.1/pic.ms
-#usr/share/doc/groff/1.18.1/pic.ps
+#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/groff
-#usr/share/groff/1.18.1
-#usr/share/groff/1.18.1/eign
-#usr/share/groff/1.18.1/font
-#usr/share/groff/1.18.1/font/devX100
-#usr/share/groff/1.18.1/font/devX100-12
-#usr/share/groff/1.18.1/font/devX100-12/CB
-#usr/share/groff/1.18.1/font/devX100-12/CBI
-#usr/share/groff/1.18.1/font/devX100-12/CI
-#usr/share/groff/1.18.1/font/devX100-12/CR
-#usr/share/groff/1.18.1/font/devX100-12/DESC
-#usr/share/groff/1.18.1/font/devX100-12/G
-#usr/share/groff/1.18.1/font/devX100-12/HB
-#usr/share/groff/1.18.1/font/devX100-12/HBI
-#usr/share/groff/1.18.1/font/devX100-12/HI
-#usr/share/groff/1.18.1/font/devX100-12/HR
-#usr/share/groff/1.18.1/font/devX100-12/M
-#usr/share/groff/1.18.1/font/devX100-12/NB
-#usr/share/groff/1.18.1/font/devX100-12/NBI
-#usr/share/groff/1.18.1/font/devX100-12/NI
-#usr/share/groff/1.18.1/font/devX100-12/NR
-#usr/share/groff/1.18.1/font/devX100-12/S
-#usr/share/groff/1.18.1/font/devX100-12/TB
-#usr/share/groff/1.18.1/font/devX100-12/TBI
-#usr/share/groff/1.18.1/font/devX100-12/TI
-#usr/share/groff/1.18.1/font/devX100-12/TR
-#usr/share/groff/1.18.1/font/devX100/CB
-#usr/share/groff/1.18.1/font/devX100/CBI
-#usr/share/groff/1.18.1/font/devX100/CI
-#usr/share/groff/1.18.1/font/devX100/CR
-#usr/share/groff/1.18.1/font/devX100/DESC
-#usr/share/groff/1.18.1/font/devX100/G
-#usr/share/groff/1.18.1/font/devX100/HB
-#usr/share/groff/1.18.1/font/devX100/HBI
-#usr/share/groff/1.18.1/font/devX100/HI
-#usr/share/groff/1.18.1/font/devX100/HR
-#usr/share/groff/1.18.1/font/devX100/M
-#usr/share/groff/1.18.1/font/devX100/NB
-#usr/share/groff/1.18.1/font/devX100/NBI
-#usr/share/groff/1.18.1/font/devX100/NI
-#usr/share/groff/1.18.1/font/devX100/NR
-#usr/share/groff/1.18.1/font/devX100/S
-#usr/share/groff/1.18.1/font/devX100/TB
-#usr/share/groff/1.18.1/font/devX100/TBI
-#usr/share/groff/1.18.1/font/devX100/TI
-#usr/share/groff/1.18.1/font/devX100/TR
-#usr/share/groff/1.18.1/font/devX75
-#usr/share/groff/1.18.1/font/devX75-12
-#usr/share/groff/1.18.1/font/devX75-12/CB
-#usr/share/groff/1.18.1/font/devX75-12/CBI
-#usr/share/groff/1.18.1/font/devX75-12/CI
-#usr/share/groff/1.18.1/font/devX75-12/CR
-#usr/share/groff/1.18.1/font/devX75-12/DESC
-#usr/share/groff/1.18.1/font/devX75-12/G
-#usr/share/groff/1.18.1/font/devX75-12/HB
-#usr/share/groff/1.18.1/font/devX75-12/HBI
-#usr/share/groff/1.18.1/font/devX75-12/HI
-#usr/share/groff/1.18.1/font/devX75-12/HR
-#usr/share/groff/1.18.1/font/devX75-12/M
-#usr/share/groff/1.18.1/font/devX75-12/NB
-#usr/share/groff/1.18.1/font/devX75-12/NBI
-#usr/share/groff/1.18.1/font/devX75-12/NI
-#usr/share/groff/1.18.1/font/devX75-12/NR
-#usr/share/groff/1.18.1/font/devX75-12/S
-#usr/share/groff/1.18.1/font/devX75-12/TB
-#usr/share/groff/1.18.1/font/devX75-12/TBI
-#usr/share/groff/1.18.1/font/devX75-12/TI
-#usr/share/groff/1.18.1/font/devX75-12/TR
-#usr/share/groff/1.18.1/font/devX75/CB
-#usr/share/groff/1.18.1/font/devX75/CBI
-#usr/share/groff/1.18.1/font/devX75/CI
-#usr/share/groff/1.18.1/font/devX75/CR
-#usr/share/groff/1.18.1/font/devX75/DESC
-#usr/share/groff/1.18.1/font/devX75/G
-#usr/share/groff/1.18.1/font/devX75/HB
-#usr/share/groff/1.18.1/font/devX75/HBI
-#usr/share/groff/1.18.1/font/devX75/HI
-#usr/share/groff/1.18.1/font/devX75/HR
-#usr/share/groff/1.18.1/font/devX75/M
-#usr/share/groff/1.18.1/font/devX75/NB
-#usr/share/groff/1.18.1/font/devX75/NBI
-#usr/share/groff/1.18.1/font/devX75/NI
-#usr/share/groff/1.18.1/font/devX75/NR
-#usr/share/groff/1.18.1/font/devX75/S
-#usr/share/groff/1.18.1/font/devX75/TB
-#usr/share/groff/1.18.1/font/devX75/TBI
-#usr/share/groff/1.18.1/font/devX75/TI
-#usr/share/groff/1.18.1/font/devX75/TR
-#usr/share/groff/1.18.1/font/devascii
-#usr/share/groff/1.18.1/font/devascii/B
-#usr/share/groff/1.18.1/font/devascii/BI
-#usr/share/groff/1.18.1/font/devascii/DESC
-#usr/share/groff/1.18.1/font/devascii/I
-#usr/share/groff/1.18.1/font/devascii/R
-#usr/share/groff/1.18.1/font/devascii8
-#usr/share/groff/1.18.1/font/devascii8/B
-#usr/share/groff/1.18.1/font/devascii8/BI
-#usr/share/groff/1.18.1/font/devascii8/DESC
-#usr/share/groff/1.18.1/font/devascii8/I
-#usr/share/groff/1.18.1/font/devascii8/R
-#usr/share/groff/1.18.1/font/devdvi
-#usr/share/groff/1.18.1/font/devdvi/CW
-#usr/share/groff/1.18.1/font/devdvi/CWEC
-#usr/share/groff/1.18.1/font/devdvi/CWI
-#usr/share/groff/1.18.1/font/devdvi/CWIEC
-#usr/share/groff/1.18.1/font/devdvi/CWITC
-#usr/share/groff/1.18.1/font/devdvi/CWTC
-#usr/share/groff/1.18.1/font/devdvi/DESC
-#usr/share/groff/1.18.1/font/devdvi/EX
-#usr/share/groff/1.18.1/font/devdvi/G
-#usr/share/groff/1.18.1/font/devdvi/HB
-#usr/share/groff/1.18.1/font/devdvi/HBEC
-#usr/share/groff/1.18.1/font/devdvi/HBI
-#usr/share/groff/1.18.1/font/devdvi/HBIEC
-#usr/share/groff/1.18.1/font/devdvi/HBITC
-#usr/share/groff/1.18.1/font/devdvi/HBTC
-#usr/share/groff/1.18.1/font/devdvi/HI
-#usr/share/groff/1.18.1/font/devdvi/HIEC
-#usr/share/groff/1.18.1/font/devdvi/HITC
-#usr/share/groff/1.18.1/font/devdvi/HR
-#usr/share/groff/1.18.1/font/devdvi/HREC
-#usr/share/groff/1.18.1/font/devdvi/HRTC
-#usr/share/groff/1.18.1/font/devdvi/M
-#usr/share/groff/1.18.1/font/devdvi/MI
-#usr/share/groff/1.18.1/font/devdvi/S
-#usr/share/groff/1.18.1/font/devdvi/SA
-#usr/share/groff/1.18.1/font/devdvi/SB
-#usr/share/groff/1.18.1/font/devdvi/TB
-#usr/share/groff/1.18.1/font/devdvi/TBEC
-#usr/share/groff/1.18.1/font/devdvi/TBI
-#usr/share/groff/1.18.1/font/devdvi/TBIEC
-#usr/share/groff/1.18.1/font/devdvi/TBITC
-#usr/share/groff/1.18.1/font/devdvi/TBTC
-#usr/share/groff/1.18.1/font/devdvi/TI
-#usr/share/groff/1.18.1/font/devdvi/TIEC
-#usr/share/groff/1.18.1/font/devdvi/TITC
-#usr/share/groff/1.18.1/font/devdvi/TR
-#usr/share/groff/1.18.1/font/devdvi/TREC
-#usr/share/groff/1.18.1/font/devdvi/TRTC
-#usr/share/groff/1.18.1/font/devdvi/generate
-#usr/share/groff/1.18.1/font/devdvi/generate/CompileFonts
-#usr/share/groff/1.18.1/font/devdvi/generate/Makefile
-#usr/share/groff/1.18.1/font/devdvi/generate/ec.map
-#usr/share/groff/1.18.1/font/devdvi/generate/msam.map
-#usr/share/groff/1.18.1/font/devdvi/generate/msbm.map
-#usr/share/groff/1.18.1/font/devdvi/generate/tc.map
-#usr/share/groff/1.18.1/font/devdvi/generate/texb.map
-#usr/share/groff/1.18.1/font/devdvi/generate/texex.map
-#usr/share/groff/1.18.1/font/devdvi/generate/texi.map
-#usr/share/groff/1.18.1/font/devdvi/generate/texmi.map
-#usr/share/groff/1.18.1/font/devdvi/generate/texr.map
-#usr/share/groff/1.18.1/font/devdvi/generate/texsy.map
-#usr/share/groff/1.18.1/font/devdvi/generate/textt.map
-#usr/share/groff/1.18.1/font/devhtml
-#usr/share/groff/1.18.1/font/devhtml/B
-#usr/share/groff/1.18.1/font/devhtml/BI
-#usr/share/groff/1.18.1/font/devhtml/CB
-#usr/share/groff/1.18.1/font/devhtml/CBI
-#usr/share/groff/1.18.1/font/devhtml/CI
-#usr/share/groff/1.18.1/font/devhtml/CR
-#usr/share/groff/1.18.1/font/devhtml/DESC
-#usr/share/groff/1.18.1/font/devhtml/G
-#usr/share/groff/1.18.1/font/devhtml/I
-#usr/share/groff/1.18.1/font/devhtml/M
-#usr/share/groff/1.18.1/font/devhtml/R
-#usr/share/groff/1.18.1/font/devhtml/S
-#usr/share/groff/1.18.1/font/devlatin1
-#usr/share/groff/1.18.1/font/devlatin1/B
-#usr/share/groff/1.18.1/font/devlatin1/BI
-#usr/share/groff/1.18.1/font/devlatin1/DESC
-#usr/share/groff/1.18.1/font/devlatin1/I
-#usr/share/groff/1.18.1/font/devlatin1/R
-#usr/share/groff/1.18.1/font/devlbp
-#usr/share/groff/1.18.1/font/devlbp/CB
-#usr/share/groff/1.18.1/font/devlbp/CI
-#usr/share/groff/1.18.1/font/devlbp/CR
-#usr/share/groff/1.18.1/font/devlbp/DESC
-#usr/share/groff/1.18.1/font/devlbp/EB
-#usr/share/groff/1.18.1/font/devlbp/EI
-#usr/share/groff/1.18.1/font/devlbp/ER
-#usr/share/groff/1.18.1/font/devlbp/HB
-#usr/share/groff/1.18.1/font/devlbp/HBI
-#usr/share/groff/1.18.1/font/devlbp/HI
-#usr/share/groff/1.18.1/font/devlbp/HNB
-#usr/share/groff/1.18.1/font/devlbp/HNBI
-#usr/share/groff/1.18.1/font/devlbp/HNI
-#usr/share/groff/1.18.1/font/devlbp/HNR
-#usr/share/groff/1.18.1/font/devlbp/HR
-#usr/share/groff/1.18.1/font/devlbp/TB
-#usr/share/groff/1.18.1/font/devlbp/TBI
-#usr/share/groff/1.18.1/font/devlbp/TI
-#usr/share/groff/1.18.1/font/devlbp/TR
-#usr/share/groff/1.18.1/font/devlj4
-#usr/share/groff/1.18.1/font/devlj4/ALBB
-#usr/share/groff/1.18.1/font/devlj4/ALBR
-#usr/share/groff/1.18.1/font/devlj4/AOB
-#usr/share/groff/1.18.1/font/devlj4/AOI
-#usr/share/groff/1.18.1/font/devlj4/AOR
-#usr/share/groff/1.18.1/font/devlj4/CB
-#usr/share/groff/1.18.1/font/devlj4/CBI
-#usr/share/groff/1.18.1/font/devlj4/CI
-#usr/share/groff/1.18.1/font/devlj4/CLARENDON
-#usr/share/groff/1.18.1/font/devlj4/CORONET
-#usr/share/groff/1.18.1/font/devlj4/CR
-#usr/share/groff/1.18.1/font/devlj4/DESC
-#usr/share/groff/1.18.1/font/devlj4/GB
-#usr/share/groff/1.18.1/font/devlj4/GBI
-#usr/share/groff/1.18.1/font/devlj4/GI
-#usr/share/groff/1.18.1/font/devlj4/GR
-#usr/share/groff/1.18.1/font/devlj4/LGB
-#usr/share/groff/1.18.1/font/devlj4/LGI
-#usr/share/groff/1.18.1/font/devlj4/LGR
-#usr/share/groff/1.18.1/font/devlj4/MARIGOLD
-#usr/share/groff/1.18.1/font/devlj4/OB
-#usr/share/groff/1.18.1/font/devlj4/OBI
-#usr/share/groff/1.18.1/font/devlj4/OI
-#usr/share/groff/1.18.1/font/devlj4/OR
-#usr/share/groff/1.18.1/font/devlj4/S
-#usr/share/groff/1.18.1/font/devlj4/TB
-#usr/share/groff/1.18.1/font/devlj4/TBI
-#usr/share/groff/1.18.1/font/devlj4/TI
-#usr/share/groff/1.18.1/font/devlj4/TR
-#usr/share/groff/1.18.1/font/devlj4/UB
-#usr/share/groff/1.18.1/font/devlj4/UBI
-#usr/share/groff/1.18.1/font/devlj4/UCB
-#usr/share/groff/1.18.1/font/devlj4/UCBI
-#usr/share/groff/1.18.1/font/devlj4/UCI
-#usr/share/groff/1.18.1/font/devlj4/UCR
-#usr/share/groff/1.18.1/font/devlj4/UI
-#usr/share/groff/1.18.1/font/devlj4/UR
-#usr/share/groff/1.18.1/font/devlj4/generate
-#usr/share/groff/1.18.1/font/devlj4/generate/Makefile
-#usr/share/groff/1.18.1/font/devlj4/generate/special.map
-#usr/share/groff/1.18.1/font/devlj4/generate/text.map
-#usr/share/groff/1.18.1/font/devnippon
-#usr/share/groff/1.18.1/font/devnippon/B
-#usr/share/groff/1.18.1/font/devnippon/BI
-#usr/share/groff/1.18.1/font/devnippon/DESC
-#usr/share/groff/1.18.1/font/devnippon/G
-#usr/share/groff/1.18.1/font/devnippon/I
-#usr/share/groff/1.18.1/font/devnippon/M
-#usr/share/groff/1.18.1/font/devnippon/R
-#usr/share/groff/1.18.1/font/devps
-#usr/share/groff/1.18.1/font/devps/AB
-#usr/share/groff/1.18.1/font/devps/ABI
-#usr/share/groff/1.18.1/font/devps/AI
-#usr/share/groff/1.18.1/font/devps/AR
-#usr/share/groff/1.18.1/font/devps/BMB
-#usr/share/groff/1.18.1/font/devps/BMBI
-#usr/share/groff/1.18.1/font/devps/BMI
-#usr/share/groff/1.18.1/font/devps/BMR
-#usr/share/groff/1.18.1/font/devps/CB
-#usr/share/groff/1.18.1/font/devps/CBI
-#usr/share/groff/1.18.1/font/devps/CI
-#usr/share/groff/1.18.1/font/devps/CR
-#usr/share/groff/1.18.1/font/devps/DESC
-#usr/share/groff/1.18.1/font/devps/G
-#usr/share/groff/1.18.1/font/devps/HB
-#usr/share/groff/1.18.1/font/devps/HBI
-#usr/share/groff/1.18.1/font/devps/HI
-#usr/share/groff/1.18.1/font/devps/HNB
-#usr/share/groff/1.18.1/font/devps/HNBI
-#usr/share/groff/1.18.1/font/devps/HNI
-#usr/share/groff/1.18.1/font/devps/HNR
-#usr/share/groff/1.18.1/font/devps/HR
-#usr/share/groff/1.18.1/font/devps/M
-#usr/share/groff/1.18.1/font/devps/NB
-#usr/share/groff/1.18.1/font/devps/NBI
-#usr/share/groff/1.18.1/font/devps/NI
-#usr/share/groff/1.18.1/font/devps/NR
-#usr/share/groff/1.18.1/font/devps/PB
-#usr/share/groff/1.18.1/font/devps/PBI
-#usr/share/groff/1.18.1/font/devps/PI
-#usr/share/groff/1.18.1/font/devps/PR
-#usr/share/groff/1.18.1/font/devps/S
-#usr/share/groff/1.18.1/font/devps/SS
-#usr/share/groff/1.18.1/font/devps/TB
-#usr/share/groff/1.18.1/font/devps/TBI
-#usr/share/groff/1.18.1/font/devps/TI
-#usr/share/groff/1.18.1/font/devps/TR
-#usr/share/groff/1.18.1/font/devps/ZCMI
-#usr/share/groff/1.18.1/font/devps/ZD
-#usr/share/groff/1.18.1/font/devps/ZDR
-#usr/share/groff/1.18.1/font/devps/download
-#usr/share/groff/1.18.1/font/devps/generate
-#usr/share/groff/1.18.1/font/devps/generate/Makefile
-#usr/share/groff/1.18.1/font/devps/generate/afmname
-#usr/share/groff/1.18.1/font/devps/generate/dingbats.map
-#usr/share/groff/1.18.1/font/devps/generate/dingbats.rmap
-#usr/share/groff/1.18.1/font/devps/generate/lgreekmap
-#usr/share/groff/1.18.1/font/devps/generate/symbol.sed
-#usr/share/groff/1.18.1/font/devps/generate/symbolchars
-#usr/share/groff/1.18.1/font/devps/generate/symbolsl.afm
-#usr/share/groff/1.18.1/font/devps/generate/textmap
-#usr/share/groff/1.18.1/font/devps/prologue
-#usr/share/groff/1.18.1/font/devps/symbolsl.pfa
-#usr/share/groff/1.18.1/font/devps/text.enc
-#usr/share/groff/1.18.1/font/devps/zapfdr.pfa
-#usr/share/groff/1.18.1/font/devutf8
-#usr/share/groff/1.18.1/font/devutf8/B
-#usr/share/groff/1.18.1/font/devutf8/BI
-#usr/share/groff/1.18.1/font/devutf8/DESC
-#usr/share/groff/1.18.1/font/devutf8/G
-#usr/share/groff/1.18.1/font/devutf8/I
-#usr/share/groff/1.18.1/font/devutf8/M
-#usr/share/groff/1.18.1/font/devutf8/R
-#usr/share/groff/1.18.1/tmac
-#usr/share/groff/1.18.1/tmac/X.tmac
-#usr/share/groff/1.18.1/tmac/Xps.tmac
-#usr/share/groff/1.18.1/tmac/a4.tmac
-#usr/share/groff/1.18.1/tmac/an-old.tmac
-#usr/share/groff/1.18.1/tmac/an.tmac
-#usr/share/groff/1.18.1/tmac/andoc.tmac
-#usr/share/groff/1.18.1/tmac/andocj.tmac
-#usr/share/groff/1.18.1/tmac/big5.tmac
-#usr/share/groff/1.18.1/tmac/cp1047.tmac
-#usr/share/groff/1.18.1/tmac/doc-old.tmac
-#usr/share/groff/1.18.1/tmac/doc.tmac
-#usr/share/groff/1.18.1/tmac/docj.tmac
-#usr/share/groff/1.18.1/tmac/dvi.tmac
-#usr/share/groff/1.18.1/tmac/e.tmac
-#usr/share/groff/1.18.1/tmac/ec.tmac
-#usr/share/groff/1.18.1/tmac/eqnrc
-#usr/share/groff/1.18.1/tmac/euc-jp.tmac
-#usr/share/groff/1.18.1/tmac/gb.tmac
-#usr/share/groff/1.18.1/tmac/html.tmac
-#usr/share/groff/1.18.1/tmac/hyphen.us
-#usr/share/groff/1.18.1/tmac/latin1.tmac
-#usr/share/groff/1.18.1/tmac/lbp.tmac
-#usr/share/groff/1.18.1/tmac/lj4.tmac
-#usr/share/groff/1.18.1/tmac/m.tmac
-#usr/share/groff/1.18.1/tmac/man.tmac
-#usr/share/groff/1.18.1/tmac/mandoc.tmac
-#usr/share/groff/1.18.1/tmac/mdoc
-#usr/share/groff/1.18.1/tmac/mdoc.tmac
-#usr/share/groff/1.18.1/tmac/mdoc/doc-common
-#usr/share/groff/1.18.1/tmac/mdoc/doc-ditroff
-#usr/share/groff/1.18.1/tmac/mdoc/doc-nroff
-#usr/share/groff/1.18.1/tmac/mdoc/doc-syms
-#usr/share/groff/1.18.1/tmac/mdoc/docj-ditroff
-#usr/share/groff/1.18.1/tmac/mdoc/docj-nroff
-#usr/share/groff/1.18.1/tmac/me.tmac
-#usr/share/groff/1.18.1/tmac/mm
-#usr/share/groff/1.18.1/tmac/mm.tmac
-#usr/share/groff/1.18.1/tmac/mm/0.MT
-#usr/share/groff/1.18.1/tmac/mm/4.MT
-#usr/share/groff/1.18.1/tmac/mm/5.MT
-#usr/share/groff/1.18.1/tmac/mm/locale
-#usr/share/groff/1.18.1/tmac/mm/ms.cov
-#usr/share/groff/1.18.1/tmac/mm/se_locale
-#usr/share/groff/1.18.1/tmac/mm/se_ms.cov
-#usr/share/groff/1.18.1/tmac/mmse.tmac
-#usr/share/groff/1.18.1/tmac/mom.tmac
-#usr/share/groff/1.18.1/tmac/ms.tmac
-#usr/share/groff/1.18.1/tmac/mse.tmac
-#usr/share/groff/1.18.1/tmac/om.tmac
-#usr/share/groff/1.18.1/tmac/pic.tmac
-#usr/share/groff/1.18.1/tmac/ps.tmac
-#usr/share/groff/1.18.1/tmac/psatk.tmac
-#usr/share/groff/1.18.1/tmac/psold.tmac
-#usr/share/groff/1.18.1/tmac/pspic.tmac
-#usr/share/groff/1.18.1/tmac/s.tmac
-#usr/share/groff/1.18.1/tmac/safer.tmac
-#usr/share/groff/1.18.1/tmac/trace.tmac
-#usr/share/groff/1.18.1/tmac/troffrc
-#usr/share/groff/1.18.1/tmac/troffrc-end
-#usr/share/groff/1.18.1/tmac/tty-char.tmac
-#usr/share/groff/1.18.1/tmac/tty.tmac
-#usr/share/groff/1.18.1/tmac/www.tmac
+#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/current
+#usr/share/groff/site-font
 #usr/share/groff/site-tmac
 #usr/share/groff/site-tmac/man.local
 #usr/share/groff/site-tmac/mdoc.local
+#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/grap2graph.1
+#usr/share/man/man1/grn.1
+#usr/share/man/man1/grodvi.1
+#usr/share/man/man1/groff.1
+#usr/share/man/man1/groffer.1
+#usr/share/man/man1/grog.1
+#usr/share/man/man1/grohtml.1
+#usr/share/man/man1/grolbp.1
+#usr/share/man/man1/grolj4.1
+#usr/share/man/man1/grops.1
+#usr/share/man/man1/grotty.1
+#usr/share/man/man1/hpftodit.1
+#usr/share/man/man1/indxbib.1
+#usr/share/man/man1/lkbib.1
+#usr/share/man/man1/lookbib.1
+#usr/share/man/man1/mmroff.1
+#usr/share/man/man1/neqn.1
+#usr/share/man/man1/nroff.1
+#usr/share/man/man1/pdfroff.1
+#usr/share/man/man1/pfbtops.1
+#usr/share/man/man1/pic.1
+#usr/share/man/man1/pic2graph.1
+#usr/share/man/man1/preconv.1
+#usr/share/man/man1/refer.1
+#usr/share/man/man1/roff2dvi.1
+#usr/share/man/man1/roff2html.1
+#usr/share/man/man1/roff2pdf.1
+#usr/share/man/man1/roff2ps.1
+#usr/share/man/man1/roff2text.1
+#usr/share/man/man1/roff2x.1
+#usr/share/man/man1/soelim.1
+#usr/share/man/man1/tbl.1
+#usr/share/man/man1/tfmtodit.1
+#usr/share/man/man1/troff.1
+#usr/share/man/man5/groff_font.5
+#usr/share/man/man5/groff_out.5
+#usr/share/man/man5/groff_tmac.5
+#usr/share/man/man5/lj4_font.5
+#usr/share/man/man7/ditroff.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_hdtbl.7
+#usr/share/man/man7/groff_man.7
+#usr/share/man/man7/groff_mdoc.7
+#usr/share/man/man7/groff_me.7
+#usr/share/man/man7/groff_mm.7
+#usr/share/man/man7/groff_mmse.7
+#usr/share/man/man7/groff_mom.7
+#usr/share/man/man7/groff_ms.7
+#usr/share/man/man7/groff_trace.7
+#usr/share/man/man7/groff_www.7
+#usr/share/man/man7/roff.7

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index 58bbf8c6af9dba2f9c828834bd99709b4eeb9b27..9393aec50d9c66c3b66cd570bdb88ead536b1edb 100644 (file)
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -110,6 +110,7 @@ etc/rc.d/init.d/snort
 etc/rc.d/init.d/squid
 etc/rc.d/init.d/sshd
 #etc/rc.d/init.d/sslh
+etc/rc.d/init.d/static-routes
 etc/rc.d/init.d/swap
 etc/rc.d/init.d/sysctl
 etc/rc.d/init.d/sysklogd

diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware
index 434366635ac84c8c6c260ffff6bccb02cab7739e..d4b90710658165c9d9921f800f3e622ad371ee15 100644 (file)
--- a/config/rootfiles/common/linux-firmware
+++ b/config/rootfiles/common/linux-firmware
@@ -1,17 +1,33 @@
 #lib/firmware/3com
 lib/firmware/3com/3C359.bin
 lib/firmware/3com/typhoon.bin
+lib/firmware/GPL-3
+lib/firmware/LICENCE.Marvell
 lib/firmware/LICENCE.agere
 lib/firmware/LICENCE.atheros_firmware
+lib/firmware/LICENCE.broadcom_bcm43xx
+lib/firmware/LICENCE.chelsio_firmware
 lib/firmware/LICENCE.i2400m
 lib/firmware/LICENCE.iwlwifi_firmware
-lib/firmware/LICENCE.libertas
-lib/firmware/LICENCE.mwl8k
+lib/firmware/LICENCE.mwl8335
+lib/firmware/LICENCE.myri10ge_firmware
+lib/firmware/LICENCE.phanfw
 lib/firmware/LICENCE.qla2xxx
 lib/firmware/LICENCE.ralink-firmware.txt
+lib/firmware/LICENCE.rtlwifi_firmware.txt
+lib/firmware/LICENCE.tda7706-firmware.txt
+lib/firmware/LICENCE.ti-connectivity
+lib/firmware/LICENCE.ueagle-atm4-firmware
+lib/firmware/LICENCE.via_vt6656
 lib/firmware/LICENCE.xc5000
 lib/firmware/LICENSE.dib0700
 lib/firmware/LICENSE.radeon_rlc
+#lib/firmware/RTL8192E
+lib/firmware/RTL8192E/boot.img
+lib/firmware/RTL8192E/data.img
+lib/firmware/RTL8192E/main.img
+lib/firmware/TDA7706_OM_v2.5.1_boot.txt
+lib/firmware/TDA7706_OM_v3.0.2_boot.txt
 lib/firmware/WHENCE
 #lib/firmware/acenic
 lib/firmware/acenic/tg1.bin
@@ -26,27 +42,96 @@ lib/firmware/advansys/38C1600.bin
 lib/firmware/advansys/mcode.bin
 lib/firmware/agere_ap_fw.bin
 lib/firmware/agere_sta_fw.bin
+#lib/firmware/ar3k
+#lib/firmware/ar3k/1020200
+lib/firmware/ar3k/1020200/PS_ASIC.pst
+lib/firmware/ar3k/1020200/RamPatch.txt
+lib/firmware/ar3k/1020200/ar3kbdaddr.pst
+#lib/firmware/ar3k/30000
+lib/firmware/ar3k/30000/PS_ASIC.pst
+lib/firmware/ar3k/30000/RamPatch.txt
+lib/firmware/ar3k/30000/ar3kbdaddr.pst
+#lib/firmware/ar3k/30101
+lib/firmware/ar3k/30101/PS_ASIC.pst
+lib/firmware/ar3k/30101/RamPatch.txt
+lib/firmware/ar3k/30101/ar3kbdaddr.pst
+lib/firmware/ar3k/AthrBT_0x01020001.dfu
+lib/firmware/ar3k/AthrBT_0x01020200.dfu
+lib/firmware/ar3k/ramps_0x01020001_26.dfu
+lib/firmware/ar3k/ramps_0x01020200_26.dfu
+lib/firmware/ar3k/ramps_0x01020200_40.dfu
+lib/firmware/ar7010.fw
+lib/firmware/ar7010_1_1.fw
 lib/firmware/ar9170-1.fw
 lib/firmware/ar9170-2.fw
 lib/firmware/ar9271.fw
 lib/firmware/ath3k-1.fw
+#lib/firmware/ath6k
+#lib/firmware/ath6k/AR6002
+lib/firmware/ath6k/AR6002/athwlan.bin.z77
+lib/firmware/ath6k/AR6002/data.patch.hw2_0.bin
+lib/firmware/ath6k/AR6002/eeprom.bin
+lib/firmware/ath6k/AR6002/eeprom.data
+#lib/firmware/ath6k/AR6003
+#lib/firmware/ath6k/AR6003/hw1.0
+lib/firmware/ath6k/AR6003/hw1.0/athwlan.bin.z77
+lib/firmware/ath6k/AR6003/hw1.0/bdata.SD31.bin
+lib/firmware/ath6k/AR6003/hw1.0/bdata.SD32.bin
+lib/firmware/ath6k/AR6003/hw1.0/bdata.WB31.bin
+lib/firmware/ath6k/AR6003/hw1.0/data.patch.bin
+lib/firmware/ath6k/AR6003/hw1.0/otp.bin.z77
+#lib/firmware/ath6k/AR6003/hw2.0
+lib/firmware/ath6k/AR6003/hw2.0/athwlan.bin.z77
+lib/firmware/ath6k/AR6003/hw2.0/bdata.SD31.bin
+lib/firmware/ath6k/AR6003/hw2.0/bdata.SD32.bin
+lib/firmware/ath6k/AR6003/hw2.0/bdata.WB31.bin
+lib/firmware/ath6k/AR6003/hw2.0/data.patch.bin
+lib/firmware/ath6k/AR6003/hw2.0/otp.bin.z77
+#lib/firmware/ath6k/AR6003/hw2.1.1
+lib/firmware/ath6k/AR6003/hw2.1.1/athwlan.bin
+lib/firmware/ath6k/AR6003/hw2.1.1/bdata.SD31.bin
+lib/firmware/ath6k/AR6003/hw2.1.1/bdata.SD32.bin
+lib/firmware/ath6k/AR6003/hw2.1.1/bdata.WB31.bin
+lib/firmware/ath6k/AR6003/hw2.1.1/data.patch.bin
+lib/firmware/ath6k/AR6003/hw2.1.1/endpointping.bin
+lib/firmware/ath6k/AR6003/hw2.1.1/otp.bin
 lib/firmware/atmsar11.fw
 #lib/firmware/av7110
 lib/firmware/av7110/bootcode.bin
 #lib/firmware/bnx2
 lib/firmware/bnx2/bnx2-mips-06-4.6.16.fw
 lib/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw
+lib/firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw
+lib/firmware/bnx2/bnx2-mips-06-6.0.15.fw
+lib/firmware/bnx2/bnx2-mips-06-6.2.1.fw
 lib/firmware/bnx2/bnx2-mips-09-4.6.17.fw
+lib/firmware/bnx2/bnx2-mips-09-5.0.0.j15.fw
 lib/firmware/bnx2/bnx2-mips-09-5.0.0.j3.fw
+lib/firmware/bnx2/bnx2-mips-09-5.0.0.j9.fw
+lib/firmware/bnx2/bnx2-mips-09-6.0.17.fw
+lib/firmware/bnx2/bnx2-mips-09-6.2.1.fw
+lib/firmware/bnx2/bnx2-mips-09-6.2.1a.fw
 lib/firmware/bnx2/bnx2-rv2p-06-4.6.16.fw
 lib/firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw
+lib/firmware/bnx2/bnx2-rv2p-06-6.0.15.fw
 lib/firmware/bnx2/bnx2-rv2p-09-4.6.15.fw
+lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw
 lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw
+lib/firmware/bnx2/bnx2-rv2p-09-6.0.17.fw
+lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
 lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw
+lib/firmware/bnx2/bnx2-rv2p-09ax-6.0.17.fw
 lib/firmware/bnx2x-e1-4.8.53.0.fw
+lib/firmware/bnx2x-e1-5.2.13.0.fw
 lib/firmware/bnx2x-e1-5.2.7.0.fw
 lib/firmware/bnx2x-e1h-4.8.53.0.fw
+lib/firmware/bnx2x-e1h-5.2.13.0.fw
 lib/firmware/bnx2x-e1h-5.2.7.0.fw
+#lib/firmware/brcm
+lib/firmware/brcm/bcm4329-fullmac-4.bin
+lib/firmware/brcm/bcm4329-fullmac-4.txt
+lib/firmware/brcm/bcm43xx-0.fw
+lib/firmware/brcm/bcm43xx_hdr-0.fw
 #lib/firmware/cis
 lib/firmware/cis/3CCFEM556.cis
 lib/firmware/cis/3CXEM556.cis
@@ -58,10 +143,25 @@ lib/firmware/cis/MT5634ZLX.cis
 lib/firmware/cis/NE2K.cis
 lib/firmware/cis/PCMLM28.cis
 lib/firmware/cis/PE-200.cis
+lib/firmware/cis/PE520.cis
 lib/firmware/cis/RS-COM-2P.cis
 lib/firmware/cis/SW_555_SER.cis
 lib/firmware/cis/SW_7xx_SER.cis
 lib/firmware/cis/SW_8xx_SER.cis
+#lib/firmware/cis/src
+lib/firmware/cis/src/3CCFEM556.cis
+lib/firmware/cis/src/3CXEM556.cis
+lib/firmware/cis/src/COMpad2.cis
+lib/firmware/cis/src/COMpad4.cis
+lib/firmware/cis/src/DP83903.cis
+lib/firmware/cis/src/LA-PCM.cis
+lib/firmware/cis/src/MT5634ZLX.cis
+lib/firmware/cis/src/NE2K.cis
+lib/firmware/cis/src/PCMLM28.cis
+lib/firmware/cis/src/PE-200.cis
+lib/firmware/cis/src/PE520.cis
+lib/firmware/cis/src/RS-COM-2P.cis
+lib/firmware/cis/src/tamarack.cis
 lib/firmware/cis/tamarack.cis
 #lib/firmware/cpia2
 lib/firmware/cpia2/stv0672_vp4.bin
@@ -73,7 +173,10 @@ lib/firmware/cxgb3/t3b_psram-1.1.0.bin
 lib/firmware/cxgb3/t3c_psram-1.1.0.bin
 lib/firmware/cxgb3/t3fw-7.0.0.bin
 lib/firmware/cxgb3/t3fw-7.1.0.bin
+lib/firmware/cxgb3/t3fw-7.10.0.bin
 lib/firmware/cxgb3/t3fw-7.4.0.bin
+#lib/firmware/cxgb4
+lib/firmware/cxgb4/t4fw.bin
 #lib/firmware/dabusb
 lib/firmware/dabusb/bitstream.bin
 lib/firmware/dabusb/firmware.fw
@@ -105,16 +208,25 @@ lib/firmware/emi62/spdif.fw
 lib/firmware/ess/maestro3_assp_kernel.fw
 lib/firmware/ess/maestro3_assp_minisrc.fw
 lib/firmware/f2255usb.bin
-lib/firmware/i2400m-fw-usb-1.3.sbcf
+lib/firmware/htc_7010.fw
+lib/firmware/htc_9271.fw
 lib/firmware/i2400m-fw-usb-1.4.sbcf
+lib/firmware/i2400m-fw-usb-1.5.sbcf
+lib/firmware/i6050-fw-usb-1.5.sbcf
 lib/firmware/intelliport2.bin
+lib/firmware/iwlwifi-100-5.ucode
 lib/firmware/iwlwifi-1000-3.ucode
 lib/firmware/iwlwifi-3945-2.ucode
 lib/firmware/iwlwifi-4965-2.ucode
 lib/firmware/iwlwifi-5000-1.ucode
 lib/firmware/iwlwifi-5000-2.ucode
+lib/firmware/iwlwifi-5000-5.ucode
 lib/firmware/iwlwifi-5150-2.ucode
 lib/firmware/iwlwifi-6000-4.ucode
+lib/firmware/iwlwifi-6000g2a-5.ucode
+lib/firmware/iwlwifi-6000g2b-5.ucode
+lib/firmware/iwlwifi-6050-4.ucode
+lib/firmware/iwlwifi-6050-5.ucode
 #lib/firmware/kaweth
 lib/firmware/kaweth/new_code.bin
 lib/firmware/kaweth/new_code_fix.bin
@@ -140,6 +252,7 @@ lib/firmware/keyspan_pda/keyspan_pda.fw
 lib/firmware/keyspan_pda/xircom_pgs.fw
 #lib/firmware/korg
 lib/firmware/korg/k1212.dsp
+lib/firmware/lgs8g75.fw
 #lib/firmware/libertas
 lib/firmware/libertas/cf8385.bin
 lib/firmware/libertas/cf8385_helper.bin
@@ -165,16 +278,30 @@ lib/firmware/libertas/usb8682.bin
 #lib/firmware/matrox
 lib/firmware/matrox/g200_warp.fw
 lib/firmware/matrox/g400_warp.fw
+#lib/firmware/mrvl
+lib/firmware/mrvl/sd8787_uapsta.bin
 lib/firmware/mts_cdma.fw
 lib/firmware/mts_edge.fw
 lib/firmware/mts_gsm.fw
+lib/firmware/mts_mt9234mu.fw
+lib/firmware/mts_mt9234zba.fw
+lib/firmware/mwl8335_duplex.fw
 #lib/firmware/mwl8k
+lib/firmware/mwl8k/fmimage_8366.fw
+lib/firmware/mwl8k/fmimage_8366_ap-1.fw
+lib/firmware/mwl8k/fmimage_8366_ap-2.fw
 lib/firmware/mwl8k/fmimage_8687.fw
+lib/firmware/mwl8k/helper_8366.fw
 lib/firmware/mwl8k/helper_8687.fw
+lib/firmware/myri10ge_eth_z8e.dat
+lib/firmware/myri10ge_ethp_z8e.dat
+lib/firmware/myri10ge_rss_eth_z8e.dat
+lib/firmware/myri10ge_rss_ethp_z8e.dat
 #lib/firmware/myricom
 lib/firmware/myricom/lanai.bin
 #lib/firmware/ositech
 lib/firmware/ositech/Xilinx7OD.bin
+lib/firmware/phanfw.bin
 lib/firmware/ql2100_fw.bin
 lib/firmware/ql2200_fw.bin
 lib/firmware/ql2300_fw.bin
@@ -186,9 +313,32 @@ lib/firmware/qlogic/1040.bin
 lib/firmware/qlogic/12160.bin
 lib/firmware/qlogic/1280.bin
 lib/firmware/qlogic/isp1000.bin
+lib/firmware/qlogic/sd7220.fw
 #lib/firmware/r128
 lib/firmware/r128/r128_cce.bin
 #lib/firmware/radeon
+lib/firmware/radeon/BARTS_mc.bin
+lib/firmware/radeon/BARTS_me.bin
+lib/firmware/radeon/BARTS_pfp.bin
+lib/firmware/radeon/BTC_rlc.bin
+lib/firmware/radeon/CAICOS_mc.bin
+lib/firmware/radeon/CAICOS_me.bin
+lib/firmware/radeon/CAICOS_pfp.bin
+lib/firmware/radeon/CAYMAN_mc.bin
+lib/firmware/radeon/CAYMAN_me.bin
+lib/firmware/radeon/CAYMAN_pfp.bin
+lib/firmware/radeon/CAYMAN_rlc.bin
+lib/firmware/radeon/CEDAR_me.bin
+lib/firmware/radeon/CEDAR_pfp.bin
+lib/firmware/radeon/CEDAR_rlc.bin
+lib/firmware/radeon/CYPRESS_me.bin
+lib/firmware/radeon/CYPRESS_pfp.bin
+lib/firmware/radeon/CYPRESS_rlc.bin
+lib/firmware/radeon/JUNIPER_me.bin
+lib/firmware/radeon/JUNIPER_pfp.bin
+lib/firmware/radeon/JUNIPER_rlc.bin
+lib/firmware/radeon/PALM_me.bin
+lib/firmware/radeon/PALM_pfp.bin
 lib/firmware/radeon/R100_cp.bin
 lib/firmware/radeon/R200_cp.bin
 lib/firmware/radeon/R300_cp.bin
@@ -198,6 +348,9 @@ lib/firmware/radeon/R600_me.bin
 lib/firmware/radeon/R600_pfp.bin
 lib/firmware/radeon/R600_rlc.bin
 lib/firmware/radeon/R700_rlc.bin
+lib/firmware/radeon/REDWOOD_me.bin
+lib/firmware/radeon/REDWOOD_pfp.bin
+lib/firmware/radeon/REDWOOD_rlc.bin
 lib/firmware/radeon/RS600_cp.bin
 lib/firmware/radeon/RS690_cp.bin
 lib/firmware/radeon/RS780_me.bin
@@ -218,12 +371,32 @@ lib/firmware/radeon/RV730_me.bin
 lib/firmware/radeon/RV730_pfp.bin
 lib/firmware/radeon/RV770_me.bin
 lib/firmware/radeon/RV770_pfp.bin
+lib/firmware/radeon/SUMO_rlc.bin
+lib/firmware/radeon/TURKS_mc.bin
+lib/firmware/radeon/TURKS_me.bin
+lib/firmware/radeon/TURKS_pfp.bin
 lib/firmware/rt2561.bin
 lib/firmware/rt2561s.bin
 lib/firmware/rt2661.bin
 lib/firmware/rt2860.bin
 lib/firmware/rt2870.bin
+lib/firmware/rt3070.bin
+lib/firmware/rt3071.bin
+lib/firmware/rt3090.bin
 lib/firmware/rt73.bin
+#lib/firmware/rtl_nic
+lib/firmware/rtl_nic/rtl8105e-1.fw
+lib/firmware/rtl_nic/rtl8168d-1.fw
+lib/firmware/rtl_nic/rtl8168d-2.fw
+lib/firmware/rtl_nic/rtl8168e-1.fw
+lib/firmware/rtl_nic/rtl8168e-2.fw
+lib/firmware/rtl_nic/rtl8168e-3.fw
+#lib/firmware/rtlwifi
+lib/firmware/rtlwifi/rtl8192cfw.bin
+lib/firmware/rtlwifi/rtl8192cufw.bin
+lib/firmware/rtlwifi/rtl8192defw.bin
+lib/firmware/rtlwifi/rtl8192sefw.bin
+lib/firmware/rtlwifi/rtl8712u.bin
 lib/firmware/s2250.fw
 lib/firmware/s2250_loader.fw
 #lib/firmware/sb16
@@ -245,15 +418,50 @@ lib/firmware/sxg/saharadbgdownloadB.sys
 lib/firmware/sxg/saharadownloadB.sys
 #lib/firmware/tehuti
 lib/firmware/tehuti/bdx.bin
+#lib/firmware/ti-connectivity
+lib/firmware/ti-connectivity/TIInit_7.2.31.bts
+lib/firmware/ti-connectivity/wl1271-fw-2.bin
+lib/firmware/ti-connectivity/wl1271-fw-ap.bin
+lib/firmware/ti-connectivity/wl1271-fw.bin
+lib/firmware/ti-connectivity/wl1271-nvs-example-wl128x.bin
+lib/firmware/ti-connectivity/wl1271-nvs.bin
+lib/firmware/ti-connectivity/wl128x-fw-ap.bin
+lib/firmware/ti-connectivity/wl128x-fw.bin
 lib/firmware/ti_3410.fw
 lib/firmware/ti_5052.fw
 #lib/firmware/tigon
 lib/firmware/tigon/tg3.bin
 lib/firmware/tigon/tg3_tso.bin
 lib/firmware/tigon/tg3_tso5.bin
+lib/firmware/tlg2300_firmware.bin
 lib/firmware/tr_smctr.bin
 #lib/firmware/ttusb-budget
 lib/firmware/ttusb-budget/dspbootcode.bin
+#lib/firmware/ueagle-atm
+lib/firmware/ueagle-atm/930-fpga.bin
+lib/firmware/ueagle-atm/CMV4p.bin.v2
+lib/firmware/ueagle-atm/CMV9i.bin
+lib/firmware/ueagle-atm/CMV9p.bin
+lib/firmware/ueagle-atm/CMVei.bin
+lib/firmware/ueagle-atm/CMVeiWO.bin
+lib/firmware/ueagle-atm/CMVep.bin
+lib/firmware/ueagle-atm/CMVepES.bin
+lib/firmware/ueagle-atm/CMVepES03.bin
+lib/firmware/ueagle-atm/CMVepFR.bin
+lib/firmware/ueagle-atm/CMVepFR04.bin
+lib/firmware/ueagle-atm/CMVepFR10.bin
+lib/firmware/ueagle-atm/CMVepIT.bin
+lib/firmware/ueagle-atm/CMVepWO.bin
+lib/firmware/ueagle-atm/DSP4p.bin
+lib/firmware/ueagle-atm/DSP9i.bin
+lib/firmware/ueagle-atm/DSP9p.bin
+lib/firmware/ueagle-atm/DSPei.bin
+lib/firmware/ueagle-atm/DSPep.bin
+lib/firmware/ueagle-atm/adi930.fw
+lib/firmware/ueagle-atm/eagleI.fw
+lib/firmware/ueagle-atm/eagleII.fw
+lib/firmware/ueagle-atm/eagleIII.fw
+lib/firmware/ueagle-atm/eagleIV.fw
 #lib/firmware/usbdux
 #lib/firmware/usbdux/Makefile_dux
 #lib/firmware/usbdux/README.dux
@@ -271,6 +479,10 @@ lib/firmware/v4l-cx23885-enc.fw
 lib/firmware/v4l-cx25840.fw
 #lib/firmware/vicam
 lib/firmware/vicam/firmware.fw
+lib/firmware/vntwusb.fw
+#lib/firmware/vxge
+lib/firmware/vxge/X3fw-pxe.ncf
+lib/firmware/vxge/X3fw.ncf
 lib/firmware/whiteheat.fw
 lib/firmware/whiteheat_loader.fw
 #lib/firmware/yam
@@ -281,5 +493,3 @@ lib/firmware/yamaha/ds1_ctrl.fw
 lib/firmware/yamaha/ds1_dsp.fw
 lib/firmware/yamaha/ds1e_ctrl.fw
 lib/firmware/yamaha/yss225_registers.bin
-lib/firmware/bnx2x-e1-5.0.21.0.fw
-lib/firmware/bnx2x-e1h-5.0.21.0.fw

diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs
index 6e5d7caec192ef14668720b40f7fbf9f62ea7745..adab51bc1eea62f39c70c0e8101a43476534b5ed 100644 (file)
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -18,6 +18,7 @@ usr/local/bin/outgoingfwctrl
 usr/local/bin/pakfire
 usr/local/bin/qosctrl
 usr/local/bin/rebuildhosts
+usr/local/bin/rebuildroutes
 usr/local/bin/redctrl
 #usr/local/bin/sambactrl
 usr/local/bin/setaliases

diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python
index 5f4b6a8797c18eb29f6006fec7c6fc544a16c9b3..c6421cb94be3d3d570cea156ec50ba8faef06c64 100644 (file)
--- a/config/rootfiles/common/python
+++ b/config/rootfiles/common/python
@@ -1815,7 +1815,7 @@ usr/lib/python2.7/json/tool.pyc
 usr/lib/python2.7/keyword.pyc
 #usr/lib/python2.7/keyword.pyo
 #usr/lib/python2.7/lib-dynload
-#usr/lib/python2.7/lib-dynload/Python-2.7-py2.7.egg-info
+usr/lib/python2.7/lib-dynload/Python-2.7.2-py2.7.egg-info
 usr/lib/python2.7/lib-dynload/_bisect.so
 usr/lib/python2.7/lib-dynload/_bsddb.so
 usr/lib/python2.7/lib-dynload/_codecs_cn.so
@@ -1843,10 +1843,10 @@ usr/lib/python2.7/lib-dynload/_multibytecodec.so
 usr/lib/python2.7/lib-dynload/_multiprocessing.so
 usr/lib/python2.7/lib-dynload/_random.so
 usr/lib/python2.7/lib-dynload/_socket.so
+usr/lib/python2.7/lib-dynload/_sqlite3.so
 usr/lib/python2.7/lib-dynload/_ssl.so
 usr/lib/python2.7/lib-dynload/_struct.so
 usr/lib/python2.7/lib-dynload/_testcapi.so
-usr/lib/python2.7/lib-dynload/_weakref.so
 usr/lib/python2.7/lib-dynload/array.so
 usr/lib/python2.7/lib-dynload/audioop.so
 usr/lib/python2.7/lib-dynload/binascii.so
@@ -1882,7 +1882,6 @@ usr/lib/python2.7/lib-dynload/termios.so
 usr/lib/python2.7/lib-dynload/time.so
 usr/lib/python2.7/lib-dynload/unicodedata.so
 usr/lib/python2.7/lib-dynload/zlib.so
-#usr/lib/python2.7/lib-old
 #usr/lib/python2.7/lib-tk
 #usr/lib/python2.7/lib-tk/Canvas.py
 #usr/lib/python2.7/lib-tk/Canvas.pyc
@@ -1974,12 +1973,21 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/turtle.pyo
 #usr/lib/python2.7/lib2to3
 #usr/lib/python2.7/lib2to3/Grammar.txt
-#usr/lib/python2.7/lib2to3/Grammar2.7.0.final.0.pickle
+#usr/lib/python2.7/lib2to3/Grammar2.7.2.final.0.pickle
 #usr/lib/python2.7/lib2to3/PatternGrammar.txt
-#usr/lib/python2.7/lib2to3/PatternGrammar2.7.0.final.0.pickle
+#usr/lib/python2.7/lib2to3/PatternGrammar2.7.2.final.0.pickle
 #usr/lib/python2.7/lib2to3/__init__.py
 #usr/lib/python2.7/lib2to3/__init__.pyc
 #usr/lib/python2.7/lib2to3/__init__.pyo
+#usr/lib/python2.7/lib2to3/__main__.py
+#usr/lib/python2.7/lib2to3/__main__.pyc
+#usr/lib/python2.7/lib2to3/__main__.pyo
+#usr/lib/python2.7/lib2to3/btm_matcher.py
+#usr/lib/python2.7/lib2to3/btm_matcher.pyc
+#usr/lib/python2.7/lib2to3/btm_matcher.pyo
+#usr/lib/python2.7/lib2to3/btm_utils.py
+#usr/lib/python2.7/lib2to3/btm_utils.pyc
+#usr/lib/python2.7/lib2to3/btm_utils.pyo
 #usr/lib/python2.7/lib2to3/fixer_base.py
 #usr/lib/python2.7/lib2to3/fixer_base.pyc
 #usr/lib/python2.7/lib2to3/fixer_base.pyo
@@ -2637,14 +2645,39 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/buffer_tests.pyo
 #usr/lib/python2.7/test/cfgparser.1
 #usr/lib/python2.7/test/check_soundcard.vbs
-#usr/lib/python2.7/test/cjkencodings_test.py
-#usr/lib/python2.7/test/cjkencodings_test.pyc
-#usr/lib/python2.7/test/cjkencodings_test.pyo
+#usr/lib/python2.7/test/cjkencodings
+#usr/lib/python2.7/test/cjkencodings/big5-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/big5.txt
+#usr/lib/python2.7/test/cjkencodings/big5hkscs-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/big5hkscs.txt
+#usr/lib/python2.7/test/cjkencodings/cp949-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/cp949.txt
+#usr/lib/python2.7/test/cjkencodings/euc_jisx0213-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/euc_jisx0213.txt
+#usr/lib/python2.7/test/cjkencodings/euc_jp-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/euc_jp.txt
+#usr/lib/python2.7/test/cjkencodings/euc_kr-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/euc_kr.txt
+#usr/lib/python2.7/test/cjkencodings/gb18030-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/gb18030.txt
+#usr/lib/python2.7/test/cjkencodings/gb2312-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/gb2312.txt
+#usr/lib/python2.7/test/cjkencodings/gbk-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/gbk.txt
+#usr/lib/python2.7/test/cjkencodings/hz-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/hz.txt
+#usr/lib/python2.7/test/cjkencodings/johab-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/johab.txt
+#usr/lib/python2.7/test/cjkencodings/shift_jis-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/shift_jis.txt
+#usr/lib/python2.7/test/cjkencodings/shift_jisx0213-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/shift_jisx0213.txt
 #usr/lib/python2.7/test/cmath_testcases.txt
 #usr/lib/python2.7/test/curses_tests.py
 #usr/lib/python2.7/test/curses_tests.pyc
 #usr/lib/python2.7/test/curses_tests.pyo
 #usr/lib/python2.7/test/data
+#usr/lib/python2.7/test/data/README
 #usr/lib/python2.7/test/decimaltestdata
 #usr/lib/python2.7/test/decimaltestdata/abs.decTest
 #usr/lib/python2.7/test/decimaltestdata/add.decTest
@@ -2887,6 +2920,10 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/string_tests.py
 #usr/lib/python2.7/test/string_tests.pyc
 #usr/lib/python2.7/test/string_tests.pyo
+#usr/lib/python2.7/test/subprocessdata
+#usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py
+#usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc
+#usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo
 #usr/lib/python2.7/test/svn_python_org_https_cert.pem
 #usr/lib/python2.7/test/test_MimeWriter.py
 #usr/lib/python2.7/test/test_MimeWriter.pyc
@@ -3535,6 +3572,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_modulefinder.py
 #usr/lib/python2.7/test/test_modulefinder.pyc
 #usr/lib/python2.7/test/test_modulefinder.pyo
+#usr/lib/python2.7/test/test_msilib.py
+#usr/lib/python2.7/test/test_msilib.pyc
+#usr/lib/python2.7/test/test_msilib.pyo
 #usr/lib/python2.7/test/test_multibytecodec.py
 #usr/lib/python2.7/test/test_multibytecodec.pyc
 #usr/lib/python2.7/test/test_multibytecodec.pyo
@@ -3667,9 +3707,6 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_profile.py
 #usr/lib/python2.7/test/test_profile.pyc
 #usr/lib/python2.7/test/test_profile.pyo
-#usr/lib/python2.7/test/test_profilehooks.py
-#usr/lib/python2.7/test/test_profilehooks.pyc
-#usr/lib/python2.7/test/test_profilehooks.pyo
 #usr/lib/python2.7/test/test_property.py
 #usr/lib/python2.7/test/test_property.pyc
 #usr/lib/python2.7/test/test_property.pyo
@@ -3721,6 +3758,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_richcmp.py
 #usr/lib/python2.7/test/test_richcmp.pyc
 #usr/lib/python2.7/test/test_richcmp.pyo
+#usr/lib/python2.7/test/test_rlcompleter.py
+#usr/lib/python2.7/test/test_rlcompleter.pyc
+#usr/lib/python2.7/test/test_rlcompleter.pyo
 #usr/lib/python2.7/test/test_robotparser.py
 #usr/lib/python2.7/test/test_robotparser.pyc
 #usr/lib/python2.7/test/test_robotparser.pyo
@@ -3850,6 +3890,12 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_sys.py
 #usr/lib/python2.7/test/test_sys.pyc
 #usr/lib/python2.7/test/test_sys.pyo
+#usr/lib/python2.7/test/test_sys_setprofile.py
+#usr/lib/python2.7/test/test_sys_setprofile.pyc
+#usr/lib/python2.7/test/test_sys_setprofile.pyo
+#usr/lib/python2.7/test/test_sys_settrace.py
+#usr/lib/python2.7/test/test_sys_settrace.pyc
+#usr/lib/python2.7/test/test_sys_settrace.pyo
 #usr/lib/python2.7/test/test_sysconfig.py
 #usr/lib/python2.7/test/test_sysconfig.pyc
 #usr/lib/python2.7/test/test_sysconfig.pyo
@@ -4074,6 +4120,13 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/time_hashlib.pyc
 #usr/lib/python2.7/test/time_hashlib.pyo
 #usr/lib/python2.7/test/tokenize_tests.txt
+#usr/lib/python2.7/test/tracedmodules
+#usr/lib/python2.7/test/tracedmodules/__init__.py
+#usr/lib/python2.7/test/tracedmodules/__init__.pyc
+#usr/lib/python2.7/test/tracedmodules/__init__.pyo
+#usr/lib/python2.7/test/tracedmodules/testmod.py
+#usr/lib/python2.7/test/tracedmodules/testmod.pyc
+#usr/lib/python2.7/test/tracedmodules/testmod.pyo
 #usr/lib/python2.7/test/warning_tests.py
 #usr/lib/python2.7/test/warning_tests.pyc
 #usr/lib/python2.7/test/warning_tests.pyo

diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index df093b0751114d98b212dccfb7f34e5199c38789..c7d4bbd45203b7571b82293367cb1e1fba5e2304 100644 (file)
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -10,21 +10,21 @@ etc/ipsec.d/private
 etc/ipsec.d/reqs
 etc/ipsec.secrets
 etc/strongswan.conf
-#usr/lib/libcharon.a
-#usr/lib/libcharon.la
-usr/lib/libcharon.so
-usr/lib/libcharon.so.0
-usr/lib/libcharon.so.0.0.0
-#usr/lib/libhydra.a
-#usr/lib/libhydra.la
-usr/lib/libhydra.so
-usr/lib/libhydra.so.0
-usr/lib/libhydra.so.0.0.0
-#usr/lib/libstrongswan.a
-#usr/lib/libstrongswan.la
-usr/lib/libstrongswan.so
-usr/lib/libstrongswan.so.0
-usr/lib/libstrongswan.so.0.0.0
+#usr/lib/ipsec/libcharon.a
+#usr/lib/ipsec/libcharon.la
+usr/lib/ipsec/libcharon.so
+usr/lib/ipsec/libcharon.so.0
+usr/lib/ipsec/libcharon.so.0.0.0
+#usr/lib/ipsec/libhydra.a
+#usr/lib/ipsec/libhydra.la
+usr/lib/ipsec/libhydra.so
+usr/lib/ipsec/libhydra.so.0
+usr/lib/ipsec/libhydra.so.0.0.0
+#usr/lib/ipsec/libstrongswan.a
+#usr/lib/ipsec/libstrongswan.la
+usr/lib/ipsec/libstrongswan.so
+usr/lib/ipsec/libstrongswan.so.0
+usr/lib/ipsec/libstrongswan.so.0.0.0
 #usr/libexec/ipsec
 usr/libexec/ipsec/_copyright
 usr/libexec/ipsec/_pluto_adns
@@ -33,82 +33,86 @@ usr/libexec/ipsec/_updown_espmark
 usr/libexec/ipsec/charon
 usr/libexec/ipsec/openac
 usr/libexec/ipsec/pki
-#usr/libexec/ipsec/plugins
-#usr/libexec/ipsec/plugins/libstrongswan-aes.a
-#usr/libexec/ipsec/plugins/libstrongswan-aes.la
-usr/libexec/ipsec/plugins/libstrongswan-aes.so
-#usr/libexec/ipsec/plugins/libstrongswan-attr.a
-#usr/libexec/ipsec/plugins/libstrongswan-attr.la
-usr/libexec/ipsec/plugins/libstrongswan-attr.so
-#usr/libexec/ipsec/plugins/libstrongswan-curl.a
-#usr/libexec/ipsec/plugins/libstrongswan-curl.la
-usr/libexec/ipsec/plugins/libstrongswan-curl.so
-#usr/libexec/ipsec/plugins/libstrongswan-des.a
-#usr/libexec/ipsec/plugins/libstrongswan-des.la
-usr/libexec/ipsec/plugins/libstrongswan-des.so
-#usr/libexec/ipsec/plugins/libstrongswan-dnskey.a
-#usr/libexec/ipsec/plugins/libstrongswan-dnskey.la
-usr/libexec/ipsec/plugins/libstrongswan-dnskey.so
-#usr/libexec/ipsec/plugins/libstrongswan-fips-prf.a
-#usr/libexec/ipsec/plugins/libstrongswan-fips-prf.la
-usr/libexec/ipsec/plugins/libstrongswan-fips-prf.so
-#usr/libexec/ipsec/plugins/libstrongswan-gmp.a
-#usr/libexec/ipsec/plugins/libstrongswan-gmp.la
-usr/libexec/ipsec/plugins/libstrongswan-gmp.so
-#usr/libexec/ipsec/plugins/libstrongswan-hmac.a
-#usr/libexec/ipsec/plugins/libstrongswan-hmac.la
-usr/libexec/ipsec/plugins/libstrongswan-hmac.so
-#usr/libexec/ipsec/plugins/libstrongswan-kernel-netlink.a
-#usr/libexec/ipsec/plugins/libstrongswan-kernel-netlink.la
-usr/libexec/ipsec/plugins/libstrongswan-kernel-netlink.so
-#usr/libexec/ipsec/plugins/libstrongswan-md5.a
-#usr/libexec/ipsec/plugins/libstrongswan-md5.la
-usr/libexec/ipsec/plugins/libstrongswan-md5.so
-#usr/libexec/ipsec/plugins/libstrongswan-pem.a
-#usr/libexec/ipsec/plugins/libstrongswan-pem.la
-usr/libexec/ipsec/plugins/libstrongswan-pem.so
-#usr/libexec/ipsec/plugins/libstrongswan-pgp.a
-#usr/libexec/ipsec/plugins/libstrongswan-pgp.la
-usr/libexec/ipsec/plugins/libstrongswan-pgp.so
-#usr/libexec/ipsec/plugins/libstrongswan-pkcs1.a
-#usr/libexec/ipsec/plugins/libstrongswan-pkcs1.la
-usr/libexec/ipsec/plugins/libstrongswan-pkcs1.so
-#usr/libexec/ipsec/plugins/libstrongswan-pubkey.a
-#usr/libexec/ipsec/plugins/libstrongswan-pubkey.la
-usr/libexec/ipsec/plugins/libstrongswan-pubkey.so
-#usr/libexec/ipsec/plugins/libstrongswan-random.a
-#usr/libexec/ipsec/plugins/libstrongswan-random.la
-usr/libexec/ipsec/plugins/libstrongswan-random.so
-#usr/libexec/ipsec/plugins/libstrongswan-resolve.a
-#usr/libexec/ipsec/plugins/libstrongswan-resolve.la
-usr/libexec/ipsec/plugins/libstrongswan-resolve.so
-#usr/libexec/ipsec/plugins/libstrongswan-revocation.a
-#usr/libexec/ipsec/plugins/libstrongswan-revocation.la
-usr/libexec/ipsec/plugins/libstrongswan-revocation.so
-#usr/libexec/ipsec/plugins/libstrongswan-sha1.a
-#usr/libexec/ipsec/plugins/libstrongswan-sha1.la
-usr/libexec/ipsec/plugins/libstrongswan-sha1.so
-#usr/libexec/ipsec/plugins/libstrongswan-sha2.a
-#usr/libexec/ipsec/plugins/libstrongswan-sha2.la
-usr/libexec/ipsec/plugins/libstrongswan-sha2.so
-#usr/libexec/ipsec/plugins/libstrongswan-socket-raw.a
-#usr/libexec/ipsec/plugins/libstrongswan-socket-raw.la
-usr/libexec/ipsec/plugins/libstrongswan-socket-raw.so
-#usr/libexec/ipsec/plugins/libstrongswan-stroke.a
-#usr/libexec/ipsec/plugins/libstrongswan-stroke.la
-usr/libexec/ipsec/plugins/libstrongswan-stroke.so
-#usr/libexec/ipsec/plugins/libstrongswan-updown.a
-#usr/libexec/ipsec/plugins/libstrongswan-updown.la
-usr/libexec/ipsec/plugins/libstrongswan-updown.so
-#usr/libexec/ipsec/plugins/libstrongswan-x509.a
-#usr/libexec/ipsec/plugins/libstrongswan-x509.la
-usr/libexec/ipsec/plugins/libstrongswan-x509.so
-#usr/libexec/ipsec/plugins/libstrongswan-xauth.a
-#usr/libexec/ipsec/plugins/libstrongswan-xauth.la
-usr/libexec/ipsec/plugins/libstrongswan-xauth.so
-#usr/libexec/ipsec/plugins/libstrongswan-xcbc.a
-#usr/libexec/ipsec/plugins/libstrongswan-xcbc.la
-usr/libexec/ipsec/plugins/libstrongswan-xcbc.so
+#usr/lib/ipsec
+#usr/lib/ipsec/plugins
+#usr/lib/ipsec/plugins/libstrongswan-aes.a
+#usr/lib/ipsec/plugins/libstrongswan-aes.la
+usr/lib/ipsec/plugins/libstrongswan-aes.so
+#usr/lib/ipsec/plugins/libstrongswan-attr.a
+#usr/lib/ipsec/plugins/libstrongswan-attr.la
+usr/lib/ipsec/plugins/libstrongswan-attr.so
+#usr/lib/ipsec/plugins/libstrongswan-constraints.a
+#usr/lib/ipsec/plugins/libstrongswan-constraints.la
+usr/lib/ipsec/plugins/libstrongswan-constraints.so
+#usr/lib/ipsec/plugins/libstrongswan-curl.a
+#usr/lib/ipsec/plugins/libstrongswan-curl.la
+usr/lib/ipsec/plugins/libstrongswan-curl.so
+#usr/lib/ipsec/plugins/libstrongswan-des.a
+#usr/lib/ipsec/plugins/libstrongswan-des.la
+usr/lib/ipsec/plugins/libstrongswan-des.so
+#usr/lib/ipsec/plugins/libstrongswan-dnskey.a
+#usr/lib/ipsec/plugins/libstrongswan-dnskey.la
+usr/lib/ipsec/plugins/libstrongswan-dnskey.so
+#usr/lib/ipsec/plugins/libstrongswan-fips-prf.a
+#usr/lib/ipsec/plugins/libstrongswan-fips-prf.la
+usr/lib/ipsec/plugins/libstrongswan-fips-prf.so
+#usr/lib/ipsec/plugins/libstrongswan-gmp.a
+#usr/lib/ipsec/plugins/libstrongswan-gmp.la
+usr/lib/ipsec/plugins/libstrongswan-gmp.so
+#usr/lib/ipsec/plugins/libstrongswan-hmac.a
+#usr/lib/ipsec/plugins/libstrongswan-hmac.la
+usr/lib/ipsec/plugins/libstrongswan-hmac.so
+#usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.a
+#usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.la
+usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so
+#usr/lib/ipsec/plugins/libstrongswan-md5.a
+#usr/lib/ipsec/plugins/libstrongswan-md5.la
+usr/lib/ipsec/plugins/libstrongswan-md5.so
+#usr/lib/ipsec/plugins/libstrongswan-pem.a
+#usr/lib/ipsec/plugins/libstrongswan-pem.la
+usr/lib/ipsec/plugins/libstrongswan-pem.so
+#usr/lib/ipsec/plugins/libstrongswan-pgp.a
+#usr/lib/ipsec/plugins/libstrongswan-pgp.la
+usr/lib/ipsec/plugins/libstrongswan-pgp.so
+#usr/lib/ipsec/plugins/libstrongswan-pkcs1.a
+#usr/lib/ipsec/plugins/libstrongswan-pkcs1.la
+usr/lib/ipsec/plugins/libstrongswan-pkcs1.so
+#usr/lib/ipsec/plugins/libstrongswan-pubkey.a
+#usr/lib/ipsec/plugins/libstrongswan-pubkey.la
+usr/lib/ipsec/plugins/libstrongswan-pubkey.so
+#usr/lib/ipsec/plugins/libstrongswan-random.a
+#usr/lib/ipsec/plugins/libstrongswan-random.la
+usr/lib/ipsec/plugins/libstrongswan-random.so
+#usr/lib/ipsec/plugins/libstrongswan-resolve.a
+#usr/lib/ipsec/plugins/libstrongswan-resolve.la
+usr/lib/ipsec/plugins/libstrongswan-resolve.so
+#usr/lib/ipsec/plugins/libstrongswan-revocation.a
+#usr/lib/ipsec/plugins/libstrongswan-revocation.la
+usr/lib/ipsec/plugins/libstrongswan-revocation.so
+#usr/lib/ipsec/plugins/libstrongswan-sha1.a
+#usr/lib/ipsec/plugins/libstrongswan-sha1.la
+usr/lib/ipsec/plugins/libstrongswan-sha1.so
+#usr/lib/ipsec/plugins/libstrongswan-sha2.a
+#usr/lib/ipsec/plugins/libstrongswan-sha2.la
+usr/lib/ipsec/plugins/libstrongswan-sha2.so
+#usr/lib/ipsec/plugins/libstrongswan-socket-raw.a
+#usr/lib/ipsec/plugins/libstrongswan-socket-raw.la
+usr/lib/ipsec/plugins/libstrongswan-socket-raw.so
+#usr/lib/ipsec/plugins/libstrongswan-stroke.a
+#usr/lib/ipsec/plugins/libstrongswan-stroke.la
+usr/lib/ipsec/plugins/libstrongswan-stroke.so
+#usr/lib/ipsec/plugins/libstrongswan-updown.a
+#usr/lib/ipsec/plugins/libstrongswan-updown.la
+usr/lib/ipsec/plugins/libstrongswan-updown.so
+#usr/lib/ipsec/plugins/libstrongswan-x509.a
+#usr/lib/ipsec/plugins/libstrongswan-x509.la
+usr/lib/ipsec/plugins/libstrongswan-x509.so
+#usr/lib/ipsec/plugins/libstrongswan-xauth.a
+#usr/lib/ipsec/plugins/libstrongswan-xauth.la
+usr/lib/ipsec/plugins/libstrongswan-xauth.so
+#usr/lib/ipsec/plugins/libstrongswan-xcbc.a
+#usr/lib/ipsec/plugins/libstrongswan-xcbc.la
+usr/lib/ipsec/plugins/libstrongswan-xcbc.so
 usr/libexec/ipsec/pluto
 usr/libexec/ipsec/scepclient
 usr/libexec/ipsec/starter
@@ -118,14 +122,11 @@ usr/sbin/ipsec
 #usr/share/man/man3/anyaddr.3
 #usr/share/man/man3/atoaddr.3
 #usr/share/man/man3/atoasr.3
-#usr/share/man/man3/atosa.3
 #usr/share/man/man3/atoul.3
 #usr/share/man/man3/goodmask.3
 #usr/share/man/man3/initaddr.3
 #usr/share/man/man3/initsubnet.3
-#usr/share/man/man3/keyblobtoid.3
 #usr/share/man/man3/portof.3
-#usr/share/man/man3/prng.3
 #usr/share/man/man3/rangetosubnet.3
 #usr/share/man/man3/sameaddr.3
 #usr/share/man/man3/subnetof.3
@@ -136,13 +137,11 @@ usr/sbin/ipsec
 #usr/share/man/man5/ipsec.conf.5
 #usr/share/man/man5/ipsec.secrets.5
 #usr/share/man/man5/strongswan.conf.5
-#usr/share/man/man8/_copyright.8
 #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/pluto.8
 #usr/share/man/man8/scepclient.8
-#usr/share/man/man8/starter.8
 etc/ipsec.user.conf
 etc/ipsec.user.secrets

diff --git a/config/rootfiles/common/usb_modeswitch b/config/rootfiles/common/usb_modeswitch
index 13c1a38e85eb10a18dbf14b71de47b4da232d5db..fe60c0553e542706f4722d44d4f4a6a694e53379 100644 (file)
--- a/config/rootfiles/common/usb_modeswitch
+++ b/config/rootfiles/common/usb_modeswitch
@@ -1,6 +1,6 @@
-#etc/usb_modeswitch.conf
-etc/usb_modeswitch.setup.example
+etc/usb_modeswitch.conf
 #lib/udev/usb_modeswitch
 usr/sbin/usb_modeswitch
 usr/sbin/usb_modeswitch_dispatcher
 #usr/share/man/man1/usb_modeswitch.1
+var/lib/usb_modeswitch

diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data
index e7b3079bc32ff8340beabbeefb2bfb421438d85b..c3166a0e8e52490a11f0994ebcda23f7418d8ad9 100644 (file)
--- a/config/rootfiles/common/usb_modeswitch_data
+++ b/config/rootfiles/common/usb_modeswitch_data
@@ -1,150 +1,199 @@
-#etc/usb_modeswitch.d
-etc/usb_modeswitch.d/0421:060c
-etc/usb_modeswitch.d/0421:0610
-etc/usb_modeswitch.d/0421:0622
-etc/usb_modeswitch.d/0421:0627
-etc/usb_modeswitch.d/0471:1210
-etc/usb_modeswitch.d/0471:1237
-etc/usb_modeswitch.d/0482:024d
-etc/usb_modeswitch.d/04e8:689a
-etc/usb_modeswitch.d/04e8:f000
-etc/usb_modeswitch.d/057c:84ff
-etc/usb_modeswitch.d/05c6:1000:sVe=Option
-etc/usb_modeswitch.d/05c6:1000:uMa=AnyDATA
-etc/usb_modeswitch.d/05c6:1000:uMa=Option
-etc/usb_modeswitch.d/05c6:1000:uMa=SAMSUNG
-etc/usb_modeswitch.d/05c6:1000:uMa=Vertex
-etc/usb_modeswitch.d/05c6:2001
-etc/usb_modeswitch.d/05c6:f000
-etc/usb_modeswitch.d/05c7:1000
-etc/usb_modeswitch.d/072f:100d
-etc/usb_modeswitch.d/0930:0d46
-etc/usb_modeswitch.d/0ace:2011
-etc/usb_modeswitch.d/0ace:20ff
-etc/usb_modeswitch.d/0af0:6711
-etc/usb_modeswitch.d/0af0:6731
-etc/usb_modeswitch.d/0af0:6751
-etc/usb_modeswitch.d/0af0:6771
-etc/usb_modeswitch.d/0af0:6791
-etc/usb_modeswitch.d/0af0:6811
-etc/usb_modeswitch.d/0af0:6911
-etc/usb_modeswitch.d/0af0:6951
-etc/usb_modeswitch.d/0af0:6971
-etc/usb_modeswitch.d/0af0:7011
-etc/usb_modeswitch.d/0af0:7031
-etc/usb_modeswitch.d/0af0:7051
-etc/usb_modeswitch.d/0af0:7071
-etc/usb_modeswitch.d/0af0:7111
-etc/usb_modeswitch.d/0af0:7211
-etc/usb_modeswitch.d/0af0:7251
-etc/usb_modeswitch.d/0af0:7271
-etc/usb_modeswitch.d/0af0:7301
-etc/usb_modeswitch.d/0af0:7311
-etc/usb_modeswitch.d/0af0:7361
-etc/usb_modeswitch.d/0af0:7381
-etc/usb_modeswitch.d/0af0:7401
-etc/usb_modeswitch.d/0af0:7501
-etc/usb_modeswitch.d/0af0:7601
-etc/usb_modeswitch.d/0af0:7701
-etc/usb_modeswitch.d/0af0:7801
-etc/usb_modeswitch.d/0af0:7901
-etc/usb_modeswitch.d/0af0:8200
-etc/usb_modeswitch.d/0af0:8201
-etc/usb_modeswitch.d/0af0:8300
-etc/usb_modeswitch.d/0af0:8302
-etc/usb_modeswitch.d/0af0:8304
-etc/usb_modeswitch.d/0af0:8400
-etc/usb_modeswitch.d/0af0:c031
-etc/usb_modeswitch.d/0af0:c100
-etc/usb_modeswitch.d/0af0:d013
-etc/usb_modeswitch.d/0af0:d031
-etc/usb_modeswitch.d/0af0:d033
-etc/usb_modeswitch.d/0af0:d035
-etc/usb_modeswitch.d/0af0:d055
-etc/usb_modeswitch.d/0af0:d057
-etc/usb_modeswitch.d/0af0:d058
-etc/usb_modeswitch.d/0af0:d155
-etc/usb_modeswitch.d/0af0:d157
-etc/usb_modeswitch.d/0af0:d255
-etc/usb_modeswitch.d/0af0:d257
-etc/usb_modeswitch.d/0af0:d357
-etc/usb_modeswitch.d/0b3c:c700
-etc/usb_modeswitch.d/0b3c:f000
-etc/usb_modeswitch.d/0cf3:20ff
-etc/usb_modeswitch.d/0d46:45a1
-etc/usb_modeswitch.d/0d46:45a5
-etc/usb_modeswitch.d/0e8d:7109
-etc/usb_modeswitch.d/0fce:d0cf
-etc/usb_modeswitch.d/0fce:d0e1
-etc/usb_modeswitch.d/0fce:d103
-etc/usb_modeswitch.d/0fd1:1000
-etc/usb_modeswitch.d/1004:1000
-etc/usb_modeswitch.d/1004:607f
-etc/usb_modeswitch.d/1004:613a
-etc/usb_modeswitch.d/1004:613f
-etc/usb_modeswitch.d/1004:6190
-etc/usb_modeswitch.d/1033:0035
-etc/usb_modeswitch.d/106c:3b03
-etc/usb_modeswitch.d/106c:3b05
-etc/usb_modeswitch.d/106c:3b06
-etc/usb_modeswitch.d/1076:7f40
-etc/usb_modeswitch.d/1199:0fff
-etc/usb_modeswitch.d/1266:1000
-etc/usb_modeswitch.d/12d1:1001
-etc/usb_modeswitch.d/12d1:1003
-etc/usb_modeswitch.d/12d1:101e
-etc/usb_modeswitch.d/12d1:1031
-etc/usb_modeswitch.d/12d1:1414
-etc/usb_modeswitch.d/12d1:1446
-etc/usb_modeswitch.d/12d1:14ad
-etc/usb_modeswitch.d/12d1:14c1
-etc/usb_modeswitch.d/12d1:1520
-etc/usb_modeswitch.d/12d1:1521
-etc/usb_modeswitch.d/12d1:1523
-etc/usb_modeswitch.d/12d1:1553
-etc/usb_modeswitch.d/12d1:1557
-etc/usb_modeswitch.d/12d1:1c0b
-etc/usb_modeswitch.d/1410:5010
-etc/usb_modeswitch.d/1410:5020
-etc/usb_modeswitch.d/1410:5030
-etc/usb_modeswitch.d/1410:5031
-etc/usb_modeswitch.d/1410:5041
-etc/usb_modeswitch.d/148f:2578
-etc/usb_modeswitch.d/16d8:6281
-etc/usb_modeswitch.d/16d8:6803
-etc/usb_modeswitch.d/16d8:6803:?
-etc/usb_modeswitch.d/16d8:700a
-etc/usb_modeswitch.d/16d8:f000
-etc/usb_modeswitch.d/198f:bccd
-etc/usb_modeswitch.d/19d2:0003
-etc/usb_modeswitch.d/19d2:0026
-etc/usb_modeswitch.d/19d2:0040
-etc/usb_modeswitch.d/19d2:0053
-etc/usb_modeswitch.d/19d2:0083
-etc/usb_modeswitch.d/19d2:0101
-etc/usb_modeswitch.d/19d2:0103
-etc/usb_modeswitch.d/19d2:0115
-etc/usb_modeswitch.d/19d2:1001
-etc/usb_modeswitch.d/19d2:1007
-etc/usb_modeswitch.d/19d2:1009
-etc/usb_modeswitch.d/19d2:1013
-etc/usb_modeswitch.d/19d2:2000
-etc/usb_modeswitch.d/19d2:fff5
-etc/usb_modeswitch.d/19d2:fff6
-etc/usb_modeswitch.d/1a8d:1000
-etc/usb_modeswitch.d/1ab7:5700
-etc/usb_modeswitch.d/1b7d:0700
-etc/usb_modeswitch.d/1bbb:f000
-etc/usb_modeswitch.d/1c9e:1001
-etc/usb_modeswitch.d/1c9e:9200
-etc/usb_modeswitch.d/1c9e:9e00
-etc/usb_modeswitch.d/1c9e:f000
-etc/usb_modeswitch.d/1dd6:1000
-etc/usb_modeswitch.d/1e0e:f000
-etc/usb_modeswitch.d/1edf:6003
-etc/usb_modeswitch.d/1ee8:0009
-etc/usb_modeswitch.d/1ee8:0013
-etc/usb_modeswitch.d/1f28:0021
-etc/usb_modeswitch.d/1fac:0130
-etc/usb_modeswitch.d/230d:0001
+etc/usb_modeswitch.d
 lib/udev/rules.d/40-usb_modeswitch.rules
+#usr/share/usb_modeswitch
+usr/share/usb_modeswitch/03f0:002a
+usr/share/usb_modeswitch/0421:060c
+usr/share/usb_modeswitch/0421:0610
+usr/share/usb_modeswitch/0421:0622
+usr/share/usb_modeswitch/0421:0627
+usr/share/usb_modeswitch/0471:1210:uMa=Philips
+usr/share/usb_modeswitch/0471:1210:uMa=Wisue
+usr/share/usb_modeswitch/0471:1237
+usr/share/usb_modeswitch/0482:024d
+usr/share/usb_modeswitch/04e8:689a
+usr/share/usb_modeswitch/04e8:f000
+usr/share/usb_modeswitch/057c:84ff
+usr/share/usb_modeswitch/05c6:1000:sVe=GT
+usr/share/usb_modeswitch/05c6:1000:sVe=Option
+usr/share/usb_modeswitch/05c6:1000:uMa=AnyDATA
+usr/share/usb_modeswitch/05c6:1000:uMa=Option
+usr/share/usb_modeswitch/05c6:1000:uMa=SAMSUNG
+usr/share/usb_modeswitch/05c6:1000:uMa=SSE
+usr/share/usb_modeswitch/05c6:1000:uMa=Vertex
+usr/share/usb_modeswitch/05c6:2000
+usr/share/usb_modeswitch/05c6:2001
+usr/share/usb_modeswitch/05c6:f000
+usr/share/usb_modeswitch/05c7:1000
+usr/share/usb_modeswitch/072f:100d
+usr/share/usb_modeswitch/07d1:a800
+usr/share/usb_modeswitch/07d1:a804
+usr/share/usb_modeswitch/0930:0d46
+usr/share/usb_modeswitch/0ace:2011
+usr/share/usb_modeswitch/0ace:20ff
+usr/share/usb_modeswitch/0af0:6711
+usr/share/usb_modeswitch/0af0:6731
+usr/share/usb_modeswitch/0af0:6751
+usr/share/usb_modeswitch/0af0:6771
+usr/share/usb_modeswitch/0af0:6791
+usr/share/usb_modeswitch/0af0:6811
+usr/share/usb_modeswitch/0af0:6911
+usr/share/usb_modeswitch/0af0:6951
+usr/share/usb_modeswitch/0af0:6971
+usr/share/usb_modeswitch/0af0:7011
+usr/share/usb_modeswitch/0af0:7031
+usr/share/usb_modeswitch/0af0:7051
+usr/share/usb_modeswitch/0af0:7071
+usr/share/usb_modeswitch/0af0:7111
+usr/share/usb_modeswitch/0af0:7211
+usr/share/usb_modeswitch/0af0:7251
+usr/share/usb_modeswitch/0af0:7271
+usr/share/usb_modeswitch/0af0:7301
+usr/share/usb_modeswitch/0af0:7311
+usr/share/usb_modeswitch/0af0:7361
+usr/share/usb_modeswitch/0af0:7381
+usr/share/usb_modeswitch/0af0:7401
+usr/share/usb_modeswitch/0af0:7501
+usr/share/usb_modeswitch/0af0:7601
+usr/share/usb_modeswitch/0af0:7701
+usr/share/usb_modeswitch/0af0:7801
+usr/share/usb_modeswitch/0af0:7901
+usr/share/usb_modeswitch/0af0:7a01
+usr/share/usb_modeswitch/0af0:7a05
+usr/share/usb_modeswitch/0af0:8200
+usr/share/usb_modeswitch/0af0:8201
+usr/share/usb_modeswitch/0af0:8300
+usr/share/usb_modeswitch/0af0:8302
+usr/share/usb_modeswitch/0af0:8304
+usr/share/usb_modeswitch/0af0:8400
+usr/share/usb_modeswitch/0af0:8600
+usr/share/usb_modeswitch/0af0:8800
+usr/share/usb_modeswitch/0af0:8900
+usr/share/usb_modeswitch/0af0:9000
+usr/share/usb_modeswitch/0af0:c031
+usr/share/usb_modeswitch/0af0:c100
+usr/share/usb_modeswitch/0af0:d013
+usr/share/usb_modeswitch/0af0:d031
+usr/share/usb_modeswitch/0af0:d033
+usr/share/usb_modeswitch/0af0:d035
+usr/share/usb_modeswitch/0af0:d055
+usr/share/usb_modeswitch/0af0:d057
+usr/share/usb_modeswitch/0af0:d058
+usr/share/usb_modeswitch/0af0:d155
+usr/share/usb_modeswitch/0af0:d157
+usr/share/usb_modeswitch/0af0:d255
+usr/share/usb_modeswitch/0af0:d257
+usr/share/usb_modeswitch/0af0:d357
+usr/share/usb_modeswitch/0b3c:c700
+usr/share/usb_modeswitch/0b3c:f000
+usr/share/usb_modeswitch/0cf3:20ff
+usr/share/usb_modeswitch/0d46:45a1
+usr/share/usb_modeswitch/0d46:45a5
+usr/share/usb_modeswitch/0df7:0800
+usr/share/usb_modeswitch/0e8d:7109
+usr/share/usb_modeswitch/0fce:d0cf
+usr/share/usb_modeswitch/0fce:d0e1
+usr/share/usb_modeswitch/0fce:d103
+usr/share/usb_modeswitch/0fd1:1000
+usr/share/usb_modeswitch/1004:1000
+usr/share/usb_modeswitch/1004:607f
+usr/share/usb_modeswitch/1004:613a
+usr/share/usb_modeswitch/1004:613f
+usr/share/usb_modeswitch/1004:6190
+usr/share/usb_modeswitch/1033:0035
+usr/share/usb_modeswitch/106c:3b03
+usr/share/usb_modeswitch/106c:3b05
+usr/share/usb_modeswitch/106c:3b06
+usr/share/usb_modeswitch/1076:7f40
+usr/share/usb_modeswitch/1199:0fff
+usr/share/usb_modeswitch/1266:1000
+usr/share/usb_modeswitch/12d1:1001
+usr/share/usb_modeswitch/12d1:1003
+usr/share/usb_modeswitch/12d1:1009
+usr/share/usb_modeswitch/12d1:101e
+usr/share/usb_modeswitch/12d1:1030
+usr/share/usb_modeswitch/12d1:1031
+usr/share/usb_modeswitch/12d1:1414
+usr/share/usb_modeswitch/12d1:1446
+usr/share/usb_modeswitch/12d1:1449
+usr/share/usb_modeswitch/12d1:14ad
+usr/share/usb_modeswitch/12d1:14b5
+usr/share/usb_modeswitch/12d1:14b7
+usr/share/usb_modeswitch/12d1:14c1
+usr/share/usb_modeswitch/12d1:14c4
+usr/share/usb_modeswitch/12d1:14c5
+usr/share/usb_modeswitch/12d1:14d1
+usr/share/usb_modeswitch/12d1:14fe
+usr/share/usb_modeswitch/12d1:1505
+usr/share/usb_modeswitch/12d1:1520
+usr/share/usb_modeswitch/12d1:1521
+usr/share/usb_modeswitch/12d1:1523
+usr/share/usb_modeswitch/12d1:1553
+usr/share/usb_modeswitch/12d1:1557
+usr/share/usb_modeswitch/12d1:1c0b
+usr/share/usb_modeswitch/12d1:1da1
+usr/share/usb_modeswitch/12d1:380b
+usr/share/usb_modeswitch/1307:1169
+usr/share/usb_modeswitch/1410:5010
+usr/share/usb_modeswitch/1410:5020
+usr/share/usb_modeswitch/1410:5030
+usr/share/usb_modeswitch/1410:5031
+usr/share/usb_modeswitch/1410:5041
+usr/share/usb_modeswitch/148e:a000
+usr/share/usb_modeswitch/148f:2578
+usr/share/usb_modeswitch/16d8:6281
+usr/share/usb_modeswitch/16d8:6803
+usr/share/usb_modeswitch/16d8:700a
+usr/share/usb_modeswitch/16d8:700b
+usr/share/usb_modeswitch/16d8:f000
+usr/share/usb_modeswitch/198a:0003
+usr/share/usb_modeswitch/198f:bccd
+usr/share/usb_modeswitch/19d2:0003
+usr/share/usb_modeswitch/19d2:0013
+usr/share/usb_modeswitch/19d2:0026
+usr/share/usb_modeswitch/19d2:0040
+usr/share/usb_modeswitch/19d2:0053
+usr/share/usb_modeswitch/19d2:0083
+usr/share/usb_modeswitch/19d2:0101
+usr/share/usb_modeswitch/19d2:0103
+usr/share/usb_modeswitch/19d2:0110
+usr/share/usb_modeswitch/19d2:0115
+usr/share/usb_modeswitch/19d2:0149
+usr/share/usb_modeswitch/19d2:1001
+usr/share/usb_modeswitch/19d2:1007
+usr/share/usb_modeswitch/19d2:1009
+usr/share/usb_modeswitch/19d2:1013
+usr/share/usb_modeswitch/19d2:1171
+usr/share/usb_modeswitch/19d2:1175
+usr/share/usb_modeswitch/19d2:1179
+usr/share/usb_modeswitch/19d2:1201
+usr/share/usb_modeswitch/19d2:1216
+usr/share/usb_modeswitch/19d2:1224
+usr/share/usb_modeswitch/19d2:2000
+usr/share/usb_modeswitch/19d2:bccd
+usr/share/usb_modeswitch/19d2:ffe6
+usr/share/usb_modeswitch/19d2:fff5
+usr/share/usb_modeswitch/19d2:fff6
+usr/share/usb_modeswitch/1a8d:1000
+usr/share/usb_modeswitch/1ab7:5700
+usr/share/usb_modeswitch/1b7d:0700
+usr/share/usb_modeswitch/1bbb:f000
+usr/share/usb_modeswitch/1c9e:1001
+usr/share/usb_modeswitch/1c9e:6061
+usr/share/usb_modeswitch/1c9e:9200
+usr/share/usb_modeswitch/1c9e:9800
+usr/share/usb_modeswitch/1c9e:9e00
+usr/share/usb_modeswitch/1c9e:f000
+usr/share/usb_modeswitch/1dd6:1000
+usr/share/usb_modeswitch/1e0e:f000
+usr/share/usb_modeswitch/1edf:6003
+usr/share/usb_modeswitch/1ee8:0009
+usr/share/usb_modeswitch/1ee8:0013
+usr/share/usb_modeswitch/1ee8:0040
+usr/share/usb_modeswitch/1f28:0021
+usr/share/usb_modeswitch/1fac:0032
+usr/share/usb_modeswitch/1fac:0130
+usr/share/usb_modeswitch/201e:2009
+usr/share/usb_modeswitch/2020:f00e
+usr/share/usb_modeswitch/230d:0001
+usr/share/usb_modeswitch/230d:0007
+usr/share/usb_modeswitch/8888:6500

diff --git a/config/rootfiles/common/wireless-regdb b/config/rootfiles/common/wireless-regdb
new file mode 100644 (file)
index 0000000..2dcdbca
--- /dev/null
+++ b/config/rootfiles/common/wireless-regdb
@@ -0,0 +1,5 @@
+#usr/lib/crda
+#usr/lib/crda/pubkeys
+usr/lib/crda/pubkeys/linville.key.pub.pem
+usr/lib/crda/regulatory.bin
+#usr/share/man/man5/regulatory.bin.5.gz

diff --git a/config/rootfiles/common/zd1211-firmware b/config/rootfiles/common/zd1211-firmware
new file mode 100644 (file)
index 0000000..389c73a
--- /dev/null
+++ b/config/rootfiles/common/zd1211-firmware
@@ -0,0 +1,19 @@
+#lib/firmware/zd1211
+#lib/firmware/zd1211/COPYING
+#lib/firmware/zd1211/README
+#lib/firmware/zd1211/WS11UPh.h
+#lib/firmware/zd1211/WS11UPhR.h
+#lib/firmware/zd1211/WS11UPhR_Turbo.h
+#lib/firmware/zd1211/WS11UPhm.h
+#lib/firmware/zd1211/WS11Ub.h
+#lib/firmware/zd1211/WS11Ur.h
+lib/firmware/zd1211/zd1211_ub
+lib/firmware/zd1211/zd1211_uph
+lib/firmware/zd1211/zd1211_uphm
+lib/firmware/zd1211/zd1211_uphr
+lib/firmware/zd1211/zd1211_ur
+lib/firmware/zd1211/zd1211b_ub
+lib/firmware/zd1211/zd1211b_uph
+lib/firmware/zd1211/zd1211b_uphm
+lib/firmware/zd1211/zd1211b_uphr
+lib/firmware/zd1211/zd1211b_ur

diff --git a/config/rootfiles/core/49/exclude b/config/rootfiles/core/49/exclude
index 6fe46b4c89f3ebdb1bdd76150fdfd63c99546a19..ce199d8511a8260b17b0fa4f8e154be635fc8e5a 100644 (file)
--- a/config/rootfiles/core/49/exclude
+++ b/config/rootfiles/core/49/exclude
@@ -1 +1 @@
-/srv/web/ipfire/html/proxy.pac
+srv/web/ipfire/html/proxy.pac

diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files
index 032958b192aac4e76f4fc2f19b51eb5d7ccee608..3bc88ddde0cc270bcdfb19f1639935b0a6a5e0f6 100644 (file)
--- a/config/rootfiles/core/49/filelists/files
+++ b/config/rootfiles/core/49/filelists/files
@@ -1,4 +1,5 @@
 etc/system-release
+etc/httpd/conf/server-tuning.conf
 etc/rc.d/init.d/squid
 etc/rc.d/init.d/waitdrives
 etc/rc.d/rcsysinit.d/S19waitdrives
@@ -6,9 +7,11 @@ var/ipfire/backup/bin/backup.pl
 srv/web/ipfire/cgi-bin/backup.cgi
 srv/web/ipfire/cgi-bin/extrahd.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 srv/web/ipfire/cgi-bin/ovpnmain.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/services.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 var/ipfire/langs/de.pl

diff --git a/config/rootfiles/core/49/filelists/icons b/config/rootfiles/core/49/filelists/icons
deleted file mode 100644 (file)
index 52b22e0..0000000
--- a/config/rootfiles/core/49/filelists/icons
+++ /dev/null
@@ -1,13 +0,0 @@
-srv/web/ipfire/html/images/delete.gif
-srv/web/ipfire/html/images/document-save.png
-srv/web/ipfire/html/images/edit.gif
-srv/web/ipfire/html/images/floppy.gif
-srv/web/ipfire/html/images/forward.gif
-srv/web/ipfire/html/images/info.gif
-srv/web/ipfire/html/images/list-add.png
-srv/web/ipfire/html/images/list-remove.png
-srv/web/ipfire/html/images/package-x-generic.png
-srv/web/ipfire/html/images/reload.gif
-srv/web/ipfire/html/images/stock_ok.png
-srv/web/ipfire/html/images/stock_stop.png
-srv/web/ipfire/html/images/user-trash.png

diff --git a/config/rootfiles/core/50/exclude b/config/rootfiles/core/50/exclude
new file mode 100644 (file)
index 0000000..3446254
--- /dev/null
+++ b/config/rootfiles/core/50/exclude
@@ -0,0 +1,3 @@
+srv/web/ipfire/html/proxy.pac
+var/updatecache
+etc/collectd.custom

diff --git a/config/rootfiles/core/50/filelists/apache2 b/config/rootfiles/core/50/filelists/apache2
new file mode 120000 (symlink)
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/core/50/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file

diff --git a/config/rootfiles/core/50/filelists/collectd b/config/rootfiles/core/50/filelists/collectd
new file mode 120000 (symlink)
index 0000000..871b32f
--- /dev/null
+++ b/config/rootfiles/core/50/filelists/collectd
@@ -0,0 +1 @@
+../../../common/collectd
\ No newline at end of file

diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files
new file mode 100644 (file)
index 0000000..f61cb05
--- /dev/null
+++ b/config/rootfiles/core/50/filelists/files
@@ -0,0 +1,11 @@
+etc/sysctl.conf
+etc/system-release
+var/ipfire/langs/
+etc/rc.d/init.d/console
+usr/local/sbin/setup
+var/ipfire/graphs.pl
+srv/web/ipfire/cgi-bin/portfw.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+usr/local/share/GeoIP/GeoIP.dat
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids

diff --git a/config/rootfiles/core/50/filelists/gettext b/config/rootfiles/core/50/filelists/gettext
new file mode 120000 (symlink)
index 0000000..b6c6c6f
--- /dev/null
+++ b/config/rootfiles/core/50/filelists/gettext
@@ -0,0 +1 @@
+../../../common/gettext
\ No newline at end of file

diff --git a/config/rootfiles/core/50/filelists/python b/config/rootfiles/core/50/filelists/python
new file mode 120000 (symlink)
index 0000000..ffe6e2c
--- /dev/null
+++ b/config/rootfiles/core/50/filelists/python
@@ -0,0 +1 @@
+../../../common/python
\ No newline at end of file

diff --git a/config/rootfiles/core/50/filelists/smartmontools b/config/rootfiles/core/50/filelists/smartmontools
new file mode 120000 (symlink)
index 0000000..fb66daf
--- /dev/null
+++ b/config/rootfiles/core/50/filelists/smartmontools
@@ -0,0 +1 @@
+../../../common/smartmontools
\ No newline at end of file

diff --git a/config/rootfiles/core/50/filelists/squid b/config/rootfiles/core/50/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/50/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file

diff --git a/config/rootfiles/core/50/meta b/config/rootfiles/core/50/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/50/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/50/update.sh b/config/rootfiles/core/50/update.sh
new file mode 100644 (file)
index 0000000..b114ded
--- /dev/null
+++ b/config/rootfiles/core/50/update.sh
@@ -0,0 +1,64 @@
+#!/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) 2011 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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=50
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/apache stop
+/etc/init.d/collectd stop
+/etc/init.d/squid stop
+#
+#Extract files
+extract_files
+
+#
+#Start services
+/etc/init.d/squid start
+/etc/init.d/collectd start
+/etc/init.d/apache start
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod 2.6.32.28-ipfire     >/dev/null 2>&1
+#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1
+#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0

diff --git a/config/rootfiles/core/51/exclude b/config/rootfiles/core/51/exclude
new file mode 100644 (file)
index 0000000..ce199d8
--- /dev/null
+++ b/config/rootfiles/core/51/exclude
@@ -0,0 +1 @@
+srv/web/ipfire/html/proxy.pac

diff --git a/config/rootfiles/core/51/filelists/crda b/config/rootfiles/core/51/filelists/crda
new file mode 120000 (symlink)
index 0000000..d68c46e
--- /dev/null
+++ b/config/rootfiles/core/51/filelists/crda
@@ -0,0 +1 @@
+../../../common/crda
\ No newline at end of file

diff --git a/config/rootfiles/core/51/filelists/dhcp b/config/rootfiles/core/51/filelists/dhcp
new file mode 120000 (symlink)
index 0000000..32d8da4
--- /dev/null
+++ b/config/rootfiles/core/51/filelists/dhcp
@@ -0,0 +1 @@
+../../../common/dhcp
\ No newline at end of file

diff --git a/config/rootfiles/core/51/filelists/dracut b/config/rootfiles/core/51/filelists/dracut
new file mode 120000 (symlink)
index 0000000..1608699
--- /dev/null
+++ b/config/rootfiles/core/51/filelists/dracut
@@ -0,0 +1 @@
+../../../common/dracut
\ No newline at end of file

diff --git a/config/rootfiles/core/51/filelists/files b/config/rootfiles/core/51/filelists/files
new file mode 100644 (file)
index 0000000..ec37489
--- /dev/null
+++ b/config/rootfiles/core/51/filelists/files
@@ -0,0 +1,4 @@
+etc/system-release
+etc/sysctl.conf
+var/ipfire/langs/
+var/ipfire/proxy/advanced/useragents

diff --git a/config/rootfiles/core/51/filelists/grub b/config/rootfiles/core/51/filelists/grub
new file mode 120000 (symlink)
index 0000000..050745c
--- /dev/null
+++ b/config/rootfiles/core/51/filelists/grub
@@ -0,0 +1 @@
+../../../common/grub
\ No newline at end of file

diff --git a/config/rootfiles/core/51/filelists/iw b/config/rootfiles/core/51/filelists/iw
new file mode 120000 (symlink)
index 0000000..7c58a20
--- /dev/null
+++ b/config/rootfiles/core/51/filelists/iw
@@ -0,0 +1 @@
+../../../common/iw
\ No newline at end of file

diff --git a/config/rootfiles/core/51/filelists/linux b/config/rootfiles/core/51/filelists/linux
new file mode 120000 (symlink)
index 0000000..c469fe1
--- /dev/null
+++ b/config/rootfiles/core/51/filelists/linux
@@ -0,0 +1 @@
+../../../common/linux
\ No newline at end of file

diff --git a/config/rootfiles/core/51/filelists/linux-firmware b/config/rootfiles/core/51/filelists/linux-firmware
new file mode 120000 (symlink)
index 0000000..4bf91bc
--- /dev/null
+++ b/config/rootfiles/core/51/filelists/linux-firmware
@@ -0,0 +1 @@
+../../../common/linux-firmware
\ No newline at end of file

diff --git a/config/rootfiles/core/51/filelists/wireless-regdb b/config/rootfiles/core/51/filelists/wireless-regdb
new file mode 120000 (symlink)
index 0000000..c9205b3
--- /dev/null
+++ b/config/rootfiles/core/51/filelists/wireless-regdb
@@ -0,0 +1 @@
+../../../common/wireless-regdb
\ No newline at end of file

diff --git a/config/rootfiles/core/51/filelists/zd1211-firmware b/config/rootfiles/core/51/filelists/zd1211-firmware
new file mode 120000 (symlink)
index 0000000..33985ce
--- /dev/null
+++ b/config/rootfiles/core/51/filelists/zd1211-firmware
@@ -0,0 +1 @@
+../../../common/zd1211-firmware
\ No newline at end of file

diff --git a/config/rootfiles/core/51/meta b/config/rootfiles/core/51/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/51/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/51/update.sh b/config/rootfiles/core/51/update.sh
new file mode 100644 (file)
index 0000000..58a47da
--- /dev/null
+++ b/config/rootfiles/core/51/update.sh
@@ -0,0 +1,171 @@
+#!/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) 2011 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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=51
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+KVER="xxxKVERxxx"
+MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
+# Nur den letzten Parameter verwenden
+echo $MOUNT > /dev/null
+MOUNT=$_
+if [ ! $MOUNT == "rw" ]; then
+       MOUNT="ro"
+fi
+
+
+#
+# erase old backups to prefent disk-full on small installations
+rm -f /var/ipfire/backup/core-upgrade_*.tar.bz2
+
+#
+# backup
+echo First we made a backup of all files that was inside of the
+echo update archive. This may take a while ...
+# Add some files that are not in the package to backup
+echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
+echo boot >> /opt/pakfire/tmp/ROOTFILES
+
+# Backup the files
+tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
+    -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1
+
+echo
+echo Update Kernel to $KVER ...
+# Remove old kernel, configs, initrd, modules ...
+#
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/vmlinuz-*
+rm -rf /lib/modules/*
+#
+# Backup grub.conf
+#
+cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
+
+#
+# Stop services to save memory
+#
+/etc/init.d/snort stop
+/etc/init.d/squid stop
+/etc/init.d/ipsec stop
+/etc/init.d/dhcp stop
+#
+# Unpack the updated files
+#
+echo
+echo Unpack the updated files ...
+#
+tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
+       --no-overwrite-dir
+
+#
+# Enable ralink rt73 hardware encryption again
+rm -f /etc/modprobe.d/ralink_wireless
+
+#
+# Start services
+#
+/etc/init.d/dhcp 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
+
+
+#
+# Modify grub.conf
+#
+echo
+echo Update grub configuration ...
+ROOT=`mount | grep " / " | cut -d" " -f1`
+if [ ! -z $ROOT ]; then
+       ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
+fi
+if [ ! -z $ROOTUUID ]; then
+       sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf
+else
+       sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
+fi
+sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf
+sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf
+
+if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then
+       echo "grub use default console ..."
+else
+       echo "grub use serial console ..."
+       sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf
+       sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf
+       sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf
+       sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf
+fi
+#
+# ReInstall grub
+#
+grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
+#
+# Rebuild Language
+#
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+#
+# Delete old lm-sensor modullist to force search at next boot
+#
+rm -rf /etc/sysconfig/lm_sensors
+
+# Ensure that all data was written...
+sync
+sync
+sync
+
+# Reboot message to console
+/usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Upgrade finished. If you use a customized grub.cfg"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Check it before reboot !!!"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-51 " *** Please reboot... *** "
+
+# This update need a reboot.
+touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Ensure that all data was written...
+sync
+sync
+sync
+
+#
+#Don't report the exitcode last command
+exit 0

diff --git a/config/rootfiles/core/52/exclude b/config/rootfiles/core/52/exclude
new file mode 100644 (file)
index 0000000..bb0d8c8
--- /dev/null
+++ b/config/rootfiles/core/52/exclude
@@ -0,0 +1,2 @@
+srv/web/ipfire/html/proxy.pac
+var/updatecache

diff --git a/config/rootfiles/core/52/filelists/apache2 b/config/rootfiles/core/52/filelists/apache2
new file mode 120000 (symlink)
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/core/52/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file

diff --git a/config/rootfiles/core/52/filelists/ethtool b/config/rootfiles/core/52/filelists/ethtool
new file mode 120000 (symlink)
index 0000000..494a53e
--- /dev/null
+++ b/config/rootfiles/core/52/filelists/ethtool
@@ -0,0 +1 @@
+../../../common/ethtool
\ No newline at end of file

diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files
new file mode 100644 (file)
index 0000000..331514d
--- /dev/null
+++ b/config/rootfiles/core/52/filelists/files
@@ -0,0 +1,6 @@
+etc/system-release
+var/ipfire/langs/
+etc/rc.d/init.d/console
+usr/local/sbin/setup
+usr/local/bin/setddns.pl
+srv/web/ipfire/cgi-bin/ddns.cgi

diff --git a/config/rootfiles/core/52/meta b/config/rootfiles/core/52/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/52/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/52/update.sh b/config/rootfiles/core/52/update.sh
new file mode 100644 (file)
index 0000000..1e2f61e
--- /dev/null
+++ b/config/rootfiles/core/52/update.sh
@@ -0,0 +1,61 @@
+#!/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) 2011 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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=52
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/apache stop
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+/etc/init.d/apache start
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod 2.6.32.43-ipfire     >/dev/null 2>&1
+#depmod 2.6.32.43-ipfire-pae >/dev/null 2>&1
+#depmod 2.6.32.43-ipfire-xen >/dev/null 2>&1
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0

diff --git a/config/rootfiles/core/next/exclude b/config/rootfiles/core/next/exclude
new file mode 100644 (file)
index 0000000..6bfbbf7
--- /dev/null
+++ b/config/rootfiles/core/next/exclude
@@ -0,0 +1,7 @@
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime

diff --git a/config/rootfiles/core/next/filelists/apache2 b/config/rootfiles/core/next/filelists/apache2
new file mode 120000 (symlink)
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/core/next/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file

diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files
new file mode 100644 (file)
index 0000000..30727a5
--- /dev/null
+++ b/config/rootfiles/core/next/filelists/files
@@ -0,0 +1,13 @@
+etc/sysctl.conf
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/extrahd.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+var/ipfire/langs/de.pl
+var/ipfire/langs/en.pl
+var/ipfire/langs/es.pl
+var/ipfire/langs/fr.pl
+var/ipfire/langs/pl.pl
+usr/local/bin/ipsecctrl
+usr/local/bin/vpn-watch

diff --git a/config/rootfiles/core/next/filelists/gcc b/config/rootfiles/core/next/filelists/gcc
new file mode 120000 (symlink)
index 0000000..8538cc4
--- /dev/null
+++ b/config/rootfiles/core/next/filelists/gcc
@@ -0,0 +1 @@
+../../../common/gcc
\ No newline at end of file

diff --git a/config/rootfiles/core/next/filelists/glibc b/config/rootfiles/core/next/filelists/glibc
new file mode 120000 (symlink)
index 0000000..fbb4a52
--- /dev/null
+++ b/config/rootfiles/core/next/filelists/glibc
@@ -0,0 +1 @@
+../../../common/glibc
\ No newline at end of file

diff --git a/config/rootfiles/core/next/filelists/gmp b/config/rootfiles/core/next/filelists/gmp
new file mode 120000 (symlink)
index 0000000..8662a89
--- /dev/null
+++ b/config/rootfiles/core/next/filelists/gmp
@@ -0,0 +1 @@
+../../../common/gmp
\ No newline at end of file

diff --git a/config/rootfiles/core/next/filelists/strongswan b/config/rootfiles/core/next/filelists/strongswan
new file mode 120000 (symlink)
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/next/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file

diff --git a/config/rootfiles/core/next/filelists/usb_modeswitch b/config/rootfiles/core/next/filelists/usb_modeswitch
new file mode 120000 (symlink)
index 0000000..acbab6f
--- /dev/null
+++ b/config/rootfiles/core/next/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
\ No newline at end of file

diff --git a/config/rootfiles/core/next/filelists/usb_modeswitch_data b/config/rootfiles/core/next/filelists/usb_modeswitch_data
new file mode 120000 (symlink)
index 0000000..4cbce46
--- /dev/null
+++ b/config/rootfiles/core/next/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
\ No newline at end of file

diff --git a/config/rootfiles/core/next/meta b/config/rootfiles/core/next/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/next/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh
new file mode 100644 (file)
index 0000000..9a46645
--- /dev/null
+++ b/config/rootfiles/core/next/update.sh
@@ -0,0 +1,111 @@
+#!/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) 2011 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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=52
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+
+/etc/init.d/ipsec stop
+
+#
+# Remove old strongswan libs
+rm -rf /usr/lib/libcharon.so
+rm -rf /usr/lib/libcharon.so.0
+rm -rf /usr/lib/libcharon.so.0.0.0
+rm -rf /usr/lib/libhydra.so
+rm -rf /usr/lib/libhydra.so.0
+rm -rf /usr/lib/libhydra.so.0.0.0
+rm -rf /usr/lib/libstrongswan.so
+rm -rf /usr/lib/libstrongswan.so.0
+rm -rf /usr/lib/libstrongswan.so.0.0.0
+rm -rf /usr/libexec/ipsec/plugins
+
+# Remove old usb_modeswitch_data
+rm -rf /etc/usb_modeswitch.d
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+       /etc/init.d/ipsec start
+fi
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod 2.6.32.45-ipfire     >/dev/null 2>&1
+#depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1
+#depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1
+
+## Change version of Pakfire.conf
+##
+#OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
+#NEWVERSION="2.9"
+#sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
+##
+## 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 core-upgrade-44 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update
+#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 "Check it before reboot !!!"' >> /tmp/pak_update
+#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 " *** Please reboot... *** "' >> /tmp/pak_update
+#echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
+#
+#chmod +x /tmp/pak_update
+#/tmp/pak_update &
+#echo
+#echo Please wait until pakfire has ended...
+#echo
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0

diff --git a/config/rootfiles/installer/gzip b/config/rootfiles/installer/gzip
new file mode 120000 (symlink)
index 0000000..1cbc376
--- /dev/null
+++ b/config/rootfiles/installer/gzip
@@ -0,0 +1 @@
+../common/gzip
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/48/exclude b/config/rootfiles/oldcore/48/exclude
index 6fe46b4c89f3ebdb1bdd76150fdfd63c99546a19..ce199d8511a8260b17b0fa4f8e154be635fc8e5a 100644 (file)
--- a/config/rootfiles/oldcore/48/exclude
+++ b/config/rootfiles/oldcore/48/exclude
@@ -1 +1 @@
-/srv/web/ipfire/html/proxy.pac
+srv/web/ipfire/html/proxy.pac

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index fae43b8c41df449497478e603eff7f5d32aea114..96d00940b8470d0fdd288473847510586216527a 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,18 +10,19 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.9
+usr/lib/libclamav.so.6.1.11
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.9
+usr/lib/libclamunrar.so.6.1.11
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.9
+usr/lib/libclamunrar_iface.so.6.1.11
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav
+#usr/share/man/man1/clambc.1
 #usr/share/man/man1/clamconf.1
 #usr/share/man/man1/clamdscan.1
 #usr/share/man/man1/clamdtop.1

diff --git a/config/rootfiles/packages/client175 b/config/rootfiles/packages/client175
index e6596235b1882c9d282e8ee331bc268121867409..6e366c23a56784a92d1055cf8b017a01106485a8 100644 (file)
--- a/config/rootfiles/packages/client175
+++ b/config/rootfiles/packages/client175
@@ -46,6 +46,7 @@ srv/client175/cherrypy/process/wspbus.py
 #srv/client175/cherrypy/wsgiserver
 srv/client175/cherrypy/wsgiserver/__init__.py
 srv/client175/covers.py
+srv/client175/httpd.conf.example
 srv/client175/lyricwiki.py
 #srv/client175/metadata
 srv/client175/metadata/COPYING
@@ -99,6 +100,7 @@ srv/client175/site.conf
 srv/client175/static/COPYING.txt
 srv/client175/static/Thumbs.db
 srv/client175/static/covers
+srv/client175/static/covers/album_blank.png
 #srv/client175/static/ext
 srv/client175/static/ext/ext-all-debug.js
 srv/client175/static/ext/ext-all.js
@@ -2844,6 +2846,7 @@ srv/client175/static/icons/fugue/folder-horizontal.png
 srv/client175/static/icons/fugue/folder-microphone.png
 srv/client175/static/icons/fugue/folder-open-document-music.png
 srv/client175/static/icons/fugue/folder-open.png
+srv/client175/static/icons/fugue/gear.png
 srv/client175/static/icons/fugue/globe--plus.png
 srv/client175/static/icons/fugue/home.png
 srv/client175/static/icons/fugue/information-frame.png

diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index d83113c2f07913175db1e89e956772192431c86d..6bf7e69244c25cbaf4d853f700cbfa15a623c36c 100644 (file)
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -883,7 +883,6 @@ usr/share/doc/cups/help
 #usr/share/doc/cups/help/man-cupsenable.html
 #usr/share/doc/cups/help/man-cupstestdsc.html
 #usr/share/doc/cups/help/man-cupstestppd.html
-#usr/share/doc/cups/help/man-drv.html
 #usr/share/doc/cups/help/man-filter.html
 #usr/share/doc/cups/help/man-lp.html
 #usr/share/doc/cups/help/man-lpadmin.html
@@ -948,6 +947,7 @@ usr/share/doc/cups/images
 #usr/share/doc/cups/images/cups-postscript-chain.png
 #usr/share/doc/cups/images/cups-raster-chain.png
 #usr/share/doc/cups/images/cups.png
+#usr/share/doc/cups/images/generic.png
 #usr/share/doc/cups/images/left.gif
 #usr/share/doc/cups/images/raster.png
 #usr/share/doc/cups/images/right.gif
@@ -1012,7 +1012,6 @@ usr/share/doc/cups/robots.txt
 #usr/share/man/man5/printers.conf.5.gz
 #usr/share/man/man5/subscriptions.conf.5.gz
 #usr/share/man/man7/backend.7.gz
-#usr/share/man/man7/drv.7.gz
 #usr/share/man/man7/filter.7.gz
 #usr/share/man/man7/notifier.7.gz
 #usr/share/man/man8/accept.8.gz

diff --git a/config/rootfiles/packages/intltool b/config/rootfiles/packages/intltool
new file mode 100644 (file)
index 0000000..e1421fa
--- /dev/null
+++ b/config/rootfiles/packages/intltool
@@ -0,0 +1,13 @@
+usr/bin/intltool-extract
+usr/bin/intltool-merge
+usr/bin/intltool-prepare
+usr/bin/intltool-update
+usr/bin/intltoolize
+#usr/share/aclocal/intltool.m4
+#usr/share/intltool
+#usr/share/intltool/Makefile.in.in
+#usr/share/man/man8/intltool-extract.8
+#usr/share/man/man8/intltool-merge.8
+#usr/share/man/man8/intltool-prepare.8
+#usr/share/man/man8/intltool-update.8
+#usr/share/man/man8/intltoolize.8

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index 866d173c6f782fecb71c6fde6562deee259c014a..322b3c39ce55b5fb473254bc61d8ec1005d0f0a5 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.9.i586-full-core48.iso.torrent
+var/ipfire/seeder/ipfire-2.9.i586-full-core51.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/config/rootfiles/packages/libmpdclient b/config/rootfiles/packages/libmpdclient
index ac2242639010f86e9fe88c00bbc6f989dfcc3d0a..a349cfd595ae70aee57dbdd405106cad392edb7e 100644 (file)
--- a/config/rootfiles/packages/libmpdclient
+++ b/config/rootfiles/packages/libmpdclient
@@ -11,6 +11,7 @@
 #usr/include/mpd/error.h
 #usr/include/mpd/idle.h
 #usr/include/mpd/list.h
+#usr/include/mpd/message.h
 #usr/include/mpd/mixer.h
 #usr/include/mpd/output.h
 #usr/include/mpd/pair.h
@@ -24,6 +25,7 @@
 #usr/include/mpd/response.h
 #usr/include/mpd/search.h
 #usr/include/mpd/send.h
+#usr/include/mpd/settings.h
 #usr/include/mpd/song.h
 #usr/include/mpd/stats.h
 #usr/include/mpd/status.h
@@ -34,7 +36,7 @@
 #usr/lib/libmpdclient.la
 usr/lib/libmpdclient.so
 usr/lib/libmpdclient.so.2
-usr/lib/libmpdclient.so.2.0.0
+usr/lib/libmpdclient.so.2.0.5
 #usr/lib/pkgconfig/libmpdclient.pc
 #usr/share/doc/libmpdclient
 #usr/share/doc/libmpdclient/COPYING

diff --git a/config/rootfiles/packages/libsatsolver b/config/rootfiles/packages/libsatsolver
deleted file mode 100644 (file)
index 212eeea..0000000
--- a/config/rootfiles/packages/libsatsolver
+++ /dev/null
@@ -1,52 +0,0 @@
-#usr/include/satsolver
-#usr/include/satsolver/bitmap.h
-#usr/include/satsolver/chksum.h
-#usr/include/satsolver/dirpool.h
-#usr/include/satsolver/evr.h
-#usr/include/satsolver/hash.h
-#usr/include/satsolver/knownid.h
-#usr/include/satsolver/md5.h
-#usr/include/satsolver/policy.h
-#usr/include/satsolver/pool.h
-#usr/include/satsolver/pool_fileconflicts.h
-#usr/include/satsolver/poolarch.h
-#usr/include/satsolver/poolid.h
-#usr/include/satsolver/pooltypes.h
-#usr/include/satsolver/poolvendor.h
-#usr/include/satsolver/problems.h
-#usr/include/satsolver/queue.h
-#usr/include/satsolver/repo.h
-#usr/include/satsolver/repo_content.h
-#usr/include/satsolver/repo_deb.h
-#usr/include/satsolver/repo_deltainfoxml.h
-#usr/include/satsolver/repo_helix.h
-#usr/include/satsolver/repo_products.h
-#usr/include/satsolver/repo_releasefile_products.h
-#usr/include/satsolver/repo_repomdxml.h
-#usr/include/satsolver/repo_rpmdb.h
-#usr/include/satsolver/repo_rpmmd.h
-#usr/include/satsolver/repo_solv.h
-#usr/include/satsolver/repo_susetags.h
-#usr/include/satsolver/repo_updateinfoxml.h
-#usr/include/satsolver/repo_write.h
-#usr/include/satsolver/repo_zyppdb.h
-#usr/include/satsolver/repodata.h
-#usr/include/satsolver/repopage.h
-#usr/include/satsolver/rules.h
-#usr/include/satsolver/sat_xfopen.h
-#usr/include/satsolver/satversion.h
-#usr/include/satsolver/sha1.h
-#usr/include/satsolver/sha2.h
-#usr/include/satsolver/solvable.h
-#usr/include/satsolver/solver.h
-#usr/include/satsolver/solverdebug.h
-#usr/include/satsolver/strpool.h
-#usr/include/satsolver/tools_util.h
-#usr/include/satsolver/transaction.h
-#usr/include/satsolver/util.h
-usr/lib/libsatsolver.so
-usr/lib/libsatsolver.so.0
-usr/lib/libsatsolver.so.0.16
-usr/lib/libsatsolverext.so
-usr/lib/libsatsolverext.so.0
-usr/lib/libsatsolverext.so.0.16

diff --git a/config/rootfiles/packages/libsolv b/config/rootfiles/packages/libsolv
new file mode 100644 (file)
index 0000000..587d514
--- /dev/null
+++ b/config/rootfiles/packages/libsolv
@@ -0,0 +1,47 @@
+#usr/include/solv
+#usr/include/solv/bitmap.h
+#usr/include/solv/chksum.h
+#usr/include/solv/dirpool.h
+#usr/include/solv/evr.h
+#usr/include/solv/hash.h
+#usr/include/solv/knownid.h
+#usr/include/solv/policy.h
+#usr/include/solv/pool.h
+#usr/include/solv/pool_fileconflicts.h
+#usr/include/solv/poolarch.h
+#usr/include/solv/poolid.h
+#usr/include/solv/pooltypes.h
+#usr/include/solv/poolvendor.h
+#usr/include/solv/problems.h
+#usr/include/solv/queue.h
+#usr/include/solv/repo.h
+#usr/include/solv/repo_content.h
+#usr/include/solv/repo_deb.h
+#usr/include/solv/repo_deltainfoxml.h
+#usr/include/solv/repo_helix.h
+#usr/include/solv/repo_products.h
+#usr/include/solv/repo_releasefile_products.h
+#usr/include/solv/repo_repomdxml.h
+#usr/include/solv/repo_rpmdb.h
+#usr/include/solv/repo_rpmmd.h
+#usr/include/solv/repo_solv.h
+#usr/include/solv/repo_susetags.h
+#usr/include/solv/repo_updateinfoxml.h
+#usr/include/solv/repo_write.h
+#usr/include/solv/repo_zyppdb.h
+#usr/include/solv/repodata.h
+#usr/include/solv/repopage.h
+#usr/include/solv/rules.h
+#usr/include/solv/solv_xfopen.h
+#usr/include/solv/solvable.h
+#usr/include/solv/solver.h
+#usr/include/solv/solverdebug.h
+#usr/include/solv/solvversion.h
+#usr/include/solv/strpool.h
+#usr/include/solv/tools_util.h
+#usr/include/solv/transaction.h
+#usr/include/solv/util.h
+usr/lib/libsolv.so
+usr/lib/libsolv.so.0
+usr/lib/libsolvext.so
+usr/lib/libsolvext.so.0

diff --git a/config/rootfiles/packages/nagios_nrpe b/config/rootfiles/packages/nagios_nrpe
new file mode 100644 (file)
index 0000000..e499d6a
--- /dev/null
+++ b/config/rootfiles/packages/nagios_nrpe
@@ -0,0 +1,3 @@
+#root/.rnd
+usr/bin/nrpe
+usr/lib/nagios/check_nrpe

diff --git a/config/rootfiles/packages/pakfire3-deps b/config/rootfiles/packages/pakfire3-deps
new file mode 100644 (file)
index 0000000..464f5ca
--- /dev/null
+++ b/config/rootfiles/packages/pakfire3-deps
@@ -0,0 +1 @@
+var/ipfire/pakfire3-deps

diff --git a/config/rootfiles/packages/python-distutils b/config/rootfiles/packages/python-distutils
new file mode 100644 (file)
index 0000000..3c04b89
--- /dev/null
+++ b/config/rootfiles/packages/python-distutils
@@ -0,0 +1,293 @@
+#usr/lib/python2.7/distutils
+#usr/lib/python2.7/distutils/README
+usr/lib/python2.7/distutils/__init__.py
+usr/lib/python2.7/distutils/__init__.pyc
+#usr/lib/python2.7/distutils/__init__.pyo
+usr/lib/python2.7/distutils/archive_util.py
+usr/lib/python2.7/distutils/archive_util.pyc
+#usr/lib/python2.7/distutils/archive_util.pyo
+usr/lib/python2.7/distutils/bcppcompiler.py
+usr/lib/python2.7/distutils/bcppcompiler.pyc
+#usr/lib/python2.7/distutils/bcppcompiler.pyo
+usr/lib/python2.7/distutils/ccompiler.py
+usr/lib/python2.7/distutils/ccompiler.pyc
+#usr/lib/python2.7/distutils/ccompiler.pyo
+usr/lib/python2.7/distutils/cmd.py
+usr/lib/python2.7/distutils/cmd.pyc
+#usr/lib/python2.7/distutils/cmd.pyo
+#usr/lib/python2.7/distutils/command
+usr/lib/python2.7/distutils/command/__init__.py
+usr/lib/python2.7/distutils/command/__init__.pyc
+#usr/lib/python2.7/distutils/command/__init__.pyo
+usr/lib/python2.7/distutils/command/bdist.py
+usr/lib/python2.7/distutils/command/bdist.pyc
+#usr/lib/python2.7/distutils/command/bdist.pyo
+usr/lib/python2.7/distutils/command/bdist_dumb.py
+usr/lib/python2.7/distutils/command/bdist_dumb.pyc
+#usr/lib/python2.7/distutils/command/bdist_dumb.pyo
+usr/lib/python2.7/distutils/command/bdist_msi.py
+usr/lib/python2.7/distutils/command/bdist_msi.pyc
+#usr/lib/python2.7/distutils/command/bdist_msi.pyo
+usr/lib/python2.7/distutils/command/bdist_rpm.py
+usr/lib/python2.7/distutils/command/bdist_rpm.pyc
+#usr/lib/python2.7/distutils/command/bdist_rpm.pyo
+usr/lib/python2.7/distutils/command/bdist_wininst.py
+usr/lib/python2.7/distutils/command/bdist_wininst.pyc
+#usr/lib/python2.7/distutils/command/bdist_wininst.pyo
+usr/lib/python2.7/distutils/command/build.py
+usr/lib/python2.7/distutils/command/build.pyc
+#usr/lib/python2.7/distutils/command/build.pyo
+usr/lib/python2.7/distutils/command/build_clib.py
+usr/lib/python2.7/distutils/command/build_clib.pyc
+#usr/lib/python2.7/distutils/command/build_clib.pyo
+usr/lib/python2.7/distutils/command/build_ext.py
+usr/lib/python2.7/distutils/command/build_ext.pyc
+#usr/lib/python2.7/distutils/command/build_ext.pyo
+usr/lib/python2.7/distutils/command/build_py.py
+usr/lib/python2.7/distutils/command/build_py.pyc
+#usr/lib/python2.7/distutils/command/build_py.pyo
+usr/lib/python2.7/distutils/command/build_scripts.py
+usr/lib/python2.7/distutils/command/build_scripts.pyc
+#usr/lib/python2.7/distutils/command/build_scripts.pyo
+usr/lib/python2.7/distutils/command/check.py
+usr/lib/python2.7/distutils/command/check.pyc
+#usr/lib/python2.7/distutils/command/check.pyo
+usr/lib/python2.7/distutils/command/clean.py
+usr/lib/python2.7/distutils/command/clean.pyc
+#usr/lib/python2.7/distutils/command/clean.pyo
+#usr/lib/python2.7/distutils/command/command_template
+usr/lib/python2.7/distutils/command/config.py
+usr/lib/python2.7/distutils/command/config.pyc
+#usr/lib/python2.7/distutils/command/config.pyo
+usr/lib/python2.7/distutils/command/install.py
+usr/lib/python2.7/distutils/command/install.pyc
+#usr/lib/python2.7/distutils/command/install.pyo
+usr/lib/python2.7/distutils/command/install_data.py
+usr/lib/python2.7/distutils/command/install_data.pyc
+#usr/lib/python2.7/distutils/command/install_data.pyo
+usr/lib/python2.7/distutils/command/install_egg_info.py
+usr/lib/python2.7/distutils/command/install_egg_info.pyc
+#usr/lib/python2.7/distutils/command/install_egg_info.pyo
+usr/lib/python2.7/distutils/command/install_headers.py
+usr/lib/python2.7/distutils/command/install_headers.pyc
+#usr/lib/python2.7/distutils/command/install_headers.pyo
+usr/lib/python2.7/distutils/command/install_lib.py
+usr/lib/python2.7/distutils/command/install_lib.pyc
+#usr/lib/python2.7/distutils/command/install_lib.pyo
+usr/lib/python2.7/distutils/command/install_scripts.py
+usr/lib/python2.7/distutils/command/install_scripts.pyc
+#usr/lib/python2.7/distutils/command/install_scripts.pyo
+usr/lib/python2.7/distutils/command/register.py
+usr/lib/python2.7/distutils/command/register.pyc
+#usr/lib/python2.7/distutils/command/register.pyo
+usr/lib/python2.7/distutils/command/sdist.py
+usr/lib/python2.7/distutils/command/sdist.pyc
+#usr/lib/python2.7/distutils/command/sdist.pyo
+usr/lib/python2.7/distutils/command/upload.py
+usr/lib/python2.7/distutils/command/upload.pyc
+#usr/lib/python2.7/distutils/command/upload.pyo
+usr/lib/python2.7/distutils/command/wininst-6.0.exe
+usr/lib/python2.7/distutils/command/wininst-7.1.exe
+usr/lib/python2.7/distutils/command/wininst-8.0.exe
+usr/lib/python2.7/distutils/command/wininst-9.0-amd64.exe
+usr/lib/python2.7/distutils/command/wininst-9.0.exe
+usr/lib/python2.7/distutils/config.py
+usr/lib/python2.7/distutils/config.pyc
+#usr/lib/python2.7/distutils/config.pyo
+usr/lib/python2.7/distutils/core.py
+usr/lib/python2.7/distutils/core.pyc
+#usr/lib/python2.7/distutils/core.pyo
+usr/lib/python2.7/distutils/cygwinccompiler.py
+usr/lib/python2.7/distutils/cygwinccompiler.pyc
+#usr/lib/python2.7/distutils/cygwinccompiler.pyo
+usr/lib/python2.7/distutils/debug.py
+usr/lib/python2.7/distutils/debug.pyc
+#usr/lib/python2.7/distutils/debug.pyo
+usr/lib/python2.7/distutils/dep_util.py
+usr/lib/python2.7/distutils/dep_util.pyc
+#usr/lib/python2.7/distutils/dep_util.pyo
+usr/lib/python2.7/distutils/dir_util.py
+usr/lib/python2.7/distutils/dir_util.pyc
+#usr/lib/python2.7/distutils/dir_util.pyo
+usr/lib/python2.7/distutils/dist.py
+usr/lib/python2.7/distutils/dist.pyc
+#usr/lib/python2.7/distutils/dist.pyo
+usr/lib/python2.7/distutils/emxccompiler.py
+usr/lib/python2.7/distutils/emxccompiler.pyc
+#usr/lib/python2.7/distutils/emxccompiler.pyo
+usr/lib/python2.7/distutils/errors.py
+usr/lib/python2.7/distutils/errors.pyc
+#usr/lib/python2.7/distutils/errors.pyo
+usr/lib/python2.7/distutils/extension.py
+usr/lib/python2.7/distutils/extension.pyc
+#usr/lib/python2.7/distutils/extension.pyo
+usr/lib/python2.7/distutils/fancy_getopt.py
+usr/lib/python2.7/distutils/fancy_getopt.pyc
+#usr/lib/python2.7/distutils/fancy_getopt.pyo
+usr/lib/python2.7/distutils/file_util.py
+usr/lib/python2.7/distutils/file_util.pyc
+#usr/lib/python2.7/distutils/file_util.pyo
+usr/lib/python2.7/distutils/filelist.py
+usr/lib/python2.7/distutils/filelist.pyc
+#usr/lib/python2.7/distutils/filelist.pyo
+usr/lib/python2.7/distutils/log.py
+usr/lib/python2.7/distutils/log.pyc
+#usr/lib/python2.7/distutils/log.pyo
+usr/lib/python2.7/distutils/msvc9compiler.py
+usr/lib/python2.7/distutils/msvc9compiler.pyc
+#usr/lib/python2.7/distutils/msvc9compiler.pyo
+usr/lib/python2.7/distutils/msvccompiler.py
+usr/lib/python2.7/distutils/msvccompiler.pyc
+#usr/lib/python2.7/distutils/msvccompiler.pyo
+usr/lib/python2.7/distutils/spawn.py
+usr/lib/python2.7/distutils/spawn.pyc
+#usr/lib/python2.7/distutils/spawn.pyo
+usr/lib/python2.7/distutils/sysconfig.py
+usr/lib/python2.7/distutils/sysconfig.pyc
+#usr/lib/python2.7/distutils/sysconfig.pyo
+#usr/lib/python2.7/distutils/tests
+#usr/lib/python2.7/distutils/tests/Setup.sample
+#usr/lib/python2.7/distutils/tests/__init__.py
+#usr/lib/python2.7/distutils/tests/__init__.pyc
+#usr/lib/python2.7/distutils/tests/__init__.pyo
+#usr/lib/python2.7/distutils/tests/setuptools_build_ext.py
+#usr/lib/python2.7/distutils/tests/setuptools_build_ext.pyc
+#usr/lib/python2.7/distutils/tests/setuptools_build_ext.pyo
+#usr/lib/python2.7/distutils/tests/setuptools_extension.py
+#usr/lib/python2.7/distutils/tests/setuptools_extension.pyc
+#usr/lib/python2.7/distutils/tests/setuptools_extension.pyo
+#usr/lib/python2.7/distutils/tests/support.py
+#usr/lib/python2.7/distutils/tests/support.pyc
+#usr/lib/python2.7/distutils/tests/support.pyo
+#usr/lib/python2.7/distutils/tests/test_archive_util.py
+#usr/lib/python2.7/distutils/tests/test_archive_util.pyc
+#usr/lib/python2.7/distutils/tests/test_archive_util.pyo
+#usr/lib/python2.7/distutils/tests/test_bdist.py
+#usr/lib/python2.7/distutils/tests/test_bdist.pyc
+#usr/lib/python2.7/distutils/tests/test_bdist.pyo
+#usr/lib/python2.7/distutils/tests/test_bdist_dumb.py
+#usr/lib/python2.7/distutils/tests/test_bdist_dumb.pyc
+#usr/lib/python2.7/distutils/tests/test_bdist_dumb.pyo
+#usr/lib/python2.7/distutils/tests/test_bdist_msi.py
+#usr/lib/python2.7/distutils/tests/test_bdist_msi.pyc
+#usr/lib/python2.7/distutils/tests/test_bdist_msi.pyo
+#usr/lib/python2.7/distutils/tests/test_bdist_rpm.py
+#usr/lib/python2.7/distutils/tests/test_bdist_rpm.pyc
+#usr/lib/python2.7/distutils/tests/test_bdist_rpm.pyo
+#usr/lib/python2.7/distutils/tests/test_bdist_wininst.py
+#usr/lib/python2.7/distutils/tests/test_bdist_wininst.pyc
+#usr/lib/python2.7/distutils/tests/test_bdist_wininst.pyo
+#usr/lib/python2.7/distutils/tests/test_build.py
+#usr/lib/python2.7/distutils/tests/test_build.pyc
+#usr/lib/python2.7/distutils/tests/test_build.pyo
+#usr/lib/python2.7/distutils/tests/test_build_clib.py
+#usr/lib/python2.7/distutils/tests/test_build_clib.pyc
+#usr/lib/python2.7/distutils/tests/test_build_clib.pyo
+#usr/lib/python2.7/distutils/tests/test_build_ext.py
+#usr/lib/python2.7/distutils/tests/test_build_ext.pyc
+#usr/lib/python2.7/distutils/tests/test_build_ext.pyo
+#usr/lib/python2.7/distutils/tests/test_build_py.py
+#usr/lib/python2.7/distutils/tests/test_build_py.pyc
+#usr/lib/python2.7/distutils/tests/test_build_py.pyo
+#usr/lib/python2.7/distutils/tests/test_build_scripts.py
+#usr/lib/python2.7/distutils/tests/test_build_scripts.pyc
+#usr/lib/python2.7/distutils/tests/test_build_scripts.pyo
+#usr/lib/python2.7/distutils/tests/test_ccompiler.py
+#usr/lib/python2.7/distutils/tests/test_ccompiler.pyc
+#usr/lib/python2.7/distutils/tests/test_ccompiler.pyo
+#usr/lib/python2.7/distutils/tests/test_check.py
+#usr/lib/python2.7/distutils/tests/test_check.pyc
+#usr/lib/python2.7/distutils/tests/test_check.pyo
+#usr/lib/python2.7/distutils/tests/test_clean.py
+#usr/lib/python2.7/distutils/tests/test_clean.pyc
+#usr/lib/python2.7/distutils/tests/test_clean.pyo
+#usr/lib/python2.7/distutils/tests/test_cmd.py
+#usr/lib/python2.7/distutils/tests/test_cmd.pyc
+#usr/lib/python2.7/distutils/tests/test_cmd.pyo
+#usr/lib/python2.7/distutils/tests/test_config.py
+#usr/lib/python2.7/distutils/tests/test_config.pyc
+#usr/lib/python2.7/distutils/tests/test_config.pyo
+#usr/lib/python2.7/distutils/tests/test_config_cmd.py
+#usr/lib/python2.7/distutils/tests/test_config_cmd.pyc
+#usr/lib/python2.7/distutils/tests/test_config_cmd.pyo
+#usr/lib/python2.7/distutils/tests/test_core.py
+#usr/lib/python2.7/distutils/tests/test_core.pyc
+#usr/lib/python2.7/distutils/tests/test_core.pyo
+#usr/lib/python2.7/distutils/tests/test_dep_util.py
+#usr/lib/python2.7/distutils/tests/test_dep_util.pyc
+#usr/lib/python2.7/distutils/tests/test_dep_util.pyo
+#usr/lib/python2.7/distutils/tests/test_dir_util.py
+#usr/lib/python2.7/distutils/tests/test_dir_util.pyc
+#usr/lib/python2.7/distutils/tests/test_dir_util.pyo
+#usr/lib/python2.7/distutils/tests/test_dist.py
+#usr/lib/python2.7/distutils/tests/test_dist.pyc
+#usr/lib/python2.7/distutils/tests/test_dist.pyo
+#usr/lib/python2.7/distutils/tests/test_file_util.py
+#usr/lib/python2.7/distutils/tests/test_file_util.pyc
+#usr/lib/python2.7/distutils/tests/test_file_util.pyo
+#usr/lib/python2.7/distutils/tests/test_filelist.py
+#usr/lib/python2.7/distutils/tests/test_filelist.pyc
+#usr/lib/python2.7/distutils/tests/test_filelist.pyo
+#usr/lib/python2.7/distutils/tests/test_install.py
+#usr/lib/python2.7/distutils/tests/test_install.pyc
+#usr/lib/python2.7/distutils/tests/test_install.pyo
+#usr/lib/python2.7/distutils/tests/test_install_data.py
+#usr/lib/python2.7/distutils/tests/test_install_data.pyc
+#usr/lib/python2.7/distutils/tests/test_install_data.pyo
+#usr/lib/python2.7/distutils/tests/test_install_headers.py
+#usr/lib/python2.7/distutils/tests/test_install_headers.pyc
+#usr/lib/python2.7/distutils/tests/test_install_headers.pyo
+#usr/lib/python2.7/distutils/tests/test_install_lib.py
+#usr/lib/python2.7/distutils/tests/test_install_lib.pyc
+#usr/lib/python2.7/distutils/tests/test_install_lib.pyo
+#usr/lib/python2.7/distutils/tests/test_install_scripts.py
+#usr/lib/python2.7/distutils/tests/test_install_scripts.pyc
+#usr/lib/python2.7/distutils/tests/test_install_scripts.pyo
+#usr/lib/python2.7/distutils/tests/test_msvc9compiler.py
+#usr/lib/python2.7/distutils/tests/test_msvc9compiler.pyc
+#usr/lib/python2.7/distutils/tests/test_msvc9compiler.pyo
+#usr/lib/python2.7/distutils/tests/test_register.py
+#usr/lib/python2.7/distutils/tests/test_register.pyc
+#usr/lib/python2.7/distutils/tests/test_register.pyo
+#usr/lib/python2.7/distutils/tests/test_sdist.py
+#usr/lib/python2.7/distutils/tests/test_sdist.pyc
+#usr/lib/python2.7/distutils/tests/test_sdist.pyo
+#usr/lib/python2.7/distutils/tests/test_spawn.py
+#usr/lib/python2.7/distutils/tests/test_spawn.pyc
+#usr/lib/python2.7/distutils/tests/test_spawn.pyo
+#usr/lib/python2.7/distutils/tests/test_sysconfig.py
+#usr/lib/python2.7/distutils/tests/test_sysconfig.pyc
+#usr/lib/python2.7/distutils/tests/test_sysconfig.pyo
+#usr/lib/python2.7/distutils/tests/test_text_file.py
+#usr/lib/python2.7/distutils/tests/test_text_file.pyc
+#usr/lib/python2.7/distutils/tests/test_text_file.pyo
+#usr/lib/python2.7/distutils/tests/test_unixccompiler.py
+#usr/lib/python2.7/distutils/tests/test_unixccompiler.pyc
+#usr/lib/python2.7/distutils/tests/test_unixccompiler.pyo
+#usr/lib/python2.7/distutils/tests/test_upload.py
+#usr/lib/python2.7/distutils/tests/test_upload.pyc
+#usr/lib/python2.7/distutils/tests/test_upload.pyo
+#usr/lib/python2.7/distutils/tests/test_util.py
+#usr/lib/python2.7/distutils/tests/test_util.pyc
+#usr/lib/python2.7/distutils/tests/test_util.pyo
+#usr/lib/python2.7/distutils/tests/test_version.py
+#usr/lib/python2.7/distutils/tests/test_version.pyc
+#usr/lib/python2.7/distutils/tests/test_version.pyo
+#usr/lib/python2.7/distutils/tests/test_versionpredicate.py
+#usr/lib/python2.7/distutils/tests/test_versionpredicate.pyc
+#usr/lib/python2.7/distutils/tests/test_versionpredicate.pyo
+usr/lib/python2.7/distutils/text_file.py
+usr/lib/python2.7/distutils/text_file.pyc
+#usr/lib/python2.7/distutils/text_file.pyo
+usr/lib/python2.7/distutils/unixccompiler.py
+usr/lib/python2.7/distutils/unixccompiler.pyc
+#usr/lib/python2.7/distutils/unixccompiler.pyo
+usr/lib/python2.7/distutils/util.py
+usr/lib/python2.7/distutils/util.pyc
+#usr/lib/python2.7/distutils/util.pyo
+usr/lib/python2.7/distutils/version.py
+usr/lib/python2.7/distutils/version.pyc
+#usr/lib/python2.7/distutils/version.pyo
+usr/lib/python2.7/distutils/versionpredicate.py
+usr/lib/python2.7/distutils/versionpredicate.pyc
+#usr/lib/python2.7/distutils/versionpredicate.pyo

diff --git a/config/rootfiles/packages/python-distutils-extra b/config/rootfiles/packages/python-distutils-extra
new file mode 100644 (file)
index 0000000..1f0ddbe
--- /dev/null
+++ b/config/rootfiles/packages/python-distutils-extra
@@ -0,0 +1,20 @@
+#usr/lib/python2.7/site-packages/DistUtilsExtra
+usr/lib/python2.7/site-packages/DistUtilsExtra/__init__.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/__init__.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/auto.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/auto.pyc
+#usr/lib/python2.7/site-packages/DistUtilsExtra/command
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/__init__.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/__init__.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_extra.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_extra.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_help.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_help.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_i18n.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_i18n.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_icons.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_icons.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/clean_i18n.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/clean_i18n.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/pylint.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/pylint.pyc

diff --git a/config/rootfiles/packages/python-lzma b/config/rootfiles/packages/python-lzma
new file mode 100644 (file)
index 0000000..21f647e
--- /dev/null
+++ b/config/rootfiles/packages/python-lzma
@@ -0,0 +1,5 @@
+usr/lib/python2.7/site-packages/liblzma.py
+usr/lib/python2.7/site-packages/liblzma.pyc
+usr/lib/python2.7/site-packages/lzma.py
+usr/lib/python2.7/site-packages/lzma.pyc
+usr/lib/python2.7/site-packages/lzma.so

diff --git a/config/rootfiles/packages/python-progressbar b/config/rootfiles/packages/python-progressbar
new file mode 100644 (file)
index 0000000..453f51d
--- /dev/null
+++ b/config/rootfiles/packages/python-progressbar
@@ -0,0 +1,3 @@
+usr/lib/python2.7/site-packages/progressbar-2.2-py2.7.egg-info
+usr/lib/python2.7/site-packages/progressbar.py
+usr/lib/python2.7/site-packages/progressbar.pyc

diff --git a/config/rootfiles/packages/python-satsolver b/config/rootfiles/packages/python-satsolver
deleted file mode 100644 (file)
index 6b5e576..0000000
--- a/config/rootfiles/packages/python-satsolver
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/python2.7/site-packages/_satsolver.so
-usr/lib/python2.7/site-packages/satsolver.py

diff --git a/config/rootfiles/packages/python-xattr b/config/rootfiles/packages/python-xattr
new file mode 100644 (file)
index 0000000..747ff5c
--- /dev/null
+++ b/config/rootfiles/packages/python-xattr
@@ -0,0 +1,2 @@
+usr/lib/python2.7/site-packages/pyxattr-0.5.0-py2.7.egg-info
+usr/lib/python2.7/site-packages/xattr.so

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index 27d82a31f768e7cb530509924df8f16618162285..50620663a059e9de2d0e63f90798c5d8b6c0a292 100644 (file)
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -1,11 +1,22 @@
+#etc/qemu
+etc/qemu/target-x86_64.conf
 usr/bin/qemu
+usr/bin/qemu-ga
 usr/bin/qemu-i386
 usr/bin/qemu-img
 usr/bin/qemu-io
 usr/bin/qemu-nbd
+usr/bin/qemu-system-arm
+#usr/share/doc/qemu
+#usr/share/doc/qemu/qemu-doc.html
+#usr/share/doc/qemu/qemu-tech.html
+#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/bamboo.dtb
 usr/share/qemu/bios.bin
+usr/share/qemu/extboot.bin
 usr/share/qemu/keymaps
 usr/share/qemu/keymaps/ar
 usr/share/qemu/keymaps/common
@@ -43,18 +54,26 @@ usr/share/qemu/keymaps/sv
 usr/share/qemu/keymaps/th
 usr/share/qemu/keymaps/tr
 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/petalogix-ml605.dtb
 usr/share/qemu/petalogix-s3adsp1800.dtb
 usr/share/qemu/ppc_rom.bin
-usr/share/qemu/pxe-e1000.bin
-usr/share/qemu/pxe-i82559er.bin
-usr/share/qemu/pxe-ne2k_pci.bin
-usr/share/qemu/pxe-pcnet.bin
-usr/share/qemu/pxe-rtl8139.bin
-usr/share/qemu/pxe-virtio.bin
+usr/share/qemu/pxe-e1000.rom
+usr/share/qemu/pxe-eepro100.rom
+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/s390-zipl.rom
+usr/share/qemu/slof.bin
+usr/share/qemu/spapr-rtas.bin
+usr/share/qemu/vapic.bin
 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/share/qemu/video.x

diff --git a/config/rootfiles/packages/sane b/config/rootfiles/packages/sane
index 8e91815feecb7579f09d143215419e1ad8dfc236..411243e39c9c19f9290c51e00465b08990376809 100644 (file)
--- a/config/rootfiles/packages/sane
+++ b/config/rootfiles/packages/sane
@@ -1,104 +1,6 @@
-usr/bin/gamma4scanimage
-usr/bin/sane-config
-usr/bin/sane-find-scanner
-usr/bin/scanimage
-#usr/doc/sane-1.0.19
-usr/doc/sane-1.0.19/AUTHORS
-usr/doc/sane-1.0.19/COPYING
-usr/doc/sane-1.0.19/ChangeLog
-usr/doc/sane-1.0.19/LICENSE
-usr/doc/sane-1.0.19/NEWS
-usr/doc/sane-1.0.19/PROBLEMS
-usr/doc/sane-1.0.19/PROJECTS
-usr/doc/sane-1.0.19/README
-#usr/doc/sane-1.0.19/README.aix
-#usr/doc/sane-1.0.19/README.beos
-#usr/doc/sane-1.0.19/README.darwin
-#usr/doc/sane-1.0.19/README.djpeg
-#usr/doc/sane-1.0.19/README.freebsd
-#usr/doc/sane-1.0.19/README.hp-ux
-usr/doc/sane-1.0.19/README.linux
-#usr/doc/sane-1.0.19/README.netbsd
-#usr/doc/sane-1.0.19/README.openbsd
-#usr/doc/sane-1.0.19/README.os2
-#usr/doc/sane-1.0.19/README.solaris
-#usr/doc/sane-1.0.19/README.unixware2
-#usr/doc/sane-1.0.19/README.unixware7
-usr/doc/sane-1.0.19/README.windows
-#usr/doc/sane-1.0.19/README.zeta
-usr/doc/sane-1.0.19/backend-writing.txt
-#usr/doc/sane-1.0.19/canon
-usr/doc/sane-1.0.19/canon/canon.changes
-usr/doc/sane-1.0.19/canon/canon.install2700F.txt
-#usr/doc/sane-1.0.19/gt68xx
-usr/doc/sane-1.0.19/gt68xx/gt68xx.CHANGES
-usr/doc/sane-1.0.19/gt68xx/gt68xx.TODO
-#usr/doc/sane-1.0.19/leo
-usr/doc/sane-1.0.19/leo/leo.txt
-#usr/doc/sane-1.0.19/matsushita
-usr/doc/sane-1.0.19/matsushita/matsushita.txt
-#usr/doc/sane-1.0.19/mustek
-usr/doc/sane-1.0.19/mustek/mustek.CHANGES
-#usr/doc/sane-1.0.19/mustek_usb
-usr/doc/sane-1.0.19/mustek_usb/mustek_usb.CHANGES
-usr/doc/sane-1.0.19/mustek_usb/mustek_usb.TODO
-#usr/doc/sane-1.0.19/mustek_usb2
-usr/doc/sane-1.0.19/mustek_usb2/mustek_usb2.CHANGES
-usr/doc/sane-1.0.19/mustek_usb2/mustek_usb2.TODO
-#usr/doc/sane-1.0.19/niash
-usr/doc/sane-1.0.19/niash/niash.TODO
-#usr/doc/sane-1.0.19/plustek
-usr/doc/sane-1.0.19/plustek/FAQ
-usr/doc/sane-1.0.19/plustek/MakeModule.sh
-#usr/doc/sane-1.0.19/plustek/Makefile.kernel24
-usr/doc/sane-1.0.19/plustek/Makefile.kernel26
-usr/doc/sane-1.0.19/plustek/Plustek-PARPORT-TODO.txt
-usr/doc/sane-1.0.19/plustek/Plustek-PARPORT.changes
-usr/doc/sane-1.0.19/plustek/Plustek-PARPORT.txt
-usr/doc/sane-1.0.19/plustek/Plustek-USB-TODO.txt
-usr/doc/sane-1.0.19/plustek/Plustek-USB.changes
-usr/doc/sane-1.0.19/plustek/Plustek-USB.txt
-usr/doc/sane-1.0.19/sane-backends-external.html
-usr/doc/sane-1.0.19/sane-backends.html
-usr/doc/sane-1.0.19/sane-mfgs-external.html
-usr/doc/sane-1.0.19/sane-mfgs.html
-#usr/doc/sane-1.0.19/sceptre
-usr/doc/sane-1.0.19/sceptre/s1200.txt
-#usr/doc/sane-1.0.19/teco
-usr/doc/sane-1.0.19/teco/teco1.txt
-usr/doc/sane-1.0.19/teco/teco2.txt
-usr/doc/sane-1.0.19/teco/teco3.txt
-#usr/doc/sane-1.0.19/u12
-usr/doc/sane-1.0.19/u12/U12.changes
-usr/doc/sane-1.0.19/u12/U12.todo
-#usr/doc/sane-1.0.19/umax
-usr/doc/sane-1.0.19/umax/negative-types.txt
-usr/doc/sane-1.0.19/umax/sane-logo.jpg
-usr/doc/sane-1.0.19/umax/sane-umax-advanced-options-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax-advanced.jpg
-usr/doc/sane-1.0.19/umax/sane-umax-astra-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax-config-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax-histogram.jpg
-usr/doc/sane-1.0.19/umax/sane-umax-mirage-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax-not-listed-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax-others-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax-parport-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax-powerlook-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax-scanner-clones-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax-speed-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax-standard-options-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax-standard.jpg
-usr/doc/sane-1.0.19/umax/sane-umax-text.jpg
-usr/doc/sane-1.0.19/umax/sane-umax-text2.jpg
-usr/doc/sane-1.0.19/umax/sane-umax-text4.jpg
-usr/doc/sane-1.0.19/umax/sane-umax-uc-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax-vista-doc.html
-usr/doc/sane-1.0.19/umax/sane-umax.jpg
-usr/doc/sane-1.0.19/umax/umax.BUGS
-usr/doc/sane-1.0.19/umax/umax.CHANGES
-usr/doc/sane-1.0.19/umax/umax.FAQ
-usr/doc/sane-1.0.19/umax/umax.TODO
+etc/rc.d/rc0.d/K10sane
+etc/rc.d/rc3.d/S95sane
+etc/rc.d/rc6.d/K10sane
 #etc/sane.d
 etc/sane.d/abaton.conf
 etc/sane.d/agfafocus.conf
@@ -109,14 +11,17 @@ etc/sane.d/avision.conf
 etc/sane.d/bh.conf
 etc/sane.d/canon.conf
 etc/sane.d/canon630u.conf
+etc/sane.d/canon_dr.conf
 etc/sane.d/cardscan.conf
 etc/sane.d/coolscan.conf
 etc/sane.d/coolscan2.conf
+etc/sane.d/coolscan3.conf
 etc/sane.d/dc210.conf
 etc/sane.d/dc240.conf
 etc/sane.d/dc25.conf
 etc/sane.d/dell1600n_net.conf
 etc/sane.d/dll.conf
+etc/sane.d/dll.d
 etc/sane.d/dmc.conf
 etc/sane.d/epjitsu.conf
 etc/sane.d/epson.conf
@@ -130,21 +35,27 @@ etc/sane.d/hp4200.conf
 etc/sane.d/hp5400.conf
 etc/sane.d/hs2p.conf
 etc/sane.d/ibm.conf
+etc/sane.d/kodak.conf
 etc/sane.d/leo.conf
 etc/sane.d/lexmark.conf
 etc/sane.d/ma1509.conf
+etc/sane.d/magicolor.conf
 etc/sane.d/matsushita.conf
 etc/sane.d/microtek.conf
 etc/sane.d/microtek2.conf
 etc/sane.d/mustek.conf
+etc/sane.d/mustek_pp.conf
 etc/sane.d/mustek_usb.conf
 etc/sane.d/nec.conf
 etc/sane.d/net.conf
+etc/sane.d/p5.conf
 etc/sane.d/pie.conf
+etc/sane.d/pixma.conf
 etc/sane.d/plustek.conf
 etc/sane.d/plustek_pp.conf
 etc/sane.d/qcam.conf
 etc/sane.d/ricoh.conf
+etc/sane.d/rts8891.conf
 etc/sane.d/s9036.conf
 etc/sane.d/saned.conf
 etc/sane.d/sceptre.conf
@@ -163,414 +74,546 @@ etc/sane.d/u12.conf
 etc/sane.d/umax.conf
 etc/sane.d/umax1220u.conf
 etc/sane.d/umax_pp.conf
-etc/sane.d/v4l.conf
+etc/sane.d/xerox_mfp.conf
+usr/bin/gamma4scanimage
+usr/bin/sane-config
+usr/bin/sane-find-scanner
+usr/bin/scanimage
+usr/doc/sane-1.0.22
+usr/doc/sane-1.0.22/AUTHORS
+usr/doc/sane-1.0.22/COPYING
+usr/doc/sane-1.0.22/ChangeLog
+usr/doc/sane-1.0.22/LICENSE
+usr/doc/sane-1.0.22/NEWS
+usr/doc/sane-1.0.22/PROBLEMS
+usr/doc/sane-1.0.22/PROJECTS
+usr/doc/sane-1.0.22/README
+#usr/doc/sane-1.0.22/README.aix
+#usr/doc/sane-1.0.22/README.beos
+#usr/doc/sane-1.0.22/README.darwin
+usr/doc/sane-1.0.22/README.djpeg
+#usr/doc/sane-1.0.22/README.freebsd
+#usr/doc/sane-1.0.22/README.hp-ux
+usr/doc/sane-1.0.22/README.linux
+#usr/doc/sane-1.0.22/README.netbsd
+#usr/doc/sane-1.0.22/README.openbsd
+#usr/doc/sane-1.0.22/README.os2
+#usr/doc/sane-1.0.22/README.solaris
+#usr/doc/sane-1.0.22/README.unixware2
+#usr/doc/sane-1.0.22/README.unixware7
+#usr/doc/sane-1.0.22/README.windows
+#usr/doc/sane-1.0.22/README.zeta
+#usr/doc/sane-1.0.22/backend-writing.txt
+usr/doc/sane-1.0.22/canon
+usr/doc/sane-1.0.22/canon/canon.changes
+usr/doc/sane-1.0.22/canon/canon.install2700F.txt
+#usr/doc/sane-1.0.22/gt68xx
+usr/doc/sane-1.0.22/gt68xx/gt68xx.CHANGES
+usr/doc/sane-1.0.22/gt68xx/gt68xx.TODO
+#usr/doc/sane-1.0.22/leo
+usr/doc/sane-1.0.22/leo/leo.txt
+#usr/doc/sane-1.0.22/matsushita
+usr/doc/sane-1.0.22/matsushita/matsushita.txt
+#usr/doc/sane-1.0.22/mustek
+usr/doc/sane-1.0.22/mustek/mustek.CHANGES
+#usr/doc/sane-1.0.22/mustek_usb
+usr/doc/sane-1.0.22/mustek_usb/mustek_usb.CHANGES
+usr/doc/sane-1.0.22/mustek_usb/mustek_usb.TODO
+#usr/doc/sane-1.0.22/mustek_usb2
+usr/doc/sane-1.0.22/mustek_usb2/mustek_usb2.CHANGES
+usr/doc/sane-1.0.22/mustek_usb2/mustek_usb2.TODO
+#usr/doc/sane-1.0.22/niash
+usr/doc/sane-1.0.22/niash/niash.TODO
+#usr/doc/sane-1.0.22/plustek
+usr/doc/sane-1.0.22/plustek/FAQ
+usr/doc/sane-1.0.22/plustek/MakeModule.sh
+#usr/doc/sane-1.0.22/plustek/Makefile.kernel24
+usr/doc/sane-1.0.22/plustek/Makefile.kernel26
+usr/doc/sane-1.0.22/plustek/Plustek-PARPORT-TODO.txt
+usr/doc/sane-1.0.22/plustek/Plustek-PARPORT.changes
+usr/doc/sane-1.0.22/plustek/Plustek-PARPORT.txt
+usr/doc/sane-1.0.22/plustek/Plustek-USB-TODO.txt
+usr/doc/sane-1.0.22/plustek/Plustek-USB.changes
+usr/doc/sane-1.0.22/plustek/Plustek-USB.txt
+usr/doc/sane-1.0.22/sane-backends-external.html
+usr/doc/sane-1.0.22/sane-backends.html
+usr/doc/sane-1.0.22/sane-mfgs-external.html
+usr/doc/sane-1.0.22/sane-mfgs.html
+#usr/doc/sane-1.0.22/sceptre
+usr/doc/sane-1.0.22/sceptre/s1200.txt
+#usr/doc/sane-1.0.22/teco
+usr/doc/sane-1.0.22/teco/teco1.txt
+usr/doc/sane-1.0.22/teco/teco2.txt
+usr/doc/sane-1.0.22/teco/teco3.txt
+#usr/doc/sane-1.0.22/u12
+usr/doc/sane-1.0.22/u12/U12.changes
+usr/doc/sane-1.0.22/u12/U12.todo
+#usr/doc/sane-1.0.22/umax
+usr/doc/sane-1.0.22/umax/negative-types.txt
+usr/doc/sane-1.0.22/umax/sane-logo.jpg
+usr/doc/sane-1.0.22/umax/sane-umax-advanced-options-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax-advanced.jpg
+usr/doc/sane-1.0.22/umax/sane-umax-astra-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax-config-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax-histogram.jpg
+usr/doc/sane-1.0.22/umax/sane-umax-mirage-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax-not-listed-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax-others-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax-parport-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax-powerlook-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax-scanner-clones-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax-speed-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax-standard-options-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax-standard.jpg
+usr/doc/sane-1.0.22/umax/sane-umax-text.jpg
+usr/doc/sane-1.0.22/umax/sane-umax-text2.jpg
+usr/doc/sane-1.0.22/umax/sane-umax-text4.jpg
+usr/doc/sane-1.0.22/umax/sane-umax-uc-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax-vista-doc.html
+usr/doc/sane-1.0.22/umax/sane-umax.jpg
+usr/doc/sane-1.0.22/umax/umax.BUGS
+usr/doc/sane-1.0.22/umax/umax.CHANGES
+usr/doc/sane-1.0.22/umax/umax.FAQ
+usr/doc/sane-1.0.22/umax/umax.TODO
 #usr/include/sane
 usr/include/sane/sane.h
 usr/include/sane/saneopts.h
-usr/lib/libsane.la
+#usr/lib/libsane.la
 usr/lib/libsane.so
 usr/lib/libsane.so.1
-usr/lib/libsane.so.1.0.19
+usr/lib/libsane.so.1.0.22
 #usr/lib/sane
 #usr/lib/sane/libsane-abaton.la
 usr/lib/sane/libsane-abaton.so
 usr/lib/sane/libsane-abaton.so.1
-usr/lib/sane/libsane-abaton.so.1.0.19
+usr/lib/sane/libsane-abaton.so.1.0.22
 #usr/lib/sane/libsane-agfafocus.la
 usr/lib/sane/libsane-agfafocus.so
 usr/lib/sane/libsane-agfafocus.so.1
-usr/lib/sane/libsane-agfafocus.so.1.0.19
+usr/lib/sane/libsane-agfafocus.so.1.0.22
 #usr/lib/sane/libsane-apple.la
 usr/lib/sane/libsane-apple.so
 usr/lib/sane/libsane-apple.so.1
-usr/lib/sane/libsane-apple.so.1.0.19
+usr/lib/sane/libsane-apple.so.1.0.22
 #usr/lib/sane/libsane-artec.la
 usr/lib/sane/libsane-artec.so
 usr/lib/sane/libsane-artec.so.1
-usr/lib/sane/libsane-artec.so.1.0.19
+usr/lib/sane/libsane-artec.so.1.0.22
 #usr/lib/sane/libsane-artec_eplus48u.la
 usr/lib/sane/libsane-artec_eplus48u.so
 usr/lib/sane/libsane-artec_eplus48u.so.1
-usr/lib/sane/libsane-artec_eplus48u.so.1.0.19
+usr/lib/sane/libsane-artec_eplus48u.so.1.0.22
 #usr/lib/sane/libsane-as6e.la
 usr/lib/sane/libsane-as6e.so
 usr/lib/sane/libsane-as6e.so.1
-usr/lib/sane/libsane-as6e.so.1.0.19
+usr/lib/sane/libsane-as6e.so.1.0.22
 #usr/lib/sane/libsane-avision.la
 usr/lib/sane/libsane-avision.so
 usr/lib/sane/libsane-avision.so.1
-usr/lib/sane/libsane-avision.so.1.0.19
+usr/lib/sane/libsane-avision.so.1.0.22
 #usr/lib/sane/libsane-bh.la
 usr/lib/sane/libsane-bh.so
 usr/lib/sane/libsane-bh.so.1
-usr/lib/sane/libsane-bh.so.1.0.19
+usr/lib/sane/libsane-bh.so.1.0.22
 #usr/lib/sane/libsane-canon.la
 usr/lib/sane/libsane-canon.so
 usr/lib/sane/libsane-canon.so.1
-usr/lib/sane/libsane-canon.so.1.0.19
+usr/lib/sane/libsane-canon.so.1.0.22
 #usr/lib/sane/libsane-canon630u.la
 usr/lib/sane/libsane-canon630u.so
 usr/lib/sane/libsane-canon630u.so.1
-usr/lib/sane/libsane-canon630u.so.1.0.19
+usr/lib/sane/libsane-canon630u.so.1.0.22
+#usr/lib/sane/libsane-canon_dr.la
+usr/lib/sane/libsane-canon_dr.so
+usr/lib/sane/libsane-canon_dr.so.1
+usr/lib/sane/libsane-canon_dr.so.1.0.22
 #usr/lib/sane/libsane-cardscan.la
 usr/lib/sane/libsane-cardscan.so
 usr/lib/sane/libsane-cardscan.so.1
-usr/lib/sane/libsane-cardscan.so.1.0.19
+usr/lib/sane/libsane-cardscan.so.1.0.22
 #usr/lib/sane/libsane-coolscan.la
 usr/lib/sane/libsane-coolscan.so
 usr/lib/sane/libsane-coolscan.so.1
-usr/lib/sane/libsane-coolscan.so.1.0.19
+usr/lib/sane/libsane-coolscan.so.1.0.22
 #usr/lib/sane/libsane-coolscan2.la
 usr/lib/sane/libsane-coolscan2.so
 usr/lib/sane/libsane-coolscan2.so.1
-usr/lib/sane/libsane-coolscan2.so.1.0.19
+usr/lib/sane/libsane-coolscan2.so.1.0.22
+#usr/lib/sane/libsane-coolscan3.la
+usr/lib/sane/libsane-coolscan3.so
+usr/lib/sane/libsane-coolscan3.so.1
+usr/lib/sane/libsane-coolscan3.so.1.0.22
 #usr/lib/sane/libsane-dc210.la
 usr/lib/sane/libsane-dc210.so
 usr/lib/sane/libsane-dc210.so.1
-usr/lib/sane/libsane-dc210.so.1.0.19
+usr/lib/sane/libsane-dc210.so.1.0.22
 #usr/lib/sane/libsane-dc240.la
 usr/lib/sane/libsane-dc240.so
 usr/lib/sane/libsane-dc240.so.1
-usr/lib/sane/libsane-dc240.so.1.0.19
+usr/lib/sane/libsane-dc240.so.1.0.22
 #usr/lib/sane/libsane-dc25.la
 usr/lib/sane/libsane-dc25.so
 usr/lib/sane/libsane-dc25.so.1
-usr/lib/sane/libsane-dc25.so.1.0.19
+usr/lib/sane/libsane-dc25.so.1.0.22
 #usr/lib/sane/libsane-dell1600n_net.la
 usr/lib/sane/libsane-dell1600n_net.so
 usr/lib/sane/libsane-dell1600n_net.so.1
-usr/lib/sane/libsane-dell1600n_net.so.1.0.19
+usr/lib/sane/libsane-dell1600n_net.so.1.0.22
 #usr/lib/sane/libsane-dll.la
 usr/lib/sane/libsane-dll.so
 usr/lib/sane/libsane-dll.so.1
-usr/lib/sane/libsane-dll.so.1.0.19
+usr/lib/sane/libsane-dll.so.1.0.22
 #usr/lib/sane/libsane-dmc.la
 usr/lib/sane/libsane-dmc.so
 usr/lib/sane/libsane-dmc.so.1
-usr/lib/sane/libsane-dmc.so.1.0.19
+usr/lib/sane/libsane-dmc.so.1.0.22
 #usr/lib/sane/libsane-epjitsu.la
 usr/lib/sane/libsane-epjitsu.so
 usr/lib/sane/libsane-epjitsu.so.1
-usr/lib/sane/libsane-epjitsu.so.1.0.19
+usr/lib/sane/libsane-epjitsu.so.1.0.22
 #usr/lib/sane/libsane-epson.la
 usr/lib/sane/libsane-epson.so
 usr/lib/sane/libsane-epson.so.1
-usr/lib/sane/libsane-epson.so.1.0.19
+usr/lib/sane/libsane-epson.so.1.0.22
 #usr/lib/sane/libsane-epson2.la
 usr/lib/sane/libsane-epson2.so
 usr/lib/sane/libsane-epson2.so.1
-usr/lib/sane/libsane-epson2.so.1.0.19
+usr/lib/sane/libsane-epson2.so.1.0.22
 #usr/lib/sane/libsane-fujitsu.la
 usr/lib/sane/libsane-fujitsu.so
 usr/lib/sane/libsane-fujitsu.so.1
-usr/lib/sane/libsane-fujitsu.so.1.0.19
+usr/lib/sane/libsane-fujitsu.so.1.0.22
 #usr/lib/sane/libsane-genesys.la
 usr/lib/sane/libsane-genesys.so
 usr/lib/sane/libsane-genesys.so.1
-usr/lib/sane/libsane-genesys.so.1.0.19
+usr/lib/sane/libsane-genesys.so.1.0.22
 #usr/lib/sane/libsane-gt68xx.la
 usr/lib/sane/libsane-gt68xx.so
 usr/lib/sane/libsane-gt68xx.so.1
-usr/lib/sane/libsane-gt68xx.so.1.0.19
+usr/lib/sane/libsane-gt68xx.so.1.0.22
 #usr/lib/sane/libsane-hp.la
 usr/lib/sane/libsane-hp.so
 usr/lib/sane/libsane-hp.so.1
-usr/lib/sane/libsane-hp.so.1.0.19
+usr/lib/sane/libsane-hp.so.1.0.22
 #usr/lib/sane/libsane-hp3500.la
 usr/lib/sane/libsane-hp3500.so
 usr/lib/sane/libsane-hp3500.so.1
-usr/lib/sane/libsane-hp3500.so.1.0.19
+usr/lib/sane/libsane-hp3500.so.1.0.22
 #usr/lib/sane/libsane-hp3900.la
 usr/lib/sane/libsane-hp3900.so
 usr/lib/sane/libsane-hp3900.so.1
-usr/lib/sane/libsane-hp3900.so.1.0.19
+usr/lib/sane/libsane-hp3900.so.1.0.22
 #usr/lib/sane/libsane-hp4200.la
 usr/lib/sane/libsane-hp4200.so
 usr/lib/sane/libsane-hp4200.so.1
-usr/lib/sane/libsane-hp4200.so.1.0.19
+usr/lib/sane/libsane-hp4200.so.1.0.22
 #usr/lib/sane/libsane-hp5400.la
 usr/lib/sane/libsane-hp5400.so
 usr/lib/sane/libsane-hp5400.so.1
-usr/lib/sane/libsane-hp5400.so.1.0.19
+usr/lib/sane/libsane-hp5400.so.1.0.22
 #usr/lib/sane/libsane-hp5590.la
 usr/lib/sane/libsane-hp5590.so
 usr/lib/sane/libsane-hp5590.so.1
-usr/lib/sane/libsane-hp5590.so.1.0.19
+usr/lib/sane/libsane-hp5590.so.1.0.22
 #usr/lib/sane/libsane-hpljm1005.la
 usr/lib/sane/libsane-hpljm1005.so
 usr/lib/sane/libsane-hpljm1005.so.1
-usr/lib/sane/libsane-hpljm1005.so.1.0.19
+usr/lib/sane/libsane-hpljm1005.so.1.0.22
 #usr/lib/sane/libsane-hs2p.la
 usr/lib/sane/libsane-hs2p.so
 usr/lib/sane/libsane-hs2p.so.1
-usr/lib/sane/libsane-hs2p.so.1.0.19
+usr/lib/sane/libsane-hs2p.so.1.0.22
 #usr/lib/sane/libsane-ibm.la
 usr/lib/sane/libsane-ibm.so
 usr/lib/sane/libsane-ibm.so.1
-usr/lib/sane/libsane-ibm.so.1.0.19
+usr/lib/sane/libsane-ibm.so.1.0.22
+#usr/lib/sane/libsane-kodak.la
+usr/lib/sane/libsane-kodak.so
+usr/lib/sane/libsane-kodak.so.1
+usr/lib/sane/libsane-kodak.so.1.0.22
+#usr/lib/sane/libsane-kvs1025.la
+usr/lib/sane/libsane-kvs1025.so
+usr/lib/sane/libsane-kvs1025.so.1
+usr/lib/sane/libsane-kvs1025.so.1.0.22
+#usr/lib/sane/libsane-kvs20xx.la
+usr/lib/sane/libsane-kvs20xx.so
+usr/lib/sane/libsane-kvs20xx.so.1
+usr/lib/sane/libsane-kvs20xx.so.1.0.22
 #usr/lib/sane/libsane-leo.la
 usr/lib/sane/libsane-leo.so
 usr/lib/sane/libsane-leo.so.1
-usr/lib/sane/libsane-leo.so.1.0.19
+usr/lib/sane/libsane-leo.so.1.0.22
 #usr/lib/sane/libsane-lexmark.la
 usr/lib/sane/libsane-lexmark.so
 usr/lib/sane/libsane-lexmark.so.1
-usr/lib/sane/libsane-lexmark.so.1.0.19
+usr/lib/sane/libsane-lexmark.so.1.0.22
 #usr/lib/sane/libsane-ma1509.la
 usr/lib/sane/libsane-ma1509.so
 usr/lib/sane/libsane-ma1509.so.1
-usr/lib/sane/libsane-ma1509.so.1.0.19
+usr/lib/sane/libsane-ma1509.so.1.0.22
+#usr/lib/sane/libsane-magicolor.la
+usr/lib/sane/libsane-magicolor.so
+usr/lib/sane/libsane-magicolor.so.1
+usr/lib/sane/libsane-magicolor.so.1.0.22
 #usr/lib/sane/libsane-matsushita.la
 usr/lib/sane/libsane-matsushita.so
 usr/lib/sane/libsane-matsushita.so.1
-usr/lib/sane/libsane-matsushita.so.1.0.19
+usr/lib/sane/libsane-matsushita.so.1.0.22
 #usr/lib/sane/libsane-microtek.la
 usr/lib/sane/libsane-microtek.so
 usr/lib/sane/libsane-microtek.so.1
-usr/lib/sane/libsane-microtek.so.1.0.19
+usr/lib/sane/libsane-microtek.so.1.0.22
 #usr/lib/sane/libsane-microtek2.la
 usr/lib/sane/libsane-microtek2.so
 usr/lib/sane/libsane-microtek2.so.1
-usr/lib/sane/libsane-microtek2.so.1.0.19
+usr/lib/sane/libsane-microtek2.so.1.0.22
 #usr/lib/sane/libsane-mustek.la
 usr/lib/sane/libsane-mustek.so
 usr/lib/sane/libsane-mustek.so.1
-usr/lib/sane/libsane-mustek.so.1.0.19
+usr/lib/sane/libsane-mustek.so.1.0.22
+#usr/lib/sane/libsane-mustek_pp.la
+usr/lib/sane/libsane-mustek_pp.so
+usr/lib/sane/libsane-mustek_pp.so.1
+usr/lib/sane/libsane-mustek_pp.so.1.0.22
 #usr/lib/sane/libsane-mustek_usb.la
 usr/lib/sane/libsane-mustek_usb.so
 usr/lib/sane/libsane-mustek_usb.so.1
-usr/lib/sane/libsane-mustek_usb.so.1.0.19
-#usr/lib/sane/libsane-mustek_usb2.la
-usr/lib/sane/libsane-mustek_usb2.so
-usr/lib/sane/libsane-mustek_usb2.so.1
-usr/lib/sane/libsane-mustek_usb2.so.1.0.19
+usr/lib/sane/libsane-mustek_usb.so.1.0.22
 #usr/lib/sane/libsane-nec.la
 usr/lib/sane/libsane-nec.so
 usr/lib/sane/libsane-nec.so.1
-usr/lib/sane/libsane-nec.so.1.0.19
+usr/lib/sane/libsane-nec.so.1.0.22
 #usr/lib/sane/libsane-net.la
 usr/lib/sane/libsane-net.so
 usr/lib/sane/libsane-net.so.1
-usr/lib/sane/libsane-net.so.1.0.19
+usr/lib/sane/libsane-net.so.1.0.22
 #usr/lib/sane/libsane-niash.la
 usr/lib/sane/libsane-niash.so
 usr/lib/sane/libsane-niash.so.1
-usr/lib/sane/libsane-niash.so.1.0.19
+usr/lib/sane/libsane-niash.so.1.0.22
+#usr/lib/sane/libsane-p5.la
+usr/lib/sane/libsane-p5.so
+usr/lib/sane/libsane-p5.so.1
+usr/lib/sane/libsane-p5.so.1.0.22
 #usr/lib/sane/libsane-pie.la
 usr/lib/sane/libsane-pie.so
 usr/lib/sane/libsane-pie.so.1
-usr/lib/sane/libsane-pie.so.1.0.19
+usr/lib/sane/libsane-pie.so.1.0.22
 #usr/lib/sane/libsane-pixma.la
 usr/lib/sane/libsane-pixma.so
 usr/lib/sane/libsane-pixma.so.1
-usr/lib/sane/libsane-pixma.so.1.0.19
+usr/lib/sane/libsane-pixma.so.1.0.22
 #usr/lib/sane/libsane-plustek.la
 usr/lib/sane/libsane-plustek.so
 usr/lib/sane/libsane-plustek.so.1
-usr/lib/sane/libsane-plustek.so.1.0.19
+usr/lib/sane/libsane-plustek.so.1.0.22
 #usr/lib/sane/libsane-plustek_pp.la
 usr/lib/sane/libsane-plustek_pp.so
 usr/lib/sane/libsane-plustek_pp.so.1
-usr/lib/sane/libsane-plustek_pp.so.1.0.19
+usr/lib/sane/libsane-plustek_pp.so.1.0.22
 #usr/lib/sane/libsane-qcam.la
 usr/lib/sane/libsane-qcam.so
 usr/lib/sane/libsane-qcam.so.1
-usr/lib/sane/libsane-qcam.so.1.0.19
+usr/lib/sane/libsane-qcam.so.1.0.22
 #usr/lib/sane/libsane-ricoh.la
 usr/lib/sane/libsane-ricoh.so
 usr/lib/sane/libsane-ricoh.so.1
-usr/lib/sane/libsane-ricoh.so.1.0.19
+usr/lib/sane/libsane-ricoh.so.1.0.22
+#usr/lib/sane/libsane-rts8891.la
+usr/lib/sane/libsane-rts8891.so
+usr/lib/sane/libsane-rts8891.so.1
+usr/lib/sane/libsane-rts8891.so.1.0.22
 #usr/lib/sane/libsane-s9036.la
 usr/lib/sane/libsane-s9036.so
 usr/lib/sane/libsane-s9036.so.1
-usr/lib/sane/libsane-s9036.so.1.0.19
+usr/lib/sane/libsane-s9036.so.1.0.22
 #usr/lib/sane/libsane-sceptre.la
 usr/lib/sane/libsane-sceptre.so
 usr/lib/sane/libsane-sceptre.so.1
-usr/lib/sane/libsane-sceptre.so.1.0.19
+usr/lib/sane/libsane-sceptre.so.1.0.22
 #usr/lib/sane/libsane-sharp.la
 usr/lib/sane/libsane-sharp.so
 usr/lib/sane/libsane-sharp.so.1
-usr/lib/sane/libsane-sharp.so.1.0.19
+usr/lib/sane/libsane-sharp.so.1.0.22
 #usr/lib/sane/libsane-sm3600.la
 usr/lib/sane/libsane-sm3600.so
 usr/lib/sane/libsane-sm3600.so.1
-usr/lib/sane/libsane-sm3600.so.1.0.19
+usr/lib/sane/libsane-sm3600.so.1.0.22
 #usr/lib/sane/libsane-sm3840.la
 usr/lib/sane/libsane-sm3840.so
 usr/lib/sane/libsane-sm3840.so.1
-usr/lib/sane/libsane-sm3840.so.1.0.19
+usr/lib/sane/libsane-sm3840.so.1.0.22
 #usr/lib/sane/libsane-snapscan.la
 usr/lib/sane/libsane-snapscan.so
 usr/lib/sane/libsane-snapscan.so.1
-usr/lib/sane/libsane-snapscan.so.1.0.19
+usr/lib/sane/libsane-snapscan.so.1.0.22
 #usr/lib/sane/libsane-sp15c.la
 usr/lib/sane/libsane-sp15c.so
 usr/lib/sane/libsane-sp15c.so.1
-usr/lib/sane/libsane-sp15c.so.1.0.19
+usr/lib/sane/libsane-sp15c.so.1.0.22
 #usr/lib/sane/libsane-st400.la
 usr/lib/sane/libsane-st400.so
 usr/lib/sane/libsane-st400.so.1
-usr/lib/sane/libsane-st400.so.1.0.19
+usr/lib/sane/libsane-st400.so.1.0.22
 #usr/lib/sane/libsane-stv680.la
 usr/lib/sane/libsane-stv680.so
 usr/lib/sane/libsane-stv680.so.1
-usr/lib/sane/libsane-stv680.so.1.0.19
+usr/lib/sane/libsane-stv680.so.1.0.22
 #usr/lib/sane/libsane-tamarack.la
 usr/lib/sane/libsane-tamarack.so
 usr/lib/sane/libsane-tamarack.so.1
-usr/lib/sane/libsane-tamarack.so.1.0.19
+usr/lib/sane/libsane-tamarack.so.1.0.22
 #usr/lib/sane/libsane-teco1.la
 usr/lib/sane/libsane-teco1.so
 usr/lib/sane/libsane-teco1.so.1
-usr/lib/sane/libsane-teco1.so.1.0.19
+usr/lib/sane/libsane-teco1.so.1.0.22
 #usr/lib/sane/libsane-teco2.la
 usr/lib/sane/libsane-teco2.so
 usr/lib/sane/libsane-teco2.so.1
-usr/lib/sane/libsane-teco2.so.1.0.19
+usr/lib/sane/libsane-teco2.so.1.0.22
 #usr/lib/sane/libsane-teco3.la
 usr/lib/sane/libsane-teco3.so
 usr/lib/sane/libsane-teco3.so.1
-usr/lib/sane/libsane-teco3.so.1.0.19
+usr/lib/sane/libsane-teco3.so.1.0.22
 #usr/lib/sane/libsane-test.la
 usr/lib/sane/libsane-test.so
 usr/lib/sane/libsane-test.so.1
-usr/lib/sane/libsane-test.so.1.0.19
+usr/lib/sane/libsane-test.so.1.0.22
 #usr/lib/sane/libsane-u12.la
 usr/lib/sane/libsane-u12.so
 usr/lib/sane/libsane-u12.so.1
-usr/lib/sane/libsane-u12.so.1.0.19
+usr/lib/sane/libsane-u12.so.1.0.22
 #usr/lib/sane/libsane-umax.la
 usr/lib/sane/libsane-umax.so
 usr/lib/sane/libsane-umax.so.1
-usr/lib/sane/libsane-umax.so.1.0.19
+usr/lib/sane/libsane-umax.so.1.0.22
 #usr/lib/sane/libsane-umax1220u.la
 usr/lib/sane/libsane-umax1220u.so
 usr/lib/sane/libsane-umax1220u.so.1
-usr/lib/sane/libsane-umax1220u.so.1.0.19
+usr/lib/sane/libsane-umax1220u.so.1.0.22
 #usr/lib/sane/libsane-umax_pp.la
 usr/lib/sane/libsane-umax_pp.so
 usr/lib/sane/libsane-umax_pp.so.1
-usr/lib/sane/libsane-umax_pp.so.1.0.19
-#usr/lib/sane/libsane-v4l.la
-usr/lib/sane/libsane-v4l.so
-usr/lib/sane/libsane-v4l.so.1
-usr/lib/sane/libsane-v4l.so.1.0.19
+usr/lib/sane/libsane-umax_pp.so.1.0.22
+#usr/lib/sane/libsane-xerox_mfp.la
+usr/lib/sane/libsane-xerox_mfp.so
+usr/lib/sane/libsane-xerox_mfp.so.1
+usr/lib/sane/libsane-xerox_mfp.so.1.0.22
 usr/sbin/saned
 #usr/share/locale/bg/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/cs/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/da/LC_MESSAGES/sane-backends.mo
 usr/share/locale/de/LC_MESSAGES/sane-backends.mo
+#usr/share/locale/en_GB/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/eo/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/es/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/fi/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/fr/LC_MESSAGES/sane-backends.mo
+#usr/share/locale/gl/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/it/LC_MESSAGES/sane-backends.mo
+#usr/share/locale/ja/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/nb/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/nl/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/pl/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/pt/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/ru/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/sv/LC_MESSAGES/sane-backends.mo
-usr/share/man/man1/gamma4scanimage.1
-usr/share/man/man1/sane-config.1
-usr/share/man/man1/sane-find-scanner.1
-usr/share/man/man1/scanimage.1
-usr/share/man/man5/sane-abaton.5
-usr/share/man/man5/sane-agfafocus.5
-usr/share/man/man5/sane-apple.5
-usr/share/man/man5/sane-artec.5
-usr/share/man/man5/sane-artec_eplus48u.5
-usr/share/man/man5/sane-as6e.5
-usr/share/man/man5/sane-avision.5
-usr/share/man/man5/sane-bh.5
-usr/share/man/man5/sane-canon.5
-usr/share/man/man5/sane-canon630u.5
-usr/share/man/man5/sane-canon_pp.5
-usr/share/man/man5/sane-cardscan.5
-usr/share/man/man5/sane-coolscan.5
-usr/share/man/man5/sane-coolscan2.5
-usr/share/man/man5/sane-dc210.5
-usr/share/man/man5/sane-dc240.5
-usr/share/man/man5/sane-dc25.5
-usr/share/man/man5/sane-dll.5
-usr/share/man/man5/sane-dmc.5
-usr/share/man/man5/sane-epjitsu.5
-usr/share/man/man5/sane-epson.5
-usr/share/man/man5/sane-fujitsu.5
-usr/share/man/man5/sane-genesys.5
-usr/share/man/man5/sane-gphoto2.5
-usr/share/man/man5/sane-gt68xx.5
-usr/share/man/man5/sane-hp.5
-usr/share/man/man5/sane-hp3500.5
-usr/share/man/man5/sane-hp3900.5
-usr/share/man/man5/sane-hp4200.5
-usr/share/man/man5/sane-hp5400.5
-usr/share/man/man5/sane-hp5590.5
-usr/share/man/man5/sane-hpljm1005.5
-usr/share/man/man5/sane-hpsj5s.5
-usr/share/man/man5/sane-hs2p.5
-usr/share/man/man5/sane-ibm.5
-usr/share/man/man5/sane-leo.5
-usr/share/man/man5/sane-lexmark.5
-usr/share/man/man5/sane-ma1509.5
-usr/share/man/man5/sane-matsushita.5
-usr/share/man/man5/sane-microtek.5
-usr/share/man/man5/sane-microtek2.5
-usr/share/man/man5/sane-mustek.5
-usr/share/man/man5/sane-mustek_pp.5
-usr/share/man/man5/sane-mustek_usb.5
-usr/share/man/man5/sane-mustek_usb2.5
-usr/share/man/man5/sane-nec.5
-usr/share/man/man5/sane-net.5
-usr/share/man/man5/sane-niash.5
-usr/share/man/man5/sane-pie.5
-usr/share/man/man5/sane-pint.5
-usr/share/man/man5/sane-pixma.5
-usr/share/man/man5/sane-plustek.5
-usr/share/man/man5/sane-plustek_pp.5
-usr/share/man/man5/sane-pnm.5
-usr/share/man/man5/sane-qcam.5
-usr/share/man/man5/sane-ricoh.5
-usr/share/man/man5/sane-s9036.5
-usr/share/man/man5/sane-sceptre.5
-usr/share/man/man5/sane-scsi.5
-usr/share/man/man5/sane-sharp.5
-usr/share/man/man5/sane-sm3600.5
-usr/share/man/man5/sane-sm3840.5
-usr/share/man/man5/sane-snapscan.5
-usr/share/man/man5/sane-sp15c.5
-usr/share/man/man5/sane-st400.5
-usr/share/man/man5/sane-stv680.5
-usr/share/man/man5/sane-tamarack.5
-usr/share/man/man5/sane-teco1.5
-usr/share/man/man5/sane-teco2.5
-usr/share/man/man5/sane-teco3.5
-usr/share/man/man5/sane-test.5
-usr/share/man/man5/sane-u12.5
-usr/share/man/man5/sane-umax.5
-usr/share/man/man5/sane-umax1220u.5
-usr/share/man/man5/sane-umax_pp.5
-usr/share/man/man5/sane-usb.5
-usr/share/man/man5/sane-v4l.5
-usr/share/man/man7/sane.7
-usr/share/man/man8/saned.8
+#usr/share/locale/uk/LC_MESSAGES/sane-backends.mo
+#usr/share/man/man1/gamma4scanimage.1
+#usr/share/man/man1/sane-config.1
+#usr/share/man/man1/sane-find-scanner.1
+#usr/share/man/man1/scanimage.1
+#usr/share/man/man5/sane-abaton.5
+#usr/share/man/man5/sane-agfafocus.5
+#usr/share/man/man5/sane-apple.5
+#usr/share/man/man5/sane-artec.5
+#usr/share/man/man5/sane-artec_eplus48u.5
+#usr/share/man/man5/sane-as6e.5
+#usr/share/man/man5/sane-avision.5
+#usr/share/man/man5/sane-bh.5
+#usr/share/man/man5/sane-canon.5
+#usr/share/man/man5/sane-canon630u.5
+#usr/share/man/man5/sane-canon_dr.5
+#usr/share/man/man5/sane-cardscan.5
+#usr/share/man/man5/sane-coolscan.5
+#usr/share/man/man5/sane-coolscan2.5
+#usr/share/man/man5/sane-coolscan3.5
+#usr/share/man/man5/sane-dc210.5
+#usr/share/man/man5/sane-dc240.5
+#usr/share/man/man5/sane-dc25.5
+#usr/share/man/man5/sane-dll.5
+#usr/share/man/man5/sane-dmc.5
+#usr/share/man/man5/sane-epjitsu.5
+#usr/share/man/man5/sane-epson.5
+#usr/share/man/man5/sane-epson2.5
+#usr/share/man/man5/sane-fujitsu.5
+#usr/share/man/man5/sane-genesys.5
+#usr/share/man/man5/sane-gt68xx.5
+#usr/share/man/man5/sane-hp.5
+#usr/share/man/man5/sane-hp3500.5
+#usr/share/man/man5/sane-hp3900.5
+#usr/share/man/man5/sane-hp4200.5
+#usr/share/man/man5/sane-hp5400.5
+#usr/share/man/man5/sane-hp5590.5
+#usr/share/man/man5/sane-hpljm1005.5
+#usr/share/man/man5/sane-hs2p.5
+#usr/share/man/man5/sane-ibm.5
+#usr/share/man/man5/sane-kodak.5
+#usr/share/man/man5/sane-kvs1025.5
+#usr/share/man/man5/sane-kvs20xx.5
+#usr/share/man/man5/sane-leo.5
+#usr/share/man/man5/sane-lexmark.5
+#usr/share/man/man5/sane-ma1509.5
+#usr/share/man/man5/sane-magicolor.5
+#usr/share/man/man5/sane-matsushita.5
+#usr/share/man/man5/sane-microtek.5
+#usr/share/man/man5/sane-microtek2.5
+#usr/share/man/man5/sane-mustek.5
+#usr/share/man/man5/sane-mustek_pp.5
+#usr/share/man/man5/sane-mustek_usb.5
+#usr/share/man/man5/sane-nec.5
+#usr/share/man/man5/sane-net.5
+#usr/share/man/man5/sane-niash.5
+#usr/share/man/man5/sane-p5.5
+#usr/share/man/man5/sane-pie.5
+#usr/share/man/man5/sane-pixma.5
+#usr/share/man/man5/sane-plustek.5
+#usr/share/man/man5/sane-plustek_pp.5
+#usr/share/man/man5/sane-qcam.5
+#usr/share/man/man5/sane-ricoh.5
+#usr/share/man/man5/sane-rts8891.5
+#usr/share/man/man5/sane-s9036.5
+#usr/share/man/man5/sane-sceptre.5
+#usr/share/man/man5/sane-scsi.5
+#usr/share/man/man5/sane-sharp.5
+#usr/share/man/man5/sane-sm3600.5
+#usr/share/man/man5/sane-sm3840.5
+#usr/share/man/man5/sane-snapscan.5
+#usr/share/man/man5/sane-sp15c.5
+#usr/share/man/man5/sane-st400.5
+#usr/share/man/man5/sane-stv680.5
+#usr/share/man/man5/sane-tamarack.5
+#usr/share/man/man5/sane-teco1.5
+#usr/share/man/man5/sane-teco2.5
+#usr/share/man/man5/sane-teco3.5
+#usr/share/man/man5/sane-test.5
+#usr/share/man/man5/sane-u12.5
+#usr/share/man/man5/sane-umax.5
+#usr/share/man/man5/sane-umax1220u.5
+#usr/share/man/man5/sane-umax_pp.5
+#usr/share/man/man5/sane-usb.5
+#usr/share/man/man5/sane-xerox_mfp.5
+#usr/share/man/man7/sane.7
+#usr/share/man/man8/saned.8
 #usr/share/sane
 usr/share/sane/artec_eplus48u
 usr/share/sane/epjitsu
 usr/share/sane/gt68xx
 usr/share/sane/snapscan
+#usr/var
+#usr/var/lock
 usr/var/lock/sane
-etc/sane.d/mustek_pp.conf
-#usr/lib/sane/libsane-mustek_pp.la
-usr/lib/sane/libsane-mustek_pp.so
-usr/lib/sane/libsane-mustek_pp.so.1
-usr/lib/sane/libsane-mustek_pp.so.1.0.19
+var/ipfire/backup/addons/includes/sane
 etc/rc.d/init.d/sane
-etc/rc.d/rc3.d/S95sane
-etc/rc.d/rc0.d/K10sane
-etc/rc.d/rc6.d/K10sane
 usr/local/bin/sanedloop
-var/ipfire/backup/addons/includes/sane
-#usr/var
-#usr/var/lock

diff --git a/config/rootfiles/packages/sqlite b/config/rootfiles/packages/sqlite
index e483864b5ac2a271f1f8b43c8fa52bd61daccadf..f3b0b3697ee7f6fc18ebac101f8098882e444f2b 100644 (file)
--- a/config/rootfiles/packages/sqlite
+++ b/config/rootfiles/packages/sqlite
@@ -7,3 +7,4 @@ usr/lib/libsqlite3.so
 usr/lib/libsqlite3.so.0
 usr/lib/libsqlite3.so.0.8.6
 #usr/lib/pkgconfig/sqlite3.pc
+#usr/share/man/man1/sqlite3.1

diff --git a/doc/language_issues.de b/doc/language_issues.de
index a482dceee969791654803d00736c2c043565057f..0f1b918b1c72ee0041842073ac4893ec4a4dd70d 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Act as
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -143,6 +144,8 @@ WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
+WARNING: translation string unused: extrahd unable to read
+WARNING: translation string unused: extrahd unable to write
 WARNING: translation string unused: filename
 WARNING: translation string unused: firewall graphs
 WARNING: translation string unused: firewall log viewer
@@ -193,6 +196,7 @@ WARNING: translation string unused: invalid upstream proxy username or password
 WARNING: translation string unused: invert
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
+WARNING: translation string unused: ipfire side is invalid
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: isdn
 WARNING: translation string unused: isdn settings
@@ -233,7 +237,6 @@ WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
 WARNING: translation string unused: mbmon value
 WARNING: translation string unused: min size
-WARNING: translation string unused: minutes
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
 WARNING: translation string unused: modem on com1
@@ -306,6 +309,7 @@ WARNING: translation string unused: ovpn_processprioVH
 WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire updates
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: password crypting key
@@ -458,7 +462,10 @@ WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
-WARNING: untranslated string: cpu frequency per
 WARNING: untranslated string: new
 WARNING: untranslated string: outgoing firewall reserved groupname
 WARNING: untranslated string: qos add subclass
+WARNING: untranslated string: route config changed
+WARNING: untranslated string: routing config added
+WARNING: untranslated string: routing config changed
+WARNING: untranslated string: routing table

diff --git a/doc/language_issues.en b/doc/language_issues.en
index c95749bcb610d93d19ff96fb517075d421850307..bffff8044c7533316d14d67d12224113f3766fd8 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Act as
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -167,6 +168,8 @@ WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
+WARNING: translation string unused: extrahd unable to read
+WARNING: translation string unused: extrahd unable to write
 WARNING: translation string unused: filename
 WARNING: translation string unused: firewall graphs
 WARNING: translation string unused: firewall log viewer
@@ -220,6 +223,7 @@ WARNING: translation string unused: invalid upstream proxy username or password
 WARNING: translation string unused: invert
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
+WARNING: translation string unused: ipfire side is invalid
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: isdn
 WARNING: translation string unused: isdn settings
@@ -260,7 +264,6 @@ WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
 WARNING: translation string unused: mbmon value
 WARNING: translation string unused: min size
-WARNING: translation string unused: minutes
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
 WARNING: translation string unused: modem on com1
@@ -334,6 +337,7 @@ WARNING: translation string unused: ovpn_processprioVH
 WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire updates
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: password crypting key
@@ -491,6 +495,9 @@ WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
-WARNING: untranslated string: cpu frequency per
 WARNING: untranslated string: new
 WARNING: untranslated string: outgoing firewall reserved groupname
+WARNING: untranslated string: route config changed
+WARNING: untranslated string: routing config added
+WARNING: untranslated string: routing config changed
+WARNING: untranslated string: routing table

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 00f1f8f18db27d2cb8f9c56f41f06afc6fe16857..0ef2eacd8d02a7bacc05008e01c609910dab7a81 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Act as
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -167,6 +168,8 @@ WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
+WARNING: translation string unused: extrahd unable to read
+WARNING: translation string unused: extrahd unable to write
 WARNING: translation string unused: filename
 WARNING: translation string unused: firewall graphs
 WARNING: translation string unused: firewall log viewer
@@ -220,6 +223,7 @@ WARNING: translation string unused: invalid upstream proxy username or password
 WARNING: translation string unused: invert
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
+WARNING: translation string unused: ipfire side is invalid
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: isdn
 WARNING: translation string unused: isdn settings
@@ -260,7 +264,6 @@ WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
 WARNING: translation string unused: mbmon value
 WARNING: translation string unused: min size
-WARNING: translation string unused: minutes
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
 WARNING: translation string unused: modem on com1
@@ -335,6 +338,7 @@ WARNING: translation string unused: ovpn_processprioVH
 WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire updates
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: password crypting key
@@ -494,7 +498,6 @@ WARNING: untranslated string: Async logging enabled
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: Set time on boot
 WARNING: untranslated string: bytes
-WARNING: untranslated string: cpu frequency per
 WARNING: untranslated string: fireinfo ipfire version
 WARNING: untranslated string: fireinfo is disabled
 WARNING: untranslated string: fireinfo is enabled
@@ -512,6 +515,7 @@ WARNING: untranslated string: fireinfo why descr2
 WARNING: untranslated string: fireinfo why enable
 WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
+WARNING: untranslated string: minute
 WARNING: untranslated string: new
 WARNING: untranslated string: outgoing firewall add ip group
 WARNING: untranslated string: outgoing firewall add mac group
@@ -529,4 +533,10 @@ WARNING: untranslated string: outgoing firewall p2p description 3
 WARNING: untranslated string: outgoing firewall reserved groupname
 WARNING: untranslated string: outgoing firewall view group
 WARNING: untranslated string: pakfire ago
+WARNING: untranslated string: route config changed
+WARNING: untranslated string: routing config added
+WARNING: untranslated string: routing config changed
+WARNING: untranslated string: routing table
+WARNING: untranslated string: static routes
 WARNING: untranslated string: system information
+WARNING: untranslated string: vpn keyexchange

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index e491a0fce32ea0323ab9035e98c70011c89d06d4..00cb46278832c79d93203e58d5f5dc9b2f04fd7b 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Act as
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -167,7 +168,8 @@ WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
-WARNING: translation string unused: extrahd founded drives
+WARNING: translation string unused: extrahd unable to read
+WARNING: translation string unused: extrahd unable to write
 WARNING: translation string unused: filename
 WARNING: translation string unused: firewall graphs
 WARNING: translation string unused: firewall log viewer
@@ -221,6 +223,7 @@ WARNING: translation string unused: invalid upstream proxy username or password
 WARNING: translation string unused: invert
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
+WARNING: translation string unused: ipfire side is invalid
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: isdn
 WARNING: translation string unused: isdn settings
@@ -261,7 +264,6 @@ WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
 WARNING: translation string unused: mbmon value
 WARNING: translation string unused: min size
-WARNING: translation string unused: minutes
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
 WARNING: translation string unused: modem on com1
@@ -335,6 +337,7 @@ WARNING: translation string unused: ovpn_processprioVH
 WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire updates
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: password crypting key
@@ -494,9 +497,7 @@ WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
-WARNING: untranslated string: cpu frequency per
 WARNING: untranslated string: dns address deleted txt
-WARNING: untranslated string: extrahd detected drives
 WARNING: untranslated string: fireinfo ipfire version
 WARNING: untranslated string: fireinfo is disabled
 WARNING: untranslated string: fireinfo is enabled
@@ -514,16 +515,23 @@ WARNING: untranslated string: fireinfo why descr2
 WARNING: untranslated string: fireinfo why enable
 WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
+WARNING: untranslated string: minute
 WARNING: untranslated string: new
 WARNING: untranslated string: ntp common settings
 WARNING: untranslated string: ntp sync
 WARNING: untranslated string: outgoing firewall reserved groupname
 WARNING: untranslated string: pakfire ago
+WARNING: untranslated string: route config changed
+WARNING: untranslated string: routing config added
+WARNING: untranslated string: routing config changed
+WARNING: untranslated string: routing table
 WARNING: untranslated string: snort working
+WARNING: untranslated string: static routes
 WARNING: untranslated string: system information
 WARNING: untranslated string: upload new ruleset
 WARNING: untranslated string: urlfilter file ext block
 WARNING: untranslated string: urlfilter mode block
+WARNING: untranslated string: vpn keyexchange
 WARNING: untranslated string: wlanap access point
 WARNING: untranslated string: wlanap channel
 WARNING: untranslated string: wlanap debugging

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
new file mode 100644 (file)
index 0000000..0ef2eac
--- /dev/null
+++ b/doc/language_issues.pl
@@ -0,0 +1,542 @@
+WARNING: translation string unused: Act as
+WARNING: translation string unused: Client status and controlc
+WARNING: translation string unused: ConnSched scheduler
+WARNING: translation string unused: ConnSched select profile
+WARNING: translation string unused: HDD temperature
+WARNING: translation string unused: Level7 rule
+WARNING: translation string unused: Local VPN IP
+WARNING: translation string unused: Ping
+WARNING: translation string unused: Remote IP
+WARNING: translation string unused: Remote VPN IP
+WARNING: translation string unused: Resolv
+WARNING: translation string unused: TOS Bits
+WARNING: translation string unused: Verbose
+WARNING: translation string unused: access refused with this oinkcode
+WARNING: translation string unused: add network
+WARNING: translation string unused: add new ovpn
+WARNING: translation string unused: add service
+WARNING: translation string unused: add-route
+WARNING: translation string unused: admin user password has been changed
+WARNING: translation string unused: administrator user password
+WARNING: translation string unused: advproxy LDAP auth
+WARNING: translation string unused: advproxy NTLM auth
+WARNING: translation string unused: advproxy advanced proxy
+WARNING: translation string unused: advproxy chgwebpwd ERROR
+WARNING: translation string unused: advproxy chgwebpwd SUCCESS
+WARNING: translation string unused: advproxy chgwebpwd change password
+WARNING: translation string unused: advproxy chgwebpwd change web password
+WARNING: translation string unused: advproxy chgwebpwd new password
+WARNING: translation string unused: advproxy chgwebpwd new password confirm
+WARNING: translation string unused: advproxy chgwebpwd old password
+WARNING: translation string unused: advproxy chgwebpwd username
+WARNING: translation string unused: advproxy cre disabled
+WARNING: translation string unused: advproxy errmsg change fail
+WARNING: translation string unused: advproxy errmsg change success
+WARNING: translation string unused: advproxy errmsg invalid user
+WARNING: translation string unused: advproxy errmsg no password
+WARNING: translation string unused: advproxy errmsg password incorrect
+WARNING: translation string unused: advproxy no cre groups
+WARNING: translation string unused: advproxy ssadvanced proxy
+WARNING: translation string unused: advproxy update information
+WARNING: translation string unused: advproxy update notification
+WARNING: translation string unused: alcatelusb help
+WARNING: translation string unused: alcatelusb upload
+WARNING: translation string unused: all interfaces
+WARNING: translation string unused: all updates installed
+WARNING: translation string unused: allmsg
+WARNING: translation string unused: alt information
+WARNING: translation string unused: alt ovpn
+WARNING: translation string unused: and
+WARNING: translation string unused: ansi t1.483
+WARNING: translation string unused: apply
+WARNING: translation string unused: archive not exist
+WARNING: translation string unused: available updates
+WARNING: translation string unused: backup archive
+WARNING: translation string unused: backup clear archive
+WARNING: translation string unused: backup config floppy
+WARNING: translation string unused: backup configuration
+WARNING: translation string unused: backup erase key
+WARNING: translation string unused: backup explain key
+WARNING: translation string unused: backup explain key li1
+WARNING: translation string unused: backup explain key li2
+WARNING: translation string unused: backup explain key li3
+WARNING: translation string unused: backup explain key no1
+WARNING: translation string unused: backup explain key no2
+WARNING: translation string unused: backup export key
+WARNING: translation string unused: backup extract key
+WARNING: translation string unused: backup generate key
+WARNING: translation string unused: backup import dat file
+WARNING: translation string unused: backup import key
+WARNING: translation string unused: backup key
+WARNING: translation string unused: backup key file
+WARNING: translation string unused: backup key info
+WARNING: translation string unused: backup media info
+WARNING: translation string unused: backup missing key
+WARNING: translation string unused: backup password
+WARNING: translation string unused: backup protect key password
+WARNING: translation string unused: backup sets
+WARNING: translation string unused: backup to floppy
+WARNING: translation string unused: bad characters in
+WARNING: translation string unused: bewan adsl pci st
+WARNING: translation string unused: bewan adsl usb
+WARNING: translation string unused: bitrate
+WARNING: translation string unused: bleeding rules
+WARNING: translation string unused: blue access use hint
+WARNING: translation string unused: blue interface
+WARNING: translation string unused: cache management
+WARNING: translation string unused: cache size
+WARNING: translation string unused: calamaris report interval (in minutes)
+WARNING: translation string unused: calc traffic all x minutes
+WARNING: translation string unused: capsinactive
+WARNING: translation string unused: cfg restart
+WARNING: translation string unused: check for net traffic update
+WARNING: translation string unused: choose config
+WARNING: translation string unused: choose media
+WARNING: translation string unused: clear cache
+WARNING: translation string unused: compression
+WARNING: translation string unused: connect
+WARNING: translation string unused: connect the modem
+WARNING: translation string unused: core notice 1
+WARNING: translation string unused: core notice 2
+WARNING: translation string unused: core notice 3
+WARNING: translation string unused: could not connect to
+WARNING: translation string unused: could not connect to www ipcop org
+WARNING: translation string unused: could not connect to www ipfire org
+WARNING: translation string unused: could not create directory
+WARNING: translation string unused: could not download latest patch list
+WARNING: translation string unused: could not download the available updates list
+WARNING: translation string unused: could not open available updates file
+WARNING: translation string unused: could not open installed updates file
+WARNING: translation string unused: could not open update information file
+WARNING: translation string unused: create
+WARNING: translation string unused: create new backup
+WARNING: translation string unused: current dynamic leases
+WARNING: translation string unused: current media
+WARNING: translation string unused: current ovpn
+WARNING: translation string unused: current profile
+WARNING: translation string unused: custom networks
+WARNING: translation string unused: custom services
+WARNING: translation string unused: daily firewallhits
+WARNING: translation string unused: dat without key
+WARNING: translation string unused: dbfile
+WARNING: translation string unused: ddns help dnsmadeeasy
+WARNING: translation string unused: ddns help freedns
+WARNING: translation string unused: ddns help plus
+WARNING: translation string unused: debugme
+WARNING: translation string unused: deep scan directories
+WARNING: translation string unused: default networks
+WARNING: translation string unused: default services
+WARNING: translation string unused: dhcp base ip fixed lease
+WARNING: translation string unused: dhcp create fixed leases
+WARNING: translation string unused: dhcp fixed lease err1
+WARNING: translation string unused: dhcp fixed lease help1
+WARNING: translation string unused: dhcp mode
+WARNING: translation string unused: dhcp server disabled on blue interface
+WARNING: translation string unused: dhcp server enabled on blue interface
+WARNING: translation string unused: dial user password
+WARNING: translation string unused: dial user password has been changed
+WARNING: translation string unused: dialup settings
+WARNING: translation string unused: disconnect
+WARNING: translation string unused: display traffic at home
+WARNING: translation string unused: dns server
+WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: done
+WARNING: translation string unused: driver
+WARNING: translation string unused: dynamic dns client
+WARNING: translation string unused: eciadsl help
+WARNING: translation string unused: eciadsl upload
+WARNING: translation string unused: edit network
+WARNING: translation string unused: edit service
+WARNING: translation string unused: editor
+WARNING: translation string unused: email server can not be empty
+WARNING: translation string unused: enable javascript
+WARNING: translation string unused: enabled on
+WARNING: translation string unused: enabledtitle
+WARNING: translation string unused: encrypted
+WARNING: translation string unused: err bk 1
+WARNING: translation string unused: err bk 10 password
+WARNING: translation string unused: err bk 2 key
+WARNING: translation string unused: err bk 3 tar
+WARNING: translation string unused: err bk 4 gz
+WARNING: translation string unused: err bk 5 encrypt
+WARNING: translation string unused: err rs 1
+WARNING: translation string unused: err rs 6 decrypt
+WARNING: translation string unused: err rs 7 untartst
+WARNING: translation string unused: err rs 8 untar
+WARNING: translation string unused: error config
+WARNING: translation string unused: error external access
+WARNING: translation string unused: expected
+WARNING: translation string unused: exportkey
+WARNING: translation string unused: external access rule changed
+WARNING: translation string unused: extrahd unable to read
+WARNING: translation string unused: extrahd unable to write
+WARNING: translation string unused: filename
+WARNING: translation string unused: firewall graphs
+WARNING: translation string unused: firewall log viewer
+WARNING: translation string unused: firmware
+WARNING: translation string unused: firmware upload
+WARNING: translation string unused: force update
+WARNING: translation string unused: frequency
+WARNING: translation string unused: fritzdsl help
+WARNING: translation string unused: fritzdsl upload
+WARNING: translation string unused: from email adr
+WARNING: translation string unused: from email pw
+WARNING: translation string unused: from email server
+WARNING: translation string unused: from email user
+WARNING: translation string unused: from warn email bad
+WARNING: translation string unused: g.dtm
+WARNING: translation string unused: g.lite
+WARNING: translation string unused: gen static key
+WARNING: translation string unused: generate
+WARNING: translation string unused: genkey
+WARNING: translation string unused: green interface
+WARNING: translation string unused: gz with key
+WARNING: translation string unused: hint
+WARNING: translation string unused: host
+WARNING: translation string unused: host configuration
+WARNING: translation string unused: hostname and domain already in use
+WARNING: translation string unused: hours2
+WARNING: translation string unused: ibod for dual isdn only
+WARNING: translation string unused: icmp selected but no type
+WARNING: translation string unused: icmp type
+WARNING: translation string unused: id
+WARNING: translation string unused: ids preprocessor
+WARNING: translation string unused: import
+WARNING: translation string unused: importkey
+WARNING: translation string unused: in
+WARNING: translation string unused: incorrect password
+WARNING: translation string unused: insert floppy
+WARNING: translation string unused: insert removable device
+WARNING: translation string unused: install new update
+WARNING: translation string unused: installed
+WARNING: translation string unused: installed updates
+WARNING: translation string unused: intrusion detection system log viewer
+WARNING: translation string unused: invalid cache size
+WARNING: translation string unused: invalid date entered
+WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid loaded file
+WARNING: translation string unused: invalid md5sum
+WARNING: translation string unused: invalid port list
+WARNING: translation string unused: invalid time entered
+WARNING: translation string unused: invalid uplink speed
+WARNING: translation string unused: invalid upstream proxy username or password setting
+WARNING: translation string unused: invert
+WARNING: translation string unused: ip address in use
+WARNING: translation string unused: ipfire side
+WARNING: translation string unused: ipfire side is invalid
+WARNING: translation string unused: iptable rules
+WARNING: translation string unused: isdn
+WARNING: translation string unused: isdn settings
+WARNING: translation string unused: isdn1
+WARNING: translation string unused: isdn2
+WARNING: translation string unused: javascript menu error1
+WARNING: translation string unused: javascript menu error2
+WARNING: translation string unused: kernel version
+WARNING: translation string unused: key stuff
+WARNING: translation string unused: lateprompting
+WARNING: translation string unused: length
+WARNING: translation string unused: line
+WARNING: translation string unused: loaded modules
+WARNING: translation string unused: local hard disk
+WARNING: translation string unused: localkeyfile
+WARNING: translation string unused: log enabled
+WARNING: translation string unused: log viewer
+WARNING: translation string unused: loosedirectorychecking
+WARNING: translation string unused: ls_dhcpd
+WARNING: translation string unused: ls_disk space
+WARNING: translation string unused: ls_free/swan
+WARNING: translation string unused: ls_httpd
+WARNING: translation string unused: ls_init
+WARNING: translation string unused: ls_kernel
+WARNING: translation string unused: ls_modprobe
+WARNING: translation string unused: ls_pam_unix
+WARNING: translation string unused: ls_sshd
+WARNING: translation string unused: ls_syslogd
+WARNING: translation string unused: mac address error not 00
+WARNING: translation string unused: manage ovpn
+WARNING: translation string unused: manual control and status
+WARNING: translation string unused: marked
+WARNING: translation string unused: max incoming size
+WARNING: translation string unused: max outgoing size
+WARNING: translation string unused: max size
+WARNING: translation string unused: mbmon fan in
+WARNING: translation string unused: mbmon graphs
+WARNING: translation string unused: mbmon temp in
+WARNING: translation string unused: mbmon value
+WARNING: translation string unused: min size
+WARNING: translation string unused: missing dat
+WARNING: translation string unused: missing gz
+WARNING: translation string unused: modem on com1
+WARNING: translation string unused: modem on com2
+WARNING: translation string unused: modem on com3
+WARNING: translation string unused: modem on com4
+WARNING: translation string unused: modem on com5
+WARNING: translation string unused: modulation
+WARNING: translation string unused: monthly firewallhits
+WARNING: translation string unused: monthly start day bad
+WARNING: translation string unused: monthly traffic bad
+WARNING: translation string unused: monthly volume
+WARNING: translation string unused: monthly volume start day
+WARNING: translation string unused: monthly volume start day short
+WARNING: translation string unused: mount
+WARNING: translation string unused: nat-traversal
+WARNING: translation string unused: net address
+WARNING: translation string unused: net config type
+WARNING: translation string unused: net config type help
+WARNING: translation string unused: net-traffic configuration
+WARNING: translation string unused: network added
+WARNING: translation string unused: network configuration
+WARNING: translation string unused: network removed
+WARNING: translation string unused: network status information
+WARNING: translation string unused: network traffic graphs
+WARNING: translation string unused: network updated
+WARNING: translation string unused: networks settings
+WARNING: translation string unused: new optionsfw must boot
+WARNING: translation string unused: no alcatelusb firmware
+WARNING: translation string unused: no cfg upload
+WARNING: translation string unused: no eciadsl synch.bin file
+WARNING: translation string unused: no fritzdsl driver
+WARNING: translation string unused: no information available
+WARNING: translation string unused: no modem selected
+WARNING: translation string unused: no set selected
+WARNING: translation string unused: nonetworkname
+WARNING: translation string unused: noservicename
+WARNING: translation string unused: notes
+WARNING: translation string unused: o-no
+WARNING: translation string unused: o-yes
+WARNING: translation string unused: online help en
+WARNING: translation string unused: only red
+WARNING: translation string unused: openvpn client
+WARNING: translation string unused: openvpn server
+WARNING: translation string unused: optional data
+WARNING: translation string unused: optionsfw portlist hint
+WARNING: translation string unused: optionsfw warning
+WARNING: translation string unused: or
+WARNING: translation string unused: original
+WARNING: translation string unused: other countries
+WARNING: translation string unused: out
+WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
+WARNING: translation string unused: outgoing firewall p2p description
+WARNING: translation string unused: ovpn
+WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn dl
+WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn_fastio
+WARNING: translation string unused: ovpn_fragment
+WARNING: translation string unused: ovpn_mssfix
+WARNING: translation string unused: ovpn_mtudisc
+WARNING: translation string unused: ovpn_processprio
+WARNING: translation string unused: ovpn_processprioD
+WARNING: translation string unused: ovpn_processprioED
+WARNING: translation string unused: ovpn_processprioEH
+WARNING: translation string unused: ovpn_processprioEN
+WARNING: translation string unused: ovpn_processprioH
+WARNING: translation string unused: ovpn_processprioLN
+WARNING: translation string unused: ovpn_processprioN
+WARNING: translation string unused: ovpn_processprioVD
+WARNING: translation string unused: ovpn_processprioVH
+WARNING: translation string unused: ovpnstatus log
+WARNING: translation string unused: ovpnsys log
+WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire updates
+WARNING: translation string unused: password contains illegal characters
+WARNING: translation string unused: password crypting key
+WARNING: translation string unused: passwords must be at least 6 characters in length
+WARNING: translation string unused: phonebook entry
+WARNING: translation string unused: ping disabled
+WARNING: translation string unused: polfile
+WARNING: translation string unused: ports
+WARNING: translation string unused: pots
+WARNING: translation string unused: pppoe
+WARNING: translation string unused: present
+WARNING: translation string unused: profiles
+WARNING: translation string unused: proxy access graphs
+WARNING: translation string unused: proxy no proxy extend
+WARNING: translation string unused: proxy no proxy local
+WARNING: translation string unused: proxy port
+WARNING: translation string unused: psk
+WARNING: translation string unused: quick control
+WARNING: translation string unused: reboot schedule
+WARNING: translation string unused: rebooting
+WARNING: translation string unused: refresh update list
+WARNING: translation string unused: released
+WARNING: translation string unused: removable device advice
+WARNING: translation string unused: reportfile
+WARNING: translation string unused: requested data
+WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: root
+WARNING: translation string unused: root path
+WARNING: translation string unused: root user password
+WARNING: translation string unused: route subnet is invalid
+WARNING: translation string unused: router ip
+WARNING: translation string unused: rules already up to date
+WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: save error
+WARNING: translation string unused: select media
+WARNING: translation string unused: selecttraffic
+WARNING: translation string unused: send email notification
+WARNING: translation string unused: send test mail
+WARNING: translation string unused: server reserved
+WARNING: translation string unused: service added
+WARNING: translation string unused: service removed
+WARNING: translation string unused: service updated
+WARNING: translation string unused: servicename
+WARNING: translation string unused: services settings
+WARNING: translation string unused: shaping add options
+WARNING: translation string unused: shaping list options
+WARNING: translation string unused: show areas
+WARNING: translation string unused: show lines
+WARNING: translation string unused: shutdown control
+WARNING: translation string unused: shutdown2
+WARNING: translation string unused: shutting down
+WARNING: translation string unused: sitekeyfile
+WARNING: translation string unused: smbreload
+WARNING: translation string unused: sort ascending
+WARNING: translation string unused: sort descending
+WARNING: translation string unused: squid extension methods
+WARNING: translation string unused: squid extension methods invalid
+WARNING: translation string unused: squid fix cache
+WARNING: translation string unused: ssh access tip
+WARNING: translation string unused: ssh1 disabled
+WARNING: translation string unused: ssh1 enabled
+WARNING: translation string unused: ssh1 support
+WARNING: translation string unused: ssnetwork status
+WARNING: translation string unused: sspasswords
+WARNING: translation string unused: ssproxy graphs
+WARNING: translation string unused: sssystem status
+WARNING: translation string unused: sstraffic graphs
+WARNING: translation string unused: subject test
+WARNING: translation string unused: subject warn
+WARNING: translation string unused: subnet
+WARNING: translation string unused: subnet is invalid
+WARNING: translation string unused: successfully refreshed updates list
+WARNING: translation string unused: system graphs
+WARNING: translation string unused: system log viewer
+WARNING: translation string unused: system status information
+WARNING: translation string unused: test
+WARNING: translation string unused: test email could not be sent
+WARNING: translation string unused: test email was sent
+WARNING: translation string unused: the following update was successfully installed
+WARNING: translation string unused: there are updates
+WARNING: translation string unused: there are updates available
+WARNING: translation string unused: this feature has been sponsored by
+WARNING: translation string unused: this is not a valid archive
+WARNING: translation string unused: this is not an authorised update
+WARNING: translation string unused: this months volume
+WARNING: translation string unused: this update is already installed
+WARNING: translation string unused: this weeks volume
+WARNING: translation string unused: time date manually reset
+WARNING: translation string unused: to email adr
+WARNING: translation string unused: to install an update
+WARNING: translation string unused: to warn email bad
+WARNING: translation string unused: too long 80 char max
+WARNING: translation string unused: traffic back
+WARNING: translation string unused: traffic calc time
+WARNING: translation string unused: traffic calc time bad
+WARNING: translation string unused: traffic info messages
+WARNING: translation string unused: traffic monitor
+WARNING: translation string unused: traffic shaping
+WARNING: translation string unused: traffic shaping settings
+WARNING: translation string unused: traffic warn level bad
+WARNING: translation string unused: trafficblue
+WARNING: translation string unused: trafficdate
+WARNING: translation string unused: trafficfrom
+WARNING: translation string unused: trafficgreen
+WARNING: translation string unused: trafficin
+WARNING: translation string unused: trafficorange
+WARNING: translation string unused: trafficout
+WARNING: translation string unused: trafficred
+WARNING: translation string unused: trafficsum
+WARNING: translation string unused: trafficto
+WARNING: translation string unused: transfer limits
+WARNING: translation string unused: transparent on
+WARNING: translation string unused: umount
+WARNING: translation string unused: umount removable media before to unplug
+WARNING: translation string unused: unencrypted
+WARNING: translation string unused: unknown
+WARNING: translation string unused: update transcript
+WARNING: translation string unused: updates
+WARNING: translation string unused: updates is old1
+WARNING: translation string unused: updates is old2
+WARNING: translation string unused: updxlrtr children
+WARNING: translation string unused: updxlrtr invalid num of children
+WARNING: translation string unused: updxlrtr unknown
+WARNING: translation string unused: updxlrtr update information
+WARNING: translation string unused: updxlrtr update notification
+WARNING: translation string unused: upload fcdsl.o
+WARNING: translation string unused: upload file
+WARNING: translation string unused: upload static key
+WARNING: translation string unused: upload successful
+WARNING: translation string unused: upload synch.bin
+WARNING: translation string unused: upload update file
+WARNING: translation string unused: upstream password
+WARNING: translation string unused: upstream proxy host:port
+WARNING: translation string unused: upstream username
+WARNING: translation string unused: uptime and users
+WARNING: translation string unused: urlfilter background image
+WARNING: translation string unused: urlfilter background text
+WARNING: translation string unused: urlfilter enable jpeg
+WARNING: translation string unused: urlfilter update information
+WARNING: translation string unused: urlfilter update notification
+WARNING: translation string unused: urlfilter update results
+WARNING: translation string unused: urlfilter upload background
+WARNING: translation string unused: use
+WARNING: translation string unused: use dov
+WARNING: translation string unused: use ibod
+WARNING: translation string unused: view log
+WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn on blue
+WARNING: translation string unused: vpn on green
+WARNING: translation string unused: vpn on orange
+WARNING: translation string unused: warn when traffic reaches
+WARNING: translation string unused: web proxy configuration
+WARNING: translation string unused: weekly firewallhits
+WARNING: translation string unused: xtaccess bad transfert
+WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: Async logging enabled
+WARNING: untranslated string: Scan for Songs
+WARNING: untranslated string: Set time on boot
+WARNING: untranslated string: bytes
+WARNING: untranslated string: fireinfo ipfire version
+WARNING: untranslated string: fireinfo is disabled
+WARNING: untranslated string: fireinfo is enabled
+WARNING: untranslated string: fireinfo is submitted
+WARNING: untranslated string: fireinfo is submitted button
+WARNING: untranslated string: fireinfo kernel version
+WARNING: untranslated string: fireinfo not submitted
+WARNING: untranslated string: fireinfo not submitted button
+WARNING: untranslated string: fireinfo pakfire version
+WARNING: untranslated string: fireinfo please enable
+WARNING: untranslated string: fireinfo settings
+WARNING: untranslated string: fireinfo system version
+WARNING: untranslated string: fireinfo why descr1
+WARNING: untranslated string: fireinfo why descr2
+WARNING: untranslated string: fireinfo why enable
+WARNING: untranslated string: fireinfo why read more
+WARNING: untranslated string: fireinfo your profile id
+WARNING: untranslated string: minute
+WARNING: untranslated string: new
+WARNING: untranslated string: outgoing firewall add ip group
+WARNING: untranslated string: outgoing firewall add mac group
+WARNING: untranslated string: outgoing firewall edit ip group
+WARNING: untranslated string: outgoing firewall edit mac group
+WARNING: untranslated string: outgoing firewall group error
+WARNING: untranslated string: outgoing firewall groups
+WARNING: untranslated string: outgoing firewall ip groups
+WARNING: untranslated string: outgoing firewall mac groups
+WARNING: untranslated string: outgoing firewall p2p allow
+WARNING: untranslated string: outgoing firewall p2p deny
+WARNING: untranslated string: outgoing firewall p2p description 1
+WARNING: untranslated string: outgoing firewall p2p description 2
+WARNING: untranslated string: outgoing firewall p2p description 3
+WARNING: untranslated string: outgoing firewall reserved groupname
+WARNING: untranslated string: outgoing firewall view group
+WARNING: untranslated string: pakfire ago
+WARNING: untranslated string: route config changed
+WARNING: untranslated string: routing config added
+WARNING: untranslated string: routing config changed
+WARNING: untranslated string: routing table
+WARNING: untranslated string: static routes
+WARNING: untranslated string: system information
+WARNING: untranslated string: vpn keyexchange

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
new file mode 100644 (file)
index 0000000..9add81b
--- /dev/null
+++ b/doc/language_issues.ru
@@ -0,0 +1,513 @@
+WARNING: translation string unused: Act as
+WARNING: translation string unused: Client status and controlc
+WARNING: translation string unused: ConnSched scheduler
+WARNING: translation string unused: ConnSched select profile
+WARNING: translation string unused: HDD temperature
+WARNING: translation string unused: Level7 rule
+WARNING: translation string unused: Local VPN IP
+WARNING: translation string unused: Ping
+WARNING: translation string unused: Remote IP
+WARNING: translation string unused: Remote VPN IP
+WARNING: translation string unused: Resolv
+WARNING: translation string unused: TOS Bits
+WARNING: translation string unused: Verbose
+WARNING: translation string unused: access refused with this oinkcode
+WARNING: translation string unused: add network
+WARNING: translation string unused: add new ovpn
+WARNING: translation string unused: add service
+WARNING: translation string unused: add-route
+WARNING: translation string unused: admin user password has been changed
+WARNING: translation string unused: administrator user password
+WARNING: translation string unused: advproxy LDAP auth
+WARNING: translation string unused: advproxy NTLM auth
+WARNING: translation string unused: advproxy advanced proxy
+WARNING: translation string unused: advproxy chgwebpwd ERROR
+WARNING: translation string unused: advproxy chgwebpwd SUCCESS
+WARNING: translation string unused: advproxy chgwebpwd change password
+WARNING: translation string unused: advproxy chgwebpwd change web password
+WARNING: translation string unused: advproxy chgwebpwd new password
+WARNING: translation string unused: advproxy chgwebpwd new password confirm
+WARNING: translation string unused: advproxy chgwebpwd old password
+WARNING: translation string unused: advproxy chgwebpwd username
+WARNING: translation string unused: advproxy cre disabled
+WARNING: translation string unused: advproxy errmsg change fail
+WARNING: translation string unused: advproxy errmsg change success
+WARNING: translation string unused: advproxy errmsg invalid user
+WARNING: translation string unused: advproxy errmsg no password
+WARNING: translation string unused: advproxy errmsg password incorrect
+WARNING: translation string unused: advproxy no cre groups
+WARNING: translation string unused: advproxy ssadvanced proxy
+WARNING: translation string unused: advproxy update information
+WARNING: translation string unused: advproxy update notification
+WARNING: translation string unused: alcatelusb help
+WARNING: translation string unused: alcatelusb upload
+WARNING: translation string unused: all interfaces
+WARNING: translation string unused: all updates installed
+WARNING: translation string unused: allmsg
+WARNING: translation string unused: alt information
+WARNING: translation string unused: alt ovpn
+WARNING: translation string unused: and
+WARNING: translation string unused: ansi t1.483
+WARNING: translation string unused: apply
+WARNING: translation string unused: archive not exist
+WARNING: translation string unused: available updates
+WARNING: translation string unused: backup archive
+WARNING: translation string unused: backup clear archive
+WARNING: translation string unused: backup config floppy
+WARNING: translation string unused: backup configuration
+WARNING: translation string unused: backup erase key
+WARNING: translation string unused: backup explain key
+WARNING: translation string unused: backup explain key li1
+WARNING: translation string unused: backup explain key li2
+WARNING: translation string unused: backup explain key li3
+WARNING: translation string unused: backup explain key no1
+WARNING: translation string unused: backup explain key no2
+WARNING: translation string unused: backup export key
+WARNING: translation string unused: backup extract key
+WARNING: translation string unused: backup generate key
+WARNING: translation string unused: backup import dat file
+WARNING: translation string unused: backup import key
+WARNING: translation string unused: backup key
+WARNING: translation string unused: backup key file
+WARNING: translation string unused: backup key info
+WARNING: translation string unused: backup media info
+WARNING: translation string unused: backup missing key
+WARNING: translation string unused: backup password
+WARNING: translation string unused: backup protect key password
+WARNING: translation string unused: backup sets
+WARNING: translation string unused: backup to floppy
+WARNING: translation string unused: bad characters in
+WARNING: translation string unused: bewan adsl pci st
+WARNING: translation string unused: bewan adsl usb
+WARNING: translation string unused: bitrate
+WARNING: translation string unused: bleeding rules
+WARNING: translation string unused: blue access use hint
+WARNING: translation string unused: blue interface
+WARNING: translation string unused: cache management
+WARNING: translation string unused: cache size
+WARNING: translation string unused: calamaris report interval (in minutes)
+WARNING: translation string unused: calc traffic all x minutes
+WARNING: translation string unused: capsinactive
+WARNING: translation string unused: cfg restart
+WARNING: translation string unused: check for net traffic update
+WARNING: translation string unused: choose config
+WARNING: translation string unused: choose media
+WARNING: translation string unused: clear cache
+WARNING: translation string unused: compression
+WARNING: translation string unused: connect
+WARNING: translation string unused: connect the modem
+WARNING: translation string unused: core notice 1
+WARNING: translation string unused: core notice 2
+WARNING: translation string unused: core notice 3
+WARNING: translation string unused: could not connect to
+WARNING: translation string unused: could not connect to www ipcop org
+WARNING: translation string unused: could not connect to www ipfire org
+WARNING: translation string unused: could not create directory
+WARNING: translation string unused: could not download latest patch list
+WARNING: translation string unused: could not download the available updates list
+WARNING: translation string unused: could not open available updates file
+WARNING: translation string unused: could not open installed updates file
+WARNING: translation string unused: could not open update information file
+WARNING: translation string unused: create
+WARNING: translation string unused: create new backup
+WARNING: translation string unused: current dynamic leases
+WARNING: translation string unused: current media
+WARNING: translation string unused: current ovpn
+WARNING: translation string unused: current profile
+WARNING: translation string unused: custom networks
+WARNING: translation string unused: custom services
+WARNING: translation string unused: daily firewallhits
+WARNING: translation string unused: dat without key
+WARNING: translation string unused: dbfile
+WARNING: translation string unused: ddns help dnsmadeeasy
+WARNING: translation string unused: ddns help freedns
+WARNING: translation string unused: ddns help plus
+WARNING: translation string unused: debugme
+WARNING: translation string unused: deep scan directories
+WARNING: translation string unused: default networks
+WARNING: translation string unused: default services
+WARNING: translation string unused: dhcp base ip fixed lease
+WARNING: translation string unused: dhcp create fixed leases
+WARNING: translation string unused: dhcp fixed lease err1
+WARNING: translation string unused: dhcp fixed lease help1
+WARNING: translation string unused: dhcp mode
+WARNING: translation string unused: dhcp server disabled on blue interface
+WARNING: translation string unused: dhcp server enabled on blue interface
+WARNING: translation string unused: dial user password
+WARNING: translation string unused: dial user password has been changed
+WARNING: translation string unused: dialup settings
+WARNING: translation string unused: disconnect
+WARNING: translation string unused: display traffic at home
+WARNING: translation string unused: dns server
+WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: done
+WARNING: translation string unused: driver
+WARNING: translation string unused: dynamic dns client
+WARNING: translation string unused: eciadsl help
+WARNING: translation string unused: eciadsl upload
+WARNING: translation string unused: edit network
+WARNING: translation string unused: edit service
+WARNING: translation string unused: editor
+WARNING: translation string unused: email server can not be empty
+WARNING: translation string unused: enable javascript
+WARNING: translation string unused: enabled on
+WARNING: translation string unused: enabledtitle
+WARNING: translation string unused: encrypted
+WARNING: translation string unused: err bk 1
+WARNING: translation string unused: err bk 10 password
+WARNING: translation string unused: err bk 2 key
+WARNING: translation string unused: err bk 3 tar
+WARNING: translation string unused: err bk 4 gz
+WARNING: translation string unused: err bk 5 encrypt
+WARNING: translation string unused: err rs 1
+WARNING: translation string unused: err rs 6 decrypt
+WARNING: translation string unused: err rs 7 untartst
+WARNING: translation string unused: err rs 8 untar
+WARNING: translation string unused: error config
+WARNING: translation string unused: error external access
+WARNING: translation string unused: expected
+WARNING: translation string unused: exportkey
+WARNING: translation string unused: external access rule changed
+WARNING: translation string unused: filename
+WARNING: translation string unused: firewall graphs
+WARNING: translation string unused: firewall log viewer
+WARNING: translation string unused: firmware
+WARNING: translation string unused: firmware upload
+WARNING: translation string unused: force update
+WARNING: translation string unused: frequency
+WARNING: translation string unused: fritzdsl help
+WARNING: translation string unused: fritzdsl upload
+WARNING: translation string unused: from email adr
+WARNING: translation string unused: from email pw
+WARNING: translation string unused: from email server
+WARNING: translation string unused: from email user
+WARNING: translation string unused: from warn email bad
+WARNING: translation string unused: g.dtm
+WARNING: translation string unused: g.lite
+WARNING: translation string unused: gen static key
+WARNING: translation string unused: generate
+WARNING: translation string unused: genkey
+WARNING: translation string unused: green interface
+WARNING: translation string unused: gz with key
+WARNING: translation string unused: hint
+WARNING: translation string unused: host
+WARNING: translation string unused: host configuration
+WARNING: translation string unused: hostname and domain already in use
+WARNING: translation string unused: hours2
+WARNING: translation string unused: ibod for dual isdn only
+WARNING: translation string unused: icmp selected but no type
+WARNING: translation string unused: icmp type
+WARNING: translation string unused: id
+WARNING: translation string unused: ids preprocessor
+WARNING: translation string unused: import
+WARNING: translation string unused: importkey
+WARNING: translation string unused: in
+WARNING: translation string unused: incorrect password
+WARNING: translation string unused: insert floppy
+WARNING: translation string unused: insert removable device
+WARNING: translation string unused: install new update
+WARNING: translation string unused: installed
+WARNING: translation string unused: installed updates
+WARNING: translation string unused: intrusion detection system log viewer
+WARNING: translation string unused: invalid cache size
+WARNING: translation string unused: invalid date entered
+WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid loaded file
+WARNING: translation string unused: invalid md5sum
+WARNING: translation string unused: invalid port list
+WARNING: translation string unused: invalid time entered
+WARNING: translation string unused: invalid uplink speed
+WARNING: translation string unused: invalid upstream proxy username or password setting
+WARNING: translation string unused: invert
+WARNING: translation string unused: ip address in use
+WARNING: translation string unused: ipfire side
+WARNING: translation string unused: ipfire side is invalid
+WARNING: translation string unused: iptable rules
+WARNING: translation string unused: isdn
+WARNING: translation string unused: isdn settings
+WARNING: translation string unused: isdn1
+WARNING: translation string unused: isdn2
+WARNING: translation string unused: javascript menu error1
+WARNING: translation string unused: javascript menu error2
+WARNING: translation string unused: kernel version
+WARNING: translation string unused: key stuff
+WARNING: translation string unused: lateprompting
+WARNING: translation string unused: length
+WARNING: translation string unused: line
+WARNING: translation string unused: loaded modules
+WARNING: translation string unused: local hard disk
+WARNING: translation string unused: localkeyfile
+WARNING: translation string unused: log enabled
+WARNING: translation string unused: log viewer
+WARNING: translation string unused: loosedirectorychecking
+WARNING: translation string unused: ls_dhcpd
+WARNING: translation string unused: ls_disk space
+WARNING: translation string unused: ls_free/swan
+WARNING: translation string unused: ls_httpd
+WARNING: translation string unused: ls_init
+WARNING: translation string unused: ls_kernel
+WARNING: translation string unused: ls_modprobe
+WARNING: translation string unused: ls_pam_unix
+WARNING: translation string unused: ls_sshd
+WARNING: translation string unused: ls_syslogd
+WARNING: translation string unused: mac address error not 00
+WARNING: translation string unused: manage ovpn
+WARNING: translation string unused: manual control and status
+WARNING: translation string unused: marked
+WARNING: translation string unused: max incoming size
+WARNING: translation string unused: max outgoing size
+WARNING: translation string unused: max size
+WARNING: translation string unused: mbmon fan in
+WARNING: translation string unused: mbmon graphs
+WARNING: translation string unused: mbmon temp in
+WARNING: translation string unused: mbmon value
+WARNING: translation string unused: min size
+WARNING: translation string unused: missing dat
+WARNING: translation string unused: missing gz
+WARNING: translation string unused: modem on com1
+WARNING: translation string unused: modem on com2
+WARNING: translation string unused: modem on com3
+WARNING: translation string unused: modem on com4
+WARNING: translation string unused: modem on com5
+WARNING: translation string unused: modulation
+WARNING: translation string unused: monthly firewallhits
+WARNING: translation string unused: monthly start day bad
+WARNING: translation string unused: monthly traffic bad
+WARNING: translation string unused: monthly volume
+WARNING: translation string unused: monthly volume start day
+WARNING: translation string unused: monthly volume start day short
+WARNING: translation string unused: mount
+WARNING: translation string unused: nat-traversal
+WARNING: translation string unused: net address
+WARNING: translation string unused: net config type
+WARNING: translation string unused: net config type help
+WARNING: translation string unused: net-traffic configuration
+WARNING: translation string unused: network added
+WARNING: translation string unused: network configuration
+WARNING: translation string unused: network removed
+WARNING: translation string unused: network status information
+WARNING: translation string unused: network traffic graphs
+WARNING: translation string unused: network updated
+WARNING: translation string unused: networks settings
+WARNING: translation string unused: new optionsfw must boot
+WARNING: translation string unused: no alcatelusb firmware
+WARNING: translation string unused: no cfg upload
+WARNING: translation string unused: no eciadsl synch.bin file
+WARNING: translation string unused: no fritzdsl driver
+WARNING: translation string unused: no information available
+WARNING: translation string unused: no modem selected
+WARNING: translation string unused: no set selected
+WARNING: translation string unused: nonetworkname
+WARNING: translation string unused: noservicename
+WARNING: translation string unused: notes
+WARNING: translation string unused: o-no
+WARNING: translation string unused: o-yes
+WARNING: translation string unused: online help en
+WARNING: translation string unused: only red
+WARNING: translation string unused: openvpn client
+WARNING: translation string unused: openvpn server
+WARNING: translation string unused: optional data
+WARNING: translation string unused: optionsfw portlist hint
+WARNING: translation string unused: optionsfw warning
+WARNING: translation string unused: or
+WARNING: translation string unused: original
+WARNING: translation string unused: other countries
+WARNING: translation string unused: out
+WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
+WARNING: translation string unused: ovpn
+WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn dl
+WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn_fastio
+WARNING: translation string unused: ovpn_fragment
+WARNING: translation string unused: ovpn_mssfix
+WARNING: translation string unused: ovpn_mtudisc
+WARNING: translation string unused: ovpn_processprio
+WARNING: translation string unused: ovpn_processprioD
+WARNING: translation string unused: ovpn_processprioED
+WARNING: translation string unused: ovpn_processprioEH
+WARNING: translation string unused: ovpn_processprioEN
+WARNING: translation string unused: ovpn_processprioH
+WARNING: translation string unused: ovpn_processprioLN
+WARNING: translation string unused: ovpn_processprioN
+WARNING: translation string unused: ovpn_processprioVD
+WARNING: translation string unused: ovpn_processprioVH
+WARNING: translation string unused: ovpnstatus log
+WARNING: translation string unused: ovpnsys log
+WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire updates
+WARNING: translation string unused: password contains illegal characters
+WARNING: translation string unused: password crypting key
+WARNING: translation string unused: passwords must be at least 6 characters in length
+WARNING: translation string unused: phonebook entry
+WARNING: translation string unused: ping disabled
+WARNING: translation string unused: polfile
+WARNING: translation string unused: ports
+WARNING: translation string unused: pots
+WARNING: translation string unused: pppoe
+WARNING: translation string unused: present
+WARNING: translation string unused: profiles
+WARNING: translation string unused: proxy access graphs
+WARNING: translation string unused: proxy no proxy extend
+WARNING: translation string unused: proxy no proxy local
+WARNING: translation string unused: proxy port
+WARNING: translation string unused: psk
+WARNING: translation string unused: quick control
+WARNING: translation string unused: reboot schedule
+WARNING: translation string unused: rebooting
+WARNING: translation string unused: refresh update list
+WARNING: translation string unused: released
+WARNING: translation string unused: removable device advice
+WARNING: translation string unused: reportfile
+WARNING: translation string unused: requested data
+WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: root
+WARNING: translation string unused: root path
+WARNING: translation string unused: root user password
+WARNING: translation string unused: route subnet is invalid
+WARNING: translation string unused: router ip
+WARNING: translation string unused: rules already up to date
+WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: save error
+WARNING: translation string unused: select media
+WARNING: translation string unused: selecttraffic
+WARNING: translation string unused: send email notification
+WARNING: translation string unused: send test mail
+WARNING: translation string unused: server reserved
+WARNING: translation string unused: service added
+WARNING: translation string unused: service removed
+WARNING: translation string unused: service updated
+WARNING: translation string unused: servicename
+WARNING: translation string unused: services settings
+WARNING: translation string unused: shaping add options
+WARNING: translation string unused: shaping list options
+WARNING: translation string unused: show areas
+WARNING: translation string unused: show lines
+WARNING: translation string unused: shutdown control
+WARNING: translation string unused: shutdown2
+WARNING: translation string unused: shutting down
+WARNING: translation string unused: sitekeyfile
+WARNING: translation string unused: smbreload
+WARNING: translation string unused: sort ascending
+WARNING: translation string unused: sort descending
+WARNING: translation string unused: squid extension methods
+WARNING: translation string unused: squid extension methods invalid
+WARNING: translation string unused: squid fix cache
+WARNING: translation string unused: ssh access tip
+WARNING: translation string unused: ssh1 disabled
+WARNING: translation string unused: ssh1 enabled
+WARNING: translation string unused: ssh1 support
+WARNING: translation string unused: ssnetwork status
+WARNING: translation string unused: sspasswords
+WARNING: translation string unused: ssproxy graphs
+WARNING: translation string unused: sssystem status
+WARNING: translation string unused: sstraffic graphs
+WARNING: translation string unused: subject test
+WARNING: translation string unused: subject warn
+WARNING: translation string unused: subnet
+WARNING: translation string unused: subnet is invalid
+WARNING: translation string unused: successfully refreshed updates list
+WARNING: translation string unused: system graphs
+WARNING: translation string unused: system log viewer
+WARNING: translation string unused: system status information
+WARNING: translation string unused: test
+WARNING: translation string unused: test email could not be sent
+WARNING: translation string unused: test email was sent
+WARNING: translation string unused: the following update was successfully installed
+WARNING: translation string unused: there are updates
+WARNING: translation string unused: there are updates available
+WARNING: translation string unused: this feature has been sponsored by
+WARNING: translation string unused: this is not a valid archive
+WARNING: translation string unused: this is not an authorised update
+WARNING: translation string unused: this months volume
+WARNING: translation string unused: this update is already installed
+WARNING: translation string unused: this weeks volume
+WARNING: translation string unused: time date manually reset
+WARNING: translation string unused: to email adr
+WARNING: translation string unused: to install an update
+WARNING: translation string unused: to warn email bad
+WARNING: translation string unused: too long 80 char max
+WARNING: translation string unused: traffic back
+WARNING: translation string unused: traffic calc time
+WARNING: translation string unused: traffic calc time bad
+WARNING: translation string unused: traffic info messages
+WARNING: translation string unused: traffic monitor
+WARNING: translation string unused: traffic shaping
+WARNING: translation string unused: traffic shaping settings
+WARNING: translation string unused: traffic warn level bad
+WARNING: translation string unused: trafficblue
+WARNING: translation string unused: trafficdate
+WARNING: translation string unused: trafficfrom
+WARNING: translation string unused: trafficgreen
+WARNING: translation string unused: trafficin
+WARNING: translation string unused: trafficorange
+WARNING: translation string unused: trafficout
+WARNING: translation string unused: trafficred
+WARNING: translation string unused: trafficsum
+WARNING: translation string unused: trafficto
+WARNING: translation string unused: transfer limits
+WARNING: translation string unused: transparent on
+WARNING: translation string unused: umount
+WARNING: translation string unused: umount removable media before to unplug
+WARNING: translation string unused: unencrypted
+WARNING: translation string unused: unknown
+WARNING: translation string unused: update transcript
+WARNING: translation string unused: updates
+WARNING: translation string unused: updates is old1
+WARNING: translation string unused: updates is old2
+WARNING: translation string unused: updxlrtr children
+WARNING: translation string unused: updxlrtr invalid num of children
+WARNING: translation string unused: updxlrtr unknown
+WARNING: translation string unused: updxlrtr update information
+WARNING: translation string unused: updxlrtr update notification
+WARNING: translation string unused: upload fcdsl.o
+WARNING: translation string unused: upload file
+WARNING: translation string unused: upload static key
+WARNING: translation string unused: upload successful
+WARNING: translation string unused: upload synch.bin
+WARNING: translation string unused: upload update file
+WARNING: translation string unused: upstream password
+WARNING: translation string unused: upstream proxy host:port
+WARNING: translation string unused: upstream username
+WARNING: translation string unused: uptime and users
+WARNING: translation string unused: urlfilter background image
+WARNING: translation string unused: urlfilter background text
+WARNING: translation string unused: urlfilter enable jpeg
+WARNING: translation string unused: urlfilter update information
+WARNING: translation string unused: urlfilter update notification
+WARNING: translation string unused: urlfilter update results
+WARNING: translation string unused: urlfilter upload background
+WARNING: translation string unused: use
+WARNING: translation string unused: use dov
+WARNING: translation string unused: use ibod
+WARNING: translation string unused: view log
+WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn on blue
+WARNING: translation string unused: vpn on green
+WARNING: translation string unused: vpn on orange
+WARNING: translation string unused: warn when traffic reaches
+WARNING: translation string unused: web proxy configuration
+WARNING: translation string unused: weekly firewallhits
+WARNING: translation string unused: xtaccess bad transfert
+WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: Add a route
+WARNING: untranslated string: Edit an existing route
+WARNING: untranslated string: Scan for Songs
+WARNING: untranslated string: bytes
+WARNING: untranslated string: extrahd because there is already a device mounted
+WARNING: untranslated string: extrahd cant umount
+WARNING: untranslated string: extrahd install or load driver
+WARNING: untranslated string: extrahd maybe the device is in use
+WARNING: untranslated string: extrahd to
+WARNING: untranslated string: extrahd to root
+WARNING: untranslated string: extrahd you cant mount
+WARNING: untranslated string: minute
+WARNING: untranslated string: new
+WARNING: untranslated string: outgoing firewall reserved groupname
+WARNING: untranslated string: route config changed
+WARNING: untranslated string: routing config added
+WARNING: untranslated string: routing config changed
+WARNING: untranslated string: routing table
+WARNING: untranslated string: static routes
+WARNING: untranslated string: vpn keyexchange

diff --git a/doc/language_missings b/doc/language_missings
index d0ba138976c8c868fef1727cf7353c0af645097b..5dc1daef11b092f4050d0eb4ce5145678be97af8 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -11,7 +11,6 @@
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
 < dns address deleted txt
-< extrahd detected drives
 < fireinfo ipfire version
 < fireinfo is disabled
 < fireinfo is enabled
@@ -29,13 +28,16 @@
 < fireinfo why enable
 < fireinfo why read more
 < fireinfo your profile id
+< minute
 < ntp common settings
 < ntp sync
 < snort working
+< static routes
 < system information
 < upload new ruleset
 < urlfilter file ext block
 < urlfilter mode block
+< vpn keyexchange
 < wlanap access point
 < wlanap channel
 < wlanap debugging
@@ -80,6 +82,7 @@
 < fireinfo why enable
 < fireinfo why read more
 < fireinfo your profile id
+< minute
 < outgoing firewall add ip group
 < outgoing firewall add mac group
 < outgoing firewall edit ip group
@@ -95,4 +98,44 @@
 < outgoing firewall p2p description 3
 < outgoing firewall view group
 < Set time on boot
+< static routes
 < system information
+< vpn keyexchange
+############################################################################
+# Checking install/setup translations for language: pl                     #
+############################################################################
+############################################################################
+# Checking cgi-bin translations for language: pl                           #
+############################################################################
+< extrahd because there is already a device mounted
+< extrahd cant umount
+< extrahd install or load driver
+< extrahd maybe the device is in use
+< extrahd to
+< extrahd to root
+< extrahd unable to read
+< extrahd unable to write
+< extrahd you cant mount
+< minute
+< static routes
+< vpn keyexchange
+############################################################################
+# Checking install/setup translations for language: ru                     #
+############################################################################
+############################################################################
+# Checking cgi-bin translations for language: ru                           #
+############################################################################
+< Add a route
+< Edit an existing route
+< extrahd because there is already a device mounted
+< extrahd cant umount
+< extrahd install or load driver
+< extrahd maybe the device is in use
+< extrahd to
+< extrahd to root
+< extrahd unable to read
+< extrahd unable to write
+< extrahd you cant mount
+< minute
+< static routes
+< vpn keyexchange

diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi
index f7ae56852d8b4da6cb3c2513ecb6c7eca034dc47..4453542475ac6a0cd6996cb148c8bcadd9403778 100644 (file)
--- a/html/cgi-bin/ddns.cgi
+++ b/html/cgi-bin/ddns.cgi
@@ -139,11 +139,13 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) {
        }
        
        # Permit an empty HOSTNAME for the nsupdate, regfish, dyndns, enom, ovh, zoneedit, no-ip, easydns
+       #and namecheap
         unless ($settings{'SERVICE'} eq 'zoneedit.com' || $settings{'SERVICE'} eq 'nsupdate' || 
                $settings{'SERVICE'} eq 'dyndns-custom'|| $settings{'SERVICE'} eq 'regfish.com' || 
                $settings{'SERVICE'} eq 'enom.com' || $settings{'SERVICE'} eq 'dnspark.com' ||
                $settings{'SERVICE'} eq 'ovh.com' || $settings{'HOSTNAME'} ne '' ||
-               $settings{'SERVICE'} eq 'no-ip.com' || $settings{'SERVICE'} eq 'easydns.com' ) {
+               $settings{'SERVICE'} eq 'no-ip.com' || $settings{'SERVICE'} eq 'easydns.com'  ||
+               $settings{'SERVICE'} eq 'namecheap.com' )       {
            $errormessage = $Lang::tr{'hostname not set'};
        }
        unless ($settings{'HOSTNAME'} eq '' || $settings{'HOSTNAME'} =~ /^[a-zA-Z_0-9-]+$/) {
@@ -243,6 +245,7 @@ $checked{'SERVICE'}{'easydns.com'} = '';
 $checked{'SERVICE'}{'enom.com'} = '';
 $checked{'SERVICE'}{'freedns.afraid.org'} = '';
 $checked{'SERVICE'}{'hn.org'} = '';
+$checked{'SERVICE'}{'namecheap.com'} = '';
 $checked{'SERVICE'}{'no-ip.com'} = '';
 $checked{'SERVICE'}{'nsupdate'} = '';
 $checked{'SERVICE'}{'ovh.com'} = '';
@@ -336,6 +339,7 @@ print <<END
     <option $checked{'SERVICE'}{'enom.com'}>enom.com</option>
     <option $checked{'SERVICE'}{'freedns.afraid.org'}>freedns.afraid.org</option>
     <option $checked{'SERVICE'}{'hn.org'}>hn.org</option>
+       <option $checked{'SERVICE'}{'namecheap.com'}>namecheap.com</option>
     <option $checked{'SERVICE'}{'no-ip.com'}>no-ip.com</option>
     <option $checked{'SERVICE'}{'nsupdate'}>nsupdate</option>
     <option $checked{'SERVICE'}{'ovh.com'}>ovh.com</option>

diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
index 3bb6afd8deade3e0905751dea9762c3146985e6d..86b0de5c37e6cfff31d2f87ca064f025bf73ddc7 100644 (file)
--- a/html/cgi-bin/extrahd.cgi
+++ b/html/cgi-bin/extrahd.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2011  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        #
@@ -79,11 +79,11 @@ if ($extrahdsettings{'ACTION'} eq $Lang::tr{'add'})
                @deviceline = split( /\;/, $deviceentry );
                if ( "$extrahdsettings{'PATH'}" eq "$deviceline[2]" ) {
                        $ok = "false";
-                       $errormessage = "You can't mount $extrahdsettings{'DEVICE'} to $extrahdsettings{'PATH'}, because there is already a device mounted.";
+                       $errormessage = "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{'DEVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'}$Lang::tr{'extrahd because there is already a device mounted'}.";
                }
                if ( "$extrahdsettings{'PATH'}" eq "/" ) {
                        $ok = "false";
-                       $errormessage = "You can't mount $extrahdsettings{'DEVICE'} to root /.";
+                       $errormessage = "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{'DEVICE'} $Lang::tr{'extrahd to root'}.";
                }
        }
 
@@ -113,7 +113,7 @@ elsif ($extrahdsettings{'ACTION'} eq $Lang::tr{'delete'})
                }
                close FILE;
        } else {
-               $errormessage = "Can't umount $extrahdsettings{'PATH'}. Maybe the device is in use?";
+               $errormessage = "$Lang::tr{'extrahd cant umount'} $extrahdsettings{'PATH'}$Lang::tr{'extrahd maybe the device is in use'}?";
        }
 }
 
@@ -143,10 +143,10 @@ END
                        $color=$Header::colourgreen;
                }
                print <<END
-                       <tr><td colspan="5">&nbsp;
-                       <tr><td align='center'><font color=$color><b>$deviceline[0]</b></font>
-                               <td align='center'>$deviceline[1]
-                               <td align='center'>$deviceline[2]
+                       <tr><td colspan="4">&nbsp;</td></tr>
+                       <tr><td align='left'><font color=$color><b>$deviceline[0]</b></font></td>
+                               <td align='left'>$deviceline[1]</td>
+                               <td align='left'>$deviceline[2]</td>
                                <td align='center'>
                                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                <input type='hidden' name='DEVICE' value='$deviceline[0]' />
@@ -154,7 +154,7 @@ END
                                                <input type='hidden' name='PATH' value='$deviceline[2]' />
                                                <input type='hidden' name='ACTION' value=$Lang::tr{'delete'} />
                                                <input type='image' alt=$Lang::tr{'delete'} src='/images/delete.gif' />
-                                       </form>
+                                       </form></td></tr>
 END
 ;
        }
@@ -179,21 +179,26 @@ END
        foreach $scanentry (sort @scans)
        {
                @scanline = split( /\;/, $scanentry );
-               print <<END
-                       <tr><td colspan="5">&nbsp;
-                       <tr><td align='left' colspan="2"><b>/dev/$scanline[0]</b>
-                               <td align='center' colspan="2">$scanline[1]
+               # remove wrong entries like usb controller name
+               if ($scanline[1] ne "\n")
+               {
+                       print <<END
+                               <tr><td colspan="5">&nbsp;</td></tr>
+                               <tr><td align='left' colspan="2"><b>/dev/$scanline[0]</b></td>
+                               <td align='center' colspan="2">$scanline[1]</td>
 END
 ;
+
+               }
                foreach $partitionentry (sort @partitions)
                {
                        @partitionline = split( /\;/, $partitionentry );
                        if ( "$partitionline[0]" eq "$scanline[0]" ) {
                                $size = int($partitionline[1] / 1024);
                                print <<END
-                               <td align='center'>$Lang::tr{'size'} $size MB
-                               <td>&nbsp;
-                               <tr><td colspan="5">&nbsp;
+                               <td align='center'>$Lang::tr{'size'} $size MB</td>
+                               <td>&nbsp;</td></tr>
+                               <tr><td colspan="5">&nbsp;</td></tr>
 END
 ;
                        }
@@ -206,24 +211,27 @@ END
                                $size = int($partitionline[1] / 1024);
                                print <<END
                                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                               <tr><td align="left" colspan=5><b>UUID=$partitionline[2]</b></td></tr>
+                               <tr><td align="left" colspan=5><strong>UUID=$partitionline[2]</strong></td></tr>
                                <tr>
                                <td align="list">/dev/$partitionline[0]</td>
-                               <td align="center">$Lang::tr{'size'} $size MB
+                               <td align="center">$Lang::tr{'size'} $size MB</td>
                                <td align="center"><select name="FS">
                                                                                <option value="auto">auto</option>
                                                                                <option value="ext3">ext3</option>
+                                                                               <option value="ext4">ext4</option>
                                                                                <option value="reiserfs">reiserfs</option>
                                                                                <option value="vfat">fat</option>
                                                                                <option value="ntfs-3g">ntfs (experimental)</option>
-                                                                          </select>
-                               <td align="center"><input type='text' name='PATH' value=/mnt/harddisk />
+                                                                          </select></td>
+                               <td align="center"><input type='text' name='PATH' value=/mnt/harddisk /></td>
                                <td align="center">
                                        <input type='hidden' name='DEVICE' value='$partitionline[0]' />
                                        <input type='hidden' name='UUID' value='$partitionline[2]' />
                                        <input type='hidden' name='ACTION' value=$Lang::tr{'add'} />
                                        <input type='image' alt=$Lang::tr{'add'} src='/images/add.gif' />
-                               </form>
+                               </form></td></tr>
+END
+;
 
 END
 ;
@@ -232,7 +240,9 @@ END
        }
 
        print <<END
-       <tr><td align="center" colspan="5">If your device isn't listed here, you need to install or load the driver.<br />If you can see your device but no partitions you have to create them first.
+       <tr><td align="center" colspan="5">&nbsp;</td></tr>
+       <tr><td align="center" colspan="5">&nbsp;</td></tr>
+       <tr><td align="center" colspan="5">$Lang::tr{'extrahd install or load driver'}</td></tr>
        </table>
 END
 ;

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index d372d5255a1cbba29b1613f69242907ebb29f186..0ef95ba8ca26c83d6f203736793b3ee7c3b17af5 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -369,7 +369,9 @@ END
                            $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
                        } else {
                            foreach my $line (@status) {
-                               if ($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) {
+                               if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
+                                   ($line =~/$confighash{$key}[1]\{.*INSTALLED/ ))
+                                   {
                                    $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
                                }
                           }

diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index fea9e6bf1e636d30dba894ce0b3f762f465623ce..c0da266f15849efb802071d995b86fe9b435e855 100644 (file)
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -60,7 +60,7 @@ my %sections = (
         'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
         'auth' => '(\w+\(pam_unix\)\[.*\]: )',
         'kernel' => '(kernel: (?!DROP_))',
-        'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |vpnwatch: )',
+        'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
         'openvpn' => '(openvpnserver)\[.*\]: ',
         'pakfire' => '(pakfire:) ',
         'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) '

diff --git a/html/cgi-bin/outgoinggrp.cgi b/html/cgi-bin/outgoinggrp.cgi
index e757ca08afb11f2a840f36995c2452e23809f73c..1c3d6952cd2a601906467328027756437f7030e4 100644 (file)
--- a/html/cgi-bin/outgoinggrp.cgi
+++ b/html/cgi-bin/outgoinggrp.cgi
@@ -87,6 +87,8 @@ if ($outgrpsettings{'ACTION'} eq 'newipgroup')
 
        if ( -e "$configpath/macgroups/$outgrpsettings{'ipgroup'}" ){
                $errormessage =  "$Lang::tr{'outgoing firewall group error'}";
+       } elsif ( $outgrpsettings{'ipgroup'} =~ /\W/ ){
+               $errormessage = $Lang::tr{'name must only contain characters'}." - ".$outgrpsettings{'ipgroup'};
        } elsif ( $outgrpsettings{'ipgroup'} eq "all" || $outgrpsettings{'ipgroup'} eq "red" || $outgrpsettings{'ipgroup'} eq "blue" ||
                        $outgrpsettings{'ipgroup'} eq "green" || $outgrpsettings{'ipgroup'} eq "orange" || $outgrpsettings{'ipgroup'} eq "ip" ||
                        $outgrpsettings{'ipgroup'} eq "mac" || $outgrpsettings{'ipgroup'} eq "ovpn" || $outgrpsettings{'ipgroup'} eq "ipsec" ) {
@@ -112,6 +114,8 @@ if ($outgrpsettings{'ACTION'} eq 'newmacgroup')
 
        if ( -e "$configpath/ipgroups/$outgrpsettings{'macgroup'}" ){
                $errormessage =  "$Lang::tr{'outgoing firewall group error'}";
+       } elsif ( $outgrpsettings{'macgroup'} =~ /\W/ ){
+               $errormessage = $Lang::tr{'name must only contain characters'}." - ".$outgrpsettings{'macgroup'};
        } elsif ( $outgrpsettings{'macgroup'} eq "all" || $outgrpsettings{'macgroup'} eq "red" || $outgrpsettings{'macgroup'} eq "blue" ||
                        $outgrpsettings{'macgroup'} eq "green" || $outgrpsettings{'macgroup'} eq "orange" || $outgrpsettings{'macgroup'} eq "ip" ||
                        $outgrpsettings{'macgroup'} eq "mac" || $outgrpsettings{'macgroup'} eq "ovpn" || $outgrpsettings{'macgroup'} eq "ipsec" ) {

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 124f912cf7155c27dff0872875ad1ce75ec689d0..5903d8525939d02ba3c2c4c770fd79699907ddda 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -43,7 +43,6 @@ $pakfiresettings{'VALID'} = '';
 $pakfiresettings{'INSPAKS'} = '';
 $pakfiresettings{'DELPAKS'} = '';
 $pakfiresettings{'AUTOUPDATE'} = 'off';
-$pakfiresettings{'AUTOUPGRADE'} = 'off';
 $pakfiresettings{'HEALTHCHECK'} = 'on';
 $pakfiresettings{'UUID'} = 'on';
 
@@ -153,12 +152,6 @@ END
                system("/usr/local/bin/pakfire disable updates  >/dev/null 2>&1");
        }
 
-       if ($pakfiresettings{'AUTOUPGRADE'} eq 'on') {
-               system("/usr/local/bin/pakfire enable upgrades >/dev/null 2>&1");
-       } else {
-               system("/usr/local/bin/pakfire disable upgrades >/dev/null 2>&1");
-       }
-
        &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);
 }
 
@@ -170,9 +163,6 @@ my %checked=();
 $checked{'AUTOUPDATE'}{'off'} = '';
 $checked{'AUTOUPDATE'}{'on'} = '';
 $checked{'AUTOUPDATE'}{$pakfiresettings{'AUTOUPDATE'}} = "checked='checked'";
-$checked{'AUTOUPGRADE'}{'off'} = '';
-$checked{'AUTOUPGRADE'}{'on'} = '';
-$checked{'AUTOUPGRADE'}{$pakfiresettings{'AUTOUPGRADE'}} = "checked='checked'";
 $checked{'HEALTHCHECK'}{'off'} = '';
 $checked{'HEALTHCHECK'}{'on'} = '';
 $checked{'HEALTHCHECK'}{$pakfiresettings{'HEALTHCHECK'}} = "checked='checked'";
@@ -302,9 +292,6 @@ print <<END;
                        <tr><td align='left' width='45%'>$Lang::tr{'pakfire update daily'}</td><td width="55%" align="left">
           on <input type='radio' name='AUTOUPDATE' value='on' $checked{'AUTOUPDATE'}{'on'} /> |
           <input type='radio' name='AUTOUPDATE' value='off' $checked{'AUTOUPDATE'}{'off'} /> off </td></tr>
-                       <tr><td align='left' width='45%'>$Lang::tr{'pakfire core update auto'}</td><td align="left">
-          on <input type='radio' name='AUTOUPGRADE' value='on' $checked{'AUTOUPGRADE'}{'on'} /> |
-          <input type='radio' name='AUTOUPGRADE' value='off' $checked{'AUTOUPGRADE'}{'off'} /> off </td></tr>
                        <tr><td align='left' width='45%'>$Lang::tr{'pakfire health check'}</td><td align="left">
           on <input type='radio' name='HEALTHCHECK' value='on' $checked{'HEALTHCHECK'}{'on'} /> |
           <input type='radio' name='HEALTHCHECK' value='off' $checked{'HEALTHCHECK'}{'off'} /> off </td></tr>          

diff --git a/html/cgi-bin/portfw.cgi b/html/cgi-bin/portfw.cgi
index 5583fb88a555eb4136f6383c99abedbdf606749a..199682f44fb81affd96cbaeab90538a3503ec5e7 100644 (file)
--- a/html/cgi-bin/portfw.cgi
+++ b/html/cgi-bin/portfw.cgi
@@ -1038,7 +1038,7 @@ sub disallowreserved
 {
        # port 67 and 68 same for tcp and udp, don't bother putting in an array
        my $msg = "";
-       my @tcp_reserved = (81,222,444);
+       my @tcp_reserved = ();
        my $prt = $_[0]; # the port or range
        my $ryn = $_[1]; # tells us whether or not it is a port range
        my $prot = $_[2]; # protocol

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 60c75d73654f4cf9aacc0d1bee3ea40fea1b298e..844058de3276cf249dde5669ce9603576b326f14 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -531,7 +531,7 @@ END
        open( FILE, "> $level7file" ) or die "Unable to write $level7file";
        print FILE <<END
 102;$qossettings{'RED_DEV'};dns;;;
-102;$qossettings{'RED_DEV'};sip;;;
+102;$qossettings{'RED_DEV'};rtp;;;
 102;$qossettings{'RED_DEV'};skypetoskype;;;
 103;$qossettings{'RED_DEV'};ssh;;;
 103;$qossettings{'RED_DEV'};rdp;;;
@@ -540,6 +540,7 @@ END
 104;$qossettings{'RED_DEV'};pop3;;;
 120;$qossettings{'RED_DEV'};applejuice;;;
 120;$qossettings{'RED_DEV'};bittorrent;;;
+200;imq0;rtp;;;
 200;imq0;skypetoskype;;;
 203;imq0;ssh;;;
 203;imq0;rdp;;;

diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi
new file mode 100644 (file)
index 0000000..86e0429
--- /dev/null
+++ b/html/cgi-bin/routing.cgi
@@ -0,0 +1,446 @@
+#!/usr/bin/perl
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+use strict;
+
+# enable only the following on debugging purpose
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
+
+require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
+
+#workaround to suppress a warning when a variable is used only once
+my @dummy = ( ${Header::colouryellow} );
+undef (@dummy);
+
+# Files used
+my $setting = "${General::swroot}/main/settings";
+our $datafile = "${General::swroot}/main/routing";             #(our: used in subroutine)
+
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
+our %settings = ();
+
+$settings{'EN'} = '';                  # reuse for dummy field in position zero
+$settings{'IP'} = '';
+$settings{'GATEWAY'} = '';
+$settings{'REMARK'} = '';
+my @nosaved=('EN','IP','GATEWAY','REMARK');    # List here ALL setting2 fields. Mandatory
+    
+$settings{'ACTION'} = '';              # add/edit/remove
+$settings{'KEY1'} = '';                        # point record for ACTION
+
+#Define each field that can be used to sort columns
+my $sortstring='^IP|^GATEWAY|^REMARK';
+$settings{'SORT_GATEWAYLIST'} = 'GATEWAY';
+my $errormessage = '';
+my $warnmessage = '';
+
+&Header::showhttpheaders();
+
+#Get GUI values
+&Header::getcgihash(\%settings);
+
+###############
+# DEBUG DEBUG
+#&Header::openbox('100%', 'left', 'DEBUG');
+#my $debugCount = 0;
+#foreach my $line (sort keys %settings) {
+#print "$line = $settings{$line}<br />\n";
+# $debugCount++;
+#}
+#print "&nbsp;Count: $debugCount\n";
+#&Header::closebox();
+# DEBUG DEBUG
+###############
+
+# Load multiline data
+our @current = ();
+if (open(FILE, "$datafile")) {
+    @current = <FILE>;
+    close (FILE);
+}
+
+## Settings1 Box not used...
+&General::readhash("${General::swroot}/main/settings", \%settings);
+
+
+## Now manipulate the multi-line list with Settings2
+# Basic actions are:
+#      toggle the check box
+#      add/update a new line
+#      begin editing a line
+#      remove a line
+
+
+# Toggle enable/disable field.  Field is in second position
+if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) {
+    #move out new line
+    chomp(@current[$settings{'KEY1'}]);
+    my @temp = split(/\,/,@current[$settings{'KEY1'}]);
+
+    $temp[0] = $temp[0] ne '' ? '' : 'on';             # Toggle the field
+    @current[$settings{'KEY1'}] = join (',',@temp)."\n";
+    $settings{'KEY1'} = '';                            # End edit mode
+    
+    &General::log($Lang::tr{'routing config changed'});
+
+    #Save current
+    open(FILE, ">$datafile") or die 'routing datafile error';
+    print FILE @current;
+    close(FILE);
+       
+    # Rebuild configuration file
+    &BuildConfiguration;
+}
+
+if ($settings{'ACTION'} eq $Lang::tr{'add'}) {
+
+# Validate inputs
+       if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){
+       $errormessage = $Lang::tr{'invalid ip'}." / ".$Lang::tr{'invalid netmask'};
+       }
+
+       if ($settings{'IP'} =~ /0.0.0.0/){
+       $errormessage = $Lang::tr{'invalid ip'}." - 0.0.0.0";
+       }
+
+       if( !&General::validip($settings{'GATEWAY'}) ) {
+       $errormessage = $Lang::tr{'invalid ip'}. " - ".$Lang::tr{'gateway ip'};
+       }
+
+    unless ($errormessage) {
+       if ($settings{'KEY1'} eq '') { #add or edit ?
+           unshift (@current, "$settings{'EN'},$settings{'IP'},$settings{'GATEWAY'},$settings{'REMARK'}\n");
+           &General::log($Lang::tr{'routing config added'});
+       } else {
+           @current[$settings{'KEY1'}] = "$settings{'EN'},$settings{'IP'},$settings{'GATEWAY'},$settings{'REMARK'}\n";
+           $settings{'KEY1'} = '';       # End edit mode
+           &General::log($Lang::tr{'routing config changed'});
+       }
+
+        # Write changes to config file.
+        &SortDataFile;                         # sort newly added/modified entry
+        &BuildConfiguration;                   # then re-build routing
+       
+       #map ($settings{$_}='' ,@nosaved);      # Clear fields
+    }
+}
+
+if ($settings{'ACTION'} eq $Lang::tr{'edit'}) {
+    #move out new line
+    my $line = @current[$settings{'KEY1'}];    # KEY1 is the index in current
+    chomp($line);
+    my @temp = split(/\,/, $line);
+    $settings{'EN'}=$temp[0];                  # Prepare the screen for editing
+    $settings{'IP'}=$temp[1];
+    $settings{'GATEWAY'}=$temp[2];
+    $settings{'REMARK'}=$temp[3];
+    &BuildConfiguration;
+}
+
+if ($settings{'ACTION'} eq $Lang::tr{'remove'}) {
+    splice (@current,$settings{'KEY1'},1);             # Delete line 
+    open(FILE, ">$datafile") or die 'route datafile error';
+    print FILE @current;
+    close(FILE);
+    $settings{'KEY1'} = '';                            # End remove mode
+    &General::log($Lang::tr{'route config changed'});
+
+    &BuildConfiguration;                               # then re-build conf which use new data
+}
+
+##  Check if sorting is asked
+# If same column clicked, reverse the sort.
+if ($ENV{'QUERY_STRING'} =~ /$sortstring/ ) {
+    my $newsort=$ENV{'QUERY_STRING'};
+    my $actual=$settings{'SORT_GATEWAYLIST'};
+    #Reverse actual sort ?
+    if ($actual =~ $newsort) {
+       my $Rev='';
+       if ($actual !~ 'Rev') {
+           $Rev='Rev';
+       }
+       $newsort.=$Rev;
+    }
+    $settings{'SORT_GATEWAYLIST'}=$newsort;
+    map (delete ($settings{$_}) ,(@nosaved,'ACTION','KEY1'));# Must never be saved
+    &General::writehash($setting, \%settings);
+    &SortDataFile;
+    $settings{'ACTION'} = 'SORT';                      # Create an 'ACTION'
+    map ($settings{$_} = '' ,@nosaved,'KEY1');         # and reinit vars to empty
+}
+
+if ($settings{'ACTION'} eq '' ) { # First launch from GUI
+    # Place here default value when nothing is initialized
+    $settings{'EN'} = 'on';
+    $settings{'GATEWAY'} = '';
+    $settings{'IP'} = '';
+}
+
+&Header::openpage($Lang::tr{'routing table entries'}, 1, '');
+&Header::openbigbox('100%', 'left', '', $errormessage);
+my %checked=();     # Checkbox manipulations
+
+if ($errormessage) {
+    &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+    print "<font class='base'>$errormessage&nbsp;</font>";
+    &Header::closebox();
+}
+
+#
+
+$checked{'EN'}{'on'} = ($settings{'EN'} eq '' ) ? '' : "checked='checked'";
+
+my $buttontext = $Lang::tr{'add'};
+if ($settings{'KEY1'} ne '') {
+    $buttontext = $Lang::tr{'update'};
+    &Header::openbox('100%', 'left', $Lang::tr{'Edit an existing route'});
+} else {
+    &Header::openbox('100%', 'left', $Lang::tr{'Add a route'});
+}
+
+#Edited line number (KEY1) passed until cleared by 'save' or 'remove' or 'new sort order'
+print <<END
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<input type='hidden' name='KEY1' value='$settings{'KEY1'}' />
+<table width='100%'>
+<tr>
+    <td class='base'>$Lang::tr{'host ip'} / $Lang::tr{'network'}:&nbsp;</td>
+    <td><input type='text' name='IP' value='$settings{'IP'}' size='25'/></td>
+</tr><tr>
+    <td class='base'>$Lang::tr{'gateway'}:&nbsp;</td>
+    <td><input type='text' name='GATEWAY' value='$settings{'GATEWAY'}' size='25'/></td>
+    <td class='base'>$Lang::tr{'enabled'}</td>
+    <td><input type='checkbox' name='EN' $checked{'EN'}{'on'} /></td>
+</tr>
+</tr>
+    <td class='base'>$Lang::tr{'remark'}:&nbsp;</td>
+    <td><input type='text' name='REMARK' value='$settings{'REMARK'}' size='25'/></td>
+</tr>
+</table>
+<hr />
+<table width='100%'>
+<tr>
+    <td width='50%' align='center'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td>
+</tr>
+</table>
+</form>
+END
+;
+&Header::closebox();
+
+&Header::openbox('100%', 'left', $Lang::tr{'routing table'});
+print <<END
+<hr />
+<table width='100%'>
+<tr>
+    <td width='30%' align='center'><a href='$ENV{'SCRIPT_NAME'}?IP'><b>$Lang::tr{'host ip'} / $Lang::tr{'network'}</b></a></td>
+    <td width='30%' align='center'><a href='$ENV{'SCRIPT_NAME'}?GATEWAY'><b>$Lang::tr{'gateway'}</b></a></td>
+    <td width='30%' align='center'><a href='$ENV{'SCRIPT_NAME'}?REMARK'><b>$Lang::tr{'remark'}</b></a></td>
+    <td width='10%' colspan='3' class='boldbase' align='center'><b>$Lang::tr{'action'}</b></td>
+</tr>
+END
+;
+
+#
+# Print each line of @current list
+#
+
+my $key = 0;
+foreach my $line (@current) {
+    chomp($line);                              # remove newline
+    my @temp=split(/\,/,$line);
+    $temp[2] ='' unless defined $temp[2]; # not always populated
+    $temp[3] ='' unless defined $temp[2]; # not always populated
+
+    #Choose icon for checkbox
+    my $gif = '';
+    my $gdesc = '';
+    if ($temp[0] ne '' ) {
+       $gif = 'on.gif';
+       $gdesc = $Lang::tr{'click to disable'};
+    } else {
+       $gif = 'off.gif';
+       $gdesc = $Lang::tr{'click to enable'}; 
+    }
+
+    #Colorize each line
+    if ($settings{'KEY1'} eq $key) {
+       print "<tr bgcolor='${Header::colouryellow}'>";
+    } elsif ($key % 2) {
+       print "<tr bgcolor='$color{'color22'}'>";
+    } else {
+       print "<tr bgcolor='$color{'color20'}'>"; 
+    }
+    print <<END
+<td align='center'>$temp[1]</td>
+<td align='center'>$temp[2]</td>
+<td align='center'>$temp[3]</td>
+<td align='center'>
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<input type='hidden' name='ACTION' value='$Lang::tr{'toggle enable disable'}' />
+<input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$gif' alt='$gdesc' title='$gdesc' />
+<input type='hidden' name='KEY1' value='$key' />
+</form>
+</td>
+
+<td align='center'>
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<input type='hidden' name='ACTION' value='$Lang::tr{'edit'}' />
+<input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' />
+<input type='hidden' name='KEY1' value='$key' />
+</form>
+</td>
+
+<td align='center'>
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
+<input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
+<input type='hidden' name='KEY1' value='$key' />
+</form>
+</td>
+</tr>
+END
+;
+    $key++;
+}
+print "</table>";
+
+# If table contains entries, print 'Key to action icons'
+if ($key) {
+print <<END
+<table>
+<tr>
+    <td class='boldbase'>&nbsp;<b>$Lang::tr{'legend'}:&nbsp;</b></td>
+    <td><img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td>
+    <td class='base'>$Lang::tr{'click to disable'}</td>
+    <td>&nbsp;&nbsp;</td>
+    <td><img src='/images/off.gif' alt='$Lang::tr{'click to enable'}' /></td>
+    <td class='base'>$Lang::tr{'click to enable'}</td>
+    <td>&nbsp;&nbsp;</td>
+    <td><img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
+    <td class='base'>$Lang::tr{'edit'}</td>
+    <td>&nbsp;&nbsp;</td>
+    <td><img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
+    <td class='base'>$Lang::tr{'remove'}</td>
+</tr>
+</table>
+END
+;
+}
+
+&Header::closebox();
+
+my $output = `/sbin/ip route show table static`;
+$output = &Header::cleanhtml($output,"y");
+
+if ( $output != "" ) {
+       &Header::openbox('100%', 'left', $Lang::tr{'routing table entries'});
+       print "<pre>$output</pre>\n";
+       &Header::closebox();
+}
+
+&Header::closebigbox();
+&Header::closepage();
+
+## Ouf it's the end !
+
+# Sort the "current" array according to choices
+sub SortDataFile
+{
+    our %entries = ();
+    
+    # Sort pair of record received in $a $b special vars.
+    # When IP is specified use numeric sort else alpha.
+    # If sortname ends with 'Rev', do reverse sort.
+    #
+    sub fixedleasesort {
+       my $qs='';             # The sort field specified minus 'Rev'
+       if (rindex ($settings{'SORT_GATEWAYLIST'},'Rev') != -1) {
+           $qs=substr ($settings{'SORT_GATEWAYLIST'},0,length($settings{'SORT_GATEWAYLIST'})-3);
+           if ($qs eq 'IP') {
+               my @a = split(/\./,$entries{$a}->{$qs});
+               my @b = split(/\./,$entries{$b}->{$qs});
+               ($b[0]<=>$a[0]) ||
+               ($b[1]<=>$a[1]) ||
+               ($b[2]<=>$a[2]) ||
+               ($b[3]<=>$a[3]);
+           } else {
+               $entries{$b}->{$qs} cmp $entries{$a}->{$qs};
+           }
+       } else { #not reverse
+           $qs=$settings{'SORT_GATEWAYLIST'};
+           if ($qs eq 'IP') {
+               my @a = split(/\./,$entries{$a}->{$qs});
+               my @b = split(/\./,$entries{$b}->{$qs});
+               ($a[0]<=>$b[0]) ||
+               ($a[1]<=>$b[1]) ||
+               ($a[2]<=>$b[2]) ||
+               ($a[3]<=>$b[3]);
+           } else {
+               $entries{$a}->{$qs} cmp $entries{$b}->{$qs};
+           }
+       }
+    }
+
+    #Use an associative array (%entries)
+    my $key = 0;
+    foreach my $line (@current) {
+       chomp( $line); #remove newline because can be on field 5 or 6 (addition of REMARK)
+       my @temp = ( '','','', '');
+       @temp = split (',',$line);
+
+       # Build a pair 'Field Name',value for each of the data dataline.
+       # Each SORTABLE field must have is pair.
+       # Other data fields (non sortable) can be grouped in one
+       
+       my @record = ('KEY',$key++,'EN',$temp[0],'IP',$temp[1],'GATEWAY',$temp[2],'REMARK',$temp[3]);
+       my $record = {};                                # create a reference to empty hash
+       %{$record} = @record;                           # populate that hash with @record
+       $entries{$record->{KEY}} = $record;             # add this to a hash of hashes
+    }
+    
+    open(FILE, ">$datafile") or die 'routing datafile error';
+
+    # Each field value is printed , with the newline ! Don't forget separator and order of them.
+    foreach my $entry (sort fixedleasesort keys %entries) {
+       print FILE "$entries{$entry}->{EN},$entries{$entry}->{IP},$entries{$entry}->{GATEWAY},$entries{$entry}->{REMARK}\n";
+    }
+
+    close(FILE);
+    # Reload sorted  @current
+    open (FILE, "$datafile");
+    @current = <FILE>;
+    close (FILE);
+}
+
+#
+# Build the configuration file
+#
+sub BuildConfiguration {
+    system '/usr/local/bin/rebuildroutes';
+}
\ No newline at end of file

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 76b408d10f11ead61e7c852220f26d90ae3125ba..e1a82009452d629b0a092ac933c4a7f8946ea15d 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -111,6 +111,7 @@ $cgiparams{'ROOTCERT_EMAIL'} = '';
 $cgiparams{'ROOTCERT_OU'} = '';
 $cgiparams{'ROOTCERT_CITY'} = '';
 $cgiparams{'ROOTCERT_STATE'} = '';
+$cgiparams{'RW_NET'} = '';
 
 &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'});
 
@@ -395,8 +396,11 @@ sub writeipsecfiles {
            print CONF "\tpfsgroup=$lconfighash{$key}[23]\n";
        }
 
-       # IKE V1
-       print CONF "\tkeyexchange=ikev1\n";
+       # IKE V1 or V2
+       if (! $lconfighash{$key}[29]) {
+          $lconfighash{$key}[29] = "ikev1";
+       }
+       print CONF "\tkeyexchange=$lconfighash{$key}[29]\n";
 
        # Lifetimes
        print CONF "\tikelifetime=$lconfighash{$key}[16]h\n" if ($lconfighash{$key}[16]);
@@ -435,6 +439,7 @@ sub writeipsecfiles {
        # Automatically start only if a net-to-net connection
        if ($lconfighash{$key}[3] eq 'host') {
            print CONF "\tauto=add\n";
+           print CONF "\trightsourceip=$lvpnsettings{'RW_NET'}\n";
        } else {
            print CONF "\tauto=start\n";
        }
@@ -471,6 +476,11 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
        goto SAVE_ERROR;
     }
 
+    if ( $cgiparams{'RW_NET'} ne '' and !&General::validipandmask($cgiparams{'RW_NET'}) ) {
+       $errormessage = $Lang::tr{'urlfilter invalid ip or mask error'};
+       goto SAVE_ERROR;
+    }
+
     map ($vpnsettings{$_} = $cgiparams{$_},
        ('ENABLED','DBG_CRYPT','DBG_PARSING','DBG_EMITTING','DBG_CONTROL',
         'DBG_DNS'));
@@ -479,6 +489,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
     $vpnsettings{'VPN_DELAYED_START'} = $cgiparams{'VPN_DELAYED_START'};
     $vpnsettings{'VPN_OVERRIDE_MTU'} = $cgiparams{'VPN_OVERRIDE_MTU'};
     $vpnsettings{'VPN_WATCH'} = $cgiparams{'VPN_WATCH'};
+    $vpnsettings{'RW_NET'} = $cgiparams{'RW_NET'};
     &General::writehash("${General::swroot}/vpn/settings", \%vpnsettings);
     &writeipsecfiles();
     if (&vpnenabled) {
@@ -1288,6 +1299,7 @@ END
        $cgiparams{'REMARK'}            = $confighash{$cgiparams{'KEY'}}[25];
        $cgiparams{'INTERFACE'}         = $confighash{$cgiparams{'KEY'}}[26];
        $cgiparams{'DPD_ACTION'}        = $confighash{$cgiparams{'KEY'}}[27];
+       $cgiparams{'IKE_VERSION'}       = $confighash{$cgiparams{'KEY'}}[29];
        $cgiparams{'IKE_ENCRYPTION'}    = $confighash{$cgiparams{'KEY'}}[18];
        $cgiparams{'IKE_INTEGRITY'}     = $confighash{$cgiparams{'KEY'}}[19];
        $cgiparams{'IKE_GROUPTYPE'}     = $confighash{$cgiparams{'KEY'}}[20];
@@ -1790,6 +1802,7 @@ END
        $confighash{$key}[25] = $cgiparams{'REMARK'};
        $confighash{$key}[26] = $cgiparams{'INTERFACE'};
        $confighash{$key}[27] = $cgiparams{'DPD_ACTION'};
+       $confighash{$key}[29] = $cgiparams{'IKE_VERSION'};
 
        #dont forget advanced value
        $confighash{$key}[18] = $cgiparams{'IKE_ENCRYPTION'};
@@ -1845,6 +1858,11 @@ END
            $cgiparams{'DPD_ACTION'} = 'restart';
        }
 
+       # Default IKE Version to V1
+       if (! $cgiparams{'IKE_VERSION'}) {
+           $cgiparams{'IKE_VERSION'} = 'ikev1';
+       }
+
        # Default is yes for 'pfs'
        $cgiparams{'PFS'}     = 'on';
        
@@ -1895,6 +1913,10 @@ END
     $selected{'DPD_ACTION'}{'restart'} = '';
     $selected{'DPD_ACTION'}{$cgiparams{'DPD_ACTION'}} = "selected='selected'";
 
+    $selected{'IKE_VERSION'}{'ikev1'} = '';
+    $selected{'IKE_VERSION'}{'ikev2'} = '';
+    $selected{'IKE_VERSION'}{$cgiparams{'IKE_VERSION'}} = "selected='selected'";
+
     &Header::showhttpheaders();
     &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
     &Header::openbigbox('100%', 'left', '', $errormessage);
@@ -1974,6 +1996,12 @@ END
            <td><input type='text' name='REMOTE_ID' value='$cgiparams{'REMOTE_ID'}' /></td>
        </tr><tr>
        </tr><td><br /></td><tr>
+           <td>$Lang::tr{'vpn keyexchange'}:</td>
+           <td><select name='IKE_VERSION'>
+               <option value='ikev1' $selected{'IKE_VERSION'}{'ikev1'}>IKEv1</option>
+               <option value='ikev2' $selected{'IKE_VERSION'}{'ikev2'}>IKEv2</option>
+               </select></a>
+           </td>
            <td>$Lang::tr{'dpd action'}:</td>
            <td><select name='DPD_ACTION'>
                <option value='clear' $selected{'DPD_ACTION'}{'clear'}>clear</option>
@@ -2458,6 +2486,10 @@ print <<END
        <td  class='base' nowrap='nowrap'>$Lang::tr{'vpn delayed start'}:&nbsp;<img src='/blob.gif' alt='*' /><img src='/blob.gif' alt='*' /></td>
        <td ><input type='text' name='VPN_DELAYED_START' value='$cgiparams{'VPN_DELAYED_START'}' /></td>
     </tr>
+    <tr>
+       <td  class='base' nowrap='nowrap'>$Lang::tr{'host to net vpn'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+       <td ><input type='text' name='RW_NET' value='$cgiparams{'RW_NET'}' /></td>
+    </tr>
  </table>
 <p>$Lang::tr{'vpn watch'}:<input type='checkbox' name='VPN_WATCH' $checked{'VPN_WATCH'} /></p>
 <p>PLUTO DEBUG&nbsp;=
@@ -2507,7 +2539,7 @@ END
            print "<tr bgcolor='$color{'color22'}'>\n";
        }
        print "<td align='center' nowrap='nowrap'>$confighash{$key}[1]</td>";
-       print "<td align='center' nowrap='nowrap'>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
+       print "<td align='center' nowrap='nowrap'>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ") $confighash{$key}[29]</td>";
        if ($confighash{$key}[2] eq '%auth-dn') {
            print "<td align='left' nowrap='nowrap'>$confighash{$key}[9]</td>";
        } elsif ($confighash{$key}[4] eq 'cert') {
@@ -2519,7 +2551,9 @@ END
        # get real state
        my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
        foreach my $line (@status) {
-           if ($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) {
+           if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
+              ($line =~ /$confighash{$key}[1]\{.*INSTALLED/))
+           {
                $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
            }
        }

diff --git a/html/html/images/delete.gif b/html/html/images/delete.gif
index edae2a7f77b189461ab9679f25f9a500df2ad709..855a9b3c2f26fce99bac3b6dc6d7505ee11d6299 100644 (file)
Binary files a/html/html/images/delete.gif and b/html/html/images/delete.gif differ

diff --git a/html/html/images/document-save.png b/html/html/images/document-save.png
index 65a42b2e68e21fda2f4e25400a01393bc90011c3..22ff49571020a2b520d34f622673bea031cbbf2d 100644 (file)
Binary files a/html/html/images/document-save.png and b/html/html/images/document-save.png differ

diff --git a/html/html/images/edit.gif b/html/html/images/edit.gif
index 851d29e64e5565dda9d7f887bde5bdc03e4e0714..c749f465811338334bc05cbc13a6c49dfe6521e3 100644 (file)
Binary files a/html/html/images/edit.gif and b/html/html/images/edit.gif differ

diff --git a/html/html/images/floppy.gif b/html/html/images/floppy.gif
index d0562220dc61a9c3e2dc0c88c5111f2a2fb4a5b9..7db2f32d1da65f4d4f12af9ee70cef5205620acc 100644 (file)
Binary files a/html/html/images/floppy.gif and b/html/html/images/floppy.gif differ

diff --git a/html/html/images/forward.gif b/html/html/images/forward.gif
index fdda6afa9a4212d04374a9b192b026d636ddc29a..33d18b57197a951673ace2b3091fd202ba58dd47 100644 (file)
Binary files a/html/html/images/forward.gif and b/html/html/images/forward.gif differ

diff --git a/html/html/images/info.gif b/html/html/images/info.gif
index 31e680c6c62d7b330c14dffc5f511fa1baeca6bd..94671ef2f88f359a09c7db13d53854a5390ea870 100644 (file)
Binary files a/html/html/images/info.gif and b/html/html/images/info.gif differ

diff --git a/html/html/images/list-add.png b/html/html/images/list-add.png
index 012cb2eb40e3d982f5f05811d5c0992c06027307..1aa7f095c6c282262390748ab2e596a3fc15c228 100644 (file)
Binary files a/html/html/images/list-add.png and b/html/html/images/list-add.png differ

diff --git a/html/html/images/list-remove.png b/html/html/images/list-remove.png
index 2d0c7808383d154feed767d33184457c56607f2f..00b654e8ca567c380fa477d4b32f808c3b5500d3 100644 (file)
Binary files a/html/html/images/list-remove.png and b/html/html/images/list-remove.png differ

diff --git a/html/html/images/package-x-generic.png b/html/html/images/package-x-generic.png
index 5febf95dc6995e01492ae1de2b6b5544e35d9412..9015426153054c0b529b4d9ebdfa06a221d568ac 100644 (file)
Binary files a/html/html/images/package-x-generic.png and b/html/html/images/package-x-generic.png differ

diff --git a/html/html/images/reload.gif b/html/html/images/reload.gif
index 1b04197ee3410cad48a9b3c8c115a827ddeebbc8..a456e7e733e703442d5755520a9d870f670e000d 100644 (file)
Binary files a/html/html/images/reload.gif and b/html/html/images/reload.gif differ

diff --git a/html/html/images/stock_ok.png b/html/html/images/stock_ok.png
index 7a4acb5d176f7ecb214d6f0a6f2679a9c312545b..d92d88d8a472498e358027c560cd0d750f0ffd9c 100644 (file)
Binary files a/html/html/images/stock_ok.png and b/html/html/images/stock_ok.png differ

diff --git a/html/html/images/stock_stop.png b/html/html/images/stock_stop.png
index 8305ee8a432ab2fb4e204dce7acacb05bed242f6..89c212493e4c6b7f4a3621b4722e9b8b887bb7c2 100644 (file)
Binary files a/html/html/images/stock_stop.png and b/html/html/images/stock_stop.png differ

diff --git a/html/html/images/user-trash.png b/html/html/images/user-trash.png
index 2a1c7b1c302876ad1e17d29203798ad6f2d89acc..0e0953c73c60adbbc762d0553f95a586f3054aa6 100644 (file)
Binary files a/html/html/images/user-trash.png and b/html/html/images/user-trash.png differ

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index b78efc5dab35ae8a54b9fff09e18ab16370928a7..0d73e61dfc84ac3273943a0ef5dd46e71c668fa0 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -5,6 +5,7 @@
 'Add Level7 rule' => 'Level7-Regel hinzufügen',
 'Add Port Rule' => 'Port Regel hinzufügen',
 'Add Rule' => 'Regel hinzufügen',
+'Add a route' => 'Eine Route hinzufügen',
 'Async logging enabled' => 'Aktiviere asynchrones schreiben des Syslogs',
 'Choose Rule' => 'Wählen sie <u>eine</u> der untenstehenden Regeln aus.',
 'Class' => 'Klasse',
@@ -18,13 +19,13 @@
 'ConnSched ipsecstart' => 'IPSec (neu)starten',
 'ConnSched ipsecstop' => 'IPSec stop',
 'ConnSched reconnect' => 'Neu verbinden',
-'cpu frequency per' => 'CPU Frequenz pro',
 'ConnSched scheduled actions' => 'Geplante Aktionen',
 'ConnSched scheduler' => 'Scheduler',
 'ConnSched select profile' => 'Wähle Profil',
 'ConnSched time' => 'Zeit:',
 'ConnSched up' => 'Hoch',
 'ConnSched weekdays' => 'Wochentage:',
+'Edit an existing route' => 'Eine existierende Route editieren',
 'Enter TOS' => 'Aktivieren oder deaktivieren sie die TOS-Bits <br /> und klicken Sie danach auf <i>Speichern</i>.',
 'Existing Files' => 'Dateien in der Datenbank',
 'HDD temperature' => 'HDD-Temperatur',
@@ -514,6 +515,7 @@
 'could not open update information file' => 'Datei mit den Update-Information konnte nicht geöffnet werden. Die Update-Datei ist beschädigt.',
 'could not retrieve common name from certificate' => 'Der Gemeinsame Name (CN) konnte nicht aus dem Zertifikat gelesen werden.',
 'country' => 'Land',
+'cpu frequency per' => 'CPU Frequenz pro',
 'cpu idle usage' => 'Leerlauf CPU Nutzung',
 'cpu interrupt usage' => 'Interrupt CPU Nutzung',
 'cpu iowait usage' => 'CPU wartet auf IO',
@@ -774,7 +776,16 @@
 'external access rule removed' => ' Regel für externen Zugang entfernt; Starte Zugangskontroller neu',
 'external aliases configuration' => 'Externe Alias-Konfiguration',
 'extrahd' => 'ExtraHD',
+'extrahd because there is already a device mounted' => ' mounten, weil bereits ein Geräte gemountet ist',
+'extrahd cant umount' => 'Konnte',
 'extrahd detected drives' => 'gefundene Laufwerke',
+'extrahd install or load driver' => 'Wenn Ihre Festplatte nicht angezeigt wird, müssen Sie zuerst den Treiber laden oder ggf. auch nach installieren. Wenn diese jedoch angezeigt wird, aber keine Partitionen zu sehen sind, müssen diese erst angelegt werden.',
+'extrahd maybe the device is in use' => 'nicht mounten. Vielleicht wird das Gerät bereits verwendet',
+'extrahd to' => 'nicht nach',
+'extrahd to root' => 'nicht nach root mounten',
+'extrahd unable to read' => 'Lesefehler von',
+'extrahd unable to write' => 'Schreibfehler von',
+'extrahd you cant mount' => 'Sie können',
 'false classnumber' => 'Die Klassennummer passt nicht zum angegebenen Interface.',
 'false max bandwith' => 'Maximalbandbreite ist ungültig.',
 'false min bandwith' => 'Mindestbandbreite ist ungültig.',
@@ -1150,6 +1161,7 @@
 'min delay' => 'Minimale Verzögerung',
 'min size' => 'Min. Objektgröße (kB):',
 'minimal' => 'Minimal',
+'minute' => 'Minute',
 'minutes' => 'Minuten',
 'misc-options' => 'Sonstige Optionen',
 'missing dat' => 'Verschlüsseltes Archiv wurde nicht gefunden',
@@ -1355,7 +1367,7 @@
 'pakfire install package' => 'Sie möchten folgende Pakete installieren: ',
 'pakfire installed addons' => 'Installierte Addons:',
 'pakfire last core list update' => 'Letztes Corelisten Update vor',
-'pakfire last package update' => 'Letztes Pakelisten Update vor',
+'pakfire last package update' => 'Letztes Paketlisten Update vor',
 'pakfire last serverlist update' => 'Letztes Serverlisten Update vor',
 'pakfire last update' => 'Letzes Update vor',
 'pakfire possible dependency' => ' Möglicherweise haben diese Pakete Abhängigkeiten, d.h. andere Pakete müssen zusätzlich installiert werden. Dazu sehen sie unten eine Liste.',
@@ -1639,6 +1651,7 @@
 'start ovpn server' => 'Starte OpenVPN Server',
 'state or province' => 'Bundesstat oder Provinz',
 'static ip' => 'Statisch IP',
+'static routes' => 'Statische Routen',
 'status' => 'Status',
 'status information' => 'Statusinformationen',
 'status ovpn' => 'OpenVPN',
@@ -2077,6 +2090,7 @@
 'vpn delayed start' => 'Verzögerung bevor VPN gestartet wird (Sekunden)',
 'vpn delayed start help' => 'Falls notwendig, kann diese Verzögerung dazu verwendet werden, um Dynamic DNS Updates ordnungsgemäß anzuwenden. 60 ist ein gängiger Wert, wenn ROT (RED) eine dynamische IP Adresse ist.',
 'vpn incompatible use of defaultroute' => 'Hostname=%defaultroute nicht zulässig',
+'vpn keyexchange' => 'Schlüsseltausch',
 'vpn local id' => 'Lokale ID',
 'vpn missing remote id' => 'Sie müssen einen korrekten Distinguished Name (DN) für diese Authentifikation eingeben.',
 'vpn mtu invalid' => 'MTU muß ein numerischer Wert sein!',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 20a2681dac6889dd1f547b2963e31116dbf4d274..e18fc534a4c8e8b7c7ecb86d3962d878c592ea39 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -5,6 +5,7 @@
 'Add Level7 rule' => 'Add Level7 rule',
 'Add Port Rule' => 'Add port rule',
 'Add Rule' => 'Add rule',
+'Add a route' => 'Add a route',
 'Async logging enabled' => 'Enable asynchronous writing of the syslog file',
 'Choose Rule' => 'Choose <u>one</u> of the following rules.',
 'Class' => 'Class',
@@ -17,7 +18,6 @@
 'ConnSched down' => 'Down',
 'ConnSched ipsecstart' => 'IPSec (re)start',
 'ConnSched ipsecstop' => 'IPSec stop',
-'cpu frequency per' => 'CPU frequency per',
 'ConnSched reconnect' => 'Reconnect',
 'ConnSched scheduled actions' => 'Scheduled actions',
 'ConnSched scheduler' => 'Scheduler',
@@ -25,6 +25,7 @@
 'ConnSched time' => 'Time:',
 'ConnSched up' => 'Up',
 'ConnSched weekdays' => 'Days of the week:',
+'Edit an existing route' => 'Edit an existing route',
 'Enter TOS' => 'Activate or deactivate TOS-bits <br /> and then press <i>Save</i>.',
 'Existing Files' => 'Files in database',
 'HDD temperature' => 'HDD temperature',
@@ -535,6 +536,7 @@
 'could not open update information file' => 'Could not open update information file.  The update file is corrupt.',
 'could not retrieve common name from certificate' => 'Could not retrieve common name from certificate.',
 'country' => 'Country',
+'cpu frequency per' => 'CPU frequency per',
 'cpu idle usage' => 'Idle CPU Usage',
 'cpu interrupt usage' => 'Interrupt CPU Usage',
 'cpu iowait usage' => 'CPU waiting for IO',
@@ -798,7 +800,16 @@
 'external access rule removed' => ' External access rule removed; restarting access controller',
 'external aliases configuration' => 'External aliases configuration',
 'extrahd' => 'ExtraHD',
+'extrahd because there is already a device mounted' => ', because there is already a device mounted',
+'extrahd cant umount' => 'Can\'t umount',
 'extrahd detected drives' => 'detected drives',
+'extrahd install or load driver' => 'If your device isn\'t listed here, you need to install or load the driver.<br />If you can see your device but no partitions you have to create them first.',
+'extrahd maybe the device is in use' => '. Maybe the device is in use',
+'extrahd to' => 'to',
+'extrahd to root' => 'to root',
+'extrahd unable to read' => 'Unable to read',
+'extrahd unable to write' => 'Unable to write',
+'extrahd you cant mount' => 'You can\'t mount',
 'false classnumber' => 'The Class-Number does not match the interface.',
 'false max bandwith' => 'Maximum bandwith is false.',
 'false min bandwith' => 'Minimum bandwith is false.',
@@ -1177,6 +1188,7 @@
 'min delay' => 'Minimum delay',
 'min size' => 'Min object size (KB):',
 'minimal' => 'Minimal',
+'minute' => 'Minute',
 'minutes' => 'Minutes',
 'misc-options' => 'Miscellaneous options',
 'missing dat' => 'Encrypted archive not found',
@@ -1672,6 +1684,7 @@
 'start ovpn server' => 'Start OpenVPN Server',
 'state or province' => 'State or Province',
 'static ip' => 'Static IP',
+'static routes' => 'Static routes',
 'status' => 'Status',
 'status information' => 'Status information',
 'status ovpn' => '4. OpenVPN Status / Configuration:',
@@ -2111,6 +2124,7 @@
 'vpn delayed start' => 'Delay before launching VPN (seconds)',
 'vpn delayed start help' => 'If required, this delay can be used to allow dynamic DNS updates to propagate properly. 60 is a common value when RED is a dynamic IP.',
 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed',
+'vpn keyexchange' => 'Keyexchange',
 'vpn local id' => 'Local ID',
 'vpn missing remote id' => 'You must specify a correct Distinguished Name (DN) for this authentication.',
 'vpn mtu invalid' => 'MTU must be a numeric value!',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index e35c680b9ee7f55808ac0cb0a141a9a63598aa3b..409380965c11b44f4fffa3a6e324cd9cfb0cddba 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -5,6 +5,7 @@
 'Add Level7 rule' => 'añadir regla de Nivel 7',
 'Add Port Rule' => 'Añadir Regla de Puerto',
 'Add Rule' => 'Añadir Regla',
+'Add a route' => 'Añadir una route',
 'Choose Rule' => 'Seleccione <u>una</u> de las siguientes reglas.',
 'Class' => 'Clase',
 'Class was deleted' => 'con subclases potenciales fué eliminado',
@@ -23,6 +24,7 @@
 'ConnSched time' => 'Tiempo:',
 'ConnSched up' => 'Arriba',
 'ConnSched weekdays' => 'Días de las semana:',
+'Edit an existing route' => 'Editar una route existente',
 'Enter TOS' => 'Activar o desactivar bits TOS<br /> y después presione <i>Guardar</i>',
 'Existing Files' => 'Archivos en la base de datos',
 'HDD temperature' => 'Temperatura de HDD',
@@ -532,10 +534,10 @@
 'could not open update information file' => 'No se pudo abrir el archivo de información de actualizaciones. El archivo de actualizaciones está dañado',
 'could not retrieve common name from certificate' => 'No se pudo recuperar el nombre común del certificado.',
 'country' => 'País',
+'cpu frequency per' => 'CPU frecuencia por',
 'cpu idle usage' => 'Uso de CPU inactivo',
 'cpu interrupt usage' => 'Uso de interrupción de CPU',
 'cpu iowait usage' => 'CPU esperando IO',
-'cpu frequency per' => 'CPU frecuencia por',
 'cpu irq usage' => 'Uso de IRQ del CPU',
 'cpu nice usage' => 'Buen uso de CPU',
 'cpu steal usage' => 'uso de CPU steal',
@@ -796,7 +798,16 @@
 'external access rule removed' => '"Reglas de acceso externo eliminadas; reiniciando controlador de acceso"',
 'external aliases configuration' => 'Configuración de Alias externo',
 'extrahd' => 'Disco duro Adicional',
+'extrahd because there is already a device mounted' => ', because there is already a device mounted',
+'extrahd cant umount' => 'Can\'t umount',
 'extrahd detected drives' => 'Unidades encontradas',
+'extrahd install or load driver' => 'If your device isn\'t listed here, you need to install or load the driver.<br />If you can see your device but no partitions you have to create them first.',
+'extrahd maybe the device is in use' => '. Maybe the device is in use',
+'extrahd to' => 'to',
+'extrahd to root' => 'to root',
+'extrahd unable to read' => 'Unable to read',
+'extrahd unable to write' => 'Unable to write',
+'extrahd you cant mount' => 'You can\'t mount',
 'false classnumber' => 'El número de clase no coincide con la interfaz',
 'false max bandwith' => 'El ancho de banda máximo es falso',
 'false min bandwith' => 'El ancho de banda mínimo es falso',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 8d52e1d36c893db459f513937e1711b2f36409b9..69e8ba1c664669b53ec3b5a158b8c400b5280f0c 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -5,6 +5,7 @@
 'Add Level7 rule' => 'Ajouter une règle Level7',
 'Add Port Rule' => 'Ajouter une règle de port',
 'Add Rule' => 'Ajouter une règle',
+'Add a route' => 'Ajouter une route',
 'Async logging enabled' => 'Activer l\'écriture asynchrone du fichier syslog',
 'Choose Rule' => 'Choisissez <u>une</u> des règles suivantes.',
 'Class' => 'Classe',
@@ -16,7 +17,6 @@
 'ConnSched days' => 'Jours :',
 'ConnSched down' => 'Arrêt',
 'ConnSched ipsecstart' => 'IPSec (re)démarrage',
-'cpu frequency per' => 'CPU fréquence par',
 'ConnSched ipsecstop' => 'IPSec arrêt',
 'ConnSched reconnect' => 'Reconnecter',
 'ConnSched scheduled actions' => 'Actions planifiées',
@@ -25,6 +25,7 @@
 'ConnSched time' => 'Temps :',
 'ConnSched up' => 'Actif',
 'ConnSched weekdays' => 'Jours de la semaine :',
+'Edit an existing route' => 'Modifier une route existante',
 'Enter TOS' => 'Activer ou désactiver TOS-Bits <br /> puis appuyez sur <i> Enregistrer </i>.',
 'Existing Files' => 'Fichiers dans la base de donnée',
 'HDD temperature' => 'Température Disque Dur',
@@ -535,6 +536,7 @@
 'could not open update information file' => 'Impossible d\'ouvrir le fichier d\'information de mise à jour. Le fichier est corrompu.',
 'could not retrieve common name from certificate' => 'Impossible de récupérer le nom courant depuis le certificat.',
 'country' => 'Pays',
+'cpu frequency per' => 'CPU fréquence par',
 'cpu idle usage' => 'Pourcentage d\'inactivite CPU',
 'cpu interrupt usage' => 'Utilisation des interruptions CPU',
 'cpu iowait usage' => 'Le COU attend des IO',
@@ -797,7 +799,16 @@
 'external access rule removed' => 'Règle d\'accès externe supprimée; redémarrage du controleur d\'accès',
 'external aliases configuration' => 'Configuration des alias externes',
 'extrahd' => 'ExtraHD',
-'extrahd founded drives' => 'Périphériques trouvés',
+'extrahd because there is already a device mounted' => ' car vous avez déjà un support de monté',
+'extrahd cant umount' => 'Impossible de démonter',
+'extrahd detected drives' => 'Périphériques trouvés',
+'extrahd install or load driver' => 'Si votre support n\'est pas visible ici, vous devez installer ou charger son pilote.<br />Si vous voyez votre support mais pas de partitions, vous devez tout d\'abord les créer.',
+'extrahd maybe the device is in use' => '. Votre support est peut-être en cours d\'utilisation',
+'extrahd to' => 'vers',
+'extrahd to root' => 'vers root',
+'extrahd unable to read' => 'Impossible de lire',
+'extrahd unable to write' => 'Impossible d\'écrire',
+'extrahd you cant mount' => 'Vous ne pouvez pas monter',
 'false classnumber' => 'Le numéro de classe ne correspond pas à l\'interface.',
 'false max bandwith' => 'La bande passante maximum est fausse.',
 'false min bandwith' => 'La bande passante minimum est fausse.',

diff --git a/langs/list b/langs/list
index dfc2ece646f8f4a34b1c12e33b0d26c31d7925e4..94828cd5095740d5b26746d763cd86e9187d8b65 100644 (file)
--- a/langs/list
+++ b/langs/list
@@ -2,3 +2,5 @@ en:English:English
 de:Deutsch:German
 fr:Français:French
 es:Español:Spanish
+pl:Polski:Polish
+ru:Русский:Russian

diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
new file mode 100644 (file)
index 0000000..be4f5ea
--- /dev/null
+++ b/langs/pl/cgi-bin/pl.pl
@@ -0,0 +1,2183 @@
+%tr = ( 
+%tr,
+
+'Act as' => 'Act as:',
+'Add Level7 rule' => 'Dodaj regułę L7',
+'Add Port Rule' => 'Dodaj regułę portu',
+'Add Rule' => 'Dodaj regułę',
+'Add a route' => 'Dodaj trase',
+'Async logging enabled' => 'Włącz asynchroniczny zapis do pliku syslog',
+'Choose Rule' => 'Wybierz <u>jedną</u> z poniższych reguł.',
+'Class' => 'Klasa',
+'Class was deleted' => 'wraz z ewentualnymi podklasami została usunięta',
+'Client status and controlc' => 'Client status and control:',
+'ConnSched action' => 'Zadanie:',
+'ConnSched add action' => 'Dodaj zadanie',
+'ConnSched change profile title' => 'Zmień na profil:',
+'ConnSched days' => 'Dni:',
+'ConnSched down' => 'Niżej',
+'ConnSched ipsecstart' => '(Re)start IPSec',
+'ConnSched ipsecstop' => 'Zatrzymanie IPSec',
+'ConnSched reconnect' => 'Ponowne połączenie',
+'ConnSched scheduled actions' => 'Zaplanowane zadania',
+'ConnSched scheduler' => 'Harmonogram',
+'ConnSched select profile' => 'Wybierz profil',
+'ConnSched time' => 'Czas:',
+'ConnSched up' => 'Wyżej',
+'ConnSched weekdays' => 'Dni tygodnia:',
+'Edit an existing route' => 'Edytuj istniejaca trase',
+'Enter TOS' => 'Aktywuj lub deaktywuj bity TOS <br /> a następnie kliknij <i>Zapisz</i>.',
+'Existing Files' => 'Plików w bazie',
+'HDD temperature' => 'Temperatura HDD',
+'Level7 Protocol' => 'Protokół-L7',
+'Level7 Rule' => 'Reguła-L7',
+'Level7 rule' => 'Reguła L7 ',
+'Local VPN IP' => 'Sieć wewnętrzna (GREEN):',
+'MTU' => 'Rozmiar MTU:',
+'Number of IPs for the pie chart' => 'Liczba numerów IP na wykresie kołowym',
+'Number of Ports for the pie chart' => 'Liczba portów na wykresie kołowym',
+'OVPN' => 'OpenVPN',
+'OpenVPN' => 'OpenVPN',
+'Pages' => 'Stron',
+'Ping' => 'Ping :',
+'Port Rule' => 'Reguła portu',
+'QoS not enabled' => 'QoS nie jest włączony!',
+'Queuelenght' => 'Długość kolejki',
+'Remote IP' => 'Zdalny IP / Nazwa hosta (DynDNS):',
+'Remote VPN IP' => 'Podsieć VPN (np. 10.0.10.0/255.255.255.0):',
+'Resolv' => 'Resolv-Retry:',
+'Scan for Files' => 'Scan for files',
+'Scan from Directory' => 'Scan from directory',
+'Set time on boot' => 'Wymuś ustawienie zegara systemowego przy uruchamianiu systemu',
+'Subclass' => 'Podklasa',
+'TOS Bits' => 'Bity-TOS',
+'TOS Rule' => 'Reguła-TOS',
+'TOS rule' => 'Reguła TOS',
+'The class number does not match the specified interface.' => 'Numer klasy nie pasuje do podanego interfejsu.',
+'The destination IP address is invalid.' => 'Docelowy adres IP jest nieprawidłowy.',
+'The source IP address is invalid.' => 'Źródłowy adres IP jest nieprawidłowy.',
+'Utilization on' => 'Utilization on',
+'Verbose' => 'Verbose:',
+'WakeOnLan' => 'Wake On Lan',
+'a ca certificate with this name already exists' => 'Certyfikat CA z tą nazwą już istnieje.',
+'a connection with this common name already exists' => 'Połączenie z tą nazwą pospolitą (common name) już istnieje.',
+'a connection with this name already exists' => 'Połączenie z tą nazwą już istnieje.',
+'abort' => 'przerwij',
+'access allowed' => 'Dostęp dozwolony z:',
+'access refused with this oinkcode' => 'Dostęp odrzucony dla tego Oink Code',
+'accounting' => 'Accounting',
+'accounting user nonpdc' => 'Accounting - none PDC Mode',
+'accounting user pdc' => 'Accounting - PDC Mode',
+'action' => 'Akcja',
+'activate' => 'Aktywuj',
+'activate user' => 'Aktywuj użytkownika',
+'active' => 'Aktywne',
+'add' => 'Dodaj',
+'add a host' => 'Dodaj hosta:',
+'add a new rule' => 'Dodaj nową regułę:',
+'add cron' => 'dodaj zadanie crona',
+'add device' => 'Dodaj urządzenie',
+'add network' => 'Dodaj sieć',
+'add new alias' => 'Dodaj nowy alias:',
+'add new lease' => 'Dodaj statyczne powiązanie DHCP',
+'add new ovpn' => 'Ustawienia OpenVPN:',
+'add printer' => 'Dodaj drukarkę',
+'add service' => 'Dodaj usługę',
+'add share' => 'Dodaj zasób',
+'add subclass' => 'Dodaj podklasę',
+'add user' => 'Dodaj użytkownika',
+'add xtaccess' => 'Dodaj dostęp z zewnątrz',
+'add-route' => 'Dodatkowe rutingi wypychane',
+'added from dhcp lease list' => 'Dodany z listy DHCP',
+'admin user password has been changed' => 'Hasło administratora zostało zmienione.',
+'admin users' => 'Użytkownik prawami superużytkownika',
+'administrator user password' => 'Hasło administratora:',
+'adsl settings' => 'Ustawienia ADSL',
+'advanced' => 'Zaawansowane',
+'advanced server' => 'Zaawansowane ustawienia serwera',
+'advproxy AUTH always required' => 'Wymagaj autoryzacji dla adresów źródłowych bez ograniczeń',
+'advproxy AUTH auth cache TTL' => 'TTL autoryzacji (w minutach)',
+'advproxy AUTH global settings' => 'Globalne ustawienia autoryzacji',
+'advproxy AUTH limit of IP addresses' => 'Limit adresów IP dla użytkownika',
+'advproxy AUTH method' => 'Metoda autoryzacji',
+'advproxy AUTH method ident' => 'identd',
+'advproxy AUTH method ldap' => 'LDAP',
+'advproxy AUTH method ncsa' => 'Local',
+'advproxy AUTH method none' => 'None',
+'advproxy AUTH method ntlm' => 'Windows',
+'advproxy AUTH method radius' => 'RADIUS',
+'advproxy AUTH no auth' => 'Domeny bez autoryzacji (jedna w linii)',
+'advproxy AUTH number of auth processes' => 'Liczba procesów autoryzujących',
+'advproxy AUTH realm' => 'Authentication realm prompt',
+'advproxy AUTH user IP cache TTL' => 'TTL użytkownika/IP (w minutach)',
+'advproxy IDENT authorized users' => 'Uprawnieni użytkownicy (jeden w linii)',
+'advproxy IDENT aware hosts' => 'Ident aware hosts (one per line)',
+'advproxy IDENT identd settings' => 'Podstawowe ustawienia identd',
+'advproxy IDENT required' => 'Wymagaj autoryzacji identd',
+'advproxy IDENT timeout' => 'Czas oczekiwania Ident (w sekundach)',
+'advproxy IDENT unauthorized users' => 'Unauthorized users (one per line)',
+'advproxy IDENT use negative access list' => 'Używaj negatywnej kontroli dostępu',
+'advproxy IDENT use positive access list' => 'Używaj pozytywnej kontroli dostępu',
+'advproxy IDENT user based access restrictions' => 'User based access restrictions',
+'advproxy LDAP ADS' => 'Active Directory',
+'advproxy LDAP NDS' => 'Novell eDirectory',
+'advproxy LDAP V2' => 'LDAP version 2',
+'advproxy LDAP V3' => 'LDAP version 3',
+'advproxy LDAP auth' => 'LDAP authentication',
+'advproxy LDAP basedn' => 'Base DN',
+'advproxy LDAP binddn password' => 'Hasło Bind DN',
+'advproxy LDAP binddn settings' => 'Ustawienia Bind DN',
+'advproxy LDAP binddn username' => 'Użytkownik Bind DN',
+'advproxy LDAP common settings' => 'Podstawowe ustawienia LDAP',
+'advproxy LDAP group access control' => 'Kontrola dostępu według grup',
+'advproxy LDAP group required' => 'Wymagana grupa',
+'advproxy LDAP port' => 'Port',
+'advproxy LDAP server' => 'Serwer LDAP',
+'advproxy LDAP type' => 'Typ LDAP',
+'advproxy MIME block types' => ' Zablokuj te typy MIME (jeden w linii)',
+'advproxy MIME filter' => 'Fitr typów MIME',
+'advproxy NCSA auth' => 'Local user authentication',
+'advproxy NCSA create user' => 'Utwórz użytkownika',
+'advproxy NCSA group' => 'Grupa',
+'advproxy NCSA group membership' => 'Członkowie grupy',
+'advproxy NCSA grp disabled' => 'Wyłączony',
+'advproxy NCSA grp extended' => 'Rozszerzony',
+'advproxy NCSA grp standard' => 'Podstawowy',
+'advproxy NCSA min password length' => 'Minimalna długość hasła',
+'advproxy NCSA no accounts' => 'Brak dostępnych kont użytkowników',
+'advproxy NCSA password' => 'Hasło',
+'advproxy NCSA password confirm' => 'Hasło (potwierdź)',
+'advproxy NCSA redirector bypass' => 'Bypass redirection for members of the group',
+'advproxy NCSA update user' => 'Aktualizuj użytkownika',
+'advproxy NCSA user accounts' => 'Konta użytkowników',
+'advproxy NCSA user management' => 'Zarządzanie użytkownikami',
+'advproxy NCSA username' => 'Nazwa użytkownika',
+'advproxy NTLM BDC hostname' => 'Host BDC',
+'advproxy NTLM PDC hostname' => 'Host PDC',
+'advproxy NTLM auth' => 'Autoryzacja Windows NT/2003',
+'advproxy NTLM auth mode' => 'Tryb autoryzacji',
+'advproxy NTLM authorized users' => 'Uprawnieni użytkownicy domeny (jeden w linii)',
+'advproxy NTLM domain' => 'Domena',
+'advproxy NTLM domain settings' => 'Podstawowe ustawienia domeny',
+'advproxy NTLM unauthorized users' => 'Nieuprawnieni użytkownicy domeny (jeden w linii)',
+'advproxy NTLM use integrated auth' => 'Włącz zintegrowaną autoryzację Windows',
+'advproxy NTLM use negative access list' => 'Używaj negatywnej kontroli dostępu',
+'advproxy NTLM use positive access list' => 'Używaj pozytywnej kontroli dostępu',
+'advproxy NTLM user based access restrictions' => 'Ograniczenia dostępu użytkowników',
+'advproxy RADIUS authorized users' => 'Uprawnieni użytkownicy (jeden w linii)',
+'advproxy RADIUS identifier' => 'Identyfikator',
+'advproxy RADIUS port' => 'Port',
+'advproxy RADIUS radius settings' => 'Podstawowe ustawienia RADIUS',
+'advproxy RADIUS secret' => 'Współdzielone hasło (secret)',
+'advproxy RADIUS server' => 'Serwer RADIUS',
+'advproxy RADIUS unauthorized users' => 'Nieuprawnieni użytkownicy (jeden w linii)',
+'advproxy RADIUS use negative access list' => 'Używaj negatywnej kontroli dostępu',
+'advproxy RADIUS use positive access list' => 'Używaj pozytywnej kontroli dostępu',
+'advproxy RADIUS user based access restrictions' => 'Ograniczenia dostępu użytkowników',
+'advproxy UA enable filter' => 'Włącz sprawdzanie przeglądarki',
+'advproxy access' => 'Dostęp',
+'advproxy admin mail' => 'E-Mail administratora serwera proxy',
+'advproxy advanced proxy' => 'Advanced Proxy',
+'advproxy advanced web proxy' => 'Advanced Web Proxy',
+'advproxy advanced web proxy configuration' => 'Zaawansowana konfiguracja Proxy',
+'advproxy allowed subnets' => 'Dozwolone podsieci (jedna w linii)',
+'advproxy allowed web browsers' => 'Allowed clients for web access',
+'advproxy back to main page' => 'Powrót do strony głównej',
+'advproxy banned ip clients' => 'Zablokowane adresy IP (jeden w linii)',
+'advproxy banned mac clients' => 'Zablokowane adresy MAC (jeden w linii)',
+'advproxy cache management' => 'Zarządzanie pamięcią Cache',
+'advproxy cache replacement policy' => 'Polityka zatępowania cache',
+'advproxy chgwebpwd ERROR' => 'B Ł Ą D :',
+'advproxy chgwebpwd SUCCESS' => 'S U K C E S :',
+'advproxy chgwebpwd change password' => 'Zmień hasło',
+'advproxy chgwebpwd change web password' => 'Z m i ń&nbsp; h a s ł o &nbsp; d o s t ę p u &nbsp; d o &nbsp; s i e c i &nbsp; w e b',
+'advproxy chgwebpwd new password' => 'Nowe hasło',
+'advproxy chgwebpwd new password confirm' => 'Nowe hasło (powtórz)',
+'advproxy chgwebpwd old password' => 'Aktualne hasło',
+'advproxy chgwebpwd username' => 'Użytkownik',
+'advproxy classroom extensions' => 'Classroom extensions',
+'advproxy clear cache' => 'Wyczyść Cache',
+'advproxy client IP forwarding' => 'Przekazywanie adresu IP klienta',
+'advproxy common settings' => 'Ustawienia podstawowe',
+'advproxy content based throttling' => 'Włącz ograniczenia przepustowość wg. zawartości',
+'advproxy cre disabled' => 'Interferjs zarządzający został wyłączony przez administratora',
+'advproxy cre group definitions' => 'Classroom group definitions',
+'advproxy cre supervisors' => 'Supervisor IP addresses (one per line)',
+'advproxy destination ports' => 'Porty docelowe',
+'advproxy download throttling' => 'Ograniczenia przepustowości',
+'advproxy enabled' => 'Włączone',
+'advproxy enabled on' => 'Włączone na',
+'advproxy errmsg acl cannot be empty' => 'Lista kontroli dostępu nie może być pusta',
+'advproxy errmsg auth cache ttl' => 'Nieprawidłowa wartość dla TTL autoryzacji',
+'advproxy errmsg auth children' => 'Nieprawidłowa liczba procesów autoryzacji',
+'advproxy errmsg auth ipcache may not be null' => 'TTL autoryzacji nie może wynosić 0 kiedy wykorzystaywane są ograniczenia IP',
+'advproxy errmsg auth ipcache ttl' => 'Nieprawidłowa watość TTL użytkownika/IP',
+'advproxy errmsg change fail' => 'Hasło nie może być zmienione',
+'advproxy errmsg change success' => 'Hasło dostępu do sieci web zostało zmienione',
+'advproxy errmsg hdd cache size' => 'Nieprawidłowa wartość rozmiaru cache na dysku (wymagane min 10 MB)',
+'advproxy errmsg ident timeout' => 'Nieprawidłowy czas oczekiwania ident',
+'advproxy errmsg invalid bdc' => 'Nieprawidłowa nazwa hosta dla zapasowego kontrolera domeny',
+'advproxy errmsg invalid destination port' => 'Nieprawodłowy port docelowy',
+'advproxy errmsg invalid ip or mask' => 'Nieprawidłowy adres IP lub maska sieci',
+'advproxy errmsg invalid mac' => 'Nieprawidłowy adres MAC',
+'advproxy errmsg invalid pdc' => 'Nieprawidłowa nazwa hosta dla podstawowego kontrolera domeny',
+'advproxy errmsg invalid proxy port' => 'Nieprawidłowy port proxy',
+'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting',
+'advproxy errmsg invalid user' => 'Użytkownik nie istnieje',
+'advproxy errmsg ldap base dn' => 'LDAP base DN required',
+'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required',
+'advproxy errmsg ldap port' => 'Nieprawidłowy numer portu LDAP',
+'advproxy errmsg ldap server' => 'Nieprawidłowy adres IP serwera LDAP',
+'advproxy errmsg max userip' => 'Nieprawidłowa liczba adresów IP na użytkownika',
+'advproxy errmsg mem cache size' => 'Invalid value for memory cache size',
+'advproxy errmsg no browser' => 'Conajmniej 1 przeglądarka lub klient musi mieć przyznany dostęp do sieci WEB',
+'advproxy errmsg no password' => 'Hasło nie może być puste',
+'advproxy errmsg no username' => 'Nazwa użytkownika nie może być pusta',
+'advproxy errmsg non-transparent proxy required' => 'Serwer proxy nie może być uruchomiony w trybie transparentym jeżeli chcesz używać autoryzacji',
+'advproxy errmsg ntlm domain' => 'Wymagana nazwa domeny Windows',
+'advproxy errmsg ntlm pdc' => 'Wymagana nazwa hosta podstawowego kontrolera domeny',
+'advproxy errmsg password incorrect' => 'Nieprawidłowe hasło',
+'advproxy errmsg password length' => 'Nieprawidłowa wartość długości hasła',
+'advproxy errmsg password length 1' => 'Hasło musi mieć conajmniej ',
+'advproxy errmsg password length 2' => ' znaków',
+'advproxy errmsg passwords different' => 'Hasła nie pasują do siebie',
+'advproxy errmsg radius port' => 'Nieprawidłowy numer portu RADIUS',
+'advproxy errmsg radius secret' => 'Wymagane współdzielone hasło RADIUS',
+'advproxy errmsg radius server' => 'Nieprawidłowy adres IP serwera RADIUS',
+'advproxy errmsg time restriction' => 'Niepoprawne ograniczenia czase',
+'advproxy error design' => 'Styl komunikatów o błędach',
+'advproxy error language' => 'Język komunikatów o błędach',
+'advproxy fake referer' => 'Fake referer submitted to external sites',
+'advproxy fake useragent' => 'Fake useragent submitted to external sites',
+'advproxy friday' => 'Pią',
+'advproxy from' => 'Od',
+'advproxy hdd cache size' => 'Rozmiar cache na dysku (MB)',
+'advproxy invalid num of children' => 'Niepoprawna liczba procesów filtrujących',
+'advproxy log enabled' => 'Logi włączone',
+'advproxy log query' => 'Log query terms',
+'advproxy log settings' => 'Ustawienia logowania',
+'advproxy log useragent' => 'Log useragents',
+'advproxy max download size' => 'Maks rozmiar pobierania (KB)',
+'advproxy max size' => 'Maks rozmiar obiektu (KB)',
+'advproxy max upload size' => 'Maks rozmiar wysyłania (KB)',
+'advproxy memory replacement policy' => 'Memory replacement policy',
+'advproxy min size' => 'Min rozmiar obiektu (KB)',
+'advproxy mode allow' => 'zezwól',
+'advproxy mode deny' => 'odmów',
+'advproxy monday' => 'Pon',
+'advproxy network based access' => 'Kontrola dostępu oparta na sieciach',
+'advproxy no cache sites' => 'Wyłącz buforowanie dla tych domen (jedna w linii)',
+'advproxy no clients defined' => 'Nie zdefiniowano klientów',
+'advproxy no connection auth' => 'No connection oriented authentication forwarding',
+'advproxy no cre groups' => 'Brak dostępnych grup dostępu',
+'advproxy no internal proxy on blue' => 'Wyłącz wewnętrzny dostęp z sieci BLUE do pozostałych podsieci',
+'advproxy no internal proxy on green' => 'Wyłącz wewnętrzny dostęp do sieci GREEN z innych podsieci',
+'advproxy number of L1 dirs' => 'Liczba podkatalogów pierwszego poziomu',
+'advproxy off' => 'Proxy wyłączone',
+'advproxy offline mode' => 'Włącz tryb offline',
+'advproxy on' => 'Proxy wł',
+'advproxy privacy' => 'Prywatność',
+'advproxy proxy port' => 'Port proxy',
+'advproxy ram cache size' => 'Rozmiar RAM cache (MB)',
+'advproxy redirector children' => 'Liczba procesów filtrujących',
+'advproxy reset' => 'Reset',
+'advproxy saturday' => 'Sob',
+'advproxy save and restart' => 'Zapis i restart',
+'advproxy squid version' => 'Wersja Squid\'a ',
+'advproxy squidclamav' => 'SquidClamav',
+'advproxy ssadvanced proxy' => 'advanced proxy',
+'advproxy ssl ports' => 'Dozwolone porty SSL (jeden w linii)',
+'advproxy standard' => 'Standard',
+'advproxy standard ports' => 'Dozwolone porty standardowe (jeden w linii)',
+'advproxy sunday' => 'Nie',
+'advproxy supervisor password' => 'Supervisor password',
+'advproxy suppress version' => 'Ukrywaj informacje o wersji',
+'advproxy throttle binary' => 'Pliki binarne',
+'advproxy throttle dskimg' => 'Obrazy CD',
+'advproxy throttle mmedia' => 'Multimedia',
+'advproxy throttling per host on' => 'Limit dla komputera na:',
+'advproxy throttling total on' => 'Całkowity limit na:',
+'advproxy throttling unlimited' => 'bez limitu',
+'advproxy thursday' => 'Czw',
+'advproxy time restrictions' => 'Ograniczenia czasowe',
+'advproxy to' => 'Do',
+'advproxy transfer limits' => 'Limity tranferu',
+'advproxy transparent on' => 'Przezroczysty na',
+'advproxy tuesday' => 'Wto',
+'advproxy unknown' => 'Nieznany',
+'advproxy unrestricted ip clients' => 'Adresy IP bez ograniczeń (jeden w linii)',
+'advproxy unrestricted mac clients' => 'Adresy MAC bez ograniczeń (jeden w linii)',
+'advproxy update accelerator' => 'Update accelerator',
+'advproxy update information' => 'Dostępna jest nowsza wersja do pobrania. Odwiedź <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> aby uzyskać dodatkowe informacje.',
+'advproxy update notification' => 'Aktualizacja dostępna!',
+'advproxy upstream password' => 'Upstream password',
+'advproxy upstream proxy' => 'Upstream proxy',
+'advproxy upstream proxy host:port' => 'Upstream proxy (host:port)',
+'advproxy upstream username' => 'Upstream username',
+'advproxy url filter' => 'Filtr URL',
+'advproxy username forwarding' => 'Username forwarding',
+'advproxy via forwarding' => 'Proxy address forwarding',
+'advproxy visible hostname' => 'Widoczna nazwa hosta',
+'advproxy web browser' => 'Przeglądarka WWW',
+'advproxy wednesday' => 'Śr',
+'again' => 'Ponownie:',
+'aktiv' => 'Aktywny',
+'album' => 'Album',
+'alcatelusb help' => 'Aby używać modemu Speedtouch 330 lub Speedtouch USB należy wgrać na do systemu IPFire odpowiedni firmware. Pobierz pakiet <b>Embedded Firmware</b> dla SpeedTouch 330 ze strony speedtouch.com, rozpakuj pobrany plik a następnie wgraj za pomocą poniższego formularza odpowiedni dla Twojego modemu plik : KQD6_3.xxx jeżeli Rev<4 lub ZZZL_3.xxx dla Rev=4.',
+'alcatelusb upload' => 'Wgraj firmware Speedtouch USB',
+'alias ip' => 'Alias IP',
+'aliases' => 'Aliasy',
+'aliases not active' => 'Aliasy nie będą aktywne jeżeli interferjs RED nie jest statyczny',
+'all' => 'Wszystko',
+'all interfaces' => 'Wszystkie interfejsy',
+'all services' => 'Wszystkie usługi',
+'all updates installed' => 'Wszystki zainstalowane aktualizacje',
+'allmsg' => 'pokaż wszystko',
+'alt dialup' => 'Dialup',
+'alt home' => 'Start',
+'alt information' => 'Informacja',
+'alt logs' => 'Logi',
+'alt ovpn' => 'OpenVPN',
+'alt proxy' => 'Proxy',
+'alt services' => 'Usługi',
+'alt system' => 'System',
+'alt vpn' => 'VPNy',
+'and' => 'i',
+'ansi t1.483' => 'TO BE REMOVED',
+'apcupsd' => 'status APC-UPS',
+'apply' => 'Zastosuj',
+'april' => 'Kwiecień',
+'archive not exist' => 'Archiwum konfiguracji nie istnieje',
+'are you sure' => 'Jesteś pewien?',
+'arp table entries' => 'Wpisy tabeli ARP:',
+'artist' => 'Artysta',
+'attemps' => 'Prób',
+'august' => 'Sierpień',
+'authentication' => 'Uwierzytelnianie:',
+'automatic' => 'Automatycznie',
+'available updates' => 'Dostępne aktualizacje:',
+'average' => 'Srednia',
+'avoid dod' => 'Nie używaj tej opcji jeżeli wykorzystujesz wdzanianie na żądanie! Zazwyczaj wykorzystywane jeżeli IPFire jest za routerem. Interfejs RED musi być w jednej z 3 sieci np. 10/8, 172.16/12, 192.168/16',
+'back' => 'WRÓĆ',
+'backup' => 'Backup',
+'backup archive' => 'Plik backupu (.dat)',
+'backup clear archive' => 'Wyczyść plik backupu (.gz)',
+'backup config floppy' => 'Backup konfiguracji - dyskietka',
+'backup configuration' => 'Konfiguracja backupu:',
+'backup erase key' => 'Usuń klucz',
+'backup explain key' => 'Kopie zapasowe są szyfrowane z użyciem tego klucza. W celu zapewnienia bezpieczeństwa IPFire pozwala na odtwarzanie WYŁĄCZNIE kopii zapasowych zaszyfrowanych przy użyciu tego klucza. Masz 3 opcje do wyboru:',
+'backup explain key li1' => 'pozwól IPFire na wygenerowanie klucza dla Ciebie.',
+'backup explain key li2' => 'zaimportuj klucz (możliwe zabezpieczenie hasłem).',
+'backup explain key li3' => 'wypakuj klucz z nieszyfrowanej kopii z wersji 1.4.10.',
+'backup explain key no1' => 'powinieneś zachować ten klucz jeżeli planujesz odtworzenie na nowych urządzeniach. IPFire pozwala tylko raz utworzyć/importować klucz.',
+'backup explain key no2' => 'legacy floppy backups are not concerned with this key.',
+'backup export key' => 'Eksportuj klucz',
+'backup extract key' => 'Wypakuj klucz',
+'backup from' => 'Backup z',
+'backup generate key' => 'Generuj klucz',
+'backup import dat file' => 'Importuj plik backupu (.dat)',
+'backup import key' => 'Import klucza',
+'backup key' => 'Klucz szyfrujący kopii',
+'backup key file' => 'Backup key file',
+'backup key info' => 'IPFire restricts access to the backup key, thus you must know root password. You have possibility to protect this key outside of IPFire with a password.',
+'backup media info' => 'Dyskietki i/lub niesformatowane urządzenia mogą powodować wyświetlanie nieprawidłowych rozmiarów. W takim przypadku wybierz całe urządzenie. Pamiętaj o zamontowaniu dysku twardego przed usunięciem urządzenia. UWAGA: dyskietka utworzona w tym miejscu nie jest wykorzystywana w procesie instalacji!!!',
+'backup missing key' => 'Need the backup key to restore a set',
+'backup password' => 'Hasło do kopii',
+'backup protect key password' => 'Backup key password',
+'backup sets' => 'Backup sets',
+'backup to floppy' => 'Kopia na dyskietkię',
+'backupaddon' => 'Kopia dodatków',
+'backupprofile' => 'Jeżeli ponowne połączenie nie powiedzie się przełącz na profil',
+'backups' => 'kopie',
+'backupwarning' => 'Najpierw należy przywrócić kopię podstawową, a następnie kopię dodatków. Proszę nie zmieniać nazwy pobranych plików z kopiami.',
+'bad characters in' => 'Niepoprawny znak w ',
+'bad characters in script field' => 'Niepoprawny znak w polu skryptu',
+'bad characters in the telephone number field' => 'Niepoprawny znak w polu z numerem telefonu.',
+'bad destination range' => 'Zakres portów docelowych posiada wartość początkową która jest większa lub równa wartości końcowej.',
+'bad ignore filter' => 'Bad ignore filter:',
+'bad return code' => 'Program pomocniczy zwrócił kod błędu',
+'bad source range' => 'The Source port range has a first value that is greater than or equal to the second value.',
+'bandwidth usage' => 'wykorzystanie pasma (wyjście)',
+'bandwitherror' => 'Nie możesz zmienić ustawień przepustawości kiedy Qos jest włączony. Najpierw wyłącz Qos.<p>',
+'bandwithsettings' => 'Ustawienia przepustowości',
+'basic options' => 'Podstawowe opcje',
+'beep when ppp connects or disconnects' => 'Dźwięk przy połączeniu/rozłączeniu IPFire',
+'behind a proxy' => 'Za proxy:',
+'bewan adsl pci st' => 'TO BE REMOVED',
+'bewan adsl usb' => 'TO BE REMOVED',
+'bitrate' => 'Bitrate',
+'bleeding rules' => 'Bleeding Edge Snort Rules',
+'blue' => 'BLUE',
+'blue access' => 'Dostęp Blue',
+'blue access use hint' => 'Należy wprowadzić adres IP lub MAC urządzenia. Możliwe jest także wprowadzenie oby adresów',
+'blue interface' => 'Interfejs Blue',
+'broadcast' => 'Broadcast',
+'broken pipe' => 'Broken pipe',
+'buffered memory' => 'Buffered Memory',
+'buffers' => 'bufory',
+'bytes per second' => 'Bajtow na sekunde',
+'bytes received' => 'Bajtów odebranych',
+'bytes sent' => 'Bajtów wysłanych',
+'ca certificate' => 'Certyfikat CA',
+'ca name' => 'Nazwa CA',
+'cache management' => 'Zarządzanie pam. podręczną',
+'cache size' => 'Rozmiar pam. podręcznej (MB):',
+'cached' => 'cached',
+'cached memory' => 'Cached Memory  ',
+'cached swap' => 'Cached Swap',
+'calamaris available reports' => 'Dostępne raporty',
+'calamaris byte unit' => 'Byte unit',
+'calamaris create report' => 'Utwórz raport',
+'calamaris enable content report' => 'Włącz raport zawartości',
+'calamaris enable distribution histogram' => 'Włącz histogram rozkładu',
+'calamaris enable domain report' => 'Włącz raport domen',
+'calamaris enable performance report' => 'Włącz raport wydajności',
+'calamaris enable requester report' => 'Włącz raport wg. wywołujących',
+'calamaris enable verbose reporting' => 'Włącz szczegółowy raport',
+'calamaris high' => 'duża',
+'calamaris histogram resolution' => 'Rozdzielczość histogramu',
+'calamaris low' => 'niska',
+'calamaris medium' => 'średnia',
+'calamaris no reports available' => 'Brak dostępnych raportów',
+'calamaris none' => 'brak',
+'calamaris number of content types' => 'Liczba typów zawartości',
+'calamaris number of domains' => 'Liczba domen',
+'calamaris number of requested urls' => 'Liczba wywoływanych URLi',
+'calamaris number of requesting hosts' => 'Liczba wywołujących hostów',
+'calamaris performance options' => 'Opcje wpływające na wydajność',
+'calamaris proxy reports' => 'Raporty Proxy',
+'calamaris refresh list' => 'Odśwież listę',
+'calamaris report interval (in minutes)' => 'Interwał raportów (w minutach)',
+'calamaris report options' => 'Opcje raportu',
+'calamaris report period' => 'Przedział czasowy raportu',
+'calamaris run as background task' => 'Uruchom jako zadanie w tle',
+'calamaris show usernames' => 'Wyświetl nazwy użytkowników',
+'calamaris skip archived logfiles' => 'Pomiń archiwalne logi',
+'calamaris unlimited' => 'bez limitu',
+'calamaris view' => 'Pokaż',
+'calamaris view report' => 'Pokaż raport',
+'calc traffic all x minutes' => 'Calculate traffic all x minutes',
+'cancel' => 'Anuluj',
+'cancel-adv-options' => 'Anuluj',
+'cannot enable both nat traversal and compression' => 'Nie można jednocześnie uruchomić opcji NAT traversal i kompresja.',
+'cannot enable ntp without specifying primary' => 'Nie można uruchomić NTP bez podania podstawowego.',
+'cannot specify secondary dns without specifying primary' => 'Nie można wprowadzić zapasowego DNS bez podania podstawowego.',
+'cannot specify secondary ntp without specifying primary' => 'Nie można wprowadzić zapasowego NTP bez podania podstawowego',
+'cannot specify secondary wins without specifying primary' => 'Nie można wprowadzić zapasowego WINS bez podania podstawowego.',
+'cant change certificates' => 'Nie można zmienić certyfikatów',
+'cant enable xtaccess' => 'Powiązana reguła przekierowania portu jest wyłączona w związku z czym nie można włączyć zewnętrznego dostępu dla tej reguły.',
+'cant start openssl' => 'Nie można uruchomić OpenSSL',
+'caps all' => 'Wszystko',
+'capsclosed' => 'ROZŁĄCZONE',
+'capsinactive' => 'NIEAKTYWNE',
+'capsopen' => 'POŁĄCZONE',
+'capswarning' => 'OSTRZEŻENIE',
+'caption' => 'Caption',
+'cert' => 'Certyfikat',
+'certificate' => 'Certyfikat',
+'certificate authorities' => 'Certificate Authorities',
+'certificate does not have a valid ca associated with it' => 'Certyfikat nie posiada przypisanego prawidłowego CA.',
+'certificate file move failed' => 'Niepowodzenie przeniesienie pliku certyfikatu',
+'cfg restart' => 'Zalecane jest ponowne uruchomienie po przywróceniu konfiguracji.',
+'chain' => 'Łańcuch',
+'change passwords' => 'Zmiana hasła',
+'change share' => 'zmiana opcji zasobu',
+'check for net traffic update' => 'Sprawdź aktualizacje Net-Traffic',
+'check vpn lr' => 'Sprawdź',
+'choose config' => 'Wybierz ustawienia',
+'choose media' => 'Wybierz media',
+'cipher' => 'Szyfrowanie:',
+'city' => 'Miasto',
+'class in use' => 'Klasa jest aktualnie w użyciu.',
+'clear cache' => 'Wyczyść pam. podręczną',
+'clear playlist' => 'Wyczyść listę odtwarzania playlist',
+'clenabled' => 'Udostępnij czas w sieci lokalnej',
+'click to disable' => 'Włączone (kliknij aby wył.)',
+'click to enable' => 'Wyłączone (kliknij aby wł)',
+'client' => 'Nazwa komputera',
+'clock has not been synchronized' => 'Zegar nie został zsynchonizowany',
+'clock last synchronized at' => 'Ostatnia synchronizacja zegara: ',
+'comment' => 'Opis:',
+'common name' => 'Common name',
+'community rules' => 'Emergingthreats.net Community Rules',
+'comp-lzo' => 'Kompresja LZO:',
+'compression' => 'Kompresja:',
+'computer to modem rate' => 'Szybkość połączenia z komputerem:',
+'concentrator name' => 'Nazwa koncentratora:',
+'confirmation' => 'potwierdzenie',
+'connect' => 'OVPN Start / Połącz',
+'connect the modem' => 'Połącz z modemem',
+'connect timeout' => 'Czas oczekiwania połączenia:',
+'connected' => 'Połączony',
+'connecting' => 'Łączenie...',
+'connection' => 'Połączenie',
+'connection closed' => 'Brak połączenia...',
+'connection debugging' => 'Debugowanie połączenia',
+'connection status and controlc' => 'Stan i kontrola połączenia:',
+'connection tracking' => 'Śledzenie połączeń IPTables',
+'connection type' => 'Rodzaj połączenia',
+'connection type is invalid' => 'Nieprawidłowy rodzaj połączenia.',
+'connections' => 'Połączenia',
+'connections are associated with this ca.  deleting the ca will delete these connections as well.' => 'istnieją połączenia powiązane z tym CA. Usunięcie tego CA spowoduje także usunięcie powiązanych połączeń.',
+'connscheduler' => 'Harmonogram połączeń',
+'core notice 1' => '<strong>Uwaga:</strong> Dostępna jest aktualizacja (core-update) z',
+'core notice 2' => 'do',
+'core notice 3' => '.',
+'could not be opened' => 'nie może być otwarty.',
+'could not connect to' => 'Nie można połączyć z',
+'could not connect to www ipcop org' => 'Nie można połączyć z www.ipfire.org',
+'could not connect to www ipfire org' => 'Nie można połączyć z to www.ipfire.org',
+'could not create directory' => 'Nie można utworzyć katalogu.',
+'could not download latest patch list' => 'Nie można pobrać najnowszej listy poprawek (brak połączenia).',
+'could not download latest updates' => 'Nie można pobrać najnowszej listy aktualizacji.',
+'could not download the available updates list' => 'Nie można pobrać listy dostępnych aktualizacji.',
+'could not open available updates file' => 'Nie można otworzyć pliku z dostępnymi aktualizacjami.',
+'could not open installed updates file' => 'Nie można otworzyć pliku z zainstalowanymi aktualizacjami',
+'could not open update information file' => 'Could not open update information file.  The update file is corrupt.',
+'could not retrieve common name from certificate' => 'Nie można odzyskać nazwy serwera (common name) z certyfikatu.',
+'country' => 'Kraj',
+'cpu frequency per' => 'Czestotliwosc procesora na',
+'cpu idle usage' => 'Bezczynnosc CPU',
+'cpu interrupt usage' => 'Interrupt CPU Usage',
+'cpu iowait usage' => 'CPU oczekujace na IO',
+'cpu irq usage' => 'IRQ CPU Usage',
+'cpu nice usage' => 'Nice CPU Usage',
+'cpu steal usage' => 'Steal CPU Usage',
+'cpu system usage' => 'System CPU Usage',
+'cpu usage per' => 'CPU Usage per',
+'cpu user usage' => 'User CPU Usage',
+'create' => 'Utwórz',
+'create mask' => 'Prawa UNIX\'a dla tworzonych plików',
+'create new backup' => 'Utwórz nowe ustawienia kopii zapasowej',
+'credits' => 'Credits',
+'crl' => 'Lista odwołań certyfikatów',
+'cron server' => 'Serwer CRON',
+'current' => 'Aktualne',
+'current aliases' => 'Aktualne alias:',
+'current class' => 'Aktualna klasa',
+'current devices' => 'Aktualne urządzenia',
+'current dhcp leases on blue' => 'Przydziały DHCP na interfejsie BLUE',
+'current dynamic leases' => 'Aktualne przydziały dynamiczne',
+'current fixed leases' => 'Aktualne przydziały statyczne',
+'current hosts' => 'Aktualne hosty:',
+'current media' => 'Aktualne media',
+'current ovpn' => 'Aktywne połączenia OVPN:',
+'current playlist' => 'Aktualna lista odtw.',
+'current profile' => 'Aktualny profil:',
+'current rules' => 'Aktualne reguły:',
+'custom networks' => 'Własne sieci',
+'custom services' => 'Własne usługi',
+'daily firewallhits' => 'daily firewallhits',
+'dat without key' => 'Zaszyfrowane archiwa nie mogą być odzyskane bez podania klucza.',
+'date' => 'Data',
+'date not in logs' => 'Brak (lub tylko część) logów dla podanej daty',
+'day' => 'Dzien',
+'day after' => 'Dzień po',
+'day before' => 'Dzień przed',
+'days' => 'dni.',
+'dbfile' => 'Dbfile',
+'ddns help dnsmadeeasy' => 'W polu nazwa hosta wprowadź twoje ID (lub listę ID oddzielanych średnikami)',
+'ddns help freedns' => 'W polu użytkownik wprowadź connect string',
+'ddns help plus' => '<b>+</b> marks a mandatory field',
+'ddns hostname added' => 'Dynamiczny host DNS dodany',
+'ddns hostname modified' => 'Dynamiczny host DNS zmodyfikowany',
+'ddns hostname removed' => 'Dynamiczny host DNS usunięty',
+'ddns minimize updates' => 'Ograniczaj aktualizację: przed aktualizacją porównaj IP dla hosta "[host.]domain" z IP interfejsu RED.',
+'ddns noip prefix' => 'To use no-ip in group mode, prefix hostname with <b>%</b>',
+'deactivate' => 'deaktywuj',
+'deactivate user' => 'deaktywuj użytkownika',
+'debugme' => 'Obecnie brak implementacji',
+'december' => 'Grudzień',
+'deep scan directories' => 'Skanuj rekursywnie',
+'def lease time' => 'Domyślny czas przydziału',
+'default lease time' => 'Domyślny czas przydziału (min):',
+'default networks' => 'Domyślne sieci',
+'default renewal time' => 'Domyślny czas odnawiania',
+'default services' => 'Domyślne usługi',
+'defaultwarning' => 'UWAGA - Twoje ustawienia zostaną utracone i zastąpione przez ustawienia domyślne.',
+'delete' => 'Usuń',
+'delete cron' => 'Usuń zadanie crona',
+'delete pc' => 'Usuń komputer',
+'delete share' => 'Usuń zasób',
+'delete user' => 'Usuń użytkownika',
+'demon login script' => 'Demon login script',
+'description' => 'Opis',
+'dest ip and port' => 'Cel IP: Port',
+'destination' => 'Cel',
+'destination ip' => 'Docelowe IP',
+'destination ip bad' => 'Niepoprawne docelowe IP',
+'destination ip or net' => 'Docelowe IP lub sieć',
+'destination net' => 'Sieć docelowa',
+'destination port' => 'Port docelowy',
+'destination port numbers' => 'Port docelowy musi być prawidłowym numerem portu lub zakresem portów.',
+'destination port overlaps' => 'Zakres portów docelowych pokrywa się z istniejącym.',
+'detail level' => 'Szczegóły',
+'device' => 'Urządzenie',
+'devices on blue' => 'Urządzenia na BLUE',
+'dhcp advopt add' => 'Dodaj opcję DHCP',
+'dhcp advopt added' => 'Opcja DHCP dodana',
+'dhcp advopt blank value' => 'Wartość opcji DHCP nie może być pusta.',
+'dhcp advopt custom definition' => 'Własne definicje opcji',
+'dhcp advopt definition' => 'Definicja',
+'dhcp advopt definition exists' => 'Definicja opcji istnieje. Możesz ją zmodyfikować lub usunąć.',
+'dhcp advopt edit' => 'Edydutj opcję DHCP',
+'dhcp advopt help' => 'Lista opcji',
+'dhcp advopt list' => 'Dodatkowe opcje DHCP',
+'dhcp advopt modified' => 'Zmodyfikowano opcję DHCP',
+'dhcp advopt name' => 'Nazwa opcji',
+'dhcp advopt removed' => 'Usunięto opcję DHCP',
+'dhcp advopt scope' => 'Zakres opcji',
+'dhcp advopt scope global' => 'Globalna',
+'dhcp advopt scope help' => 'Zakres globalny lub ograniczony do wybranych interfejsów.',
+'dhcp advopt unknown' => 'Nieprawidłowa nazwa opcji DHCP',
+'dhcp advopt value' => 'Wartość opcji',
+'dhcp allow bootp' => 'Zazwalaj na klientów bootp',
+'dhcp base ip fixed lease' => 'Część IP do tworzenia powiązań statycznych',
+'dhcp bootp pxe data' => 'Dodatkowe dane bootp pxe dla tego powiązania statycznego',
+'dhcp configuration' => 'Konfiguracja DHCP',
+'dhcp create fixed leases' => 'Stwórz powiązanie statyczne',
+'dhcp fixed lease err1' => 'Aby utworzyć powiązanie statyczne należy podać adres MAC i/lub nazwę hosta.',
+'dhcp fixed lease help1' => 'IP Addresses might be entered as FQDN',
+'dhcp mode' => 'DHCP',
+'dhcp server' => 'Serwer DHCP',
+'dhcp server disabled' => 'Serwer DHCP wyłączony.  Zatrzymano.',
+'dhcp server disabled on blue interface' => 'Serwer DHCP wyłączony na interfejsie BLUE',
+'dhcp server enabled' => 'Serwer DHCP włączony.  Ponowne uruchamianie.',
+'dhcp server enabled on blue interface' => 'Serwer DHCP włączony na interfejsie BLUE',
+'dhcp-options' => 'DHCP push options',
+'dial' => 'Połącz',
+'dial profile' => 'Połącz z profilem',
+'dial user password' => 'Dial user password:',
+'dial user password has been changed' => 'Dial user password has been changed.',
+'dialing mode' => 'Dialing mode:',
+'dialup red not ppp' => 'Profile połączeń wdzwanianych mogą być używane tylko kiedy interfejs <b>RED</b> jest ustawiony jako <b>PPP Dialup</b><BR>Sprawdź ustawienia sieci.',
+'dialup settings' => 'Ustawienia wdzwaniania',
+'directory mask' => 'Prawa UNIX do katalogu',
+'directory writeable' => 'katalog ma prawo zapisu',
+'disabled' => 'wyłączony',
+'disconnect' => 'OVPN Zatrz./Rozłączenie',
+'disconnects' => 'Rozłączeń',
+'disk access per' => 'Dostepow do dysku na',
+'disk usage' => 'Wykorzystanie dysku',
+'display' => 'Wyświetl',
+'display charset' => 'Display Charset',
+'display hostname in window title' => 'Wyświetlaj nazwę hosta w tytule okna',
+'display traffic at home' => 'Wyświetlaj dane o ruchu na stronie startowej',
+'display webinterface effects' => 'Aktywuj efekty interfejsu',
+'dl client arch' => 'Pobierz pakiet klienta (zip)',
+'dmz' => 'DMZ',
+'dmz pinhole configuration' => 'Konfigracja DMZ pinhole',
+'dmz pinhole rule added' => 'Reguła DMZ pinhole dodana; restartowanie DMZ pinhole',
+'dmz pinhole rule removed' => 'Reguła DMZ pinhole usunięta; restartowanie DMZ pinhole',
+'dmzpinholes for same net not necessary' => 'DMZ Pinhole jest niepotrzebny pomiędzy tymi samymi sieciami. Wybierz różne sieci źródłowe i docelowe.',
+'dns address deleted' => 'Pomyślnie usunięto!',
+'dns address deleted txt' => 'Adres serwera DNS został pomyślnie usunięty.<br />Należy wykonać restart lub nawiązać ponownie połączenie!!!',
+'dns address done' => 'Zapisywanie ustawień serwerów DNS.',
+'dns address recon' => 'Ponowne łączenie!',
+'dns check failed' => 'DNS check failed',
+'dns desc' => 'Jeżeli adres IP przydzielany jest z serwera DHCP dostawcy informacje o DNS zostaną wprowadzone automatycznie. W tym miejscu możesz wprowadzić własne adresy serwerów DNS.',
+'dns error 0' => 'Adres IP <strong>podstawowego</strong> DNS jest niepoprawny. Sprawdź ustawienia!<br />Wprowadzony adres<strong>zapasowego</strong> DNS jest prawidłowy.',
+'dns error 01' => 'Podane adresy serwerów DNS <strong>podstawowego</strong> i <strong>zapasowego</strong> są nieporawne. Sprawdź ustawienia!',
+'dns error 1' => 'Adres IP <strong>zapasowego</strong> DNS jest niepoprawny. Sprawdź ustawienia!<br />Wprowadzony adres <strong>podstawowego</strong> DNS jest prawidłowy.',
+'dns header' => 'Assign DNS server addresses only for DHCP on red0',
+'dns list' => 'Lista darmowych publicznych serwerów DNS',
+'dns menu' => 'Przypisz serwer DNS',
+'dns new 0' => 'Nowy adres IP <strong>podstawowego</strong> DNS:',
+'dns new 1' => 'Nowy adres IP <strong>zapasowego</strong> DNS:',
+'dns proxy server' => 'Serwer Proxy DNS',
+'dns saved' => 'Zapisano poprawnie!',
+'dns saved txt' => 'Podane adresy serwerów DNS zostały poprawnie zapisane. <br />Należy wykonać restart lub wykonać ponowne łączenie, aby zmiany zostały zastosowane!',
+'dns server' => 'Serwer DNS',
+'dns title' => 'Domain Name System',
+'do not log this port list' => 'Odrzucaj tą listę portów zanim zostaną zapisane do logu (zmniejsza rozmiar logów)',
+'dod' => 'Łącz na żądanie',
+'dod for dns' => 'Łącz na żadnie DNS:',
+'dod not compatible with ddns' => 'Łączenie na żądanie nie jest kompatybilne z usługą dynamicznego dns (dyndns)',
+'dod waiting' => 'Łączenie na żądanie - oczekiwanie',
+'domain' => 'Domena',
+'domain master' => 'Domain Master',
+'domain name' => 'Nazwa domeny',
+'domain name suffix' => 'Sufiks nazwy domeny:',
+'domain not set' => 'Domena nie ustawiona.',
+'donation' => 'Donation',
+'donation-link' => 'https://www.paypal.com/en_US/GB/i/btn/btn_donateCC_LG.gif',
+'donation-text' => '<strong>IPFire</strong> jest tworzony przez wolontariuszy w ich wolnym czasie. Jeżeli chcesz pomóc w dalszym rozwoju projektu możesz nas wspomóc dowolną kwotą. ',
+'done' => 'Do it',
+'dos charset' => 'Kodowanie DOS',
+'down and up speed' => 'Wprowadź parametry Twojego łącza - prędkość pobierania i wysyłania danych <br /> i naciśnij <i>Zapisz</i>.',
+'downlink speed' => 'Prędkość pobierania (kbit/sec)',
+'downlink std class' => 'standardowa klasa pobierania',
+'download' => 'pobierz',
+'download ca certificate' => 'Pobierz certyfikat CA',
+'download certificate' => 'Pobierz certyfikat',
+'download host certificate' => 'Pobierz certyfikat hosta',
+'download new ruleset' => 'Pobierz nowy zestaw reguł',
+'download pkcs12 file' => 'Pobierz plik PKCS12',
+'download root certificate' => 'Pobierz certyfikat root',
+'dpd action' => 'Dead Peer Detection action',
+'driver' => 'Sterownik',
+'drop input' => 'Loguj odrzucone pakiety wejściowe (input packets)',
+'drop newnotsyn' => 'Loguj odrzucone pakiety new not syn',
+'drop output' => 'Loguj odrzucone pakiety wyjściowe (output packets)',
+'drop portscan' => 'Loguj odrzucone pakiety skanowania (portscan pakets)',
+'drop proxy' => 'Odrzucaj wszystkie pakiety nie skierowane do proxy',
+'drop samba' => 'Odrzucaj wszystkie porty Microsoft 135,137,138,139,445,1025',
+'drop wirelessforward' => 'Log dropped wireless forward pakets',
+'drop wirelessinput' => 'Loguj odrzucone pakiety wejściowe wireless',
+'dst port' => 'Dst Port',
+'dstprt range overlaps' => 'Zakres portów zachodzi na jeden z aktualnie zdefiniowanych portów.',
+'dstprt within existing' => 'Port docelowy zawiera się w aktualnie zdefiniowanym zakresie portów.',
+'duplicate ip' => 'Wprowadzono duplikat adresu IP',
+'duplicate ip bold' => 'Zduplikowany adresy zostały <b>pogrubiony</b>',
+'duplicate mac' => 'Wprowadzono duplikat adresu MAC',
+'duplicate name' => 'Taka nazwa już istnieje, proszę podać inną.',
+'dyn dns source choice' => 'IPFire będzie dostarczał adres IP dla usługodawców Dynamic DNS z:',
+'dynamic dns' => 'Dynamiczny DNS',
+'dynamic dns client' => 'Klient dynamicznego DNS',
+'e-mail address too long' => 'Adres E-mail jest zbyt długi; nie powinien być dłuższy niż 40 znaków.',
+'eciadsl help' => 'Aby korzystać z modemu ECI ADSL należy wgrać plik synch.bin na serwer IPFire. Należy pobrać ten plik ze strony ECIADSL a następnie wgrać plik <b>synch.bin</b> wykorzystując poniższy formularz.',
+'eciadsl upload' => 'Wgraj plik ECI ADSL synch.bin',
+'edit' => 'Edycja',
+'edit a rule' => 'Edytuj istniejącą regułę:',
+'edit advanced settings when done' => 'Edytuj zaawansowane opcje kiedy zakończone.',
+'edit an existing alias' => 'Edytuj istniejący alias',
+'edit an existing host' => 'Edytuj istniejącego hosta',
+'edit an existing lease' => 'Edytuj istniejący wpis statyczny',
+'edit device' => 'Edycja urządzenia',
+'edit hosts' => 'Edycja hosta',
+'edit network' => 'Edycja sieci',
+'edit printer' => 'edycja drukarki',
+'edit service' => 'Edycja usługi',
+'edit share' => 'Edycja zasobu',
+'editor' => 'Edytor',
+'eg' => 'np.:',
+'email server can not be empty' => 'Serwer E-mail nie może być pusty',
+'emailreportlevel' => 'E-mailreportlevel',
+'empty' => 'To pole może zostać puste',
+'empty profile' => 'pusty',
+'enable ignore filter' => 'Enable ignore filter',
+'enable javascript' => 'Włącz javascript',
+'enable wildcards' => 'Enable wildcards:',
+'enabled' => 'Włączony:',
+'enabled on' => 'Włączony na',
+'enabledtitle' => 'Włączony',
+'encapsulation' => 'Encapsulacja',
+'encrypted' => 'Encrypted',
+'end address' => 'Adres końcowy:',
+'enter ack class' => 'Wprowadź klasę dla ACK <br /> i naciśnij <i>Zapisz</i>.',
+'enter data' => 'Wprowadź ustawienia <br /> a następnie naciśnij <i>Zapisz</i>.',
+'err bk 1' => 'Błąd tworzenia archiwum',
+'err bk 10 password' => 'Error with backup password',
+'err bk 2 key' => 'Błąd tworzenia pliku klucza',
+'err bk 3 tar' => 'Błąd dodawania plików do archiwum',
+'err bk 4 gz' => 'Błąd kompresji archiwum',
+'err bk 5 encrypt' => 'Błąd szyfrowania archiwum',
+'err rs 1' => 'Błąd przywracania archiwum',
+'err rs 6 decrypt' => 'Błąd odszyfrowywania archiwum',
+'err rs 7 untartst' => 'Niepoprawne odszyfrowane archiwum',
+'err rs 8 untar' => 'Błąd wypakowywania archiwum (untar)',
+'error config' => 'Nie można otworzyć /var/ipfire/ovpn/config/ZERINA.ovpn !',
+'error external access' => 'Nie można otworzyć /var/ipfire/xtaccess/config (dostęp zewnętrzny może nie działać)!',
+'error messages' => 'Wiadomości o błędach:',
+'esp encryption' => 'Szyfrowanie ESP:',
+'esp grouptype' => 'Grupa ESP:',
+'esp integrity' => 'ESP Integrity:',
+'esp keylife' => 'Czas ważności klucza ESP:',
+'esp keylife should be between 1 and 24 hours' => 'Czas ważności klucza ESP powinien być pomięcy 1 a 24 godzinami',
+'every' => 'Każdy',
+'exampel' => 'przykład',
+'exclude logfiles' => 'Wyklucz pliki z logami',
+'excluding buffers and cache' => '-/+ buffers/cache',
+'expected' => 'Oczekiwano',
+'expertoptions' => 'Opcje zaawans.',
+'expires' => 'Wygasa',
+'export' => 'Export',
+'exportkey' => 'Export PSK',
+'external access' => 'Dostęp zewnętrzny',
+'external access configuration' => 'Konfiguracja dostępu zewnętrznego',
+'external access rule added' => ' Dodano regułę dostępu zewnętrznego; ponowne uruchamianie kontroli dostępu',
+'external access rule changed' => ' Zmieniono regułę dostępu zewnętrznego; ponowne uruchamianie kontroli dostępu',
+'external access rule removed' => ' Usunięto regułę dostępu zewnętrznego; ponowne uruchamianie kontroli dostępu',
+'external aliases configuration' => 'Konfiguracja aliasów zewnętrznych',
+'extrahd' => 'ExtraHD',
+'extrahd detected drives' => 'wykryte napędy',
+'false classnumber' => 'Numer klasy nie pasuje do interfejsu.',
+'false max bandwith' => 'Nieprawidłowe maksymalne pasmo (false).',
+'false min bandwith' => 'Nieprawidłowe minimalne pasmo (false).',
+'february' => 'Luty',
+'fetch ip from' => 'Próbuj uzyskać publiczne IP za pomocą zewnętrznego serwera',
+'filename' => 'Nazwa pliku',
+'filesystem full' => 'Pełny system plików',
+'fireinfo ipfire version' => 'Wersja IPFire',
+'fireinfo is disabled' => 'Fireinfo jest wyłączony',
+'fireinfo is enabled' => 'Fireinfo jest włączony',
+'fireinfo is submitted' => 'Twój profil jest przesyłany do serwisu fireinfo.',
+'fireinfo is submitted button' => 'Nie, nie chcę więcej przesyłać mojego profilu',
+'fireinfo kernel version' => 'Wersja jądra',
+'fireinfo not submitted' => 'Twój profil nie jest przesyłany do serwisu fireinfo.',
+'fireinfo not submitted button' => 'Tak, chcę przesłać mój profil',
+'fireinfo pakfire version' => 'Wersja pakfire',
+'fireinfo please enable' => 'Proszę włączyć usługę fireinfo.',
+'fireinfo settings' => 'Ustawienia Fireinfo',
+'fireinfo system version' => 'Wersja systemu',
+'fireinfo why descr1' => 'Dla rozwoju IPFire bardzo ważne jest włączenie tej usługi',
+'fireinfo why descr2' => 'usługa. ',
+'fireinfo why enable' => 'Dlaczego powinienem włączyć fireinfo?',
+'fireinfo why read more' => 'Czytaj więcej o powodach.',
+'fireinfo your profile id' => 'ID Twojego profilu',
+'firewall' => 'Zapora',
+'firewall graphs' => 'Zapora - Wykresy',
+'firewall hits' => 'Zdarzen zapory dla',
+'firewall hits per' => 'zdarzen zapory na',
+'firewall log' => 'Log zapory',
+'firewall log viewer' => 'Przeglad logow zapory',
+'firewall logs' => 'Logi zapory',
+'firewall logs ip' => 'Fw-Logdgraphs (IP)',
+'firewall logs port' => 'Fw-Loggraphs (Port)',
+'firewallhits' => 'zdarzen zapory',
+'firmware' => 'Firmware',
+'firmware upload' => 'Wgraj Firmware/Sterowniki',
+'fixed ip lease added' => 'Dodano statyczny wpis IP',
+'fixed ip lease modified' => 'Zmodyfikowano statyczny wpis IP',
+'fixed ip lease removed' => 'Usunięto statyczny wpis IP',
+'force update' => 'Wymuś aktualizację',
+'force user' => 'force all new file to user',
+'forwarding rule added' => 'Dodano regułę przekierowania; ponowne uruchamianie przekierowań',
+'forwarding rule removed' => 'Usunięto regułę przekierowania; ponowne uruchamianie przekierowań',
+'forwarding rule updated' => 'Zmieniono regułę przekierowania; ponowne uruchamianie przekierowań',
+'free' => 'Wolne',
+'free memory' => 'Wolna pamiec    ',
+'free swap' => 'Wolny SWAP',
+'frequency' => 'Czestotliwosc',
+'friday' => 'Piątek',
+'fritzdsl help' => 'Aby używać modemów Fritz Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb , należy wgrać odpowiedni pakiet na serwer IPFire. W tym celu należy pobrać pakiet tar odpowiadający twojej wersji ze strony IPFire, a następnie wgrać plik <b>fcdsl-(your_version).tgz</b> na Twój serwer IPFire wykorzystując poniższy formularz.',
+'fritzdsl upload' => 'Wgraj sterownik Fritz!DSL',
+'from' => 'Od',
+'from email adr' => 'Adres nadawcy e-mail',
+'from email pw' => 'Hasło nadawcy e-mail',
+'from email server' => 'Serwer nadawcy e-mail',
+'from email user' => 'Użytkownik nadawcy e-mail',
+'from warn email bad' => 'Adres nadawcy e-mail jest niepoprawny',
+'fw blue' => 'Opcje zapory dla interfejsu BLUE',
+'fw logging' => 'Logowanie zapory',
+'g.dtm' => 'TO BE REMOVED',
+'g.lite' => 'TO BE REMOVED',
+'gateway' => 'Brama',
+'gateway ip' => 'IP bramy',
+'gen static key' => 'Generuj statyczny klucz',
+'generate' => 'Generuj certyfikat root/host',
+'generate a certificate' => 'Generuj certyfikat:',
+'generate iso' => 'Generate ISO',
+'generate root/host certificates' => 'Generuj certyfikaty root/host',
+'generate tripwire keys and init' => 'generuj klucze tripwire i inicjuj',
+'generatekeys' => 'Generuj klucze',
+'generatepolicy' => 'Generuj nową politykę',
+'generatereport' => 'Generuj nowy raport',
+'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Generowanie certyfikatów root i host może zając dłuższą chwilę. Na starszym sprzęcie może trwać kilka minut. Zachowaj cierpliwość',
+'genkey' => 'Generuj PSK',
+'genre' => 'Genre',
+'global settings' => 'Ustawienia globalne',
+'gpl i accept these terms and conditions' => 'Akceptuję te warunki',
+'gpl license agreement' => 'Akceptacja licencji',
+'gpl please read carefully the general public license and accept it below' => 'Proszę uważnie przeczytać licencję General Public License i zaakceptować jej warunki',
+'gpl unofficial translation of the general public license v3' => 'Nieoficjalne tłumaczenie General Public License v3',
+'graph' => 'Wykres',
+'graph per' => 'na',
+'green' => 'Green',
+'green interface' => 'Interfejs Green',
+'guaranteed bandwith' => 'Gwarantowane pasmo',
+'guardian alertfile' => 'Plik alertów',
+'guardian configuration' => 'Konfiguracja Guardian\'a',
+'guardian ignorefile' => 'Plik ignorowanych',
+'guardian interface' => 'Interfejs',
+'guardian logfile' => 'Plik Log',
+'guardian timelimit' => 'Ograniczenie czasowe',
+'guest ok' => 'zezwól na dostęp dla gości',
+'gui settings' => 'Ustawienia GUI',
+'gz with key' => 'Tylko zaszyfrowane archiwum może być odtworzone na tej maszynie.',
+'hangup' => 'Rozłącz',
+'hangup string' => 'Hangup:',
+'harddisk temperature' => 'Temperatura dysku',
+'harddisk temperature graphs' => 'wykresy temperatury hdd',
+'hardware graphs' => 'Wykresy sprzętu',
+'hdd temperature in' => 'Temperatura dysku w ',
+'help' => 'Pomoc',
+'high' => 'Wysoki',
+'high memory usage' => 'High memory usage',
+'hint' => 'Wskazówka:',
+'holdoff' => 'Czas powstrzymania (w sekundach)',
+'host' => 'Host',
+'host allow' => 'lista dozwolonych hostów',
+'host certificate' => 'Certyfikat hosta',
+'host configuration' => 'Konfiguracja hosta',
+'host deny' => 'lista zabronionych hostów',
+'host ip' => 'Adres IP hosta',
+'host to net vpn' => 'Host-to-Net Virtual Private Network (RoadWarrior)',
+'hostname' => 'Nazwa hosta',
+'hostname and domain already in use' => 'Nazwa hosta i domena są już w użyciu.',
+'hostname cant be empty' => 'Nazwa hosta nie może być pusta.',
+'hostname not set' => 'Nazwa hosta nie ustawiona.',
+'hosts config added' => 'Dodana konfiguracja hostów',
+'hosts config changed' => 'Zmieniona konfiguracja hostów',
+'hour' => 'Godzina',
+'hours' => 'Godziny',
+'hours2' => 'Godziny',
+'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
+'icmp selected but no type' => 'Wybrano protokół ICMP, ale nie określono typu ICMP.',
+'icmp type' => 'Typ ICMP',
+'id' => 'ID',
+'idle' => 'Bezczynne',
+'idle timeout' => 'Czas bezczynności (min; 0 aby wyłączyć):',
+'idle timeout not set' => 'Nie określono czasu bezczynności.',
+'ids log viewer' => 'Przegląd logów IDS',
+'ids logs' => 'Logi IDS',
+'ids preprocessor' => 'Preprocessor IDS ',
+'ids rules license' => 'Aby używać certyfikowanych reguł Sourcefire VRT, musisz zarejestrować się na',
+'ids rules license1' => '.',
+'ids rules license2' => 'Zaakceptuj licencje, aktywuj swoje konto przez kliknięcie linku otrzymanego mailem. Następnie przejdź do',
+'ids rules license3' => 'naciśnij przycis "Generate code"-i skopiuj 40-to znakowy Oinkcode do pola poniżej.',
+'ids rules update' => 'Aktualizacja reguł Snorta',
+'iface' => 'Iface',
+'ignore filter' => 'Ignore filter',
+'ike encryption' => 'Szyfrowanie IKE:',
+'ike grouptype' => 'Typ grupy IKE:',
+'ike integrity' => 'Spójność IKE:',
+'ike lifetime' => 'Czas ważności IKE:',
+'ike lifetime should be between 1 and 8 hours' => 'Czas ważności IKE powinien wynosić od 1 do 8 godzin.',
+'import' => 'Import',
+'importkey' => 'Import PSK',
+'in' => 'W',
+'inactive' => 'nieaktywne/y',
+'include logfiles' => 'Dołącz pliki z logami',
+'incoming' => 'przychodzące/y',
+'incoming traffic in bytes per second' => 'Ruch przychodzacy',
+'incorrect password' => 'Niepoprawne hasło',
+'info' => 'Info',
+'init string' => 'Inicjuj:',
+'insert floppy' => 'Aby wykonać kopię na dyskietkę włóż sformatowany nośnik do napędu w serwerze IPFire i naciśnij <i>kopia na dyskietę</i> aby zapisać konfigurację systemu. Należy uważnie sprawdzić wynik tej operacji. Wykonywania kopii może zając dłuższą chwilę, zachowaj cierpliwość.<p>',
+'insert removable device' => 'Włóż wymienny nośnik',
+'install' => 'Instaluj',
+'install new update' => 'Instaluj nową aktualizację:',
+'installed' => 'Zainstalowane',
+'installed updates' => 'Zainstalowane aktualizacje:',
+'instant update' => 'Instant Update',
+'interface' => 'Interfejs',
+'interfaces' => 'Interfejsy',
+'internet' => 'INTERNET',
+'intrusion detection' => 'Wykrywanie intruzów',
+'intrusion detection system' => 'System wykrywania intruzów',
+'intrusion detection system log viewer' => 'Przegląd logów systemu wykrywania intruzów',
+'intrusion detection system rules' => 'reguły systemu wykrywania intruzów',
+'intrusion detection system2' => 'System wykrywania intruzów:',
+'invalid broadcast ip' => 'Niepoprawny broadcast IP',
+'invalid cache size' => 'Niepoprawny rozmiar cache.',
+'invalid characters found in pre-shared key' => 'Nieporawny znak w polu klucza współdzielonego.',
+'invalid date entered' => 'Wprowadzono niepoprawną datę.',
+'invalid default lease time' => 'Niepoprawny domyślny czas dzierżawy.',
+'invalid domain name' => 'Niepoprawna nazwa domeny.',
+'invalid downlink speed' => 'Niepoprawna szybkość pobierania.',
+'invalid end address' => 'Niepoprawny adres końcowy.',
+'invalid fixed ip address' => 'Niepoprawny adres IP wpisu statycznego',
+'invalid fixed mac address' => 'Niepoprawny adres MAC wpisu statycznego',
+'invalid hostname' => 'Niepoprawna nazwa hosta.',
+'invalid input' => 'Niepoprawna wartość',
+'invalid input for authentication method' => 'Niepoprawna wartość metody uwierzytelniana.',
+'invalid input for city' => 'Niepoprawna wartość w polu miasto.',
+'invalid input for country' => 'Niepoprawna wartość w polu kraj.',
+'invalid input for department' => 'Niepoprawna wartość w polu oddział.',
+'invalid input for dhcp dns' => 'Niepoprawna wartość w polu DHCP DNS',
+'invalid input for dhcp domain' => 'Niepoprawna wartość w polu domena DHCP',
+'invalid input for dhcp wins' => 'Niepoprawna wartość w polu DHCP WINS',
+'invalid input for e-mail address' => 'Niepoprawna wartość w polu adres e-mail.',
+'invalid input for esp keylife' => 'Niepoprawna wartość w polu czas ważności ESP',
+'invalid input for hostname' => 'Niepoprawna wartość w polu nazwa hosta.',
+'invalid input for ike lifetime' => 'Niepoprawna wartość w polu czas ważności IKE',
+'invalid input for keepalive 1' => 'Niepoprawna wartość w polu Keepalive ping',
+'invalid input for keepalive 1:2' => 'Niepoprawna wartość w polu Keepalive. Używaj min. współczynnika 1:2',
+'invalid input for keepalive 2' => 'Niepoprawna wartość w polu Keepalive ping-restart',
+'invalid input for max clients' => 'Niepoprawna wartość w polu Max Klientów',
+'invalid input for name' => 'Niepoprawna wartość w polu pełna nazwa użytkownika lub nazwa hosta systemu',
+'invalid input for oink code' => 'Niepoprawny OINKCODE',
+'invalid input for organization' => 'Niepoprawna wartość w polu organizacja',
+'invalid input for remote host/ip' => 'Niepoprawna wartość w polu zdalny host/ip.',
+'invalid input for state or province' => 'Niepoprawna wartość w polu stan lub prowincja.',
+'invalid ip' => 'Niepoprawny adres IP',
+'invalid keep time' => 'Czas podtrzymywania musi być prawidłową liczbą',
+'invalid key' => 'Niepoprawny klucz.',
+'invalid loaded file' => 'Wczytano niepoprawny plik',
+'invalid local-remote id' => 'lokalny i zdalny id nie mogą być takie same i muszą rozpoczynać się od znaku "@" sign. Są to tak zwane leftid i rightid w terminologii strongswan.',
+'invalid logserver address' => 'Nieporawny adres serwera syslogd server',
+'invalid mac address' => 'Niepoprawny adres MAC',
+'invalid max lease time' => 'Niepoprawny maksymalny czas dzierżawy.',
+'invalid maximum incoming size' => 'Niepoprawny maksymalny rozmiar przychodzący (incoming size).',
+'invalid maximum object size' => 'Niepoprawny maksymalny rozmiar obiektu.',
+'invalid maximum outgoing size' => 'Niepoprawny maksymalny rozmiar wychodzący (outgoing size).',
+'invalid md5sum' => 'Niepoprawna suma MD5.',
+'invalid minimum object size' => 'Niepoprawny minimalny rozmiar obiektu.',
+'invalid mtu input' => 'Niepoprawne MTU',
+'invalid netmask' => 'Niepoprawna maska sieci',
+'invalid port' => 'Niepoprawny port. Musi to być prawidłowy numer portu..',
+'invalid port list' => 'Lista portów powinna wyglądać następująco: port[,port]... gdzie port jest liczbą lub wpisem z /etc/services',
+'invalid primary dns' => 'Niepoprawny podstawowy DNS.',
+'invalid primary ntp' => 'Niepoprawny adres podstawowego serwera NTP',
+'invalid secondary dns' => 'Niepoprawny zapasowy DNS.',
+'invalid secondary ntp' => 'Niepoprawny adres drugiego serwera NTP',
+'invalid start address' => 'Niepoprawny adres początkowy.',
+'invalid time entered' => 'Wprowadzono niepoprawny czas.',
+'invalid time period' => 'Nieprawidłowy okres czasu',
+'invalid uplink speed' => 'Nieprawidłowa szybkość wysyłania.',
+'invalid upstream proxy username or password setting' => 'Nieprawidłowy użytkownik lub hasło dla upstream proxy.',
+'invalid users' => 'lista użytkowników z zabronionym dostępem',
+'invalid vpi vpci' => 'Nieprawidłowe ustawienia VPI/VPCI',
+'invalid wins address' => 'Nieprawidłowy adres serwera WINS.',
+'invert' => 'Odwróć',
+'ip address' => 'Adres IP',
+'ip address in use' => 'Adres IP jest już w użyciu',
+'ip address outside subnets' => 'Adres IP poza podsieciami',
+'ip alias added' => 'Dodano zewnętrzny alias IP',
+'ip alias changed' => 'Zmieniono zewnętrzny alias IP',
+'ip alias removed' => 'Usunięto zewnętrzny alias IP',
+'ip info' => 'Informacje IP',
+'ipfire has now rebooted' => 'Serwer IPFire uruchamia się ponownie.',
+'ipfire has now shutdown' => 'Wyłączanie serwera IPFire.',
+'ipfire side' => 'IPFire side:',
+'ipfire side is invalid' => 'IPFire side is invalid.',
+'ipfires hostname' => 'Nazwa hosta IPFire\'s',
+'ipinfo' => 'Info IP',
+'iptable rules' => 'Reguły IPTable',
+'iptmangles' => 'IPTable Mangles',
+'iptnats' => 'IPTable Network Address Translation',
+'ipts' => 'IPTables',
+'isdn' => 'ISDN',
+'isdn settings' => 'Dodatkowe ustawienia ISDN:',
+'isdn1' => 'Pojedynczy ISDN',
+'isdn2' => 'Podwójny ISDN',
+'january' => 'Styczeń',
+'javascript menu error1' => 'Jeżeli rozwijane menu nie działają poprawnie wyłącz javascript na',
+'javascript menu error2' => 'stronie.',
+'july' => 'Lipiec',
+'june' => 'Czerwiec',
+'kernel' => 'Kernel',
+'kernel logging server' => 'Kernel Logging Server',
+'kernel version' => 'Wersja Kernela:',
+'key stuff' => '2. Klucze i certyfikaty',
+'keyreset' => 'Resetuj klucze',
+'keys' => 'klucze',
+'lan' => 'LAN',
+'lang' => 'en',
+'languagepurpose' => 'Wybierz język interfejsu IPFire którego chcesz używać:',
+'last activity' => 'Ostatnia aktywność',
+'lateprompting' => 'Lateprompting',
+'lease expires' => 'Dzierżawa upływa',
+'legend' => 'Legenda',
+'length' => 'Długość',
+'line' => 'Linia',
+'linkq' => 'Jakosc polaczenia',
+'load printer' => 'Załaduj drukarkę',
+'loaded modules' => 'Załadowane moduły:',
+'local hard disk' => 'Dysk twardy',
+'local master' => 'Local Master',
+'local ntp server specified but not enabled' => 'Wprowadzono lokoalny serwer NTP, jednak nie włączono go',
+'local subnet' => 'Podsieć lokalna:',
+'local subnet is invalid' => 'Niepoprawna podsieć lokalna.',
+'local vpn hostname/ip' => 'Lokalna nazwa VPN/IP',
+'localkey' => 'Klucz lokalny',
+'localkeyfile' => 'Plik klucza lokalnego',
+'log' => 'Log:',
+'log enabled' => 'Log Włączony',
+'log level' => 'Poziom logów',
+'log lines per page' => 'Linii na stronę',
+'log server address' => 'Serwer syslog:',
+'log settings' => 'Ustawienia logów',
+'log summaries' => 'Podsumowania logów',
+'log summary' => 'Podsumowanie logów',
+'log var messages' => 'Ustawienia dla /var/log/messages:',
+'log view' => 'Przegląd logów',
+'log viewer' => 'Przeglądarka logów',
+'log viewing options' => 'Opcje przeglądarki logów',
+'log-options' => 'Opcje pliku logów',
+'loged in at' => 'Logged in at',
+'logging' => 'Logowanie',
+'logging server' => 'Serwer logowania',
+'loginlogout' => 'Zalogowanie/wylogowanie',
+'logs' => 'logi',
+'lookup failed' => 'Reverse lookup failed',
+'loosedirectorychecking' => 'Loosedirectorychecking',
+'low' => 'Niski',
+'ls_dhcpd' => 'Serwer DHCP:',
+'ls_disk space' => 'Miejsce na dysku:',
+'ls_free/swan' => 'VPN:',
+'ls_httpd' => 'Serwer HTTP:',
+'ls_init' => 'Init:',
+'ls_kernel' => 'Kernel i zapora:',
+'ls_modprobe' => 'Ładowanie modułów:',
+'ls_pam_unix' => 'Logowania użytkowników lokalnych:',
+'ls_sshd' => 'Logowania użytkowników zdalnych:',
+'ls_syslogd' => 'Syslogd:',
+'mac address' => 'Adres MAC',
+'mac address deleted' => 'Poprawnie usunięto!',
+'mac address deleted txt' => 'Adres MAC został poprawnie usunięty, jednak zmiany zostaną zastosowane dopiero po <strong>ponownym uruchomieniu</strong>.',
+'mac address done' => 'Ustawienia adresu MAC są zapisywane.',
+'mac address error not 00' => 'Adres MAC musi rozpoczynać się od 00!',
+'mac address error not valid' => 'Nieprawidłowy adres MAC !',
+'mac address header' => 'Adres MAC na interfejsie red0',
+'mac address in use' => 'Adres MAC jest już w użyciu',
+'mac address menu' => 'Przypisz adres MAC',
+'mac address recon' => 'Próba ponownego łączenia!',
+'mac address saved' => 'Zapisano poprawnie!',
+'mac address saved txt' => 'Adres MAC został poprawnie zapisany, jednak zmiany zostaną zastosowane dopiero po <strong>ponownym uruchomieniu</strong>.',
+'mac address title' => 'Medium Access Control Address',
+'mac desc' => 'W tym miejscu masz możliwość ustawienia adresu MAC dla interfejsu red0. Adres należy wpisać w postaci szesnastkowej (0-9,a-f). Przykłady poprawnych wpisów <br /> 00-01-02-0e-b8-d6 lub 00:01:02:0e:b8:d6.',
+'mac new' => 'nowy adres MAC:',
+'mac1 new' => 'nowy adres MAC 1 (vdsl-inet):',
+'mac2 new' => 'nowy adres MAC 2 (vdsl-iptv):',
+'magic packet send to:' => 'Magic packet send to:',
+'mailmethod' => 'Mailmethod',
+'mailprogramm' => 'Mailprogram',
+'main page' => 'Strona główna',
+'manage ovpn' => '5. Zarządzanie tunelami:',
+'manage printers' => 'Zarządzanie drukarkami',
+'manage shares' => 'Zarządzanie udost. zasobami',
+'manual' => 'Manual',
+'manual control and status' => 'Ręczna kontrola i stan:',
+'manually' => 'Ręcznie',
+'map to guest' => 'Map to Guest',
+'march' => 'Marzec',
+'marked' => 'Zaznaczone',
+'max bandwith' => 'Maksymalne pasmo',
+'max incoming size' => 'Maks rozmiar przychodzący (KB):',
+'max lease time' => 'Maks czas dzierżawy (min):',
+'max outgoing size' => 'Maks rozmiar wychodzący (KB):',
+'max reliability' => 'Maksymalna niezawodność',
+'max renewal time' => 'Maks czas odnowy',
+'max retries not set' => 'Maks l. powtórzeń nie ustawiona.',
+'max size' => 'Maks rozmiar obiektu (KB):',
+'max throughput' => 'Maksymalna przepustowość',
+'maximal' => 'Maksymalny',
+'maximum retries' => 'Maksymalna l. powtórzeń:',
+'may' => 'Maj',
+'mbmon display' => 'Wyświetl',
+'mbmon fan' => 'Predkosc wentylatorow',
+'mbmon fan in' => 'Predkosc wentylatorow w',
+'mbmon graphs' => 'wykresy mbmon',
+'mbmon label' => 'Etykieta',
+'mbmon settings' => 'Ustawienia wykresow mbmon',
+'mbmon temp' => 'Temperatura',
+'mbmon temp in' => 'Temperatura w',
+'mbmon value' => 'Wartosc',
+'mbmon volt' => 'Napiecie',
+'meaning' => 'znaczenie',
+'media' => 'Nośniki',
+'media information' => 'Informacje o nośnikach',
+'medium' => 'Średni',
+'memory' => 'Pamiec',
+'memory information' => 'informacje o pamieci',
+'memory usage per' => 'Wykorzystanie pamieci na',
+'messages logging' => 'Ustawienia logowania dla /var/log/messages',
+'method' => 'Metoda:',
+'min costs' => 'Minimalne koszty',
+'min delay' => 'Minimalne opóźnienia',
+'min size' => 'Min rozmiar obiektu (KB):',
+'minimal' => 'Minimalne/y',
+'minutes' => 'Minuty',
+'misc-options' => 'Opcje dodatkowe',
+'missing dat' => 'Nie odnaleziono zaszyfrowanego archiwum',
+'missing gz' => 'Nie odnaleziono odszyfrowanego archiwum',
+'mode' => 'Tryb',
+'modem' => 'Modem',
+'modem configuration' => 'Konfiguracja modemu',
+'modem on com1' => 'Modem na COM1',
+'modem on com2' => 'Modem na COM2',
+'modem on com3' => 'Modem na COM3',
+'modem on com4' => 'Modem na COM4',
+'modem on com5' => 'Modem na COM5',
+'modem settings have errors' => 'Ustawienia modemu posiadają błędu',
+'modem speaker on' => 'Modem speaker on:',
+'modify' => 'Modyfikuj',
+'modulation' => 'Modulacja',
+'monday' => 'Poniedziałek',
+'month' => 'Miesiac',
+'monthly firewallhits' => 'miesięczne zdarzenia zapory',
+'monthly start day bad' => 'Początek okresu miesięcznego jest niepoprawny',
+'monthly traffic bad' => 'Monthly volume is not correct',
+'monthly volume' => 'Monthly volume',
+'monthly volume start day' => 'Pierwszy dzień okresu miesięcznego',
+'monthly volume start day short' => 'Pierwszy dzień',
+'months' => 'miesiące',
+'more' => 'więcej',
+'mount' => 'Montuj',
+'mounted on' => 'Zamontowany w',
+'mpfire' => 'Odtwarzać mediów dla IPFire',
+'mpfire controls' => 'Zarządzanie MPFire',
+'mpfire playlist' => 'Playlist\'a MPFire ',
+'mpfire scanning' => 'Skanuj w poszukiwaniu nowych plików',
+'mpfire search' => 'MPFire Szukaj',
+'mpfire songs' => 'MPFire lista utworów',
+'mpfire webradio' => 'MPFire Webradio',
+'mtu QoS' => 'Ta opcja nie zmienia globalnego MTU, a jedynie MTU dla QoS.',
+'my new share' => 'Mój nowy zasób',
+'name' => 'Nazwa',
+'name is invalid' => 'Nazwa jest nieprawidłowa',
+'name must only contain characters' => 'Nazwa może zawierać jedynie litery.',
+'name too long' => 'Pełna nazwa użytkownika lub nazwa hosta są zbyt długie',
+'nat-traversal' => 'Nat Traversal:',
+'needreboot' => 'Aktualizacja wymaga ponownego uruchomienia',
+'net' => 'Sieć',
+'net address' => 'adres sieci',
+'net config' => 'Konfiguracja sieci',
+'net config type' => 'rodzaj konfiguracji sieci',
+'net config type help' => 'GREEN - sieć lokalna, RED - internet, BLUE - WLAN, ORANGE - DMZ.',
+'net to net vpn' => 'Net-to-Net Virtual Private Network',
+'net traffic newversion' => 'Dostępna nowa wersja Net-Traffic:',
+'net-traffic configuration' => 'Konfiguracja Net-Traffic',
+'netbios name' => 'Nazwa Netbios',
+'netmask' => 'Maska sieci',
+'network' => 'Sieć',
+'network added' => 'Custom network added',
+'network configuration' => 'Konfiguracja sieci',
+'network internal' => 'Sieć (wewnętrzna)',
+'network options' => 'Opcje sieci',
+'network other' => 'Sieć (inne)',
+'network red' => 'Sieć (zewnętrzna)',
+'network removed' => 'Custom network removed',
+'network status information' => 'Informacje o stanie sieci',
+'network time' => 'Używaj sieciowego serwera czasu:',
+'network time from' => 'Uzyskaj czas z sieciowego serwera czasu',
+'network traffic graphs' => 'Wykresy ruchu sieciowego',
+'network traffic graphs external' => 'Wykresy Net-Traffic (sieć zewn.)',
+'network traffic graphs internal' => 'Net-Traffic graphs (sieć wewn.)',
+'network traffic graphs others' => 'Sieć (inne)',
+'network updated' => 'Custom Network updated',
+'networks settings' => 'Zapora - ustawienia sieci',
+'new optionsfw later' => 'Twoja zmiany będą aktywne po ponownym uruchomieniu',
+'new optionsfw must boot' => 'Musisz ponownie uruchomić serwer IPFire',
+'newer' => 'Nowsze',
+'next' => 'następny',
+'no' => 'Nie',
+'no alcatelusb firmware' => 'Brak firmware dla Alcatel USB. Proszę o jego wgranie.',
+'no cfg upload' => 'Brak danych do wgrania',
+'no dhcp lease' => 'Brak przydzielonych dzierżaw DHCP',
+'no eciadsl synch.bin file' => 'Brak pliku ECI ADSL synch.bin. Proszę o jego wgranie.',
+'no filter pass' => 'Proszę wprowadzić standardową klasę dla pakietów niefiltrowanych.',
+'no fritzdsl driver' => 'Brak sterownika Fritz!DSL.  Proszę o jego wgranie.',
+'no information available' => 'Brak dostępnych informacji.',
+'no log selected' => 'Nie wybrano logu',
+'no modem selected' => 'Nie wybrano modemu',
+'no set selected' => 'Nie wybrano ustawienia',
+'no time limit' => 'nieograniczony czas',
+'none found' => 'nic nie znaleziono',
+'nonetworkname' => 'Nie podano nazwy sieci',
+'noservicename' => 'Nie podano nazwy usługi',
+'not a valid ca certificate' => 'Brak poprawnego certyfikatu CA.',
+'not enough disk space' => 'Brak miejsca na dysku',
+'not present' => '<b>Nie</b> występuje',
+'not running' => 'nie uruchomiony',
+'not set' => 'nie ustawiono',
+'notes' => 'Uwagi',
+'november' => 'Listopad',
+'ntp common settings' => 'Ustawienia podstawowe',
+'ntp configuration' => 'Konfiguracja NTP',
+'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.',
+'ntp server' => 'Serwer NTP',
+'ntp sync' => 'Synchronizacja',
+'ntp syncro disabled' => 'Synchronizacja NTP wyłączona',
+'ntp syncro enabled' => 'Synchronizacja NTP włączona',
+'ntpd restarted' => 'ntpd zrestartowany',
+'number' => 'Numer:',
+'o-no' => 'Nieaktywny',
+'o-yes' => 'Aktywny',
+'october' => 'Październik',
+'off' => 'wył',
+'ok' => 'OK',
+'older' => 'Starsze',
+'on' => 'wł',
+'online help en' => 'Pomoc online (po angielsku)',
+'only digits allowed in holdoff field' => 'Only digits allowed in holdoff field',
+'only digits allowed in max retries field' => 'W polu maksymalna liczba powtórzeń mogą być tylko cyfry.',
+'only digits allowed in the idle timeout' => 'W polu czas bezczynności mogą być tylko cyfry.',
+'only red' => 'Tylko RED',
+'open to all' => 'Nadpisz dostęp zewnętrzny do wszystkich',
+'openssl produced an error' => 'OpenSSL spowodował błąd',
+'openvpn client' => 'Klient OpenVPN',
+'openvpn log' => 'Log OpenVPN',
+'openvpn server' => 'Serwer OpenVPN',
+'optional at cmd' => 'dodatkowe polecenia AT',
+'optional data' => '3. Dodatkowe ustawienia:',
+'options' => 'Opcje',
+'options fw' => 'Opcje zapory',
+'optionsfw portlist hint' => 'Lista portów powinna być oddzielana przecinkami (np. 137,138). Można zdefiniować maksymalnie 15 portów dla protokołu.',
+'optionsfw warning' => 'Zmiana tych opcji oznacza ponowne uruchomienie zapory',
+'or' => 'lub',
+'orange' => 'ORANGE',
+'organization cant be empty' => 'Pole organizacji nie może być puste',
+'organization name' => 'Nazwa organizacji',
+'organization too long' => 'Nazwa organizacji jest zbyt długa; nie powinna być dłuższa niż 60 znaków.',
+'original' => 'Original',
+'os level' => 'OS Level',
+'other countries' => 'Pozostałe kraje',
+'other login script' => 'Inny skrypt logowania',
+'otherip' => 'inne IP',
+'otherport' => 'inny port',
+'out' => 'Wyj',
+'outgoing' => 'wyjściowy',
+'outgoing firewall' => 'Zapora wyjściowa',
+'outgoing firewall add ip group' => 'Dodaj grupę adresów IP',
+'outgoing firewall add mac group' => 'Dodaj grupę adresów MAC',
+'outgoing firewall edit ip group' => 'Edytuj grupę adresów IP',
+'outgoing firewall edit mac group' => 'Edytuj grupę adresów MAC',
+'outgoing firewall group error' => 'Grupa o takiej nazwie już istnieje.',
+'outgoing firewall groups' => 'Grupy zapory',
+'outgoing firewall ip groups' => 'Grupy adresów IP zapory wyjściowej',
+'outgoing firewall mac groups' => 'Grupy adresów MAC zapory wyjściowej',
+'outgoing firewall mode0' => 'W tym trybie wszyscy klienci mają dostęp do internetu bez żadnych restrykcji.',
+'outgoing firewall mode1' => 'W tym trybie tylko połączenia określone w regułach są dozwolone.',
+'outgoing firewall mode2' => 'W tym trybie wszystkie połączenia są dozwolone z wyjątkiem tych określonych w regułach.',
+'outgoing firewall outgoing firewall reserved groupname' => 'Proszę użyć innej nazwy grupy-ta jest zarezerwowana.',
+'outgoing firewall p2p allow' => 'protokoły p2p są dozwolone',
+'outgoing firewall p2p deny' => 'protokoły p2p są zabronione',
+'outgoing firewall p2p description 1' => 'Przycisk',
+'outgoing firewall p2p description 2' => 'oznacza, że protokoły p2p są dozwolone lub',
+'outgoing firewall p2p description 3' => ' że protokoły p2p są zabronione.',
+'outgoing firewall reset' => 'Resetuj wszystko',
+'outgoing firewall view group' => 'Zobacz grupę',
+'outgoing firewall warning' => 'Nie wybranie ip lub mac powoduje ich ignorowanie',
+'outgoing traffic in bytes per second' => 'Ruch wychodzący',
+'override mtu' => 'Nadpisz domyślne MTU',
+'ovpn' => 'OpenVPN',
+'ovpn con stat' => 'Statystyki połączeń OpenVPN',
+'ovpn config' => 'OVPN-Konfig',
+'ovpn device' => 'Urządzenie OpenVPN:',
+'ovpn dl' => 'Pobierz konfig OVPN',
+'ovpn log' => 'Log OVPN',
+'ovpn on blue' => 'OpenVPN na int. BLUE',
+'ovpn on orange' => 'OpenVPN na int. ORANGE',
+'ovpn on red' => 'OpenVPN na int. RED',
+'ovpn server status' => 'Stan serwera OpenVPN:',
+'ovpn subnet' => 'Podsieć OpenVPN (np. 10.0.10.0/255.255.255.0)',
+'ovpn subnet is invalid' => 'Podsieć OpenVPN jest niepoprawna.',
+'ovpn subnet overlap' => 'Podsieć OpenVPN zachodzi na : ',
+'ovpn_fastio' => 'Fast-IO',
+'ovpn_fragment' => 'Rozmiar fragmentu',
+'ovpn_mssfix' => 'MSSFIX Size',
+'ovpn_mtudisc' => 'Odszukiwanie MTU',
+'ovpn_processprio' => 'Priorytet procesu',
+'ovpn_processprioD' => 'Deeply',
+'ovpn_processprioED' => 'Extremely deeply',
+'ovpn_processprioEH' => 'Ekstremalnie wysoki',
+'ovpn_processprioEN' => 'Wyższy niż normalnie',
+'ovpn_processprioH' => 'Wysoki',
+'ovpn_processprioLN' => 'More deeply than normal',
+'ovpn_processprioN' => 'Normalny',
+'ovpn_processprioVD' => 'Very deeply',
+'ovpn_processprioVH' => 'Bardzo wysoki',
+'ovpnstatus log' => 'OVPN-Status-Log',
+'ovpnsys log' => 'OVPN-System-Log',
+'package failed to install' => 'Błąd instalacji pakietu.',
+'pagerefresh' => 'Strona jest odświeżana, proszę czekać.',
+'pakfire accept all' => 'Czy chcesz zainstalować wszystkie pakiety?',
+'pakfire ago' => 'temu.',
+'pakfire available addons' => 'Dostępne dodatki:',
+'pakfire configuration' => 'Konfiguracja Pakfire',
+'pakfire core update auto' => 'Instaluj aktualizacje jądra automatycznie:',
+'pakfire core update level' => 'Aktualizacja jądra',
+'pakfire health check' => 'Sprawdź czy mirror jest dostępny (ping):',
+'pakfire install description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, <br /> a następnie kliknąć plus aby zainstalować.',
+'pakfire install package' => 'Zamierzasz zainstalować następujące pakiety: ',
+'pakfire installed addons' => 'Zainstalowane dodatki:',
+'pakfire last core list update' => 'Sprawdzenie aktualizacja jądra:',
+'pakfire last package update' => 'Ostatnia aktualizacja listy pakietów:',
+'pakfire last serverlist update' => 'Ostatnia aktualizacja listy serwerów:',
+'pakfire last update' => 'Ostatnia aktualizacja:',
+'pakfire possible dependency' => ' Pewne pakiety mogą wymagać zależności. Oto lista pakietów które muszę zostać zainstalowane.',
+'pakfire register' => 'Register at pakfire-server:',
+'pakfire system state' => 'Status systemu',
+'pakfire uninstall description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, <br /> a następnie kliknąć minus aby odinstalować.',
+'pakfire uninstall package' => 'Zamierzasz odinstalować następujące pakiety: ',
+'pakfire update daily' => 'Szukaj aktualizacje codziennie:',
+'pakfire updates' => 'Dostępne aktualizacje:',
+'pakfire working' => 'Pakfire pracuje ... Proszę poczekać na zakończenie wszystkich operacji.',
+'pap or chap' => 'PAP lub CHAP',
+'parentclass' => 'Klasa nadrzędna',
+'parentclass add' => 'Dodaj klasę nadrzędną',
+'password' => 'Hasło:',
+'password contains illegal characters' => 'Hasło zawiera niepoprawne znaki.',
+'password crypting key' => 'Hasło chroniące klucz',
+'password not set' => 'Nie ustawiono hasła.',
+'password too short' => 'Hasło jest za krótkie.',
+'passwords do not match' => 'Hasła nie pasują do siebie.',
+'passwords must be at least 6 characters in length' => 'Hasła muszą mieć długość minumum 6 znaków',
+'path to directory' => 'ścieżka do zasobu',
+'pc' => 'Stacja robocza',
+'pc add' => 'Dodaj stację roboczą',
+'pdc options' => 'Opcje PDC',
+'percentage' => 'Procentowo',
+'persistent' => 'Persistent',
+'pfs yes no' => 'Perfect Forward Secrecy (PFS)',
+'phase1 group' => 'Grupa fazy 1',
+'phonebook entry' => 'Wpis ksiązki tel:',
+'ping disabled' => 'Wyłącz odpowiadanie na ping',
+'pkcs12 file password' => 'Hasło pliku PKCS12',
+'play' => 'Graj',
+'polfile' => 'Polfile',
+'policy' => 'Polityka',
+'port' => 'Port',
+'port forwarding configuration' => 'Konfiguracja przekierowania portów',
+'ports' => 'Porty',
+'portscans' => 'skanowania portów',
+'pots' => 'Klasyczna linia analogowa',
+'ppp setup' => 'Konfiguracja PPP',
+'pppoe' => 'PPPoE',
+'pppoe settings' => 'Dodatkowe ustawienia PPPoE:',
+'pptp settings' => 'Dodatkowe ustawienia PPTP:',
+'pre-shared key is too short' => 'Klucz współdzielony jest za krótki.',
+'prefered master' => 'Preferowany Master',
+'present' => 'Present',
+'prev' => 'poprzedni',
+'primary dns' => 'Podstawowy DNS:',
+'primary ntp server' => 'Podstawowy serwer NTP',
+'primary wins server address' => 'Adres podstawowego serwera WINS',
+'printcap name' => 'Printercap name',
+'printer' => 'Drukarka',
+'printername' => 'Nazwa drukarki',
+'printing' => 'Drukowanie',
+'printing options' => 'opcje drukowania',
+'priority' => 'Priorytet',
+'processes' => 'Procesy',
+'profile' => 'Profil',
+'profile deleted' => 'Usunięto profil: ',
+'profile has errors' => 'Profil posiada błędy',
+'profile made current' => 'Ustawiono aktualny profil: ',
+'profile name' => 'Nazwa profilu:',
+'profile name not given' => 'Nie wprowadzono nazwy profilu.',
+'profile saved' => 'Zapisano profil: ',
+'profiles' => 'Profile:',
+'proto' => 'Proto',
+'protocol' => 'Protokół:',
+'proxy' => 'Proxy',
+'proxy access graphs' => 'Wykresy dostępu do Proxy',
+'proxy admin password' => 'Hasło administratora Cache',
+'proxy cachemgr' => 'Aktywuj cachemanager',
+'proxy errmsg filedescriptors' => 'Niepoprawna wartość w polu filedescriptors',
+'proxy filedescriptors' => 'Ilość fildescriptors',
+'proxy log viewer' => 'Przeglądanie logów Proxy',
+'proxy logs' => 'Logi Proxy',
+'proxy no proxy extend' => 'lub wprowadź listę celów, które będą pomijane przez proxy',
+'proxy no proxy local' => 'Zabraniaj na lokalny proxy cache dla sieci BLUE/GREEN',
+'proxy port' => 'Port Proxy',
+'proxy reconfigure' => 'Zapisz i zładuj',
+'psk' => 'PSK',
+'pulse' => 'Pulse',
+'pulse dial' => 'Pulse dial:',
+'qos add subclass' => 'Dodaj podklasę',
+'qos graphs' => 'Wykresy Qos',
+'qos warning' => 'Reguła <strong>musi</strong> być zapisana, w przeciwnym razie będzie odrzucona!',
+'quick control' => 'Quick Control',
+'quick playlist' => 'Szybka lista',
+'ram' => 'RAM',
+'read bytes' => 'Odczyt bajtow',
+'read list' => 'lista hostów tylko do odczytu',
+'real address' => 'Prawdziwy adres',
+'reboot' => 'Reboot',
+'reboot ask' => 'Restart?',
+'reboot question' => 'Dodatkowe zapytanie dla restartu i wyłączenia',
+'reboot schedule' => 'Planowanie ponownego uruchamiania IPFire',
+'reboot sure' => 'Czy na pewno uruchomić ponownie system?',
+'rebooting' => 'Ponowne uruchamianie',
+'rebooting ipfire' => 'Ponowne uruchamianie IPFire',
+'reconnect' => 'Połącz ponownie',
+'reconnection' => 'Ponowne łączenie',
+'red' => 'Internet',
+'references' => 'Referencje',
+'refresh' => 'Odśwież',
+'refresh index page while connected' => 'Odśwież stronę index.cgi po połączeniu',
+'refresh update list' => 'Odśwież listę aktualizacji',
+'registered user rules' => 'Reguły Sourcefire VRT dla zarejestrowanych użytkowników',
+'released' => 'Opublikowany',
+'reload' => 'wczytaj',
+'remark' => 'Komentarz',
+'remark title' => 'Komentarz:',
+'remote access' => 'Zdalny dostęp',
+'remote announce' => 'Remote Announce',
+'remote browse sync' => 'Remote Browse Sync',
+'remote host/ip' => 'Zdalny host/IP',
+'remote logging' => 'Zdalne logowanie',
+'remote subnet' => 'Zdalna podsieć:',
+'remote subnet is invalid' => 'Zdalne podsieć jest nieprawidłowa.',
+'removable device advice' => 'Podłącz urządzenie, odśwież, a następnie wciśnij montuj. Odmontuj zanim usuniesz urządzenie.',
+'remove' => 'Usuń',
+'remove ca certificate' => 'Usuń certyfikat CA',
+'remove x509' => 'Usuń x509',
+'repeat' => 'Powtórz',
+'reportfile' => 'Plik raportu',
+'reportlevel' => 'Poziom szczegółów',
+'request' => 'Żądanie',
+'requested data' => '1. Ustawienia połączenia:',
+'reserved dst port' => 'Port docelowy jest zarezerwowany przez IPFire. Używaj tylko:',
+'reserved src port' => 'Port źródłowy jest zarezerwowany przez IPFire. Używaj tylko:',
+'reset' => 'Reset',
+'reset shares' => 'Resetuj zasób',
+'resetglobals' => 'Resetuj globalne ustawienia ',
+'resetpolicy' => 'Resetuj politykę do domyślnej',
+'resetshares' => 'Resetoważ zasoby?',
+'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Reset ustawień VPN spowoduje usunięcie certyfikatu root CA, certyfikatu hosta oraz wszystkich połączeń opartych na certyfikatach',
+'restart' => 'Restart',
+'restart ovpn server' => 'Restart serwera OpenVPN',
+'restore' => 'Przywróć',
+'restore defaults' => 'Przywróć domyślne',
+'restore hardware settings' => 'Przywróć ustawienia sprzętu',
+'restore settings' => 'Reset ustawień',
+'reverse sort' => 'Sortuj w odwrotnym porządku chronologicznym',
+'root' => 'Root',
+'root certificate' => 'Certyfikat Root',
+'root path' => 'Ścieżka Root',
+'root user password' => 'Hasło Root',
+'route subnet is invalid' => 'Dodatkowa wypychana ścieżka sieci jest niepoprawna',
+'router ip' => 'Adres IP routera:',
+'routing table entries' => 'Wpisy tablicy routingu:',
+'rsvd dst port overlap' => 'Zakres portów docelowych zachodzi na zarezerwowany dla IPFire port:',
+'rsvd src port overlap' => 'Zakres portów źródłowych zachodzi na zarezerwowany dla IPFire port:',
+'rules already up to date' => 'Reguły są aktualne',
+'running' => 'URUCHOMIONE',
+'safe removal of umounted device' => 'Możesz bezpiecznie usunąć odmontowane urządzenie',
+'samba' => 'Samba',
+'samba status' => 'Status Samby',
+'saturday' => 'Sobota',
+'save' => 'Zapisz',
+'save config' => 'zapisz ustawienia',
+'save error' => 'Nie można zapisać konfiguracji do pliku archiwum',
+'save settings' => 'Zapisz ustawienia',
+'save-adv-options' => 'Zapisz zaawansowane ustawienia',
+'script name' => 'Nazwa skryptu:',
+'secondary dns' => 'Zapasowy DNS:',
+'secondary ntp server' => 'Zapasowy serwer NTP',
+'secondary wins server address' => 'Adres zapasowego serwera WINS',
+'seconds' => 'Sek',
+'section' => 'Sekcja',
+'secure shell server' => 'Secure Shell Server',
+'security' => 'Bezpieczeństwo',
+'security options' => 'Opcje zabezpieczeń',
+'select' => 'Wybierz',
+'select dest net' => 'Wybierz sieć docelową.',
+'select media' => 'Wybierz nośnik <br />(wspierany jest tylko FAT dla nośników wymiennych)',
+'select source net' => 'Wybierz sieć źródłową. Jeżeli nie posiadasz skonfigurowanych sieci ORAGNE lub BLUE DMZ Pinholes nie są wymagane.',
+'selecttraffic' => 'Select utilization-overview:',
+'send cr' => 'ISP requires Carriage Return:',
+'send email notification' => 'Włącz informowania przez e-mail',
+'send test mail' => 'Wyślij testowego maila',
+'september' => 'Wrzesień',
+'serial' => 'Serial',
+'server reserved' => 'Nazwa serwera połączenia jest zastrzeżona i niedozwolona',
+'server string' => 'Server String',
+'service' => 'Usługa',
+'service added' => 'Dodano niestandardową usługę sieciową',
+'service name' => 'Nazwa usługi:',
+'service removed' => 'Usunięto niestandardową usługę sieciową',
+'service updated' => 'Zmieniono niestandardową usługę sieciową',
+'servicename' => 'Nazwa usługi',
+'services' => 'Usługi',
+'services settings' => 'Zapora - ustawienia usług',
+'set' => 'ustaw',
+'set time now' => 'Ustaw czas teraz',
+'set time now help' => 'Aby wykonać synchronizację w dowolnym czasie, naciśnij przycisk<i>Ustaw czas teraz</i>. Należy zwrócić uwagę, że proces synchronizacji może zająć kilka minut.',
+'settings' => 'Ustawienia',
+'shaping add options' => 'Dodaj usługę',
+'shaping list options' => 'Kształtowanie ruchu - usługi',
+'shared' => 'współdzielona',
+'sharename' => 'Nazwa zasobu',
+'shares' => 'Zasoby',
+'show ajax speedmeter in footer' => 'Wyświetlaj pomiar szybkości w Ajax\'ie',
+'show areas' => 'show areas',
+'show ca certificate' => 'Pokaż certyfikat CA',
+'show certificate' => 'Pokaż certyfikat',
+'show crl' => 'Pokaż listę odwołań certyfikatów',
+'show host certificate' => 'Pokaż certyfikat hosta',
+'show last x lines' => 'Pokaż ostatnie x linii',
+'show lines' => 'Pokaż linie',
+'show root certificate' => 'Pokaż certyfikat root',
+'show share options' => 'Pokaż opcje zasobu',
+'shuffle' => 'Losowo',
+'shutdown' => 'Wyłącz',
+'shutdown ask' => 'Wyłączyć?',
+'shutdown control' => 'Kontrola wyłączenia',
+'shutdown sure' => 'Czy jesteś pewien, że chcesz wyłączyć?',
+'shutdown2' => 'Wyłącz:',
+'shutting down' => 'Wyłączanie',
+'shutting down ipfire' => 'Wyłączanie IPFire',
+'since' => 'od',
+'sitekey' => 'Sitekey',
+'sitekeyfile' => 'Sitekeyfile',
+'size' => 'Rozmiar',
+'smart information' => 'Informacje S.M.A.R.T.',
+'smartwarn1' => 'Urządzenie:',
+'smartwarn2' => 'raportuje błąd S.M.A.R.T.',
+'smbreload' => 'Reload samba',
+'smbrestart' => 'Restart samby',
+'smbstart' => 'Start samba',
+'smbstop' => 'Stop samba',
+'smtphost' => 'Host SMTP',
+'smtpport' => 'Port SMTP',
+'snort hits' => 'Całkowita liczba aktuwnych reguł dla',
+'snort working' => 'Snort pracuje.... Proszę poczekać na zakończenie wszystkich operacji.',
+'socket options' => 'Socket options',
+'sort ascending' => 'Sortuj rosnąco',
+'sort descending' => 'Sortuj malejąco',
+'sound' => 'Dźwięk',
+'source' => 'Źródło',
+'source ip' => 'Źródłowe IP',
+'source ip and port' => 'Źródłowe IP: Port',
+'source ip bad' => 'Niepoprawny adres IP lub adres sieci.',
+'source ip in use' => 'Źródłowe IP w użyciu:',
+'source ip or net' => 'Źródłowe IP lub sieć',
+'source net' => 'Sieć źródłowa',
+'source network' => 'Źródłowe IP lub sieć (puste oznacza wszystkie):',
+'source port' => 'Port źródłowy',
+'source port in use' => 'Port źródłowy w użyciu:',
+'source port numbers' => 'Port źródłowy musi być prawidłowym numerem portu lub zakresem portów.',
+'source port overlaps' => 'Port źródłowy zachodzi na istniejący zakres portów.',
+'speaker off' => 'Głośnik wył:',
+'speaker on' => 'Głośnik wł:',
+'squid extension methods' => 'Twoja lista <tt>extension_methods</tt>',
+'squid extension methods invalid' => 'Twoja lista \'extension_methods\' może zawierać wyrazy (litery i cyfry) pisane dużymi literami i oddzielone spacjami. ',
+'squid fix cache' => 'Napraw cache',
+'src port' => 'Port źr.',
+'srcprt range overlaps' => 'Zakres portów źródłowych zachodzi na istniejącą numer portu.',
+'srcprt within existing' => 'Port źródłowy zawiera się w aktualnie zdefiniowanym zakresie portów.',
+'ssdmz pinholes' => 'DMZ Pinholes',
+'ssh access' => 'Dostęp SSH',
+'ssh access tip' => 'SSH nie wykorzystuje domyślnego dla IPFire portu 222!',
+'ssh fingerprint' => 'Odcisk palca',
+'ssh host keys' => 'Klucze hosta SSH',
+'ssh is disabled' => 'SSH jest wyłączony.  Zatrzymywanie.',
+'ssh is enabled' => 'SSH jest włączony.  Ponowne uruchamianie.',
+'ssh key' => 'Klucz',
+'ssh key size' => 'Długość (bitów)',
+'ssh keys' => 'Zezwalaj na autentykację kluczem publicznym',
+'ssh no auth' => 'Nie dopuszczono żadnej metody autentykacji. Uniemożliwi to zalogowanie do systemu',
+'ssh passwords' => 'Zezwalaj na autentykację hasłem',
+'ssh port' => 'Ustaw port SSH na 22 (domyślny dla IPFire to 222)',
+'ssh portfw' => 'Zezwalaj na przekierowania TCP',
+'ssh tempstart15' => 'Zatrzymaj serwer SSH za 15 minut',
+'ssh tempstart30' => 'Zatrzymaj serwer SSH za 30 minut',
+'ssh1 disabled' => 'SSHv1 jest wyłączony, od klientów wymagana będzie wersja 2.',
+'ssh1 enabled' => 'SSHv1 jest włączona, starsze programy klienckie będą wspierane.',
+'ssh1 support' => 'Wspieraj wersję pierwszą protokołu SSH (wymagane tylko dla starych klientów)',
+'ssnetwork status' => 'Stan sieci',
+'sspasswords' => 'Hasła',
+'ssport forwarding' => 'Przekierowanie portów',
+'ssproxy graphs' => 'Wykresy Proxy',
+'sssystem status' => 'Stan systemu',
+'sstraffic' => 'Net-Traffic',
+'sstraffic graphs' => 'Wykresy ruchu',
+'standard login script' => 'Standardowy skrypt logowania',
+'start' => 'Start',
+'start address' => 'Adres początku:',
+'start ovpn server' => 'Uruchom serwer OpenVPN',
+'state or province' => 'Stan lub prowincja',
+'static ip' => 'Statyczne IP',
+'status' => 'Status',
+'status information' => 'Status information',
+'status ovpn' => '4. OpenVPN Status / Konfiguracja:',
+'std classes' => 'Klasy standardowe',
+'stop' => 'Stop',
+'stop ovpn server' => 'Zatrzymaj serwer OpenVPN',
+'stopped' => 'ZATRZYMANE',
+'subject' => 'Temat',
+'subject test' => 'E-mail testowy',
+'subject warn' => 'Ostrzeżenie - osiągnięto poziom ostrzeżenia',
+'subnet' => 'Podsieć',
+'subnet is invalid' => 'Maska sieci jest niepoprawna',
+'subscripted user rules' => 'Reguły Sourcefire VRT z subskrypcją',
+'successfully refreshed updates list' => 'Pomyślnie odświeżono listę aktualizacji.',
+'summaries kept' => 'Przechowuj podsumowania przez',
+'sunday' => 'Niedziela',
+'swap' => 'Swap',
+'swap usage per' => 'Wykorzystanie Swap na',
+'system' => 'System',
+'system graphs' => 'Wykresy Systemu',
+'system information' => 'Informacje o systemie',
+'system log viewer' => 'Przegląd logów systemu',
+'system logs' => 'Logi systemu',
+'system status information' => 'Informacje o stanie systemu',
+'telephone not set' => 'Telephone not set.',
+'template' => 'Schemat',
+'template warning' => 'Masz 2 możliwości skonfigurowania QoS. Pierwsza to naciśnięcie przycisku zapisz i skonfigurowanie klas i reguł samodzielnie. Druga to wciśnięcie przycisku schemat aby utworzyć klasy i reguły ze schematu.',
+'test' => 'test',
+'test email could not be sent' => 'Nie można wysłać maila testowego',
+'test email was sent' => 'Mail testowy został wysłany poprawnie',
+'the following update was successfully installed' => 'Następująca aktualizacja została prawidłowo zainstalowana',
+'the statistics were last updated at' => 'Ostatnia aktualizacja statystyk: ',
+'theme' => 'Schemat',
+'there are updates' => 'Dostępne są nowe aktualizacje dla twojego systemu. Proszę przejść do sekcji aktualizacje aby uzyskać więcej informacji.',
+'there are updates available' => 'Dostępne są nowe aktualizacje dla twojego systemu. Zalecane jest wykonanie aktualizacji tak szybko jak to możliwe',
+'there was no file upload' => 'Nie wgrano żadnego pliku.',
+'this feature has been sponsored by' => 'Ta funkcjonalność jest sponsorowana przez',
+'this field may be blank' => 'To pole może być puste.',
+'this is not a valid archive' => 'Nie odnaleziono poprawnego archiwum.',
+'this is not an authorised update' => 'To nie jest autoryzowana aktualizacja.',
+'this months volume' => 'Ilość w tym miesiącu',
+'this update is already installed' => 'Ta aktualizacja jest już zainstalowana.',
+'this weeks volume' => 'Ilość w tym tygodniu',
+'thursday' => 'Czwartek',
+'time' => 'Czas',
+'time date manually reset' => 'Ręczny reset czasu/daty.',
+'time server' => 'Serwer czasu',
+'timeout must be a number' => 'Czas oczekiwania musi być liczbą.',
+'title' => 'Tytuł',
+'to' => 'Do',
+'to email adr' => 'Adres e-mail do',
+'to install an update' => 'Aby zainstalować aktualizację wgraj plik tgz.gpg:',
+'to warn email bad' => 'Niepoprawny adres e-mail do',
+'toggle' => 'pause/resume',
+'toggle enable disable' => 'Włącz lub wyłącz',
+'tone' => 'Tonowo',
+'tone dial' => 'Dzwonienie tonowe:',
+'too long 80 char max' => ' jest zbyt długi - maksymalnie 80 znaków',
+'total connection time' => 'Całkowity czas połączenia',
+'total hits for log section' => 'Liczba zdarzeń dla sekcji logów',
+'traffic back' => 'Wróć',
+'traffic calc time' => 'Czas obliczeń',
+'traffic calc time bad' => 'Czas obliczeń jest nieprawidłowy',
+'traffic info messages' => 'Informacje',
+'traffic monitor' => 'Monitor ruchu',
+'traffic on' => 'Ruch na',
+'traffic shaping' => 'Kształtowanie ruchu',
+'traffic shaping settings' => 'Ustawienia kształtowania rucu',
+'traffic warn level bad' => 'Poziom ostrzeżeń jest niepoprawny',
+'trafficblue' => 'WLAN',
+'trafficdate' => 'Data',
+'trafficfrom' => 'Od',
+'trafficgreen' => 'Sieć wewnętrzna',
+'trafficin' => 'Wejście',
+'trafficorange' => 'DMZ',
+'trafficout' => 'Wyjście',
+'trafficred' => 'Internet',
+'traffics' => 'Wykorzystanie pasma-przeglad:',
+'trafficsum' => 'Razem',
+'trafficto' => 'Do',
+'transfer limits' => 'Limity transferu',
+'transparent on' => 'Przezroczysty na',
+'tripwire' => 'Tripwire',
+'tripwire cronjob' => 'tripwire cronjob',
+'tripwire functions' => 'funkcje tripwire',
+'tripwire reports' => 'raporty tripwire',
+'tripwireoperating' => 'Proces został uruchomiony. Zadanie może zająć kilka minut. Proszę poczekać na automatyczne odświeżenie okna po zakończeniu operacji.',
+'tripwirewarningdatabase' => 'UWAGA - Twoja baza danych zostanie zaktualizowana przez dane z raportu. Proszę upewnić się, że nie są raportowane żadne nieautoryzowane zmiany. W tym celu niezbędny jest klucz lokalny.',
+'tripwirewarningkeys' => 'UWAGA - ta operacja spowoduje usunięcie aktualnych kluczy, konfiguracji i bazy danych i wygenerowanie nowych.',
+'tripwirewarningpolicy' => 'UWAGA - nastąpi przebudowanie twojej reguły oraz ponowną inicjalizację bazy danych. W związku z tym wymagane jest klucz strony i klucz lokalny.',
+'tuesday' => 'Wtorek',
+'type' => 'Typ',
+'umount' => 'Odmontuj',
+'umount removable media before to unplug' => 'Odmontuj nośnik wymienny przed odłączeniem urządzenia',
+'unable to alter profiles while red is active' => 'Nie można zastąpić profili kiedy interfejs RED jest aktywny.',
+'unable to contact' => 'Nie można połączyć',
+'unencrypted' => 'Nieszyfrowane',
+'uninstall' => 'Odinstaluj',
+'unix charset' => 'Kodowanie UNIX',
+'unix group' => ' grupa użytkownika UNIX',
+'unix password sync' => 'Synch haseł Unix',
+'unix shell' => 'UNIX Shell',
+'unknown' => 'NIEZNANY',
+'unnamed' => 'Bez nazwy',
+'update' => 'Aktualizuj',
+'update accelerator' => 'Update Accelerator',
+'update time' => 'Aktualizuj czas:',
+'update transcript' => 'Update transcript',
+'updatedatabase' => 'Aktualizuj bazę danych z ostatniego raportu',
+'updates' => 'Aktualizacje',
+'updates installed' => 'Zainstalowano aktualizację',
+'updates is old1' => 'Twój plik aktualizacji jest sprzed ',
+'updates is old2' => 'dni. Zalecamy jego aktualizację w zakładce <b>System>Aktualizacje/b>.',
+'updxlrtr 3 months' => 'trzech miesiący',
+'updxlrtr 6 months' => 'sześciu miesięcy',
+'updxlrtr all files' => 'wszystkie pliki ...',
+'updxlrtr cache dir' => 'Katalog Cache',
+'updxlrtr cache maintenance' => 'Utrzymanie Cache',
+'updxlrtr cache size' => 'Rozmiar Cache (w bajtach)',
+'updxlrtr cache statistics' => 'Statystyki Cache',
+'updxlrtr cancel download' => 'Anuluj pobieranie',
+'updxlrtr children' => 'Liczba procesów akceleratora',
+'updxlrtr common settings' => 'Ustawienia podstawowe',
+'updxlrtr condition download' => 'Pobierz',
+'updxlrtr condition nosource' => 'Brak źródła',
+'updxlrtr condition ok' => 'Aktualny',
+'updxlrtr condition outdated' => 'Nieaktualny',
+'updxlrtr condition suspended' => 'Wstrzymany',
+'updxlrtr condition unknown' => 'Nieznany',
+'updxlrtr configuration' => 'Konfiguracja Update accelerator',
+'updxlrtr current downloads' => 'Pliki pobrane do lokalnej pamięci cache',
+'updxlrtr current files' => 'Pliki znajdujące się w lokalnej pamięci cache',
+'updxlrtr daily' => 'dziennie',
+'updxlrtr data from cache' => 'Danych z pamięci cache (w bajtach)',
+'updxlrtr disk usage' => 'Wykorzystanie dysku',
+'updxlrtr efficiency index' => 'Indeks efektywności cache',
+'updxlrtr empty repository' => 'Pamięć cache jest pusta',
+'updxlrtr enable autocheck' => 'Włącz automatyczą kontrolę źródła',
+'updxlrtr enable log' => 'Włącz logi',
+'updxlrtr filename' => 'Nazwa',
+'updxlrtr files' => 'Pliki',
+'updxlrtr filesize' => 'Rozmiar',
+'updxlrtr full autosync' => 'Zastąp nieaktualne pliki podczas sprawdzania',
+'updxlrtr invalid disk usage' => 'Nieprawidłowa wartość w polu maks. wykorzystanie dysku',
+'updxlrtr invalid download rate' => 'Nieprawidłowa wartość w polu maks. pr. pobierania',
+'updxlrtr invalid num of children' => 'Nieprawidłowa liczba procesów akceleratora',
+'updxlrtr last access' => 'Ost. żądanie',
+'updxlrtr last checkup' => 'Ost. sprawdzenie źródła',
+'updxlrtr low download priority' => 'Obniż priorytet CPU dla pobierania',
+'updxlrtr maintenance' => 'Konserwacja',
+'updxlrtr marked as' => 'oznaczone jako',
+'updxlrtr max disk usage' => 'Maks. wykorzystanie dysku',
+'updxlrtr max download rate' => 'Maks. prędkość pobierania (kBit/s)',
+'updxlrtr month' => 'miesiąca',
+'updxlrtr monthly' => 'miesięcznie',
+'updxlrtr not accessed' => 'bez żądania od',
+'updxlrtr not enabled' => 'Update Accelerator nie jest włączony w zakładce web proxy',
+'updxlrtr other' => 'Inne',
+'updxlrtr passive mode' => 'Włącz tryb pasywny',
+'updxlrtr pending downloads' => 'Aktualnie pobierane',
+'updxlrtr performance options' => 'Opcje wydajności',
+'updxlrtr progress' => 'Postęp',
+'updxlrtr purge' => 'Oczyść',
+'updxlrtr remove file' => 'Usuń z cache',
+'updxlrtr save and restart' => 'Zapis i restart',
+'updxlrtr source' => 'Źródło',
+'updxlrtr source checkup' => 'Sprawdzanie źródeł',
+'updxlrtr source checkup schedule' => 'Planuj sprawdzanie źródeł',
+'updxlrtr statistics' => 'Statystyki',
+'updxlrtr statistics by source' => 'Statystyki wg. źródła',
+'updxlrtr summary' => 'Podsumowanie',
+'updxlrtr total cache size' => 'Całkowity rozmiar cache (w bajtach)',
+'updxlrtr total data from cache' => 'Danych dostarczonych z cache (w bajtach)',
+'updxlrtr total files' => 'Liczba plików w cache',
+'updxlrtr unknown' => 'Nieznany',
+'updxlrtr update accelerator' => 'Update Accelerator',
+'updxlrtr update information' => 'Dostępna jest nowsza wersja do pobrania. Wejdź na stronę <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> aby uzyskać więcej informacji.',
+'updxlrtr update notification' => 'Informacja o aktualizacji!',
+'updxlrtr web proxy service required' => 'Usługa Web proxy musi być włączona aby używać Update Accelerator',
+'updxlrtr week' => 'tygodnia',
+'updxlrtr weekly' => 'tygodniowo',
+'updxlrtr year' => 'roku',
+'upgrade' => 'upgrade',
+'uplink speed' => 'Szybskość wysyłania (kbit/sec)',
+'uplink std class' => 'standardowa klasa wysyłania',
+'upload' => 'Wyślij',
+'upload a certificate' => 'Wyślij certyfikat:',
+'upload a certificate request' => 'Wyślij żądanie certyfikatu:',
+'upload ca certificate' => 'Wyślij certyfikat CA',
+'upload fcdsl.o' => 'TO BE REMOVED',
+'upload file' => 'Wyślij plik',
+'upload new ruleset' => 'Wyślij nowy zestaw reguł',
+'upload p12 file' => 'Wyślij plik Upload PKCS12',
+'upload static key' => 'Wyślij klucz statyczny',
+'upload successful' => 'Wysyłanie zakończone.',
+'upload synch.bin' => 'Wyślij synch.bin',
+'upload update file' => 'Wyślij plik aktualizacji:',
+'upstream password' => 'Upstream password:',
+'upstream proxy host:port' => 'Upstream proxy (host:port)',
+'upstream username' => 'Upstream username:',
+'uptime and users' => 'Uptime and users:',
+'url filter' => 'Filtr treści',
+'urlfilter access' => 'Dostęp',
+'urlfilter activity detection' => 'Wykrywanie aktywności',
+'urlfilter add new time constraint rule' => 'Dodaj regułę ograniczeń w czasie',
+'urlfilter add new user quota rule' => 'Dodaj regułę ograniczenia czasowego (quota)',
+'urlfilter add rule' => 'Dodaj',
+'urlfilter advanced settings' => 'Ustawienia zaawansowane',
+'urlfilter allow' => 'Zezwól',
+'urlfilter allow access' => 'Zezwól na dostęp',
+'urlfilter allowed domains' => 'Dozwolone domeny (jedna w linii)',
+'urlfilter allowed urls' => 'Dozwolone URL\'e (jeden w linii)',
+'urlfilter assigned quota users' => 'Przypisani użytkownicy (jeden w linii)',
+'urlfilter assigned users' => 'Przypisani użytkownicy',
+'urlfilter automatic blacklist update' => 'Automatyczna aktualizacja czarnej listy',
+'urlfilter automatic update schedule' => 'Zaplanuj automatyczne aktualizacje',
+'urlfilter back to main page' => 'Powrót do głównej strony',
+'urlfilter background image' => 'obraz tła filtru treści',
+'urlfilter background text' => 'Aby używać własnego obrazu tła na stronie blokady wyślij plik jpg przez poniższy formularz',
+'urlfilter backup' => 'Utwórz plik kopii',
+'urlfilter backup error' => 'Nie można utworzyć pliku kopii',
+'urlfilter backup settings' => 'Kopia ustawień filtra treści',
+'urlfilter banned clients' => 'Zablokowane adresy IP',
+'urlfilter blacklist age 1' => 'Ostatnia poprawna aktualizacja czarnej listy:',
+'urlfilter blacklist age 2' => 'dni temu',
+'urlfilter blacklist category name' => 'Nazwa kategorii czarnej listy',
+'urlfilter blacklist editor' => 'Edytor czarnej listy',
+'urlfilter blacklist editor info' => 'Utwórz i edytuj własną czarną listę',
+'urlfilter blacklist name' => 'Nazwa czarnej listy',
+'urlfilter blacklist update' => 'Aktualizacja czarnej listy',
+'urlfilter block' => 'Blokuj',
+'urlfilter block access' => 'Block access',
+'urlfilter block all' => 'Blokuj wszystkie URL\'e z wyjątkiem zezwolonych',
+'urlfilter block archives' => 'Blokuj skompresowane archiwa',
+'urlfilter block audio-video' => 'Blokuj pliki audio/wideo',
+'urlfilter block categories' => 'Kategorie czarnej listy',
+'urlfilter block executables' => 'Blokuj pliki wykonywalne',
+'urlfilter block ip' => 'Blokuj wywołania stron przez ich IP',
+'urlfilter block settings' => 'Ustawienia strony blokady',
+'urlfilter blocked domains' => 'Blokowane domeny (jedna w linii)',
+'urlfilter blocked expressions' => 'Blokowane wyrażenia (jako wyrażenie regularne)',
+'urlfilter blocked urls' => 'Blokowane URL\'e (jeden w linii)',
+'urlfilter category' => 'Kategoria',
+'urlfilter category all' => 'wszystkie',
+'urlfilter category data error' => 'Czarna lista jest pusta',
+'urlfilter category log' => 'Podziel logi na kategorie',
+'urlfilter category name error' => 'Wymagana nazwa kategorii czarnej listy',
+'urlfilter client' => 'Klient',
+'urlfilter configuration' => 'Konfiguracja filtra URL',
+'urlfilter constraint definition' => 'Definicja',
+'urlfilter constraint outside' => 'poza okr.',
+'urlfilter constraint within' => 'w okresie',
+'urlfilter copy rule' => 'Kopiuj',
+'urlfilter current files' => 'Pliki w lokalnym repozytorium',
+'urlfilter custom blacklist' => 'Własna czarna lista',
+'urlfilter custom expression list' => 'Własna lista wyrażeń',
+'urlfilter custom url' => 'Własne źródłowe URL\'e',
+'urlfilter custom url required' => 'Wymagane własne źródłowe URL\'e',
+'urlfilter custom whitelist' => 'Własna biała lista',
+'urlfilter daily' => 'codziennie',
+'urlfilter disabled' => 'wyłączony',
+'urlfilter domains' => 'Domeny (jedna w linii)',
+'urlfilter dont restart urlfilter' => 'Nie uruchamiaj ponownie filtra URL',
+'urlfilter dst' => 'Cel',
+'urlfilter dst error' => 'Przynajmniej 1 kategoria musi być wybrana',
+'urlfilter edit domains urls expressions' => 'Edycja domen, URL\'i oraz wyrażeń',
+'urlfilter edit time constraint rule' => 'Edytuj istniejącą regułę czasową',
+'urlfilter edit user quota rule' => 'Edytuj istniejącą regułę limitu czasowego',
+'urlfilter empty ads' => 'Blokowanie reklam pustym oknem',
+'urlfilter empty repository' => 'Lokalne repozytorium plików jest puste',
+'urlfilter enable automatic blacklist update' => 'Włącz automatyczne aktualizacje',
+'urlfilter enable custom blacklist' => 'Włącz własną czarną listę',
+'urlfilter enable custom expression list' => 'Włącz własną listę wyrażeń',
+'urlfilter enable custom whitelist' => 'Włącz własną białą listę',
+'urlfilter enable expression lists' => 'Włącz listę wyrażeń',
+'urlfilter enable full backup' => 'Dołącz kompletną czarną listę',
+'urlfilter enable jpeg' => 'Włącz obraz tła',
+'urlfilter enable log' => 'Włącz logi',
+'urlfilter enable rewrite rules' => 'Włącz lokalne przekierowania plików',
+'urlfilter enabled' => 'Włączone:',
+'urlfilter example' => 'Przykład: www.domain.com',
+'urlfilter example ads' => 'Przykład: www.domain.com/ads/',
+'urlfilter export blacklist' => 'Esportuj czarną listę',
+'urlfilter export error' => 'Nie można utworzyć pliku eksportu',
+'urlfilter expressions' => 'Wyrażenia (jedno w linii)',
+'urlfilter file ext block' => 'Blokowanie rozszerzeń plików',
+'urlfilter filename' => 'Nazwa',
+'urlfilter filesize' => 'Rozmiar',
+'urlfilter filter settings' => 'Ustawienia filtra URL',
+'urlfilter fri' => 'P',
+'urlfilter friday' => 'Pt',
+'urlfilter from' => 'Od',
+'urlfilter hourly' => 'co godzinę',
+'urlfilter import blacklist' => 'Importuj czarną listę',
+'urlfilter import text' => 'Aby zaimportować wcześniej zapisane czarne listy proszę wysłać plik .tar.gz przez poniższy formularz',
+'urlfilter install blacklist' => 'Instaluj czarną listę',
+'urlfilter install information' => 'Nowa lista zostanie automatycznie skompilowana do odpowiedniego formatu. W przypadku dużej czarnej listy może to potrwać kilka minut.',
+'urlfilter invalid content' => 'Plik nie jest kompatybilny z czarną listą squidGuard',
+'urlfilter invalid import file' => 'Plik nie jest prawidłowym plikiem edytora czarnej listy',
+'urlfilter invalid ip or mask error' => 'Niepoprawny adres IP lub maska sieci',
+'urlfilter invalid restore file' => 'Plik nie jest prawidłowym plikiem kopii filtra URL',
+'urlfilter invalid user error' => 'Niepoprawna nazwa użytkownika',
+'urlfilter load blacklist' => 'Wczytaj czarną listę',
+'urlfilter local file redirection' => 'Lokalne przekierowania plików',
+'urlfilter log' => 'logi filtra treści',
+'urlfilter log summary' => 'Liczba zdarzeń filtra URL w dniu',
+'urlfilter log viewer' => 'Przegląd logów filtra URL',
+'urlfilter logs' => 'Logi filtra URL',
+'urlfilter maintenance' => 'Konserwacja filtra URL',
+'urlfilter manage local file repository' => 'Zarządzaj lokalnym repozytorium plików',
+'urlfilter manage repository' => 'Zarządzanie repozytorium',
+'urlfilter minutes' => 'minut',
+'urlfilter mode allow' => 'zezwól',
+'urlfilter mode block' => 'blokuj',
+'urlfilter mon' => 'P',
+'urlfilter monday' => 'Pon',
+'urlfilter monthly' => 'co miesiąc',
+'urlfilter msg text 1' => 'Linia 1 komunikatu',
+'urlfilter msg text 2' => 'Linia 2 komunikatu',
+'urlfilter msg text 3' => 'Linia 3 komunikatu',
+'urlfilter network access control' => 'Kontrola dostępu według sieci',
+'urlfilter no categories' => 'Brak dostępnych kategorii',
+'urlfilter not enabled' => 'Filtr URL nie jest włączony w zakładce Web proxy',
+'urlfilter quota restart message' => 'UWAGA: Liczniki dla wszystkich użytkowników zostaną zresetowane po ponownym uruchomieniu filtra URL',
+'urlfilter quota time error' => 'Nieprawidłowy limit czasowy',
+'urlfilter quota user error' => 'Przynajmniej 1 nazwa użytkownika jest wymagana',
+'urlfilter redirectpage' => 'Przekieruj do tego URL',
+'urlfilter remove file' => 'Usuń z repozytorium',
+'urlfilter renewal' => 'Odnowianie',
+'urlfilter renewal period' => 'Czas odnawiania',
+'urlfilter repository information' => 'Żądania pobierania dla tych plików zostaną przekierowane z oryginalnego źródła do lokalnego repozytorium.',
+'urlfilter reset' => 'Reset',
+'urlfilter restart' => 'Ponownie uruchom filtr URL',
+'urlfilter restart message' => 'Filtr URL musi być ponownie uruchomiony aby wprowadzone zmiany zostały zastosowane',
+'urlfilter restart notification' => 'Aktywuj zmienione reguły',
+'urlfilter restore' => 'Importuj plik kopii',
+'urlfilter restore results' => 'Wynik przywracania',
+'urlfilter restore settings' => 'Przywróć ustawienia filtra URL',
+'urlfilter restore success' => 'Konfiguracja filtra URL została przywrócona. Filtr powinien zostać ponownie uruchomiony aby zastosować zmiany.',
+'urlfilter restore text' => 'Aby przywrócić zapisaną konfigurację wgraj plik .tar.gz przez poniższy formularz',
+'urlfilter safesearch' => 'Włącz SafeSearch',
+'urlfilter sat' => 'S',
+'urlfilter saturday' => 'Sob',
+'urlfilter save and restart' => 'Zapis i Restart',
+'urlfilter save schedule' => 'Zapisz ustawienia aktualizacji',
+'urlfilter select blacklist' => 'Wybierz istniejącą czarną listę',
+'urlfilter select multi' => 'Przytrzymaj ctrl aby zaznaczyć wiele kategorii',
+'urlfilter select source' => 'Wybierz źródło pobierania',
+'urlfilter set time constraints' => 'Ustaw ograniczenia w czasie',
+'urlfilter set user quota' => 'Ustaw limity czasowe',
+'urlfilter show category' => 'Pokaż kategorię na stonie blokady',
+'urlfilter show dnserror' => 'Używaj błędy DNS aby blokować URL',
+'urlfilter show ip' => 'Pokaż IP na stronie blokady',
+'urlfilter show url' => 'Pokaż URL na stronie blokady',
+'urlfilter source' => 'Host(y) lub sieć(i) źródłowe',
+'urlfilter src' => 'Źródło',
+'urlfilter src error' => 'Źródło nie może być puste',
+'urlfilter sun' => 'N',
+'urlfilter sunday' => 'Nie',
+'urlfilter tar error' => 'Nie można wypakować plików z archiwum tar',
+'urlfilter thu' => 'C',
+'urlfilter thursday' => 'Czw',
+'urlfilter time' => 'Czas',
+'urlfilter time quota' => 'Limit czasowy',
+'urlfilter time space' => 'Przedział czasowy',
+'urlfilter timebased access control' => 'Kontrola dostępu według czasu',
+'urlfilter timespace error' => 'Błąd w deklaracji przedziału czasowego',
+'urlfilter to' => 'Do',
+'urlfilter tue' => 'W',
+'urlfilter tuesday' => 'Wto',
+'urlfilter unfiltered clients' => 'Niefiltrowane adresy IP',
+'urlfilter update information' => 'Dostępna jest nowsza wersja do pobrania. Wejdź na stronę <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> aby uzyskać więcej informacji.',
+'urlfilter update notification' => 'Informacja o aktualizacji!',
+'urlfilter update now' => 'Aktualizuj teraz',
+'urlfilter update results' => 'Wyniki aktualizacja czarnej listy',
+'urlfilter update rule' => 'Aktualizuj',
+'urlfilter upload background' => 'Wgraj obraz',
+'urlfilter upload blacklist' => 'Wgraj czarną listę',
+'urlfilter upload file' => 'Wgraj plik',
+'urlfilter upload file information 1' => 'Info',
+'urlfilter upload file information 2' => 'Filtr URL powinien zostać uruchomiony ponownie aby aktywować zmiany w repozytorium.',
+'urlfilter upload file text' => 'Aby dodać plik do repozytorium wgraj go przez poniższy formularz',
+'urlfilter upload information' => 'Nowa czarna lista zostanie automatycznie skompilowana do odpowiedniego formatu. W przypadku dużej listy może to potrwać kilka minut. Proszę poczekać na zakończenie tego procesu przed restartem filtra URL.',
+'urlfilter upload success' => 'Czarna lista została poprawnie wgrana.',
+'urlfilter upload text' => 'Aby zainstalować zaktualizowaną listę wgraj plik .tar.gz poniżej',
+'urlfilter url filter' => 'Filtr URL',
+'urlfilter urlfilter blacklist editor' => 'Edytor czarnej listy filtra URL',
+'urlfilter urls' => 'URL\'e (jeden w linii)',
+'urlfilter user time quota' => 'Limit czasowy (w minutach)',
+'urlfilter username' => 'Nazwa użytkownika',
+'urlfilter username log' => 'Loguj nazwy użytkowników',
+'urlfilter web proxy service required' => 'Usługa Web proxy musi być włączona aby używać filtr URL',
+'urlfilter wed' => 'Ś',
+'urlfilter wednesday' => 'Śro',
+'urlfilter weekday error' => 'Musi być wybrany przynajmniej 1 dzień',
+'urlfilter weekly' => 'co tydzień',
+'urlfilter whitelist always allowed' => 'Zezwolenie na białą listę dla zablokowanych klientów',
+'urlfilter wrong filetype' => 'Plik nie posiada rozszerzenia .tar.gz',
+'usb modem on acm0' => 'Modem USB na ACM0',
+'usb modem on acm1' => 'Modem USB na ACM1',
+'usb modem on acm2' => 'Modem USB na ACM2',
+'usb modem on acm3' => 'Modem USB na ACM3',
+'use' => 'Użyj',
+'use a pre-shared key' => 'Użyj klucza współdzielonego:',
+'use dov' => 'Use data over voice (DOV):',
+'use ibod' => 'Użyj pasma na żądanie (iBOD):',
+'use ipfire red ip' => 'Użyj IP czerwonego interfejsu IPFire',
+'use only proposed settings' => 'Use only proposed settings.',
+'used' => 'Użyte',
+'used memory' => 'Uzyta pamiec    ',
+'used swap' => 'Uzyty Swap',
+'user' => 'Użytkownik',
+'user log' => 'user log',
+'user proxy logs' => 'user proxy log',
+'username' => 'Nazwa użytkownika:',
+'username not set' => 'Nie ustawiono nazwy użytkownika.',
+'users department' => 'User\'s department',
+'users email' => 'Adres email użytkownika',
+'users fullname or system hostname' => 'Pełna nazwa użytkownika lub nazwa hosta systemu',
+'valid root certificate already exists' => 'Poprawny certyfikat root już istnieje',
+'valid till' => 'Ważny do',
+'vci number' => 'Numer VCI:',
+'view log' => 'zobacz log',
+'virtual address' => 'Wirtualny adres',
+'virtual private networking' => 'Virtual Private Networking',
+'visible in browselist' => 'visible in browselist',
+'voldown10' => 'Ciszej o 10',
+'voldown5' => 'Ciszej o 5',
+'volup10' => 'Głośniej o 10',
+'volup5' => 'Głośniej 5',
+'vpi number' => 'Numer VPI:',
+'vpn' => 'VPN',
+'vpn aggrmode' => 'Zezwól na agresywny tryb IKE. Unikać jeśli możliwe (klucz współdzielony przesyłany otwartym tekstem)!',
+'vpn altname syntax' => 'SubjectAltName is a comma separated list of e-mail, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>e-mail:</b>ipfire@foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something',
+'vpn auth-dn' => 'Klien jest identyfikowany przez jeden z ciągów: IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN w zdalnym polu ID',
+'vpn configuration main' => 'Konfiguracja VPN ',
+'vpn delayed start' => 'Opóźnienie przed uruchomieniem VPN (w sekundach)',
+'vpn delayed start help' => 'Opóźnienie pozwala na aktualizację dynamicznego DNS przez uruchomienie. 60 jest domyślną wartością kiedy interfejs RED posiada dynamiczne IP.',
+'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed',
+'vpn local id' => 'Lokalne ID',
+'vpn missing remote id' => 'You must specify a correct Distinguished Name (DN) for this authentication.',
+'vpn mtu invalid' => 'MTU musi być liczbową wartością!',
+'vpn no full pki' => 'brak klucza lokalnego do wygenerowania certyfikatu',
+'vpn on blue' => 'VPN na BLUE',
+'vpn on green' => 'VPN na GREEN',
+'vpn on orange' => 'VPN na ORANGE',
+'vpn payload compression' => 'Negotiate payload compression',
+'vpn red name' => 'Publiczne IP lub FQDN interfejsu RED lub <%defaultroute>',
+'vpn remote id' => 'Zdalne ID',
+'vpn subjectaltname' => 'Subject Alt Name',
+'vpn vhost' => 'Roadwarrior virtual IP (sometimes called Inner-IP)',
+'vpn watch' => 'Uruchom ponownie vpn net-to-net kiedy zmieni się IP zdalnej końcówki (dyndns).',
+'waiting to synchronize clock' => 'Oczekiwanie na synchronizację zegara',
+'warn when traffic reaches' => 'Ostrzegaj kiedy ruch osiągnie x %',
+'warning messages' => 'Ostrzeżenia',
+'was deleted' => 'został usunięty',
+'web hits' => 'Liczba stron pasujących do kryterium ',
+'web proxy' => 'Proxy WWW',
+'web proxy configuration' => 'Konfiguracja proxy WWW',
+'web server' => 'Serwer stron WWW',
+'webradio playlist' => 'Webradio Playlist',
+'website' => 'Stron WWW',
+'wednesday' => 'Środa',
+'week' => 'Tydzien',
+'weekly firewallhits' => 'zdarzeń zapory tygodniowo',
+'weeks' => 'tygodnie',
+'wildcards' => 'Maski',
+'wins server' => 'Serwer Wins',
+'wins support' => 'Wsparcie Wins',
+'wireless' => 'Sieć bezprzewodowa',
+'wireless config added' => 'Dodano konfigurację sieci bezprzewodowej',
+'wireless config changed' => 'Zmieniono konfigurację sieci bezprzewodowej',
+'wireless configuration' => 'Konfiguracja sieci bezprzewodowej',
+'wlanap access point' => 'Access Point',
+'wlanap channel' => 'Kanał',
+'wlanap debugging' => 'Debugowanie',
+'wlanap del interface' => 'Usunąć wybrany interfejs?',
+'wlanap encryption' => 'Szyfrowanie',
+'wlanap informations' => 'Informacje',
+'wlanap interface' => 'Wybierz interfejs',
+'wlanap invalid wpa' => 'Niepoprawna długość klucza WPA. Klucz musi zawierać od 8 do 63 znaków.',
+'wlanap link dhcp' => 'Konfiguracja DHCP dla sieci bezprzewodowej',
+'wlanap link wireless' => 'Aktywuj klientów sieci bezprzewodowej',
+'wlanap no interface' => 'Wybrany interfejs nie jest kartą bezprzewodową!',
+'wlanap none' => 'brak',
+'wlanap notifications' => 'Notifications',
+'wlanap select interface' => 'Proszę wybrać interfejs bezprzewodowy.',
+'wlanap verbose' => 'Verbose',
+'wlanap warnings' => 'Ostrzeżenia',
+'wlanap wlan card' => 'Karta WLan',
+'wlanap wlan services' => 'Usługi WLan',
+'wlanap wlan settings' => 'Ustawienia WLan',
+'wlanap wlan status' => 'Status WLan',
+'wol wakeup' => 'WakeUp',
+'workgroup' => 'Grupa robocza',
+'written bytes' => 'Zapisanych bajtów',
+'xtaccess all error' => 'Nie możesz ustawić zdalnego dostępu dla wszystkich - to robi wpis przekierowujący porty.',
+'xtaccess bad transfert' => 'Jeżeli określisz zakres portów docelowy musisz ustawić identyczny zakres portów źródłowych !',
+'year' => 'Rok',
+'yearly firewallhits' => 'zdarzeń zapory w toku',
+'yes' => 'Tak',
+'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Możesz zdefiniować tylko jedno połączenie typu Roadwarrior jeżeli używasz autentykacji kluczem współdzielony (pre-shared key).<br />Albo połączenie typu Roadwarrior uwierzytelniane kluczem współdzielonym już istnieje, albo próbujesz dodać je teraz.',
+'your department' => 'Twoje oddziały',
+'your e-mail' => 'Twój adres email',
+);
+
+#EOF

diff --git a/langs/pl/install/lang_pl.c b/langs/pl/install/lang_pl.c
new file mode 100644 (file)
index 0000000..eb428d5
--- /dev/null
+++ b/langs/pl/install/lang_pl.c
@@ -0,0 +1,586 @@
+/*
+ * Polish (pl) Data File
+ *
+ * This file is part of the IPFire.
+ * 
+ * IPCop 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.
+ * 
+ * IPCop 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 IPCop; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ * 
+ * (c) IPFire Team  <info@ipfire.org>
+ *
+ */
+ 
+#include "libsmooth.h"
+
+char *pl_tr[] = {
+
+/* TR_ISDN */
+"ISDN",
+/* TR_ERROR_PROBING_ISDN */
+"Nie można przeprowadzić wyszukiwania urządzeń ISDN.",
+/* TR_PROBING_ISDN */
+"Wyszukiwanie i konfiguracja urządzeń ISDN.",
+/* TR_MISSING_GREEN_IP */
+"Brak adresu IP interfejsu Green!",
+/* TR_CHOOSE_FILESYSTEM */
+"Proszę wybrać system plików:",
+/* TR_NOT_ENOUGH_INTERFACES */
+"Brak wystarczającej liczby urządzeń sieciowych.\n\nPotrzebne: %d - Dostępne: %d\n",
+/* TR_INTERFACE_CHANGE */
+"Proszę wybrać interfejs dla którego chcesz wprowadzić zmiany.\n\n",
+/* TR_NETCARD_COLOR */
+"Przypisane karty",
+/* TR_REMOVE */
+"Usuń",
+/* TR_MISSING_DNS */
+"Brakujący DNS.\n",
+/* TR_MISSING_DEFAULT */
+"Brak bramy domyślnej.\n",
+/* TR_JOURNAL_EXT3 */
+"Tworzenie dziennika dla Ext3...",
+/* TR_CHOOSE_NETCARD */
+"Proszę wybrać urządzenie sieciowe dla interfejsu - %s.",
+/* TR_NETCARDMENU2 */
+"Rozszerzone menu sieci",
+/* TR_ERROR_INTERFACES */
+"W twoim systemie nie ma wolnych interfejsów.",
+/* TR_REMOVE_CARD */
+"Czy usunąć przydział dla tej karty sieciowej? - %s",
+/* TR_JOURNAL_ERROR */
+"Nie można utworzyć dziennika, nastąpi powrót do ext2.",
+/* TR_FILESYSTEM */
+"Wybierz system plików",
+/* TR_ADDRESS_SETTINGS */
+"Ustawienia adresów",
+/* TR_ADMIN_PASSWORD */
+"hasło 'admina' ",
+/* TR_AGAIN_PROMPT */
+"Powtórz:",
+/* TR_ALL_CARDS_SUCCESSFULLY_ALLOCATED */
+"Wszystkie karty przypisano poprawnie.",
+/* TR_AUTODETECT */
+"* AUTODETECT *",
+/* TR_BUILDING_INITRD */
+"Tworzenie ramdisk...",
+/* TR_CANCEL */
+"Anuluj",
+/* TR_CARD_ASSIGNMENT */
+"Przypisywanie kart",
+/* TR_CHECKING */
+"Sprawdzanie URL...",
+/* TR_CHECKING_FOR */
+"Sprawdzanie dla: %s",
+/* TR_CHOOSE_THE_ISDN_CARD_INSTALLED */
+"Wybierz kartę ISDN zainstalowaną w tym komputerze.",
+/* TR_CHOOSE_THE_ISDN_PROTOCOL */
+"Wybierz wymagany protokół ISDN.",
+/* TR_CONFIGURE_DHCP */
+"Skonfiguruj serwer DHCP wprowadzając odpowiednie ustawienia.",
+/* TR_CONFIGURE_NETWORKING */
+"Konfiguruj sieć",
+/* TR_CONFIGURE_NETWORKING_LONG */
+"Teraz powinieneś skonfigurować sieć poprzez załadowanie odpowiedniego sterownika dla interfejsu GREEN. Możesz skorzystać z automatycznego wykrywania kart sieciowych lub wybrać odpowiedni sterownik z listy. Pamiętaj - jeżeli posiadasz zainstalowaną więcej niż jedną kartę sieciową ich konfigurację będzie można przeprowadzić w dalszej części procesu instalacji. Pamiętaj także, że jeżeli posiadasz więcej niż jedną kartę sieciową takiego samego typu jak GREEN i każda z nich wymaga specjalnych parametrów modułu należy wprowadzić parametry dla wszystkich kart tego typu tak aby możliwe było aktywowanie interfejsu GREEN po jego konfiguracji.",
+/* TR_CONFIGURE_NETWORK_DRIVERS */
+"Konfiguracja sterowników oraz przydział kart sieciowych do interfejsów. Aktualna konfiguracja wygląda następująco:\n\n",
+/* TR_CONFIGURE_THE_CDROM */
+"Skonfiguruj CDROM wybierając odpowiedni adres IO i/lub IRQ.",
+/* TR_CONGRATULATIONS */
+"Gratulacje!",
+/* TR_CONGRATULATIONS_LONG */
+"%s został prawidłowo zainstalowany. Proszę usunąć płytę CD z komputera. Uruchomiony zostanie program konfiguracyjny umożliwiający ustawienie połączenia ISDN, kart sieciowych oraz haseł. Po wprowadzeniu ustawień powinieneś otworzyć w przeglądare adres https://%s:444 (lub wprowadzoną nazwę %s) aby przejść do panelu zarządzania systemem.",
+/* TR_CONTINUE_NO_SWAP */
+"Twój dysk twardy jest bardzo mały. Możesz kontynuować, ale utworzona zostanie bardzo mała przestrzeń swap. (Używaj ostrożnie).",
+/* TR_CURRENT_CONFIG */
+"Aktualna konfiguracja: %s%s",
+/* TR_DEFAULT_GATEWAY */
+"Brama domyślna:",
+/* TR_DEFAULT_GATEWAY_CR */
+"Brama domyślna\n",
+/* TR_DEFAULT_LEASE */
+"Domyślny czas dzierżawy (minut):",
+/* TR_DEFAULT_LEASE_CR */
+"Domyślny czas dzierżawy\n",
+/* TR_DETECTED */
+"Wykryto: %s",
+/* TR_DHCP_HOSTNAME */
+"Nazwa hosta DHCP:",
+/* TR_DHCP_HOSTNAME_CR */
+"Nazwa hosta DHCP\n",
+/* TR_DHCP_SERVER_CONFIGURATION */
+"Konfiguracja serwera DHCP",
+/* TR_DISABLED */
+"Wyłączone",
+/* TR_DISABLE_ISDN */
+"Wyłącz ISDN",
+/* TR_DISK_TOO_SMALL */
+"Twój dysk jest za mały.",
+/* TR_DNS_AND_GATEWAY_SETTINGS */
+"Ustawienia DNS i bramy",
+/* TR_DNS_AND_GATEWAY_SETTINGS_LONG */
+"Wprowadź informacje o DNS i bramie. Te ustawienie są używane tylko dla statycznego IP (i DHCP jeżeli ustawiono DNS) na interfejsie RED.",
+/* TR_DNS_GATEWAY_WITH_GREEN */
+"Twoja konfiguracja nie wykorzystuje karty ethernet jako interfejsu RED.  Informacje o DNS i bramie są wprowadzane automatycznie dla połączeń typu dialup przy połączeniu.",
+/* TR_DOMAINNAME */
+"Nazwa domeny",
+/* TR_DOMAINNAME_CANNOT_BE_EMPTY */
+"Nazwa domeny nie może być pusta.",
+/* TR_DOMAINNAME_CANNOT_CONTAIN_SPACES */
+"Nazwa domeny nie może zawierać spacji.",
+/* TR_DOMAINNAME_NOT_VALID_CHARS */
+"Domain name may only contain letters, numbers, hyphens and periods.",
+/* TR_DOMAIN_NAME_SUFFIX */
+"Sufix nazwy domeny:",
+/* TR_DOMAIN_NAME_SUFFIX_CR */
+"Sufix nazwy domeny\n",
+/* TR_DONE */
+"Gotowe",
+/* TR_DO_YOU_WISH_TO_CHANGE_THESE_SETTINGS */
+"\nCzy chcesz zmienić te ustawienia?",
+/* TR_DRIVERS_AND_CARD_ASSIGNMENTS */
+"Przypisywanie sterowników i kart",
+/* TR_ENABLED */
+"Włączone",
+/* TR_ENABLE_ISDN */
+"Włącz ISDN",
+/* TR_END_ADDRESS */
+"Adres końcowy:",
+/* TR_END_ADDRESS_CR */
+"Adres końcowy\n",
+/* TR_ENTER_ADDITIONAL_MODULE_PARAMS */
+"Niektóre karty ISDN (w szczególności ISA) mogą wymagać dodatkowych parametrów modułu w celu ustawienia IRQ i adresu IO. Jeżeli posiadasz tego typu kartę wprowadź te dodatkowe parametry tutaj. Na przykład: \"io=0x280 irq=9\". Zostaną one użyte podczas wykrywania kart.",
+/* TR_ENTER_ADMIN_PASSWORD */
+"Podaj hasło użytkownika 'admin' dla %s .  Jest to użytkownik na którego będziesz logował się do interfejsu WWW aby zarządzać %s .",
+/* TR_ENTER_DOMAINNAME */
+"Wprowadź nazwę domeny",
+/* TR_ENTER_HOSTNAME */
+"Podaj nazwę hosta dla maszyny.",
+/* TR_ENTER_IP_ADDRESS_INFO */
+"Wprowadź informacje o adresie IP",
+/* TR_ENTER_NETWORK_DRIVER */
+"Nie można wykryć kart sieciowych automatycznie. Wprowadź sterownik oraz dodatkowe parametry dla karty sieciowej.",
+/* TR_ENTER_ROOT_PASSWORD */
+"Podaj hasło użytkownika 'root' . Jest to użytkownik wykorzystywany do logowania do linii poleceń.",
+/* TR_ENTER_SETUP_PASSWORD */
+"TO BE REMOVED",
+/* TR_ENTER_THE_IP_ADDRESS_INFORMATION */
+"Wprowadź informacje o adresie IP dla interfejsu %s .",
+/* TR_ENTER_THE_LOCAL_MSN */
+"Wprowadź lokalny numer telefonu (MSN/EAZ).",
+/* TR_ENTER_URL */
+"Wprowadź adres URL do ipcop-<version>.tgz i plików images/scsidrv-<version>.img . UWAGA: DNS niedostępny! URL powinien wyglądać następująco http://X.X.X.X/<katalog>",
+/* TR_ERROR */
+"Błąd",
+/* TR_ERROR_PROBING_CDROM */
+"Nie znaleziono napędu CDROM.",
+/* TR_ERROR_WRITING_CONFIG */
+"Błąd zapisywania informacji o konfiguracji.",
+/* TR_EURO_EDSS1 */
+"Euro (EDSS1)",
+/* TR_EXTRACTING_MODULES */
+"Wypakowywanie modułów...",
+/* TR_FAILED_TO_FIND */
+"Nie można odnaleźć pliku URL.",
+/* TR_FOUND_NIC */
+"%s wykrył następujące urządzenia NIC w twojej maszynie: %s",
+/* TR_GERMAN_1TR6 */
+"German 1TR6",
+/* TR_HELPLINE */
+"              <Tab>/<Alt-Tab> pomiędzy pozycjami   |  <Space> wybór",
+/* TR_HOSTNAME */
+"Nazwa hosta",
+/* TR_HOSTNAME_CANNOT_BE_EMPTY */
+"Nazwa hosta nie może być pusta.",
+/* TR_HOSTNAME_CANNOT_CONTAIN_SPACES */
+"Nazwa hosta nie może zawierać spacji.",
+/* TR_HOSTNAME_NOT_VALID_CHARS */
+"Nazwa hosta może zawierać tylko listery, cyfry i łączniki.",
+/* TR_INITIALISING_ISDN */
+"Inicjalizacja ISDN...",
+/* TR_INSERT_CDROM */
+"Proszę włożyć %s CD do napędu CDROM.",
+/* TR_INSERT_FLOPPY */
+"Proszę włożyć dyskietkę ze sterownikami %s do napędu.",
+/* TR_INSTALLATION_CANCELED */
+"Instalacja anulowana.",
+/* TR_INSTALLING_FILES */
+"Instalowanie plików...",
+/* TR_INSTALLING_GRUB */
+"Instalowanie GRUB...",
+/* TR_INSTALLING_LANG_CACHE */
+"Instalowanie plików językowych...",
+/* TR_INTERFACE */
+"Interfejs - %s",
+/* TR_INTERFACE_FAILED_TO_COME_UP */
+"Nie można uruchomić interfejsu.",
+/* TR_INVALID_FIELDS */
+"Poniższe pola są niepoprawne:\n\n",
+/* TR_INVALID_IO */
+"Szczegóły portu IO są nieprawidłowe. ",
+/* TR_INVALID_IRQ */
+"Wprowadzone dane IRQ są niepoprawne.",
+/* TR_IP_ADDRESS_CR */
+"Adres IP\n",
+/* TR_IP_ADDRESS_PROMPT */
+"Adres IP:",
+/* TR_ISDN_CARD */
+"Karta ISDN",
+/* TR_ISDN_CARD_NOT_DETECTED */
+"Nie wykryto karty ISDN. Możesz wprowadzić dodatkowe parametry modułu jeżeli posiadasz kartę ISA lub twoja karta ma specyficzne wymagania.",
+/* TR_ISDN_CARD_SELECTION */
+"Wybór karty ISDN",
+/* TR_ISDN_CONFIGURATION */
+"Konfiguracja ISDN",
+/* TR_ISDN_CONFIGURATION_MENU */
+"Menu konfiguracji ISDN",
+/* TR_ISDN_NOT_SETUP */
+"Nie skonfigurowano ISDN. Pewne pozycje nie zostały wybrane.",
+/* TR_ISDN_NOT_YET_CONFIGURED */
+"ISDN nie został jeszcze skonfigurowany. Wybierz tą pozycję aby skonfigurować.",
+/* TR_ISDN_PROTOCOL_SELECTION */
+"Wybór protokołu ISDN",
+/* TR_ISDN_STATUS */
+"ISDN jest obecnie %s.\n\n   Protokół: %s\n   Karta: %s\n   Lokalny numer telefonu: %s\n\nWybierz pozycję którą chcesz zmienić lub pozostaw obecną konfigurację.",
+/* TR_KEYBOARD_MAPPING */
+"Układ klawiatury",
+/* TR_KEYBOARD_MAPPING_LONG */
+"Z poniższej listy wybierz układ klawiatury którego chcesz używać.",
+/* TR_LEASED_LINE */
+"Linia dzierżawiona",
+/* TR_LOADING_MODULE */
+"Ładowanie modułu...",
+/* TR_LOADING_PCMCIA */
+"Ładowanie modułów PCMCIA...",
+/* TR_LOOKING_FOR_NIC */
+"Wyszukiwanie: %s",
+/* TR_MAKING_BOOT_FILESYSTEM */
+"Tworzenie systemu plików boot...",
+/* TR_MAKING_LOG_FILESYSTEM */
+"Tworzenie systemu plików log...",
+/* TR_MAKING_ROOT_FILESYSTEM */
+"Tworzenie systemu plików root...",
+/* TR_MAKING_SWAPSPACE */
+"Tworzenie przestrzeni swap...",
+/* TR_MANUAL */
+"* RĘCZNIE *",
+/* TR_MAX_LEASE */
+"Maks czas dzierżawy (minut):",
+/* TR_MAX_LEASE_CR */
+"Maks czas dzierżawy\n",
+/* TR_MISSING_BLUE_IP */
+"Brak informacji o IP dla interfejsu BLUE.",
+/* TR_MISSING_ORANGE_IP */
+"Brak informacji o IP dla interfejsu ORANGE.",
+/* TR_MISSING_RED_IP */
+"Brak informacji o IP dla interfejsu RED.",
+/* TR_MODULE_NAME_CANNOT_BE_BLANK */
+"Nazwa modułu nie może być pusta.",
+/* TR_MODULE_PARAMETERS */
+"Wprowadź nazwę modułu i parametry dla sterownika.",
+/* TR_MOUNTING_BOOT_FILESYSTEM */
+"Montowanie systemu plików boot...",
+/* TR_MOUNTING_LOG_FILESYSTEM */
+"Montowanie systemu plików log...",
+/* TR_MOUNTING_ROOT_FILESYSTEM */
+"Montowanie systemu plików root...",
+/* TR_MOUNTING_SWAP_PARTITION */
+"Montowanie przestrzeni wymiany swap...",
+/* TR_MSN_CONFIGURATION */
+"Lokalny numer telefonu (MSN/EAZ)",
+/* TR_NETMASK_PROMPT */
+"Maska sieci:",
+/* TR_NETWORKING */
+"Sieć",
+/* TR_NETWORK_ADDRESS_CR */
+"Adres sieci\n",
+/* TR_NETWORK_ADDRESS_PROMPT */
+"Adres sieci:",
+/* TR_NETWORK_CONFIGURATION_MENU */
+"Menu konfiguracji sieci",
+/* TR_NETWORK_CONFIGURATION_TYPE */
+"Typ konfiguracji sieci",
+/* TR_NETWORK_CONFIGURATION_TYPE_LONG */
+"Wybierz typ konfiguracji sieci dla %s.  Poniższe typy konfiguracji uwzględniają podłączone interfejsy typu ethernet. Jeżeli zmienisz te ustawienia sieć zostanie uruchomiona ponownie i koniecznie będzie ponowne przypisanie sterowników kart.",
+/* TR_NETWORK_MASK_CR */
+"Maska sieci\n",
+/* TR_NETWORK_SETUP_FAILED */
+"Błąd konfiguracji sieci.",
+/* TR_NOT_ENOUGH_CARDS_WERE_ALLOCATED */
+"Nie można przydzielić wymaganej liczby kart.",
+/* TR_NO_BLUE_INTERFACE */
+"Nie przypisano interfejsu BLUE.",
+/* TR_NO_CDROM */
+"Nie znaleziono CD-ROM'u.",
+/* TR_NO_GREEN_INTERFACE */
+"Nie przypisano interfejsu GREEN.",
+/* TR_NO_HARDDISK */
+"Nie znaleziono dysku twardego.",
+/* TR_NO_IPCOP_TARBALL_FOUND */
+"Nie znaleziono archiwum tar ipcop na serwerze Web.",
+/* TR_NO_ORANGE_INTERFACE */
+"Nie przypisano interfejsu ORANGE.",
+/* TR_NO_RED_INTERFACE */
+"Nie przypisano interfejsu RED.",
+/* TR_NO_SCSI_IMAGE_FOUND */
+"Nie znaleziono obrazu SCSI na serwerze Web.",
+/* TR_NO_UNALLOCATED_CARDS */
+"Nie pozostało więcej nieprzypisanych kart. Możesz wykorzystać automatyczne wykrywanie aby poszukać więcej kart, lub ręcznie wybrać sterownik z listy.",
+/* TR_OK */
+"Ok",
+/* TR_PARTITIONING_DISK */
+"Partycjonowanie dysku...",
+/* TR_PASSWORDS_DO_NOT_MATCH */
+"Hasła nie są identyczne.",
+/* TR_PASSWORD_CANNOT_BE_BLANK */
+"Hasło nie może być puste.",
+/* TR_PASSWORD_CANNOT_CONTAIN_SPACES */
+"Hasło nie może zawierać spacji.",
+/* TR_PASSWORD_PROMPT */
+"Hasło:",
+/* TR_PHONENUMBER_CANNOT_BE_EMPTY */
+"Numer telefonu nie może być pusty.",
+/* TR_PREPARE_HARDDISK */
+"Program instalacyjny przygotuje dysk na %s. Nastąpi partycjonowanie dysku, a następnie utworzone zostaną systemy plików na partycjach.",
+/* TR_PRESS_OK_TO_REBOOT */
+"Naciśnij OK aby uruchomić ponownie.",
+/* TR_PRIMARY_DNS */
+"Podstawowy DNS:",
+/* TR_PRIMARY_DNS_CR */
+"Podstawowy DNS\n",
+/* TR_PROBE */
+"Sprawdź",
+/* TR_PROBE_FAILED */
+"Błąd automatycznego wykrywania.",
+/* TR_PROBING_HARDWARE */
+"Sprawdzanie sprzętu...",
+/* TR_PROBING_FOR_NICS */
+"Sprawdzanie interfejsów NIC...",
+/* TR_PROBLEM_SETTING_ADMIN_PASSWORD */
+"Problem podczas ustawiania hasła dla użytkownika %s 'admin' .",
+/* TR_PROBLEM_SETTING_ROOT_PASSWORD */
+"Problem podczas ustawiania hasła dla użytkownika 'root' .",
+/* TR_PROBLEM_SETTING_SETUP_PASSWORD */
+"TO BE REMOVED",
+/* TR_PROTOCOL_COUNTRY */
+"Protokół/Kraj",
+/* TR_PULLING_NETWORK_UP */
+"Uruchamianie sieci...",
+/* TR_PUSHING_NETWORK_DOWN */
+"Wyłączanie sieci...",
+/* TR_PUSHING_NON_LOCAL_NETWORK_DOWN */
+"Wyłączanie sieci innych niż lokalna...",
+/* TR_QUIT */
+"Wyjście",
+/* TR_RED_IN_USE */
+"ISDN (lub inne zewnętrzne połączenie) jest aktualnie w użyciu.  Nie możesz skonfigurować ISDN kiedy interfejs RED jest aktywny.",
+/* TR_RESTART_REQUIRED */
+"\n\nPo zakończeniu konfiguracji wymagane będzie ponowne uruchomienie sieci.",
+/* TR_RESTORE */
+"Przywróć",
+/* TR_RESTORE_CONFIGURATION */
+"Jeżeli posiadasz dyskietkę zawierającą konfigurację systemu %s , umieść ją w napędzie dyskietek i naciśnij przycisk Przywróć.",
+/* TR_ROOT_PASSWORD */
+"hasło 'root'",
+/* TR_SECONDARY_DNS */
+"Drugi DNS:",
+/* TR_SECONDARY_DNS_CR */
+"Drugi DNS\n",
+/* TR_SECONDARY_WITHOUT_PRIMARY_DNS */
+"Zdefiniowano drugi DNS bez podania podstawowego",
+/* TR_SECTION_MENU */
+"Section menu",
+/* TR_SELECT */
+"Wybierz",
+/* TR_SELECT_CDROM_TYPE */
+"Wybierz typ CDROM",
+/* TR_SELECT_CDROM_TYPE_LONG */
+"Nie wykryto CD-ROM'u w tym komputerze. Proszę wybrać sterowniki których chcesz użyć aby %s mógł uzyskać dostęp do CD-ROM.",
+/* TR_SELECT_INSTALLATION_MEDIA */
+"Wybierz nośnik instalacji",
+/* TR_SELECT_INSTALLATION_MEDIA_LONG */
+"%s może być zainstalowany z wielu źródeł. Najprostszym sposobem jest instalacja z napędu CDROM. Jeżeli ten komputer nie posiada takiego napędu możesz przeprowadzić instalację z innego komputera w sieci LAN udostępniającego pliki przez HTTP lub FTP.",
+/* TR_SELECT_NETWORK_DRIVER */
+"Wybierz sterownik karty sieciowej",
+/* TR_SELECT_NETWORK_DRIVER_LONG */
+"Wybierz sterownik dla karty sieciowej zainstalowanej w komputerze. Jeżeli wybierzesz ręczne przypisywanie sterowników będziesz miał możliwość wprowadzenie modułu sterownika i dodatkowych parametrów wymaganych przez niektóre karty (np. ISA).",
+/* TR_SELECT_THE_INTERFACE_YOU_WISH_TO_RECONFIGURE */
+"Wybierz interfejs którego konfigurację chcesz zmienić.",
+/* TR_SELECT_THE_ITEM */
+"Wybierz pozycję którą chcesz konfigurować.",
+/* TR_SETTING_ADMIN_PASSWORD */
+"Ustawianie hasła dla użytkownika 'admin' %s ...",
+/* TR_SETTING_ROOT_PASSWORD */
+"Ustawianie hasła użytkownika 'root' ....",
+/* TR_SETTING_SETUP_PASSWORD */
+"TO BE REMOVED",
+/* TR_SETUP_FINISHED */
+"Zakończono konfigurowanie.  Naciśnij Ok.",
+/* TR_SETUP_NOT_COMPLETE */
+"Początkowo konfiguracja nie jest kompletna. Należy upewnić się, że ustawienia są poprawne przez uruchomienie programu konfiguracyjnego (polecenia setup z linii poleceń).",
+/* TR_SETUP_PASSWORD */
+"TO BE REMOVED",
+/* TR_SET_ADDITIONAL_MODULE_PARAMETERS */
+"Ustaw dodatkowe parametry modułu",
+/* TR_SINGLE_GREEN */
+"Twoja konfiguracja zezwala tylko na 1 interfejs GREEN.",
+/* TR_SKIP */
+"Pomiń",
+/* TR_START_ADDRESS */
+"Adres początkowy:",
+/* TR_START_ADDRESS_CR */
+"Adres początkowy\n",
+/* TR_STATIC */
+"Statycznie",
+/* TR_SUGGEST_IO */
+"(sugerowane %x)",
+/* TR_SUGGEST_IRQ */
+"(sugerowane %d)",
+/* TR_THIS_DRIVER_MODULE_IS_ALREADY_LOADED */
+"Moduł sterownika jest już załadowany.",
+/* TR_TIMEZONE */
+"Strefa czasowa",
+/* TR_TIMEZONE_LONG */
+"Wybierz strefę czasową z poniższej listy.",
+/* TR_UNABLE_TO_EJECT_CDROM */
+"Nie można wysunąć CDROM'u.",
+/* TR_UNABLE_TO_EXTRACT_MODULES */
+"Nie można wypakować modułów.",
+/* TR_UNABLE_TO_FIND_ANY_ADDITIONAL_DRIVERS */
+"Nie można odnaleźć dodatkowych sterowników.",
+/* TR_UNABLE_TO_FIND_AN_ISDN_CARD */
+"Nie można odnaleźć karty ISDN w tym komputerze. Może być konieczne zdefiniowanie dodatkowych parametrów modułu jeżeli karta jest typu ISA lub ma specyficzne wymagania.",
+/* TR_UNABLE_TO_INITIALISE_ISDN */
+"Nie można zainicjować ISDN.",
+/* TR_UNABLE_TO_INSTALL_FILES */
+"Nie można zainstalować plików.",
+/* TR_UNABLE_TO_INSTALL_LANG_CACHE */
+"Nie można zainstalować plików językowych.",
+/* TR_UNABLE_TO_INSTALL_GRUB */
+"Nie można zainstalować GRUB'a.",
+/* TR_UNABLE_TO_LOAD_DRIVER_MODULE */
+"Nie można zainstalować modułu sterownika.",
+/* TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM */
+"Nie można utowrzyć systemu plików boot.",
+/* TR_UNABLE_TO_MAKE_LOG_FILESYSTEM */
+"Nie można utowrzyć systemu plików log.",
+/* TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM */
+"Nie można utowrzyć systemu plików root.",
+/* TR_UNABLE_TO_MAKE_SWAPSPACE */
+"Nie można utworzyć przestrzeni swap.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK */
+"Nie można utworzyć linku symbolicznego /dev/harddisk.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK1 */
+"Nie można utworzyć linku symbolicznego /dev/harddisk1.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK2 */
+"Nie można utworzyć linku symbolicznego /dev/harddisk2.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK3 */
+"Nie można utworzyć linku symbolicznego /dev/harddisk3.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK4 */
+"Nie można utworzyć linku symbolicznego /dev/harddisk4.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_ROOT */
+"Nie można utworzyć linku symbolicznego /dev/root.",
+/* TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM */
+"Nie można zamontować systemu plików boot.",
+/* TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM */
+"Nie można zamontować systemu plików log.",
+/* TR_UNABLE_TO_MOUNT_PROC_FILESYSTEM */
+"Nie można zamontować systemu plików proc.",
+/* TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM */
+"Nie można zamontować systemu plików root.",
+/* TR_UNABLE_TO_MOUNT_SWAP_PARTITION */
+"Nie można zamontować partycji swap.",
+/* TR_UNABLE_TO_OPEN_HOSTS_FILE */
+"Nie można otworzyć głównego plików z hostami.",
+/* TR_UNABLE_TO_OPEN_SETTINGS_FILE */
+"Nie można utworzyć pliku ustawień",
+/* TR_UNABLE_TO_PARTITION */
+"Nie można utworzyć partycji na dysku.",
+/* TR_UNABLE_TO_REMOVE_TEMP_FILES */
+"Nie można usunąć pobranych plików tymczasowych.",
+/* TR_UNABLE_TO_SET_HOSTNAME */
+"Nie można ustawić nazwy hosta.",
+/* TR_UNABLE_TO_UNMOUNT_CDROM */
+"Nie można odmontować CDROM'u lub dyskietki.",
+/* TR_UNABLE_TO_UNMOUNT_HARDDISK */
+"Nie można odmontować harddisk.",
+/* TR_UNABLE_TO_WRITE_ETC_FSTAB */
+"Nie można zapisać /etc/fstab",
+/* TR_UNABLE_TO_WRITE_ETC_HOSTNAME */
+"Nie można zapisać /etc/hostname",
+/* TR_UNABLE_TO_WRITE_ETC_HOSTS */
+"Nie można zapisać /etc/hosts.",
+/* TR_UNABLE_TO_WRITE_ETC_HOSTS_ALLOW */
+"Nie można zapisać /etc/hosts.allow.",
+/* TR_UNABLE_TO_WRITE_ETC_HOSTS_DENY */
+"Nie można zapisać /etc/hosts.deny.",
+/* TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_ETHERNET_SETTINGS */
+"Nie można zapisać %s/ethernet/settings.",
+/* TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_HOSTNAMECONF */
+"Nie można zapisać %s/main/hostname.conf",
+/* TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_SETTINGS */
+"Nie można zapisać %s/main/settings.",
+/* TR_UNCLAIMED_DRIVER */
+"Istnieje nieprzydzielona karta ethernet typu:\n%s\n\nMożesz ją przypisać do:",
+/* TR_UNKNOWN */
+"NIEZNANY",
+/* TR_UNSET */
+"UNSET",
+/* TR_USB_KEY_VFAT_ERR */
+"Ten nośnik USB jest nieprawidłowy (nie znaleziono partycji vfat).",
+/* TR_US_NI1 */
+"US NI1",
+/* TR_WARNING */
+"UWAGA",
+/* TR_WARNING_LONG */
+"Jeżeli zmienisz ten adres IP i jesteś zdalnie zalogowany twoje połączenie z %s zostnie przerwane i konieczne będzie ponowne zalogowanie na nowy adres IP. Jest to ryzykowna operacja i powinna być wykonywana tylko w sytuacji kiedy możliwy jest fizyczny dostęp do maszyny gdyby coś poszło nie tak.",
+/* TR_WELCOME */
+"Witaj w programie instalacyjnym %s . Wybranie przycisku Anuluj na kolejnych ekranach spowoduje ponowne uruchomienie komputera.",
+/* TR_YOUR_CONFIGURATION_IS_SINGLE_GREEN_ALREADY_HAS_DRIVER */
+"Twoja konfiguracja zezwala na jeden interfejs GREEN, który posiada już przypisany sterownik.",
+/* TR_YES */
+"Tak",
+/* TR_NO */
+"Nie",
+/* TR_AS */
+"jako",
+/* TR_IGNORE */
+"Ignoruj",
+/* TR_PPP_DIALUP */
+"PPP DIALUP (PPPoE, modem, ATM ...)",
+/* TR_DHCP */
+"DHCP",
+/* TR_DHCP_STARTSERVER */
+"Uruchamianie serwera DHCP ...",
+/* TR_DHCP_STOPSERVER */
+"Zatrzymywanie serwera DHCP ...",
+/* TR_LICENSE_ACCEPT */
+"Akceptuję licencję.",
+/* TR_LICENSE_NOT_ACCEPTED */
+"Nie zaakceptowano licencji.Wyjście!",
+/* TR_EXT2FS_DESCR */
+"Ext2 - System plików bez dziennika (zalecany dla napędów flash)",
+/* TR_EXT3FS_DESCR */
+"Ext3 - System plików z dziennikiem",
+/* TR_EXT4FS_DESCR */
+"Ext4 - System plików z dziennikiem",
+/* TR_REISERFS_DESCR */
+"ReiserFS - System plików z dziennikiem",
+/* TR_NO_LOCAL_SOURCE */
+"Brak lokalnego źródła. Rozpoczynanie pobierania.",
+/* TR_DOWNLOADING_ISO */
+"Pobieranie obrazu instalacyjnego ...",
+/* TR_DOWNLOAD_ERROR */
+"Błąd podczas pobierania!",
+/* TR_DHCP_FORCE_MTU */
+"Wymuś mtu DHCP:",
+};

diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
new file mode 100644 (file)
index 0000000..946e302
--- /dev/null
+++ b/langs/ru/cgi-bin/ru.pl
@@ -0,0 +1,2181 @@
+%tr = ( 
+%tr,
+
+'Act as' => 'В качестве:',
+'Add Level7 rule' => 'Добавить правило Level7',
+'Add Port Rule' => 'Добавить правило для порта',
+'Add Rule' => 'Добавить правило',
+'Async logging enabled' => 'Разрешить ассинхронную запись в файл логов',
+'Choose Rule' => 'Укажите <u>одно</u> из следующих правил.',
+'Class' => 'Класс',
+'Class was deleted' => 'Обнаружено с подклассами',
+'Client status and controlc' => 'Статус и управление клиентами:',
+'ConnSched action' => 'Действие:',
+'ConnSched add action' => 'Добавить действие',
+'ConnSched change profile title' => 'Сменить профиль:',
+'ConnSched days' => 'Дни:',
+'ConnSched down' => 'Down',
+'ConnSched ipsecstart' => 'IPSec (пере)запустить',
+'ConnSched ipsecstop' => 'IPSec остановить',
+'ConnSched reconnect' => 'Переподключить',
+'ConnSched scheduled actions' => 'Действия по расписанию',
+'ConnSched scheduler' => 'Расписание',
+'ConnSched select profile' => 'Укажите профиль',
+'ConnSched time' => 'Время:',
+'ConnSched up' => 'Up',
+'ConnSched weekdays' => 'Дни в неделю:',
+'Enter TOS' => 'Включите или отключите TOS-bits <br /> т затем нажмите <i>Сохранить</i>.',
+'Existing Files' => 'Файлы в базе данных',
+'HDD temperature' => 'HDD temperature',
+'Level7 Protocol' => 'Level7-Протокол',
+'Level7 Rule' => 'Level7-Правило',
+'Level7 rule' => 'Level7 правило',
+'Local VPN IP' => 'Внутренняя сеть (GREEN):',
+'MTU' => 'Размер MTU:',
+'Number of IPs for the pie chart' => 'Число IP для круглых графиков',
+'Number of Ports for the pie chart' => 'Число портов для круглых графиков',
+'OVPN' => 'OpenVPN',
+'OpenVPN' => 'OpenVPN',
+'Pages' => 'Страницы',
+'Ping' => 'Пинг :',
+'Port Rule' => 'Порт-Правило',
+'QoS not enabled' => 'QoS не включен!',
+'Queuelenght' => 'Длина очереди',
+'Remote IP' => 'Удалённый IP / Имя хоста (DynDNS):',
+'Remote VPN IP' => 'Подсеть VPN (то есть 10.0.10.0/255.255.255.0):',
+'Resolv' => 'Resolv-Retry:',
+'Scan for Files' => 'Найти файлы',
+'Scan from Directory' => 'Найти каталог',
+'Set time on boot' => 'Выставлять системное время на этапе загрузки машины',
+'Subclass' => 'Подкласс',
+'TOS Bits' => 'TOS-Биты',
+'TOS Rule' => 'TOS-Правило',
+'TOS rule' => 'TOS правило',
+'The class number does not match the specified interface.' => 'Номер класса не соответствует указанному интерфейсу.',
+'The destination IP address is invalid.' => 'IP адрес назначения задан неверно.',
+'The source IP address is invalid.' => 'Исходный IP адрес задан неверно.',
+'Utilization on' => 'Использовать на',
+'Verbose' => 'Подробности:',
+'WakeOnLan' => 'Wake On Lan',
+'a ca certificate with this name already exists' => 'Сертификат CA с таким именем уже существует.',
+'a connection with this common name already exists' => 'Соединение с таким именем уже существует.',
+'a connection with this name already exists' => 'Соединение с таким именем уже существует.',
+'abort' => 'Прервать',
+'access allowed' => 'Доступ разрешён от:',
+'access refused with this oinkcode' => 'Соединение отвергнуто с таким Oink кодом',
+'accounting' => 'Учёт',
+'accounting user nonpdc' => 'Учёт - без PDC режима',
+'accounting user pdc' => 'Учёт - PDC режим',
+'action' => 'Действие',
+'activate' => 'Активировать',
+'activate user' => 'Активировать пользователя',
+'active' => 'Активен',
+'add' => 'Добавить',
+'add a host' => 'Добавить хост:',
+'add a new rule' => 'Добавить новое правило:',
+'add cron' => 'Добавить cronjob',
+'add device' => 'Добавить Устройство',
+'add network' => 'Добавить сеть',
+'add new alias' => 'Добавить новый псевдоним:',
+'add new lease' => 'Добавить фиксированный IP',
+'add new ovpn' => 'Настройки OpenVPN:',
+'add printer' => 'Добавить принтер',
+'add service' => 'Добавить сервис',
+'add share' => 'Добавить общий ресурс',
+'add subclass' => 'Добавить подкласс',
+'add user' => 'Добавить пользователя',
+'add xtaccess' => 'Добавить внешний доступ',
+'add-route' => 'Дополнительный роутинг',
+'added from dhcp lease list' => 'Добавлен из списка аренды DHCP',
+'admin user password has been changed' => 'Пароль пользователя Admin был изменён.',
+'admin users' => 'Пользователь с правами суперадминистратора',
+'administrator user password' => 'Пароль пользователя Admin:',
+'adsl settings' => 'Настройки ADSL',
+'advanced' => 'Дополнительно',
+'advanced server' => 'Дополнительные настройки сервера',
+'advproxy AUTH always required' => 'Требовать аутентификацию у незарегистрированных адресов',
+'advproxy AUTH auth cache TTL' => 'Кэш аутентификации TTL (в минутах)',
+'advproxy AUTH global settings' => 'Общие настройки аутентификации',
+'advproxy AUTH limit of IP addresses' => 'Ограничение IP адресов на пользователя',
+'advproxy AUTH method' => 'Метод Аутентификации',
+'advproxy AUTH method ident' => 'identd',
+'advproxy AUTH method ldap' => 'LDAP',
+'advproxy AUTH method ncsa' => 'Локальный',
+'advproxy AUTH method none' => 'Нет',
+'advproxy AUTH method ntlm' => 'Windows',
+'advproxy AUTH method radius' => 'RADIUS',
+'advproxy AUTH no auth' => 'Домен без аутентификации (один на строчку)',
+'advproxy AUTH number of auth processes' => 'Кол-во процессов аутентификации',
+'advproxy AUTH realm' => 'Сообщение аутентификации',
+'advproxy AUTH user IP cache TTL' => 'Пользовательский/IP кэш TTL (в минутах)',
+'advproxy IDENT authorized users' => 'Авторизованные пользователи (один на строчку)',
+'advproxy IDENT aware hosts' => 'Ident aware hosts (one per line)',
+'advproxy IDENT identd settings' => 'Common identd settings',
+'advproxy IDENT required' => 'Require identd authentication',
+'advproxy IDENT timeout' => 'Ident timeout (in seconds)',
+'advproxy IDENT unauthorized users' => 'Неавторизованные пользователи (один на строчку)',
+'advproxy IDENT use negative access list' => 'Использовать пессимистический контроль доступа',
+'advproxy IDENT use positive access list' => 'Использовать оптимистический контроль доступа',
+'advproxy IDENT user based access restrictions' => 'Использовать пользовательские ограничения доступа',
+'advproxy LDAP ADS' => 'Active Directory',
+'advproxy LDAP NDS' => 'Novell eDirectory',
+'advproxy LDAP V2' => 'LDAP version 2',
+'advproxy LDAP V3' => 'LDAP version 3',
+'advproxy LDAP auth' => 'LDAP Аутентификация',
+'advproxy LDAP basedn' => 'Base DN',
+'advproxy LDAP binddn password' => 'Bind DN пароль',
+'advproxy LDAP binddn settings' => 'Bind DN настройки',
+'advproxy LDAP binddn username' => 'Bind DN пользователь',
+'advproxy LDAP common settings' => 'Основные настройки LDAP',
+'advproxy LDAP group access control' => 'Доступ для групп',
+'advproxy LDAP group required' => 'Необходимая группа',
+'advproxy LDAP port' => 'Порт',
+'advproxy LDAP server' => 'LDAP сервер',
+'advproxy LDAP type' => 'тип LDAP',
+'advproxy MIME block types' => ' Блокировать следующие MIME типы (один на строчку)',
+'advproxy MIME filter' => 'фильтр MIME типов',
+'advproxy NCSA auth' => 'Аутентификация локальных пользователей',
+'advproxy NCSA create user' => 'Создать пользователя',
+'advproxy NCSA group' => 'Группа',
+'advproxy NCSA group membership' => 'Члены группы',
+'advproxy NCSA grp disabled' => 'Отключено',
+'advproxy NCSA grp extended' => 'Расширено',
+'advproxy NCSA grp standard' => 'Стандартно',
+'advproxy NCSA min password length' => 'Минимальная длина пароля',
+'advproxy NCSA no accounts' => 'Нет доступных пользовательских учётных записей',
+'advproxy NCSA password' => 'Пароль',
+'advproxy NCSA password confirm' => 'Пароль (подтвердить)',
+'advproxy NCSA redirector bypass' => 'Bypass redirection for members of the group',
+'advproxy NCSA update user' => 'Обновить пользователя',
+'advproxy NCSA user accounts' => 'Пользовательские учётные записи',
+'advproxy NCSA user management' => 'Управление пользователями',
+'advproxy NCSA username' => 'Имя пользователя',
+'advproxy NTLM BDC hostname' => 'BDC имя хоста',
+'advproxy NTLM PDC hostname' => 'PDC имя хоста',
+'advproxy NTLM auth' => 'Windows NT/2003 аутентификация',
+'advproxy NTLM auth mode' => 'Режим аутентификации',
+'advproxy NTLM authorized users' => 'Авторизованные пользователи домена (один на строчку)',
+'advproxy NTLM domain' => 'Домен',
+'advproxy NTLM domain settings' => 'Основные настройки Домена',
+'advproxy NTLM unauthorized users' => 'Неавторизированные пользователи домена (один на строчку)',
+'advproxy NTLM use integrated auth' => 'Разрешить встроенную в Windows аутентификацию',
+'advproxy NTLM use negative access list' => 'Использовать пессимистический контроль доступа',
+'advproxy NTLM use positive access list' => 'Использовать оптимистический контроль доступа',
+'advproxy NTLM user based access restrictions' => 'User based access restrictions',
+'advproxy RADIUS authorized users' => 'Authorized users (one per line)',
+'advproxy RADIUS identifier' => 'Identifier',
+'advproxy RADIUS port' => 'Port',
+'advproxy RADIUS radius settings' => 'Основные настройки RADIUS',
+'advproxy RADIUS secret' => 'Сервер общих ресурсов',
+'advproxy RADIUS server' => 'RADIUS Сервер',
+'advproxy RADIUS unauthorized users' => 'Авторизированные пользователи (один на строчку)',
+'advproxy RADIUS use negative access list' => 'Use negative access control',
+'advproxy RADIUS use positive access list' => 'Use positive access control',
+'advproxy RADIUS user based access restrictions' => 'Использовать пользовательские ограничения доступа',
+'advproxy UA enable filter' => 'Разрешить проверку браузера',
+'advproxy access' => 'Доступ',
+'advproxy admin mail' => 'e-mail кэш администратора',
+'advproxy advanced proxy' => 'Расширенный Proxy',
+'advproxy advanced web proxy' => 'Настройки Web Proxy',
+'advproxy advanced web proxy configuration' => 'Расширенные настройки web proxy',
+'advproxy allowed subnets' => 'Разрешить подсети (одна на строчку)',
+'advproxy allowed web browsers' => 'Разрешённые клиенты для веб-доступа',
+'advproxy back to main page' => 'Назад к главной странице',
+'advproxy banned ip clients' => 'Заблокированные IP адреса (один на строчку)',
+'advproxy banned mac clients' => 'Заблокированные MAC адреса (один на строчку)',
+'advproxy cache management' => 'Контроль кэша',
+'advproxy cache replacement policy' => 'Политика замены кэша',
+'advproxy chgwebpwd ERROR' => 'О Ш И Б К А :',
+'advproxy chgwebpwd SUCCESS' => 'У С П Е Х :',
+'advproxy chgwebpwd change password' => 'Сменить пароль',
+'advproxy chgwebpwd change web password' => 'С м е н и т ь &nbsp; п а р о л ь &nbsp; в е б &nbsp; д о с т у п а',
+'advproxy chgwebpwd new password' => 'Новый пароль',
+'advproxy chgwebpwd new password confirm' => 'Новый пароль (подтвердить)',
+'advproxy chgwebpwd old password' => 'Текущий пароль',
+'advproxy chgwebpwd username' => 'Имя пользователя',
+'advproxy classroom extensions' => 'Classroom extensions',
+'advproxy clear cache' => 'Очистить Кэш',
+'advproxy client IP forwarding' => 'перенаправлять IP адреса клиентов',
+'advproxy common settings' => 'Базовые настройки',
+'advproxy content based throttling' => 'Ориентироваться на контент',
+'advproxy cre disabled' => 'Интерфейс управления был отключён администратором',
+'advproxy cre group definitions' => 'Classroom group definitions',
+'advproxy cre supervisors' => 'IP адреса ответственных (один на строчку)',
+'advproxy destination ports' => 'Порты назначения',
+'advproxy download throttling' => 'Органичение скорости',
+'advproxy enabled' => 'Разрешить',
+'advproxy enabled on' => 'Разрешить на',
+'advproxy errmsg acl cannot be empty' => 'Список доступа не может быть пустым',
+'advproxy errmsg auth cache ttl' => 'Неверное значение для кэша аутентификации TTL',
+'advproxy errmsg auth children' => 'Неверное кол-во процессов аутентификации',
+'advproxy errmsg auth ipcache may not be null' => 'Кэш аутентификации TTL не может быть 0 когда используются ограницения IP адресов',
+'advproxy errmsg auth ipcache ttl' => 'Неверное значение для пользовательского/IP кэша TTL',
+'advproxy errmsg change fail' => 'Пароль не может быть изменён',
+'advproxy errmsg change success' => 'Пароль веб-доступа успешно изменён',
+'advproxy errmsg hdd cache size' => 'Неверное значение кэша жёсткого диска (требуется мин. 10 MB)',
+'advproxy errmsg ident timeout' => 'Invalid ident timeout',
+'advproxy errmsg invalid bdc' => 'Неверное имя хоста для контролера домена бекапа',
+'advproxy errmsg invalid destination port' => 'Неверный порт назначения',
+'advproxy errmsg invalid ip or mask' => 'Неверно указан IP адрес или маска подсети',
+'advproxy errmsg invalid mac' => 'Неверно указан MAC адрес',
+'advproxy errmsg invalid pdc' => 'Неверное имя хоста для основного контролера домена',
+'advproxy errmsg invalid proxy port' => 'Неверный порт proxy',
+'advproxy errmsg invalid upstream proxy username or password setting' => 'Неверное имя или пароль для исходящего proxy',
+'advproxy errmsg invalid user' => 'Данное имя пользователя не существует',
+'advproxy errmsg ldap base dn' => 'LDAP base DN required',
+'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required',
+'advproxy errmsg ldap port' => 'Неверный номер порта LDAP',
+'advproxy errmsg ldap server' => 'Неверный IP адрес для LDAP сервера',
+'advproxy errmsg max userip' => 'Неправильное количество IP адресов на пользователя',
+'advproxy errmsg mem cache size' => 'Неверно задан размер кэша памяти',
+'advproxy errmsg no browser' => 'Как минимум один браузер или клиент должен быть указан для веб доступа',
+'advproxy errmsg no password' => 'Поле пароля не может быть пустым',
+'advproxy errmsg no username' => 'Имя пользователя не может быть пустым',
+'advproxy errmsg non-transparent proxy required' => 'Для аутентификации proxy должен работать в непрозрачном режиме',
+'advproxy errmsg ntlm domain' => 'Требуется имя домена Windows',
+'advproxy errmsg ntlm pdc' => 'Требуется имя хоста для основного контролера домена',
+'advproxy errmsg password incorrect' => 'Неверный пароль',
+'advproxy errmsg password length' => 'Неверная длина пароля',
+'advproxy errmsg password length 1' => 'Пароль должен иметь как минимум ',
+'advproxy errmsg password length 2' => ' символов',
+'advproxy errmsg passwords different' => 'Пароли не совпадают',
+'advproxy errmsg radius port' => 'Неверный номер порта RADIUS',
+'advproxy errmsg radius secret' => 'Требуется публичный ключ RADIUS',
+'advproxy errmsg radius server' => 'Неверный IP адрес для RADIUS сервера',
+'advproxy errmsg time restriction' => 'Неверное ограничение по времени',
+'advproxy error design' => 'Оформление ошибок',
+'advproxy error language' => 'Язык, на котором отображаются ошибки',
+'advproxy fake referer' => 'Липовый referer Для внешних сайтов',
+'advproxy fake useragent' => 'Липовый useragent для внешних сайтов',
+'advproxy friday' => 'Пт',
+'advproxy from' => 'C',
+'advproxy hdd cache size' => 'Размер кэша жёсткого диска (MB)',
+'advproxy invalid num of children' => 'Неверное число работающих фильтров',
+'advproxy log enabled' => 'Лог включён',
+'advproxy log query' => 'Записывать query terms',
+'advproxy log settings' => 'Настройки логов',
+'advproxy log useragent' => 'Записывать useragents',
+'advproxy max download size' => 'Максимум на загрузку (KB)',
+'advproxy max size' => 'Максимальный размер объекта (KB)',
+'advproxy max upload size' => 'Максимум на отдачу (KB)',
+'advproxy memory replacement policy' => 'Политика замены памяти',
+'advproxy min size' => 'Минимальный размер объекта (KB)',
+'advproxy mode allow' => 'разрешить',
+'advproxy mode deny' => 'запретить',
+'advproxy monday' => 'Пон',
+'advproxy network based access' => 'Контроль подсетей',
+'advproxy no cache sites' => 'Не кэшировать следующие домены (один на строчку)',
+'advproxy no clients defined' => 'Клиенты не определены',
+'advproxy no connection auth' => 'No connection oriented authentication forwarding',
+'advproxy no cre groups' => 'There are no access groups available',
+'advproxy no internal proxy on blue' => 'Запретить внутренний proxy доступ из BLUE к другим подсетям',
+'advproxy no internal proxy on green' => 'Запретить внутренний proxy доступ к GREEN из других подсетей',
+'advproxy number of L1 dirs' => 'Кол-во level-1 subdirectories',
+'advproxy off' => 'Proxy выкл',
+'advproxy offline mode' => 'Включить автономный режим',
+'advproxy on' => 'Proxy вкл',
+'advproxy privacy' => 'Приватность',
+'advproxy proxy port' => 'Порт Proxy',
+'advproxy ram cache size' => 'Размер памяти кэша (MB)',
+'advproxy redirector children' => 'Количество фильтруемых процессов',
+'advproxy reset' => 'Сбросить',
+'advproxy saturday' => 'Суб',
+'advproxy save and restart' => 'Сохранить и перезагрузить',
+'advproxy squid version' => 'Версия кэша Squid',
+'advproxy squidclamav' => 'SquidClamav',
+'advproxy ssadvanced proxy' => 'расширенный proxy',
+'advproxy ssl ports' => 'Разрешить SSL порты (один на строчку)',
+'advproxy standard' => 'Standard',
+'advproxy standard ports' => 'Разрешить стандартные порты (один на строчку)',
+'advproxy sunday' => 'Воск',
+'advproxy supervisor password' => 'Пароль ответственного',
+'advproxy suppress version' => 'Игнорировать версии',
+'advproxy throttle binary' => 'Бинарные файлы',
+'advproxy throttle dskimg' => 'Образы CD',
+'advproxy throttle mmedia' => 'Мультимедия',
+'advproxy throttling per host on' => 'Ограничение на Хост на',
+'advproxy throttling total on' => 'Общее ограничение на',
+'advproxy throttling unlimited' => 'неограничен',
+'advproxy thursday' => 'Чт',
+'advproxy time restrictions' => 'Ограничения по времени',
+'advproxy to' => 'До',
+'advproxy transfer limits' => 'Ограничение трафика',
+'advproxy transparent on' => 'Прозрачно на',
+'advproxy tuesday' => 'Вт',
+'advproxy unknown' => 'Unknown',
+'advproxy unrestricted ip clients' => 'Неограниченные IP адреса (один на строчку)',
+'advproxy unrestricted mac clients' => 'Неограниченные MAC адреса (один на строчку)',
+'advproxy update accelerator' => 'Ускоритель обновления',
+'advproxy update information' => 'Доступна новая версия для загрузки. Зайдите на <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> для получения информации.',
+'advproxy update notification' => 'Сообщение об обновлении!',
+'advproxy upstream password' => 'Пароль на выход',
+'advproxy upstream proxy' => 'Исходящий proxy',
+'advproxy upstream proxy host:port' => 'Исходящий proxy (хост:порт)',
+'advproxy upstream username' => 'Upstream username',
+'advproxy url filter' => 'URL фильтр',
+'advproxy username forwarding' => 'Переадресация пользователей',
+'advproxy via forwarding' => 'Перенаправлять адреса Proxy',
+'advproxy visible hostname' => 'Видимое имя хоста',
+'advproxy web browser' => 'Веб Браузер: ',
+'advproxy wednesday' => 'Ср',
+'again' => 'Ещё раз:',
+'aktiv' => 'Активен',
+'album' => 'Альбом',
+'alcatelusb help' => 'Для использования SpeedTouch 330 или SpeedTouch USB modem Вам придётся загрузить драйвера на IpFire. Пожалуйста загрузите the <b>External Firmware</b> для SpeedTouch 330 с сайта speedtouch.com, разархивируйте и затем загрузите правильный файл для Вашего модема : KQD6_3.xxx when Rev<4 или ZZZL_3.xxx для Rev=4 с помощью формы ниже.',
+'alcatelusb upload' => 'загрузить Speedtouch USB firmware',
+'alias ip' => 'Псевдоним IP',
+'aliases' => 'Псевдонимы',
+'aliases not active' => 'Псевдонимы не будут использованы пока ваш RED интерфейс СТАТИЧЕСКИЙ',
+'all' => 'Все',
+'all interfaces' => 'Все интерфейсы',
+'all services' => 'Все Сервисы',
+'all updates installed' => 'Все обновления установлены',
+'allmsg' => 'Показать все',
+'alt dialup' => 'Dialup',
+'alt home' => 'Главная',
+'alt information' => 'Информация',
+'alt logs' => 'Логи',
+'alt ovpn' => 'OpenVPN',
+'alt proxy' => 'Proxy',
+'alt services' => 'Сервисы',
+'alt system' => 'Система',
+'alt vpn' => 'VPN\'ы',
+'and' => 'и',
+'ansi t1.483' => 'БУДЕТ УДАЛЕНО',
+'apcupsd' => 'APC-UPS статус',
+'apply' => 'Применить сейчас',
+'april' => 'Апрель',
+'archive not exist' => 'Архив с конфигурацией не существует',
+'are you sure' => 'Вы уверены?',
+'arp table entries' => 'Записи ARP-таблицы:',
+'artist' => 'Artist',
+'attemps' => 'Попытки',
+'august' => 'Август',
+'authentication' => 'Аутентификация:',
+'automatic' => 'Автоматически',
+'available updates' => 'Доступные обновления:',
+'average' => 'Average',
+'avoid dod' => 'Не используйте эту опцию с дозвоном по требованию! Обычно используется, когда IPFire находится за роутером. Ваш RED IP должен находиться в одной из трёх зарезервированных сетей то есть 10/8, 172.16/12, 192.168/16',
+'back' => 'НАЗАД',
+'backup' => 'Резервная копия системы',
+'backup archive' => 'Backup файл (.dat)',
+'backup clear archive' => 'Очистить Backup файл (.gz)',
+'backup config floppy' => 'Конфигурация Backup - Floppy диск',
+'backup configuration' => 'Конфигурация Backup:',
+'backup erase key' => 'Удалить ключ',
+'backup explain key' => 'Восстановительные копии шифруются. Для предотвращения незаконного доступа к таким файлам, IPFire восстанавливает только файлы по указанному здесь ключу. Предусмотрено три варианта',
+'backup explain key li1' => 'Позволить IPFire создать ключ для Вас.',
+'backup explain key li2' => 'Импортировать сохранённый ключ (возможно, защищённый паролем).',
+'backup explain key li3' => 'Извлеч ключь из незашифрованного резервного файла (только версии 1.4.10).',
+'backup explain key no1' => 'Вам следует сохранить этот ключь для восстановления на новых машинах, IPFire допускает только одноразовое создание/импорт ключа.',
+'backup explain key no2' => 'floppy дискеты восстановления не связаны с этим ключом.',
+'backup export key' => 'Экспорт ключа',
+'backup extract key' => 'Извлеч ключ',
+'backup from' => 'Восстановить из',
+'backup generate key' => 'Генерировать ключ',
+'backup import dat file' => 'Импортировать файл восстановления (.dat) ',
+'backup import key' => 'Импортировать ключ',
+'backup key' => 'Ключ шифрования файлов восстановления',
+'backup key file' => 'Файл ключа восстановления',
+'backup key info' => 'IPFire запрещает доступ к файлу восстановления, для этого Вам необходим пароль root. У вас так же есть возможность защитить ключ дополнительным паролем вне IPFire.',
+'backup media info' => 'Floppy и/или неотформатированный носитель может неверно сообщать размер своих разделов. В этом случае укажите всё устройство. Не забудьте смонтировать жёсткие диски до удаления устройства. Обратите внимание: floppy созданные здесь не могут использоваться с установщиком IPFire!',
+'backup missing key' => 'Нужен ключ для восстановления',
+'backup password' => 'Пароль восстановления',
+'backup protect key password' => 'Пароль ключа восстановления',
+'backup sets' => 'Наборы для восстановления',
+'backup to floppy' => 'Сохранить на floppy',
+'backupaddon' => 'Резервная копия аддонов',
+'backupprofile' => 'Если не получается переподключиться, укажите другой профиль',
+'backups' => 'Резервные копии',
+'backupwarning' => 'Пожалуйста, сперва восстановите резервную копию системы, а затем аддоны. <br> Пожалуйста сохраните оригинальное название файла, которое было при скачивании.',
+'bad characters in' => 'Неправильные символы в ',
+'bad characters in script field' => 'Неправильные символы в поле скрипта',
+'bad characters in the telephone number field' => 'Неправильные символы в поле телефонного номера.',
+'bad destination range' => 'В диапазоне портов назначения номер начального порт больше конечного.',
+'bad ignore filter' => 'Неправильный фильтр игнора:',
+'bad return code' => 'Программа помощи сообщает об ошибке',
+'bad source range' => 'В диапазоне исходящих портов номер начального порт больше конечного.',
+'bandwidth usage' => 'Внешний трафик',
+'bandwitherror' => 'Вы не сможете поменять пропускную способность, пока работает Qos. Сперва остановите Qos.<p>',
+'bandwithsettings' => 'Настройка пропускной способности',
+'basic options' => 'Основные опции',
+'beep when ppp connects or disconnects' => 'Пищать спикером, когда IPFire подключается и отключается',
+'behind a proxy' => 'За proxy:',
+'bewan adsl pci st' => 'БУДЕТ УДАЛЁН',
+'bewan adsl usb' => 'БУДЕТ УДАЛЁН',
+'bitrate' => 'Битрейд',
+'bleeding rules' => 'Bleeding Edge Snort Rules',
+'blue' => 'BLUE',
+'blue access' => 'Доступ к Blue',
+'blue access use hint' => 'You have to enter the MAC or the IP Address for a device. To enter both is also possible',
+'blue interface' => 'Blue Интерфейс',
+'broadcast' => 'Broadcast',
+'broken pipe' => 'Broken pipe',
+'buffered memory' => 'Buffered Memory',
+'buffers' => 'buffers',
+'bytes per second' => 'Bytes per Second',
+'bytes received' => 'Bytes Received',
+'bytes sent' => 'Bytes Sent',
+'ca certificate' => 'CA Certificate',
+'ca name' => 'Имя CA',
+'cache management' => 'Управление Кэшем',
+'cache size' => 'Cache size (MB):',
+'cached' => 'cached',
+'cached memory' => 'Cached Memory  ',
+'cached swap' => 'Cached Swap',
+'calamaris available reports' => 'Доступные отчёты',
+'calamaris byte unit' => 'Единицы измерения',
+'calamaris create report' => 'Создать отчёт',
+'calamaris enable content report' => 'Включить отчёт по контенту',
+'calamaris enable distribution histogram' => 'Включить гистограммы распределения',
+'calamaris enable domain report' => 'Включить отчёт по домену',
+'calamaris enable performance report' => 'Включить отчёт производительности',
+'calamaris enable requester report' => 'Включить отчёты запросов',
+'calamaris enable verbose reporting' => 'Включить подробные отчёты',
+'calamaris high' => 'Высокое',
+'calamaris histogram resolution' => 'Разрешение гистограммы',
+'calamaris low' => 'Низкое',
+'calamaris medium' => 'среднее',
+'calamaris no reports available' => 'Нет доступных отчётов',
+'calamaris none' => 'none',
+'calamaris number of content types' => 'Кол-во контентных типов',
+'calamaris number of domains' => 'Чисто доменов',
+'calamaris number of requested urls' => 'Кол-во запрошеных URLs',
+'calamaris number of requesting hosts' => 'Кол-во запросов хостов',
+'calamaris performance options' => 'Настройки производительности',
+'calamaris proxy reports' => 'Отчёты Proxy',
+'calamaris refresh list' => 'Обновить список',
+'calamaris report interval (in minutes)' => 'Интервал (в минутах)',
+'calamaris report options' => 'настройки отчёта',
+'calamaris report period' => 'Отчётный период',
+'calamaris run as background task' => 'Запустить в фоновом режине',
+'calamaris show usernames' => 'Показать имена пользователей',
+'calamaris skip archived logfiles' => 'Пропускать файлы логов',
+'calamaris unlimited' => 'unlimited',
+'calamaris view' => 'View',
+'calamaris view report' => 'View report',
+'calc traffic all x minutes' => 'Calculate traffic all x minutes',
+'cancel' => 'Отменить',
+'cancel-adv-options' => 'Отменить',
+'cannot enable both nat traversal and compression' => 'Cannot enable both NAT traversal and compression.',
+'cannot enable ntp without specifying primary' => 'Cannot enable NTP without specifying primary.',
+'cannot specify secondary dns without specifying primary' => 'Cannot specify secondary DNS without specifying primary.',
+'cannot specify secondary ntp without specifying primary' => 'Cannot specify Secondary NTP server without specifying Primary',
+'cannot specify secondary wins without specifying primary' => 'Cannot specify secondary WINS without specifying primary.',
+'cant change certificates' => 'Can\'t change certificates.',
+'cant enable xtaccess' => 'The associated port forwarding rule is disabled, therefore you cannot enable external access for this rule.',
+'cant start openssl' => 'Can\'t start OpenSSL',
+'caps all' => 'ВСЕ',
+'capsclosed' => 'ОТКЛЮЧЁН',
+'capsinactive' => 'НЕ АКТИВЕН',
+'capsopen' => 'ПОДКЛЮЧЁН',
+'capswarning' => 'АХТУНГ',
+'caption' => 'Caption',
+'cert' => 'Сертификат',
+'certificate' => 'Сертификат',
+'certificate authorities' => 'Центр выдачи сертификатов',
+'certificate does not have a valid ca associated with it' => 'Certificate does not have a valid CA associated with it.',
+'certificate file move failed' => 'Certificate file move failed',
+'cfg restart' => 'A reboot is suggested after restoring a configuration archive.',
+'chain' => 'Chain',
+'change passwords' => 'Change passwords',
+'change share' => 'edit share options',
+'check for net traffic update' => 'Check for Net-Traffic updates',
+'check vpn lr' => 'Check',
+'choose config' => 'Choose config',
+'choose media' => 'Choose media',
+'cipher' => 'Метод шифрования:',
+'city' => 'City',
+'class in use' => 'The class is already in use.',
+'clear cache' => 'Clear Cache',
+'clear playlist' => 'Empty playlist',
+'clenabled' => 'Предоставить время пользователям локальной сети',
+'click to disable' => 'Разрешить (кликните чтобы запретить)',
+'click to enable' => 'Запретить (кликните чтобы разрешить)',
+'client' => 'Workstation Name',
+'clock has not been synchronized' => 'Clock has not been synchronized',
+'clock last synchronized at' => 'В последний раз время синхронизировалось в',
+'comment' => 'Description:',
+'common name' => 'Короткое имя',
+'community rules' => 'Emergingthreats.net Community Rules',
+'comp-lzo' => 'LZO-Сжатие:',
+'compression' => 'Compression:',
+'computer to modem rate' => 'Computer to modem rate:',
+'concentrator name' => 'Concentrator name:',
+'confirmation' => 'confirmation',
+'connect' => 'OVPN Start / Connect',
+'connect the modem' => 'Connect the modem',
+'connect timeout' => 'Connect timeout:',
+'connected' => 'Подключён',
+'connecting' => 'Подключаюсь...',
+'connection' => 'Подключение',
+'connection closed' => 'Не подключён...',
+'connection debugging' => 'Connection debugging',
+'connection status and controlc' => 'Статус и управление подключениями:',
+'connection tracking' => 'Просмотр соединений через IPTables',
+'connection type' => 'Connection Type',
+'connection type is invalid' => 'Connection type is invalid.',
+'connections' => 'Соединения',
+'connections are associated with this ca.  deleting the ca will delete these connections as well.' => 'connections are associated with this CA. Deleting the CA will delete these connections as well.',
+'connscheduler' => 'Расписание подключений',
+'core notice 1' => '<strong>Notice:</strong> There is an core-update from',
+'core notice 2' => 'to',
+'core notice 3' => 'available.',
+'could not be opened' => 'не может быть открыт.',
+'could not connect to' => 'Could not connect to',
+'could not connect to www ipcop org' => 'Could not connect to www.ipfire.org',
+'could not connect to www ipfire org' => 'Could not connect to www.ipfire.org',
+'could not create directory' => 'Could not create directory.',
+'could not download latest patch list' => 'Could not download latest patch list (not connected).',
+'could not download latest updates' => 'Could not download latest updates.',
+'could not download the available updates list' => 'Could not download the available updates list.',
+'could not open available updates file' => 'Could not open available updates file.',
+'could not open installed updates file' => 'Could not open installed updates file',
+'could not open update information file' => 'Could not open update information file.  The update file is corrupt.',
+'could not retrieve common name from certificate' => 'Could not retrieve common name from certificate.',
+'country' => 'Country',
+'cpu frequency per' => 'CPU frequency per',
+'cpu idle usage' => 'Idle CPU Usage',
+'cpu interrupt usage' => 'Interrupt CPU Usage',
+'cpu iowait usage' => 'CPU waiting for IO',
+'cpu irq usage' => 'IRQ CPU Usage',
+'cpu nice usage' => 'Nice CPU Usage',
+'cpu steal usage' => 'Steal CPU Usage',
+'cpu system usage' => 'System CPU Usage',
+'cpu usage per' => 'CPU Usage per',
+'cpu user usage' => 'User CPU Usage',
+'create' => 'Create',
+'create mask' => 'UNIX rights for new created files',
+'create new backup' => 'Create a new backup set',
+'credits' => 'О Проекте',
+'crl' => 'Список отозванных сертификатов',
+'cron server' => 'CRON Сервер',
+'current' => 'Текущий',
+'current aliases' => 'Действующие псевдонимы:',
+'current class' => 'Текущий класс',
+'current devices' => 'Текущие устройства',
+'current dhcp leases on blue' => 'Текущий лизинг DHCP в сети BLUE',
+'current dynamic leases' => 'Текущий лизинг динамических IP',
+'current fixed leases' => 'Текущий лизинг фиксированных адресов',
+'current hosts' => 'Действующие хосты:',
+'current media' => 'Задействованный диск',
+'current ovpn' => 'Активные OVPN-соединения:',
+'current playlist' => 'Текущий Playlist',
+'current profile' => 'Текущий профиль:',
+'current rules' => 'Установленные правила:',
+'custom networks' => 'Пользовательские сети',
+'custom services' => 'Пользовательские сервисыs',
+'daily firewallhits' => 'daily firewallhits',
+'dat without key' => 'Зашифрованный архив не может быть использован без ключа.',
+'date' => 'Дата',
+'date not in logs' => 'На запрошеный день журналы не найдены или они частично недоступны',
+'day' => 'Day',
+'day after' => 'Следующий День',
+'day before' => 'Предыдущий День',
+'days' => 'Дни.',
+'dbfile' => 'Dbfile',
+'ddns help dnsmadeeasy' => 'In the field for hostname enter your ID (or a list of IDs seperated by;)',
+'ddns help freedns' => 'In the fied username enter your connect string',
+'ddns help plus' => '<b>+</b> marks a mandatory field',
+'ddns hostname added' => 'Dynamic DNS hostname added',
+'ddns hostname modified' => 'Dynamic DNS hostname modified',
+'ddns hostname removed' => 'Dynamic DNS hostname removed',
+'ddns minimize updates' => 'Минимизировать обновления: перед обновлением сравнивать dns IP от хоста "[host.]domain" с RED IP.',
+'ddns noip prefix' => 'Для использования no-ip в режиме групп, используйте префикс для хостов <b>%</b>',
+'deactivate' => 'Деактивировать',
+'deactivate user' => 'Деактивировать пользователя',
+'debugme' => 'Ещё пока не задано',
+'december' => 'Декабрь',
+'deep scan directories' => 'Рекурсивное сканирование',
+'def lease time' => 'Время аренды по умолчанию',
+'default lease time' => 'Время аренды по умолчанию (мин.):',
+'default networks' => 'Сети по умолчанию',
+'default renewal time' => 'Время обновления по умолчанию',
+'default services' => 'Сервисы по умолчанию',
+'defaultwarning' => 'ВНИМАНИЕ - Ваши настройки будут потеряны и заменены исходными.',
+'delete' => 'Удалить',
+'delete cron' => 'Удалить cronjob',
+'delete pc' => 'Удалить рабочую станцию',
+'delete share' => 'Удалить шару',
+'delete user' => 'Удалить пользователя',
+'demon login script' => 'Demon login скрипт',
+'description' => 'Описание',
+'dest ip and port' => 'IP получателя: Порт',
+'destination' => 'Пункт назначения',
+'destination ip' => 'IP получателя',
+'destination ip bad' => 'Неверный IP получателя',
+'destination ip or net' => 'IP или сеть получателя',
+'destination net' => 'Сеть получателя',
+'destination port' => 'Порт получателя',
+'destination port numbers' => 'Destination port must be a valid port number or port range.',
+'destination port overlaps' => 'Destination port range overlaps an existing port range.',
+'detail level' => 'Уровень детализации логов',
+'device' => 'Устройство',
+'devices on blue' => 'Устройства в сети BLUE',
+'dhcp advopt add' => 'Добавить DHCP опцию',
+'dhcp advopt added' => 'DHCP опция добавлена',
+'dhcp advopt blank value' => 'Значение DHCP опции не может быть пустым.',
+'dhcp advopt custom definition' => 'Your custom option definition',
+'dhcp advopt definition' => 'Definition',
+'dhcp advopt definition exists' => 'Definition option already exists. You can only edit or remove it.',
+'dhcp advopt edit' => 'Изменить DHCP опции',
+'dhcp advopt help' => 'Показать опции',
+'dhcp advopt list' => 'Дополнительные опции DHCP',
+'dhcp advopt modified' => 'Опция DHCP изменена.',
+'dhcp advopt name' => 'Название опции',
+'dhcp advopt removed' => 'Опция DHCP удалена',
+'dhcp advopt scope' => 'Option scope',
+'dhcp advopt scope global' => 'Global',
+'dhcp advopt scope help' => 'Глобальная или локальная область для отмеченых интерфейсов.',
+'dhcp advopt unknown' => 'DHCP опция не опознана',
+'dhcp advopt value' => 'Значение опции',
+'dhcp allow bootp' => 'Разрешить bootp клиентов',
+'dhcp base ip fixed lease' => 'IP для создания фиксированной аренды',
+'dhcp bootp pxe data' => 'Введите дополнительную bootp pxe информацию для фиксированной аренды',
+'dhcp configuration' => 'Настройка DHCP',
+'dhcp create fixed leases' => 'Создать фиксированную аренду',
+'dhcp fixed lease err1' => 'Для создания фиксированной аренды введите MAC адрес или имя хоста, или и то и другое.',
+'dhcp fixed lease help1' => 'IP адрес может быть задан как FQDN',
+'dhcp mode' => 'DHCP',
+'dhcp server' => 'DHCP Сервер',
+'dhcp server disabled' => 'DHCP сервер отключен.  Остановлен.',
+'dhcp server disabled on blue interface' => 'DHCP сервер отключен на BLUE интерфейсе',
+'dhcp server enabled' => 'DHCP сервер включён.  Перезагрузка.',
+'dhcp server enabled on blue interface' => 'DHCP сервер включен на BLUE интерфейсе',
+'dhcp-options' => 'DHCP push опции',
+'dial' => 'Подключиться',
+'dial profile' => 'Подключиться с профилем',
+'dial user password' => 'Введите пользовательский пароль на подключение:',
+'dial user password has been changed' => 'пользовательский пароль на подключение был изменён.',
+'dialing mode' => 'Режим набора:',
+'dialup red not ppp' => 'Dialup настройки появляются только когда <b>RED</b> интерфейс использует <b>PPP Dialup</b><BR> подключение. <BR><BR>* Изменить настройки сетевых интерфейсов можно из консоли IpFire, выполнив команду <BR><b>setup</b> под рутом.',
+'dialup settings' => 'Настройки Dialup',
+'directory mask' => 'Права на UNIX каталоги',
+'directory writeable' => 'каталог writeable',
+'disabled' => 'отключён',
+'disconnect' => 'OVPN Остановить / Отключить',
+'disconnects' => 'Отключает',
+'disk access per' => 'Доступ к диску по',
+'disk usage' => 'Использование дисков',
+'display' => 'Экран',
+'display charset' => 'Таблица символов',
+'display hostname in window title' => 'Показать имя сервера в заголовке окна',
+'display traffic at home' => 'Показать суммарный трафик на Главной странице',
+'display webinterface effects' => 'Включить Эффекты веб-интерфейса',
+'dl client arch' => 'Скачать клиентский комплект (zip)',
+'dmz' => 'DMZ',
+'dmz pinhole configuration' => 'Настройка DMZ туннелей',
+'dmz pinhole rule added' => 'DMZ pinhole rule added; restarting DMZ pinhole',
+'dmz pinhole rule removed' => 'DMZ pinhole rule removed; restarting DMZ pinhole',
+'dmzpinholes for same net not necessary' => 'DMZ Pinholes are not necessary for same net. Select different source or destination net.',
+'dns address deleted' => 'Успешно удалён!',
+'dns address deleted txt' => 'Адрес DNS-сервера был успешно удалён.<br />Необходима перезагрузка или переподключение, чтобы изменения вступили в силу!',
+'dns address done' => 'Настройки адреса DNS-сервера будут сохранены.',
+'dns address recon' => 'Пытаюсь переподсоединиться!',
+'dns check failed' => 'Проверка DNS завершилась с ошибками',
+'dns desc' => 'If the red0 interface gets the IP address information via DHCP from the provider, the DNS server addresses will be set automatically. Now here you are able to change these DNS server IP addresses with your own ones.',
+'dns error 0' => 'The IP address of the <strong>primary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>secondary</strong> DNS server address is valid.',
+'dns error 01' => 'The entered IP address of the <strong>primary</strong> and <strong>secondary</strong> DNS server are not valid, please check your entries!',
+'dns error 1' => 'The IP address of the <strong>secondary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>primary</strong> DNS server address is valid.',
+'dns header' => 'Assign DNS server addresses only for DHCP on red0',
+'dns list' => 'List of free public DNS servers',
+'dns menu' => 'Assign DNS-Server',
+'dns new 0' => 'New <strong>primary</strong> DNS server IP:',
+'dns new 1' => 'New <strong>secondary</strong> DNS server IP:',
+'dns proxy server' => 'DNS Proxy Сервер',
+'dns saved' => 'Successfully saved!',
+'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!',
+'dns server' => 'DNS Сервер',
+'dns title' => 'Domain Name System',
+'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)',
+'dod' => 'Dial on Demand',
+'dod for dns' => 'Dial on Demand for DNS:',
+'dod not compatible with ddns' => 'Dial on demand is not compatible with dynamic dns services',
+'dod waiting' => 'Dial on Demand waiting',
+'domain' => 'Домен',
+'domain master' => 'Главный домен',
+'domain name' => 'Имя домена',
+'domain name suffix' => 'Префикс домена:',
+'domain not set' => 'Домен не задан.',
+'donation' => 'Пожертвования',
+'donation-link' => 'https://www.paypal.com/en_US/GB/i/btn/btn_donateCC_LG.gif',
+'donation-text' => '<strong>IPFire</strong> управляется и поддерживается добровольцами за счёт их собственного времени и сил. Мы будем признательны, если Вы внесёте небольшое пожертвование на поддержку и развитие проекта.',
+'done' => 'Выполнить',
+'dos charset' => 'Символы DOS',
+'down and up speed' => 'Введите свою входящую и исходящую скорость <br /> и нажмите <i>Сохранить</i>.',
+'downlink speed' => 'Скорость загрузки (kbit/sec)',
+'downlink std class' => 'downlink standard class',
+'download' => 'Загрузить',
+'download ca certificate' => 'Загрузить CA сертификат',
+'download certificate' => 'Скачать сертификат',
+'download host certificate' => 'Загрузить Хост сертификат',
+'download new ruleset' => 'Загрузить новые правила',
+'download pkcs12 file' => 'Загрузить PKCS12 файл',
+'download root certificate' => 'Загрузить root сертификат',
+'dpd action' => 'Действие при обнаружении Dead Peer',
+'driver' => 'Драйвер',
+'drop input' => 'Записывать сброшенные входящие пакеты',
+'drop newnotsyn' => 'Записывать сброшенные новые не syn пакеты',
+'drop output' => 'Записывать сброшенные исходящие пакеты',
+'drop portscan' => 'Записывать сброшенные пакеты сканирования портов',
+'drop proxy' => 'Сбрасывать все пакеты, неадресованные для proxy',
+'drop samba' => 'Сбрасывать все порты Microsoft (135,137,138,139,445,1025)',
+'drop wirelessforward' => 'Записывать сброшенные wireless перенаправленные пакеты',
+'drop wirelessinput' => 'Записывать сброшенные wireless входящие пакеты',
+'dst port' => 'Dst Port',
+'dstprt range overlaps' => 'Диапазон портов назначения пересекается с уже определённым портом.',
+'dstprt within existing' => 'Данный порт назначения пересекается с ранее указаным диапазоном портов.',
+'duplicate ip' => 'Введён дублирующий IP адрес',
+'duplicate ip bold' => 'Дублирующие адреса <b>выделены</b>',
+'duplicate mac' => 'Введён дублирующий MAC адрес',
+'duplicate name' => 'Это имя уже используется в системе, пожалуйста укажите другое.',
+'dyn dns source choice' => 'Провайдер(ы) динамических DNS получают IP адрес для IPFire от:',
+'dynamic dns' => 'Динамический DNS',
+'dynamic dns client' => 'Клиент динамического DNS',
+'e-mail address too long' => 'E-mail адрес слишком длинный; Он не должен быть длиннее 40 символов.',
+'eciadsl help' => 'To utilise the ECI ADSL modem you must upload a synch.bin file to your IPFire box. Please download the file from the ECIADSL website and then upload the file <b>synch.bin</b> using the form below.',
+'eciadsl upload' => 'Upload ECI ADSL synch.bin file',
+'edit' => 'Редактировать',
+'edit a rule' => 'Edit an existing rule:',
+'edit advanced settings when done' => 'Edit advanced settings when done.',
+'edit an existing alias' => 'Edit an existing alias',
+'edit an existing host' => 'Edit an existing host',
+'edit an existing lease' => 'Edit an existing lease',
+'edit device' => 'Редактировать устройства',
+'edit hosts' => 'Редактор хостов',
+'edit network' => 'Редактировать сеть',
+'edit printer' => 'Редактировать принтер',
+'edit service' => 'Редактировать сервис',
+'edit share' => 'Редактировать шару',
+'editor' => 'Редактор',
+'eg' => 'то есть:',
+'email server can not be empty' => 'E-mail не может быть пустым',
+'emailreportlevel' => 'E-mailreportlevel',
+'empty' => 'Эти поля могут остаться пустыми.',
+'empty profile' => 'empty',
+'enable ignore filter' => 'Включить фильтр',
+'enable javascript' => 'Разрешить javascript',
+'enable wildcards' => 'Разрешить wildcards:',
+'enabled' => 'Включено:',
+'enabled on' => 'Разрешено на',
+'enabledtitle' => 'Включено',
+'encapsulation' => 'Инкапсуляция',
+'encrypted' => 'Зашифровано',
+'end address' => 'Конечный:',
+'enter ack class' => 'Введите ACK- Class <br /> и нажмите <i>Сохранить</i>.',
+'enter data' => 'Введите ваши настройки <br /> и нажмите <i>Сохранить</i>.',
+'err bk 1' => 'Возникла ошибка при создании архива',
+'err bk 10 password' => 'Ошибка пароля файла восстановления',
+'err bk 2 key' => 'Ошибка при создании файла ключа',
+'err bk 3 tar' => 'Ошибка при обновлении файлов в архиве',
+'err bk 4 gz' => 'Ошибка при сжатии архива',
+'err bk 5 encrypt' => 'Ошибка при шифровании архива',
+'err rs 1' => 'Ошибка при восстановлении архива',
+'err rs 6 decrypt' => 'Ошибка при расшифровке архива',
+'err rs 7 untartst' => 'Неправильно зашифрованный архив',
+'err rs 8 untar' => 'Ошибка при извлечении файлов из архива',
+'error config' => 'Не могу открыть /var/ipfire/ovpn/config/ZERINA.ovpn !',
+'error external access' => 'Не могу открыть /var/ipfire/xtaccess/config (Не могу получить право на внешний доступ)!',
+'error messages' => 'Сообщение об ошибке:',
+'esp encryption' => 'ESP шифрование:',
+'esp grouptype' => 'ESP Grouptype:',
+'esp integrity' => 'ESP Integrity:',
+'esp keylife' => 'ESP Keylife:',
+'esp keylife should be between 1 and 24 hours' => 'ESP keylife should be between 1 and 24 hours.',
+'every' => 'Каждый',
+'exampel' => 'пример',
+'exclude logfiles' => 'Исключить файлы логов',
+'excluding buffers and cache' => '-/+ buffers/cache',
+'expected' => 'Ожидается',
+'expertoptions' => 'Экспортировать настройки',
+'expires' => 'Истекает',
+'export' => 'Экспортировать',
+'exportkey' => 'Export PSK',
+'external access' => 'External Access',
+'external access configuration' => 'External access configuration',
+'external access rule added' => 'External access rule added; restarting access controller',
+'external access rule changed' => 'External access rule changed; restarting access controller',
+'external access rule removed' => ' External access rule removed; restarting access controller',
+'external aliases configuration' => 'External aliases configuration',
+'extrahd' => 'Дополнительные HD',
+'extrahd detected drives' => 'Найдены устройства',
+'false classnumber' => 'The Class-Number does not match the interface.',
+'false max bandwith' => 'Maximum bandwith is false.',
+'false min bandwith' => 'Minimum bandwith is false.',
+'february' => 'Февраль',
+'fetch ip from' => 'Узнать реальный внешний IP с помощью внешнего сервера',
+'filename' => 'Имя файла',
+'filesystem full' => 'Filesystem full',
+'fireinfo ipfire version' => 'Версия IPFire',
+'fireinfo is disabled' => 'Fireinfo отключен',
+'fireinfo is enabled' => 'Fireinfo включен',
+'fireinfo is submitted' => 'Информация о Вашей системе успешно отправлена на сервис fireinfo.',
+'fireinfo is submitted button' => 'НЕТ, я больше не хочу отправлять информацию о своей системе.',
+'fireinfo kernel version' => 'Версия Kernel',
+'fireinfo not submitted' => 'Ваш профиль всё ещё не отправлен на сервис fireinfo.',
+'fireinfo not submitted button' => 'ДА, я хочу отправить информацию о своей системе на сервис fireinfo',
+'fireinfo pakfire version' => 'Версия Pakfire',
+'fireinfo please enable' => 'Please enable the fireinfo service.',
+'fireinfo settings' => 'Информация для сервиса Fireinfo',
+'fireinfo system version' => 'Версия Системы',
+'fireinfo why descr1' => 'Это очень важно для дальнейшей разработки IPFire чтобы Вы включили этот',
+'fireinfo why descr2' => 'сервис. ',
+'fireinfo why enable' => 'Почему я должен разрешить fireinfo?',
+'fireinfo why read more' => 'Узнать больше.',
+'fireinfo your profile id' => 'Ваш идентификатор',
+'firewall' => 'Firewall',
+'firewall graphs' => 'Firewall Graphs',
+'firewall hits' => 'Общее число срабатываний на',
+'firewall hits per' => 'firewallhits per',
+'firewall log' => 'Firewall log',
+'firewall log viewer' => 'Firewall Log Viewer',
+'firewall logs' => 'Журнал Файервола',
+'firewall logs ip' => 'Fw-Logdgraphs (IP)',
+'firewall logs port' => 'Fw-Loggraphs (Port)',
+'firewallhits' => 'firewallhits',
+'firmware' => 'Firmware',
+'firmware upload' => 'Upload Firmware/Drivers',
+'fixed ip lease added' => 'Fixed IP lease added',
+'fixed ip lease modified' => 'Fixed IP lease modified',
+'fixed ip lease removed' => 'Fixed IP lease removed',
+'force update' => 'Force update',
+'force user' => 'force all new file to user',
+'forwarding rule added' => 'Forwarding rule added; restarting forwarder',
+'forwarding rule removed' => 'Forwarding rule removed; restarting forwarder',
+'forwarding rule updated' => 'Forwarding rule updated; restarting forwarder',
+'free' => 'Свободно',
+'free memory' => 'Свободно Памяти    ',
+'free swap' => 'Свободно Swap',
+'frequency' => 'Частота',
+'friday' => 'Пятница',
+'fritzdsl help' => 'To utilise one of Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb modem, you must upload a package to your IPFire box. Please download the tarball corresponding to your version from the IPFire website and then upload the entire <b>fcdsl-(your_version).tgz</b> using the form below.',
+'fritzdsl upload' => 'Upload Fritz!DSL driver',
+'from' => 'От',
+'from email adr' => 'From e-mail address',
+'from email pw' => 'From e-mail password',
+'from email server' => 'From Email server',
+'from email user' => 'From e-mail user',
+'from warn email bad' => 'From e-mail address is not valid',
+'fw blue' => 'Настройки фаервола для BLUE интерфейса',
+'fw logging' => 'Журналирование',
+'g.dtm' => 'TO BE REMOVED',
+'g.lite' => 'TO BE REMOVED',
+'gateway' => 'Gateway',
+'gateway ip' => 'Gateway IP',
+'gen static key' => 'Сгенерировать статический ключ',
+'generate' => 'Сгенерировать root/хост сертификат',
+'generate a certificate' => 'Сгенерировать сертификат:',
+'generate iso' => 'Сгенерировать ISO',
+'generate root/host certificates' => 'Сгенерировать root/хост сертификаты',
+'generate tripwire keys and init' => 'generate tripwire keys and init',
+'generatekeys' => 'Сгенерировать ключи',
+'generatepolicy' => 'Сгенерировать новую палитику',
+'generatereport' => 'Сгенерировать новый отчёт',
+'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Генерация нового root / хост ключа может занять некоторое время.  На старых компьютерах может потребоваться несколько минут. Пожалуйста подождите.',
+'genkey' => 'Generate PSK',
+'genre' => 'Genre',
+'global settings' => 'Общие настройки',
+'gpl i accept these terms and conditions' => 'I accept these terms and conditions',
+'gpl license agreement' => 'License Agreement',
+'gpl please read carefully the general public license and accept it below' => 'Please read carefully the General Public License and accept it below',
+'gpl unofficial translation of the general public license v3' => 'Unofficial translation of the General Public License v3',
+'graph' => 'Graph',
+'graph per' => 'per',
+'green' => 'Green',
+'green interface' => 'Green Интерфейс',
+'guaranteed bandwith' => 'Гарантированная пропускная способность',
+'guardian alertfile' => 'Alertfile',
+'guardian configuration' => 'Настройки защиты',
+'guardian ignorefile' => 'Ignorefile',
+'guardian interface' => 'Интерфейс',
+'guardian logfile' => 'Logfile',
+'guardian timelimit' => 'Ограничение времени',
+'guest ok' => 'Разрешить гостевой доступ',
+'gui settings' => 'Внешний вид',
+'gz with key' => 'Только зашифрованный архив может быть восстановлен на этой машине.',
+'hangup' => 'Отключится',
+'hangup string' => 'Завис:',
+'harddisk temperature' => 'Harddisk temperature',
+'harddisk temperature graphs' => 'hdd temperature graphs',
+'hardware graphs' => 'Железо',
+'hdd temperature in' => 'Harddisk temperature in',
+'help' => 'Help',
+'high' => 'High',
+'high memory usage' => 'High memory usage',
+'hint' => 'Hint:',
+'holdoff' => 'Holdoff time (in seconds)',
+'host' => 'Host',
+'host allow' => 'list with allowed hosts',
+'host certificate' => 'Хост сертификат',
+'host configuration' => 'Конфигурация хоста',
+'host deny' => 'list with denied hosts',
+'host ip' => 'IP адрес хоста',
+'host to net vpn' => 'Host-to-Net Virtual Private Network (RoadWarrior)',
+'hostname' => 'Имя Хоста',
+'hostname and domain already in use' => 'Hostname and domain already in use.',
+'hostname cant be empty' => 'Hostname can\'t be empty.',
+'hostname not set' => 'Hostname not set.',
+'hosts config added' => 'Hosts config added',
+'hosts config changed' => 'Hosts config changed',
+'hour' => 'Час',
+'hours' => 'Часы',
+'hours2' => 'Часы',
+'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
+'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.',
+'icmp type' => 'ICMP Type',
+'id' => 'ID',
+'idle' => 'Idle',
+'idle timeout' => 'Idle timeout (mins; 0 to disable):',
+'idle timeout not set' => 'Idle timeout not set.',
+'ids log viewer' => 'IDS log viewer',
+'ids logs' => 'Журналы IDS',
+'ids preprocessor' => 'IDS preprocessor',
+'ids rules license' => 'Для использования Sourcefire VRT Certified Rules, необходимо зарегистрироваться на ',
+'ids rules license1' => '.',
+'ids rules license2' => 'Подтвердить и активировать аккаунт, пройдя по ссылке, которая будет выслана Вам на e-mail. Затем перейдите в',
+'ids rules license3' => 'нажмите кнопку "Generate code" и скопируйте 40-символьный Oinkcode в поле ниже.',
+'ids rules update' => 'Обновление правил Snort',
+'iface' => 'Iface',
+'ignore filter' => 'фильтр игнора',
+'ike encryption' => 'IKE Encryption:',
+'ike grouptype' => 'IKE Grouptype:',
+'ike integrity' => 'IKE Integrity:',
+'ike lifetime' => 'IKE Lifetime:',
+'ike lifetime should be between 1 and 8 hours' => 'IKE lifetime should be between 1 and 8 hours.',
+'import' => 'Import',
+'importkey' => 'Import PSK',
+'in' => 'In',
+'inactive' => 'inactive',
+'include logfiles' => 'Включить файлы логов',
+'incoming' => 'Входящий',
+'incoming traffic in bytes per second' => 'Incoming Traffic',
+'incorrect password' => 'Incorrect password',
+'info' => 'Info',
+'init string' => 'Init:',
+'insert floppy' => 'Для создания запасной floppy дискеты (backup), установите отформатированную floppy дискету в привод на IpFire и кликните <i>backup to floppy</i> Для сохранения системных настроек. Пожалуйста убедитесь, что данные успешно записаны. Процедура займёт некоторое время.<p>',
+'insert removable device' => 'Подсоедините внешнее устройство',
+'install' => 'Установить',
+'install new update' => 'Установить обновление:',
+'installed' => 'Установлено',
+'installed updates' => 'Установленные обновления:',
+'instant update' => 'Instant Update',
+'interface' => 'Интерфейс',
+'interfaces' => 'Интерфейсы',
+'internet' => 'ИНТЕРНЕТ',
+'intrusion detection' => 'Детектор Влома',
+'intrusion detection system' => 'Система обнаружения попыток взлома',
+'intrusion detection system log viewer' => 'Посмотреть логи Детектора Взлома',
+'intrusion detection system rules' => 'Правила обнаружения взлома',
+'intrusion detection system2' => 'Система обнаружения попыток взлома:',
+'invalid broadcast ip' => 'Недопустимый широковещательный IP',
+'invalid cache size' => 'Недопустимый размер кэша.',
+'invalid characters found in pre-shared key' => 'В pre-shared ключе обнаружены недопустимые символы.',
+'invalid date entered' => 'Введена неверная дата.',
+'invalid default lease time' => 'Неверное время аренды.',
+'invalid domain name' => 'Неверное имя домена.',
+'invalid downlink speed' => 'Invalid downlink speed.',
+'invalid end address' => 'Неверный конечный адрес.',
+'invalid fixed ip address' => 'Неверный статический IP адрес',
+'invalid fixed mac address' => 'Неверный статический MAC адрес',
+'invalid hostname' => 'Неверный имя хоста.',
+'invalid input' => 'Неверный ввод',
+'invalid input for authentication method' => 'Неверно указан метод аутентификации.',
+'invalid input for city' => 'Неверно указан город.',
+'invalid input for country' => 'Неверно указана страна.',
+'invalid input for department' => 'Неверно указано отделение.',
+'invalid input for dhcp dns' => 'Неверно указаны DHCP DNS.',
+'invalid input for dhcp domain' => 'Неверно указан домен DHCP.',
+'invalid input for dhcp wins' => 'Неверно указан DHCP WINS.',
+'invalid input for e-mail address' => 'Неверно указан e-mail.',
+'invalid input for esp keylife' => 'Неверно указан файл ключа ESP.',
+'invalid input for hostname' => 'Неверный имя хоста.',
+'invalid input for ike lifetime' => 'Неверно указан IKE lifetime.',
+'invalid input for keepalive 1' => 'Неверно указан Keepalive ping.',
+'invalid input for keepalive 1:2' => 'Invalid input for Keepalive use at least a ratio of 1:2.',
+'invalid input for keepalive 2' => 'Неверно указан Keepalive ping-restart.',
+'invalid input for max clients' => 'Неверно указано максимальное число клиентов.',
+'invalid input for name' => 'Неверно указано полное имя пользователя или системное имя хоста.',
+'invalid input for oink code' => 'Неверно указан Oink code',
+'invalid input for organization' => 'Неверно указана организация',
+'invalid input for remote host/ip' => 'Неверно указан удалённый хост/ip.',
+'invalid input for state or province' => 'Неверно указан штат или область.',
+'invalid ip' => 'Неверный IP адрес.',
+'invalid keep time' => 'Keep time must be a valid number.',
+'invalid key' => 'Не тот ключ.',
+'invalid loaded file' => 'Загруженный файл кривой.',
+'invalid local-remote id' => 'local & remote id must not be equal and begin with a "@" sign. These are leftid and rightid in strongswan terminology.',
+'invalid logserver address' => 'Неверно указан адрес syslogd сервера.',
+'invalid mac address' => 'Неверно указан MAC адрес.',
+'invalid max lease time' => 'Неверно указано максимальное время аренды.',
+'invalid maximum incoming size' => 'Неверно указан входящий размер.',
+'invalid maximum object size' => 'Неверно указан максимальный размер объекта.',
+'invalid maximum outgoing size' => 'Неверно указан исходящий размер.',
+'invalid md5sum' => 'Неверная сумма MD5.',
+'invalid minimum object size' => 'Неверно указан минимальный размер объекта.',
+'invalid mtu input' => 'Неверный MTU',
+'invalid netmask' => 'Неверно указана маска подсети',
+'invalid port' => 'Неверно указан порт. Укажите реальный номер порта.',
+'invalid port list' => 'Port list syntax is: port[,port]... where port is in /etc/services or number',
+'invalid primary dns' => 'Неверно указан основной DNS.',
+'invalid primary ntp' => 'Неверно указан основной NTP сервер',
+'invalid secondary dns' => 'Неверно указан второй DNS.',
+'invalid secondary ntp' => 'Неверно указан второй NTP сервер',
+'invalid start address' => 'Неверно указан начальный адрес.',
+'invalid time entered' => 'Invalid time entered.',
+'invalid time period' => 'Invalid time period',
+'invalid uplink speed' => 'Invalid uplink speed.',
+'invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting.',
+'invalid users' => 'list with users denied to access',
+'invalid vpi vpci' => 'Invalid VPI/VPCI settings',
+'invalid wins address' => 'Invalid WINS server address.',
+'invert' => 'Инвертировать',
+'ip address' => 'IP адрес',
+'ip address in use' => 'IP address already in use',
+'ip address outside subnets' => 'IP Адрес находится за пределами подсети',
+'ip alias added' => 'External IP alias added',
+'ip alias changed' => 'External IP alias changed',
+'ip alias removed' => 'External IP alias removed',
+'ip info' => 'IP Information',
+'ipfire has now rebooted' => 'IPFire is rebooting now.',
+'ipfire has now shutdown' => 'IPFire is shutting down now.',
+'ipfire side' => 'IPFire side:',
+'ipfire side is invalid' => 'IPFire side is invalid.',
+'ipfires hostname' => 'IPFire\'s Hostname',
+'ipinfo' => 'IP info',
+'iptable rules' => 'IPTable rules',
+'iptmangles' => 'IPTable Mangles',
+'iptnats' => 'IPTable Network Address Translation',
+'ipts' => 'IPTables',
+'isdn' => 'ISDN',
+'isdn settings' => 'Additional ISDN settings:',
+'isdn1' => 'Single ISDN',
+'isdn2' => 'Dual ISDN',
+'january' => 'Январь',
+'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the',
+'javascript menu error2' => 'page.',
+'july' => 'Июль',
+'june' => 'Июнь',
+'kernel' => 'Kernel',
+'kernel logging server' => 'Kernel Logging Сервер',
+'kernel version' => 'Kernel version:',
+'key stuff' => '2. Keys and Certificates',
+'keyreset' => 'Reset Keys',
+'keys' => 'keys',
+'lan' => 'LAN',
+'lang' => 'en',
+'languagepurpose' => 'Select the language you wish IPFire to display in:',
+'last activity' => 'Last Activity',
+'lateprompting' => 'Lateprompting',
+'lease expires' => 'Лизинг истекает',
+'legend' => 'Пояснения',
+'length' => 'Length',
+'line' => 'Line',
+'linkq' => 'Link Quality',
+'load printer' => 'Load Printer',
+'loaded modules' => 'Loaded modules:',
+'local hard disk' => 'Hard disk',
+'local master' => 'Local Master',
+'local ntp server specified but not enabled' => 'Локальный NTP сервер указан, но не включен.',
+'local subnet' => 'Локальная сеть:',
+'local subnet is invalid' => 'Локальная сеть неисправна.',
+'local vpn hostname/ip' => 'Локальное имя VPN хоста /IP',
+'localkey' => 'Localkey',
+'localkeyfile' => 'Localkeyfile',
+'log' => 'Журнал:',
+'log enabled' => 'Логи включены',
+'log level' => 'Log Level',
+'log lines per page' => 'Строк на странице',
+'log server address' => 'Сервер логов:',
+'log settings' => 'Настройки логов',
+'log summaries' => 'Сводки по журналам событий',
+'log summary' => 'Обзор журнала событий',
+'log var messages' => 'Настройки для /var/log/messages:',
+'log view' => 'Log View',
+'log viewer' => 'Менеджер журналов событий',
+'log viewing options' => 'Опции просмотра логов',
+'log-options' => 'Опции лог-файла',
+'loged in at' => 'Logged in at',
+'logging' => 'Logging',
+'logging server' => 'Сервер Логов',
+'loginlogout' => 'Login/Logout',
+'logs' => 'Логи',
+'lookup failed' => 'Reverse lookup failed',
+'loosedirectorychecking' => 'Loosedirectorychecking',
+'low' => 'Low',
+'ls_dhcpd' => 'DHCP сервер:',
+'ls_disk space' => 'Дисковое пространство:',
+'ls_free/swan' => 'VPN:',
+'ls_httpd' => 'HTTP сервер:',
+'ls_init' => 'Init:',
+'ls_kernel' => 'Kernel и Firewall:',
+'ls_modprobe' => 'Загрузчик модулей:',
+'ls_pam_unix' => 'Вход локальных пользователей:',
+'ls_sshd' => 'Вход удалённых пользователей:',
+'ls_syslogd' => 'Syslogd:',
+'mac address' => 'MAC Адрес',
+'mac address deleted' => 'Успешно удалено!',
+'mac address deleted txt' => 'MAC адрес был успешно удалён, но изменения вступят в силу <strong>только после перезагрузки</strong>.',
+'mac address done' => 'Настройки MAC адреса будут сохранены.',
+'mac address error not 00' => 'MAC адрес должен начинаться с 00!',
+'mac address error not valid' => 'Это неправильный MAC адрес!',
+'mac address header' => 'MAC адрес на red0',
+'mac address in use' => 'MAC уже используется',
+'mac address menu' => 'задать MAC адрес',
+'mac address recon' => 'Пытаюсь переподключиться!',
+'mac address saved' => 'Успешно сохранено!',
+'mac address saved txt' => 'MAC адрес был успешно сохранён, но изменения вступят в силу <strong>только после перезагрузки или переподключения</strong>.',
+'mac address title' => 'Medium Access Control Address',
+'mac desc' => 'Здесь можно поменять MAC адрес на red0. Адрес указывается в шеснадцетиричной форме (0-9,a-f), пример: <br /> 00-01-02-0e-b8-d6 или 00:01:02:0e:b8:d6.',
+'mac new' => 'новый MAC адрес:',
+'mac1 new' => 'новый MAC адрес 1 (vdsl-inet):',
+'mac2 new' => 'новый MAC адрес 2 (vdsl-iptv):',
+'magic packet send to:' => 'Magic packet send to:',
+'mailmethod' => 'Метод отправки',
+'mailprogramm' => 'Почтовая программа',
+'main page' => 'Главная страница',
+'manage ovpn' => '5. Tunnel Management:',
+'manage printers' => 'manage printers',
+'manage shares' => 'Manage Shares',
+'manual' => 'Manual',
+'manual control and status' => 'Ручная настройка и статистика:',
+'manually' => 'Вручную',
+'map to guest' => 'Map to Guest',
+'march' => 'Март',
+'marked' => 'Отмечен',
+'max bandwith' => 'Максимальная полоса пропускания',
+'max incoming size' => 'Максимальный входящий размер (KB):',
+'max lease time' => 'Максимальное время аренды (мин.):',
+'max outgoing size' => 'Максимальный исходящий размер (KB):',
+'max reliability' => 'Максимальная надёжность',
+'max renewal time' => 'Максимальное время обновления',
+'max retries not set' => 'Не указано максимальное число попыток.',
+'max size' => 'Максимальный размер объекта (KB):',
+'max throughput' => 'Максимальная пропускная способность',
+'maximal' => 'Максимум',
+'maximum retries' => 'Максимальное число попыток:',
+'may' => 'Май',
+'mbmon display' => 'Показать',
+'mbmon fan' => 'FAN speed',
+'mbmon fan in' => 'Fan speed in',
+'mbmon graphs' => 'mbmon Graphs',
+'mbmon label' => 'Метка',
+'mbmon settings' => 'Настройки mbmongraph',
+'mbmon temp' => 'Temperature',
+'mbmon temp in' => 'Температура в',
+'mbmon value' => 'Значение',
+'mbmon volt' => 'Voltage',
+'meaning' => 'meaning',
+'media' => 'Диски',
+'media information' => 'media information',
+'medium' => 'Medium',
+'memory' => 'Memory',
+'memory information' => 'memory information',
+'memory usage per' => 'Memory Usage per',
+'messages logging' => 'Настройки логов для /var/log/messages',
+'method' => 'Метод:',
+'min costs' => 'Minimum costs',
+'min delay' => 'Минимальная задержка',
+'min size' => 'Минимальный размер объекта (KB):',
+'minimal' => 'Minimal',
+'minutes' => 'Minutes',
+'misc-options' => 'Прочие настройки',
+'missing dat' => 'Encrypted archive not found',
+'missing gz' => 'Unencrypted archive not found',
+'mode' => 'Mode',
+'modem' => 'Modem',
+'modem configuration' => 'Modem configuration',
+'modem on com1' => 'Modem on COM1',
+'modem on com2' => 'Modem on COM2',
+'modem on com3' => 'Modem on COM3',
+'modem on com4' => 'Modem on COM4',
+'modem on com5' => 'Modem on COM5',
+'modem settings have errors' => 'Modem settings have errors',
+'modem speaker on' => 'Modem speaker on:',
+'modify' => 'Изменить',
+'modulation' => 'Модуляция',
+'monday' => 'Понедельник',
+'month' => 'Месяц',
+'monthly firewallhits' => 'monthly firewallhits',
+'monthly start day bad' => 'Monthly start day is not correct',
+'monthly traffic bad' => 'Monthly volume is not correct',
+'monthly volume' => 'Monthly volume',
+'monthly volume start day' => 'First day of monthly period',
+'monthly volume start day short' => 'First day',
+'months' => 'месяцев',
+'more' => 'Больше',
+'mount' => 'Монтировать',
+'mounted on' => 'Смонтирован на',
+'mpfire' => 'Media Player for IPFire',
+'mpfire controls' => 'MPFire Control',
+'mpfire playlist' => 'MPFire Playlist',
+'mpfire scanning' => 'Искать новые файлы',
+'mpfire search' => 'MPFire Search',
+'mpfire songs' => 'MPFire songlist',
+'mpfire webradio' => 'MPFire Webradio',
+'mtu QoS' => 'Это нре изменит глобальные настройки MTU, а только задаёт MTU для QoS.',
+'my new share' => 'Моя новая шара',
+'name' => 'Имя',
+'name is invalid' => 'Неверное имя',
+'name must only contain characters' => 'Имя должно содержать только символы.',
+'name too long' => 'User\'s full name or system hostname is too long',
+'nat-traversal' => 'Nat Traversal:',
+'needreboot' => 'An update requires a restart',
+'net' => 'Сеть',
+'net address' => 'сетевой адрес',
+'net config' => 'Настройка сети',
+'net config type' => 'kind of network configuration',
+'net config type help' => 'GREEN это локальная сеть (LAN), RED это внешний интернет, BLUE аналогичен WLAN, ORANGE представляет собой DMZ.',
+'net to net vpn' => 'Net-to-Net Virtual Private Network',
+'net traffic newversion' => 'New Net-Traffic version is available:',
+'net-traffic configuration' => 'Net-Traffic Configuration',
+'netbios name' => 'Имя Netbios',
+'netmask' => 'Маска подсети',
+'network' => 'Сеть',
+'network added' => 'Custom network added',
+'network configuration' => 'Сетевые настройки',
+'network internal' => 'Сеть (Внутренняя)',
+'network options' => 'Сетевые настройки',
+'network other' => 'Сеть (Другая)',
+'network red' => 'Сеть (Внешняя)',
+'network removed' => 'Custom network removed',
+'network status information' => 'Network Status Information',
+'network time' => 'Настройка внутреннего сервера времени:',
+'network time from' => 'Получать время от сетевого сервера времени',
+'network traffic graphs' => 'Network traffic graphs',
+'network traffic graphs external' => 'Net-Traffic graphs (external)',
+'network traffic graphs internal' => 'Net-Traffic graphs (internal)',
+'network traffic graphs others' => 'Network (others)',
+'network updated' => 'Custom Network updated',
+'networks settings' => 'Firewall - Network settings',
+'new optionsfw later' => 'Your modification(s) will be active on next restart',
+'new optionsfw must boot' => 'You must reboot your IPFire',
+'newer' => 'Новее',
+'next' => 'Следующий',
+'no' => 'Нет',
+'no alcatelusb firmware' => 'No Alcatel USB firmware. Please upload.',
+'no cfg upload' => 'No data was uploaded',
+'no dhcp lease' => 'No DHCP lease has been acquired',
+'no eciadsl synch.bin file' => 'No ECI ADSL synch.bin file. Please upload.',
+'no filter pass' => 'Задайте стандартный класс для нефильтруемых пакетов.',
+'no fritzdsl driver' => 'No Fritz!DSL driver.  Please upload.',
+'no information available' => 'No information available.',
+'no log selected' => 'No log selected',
+'no modem selected' => 'No modem selected',
+'no set selected' => 'No set was selected',
+'no time limit' => 'unlimited time',
+'none found' => 'none found',
+'nonetworkname' => 'No Network Name entered',
+'noservicename' => 'No Service Name entered',
+'not a valid ca certificate' => 'Not a valid CA certificate.',
+'not enough disk space' => 'Not enough disk space',
+'not present' => '<b>Not</b> present',
+'not running' => 'not running',
+'not set' => 'not set',
+'notes' => 'Notes',
+'november' => 'Ноябрь',
+'ntp common settings' => 'Основные настройки',
+'ntp configuration' => 'NTP configuration',
+'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.',
+'ntp server' => 'NTP Сервер',
+'ntp sync' => 'Синхронизация',
+'ntp syncro disabled' => 'NTP синхронизация отключена',
+'ntp syncro enabled' => 'NTP синхронизация включена',
+'ntpd restarted' => 'ntpd перезапущен',
+'number' => 'Number:',
+'o-no' => 'Inactiv',
+'o-yes' => 'Activ',
+'october' => 'Октябрь',
+'off' => 'выкл',
+'ok' => 'OK',
+'older' => 'Старше',
+'on' => 'вкл',
+'online help en' => 'Online help (in english)',
+'only digits allowed in holdoff field' => 'Only digits allowed in holdoff field',
+'only digits allowed in max retries field' => 'Only digits allowed in max retries field.',
+'only digits allowed in the idle timeout' => 'Only digits allowed in the idle timeout.',
+'only red' => 'Only RED',
+'open to all' => 'Override external access to ALL',
+'openssl produced an error' => 'OpenSSL produced an error',
+'openvpn client' => 'OpenVPN Client',
+'openvpn log' => 'OpenVPN Log',
+'openvpn server' => 'OpenVPN Server',
+'optional at cmd' => 'optional AT command',
+'optional data' => '3. Optional Settings:',
+'options' => 'Options',
+'options fw' => 'Настроить Firewall',
+'optionsfw portlist hint' => 'The list of ports has to be comma separated (e.g. 137,138). You can specify up to a maximum of 15 ports per protocol.',
+'optionsfw warning' => 'Modifying these options implies restart of firewall',
+'or' => 'or',
+'orange' => 'ORANGE',
+'organization cant be empty' => 'Organization can\'t be empty.',
+'organization name' => 'Organization Name',
+'organization too long' => 'Organization is too long; it should not be longer than 60 characters.',
+'original' => 'Original',
+'os level' => 'OS Level',
+'other countries' => 'Other countries',
+'other login script' => 'Other login script',
+'otherip' => 'other IP',
+'otherport' => 'other Port',
+'out' => 'Out',
+'outgoing' => 'исходящий',
+'outgoing firewall' => 'Исходящий Firewall',
+'outgoing firewall add ip group' => 'Добавить группу IP адресов',
+'outgoing firewall add mac group' => 'Добавить группу MAC адресов',
+'outgoing firewall edit ip group' => 'Редактировать группу IP адресов',
+'outgoing firewall edit mac group' => 'Редактировать группу MAC адресов',
+'outgoing firewall group error' => 'Группа с таким именем уже существует.',
+'outgoing firewall groups' => 'Группы Firewall\'а',
+'outgoing firewall ip groups' => 'Группы IP адресов исходящего Firewall',
+'outgoing firewall mac groups' => 'Группы MAC адресов исходящего Firewall',
+'outgoing firewall mode0' => 'При использовании этого метода у всех клиентов неограниченный доступ в интернет.',
+'outgoing firewall mode1' => 'При использовании этого метода доступ в интернет разрешён только тем, кто указан в правилах.',
+'outgoing firewall mode2' => 'При использовании этого метода доступ в интернет разрешён всем клиентам, кроме тех, кто указан в правилах.',
+'outgoing firewall outgoing firewall reserved groupname' => 'Данное имя группы зарезервировано системой, укажите другое.',
+'outgoing firewall p2p allow' => 'p2p протокол разрешён',
+'outgoing firewall p2p deny' => 'p2p протокол запрещён',
+'outgoing firewall p2p description 1' => 'Значок',
+'outgoing firewall p2p description 2' => 'означает, что p2p протокол разрешён, а',
+'outgoing firewall p2p description 3' => 'означает, что p2p протокол запрещён.',
+'outgoing firewall reset' => 'Сбросить всё',
+'outgoing firewall view group' => 'Посмотреть группу',
+'outgoing firewall warning' => 'Если не указывать ip или mac, то они будут игнорироваться',
+'outgoing traffic in bytes per second' => 'Исходящий трафик',
+'override mtu' => 'Перезаписать MTU по умолчанию',
+'ovpn' => 'OpenVPN',
+'ovpn con stat' => 'Статистика подключений OpenVPN',
+'ovpn config' => 'Настройки OVPN',
+'ovpn device' => 'Устройство OpenVPN:',
+'ovpn dl' => 'Загрузка настроек OVPN',
+'ovpn log' => 'Журнал OVPN',
+'ovpn on blue' => 'OpenVPN на BLUE',
+'ovpn on orange' => 'OpenVPN на ORANGE',
+'ovpn on red' => 'OpenVPN на RED',
+'ovpn server status' => 'Текущий статус сервера OpenVPN:',
+'ovpn subnet' => 'Подсеть OpenVPN (e.g. 10.0.10.0/255.255.255.0)',
+'ovpn subnet is invalid' => 'Подсеть OpenVPN задана неверно.',
+'ovpn subnet overlap' => 'Подсеть OpenVPN пересекается с: ',
+'ovpn_fastio' => 'Fast-IO',
+'ovpn_fragment' => 'Fragmentsize',
+'ovpn_mssfix' => 'MSSFIX Size',
+'ovpn_mtudisc' => 'MTU-Discovery',
+'ovpn_processprio' => 'Process priority',
+'ovpn_processprioD' => 'Deeply',
+'ovpn_processprioED' => 'Extremely deeply',
+'ovpn_processprioEH' => 'Extremely high',
+'ovpn_processprioEN' => 'More highly than normal',
+'ovpn_processprioH' => 'High',
+'ovpn_processprioLN' => 'More deeply than normal',
+'ovpn_processprioN' => 'Normal',
+'ovpn_processprioVD' => 'Very deeply',
+'ovpn_processprioVH' => 'Very high',
+'ovpnstatus log' => 'OVPN-Status-Log',
+'ovpnsys log' => 'OVPN-System-Log',
+'package failed to install' => 'Package failed to install.',
+'pagerefresh' => 'Page is beeing refreshed, please wait.',
+'pakfire accept all' => 'Do you want to install all packages?',
+'pakfire ago' => 'назад.',
+'pakfire available addons' => 'Доступные Аддоны:',
+'pakfire configuration' => 'Pakfire Configuration',
+'pakfire core update auto' => 'Устанавливать обновления ядра и аддонов автоматически:',
+'pakfire core update level' => 'Уровень обновления системы',
+'pakfire health check' => 'Пинговать зеркало на доступность:',
+'pakfire install description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и <br /> нажмите плюсик для установки.',
+'pakfire install package' => 'Вы собираетесь установить следующие пакеты: ',
+'pakfire installed addons' => 'Установленные Аддоны:',
+'pakfire last core list update' => 'Обновление core-списков',
+'pakfire last package update' => 'Обновление списка пакетов',
+'pakfire last serverlist update' => 'Обновление серверных списков',
+'pakfire last update' => 'Последнее обновление',
+'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
+'pakfire register' => 'Регистрировать на pakfire-сервере:',
+'pakfire system state' => 'Статус системы',
+'pakfire uninstall description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и <br /> нажмите минус для удаления.',
+'pakfire uninstall package' => 'Вы собираетесь удалить следующие пакеты: ',
+'pakfire update daily' => 'Ежедневный поиск обновлений:',
+'pakfire updates' => 'Доступное обновление:',
+'pakfire working' => 'Pakfire работает ... Пожалуйста дождитесь успешного завершения процедуры.',
+'pap or chap' => 'PAP или CHAP',
+'parentclass' => 'Родительский класс',
+'parentclass add' => 'Добавить родительский класс',
+'password' => 'Пароль:',
+'password contains illegal characters' => 'Password contains illegal characters.',
+'password crypting key' => 'Password crypting the key',
+'password not set' => 'Password not set.',
+'password too short' => 'Password is too short.',
+'passwords do not match' => 'Passwords do not match.',
+'passwords must be at least 6 characters in length' => 'Passwords must be at least 6 characters in length',
+'path to directory' => 'path to share',
+'pc' => 'Workstation',
+'pc add' => 'Add workstation',
+'pdc options' => 'PDC options',
+'percentage' => 'Percentage',
+'persistent' => 'Persistent',
+'pfs yes no' => 'Perfect Forward Secrecy (PFS)',
+'phase1 group' => 'Phase1 Group',
+'phonebook entry' => 'Phonebook entry:',
+'ping disabled' => 'Disable ping response',
+'pkcs12 file password' => 'PKCS12 File Password',
+'play' => 'Play',
+'polfile' => 'Polfile',
+'policy' => 'Правила',
+'port' => 'Порт',
+'port forwarding configuration' => 'Настройка перенаправления портов',
+'ports' => 'Порты',
+'portscans' => 'portscancs',
+'pots' => 'Analog classic line',
+'ppp setup' => 'Настройки PPP',
+'pppoe' => 'PPPoE',
+'pppoe settings' => 'Дополнительные настройки PPPoE:',
+'pptp settings' => 'Дополнительные настройки PPTP:',
+'pre-shared key is too short' => 'Pre-shared key is too short.',
+'prefered master' => 'Prefered Master',
+'present' => 'Present',
+'prev' => 'Предыдущий',
+'primary dns' => 'Основной DNS:',
+'primary ntp server' => 'Основной NTP Сервер',
+'primary wins server address' => 'Адрес основного WINS сервера',
+'printcap name' => 'Printercap имя',
+'printer' => 'Принтер',
+'printername' => 'Имя принтера',
+'printing' => 'Printing',
+'printing options' => 'Опции печати',
+'priority' => 'Приоритет',
+'processes' => 'Processes',
+'profile' => 'Профиль',
+'profile deleted' => 'Прифиль удалён: ',
+'profile has errors' => 'В профиле есть ошибки',
+'profile made current' => 'Profile made current: ',
+'profile name' => 'Имя профиля:',
+'profile name not given' => 'Имя профиля не задано.',
+'profile saved' => 'Профиль сохранён: ',
+'profiles' => 'Профили:',
+'proto' => 'Proto',
+'protocol' => 'Протокол:',
+'proxy' => 'Proxy',
+'proxy access graphs' => 'Proxy access graphs',
+'proxy admin password' => 'Cache administrator password',
+'proxy cachemgr' => 'Включить менеджер кэша',
+'proxy errmsg filedescriptors' => 'Wrong amount of filedescriptors',
+'proxy filedescriptors' => 'Кол-во fildescriptors',
+'proxy log viewer' => 'Просмотр журнала Proxy',
+'proxy logs' => 'Журнал Proxy',
+'proxy no proxy extend' => 'or specify a list of not proxied destination',
+'proxy no proxy local' => 'Disallow local proxying on BLUE/GREEN networks',
+'proxy port' => 'Порт Proxy',
+'proxy reconfigure' => 'Сохранить и перезапустить',
+'psk' => 'PSK',
+'pulse' => 'Импульсный',
+'pulse dial' => 'Импульсный набор:',
+'qos add subclass' => 'Добавить подкласс',
+'qos graphs' => 'Qos Graphs',
+'qos warning' => 'Правило <strong>должно</strong> быть сохранено, иначе оно исчезнет совсем!',
+'quick control' => 'Quick Control',
+'quick playlist' => 'Quick Playlist',
+'ram' => 'RAM',
+'read bytes' => 'Read Bytes',
+'read list' => 'list with readonly hosts',
+'real address' => 'Real Доступ',
+'reboot' => 'Перезагрузить',
+'reboot ask' => 'Перезагрузить?',
+'reboot question' => 'Переспрашивать перед перезагрузкой и выключением сервера',
+'reboot schedule' => 'Schedule IPFire reboots',
+'reboot sure' => 'Вы уверенны, что хотите перезагрузить сервер?',
+'rebooting' => 'Перезагружается',
+'rebooting ipfire' => 'IPFire перезагружается',
+'reconnect' => 'Переподключить',
+'reconnection' => 'Переподключение',
+'red' => 'Интернет',
+'references' => 'Ссылки',
+'refresh' => 'Обновить',
+'refresh index page while connected' => 'Обновлять index.cgi при подключении',
+'refresh update list' => 'Refresh update list',
+'registered user rules' => 'Sourcefire VRT rules for registered users',
+'released' => 'Released',
+'reload' => 'reload',
+'remark' => 'Пояснение',
+'remark title' => 'Пояснение:',
+'remote access' => 'Удалённый доступ',
+'remote announce' => 'Remote Announce',
+'remote browse sync' => 'Remote Browse Sync',
+'remote host/ip' => 'Remote host/IP',
+'remote logging' => 'Удалённый сервер логов',
+'remote subnet' => 'Remote subnet:',
+'remote subnet is invalid' => 'Remote subnet is invalid.',
+'removable device advice' => 'Plug in a device, refresh, select and mount before usage. Umount before removal.',
+'remove' => 'Удалить',
+'remove ca certificate' => 'Remove CA certificate',
+'remove x509' => 'Удалить x509',
+'repeat' => 'Repeat',
+'reportfile' => 'Reportfile',
+'reportlevel' => 'Reportlevel',
+'request' => 'Request',
+'requested data' => '1. Connection Settings:',
+'reserved dst port' => 'Destination port is reserved for IPFire use only:',
+'reserved src port' => 'Source port is reserved for IPFire use only:',
+'reset' => 'Сбростить',
+'reset shares' => 'Reset share',
+'resetglobals' => 'Сбросить Общие настройки',
+'resetpolicy' => 'Reset policy to default',
+'resetshares' => 'Reset shares?',
+'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Сброс настроек VPN приведёт к потере root CA, хост сертификатов и всех подключений на этих сертификатах.',
+'restart' => 'Перезапустить',
+'restart ovpn server' => 'Перезапустить сервер OpenVPN',
+'restore' => 'Восстановление',
+'restore defaults' => 'Восстановить исходные настройки',
+'restore hardware settings' => 'Restore hardware settings',
+'restore settings' => 'Reset Settings',
+'reverse sort' => 'Сортировать в обратном хронологическом порядке',
+'root' => 'Root',
+'root certificate' => 'Сертификат Root',
+'root path' => 'Путь от корневой директории',
+'root user password' => 'Root пароль',
+'route subnet is invalid' => 'Additional push route subnet is invalid',
+'router ip' => 'Router IP address:',
+'routing table entries' => 'Записи таблицы маршрутизации:',
+'rsvd dst port overlap' => 'Destination Port Range overlaps a port reserved for IPFire:',
+'rsvd src port overlap' => 'Source Port Range overlaps a port reserved for IPFire:',
+'rules already up to date' => 'Rules already up to date',
+'running' => 'РАБОТАЕТ',
+'safe removal of umounted device' => 'Вы можете безопасно извлечь отмонтированное устройство',
+'samba' => 'Samba',
+'samba status' => 'Статус Samba',
+'saturday' => 'Суббота',
+'save' => 'Сохранить',
+'save config' => 'сохранить настройки',
+'save error' => 'Не получилось сохранить архив настроек',
+'save settings' => 'Сохранить настройки',
+'save-adv-options' => 'Сохранить дополнительные настройки',
+'script name' => 'Имя скрипта:',
+'secondary dns' => 'Второй DNS:',
+'secondary ntp server' => 'Второй NTP сервер',
+'secondary wins server address' => 'Второй WINS сервер',
+'seconds' => 'сек.',
+'section' => 'Раздел',
+'secure shell server' => 'Secure Shell Server',
+'security' => 'Безопасность',
+'security options' => 'Настройки безопасности',
+'select' => 'Выделить',
+'select dest net' => 'Укажите сеть назначения.',
+'select media' => 'Укажите носитель <br />(Для внешних носителей поддерживается только  FAT)',
+'select source net' => 'Select a source net. If you have no ORAGNE or BLUE net configured, you need no DMZ Pinholes.',
+'selecttraffic' => 'Select utilization-overview:',
+'send cr' => 'ISP requires Carriage Return:',
+'send email notification' => 'Enabled, send e-mail notification',
+'send test mail' => 'Послать пробный e-mail',
+'september' => 'Сентябрь',
+'serial' => 'Serial',
+'server reserved' => 'The connection name server is reserved and not allowed',
+'server string' => 'Server String',
+'service' => 'Сервис',
+'service added' => 'Custom network service added',
+'service name' => 'Service name:',
+'service removed' => 'Custom network service removed',
+'service updated' => 'Custom network service updated',
+'servicename' => 'Service Name',
+'services' => 'Сервисы',
+'services settings' => 'Firewall - Services settings',
+'set' => 'set',
+'set time now' => 'Выставить время сейчас',
+'set time now help' => 'Для установки события синхронизации в очередь (даже если Вы используете повторяющееся расписание), нажмите кнопку <i>Выставить время сейчас</i>. Учтите, что может потребоваться до пяти минут и более, прежде чем произойдёт синхронизация.',
+'settings' => 'Настройки',
+'shaping add options' => 'Добавить сервис',
+'shaping list options' => 'Сервис формирования трафика',
+'shared' => 'Общедоступно',
+'sharename' => 'Имя шары',
+'shares' => 'Общие ресурсы',
+'show ajax speedmeter in footer' => 'Показать Ajax speedmeter',
+'show areas' => 'показать области',
+'show ca certificate' => 'Показать CA сертификат',
+'show certificate' => 'Показать сертификат',
+'show crl' => 'Показать список аннулированных сертификатов',
+'show host certificate' => 'Показать Хост сертификат',
+'show last x lines' => 'Показать последние x строк',
+'show lines' => 'Показать строки',
+'show root certificate' => 'Показать root сертификат',
+'show share options' => 'Показать настройки общих ресурсов',
+'shuffle' => 'Перемешать',
+'shutdown' => 'Выключить',
+'shutdown ask' => 'Выключить?',
+'shutdown control' => 'Управление выключением',
+'shutdown sure' => 'Вы уверены, что хотите выключить машину?',
+'shutdown2' => 'Выключение:',
+'shutting down' => 'Выключается',
+'shutting down ipfire' => 'IPFire Выключается',
+'since' => 'с',
+'sitekey' => 'Sitekey',
+'sitekeyfile' => 'Sitekeyfile',
+'size' => 'Размер',
+'smart information' => 'Информация S.M.A.R.T.',
+'smartwarn1' => 'Устройство:',
+'smartwarn2' => 'сообщает об ошибке S.M.A.R.T.',
+'smbreload' => 'Перезагрузить samba',
+'smbrestart' => 'Перезапустить samba',
+'smbstart' => 'Запустить samba',
+'smbstop' => 'Остановить samba',
+'smtphost' => 'SMTP хост',
+'smtpport' => 'SMTP порт',
+'snort hits' => 'Общее число срабатываний правил на',
+'snort working' => 'Snort is working ... Please wait until all operations have completed successfully.',
+'socket options' => 'Socket options',
+'sort ascending' => 'Sort ascending',
+'sort descending' => 'Sort descending',
+'sound' => 'Звук',
+'source' => 'Источник',
+'source ip' => 'IP источника',
+'source ip and port' => 'IP отправителя: Порт',
+'source ip bad' => 'Not a valid IP address or a network address.',
+'source ip in use' => 'IP источника занят:',
+'source ip or net' => 'IP источника или подсеть',
+'source net' => 'Подсеть источника',
+'source network' => 'IP подключающегося клиента или подсети (пустое поле = "для всех"):',
+'source port' => 'Порт источника',
+'source port in use' => 'Порт источника занят:',
+'source port numbers' => 'Порт источника должен быть реальным портом или диапазон портов.',
+'source port overlaps' => 'Диапозон портов источника пересекается с существующим диапазоном.',
+'speaker off' => 'Динамик выключен:',
+'speaker on' => 'Динамик включен:',
+'squid extension methods' => 'Ваш список <tt>extension_methods</tt>',
+'squid extension methods invalid' => 'Your \'extension_methods\' list can only contain uppercase words of letters and digits, separated with a space. ',
+'squid fix cache' => 'Repair cache',
+'src port' => 'Src Port',
+'srcprt range overlaps' => 'Указанный диапазон портов пересекается с ранее указанным портом.',
+'srcprt within existing' => 'Указанный порт уже входит в указаный ранее диапазон портов.',
+'ssdmz pinholes' => 'DMZ Pinholes',
+'ssh access' => 'SSH Доступ',
+'ssh access tip' => 'IPFire SSH не использует порт по умолчанию 222!',
+'ssh fingerprint' => 'Слепок ключа',
+'ssh host keys' => 'SSH Хост-ключи',
+'ssh is disabled' => 'SSH отключен.  Останавливаю.',
+'ssh is enabled' => 'SSH включен.  Перезапускаю.',
+'ssh key' => 'Ключ',
+'ssh key size' => 'Размер (биты)',
+'ssh keys' => 'Разрешить аутентификацию по открытому ключу (public key)',
+'ssh no auth' => 'You have not allowed any authentication methods; this will stop you logging in',
+'ssh passwords' => 'Разрешить аутентификацию по паролю',
+'ssh port' => 'Использовать для SSH порт 22 (по умолчанию используется порт 222)',
+'ssh portfw' => 'Разрешить перенаправление TCP трафика',
+'ssh tempstart15' => 'Остановить SSH демон через 15 минут',
+'ssh tempstart30' => 'Остановить SSH демон через 30 минут',
+'ssh1 disabled' => 'SSHv1 is disabled, a version 2 client will be required.',
+'ssh1 enabled' => 'SSHv1 is enabled, old clients will be supported.',
+'ssh1 support' => 'Support SSH protocol version 1 (required only for old clients)',
+'ssnetwork status' => 'Статус сети',
+'sspasswords' => 'Пароли',
+'ssport forwarding' => 'Перенаправление портов',
+'ssproxy graphs' => 'Proxy Graphs',
+'sssystem status' => 'Статус системы',
+'sstraffic' => 'Сетевой трафик',
+'sstraffic graphs' => 'Traffic Graphs',
+'standard login script' => 'Standard login script',
+'start' => 'Запустить',
+'start address' => 'Начальный адрес:',
+'start ovpn server' => 'Запустить сервер OpenVPN',
+'state or province' => 'Штат или область',
+'static ip' => 'Статический IP',
+'status' => 'Статус',
+'status information' => 'Информация о статусе',
+'status ovpn' => '4. OpenVPN статус / Настройка:',
+'std classes' => 'Standardclasses',
+'stop' => 'Стоп',
+'stop ovpn server' => 'Остановить сервер OpenVPN',
+'stopped' => 'ОСТАНОВЛЕН',
+'subject' => 'Содержание',
+'subject test' => 'Teste-mail',
+'subject warn' => 'Warning - warnlevel reached',
+'subnet' => 'Subnet',
+'subnet is invalid' => 'Netmask is invalid',
+'subscripted user rules' => 'Sourcefire VRT rules with subscription',
+'successfully refreshed updates list' => 'Successfully refreshed updates list.',
+'summaries kept' => 'Хранить',
+'sunday' => 'Воскресенье',
+'swap' => 'Swap',
+'swap usage per' => 'Swap usage per',
+'system' => 'Система',
+'system graphs' => 'System Graphs',
+'system information' => 'Информация о системе',
+'system log viewer' => 'System Log Viewer',
+'system logs' => 'Системные журналы',
+'system status information' => 'System Status Information',
+'telephone not set' => 'Telephone not set.',
+'template' => 'Задать',
+'template warning' => 'У Вас есть две опции для установки Qos. Первая - нажать кнопку сохранения и сгенерировать классы и правила самостоятельно. Вторая - задать правила по шаблону.',
+'test' => 'проверка',
+'test email could not be sent' => 'Could not sent Testemail',
+'test email was sent' => 'Testemail was send successfully',
+'the following update was successfully installed' => 'The following update was successfully installed',
+'the statistics were last updated at' => 'The statistics were last updated at',
+'theme' => 'Тема оформления',
+'there are updates' => 'There are updates available for your system. Please go to the "updates" section for more information.',
+'there are updates available' => 'There are updates available for your system. It is strongly urged that you install them as soon as possible.',
+'there was no file upload' => 'There was no file upload.',
+'this feature has been sponsored by' => 'This feature has been sponsored by',
+'this field may be blank' => 'Эти поля могут остаться пустыми.',
+'this is not a valid archive' => 'This is not a valid archive.',
+'this is not an authorised update' => 'This is not an authorised update.',
+'this months volume' => 'This months volume',
+'this update is already installed' => 'This update is already installed.',
+'this weeks volume' => 'This weeks volume',
+'thursday' => 'Четверг',
+'time' => 'Время',
+'time date manually reset' => 'Ручной сброс Времени/Даты.',
+'time server' => 'Сервер времени NTP',
+'timeout must be a number' => 'Таймаут должен быть числом.',
+'title' => 'Заголовок',
+'to' => 'До',
+'to email adr' => 'На e-mail адрес',
+'to install an update' => 'Для установки обновления укажите файл .tgz.gpg:',
+'to warn email bad' => 'Неверно указан e-mail',
+'toggle' => 'пауза/возобновить',
+'toggle enable disable' => 'Разрешить / запретить',
+'tone' => 'тональный',
+'tone dial' => 'Тональный набор:',
+'too long 80 char max' => ' слишком длинный, максимально разрешено 80 символов',
+'total connection time' => 'Total connection time',
+'total hits for log section' => 'Общее число записей',
+'traffic back' => 'Back',
+'traffic calc time' => 'Time of calculation',
+'traffic calc time bad' => 'Calculation time is not correct',
+'traffic info messages' => 'Info messages',
+'traffic monitor' => 'Traffic Monitor',
+'traffic on' => 'Traffic on',
+'traffic shaping' => 'Traffic Shaping',
+'traffic shaping settings' => 'Traffic Shaping Settings',
+'traffic warn level bad' => 'Warnlevel is not correct',
+'trafficblue' => 'WLAN',
+'trafficdate' => 'Дата',
+'trafficfrom' => 'C',
+'trafficgreen' => 'Внутренняя сеть',
+'trafficin' => 'Input',
+'trafficorange' => 'DMZ',
+'trafficout' => 'Output',
+'trafficred' => 'Интернет',
+'traffics' => 'Обзор используемых ресурсов:',
+'trafficsum' => 'Totals',
+'trafficto' => 'До',
+'transfer limits' => 'Transfer limits',
+'transparent on' => 'Transparent on',
+'tripwire' => 'Tripwire',
+'tripwire cronjob' => 'tripwire cronjob',
+'tripwire functions' => 'tripwire functions',
+'tripwire reports' => 'tripwire reports',
+'tripwireoperating' => 'The process was started. This may take serverall minutes, please wait the window will automaticly refresh after the process has finished.',
+'tripwirewarningdatabase' => 'WARNING - Your database will be updated with the data of the last report. Please ensure that no unauthorized changes are reported. Therefor the local-key is needed.',
+'tripwirewarningkeys' => 'WARNING - This will erase your current keys, config, and database and generate them new.',
+'tripwirewarningpolicy' => 'WARNING - Your policy will be rebuild, after that your database will be reinitalised. Therefor the site-key and the local-key are neeeded.',
+'tuesday' => 'Вторник',
+'type' => 'Тип',
+'umount' => 'Umount',
+'umount removable media before to unplug' => 'Umount removable media before unplugging the device',
+'unable to alter profiles while red is active' => 'Unable to alter profiles while RED is active.',
+'unable to contact' => 'Unable to contact',
+'unencrypted' => 'Unencrypted',
+'uninstall' => 'Uninstall',
+'unix charset' => 'UNIX Charset',
+'unix group' => ' UNIX usergroup',
+'unix password sync' => 'Unix Password Sync',
+'unix shell' => 'UNIX Shell',
+'unknown' => 'НЕ ИЗВЕСТНО',
+'unnamed' => 'Без Имени',
+'update' => 'Обновить',
+'update accelerator' => 'Ускоритель обновления',
+'update time' => 'Обновить время:',
+'update transcript' => 'Update transcript',
+'updatedatabase' => 'Update Database with last report',
+'updates' => 'Updates',
+'updates installed' => 'Набор правил от',
+'updates is old1' => 'Your update file is ',
+'updates is old2' => 'days old. We recommend you update it on the <b>System>Updates</b> page.',
+'updxlrtr 3 months' => 'three months',
+'updxlrtr 6 months' => 'six  months',
+'updxlrtr all files' => 'all files ...',
+'updxlrtr cache dir' => 'Директория кэша',
+'updxlrtr cache maintenance' => 'Управление Кэшем',
+'updxlrtr cache size' => 'Cache size (bytes)',
+'updxlrtr cache statistics' => 'Cache statistics',
+'updxlrtr cancel download' => 'Cancel download',
+'updxlrtr children' => 'Number of accelerator processes',
+'updxlrtr common settings' => 'Основные настройки',
+'updxlrtr condition download' => 'Закачка',
+'updxlrtr condition nosource' => 'No source',
+'updxlrtr condition ok' => 'Последний',
+'updxlrtr condition outdated' => 'Устарел',
+'updxlrtr condition suspended' => 'Расширенный',
+'updxlrtr condition unknown' => 'Неизвестно',
+'updxlrtr configuration' => 'Настройки ускорителя обновлений',
+'updxlrtr current downloads' => 'Файлы для загрузки в локальный кэш',
+'updxlrtr current files' => 'Текущие файлы в кэше',
+'updxlrtr daily' => 'daily',
+'updxlrtr data from cache' => 'Данные кэша (байты)',
+'updxlrtr disk usage' => 'Использование дисков',
+'updxlrtr efficiency index' => 'Индекс эффективности кэша',
+'updxlrtr empty repository' => 'Локальный кэш пуст',
+'updxlrtr enable autocheck' => 'Автопроверка источника',
+'updxlrtr enable log' => 'Записывать логи',
+'updxlrtr filename' => 'Имя',
+'updxlrtr files' => 'Файлы',
+'updxlrtr filesize' => 'Размер',
+'updxlrtr full autosync' => 'Заменить старые файлы во время проверки',
+'updxlrtr invalid disk usage' => 'Неверное значение максимума использования диска',
+'updxlrtr invalid download rate' => 'Недопустимое значение максимальной скорости загрузки',
+'updxlrtr invalid num of children' => 'Неверное количество процессов ускорителя',
+'updxlrtr last access' => 'Последнее обращение к кэшу',
+'updxlrtr last checkup' => 'Последняя проверка',
+'updxlrtr low download priority' => 'Снизить CPU приоритет для загрузки',
+'updxlrtr maintenance' => 'Управление',
+'updxlrtr marked as' => 'отмечен как',
+'updxlrtr max disk usage' => 'Максимальное использование диска',
+'updxlrtr max download rate' => 'Максимальная скорость загрузки (kBit/s)',
+'updxlrtr month' => 'один месяц',
+'updxlrtr monthly' => 'Ежемесячно',
+'updxlrtr not accessed' => 'Не обращались с',
+'updxlrtr not enabled' => 'Ускоритель обновлений не активирован на странице настроек web proxy',
+'updxlrtr other' => 'Другой',
+'updxlrtr passive mode' => 'Разрешить пасивный режим',
+'updxlrtr pending downloads' => 'Ожидание загрузки',
+'updxlrtr performance options' => 'Настройки производительности',
+'updxlrtr progress' => 'Прогресс',
+'updxlrtr purge' => 'Очистка',
+'updxlrtr remove file' => 'Удалить из кэша',
+'updxlrtr save and restart' => 'Сохранить и перезапустить',
+'updxlrtr source' => 'Источник',
+'updxlrtr source checkup' => 'Проверка источника',
+'updxlrtr source checkup schedule' => 'Расписание проверок источника',
+'updxlrtr statistics' => 'Статистика',
+'updxlrtr statistics by source' => 'Статистика по источникам',
+'updxlrtr summary' => 'Итого',
+'updxlrtr total cache size' => 'Общий объём кэша (bytes)',
+'updxlrtr total data from cache' => 'Общий объём использованных данных кэша (bytes)',
+'updxlrtr total files' => 'Общее число файлов в кэше',
+'updxlrtr unknown' => 'Неизвестно',
+'updxlrtr update accelerator' => 'Ускоритель обновлений',
+'updxlrtr update information' => 'Имеется обновлённая версия. Зайдите на <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> для получения полной информации.',
+'updxlrtr update notification' => 'Уведомление об обновлении!',
+'updxlrtr web proxy service required' => 'Необходимо включить сервис Web proxy для работы ускорителя обновлений',
+'updxlrtr week' => 'одна неделя',
+'updxlrtr weekly' => 'еженедельно',
+'updxlrtr year' => 'один год',
+'upgrade' => 'Апгрейд',
+'uplink speed' => 'Исходящая скорость подключения (kbit/sec)',
+'uplink std class' => 'uplink standard class',
+'upload' => 'Отдача',
+'upload a certificate' => 'Upload a certificate:',
+'upload a certificate request' => 'Upload a certificate request:',
+'upload ca certificate' => 'Загрузить CA сертификат',
+'upload fcdsl.o' => 'TO BE REMOVED',
+'upload file' => 'Upload file',
+'upload new ruleset' => 'Upload new ruleset',
+'upload p12 file' => 'Upload PKCS12 file',
+'upload static key' => 'Upload a static key',
+'upload successful' => 'Upload successful.',
+'upload synch.bin' => 'Upload synch.bin',
+'upload update file' => 'Upload update file:',
+'upstream password' => 'Upstream password:',
+'upstream proxy host:port' => 'Upstream proxy (host:port)',
+'upstream username' => 'Upstream username:',
+'uptime and users' => 'Uptime and users:',
+'url filter' => 'Контентный Фильтр',
+'urlfilter access' => 'Доступ',
+'urlfilter activity detection' => 'Activity detection',
+'urlfilter add new time constraint rule' => 'Add new time constraint rule',
+'urlfilter add new user quota rule' => 'Add new user quota rule',
+'urlfilter add rule' => 'Add',
+'urlfilter advanced settings' => 'Расширенные настройки',
+'urlfilter allow' => 'Allow',
+'urlfilter allow access' => 'Allow access',
+'urlfilter allowed domains' => 'Разрешённые домены (один на строчку)',
+'urlfilter allowed urls' => 'Разрешённые URLы (один на строчку)',
+'urlfilter assigned quota users' => 'Назначенные пользователи (один на строчку)',
+'urlfilter assigned users' => 'Назначенные пользователи',
+'urlfilter automatic blacklist update' => 'Автоматически обновлять чёрный список',
+'urlfilter automatic update schedule' => 'Автоматически обновлять расписание',
+'urlfilter back to main page' => 'Назад, к главной странице',
+'urlfilter background image' => 'Картинка для URL фильтра',
+'urlfilter background text' => 'Для использования картинки на заблокированной странице, загрузите .jpg файл ниже',
+'urlfilter backup' => 'Создать резервную копию',
+'urlfilter backup error' => 'Не получилось создать бэкап',
+'urlfilter backup settings' => 'Резервная копия настроек URL фильтра',
+'urlfilter banned clients' => 'Заблокированные IP адреса',
+'urlfilter blacklist age 1' => 'Последнее успешное обновление чёрного списка было',
+'urlfilter blacklist age 2' => 'Дней назад',
+'urlfilter blacklist category name' => 'Название категории чёрного списка',
+'urlfilter blacklist editor' => 'Редактор чёрного списка',
+'urlfilter blacklist editor info' => 'Создать и редактировать Ваши собственные файлы чёрного списка',
+'urlfilter blacklist name' => 'Название чёрного списка',
+'urlfilter blacklist update' => 'Обновление чёрного списка',
+'urlfilter block' => 'Блокировать',
+'urlfilter block access' => 'Блокировать доступ',
+'urlfilter block all' => 'Блокировать все не разрешённые явно URLы',
+'urlfilter block archives' => 'Блокировать сжатые архивы файлов',
+'urlfilter block audio-video' => 'Блокировать аудио/видео файлы',
+'urlfilter block categories' => 'Блокируемые категории',
+'urlfilter block executables' => 'Блокировать исполняемые файлы',
+'urlfilter block ip' => 'Блокированные сайты по IP адресам',
+'urlfilter block settings' => 'Настройки страницы блокировки',
+'urlfilter blocked domains' => 'Блокировать домены (один на строчку)',
+'urlfilter blocked expressions' => 'Блокированные выражения (как регулярные выражения)',
+'urlfilter blocked urls' => 'Блокировать URLы (один на строчку)',
+'urlfilter category' => 'Категория',
+'urlfilter category all' => 'any',
+'urlfilter category data error' => 'Чёрный список пуст',
+'urlfilter category log' => 'Разбить лог по категориям',
+'urlfilter category name error' => 'Требуется ввести название категории чёрного списка',
+'urlfilter client' => 'Client',
+'urlfilter configuration' => 'Конфигурация URL фильтров',
+'urlfilter constraint definition' => 'Определение',
+'urlfilter constraint outside' => 'outside',
+'urlfilter constraint within' => 'within',
+'urlfilter copy rule' => 'Копировать',
+'urlfilter current files' => 'Текущие файлы в локальном репозитории',
+'urlfilter custom blacklist' => 'Пользовательский чёрный список',
+'urlfilter custom expression list' => 'Пользовательский список выражений',
+'urlfilter custom url' => 'Пользовательский source URL',
+'urlfilter custom url required' => 'Custom source URL required',
+'urlfilter custom whitelist' => 'Пользовательский белый список',
+'urlfilter daily' => 'Ежедневно',
+'urlfilter disabled' => 'Выключен',
+'urlfilter domains' => 'Домены (Один на строчку)',
+'urlfilter dont restart urlfilter' => 'Не перезапускайте URL фильтры',
+'urlfilter dst' => 'Destination',
+'urlfilter dst error' => 'Как минимум одна категория должна быть выделена',
+'urlfilter edit domains urls expressions' => 'Редактировать домены, URLы и выражения',
+'urlfilter edit time constraint rule' => 'Редактировать существующие временные ограничения',
+'urlfilter edit user quota rule' => 'Редактировать существующие пользовательские квоты',
+'urlfilter empty ads' => 'Блокировать рекламу с пустыми окнами',
+'urlfilter empty repository' => 'Локальный файловый репозиторий пуст',
+'urlfilter enable automatic blacklist update' => 'Разрешить автоматическое обновление',
+'urlfilter enable custom blacklist' => 'Разрешить пользовательский чёрный список',
+'urlfilter enable custom expression list' => 'Разрешить пользовательский список выражений',
+'urlfilter enable custom whitelist' => 'Разрешить пользовательский белый список',
+'urlfilter enable expression lists' => 'Разрешить списки выражений',
+'urlfilter enable full backup' => 'Включить полный чёрный список',
+'urlfilter enable jpeg' => 'Разрешить фоновое изображение',
+'urlfilter enable log' => 'Включить лог',
+'urlfilter enable rewrite rules' => 'Разрешить перенаправление локальных файлов',
+'urlfilter enabled' => 'Разрешено:',
+'urlfilter example' => 'Пример: www.domain.com',
+'urlfilter example ads' => 'Пример: www.domain.com/ads/',
+'urlfilter export blacklist' => 'Экспортировать чёрный список',
+'urlfilter export error' => 'Не получилось создать файл экспорта',
+'urlfilter expressions' => 'Выражения (одно на строчку)',
+'urlfilter file ext block' => 'Блокировка расширений файлов',
+'urlfilter filename' => 'Имя',
+'urlfilter filesize' => 'Size',
+'urlfilter filter settings' => 'Настройки URL фильтра',
+'urlfilter fri' => 'F',
+'urlfilter friday' => 'Пт',
+'urlfilter from' => 'С',
+'urlfilter hourly' => 'hourly',
+'urlfilter import blacklist' => 'Импортировать чёрный список',
+'urlfilter import text' => 'Чтобы импортировать предварительно сохранённый файл редактора чёрного списка, Укажите .tar.gz файл ниже',
+'urlfilter install blacklist' => 'Установить Чёрный список',
+'urlfilter install information' => 'Чёрный список будет автоматически дополнен для Базы Данных. На это может потребоваться некоторое время, в зависимости от размера файла.',
+'urlfilter invalid content' => 'Файл чёрного списка не совместим со squidGuard',
+'urlfilter invalid import file' => 'Неверный файл редактора URL фильтров чёрного списка',
+'urlfilter invalid ip or mask error' => 'Неверный IP адрес или маска подсети',
+'urlfilter invalid restore file' => 'Неправильный файл резервной копии URL фильтра',
+'urlfilter invalid user error' => 'Неверное имя пользователя',
+'urlfilter load blacklist' => 'Загрузить чёрный список',
+'urlfilter local file redirection' => 'Перенаправление локальных файлов',
+'urlfilter log' => 'urlfilter log',
+'urlfilter log summary' => 'Общее число срабатываний URL фильтра на',
+'urlfilter log viewer' => 'Просмотр логов URL фильтров',
+'urlfilter logs' => 'Логи URL фильтров',
+'urlfilter maintenance' => 'Обслуживание URL фильтров',
+'urlfilter manage local file repository' => 'Управление локальным файловым репозиторием',
+'urlfilter manage repository' => 'Управление репозиторием',
+'urlfilter minutes' => 'minutes',
+'urlfilter mode allow' => 'Разрешить',
+'urlfilter mode block' => 'Блокировать',
+'urlfilter mon' => 'M',
+'urlfilter monday' => 'Пон',
+'urlfilter monthly' => 'ежемесячно',
+'urlfilter msg text 1' => 'Первая строчка сообщения',
+'urlfilter msg text 2' => 'Вторая строчка сообщения',
+'urlfilter msg text 3' => 'Третья строчка сообщения',
+'urlfilter network access control' => 'Контроль сетевого доступа',
+'urlfilter no categories' => 'Нет доступных категорий',
+'urlfilter not enabled' => 'URL не включен на странице Web proxy',
+'urlfilter quota restart message' => 'Обратите внимание: Контент будет сброшен для всех пользователей при перезапуске URL фильтра',
+'urlfilter quota time error' => 'Неверное значение временной квоты',
+'urlfilter quota user error' => 'Необходим как минимум один username',
+'urlfilter redirectpage' => 'Перенаправить на этот URL',
+'urlfilter remove file' => 'Удалить файл из репозитория',
+'urlfilter renewal' => 'Обновление',
+'urlfilter renewal period' => 'Период обновления',
+'urlfilter repository information' => 'Запросы на загрузку этих файлов будут перенаправлены с оригинального источника на локальный файловый репозиторий.',
+'urlfilter reset' => 'Сбросить',
+'urlfilter restart' => 'Перезапустить URL фильтр',
+'urlfilter restart message' => 'URL фильтр должен быть перезапущен для активации изменений в правилах.',
+'urlfilter restart notification' => 'Активировать изменённые правила',
+'urlfilter restore' => 'Импортировать файлы резервной копии',
+'urlfilter restore results' => 'Восстановить результаты',
+'urlfilter restore settings' => 'Восстановить настройки URL фильтров',
+'urlfilter restore success' => 'Конфигурация URL фильтров была восстановлена. URL фильтры должны быть перезапущены для активации новых настроек.',
+'urlfilter restore text' => 'Для восстановления ранее сохранённой конфигурации загрузите резервную копию .tar.gz ',
+'urlfilter safesearch' => 'Включить функцию SafeSearch',
+'urlfilter sat' => 'S',
+'urlfilter saturday' => 'Суб',
+'urlfilter save and restart' => 'Сохранить и перезагрузить',
+'urlfilter save schedule' => 'Сохранить настройки обновления',
+'urlfilter select blacklist' => 'Указать существующий чёрный список',
+'urlfilter select multi' => 'Зажмите ctrl для выделения нескольких категорий',
+'urlfilter select source' => 'Указать источник загрузки',
+'urlfilter set time constraints' => 'Задать временные ограничения',
+'urlfilter set user quota' => 'Задать квоту пользователю',
+'urlfilter show category' => 'Отображать категории на блокированной странице',
+'urlfilter show dnserror' => 'Использовать "DNS error" для блокировки URLов',
+'urlfilter show ip' => 'Показать IP на блокированной странице',
+'urlfilter show url' => 'Показать URL на блокированной странице',
+'urlfilter source' => 'Source host(s) or network(s)',
+'urlfilter src' => 'Source',
+'urlfilter src error' => 'Источник не может быть пустым',
+'urlfilter sun' => 'S',
+'urlfilter sunday' => 'Воск',
+'urlfilter tar error' => 'Не получилось извлечь данные из tar архива',
+'urlfilter thu' => 'T',
+'urlfilter thursday' => 'Чт',
+'urlfilter time' => 'Время',
+'urlfilter time quota' => 'Временная квота',
+'urlfilter time space' => 'Временное пространство',
+'urlfilter timebased access control' => 'Управление повременным доступом',
+'urlfilter timespace error' => 'Ошибка в указанном временном диапазоне',
+'urlfilter to' => 'До',
+'urlfilter tue' => 'T',
+'urlfilter tuesday' => 'Вт',
+'urlfilter unfiltered clients' => 'Нефильтруемые IP адреса',
+'urlfilter update information' => 'Доступна обновлённая версия. Зайдите на <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> Для получения информации.',
+'urlfilter update notification' => 'Update notification!',
+'urlfilter update now' => 'Обновить сейчас',
+'urlfilter update results' => 'Результаты обновления чёрного списка',
+'urlfilter update rule' => 'Обновить',
+'urlfilter upload background' => 'Загрузить изображение',
+'urlfilter upload blacklist' => 'Загрузить чёрный список',
+'urlfilter upload file' => 'Загрузить файл',
+'urlfilter upload file information 1' => 'Обратите внимание',
+'urlfilter upload file information 2' => 'URL фильтр необходимо перезагрузить для активации изменений в репозитории.',
+'urlfilter upload file text' => 'Укажите файл для загрузки в репозиторий',
+'urlfilter upload information' => 'Новый чёрный список будет автоматически дополнен для Базы Данных. На это может потребоваться несколько минут, в зависимости от размера файла. Пожалуйста дождитесь окончания процедуры прежде чем перезапустить URL фильтр.',
+'urlfilter upload success' => 'Blacklist upload successfully completed.',
+'urlfilter upload text' => 'Для установки обновлённого чёрного списка, загрузите .tar.gz файл ниже',
+'urlfilter url filter' => 'URL фильтр',
+'urlfilter urlfilter blacklist editor' => 'Редактор чёрного списка URL фильтров',
+'urlfilter urls' => 'URLы (один на строчку)',
+'urlfilter user time quota' => 'Повременная квота (в минутах)',
+'urlfilter username' => 'Имя пользователя',
+'urlfilter username log' => 'Лог по пользователю',
+'urlfilter web proxy service required' => 'Для использования URL фильтров Web proxy должен быть включен.',
+'urlfilter wed' => 'W',
+'urlfilter wednesday' => 'Ср',
+'urlfilter weekday error' => 'Должен быть указан хотя бы один день',
+'urlfilter weekly' => 'Еженедельно',
+'urlfilter whitelist always allowed' => 'Разрешить пользовательский белый список для забаненых клиентов',
+'urlfilter wrong filetype' => 'File has not the extension .tar.gz',
+'usb modem on acm0' => 'USB Модем на ACM0',
+'usb modem on acm1' => 'USB Модем на ACM1',
+'usb modem on acm2' => 'USB Модем на ACM2',
+'usb modem on acm3' => 'USB Модем на ACM3',
+'use' => 'Use',
+'use a pre-shared key' => 'Use a pre-shared key:',
+'use dov' => 'Use data over voice (DOV):',
+'use ibod' => 'Use Bandwidth on Demand (iBOD):',
+'use ipfire red ip' => 'Для подключения IPFire использует классический RED IP',
+'use only proposed settings' => 'Пожалуйста используйте только предлагаемые настройки.',
+'used' => 'Использовано',
+'used memory' => 'Использовано памяти    ',
+'used swap' => 'Использовано Swap',
+'user' => 'Пользователь',
+'user log' => 'Журнал пользователя',
+'user proxy logs' => 'Журнал proxy пользователя',
+'username' => 'Имя пользователя:',
+'username not set' => 'Имя пользователя не задано.',
+'users department' => 'User\'s department',
+'users email' => 'User\'s E-mail address',
+'users fullname or system hostname' => 'User\'s full name or system hostname',
+'valid root certificate already exists' => 'A valid root certificate already exists.',
+'valid till' => 'Действительно до',
+'vci number' => 'VCI number:',
+'view log' => 'view log',
+'virtual address' => 'Virtual Address',
+'virtual private networking' => 'Виртуальная частная сеть',
+'visible in browselist' => 'visible in browselist',
+'voldown10' => 'Decrease volume by 10',
+'voldown5' => 'Decrease volume by 5',
+'volup10' => 'Increase volume by 10',
+'volup5' => 'Increase volume by 5',
+'vpi number' => 'VPI number:',
+'vpn' => 'VPN',
+'vpn aggrmode' => 'IKE aggressive mode allowed. Avoid if possible (preshared key is transmitted in clear text)!',
+'vpn altname syntax' => 'SubjectAltName is a comma separated list of e-mail, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>e-mail:</b>ipfire@foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something',
+'vpn auth-dn' => 'Peer is identified by either IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field',
+'vpn configuration main' => 'VPN configuration - Main',
+'vpn delayed start' => 'Задержка перед запуском VPN (в секундах)',
+'vpn delayed start help' => 'Если требуется, эту задержку можно использовать для корректной работы DNS во время динамического обновления. Стандартно ставится 60, когда RED на динамическом IP.',
+'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed',
+'vpn local id' => 'Local ID',
+'vpn missing remote id' => 'You must specify a correct Distinguished Name (DN) for this authentication.',
+'vpn mtu invalid' => 'MTU must be a numeric value!',
+'vpn no full pki' => 'missing private key to generate cert',
+'vpn on blue' => 'VPN on BLUE',
+'vpn on green' => 'VPN on GREEN',
+'vpn on orange' => 'VPN on ORANGE',
+'vpn payload compression' => 'Negotiate payload compression',
+'vpn red name' => 'Внешний IP или FQDN для RED интерфейса или <%defaultroute>',
+'vpn remote id' => 'Удалённый ID',
+'vpn subjectaltname' => 'Subject Alt Name',
+'vpn vhost' => 'Roadwarrior virtual IP (sometimes called Inner-IP)',
+'vpn watch' => 'Перезапускать net-to-net vpn когда удалённый IP меняется (dyndns).',
+'waiting to synchronize clock' => 'Ожидается синхронизация',
+'warn when traffic reaches' => 'Предупреждать когда трафик возрастает до x %',
+'warning messages' => 'Warning messages',
+'was deleted' => 'was deleted',
+'web hits' => 'Общее число сайтов, попавших под критерии фильтра на',
+'web proxy' => 'Web Proxy',
+'web proxy configuration' => 'Web proxy configuration',
+'web server' => 'Web Server',
+'webradio playlist' => 'Webradio Playlist',
+'website' => 'Веб-Сайт',
+'wednesday' => 'Среда',
+'week' => 'Неделя',
+'weekly firewallhits' => 'weekly firewallhits',
+'weeks' => 'Недели',
+'wildcards' => 'Wildcards',
+'wins server' => 'Сервер Wins',
+'wins support' => 'Поддержка Wins',
+'wireless' => 'Wireless',
+'wireless config added' => 'Wireless config added',
+'wireless config changed' => 'Wireless config changed',
+'wireless configuration' => 'Wireless Configuration',
+'wlanap access point' => 'Access Point',
+'wlanap channel' => 'Channel',
+'wlanap debugging' => 'Debugging',
+'wlanap del interface' => 'Remove selected interface?',
+'wlanap encryption' => 'Encryption',
+'wlanap informations' => 'Informations',
+'wlanap interface' => 'Select interface',
+'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Must be between 8 and 63 characters.',
+'wlanap link dhcp' => 'Wireless lan DHCP configuration',
+'wlanap link wireless' => 'Activate wireless lan clients',
+'wlanap no interface' => 'Selected interface is not a wirless lan card!',
+'wlanap none' => 'none',
+'wlanap notifications' => 'Notifications',
+'wlanap select interface' => 'Please select the wireless lan interface.',
+'wlanap verbose' => 'Verbose',
+'wlanap warnings' => 'Warnings',
+'wlanap wlan card' => 'WLan Card',
+'wlanap wlan services' => 'WLan Services',
+'wlanap wlan settings' => 'WLan Settings',
+'wlanap wlan status' => 'WLan Status',
+'wol wakeup' => 'WakeUp',
+'workgroup' => 'Workgroup',
+'written bytes' => 'Writen Bytes',
+'xtaccess all error' => 'You cannot set an external access to ALL, that is done in the port forwarding record.',
+'xtaccess bad transfert' => 'If you specify a port destination range, the source range must be identical !',
+'year' => 'Год',
+'yearly firewallhits' => 'yearly firewallhits',
+'yes' => 'Да',
+'you can only define one roadwarrior connection when using pre-shared key authentication' => 'You can only define one Roadwarrior connection when using pre-shared key authentication.<br />Either you already have a Roadwarrior connection with pre-shared key authentication, or you\'re trying to add one now.',
+'your department' => 'Your department',
+'your e-mail' => 'Your e-mail address',
+);
+
+#EOF

diff --git a/langs/ru/install/lang_ru.c b/langs/ru/install/lang_ru.c
new file mode 100644 (file)
index 0000000..1e96b61
--- /dev/null
+++ b/langs/ru/install/lang_ru.c
@@ -0,0 +1,584 @@
+/*
+ * Russian (ru) Data File
+ *
+ * This file is part of the IPFire.
+ * 
+ * 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 IPCop; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ * 
+ * (c) IPFire Team  <info@ipfire.org>
+ *
+ */
+#include "libsmooth.h"
+
+char *ru_tr[] = {
+/* TR_ISDN */
+"ISDN",
+/* TR_ERROR_PROBING_ISDN */
+"Невозможно просканировать ISDN устройства.",
+/* TR_PROBING_ISDN */
+"ISDN устройства сканируются и настраиваются.",
+/* TR_MISSING_GREEN_IP */
+"Не найден Green IP!",
+/* TR_CHOOSE_FILESYSTEM */
+"Пожалуйста укажите вашу файловую систему:",
+/* TR_NOT_ENOUGH_INTERFACES */
+"Недостаточно сетевых карт для Вашего выбора.\n\nНеобходимо: %d - Доступно: %d\n",
+/* TR_INTERFACE_CHANGE */
+"Пожалуйста укажите интерфейс, который хотите изменить.\n\n",
+/* TR_NETCARD_COLOR */
+"Назначенные карты",
+/* TR_REMOVE */
+"Удалить",
+/* TR_MISSING_DNS */
+"Не найден DNS.\n",
+/* TR_MISSING_DEFAULT */
+"Не найден шлюз.\n",
+/* TR_JOURNAL_EXT3 */
+"Создаются журналы для Ext3...",
+/* TR_CHOOSE_NETCARD */
+"Пожалуйста укажите сетевую карту для следующего интерфейса - %s.",
+/* TR_NETCARDMENU2 */
+"Расширенное сетевое меню",
+/* TR_ERROR_INTERFACES */
+"В Вашей системе нет свободных интерфейсов.",
+/* TR_REMOVE_CARD */
+"Удалить сетевую карту? - %s",
+/* TR_JOURNAL_ERROR */
+"Не получилось создать журнал, пробуем ext2.",
+/* TR_FILESYSTEM */
+"Укажите файловую систему",
+/* TR_ADDRESS_SETTINGS */
+"Настройки адреса",
+/* TR_ADMIN_PASSWORD */
+"Пароль 'admin'",
+/* TR_AGAIN_PROMPT */
+"Ещё раз:",
+/* TR_ALL_CARDS_SUCCESSFULLY_ALLOCATED */
+"Все карты успешно установлены.",
+/* TR_AUTODETECT */
+"* АВТООПРЕДЕЛЕНИЕ *",
+/* TR_BUILDING_INITRD */
+"Создаётся ramdisk...",
+/* TR_CANCEL */
+"Отмена",
+/* TR_CARD_ASSIGNMENT */
+"Установка карт",
+/* TR_CHECKING */
+"Проверяется URL...",
+/* TR_CHECKING_FOR */
+"Проверка для: %s",
+/* TR_CHOOSE_THE_ISDN_CARD_INSTALLED */
+"Укажите ISDN карту, установленную в этом компьютере.",
+/* TR_CHOOSE_THE_ISDN_PROTOCOL */
+"Укажите необходимый ISDN протокол.",
+/* TR_CONFIGURE_DHCP */
+"Введите необходимые настройки DHCP сервера.",
+/* TR_CONFIGURE_NETWORKING */
+"Настройка сети",
+/* TR_CONFIGURE_NETWORKING_LONG */
+"Необходимо настроить сеть, загрузив драйвер для  GREEN интерфейса. Вы можете воспользоваться автоподбором драйвера для сетевой карты или самостоятельно указать его из списка. Позже Вы сможете подобрать драйвер и для остальных сетевых карт. Также, если у Вас более одной карты такого же типа, как для GREEN интерфейса, и каждая требует особых параметров, то Вам следует указать эти параметры, чтобы все карты были активны во время настройки GREEN интерфейса.",
+/* TR_CONFIGURE_NETWORK_DRIVERS */
+"Назначьте драйверы интерфейсам. Текущая конфигурация следующая:\n\n",
+/* TR_CONFIGURE_THE_CDROM */
+"Для настройки CDROM необходимо указать его IO адрес и/или IRQ.",
+/* TR_CONGRATULATIONS */
+"Поздравляем!",
+/* TR_CONGRATULATIONS_LONG */
+"%s был успешно установлен. Пожалуйста достаньте CD диск из привода. Далее будет предложена настройка ISDN, сетевых карт, и системных паролей. После окончания установки появится возможность настройки сервера с помощью браузера через веб-интерфейс по адресу https://%s:444 (или по имени, которое Вы указали для %s), где будет предложена настройка dialup подключения (если требуется) и удалённого доступа.",
+/* TR_CONTINUE_NO_SWAP */
+"Ваш жёсткий диск слишком мал, но установка всё же возможна с очень маленьким разделом swap. (Будьте внимательны).",
+/* TR_CURRENT_CONFIG */
+"Текущая конфигурация: %s%s",
+/* TR_DEFAULT_GATEWAY */
+"Основной шлюз:",
+/* TR_DEFAULT_GATEWAY_CR */
+"Основной шлюз\n",
+/* TR_DEFAULT_LEASE */
+"Аренда по умолчанию (в минутах):",
+/* TR_DEFAULT_LEASE_CR */
+"Время аренды по умолчанию\n",
+/* TR_DETECTED */
+"Обнаружен: %s",
+/* TR_DHCP_HOSTNAME */
+"Имя хоста DHCP:",
+/* TR_DHCP_HOSTNAME_CR */
+"Имя хоста DHCP\n",
+/* TR_DHCP_SERVER_CONFIGURATION */
+"Настройка DHCP сервера",
+/* TR_DISABLED */
+"Выключен",
+/* TR_DISABLE_ISDN */
+"Выключить ISDN",
+/* TR_DISK_TOO_SMALL */
+"Ваш жёсткий диск слишком мал.",
+/* TR_DNS_AND_GATEWAY_SETTINGS */
+"Настройка DNS и шлюза",
+/* TR_DNS_AND_GATEWAY_SETTINGS_LONG */
+"Введите DNS шлюз.  Эти настройки используются только со статическим IP (и DHCP если указан DNS) на RED интерфейсе.",
+/* TR_DNS_GATEWAY_WITH_GREEN */
+"Ваши настройки не используются ethernet адаптером для  RED интерфейса.  Информация о DNS и шлюзе для пользователей dialup получается автоматически при подключении.",
+/* TR_DOMAINNAME */
+"Имя домена",
+/* TR_DOMAINNAME_CANNOT_BE_EMPTY */
+"Имя домена не может быть пустым.",
+/* TR_DOMAINNAME_CANNOT_CONTAIN_SPACES */
+"В имени домена не должно быть пробелов.",
+/* TR_DOMAINNAME_NOT_VALID_CHARS */
+"Имя домена может содержать только буквы, цифры, дефисы и нижние подчёркивания.",
+/* TR_DOMAIN_NAME_SUFFIX */
+"Префикс доменного имени:",
+/* TR_DOMAIN_NAME_SUFFIX_CR */
+"Префикс доменного имени\n",
+/* TR_DONE */
+"Готово",
+/* TR_DO_YOU_WISH_TO_CHANGE_THESE_SETTINGS */
+"\nХотите поменять эти настройки?",
+/* TR_DRIVERS_AND_CARD_ASSIGNMENTS */
+"Назначение драйверов и карт",
+/* TR_ENABLED */
+"Включено",
+/* TR_ENABLE_ISDN */
+"Включить ISDN",
+/* TR_END_ADDRESS */
+"Конечный адрес:",
+/* TR_END_ADDRESS_CR */
+"Конечный адрес\n",
+/* TR_ENTER_ADDITIONAL_MODULE_PARAMS */
+"Некоторые ISDN карты (особенно ISA) Могут потребовать дополнительных параметров для задания IRQ и IO адреса. Если у Вас такая  ISDN карта, введите эти параметры тут. Пример: \"io=0x280 irq=9\". Эти параметры будут использоваться во время определения карты.",
+/* TR_ENTER_ADMIN_PASSWORD */
+"Введите %s 'admin' пароль.  Эта учётная запись используется для входа на веб интерфейс %s.",
+/* TR_ENTER_DOMAINNAME */
+"Введите имя домена",
+/* TR_ENTER_HOSTNAME */
+"Введите имя хоста.",
+/* TR_ENTER_IP_ADDRESS_INFO */
+"введите IP адрес",
+/* TR_ENTER_NETWORK_DRIVER */
+"Не удалось автоматически определить сетевую карту. Введите дополнительные параметры для этой сетевой карты.",
+/* TR_ENTER_ROOT_PASSWORD */
+"Введите пароль для 'root'. Эта учётная запись используется для доступа с командной строки.",
+/* TR_ENTER_SETUP_PASSWORD */
+"БУДЕТ УДАЛЁН",
+/* TR_ENTER_THE_IP_ADDRESS_INFORMATION */
+"Введите IP адрес для %s интерфейса.",
+/* TR_ENTER_THE_LOCAL_MSN */
+"Введите номер телефона (MSN/EAZ).",
+/* TR_ENTER_URL */
+"Укажите URL к ipcop-<version>.tgz и images/scsidrv-<version>.img файлам. ВНИМАНИЕ: DNS не работает! Пример: http://X.X.X.X/<directory>",
+/* TR_ERROR */
+"Ошибка",
+/* TR_ERROR_PROBING_CDROM */
+"Не найден привод CDROM.",
+/* TR_ERROR_WRITING_CONFIG */
+"Ошибка записи настроек.",
+/* TR_EURO_EDSS1 */
+"Евро (EDSS1)",
+/* TR_EXTRACTING_MODULES */
+"Модули извлекаются...",
+/* TR_FAILED_TO_FIND */
+"Не удалось найти файл по этому URL.",
+/* TR_FOUND_NIC */
+"%s обнаружил следующий NIC в Вашем компьютере: %s",
+/* TR_GERMAN_1TR6 */
+"German 1TR6",
+/* TR_HELPLINE */
+"              <Tab>/<Alt-Tab> Переключает   |  <Space> Выделяет",
+/* TR_HOSTNAME */
+"Имя хоста",
+/* TR_HOSTNAME_CANNOT_BE_EMPTY */
+"Имя хоста не может быть пустым.",
+/* TR_HOSTNAME_CANNOT_CONTAIN_SPACES */
+"Имя хоста не может содержать пробелы.",
+/* TR_HOSTNAME_NOT_VALID_CHARS */
+"В имени хоста могут быть только буквы, цифры дефисы.",
+/* TR_INITIALISING_ISDN */
+"Устанавливается ISDN...",
+/* TR_INSERT_CDROM */
+"Пожалуйста вставьте %s CD в привод CDROM.",
+/* TR_INSERT_FLOPPY */
+"Пожалуйста вставьте %s дискету с драйверами в привод floppy.",
+/* TR_INSTALLATION_CANCELED */
+"Установка отменена.",
+/* TR_INSTALLING_FILES */
+"Устанавливаются файлы...",
+/* TR_INSTALLING_GRUB */
+"Устанавливается GRUB...",
+/* TR_INSTALLING_LANG_CACHE */
+"Устанавливаются языковые пакеты...",
+/* TR_INTERFACE */
+"Интерфейс - %s",
+/* TR_INTERFACE_FAILED_TO_COME_UP */
+"Не удалось поднять интерфейс.",
+/* TR_INVALID_FIELDS */
+"В следующих полях есть ошибки:\n\n",
+/* TR_INVALID_IO */
+"Параметры IO порта содержат ошибки. ",
+/* TR_INVALID_IRQ */
+"Параметры IRQ details содержат ошибки.",
+/* TR_IP_ADDRESS_CR */
+"IP адрес\n",
+/* TR_IP_ADDRESS_PROMPT */
+"IP адреса:",
+/* TR_ISDN_CARD */
+"ISDN карта",
+/* TR_ISDN_CARD_NOT_DETECTED */
+"ISDN карта не найдена. Возможно стоит указать дополнительные параметры модулю, если у вас карта типа ISA или имеет особые параметры.",
+/* TR_ISDN_CARD_SELECTION */
+"выбор ISDN карты",
+/* TR_ISDN_CONFIGURATION */
+"Настройка ISDN",
+/* TR_ISDN_CONFIGURATION_MENU */
+"Меню настройки ISDN",
+/* TR_ISDN_NOT_SETUP */
+"ISDN не настроена. Некоторые элементы не были указаны.",
+/* TR_ISDN_NOT_YET_CONFIGURED */
+"ISDN ещё не настроена. Укажите элемент, который хотите настроить.",
+/* TR_ISDN_PROTOCOL_SELECTION */
+"выбор ISDN протокола",
+/* TR_ISDN_STATUS */
+"ISDN сейчас %s.\n\n   Протокол: %s\n   Карта: %s\n   Телефон: %s\n\nУкажите элемент для перенастройки, или сохраните текущие настройки.",
+/* TR_KEYBOARD_MAPPING */
+"Раскладка клавиатуры",
+/* TR_KEYBOARD_MAPPING_LONG */
+"Укажите тип используемой клавиатуры из списка ниже. (обычно подходит ru_win )",
+/* TR_LEASED_LINE */
+"Зарезервированная строка",
+/* TR_LOADING_MODULE */
+"Грузится модуль...",
+/* TR_LOADING_PCMCIA */
+"Грузятся PCMCIA модули...",
+/* TR_LOOKING_FOR_NIC */
+"Поиск: %s",
+/* TR_MAKING_BOOT_FILESYSTEM */
+"Создаётся файловой системы загрузчика...",
+/* TR_MAKING_LOG_FILESYSTEM */
+"Создаётся файловая система под логи...",
+/* TR_MAKING_ROOT_FILESYSTEM */
+"Создаётся корневая файловая система...",
+/* TR_MAKING_SWAPSPACE */
+"Создаётся swap...",
+/* TR_MANUAL */
+"* MANUAL *",
+/* TR_MAX_LEASE */
+"Max аренда (минуты):",
+/* TR_MAX_LEASE_CR */
+"Время Max аренды\n",
+/* TR_MISSING_BLUE_IP */
+"Не указан IP на BLUE интерфейсе.",
+/* TR_MISSING_ORANGE_IP */
+"Не указан IP на ORANGE интерфейсе.",
+/* TR_MISSING_RED_IP */
+"Не указан IP на RED интерфейсе.",
+/* TR_MODULE_NAME_CANNOT_BE_BLANK */
+"Имя модуля не может быть пустым.",
+/* TR_MODULE_PARAMETERS */
+"Введите имя модуля и параметры для нужного драйвера.",
+/* TR_MOUNTING_BOOT_FILESYSTEM */
+"Монтируется файловая система для загрузчика...",
+/* TR_MOUNTING_LOG_FILESYSTEM */
+"Монтируется файловая система для логов...",
+/* TR_MOUNTING_ROOT_FILESYSTEM */
+"Монтируется корневая файловая система...",
+/* TR_MOUNTING_SWAP_PARTITION */
+"Монтируется swap...",
+/* TR_MSN_CONFIGURATION */
+"Номер телефона (MSN/EAZ)",
+/* TR_NETMASK_PROMPT */
+"Маска подсети:",
+/* TR_NETWORKING */
+"Сеть",
+/* TR_NETWORK_ADDRESS_CR */
+"Сетевой адрес\n",
+/* TR_NETWORK_ADDRESS_PROMPT */
+"Сетевой адрес:",
+/* TR_NETWORK_CONFIGURATION_MENU */
+"Меню настройки сети",
+/* TR_NETWORK_CONFIGURATION_TYPE */
+"Настройка типа сетевого подключения",
+/* TR_NETWORK_CONFIGURATION_TYPE_LONG */
+"Укажите сетевые настройки для %s.  Ниже представлен список для интернет подключения. Если Вы решите поменять эти настройки,Потребуется перезапуск сети, а так же потребуется переназначить драйвера сетевых карт.",
+/* TR_NETWORK_MASK_CR */
+"Маска подсети\n",
+/* TR_NETWORK_SETUP_FAILED */
+"Не удалось настроить сеть.",
+/* TR_NOT_ENOUGH_CARDS_WERE_ALLOCATED */
+"Выделено недостаточно сетевых карт.",
+/* TR_NO_BLUE_INTERFACE */
+"Не назначен BLUE интерфейс.",
+/* TR_NO_CDROM */
+"Не найден CD-ROM.",
+/* TR_NO_GREEN_INTERFACE */
+"Не назначен  GREEN интерфейс.",
+/* TR_NO_HARDDISK */
+"Не найден жсткий диск.",
+/* TR_NO_IPCOP_TARBALL_FOUND */
+"На сервере не найден архив ipcop.",
+/* TR_NO_ORANGE_INTERFACE */
+"Не назначен ORANGE интерфейс.",
+/* TR_NO_RED_INTERFACE */
+"Не назначен RED интерфейс.",
+/* TR_NO_SCSI_IMAGE_FOUND */
+"По этому адресу не найден образ SCSI.",
+/* TR_NO_UNALLOCATED_CARDS */
+"Нужно больше карт. Можно попытаться поискать или указать другие карты на этой машине, или указать драйвер из списка ниже.",
+/* TR_OK */
+"Ok",
+/* TR_PARTITIONING_DISK */
+"Разбивка диска...",
+/* TR_PASSWORDS_DO_NOT_MATCH */
+"Пароли не совпадают.",
+/* TR_PASSWORD_CANNOT_BE_BLANK */
+"Пароль не может быть пустым.",
+/* TR_PASSWORD_CANNOT_CONTAIN_SPACES */
+"Пароль не должен содержать пробелы.",
+/* TR_PASSWORD_PROMPT */
+"Пароль:",
+/* TR_PHONENUMBER_CANNOT_BE_EMPTY */
+"Номер телефона не может быть пустым.",
+/* TR_PREPARE_HARDDISK */
+"Мастер установки сейчас подготовит диски на %s. Сперва будет проводиться разбиение диска, а затем разделам будут назначены файловые системы.",
+/* TR_PRESS_OK_TO_REBOOT */
+"Нажмите Ok для перезагрузки.",
+/* TR_PRIMARY_DNS */
+"Основной DNS:",
+/* TR_PRIMARY_DNS_CR */
+"Основной DNS\n",
+/* TR_PROBE */
+"Пробовать",
+/* TR_PROBE_FAILED */
+"Не удалось определить автоматически.",
+/* TR_PROBING_HARDWARE */
+"Определение железа...",
+/* TR_PROBING_FOR_NICS */
+"Определение NIC...",
+/* TR_PROBLEM_SETTING_ADMIN_PASSWORD */
+"Возникли проблемы при установке на %s пароля для 'admin'.",
+/* TR_PROBLEM_SETTING_ROOT_PASSWORD */
+"Возникли проблемы при установке пароля для 'root'.",
+/* TR_PROBLEM_SETTING_SETUP_PASSWORD */
+"БУДЕТ УДАЛЁН",
+/* TR_PROTOCOL_COUNTRY */
+"Протокол/Страна",
+/* TR_PULLING_NETWORK_UP */
+"Поднимаем сеть...",
+/* TR_PUSHING_NETWORK_DOWN */
+"Отключаем сеть...",
+/* TR_PUSHING_NON_LOCAL_NETWORK_DOWN */
+"Отключаем нелокальную сеть...",
+/* TR_QUIT */
+"Выход",
+/* TR_RED_IN_USE */
+"ISDN (или другое внешнее подключение) задействовано в данный момент.  Не получится настроить ISDN пока RED интерфейс активен.",
+/* TR_RESTART_REQUIRED */
+"\n\nПосле настройки потребуется перезапуск сети.",
+/* TR_RESTORE */
+"Восстановить",
+/* TR_RESTORE_CONFIGURATION */
+"Если у Вас есть floppy с настройками %s , вставьте floppy диск и нажмите кнопку восстановления.",
+/* TR_ROOT_PASSWORD */
+"пароль 'root'",
+/* TR_SECONDARY_DNS */
+"Второй DNS:",
+/* TR_SECONDARY_DNS_CR */
+"Второй DNS\n",
+/* TR_SECONDARY_WITHOUT_PRIMARY_DNS */
+"Второй DNS указан без основного DNS",
+/* TR_SECTION_MENU */
+"Меню разделов",
+/* TR_SELECT */
+"Выбрать",
+/* TR_SELECT_CDROM_TYPE */
+"Выделить тип CDROM",
+/* TR_SELECT_CDROM_TYPE_LONG */
+"Не найден CD-ROM на этой машине.  Пожалуйста укажите какой драйвер Вы собираетесь использовать, чтобы %s увидел CD-ROM.",
+/* TR_SELECT_INSTALLATION_MEDIA */
+"Укажите носитель с установщиком",
+/* TR_SELECT_INSTALLATION_MEDIA_LONG */
+"%s может быть установлен разными способами.  Самый простой - использовать привод CDROM. Если его нет, то можно попробовать установку с другой машины в LAN сети, где установочные файлы доступны по HTTP или FTP протоколу.",
+/* TR_SELECT_NETWORK_DRIVER */
+"Укажите сетевой драйвер",
+/* TR_SELECT_NETWORK_DRIVER_LONG */
+"Укажите драйвер для сетевой карты, установленной на этой машине. Если Вы указываете ВРУЧНУЮ, у Вас появится возможность задать название модуля драйвера и параметра для драйвера с особыми настройками, например для ISA карты.",
+/* TR_SELECT_THE_INTERFACE_YOU_WISH_TO_RECONFIGURE */
+"Укажите интерфейс для перенастройки.",
+/* TR_SELECT_THE_ITEM */
+"Укажите, что хотите настроить.",
+/* TR_SETTING_ADMIN_PASSWORD */
+"Записывается 'admin' пароль для %s...",
+/* TR_SETTING_ROOT_PASSWORD */
+"Записывается 'root' пароль....",
+/* TR_SETTING_SETUP_PASSWORD */
+"БУДЕТ УДАЛЁН",
+/* TR_SETUP_FINISHED */
+"Установка окончена.  Нажмите Ok.",
+/* TR_SETUP_NOT_COMPLETE */
+"Первоначальная установка не была завершена полностью.  Необходимо убедиться, что настройка полностью завершена выполнив команду setup ещё раз в shell оболочке.",
+/* TR_SETUP_PASSWORD */
+"БУДЕТ УДАЛЁН",
+/* TR_SET_ADDITIONAL_MODULE_PARAMETERS */
+"Задать дополнительные параметры модуля",
+/* TR_SINGLE_GREEN */
+"Ваши настройки задаются для одного GREEN интерфейса.",
+/* TR_SKIP */
+"Пропустить",
+/* TR_START_ADDRESS */
+"Начальный адрес:",
+/* TR_START_ADDRESS_CR */
+"Начальный адрес\n",
+/* TR_STATIC */
+"Статический",
+/* TR_SUGGEST_IO */
+"(Предлагаемый %x)",
+/* TR_SUGGEST_IRQ */
+"(Предлагаемый %d)",
+/* TR_THIS_DRIVER_MODULE_IS_ALREADY_LOADED */
+"Модуль этого драйвера уже установлен.",
+/* TR_TIMEZONE */
+"Часовой пояс",
+/* TR_TIMEZONE_LONG */
+"Укажите свою временную зону из списка ниже.",
+/* TR_UNABLE_TO_EJECT_CDROM */
+"Не могу открыть CDROM.",
+/* TR_UNABLE_TO_EXTRACT_MODULES */
+"Не удалось распаковать модули.",
+/* TR_UNABLE_TO_FIND_ANY_ADDITIONAL_DRIVERS */
+"Не удалось найти какие-либо дополнительные драйверы.",
+/* TR_UNABLE_TO_FIND_AN_ISDN_CARD */
+"Не удалось найти ISDN карты на этом компьютере. Возможно стоит указать дополнительные параметры, если у вас карта типа ISA или имеет особые настройки.",
+/* TR_UNABLE_TO_INITIALISE_ISDN */
+"Не удаётся инициализировать ISDN.",
+/* TR_UNABLE_TO_INSTALL_FILES */
+"Не удалось установить файлы.",
+/* TR_UNABLE_TO_INSTALL_LANG_CACHE */
+"Не удалось установить языковые пакеты.",
+/* TR_UNABLE_TO_INSTALL_GRUB */
+"Не удалось установить GRUB.",
+/* TR_UNABLE_TO_LOAD_DRIVER_MODULE */
+"Не удалось подгрузить модули драйверов.",
+/* TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM */
+"Не удалось создать файловую систему для boot.",
+/* TR_UNABLE_TO_MAKE_LOG_FILESYSTEM */
+"Не удалось создать файловую систему для логов.",
+/* TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM */
+"Не удалось создать корневую файловую систему.",
+/* TR_UNABLE_TO_MAKE_SWAPSPACE */
+"Не удалось создать swap.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK */
+"Не удалось создать симлинк /dev/harddisk.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK1 */
+"Не удалось создать симлинк /dev/harddisk1.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK2 */
+"Не удалось создать симлинк /dev/harddisk2.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK3 */
+"Не удалось создать симлинк /dev/harddisk3.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK4 */
+"Не удалось создать симлинк /dev/harddisk4.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_ROOT */
+"Не удалось создать симлинк /dev/root.",
+/* TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM */
+"Не удалось смонтировать раздел boot.",
+/* TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM */
+"Не удалось смонтировать раздел с логами.",
+/* TR_UNABLE_TO_MOUNT_PROC_FILESYSTEM */
+"Не удалось смонтировать раздел proc.",
+/* TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM */
+"Не удалось смонтировать корневой раздел .",
+/* TR_UNABLE_TO_MOUNT_SWAP_PARTITION */
+"Не удалось смонтировать раздел swap.",
+/* TR_UNABLE_TO_OPEN_HOSTS_FILE */
+"Не удалось открыть основной файл хостов.",
+/* TR_UNABLE_TO_OPEN_SETTINGS_FILE */
+"Не удалось открыть файл настроек",
+/* TR_UNABLE_TO_PARTITION */
+"Не удалось разбить диск на разделы.",
+/* TR_UNABLE_TO_REMOVE_TEMP_FILES */
+"Не удаётся удалить временные загруженные файлы.",
+/* TR_UNABLE_TO_SET_HOSTNAME */
+"Не удалось задать имя хоста.",
+/* TR_UNABLE_TO_UNMOUNT_CDROM */
+"Не удаётся смонтировать привод CDROM/floppy.",
+/* TR_UNABLE_TO_UNMOUNT_HARDDISK */
+"Не получается отмонтировать жёсткие диски.",
+/* TR_UNABLE_TO_WRITE_ETC_FSTAB */
+"Не могу записать в /etc/fstab",
+/* TR_UNABLE_TO_WRITE_ETC_HOSTNAME */
+"Не могу записать в /etc/hostname",
+/* TR_UNABLE_TO_WRITE_ETC_HOSTS */
+"Не могу записать в /etc/hosts.",
+/* TR_UNABLE_TO_WRITE_ETC_HOSTS_ALLOW */
+"Не могу записать в /etc/hosts.allow.",
+/* TR_UNABLE_TO_WRITE_ETC_HOSTS_DENY */
+"Не могу записать в /etc/hosts.deny.",
+/* TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_ETHERNET_SETTINGS */
+"Не могу записать в %s/ethernet/settings.",
+/* TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_HOSTNAMECONF */
+"Не могу записать в %s/main/hostname.conf",
+/* TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_SETTINGS */
+"Не могу записать в %s/main/settings.",
+/* TR_UNCLAIMED_DRIVER */
+"Обнаружена невостребованная сетевая карта типа:\n%s\n\nМожно ей назначить:",
+/* TR_UNKNOWN */
+"НЕИЗВЕСТНО",
+/* TR_UNSET */
+"НЕЗАДАНО",
+/* TR_USB_KEY_VFAT_ERR */
+"Неправильный USB носитель (не найден раздел vfat).",
+/* TR_US_NI1 */
+"Использовать NI1",
+/* TR_WARNING */
+"ВНИМАНИЕ",
+/* TR_WARNING_LONG */
+"Если изменить этот IP адрес, и в данный момент Вы подключены удалённо, то естественным образм Ваше соединение с %s будет потеряно. Придётся переподключиться к НОВОМУ IP. Эта процедура довольно рискована, есть у Вас нет возможности физического доступа к машине, на случай если что-то пойдёт не так.",
+/* TR_WELCOME */
+"Добро пожаловать в мастер настройки %s . Отмена установки на любом этапе приведёт к перезагрузке.",
+/* TR_YOUR_CONFIGURATION_IS_SINGLE_GREEN_ALREADY_HAS_DRIVER */
+"Ваша конфигурация настроена на один GREEN интерфейс, который уже оснащён драйвером.",
+/* TR_YES */
+"Да",
+/* TR_NO */
+"Нет",
+/* TR_AS */
+"как",
+/* TR_IGNORE */
+"Игнорировать",
+/* TR_PPP_DIALUP */
+"PPP DIALUP (PPPoE, модем, ATM ...)",
+/* TR_DHCP */
+"DHCP",
+/* TR_DHCP_STARTSERVER */
+"Запуск DHCP-server ...",
+/* TR_DHCP_STOPSERVER */
+"Остановка DHCP-server ...",
+/* TR_LICENSE_ACCEPT */
+"Я принимаю эту лицензию.",
+/* TR_LICENSE_NOT_ACCEPTED */
+"Лицензия не принята. Выход!",
+/* TR_EXT2FS_DESCR */
+"Ext2 - Файловая система без журналирования (Рекомендуется для флеш-носителей)",
+/* TR_EXT3FS_DESCR */
+"Ext3 - Файловая система с журналированием",
+/* TR_EXT4FS_DESCR */
+"Ext4 - Файловая система с журналированием",
+/* TR_REISERFS_DESCR */
+"ReiserFS - Файловая система с журналированием",
+/* TR_NO_LOCAL_SOURCE */
+"Локальный источник не найден. Начинаю загрузку.",
+/* TR_DOWNLOADING_ISO */
+"Загружается установочный образ ...",
+/* TR_DOWNLOAD_ERROR */
+"Во время загрузки произошла ошибка!",
+/* TR_DHCP_FORCE_MTU */
+"Форсировать DHCP mtu:",
+};

diff --git a/lfs/Config b/lfs/Config
index 01b9cf1c92bb7661fa2ad17135936230a00e7709..fac10eba27c5b270790ff419c9bbdf6af45d68e4 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -196,6 +196,7 @@ define PAK
        fi
        cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
        sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES
+       sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
        chmod 755 /install/packages/package/{{,un}install,update}.sh
        cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \
                -p --numeric-owner

diff --git a/lfs/GeoIP b/lfs/GeoIP
index e22dc261a7e23c15ca09be04ae328f0269fb9b8c..d90a4c30b0cb89ec9c87b338f73d0dc3116c672e 100644 (file)
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
 include Config
 
 VER        = 1.17
-DATVER     = 01012011
+DATVER     = 01072011
 
 THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
 
 $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = 560eaeef02761b866d106cda42929d4c
+GeoIP.dat-$(DATVER).gz_MD5 = 437a8fe09af2726856c1090615e27965
 
 install : $(TARGET)
 

diff --git a/lfs/apache2 b/lfs/apache2
index 7b5b791d3c35e9f95ce6f58deb36fce2aa4a6b67..c5fd754291726bbbf2cf76fe5bb90ad94c834c41 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011   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        #
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 2.2.17
+VER        = 2.2.20
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -47,7 +47,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
 
-$(DL_FILE)_MD5 = 16eadc59ea6b38af33874d300973202e
+$(DL_FILE)_MD5 = 1ac251431c8c4285f6b085c1d156bb56
 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
 
 install : $(TARGET)

diff --git a/lfs/binutils b/lfs/binutils
index 464ac52fc37d91350f3da7bbcaba1663fa1b11f6..ab28c797819a9f780e9bea3a8fb8da317ef8adf7 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.17
+VER        = 2.18
 
 THISAPP    = binutils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -34,23 +34,10 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
-ifeq "$(LFS_PASS)" "install"
-  TARGET = $(DIR_INFO)/$(THISAPP)-install
-  EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \
-               --build=$(MACHINE)-pc-linux-gnu \
-               --host=$(MACHINE)-pc-linux-gnu \
-               --target=$(MACHINE)-linux-uclibc \
-               --disable-nls \
-               --enable-multilib \
-               --disable-werror
-  EXTRA_MAKE = all
-  EXTRA_INSTALL = 
-else
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --enable-shared --disable-nls
   EXTRA_MAKE = tooldir=/usr
   EXTRA_INSTALL = tooldir=/usr
-endif
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
@@ -73,7 +60,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e26e2e06b6e4bf3acf1dc8688a94c0d1
+$(DL_FILE)_MD5 = 9d22ee4dafa3a194457caf4706f9cf01
 
 install : $(TARGET)
 
@@ -104,6 +91,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/binutils-build
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-configure-1.patch
        cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
 ifeq "$(PASS)" "1"
        cd $(DIR_SRC)/binutils-build && make configure-host
@@ -111,9 +99,7 @@ endif
        cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING)
        cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
-ifneq "$(LFS_PASS)" "install"
        cp -v $(DIR_APP)/include/libiberty.h /usr/include
-endif
 else
 ifeq "$(PASS)" "1"
        cd $(DIR_SRC)/binutils-build && make -C ld clean

diff --git a/lfs/ccache b/lfs/ccache
index 24073209d4e6b5ed613a03d97b6baebde5d3bef2..6ae52330ac29e7ecc496a5f7d261dfc5c847247b 100644 (file)
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1
+VER        = 3.1.6
 
 THISAPP    = ccache-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7961852e1e36f11559039c32142f58df
+$(DL_FILE)_MD5 = 343dc9b642e1d2af1e6bd8e474dde92e
 
 install : $(TARGET)
 

diff --git a/lfs/clamav b/lfs/clamav
index a9d97098d0c963be0e04e34adc35a524c54301b6..d30ae6344c75d9c680c85116d044475ba6fcfcbf 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.97
+VER        = 0.97.2
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 15
+PAK_VER    = 17
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 605ed132b2f8e89df11064adea2b183b
+$(DL_FILE)_MD5 = cb2d78b4790fdfca3b2390d7ce82f0b7
 
 install : $(TARGET)
 

diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index 06d42311933c303422de13529969c28068a465c3..bc6930c9e32aefa3bf29f9adaa4d63d5e9652735 100644 (file)
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -54,11 +54,11 @@ ifeq "$(PASS)" "1"
        mv -v /tools/i686-pc-linux-gnu/bin/{ld,ld-old}
        cp -v /tools/bin/{ld-new,ld}
        ln -sv /tools/bin/ld /tools/i686-pc-linux-gnu/bin/ld
-       gcc -dumpspecs > /tools/lib/gcc/i686-pc-linux-gnu/4.0.4/specs
-       sed 's@^/lib/ld-linux.so.2@/tools&@g' /tools/lib/gcc/i686-pc-linux-gnu/4.0.4/specs > tempspecfile
-       mv -vf tempspecfile /tools/lib/gcc/i686-pc-linux-gnu/4.0.4/specs
-       find /tools/lib/gcc/i686-pc-linux-gnu/4.0.4/include/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \;
-       rm -vf `grep -l "DO NOT EDIT THIS FILE" /tools/lib/gcc/i686-pc-linux-gnu/4.0.4/include/*`
+       gcc -dumpspecs > /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs
+       sed 's@^/lib/ld-linux.so.2@/tools&@g' /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs > tempspecfile
+       mv -vf tempspecfile /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs
+       find /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/include/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \;
+       rm -vf `grep -l "DO NOT EDIT THIS FILE" /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/include/*`
 endif
 ifeq "$(PASS)" "2"
        -strip --strip-debug /tools/lib/*
@@ -74,6 +74,6 @@ ifeq "$(PASS)" "3"
        gcc -dumpspecs | \
        perl -p -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g;' \
            -e 's@\*startfile_prefix_spec:\n@$$_/usr/lib/ @g;' > \
-           /tools/lib/gcc/i686-pc-linux-gnu/4.0.4/specs
+           /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs
 endif
        @$(POSTBUILD)

diff --git a/lfs/client175 b/lfs/client175
index 7f39508fa6ec299e819be28e6f15c12e35ec986f..ef2b487fba730d0257d799097b82318f4e6a4f26 100644 (file)
--- a/lfs/client175
+++ b/lfs/client175
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5a
+VER        = 0.7
 
 THISAPP    = client175_$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = client175
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "mpfire"
 
@@ -44,7 +44,8 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 578ad4ba1743f3b0801a806659f550c8
+$(DL_FILE)_MD5 = 975b69de79dc2649d8acba294cc0c5eb
+
 install : $(TARGET)
 
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -76,11 +77,12 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxvf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
        @rm -rf /srv/client175
        mkdir -pv /srv/client175
 
        cd $(DIR_APP) && mv -vf * /srv/client175
+
        cp -vf $(DIR_SRC)/config/client175/site.conf /srv/client175/
 
        install -v -m 644 $(DIR_SRC)/config/backup/includes/client175 \

diff --git a/lfs/collectd b/lfs/collectd
index c9e70608a99144fbb66d2dfb04c9a2c33b3878cd..f17879c9d36230e41e8d285513f84ffb221e47ce 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  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        #
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = collectd
-VER        = 4.9.1
+VER        = 4.10.3
 
 THISAPP    = collectd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5753496651c8c84afaea1fe290876bfc
+$(DL_FILE)_MD5 = 5f17bfd7342af4f97f78c608f1d1eb1d
 
 install : $(TARGET)
 

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 22223d7d7a80e9b671c4f3b39ce910aafe958e40..370f06bef6fb5c6044b3efe1ea7341b8036a5657 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -34,7 +34,7 @@ else
 endif
 endif
 
-VER        = 2.6.38-3-ns
+VER        = 3.0-2
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = compat-wireless-$(VER).tar.bz2
@@ -51,7 +51,7 @@ objects = $(DL_FILE) asix-3.5.0a.tar.bz2
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 asix-3.5.0a.tar.bz2 = $(DL_FROM)/asix-3.5.0a.tar.bz2
 
-$(DL_FILE)_MD5 = c4c78d1d41c28f0e9c48ab8098a0a9f2
+$(DL_FILE)_MD5 = 7f2d0de30bf9c3e9a941d9e67971e9b3
 asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7
 
 install : $(TARGET)
@@ -83,6 +83,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
+       # kfifo has no license info and taints kernel
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch
+
        # Copy USB-Net drivers from Kernel...
        mkdir $(DIR_APP)/drivers/net/usb/new
        cp $(DIR_APP)/drivers/net/usb/*.c $(DIR_APP)/drivers/net/usb/new
@@ -101,8 +104,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /etc/udev/rules.d/
        cd $(DIR_APP)/udev && install -m 755 compat_firmware.sh /lib/udev/
 
-       # Disable hwcrypt on rt73 ...
-       echo "options rt73usb nohwcrypt=1" > /etc/modprobe.d/ralink_wireless
-
        -rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/core-updates b/lfs/core-updates
index f7f50cf5d9f502d2301deeaa70545c87e9d36e37..0dd2ecccbc5a20a2e1c939fdacc011154a22eb56 100644 (file)
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -63,7 +63,7 @@ core/%:
        
        #Change KVER to Kernelversion
        sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
-       
+
        #Remove doubled files with tar/untar/tar to save space
        tar -c -C / --files-from=/tmp/ROOTFILES \
                -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
@@ -80,6 +80,9 @@ core/%:
        #build package
        cp -f $(DIR_SRC)/config/rootfiles/$@/update.sh /install/packages/package
        chmod 755 /install/packages/package/update.sh
+       #Change xxxKVERxxx to Kernelversion
+       sed -e "s/xxxKVERxxx/$(KVER)/g" -i /install/packages/package/update.sh
+
        cd /install/packages/package && tar cf ../core-upgrade-$(VERSION)-$$(basename $@).ipfire \
                update.sh files ROOTFILES
        rm -rf /install/packages/package

diff --git a/lfs/crda b/lfs/crda
index f97fdcb81ec685058c4bc66f38e34661c10ed022..521eb933dfc61081f4f6b007662fb1a0ac679a3f 100644 (file)
--- a/lfs/crda
+++ b/lfs/crda
@@ -24,12 +24,10 @@
 
 include Config
 
-VER        = 20110202-git
-
-REGDB      = regulatory-20110202
+VER        = 1.1.1
 
 THISAPP    = crda-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -39,13 +37,11 @@ TARGET = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(REGDB).tar.xz
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(REGDB).tar.xz = $(DL_FROM)/$(REGDB).tar.xz
 
-$(DL_FILE)_MD5 = 1da048b854cca1f1087c1250df335ca8
-$(REGDB).tar.xz_MD5 = 620621172d18d6f8cdc2db423dcb6381
+$(DL_FILE)_MD5 = 5fc77af68b3e21736b8ef2f8b061c810
 
 install : $(TARGET)
 
@@ -74,9 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       -mkdir /usr/lib/crda
-       tar Jxf $(DIR_DL)/$(REGDB).tar.xz -C /usr/lib/crda/
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && USE_OPENSSL=1 make $(MAKETUNING)
        cd $(DIR_APP) && USE_OPENSSL=1 make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/cups b/lfs/cups
index e8d9cc0e7e08e8ef7e0160ca901f84585263fdb4..e7fd085e27cb7b02ba3aecc2ae0ebe109656da31 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.4
+VER        = 1.4.6
 
 THISAPP    = cups-$(VER)
 DL_FILE    = $(THISAPP)-source.tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       = "ghostscript"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8776403ad60fea9e85eab9c04d88560d
+$(DL_FILE)_MD5 = de8fb5a29c36554925c0c6a6e2c0dae1
 
 install : $(TARGET)
 

diff --git a/lfs/dhcp b/lfs/dhcp
index 01cd9d5203bceff3c94d420708f2926c12c4219d..845813cc8068ae145fc027bf9950f5d51e8f9d73 100644 (file)
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.0
+VER        = 3.1-ESV-R3
 
 THISAPP    = dhcp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 27d179a3c3fbef576566b456a1168246
+$(DL_FILE)_MD5 = af3d8db60f62664f1d5538b81e406459
 
 install : $(TARGET)
 
@@ -70,7 +70,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-3.0.4-iproute2-1.patch
        cd $(DIR_APP) && ./configure
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make LIBDIR=/usr/lib INCDIR=/usr/include install

diff --git a/lfs/ethtool b/lfs/ethtool
index 00b4a13e53b03a7b85625af11809a90571aeec6e..15f0419d868ac29e2afe5416ea4d870d04b861fd 100644 (file)
--- a/lfs/ethtool
+++ b/lfs/ethtool
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 3
+VER        = 3.0
 
 THISAPP    = ethtool-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b4e71f7fa2629250677eefcb338442c5
+$(DL_FILE)_MD5 = cb129398cbbf39859901b55ecac101da
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

diff --git a/lfs/gcc b/lfs/gcc
index b6a261ae9b15aa2461eaba372fda199181212681..af87e21164eff2f8935c1751af1db5fafaa00ba8 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.0.4
+VER        = 4.1.2
 
 THISAPP    = gcc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,47 +32,10 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
-TARGET_PATH = /opt/$(MACHINE)-uClibc/bin:$(PATH)
 
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
-ifeq "$(INST)" "1"
-  TARGET = $(DIR_INFO)/$(THISAPP)-install1
-  EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \
-               --build=$(MACHINE)-pc-linux-gnu \
-               --host=$(MACHINE)-pc-linux-gnu \
-               --target=$(MACHINE)-linux-uclibc \
-               --enable-languages=c \
-               --with-sysroot=$(DIR_SRC)/uClibc_dev \
-               --disable-__cxa_atexit \
-               --enable-target-optspace \
-               --with-gnu-ld \
-               --disable-shared \
-               --enable-threads \
-               --enable-multilib \
-               --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
-else
-ifeq "$(INST)" "2"
-  TARGET = $(DIR_INFO)/$(THISAPP)-install2
-  EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \
-               --build=$(MACHINE)-pc-linux-gnu \
-               --host=$(MACHINE)-pc-linux-gnu \
-               --target=$(MACHINE)-linux-uclibc \
-               --enable-languages=c,c++ \
-               --with-sysroot=$(DIR_SRC)/uClibc_dev \
-               --disable-__cxa_atexit \
-               --enable-target-optspace \
-               --with-gnu-ld \
-               --enable-shared \
-               --disable-nls \
-               --enable-threads \
-               --enable-multilib
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
-else
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr \
                --libexecdir=/usr/lib \
@@ -84,8 +47,6 @@ else
                --disable-nls
   EXTRA_MAKE =
   EXTRA_INSTALL =
-endif
-endif
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
@@ -94,8 +55,8 @@ ifeq "$(PASS)" "1"
                --disable-nls \
                --enable-shared \
                --enable-languages=c
-  EXTRA_MAKE = 
-  #bootstrap BOOT_LDFLAGS="-static"
+  EXTRA_MAKE = bootstrap
+  # BOOT_LDFLAGS="-static"
   EXTRA_INSTALL = 
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
@@ -119,7 +80,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8970debbc55bea85ee80961d733080f0
+$(DL_FILE)_MD5 = a4a3eb15c96030906d8494959eeda23c
 
 install : $(TARGET)
 
@@ -149,31 +110,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_linker_version_detection.patch
        @mkdir $(DIR_SRC)/gcc-build
 ifeq "$(ROOT)" ""
-ifeq "$(INST)" "1"
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-conf.patch
-       cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
-       cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make $(MAKETUNING) all-gcc
-       cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make install-gcc
-       cd /opt/$(MACHINE)-uClibc/bin && for i in `ls -w1 $(MACHINE)-linux-uclibc-*`; do \
-               ln -svf $$i $(MACHINE)-linux-`echo $$i | cut -c 19-`; \
-       done
-       ln -svf $(MACHINE)-linux-uclibc /opt/$(MACHINE)-uClibc/$(MACHINE)-linux
-       ln -svf gcc /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/bin/cc
-else
-ifeq "$(INST)" "2"
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-conf.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-locale.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-libstdc++-pic.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-sdk-libstdc++-includes.patch
-       ln -snf ../include /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/sys-include
-       cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
-       cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make install $(EXTRA_INSTALL)
-       cp -f /opt/$(MACHINE)-uClibc/lib/libgcc_s.so /lib
-       cd /lib && ln -sf libgcc_s.so libgcc_s.so.1
-else
        cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
        cd $(DIR_APP) && sed -i 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in
        cd $(DIR_APP) && sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
@@ -184,8 +123,6 @@ else
        cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
        ln -sfv ../usr/bin/cpp /lib
        ln -sfv gcc /usr/bin/cc
-endif
-endif
 else
 ifeq "$(PASS)" "1"
        cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)

diff --git a/lfs/groff b/lfs/groff
index 194877e7818d419fc9592276f07711fd73733a17..1739fee23b16952105477b7ff5e8e77fb0481e4a 100644 (file)
--- a/lfs/groff
+++ b/lfs/groff
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.18.1.1
+VER        = 1.21
 
 THISAPP    = groff-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 511dbd64b67548c99805f1521f82cc5e
+$(DL_FILE)_MD5 = 8b8cd29385b97616a0f0d96d0951c5bf
 
 install : $(TARGET)
 
@@ -70,13 +70,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-debian_fixes-1.patch
-       cd $(DIR_APP) && sed -i -e 's/2010/002D/' -e 's/2212/002D/' \
-                               -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto
        cd $(DIR_APP) && PAGE=A4 ./configure --prefix=/usr --enable-multibyte --disable-nls
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
-       ln -sv eqn /usr/bin/geqn
-       ln -sv tbl /usr/bin/gtbl
+       ln -svf eqn /usr/bin/geqn
+       ln -svf tbl /usr/bin/gtbl
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/python-satsolver b/lfs/intltool
similarity index 70%
rename from lfs/python-satsolver
rename to lfs/intltool
index 0974a151d0d61fe27ed164595cbdcd9b50794557..8fb42aca1c1745cd40924a5341c4b0aa3c409b32 100644 (file)
--- a/lfs/python-satsolver
+++ b/lfs/intltool
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,18 +24,18 @@
 
 include Config
 
-VER        = 0.16.0-20110429-868eae9
+VER        = 0.40.5
 
-THISAPP    = sat-solver-bindings-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
-DL_FROM    = http://source.ipfire.org/source-3.x
+THISAPP    = intltool-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-
-PROG       = python-satsolver
-DEPS       = "libsatsolver"
+PROG       = intltool
 PAK_VER    = 1
 
+DEPS       = ""
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 479f3b57a9f9a59c7b24e37aedda7469
+$(DL_FILE)_MD5 = 3e7ded6f50d88cf8b8bb505eaf591775
 
 install : $(TARGET)
 
@@ -54,8 +54,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist :
-       $(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -70,33 +68,18 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
 $(subst %,%_MD5,$(objects)) :
        @$(MD5)
 
+dist: 
+       @$(PAK)
+
 ###############################################################################
 # Installation Details
 ###############################################################################
+
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-
-       # Workaround for weak tarball
-       @rm -rf $(DIR_APP) && mkdir $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) -C $(DIR_APP)
-
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-satsover-fix-building-without-rpm.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-satsolver-only-python-bindings.patch
-
-       # Aaaahh!
-       cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt
-
-       cd $(DIR_APP) && mkdir build
-       cd $(DIR_APP)/build && cmake .. -DDEBIAN=1 \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DCMAKE_SKIP_RPATH=1 \
-               -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-               -DPYTHON_INCLUDE_PATH=/usr/include/python2.7
-
-       cd $(DIR_APP)/build && make $(PARALELLISMFLAGS)
-
-       # Install only the python bindings. That's all we need.
-       cd $(DIR_APP)/build/bindings/python && make install
-
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index 2292c3ee2c828e465cd671563cfb55e8abb29396..0fd2f3c9130fa3eccccf26c61e6625c7fd6eb8c1 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.9.i586-full-core48.iso.torrent
+DL_FILE    = ipfire-2.9.i586-full-core51.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 24
+PAK_VER    = 27
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 37dd855f48af4efae045eb9b1f971a6e
+$(DL_FILE)_MD5 = fa40cd03e4b0a11f8f703595a5c01a76
 
 install : $(TARGET)
 

diff --git a/lfs/iproute2 b/lfs/iproute2
index 3cc684483b711da7df627a2e4c4e90171e81cb56..50ccf40df3014209153c13f5460aaca6770595b6 100644 (file)
--- a/lfs/iproute2
+++ b/lfs/iproute2
@@ -76,5 +76,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING) SBINDIR=/sbin
        cd $(DIR_APP) && make SBINDIR=/sbin install
        cd $(DIR_APP) && mv -v /sbin/arpd /usr/sbin
+
+       # Add table for static routing
+       echo "200       static" >> /etc/iproute2/rt_tables
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/iw b/lfs/iw
index c3304206a8c4c00824a649e6c732d07d0789c8d2..ec59f23cac8a476ba498b0bfe2e49a6239222198 100644 (file)
--- a/lfs/iw
+++ b/lfs/iw
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.20
+VER        = 0.9.22
 
 THISAPP    = iw-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1055799b544b3e08169d155bb6c21bb0
+$(DL_FILE)_MD5 = 561c2602c5ce7c65a590118286c0892a
 
 install : $(TARGET)
 

diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod
index e443b703447a1dfe922c582de6e2045c5ee2103c..7cb846eb78878eb4120460a5d590f74b81d1077b 100644 (file)
--- a/lfs/kvm-kmod
+++ b/lfs/kvm-kmod
@@ -34,7 +34,7 @@ else
 endif
 endif
 
-VER        = 2.6.34.1
+VER        = 3.0b
 
 THISAPP    = kvm-kmod-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c227b58ee33f6035f16abd258bcd92ec
+$(DL_FILE)_MD5 = 19792041adc25779b31ea5c5fdca7d8c
 
 install : $(TARGET)
 
@@ -83,6 +83,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_pvclock_scale_delta_redefinition.patch
        cd $(DIR_APP) && ./configure --kerneldir=/usr/src/linux
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && install -m 644 x86/*.ko \

diff --git a/lfs/libmpdclient b/lfs/libmpdclient
index 1778beb22d6753d44af5a3b22b33ff9bc7c02a36..afbbb7dc36d51e20a38efe313abef6b222263d50 100644 (file)
--- a/lfs/libmpdclient
+++ b/lfs/libmpdclient
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.1
+VER        = 2.5
 
 THISAPP    = libmpdclient-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libmpdclient
-PAK_VER    = 1
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 67efa0c3d107c090ef277dfb3442d1e3
+$(DL_FILE)_MD5 = c1e359de6fbee3dc052deaeed05350db
 
 install : $(TARGET)
 

diff --git a/lfs/libsatsolver b/lfs/libsolv
similarity index 84%
rename from lfs/libsatsolver
rename to lfs/libsolv
index 778375a2e64c70af7fb20f0160fac0ce6f2e6e04..b602095caa894e18d7e733d1b316017034f580d2 100644 (file)
--- a/lfs/libsatsolver
+++ b/lfs/libsolv
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 0.16.4
+VER        = 0.0.0-0db9d7f
 
-THISAPP    = libsatsolver-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+THISAPP    = libsolv-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-PROG       = libsatsolver
+PROG       = libsolv
 DEPS       = ""
 PAK_VER    = 1
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 563414330c29e9b49be0e43358185a78
+$(DL_FILE)_MD5 = ba95c404d807bc71297c508a7127a3d9
 
 install : $(TARGET)
 
@@ -76,17 +76,19 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsatsolver-Build-only-libraries.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsatsolver-Create-linker-scripts-that-do-only-export-the-needed.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
        # Who releases code with -Werror?
        cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt
 
+       # Disable bindings, examples and tools.
+       cd $(DIR_APP) && sed "/bindings/d" -i CMakeLists.txt
+       cd $(DIR_APP) && sed "/examples/d" -i CMakeLists.txt
+       cd $(DIR_APP) && sed "/tools/d" -i CMakeLists.txt
+
        # Make sure that libsatsolverext is linked properly to all needed
        # libraries.
-       cd $(DIR_APP) && echo "TARGET_LINK_LIBRARIES(satsolverext satsolver \$${EXPAT_LIBRARY} \$${ZLIB_LIBRARY})" \
+       cd $(DIR_APP) && echo "TARGET_LINK_LIBRARIES(libsolvext libsolv \$${EXPAT_LIBRARY} \$${ZLIB_LIBRARY})" \
                >> ext/CMakeLists.txt
 
        # Remove the RPM stuff when we build with -DFEDORA=1 because we

diff --git a/lfs/linux b/lfs/linux
index d9df8fc8a41a15795dee3773b684ac71257fc1c2..cb36d5f8d23b25cbeee49b2d740dc927e205777d 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,18 +24,18 @@
 
 include Config
 
-PATCHLEVEL = .39
-VER        = 2.6.32.39
+PATCHLEVEL = .45
+VER        = 2.6.32.45
 
 THISAPP    = linux-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
 PROG      = linux-xen
-PAK_VER    = 16
+PAK_VER    = 19
 DEPS      = ""
 
 # Normal build or XEN build.
@@ -68,7 +68,7 @@ patch-2.6.16-nath323-1.3.bz2          = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 reiser4-for-2.6.32.patch.bz2           = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
 xen-patches-2.6.32-2f.tar.bz2          = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
 
-$(DL_FILE)_MD5                         = e0e741937640a875392b1820e945be25
+$(DL_FILE)_MD5                         = d41f1c7e704cc95fdfc3374367b6fd64
 netfilter-layer7-v2.22.tar.gz_MD5      = 98dff8a3d5a31885b73341633f69501f
 patch-2.6.16-nath323-1.3.bz2_MD5       = f926409ff703a307baf54b57ab75d138
 reiser4-for-2.6.32.patch.bz2_MD5       = 3246397973d9271eb8e6d7c97c5d2d91
@@ -103,7 +103,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
        ln -s linux-$(VER) /usr/src/linux
 

diff --git a/lfs/linux-firmware b/lfs/linux-firmware
index eb9c4ffeb575ae5a04dfa6a1ba5ad0bbc202c70f..6a7f956527ef330258aa94ece94bd75ca58b439d 100644 (file)
--- a/lfs/linux-firmware
+++ b/lfs/linux-firmware
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 20100318
+VER        = 20110518
 
 THISAPP    = linux-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 57e3ec91c81eee2443b0ab6d83c43633
+$(DL_FILE)_MD5 = 3b215b5ec9a5e8784dd971c039e9b948
 
 install : $(TARGET)
 

diff --git a/lfs/mpc b/lfs/mpc
index 0cd871e9508208783c36a0adef1f3d1a79e58dbe..01872bfec7b82594757e5264c8c5ede6ef29a4c0 100644 (file)
--- a/lfs/mpc
+++ b/lfs/mpc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.19
+VER        = 0.21
 
 THISAPP    = mpc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpc
-PAK_VER    = 4
+PAK_VER    = 6
 
 DEPS       = "mpd libmpdclient"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9ab2967d9ec719b06a86f3b4121be654
+$(DL_FILE)_MD5 = d8f88aad5fa7ed4c6e7005c5ec1ba7c5
 
 install : $(TARGET)
 

diff --git a/lfs/mpd b/lfs/mpd
index e6d86ab039ee195b5545c9281923c2ea2edf872c..f673c85b4e268876f42985a0cc322aecdada3225 100644 (file)
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.15.12
+VER        = 0.16.3
 
 THISAPP    = mpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 11
+PAK_VER    = 13
 
 DEPS       = "alsa faad2 ffmpeg-libs glib lame libshout libogg libid3tag libvorbis"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b00b289a20ecd9accfd4972d6395135c
+$(DL_FILE)_MD5 = 6e708c02b0e8c288aec855eecf441a5a
 
 install : $(TARGET)
 
@@ -76,8 +76,11 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-ipv6
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr \
+                                       --disable-ipv6 \
+                                       --sysconfdir=/etc \
+                                       --disable-sqlite
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/mpfire b/lfs/mpfire
index 5a8b85feda6f1de16a89c16bf3d93843b7e6898c..facb1798cce6576523b726a809df228ade84c611 100644 (file)
--- a/lfs/mpfire
+++ b/lfs/mpfire
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  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        #
@@ -30,7 +30,7 @@ THISAPP    = mpfire-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpfire
-PAK_VER    = 10
+PAK_VER    = 11
 
 DEPS       = "mpd mpc"
 

diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe
new file mode 100644 (file)
index 0000000..34bc5a8
--- /dev/null
+++ b/lfs/nagios_nrpe
@@ -0,0 +1,87 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.12
+
+THISAPP    = nrpe-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+PROG       = nagios_nrpe
+PAK_VER    = 1
+
+DEPS       = "nagios"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = b2d75e2962f1e3151ef58794d60c9e97
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib/nagios \
+                           --with-nrpe-user=nobody --with-nrpe-group=nobody \
+                           --with-nagios-user=nobody --with-nagios-group=nobody
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/pakfire3-deps b/lfs/pakfire3-deps
new file mode 100644 (file)
index 0000000..3a34e4f
--- /dev/null
+++ b/lfs/pakfire3-deps
@@ -0,0 +1,56 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER       = 0
+
+THISAPP    = pakfire3-deps
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG      = pakfire3-deps
+PAK_VER    = 1
+DEPS       = "intltool git make libsatsolver python-satsolver python-distutils python-distutils-extra python-lzma python-progressbar python-xattr sqlite urlgrabber"
+
+###############################################################################
+
+install : $(TARGET)
+
+check :
+
+download :
+
+md5 :
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       #Create a file for the package. Because empty rootfile will break.
+       echo "# Pakfire 3 deps is installed" > /var/ipfire/pakfire3-deps
+       @$(POSTBUILD)

diff --git a/lfs/perl b/lfs/perl
index f507544c425456944db3a40ae4ad5c027d6c0403..c4ddc8e7604e5157e5de4126288daeb87e7e78cf 100644 (file)
--- a/lfs/perl
+++ b/lfs/perl
@@ -80,6 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifneq "$(ROOT)" ""
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-libc-2.patch
 endif
+       cd $(DIR_APP) && sed -i -e 's|-fstack-protector|-fno-stack-protector|g' Configure
 ifeq "$(ROOT)" ""
        cd $(DIR_APP) && ./configure.gnu --prefix=/usr -Dman1dir=/usr/share/man/man1 \
                -Dman3dir=/usr/share/man/man3 -Dpager="/usr/bin/less -isR" -Dusethreads

diff --git a/lfs/python b/lfs/python
index 3a226b66c21361071d7a9d8899496afd75b12913..0deaadd1104ee8f29969ac05d7fa453a1cf58e5a 100644 (file)
--- a/lfs/python
+++ b/lfs/python
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.7
+VER        = 2.7.2
 
 THISAPP    = Python-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0e8c9ec32abf5b732bea7d91b38c3339
+$(DL_FILE)_MD5 = 75c87a80c6ddb0b785a57ea3583e04fa
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gdbm-1.patch
        cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared
        cd $(DIR_APP) && make $(MAKETUNING)

diff --git a/lfs/python-distutils b/lfs/python-distutils
new file mode 100644 (file)
index 0000000..42ea44e
--- /dev/null
+++ b/lfs/python-distutils
@@ -0,0 +1,37 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER       = 2.7.1
+
+include python
+
+PROG      = python-distutils
+PAK_VER    = 2
+DEPS       =
+
+dist: 
+       @$(PAK)
+

diff --git a/lfs/python-distutils-extra b/lfs/python-distutils-extra
new file mode 100644 (file)
index 0000000..f35b581
--- /dev/null
+++ b/lfs/python-distutils-extra
@@ -0,0 +1,85 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.25
+
+THISAPP    = python-distutils-extra-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python-distutils-extra
+PAK_VER    = 1
+
+DEPS       = "python-distutils"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 76d298db8d6d4fcdbf5d190046f70362
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && python setup.py install
+       mv -f /usr/lib/python2.7/site-packages/python_distutils_extra-$(VER)-py2.7.egg/DistUtilsExtra \
+               /usr/lib/python2.7/site-packages/
+       rm -rf  /usr/lib/python2.7/site-packages/python_distutils_extra-$(VER)-py2.7.egg
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/python-lzma b/lfs/python-lzma
new file mode 100644 (file)
index 0000000..f2f6aab
--- /dev/null
+++ b/lfs/python-lzma
@@ -0,0 +1,87 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.5.3
+
+THISAPP    = pyliblzma-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python-lzma
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 500f61116ee1ab4063b49c121786863a
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && python setup.py install
+       # unzip the egg because it won't work without
+       cd /usr/lib/python2.7/site-packages && \
+               unzip pyliblzma-$(VER)-py2.7-linux-i686.egg
+       rm -rf /usr/lib/python2.7/site-packages/pyliblzma-$(VER)-py2.7-linux-i686.egg
+       rm -rf /usr/lib/python2.7/site-packages/EGG-INFO
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/python-optional-src b/lfs/python-optional-src
index d193f3dad0ed0517601a745cae08b891117dfc71..7b9e0c7c8625bd8aadf6b8c3a5dd62b691ca8cb8 100644 (file)
--- a/lfs/python-optional-src
+++ b/lfs/python-optional-src
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2011  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        #
@@ -24,12 +24,12 @@
 
 include Config
 
-VER       = 2.7
+VER       = 2.7.1
 
 include python
 
 PROG      = python-optional-src
-PAK_VER    = 1
+PAK_VER    = 2
 DEPS       =
 
 dist: 

diff --git a/lfs/python-progressbar b/lfs/python-progressbar
new file mode 100644 (file)
index 0000000..cae318e
--- /dev/null
+++ b/lfs/python-progressbar
@@ -0,0 +1,82 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.2
+
+THISAPP    = progressbar-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python-progressbar
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 8ea4e2c17a8ec9e7d153767c5f2a7b28
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && python setup.py install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/python-xattr b/lfs/python-xattr
new file mode 100644 (file)
index 0000000..8932ccf
--- /dev/null
+++ b/lfs/python-xattr
@@ -0,0 +1,82 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.5.0
+
+THISAPP    = pyxattr-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python-xattr
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 0f7ab1e185087329e40f7de218517c84
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && python setup.py install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/qemu b/lfs/qemu
index 7925f0d3b8301102150070700911280a438fd8c2..20f594241a7df224fbdcfa864a57567f0a421c95 100644 (file)
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 0.12.3
+VER        = 0.15.0
 
-THISAPP    = qemu-$(VER)
+THISAPP    = qemu-kvm-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = qemu
-PAK_VER    = 10
+PAK_VER    = 13
 
 DEPS       = "sdl"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d215e4568650e8019816397174c090e1
+$(DL_FILE)_MD5 = b45b0deebba4ce47dcaaab3807f6ed47
 
 install : $(TARGET)
 
@@ -77,8 +77,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr \
-               --target-list="i386-linux-user i386-softmmu"
+
+       cd $(DIR_APP) && sed -i -e 's|CFLAGS+="-march=i486"|CFLAGS+=""|g' configure
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.15.0_missing_definitions_hack.patch
+
+       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
+               --target-list="i386-linux-user i386-softmmu arm-softmmu"
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/rsync b/lfs/rsync
index a68e191afd4532ce30f16a49efee4e3be08575ba..e15198727dbb10f6f1fc15292b0a6db3f2419e0c 100644 (file)
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.0.7
+VER        = 3.0.8
 
 THISAPP    = rsync-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b53525900817cf1ba7ad3a516ab5bfe9
+$(DL_FILE)_MD5 = 0ee8346ce16bdfe4c88a236e94c752b4
 
 install : $(TARGET)
 

diff --git a/lfs/samba b/lfs/samba
index 449cb12fd2e5fd72bf3b6adde1d54b8a071db160..bd2c32a0f82ea26ded5937c60b44ff1c06ef9afe 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.5.8
+VER        = 3.5.11
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 34
+PAK_VER    = 36
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 355b4530c20997e94aebc74cd6ea5307
+$(DL_FILE)_MD5 = 81bbd16048c6ca40baea8c59126ee385
 
 install : $(TARGET)
 

diff --git a/lfs/sane b/lfs/sane
index 742fc70dbf39dfdce4249db8d72295c7bc111195..96341b6e0cce6f9bc4a561051a5f89263582d5b7 100644 (file)
--- a/lfs/sane
+++ b/lfs/sane
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,23 +24,16 @@
 
 include Config
 
-VER        = 1.0.19
+VER        = 1.0.22
 
 THISAPP    = sane-$(VER)
 DL_FILE    = sane-backends-$(VER).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/sane-backends-$(VER)
-ifeq "$(KMOD)" "1"
-ifeq "$(SMP)" "1"
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-smp
-else
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod
-endif
-else
 TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+
 PROG       = sane
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = "libtiff"
 
@@ -52,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8c0936272dcfd4e98c51512699f1c06f
+$(DL_FILE)_MD5 = fadf56a60f4776bfb24491f66b617cf5
 
 install : $(TARGET)
 
@@ -85,21 +78,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(KMOD)" "1"
-       cd $(DIR_APP)/doc/plustek && cp -vf Makefile.kernel26 \
-                               $(DIR_APP)/backend/Makefile
-ifeq "$(SMP)" "1"
-       cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire-smp/build/ \
-                                   SUBDIRS=$(DIR_APP)/backend modules
-       cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \
-           /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/parport/
-else
-       cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire/build/ \
-                                   SUBDIRS=$(DIR_APP)/backend modules
-       cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \
-           /lib/modules/$(KVER)-ipfire/kernel/drivers/parport/
-endif
-else
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
                                     --disable-ipv6 \
                                     --enable-parport-directio
@@ -112,7 +90,5 @@ else
        ln -sf ../init.d/sane /etc/rc.d/rc6.d/K10sane
        install -v -m 644 $(DIR_SRC)/config/backup/includes/sane  \
                        /var/ipfire/backup/addons/includes/sane
-endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
-       
\ No newline at end of file

diff --git a/lfs/smartmontools b/lfs/smartmontools
index 5530f2108f6748a8347212028eac59c3e72b58b2..3f92cb78211a332de453b4659c4618b851a3c7a1 100644 (file)
--- a/lfs/smartmontools
+++ b/lfs/smartmontools
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.40
+VER        = 5.41
 
 THISAPP    = smartmontools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f0be0239914ad87830a4fff594bda5b
+$(DL_FILE)_MD5 = 4577886bea79d4ff12bd9a7d323ce692
 
 install : $(TARGET)
 

diff --git a/lfs/sqlite b/lfs/sqlite
index 2e56feb589d532cac6fe741205cd7a794812d865..5bc694a28b0c18fe40ebd18e93a72492f6469fa7 100644 (file)
--- a/lfs/sqlite
+++ b/lfs/sqlite
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 3.6.10
+VER        = 3070603
 
-THISAPP    = sqlite-$(VER)
+THISAPP    = sqlite-autoconf-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sqlite
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a03bdc86df4025b6881d58557e4b5bd3
+$(DL_FILE)_MD5 = 7eb41eea5ffa5cbe359a48629084c425
 
 install : $(TARGET)
 

diff --git a/lfs/squid b/lfs/squid
index bdc164620a72059bedf41951a80fb6ea25ff2866..f85b5e9a8029cf47df49042843b0f5cd5ce341c5 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.11
+VER        = 3.1.14
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1
+$(DL_FILE)_MD5 = 8f82a451b04c3bf3c29202c548d2f2dd
 
 install : $(TARGET)
 

diff --git a/lfs/strongswan b/lfs/strongswan
index 380d351d9fd864aed723ca18f5d3d970080503a0..1efd283bbed4c9d19e43dd050b5981cb255eadc8 100644 (file)
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.5.0
+VER        = 4.5.3
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = cfbd6efef87830a2e7cc4175bde7ac84
+$(DL_FILE)_MD5 = ee7c50a90c91307b111e8085f2479890
 
 install : $(TARGET)
 

diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch
index 3046171bb5665ae8e331c2f83c8a2f673292428f..e5ae0ed791690309c24baa7c64df38616bd176e3 100644 (file)
--- a/lfs/usb_modeswitch
+++ b/lfs/usb_modeswitch
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.6
+VER        = 1.1.9
 
 THISAPP    = usb-modeswitch-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = be3c7fc908e6ab50eb9fd29d187ad176
+$(DL_FILE)_MD5 = 76f6978f18cac41f269a346a5d0f1052
 
 install : $(TARGET)
 
@@ -73,6 +73,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make clean
        cd $(DIR_APP) && make all $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
-       cp -f $(DIR_APP)/device_reference.txt /etc/usb_modeswitch.setup.example
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data
index f32208039f453e7e04f2d2f0610e6f8a02601ebe..9afafada1aa836dc88acd2b48ce5f97ff3cac89c 100644 (file)
--- a/lfs/usb_modeswitch_data
+++ b/lfs/usb_modeswitch_data
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 20101222
+VER        = 20110805
 
 THISAPP    = usb-modeswitch-data-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e386386bc389c2a8184c7ea4136fde0e
+$(DL_FILE)_MD5 = 0ed8a28f8efd3177a128ecd46fc8bf9f
 
 install : $(TARGET)
 

diff --git a/lfs/wireless-regdb b/lfs/wireless-regdb
new file mode 100644 (file)
index 0000000..2228c22
--- /dev/null
+++ b/lfs/wireless-regdb
@@ -0,0 +1,76 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2011  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        #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2011.04.28
+
+THISAPP    = wireless-regdb-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 16b7fabd4d7761ccf206702a3f18cce9
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/zd1211-firmware b/lfs/zd1211-firmware
new file mode 100644 (file)
index 0000000..25a9c4a
--- /dev/null
+++ b/lfs/zd1211-firmware
@@ -0,0 +1,76 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2011  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        #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.4
+
+THISAPP    = zd1211-firmware-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/zd1211-firmware
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 19f28781d76569af8551c9d11294c870
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       mkdir -p /lib/firmware/zd1211
+       cd $(DIR_APP) && cp -v * /lib/firmware/zd1211
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index ccb1dbca44dc58205b543c764ba6fc139be1fac3..af884716983617250e1aeb4f7b4d594a960e1838 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.10"                                                 # Version number
-CORE="49"                                                      # Core Level (Filename)
-PAKFIRE_CORE="48"                                              # Core Level (PAKFIRE)
+CORE="52"                                                      # Core Level (Filename)
+PAKFIRE_CORE="51"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -358,6 +358,7 @@ buildipfire() {
   ipfiremake which
   ipfiremake xz
   ipfiremake linux-firmware
+  ipfiremake zd1211-firmware
   ipfiremake linux                     XEN=1
   ipfiremake kqemu                     XEN=1
   ipfiremake v4l-dvb                   XEN=1
@@ -417,6 +418,8 @@ buildipfire() {
   ipfiremake pam
   ipfiremake openssl
   ipfiremake curl
+  ipfiremake tcl
+  ipfiremake sqlite
   ipfiremake python
   ipfiremake fireinfo
   ipfiremake libnet
@@ -612,6 +615,7 @@ buildipfire() {
   ipfiremake phpSANE
   ipfiremake tunctl
   ipfiremake nagios
+  ipfiremake nagios_nrpe
   ipfiremake ebtables
   ipfiremake fontconfig
   ipfiremake freefont
@@ -650,7 +654,6 @@ buildipfire() {
   ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
-  ipfiremake sqlite
   ipfiremake taglib
   ipfiremake mediatomb
   ipfiremake sslh
@@ -681,7 +684,6 @@ buildipfire() {
   ipfiremake pound
   ipfiremake minicom
   ipfiremake ddrescue
-  ipfiremake tcl
   ipfiremake imspector
   ipfiremake miniupnpd
   ipfiremake client175
@@ -689,9 +691,15 @@ buildipfire() {
   ipfiremake parted
   ipfiremake swig
   ipfiremake python-m2crypto
+  ipfiremake wireless-regdb
   ipfiremake crda
-  ipfiremake libsatsolver
-  ipfiremake python-satsolver
+  ipfiremake libsolv
+  ipfiremake python-distutils-extra
+  ipfiremake python-lzma
+  ipfiremake python-progressbar
+  ipfiremake python-xattr
+  ipfiremake intltool
+  ipfiremake pakfire3-deps
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild

diff --git a/src/hwdata/pci.ids b/src/hwdata/pci.ids
index 1eb38cc68a7d648590fc04fb7d882c2ecb2b5655..79cbd3ce16005c5a89b475903406f183eaab320d 100644 (file)
--- a/src/hwdata/pci.ids
+++ b/src/hwdata/pci.ids
@@ -1,8 +1,8 @@
 #
 #      List of PCI ID's
 #
-#      Version: 2011.01.06
-#      Date:    2011-01-06 14:51:03
+#      Version: 2011.06.23
+#      Date:    2011-06-23 03:15:04
 #
 #      Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
 #      PCI ID Project at http://pciids.sf.net/.
@@ -84,8 +84,6 @@
 0432  SCM Microsystems, Inc.
        0001  Pluto2 DVB-T Receiver for PCMCIA [EasyWatch MobilSet]
 045e  Microsoft
-       006e  MN-510 802.11b wireless USB paddle
-       00c2  MN-710 wireless USB paddle
 0482  Kyocera
 # vendor code used for (at a minimum) RSA cards
 04b3  IBM Corp.
@@ -93,7 +91,6 @@
 04cf  Myson Century, Inc
        8818  CS8818 USB2.0-to-ATAPI Bridge Controller with Embedded PHY
 050d  Belkin
-       001a  FSD7000 802.11g PCI Wireless card
 058f  Alcor Micro Corporation
 05a9  OmniVision
        8519  OV519 series
@@ -109,6 +106,7 @@
        1704  ISDN Adapter (PCI Bus, D, C)
 069d  Hughes Network Systems (HNS)
 0721  Sapphire, Inc.
+0777  Ubiquiti Networks, Inc.
 0795  Wired Inc.
        6663  Butane II (MPEG2 encoder board)
        6666  MediaPress (MPEG2 encoder board)
@@ -366,6 +364,7 @@
        0055  SAS1068 PCI-X Fusion-MPT SAS
                1033 8336  SAS1068
        0056  SAS1064ET PCI-Express Fusion-MPT SAS
+               1014 03bb  ServeRAID BR10il SAS/SATA Controller v2
        0057  M1064E MegaRAID SAS
                8086 346c  Embedded Software RAID Technology II (ESTRII)
        0058  SAS1068E PCI-Express Fusion-MPT SAS
@@ -377,15 +376,17 @@
                103c 3229  SC44Ge Host Bus Adapter
        0059  MegaRAID SAS 8208ELP/8208ELP
        005a  SAS1066E PCI-Express Fusion-MPT SAS
-       005b  MegaRAID SAS TB
+       005b  MegaRAID SAS 2208 [Thunderbolt]
                1028 1f2d  PERC H810 Adapter
-               1028 1f31  PERC H710 Adapter
-               1028 1f33  PERC H710 Mini (for blades)
-               1028 1f34  PERC H710 Mini (for monolithics)
-               1028 1f35  PERC H510 Adapter
-               1028 1f37  PERC H510 Mini (for blades)
-               1028 1f38  PERC H510 Mini (for monolithics)
+               1028 1f30  PERC H710 Embedded
+               1028 1f31  PERC H710P Adapter
+               1028 1f33  PERC H710P Mini (for blades)
+               1028 1f34  PERC H710P Mini (for monolithics)
+               1028 1f35  PERC H710 Adapter
+               1028 1f37  PERC H710 Mini (for blades)
+               1028 1f38  PERC H710 Mini (for monolithics)
        005c  SAS1064A PCI-X Fusion-MPT SAS
+       005d  MegaRAID SAS-3 3108 [Invader]
        005e  SAS1066 PCI-X Fusion-MPT SAS
        0060  MegaRAID SAS 1078
                1000 1006  MegaRAID SAS 8888ELP
@@ -430,8 +431,9 @@
                1028 1f1e  PERC H200 Integrated
                1028 1f1f  PERC H200 Modular
                1028 1f20  PERC H200 Embedded
+               1028 1f22  Internal Tape Adapter
        0073  MegaRAID SAS 9240
-               1000 9240  MegaRAID SAS 9240-4i
+               1000 9240  MegaRAID SAS 9240-8i
                1000 9241  MegaRAID SAS 9240-4i
                1014 03b1  ServeRAID M1015 SAS/SATA Controller
                1028 1f4e  PERC H310 Adapter
@@ -451,7 +453,7 @@
        0074  SAS2108 PCI-Express Fusion-MPT SAS-2 [Liberator]
        0076  SAS2108 PCI-Express Fusion-MPT SAS-2 [Liberator]
        0077  SAS2108 PCI-Express Fusion-MPT SAS-2 [Liberator]
-       0079  LSI MegaSAS 9260
+       0079  MegaRAID SAS 2108 [Liberator]
                1000 9251  MegaRAID SAS 9260-4ix
                1000 9256  MegaRAID SAS 9260-8ix
                1000 9262  MegaRAID SAS 9262-8i
@@ -482,6 +484,7 @@
                8086 9268  RAID Controller RS2VB080
        007c  MegaRAID SAS 1078DE
                1014 0395  ServeRAID-AR10is SAS/SATA Controller
+       007e  SSS6200 PCI-Express Flash SSD
        0080  SAS2208 PCI-Express Fusion-MPT SAS-2
        0081  SAS2208 PCI-Express Fusion-MPT SAS-2
        0082  SAS2208 PCI-Express Fusion-MPT SAS-2
@@ -594,6 +597,7 @@
        0017  PROTO-3 PCI Prototyping board
        9100  INI-9100/9100W SCSI Host
 1002  ATI Technologies Inc
+       1314  HDMI Audio out for AMD Radeon HD 6310 Graphics
        3150  M24 1P [Radeon Mobility X600]
                103c 0934  nx8220
        3151  M24 [FireMV 2400]
@@ -691,6 +695,7 @@
        4370  IXP SB400 AC'97 Audio Controller
                1025 0079  Aspire 5024WLMMi
                1025 0091  Aspire 5032WXMi
+               103c 2a05  Pavilion t3030.de Desktop PC
                103c 308b  MX6125
                105b 0c81  Realtek ALC 653
                107b 0300  MX6421
@@ -700,27 +705,33 @@
                1462 7217  Aspire L250
        4372  IXP SB400 SMBus Controller
                1025 0080  Aspire 5024WLMMi
+               103c 2a20  Pavilion t3030.de Desktop PC
                103c 308b  MX6125
                1462 0131  MS-1013 Notebook
                1462 7217  Aspire L250
        4373  IXP SB400 USB2 Host Controller
                1025 0080  Aspire 5024WLMMi
+               103c 2a20  Pavilion t3030.de Desktop PC
                103c 308b  MX6125
                1462 7217  Aspire L250
        4374  IXP SB400 USB Host Controller
+               103c 2a20  Pavilion t3030.de Desktop PC
                103c 308b  MX6125
                1462 7217  Aspire L250
        4375  IXP SB400 USB Host Controller
                1025 0080  Aspire 5024WLMMi
+               103c 2a20  Pavilion t3030.de Desktop PC
                103c 308b  MX6125
                1462 7217  Aspire L250
        4376  IXP SB400 IDE Controller
                1025 0080  Aspire 5024WLMMi
+               103c 2a20  Pavilion t3030.de Desktop PC
                103c 308b  MX6125
                1462 0131  MS-1013 Notebook
                1462 7217  Aspire L250
        4377  IXP SB400 PCI-ISA Bridge
                1025 0080  Aspire 5024WLMi
+               103c 2a20  Pavilion t3030.de Desktop PC
                103c 308b  MX6125
                1462 7217  Aspire L250
        4378  SB400 AC'97 Modem Controller
@@ -740,6 +751,7 @@
                1734 10b8  Realtek High Definition Audio
        4380  SB600 Non-Raid-5 SATA
                103c 2813  DC5750 Microtower
+               1179 ff50  Satellite P305D-S8995E
                1458 b003  GA-MA790FX-DS5 (rev. 1.0)
                1458 b005  Gigabyte GA-MA69G-S3H Motherboard
                1462 7327  K9AG Neo2
@@ -747,76 +759,92 @@
        4381  SB600 Raid-5 SATA
        4382  SB600 AC97 Audio
        4383  SBx00 Azalia (Intel HDA)
+               103c 1611  Pavilion DM1Z-3000
                103c 280a  DC5750 Microtower
                1043 8230  M3A78-EH Motherboard
                1043 836c  M4A785TD Motherboard
+               1043 8410  M4A89GTD PRO/USB3 Motherboard
+               1179 ff50  Satellite P305D-S8995E
                1458 a022  GA-MA770-DS3rev2.0 Motherboard
                17f2 5000  KI690-AM2 Motherboard
        4384  SBx00 PCI to PCI Bridge
        4385  SBx00 SMBus Controller
+               103c 1611  Pavilion DM1Z-3000
                103c 280a  DC5750 Microtower
                1043 82ef  M3A78-EH Motherboard
                1043 8389  M4A785TD Motherboard
+               1179 ff50  Satellite P305D-S8995E
                1458 4385  GA-MA770-DS3rev2.0 Motherboard
                1462 7368  K9AG Neo2
                17f2 5000  KI690-AM2 Motherboard
        4386  SB600 USB Controller (EHCI)
                103c 280a  DC5750 Microtower
+               1179 ff50  Satellite P305D-S8995E
                1462 7368  K9AG Neo2
                17f2 5000  KI690-AM2 Motherboard
        4387  SB600 USB (OHCI0)
                103c 280a  DC5750 Microtower
+               1179 ff50  Satellite P305D-S8995E
                1462 7368  K9AG Neo2
                17f2 5000  KI690-AM2 Motherboard
        4388  SB600 USB (OHCI1)
                103c 280a  DC5750 Microtower
+               1179 ff50  Satellite P305D-S8995E
                1462 7368  K9AG Neo2
                17f2 5000  KI690-AM2 Motherboard
        4389  SB600 USB (OHCI2)
                103c 280a  DC5750 Microtower
+               1179 ff50  Satellite P305D-S8995E
                1462 7368  K9AG Neo2
                17f2 5000  KI690-AM2 Motherboard
        438a  SB600 USB (OHCI3)
                103c 280a  DC5750 Microtower
+               1179 ff50  Satellite P305D-S8995E
                1462 7368  K9AG Neo2
                17f2 5000  KI690-AM2 Motherboard
        438b  SB600 USB (OHCI4)
                103c 280a  DC5750 Microtower
+               1179 ff50  Satellite P305D-S8995E
                1462 7368  K9AG Neo2
                17f2 5000  KI690-AM2 Motherboard
        438c  SB600 IDE
                103c 280a  DC5750 Microtower
+               1179 ff50  Satellite P305D-S8995E
                1458 5002  Gigabyte GA-MA69G-S3H Motherboard
                1462 7368  K9AG Neo2
                17f2 5000  KI690-AM2 Motherboard
        438d  SB600 PCI to LPC Bridge
                103c 280a  DC5750 Microtower
+               1179 ff50  Satellite P305D-S8995E
                1462 7368  K9AG Neo2
                17f2 5000  KI690-AM2 Motherboard
        438e  SB600 AC97 Modem
-       4390  SB700/SB800 SATA Controller [IDE mode]
+       4390  SB7x0/SB8x0/SB9x0 SATA Controller [IDE mode]
                1043 82ef  M3A78-EH Motherboard
                1043 8389  M4A785TD Motherboard
                1458 b002  GA-MA770-DS3rev2.0 Motherboard
                1849 4390  Motherboard (one of many)
-       4391  SB700/SB800 SATA Controller [AHCI mode]
+       4391  SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode]
+               103c 1611  Pavilion DM1Z-3000
                1043 82ef  M3A78-EH Motherboard
-       4392  SB700/SB800 SATA Controller [Non-RAID5 mode]
-       4393  SB700/SB800 SATA Controller [RAID5 mode]
-# 4394 is same as 4391, for AHCI mode
-       4394  SB700/SB800 SATA Controller [AHCI mode]
-       4395  SB800 SATA Controller [Storage mode with HyperFlash-PCIE]
-       4396  SB700/SB800 USB EHCI Controller
+       4392  SB7x0/SB8x0/SB9x0 SATA Controller [Non-RAID5 mode]
+       4393  SB7x0/SB8x0/SB9x0 SATA Controller [RAID5 mode]
+       4394  SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode]
+       4395  SB8x0/SB9x0 SATA Controller [Storage mode]
+       4396  SB7x0/SB8x0/SB9x0 USB EHCI Controller
+               103c 1611  Pavilion DM1Z-3000
                1043 82ef  M3A78-EH Motherboard
-       4397  SB700/SB800 USB OHCI0 Controller
+       4397  SB7x0/SB8x0/SB9x0 USB OHCI0 Controller
+               103c 1611  Pavilion DM1Z-3000
                1043 82ef  M3A78-EH Motherboard
-       4398  SB700 USB OHCI1 Controller
+       4398  SB7x0 USB OHCI1 Controller
                1043 82ef  M3A78-EH Motherboard
-       4399  SB700/SB800 USB OHCI2 Controller
+       4399  SB7x0/SB8x0/SB9x0 USB OHCI2 Controller
                1043 82ef  M3A78-EH Motherboard
-       439c  SB700/SB800 IDE Controller
+       439c  SB7x0/SB8x0/SB9x0 IDE Controller
                1043 82ef  M3A78-EH Motherboard
-       439d  SB700/SB800 LPC host controller
+       439d  SB7x0/SB8x0/SB9x0 LPC host controller
+               103c 1611  Pavilion DM1Z-3000
                1043 82ef  M3A78-EH Motherboard
        4437  Radeon Mobility 7000 IGP
        4554  210888ET [Mach64 ET]
@@ -987,6 +1015,7 @@
                0e11 b111  Evo N600c
                1014 0235  ThinkPad A30/A30p (2652/2653)
                1014 0239  ThinkPad X22/X23/X24
+               103c 0025  XE4500 Notebook
                104d 80e7  VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP
                104d 8140  PCG-Z1SP laptop
                1509 1930  Medion MD9703
@@ -1280,6 +1309,7 @@
        5950  RS480 Host Bridge
                1025 0080  Aspire 5024WLMMi
                103c 280a  DC5750 Microtower
+               103c 2a20  Pavilion t3030.de Desktop PC
                103c 308b  MX6125
                1462 0131  MS-1013 Notebook
                1462 7217  Aspire L250
@@ -1436,17 +1466,34 @@
        5e6d  RV410 [Radeon X700 (PCIE)] (Secondary)
                148c 2117  PowerColor Bravo X700
        5f57  R423 [Radeon X800XT (PCIE)]
-       6738  AMD Radeon HD 6800 Series Video Card
+       6718  Cayman XT [AMD Radeon HD 6900 Series]
+       6719  Cayman PRO [AMD Radeon 6900 Series]
+       671d  Antilles [AMD Radeon HD 6990]
+       671f  NI CAYMAN [Radeon HD 6900 Series]
+       6720  Blackcomb [AMD Radeon HD 6900M Series]
+       6738  Barts XT [ATI Radeon HD 6800 Series]
+       6739  Barts PRO [ATI Radeon HD 6800 Series]
+       673e  Barts LE [AMD Radeon HD 6700 Series]
+       6740  Whistler XT [AMD Radeon HD 6700M Series]
        6741  NI Whistler [AMD Radeon HD 6600M Series]
+       6742  Whistler LE [AMD Radeon HD 6625M Graphics]
+       6743  NI WHISTLER [Radeon E6760]
+       6750  Turks [AMD Radeon HD 6500 series]
+       6758  Turks XT [AMD Radeon HD 6600 Series]
        6759  NI Turks [AMD Radeon HD 6500]
        6760  NI Seymour [AMD Radeon HD 6470M]
        6761  NI Seymour [AMD Radeon HD 6430M]
+       6763  NI SEYMOUR [Radoen] E6460
+       6770  NI CAICOS [AMD Radeon HD 6400 Series]
        6779  NI Caicos [AMD RADEON HD 6450]
+       6858  SI LOMBOK [Radoen HD 6000 Series]
+       6889  EG Cypress [FirePro V7800]
        688c  Cypress [AMD FireStream 9370]
        688d  Cypress [AMD FireStream 9350]
        6898  Radeon HD 5870 (Cypress)
                1462 8032  R5870 PM2D1G
        6899  Cypress [Radeon HD 5800 Series]
+       689b  EG CYPRESS [Radeon HD 6800 Series]
        689c  Hemlock [ATI Radeon HD 5900 Series]
        689e  Radeon HD 5800 Series (Cypress LE)
        68a0  Broadway XT [Mobility Radeon HD 5800 Series]
@@ -1455,10 +1502,12 @@
        68a8  Broadway [ATI Mobility Radeon HD 6800 Series]
        68b8  Juniper [Radeon HD 5700 Series]
        68b9  Juniper [ATI Radeon HD 5600/5700]
+       68ba  Juniper XT [AMD Radeon HD 6000 Series]
        68be  Juniper [Radeon HD 5750 Series]
+       68bf  Juniper LE [AMD Radeon HD 6700 Series]
        68c0  Madison [Mobility Radeon HD 5000 Series]
                103c 1521  Madison XT [FirePro M5800]
-       68c1  Redwood [Radeon HD 5600 Series]
+       68c1  Madison [AMD Radeon HD 5000M Series]
                1025 0347  Aspire 7740G
                103c 1521  Madison Pro [FirePro M5800]
        68c7  Pinewood [Radeon HD 5570]
@@ -1466,10 +1515,13 @@
        68d8  Redwood [Radeon HD 5670]
        68d9  Redwood PRO [Radeon HD 5500 Series]
        68da  Redwood PRO [Radeon HD 5500 Series]
-       68e0  Manhattan [Mobility Radeon HD 5000 Series]
+       68e0  Manhattan [Mobility Radeon HD 5400 Series]
+               103c 1486  TouchSmart tm2-2050er discrete GPU (Mobility Radeon HD 5450)
        68e1  Manhattan [Mobility Radeon HD 5430 Series]
        68e4  Robson CE [AMD Radeon HD 6300 Series]
        68e5  Robson LE [AMD Radeon HD 6300M Series]
+       68f1  Cadar [FirePro 2460]
+       68f2  Cedar [FirePro 2270]
        68f9  Cedar PRO [Radeon HD 5450]
        700f  PCI Bridge [IGP 320M]
        7010  PCI Bridge [IGP 340M]
@@ -1518,6 +1570,7 @@
        7166  RV515 [Radeon X1300] (Secondary)
                1002 0323  All-in-Wonder 2006 PCI-E Edition (Secondary)
                1545 1997  Radeon X1300 512MB PCI-e (Secondary)
+       7167  RV515 [Radeon X1550 64-bit] (Secondary)
        716e  RV515LE [Radeon X1300] Secondary
        7172  RV515GL [FireGL V3300] (Secondary)
        7173  RV515GL [FireGL V3350] (Secondary)
@@ -1554,7 +1607,7 @@
        71c7  RV535 [Radeon X1650 Series]
        71ce  RV530LE [Radeon X1600]
        71d2  RV530GL [FireGL V3400]
-       71d4  M56GL [Mobility FireGL V5250]
+       71d4  M66GL [ATI Mobility FireGL V5250]
        71d5  M66-P [Mobility Radeon X1700]
        71d6  M66-XT [Mobility Radeon X1700]
        71de  RV530LE [Radeon X1600]
@@ -1599,6 +1652,7 @@
        7835  Radeon Mobility 9200 IGP
        7838  Radeon 9100 IGP PCI/AGP Bridge
        7910  RS690 Host Bridge
+               1179 ff50  Satellite P305D-S8995E
                17f2 5000  KI690-AM2 Motherboard
        7911  RS690 Host Bridge
        7912  RS690 PCI to PCI Bridge (Internal gfx)
@@ -1608,11 +1662,13 @@
        7917  RS690 PCI to PCI Bridge (PCI Express Port 3)
                1002 7910  RS690 PCI to PCI Bridge
        7919  Radeon X1200 Series Audio Controller
+               1179 7919  Satellite P305D-S8995E
                17f2 5000  KI690-AM2 Motherboard
        791e  RS690 [Radeon X1200 Series]
                1462 7327  K9AG Neo2
                17f2 5000  KI690-AM2 Motherboard
        791f  RS690M [Radeon X1200 Series]
+               1179 ff50  Satellite P305D-S8995E
        7930  Radeon Xpress 7930 Host Bridge
        7932  RS7932 PCI Bridge
        7933  RS7933 PCI Bridge
@@ -1633,6 +1689,7 @@
        9440  RV770 [Radeon HD 4870]
        9441  R700 [Radeon HD 4870 X2]
        9442  RV770 [Radeon HD 4850]
+               1002 0502  MSI R4850-T2D512
                174b e810  Sapphire HD 4850 512MB GDDR3 PCI-E Dual Slot Fansink
        9443  R700 [Radeon HD 4850]
        944a  M98L [Mobility Radeon HD 4850]
@@ -1641,7 +1698,7 @@
        9450  RV770 [FireStream 9270]
        9452  RV770 [FireStream 9250]
        945a  M98 XT [Mobility Radeon HD 4870]
-       9460  RV790 [Radeon HD 4800 Series]
+       9460  RV790 [Radeon HD 4890]
        9462  RV790LE [Radeon HD 4800 Series]
        9480  M96 [Mobility Radeon HD 4650]
                103c 3628  ATI Mobility Radeon HD 4650 [dv6-1190en]
@@ -1666,6 +1723,7 @@
                1028 0d02  Optiplex 755
        94c3  RV610 video device [Radeon HD 2400 PRO]
                1002 94c3  Radeon HD 2400PRO
+               1028 0302  Radeon HD 2400 Pro
                174b e400  Sapphire HD 2400 PRO video device
                18bc 3550  GeCube Radeon HD2400 PRO
        94c4  RV610 LE AGP [Radeon HD 2400 PRO AGP]
@@ -1686,9 +1744,12 @@
        9519  RV670 [FireStream 9170]
        9540  RV710 [Radeon HD 4550]
        954f  RV710 [Radeon HD 4350]
+               1462 1618  R4350 MD512H (MS-V161)
        9552  M92 LP [Mobility Radeon HD 4300 Series]
-       9553  M92 [Mobility Radeon HD 4500 Series]
-       9555  M93 [Mobility Radeon HD 4500 Series]
+       9553  M92 [Mobility Radeon HD 4500/5100 Series]
+               1179 ff82  Satellite L505-13T GPU (Mobility Radeon HD 5145)
+       9555  M93 [Mobility Radeon HD 4300/4500 Series]
+               103c 1411  ProBook 4720s GPU (Mobility Radeon HD 4350)
        9559  Mobility Radeon HD 3600 Series
        955f  M92 [Mobility Radeon HD 4330]
        9581  M76 [Radeon Mobility HD 2600 Series]
@@ -1705,6 +1766,7 @@
        9593  Radeon Mobility HD 3670
        9595  M86GL [Mobility FireGL V5700]
        9596  RV635 PRO AGP [Radeon HD 3650]
+               1043 0028  EAH3650 SILENT/HTDI/512M/A
        9598  Mobility Radeon HD 3600 Series
                1002 9598  Mobility Radeon HD 3600
                1043 01d6  EAH3650 Silent
@@ -1738,6 +1800,7 @@
        9714  RS880 [Radeon HD 4290]
        9715  RS880 [Radeon HD 4250]
        9723  Radeon HD 5450
+       9802  AMD Radeon HD 6310 GraphicsATI
        aa00  R600 Audio Device [Radeon HD 2900 Series]
        aa08  RV630/M76 audio device [Radeon HD 2600 Series]
        aa10  RV610 audio device [Radeon HD 2400 PRO]
@@ -1756,8 +1819,10 @@
        aa60  Redwood HDMI Audio [Radeon HD 5600 Series]
                1025 0347  Aspire 7740G
        aa68  Manhattan HDMI Audio [Mobility Radeon HD 5000 Series]
+       aa88  Barts HDMI Audio [Radeon HD 6800 Series]
        ac00  Theater 600 Pro
        ac02  TV Wonder HD 600 PCIe
+       ac12  Theater HD T507 (DVB-T) TV tuner/capture device
        cab0  AGP Bridge [IGP 320M]
        cab2  RS200/RS200M AGP Bridge [IGP 340M]
        cab3  R200 AGP Bridge [Mobility Radeon 7000 IGP]
@@ -2240,11 +2305,32 @@
        1302  Family 11h Processor DRAM Controller
        1303  Family 11h Processor Miscellaneous Control
        1304  Family 11h Processor Link Control
+       1510  Family 14h Processor Root Complex
+               1022 1510  Pavilion DM1Z-3000 Host bridge
+       1512  Family 14h Processor Root Port
+       1513  Family 14h Processor Root Port
+       1514  Family 14h Processor Root Port
+       1515  Family 14h Processor Root Port
+       1516  Family 14h Processor Root Port
+       1600  Family 15h Processor Function 0
+       1601  Family 15h Processor Function 1
+       1602  Family 15h Processor Function 2
+       1603  Family 15h Processor Function 3
+       1604  Family 15h Processor Function 4
+       1605  Family 15h Processor Function 5
        1700  Family 12h/14h Processor Function 0
        1701  Family 12h/14h Processor Function 1
        1702  Family 12h/14h Processor Function 2
        1703  Family 12h/14h Processor Function 3
        1704  Family 12h/14h Processor Function 4
+       1705  Family 12h Processor Root Complex
+       1707  Family 12h Processor Root Port
+       1708  Family 12h Processor Root Port
+       1709  Family 12h Processor Root Port
+       170a  Family 12h Processor Root Port
+       170b  Family 12h Processor Root Port
+       170c  Family 12h Processor Root Port
+       170d  Family 12h Processor Root Port
        1716  Family 12h/14h Processor Function 5
        1718  Family 12h/14h Processor Function 6
        1719  Family 12h/14h Processor Function 7
@@ -2363,14 +2449,14 @@
        9600  RS780 Host Bridge
                1043 82f1  M3A78-EH Motherboard
        9601  RS880 Host Bridge
-       9602  RS780 PCI to PCI bridge (int gfx)
+       9602  RS780/RS880 PCI to PCI bridge (int gfx)
        9603  RS780 PCI to PCI bridge (ext gfx port 0)
        9604  RS780 PCI to PCI bridge (PCIE port 0)
        9605  RS780 PCI to PCI bridge (PCIE port 1)
        9606  RS780 PCI to PCI bridge (PCIE port 2)
        9607  RS780 PCI to PCI bridge (PCIE port 3)
-       9608  RS780 PCI to PCI bridge (PCIE port 4)
-       9609  RS780 PCI to PCI bridge (PCIE port 5)
+       9608  RS780/RS880 PCI to PCI bridge (PCIE port 4)
+       9609  RS780/RS880 PCI to PCI bridge (PCIE port 5)
        960a  RS780 PCI to PCI bridge (NB-SB link)
        960b  RS780 PCI to PCI bridge (ext gfx port 1)
 1023  Trident Microsystems
@@ -2700,6 +2786,8 @@
                1028 028d  PowerEdge T410 MGA G200eW WPCM450
                1028 029c  PowerEdge M710 MGA G200eW WPCM450
                1028 02a4  PowerEdge T310 MGA G200eW WPCM450
+       0533  MGA G200EH
+               103c 3381  iLO4
        0534  G200eR2
        0540  M91XX
                102b 2080  M9140 LP PCIe x16
@@ -2905,6 +2993,7 @@
        0125  uPD720400 PCI Express - PCI/PCI-X Bridge
        013a  Dual Tuner/MPEG Encoder
        0194  uPD720200 USB 3.0 Host Controller
+               1043 8413  P8P67 Deluxe Motherboard
 1034  Framatome Connectors USA Inc.
 1035  Comp. & Comm. Research Lab
 1036  Future Domain Corp.
@@ -3017,6 +3106,7 @@
        6300  630/730 PCI/AGP VGA Display Adapter
                1019 0970  P6STP-FL motherboard
                1043 8035  CUSI-FX motherboard
+               104d 80e2  VAIO PCV-J200
        6306  530/620 PCI/AGP VGA Display Adapter
        6325  65x/M650/740 PCI/AGP VGA Display Adapter
                1039 6325  SiS 651 onboard [Asus P4SC-EA]
@@ -3070,6 +3160,7 @@
                1039 7018  SiS PCI Audio Accelerator
                1043 1453  SiS PCI Audio Accelerator
                1043 800b  SiS PCI Audio Accelerator
+               104d 80e2  VAIO PCV-J200
                1054 7018  SiS PCI Audio Accelerator
                107d 5330  SiS PCI Audio Accelerator
                107d 5350  SiS PCI Audio Accelerator
@@ -3090,6 +3181,7 @@
 103a  Seiko Epson Corporation
 103b  Tatung Corp. Of America
 103c  Hewlett-Packard Company
+       0025  XE4500 Notebook
        002a  NX9000 Notebook
        08bc  NX5000 Notebook
        1005  A4977A Visualize EG
@@ -3154,6 +3246,7 @@
        2925  E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer
        3080  Pavilion ze2028ea
        3085  Realtek RTL8139/8139C/8139C+
+       30a3  Compaq NW8440 Notebook
        30b5  Compaq Presario V3000Z
        31fb  DL365 ATI ES1000 VGA controller
        3206  Adaptec Embedded Serial ATA HostRAID
@@ -3176,14 +3269,33 @@
                103c 3249  Smart Array P812
                103c 324a  HP Smart Array 712m (Mezzanine RAID controller)
                103c 324b  Smart Array P711m (Mezzanine RAID controller)
-       3300  Proliant iLO2/iLO3 virtual USB controller
-       3301  iLO3 Serial Port
+       3300  Integrated Lights-Out Standard Virtual USB Controller
+               103c 3304  iLO2
+               103c 3305  iLO2
+               103c 3309  iLO2 GXL/iLO3 GXE
+               103c 330e  iLO3
+               103c 3381  iLO4
+       3301  Integrated Lights-Out Standard Serial Port
+               103c 3304  iLO2
+               103c 3305  iLO2
+               103c 330e  iLO3
+               103c 3381  iLO4
 # Virtual serial port which is presented on a Java applet
-       3302  Proliant iLO2 virtual UART
-       3305  Proliant iLO2 [Integrated Lights Out] controller
-       3306  iLO3 Slave instrumentation & System support
-       3307  iLO3 Management Processor Support and Messaging
-       3308  iLO3 MS Watchdog Timer
+       3302  Integrated Lights-Out Standard KCS Interface
+               103c 3304  iLO2
+               103c 3305  iLO2
+               103c 330e  iLO3
+               103c 3381  iLO4
+       3305  Integrated Lights-Out (iLO2) Controller
+       3306  Integrated Lights-Out Standard Slave Instrumentation & System Support
+               103c 330e  iLO3
+               103c 3381  iLO4
+       3307  Integrated Lights-Out Standard Management Processor Support and Messaging
+               103c 330e  iLO3
+               103c 3381  iLO4
+       3308  Integrated Lights-Out Standard MS Watchdog Timer
+               103c 330e  iLO3
+               103c 3381  iLO4
        402f  PCIe Root Port
        4030  zx2 System Bus Adapter
        4031  zx2 I/O Controller
@@ -3227,6 +3339,8 @@
        8233  EEE-PC 701 Netbook
        82ca  G96 GeForce 9500 GT
        82e8  M3N72-D
+       8383  P7P55D Series Motherboard
+       83a4  Motherboard M2N68-AM SE2
 # wrong vendor ID (should have been AMD)
        9602  RS880 PCI to PCI bridge (int gfx)
                1043 83a2  M4A785TD Motherboard
@@ -3383,6 +3497,7 @@
                e4bf 1010  CF2-1-CYMBAL
        8020  TSB12LV26 IEEE-1394 Controller (Link)
                1028 00d8  Precision 530
+               104d 80e2  VAIO PCV-J200
                11bd 000f  Studio DV500-1394
                11bd 001c  Excalibur 4.1
        8021  TSB43AA22 IEEE-1394 Controller (PHY/Link Integrated)
@@ -3404,6 +3519,7 @@
        8026  TSB43AB21 IEEE-1394a-2000 Controller (PHY/Link)
                1025 0035  TravelMate 660
                1025 003c  Aspire 2001WLCi (Compaq CL50 motherboard)
+               103c 0025  XE4500 Notebook
                103c 006a  NX9500
                1043 808d  A7V333 mainboard.
        8027  PCI4451 IEEE-1394 Controller
@@ -3446,13 +3562,16 @@
                103c 309f  Compaq nx9420 Notebook
                103c 30a1  NC2400
                103c 30a3  Compaq nw8440
+               104d 902d  VAIO VGN-NR120E
        803a  PCIxx12 OHCI Compliant IEEE 1394 Host Controller
                103c 309f  nx9420
                103c 30a1  NC2400
                103c 30a3  Compaq nw8440
+               104d 902d  VAIO VGN-NR120E
        803b  5-in-1 Multimedia Card Reader (SD/MMC/MS/MS PRO/xD)
                103c 309f  nx9420
                103c 30a3  Compaq nw8440
+               104d 902d  VAIO VGN-NR120E
        803c  PCIxx12 SDA Standard Compliant SD Host Controller
                103c 309f  nx9420
                103c 30a3  Compaq nw8440
@@ -3498,6 +3617,7 @@
                16ec 010d  USR5416 802.11g Wireless Turbo PCI Adapter
                16ec 010e  USR5410 802.11g Wireless Cardbus Adapter
                1737 0033  WPC54G v2 802.11g Wireless-G Notebook Adapter
+               17cf 0032  G-162 v1 802.11g Wireless Cardbus Adapter
                17cf 0033  Z-Com XG650 Wireless miniPCI 802.11b/g
                187e 340b  G-302 v2 802.11g Wireless PCI Adapter
                187e 340c  G-360 v2 802.11g Wireless PCI Adapter
@@ -3573,6 +3693,7 @@
                103c 08b0  tc1100 tablet
        ac55  PCI1520 PC card Cardbus Controller
                1014 0512  ThinkPad T30/T40
+               103c 0025  XE4500 Notebook
        ac56  PCI1510 PC card Cardbus Controller
                1014 0512  ThinkPad R50e
                1014 0528  ThinkPad R40e
@@ -3601,6 +3722,7 @@
        8056  Rockwell HCF 56K modem
        808a  Memory Stick Controller
        81ce  SxS Pro memory card
+       902d  VAIO VGN-NR120E
 104e  Oak Technology, Inc
        0017  OTI-64017
        0107  OTI-107 [Spitfire]
@@ -4085,7 +4207,7 @@
        6312  SP202-based 2Gb Fibre Channel to PCI-X HBA
        6322  SP212-based 2Gb Fibre Channel to PCI-X HBA
        7220  IBA7220 InfiniBand HCA
-       7322  InfiniPath QME7342 QDR HCA
+       7322  IBA7322 QDR InfiniBand HCA
        8000  10GbE Converged Network Adapter (TCP/IP Networking)
        8001  10GbE Converged Network Adapter (FCoE)
        8020  cLOM8214 1/10GbE Controller
@@ -4096,10 +4218,13 @@
                1077 020b  3200 Series Dual Port 10Gb Intelligent Ethernet Adapter
                1077 020c  3200 Series Quad Port 1Gb Intelligent Ethernet Adapter
                1077 020f  3200 Series Single Port 10Gb Intelligent Ethernet Adapter
+               1077 0210  QME8242-k 10GbE Dual Port Mezzanine Card
        8021  8200 Series 10GbE Converged Network Adapter (FCoE)
                103c 3348  CN1000Q Dual Port Converged Network Adapter
+               1077 0211  QME8242-k 10GbE Dual Port Mezzanine Card, FCoE
        8022  8200 Series 10GbE Converged Network Adapter (iSCSI)
                103c 3347  CN1000Q Dual Port Converged Network Adapter
+               1077 0212  QME8242-k 10GbE Dual Port Mezzanine Card, iSCSI
        8432  ISP2432M-based 10GbE Converged Network Adapter (CNA)
 1078  Cyrix Corporation
        0000  5510 [Grappa]
@@ -4307,6 +4432,7 @@
        14f0  PCI-6111
        1580  PXI-6031E
        15b0  PXI-6071E
+       1710  PXI-6509
        17d0  PCI-6503
        1870  PCI-6713
        1880  PCI-6711
@@ -4334,6 +4460,7 @@
        70aa  PCI-6229
        70ab  PCI-6259
        70ac  PCI-6289
+       70ae  PXI-6220
        70af  PCI-6221
        70b0  PCI-6220
        70b4  PCI-6250
@@ -4707,6 +4834,10 @@
                1518 0200  Kontron ThinkIO-C
                15ed 1002  MCCS 8-port Serial Hot Swap
                15ed 1003  MCCS 16-port Serial Hot Swap
+# MIL-STD-1553B Board
+               e1c5 0001  TE1-PCI
+               e1c5 0005  TA1-PCI
+               e1c5 0006  TA1-PCI4
        9036  9036
        9050  PCI <-> IOBus Bridge
                10b5 1067  IXXAT CAN i165
@@ -4782,7 +4913,9 @@
                10b5 3415  Alpermann+Velte PCIe TS: Time Synchronisation Board
                1369 c001  LX6464ES
                1369 c201  LX1616ES
+               14b4 d10a  DekTec DTA-110T
                14b4 d140  Dektec DTA-140
+               1a0e 006f  Dektec DTA-111
        9060  PCI9060 32-bit 33MHz PCI <-> IOBus Bridge
        906d  9060SD
                125c 0640  Aries 16000P
@@ -5052,12 +5185,14 @@
                1014 050f  ThinkPad R30
                1014 053d  ThinkPad R40e
                103c 0024  Pavilion ze4400 builtin IDE
+               103c 0025  XE4500 Notebook
                1043 8053  A7A266 Motherboard IDE
                1849 5229  ASRock 939Dual-SATA2 Motherboard IDE (PATA)
        5235  M5225
        5237  USB 1.1 Controller
                1014 0540  ThinkPad R40e
                103c 0024  Pavilion ze4400 builtin USB
+               103c 0025  XE4500 Notebook
                104d 810f  VAIO PCG-U1 USB/OHCI Revision 1.0
                10b9 5237  ASRock 939Dual-SATA2 Motherboard
                1849 5237  ASRock 939Dual-SATA2 Motherboard
@@ -5086,6 +5221,7 @@
                1014 0506  ThinkPad R30
                1014 053e  ThinkPad R40e
                103c 0024  Pavilion ze4400 builtin Audio
+               103c 0025  XE4500 Notebook
        5453  M5453 PCI AC-Link Controller Modem Device
        5455  M5455 PCI AC-Link Controller Audio Device
                10b9 5455  ASRock 939Dual-SATA2 Motherboard
@@ -5093,6 +5229,7 @@
        5457  M5457 AC'97 Modem Controller
                1014 0535  ThinkPad R40e
                103c 0024  Pavilion ze4400 builtin Modem Device
+               103c 0025  XE4500 Notebook
        5459  SmartLink SmartPCI561 56K Modem
        545a  SmartLink SmartPCI563 56K Modem
        5461  High Definition Audio/AC'97 Host Controller
@@ -5102,6 +5239,7 @@
                1014 0510  ThinkPad R30
                1014 053c  ThinkPad R40e
                103c 0024  Pavilion ze4400
+               103c 0025  XE4500 Notebook
                1849 7101  ASRock 939Dual-SATA2 Motherboard
 10ba  Mitsubishi Electric Corp.
        0301  AccelGraphics AccelECLIPSE
@@ -5666,9 +5804,9 @@
        0163  NV44 [GeForce 6200 LE]
        0164  NV44 [GeForce Go 6200]
        0165  NV44 [Quadro NVS 285]
-       0166  NV43 [GeForce Go 6400]
-       0167  NV43 [GeForce Go 6200/6400]
-       0168  NV43 [GeForce Go 6200/6400]
+       0166  NV44 [GeForce Go 6400]
+       0167  NV44 [GeForce Go 6200]
+       0168  NV44 [GeForce Go 6400]
        0169  NV44 [GeForce 6250]
        016a  NV44 [GeForce 7100 GS]
        0170  NV17 [GeForce4 MX 460]
@@ -5717,6 +5855,7 @@
        018d  NV18M [GeForce4 448 Go]
        0191  G80 [GeForce 8800 GTX]
        0193  G80 [GeForce 8800 GTS]
+               107d 20bd  WinFast PX 8800 GTS TDH
        0194  G80 [GeForce 8800 Ultra]
 # Found in GPU server Tesla D870 and S870
        0197  G80 [Tesla C870]
@@ -6005,7 +6144,7 @@
        0323  NV34 [GeForce FX 5200LE]
        0324  NV34M [GeForce FX Go5200 64M]
                1028 0196  Inspiron 5160
-               103c 006a  Pavillon ZD7000 laptop
+               103c 006a  Pavilion ZD7000 laptop
                1071 8160  MIM2000
        0325  NV34M [GeForce FX Go5250]
        0326  NV34 [GeForce FX 5500]
@@ -6312,11 +6451,16 @@
                1462 7508  K9N2GM-FIH
                1849 0569  K10N78FullHD-hSLI R3.0 PCI Express Bridge
        056a  MCP73 [nForce 630i] USB 2.0 Controller (EHCI)
+               1019 297a  MCP73PVT-SM
        056c  MCP73 IDE
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        056d  MCP73 PCI Express bridge
+               1019 297a  MCP73PVT-SM
        056e  MCP73 PCI Express bridge
+               1019 297a  MCP73PVT-SM
        056f  MCP73 PCI Express bridge
+               1019 297a  MCP73PVT-SM
        05b1  NF200 PCIe 2.0 switch for mainboards
        05b8  NF200 PCIe 2.0 switch for GTX 295
        05be  NF200 PCIe 2.0 switch for Quadro Plex S4 / Tesla S870 / Tesla S1070 / Tesla S2050
@@ -6421,6 +6565,8 @@
        06cd  GF100 [GeForce GTX 470]
        06d1  GF100 [Tesla C2050 / C2070]
        06d2  GF100 [M2070]
+       06d8  GF100 [Quadro 6000]
+       06d9  GF100 [Quadro 5000]
        06dd  GF100 [Quadro 4000]
        06de  GF100 [Tesla S2050]
        06df  GF100 [M2070Q]
@@ -6518,33 +6664,47 @@
        07c0  MCP73 Host Bridge
                1afa 7150  JW-IN7150-HD
        07c1  MCP73 Host Bridge
+               1019 297a  MCP73PVT-SM
        07c2  MCP73 Host Bridge
        07c5  MCP73 Host Bridge
        07c8  MCP73 Memory Controller
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        07cb  nForce 630i memory controller
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        07cd  nForce 630i memory controller
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        07ce  nForce 630i memory controller
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        07cf  nForce 630i memory controller
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        07d0  nForce 630i memory controller
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        07d1  nForce 630i memory controller
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        07d2  nForce 630i memory controller
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        07d3  nForce 630i memory controller
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        07d6  nForce 630i memory controller
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        07d7  MCP73 LPC Bridge
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        07d8  MCP73 SMBus
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        07d9  MCP73 Memory Controller
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        07da  MCP73 Co-processor
                1afa 7150  JW-IN7150-HD
@@ -6555,15 +6715,19 @@
        07e0  C73 [GeForce 7150 / nForce 630i]
                1afa 7150  JW-IN7150-HD
        07e1  C73 [GeForce 7100 / nForce 630i]
+               1019 297a  MCP73PVT-SM
        07e2  C73 [GeForce 7050 / nForce 630i]
        07e3  C73 [GeForce 7050 / nForce 610i]
        07e5  C73 [GeForce 7100 / nForce 620i]
        07f0  MCP73 IDE
        07f4  GeForce 7100/nForce 630i SATA
+               1019 297a  MCP73PVT-SM
        07f8  MCP73 SATA RAID Controller
        07fc  MCP73 High Definition Audio
+               1019 297a  MCP73PVT-SM
                10de 07fc  MCP73 High Definition Audio
        07fe  GeForce 7100/nForce 630i USB
+               1019 297a  MCP73PVT-SM
                1afa 7150  JW-IN7150-HD
        0844  C77 [GeForce 9100M G]
        0845  C77 [GeForce 8200M G]
@@ -6604,6 +6768,7 @@
                19da a123  IONITX-F-E
        087e  ION LE VGA
        087f  ION LE VGA
+       08a4  GT216 [GeForce 320M]
        0a20  GT216 [GeForce GT 220]
        0a23  GT218 [GeForce 210]
        0a28  GT216 [GeForce GT 230M]
@@ -6614,12 +6779,14 @@
        0a2d  GT216 [GeForce GT 320M]
        0a34  GT216 [GeForce GT 240M]
        0a35  GT216 [GeForce GT 325M]
+       0a38  GT216GL [Quadro 400]
        0a3c  GT216 [Quadro FX 880M]
        0a60  GT218 [GeForce G210]
        0a62  GT218 [GeForce 205]
        0a63  GT218 [GeForce 310]
        0a64  GT218 [ION]
        0a65  GT218 [GeForce 210]
+               1043 8334  EN210 SILENT
        0a66  GT218 [GeForce 310]
        0a68  G98M [GeForce G105M]
        0a69  G98M [GeForce G105M]
@@ -6707,6 +6874,7 @@
        0be2  High Definition Audio Controller
        0be3  High Definition Audio Controller
                1028 040b  Latitude E6510
+               10de 066d  G98 [GeForce 8400GS]
        0be4  High Definition Audio Controller
        0be5  GF100 High Definition Audio Controller
        0be9  GF106 High Definition Audio Controller
@@ -6735,29 +6903,50 @@
        0d7d  MCP89 Ethernet
        0d80  MCP89 LPC Bridge
        0d85  MCP89 SATA Controller
+       0d88  MCP89 SATA Controller (AHCI mode)
        0d89  MCP89 SATA Controller (AHCI mode)
        0d8d  MCP89 SATA Controller (RAID mode)
        0d94  MCP89 High Definition Audio
        0d9c  MCP89 OHCI USB 1.1 Controller
        0d9d  MCP89 EHCI USB 2.0 Controller
        0dc4  GF106 [GeForce 450 GTS]
-       0dd1  GeForce GTX 460M (rev a1)
+# rev a1
+       0dd1  GF106 [GeForce GTX 460M]
                1558 8687  CLEVO/KAPOK W860CU
+       0dd8  GF106GL [Quadro 2000]
+       0dda  GF106 [Quadro 2000M]
        0de1  GF108 [GeForce GT 430]
+       0dee  GF108 [Geforce GT 415M]
+       0df4  GF106 [GeForce GT 555M SDDR3]
+       0df8  GF108 [Quadro 600]
+       0dfa  GF108 [Quadro 1000M]
+       0e08  HDMI Audio stub
        0e09  GF110 High Definition Audio Controller
        0e22  GF104 [GeForce GTX 460]
                1462 2322  N460GTX Cyclone 1GD5/OC
+       0e3a  GF104 [Quadro 3000M]
+       0e3b  GF104 [Quadro 4000M]
+       1056  GF108 [Quadro NVS 4200M]
        1080  GF110 [Geforce GTX 580]
+       1081  GF110 [Geforce GTX 570]
+               10de 087e  Leadtek WinFast GTX 570
+       1086  GF110 [Geforce GTX 570 HD]
        10c3  G98 [GeForce 8400GS]
+               10de 066d  G98 [GeForce 8400GS]
+       10c5  M116N
+       10d8  GT218 [NVS 300]
+       1200  GF110 [GeForce GTX 560 Ti]
 10df  Emulex Corporation
        1ae5  LP6000 Fibre Channel Host Adapter
        e100  Proteus-X: LightPulse IOV Fibre Channel Host Adapter
        e131  LightPulse 8Gb/s PCIe Shared I/O Fibre Channel Adapter
        e180  Proteus-X: LightPulse IOV Fibre Channel Host Adapter
        e200  Lancer-X: LightPulse Fibre Channel Host Adapter
+       e208  LightPulse 16Gb Fibre Channel Host Adapter (Lancer-VF)
        e220  OneConnect NIC (Lancer)
        e240  OneConnect iSCSI Initiator (Lancer)
        e260  OneConnect FCoE Initiator (Lancer)
+       e268  OneConnect 10Gb FCoE Converged Network Adapter (Lancer-VF)
        f011  Saturn: LightPulse Fibre Channel Host Adapter
        f015  Saturn: LightPulse Fibre Channel Host Adapter
        f085  LP850 Fibre Channel Host Adapter
@@ -6841,6 +7030,7 @@
        809c  S5933_HEPC3
        80b9  Harmonix Hi-Card P8 (4x active ISDN BRI)
        80d7  PCI-9112
+       80d8  PCI-7200
        80d9  PCI-9118
        80da  PCI-9812
        80fc  APCI1500 Signal processing controller (16 dig. inputs + 16 dig. outputs)
@@ -6891,6 +7081,7 @@
                1025 1605  TravelMate 5600 series
        0885  Realtek 885 High Definition Audio
        0888  Realtek 888 High Definition Audio
+               1028 020d  Inspiron 530
        8029  RTL-8029(AS)
                10b8 2011  EZ-Card (SMC1208)
                10ec 8029  RTL-8029(AS)
@@ -6911,6 +7102,7 @@
                1025 8920  ALN-325
                1025 8921  ALN-325
                103c 006a  NX9500
+               103c 2a20  Pavilion t3030.de Desktop PC
                103c 30d9  Presario C700
                1043 1045  L8400B or L3C/S notebook
                1043 8109  P5P800-MX Mainboard
@@ -6957,11 +7149,14 @@
                1462 235c  P965 Neo MS-7235 mainboard
                1462 236c  945P Neo3-F motherboard
        8168  RTL8111/8168B PCI Express Gigabit Ethernet controller
+               1019 8168  MCP73PVT-SM
+               103c 1611  Pavilion DM1Z-3000
                1043 11f5  A6J-Q008
-               1043 16d5  U6V laptop
+               1043 16d5  U6V/U31J laptop
                1043 81aa  P5B
                1043 82c6  M3A78-EH Motherboard
                1043 83a3  M4A785TD Motherboard
+               1043 8432  P8P67 Deluxe Motherboard [Realtek RTL8111E]
                1458 e000  GA-EP45-DS5 Motherboard
                1462 238c  Onboard RTL8111b on MSI P965 Platinum Mainboard
                1462 368c  K9AG Neo2
@@ -6971,6 +7166,7 @@
        8169  RTL-8169 Gigabit Ethernet
                1025 0079  Aspire 5024WLMi
                10bd 3202  EP-320G-TX1 32-bit PCI Gigabit Ethernet Adapter
+               10ec 8169  RTL8169/8110 Family PCI Gigabit Ethernet NIC
                1259 c107  CG-LAPCIGT
                1371 434e  ProG-2000L
                1385 311a  GA311
@@ -6994,7 +7190,7 @@
                1737 0019  WPC11v4 802.11b Wireless-B Notebook Adapter
        8185  RTL-8185 IEEE 802.11a/b/g Wireless LAN Controller
        8191  RTL8188CE 802.11b/g/n WiFi Adapter
-       8192  RTL8192E Wireless LAN Controller
+       8192  RTL8192E/RTL8192SE Wireless LAN Controller
        8197  SmartLAN56 56K Modem
        8199  RTL8187SE Wireless LAN Controller
 10ed  Ascii Corporation
@@ -7217,6 +7413,7 @@
        0391  VT8371 [KX133]
        0397  VT1708S HD Audio
                1043 836c  P7H55
+               1043 83c7  P5KPL-AM EPU
        0409  VX855/VX875 Host Bridge: Host Control
        0415  VT6415 PATA IDE Host Controller
        0501  VT8501 [Apollo MVP4]
@@ -7359,6 +7556,7 @@
        3044  VT6306/7/8 [Fire II(M)] IEEE 1394 OHCI Controller
                0010 0001  IEEE 1394 4port DCST 1394-3+1B
                1025 005a  TravelMate 290
+               103c 2a20  Pavilion t3030.de Desktop PC
                1043 808a  A8V/A8N/P4P800 series motherboard
                1043 81fe  M4A series motherboard
                1458 1000  GA-7VT600-1394 Motherboard
@@ -7479,6 +7677,7 @@
        3123  VT8623 [Apollo CLE266]
        3128  VT8753 [P4X266 AGP]
        3133  VT3133 Host Bridge
+       3142  VT6651 WiFi Adapter, 802.11b
        3147  VT8233A ISA Bridge
                1043 808c  A7V333 motherboard
        3148  P4M266 Host Bridge
@@ -7535,7 +7734,7 @@
        324a  CX700/VX700 PCI to PCI Bridge
        324b  CX700/VX700 Host Bridge
        324e  CX700/VX700 Internal Module Bus
-       3253  VIA VT6655 WiFi Adapter, 802.11a/b/g
+       3253  VT6655 WiFi Adapter, 802.11a/b/g
        3258  PT880 Host Bridge
        3259  CN333/CN400/PM880 Host Bridge
        3260  VIA Chrome9 HC IGP
@@ -7561,6 +7760,7 @@
        337a  VT8237A PCI to PCI Bridge
        337b  VT8237A Host Bridge
        3403  VT6315 Series Firewire Controller
+               1043 8384  P8P67 Deluxe Motherboard
        3409  VX855/VX875 DRAM Bus Control
        4149  VIA VT6420 (ATA133) Controller
        4204  K8M800 Host Bridge
@@ -7774,6 +7974,7 @@
        0051  DT322
        0060  DT340
        0069  DT332
+       80c2  DT3162
 1117  Datacube, Inc
        9500  Max-1C SVGA card
        9501  Max-1C image processing
@@ -7973,9 +8174,14 @@
        540b  PNX1005 Media Processor
                1131 0020  PNXLite PCI Demo Board
        7130  SAA7130 Video Broadcast Decoder
+               0000 4016  Behold TV 401
+               0000 4051  Behold TV 405 FM
+               0000 5051  Behold TV 505 RDS
+               0000 505b  Behold TV 505 RDS
                102b 48d0  Matrox CronosPlus
                1048 226b  ELSA EX-VISION 300TV
                107d 6655  WinFast DTV1000S
+               1131 0000  Behold TV 401
                1131 2001  10MOONS PCI TV CAPTURE CARD
                1131 2005  Techcom (India) TV Tuner Card (SSD-TV-670)
                1458 9006  GT-PS700 DVB-S tuner
@@ -7987,8 +8193,13 @@
                185b c100  Compro VideoMate TV PVR/FM
                185b c901  Videomate DVB-T200
                5168 0138  LifeView FlyVIDEO2000
+               5ace 5010  Behold TV 501
+               5ace 5050  Behold TV 505 FM
        7133  SAA7131/SAA7133/SAA7135 Video Broadcast Decoder
                0000 4091  Beholder BeholdTV 409 FM
+               0000 5071  Behold TV 507 RDS
+               0000 507b  Behold TV 507 RDS
+               0000 5201  Behold TV Columbus
 # Deleting vendor name after rereading submit instructions
                0070 6701  WinTV HVR-1110
                1019 4cb5  Elitegroup ECS TVP3XP FM1236 Tuner Card (NTSC,FM)
@@ -8040,12 +8251,28 @@
                5168 2520  LifeView FlyDVB-S Duo CardBus
                5168 3502  LifeView FlyDVB-T Hybrid CardBus
                5168 3520  LifeView FlyDVB Trio N CardBus
+               5ace 5030  Behold TV 503 FM
+               5ace 5090  Behold TV 509 FM
+               5ace 6090  Behold TV 609 FM
+               5ace 6091  Behold TV 609 FM
+               5ace 6092  Behold TV 609 RDS
+               5ace 6093  Behold TV 609 RDS
+               5ace 6190  Behold TV M6
+               5ace 6191  Behold TV M63
+               5ace 6193  Behold TV M6 Extra
+               5ace 6290  Behold TV H6
+               5ace 7090  Behold TV A7
+               5ace 7190  Behold TV H7
                5ace 7595  Behold TV X7
        7134  SAA7134/SAA7135HL Video Broadcast Decoder
+               0000 4036  Behold TV 403
+               0000 4037  Behold TV 403 FM
+               0000 4071  Behold TV 407 FM
                1019 4cb4  Elitegroup ECS TVP3XP FM1216 Tuner Card(PAL-BG,FM)
                1043 0210  Digimatrix TV
                1043 4840  ASUS TV-FM 7134
                1043 4842  TV-FM 7134
+               1131 0000  Behold TV 403 FM
                1131 2004  EUROPA V3 reference design
                1131 4e85  SKNet Monster TV
                1131 6752  EMPRESS
@@ -8067,6 +8294,11 @@
                1894 a006  KNC One TV-Station DVR
                1894 fe01  KNC One TV-Station RDS / Typhoon TV Tuner RDS
                5168 0138  FLY TV PRIME 34FM
+               5ace 5070  Behold TV 507 FM
+               5ace 6070  Behold TV 607 FM
+               5ace 6071  Behold TV 607 FM
+               5ace 6072  Behold TV 607 RDS
+               5ace 6073  Behold TV 607 RDS
        7145  SAA7145
        7146  SAA7146
                110a 0000  Fujitsu/Siemens DVB-C card rev1.5
@@ -8130,6 +8362,9 @@
                0070 8993  WinTV HVR-2200
                0070 89a0  WinTV HVR-2200
                0070 89a1  WinTV HVR-2200
+       7231  SAA7231
+               5ace 8000  Behold TV H8
+               5ace 8100  Behold TV A8
        9730  SAA9730 Integrated Multimedia and Peripheral Controller
                1131 0000  Integrated Multimedia and Peripheral Controller
 1132  Mitel Corp.
@@ -8366,6 +8601,7 @@
        9e01  SK-9E21M 10/100/1000Base-T Adapter
 1149  Win System Corporation
 114a  VMIC
+       5565  GE-IP PCI5565,PMC5565 Reflective Memory Node
        5579  VMIPCI-5579 (Reflective Memory Card)
        5587  VMIPCI-5587 (Reflective Memory Card)
        6504  VMIC PCI 7755 FPGA
@@ -8902,8 +9138,10 @@
        2a02  88W8361 [TopDog] 802.11n Wireless
                1385 7e00  WN311T RangeMax Next 300 Mbps Wireless PCI Adapter
                1799 801b  F5D8011 v2 802.11n N1 Wireless Notebook Card
+       2a08  88W8362e [TopDog] 802.11a/b/g/n Wireless
        2a0a  88W8363 [TopDog] 802.11n Wireless
        2a0c  88W8363 [TopDog] 802.11n Wireless
+       2a24  88W8363 [TopDog] 802.11n Wireless
        2a2b  88W8687 [TopDog] 802.11b/g Wireless
        2a30  88W8687 [TopDog] 802.11b/g Wireless
        2a40  88W8366 [TopDog] 802.11n Wireless
@@ -8975,8 +9213,10 @@
                1854 0020  Marvell 88E8036 Fast Ethernet Controller (LGE)
        4352  88E8038 PCI-E Fast Ethernet Controller
        4353  88E8039 PCI-E Fast Ethernet Controller
+               104d 902d  VAIO VGN-NR120E
        4354  88E8040 PCI-E Fast Ethernet Controller
        4355  88E8040T PCI-E Fast Ethernet Controller
+               1179 ff50  Satellite P305D-S8995E
        4356  88EC033 PCI-E Fast Ethernet Controller
        4357  88E8042 PCI-E Fast Ethernet Controller
        435a  88E8048 PCI-E Fast Ethernet Controller
@@ -9036,6 +9276,7 @@
                a0a0 0506  Marvell 88E8053 Gigabit Ethernet Controller (Aopen)
        4363  88E8055 PCI-E Gigabit Ethernet Controller
        4364  88E8056 PCI-E Gigabit Ethernet Controller
+               11ba 00ba  8056 Gigabit Ethernet Controller
        4365  88E8070 based Ethernet Controller
        4366  88EC036 PCI-E Gigabit Ethernet Controller
        4367  88EC032 Ethernet Controller
@@ -9063,7 +9304,7 @@
        6041  MV88SX6041 4-port SATA II PCI-X Controller
        6042  88SX6042 PCI-X 4-Port SATA-II
        6081  MV88SX6081 8-port SATA II PCI-X Controller
-       6101  88SE6101 single-port PATA133 interface
+       6101  88SE6101/6102 single-port PATA133 interface
        6111  88SE6111 1-port PATA133(IDE) and 1-port SATA II Controllers
        6121  88SE6121 SATA II Controller
        6141  88SE614x SATA II PCI-E controller
@@ -9247,6 +9488,7 @@
        0620  Lucent V.92 Data/Fax Modem
        1040  HDA softmodem
        2600  StarPro26XX family (SP2601, SP2603, SP2612) DSP
+       3026  HDA Modem
        5400  OR3TP12 FPSC
        5656  Agere Systems Venus Modem
        5801  USB
@@ -9308,6 +9550,7 @@
        1535  Blackfin BF535 processor
        1805  SM56 PCI modem
        1889  AD1889 sound chip
+       194a  AD1984A sound chip
        1981  AD1981HD sound chip
        1983  AD1983HD sound chip
        1984  AD1984HD sound chip
@@ -9480,6 +9723,7 @@
 1216  Purup Prepress A/S
 1217  O2 Micro, Inc.
        00f7  Firewire (IEEE 1394)
+               1179 ff50  Satellite P305D-S8995E
        6729  OZ6729
        673a  OZ6730
        6832  OZ6832/6833 CardBus Controller
@@ -9501,7 +9745,9 @@
                1025 0035  TravelMate 660
        7114  OZ711M1/MC1 4-in-1 MemoryCardBus Controller
        7120  Integrated MMC/SD Controller
+               1179 ff50  Satellite P305D-S8995E
        7130  Integrated MS/xD Controller
+               1179 ff50  Satellite P305D-S8995E
        7134  OZ711MP1/MS1 MemoryCardBus Controller
        7135  Cardbus bridge
        7136  OZ711SP1 Memory CardBus Controller
@@ -9765,16 +10011,16 @@
 125e  Specialvideo Engineering SRL
 125f  Concurrent Technologies, Inc.
 1260  Intersil Corporation
-       3872  Prism 2.5 Wavelan chipset
+       3872  ISL3872 [Prism 3]
                1468 0202  LAN-Express IEEE 802.11b Wireless LAN
-       3873  Prism 2.5 Wavelan chipset
-               10cf 1169  MBH7WM01-8734 802.11b Wireless Mini PCI Card
-               1186 3501  DWL-520 Wireless PCI Adapter
-               1186 3700  DWL-520 Wireless PCI Adapter, Rev E1
-               1385 4105  MA311 802.11b wireless adapter
+       3873  ISL3874 [Prism 2.5]/ISL3872 [Prism 3]
+               10cf 1169  MBH7WM01-8734 802.11b Wireless Mini PCI Card [ISL3874]
+               1186 3501  DWL-520 Wireless PCI Adapter (rev A) [ISL3874]
+               1186 3700  DWL-520 Wireless PCI Adapter (rev E1) [ISL3872]
+               1385 4105  MA311 802.11b wireless adapter [ISL3874]
                1668 0414  HWP01170-01 802.11b PCI Wireless Adapter
                16a5 1601  AIR.mate PC-400 PCI Wireless LAN Adapter
-               1737 3874  WMP11 v1 802.11b Wireless-B PCI Adapter
+               1737 3874  WMP11 v1 802.11b Wireless-B PCI Adapter [ISL3874]
                8086 2510  M3AWEB Wireless 802.11b MiniPCI Adapter
                8086 2513  Wireless 802.11b MiniPCI Adapter
        3877  ISL3877 [Prism Indigo]
@@ -10132,6 +10378,7 @@
 12ab  Yuan Yuan Enterprise Co., Ltd.
        0000  MPG160/Kuroutoshikou ITVC15-STVLP
        0002  AU8830 [Vortex2] Based Sound Card With A3D Support
+       0003  T507 (DVB-T) TV tuner/capture device
        2300  Club-3D Zap TV2100
        3000  MPG-200C PCI DVD Decoder Card
        4789  MPC788 MiniPCI Hybrid TV Tuner
@@ -10246,6 +10493,7 @@
 12ca  Integrated Computing Engines
 12cb  Antex Electronics Corporation
        0027  SC4 (StudioCard)
+       002e  StudioCard 2000
 12cc  Pluto Technologies International
 12cd  Aims Lab
 12ce  Netspeed Inc.
@@ -10722,6 +10970,7 @@
        0045  Silicom 6 port Copper Giga Ethernet 546 Bypass Server Adapter (PXG6BPI)
        0047  Silicom Dual port Fiber-SX Giga Ethernet 571 Bypass Disconnect Server Adapter (PEG2BPFID)
        004a  Silicom Quad port Fiber-LX Giga Ethernet 571 Bypass Server Adapter (PEG4BPFI-LX)
+       004d  Dual port Copper Giga Ethernet PCI-E Bypass Server Adapter
 1375  Argosystems Inc
 1376  LMC
 1377  Electronic Equipment Production & Distribution GmbH
@@ -10759,8 +11008,6 @@
        4601  WAG511 802.11a/b/g Dual Band Wireless PC Card
        4610  WAG511 802.11a/b/g Dual Band Wireless PC Card
        4a00  WAG311 802.11a/g Wireless PCI Adapter
-       4b00  WG511T 108 Mbps Wireless PC Card
-       4f00  WG511U Double 108 Mbps  Wireless PC Card
        5200  GA511 Gigabit PC Card
        620a  GA620 Gigabit Ethernet
        630a  GA630 Gigabit Ethernet
@@ -10830,9 +11077,11 @@
        08b4  ISDN network Controller [HFC-4S]
                1397 b520  HFC-4S [IOB4ST]
                1397 b540  HFC-4S [Swyx 4xS0 SX2 QuadBri]
+               1397 b550  HFC-4S [Junghanns quadBRI]
                1397 b556  HFC-4S [Junghanns DuoDBRI]
                1397 e888  HFC-4S [OpenVox B200P / B400P]
        16b8  ISDN network Controller [HFC-8S]
+               1397 b562  HFC-8S [IOB8ST]
        2bd0  ISDN network controller [HFC-PCI]
                0675 1704  ISDN Adapter (PCI Bus, D, C)
                0675 1708  ISDN Adapter (PCI Bus, D, C, ACPI)
@@ -11057,14 +11306,17 @@
                1043 838e  Virtuoso 66 (Xonar DS)
                1043 8428  Virtuoso 100 (Xonar Xense)
                1043 8467  CMI8786 (Xonar DG)
+               13f6 8782  PCI 2.0 HD Audio
                13f6 ffff  CMI8787-HG2PCI
                14c3 1710  HiFier Fantasia
                14c3 1711  HiFier Serenade
                1a58 0910  Barracuda AC-1
                415a 5431  X-Meridian 7.1
+               5431 017a  X-Meridian 7.1 2G
                584d 3781  HDA X-Purity 7.1 Platinum
                7284 9761  CLARO
                7284 9781  CLARO halo
+               7284 9783  eCLARO
        9880  CM9880
 13f7  Wildfire Communications
 13f8  Ad Lib Multimedia Inc
@@ -11306,6 +11558,7 @@
        9513  OX16PCI954 (Quad 16950 UART) function 1 (parallel port)
        9521  OX16PCI952 (Dual 16950 UART)
        9523  OX16PCI952 Integrated Parallel Port
+       c308  EX-44016 16-port serial
 1416  Multiwave Innovation pte Ltd
 1417  Convergenet Technologies Inc
 1418  Kyushu electronics systems Inc
@@ -11727,6 +11980,7 @@
 14e2  INFOLIBRIA
 14e3  AMTELCO
 14e4  Broadcom Corporation
+       0576  BCM43224 802.11a/b/g/n
        0800  Sentry5 Chipcommon I/O Controller
        0804  Sentry5 PCI Bridge
        0805  Sentry5 MIPS32 CPU
@@ -11865,7 +12119,6 @@
        1655  NetXtreme BCM5717 Gigabit Ethernet PCIe
        1656  NetXtreme BCM5718 Gigabit Ethernet PCIe
        1657  NetXtreme BCM5719 Gigabit Ethernet PCIe
-       1658  NetXtreme BCM5720 Gigabit Ethernet
        1659  NetXtreme BCM5721 Gigabit Ethernet PCI Express
                1014 02c6  eServer xSeries server mainboard
                1028 01e6  PowerEdge 860
@@ -11893,6 +12146,7 @@
                103c 0890  NC6000 laptop
                103c 099c  NX6110/NC6120
                10cf 1279  LifeBook E8010D
+       165f  NetXtreme BCM5720 Gigabit Ethernet PCIe
        1662  NetXtreme II BCM57712 10 Gigabit Ethernet
        1663  NetXtreme II BCM57712 10 Gigabit Ethernet Multi Function
        1668  NetXtreme BCM5714 Gigabit Ethernet
@@ -11906,7 +12160,6 @@
        1672  NetXtreme BCM5754M Gigabit Ethernet PCI Express
        1673  NetXtreme BCM5755M Gigabit Ethernet PCI Express
        1674  NetXtreme BCM5756ME Gigabit Ethernet PCI Express
-       1676  NetXtreme BCM5750 Gigabit Ethernet
        1677  NetXtreme BCM5751 Gigabit Ethernet PCI Express
                1028 0176  Dimension XPS Gen 4
                1028 0177  Dimension 8400
@@ -11932,7 +12185,6 @@
                1028 021e  Precision T5400
        167b  NetXtreme BCM5755 Gigabit Ethernet PCI Express
                103c 280a  DC5750 Microtower
-       167c  NetXtreme BCM5750M Gigabit Ethernet
        167d  NetXtreme BCM5751M Gigabit Ethernet PCI Express
                1014 0577  ThinkPad Z60t
                103c 0940  HP Compaq nw8240 Mobile Workstation
@@ -11943,9 +12195,9 @@
        1681  NetXtreme BCM5761 Gigabit Ethernet PCIe
        1684  NetXtreme BCM5764M Gigabit Ethernet PCIe
        1685  NetXtreme II BCM57500S Gigabit Ethernet
-       168a  NetXtreme II BCM57800S 10 Gigabit Ethernet
-       168d  NetXtreme II BCM57840S 20 Gigabit Ethernet
-       168e  NetXtreme II BCM57810S 10 Gigabit Ethernet
+       168a  NetXtreme II BCM57800 10 Gigabit Ethernet
+       168d  NetXtreme II BCM57840 10/20 Gigabit Ethernet
+       168e  NetXtreme II BCM57810 10 Gigabit Ethernet
        1690  NetXtreme BCM57760 Gigabit Ethernet PCIe
        1691  NetLink BCM57788 Gigabit Ethernet PCIe
        1692  NetLink BCM57780 Gigabit Ethernet PCIe
@@ -11968,6 +12220,7 @@
                1462 590c  KT6 Delta-FIS2R (MS-6590)
        169d  NetLink BCM5789 Gigabit Ethernet PCI Express
        16a0  NetLink BCM5785 Fast Ethernet
+       16a5  NetXtreme II BCM57800 10 Gigabit Ethernet Multi Function
        16a6  NetXtreme BCM5702X Gigabit Ethernet
                0e11 00bb  NC7760 Gigabit Server Adapter (PCI-X, 10/100/1000-T)
                1028 0126  BCM5702 1000Base-T
@@ -11986,9 +12239,11 @@
                10a9 8014  Dual Port Gigabit Ethernet (PCI-X,Fiber)
                10a9 801c  Quad Port Gigabit Ethernet (PCI-E,Fiber)
                10b7 2001  3C998-SX Dual Port 1000-SX PCI-X
+       16a9  NetXtreme II BCM57800 10 Gigabit Ethernet Virtual Function
        16aa  NetXtreme II BCM5706S Gigabit Ethernet
                103c 3102  NC370F MultifuNCtion Gigabit Server Adapter
                103c 310c  NC370i Multifunction Gigabit Server Adapter
+       16ab  NetXtreme II BCM57840 10/20 Gigabit Ethernet Multi Function
        16ac  NetXtreme II BCM5708S Gigabit Ethernet
                1014 0304  NetXtreme II BCM5708S Gigabit Ethernet
                1028 01bb  PowerEdge 1955 Broadcom NetXtreme II BCM5708S
@@ -11997,12 +12252,16 @@
                103c 7038  NC373i PCI Express Multifunction Gigabit Server Adapter
                103c 703b  NC373i Integrated Multifunction Gigabit Server Adapter
                103c 703d  NC373F PCI Express Multifunction Gigabit Server Adapter
+       16ad  NetXtreme II BCM57840 10/20 Gigabit Ethernet Virtual Function
+       16ae  NetXtreme II BCM57810 10 Gigabit Ethernet Multi Function
+       16af  NetXtreme II BCM57810 10 Gigabit Ethernet Virtual Function
        16b0  NetXtreme BCM57761 Gigabit Ethernet PCIe
        16b1  NetLink BCM57781 Gigabit Ethernet PCIe
        16b2  NetLink BCM57791 Gigabit Ethernet PCIe
        16b4  NetXtreme BCM57765 Gigabit Ethernet PCIe
        16b5  NetLink BCM57785 Gigabit Ethernet PCIe
        16b6  NetLink BCM57795 Gigabit Ethernet PCIe
+       16bc  NetXtreme BCM57765 Memory Card Reader
        16c6  NetXtreme BCM5702A3 Gigabit Ethernet
                10b7 1100  3C1000B-T 10/100/1000 PCI
                14e4 000c  BCM5702 1000Base-T
@@ -12048,9 +12307,10 @@
        4212  BCM4212 v.90 56k modem
        4220  802-11b/g Wireless PCI controller, packaged as a Linksys WPC54G ver 1.2 PCMCIA card
        4222  NetXtreme BCM5753M Gigabit Ethernet PCI Express
-       4301  BCM4303 802.11b Wireless LAN Controller
+       4301  BCM4301 802.11b Wireless LAN Controller
                1028 0407  TrueMobile 1180 Onboard WLAN
                1043 0120  WL-103b Wireless LAN PC Card
+               16a5 1602  B-300 802.11b Wireless CardBus Adapter
                1737 4301  WMP11 v2.7 802.11b Wireless-B PCI Adapter
        4305  BCM4307 V.90 56k Modem
        4306  BCM4307 Ethernet Controller
@@ -12069,7 +12329,7 @@
                103c 137f  BCM4322 802.11a/b/g/n Wireless LAN Controller
                103c 1380  BCM4322 802.11a/b/g/n Wireless LAN Controller
                14e4 4311  BCM94311MCG
-       4312  BCM4312 802.11a/b/g
+       4312  BCM4311 802.11a/b/g
                1028 0007  Wireless 1490 Dual Band WLAN Mini-Card
                1028 0008  Wireless 1490 Dual Band WLAN ExpressCard
                103c 135a  Broadcom 802.11a/b/g WLAN
@@ -12109,7 +12369,7 @@
                1799 7001  F5D7001 v2000 Wireless G Plus Desktop Card
                1799 7010  F5D7010 v4000 Wireless G Notebook Card
                1799 7011  F5D7011 v2000 High-Speed Mode Wireless G Notebook Card
-       4319  BCM4311 [AirForce 54g] 802.11a/b/g PCI Express Transceiver
+       4319  BCM4318 [AirForce 54g] 802.11a/b/g PCI Express Transceiver
                1028 0005  Wireless 1470 Dual Band WLAN Mini-PCI Card
                1028 0006  Wireless 1470 Dual Band WLAN PC Card
                103c 1358  Broadcom 802.11a/b/g WLAN
@@ -12140,7 +12400,7 @@
                185f 1220  TravelMate 290E WLAN Mini-PCI Card
        4321  BCM4306 802.11a Wireless LAN Controller
        4322  BCM4306 UART
-       4324  BCM4309 802.11a/b/g
+       4324  BCM4306 802.11a/b/g
                1028 0001  Truemobile 1400
                1028 0002  TrueMobile 1400 Dual Band WLAN PC Card
                1028 0003  Truemobile 1450 MiniPCI
@@ -12167,9 +12427,13 @@
        432c  BCM4322 802.11b/g/n
                1799 d311  Dynex DX-NNBX 802.11n WLAN Cardbus Card
        432d  BCM4322 802.11a/b/g/n
+       4331  BCM4331 802.11a/b/g/n
+               106b 00d6  AirPort Extreme
        4344  EDGE/GPRS data and 802.11b/g combo cardbus [GC89]
        4353  BCM43224 802.11a/b/g/n
        4357  BCM43225 802.11b/g/n
+       4358  BCM43227 802.11b/g/n
+       4359  BCM43228 802.11a/b/g/n
        4401  BCM4401 100Base-T
                1025 0035  TravelMate 660
                103c 08b0  tc1100 tablet
@@ -12395,6 +12659,7 @@
        5051  High Definition Audio (HERMOSA)
        5b7a  CX23418 Single-Chip MPEG-2 Encoder with Integrated Analog Video/Broadcast Audio Decoder
                0070 7444  WinTV HVR-1600
+               5854 3343  GoTView PCI DVD3 Hybrid
        8200  CX25850
        8234  RS8234 ATM SAR Controller [ServiceSAR Plus]
        8800  CX23880/1/2/3 PCI Video and Audio Decoder
@@ -12442,11 +12707,13 @@
                18ac db00  FusionHDTV DVB-T1
                18ac db11  FusionHDTV DVB-T Plus
                18ac db50  FusionHDTV DVB-T Dual Digital
+               5654 2388  GoTView PCI Hybrid TV Tuner Card
                7063 3000  pcHDTV HD3000 HDTV
                7063 5500  pcHDTV HD-5500
        8801  CX23880/1/2/3 PCI Video and Audio Decoder [Audio Port]
                0070 2801  Hauppauge WinTV 28xxx (Roslyn) models
                185b e000  VideoMate X500
+               5654 2388  GoTView PCI Hybrid Audio AVStream Device
                7063 5500  pcHDTV HD-5500
        8802  CX23880/1/2/3 PCI Video and Audio Decoder [MPEG Port]
                0070 2801  Hauppauge WinTV 28xxx (Roslyn) models
@@ -12465,6 +12732,7 @@
                18ac d820  DViCO FusionHDTV3 Gold-T
                18ac db00  DVICO FusionHDTV DVB-T1
                18ac db10  DVICO FusionHDTV DVB-T Plus
+               5654 2388  GoTView PCI Hybrid TS Capture Device
                7063 3000  pcHDTV HD3000 HDTV
                7063 5500  pcHDTV HD-5500
        8804  CX23880/1/2/3 PCI Video and Audio Decoder [IR Port]
@@ -12482,12 +12750,14 @@
                18ac d810  DViCO FusionHDTV3 Gold-Q
                18ac d820  DViCO FusionHDTV3 Gold-T
                18ac db00  DVICO FusionHDTV DVB-T1
+               5654 2388  GoTView PCI Hybrid Audio Capture Device
        8852  CX23885 PCI Video and Audio Decoder
                0070 8010  Hauppauge WinTV HVR-1400 ExpressCard
                1461 c039  AVerTV Hybrid Express (A577)
                18ac db78  FusionHDTV DVB-T Dual Express
        8880  CX23887/8 PCIe Broadcast Audio and Video Decoder with 3D Comb
                0070 c108  WinTV-HVR-4400-HD model 1278
+               5654 2389  GoTView X5 DVD Hybrid PCI-E
                5654 2390  GoTView X5 3D HYBRID PCI-E
 14f2  MOBILITY Electronics
        0120  EV1000 bridge
@@ -12830,7 +13100,8 @@
 15b1  Source Technology Inc
 15b2  Mosaid Technologies Inc
 15b3  Mellanox Technologies
-       0191  MT25408 [ConnectX IB SDR Flash Recovery]
+       0191  MT25408 [ConnectX IB Flash Recovery]
+       01f5  MT27500 Family [ConnectX-3 Flash Recovery]
        1002  MT25400 Family [ConnectX-2 Virtual Function]
        1003  MT27500 Family [ConnectX-3]
        1004  MT27500 Family [ConnectX-3 Virtual Function]
@@ -12892,8 +13163,11 @@
        0015  ZBox
 15b7  Sandisk Corp
 15b8  ADDI-DATA GmbH
+       1001  APCI1516 SP controller (16 digi outputs)
        1003  APCI1032 SP controller (32 digi inputs w/ opto coupler)
+       1004  APCI2032 SP controller (32 digi outputs)
        1005  APCI2200 SP controller (8/16 digi outputs (relay))
+       1006  APCI1564 SP controller (32 digi ins, 32 digi outs)
        100a  APCI1696 SP controller (96 TTL I/Os)
        3001  APCI3501 SP controller (analog output board)
        300f  APCI3600 Noise and vibration measurement board
@@ -13079,9 +13353,10 @@
 167b  ZyDAS Technology Corp.
        2102  ZyDAS ZD1202
                187e 3406  ZyAIR B-122 CardBus 11Mbs Wireless LAN Card
+               187e 3407  ZyAIR B-320 802.11b Wireless PCI Adapter
        2116  ZD1212B Wireless Adapter
 167d  Samsung Electro-Mechanics Co., Ltd.
-       a000  IPW2200 miniPCI Wireless
+       a000  MagicLAN SWL-2210P 802.11b [Intersil ISL3874]
 167e  ONNTO Corp.
 1681  Hercules
        0010  Hercules 3d Prophet II Ultra 64MB (350 MHz NV15BR core)
@@ -13091,12 +13366,18 @@
 168c  Atheros Communications Inc.
        0007  AR5000 802.11a Wireless Adapter
                1737 0007  WPC54A Wireless PC Card
+               1b47 0100  Harmony 8450CN Wireless CardBus Module
+               1b47 0110  Skyline 4030 / Harmony 8450 802.11a Wireless CardBus Adapter
                8086 2501  PRO/Wireless 5000 LAN PCI Adapter Module
        0011  AR5210 802.11a NIC
        0012  AR5211 802.11ab NIC
                126c 8031  2201 Mobile Adapter
+               1385 4400  WAB501 802.11ab Wireless CardBus Card
+               1b47 aa00  8460 802.11ab Wireless CardBus Adapter
        0013  Atheros AR5001X+ Wireless Network Adapter
+               0308 3402  AG-100 802.11ag Wireless Cardbus Adapter
                0308 3405  G-102 v2 802.11g Wireless Cardbus Adapter
+               0308 3408  G-170S 802.11g Wireless CardBus Adapter
                0e11 00e5  NC6000 laptop
                10b7 6002  3CRWE154A72 802.11abg Cardbus Adapter
                1113 d301  Philips CPWNA100 Wireless CardBus adapter
@@ -13110,13 +13391,18 @@
                1186 3a14  AirPremier AG DWL-AG530 Wireless PCI Adapter (rev.A)
                1186 3a17  D-Link AirPremier DWL-G680 Wireless Cardbus Adapter
                1186 3a18  D-Link AirPremier DWL-G550 Wireless PCI Adapter
+               1186 3a1a  WNA-2330 802.11bg Wireless CardBus Adapter
                1186 3a63  D-Link AirPremier DWL-AG660 Wireless Cardbus Adapter
                1186 3a93  Conceptronic C54I Wireless 801.11g PCI card
                1186 3a94  C54C Wireless 801.11g cardbus
                1186 3ab0  Allnet ALL0281 Wireless PCI Card
                1385 4900  WG311v1 802.11g Wireless PCI Adapter
+               1385 4b00  WG511T 108 Mbps Wireless PC Card (rev.A/B)
                1385 4d00  WG311T 108 Mbps Wireless PCI Adapter (rev.A2)
+               1385 4f00  WG511U Double 108 Mbps Wireless PC Card
                1385 5a00  WG311T 108 Mbps Wireless PCI Adapter (rev.A3)
+               1385 5b00  WG511T 108 Mbps Wireless PC Card (rev.C)
+               1385 5d00  WPN511 RangeMax Wireless PC Card
                1458 e911  Gigabyte GN-WIAG02
                1468 0403  U10H014 802.11g Cardbus Adapter
                1468 0408  ThinkPad 11b/g Wireless LAN Mini PCI Adapter
@@ -13136,14 +13422,16 @@
                168c 2041  Engenius 5354MP Plus ARIES2 b/g MiniPCI Adapter
                168c 2042  Engenius 5354MP Plus ARIES2 a/b/g MiniPCI Adapter
                168c 2051  TRENDnet TEW-443PI Wireless PCI Adapter
+               16a5 160a  BWP712 802.11bg Wireless CardBus Adapter
                16ab 7302  Trust Speedshare Turbo Pro Wireless PCI Adapter
                1737 0017  WPC55AG
                1737 0026  WMP55AG v1.1
                1737 0035  WPC55AG v1.2 802.11abg Cardbus Adapter
+               1799 3000  F6D3000 Dual-Band Wireless A+G Desktop Card
+               1799 3010  F6D3010 Dual-Band Wireless A+G Notebook Card
                17cf 0042  Z-COMAX Highpower XG-622H (400mw) 802.11b/g mini-PCI Adapter
                185f 1012  CM9 Wireless a/b/g MiniPCI Adapter
                185f 2012  Wistron NeWeb WLAN a+b+g model CB9
-               1948 3aba  RBTBJ-AW 802.11abg Cardbus Adapter
                a727 6801  3CRXJK10075 OfficeConnect Wireless 108Mbps 11g XJACK PC Card
 # the name AR5005G is used for the reference design using AR2413
        001a  AR2413 802.11bg NIC
@@ -13164,17 +13452,32 @@
                1737 0053  WPC54G v7 802.11g Wireless-G Notebook Adapter
                1799 700c  F5D7000 v5000 Wireless G Desktop Card
                1799 701d  F5D7010 v5000 Wireless G Notebook Card
+               17f9 0008  DX-WGNBC 802.11bg Wireless CardBus Adapter
+               17f9 0018  DX-WGDTC 802.11bg Wireless PCI Adapter
 # the name AR5006X is used for the reference design using AR5413
        001b  AR5413 802.11abg NIC
+               0777 3002  XR2 802.11g Wireless Mini PCI Adapter
+               0777 3005  XR5 802.11a Wireless Mini PCI Adapter
+               0777 3009  XR9 900MHz Wireless Mini PCI Adapter
+               1154 034e  WLI-CB-AG108HP 802.11abg Wireless CardBus Adapter
                1186 3a19  D-Link AirPremier AG DWL-AG660 Wireless Cardbus Adapter
                1186 3a22  AirPremier AG DWL-AG530 Wireless PCI Adapter (rev.B)
+               11ad 5001  WN5301A 802.11bg Wireless PCI Adapter
                1458 e901  GN-WI01HT Wireless a/b/g MiniPCI Adapter
                168c 001b  Wireless LAN PCI LiteOn
+               168c 1062  IPN-W100CB 802.11abg Wireless CardBus Adapter
                168c 2062  EnGenius EMP-8602 (400mw) or Compex WLM54AG (SuperAG)
                168c 2063  EnGenius EMP-8602 (400mw) or Compex WLM54AG
+               17f9 000b  WL-711A 802.11abg Wireless CardBus Adapter
+               17f9 000c  WPIA-112AG 802.11abg Wireless PCI Adapter
+               17f9 000d  PC-686X 802.11abg Wireless Mini PCI Adapter
                185f 1600  DCMA-82 High Power WLAN 802.11a/b/g mini-PCI Module (Super A/G, eXtended Range, 400mW)
+               1948 3aba  RBTBJ-AW 802.11abg Wireless Cardbus Adapter
                a727 6804  Wireless 11a/b/g PC Card with XJACK(r) Antenna
-       001c  AR5001 Wireless Network Adapter
+       001c  AR242x / AR542x Wireless Network Adapter (PCI-Express)
+               0777 3006  SRX 802.11abg Wireless ExpressCard Adapter
+               103c 137a  AR5BXB63 (Foxconn) 802.11bg Mini PCIe NIC
+               144f 7128  WLL3141 (Toshiba PA3613U-1MPC) 802.11bg Wireless Adapter
                1468 0428  AR5BXB63 802.11bg NIC
                1468 042a  AR5007EG 802.11bg NIC
                147b 1033  AirPace Wi-Fi
@@ -13194,20 +13497,29 @@
                1186 3a67  DWL-G650M Super G MIMO Wireless Notebook Adapter
                1186 3a68  DWL-G520M Wireless 108G MIMO Desktop Adapter
                187e 340e  M-302 802.11g Wireless PCI Adapter
+               1976 2003  TEW-601PC 802.11g Wireless CardBus Adapter
        0023  AR5008 Wireless Network Adapter
+               0308 340b  NWD-170N 802.11bgn Wireless CardBus Adapter
                1154 0365  Buffalo WLP-CB-AG300 802.11abgn Cardbus Adapter
+               1154 0367  WLI-CB-AG301N 802.11abgn Wireless CardBus Adapter
                1186 3a6a  DWA-642 802.11n RangeBooster N CardBus Adapter
                1186 3a6d  DWA-552 802.11n Xtreme N Desktop Adapter (rev A1)
                1186 3a76  DWA-645 802.11n RangeBooster N 650 Notebook Adapter (rev A1)
                1737 0059  WPC300N v2 Wireless-N Notebook Adapter
                1737 0069  WPC100 v1 802.11n RangePlus Wireless Notebook Adapter
                1799 8011  F5D8011 v1 802.11n N1 Wireless Notebook Card
+               187e 3411  NWD-370N 802.11n Wireless PCI Adapter
+               1976 2008  TEW-621PC 802.11bgn Wireless CardBus Adapter
        0024  AR5008 Wireless Network Adapter
        0027  AR9160 802.11abgn Wireless PCI Adapter
+               0777 4082  SR71-A 802.11abgn Wireless Mini PCI Adapter
        0029  AR922X Wireless Network Adapter
                1186 3a7a  DWA-552 802.11n Xtreme N Desktop Adapter (rev A2)
        002a  AR928X Wireless Network Adapter (PCI-Express)
+               103c 3041  AR5BHB92-H 802.11abgn Wireless Half-size Mini PCIe Card
+               1a3b 1081  AW-NE773 802.11abgn Wireless Half-size Mini PCIe Card
        002b  AR9285 Wireless Network Adapter (PCI-Express)
+               1931 0023  Option GTM67x PCIe WiFi Adapter
        002c  AR2427 Wireless Network Adapter (PCI-Express)
        002d  AR9287 Wireless Network Adapter
        002e  AR9287 Wireless Network Adapter (PCI-Express)
@@ -13217,6 +13529,7 @@
        0207  AR5210
        1014  AR5212 802.11abg NIC
                1014 058a  ThinkPad 11a/b/g Wireless LAN Mini Express Adapter (AR5BXB6)
+       9013  AR5001X+ Wireless Network Adapter
        ff19  AR5006X Wireless Network Adapter
        ff1c  AR5008 Wireless Network Adapter
        ff1d  AR5008 Wireless Network Adapter
@@ -13295,6 +13608,9 @@
        5801  XMC-VLX85 Reconfigurable Virtex-5 FPGA with plug-in I/O
        5802  XMC-VLX110 Reconfigurable Virtex-5 FPGA with plug-in I/O
        5804  XMC-VLX155 Reconfigurable Virtex-5 FPGA with plug-in I/O
+       5807  XMC-SLX150: Reconfigurable Spartan-6 FPGA with plug-in I/O
+       5808  XMC-SLX150-1M: Reconfigurable Spartan-6 FPGA with plug-in I/O
+       5901  APCe8650 PCI Express IndustryPack Carrier Card
 16da  Advantech Co., Ltd.
        0011  INES GPIB-PCI
 16df  PIKA Technologies Inc.
@@ -13377,6 +13693,9 @@
        0070  Octeon CN50XX Network Processor
        0080  Octeon CN52XX Network Processor
        0090  Octeon II CN63XX Network Processor
+       0091  Octeon II CN68XX Network Processor
+       0092  Octeon II CN65XX Network Processor
+       0093  Octeon II CN61XX Network Processor
 1787  Hightech Information System Ltd.
 1789  Ennyah Technologies Corp.
 # also used by Struck Innovative Systeme for joint developments
@@ -13434,7 +13753,9 @@
 17c2  Newisys, Inc.
 17cb  Airgo Networks Inc
        0001  AGN100 802.11 a/b/g True MIMO Wireless Card
+               1385 5c00  WGM511 Pre-N 802.11g Wireless CardBus Adapter
        0002  AGN300 802.11 a/b/g True MIMO Wireless Card
+               1385 6d00  WPNT511 RangeMax 240 Mbps Wireless CardBus Adapter
                1737 0054  WPC54GX4 v1 802.11g Wireless-G Notebook Adapter with SRX400
 17cc  NetChip Technology, Inc
        2280  USB 2.0
@@ -13454,6 +13775,7 @@
                17d3 1221  ARC-1221 8-Port PCI-Express to SATA RAID Controller
        1300  ARC-1300ix-16 16-Port PCI-Express to SAS Non-RAID Host Adapter
        1680  ARC-1680 8 port PCIe/PCI-X to SAS/SATA II RAID Controller
+       1880  ARC-1880 8/12 port PCIe/PCI-X to SAS/SATA II RAID Controller
 # nee Neterion Inc., previously S2io Inc.
 17d5  Exar Corp.
        5731  Xframe 10-Gigabit Ethernet PCI-X
@@ -13508,10 +13830,12 @@
        6060  R6060 USB 1.1 Controller
        6061  R6061 USB 2.0 Controller
 17f7  Topdek Semiconductor Inc.
+17f9  Gemtek Technology Co., Ltd
 17fe  InProComm Inc.
        2120  IPN 2120 802.11b
                1737 0020  WMP11 v4 802.11b Wireless-B PCI Adapter
        2220  IPN 2220 802.11g
+               1468 0305  T60N871 802.11g Mini PCI Wireless Adapter
                1737 0029  WPC54G v4 802.11g Wireless-G Notebook Adapter
 17ff  Benq Corporation
 1803  ProdaSafe GmbH
@@ -13522,7 +13846,7 @@
                16be 0001  V9x HAM Data Fax Modem
        4100  HaM plus Data Fax Modem
                16be 0002  V9x HAM 1394
-1814  RaLink
+1814  Ralink corp.
        0101  Wireless PCI Adapter RT2400 / RT2460
                1043 0127  WiFi-b add-on Card
                1371 0010  Minitar MNW2BPCI Wireless PCI Card
@@ -13541,6 +13865,8 @@
                1799 700a  F5D7000 v2000/v3000 Wireless G Desktop Card
                1799 701a  F5D7010 v2000/v3000 Wireless G Notebook Card
                185f 22a0  CN-WF513 Wireless Cardbus Adapter
+               1948 3c00  C54RC v1 Wireless 11g CardBus Adapter
+               1948 3c01  C54Ri v1 Wireless 11g PCI Adapter
        0300  Wireless Adapter Canyon CN-WF511
        0301  RT2561/RT61 802.11g PCI
                1186 3c08  AirPlus G DWL-G630 Wireless Cardbus Adapter (rev.E1)
@@ -13551,20 +13877,29 @@
                1737 0055  WMP54G ver 4.1
                1799 700e  F5D7000 v6000 Wireless G Desktop Card
                1799 701e  F5D7010 v6000 Wireless G Notebook Card
+               17f9 0012  AWLC3026T 802.11g Wireless CardBus Adapter
                1814 2561  EW-7108PCg
        0302  RT2561/RT61 rev B 802.11g
                1186 3a71  DWA-510 Wireless G Desktop Adapter
                1186 3c08  AirPlus G DWL-G630 Wireless Cardbus Adapter (rev.E2)
                1186 3c09  AirPlus G DWL-G510 Wireless Network Adapter (Rev.C)
                1462 b834  PC54G3 Wireless 11g PCI Card
+               1948 3c23  C54RC v2 Wireless 11g CardBus Adapter
+               1948 3c24  C54Ri v2 Wireless 11g PCI Adapter
        0401  RT2600 802.11 MIMO
                1737 0052  WPC54GR v1 802.11g Wireless-G Notebook Adapter with RangeBooster
+               17f9 0011  WPCR-137G 802.11bg Wireless CardBus Adapter
+               17f9 0016  WPIR-119GH 802.11bg Wireless Desktop Adapter
        0601  RT2800 802.11n PCI
                1799 801c  F5D8011 v3 802.11n N1 Wireless Notebook Card
+               187e 3412  NWD-310N 802.11n Wireless PCI Adapter
        0681  RT2860 Wireless 802.11n PCIe
        0701  RT2760 Wireless 802.11n 1T/2R Cardbus
        0781  RT2860
+       3060  RT3060 Wireless 802.11n 1T/1R
+               1186 3c04  DWA-525 Wireless N 150 Desktop Adapter (rev.A1)
        3090  RT3090 Wireless 802.11n 1T/1R PCIe
+               13bd 1057  GN-WS32L-RH Half-size Mini PCIe Card
        3091  RT3091 Wireless 802.11n 1T/2R PCIe
        3092  RT3092 Wireless 802.11n 2T/2R PCIe
        e932  RT2560F 802.11 b/g PCI
@@ -13745,19 +14080,20 @@
        0004  Fastcom 422/2-PCI-335
        0005  Fastcom IGESCC-PCI-ISO/1
        000a  Fastcom 232/4-PCI-335
+       000b  Fastcom 232/8-PCI-335 Async 8-Port RS-232 Serial PCI Adapter
        000f  Fastcom FSCC
        0010  Fastcom GSCC
 # Dual Serocco
        0011  Fastcom QSSB
        0014  SuperFSCC
        0015  SuperFSCC-104
-       0016  Fastcom FSCC-232
+       0016  Fastcom FSCC-232 Sync/Async 2-Port RS-232 Serial PCI Adapter (F-Core)
        0017  SuperFSCC-104-NOUART
-       0018  SuperFSCC/4
+       0018  Fastcom SuperFSCC/4 Sync/Async 4-Port RS-422 Serial PCI Adapter with DMA (F-Core)
        0019  SuperFSCC with soft UARTs
-       001a  SuperFSCC-104-LVDS
-       001b  FSCC/4
-       001c  SuperFSCC/4-LVDS
+       001a  Fastcom SuperFSCC-104-LVDS Sync/Async 2-Port RS-644 Serial PC/104+ Adapter with DMA (F-Core)
+       001b  Fastcom FSCC/4 Sync/Async 4-Port RS-422 Serial PCI Adapter (F-Core)
+       001c  Fastcom SuperFSCC/4-LVDSSync/Async 4-Port RS-644 Serial PCI Adapter with DMA (F-Core)
 18fb  Resilience Corporation
 1904  Hangzhou Silan Microelectronics Co., Ltd.
        2031  SC92031 PCI Fast Ethernet Adapter
@@ -13811,6 +14147,8 @@
                1924 6204  SFN5122F-R4
                1924 6205  SFN5122F-R5
                1924 6206  SFN5122F-R6
+               1924 6210  SFN5322F-R0
+               1924 6211  SFN5322F-R1
                1924 6a05  SFN5112F-R5
                1924 6a06  SFN5112F-R6
                1924 7206  SFN5162F-R6
@@ -13824,6 +14162,8 @@
                1924 6904  SFN5111T-R4
                1924 7104  SFN5161T-R4
                1924 7904  SFN5151T-R4
+       1803  SFC9020 Virtual Function [Solarstorm]
+       1813  SFL9021 Virtual Function [Solarstorm]
        6703  SFC4000 rev A iSCSI/Onload [Solarstorm]
                10b8 0102  SMC10GPCIe-10BT (A2) [TigerCard]
                10b8 0103  SMC10GPCIe-10BT (A3) [TigerCard]
@@ -13854,13 +14194,17 @@
        e521  Advance e620 accelerator card
 1947  C-guys, Inc.
        4743  CG200 Dual SD/SDIO Host controller device
-1948  Enterasys Networks
+1948  Alpha Networks Inc.
 194a  DapTechnology B.V.
        1111  FireSpy3850
        1112  FireSpy450b
        1113  FireSpy450bT
        1114  FireSpy850
        1115  FireSpy850bT
+       1200  FireTrac 3460bT
+       1201  FireTrac 3460bT (fallback firmware)
+       1202  FireTrac 3460bT
+       1203  FireTrac 3460bT (fallback firmware)
 1954  Curtis, Inc.
 1957  Freescale Semiconductor Inc
        0012  MPC8548E
@@ -13949,6 +14293,7 @@
        1066  L2c Gigabit Ethernet
        1067  L1c Gigabit Ethernet
        1073  AR8151 v1.0 Gigabit Ethernet
+       1083  AR8151 v2.0 Gigabit Ethernet
        2048  L2 Fast Ethernet
        2060  AR8152 v1.1 Fast Ethernet
        2062  AR8152 v2.0 Fast Ethernet
@@ -13961,6 +14306,7 @@
        1011  Physics Processing Unit [PhysX]
                1043 0001  PhysX P1
 1974  TransferZentrum Mikroelektronik
+1976  TRENDnet
 1977  Parsec
 197b  JMicron Technology Corp.
        0250  JMC250 PCI Express Gigabit Ethernet Controller
@@ -13970,6 +14316,7 @@
        2361  JMB361 AHCI/IDE
                1462 7235  P965 Neo MS-7235 mainboard
        2362  JMB362 AHCI Controller
+               1043 8460  P8P67 Deluxe Motherboard
        2363  JMB362/JMB363 Serial ATA Controller
                1043 81e4  P5B [JMB363]
                1458 b000  GA-EP45-DS5 Motherboard
@@ -14054,6 +14401,7 @@
        1004  STIX - 4 Port T1/E1 Card
        1005  STIX - 4 Port FXS Card
 19ee  Netronome Systems, Inc.
+19f1  BFG Tech
 19ff  Eclipse Electronic Systems, Inc.
 1a03  ASPEED Technology, Inc.
        1150  AST1150 PCI-to-PCI Bridge
@@ -14066,7 +14414,6 @@
 1a08  Sierra semiconductor
        0000  SC15064
 1a0e  DekTec Digital Video B.V.
-       0069  DTA-105
 1a17  Force10 Networks, Inc.
        8002  PB-10GE-2P 10GbE Security Card
 1a1d  GFaI e.V.
@@ -14099,6 +14446,9 @@
 1a78  Virident Systems Inc.
        0031  Virident tachIOn Drive
                1a78 0034  tachIOn PCIe SSD [rev 3]
+               1a78 0037  tachIOn PCIe SSD [rev 3D]
+               1a78 0038  tachIOn PCIe SSD [rev 4]
+               1a78 0039  tachIOn PCIe SSD [rev 4D]
 1a84  Commex Technologies
        0001  Vulcan SP HT6210 10-Gigabit Ethernet (rev 02)
 1a88  MEN Mikro Elektronik
@@ -14147,14 +14497,23 @@
 1b1a  K&F Computing Research Co.
        0e70  GRAPE
 1b36  Red Hat, Inc.
+1b3a  Westar Display Technologies
+       7589  HRED J2000 - JPEG 2000 Video Codec Device
 1b3e  Teradata Corp.
        1fa8  BYNET BIC2SE/X
                1b3e 00a3  BYNET BIC2SX
                1b3e 00c3  BYNET BIC2SE
 1b40  Schooner Information Technology, Inc.
+# Early Proxim devices use 1b47 rather than 14b7.
+1b47  PROXIM Inc (Wrong ID)
 1b4b  Marvell Technology Group Ltd.
        9123  88SE9123 PCIe SATA 6.0 Gb/s controller
+       9125  88SE9125 PCIe SATA 6.0 Gb/s controller
        9128  88SE9128 PCIe SATA 6 Gb/s RAID controller
+       9130  88SE9128 PCIe SATA 6 Gb/s RAID controller with HyperDuo
+               1043 8438  P8P67 Deluxe Motherboard
+       91a0  88SE91A0 SATA 6Gb/s Controller
+       91a4  88SE91A4 SATA 6Gb/s Controller
 1b55  NetUP Inc.
        2a2c  Dual DVB-S2-CI card
        e2e4  Dual DVB-T/C-CI RF card
@@ -14171,6 +14530,7 @@
        5304  BC-H04120A 4 port H.264 video and audio encoder / decoder
        5308  BC-H08240A 8 port H.264 video and audio encoder / decoder
        5310  BC-H16480A 16 port H.264 video and audio encoder / decoder
+1bb5  Quantenna Communications, Inc.
 1bf4  VTI Instruments Corporation
 1c1c  Symphony
        0001  82C101
@@ -14521,6 +14881,8 @@
        0000  [mvHYPERION-CLe/CLb] CameraLink PCI Express x1 Frame Grabber
        0001  [mvHYPERION-CLf/CLm] CameraLink PCI Express x4 Frame Grabber
        0010  [mvHYPERION-16R16/-32R16] 16 Video Channel PCI Express x4 Frame Grabber
+       0020  [mvHYPERION-HD-SDI] HD-SDI PCI Express x4 Frame Grabber
+       0030  [mvHYPERION-HD-SDI-Merger] HD-SDI PCI Express x4 Frame Grabber
 4ddc  ILC Data Device Corp
        0100  DD-42924I5-300 (ARINC 429 Data Bus)
        0801  BU-65570I1 MIL-STD-1553 Test and Simulation
@@ -14696,6 +15058,7 @@
                1092 5a55  Viper II Z200
                1092 5a57  Viper II Z200
        ca00  SonicVibes
+5431  AuzenTech, Inc.
 544c  Teralogic Inc
        0350  TL880-based HDTV/ATSC tuner
 5455  Technische University Berlin
@@ -14713,8 +15076,12 @@
 5851  Exacq Technologies
 5853  XenSource, Inc.
        0001  Xen Platform Device
+# Virtual device surfaced in guests to provide HID events.
+       c110  Virtualized HID
+# Device surfaced in guests to provide 2d graphics capabilities
+       c147  Virtualized Graphics Device
+5854  GoTView
 5ace  Beholder International Ltd.
-       5050  BeholdTV 505 FM
 631c  SmartInfra Ltd
        1652  PXI-1652 Signal Generator
        2504  PXI-2504 Signal Interrogator
@@ -14736,6 +15103,7 @@
        1022  4 photo couple 4 relay Card
        1025  16 photo couple 16 relay Card
        4000  WatchDog Card
+6739  RV 940 [Barts Pro]
 # nee Qumranet
 6900  Red Hat, Inc.
 7063  pcHDTV
@@ -14762,8 +15130,10 @@
        0043  Core Processor Secondary PCI Express Root Port
        0044  Core Processor DRAM Controller
                1025 0347  Aspire 7740G
+               e4bf 50c1  PC1-GROOVE
        0045  Core Processor PCI Express x16 Root Port
        0046  Core Processor Integrated Graphics Controller
+               e4bf 50c1  PC1-GROOVE
        0047  Core Processor Secondary PCI Express Root Port
        0048  Core Processor DRAM Controller
        0049  Core Processor PCI Express x16 Root Port
@@ -14823,23 +15193,35 @@
                8086 5225  Centrino Advanced-N 6230 BGN
                8086 5226  Centrino Advanced-N 6230 ABG
        0100  2nd Generation Core Processor Family DRAM Controller
-       0101  2nd Generation Core Processor Family PCI Express Root Port
+               1043 844d  P8P67 Deluxe Motherboard
+       0101  Xeon E3-1200/2nd Generation Core Processor Family PCI Express Root Port
        0102  2nd Generation Core Processor Family Integrated Graphics Controller
-       0103  2nd Generation Core Processor Family Thermal Management Controller
        0104  2nd Generation Core Processor Family DRAM Controller
-       0105  2nd Generation Core Processor Family PCI Express Root Port
+       0105  Xeon E3-1200/2nd Generation Core Processor Family PCI Express Root Port
        0106  2nd Generation Core Processor Family Integrated Graphics Controller
-       0108  2nd Generation Core Processor Family DRAM Controller
-       0109  2nd Generation Core Processor Family PCI Express Root Port
-       010a  2nd Generation Core Processor Family Integrated Graphics Controller
-       010b  2nd Generation Core Processor Family Integrated Graphics Controller
-       010c  2nd Generation Core Processor Family DRAM Controller
-       010d  2nd Generation Core Processor Family PCI Express Root Port
-       010e  2nd Generation Core Processor Family Integrated Graphics Controller
+       0108  Xeon E3-1200 Processor Family DRAM Controller
+       0109  Xeon E3-1200/2nd Generation Core Processor Family PCI Express Root Port
+       010a  Xeon E3-1200 Processor Family Integrated Graphics Controller
+       010b  Xeon E3-1200/2nd Generation Core Processor Family Integrated Graphics Controller
+       010c  Xeon E3-1200/2nd Generation Core Processor Family DRAM Controller
+       010d  Xeon E3-1200/2nd Generation Core Processor Family PCI Express Root Port
+       010e  Xeon E3-1200/2nd Generation Core Processor Family Integrated Graphics Controller
        0112  2nd Generation Core Processor Family Integrated Graphics Controller
        0116  2nd Generation Core Processor Family Integrated Graphics Controller
        0122  2nd Generation Core Processor Family Integrated Graphics Controller
        0126  2nd Generation Core Processor Family Integrated Graphics Controller
+       0150  Ivy Bridge DRAM Controller
+       0151  Ivy Bridge PCI Express Root Port
+       0152  Ivy Bridge Graphics Controller
+       0154  Ivy Bridge DRAM Controller
+       0155  Ivy Bridge PCI Express Root Port
+       0156  Ivy Bridge Graphics Controller
+       0158  Ivy Bridge DRAM Controller
+       0159  Ivy Bridge PCI Express Root Port
+       015a  Ivy Bridge Graphics Controller
+       015c  Ivy Bridge DRAM Controller
+       015d  Ivy Bridge PCI Express Root Port
+       015e  Ivy Bridge Graphics Controller
        0309  80303 I/O Processor PCI-to-PCI Bridge
        030d  80312 I/O Companion Chip PCI-to-PCI Bridge
        0326  6700/6702PXH I/OxAPIC Interrupt Controller A
@@ -14940,10 +15322,22 @@
        0886  Centrino Wireless-N + WiMAX 6150
                8086 1315  Centrino Wireless-N + WiMAX 6150 BGN
                8086 1317  Centrino Wireless-N + WiMAX 6150 BG
-       0896  WiFi 130 Series
-       0897  WiFi 130 Series
-       08ae  WiFi 100 Series
-       08af  WiFi 100 Series
+       0896  Centrino Wireless-N 130
+               8086 5005  Centrino Wireless-N 130 BGN
+               8086 5007  Centrino Wireless-N 130 BG
+               8086 5025  Centrino Wireless-N 130 BGN
+               8086 5027  Centrino Wireless-N 130 BG
+       0897  Centrino Wireless-N 130
+               8086 5015  Centrino Wireless-N 130 BGN
+               8086 5017  Centrino Wireless-N 130 BG
+       08ae  Centrino Wireless-N 100
+               8086 1005  Centrino Wireless-N 100 BGN
+               8086 1007  Centrino Wireless-N 100 BG
+               8086 1025  Centrino Wireless-N 100 BGN
+               8086 1027  Centrino Wireless-N 100 BG
+       08af  Centrino Wireless-N 100
+               8086 1015  Centrino Wireless-N 100 BGN
+               8086 1017  Centrino Wireless-N 100 BG
        0960  80960RP (i960RP) Microprocessor/Bridge
        0962  80960RM (i960RM) Bridge
        0964  80960RP (i960RP) Microprocessor/Bridge
@@ -15318,6 +15712,7 @@
                1028 0211  OptiPlex 755
        10bf  82567LF Gigabit Network Connection
        10c0  82562V-2 10/100 Network Connection
+               1028 020d  Inspiron 530
        10c2  82562G-2 10/100 Network Connection
        10c3  82562GT-2 10/100 Network Connection
        10c4  82562GT 10/100 Network Connection
@@ -15353,6 +15748,7 @@
                10a9 8029  Prism XL Single Port Gigabit Ethernet
                8086 0001  Gigabit CT2 Desktop Adapter
                8086 a01f  Gigabit CT Desktop Adapter
+               e4bf 50c1  PC1-GROOVE
        10d5  82571PT Gigabit PT Quad Port Server ExpressModule
        10d6  82575GB Gigabit Network Connection
                8086 10d6  Gigabit VT Quad Port Server Adapter
@@ -15382,6 +15778,7 @@
                8086 a02c  Gigabit ET Quad Port Server Adapter
        10ea  82577LM Gigabit Network Connection
                1028 040b  Latitude E6510
+               e4bf 50c1  PC1-GROOVE
        10eb  82577LC Gigabit Network Connection
        10ec  82598EB 10-Gigabit AT CX4 Network Connection
                8086 a01f  10-Gigabit CX4 Dual Port Server Adapter
@@ -15398,8 +15795,10 @@
        10f5  82567LM Gigabit Network Connection
        10f6  82574L Gigabit Network Connection
        10f7  82599EB 10-Gigabit KX4 Network Connection
+               108e 7b12  Sun Dual 10GbE PCIe 2.0 FEM
                8086 000d  Ethernet Mezzanine Adapter X520-KX4-2
        10f8  82599EB 10 Gigabit Dual Port Backplane Connection
+               1028 1f63  10GbE 2P X520k bNDC
                8086 000c  Ethernet X520 10GbE Dual Port KX4-KR Mezz
        10f9  82599EB 10 Gigabit CX4 Dual Port Network Connection
        10fb  82599EB 10-Gigabit SFI/SFP+ Network Connection
@@ -15635,6 +16034,7 @@
        1501  82567V-3 Gigabit Network Connection
        1502  82579LM Gigabit Network Connection
        1503  82579V Gigabit Network Connection
+               1043 849c  P8P67 Deluxe Motherboard
        1507  82599EB 10 Gigabit Network Connection
        1508  82598EB Gigabit BX Network Connection
        150a  82576NS Gigabit Network Connection
@@ -15652,7 +16052,7 @@
        150f  82580 Gigabit Fiber Network Connection
        1510  82580 Gigabit Backplane Connection
        1511  82580 Gigabit SFP Connection
-       1514  10 Gigabit KX4 Network Connection
+       1514  82599EB 10 Gigabit KX4 Network Connection
                8086 000b  Ethernet X520 10GbE Dual Port KX4 Mezz
        1516  82580 Gigabit Network Connection
                8086 12b1  Ethernet Server Adapter I340-T2
@@ -15662,6 +16062,24 @@
        1518  82576NS SerDes Gigabit Network Connection
        151c  82599EB 10 Gigabit TN Network Connection
                108e 7b13  Dual 10GBASE-T LP
+       1521  I350 Gigabit Network Connection
+               1028 1f60  Intel GbE 4P I350crNDC
+               1028 1f62  Intel GbE 2P I350crNDC
+               8086 0001  Ethernet Server Adapter I350-T4
+               8086 0002  Ethernet Server Adapter I350-T2
+               8086 00a1  Ethernet Server Adapter I350-T4
+               8086 00a2  Ethernet Server Adapter I350-T2
+               8086 5001  Ethernet Server Adapter I350-T4
+               8086 5002  Ethernet Server Adapter I350-T2
+       1522  I350 Gigabit Fiber Network Connection
+               8086 0002  Ethernet Server Adapter I350-T2
+               8086 0003  Ethernet Server Adapter I350-F4
+               8086 0004  Ethernet Server Adapter I350-F2
+               8086 00a3  Ethernet Server Adapter I350-F4
+               8086 00a4  Ethernet Server Adapter I350-F2
+       1523  I350 Gigabit Backplane Connection
+               8086 1f52  1GbE 4P I350 Mezz
+       1524  I350 Gigabit Connection
        1525  82567V-4 Gigabit Network Connection
        1526  82576 Gigabit Network Connection
                8086 a05c  Gigabit ET2 Quad Port Server Adapter
@@ -15670,8 +16088,15 @@
                8086 0001  Ethernet Server Adapter I340-F4
                8086 0002  Ethernet Server Adapter I340-F4
        1528  Ethernet Controller 10 Gigabit X540-AT2
+               8086 0001  Ethernet Server Adapter X540-T2
+               8086 0002  Ethernet Server Adapter X540-T1
+               8086 001a  Ethernet Server Adapter X540-T2
+               8086 00a2  Ethernet Server Adapter X540-T1
+               8086 5003  Ethernet Server Adapter X540-T2
        1529  82599 10 Gigabit Dual Port Backplane Connection with FCoE
        152a  82599 10 Gigabit Dual port Network Connection with FCoE
+       154d  82599EB 10-Gigabit SFP+ Network Connection
+               8086 7b11  10GbE 2P X520 Adapter
        1960  80960RP (i960RP) Microprocessor
                101e 0431  MegaRAID 431 RAID Controller
                101e 0438  MegaRAID 438 Ultra2 LVD RAID Controller
@@ -15715,67 +16140,73 @@
        1b48  82597EX 10GbE Ethernet Controller
                8086 a01f  PRO/10GbE LR Server Adapter
                8086 a11f  PRO/10GbE LR Server Adapter
-       1c00  6 Series Chipset Family 4 port SATA IDE Controller
-       1c01  6 Series Chipset Family 4 port SATA IDE Controller
-       1c02  6 Series Chipset Family 6 port SATA AHCI Controller
-       1c03  6 Series Chipset Family 6 port SATA AHCI Controller
-       1c04  6 Series Chipset Family SATA RAID Controller
-       1c05  6 Series Chipset Family SATA RAID Controller
-       1c06  6 Series Chipset Family SATA RAID Controller
-       1c08  6 Series Chipset Family 2 port SATA IDE Controller
-       1c09  6 Series Chipset Family 2 port SATA IDE Controller
-       1c10  6 Series Chipset Family PCI Express Root Port 1
-       1c12  6 Series Chipset Family PCI Express Root Port 2
-       1c14  6 Series Chipset Family PCI Express Root Port 3
-       1c16  6 Series Chipset Family PCI Express Root Port 4
-       1c18  6 Series Chipset Family PCI Express Root Port 5
-       1c1a  6 Series Chipset Family PCI Express Root Port 6
-       1c1c  6 Series Chipset Family PCI Express Root Port 7
-       1c1e  6 Series Chipset Family PCI Express Root Port 8
-       1c20  6 Series Chipset Family High Definition Audio Controller
-       1c22  6 Series Chipset Family SMBus Controller
-       1c24  6 Series Chipset Family Thermal Management Controller
-       1c25  6 Series Chipset Family DMI to PCI Bridge
-       1c26  6 Series Chipset Family USB Enhanced Host Controller #1
-       1c2d  6 Series Chipset Family USB Enhanced Host Controller #2
-       1c33  6 Series Chipset Family LAN Controller
-       1c35  6 Series Chipset Family VECI Controller
-       1c3a  6 Series Chipset Family HECI Controller #1
-       1c3b  6 Series Chipset Family HECI Controller #2
-       1c3c  6 Series Chipset Family IDE-r Controller
-       1c3d  6 Series Chipset Family KT Controller
-       1c40  6 Series Chipset Family LPC Controller
-       1c41  6 Series Chipset Family LPC Controller
-       1c42  6 Series Chipset Family LPC Controller
-       1c43  6 Series Chipset Family LPC Controller
-       1c44  6 Series Chipset Family LPC Controller
-       1c45  6 Series Chipset Family LPC Controller
+       1c00  6 Series/C200 Series Chipset Family 4 port SATA IDE Controller
+       1c01  6 Series/C200 Series Chipset Family 4 port SATA IDE Controller
+       1c02  6 Series/C200 Series Chipset Family 6 port SATA AHCI Controller
+               1043 844d  P8P67 Deluxe Motherboard
+       1c03  6 Series/C200 Series Chipset Family 6 port SATA AHCI Controller
+       1c04  6 Series/C200 Series Chipset Family SATA RAID Controller
+       1c05  6 Series/C200 Series Chipset Family SATA RAID Controller
+       1c08  6 Series/C200 Series Chipset Family 2 port SATA IDE Controller
+       1c09  6 Series/C200 Series Chipset Family 2 port SATA IDE Controller
+       1c10  6 Series/C200 Series Chipset Family PCI Express Root Port 1
+       1c12  6 Series/C200 Series Chipset Family PCI Express Root Port 2
+       1c14  6 Series/C200 Series Chipset Family PCI Express Root Port 3
+       1c16  6 Series/C200 Series Chipset Family PCI Express Root Port 4
+       1c18  6 Series/C200 Series Chipset Family PCI Express Root Port 5
+       1c1a  6 Series/C200 Series Chipset Family PCI Express Root Port 6
+       1c1c  6 Series/C200 Series Chipset Family PCI Express Root Port 7
+       1c1e  6 Series/C200 Series Chipset Family PCI Express Root Port 8
+       1c20  6 Series/C200 Series Chipset Family High Definition Audio Controller
+               1043 8418  P8P67 Deluxe Motherboard
+       1c22  6 Series/C200 Series Chipset Family SMBus Controller
+               1043 844d  P8P67 Deluxe Motherboard
+       1c24  6 Series/C200 Series Chipset Family Thermal Management Controller
+       1c25  6 Series/C200 Series Chipset Family DMI to PCI Bridge
+       1c26  6 Series/C200 Series Chipset Family USB Enhanced Host Controller #1
+               1043 844d  P8P67 Deluxe Motherboard
+       1c2d  6 Series/C200 Series Chipset Family USB Enhanced Host Controller #2
+               1043 844d  P8P67 Deluxe Motherboard
+       1c33  6 Series/C200 Series Chipset Family LAN Controller
+       1c35  6 Series/C200 Series Chipset Family VECI Controller
+       1c3a  6 Series/C200 Series Chipset Family HECI Controller #1
+               1043 844d  P8P67 Deluxe Motherboard
+       1c3b  6 Series/C200 Series Chipset Family HECI Controller #2
+       1c3c  6 Series/C200 Series Chipset Family IDE-r Controller
+       1c3d  6 Series/C200 Series Chipset Family KT Controller
+       1c40  6 Series/C200 Series Chipset Family LPC Controller
+       1c41  Mobile SFF 6 Series Chipset Family LPC Controller
+       1c42  6 Series/C200 Series Chipset Family LPC Controller
+       1c43  Mobile 6 Series Chipset Family LPC Controller
+       1c44  Z68 Express Chipset Family LPC Controller
+       1c45  6 Series/C200 Series Chipset Family LPC Controller
        1c46  P67 Express Chipset Family LPC Controller
-       1c47  6 Series Chipset Family LPC Controller
-       1c48  6 Series Chipset Family LPC Controller
+               1043 844d  P8P67 Deluxe Motherboard
+       1c47  UM67 Express Chipset Family LPC Controller
+       1c48  6 Series/C200 Series Chipset Family LPC Controller
        1c49  HM65 Express Chipset Family LPC Controller
        1c4a  H67 Express Chipset Family LPC Controller
        1c4b  HM67 Express Chipset Family LPC Controller
-       1c4c  6 Series Chipset Family LPC Controller
-       1c4d  6 Series Chipset Family LPC Controller
-       1c4e  6 Series Chipset Family LPC Controller
-       1c4f  6 Series Chipset Family LPC Controller
-       1c50  6 Series Chipset Family LPC Controller
-       1c51  6 Series Chipset Family LPC Controller
-       1c52  6 Series Chipset Family LPC Controller
-       1c53  6 Series Chipset Family LPC Controller
-       1c54  6 Series Chipset Family LPC Controller
-       1c55  6 Series Chipset Family LPC Controller
-       1c56  6 Series Chipset Family LPC Controller
-       1c57  6 Series Chipset Family LPC Controller
-       1c58  6 Series Chipset Family LPC Controller
-       1c59  6 Series Chipset Family LPC Controller
-       1c5a  6 Series Chipset Family LPC Controller
-       1c5b  6 Series Chipset Family LPC Controller
-       1c5c  6 Series Chipset Family LPC Controller
-       1c5d  6 Series Chipset Family LPC Controller
-       1c5e  6 Series Chipset Family LPC Controller
-       1c5f  6 Series Chipset Family LPC Controller
+       1c4c  Q65 Express Chipset Family LPC Controller
+       1c4d  QS67 Express Chipset Family LPC Controller
+       1c4e  Q67 Express Chipset Family LPC Controller
+       1c4f  QM67 Express Chipset Family LPC Controller
+       1c50  B65 Express Chipset Family LPC Controller
+       1c51  6 Series/C200 Series Chipset Family LPC Controller
+       1c52  C202 Chipset Family LPC Controller
+       1c53  6 Series/C200 Series Chipset Family LPC Controller
+       1c54  C204 Chipset Family LPC Controller
+       1c55  6 Series/C200 Series Chipset Family LPC Controller
+       1c56  C206 Chipset Family LPC Controller
+       1c57  6 Series/C200 Series Chipset Family LPC Controller
+       1c58  Upgraded B65 Express Chipset Family LPC Controller
+       1c59  Upgraded HM67 Express Chipset Family LPC Controller
+       1c5a  Upgraded Q67 Express Chipset Family LPC Controller
+       1c5b  6 Series/C200 Series Chipset Family LPC Controller
+       1c5c  H61 Express Chipset Family LPC Controller
+       1c5d  6 Series/C200 Series Chipset Family LPC Controller
+       1c5e  6 Series/C200 Series Chipset Family LPC Controller
+       1c5f  6 Series/C200 Series Chipset Family LPC Controller
        1d00  Patsburg 4-Port SATA IDE Controller
        1d02  Patsburg 6-Port SATA AHCI Controller
        1d04  Patsburg SATA RAID Controller
@@ -15798,7 +16229,7 @@
        1d1e  Patsburg PCI Express Root Port 8
        1d1f  Patsburg PCI Express Root Port 8
        1d20  Patsburg High Definition Audio Controller
-       1d22  Patsburg SMBus Controller
+       1d22  Patsburg SMBus Host Controller
        1d24  Patsburg Thermal Management Controller
        1d25  Patsburg DMI to PCI Bridge
        1d26  Patsburg USB2 Enhanced Host Controller #1
@@ -15813,21 +16244,105 @@
        1d3f  Patsburg PCI Express Virtual Switch Port
        1d40  Patsburg LPC Controller
        1d41  Patsburg LPC Controller
-       1d50  Patsburg 8-Port SATA/SAS Storage Control Unit
-       1d58  Patsburg 8-Port SATA/SAS Storage Control Unit
+       1d50  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
+       1d54  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
+       1d55  Patsburg 4-Port SATA/SAS Storage Control Unit
+       1d58  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
        1d59  Patsburg 4-Port SATA/SAS Storage Control Unit
        1d5b  Patsburg 4-Port SATA Storage Control Unit
-       1d60  Patsburg 8-Port SATA/SAS Storage Control Unit
+       1d60  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
        1d61  Patsburg SAS Storage Control Unit 1
-       1d68  Patsburg 8-Port SATA/SAS Storage Control Unit
+       1d64  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
+       1d65  Patsburg 4-Port SATA/SAS Storage Control Unit
+       1d68  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
        1d69  Patsburg 4-Port SATA/SAS Storage Control Unit
        1d6b  Patsburg 4-Port SATA Storage Control Unit
-       1d70  Patsburg SCU0 SMBus Controller
-       1d71  Patsburg SCU1 SMBus Controller
-       1d72  Patsburg SMBus Controller 2 
+       1d70  Patsburg SMBus Controller 0
+       1d71  Patsburg SMBus Controller 1
+       1d72  Patsburg SMBus Controller 2
        1d73  Patsburg Integrated NVSRAM Controller 
        1d74  Patsburg PCI Express Upstream Port 
        1d76  Patsburg Multi-Function Glue
+       1e00  Panther Point 4 port SATA IDE Controller
+       1e01  Panther Point 4 port SATA IDE Controller
+       1e02  Panther Point 6 port SATA AHCI Controller
+       1e03  Panther Point 6 port SATA AHCI Controller
+       1e04  Panther Point SATA RAID Controller
+       1e05  Panther Point SATA RAID Controller
+       1e06  Panther Point SATA Premium RAID Controller
+       1e07  Panther Point SATA Premium RAID Controller
+       1e08  Panther Point 2 port SATA IDE Controller
+       1e09  Panther Point 2 port SATA IDE Controller
+       1e10  Panther Point PCI Express Root Port 1
+       1e12  Panther Point PCI Express Root Port 2
+       1e14  Panther Point PCI Express Root Port 3
+       1e16  Panther Point PCI Express Root Port 4
+       1e18  Panther Point PCI Express Root Port 5
+       1e1a  Panther Point PCI Express Root Port 6
+       1e1c  Panther Point PCI Express Root Port 7
+       1e1e  Panther Point PCI Express Root Port 8
+       1e20  Panther Point High Definition Audio Controller
+       1e22  Panther Point SMBus Controller
+       1e24  Panther Point Thermal Management Controller
+       1e25  Panther Point DMI to PCI Bridge
+       1e26  Panther Point USB Enhanced Host Controller #1
+       1e2d  Panther Point USB Enhanced Host Controller #2
+       1e31  Panther Point USB xHCI Host Controller
+       1e33  Panther Point LAN Controller
+       1e3a  Panther Point HECI Controller #1
+       1e3b  Panther Point HECI Controller #2
+       1e3c  Panther Point IDE-r Controller
+       1e3d  Panther Point KT Controller
+       1e40  Panther Point LPC Controller
+       1e41  Panther Point LPC Controller
+       1e42  Panther Point LPC Controller
+       1e43  Panther Point LPC Controller
+       1e44  Panther Point LPC Controller
+       1e45  Panther Point LPC Controller
+       1e46  Panther Point LPC Controller
+       1e47  Panther Point LPC Controller
+       1e48  Panther Point LPC Controller
+       1e49  Panther Point LPC Controller
+       1e4a  Panther Point LPC Controller
+       1e4b  Panther Point LPC Controller
+       1e4c  Panther Point LPC Controller
+       1e4d  Panther Point LPC Controller
+       1e4e  Panther Point LPC Controller
+       1e4f  Panther Point LPC Controller
+       1e50  Panther Point LPC Controller
+       1e51  Panther Point LPC Controller
+       1e52  Panther Point LPC Controller
+       1e53  Panther Point LPC Controller
+       1e54  Panther Point LPC Controller
+       1e55  Panther Point LPC Controller
+       1e56  Panther Point LPC Controller
+       1e57  Panther Point LPC Controller
+       1e58  Panther Point LPC Controller
+       1e59  Panther Point LPC Controller
+       1e5a  Panther Point LPC Controller
+       1e5b  Panther Point LPC Controller
+       1e5c  Panther Point LPC Controller
+       1e5d  Panther Point LPC Controller
+       1e5e  Panther Point LPC Controller
+       1e5f  Panther Point LPC Controller
+       2310  DH89xxCC LPC Controller
+       2323  DH89xxCC 4 Port SATA AHCI Controller
+       2330  DH89xxCC SMBus Controller
+       2331  DH89xxCC Chap Counter
+       2332  DH89xxCC Thermal Subsystem
+       2334  DH89xxCC USB2 Enhanced Host Controller #1
+       2335  DH89xxCC USB2 Enhanced Host Controller #1
+       2342  DH89xxCC PCI Express Root Port #1
+       2343  DH89xxCC PCI Express Root Port #1
+       2344  DH89xxCC PCI Express Root Port #2
+       2345  DH89xxCC PCI Express Root Port #2
+       2346  DH89xxCC PCI Express Root Port #3
+       2347  DH89xxCC PCI Express Root Port #3
+       2348  DH89xxCC PCI Express Root Port #4
+       2349  DH89xxCC PCI Express Root Port #4
+       2360  DH89xxCC Watchdog Timer
+       2364  DH89xxCC HECI 0
+       2365  DH89xxCC HECI 1
        2410  82801AA ISA Bridge (LPC)
        2411  82801AA IDE Controller
        2412  82801AA USB Controller
@@ -15912,6 +16427,7 @@
                103c 309f  Compaq nx9420 Notebook
                103c 30a3  Compaq nw8440
                103c 30c1  Compaq 6910p
+               104d 902d  VAIO VGN-NR120E
                144d c00c  P30 notebook
                1734 1055  Amilo M1420
                17aa 20ae  ThinkPad T61
@@ -15965,7 +16481,9 @@
        244c  82801BAM ISA Bridge (LPC)
        244e  82801 PCI Bridge
                1014 0267  NetVista A30p
+               1028 020d  Inspiron 530
                1028 0211  Optiplex 755
+               103c 2a3b  Pavilion A1512X
                1458 5000  GA-EP45-DS5 Motherboard
                1775 11cc  CC11/CL11
        2450  82801E ISA Bridge (LPC)
@@ -16836,11 +17354,13 @@
                15d9 8680  X7DVL-E-O motherboard
        2770  82945G/GZ/P/PL Memory Controller Hub
                1028 01ad  OptiPlex GX620
+               103c 2a3b  Pavilion A1512X
                1043 817a  P5LD2-VM Mainboard
                107b 5048  E4500
                8086 544e  DeskTop Board D945GTP
        2771  82945G/GZ/P/PL PCI Express Root Port
        2772  82945G/GZ Integrated Graphics Controller
+               103c 2a3b  Pavilion A1512X
                8086 544e  DeskTop Board D945GTP
                8086 d605  Intel Desktop Board D945GCCR
        2774  82955X Memory Controller Hub
@@ -16889,6 +17409,7 @@
        27ae  Mobile 945GME Express Integrated Graphics Controller
                1775 11cc  CC11/CL11 integrated graphics (primary)
        27b0  82801GH (ICH7DH) LPC Interface Bridge
+               103c 2a3b  Pavilion A1512X
                8086 544e  DeskTop Board D945GTP
        27b8  82801GB/GR (ICH7 Family) LPC Interface Bridge
                1028 01e6  PowerEdge 860
@@ -16919,6 +17440,7 @@
                8086 544e  DeskTop Board D945GTP
        27c1  N10/ICH7 Family SATA AHCI Controller
                1028 01df  PowerEdge SC440
+               103c 2a3b  Pavilion A1512X
                1775 11cc  CC11/CL11
                8086 4f4d  DeskTop Board D510MO
                8086 5842  DeskTop Board D975XBX
@@ -16940,6 +17462,7 @@
                1028 01d7  XPS M1210
                1028 01df  PowerEdge SC440
                1028 01e6  PowerEdge 860
+               103c 2a3b  Pavilion A1512X
                103c 309f  Compaq nx9420 Notebook
                103c 30a1  NC2400
                103c 30a3  Compaq nw8440
@@ -16956,6 +17479,7 @@
                1028 01d7  XPS M1210
                1028 01df  PowerEdge SC440
                1028 01e6  PowerEdge 860
+               103c 2a3b  Pavilion A1512X
                103c 309f  Compaq nx9420 Notebook
                103c 30a1  NC2400
                103c 30a3  Compaq nw8440
@@ -16972,6 +17496,7 @@
                1028 01d7  XPS M1210
                1028 01df  PowerEdge SC440
                1028 01e6  PowerEdge 860
+               103c 2a3b  Pavilion A1512X
                103c 309f  Compaq nx9420 Notebook
                103c 30a1  NC2400
                103c 30a3  Compaq nw8440
@@ -16987,6 +17512,7 @@
                1028 01ad  OptiPlex GX620
                1028 01d7  XPS M1210
                1028 01df  PowerEdge SC440
+               103c 2a3b  Pavilion A1512X
                103c 309f  Compaq nx9420 Notebook
                103c 30a1  NC2400
                103c 30a3  Compaq nw8440
@@ -17003,6 +17529,7 @@
                1028 01d7  XPS M1210
                1028 01df  PowerEdge SC440
                1028 01e6  PowerEdge 860
+               103c 2a3b  Pavilion A1512X
                103c 309f  Compaq nx9420 Notebook
                103c 30a1  NC2400
                103c 30a3  Compaq nw8440
@@ -17028,6 +17555,7 @@
        27d8  N10/ICH 7 Family High Definition Audio Controller
                1025 006c  9814 WKMI
                1028 01d7  XPS M1210
+               103c 2a3b  Pavilion A1512X
                103c 309f  Compaq nx9420 Notebook
                103c 30a1  NC2400
                103c 30a3  Compaq nw8440
@@ -17055,6 +17583,7 @@
                1028 01d7  XPS M1210
                1028 01df  PowerEdge SC440
                1028 01e6  PowerEdge 860
+               103c 2a3b  Pavilion A1512X
                1043 8179  P5KPL-VM Motherboard
                10f7 8338  Panasonic CF-Y5 laptop
                1458 5001  GA-8I945PG-RH Mainboard
@@ -17064,6 +17593,7 @@
                8086 544e  DeskTop Board D945GTP
                8086 5842  DeskTop Board D975XBX
        27dc  N10/ICH 7 Family LAN Controller
+               103c 2a3b  Pavilion A1512X
                8086 308d  DeskTop Board D945GTP
        27dd  82801G (ICH7 Family) AC'97 Modem Controller
        27de  82801G (ICH7 Family) AC'97 Audio Controller
@@ -17073,6 +17603,7 @@
        27df  82801G (ICH7 Family) IDE Controller
                1028 01df  PowerEdge SC440
                1028 01e6  PowerEdge 860
+               103c 2a3b  Pavilion A1512X
                103c 309f  Compaq nx9420 Notebook
                103c 30a1  NC2400
                103c 30a3  Compaq nw8440
@@ -17102,16 +17633,19 @@
                103c 30c0  Compaq 6710b
                103c 30d9  Presario C700
                104d 9005  Vaio VGN-FZ260E
+               104d 902d  VAIO VGN-NR120E
        2820  82801H (ICH8 Family) 4 port SATA IDE Controller
                1028 01da  OptiPlex 745
                1462 7235  P965 Neo MS-7235 mainboard
        2821  82801HR/HO/HH (ICH8R/DO/DH) 6 port SATA AHCI Controller
        2822  82801 SATA RAID Controller
+               1028 020d  Inspiron 530
        2824  82801HB (ICH8) 4 port SATA AHCI Controller
                1043 81ec  P5B
        2825  82801H (ICH8 Family) 2 port SATA IDE Controller
                1028 01da  OptiPlex 745
                1462 7235  P965 Neo MS-7235 mainboard
+       2826  Patsburg SATA RAID Controller
        2828  82801HBM/HEM (ICH8M/ICH8M-E) SATA IDE Controller
                1028 01f3  Inspiron 1420
                103c 30c0  Compaq 6710b
@@ -17122,10 +17656,12 @@
                103c 30c1  Compaq 6910p
                103c 30d9  Presario C700
                104d 9005  Vaio VGN-FZ260E
+               104d 902d  VAIO VGN-NR120E
                17aa 20a7  ThinkPad T61
                e4bf cc47  CCG-RUMBA
        282a  Mobile 82801 SATA RAID Controller
                1028 040b  Latitude E6510
+               e4bf 50c1  PC1-GROOVE
        2830  82801H (ICH8 Family) USB UHCI Controller #1
                1025 0121  Acer Aspire 5920G
                1028 01da  OptiPlex 745
@@ -17135,6 +17671,7 @@
                103c 30d9  Presario C700
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
+               104d 902d  VAIO VGN-NR120E
                1462 7235  P965 Neo MS-7235 mainboard
                17aa 20aa  ThinkPad T61
                e4bf cc47  CCG-RUMBA
@@ -17148,6 +17685,7 @@
                103c 30d9  Presario C700
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
+               104d 902d  VAIO VGN-NR120E
                1462 7235  P965 Neo MS-7235 mainboard
                17aa 20aa  ThinkPad T61
                e4bf cc47  CCG-RUMBA
@@ -17160,8 +17698,11 @@
                103c 30d9  Presario C700
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
+               104d 902d  VAIO VGN-NR120E
                17aa 20aa  ThinkPad T61
                e4bf cc47  CCG-RUMBA
+       2833  82801H (ICH8 Family) USB UHCI Controller #4
+               1043 81ec  P5B
        2834  82801H (ICH8 Family) USB UHCI Controller #4
                1025 0121  Aspire 5920G
                1028 01da  OptiPlex 745
@@ -17170,6 +17711,7 @@
                103c 30c1  Compaq 6910p
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
+               104d 902d  VAIO VGN-NR120E
                1462 7235  P965 Neo MS-7235 mainboard
                17aa 20aa  ThinkPad T61
                e4bf cc47  CCG-RUMBA
@@ -17181,6 +17723,7 @@
                103c 30c1  Compaq 6910p
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
+               104d 902d  VAIO VGN-NR120E
                17aa 20aa  ThinkPad T60
                e4bf cc47  CCG-RUMBA
        2836  82801H (ICH8 Family) USB2 EHCI Controller #1
@@ -17192,6 +17735,7 @@
                103c 30d9  Presario C700
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
+               104d 902d  VAIO VGN-NR120E
                1462 7235  P965 Neo MS-7235 mainboard
                17aa 20ab  ThinkPad T61
                e4bf cc47  CCG-RUMBA
@@ -17203,6 +17747,7 @@
                103c 30c1  Compaq 6910p
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
+               104d 902d  VAIO VGN-NR120E
                17aa 20ab  ThinkPad T61
                e4bf cc47  CCG-RUMBA
        283e  82801H (ICH8 Family) SMBus Controller
@@ -17213,17 +17758,21 @@
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
                104d 9008  Vaio VGN-SZ79SN_C
+               104d 902d  VAIO VGN-NR120E
                1462 7235  P965 Neo MS-7235 mainboard
                17aa 20a9  ThinkPad T61
                e4bf cc47  CCG-RUMBA
        283f  82801H (ICH8 Family) PCI Express Port 1
                1028 01da  OptiPlex 745
                103c 30c1  Compaq 6910p
+               104d 902d  VAIO VGN-NR120E
                17aa 20ad  ThinkPad T61
        2841  82801H (ICH8 Family) PCI Express Port 2
                103c 30c1  Compaq 6910p
+               104d 902d  VAIO VGN-NR120E
                17aa 20ad  ThinkPad T61
        2843  82801H (ICH8 Family) PCI Express Port 3
+               104d 902d  VAIO VGN-NR120E
                17aa 20ad  ThinkPad T61
        2845  82801H (ICH8 Family) PCI Express Port 4
                17aa 20ad  ThinkPad T61
@@ -17249,6 +17798,7 @@
                104d 9005  Vaio VGN-FZ260E
                104d 9008  Vaio VGN-SZ79SN_C
                104d 9016  Sony VAIO VGN-AR51M
+               104d 902d  VAIO VGN-NR120E
                14f1 5051  Presario C700
                17aa 20ac  ThinkPad T61
                8384 7616  Dell Vostro 1400
@@ -17261,18 +17811,22 @@
                103c 30c1  Compaq 6910p
                103c 30d9  Presario C700
                104d 9005  Vaio VGN-FZ260E
+               104d 902d  VAIO VGN-NR120E
                17aa 20a6  ThinkPad T61
                e4bf cc47  CCG-RUMBA
        2912  82801IH (ICH9DH) LPC Interface Controller
        2914  82801IO (ICH9DO) LPC Interface Controller
                1028 0211  Optiplex 755
        2916  82801IR (ICH9R) LPC Interface Controller
+               1028 020d  Inspiron 530
        2917  ICH9M-E LPC Interface Controller
                e4bf cc4d  CCM-BOOGIE
        2918  82801IB (ICH9) LPC Interface Controller
                1028 0236  PowerEdge R610 82801IB (ICH9) LPC Interface Controller
+               1462 7360  G33/P35 Neo
        2919  ICH9M LPC Interface Controller
        2920  82801IR/IO/IH (ICH9R/DO/DH) 4 port SATA IDE Controller
+               1028 020d  Inspiron 530
                1028 020f  PowerEdge R300 onboard SATA Controller
                1028 0210  PowerEdge T300 onboard SATA Controller
                1028 0211  Optiplex 755
@@ -17281,15 +17835,18 @@
                1028 0235  PowerEdge R710 SATA IDE Controller
                1028 0236  PowerEdge R610 SATA IDE Controller
                1028 0237  PowerEdge T610 SATA IDE Controller
+               1462 7360  G33/P35 Neo
        2922  82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA AHCI Controller
        2923  82801IB (ICH9) 4 port SATA AHCI Controller
        2925  82801IR/IO (ICH9R/DO) SATA RAID Controller
                1734 10e0  System Board D2542
                8086 2925  System Board D2542
        2926  82801I (ICH9 Family) 2 port SATA IDE Controller
+               1028 020d  Inspiron 530
                1028 020f  PowerEdge R300 onboard SATA Controller
                1028 0210  PowerEdge T300 onboard SATA Controller
                1028 0211  Optiplex 755
+               1462 7360  G33/P35 Neo
        2928  ICH9M/M-E 2 port SATA IDE Controller
        2929  ICH9M/M-E SATA AHCI Controller
                103c 3628  dv6-1190en
@@ -17299,12 +17856,15 @@
                e4bf cc4d  CCM-BOOGIE
        292e  ICH9M SATA IDE Controller
        2930  82801I (ICH9 Family) SMBus Controller
+               1028 020d  Inspiron 530
                1028 0211  Optiplex 755
                103c 3628  dv6-1190en
+               1462 7360  G33/P35 Neo
                e4bf cc4d  CCM-BOOGIE
        2932  82801I (ICH9 Family) Thermal Subsystem
                103c 3628  dv6-1190en
        2934  82801I (ICH9 Family) USB UHCI Controller #1
+               1028 020d  Inspiron 530
                1028 020f  PowerEdge R300 onboard UHCI
                1028 0210  PowerEdge T300 onboard UHCI
                1028 0211  Optiplex 755
@@ -17315,8 +17875,10 @@
                1028 0287  PowerEdge M610 onboard UHCI
                1028 029c  PowerEdge M710 USB UHCI Controller
                1028 2011  Optiplex 755
+               1462 7360  G33/P35 Neo
                e4bf cc4d  CCM-BOOGIE
        2935  82801I (ICH9 Family) USB UHCI Controller #2
+               1028 020d  Inspiron 530
                1028 020f  PowerEdge R300 onboard UHCI
                1028 0210  PowerEdge T300 onboard UHCI
                1028 0211  Optiplex 755
@@ -17326,8 +17888,10 @@
                1028 023c  PowerEdge R200 onboard UHCI
                1028 0287  PowerEdge M610 onboard UHCI
                1028 029c  PowerEdge M710 USB UHCI Controller
+               1462 7360  G33/P35 Neo
                e4bf cc4d  CCM-BOOGIE
        2936  82801I (ICH9 Family) USB UHCI Controller #3
+               1028 020d  Inspiron 530
                1028 020f  PowerEdge R300 onboard UHCI
                1028 0210  PowerEdge T300 onboard UHCI
                1028 0211  Optiplex 755
@@ -17335,8 +17899,10 @@
                1028 023c  PowerEdge R200 onboard UHCI
                1028 0287  PowerEdge M610 onboard UHCI
                1028 029c  PowerEdge M710 USB UHCI Controller
+               1462 7360  G33/P35 Neo
                e4bf cc4d  CCM-BOOGIE
        2937  82801I (ICH9 Family) USB UHCI Controller #4
+               1028 020d  Inspiron 530
                1028 0211  Optiplex 755
                1028 0235  PowerEdge R710 USB UHCI Controller
                1028 0236  PowerEdge R610 USB UHCI Controller
@@ -17344,23 +17910,29 @@
                1028 0287  PowerEdge M610 onboard UHCI
                1028 029c  PowerEdge M710 USB UHCI Controller
                1028 2011  Optiplex 755
+               1462 7360  G33/P35 Neo
                8086 2937  Optiplex 755
                8086 2942  828011 (ICH9 Family ) USB UHCI Controller
                e4bf cc4d  CCM-BOOGIE
        2938  82801I (ICH9 Family) USB UHCI Controller #5
+               1028 020d  Inspiron 530
                1028 0211  Optiplex 755
                1028 0235  PowerEdge R710 USB UHCI Controller
                1028 0236  PowerEdge R610 USB UHCI Controller
                1028 0237  PowerEdge T610 USB UHCI Controller
                1028 0287  PowerEdge M610 onboard UHCI
                1028 029c  PowerEdge M710 USB UHCI Controller
+               1462 7360  G33/P35 Neo
                8086 2938  Optiplex 755
                e4bf cc4d  CCM-BOOGIE
        2939  82801I (ICH9 Family) USB UHCI Controller #6
+               1028 020d  Inspiron 530
                1028 0210  PowerEdge T300 onboard UHCI
                1028 0237  PowerEdge T610 USB UHCI Controller
+               1462 7360  G33/P35 Neo
                e4bf cc4d  CCM-BOOGIE
        293a  82801I (ICH9 Family) USB2 EHCI Controller #1
+               1028 020d  Inspiron 530
                1028 020f  PowerEdge R300 onboard EHCI
                1028 0210  PowerEdge T300 onboard EHCI
                1028 0211  Optiplex 755
@@ -17370,30 +17942,41 @@
                1028 023c  PowerEdge R200 onboard EHCI
                1028 0287  PowerEdge M610 onboard EHCI
                1028 029c  PowerEdge M710 USB EHCI Controller
+               1462 7360  G33/P35 Neo
                e4bf cc4d  CCM-BOOGIE
        293c  82801I (ICH9 Family) USB2 EHCI Controller #2
+               1028 020d  Inspiron 530
                1028 0211  Optiplex 755
                1028 0235  PowerEdge R710 USB EHCI Controller
                1028 0236  PowerEdge R610 USB EHCI Controller
                1028 0237  PowerEdge T610 USB EHCI Controller
                1028 0287  PowerEdge M610 onboard EHCI
                1028 029c  PowerEdge M710 USB EHCI Controller
+               1462 7360  G33/P35 Neo
                8086 293c  Optiplex 755
                e4bf cc4d  CCM-BOOGIE
        293e  82801I (ICH9 Family) HD Audio Controller
+               1028 020d  Inspiron 530
                1028 0211  Optiplex 755
                103c 3628  dv6-1190en
+               1462 7360  G33/P35 Neo
                8086 293e  Optiplex 755
                8086 2940  Optiplex 755
                e4bf cc4d  CCM-BOOGIE
        2940  82801I (ICH9 Family) PCI Express Port 1
+               1028 020d  Inspiron 530
                1028 0211  Optiplex 755
                8086 2940  Optiplex 755
        2942  82801I (ICH9 Family) PCI Express Port 2
+               1028 020d  Inspiron 530
        2944  82801I (ICH9 Family) PCI Express Port 3
+               1028 020d  Inspiron 530
        2946  82801I (ICH9 Family) PCI Express Port 4
+               1028 020d  Inspiron 530
        2948  82801I (ICH9 Family) PCI Express Port 5
+               1028 020d  Inspiron 530
        294a  82801I (ICH9 Family) PCI Express Port 6
+               1028 020d  Inspiron 530
        294c  82566DC-2 Gigabit Network Connection
                17aa 302e  82566DM-2 Gigabit Network Connection
        2970  82946GZ/PL/GL Memory Controller Hub
@@ -17445,11 +18028,16 @@
        29b7  82Q35 Express Serial KT Controller
                1028 0211  OptiPlex 755
        29c0  82G33/G31/P35/P31 Express DRAM Controller
+               1028 020d  Inspiron 530
                1043 82b0  P5KPL-VM Motherboard
+               1462 7360  G33/P35 Neo
        29c1  82G33/G31/P35/P31 Express PCI Express Root Port
+               1028 020d  Inspiron 530
        29c2  82G33/G31 Express Integrated Graphics Controller
+               1028 020d  Inspiron 530
                1043 82b0  P5KPL-VM Motherboard
        29c3  82G33/G31 Express Integrated Graphics Controller
+               1028 020d  Inspiron 530
                1043 82b0  P5KPL-VM Motherboard
        29c4  82G33/G31/P35/P31 Express MEI Controller
        29c5  82G33/G31/P35/P31 Express MEI Controller
@@ -17485,21 +18073,24 @@
                103c 30c1  Compaq 6910p
                103c 30d9  Presario C700
                104d 9005  Vaio VGN-FZ260E
+               104d 902d  VAIO VGN-NR120E
                17aa 20b1  ThinkPad T61
                17aa 20b3  T61
                e4bf cc47  CCG-RUMBA
        2a01  Mobile PM965/GM965/GL960 PCI Express Root Port
-       2a02  Mobile GM965/GL960 Integrated Graphics Controller
+       2a02  Mobile GM965/GL960 Integrated Graphics Controller (primary)
                1028 01f3  Inspiron 1420
                1028 01f9  Latitude D630
                103c 30c0  Compaq 6710b
                103c 30d9  Presario C700
+               104d 902d  VAIO VGN-NR120E
                17aa 20b5  T61
                e4bf cc47  CCG-RUMBA
-       2a03  Mobile GM965/GL960 Integrated Graphics Controller
+       2a03  Mobile GM965/GL960 Integrated Graphics Controller (secondary)
                1028 01f3  Dell Inspiron 1420
                103c 30c0  Compaq 6710b
                103c 30d9  Presario C700
+               104d 902d  VAIO VGN-NR120E
                17aa 20b5  T61
                e4bf cc47  CCG-RUMBA
        2a04  Mobile PM965/GM965 MEI Controller
@@ -17536,49 +18127,49 @@
        2a51  Cantiga MEI Controller
        2a52  Cantiga PT IDER Controller
        2a53  Cantiga AMT SOL Redirection
-       2b00  Xeon 7500 System Configuration Controller 1
-       2b02  Xeon 7500 System Configuration Controller 2
-       2b04  Xeon 7500 Power Controller
-       2b08  Xeon 7500 Caching Agent 0
-       2b0c  Xeon 7500 Caching Agent 1
-       2b10  Xeon 7500 QPI Home Agent 0
-       2b13  Xeon 7500 Memory Controller 0c
-       2b14  Xeon 7500 Memory Controller 0a
-       2b16  Xeon 7500 Memory Controller 0b
-       2b18  Xeon 7500 QPI Home Agent 1
-       2b1b  Xeon 7500 Memory Controller 1c
-       2b1c  Xeon 7500 Memory Controller 1a
-       2b1e  Xeon 7500 Memory Controller 1b
-       2b20  Xeon 7500 Last Level Cache Coherence Engine 0
-       2b22  Xeon 7500 System Configuration Controller 3
-       2b24  Xeon 7500 Last Level Cache Coherence Engine 1
-       2b28  Xeon 7500 Last Level Cache Coherence Engine 2
-       2b2a  Xeon 7500 System Configuration Controller 4
-       2b2c  Xeon 7500 Last Level Cache Coherence Engine 3
-       2b30  Xeon 7500 Last Level Cache Coherence Engine 4
-       2b34  Xeon 7500 Last Level Cache Coherence Engine 5
-       2b38  Xeon 7500 Last Level Cache Coherence Engine 6
-       2b3c  Xeon 7500 Last Level Cache Coherence Engine 7
-       2b40  Xeon 7500 QPI Router Port 0-1
-       2b42  Xeon 7500 QPI Router Port 2-3
-       2b44  Xeon 7500 QPI Router Port 4-5
-       2b46  Xeon 7500 QPI Router Port 6-7
-       2b48  Xeon 7500 Test and Debug 0
-       2b4c  Xeon 7500 Test and Debug 1
-       2b50  Xeon 7500 QPI Physical Port 0: REUT control/status
-       2b52  Xeon 7500 QPI Physical Port 0: Misc. control/status
-       2b54  Xeon 7500 QPI Physical Port 1: REUT control/status
-       2b56  Xeon 7500 QPI Physical Port 1: Misc. control/status
-       2b58  Xeon 7500 QPI Physical Port 2: REUT control/status
-       2b5a  Xeon 7500 QPI Physical Port 2: Misc. control/status
-       2b5c  Xeon 7500 QPI Physical Port 3: REUT control/status
-       2b5e  Xeon 7500 QPI Physical Port 3: Misc. control/status
-       2b60  Xeon 7500 SMI Physical Port 0: REUT control/status
-       2b62  Xeon 7500 SMI Physical Port 0: Misc control/status
-       2b64  Xeon 7500 SMI Physical Port 1: REUT control/status
-       2b66  Xeon 7500 SMI Physical Port 1: Misc control/status
-       2b68  Westmere-EX Last Level Cache Coherence Engine 8
-       2b6c  Westmere-EX Last Level Cache Coherence Engine 9
+       2b00  Xeon Processor E7 Product Family System Configuration Controller 1
+       2b02  Xeon Processor E7 Product Family System Configuration Controller 2
+       2b04  Xeon Processor E7 Product Family Power Controller
+       2b08  Xeon Processor E7 Product Family Caching Agent 0
+       2b0c  Xeon Processor E7 Product Family Caching Agent 1
+       2b10  Xeon Processor E7 Product Family QPI Home Agent 0
+       2b13  Xeon Processor E7 Product Family Memory Controller 0c
+       2b14  Xeon Processor E7 Product Family Memory Controller 0a
+       2b16  Xeon Processor E7 Product Family Memory Controller 0b
+       2b18  Xeon Processor E7 Product Family QPI Home Agent 1
+       2b1b  Xeon Processor E7 Product Family Memory Controller 1c
+       2b1c  Xeon Processor E7 Product Family Memory Controller 1a
+       2b1e  Xeon Processor E7 Product Family Memory Controller 1b
+       2b20  Xeon Processor E7 Product Family Last Level Cache Coherence Engine 0
+       2b22  Xeon Processor E7 Product Family System Configuration Controller 3
+       2b24  Xeon Processor E7 Product Family Last Level Cache Coherence Engine 1
+       2b28  Xeon Processor E7 Product Family Last Level Cache Coherence Engine 2
+       2b2a  Xeon Processor E7 Product Family System Configuration Controller 4
+       2b2c  Xeon Processor E7 Product Family Last Level Cache Coherence Engine 3
+       2b30  Xeon Processor E7 Product Family Last Level Cache Coherence Engine 4
+       2b34  Xeon Processor E7 Product Family Last Level Cache Coherence Engine 5
+       2b38  Xeon Processor E7 Product Family Last Level Cache Coherence Engine 6
+       2b3c  Xeon Processor E7 Product Family Last Level Cache Coherence Engine 7
+       2b40  Xeon Processor E7 Product Family QPI Router Port 0-1
+       2b42  Xeon Processor E7 Product Family QPI Router Port 2-3
+       2b44  Xeon Processor E7 Product Family QPI Router Port 4-5
+       2b46  Xeon Processor E7 Product Family QPI Router Port 6-7
+       2b48  Xeon Processor E7 Product Family Test and Debug 0
+       2b4c  Xeon Processor E7 Product Family Test and Debug 1
+       2b50  Xeon Processor E7 Product Family QPI Physical Port 0: REUT control/status
+       2b52  Xeon Processor E7 Product Family QPI Physical Port 0: Misc. control/status
+       2b54  Xeon Processor E7 Product Family QPI Physical Port 1: REUT control/status
+       2b56  Xeon Processor E7 Product Family QPI Physical Port 1: Misc. control/status
+       2b58  Xeon Processor E7 Product Family QPI Physical Port 2: REUT control/status
+       2b5a  Xeon Processor E7 Product Family QPI Physical Port 2: Misc. control/status
+       2b5c  Xeon Processor E7 Product Family QPI Physical Port 3: REUT control/status
+       2b5e  Xeon Processor E7 Product Family QPI Physical Port 3: Misc. control/status
+       2b60  Xeon Processor E7 Product Family SMI Physical Port 0: REUT control/status
+       2b62  Xeon Processor E7 Product Family SMI Physical Port 0: Misc control/status
+       2b64  Xeon Processor E7 Product Family SMI Physical Port 1: REUT control/status
+       2b66  Xeon Processor E7 Product Family SMI Physical Port 1: Misc control/status
+       2b68  Xeon Processor E7 Product Family Last Level Cache Coherence Engine 8
+       2b6c  Xeon Processor E7 Product Family Last Level Cache Coherence Engine 9
        2c01  Xeon 5500/Core i7 QuickPath Architecture System Address Decoder
        2c10  Xeon 5500/Core i7 QPI Link 0
        2c11  Xeon 5500/Core i7 QPI Physical 0
@@ -18112,6 +18703,7 @@
        3b06  5 Series Chipset LPC Interface Controller
        3b07  Mobile 5 Series Chipset LPC Interface Controller
                1028 040b  Latitude E6510
+               e4bf 50c1  PC1-GROOVE
        3b08  5 Series Chipset LPC Interface Controller
        3b09  Mobile 5 Series Chipset LPC Interface Controller
                1025 0347  Aspire 7740G
@@ -18148,16 +18740,21 @@
                1025 0347  Aspire 7740G
        3b2c  5 Series/3400 Series Chipset SATA RAID Controller
        3b2d  5 Series/3400 Series Chipset 2 port SATA IDE Controller
+               e4bf 50c1  PC1-GROOVE
        3b2e  5 Series/3400 Series Chipset 4 port SATA IDE Controller
+               e4bf 50c1  PC1-GROOVE
        3b2f  5 Series/3400 Series Chipset 6 port SATA AHCI Controller
+               e4bf 50c1  PC1-GROOVE
        3b30  5 Series/3400 Series Chipset SMBus Controller
                1025 0347  Aspire 7740G
                1028 040b  Latitude E6510
+               e4bf 50c1  PC1-GROOVE
        3b32  5 Series/3400 Series Chipset Thermal Subsystem
                1025 0347  Aspire 7740G
        3b34  5 Series/3400 Series Chipset USB2 Enhanced Host Controller
                1025 0347  Aspire 7740G
                1028 040b  Latitude E6510
+               e4bf 50c1  PC1-GROOVE
        3b36  5 Series/3400 Series Chipset USB Universal Host Controller
        3b37  5 Series/3400 Series Chipset USB Universal Host Controller
        3b38  5 Series/3400 Series Chipset USB Universal Host Controller
@@ -18167,6 +18764,7 @@
        3b3c  5 Series/3400 Series Chipset USB2 Enhanced Host Controller
                1025 0347  Aspire 7740G
                1028 040b  Latitude E6510
+               e4bf 50c1  PC1-GROOVE
        3b3e  5 Series/3400 Series Chipset USB Universal Host Controller
        3b3f  5 Series/3400 Series Chipset USB Universal Host Controller
        3b40  5 Series/3400 Series Chipset USB Universal Host Controller
@@ -18183,12 +18781,15 @@
        3b56  5 Series/3400 Series Chipset High Definition Audio
                1025 0347  Aspire 7740G
                1028 040b  Latitude E6510
+               e4bf 50c1  PC1-GROOVE
        3b57  5 Series/3400 Series Chipset High Definition Audio
        3b64  5 Series/3400 Series Chipset HECI Controller
                1025 0347  Aspire 7740G
+               e4bf 50c1  PC1-GROOVE
        3b65  5 Series/3400 Series Chipset HECI Controller
        3b66  5 Series/3400 Series Chipset PT IDER Controller
        3b67  5 Series/3400 Series Chipset KT Controller
+               e4bf 50c1  PC1-GROOVE
        3c00  Sandy Bridge DMI2
        3c01  Sandy Bridge DMI2 in PCI Express Mode
        3c02  Sandy Bridge IIO PCI Express Root Port 1a
@@ -19057,6 +19658,8 @@
                1000 0022  2P2S (2 Parallel / 2 16550A Serial Port Adapter)
        9865  PCI 9865 Multi-I/O Controller
        9901  PCIe 9901 Multi-I/O Controller
+       9904  4-Port PCIe Serial Adapter
+       9922  PCIe 9922 Multi-I/O Controller
        9990  MCS9990 PCIe to 4‐Port USB 2.0 Host Controller
 9902  Stargen Inc.
        0001  SG2010 PCI over Starfabric Bridge
@@ -19087,9 +19690,11 @@ affe  Sirrix AG security technologies
        02e1  PCI2E1 2-port ISDN E1 interface
        450e  PCI4S0EC 4-port ISDN S0 interface
        dead  Sirrix.PCI4S0 4-port ISDN S0 interface
+b100  OpenVox Communication Co. Ltd.
 # Not registered officially
 b10b  Uakron PCI Project
 b1b3  Shiva Europe Limited
+b1d9  ATCOM Technology co., LTD.
 # Pinnacle should be 11bd, but they got it wrong several times --mj
 bd11  Pinnacle Systems, Inc. (Wrong ID)
 bdbd  Blackmagic Design
@@ -19119,7 +19724,10 @@ d161  Digium, Inc.
        0410  Wildcard TE410P/TE412P quad-span T1/E1/J1 card 3.3V
        0420  Wildcard TE420P quad-span T1/E1/J1 card 3.3V (PCI-Express)
        0800  Wildcard TDM800P 8-port analog card
+       1205  Wildcard TE205P/TE207P dual-span T1/E1/J1 card 5.0V (u1)
        1220  Wildcard TE220 dual-span T1/E1/J1 card 3.3V (PCI-Express) (5th gen)
+       1405  Wildcard TE405P/TE407P quad-span T1/E1/J1 card 5.0V (u1)
+       1420  Wildcard TE420 quad-span T1/E1/J1 card 3.3V (PCI-Express) (5th gen)
        2400  Wildcard TDM2400P 24-port analog card
        3400  Wildcard TC400P transcoder base card
        8000  Wildcard TE121 single-span T1/E1/J1 card (PCI-Express)
@@ -19151,7 +19759,10 @@ e159  Tiger Jet Network Inc.
                0059 0003  128k ISDN-U Adapter
                00a7 0001  TELES.S0/PCI 2.x ISDN Adapter
                8086 0003  Digium X100P/X101P analogue PSTN FXO interface
+               b100 0003  OpenVox A400P 4-port analog card
+               b1d9 0003  AX400P 4-port analog card
        0002  Tiger100APC ISDN chipset
+e1c5  Elcus
 e4bf  EKF Elektronik GmbH
 e55e  Essence Technology, Inc.
 ea01  Eagle Technology
@@ -19252,6 +19863,7 @@ feda  Broadcom Inc
        a10e  BCM4230 iLine10 HomePNA 2.0
 fede  Fedetec Inc.
        0003  TABIC PCI v3
+ffee  FNK Tech
 fffd  XenSource, Inc.
        0101  PCI Event Channel Controller
 # Used in some old VMWare products before they got a real ID assigned
@@ -19405,6 +20017,7 @@ C 0c  Serial bus controller
                00  UHCI
                10  OHCI
                20  EHCI
+               30  XHCI
                80  Unspecified
                fe  USB Device
        04  Fibre Channel

diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids
index d7790d138dd5f333f96373f5605d452d10ddabfa..ca684efa8cdc5f15f64b8b529e4c1715686072e0 100644 (file)
--- a/src/hwdata/usb.ids
+++ b/src/hwdata/usb.ids
@@ -9,8 +9,8 @@
 #      The latest version can be obtained from
 #              http://www.linux-usb.org/usb.ids
 #
-# Version: 2010.12.24
-# Date:    2010-12-24 20:34:02
+# Version: 2011.06.19
+# Date:    2011-06-19 20:34:03
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -29,11 +29,11 @@
        5301  GW-US54ZGL 802.11bg
 0079  DragonRise Inc.
        0006  Generic USB Joystick
+       0011  Gamepad
 0105  Trust International B.V.
        145f  NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]
 0145  Unknown
        0112  Card Reader
-0154  LW154 Wireless 150N Adapter
 0204  Chipsbank Microelectronics Co., Ltd
        6025  CBM2080 Flash drive controller
        6026  CBM1180 Flash drive controller
@@ -85,15 +85,22 @@
        204e  LUFA Dual CDC Demo Application
        204f  LUFA Generic HID Demo Application
        2060  Benito Programmer Project
-       2061  LUFA Combined Mas Storage and Keyboard Demo Application
+       2061  LUFA Combined Mass Storage and Keyboard Demo Application
        2062  LUFA Combined CDC and Mouse Demo Application
        2063  LUFA Datalogger Device
+       2064  Interfaceless Control-Only LUFA Devices
+       2065  LUFA Test and Measurement Demo Application
+       2066  LUFA Multiple Report HID Demo
+       2068  LUFA Virtual Serial/Mass Storage Demo
+       2069  LUFA Webserver Project
        2103  JTAG ICE mkII
        2104  AVR ISP mkII
        2105  AVRONE!
        2106  STK600 development board
        2107  AVR Dragon
        210d  XPLAIN evaluation kit (CDC ACM)
+       2122  XMEGA-A1 Explained evaluation kit
+       2310  EVK11xx evaluation board
        2ffb  at90usb AVR DFU bootloader
        2ffd  at89c5130/c5131 DFU bootloader
        2fff  at89c5132/c51snd1c DFU bootloader
@@ -103,7 +110,7 @@
        5601  at76c510 Prism-II 802.11b Access Point
        5603  Cisco 7920 WiFi IP Phone
        6124  at91sam SAMBA bootloader
-       7603  at76c503a D-Link DWL-120 802.11b Adapter
+       7603  D-Link DWL-120 802.11b Wireless Adapter [Atmel at76c503a]
        7604  at76c503a 802.11b Adapter
        7605  at76c503a 802.11b Adapter
        7606  at76c505 802.11b Adapter
@@ -177,7 +184,7 @@
        0511  OfficeJet K60
        0512  DeckJet 450
        0517  LaserJet 1000
-       051d  integrated module with Bluetooth wireless technology.
+       051d  Wireless (Bluetooth + WLAN) Interface [Integrated Module]
        0601  ScanJet 6300c
        0604  DeskJet 840c
        0605  ScanJet 2200c
@@ -222,6 +229,7 @@
        1016  Jornada 548 / iPAQ HW6515 Pocket PC
        1017  LaserJet 1300
        1024  Smart Card Keyboard
+       1027  Virtual keyboard and mouse
        1102  PhotoSmart 240 series
        1104  DeskJet 959c
        1105  ScanJet 5470c/5490c
@@ -281,6 +289,7 @@
        1b02  PhotoSmart A610 series
        1b04  DeskJet 3810
        1b05  ScanJet 4850C/4890C
+       1b07  Premium Starter Webcam
        1c02  PhotoSmart A710 series
        1c17  Color LaserJet 2550l
        1d02  PhotoSmart A310 series
@@ -314,6 +323,7 @@
        2312  OfficeJet Pro L7700
        2317  LaserJet 4350
        2402  PhotoSmart 7700 series
+       2404  Deskjet F2280 series
        2405  ScanJet 4070 PhotoSmart
        2417  LaserJet 4250
        241d  Gobi 2000 Wireless Modem (QDL mode)
@@ -362,6 +372,7 @@
        3104  DeskJet 960c
        3111  OfficeJet 4100 series
        3117  EWS 2605dtn
+       311d  Atheros AR9285 Malbec Bluetooth Adapter
        3202  PhotoSmart 1215
        3207  4 GB flash drive
        3211  OfficeJet 4105 series
@@ -421,6 +432,7 @@
        4502  PhotoSmart 945 (PTP mode)
        4505  ScanJet G4010
        4511  PhotoSmart 2600
+       4512  E709n [Officejet 6500 Wireless]
        4517  EWS UPD
        4605  ScanJet G4050
        4611  PhotoSmart 2700
@@ -440,6 +452,7 @@
        5111  PhotoSmart 3200 series
        5211  PhotoSmart 3300 series
        5311  OfficeJet 6300
+       5312  Officejet Pro 8500A
        5411  OfficeJet 4300
        5511  DeskJet F300 series
        5611  PhotoSmart C3180
@@ -523,6 +536,7 @@
        8117  LaserJet P4015
        811c  Ethernet HN210E
        8204  Printing Support
+       8207  FHA-3510 2.4GHz Wireless Optical Mobile Mouse
        8217  LaserJet P4014
        8317  LaserJet M9050 MFP
        8404  DeskJet 6800 series
@@ -532,6 +546,8 @@
        8704  DeskJet 5940
        8804  DeskJet 6980 series
        8904  DeskJet 6940 series
+       8c07  Digital Stereo Headset
+       8c11  Deskjet F4500 series
        9002  PhotoSmart M437
        9102  PhotoSmart M537
        9302  PhotoSmart R930 series
@@ -638,7 +654,8 @@
        6008  Serial Converter
        6009  Serial Converter
        6010  FT2232C Dual USB-UART/FIFO IC
-       6011  FT4232H
+       6011  FT4232H Quad HS USB-UART/FIFO IC
+       6014  FT232H Single HS USB-UART/FIFO IC
        8040  4 Port Hub
        8070  7 Port Hub
        8370  7 Port Hub
@@ -647,6 +664,10 @@
        bcd8  Stellaris Development Board
        bcd9  Stellaris Evaluation Board
        c630  lcd2usb interface
+       c631  i2c-tiny-usb interface
+       c632  xu1541 c64 floppy drive interface
+       c633  TinyCrypt dongle
+       c634  glcd2usb interface
        c7d0  RR-CirKits LocoBuffer-USB
        c8b8  Alpermann+Velte MTD TCU
        c8b9  Alpermann+Velte MTD TCU 1HE
@@ -663,7 +684,9 @@
        d012  SCS DRAGON 1
        d013  SCS DRAGON 1
        d6f8  UNI Black BOX
-       e0d0  Total Phase Aardvark I2C/SPI analyzer
+       d9a9  Actisense USG-1 NMEA Serial Gateway
+       d9aa  Actisense NGT-1 NMEA2000 PC Interface
+       e0d0  Total Phase Aardvark I2C/SPI Host Adapter
        e521  EVER Sinline XL Series UPS
        e700  Elster Unicom III Optical Probe
        e888  Expert ISDN Control USB
@@ -676,6 +699,7 @@
        ed72  HAMEG HO720 Serial Port
        ed73  HAMEG HO730 Serial Port
        ed74  HAMEG HO820 Serial Port
+       ef10  FT1245BL
        f070  Serial Converter 422/485 [Vardaan VEUSB422R3]
        f1a0  Asix PRESTO Programmer
        f208  Papenmeier Braille-Display
@@ -919,7 +943,7 @@
        6205  USB 2.0 Card Reader
 040e  MCCI
 040f  Echo Speech Corp.
-0411  MelCo., Inc.
+0411  BUFFALO INC. (formerly MelCo., Inc.)
        0001  LUA-TX Ethernet [pegasus]
        0005  LUA-TX Ethernet
        0006  WLI-USB-L11 Wireless LAN Adapter
@@ -955,17 +979,18 @@
        00d8  WLI-U2-SG54HP
        00d9  WLI-U2-G54HP
        00da  WLI-U2-KG54L 802.11bg [ZyDAS ZD1211B]
-       00e8  Buffalo WLI-UC-G300N Wireless LAN Adapter
-       012e  Buffalo WLI-UC-AG300N Wireless LAN Adapter
-       0148  Buffalo WLI-UC-G300HP Wireless LAN Adapter
-       0150  Buffalo WLP-UC-AG300 Wireless LAN Adapter
-       0157  Buffalo External Hard Drive HD-PEU2
-       0158  Buffalo WLI-UC-GNHP Wireless LAN Adapter
-       015d  Buffalo WLI-UC-GN Wireless LAN Adapter [Ralink RT2870]
-       016f  Buffalo WLI-UC-G301N Wireless LAN Adapter
-       017f  Sony UWA-BR100 802.11abgn Wireless Adapter [Atheros AR7010]
-       019e  Buffalo WLI-UC-GNP Wireless LAN Adapter
-       01a2  Buffalo WLI-UC-GNM Wireless LAN Adapter
+       00e8  WLI-UC-G300N Wireless LAN Adapter [Ralink RT2870]
+       012e  WLI-UC-AG300N Wireless LAN Adapter
+       0148  WLI-UC-G300HP Wireless LAN Adapter
+       0150  WLP-UC-AG300 Wireless LAN Adapter
+       0157  External Hard Drive HD-PEU2
+       0158  WLI-UC-GNHP Wireless LAN Adapter
+       015d  WLI-UC-GN Wireless LAN Adapter [Ralink RT3070]
+       016f  WLI-UC-G301N Wireless LAN Adapter
+       017f  Sony UWA-BR100 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]
+       019e  WLI-UC-GNP Wireless LAN Adapter
+       01a1  MiniStation Metro
+       01a2  WLI-UC-GNM Wireless LAN Adapter
 0412  Award Software International
 0413  Leadtek Research, Inc.
        1310  WinFast TV - NTSC + FM
@@ -1054,6 +1079,7 @@
        1053  Mouse Gamer HD7600L
        200c  MuVo V100
        2020  Zen X-Fi 2
+       2029  ZiiO
        2801  Prodikeys PC-MIDI multifunction keyboard
        3000  SoundBlaster Extigy
        3002  SB External Composite Device
@@ -1066,6 +1092,7 @@
        3060  Sound Blaster Audigy 2 ZS External
        3061  SoundBlaster Audigy 2 ZS Video Editor
        3090  Sound Blaster Digital Music SX
+       30d3  Sound Blaster Play!
        3f00  E-Mu Xboard 25 MIDI Controller
        3f02  E-Mu 0202
        3f04  E-Mu 0404
@@ -1110,6 +1137,7 @@
        403d  Webcam Notebook Ultra
        403e  Webcam Vista Plus
        4041  Webcam Live! Motion
+       4043  Vibra Plus Webcam
        4045  Live! Cam Voice
        4049  Live! Cam Voice
        4051  Live! Cam Notebook Pro [VF0250]
@@ -1123,6 +1151,7 @@
        4061  Live! Cam Notebook Pro [VF0400]
        4063  Live! Cam Video IM Pro
        4068  Live! Cam Notebook [VF0470]
+       406c  Live! Cam Sync [VF0520]
        4083  Live! Cam Socialize [VF0640]
        4100  Nomad Jukebox 2
        4101  Nomad Jukebox 3
@@ -1209,6 +1238,7 @@
        01b2  6303 classic Phone (Printing and media mode)
        01c7  N900 (Storage Mode)
        01c8  N900 (PC-Suite Mode)
+       0228  5530 XpressMusic
        026a  N97 (mass storage)
        026b  N97 (Multimedia)
        026c  N97 (PC Suite)
@@ -1277,6 +1307,7 @@
        04c3  N800 Internet Tablet
        04ce  E90 Communicator (PC Suite mode)
        04cf  E90 Communicator (Storage mode)
+       04f0  Nokia N95 (PC Suite mode)
        04f9  6300 (PC Suite mode)
        0508  E65 (PC Suite mode)
        0509  E65 (Storage mode)
@@ -1312,6 +1343,7 @@
        2504  USB 2.0 Hub
        2512  USB 2.0 Hub
        2514  USB 2.0 Hub
+       2517  Hub
        2524  USB MultiSwitch Hub
        2602  USB 2.0 Hub
        2640  USB 2.0 Hub
@@ -1504,6 +1536,7 @@
        010b  2500 series
        010d  3500-4500 series
        010f  6500 series
+       0142  X3650 (Printer, Scanner, Copier)
        4303  Xerox WorkCentre Pro 412
 043e  LG Electronics USA, Inc.
        3001  AN-WF100 802.11abgn Wireless Adapter [Broadcom BCM4323]
@@ -1591,7 +1624,7 @@
        6001  AU5 ADSL Modem
        6060  RNDIS/BeWAN ADSL2+
        6070  RNDIS/BeWAN ADSL2+
-       625f  Trekstor USB-Stick 12 CS-D 12 GB
+       625f  TUSB6250 ATA Bridge
        dbc0  Device Bay Controller
        e001  GraphLink
        e003  TI-84 Plus Calculator
@@ -1705,6 +1738,7 @@
        7055  Slim 2020AF camera
        705a  Asus USB2.0 Webcam
        705c  Genius iSlim 1300AF
+       7079  FaceCam 2025R
 0459  Adobe Systems, Inc.
 045a  SONICblue, Inc.
        07da  Supra Express 56K modem
@@ -1773,7 +1807,7 @@
        0065  Wireless Natural MultiMedia Keyboard (106/109)
        006a  Wireless Optical Mouse (IntelliPoint)
        006d  eHome Remote Control Keyboard keys
-       006e  MN510 802.11b Adapter
+       006e  MN-510 802.11b Wireless Adapter [Intersil ISL3873B]
        006f  Smart Display Reference Device
        0070  Wireless MultiMedia Keyboard
        0071  Wireless MultiMedia Keyboard (106/109)
@@ -1816,6 +1850,7 @@
        00f9  Wireless Desktop Receiver 3.1
        0202  Xbox Controller
        0280  XBox Device
+       0283  Xbox Communicator
        0284  Xbox DVD Playback Kit
        0285  Xbox Controller S
        0288  Xbox Controller S Hub
@@ -1825,12 +1860,13 @@
        028e  Xbox360 Controller
        028f  Xbox360 Wireless Controller
        0290  Xbox360 Performance Pipe (PIX)
+       0291  Xbox 360 Wireless Receiver for Windows
        0292  Xbox360 Wireless Networking Adapter
        029c  Xbox360 HD-DVD Drive
        029d  Xbox360 HD-DVD Drive
        029e  Xbox360 HD-DVD Memory Unit
        02a0  Xbox360 Big Button IR
-       02a8  Xbox360 Wireless N Networking Adapter [Atheros AR7010]
+       02a8  Xbox360 Wireless N Networking Adapter [Atheros AR7010+AR9280]
        02ad  Xbox NUI Audio
        02ae  Xbox NUI Camera
        02b0  Xbox NUI Motor
@@ -1970,12 +2006,15 @@
        0710  Zune Media Player
        0713  Wireless Presenter Mouse 8000
        0719  Xbox 360 Wireless Adapter
+       071f  Mouse/Keyboard 2.4GHz Transceiver V2.0
        0721  LifeCam NX-3000 (UVC-compliant)
        0723  LifeCam VX-7000 (UVC-compliant)
        0734  Wireless Optical Desktop 700
+       0737  Compact Optical Mouse 500
        0745  Nano Transceiver v1.0 for Bluetooth
        0750  Wired Keyboard 600
        075d  LifeCam Cinema
+       0768  Sidewinder X4
        076d  LifeCam HD-5000
        930a  ISOUSB.SYS Intel 82930 Isochronous IO Test Board
        fff8  Keyboard
@@ -2035,7 +2074,9 @@
        4d2b  Wireless Laser Mini Mouse (HID)
        4d2c  PoPo Mini Pointer Mouse (HID)
        4d2e  Optical Mobile Mouse (HID)
-       4d51  0Y357C MOCZUL [Dell Laser Mouse Kit]
+       4d51  0Y357C PMX-MMOCZUL (B) [Dell Laser Mouse]
+       4d75  Rocketfish RF-FLBTAD Bluetooth Adapter
+       4de7  webcam
 0463  MGE UPS Systems
        0001  UPS
        ffff  UPS
@@ -2056,6 +2097,9 @@
        002a  Wireless Mouse & Keyboard
        002d  SmartTerminal XX44
        003e  SmartTerminal ST-2xxx
+       0080  eHealth Terminal ST 1503
+       0081  eHealth Keyboard G87 1504
+       0106  R-300 Wireless Mouse Receiver
 046b  American Megatrends, Inc.
        0001  Keyboard
        0101  PS/2 Keyboard, Mouse & Joystick Ports
@@ -2084,6 +2128,7 @@
        0819  Webcam C210
        081b  Webcam C310
        0820  QuickCam VC
+       0821  HD Webcam C910
        0825  Webcam C270
        0830  QuickClip
        0840  QuickCam Express
@@ -2181,6 +2226,7 @@
        0a02  Premium Stereo USB Headset 350
        0a03  Logitech USB Microphone
        0a04  V20 portable speakers (USB powered)
+       0a07  Z-10 Speakers
        0a0b  ClearChat Pro USB
        0a0c  Clear Chat Comfort USB Headset
        0a13  Z-5 Speakers
@@ -2225,7 +2271,7 @@
        c038  Mouse
        c03d  M-BT96a Pilot Optical Mouse
        c03e  Premium Optical Wheel Mouse (M-BT58)
-       c03f  UltraX Optical Mouse
+       c03f  M-BT85 [UltraX Optical Mouse]
        c040  Corded Tilt-Wheel Mouse
        c041  G5 Laser Mouse
        c042  G3 Laser Mouse
@@ -2241,10 +2287,14 @@
        c053  Laser Mouse
        c058  M115 Mouse
        c05a  Optical Mouse M90
+       c05d  Optical Mouse
        c061  RX1500 Laser Mouse
+       c062  LS1 Laser Mouse, corded
+       c063  DELL Laser Mouse
        c068  G500 Laser Mouse
        c101  UltraX Media Remote
-       c110  Harmony Remote 885
+       c110  Harmony 885 Remote
+       c11f  Harmony 900 Remote
        c122  Harmony 700 Remote
        c201  WingMan Extreme Joystick with Throttle
        c202  WingMan Formula
@@ -2274,6 +2324,8 @@
        c225  G11/G15 Keyboard / G keys
        c226  G15 Refresh Keyboard
        c227  G15 Refresh Keyboard
+       c22d  G510 Gaming Keyboard
+       c22e  G510 Gaming Keyboard onboard audio
        c281  WingMan Force
        c283  WingMan Force 3D
        c285  WingMan Strike Force 3D
@@ -2285,6 +2337,8 @@
        c295  Momo Force Steering Wheel
        c298  Driving Force Pro
        c299  G25 Racing Wheel
+       c29b  G27 Racing Wheel
+       c29c  Speed Force Wireless Wheel for Wii
        c2a0  Wingman Force Feedback Mouse
        c2a1  WingMan Force Feedback Mouse
        c301  iTouch Keyboard
@@ -2302,10 +2356,12 @@
        c30f  Logicool HID-Compliant Keyboard (106 key)
        c311  Y-UF49 [Internet Pro Keyboard]
        c312  DeLuxe 250 Keyboard
+       c313  Internet 350 Keyboard
        c315  Classic New Touch Keyboard
        c316  HID-Compliant Keyboard
        c317  Wave Corded Keyboard
        c318  Illuminated Keyboard
+       c31a  Comfort Wave 450
        c31b  Compact Keyboard K300
        c31c  Keyboard K120 for Business
        c401  TrackMan Marble Wheel
@@ -2330,6 +2386,7 @@
        c512  LX-700 Cordless Desktop Receiver
        c513  MX3000 Cordless Desktop Receiver
        c514  Cordless Mouse
+       c515  Cordless 2.4 GHz Presenter Presentation remote control
        c517  LX710 Cordless Desktop Laser
        c518  MX610 Laser Cordless Mouse
        c51a  MX Revolution/G7 Cordless Mouse
@@ -2448,6 +2505,7 @@
        0815  eHome Infrared Receiver
        0844  SA2111/02 1GB Flash Audio Player
        084a  GoGear SA3125
+       084e  GoGear SA60xx (mtp)
        0888  Hantek DDS-3005 Arbitrary Waveform Generator
        1103  Digital Speaker System
        1120  Creative Rhomba MP3 player
@@ -2466,6 +2524,7 @@
        2021  SDE3273FC/97 2.5" SATA HDD Enclosure [INIC-1608L]
        2022  GoGear SA52XX
        2034  Webcam SPC530NC
+       2036  Webcam SPC1030NC
        203f  TSU9200 Remote Control
        2046  TSU9800 Remote Control
        204e  GoGear RaGa (SA1942/02)
@@ -2478,7 +2537,7 @@
        485d  Senselock SenseIV v2.x
        df55  LPCXpresso LPC-Link
 0472  Chicony Electronics Co., Ltd
-       0065  PFU-65 Keyboard
+       0065  PFU-65 Keyboard [Chicony]
        b086  Asus USB2.0 Webcam
        b091  Webcam
 0473  Sanyo Information Business Co., Ltd
@@ -2645,9 +2704,13 @@
 0489  Foxconn / Hon Hai
        0502  SmartMedia Card Reader Firmware Loader
        0503  SmartMedia Card Reader
+       d00c  Rollei Compactline (Storage Mode)
+       d00e  Rollei Compactline (Video Mode)
        e000  T-Com TC 300
        e003  Pirelli DP-L10
-       e016  Foxconn / Hon Hai
+       e00f  Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter]
+       e016  Ubee PXU1900 WiMAX Adapter [Beceem BCSM250]
+       e02c  Atheros AR5BBU12 Bluetooth Device
 048a  S-MOS Systems, Inc.
 048c  Alps Electric Ireland, Ltd
 048d  Integrated Technology Express, Inc.
@@ -3019,10 +3082,12 @@
        172b  MP140 ser
        173e  MP560
        173f  Pixma MP640 Multifunction device
+       1748  Pixma MG5150
        1900  CanoScan LiDE 90
        1901  CanoScan 8800F
        1904  CanoScan LiDE 100
        1905  CanoScan LiDE 200
+       1906  CanoScan 5600F
        1907  CanoScan LiDE 700F
        1909  CanoScan LiDE 110
        190a  CanoScan LiDE 210
@@ -3382,6 +3447,7 @@
        0102  Keyboard with APM
        0130  MyIRC Remote Receiver
        0306  Telephone Receiver
+       0407  Optical Skype Mouse
        0bad  MetaGeek Wi-Spy
        1002  CY7C63001 R100 FM Radio
        1006  Human Interface Device
@@ -3409,6 +3475,7 @@
        de61  Barcode Reader
        de64  Barcode Reader
        f000  CY30700 Licorice evaluation board
+       f111  CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit
        f115  PSoC FirstTouch Programmer
 04b5  ROHM LSI Systems USA, LLC
 04b6  Hint Corp.
@@ -3447,17 +3514,20 @@
        011e  Perfection 1660 Photo
        011f  Perfection 1670
        0120  Perfection 1270 scanner
-       0121  Perfection 2480 Photo
+       0121  Perfection 2480/2580 Photo [GT-F500]
        0122  Perfection 3590 scanner
        0126  GT-15000 (ES-7000)
        0128  Perfection 4870 (GT-X700)
        0129  Expression 10000XL (ES-10000G)
        012a  Perfection 4990 Photo scanner
        012b  GT-2500 (ES-H300)
-       012c  Perfection V350 (GT-F700)
+       012c  Perfection V700 Photo (GT-X900)
        012d  Perfection V10/V100 (GT-S600/F650)
        012f  Perfection V350 (GT-F700)
        0130  Perfection V500 (GT-X770)
+       0131  Perfection V300
+       0136  GT-S80 (ES-D400)
+       0137  GT-S50 (ES-D200)
        0202  Receipt Printer M129C
        0401  CP 800 Digital Camera
        0402  PhotoPC 850z
@@ -3529,6 +3599,9 @@
        083f  Stylus DX4450
        0849  Stylus SX205
        084d  Stylus SX115
+       0851  Stylus SX410
+       0856  Stylus SX515W
+       085c  Stylus SX125
 04b9  Rainbow Technologies, Inc.
        0300  SafeNet USB SuperPro/UltraPro
        1000  iKey 1000 Token
@@ -3740,6 +3813,8 @@
        1520  USB 2.0 Hub (Avocent KVM)
        1521  USB 2.0 Hub
        1a62  GW Instek GSP-830 Spectrum Analyzer (HID)
+       2323  Ux500 serial debug port
+       2533  NFC device (PN533)
        8116  Camera
 04cd  Tatung Co. Of America
 04ce  ScanLogic Corp.
@@ -3779,12 +3854,17 @@
        000b  PIC18F2550 (32K Flashable 10 Channel, 10 Bit A/D USB Microcontroller)
        0032  PICkit1
        0033  PICkit2
+       0036  PICkit Serial Analyzer
        00e0  PIC32 Starter Board
+       0a04  AGP LIN Serial Analyzer
        8000  In-Circuit Debugger
        8001  ICD2 in-circuit debugger
+       8101  PIC24F Starter Kit
+       900a  PICkit3
        c001  PicoLCD 20x4
        fbba  DiscFerret Magnetic Disc Analyser (bootloader mode)
        fbbb  DiscFerret Magnetic Disc Analyser (active mode)
+       ffef  PICoPLC [APStech]
 04d9  Holtek Semiconductor, Inc.
        0022  Portable Keyboard
        048e  Optical Mouse
@@ -3792,6 +3872,8 @@
        1203  Keyboard
        1400  PS/2 keyboard + mouse controller
        1503  Shortboard Lefty
+       1603  Keyboard
+       2221  Keyboard
 04da  Panasonic (Matsushita)
        0901  LS-120 Camera
        0912  SDR-S10
@@ -3820,6 +3902,8 @@
        2497  HDC-TM700
        250c  Gobi Wireless Modem (QDL mode)
        250d  Gobi Wireless Modem
+       3904  N5HBZ0000055 802.11abgn Wireless Adapter [Atheros AR7010]
+       3c04  JT-P100MR-20 [ePassport Reader]
 04db  Hypertec Pty, Ltd
 04dc  Huan Hsin Holdings, Ltd
 04dd  Sharp Corp.
@@ -3848,6 +3932,7 @@
        601b  AL-1217
        601c  AL-1226
        601d  AR-123E
+       6021  IS01
        7002  DVC Ver.1.0
        7004  VE-CG40U Digital Still Camera
        7005  VE-CG30 Digital Still Camera
@@ -4062,7 +4147,8 @@
        508c  YP-S5
        5090  YP-S3 (msc)
        5091  YP-S3 (mtp)
-       5092  YP-U4
+       5092  YP-U4 (msc)
+       5093  YP-U4 (mtp)
        5095  YP-S2
        510f  YP-R1
        5119  Yepp YP-P3
@@ -4118,11 +4204,12 @@
        6802  Standalone HSPA device
        6806  Composite LTE device (Trial)
        6807  Composite HSPA device
-       681c  Galaxy Portal/Spica Android Phone
+       681c  Galaxy Portal/Spica/S
        681d  Galaxy Portal/Spica Android Phone
        684e  Wave (GT-S8500)
        6875  GT-B3710 Standalone LTE device (Commercial)
        6876  GT-B3710 LTE Modem
+       6877  Galaxy S
        6888  GT-B3730 Composite LTE device (Commercial)
        6889  GT-B3730 Composite LTE device (Commercial)
        689a  LTE Storage Driver [CMC2xx]
@@ -4160,7 +4247,7 @@
        0110  KU-2971 Keyboard
        0111  KU-9908 Keyboard
        0112  KU-8933 Keyboard with PS/2 Mouse port
-       0116  KU-2971 German Keyboard
+       0116  KU-2971/KU-0325 Keyboard
        0220  Wireless HID Receiver
        0402  Genius LuxeMate i200 Keyboard
        0403  KU-0420 keyboard
@@ -4206,6 +4293,7 @@
        b104  CNF7069 Webcam
        b107  CNF7070 Webcam
        b14c  CNF8050 Webcam
+       b175  4-Port Hub
        b1aa  Webcam-101
        b1b4  Lenovo Integrated Camera
        b1cf  Lenovo Integrated Camera
@@ -4213,6 +4301,7 @@
        0210  AM-400 Hama Optical Mouse
        0212  Laser Mouse
        0214  Lynx M9 Optical Mouse
+       0230  3D Optical Mouse
        02f4  2.4G Cordless Mouse
 04f4  Harting Elektronik, Inc.
 04f5  Fujitsu-ICL Systems, Inc.
@@ -4402,6 +4491,9 @@
        01e2  DCP-157C
        01e3  DCP-353C
        01e4  DCP-357C
+       01e7  MFC-7340
+       01e9  DCP-7040
+       01ea  DCP-7030
        01eb  MFC-7320
        01f4  MFC-5890CN
        1000  Printer
@@ -4411,6 +4503,7 @@
        2015  QL-500 P-touch label printer
        2016  QL-550 P-touch label printer
        201a  PT-18R P-touch label printer
+       2027  QL-560 P-Touch Label Printer
        2100  Card Reader Writer
 04fa  Dallas Semiconductor
        2490  DS1490F 2-in-1 Fob, 1-Wire adapter
@@ -4497,6 +4590,7 @@
        0012  F8T012 Bluetooth Adapter
        0013  F8T013 Bluetooth Adapter
        0017  B8T017 Bluetooth+EDR 2.1
+       003a  Universal Media Reader
        0050  F5D6050 802.11b Wireless Adapter v2000 [Atmel at76c503a]
        0081  F8T001v2 Bluetooth
        0083  Bluetooth Device
@@ -4522,16 +4616,20 @@
        0240  F5U240 USB 2.0 CF Card Reader
        0249  USB 2 Flash Media Device
        0257  F5U257 Serial
+       0304  FSU304 USB 2.0 - 4 Ports Hub
        0409  F5U409 Serial
        0551  F6C550-AVR UPS
+       0706  2-N-1 USB 2.0 7-Port Hub (Lower half)
        0802  Nostromo n40 Gamepad
        0803  Nostromo 1745 GamePad
        0805  Nostromo N50 GamePad
        0815  Nostromo n52 HID SpeedPad Mouse Wheel
        0826  ErgoFit Wireless Optical Mouse (HID)
        0980  HID UPS Battery
+       1102  F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CE-VAU]
        1202  F5U120-PC Parallel Printer Port
        1203  F5U120-PC Serial Port
+       2103  F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU]
        258a  F5U258 Host to Host cable
        3101  F1DF102U/F1DG102U Flip Hub
        3201  F1DF102U/F1DG102U Flip KVM
@@ -4540,10 +4638,11 @@
        6051  F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201]
        7050  F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887]
        7051  F5D7051 802.11g Adapter v1000 [Broadcom 4320 USB]
-       705a  F5D7050 Wireless G Adapter v3000 [Ralink RT2573]
+       705a  F5D7050 Wireless G Adapter v3000 [Ralink RT2571W]
        705b  Wireless G Adapter
        705c  F5D7050 Wireless G Adapter v4000 [Zydas ZD1211B]
        705e  F5D7050 Wireless G Adapter v5000 [Realtek RTL8187B]
+       706a  2-N-1 USB 2.0 7-Port Hub (Lower half)
        8053  F5D8053 N Wireless USB Adapter v1000/v4000 [Ralink RT2870]
        805c  F5D8053 N Wireless Adapter v3000 [Ralink RT2870]
        805e  F5D8053 N Wireless USB Adapter v5000 [Realtek RTL8192U]
@@ -4551,11 +4650,12 @@
        815f  F5D8053 N Wireless USB Adapter v6000 [Realtek RTL8192SU]
        825a  F5D8055 N+ Wireless Adapter v1000 [Ralink RT2870]
        825b  F5D8055 N+ Wireless Adapter v2000 [Ralink RT3070]
-       845a  F7D2101deSH [rtl8192su]
+       845a  F7D2101 802.11n Surf & Share Wireless Adapter v1000 [Realtek RTL8192SU]
        905b  F5D9050 Wireless G+ MIMO Network Adapter v3000 [Ralink RT2573]
        905c  F5D9050 Wireless G+ MIMO Network Adapter v4000 [Ralink RT2573]
        935a  F6D4050 N150 Enhanced Wireless Network Adapter v1000 [Ralink RT2870]
        935b  F6D4050 N150 Enhanced Wireless Network Adapter v2000 [Ralink RT3070]
+       945a  F7D1101 Basic Wireless USB Adapter v1000 [Realtek RTL8188SU]
 050e  Neon Technology, Inc.
 050f  KC Technology, Inc.
        0001  Hub
@@ -4577,6 +4677,7 @@
        0001  USB to PS2 Adaptor v1.09
        0002  EZ-9900C Keyboard
 0519  Star Micronics Co., Ltd
+       0003  TSP100ECO/TSP100II
        c002  Xlive Bluetooth XBM-100S MP3 Player
 051a  WYSE Technology
        a005  Smart Display Version 9973
@@ -4896,9 +4997,10 @@
        02f9  DSC-H9
        0317  WALKMAN
        031a  Walkman NWD-B103F
-       031e  PRS-505 reader
+       031e  PRS-300/PRS-505 eBook reader
        033e  DSC-W120
        0346  Handycam DCR-SR55E
+       0348  HandyCam HDR-TG3E
        0382  Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1)
        03bc  Webbie HD - MHS-CM1
        03d3  DR-BT100CX
@@ -5004,6 +5106,7 @@
        0401  P 3600 A3 Pro
        0408  BearPaw 2448 CU Pro
        0409  BearPaw 2448 TA Pro
+       040b  ScanExpress A3 USB 1200 PRO
        0873  ScanExpress 600 USB
        1000  BearPaw 4800 TA Pro
        a350  gSmart 350 Camera
@@ -5034,7 +5137,7 @@
        0001  Enhanced Microphone
        0002  Telex Microphone
 0563  Immersion Corp.
-0564  Chinon Industries, Inc.
+0564  Kodak Digital Product Center, Japan Ltd. (formerly Chinon Industries Inc.)
 0565  Peracom Networks, Inc.
        0001  Serial Port [etek]
        0002  Enet Ethernet [klsi]
@@ -5122,6 +5225,7 @@
        00c7  DTU-1931
        00d1  Bamboo Pen & Touch (CTH-460-DE)
        00d3  Bamboo Fun (CTH-661)
+       00db  Bamboo Fun (CTH-661SE-NL)
        0400  PenPartner 4x5
        4850  PenPartner 6x8
 056b  Decicon, Inc.
@@ -5144,6 +5248,7 @@
        4010  LD-USB20
        5003  UC-SGT
        5004  UC-SGT
+       6008  Flash Disk
        abc1  LD-USB/TX
 056f  Korea Data Systems Co., Ltd
        cd00  CDM-751 CD organizer
@@ -5277,6 +5382,7 @@
        84ff  AVM Fritz!WLAN USB N (in CD-ROM-mode)
 057d  Shark Multimedia, Inc.
 057e  Nintendo Co., Ltd
+       0305  Broadcom BCM2045A Bluetooth Radio [Nintendo Wii]
        0306  Wii Remote Controller RVL-003
 057f  QuickShot, Ltd
        6238  USB StrikePad
@@ -5485,6 +5591,7 @@
        3417  NWD271N 802.11n Wireless Adapter [Atheros AR9001U-(2)NG]
        3418  NWD211AN 802.11abgn Wireless Adapter [Ralink RT2870]
        341a  NWD-270N Wireless N-lite USB Adapter
+       341f  NWD2205 802.11n Wireless N Adapter [Realtek RTL8192CU]
 0587  America Kotobuki Electronics Industries, Inc.
 0588  Sapien Design
 0589  Victron
@@ -5520,6 +5627,7 @@
        6232  Hi-Speed 16-in-1 Flash Card Reader/Writer
        6254  USB Hub
        6331  SD/MMC/MS Card Reader
+       6332  Multi-Function Card Reader
        6335  SD/MMC Card Reader
        6360  Multimedia Card Reader
        6361  Multimedia Card Reader
@@ -5553,7 +5661,7 @@
 0590  Omron Corp.
        0004  Cable Modem
        000b  MR56SVS
-       0028  HJ-720IT Pedometer
+       0028  HJ-720IT Pedometer / Blood Pressure Monitor HEM-7080IT-E
 0591  Questra Consulting
 0592  Powerware Corp.
        0002  UPS (X-Slot)
@@ -5586,7 +5694,7 @@
        0053  CDRW55292EXT CD-RW External Drive
        0057  Mass Storage Device
        005d  Mass Storage Device
-       005f  Mass Storage Device
+       005f  CDRW64892EXT3-C CD-RW 52x24x52x External Drive
        0060  PCMCIA PocketZip Dock
        0061  Varo PocketZip 40 MP3 Player
        006d  HipZip MP3 Player
@@ -5609,6 +5717,7 @@
        027a  LPHD250-U [Portable Hard Drive Silver Series 250 Go]
        0470  Prestige Portable Hard Drive
        047a  Select Portable Hard Drive
+       0579  eGo Portable Hard Drive
        1052  DVD+RW External Drive
 059c  A-Trend Technology Co., Ltd
 059d  Advanced Input Devices
@@ -5625,7 +5734,10 @@
        0641  Mobile Hard Drive
        1010  Desktop Hard Drive
        1019  Desktop Hard Drive
+       1021  Little Disk
+       1027  iamaKey V2
        102a  Rikiki Hard Drive
+       1049  rikiki Harddrive
        a601  HardDrive
        a602  CD R/W
 05a0  Vetronix Corp.
@@ -5748,6 +5860,7 @@
        1223  iPod Classic/Nano 3.Gen (DFU mode)
        1224  iPod Nano 3.Gen (DFU mode)
        1225  iPod Nano 4.Gen (DFU mode)
+       1227  Mobile Device (DFU Mode)
        1231  iPod Nano 5.Gen (DFU mode)
        1240  iPod Nano 2.Gen (DFU mode)
        1242  iPod Nano 3.Gen (WTF mode)
@@ -5761,6 +5874,7 @@
        1263  iPod Nano 4.Gen
        1265  iPod Nano 5.Gen
        1266  iPod Nano 6.Gen
+       1281  Apple Mobile Device [Recovery Mode]
        1290  iPhone
        1291  iPod Touch 1.Gen
        1292  iPhone 3G
@@ -5771,9 +5885,11 @@
        1299  iPod Touch 3.Gen
        129a  iPad
        129e  iPod Touch 4.Gen
+       129f  iPad 2
        1300  iPod Shuffle
        1301  iPod Shuffle 2.Gen
        1302  iPod Shuffle 3.Gen
+       1303  iPod Shuffle 4.Gen
        1401  Modem
        8202  HCF V.90 Data/Fax Modem
        8203  Bluetooth HCI
@@ -5794,7 +5910,9 @@
        8502  Built-in iSight
        8505  Built-in iSight
        8507  Built-in iSight
+       911c  Hub in A1082 [Cinema HD Display 23"]
        912f  Hub in 30" Cinema Display
+       921c  A1082 [Cinema HD Display 23"]
        9221  30" Cinema Display
        ffff  Bluetooth in DFU mode - Driver
 05ad  Y.C. Cable U.S.A., Inc.
@@ -5875,6 +5993,7 @@
        6001  Ten-Keypad
 05c8  Cheng Uei Precision Industry Co., Ltd (Foxlink)
        0103  FO13FF-65 PC-CAM
+       0403  Webcam
 05c9  Semtech Corp.
 05ca  Ricoh Co., Ltd
        0101  RDC-5300 Camera
@@ -5904,6 +6023,7 @@
        1841  Fujitsu F01/ Lifebook U810 [R5U870]
        1870  Webcam 1000
        18b0  Sony Vaio Integrated Webcam
+       18b1  Sony Vaio Integrated Webcam
        18b3  Sony Vaio Integrated Webcam
        2201  RDC-7 Camera
        2202  Caplio RR30
@@ -6136,6 +6256,7 @@
        a531  JumpDrive Secure II
        a560  JumpDrive FireFly
        a701  JumpDrive FireFly
+       a731  JumpDrive FireFly
        a790  JumpDrive 2GB
        b002  USB CF Reader
        b018  Multi-Card Reader
@@ -6304,6 +6425,7 @@
 060a  Worthington Data Solutions, Inc.
 060b  Solid Year
        0001  MacAlly Keyboard
+       0230  KSK-8003 UX Keyboard
        1006  Japanese Keyboard - 260U
        2101  Keyboard
        2231  KSK-6001 UELX Keyboard
@@ -6332,6 +6454,8 @@
        0103  SLP-100N Driver
        0104  SLP-200N Driver
        0105  SLP-240 Driver
+       0501  SLP-440 Driver
+       0502  SLP-450 Driver
 061a  Veridicom International, Inc.
        0110  5thSense Fingerprint Sensor
        0200  FPS200 Fingerprint Sensor
@@ -6441,6 +6565,8 @@
        f103  Lenovo Integrated Webcam [R5U877]
 064f  WIBU-Systems AG
        03e9  Propellerhead Record Ignition Key
+       03f2  CmStick/M (article no. 1010)
+       03f3  CmStick/M (article no. 1011)
        0bd7  BOX/U
        0bd8  BOX/RU
 0650  Dynapro Systems
@@ -6467,15 +6593,15 @@
 0662  Kansai Electric Co., Ltd
 0663  Topmax Electronic Co., Ltd
        0103  CobraPad
-0664  Groovy Technology Corp.
-       0301  GTouch Touch Screen
-       0302  GTouch Touch Screen
-       0303  GTouch Touch Screen
-       0304  GTouch Touch Screen
-       0305  GTouch Touch Screen
-       0306  GTouch Touch Screen
-       0307  GTouch Touch Screen
-       0309  GTouch Touch Screen
+0664  ET&T Technology Co., Ltd.
+       0301  Groovy Technology Corp. GTouch Touch Screen
+       0302  Groovy Technology Corp. GTouch Touch Screen
+       0303  Groovy Technology Corp. GTouch Touch Screen
+       0304  Groovy Technology Corp. GTouch Touch Screen
+       0305  Groovy Technology Corp. GTouch Touch Screen
+       0306  Groovy Technology Corp. GTouch Touch Screen
+       0307  Groovy Technology Corp. GTouch Touch Screen
+       0309  Groovy Technology Corp. GTouch Touch Screen
 0665  Cypress Semiconductor
        5161  USB to Serial
 0667  Aiwa Co., Ltd
@@ -6629,11 +6755,13 @@
 067b  Prolific Technology, Inc.
        0000  PL2301 USB-USB Bridge
        0001  PL2302 USB-USB Bridge
+       0307  Motorola Serial Adapter
        04bb  PL2303 Serial (IODATA USB-RSAQ2)
        0610  Onext EG210U MODEM
        0611  AlDiga AL-11U Quad-band GSM/GPRS/EDGE modem
        2303  PL2303 Serial Port
        2305  PL2305 Parallel Port
+       2306  Raylink Bridge Controller
        2307  PL2307 USB-ATAPI4 Bridge
        2313  FITEL PHS U Cable Adaptor
        2315  Flash Disk Embedded Hub
@@ -6729,7 +6857,8 @@
        4016  Dimage XT Camera [remote mode]
        4017  Dimage E223
        4018  Dimage Z1  Camera
-       401a  Dimage A1 Camera
+       4019  Dimage A1 Camera [remote mode]
+       401a  Dimage A1 Camera [storage]
        401c  Dimage X20 Camera
        401e  Dimage E323 Camera
 068a  Pertech, Inc.
@@ -6778,11 +6907,13 @@
        4501  Scientific-Atlanta WebSTAR 2000 series Cable Modem
 069b  Thomson, Inc.
        0704  DCM245 Cable Modem
+       0705  THG540K Cable Modem
        070c  MP3 Player
        070d  MP3 Player
        070e  MP3 Player
        070f  RCA Lyra RD1071 MP3 Player
        0731  Lyra M200E256
+       0761  RCA H100A
        0778  PEARL USB Device
        2220  RCA Kazoo RD1000 MP3 Player
        300a  RCA Lyra MP3 Player
@@ -6792,8 +6923,8 @@
 069d  Hughes Network Systems (HNS)
        0001  Satellite Receiver Device
        0002  Satellite Device
-069e  Marx
-       0005  CryptoBox v1.2
+069e  Welcat Inc.
+       0005  Marx CryptoBox v1.2
 069f  Allied Data Technologies BV
        0010  Tornado Speakerphone FaxModem 56.0
        0011  Tornado Speakerphone FaxModem 56.0
@@ -6999,8 +7130,8 @@
        011e  MPR Serial (MPRQ)
        0121  USA-19hs serial adapter
        012a  USA-49Wlc serial adapter
-       0201  Digital Media Remote
-       0202  UIA-11 remote control
+       0201  UIA-10 Digital Media Remote [Cypress AN2131SC]
+       0202  UIA-11 Digital Media Remote
 06cf  SpheronVR AG
        1010  PanoCam 10
        1012  PanoCam 12/12X
@@ -7040,6 +7171,7 @@
 06d8  Technical Marketing Research, Inc.
 06da  Phoenixtec Power Co., Ltd
        0002  UPS
+       0003  1300VA UPS
 06db  Paradyne
 06dc  Foxlink Image Technology Co., Ltd
        0012  Scan 1200c Scanner
@@ -7178,8 +7310,9 @@
        e000  HWGUSB2-54 WLAN
        e010  HWGUSB2-54-LB
        e020  HWGUSB2-54V2-AP
-       e031  Hercules HWNUm-300 Wireless N mini [Realtek RTL8191S]
+       e031  Hercules HWNUm-300 Wireless N mini [Realtek RTL8191SU]
        e032  HWGUm-54 [Hercules Wireless G Ultra Mini Key]
+       e033  Hercules HWNUp-150 802.11n Wireless N Pico [Realtek RTL8188CUS]
 06f9  ASYST electronic d.o.o.
 06fa  HSD S.r.L
 06fc  Motorola Semiconductor Products Sector
@@ -7510,8 +7643,9 @@
        5406  Cruzer Micro U3
        5408  Cruzer Titanium U3
        540e  Cruzer Contour Flash Drive
-       5530  Cruzer U3 4gb SDCZ36
-       5567  Cruszer Blade
+       5530  Cruzer
+       5567  Cruzer Blade
+       5e10  Encrypted
        6100  Ultra II SD Plus 2GB
        7100  Cruzer Mini
        7101  Pen Flash
@@ -7683,7 +7817,9 @@
        fc02  Cable II USB-2
        fc03  USB2-IDE IDE bridge
        fcd6  Freecom HD Classic
+       fcf6  DataBar 512 MB
        fcf8  Freecom Classic SL Network Drive
+       fcfe  Hard Drive 80GB
 07af  Microtech
        0004  SCSI-DB25 SCSI Bridge [shuttle]
        0005  SCSI-HD50 SCSI Bridge [shuttle]
@@ -7734,6 +7870,7 @@
        0410  Scanner
        0412  Scanner
        0413  OpticSlim 1200 Scanner
+       0601  OpticPro ST24 Scanner
        0800  OpticPro ST48 Scanner
        0906  OpticBook 3600 Scanner
        0a06  TVcam VD100
@@ -7789,7 +7926,7 @@
        420a  UF200 Ethernet
        5301  GW-US54ZGL 802.11bg
        6001  802.11bg
-       a001  Wireless Network Adapter
+       a001  WUG2200 802.11g Wireless Adapter [Envara WiND512]
        abc1  DU-E10 Ethernet [pegasus]
        b000  BWU613
        b02a  AboCom Bluetooth Device
@@ -7872,6 +8009,7 @@
 07ca  AVerMedia Technologies, Inc.
        0002  AVerTV PVR USB/EZMaker Pro Device
        0026  AVerTV
+       0337  A867 DVB-T dongle
        1228  MPEG-2 Capture Device (M038)
        1830  AVerTV Volar Video Capture (H830)
        850a  AverTV Volar Black HD (A850)
@@ -7992,9 +8130,9 @@
        3300  DWA-130 802.11n Wireless N Adapter(rev.E) [Realtek RTL8192SU]
        3302  DWA-130 802.11n Wireless N Adapter(rev.C2) [Realtek RTL8192SU]
        3303  DWA-131 802.11n Wireless N Nano Adapter(rev.A1) [Realtek RTL8192SU]
-       3a07  WUA-2340 Adapter
-       3a08  predator Bootloader Download
-       3a09  DWA-160 Xtreme N Dual Band USB Adapter(rev.A2) [Atheros AR9001U-(2)NG]
+       3a07  WUA-2340 RangeBooster G Adapter(rev.A) [Atheros AR5523]
+       3a08  WUA-2340 RangeBooster G Adapter(rev.A) (no firmware) [Atheros AR5523]
+       3a09  DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.A2) [Atheros AR9170+AR9104]
        3a0d  DWA-120 802.11g Wireless 108G Adapter [Atheros AR5523]
        3a0f  DWA-130 802.11n Wireless N Adapter(rev.D) [Atheros AR9001U-(2)NG]
        3a10  DWA-126 802.11n Wireless Adapter [Atheros AR9271]
@@ -8008,14 +8146,14 @@
        3c09  DWA-140 RangeBooster N Adapter(rev.B1) [Ralink RT2870]
        3c0a  DWA-140 RangeBooster N Adapter(rev.B2) [Ralink RT2870]
        3c0b  DWA-110 Wireless G USB Adapter(rev.B)
-       3c0d  DWA-125 Wireless N 150 Adapter(rev.A1) [Ralink RT2870]
-       3c0e  WUA-2340 USB Adapter(rev.B)
+       3c0d  DWA-125 Wireless N 150 Adapter(rev.A1) [Ralink RT3070]
+       3c0e  WUA-2340 RangeBooster G Adapter(rev.B) [Ralink RT2070]
        3c0f  AirPlus G DWL-G122 Wireless Adapter(rev.E) [Ralink RT2870]
-       3c10  DWA-160 Xtreme N Dual Band USB Adapter(rev.A) [Atheros AR9001U-(2)NG]
+       3c10  DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.A1) [Atheros AR9170+AR9104]
        3c11  DWA-160 Xtreme N Dual Band USB Adapter(rev.B) [Ralink RT2870]
        3c13  DWA-130 802.11n Wireless N Adapter(rev.B) [Ralink RT2870]
        3c15  DWA-140 RangeBooster N Adapter(rev.B3) [Ralink RT2870]
-       3c16  DWA-125 Wireless N 150 Adapter(rev.A2) [Ralink RT2870]
+       3c16  DWA-125 Wireless N 150 Adapter(rev.A2) [Ralink RT3070]
        3e02  DWM-156 3.75G HSUPA Adapter
        5100  Remote NDIS Device
        a800  DWM-152 3.75G HSUPA Adapter
@@ -8256,9 +8394,9 @@
        7100  WN121T RangeMax Next Wireless-N [Marvell TopDog]
        9000  WN111(v1) RangeMax Next Wireless [Marvell TopDog]
        9001  WN111(v2) RangeMax Next Wireless [Atheros AR9001U-(2)NG]
-       9010  WNDA3100(v1) 802.11n [Atheros AR9001U-(2)NG]
-       9011  WNDA3100(v2) 802.11n [Broadcom BCM4323]
-       9018  WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010]
+       9010  WNDA3100v1 802.11abgn [Atheros AR9170+AR9104]
+       9011  WNDA3100v2 802.11abgn [Broadcom BCM4323]
+       9018  WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]
        9020  WNA3100(v1) Wireless-N 300 [Broadcom BCM43231]
        9030  WNA1100 Wireless-N 150 [Atheros AR9271]
        9040  WNA1000 Wireless-N 150 [Atheros AR9001U-(2)NG]
@@ -8673,12 +8811,12 @@
        1200  MP3 player
        1540  Digitex Container Flash Disk
 090b  Neurosmith
-090c  Feiya Technology Corp.
+090c  Silicon Motion, Inc. - Taiwan (formerly Feiya Technology Corp.)
        0371  Silicon Motion SM371 Camera
        0373  Silicon Motion Camera
        037a  Silicon Motion Camera
        037b  Silicon Motion Camera
-       1000  Flash Drive
+       1000  64MB QDI U2 DISK
        1132  5-in-1 Card Reader
        337b  Silicon Motion Camera
        3710  Silicon Motion Camera
@@ -8740,6 +8878,7 @@
        2295  Colorado 300
        22b6  eTrex Vista HCx (Mass Storage mode)
        2353  Nüvi 205T
+       2535  Edge 800
 0920  Echelon Co.
        7500  Network Interface
 0921  GoHubs, Inc.
@@ -8797,6 +8936,7 @@
        0709  Pocket PC e750 Series
        070a  Pocket PC e400 Series
        070b  Pocket PC e800 Series
+       0a07  WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572]
        0b05  PX1220E-1G25 External hard drive
        0b09  PX1396E-3T01 External hard drive
        1300  Wireless Broadband (CDMA EV-DO) SM-Bus Minicard Status Port
@@ -8933,6 +9073,8 @@
        1603  DataTraveler 1GB/2GB Pen Drive
        1607  DataTraveler 100
        1613  DataTraveler DT101C Flash Drive
+       1616  Kingston DataTraveler Locker (4GB)
+       1624  DataTraveler G2
        1625  DataTraveler 101 II
        162a  DataTraveler 112 4GB Pen Drive
        1643  DataTraveler G3 4GB
@@ -9021,6 +9163,12 @@
        00c0  COMpact 2104 ISDN PBX
        00db  COMpact 4410/2206 ISDN ISDN
        00f1  COMfort System Telephones
+09c0  Genpix Electronics, LLC
+       0202  8PSK DVB-S tuner
+       0203  Skywalker-1 DVB-S tuner
+       0204  Skywalker-CW3K DVB-S tuner
+       0205  Skywalker-CW3K DVB-S tuner
+       0206  Skywalker-2 DVB-S tuner
 09c1  Arris Interactive LLC
        1337  TOUCHSTONE DEVICE
 09c2  Nisca Corp.
@@ -9052,6 +9200,7 @@
        022b  Wireless Mouse (Battery Free)
        024f  RF Receiver and G6-20D Wireless Optical Mouse
        032b  Wireless Mouse (Battery Free)
+       9090  XL-750BK Laser Mouse
 09db  Measurement Computing Corp.
        0075  MiniLab 1008
        0076  PMD-1024
@@ -9093,6 +9242,7 @@
 09f9  Bay Associates
 09fa  Mtek Vision
 09fb  Altera
+       6001  Blaster
 09ff  Gain Technology Corp.
 0a00  Liquid Audio
 0a01  ViA, Inc.
@@ -9165,6 +9315,7 @@
 0a2c  AK-Modul-Bus Computer GmbH
        0008  GPIO Ports
 0a34  TG3 Electronics, Inc.
+       0101  TG82tp
        0110  Deck 82-key backlit keyboard
 0a35  Radikal Technologies
        002a  SAC - Software Assigned Controller
@@ -9180,6 +9331,7 @@
        0268  ST268
        6688  ZT6688 Fast Ethernet Adapter
        8515  ADMtek ADM8515 NIC
+       9000  DM9000E Fast Ethernet Adapter
        9601  DM9601 Fast Ethernet Adapter
 0a47  Hirose Electric
 0a48  I/O Interconnect
@@ -9201,6 +9353,7 @@
        5025  Mass Storage Device
 0a4b  Fujitsu Media Devices, Ltd
 0a4c  Computex Co., Ltd
+       15d9  OPTICAL MOUSE
 0a4d  Evolution Electronics, Ltd
        0064  MK-225 Driver
        0065  MK-225C Driver
@@ -9250,7 +9403,7 @@
        2000  Bluetooth Device
        2001  Bluetooth Device
        2009  Bluetooth Controller
-       200a  Bluetooth dongle
+       200a  BCM2035 Bluetooth dongle
        200f  Bluetooth Controller
        201d  Bluetooth Device
        201e  IBM Integrated Bluetooth IV
@@ -9275,6 +9428,7 @@
        2130  2045 Bluetooth 2.0 USB-UHE Device with trace filter
        2131  2045 Bluetooth 2.0 Device with trace filter
        2145  Bluetooth with Enhanced Data Rate II
+       2148  BCM92046DG-CL1ROM Bluetooth 2.1 Adapter
        2150  BCM2046 Bluetooth Device
        2151  Bluetooth
        217f  Bluetooth Controller
@@ -9295,6 +9449,7 @@
        5802  BCM5880 Secure Applications Processor with fingerprint touch sensor
        5803  BCM5880 Secure Applications Processor with secure keyboard
        6300  Pirelli Remote NDIS Device
+       bd13  Arcadyan WN8522B [Broadcom BCM4323]
        d11b  Eminent EM4045 [Broadcom 4320 USB]
 0a5d  Diatrend Corp.
 0a5f  Zebra
@@ -9310,6 +9465,7 @@
 0a69  Chroma ate, Inc.
 0a6b  Green House Co., Ltd
        0001  Compact Flash R/W with MP3 player
+       000f  FlashDisk
 0a6c  Integrated Circuit Systems, Inc.
 0a6d  UPS Manufacturing
 0a6e  Benwin
@@ -9360,6 +9516,7 @@
        0005  MyPen Light
        000d  Input Pen
        0010  C-Pen 20
+       0a93  PayPen
 0a94  Intersense
 0aa3  Lava Computer Mfg., Inc.
 0aa4  Develco Elektronik
@@ -9398,6 +9555,8 @@
        0501  Hub Printer Interface
        0502  Hub SNIKey Keyboard
        4304  Banking Printer TP07
+       4305  Banking Printer TP07c
+       4500  WN Central Special Electronics
 0aa8  TriGem Computer, Inc.
        0060  TG 11Mbps WLAN Mini Adapter
        1001  DreamComboM4100
@@ -9448,6 +9607,7 @@
        c002  Visual Communication Camera VGP-VCC1
        c302  Vega USB 2.0 Camera
        c303  Saturn USB 2.0 Camera
+       c326  Namuga 1.3M Webcam
        c33f  Webcam
 0ac9  Micro Solutions, Inc.
        0000  Backpack CD-ReWriter
@@ -9465,7 +9625,7 @@
        0630  ID TECH Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC
 0ace  ZyDAS
        1201  ZD1201 802.11b
-       1211  ZEW 2501 802.11bg Wireless Adapter
+       1211  ZD1211 802.11g
        1215  ZD1211B 802.11g
        1221  ZD1221 802.11n
        1602  ZyXEL Omni FaxModem 56K
@@ -9568,7 +9728,8 @@
        1774  Gobi Wireless Modem (QDL mode)
        1776  Gobi Wireless Modem
        1779  My Cinema U3100 Mini Plus [AF9035A]
-       1784  USB-N13 802.11n Network Adapter [Ralink RT2870]
+       1784  USB-N13 802.11n Network Adapter [Ralink RT3072]
+       1786  USB-N10 Wireless N dongle [Realtek RTL8712U]
        6101  Cable Modem
        620a  Remote NDIS Device
        b700  Broadcom Bluetooth 2.1
@@ -9587,6 +9748,7 @@
 0b10  Pcally
 0b11  I Tech Solutions Co., Ltd
 0b1e  Electronic Warfare Assoc., Inc. (EWA)
+       8007  Blackhawk USB560-BP JTAG Emulator
 0b1f  Insyde Software Corp.
 0b20  TransDimension, Inc.
 0b21  Yokogawa Electric Corp.
@@ -9602,6 +9764,7 @@
        0020  ShuttleXpress
 0b37  Hitachi ULSI Systems Co., Ltd
 0b38  Gear Head
+       0003  Keyboard
        0010  107-Key Keyboard
 0b39  Omnidirectional Control Technology, Inc.
        0001  Composite USB PS2 Converter
@@ -9927,22 +10090,28 @@
        0a9f  SmartPhone Sync
        0b03  Ozone Mobile Broadband
        0b04  Hermes / TyTN / T-Mobile MDA Vario II / O2 Xda Trion
+       0b05  P3600
        0b06  Athena / Advantage x7500 / Dopod U1000 / T-Mobile AMEO
        0b0c  Elf / Touch / P3450 / T-Mobile MDA Touch / O2 Xda Nova / Dopod S1
+       0b1f  Sony Ericsson XPERIA X1
        0b2f  Rhodium
        0b51  Qtek 8310 mobile phone [Tornado Noble]
        0bce  Vario MDA
        0c01  Dream / ADP1 / G1 / Magic / Tattoo
        0c02  Dream / ADP1 / G1 / Magic / Tattoo (Debug)
        0c13  Diamond
+       0c1f  Sony Ericsson XPERIA X1
        0c5f  Snap
-       0c87  Desire (Debug)
+       0c87  Desire (debug)
+       0c8d  EVO 4G (debug)
        0c91  Vision
        0c94  Vision
        0c97  Legend
-       0c99  Desire Phone (Debug)
+       0c99  Desire (debug)
        0c9e  Incredible
-       0ff9  Desire / Hero
+       0ca2  Desire HD (debug mode)
+       0ff9  Desire / Desire HD / Hero
+       0ffe  Desire HD (modem mode)
        0fff  Android Fastboot Bootloader
 0bb5  Murata Manufacturing Co., Ltd
 0bb6  Network Alchemy
@@ -9958,6 +10127,8 @@
 0bc2  Seagate RSS LLC
        2000  Storage Adapter V3 (TPP)
        2200  FreeAgent Go FW
+       5021  FreeAgent GoFlex USB 2.0
+       5031  FreeAgent GoFlex USB 3.0
 0bc3  IPWireless, Inc.
        0001  UMTS-TDD (TD-CDMA) modem
 0bc4  Microcube Corp.
@@ -9997,6 +10168,7 @@
        0116  Mass Storage Device
        0117  Mass Storage Device
        0118  Mass Storage Device
+       0138  Card reader
        0151  Mass Storage Device (Multicard Reader)
        0152  Mass Storage Device
        0153  Mass Storage Device
@@ -10015,7 +10187,7 @@
        8150  RTL8150 Fast Ethernet Adapter
        8151  RTL8151 Adapteon Business Mobile Networks BV
        8171  RTL8188SU 802.11n WLAN Adapter
-       8172  RTL8191S WLAN Adapter
+       8172  RTL8191SU 802.11n WLAN Adapter
        8176  RTL8188CUS 802.11n WLAN
        8187  RTL8187 Wireless Adapter
        8189  RTL8187B Wireless 802.11g 54Mbps Network Adapter
@@ -10061,6 +10233,11 @@
 0bf8  Fujitsu Siemens Computers
        1001  Fujitsu Pocket Loox 600 PDA
        1006  SmartCard Reader 2A
+       1007  Connect2Air E-5400 802.11g Wireless Adapter
+       1009  Name: Connect2Air E-5400 D1700 802.11g Wireless Adapter [Intersil ISL3887]
+       100f  miniCard D2301 802.11bg Wireless Module [SiS 163U]
+0bfd  Kvaser AB
+       000e  Leaf SemiPro HS
 0c04  MOTO Development Group, Inc.
 0c05  Appian Graphics
 0c06  Hasbro Games, Inc.
@@ -10274,7 +10451,10 @@
        63e0  Sonix Integrated Webcam
        63f1  Integrated Webcam
        63f8  Sonix Integrated Webcam
+       6409  Webcam
        6417  Integrated Webcam
+       641d  1.3 MPixel Integrated Webcam
+       6480  Sonix 1.3 MP Laptop Integrated Webcam
        8000  DC31VC
        8006  Dual Mode Camera (8006 VGA)
        800a  Vivitar Vivicam3350B
@@ -10307,6 +10487,8 @@
 0c67  Concept Telecom, Ltd
 0c70  MCT Elektronikladen
        0000  USB08 Development board
+0c72  PEAK System
+       000c  PCAN-USB
 0c74  Optronic Laboratories Inc.
        0002  OL 700-30 Goniometer
 0c76  JMTek, LLC.
@@ -10427,6 +10609,7 @@
        0086  Cinergy Hybrid XE
        0097  Cinergy T RC MKII
        00a5  Cinergy Hybrid Stick
+       00a9  RTL2838 DVB-T COFDM Demodulator [TerraTec Cinergy T Stick Black]
 0cd4  Bang Olufsen
        0101  BeolinkPC2
 0cd5  LabJack Corporation
@@ -10476,14 +10659,16 @@
        0005  AR5523
        0006  AR5523 (no firmware)
        1001  Thomson TG121N [Atheros AR9001U-(2)NG]
-       1002  TP-Link TL-WN821N v2 [Atheros AR9001U-(2)NG]
+       1002  TP-Link TL-WN821N v2 802.11n [Atheros AR9170]
        1006  TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271]
        1010  3Com 3CRUSBN275 802.11abgn Wireless Adapter [Atheros AR9170]
+       20ff  Virtual CD-ROM
        3000  AR3011
+       7015  TP-Link TL-WN821N v3 802.11n [Atheros AR7010+AR9287]
        9170  AR9170 802.11n
        9271  AR9271 802.11n
        b002  Ubiquiti WiFiStation 802.11n [Atheros AR9271]
-       b003  AR9271 802.11n
+       b003  Ubiquiti WiFiStationEXT 802.11n [Atheros AR9271]
 0cf4  Fomtex Corp.
 0cf5  Cellink Co., Ltd
 0cf6  Compucable Corp.
@@ -10528,6 +10713,8 @@
 0d17  NALTEC, Inc.
 0d18  coaXmedia
 0d19  Hank Connection Industrial Co., Ltd
+0d28  NXP
+       0204  LPC1768
 0d32  Leo Hui Electric Wire & Cable Co., Ltd
 0d33  AirSpeak, Inc.
 0d34  Rearden Steel Technologies
@@ -10551,6 +10738,7 @@
        3000  Drive
        3010  3000LE Drive
        3100  Hi-Speed USB-IDE Bridge Controller
+       3200  Personal Storage 3200
        5000  5000XT Drive
        5010  5000LE Drive
        5020  Mobile Hard Disk Drive
@@ -10591,6 +10779,8 @@
        0800  Magic Wheel
        2021  AM805 Keyboard
        2026  TECOM Bluetooth Device
+       2050  Mouse
+       2106  Dell L20U Multimedia Keyboard
        a100  Optical Mouse
 0d63  Fritz Gegauf AG
 0d64  DXG Technology Corp.
@@ -10765,6 +10955,7 @@
 0db0  Micro Star International
        1020  PC2PC WLAN Card
        1967  Bluetooth Dongle
+       3801  Motorola Bluetooth 2.1+EDR Device
        4011  Medion Flash XL V2.0 Card Reader
        4600  802.11b/g Turbo Wireless Adapter
        5501  Mass Storage Device
@@ -10803,14 +10994,14 @@
 0dbc  A&D Medical
        0003  AND Serial Cable [AND Smart Cable]
 0dbe  Jiuh Shiuh Precision Industry Co., Ltd
-0dbf  Quik Tech Solutions
+0dbf  Jess-Link International
        0002  SmartDongle Security Key
        0200  HDD Storage Solution
        021b  USB-2.0 IDE Adapter
        0300  Storage Adapter
        0333  Storage Adapter
        0707  ZIV Drive
-0dc0  Great Notions
+0dc0  G7 Solutions (formerly Great Notions)
 0dc1  Tamagawa Seiki Co., Ltd
 0dc3  Athena Smartcard Solutions, Inc.
        0801  ASEDrive III
@@ -10904,15 +11095,15 @@
        003d  WL-324 Wireless USB Adapter 300N
        003e  WL-343 Wireless USB Adapter 150N X1
        003f  WL-608 Wireless USB Adapter 54g
-       0040  WL-344 Wireless USB Adapter 300N X2
+       0040  WL-344 Wireless Adapter 300N X2 [Ralink RT3071]
        0041  WL-329 Wireless Dualband USB adapter 300N
        0042  WL-345 Wireless USB adapter 300N X3
        0045  WL-353 Wireless USB Adapter 150N Nano
        0047  WL-352v1 Wireless USB Adapter 300N 002
-       0048  WL-349v1 Wireless USB Adapter 150N 002
+       0048  WL-349v1 Wireless Adapter 150N 002 [Ralink RT3070]
        004a  WL-358v1 Wireless Micro USB Adapter 300N X3 002
        004b  WL-349v3 Wireless Micro Adapter 150N X1 [Realtek RTL8192SU]
-       004c  WL-352 802.11n Adapter [realtek rtl8191s]
+       004c  WL-352 802.11n Adapter [Realtek RTL8191SU]
        0050  WL-349v4 Wireless Micro Adapter 150N X1 [Ralink RT3370]
        061c  LN-028 Network USB 2.0 Adapter
        21f4  44 St Bluetooth Device
@@ -10971,6 +11162,7 @@
        0800  Cowon D2 (UMS mode)
        0801  Cowon D2 (MTP mode)
        0910  iAUDIO 9
+       0920  J3
 0e22  Symbian Ltd.
 0e23  Liou Yuane Enterprise Co., Ltd
 0e25  VinChip Systems, Inc.
@@ -11033,10 +11225,10 @@
 0e66  Hawking Technologies
        0001  HWUN1 Hi-Gain Wireless-300N Adapter w/ Upgradable Antenna [Ralink RT2870]
        0003  HWDN1 Hi-Gain Wireless-300N Dish Adapter [Ralink RT2870]
-       0009  HWUN2 Hi-Gain Wireless-150N Adapter w/ Upgradable Antenna [Ralink RT2870]
-       000b  HWDN2 Hi-Gain Wireless-150N Dish Adapter [Ralink RT2870]
-       0013  HWUN3 Hi-Gain Wireless-N Adapter [Ralink RT2870]
-       0017  Wireless-N Network Adapter [Ralink RT2870]
+       0009  HWUN2 Hi-Gain Wireless-150N Adapter w/ Upgradable Antenna [Ralink RT2770]
+       000b  HWDN2 Hi-Gain Wireless-150N Dish Adapter [Ralink RT2770]
+       0013  HWUN3 Hi-Gain Wireless-N Adapter [Ralink RT3070]
+       0017  HAWNU1 Hi-Gain Wireless-150N Network Adapter with Range Amplifier [Ralink RT3070]
        0018  Wireless-N Network Adapter [Ralink RT2870]
        400b  UF100 10/100 Network Adapter
        400c  UF100 Ethernet [pegasus2]
@@ -11323,6 +11515,7 @@
        00af  V640i Phone [PTP Camera]
        00d4  C902 [MTP]
        00d9  C702 Phone
+       0112  W995 Walkman Phone
        1010  WMC Modem
        10af  V640i Phone [PictBridge]
        10d4  C902 Phone [PictBridge]
@@ -11341,7 +11534,7 @@
        d025  520 WMC Data Modem
        d028  W800i
        d038  W850i Phone
-       d039  K800i Phone
+       d039  K800i (phone mode)
        d041  K510i Phone
        d042  W810i Phone
        d043  V630i Phone
@@ -11354,6 +11547,7 @@
        d0d4  C902 Phone [Modem]
        d0e1  MD400 Mobile Broadband Modem
        d12e  Xperia X10
+       e039  K800i (msc mode)
        e042  W810i Phone
        e043  V630i Phone [Mass Storage]
        e075  K850i
@@ -11363,9 +11557,11 @@
        e0a3  W660i
        e0af  V640i Phone [Mass Storage]
        e0d4  C902 Phone [Mass Storage] 
+       e0ef  C905 Phone [Mass Storage]
        e0f3  W595
        e112  W995 Phone (Mass Storage)
        e12e  X10i Phone
+       e14f  Xperia Arc
 0fcf  Dynastream Innovations, Inc.
 0fd0  Tulip Computers B.V.
 0fd1  Giant Electronics Ltd.
@@ -11376,6 +11572,8 @@
 0fe5  Greenconn (U.S.A.), Inc.
 0fe6  Kontron (Industrial Computer Source / ICS Advent)
        8101  DM9601 Fast Ethernet Adapter
+       811e  Parallel Adapter
+       9700  DM9601 Fast Ethernet Adapter
 0fe9  DVICO
        4020  TViX M-6500
        db00  FusionHDTV DVB-T (MT352+LgZ201) (uninitialized)
@@ -11401,8 +11599,9 @@
        6000  KU330/KU990/VX4400/VX6000
        6005  T5100
        6018  GM360/GD510/GW520/KP501
-       618e  Ally (debug mode)
-       618f  Ally
+       618e  Ally/Optimus One/Vortex (debug mode)
+       618f  Ally/Optimus One
+       61c6  Vortex (msc)
        6800  CDMA Modem
        7000  LG LDP-7024D(LD)USB
        a400  Renoir (KC910)
@@ -11536,11 +11735,14 @@
        0702  Passport External HDD
        0704  Passport External HDD
        070a  My Passport Essential SE
+       071a  My Passport 1TB
        0900  MyBook Essential External HDD
        0901  MyBook External HDD
        0910  MyBook Essential External HDD
        1001  External Hard Disk [Elements]
+       1021  Elements 2TB
        1104  MyBook Mirror Edition External HDD
+       1123  My Book 3.0
 1059  Giesecke & Devrient GmbH
        000b  StarSign Bio Token 3.0
 105c  Hong Ji Electric Wire & Cable (Dongguan) Co., Ltd
@@ -11653,6 +11855,7 @@
 10a9  SK Teletech Co., Ltd
        1102  Sky Love Actually IM-U460K
        1104  Sky Vega IM-A650S
+       6021  SIRIUS alpha
 10aa  Cables To Go
 10ab  USI Co., Ltd
        1002  Bluetooth Device
@@ -11687,6 +11890,7 @@
        0001  SmartHome PowerLinc
 10c4  Cygnal Integrated Products, Inc.
        0002  F32x USBXpress Device
+       0003  CommandIR
        8044  USB Debug Adapter
        804e  Software Bisque Paramount ME
        80a9  CP210x to UART Bridge Controller
@@ -11736,6 +11940,7 @@
 10f0  Nexio Co., Ltd
        2002  iNexio Touchscreen controller
 10f1  Importek
+       1a08  Internal Webcam
        1a1e  Laptop Integrated Webcam 1.3M
 10f5  Turtle Beach
        0200  Audio Advantage Roadie
@@ -11787,7 +11992,7 @@
 1130  Tenx Technology, Inc.
        0002  iBuddy
        6604  MCE IR-Receiver
-       660c  USB Foot Pedal [Generic]
+       660c  Foot Pedal/Thermometer
        6806  Keychain photo frame
        f211  TP6911 Audio Headset
 1131  Integrated System Solution Corp.
@@ -11948,6 +12153,8 @@
        3403  Muzio JM250 Audio Player
 1223  SKYCABLE ENTERPRISE. CO., LTD.
 1230  Chipidea-Microelectronica, S.A.
+1233  Denver Electronics
+       5677  FUSB200 mp3 player
 1234  Unknown
        ed02  Emotiv EPOC Developer Headset Wireless Dongle
 1235  Novation EMS
@@ -12043,10 +12250,13 @@
        1003  E220 HSDPA Modem / E230/E270 HSDPA/HSUPA Modem
        1009  U120
        1010  ETS2252+ CDMA Fixed Wireless Terminal
-       1038  Ideos
+       1037  Ideos
+       1038  Ideos (debug mode)
+       1406  E1750
        140b  EC1260 Wireless Data Modem HSD USB Card
        1446  E1552 (HSPA modem)
        1501  Pulse
+       380b  WiMAX USB modem(s)
 12d2  LINE TECH INDUSTRIAL CO., LTD.
 12d6  EMS Dr. Thomas Wuensche
        0444  CPC-USB/ARM7
@@ -12205,6 +12415,8 @@
        002f  AE1000 v1 802.11n [Ralink RT2870]
        0031  AM10 v1 802.11n [Ralink RT2870]
        13b1  WUSB200: Wireless-G Business Network Adapter with Rangebooster
+13b2  Alesis
+       0030  Multimix 8
 13b3  Nippon Dics Co., Ltd.
 13ba  Unknown
        0017  PS/2 Keyboard+Mouse Adapter
@@ -12251,12 +12463,14 @@
        3243  DTV-DVB UDXTTM6010 - A/D Driver(Without HID)
        3244  DTV-DVB UDTT 7047Z-USB 2.0 DVB-T Driver
        3247  802.11 n/g/b Wireless LAN Adapter
+       3249  Internal Bluetooth
        3262  802.11 n/g/b Wireless LAN USB Adapter
        3273  802.11 n/g/b Wireless LAN USB Mini-Card
        3274  DVB-T Dongle [RTL2832U]
        3282  DVB-T + GPS Minicard [RTL2832U]
        3284  Wireless LAN USB Mini-Card
        3306  WLAN [RTL8191S]
+       5070  Webcam
        5111  Integrated Webcam
        5115  Integrated Webcam
        5116  Integrated Webcam
@@ -12270,6 +12484,8 @@
 13e6  TechnoScope Co., Ltd.
 13ec  Zydacron
        0006  HID Remote Control
+13ee  MosArt
+       0003  Optical Mouse
 13fd  Initio Corporation
        0841  Samsung SE-T084M DVD-RW
        1340  Hi-Speed USB to SATA Bridge
@@ -12280,9 +12496,10 @@
        1a00  512MB/1GB Flash Drive
        1a23  512MB Flash Drive
        1d00  DataTraveler 2.0 1GB/4GB Flash Drive / Patriot Xporter 4GB Flash Drive
+       1e00  Flash Drive 2 GB [ICIDU 2 GB]
        1f00  DataTraveler 2.0 4GB Flash Drive / Patriot Xporter 32GB (PEF32GUSB) Flash Drive
        2240  microSD card reader
-       3100  2 GB USB stick
+       3100  2/4 GB stick
 1400  Axxion Group Corp.
 1402  Bowe Bell & Howell
 1403  Sitronix
@@ -12372,6 +12589,8 @@
        1000  Biometric Touchchip/Touchstrip Fingerprint Sensor
        2016  Biometric Touchchip/Touchstrip Fingerprint Sensor
 147f  Hama GmbH & Co., KG
+1482  Vaillant
+       1005  VRD PC-Interface
 1484  Elsa AG [hex]
        1746  Ecomo 19H99 Monitor
        7616  Elsa Hub
@@ -12411,18 +12630,19 @@
 14af  ATP Electronics Inc.
 14b0  StarTech.com Ltd.
 14b2  Ralink Technology, Corp.
-       3a93  USB WLAN Device
+       3a95  Toshiba WUS-G06G-JT 802.11bg Wireless Adapter
+       3a98  Airlink101 AWLL4130 802.11bg Wireless Adapter [Atheros AR5523]
        3c02  rt2500 802.11g WLAN
        3c05  rt2570 802.11g WLAN
-       3c06  802.11n adapter (V1)
+       3c06  Conceptronic C300RU v1 802.11bgn Wireless Adapter [Ralink RT2870]
        3c07  802.11n adapter
        3c09  802.11n adapter
-       3c22  rt73 802.11g WLAN
-       3c23  802.11n adapter
-       3c25  802.11n adapter
-       3c27  rt2870 802.11n WLAN
-       3c28  802.11n adapter (V2)
-       3c2c  RT3070 802.11n Wireless Adapter
+       3c22  Conceptronic C54RU 802.11bg Wireless Adapter [Ralink RT73]
+       3c23  Airlink101 AWLL6080 802.11bgn Wireless Adapter [Ralink RT2870]
+       3c25  DrayTek Vigor N61 802.11bgn Wireless Adapter [Ralink RT2870]
+       3c27  Airlink101 AWLL6070 802.11bgn Wireless Adapter [Ralink RT2770]
+       3c28  Conceptronic C300RU v2 802.11bgn Wireless Adapter [Ralink RT2770]
+       3c2c  Keebox W150NU 802.11bgn Wireless Adapter [Ralink RT3070]
 14c0  Rockwell Automation, Inc.
 14c2  Gemlight Computer, Ltd
        0250  Storage Adapter V2
@@ -12435,6 +12655,7 @@
        6700  Card Reader
        6900  Card Reader
        8123  SD MMC Reader
+       8125  SD MMC Reader
 14d8  JAMER INDUSTRIES CO., LTD.
 14dd  Raritan Computer, Inc.
 14e1  Dialogue Technology Corp.
@@ -12462,7 +12683,7 @@
        2004  FlashPro3 Programmer
        2005  FlashPro3 Programmer
 1516  CompUSA
-       1603  1GB Flash Drive
+       1603  Flash Drive
        8628  Pen Drive
 1518  Cheshire Engineering Corp.
        0001  HDReye High Dynamic Range Camera
@@ -12476,11 +12697,12 @@
 1529  UBIQUAM Co., Ltd.
        3100  CDMA 1xRTT USB Modem (U-100/105/200/300/520)
 152d  JMicron Technology Corp. / JMicron USA Technology Corp.
-       2329  transcend storejet 25P
+       2329  JM20329 SATA Bridge
        2335  ATA/ATAPI Bridge
        2336  Hard Disk Drive
        2337  ATA/ATAPI Bridge
        2338  JM20337 Hi-Speed USB to SATA & PATA Combo Bridge
+       2352  ATA/ATAPI Bridge
        2509  JMS539 SuperSpeed SATA II 3.0G Bridge
 152e  LG (HLDS)
        2507  PL-2507 IDE Controller
@@ -12519,9 +12741,9 @@
        300a  TEW-429UB 802.11bg
        300b  TEW-429UB 802.11bg
        300d  TEW-429UB C1 802.11bg
-       3204  ALL0298 v2 802.11bg
-       3205  AR5523
-       3206  AR5523 (no firmware)
+       3204  Allnet ALL0298 v2 802.11bg
+       3205  Allnet ALL0283 [AR5523]
+       3206  Allnet ALL0283 [AR5523](no firmware)
 1582  Fiberline
        6003  WL-430U 802.11bg
 1587  SMA Technologie AG
@@ -12777,7 +12999,8 @@
 1677  China Huada Integrated Circuit Design (Group) Co., Ltd. (CIDC Group)
        0103  Token
 1679  Total Phase
-       2001  Beagle USB 12 Protocol Analyzer
+       2001  Beagle Protocol Analyzer
+       2002  Cheetah SPI Host Adapter
 1680  Golden Bridge Electech Inc.
        a332  DVB-T Dongle [RTL2832U]
 1681  Prevo Technologies, Inc.
@@ -12789,6 +13012,7 @@
 1686  ZOOM Corporation
        0045  H4 Digital Recorder
 1687  Kingmax Digital Inc.
+       5289  FlashDisk
        6211  FlashDisk
 1688  Saab AB
 168c  Atheros Communications
@@ -12853,6 +13077,8 @@
        03f1  free for internal lab use 1009
        05dc  shared ID for use with libusb
        05dd  BlackcatUSB2
+       05e1  CDC-ACM class devices (modems)
+       05e4  MIDI class devices
        076b  OpenPCD 13.56MHz RFID Reader
        076c  OpenPICC 13.56MHz RFID Simulator (native)
        08ac  OpenBeacon USB stick
@@ -12860,6 +13086,11 @@
        08cb  Alpermann+Velte Studio Clock
        08cc  Alpermann+Velte SAM7S MT Boot Loader
        08cd  Alpermann+Velte SAM7X MT Boot Loader
+       27da  Mouse
+       27db  Keyboard
+       27dc  Joystick
+       27dd  CDC-ACM class devices (modems)
+       27de  MIDI class devices
 16ca  Wireless Cables, Inc.
        1502  Bluetooth Dongle
 16cc  silex technology, Inc.
@@ -12867,6 +13098,7 @@
        054b  ReelBox OLED Display (external)
 16d3  Frontline Test Equipment, Inc.
 16d5  AnyDATA Corporation
+       6202  CDMA/UMTS/GPRS modem
        6501  CDMA 2000 1xRTT/EV-DO Modem
        6502  CDMA/UMTS/GPRS modem
 16d6  JABLOCOM s.r.o.
@@ -12888,6 +13120,8 @@
        0001  CC
        000b  VM
 16df  King Billion Electronics Co., Ltd.
+16f0  GN ReSound A/S
+       0003  Airlink Wireless Programming Interface
 16f5  Futurelogic Inc.
 1706  BlueView Technologies, Inc.
 1707  ARTIMI
@@ -13027,6 +13261,7 @@
 17ef  Lenovo
        1003  Integrated Smart Card Reader
        1004  Integrated Webcam
+       100a  ThinkPad Mini Dock Plus Series 3
        3815  ChipsBnk 2GB USB Stick
        4802  Lenovo Vc0323+MI1310_SOC Camera
        4807  UVC Camera
@@ -13106,9 +13341,11 @@
 18cd  Ecamm
        cafe  Pico iMage
 18d1  Google Inc.
-       4e11  Nexus One Phone
-       4e12  Nexus One Phone (Debug)
-       4e13  Nexus One Phone (USB Tether)
+       4e11  Nexus One
+       4e12  Nexus One (debug)
+       4e13  Nexus One (tether)
+       4e21  Nexus S
+       4e22  Nexus S (debug)
 18d5  Starline International Group Limited
 18d9  Kaba
        01a0  B-Net 91 07
@@ -13118,6 +13355,7 @@
        7102  Multi Card Reader (Internal)
        9101  All-in-1 Card Reader
        9102  Multi Card Reader
+       9512  Webcam
 18e8  Qcom
        6196  RT2573
        6229  RT2573
@@ -13555,6 +13793,7 @@
        1101  DK DVB-T Dongle
        1102  DK mini DVB-T Dongle
        1103  DK 5217 DVB-T Dongle
+       6105  Video grabber
        8202  DK DVBC/T DONGLE
 1d1f  Diostech Co., Ltd.
 1d20  SAMTACK INC.
@@ -13609,7 +13848,10 @@
        6511  MP705-8G MP3 player
        6512  MP705-4G
 1e7d  ROCCAT
+       2c24  Pyra Mouse (wired)
        2ced  Kone Mouse
+       2d51  Kone+ Mouse
+       30d4  Arvo Keyboard
 1ebb  NuCORE Technology, Inc.
 1eda  AirTies Wireless Networks
        2310  802.11n USB Wireless LAN Card
@@ -13626,6 +13868,7 @@
        0002  Multi-touch HID Controller
 1fbd  Delphin Technology AG
        0001  Expert Key - Data aquisition system
+1fc9  NXP Semiconductors
 1fe7  Vertex Wireless Co., Ltd.
        1000  VW100 series CDMA EV-DO Rev.A modem
 2001  D-Link Corp.
@@ -13633,12 +13876,12 @@
        0201  DHN-120 10Mb Home Phoneline Adapter
        1a00  10/100 Ethernet
        200c  10/100 Ethernet
-       3200  DWL-120 802.11b (Atmel RFMD503A) [usbvnetr]
+       3200  DWL-120 802.11b Wireless Adapter(rev.E1) [Atmel at76c503a]
        3301  DWA-130 802.11n Wireless N Adapter(rev.C1) [Realtek RTL8192U]
        3500  Elitegroup Computer Systems WLAN card WL-162
        3700  DWL-122 802.11b [Intersil Prism 3]
        3701  DWL-G120 Spinnaker 802.11g [Intersil ISL3886]
-       3702  DWL-120 rev F
+       3702  DWL-120 802.11b Wireless Adapter(rev.F) [Intersil ISL3871]
        3703  AirPlus G DWL-G122 Wireless Adapter [Intersil ISL3886]
        3704  AirPlus G DWL-G122 Wireless Adapter(rev.A2) [Intersil ISL3887]
        3705  AirPlus G DWL-G120 Wireless Adapter(rev.C) [Intersil ISL3887]
@@ -13653,7 +13896,7 @@
        3a81  predator Bootloader Download
        3a82  AirPremier AG DWL-AG132 Wireless Adapter
        3a83  predator Bootloader Download
-       3b00  AirPlus DWL-120+ Wireless Adapter
+       3b00  AirPlus DWL-120+ Wireless Adapter [Texas Instruments ACX100USB]
        3b01  WLAN Boot Device
        3c00  AirPlus G DWL-G122 Wireless Adapter(rev.B1) [Ralink RT2500USB]
        3c01  AirPlus AG DWL-AG122 Wireless Adapter
@@ -13755,6 +13998,8 @@
 20b1  XMOS Ltd
        10ad  XUSB Loader
        f7d1  XTAG2 - JTAG Adapter
+20b3  Hanvon
+       0a18  10.1 Touch screen overlay
 20b7  Qi Hardware
        0713  Milkymist JTAG/serial
        1540  ben-wpan, AT86RF230-based
@@ -14296,6 +14541,9 @@
        0284  802.11a/b/g/n USB Wireless LAN Card
        0290  ZW-N290 802.11n [Realtek RTL8192SU]
        5257  Metronic 495257 wifi 802.11ng
+6000  Beholder International Ltd.
+       dec0  TV Wander
+       dec1  TV Voyage
 601a  Ingenic Semiconductor Ltd.
        4740  XBurst Jz4740 boot mode
 6189  Sitecom
@@ -14336,6 +14584,7 @@
        7711  EW-7711UTn nLite Wireless Adapter [Ralink RT2870]
        7717  EW-7717UN 802.11n Wireless Adapter [Ralink RT2870]
        7718  EW-7718UN 802.11n Wireless Adapter [Ralink RT2870]
+       7722  EW-7722UTn 802.11n Wireless Adapter [Ralink RT307x]
        7811  EW-7811Un 802.11n Wireless Adapter [Realtek RTL8188CUS]
 8086  Intel Corp.
        0001  AnyPoint (TM) Home Network 1.6 Mbps Wireless Adapter
@@ -14436,7 +14685,7 @@ a168  AnMo Electronics Corporation
 a600  Asix
        e110  OK1ZIA Davac 4.x
 a727  3Com
-       6893  AR5523
+       6893  3CRUSB20075 OfficeConnect Wireless 108Mbps 11g Adapter [Atheros AR5523]
        6895  AR5523
        6897  AR5523
 abcd  Unknown
@@ -14474,6 +14723,7 @@ eb1a  eMPIA Technology, Inc.
        2776  Combined audio and video input device
        2800  Terratec Cinergy 200
        2801  GrabBeeX+ Video Encoder
+       2863  Video Grabber
        2870  Pinnacle PCTV Stick
        2881  EM2881 Video Controller
        50a3  Gadmei UTV380 TV Box

diff --git a/src/initscripts/init.d/console b/src/initscripts/init.d/console
index 8d2e49dfbe63fcc7d6fe620d1ec315ff575f8370..728262308d1422cb3fa9371586385cb977b48431 100644 (file)
--- a/src/initscripts/init.d/console
+++ b/src/initscripts/init.d/console
@@ -17,16 +17,22 @@
 . ${rc_functions}
 eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
 
+# English is default
+FONT="lat0-16"
+KEYMAP_CORRECTIONS="euro2"
+
 if [ "$LANGUAGE" == "de" ]; then
-       #KEYMAP="de-latin1"
-       KEYMAP_CORRECTIONS="euro2"
        LEGACY_CHARSET="iso-8859-15"
        #FONT="LatArCyrHeb-16 -m 8859-15"
        FONT="lat0-16 -m 8859-15"
-else
-       # English
-       FONT="lat0-16"
-       KEYMAP_CORRECTIONS="euro2"
+fi
+
+if [ "$LANGUAGE" == "pl" ]; then
+       FONT="lat2-16"
+fi
+
+if [ "$LANGUAGE" == "ru" ]; then
+       FONT="LatArCyrHeb-16"
 fi
 
 UNICODE="1"

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 1e4af55af812f3520196d270674c37ab78be6f51..2b342c8a0334428f09b2283b5f993c69a36dcb13 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -458,7 +458,7 @@ case "${1}" in
                        PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach mtu ${MTU}"
                        PPP_STD_OPTIONS+=" mru ${MRU} noaccomp nodeflate nopcomp novj novjccomp"
                        PPP_STD_OPTIONS+=" nobsdcomp user ${USERNAME} lcp-echo-interval 20"
-                       PPP_STD_OPTIONS+=" lcp-echo-failure 3 ${AUTH}"
+                       PPP_STD_OPTIONS+=" lcp-echo-failure 5 ${AUTH}"
                                
                        ### Debugging
                        #

diff --git a/src/initscripts/init.d/static-routes b/src/initscripts/init.d/static-routes
new file mode 100644 (file)
index 0000000..970083c
--- /dev/null
+++ b/src/initscripts/init.d/static-routes
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+
+function init_table() {
+       # Check if table does already exist. If not we add it.
+       if (ip rule | grep -q "static" >/dev/null 2>&1); then
+               return
+       fi
+
+       ip rule add table static
+}
+
+function create_all_routes() {
+       local file=${1}
+       shift
+
+       # Remote all routes.
+       ip route flush table static >/dev/null 2>&1
+
+       local status
+       local network
+       local gateway
+       local remark
+
+       # Read all routes from the configuration file and add the enabled ones
+       # immediately.
+       while IFS=, read status network gateway remark; do
+               [ "${status}" = "on" ] || continue
+
+               if [ -z "${network}" -o -z "${gateway}" ]; then
+                       # Silently skipping invalid routes.
+                       continue
+               fi
+
+               ip route add ${network} via ${gateway} table static
+       done < ${file}
+}
+
+CONFIGFILE="/var/ipfire/main/routing"
+
+case "${1}" in
+       start)
+               boot_mesg "Adding static routes..."
+
+               # First, initialize the table
+               init_table
+
+               # Add all routes
+               create_all_routes ${CONFIGFILE}
+
+               evaluate_retval
+               ;;
+
+       stop)
+               boot_mesg "Removing static routes..."
+               ip route flush table static >/dev/null 2>&1
+               evaluate_retval
+               ;;
+
+       *)
+               echo "Usage: ${0} {start|stop}"
+               exit 1
+               ;;
+esac

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 0172f8b7b0c73de481bf3b4885ef2d39d5d89cd2..799059a3b82b115307b88041d71c524fcf53ba58 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -1,3 +1,4 @@
+
 /* SmoothWall install program.
  *
  * This program is distributed under the terms of the GNU General Public
@@ -11,7 +12,7 @@
 #include "install.h"
 #define _GNU_SOURCE
  
-#define INST_FILECOUNT 8400
+#define INST_FILECOUNT 10700
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
 #define EXT2 0
@@ -33,15 +34,17 @@ extern char *en_tr[];
 extern char *es_tr[];
 extern char *de_tr[];
 extern char *fr_tr[];
+extern char *pl_tr[];
+extern char *ru_tr[];
 
 int main(int argc, char *argv[])
 {
 
        char discl_msg[40000] = "Disclaimer\n";
 
-       char *langnames[] = { "Deutsch", "English", "Français", "Español", NULL };
-       char *shortlangnames[] = { "de", "en", "fr", "es", NULL };
-       char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL };
+       char *langnames[] = { "Deutsch", "English", "Français", "Español", "Polski", "Русский", NULL };
+       char *shortlangnames[] = { "de", "en", "fr", "es", "pl", "ru", NULL };
+       char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, ru_tr, NULL };
        char hdletter;
        char harddrive[30], sourcedrive[5];     /* Device holder. */
        struct devparams hdparams, cdromparams; /* Params for CDROM and HD */

diff --git a/src/install+setup/libsmooth/main.c b/src/install+setup/libsmooth/main.c
index 8de8c231e9d9eb8c4a329d6a17c0f32ad77f69ee..17adcc744a8a598ed177faacbc01f66691bc761a 100644 (file)
--- a/src/install+setup/libsmooth/main.c
+++ b/src/install+setup/libsmooth/main.c
@@ -344,6 +344,8 @@ int replace(char filename1[], char *from, char *to)
        #include "lang_en.c"
        #include "lang_es.c"
        #include "lang_fr.c"
+       #include "lang_pl.c"
+       #include "lang_ru.c"
 #endif
 
 // returns a pointer to the actual running version number of IPFire.

diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c
index a6c15c9041d01ca272c17469f431ca39f14106db..65878f98a53975fc80862bd2c192509e9241f503 100644 (file)
--- a/src/install+setup/setup/main.c
+++ b/src/install+setup/setup/main.c
@@ -24,6 +24,8 @@ extern char *en_tr[];
 extern char *de_tr[];
 extern char *fr_tr[];
 extern char *es_tr[];
+extern char *pl_tr[];
+extern char *ru_tr[];
 
 int main(int argc, char *argv[])
 {
@@ -31,8 +33,8 @@ int main(int argc, char *argv[])
        char *shortlangnames[] = { "en", NULL };
        char **langtrs[] = { en_tr, NULL };
 #else
-       char *shortlangnames[] = { "de", "en", "fr", "es", NULL };
-       char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL };
+       char *shortlangnames[] = { "de", "en", "fr", "es", "pl", "ru", NULL };
+       char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, ru_tr, NULL };
 #endif
        int choice;
        char *sections[11]; /* need to fill this out AFTER knowning lang */

diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile
index 348f91c7437111fe42b03edf77fd4bb3cf6248f5..9f1e3f0006d16b3dac3ac93e8bc95af8fbd2c191 100644 (file)
--- a/src/misc-progs/Makefile
+++ b/src/misc-progs/Makefile
@@ -32,7 +32,7 @@ SUID_PROGS = setdmzholes setportfw setxtaccess \
        wirelessctrl getipstat getiptstate qosctrl launch-ether-wake \
        redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \
        smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \
-       setaliases urlfilterctrl updxlratorctrl fireinfoctrl
+       setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes
 SUID_UPDX = updxsetperms
 
 install : all
@@ -158,3 +158,5 @@ updxsetperms: updxsetperms.c setuid.o ../install+setup/libsmooth/varval.o
 fireinfoctrl: fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o
        $(COMPILE) -I../install+setup/libsmooth/ fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 
+rebuildroutes: rebuildroutes.c setuid.o ../install+setup/libsmooth/varval.o
+       $(COMPILE) -I../install+setup/libsmooth/ rebuildroutes.c setuid.o ../install+setup/libsmooth/varval.o -o $@

diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c
index 51f6b5a30190a1472afb4b5ae09096fec16e17ab..0b0517713d031d1e481559d7148aeb54c562aaee 100644 (file)
--- a/src/misc-progs/ipsecctrl.c
+++ b/src/misc-progs/ipsecctrl.c
@@ -59,9 +59,9 @@ void open_physical (char *interface, int nat_traversal_port) {
 //        safe_system(str);
         // IKE
 
-        sprintf(str, "/sbin/iptables -D IPSECINPUT -p udp -i %s --sport 500 --dport 500 -j ACCEPT >/dev/null 2>&1", interface);
+        sprintf(str, "/sbin/iptables -D IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT >/dev/null 2>&1", interface);
         safe_system(str);
-        sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --sport 500 --dport 500 -j ACCEPT", interface);
+        sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT", interface);
         safe_system(str);
 
         if (! nat_traversal_port) 
@@ -142,10 +142,42 @@ int decode_line (char *s,
 */
 void turn_connection_on (char *name, char *type) {
 /*
-    if you find a way to start a single connection without changing all add it
-    here. Change also vpn-watch.
+       Rename the connection and run ipsec update and rename it back to readd
+       a deleted connection. Because ipsec update ignores connection that have
+       not changed since last load.
 */
-        safe_system("/etc/rc.d/init.d/ipsec restart >/dev/null");
+        char command[STRING_SIZE];
+        memset(command, 0, STRING_SIZE);
+        snprintf(command, STRING_SIZE - 1, 
+                "sed -i -e 's|^conn %s$|conn %s-renamed|g' /var/ipfire/vpn/ipsec.conf >/dev/null", name, name);
+        safe_system(command);
+
+       // Down and delete IKEv2 Tunnel before ipsec update
+        snprintf(command, STRING_SIZE - 1, 
+                "/usr/sbin/ipsec stroke down %s >/dev/null", name);
+        safe_system(command);
+        snprintf(command, STRING_SIZE - 1, 
+                "/usr/sbin/ipsec stroke delete %s >/dev/null", name);
+        safe_system(command);
+
+        safe_system("/etc/rc.d/init.d/ipsec update >/dev/null");
+
+       sleep(1);
+
+       // Back to original name
+       snprintf(command, STRING_SIZE - 1, 
+                "sed -i -e 's|^conn %s-renamed$|conn %s|g' /var/ipfire/vpn/ipsec.conf >/dev/null", name, name);
+        safe_system(command);
+
+       // Down and delete IKEv2 Tunnel before ipsec update
+        snprintf(command, STRING_SIZE - 1, 
+                "/usr/sbin/ipsec stroke down %s-renamed >/dev/null", name);
+        safe_system(command);
+        snprintf(command, STRING_SIZE - 1, 
+                "/usr/sbin/ipsec stroke delete %s-renamed >/dev/null", name);
+        safe_system(command);
+
+        safe_system("/etc/rc.d/init.d/ipsec update >/dev/null");
 }
 /*
     issue ipsec commmands to turn off connection 'name'
@@ -156,7 +188,16 @@ void turn_connection_off (char *name) {
         snprintf(command, STRING_SIZE - 1, 
                 "/usr/sbin/ipsec whack --delete --name %s >/dev/null", name);
         safe_system(command);
+        snprintf(command, STRING_SIZE - 1, 
+                "/usr/sbin/ipsec stroke down %s >/dev/null", name);
+        safe_system(command);
+        snprintf(command, STRING_SIZE - 1, 
+                "/usr/sbin/ipsec stroke delete %s >/dev/null", name);
+        safe_system(command);
+
         safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null");
+        safe_system("/usr/sbin/ipsec stroke rereadall >/dev/null");
+
 }
 
 
@@ -178,11 +219,13 @@ int main(int argc, char *argv[]) {
 
         if (strcmp(argv[1], "I") == 0) {
                 safe_system("/usr/sbin/ipsec whack --status");
+                safe_system("/usr/sbin/ipsec stroke status");
                 exit(0);
         }
 
         if (strcmp(argv[1], "R") == 0) {
                 safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null");
+                safe_system("/usr/sbin/ipsec stroke rereadall >/dev/null");
                 exit(0);
         }
 

diff --git a/src/misc-progs/rebuildroutes.c b/src/misc-progs/rebuildroutes.c
new file mode 100644 (file)
index 0000000..3655692
--- /dev/null
+++ b/src/misc-progs/rebuildroutes.c
@@ -0,0 +1,17 @@
+/* IPFire helper program - rebuildroutes
+ *
+ * This program is distributed under the terms of the GNU General Public
+ * Licence.  See the file COPYING for details.
+ */
+
+#include "libsmooth.h"
+#include "setuid.h"
+
+int main(int argc, char *argv[]) {
+       if (!(initsetuid()))
+               exit(1);
+
+       safe_system("/etc/init.d/static-routes start >/dev/null 2>&1");
+
+       return 0;
+}

diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index 01e59ebce42eb7a2faeb536585b7716e38001074..60f8bbb42e31f3e949027e792ae79885ea12a186 100644 (file)
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -17,14 +17,14 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2010 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 extract_files
 #
-KVER=2.6.32.39
+KVER=xxxKVERxxx
 ROOT=`mount | grep " / " | cut -d" " -f1`
 ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
 if [ ! -z $ROOTUUID ]; then

diff --git a/src/paks/linux-pae/update.sh b/src/paks/linux-pae/update.sh
index abbaf47c3cdefc976257ad3dcd052b658b3002b7..2878dfb4fbbecc4399f0186d5e4bc8d5bcf28088 100644 (file)
--- a/src/paks/linux-pae/update.sh
+++ b/src/paks/linux-pae/update.sh
@@ -17,11 +17,11 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
-#Don't remove old xen kernel at update
+#Don't remove old pae kernel at update
 #./uninstall.sh
 ./install.sh

diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh
index f3ffbdb8bb2668b5591980174da6dcfc82ed2e92..70efa9db7e4b8016a9794ab6a78ab48a9a08ae28 100644 (file)
--- a/src/paks/linux-xen/install.sh
+++ b/src/paks/linux-xen/install.sh
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 #
-KVER=2.6.32.39
+KVER=xxxKVERxxx
 ROOT=`mount | grep " / " | cut -d" " -f1`
 ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
 if [ ! -z $ROOTUUID ]; then

diff --git a/src/paks/mpfire/install.sh b/src/paks/mpfire/install.sh
index e09fca42542a90dc8420a8cc49f23e3fde630bac..f8f833de969b633acf8239ce6246f68f1afaf519 100644 (file)
--- a/src/paks/mpfire/install.sh
+++ b/src/paks/mpfire/install.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -28,7 +28,9 @@ ln -svf  /etc/init.d/mpd /etc/rc.d/rc0.d/K35mpd
 ln -svf  /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd
 ln -svf  /var/ipfire/mpfire/mpd.conf /etc/mpd.conf
 chmod 755 /srv/web/ipfire/html/images/mpfire
-touch /var/log/mpd.error.log
 touch /var/log/mpd.log
 restore_backup ${NAME}
+# comment removed option from config
+sed -i -e "s|^error_file|#error_file|g" /var/ipfire/mpfire/mpd.conf
+#
 /etc/init.d/mpd start

diff --git a/src/patches/Python-2.7-gdbm-1.patch b/src/patches/Python-2.7.2-gdbm-1.patch
similarity index 100%
rename from src/patches/Python-2.7-gdbm-1.patch
rename to src/patches/Python-2.7.2-gdbm-1.patch

diff --git a/src/patches/binutils-2.18-configure-1.patch b/src/patches/binutils-2.18-configure-1.patch
new file mode 100644 (file)
index 0000000..ae6aaa3
--- /dev/null
+++ b/src/patches/binutils-2.18-configure-1.patch
@@ -0,0 +1,19 @@
+Submitted By: Matt Burgess (matthew at linuxfromscratch dot org)
+Date: 2007-11-19
+Initial Package Version: 2.18
+Origin: Upstream (http://sourceware.org/cgi-bin/cvsweb.cgi/src/configure.diff?r1=1.268&r2=1.268.2.1&cvsroot=src)
+Upstream Status: Applied
+Description: Fixes the configure script to correctly dictate Texinfo > 4.9.
+
+diff -Naur binutils-2.18.orig/configure binutils-2.18/configure
+--- binutils-2.18.orig/configure       2007-08-06 20:29:40.000000000 +0000
++++ binutils-2.18/configure    2007-11-18 22:37:58.000000000 +0000
+@@ -6128,7 +6128,7 @@
+     # For an installed makeinfo, we require it to be from texinfo 4.4 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"

diff --git a/src/patches/ccache-3.1-no_compiler_mtime.patch b/src/patches/ccache-3.1.6-no_compiler_mtime.patch
similarity index 100%
rename from src/patches/ccache-3.1-no_compiler_mtime.patch
rename to src/patches/ccache-3.1.6-no_compiler_mtime.patch

diff --git a/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch b/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch
new file mode 100644 (file)
index 0000000..eb5d280
--- /dev/null
+++ b/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch
@@ -0,0 +1,14 @@
+diff -Naur compat-wireless-2.6.39-1-sn.org/compat/kfifo.c compat-wireless-2.6.39-1-sn/compat/kfifo.c
+--- compat-wireless-2.6.39-1-sn.org/compat/kfifo.c     2011-05-24 01:43:48.000000000 +0200
++++ compat-wireless-2.6.39-1-sn/compat/kfifo.c 2011-05-24 17:20:06.956818313 +0200
+@@ -27,6 +27,10 @@
+ #include <linux/uaccess.h>
+ #include <linux/kfifo.h>
+ 
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Stefani Seibold <stefani@seibold.net>");
++MODULE_DESCRIPTION("A generic kernel FIFO implementation");
++
+ /*
+  * internal helper to calculate the unused elements in a fifo
+  */

diff --git a/src/patches/dhcp-3.0.4-iproute2-1.patch b/src/patches/dhcp-3.0.4-iproute2-1.patch
deleted file mode 100644 (file)
index 40a6aad..0000000
--- a/src/patches/dhcp-3.0.4-iproute2-1.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Submitted By: DJ Lucas (dj at linuxfromscratch dot org)
-Date: 2005-06-18
-Initial Package Version: 3.0.2
-Origin: Jim Gifford, Bruce Dubbs, DJ Lucas
-Description: Fixes client script to use iproute2 (added flush to previous 
-             unversioned patches)
-Upstream Status:  Not submitted
-
---- dhcp-3.0.2-orig/client/scripts/linux       2002-11-14 19:09:09.000000000 -0600
-+++ dhcp-3.0.2/client/scripts/linux    2005-06-18 22:54:59.000000000 -0500
-@@ -1,26 +1,15 @@
- #!/bin/bash
- # dhclient-script for Linux. Dan Halbert, March, 1997.
- # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
--# No guarantees about this. I'm a novice at the details of Linux
--# networking.
-+
-+# Updated to iproute2 by Jim Gifford (scripts@jg555.com)
- 
- # Notes:
- 
- # 0. This script is based on the netbsd script supplied with dhcp-970306.
--
--# 1. ifconfig down apparently deletes all relevant routes and flushes
--# the arp cache, so this doesn't need to be done explicitly.
--
--# 2. The alias address handling here has not been tested AT ALL.
--# I'm just going by the doc of modern Linux ip aliasing, which uses
--# notations like eth0:0, eth0:1, for each alias.
--
--# 3. I have to calculate the network address, and calculate the broadcast
--# address if it is not supplied. This might be much more easily done
--# by the dhclient C code, and passed on.
--
--# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious
--# of the $1 in its args.
-+# 1. This script was modified to work with iproute2
-+# 2. cidr_convert based on a script by Kevin Fleming (kpfleming@linuxfromscratch.org)
-+# 3. Updated to delete addresses when taking an interface down (bdubbs@linuxfromscratch.org)
- 
- make_resolv_conf() {
-   if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
-@@ -32,6 +21,30 @@
-   fi
- }
- 
-+dec2binary()
-+{
-+    local n=$1
-+    local ret=""
-+    while [ $n != 0 ]; do
-+        ret=$[$n%2]$ret
-+        n=$[$n>>1]
-+    done
-+    echo $ret
-+}
-+
-+mask_to_binary()
-+{
-+    echo `dec2binary $1``dec2binary $2``dec2binary $3``dec2binary $4`
-+}
-+
-+cidr_convert()
-+{
-+      netmask=$1
-+        local mask=`mask_to_binary ${netmask//./ }`
-+        mask=${mask%%0*}
-+        cidr=${#mask}
-+}
-+
- # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
- exit_with_hooks() {
-   exit_status=$1
-@@ -53,11 +66,6 @@
-   fi
- fi
- 
--release=`uname -r`
--release=`expr $release : '\(.*\)\..*'`
--relminor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'`
--relmajor=`echo $release |sed -e 's/\([0-9][0-9]*\)\..*$/\1/'`
--
- if [ x$new_broadcast_address != x ]; then
-   new_broadcast_arg="broadcast $new_broadcast_address"
- fi
-@@ -65,13 +73,12 @@
-   old_broadcast_arg="broadcast $old_broadcast_address"
- fi
- if [ x$new_subnet_mask != x ]; then
--  new_subnet_arg="netmask $new_subnet_mask"
-+  cidr_convert $new_subnet_mask
-+  new_subnet_arg="$cidr"
- fi
- if [ x$old_subnet_mask != x ]; then
--  old_subnet_arg="netmask $old_subnet_mask"
--fi
--if [ x$alias_subnet_mask != x ]; then
--  alias_subnet_arg="netmask $alias_subnet_mask"
-+  cidr_convert $old_subnet_mask
-+  old_subnet_arg="$cidr"
- fi
- 
- if [ x$reason = xMEDIUM ]; then
-@@ -82,17 +89,10 @@
- if [ x$reason = xPREINIT ]; then
-   if [ x$alias_ip_address != x ]; then
-     # Bring down alias interface. Its routes will disappear too.
--    ifconfig $interface:0- inet 0
--  fi
--  if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
--   then
--    ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
--              broadcast 255.255.255.255 up
--    # Add route to make broadcast work. Do not omit netmask.
--    route add default dev $interface netmask 0.0.0.0
--  else
--    ifconfig $interface 0 up
-+    ip link set $interface down
-+    ip addr del $alias_ip_address  dev $interface
-   fi
-+  ip link set $interface up
- 
-   # We need to give the kernel some time to get the interface up.
-   sleep 1
-@@ -115,83 +115,51 @@
-     fi
-   fi
-     
--  if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
--              [ x$alias_ip_address != x$old_ip_address ]; then
--    # Possible new alias. Remove old alias.
--    ifconfig $interface:0- inet 0
--  fi
-   if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
--    # IP address changed. Bringing down the interface will delete all routes,
-+    # IP address changed. Bring down the interface, delete all routes,
-     # and clear the ARP cache.
--    ifconfig $interface inet 0 down
--
-+    ip link set $interface down
-+    ip addr flush dev $interface
-   fi
-   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
-      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
- 
--    ifconfig $interface inet $new_ip_address $new_subnet_arg \
--                                                      $new_broadcast_arg
-+    ip link set $interface up
-+    ip addr add $new_ip_address/$new_subnet_arg $new_broadcast_arg \
-+       label $interface dev $interface
-     # Add a network route to the computed network address.
--    if [ $relmajor -lt 2 ] || \
--              ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
--      route add -net $new_network_number $new_subnet_arg dev $interface
--    fi
-     for router in $new_routers; do
--      route add default gw $router
-+      ip route add default via $router
-     done
-   fi
--  if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
--   then
--    ifconfig $interface:0- inet 0
--    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--    route add -host $alias_ip_address $interface:0
--  fi
-   make_resolv_conf
-   exit_with_hooks 0
- fi
- 
- if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
-    || [ x$reason = xSTOP ]; then
--  if [ x$alias_ip_address != x ]; then
--    # Turn off alias interface.
--    ifconfig $interface:0- inet 0
--  fi
-   if [ x$old_ip_address != x ]; then
--    # Shut down interface, which will delete routes and clear arp cache.
--    ifconfig $interface inet 0 down
--  fi
--  if [ x$alias_ip_address != x ]; then
--    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--    route add -host $alias_ip_address $interface:0
-+    # Shut down interface, delete routes, and clear arp cache.
-+    ip link set $interface down
-+    ip addr flush dev $interface
-   fi
-   exit_with_hooks 0
- fi
- 
- if [ x$reason = xTIMEOUT ]; then
--  if [ x$alias_ip_address != x ]; then
--    ifconfig $interface:0- inet 0
--  fi
--  ifconfig $interface inet $new_ip_address $new_subnet_arg \
--                                      $new_broadcast_arg
-+  ip link set $interface up
-+  ip addr set $new_ip_address/$new_subnet_arg $new_broadcast_arg \
-+     label $interface dev $interface
-   set $new_routers
--  ############## what is -w in ping?
--  if ping -q -c 1 $1; then
--    if [ x$new_ip_address != x$alias_ip_address ] && \
--                      [ x$alias_ip_address != x ]; then
--      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--      route add -host $alias_ip_address dev $interface:0
--    fi
--    if [ $relmajor -lt 2 ] || \
--              ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
--      route add -net $new_network_number
--    fi
--    for router in $new_routers; do
--      route add default gw $router
--    done
--    make_resolv_conf
--    exit_with_hooks 0
--  fi
--  ifconfig $interface inet 0 down
-+  
-+  for router in $new_routers; do
-+    ip route add default via $router
-+  done
-+  
-+  make_resolv_conf
-+  exit_with_hooks 0
-+  ip link set $interface down
-+  ip addr flush dev $interface
-   exit_with_hooks 1
- fi
- 

diff --git a/src/patches/gcc-4.1.2-fix_linker_version_detection.patch b/src/patches/gcc-4.1.2-fix_linker_version_detection.patch
new file mode 100644 (file)
index 0000000..c2f43be
--- /dev/null
+++ b/src/patches/gcc-4.1.2-fix_linker_version_detection.patch
@@ -0,0 +1,12 @@
+diff -Naur gcc-4.1.2.org/libstdc++-v3/configure gcc-4.1.2/libstdc++-v3/configure
+--- gcc-4.1.2.org/libstdc++-v3/configure       2007-01-29 11:51:01.000000000 +0100
++++ gcc-4.1.2/libstdc++-v3/configure   2011-08-29 19:25:22.973430586 +0200
+@@ -8281,7 +8281,7 @@
+   if test x"$with_gnu_ld" = x"yes"; then
+ 
+     ldver=`$LD --version 2>/dev/null | head -1 | \
+-           sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
++           sed -e 's/GNU ld (GNU binutils) \([0-9.][0-9.]*\).*/\1/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+            $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`

diff --git a/src/patches/gcc-4.1.2-specs-1.patch b/src/patches/gcc-4.1.2-specs-1.patch
new file mode 100644 (file)
index 0000000..16eef76
--- /dev/null
+++ b/src/patches/gcc-4.1.2-specs-1.patch
@@ -0,0 +1,337 @@
+Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
+Date: 2006-02-17
+Initial Package Version: 4.1.0
+Upstream Status: Not Sent - LFS Specific
+Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
+        the Pure LFS project.
+        More architectures added by Zack Winkles.
+        Further fine tunings by Greg Schafer.
+        Modified for gcc 3.3.2 by Oliver Brakmann.
+        Rediffed against gcc 3.4.0 by Zack Winkles.
+        Rediffed against gcc 3.4.3 by Jim Gifford.
+        Rediffed against gcc 4.0.0 by Robert Connolly.
+        Rediffed against gcc 4.1.0 by Chris Staub
+Description: This patch modifies the location of the dynamic linker for
+        the GCC Pass 2 build in LFS Chapter 5.
+
+diff -Naur gcc-4.1.0.orig/gcc/config/alpha/linux-elf.h gcc-4.1.0/gcc/config/alpha/linux-elf.h
+--- gcc-4.1.0.orig/gcc/config/alpha/linux-elf.h        2005-06-24 21:22:41.000000000 -0400
++++ gcc-4.1.0/gcc/config/alpha/linux-elf.h     2006-02-28 22:02:20.000000000 -0500
+@@ -27,7 +27,7 @@
+ #define SUBTARGET_EXTRA_SPECS \
+ { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
+ 
+-#define ELF_DYNAMIC_LINKER    "/lib/ld-linux.so.2"
++#define ELF_DYNAMIC_LINKER    "/tools/lib/ld-linux.so.2"
+ 
+ #define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}                \
+   %{O*:-O3} %{!O*:-O1}                                                \
+diff -Naur gcc-4.1.0.orig/gcc/config/arm/linux-elf.h gcc-4.1.0/gcc/config/arm/linux-elf.h
+--- gcc-4.1.0.orig/gcc/config/arm/linux-elf.h  2005-10-09 21:04:31.000000000 -0400
++++ gcc-4.1.0/gcc/config/arm/linux-elf.h       2006-02-28 22:02:20.000000000 -0500
+@@ -51,7 +51,7 @@
+ 
+ #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
+ 
+-#define LINUX_TARGET_INTERPRETER "/lib/ld-linux.so.2"
++#define LINUX_TARGET_INTERPRETER "/tools/lib/ld-linux.so.2"
+ 
+ #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
+    %{b} \
+diff -Naur gcc-4.1.0.orig/gcc/config/frv/linux.h gcc-4.1.0/gcc/config/frv/linux.h
+--- gcc-4.1.0.orig/gcc/config/frv/linux.h      2005-06-24 21:22:41.000000000 -0400
++++ gcc-4.1.0/gcc/config/frv/linux.h   2006-02-28 22:02:20.000000000 -0500
+@@ -41,7 +41,7 @@
+   %{mfdpic: -m elf32frvfd -z text} %{shared} %{pie} \
+   %{!shared: %{!static: \
+    %{rdynamic:-export-dynamic} \
+-   %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
++   %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
+    %{static}}"
+ 
+ /* Support for compile-time default CPU.  */
+diff -Naur gcc-4.1.0.orig/gcc/config/i386/gnu.h gcc-4.1.0/gcc/config/i386/gnu.h
+--- gcc-4.1.0.orig/gcc/config/i386/gnu.h       2004-09-07 20:17:19.000000000 -0400
++++ gcc-4.1.0/gcc/config/i386/gnu.h    2006-02-28 22:02:21.000000000 -0500
+@@ -27,7 +27,7 @@
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+-      %{!dynamic-linker:-dynamic-linker /lib/ld.so}} \
++      %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so}} \
+     %{static:-static}}"
+ 
+ #undef        STARTFILE_SPEC
+diff -Naur gcc-4.1.0.orig/gcc/config/i386/linux.h gcc-4.1.0/gcc/config/i386/linux.h
+--- gcc-4.1.0.orig/gcc/config/i386/linux.h     2005-08-10 13:53:01.000000000 -0400
++++ gcc-4.1.0/gcc/config/i386/linux.h  2006-02-28 22:02:21.000000000 -0500
+@@ -105,7 +105,7 @@
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
+ #define LINK_EMULATION "elf_i386"
+-#define DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+ 
+ #undef  SUBTARGET_EXTRA_SPECS
+ #define SUBTARGET_EXTRA_SPECS \
+diff -Naur gcc-4.1.0.orig/gcc/config/i386/linux64.h gcc-4.1.0/gcc/config/i386/linux64.h
+--- gcc-4.1.0.orig/gcc/config/i386/linux64.h   2005-08-10 13:53:01.000000000 -0400
++++ gcc-4.1.0/gcc/config/i386/linux64.h        2006-02-28 22:02:21.000000000 -0500
+@@ -60,8 +60,8 @@
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+-      %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
+-      %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
++      %{m32:%{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}} \
++      %{!m32:%{!dynamic-linker:-dynamic-linker /tools/lib64/ld-linux-x86-64.so.2}}} \
+     %{static:-static}}"
+ 
+ /* Similar to standard Linux, but adding -ffast-math support.  */
+diff -Naur gcc-4.1.0.orig/gcc/config/ia64/linux.h gcc-4.1.0/gcc/config/ia64/linux.h
+--- gcc-4.1.0.orig/gcc/config/ia64/linux.h     2004-09-07 20:17:19.000000000 -0400
++++ gcc-4.1.0/gcc/config/ia64/linux.h  2006-02-28 22:02:21.000000000 -0500
+@@ -43,7 +43,7 @@
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+-      %{!dynamic-linker:-dynamic-linker /lib/ld-linux-ia64.so.2}} \
++      %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux-ia64.so.2}} \
+       %{static:-static}}"
+ 
+ 
+diff -Naur gcc-4.1.0.orig/gcc/config/linux.h gcc-4.1.0/gcc/config/linux.h
+--- gcc-4.1.0.orig/gcc/config/linux.h  2005-08-06 09:26:35.000000000 -0400
++++ gcc-4.1.0/gcc/config/linux.h       2006-02-28 22:02:21.000000000 -0500
+@@ -104,3 +104,7 @@
+ #define TARGET_C99_FUNCTIONS 1
+ 
+ #define TARGET_POSIX_IO
++
++/* Remove /usr/include from the end of the include search path.  */
++#undef STANDARD_INCLUDE_DIR
++#define STANDARD_INCLUDE_DIR 0
+diff -Naur gcc-4.1.0.orig/gcc/config/m32r/linux.h gcc-4.1.0/gcc/config/m32r/linux.h
+--- gcc-4.1.0.orig/gcc/config/m32r/linux.h     2005-07-08 06:00:15.000000000 -0400
++++ gcc-4.1.0/gcc/config/m32r/linux.h  2006-02-28 22:02:21.000000000 -0500
+@@ -66,7 +66,7 @@
+     %{!ibcs: \
+       %{!static: \
+       %{rdynamic:-export-dynamic} \
+-      %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
++      %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}} \
+       %{static:-static}}}"
+ #else
+ #define LINK_SPEC "%(link_cpu) -m m32relf_linux %{shared:-shared} \
+@@ -74,7 +74,7 @@
+     %{!ibcs: \
+       %{!static: \
+       %{rdynamic:-export-dynamic} \
+-      %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
++      %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}} \
+       %{static:-static}}}"
+ #endif
+ 
+diff -Naur gcc-4.1.0.orig/gcc/config/m68k/linux.h gcc-4.1.0/gcc/config/m68k/linux.h
+--- gcc-4.1.0.orig/gcc/config/m68k/linux.h     2005-06-24 21:22:41.000000000 -0400
++++ gcc-4.1.0/gcc/config/m68k/linux.h  2006-02-28 22:02:21.000000000 -0500
+@@ -128,7 +128,7 @@
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+-      %{!dynamic-linker*:-dynamic-linker /lib/ld.so.1}} \
++      %{!dynamic-linker*:-dynamic-linker /tools/lib/ld.so.1}} \
+     %{static}}"
+ 
+ /* For compatibility with linux/a.out */
+diff -Naur gcc-4.1.0.orig/gcc/config/mips/linux.h gcc-4.1.0/gcc/config/mips/linux.h
+--- gcc-4.1.0.orig/gcc/config/mips/linux.h     2005-06-24 21:22:41.000000000 -0400
++++ gcc-4.1.0/gcc/config/mips/linux.h  2006-02-28 22:02:21.000000000 -0500
+@@ -112,7 +112,7 @@
+     %{!ibcs: \
+       %{!static: \
+         %{rdynamic:-export-dynamic} \
+-        %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
++        %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
+         %{static:-static}}}"
+ 
+ #undef SUBTARGET_ASM_SPEC
+diff -Naur gcc-4.1.0.orig/gcc/config/mips/linux64.h gcc-4.1.0/gcc/config/mips/linux64.h
+--- gcc-4.1.0.orig/gcc/config/mips/linux64.h   2005-06-24 21:22:41.000000000 -0400
++++ gcc-4.1.0/gcc/config/mips/linux64.h        2006-02-28 22:02:21.000000000 -0500
+@@ -47,9 +47,9 @@
+       %{!static: \
+         %{rdynamic:-export-dynamic} \
+         %{!dynamic-linker: \
+-        %{mabi=n32: -dynamic-linker /lib32/ld.so.1} \
+-        %{mabi=64: -dynamic-linker /lib64/ld.so.1} \
+-        %{mabi=32: -dynamic-linker /lib/ld.so.1}}} \
++        %{mabi=n32: -dynamic-linker /tools/lib32/ld.so.1} \
++        %{mabi=64: -dynamic-linker /tools/lib64/ld.so.1} \
++        %{mabi=32: -dynamic-linker /tools/lib/ld.so.1}}} \
+       %{static:-static}}} \
+ %{mabi=n32:-melf32%{EB:b}%{EL:l}tsmipn32} \
+ %{mabi=64:-melf64%{EB:b}%{EL:l}tsmip} \
+diff -Naur gcc-4.1.0.orig/gcc/config/mn10300/linux.h gcc-4.1.0/gcc/config/mn10300/linux.h
+--- gcc-4.1.0.orig/gcc/config/mn10300/linux.h  2005-06-24 21:22:41.000000000 -0400
++++ gcc-4.1.0/gcc/config/mn10300/linux.h       2006-02-28 22:02:21.000000000 -0500
+@@ -37,7 +37,7 @@
+ #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
+    %{!static: \
+      %{rdynamic:-export-dynamic} \
+-     %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
++     %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
+    %{static:-static}"
+ 
+ #undef  PROCESSOR_DEFAULT
+diff -Naur gcc-4.1.0.orig/gcc/config/pa/pa-linux.h gcc-4.1.0/gcc/config/pa/pa-linux.h
+--- gcc-4.1.0.orig/gcc/config/pa/pa-linux.h    2005-11-17 22:22:18.000000000 -0500
++++ gcc-4.1.0/gcc/config/pa/pa-linux.h 2006-02-28 22:02:21.000000000 -0500
+@@ -55,7 +55,7 @@
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+-      %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
++      %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
+       %{static:-static}}"
+ 
+ /* glibc's profiling functions don't need gcc to allocate counters.  */
+diff -Naur gcc-4.1.0.orig/gcc/config/rs6000/linux64.h gcc-4.1.0/gcc/config/rs6000/linux64.h
+--- gcc-4.1.0.orig/gcc/config/rs6000/linux64.h 2006-02-10 15:58:33.000000000 -0500
++++ gcc-4.1.0/gcc/config/rs6000/linux64.h      2006-02-28 22:02:21.000000000 -0500
+@@ -339,11 +339,11 @@
+ 
+ #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+-  %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
++  %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
+ 
+ #define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+-  %{!dynamic-linker:-dynamic-linker /lib64/ld64.so.1}}}"
++  %{!dynamic-linker:-dynamic-linker /tools/lib64/ld64.so.1}}}"
+ 
+ #undef  TOC_SECTION_ASM_OP
+ #define TOC_SECTION_ASM_OP \
+diff -Naur gcc-4.1.0.orig/gcc/config/rs6000/sysv4.h gcc-4.1.0/gcc/config/rs6000/sysv4.h
+--- gcc-4.1.0.orig/gcc/config/rs6000/sysv4.h   2006-02-10 15:58:33.000000000 -0500
++++ gcc-4.1.0/gcc/config/rs6000/sysv4.h        2006-02-28 22:02:21.000000000 -0500
+@@ -1041,7 +1041,7 @@
+ 
+ #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+-  %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
++  %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
+ 
+ #if defined(HAVE_LD_EH_FRAME_HDR)
+ # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
+@@ -1072,7 +1072,7 @@
+ 
+ #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+-  %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
++  %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
+ 
+ #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__  \
+ %{!undef:                                                     \
+diff -Naur gcc-4.1.0.orig/gcc/config/s390/linux.h gcc-4.1.0/gcc/config/s390/linux.h
+--- gcc-4.1.0.orig/gcc/config/s390/linux.h     2006-02-11 03:38:51.000000000 -0500
++++ gcc-4.1.0/gcc/config/s390/linux.h  2006-02-28 22:02:21.000000000 -0500
+@@ -86,8 +86,8 @@
+       %{!static: \
+       %{rdynamic:-export-dynamic} \
+       %{!dynamic-linker: \
+-          %{m31:-dynamic-linker /lib/ld.so.1} \
+-          %{m64:-dynamic-linker /lib/ld64.so.1}}}}"
++          %{m31:-dynamic-linker /tools/lib/ld.so.1} \
++          %{m64:-dynamic-linker /tools/lib/ld64.so.1}}}}"
+ 
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+diff -Naur gcc-4.1.0.orig/gcc/config/sh/linux.h gcc-4.1.0/gcc/config/sh/linux.h
+--- gcc-4.1.0.orig/gcc/config/sh/linux.h       2005-06-24 21:22:41.000000000 -0400
++++ gcc-4.1.0/gcc/config/sh/linux.h    2006-02-28 22:02:21.000000000 -0500
+@@ -60,7 +60,7 @@
+   "%{shared:-shared} \
+    %{!static: \
+      %{rdynamic:-export-dynamic} \
+-     %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
++     %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}} \
+    %{static:-static}"
+ 
+ /* Output assembler code to STREAM to call the profiler.  */
+diff -Naur gcc-4.1.0.orig/gcc/config/sparc/linux.h gcc-4.1.0/gcc/config/sparc/linux.h
+--- gcc-4.1.0.orig/gcc/config/sparc/linux.h    2006-02-11 03:38:51.000000000 -0500
++++ gcc-4.1.0/gcc/config/sparc/linux.h 2006-02-28 22:02:21.000000000 -0500
+@@ -126,13 +126,13 @@
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+         %{rdynamic:-export-dynamic} \
+-        %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
++        %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}} \
+         %{static:-static}}}"
+ 
+ /* The sun bundled assembler doesn't accept -Yd, (and neither does gas).
+diff -Naur gcc-4.1.0.orig/gcc/config/sparc/linux64.h gcc-4.1.0/gcc/config/sparc/linux64.h
+--- gcc-4.1.0.orig/gcc/config/sparc/linux64.h  2006-02-11 03:38:51.000000000 -0500
++++ gcc-4.1.0/gcc/config/sparc/linux64.h       2006-02-28 22:02:21.000000000 -0500
+@@ -162,21 +162,21 @@
+   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },      \
+   { "link_arch",       LINK_ARCH_SPEC },
+     
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/tools/lib %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+         %{rdynamic:-export-dynamic} \
+-        %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
++        %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}} \
+         %{static:-static}}} \
+ "
+ 
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/tools/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+         %{rdynamic:-export-dynamic} \
+-        %{!dynamic-linker:-dynamic-linker /lib64/ld-linux.so.2}} \
++        %{!dynamic-linker:-dynamic-linker /tools/lib64/ld-linux.so.2}} \
+         %{static:-static}}} \
+ "
+ 
+@@ -252,12 +252,12 @@
+ #else /* !SPARC_BI_ARCH */
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc -Y P,/tools/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+         %{rdynamic:-export-dynamic} \
+-        %{!dynamic-linker:-dynamic-linker /lib64/ld-linux.so.2}} \
++        %{!dynamic-linker:-dynamic-linker /tools/lib64/ld-linux.so.2}} \
+         %{static:-static}}} \
+ %{mlittle-endian:-EL} \
+ %{!mno-relax:%{!r:-relax}} \
+diff -Naur gcc-4.1.0.orig/gcc/config/xtensa/linux.h gcc-4.1.0/gcc/config/xtensa/linux.h
+--- gcc-4.1.0.orig/gcc/config/xtensa/linux.h   2005-06-24 21:22:41.000000000 -0400
++++ gcc-4.1.0/gcc/config/xtensa/linux.h        2006-02-28 22:02:21.000000000 -0500
+@@ -50,7 +50,7 @@
+     %{!ibcs: \
+       %{!static: \
+         %{rdynamic:-export-dynamic} \
+-        %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
++        %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
+       %{static:-static}}}"
+ 
+ #undef LOCAL_LABEL_PREFIX

diff --git a/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch b/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch
new file mode 100644 (file)
index 0000000..331e8a1
--- /dev/null
+++ b/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch
@@ -0,0 +1,45 @@
+diff -Naur kvm-kmod-2.6.38.6.org/x86/external-module-compat.h kvm-kmod-2.6.38.6/x86/external-module-compat.h
+--- kvm-kmod-2.6.38.6.org/x86/external-module-compat.h 2011-05-15 09:34:48.000000000 +0200
++++ kvm-kmod-2.6.38.6/x86/external-module-compat.h     2011-05-21 13:30:50.529469540 +0200
+@@ -1064,41 +1064,6 @@
+ 
+ #endif /* >= 2.6.36 */
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+-static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift)
+-{
+-      u64 product;
+-#ifdef __i386__
+-      u32 tmp1, tmp2;
+-#endif
+-
+-      if (shift < 0)
+-              delta >>= -shift;
+-      else
+-              delta <<= shift;
+-
+-#ifdef __i386__
+-      __asm__ (
+-              "mul  %5       ; "
+-              "mov  %4,%%eax ; "
+-              "mov  %%edx,%4 ; "
+-              "mul  %5       ; "
+-              "xor  %5,%5    ; "
+-              "add  %4,%%eax ; "
+-              "adc  %5,%%edx ; "
+-              : "=A" (product), "=r" (tmp1), "=r" (tmp2)
+-              : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) );
+-#elif defined(__x86_64__)
+-      __asm__ (
+-              "mul %%rdx ; shrd $32,%%rdx,%%rax"
+-              : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) );
+-#else
+-#error implement me!
+-#endif
+-
+-      return product;
+-}
+-#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) && \
+     LINUX_VERSION_CODE != KERNEL_VERSION(2,6,32) && defined(CONFIG_X86_64)

diff --git a/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch b/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch
new file mode 100644 (file)
index 0000000..87effb3
--- /dev/null
+++ b/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch
@@ -0,0 +1,12 @@
+diff -Naur kvm-kmod-3.0b.org/x86/external-module-compat.h kvm-kmod-3.0b/x86/external-module-compat.h
+--- kvm-kmod-3.0b.org/x86/external-module-compat.h     2011-07-23 16:39:10.000000000 +0200
++++ kvm-kmod-3.0b/x86/external-module-compat.h 2011-08-13 21:37:56.046677541 +0200
+@@ -1095,7 +1095,7 @@
+ 
+ #endif /* >= 2.6.36 */
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) || \
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) && \
+     (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,32) && KERNEL_EXTRAVERSION < 40)
+ static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift)
+ {

diff --git a/src/patches/libsatsolver-Build-only-libraries.patch b/src/patches/libsatsolver-Build-only-libraries.patch
deleted file mode 100644 (file)
index 47e24e4..0000000
--- a/src/patches/libsatsolver-Build-only-libraries.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur old/CMakeLists.txt new/CMakeLists.txt
---- old/CMakeLists.txt 2011-04-10 23:55:09.506257000 +0200
-+++ new/CMakeLists.txt 2011-04-10 23:46:30.612257002 +0200
-@@ -32,7 +32,7 @@
- INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake )
- 
- FIND_PACKAGE(EXPAT REQUIRED)
--FIND_PACKAGE(Check REQUIRED)
-+#FIND_PACKAGE(Check REQUIRED)
- FIND_PACKAGE(ZLIB REQUIRED)
- 
- IF ( FEDORA )
-@@ -190,10 +190,10 @@
- 
- ADD_SUBDIRECTORY(src)
- ADD_SUBDIRECTORY(ext)
--ADD_SUBDIRECTORY(tools)
--ADD_SUBDIRECTORY(tests)
--ADD_SUBDIRECTORY(examples)
--ADD_SUBDIRECTORY(doc)
-+#ADD_SUBDIRECTORY(tools)
-+#ADD_SUBDIRECTORY(tests)
-+#ADD_SUBDIRECTORY(examples)
-+#ADD_SUBDIRECTORY(doc)
- 
- MESSAGE(STATUS "version: ${VERSION}")

diff --git a/src/patches/libsatsolver-Create-linker-scripts-that-do-only-export-the-needed.patch b/src/patches/libsatsolver-Create-linker-scripts-that-do-only-export-the-needed.patch
deleted file mode 100644 (file)
index 5ba4fa2..0000000
--- a/src/patches/libsatsolver-Create-linker-scripts-that-do-only-export-the-needed.patch
+++ /dev/null
@@ -1,439 +0,0 @@
->From a42d7e17fa3e39a8306126c19f1b3b54f1fdd79e Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Thu, 21 Apr 2011 16:40:11 +0200
-Subject: [PATCH] Create linker-scripts that do only export the needed symbols
- of libsatsolver{,ext}.
-
-See these posts for reference:
-       http://lists.opensuse.org/zypp-devel/2011-04/msg00012.html
-       http://lists.opensuse.org/zypp-devel/2011-04/msg00014.html
-
-Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
----
- ext/CMakeLists.txt      |    1 +
- ext/libsatsolverext.ver |   25 ++++
- src/CMakeLists.txt      |    1 +
- src/libsatsolver.ver    |  355 +++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 382 insertions(+), 0 deletions(-)
- create mode 100644 ext/libsatsolverext.ver
- create mode 100644 src/libsatsolver.ver
-
-diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
-index 68e1c3c..d51a43b 100644
---- a/ext/CMakeLists.txt
-+++ b/ext/CMakeLists.txt
-@@ -21,6 +21,7 @@ SET(libsatsolverext_HEADERS
-     tools_util.h repo_deb.h sat_xfopen.h)
- 
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-+SET(CMAKE_SHARED_LINKER_FLAGS "${LINK_FLAGS} -Wl,--version-script=${satsolver_SOURCE_DIR}/ext/libsatsolverext.ver")
- 
- INSTALL(FILES ${libsatsolverext_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/satsolver")
- INSTALL(TARGETS satsolverext LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
-diff --git a/ext/libsatsolverext.ver b/ext/libsatsolverext.ver
-new file mode 100644
-index 0000000..4869d37
---- /dev/null
-+++ b/ext/libsatsolverext.ver
-@@ -0,0 +1,25 @@
-+EXT1.0 {
-+      global:
-+              repo_add_code11_products;
-+              repo_add_content;
-+              repo_add_deb;
-+              repo_add_debdb;
-+              repo_add_debpackages;
-+              repo_add_debs;
-+              repo_add_deltainfoxml;
-+              repo_add_helix;
-+              repo_add_products;
-+              repo_add_releasefile_products;
-+              repo_add_repomdxml;
-+              repo_add_rpmmd;
-+              repo_add_susetags;
-+              repo_add_updateinfoxml;
-+              repo_add_zyppdb_products;
-+              repodata_write;
-+              repo_write;
-+              repo_write_stdkeyfilter;
-+              sat_xfopen;
-+              sat_xfopen_fd;
-+      local:
-+              *;
-+};
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6a14d10..b54d01d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -20,6 +20,7 @@ SET(libsatsolver_HEADERS
-     chksum.h md5.h sha1.h sha2.h ${CMAKE_BINARY_DIR}/src/satversion.h)
- 
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-+SET(CMAKE_SHARED_LINKER_FLAGS "${LINK_FLAGS} -Wl,--version-script=${satsolver_SOURCE_DIR}/src/libsatsolver.ver")
- 
- INSTALL(FILES ${libsatsolver_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/satsolver")
- INSTALL(TARGETS satsolver LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
-diff --git a/src/libsatsolver.ver b/src/libsatsolver.ver
-new file mode 100644
-index 0000000..dab3576
---- /dev/null
-+++ b/src/libsatsolver.ver
-@@ -0,0 +1,355 @@
-+SAT1.0 {
-+      global:
-+              dataiterator_clonepos;
-+              dataiterator_entersub;
-+              dataiterator_free;
-+              dataiterator_init;
-+              dataiterator_init_clone;
-+              dataiterator_jump_to_repo;
-+              dataiterator_jump_to_solvid;
-+              dataiterator_match;
-+              dataiterator_prepend_keyname;
-+              dataiterator_seek;
-+              dataiterator_set_keyname;
-+              dataiterator_set_match;
-+              dataiterator_setpos;
-+              dataiterator_setpos_parent;
-+              dataiterator_set_search;
-+              dataiterator_skip_attribute;
-+              dataiterator_skip_repo;
-+              dataiterator_skip_solvable;
-+              dataiterator_step;
-+              datamatcher_free;
-+              datamatcher_init;
-+              datamatcher_match;
-+              data_read_idarray;
-+              data_read_rel_idarray;
-+              data_skip_key;
-+              dep2str;
-+              dirpool_add_dir;
-+              dirpool_free;
-+              dirpool_init;
-+              dirpool_make_dirtraverse;
-+              evrcmp;
-+              evrmatch;
-+              id2str;
-+              map_free;
-+              map_grow;
-+              map_init;
-+              map_init_clone;
-+              policy_create_obsolete_index;
-+              policy_filter_unwanted;
-+              policy_findupdatepackages;
-+              policy_illegal2str;
-+              policy_illegal_archchange;
-+              policy_illegal_vendorchange;
-+              policy_is_illegal;
-+              pool_add_fileconflicts_deps;
-+              pool_addfileprovides;
-+              pool_addfileprovides_ids;
-+              pool_addrelproviders;
-+              pool_add_solvable;
-+              pool_add_solvable_block;
-+              pool_alloctmpspace;
-+              pool_arch2color_slow;
-+              pool_bin2hex;
-+              pool_calc_duchanges;
-+              pool_calc_installsizechange;
-+              pool_clear_pos;
-+              pool_create;
-+              pool_create_state_maps;
-+              pool_createwhatprovides;
-+              pool_debug;
-+              pool_free;
-+              pool_freeidhashes;
-+              pool_free_solvable_block;
-+              pool_freetmpspace;
-+              pool_freewhatprovides;
-+              pool_id2langid;
-+              pool_job2str;
-+              pool_lookup_bin_checksum;
-+              pool_lookup_checksum;
-+              pool_lookup_id;
-+              pool_lookup_num;
-+              pool_lookup_str;
-+              pool_lookup_void;
-+              pool_match_dep;
-+              pool_match_nevr_rel;
-+              pool_queuetowhatprovides;
-+              pool_search;
-+              pool_setarch;
-+              pool_setarchpolicy;
-+              pool_setdebuglevel;
-+              pool_set_installed;
-+              pool_set_languages;
-+              pool_setvendorclasses;
-+              pool_shrink_rels;
-+              pool_shrink_strings;
-+              pool_tmpappend;
-+              pool_tmpjoin;
-+              pool_trivial_installable;
-+              pool_trivial_installable_noobsoletesmap;
-+              pool_vendor2mask;
-+              prune_best_arch_name_version;
-+              prune_to_best_arch;
-+              prune_to_best_version;
-+              queue_alloc_one;
-+              queue_alloc_one_head;
-+              queue_delete;
-+              queue_delete2;
-+              queue_deleten;
-+              queue_free;
-+              queue_init;
-+              queue_init_buffer;
-+              queue_init_clone;
-+              queue_insert;
-+              queue_insert2;
-+              queue_insertn;
-+              rel2id;
-+              repo_addid;
-+              repo_addid_dep;
-+              repo_add_poolstr_array;
-+              repo_add_repodata;
-+              repo_add_solv;
-+              repo_add_solv_flags;
-+              repo_create;
-+              repodata_add_dirnumnum;
-+              repodata_add_dirstr;
-+              repodata_add_fixarray;
-+              repodata_add_flexarray;
-+              repodata_add_idarray;
-+              repodata_add_poolstr_array;
-+              repodata_chk2str;
-+              repodata_create;
-+              repodata_create_stubs;
-+              repodata_delete;
-+              repodata_delete_uninternalized;
-+              repodata_dir2str;
-+              repodata_disable_paging;
-+              repodata_empty;
-+              repodata_extend;
-+              repodata_extend_block;
-+              repodata_filelistfilter_matches;
-+              repodata_free;
-+              repodata_freedata;
-+              repodata_free_schemahash;
-+              repodata_globalize_id;
-+              repodata_initdata;
-+              repodata_internalize;
-+              repodata_key2id;
-+              repodata_localize_id;
-+              repodata_lookup_bin_checksum;
-+              repodata_lookup_id;
-+              repodata_lookup_idarray;
-+              repodata_lookup_num;
-+              repodata_lookup_str;
-+              repodata_lookup_type;
-+              repodata_lookup_void;
-+              repodata_merge_attrs;
-+              repodata_merge_some_attrs;
-+              repodata_new_handle;
-+              repodata_schema2id;
-+              repodata_search;
-+              repodata_set_binary;
-+              repodata_set_bin_checksum;
-+              repodata_set_checksum;
-+              repodata_set_constant;
-+              repodata_set_constantid;
-+              repodata_set_id;
-+              repodata_set_idarray;
-+              repodata_set_location;
-+              repodata_set_num;
-+              repodata_set_poolstr;
-+              repodata_setpos_kv;
-+              repodata_set_str;
-+              repodata_set_void;
-+              repodata_shrink;
-+              repodata_str2dir;
-+              repodata_stringify;
-+              repo_disable_paging;
-+              repo_empty;
-+              repo_fix_conflicts;
-+              repo_fix_supplements;
-+              repo_free;
-+              repo_freeallrepos;
-+              repo_free_solvable_block;
-+              repo_internalize;
-+              repo_last_repodata;
-+              repo_lookup_bin_checksum;
-+              repo_lookup_checksum;
-+              repo_lookup_id;
-+              repo_lookup_idarray;
-+              repo_lookup_num;
-+              repo_lookup_str;
-+              repo_lookup_type;
-+              repo_lookup_void;
-+              repo_matchvalue;
-+              repopagestore_compress_page;
-+              repopagestore_disable_paging;
-+              repopagestore_free;
-+              repopagestore_init;
-+              repopagestore_load_page_range;
-+              repopagestore_read_or_setup_pages;
-+              repo_reserve_ids;
-+              repo_search;
-+              repo_set_id;
-+              repo_set_num;
-+              repo_set_poolstr;
-+              repo_set_str;
-+              repo_sidedata_create;
-+              repo_sidedata_extend;
-+              sat_bin2hex;
-+              sat_calloc;
-+              sat_chksum_add;
-+              sat_chksum_create;
-+              sat_chksum_create_from_bin;
-+              sat_chksum_free;
-+              sat_chksum_get;
-+              sat_chksum_get_type;
-+              sat_chksum_isfinished;
-+              sat_chksum_str2type;
-+              sat_chksum_type2str;
-+              sat_dupappend;
-+              sat_dupjoin;
-+              sat_free;
-+              sat_hex2bin;
-+              sat_malloc;
-+              sat_malloc2;
-+              sat_MD5_Final;
-+              sat_MD5_Init;
-+              sat_MD5_Update;
-+              sat_oom;
-+              sat_realloc;
-+              sat_realloc2;
-+              sat_SHA1_Final;
-+              sat_SHA1_Init;
-+              sat_SHA1_Update;
-+              sat_SHA256_Data;
-+              sat_SHA256_End;
-+              sat_SHA256_Final;
-+              sat_SHA256_Init;
-+              sat_SHA256_Update;
-+              sat_SHA384_Data;
-+              sat_SHA384_End;
-+              sat_SHA384_Final;
-+              sat_SHA384_Init;
-+              sat_SHA384_Update;
-+              sat_SHA512_Data;
-+              sat_SHA512_End;
-+              sat_SHA512_Final;
-+              sat_SHA512_Init;
-+              sat_SHA512_Update;
-+              sat_sort;
-+              sat_timems;
-+              sat_version;
-+              sat_version_major;
-+              sat_version_minor;
-+              sat_version_patch;
-+              solvable2str;
-+              solvable_get_location;
-+              solvable_identical;
-+              solvable_lookup_bin_checksum;
-+              solvable_lookup_bool;
-+              solvable_lookup_checksum;
-+              solvable_lookup_id;
-+              solvable_lookup_idarray;
-+              solvable_lookup_num;
-+              solvable_lookup_str;
-+              solvable_lookup_str_lang;
-+              solvable_lookup_str_poollang;
-+              solvable_lookup_void;
-+              solvable_selfprovidedep;
-+              solvable_trivial_installable_map;
-+              solvable_trivial_installable_queue;
-+              solvable_trivial_installable_repo;
-+              solver_addchoicerules;
-+              solver_addduprules;
-+              solver_addinfarchrules;
-+              solver_addrpmrulesforsolvable;
-+              solver_addrpmrulesforupdaters;
-+              solver_addrpmrulesforweak;
-+              solver_addrule;
-+              solver_addupdaterule;
-+              solver_allruleinfos;
-+              solver_calc_duchanges;
-+              solver_calc_installsizechange;
-+              solver_calculate_noobsmap;
-+              solver_create;
-+              solver_create_decisions_obsoletesmap;
-+              solver_createdupmaps;
-+              solver_dep_installed;
-+              solver_disablechoicerules;
-+              solver_disablepolicyrules;
-+              solver_disableproblem;
-+              solver_enableproblem;
-+              solver_findallproblemrules;
-+              solver_findproblemrule;
-+              solver_free;
-+              solver_freedupmaps;
-+              solver_next_problem;
-+              solver_next_solution;
-+              solver_next_solutionelement;
-+              solver_prepare_solutions;
-+              solver_printallsolutions;
-+              solver_printcompleteprobleminfo;
-+              solver_printdecisionq;
-+              solver_printdecisions;
-+              solver_printproblem;
-+              solver_printprobleminfo;
-+              solver_printproblemruleinfo;
-+              solver_printrule;
-+              solver_printruleclass;
-+              solver_printruleelement;
-+              solver_printsolution;
-+              solver_printtransaction;
-+              solver_printtrivial;
-+              solver_printwatches;
-+              solver_problem_count;
-+              solver_problemruleinfo;
-+              solver_problemruleinfo2str;
-+              solver_reenablepolicyrules;
-+              solver_reset;
-+              solver_ruleinfo;
-+              solver_run_sat;
-+              solver_samerule;
-+              solver_select2str;
-+              solver_solution_count;
-+              solver_solutionelement2str;
-+              solver_solutionelement_count;
-+              solver_solve;
-+              solver_splitprovides;
-+              solver_take_solution;
-+              solver_take_solutionelement;
-+              solver_trivial_installable;
-+              solver_unifyrules;
-+              str2id;
-+              strn2id;
-+              stringpool_clone;
-+              stringpool_free;
-+              stringpool_freehash;
-+              stringpool_init;
-+              stringpool_init_empty;
-+              stringpool_shrink;
-+              stringpool_str2id;
-+              stringpool_strn2id;
-+              transaction_add_obsoleted;
-+              transaction_all_obs_pkgs;
-+              transaction_calc_duchanges;
-+              transaction_calc_installsizechange;
-+              transaction_calculate;
-+              transaction_check_order;
-+              transaction_classify;
-+              transaction_classify_pkgs;
-+              transaction_free;
-+              transaction_free_orderdata;
-+              transaction_init;
-+              transaction_init_clone;
-+              transaction_installedresult;
-+              transaction_obs_pkg;
-+              transaction_order;
-+              transaction_order_add_choices;
-+              transaction_type;
-+              vercmp;
-+      local:
-+              *;
-+};
--- 
-1.7.4.4
-

diff --git a/src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch b/src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch
deleted file mode 100644 (file)
index 449275c..0000000
--- a/src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch
+++ /dev/null
@@ -1,94 +0,0 @@
->From 1f9659b55013f222046b9d161fd5a0f2fc399cb8 Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Thu, 21 Apr 2011 12:48:41 +0200
-Subject: [PATCH] Make libsatsolver{,ext} a versioned shared lib.
-
-Most distributions only do accept shared libraries because of
-relro and hardening stuff.
-
-Previously, libsatsolver was statically compiled because the ABI
-was assumed to be changed from time to time but has now become
-very stable.
-
-Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
----
- ext/CMakeLists.txt   |    6 +++++-
- src/CMakeLists.txt   |    6 +++++-
- tools/CMakeLists.txt |   12 ++++++------
- 3 files changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
-index 8e71eee..68e1c3c 100644
---- a/ext/CMakeLists.txt
-+++ b/ext/CMakeLists.txt
-@@ -8,7 +8,11 @@ SET(libsatsolverext_SRCS
-     ${libsatsolverext_SRCS} pool_fileconflicts.c repo_rpmdb.c)
- ENDIF (NOT DEBIAN)
- 
--ADD_LIBRARY(satsolverext STATIC ${libsatsolverext_SRCS})
-+ADD_LIBRARY(satsolverext SHARED ${libsatsolverext_SRCS})
-+SET_TARGET_PROPERTIES(satsolverext PROPERTIES
-+        VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}"
-+        SOVERSION "${LIBSATSOLVER_MAJOR}"
-+)
- 
- SET(libsatsolverext_HEADERS
-     pool_fileconflicts.h repo_content.h repo_deltainfoxml.h repo_helix.h repo_products.h
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9bd0fde..6a14d10 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -6,7 +6,11 @@ SET(libsatsolver_SRCS
-     transaction.c rules.c problems.c
-     chksum.c md5.c sha1.c sha2.c satversion.c)
- 
--ADD_LIBRARY(satsolver STATIC ${libsatsolver_SRCS})
-+ADD_LIBRARY(satsolver SHARED ${libsatsolver_SRCS})
-+SET_TARGET_PROPERTIES(satsolver PROPERTIES
-+      VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}"
-+      SOVERSION "${LIBSATSOLVER_MAJOR}"
-+)
- 
- SET(libsatsolver_HEADERS
-     bitmap.h evr.h hash.h policy.h poolarch.h poolvendor.h pool.h
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index 79d4890..7696612 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -20,19 +20,19 @@ ADD_EXECUTABLE(rpmmd2solv rpmmd2solv.c)
- TARGET_LINK_LIBRARIES(rpmmd2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
- 
- ADD_EXECUTABLE(helix2solv helix2solv.c)
--TARGET_LINK_LIBRARIES(helix2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY})
-+TARGET_LINK_LIBRARIES(helix2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
- 
- ADD_EXECUTABLE(susetags2solv susetags2solv.c)
--TARGET_LINK_LIBRARIES(susetags2solv toolstuff satsolverext satsolver ${ZLIB_LIBRARY})
-+TARGET_LINK_LIBRARIES(susetags2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
- 
- ADD_EXECUTABLE(updateinfoxml2solv updateinfoxml2solv.c)
--TARGET_LINK_LIBRARIES(updateinfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY})
-+TARGET_LINK_LIBRARIES(updateinfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
- 
- ADD_EXECUTABLE(deltainfoxml2solv deltainfoxml2solv.c)
--TARGET_LINK_LIBRARIES(deltainfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY})
-+TARGET_LINK_LIBRARIES(deltainfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
- 
- ADD_EXECUTABLE(repomdxml2solv repomdxml2solv.c)
--TARGET_LINK_LIBRARIES(repomdxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY})
-+TARGET_LINK_LIBRARIES(repomdxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
- 
- ADD_EXECUTABLE(installcheck installcheck.c)
- TARGET_LINK_LIBRARIES(installcheck satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
-@@ -44,7 +44,7 @@ ADD_EXECUTABLE(dumpsolv dumpsolv.c )
- TARGET_LINK_LIBRARIES(dumpsolv satsolver)
- 
- ADD_EXECUTABLE(mergesolv mergesolv.c )
--TARGET_LINK_LIBRARIES(mergesolv toolstuff satsolverext satsolver)
-+TARGET_LINK_LIBRARIES(mergesolv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
- 
- install(TARGETS
-     mergesolv
--- 
-1.7.4.4
-

diff --git a/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch b/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch
new file mode 100644 (file)
index 0000000..31dde45
--- /dev/null
+++ b/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch
@@ -0,0 +1,28 @@
+diff -Naur qemu-0.14.1.org/hw/virtio-9p-local.c qemu-0.14.1/hw/virtio-9p-local.c
+--- qemu-0.14.1.org/hw/virtio-9p-local.c       2011-05-06 21:01:43.000000000 +0200
++++ qemu-0.14.1/hw/virtio-9p-local.c   2011-05-18 14:04:32.432444320 +0200
+@@ -10,6 +10,7 @@
+  * the COPYING file in the top-level directory.
+  *
+  */
++
+ #include "virtio.h"
+ #include "virtio-9p.h"
+ #include "virtio-9p-xattr.h"
+@@ -20,6 +21,16 @@
+ #include <sys/un.h>
+ #include <attr/xattr.h>
+ 
++#ifndef AT_FDCWD
++/* Copied from linux/include/linux/fcntl.h * because direct include fails */
++#define AT_FDCWD              -100    /* Special value used to indicate
++                                           openat should use the current
++                                           working directory. */
++#define AT_SYMLINK_NOFOLLOW   0x100   /* Do not follow symbolic links.  */
++#define AT_REMOVEDIR          0x200   /* Remove directory instead of
++                                           unlinking file.  */
++#define AT_SYMLINK_FOLLOW     0x400   /* Follow symbolic links.  */
++#endif
+ 
+ static int local_lstat(FsContext *fs_ctx, const char *path, struct stat *stbuf)
+ {

diff --git a/src/patches/qemu-0.15.0_missing_definitions_hack.patch b/src/patches/qemu-0.15.0_missing_definitions_hack.patch
new file mode 100644 (file)
index 0000000..4ff2c08
--- /dev/null
+++ b/src/patches/qemu-0.15.0_missing_definitions_hack.patch
@@ -0,0 +1,40 @@
+diff -Naur qemu-kvm-0.15.0.org/hw/9pfs/virtio-9p-local.c qemu-kvm-0.15.0/hw/9pfs/virtio-9p-local.c
+--- qemu-kvm-0.15.0.org/hw/9pfs/virtio-9p-local.c      2011-08-09 14:40:29.000000000 +0200
++++ qemu-kvm-0.15.0/hw/9pfs/virtio-9p-local.c  2011-08-14 10:31:22.711480316 +0200
+@@ -21,6 +21,16 @@
+ #include <sys/un.h>
+ #include <attr/xattr.h>
+ 
++#ifndef AT_FDCWD
++/* Copied from linux/include/linux/fcntl.h * because direct include fails */
++#define AT_FDCWD              -100    /* Special value used to indicate
++                                           openat should use the current
++                                           working directory. */
++#define AT_SYMLINK_NOFOLLOW   0x100   /* Do not follow symbolic links.  */
++#define AT_REMOVEDIR          0x200   /* Remove directory instead of
++                                           unlinking file.  */
++#define AT_SYMLINK_FOLLOW     0x400   /* Follow symbolic links.  */
++#endif
+ 
+ static int local_lstat(FsContext *fs_ctx, const char *path, struct stat *stbuf)
+ {
+diff -Naur qemu-kvm-0.15.0.org/linux-user/syscall.c qemu-kvm-0.15.0/linux-user/syscall.c
+--- qemu-kvm-0.15.0.org/linux-user/syscall.c   2011-08-09 14:40:29.000000000 +0200
++++ qemu-kvm-0.15.0/linux-user/syscall.c       2011-08-14 12:43:43.190231600 +0200
+@@ -971,6 +971,16 @@
+     return result;
+ }
+ 
++/* Copied from linux/include/asm/resource.h * because direct include fails */
++
++#ifndef RLIMIT_NICE
++#define RLIMIT_NICE           13      /* max nice prio allowed to raise to
++                                         0-39 for nice level 19 .. -20 */
++#endif
++#ifndef RLIMIT_RTPRIO
++#define RLIMIT_RTPRIO         14      /* maximum realtime priority */
++#endif
++
+ static inline int target_to_host_resource(int code)
+ {
+     switch (code) {

diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl
index 2c7c947f548d68f903e2034e0d93f7125d232cdc..f66b841d7ac9697c51d5553d84faf4fb45f49ab9 100644 (file)
--- a/src/scripts/setddns.pl
+++ b/src/scripts/setddns.pl
@@ -515,6 +515,36 @@ if ($ip ne $ipcache) {
                                &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure (could not connect to server)");
                            }
                        }
+                       #namecheap test
+                       elsif ($settings{'SERVICE'} eq 'namecheap') {
+                               # use proxy ?
+                               my %proxysettings;
+                               &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
+                               if ($_=$proxysettings{'UPSTREAM_PROXY'}) {
+                                       my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
+                                       Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} );
+                               }
+
+                               my ($out, $response) = Net::SSLeay::get_https(  'dynamicdns.park-your-domain.com',
+                                                               443,
+                                                               "/update?host=$settings{'HOSTNAME'}&domain=$settings{'DOMAIN'}&password=$settings{'PASSWORD'}&ip=$ip",
+                                                               Net::SSLeay::make_headers('User-Agent' => 'IPFire' )
+                                                               );
+                                       #Valid responses from service are:
+                                       # wait confirmation!!
+                                       if ($response =~ m%HTTP/1\.. 200 OK%) {
+                                               if ( $out !~ m/<ErrCount>0<\/ErrCount>/ ) {
+                                                       $out =~ m/<Err1>(.*)<\/Err1>/;
+                                                       &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure ($1)");
+                                               } else {
+                                                       &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : success");
+                                                       $success++;
+                                               }
+                                       } else {
+                                               &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure (could not connect to server)");
+                               }
+                       }
+                       #end namecheap test
                        elsif ($settings{'SERVICE'} eq 'dynu') {
                            # use proxy ?
                            my %proxysettings;

diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch
index af646adce8b8f98fa2277a1287cd38571728e8f7..7eae873cea81f1820920a058cdd85a895f265dac 100755 (executable)
--- a/src/scripts/vpn-watch
+++ b/src/scripts/vpn-watch
@@ -1,6 +1,6 @@
 #!/usr/bin/perl 
 ##################################################
-#####     VPN-Watch.pl     Version 0.6a      #####
+#####     VPN-Watch.pl     Version 0.7       #####
 ##################################################
 #                                                #
 #   VPN-Watch is part of the IPFire Firewall     #
@@ -31,18 +31,19 @@ while ( $i == 0){
 
   $round++;
 
-   # Reset roundcounter after 60 min. To do established check.
-  if ($round > 59) { $round=0; }
+   # Reset roundcounter after 10 min. To do established check.
+  if ($round > 9) { $round=0; }
 
   if (open(FILE, "<${General::swroot}/vpn/config")) {    @vpnsettings = <FILE>;
     close(FILE);
     unless(@vpnsettings) {exit 1;}
   }
 
-my $status = `ipsec whack --status`;
+my $status = `ipsec status`;
 foreach (@vpnsettings){
  my @settings = split(/,/,$_);
-
+  
+  chomp($settings[30]);
   if ($settings[27] ne 'RED'){next;}
   if ($settings[4] ne 'net'){next;}  
   if ($settings[1] ne 'on'){next;}chomp($settings[29]);
@@ -55,15 +56,13 @@ foreach (@vpnsettings){
   my $remoteip = `/usr/bin/ping -c 1 $remotehostname 2>/dev/null | head -n1 | awk '{print \$3}' | tr -d '()' | tr -d ':'`;chomp($remoteip);
   if ($remoteip eq ""){next;if ($debug){logger("Unable to resolve $remotehostname.");}}
   my $ipmatch= `echo "$status" | grep '$remoteip' | grep '$settings[2]'`;
-  my $established= `echo "$status" | grep '$settings[2]' | grep 'erouted;'`;
+  my $established= `echo "$status" | grep '$settings[2]' | grep -e 'erouted;' -e 'INSTALLED'`;
   my $known= `echo "$status" | grep '$settings[2]'`;
 
   if ( $ipmatch eq '' && $known ne '' ){
     logger("Remote IP for host $remotehostname($remoteip) has changed, restarting ipsec.");
     system("/usr/local/bin/ipsecctrl S $settings[0]");
     $round=0;
-    last; #all connections will reloaded
-          #remove this if ipsecctrl can restart single con again
   }
 
   if ($debug){logger("Round=".$round." and established=".$established);}
@@ -72,8 +71,6 @@ foreach (@vpnsettings){
     logger("Connection to $remotehostname($remoteip) not erouted, restarting ipsec.");
     system("/usr/local/bin/ipsecctrl S $settings[0]");
     $round=0;
-    last; #all connections will reloaded
-          #remove this if ipsecctrl can restart single con again
 
   }
  }

diff --git a/tools/check_langs.sh b/tools/check_langs.sh
index 3122d3106d2a03ce5c99de8cfc502874034617dd..794cea592389c272e589c361de9df57b303db254 100755 (executable)
--- a/tools/check_langs.sh
+++ b/tools/check_langs.sh
@@ -28,7 +28,7 @@ fi
 cat ./langs/de/cgi-bin/de.pl | grep \'.*\' | awk -F\' '{print $2}'| sort > /tmp/de_cgi-bin.$$
 cat ./langs/de/install/lang_de.c | grep TR_ | awk -F\  '{print $2}' > /tmp/de_install.$$
 
-for i in ./langs/en ./langs/fr ./langs/es; do
+for i in ./langs/en ./langs/fr ./langs/es ./langs/pl ./langs/ru ; do
     language=`echo "$i" | awk -F/  '{ print $3 }'`
 
     echo "############################################################################"

diff --git a/tools/make-functions b/tools/make-functions
index 2bd85f166a6617df86102a92ec767f7a2fb94a5e..4ee4344fe8bea4b6be700ae2c4f4b5c09c212ade 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -730,10 +730,14 @@ update_langs() {
                $BASEDIR/tools/sort_strings.pl de
                $BASEDIR/tools/sort_strings.pl fr
                $BASEDIR/tools/sort_strings.pl es
+               $BASEDIR/tools/sort_strings.pl pl
+               $BASEDIR/tools/sort_strings.pl ru
                $BASEDIR/tools/check_strings.pl en > $BASEDIR/doc/language_issues.en
                $BASEDIR/tools/check_strings.pl de > $BASEDIR/doc/language_issues.de
                $BASEDIR/tools/check_strings.pl fr > $BASEDIR/doc/language_issues.fr
                $BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.es
+               $BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.pl
+               $BASEDIR/tools/check_strings.pl ru > $BASEDIR/doc/language_issues.ru
                $BASEDIR/tools/check_langs.sh > $BASEDIR/doc/language_missings
                beautify message DONE
 }

diff --git a/tools/sort_strings.pl b/tools/sort_strings.pl
index 64ee423efe438154d1de6c0378a450fb53fdd627..494f1f626352e45290f5c025463c41cb3bb1fe0d 100755 (executable)
--- a/tools/sort_strings.pl
+++ b/tools/sort_strings.pl
@@ -40,13 +40,6 @@ EOF
 
 for my $key ( sort (keys %tr) ) {
        my $value = $tr{$key};
-       $value =~ s/ä/ä/g;
-       $value =~ s/ö/ö/g;
-       $value =~ s/ü/ü/g;
-       $value =~ s/Ä/Ã\84/g;
-       $value =~ s/Ö/Ã\96/g;
-       $value =~ s/Ü/Ã\9c/g;
-       $value =~ s/ß/Ã\9f/g;
        $value =~ s/\'/\\\'/g;
        print FILE "\'$key\' => \'$value\',\n";
 }