IPFire-SCM January 2014

ipfire-scm@lists.ipfire.org

1 participants
89 discussions

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. f64223d9ec9f2b0aa57ab4fae8680039de212d30
by git＠ipfire.org 11 Jan '14

11 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via f64223d9ec9f2b0aa57ab4fae8680039de212d30 (commit) from 3547adad97669b65c9b11eb69aa36fd41a2484d0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f64223d9ec9f2b0aa57ab4fae8680039de212d30 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 11 02:44:27 2014 +0100 linux-firmware: update to 52d77db. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/dvb-firmwares | 1 + config/rootfiles/common/linux-firmware | 277 ++++++++++++++++++++- .../66 => core/fifteen}/filelists/dvb-firmwares | 0 .../28 => core/fifteen}/filelists/linux-firmware | 0 lfs/linux-firmware | 11 +- 5 files changed, 278 insertions(+), 11 deletions(-) copy config/rootfiles/{oldcore/66 => core/fifteen}/filelists/dvb-firmwares (100%) copy config/rootfiles/{oldcore/28 => core/fifteen}/filelists/linux-firmware (100%) Difference in files: diff --git a/config/rootfiles/common/dvb-firmwares b/config/rootfiles/common/dvb-firmwares index 3a521b1..53dec97 100644 --- a/config/rootfiles/common/dvb-firmwares +++ b/config/rootfiles/common/dvb-firmwares @@ -21,3 +21,4 @@ lib/firmware/dvb-usb-vp702x-01.fw lib/firmware/dvb-usb-vp7045-01.fw lib/firmware/dvb-usb-wt220u-01.fw lib/firmware/dvb-usb-wt220u-02.fw +lib/firmware/v4l-cx23885-enc.fw diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware index 78bcc64..d828b8d 100644 --- a/config/rootfiles/common/linux-firmware +++ b/config/rootfiles/common/linux-firmware @@ -7,21 +7,28 @@ lib/firmware/LICENCE.OLPC lib/firmware/LICENCE.agere lib/firmware/LICENCE.atheros_firmware lib/firmware/LICENCE.broadcom_bcm43xx +lib/firmware/LICENCE.ca0132 lib/firmware/LICENCE.chelsio_firmware +lib/firmware/LICENCE.cw1200 lib/firmware/LICENCE.ene_firmware +lib/firmware/LICENCE.go7007 lib/firmware/LICENCE.i2400m +lib/firmware/LICENCE.ibt_firmware lib/firmware/LICENCE.iwlwifi_firmware 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.ralink_a_mediatek_company_firmware 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.wl1251 lib/firmware/LICENCE.xc5000 +lib/firmware/LICENSE.amd-ucode lib/firmware/LICENSE.dib0700 lib/firmware/LICENSE.radeon #lib/firmware/Makefile @@ -46,6 +53,11 @@ lib/firmware/advansys/38C1600.bin lib/firmware/advansys/mcode.bin lib/firmware/agere_ap_fw.bin lib/firmware/agere_sta_fw.bin +#lib/firmware/amd-ucode +lib/firmware/amd-ucode/microcode_amd.bin +lib/firmware/amd-ucode/microcode_amd.bin.asc +lib/firmware/amd-ucode/microcode_amd_fam15h.bin +lib/firmware/amd-ucode/microcode_amd_fam15h.bin.asc #lib/firmware/ar3k #lib/firmware/ar3k/1020200 lib/firmware/ar3k/1020200/PS_ASIC.pst @@ -73,6 +85,7 @@ lib/firmware/ar3k/AthrBT_0x01020200.dfu lib/firmware/ar3k/AthrBT_0x01020201.dfu lib/firmware/ar3k/AthrBT_0x11020000.dfu lib/firmware/ar3k/AthrBT_0x31010000.dfu +lib/firmware/ar3k/AthrBT_0x41020000.dfu lib/firmware/ar3k/ramps_0x01020001_26.dfu lib/firmware/ar3k/ramps_0x01020200_26.dfu lib/firmware/ar3k/ramps_0x01020200_40.dfu @@ -80,6 +93,8 @@ lib/firmware/ar3k/ramps_0x01020201_26.dfu lib/firmware/ar3k/ramps_0x01020201_40.dfu lib/firmware/ar3k/ramps_0x11020000_40.dfu lib/firmware/ar3k/ramps_0x31010000_40.dfu +lib/firmware/ar3k/ramps_0x41020000_40.dfu +lib/firmware/ar5523.bin lib/firmware/ar7010.fw lib/firmware/ar7010_1_1.fw lib/firmware/ar9170-1.fw @@ -178,6 +193,7 @@ lib/firmware/bnx2x/bnx2x-e1-7.0.23.0.fw lib/firmware/bnx2x/bnx2x-e1-7.0.29.0.fw lib/firmware/bnx2x/bnx2x-e1-7.2.16.0.fw lib/firmware/bnx2x/bnx2x-e1-7.2.51.0.fw +lib/firmware/bnx2x/bnx2x-e1-7.8.17.0.fw lib/firmware/bnx2x/bnx2x-e1-7.8.2.0.fw lib/firmware/bnx2x/bnx2x-e1h-6.0.34.0.fw lib/firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw @@ -187,6 +203,7 @@ lib/firmware/bnx2x/bnx2x-e1h-7.0.23.0.fw lib/firmware/bnx2x/bnx2x-e1h-7.0.29.0.fw lib/firmware/bnx2x/bnx2x-e1h-7.2.16.0.fw lib/firmware/bnx2x/bnx2x-e1h-7.2.51.0.fw +lib/firmware/bnx2x/bnx2x-e1h-7.8.17.0.fw lib/firmware/bnx2x/bnx2x-e1h-7.8.2.0.fw lib/firmware/bnx2x/bnx2x-e2-6.0.34.0.fw lib/firmware/bnx2x/bnx2x-e2-6.2.5.0.fw @@ -196,15 +213,152 @@ lib/firmware/bnx2x/bnx2x-e2-7.0.23.0.fw lib/firmware/bnx2x/bnx2x-e2-7.0.29.0.fw lib/firmware/bnx2x/bnx2x-e2-7.2.16.0.fw lib/firmware/bnx2x/bnx2x-e2-7.2.51.0.fw +lib/firmware/bnx2x/bnx2x-e2-7.8.17.0.fw lib/firmware/bnx2x/bnx2x-e2-7.8.2.0.fw #lib/firmware/brcm lib/firmware/brcm/bcm4329-fullmac-4.bin lib/firmware/brcm/bcm43xx-0.fw lib/firmware/brcm/bcm43xx_hdr-0.fw lib/firmware/brcm/brcmfmac43236b.bin -lib/firmware/brcm/brcmfmac4329.bin -lib/firmware/brcm/brcmfmac4330.bin -lib/firmware/brcm/brcmfmac4334.bin +lib/firmware/brcm/brcmfmac43241b0-sdio.bin +lib/firmware/brcm/brcmfmac43241b4-sdio.bin +lib/firmware/brcm/brcmfmac4329-sdio.bin +lib/firmware/brcm/brcmfmac4330-sdio.bin +lib/firmware/brcm/brcmfmac4334-sdio.bin +lib/firmware/brcm/brcmfmac4335-sdio.bin +lib/firmware/carl9170-1.fw +#lib/firmware/carl9170fw +#lib/firmware/carl9170fw/CMakeLists.txt +#lib/firmware/carl9170fw/COPYRIGHT +#lib/firmware/carl9170fw/GPL +#lib/firmware/carl9170fw/Kconfig +#lib/firmware/carl9170fw/README +#lib/firmware/carl9170fw/autogen.sh +#lib/firmware/carl9170fw/carlfw +#lib/firmware/carl9170fw/carlfw/CMakeLists.txt +#lib/firmware/carl9170fw/carlfw/Kconfig +#lib/firmware/carl9170fw/carlfw/carl9170.lds +#lib/firmware/carl9170fw/carlfw/include +#lib/firmware/carl9170fw/carlfw/include/cam.h +#lib/firmware/carl9170fw/carlfw/include/carl9170.h +#lib/firmware/carl9170fw/carlfw/include/cmd.h +#lib/firmware/carl9170fw/carlfw/include/config.h +#lib/firmware/carl9170fw/carlfw/include/dma.h +#lib/firmware/carl9170fw/carlfw/include/fwdsc.h +#lib/firmware/carl9170fw/carlfw/include/gpio.h +#lib/firmware/carl9170fw/carlfw/include/hostif.h +#lib/firmware/carl9170fw/carlfw/include/io.h +#lib/firmware/carl9170fw/carlfw/include/printf.h +#lib/firmware/carl9170fw/carlfw/include/rf.h +#lib/firmware/carl9170fw/carlfw/include/rom.h +#lib/firmware/carl9170fw/carlfw/include/timer.h +#lib/firmware/carl9170fw/carlfw/include/uart.h +#lib/firmware/carl9170fw/carlfw/include/usb.h +#lib/firmware/carl9170fw/carlfw/include/usb_fifo.h +#lib/firmware/carl9170fw/carlfw/include/wl.h +#lib/firmware/carl9170fw/carlfw/include/wol.h +#lib/firmware/carl9170fw/carlfw/src +#lib/firmware/carl9170fw/carlfw/src/ashlsi3.S +#lib/firmware/carl9170fw/carlfw/src/cam.c +#lib/firmware/carl9170fw/carlfw/src/cmd.c +#lib/firmware/carl9170fw/carlfw/src/dma.c +#lib/firmware/carl9170fw/carlfw/src/fw.c +#lib/firmware/carl9170fw/carlfw/src/gpio.c +#lib/firmware/carl9170fw/carlfw/src/hostif.c +#lib/firmware/carl9170fw/carlfw/src/main.c +#lib/firmware/carl9170fw/carlfw/src/memcpy.S +#lib/firmware/carl9170fw/carlfw/src/memset.S +#lib/firmware/carl9170fw/carlfw/src/printf.c +#lib/firmware/carl9170fw/carlfw/src/reboot.S +#lib/firmware/carl9170fw/carlfw/src/rf.c +#lib/firmware/carl9170fw/carlfw/src/uart.c +#lib/firmware/carl9170fw/carlfw/src/udivsi3_i4i-Os.S +#lib/firmware/carl9170fw/carlfw/src/wlan.c +#lib/firmware/carl9170fw/carlfw/src/wol.c +#lib/firmware/carl9170fw/carlfw/usb +#lib/firmware/carl9170fw/carlfw/usb/Kconfig +#lib/firmware/carl9170fw/carlfw/usb/fifo.c +#lib/firmware/carl9170fw/carlfw/usb/main.c +#lib/firmware/carl9170fw/carlfw/usb/usb.c +#lib/firmware/carl9170fw/config +#lib/firmware/carl9170fw/config/CMakeLists.txt +#lib/firmware/carl9170fw/config/conf.c +#lib/firmware/carl9170fw/config/confdata.c +#lib/firmware/carl9170fw/config/expr.c +#lib/firmware/carl9170fw/config/expr.h +#lib/firmware/carl9170fw/config/lkc.h +#lib/firmware/carl9170fw/config/lkc_proto.h +#lib/firmware/carl9170fw/config/menu.c +#lib/firmware/carl9170fw/config/symbol.c +#lib/firmware/carl9170fw/config/util.c +#lib/firmware/carl9170fw/config/zconf.gperf +#lib/firmware/carl9170fw/config/zconf.l +#lib/firmware/carl9170fw/config/zconf.y +#lib/firmware/carl9170fw/extra +#lib/firmware/carl9170fw/extra/FindGPERF.cmake +#lib/firmware/carl9170fw/extra/FindPackageHandleStandardArgs.cmake +#lib/firmware/carl9170fw/extra/FindUSB-1.0.cmake +#lib/firmware/carl9170fw/extra/GCCVersion.cmake +#lib/firmware/carl9170fw/extra/libusb-zeropacket.diff +#lib/firmware/carl9170fw/extra/sh-elf-linux.cmake +#lib/firmware/carl9170fw/genapi.sh +#lib/firmware/carl9170fw/include +#lib/firmware/carl9170fw/include/linux +#lib/firmware/carl9170fw/include/linux/ch9.h +#lib/firmware/carl9170fw/include/linux/compiler.h +#lib/firmware/carl9170fw/include/linux/ieee80211.h +#lib/firmware/carl9170fw/include/linux/types.h +#lib/firmware/carl9170fw/include/shared +#lib/firmware/carl9170fw/include/shared/eeprom.h +#lib/firmware/carl9170fw/include/shared/fwcmd.h +#lib/firmware/carl9170fw/include/shared/fwdesc.h +#lib/firmware/carl9170fw/include/shared/hw.h +#lib/firmware/carl9170fw/include/shared/phy.h +#lib/firmware/carl9170fw/include/shared/version.h +#lib/firmware/carl9170fw/include/shared/wlan.h +#lib/firmware/carl9170fw/minifw +#lib/firmware/carl9170fw/minifw/CMakeLists.txt +#lib/firmware/carl9170fw/minifw/Kconfig +#lib/firmware/carl9170fw/minifw/miniboot.S +#lib/firmware/carl9170fw/minifw/miniboot.lds +#lib/firmware/carl9170fw/toolchain +#lib/firmware/carl9170fw/toolchain/Makefile +#lib/firmware/carl9170fw/toolchain/SHA256SUMS +#lib/firmware/carl9170fw/tools +#lib/firmware/carl9170fw/tools/CMakeLists.txt +#lib/firmware/carl9170fw/tools/Kconfig +#lib/firmware/carl9170fw/tools/carlu +#lib/firmware/carl9170fw/tools/carlu/CMakeLists.txt +#lib/firmware/carl9170fw/tools/carlu/src +#lib/firmware/carl9170fw/tools/carlu/src/carlu.h +#lib/firmware/carl9170fw/tools/carlu/src/cmd.c +#lib/firmware/carl9170fw/tools/carlu/src/cmd.h +#lib/firmware/carl9170fw/tools/carlu/src/debug.c +#lib/firmware/carl9170fw/tools/carlu/src/debug.h +#lib/firmware/carl9170fw/tools/carlu/src/fw.c +#lib/firmware/carl9170fw/tools/carlu/src/main.c +#lib/firmware/carl9170fw/tools/carlu/src/rx.c +#lib/firmware/carl9170fw/tools/carlu/src/test.c +#lib/firmware/carl9170fw/tools/carlu/src/test.h +#lib/firmware/carl9170fw/tools/carlu/src/tx.c +#lib/firmware/carl9170fw/tools/carlu/src/usb.c +#lib/firmware/carl9170fw/tools/carlu/src/usb.h +#lib/firmware/carl9170fw/tools/include +#lib/firmware/carl9170fw/tools/include/frame.h +#lib/firmware/carl9170fw/tools/include/list.h +#lib/firmware/carl9170fw/tools/lib +#lib/firmware/carl9170fw/tools/lib/CMakeLists.txt +#lib/firmware/carl9170fw/tools/lib/carlfw.c +#lib/firmware/carl9170fw/tools/lib/carlfw.h +#lib/firmware/carl9170fw/tools/src +#lib/firmware/carl9170fw/tools/src/CMakeLists.txt +#lib/firmware/carl9170fw/tools/src/checksum.c +#lib/firmware/carl9170fw/tools/src/eeprom_fix.c +#lib/firmware/carl9170fw/tools/src/fwinfo.c +#lib/firmware/carl9170fw/tools/src/miniboot.c +#lib/firmware/carl9170fw/tools/src/wol.c +lib/firmware/cbfw-3.2.1.1.bin +lib/firmware/cbfw-3.2.3.0.bin #lib/firmware/cis lib/firmware/cis/3CCFEM556.cis lib/firmware/cis/3CXEM556.cis @@ -240,6 +394,12 @@ lib/firmware/cis/tamarack.cis #lib/firmware/configure #lib/firmware/cpia2 lib/firmware/cpia2/stv0672_vp4.bin +lib/firmware/ct2fw-3.2.1.1.bin +lib/firmware/ct2fw-3.2.3.0.bin +lib/firmware/ctefx.bin +lib/firmware/ctfw-3.2.1.1.bin +lib/firmware/ctfw-3.2.3.0.bin +lib/firmware/ctspeq.bin #lib/firmware/cxgb3 lib/firmware/cxgb3/ael2005_opt_edc.bin lib/firmware/cxgb3/ael2005_twx_edc.bin @@ -252,8 +412,10 @@ lib/firmware/cxgb3/t3fw-7.10.0.bin lib/firmware/cxgb3/t3fw-7.12.0.bin lib/firmware/cxgb3/t3fw-7.4.0.bin #lib/firmware/cxgb4 -lib/firmware/cxgb4/t4fw-1.4.23.0.bin +lib/firmware/cxgb4/t4fw-1.9.23.0.bin lib/firmware/cxgb4/t4fw.bin +lib/firmware/cxgb4/t5fw-1.9.23.0.bin +lib/firmware/cxgb4/t5fw.bin #lib/firmware/dabusb lib/firmware/dabusb/bitstream.bin lib/firmware/dabusb/firmware.fw @@ -295,11 +457,24 @@ lib/firmware/ene-ub6250/sd_rdwr.bin lib/firmware/ess/maestro3_assp_kernel.fw lib/firmware/ess/maestro3_assp_minisrc.fw lib/firmware/f2255usb.bin +#lib/firmware/go7007 +lib/firmware/go7007/go7007fw.bin +lib/firmware/go7007/go7007tv.bin +lib/firmware/go7007/lr192.fw +lib/firmware/go7007/px-m402u.fw +lib/firmware/go7007/px-tv402u.fw +lib/firmware/go7007/s2250-1.fw +lib/firmware/go7007/s2250-2.fw +lib/firmware/go7007/wis-startrek.fw 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/intel +lib/firmware/intel/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq +lib/firmware/intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq +lib/firmware/intel/ibt-hw-37.7.bseq lib/firmware/intelliport2.bin #lib/firmware/isci #lib/firmware/isci/Makefile @@ -315,6 +490,7 @@ lib/firmware/iwlwifi-105-6.ucode lib/firmware/iwlwifi-135-6.ucode lib/firmware/iwlwifi-2000-6.ucode lib/firmware/iwlwifi-2030-6.ucode +lib/firmware/iwlwifi-3160-7.ucode lib/firmware/iwlwifi-3945-2.ucode lib/firmware/iwlwifi-4965-2.ucode lib/firmware/iwlwifi-5000-1.ucode @@ -328,6 +504,7 @@ lib/firmware/iwlwifi-6000g2b-5.ucode lib/firmware/iwlwifi-6000g2b-6.ucode lib/firmware/iwlwifi-6050-4.ucode lib/firmware/iwlwifi-6050-5.ucode +lib/firmware/iwlwifi-7260-7.ucode #lib/firmware/kaweth lib/firmware/kaweth/new_code.bin lib/firmware/kaweth/new_code_fix.bin @@ -385,8 +562,25 @@ lib/firmware/libertas/usb8682.bin #lib/firmware/matrox lib/firmware/matrox/g200_warp.fw lib/firmware/matrox/g400_warp.fw +#lib/firmware/moxa +lib/firmware/moxa/moxa-1250.fw +lib/firmware/moxa/moxa-1251.fw +lib/firmware/moxa/moxa-1410.fw +lib/firmware/moxa/moxa-1450.fw +lib/firmware/moxa/moxa-1451.fw +lib/firmware/moxa/moxa-1613.fw +lib/firmware/moxa/moxa-1618.fw +lib/firmware/moxa/moxa-1653.fw +lib/firmware/moxa/moxa-1658.fw #lib/firmware/mrvl +lib/firmware/mrvl/pcie8897_uapsta.bin +lib/firmware/mrvl/sd8688.bin +lib/firmware/mrvl/sd8688_helper.bin lib/firmware/mrvl/sd8787_uapsta.bin +lib/firmware/mrvl/sd8797_uapsta.bin +lib/firmware/mrvl/sd8897_uapsta.bin +lib/firmware/mrvl/usb8797_uapsta.bin +lib/firmware/mt7650.bin lib/firmware/mts_cdma.fw lib/firmware/mts_edge.fw lib/firmware/mts_gsm.fw @@ -396,7 +590,9 @@ lib/firmware/mts_mt9234zba.fw 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_8366_ap-3.fw lib/firmware/mwl8k/fmimage_8687.fw +lib/firmware/mwl8k/fmimage_8764_ap-1.fw lib/firmware/mwl8k/helper_8366.fw lib/firmware/mwl8k/helper_8687.fw lib/firmware/myri10ge_eth_z8e.dat @@ -429,23 +625,63 @@ lib/firmware/radeon/ARUBA_rlc.bin lib/firmware/radeon/BARTS_mc.bin lib/firmware/radeon/BARTS_me.bin lib/firmware/radeon/BARTS_pfp.bin +lib/firmware/radeon/BARTS_smc.bin +lib/firmware/radeon/BONAIRE_ce.bin +lib/firmware/radeon/BONAIRE_mc.bin +lib/firmware/radeon/BONAIRE_me.bin +lib/firmware/radeon/BONAIRE_mec.bin +lib/firmware/radeon/BONAIRE_pfp.bin +lib/firmware/radeon/BONAIRE_rlc.bin +lib/firmware/radeon/BONAIRE_sdma.bin +lib/firmware/radeon/BONAIRE_smc.bin +lib/firmware/radeon/BONAIRE_uvd.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/CAICOS_smc.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/CAYMAN_smc.bin lib/firmware/radeon/CEDAR_me.bin lib/firmware/radeon/CEDAR_pfp.bin lib/firmware/radeon/CEDAR_rlc.bin +lib/firmware/radeon/CEDAR_smc.bin lib/firmware/radeon/CYPRESS_me.bin lib/firmware/radeon/CYPRESS_pfp.bin lib/firmware/radeon/CYPRESS_rlc.bin +lib/firmware/radeon/CYPRESS_smc.bin +lib/firmware/radeon/CYPRESS_uvd.bin +lib/firmware/radeon/HAINAN_ce.bin +lib/firmware/radeon/HAINAN_mc.bin +lib/firmware/radeon/HAINAN_me.bin +lib/firmware/radeon/HAINAN_pfp.bin +lib/firmware/radeon/HAINAN_rlc.bin +lib/firmware/radeon/HAINAN_smc.bin lib/firmware/radeon/JUNIPER_me.bin lib/firmware/radeon/JUNIPER_pfp.bin lib/firmware/radeon/JUNIPER_rlc.bin +lib/firmware/radeon/JUNIPER_smc.bin +lib/firmware/radeon/KABINI_ce.bin +lib/firmware/radeon/KABINI_me.bin +lib/firmware/radeon/KABINI_mec.bin +lib/firmware/radeon/KABINI_pfp.bin +lib/firmware/radeon/KABINI_rlc.bin +lib/firmware/radeon/KABINI_sdma.bin +lib/firmware/radeon/KAVERI_ce.bin +lib/firmware/radeon/KAVERI_me.bin +lib/firmware/radeon/KAVERI_mec.bin +lib/firmware/radeon/KAVERI_pfp.bin +lib/firmware/radeon/KAVERI_rlc.bin +lib/firmware/radeon/KAVERI_sdma.bin +lib/firmware/radeon/OLAND_ce.bin +lib/firmware/radeon/OLAND_mc.bin +lib/firmware/radeon/OLAND_me.bin +lib/firmware/radeon/OLAND_pfp.bin +lib/firmware/radeon/OLAND_rlc.bin +lib/firmware/radeon/OLAND_smc.bin lib/firmware/radeon/PALM_me.bin lib/firmware/radeon/PALM_pfp.bin lib/firmware/radeon/PITCAIRN_ce.bin @@ -453,6 +689,7 @@ lib/firmware/radeon/PITCAIRN_mc.bin lib/firmware/radeon/PITCAIRN_me.bin lib/firmware/radeon/PITCAIRN_pfp.bin lib/firmware/radeon/PITCAIRN_rlc.bin +lib/firmware/radeon/PITCAIRN_smc.bin lib/firmware/radeon/R100_cp.bin lib/firmware/radeon/R200_cp.bin lib/firmware/radeon/R300_cp.bin @@ -465,6 +702,7 @@ 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/REDWOOD_smc.bin lib/firmware/radeon/RS600_cp.bin lib/firmware/radeon/RS690_cp.bin lib/firmware/radeon/RS780_me.bin @@ -481,28 +719,39 @@ lib/firmware/radeon/RV670_me.bin lib/firmware/radeon/RV670_pfp.bin lib/firmware/radeon/RV710_me.bin lib/firmware/radeon/RV710_pfp.bin +lib/firmware/radeon/RV710_smc.bin +lib/firmware/radeon/RV710_uvd.bin lib/firmware/radeon/RV730_me.bin lib/firmware/radeon/RV730_pfp.bin +lib/firmware/radeon/RV730_smc.bin +lib/firmware/radeon/RV740_smc.bin lib/firmware/radeon/RV770_me.bin lib/firmware/radeon/RV770_pfp.bin +lib/firmware/radeon/RV770_smc.bin lib/firmware/radeon/SUMO2_me.bin lib/firmware/radeon/SUMO2_pfp.bin lib/firmware/radeon/SUMO_me.bin lib/firmware/radeon/SUMO_pfp.bin lib/firmware/radeon/SUMO_rlc.bin +lib/firmware/radeon/SUMO_uvd.bin lib/firmware/radeon/TAHITI_ce.bin lib/firmware/radeon/TAHITI_mc.bin lib/firmware/radeon/TAHITI_me.bin lib/firmware/radeon/TAHITI_pfp.bin lib/firmware/radeon/TAHITI_rlc.bin +lib/firmware/radeon/TAHITI_smc.bin +lib/firmware/radeon/TAHITI_uvd.bin lib/firmware/radeon/TURKS_mc.bin lib/firmware/radeon/TURKS_me.bin lib/firmware/radeon/TURKS_pfp.bin +lib/firmware/radeon/TURKS_smc.bin lib/firmware/radeon/VERDE_ce.bin lib/firmware/radeon/VERDE_mc.bin lib/firmware/radeon/VERDE_me.bin lib/firmware/radeon/VERDE_pfp.bin lib/firmware/radeon/VERDE_rlc.bin +lib/firmware/radeon/VERDE_smc.bin +lib/firmware/rp2.fw lib/firmware/rt2561.bin lib/firmware/rt2561s.bin lib/firmware/rt2661.bin @@ -516,6 +765,7 @@ lib/firmware/rt73.bin #lib/firmware/rtl_nic lib/firmware/rtl_nic/rtl8105e-1.fw lib/firmware/rtl_nic/rtl8106e-1.fw +lib/firmware/rtl_nic/rtl8106e-2.fw lib/firmware/rtl_nic/rtl8168d-1.fw lib/firmware/rtl_nic/rtl8168d-2.fw lib/firmware/rtl_nic/rtl8168e-1.fw @@ -524,13 +774,21 @@ lib/firmware/rtl_nic/rtl8168e-3.fw lib/firmware/rtl_nic/rtl8168f-1.fw lib/firmware/rtl_nic/rtl8168f-2.fw lib/firmware/rtl_nic/rtl8168g-1.fw +lib/firmware/rtl_nic/rtl8168g-2.fw +lib/firmware/rtl_nic/rtl8168g-3.fw lib/firmware/rtl_nic/rtl8402-1.fw lib/firmware/rtl_nic/rtl8411-1.fw +lib/firmware/rtl_nic/rtl8411-2.fw #lib/firmware/rtlwifi +lib/firmware/rtlwifi/rtl8188efw.bin +lib/firmware/rtlwifi/rtl8188eufw.bin lib/firmware/rtlwifi/rtl8192cfw.bin lib/firmware/rtlwifi/rtl8192cfwU.bin lib/firmware/rtlwifi/rtl8192cfwU_B.bin lib/firmware/rtlwifi/rtl8192cufw.bin +lib/firmware/rtlwifi/rtl8192cufw_A.bin +lib/firmware/rtlwifi/rtl8192cufw_B.bin +lib/firmware/rtlwifi/rtl8192cufw_TMSC.bin lib/firmware/rtlwifi/rtl8192defw.bin lib/firmware/rtlwifi/rtl8192sefw.bin lib/firmware/rtlwifi/rtl8712u.bin @@ -538,12 +796,16 @@ lib/firmware/rtlwifi/rtl8723fw.bin lib/firmware/rtlwifi/rtl8723fw_B.bin lib/firmware/s2250.fw lib/firmware/s2250_loader.fw +lib/firmware/s5p-mfc +lib/firmware/s5p-mfc/s5p-mfc-v6.fw +lib/firmware/s5p-mfc/s5p-mfc.fw #lib/firmware/sb16 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/sdd_sagrad_1091_1098.bin #lib/firmware/slicoss lib/firmware/slicoss/gbdownload.sys lib/firmware/slicoss/gbrcvucode.sys @@ -559,6 +821,8 @@ lib/firmware/sxg/saharadownloadB.sys lib/firmware/tehuti/bdx.bin #lib/firmware/ti-connectivity lib/firmware/ti-connectivity/TIInit_7.2.31.bts +lib/firmware/ti-connectivity/wl1251-fw.bin +lib/firmware/ti-connectivity/wl1251-nvs.bin lib/firmware/ti-connectivity/wl1271-fw-2.bin lib/firmware/ti-connectivity/wl1271-fw-ap.bin lib/firmware/ti-connectivity/wl1271-fw.bin @@ -584,11 +848,14 @@ lib/firmware/ti-connectivity/wl128x-fw-plt-3.bin lib/firmware/ti-connectivity/wl128x-fw.bin lib/firmware/ti-connectivity/wl128x-nvs.bin lib/firmware/ti-connectivity/wl12xx-nvs.bin +lib/firmware/ti-connectivity/wl18xx-conf.bin +lib/firmware/ti-connectivity/wl18xx-fw-2.bin lib/firmware/ti-connectivity/wl18xx-fw.bin lib/firmware/ti_3410.fw lib/firmware/ti_5052.fw #lib/firmware/tigon lib/firmware/tigon/tg3.bin +lib/firmware/tigon/tg357766.bin lib/firmware/tigon/tg3_tso.bin lib/firmware/tigon/tg3_tso5.bin lib/firmware/tlg2300_firmware.bin @@ -635,7 +902,6 @@ lib/firmware/v4l-cx23418-apu.fw lib/firmware/v4l-cx23418-cpu.fw lib/firmware/v4l-cx23418-dig.fw lib/firmware/v4l-cx23885-avcore-01.fw -lib/firmware/v4l-cx23885-enc.fw lib/firmware/v4l-cx25840.fw #lib/firmware/vicam lib/firmware/vicam/firmware.fw @@ -645,6 +911,7 @@ lib/firmware/vxge/X3fw-pxe.ncf lib/firmware/vxge/X3fw.ncf lib/firmware/whiteheat.fw lib/firmware/whiteheat_loader.fw +lib/firmware/wsm_22.bin #lib/firmware/yam lib/firmware/yam/1200.bin lib/firmware/yam/9600.bin diff --git a/config/rootfiles/core/fifteen/filelists/dvb-firmwares b/config/rootfiles/core/fifteen/filelists/dvb-firmwares new file mode 120000 index 0000000..69d0cdc --- /dev/null +++ b/config/rootfiles/core/fifteen/filelists/dvb-firmwares @@ -0,0 +1 @@ +../../../common/dvb-firmwares \ No newline at end of file diff --git a/config/rootfiles/core/fifteen/filelists/linux-firmware b/config/rootfiles/core/fifteen/filelists/linux-firmware new file mode 120000 index 0000000..4bf91bc --- /dev/null +++ b/config/rootfiles/core/fifteen/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/lfs/linux-firmware b/lfs/linux-firmware index 33a5381..1dbfc7e 100644 --- a/lfs/linux-firmware +++ b/lfs/linux-firmware @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,10 @@ include Config -VER = 236367d +VER = 52d77db THISAPP = linux-firmware-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,8 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 35d2ecf9b7d0b4d339fa0d4cc0736f6f - +$(DL_FILE)_MD5 = 3f6f1e78af3ee67a5540355f2ed8ba14 install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -69,7 +68,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) mkdir -p /lib/firmware cd $(DIR_APP) && cp -vr * /lib/firmware @rm -rf $(DIR_APP) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 3547adad97669b65c9b11eb69aa36fd41a2484d0
by git＠ipfire.org 10 Jan '14

