webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-17 06:23:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Ben Schweikert
2013-02-16 20:25:05 +01:00
parent 71c7c48403 fd88f2ee29
commit 2ad0c24a00
85 changed files with 4205 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/bash/dot_bashrc
View File

@@ -10,3 +10,9 @@ alias mv='mv -i'
if [ -f /etc/bashrc ]; then
. /etc/bashrc
fi
# Automatically logout only console users after 10 minutes.
export TMOUT=0
if [ -z "${SSH_TTY}" ] && [ -z "${STY}" ]; then
export TMOUT=600
fi

2
config/etc/group
View File

@@ -14,7 +14,7 @@ dialout:x:16:
floppy:x:19:
tape:x:20:
utmp:x:22:
squid:x:23:
squid:x:23:nobody
ntp:x:38:
dip:x:40:
mysql:x:41:

8
config/fstrim/trim Normal file
View File

@@ -0,0 +1,8 @@
#!/bin/bash
#
# Script to trim free space on solid state drives.
#
for i in / /boot /var; do
fstrim $i 2>&1 >/dev/null
done

25
config/qos/makeqosscripts.pl
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -58,6 +58,7 @@ my $subclassfile = "/var/ipfire/qos/subclasses";
my $level7file = "/var/ipfire/qos/level7config";
my $portfile = "/var/ipfire/qos/portconfig";
my $tosfile = "/var/ipfire/qos/tosconfig";
my $fqcodel_options = "noecn limit 800 quantum 500";
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
@@ -70,13 +71,11 @@ $qossettings{'DEF_INC_SPD'} = '';
$qossettings{'DEFCLASS_INC'} = '';
$qossettings{'DEFCLASS_OUT'} = '';
$qossettings{'ACK'} = '';
$qossettings{'MTU'} = '1492';
$qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`;
$qossettings{'IMQ_DEV'} = 'imq0';
$qossettings{'TOS'} = '';
$qossettings{'VALID'} = 'yes';
$qossettings{'IMQ_MODE'} = 'PREROUTING';
$qossettings{'QLENGTH'} = '1000';
&General::readhash("${General::swroot}/qos/settings", \%qossettings);
@@ -161,11 +160,8 @@ case "\$1" in
### INIT KERNEL
modprobe sch_htb
### SET QUEUE LENGTH & MTU - has just to be tested!!! IMPORTANT
ip link set dev $qossettings{'RED_DEV'} qlen $qossettings{'QLENGTH'}
#ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'}
### ADD HTB QDISC FOR $qossettings{'RED_DEV'}
tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1
tc qdisc add dev $qossettings{'RED_DEV'} root handle 1: htb default $qossettings{'DEFCLASS_OUT'}
### MAIN RATE LIMIT
@@ -224,7 +220,7 @@ foreach $classentry (sort @classes)
if ($qossettings{'RED_DEV'} eq $classline[0]) {
$qossettings{'DEVICE'} = $classline[0];
$qossettings{'CLASS'} = $classline[1];
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: sfq perturb $qossettings{'SFQ_PERTUB'}\n";
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n";
}
}
foreach $subclassentry (sort @subclasses) {
@@ -232,7 +228,7 @@ foreach $subclassentry (sort @subclasses) {
if ($qossettings{'RED_DEV'} eq $subclassline[0]) {
$qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'SCLASS'} = $subclassline[2];
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: sfq perturb $qossettings{'SFQ_PERTUB'}\n";
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel $fqcodel_options\n";
}
}
print "\n\t### FILTER TRAFFIC INTO CLASSES\n";
@@ -418,11 +414,8 @@ print <<END
modprobe imq numdevs=1
ip link set $qossettings{'IMQ_DEV'} up
### SET QUEUE LENGTH & MTU - has just to be tested!!! IMPORTANT
ip link set dev $qossettings{'IMQ_DEV'} qlen $qossettings{'QLENGTH'}
# ip link set dev $qossettings{'IMQ_DEV'} mtu $qossettings{'MTU'}
### ADD HTB QDISC FOR $qossettings{'IMQ_DEV'}
tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1
tc qdisc add dev $qossettings{'IMQ_DEV'} root handle 2: htb default $qossettings{'DEFCLASS_INC'}
### MAIN RATE LIMIT
@@ -481,7 +474,7 @@ foreach $classentry (sort @classes)
if ($qossettings{'IMQ_DEV'} eq $classline[0]) {
$qossettings{'DEVICE'} = $classline[0];
$qossettings{'CLASS'} = $classline[1];
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel\n";
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n";
}
}
foreach $subclassentry (sort @subclasses) {
@@ -489,7 +482,7 @@ foreach $subclassentry (sort @subclasses) {
if ($qossettings{'IMQ_DEV'} eq $subclassline[0]) {
$qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'SCLASS'} = $subclassline[2];
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel\n";
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel $fqcodel_options\n";
}
}
print "\n\t### FILTER TRAFFIC INTO CLASSES\n";
@@ -694,7 +687,9 @@ print <<END
(sleep 3 && killall -9 qosd &>/dev/null) &
# DELETE QDISCS
tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1
tc qdisc add root dev $qossettings{'RED_DEV'} fq_codel >/dev/null 2>&1
tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1
tc qdisc add root dev $qossettings{'IMQ_DEV'} fq_codel >/dev/null 2>&1
# STOP IMQ-DEVICE
ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1
iptables -t mangle --delete POSTROUTING -i $qossettings{'RED_DEV'} -p ah -j RETURN >/dev/null 2>&1

2
config/rootfiles/common/bind
View File

@@ -1,4 +1,4 @@
#usr/bin/dig
usr/bin/dig
usr/bin/host
usr/bin/nslookup
usr/bin/nsupdate

1
config/rootfiles/common/configroot
View File

@@ -59,6 +59,7 @@ var/ipfire/langs
#var/ipfire/langs/es.pl
#var/ipfire/langs/fr.pl
#var/ipfire/langs/list
#var/ipfire/langs/nl.pl
#var/ipfire/langs/pl.pl
#var/ipfire/langs/ru.pl
var/ipfire/logging

4
config/rootfiles/common/curl
View File

@@ -16,10 +16,11 @@ usr/bin/curl
usr/lib/libcurl.so
usr/lib/libcurl.so.3
usr/lib/libcurl.so.4
usr/lib/libcurl.so.4.2.0
usr/lib/libcurl.so.4.3.0
#usr/lib/pkgconfig/libcurl.pc
#usr/share/man/man1/curl-config.1
#usr/share/man/man1/curl.1
#usr/share/man/man1/mk-ca-bundle.1
#usr/share/man/man3/curl_easy_cleanup.3
#usr/share/man/man3/curl_easy_duphandle.3
#usr/share/man/man3/curl_easy_escape.3
@@ -57,6 +58,7 @@ usr/lib/libcurl.so.4.2.0
#usr/share/man/man3/curl_multi_socket_action.3
#usr/share/man/man3/curl_multi_strerror.3
#usr/share/man/man3/curl_multi_timeout.3
#usr/share/man/man3/curl_multi_wait.3
#usr/share/man/man3/curl_share_cleanup.3
#usr/share/man/man3/curl_share_init.3
#usr/share/man/man3/curl_share_setopt.3

6
config/rootfiles/common/daq
View File

@@ -1,4 +1,4 @@
usr/bin/daq-modules-config
#usr/bin/daq-modules-config
#usr/include/daq.h
#usr/include/daq_api.h
#usr/include/daq_common.h
@@ -20,8 +20,8 @@ usr/lib/daq
#usr/lib/libdaq.a
#usr/lib/libdaq.la
#usr/lib/libdaq.so
usr/lib/libdaq.so.1
usr/lib/libdaq.so.1.0.0
usr/lib/libdaq.so.2
usr/lib/libdaq.so.2.0.0
#usr/lib/libdaq_static.a
#usr/lib/libdaq_static.la
#usr/lib/libdaq_static_modules.a

2
config/rootfiles/common/fstrim Normal file
View File

@@ -0,0 +1,2 @@
etc/fcron.daily/trim
usr/bin/fstrim

37
config/rootfiles/common/i586/syslinux
View File

@@ -36,12 +36,14 @@
#usr/share/syslinux/com32/include/bitsize/stdint.h
#usr/share/syslinux/com32/include/bitsize/stdintconst.h
#usr/share/syslinux/com32/include/bitsize/stdintlimits.h
#usr/share/syslinux/com32/include/bufprintf.h
#usr/share/syslinux/com32/include/colortbl.h
#usr/share/syslinux/com32/include/com32.h
#usr/share/syslinux/com32/include/console.h
#usr/share/syslinux/com32/include/cpufeature.h
#usr/share/syslinux/com32/include/ctype.h
#usr/share/syslinux/com32/include/dev.h
#usr/share/syslinux/com32/include/dhcp.h
#usr/share/syslinux/com32/include/dirent.h
#usr/share/syslinux/com32/include/dprintf.h
#usr/share/syslinux/com32/include/elf.h
@@ -51,6 +53,24 @@
#usr/share/syslinux/com32/include/getopt.h
#usr/share/syslinux/com32/include/gplinclude
#usr/share/syslinux/com32/include/gplinclude/README
#usr/share/syslinux/com32/include/gplinclude/acpi
#usr/share/syslinux/com32/include/gplinclude/acpi/acpi.h
#usr/share/syslinux/com32/include/gplinclude/acpi/boot.h
#usr/share/syslinux/com32/include/gplinclude/acpi/dsdt.h
#usr/share/syslinux/com32/include/gplinclude/acpi/ecdt.h
#usr/share/syslinux/com32/include/gplinclude/acpi/facs.h
#usr/share/syslinux/com32/include/gplinclude/acpi/fadt.h
#usr/share/syslinux/com32/include/gplinclude/acpi/hpet.h
#usr/share/syslinux/com32/include/gplinclude/acpi/madt.h
#usr/share/syslinux/com32/include/gplinclude/acpi/mcfg.h
#usr/share/syslinux/com32/include/gplinclude/acpi/rsdp.h
#usr/share/syslinux/com32/include/gplinclude/acpi/rsdt.h
#usr/share/syslinux/com32/include/gplinclude/acpi/sbst.h
#usr/share/syslinux/com32/include/gplinclude/acpi/slic.h
#usr/share/syslinux/com32/include/gplinclude/acpi/ssdt.h
#usr/share/syslinux/com32/include/gplinclude/acpi/structs.h
#usr/share/syslinux/com32/include/gplinclude/acpi/tcpa.h
#usr/share/syslinux/com32/include/gplinclude/acpi/xsdt.h
#usr/share/syslinux/com32/include/gplinclude/cpuid.h
#usr/share/syslinux/com32/include/gplinclude/disk
#usr/share/syslinux/com32/include/gplinclude/disk/bootloaders.h
@@ -79,6 +99,8 @@
#usr/share/syslinux/com32/include/gplinclude/memory.h
#usr/share/syslinux/com32/include/gplinclude/vpd
#usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h
#usr/share/syslinux/com32/include/gplinclude/zzjson
#usr/share/syslinux/com32/include/gplinclude/zzjson/zzjson.h
#usr/share/syslinux/com32/include/ilog2.h
#usr/share/syslinux/com32/include/inttypes.h
#usr/share/syslinux/com32/include/klibc
@@ -104,7 +126,9 @@
#usr/share/syslinux/com32/include/stdio.h
#usr/share/syslinux/com32/include/stdlib.h
#usr/share/syslinux/com32/include/string.h
#usr/share/syslinux/com32/include/suffix_number.h
#usr/share/syslinux/com32/include/sys
#usr/share/syslinux/com32/include/sys/bitops.h
#usr/share/syslinux/com32/include/sys/cpu.h
#usr/share/syslinux/com32/include/sys/dirent.h
#usr/share/syslinux/com32/include/sys/elf32.h
@@ -126,6 +150,7 @@
#usr/share/syslinux/com32/include/syslinux/bootpm.h
#usr/share/syslinux/com32/include/syslinux/bootrm.h
#usr/share/syslinux/com32/include/syslinux/config.h
#usr/share/syslinux/com32/include/syslinux/disk.h
#usr/share/syslinux/com32/include/syslinux/features.h
#usr/share/syslinux/com32/include/syslinux/idle.h
#usr/share/syslinux/com32/include/syslinux/io.h
@@ -149,11 +174,16 @@
#usr/share/syslinux/com32/include/zlib.h
#usr/share/syslinux/com32/libcom32.a
#usr/share/syslinux/com32/libcom32gpl.a
#usr/share/syslinux/com32/libcom32upload.a
#usr/share/syslinux/com32/libutil_com.a
#usr/share/syslinux/com32/libutil_lnx.a
#usr/share/syslinux/config.c32
#usr/share/syslinux/cpuid.c32
#usr/share/syslinux/cpuidtest.c32
#usr/share/syslinux/diag
#usr/share/syslinux/diag/geodsp1s.img.xz
#usr/share/syslinux/diag/geodspms.img.xz
#usr/share/syslinux/diag/handoff.bin
#usr/share/syslinux/disk.c32
#usr/share/syslinux/dmitest.c32
#usr/share/syslinux/dosutil
@@ -168,10 +198,12 @@
#usr/share/syslinux/gptmbr_f.bin
#usr/share/syslinux/gpxecmd.c32
#usr/share/syslinux/gpxelinux.0
#usr/share/syslinux/gpxelinuxk.0
#usr/share/syslinux/hdt.c32
#usr/share/syslinux/host.c32
#usr/share/syslinux/ifcpu.c32
#usr/share/syslinux/ifcpu64.c32
#usr/share/syslinux/ifmemdsk.c32
#usr/share/syslinux/ifplop.c32
#usr/share/syslinux/int18.com
#usr/share/syslinux/isohdpfx.bin
@@ -183,6 +215,7 @@
#usr/share/syslinux/isolinux-debug.bin
#usr/share/syslinux/isolinux.bin
#usr/share/syslinux/kbdmap.c32
#usr/share/syslinux/kontron_wdt.c32
#usr/share/syslinux/linux.c32
#usr/share/syslinux/ls.c32
#usr/share/syslinux/lua.c32
@@ -197,8 +230,10 @@
#usr/share/syslinux/pcitest.c32
#usr/share/syslinux/pmload.c32
#usr/share/syslinux/poweroff.com
#usr/share/syslinux/prdhcp.c32
#usr/share/syslinux/pwd.c32
#usr/share/syslinux/pxechain.com
#usr/share/syslinux/pxechn.c32
#usr/share/syslinux/pxelinux.0
#usr/share/syslinux/reboot.c32
#usr/share/syslinux/rosh.c32
@@ -208,7 +243,9 @@
#usr/share/syslinux/syslinux.com
#usr/share/syslinux/syslinux.exe
#usr/share/syslinux/syslinux64.exe
#usr/share/syslinux/ver.com
#usr/share/syslinux/vesainfo.c32
#usr/share/syslinux/vesamenu.c32
#usr/share/syslinux/vpdtest.c32
#usr/share/syslinux/whichsys.c32
#usr/share/syslinux/zzjson.c32

22
config/rootfiles/common/libupnp
View File

@@ -3,26 +3,32 @@
#usr/include/upnp/LinkedList.h
#usr/include/upnp/ThreadPool.h
#usr/include/upnp/TimerThread.h
#usr/include/upnp/iasnprintf.h
#usr/include/upnp/UpnpGlobal.h
#usr/include/upnp/UpnpInet.h
#usr/include/upnp/UpnpIntTypes.h
#usr/include/upnp/UpnpStdInt.h
#usr/include/upnp/UpnpString.h
#usr/include/upnp/UpnpUniStd.h
#usr/include/upnp/ithread.h
#usr/include/upnp/ixml.h
#usr/include/upnp/ixmldebug.h
#usr/include/upnp/upnp.h
#usr/include/upnp/upnpconfig.h
#usr/include/upnp/upnpdebug.h
#usr/include/upnp/upnptools.h
#usr/lib/libixml.a
#usr/lib/libixml.la
usr/lib/libixml.so
usr/lib/libixml.so.2
usr/lib/libixml.so.2.0.8
#usr/lib/libthreadutil.a
#usr/lib/libthreadutil.la
usr/lib/libthreadutil.so
usr/lib/libthreadutil.so.2
usr/lib/libthreadutil.so.6
usr/lib/libthreadutil.so.6.0.3
#usr/lib/libupnp.a
#usr/lib/libupnp.la
#usr/lib/pkgconfig/libupnp.pc
#usr/include/upnp/upnpdebug.h
usr/lib/libixml.so.2.0.4
usr/lib/libthreadutil.so.2.2.3
usr/lib/libupnp.so
usr/lib/libupnp.so.3
usr/lib/libupnp.so.3.0.5
usr/lib/libupnp.so.6
usr/lib/libupnp.so.6.3.2
#usr/lib/pkgconfig/libupnp.pc

1
config/rootfiles/common/misc-progs
View File

@@ -33,7 +33,6 @@ usr/local/bin/syslogdctrl
usr/local/bin/timectrl
#usr/local/bin/tripwirectrl
usr/local/bin/updxlratorctrl
usr/local/bin/updxsetperms
usr/local/bin/upnpctrl
usr/local/bin/urlfilterctrl
usr/local/bin/wirelessctrl

1
config/rootfiles/common/openssl
View File

@@ -1164,7 +1164,6 @@ usr/lib/libssl.so.0.9.8
#usr/share/man/man3/md5.3
#usr/share/man/man3/mdc2.3
#usr/share/man/man3/pem.3
#usr/share/man/man3/rand.3
#usr/share/man/man3/rc4.3
#usr/share/man/man3/ripemd.3
#usr/share/man/man3/rsa.3

4
config/rootfiles/common/snort
View File

@@ -26,9 +26,10 @@ usr/bin/u2spewfoo
#usr/include/snort/dynamic_output/snort_debug.h
#usr/include/snort/dynamic_output/stream_api.h
#usr/include/snort/dynamic_preproc
#usr/include/snort/dynamic_preproc/attribute_table_api.h
#usr/include/snort/dynamic_preproc/bitop.h
#usr/include/snort/dynamic_preproc/cpuclock.h
#usr/include/snort/dynamic_preproc/file_api.h
#usr/include/snort/dynamic_preproc/file_lib.h
#usr/include/snort/dynamic_preproc/idle_processing.h
#usr/include/snort/dynamic_preproc/ipv6_port.h
#usr/include/snort/dynamic_preproc/mempool.h
@@ -178,6 +179,7 @@ usr/sbin/snort
#usr/share/doc/snort/README.dnp3
#usr/share/doc/snort/README.dns
#usr/share/doc/snort/README.event_queue
#usr/share/doc/snort/README.file
#usr/share/doc/snort/README.filters
#usr/share/doc/snort/README.flowbits
#usr/share/doc/snort/README.frag3

82
config/rootfiles/common/squid
View File

@@ -1157,47 +1157,47 @@ usr/lib/squid/errors/fr/error-details.txt
#usr/lib/squid/errors/ms/error-details.txt
#usr/lib/squid/errors/nl
#usr/lib/squid/errors/nl-nl
#usr/lib/squid/errors/nl/ERR_ACCESS_DENIED
#usr/lib/squid/errors/nl/ERR_ACL_TIME_QUOTA_EXCEEDED
#usr/lib/squid/errors/nl/ERR_AGENT_CONFIGURE
#usr/lib/squid/errors/nl/ERR_AGENT_WPAD
#usr/lib/squid/errors/nl/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/nl/ERR_CANNOT_FORWARD
#usr/lib/squid/errors/nl/ERR_CONNECT_FAIL
#usr/lib/squid/errors/nl/ERR_DIR_LISTING
#usr/lib/squid/errors/nl/ERR_DNS_FAIL
#usr/lib/squid/errors/nl/ERR_ESI
#usr/lib/squid/errors/nl/ERR_FORWARDING_DENIED
#usr/lib/squid/errors/nl/ERR_FTP_DISABLED
#usr/lib/squid/errors/nl/ERR_FTP_FAILURE
#usr/lib/squid/errors/nl/ERR_FTP_FORBIDDEN
#usr/lib/squid/errors/nl/ERR_FTP_NOT_FOUND
#usr/lib/squid/errors/nl/ERR_FTP_PUT_CREATED
#usr/lib/squid/errors/nl/ERR_FTP_PUT_ERROR
#usr/lib/squid/errors/nl/ERR_FTP_PUT_MODIFIED
#usr/lib/squid/errors/nl/ERR_FTP_UNAVAILABLE
#usr/lib/squid/errors/nl/ERR_GATEWAY_FAILURE
#usr/lib/squid/errors/nl/ERR_ICAP_FAILURE
#usr/lib/squid/errors/nl/ERR_INVALID_REQ
#usr/lib/squid/errors/nl/ERR_INVALID_RESP
#usr/lib/squid/errors/nl/ERR_INVALID_URL
#usr/lib/squid/errors/nl/ERR_LIFETIME_EXP
#usr/lib/squid/errors/nl/ERR_NO_RELAY
#usr/lib/squid/errors/nl/ERR_ONLY_IF_CACHED_MISS
#usr/lib/squid/errors/nl/ERR_PRECONDITION_FAILED
#usr/lib/squid/errors/nl/ERR_READ_ERROR
#usr/lib/squid/errors/nl/ERR_READ_TIMEOUT
#usr/lib/squid/errors/nl/ERR_SECURE_CONNECT_FAIL
#usr/lib/squid/errors/nl/ERR_SHUTTING_DOWN
#usr/lib/squid/errors/nl/ERR_SOCKET_FAILURE
#usr/lib/squid/errors/nl/ERR_TOO_BIG
#usr/lib/squid/errors/nl/ERR_UNSUP_HTTPVERSION
#usr/lib/squid/errors/nl/ERR_UNSUP_REQ
#usr/lib/squid/errors/nl/ERR_URN_RESOLVE
#usr/lib/squid/errors/nl/ERR_WRITE_ERROR
#usr/lib/squid/errors/nl/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/nl/error-details.txt
usr/lib/squid/errors/nl/ERR_ACCESS_DENIED
usr/lib/squid/errors/nl/ERR_ACL_TIME_QUOTA_EXCEEDED
usr/lib/squid/errors/nl/ERR_AGENT_CONFIGURE
usr/lib/squid/errors/nl/ERR_AGENT_WPAD
usr/lib/squid/errors/nl/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/nl/ERR_CANNOT_FORWARD
usr/lib/squid/errors/nl/ERR_CONNECT_FAIL
usr/lib/squid/errors/nl/ERR_DIR_LISTING
usr/lib/squid/errors/nl/ERR_DNS_FAIL
usr/lib/squid/errors/nl/ERR_ESI
usr/lib/squid/errors/nl/ERR_FORWARDING_DENIED
usr/lib/squid/errors/nl/ERR_FTP_DISABLED
usr/lib/squid/errors/nl/ERR_FTP_FAILURE
usr/lib/squid/errors/nl/ERR_FTP_FORBIDDEN
usr/lib/squid/errors/nl/ERR_FTP_NOT_FOUND
usr/lib/squid/errors/nl/ERR_FTP_PUT_CREATED
usr/lib/squid/errors/nl/ERR_FTP_PUT_ERROR
usr/lib/squid/errors/nl/ERR_FTP_PUT_MODIFIED
usr/lib/squid/errors/nl/ERR_FTP_UNAVAILABLE
usr/lib/squid/errors/nl/ERR_GATEWAY_FAILURE
usr/lib/squid/errors/nl/ERR_ICAP_FAILURE
usr/lib/squid/errors/nl/ERR_INVALID_REQ
usr/lib/squid/errors/nl/ERR_INVALID_RESP
usr/lib/squid/errors/nl/ERR_INVALID_URL
usr/lib/squid/errors/nl/ERR_LIFETIME_EXP
usr/lib/squid/errors/nl/ERR_NO_RELAY
usr/lib/squid/errors/nl/ERR_ONLY_IF_CACHED_MISS
usr/lib/squid/errors/nl/ERR_PRECONDITION_FAILED
usr/lib/squid/errors/nl/ERR_READ_ERROR
usr/lib/squid/errors/nl/ERR_READ_TIMEOUT
usr/lib/squid/errors/nl/ERR_SECURE_CONNECT_FAIL
usr/lib/squid/errors/nl/ERR_SHUTTING_DOWN
usr/lib/squid/errors/nl/ERR_SOCKET_FAILURE
usr/lib/squid/errors/nl/ERR_TOO_BIG
usr/lib/squid/errors/nl/ERR_UNSUP_HTTPVERSION
usr/lib/squid/errors/nl/ERR_UNSUP_REQ
usr/lib/squid/errors/nl/ERR_URN_RESOLVE
usr/lib/squid/errors/nl/ERR_WRITE_ERROR
usr/lib/squid/errors/nl/ERR_ZERO_SIZE_OBJECT
usr/lib/squid/errors/nl/error-details.txt
#usr/lib/squid/errors/oc
#usr/lib/squid/errors/oc/ERR_ACCESS_DENIED
#usr/lib/squid/errors/oc/ERR_ACL_TIME_QUOTA_EXCEEDED

1
config/rootfiles/common/strongswan
View File

@@ -51,6 +51,7 @@ usr/lib/ipsec/plugins/libstrongswan-openssl.so
usr/lib/ipsec/plugins/libstrongswan-pem.so
usr/lib/ipsec/plugins/libstrongswan-pgp.so
usr/lib/ipsec/plugins/libstrongswan-pkcs1.so
usr/lib/ipsec/plugins/libstrongswan-pkcs7.so
usr/lib/ipsec/plugins/libstrongswan-pkcs8.so
usr/lib/ipsec/plugins/libstrongswan-pubkey.so
usr/lib/ipsec/plugins/libstrongswan-random.so

1
config/rootfiles/core/66/exclude
View File

@@ -6,6 +6,7 @@ etc/ipsec.conf
etc/ipsec.secrets
etc/ipsec.user.conf
etc/ipsec.user.secrets
var/log/cache
var/updatecache
etc/localtime
var/ipfire/ovpn

1
config/rootfiles/core/66/filelists/bind Symbolic link
View File

@@ -0,0 +1 @@
../../../common/bind

6
config/rootfiles/core/66/filelists/files
View File

@@ -1,12 +1,15 @@
etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
etc/issue
etc/modprobe.d/cfg80211
etc/rc.d/init.d/cleanfs
etc/rc.d/init.d/firewall
etc/rc.d/init.d/fsresize
etc/rc.d/init.d/halt
etc/rc.d/init.d/leds
etc/rc.d/init.d/mountfs
etc/rc.d/init.d/network
etc/rc.d/init.d/networking/dhcpcd.exe
etc/rc.d/init.d/networking/red
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/partresize
@@ -27,6 +30,7 @@ opt/pakfire/lib/functions.sh
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat
srv/web/ipfire/cgi-bin/media.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/qos.cgi
@@ -34,6 +38,7 @@ srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/updatexlrator.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/bin/watch
usr/local/bin/makegraphs
usr/local/bin/readhash
usr/local/bin/scanhd
usr/sbin/ovpn-ccd-convert
@@ -43,3 +48,4 @@ var/ipfire/general-functions.pl
var/ipfire/langs
var/ipfire/outgoing/bin/outgoingfw.pl
var/ipfire/qos/bin/makeqosscripts.pl
var/ipfire/updatexlrator/bin/download

1
config/rootfiles/core/66/filelists/fstrim Symbolic link
View File

@@ -0,0 +1 @@
../../../common/fstrim

1
config/rootfiles/core/66/filelists/libupnp Symbolic link
View File

@@ -0,0 +1 @@
../../../common/libupnp

1
config/rootfiles/core/66/filelists/openssh Symbolic link
View File

@@ -0,0 +1 @@
../../../common/openssh

20
config/rootfiles/core/66/update.sh
View File

@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2012 IPFire-Team <info@ipfire.org>. #
# Copyright (C) 2013 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
@@ -78,7 +78,7 @@ fi
#
#
KVER="3.2.35"
KVER="3.2.38"
MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 `
# Nur den letzten Parameter verwenden
echo $MOUNT > /dev/null
@@ -111,6 +111,7 @@ add_to_backup usr/share/terminfo
add_to_backup etc/sysconfig/lm_sensors
add_to_backup etc/sysconfig/rc.local
add_to_backup usr/local/bin/vpn-watch
add_to_backup usr/local/bin/updxsetperms
add_to_backup usr/libexec/ipsec
# Backup the files
@@ -126,6 +127,9 @@ if [ $ROOTSPACE -lt 70000 ]; then
exit 2
fi
# Add user nobody to group squid.
usermod -a -G squid nobody
echo
echo Update Kernel to $KVER ...
#
@@ -184,6 +188,9 @@ rm -rf /lib/libncurses*
rm -f /usr/libexec/ipsec/{pluto,_pluto_adns,whack}
rm -f /usr/local/bin/vpn-watch
# Remove update accelerator permissions script.
rm -f /usr/local/bin/updxsetperms
#
#Extract files
tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
@@ -287,6 +294,7 @@ case $(uname -m) in
#
# ReInstall grub
#
echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map
grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
;;
esac
@@ -320,8 +328,8 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
"core-update-$core: WARNING not enough space for pae kernel."
else
echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
echo "ProgVersion: 3.2.35" >> /opt/pakfire/db/installed/meta-linux-pae
echo "Release: 25" >> /opt/pakfire/db/installed/meta-linux-pae
echo "ProgVersion: 3.2.38" >> /opt/pakfire/db/installed/meta-linux-pae
echo "Release: 27" >> /opt/pakfire/db/installed/meta-linux-pae
fi
fi
@@ -329,7 +337,9 @@ fi
if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then
echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen
echo "ProgVersion: 2.6.32.60" >> /opt/pakfire/db/installed/meta-linux-xen
echo "Release: 23" >> /opt/pakfire/db/installed/meta-linux-xen
echo "Release: 24" >> /opt/pakfire/db/installed/meta-linux-xen
# Add xvc0 to /etc/securetty
echo "xvc0" >> /etc/securetty
fi
#

