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
#
# 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
# 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
CONFIG_NR_CPUS=8
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
# 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
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
#
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
#
# 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
# 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
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
CONFIG_DMI=y
# CONFIG_IOMMU_HELPER is not set
CONFIG_IOMMU_API=y
-CONFIG_NR_CPUS=8
+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
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
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
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
# 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
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
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32.27-ipfire-xen
-# Thu Dec 30 14:49:34 2010
+# 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
# 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
CONFIG_IOMMU_HELPER=y
# CONFIG_IOMMU_API is not set
CONFIG_NR_CPUS=8
+CONFIG_IRQ_TIME_ACCOUNTING=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
# 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
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
#usr/lib/perl5/site_perl/5.12.3/MIME
usr/lib/perl5/site_perl/5.12.3/MIME/Body.pm
-usr/lib/perl5/site_perl/5.12.3/MIME/Decoder
+#usr/lib/perl5/site_perl/5.12.3/MIME/Decoder
usr/lib/perl5/site_perl/5.12.3/MIME/Decoder.pm
usr/lib/perl5/site_perl/5.12.3/MIME/Decoder/Base64.pm
usr/lib/perl5/site_perl/5.12.3/MIME/Decoder/BinHex.pm
usr/lib/perl5/site_perl/5.12.3/MIME/Tools.pm
usr/lib/perl5/site_perl/5.12.3/MIME/WordDecoder.pm
usr/lib/perl5/site_perl/5.12.3/MIME/Words.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME-tools
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME-tools/.packlist
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME/tools
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME/tools/.packlist
#usr/share/man/man3/MIME::Body.3
#usr/share/man/man3/MIME::Decoder.3
#usr/share/man/man3/MIME::Decoder::Base64.3
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
-etc/modprobe.d/ralink_wireless
etc/udev/rules.d/50-compat_firmware.rules
lib/udev/compat_firmware.sh
#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
#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
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
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
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
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
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
#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
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
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
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
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
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
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
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
#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-constraints.a
+#usr/libexec/ipsec/plugins/libstrongswan-constraints.la
+usr/libexec/ipsec/plugins/libstrongswan-constraints.so
#usr/libexec/ipsec/plugins/libstrongswan-curl.a
#usr/libexec/ipsec/plugins/libstrongswan-curl.la
usr/libexec/ipsec/plugins/libstrongswan-curl.so
#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
#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
--- /dev/null
+#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
--- /dev/null
+#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
+++ /dev/null
-../../../common/perl-GD
\ No newline at end of file
--- /dev/null
+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
--- /dev/null
+../../../common/gmp
\ No newline at end of file
--- /dev/null
+../../../common/wireless-regdb
\ No newline at end of file
--- /dev/null
+../../../common/zd1211-firmware
\ No newline at end of file
--- /dev/null
+#!/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
+#
+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
+
+
+#
+# check if we the backup file already exist
+if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then
+ echo Moving backup to backup-old ...
+ mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
+ /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2
+fi
+echo First we made a backup of all files that was inside of the
+echo update archive. This may take a while ...
+# Add some files that are not in the package to backup
+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/*-ipfire
+#
+# 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
+
+#
+# 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/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
+##
+## 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
+/usr/bin/logger -p syslog.emerg -t core-upgrade-next "Upgrade finished. If you use a customized grub.cfg"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-next "Check it before reboot !!!"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-next " *** Please reboot... *** "
--- /dev/null
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
--- /dev/null
+../../../common/dracut
\ No newline at end of file
--- /dev/null
+../../../common/grub
\ No newline at end of file
--- /dev/null
+../../../common/iw
\ No newline at end of file
--- /dev/null
+../../../common/linux
\ No newline at end of file
--- /dev/null
+../../../common/linux-firmware
\ No newline at end of file
--- /dev/null
+../../../common/strongswan
\ No newline at end of file
lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl1251/wl1251.ko
lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko
-lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko
+#lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko
lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
lib/modules/2.6.32.28-ipfire/kernel/drivers/ssb/ssb.ko
lib/modules/2.6.32.28-ipfire/kernel/drivers/staging/ath6kl/ath6kl.ko
lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251.ko
lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko
-lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl1271.ko
+#lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl1271.ko
lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/ssb/ssb.ko
lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/staging/ath6kl/ath6kl.ko
lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251.ko
lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko
-lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1271.ko
+#lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1271.ko
lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/ssb/ssb.ko
lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/staging/ath6kl/ath6kl.ko
--- /dev/null
+../../../common/crda
\ No newline at end of file
+etc/rc.d/init.d/alsa
lib/firmware/aica_firmware.bin
#lib/firmware/asihpi
lib/firmware/asihpi/dsp2400.bin
lib/firmware/emagic/emi26-firmware.bin
lib/firmware/emagic/emi26-loader.bin
lib/firmware/emagic/emi62-bitstream.bin
+lib/firmware/emagic/emi62-firmware.bin
lib/firmware/emagic/emi62-firmware-midi.bin
lib/firmware/emagic/emi62-firmware-spdif.bin
-lib/firmware/emagic/emi62-firmware.bin
lib/firmware/emagic/emi62-loader.bin
lib/firmware/emagic/license.txt
#lib/firmware/emu
lib/firmware/emu/audio_dock.fw
lib/firmware/emu/emu0404.fw
-lib/firmware/emu/emu1010_notebook.fw
lib/firmware/emu/emu1010b.fw
+lib/firmware/emu/emu1010_notebook.fw
lib/firmware/emu/hana.fw
lib/firmware/emu/micro_dock.fw
+lib/firmware/ess/maestro3_assp_kernel.fw
+lib/firmware/ess/maestro3_assp_minisrc.fw
+lib/firmware/korg/k1212.dsp
#lib/firmware/mixart
+lib/firmware/mixart/miXart8AES.xlx
lib/firmware/mixart/miXart8.elf
lib/firmware/mixart/miXart8.xlx
-lib/firmware/mixart/miXart8AES.xlx
lib/firmware/multiface_firmware.bin
lib/firmware/multiface_firmware_rev11.bin
#lib/firmware/pcxhr
lib/firmware/pcxhr/xlxc882hr.dat
lib/firmware/pcxhr/xlxc924.dat
lib/firmware/pcxhr/xlxint.dat
+lib/firmware/rpm_firmware.bin
+lib/firmware/sb16/alaw_main.csp
+lib/firmware/sb16/ima_adpcm_capture.csp
+lib/firmware/sb16/ima_adpcm_init.csp
+lib/firmware/sb16/ima_adpcm_playback.csp
+lib/firmware/sb16/mulaw_main.csp
#lib/firmware/turtlebeach
lib/firmware/turtlebeach/msndinit.bin
lib/firmware/turtlebeach/msndperm.bin
lib/firmware/vx/x1_1_vx2.xlx
lib/firmware/vx/x1_1_vxp.xlx
lib/firmware/vx/x1_2_v22.xlx
+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/udev/rules.d/90-alsa-restore.rules
usr/bin/aconnect
+usr/bin/alsaloop
usr/bin/alsamixer
+usr/bin/alsaucm
usr/bin/amidi
usr/bin/amixer
usr/bin/aplay
#usr/include/alsa/asoundef.h
#usr/include/alsa/asoundlib.h
#usr/include/alsa/conf.h
-#usr/include/alsa/control.h
#usr/include/alsa/control_external.h
+#usr/include/alsa/control.h
#usr/include/alsa/error.h
#usr/include/alsa/global.h
#usr/include/alsa/hwdep.h
#usr/include/alsa/iatomic.h
#usr/include/alsa/input.h
-#usr/include/alsa/mixer.h
#usr/include/alsa/mixer_abst.h
+#usr/include/alsa/mixer.h
#usr/include/alsa/output.h
-#usr/include/alsa/pcm.h
#usr/include/alsa/pcm_external.h
#usr/include/alsa/pcm_extplug.h
+#usr/include/alsa/pcm.h
#usr/include/alsa/pcm_ioplug.h
#usr/include/alsa/pcm_old.h
#usr/include/alsa/pcm_plugin.h
#usr/include/alsa/pcm_rate.h
#usr/include/alsa/rawmidi.h
-#usr/include/alsa/seq.h
#usr/include/alsa/seq_event.h
-#usr/include/alsa/seq_midi_event.h
+#usr/include/alsa/seq.h
#usr/include/alsa/seqmid.h
+#usr/include/alsa/seq_midi_event.h
#usr/include/alsa/sound
#usr/include/alsa/sound/asound_fm.h
#usr/include/alsa/sound/emu10k1.h
#usr/include/alsa/sound/hdsp.h
+usr/include/alsa/sound/hdspm.h
#usr/include/alsa/sound/sb16_csp.h
#usr/include/alsa/sound/sscape_ioctl.h
#usr/include/alsa/sound/type_compat.h
#usr/include/alsa/timer.h
+#usr/include/alsa/use-case.h
#usr/include/alsa/version.h
#usr/include/sys/asoundlib.h
#usr/lib/alsa-lib
#usr/local/share/alsa/firmware/hdsploader/digiface_firmware_rev11.bin
#usr/local/share/alsa/firmware/hdsploader/multiface_firmware.bin
#usr/local/share/alsa/firmware/hdsploader/multiface_firmware_rev11.bin
+usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin
#usr/local/share/alsa/firmware/mixartloader
-#usr/local/share/alsa/firmware/mixartloader/miXart.conf
+#usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx
#usr/local/share/alsa/firmware/mixartloader/miXart8.elf
#usr/local/share/alsa/firmware/mixartloader/miXart8.xlx
-#usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx
+#usr/local/share/alsa/firmware/mixartloader/miXart.conf
#usr/local/share/alsa/firmware/pcxhrloader
#usr/local/share/alsa/firmware/pcxhrloader/b321_512.b56
#usr/local/share/alsa/firmware/pcxhrloader/d321_512.d56
#usr/local/share/alsa/firmware/pcxhrloader/dspe882.e56
#usr/local/share/alsa/firmware/pcxhrloader/dspe924.e56
#usr/local/share/alsa/firmware/pcxhrloader/e321_512.e56
-#usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr0.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr1.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr2.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr3.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr4.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr5.conf
+#usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf
#usr/local/share/alsa/firmware/pcxhrloader/xc_1_882.dat
#usr/local/share/alsa/firmware/pcxhrloader/xi_1_882.dat
#usr/local/share/alsa/firmware/pcxhrloader/xlxc1222e.dat
#usr/local/share/alsa/firmware/usx2yloader
#usr/local/share/alsa/firmware/usx2yloader/tascam_loader.ihx
#usr/local/share/alsa/firmware/usx2yloader/us122.conf
+#usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx
#usr/local/share/alsa/firmware/usx2yloader/us122.prepad
#usr/local/share/alsa/firmware/usx2yloader/us122.rbt
-#usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx
#usr/local/share/alsa/firmware/usx2yloader/us224.conf
+#usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx
#usr/local/share/alsa/firmware/usx2yloader/us224.prepad
#usr/local/share/alsa/firmware/usx2yloader/us224.rbt
-#usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx
#usr/local/share/alsa/firmware/usx2yloader/us428.conf
+#usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx
#usr/local/share/alsa/firmware/usx2yloader/us428.prepad
#usr/local/share/alsa/firmware/usx2yloader/us428.rbt
-#usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx
#usr/local/share/alsa/firmware/vxloader
#usr/local/share/alsa/firmware/vxloader/bd56002.boot
#usr/local/share/alsa/firmware/vxloader/bd563s3.boot
#usr/share/alsa/alsa.conf
#usr/share/alsa/cards
#usr/share/alsa/cards/AACI.conf
+#usr/share/alsa/cards/aliases.alisp
+#usr/share/alsa/cards/aliases.conf
+#usr/share/alsa/cards/ATIIXP.conf
#usr/share/alsa/cards/ATIIXP-MODEM.conf
#usr/share/alsa/cards/ATIIXP-SPDMA.conf
-#usr/share/alsa/cards/ATIIXP.conf
#usr/share/alsa/cards/AU8810.conf
#usr/share/alsa/cards/AU8820.conf
#usr/share/alsa/cards/AU8830.conf
-#usr/share/alsa/cards/Audigy.conf
#usr/share/alsa/cards/Audigy2.conf
+#usr/share/alsa/cards/Audigy.conf
#usr/share/alsa/cards/Aureon51.conf
#usr/share/alsa/cards/Aureon71.conf
#usr/share/alsa/cards/CA0106.conf
-#usr/share/alsa/cards/CMI8338-SWIEC.conf
#usr/share/alsa/cards/CMI8338.conf
+#usr/share/alsa/cards/CMI8338-SWIEC.conf
#usr/share/alsa/cards/CMI8738-MC6.conf
#usr/share/alsa/cards/CMI8738-MC8.conf
#usr/share/alsa/cards/CMI8788.conf
#usr/share/alsa/cards/HDA-Intel.conf
#usr/share/alsa/cards/ICE1712.conf
#usr/share/alsa/cards/ICE1724.conf
-#usr/share/alsa/cards/ICH-MODEM.conf
-#usr/share/alsa/cards/ICH.conf
#usr/share/alsa/cards/ICH4.conf
+#usr/share/alsa/cards/ICH.conf
+#usr/share/alsa/cards/ICH-MODEM.conf
#usr/share/alsa/cards/Maestro3.conf
#usr/share/alsa/cards/NFORCE.conf
#usr/share/alsa/cards/PC-Speaker.conf
#usr/share/alsa/cards/TRID4DWAVENX.conf
#usr/share/alsa/cards/USB-Audio.conf
#usr/share/alsa/cards/VIA686A.conf
-#usr/share/alsa/cards/VIA8233.conf
#usr/share/alsa/cards/VIA8233A.conf
+#usr/share/alsa/cards/VIA8233.conf
#usr/share/alsa/cards/VIA8237.conf
#usr/share/alsa/cards/VX222.conf
-#usr/share/alsa/cards/VXPocket.conf
#usr/share/alsa/cards/VXPocket440.conf
+#usr/share/alsa/cards/VXPocket.conf
#usr/share/alsa/cards/YMF744.conf
-#usr/share/alsa/cards/aliases.alisp
-#usr/share/alsa/cards/aliases.conf
#usr/share/alsa/init
#usr/share/alsa/init/00main
#usr/share/alsa/init/default
#usr/share/alsa/speaker-test
#usr/share/alsa/speaker-test/sample_map.csv
#usr/share/locale/de/LC_MESSAGES/alsa-utils.mo
-#usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
+#usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo
#usr/share/locale/ja/LC_MESSAGES/alsaconf.mo
+#usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
#usr/share/locale/ru/LC_MESSAGES/alsaconf.mo
#usr/share/man/fr/man8/alsaconf.8
#usr/share/man/man1/aconnect.1
#usr/share/man/man1/alsactl.1
+#usr/share/man/man1/alsaloop.1
#usr/share/man/man1/alsamixer.1
#usr/share/man/man1/amidi.1
#usr/share/man/man1/amixer.1
#usr/share/sounds/alsa/Rear_Right.wav
#usr/share/sounds/alsa/Side_Left.wav
#usr/share/sounds/alsa/Side_Right.wav
-etc/rc.d/init.d/alsa
-lib/firmware/ess/maestro3_assp_kernel.fw
-lib/firmware/ess/maestro3_assp_minisrc.fw
-lib/firmware/korg/k1212.dsp
-lib/firmware/sb16/alaw_main.csp
-lib/firmware/sb16/ima_adpcm_capture.csp
-lib/firmware/sb16/ima_adpcm_init.csp
-lib/firmware/sb16/ima_adpcm_playback.csp
-lib/firmware/sb16/mulaw_main.csp
-lib/firmware/yamaha/ds1_ctrl.fw
-lib/firmware/yamaha/ds1_dsp.fw
-lib/firmware/yamaha/ds1e_ctrl.fw
+var/lib/alsa
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: 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: 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: untranslated string: outgoing firewall view group
WARNING: untranslated string: pakfire ago
WARNING: untranslated string: system information
+WARNING: untranslated string: vpn keyexchange
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
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: bytes
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
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
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: untranslated string: outgoing firewall view group
WARNING: untranslated string: pakfire ago
WARNING: untranslated string: system information
+WARNING: untranslated string: vpn keyexchange
# Checking cgi-bin translations for language: fr #
############################################################################
< dns address deleted txt
-< extrahd detected drives
< fireinfo ipfire version
< fireinfo is disabled
< fireinfo is enabled
< upload new ruleset
< urlfilter file ext block
< urlfilter mode block
+< vpn keyexchange
< wlanap access point
< wlanap channel
< wlanap debugging
< outgoing firewall view group
< Set time on boot
< system information
+< vpn keyexchange
############################################################################
# Checking install/setup translations for language: pl #
############################################################################
-< TR_ISDN
-< TR_ERROR_PROBING_ISDN
-< TR_PROBING_ISDN
-< TR_MISSING_GREEN_IP
-< TR_CHOOSE_FILESYSTEM
-< TR_NOT_ENOUGH_INTERFACES
-< TR_INTERFACE_CHANGE
-< TR_NETCARD_COLOR
-< TR_REMOVE
-< TR_MISSING_DNS
-< TR_MISSING_DEFAULT
-< TR_JOURNAL_EXT3
-< TR_CHOOSE_NETCARD
-< TR_NETCARDMENU2
-< TR_ERROR_INTERFACES
-< TR_REMOVE_CARD
-< TR_JOURNAL_ERROR
-< TR_FILESYSTEM
-< TR_ADDRESS_SETTINGS
-< TR_ADMIN_PASSWORD
-< TR_AGAIN_PROMPT
-< TR_ALL_CARDS_SUCCESSFULLY_ALLOCATED
-< TR_AUTODETECT
-< TR_BUILDING_INITRD
-< TR_CANCEL
-< TR_CARD_ASSIGNMENT
-< TR_CHECKING
-< TR_CHECKING_FOR
-< TR_CHOOSE_THE_ISDN_CARD_INSTALLED
-< TR_CHOOSE_THE_ISDN_PROTOCOL
-< TR_CONFIGURE_DHCP
-< TR_CONFIGURE_NETWORKING
-< TR_CONFIGURE_NETWORKING_LONG
-< TR_CONFIGURE_NETWORK_DRIVERS
-< TR_CONFIGURE_THE_CDROM
-< TR_CONGRATULATIONS
-< TR_CONGRATULATIONS_LONG
-< TR_CONTINUE_NO_SWAP
-< TR_CURRENT_CONFIG
-< TR_DEFAULT_GATEWAY
-< TR_DEFAULT_GATEWAY_CR
-< TR_DEFAULT_LEASE
-< TR_DEFAULT_LEASE_CR
-< TR_DETECTED
-< TR_DHCP_HOSTNAME
-< TR_DHCP_HOSTNAME_CR
-< TR_DHCP_SERVER_CONFIGURATION
-< TR_DISABLED
-< TR_DISABLE_ISDN
-< TR_DISK_TOO_SMALL
-< TR_DNS_AND_GATEWAY_SETTINGS
-< TR_DNS_AND_GATEWAY_SETTINGS_LONG
-< TR_DNS_GATEWAY_WITH_GREEN
-< 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
-< TR_DONE
-< TR_DO_YOU_WISH_TO_CHANGE_THESE_SETTINGS
-< TR_DRIVERS_AND_CARD_ASSIGNMENTS
-< TR_ENABLED
-< TR_ENABLE_ISDN
-< TR_END_ADDRESS
-< TR_END_ADDRESS_CR
-< TR_ENTER_ADDITIONAL_MODULE_PARAMS
-< TR_ENTER_ADMIN_PASSWORD
-< TR_ENTER_DOMAINNAME
-< TR_ENTER_HOSTNAME
-< TR_ENTER_IP_ADDRESS_INFO
-< TR_ENTER_NETWORK_DRIVER
-< TR_ENTER_ROOT_PASSWORD
-< TR_ENTER_SETUP_PASSWORD
-< TR_ENTER_THE_IP_ADDRESS_INFORMATION
-< TR_ENTER_THE_LOCAL_MSN
-< TR_ENTER_URL
-< TR_ERROR
-< TR_ERROR_PROBING_CDROM
-< TR_ERROR_WRITING_CONFIG
-< TR_EURO_EDSS1
-< TR_EXTRACTING_MODULES
-< TR_FAILED_TO_FIND
-< TR_FOUND_NIC
-< TR_GERMAN_1TR6
-< TR_HELPLINE
-< TR_HOSTNAME
-< TR_HOSTNAME_CANNOT_BE_EMPTY
-< TR_HOSTNAME_CANNOT_CONTAIN_SPACES
-< TR_HOSTNAME_NOT_VALID_CHARS
-< TR_INITIALISING_ISDN
-< TR_INSERT_CDROM
-< TR_INSERT_FLOPPY
-< TR_INSTALLATION_CANCELED
-< TR_INSTALLING_FILES
-< TR_INSTALLING_GRUB
-< TR_INSTALLING_LANG_CACHE
-< TR_INTERFACE
-< TR_INTERFACE_FAILED_TO_COME_UP
-< TR_INVALID_FIELDS
-< TR_INVALID_IO
-< TR_INVALID_IRQ
-< TR_IP_ADDRESS_CR
-< TR_IP_ADDRESS_PROMPT
-< TR_ISDN_CARD
-< TR_ISDN_CARD_NOT_DETECTED
-< TR_ISDN_CARD_SELECTION
-< TR_ISDN_CONFIGURATION
-< TR_ISDN_CONFIGURATION_MENU
-< TR_ISDN_NOT_SETUP
-< TR_ISDN_NOT_YET_CONFIGURED
-< TR_ISDN_PROTOCOL_SELECTION
-< TR_ISDN_STATUS
-< TR_KEYBOARD_MAPPING
-< TR_KEYBOARD_MAPPING_LONG
-< TR_LEASED_LINE
-< TR_LOADING_MODULE
-< TR_LOADING_PCMCIA
-< TR_LOOKING_FOR_NIC
-< TR_MAKING_BOOT_FILESYSTEM
-< TR_MAKING_LOG_FILESYSTEM
-< TR_MAKING_ROOT_FILESYSTEM
-< TR_MAKING_SWAPSPACE
-< TR_MANUAL
-< TR_MAX_LEASE
-< TR_MAX_LEASE_CR
-< TR_MISSING_BLUE_IP
-< TR_MISSING_ORANGE_IP
-< TR_MISSING_RED_IP
-< 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
-< TR_MSN_CONFIGURATION
-< TR_NETMASK_PROMPT
-< TR_NETWORKING
-< TR_NETWORK_ADDRESS_CR
-< TR_NETWORK_ADDRESS_PROMPT
-< TR_NETWORK_CONFIGURATION_MENU
-< TR_NETWORK_CONFIGURATION_TYPE
-< TR_NETWORK_CONFIGURATION_TYPE_LONG
-< TR_NETWORK_MASK_CR
-< TR_NETWORK_SETUP_FAILED
-< TR_NOT_ENOUGH_CARDS_WERE_ALLOCATED
-< TR_NO_BLUE_INTERFACE
-< TR_NO_CDROM
-< TR_NO_GREEN_INTERFACE
-< TR_NO_HARDDISK
-< TR_NO_IPCOP_TARBALL_FOUND
-< TR_NO_ORANGE_INTERFACE
-< TR_NO_RED_INTERFACE
-< TR_NO_SCSI_IMAGE_FOUND
-< TR_NO_UNALLOCATED_CARDS
-< TR_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
-< TR_PRESS_OK_TO_REBOOT
-< TR_PRIMARY_DNS
-< TR_PRIMARY_DNS_CR
-< TR_PROBE
-< TR_PROBE_FAILED
-< TR_PROBING_HARDWARE
-< TR_PROBING_FOR_NICS
-< TR_PROBLEM_SETTING_ADMIN_PASSWORD
-< TR_PROBLEM_SETTING_ROOT_PASSWORD
-< 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
-< TR_RESTART_REQUIRED
-< TR_RESTORE
-< TR_RESTORE_CONFIGURATION
-< TR_ROOT_PASSWORD
-< TR_SECONDARY_DNS
-< TR_SECONDARY_DNS_CR
-< TR_SECONDARY_WITHOUT_PRIMARY_DNS
-< TR_SECTION_MENU
-< TR_SELECT
-< TR_SELECT_CDROM_TYPE
-< TR_SELECT_CDROM_TYPE_LONG
-< TR_SELECT_INSTALLATION_MEDIA
-< TR_SELECT_INSTALLATION_MEDIA_LONG
-< TR_SELECT_NETWORK_DRIVER
-< TR_SELECT_NETWORK_DRIVER_LONG
-< TR_SELECT_THE_INTERFACE_YOU_WISH_TO_RECONFIGURE
-< TR_SELECT_THE_ITEM
-< TR_SETTING_ADMIN_PASSWORD
-< TR_SETTING_ROOT_PASSWORD
-< TR_SETTING_SETUP_PASSWORD
-< TR_SETUP_FINISHED
-< TR_SETUP_NOT_COMPLETE
-< TR_SETUP_PASSWORD
-< TR_SET_ADDITIONAL_MODULE_PARAMETERS
-< TR_SINGLE_GREEN
-< TR_SKIP
-< TR_START_ADDRESS
-< TR_START_ADDRESS_CR
-< TR_STATIC
-< TR_SUGGEST_IO
-< TR_SUGGEST_IRQ
-< TR_THIS_DRIVER_MODULE_IS_ALREADY_LOADED
-< TR_TIMEZONE
-< TR_TIMEZONE_LONG
-< TR_UNABLE_TO_EJECT_CDROM
-< TR_UNABLE_TO_EXTRACT_MODULES
-< TR_UNABLE_TO_FIND_ANY_ADDITIONAL_DRIVERS
-< TR_UNABLE_TO_FIND_AN_ISDN_CARD
-< TR_UNABLE_TO_INITIALISE_ISDN
-< TR_UNABLE_TO_INSTALL_FILES
-< TR_UNABLE_TO_INSTALL_LANG_CACHE
-< TR_UNABLE_TO_INSTALL_GRUB
-< TR_UNABLE_TO_LOAD_DRIVER_MODULE
-< TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM
-< TR_UNABLE_TO_MAKE_LOG_FILESYSTEM
-< TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM
-< TR_UNABLE_TO_MAKE_SWAPSPACE
-< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK
-< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK1
-< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK2
-< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK3
-< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK4
-< TR_UNABLE_TO_MAKE_SYMLINK_DEV_ROOT
-< TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM
-< TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM
-< TR_UNABLE_TO_MOUNT_PROC_FILESYSTEM
-< TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM
-< TR_UNABLE_TO_MOUNT_SWAP_PARTITION
-< 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
-< TR_UNABLE_TO_UNMOUNT_HARDDISK
-< TR_UNABLE_TO_WRITE_ETC_FSTAB
-< TR_UNABLE_TO_WRITE_ETC_HOSTNAME
-< TR_UNABLE_TO_WRITE_ETC_HOSTS
-< TR_UNABLE_TO_WRITE_ETC_HOSTS_ALLOW
-< TR_UNABLE_TO_WRITE_ETC_HOSTS_DENY
-< TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_ETHERNET_SETTINGS
-< TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_HOSTNAMECONF
-< TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_SETTINGS
-< TR_UNCLAIMED_DRIVER
-< TR_UNKNOWN
-< TR_UNSET
-< TR_USB_KEY_VFAT_ERR
-< TR_US_NI1
-< TR_WARNING
-< TR_WARNING_LONG
-< TR_WELCOME
-< TR_YOUR_CONFIGURATION_IS_SINGLE_GREEN_ALREADY_HAS_DRIVER
-< TR_YES
-< TR_NO
-< TR_AS
-< TR_IGNORE
-< TR_PPP_DIALUP
-< TR_DHCP
-< TR_DHCP_STARTSERVER
-< TR_DHCP_STOPSERVER
-< TR_LICENSE_ACCEPT
-< TR_LICENSE_NOT_ACCEPTED
-< TR_EXT2FS_DESCR
-< TR_EXT3FS_DESCR
-< TR_EXT4FS_DESCR
-< TR_REISERFS_DESCR
-< TR_NO_LOCAL_SOURCE
-< TR_DOWNLOADING_ISO
-< TR_DOWNLOAD_ERROR
-< TR_DHCP_FORCE_MTU
############################################################################
# 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
+< vpn keyexchange
###############################################################################
# #
# 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 #
@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'}.";
}
}
}
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'}?";
}
}
$color=$Header::colourgreen;
}
print <<END
- <tr><td colspan="5">
- <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"> </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]' />
<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
;
}
foreach $scanentry (sort @scans)
{
@scanline = split( /\;/, $scanentry );
- print <<END
- <tr><td colspan="5">
- <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"> </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>
- <tr><td colspan="5">
+ <td align='center'>$Lang::tr{'size'} $size MB</td>
+ <td> </td></tr>
+ <tr><td colspan="5"> </td></tr>
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
;
}
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"> </td></tr>
+ <tr><td align="center" colspan="5"> </td></tr>
+ <tr><td align="center" colspan="5">$Lang::tr{'extrahd install or load driver'}</td></tr>
</table>
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>";
}
}
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" ) {
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" ) {
--- /dev/null
+#!/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 " 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 </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'}: </td>
+ <td><input type='text' name='IP' value='$settings{'IP'}' size='25'/></td>
+</tr><tr>
+ <td class='base'>$Lang::tr{'gateway'}: </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'}: </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'> <b>$Lang::tr{'legend'}: </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> </td>
+ <td><img src='/images/off.gif' alt='$Lang::tr{'click to enable'}' /></td>
+ <td class='base'>$Lang::tr{'click to enable'}</td>
+ <td> </td>
+ <td><img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
+ <td class='base'>$Lang::tr{'edit'}</td>
+ <td> </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
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]);
$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];
$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'};
$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';
$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);
<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>
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') {
# 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>";
}
}
%tr,
'Act as' => 'Konfiguriert als',
+'Edit an existing route' => 'Eine existierende Route editieren',
+'Add a route' => 'Eine Route hinzufügen',
'Add Level7 rule' => 'Level7-Regel hinzufügen',
'Add Port Rule' => 'Port Regel hinzufügen',
'Add Rule' => 'Regel hinzufügen',
'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.',
'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!',
'Act as' => 'Act as:',
'Add Level7 rule' => 'Add Level7 rule',
'Add Port Rule' => 'Add port rule',
+'Edit an existing route' => 'Edit an existing route',
+'Add a route' => 'Add a route',
'Add Rule' => 'Add rule',
'Async logging enabled' => 'Enable asynchronous writing of the syslog file',
'Choose Rule' => 'Choose <u>one</u> of the following rules.',
'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.',
'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!',
'Add Level7 rule' => 'añadir regla de Nivel 7',
'Add Port Rule' => 'Añadir Regla de Puerto',
'Add Rule' => 'Añadir Regla',
+'Edit an existing route' => 'Editar una route existente',
+'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',
'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',
'Add Level7 rule' => 'Ajouter une règle Level7',
'Add Port Rule' => 'Ajouter une règle de port',
'Add Rule' => 'Ajouter une règle',
+'Edit an existing route' => 'Modifier une route existante',
+'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',
'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.',
'Async logging enabled' => 'WÅ\82Ã\84\85cz asynchroniczny zapis do pliku syslog',
'Choose Rule' => 'Wybierz <u>jednÃ\84\85</u> z poniższych reguÅ\82.',
'Class' => 'Klasa',
+'Edit an existing route' => 'Edytuj istniejaca trase',
+'Add a route' => 'Dodaj trase',
'Class was deleted' => 'wraz z ewentualnymi podklasami zostaÅ\82a usuniÃ\84\99ta',
'Client status and controlc' => 'Client status and control:',
'ConnSched action' => 'Zadanie:',
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
###############################################################################
# #
# 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 #
endif
endif
-VER = 1.0.23
-UVER = 1.0.23
-FVER = 1.0.23
-DVER = 1.0.23
+VER = 1.0.24.1
+UVER = 1.0.24.2
+FVER = 1.0.24.1
+DVER = 1.0.24
THISAPP = alsa-lib-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
PROG = alsa
-PAK_VER = 8
+PAK_VER = 9
DEPS = ""
alsa-firmware-$(FVER).tar.bz2 = $(DL_FROM)/alsa-firmware-$(FVER).tar.bz2
alsa-driver-$(DVER).tar.bz2 = $(DL_FROM)/alsa-driver-$(DVER).tar.bz2
-$(DL_FILE)_MD5 = f48b50421d8a69d2d806d9c47e534f0d
-alsa-utils-$(UVER).tar.bz2_MD5 = cb0cf46029ac9549cf3a31bff6a4f4e1
-alsa-firmware-$(FVER).tar.bz2_MD5 = e3f755331d6d485f6fd697249b90f877
-alsa-driver-$(DVER).tar.bz2_MD5 = 4be102f995bd4cc68e6e8178b0d19ec2
+$(DL_FILE)_MD5 = 7cc05f25e1d5b65da8fb3fdcd540f226
+alsa-utils-$(UVER).tar.bz2_MD5 = 8238cd57cb301d1c36bcf0ecb59ce6b2
+alsa-firmware-$(FVER).tar.bz2_MD5 = d37434dfcfececd8581d2f0bbe2fcf1b
+alsa-driver-$(DVER).tar.bz2_MD5 = a4ffd80745ce5098dfd48d83c2769e0e
install : $(TARGET)
endif
endif
-VER = 2.6.37-4-sn
+VER = 2.6.39-1-sn
THISAPP = compat-wireless-$(VER)
DL_FILE = compat-wireless-$(VER).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 = be07898fa2e28a06c1b90dd424270ad2
+$(DL_FILE)_MD5 = ac2b20607d75de8ce2b30b74995383a6
asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7
install : $(TARGET)
@$(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
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)
#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/*' \
#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
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)
# 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)
$(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)
###############################################################################
# #
# 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 #
endif
endif
-VER = 8.0.19
+VER = 8.0.30
THISAPP = e1000-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = dc66dcbfd7c2e48af8cfc86f4f174fce
+$(DL_FILE)_MD5 = d85a64fdde2987b27ac6fbab5be605a0
install : $(TARGET)
###############################################################################
# #
# 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 #
endif
endif
-VER = 1.1.19
+VER = 1.3.10a
THISAPP = e1000e-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 94e86507f139226c1add173dafdbbd52
+$(DL_FILE)_MD5 = 04b8856433d5e582ab41bdd3b24f20a5
install : $(TARGET)
###############################################################################
# #
# 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 #
endif
endif
-VER = 2.3.4
+VER = 3.0.19
THISAPP = igb-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b0ea2a70198746b69392ef935b61454a
+$(DL_FILE)_MD5 = 8fdc04600bea4a4188672a1a8d0eb73b
install : $(TARGET)
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)
include Config
-VER = 0.9.20
+VER = 0.9.22
THISAPP = iw-$(VER)
DL_FILE = $(THISAPP).tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1055799b544b3e08169d155bb6c21bb0
+$(DL_FILE)_MD5 = 561c2602c5ce7c65a590118286c0892a
install : $(TARGET)
endif
endif
-VER = 2.6.34.1
+VER = 2.6.38.6
THISAPP = kvm-kmod-$(VER)
DL_FILE = $(THISAPP).tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c227b58ee33f6035f16abd258bcd92ec
+$(DL_FILE)_MD5 = b631ba6ba7b0d3c07de870c6104ffbd5
install : $(TARGET)
$(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_redifinition.patch
cd $(DIR_APP) && ./configure --kerneldir=/usr/src/linux
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && install -m 644 x86/*.ko \
###############################################################################
# #
# 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 #
include Config
-PATCHLEVEL = .28
-VER = 2.6.32.28
+PATCHLEVEL = .42
+VER = 2.6.32.42
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
netfilter-layer7-v2.22.tar.gz \
patch-2.6.16-nath323-1.3.bz2 \
reiser4-for-2.6.32.patch.bz2 \
- xen-patches-2.6.32-2d.tar.bz2
+ xen-patches-2.6.32-2f.tar.bz2
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz
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-2d.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2d.tar.bz2
+xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
-$(DL_FILE)_MD5 = 9ee6d4023f34eb055ec32f201b5f9206
+$(DL_FILE)_MD5 = f1bb2e5ff5ae8d552e6cedeaa70da25e
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
-xen-patches-2.6.32-2d.tar.bz2_MD5 = d1690d2b8b0c9124897981aea505f8f7
+xen-patches-2.6.32-2f.tar.bz2_MD5 = b59d6f89e11accb9d40354418e13f31b
install : $(TARGET)
ifeq "$(XEN)" "1"
# Apply gentoo Xen patches
mkdir -p $(DIR_SRC)/xen-patches
- cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2d.tar.bz2
+ cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2f.tar.bz2
for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
echo "*********** [Patch: $$x]"; \
###############################################################################
# #
# 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 #
include Config
-VER = 20100318
+VER = 20110518
THISAPP = linux-firmware-$(VER)
DL_FILE = $(THISAPP).tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 57e3ec91c81eee2443b0ab6d83c43633
+$(DL_FILE)_MD5 = 3b215b5ec9a5e8784dd971c039e9b948
install : $(TARGET)
###############################################################################
# #
# 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 #
include Config
-VER = 4.5.0
+VER = 4.5.3dr7
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cfbd6efef87830a2e7cc4175bde7ac84
+$(DL_FILE)_MD5 = 72036d309e254c0b3cad8e5473d68218
install : $(TARGET)
###############################################################################
# #
# 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 #
endif
endif
-VER = abd3aac6644e
+VER = git20110427
THISAPP = v4l-dvb-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
PAK_VER = 2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fca89ad531c5d04dadbbc65997c92aac
+$(DL_FILE)_MD5 = 8b83a89332fe8468ebffd516a4a47128
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- # Remove backported warning...
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_remove_backport_warning.patch
- cd $(DIR_APP) && make release VER=$(KVER)-$(VERSUFIX)
- cd $(DIR_APP) && make $(MAKETUNING) all
- cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32
+ cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32
ln -sf $(DIR_APP)/ /usr/src/v4l-dvb
# @rm -rf $(DIR_APP)
@$(POSTBUILD)
--- /dev/null
+###############################################################################
+# #
+# 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)
--- /dev/null
+###############################################################################
+# #
+# 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)
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
-VERSION="2.9" # Version number
+VERSION="2.10" # Version number
CORE="51" # Core Level (Filename)
PAKFIRE_CORE="50" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
ipfiremake which
ipfiremake xz
ipfiremake linux-firmware
+ ipfiremake zd1211-firmware
ipfiremake linux XEN=1
ipfiremake kqemu XEN=1
ipfiremake v4l-dvb XEN=1
ipfiremake parted
ipfiremake swig
ipfiremake python-m2crypto
+ ipfiremake wireless-regdb
ipfiremake crda
ipfiremake libsatsolver
ipfiremake python-satsolver
echo >> $BASEDIR/build/var/ipfire/firebuild
cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
- if [ "$GIT_BRANCH" = "master" ]; then
+ if [ "$GIT_BRANCH" = "next" ]; then
echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
else
echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
--- /dev/null
+#!/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
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
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 $@
// 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)
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");
+
}
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);
}
--- /dev/null
+/* 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;
+}
# 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.28
+KVER=xxxKVERxxx
ROOT=`mount | grep " / " | cut -d" " -f1`
ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
if [ ! -z $ROOTUUID ]; then
#
. /opt/pakfire/lib/functions.sh
remove_files
-mv -f /boot/grub/grub-backup-2.6.32.*-pae.conf /boot/grub/grub.conf
+#mv -f /boot/grub/grub-backup-2.6.32.*-pae.conf /boot/grub/grub.conf
# 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
. /opt/pakfire/lib/functions.sh
extract_files
#
-KVER=2.6.32.28
+KVER=xxxKVERxxx
ROOT=`mount | grep " / " | cut -d" " -f1`
ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
if [ ! -z $ROOTUUID ]; then
############################################################################
#
. /opt/pakfire/lib/functions.sh
-#Don't remove old xen kernel at update
-#./uninstall.sh
+./uninstall.sh
./install.sh
--- /dev/null
+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
+ */
--- /dev/null
+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)
+++ /dev/null
-diff -Naur v4l-dvb-abd3aac6644e.org/v4l/compat.h v4l-dvb-abd3aac6644e/v4l/compat.h
---- v4l-dvb-abd3aac6644e.org/v4l/compat.h 2010-07-02 05:38:54.000000000 +0200
-+++ v4l-dvb-abd3aac6644e/v4l/compat.h 2010-12-04 12:19:09.531056981 +0100
-@@ -14,8 +14,6 @@
- #define INIT_DELAYED_WORK(a,b,c) INIT_WORK(a,b,c)
- #endif
-
--#define EXPERIMENTAL_TREE
--
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
- #define usb_buffer_alloc(dev, size, mem_flags, dma) usb_alloc_coherent(dev, size, mem_flags, dma)
- #define usb_buffer_free(dev, size, addr, dma) usb_free_coherent(dev, size, addr, dma)
my $status = `ipsec whack --status`;
foreach (@vpnsettings){
my @settings = split(/,/,$_);
-
+
+ chomp($settings[30]);
+ if ($settings[30] eq 'ikev2'){next;}
if ($settings[27] ne 'RED'){next;}
if ($settings[4] ne 'net'){next;}
if ($settings[1] ne 'on'){next;}chomp($settings[29]);
projects / people / pmueller / ipfire-2.x.git / commitdiff