10 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via 3547adad97669b65c9b11eb69aa36fd41a2484d0 (commit) via 986ba0d12789e4a91d3cfb923822e2f366c9070a (commit) from 2a747e37a86f44c5da8dbf67c4135772df29f24e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3547adad97669b65c9b11eb69aa36fd41a2484d0 Merge: 986ba0d 2a747e3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 10 20:31:03 2014 +0100 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen commit 986ba0d12789e4a91d3cfb923822e2f366c9070a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 10 20:30:13 2014 +0100 usb_modesitch: update to 2.01 and database 20131113. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/usb_modeswitch | 1 + config/rootfiles/common/usb_modeswitch_data | 22 +++++++++++++++++++--- .../34 => core/fifteen}/filelists/usb_modeswitch | 0 .../fifteen}/filelists/usb_modeswitch_data | 0 config/rootfiles/core/fifteen/update.sh | 4 ++++ lfs/usb_modeswitch | 6 +++--- lfs/usb_modeswitch_data | 6 +++--- 7 files changed, 30 insertions(+), 9 deletions(-) copy config/rootfiles/{oldcore/34 => core/fifteen}/filelists/usb_modeswitch (100%) copy config/rootfiles/{oldcore/44 => core/fifteen}/filelists/usb_modeswitch_data (100%) Difference in files: diff --git a/config/rootfiles/common/usb_modeswitch b/config/rootfiles/common/usb_modeswitch index ab46c4d..2b386b3 100644 --- a/config/rootfiles/common/usb_modeswitch +++ b/config/rootfiles/common/usb_modeswitch @@ -3,4 +3,5 @@ lib/udev/usb_modeswitch usr/sbin/usb_modeswitch usr/sbin/usb_modeswitch_dispatcher #usr/share/man/man1/usb_modeswitch.1 +#usr/share/man/man1/usb_modeswitch_dispatcher.1 var/lib/usb_modeswitch diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data index a454c61..6948694 100644 --- a/config/rootfiles/common/usb_modeswitch_data +++ b/config/rootfiles/common/usb_modeswitch_data @@ -2,6 +2,9 @@ etc/usb_modeswitch.d lib/udev/rules.d/40-usb_modeswitch.rules #usr/share/usb_modeswitch usr/share/usb_modeswitch/03f0:002a +usr/share/usb_modeswitch/0408:ea17 +usr/share/usb_modeswitch/0408:ea25 +usr/share/usb_modeswitch/0408:ea43 usr/share/usb_modeswitch/0408:f000 usr/share/usb_modeswitch/0421:060c usr/share/usb_modeswitch/0421:0610 @@ -21,6 +24,7 @@ usr/share/usb_modeswitch/04cc:225c usr/share/usb_modeswitch/04e8:680c usr/share/usb_modeswitch/04e8:689a usr/share/usb_modeswitch/04e8:f000:sMo=U209 +usr/share/usb_modeswitch/057c:62ff usr/share/usb_modeswitch/057c:84ff usr/share/usb_modeswitch/05c6:0010 usr/share/usb_modeswitch/05c6:1000:sVe=GT @@ -36,6 +40,7 @@ usr/share/usb_modeswitch/05c6:1000:uMa=Vertex usr/share/usb_modeswitch/05c6:2000 usr/share/usb_modeswitch/05c6:2001 usr/share/usb_modeswitch/05c6:6503 +usr/share/usb_modeswitch/05c6:9024 usr/share/usb_modeswitch/05c6:f000 usr/share/usb_modeswitch/05c7:1000 usr/share/usb_modeswitch/072f:100d @@ -112,6 +117,7 @@ usr/share/usb_modeswitch/0d46:45a5 usr/share/usb_modeswitch/0df7:0800 usr/share/usb_modeswitch/0e8d:0002:uPr=MT usr/share/usb_modeswitch/0e8d:7109 +usr/share/usb_modeswitch/0fca:8020 usr/share/usb_modeswitch/0fce:d0cf usr/share/usb_modeswitch/0fce:d0e1 usr/share/usb_modeswitch/0fce:d103 @@ -136,6 +142,7 @@ usr/share/usb_modeswitch/106c:3b11 usr/share/usb_modeswitch/106c:3b14 usr/share/usb_modeswitch/1076:7f40 usr/share/usb_modeswitch/109b:f009 +usr/share/usb_modeswitch/10a9:6080 usr/share/usb_modeswitch/1199:0fff usr/share/usb_modeswitch/1266:1000 usr/share/usb_modeswitch/12d1:1001 @@ -166,6 +173,7 @@ usr/share/usb_modeswitch/12d1:1526 usr/share/usb_modeswitch/12d1:1553 usr/share/usb_modeswitch/12d1:1557 usr/share/usb_modeswitch/12d1:155b +usr/share/usb_modeswitch/12d1:156a usr/share/usb_modeswitch/12d1:1805 usr/share/usb_modeswitch/12d1:1c0b usr/share/usb_modeswitch/12d1:1c1b @@ -175,6 +183,11 @@ usr/share/usb_modeswitch/12d1:1da1 usr/share/usb_modeswitch/12d1:1f01 usr/share/usb_modeswitch/12d1:1f03 usr/share/usb_modeswitch/12d1:1f11 +usr/share/usb_modeswitch/12d1:1f15 +usr/share/usb_modeswitch/12d1:1f16 +usr/share/usb_modeswitch/12d1:1f17 +usr/share/usb_modeswitch/12d1:1f18 +usr/share/usb_modeswitch/12d1:1f19 usr/share/usb_modeswitch/12d1:380b usr/share/usb_modeswitch/1307:1169 usr/share/usb_modeswitch/1410:5010 @@ -198,12 +211,9 @@ usr/share/usb_modeswitch/1726:f00e usr/share/usb_modeswitch/198a:0003 usr/share/usb_modeswitch/198f:bccd usr/share/usb_modeswitch/19d2:0003 -usr/share/usb_modeswitch/19d2:0013 usr/share/usb_modeswitch/19d2:0026 -usr/share/usb_modeswitch/19d2:0031 usr/share/usb_modeswitch/19d2:0040 usr/share/usb_modeswitch/19d2:0053 -usr/share/usb_modeswitch/19d2:0083 usr/share/usb_modeswitch/19d2:0083:uPr=WCDMA usr/share/usb_modeswitch/19d2:0101 usr/share/usb_modeswitch/19d2:0103 @@ -217,6 +227,7 @@ usr/share/usb_modeswitch/19d2:0154 usr/share/usb_modeswitch/19d2:0166 usr/share/usb_modeswitch/19d2:0169 usr/share/usb_modeswitch/19d2:0266 +usr/share/usb_modeswitch/19d2:0304 usr/share/usb_modeswitch/19d2:0325 usr/share/usb_modeswitch/19d2:1001 usr/share/usb_modeswitch/19d2:1007 @@ -229,6 +240,7 @@ usr/share/usb_modeswitch/19d2:1179 usr/share/usb_modeswitch/19d2:1201 usr/share/usb_modeswitch/19d2:1216 usr/share/usb_modeswitch/19d2:1224 +usr/share/usb_modeswitch/19d2:1225 usr/share/usb_modeswitch/19d2:1227 usr/share/usb_modeswitch/19d2:1514 usr/share/usb_modeswitch/19d2:1517 @@ -237,6 +249,7 @@ usr/share/usb_modeswitch/19d2:1523 usr/share/usb_modeswitch/19d2:1528 usr/share/usb_modeswitch/19d2:1542 usr/share/usb_modeswitch/19d2:2000 +usr/share/usb_modeswitch/19d2:2004 usr/share/usb_modeswitch/19d2:bccd usr/share/usb_modeswitch/19d2:ffde usr/share/usb_modeswitch/19d2:ffe6 @@ -248,6 +261,7 @@ usr/share/usb_modeswitch/1ab7:5700 usr/share/usb_modeswitch/1b7d:0700 usr/share/usb_modeswitch/1bbb:000f usr/share/usb_modeswitch/1bbb:00ca +usr/share/usb_modeswitch/1bbb:011f usr/share/usb_modeswitch/1bbb:f000 usr/share/usb_modeswitch/1bbb:f017 usr/share/usb_modeswitch/1bbb:f052 @@ -296,5 +310,7 @@ usr/share/usb_modeswitch/22f4:0021 usr/share/usb_modeswitch/230d:0001 usr/share/usb_modeswitch/230d:0007 usr/share/usb_modeswitch/230d:0101 +usr/share/usb_modeswitch/230d:0103 usr/share/usb_modeswitch/2357:0200 +usr/share/usb_modeswitch/2357:f000 usr/share/usb_modeswitch/8888:6500 diff --git a/config/rootfiles/core/fifteen/filelists/usb_modeswitch b/config/rootfiles/core/fifteen/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/core/fifteen/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/fifteen/filelists/usb_modeswitch_data b/config/rootfiles/core/fifteen/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/core/fifteen/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/fifteen/update.sh b/config/rootfiles/core/fifteen/update.sh index 8e0c2e1..54e756c 100644 --- a/config/rootfiles/core/fifteen/update.sh +++ b/config/rootfiles/core/fifteen/update.sh @@ -109,6 +109,7 @@ add_to_backup srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi add_to_backup var/ipfire/{dmzholes,portfw,outgoing,xtaccess} add_to_backup etc/inittab add_to_backup etc/fstab +add_to_backup usr/share/usb_modeswitch # Backup the files tar cJvf /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz \ @@ -137,6 +138,9 @@ rm -rf /boot/uImage-ipfire-* rm -rf /boot/uInit-ipfire-* rm -rf /lib/modules +# Remove old usb_modeswitch_data +rm -rf /usr/share/usb_modeswitch + # # Remove old udev rules. # diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index 0f28078..b0cf7d3 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.2.6 +VER = 2.0.1 THISAPP = usb-modeswitch-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3cd804ad2dd4cb61fbd77a5cc033496c +$(DL_FILE)_MD5 = e48d4419d0574d342bb183f7465556d0 install : $(TARGET) diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index 709434c..95aeac6 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 20130610 +VER = 20131113 THISAPP = usb-modeswitch-data-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 52dff3f54e0c01dad02639d642e089e0 +$(DL_FILE)_MD5 = 7b5ac1226b360ddc366c286e62b3c3a4 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 2a747e37a86f44c5da8dbf67c4135772df29f24e
by git＠ipfire.org 10 Jan '14