2
config/rootfiles/packages/check_mk_agent Normal file
View File

@@ -0,0 +1,2 @@
usr/bin/check_mk_agent
usr/bin/waitmax

3
config/rootfiles/packages/cifs-utils Normal file
View File

@@ -0,0 +1,3 @@
sbin/mount.cifs
#usr/local/include/cifsidmap.h
#usr/local/share/man/man8/mount.cifs.8

31
config/rootfiles/packages/samba
View File

@@ -1,11 +1,5 @@
usr/bin/eventlogadm
usr/bin/findsmb
usr/bin/ldbadd
usr/bin/ldbdel
usr/bin/ldbedit
usr/bin/ldbmodify
usr/bin/ldbrename
usr/bin/ldbsearch
usr/bin/net
usr/bin/nmblookup
usr/bin/ntlm_auth
@@ -21,10 +15,12 @@ usr/bin/smbget
usr/bin/smbpasswd
usr/bin/smbspool
usr/bin/smbstatus
usr/bin/smbta-util
usr/bin/smbtar
usr/bin/smbtree
usr/bin/tdbbackup
usr/bin/tdbdump
usr/bin/tdbrestore
usr/bin/tdbtool
usr/bin/testparm
usr/bin/wbinfo
@@ -33,7 +29,6 @@ usr/bin/wbinfo
#usr/include/smb_share_modes.h
#usr/include/talloc.h
#usr/include/tdb.h
#usr/include/wbc_async.h
#usr/include/wbclient.h
usr/lib/libnetapi.so
usr/lib/libnetapi.so.0
@@ -43,8 +38,10 @@ usr/lib/libsmbsharemodes.so
usr/lib/libsmbsharemodes.so.0
usr/lib/libtalloc.so
usr/lib/libtalloc.so.2
usr/lib/libtalloc.so.2.0.5
usr/lib/libtdb.so
usr/lib/libtdb.so.1
usr/lib/libtdb.so.1.2.9
usr/lib/libwbclient.so
usr/lib/libwbclient.so.0
#usr/lib/samba
@@ -55,11 +52,11 @@ usr/lib/samba/charset/CP437.so
usr/lib/samba/charset/CP850.so
usr/lib/samba/gpext
usr/lib/samba/idmap
usr/lib/samba/idmap/autorid.so
usr/lib/samba/lowcase.dat
usr/lib/samba/nss_info
usr/lib/samba/pdb
usr/lib/samba/perfcount
usr/lib/samba/rpc
usr/lib/samba/upcase.dat
usr/lib/samba/valid.dat
#usr/lib/samba/vfs
@@ -68,6 +65,7 @@ usr/lib/samba/vfs/acl_xattr.so
usr/lib/samba/vfs/audit.so
usr/lib/samba/vfs/cap.so
usr/lib/samba/vfs/catia.so
usr/lib/samba/vfs/crossrename.so
usr/lib/samba/vfs/default_quota.so
usr/lib/samba/vfs/dirsort.so
usr/lib/samba/vfs/expand_msdfs.so
@@ -75,6 +73,7 @@ usr/lib/samba/vfs/extd_audit.so
usr/lib/samba/vfs/fake_perms.so
usr/lib/samba/vfs/fileid.so
usr/lib/samba/vfs/full_audit.so
usr/lib/samba/vfs/linux_xfs_sgid.so
usr/lib/samba/vfs/netatalk.so
usr/lib/samba/vfs/preopen.so
usr/lib/samba/vfs/readahead.so
@@ -87,11 +86,11 @@ usr/lib/samba/vfs/smb_traffic_analyzer.so
usr/lib/samba/vfs/streams_depot.so
usr/lib/samba/vfs/streams_xattr.so
usr/lib/samba/vfs/syncops.so
usr/lib/samba/vfs/time_audit.so
usr/lib/samba/vfs/xattr_tdb.so
usr/lib/security
usr/lib/security/pam_smbpass.so
usr/lib/security/pam_winbind.so
usr/sbin/mount.cifs
usr/sbin/nmbd
usr/sbin/smbd
usr/sbin/winbindd
@@ -116,12 +115,6 @@ usr/sbin/winbindd
#usr/share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo
#usr/share/man/man1/findsmb.1
#usr/share/man/man1/ldbadd.1
#usr/share/man/man1/ldbdel.1
#usr/share/man/man1/ldbedit.1
#usr/share/man/man1/ldbmodify.1
#usr/share/man/man1/ldbrename.1
#usr/share/man/man1/ldbsearch.1
#usr/share/man/man1/log2pcap.1
#usr/share/man/man1/nmblookup.1
#usr/share/man/man1/ntlm_auth.1
@@ -150,13 +143,13 @@ usr/sbin/winbindd
#usr/share/man/man8/eventlogadm.8
#usr/share/man/man8/idmap_ad.8
#usr/share/man/man8/idmap_adex.8
#usr/share/man/man8/idmap_autorid.8
#usr/share/man/man8/idmap_hash.8
#usr/share/man/man8/idmap_ldap.8
#usr/share/man/man8/idmap_nss.8
#usr/share/man/man8/idmap_rid.8
#usr/share/man/man8/idmap_tdb.8
#usr/share/man/man8/idmap_tdb2.8
#usr/share/man/man8/mount.cifs.8
#usr/share/man/man8/net.8
#usr/share/man/man8/nmbd.8
#usr/share/man/man8/pam_winbind.8
@@ -164,19 +157,21 @@ usr/sbin/winbindd
#usr/share/man/man8/smbd.8
#usr/share/man/man8/smbpasswd.8
#usr/share/man/man8/smbspool.8
#usr/share/man/man8/smbta-util.8
#usr/share/man/man8/swat.8
#usr/share/man/man8/tdbbackup.8
#usr/share/man/man8/tdbdump.8
#usr/share/man/man8/tdbtool.8
#usr/share/man/man8/umount.cifs.8
#usr/share/man/man8/vfs_acl_tdb.8
#usr/share/man/man8/vfs_acl_xattr.8
#usr/share/man/man8/vfs_aio_fork.8
#usr/share/man/man8/vfs_aio_pthread.8
#usr/share/man/man8/vfs_audit.8
#usr/share/man/man8/vfs_cacheprime.8
#usr/share/man/man8/vfs_cap.8
#usr/share/man/man8/vfs_catia.8
#usr/share/man/man8/vfs_commit.8
#usr/share/man/man8/vfs_crossrename.8
#usr/share/man/man8/vfs_default_quota.8
#usr/share/man/man8/vfs_dirsort.8
#usr/share/man/man8/vfs_extd_audit.8
@@ -197,6 +192,7 @@ usr/sbin/winbindd
#usr/share/man/man8/vfs_smb_traffic_analyzer.8
#usr/share/man/man8/vfs_streams_depot.8
#usr/share/man/man8/vfs_streams_xattr.8
#usr/share/man/man8/vfs_time_audit.8
#usr/share/man/man8/vfs_xattr_tdb.8
#usr/share/man/man8/winbindd.8
var/ipfire/backup/addons/includes/samba
@@ -218,6 +214,7 @@ var/ipfire/samba/smb.conf
var/ipfire/samba/smb.conf.default
var/lib/samba
var/log/samba
var/nmbd
etc/rc.d/init.d/samba
etc/rc.d/init.d/winbind
srv/web/ipfire/cgi-bin/samba.cgi

