mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-12 04:05:53 +02:00
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into logwatch
This commit is contained in:
Matthias Fischer
@@ -160,12 +160,10 @@ sub createinclude(){
|
||||
close(DATEI);
|
||||
|
||||
foreach (@Zeilen){
|
||||
if ( $_ =~ /\*/){
|
||||
my @files = `ls $_`;
|
||||
chomp($_);
|
||||
my @files = `find $_ -maxdepth 0 2>/dev/null`;
|
||||
foreach (@files){
|
||||
push(@include,$_);
|
||||
}
|
||||
}
|
||||
else {push(@include,$_);}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
1
config/backup/includes/haproxy
Normal file
1
config/backup/includes/haproxy
Normal file
@@ -0,0 +1 @@
|
||||
/etc/haproxy/haproxy.cfg
|
||||
@@ -1,7 +0,0 @@
|
||||
/opt/teamspeak/bad_names.txt
|
||||
/opt/teamspeak/server.dbs
|
||||
/opt/teamspeak/server.ini
|
||||
/opt/teamspeak/server.log
|
||||
/opt/teamspeak/whitelist.txt
|
||||
|
||||
|
||||
86
config/haproxy/haproxy.cfg
Normal file
86
config/haproxy/haproxy.cfg
Normal file
@@ -0,0 +1,86 @@
|
||||
#---------------------------------------------------------------------
|
||||
# Example configuration for a possible web application. See the
|
||||
# full configuration options online.
|
||||
#
|
||||
# http://haproxy.1wt.eu/download/1.4/doc/configuration.txt
|
||||
#
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
# Global settings
|
||||
#---------------------------------------------------------------------
|
||||
global
|
||||
# to have these messages end up in /var/log/haproxy.log you will
|
||||
# need to:
|
||||
#
|
||||
# 1) configure syslog to accept network log events. This is done
|
||||
# by adding the '-r' option to the SYSLOGD_OPTIONS in
|
||||
# /etc/sysconfig/syslog
|
||||
#
|
||||
# 2) configure local2 events to go to the /var/log/haproxy.log
|
||||
# file. A line like the following can be added to
|
||||
# /etc/sysconfig/syslog
|
||||
#
|
||||
# local2.* /var/log/haproxy.log
|
||||
#
|
||||
log 127.0.0.1 local2
|
||||
|
||||
chroot /var/lib/haproxy
|
||||
pidfile /var/run/haproxy.pid
|
||||
maxconn 4000
|
||||
user haproxy
|
||||
group haproxy
|
||||
daemon
|
||||
|
||||
# turn on stats unix socket
|
||||
stats socket /var/lib/haproxy/stats
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
# common defaults that all the 'listen' and 'backend' sections will
|
||||
# use if not designated in their block
|
||||
#---------------------------------------------------------------------
|
||||
defaults
|
||||
mode http
|
||||
log global
|
||||
option httplog
|
||||
option dontlognull
|
||||
option http-server-close
|
||||
option forwardfor except 127.0.0.0/8
|
||||
option redispatch
|
||||
retries 3
|
||||
timeout http-request 10s
|
||||
timeout queue 1m
|
||||
timeout connect 10s
|
||||
timeout client 1m
|
||||
timeout server 1m
|
||||
timeout http-keep-alive 10s
|
||||
timeout check 10s
|
||||
maxconn 3000
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
# main frontend which proxys to the backends
|
||||
#---------------------------------------------------------------------
|
||||
frontend main *:5000
|
||||
acl url_static path_beg -i /static /images /javascript /stylesheets
|
||||
acl url_static path_end -i .jpg .gif .png .css .js
|
||||
|
||||
use_backend static if url_static
|
||||
default_backend app
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
# static backend for serving up images, stylesheets and such
|
||||
#---------------------------------------------------------------------
|
||||
backend static
|
||||
balance roundrobin
|
||||
server static 127.0.0.1:4331 check
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
# round robin balancing between the various backends
|
||||
#---------------------------------------------------------------------
|
||||
backend app
|
||||
balance roundrobin
|
||||
server app1 127.0.0.1:5001 check
|
||||
server app2 127.0.0.1:5002 check
|
||||
server app3 127.0.0.1:5003 check
|
||||
server app4 127.0.0.1:5004 check
|
||||
|
||||
@@ -121,7 +121,6 @@ etc/rc.d/init.d/swap
|
||||
etc/rc.d/init.d/swconfig
|
||||
etc/rc.d/init.d/sysctl
|
||||
etc/rc.d/init.d/sysklogd
|
||||
etc/rc.d/init.d/teamspeak
|
||||
etc/rc.d/init.d/template
|
||||
#etc/rc.d/init.d/tftpd
|
||||
etc/rc.d/init.d/tmpfs
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#etc/init.d
|
||||
#etc/init.d/fuse
|
||||
#etc/rc.d/init.d/fuse
|
||||
etc/udev/rules.d/99-fuse.rules
|
||||
sbin/mount.fuse
|
||||
usr/bin/fusermount
|
||||
@@ -19,10 +20,13 @@ usr/bin/ulockmgr_server
|
||||
#usr/lib/libfuse.la
|
||||
usr/lib/libfuse.so
|
||||
usr/lib/libfuse.so.2
|
||||
usr/lib/libfuse.so.2.8.3
|
||||
usr/lib/libfuse.so.2.9.3
|
||||
#usr/lib/libulockmgr.a
|
||||
#usr/lib/libulockmgr.la
|
||||
usr/lib/libulockmgr.so
|
||||
usr/lib/libulockmgr.so.1
|
||||
usr/lib/libulockmgr.so.1.0.1
|
||||
#usr/lib/pkgconfig/fuse.pc
|
||||
#usr/share/man/man1/fusermount.1
|
||||
#usr/share/man/man1/ulockmgr_server.1
|
||||
#usr/share/man/man8/mount.fuse.8
|
||||
|
||||
@@ -122,7 +122,6 @@ etc/rc.d/init.d/static-routes
|
||||
etc/rc.d/init.d/swap
|
||||
etc/rc.d/init.d/sysctl
|
||||
etc/rc.d/init.d/sysklogd
|
||||
etc/rc.d/init.d/teamspeak
|
||||
etc/rc.d/init.d/template
|
||||
#etc/rc.d/init.d/tftpd
|
||||
etc/rc.d/init.d/tmpfs
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
#usr/share/locale/id/LC_MESSAGES/installer.mo
|
||||
#usr/share/locale/it/LC_MESSAGES/installer.mo
|
||||
#usr/share/locale/ja/LC_MESSAGES/installer.mo
|
||||
#usr/share/locale/ja_JP/LC_MESSAGES/installer.mo
|
||||
#usr/share/locale/jv/LC_MESSAGES/installer.mo
|
||||
#usr/share/locale/km_KH/LC_MESSAGES/installer.mo
|
||||
#usr/share/locale/nl/LC_MESSAGES/installer.mo
|
||||
@@ -30,7 +29,6 @@
|
||||
#usr/share/locale/pt_PT/LC_MESSAGES/installer.mo
|
||||
#usr/share/locale/ro_RO/LC_MESSAGES/installer.mo
|
||||
#usr/share/locale/ru/LC_MESSAGES/installer.mo
|
||||
#usr/share/locale/ru_RU/LC_MESSAGES/installer.mo
|
||||
#usr/share/locale/rw/LC_MESSAGES/installer.mo
|
||||
#usr/share/locale/sk/LC_MESSAGES/installer.mo
|
||||
#usr/share/locale/sq/LC_MESSAGES/installer.mo
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
#etc/logrotate.d
|
||||
etc/logrotate.d/.empty
|
||||
#usr/man/man8/logrotate.8
|
||||
usr/sbin/logrotate
|
||||
var/lib/logrotate.status
|
||||
|
||||
@@ -1,13 +1,20 @@
|
||||
bin/lowntfs-3g
|
||||
bin/ntfs-3g
|
||||
lib/libntfs-3g.so
|
||||
lib/libntfs-3g.so.80
|
||||
lib/libntfs-3g.so.80.0.0
|
||||
#lib/libntfs-3g.so
|
||||
lib/libntfs-3g.so.85
|
||||
lib/libntfs-3g.so.85.0.0
|
||||
sbin/mkfs.ntfs
|
||||
sbin/mount.lowntfs-3g
|
||||
sbin/mount.ntfs-3g
|
||||
usr/bin/ntfs-3g.probe
|
||||
usr/bin/ntfs-3g.secaudit
|
||||
usr/bin/ntfs-3g.usermap
|
||||
usr/bin/ntfscat
|
||||
usr/bin/ntfscluster
|
||||
usr/bin/ntfscmp
|
||||
usr/bin/ntfsfix
|
||||
usr/bin/ntfsinfo
|
||||
usr/bin/ntfsls
|
||||
#usr/include/ntfs-3g
|
||||
#usr/include/ntfs-3g/acls.h
|
||||
#usr/include/ntfs-3g/attrib.h
|
||||
@@ -36,6 +43,7 @@ usr/bin/ntfs-3g.usermap
|
||||
#usr/include/ntfs-3g/ntfstime.h
|
||||
#usr/include/ntfs-3g/object_id.h
|
||||
#usr/include/ntfs-3g/param.h
|
||||
#usr/include/ntfs-3g/realpath.h
|
||||
#usr/include/ntfs-3g/reparse.h
|
||||
#usr/include/ntfs-3g/runlist.h
|
||||
#usr/include/ntfs-3g/security.h
|
||||
@@ -46,13 +54,33 @@ usr/bin/ntfs-3g.usermap
|
||||
#usr/include/ntfs-3g/xattrs.h
|
||||
#usr/lib/libntfs-3g.a
|
||||
#usr/lib/libntfs-3g.la
|
||||
usr/lib/libntfs-3g.so
|
||||
#usr/lib/libntfs-3g.so
|
||||
usr/lib/pkgconfig/libntfs-3g.pc
|
||||
usr/sbin/mkntfs
|
||||
usr/sbin/ntfsclone
|
||||
usr/sbin/ntfscp
|
||||
usr/sbin/ntfslabel
|
||||
usr/sbin/ntfsresize
|
||||
usr/sbin/ntfsundelete
|
||||
#usr/share/doc/ntfs-3g
|
||||
#usr/share/doc/ntfs-3g/README
|
||||
#usr/share/man/man8/mkfs.ntfs.8
|
||||
#usr/share/man/man8/mkntfs.8
|
||||
#usr/share/man/man8/mount.lowntfs-3g.8
|
||||
#usr/share/man/man8/mount.ntfs-3g.8
|
||||
#usr/share/man/man8/ntfs-3g.8
|
||||
#usr/share/man/man8/ntfs-3g.probe.8
|
||||
#usr/share/man/man8/ntfs-3g.secaudit.8
|
||||
#usr/share/man/man8/ntfs-3g.usermap.8
|
||||
#usr/share/man/man8/ntfscat.8
|
||||
#usr/share/man/man8/ntfsclone.8
|
||||
#usr/share/man/man8/ntfscluster.8
|
||||
#usr/share/man/man8/ntfscmp.8
|
||||
#usr/share/man/man8/ntfscp.8
|
||||
#usr/share/man/man8/ntfsfix.8
|
||||
#usr/share/man/man8/ntfsinfo.8
|
||||
#usr/share/man/man8/ntfslabel.8
|
||||
#usr/share/man/man8/ntfsls.8
|
||||
#usr/share/man/man8/ntfsprogs.8
|
||||
#usr/share/man/man8/ntfsresize.8
|
||||
#usr/share/man/man8/ntfsundelete.8
|
||||
|
||||
@@ -18,9 +18,6 @@ usr/share/locale/hu/LC_MESSAGES/setup.mo
|
||||
usr/share/locale/id/LC_MESSAGES/setup.mo
|
||||
usr/share/locale/it/LC_MESSAGES/setup.mo
|
||||
usr/share/locale/ja/LC_MESSAGES/setup.mo
|
||||
#usr/share/locale/ja_JP
|
||||
#usr/share/locale/ja_JP/LC_MESSAGES
|
||||
usr/share/locale/ja_JP/LC_MESSAGES/setup.mo
|
||||
#usr/share/locale/jv
|
||||
#usr/share/locale/jv/LC_MESSAGES
|
||||
usr/share/locale/jv/LC_MESSAGES/setup.mo
|
||||
@@ -37,9 +34,6 @@ usr/share/locale/pt_PT/LC_MESSAGES/setup.mo
|
||||
#usr/share/locale/ro_RO/LC_MESSAGES
|
||||
usr/share/locale/ro_RO/LC_MESSAGES/setup.mo
|
||||
usr/share/locale/ru/LC_MESSAGES/setup.mo
|
||||
#usr/share/locale/ru_RU
|
||||
#usr/share/locale/ru_RU/LC_MESSAGES
|
||||
usr/share/locale/ru_RU/LC_MESSAGES/setup.mo
|
||||
usr/share/locale/rw/LC_MESSAGES/setup.mo
|
||||
usr/share/locale/sk/LC_MESSAGES/setup.mo
|
||||
usr/share/locale/sq/LC_MESSAGES/setup.mo
|
||||
|
||||
@@ -2,4 +2,5 @@ etc/system-release
|
||||
etc/issue
|
||||
srv/web/ipfire/cgi-bin/fwhosts.cgi
|
||||
srv/web/ipfire/cgi-bin/ovpnmain.cgi
|
||||
var/ipfire/backup/bin/backup.pl
|
||||
var/ipfire/langs
|
||||
|
||||
@@ -48,6 +48,9 @@ rm -f \
|
||||
/opt/pakfire/db/installed/meta-sqlite \
|
||||
/opt/pakfire/db/rootfiles/sqlite
|
||||
|
||||
# Fix #10625
|
||||
mkdir -p /etc/logrotate.d
|
||||
|
||||
sync
|
||||
|
||||
# This update need a reboot...
|
||||
|
||||
@@ -11,15 +11,15 @@ usr/bin/sigtool
|
||||
#usr/lib/libclamav.la
|
||||
usr/lib/libclamav.so
|
||||
usr/lib/libclamav.so.6
|
||||
usr/lib/libclamav.so.6.1.22
|
||||
usr/lib/libclamav.so.6.1.25
|
||||
#usr/lib/libclamunrar.la
|
||||
usr/lib/libclamunrar.so
|
||||
usr/lib/libclamunrar.so.6
|
||||
usr/lib/libclamunrar.so.6.1.22
|
||||
usr/lib/libclamunrar.so.6.1.25
|
||||
#usr/lib/libclamunrar_iface.la
|
||||
usr/lib/libclamunrar_iface.so
|
||||
usr/lib/libclamunrar_iface.so.6
|
||||
usr/lib/libclamunrar_iface.so.6.1.22
|
||||
usr/lib/libclamunrar_iface.so.6.1.25
|
||||
#usr/lib/pkgconfig/libclamav.pc
|
||||
usr/sbin/clamd
|
||||
usr/share/clamav
|
||||
@@ -41,6 +41,5 @@ var/ipfire/clamav/clamd.conf
|
||||
var/ipfire/clamav/clamd.conf.sample
|
||||
var/ipfire/clamav/freshclam.conf
|
||||
var/ipfire/clamav/freshclam.conf.sample
|
||||
#var/run/clamav
|
||||
etc/rc.d/init.d/clamav
|
||||
usr/local/bin/clamavctrl
|
||||
|
||||
8
config/rootfiles/packages/haproxy
Normal file
8
config/rootfiles/packages/haproxy
Normal file
@@ -0,0 +1,8 @@
|
||||
#etc/haproxy
|
||||
etc/haproxy/haproxy.cfg
|
||||
etc/rc.d/init.d/haproxy
|
||||
usr/sbin/haproxy
|
||||
#usr/sbin/haproxy-systemd-wrapper
|
||||
#usr/share/man/man1/haproxy.1
|
||||
var/ipfire/backup/addons/includes/haproxy
|
||||
var/lib/haproxy
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,3 +0,0 @@
|
||||
etc/rc.d/init.d/teamspeak
|
||||
opt/teamspeak
|
||||
var/ipfire/backup/addons/includes/teamspeak
|
||||
@@ -66,6 +66,7 @@ my %ipsecsettings=();
|
||||
my %aliases=();
|
||||
my %optionsfw=();
|
||||
my %ifaces=();
|
||||
my %rulehash=();
|
||||
|
||||
my @PROTOCOLS = ("TCP", "UDP", "ICMP", "IGMP", "AH", "ESP", "GRE","IPv6","IPIP");
|
||||
|
||||
@@ -194,6 +195,7 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
|
||||
&General::readhasharray("$configfwdfw", \%configfwdfw);
|
||||
&General::readhasharray("$configinput", \%configinputfw);
|
||||
&General::readhasharray("$configoutgoing", \%configoutgoingfw);
|
||||
my $maxkey;
|
||||
#Set Variables according to the JQuery code in protocol section
|
||||
if ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP')
|
||||
{
|
||||
@@ -230,157 +232,80 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
|
||||
if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire'){
|
||||
$errormessage=$Lang::tr{'fwdfw err same'};
|
||||
}
|
||||
#INPUT part
|
||||
if($fwdfwsettings{'grp2'} eq 'ipfire' && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ORANGE'){
|
||||
# INPUT part
|
||||
if ($fwdfwsettings{'grp2'} eq 'ipfire' && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ORANGE'){
|
||||
$fwdfwsettings{'config'}=$configinput;
|
||||
$fwdfwsettings{'chain'} = 'INPUTFW';
|
||||
my $maxkey=&General::findhasharraykey(\%configinputfw);
|
||||
#check if we have an identical rule already
|
||||
if($fwdfwsettings{'oldrulenumber'} eq $fwdfwsettings{'rulepos'}){
|
||||
foreach my $key (sort keys %configinputfw){
|
||||
if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}"
|
||||
eq "$configinputfw{$key}[0],$configinputfw{$key}[2],$configinputfw{$key}[3],$configinputfw{$key}[4],$configinputfw{$key}[5],$configinputfw{$key}[6],$configinputfw{$key}[7],$configinputfw{$key}[8],$configinputfw{$key}[9],$configinputfw{$key}[10],$configinputfw{$key}[11],$configinputfw{$key}[12],$configinputfw{$key}[13],$configinputfw{$key}[14],$configinputfw{$key}[15],$configinputfw{$key}[17],$configinputfw{$key}[18],$configinputfw{$key}[19],$configinputfw{$key}[20],$configinputfw{$key}[21],$configinputfw{$key}[22],$configinputfw{$key}[23],$configinputfw{$key}[24],$configinputfw{$key}[25],$configinputfw{$key}[26],$configinputfw{$key}[27],$configinputfw{$key}[28],$configinputfw{$key}[29],$configinputfw{$key}[30],$configinputfw{$key}[31],$configinputfw{$key}[32],$configinputfw{$key}[33],$configinputfw{$key}[34],$configinputfw{$key}[35],$configinputfw{$key}[36]"){
|
||||
$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
|
||||
if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){
|
||||
$errormessage=$Lang::tr{'fwdfw err remark'}."<br>";
|
||||
}
|
||||
if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){
|
||||
$errormessage='';
|
||||
}
|
||||
if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){
|
||||
$fwdfwsettings{'nosave'} = 'on';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#check Rulepos on new Rule
|
||||
if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){
|
||||
$fwdfwsettings{'oldrulenumber'}=$maxkey;
|
||||
foreach my $key (sort keys %configinputfw){
|
||||
if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}"
|
||||
eq "$configinputfw{$key}[0],$configinputfw{$key}[2],$configinputfw{$key}[3],$configinputfw{$key}[4],$configinputfw{$key}[5],$configinputfw{$key}[6],$configinputfw{$key}[7],$configinputfw{$key}[8],$configinputfw{$key}[9],$configinputfw{$key}[10],$configinputfw{$key}[11],$configinputfw{$key}[12],$configinputfw{$key}[13],$configinputfw{$key}[14],$configinputfw{$key}[15],$configinputfw{$key}[17],$configinputfw{$key}[18],$configinputfw{$key}[19],$configinputfw{$key}[20],$configinputfw{$key}[21],$configinputfw{$key}[22],$configinputfw{$key}[23],$configinputfw{$key}[24],$configinputfw{$key}[25],$configinputfw{$key}[26],$configinputfw{$key}[27],$configinputfw{$key}[28],$configinputfw{$key}[29],$configinputfw{$key}[30],$configinputfw{$key}[31],$configinputfw{$key}[32],$configinputfw{$key}[33],$configinputfw{$key}[34],$configinputfw{$key}[35],$configinputfw{$key}[36]"){
|
||||
$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
|
||||
}
|
||||
}
|
||||
}
|
||||
#check if we just close a rule
|
||||
if( $fwdfwsettings{'oldgrp1a'} eq $fwdfwsettings{'grp1'} && $fwdfwsettings{'oldgrp1b'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'oldgrp2a'} eq $fwdfwsettings{'grp2'} && $fwdfwsettings{'oldgrp2b'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'oldgrp3a'} eq $fwdfwsettings{'grp3'} && $fwdfwsettings{'oldgrp3b'} eq $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'oldruletype'} eq $fwdfwsettings{'chain'} ) {
|
||||
if($fwdfwsettings{'nosave'} eq 'on' && $fwdfwsettings{'updatefwrule'} eq 'on'){
|
||||
$errormessage='';
|
||||
$fwdfwsettings{'nosave2'} = 'on';
|
||||
}
|
||||
}
|
||||
if (!$errormessage){
|
||||
if($fwdfwsettings{'nosave2'} ne 'on'){
|
||||
&saverule(\%configinputfw,$configinput);
|
||||
}
|
||||
}
|
||||
}elsif($fwdfwsettings{'grp1'} eq 'ipfire_src' ){
|
||||
$maxkey=&General::findhasharraykey(\%configinputfw);
|
||||
%rulehash=%configinputfw;
|
||||
}elsif ($fwdfwsettings{'grp1'} eq 'ipfire_src' ){
|
||||
# OUTGOING PART
|
||||
$fwdfwsettings{'config'}=$configoutgoing;
|
||||
$fwdfwsettings{'chain'} = 'OUTGOINGFW';
|
||||
my $maxkey=&General::findhasharraykey(\%configoutgoingfw);
|
||||
if($fwdfwsettings{'oldrulenumber'} eq $fwdfwsettings{'rulepos'}){
|
||||
foreach my $key (sort keys %configoutgoingfw){
|
||||
if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}"
|
||||
eq "$configoutgoingfw{$key}[0],$configoutgoingfw{$key}[2],$configoutgoingfw{$key}[3],$configoutgoingfw{$key}[4],$configoutgoingfw{$key}[5],$configoutgoingfw{$key}[6],$configoutgoingfw{$key}[7],$configoutgoingfw{$key}[8],$configoutgoingfw{$key}[9],$configoutgoingfw{$key}[10],$configoutgoingfw{$key}[11],$configoutgoingfw{$key}[12],$configoutgoingfw{$key}[13],$configoutgoingfw{$key}[14],$configoutgoingfw{$key}[15],$configoutgoingfw{$key}[17],$configoutgoingfw{$key}[18],$configoutgoingfw{$key}[19],$configoutgoingfw{$key}[20],$configoutgoingfw{$key}[21],$configoutgoingfw{$key}[22],$configoutgoingfw{$key}[23],$configoutgoingfw{$key}[24],$configoutgoingfw{$key}[25],$configoutgoingfw{$key}[26],$configoutgoingfw{$key}[27],$configoutgoingfw{$key}[28],$configoutgoingfw{$key}[29],$configoutgoingfw{$key}[30],$configoutgoingfw{$key}[31],$configoutgoingfw{$key}[32],$configoutgoingfw{$key}[33],$configoutgoingfw{$key}[34],$configoutgoingfw{$key}[35],$configoutgoingfw{$key}[36]"){
|
||||
$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
|
||||
if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){
|
||||
$errormessage=$Lang::tr{'fwdfw err remark'}."<br>";
|
||||
}
|
||||
if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){
|
||||
$errormessage='';
|
||||
}
|
||||
if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){
|
||||
$fwdfwsettings{'nosave'} = 'on';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#check Rulepos on new Rule
|
||||
if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){
|
||||
$fwdfwsettings{'oldrulenumber'}=$maxkey;
|
||||
foreach my $key (sort keys %configoutgoingfw){
|
||||
if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}"
|
||||
eq "$configoutgoingfw{$key}[0],$configoutgoingfw{$key}[2],$configoutgoingfw{$key}[3],$configoutgoingfw{$key}[4],$configoutgoingfw{$key}[5],$configoutgoingfw{$key}[6],$configoutgoingfw{$key}[7],$configoutgoingfw{$key}[8],$configoutgoingfw{$key}[9],$configoutgoingfw{$key}[10],$configoutgoingfw{$key}[11],$configoutgoingfw{$key}[12],$configoutgoingfw{$key}[13],$configoutgoingfw{$key}[14],$configoutgoingfw{$key}[15],$configoutgoingfw{$key}[17],$configoutgoingfw{$key}[18],$configoutgoingfw{$key}[19],$configoutgoingfw{$key}[20],$configoutgoingfw{$key}[21],$configoutgoingfw{$key}[22],$configoutgoingfw{$key}[23],$configoutgoingfw{$key}[24],$configoutgoingfw{$key}[25],$configoutgoingfw{$key}[26],$configoutgoingfw{$key}[27],$configoutgoingfw{$key}[28],$configoutgoingfw{$key}[29],$configoutgoingfw{$key}[30],$configoutgoingfw{$key}[31],$configoutgoingfw{$key}[32],$configoutgoingfw{$key}[33],$configoutgoingfw{$key}[34],$configoutgoingfw{$key}[35],$configoutgoingfw{$key}[36]"){
|
||||
$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
|
||||
}
|
||||
}
|
||||
}
|
||||
#check if we just close a rule
|
||||
if( $fwdfwsettings{'oldgrp1a'} eq $fwdfwsettings{'grp1'} && $fwdfwsettings{'oldgrp1b'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'oldgrp2a'} eq $fwdfwsettings{'grp2'} && $fwdfwsettings{'oldgrp2b'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'oldgrp3a'} eq $fwdfwsettings{'grp3'} && $fwdfwsettings{'oldgrp3b'} eq $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'oldruletype'} eq $fwdfwsettings{'chain'} ) {
|
||||
if($fwdfwsettings{'nosave'} eq 'on' && $fwdfwsettings{'updatefwrule'} eq 'on'){
|
||||
$fwdfwsettings{'nosave2'} = 'on';
|
||||
$errormessage='';
|
||||
}
|
||||
}
|
||||
#increase counters
|
||||
if (!$errormessage){
|
||||
if ($fwdfwsettings{'nosave2'} ne 'on'){
|
||||
&saverule(\%configoutgoingfw,$configoutgoing);
|
||||
}
|
||||
}
|
||||
}else{
|
||||
#FORWARD PART
|
||||
$maxkey=&General::findhasharraykey(\%configoutgoingfw);
|
||||
%rulehash=%configoutgoingfw;
|
||||
}else {
|
||||
# FORWARD PART
|
||||
$fwdfwsettings{'config'}=$configfwdfw;
|
||||
$fwdfwsettings{'chain'} = 'FORWARDFW';
|
||||
my $maxkey=&General::findhasharraykey(\%configfwdfw);
|
||||
if($fwdfwsettings{'oldrulenumber'} eq $fwdfwsettings{'rulepos'}){
|
||||
#check if we have an identical rule already
|
||||
foreach my $key (sort keys %configfwdfw){
|
||||
if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}"
|
||||
eq "$configfwdfw{$key}[0],$configfwdfw{$key}[2],$configfwdfw{$key}[3],$configfwdfw{$key}[4],$configfwdfw{$key}[5],$configfwdfw{$key}[6],$configfwdfw{$key}[7],$configfwdfw{$key}[8],$configfwdfw{$key}[9],$configfwdfw{$key}[10],$configfwdfw{$key}[11],$configfwdfw{$key}[12],$configfwdfw{$key}[13],$configfwdfw{$key}[14],$configfwdfw{$key}[15],$configfwdfw{$key}[18],$configfwdfw{$key}[19],$configfwdfw{$key}[20],$configfwdfw{$key}[21],$configfwdfw{$key}[22],$configfwdfw{$key}[23],$configfwdfw{$key}[24],$configfwdfw{$key}[25],$configfwdfw{$key}[26],$configfwdfw{$key}[27],$configfwdfw{$key}[28],$configfwdfw{$key}[29],$configfwdfw{$key}[30],$configfwdfw{$key}[31],$configfwdfw{$key}[32],$configfwdfw{$key}[33],$configfwdfw{$key}[34],$configfwdfw{$key}[35],$configfwdfw{$key}[36]"){
|
||||
$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
|
||||
if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){
|
||||
$errormessage=$Lang::tr{'fwdfw err remark'}."<br>";
|
||||
}
|
||||
if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){
|
||||
$errormessage='';
|
||||
}
|
||||
if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){
|
||||
$fwdfwsettings{'nosave'} = 'on';
|
||||
}
|
||||
}
|
||||
$maxkey=&General::findhasharraykey(\%configfwdfw);
|
||||
%rulehash=%configfwdfw;
|
||||
}
|
||||
#check if we have an identical rule already
|
||||
if($fwdfwsettings{'oldrulenumber'} eq $fwdfwsettings{'rulepos'}){
|
||||
foreach my $key (sort keys %rulehash){
|
||||
if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'ruleremark'},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}"
|
||||
eq "$rulehash{$key}[0],$rulehash{$key}[2],$rulehash{$key}[3],$rulehash{$key}[4],$rulehash{$key}[5],$rulehash{$key}[6],$rulehash{$key}[7],$rulehash{$key}[8],$rulehash{$key}[9],$rulehash{$key}[10],$rulehash{$key}[11],$rulehash{$key}[12],$rulehash{$key}[13],$rulehash{$key}[14],$rulehash{$key}[15],$rulehash{$key}[16],$rulehash{$key}[17],$rulehash{$key}[18],$rulehash{$key}[19],$rulehash{$key}[20],$rulehash{$key}[21],$rulehash{$key}[22],$rulehash{$key}[23],$rulehash{$key}[24],$rulehash{$key}[25],$rulehash{$key}[26],$rulehash{$key}[27],$rulehash{$key}[28],$rulehash{$key}[29],$rulehash{$key}[30],$rulehash{$key}[31],$rulehash{$key}[32],$rulehash{$key}[33],$rulehash{$key}[34],$rulehash{$key}[35],$rulehash{$key}[36]"){
|
||||
$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
|
||||
if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){
|
||||
$errormessage=$Lang::tr{'fwdfw err remark'}."<br>";
|
||||
}
|
||||
if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){
|
||||
$errormessage='';
|
||||
}
|
||||
if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){
|
||||
$fwdfwsettings{'nosave'} = 'on';
|
||||
}
|
||||
}
|
||||
}
|
||||
#check Rulepos on new Rule
|
||||
if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){
|
||||
$fwdfwsettings{'oldrulenumber'}=$maxkey;
|
||||
foreach my $key (sort keys %configfwdfw){
|
||||
if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}"
|
||||
eq "$configfwdfw{$key}[0],$configfwdfw{$key}[2],$configfwdfw{$key}[3],$configfwdfw{$key}[4],$configfwdfw{$key}[5],$configfwdfw{$key}[6],$configfwdfw{$key}[7],$configfwdfw{$key}[8],$configfwdfw{$key}[9],$configfwdfw{$key}[10],$configfwdfw{$key}[11],$configfwdfw{$key}[12],$configfwdfw{$key}[13],$configfwdfw{$key}[14],$configfwdfw{$key}[15],$configfwdfw{$key}[18],$configfwdfw{$key}[19],$configfwdfw{$key}[20],$configfwdfw{$key}[21],$configfwdfw{$key}[22],$configfwdfw{$key}[23],$configfwdfw{$key}[24],$configfwdfw{$key}[25],$configfwdfw{$key}[26],$configfwdfw{$key}[27],$configfwdfw{$key}[28],$configfwdfw{$key}[29],$configfwdfw{$key}[30],$configfwdfw{$key}[31],$configfwdfw{$key}[32],$configfwdfw{$key}[33],$configfwdfw{$key}[34],$configfwdfw{$key}[35],$configfwdfw{$key}[36]"){
|
||||
$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
|
||||
}
|
||||
}
|
||||
#check Rulepos on new Rule
|
||||
if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){
|
||||
$fwdfwsettings{'oldrulenumber'}=$maxkey;
|
||||
foreach my $key (sort keys %rulehash){
|
||||
if ( "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'},$fwdfwsettings{'LIMIT_CON_CON'},$fwdfwsettings{'concon'},$fwdfwsettings{'RATE_LIMIT'},$fwdfwsettings{'ratecon'},$fwdfwsettings{'RATETIME'}"
|
||||
eq "$rulehash{$key}[0],$rulehash{$key}[2],$rulehash{$key}[3],$rulehash{$key}[4],$rulehash{$key}[5],$rulehash{$key}[6],$rulehash{$key}[7],$rulehash{$key}[8],$rulehash{$key}[9],$rulehash{$key}[10],$rulehash{$key}[11],$rulehash{$key}[12],$rulehash{$key}[13],$rulehash{$key}[14],$rulehash{$key}[15],$rulehash{$key}[18],$rulehash{$key}[19],$rulehash{$key}[20],$rulehash{$key}[21],$rulehash{$key}[22],$rulehash{$key}[23],$rulehash{$key}[24],$rulehash{$key}[25],$rulehash{$key}[26],$rulehash{$key}[27],$rulehash{$key}[28],$rulehash{$key}[29],$rulehash{$key}[30],$rulehash{$key}[31],$rulehash{$key}[32],$rulehash{$key}[33],$rulehash{$key}[34],$rulehash{$key}[35],$rulehash{$key}[36]"){
|
||||
$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
|
||||
}
|
||||
}
|
||||
#check if we just close a rule
|
||||
if( $fwdfwsettings{'oldgrp1a'} eq $fwdfwsettings{'grp1'} && $fwdfwsettings{'oldgrp1b'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'oldgrp2a'} eq $fwdfwsettings{'grp2'} && $fwdfwsettings{'oldgrp2b'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'oldgrp3a'} eq $fwdfwsettings{'grp3'} && $fwdfwsettings{'oldgrp3b'} eq $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'oldruletype'} eq $fwdfwsettings{'chain'}){
|
||||
if($fwdfwsettings{'nosave'} eq 'on' && $fwdfwsettings{'updatefwrule'} eq 'on'){
|
||||
$fwdfwsettings{'nosave2'} = 'on';
|
||||
$errormessage='';
|
||||
}
|
||||
}
|
||||
#check if we just close a rule
|
||||
if( $fwdfwsettings{'oldgrp1a'} eq $fwdfwsettings{'grp1'} && $fwdfwsettings{'oldgrp1b'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'oldgrp2a'} eq $fwdfwsettings{'grp2'} && $fwdfwsettings{'oldgrp2b'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'oldgrp3a'} eq $fwdfwsettings{'grp3'} && $fwdfwsettings{'oldgrp3b'} eq $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'oldruletype'} eq $fwdfwsettings{'chain'}){
|
||||
if($fwdfwsettings{'nosave'} eq 'on' && $fwdfwsettings{'updatefwrule'} eq 'on'){
|
||||
$fwdfwsettings{'nosave2'} = 'on';
|
||||
$errormessage='';
|
||||
}
|
||||
#check max concurrent connections per ip address
|
||||
if ($fwdfwsettings{'LIMIT_CON_CON'} eq 'ON'){
|
||||
if (!($fwdfwsettings{'concon'} =~ /^(\d+)$/)) {
|
||||
$errormessage.=$Lang::tr{'fwdfw err concon'};
|
||||
}
|
||||
}else{
|
||||
$fwdfwsettings{'concon'}='';
|
||||
}
|
||||
#check max concurrent connections per ip address
|
||||
if ($fwdfwsettings{'LIMIT_CON_CON'} eq 'ON'){
|
||||
if (!($fwdfwsettings{'concon'} =~ /^(\d+)$/)) {
|
||||
$errormessage.=$Lang::tr{'fwdfw err concon'};
|
||||
}
|
||||
#check ratelimit value
|
||||
if ($fwdfwsettings{'RATE_LIMIT'} eq 'ON'){
|
||||
if (!($fwdfwsettings{'ratecon'} =~ /^(\d+)$/)) {
|
||||
$errormessage.=$Lang::tr{'fwdfw err ratecon'};
|
||||
}
|
||||
}else{
|
||||
$fwdfwsettings{'ratecon'}='';
|
||||
}else{
|
||||
$fwdfwsettings{'concon'}='';
|
||||
}
|
||||
#check ratelimit value
|
||||
if ($fwdfwsettings{'RATE_LIMIT'} eq 'ON'){
|
||||
if (!($fwdfwsettings{'ratecon'} =~ /^(\d+)$/)) {
|
||||
$errormessage.=$Lang::tr{'fwdfw err ratecon'};
|
||||
}
|
||||
#increase counters
|
||||
if (!$errormessage){
|
||||
if ($fwdfwsettings{'nosave2'} ne 'on'){
|
||||
&saverule(\%configfwdfw,$configfwdfw);
|
||||
}
|
||||
}else{
|
||||
$fwdfwsettings{'ratecon'}='';
|
||||
}
|
||||
#increase counters
|
||||
if (!$errormessage){
|
||||
if ($fwdfwsettings{'nosave2'} ne 'on'){
|
||||
&saverule(\%rulehash,$fwdfwsettings{'config'});
|
||||
}
|
||||
}
|
||||
if ($errormessage){
|
||||
|
||||
@@ -437,6 +437,14 @@ sub writeipsecfiles {
|
||||
}
|
||||
print CONF "\n";
|
||||
}#foreach key
|
||||
|
||||
# Add post user includes to config file
|
||||
# After the GUI-connections allows to patch connections.
|
||||
if (-e "/etc/ipsec.user-post.conf") {
|
||||
print CONF "include /etc/ipsec.user-post.conf\n";
|
||||
print CONF "\n";
|
||||
}
|
||||
|
||||
print SECRETS $last_secrets if ($last_secrets);
|
||||
close(CONF);
|
||||
close(SECRETS);
|
||||
|
||||
@@ -28,9 +28,9 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = asterisk
|
||||
PAK_VER = 13
|
||||
PAK_VER = 14
|
||||
|
||||
DEPS = "libsrtp sqlite"
|
||||
DEPS = "libsrtp"
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007-2014 IPFire Team <info@ipfire.org> #
|
||||
# Copyright (C) 2007-2015 IPFire Team <info@ipfire.org> #
|
||||
# #
|
||||
# This program is free software: you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 0.98.5
|
||||
VER = 0.98.6
|
||||
|
||||
THISAPP = clamav-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = clamav
|
||||
PAK_VER = 27
|
||||
PAK_VER = 28
|
||||
|
||||
DEPS = ""
|
||||
|
||||
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = abb5c7efaff3394c0a49ff970841a2ac
|
||||
$(DL_FILE)_MD5 = 7f4f7e82a09e42c4ebf153d6d452d9d8
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -81,6 +81,7 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/clamav/llvm-glibc.patch
|
||||
cd $(DIR_APP) && ./configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/var/ipfire/clamav \
|
||||
|
||||
13
lfs/ddns
13
lfs/ddns
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 005
|
||||
VER = 007
|
||||
|
||||
THISAPP = ddns-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.xz
|
||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 5fb0e7c8a775ae03074ad90d5a251a4c
|
||||
$(DL_FILE)_MD5 = 44f63cecc36db0d9ffddfa4bca7983ae
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -71,11 +71,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
|
||||
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns/ddns-005-Add-changeip-com.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns/ddns-005-SPDNS-fix-auth.patch
|
||||
|
||||
cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire
|
||||
cd $(DIR_APP) && ./configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/var/ipfire \
|
||||
--disable-manpages
|
||||
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
|
||||
|
||||
61
lfs/dnsmasq
61
lfs/dnsmasq
@@ -24,10 +24,10 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 1062667
|
||||
VER = 2.72
|
||||
|
||||
THISAPP = dnsmasq-$(VER)
|
||||
DL_FILE = $(THISAPP)-20150201.tar.gz
|
||||
DL_FILE = $(THISAPP).tar.xz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = ee58d033a892faa69b099ed598f500c2
|
||||
$(DL_FILE)_MD5 = 0256e0a71e27c8d8a5c89a0d18f3cfe2
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -73,6 +73,61 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0001-Add-newline-at-the-end-of-example-config-file.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0002-crash-at-startup-when-an-empty-suffix-is-supplied-to.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0007-Improve-RFC-compliance-when-unable-to-supply-address.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0009-Use-inotify-instead-of-polling-on-Linux.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0010-Teach-the-new-inotify-code-about-symlinks.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0011-Remove-floor-on-EDNS0-packet-size-with-DNSSEC.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0012-CHANGELOG-re.-inotify.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0013-Fix-breakage-of-domain-domain-subnet-local.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0014-Remove-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0015-Eliminate-IPv6-privacy-addresses-from-interface-name.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0016-Tweak-field-width-in-cache-dump-to-avoid-truncating-.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0017-Fix-crash-in-DNSSEC-code-when-attempting-to-verify-l.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0018-Make-caching-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0019-Fix-problems-validating-NSEC3-and-wildcards.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0020-Initialise-return-value.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0021-Add-ignore-address-option.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0022-Bad-packet-protection.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0023-Fix-build-failure-in-new-inotify-code-on-BSD.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0024-Implement-makefile-dependencies-on-COPTS-variable.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0026-DNSSEC-do-top-down-search-for-limit-of-secure-delega.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0027-Add-log-queries-extra-option-for-more-complete-loggi.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0028-Add-min-cache-ttl-option.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0030-Don-t-answer-from-cache-RRsets-from-wildcards-as-we-.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0031-Logs-for-DS-records-consistent.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0032-Cope-with-multiple-interfaces-with-the-same-LL-addre.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0033-Don-t-treat-SERVFAIL-as-a-recoverable-error.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0034-Add-dhcp-hostsdir-config-option.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0035-Update-German-translation.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0036-Don-t-reply-to-DHCPv6-SOLICIT-messages-when-not-conf.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0037-Allow-inotify-to-be-disabled-at-compile-time-on-Linu.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0038-Expand-inotify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0040-inotify-documentation-updates.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0041-Fix-broken-ECDSA-DNSSEC-signatures.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0042-BSD-make-support.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0043-Fix-build-failure-on-openBSD.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0044-Manpage-typo-fix.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0045-Fixup-dhcp-configs-after-reading-extra-hostfiles-wit.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0046-Extra-logging-for-inotify-code.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0047-man-page-typo.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0048-Fix-get-version-script-which-returned-wrong-tag-in-s.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0049-Typos.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0050-Make-dynamic-hosts-files-work-when-no-hosts-set.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0051-Fix-trivial-memory-leaks-to-quieten-valgrind.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0052-Fix-uninitialized-value-used-in-get_client_mac.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch
|
||||
cd $(DIR_APP) && sed -i src/config.h \
|
||||
-e 's|/\* #define HAVE_IDN \*/|#define HAVE_IDN|g' \
|
||||
|
||||
6
lfs/fuse
6
lfs/fuse
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
|
||||
# Copyright (C) 2015 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 #
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.8.3
|
||||
VER = 2.9.3
|
||||
|
||||
THISAPP = fuse-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 517c8384f915e40647bda9f71579fd97
|
||||
$(DL_FILE)_MD5 = 33cae22ca50311446400daf8a6255c6a
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
|
||||
# Copyright (C) 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,12 +24,15 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.0.24.1
|
||||
VER = 1.5.11
|
||||
|
||||
THISAPP = teamspeak-$(VER)
|
||||
THISAPP = haproxy-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = teamspeak
|
||||
PAK_VER = 2
|
||||
PROG = haproxy
|
||||
PAK_VER = 1
|
||||
|
||||
DEPS = ""
|
||||
|
||||
@@ -37,26 +40,60 @@ DEPS = ""
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
|
||||
objects =
|
||||
objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 5500a79d0d2b238d4a1e9749bd0c2cb2
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
check :
|
||||
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
|
||||
|
||||
download :
|
||||
download :$(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
|
||||
md5 :
|
||||
md5 : $(subst %,%_MD5,$(objects))
|
||||
|
||||
dist:
|
||||
dist:
|
||||
@$(PAK)
|
||||
|
||||
###############################################################################
|
||||
# Downloading, checking, md5sum
|
||||
###############################################################################
|
||||
|
||||
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
|
||||
@$(CHECK)
|
||||
|
||||
$(patsubst %,$(DIR_DL)/%,$(objects)) :
|
||||
@$(LOAD)
|
||||
|
||||
$(subst %,%_MD5,$(objects)) :
|
||||
@$(MD5)
|
||||
|
||||
###############################################################################
|
||||
# Installation Details
|
||||
###############################################################################
|
||||
|
||||
$(TARGET) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
-mkdir -p /opt/teamspeak
|
||||
install -v -m 644 $(DIR_SRC)/config/backup/includes/teamspeak \
|
||||
/var/ipfire/backup/addons/includes/teamspeak
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
|
||||
|
||||
cd $(DIR_APP) && make $(MAKETUNING) CPU="generic" TARGET="linux2628" \
|
||||
USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_REGPARM=1 \
|
||||
ADDINC="$(CFLAGS)" USE_LINUX_TPROXY=1 ADDLIB="$(LDFLAGS)"
|
||||
|
||||
cd $(DIR_APP) && make install-bin install-man PREFIX=/usr
|
||||
|
||||
-mkdir -pv /etc/haproxy /var/lib/haproxy
|
||||
install -v -m 644 $(DIR_SRC)/config/haproxy/haproxy.cfg \
|
||||
/etc/haproxy/haproxy.cfg
|
||||
|
||||
install -v -m 644 $(DIR_SRC)/config/backup/includes/haproxy \
|
||||
/var/ipfire/backup/addons/includes/haproxy
|
||||
|
||||
# Restore initscript
|
||||
install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/haproxy \
|
||||
/etc/rc.d/init.d/haproxy
|
||||
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
@@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
touch /var/lib/logrotate.status
|
||||
mkdir -pv /etc/logrotate.d
|
||||
touch /etc/logrotate.d/.empty /var/lib/logrotate.status
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
|
||||
# Copyright (C) 2015 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 #
|
||||
@@ -24,9 +24,9 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2011.1.15
|
||||
VER = 2014.2.15
|
||||
|
||||
THISAPP = ntfs-3g-$(VER)
|
||||
THISAPP = ntfs-3g_ntfsprogs-$(VER)
|
||||
DL_FILE = $(THISAPP).tgz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 15a5cf5752012269fa168c24191f00e2
|
||||
$(DL_FILE)_MD5 = f11d563816249d730a00498983485f3a
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 7.0.0
|
||||
VER = 7.0.3
|
||||
|
||||
THISAPP = owncloud-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = owncloud
|
||||
PAK_VER = 2
|
||||
PAK_VER = 4
|
||||
|
||||
DEPS = ""
|
||||
|
||||
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 28cfdc99e8ee9350fe88430b4c7d62f2
|
||||
$(DL_FILE)_MD5 = d5d2ad068046e6ddb322cf001a9bb3d5
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007-2014 IPFire Team <info@ipfire.org> #
|
||||
# Copyright (C) 2007-2015 IPFire Team <info@ipfire.org> #
|
||||
# #
|
||||
# This program is free software: you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 3.6.24
|
||||
VER = 3.6.25
|
||||
|
||||
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 = 59
|
||||
PAK_VER = 60
|
||||
|
||||
DEPS = "cups krb5"
|
||||
|
||||
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = d98425c0c2b73e08f048d31ffc727fb0
|
||||
$(DL_FILE)_MD5 = 76da2fa64edd94a0188531e7ecb27c4e
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
|
||||
@@ -79,8 +79,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.0.2_ipfire.patch
|
||||
cd $(DIR_APP) && patch -Np1 --ignore-whitespace \
|
||||
-i $(DIR_SRC)/src/patches/strongswan-5.2.2-issue-816.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.2.2-issue-816-eb25190.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.2.2-issue-816-650a3ad.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.2.2-issue-816-dd0ebb.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.2.2-issue-819-cd2c30a.patch
|
||||
|
||||
cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
|
||||
|
||||
2
make.sh
2
make.sh
@@ -664,7 +664,6 @@ buildipfire() {
|
||||
ipfiremake lm_sensors
|
||||
ipfiremake liboping
|
||||
ipfiremake collectd
|
||||
ipfiremake teamspeak
|
||||
ipfiremake elinks
|
||||
ipfiremake igmpproxy
|
||||
ipfiremake fbset
|
||||
@@ -812,6 +811,7 @@ buildipfire() {
|
||||
ipfiremake pigz
|
||||
ipfiremake tmux
|
||||
ipfiremake swconfig
|
||||
ipfiremake haproxy
|
||||
}
|
||||
|
||||
buildinstaller() {
|
||||
|
||||
47
src/initscripts/init.d/haproxy
Normal file
47
src/initscripts/init.d/haproxy
Normal file
@@ -0,0 +1,47 @@
|
||||
#!/bin/sh
|
||||
########################################################################
|
||||
# Begin $rc_base/init.d/haproxy
|
||||
#
|
||||
# Description : HAProxy init script
|
||||
#
|
||||
########################################################################
|
||||
|
||||
. /etc/sysconfig/rc
|
||||
. ${rc_functions}
|
||||
|
||||
case "${1}" in
|
||||
start)
|
||||
boot_mesg "Starting HAProxy..."
|
||||
loadproc /usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg \
|
||||
-p /var/run/haproxy.pid
|
||||
;;
|
||||
|
||||
stop)
|
||||
boot_mesg "Stopping HAProxy..."
|
||||
killproc /usr/sbin/haproxy
|
||||
;;
|
||||
|
||||
reload)
|
||||
boot_mesg "Reloading HAProxy..."
|
||||
/usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg \
|
||||
-p /var/run/haproxy.pid -sf $(cat /var/run/haproxy.pid)
|
||||
evaluate_retval
|
||||
;;
|
||||
|
||||
restart)
|
||||
${0} stop
|
||||
sleep 1
|
||||
${0} start
|
||||
;;
|
||||
|
||||
status)
|
||||
statusproc /usr/sbin/haproxy
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "Usage: ${0} {start|stop|reload|restart|status}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# End $rc_base/init.d/haproxy
|
||||
@@ -1,28 +0,0 @@
|
||||
#!/bin/sh
|
||||
########################################################################
|
||||
# Begin $rc_base/init.d/teamspeak
|
||||
#
|
||||
# Description : Start/Stops the teamspeak server
|
||||
#
|
||||
# Authors : Michael Tremer
|
||||
#
|
||||
# Version : 01.00
|
||||
#
|
||||
# Notes :
|
||||
#
|
||||
########################################################################
|
||||
|
||||
. /etc/sysconfig/rc
|
||||
. $rc_functions
|
||||
|
||||
case "$1" in
|
||||
status)
|
||||
statusproc /opt/teamspeak/server_linux
|
||||
;;
|
||||
*)
|
||||
export LANG=en_US.utf8
|
||||
cd /opt/teamspeak && sudo -u teamspeak ./teamspeak2-server_startscript $*
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
# End $rc_base/init.d/teamspeak
|
||||
@@ -12,7 +12,6 @@ hu
|
||||
id
|
||||
it
|
||||
ja
|
||||
ja_JP
|
||||
jv
|
||||
km_KH
|
||||
nl
|
||||
@@ -21,7 +20,6 @@ pt_BR
|
||||
pt_PT
|
||||
ro_RO
|
||||
ru
|
||||
ru_RU
|
||||
rw
|
||||
sk
|
||||
sq
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
#
|
||||
# Translators:
|
||||
# Henrik Simonsen <cybermaze@gmail.com>, 2014
|
||||
# Henrik Simonsen <cybermaze@gmail.com>, 2014-2015
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: IPFire Project\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2014-11-05 01:29+0000\n"
|
||||
"PO-Revision-Date: 2014-11-05 01:33+0000\n"
|
||||
"Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
|
||||
"PO-Revision-Date: 2015-01-13 21:22+0000\n"
|
||||
"Last-Translator: Henrik Simonsen <cybermaze@gmail.com>\n"
|
||||
"Language-Team: Danish (http://www.transifex.com/projects/p/ipfire/language/da/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@@ -33,7 +33,7 @@ msgstr "Jeg accepterer brugerlicensen"
|
||||
|
||||
#: main.c:384
|
||||
msgid "Warning: Unattended installation will start in 10 seconds..."
|
||||
msgstr ""
|
||||
msgstr "Advarsel: Installation uden opsyn starter om 10 sekunder..."
|
||||
|
||||
#: main.c:403
|
||||
msgid "Language selection"
|
||||
@@ -45,7 +45,7 @@ msgstr "Vælg det sprog du ønsker at anvende under installationen."
|
||||
|
||||
#: main.c:418
|
||||
msgid "Unattended mode"
|
||||
msgstr ""
|
||||
msgstr "Uden opsyn"
|
||||
|
||||
#: main.c:420
|
||||
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
|
||||
@@ -66,7 +66,7 @@ msgstr "Start installationen"
|
||||
#: main.c:449
|
||||
#, c-format
|
||||
msgid "The installer will now try downloading the installation image."
|
||||
msgstr ""
|
||||
msgstr "Installationen vil nu forsøge at hente installationsbilledet."
|
||||
|
||||
#: main.c:452
|
||||
#, c-format
|
||||
@@ -74,41 +74,41 @@ msgid ""
|
||||
"No source drive could be found.\n"
|
||||
"\n"
|
||||
"You can try downloading the required installation image."
|
||||
msgstr ""
|
||||
msgstr "Kunne ikke finde et kildedrev.\n\nDu kan prøve at hente det påkrævede installationsbillede."
|
||||
|
||||
#: main.c:456
|
||||
msgid ""
|
||||
"Please make sure to connect your machine to a network and the installer will"
|
||||
" try connect to acquire an IP address."
|
||||
msgstr ""
|
||||
msgstr "Sørg venligst for at din computer er forbundet til et netværk, så vil installationen forsøge at skaffe en IP adresse."
|
||||
|
||||
#: main.c:460
|
||||
msgid "Download installation image"
|
||||
msgstr ""
|
||||
msgstr "Hent installationsbillede"
|
||||
|
||||
#: main.c:473
|
||||
msgid "Trying to start networking (DHCP)..."
|
||||
msgstr ""
|
||||
msgstr "Prøver at starte netværk (DHCP)..."
|
||||
|
||||
#: main.c:484
|
||||
msgid ""
|
||||
"Networking could not be started but is required to go on with the installation.\n"
|
||||
"\n"
|
||||
"Please connect your machine to a network with a DHCP server and retry."
|
||||
msgstr ""
|
||||
msgstr "Kunne ikke oprette forbindelse til et netværk hvilket er nødvendigt for installationen.\n\nForbind venligst din computer til et netværk med en DHCP server og prøv igen."
|
||||
|
||||
#: main.c:487 main.c:516
|
||||
msgid "Retry"
|
||||
msgstr ""
|
||||
msgstr "Prøv igen"
|
||||
|
||||
#: main.c:501
|
||||
msgid "Downloading installation image..."
|
||||
msgstr ""
|
||||
msgstr "Henter installationsbillede..."
|
||||
|
||||
#: main.c:510
|
||||
#, c-format
|
||||
msgid "MD5 checksum mismatch"
|
||||
msgstr ""
|
||||
msgstr "MD5 checksum mismatch"
|
||||
|
||||
#: main.c:513
|
||||
#, c-format
|
||||
@@ -117,14 +117,14 @@ msgid ""
|
||||
" Reason: %s\n"
|
||||
"\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
msgstr "Installationsbilledet kunne ikke hentes.\n Årsag: %s\n\n%s"
|
||||
|
||||
#: main.c:528
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Could not mount %s to %s:\n"
|
||||
" %s\n"
|
||||
msgstr ""
|
||||
msgstr "Kunne ikke montere %s til %s:\n %s\n"
|
||||
|
||||
#: main.c:543
|
||||
msgid "License Agreement"
|
||||
@@ -191,16 +191,16 @@ msgstr "RAID opsætning"
|
||||
|
||||
#: main.c:640
|
||||
msgid "Your disk configuration is currently not supported."
|
||||
msgstr ""
|
||||
msgstr "Din drev konfiguration er ikke understøttet pt."
|
||||
|
||||
#: main.c:655
|
||||
msgid "Your harddisk is too small."
|
||||
msgstr "Din harddisk er for lille."
|
||||
msgstr "Din harddisk har for lille kapacitet."
|
||||
|
||||
#: main.c:671
|
||||
msgid ""
|
||||
"Your harddisk is very small, but you can continue without a swap partition."
|
||||
msgstr "Din harddisk er meget lille, men du kan fortsætte uden en swap partition."
|
||||
msgstr "Din harddisk har meget lille kapacitet, men du kan fortsætte uden en swap partition."
|
||||
|
||||
#: main.c:684
|
||||
msgid "ext4 Filesystem"
|
||||
@@ -287,27 +287,27 @@ msgid ""
|
||||
"A backup file has been found on the installation image.\n"
|
||||
"\n"
|
||||
"Do you want to restore the backup?"
|
||||
msgstr ""
|
||||
msgstr "En backup fil er fundet på installationsbilledet.\n\nØnsker du at genskabe denne backup?"
|
||||
|
||||
#: main.c:827
|
||||
msgid "Yes"
|
||||
msgstr ""
|
||||
msgstr "Ja"
|
||||
|
||||
#: main.c:827
|
||||
msgid "No"
|
||||
msgstr ""
|
||||
msgstr "Nej"
|
||||
|
||||
#: main.c:834
|
||||
msgid "An error occured when the backup file was restored."
|
||||
msgstr ""
|
||||
msgstr "Der opstod en fejl under forsøget på at genskabe backup filen."
|
||||
|
||||
#: main.c:869
|
||||
msgid "Running post-install script..."
|
||||
msgstr ""
|
||||
msgstr "Kører efter-installation script..."
|
||||
|
||||
#: main.c:870
|
||||
msgid "Post-install script failed."
|
||||
msgstr ""
|
||||
msgstr "Efter-installation script fejlede."
|
||||
|
||||
#: main.c:877
|
||||
#, c-format
|
||||
|
||||
@@ -9,7 +9,7 @@ msgstr ""
|
||||
"Project-Id-Version: IPFire Project\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2014-11-05 01:29+0000\n"
|
||||
"PO-Revision-Date: 2015-01-26 07:48+0000\n"
|
||||
"PO-Revision-Date: 2015-02-17 23:49+0000\n"
|
||||
"Last-Translator: Khalil Delavaran <khalil.delavaran@gmail.com>\n"
|
||||
"Language-Team: Persian (http://www.transifex.com/projects/p/ipfire/language/fa/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -66,7 +66,7 @@ msgstr "آغاز برپا سازی"
|
||||
#: main.c:449
|
||||
#, c-format
|
||||
msgid "The installer will now try downloading the installation image."
|
||||
msgstr ""
|
||||
msgstr "برنامه نصب تلاش خواهد کرد که ایمیج نصب را دانلود کند."
|
||||
|
||||
#: main.c:452
|
||||
#, c-format
|
||||
@@ -80,7 +80,7 @@ msgstr "درایو منبع پیدا نشد.\n\nشما می توانید ایم
|
||||
msgid ""
|
||||
"Please make sure to connect your machine to a network and the installer will"
|
||||
" try connect to acquire an IP address."
|
||||
msgstr ""
|
||||
msgstr "لطفا مطمئن شوید که دستگاه شما به شبکه متصل است و برنامه نصب برای بدست آوردن IP تلاش خواهد کرد."
|
||||
|
||||
#: main.c:460
|
||||
msgid "Download installation image"
|
||||
|
||||
@@ -3,13 +3,14 @@
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
#
|
||||
# Translators:
|
||||
# nonux <nonux@free.fr>, 2015
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: IPFire Project\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2014-11-05 01:29+0000\n"
|
||||
"PO-Revision-Date: 2014-11-05 01:33+0000\n"
|
||||
"Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
|
||||
"PO-Revision-Date: 2015-02-17 23:23+0000\n"
|
||||
"Last-Translator: nonux <nonux@free.fr>\n"
|
||||
"Language-Team: French (http://www.transifex.com/projects/p/ipfire/language/fr/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@@ -24,11 +25,11 @@ msgstr ""
|
||||
#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
|
||||
#: main.c:702
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
msgstr "Annuler"
|
||||
|
||||
#: main.c:176
|
||||
msgid "I accept this license"
|
||||
msgstr ""
|
||||
msgstr "J'accepte la licence"
|
||||
|
||||
#: main.c:384
|
||||
msgid "Warning: Unattended installation will start in 10 seconds..."
|
||||
@@ -36,11 +37,11 @@ msgstr ""
|
||||
|
||||
#: main.c:403
|
||||
msgid "Language selection"
|
||||
msgstr ""
|
||||
msgstr "Sélection de la langue"
|
||||
|
||||
#: main.c:403
|
||||
msgid "Select the language you wish to use for the installation."
|
||||
msgstr ""
|
||||
msgstr "Sélectionnez la langue que vous souhaitez utiliser pour l'installation."
|
||||
|
||||
#: main.c:418
|
||||
msgid "Unattended mode"
|
||||
@@ -60,12 +61,12 @@ msgstr ""
|
||||
|
||||
#: main.c:428
|
||||
msgid "Start installation"
|
||||
msgstr ""
|
||||
msgstr "Démarrer l'installation"
|
||||
|
||||
#: main.c:449
|
||||
#, c-format
|
||||
msgid "The installer will now try downloading the installation image."
|
||||
msgstr ""
|
||||
msgstr "Le programme d'installation va maintenant essayer de télécharger l'image d'installation."
|
||||
|
||||
#: main.c:452
|
||||
#, c-format
|
||||
@@ -83,11 +84,11 @@ msgstr ""
|
||||
|
||||
#: main.c:460
|
||||
msgid "Download installation image"
|
||||
msgstr ""
|
||||
msgstr "Télécharger l'image d'installation"
|
||||
|
||||
#: main.c:473
|
||||
msgid "Trying to start networking (DHCP)..."
|
||||
msgstr ""
|
||||
msgstr "Tente de démarrer le réseau (DHCP)..."
|
||||
|
||||
#: main.c:484
|
||||
msgid ""
|
||||
@@ -98,11 +99,11 @@ msgstr ""
|
||||
|
||||
#: main.c:487 main.c:516
|
||||
msgid "Retry"
|
||||
msgstr ""
|
||||
msgstr "Ré-essayer"
|
||||
|
||||
#: main.c:501
|
||||
msgid "Downloading installation image..."
|
||||
msgstr ""
|
||||
msgstr "Téléchargement de l'image d'installation ..."
|
||||
|
||||
#: main.c:510
|
||||
#, c-format
|
||||
@@ -127,19 +128,19 @@ msgstr ""
|
||||
|
||||
#: main.c:543
|
||||
msgid "License Agreement"
|
||||
msgstr ""
|
||||
msgstr "Contrat de licence"
|
||||
|
||||
#: main.c:544
|
||||
msgid "License not accepted!"
|
||||
msgstr ""
|
||||
msgstr "Contrat de licence non accepté!"
|
||||
|
||||
#: main.c:566
|
||||
msgid "No hard disk found."
|
||||
msgstr ""
|
||||
msgstr "Aucun disque dur trouvé."
|
||||
|
||||
#: main.c:587
|
||||
msgid "Disk Selection"
|
||||
msgstr ""
|
||||
msgstr "Sélection du disque"
|
||||
|
||||
#: main.c:588
|
||||
msgid ""
|
||||
@@ -167,11 +168,11 @@ msgstr ""
|
||||
|
||||
#: main.c:619
|
||||
msgid "Disk Setup"
|
||||
msgstr ""
|
||||
msgstr "Configuration du disque"
|
||||
|
||||
#: main.c:620 main.c:630
|
||||
msgid "Delete all data"
|
||||
msgstr ""
|
||||
msgstr "Supprime toutes les données"
|
||||
|
||||
#: main.c:627
|
||||
#, c-format
|
||||
@@ -190,76 +191,76 @@ msgstr ""
|
||||
|
||||
#: main.c:640
|
||||
msgid "Your disk configuration is currently not supported."
|
||||
msgstr ""
|
||||
msgstr "La configuration du disque n'est pas actuellement supportée."
|
||||
|
||||
#: main.c:655
|
||||
msgid "Your harddisk is too small."
|
||||
msgstr ""
|
||||
msgstr "Votre disque dur est trop petit."
|
||||
|
||||
#: main.c:671
|
||||
msgid ""
|
||||
"Your harddisk is very small, but you can continue without a swap partition."
|
||||
msgstr ""
|
||||
msgstr "Votre disque dur est très petit, mais vous pouvez continuer sans la partition d'échange."
|
||||
|
||||
#: main.c:684
|
||||
msgid "ext4 Filesystem"
|
||||
msgstr ""
|
||||
msgstr "Système de fichier ext4"
|
||||
|
||||
#: main.c:685
|
||||
msgid "ext4 Filesystem without journal"
|
||||
msgstr ""
|
||||
msgstr "Système de fichier ext4 sans journalisation"
|
||||
|
||||
#: main.c:686
|
||||
msgid "XFS Filesystem"
|
||||
msgstr ""
|
||||
msgstr "Système de fichier XFS"
|
||||
|
||||
#: main.c:687
|
||||
msgid "ReiserFS Filesystem"
|
||||
msgstr ""
|
||||
msgstr "Système de fichier ReiserFS"
|
||||
|
||||
#: main.c:701
|
||||
msgid "Filesystem Selection"
|
||||
msgstr ""
|
||||
msgstr "Choix du système de fichier"
|
||||
|
||||
#: main.c:701
|
||||
msgid "Please choose your filesystem:"
|
||||
msgstr ""
|
||||
msgstr "Merci de choisir votre système de fichier : "
|
||||
|
||||
#: main.c:712
|
||||
msgid "Building RAID..."
|
||||
msgstr ""
|
||||
msgstr "Contruction du RAID..."
|
||||
|
||||
#: main.c:716
|
||||
msgid "Unable to build the RAID."
|
||||
msgstr ""
|
||||
msgstr "Impossible de construire le RAID."
|
||||
|
||||
#: main.c:728
|
||||
msgid "Partitioning disk..."
|
||||
msgstr ""
|
||||
msgstr "Partitionnement du disque..."
|
||||
|
||||
#: main.c:732
|
||||
msgid "Unable to partition the disk."
|
||||
msgstr ""
|
||||
msgstr "Impossible de partitionner le disque."
|
||||
|
||||
#: main.c:739
|
||||
msgid "Creating filesystems..."
|
||||
msgstr ""
|
||||
msgstr "Création des systèmes de fichiers"
|
||||
|
||||
#: main.c:743
|
||||
msgid "Unable to create filesystems."
|
||||
msgstr ""
|
||||
msgstr "Impossible de créer les systèmes de fichiers."
|
||||
|
||||
#: main.c:749
|
||||
msgid "Unable to mount filesystems."
|
||||
msgstr ""
|
||||
msgstr "Impossible de monter les systèmes de fichiers."
|
||||
|
||||
#: main.c:760
|
||||
msgid "Installing the system..."
|
||||
msgstr ""
|
||||
msgstr "Installation du système..."
|
||||
|
||||
#: main.c:761
|
||||
msgid "Unable to install the system."
|
||||
msgstr ""
|
||||
msgstr "Impossible d'installer le système."
|
||||
|
||||
#: main.c:777
|
||||
msgid "Installing the language cache..."
|
||||
@@ -290,11 +291,11 @@ msgstr ""
|
||||
|
||||
#: main.c:827
|
||||
msgid "Yes"
|
||||
msgstr ""
|
||||
msgstr "Oui"
|
||||
|
||||
#: main.c:827
|
||||
msgid "No"
|
||||
msgstr ""
|
||||
msgstr "Non"
|
||||
|
||||
#: main.c:834
|
||||
msgid "An error occured when the backup file was restored."
|
||||
@@ -322,8 +323,8 @@ msgstr ""
|
||||
|
||||
#: main.c:882
|
||||
msgid "Reboot"
|
||||
msgstr ""
|
||||
msgstr "Re-démarrer"
|
||||
|
||||
#: main.c:893
|
||||
msgid "Setup has failed. Press Ok to reboot."
|
||||
msgstr ""
|
||||
msgstr "La configuration a échoué. Appuyez sur OK pour re-démarrer."
|
||||
|
||||
@@ -1,329 +0,0 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR The IPFire Project (www.ipfire.org)
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
#
|
||||
# Translators:
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: IPFire Project\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2014-11-05 01:29+0000\n"
|
||||
"PO-Revision-Date: 2014-07-31 09:39+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/ipfire/language/ja_JP/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: ja_JP\n"
|
||||
"Plural-Forms: nplurals=1; plural=0;\n"
|
||||
|
||||
#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
|
||||
msgid "OK"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
|
||||
#: main.c:702
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:176
|
||||
msgid "I accept this license"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:384
|
||||
msgid "Warning: Unattended installation will start in 10 seconds..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:403
|
||||
msgid "Language selection"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:403
|
||||
msgid "Select the language you wish to use for the installation."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:418
|
||||
msgid "Unattended mode"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:420
|
||||
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:426
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Welcome to the %s installation program.\n"
|
||||
"\n"
|
||||
"Selecting Cancel on any of the following screens will reboot the computer."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:428
|
||||
msgid "Start installation"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:449
|
||||
#, c-format
|
||||
msgid "The installer will now try downloading the installation image."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:452
|
||||
#, c-format
|
||||
msgid ""
|
||||
"No source drive could be found.\n"
|
||||
"\n"
|
||||
"You can try downloading the required installation image."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:456
|
||||
msgid ""
|
||||
"Please make sure to connect your machine to a network and the installer will"
|
||||
" try connect to acquire an IP address."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:460
|
||||
msgid "Download installation image"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:473
|
||||
msgid "Trying to start networking (DHCP)..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:484
|
||||
msgid ""
|
||||
"Networking could not be started but is required to go on with the installation.\n"
|
||||
"\n"
|
||||
"Please connect your machine to a network with a DHCP server and retry."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:487 main.c:516
|
||||
msgid "Retry"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:501
|
||||
msgid "Downloading installation image..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:510
|
||||
#, c-format
|
||||
msgid "MD5 checksum mismatch"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:513
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The installation image could not be downloaded.\n"
|
||||
" Reason: %s\n"
|
||||
"\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:528
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Could not mount %s to %s:\n"
|
||||
" %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:543
|
||||
msgid "License Agreement"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:544
|
||||
msgid "License not accepted!"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:566
|
||||
msgid "No hard disk found."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:587
|
||||
msgid "Disk Selection"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:588
|
||||
msgid ""
|
||||
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
|
||||
"\n"
|
||||
"ALL DATA ON THE DISK WILL BE DESTROYED."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:599
|
||||
msgid ""
|
||||
"No disk has been selected.\n"
|
||||
"\n"
|
||||
"Please select one or more disks you want to install IPFire on."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:617
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The installation program will now prepare the chosen harddisk:\n"
|
||||
"\n"
|
||||
" %s\n"
|
||||
"\n"
|
||||
"Do you agree to continue?"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:619
|
||||
msgid "Disk Setup"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:620 main.c:630
|
||||
msgid "Delete all data"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:627
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
|
||||
"\n"
|
||||
" %s\n"
|
||||
" %s\n"
|
||||
"\n"
|
||||
"Do you agree to continue?"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:629
|
||||
msgid "RAID Setup"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:640
|
||||
msgid "Your disk configuration is currently not supported."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:655
|
||||
msgid "Your harddisk is too small."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:671
|
||||
msgid ""
|
||||
"Your harddisk is very small, but you can continue without a swap partition."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:684
|
||||
msgid "ext4 Filesystem"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:685
|
||||
msgid "ext4 Filesystem without journal"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:686
|
||||
msgid "XFS Filesystem"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:687
|
||||
msgid "ReiserFS Filesystem"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:701
|
||||
msgid "Filesystem Selection"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:701
|
||||
msgid "Please choose your filesystem:"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:712
|
||||
msgid "Building RAID..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:716
|
||||
msgid "Unable to build the RAID."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:728
|
||||
msgid "Partitioning disk..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:732
|
||||
msgid "Unable to partition the disk."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:739
|
||||
msgid "Creating filesystems..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:743
|
||||
msgid "Unable to create filesystems."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:749
|
||||
msgid "Unable to mount filesystems."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:760
|
||||
msgid "Installing the system..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:761
|
||||
msgid "Unable to install the system."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:777
|
||||
msgid "Installing the language cache..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:778
|
||||
msgid "Unable to install the language cache."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:783
|
||||
msgid "Installing the bootloader..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:790
|
||||
msgid "Unable to open /etc/default/grub for writing."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:812
|
||||
msgid "Unable to install the bootloader."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:826
|
||||
msgid ""
|
||||
"A backup file has been found on the installation image.\n"
|
||||
"\n"
|
||||
"Do you want to restore the backup?"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:827
|
||||
msgid "Yes"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:827
|
||||
msgid "No"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:834
|
||||
msgid "An error occured when the backup file was restored."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:869
|
||||
msgid "Running post-install script..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:870
|
||||
msgid "Post-install script failed."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:877
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s was successfully installed!\n"
|
||||
"\n"
|
||||
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:882
|
||||
msgid "Congratulations!"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:882
|
||||
msgid "Reboot"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:893
|
||||
msgid "Setup has failed. Press Ok to reboot."
|
||||
msgstr ""
|
||||
@@ -4,14 +4,15 @@
|
||||
#
|
||||
# Translators:
|
||||
# André Felipe Morro <andre@andremorro.com>, 2014
|
||||
# Evertton de Lima <e.everttonlima@gmail.com>, 2015
|
||||
# Leandro Luquetti Basilio da Silva <leandroluquetti@gmail.com>, 2014
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: IPFire Project\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2014-11-05 01:29+0000\n"
|
||||
"PO-Revision-Date: 2014-11-05 01:33+0000\n"
|
||||
"Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
|
||||
"PO-Revision-Date: 2015-02-16 23:04+0000\n"
|
||||
"Last-Translator: Evertton de Lima <e.everttonlima@gmail.com>\n"
|
||||
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/ipfire/language/pt_BR/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@@ -34,19 +35,19 @@ msgstr "Eu aceito esta licença"
|
||||
|
||||
#: main.c:384
|
||||
msgid "Warning: Unattended installation will start in 10 seconds..."
|
||||
msgstr ""
|
||||
msgstr "Cuidado: A instalação irá iniciar em 10 segundos..."
|
||||
|
||||
#: main.c:403
|
||||
msgid "Language selection"
|
||||
msgstr ""
|
||||
msgstr "Seleção de idioma"
|
||||
|
||||
#: main.c:403
|
||||
msgid "Select the language you wish to use for the installation."
|
||||
msgstr ""
|
||||
msgstr "Selecione o idioma que você deseja usar para a instalação."
|
||||
|
||||
#: main.c:418
|
||||
msgid "Unattended mode"
|
||||
msgstr ""
|
||||
msgstr "Modo automático"
|
||||
|
||||
#: main.c:420
|
||||
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
|
||||
@@ -58,7 +59,7 @@ msgid ""
|
||||
"Welcome to the %s installation program.\n"
|
||||
"\n"
|
||||
"Selecting Cancel on any of the following screens will reboot the computer."
|
||||
msgstr ""
|
||||
msgstr "Bem-vindo para o programa de instalação %s.\n\nSelecionando Cancelar em qualquer uma das telas seguintes irá reiniciar o computador."
|
||||
|
||||
#: main.c:428
|
||||
msgid "Start installation"
|
||||
@@ -67,7 +68,7 @@ msgstr "Iniciar a instalação"
|
||||
#: main.c:449
|
||||
#, c-format
|
||||
msgid "The installer will now try downloading the installation image."
|
||||
msgstr ""
|
||||
msgstr "O instalador irá tentar baixar a imagem de instalação agora."
|
||||
|
||||
#: main.c:452
|
||||
#, c-format
|
||||
@@ -85,26 +86,26 @@ msgstr ""
|
||||
|
||||
#: main.c:460
|
||||
msgid "Download installation image"
|
||||
msgstr ""
|
||||
msgstr "Baixar imagem de instalação"
|
||||
|
||||
#: main.c:473
|
||||
msgid "Trying to start networking (DHCP)..."
|
||||
msgstr ""
|
||||
msgstr "Tentando iniciar a rede (DHCP)..."
|
||||
|
||||
#: main.c:484
|
||||
msgid ""
|
||||
"Networking could not be started but is required to go on with the installation.\n"
|
||||
"\n"
|
||||
"Please connect your machine to a network with a DHCP server and retry."
|
||||
msgstr ""
|
||||
msgstr "Rede não pode ser iniciado, mas é necessária para continuar a instalação.\n\nPor favor, conecte sua máquina a uma rede com servidor DHCP e reinicie."
|
||||
|
||||
#: main.c:487 main.c:516
|
||||
msgid "Retry"
|
||||
msgstr ""
|
||||
msgstr "Tentar novamente"
|
||||
|
||||
#: main.c:501
|
||||
msgid "Downloading installation image..."
|
||||
msgstr ""
|
||||
msgstr "Baixando imagem de instalação..."
|
||||
|
||||
#: main.c:510
|
||||
#, c-format
|
||||
@@ -118,18 +119,18 @@ msgid ""
|
||||
" Reason: %s\n"
|
||||
"\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
msgstr "A imagem de instalação não pode ser baixada.\nMotivo: %s\n\n%s"
|
||||
|
||||
#: main.c:528
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Could not mount %s to %s:\n"
|
||||
" %s\n"
|
||||
msgstr ""
|
||||
msgstr "Não pode montar %s para %s:\n%s\n"
|
||||
|
||||
#: main.c:543
|
||||
msgid "License Agreement"
|
||||
msgstr ""
|
||||
msgstr "Contrato de Licença"
|
||||
|
||||
#: main.c:544
|
||||
msgid "License not accepted!"
|
||||
@@ -192,7 +193,7 @@ msgstr "Configuração de RAID"
|
||||
|
||||
#: main.c:640
|
||||
msgid "Your disk configuration is currently not supported."
|
||||
msgstr ""
|
||||
msgstr "Sua configuração de disco não é suportada atualmente."
|
||||
|
||||
#: main.c:655
|
||||
msgid "Your harddisk is too small."
|
||||
@@ -201,7 +202,7 @@ msgstr "Seu disco rígido é muito pequeno."
|
||||
#: main.c:671
|
||||
msgid ""
|
||||
"Your harddisk is very small, but you can continue without a swap partition."
|
||||
msgstr ""
|
||||
msgstr "Seu disco rígido é muito pequeno, mas você pode continuar sem uma partição swap."
|
||||
|
||||
#: main.c:684
|
||||
msgid "ext4 Filesystem"
|
||||
@@ -277,7 +278,7 @@ msgstr "Instalando o gerenciador de inicialização..."
|
||||
|
||||
#: main.c:790
|
||||
msgid "Unable to open /etc/default/grub for writing."
|
||||
msgstr ""
|
||||
msgstr "Não possível abrir /etc/default/grub para escrita."
|
||||
|
||||
#: main.c:812
|
||||
msgid "Unable to install the bootloader."
|
||||
@@ -288,27 +289,27 @@ msgid ""
|
||||
"A backup file has been found on the installation image.\n"
|
||||
"\n"
|
||||
"Do you want to restore the backup?"
|
||||
msgstr ""
|
||||
msgstr "Uma cópia de segurança foi encontrada na imagem de instalação.\n\nVocê quer restaurar a cópia de segurança?"
|
||||
|
||||
#: main.c:827
|
||||
msgid "Yes"
|
||||
msgstr ""
|
||||
msgstr "Sim"
|
||||
|
||||
#: main.c:827
|
||||
msgid "No"
|
||||
msgstr ""
|
||||
msgstr "Não"
|
||||
|
||||
#: main.c:834
|
||||
msgid "An error occured when the backup file was restored."
|
||||
msgstr ""
|
||||
msgstr "Um erro ocorreu enquanto a cópia de segurança foi restaurada."
|
||||
|
||||
#: main.c:869
|
||||
msgid "Running post-install script..."
|
||||
msgstr ""
|
||||
msgstr "Executando post-install script..."
|
||||
|
||||
#: main.c:870
|
||||
msgid "Post-install script failed."
|
||||
msgstr ""
|
||||
msgstr "Post-install script falhou."
|
||||
|
||||
#: main.c:877
|
||||
#, c-format
|
||||
@@ -328,4 +329,4 @@ msgstr "Reiniciar"
|
||||
|
||||
#: main.c:893
|
||||
msgid "Setup has failed. Press Ok to reboot."
|
||||
msgstr ""
|
||||
msgstr "Instalação falhou. Pressione Ok para reiniciar."
|
||||
|
||||
@@ -3,13 +3,14 @@
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
#
|
||||
# Translators:
|
||||
# ellviss <kpe1501@gmail.com>, 2015
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: IPFire Project\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2014-11-05 01:29+0000\n"
|
||||
"PO-Revision-Date: 2014-11-05 01:33+0000\n"
|
||||
"Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
|
||||
"PO-Revision-Date: 2015-02-24 12:56+0000\n"
|
||||
"Last-Translator: ellviss <kpe1501@gmail.com>\n"
|
||||
"Language-Team: Russian (http://www.transifex.com/projects/p/ipfire/language/ru/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@@ -19,36 +20,36 @@ msgstr ""
|
||||
|
||||
#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
|
||||
msgid "OK"
|
||||
msgstr ""
|
||||
msgstr "ОК"
|
||||
|
||||
#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
|
||||
#: main.c:702
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
msgstr "Отмена"
|
||||
|
||||
#: main.c:176
|
||||
msgid "I accept this license"
|
||||
msgstr ""
|
||||
msgstr "Я Согласен с этой лицензией"
|
||||
|
||||
#: main.c:384
|
||||
msgid "Warning: Unattended installation will start in 10 seconds..."
|
||||
msgstr ""
|
||||
msgstr "Внимание : запуск автоматической установки начнётся через 10 секунд ..."
|
||||
|
||||
#: main.c:403
|
||||
msgid "Language selection"
|
||||
msgstr ""
|
||||
msgstr "Выберите язык"
|
||||
|
||||
#: main.c:403
|
||||
msgid "Select the language you wish to use for the installation."
|
||||
msgstr ""
|
||||
msgstr "Выберете язык для инсталяции"
|
||||
|
||||
#: main.c:418
|
||||
msgid "Unattended mode"
|
||||
msgstr ""
|
||||
msgstr "Автоматический режим"
|
||||
|
||||
#: main.c:420
|
||||
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
|
||||
msgstr ""
|
||||
msgstr "<Tab>/<Alt-Tab> переход между элементами | <Space> выбор <F12> следующий экран"
|
||||
|
||||
#: main.c:426
|
||||
#, c-format
|
||||
@@ -56,16 +57,16 @@ msgid ""
|
||||
"Welcome to the %s installation program.\n"
|
||||
"\n"
|
||||
"Selecting Cancel on any of the following screens will reboot the computer."
|
||||
msgstr ""
|
||||
msgstr "Добро пожаловать в установку %s .\n\nНажатие Отмены на любом из следующих экранах приведёт к перезагрузке."
|
||||
|
||||
#: main.c:428
|
||||
msgid "Start installation"
|
||||
msgstr ""
|
||||
msgstr "Начать установку"
|
||||
|
||||
#: main.c:449
|
||||
#, c-format
|
||||
msgid "The installer will now try downloading the installation image."
|
||||
msgstr ""
|
||||
msgstr "Установщик пробует скачать установочный образ"
|
||||
|
||||
#: main.c:452
|
||||
#, c-format
|
||||
@@ -73,21 +74,21 @@ msgid ""
|
||||
"No source drive could be found.\n"
|
||||
"\n"
|
||||
"You can try downloading the required installation image."
|
||||
msgstr ""
|
||||
msgstr "Не найден источник\n\nВы можете скачать необходимый загрузочный образ"
|
||||
|
||||
#: main.c:456
|
||||
msgid ""
|
||||
"Please make sure to connect your machine to a network and the installer will"
|
||||
" try connect to acquire an IP address."
|
||||
msgstr ""
|
||||
msgstr "Убедитесь что компьютер подсоединён к сети и установщик может подключиться к запращиваемому ip адресу"
|
||||
|
||||
#: main.c:460
|
||||
msgid "Download installation image"
|
||||
msgstr ""
|
||||
msgstr "Скачать образ установки"
|
||||
|
||||
#: main.c:473
|
||||
msgid "Trying to start networking (DHCP)..."
|
||||
msgstr ""
|
||||
msgstr "Проверка запуска (DHCP)..."
|
||||
|
||||
#: main.c:484
|
||||
msgid ""
|
||||
@@ -98,16 +99,16 @@ msgstr ""
|
||||
|
||||
#: main.c:487 main.c:516
|
||||
msgid "Retry"
|
||||
msgstr ""
|
||||
msgstr "Повтор"
|
||||
|
||||
#: main.c:501
|
||||
msgid "Downloading installation image..."
|
||||
msgstr ""
|
||||
msgstr "Скачивание образа установки..."
|
||||
|
||||
#: main.c:510
|
||||
#, c-format
|
||||
msgid "MD5 checksum mismatch"
|
||||
msgstr ""
|
||||
msgstr "MD5 хеш не совпал"
|
||||
|
||||
#: main.c:513
|
||||
#, c-format
|
||||
@@ -123,23 +124,23 @@ msgstr ""
|
||||
msgid ""
|
||||
"Could not mount %s to %s:\n"
|
||||
" %s\n"
|
||||
msgstr ""
|
||||
msgstr "Не удалось подключить %s к %s:\n\n%s\n"
|
||||
|
||||
#: main.c:543
|
||||
msgid "License Agreement"
|
||||
msgstr ""
|
||||
msgstr "Лицензионное соглашение"
|
||||
|
||||
#: main.c:544
|
||||
msgid "License not accepted!"
|
||||
msgstr ""
|
||||
msgstr "Лицензия не принята"
|
||||
|
||||
#: main.c:566
|
||||
msgid "No hard disk found."
|
||||
msgstr ""
|
||||
msgstr "Не найдены жесткие диски"
|
||||
|
||||
#: main.c:587
|
||||
msgid "Disk Selection"
|
||||
msgstr ""
|
||||
msgstr "Выберете диск"
|
||||
|
||||
#: main.c:588
|
||||
msgid ""
|
||||
@@ -163,15 +164,15 @@ msgid ""
|
||||
" %s\n"
|
||||
"\n"
|
||||
"Do you agree to continue?"
|
||||
msgstr ""
|
||||
msgstr "Установочная программа настроит выбранный диск :\n\n%s\n\nВы согласны продолжить?"
|
||||
|
||||
#: main.c:619
|
||||
msgid "Disk Setup"
|
||||
msgstr ""
|
||||
msgstr "Настройка диска"
|
||||
|
||||
#: main.c:620 main.c:630
|
||||
msgid "Delete all data"
|
||||
msgstr ""
|
||||
msgstr "Удалить все данные"
|
||||
|
||||
#: main.c:627
|
||||
#, c-format
|
||||
@@ -186,127 +187,127 @@ msgstr ""
|
||||
|
||||
#: main.c:629
|
||||
msgid "RAID Setup"
|
||||
msgstr ""
|
||||
msgstr "Настройка RAID"
|
||||
|
||||
#: main.c:640
|
||||
msgid "Your disk configuration is currently not supported."
|
||||
msgstr ""
|
||||
msgstr "Конфигурация ваших дисков не поддерживается"
|
||||
|
||||
#: main.c:655
|
||||
msgid "Your harddisk is too small."
|
||||
msgstr ""
|
||||
msgstr "Ваш диск слишком мал"
|
||||
|
||||
#: main.c:671
|
||||
msgid ""
|
||||
"Your harddisk is very small, but you can continue without a swap partition."
|
||||
msgstr ""
|
||||
msgstr "Ваш диск слишком мал, но вы можете продолжить без файла подкачки"
|
||||
|
||||
#: main.c:684
|
||||
msgid "ext4 Filesystem"
|
||||
msgstr ""
|
||||
msgstr "раздел ext4"
|
||||
|
||||
#: main.c:685
|
||||
msgid "ext4 Filesystem without journal"
|
||||
msgstr ""
|
||||
msgstr "журналируемый раздел ext4"
|
||||
|
||||
#: main.c:686
|
||||
msgid "XFS Filesystem"
|
||||
msgstr ""
|
||||
msgstr "раздел XFS"
|
||||
|
||||
#: main.c:687
|
||||
msgid "ReiserFS Filesystem"
|
||||
msgstr ""
|
||||
msgstr "раздел ReiserFS"
|
||||
|
||||
#: main.c:701
|
||||
msgid "Filesystem Selection"
|
||||
msgstr ""
|
||||
msgstr "Выбор файловой системы"
|
||||
|
||||
#: main.c:701
|
||||
msgid "Please choose your filesystem:"
|
||||
msgstr ""
|
||||
msgstr "Пожалуйста, выберете тип файловой системы:"
|
||||
|
||||
#: main.c:712
|
||||
msgid "Building RAID..."
|
||||
msgstr ""
|
||||
msgstr "Создание RAID...."
|
||||
|
||||
#: main.c:716
|
||||
msgid "Unable to build the RAID."
|
||||
msgstr ""
|
||||
msgstr "Не возмозжно создать RAID"
|
||||
|
||||
#: main.c:728
|
||||
msgid "Partitioning disk..."
|
||||
msgstr ""
|
||||
msgstr "Разбивка диска..."
|
||||
|
||||
#: main.c:732
|
||||
msgid "Unable to partition the disk."
|
||||
msgstr ""
|
||||
msgstr "Невозможно разбить диск"
|
||||
|
||||
#: main.c:739
|
||||
msgid "Creating filesystems..."
|
||||
msgstr ""
|
||||
msgstr "Создание файловой системы..."
|
||||
|
||||
#: main.c:743
|
||||
msgid "Unable to create filesystems."
|
||||
msgstr ""
|
||||
msgstr "Не возможно создать раздел"
|
||||
|
||||
#: main.c:749
|
||||
msgid "Unable to mount filesystems."
|
||||
msgstr ""
|
||||
msgstr "Невозможно присоединить раздел"
|
||||
|
||||
#: main.c:760
|
||||
msgid "Installing the system..."
|
||||
msgstr ""
|
||||
msgstr "Установка системы ...."
|
||||
|
||||
#: main.c:761
|
||||
msgid "Unable to install the system."
|
||||
msgstr ""
|
||||
msgstr "Невозможно установить систему"
|
||||
|
||||
#: main.c:777
|
||||
msgid "Installing the language cache..."
|
||||
msgstr ""
|
||||
msgstr "Установка кеша языка...."
|
||||
|
||||
#: main.c:778
|
||||
msgid "Unable to install the language cache."
|
||||
msgstr ""
|
||||
msgstr "Невозможно установить кеш языка"
|
||||
|
||||
#: main.c:783
|
||||
msgid "Installing the bootloader..."
|
||||
msgstr ""
|
||||
msgstr "Установка загрузчика....."
|
||||
|
||||
#: main.c:790
|
||||
msgid "Unable to open /etc/default/grub for writing."
|
||||
msgstr ""
|
||||
msgstr "Невозможно открыть /etc/default/grub на запись"
|
||||
|
||||
#: main.c:812
|
||||
msgid "Unable to install the bootloader."
|
||||
msgstr ""
|
||||
msgstr "Невозможно установить загрузчик"
|
||||
|
||||
#: main.c:826
|
||||
msgid ""
|
||||
"A backup file has been found on the installation image.\n"
|
||||
"\n"
|
||||
"Do you want to restore the backup?"
|
||||
msgstr ""
|
||||
msgstr "Файл восстановления был найдет на установочном носителе\n\nвы хотите восстановить ?"
|
||||
|
||||
#: main.c:827
|
||||
msgid "Yes"
|
||||
msgstr ""
|
||||
msgstr "Да"
|
||||
|
||||
#: main.c:827
|
||||
msgid "No"
|
||||
msgstr ""
|
||||
msgstr "Нет"
|
||||
|
||||
#: main.c:834
|
||||
msgid "An error occured when the backup file was restored."
|
||||
msgstr ""
|
||||
msgstr "Произошла ошибка при восстановлении из файла."
|
||||
|
||||
#: main.c:869
|
||||
msgid "Running post-install script..."
|
||||
msgstr ""
|
||||
msgstr "Выполняются пост-установочные скрипты..."
|
||||
|
||||
#: main.c:870
|
||||
msgid "Post-install script failed."
|
||||
msgstr ""
|
||||
msgstr "Пост-установочный скрипт не сработал"
|
||||
|
||||
#: main.c:877
|
||||
#, c-format
|
||||
@@ -314,16 +315,16 @@ msgid ""
|
||||
"%s was successfully installed!\n"
|
||||
"\n"
|
||||
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
|
||||
msgstr ""
|
||||
msgstr "%s успешно установлено!\n\nПожалуйста извлеките все установочные носители из системы и нажмите кнопку перезагрузки. После перезапуска система попросит установить системный и сетевой пароли. После этого вы можете зайти через браузер на https://%s:444 ( где %s - ваш адрес ) для конфигурирования системы через web"
|
||||
|
||||
#: main.c:882
|
||||
msgid "Congratulations!"
|
||||
msgstr ""
|
||||
msgstr "Поздравляем!"
|
||||
|
||||
#: main.c:882
|
||||
msgid "Reboot"
|
||||
msgstr ""
|
||||
msgstr "Перезагрузка"
|
||||
|
||||
#: main.c:893
|
||||
msgid "Setup has failed. Press Ok to reboot."
|
||||
msgstr ""
|
||||
msgstr "Установка не удалась. Нажмите ОК для перезапуска"
|
||||
|
||||
@@ -1,329 +0,0 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR The IPFire Project (www.ipfire.org)
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
#
|
||||
# Translators:
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: IPFire Project\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2014-11-05 01:29+0000\n"
|
||||
"PO-Revision-Date: 2014-07-31 09:39+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/ipfire/language/ru_RU/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: ru_RU\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
|
||||
|
||||
#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
|
||||
msgid "OK"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
|
||||
#: main.c:702
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:176
|
||||
msgid "I accept this license"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:384
|
||||
msgid "Warning: Unattended installation will start in 10 seconds..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:403
|
||||
msgid "Language selection"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:403
|
||||
msgid "Select the language you wish to use for the installation."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:418
|
||||
msgid "Unattended mode"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:420
|
||||
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:426
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Welcome to the %s installation program.\n"
|
||||
"\n"
|
||||
"Selecting Cancel on any of the following screens will reboot the computer."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:428
|
||||
msgid "Start installation"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:449
|
||||
#, c-format
|
||||
msgid "The installer will now try downloading the installation image."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:452
|
||||
#, c-format
|
||||
msgid ""
|
||||
"No source drive could be found.\n"
|
||||
"\n"
|
||||
"You can try downloading the required installation image."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:456
|
||||
msgid ""
|
||||
"Please make sure to connect your machine to a network and the installer will"
|
||||
" try connect to acquire an IP address."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:460
|
||||
msgid "Download installation image"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:473
|
||||
msgid "Trying to start networking (DHCP)..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:484
|
||||
msgid ""
|
||||
"Networking could not be started but is required to go on with the installation.\n"
|
||||
"\n"
|
||||
"Please connect your machine to a network with a DHCP server and retry."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:487 main.c:516
|
||||
msgid "Retry"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:501
|
||||
msgid "Downloading installation image..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:510
|
||||
#, c-format
|
||||
msgid "MD5 checksum mismatch"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:513
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The installation image could not be downloaded.\n"
|
||||
" Reason: %s\n"
|
||||
"\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:528
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Could not mount %s to %s:\n"
|
||||
" %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:543
|
||||
msgid "License Agreement"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:544
|
||||
msgid "License not accepted!"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:566
|
||||
msgid "No hard disk found."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:587
|
||||
msgid "Disk Selection"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:588
|
||||
msgid ""
|
||||
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
|
||||
"\n"
|
||||
"ALL DATA ON THE DISK WILL BE DESTROYED."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:599
|
||||
msgid ""
|
||||
"No disk has been selected.\n"
|
||||
"\n"
|
||||
"Please select one or more disks you want to install IPFire on."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:617
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The installation program will now prepare the chosen harddisk:\n"
|
||||
"\n"
|
||||
" %s\n"
|
||||
"\n"
|
||||
"Do you agree to continue?"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:619
|
||||
msgid "Disk Setup"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:620 main.c:630
|
||||
msgid "Delete all data"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:627
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
|
||||
"\n"
|
||||
" %s\n"
|
||||
" %s\n"
|
||||
"\n"
|
||||
"Do you agree to continue?"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:629
|
||||
msgid "RAID Setup"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:640
|
||||
msgid "Your disk configuration is currently not supported."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:655
|
||||
msgid "Your harddisk is too small."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:671
|
||||
msgid ""
|
||||
"Your harddisk is very small, but you can continue without a swap partition."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:684
|
||||
msgid "ext4 Filesystem"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:685
|
||||
msgid "ext4 Filesystem without journal"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:686
|
||||
msgid "XFS Filesystem"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:687
|
||||
msgid "ReiserFS Filesystem"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:701
|
||||
msgid "Filesystem Selection"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:701
|
||||
msgid "Please choose your filesystem:"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:712
|
||||
msgid "Building RAID..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:716
|
||||
msgid "Unable to build the RAID."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:728
|
||||
msgid "Partitioning disk..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:732
|
||||
msgid "Unable to partition the disk."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:739
|
||||
msgid "Creating filesystems..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:743
|
||||
msgid "Unable to create filesystems."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:749
|
||||
msgid "Unable to mount filesystems."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:760
|
||||
msgid "Installing the system..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:761
|
||||
msgid "Unable to install the system."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:777
|
||||
msgid "Installing the language cache..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:778
|
||||
msgid "Unable to install the language cache."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:783
|
||||
msgid "Installing the bootloader..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:790
|
||||
msgid "Unable to open /etc/default/grub for writing."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:812
|
||||
msgid "Unable to install the bootloader."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:826
|
||||
msgid ""
|
||||
"A backup file has been found on the installation image.\n"
|
||||
"\n"
|
||||
"Do you want to restore the backup?"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:827
|
||||
msgid "Yes"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:827
|
||||
msgid "No"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:834
|
||||
msgid "An error occured when the backup file was restored."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:869
|
||||
msgid "Running post-install script..."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:870
|
||||
msgid "Post-install script failed."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:877
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s was successfully installed!\n"
|
||||
"\n"
|
||||
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
|
||||
msgstr ""
|
||||
|
||||
#: main.c:882
|
||||
msgid "Congratulations!"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:882
|
||||
msgid "Reboot"
|
||||
msgstr ""
|
||||
|
||||
#: main.c:893
|
||||
msgid "Setup has failed. Press Ok to reboot."
|
||||
msgstr ""
|
||||
@@ -3,6 +3,7 @@
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
#
|
||||
# Translators:
|
||||
# Ersan YILDIRIM <ersan73@gmail.com>, 2015
|
||||
# Kudret Emre <kudretemre@hotmail.com.tr>, 2014
|
||||
# Kudret Emre <kudretemre@hotmail.com.tr>, 2014
|
||||
msgid ""
|
||||
@@ -10,8 +11,8 @@ msgstr ""
|
||||
"Project-Id-Version: IPFire Project\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2014-11-05 01:29+0000\n"
|
||||
"PO-Revision-Date: 2014-12-08 17:24+0000\n"
|
||||
"Last-Translator: Kudret Emre <kudretemre@hotmail.com.tr>\n"
|
||||
"PO-Revision-Date: 2015-02-28 22:11+0000\n"
|
||||
"Last-Translator: Ersan YILDIRIM <ersan73@gmail.com>\n"
|
||||
"Language-Team: Turkish (http://www.transifex.com/projects/p/ipfire/language/tr/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@@ -50,7 +51,7 @@ msgstr "Katılımsız kurulum modu"
|
||||
|
||||
#: main.c:420
|
||||
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
|
||||
msgstr "<Tab>/<Alt-Tab> elementler arası geçiş | <Space> seç | <F12> sonraki ekran"
|
||||
msgstr "<Tab>/<Alt-Tab> düğmeler arası geçiş | <Space> seç | <F12> sonraki ekran"
|
||||
|
||||
#: main.c:426
|
||||
#, c-format
|
||||
@@ -58,16 +59,16 @@ msgid ""
|
||||
"Welcome to the %s installation program.\n"
|
||||
"\n"
|
||||
"Selecting Cancel on any of the following screens will reboot the computer."
|
||||
msgstr "%s yükleme programına hoşgeldiniz.\n\nİlerleyen ekranların herhangi birinde İptal'e tıklamanız bilgisayarınızı yeniden başlatır."
|
||||
msgstr "%s kurulum programına hoş geldiniz.\n\nSonraki ekranların herhangi birinde İptal seçeneğini seçtiğinizde bilgisayar yeniden başlatılac."
|
||||
|
||||
#: main.c:428
|
||||
msgid "Start installation"
|
||||
msgstr "Yüklemeyi başlat"
|
||||
msgstr "Kurulumu Başlat"
|
||||
|
||||
#: main.c:449
|
||||
#, c-format
|
||||
msgid "The installer will now try downloading the installation image."
|
||||
msgstr "Yükleyici şimdi yükleme dosyasını indirmeyi deneyecek."
|
||||
msgstr "Yükleyici şimdi kurulum dosyasını indirmeyi deneyecek."
|
||||
|
||||
#: main.c:452
|
||||
#, c-format
|
||||
@@ -75,17 +76,17 @@ msgid ""
|
||||
"No source drive could be found.\n"
|
||||
"\n"
|
||||
"You can try downloading the required installation image."
|
||||
msgstr "Hiçbir kaynak sürücüsü bulunamadı.\n\nGerekli yükleme dosyasını indirmeyi deneyebilirsiniz."
|
||||
msgstr "Hiçbir kaynak sürücüsü bulunamadı.\n\nGerekli kurulum dosyasını indirmeyi deneyebilirsiniz."
|
||||
|
||||
#: main.c:456
|
||||
msgid ""
|
||||
"Please make sure to connect your machine to a network and the installer will"
|
||||
" try connect to acquire an IP address."
|
||||
msgstr ""
|
||||
msgstr "Makinenizi bir ağa bağladığınıza emin olun ve yükleyiciye IP adresini elle girerek bağlanmayı tekrar deneyin."
|
||||
|
||||
#: main.c:460
|
||||
msgid "Download installation image"
|
||||
msgstr "Yükleme dosyasını indir"
|
||||
msgstr "Kurulum dosyasını indir"
|
||||
|
||||
#: main.c:473
|
||||
msgid "Trying to start networking (DHCP)..."
|
||||
@@ -125,7 +126,7 @@ msgstr "Yükleme dosyası indirilemedi.\nSebep: %s\n\n%s"
|
||||
msgid ""
|
||||
"Could not mount %s to %s:\n"
|
||||
" %s\n"
|
||||
msgstr ""
|
||||
msgstr "Bağlanamadı: %s - %s:\n%s\n\n"
|
||||
|
||||
#: main.c:543
|
||||
msgid "License Agreement"
|
||||
@@ -173,7 +174,7 @@ msgstr "Disk Kurulumu"
|
||||
|
||||
#: main.c:620 main.c:630
|
||||
msgid "Delete all data"
|
||||
msgstr "Tüm veriyi sil"
|
||||
msgstr "Tüm Veriyi Sil"
|
||||
|
||||
#: main.c:627
|
||||
#, c-format
|
||||
@@ -221,7 +222,7 @@ msgstr "ReiserFS Dosya sistemi"
|
||||
|
||||
#: main.c:701
|
||||
msgid "Filesystem Selection"
|
||||
msgstr "Dosya sistemi Seçimi"
|
||||
msgstr "Dosya Sistemi Seçimi"
|
||||
|
||||
#: main.c:701
|
||||
msgid "Please choose your filesystem:"
|
||||
@@ -288,7 +289,7 @@ msgid ""
|
||||
"A backup file has been found on the installation image.\n"
|
||||
"\n"
|
||||
"Do you want to restore the backup?"
|
||||
msgstr "Yükleme dosyasında bir yedekleme dosyası bulundu.\n\nYedeği geri yüklemek ister misiniz?"
|
||||
msgstr "Kurulum dosyasında bir yedek dosyası bulundu.\n\nYedeği geri yüklemek ister misiniz?"
|
||||
|
||||
#: main.c:827
|
||||
msgid "Yes"
|
||||
@@ -304,11 +305,11 @@ msgstr "Yedek dosyası geri yüklenirken bir hata oluştu."
|
||||
|
||||
#: main.c:869
|
||||
msgid "Running post-install script..."
|
||||
msgstr "post-install betiği çalıştırılıyor..."
|
||||
msgstr "Post-install betiği çalıştırılıyor..."
|
||||
|
||||
#: main.c:870
|
||||
msgid "Post-install script failed."
|
||||
msgstr "post-install betiği başarısız oldu."
|
||||
msgstr "Post-install betiği başarısız oldu."
|
||||
|
||||
#: main.c:877
|
||||
#, c-format
|
||||
@@ -316,7 +317,7 @@ msgid ""
|
||||
"%s was successfully installed!\n"
|
||||
"\n"
|
||||
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
|
||||
msgstr "%s başarıyla yüklendi!\n\nLütfen yükleme ortamlarını bu sistemden çıkarın ve yeniden başlatma butonuna tıklayın. Sistem yeniden başlatıldığında ağ ve sistem şifrenizi ayarlamanız istenecek. Daha sonra web yapılandırma konsoluna gitmek için yarayıcınızdan https://%s:444 (veya %s yerine ne isim verdiyseniz) adresine gidin."
|
||||
msgstr "%s başarıyla yüklendi!\n\nLütfen yükleme ortamını sistemden çıkarın ve Yeniden Başlat düğmesine tıklayın. Sistem yeniden başlatıldığında ağ kartları, ağ ve sistem parolalarını yapılandırabileceğiniz programı çalıştıracaktır. Kurulum tamamlandıktan sonra bir internet tarayıcısı açıp yapılandırma sayfasına gitmek için adres satırına https://%s:444 (veya %s yerine ne ad verdiyseniz) adresini girin."
|
||||
|
||||
#: main.c:882
|
||||
msgid "Congratulations!"
|
||||
@@ -324,8 +325,8 @@ msgstr "Tebrikler!"
|
||||
|
||||
#: main.c:882
|
||||
msgid "Reboot"
|
||||
msgstr "Yeniden başlat."
|
||||
msgstr "Yeniden Başlat"
|
||||
|
||||
#: main.c:893
|
||||
msgid "Setup has failed. Press Ok to reboot."
|
||||
msgstr "Kurulum başarısız oldu. Yeniden başlatmak için Tamam'a basın."
|
||||
msgstr "Kurulum başarısız oldu. Yeniden başlatmak için Tamam düğmesine basın."
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
#!/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) 2008 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
|
||||
[ -d /opt/teamspeak ] || mkdir -p /opt/teamspeak
|
||||
|
||||
cd /tmp
|
||||
wget -c ftp://ftp.freenet.de/pub/4players/teamspeak.org/releases/ts2_server_rc2_202319.tar.bz2 \
|
||||
ftp://ftp.freenet.de/pub/4players/teamspeak.org/developer/server/202401/server_linux
|
||||
|
||||
tar xvfj ts2_server_rc2_202319.tar.bz2 -C /tmp
|
||||
|
||||
cp -av /tmp/tss2_rc2/* /opt/teamspeak
|
||||
mv /tmp/server_linux /opt/teamspeak/server_linux
|
||||
chmod 755 -v /opt/teamspeak/server_linux
|
||||
|
||||
rm -rf /tmp/tss2_rc2 ts2_server_rc2_202319.tar.bz2
|
||||
|
||||
groupadd teamspeak
|
||||
useradd -g teamspeak teamspeak
|
||||
|
||||
chown teamspeak.teamspeak /opt/teamspeak -Rv
|
||||
|
||||
restore_backup ${NAME}
|
||||
start_service --background ${NAME}
|
||||
|
||||
ln -sf ../init.d/teamspeak /etc/rc.d/rc0.d/K00teamspeak
|
||||
ln -sf ../init.d/teamspeak /etc/rc.d/rc3.d/S99teamspeak
|
||||
ln -sf ../init.d/teamspeak /etc/rc.d/rc6.d/K00teamspeak
|
||||
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
#!/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
|
||||
stop_service ${NAME}
|
||||
|
||||
if [ ! -e "/var/ipfire/backup/addons/includes/teamspeak" ]; then
|
||||
echo /opt/teamspeak/bad_names.txt > /var/ipfire/backup/addons/includes/teamspeak
|
||||
echo /opt/teamspeak/server.dbs >> /var/ipfire/backup/addons/includes/teamspeak
|
||||
echo /opt/teamspeak/server.ini >> /var/ipfire/backup/addons/includes/teamspeak
|
||||
echo /opt/teamspeak/server.log >> /var/ipfire/backup/addons/includes/teamspeak
|
||||
echo /opt/teamspeak/whitelist.txt >> /var/ipfire/backup/addons/includes/teamspeak
|
||||
fi
|
||||
make_backup ${NAME}
|
||||
rm -rf /opt/teamspeak
|
||||
userdel teamspeak
|
||||
rm -rf /etc/rc.d/rc*.d/*teamspeak
|
||||
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
#!/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
|
||||
12
src/patches/clamav/llvm-glibc.patch
Normal file
12
src/patches/clamav/llvm-glibc.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
Index: clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
|
||||
===================================================================
|
||||
--- clamav-0.97.3.orig/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
|
||||
+++ clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
|
||||
@@ -52,6 +52,7 @@ static void runAtExitHandlers() {
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
#include <fcntl.h>
|
||||
+#include <unistd.h>
|
||||
/* stat functions are redirecting to __xstat with a version number. On x86-64
|
||||
* linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make 'stat'
|
||||
* available as an exported symbol, so we have to add it explicitly.
|
||||
@@ -0,0 +1,23 @@
|
||||
From f2658275b25ebfe691cdcb9fede85a3088cca168 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Kelley <simon@thekelleys.org.uk>
|
||||
Date: Thu, 25 Sep 2014 21:51:25 +0100
|
||||
Subject: [PATCH 01/55] Add newline at the end of example config file.
|
||||
|
||||
---
|
||||
dnsmasq.conf.example | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example
|
||||
index 83924fc4a9b4..6b00bd34fbb5 100644
|
||||
--- a/dnsmasq.conf.example
|
||||
+++ b/dnsmasq.conf.example
|
||||
@@ -645,4 +645,4 @@
|
||||
#conf-dir=/etc/dnsmasq.d,.bak
|
||||
|
||||
# Include all files in a directory which end in .conf
|
||||
-#conf-dir=/etc/dnsmasq.d/*.conf
|
||||
\ No newline at end of file
|
||||
+#conf-dir=/etc/dnsmasq.d/*.conf
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
From 00cd9d551998307225312fd21f761cfa8868bd2c Mon Sep 17 00:00:00 2001
|
||||
From: Simon Kelley <simon@thekelleys.org.uk>
|
||||
Date: Thu, 2 Oct 2014 21:44:21 +0100
|
||||
Subject: [PATCH 02/55] crash at startup when an empty suffix is supplied to
|
||||
--conf-dir
|
||||
|
||||
---
|
||||
CHANGELOG | 6 ++++++
|
||||
src/option.c | 38 +++++++++++++++++++++++---------------
|
||||
2 files changed, 29 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/CHANGELOG b/CHANGELOG
|
||||
index 768e2aaca42a..13ab41c05fc3 100644
|
||||
--- a/CHANGELOG
|
||||
+++ b/CHANGELOG
|
||||
@@ -1,3 +1,9 @@
|
||||
+version 2.73
|
||||
+ Fix crash at startup when an empty suffix is supplied to
|
||||
+ --conf-dir, also trivial memory leak. Thanks to
|
||||
+ Tomas Hozza for spotting this.
|
||||
+
|
||||
+
|
||||
version 2.72
|
||||
Add ra-advrouter mode, for RFC-3775 mobile IPv6 support.
|
||||
|
||||
diff --git a/src/option.c b/src/option.c
|
||||
index 45d8875fb7f9..b08e98e16f84 100644
|
||||
--- a/src/option.c
|
||||
+++ b/src/option.c
|
||||
@@ -1474,22 +1474,25 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
||||
for (arg = comma; arg; arg = comma)
|
||||
{
|
||||
comma = split(arg);
|
||||
- li = opt_malloc(sizeof(struct list));
|
||||
- if (*arg == '*')
|
||||
+ if (strlen(arg) != 0)
|
||||
{
|
||||
- li->next = match_suffix;
|
||||
- match_suffix = li;
|
||||
- /* Have to copy: buffer is overwritten */
|
||||
- li->suffix = opt_string_alloc(arg+1);
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- li->next = ignore_suffix;
|
||||
- ignore_suffix = li;
|
||||
- /* Have to copy: buffer is overwritten */
|
||||
- li->suffix = opt_string_alloc(arg);
|
||||
+ li = opt_malloc(sizeof(struct list));
|
||||
+ if (*arg == '*')
|
||||
+ {
|
||||
+ li->next = match_suffix;
|
||||
+ match_suffix = li;
|
||||
+ /* Have to copy: buffer is overwritten */
|
||||
+ li->suffix = opt_string_alloc(arg+1);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ li->next = ignore_suffix;
|
||||
+ ignore_suffix = li;
|
||||
+ /* Have to copy: buffer is overwritten */
|
||||
+ li->suffix = opt_string_alloc(arg);
|
||||
+ }
|
||||
}
|
||||
- };
|
||||
+ }
|
||||
|
||||
if (!(dir_stream = opendir(directory)))
|
||||
die(_("cannot access directory %s: %s"), directory, EC_FILE);
|
||||
@@ -1555,7 +1558,12 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
||||
free(ignore_suffix->suffix);
|
||||
free(ignore_suffix);
|
||||
}
|
||||
-
|
||||
+ for(; match_suffix; match_suffix = li)
|
||||
+ {
|
||||
+ li = match_suffix->next;
|
||||
+ free(match_suffix->suffix);
|
||||
+ free(match_suffix);
|
||||
+ }
|
||||
break;
|
||||
}
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
From 6ac3bc0452a74e16e3d620a0757b0f8caab182ec Mon Sep 17 00:00:00 2001
|
||||
From: Simon Kelley <simon@thekelleys.org.uk>
|
||||
Date: Fri, 3 Oct 2014 08:48:11 +0100
|
||||
Subject: [PATCH 03/55] Debian build fixes for kFreeBSD
|
||||
|
||||
---
|
||||
src/tables.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/tables.c b/src/tables.c
|
||||
index 834f11944cd0..dcdef794c4d2 100644
|
||||
--- a/src/tables.c
|
||||
+++ b/src/tables.c
|
||||
@@ -20,6 +20,10 @@
|
||||
|
||||
#if defined(HAVE_IPSET) && defined(HAVE_BSD_NETWORK)
|
||||
|
||||
+#ifndef __FreeBSD__
|
||||
+#include <bsd/string.h>
|
||||
+#endif
|
||||
+
|
||||
#include <sys/types.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
@@ -136,7 +140,7 @@ int add_to_ipset(const char *setname, const struct all_addr *ipaddr,
|
||||
return -1;
|
||||
}
|
||||
|
||||
- if (rc = pfr_add_tables(&table, 1, &n, 0))
|
||||
+ if ((rc = pfr_add_tables(&table, 1, &n, 0)))
|
||||
{
|
||||
my_syslog(LOG_WARNING, _("warning: pfr_add_tables: %s(%d)"),
|
||||
pfr_strerror(errno),rc);
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
From e9828b6f66b22ce8873f8d30a773137d1aef1b92 Mon Sep 17 00:00:00 2001
|
||||
From: Karl Vogel <karl.vogel@gmail.com>
|
||||
Date: Fri, 3 Oct 2014 21:45:15 +0100
|
||||
Subject: [PATCH 04/55] Set conntrack mark before connect() call.
|
||||
|
||||
SO_MARK has to be done before issuing the connect() call on the
|
||||
TCP socket.
|
||||
---
|
||||
src/forward.c | 36 ++++++++++++++++++------------------
|
||||
1 file changed, 18 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/src/forward.c b/src/forward.c
|
||||
index 4895efeba89a..2cf29eba6e26 100644
|
||||
--- a/src/forward.c
|
||||
+++ b/src/forward.c
|
||||
@@ -1796,6 +1796,24 @@ unsigned char *tcp_request(int confd, time_t now,
|
||||
if ((last_server->tcpfd = socket(last_server->addr.sa.sa_family, SOCK_STREAM, 0)) == -1)
|
||||
continue;
|
||||
|
||||
+#ifdef HAVE_CONNTRACK
|
||||
+ /* Copy connection mark of incoming query to outgoing connection. */
|
||||
+ if (option_bool(OPT_CONNTRACK))
|
||||
+ {
|
||||
+ unsigned int mark;
|
||||
+ struct all_addr local;
|
||||
+#ifdef HAVE_IPV6
|
||||
+ if (local_addr->sa.sa_family == AF_INET6)
|
||||
+ local.addr.addr6 = local_addr->in6.sin6_addr;
|
||||
+ else
|
||||
+#endif
|
||||
+ local.addr.addr4 = local_addr->in.sin_addr;
|
||||
+
|
||||
+ if (get_incoming_mark(&peer_addr, &local, 1, &mark))
|
||||
+ setsockopt(last_server->tcpfd, SOL_SOCKET, SO_MARK, &mark, sizeof(unsigned int));
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
if ((!local_bind(last_server->tcpfd, &last_server->source_addr, last_server->interface, 1) ||
|
||||
connect(last_server->tcpfd, &last_server->addr.sa, sa_len(&last_server->addr)) == -1))
|
||||
{
|
||||
@@ -1820,24 +1838,6 @@ unsigned char *tcp_request(int confd, time_t now,
|
||||
size = new_size;
|
||||
}
|
||||
#endif
|
||||
-
|
||||
-#ifdef HAVE_CONNTRACK
|
||||
- /* Copy connection mark of incoming query to outgoing connection. */
|
||||
- if (option_bool(OPT_CONNTRACK))
|
||||
- {
|
||||
- unsigned int mark;
|
||||
- struct all_addr local;
|
||||
-#ifdef HAVE_IPV6
|
||||
- if (local_addr->sa.sa_family == AF_INET6)
|
||||
- local.addr.addr6 = local_addr->in6.sin6_addr;
|
||||
- else
|
||||
-#endif
|
||||
- local.addr.addr4 = local_addr->in.sin_addr;
|
||||
-
|
||||
- if (get_incoming_mark(&peer_addr, &local, 1, &mark))
|
||||
- setsockopt(last_server->tcpfd, SOL_SOCKET, SO_MARK, &mark, sizeof(unsigned int));
|
||||
- }
|
||||
-#endif
|
||||
}
|
||||
|
||||
*length = htons(size);
|
||||
--
|
||||
2.1.0
|
||||
|
||||
26
src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch
Normal file
26
src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch
Normal file
@@ -0,0 +1,26 @@
|
||||
From 17b475912f6a4e72797a543dad59d4d5dde6bb1b Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Collins <daniel.collins@smoothwall.net>
|
||||
Date: Fri, 3 Oct 2014 21:58:43 +0100
|
||||
Subject: [PATCH 05/55] Fix typo in new Dbus code.
|
||||
|
||||
Simon's fault.
|
||||
---
|
||||
src/dbus.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/dbus.c b/src/dbus.c
|
||||
index 15fed906bd90..a2a94dc85dac 100644
|
||||
--- a/src/dbus.c
|
||||
+++ b/src/dbus.c
|
||||
@@ -426,7 +426,7 @@ static DBusMessage *dbus_set_bool(DBusMessage *message, int flag, char *name)
|
||||
}
|
||||
else
|
||||
{
|
||||
- my_syslog(LOG_INFO, "Disabling --$s option from D-Bus", name);
|
||||
+ my_syslog(LOG_INFO, "Disabling --%s option from D-Bus", name);
|
||||
reset_option_bool(flag);
|
||||
}
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
||||
22
src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch
Normal file
22
src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
From 3d9d2dd0018603a2ae4b9cd65ac6ff959f4fd8c7 Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Hozza <thozza@redhat.com>
|
||||
Date: Mon, 6 Oct 2014 10:46:48 +0100
|
||||
Subject: [PATCH 06/55] Fit example conf file typo.
|
||||
|
||||
---
|
||||
dnsmasq.conf.example | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example
|
||||
index 6b00bd34fbb5..1bd305dbdbad 100644
|
||||
--- a/dnsmasq.conf.example
|
||||
+++ b/dnsmasq.conf.example
|
||||
@@ -645,4 +645,4 @@
|
||||
#conf-dir=/etc/dnsmasq.d,.bak
|
||||
|
||||
# Include all files in a directory which end in .conf
|
||||
-#conf-dir=/etc/dnsmasq.d/*.conf
|
||||
+#conf-dir=/etc/dnsmasq.d/,*.conf
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
From b9ff5c8f435173cfa616e3c398bdc089ef690a07 Mon Sep 17 00:00:00 2001
|
||||
From: Vladislav Grishenko <themiron@mail.ru>
|
||||
Date: Mon, 6 Oct 2014 14:34:24 +0100
|
||||
Subject: [PATCH 07/55] Improve RFC-compliance when unable to supply addresses
|
||||
in DHCPv6
|
||||
|
||||
While testing https://github.com/sbyx/odhcp6c client I have noticed it
|
||||
permanently crashes after startup.
|
||||
|
||||
The reason was it (odhcp6c) doesn't expect empty IA options in ADVERTISE
|
||||
message without any suboptions.
|
||||
|
||||
Despite this validation bug of odhcp6c, dnsmasq should not generate
|
||||
ADVERTISE messages with IA if there's nothing to advert per RFC 3315
|
||||
17.2.2:
|
||||
|
||||
If the server will not assign any addresses to any IAs in a
|
||||
|
||||
subsequent Request from the client, the server MUST send an Advertise
|
||||
|
||||
message to the client that includes only a Status Code option with
|
||||
|
||||
code NoAddrsAvail and a status message for the user, a Server
|
||||
|
||||
Identifier option with the server's DUID, and a Client Identifier
|
||||
|
||||
option with the client's DUID.
|
||||
|
||||
Meanwhile it's need to add status code for every IA in REPLY message per
|
||||
RFC3315 18.2.1:
|
||||
|
||||
If the server cannot assign any addresses to an IA in the message
|
||||
from the client, the server MUST include the IA in the Reply message
|
||||
with no addresses in the IA and a Status Code option in the IA
|
||||
containing status code NoAddrsAvail.
|
||||
|
||||
So, I've changed the logic to skip IA completely from ADVERTISE messages and
|
||||
to add NoAddrsAvail subcode into IA of REPLY messages.
|
||||
|
||||
As for overhead, yes, I believe it's ok to return NoAddrsAvail twice in IA
|
||||
and in global section for compatibility with all old and new clients.
|
||||
---
|
||||
src/rfc3315.c | 27 +++++++++++++++++++++++++--
|
||||
1 file changed, 25 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/rfc3315.c b/src/rfc3315.c
|
||||
index 5ebf09d50ac1..ddb390bf1136 100644
|
||||
--- a/src/rfc3315.c
|
||||
+++ b/src/rfc3315.c
|
||||
@@ -691,6 +691,8 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
|
||||
#endif
|
||||
|
||||
o = build_ia(state, &t1cntr);
|
||||
+ if (address_assigned)
|
||||
+ address_assigned = 2;
|
||||
|
||||
for (ia_counter = 0; ia_option; ia_counter++, ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24))
|
||||
{
|
||||
@@ -781,6 +783,27 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
|
||||
address_assigned = 1;
|
||||
}
|
||||
|
||||
+ if (address_assigned != 1)
|
||||
+ {
|
||||
+ /* If the server will not assign any addresses to any IAs in a
|
||||
+ subsequent Request from the client, the server MUST send an Advertise
|
||||
+ message to the client that doesn't include any IA options. */
|
||||
+ if (!state->lease_allocate)
|
||||
+ {
|
||||
+ save_counter(o);
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ /* If the server cannot assign any addresses to an IA in the message
|
||||
+ from the client, the server MUST include the IA in the Reply message
|
||||
+ with no addresses in the IA and a Status Code option in the IA
|
||||
+ containing status code NoAddrsAvail. */
|
||||
+ o1 = new_opt6(OPTION6_STATUS_CODE);
|
||||
+ put_opt6_short(DHCP6NOADDRS);
|
||||
+ put_opt6_string(_("address unavailable"));
|
||||
+ end_opt6(o1);
|
||||
+ }
|
||||
+
|
||||
end_ia(t1cntr, min_time, 0);
|
||||
end_opt6(o);
|
||||
}
|
||||
@@ -806,7 +829,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
|
||||
put_opt6_short(DHCP6NOADDRS);
|
||||
put_opt6_string(_("no addresses available"));
|
||||
end_opt6(o1);
|
||||
- log6_packet(state, "DHCPADVERTISE", NULL, _("no addresses available"));
|
||||
+ log6_packet(state, state->lease_allocate ? "DHCPREPLY" : "DHCPADVERTISE", NULL, _("no addresses available"));
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -862,7 +885,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
|
||||
{
|
||||
/* Static range, not configured. */
|
||||
o1 = new_opt6(OPTION6_STATUS_CODE);
|
||||
- put_opt6_short(DHCP6UNSPEC);
|
||||
+ put_opt6_short(DHCP6NOADDRS);
|
||||
put_opt6_string(_("address unavailable"));
|
||||
end_opt6(o1);
|
||||
}
|
||||
--
|
||||
2.1.0
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user