10 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via 2a747e37a86f44c5da8dbf67c4135772df29f24e (commit) from 7514fe47f6b2caf5a1dfc80de3a539975b753b21 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2a747e37a86f44c5da8dbf67c4135772df29f24e Author: Kim Wölfel <xaver4all(a)gmx.de> Date: Fri Jan 10 16:19:43 2014 +0100 guardian: React on BF attacks for SSH at pre-auth stage. See #10457. ----------------------------------------------------------------------- Summary of changes: config/guardian/guardian.pl | 6 +++++- lfs/guardian | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/guardian/guardian.pl b/config/guardian/guardian.pl index 86d93fe..34546b7 100644 --- a/config/guardian/guardian.pl +++ b/config/guardian/guardian.pl @@ -106,6 +106,10 @@ for (;;) { $temp = $array[11]; } &checkssh ($temp, "possible SSH-Bruteforce Attack");} + + # This should catch Bruteforce Attacks with enabled preauth + if ($_ =~ /.*sshd.*Received disconnect from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}):.*\[preauth\]/) { + &checkssh ($1, "possible SSH-Bruteforce Attack, failed preauth");} } } @@ -424,4 +428,4 @@ sub get_aliases { } print "done \n"; -} \ No newline at end of file +} diff --git a/lfs/guardian b/lfs/guardian index fea50db..a91fbd9 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -30,7 +30,7 @@ THISAPP = guardian-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = guardian -PAK_VER = 8 +PAK_VER = 9 DEPS = "" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 7514fe47f6b2caf5a1dfc80de3a539975b753b21
by git＠ipfire.org 10 Jan '14