4
config/rpi-firmware/config.txt
View File

@@ -20,8 +20,8 @@ gpu_mem_512=32
###############################################################################
#
# underclock at idle
arm_freq_min=500
sdram_freq_min=250
#arm_freq_min=500
#sdram_freq_min=250
#
# use following paramters to overclock at load
#arm_freq=1000

17
config/updxlrator/download
View File

@@ -49,7 +49,7 @@ $vendorid =~ tr/A-Z/a-z/;
unless (-d "$repository/download/$vendorid")
{
system("mkdir -p $repository/download/$vendorid");
system("chmod 775 $repository/download/$vendorid");
chmod 0775, "$repository/download/$vendorid";
}
if($restartdl == 0)
@@ -159,13 +159,13 @@ if ($_ == 0)
unless (-d "$repository/$vendorid")
{
system("mkdir -p $repository/$vendorid");
system("chmod 775 $repository/$vendorid");
chmod 0775, "$repository/$vendorid";
}
unless (-d "$repository/$vendorid/$uuid")
{
system("mkdir -p $repository/$vendorid/$uuid");
system("chmod 775 $repository/$vendorid/$uuid");
chmod 0775, "$repository/$vendorid/$uuid";
}
&writelog("Moving file to the cache directory: $vendorid/$uuid");
@@ -180,8 +180,15 @@ if ($_ == 0)
&UPDXLT::setcachestatus("$repository/$vendorid/$uuid/checkup.log",time);
&UPDXLT::setcachestatus("$repository/$vendorid/$uuid/access.log",time);
system("/usr/local/bin/updxsetperms");
system("chmod 775 $repository/$vendorid/$uuid/*");
# Update permissions of all files in the download directory.
my @files = (
"$repository/$vendorid/$uuid/source.url",
"$repository/$vendorid/$uuid/status",
"$repository/$vendorid/$uuid/checkup.log",
"$repository/$vendorid/$uuid/access.log",
"$repository/$vendorid/$uuid/$updatefile"
);
chmod 0664, @files;
unlink ("$repository/download/$vendorid/$updatefile.info");

8
doc/language_issues.de
View File

@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
WARNING: translation string unused: Remote VPN IP
WARNING: translation string unused: Resolv
@@ -146,6 +147,7 @@ WARNING: translation string unused: err rs 8 untar
WARNING: translation string unused: error config
WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
@@ -257,6 +259,7 @@ WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type
@@ -293,6 +296,7 @@ WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
@@ -457,9 +461,12 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn incompatible use of defaultroute
WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
WARNING: translation string unused: vpn on green
WARNING: translation string unused: vpn on orange
WARNING: translation string unused: vpn watch
WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
@@ -476,3 +483,4 @@ WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: wlanap country

7
doc/language_issues.en
View File

@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
WARNING: translation string unused: Remote VPN IP
WARNING: translation string unused: Resolv
@@ -169,6 +170,7 @@ WARNING: translation string unused: err rs 8 untar
WARNING: translation string unused: error config
WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
@@ -283,6 +285,7 @@ WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type
@@ -320,6 +323,7 @@ WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
@@ -489,9 +493,12 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn incompatible use of defaultroute
WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
WARNING: translation string unused: vpn on green
WARNING: translation string unused: vpn on orange
WARNING: translation string unused: vpn watch
WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph

10
doc/language_issues.es
View File

@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
WARNING: translation string unused: Remote VPN IP
WARNING: translation string unused: Resolv
@@ -167,6 +168,7 @@ WARNING: translation string unused: err rs 8 untar
WARNING: translation string unused: error config
WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
@@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type
@@ -317,6 +320,7 @@ WARNING: translation string unused: other countries
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
WARNING: translation string unused: outgoing firewall p2p description
WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
@@ -486,9 +490,12 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn incompatible use of defaultroute
WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
WARNING: translation string unused: vpn on green
WARNING: translation string unused: vpn on orange
WARNING: translation string unused: vpn watch
WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
@@ -499,6 +506,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: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: attention
WARNING: untranslated string: bytes
@@ -599,6 +607,7 @@ WARNING: untranslated string: proxy reports daily
WARNING: untranslated string: proxy reports monthly
WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
@@ -608,3 +617,4 @@ WARNING: untranslated string: static routes
WARNING: untranslated string: system information
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlanap country

10
doc/language_issues.fr
View File

@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
WARNING: translation string unused: Remote VPN IP
WARNING: translation string unused: Resolv
@@ -167,6 +168,7 @@ WARNING: translation string unused: err rs 8 untar
WARNING: translation string unused: error config
WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
@@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type
@@ -316,6 +319,7 @@ WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
@@ -487,9 +491,12 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn incompatible use of defaultroute
WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
WARNING: translation string unused: vpn on green
WARNING: translation string unused: vpn on orange
WARNING: translation string unused: vpn watch
WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
@@ -498,6 +505,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: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: attention
WARNING: untranslated string: bytes
@@ -583,6 +591,7 @@ WARNING: untranslated string: proxy reports daily
WARNING: untranslated string: proxy reports monthly
WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
@@ -598,6 +607,7 @@ WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlanap access point
WARNING: untranslated string: wlanap channel
WARNING: untranslated string: wlanap country
WARNING: untranslated string: wlanap debugging
WARNING: untranslated string: wlanap del interface
WARNING: untranslated string: wlanap encryption

518
doc/language_issues.nl Normal file
View File

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

10
doc/language_issues.pl
View File

@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
WARNING: translation string unused: Remote VPN IP
WARNING: translation string unused: Resolv
@@ -167,6 +168,7 @@ WARNING: translation string unused: err rs 8 untar
WARNING: translation string unused: error config
WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
@@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type
@@ -317,6 +320,7 @@ WARNING: translation string unused: other countries
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
WARNING: translation string unused: outgoing firewall p2p description
WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
@@ -486,9 +490,12 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn incompatible use of defaultroute
WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
WARNING: translation string unused: vpn on green
WARNING: translation string unused: vpn on orange
WARNING: translation string unused: vpn watch
WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
@@ -499,6 +506,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: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: attention
WARNING: untranslated string: bytes
@@ -599,6 +607,7 @@ WARNING: untranslated string: proxy reports daily
WARNING: untranslated string: proxy reports monthly
WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
@@ -608,3 +617,4 @@ WARNING: untranslated string: static routes
WARNING: untranslated string: system information
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlanap country

10
doc/language_issues.ru
View File

@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
WARNING: translation string unused: Remote VPN IP
WARNING: translation string unused: Resolv
@@ -166,6 +167,7 @@ WARNING: translation string unused: err rs 8 untar
WARNING: translation string unused: error config
WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: filename
@@ -275,6 +277,7 @@ WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type
@@ -310,6 +313,7 @@ WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
@@ -479,9 +483,12 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn incompatible use of defaultroute
WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
WARNING: translation string unused: vpn on green
WARNING: translation string unused: vpn on orange
WARNING: translation string unused: vpn watch
WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: weekly firewallhits
@@ -490,6 +497,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: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: attention
WARNING: untranslated string: bytes
@@ -564,6 +572,7 @@ WARNING: untranslated string: proxy reports daily
WARNING: untranslated string: proxy reports monthly
WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
@@ -572,3 +581,4 @@ WARNING: untranslated string: server restart
WARNING: untranslated string: static routes
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlanap country

8
doc/language_missings
View File

@@ -11,6 +11,7 @@
############################################################################
# Checking cgi-bin translations for language: fr #
############################################################################
< advproxy errmsg cache
< advproxy errmsg invalid upstream proxy
< attention
< ccd add
@@ -97,6 +98,7 @@
< proxy reports monthly
< proxy reports today
< proxy reports weekly
< qos enter bandwidths
< server restart
< snort working
< static routes
@@ -132,6 +134,7 @@
############################################################################
# Checking cgi-bin translations for language: es #
############################################################################
< advproxy errmsg cache
< advproxy errmsg invalid upstream proxy
< Async logging enabled
< attention
@@ -234,6 +237,7 @@
< proxy reports monthly
< proxy reports today
< proxy reports weekly
< qos enter bandwidths
< server restart
< Set time on boot
< static routes
@@ -246,6 +250,7 @@
############################################################################
# Checking cgi-bin translations for language: pl #
############################################################################
< advproxy errmsg cache
< advproxy errmsg invalid upstream proxy
< attention
< ccd add
@@ -325,6 +330,7 @@
< proxy reports monthly
< proxy reports today
< proxy reports weekly
< qos enter bandwidths
< server restart
< static routes
< visit us at
@@ -336,6 +342,7 @@
# Checking cgi-bin translations for language: ru #
############################################################################
< Add a route
< advproxy errmsg cache
< advproxy errmsg invalid upstream proxy
< attention
< ccd add
@@ -419,6 +426,7 @@
< proxy reports monthly
< proxy reports today
< proxy reports weekly
< qos enter bandwidths
< server restart
< static routes
< visit us at

6
html/cgi-bin/ids.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2005-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") {
####################### End added for snort rules control #################################
if ($snortsettings{'RULES'} eq 'subscripted') {
$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931_s.tar.gz/$snortsettings{'OINKCODE'}";
$url=" http://www.snort.org/sub-rules/snortrules-snapshot-2940.tar.gz/$snortsettings{'OINKCODE'}";
} elsif ($snortsettings{'RULES'} eq 'registered') {
$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931.tar.gz/$snortsettings{'OINKCODE'}";
$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2940.tar.gz/$snortsettings{'OINKCODE'}";
} else {
$url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";
}