10 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via 7514fe47f6b2caf5a1dfc80de3a539975b753b21 (commit) from 2505d2763efef1c2339f84f8130594c0ee7feaec (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7514fe47f6b2caf5a1dfc80de3a539975b753b21 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jan 10 15:59:33 2014 +0100 convert-outgoingfw: Fix permissions of p2protocols configuration file. World access can not be granted to this file. It must be writable by nobody and can be read by all users. ----------------------------------------------------------------------- Summary of changes: config/firewall/convert-outgoingfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/firewall/convert-outgoingfw b/config/firewall/convert-outgoingfw index d2672cb..4f8bcdc 100755 --- a/config/firewall/convert-outgoingfw +++ b/config/firewall/convert-outgoingfw @@ -675,5 +675,5 @@ sub build_ovpn_grp sub process_p2p { copy("/var/ipfire/outgoing/p2protocols","/var/ipfire/firewall/p2protocols"); - chmod oct('0777'), '/var/ipfire/firewall/p2protocols'; + chown 99, 99, '/var/ipfire/firewall/p2protocols'; } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 2505d2763efef1c2339f84f8130594c0ee7feaec
by git＠ipfire.org 10 Jan '14

10 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via 2505d2763efef1c2339f84f8130594c0ee7feaec (commit) from c82aa2ec9e0dee2d3ed1b5f3ca3c8fc158404228 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2505d2763efef1c2339f84f8130594c0ee7feaec Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 9 23:51:03 2014 +0100 kernel: update to 3.10.26. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/fifteen/update.sh | 2 +- lfs/linux | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/core/fifteen/update.sh b/config/rootfiles/core/fifteen/update.sh index 2bbb539..8e0c2e1 100644 --- a/config/rootfiles/core/fifteen/update.sh +++ b/config/rootfiles/core/fifteen/update.sh @@ -71,7 +71,7 @@ esac # # -KVER="3.10.25" +KVER="3.10.26" MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 ` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null diff --git a/lfs/linux b/lfs/linux index a30c46b..560be5d 100644 --- a/lfs/linux +++ b/lfs/linux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,10 @@ include Config -VER = 3.10.25 +VER = 3.10.26 RPI_PATCHES = linux-3.10.10-grsec-c1af7c6 -GRS_PATCHES = grsecurity-2.9.1-3.10.25-ipfire1.patch.xz +GRS_PATCHES = grsecurity-2.9.1-3.10.26-ipfire1.patch.xz THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 762a030e6b927d855a7da3599381d6ee +$(DL_FILE)_MD5 = 9cdbcb3463b9753fafd97cddb38d1211 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = f55981853573236069db5ad9fb7a4bd9 -$(GRS_PATCHES)_MD5 = 3fa426c36c1faab3262ff68f166dbae2 +$(GRS_PATCHES)_MD5 = 1516189415141aa55eacb0a078e8909c install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. c82aa2ec9e0dee2d3ed1b5f3ca3c8fc158404228
by git＠ipfire.org 09 Jan '14

09 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via c82aa2ec9e0dee2d3ed1b5f3ca3c8fc158404228 (commit) via fcd014e0afcb8370106ab0044a9911f9ce7c225a (commit) via b7e621e1b1e3575ce5b10edfc6b99314c75864a0 (commit) via e3d82d27a0e3f8ed83cbaeca2166c53d9eede5f1 (commit) via 6f5487d711a868f116618b1b1d7d7be74a23637f (commit) via a9344b774b54495dcdd811f5854a0f2f640bb06c (commit) via 38d3b742e70306d88795d25916f443a1b8d4932d (commit) via 57ba5e812641d5bcd94e3e1bf55a7af375de853c (commit) via d00b3548852f478a566ffa6dc9dc4b89e86c58a3 (commit) via 4d74a20df062b9449fc4bda89da7d2e8ace49552 (commit) via 3932f02ba33e0f0b7686db4bd6f4609ae7e3d370 (commit) via 9efba5f773a19b0b402bd7b4454d911f304e7d3b (commit) via 6fc0703674ad8f77445e1e997ddd990b24123854 (commit) via 73ede29f00320a187c49f2708e37aaea70bc1b8c (commit) via c8ee899dbc37aee41df8298bdf3fb5102cd89b27 (commit) via 5b579ad60c2bfed1e451ba096880734061e81e9f (commit) via 77a516cd6a74a7bfdf069a6fe0586f59594c04fd (commit) via f9a3c1c8c9d8068f4b8d7e1d3f4e732195553b52 (commit) via bc8ecbd6ae95d54ef0d9e99d564e09265e97bc9a (commit) via 62f34bba1e6b8814a584f371199ad567f9944fa5 (commit) via 7cc8a0e526d20b2bf75a68ff208a3dbf0723c552 (commit) via dfcb2b9f9af53947ab6bfb8ad51e2a30ea034045 (commit) via 5ef70cca5dc565fd8521cdae7e995763f9bcb60f (commit) via 2aaa32f72786004ef4a5eff2c0bd018691606085 (commit) via ec5a7d21f63e0132ae97368bd269cf257530022e (commit) via f7edf97ae7044ff6d2fe25d3863c04d559197cbe (commit) via 0afd84931ea1a0712fafb85aac8976069b465c90 (commit) via 86048afb5a45fdb0a39051bcefd80edbbd52b8a9 (commit) via cc37572cf7f17795c07c546bef0f731c1b3c4db3 (commit) via bfe4320c6b9b5065db13008753a8d5e48c6eacd7 (commit) via b84989af49f116d25d039b46ce825c0f98a06ee4 (commit) via ff92ff172269bbf8bed44a1f7cf36891d7843352 (commit) via 0a644b4a04bbba6e94a8f5afed8eeca028fd6de3 (commit) via 84394ec6dd2512e12b46b1546e4b2dae721457a8 (commit) via e084eea001b33fd4e16924c5caf7dc4742036670 (commit) via 0da15c03d707ae58bd12b62a389b5970d4e57ce4 (commit) via a9d40c03dbd5f486e0efba0c1a0fa406a15b78e9 (commit) via 4ede29562fce127f88c20cec3bcdf9c6ac5bb988 (commit) via 4b74791b5da0a95fa9cef99faf2eea467985dce8 (commit) via 55f084930912949f0d841cb2143d884d436c02d9 (commit) via 748cfb0b8f5daba5cc0e6655ab93f0d32d3232b5 (commit) via 943a96faed4fb515259c18d04b330ba622490b7b (commit) via 4bf6a597fead7f5bf3d868593be4d9e366a1f3e8 (commit) via 043cfbc01fb23eb3f64fd290043fd3bfd21eb263 (commit) from 9063a04e94587fc38f410ec2234275417de201ad (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c82aa2ec9e0dee2d3ed1b5f3ca3c8fc158404228 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 9 18:46:03 2014 +0100 theme: Decrease font size of h2 elements. commit fcd014e0afcb8370106ab0044a9911f9ce7c225a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 9 18:45:55 2014 +0100 Update translations. commit b7e621e1b1e3575ce5b10edfc6b99314c75864a0 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 16:53:09 2014 +0100 some corrections for titles EN commit e3d82d27a0e3f8ed83cbaeca2166c53d9eede5f1 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 16:52:29 2014 +0100 correct title of hdd graph site commit 6f5487d711a868f116618b1b1d7d7be74a23637f Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 16:50:46 2014 +0100 deleted title of backup.cgi commit a9344b774b54495dcdd811f5854a0f2f640bb06c Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 16:29:36 2014 +0100 language changes second part commit 38d3b742e70306d88795d25916f443a1b8d4932d Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 16:28:57 2014 +0100 language changes 2. part commit 57ba5e812641d5bcd94e3e1bf55a7af375de853c Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 16:28:08 2014 +0100 layout of p2p-block.cgi title commit d00b3548852f478a566ffa6dc9dc4b89e86c58a3 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 16:27:30 2014 +0100 Layout of optionsfw.cgi - title commit 4d74a20df062b9449fc4bda89da7d2e8ace49552 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 16:26:40 2014 +0100 Layout of fwhosts title commit 3932f02ba33e0f0b7686db4bd6f4609ae7e3d370 Merge: 9efba5f 9063a04 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 16:23:39 2014 +0100 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen-layout commit 9efba5f773a19b0b402bd7b4454d911f304e7d3b Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:11:25 2014 +0100 Language changes for new layout commit 6fc0703674ad8f77445e1e997ddd990b24123854 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:10:47 2014 +0100 Language changes for new Layout DE commit 73ede29f00320a187c49f2708e37aaea70bc1b8c Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:09:50 2014 +0100 Layout changes firewalllog.dat commit c8ee899dbc37aee41df8298bdf3fb5102cd89b27 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:08:41 2014 +0100 Layout changes firewalllogport.dat commit 5b579ad60c2bfed1e451ba096880734061e81e9f Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:08:00 2014 +0100 Layout changes firewalllogip.dat commit 77a516cd6a74a7bfdf069a6fe0586f59594c04fd Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:06:16 2014 +0100 Layout changes wireless.cgi commit f9a3c1c8c9d8068f4b8d7e1d3f4e732195553b52 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:05:36 2014 +0100 LAyout changes optionsfw.cgi commit bc8ecbd6ae95d54ef0d9e99d564e09265e97bc9a Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:05:00 2014 +0100 Layout changes fwhosts.cgi commit 62f34bba1e6b8814a584f371199ad567f9944fa5 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:03:27 2014 +0100 Layout changes firewall.cgi commit 7cc8a0e526d20b2bf75a68ff208a3dbf0723c552 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:02:49 2014 +0100 Layout changes ids.cgi commit dfcb2b9f9af53947ab6bfb8ad51e2a30ea034045 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:02:15 2014 +0100 Layout changes extrahd.cgi commit 5ef70cca5dc565fd8521cdae7e995763f9bcb60f Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:01:34 2014 +0100 Layout changes qos.cgi commit 2aaa32f72786004ef4a5eff2c0bd018691606085 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:00:57 2014 +0100 Layout changes time.cgi commit ec5a7d21f63e0132ae97368bd269cf257530022e Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 15:00:23 2014 +0100 Layout changes ddns.cgi commit f7edf97ae7044ff6d2fe25d3863c04d559197cbe Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:59:46 2014 +0100 Layout changes ovpnmain.cgi commit 0afd84931ea1a0712fafb85aac8976069b465c90 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:59:10 2014 +0100 Layout changes vpnmain.cgi commit 86048afb5a45fdb0a39051bcefd80edbbd52b8a9 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:56:21 2014 +0100 Layout changes wakeonlan.cgi commit cc37572cf7f17795c07c546bef0f731c1b3c4db3 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:55:11 2014 +0100 Layout changes mac.cgi commit bfe4320c6b9b5065db13008753a8d5e48c6eacd7 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:54:24 2014 +0100 Layout changes aliases.cgi commit b84989af49f116d25d039b46ce825c0f98a06ee4 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:53:45 2014 +0100 Layout changes routing.cgi commit ff92ff172269bbf8bed44a1f7cf36891d7843352 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:53:09 2014 +0100 Layout changes dnsforward.cgi commit 0a644b4a04bbba6e94a8f5afed8eeca028fd6de3 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:52:33 2014 +0100 Layout changes hosts.cgi commit 84394ec6dd2512e12b46b1546e4b2dae721457a8 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:51:55 2014 +0100 LAyout changes connscheduler.cgi commit e084eea001b33fd4e16924c5caf7dc4742036670 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:51:19 2014 +0100 LAyout changes dhcp.cgi commit 0da15c03d707ae58bd12b62a389b5970d4e57ce4 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:50:41 2014 +0100 Layout changes urlfilter.cgi commit a9d40c03dbd5f486e0efba0c1a0fa406a15b78e9 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:50:04 2014 +0100 Layout changes services.cgi commit 4ede29562fce127f88c20cec3bcdf9c6ac5bb988 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:49:23 2014 +0100 Layout changes backup.cgi commit 4b74791b5da0a95fa9cef99faf2eea467985dce8 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:48:44 2014 +0100 Layout chnages credits.cgi commit 55f084930912949f0d841cb2143d884d436c02d9 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:47:57 2014 +0100 LAyout changes gui.cgi commit 748cfb0b8f5daba5cc0e6655ab93f0d32d3232b5 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 14:47:12 2014 +0100 Layout changes remote.cgi commit 943a96faed4fb515259c18d04b330ba622490b7b Merge: 4bf6a59 9b574b1 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Jan 9 10:15:29 2014 +0100 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen-layout commit 4bf6a597fead7f5bf3d868593be4d9e366a1f3e8 Author: Alexander Marx <amarx(a)ipfire.org> Date: Wed Jan 8 15:35:19 2014 +0100 statuspage: some fixes of last commit commit 043cfbc01fb23eb3f64fd290043fd3bfd21eb263 Author: Alexander Marx <amarx(a)ipfire.org> Date: Wed Jan 8 15:10:54 2014 +0100 Layout index: added shutdown.cgi and menuentry. Also redesigned Layout ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 8 ++- doc/language_issues.en | 6 +- doc/language_issues.es | 7 ++- doc/language_issues.fr | 7 ++- doc/language_issues.nl | 7 ++- doc/language_issues.pl | 7 ++- doc/language_issues.ru | 7 ++- doc/language_issues.tr | 7 ++- doc/language_missings | 13 +++-- html/cgi-bin/aliases.cgi | 4 +- html/cgi-bin/backup.cgi | 6 +- html/cgi-bin/connscheduler.cgi | 11 ++-- html/cgi-bin/credits.cgi | 4 +- html/cgi-bin/ddns.cgi | 7 ++- html/cgi-bin/dhcp.cgi | 7 +-- html/cgi-bin/dnsforward.cgi | 4 +- html/cgi-bin/extrahd.cgi | 4 -- html/cgi-bin/firewall.cgi | 13 ++--- html/cgi-bin/fwhosts.cgi | 69 ++++++++++++++--------- html/cgi-bin/gui.cgi | 35 +++++++----- html/cgi-bin/hosts.cgi | 5 +- html/cgi-bin/ids.cgi | 18 +++--- html/cgi-bin/logs.cgi/firewalllog.dat | 2 +- html/cgi-bin/logs.cgi/firewalllogip.dat | 16 +++--- html/cgi-bin/logs.cgi/firewalllogport.dat | 16 +++--- html/cgi-bin/mac.cgi | 10 +--- html/cgi-bin/optionsfw.cgi | 6 +- html/cgi-bin/ovpnmain.cgi | 70 +++++++++++++----------- html/cgi-bin/p2p-block.cgi | 2 +- html/cgi-bin/qos.cgi | 19 ++++--- html/cgi-bin/remote.cgi | 4 +- html/cgi-bin/routing.cgi | 4 +- html/cgi-bin/services.cgi | 10 ++-- html/cgi-bin/time.cgi | 21 +++---- html/cgi-bin/urlfilter.cgi | 4 +- html/cgi-bin/vpnmain.cgi | 29 ++++++---- html/cgi-bin/wakeonlan.cgi | 6 +- html/cgi-bin/wireless.cgi | 9 ++- html/html/themes/ipfire/include/css/style.css | 2 +- langs/de/cgi-bin/de.pl | 63 ++++++++++----------- langs/en/cgi-bin/en.pl | 79 ++++++++++++++------------- 41 files changed, 342 insertions(+), 286 deletions(-) mode change 100755 => 100644 html/cgi-bin/fwhosts.cgi Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 0eae7bf..4add394 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -19,6 +19,7 @@ WARNING: translation string unused: add new ovpn WARNING: translation string unused: add service WARNING: translation string unused: add xtaccess WARNING: translation string unused: add-route +WARNING: translation string unused: addon WARNING: translation string unused: admin user password has been changed WARNING: translation string unused: administrator user password WARNING: translation string unused: advproxy LDAP auth @@ -181,6 +182,7 @@ WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed WARNING: translation string unused: external access rule removed +WARNING: translation string unused: extrahd WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write WARNING: translation string unused: filename @@ -203,6 +205,7 @@ WARNING: translation string unused: from email user WARNING: translation string unused: from warn email bad WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 +WARNING: translation string unused: fwdfw addrule WARNING: translation string unused: fwdfw err prot_port1 WARNING: translation string unused: fwdfw final_rule WARNING: translation string unused: fwdfw from @@ -216,7 +219,6 @@ WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time WARNING: translation string unused: fwdfw xt access -WARNING: translation string unused: fwhost addrule WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue WARNING: translation string unused: fwhost changeremark @@ -224,6 +226,7 @@ WARNING: translation string unused: fwhost err addrgrp WARNING: translation string unused: fwhost err hostorip WARNING: translation string unused: fwhost err mac WARNING: translation string unused: fwhost green +WARNING: translation string unused: fwhost hosts WARNING: translation string unused: fwhost ipadr WARNING: translation string unused: fwhost ipsec host WARNING: translation string unused: fwhost orange @@ -259,6 +262,7 @@ WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates WARNING: translation string unused: intrusion detection system log viewer +WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size WARNING: translation string unused: invalid date entered WARNING: translation string unused: invalid downlink speed @@ -340,6 +344,7 @@ WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed WARNING: translation string unused: network status information +WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings @@ -586,6 +591,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: addons WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: bytes WARNING: untranslated string: community rules diff --git a/doc/language_issues.en b/doc/language_issues.en index c03ecb9..416d9eb 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -204,6 +204,7 @@ WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed WARNING: translation string unused: external access rule removed +WARNING: translation string unused: extrahd WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write WARNING: translation string unused: filename @@ -226,6 +227,7 @@ WARNING: translation string unused: from email user WARNING: translation string unused: from warn email bad WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 +WARNING: translation string unused: fwdfw addrule WARNING: translation string unused: fwdfw err prot_port1 WARNING: translation string unused: fwdfw final_rule WARNING: translation string unused: fwdfw from @@ -239,7 +241,6 @@ WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time WARNING: translation string unused: fwdfw xt access -WARNING: translation string unused: fwhost addrule WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue WARNING: translation string unused: fwhost changeremark @@ -247,6 +248,7 @@ WARNING: translation string unused: fwhost err addrgrp WARNING: translation string unused: fwhost err hostorip WARNING: translation string unused: fwhost err mac WARNING: translation string unused: fwhost green +WARNING: translation string unused: fwhost hosts WARNING: translation string unused: fwhost ipadr WARNING: translation string unused: fwhost ipsec host WARNING: translation string unused: fwhost orange @@ -285,6 +287,7 @@ WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates WARNING: translation string unused: intrusion detection system log viewer +WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size WARNING: translation string unused: invalid date entered WARNING: translation string unused: invalid downlink speed @@ -366,6 +369,7 @@ WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed WARNING: translation string unused: network status information +WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings diff --git a/doc/language_issues.es b/doc/language_issues.es index 9331ed2..ab74343 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -198,6 +198,7 @@ WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed WARNING: translation string unused: external access rule removed +WARNING: translation string unused: extrahd WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write WARNING: translation string unused: filename @@ -249,6 +250,7 @@ WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates WARNING: translation string unused: intrusion detection system log viewer +WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size WARNING: translation string unused: invalid date entered WARNING: translation string unused: invalid downlink speed @@ -330,6 +332,7 @@ WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed WARNING: translation string unused: network status information +WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings @@ -562,6 +565,7 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot +WARNING: untranslated string: addons WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy @@ -653,7 +657,6 @@ WARNING: untranslated string: fwdfw DROP WARNING: untranslated string: fwdfw REJECT WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional -WARNING: untranslated string: fwdfw addrule WARNING: untranslated string: fwdfw all icmp WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy @@ -765,7 +768,6 @@ WARNING: untranslated string: fwhost err srv exists WARNING: untranslated string: fwhost err srvexist WARNING: untranslated string: fwhost err sub32 WARNING: untranslated string: fwhost hint -WARNING: untranslated string: fwhost hosts WARNING: untranslated string: fwhost icmptype WARNING: untranslated string: fwhost ip_mac WARNING: untranslated string: fwhost ipsec net @@ -834,6 +836,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: snat new source ip address +WARNING: untranslated string: ssh WARNING: untranslated string: static routes WARNING: untranslated string: support donation WARNING: untranslated string: system information diff --git a/doc/language_issues.fr b/doc/language_issues.fr index a6257e9..ad06662 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -198,6 +198,7 @@ WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed WARNING: translation string unused: external access rule removed +WARNING: translation string unused: extrahd WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write WARNING: translation string unused: filename @@ -249,6 +250,7 @@ WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates WARNING: translation string unused: intrusion detection system log viewer +WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size WARNING: translation string unused: invalid date entered WARNING: translation string unused: invalid downlink speed @@ -330,6 +332,7 @@ WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed WARNING: translation string unused: network status information +WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings @@ -573,6 +576,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: addons WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy @@ -665,7 +669,6 @@ WARNING: untranslated string: fwdfw DROP WARNING: untranslated string: fwdfw REJECT WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional -WARNING: untranslated string: fwdfw addrule WARNING: untranslated string: fwdfw all icmp WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy @@ -777,7 +780,6 @@ WARNING: untranslated string: fwhost err srv exists WARNING: untranslated string: fwhost err srvexist WARNING: untranslated string: fwhost err sub32 WARNING: untranslated string: fwhost hint -WARNING: untranslated string: fwhost hosts WARNING: untranslated string: fwhost icmptype WARNING: untranslated string: fwhost ip_mac WARNING: untranslated string: fwhost ipsec net @@ -843,6 +845,7 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: snat new source ip address WARNING: untranslated string: snort working +WARNING: untranslated string: ssh WARNING: untranslated string: static routes WARNING: untranslated string: support donation WARNING: untranslated string: system information diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 1743071..6b5c2f4 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -200,6 +200,7 @@ WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed WARNING: translation string unused: external access rule removed +WARNING: translation string unused: extrahd WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write WARNING: translation string unused: filename @@ -251,6 +252,7 @@ WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates WARNING: translation string unused: intrusion detection system log viewer +WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size WARNING: translation string unused: invalid date entered WARNING: translation string unused: invalid downlink speed @@ -332,6 +334,7 @@ WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed WARNING: translation string unused: network status information +WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings @@ -576,6 +579,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: addons WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent @@ -611,7 +615,6 @@ WARNING: untranslated string: fwdfw DROP WARNING: untranslated string: fwdfw REJECT WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional -WARNING: untranslated string: fwdfw addrule WARNING: untranslated string: fwdfw all icmp WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy @@ -723,7 +726,6 @@ WARNING: untranslated string: fwhost err srv exists WARNING: untranslated string: fwhost err srvexist WARNING: untranslated string: fwhost err sub32 WARNING: untranslated string: fwhost hint -WARNING: untranslated string: fwhost hosts WARNING: untranslated string: fwhost icmptype WARNING: untranslated string: fwhost ip_mac WARNING: untranslated string: fwhost ipsec net @@ -762,6 +764,7 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: snat new source ip address +WARNING: untranslated string: ssh WARNING: untranslated string: support donation WARNING: untranslated string: tor WARNING: untranslated string: tor accounting diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 9331ed2..ab74343 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -198,6 +198,7 @@ WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed WARNING: translation string unused: external access rule removed +WARNING: translation string unused: extrahd WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write WARNING: translation string unused: filename @@ -249,6 +250,7 @@ WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates WARNING: translation string unused: intrusion detection system log viewer +WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size WARNING: translation string unused: invalid date entered WARNING: translation string unused: invalid downlink speed @@ -330,6 +332,7 @@ WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed WARNING: translation string unused: network status information +WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings @@ -562,6 +565,7 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot +WARNING: untranslated string: addons WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy @@ -653,7 +657,6 @@ WARNING: untranslated string: fwdfw DROP WARNING: untranslated string: fwdfw REJECT WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional -WARNING: untranslated string: fwdfw addrule WARNING: untranslated string: fwdfw all icmp WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy @@ -765,7 +768,6 @@ WARNING: untranslated string: fwhost err srv exists WARNING: untranslated string: fwhost err srvexist WARNING: untranslated string: fwhost err sub32 WARNING: untranslated string: fwhost hint -WARNING: untranslated string: fwhost hosts WARNING: untranslated string: fwhost icmptype WARNING: untranslated string: fwhost ip_mac WARNING: untranslated string: fwhost ipsec net @@ -834,6 +836,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: snat new source ip address +WARNING: untranslated string: ssh WARNING: untranslated string: static routes WARNING: untranslated string: support donation WARNING: untranslated string: system information diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 6d533bf..b3adf1e 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -197,6 +197,7 @@ WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed WARNING: translation string unused: external access rule removed +WARNING: translation string unused: extrahd WARNING: translation string unused: filename WARNING: translation string unused: firewall graphs WARNING: translation string unused: firewall log viewer @@ -244,6 +245,7 @@ WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates WARNING: translation string unused: intrusion detection system log viewer +WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size WARNING: translation string unused: invalid date entered WARNING: translation string unused: invalid downlink speed @@ -324,6 +326,7 @@ WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed WARNING: translation string unused: network status information +WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings @@ -565,6 +568,7 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Add a route WARNING: untranslated string: Edit an existing route WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: addons WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy @@ -648,7 +652,6 @@ WARNING: untranslated string: fwdfw DROP WARNING: untranslated string: fwdfw REJECT WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional -WARNING: untranslated string: fwdfw addrule WARNING: untranslated string: fwdfw all icmp WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy @@ -760,7 +763,6 @@ WARNING: untranslated string: fwhost err srv exists WARNING: untranslated string: fwhost err srvexist WARNING: untranslated string: fwhost err sub32 WARNING: untranslated string: fwhost hint -WARNING: untranslated string: fwhost hosts WARNING: untranslated string: fwhost icmptype WARNING: untranslated string: fwhost ip_mac WARNING: untranslated string: fwhost ipsec net @@ -824,6 +826,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: snat new source ip address +WARNING: untranslated string: ssh WARNING: untranslated string: static routes WARNING: untranslated string: support donation WARNING: untranslated string: tor diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 72cbae2..7880240 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -205,6 +205,7 @@ WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed WARNING: translation string unused: external access rule removed +WARNING: translation string unused: extrahd WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write WARNING: translation string unused: filename @@ -256,6 +257,7 @@ WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates WARNING: translation string unused: intrusion detection system log viewer +WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size WARNING: translation string unused: invalid date entered WARNING: translation string unused: invalid downlink speed @@ -337,6 +339,7 @@ WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed WARNING: translation string unused: network status information +WARNING: translation string unused: network time WARNING: translation string unused: network traffic graphs WARNING: translation string unused: network updated WARNING: translation string unused: networks settings @@ -591,6 +594,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: addons WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent WARNING: untranslated string: bytes @@ -617,7 +621,6 @@ WARNING: untranslated string: fwdfw DROP WARNING: untranslated string: fwdfw REJECT WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional -WARNING: untranslated string: fwdfw addrule WARNING: untranslated string: fwdfw all icmp WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy @@ -729,7 +732,6 @@ WARNING: untranslated string: fwhost err srv exists WARNING: untranslated string: fwhost err srvexist WARNING: untranslated string: fwhost err sub32 WARNING: untranslated string: fwhost hint -WARNING: untranslated string: fwhost hosts WARNING: untranslated string: fwhost icmptype WARNING: untranslated string: fwhost ip_mac WARNING: untranslated string: fwhost ipsec net @@ -767,6 +769,7 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: snat new source ip address +WARNING: untranslated string: ssh WARNING: untranslated string: support donation WARNING: untranslated string: tor directory port WARNING: untranslated string: tor errmsg invalid directory port diff --git a/doc/language_missings b/doc/language_missings index ed0edae..1164640 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -4,6 +4,7 @@ ############################################################################ # Checking cgi-bin translations for language: en # ############################################################################ +< addon < ccd maxclients ############################################################################ # Checking install/setup translations for language: fr # @@ -11,6 +12,7 @@ ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ +< addon < advproxy errmsg cache < advproxy errmsg invalid upstream proxy < advproxy errmsg proxy ports equal @@ -187,7 +189,6 @@ < fwhost addgrpname < fwhost addhost < fwhost addnet -< fwhost addrule < fwhost addservice < fwhost addservicegrp < fwhost any @@ -312,6 +313,7 @@ < server restart < snat new source ip address < snort working +< ssh < static routes < support donation < system information @@ -435,6 +437,7 @@ ############################################################################ # Checking cgi-bin translations for language: es # ############################################################################ +< addon < advproxy errmsg cache < advproxy errmsg invalid upstream proxy < advproxy errmsg proxy ports equal @@ -611,7 +614,6 @@ < fwhost addgrpname < fwhost addhost < fwhost addnet -< fwhost addrule < fwhost addservice < fwhost addservicegrp < fwhost any @@ -752,6 +754,7 @@ < server restart < Set time on boot < snat new source ip address +< ssh < static routes < support donation < system information @@ -852,6 +855,7 @@ ############################################################################ # Checking cgi-bin translations for language: pl # ############################################################################ +< addon < advproxy errmsg cache < advproxy errmsg invalid upstream proxy < advproxy errmsg proxy ports equal @@ -1019,7 +1023,6 @@ < fwhost addgrpname < fwhost addhost < fwhost addnet -< fwhost addrule < fwhost addservice < fwhost addservicegrp < fwhost any @@ -1145,6 +1148,7 @@ < red1 < server restart < snat new source ip address +< ssh < static routes < support donation < tor @@ -1245,6 +1249,7 @@ # Checking cgi-bin translations for language: ru # ############################################################################ < Add a route +< addon < advproxy errmsg cache < advproxy errmsg invalid upstream proxy < advproxy errmsg proxy ports equal @@ -1416,7 +1421,6 @@ < fwhost addgrpname < fwhost addhost < fwhost addnet -< fwhost addrule < fwhost addservice < fwhost addservicegrp < fwhost any @@ -1542,6 +1546,7 @@ < red1 < server restart < snat new source ip address +< ssh < static routes < support donation < tor diff --git a/html/cgi-bin/aliases.cgi b/html/cgi-bin/aliases.cgi index b87afdd..8d6b19d 100644 --- a/html/cgi-bin/aliases.cgi +++ b/html/cgi-bin/aliases.cgi @@ -285,12 +285,12 @@ print <<END <td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td> </tr> </table> +<br> <hr /> <table width='100%'> <tr> <td class='base' width='55%'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'this field may be blank'}</td> - <td width='40%' align='center'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td> - <td width='5%' align='right'> + <td width='40%' align='right'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td> </td> </tr> </table> diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index 830775d..86e21cf 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -166,7 +166,7 @@ if ( -e "/var/tmp/backupiso/" ){ @backupisos = `cd /var/tmp/backupiso/ && ls *.iso 2>/dev/null`; } -&Header::openbox('100%', 'center', $Lang::tr{'backup'}); +&Header::openbox('100%', 'center', ); print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}'> @@ -233,7 +233,7 @@ END ############################################################################################################################ ############################################# Backups von Addons erstellen ################################################# -&Header::openbox('100%', 'center', 'addons'); +&Header::openbox('100%', 'center', $Lang::tr{'addons'}); my @addonincluds = `ls /var/ipfire/backup/addons/includes/ 2>/dev/null`; my @addons = `ls /var/ipfire/backup/addons/backup/ 2>/dev/null`; @@ -339,4 +339,4 @@ END ; &Header::closebox(); &Header::closebigbox(); -&Header::closepage(); \ No newline at end of file +&Header::closepage(); diff --git a/html/cgi-bin/connscheduler.cgi b/html/cgi-bin/connscheduler.cgi index 8f13b56..f4fc5ef 100644 --- a/html/cgi-bin/connscheduler.cgi +++ b/html/cgi-bin/connscheduler.cgi @@ -307,7 +307,7 @@ for ($minute = 0; $minute <= 55; $minute += 5) print <<END </select></td></tr> -<tr><td colspan='2'><hr /></td></tr> +<tr><td colspan='2'><br><br></td></tr> <tr><td width='15%' class='base'>$Lang::tr{'ConnSched action'}</td><td> <input type='radio' value='CONNECT' name='ACTION_ACTION' $checked_connect /> <select name='ACTION_CONNECT'> <option value='reconnect' $selected{'reconnect'}>$Lang::tr{'ConnSched reconnect'}</option> @@ -335,7 +335,7 @@ for ($i = 1; $i <= $CONNSCHED::maxprofiles; $i++) } print <<END </select></td></tr> -<tr><td colspan='2'><hr /></td></tr> +<tr><td colspan='2'><br><br></td></tr> <tr><td width='15%' class='base'>$Lang::tr{'ConnSched days'}</td> <td><input type='radio' value='DAYS' name='ACTION_DAYSTYPE' $checked_days /> <select name='ACTION_DAYSTART'> END @@ -375,14 +375,15 @@ print <<END   <input type='checkbox' name='Sat' $checked_sat />$Lang::tr{'saturday'}<br />   <input type='checkbox' name='Sun' $checked_sun />$Lang::tr{'sunday'} </td></tr> -<tr><td colspan='2'><hr /></td></tr> +<tr><td colspan='2'><br></td></tr> <tr><td width='15%' class='base'>$Lang::tr{'remark title'} <img src='/blob.gif' alt='*' /></td> <td><input type='text' name='ACTION_COMMENT' size='40' value='$comment' /></td></tr></table> -<hr /> +<br> +<hr> <table width='100%'><tr> <td class='base' valign='top'><img src='/blob.gif' alt='*' /></td> <td width='55%' class='base'>$Lang::tr{'this field may be blank'}</td> - <td width='40%' align='center'><input type='submit' name='SUBMIT' value='$buttontext' /> + <td width='40%' align='right'><input type='submit' name='SUBMIT' value='$buttontext' /> <input type='hidden' name='ACTION' value='$hiddenvalue' /></td> <input type='hidden' name='UPDATE_ID' value='$cgiparams{'ID'}' /></td> </tr></table> diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 2d113c4..19fae9b 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -49,14 +49,14 @@ END ; &Header::closebox(); -&Header::openbox('100%', 'left', $Lang::tr{'credits'}); +&Header::openbox('100%', 'left',); print <<END <br> <center> $Lang::tr{'visit us at'}: <b><a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a></b> </center> -<br><hr><br> +<br><br> <p><b>Development:</b><br /> diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index fc9e15c..4e51ab6 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -303,7 +303,7 @@ print <<END <tr> <td class='base' valign='top'><img src='/blob.gif' alt='*' /></td> <td width='70%' class='base'>$Lang::tr{'avoid dod'}</td> - <td width='30%' align='center' class='base'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> + <td width='30%' align='right' valign='top' class='base'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> </tr> </table> </form> @@ -377,13 +377,14 @@ print <<END <td><input type='password' name='PASSWORD2' value='$settings{'PASSWORD2'}' /></td> </tr> </table> +<br> <hr /> <table width='100%'> <tr> <td class='base' valign='top'><img src='/blob.gif' alt='*' /></td> <td width='70%' class='base'>$ddnsprefix</td> - <td width='30%' align='center' class='base'> + <td width='30%' align='right' class='base'> <input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /> <input type='submit' name='SUBMIT' value='$buttontext' /> </td> </tr> @@ -542,7 +543,7 @@ print <<END <td><img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td> <td class='base'>$Lang::tr{'remove'}</td> <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <td align='center' width='30%'><input type='submit' name='ACTION' value='$Lang::tr{'instant update'}' /></td> + <td align='right' width='30%'><input type='submit' name='ACTION' value='$Lang::tr{'instant update'}' /></td> </form> </tr> </table> diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 9157cac..9a7d983 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -590,8 +590,7 @@ print <<END <tr> <td class='base' width='25%'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'this field may be blank'}</td> <td class='base' width='30%'>$warnNTPmessage</td> - <td width='40%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> - <td width='5%' align='right'> </td> + <td width='40%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> </tr> </table> </form> @@ -651,7 +650,7 @@ print <<END <table width='100%'> <tr> <td class='base' width='50%'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'dhcp advopt scope help'}</td> - <td width='50%' align='center'> + <td width='50%' align='right'> <input type='hidden' name='ACTION' value='$Lang::tr{'add'}1' /> <input type='submit' name='SUBMIT' value='$buttontext' /> <input type='submit' name='SUBMIT' value='$Lang::tr{'dhcp advopt help'}' /> @@ -851,7 +850,7 @@ print <<END <table width='100%'> <tr> <td class='base' width='50%'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'this field may be blank'}</td> - <td width='50%' align='center'> + <td width='50%' align='right'> <input type='hidden' name='ACTION' value='$Lang::tr{'add'}2' /> <input type='submit' name='SUBMIT' value='$buttontext' /> <input type='hidden' name='KEY2' value='$dhcpsettings{'KEY2'}' /></td> diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index 1439828..5f051d2 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -224,13 +224,13 @@ print <<END <td><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='40' maxlength='50' /></td> </tr> </table> - +<br> <hr> <table width='100%'> <tr> <td class='base' width='55%'><img src='/blob.gif' alt ='*' align='top' /> <font class='base'>$Lang::tr{'this field may be blank'}</font></td> - <td width='40%' align='center'> + <td width='40%' align='right'> <input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /> <input type='submit' name='SUBMIT' value='$buttontext' /> </td> diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index 86b0de5..0bff591 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -127,7 +127,6 @@ if ($errormessage) { ############################################################################################################################ ############################################################################################################################ -&Header::openbox('100%', 'center', $Lang::tr{'extrahd'}); open( FILE, "< $devicefile" ) or die "Unable to read $devicefile"; @devices = <FILE>; close FILE; @@ -162,9 +161,6 @@ END </table> END ; - -&Header::closebox(); - &Header::openbox('100%', 'center', $Lang::tr{'extrahd detected drives'}); print <<END <table border='0' width='600' cellspacing="0"> diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index c17bfaf..ceaab56 100755 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1561,8 +1561,6 @@ sub newrule if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp1'}}=$sip;} my ($dip,$dcidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp2'}}); if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;} - &Header::openbox('100%', 'left', $Lang::tr{'fwdfw addrule'}); - &Header::closebox(); &Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'}); #------SOURCE------------------------------------------------------- print "<form method='post'>"; @@ -1584,10 +1582,10 @@ END } print<<END; </select></td></tr> - <tr><td colspan='8'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table> + <tr><td><br></td></tr> + </table> END &gen_dd_block('src','grp1'); - print"<hr>"; &Header::closebox(); #---SNAT / DNAT ------------------------------------------------ @@ -1690,10 +1688,9 @@ END } print<<END; </select></td></tr> - <tr><td colspan='7'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table> + <tr><td><br></td></tr></table> END &gen_dd_block('tgt','grp2'); - print"<hr>"; &Header::closebox; #---PROTOCOL------------------------------------------------------ $fwdfwsettings{'SRC_PORT'} =~ s/\|/,/g; @@ -1848,7 +1845,7 @@ END &Header::closebox; $checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}} = 'CHECKED'; print <<END; - <hr><br> + <br> <center> <table width="80%" border="0"> <tr> @@ -1995,7 +1992,7 @@ END </td> </tr> </table> - <br><hr> + <br> END #---ACTION------------------------------------------------------ diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi old mode 100755 new mode 100644 index 3b46677..16c91bd --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -84,7 +84,7 @@ unless (-e $configsrvgrp) { system("touch $configsrvgrp"); } &Header::getcgihash(\%fwhostsettings); &Header::showhttpheaders(); -&Header::openpage($Lang::tr{'fwhost hosts'}, 1, ''); +&Header::openpage($Lang::tr{'fwhost menu'}, 1, ''); &Header::openbigbox('100%', 'center'); #### JAVA SCRIPT #### @@ -1139,13 +1139,13 @@ if($fwhostsettings{'ACTION'} eq '') } ### FUNCTIONS ### sub showmenu { - &Header::openbox('100%', 'left',$Lang::tr{'fwhost menu'}); + &Header::openbox('100%', 'left',); print "$Lang::tr{'fwhost welcome'}"; print<<END; <br><br><table border='0' width='100%'> <tr><td><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newnet'}' ><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newhost'}' ><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newgrp'}' ></form></td> <td align='right'><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newservice'}' ><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newservicegrp'}' ></form></td></tr> - <tr><td colspan='6'><hr></td></tr></table> + <tr><td colspan='6'></td></tr></table> END &Header::closebox(); @@ -1164,7 +1164,7 @@ sub addnet <tr><td>$Lang::tr{'fwhost netaddress'}:</td><td><input type='TEXT' name='IP' value='$fwhostsettings{'IP'}' $fwhostsettings{'BLK_IP'} size='20' maxlength='15'></td></tr> <tr><td>$Lang::tr{'netmask'}:</td><td><input type='TEXT' name='SUBNET' value='$fwhostsettings{'SUBNET'}' $fwhostsettings{'BLK_IP'} size='20' maxlength='15'></td></tr> <tr><td>$Lang::tr{'remark'}:</td><td><input type='TEXT' name='NETREMARK' value='$fwhostsettings{'NETREMARK'}' style='width: 98.5%;'></td></tr> - <tr><td colspan='6'><br><hr></td></tr><tr> + <tr><td colspan='6'><br></td></tr><tr> END if ($fwhostsettings{'ACTION'} eq 'editnet' || $fwhostsettings{'error'} eq 'on') { @@ -1183,11 +1183,11 @@ sub addhost $fwhostsettings{'orgname'}=$fwhostsettings{'HOSTNAME'}; $fwhostsettings{'orgremark'}=$fwhostsettings{'HOSTREMARK'}; print<<END; - <table border='0' width='100%'> + <table width='100%'> <tr><td>$Lang::tr{'name'}:</td><td><form method='post' style='display:inline;'><input type='TEXT' name='HOSTNAME' id='textbox1' value='$fwhostsettings{'HOSTNAME'}' $fwhostsettings{'BLK_HOST'} size='20'><script>document.getElementById('textbox1').focus()</script></td></tr> <tr><td>IP/MAC:</td><td><input type='TEXT' name='IP' value='$fwhostsettings{'IP'}' $fwhostsettings{'BLK_IP'} size='20' maxlength='17'></td></tr> <tr><td width='10%'>$Lang::tr{'remark'}:</td><td><input type='TEXT' name='HOSTREMARK' value='$fwhostsettings{'HOSTREMARK'}' style='width:98%;'></td></tr> - <tr><td colspan='5'><hr></td></tr><tr> + <tr><td colspan='5'><br></td></tr><tr> END if ($fwhostsettings{'ACTION'} eq 'edithost' || $fwhostsettings{'error'} eq 'on') @@ -1224,17 +1224,36 @@ sub addgrp my $rem=$fwhostsettings{'remark'}; if ($fwhostsettings{'update'} eq ''){ print<<END; - <table width='100%' border='0'> - <tr><td width='10%'>$Lang::tr{'fwhost addgrpname'}</td><td><form method='post'><input type='TEXT' name='grp_name' value='$fwhostsettings{'grp_name'}' size='20'></td></tr> - <tr><td width='10%'>$Lang::tr{'remark'}:</td><td ><input type='TEXT' name='remark' value='$fwhostsettings{'remark'}' style='width: 98%;'></td></tr> - <tr><td colspan='2'><br><hr></td></tr></table> + <table width='100%' border='0'> + <tr> + <td width='10%'>$Lang::tr{'fwhost addgrpname'}</td> + <td><form method='post'><input type='TEXT' name='grp_name' value='$fwhostsettings{'grp_name'}' size='20'></td> + </tr> + <tr> + <td width='10%'>$Lang::tr{'remark'}:</td> + <td ><input type='TEXT' name='remark' value='$fwhostsettings{'remark'}' style='width: 98%;'></td> + </tr> + <tr> + <td colspan='2'><br></td> + </tr> + </table> END }else{ print<<END; <table width='100%' border='0'><form method='post' style='display:inline'> - <tr><td nowrap='nowrap' width='12%'>$Lang::tr{'fwhost addgrpname'}</td><td width='20%'><input type='TEXT' name='grp' value='$fwhostsettings{'grp_name'}' ></td><td><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldgrpname' value='$fwhostsettings{'oldgrpname'}'><input type='hidden' name='ACTION' value='changegrpname'></td><td></td></form></tr> - <tr><form method='post' style='display:inline'><td>$Lang::tr{'remark'}:</td><td colspan='2'><input type='TEXT' name='newrem' size='45' value='$fwhostsettings{'remark'}' style='width:98%'></td><td align='right'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldrem' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='ACTION' value='changegrpremark' ></td></tr></table></form> - <hr> + <tr> + <td nowrap='nowrap' width='12%'>$Lang::tr{'fwhost addgrpname'}</td> + <td width='20%'><input type='TEXT' name='grp' value='$fwhostsettings{'grp_name'}' ></td> + <td><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldgrpname' value='$fwhostsettings{'oldgrpname'}'><input type='hidden' name='ACTION' value='changegrpname'></td> + <td></td></form> + </tr> + <tr><form method='post' style='display:inline'> + <td>$Lang::tr{'remark'}:</td> + <td colspan='2'><input type='TEXT' name='newrem' size='45' value='$fwhostsettings{'remark'}' style='width:98%'></td> + <td align='right'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldrem' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='ACTION' value='changegrpremark' ></td> + </tr> + </table></form> + <br><br> END } if ($fwhostsettings{'update'} eq 'on'){ @@ -1263,14 +1282,14 @@ END } print"</select></td></tr>"; if (! -z $confignet){ - print"<tr><td><input type='radio' name='grp2' id='CUST_SRC_NET' value='cust_net' $checked{'grp2'}{'cust_net'}></td><td>$Lang::tr{'fwhost cust net'}</td><td><select name='CUST_SRC_NET' style='min-width:185px;'>"; + print"<tr><td><input type='radio' name='grp2' id='CUST_SRC_NET' value='cust_net' $checked{'grp2'}{'cust_net'}></td><td>$Lang::tr{'fwhost cust net'}:</td><td><select name='CUST_SRC_NET' style='min-width:185px;'>"; foreach my $key (sort { ncmp($customnetwork{$a}[0],$customnetwork{$b}[0]) } keys %customnetwork) { print"<option>$customnetwork{$key}[0]</option>"; } print"</select></td></tr>"; } if (! -z $confighost){ - print"<tr><td valign='top'><input type='radio' name='grp2' id='CUST_SRC_HOST' value='cust_host' $checked{'grp2'}{'cust_host'}></td><td valign='top'>$Lang::tr{'fwhost cust addr'}</td><td><select name='CUST_SRC_HOST' style='min-width:185px;'>"; + print"<tr><td valign='top'><input type='radio' name='grp2' id='CUST_SRC_HOST' value='cust_host' $checked{'grp2'}{'cust_host'}></td><td valign='top'>$Lang::tr{'fwhost cust addr'}:</td><td><select name='CUST_SRC_HOST' style='min-width:185px;'>"; foreach my $key (sort { ncmp($customhost{$a}[0],$customhost{$b}[0]) } keys %customhost) { print"<option>$customhost{$key}[0]</option>"; } @@ -1301,7 +1320,7 @@ END #OVPN n2n networks foreach my $key (sort { ncmp($ccdhost{$a}[1],$ccdhost{$b}[1]) } keys %ccdhost) { if($ccdhost{$key}[3] eq 'net'){ - print"<td width='1%'><input type='radio' name='grp2' id='OVPN_N2N' value='ovpn_n2n' $checked{'grp2'}{'ovpn_n2n'}></td><td valign='top'>$Lang::tr{'fwhost ovpn_n2n'}</td><td colspan='3'><select name='OVPN_N2N' style='min-width:185px;'>" if ($show eq ''); + print"<td width='1%'><input type='radio' name='grp2' id='OVPN_N2N' value='ovpn_n2n' $checked{'grp2'}{'ovpn_n2n'}></td><td valign='top'>$Lang::tr{'fwhost ovpn_n2n'}:</td><td colspan='3'><select name='OVPN_N2N' style='min-width:185px;'>" if ($show eq ''); $show='1'; print"<option>$ccdhost{$key}[1]</option>"; } @@ -1318,9 +1337,9 @@ END if ($show eq '1'){$show='';print"</select></td></tr>";} print"</table>"; print"</td></tr></table>"; - print"<br><br><hr>"; + print"<br><br>"; } - print"<table border='0' width='100%'>"; + print"<table width='100%'>"; print"<tr><td align='right'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' /><input type='hidden' name='oldremark' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='update' value=\"$fwhostsettings{'update'}\"><input type='hidden' name='ACTION' value='savegrp' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='resetgrp'></form></td></table>"; &Header::closebox(); } @@ -1366,7 +1385,7 @@ END print<<END; </select></td></tr></table></div> <div id='PORT' class='noscript'><table width='100%' border='0'><tr><td width='10%'>$Lang::tr{'fwhost port'}:</td><td><input type='text' name='SRV_PORT' value='$fwhostsettings{'SRV_PORT'}' maxlength='11' size='24'></td></tr></table></div> - <table width='100%' border='0'><tr><td colspan='6'><br><hr></td></tr> + <table width='100%' border='0'><tr><td colspan='6'><br></td></tr> <tr><td colspan='6' align='right'> END if ($fwhostsettings{'updatesrv'} eq 'on') @@ -1403,22 +1422,22 @@ sub addservicegrp <table width='100%' border='0'><form method='post'> <tr><td width='10%'>$Lang::tr{'fwhost addgrpname'}</td><td><input type='text' name='SRVGRP_NAME' value='$fwhostsettings{'SRVGRP_NAME'}' size='24'></td></tr> <tr><td width='10%'>$Lang::tr{'remark'}:</td><td><input type='text' name='SRVGRP_REMARK' value='$fwhostsettings{'SRVGRP_REMARK'}' style='width: 98%;'></td></tr> - <tr><td colspan='2'><br><hr></tr> + <tr><td colspan='2'><br></tr> </table> END }else{ print<<END; - <table width='100%' border='0'><form method='post' style='display:inline'> + <table width='100%'><form method='post' style='display:inline'> <tr><td width='10%'>$Lang::tr{'fwhost addgrpname'}</td><td width='20%'><input type='text' name='srvgrp' value='$fwhostsettings{'SRVGRP_NAME'}' size='14'></td><td align='left'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldsrvgrpname' value='$fwhostsettings{'oldsrvgrpname'}'><input type='hidden' name='ACTION' value='changesrvgrpname'></td><td width='3%'></td></form></tr> <tr><form method='post'><td width='10%'>$Lang::tr{'remark'}:</td><td colspan='2'><input type='text' name='newsrvrem' value='$fwhostsettings{'SRVGRP_REMARK'}' style='width:98%;'></td><td align='right'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldsrvrem' value='$fwhostsettings{'oldsrvgrpremark'}'><input type='hidden' name='ACTION' value='changesrvgrpremark' ></td></tr> - <tr><td colspan='4'><br><hr></td></td></tr> + <tr><td colspan='4'><br></td></td></tr> </table></form> END } if($fwhostsettings{'updatesrvgrp'} eq 'on'){ print<<END; <form method='post'><input type='hidden' name='SRVGRP_REMARK' value='$fwhostsettings{'SRVGRP_REMARK'}'><input type='hidden' name='SRVGRP_NAME' value='$fwhostsettings{'SRVGRP_NAME'}'><table border='0' width='100%'> - <tr><td width='1%' nowrap='nowrap'>$Lang::tr{'add'}</td><td><select name='CUST_SRV' style='min-width:185px;'> + <tr><td width='10%' nowrap='nowrap'>$Lang::tr{'add'}: </td><td><select name='CUST_SRV' style='min-width:185px;'> END &General::readhasharray("$configsrv", \%customservice); #Protocols for use in servicegroups @@ -1439,12 +1458,12 @@ END print<<END; </select></td></tr> <tr><td colspan='4'><br><br></td></tr> - <tr><td colspan='4'><hr></td></tr> + <tr><td colspan='4'></td></tr> </table> END } print<<END; - <table width='100%' border='0'> + <table width='100%'> <tr><td align='right'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' /><input type='hidden' name='updatesrvgrp' value='$fwhostsettings{'updatesrvgrp'}'><input type='hidden' name='oldsrvgrpremark' value='$fwhostsettings{'oldsrvgrpremark'}'><input type='hidden' name='ACTION' value='saveservicegrp' ></form><form style='display:inline;' method='post'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'></td></tr> </table></form> END diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi index 9804615..dfdf7cd 100644 --- a/html/cgi-bin/gui.cgi +++ b/html/cgi-bin/gui.cgi @@ -175,15 +175,12 @@ if ($errormessage) { &Header::closebox(); } -&Header::openbox('100%','left',$Lang::tr{'gui settings'}); +&Header::openbox('100%','left',$Lang::tr{'display'}); print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}'> <table width='100%'> <tr> - <td colspan='2'><p><b>$Lang::tr{'display'}</b></td> -</tr> -<tr> <td><input type='checkbox' name='WINDOWWITHHOSTNAME' $checked{'WINDOWWITHHOSTNAME'}{'on'} /></td> <td>$Lang::tr{'display hostname in window title'}</td> </tr> @@ -232,9 +229,13 @@ END print <<END </select></td></tr> -<tr> - <td colspan='2'><hr /><p><b>$Lang::tr{'theme'}</b></td> -</tr> +</table> +END +; +&Header::closebox(); +&Header::openbox('100%','left',$Lang::tr{'theme'}); +print<<END; +<table> <tr> <td> </td> <td><select name='theme'> @@ -265,22 +266,26 @@ foreach $item (sort (@files)) { print <<END </select></td></tr> -<tr> - <td colspan='2'><hr /><p><b>$Lang::tr{'sound'}</b></td> -</tr> +</table> +END +; +&Header::closebox(); +&Header::openbox('100%','left',$Lang::tr{'sound'}); +print <<END <tr> <td><input type ='checkbox' name='PPPUPDOWNBEEP' $checked{'PPPUPDOWNBEEP'}{'on'} /></td> <td>$Lang::tr{'beep when ppp connects or disconnects'}</td> </tr> <tr> - <td colspan='2'><hr /></td> + <td colspan='2'></td> </tr> </table> -<div align='center'> -<table width='80%'> +<div align='right'> +<br> +<table width='100%'> <tr> - <td width='50%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'restore defaults'}' /></td> - <td width='50%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> + <td width='90%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'restore defaults'}' /></td> + <td width='10%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> </tr> </table> </div> diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi index 4eeeaf6..bb7df1f 100644 --- a/html/cgi-bin/hosts.cgi +++ b/html/cgi-bin/hosts.cgi @@ -4,7 +4,7 @@ # IPFire.org - A linux based firewall # # Copyright (C) 2007 Michael Tremer & Christian Schmidt # # # -# This program is free software: you can redistribute it and/or modify # +# 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. # @@ -264,11 +264,12 @@ print <<END <td><input type='checkbox' name='EN' $checked{'EN'}{'on'} /></td> </tr> </table> +<br> <hr /> <table width='100%'> <tr> <td class='base' width='50%'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'this field may be blank'}</td> - <td width='50%' align='center'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td> + <td width='50%' align='right'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td> </tr> </table> </form> diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 4bd0128..88d9db2 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -491,7 +491,7 @@ END refreshpage(); } -&Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system2'}); +&Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system'}); print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}'><table width='100%'> <tr><td class='base'><input type='checkbox' name='ENABLE_SNORT_GREEN' $checked{'ENABLE_SNORT_GREEN'}{'on'} />GREEN Snort @@ -511,7 +511,7 @@ if ( -e "/var/ipfire/guardian/guardian.conf" ) { print <<END </td></tr> <tr> - <td><hr /></td> + <td><br><br></td> </tr> <tr> <td><b>$Lang::tr{'ids rules update'}</b></td> @@ -536,7 +536,7 @@ print <<END <td nowrap='nowrap'>Oinkcode: <input type='text' size='40' name='OINKCODE' value='$snortsettings{'OINKCODE'}' /></td> </tr> <tr> - <td width='30%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'download new ruleset'}' /> + <td width='30%' align='left'><br><input type='submit' name='ACTION' value='$Lang::tr{'download new ruleset'}' /> END ; if ( -e "/var/tmp/snortrules.tar.gz"){ @@ -548,10 +548,10 @@ print " $Lang::tr{'updates installed'}: $snortsettings{'INSTALLDATE'}</td>" print <<END </tr> </table> -<hr /> +<br><br> <table width='100%'> <tr> - <td align='center'><input type='hidden' name='ACTION2' value='snort' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> + <td align='right'><input type='hidden' name='ACTION2' value='snort' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> </tr> </table> </form> @@ -579,7 +579,7 @@ END print `cat /var/ipfire/guardian/guardian.ignore`; print <<END </textarea></td></tr> -<tr><td align='center' colspan='2'><input type='hidden' name='ACTION2' value='guardian' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr> +<tr><td align='right' colspan='2'><input type='hidden' name='ACTION2' value='guardian' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr> </table> </form> END @@ -680,7 +680,7 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable # Check for display flag if ($displayrulefilerules) { # Rule file definition rule display - print "<TR><TD CLASS='base' VALIGN='TOP'><TABLE border=1><TR>"; + print "<TR><TD CLASS='base' VALIGN='TOP'><TABLE border=0><TR>"; # Local vars my $ruledefdisplaycnt = 0; @@ -732,9 +732,7 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable print <<END <table width='100%'> <tr> - <td width='33%'> </td> - <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td> - <td width='33%'> + <td width='100%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>    </td> </tr> diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index f5a4e0f..73e62ea 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -233,7 +233,7 @@ if ($errormessage) { &Header::closebox(); } -&Header::openbox('100%', 'left', "$Lang::tr{'settings'}:"); +&Header::openbox('100%', 'left', "$Lang::tr{'settings'}"); print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}'> diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat index 2ae4c0d..b58f09e 100644 --- a/html/cgi-bin/logs.cgi/firewalllogip.dat +++ b/html/cgi-bin/logs.cgi/firewalllogip.dat @@ -221,7 +221,7 @@ if ($errormessage) { &Header::closebox(); } -&Header::openbox('100%', 'left', "$Lang::tr{'settings'}:"); +&Header::openbox('100%', 'left', "$Lang::tr{'settings'}"); print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}'> @@ -266,15 +266,15 @@ print <<END </td> <td width='5%' align='center'><input type='submit' name='ACTION' title='$Lang::tr{'day before'}' value='<<' /></td> <td width='5%' align='center'><input type='submit' name='ACTION' title='$Lang::tr{'day after'}' value='>>' /></td> -<td width='20%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td> +<td width='20%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td> +</tr> +<tr> + <td colspan='3' align='left' valign="left">$Lang::tr{'Number of IPs for the pie chart'}:</td> + <td colspan='3' align='left' valign="center"><input type='text' name='pienumber' value='$pienumber' size='4'></td> + <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> </tr> </table> -<table width='100%'> -<tr><td width='20%' align='right' valign="center">$Lang::tr{'Number of IPs for the pie chart'}:</td> - <td width='10%' align='left' valign="center"><input type='text' name='pienumber' value='$pienumber' size='4'></td> - <td width='20%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr> - </table> - </form> +</form> END ; diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat index 3f93b17..7a32a90 100644 --- a/html/cgi-bin/logs.cgi/firewalllogport.dat +++ b/html/cgi-bin/logs.cgi/firewalllogport.dat @@ -222,7 +222,7 @@ if ($errormessage) { &Header::closebox(); } -&Header::openbox('100%', 'left', "$Lang::tr{'settings'}:"); +&Header::openbox('100%', 'left', "$Lang::tr{'settings'}"); print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}'> @@ -267,15 +267,15 @@ print <<END </td> <td width='5%' align='center'><input type='submit' name='ACTION' title='$Lang::tr{'day before'}' value='<<' /></td> <td width='5%' align='center'><input type='submit' name='ACTION' title='$Lang::tr{'day after'}' value='>>' /></td> -<td width='20%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td> +<td width='20%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td> +</tr> +<tr> + <td colspan='3' align='left' valign="center">$Lang::tr{'Number of Ports for the pie chart'}:</td> + <td colspan='3' align='left' valign="center"><input type='text' name='pienumber' value='$pienumber' size='4'></td> + <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> </tr> </table> -<table width='100%'> -<tr><td width='20%' align='right' valign="center">$Lang::tr{'Number of Ports for the pie chart'}:</td> - <td width='10%' align='left' valign="center"><input type='text' name='pienumber' value='$pienumber' size='4'></td> - <td width='20%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr> - </table> - </form> +</form> END ; diff --git a/html/cgi-bin/mac.cgi b/html/cgi-bin/mac.cgi index f95c0d8..1d34363 100644 --- a/html/cgi-bin/mac.cgi +++ b/html/cgi-bin/mac.cgi @@ -192,10 +192,11 @@ END print <<END </tr> <tr> - <td colspan="2"><hr /></td> + <td colspan="2"><br><hr /></td> </tr> <tr> - <td colspan="2"><div align="center"> + <td align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td><div align="right"></td> + <td align='right'> END ; if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { @@ -232,11 +233,6 @@ END print <<END </div></td> </tr> - <tr> - <td colspan="2"align='left'> - <img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td> - </tr> - </table> END diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index 9563aab..00fa1b4 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -113,7 +113,7 @@ $selected{'FWPOLICY'}{$settings{'FWPOLICY'}}= 'selected'; $selected{'FWPOLICY1'}{$settings{'FWPOLICY1'}}= 'selected'; $selected{'FWPOLICY2'}{$settings{'FWPOLICY2'}}= 'selected'; -&Header::openbox('100%', 'center', $Lang::tr{'options fw'}); +&Header::openbox('100%', 'center',); print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>"; print <<END @@ -174,8 +174,8 @@ print <<END </table> <br /> -<table width='10%' cellspacing='0'> -<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'> +<table width='100%' cellspacing='0'> +<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='submit' name='ACTION' value=$Lang::tr{'save'} /> </form></td></tr> </table> diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 5dd943f..7b1654f 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4663,7 +4663,7 @@ END <option value='DES-EDE3-CBC' $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC</option> <option value='DESX-CBC' $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC</option> </select></td></tr> - <tr><td colspan='4'><hr /></td></tr> + <tr><td colspan='4'><br><br></td></tr> END ; @@ -4690,7 +4690,7 @@ END } print "</form></table>"; &Header::closebox(); - &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate authorities'}:"); + &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate authorities'}"); print <<EOF#' <table width='100%' cellspacing='1' cellpadding='0' class='tbl'> <tr> @@ -4825,7 +4825,7 @@ print <<END <form method='post' enctype='multipart/form-data'> <table width='100%' border='0'> <tr><td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td><td nowrap='nowrap' width='8%'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' align='left'/></td><td nowrap='nowrap' align='right'><input type='file' name='FH' size='25' /><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /></td></tr> -<tr><td colspan='4'><hr /></td></tr> +<tr><td colspan='4'><br></td></tr> <tr align='right'><td colspan='4' align='right' width='80%'><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td></tr> </table> END @@ -4862,6 +4862,7 @@ END ; my $id = 0; my $gif; + my $col1=""; foreach my $key (sort { ncmp ($confighash{$a}[1],$confighash{$b}[1]) } keys %confighash) { if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; } if ($id % 2) { @@ -4885,17 +4886,18 @@ END if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'host' ){$confighash{$key}[32]="dynamic";} print "<td align='center' $col>$confighash{$key}[32]</td>"; print "<td align='center' $col>$confighash{$key}[25]</td>"; - - 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>"; + $col1="bgcolor='${Header::colourred}'"; + my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>"; if ($confighash{$key}[0] eq 'off') { - $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>"; + $col1="bgcolor='${Header::colourblue}'"; + $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>"; } else { ### # m.a.d net2net -### - +### + if ($confighash{$key}[3] eq 'net') { if (-e "/var/run/$confighash{$key}[1]n2n.pid") { @@ -4919,37 +4921,39 @@ END #EXITING -- A graceful exit is in progress. #### - if ( $tustate[1] eq 'CONNECTED') { - $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></tr></td></table>"; - } else { - $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$tustate[1]</font></b></td></tr></table>"; + if ( $tustate[1] eq 'CONNECTED') { + $col1="bgcolor='${Header::colourgreen}'"; + $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>"; + }else { + $col1="bgcolor='${Header::colourred}'"; + $active = "<b><font color='#FFFFFF'>$tustate[1]</font></b>"; + } } - } } - } else { - - my $cn; - my @match = (); - foreach my $line (@status) { - chomp($line); - if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) { - @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line); - if ($match[1] ne "Common Name") { - $cn = $match[1]; - } - $cn =~ s/[_]/ /g; - if ($cn eq "$confighash{$key}[2]") { - $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>"; - } - } - + }else { + + my $cn; + my @match = (); + foreach my $line (@status) { + chomp($line); + if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) { + @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line); + if ($match[1] ne "Common Name") { + $cn = $match[1]; + } + $cn =~ s/[_]/ /g; + if ($cn eq "$confighash{$key}[2]") { + $col1="bgcolor='${Header::colourgreen}'"; + $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>"; + } + } + } } } -} print <<END - <td align='center' $col>$active</td> + <td align='center' $col1>$active</td> <form method='post' name='frm${key}a'><td align='center' $col> <input type='image' name='$Lang::tr{'dl client arch'}' src='/images/openvpn.png' alt='$Lang::tr{'dl client arch'}' title='$Lang::tr{'dl client arch'}' border='0' /> @@ -5036,7 +5040,7 @@ END <td> <img src='/images/openvpn.png' alt='?RELOAD'/></td> <td class='base'>$Lang::tr{'dl client arch'}</td> </tr> - </table><hr> + </table><br> END ; } diff --git a/html/cgi-bin/p2p-block.cgi b/html/cgi-bin/p2p-block.cgi index 5ed5874..eb5b8ab 100755 --- a/html/cgi-bin/p2p-block.cgi +++ b/html/cgi-bin/p2p-block.cgi @@ -84,7 +84,7 @@ open(FILE, "<$p2pfile") or die "Unable to read $p2pfile"; @p2ps = <FILE>; close FILE; -&Header::openbox('100%', 'center', $Lang::tr{'p2p block'}); +&Header::openbox('100%', 'center',); print <<END; <table width='35%' class='tbl'> <tr> diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index de73284..b0b6006 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -699,7 +699,7 @@ if ($errormessage) { ############################################################################################################################ ############################################################################################################################ -&Header::openbox('100%', 'center', 'Quality of Service'); +&Header::openbox('100%', 'center', ); print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}'> @@ -707,15 +707,18 @@ print <<END END ; if ( $message ne "" ) { - print "<tr><td colspan='2' align='center'><font color='red'>$message</font>"; + print "<tr><td colspan='2' align='center'><font color='red'>$message</font></tr>"; } print <<END - <tr><td width='50%' align='left'><b>Quality of Service:</b> - <td width='50%' align='center' bgcolor='$statuscolor'><font color='white'>$status</font> - <tr><td width='100%' align='center' colspan='2'> - <input type='submit' name='ACTION' value="$Lang::tr{'start'}" /> - <input type='submit' name='ACTION' value="$Lang::tr{'stop'}" /> - <input type='submit' name='ACTION' value="$Lang::tr{'restart'}" /></table></form> + <tr><td width='50%' align='left'><b>Quality of Service:</b></td> + <td width='50%' align='center' bgcolor='$statuscolor'><font color='white'>$status</font></td></tr> + <tr> + <td colspan='2'><br></td> + </tr> + <tr><td width='100%' align='right' colspan='2'> + <input type='submit' name='ACTION' value="$Lang::tr{'start'}"> + <input type='submit' name='ACTION' value="$Lang::tr{'stop'}"> + <input type='submit' name='ACTION' value="$Lang::tr{'restart'}" ></td></tr></table></form> END ; if (($qossettings{'OUT_SPD'} ne '') && ($qossettings{'INC_SPD'} ne '')) { diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index ed8a94d..84e0847 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -126,7 +126,7 @@ if ($errormessage) { print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n"; -&Header::openbox('100%', 'left', 'SSH:'); +&Header::openbox('100%', 'left', $Lang::tr{'ssh'}); print <<END <table width='100%'> <tr> @@ -154,7 +154,7 @@ print <<END <td width='100%' class='base'>$Lang::tr{'ssh port'}</td> </tr> <tr> - <td align='center' colspan='3'><hr /> + <td align='right' colspan='3'> <input type='submit' name='ACTION' value='$Lang::tr{'ssh tempstart15'}' /> <input type='submit' name='ACTION' value='$Lang::tr{'ssh tempstart30'}' /> <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index 2a51760..5798fb8 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -244,10 +244,10 @@ print <<END <td><input type='text' name='REMARK' value='$settings{'REMARK'}' size='25'/></td> </tr> </table> -<hr /> +<br> <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> + <td width='50%' align='right'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td> </tr> </table> </form> diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 2b7ee75..fbff41f 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -117,7 +117,7 @@ if ( $querry[0] =~ "processescpu"){ print <<END <div align='center'> <table width='80%' cellspacing='1' class='tbl'> -<tr bgcolor='$color{'color20'}'> +<tr> <th align='left'><b>$Lang::tr{'services'}</b></th> <th align='center' ><b>$Lang::tr{'status'}</b></th> <th align='center'><b>PID</b></th> @@ -161,7 +161,7 @@ END print <<END <div align='center'> <table width='80%' cellspacing='1' class='tbl'> -<tr bgcolor='$color{'color20'}'> +<tr> <th align='center'><b>Addon</b></th> <th align='center'><b>Boot</b></th> <th align='center' colspan=2><b>$Lang::tr{'action'}</b></th> @@ -197,11 +197,11 @@ END print "<tr>"; $col="bgcolor='$color{'color20'}'"; } - print "<td align='left' $col>$_</td> "; + print "<td align='left' $col width='31%'>$_</td> "; my $status = isautorun($_,$col); print "$status "; - print "<td align='center' $col><A HREF=services.cgi?$_!start><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></A></td>"; - print "<td align='center' $col><A HREF=services.cgi?$_!stop><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></A></td> "; + print "<td align='center' $col width='8%'><A HREF=services.cgi?$_!start><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></A></td>"; + print "<td align='center' $col width='8%'><A HREF=services.cgi?$_!stop><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></A></td> "; my $status = &isrunningaddon($_,$col); $status =~ s/\\[[0-1]\;[0-9]+m//g; diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi index caa1718..39d71f8 100644 --- a/html/cgi-bin/time.cgi +++ b/html/cgi-bin/time.cgi @@ -233,14 +233,10 @@ if ($errormessage) { print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n"; -&Header::openbox('100%', 'left', $Lang::tr{'network time'}); +&Header::openbox('100%', 'left', $Lang::tr{'ntp common settings'}); print <<END <table width='100%'> <tr> - <td colspan='2'><strong>$Lang::tr{'ntp common settings'}</strong></td> -</tr> - -<tr> <td><input type='checkbox' name='ENABLENTP' $checked{'ENABLENTP'}{'on'} /></td> <td width='100%' colspan='4' class='base'>$Lang::tr{'network time from'}</td> </tr> @@ -281,11 +277,13 @@ print <<END <td class='base' colspan='4'><input type='checkbox' name='ENABLESETONBOOT' $checked{'ENABLESETONBOOT'}{'on'} /> $Lang::tr{'Set time on boot'}</td> </tr> </table> +END +; +&Header::closebox(); +&Header::openbox('100%',1,$Lang::tr{'ntp sync'}); +print <<END <table width='100%'> <tr> - <td colspan='4'><hr /><strong>$Lang::tr{'ntp sync'}</strong></td> -</tr> -<tr> <td class='base'><input type='radio' name='UPDATE_METHOD' value='periodically' $checked{'UPDATE_METHOD'}{'periodically'} /></td> <td width='10%'>$Lang::tr{'every'}</td> <td width='45%'><input type='text' name='UPDATE_VALUE' size='3' maxlength='3' value='$timesettings{'UPDATE_VALUE'}' /> @@ -302,7 +300,7 @@ print <<END <td colspan='2'>$Lang::tr{'manually'}</td> </tr> <tr> - <td colspan='4'><hr /><strong>$Lang::tr{'update time'}</strong></td> + <td colspan='4'><br><br><strong>$Lang::tr{'update time'}</strong></td> </tr> <tr> <td> </td> @@ -322,9 +320,8 @@ print <<END <table width='100%'> <tr> <td width='30%'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td> - <td width='40%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'set time now'}' /></td> - <td width='25%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> - <td width='5%' align='right'> </td> + <td width='65%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'set time now'}' /></td> + <td width='5%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> </tr> </table> END diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi index 1b40a3c..9f7e6ff 100644 --- a/html/cgi-bin/urlfilter.cgi +++ b/html/cgi-bin/urlfilter.cgi @@ -1170,7 +1170,7 @@ if (!($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter manage repository'})) { print "<form method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'>\n"; -&Header::openbox('100%', 'left', "$Lang::tr{'urlfilter filter settings'}:"); +&Header::openbox('100%', 'left', "$Lang::tr{'urlfilter filter settings'}"); print <<END <table width='100%'> <tr> @@ -1524,7 +1524,7 @@ print "</form>\n"; print "<form method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'>\n"; -&Header::openbox('100%', 'left', "$Lang::tr{'urlfilter maintenance'}:"); +&Header::openbox('100%', 'left', "$Lang::tr{'urlfilter maintenance'}"); print <<END <table width='100%'> diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 052b3e3..3e92d4b 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1099,7 +1099,7 @@ END <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>: $Lang::tr{'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient'} </td></tr> - <tr><td colspan='2'><hr /></td></tr> + <tr><td colspan='2'><hr></td></tr> <tr><td class='base' nowrap='nowrap'>$Lang::tr{'upload p12 file'}:</td> <td nowrap='nowrap'><input type='file' name='FH' size='32' /></td></tr> <tr><td class='base'>$Lang::tr{'pkcs12 file password'}: <img src='/blob.gif' alt='*' /></td> @@ -2632,17 +2632,18 @@ print <<END <td class='base' nowrap='nowrap'>$Lang::tr{'host to net vpn'}: <img src='/blob.gif' alt='*' /></td> <td ><input type='text' name='RW_NET' value='$cgiparams{'RW_NET'}' /></td> </tr> - </table> +</table> +<br> <hr /> <table width='100%'> <tr> <td class='base' valign='top'><img src='/blob.gif' alt='*' /></td> - <td width='70%' class='base' valign='top'>$Lang::tr{'this field may be blank'}</td> + <td width='70%' class='base' valign='top'>$Lang::tr{'this field may be blank'}</td><td width='30%' align='right' class='base'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> </tr> <tr> <td class='base' valign='top' nowrap='nowrap'><img src='/blob.gif' alt='*' /><img src='/blob.gif' alt='*' /> </td> <td class='base'> <font class='base'>$Lang::tr{'vpn delayed start help'}</font></td> - <td width='30%' align='center' class='base'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> + <td></td> </tr> </table> END @@ -2685,21 +2686,24 @@ END print "<td align='left' $col> </td>"; } print "<td align='center' $col>$confighash{$key}[25]</td>"; + my $col1="bgcolor='${Header::colourred}'"; # 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>"; + my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>"; foreach my $line (@status) { 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>"; + $col1="bgcolor='${Header::colourgreen}'"; + $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>"; } } # move to blueif really down - if ($confighash{$key}[0] eq 'off' && $active =~ /${Header::colourred}/ ) { - $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>"; + if ($confighash{$key}[0] eq 'off' && $col1 =~ /${Header::colourred}/ ) { + $col1="bgcolor='${Header::colourblue}'"; + $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>"; } print <<END - <td align='center' $col>$active</td> + <td align='center' $col1>$active</td> <td align='center' $col> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='image' name='$Lang::tr{'restart'}' src='/images/reload.gif' alt='$Lang::tr{'restart'}' title='$Lang::tr{'restart'}' /> @@ -2806,7 +2810,7 @@ END print <<END <table width='100%'> - <tr><td align='center' colspan='9'> + <tr><td align='right' colspan='9'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='submit' name='ACTION' value='$Lang::tr{'add'}' /> </form> @@ -2816,7 +2820,7 @@ END ; &Header::closebox(); - &Header::openbox('100%', 'left', "$Lang::tr{'certificate authorities'}:"); + &Header::openbox('100%', 'left', "$Lang::tr{'certificate authorities'}"); print <<EOF <table width='100%' cellspacing='1' cellpadding='0' class='tbl'> <tr> @@ -2949,6 +2953,7 @@ END } my $createCA = -f "${General::swroot}/ca/cacert.pem" ? '' : "<tr><td colspan='3'></td><td><input type='submit' name='ACTION' value='$Lang::tr{'generate root/host certificates'}' /></td></tr>"; print <<END + <br> <hr /> <form method='post' enctype='multipart/form-data' action='$ENV{'SCRIPT_NAME'}'> <table width='100%' border='0' cellspacing='1' cellpadding='0'> @@ -2961,7 +2966,7 @@ END </tr> <tr> <td colspan='3'>$Lang::tr{'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections'}:</td> - <td><input type='submit' name='ACTION' value='$Lang::tr{'remove x509'}' /></td> + <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'remove x509'}' /></td> </tr> </table> </form> diff --git a/html/cgi-bin/wakeonlan.cgi b/html/cgi-bin/wakeonlan.cgi index f403ea3..4a7fc84 100644 --- a/html/cgi-bin/wakeonlan.cgi +++ b/html/cgi-bin/wakeonlan.cgi @@ -260,12 +260,12 @@ print <<END <td colspan='4' align='left'><input type='text' name='CLIENT_COMMENT' value='$cgiparams{'CLIENT_COMMENT'}' size='40' /></td> </tr> </table> +<br> <hr /> <table width='100%'> <tr> - <td class='base' valign='top'><img src='/blob.gif' alt='*' /></td> - <td width='55%' class='base'>$Lang::tr{'this field may be blank'}</td> - <td width='40%' align='center'> + <td class='base' valign='top'><img src='/blob.gif' alt='*' />$Lang::tr{'this field may be blank'}</td> + <td width='40%' align='right'> END ; diff --git a/html/cgi-bin/wireless.cgi b/html/cgi-bin/wireless.cgi index 0755958..358f318 100644 --- a/html/cgi-bin/wireless.cgi +++ b/html/cgi-bin/wireless.cgi @@ -225,16 +225,15 @@ print <<END <td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='40' /></td> </tr> </table> -<hr /> +<br> +<hr> <table width='100%'> <tr> - <td class='base' valign='top'><img src='/blob.gif' alt='*' /></td> - <td width='55%' class='base'>$Lang::tr{'this field may be blank'}</td> - <td width='40%' align='center'> + <td class='base' valign='top'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td> + <td width='40%' align='right'> <input type='hidden' name='ACTION' value='add' /> <input type='submit' name='SUBMIT' value='$buttontext' /> </td> - <td width='5%' align='right'> </td> </tr> </table> END diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css index 9e834cd..aa7bd16 100644 --- a/html/html/themes/ipfire/include/css/style.css +++ b/html/html/themes/ipfire/include/css/style.css @@ -223,7 +223,7 @@ iframe { #main_inner .post h2 { border-bottom: dotted 1px #e1e1e1; - font-size: 1.7em; + font-size: 0.8em; margin-bottom: 1em; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index ddc0088..3671c52 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -73,12 +73,12 @@ 'activate user' => 'Benutzer aktivieren', 'active' => 'Aktiv', 'add' => 'Hinzufügen', -'add a host' => 'Host hinzufügen:', +'add a host' => 'Host hinzufügen', 'add a new rule' => 'Neue Regel hinzufügen:', 'add cron' => 'Cronjob hinzufügen', 'add device' => 'Gerät hinzufügen', 'add network' => 'Netzwerk hinzufügen', -'add new alias' => 'Neue Alias-Adresse hinzufügen:', +'add new alias' => 'Neue Alias-Adresse hinzufügen', 'add new lease' => 'Neue Zuordnung definieren', 'add new ovpn' => 'OpenVPN-Einstellungen', 'add printer' => 'Drucker hinzufügen', @@ -89,6 +89,7 @@ 'add xtaccess' => 'Externen Zugang hinzugefügt', 'add-route' => 'Additional push route', 'added from dhcp lease list' => 'hinzugefügt von der DHCP-Zuordnungsliste', +'addon' => 'Addons', 'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.', 'admin users' => 'Liste der Benutzer mit Super User Rechten', 'administrator user password' => 'Passwort für Benutzer "admin":', @@ -356,7 +357,7 @@ 'april' => 'April', 'archive not exist' => 'Konfigurationsarchiv existiert nicht', 'are you sure' => 'Sind Sie sicher?', -'arp table entries' => 'Einträge der ARP-Tabelle:', +'arp table entries' => 'Einträge der ARP-Tabelle', 'artist' => 'Künstler', 'attemps' => 'Versuche', 'attention' => 'ACHTUNG', @@ -540,7 +541,7 @@ 'connection' => 'Verbindung', 'connection closed' => 'Nicht Verbunden...', 'connection debugging' => 'Verbindungs-Debugging', -'connection status and controlc' => 'Verbindungsstatus und -kontrolle:', +'connection status and controlc' => 'Verbindungsstatus und -kontrolle', 'connection tracking' => 'iptables-Verbindungsverfolgung', 'connection type' => 'Verbindungstyp', 'connection type is invalid' => 'Verbindungstyp ist ungültig', @@ -579,13 +580,13 @@ 'crl' => 'Certificate Revocation List', 'cron server' => 'Cron-Server', 'current' => 'Aktuell', -'current aliases' => 'Aktuelle Alias-Adresse:', +'current aliases' => 'Aktuelle Alias-Adresse', 'current class' => 'Aktuelle Klasse', 'current devices' => 'Schnittstellen', 'current dhcp leases on blue' => 'Aktuelle DHCP-Zuordnungen auf Blau', 'current dynamic leases' => 'Aktuelle dynamische Zuordnungen', 'current fixed leases' => 'Aktuelle feste Zuordnungen', -'current hosts' => 'Aktuelle Hosts:', +'current hosts' => 'Aktuelle Hosts', 'current media' => 'Aktuelles Medium', 'current ovpn' => 'Aktive OVPN-Verbindung', 'current playlist' => 'Aktuelle Playlist', @@ -718,10 +719,10 @@ 'dns server' => 'DNS Server', 'dns title' => 'Domain Name System', 'dnsforward' => 'DNS-Weiterleitung', -'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen:', +'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen', 'dnsforward configuration' => 'Einstellungen für DNS Weiterleitung', -'dnsforward edit an entry' => 'Existierenden Eintrag bearbeiten:', -'dnsforward entries' => 'Aktuelle Einträge:', +'dnsforward edit an entry' => 'Existierenden Eintrag bearbeiten', +'dnsforward entries' => 'Aktuelle Einträge', 'dnsforward forward_server' => 'DNS-Server', 'dnsforward zone' => 'Zone', 'do not log this port list' => 'Verwerfe diese Port-Liste kurz bevor sie protokolliert werden (reduziert Protokollgröße)', @@ -819,7 +820,7 @@ 'err rs 8 untar' => 'Fehler beim un-tar-en des Archivs', 'error config' => 'Kann /var/ipfire/ovpn/config/ZERINA.ovpn nicht öffnen!', 'error external access' => 'Kann /var/ipfire/xtaccess/config nicht öffnen (external acccess could not be granted)!', -'error messages' => 'Fehlermeldungen:', +'error messages' => 'Fehlermeldungen', 'esp encryption' => 'ESP Verschlüsselung:', 'esp grouptype' => 'ESP Gruppentyp:', 'esp integrity' => 'ESP Integrität:', @@ -843,7 +844,7 @@ 'extrahd' => 'ExtraHD', 'extrahd because there is already a device mounted' => ' mounten, weil bereits ein Gerät gemountet ist', 'extrahd cant umount' => 'Konnte', -'extrahd detected drives' => 'gefundene Laufwerke', +'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 nachinstallieren. 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', @@ -961,7 +962,7 @@ 'fwdfw log' => 'Log', 'fwdfw log rule' => 'Logging aktivieren', 'fwdfw man port' => 'Port(s):', -'fwdfw menu' => 'Firewallregeln', +'fwdfw menu' => 'Firewall', 'fwdfw movedown' => 'Herunter', 'fwdfw moveup' => 'Herauf', 'fwdfw natport used' => 'Der eingegebene Port wird bereits von einer anderen DNAT-Regel benutzt.', @@ -1003,13 +1004,12 @@ 'fwdfw wd_tue' => 'Di', 'fwdfw wd_wed' => 'Mi', 'fwdfw xt access' => 'Input', -'fwhost addgrp' => 'Neue Gruppe hinzufügen:', +'fwhost addgrp' => 'Neue Gruppe hinzufügen', 'fwhost addgrpname' => 'Gruppenname:', -'fwhost addhost' => 'Neuen Host hinzufügen:', -'fwhost addnet' => 'Neues Netzwerk hinzufügen:', -'fwhost addrule' => 'Regel hinzufügen/ändern:', -'fwhost addservice' => 'Neuen Dienst hinzufügen:', -'fwhost addservicegrp' => 'Neue Dienstgruppe hinzufügen:', +'fwhost addhost' => 'Neuen Host hinzufügen', +'fwhost addnet' => 'Neues Netzwerk hinzufügen', +'fwhost addservice' => 'Neuen Dienst hinzufügen', +'fwhost addservicegrp' => 'Neue Dienstgruppe hinzufügen', 'fwhost any' => 'Alle', 'fwhost attention' => 'ACHTUNG', 'fwhost back' => 'Zurück', @@ -1018,10 +1018,10 @@ 'fwhost ccdnet' => 'OpenVPN-Netzwerke:', 'fwhost change' => 'Ändern', 'fwhost changeremark' => 'Es wurde nur die Bemerkung angepasst.', -'fwhost cust addr' => 'Hosts:', -'fwhost cust grp' => 'Gruppen:', -'fwhost cust net' => 'Netzwerke:', -'fwhost cust service' => 'Dienste:', +'fwhost cust addr' => 'Hosts', +'fwhost cust grp' => 'Gruppen', +'fwhost cust net' => 'Netzwerke', +'fwhost cust service' => 'Dienste', 'fwhost cust srvgrp' => 'Dienstgruppen', 'fwhost deleted' => 'Gelöscht', 'fwhost empty' => 'Keine Regeln definiert', @@ -1120,7 +1120,7 @@ 'hangup' => 'Trennen', 'hangup string' => 'Auflegen:', 'harddisk temperature' => 'Festplattentemperatur', -'harddisk temperature graphs' => 'HDD-Temperatur-Diagramme', +'harddisk temperature graphs' => 'HDD-Diagramme', 'hardware graphs' => 'Hardware-Diagramme', 'hdd temperature in' => 'Festplattentemperatur in', 'help' => 'Hilfe', @@ -1311,7 +1311,7 @@ 'local vpn hostname/ip' => 'Lokaler VPN Hostname/IP', 'localkey' => 'Localkey', 'localkeyfile' => 'Localkeyfile', -'log' => 'Protokoll:', +'log' => 'Protokoll', 'log enabled' => 'Log aktiviert', 'log level' => 'Log Level', 'log lines per page' => 'Zeilen pro Seite', @@ -1354,7 +1354,7 @@ 'mac address recon' => 'Es wird neu Verbunden!', 'mac address saved' => 'Erfolgreich gespeichert!', 'mac address saved txt' => 'Die MAC-Adresse wurde erfolgreich gespeichert. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.', -'mac address title' => 'Medium Access Control Adresse', +'mac address title' => 'MAC Adresse zuweisen', 'mac desc' => 'Sie können an dieser Stelle die MAC-Adresse von red0 ändern. Die Adresse muss in hexadezimal (0-9,a-f) eingegeben werden, eine gültige Eingaben ist z.B. 00-01-02-0e-b8-d6 oder 00:01:02:0e:b8:d6.', 'mac new' => 'Neue MAC-Adresse:', 'mac1 new' => 'Neue MAC-Adresse 1 (vdsl-inet):', @@ -1472,7 +1472,7 @@ 'network red' => 'Netzwerk (extern)', 'network removed' => 'Benutzerdefiniertes Netzwerk entfernt', 'network status information' => 'Netzwerk-Statusinformationen', -'network time' => 'Benutze NTP-Server:', +'network time' => 'Benutze NTP-Server', 'network time from' => 'Uhrzeit von einem Netzwerk Zeitserver ermitteln', 'network traffic graphs' => 'Diagramme zur Netzwerkauslastung', 'network traffic graphs external' => 'Net-Traffic-Diagramme (extern)', @@ -1507,7 +1507,7 @@ 'notice' => 'Hinweis', 'november' => 'November', 'ntp common settings' => 'Allgemeine Einstellungen', -'ntp configuration' => 'NTP-Konfiguration', +'ntp configuration' => 'Zeitserver-Konfiguration', 'ntp must be enabled to have clients' => 'Um Clients annehmen zu können, muß NTP vorher aktiviert sein.', 'ntp server' => 'NTP-Server', 'ntp sync' => 'Synchronisation', @@ -1795,7 +1795,7 @@ 'root user password' => 'Root Passwort', 'route subnet is invalid' => 'Additional push route subnet is invalid', 'router ip' => 'IP-Adresse des Routers:', -'routing table entries' => 'Einträge der Routing-Tabelle:', +'routing table entries' => 'Einträge der Routing-Tabelle', 'rsvd dst port overlap' => 'Dieser Zielportbereich überlappt mit einem Port, der für die ausschließliche Benutzung durch IPFire reserviert ist:', 'rsvd src port overlap' => 'Dieser Quellportbereich überlappt mit einem Port, der für die ausschließliche Benutzung durch IPFire reserviert ist:', 'rules already up to date' => 'Regeln sind schon aktuell', @@ -1904,6 +1904,7 @@ 'srcprt range overlaps' => 'Quell-Port-Bereich überlappt mit einem bereits definierten Port.', 'srcprt within existing' => 'Quell-Port befindet sich innnerhalb eines bereits definierten Port-Bereichs.', 'ssdmz pinholes' => 'DMZ-Schlupflöcher', +'ssh' => 'SSH', 'ssh access' => 'SSH-Zugriff', 'ssh access tip' => 'IPFire SSH läuft auf dem nicht-standard Port 222!', 'ssh fingerprint' => 'Fingerabdruck', @@ -2067,7 +2068,7 @@ 'trafficorange' => 'DMZ', 'trafficout' => 'Ausgehend', 'trafficred' => 'Internet', -'traffics' => 'Trafficübersicht:', +'traffics' => 'Trafficübersicht', 'trafficsum' => 'Total', 'trafficto' => 'Nach', 'transfer limits' => 'Transferbeschränkungen', @@ -2301,7 +2302,7 @@ 'urlfilter log summary' => 'Gesamtanzahl der URL-Filter-Treffer für', 'urlfilter log viewer' => 'Ansicht URL-Filter-Log', 'urlfilter logs' => 'URL-Filter-Logdateien', -'urlfilter maintenance' => 'URL-Filter-Wartung', +'urlfilter maintenance' => 'URL-Filter Wartung', 'urlfilter manage local file repository' => 'Lokale Dateiablage verwalten', 'urlfilter manage repository' => 'Ablage verwalten', 'urlfilter minutes' => 'Minuten', @@ -2430,7 +2431,7 @@ 'vpn aggrmode' => 'IKE Aggressive Mode zugelassen. Wenn möglich, vermeiden (preshared Schlüssel wird im Klartext übertragen)!', 'vpn altname syntax' => 'Der Subjekt Alternativ Name ist eine durch Komma getrennte Liste von Email, DNS, URI, RID und IP Objekten. <br />Email: eine Email Adresse. Syntax Email: \'copy\' benutzt die Email Adresse aus dem Zertifikatfeld. <br />DNS: ein gültiger Domain Name.<br />URI: eine gültige URI.<br />RID: Registriertes Objekt Identifikation.<br />IP: eine IP Adresse.<br />Bitte beachten: der Zeichensatz ist eingeschränkt und die Groß-/Kleinschreibung ist entscheidend.<br />Beispiel:<br /><b>email:</b>info(a)ipfire.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/nach/irgendwo', 'vpn auth-dn' => 'Peer wird identifiziert durch entweder ein IPV4_ADDR, FQDN, USER_FQDN oder DER_ASN1_DN string in Remote ID Feld', -'vpn configuration main' => 'VPN-Konfiguration - Übersicht', +'vpn configuration main' => 'VPN-Konfiguration', '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', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 7d4546d..f04a17e 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -73,12 +73,12 @@ 'activate user' => 'Activate user', 'active' => 'Active', 'add' => 'Add', -'add a host' => 'Add a host:', +'add a host' => 'Add a host', 'add a new rule' => 'Add a new rule:', 'add cron' => 'add cronjob', 'add device' => 'Add device', 'add network' => 'Add network', -'add new alias' => 'Add a new alias:', +'add new alias' => 'Add a new alias', 'add new lease' => 'Add a new fixed lease', 'add new ovpn' => 'OpenVPN Settings:', 'add printer' => 'Add printer', @@ -89,6 +89,7 @@ 'add xtaccess' => 'Add External Access', 'add-route' => 'Additional push route', 'added from dhcp lease list' => 'Added from DHCP lease list', +'addons' => 'Addons', 'admin user password has been changed' => 'Admin user password has been changed.', 'admin users' => 'User with superuser rights', 'administrator user password' => 'Admin user password:', @@ -358,7 +359,7 @@ 'april' => 'April', 'archive not exist' => 'Configuration archive does not exist', 'are you sure' => 'Are you sure?', -'arp table entries' => 'ARP Table Entries:', +'arp table entries' => 'ARP Table Entries', 'artist' => 'Artist', 'attemps' => 'Attempts', 'attention' => 'ATTENTION', @@ -560,7 +561,7 @@ 'connection' => 'Connection', 'connection closed' => 'Not connected...', 'connection debugging' => 'Connection debugging', -'connection status and controlc' => 'Connection status and control:', +'connection status and controlc' => 'Connection status and control', 'connection tracking' => 'iptables Connection Tracking', 'connection type' => 'Connection Type', 'connection type is invalid' => 'Connection type is invalid.', @@ -600,13 +601,13 @@ 'crl' => 'Certificate Revocation List', 'cron server' => 'CRON Server', 'current' => 'Current', -'current aliases' => 'Current aliases:', +'current aliases' => 'Current aliases', 'current class' => 'Current class', 'current devices' => 'Current devices', 'current dhcp leases on blue' => 'Current DHCP leases on BLUE', 'current dynamic leases' => 'Current dynamic leases', 'current fixed leases' => 'Current fixed leases', -'current hosts' => 'Current hosts:', +'current hosts' => 'Current hosts', 'current media' => 'Current media', 'current ovpn' => 'Active OVPN-Connection:', 'current playlist' => 'Current Playlist', @@ -741,11 +742,11 @@ 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!', 'dns server' => 'DNS Server', 'dns title' => 'Domain Name System', -'dnsforward' => 'DNS forwarding', -'dnsforward add a new entry' => 'Add a new entry:', +'dnsforward' => 'DNS Forwarding', +'dnsforward add a new entry' => 'Add a new entry', 'dnsforward configuration' => 'DNS forward configuration', -'dnsforward edit an entry' => 'Edit an existing entry:', -'dnsforward entries' => 'Current entries:', +'dnsforward edit an entry' => 'Edit an existing entry', +'dnsforward entries' => 'Current entries', 'dnsforward forward_server' => 'Nameserver', 'dnsforward zone' => 'Zone', 'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)', @@ -845,7 +846,7 @@ 'err rs 8 untar' => 'Error untarring archive', 'error config' => 'Could not open /var/ipfire/ovpn/config/ZERINA.ovpn !', 'error external access' => 'Could not open /var/ipfire/xtaccess/config (external acccess could not be granted)!', -'error messages' => 'Error messages:', +'error messages' => 'Error messages', 'esp encryption' => 'ESP Encryption:', 'esp grouptype' => 'ESP Grouptype:', 'esp integrity' => 'ESP Integrity:', @@ -987,7 +988,7 @@ 'fwdfw log' => 'Log', 'fwdfw log rule' => 'Log rule', 'fwdfw man port' => 'Port(s):', -'fwdfw menu' => 'Firewall Rules', +'fwdfw menu' => 'Firewall', 'fwdfw movedown' => 'Move down', 'fwdfw moveup' => 'Move up', 'fwdfw natport used' => 'The given port for NAPT is already in use by an other DNAT rule.', @@ -1029,13 +1030,12 @@ 'fwdfw wd_tue' => 'Tue', 'fwdfw wd_wed' => 'Wed', 'fwdfw xt access' => 'Input', -'fwhost addgrp' => 'Add new network/host group:', +'fwhost addgrp' => 'Add new network/host group', 'fwhost addgrpname' => 'Group name:', -'fwhost addhost' => 'Add new host:', -'fwhost addnet' => 'Add new network:', -'fwhost addrule' => 'Add/edit rule:', -'fwhost addservice' => 'Add service:', -'fwhost addservicegrp' => 'Add new service group:', +'fwhost addhost' => 'Add new host', +'fwhost addnet' => 'Add new network', +'fwhost addservice' => 'Add service', +'fwhost addservicegrp' => 'Add new service group', 'fwhost any' => 'Any', 'fwhost attention' => 'ATTENTION', 'fwhost back' => 'Back', @@ -1044,11 +1044,11 @@ 'fwhost ccdnet' => 'OpenVPN networks:', 'fwhost change' => 'Modify', 'fwhost changeremark' => 'You modified just the remark', -'fwhost cust addr' => 'Hosts:', -'fwhost cust grp' => 'Network/Host Groups:', -'fwhost cust net' => 'Networks:', -'fwhost cust service' => 'Services:', -'fwhost cust srvgrp' => 'Service Groups:', +'fwhost cust addr' => 'Hosts', +'fwhost cust grp' => 'Network/Host Groups', +'fwhost cust net' => 'Networks', +'fwhost cust service' => 'Services', +'fwhost cust srvgrp' => 'Service Groups', 'fwhost deleted' => 'Deleted', 'fwhost empty' => 'No rules defined', 'fwhost err addr' => 'Invalid IP address or subnet', @@ -1147,8 +1147,8 @@ 'gz with key' => 'Only an encrypted archive can be restored on this machine.', 'hangup' => 'Disconnect', 'hangup string' => 'Hangup:', -'harddisk temperature' => 'Harddisk temperature', -'harddisk temperature graphs' => 'hdd temperature graphs', +'harddisk temperature' => 'Harddisk Temperature', +'harddisk temperature graphs' => 'HDD Graphs', 'hardware graphs' => 'Hardware Graphs', 'hdd temperature in' => 'Harddisk temperature in', 'help' => 'Help', @@ -1340,7 +1340,7 @@ 'local vpn hostname/ip' => 'Local VPN Hostname/IP', 'localkey' => 'Localkey', 'localkeyfile' => 'Localkeyfile', -'log' => 'Log:', +'log' => 'Log', 'log enabled' => 'Log Enabled', 'log level' => 'Log Level', 'log lines per page' => 'Lines per page', @@ -1379,11 +1379,11 @@ 'mac address error not valid' => 'MAC addresse not valid!', 'mac address header' => 'MAC address on red0', 'mac address in use' => 'MAC address already in use', -'mac address menu' => 'Assign MAC-address', +'mac address menu' => 'Assign MAC-Address', 'mac address recon' => 'Trying to reconnect!', 'mac address saved' => 'Successfully saved!', 'mac address saved txt' => 'The MAC address has been successfully saved, but changes will only take effect after reboot or reconnection.', -'mac address title' => 'Medium Access Control Address', +'mac address title' => 'Assign MAC Address', 'mac desc' => 'Here you are able to change the MAC address on red0. The address must be entered in hexadecimal (0-9,a-f), a valid entry is <br />e.g. 00-01-02-0e-b8-d6 or 00:01:02:0e:b8:d6.', 'mac new' => 'new MAC address:', 'mac1 new' => 'new MAC address 1 (vdsl-inet):', @@ -1425,10 +1425,10 @@ 'mbmon volt' => 'Voltage', 'meaning' => 'meaning', 'media' => 'Media', -'media information' => 'media information', +'media information' => 'Media information', 'medium' => 'Medium', 'memory' => 'Memory', -'memory information' => 'memory information', +'memory information' => 'Memory information', 'memory usage per' => 'Memory Usage per', 'messages logging' => 'Logsettings for /var/log/messages', 'method' => 'Method:', @@ -1501,7 +1501,7 @@ 'network red' => 'Network (external)', 'network removed' => 'Custom network removed', 'network status information' => 'Network Status Information', -'network time' => 'Use a network time server:', +'network time' => 'Use a network time server', 'network time from' => 'Obtain time from a network time server', 'network traffic graphs' => 'Network traffic graphs', 'network traffic graphs external' => 'Net-Traffic graphs (external)', @@ -1537,7 +1537,7 @@ 'notice' => 'Notice', 'november' => 'November', 'ntp common settings' => 'Common settings', -'ntp configuration' => 'NTP configuration', +'ntp configuration' => 'NTP Configuration', 'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.', 'ntp server' => 'NTP Server', 'ntp sync' => 'Synchronization', @@ -1827,7 +1827,7 @@ 'root user password' => 'Root password', 'route subnet is invalid' => 'Additional push route subnet is invalid', 'router ip' => 'Router IP address:', -'routing table entries' => 'Routing Table Entries:', +'routing table entries' => 'Routing Table Entries', 'rsvd dst port overlap' => 'Destination Port Range overlaps a port reserved for IPFire:', 'rsvd src port overlap' => 'Source Port Range overlaps a port reserved for IPFire:', 'rules already up to date' => 'Rules already up to date', @@ -1939,6 +1939,7 @@ 'srcprt range overlaps' => 'Source port range overlaps an already defined port.', 'srcprt within existing' => 'Source port is within an already defined port range.', 'ssdmz pinholes' => 'DMZ Pinholes', +'ssh' => 'SSH', 'ssh access' => 'SSH Access', 'ssh access tip' => 'IPFire SSH is not using default port 222!', 'ssh fingerprint' => 'Fingerprint', @@ -1970,10 +1971,10 @@ 'start ovpn server' => 'Start OpenVPN Server', 'state or province' => 'State or Province', 'static ip' => 'Static IP', -'static routes' => 'Static routes', +'static routes' => 'Static Routes', 'status' => 'Status', 'status information' => 'Status information', -'status ovpn' => '4. OpenVPN Status / Configuration:', +'status ovpn' => 'OpenVPN', 'std classes' => 'Standardclasses', 'stop' => 'Stop', 'stop ovpn server' => 'Stop OpenVPN Server', @@ -1992,7 +1993,7 @@ 'swap usage per' => 'Swap usage per', 'system' => 'System', 'system graphs' => 'System Graphs', -'system information' => 'System information', +'system information' => 'System Information', 'system log viewer' => 'System Log Viewer', 'system logs' => 'System Logs', 'system status information' => 'System Status Information', @@ -2104,7 +2105,7 @@ 'trafficorange' => 'DMZ', 'trafficout' => 'Output', 'trafficred' => 'Internet', -'traffics' => 'Utilization-overview:', +'traffics' => 'Utilization-overview', 'trafficsum' => 'Totals', 'trafficto' => 'To', 'transfer limits' => 'Transfer limits', @@ -2233,7 +2234,7 @@ 'uptime' => 'Uptime', 'uptime and users' => 'Uptime and users:', 'uptime load average' => 'Load average', -'url filter' => 'Content Filter', +'url filter' => 'URL Filter', 'urlfilter access' => 'Access', 'urlfilter activity detection' => 'Activity detection', 'urlfilter add new time constraint rule' => 'Add new time constraint rule', @@ -2469,7 +2470,7 @@ 'vpn aggrmode' => 'IKE aggressive mode allowed. Avoid if possible (preshared key is transmitted in clear text)!', 'vpn altname syntax' => 'SubjectAltName is a comma separated list of e-mail, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>e-mail:</b>ipfire(a)foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something', 'vpn auth-dn' => 'Peer is identified by either IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field', -'vpn configuration main' => 'VPN configuration - Main', +'vpn configuration main' => 'VPN Configuration', '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', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.13-core75, created. 42dbdb2088b7877ad1626d19db47089e07996b37
by git＠ipfire.org 09 Jan '14

09 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The tag, v2.13-core75 has been created at 42dbdb2088b7877ad1626d19db47089e07996b37 (commit) - Log ----------------------------------------------------------------- commit 42dbdb2088b7877ad1626d19db47089e07996b37 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 9 12:43:39 2014 +0100 OpenVPN converter: Fix coding style and verbose output. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core75, updated. 42dbdb2088b7877ad1626d19db47089e07996b37
by git＠ipfire.org 09 Jan '14

09 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core75 has been updated via 42dbdb2088b7877ad1626d19db47089e07996b37 (commit) via 59cbe38697db109f4860e1117b8307b588957b6c (commit) via 4436bc0e2fa74e48b638838ea295fc307f0fc85b (commit) via d9f2ad84895b03abe10607d20d33ac4878eea561 (commit) via 4d5247bdd079493da9989941278d4172cde3bfbf (commit) via 33f297c92b917e9ffff0f18cbee5b0f2e5bd34cd (commit) from ea6d6642a9520469dd845b52a860017844f7c67b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: config/backup/backup.pl | 3 ++ config/rootfiles/common/stage2 | 1 + config/rootfiles/core/75/filelists/files | 2 + config/rootfiles/core/75/update.sh | 3 ++ html/cgi-bin/ovpnmain.cgi | 1 - .../sysconfig/rc.local => scripts/convert-ovpn} | 44 ++++++++++++++++++++-- 6 files changed, 50 insertions(+), 4 deletions(-) copy src/{initscripts/sysconfig/rc.local => scripts/convert-ovpn} (53%) mode change 100644 => 100755 Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index f9b8302..fd62672 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -64,6 +64,9 @@ elsif ($ARGV[0] eq 'restore') { system("cd / && tar -xvz -p -f /tmp/restore.ipf"); #Here some converter scripts to correct old Backups (before core 65) system("/usr/sbin/ovpn-ccd-convert"); + + # Convert old OpenVPN CCD files (CN change, core 75). + system("/usr/local/bin/convert-ovpn"); } elsif ($ARGV[0] eq 'restoreaddon') { if ( -e "/tmp/$ARGV[1]" ){system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");} diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 1e91b37..8bb65c3 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -72,6 +72,7 @@ usr/lib/libstdc++.so.6 usr/local/bin/backupiso usr/local/bin/connscheduler usr/local/bin/consort.sh +usr/local/bin/convert-ovpn usr/local/bin/dialctrl.pl usr/local/bin/hddshutdown usr/local/bin/httpscert diff --git a/config/rootfiles/core/75/filelists/files b/config/rootfiles/core/75/filelists/files index 460db7d..9d4fbe4 100644 --- a/config/rootfiles/core/75/filelists/files +++ b/config/rootfiles/core/75/filelists/files @@ -3,5 +3,7 @@ etc/issue opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/ovpnmain.cgi usr/lib/openvpn/verify +usr/local/bin/convert-ovpn +var/ipfire/backup/bin/backup.pl var/ipfire/header.pl var/ipfire/langs diff --git a/config/rootfiles/core/75/update.sh b/config/rootfiles/core/75/update.sh index 3fd00fe..94bec74 100644 --- a/config/rootfiles/core/75/update.sh +++ b/config/rootfiles/core/75/update.sh @@ -44,6 +44,9 @@ if [ -r "/var/ipfire/ovpn/server.conf" ]; then -i /var/ipfire/ovpn/server.conf fi +# Convert CCD files. +/usr/local/bin/convert-ovpn + # Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 2f3ac4d..a7973a5 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -3990,7 +3990,6 @@ if ($cgiparams{'TYPE'} eq 'net') { if ( -e "${General::swroot}/ovpn/ccd/$confighash{$key}[2]"){ unlink "${General::swroot}/ovpn/ccd/$cgiparams{'CERT_NAME'}"; } - $confighash{$key}[2] =~ s/ /_/gi; open ( CCDRWCONF,'>',"${General::swroot}/ovpn/ccd/$confighash{$key}[2]") or die "Unable to create clientconfigfile $!"; print CCDRWCONF "# OpenVPN clientconfig from ccd extension by Copymaster#\n\n"; if($cgiparams{'CHECK1'} eq 'dynamic'){ diff --git a/src/scripts/convert-ovpn b/src/scripts/convert-ovpn new file mode 100755 index 0000000..58921a5 --- /dev/null +++ b/src/scripts/convert-ovpn @@ -0,0 +1,60 @@ +#!/usr/bin/perl + +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2013 Alexander Marx <amarx(a)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/>. # +# # +############################################################################### +# # +# This script converts old openvpn ccd files with underscore # +# to files with spaces to make them working with openvpn 2.3 again # +# STEP1: read ovpnconfig and verify cert names # +# STEP2: if neccessary convert ccd file # +# # +############################################################################### + +require '/var/ipfire/general-functions.pl'; + +my %configovpn=(); +my $ccdpath="/var/ipfire/ovpn/ccd/"; +my $ovpnconfig="/var/ipfire/ovpn/ovpnconfig"; + +&General::readhasharray ($ovpnconfig,\%configovpn); + +&check_config(); + +sub check_config { + print "Converting CCD files...\n"; + chdir($ccdpath); + + foreach my $key (sort keys %configovpn){ + # Skip everything else but roadwarrior connections. + next if ($configovpn{$key}[3] ne 'host'); + + # Skip all connections with no space in the CN name. + next if ($configovpn{$key}[2] !~ " "); + + my $ccdname = $configovpn{$key}[2]; + $ccdname =~ tr/ /_/; + + # Rename the CCD file if one with the old format exists. + if (-e "$ccdname") { + print " Renaming $ccdname -> $configovpn{$key}[2]...\n"; + rename($ccdname, $configovpn{$key}[2]); + } + } +} hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 9063a04e94587fc38f410ec2234275417de201ad
by git＠ipfire.org 09 Jan '14

09 Jan '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 42dbdb2088b7877ad1626d19db47089e07996b37
by git＠ipfire.org 09 Jan '14

09 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 42dbdb2088b7877ad1626d19db47089e07996b37 (commit) from 59cbe38697db109f4860e1117b8307b588957b6c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 42dbdb2088b7877ad1626d19db47089e07996b37 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 9 12:43:39 2014 +0100 OpenVPN converter: Fix coding style and verbose output. ----------------------------------------------------------------------- Summary of changes: src/scripts/convert-ovpn | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) Difference in files: diff --git a/src/scripts/convert-ovpn b/src/scripts/convert-ovpn index 1e99bce..58921a5 100755 --- a/src/scripts/convert-ovpn +++ b/src/scripts/convert-ovpn @@ -27,25 +27,34 @@ # # ############################################################################### +require '/var/ipfire/general-functions.pl'; + my %configovpn=(); my $ccdpath="/var/ipfire/ovpn/ccd/"; my $ovpnconfig="/var/ipfire/ovpn/ovpnconfig"; -require '/var/ipfire/general-functions.pl'; &General::readhasharray ($ovpnconfig,\%configovpn); -&check_config; +&check_config(); +sub check_config { + print "Converting CCD files...\n"; + chdir($ccdpath); -sub check_config -{ - print "\n"; foreach my $key (sort keys %configovpn){ - if ($configovpn{$key}[3] eq 'host' && $configovpn{$key}[2]=~" "){ - my $ccdname=$configovpn{$key}[2]; - $ccdname =~ tr/ /_/; - chdir($ccdpath); - rename($ccdname,$configovpn{$key}[2]); + # Skip everything else but roadwarrior connections. + next if ($configovpn{$key}[3] ne 'host'); + + # Skip all connections with no space in the CN name. + next if ($configovpn{$key}[2] !~ " "); + + my $ccdname = $configovpn{$key}[2]; + $ccdname =~ tr/ /_/; + + # Rename the CCD file if one with the old format exists. + if (-e "$ccdname") { + print " Renaming $ccdname -> $configovpn{$key}[2]...\n"; + rename($ccdname, $configovpn{$key}[2]); } } } hooks/post-receive -- IPFire 2.x development tree

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM January 2014