6
html/cgi-bin/media.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -45,9 +45,9 @@ my @querry = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1];
my @devices = `ls -1 /sys/block | grep -E '^sd|^xvd|^vd|^md' | sort | uniq`;
my @devices = `ls -1 /sys/block | grep -E '^sd|^mmcblk|^xvd|^vd|^md' | sort | uniq`;
if ( $querry[0] =~ "sd?" || $querry[0] =~ "xvd??" || $querry[0] =~ "vd?" || $querry[0] =~ "md*" ){
if ( $querry[0] =~ "sd?" || $querry[0] =~ "mmcblk?" || $querry[0] =~ "xvd??" || $querry[0] =~ "vd?" || $querry[0] =~ "md*" ){
print "Content-type: image/png\n\n";
binmode(STDOUT);

37
html/cgi-bin/proxy.cgi
View File

@@ -348,7 +348,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
$errormessage = $Lang::tr{'invalid input'};
goto ERROR;
}
if($proxysettings{'CACHE_MEM'} > $proxysettings{'CACHE_SIZE'}){
if($proxysettings{'CACHE_MEM'} > $proxysettings{'CACHE_SIZE'} && $proxysettings{'CACHE_SIZE'} > 0){
$errormessage = $Lang::tr{'advproxy errmsg cache'}." ".$proxysettings{'CACHE_MEM'}." > ".$proxysettings{'CACHE_SIZE'};
goto ERROR;
}
@@ -358,12 +358,17 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
$errormessage = $Lang::tr{'advproxy errmsg invalid proxy port'};
goto ERROR;
}
if (!($proxysettings{'UPSTREAM_PROXY'} eq '')) {
my @temp = split(/:/,$proxysettings{'UPSTREAM_PROXY'});
if (!(&General::validip($temp[0]))) {
$errormessage = $Lang::tr{'advproxy errmsg invalid upstream proxy'};
goto ERROR;
}
if (!($proxysettings{'UPSTREAM_PROXY'} eq ''))
{
my @temp = split(/:/,$proxysettings{'UPSTREAM_PROXY'});
if (!(&General::validip($temp[0])))
{
if (!(&General::validdomainname($temp[0])))
{
$errormessage = $Lang::tr{'advproxy errmsg invalid upstream proxy'};
goto ERROR;
}
}
}
if (!($proxysettings{'CACHE_SIZE'} =~ /^\d+/) ||
($proxysettings{'CACHE_SIZE'} < 10))
@@ -512,8 +517,11 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
}
if (!&General::validip($proxysettings{'LDAP_SERVER'}))
{
$errormessage = $Lang::tr{'advproxy errmsg ldap server'};
goto ERROR;
if (!&General::validdomainname($proxysettings{'LDAP_SERVER'}))
{
$errormessage = $Lang::tr{'advproxy errmsg ldap server'};
goto ERROR;
}
}
if (!&General::validport($proxysettings{'LDAP_PORT'}))
{
@@ -3086,12 +3094,6 @@ pid_filename /var/run/squid.pid
cache_mem $proxysettings{'CACHE_MEM'} MB
END
;
if ($proxysettings{'CACHE_SIZE'} ne '0')
{
print FILE "cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256\n\n";
}
print FILE "error_directory $errordir/$proxysettings{'ERR_LANGUAGE'}\n\n";
if ($proxysettings{'OFFLINE_MODE'} eq 'on') { print FILE "offline_mode on\n\n"; }
@@ -3109,6 +3111,11 @@ END
print FILE "\n";
}
if ($proxysettings{'CACHE_SIZE'} ne '0')
{
print FILE "cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256\n\n";
}
if ($proxysettings{'LOGGING'} eq 'on')
{
print FILE <<END

113
html/cgi-bin/qos.cgi
View File

@@ -73,8 +73,6 @@ $qossettings{'DEF_INC_SPD'} = '';
$qossettings{'DEFCLASS_INC'} = '';
$qossettings{'DEFCLASS_OUT'} = '';
$qossettings{'ACK'} = '';
$qossettings{'MTU'} = '1492';
$qossettings{'QLENGTH'} = '1000';
$qossettings{'RED_DEV'} = 'ppp0';
$qossettings{'IMQ_DEV'} = 'imq0';
$qossettings{'VALID'} = 'yes';
@@ -499,20 +497,21 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'save'})
}
elsif ($qossettings{'ACTION'} eq $Lang::tr{'template'} )
{
my @UP;
#print "UP<br />";
for(my $i = 1; $i <= 10; $i++) {
$UP[$i] = int($qossettings{'OUT_SPD'} / $i );
#print $i."=".$UP[$i]." ";
}
my @DOWN;
#print "<br /><br />Down<br />";
for(my $i = 1; $i <= 20; $i++) {
$DOWN[$i] = int($qossettings{'INC_SPD'} / $i);
#print $i."=".$DOWN[$i]." ";
}
open( FILE, "> $classfile" ) or die "Unable to write $classfile";
print FILE <<END
if (($qossettings{'OUT_SPD'} > 0) && ($qossettings{'INC_SPD'} > 0)) {
my @UP;
#print "UP<br />";
for(my $i = 1; $i <= 10; $i++) {
$UP[$i] = int($qossettings{'OUT_SPD'} / $i );
#print $i."=".$UP[$i]." ";
}
my @DOWN;
#print "<br /><br />Down<br />";
for(my $i = 1; $i <= 20; $i++) {
$DOWN[$i] = int($qossettings{'INC_SPD'} / $i);
#print $i."=".$DOWN[$i]." ";
}
open( FILE, "> $classfile" ) or die "Unable to write $classfile";
print FILE <<END
imq0;200;1;$DOWN[10];$DOWN[1];;;8;VoIP;
imq0;203;4;$DOWN[20];$DOWN[1];;;0;VPN;
imq0;204;5;$DOWN[20];$DOWN[1];;;8;Webtraffic;
@@ -526,9 +525,9 @@ $qossettings{'RED_DEV'};120;7;1;$UP[1];;;1;P2P;
$qossettings{'RED_DEV'};103;4;$UP[2];$UP[1];;;2;VPN;
END
;
close FILE;
open( FILE, "> $level7file" ) or die "Unable to write $level7file";
print FILE <<END
close FILE;
open( FILE, "> $level7file" ) or die "Unable to write $level7file";
print FILE <<END
102;$qossettings{'RED_DEV'};dns;;;
102;$qossettings{'RED_DEV'};rtp;;;
102;$qossettings{'RED_DEV'};skypetoskype;;;
@@ -550,9 +549,9 @@ END
220;imq0;bittorrent;;;
END
;
close FILE;
open( FILE, "> $portfile" ) or die "Unable to write $portfile";
print FILE <<END
close FILE;
open( FILE, "> $portfile" ) or die "Unable to write $portfile";
print FILE <<END
101;$qossettings{'RED_DEV'};icmp;;;;;
102;$qossettings{'RED_DEV'};tcp;;;;53;
102;$qossettings{'RED_DEV'};udp;;;;53;
@@ -575,22 +574,25 @@ END
204;imq0;tcp;;80;;;
END
;
close FILE;
if ($qossettings{'DEF_INC_SPD'} eq '') {
$qossettings{'DEF_INC_SPD'} = int($qossettings{'INC_SPD'} * 0.9);
close FILE;
if ($qossettings{'DEF_INC_SPD'} eq '') {
$qossettings{'DEF_INC_SPD'} = int($qossettings{'INC_SPD'} * 0.9);
}
if ($qossettings{'DEF_OUT_SPD'} eq '') {
$qossettings{'DEF_OUT_SPD'} = int($qossettings{'OUT_SPD'} * 0.9);
}
$qossettings{'DEFCLASS_INC'} = "210";
$qossettings{'DEFCLASS_OUT'} = "110";
$qossettings{'ACK'} ="101";
$qossettings{'ENABLED'} = 'on';
&General::writehash("${General::swroot}/qos/settings", \%qossettings);
system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
system("/usr/bin/touch /var/ipfire/qos/enable");
system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
system("logger -t ipfire 'QoS started'");
} else {
$message = $Lang::tr{'qos enter bandwidths'};
}
if ($qossettings{'DEF_OUT_SPD'} eq '') {
$qossettings{'DEF_OUT_SPD'} = int($qossettings{'OUT_SPD'} * 0.9);
}
$qossettings{'DEFCLASS_INC'} = "210";
$qossettings{'DEFCLASS_OUT'} = "110";
$qossettings{'ACK'} ="101";
$qossettings{'ENABLED'} = 'on';
&General::writehash("${General::swroot}/qos/settings", \%qossettings);
system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
system("/usr/bin/touch /var/ipfire/qos/enable");
system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
system("logger -t ipfire 'QoS started'");
}
elsif ($qossettings{'ACTION'} eq $Lang::tr{'status'} )
{
@@ -659,13 +661,6 @@ END
&Header::closepage();
exit
}
elsif ($qossettings{'ACTION'} eq "$Lang::tr{'urlfilter advanced settings'}" )
{
&expert();
&Header::closebigbox();
&Header::closepage();
exit
}
if ($qossettings{'ACTIONBW'} eq "$Lang::tr{'modify'}" )
{
&changebandwidth();
@@ -749,11 +744,11 @@ END
</table>
</form>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table border='0' cellpadding='0' cellspacing='0'>
<tr><td><input type='submit' name='ACTION' value='$Lang::tr{'parentclass add'}' />
<td><input type='submit' name='ACTION' value='$Lang::tr{'urlfilter advanced settings'}' />
<td><input type='submit' name='ACTION' value='$Lang::tr{'status'}' />
</tr></table>
<table width='66%' border='0'>
<tr><td width='100%' align='center'>
<input type='submit' name='ACTION' value='$Lang::tr{'parentclass add'}' />
<input type='submit' name='ACTION' value='$Lang::tr{'status'}' />
</td></tr></table>
</form>
END
;
@@ -1435,26 +1430,6 @@ END
}
}
}
sub expert
{
&Header::openbox('100%', 'center', $Lang::tr{'expertoptions'});
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='66%'>
<tr><td width='33%' align='right'>MTU:<td width='33%' align='left'>
<input type='text' name='MTU' maxlength='8' required='4' value='$qossettings{'MTU'}' />
<td width='33%' align='center'>$Lang::tr{'mtu QoS'}
<tr><td width='33%' align='right'>$Lang::tr{'Queuelenght'}:<td width='33%' align='left'>
<input type='text' name='QLENGTH' maxlength='8' required='2' value='$qossettings{'QLENGTH'}' />
<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
</table>
</form>
END
;
&Header::closebox();
}
sub validminbwdth {
if ( $qossettings{'VALID'} eq 'yes' ) {
if ( $qossettings{'DEVICE'} eq $qossettings{'RED_DEV'} ) {

26
html/cgi-bin/vpnmain.cgi Executable file → Normal file
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team info@ipfire.org #
# Copyright (C) 2007-2013 IPFire Team info@ipfire.org #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -1367,14 +1367,14 @@ END
goto VPNCONF_ERROR;
}
if ($cgiparams{'TYPE'} eq 'net'){
$errormessage=&General::checksubnets($cgiparams{'NAME'},$cgiparams{'REMOTE_SUBNET'});
if ($errormessage ne ''){
goto VPNCONF_ERROR;
}
}
#temporary disabled (BUG 10294)
# if ($cgiparams{'TYPE'} eq 'net'){
# $errormessage=&General::checksubnets($cgiparams{'NAME'},$cgiparams{'REMOTE_SUBNET'});
# if ($errormessage ne ''){
# goto VPNCONF_ERROR;
# }
#
# }
if ($cgiparams{'AUTH'} eq 'psk') {
if (! length($cgiparams{'PSK'}) ) {
$errormessage = $Lang::tr{'pre-shared key is too short'};
@@ -1987,8 +1987,6 @@ END
;
&Header::closebox();
} elsif (! $cgiparams{'KEY'}) {
my $pskdisabled = ($vpnsettings{'VPN_IP'} eq '%defaultroute') ? "disabled='disabled'" : '' ;
$cgiparams{'PSK'} = $Lang::tr{'vpn incompatible use of defaultroute'} if ($pskdisabled);
my $cakeydisabled = ( ! -f "${General::swroot}/private/cakey.pem" ) ? "disabled='disabled'" : '';
$cgiparams{'CERT_NAME'} = $Lang::tr{'vpn no full pki'} if ($cakeydisabled);
my $cacrtdisabled = ( ! -f "${General::swroot}/ca/cacert.pem" ) ? "disabled='disabled'" : '';
@@ -1996,9 +1994,9 @@ END
&Header::openbox('100%', 'left', $Lang::tr{'authentication'});
print <<END
<table width='100%' cellpadding='0' cellspacing='5' border='0'>
<tr><td width='5%'><input type='radio' name='AUTH' value='psk' $checked{'AUTH'}{'psk'} $pskdisabled/></td>
<tr><td width='5%'><input type='radio' name='AUTH' value='psk' $checked{'AUTH'}{'psk'} /></td>
<td class='base' width='55%'>$Lang::tr{'use a pre-shared key'}</td>
<td class='base' width='40%'><input type='password' name='PSK' size='30' value='$cgiparams{'PSK'}' $pskdisabled/></td></tr>
<td class='base' width='40%'><input type='password' name='PSK' size='30' value='$cgiparams{'PSK'}' /></td></tr>
<tr><td colspan='3' bgcolor='#000000'></td></tr>
<tr><td><input type='radio' name='AUTH' value='certreq' $checked{'AUTH'}{'certreq'} $cakeydisabled /></td>
<td class='base'><hr />$Lang::tr{'upload a certificate request'}</td>
@@ -2094,7 +2092,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
goto ADVANCED_ERROR;
}
foreach my $val (@temp) {
if ($val !~ /^(aes256|aes128|3des)$/) {
if ($val !~ /^(aes256|aes192|aes128|3des)$/) {
$errormessage = $Lang::tr{'invalid input'};
goto ADVANCED_ERROR;
}

7
langs/de/cgi-bin/de.pl
View File

@@ -223,13 +223,13 @@
'advproxy errmsg invalid mac' => 'Ungültige MAC-Adresse',
'advproxy errmsg invalid pdc' => 'Ungültiger Hostname für den Primary Domain Controller',
'advproxy errmsg invalid proxy port' => 'Ungültiger Proxy-Port',
'advproxy errmsg invalid upstream proxy' => 'Ungültige IP für Upstream-Proxy',
'advproxy errmsg invalid upstream proxy' => 'Ungültige IP/Hostname für Upstream-Proxy',
'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy',
'advproxy errmsg invalid user' => 'Benutzername existiert nicht',
'advproxy errmsg ldap base dn' => 'LDAP base DN erforderlich',
'advproxy errmsg ldap bind dn' => 'LDAP bind DN Benutzername und Passwort erforderlich',
'advproxy errmsg ldap port' => 'Ungültige LDAP-Portnummer',
'advproxy errmsg ldap server' => 'Ungültige IP-Adresse für den LDAP-Server',
'advproxy errmsg ldap server' => 'Ungültige IP-Adresse/Hostname für den LDAP-Server',
'advproxy errmsg max userip' => 'Ungültige Anzahl von IP-Adressen pro Benutzer',
'advproxy errmsg mem cache size' => 'Ungültiger Wert für die Größe des RAM-Cachespeichers',
'advproxy errmsg no browser' => 'Mindestens ein Browser oder Client muss für den Web-Zugriff zugelassen sein',
@@ -1400,7 +1400,7 @@
'ovpn on blue' => 'OpenVPN auf BLAU',
'ovpn on orange' => 'OpenVPN auf ORANGE',
'ovpn on red' => 'OpenVPN auf ROT',
'ovpn routes push' => 'Routen (eine pro Zeile)',
'ovpn routes push' => 'Routen (eine pro Zeile) z.b. 192.168.10.0/255.255.255.0 192.168.20.0/24',
'ovpn routes push options' => 'Route push Optionen',
'ovpn server status' => 'OpenVPN-Server-Status',
'ovpn subnet' => 'OpenVPN-Subnetz (z.B. 10.0.10.0/255.255.255.0)',
@@ -1523,6 +1523,7 @@
'psk' => 'PSK',
'pulse' => 'Puls',
'pulse dial' => 'Pulswahl:',
'qos enter bandwidths' => 'Bitte geben Sie ihre Downstream- und Upstream-Bandbreite an!',
'qos graphs' => 'Qos Diagramme',
'qos warning' => 'Die Regel <strong>muss</strong> wieder gespeichert werden, ansonsten wird sie verworfen!',
'quick playlist' => 'Quick Playlist',

2
langs/de/install/lang_de.c
View File

@@ -358,7 +358,7 @@ char *de_tr[] = {
/* TR_PHONENUMBER_CANNOT_BE_EMPTY */
"Die Telefonnummer darf nicht leer sein.",
/* TR_PREPARE_HARDDISK */
"Das Installationsprogramm wird jetzt die Festplatte %s vorbereiten. Zunächst wird die Festplatte partitioniert. Danach wird auf den Partitionen ein Dateisystem erstellt.",
"Das Installationsprogramm wird jetzt die Festplatte %s vorbereiten. Zunächst wird die Festplatte partitioniert. Danach wird auf den Partitionen ein Dateisystem erstellt.\n\nALLE DATEN AUF DEM LAUFWERK WERDEN GELÖSCHT. Einverstanden?",
/* TR_PRESS_OK_TO_REBOOT */
"Drücken Sie Ok, um neu zu starten.",
/* TR_PRIMARY_DNS */

21
langs/en/cgi-bin/en.pl
View File

@@ -223,13 +223,13 @@
'advproxy errmsg invalid mac' => 'Invalid MAC address',
'advproxy errmsg invalid pdc' => 'Invalid hostname for primary domain controller',
'advproxy errmsg invalid proxy port' => 'Invalid proxy port',
'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP',
'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP/hostname',
'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting',
'advproxy errmsg invalid user' => 'Username does not exist',
'advproxy errmsg ldap base dn' => 'LDAP base DN required',
'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required',
'advproxy errmsg ldap port' => 'Invalid LDAP port number',
'advproxy errmsg ldap server' => 'Invalid IP address for LDAP Server',
'advproxy errmsg ldap server' => 'Invalid IP address/hostname for LDAP Server',
'advproxy errmsg max userip' => 'Invalid number of IP addresses per user',
'advproxy errmsg mem cache size' => 'Invalid value for memory cache size',
'advproxy errmsg no browser' => 'At least one browser or client must be selected for web access',
@@ -758,14 +758,14 @@
'download root certificate' => 'Download root certificate',
'dpd action' => 'Dead Peer Detection action',
'driver' => 'Driver',
'drop input' => 'Log dropped input pakets',
'drop newnotsyn' => 'Log dropped new not syn pakets',
'drop output' => 'Log dropped output pakets',
'drop portscan' => 'Log dropped portscan pakets',
'drop input' => 'Log dropped input packets',
'drop newnotsyn' => 'Log dropped new not syn packets',
'drop output' => 'Log dropped output packets',
'drop portscan' => 'Log dropped portscan packets',
'drop proxy' => 'Drop all packets not addressed to proxy',
'drop samba' => 'Drop all Microsoft ports 135,137,138,139,445,1025',
'drop wirelessforward' => 'Log dropped wireless forward pakets',
'drop wirelessinput' => 'Log dropped wireless input pakets',
'drop wirelessforward' => 'Log dropped wireless forward packets',
'drop wirelessinput' => 'Log dropped wireless input packets',
'dst port' => 'Dst Port',
'dstprt range overlaps' => 'Destination port range overlaps an already defined port.',
'dstprt within existing' => 'Destination port is within an already defined port range.',
@@ -1427,7 +1427,7 @@
'ovpn on blue' => 'OpenVPN on BLUE',
'ovpn on orange' => 'OpenVPN on ORANGE',
'ovpn on red' => 'OpenVPN on RED',
'ovpn routes push' => 'Routes (one per line):',
'ovpn routes push' => 'Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24',
'ovpn routes push options' => 'Route push options',
'ovpn server status' => 'Current OpenVPN server status:',
'ovpn subnet' => 'OpenVPN subnet (e.g. 10.0.10.0/255.255.255.0)',
@@ -1551,6 +1551,7 @@
'pulse' => 'Pulse',
'pulse dial' => 'Pulse dial:',
'qos add subclass' => 'Add subclass',
'qos enter bandwidths' => 'You will need to enter your downstream and upstream bandwidth!',
'qos graphs' => 'Qos Graphs',
'qos warning' => 'The rule <strong>must</strong> be saved, otherwise it will be discarded!',
'quick control' => 'Quick Control',
@@ -2235,8 +2236,8 @@
'wireless config changed' => 'Wireless config changed',
'wireless configuration' => 'Wireless Configuration',
'wlanap access point' => 'Access Point',
'wlanap country' => 'Country Code',
'wlanap channel' => 'Channel',
'wlanap country' => 'Country Code',
'wlanap debugging' => 'Debugging',
'wlanap del interface' => 'Remove selected interface?',
'wlanap encryption' => 'Encryption',

2
langs/en/install/lang_en.c
View File

@@ -354,7 +354,7 @@ char *en_tr[] = {
/* TR_PHONENUMBER_CANNOT_BE_EMPTY */
"Phone number cannot be empty.",
/* TR_PREPARE_HARDDISK */
"The installation program will now prepare the harddisk on %s. First the disk will be partitioned, and then the partitions will have a filesystem put on them.",
"The installation program will now prepare the harddisk on %s. First the disk will be partitioned, and then the partitions will have a filesystem put on them.\n\nALL DATA ON THE DISK WILL BE DESTROYED. Do you agree to continue?",
/* TR_PRESS_OK_TO_REBOOT */
"Press Ok to reboot.",
/* TR_PRIMARY_DNS */

1
langs/list
View File

@@ -4,3 +4,4 @@ fr:Français:French
es:Español:Spanish
pl:Polski:Polish
ru:Русский:Russian
nl:Nederlands:Dutch

2271
langs/nl/cgi-bin/nl.pl Normal file
View File

File diff suppressed because it is too large Load Diff

590
langs/nl/install/lang_nl.c Normal file
View File

@@ -0,0 +1,590 @@
/*
* Dutch (nl) Data File
*
* This file is part of the IPFire.
*
* IPCop is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* IPCop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with IPCop; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* (c) IPFire Team <info@ipfire.org>
*
* based on work of SmoothWall and IPCop
*
* (c) The SmoothWall Team
*
*/
#include "libsmooth.h"
char *nl_tr[] = {
/* TR_ISDN */
"ISDN",
/* TR_ERROR_PROBING_ISDN */
"Kan ISDN-apparaten niet detecteren.",
/* TR_PROBING_ISDN */
"Detecteren en configureren van ISDN-apparaten.",
/* TR_MISSING_GREEN_IP */
"Groen IP-adres ontbreekt!",
/* TR_CHOOSE_FILESYSTEM */
"Kies uw bestandssysteem:",
/* TR_NOT_ENOUGH_INTERFACES */
"Onvoldoende netwerkkaarten voor uw keuze.\n\nNodig: %d - Beschikbaar: %d\n",
/* TR_INTERFACE_CHANGE */
"Kies de interface die u wilt wijzigen.\n\n",
/* TR_NETCARD_COLOR */
"Toegewezen kaarten",
/* TR_REMOVE */
"Verwijder",
/* TR_MISSING_DNS */
"DNS ontbreekt.\n",
/* TR_MISSING_DEFAULT */
"Standaard gateway ontbreekt.\n",
/* TR_JOURNAL_EXT3 */
"Aanmaken journal voor Ext3...",
/* TR_CHOOSE_NETCARD */
"Kies een netwerkkaart voor de volgende interface - %s.",
/* TR_NETCARDMENU2 */
"Uitgebreide Netwerkmenu",
/* TR_ERROR_INTERFACES */
"Er zijn geen vrije interfaces op uw systeem.",
/* TR_REMOVE_CARD */
"Moet de toewijzing voor de netwerkkaart worden verwijderd? - %s",
/* TR_JOURNAL_ERROR */
"Kon het journaalboek niet aanmaken, valt terug op gebruik van ext2.",
/* TR_FILESYSTEM */
"Kies uw bestandssysteem",
/* TR_ADDRESS_SETTINGS */
"Adresinstellingen",
/* TR_ADMIN_PASSWORD */
"'admin' wachtwoord",
/* TR_AGAIN_PROMPT */
"Nogmaals:",
/* TR_ALL_CARDS_SUCCESSFULLY_ALLOCATED */
"Alle kaarten zijn succesvol toegewezen.",
/* TR_AUTODETECT */
"* AUTOMATISCH DETECTEREN *",
/* TR_BUILDING_INITRD */
"Aanmaken ramdisk...",
/* TR_CANCEL */
"Annuleren",
/* TR_CARD_ASSIGNMENT */
"Kaart toewijzing",
/* TR_CHECKING */
"Controleert URL...",
/* TR_CHECKING_FOR */
"Controleert voor: %s",
/* TR_CHOOSE_THE_ISDN_CARD_INSTALLED */
"Kies de ISDN-kaart die geïnstalleerd is op deze computer.",
/* TR_CHOOSE_THE_ISDN_PROTOCOL */
"Kies het ISDN-protocol dat u nodig heeft.",
/* TR_CONFIGURE_DHCP */
"Configureer de DHCP server door de instellingen in te voeren.",
/* TR_CONFIGURE_NETWORKING */
"Configureer het netwerk",
/* TR_CONFIGURE_NETWORKING_LONG */
"U moet nu het netwerk configureren door eerst de juiste driver te laden voor de GROENE interface. U kunt dit doen door ofwel automatisch te zoeken naar een netwerkkaart, of door de juiste driver te kiezen uit een lijst. Als u meer dan een kaart in uw machine heeft, dan kunt u die later in het installatieproces configureren. Mocht u meer dan een kaart van hetzelfde type als GROEN gebruiken en iedere kaart vereist speciale moduleparameters, dan moet u de parameters voor alle kaarten van dit type invoeren zodat alle kaarten actief kunnen worden waneer u de GROENE interface configureert.",
/* TR_CONFIGURE_NETWORK_DRIVERS */
"Configureer netwerkdrivers en bepaal welke interface iedere kaart krijgt toegewezen.\nDe huidige configuratie is als volgt:\n\n",
/* TR_CONFIGURE_THE_CDROM */
"Configureer de CDROM door het juiste IO-adres en/of IRQ te kiezen.",
/* TR_CONGRATULATIONS */
"Gefeliciteerd!",
/* TR_CONGRATULATIONS_LONG */
"%s is succesvol geïnstalleerd. Verwijder a.u.b. de CDROM's in uw computer. U kunt nu de netwerkkaarten en ISDN configureren en de systeemwachtwoorden instellen. Nadat de setup is afgerond, kunt u met de webbrowser naar https://%s:444 (of hoe u %s ook genoemd heeft) en het inbelnetwerk configureren (als nodig) en de remote toegang.",
/* TR_CONTINUE_NO_SWAP */
"Uw vaste schijf is erg klein, maar u kunt verder gaan met een zeer kleine swap. (Wees hier voorzichtig mee).",
/* TR_CURRENT_CONFIG */
"Huidige configuratie: %s%s",
/* TR_DEFAULT_GATEWAY */
"Standaard Gateway:",
/* TR_DEFAULT_GATEWAY_CR */
"Standaard Gateway\n",
/* TR_DEFAULT_LEASE */
"Standaard lease (min.):",
/* TR_DEFAULT_LEASE_CR */
"Standaard leasetijd\n",
/* TR_DETECTED */
"Gedetecteerd: %s",
/* TR_DHCP_HOSTNAME */
"DHCP Hostnaam:",
/* TR_DHCP_HOSTNAME_CR */
"DHCP Hostnaam\n",
/* TR_DHCP_SERVER_CONFIGURATION */
"DHCP serverconfiguratie",
/* TR_DISABLED */
"Uitgeschakeld",
/* TR_DISABLE_ISDN */
"ISDN uitschakelen",
/* TR_DISK_TOO_SMALL */
"Uw vaste schijf is te klein.",
/* TR_DNS_AND_GATEWAY_SETTINGS */
"DNS en Gateway instellingen",
/* TR_DNS_AND_GATEWAY_SETTINGS_LONG */
"Voer de DNS en gateway informatie in. Deze instellingen worden alleen gebruikt met statische IP-adressen (en DHCP als DNS is ingesteld) op de RODE interface.",
/* TR_DNS_GATEWAY_WITH_GREEN */
"Uw configuratie gebruikt geen ethernetadapter voor z'n RODE interface. DNS en gateway voor inbelgebruikers worden automatisch geconfigureerd tijdens inbellen.",
/* TR_DOMAINNAME */
"Domeinnaam",
/* TR_DOMAINNAME_CANNOT_BE_EMPTY */
"Domeinnaam mag niet leeg zijn.",
/* TR_DOMAINNAME_CANNOT_CONTAIN_SPACES */
"Domeinnaam mag geen spaties bevatten.",
/* TR_DOMAINNAME_NOT_VALID_CHARS */
"Domeinnaam mag alleen letters, getallen, koppeltekens en punten bevatten.",
/* TR_DOMAIN_NAME_SUFFIX */
"Domeinnaam toevoeging:",
/* TR_DOMAIN_NAME_SUFFIX_CR */
"Domeinnaam toevoeging\n",
/* TR_DONE */
"Klaar",
/* TR_DO_YOU_WISH_TO_CHANGE_THESE_SETTINGS */
"\nWilt u deze instellingen wijzigen?",
/* TR_DRIVERS_AND_CARD_ASSIGNMENTS */
"Drivers en kaarttoewijzingen",
/* TR_ENABLED */
"Ingeschakeld",
/* TR_ENABLE_ISDN */
"Inschakelen ISDN",
/* TR_END_ADDRESS */
"Eindadres:",
/* TR_END_ADDRESS_CR */
"Eindadres\n",
/* TR_ENTER_ADDITIONAL_MODULE_PARAMS */
"Bepaalde ISDN-kaarten (met name de ISA-kaarten) kunnen extra moduleparameters vereisen voor het instellen van IRQ- en IO-adressen. Als u zo'n ISDN-kaart heeft, voer deze parameters dan hier in. Bijvoorbeeld: \"io=0x280 irq=9\". Deze gegevens worden gebruikt tijdens de kaartdetectie.",
/* TR_ENTER_ADMIN_PASSWORD */
"Voer het %s 'admin' wachtwoord in. Dit is de gebruikersnaam die gebruikt wordt om in te loggen op de %s webbeheerpagina's.",
/* TR_ENTER_DOMAINNAME */
"Voer de domeinnaam in",
/* TR_ENTER_HOSTNAME */
"Voer de machinehostnaam in",
/* TR_ENTER_IP_ADDRESS_INFO */
"Voer de IP-adres informatie in",
/* TR_ENTER_NETWORK_DRIVER */
"Automatisch detecteren van netwerkkaart is mislukt. Voer de drivernaam en optionele parameters in voor de netwerkkaart.",
/* TR_ENTER_ROOT_PASSWORD */
"Voer het 'root' wachtwoord in. Log in als deze gebruiker voor commandoregel toegang.",
/* TR_ENTER_SETUP_PASSWORD */
"WORDT VERWIJDERD",
/* TR_ENTER_THE_IP_ADDRESS_INFORMATION */
"Voer de IP-adres informatie in voor de %s interface.",
/* TR_ENTER_THE_LOCAL_MSN */
"Voer lokaal telefoonnummer in (MSN/EAZ).",
/* TR_ENTER_URL */
"Voer het URL-pad in naar de ipcop-<versie>.tgz en images/scsidrv-<versie>.img bestanden. WAARSCHUWING: DNS is niet beschikbaar! Dit zou http://X.X.X.X/<directory> moeten zijn",
/* TR_ERROR */
"Fout",
/* TR_ERROR_PROBING_CDROM */
"Geen CDROM-speler gevonden.",
/* TR_ERROR_WRITING_CONFIG */
"Fout bij wegschrijven van configuratie informatie.",
/* TR_EURO_EDSS1 */
"Euro (EDSS1)",
/* TR_EXTRACTING_MODULES */
"Uitpakken modules...",
/* TR_FAILED_TO_FIND */
"URL-bestand niet gevonden.",
/* TR_FOUND_NIC */
"%s heeft de volgende NIC in uw machine gedetecteerd: %s",
/* TR_GERMAN_1TR6 */
"German 1TR6",
/* TR_HELPLINE */
" <Tab>/<Alt-Tab> schakel tussen elementen | <Spatie> selecteer",
/* TR_HOSTNAME */
"Hostnaam",
/* TR_HOSTNAME_CANNOT_BE_EMPTY */
"Hostnaam mag niet leeg zijn.",
/* TR_HOSTNAME_CANNOT_CONTAIN_SPACES */
"Hostnaam mag geen spaties bevatten.",
/* TR_HOSTNAME_NOT_VALID_CHARS */
"Hostnaam mag alleen letters, getallen en koppeltekens bevatten.",
/* TR_INITIALISING_ISDN */
"Initialiseert ISDN...",
/* TR_INSERT_CDROM */
"Plaats de %s CD in the CDROM-speler a.u.b.",
/* TR_INSERT_FLOPPY */
"Plaats de %s driver-diskette in het station a.u.b.",
/* TR_INSTALLATION_CANCELED */
"Installatie afgebroken.",
/* TR_INSTALLING_FILES */
"Installeert bestanden...",
/* TR_INSTALLING_GRUB */
"Installeert GRUB...",
/* TR_INSTALLING_LANG_CACHE */
"Installeert taalbestanden...",
/* TR_INTERFACE */
"Interface - %s",
/* TR_INTERFACE_FAILED_TO_COME_UP */
"Interface kwam niet op.",
/* TR_INVALID_FIELDS */
"De volgende velden zijn ongeldig:\n\n",
/* TR_INVALID_IO */
"De ingevoerde IO-poortgegevens zijn ongeldig. ",
/* TR_INVALID_IRQ */
"De ingevoerde IRQ gegevens zijn ongeldig.",
/* TR_IP_ADDRESS_CR */
"IP-adres\n",
/* TR_IP_ADDRESS_PROMPT */
"IP-adres:",
/* TR_ISDN_CARD */
"ISDN-kaart",
/* TR_ISDN_CARD_NOT_DETECTED */
"ISDN-kaart niet gedetecteerd. Mogelijk dient u extra moduleparameters op te geven als het een ISA type betreft of heeft het speciale eisen.",
/* TR_ISDN_CARD_SELECTION */
"ISDN kaartselectie",
/* TR_ISDN_CONFIGURATION */
"ISDN configuratie",
/* TR_ISDN_CONFIGURATION_MENU */
"ISDN configuratiemenu",
/* TR_ISDN_NOT_SETUP */
"ISDN niet ingesteld. Sommige items zijn niet geselecteerd.",
/* TR_ISDN_NOT_YET_CONFIGURED */
"ISDN is nog niet geconfigureerd. Selecteer het item dat u wilt configureren.",
/* TR_ISDN_PROTOCOL_SELECTION */
"ISDN protocolselectie",
/* TR_ISDN_STATUS */
"ISDN is momenteel %s.\n\n Protocol: %s\n Kaart: %s\n Lokaal telefoonnummer: %s\n\nSelecteer het item dat u wilt herconfigureren, of kies voor de huidige instellingen.",
/* TR_KEYBOARD_MAPPING */
"Toetsenbordindeling",
/* TR_KEYBOARD_MAPPING_LONG */
"Kies het type toetsenbord dat u gebruikt uit de lijst hieronder.",
/* TR_LEASED_LINE */
"Vaste verbinding",
/* TR_LOADING_MODULE */
"Laadt module...",
/* TR_LOADING_PCMCIA */
"Laadt PCMCIA modules...",
/* TR_LOOKING_FOR_NIC */
"Zoekt naar: %s",
/* TR_MAKING_BOOT_FILESYSTEM */
"Aanmaken boot bestandssysteem...",
/* TR_MAKING_LOG_FILESYSTEM */
"Aanmaken log bestandssysteem...",
/* TR_MAKING_ROOT_FILESYSTEM */
"Aanmaken root bestandssysteem...",
/* TR_MAKING_SWAPSPACE */
"Aanmaken swap...",
/* TR_MANUAL */
"* HANDMATIG *",
/* TR_MAX_LEASE */
"Max. lease (min.):",
/* TR_MAX_LEASE_CR */
"Max. leasetijd\n",
/* TR_MISSING_BLUE_IP */
"Ontbrekende IP-informatie op de BLAUWE interface.",
/* TR_MISSING_ORANGE_IP */
"Ontbrekende IP-informatie op de ORANJE interface.",
/* TR_MISSING_RED_IP */
"Ontbrekende IP-informatie op de RODE interface.",
/* TR_MODULE_NAME_CANNOT_BE_BLANK */
"Modulenaam mag niet leeg zijn.",
/* TR_MODULE_PARAMETERS */
"Voer de modulenaam en parameters in voor de driver die u nodig hebt.",
/* TR_MOUNTING_BOOT_FILESYSTEM */
"Koppelen van het boot bestandssysteem...",
/* TR_MOUNTING_LOG_FILESYSTEM */
"Koppelen van het log bestandssysteem...",
/* TR_MOUNTING_ROOT_FILESYSTEM */
"Koppelen van het root bestandssysteem...",
/* TR_MOUNTING_SWAP_PARTITION */
"Koppelen van de swap partitie...",
/* TR_MSN_CONFIGURATION */
"Lokaal telefoonnummer (MSN/EAZ)",
/* TR_NETMASK_PROMPT */
"Netwerkmasker:",
/* TR_NETWORKING */
"Netwerk",
/* TR_NETWORK_ADDRESS_CR */
"Netwerkadres\n",
/* TR_NETWORK_ADDRESS_PROMPT */
"Netwerkadres:",
/* TR_NETWORK_CONFIGURATION_MENU */
"Netwerk configuratiemenu",
/* TR_NETWORK_CONFIGURATION_TYPE */
"Netwerk configuratietype",
/* TR_NETWORK_CONFIGURATION_TYPE_LONG */
"Selecteer de netwerkconfiguratie voor %s. De volgende configuratiesoorten vermelden welke interfaces op ethernet aangesloten zijn. Als u deze instellingen wijzigt, dan is een netwerk herstart nodig en u moet de netwerkdriver toewijzingen opnieuw maken.",
/* TR_NETWORK_MASK_CR */
"Netwerkmasker\n",
/* TR_NETWORK_SETUP_FAILED */
"Netwerkinstelling mislukt.",
/* TR_NOT_ENOUGH_CARDS_WERE_ALLOCATED */
"Er zijn onvoldoende kaarten toegewezen.",
/* TR_NO_BLUE_INTERFACE */
"Er is geen BLAUWE interface toegewezen.",
/* TR_NO_CDROM */
"Geen CD-ROM gevonden.",
/* TR_NO_GREEN_INTERFACE */
"Er is geen GROENE interface toegewezen.",
/* TR_NO_HARDDISK */
"Geen vaste schijf gevonden.",
/* TR_NO_IPCOP_TARBALL_FOUND */
"Er is geen ipcop tarball gevonden op de webserver.",
/* TR_NO_ORANGE_INTERFACE */
"Er is geen ORANJE interface toegewezen.",
/* TR_NO_RED_INTERFACE */
"Er is geen RODE interface toegewezen.",
/* TR_NO_SCSI_IMAGE_FOUND */
"Er is geen SCSI image gevonden op de webserver.",
/* TR_NO_UNALLOCATED_CARDS */
"Er zijn geen vrije kaarten over, er zijn er meer vereist. U kunt automatisch detecteren proberen en op zoek gaan naar meer kaarten, of u kiest een driver uit de lijst.",
/* TR_OK */
"Ok",
/* TR_PARTITIONING_DISK */
"Partitioneert schijf...",
/* TR_PASSWORDS_DO_NOT_MATCH */
"Wachtwoorden komen niet overeen.",
/* TR_PASSWORD_CANNOT_BE_BLANK */
"Wachtwoord mag niet leeg zijn.",
/* TR_PASSWORD_CANNOT_CONTAIN_SPACES */
"Wachtwoord mag geen spaties bevatten.",
/* TR_PASSWORD_PROMPT */
"Wachtwoord:",
/* TR_PHONENUMBER_CANNOT_BE_EMPTY */
"Telefoonnummer mag niet leeg zijn.",
/* TR_PREPARE_HARDDISK */
"Het installatieprogramma zal nu de vaste schijf voorbereiden op %s. Eerst wordt de schijf gepartitioneerd, daarna zullen de bestandssystemen erop worden gezet.\n\nALLE DATA OP DE SCHIJF ZAL WORDEN GEWIST. Wilt u hiermee doorgaan?",
/* TR_PRESS_OK_TO_REBOOT */
"Druk Ok om te herstarten.",
/* TR_PRIMARY_DNS */
"Primaire DNS:",
/* TR_PRIMARY_DNS_CR */
"Primaire DNS\n",
/* TR_PROBE */
"Opsporen",
/* TR_PROBE_FAILED */
"Automatisch detecteren mislukt.",
/* TR_PROBING_HARDWARE */
"Opsporen van hardware...",
/* TR_PROBING_FOR_NICS */
"Zoeken naar NIC's...",
/* TR_PROBLEM_SETTING_ADMIN_PASSWORD */
"Er is een probleem met het instellen van %s 'admin' gebruikerswachtwoord.",
/* TR_PROBLEM_SETTING_ROOT_PASSWORD */
"Er is een probleem met het instellen van %s 'root' gebruikerswachtwoord.",
/* TR_PROBLEM_SETTING_SETUP_PASSWORD */
"WORDT VERWIJDERD",
/* TR_PROTOCOL_COUNTRY */
"Protocol/Land",
/* TR_PULLING_NETWORK_UP */
"Netwerk opbrengen...",
/* TR_PUSHING_NETWORK_DOWN */
"Netwerk stoppen...",
/* TR_PUSHING_NON_LOCAL_NETWORK_DOWN */
"Niet-lokaal netwerk stoppen...",
/* TR_QUIT */
"Stoppen",
/* TR_RED_IN_USE */
"ISDN (of een andere externe verbinding) is momenteel in gebruik. U kunt ISDN niet configureren zolang de RODE interface actief is.",
/* TR_RESTART_REQUIRED */
"\n\nAls de configuratie gereed is moet het netwerk herstart worden.",
/* TR_RESTORE */
"Terugzetten",
/* TR_RESTORE_CONFIGURATION */
"Als u een diskette heeft met een %s systeemconfiguratie daarop, plaats dan de diskette in het station en druk op de terugzetten-knop.",
/* TR_ROOT_PASSWORD */
"'root' wachtwoord",
/* TR_SECONDARY_DNS */
"Secundaire DNS:",
/* TR_SECONDARY_DNS_CR */
"Secundaire DNS\n",
/* TR_SECONDARY_WITHOUT_PRIMARY_DNS */
"Secundaire DNS opgegeven zonder een primaire DNS",
/* TR_SECTION_MENU */
"Sectiemenu",
/* TR_SELECT */
"Selecteer",
/* TR_SELECT_CDROM_TYPE */
"Selecteer CDROM type",
/* TR_SELECT_CDROM_TYPE_LONG */
"Er is geen CD-ROM gedetecteerd in deze machine. Maak een keuze uit de volgende drivers waarmee %s de CD-ROM kan benaderen.",
/* TR_SELECT_INSTALLATION_MEDIA */
"Selecteer installatiemedium",
/* TR_SELECT_INSTALLATION_MEDIA_LONG */
"%s kan worden geïnstalleerd vanuit verschillende bronnen. De eenvoudigste manier is om de CDROM-speler van de machine te gebruiken. Als de computer geen CDROM-speler heeft, dan kunt vanaf een andere machine installeren die de installatiebestanden beschikbaar kan maken over het netwerk via HTTP of FTP.",
/* TR_SELECT_NETWORK_DRIVER */
"Selecteer netwerkdriver",
/* TR_SELECT_NETWORK_DRIVER_LONG */
"Selecteer de netwerkdriver voor de aanwezige kaart in deze machine. Als u HANDMATIG selecteert, krijgt u de mogelijkheid om de driver modulenaam en parameters op te geven voor drivers met speciale eisen, zoals voor ISA-kaarten.",
/* TR_SELECT_THE_INTERFACE_YOU_WISH_TO_RECONFIGURE */
"Selecteer de interface die u wilt herconfigureren.",
/* TR_SELECT_THE_ITEM */
"Selecteer het item dat u wilt configureren.",
/* TR_SETTING_ADMIN_PASSWORD */
"Instellen van %s 'admin' gebruikerswachtwoord...",
/* TR_SETTING_ROOT_PASSWORD */
"Instellen van 'root' wachtwoord....",
/* TR_SETTING_SETUP_PASSWORD */
"WORDT VERWIJDERD",
/* TR_SETUP_FINISHED */
"Setup is afgerond. Druk Ok.",
/* TR_SETUP_NOT_COMPLETE */
"Initiële setup was niet volledig afgerond. Verzeker u ervan dat de setup goed is afgerond door het setup programma nogmaals vanaf de commandoregel te starten.",
/* TR_SETUP_PASSWORD */
"WORDT VERWIJDERD",
/* TR_SET_ADDITIONAL_MODULE_PARAMETERS */
"Instellen additionele moduleparameters",
/* TR_SINGLE_GREEN */
"Uw configuratie is ingesteld voor een enkele GROENE interface.",
/* TR_SKIP */
"Overslaan",
/* TR_START_ADDRESS */
"Beginadres:",
/* TR_START_ADDRESS_CR */
"Beginadres\n",
/* TR_STATIC */
"Statisch",
/* TR_SUGGEST_IO */
"(voorstel %x)",
/* TR_SUGGEST_IRQ */
"(voorstel %d)",
/* TR_THIS_DRIVER_MODULE_IS_ALREADY_LOADED */
"Deze drivermodule is al geladen.",
/* TR_TIMEZONE */
"Tijdzone",
/* TR_TIMEZONE_LONG */
"Kies de tijdzone waar u zich bevindt uit de lijst hieronder.",
/* TR_UNABLE_TO_EJECT_CDROM */
"Kan de CDROM niet uitwerpen.",
/* TR_UNABLE_TO_EXTRACT_MODULES */
"Kan de modules niet uitpakken.",
/* TR_UNABLE_TO_FIND_ANY_ADDITIONAL_DRIVERS */
"Kan geen additionele drivers vinden.",
/* TR_UNABLE_TO_FIND_AN_ISDN_CARD */
"Kan geen ISDN-kaart vinden in deze computer. U kunt extra module parameters opgeven als het een ISA-kaart betreft of als het speciale eisen heeft.",
/* TR_UNABLE_TO_INITIALISE_ISDN */
"Kan de ISDN-kaart niet initialiseren.",
/* TR_UNABLE_TO_INSTALL_FILES */
"Kan de bestanden niet installeren.",
/* TR_UNABLE_TO_INSTALL_LANG_CACHE */
"Kan de taalbestanden niet installeren.",
/* TR_UNABLE_TO_INSTALL_GRUB */
"Kan GRUB niet installeren.",
/* TR_UNABLE_TO_LOAD_DRIVER_MODULE */
"Kan de drivermodule niet laden.",
/* TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM */
"Kan het boot bestandssysteem niet aanmaken.",
/* TR_UNABLE_TO_MAKE_LOG_FILESYSTEM */
"Kan het log bestandssysteem niet aanmaken.",
/* TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM */
"Kan het root bestandssysteem niet aanmaken.",
/* TR_UNABLE_TO_MAKE_SWAPSPACE */
"Kan het swap bestandssysteem niet aanmaken.",
/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK */
"Kan de symlink /dev/harddisk niet aanmaken.",
/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK1 */
"Kan de symlink /dev/harddisk1 niet aanmaken.",
/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK2 */
"Kan de symlink /dev/harddisk2 niet aanmaken.",
/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK3 */
"Kan de symlink /dev/harddisk3 niet aanmaken.",
/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK4 */
"Kan de symlink /dev/harddisk4 niet aanmaken.",
/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_ROOT */
"Kan de symlink /dev/root niet aanmaken.",
/* TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM */
"Kan het boot bestandssysteem niet koppelen.",
/* TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM */
"Kan het log bestandssysteem niet koppelen.",
/* TR_UNABLE_TO_MOUNT_PROC_FILESYSTEM */
"Kan het proc bestandssysteem niet koppelen.",
/* TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM */
"Kan het root bestandssysteem niet koppelen.",
/* TR_UNABLE_TO_MOUNT_SWAP_PARTITION */
"Kan de swap partitie niet koppelen.",
/* TR_UNABLE_TO_OPEN_HOSTS_FILE */
"Kan het hosts-bestand niet openen.",
/* TR_UNABLE_TO_OPEN_SETTINGS_FILE */
"Kan het instellingenbestand niet openen",
/* TR_UNABLE_TO_PARTITION */
"Kan de schijf niet partitioneren.",
/* TR_UNABLE_TO_REMOVE_TEMP_FILES */
"Kan de tijdelijke gedownloade bestanden niet verwijderen.",
/* TR_UNABLE_TO_SET_HOSTNAME */
"Kan de hostnaam niet instellen.",
/* TR_UNABLE_TO_UNMOUNT_CDROM */
"Kan het CDROM-/diskettestation niet ontkoppelen.",
/* TR_UNABLE_TO_UNMOUNT_HARDDISK */
"Kan de vaste schijf niet ontkoppelen.",
/* TR_UNABLE_TO_WRITE_ETC_FSTAB */
"Kan /etc/fstab niet wegschrijven",
/* TR_UNABLE_TO_WRITE_ETC_HOSTNAME */
"Kan /etc/hostname niet wegschrijven",
/* TR_UNABLE_TO_WRITE_ETC_HOSTS */
"Kan /etc/hosts niet wegschrijven.",
/* TR_UNABLE_TO_WRITE_ETC_HOSTS_ALLOW */
"Kan /etc/hosts.allow niet wegschrijven.",
/* TR_UNABLE_TO_WRITE_ETC_HOSTS_DENY */
"Kan /etc/hosts.deny niet wegschrijven.",
/* TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_ETHERNET_SETTINGS */
"Kan %s/ethernet/settings niet wegschrijven.",
/* TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_HOSTNAMECONF */
"Kan %s/main/hostname.conf niet wegschrijven.",
/* TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_SETTINGS */
"Kan %s/main/settings niet wegschrijven.",
/* TR_UNCLAIMED_DRIVER */
"Er is een ongebruikte ethernetkaart van het type:\n%s\n\nU kunt deze toewijzen aan:",
/* TR_UNKNOWN */
"ONBEKEND",
/* TR_UNSET */
"NIET INGESTELD",
/* TR_USB_KEY_VFAT_ERR */
"Deze USB-sleutel is ongeldig (geen vfat partitie gevonden).",
/* TR_US_NI1 */
"US NI1",
/* TR_WARNING */
"WAARSCHUWING",
/* TR_WARNING_LONG */
"Als u dit IP-adres wijzigt, en u bent op afstand ingelogd, dan zal de verbinding naar de %s machine worden verbroken en u zult opnieuw moeten verbinden naar het nieuwe IP-adres. Dit is een riskante handeling en moet alleen geprobeerd worden als u fysieke toegang tot de machine hebt, in het geval er iets fout gaat.",
/* TR_WELCOME */
"Welkom bij het %s installatieprogramma. Als u 'annuleren' kiest op een van de volgende schermen selecteert zal de computer herstarten.",
/* TR_YOUR_CONFIGURATION_IS_SINGLE_GREEN_ALREADY_HAS_DRIVER */
"Uw configuratie is ingesteld voor een enkele GROENE interface, welke al een driver toegewezen heeft.",
/* TR_YES */
"Ja",
/* TR_NO */
"Nee",
/* TR_AS */
"als",
/* TR_IGNORE */
"Negeer",
/* TR_PPP_DIALUP */
"PPP DIALUP (PPPoE, modem, ATM ...)",
/* TR_DHCP */
"DHCP",
/* TR_DHCP_STARTSERVER */
"Start DHCP-server ...",
/* TR_DHCP_STOPSERVER */
"Stopt DHCP-server ...",
/* TR_LICENSE_ACCEPT */
"Ik accepteer deze licentie.",
/* TR_LICENSE_NOT_ACCEPTED */
"Licentie niet geaccepteerd. Stopt!",
/* TR_EXT2FS_DESCR */
"Ext2 - Bestandssysteem zonder journal (geschikt voor flashdrives)",
/* TR_EXT3FS_DESCR */
"Ext3 - Bestandssysteem met journal",
/* TR_EXT4FS_DESCR */
"Ext4 - Bestandssysteem met journal",
/* TR_REISERFS_DESCR */
"ReiserFS - Bestandssysteem met journal",
/* TR_NO_LOCAL_SOURCE */
"Geen lokale bronmedia gevonden. Start download.",
/* TR_DOWNLOADING_ISO */
"Downloaden van installatie-image ...",
/* TR_DOWNLOAD_ERROR */
"Fout tijdens downloaden!",
/* TR_DHCP_FORCE_MTU */
"Forceer DHCP mtu:",
};

84
lfs/check_mk_agent Normal file
View File

@@ -0,0 +1,84 @@
###############################################################################
# #
# 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 #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 1.2.0p3
THISAPP = check_mk_agent-$(VER)
DL_FILE = check_mk-${VER}.tar.gz
DL_FROM = http://mathias-kettner.de/download
DIR_APP = $(DIR_SRC)/check_mk-${VER}
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = check_mk_agent
PAK_VER = 2
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 2c0f27fe8b6e3455557ecb30954d8a79
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist :
$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && tar xzf agents.tar.gz
cd $(DIR_APP) && install -v -m 755 check_mk_agent.linux /usr/bin/check_mk_agent
cd $(DIR_APP) && gcc $(CFLAGS) waitmax.c -o waitmax
cd $(DIR_APP) && install -v -m 755 waitmax /usr/bin/waitmax
@rm -rf $(DIR_APP)
@$(POSTBUILD)

84
lfs/cifs-utils Normal file
View File

@@ -0,0 +1,84 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 5.9
THISAPP = cifs-utils-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cifs-utils
PAK_VER = 1
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 7164ad6f7963a31fcbffbe4f14a7cfc6
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

3
lfs/compat-wireless
View File

@@ -85,6 +85,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Codel patches
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_codel-avoid-a-nul-rec_inv_sqrt.patch
# compat-3.1 include a bogus cpufreq_backort
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch
# Build ath5k only if target has pci
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-build_ath5k_only_with_pci.patch

4
lfs/curl
View File

@@ -24,7 +24,7 @@
include Config
VER = 7.24.0
VER = 7.29.0
THISAPP = curl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b93420f80a2baaa61a0f45214eddc2ba
$(DL_FILE)_MD5 = 4f57d3b4a3963038bd5e04dbff385390
install : $(TARGET)

4
lfs/daq
View File

@@ -24,7 +24,7 @@
include Config
VER = 1.1.1
VER = 2.0.0
THISAPP = daq-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = bc204ea09165b4ecbb1bb49c7c1a2ad4
$(DL_FILE)_MD5 = a00855a153647df76d47f1ea454f74ae
install : $(TARGET)

78
lfs/fstrim Normal file
View File

@@ -0,0 +1,78 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 0.2
THISAPP = fstrim-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/fstrim
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 1a217ae44b12ae7538f922f495b8da31
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && install -m 0755 fstrim /usr/bin
# Install cronjob
install -m 0755 $(DIR_SRC)/config/fstrim/trim /etc/fcron.daily
@rm -rf $(DIR_APP)
@$(POSTBUILD)

8
lfs/hostapd
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 1.1
VER = 2.0
THISAPP = hostapd-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
PAK_VER = 23
PAK_VER = 24
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = e3ace8306d066ab2d24b4c9f668e2dd7
$(DL_FILE)_MD5 = ba22e639bc57aa4035d2ea8ffa9bbbee
install : $(TARGET)

6
lfs/igb
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -32,7 +32,7 @@ else
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/
endif
VER = 3.4.8
VER = 4.1.2
THISAPP = igb-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 36bd0eface2761577f52d84d5c5b78ea
$(DL_FILE)_MD5 = 0a5462b76310b83a40c9023edae50d72
install : $(TARGET)

4
lfs/libupnp
View File

@@ -24,7 +24,7 @@
include Config
VER = 1.6.6
VER = 1.6.18
THISAPP = libupnp-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 8918dcf7428cd119d0c8275765ff2833
$(DL_FILE)_MD5 = 11c6484fd2e2927bf3b8d8108407ca56
install : $(TARGET)

7
lfs/linux
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.2.36
VER = 3.2.38
RPI_PATCHES = linux-3.2.27-ada8b44
@@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
PAK_VER = 26
PAK_VER = 28
DEPS = ""
VERSUFIX=ipfire$(KCFG)
@@ -71,9 +71,10 @@ objects =$(DL_FILE) \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
$(DL_FILE)_MD5 = 9b92ea2160a9a383fad7487b5cfd653b
$(DL_FILE)_MD5 = 16ea59fd8701f82d7d7c534a6e4bb923
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 966687ff27e450e04ff50e0da829dc00
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))

4
lfs/linux2
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
PAK_VER = 24
PAK_VER = 25
DEPS = ""
# Normal build or XEN build.

4
lfs/openssh
View File

@@ -24,7 +24,7 @@
include Config
VER = 6.0p1
VER = 6.1p1
THISAPP = openssh-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 3c9347aa67862881c5da3f3b1c08da7b
$(DL_FILE)_MD5 = 3345cbf4efe90ffb06a78670ab2d05d5
install : $(TARGET)

4
lfs/openssl
View File

@@ -24,7 +24,7 @@
include Config
VER = 0.9.8x
VER = 0.9.8y
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ee17e9bc805c8cc7d0afac3b0ef78eda
$(DL_FILE)_MD5 = 47c7fb37f78c970f1d30aa2f9e9e26d8
install : $(TARGET)

6
lfs/r8168
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -32,7 +32,7 @@ else
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
endif
VER = 8.032.00
VER = 8.035.00
THISAPP = r8168-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 942ce02459a181093f77bb4d5cc75d45
$(DL_FILE)_MD5 = 80b8d23e463e5408dced1b1377579dae
install : $(TARGET)

9
lfs/samba
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 3.5.20
VER = 3.6.12
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 44
PAK_VER = 46
DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 5ac0420b2e7336f902204bcef3319b9f
$(DL_FILE)_MD5 = 430fd21a1acd26964d3ccf366df8709a
install : $(TARGET)
@@ -87,7 +87,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--with-winbind \
--disable-swat \
--enable-cups \
--with-cifsmount \
--with-syslog
cd $(DIR_APP)/source3 && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP)/source3 && make install

4
lfs/snort
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.9.3.1
VER = 2.9.4
THISAPP = snort-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b2102605a7ca023ad6a2429821061c29
$(DL_FILE)_MD5 = e79ee6b4fbb32edc5dfed2d7dfcc6813
install : $(TARGET)

6
lfs/strongswan
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 5.0.1
VER = 5.0.2
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 58fdeb49f133139a58f4d8adafc69a16
$(DL_FILE)_MD5 = 77dc16443fd141f46183d3a4f60986ef
install : $(TARGET)

10
lfs/syslinux
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,10 +24,10 @@
include Config
VER = 4.02
VER = 4.06
THISAPP = syslinux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 52912c03f5c275d6c0ac09180ebab81f
$(DL_FILE)_MD5 = 77d33140860621cd850c3a7ab0ebb7d6
install : $(TARGET)
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

8
lfs/transmission
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 2.75
VER = 2.76
THISAPP = transmission-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = transmission
PAK_VER = 4
PAK_VER = 5
DEPS = "libevent2"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 26b92e56e1574bb10443eccbf17443a7
$(DL_FILE)_MD5 = 9abbffe29ce9b5ee68a116d293c51111
install : $(TARGET)

6
lfs/wpa_supplicant
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 1.1
VER = 2.0
THISAPP = wpa_supplicant-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b29b9af02d7e092db8c5c8508de0e45c
$(DL_FILE)_MD5 = 3be2ebfdcced52e00eda0afe2889839d
install : $(TARGET)

14
make.sh
View File

@@ -24,7 +24,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.13beta1" # Version number
VERSION="2.13rc2" # Version number
CORE="65" # Core Level (Filename)
PAKFIRE_CORE="65" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
@@ -590,6 +590,7 @@ buildipfire() {
ipfiremake ghostscript
ipfiremake foomatic
ipfiremake hplip
ipfiremake cifs-utils
ipfiremake samba
ipfiremake sudo
ipfiremake mc
@@ -752,6 +753,8 @@ buildipfire() {
ipfiremake stress
ipfiremake libstatgrab
ipfiremake sarg
ipfiremake fstrim
ipfiremake check_mk_agent
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -761,12 +764,17 @@ buildipfire() {
echo >> $BASEDIR/build/var/ipfire/firebuild
cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
if [ "$(git status -s | wc -l)" == "0" ]; then
GIT_STATUS=""
else
GIT_STATUS="-dirty"
fi
case "$GIT_BRANCH" in
core*|beta?|rc?)
echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH$GIT_STATUS" > $BASEDIR/build/etc/system-release
;;
*)
echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release
echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" > $BASEDIR/build/etc/system-release
;;
esac
}

3
src/initscripts/init.d/cleanfs
View File

@@ -90,6 +90,9 @@ case "${1}" in
cd /var/lock &&
find . -type f ! -newer /proc -exec rm -f {} \; || failed=1
boot_mesg -n " /var/log/updatexlrator" ${NORMAL}
rm -f /var/log/updatexlrator/checkdeaddl.lck
boot_mesg " /var/run" ${NORMAL}
cd /var/run &&
find . ! -type d ! -name utmp ! -newer /proc \

2
src/initscripts/init.d/firewall
View File

@@ -335,7 +335,9 @@ case "$1" in
;;
restart)
$0 stop
$0 stopovpn
$0 start
$0 startovpn
;;
*)
echo "Usage: $0 {start|stop|reload|restart}"

2
src/initscripts/init.d/leds
View File

@@ -53,6 +53,7 @@ disable_led_trigger ()
case "${1}" in
start)
# Alix LED start
setup_heartbeat_trigger alix:1
setup_netdev_trigger alix:2 ${RED_DEV} rx
setup_netdev_trigger alix:3 ${RED_DEV} tx
@@ -78,6 +79,7 @@ case "${1}" in
stop)
# Alix LED stop
disable_led_trigger alix:1
disable_led_trigger alix:2
disable_led_trigger alix:3

4
src/initscripts/init.d/networking/dhcpcd.exe
View File

@@ -64,8 +64,8 @@ dhcpcd_up()
echo -n "$new_ip_address" > /var/ipfire/red/local-ipaddress
#Get default gateway
grep -v " gateway$" /etc/hosts > /tmp/hosts
echo "$new_routers gateway" >> /tmp/hosts
grep -v -E "\<gateway\>" /etc/hosts > /tmp/hosts
echo "$new_routers gateway" >> /tmp/hosts
mv /tmp/hosts /etc/hosts
fi

4
src/initscripts/init.d/networking/red
View File

@@ -120,8 +120,8 @@ case "${1}" in
echo -n "${DEVICE}" > /var/ipfire/red/iface
echo -n "${ADDRESS}" > /var/ipfire/red/local-ipaddress
echo -n "${GATEWAY}" > /var/ipfire/red/remote-ipaddress
grep -v "gateway" /etc/hosts > /tmp/hosts
echo "$GATEWAY gateway" >> /tmp/hosts
grep -v -E "\<gateway\>" /etc/hosts > /tmp/hosts
echo "$GATEWAY gateway" >> /tmp/hosts
mv /tmp/hosts /etc/hosts
echo -n "${DNS1}" > /var/ipfire/red/dns1
echo -n "${DNS2}" > /var/ipfire/red/dns2

13
src/initscripts/init.d/setclock
View File

@@ -24,10 +24,21 @@ case ${1} in
# udev not create the rtc symlink if rtc is in the kernel
if [ ! -e /dev/rtc ]; then
ln -s rtc0 /dev/rtc
if [ -e /dev/rtc0 ]; then
ln -s rtc0 /dev/rtc
fi
fi
hwclock --hctosys ${CLOCKPARAMS} &>/dev/null
if [ ! ${?} == 0 ]; then
if [ -s /var/log/messages ]; then
boot_mesg -n "No RTC found, set time to last log accesstime ... "
DATE=`stat --format "%y" /var/log/messages | cut -d" " -f1`
TIME=`stat --format "%y" /var/log/messages | sed -e "s|\..*||g" | cut -d" " -f2`
date -s $DATE > /dev/null
date -s $TIME
fi
fi
evaluate_retval
;;

9
src/install+setup/install/main.c
View File

@@ -35,6 +35,7 @@ extern char *en_tr[];
extern char *es_tr[];
extern char *de_tr[];
extern char *fr_tr[];
extern char *nl_tr[];
extern char *pl_tr[];
extern char *ru_tr[];
@@ -43,9 +44,9 @@ int main(int argc, char *argv[])
char discl_msg[40000] = "Disclaimer\n";
char *langnames[] = { "Deutsch", "English", "Français", "Español", "Polski", "Русский", NULL };
char *shortlangnames[] = { "de", "en", "fr", "es", "pl", "ru", NULL };
char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, ru_tr, NULL };
char *langnames[] = { "Deutsch", "English", "Français", "Español", "Nederlands", "Polski", "Русский", NULL };
char *shortlangnames[] = { "de", "en", "fr", "es", "nl", "pl", "ru", NULL };
char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, nl_tr, pl_tr, ru_tr, NULL };
char hdletter;
char harddrive[30], sourcedrive[5]; /* Device holder. */
char harddrive_info[STRING_SIZE]; /* Additional infos about target */
@@ -330,7 +331,7 @@ int main(int argc, char *argv[])
/* Calculating the amount of free space */
boot_partition = 20; /* in MB */
boot_partition = 64; /* in MB */
system_partition = disk - ( root_partition + swap_file + boot_partition );
fprintf(flog, ", boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",

1
src/install+setup/libsmooth/main.c
View File

@@ -346,6 +346,7 @@ int replace(char filename1[], char *from, char *to)
#include "lang_fr.c"
#include "lang_pl.c"
#include "lang_ru.c"
#include "lang_nl.c"
#endif
// returns a pointer to the actual running version number of IPFire.

5
src/install+setup/setup/main.c
View File

@@ -26,6 +26,7 @@ extern char *fr_tr[];
extern char *es_tr[];
extern char *pl_tr[];
extern char *ru_tr[];
extern char *nl_tr[];
int main(int argc, char *argv[])
{
@@ -33,8 +34,8 @@ int main(int argc, char *argv[])
char *shortlangnames[] = { "en", NULL };
char **langtrs[] = { en_tr, NULL };
#else
char *shortlangnames[] = { "de", "en", "fr", "es", "pl", "ru", NULL };
char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, ru_tr, NULL };
char *shortlangnames[] = { "de", "en", "fr", "es", "nl", "pl", "ru", NULL };
char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, nl_tr, pl_tr, ru_tr, NULL };
#endif
int choice;
char *sections[11]; /* need to fill this out AFTER knowning lang */

11
src/misc-progs/Makefile
View File

@@ -34,17 +34,15 @@ SUID_PROGS = setdmzholes setportfw setxtaccess \
smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \
setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes \
getconntracktable
SUID_UPDX = updxsetperms
install : all
install -m 755 $(PROGS) /usr/local/bin
install -m 4750 -g nobody $(SUID_PROGS) /usr/local/bin
install -m 4750 -g squid $(SUID_UPDX) /usr/local/bin
all : $(PROGS) $(SUID_PROGS) $(SUID_UPDX)
all : $(PROGS) $(SUID_PROGS)
clean :
-rm -f $(PROGS) $(SUID_PROGS) $(SUID_UPDX) *.o core
-rm -f $(PROGS) $(SUID_PROGS) *.o core
######
@@ -58,8 +56,6 @@ $(SUID_PROGS): setuid.o
$(PROGS): setuid.o
$(SUID_UPDX): setuid.o
logwatch: logwatch.c setuid.o ../install+setup/libsmooth/varval.o
$(COMPILE) -I../install+setup/libsmooth/ logwatch.c setuid.o ../install+setup/libsmooth/varval.o -o $@
@@ -153,9 +149,6 @@ wlanapctrl: wlanapctrl.c setuid.o ../install+setup/libsmooth/varval.o
setaliases: setaliases.c setuid.o ../install+setup/libsmooth/varval.o
$(COMPILE) -I../install+setup/libsmooth/ setaliases.c setuid.o ../install+setup/libsmooth/varval.o -o $@
updxsetperms: updxsetperms.c setuid.o ../install+setup/libsmooth/varval.o
$(COMPILE) -I../install+setup/libsmooth/ updxsetperms.c setuid.o ../install+setup/libsmooth/varval.o -o $@
fireinfoctrl: fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o
$(COMPILE) -I../install+setup/libsmooth/ fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@

26
src/paks/check_mk_agent/install.sh Normal file
View File

@@ -0,0 +1,26 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
extract_files
restore_backup ${NAME}

26
src/paks/check_mk_agent/uninstall.sh Normal file
View File

@@ -0,0 +1,26 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
make_backup ${NAME}
remove_files

26
src/paks/check_mk_agent/update.sh Normal file
View File

@@ -0,0 +1,26 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
./uninstall.sh
./install.sh

48
src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch Normal file
View File

@@ -0,0 +1,48 @@
diff -Naur compat-wireless-3.6.8-1-snp.org/compat/compat-3.1.c compat-wireless-3.6.8-1-snp/compat/compat-3.1.c
--- compat-wireless-3.6.8-1-snp.org/compat/compat-3.1.c 2012-11-29 06:03:45.000000000 +0100
+++ compat-wireless-3.6.8-1-snp/compat/compat-3.1.c 2013-01-18 16:50:08.799491784 +0100
@@ -9,30 +9,6 @@
*/
#include <linux/idr.h>
-#include <linux/cpufreq.h>
-
-/* This backports:
- * commit 3d73710880afa3d61cf57b5d4eb192e812eb7e4f
- * Author: Jesse Barnes <jbarnes@virtuousgeek.org>
- * Date: Tue Jun 28 10:59:12 2011 -0700
- *
- * cpufreq: expose a cpufreq_quick_get_max routine
- */
-
-unsigned int compat_cpufreq_quick_get_max(unsigned int cpu)
-{
- struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
- unsigned int ret_freq = 0;
-
- if (policy) {
- ret_freq = policy->max;
- cpufreq_cpu_put(policy);
- }
-
- return ret_freq;
-}
-EXPORT_SYMBOL(compat_cpufreq_quick_get_max);
-
static DEFINE_SPINLOCK(compat_simple_ida_lock);
diff -Naur compat-wireless-3.6.8-1-snp.org/include/linux/compat-3.1.h compat-wireless-3.6.8-1-snp/include/linux/compat-3.1.h
--- compat-wireless-3.6.8-1-snp.org/include/linux/compat-3.1.h 2012-10-24 15:22:50.000000000 +0200
+++ compat-wireless-3.6.8-1-snp/include/linux/compat-3.1.h 2013-01-18 16:52:04.106154741 +0100
@@ -111,10 +111,6 @@
void ida_simple_remove(struct ida *ida, unsigned int id);
-/* mask cpufreq_quick_get_max as RHEL6 backports this */
-#define cpufreq_quick_get_max(a) compat_cpufreq_quick_get_max(a)
-
-unsigned int cpufreq_quick_get_max(unsigned int cpu);
#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) */
#endif /* LINUX_3_1_COMPAT_H */

4
src/scripts/makegraphs
View File

@@ -3,7 +3,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2008-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2008-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -102,7 +102,7 @@ sub updatehdddata{
## Update vnstat
system ('/usr/bin/vnstat -u');
my @disks = `ls -1 /sys/block | grep -E '^sd|^xvd|^vd|^md' | sort | uniq`;
my @disks = `ls -1 /sys/block | grep -E '^sd|^mmcblk|^xvd|^vd|^md' | sort | uniq`;
system("unlink /var/run/hddstatus 2>/dev/null && touch /var/run/hddstatus");
foreach (@disks){
my $disk = $_;

2
tools/make-functions
View File

@@ -555,12 +555,14 @@ update_langs() {
$BASEDIR/tools/sort_strings.pl es
$BASEDIR/tools/sort_strings.pl pl
$BASEDIR/tools/sort_strings.pl ru
$BASEDIR/tools/sort_strings.pl nl
$BASEDIR/tools/check_strings.pl en > $BASEDIR/doc/language_issues.en
$BASEDIR/tools/check_strings.pl de > $BASEDIR/doc/language_issues.de
$BASEDIR/tools/check_strings.pl fr > $BASEDIR/doc/language_issues.fr
$BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.es
$BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.pl
$BASEDIR/tools/check_strings.pl ru > $BASEDIR/doc/language_issues.ru
$BASEDIR/tools/check_strings.pl nl > $BASEDIR/doc/language_issues.nl
$BASEDIR/tools/check_langs.sh > $BASEDIR/doc/language_missings
beautify message DONE
}