[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. cb92b363cf92326475df69ccee1684f3ae47b997
by git＠ipfire.org 31 Oct '13
by git＠ipfire.org 31 Oct '13
31 Oct '13
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, fifteen has been updated
via cb92b363cf92326475df69ccee1684f3ae47b997 (commit)
via 12b901f84668f0b4bfd9e3376547e644a83a6126 (commit)
via 11ab2c7d9a5b91cbc3092defe1a32572acd0ba6d (commit)
via 68f6312ac54728c20c08d1f100bc948e6f6a689e (commit)
from c03d4a5e8a37c6fcbee55c5b7efa8930f9c98351 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cb92b363cf92326475df69ccee1684f3ae47b997
Merge: 12b901f 11ab2c7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 31 15:35:34 2013 +0100
Merge remote-tracking branch 'amarx/firewall-fifteen' into fifteen
commit 12b901f84668f0b4bfd9e3376547e644a83a6126
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 31 15:34:40 2013 +0100
firewall: Fix wrong symbol for variable.
commit 11ab2c7d9a5b91cbc3092defe1a32572acd0ba6d
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Wed Oct 30 15:49:21 2013 +0100
Firewall: added IP-Address to dropdown in DNAT part and now all ip-addresses are in brackets
commit 68f6312ac54728c20c08d1f100bc948e6f6a689e
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Wed Oct 30 13:41:33 2013 +0100
Firewall: Show IP-Adresses in NAT-Source dropdown
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/general-functions.pl | 6 ++++++
html/cgi-bin/firewall.cgi | 11 ++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 48d68a2..778a39b 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -51,19 +51,23 @@ sub setup_default_networks
$defaultNetworks->{$Lang::tr{'fwhost any'}}{'NAME'} = "ALL";
$defaultNetworks->{$Lang::tr{'green'}}{'IPT'} = "$netsettings{'GREEN_NETADDRESS'}/$netsettings{'GREEN_NETMASK'}";
+ $defaultNetworks->{$Lang::tr{'green'}}{'NET'} = "$netsettings{'GREEN_ADDRESS'}";
$defaultNetworks->{$Lang::tr{'green'}}{'NAME'} = "GREEN";
if ($netsettings{'RED_DEV'} ne ''){
$defaultNetworks->{$Lang::tr{'fwdfw red'}}{'IPT'} = "$netsettings{'RED_NETADDRESS'}/$netsettings{'RED_NETMASK'}";
+ $defaultNetworks->{$Lang::tr{'fwdfw red'}}{'NET'} = "$netsettings{'RED_ADDRESS'}";
$defaultNetworks->{$Lang::tr{'fwdfw red'}}{'NAME'} = "RED";
}
if ($netsettings{'ORANGE_DEV'} ne ''){
$defaultNetworks->{$Lang::tr{'orange'}}{'IPT'} = "$netsettings{'ORANGE_NETADDRESS'}/$netsettings{'ORANGE_NETMASK'}";
+ $defaultNetworks->{$Lang::tr{'orange'}}{'NET'} = "$netsettings{'ORANGE_ADDRESS'}";
$defaultNetworks->{$Lang::tr{'orange'}}{'NAME'} = "ORANGE";
}
if ($netsettings{'BLUE_DEV'} ne ''){
$defaultNetworks->{$Lang::tr{'blue'}}{'IPT'} = "$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}";
+ $defaultNetworks->{$Lang::tr{'blue'}}{'NET'} = "$netsettings{'BLUE_ADDRESS'}";
$defaultNetworks->{$Lang::tr{'blue'}}{'NAME'} = "BLUE";
}
@@ -98,6 +102,7 @@ sub setup_default_networks
my @tempipsecsubnet = split("\/", $ipsecsettings{'RW_NET'});
$defaultNetworks->{'IPsec RW ' .$ip."/".$sub}{'ADR'} = $tempipsecsubnet[0];
$defaultNetworks->{'IPsec RW ' .$ip."/".$sub}{'NAME'} = "IPsec RW";
+ $defaultNetworks->{'IPsec RW ' .$ip."/".$sub}{'NET'} = &getnextip($ip);
}
}
}
@@ -118,6 +123,7 @@ sub get_aliases
$temp[2] = "Alias $ctr : $temp[0]";
}
$defaultNetworks->{$temp[2]}{'IPT'} = "$temp[0]";
+ $defaultNetworks->{$temp[2]}{'NET'} = "$temp[0]";
$ctr++;
}
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 8deeb1c..0b7c6fc 100755
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1685,10 +1685,10 @@ END
<td width='25%' align='right'>$Lang::tr{'dnat address'}:</td>
<td width='30%'>
<select name='dnat' style='width: 100%;'>
- <option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'default ip'}</option>
+ <option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'default ip'} ($netsettings{'RED_ADDRESS'})</option>
END
foreach my $alias (sort keys %aliases) {
- print "<option value='$alias' $selected{'dnat'}{$alias}>$alias</option>";
+ print "<option value='$alias' $selected{'dnat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
}
print "</select>";
@@ -1717,7 +1717,7 @@ END
END
foreach my $alias (sort keys %aliases) {
- print "<option value='$alias' $selected{'snat'}{$alias}>$alias</option>";
+ print "<option value='$alias' $selected{'snat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
}
# XXX this is composed in a very ugly fashion
@@ -1725,10 +1725,11 @@ END
next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
next if($defaultNetworks{$network}{'NAME'} eq "ALL");
next if($defaultNetworks{$network}{'NAME'} =~ /OpenVPN/i);
+ next if($defaultNetworks{$network}{'NAME'} =~ /IPsec/i);
print "<option value='$defaultNetworks{$network}{'NAME'}'";
print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
- print ">$network</option>";
+ print ">$network ($defaultNetworks{$network}{'NET'})</option>";
}
print <<END;
@@ -2814,7 +2815,7 @@ END
print <<END;
<tr>
<td align='center'>
- <font color="&Header::colourblue">$Lang::tr{'blue'}</font>
+ <font color="$Header::colourblue">$Lang::tr{'blue'}</font>
</td>
<td align='center'>
<font color="$Header::colourred">$Lang::tr{'red'}</font>
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. c03d4a5e8a37c6fcbee55c5b7efa8930f9c98351
by git＠ipfire.org 29 Oct '13
by git＠ipfire.org 29 Oct '13
29 Oct '13
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, fifteen has been updated
via c03d4a5e8a37c6fcbee55c5b7efa8930f9c98351 (commit)
via bee56a2d5d1d901b93b2a72d5d855a2b3bb49f2b (commit)
via 2a6e9ae967cd13e136cb563622236c979ba788c6 (commit)
via e9a056234592750a42ff82c12e858069b32ab82e (commit)
via daf400fa4d61a02eb17e24d29be01d2bbaa35f31 (commit)
from 85860aff263c41a74ff274fca2998e941b9134f6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c03d4a5e8a37c6fcbee55c5b7efa8930f9c98351
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 29 18:45:40 2013 +0100
firewall: Simplify code which shows the last rule.
Also change headings of the rule sections.
commit bee56a2d5d1d901b93b2a72d5d855a2b3bb49f2b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 29 16:57:58 2013 +0100
firewall: NAT section: Don't show irrelevant controls.
commit 2a6e9ae967cd13e136cb563622236c979ba788c6
Merge: e9a0562 daf400f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 29 16:23:35 2013 +0100
Merge remote-tracking branch 'amarx/firewall-fifteen' into fifteen
commit e9a056234592750a42ff82c12e858069b32ab82e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 29 16:22:13 2013 +0100
P2P block: Add notice that the user will reload the firewall ruleset.
commit daf400fa4d61a02eb17e24d29be01d2bbaa35f31
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Tue Oct 29 08:34:42 2013 +0100
Firewall: fixed untranslated Strings
-----------------------------------------------------------------------
Summary of changes:
doc/language_issues.de | 8 +-
doc/language_issues.en | 8 +-
doc/language_issues.es | 19 ++-
doc/language_issues.fr | 19 ++-
doc/language_issues.nl | 19 ++-
doc/language_issues.pl | 19 ++-
doc/language_issues.ru | 19 ++-
doc/language_issues.tr | 19 ++-
doc/language_missings | 44 ++++++
html/cgi-bin/firewall.cgi | 344 +++++++++++++++++++++++++++++----------------
html/cgi-bin/p2p-block.cgi | 129 +++++++++--------
langs/de/cgi-bin/de.pl | 8 ++
langs/en/cgi-bin/en.pl | 8 ++
13 files changed, 427 insertions(+), 236 deletions(-)
Difference in files:
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 3393acd..c36be8a 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -164,7 +164,6 @@ WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
-WARNING: translation string unused: external access
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
WARNING: translation string unused: extrahd unable to write
@@ -189,16 +188,18 @@ WARNING: translation string unused: from warn email bad
WARNING: translation string unused: fwdfw MODE1
WARNING: translation string unused: fwdfw MODE2
WARNING: translation string unused: fwdfw err tgt_port
-WARNING: translation string unused: fwdfw external port nat
+WARNING: translation string unused: fwdfw final_rule
WARNING: translation string unused: fwdfw from
WARNING: translation string unused: fwdfw ipsec network
WARNING: translation string unused: fwdfw man port
WARNING: translation string unused: fwdfw natport used
+WARNING: translation string unused: fwdfw p2p txt
WARNING: translation string unused: fwdfw rule action
WARNING: translation string unused: fwdfw rules
WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
WARNING: translation string unused: fwdfw time
+WARNING: translation string unused: fwdfw xt access
WARNING: translation string unused: fwhost addrule
WARNING: translation string unused: fwhost attention
WARNING: translation string unused: fwhost blue
@@ -210,6 +211,7 @@ WARNING: translation string unused: fwhost green
WARNING: translation string unused: fwhost ipadr
WARNING: translation string unused: fwhost ipsec host
WARNING: translation string unused: fwhost orange
+WARNING: translation string unused: fwhost reread
WARNING: translation string unused: fwhost reset
WARNING: translation string unused: fwhost wo subnet
WARNING: translation string unused: gen static key
@@ -346,7 +348,6 @@ WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: our donors
WARNING: translation string unused: out
-WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall mode0
WARNING: translation string unused: outgoing firewall mode1
WARNING: translation string unused: outgoing firewall mode2
@@ -386,7 +387,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
WARNING: translation string unused: polfile
-WARNING: translation string unused: policy
WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 77e825d..97da599 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -187,7 +187,6 @@ WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
-WARNING: translation string unused: external access
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
WARNING: translation string unused: extrahd unable to write
@@ -212,16 +211,18 @@ WARNING: translation string unused: from warn email bad
WARNING: translation string unused: fwdfw MODE1
WARNING: translation string unused: fwdfw MODE2
WARNING: translation string unused: fwdfw err tgt_port
-WARNING: translation string unused: fwdfw external port nat
+WARNING: translation string unused: fwdfw final_rule
WARNING: translation string unused: fwdfw from
WARNING: translation string unused: fwdfw ipsec network
WARNING: translation string unused: fwdfw man port
WARNING: translation string unused: fwdfw natport used
+WARNING: translation string unused: fwdfw p2p txt
WARNING: translation string unused: fwdfw rule action
WARNING: translation string unused: fwdfw rules
WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
WARNING: translation string unused: fwdfw time
+WARNING: translation string unused: fwdfw xt access
WARNING: translation string unused: fwhost addrule
WARNING: translation string unused: fwhost attention
WARNING: translation string unused: fwhost blue
@@ -233,6 +234,7 @@ WARNING: translation string unused: fwhost green
WARNING: translation string unused: fwhost ipadr
WARNING: translation string unused: fwhost ipsec host
WARNING: translation string unused: fwhost orange
+WARNING: translation string unused: fwhost reread
WARNING: translation string unused: fwhost reset
WARNING: translation string unused: fwhost wo subnet
WARNING: translation string unused: g.dtm
@@ -373,7 +375,6 @@ WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: our donors
WARNING: translation string unused: out
-WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall mode0
WARNING: translation string unused: outgoing firewall mode1
WARNING: translation string unused: outgoing firewall mode2
@@ -413,7 +414,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
WARNING: translation string unused: polfile
-WARNING: translation string unused: policy
WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 6faff27..163b9f2 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -186,7 +186,6 @@ WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
-WARNING: translation string unused: external access
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
WARNING: translation string unused: extrahd unable to write
@@ -342,7 +341,6 @@ WARNING: translation string unused: or
WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: out
-WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall mode0
WARNING: translation string unused: outgoing firewall mode1
WARNING: translation string unused: outgoing firewall mode2
@@ -380,7 +378,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
WARNING: translation string unused: polfile
-WARNING: translation string unused: policy
WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
@@ -593,7 +590,9 @@ WARNING: untranslated string: ccd none
WARNING: untranslated string: ccd routes
WARNING: untranslated string: ccd subnet
WARNING: untranslated string: ccd used
+WARNING: untranslated string: default ip
WARNING: untranslated string: deprecated fs warn
+WARNING: untranslated string: dnat address
WARNING: untranslated string: dnsforward
WARNING: untranslated string: dnsforward add a new entry
WARNING: untranslated string: dnsforward configuration
@@ -624,6 +623,7 @@ WARNING: untranslated string: fireinfo why descr2
WARNING: untranslated string: fireinfo why enable
WARNING: untranslated string: fireinfo why read more
WARNING: untranslated string: fireinfo your profile id
+WARNING: untranslated string: firewall rules
WARNING: untranslated string: fw default drop
WARNING: untranslated string: fw settings
WARNING: untranslated string: fw settings color
@@ -659,20 +659,23 @@ WARNING: untranslated string: fwdfw err tgt_addr
WARNING: untranslated string: fwdfw err tgt_grp
WARNING: untranslated string: fwdfw err tgt_mac
WARNING: untranslated string: fwdfw err time
-WARNING: untranslated string: fwdfw final_rule
+WARNING: untranslated string: fwdfw external port nat
WARNING: untranslated string: fwdfw hint ip1
WARNING: untranslated string: fwdfw hint ip2
+WARNING: untranslated string: fwdfw iface
+WARNING: untranslated string: fwdfw log
WARNING: untranslated string: fwdfw log rule
WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
WARNING: untranslated string: fwdfw newrule
-WARNING: untranslated string: fwdfw p2p txt
WARNING: untranslated string: fwdfw pol allow
WARNING: untranslated string: fwdfw pol block
WARNING: untranslated string: fwdfw pol text
WARNING: untranslated string: fwdfw pol text1
WARNING: untranslated string: fwdfw pol title
+WARNING: untranslated string: fwdfw prot41
+WARNING: untranslated string: fwdfw prot41 short
WARNING: untranslated string: fwdfw red
WARNING: untranslated string: fwdfw reread
WARNING: untranslated string: fwdfw rule activate
@@ -696,7 +699,6 @@ WARNING: untranslated string: fwdfw wd_sun
WARNING: untranslated string: fwdfw wd_thu
WARNING: untranslated string: fwdfw wd_tue
WARNING: untranslated string: fwdfw wd_wed
-WARNING: untranslated string: fwdfw xt access
WARNING: untranslated string: fwhost addgrp
WARNING: untranslated string: fwhost addgrpname
WARNING: untranslated string: fwhost addhost
@@ -756,7 +758,6 @@ WARNING: untranslated string: fwhost newservicegrp
WARNING: untranslated string: fwhost ovpn_n2n
WARNING: untranslated string: fwhost port
WARNING: untranslated string: fwhost prot
-WARNING: untranslated string: fwhost reread
WARNING: untranslated string: fwhost services
WARNING: untranslated string: fwhost srv_name
WARNING: untranslated string: fwhost stdnet
@@ -767,6 +768,7 @@ WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
WARNING: untranslated string: most preferred
WARNING: untranslated string: new
+WARNING: untranslated string: notice
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
WARNING: untranslated string: openvpn fragment allowed with udp
@@ -799,6 +801,8 @@ WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment
WARNING: untranslated string: ovpn mtu-disc yes
WARNING: untranslated string: ovpn routes push
WARNING: untranslated string: ovpn routes push options
+WARNING: untranslated string: p2p block
+WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: pakfire ago
WARNING: untranslated string: proxy reports
WARNING: untranslated string: proxy reports daily
@@ -812,6 +816,7 @@ WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
+WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: static routes
WARNING: untranslated string: system information
WARNING: untranslated string: tor
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 96e691e..d644104 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -186,7 +186,6 @@ WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
-WARNING: translation string unused: external access
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
WARNING: translation string unused: extrahd unable to write
@@ -342,7 +341,6 @@ WARNING: translation string unused: or
WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: out
-WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall mode0
WARNING: translation string unused: outgoing firewall mode1
WARNING: translation string unused: outgoing firewall mode2
@@ -382,7 +380,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
WARNING: translation string unused: polfile
-WARNING: translation string unused: policy
WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
@@ -595,7 +592,9 @@ WARNING: untranslated string: ccd none
WARNING: untranslated string: ccd routes
WARNING: untranslated string: ccd subnet
WARNING: untranslated string: ccd used
+WARNING: untranslated string: default ip
WARNING: untranslated string: deprecated fs warn
+WARNING: untranslated string: dnat address
WARNING: untranslated string: dns address deleted txt
WARNING: untranslated string: dnsforward
WARNING: untranslated string: dnsforward add a new entry
@@ -627,6 +626,7 @@ WARNING: untranslated string: fireinfo why descr2
WARNING: untranslated string: fireinfo why enable
WARNING: untranslated string: fireinfo why read more
WARNING: untranslated string: fireinfo your profile id
+WARNING: untranslated string: firewall rules
WARNING: untranslated string: fw default drop
WARNING: untranslated string: fw settings
WARNING: untranslated string: fw settings color
@@ -662,20 +662,23 @@ WARNING: untranslated string: fwdfw err tgt_addr
WARNING: untranslated string: fwdfw err tgt_grp
WARNING: untranslated string: fwdfw err tgt_mac
WARNING: untranslated string: fwdfw err time
-WARNING: untranslated string: fwdfw final_rule
+WARNING: untranslated string: fwdfw external port nat
WARNING: untranslated string: fwdfw hint ip1
WARNING: untranslated string: fwdfw hint ip2
+WARNING: untranslated string: fwdfw iface
+WARNING: untranslated string: fwdfw log
WARNING: untranslated string: fwdfw log rule
WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
WARNING: untranslated string: fwdfw newrule
-WARNING: untranslated string: fwdfw p2p txt
WARNING: untranslated string: fwdfw pol allow
WARNING: untranslated string: fwdfw pol block
WARNING: untranslated string: fwdfw pol text
WARNING: untranslated string: fwdfw pol text1
WARNING: untranslated string: fwdfw pol title
+WARNING: untranslated string: fwdfw prot41
+WARNING: untranslated string: fwdfw prot41 short
WARNING: untranslated string: fwdfw red
WARNING: untranslated string: fwdfw reread
WARNING: untranslated string: fwdfw rule activate
@@ -699,7 +702,6 @@ WARNING: untranslated string: fwdfw wd_sun
WARNING: untranslated string: fwdfw wd_thu
WARNING: untranslated string: fwdfw wd_tue
WARNING: untranslated string: fwdfw wd_wed
-WARNING: untranslated string: fwdfw xt access
WARNING: untranslated string: fwhost addgrp
WARNING: untranslated string: fwhost addgrpname
WARNING: untranslated string: fwhost addhost
@@ -759,7 +761,6 @@ WARNING: untranslated string: fwhost newservicegrp
WARNING: untranslated string: fwhost ovpn_n2n
WARNING: untranslated string: fwhost port
WARNING: untranslated string: fwhost prot
-WARNING: untranslated string: fwhost reread
WARNING: untranslated string: fwhost services
WARNING: untranslated string: fwhost srv_name
WARNING: untranslated string: fwhost stdnet
@@ -770,6 +771,7 @@ WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
WARNING: untranslated string: most preferred
WARNING: untranslated string: new
+WARNING: untranslated string: notice
WARNING: untranslated string: ntp common settings
WARNING: untranslated string: ntp sync
WARNING: untranslated string: openvpn default
@@ -789,6 +791,8 @@ WARNING: untranslated string: ovpn mtu-disc no
WARNING: untranslated string: ovpn mtu-disc off
WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment
WARNING: untranslated string: ovpn mtu-disc yes
+WARNING: untranslated string: p2p block
+WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: pakfire ago
WARNING: untranslated string: proxy reports
WARNING: untranslated string: proxy reports daily
@@ -802,6 +806,7 @@ WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
+WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: snort working
WARNING: untranslated string: static routes
WARNING: untranslated string: system information
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 142ec4d..0d6fafb 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -188,7 +188,6 @@ WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
-WARNING: translation string unused: external access
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
WARNING: translation string unused: extrahd unable to write
@@ -347,7 +346,6 @@ WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: our donors
WARNING: translation string unused: out
-WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall mode0
WARNING: translation string unused: outgoing firewall mode1
WARNING: translation string unused: outgoing firewall mode2
@@ -387,7 +385,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
WARNING: translation string unused: polfile
-WARNING: translation string unused: policy
WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
@@ -561,6 +558,8 @@ WARNING: untranslated string: age sminute
WARNING: untranslated string: age ssecond
WARNING: untranslated string: bytes
WARNING: untranslated string: ccd iroute2
+WARNING: untranslated string: default ip
+WARNING: untranslated string: dnat address
WARNING: untranslated string: dnsforward
WARNING: untranslated string: dnsforward add a new entry
WARNING: untranslated string: dnsforward configuration
@@ -573,6 +572,7 @@ WARNING: untranslated string: drop action1
WARNING: untranslated string: drop action2
WARNING: untranslated string: drop forward
WARNING: untranslated string: drop outgoing
+WARNING: untranslated string: firewall rules
WARNING: untranslated string: fw default drop
WARNING: untranslated string: fw settings
WARNING: untranslated string: fw settings color
@@ -608,20 +608,23 @@ WARNING: untranslated string: fwdfw err tgt_addr
WARNING: untranslated string: fwdfw err tgt_grp
WARNING: untranslated string: fwdfw err tgt_mac
WARNING: untranslated string: fwdfw err time
-WARNING: untranslated string: fwdfw final_rule
+WARNING: untranslated string: fwdfw external port nat
WARNING: untranslated string: fwdfw hint ip1
WARNING: untranslated string: fwdfw hint ip2
+WARNING: untranslated string: fwdfw iface
+WARNING: untranslated string: fwdfw log
WARNING: untranslated string: fwdfw log rule
WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
WARNING: untranslated string: fwdfw newrule
-WARNING: untranslated string: fwdfw p2p txt
WARNING: untranslated string: fwdfw pol allow
WARNING: untranslated string: fwdfw pol block
WARNING: untranslated string: fwdfw pol text
WARNING: untranslated string: fwdfw pol text1
WARNING: untranslated string: fwdfw pol title
+WARNING: untranslated string: fwdfw prot41
+WARNING: untranslated string: fwdfw prot41 short
WARNING: untranslated string: fwdfw red
WARNING: untranslated string: fwdfw reread
WARNING: untranslated string: fwdfw rule activate
@@ -645,7 +648,6 @@ WARNING: untranslated string: fwdfw wd_sun
WARNING: untranslated string: fwdfw wd_thu
WARNING: untranslated string: fwdfw wd_tue
WARNING: untranslated string: fwdfw wd_wed
-WARNING: untranslated string: fwdfw xt access
WARNING: untranslated string: fwhost addgrp
WARNING: untranslated string: fwhost addgrpname
WARNING: untranslated string: fwhost addhost
@@ -705,7 +707,6 @@ WARNING: untranslated string: fwhost newservicegrp
WARNING: untranslated string: fwhost ovpn_n2n
WARNING: untranslated string: fwhost port
WARNING: untranslated string: fwhost prot
-WARNING: untranslated string: fwhost reread
WARNING: untranslated string: fwhost services
WARNING: untranslated string: fwhost srv_name
WARNING: untranslated string: fwhost stdnet
@@ -715,13 +716,17 @@ WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: least preferred
WARNING: untranslated string: most preferred
WARNING: untranslated string: new
+WARNING: untranslated string: notice
WARNING: untranslated string: outgoing firewall reserved groupname
+WARNING: untranslated string: p2p block
+WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: red1
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
+WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
WARNING: untranslated string: tor accounting bytes
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 6faff27..163b9f2 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -186,7 +186,6 @@ WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
-WARNING: translation string unused: external access
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
WARNING: translation string unused: extrahd unable to write
@@ -342,7 +341,6 @@ WARNING: translation string unused: or
WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: out
-WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall mode0
WARNING: translation string unused: outgoing firewall mode1
WARNING: translation string unused: outgoing firewall mode2
@@ -380,7 +378,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
WARNING: translation string unused: polfile
-WARNING: translation string unused: policy
WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
@@ -593,7 +590,9 @@ WARNING: untranslated string: ccd none
WARNING: untranslated string: ccd routes
WARNING: untranslated string: ccd subnet
WARNING: untranslated string: ccd used
+WARNING: untranslated string: default ip
WARNING: untranslated string: deprecated fs warn
+WARNING: untranslated string: dnat address
WARNING: untranslated string: dnsforward
WARNING: untranslated string: dnsforward add a new entry
WARNING: untranslated string: dnsforward configuration
@@ -624,6 +623,7 @@ WARNING: untranslated string: fireinfo why descr2
WARNING: untranslated string: fireinfo why enable
WARNING: untranslated string: fireinfo why read more
WARNING: untranslated string: fireinfo your profile id
+WARNING: untranslated string: firewall rules
WARNING: untranslated string: fw default drop
WARNING: untranslated string: fw settings
WARNING: untranslated string: fw settings color
@@ -659,20 +659,23 @@ WARNING: untranslated string: fwdfw err tgt_addr
WARNING: untranslated string: fwdfw err tgt_grp
WARNING: untranslated string: fwdfw err tgt_mac
WARNING: untranslated string: fwdfw err time
-WARNING: untranslated string: fwdfw final_rule
+WARNING: untranslated string: fwdfw external port nat
WARNING: untranslated string: fwdfw hint ip1
WARNING: untranslated string: fwdfw hint ip2
+WARNING: untranslated string: fwdfw iface
+WARNING: untranslated string: fwdfw log
WARNING: untranslated string: fwdfw log rule
WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
WARNING: untranslated string: fwdfw newrule
-WARNING: untranslated string: fwdfw p2p txt
WARNING: untranslated string: fwdfw pol allow
WARNING: untranslated string: fwdfw pol block
WARNING: untranslated string: fwdfw pol text
WARNING: untranslated string: fwdfw pol text1
WARNING: untranslated string: fwdfw pol title
+WARNING: untranslated string: fwdfw prot41
+WARNING: untranslated string: fwdfw prot41 short
WARNING: untranslated string: fwdfw red
WARNING: untranslated string: fwdfw reread
WARNING: untranslated string: fwdfw rule activate
@@ -696,7 +699,6 @@ WARNING: untranslated string: fwdfw wd_sun
WARNING: untranslated string: fwdfw wd_thu
WARNING: untranslated string: fwdfw wd_tue
WARNING: untranslated string: fwdfw wd_wed
-WARNING: untranslated string: fwdfw xt access
WARNING: untranslated string: fwhost addgrp
WARNING: untranslated string: fwhost addgrpname
WARNING: untranslated string: fwhost addhost
@@ -756,7 +758,6 @@ WARNING: untranslated string: fwhost newservicegrp
WARNING: untranslated string: fwhost ovpn_n2n
WARNING: untranslated string: fwhost port
WARNING: untranslated string: fwhost prot
-WARNING: untranslated string: fwhost reread
WARNING: untranslated string: fwhost services
WARNING: untranslated string: fwhost srv_name
WARNING: untranslated string: fwhost stdnet
@@ -767,6 +768,7 @@ WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
WARNING: untranslated string: most preferred
WARNING: untranslated string: new
+WARNING: untranslated string: notice
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
WARNING: untranslated string: openvpn fragment allowed with udp
@@ -799,6 +801,8 @@ WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment
WARNING: untranslated string: ovpn mtu-disc yes
WARNING: untranslated string: ovpn routes push
WARNING: untranslated string: ovpn routes push options
+WARNING: untranslated string: p2p block
+WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: pakfire ago
WARNING: untranslated string: proxy reports
WARNING: untranslated string: proxy reports daily
@@ -812,6 +816,7 @@ WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
+WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: static routes
WARNING: untranslated string: system information
WARNING: untranslated string: tor
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 4be5db7..5f06c94 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -185,7 +185,6 @@ WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
-WARNING: translation string unused: external access
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: filename
WARNING: translation string unused: firewall graphs
@@ -336,7 +335,6 @@ WARNING: translation string unused: or
WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: out
-WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall mode0
WARNING: translation string unused: outgoing firewall mode1
WARNING: translation string unused: outgoing firewall mode2
@@ -376,7 +374,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
WARNING: translation string unused: polfile
-WARNING: translation string unused: policy
WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
@@ -588,8 +585,10 @@ WARNING: untranslated string: ccd routes
WARNING: untranslated string: ccd subnet
WARNING: untranslated string: ccd used
WARNING: untranslated string: community rules
+WARNING: untranslated string: default ip
WARNING: untranslated string: deprecated fs warn
WARNING: untranslated string: disk access per
+WARNING: untranslated string: dnat address
WARNING: untranslated string: dnsforward
WARNING: untranslated string: dnsforward add a new entry
WARNING: untranslated string: dnsforward configuration
@@ -610,6 +609,7 @@ WARNING: untranslated string: extrahd maybe the device is in use
WARNING: untranslated string: extrahd to
WARNING: untranslated string: extrahd to root
WARNING: untranslated string: extrahd you cant mount
+WARNING: untranslated string: firewall rules
WARNING: untranslated string: fw default drop
WARNING: untranslated string: fw settings
WARNING: untranslated string: fw settings color
@@ -645,20 +645,23 @@ WARNING: untranslated string: fwdfw err tgt_addr
WARNING: untranslated string: fwdfw err tgt_grp
WARNING: untranslated string: fwdfw err tgt_mac
WARNING: untranslated string: fwdfw err time
-WARNING: untranslated string: fwdfw final_rule
+WARNING: untranslated string: fwdfw external port nat
WARNING: untranslated string: fwdfw hint ip1
WARNING: untranslated string: fwdfw hint ip2
+WARNING: untranslated string: fwdfw iface
+WARNING: untranslated string: fwdfw log
WARNING: untranslated string: fwdfw log rule
WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
WARNING: untranslated string: fwdfw newrule
-WARNING: untranslated string: fwdfw p2p txt
WARNING: untranslated string: fwdfw pol allow
WARNING: untranslated string: fwdfw pol block
WARNING: untranslated string: fwdfw pol text
WARNING: untranslated string: fwdfw pol text1
WARNING: untranslated string: fwdfw pol title
+WARNING: untranslated string: fwdfw prot41
+WARNING: untranslated string: fwdfw prot41 short
WARNING: untranslated string: fwdfw red
WARNING: untranslated string: fwdfw reread
WARNING: untranslated string: fwdfw rule activate
@@ -682,7 +685,6 @@ WARNING: untranslated string: fwdfw wd_sun
WARNING: untranslated string: fwdfw wd_thu
WARNING: untranslated string: fwdfw wd_tue
WARNING: untranslated string: fwdfw wd_wed
-WARNING: untranslated string: fwdfw xt access
WARNING: untranslated string: fwhost addgrp
WARNING: untranslated string: fwhost addgrpname
WARNING: untranslated string: fwhost addhost
@@ -742,7 +744,6 @@ WARNING: untranslated string: fwhost newservicegrp
WARNING: untranslated string: fwhost ovpn_n2n
WARNING: untranslated string: fwhost port
WARNING: untranslated string: fwhost prot
-WARNING: untranslated string: fwhost reread
WARNING: untranslated string: fwhost services
WARNING: untranslated string: fwhost srv_name
WARNING: untranslated string: fwhost stdnet
@@ -754,6 +755,7 @@ WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
WARNING: untranslated string: most preferred
WARNING: untranslated string: new
+WARNING: untranslated string: notice
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
WARNING: untranslated string: openvpn fragment allowed with udp
@@ -772,6 +774,8 @@ WARNING: untranslated string: ovpn mtu-disc no
WARNING: untranslated string: ovpn mtu-disc off
WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment
WARNING: untranslated string: ovpn mtu-disc yes
+WARNING: untranslated string: p2p block
+WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: proxy reports
WARNING: untranslated string: proxy reports daily
WARNING: untranslated string: proxy reports monthly
@@ -784,6 +788,7 @@ WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
+WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: static routes
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 5ebf41a..ba02f89 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -188,7 +188,6 @@ WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
-WARNING: translation string unused: external access
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
WARNING: translation string unused: extrahd unable to write
@@ -347,7 +346,6 @@ WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: our donors
WARNING: translation string unused: out
-WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall mode0
WARNING: translation string unused: outgoing firewall mode1
WARNING: translation string unused: outgoing firewall mode2
@@ -387,7 +385,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
WARNING: translation string unused: polfile
-WARNING: translation string unused: policy
WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
@@ -558,6 +555,8 @@ WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: bytes
+WARNING: untranslated string: default ip
+WARNING: untranslated string: dnat address
WARNING: untranslated string: dnsforward
WARNING: untranslated string: dnsforward add a new entry
WARNING: untranslated string: dnsforward configuration
@@ -570,6 +569,7 @@ WARNING: untranslated string: drop action1
WARNING: untranslated string: drop action2
WARNING: untranslated string: drop forward
WARNING: untranslated string: drop outgoing
+WARNING: untranslated string: firewall rules
WARNING: untranslated string: fw default drop
WARNING: untranslated string: fw settings
WARNING: untranslated string: fw settings color
@@ -605,20 +605,23 @@ WARNING: untranslated string: fwdfw err tgt_addr
WARNING: untranslated string: fwdfw err tgt_grp
WARNING: untranslated string: fwdfw err tgt_mac
WARNING: untranslated string: fwdfw err time
-WARNING: untranslated string: fwdfw final_rule
+WARNING: untranslated string: fwdfw external port nat
WARNING: untranslated string: fwdfw hint ip1
WARNING: untranslated string: fwdfw hint ip2
+WARNING: untranslated string: fwdfw iface
+WARNING: untranslated string: fwdfw log
WARNING: untranslated string: fwdfw log rule
WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
WARNING: untranslated string: fwdfw newrule
-WARNING: untranslated string: fwdfw p2p txt
WARNING: untranslated string: fwdfw pol allow
WARNING: untranslated string: fwdfw pol block
WARNING: untranslated string: fwdfw pol text
WARNING: untranslated string: fwdfw pol text1
WARNING: untranslated string: fwdfw pol title
+WARNING: untranslated string: fwdfw prot41
+WARNING: untranslated string: fwdfw prot41 short
WARNING: untranslated string: fwdfw red
WARNING: untranslated string: fwdfw reread
WARNING: untranslated string: fwdfw rule activate
@@ -642,7 +645,6 @@ WARNING: untranslated string: fwdfw wd_sun
WARNING: untranslated string: fwdfw wd_thu
WARNING: untranslated string: fwdfw wd_tue
WARNING: untranslated string: fwdfw wd_wed
-WARNING: untranslated string: fwdfw xt access
WARNING: untranslated string: fwhost addgrp
WARNING: untranslated string: fwhost addgrpname
WARNING: untranslated string: fwhost addhost
@@ -702,7 +704,6 @@ WARNING: untranslated string: fwhost newservicegrp
WARNING: untranslated string: fwhost ovpn_n2n
WARNING: untranslated string: fwhost port
WARNING: untranslated string: fwhost prot
-WARNING: untranslated string: fwhost reread
WARNING: untranslated string: fwhost services
WARNING: untranslated string: fwhost srv_name
WARNING: untranslated string: fwhost stdnet
@@ -712,12 +713,16 @@ WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: least preferred
WARNING: untranslated string: most preferred
WARNING: untranslated string: new
+WARNING: untranslated string: notice
WARNING: untranslated string: outgoing firewall reserved groupname
+WARNING: untranslated string: p2p block
+WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: red1
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
+WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
WARNING: untranslated string: tor accounting bytes
diff --git a/doc/language_missings b/doc/language_missings
index c5f8ac0..be8ec62 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -59,7 +59,9 @@
< ccd routes
< ccd subnet
< ccd used
+< default ip
< deprecated fs warn
+< dnat address
< dns address deleted txt
< dnsforward
< dnsforward add a new entry
@@ -90,6 +92,7 @@
< fireinfo why enable
< fireinfo why read more
< fireinfo your profile id
+< firewall rules
< forward firewall
< fw default drop
< fwdfw ACCEPT
@@ -126,7 +129,9 @@
< fwdfw from
< fwdfw hint ip1
< fwdfw hint ip2
+< fwdfw iface
< fwdfw ipsec network
+< fwdfw log
< fwdfw log rule
< fwdfw man port
< fwdfw menu
@@ -142,6 +147,8 @@
< fwdfw pol text
< fwdfw pol text1
< fwdfw pol title
+< fwdfw prot41
+< fwdfw prot41 short
< fwdfw red
< fwdfw REJECT
< fwdfw reread
@@ -258,6 +265,7 @@
< least preferred
< minute
< most preferred
+< notice
< ntp common settings
< ntp sync
< openvpn default
@@ -279,6 +287,8 @@
< ovpn mtu-disc off
< ovpn mtu-disc with mssfix or fragment
< ovpn mtu-disc yes
+< p2p block
+< p2p block save notice
< proxy reports
< proxy reports daily
< proxy reports monthly
@@ -287,6 +297,7 @@
< qos enter bandwidths
< red1
< server restart
+< snat new source ip address
< snort working
< static routes
< system information
@@ -459,7 +470,9 @@
< ccd routes
< ccd subnet
< ccd used
+< default ip
< deprecated fs warn
+< dnat address
< dnsforward
< dnsforward add a new entry
< dnsforward configuration
@@ -489,6 +502,7 @@
< fireinfo why enable
< fireinfo why read more
< fireinfo your profile id
+< firewall rules
< forward firewall
< fw default drop
< fwdfw ACCEPT
@@ -525,7 +539,9 @@
< fwdfw from
< fwdfw hint ip1
< fwdfw hint ip2
+< fwdfw iface
< fwdfw ipsec network
+< fwdfw log
< fwdfw log rule
< fwdfw man port
< fwdfw menu
@@ -541,6 +557,8 @@
< fwdfw pol text
< fwdfw pol text1
< fwdfw pol title
+< fwdfw prot41
+< fwdfw prot41 short
< fwdfw red
< fwdfw REJECT
< fwdfw reread
@@ -657,6 +675,7 @@
< least preferred
< minute
< most preferred
+< notice
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -694,6 +713,8 @@
< ovpn mtu-disc yes
< ovpn routes push
< ovpn routes push options
+< p2p block
+< p2p block save notice
< proxy reports
< proxy reports daily
< proxy reports monthly
@@ -703,6 +724,7 @@
< red1
< server restart
< Set time on boot
+< snat new source ip address
< static routes
< system information
< tor
@@ -850,7 +872,9 @@
< ccd routes
< ccd subnet
< ccd used
+< default ip
< deprecated fs warn
+< dnat address
< dnsforward
< dnsforward add a new entry
< dnsforward configuration
@@ -872,6 +896,7 @@
< extrahd unable to read
< extrahd unable to write
< extrahd you cant mount
+< firewall rules
< forward firewall
< fw default drop
< fwdfw ACCEPT
@@ -908,7 +933,9 @@
< fwdfw from
< fwdfw hint ip1
< fwdfw hint ip2
+< fwdfw iface
< fwdfw ipsec network
+< fwdfw log
< fwdfw log rule
< fwdfw man port
< fwdfw menu
@@ -924,6 +951,8 @@
< fwdfw pol text
< fwdfw pol text1
< fwdfw pol title
+< fwdfw prot41
+< fwdfw prot41 short
< fwdfw red
< fwdfw REJECT
< fwdfw reread
@@ -1040,6 +1069,7 @@
< least preferred
< minute
< most preferred
+< notice
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -1063,6 +1093,8 @@
< ovpn mtu-disc yes
< ovpn routes push
< ovpn routes push options
+< p2p block
+< p2p block save notice
< proxy reports
< proxy reports daily
< proxy reports monthly
@@ -1071,6 +1103,7 @@
< qos enter bandwidths
< red1
< server restart
+< snat new source ip address
< static routes
< tor
< tor 0 = disabled
@@ -1219,8 +1252,10 @@
< ccd subnet
< ccd used
< day-graph
+< default ip
< deprecated fs warn
< disk access per
+< dnat address
< dnsforward
< dnsforward add a new entry
< dnsforward configuration
@@ -1243,6 +1278,7 @@
< extrahd unable to read
< extrahd unable to write
< extrahd you cant mount
+< firewall rules
< forward firewall
< frequency
< fw default drop
@@ -1280,7 +1316,9 @@
< fwdfw from
< fwdfw hint ip1
< fwdfw hint ip2
+< fwdfw iface
< fwdfw ipsec network
+< fwdfw log
< fwdfw log rule
< fwdfw man port
< fwdfw menu
@@ -1296,6 +1334,8 @@
< fwdfw pol text
< fwdfw pol text1
< fwdfw pol title
+< fwdfw prot41
+< fwdfw prot41 short
< fwdfw red
< fwdfw REJECT
< fwdfw reread
@@ -1415,6 +1455,7 @@
< minute
< month-graph
< most preferred
+< notice
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -1435,6 +1476,8 @@
< ovpn mtu-disc off
< ovpn mtu-disc with mssfix or fragment
< ovpn mtu-disc yes
+< p2p block
+< p2p block save notice
< proxy reports
< proxy reports daily
< proxy reports monthly
@@ -1443,6 +1486,7 @@
< qos enter bandwidths
< red1
< server restart
+< snat new source ip address
< static routes
< tor
< tor 0 = disabled
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index ffd8adf..8deeb1c 100755
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -458,15 +458,13 @@ sub addrule
{
&error;
- &Header::openbox('100%', 'left', $Lang::tr{'fwdfw menu'});
+ &Header::openbox('100%', 'left', "");
print <<END;
<form method="POST" action="">
<table border='0' width="100%">
<tr>
- <td>
+ <td align='center'>
<input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'>
- </td>
- <td align="right">
END
if (&General::firewall_needs_reload()) {
@@ -481,8 +479,9 @@ END
</table>
</form>
- <hr>
+ <br>
END
+
&Header::closebox();
&viewtablerule;
}
@@ -1661,6 +1660,7 @@ END
&gen_dd_block('src','grp1');
print"<hr>";
&Header::closebox();
+
#---SNAT / DNAT ------------------------------------------------
&Header::openbox('100%', 'left', 'NAT');
print<<END;
@@ -1671,39 +1671,75 @@ END
<div class="NAT">
<table width='100%' border='0'>
<tr>
- <td colspan='2'></td>
- <td width='1%'>
- <input type='radio' name='nat' id='dnat' value='dnat' checked>
+ <td width='5%'></td>
+ <td width='40%'>
+ <label>
+ <input type='radio' name='nat' id='dnat' value='dnat' checked>
+ $Lang::tr{'fwdfw dnat'}
+ </label>
+ </td>
+END
+
+ if (%aliases) {
+ print <<END;
+ <td width='25%' align='right'>$Lang::tr{'dnat address'}:</td>
+ <td width='30%'>
+ <select name='dnat' style='width: 100%;'>
+ <option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'default ip'}</option>
+END
+ foreach my $alias (sort keys %aliases) {
+ print "<option value='$alias' $selected{'dnat'}{$alias}>$alias</option>";
+ }
+
+ print "</select>";
+ } else {
+ print <<END;
+ <td colspan="2" width='55%'>
+ <input type='hidden' name='dnat' value='Default IP'>
</td>
- <td width='50%'>$Lang::tr{'fwdfw dnat'}</td>
END
- print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='dnat' style='width:140px;'>";
- print "<option value='ALL' $selected{'dnat'}{$Lang::tr{'all'}}>$Lang::tr{'all'}</option>";
- print "<option value='Default IP' $selected{'dnat'}{'Default IP'}>Default IP</option>";
- foreach my $alias (sort keys %aliases)
- {
- print "<option value='$alias' $selected{'dnat'}{$alias}>$alias</option>";
}
- print"</select></td></tr>";
+ print "</tr>";
+
#SNAT
- print"<tr><td colspan='2'></td><td width='1%'><input type='radio' name='nat' id='snat' value='snat' $checked{'nat'}{'snat'}></td><td width='20%'>$Lang::tr{'fwdfw snat'}</td>";
- print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='snat' style='width:140px;'>";
- foreach my $alias (sort keys %aliases)
- {
- print "<option value='$alias' $selected{'snat'}{$alias}>$alias</option>";
- }
- foreach my $network (sort keys %defaultNetworks)
- {
+ print <<END;
+ <tr>
+ <td width='5%'></td>
+ <td width='40%'>
+ <label>
+ <input type='radio' name='nat' id='snat' value='snat' $checked{'nat'}{'snat'}>
+ $Lang::tr{'fwdfw snat'}
+ </label>
+ </td>
+ <td width='25%' align='right'>$Lang::tr{'snat new source ip address'}:</td>
+ <td width='30%'>
+ <select name='snat' style='width: 100%;'>
+END
+
+ foreach my $alias (sort keys %aliases) {
+ print "<option value='$alias' $selected{'snat'}{$alias}>$alias</option>";
+ }
+
+ # XXX this is composed in a very ugly fashion
+ foreach my $network (sort keys %defaultNetworks) {
next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
next if($defaultNetworks{$network}{'NAME'} eq "ALL");
next if($defaultNetworks{$network}{'NAME'} =~ /OpenVPN/i);
+
print "<option value='$defaultNetworks{$network}{'NAME'}'";
print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
print ">$network</option>";
}
- print"</select></td></tr></table>";
- print"</div>";
+
+ print <<END;
+ </select>
+ </td>
+ </tr>
+ </table>
+ </div>
+END
&Header::closebox();
+
#---TARGET------------------------------------------------------
&Header::openbox('100%', 'left', $Lang::tr{'fwdfw target'});
print<<END;
@@ -2325,27 +2361,35 @@ sub validremark
return 0;}
return 1;
}
-sub viewtablerule
-{
+
+sub viewtablerule {
&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
- &viewtablenew(\%configfwdfw,$configfwdfw,"","Forward" );
- &viewtablenew(\%configinputfw,$configinput,"",$Lang::tr{'fwdfw xt access'} );
- &viewtablenew(\%configoutgoingfw,$configoutgoing,"","Outgoing" );
+
+ &viewtablenew(\%configfwdfw, $configfwdfw, $Lang::tr{'firewall rules'});
+ &viewtablenew(\%configinputfw, $configinput, $Lang::tr{'external access'});
+ &viewtablenew(\%configoutgoingfw, $configoutgoing, $Lang::tr{'outgoing firewall'});
}
+
sub viewtablenew
{
my $hash=shift;
my $config=shift;
my $title=shift;
- my $title1=shift;
my $go='';
+
+ my $show_box = (! -z $config) || ($optionsfw{'SHOWTABLES'} eq 'on');
+ return if (!$show_box);
+
&General::get_aliases(\%aliases);
&General::readhasharray("$confighost", \%customhost);
&General::readhasharray("$config", $hash);
&General::readhasharray("$configccdnet", \%ccdnet);
&General::readhasharray("$configccdhost", \%ccdhost);
- if( ! -z $config){
- &Header::openbox('100%', 'left',$title);
+
+ &Header::openbox('100%', 'left', $title);
+ print "<table width='100%' cellspacing='0' border='0'>";
+
+ if (! -z $config) {
my $count=0;
my ($gif,$log);
my $ruletype;
@@ -2353,11 +2397,8 @@ sub viewtablenew
my $tooltip;
my @tmpsrc=();
my $coloryellow='';
- print <<END;
- <b>$title1</b>
- <br>
- <table width='100%' cellspacing='0' border='0'>
+ print <<END;
<tr>
<th align='right' width='3%'>
#
@@ -2370,7 +2411,7 @@ sub viewtablenew
<b>$Lang::tr{'fwdfw source'}</b>
</th>
<th align='center'>
- Log <!-- XXX UNTRANSLATED STRING -->
+ <b>$Lang::tr{'fwdfw log'}</b>
</th>
<th align='center' width='30%'>
<b>$Lang::tr{'fwdfw target'}</b>
@@ -2493,7 +2534,7 @@ END
&getcolor($$hash{$key}[3],$$hash{$key}[4],\%customhost);
print"<td align='center' width='30%' $tdcolor>";
if ($$hash{$key}[3] eq 'ipfire_src'){
- $ipfireiface='Interface '; # XXX UNTRANSLATED STRING
+ $ipfireiface=$Lang::tr{'fwdfw iface'};
}
if ($$hash{$key}[3] eq 'std_net_src'){
print &get_name($$hash{$key}[4]);
@@ -2682,97 +2723,152 @@ END
}
print"<tr bgcolor='FFFFFF'><td colspan='13' height='1'></td></tr>";
}
- print"</table>";
- #SHOW FINAL RULE
- print "<table width='100%'rules='cols' border='1'>";
- my $col;
- if ($config eq '/var/ipfire/firewall/config'){
- my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
- if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
- $col="bgcolor='darkred'";
- }else{
- $col="bgcolor='green'";
- }
- &show_defaultrules($col,$pol);
- }elsif ($config eq '/var/ipfire/firewall/outgoing'){
- if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
- $col="bgcolor='darkred'";
- print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol block'}</font></td></tr>";
- }else{
- $col="bgcolor='green'";
- print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
- }
- }else{
- print"<tr><td bgcolor='darkred' width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td bgcolor='darkred' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
+ } elsif ($optionsfw{'SHOWTABLES'} eq 'on') {
+ print <<END;
+ <tr>
+ <td colspan='7' height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td>
+ </tr>
+END
+ }
+
+ #SHOW FINAL RULE
+ my $policy = 'fwdfw ' . $fwdfwsettings{'POLICY'};
+ my $colour = "bgcolor='green'";
+ if ($fwdfwsettings{'POLICY'} eq 'MODE1') {
+ $colour = "bgcolor='darkred'";
+ }
+
+ my $message;
+ if (($config eq '/var/ipfire/firewall/config') && ($fwdfwsettings{'POLICY'} ne 'MODE1')) {
+ print <<END;
+ <tr>
+ <td colspan='13'> </td>
+ </tr>
+ <tr>
+ <td colspan='13'>
+ <table width="100%" border='1' rules="cols" cellspacing='0'>
+END
+
+ # GREEN
+ print <<END;
+ <tr>
+ <td align='center'>
+ <font color="$Header::colourgreen">$Lang::tr{'green'}</font>
+ </td>
+ <td align='center'>
+ <font color="$Header::colourred">$Lang::tr{'red'}</font>
+ ($Lang::tr{'fwdfw pol allow'})
+ </td>
+END
+
+ if (&Header::orange_used()) {
+ print <<END;
+ <td align='center'>
+ <font color="$Header::colourorange">$Lang::tr{'orange'}</font>
+ ($Lang::tr{'fwdfw pol allow'})
+ </td>
+END
}
- print"</table>";
- print "<hr>";
- print "<br><br>";
- &Header::closebox();
- }else{
- if ($optionsfw{'SHOWTABLES'} eq 'on'){
- print "<b>$title1</b><br>";
- print"<table width='100%' border='0' rules='none'><tr><td height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td></tr></table>";
- my $col;
- if ($config eq '/var/ipfire/firewall/config'){
- my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
- if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
- $col="bgcolor='darkred'";
- }else{
- $col="bgcolor='green'";
- }
- &show_defaultrules($col,$pol);
- }elsif ($config eq '/var/ipfire/firewall/outgoing'){
- print "<table width='100%' rules='cols' border='1'>";
- my $pol='fwdfw '.$fwdfwsettings{'POLICY1'};
- if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
- $col="bgcolor='darkred'";
- print"<tr><td $col align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
- }else{
- $col="bgcolor='green'";
- print"<tr><td $col align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
- }
- }else{
- print "<table width='100%' rules='cols' border='1'>";
- print"<tr><td bgcolor='darkred' align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td align='center' bgcolor='darkred'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
- }
- print"</table><br><br>";
+
+ if (&Header::blue_used()) {
+ print <<END;
+ <td align='center'>
+ <font color="$Header::colourblue">$Lang::tr{'blue'}</font>
+ ($Lang::tr{'fwdfw pol allow'})
+ </td>
+END
}
- }
-}
-&Header::closebigbox();
-&Header::closepage();
-sub show_defaultrules
-{
- my $col=shift;
- my $pol=shift;
- #STANDARD RULES (From WIKI)
- print"</table>";
- if ($col eq "bgcolor='green'"){
- print "<br><table width='100%' rules='cols' border='1' >";
- my $blue = "<font color=$Header::colourblue> $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol block'})" if (&Header::blue_used());
- my $orange = "<font color=$Header::colourorange> $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol block'})" if (&Header::orange_used());
- my $blue1 = "<font color=$Header::colourblue> $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol allow'})" if (&Header::blue_used());
- my $orange1 = "<font color=$Header::colourorange> $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol allow'})" if (&Header::orange_used());
- print"<tr><td align='center'><font color='#000000'>$Lang::tr{'green'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td>";
- print"<td align='center'>$orange1</td>" if (&Header::orange_used());
- print"<td align='center'>$blue1</td>" if (&Header::blue_used());
print"</tr>";
- if (&Header::orange_used()){
- print"<tr><td align='center' width='20%'><font color='#000000'>$Lang::tr{'orange'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td><td align='center'><font color=$Header::colourgreen> $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td>";
- print"<td align='center'>$blue</td>" if (&Header::blue_used());
+
+ # ORANGE
+ if (&Header::orange_used()) {
+ print <<END;
+ <tr>
+ <td align='center' width='20%'>
+ <font color="$Header::colourorange">$Lang::tr{'orange'}</font>
+ </td>
+ <td align='center'>
+ <font color="$Header::colourred">$Lang::tr{'red'}</font>
+ ($Lang::tr{'fwdfw pol allow'})
+ </td>
+ <td align='center'>
+ <font color="$Header::colourgreen">$Lang::tr{'green'}</font>
+ ($Lang::tr{'fwdfw pol block'})
+ </td>
+END
+
+ if (&Header::blue_used()) {
+ print <<END;
+ <td align='center'>
+ <font color="$Header::colourblue">$Lang::tr{'blue'}</font>
+ ($Lang::tr{'fwdfw pol block'})
+ </td>
+END
+ }
+
print"</tr>";
}
- if (&Header::blue_used()){
- print"<tr><td align='center'><font color='#000000'>$Lang::tr{'blue'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td>";
- print"<td align='center'>$orange</td>" if (&Header::orange_used());
- print"<td align='center'><font color=$Header::colourgreen> $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td>";
+
+ if (&Header::blue_used()) {
+ print <<END;
+ <tr>
+ <td align='center'>
+ <font color="&Header::colourblue">$Lang::tr{'blue'}</font>
+ </td>
+ <td align='center'>
+ <font color="$Header::colourred">$Lang::tr{'red'}</font>
+ ($Lang::tr{'fwdfw pol allow'})
+ </td>
+END
+
+ if (&Header::orange_used()) {
+ print <<END;
+ <td align='center'>
+ <font color="$Header::colourorange">$Lang::tr{'orange'}</font>
+ ($Lang::tr{'fwdfw pol block'})
+ </td>
+ <td align='center'>
+ <font color="$Header::colourgreen">$Lang::tr{'green'}</font>
+ ($Lang::tr{'fwdfw pol block'})
+ </td>
+END
+ }
+
print"</tr>";
}
- print"<tr><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'} </font></td><td $col colspan='3' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
- }elsif($col eq "bgcolor='darkred'"){
- print "<table width='100%' rules='cols' border='1' >";
- print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
+
+ print <<END;
+ </table>
+ </td>
+ </tr>
+END
+
+ $message = $Lang::tr{'fwdfw pol allow'};
+
+ } elsif ($config eq '/var/ipfire/firewall/outgoing') {
+ $message = $Lang::tr{'fwdfw pol allow'};
+
+ } else {
+ $message = $Lang::tr{'fwdfw pol block'};
+ $colour = "bgcolor='darkred'";
}
+
+ if ($message) {
+ print <<END;
+ <tr>
+ <td $colour align='center' colspan='13'>
+ <font color='#FFFFFF'>$Lang::tr{'policy'}: $message</font>
+ </td>
+ </tr>
+END
+ }
+
+ print "</table>";
+ print "<br>";
+
+ &Header::closebox();
}
+
+&Header::closebigbox();
+&Header::closepage();
diff --git a/html/cgi-bin/p2p-block.cgi b/html/cgi-bin/p2p-block.cgi
index aab2d3d..6683ca8 100755
--- a/html/cgi-bin/p2p-block.cgi
+++ b/html/cgi-bin/p2p-block.cgi
@@ -32,6 +32,7 @@ require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
my $errormessage = '';
+my $notice;
my $p2pfile = "${General::swroot}/firewall/p2protocols";
my @p2ps = ();
@@ -44,8 +45,6 @@ my %mainsettings = ();
&Header::showhttpheaders();
&Header::getcgihash(\%fwdfwsettings);
-&Header::openpage($Lang::tr{'p2p block'}, 1, '');
-&Header::openbigbox('100%', 'center', $errormessage);
if ($fwdfwsettings{'ACTION'} eq 'togglep2p') {
open( FILE, "<$p2pfile") or die "Unable to read $p2pfile";
@@ -66,77 +65,83 @@ if ($fwdfwsettings{'ACTION'} eq 'togglep2p') {
close FILE;
&General::firewall_config_changed();
- &p2pblock();
-} else {
- &p2pblock();
+
+ $notice = $Lang::tr{'p2p block save notice'};
}
-sub p2pblock {
- my $gif;
+&Header::openpage($Lang::tr{'p2p block'}, 1, '');
+&Header::openbigbox('100%', 'center', $errormessage);
- open(FILE, "<$p2pfile") or die "Unable to read $p2pfile";
- @p2ps = <FILE>;
- close FILE;
+if ($notice) {
+ &Header::openbox('100%', 'left', $Lang::tr{'notice'});
+ print "<font class='base'>$notice</font>";
+ &Header::closebox();
+}
- &Header::openbox('100%', 'center', $Lang::tr{'p2p block'});
- print <<END;
- <table width='35%' border='0'>
- <tr bgcolor='$color{'color22'}'>
- <td align=center colspan='2' >
- <b>$Lang::tr{'protocol'}</b>
- </td>
- <td align='center'>
- <b>$Lang::tr{'status'}</b>
- </td>
- </tr>
+my $gif;
+
+open(FILE, "<$p2pfile") or die "Unable to read $p2pfile";
+@p2ps = <FILE>;
+close FILE;
+
+&Header::openbox('100%', 'center', $Lang::tr{'p2p block'});
+print <<END;
+ <table width='35%' border='0'>
+ <tr bgcolor='$color{'color22'}'>
+ <td align=center colspan='2' >
+ <b>$Lang::tr{'protocol'}</b>
+ </td>
+ <td align='center'>
+ <b>$Lang::tr{'status'}</b>
+ </td>
+ </tr>
END
- foreach my $p2pentry (sort @p2ps) {
- my @p2pline = split( /\;/, $p2pentry);
- if ($p2pline[2] eq 'on') {
- $gif = "/images/on.gif"
- } else {
- $gif = "/images/off.gif"
- }
-
- print <<END;
- <tr bgcolor='$color{'color20'}'>
- <td align='center' colspan='2'>
- $p2pline[0]:
- </td>
- <td align='center'>
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='P2PROT' value='$p2pline[1]'>
- <input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;'>
- <input type='hidden' name='ACTION' value='togglep2p'>
- </form>
- </td>
- </tr>
-END
+foreach my $p2pentry (sort @p2ps) {
+ my @p2pline = split( /\;/, $p2pentry);
+ if ($p2pline[2] eq 'on') {
+ $gif = "/images/on.gif"
+ } else {
+ $gif = "/images/off.gif"
}
print <<END;
- <tr>
- <td>
- <img src='/images/on.gif'>
- </td>
- <td>
- $Lang::tr{'outgoing firewall p2p allow'}
- </td>
- </tr>
- <tr>
- <td>
- <img src='/images/off.gif'>
- </td>
- <td>
- $Lang::tr{'outgoing firewall p2p deny'}
- </td>
- </tr>
- </table>
+ <tr bgcolor='$color{'color20'}'>
+ <td align='center' colspan='2'>
+ $p2pline[0]:
+ </td>
+ <td align='center'>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='P2PROT' value='$p2pline[1]'>
+ <input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;'>
+ <input type='hidden' name='ACTION' value='togglep2p'>
+ </form>
+ </td>
+ </tr>
END
-
- &Header::closebox();
}
+print <<END;
+ <tr>
+ <td>
+ <img src='/images/on.gif'>
+ </td>
+ <td>
+ $Lang::tr{'outgoing firewall p2p allow'}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <img src='/images/off.gif'>
+ </td>
+ <td>
+ $Lang::tr{'outgoing firewall p2p deny'}
+ </td>
+ </tr>
+ </table>
+END
+
+&Header::closebox();
+
&Header::closebigbox();
&Header::closepage();
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 92847ca..af8851f 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -617,6 +617,7 @@
'december' => 'Dezember',
'deep scan directories' => 'rekursiv scannen',
'def lease time' => 'Standardzeit für Zuordnung',
+'default ip' => 'Standard IP-Adresse',
'default lease time' => 'Haltezeit-Voreinstellung in min:',
'default networks' => 'Standard Netzwerke',
'default renewal time' => 'Standard-Aktualisierungszeit',
@@ -696,6 +697,7 @@
'dmz pinhole rule added' => 'Regel für DMZ-Schlupfloch hinzugefügt; Starte DMZ-Schlupfloch neu',
'dmz pinhole rule removed' => 'Regel für DMZ-Schlupfloch entfernt; Starte DMZ-Schlupfloch neu',
'dmzpinholes for same net not necessary' => 'DMZ-Schlupflöcher werden im gleichen Netz nicht benötigt. Wählen Sie ein anderes Quell- oder Ziel-Netz.',
+'dnat address' => 'Externe IP-Adresse',
'dns address deleted' => 'Erfolgreich gelöscht! ',
'dns address deleted txt' => 'DNS Server Adressen wurden erfolgreich gelöscht. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.',
'dns address done' => 'Die DNS-Server Adressen Einstellungen werden übernommen.',
@@ -879,6 +881,7 @@
'firewall logs' => 'Firewall-Logdateien',
'firewall logs ip' => 'Fw-Logdiagramme (IP)',
'firewall logs port' => 'Fw-Logdiagramme (Port)',
+'firewall rules' => 'Firewallregeln',
'firewallhits' => 'Firewalltreffer',
'firmware' => 'Firmware',
'firmware upload' => 'Hochladen der Firmware/Treiber',
@@ -949,7 +952,9 @@
'fwdfw from' => 'Von:',
'fwdfw hint ip1' => 'Die zuletzt erzeugte Regel mag eventuell niemals zutreffen, da sich Quelle und Ziel überlappen.',
'fwdfw hint ip2' => 'Bitte überprüfen Sie, ob diese Regel Sinn macht: ',
+'fwdfw iface' => 'Interface',
'fwdfw ipsec network' => 'IPsec-Netzwerke:',
+'fwdfw log' => 'Log',
'fwdfw log rule' => 'Logging aktivieren',
'fwdfw man port' => 'Port(s):',
'fwdfw menu' => 'Firewallregeln',
@@ -1487,6 +1492,7 @@
'not present' => '<B>Nicht</B> vorhanden',
'not running' => 'nicht gestartet',
'not set' => 'nicht gesetzt',
+'notice' => 'Hinweis',
'november' => 'November',
'ntp common settings' => 'Allgemeine Einstellungen',
'ntp configuration' => 'NTP-Konfiguration',
@@ -1609,6 +1615,7 @@
'ovpnstatus log' => 'OVPN-Status-Log',
'ovpnsys log' => 'OVPN-System-Log',
'p2p block' => 'P2P-Block',
+'p2p block save notice' => 'Bitte lesen Sie die Firewallregeln neu ein, damit die Änderungen aktiv werden.',
'package failed to install' => 'Programmpaket konnte nicht installiert werden.',
'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.',
'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?',
@@ -1856,6 +1863,7 @@
'smbstop' => 'Samba Dienste beenden',
'smtphost' => 'Smtp Host',
'smtpport' => 'Smtp Port',
+'snat new source ip address' => 'Neue Quell-IP-Adresse',
'snort hits' => 'Gesamtanzahl der aktivierten Intrusion-Regeln für',
'snort working' => 'Snort führt gerade eine Aufgabe aus... Bitte warten Sie, bis diese erfolgreich beendet wurde.',
'socket options' => 'Socket Options',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 2d36cdb..bdb66fa 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -638,6 +638,7 @@
'december' => 'December',
'deep scan directories' => 'Scan recursive',
'def lease time' => 'Default Lease Time',
+'default ip' => 'Default IP address',
'default lease time' => 'Default lease time (mins):',
'default networks' => 'Default networks',
'default renewal time' => 'Default Renewal Time',
@@ -719,6 +720,7 @@
'dmz pinhole rule added' => 'DMZ pinhole rule added; restarting DMZ pinhole',
'dmz pinhole rule removed' => 'DMZ pinhole rule removed; restarting DMZ pinhole',
'dmzpinholes for same net not necessary' => 'DMZ Pinholes are not necessary for same net. Select different source or destination net.',
+'dnat address' => 'External IP address',
'dns address deleted' => 'Successfully deleted!',
'dns address deleted txt' => 'The DNS-Server addresses have been successfully deleted.<br />You have to reboot or reconnect that the changes have effect!',
'dns address done' => 'The DNS-Server address settings are going to be saved.',
@@ -904,6 +906,7 @@
'firewall logs' => 'Firewall Logs',
'firewall logs ip' => 'Fw-Loggraphs (IP)',
'firewall logs port' => 'Fw-Loggraphs (Port)',
+'firewall rules' => 'Firewall Rules',
'firewallhits' => 'firewallhits',
'firmware' => 'Firmware',
'firmware upload' => 'Upload Firmware/Drivers',
@@ -974,7 +977,9 @@
'fwdfw from' => 'From:',
'fwdfw hint ip1' => 'The last generated rule may never match, because source and destination subnets may overlap.',
'fwdfw hint ip2' => 'Please double-check if this rule makes sense: ',
+'fwdfw iface' => 'Interface',
'fwdfw ipsec network' => 'IPsec networks:',
+'fwdfw log' => 'Log',
'fwdfw log rule' => 'Log rule',
'fwdfw man port' => 'Port(s):',
'fwdfw menu' => 'Firewall Rules',
@@ -1516,6 +1521,7 @@
'not running' => 'not running',
'not set' => 'not set',
'notes' => 'Notes',
+'notice' => 'Notice',
'november' => 'November',
'ntp common settings' => 'Common settings',
'ntp configuration' => 'NTP configuration',
@@ -1638,6 +1644,7 @@
'ovpnstatus log' => 'OVPN-Status-Log',
'ovpnsys log' => 'OVPN-System-Log',
'p2p block' => 'P2P block',
+'p2p block save notice' => 'Please reload the firewall ruleset in order to apply your changes.',
'package failed to install' => 'Package failed to install.',
'pagerefresh' => 'Page is beeing refreshed, please wait.',
'pakfire accept all' => 'Do you want to install all packages?',
@@ -1890,6 +1897,7 @@
'smbstop' => 'Stop samba',
'smtphost' => 'SMTP host',
'smtpport' => 'SMTP port',
+'snat new source ip address' => 'New source IP address',
'snort hits' => 'Total of number of Intrusion rules activated for',
'snort working' => 'Snort is working ... Please wait until all operations have completed successfully.',
'socket options' => 'Socket options',
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6fb9681c24360c0c531e18215673e2ba83c53879
by git＠ipfire.org 28 Oct '13
by git＠ipfire.org 28 Oct '13
28 Oct '13
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 6fb9681c24360c0c531e18215673e2ba83c53879 (commit)
from 78e35c82dc1273e4503aa336372f0c104f0bb737 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6fb9681c24360c0c531e18215673e2ba83c53879
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 28 21:00:03 2013 +0100
strongswan: Update to 5.1.1rc1.
-----------------------------------------------------------------------
Summary of changes:
lfs/strongswan | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/lfs/strongswan b/lfs/strongswan
index 1aed31f..b2c362e 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
include Config
-VER = 5.1.1dr4
+VER = 5.1.1rc1
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 05899faa9b8a8f253474af809b283ef9
+$(DL_FILE)_MD5 = 69826b6a6103ae705c48b3f33b4dd3d5
install : $(TARGET)
@@ -94,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-eap-identity \
$(PADLOCK)
- cd $(DIR_APP) && make $(MAKETUNING) LDFLAGS="-lrt"
+ cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
# Remove all library files we don't want or need.
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 85860aff263c41a74ff274fca2998e941b9134f6
by git＠ipfire.org 28 Oct '13
by git＠ipfire.org 28 Oct '13
28 Oct '13
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, fifteen has been updated
via 85860aff263c41a74ff274fca2998e941b9134f6 (commit)
from 47a83092b5a6f2fa13d1c95de75b7bea4eb90da2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 85860aff263c41a74ff274fca2998e941b9134f6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 28 20:35:36 2013 +0100
firewall: Fix rendering issue of the rule table.
-----------------------------------------------------------------------
Summary of changes:
html/cgi-bin/firewall.cgi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 802b2be..ffd8adf 100755
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -2491,9 +2491,9 @@ END
#SOURCE
my $ipfireiface;
&getcolor($$hash{$key}[3],$$hash{$key}[4],\%customhost);
- print"<td align='center' width='160' $tdcolor>";
+ print"<td align='center' width='30%' $tdcolor>";
if ($$hash{$key}[3] eq 'ipfire_src'){
- $ipfireiface='Interface ';
+ $ipfireiface='Interface '; # XXX UNTRANSLATED STRING
}
if ($$hash{$key}[3] eq 'std_net_src'){
print &get_name($$hash{$key}[4]);
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 47a83092b5a6f2fa13d1c95de75b7bea4eb90da2
by git＠ipfire.org 27 Oct '13
by git＠ipfire.org 27 Oct '13
27 Oct '13
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, fifteen has been updated
via 47a83092b5a6f2fa13d1c95de75b7bea4eb90da2 (commit)
via 69460bba8037c6e8663a03eb93e35ce63df08939 (commit)
via cd1f97623535245443576e293da49c8ed0618b88 (commit)
via 8b69a1135ec1d68e83e62b336266770148a5c45f (commit)
via cc9a325708fa2efb9063758ce1bed05c6958b65b (commit)
via 663e748907b0cf5fd854e4a4f4417db554708797 (commit)
via b91712acc50b41b654c60f2754245cfe0c3751a8 (commit)
via f3604e1192ef09ef43537d55d49cfc635d5d6f88 (commit)
via 16e27e9acb53d78d2f9c631ee4f32fccf29791d8 (commit)
via 64c5bbc453a4ca7419d8ab795efd7ab38d1885d0 (commit)
via 78e35c82dc1273e4503aa336372f0c104f0bb737 (commit)
via 77117e740ccd09436449234be77b7a95d720043e (commit)
via 2d490a7304b6a5a84822e5093c36a8985994d1c8 (commit)
via f974c1d4bcfc0fa95a6c9982f7fc7800158062ed (commit)
via 21b21d95a2c91ce235fe5705b0e5d2fbe6c396fe (commit)
via abb6ed9179489ab3ab5ba30662bd7b6ed9483f53 (commit)
via 6a1cdd5fda6b0f17033762c2507fc542a4b89bfd (commit)
from 901aa8b943e6442e4b3540a73fe7c79c9a9cd419 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 47a83092b5a6f2fa13d1c95de75b7bea4eb90da2
Merge: 901aa8b 69460bb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 27 13:12:12 2013 +0100
Merge branch 'next' into fifteen
commit 69460bba8037c6e8663a03eb93e35ce63df08939
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 27 13:09:30 2013 +0100
cups: Update to 1.7.0.
commit cd1f97623535245443576e293da49c8ed0618b88
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 24 22:16:49 2013 +0200
cups: Use libusb.
commit 8b69a1135ec1d68e83e62b336266770148a5c45f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 24 22:11:41 2013 +0200
libusbx: New package.
commit cc9a325708fa2efb9063758ce1bed05c6958b65b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 24 19:41:17 2013 +0200
strongswan: Rootfile update.
commit 663e748907b0cf5fd854e4a4f4417db554708797
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 24 18:14:22 2013 +0200
gutenprint: Update to 5.2.9.
commit b91712acc50b41b654c60f2754245cfe0c3751a8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 24 15:21:42 2013 +0200
foomatic: Update to 4.0.9/4.0.17 (20131023).
commit f3604e1192ef09ef43537d55d49cfc635d5d6f88
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 24 15:21:33 2013 +0200
cups: Update to 1.6.4.
commit 16e27e9acb53d78d2f9c631ee4f32fccf29791d8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 24 15:20:57 2013 +0200
make.sh: Build dbus before cups and foomatic.
commit 64c5bbc453a4ca7419d8ab795efd7ab38d1885d0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 24 15:12:09 2013 +0200
mpage: New package.
Required for foomatic 4.x.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/libusbx | 8 +
config/rootfiles/common/mpage | 9 +
config/rootfiles/common/strongswan | 13 +-
config/rootfiles/packages/check_mk_agent | 1 +
config/rootfiles/packages/cups | 1086 ++++----
config/rootfiles/packages/foomatic | 4081 +++++++++++++++++++++++++++---
config/rootfiles/packages/gutenprint | 55 +-
lfs/check_mk_agent | 6 +-
lfs/cups | 20 +-
lfs/foomatic | 57 +-
lfs/gutenprint | 7 +-
lfs/{conntrack-tools => libusbx} | 9 +-
lfs/{libogg => mpage} | 19 +-
lfs/nagios | 2 +-
lfs/strongswan | 4 +-
make.sh | 4 +-
src/paks/check_mk_agent/install.sh | 10 +
src/paks/check_mk_agent/uninstall.sh | 8 +
src/patches/mpage25-config.patch | 46 +
19 files changed, 4447 insertions(+), 998 deletions(-)
create mode 100644 config/rootfiles/common/libusbx
create mode 100644 config/rootfiles/common/mpage
copy lfs/{conntrack-tools => libusbx} (94%)
copy lfs/{libogg => mpage} (91%)
create mode 100644 src/patches/mpage25-config.patch
Difference in files:
diff --git a/config/rootfiles/common/libusbx b/config/rootfiles/common/libusbx
new file mode 100644
index 0000000..62d6492
--- /dev/null
+++ b/config/rootfiles/common/libusbx
@@ -0,0 +1,8 @@
+#usr/include/libusb-1.0
+#usr/include/libusb-1.0/libusb.h
+#usr/lib/libusb-1.0.a
+#usr/lib/libusb-1.0.la
+#usr/lib/libusb-1.0.so
+usr/lib/libusb-1.0.so.0
+usr/lib/libusb-1.0.so.0.1.0
+#usr/lib/pkgconfig/libusb-1.0.pc
diff --git a/config/rootfiles/common/mpage b/config/rootfiles/common/mpage
new file mode 100644
index 0000000..9df3083
--- /dev/null
+++ b/config/rootfiles/common/mpage
@@ -0,0 +1,9 @@
+#usr/bin/mpage
+#usr/man/man1/mpage.1
+#usr/share/mpage
+#usr/share/mpage/CP850.PC
+#usr/share/mpage/ISO+STD+OTH
+#usr/share/mpage/ISO-8859.1
+#usr/share/mpage/ISO-8859.15
+#usr/share/mpage/ISO-Latin.1
+#usr/share/mpage/ISO-Latin.2
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 5d61ec1..da94336 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -10,6 +10,7 @@ etc/ipsec.d/private
etc/ipsec.d/reqs
etc/ipsec.secrets
etc/strongswan.conf
+usr/bin/pki
#usr/lib/ipsec
#usr/lib/ipsec/libcharon.a
#usr/lib/ipsec/libcharon.la
@@ -85,11 +86,21 @@ usr/libexec/ipsec/_updown
usr/libexec/ipsec/_updown_espmark
usr/libexec/ipsec/charon
usr/libexec/ipsec/openac
-usr/libexec/ipsec/pki
usr/libexec/ipsec/scepclient
usr/libexec/ipsec/starter
usr/libexec/ipsec/stroke
usr/sbin/ipsec
+#usr/share/man/man1/pki---gen.1
+#usr/share/man/man1/pki---issue.1
+#usr/share/man/man1/pki---keyid.1
+#usr/share/man/man1/pki---pkcs7.1
+#usr/share/man/man1/pki---print.1
+#usr/share/man/man1/pki---pub.1
+#usr/share/man/man1/pki---req.1
+#usr/share/man/man1/pki---self.1
+#usr/share/man/man1/pki---signcrl.1
+#usr/share/man/man1/pki---verify.1
+#usr/share/man/man1/pki.1
#usr/share/man/man5/ipsec.conf.5
#usr/share/man/man5/ipsec.secrets.5
#usr/share/man/man5/strongswan.conf.5
diff --git a/config/rootfiles/packages/check_mk_agent b/config/rootfiles/packages/check_mk_agent
index 073b483..1d68f74 100644
--- a/config/rootfiles/packages/check_mk_agent
+++ b/config/rootfiles/packages/check_mk_agent
@@ -1,2 +1,3 @@
usr/bin/check_mk_agent
+etc/xinetd.d/check_mk_agent
usr/bin/waitmax
diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index 742cd8f..7693e15 100644
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -1,4 +1,6 @@
+#etc/dbus-1/system.d/cups.conf
etc/pam.d/cups
+etc/rc.d/init.d/cups
#etc/rc0.d
#etc/rc0.d/K36cups
#etc/rc2.d
@@ -14,6 +16,7 @@ usr/bin/cancel
#usr/bin/cups-config
usr/bin/cupstestdsc
usr/bin/cupstestppd
+usr/bin/ipptool
usr/bin/lp
usr/bin/lpoptions
usr/bin/lppasswd
@@ -33,16 +36,15 @@ usr/bin/ppdpo
#usr/include/cups/cgi.h
#usr/include/cups/cups.h
#usr/include/cups/dir.h
-#usr/include/cups/driver.h
#usr/include/cups/file.h
#usr/include/cups/help-index.h
#usr/include/cups/http.h
-#usr/include/cups/image.h
#usr/include/cups/ipp.h
#usr/include/cups/language.h
#usr/include/cups/mime.h
#usr/include/cups/ppd.h
#usr/include/cups/ppdc.h
+#usr/include/cups/pwg.h
#usr/include/cups/raster.h
#usr/include/cups/sidechannel.h
#usr/include/cups/transcode.h
@@ -50,11 +52,10 @@ usr/bin/ppdpo
#usr/lib/cups
#usr/lib/cups/backend
usr/lib/cups/backend/http
+usr/lib/cups/backend/https
usr/lib/cups/backend/ipp
+usr/lib/cups/backend/ipps
usr/lib/cups/backend/lpd
-usr/lib/cups/backend/parallel
-usr/lib/cups/backend/scsi
-usr/lib/cups/backend/serial
usr/lib/cups/backend/smb
usr/lib/cups/backend/snmp
usr/lib/cups/backend/socket
@@ -68,26 +69,18 @@ usr/lib/cups/cgi-bin/printers.cgi
#usr/lib/cups/daemon
usr/lib/cups/daemon/cups-deviced
usr/lib/cups/daemon/cups-driverd
+usr/lib/cups/daemon/cups-exec
usr/lib/cups/daemon/cups-lpd
-usr/lib/cups/daemon/cups-polld
usr/lib/cups/driver
#usr/lib/cups/filter
-usr/lib/cups/filter/bannertops
-usr/lib/cups/filter/commandtoescpx
-usr/lib/cups/filter/commandtopclx
usr/lib/cups/filter/commandtops
usr/lib/cups/filter/gziptoany
-usr/lib/cups/filter/hpgltops
-usr/lib/cups/filter/imagetops
-usr/lib/cups/filter/imagetoraster
usr/lib/cups/filter/pstops
usr/lib/cups/filter/rastertodymo
usr/lib/cups/filter/rastertoepson
-usr/lib/cups/filter/rastertoescpx
usr/lib/cups/filter/rastertohp
usr/lib/cups/filter/rastertolabel
-usr/lib/cups/filter/rastertopclx
-usr/lib/cups/filter/texttops
+usr/lib/cups/filter/rastertopwg
#usr/lib/cups/monitor
usr/lib/cups/monitor/bcp
usr/lib/cups/monitor/tbcp
@@ -98,15 +91,12 @@ usr/lib/libcups.so
usr/lib/libcups.so.2
usr/lib/libcupscgi.so
usr/lib/libcupscgi.so.1
-usr/lib/libcupsdriver.so
-usr/lib/libcupsdriver.so.1
usr/lib/libcupsimage.so
usr/lib/libcupsimage.so.2
usr/lib/libcupsmime.so
usr/lib/libcupsmime.so.1
usr/lib/libcupsppdc.so
usr/lib/libcupsppdc.so.1
-#usr/lib/php/extensions/no-debug-non-zts-20090626/phpcups.so
usr/sbin/accept
usr/sbin/cupsaccept
usr/sbin/cupsaddsmb
@@ -129,50 +119,7 @@ usr/share/cups/banners/secret
usr/share/cups/banners/standard
usr/share/cups/banners/topsecret
usr/share/cups/banners/unclassified
-#usr/share/cups/charmaps
-usr/share/cups/charmaps/euc-cn.txt
-usr/share/cups/charmaps/euc-jp.txt
-usr/share/cups/charmaps/euc-kr.txt
-usr/share/cups/charmaps/euc-tw.txt
-usr/share/cups/charmaps/iso-8859-1.txt
-usr/share/cups/charmaps/iso-8859-10.txt
-usr/share/cups/charmaps/iso-8859-11.txt
-usr/share/cups/charmaps/iso-8859-13.txt
-usr/share/cups/charmaps/iso-8859-14.txt
-usr/share/cups/charmaps/iso-8859-15.txt
-usr/share/cups/charmaps/iso-8859-16.txt
-usr/share/cups/charmaps/iso-8859-2.txt
-usr/share/cups/charmaps/iso-8859-3.txt
-usr/share/cups/charmaps/iso-8859-4.txt
-usr/share/cups/charmaps/iso-8859-5.txt
-usr/share/cups/charmaps/iso-8859-6.txt
-usr/share/cups/charmaps/iso-8859-7.txt
-usr/share/cups/charmaps/iso-8859-8.txt
-usr/share/cups/charmaps/iso-8859-9.txt
-usr/share/cups/charmaps/jis-x0213.txt
-usr/share/cups/charmaps/koi8-r.txt
-usr/share/cups/charmaps/koi8-u.txt
-usr/share/cups/charmaps/mac-roman.txt
-usr/share/cups/charmaps/windows-1250.txt
-usr/share/cups/charmaps/windows-1251.txt
-usr/share/cups/charmaps/windows-1252.txt
-usr/share/cups/charmaps/windows-1253.txt
-usr/share/cups/charmaps/windows-1254.txt
-usr/share/cups/charmaps/windows-1255.txt
-usr/share/cups/charmaps/windows-1256.txt
-usr/share/cups/charmaps/windows-1257.txt
-usr/share/cups/charmaps/windows-1258.txt
-usr/share/cups/charmaps/windows-1361.txt
-usr/share/cups/charmaps/windows-874.txt
-usr/share/cups/charmaps/windows-932.txt
-usr/share/cups/charmaps/windows-936.txt
-usr/share/cups/charmaps/windows-949.txt
-usr/share/cups/charmaps/windows-950.txt
-#usr/share/cups/charsets
-usr/share/cups/charsets/utf-8
#usr/share/cups/data
-usr/share/cups/data/HPGLprolog
-usr/share/cups/data/psglyphs
usr/share/cups/data/testprint
#usr/share/cups/drv
usr/share/cups/drv/sample.drv
@@ -188,23 +135,47 @@ usr/share/cups/examples/postscript.drv
usr/share/cups/examples/r300-basic.drv
usr/share/cups/examples/r300-colorman.drv
usr/share/cups/examples/r300-remote.drv
-#usr/share/cups/fonts
-usr/share/cups/fonts/Monospace
-usr/share/cups/fonts/Monospace-Bold
-usr/share/cups/fonts/Monospace-BoldOblique
-usr/share/cups/fonts/Monospace-Oblique
+#usr/share/cups/ipptool
+usr/share/cups/ipptool/color.jpg
+usr/share/cups/ipptool/create-printer-subscription.test
+usr/share/cups/ipptool/document-a4.pdf
+usr/share/cups/ipptool/document-a4.ps
+usr/share/cups/ipptool/document-letter.pdf
+usr/share/cups/ipptool/document-letter.ps
+usr/share/cups/ipptool/get-completed-jobs.test
+usr/share/cups/ipptool/get-jobs.test
+usr/share/cups/ipptool/get-notifications.test
+usr/share/cups/ipptool/get-printer-attributes.test
+usr/share/cups/ipptool/get-subscriptions.test
+usr/share/cups/ipptool/gray.jpg
+usr/share/cups/ipptool/ipp-1.1.test
+usr/share/cups/ipptool/ipp-2.0.test
+usr/share/cups/ipptool/ipp-2.1.test
+usr/share/cups/ipptool/ipp-2.2.test
+usr/share/cups/ipptool/ipp-everywhere.test
+usr/share/cups/ipptool/onepage-a4.pdf
+usr/share/cups/ipptool/onepage-a4.ps
+usr/share/cups/ipptool/onepage-letter.pdf
+usr/share/cups/ipptool/onepage-letter.ps
+usr/share/cups/ipptool/print-job-deflate.test
+usr/share/cups/ipptool/print-job-gzip.test
+usr/share/cups/ipptool/print-job.test
+usr/share/cups/ipptool/testfile.jpg
+usr/share/cups/ipptool/testfile.pcl
+usr/share/cups/ipptool/testfile.pdf
+usr/share/cups/ipptool/testfile.ps
+usr/share/cups/ipptool/testfile.txt
+usr/share/cups/ipptool/validate-job.test
#usr/share/cups/mime
usr/share/cups/mime/mime.convs
usr/share/cups/mime/mime.types
#usr/share/cups/model
#usr/share/cups/ppdc
#usr/share/cups/ppdc/epson.h
-#usr/share/cups/ppdc/escp.h
usr/share/cups/ppdc/font.defs
#usr/share/cups/ppdc/hp.h
#usr/share/cups/ppdc/label.h
usr/share/cups/ppdc/media.defs
-#usr/share/cups/ppdc/pcl.h
usr/share/cups/ppdc/raster.defs
usr/share/cups/profiles
#usr/share/cups/templates
@@ -212,6 +183,77 @@ usr/share/cups/templates/add-class.tmpl
usr/share/cups/templates/add-printer.tmpl
usr/share/cups/templates/add-rss-subscription.tmpl
usr/share/cups/templates/admin.tmpl
+usr/share/cups/templates/ca
+usr/share/cups/templates/ca/add-class.tmpl
+usr/share/cups/templates/ca/add-printer.tmpl
+usr/share/cups/templates/ca/add-rss-subscription.tmpl
+usr/share/cups/templates/ca/admin.tmpl
+usr/share/cups/templates/ca/choose-device.tmpl
+usr/share/cups/templates/ca/choose-make.tmpl
+usr/share/cups/templates/ca/choose-model.tmpl
+usr/share/cups/templates/ca/choose-serial.tmpl
+usr/share/cups/templates/ca/choose-uri.tmpl
+usr/share/cups/templates/ca/class-added.tmpl
+usr/share/cups/templates/ca/class-confirm.tmpl
+usr/share/cups/templates/ca/class-deleted.tmpl
+usr/share/cups/templates/ca/class-jobs-header.tmpl
+usr/share/cups/templates/ca/class-modified.tmpl
+usr/share/cups/templates/ca/class.tmpl
+usr/share/cups/templates/ca/classes-header.tmpl
+usr/share/cups/templates/ca/classes.tmpl
+usr/share/cups/templates/ca/command.tmpl
+usr/share/cups/templates/ca/edit-config.tmpl
+usr/share/cups/templates/ca/error-op.tmpl
+usr/share/cups/templates/ca/error.tmpl
+usr/share/cups/templates/ca/header.tmpl
+usr/share/cups/templates/ca/help-header.tmpl
+usr/share/cups/templates/ca/help-printable.tmpl
+usr/share/cups/templates/ca/help-trailer.tmpl
+usr/share/cups/templates/ca/job-cancel.tmpl
+usr/share/cups/templates/ca/job-hold.tmpl
+usr/share/cups/templates/ca/job-move.tmpl
+usr/share/cups/templates/ca/job-moved.tmpl
+usr/share/cups/templates/ca/job-release.tmpl
+usr/share/cups/templates/ca/job-restart.tmpl
+usr/share/cups/templates/ca/jobs-header.tmpl
+usr/share/cups/templates/ca/jobs.tmpl
+usr/share/cups/templates/ca/list-available-printers.tmpl
+usr/share/cups/templates/ca/modify-class.tmpl
+usr/share/cups/templates/ca/modify-printer.tmpl
+usr/share/cups/templates/ca/norestart.tmpl
+usr/share/cups/templates/ca/option-boolean.tmpl
+usr/share/cups/templates/ca/option-conflict.tmpl
+usr/share/cups/templates/ca/option-header.tmpl
+usr/share/cups/templates/ca/option-pickmany.tmpl
+usr/share/cups/templates/ca/option-pickone.tmpl
+usr/share/cups/templates/ca/option-trailer.tmpl
+usr/share/cups/templates/ca/pager.tmpl
+usr/share/cups/templates/ca/printer-accept.tmpl
+usr/share/cups/templates/ca/printer-added.tmpl
+usr/share/cups/templates/ca/printer-configured.tmpl
+usr/share/cups/templates/ca/printer-confirm.tmpl
+usr/share/cups/templates/ca/printer-default.tmpl
+usr/share/cups/templates/ca/printer-deleted.tmpl
+usr/share/cups/templates/ca/printer-jobs-header.tmpl
+usr/share/cups/templates/ca/printer-modified.tmpl
+usr/share/cups/templates/ca/printer-purge.tmpl
+usr/share/cups/templates/ca/printer-reject.tmpl
+usr/share/cups/templates/ca/printer-start.tmpl
+usr/share/cups/templates/ca/printer-stop.tmpl
+usr/share/cups/templates/ca/printer.tmpl
+usr/share/cups/templates/ca/printers-header.tmpl
+usr/share/cups/templates/ca/printers.tmpl
+usr/share/cups/templates/ca/restart.tmpl
+usr/share/cups/templates/ca/samba-export.tmpl
+usr/share/cups/templates/ca/samba-exported.tmpl
+usr/share/cups/templates/ca/search.tmpl
+usr/share/cups/templates/ca/set-printer-options-header.tmpl
+usr/share/cups/templates/ca/set-printer-options-trailer.tmpl
+usr/share/cups/templates/ca/subscription-added.tmpl
+usr/share/cups/templates/ca/subscription-canceled.tmpl
+usr/share/cups/templates/ca/test-page.tmpl
+usr/share/cups/templates/ca/trailer.tmpl
+usr/share/cups/templates/ca/users.tmpl
usr/share/cups/templates/choose-device.tmpl
usr/share/cups/templates/choose-make.tmpl
usr/share/cups/templates/choose-model.tmpl
@@ -226,367 +268,297 @@ usr/share/cups/templates/class.tmpl
usr/share/cups/templates/classes-header.tmpl
usr/share/cups/templates/classes.tmpl
usr/share/cups/templates/command.tmpl
-usr/share/cups/templates/de
-usr/share/cups/templates/de/add-class.tmpl
-usr/share/cups/templates/de/add-printer.tmpl
-usr/share/cups/templates/de/add-rss-subscription.tmpl
-usr/share/cups/templates/de/admin.tmpl
-usr/share/cups/templates/de/choose-device.tmpl
-usr/share/cups/templates/de/choose-make.tmpl
-usr/share/cups/templates/de/choose-model.tmpl
-usr/share/cups/templates/de/choose-serial.tmpl
-usr/share/cups/templates/de/choose-uri.tmpl
-usr/share/cups/templates/de/class-added.tmpl
-usr/share/cups/templates/de/class-confirm.tmpl
-usr/share/cups/templates/de/class-deleted.tmpl
-usr/share/cups/templates/de/class-jobs-header.tmpl
-usr/share/cups/templates/de/class-modified.tmpl
-usr/share/cups/templates/de/class.tmpl
-usr/share/cups/templates/de/classes-header.tmpl
-usr/share/cups/templates/de/classes.tmpl
-usr/share/cups/templates/de/command.tmpl
-usr/share/cups/templates/de/edit-config.tmpl
-usr/share/cups/templates/de/error-op.tmpl
-usr/share/cups/templates/de/error.tmpl
-usr/share/cups/templates/de/header.tmpl
-usr/share/cups/templates/de/help-header.tmpl
-usr/share/cups/templates/de/help-printable.tmpl
-usr/share/cups/templates/de/help-trailer.tmpl
-usr/share/cups/templates/de/job-cancel.tmpl
-usr/share/cups/templates/de/job-hold.tmpl
-usr/share/cups/templates/de/job-move.tmpl
-usr/share/cups/templates/de/job-moved.tmpl
-usr/share/cups/templates/de/job-release.tmpl
-usr/share/cups/templates/de/job-restart.tmpl
-usr/share/cups/templates/de/jobs-header.tmpl
-usr/share/cups/templates/de/jobs.tmpl
-usr/share/cups/templates/de/list-available-printers.tmpl
-usr/share/cups/templates/de/modify-class.tmpl
-usr/share/cups/templates/de/modify-printer.tmpl
-usr/share/cups/templates/de/norestart.tmpl
-usr/share/cups/templates/de/option-boolean.tmpl
-usr/share/cups/templates/de/option-conflict.tmpl
-usr/share/cups/templates/de/option-header.tmpl
-usr/share/cups/templates/de/option-pickmany.tmpl
-usr/share/cups/templates/de/option-pickone.tmpl
-usr/share/cups/templates/de/option-trailer.tmpl
-usr/share/cups/templates/de/pager.tmpl
-usr/share/cups/templates/de/printer-accept.tmpl
-usr/share/cups/templates/de/printer-added.tmpl
-usr/share/cups/templates/de/printer-configured.tmpl
-usr/share/cups/templates/de/printer-confirm.tmpl
-usr/share/cups/templates/de/printer-default.tmpl
-usr/share/cups/templates/de/printer-deleted.tmpl
-usr/share/cups/templates/de/printer-jobs-header.tmpl
-usr/share/cups/templates/de/printer-modified.tmpl
-usr/share/cups/templates/de/printer-purge.tmpl
-usr/share/cups/templates/de/printer-reject.tmpl
-usr/share/cups/templates/de/printer-start.tmpl
-usr/share/cups/templates/de/printer-stop.tmpl
-usr/share/cups/templates/de/printer.tmpl
-usr/share/cups/templates/de/printers-header.tmpl
-usr/share/cups/templates/de/printers.tmpl
-usr/share/cups/templates/de/restart.tmpl
-usr/share/cups/templates/de/samba-export.tmpl
-usr/share/cups/templates/de/samba-exported.tmpl
-usr/share/cups/templates/de/search.tmpl
-usr/share/cups/templates/de/set-printer-options-header.tmpl
-usr/share/cups/templates/de/set-printer-options-trailer.tmpl
-usr/share/cups/templates/de/subscription-added.tmpl
-usr/share/cups/templates/de/subscription-canceled.tmpl
-usr/share/cups/templates/de/test-page.tmpl
-usr/share/cups/templates/de/trailer.tmpl
-usr/share/cups/templates/de/users.tmpl
+usr/share/cups/templates/cs
+usr/share/cups/templates/cs/add-class.tmpl
+usr/share/cups/templates/cs/add-printer.tmpl
+usr/share/cups/templates/cs/add-rss-subscription.tmpl
+usr/share/cups/templates/cs/admin.tmpl
+usr/share/cups/templates/cs/choose-device.tmpl
+usr/share/cups/templates/cs/choose-make.tmpl
+usr/share/cups/templates/cs/choose-model.tmpl
+usr/share/cups/templates/cs/choose-serial.tmpl
+usr/share/cups/templates/cs/choose-uri.tmpl
+usr/share/cups/templates/cs/class-added.tmpl
+usr/share/cups/templates/cs/class-confirm.tmpl
+usr/share/cups/templates/cs/class-deleted.tmpl
+usr/share/cups/templates/cs/class-jobs-header.tmpl
+usr/share/cups/templates/cs/class-modified.tmpl
+usr/share/cups/templates/cs/class.tmpl
+usr/share/cups/templates/cs/classes-header.tmpl
+usr/share/cups/templates/cs/classes.tmpl
+usr/share/cups/templates/cs/command.tmpl
+usr/share/cups/templates/cs/edit-config.tmpl
+usr/share/cups/templates/cs/error-op.tmpl
+usr/share/cups/templates/cs/error.tmpl
+usr/share/cups/templates/cs/header.tmpl
+usr/share/cups/templates/cs/help-header.tmpl
+usr/share/cups/templates/cs/help-printable.tmpl
+usr/share/cups/templates/cs/help-trailer.tmpl
+usr/share/cups/templates/cs/job-cancel.tmpl
+usr/share/cups/templates/cs/job-hold.tmpl
+usr/share/cups/templates/cs/job-move.tmpl
+usr/share/cups/templates/cs/job-moved.tmpl
+usr/share/cups/templates/cs/job-release.tmpl
+usr/share/cups/templates/cs/job-restart.tmpl
+usr/share/cups/templates/cs/jobs-header.tmpl
+usr/share/cups/templates/cs/jobs.tmpl
+usr/share/cups/templates/cs/list-available-printers.tmpl
+usr/share/cups/templates/cs/modify-class.tmpl
+usr/share/cups/templates/cs/modify-printer.tmpl
+usr/share/cups/templates/cs/norestart.tmpl
+usr/share/cups/templates/cs/option-boolean.tmpl
+usr/share/cups/templates/cs/option-conflict.tmpl
+usr/share/cups/templates/cs/option-header.tmpl
+usr/share/cups/templates/cs/option-pickmany.tmpl
+usr/share/cups/templates/cs/option-pickone.tmpl
+usr/share/cups/templates/cs/option-trailer.tmpl
+usr/share/cups/templates/cs/pager.tmpl
+usr/share/cups/templates/cs/printer-accept.tmpl
+usr/share/cups/templates/cs/printer-added.tmpl
+usr/share/cups/templates/cs/printer-configured.tmpl
+usr/share/cups/templates/cs/printer-confirm.tmpl
+usr/share/cups/templates/cs/printer-default.tmpl
+usr/share/cups/templates/cs/printer-deleted.tmpl
+usr/share/cups/templates/cs/printer-jobs-header.tmpl
+usr/share/cups/templates/cs/printer-modified.tmpl
+usr/share/cups/templates/cs/printer-purge.tmpl
+usr/share/cups/templates/cs/printer-reject.tmpl
+usr/share/cups/templates/cs/printer-start.tmpl
+usr/share/cups/templates/cs/printer-stop.tmpl
+usr/share/cups/templates/cs/printer.tmpl
+usr/share/cups/templates/cs/printers-header.tmpl
+usr/share/cups/templates/cs/printers.tmpl
+usr/share/cups/templates/cs/restart.tmpl
+usr/share/cups/templates/cs/samba-export.tmpl
+usr/share/cups/templates/cs/samba-exported.tmpl
+usr/share/cups/templates/cs/search.tmpl
+usr/share/cups/templates/cs/set-printer-options-header.tmpl
+usr/share/cups/templates/cs/set-printer-options-trailer.tmpl
+usr/share/cups/templates/cs/subscription-added.tmpl
+usr/share/cups/templates/cs/subscription-canceled.tmpl
+usr/share/cups/templates/cs/test-page.tmpl
+usr/share/cups/templates/cs/trailer.tmpl
+usr/share/cups/templates/cs/users.tmpl
usr/share/cups/templates/edit-config.tmpl
usr/share/cups/templates/error-op.tmpl
usr/share/cups/templates/error.tmpl
-#usr/share/cups/templates/es
-#usr/share/cups/templates/es/add-class.tmpl
-#usr/share/cups/templates/es/add-printer.tmpl
-#usr/share/cups/templates/es/add-rss-subscription.tmpl
-#usr/share/cups/templates/es/admin.tmpl
-#usr/share/cups/templates/es/choose-device.tmpl
-#usr/share/cups/templates/es/choose-make.tmpl
-#usr/share/cups/templates/es/choose-model.tmpl
-#usr/share/cups/templates/es/choose-serial.tmpl
-#usr/share/cups/templates/es/choose-uri.tmpl
-#usr/share/cups/templates/es/class-added.tmpl
-#usr/share/cups/templates/es/class-confirm.tmpl
-#usr/share/cups/templates/es/class-deleted.tmpl
-#usr/share/cups/templates/es/class-jobs-header.tmpl
-#usr/share/cups/templates/es/class-modified.tmpl
-#usr/share/cups/templates/es/class.tmpl
-#usr/share/cups/templates/es/classes-header.tmpl
-#usr/share/cups/templates/es/classes.tmpl
-#usr/share/cups/templates/es/command.tmpl
-#usr/share/cups/templates/es/edit-config.tmpl
-#usr/share/cups/templates/es/error-op.tmpl
-#usr/share/cups/templates/es/error.tmpl
-#usr/share/cups/templates/es/header.tmpl
-#usr/share/cups/templates/es/help-header.tmpl
-#usr/share/cups/templates/es/help-printable.tmpl
-#usr/share/cups/templates/es/help-trailer.tmpl
-#usr/share/cups/templates/es/job-cancel.tmpl
-#usr/share/cups/templates/es/job-hold.tmpl
-#usr/share/cups/templates/es/job-move.tmpl
-#usr/share/cups/templates/es/job-moved.tmpl
-#usr/share/cups/templates/es/job-release.tmpl
-#usr/share/cups/templates/es/job-restart.tmpl
-#usr/share/cups/templates/es/jobs-header.tmpl
-#usr/share/cups/templates/es/jobs.tmpl
-#usr/share/cups/templates/es/list-available-printers.tmpl
-#usr/share/cups/templates/es/modify-class.tmpl
-#usr/share/cups/templates/es/modify-printer.tmpl
-#usr/share/cups/templates/es/norestart.tmpl
-#usr/share/cups/templates/es/option-boolean.tmpl
-#usr/share/cups/templates/es/option-conflict.tmpl
-#usr/share/cups/templates/es/option-header.tmpl
-#usr/share/cups/templates/es/option-pickmany.tmpl
-#usr/share/cups/templates/es/option-pickone.tmpl
-#usr/share/cups/templates/es/option-trailer.tmpl
-#usr/share/cups/templates/es/pager.tmpl
-#usr/share/cups/templates/es/printer-accept.tmpl
-#usr/share/cups/templates/es/printer-added.tmpl
-#usr/share/cups/templates/es/printer-configured.tmpl
-#usr/share/cups/templates/es/printer-confirm.tmpl
-#usr/share/cups/templates/es/printer-default.tmpl
-#usr/share/cups/templates/es/printer-deleted.tmpl
-#usr/share/cups/templates/es/printer-jobs-header.tmpl
-#usr/share/cups/templates/es/printer-modified.tmpl
-#usr/share/cups/templates/es/printer-purge.tmpl
-#usr/share/cups/templates/es/printer-reject.tmpl
-#usr/share/cups/templates/es/printer-start.tmpl
-#usr/share/cups/templates/es/printer-stop.tmpl
-#usr/share/cups/templates/es/printer.tmpl
-#usr/share/cups/templates/es/printers-header.tmpl
-#usr/share/cups/templates/es/printers.tmpl
-#usr/share/cups/templates/es/restart.tmpl
-#usr/share/cups/templates/es/samba-export.tmpl
-#usr/share/cups/templates/es/samba-exported.tmpl
-#usr/share/cups/templates/es/search.tmpl
-#usr/share/cups/templates/es/set-printer-options-header.tmpl
-#usr/share/cups/templates/es/set-printer-options-trailer.tmpl
-#usr/share/cups/templates/es/subscription-added.tmpl
-#usr/share/cups/templates/es/subscription-canceled.tmpl
-#usr/share/cups/templates/es/test-page.tmpl
-#usr/share/cups/templates/es/trailer.tmpl
-#usr/share/cups/templates/es/users.tmpl
-#usr/share/cups/templates/eu
-#usr/share/cups/templates/eu/add-class.tmpl
-#usr/share/cups/templates/eu/add-printer.tmpl
-#usr/share/cups/templates/eu/add-rss-subscription.tmpl
-#usr/share/cups/templates/eu/admin.tmpl
-#usr/share/cups/templates/eu/choose-device.tmpl
-#usr/share/cups/templates/eu/choose-make.tmpl
-#usr/share/cups/templates/eu/choose-model.tmpl
-#usr/share/cups/templates/eu/choose-serial.tmpl
-#usr/share/cups/templates/eu/choose-uri.tmpl
-#usr/share/cups/templates/eu/class-added.tmpl
-#usr/share/cups/templates/eu/class-confirm.tmpl
-#usr/share/cups/templates/eu/class-deleted.tmpl
-#usr/share/cups/templates/eu/class-jobs-header.tmpl
-#usr/share/cups/templates/eu/class-modified.tmpl
-#usr/share/cups/templates/eu/class.tmpl
-#usr/share/cups/templates/eu/classes-header.tmpl
-#usr/share/cups/templates/eu/classes.tmpl
-#usr/share/cups/templates/eu/command.tmpl
-#usr/share/cups/templates/eu/edit-config.tmpl
-#usr/share/cups/templates/eu/error-op.tmpl
-#usr/share/cups/templates/eu/error.tmpl
-#usr/share/cups/templates/eu/header.tmpl
-#usr/share/cups/templates/eu/help-header.tmpl
-#usr/share/cups/templates/eu/help-printable.tmpl
-#usr/share/cups/templates/eu/help-trailer.tmpl
-#usr/share/cups/templates/eu/job-cancel.tmpl
-#usr/share/cups/templates/eu/job-hold.tmpl
-#usr/share/cups/templates/eu/job-move.tmpl
-#usr/share/cups/templates/eu/job-moved.tmpl
-#usr/share/cups/templates/eu/job-release.tmpl
-#usr/share/cups/templates/eu/job-restart.tmpl
-#usr/share/cups/templates/eu/jobs-header.tmpl
-#usr/share/cups/templates/eu/jobs.tmpl
-#usr/share/cups/templates/eu/list-available-printers.tmpl
-#usr/share/cups/templates/eu/modify-class.tmpl
-#usr/share/cups/templates/eu/modify-printer.tmpl
-#usr/share/cups/templates/eu/norestart.tmpl
-#usr/share/cups/templates/eu/option-boolean.tmpl
-#usr/share/cups/templates/eu/option-conflict.tmpl
-#usr/share/cups/templates/eu/option-header.tmpl
-#usr/share/cups/templates/eu/option-pickmany.tmpl
-#usr/share/cups/templates/eu/option-pickone.tmpl
-#usr/share/cups/templates/eu/option-trailer.tmpl
-#usr/share/cups/templates/eu/pager.tmpl
-#usr/share/cups/templates/eu/printer-accept.tmpl
-#usr/share/cups/templates/eu/printer-added.tmpl
-#usr/share/cups/templates/eu/printer-configured.tmpl
-#usr/share/cups/templates/eu/printer-confirm.tmpl
-#usr/share/cups/templates/eu/printer-default.tmpl
-#usr/share/cups/templates/eu/printer-deleted.tmpl
-#usr/share/cups/templates/eu/printer-jobs-header.tmpl
-#usr/share/cups/templates/eu/printer-modified.tmpl
-#usr/share/cups/templates/eu/printer-purge.tmpl
-#usr/share/cups/templates/eu/printer-reject.tmpl
-#usr/share/cups/templates/eu/printer-start.tmpl
-#usr/share/cups/templates/eu/printer-stop.tmpl
-#usr/share/cups/templates/eu/printer.tmpl
-#usr/share/cups/templates/eu/printers-header.tmpl
-#usr/share/cups/templates/eu/printers.tmpl
-#usr/share/cups/templates/eu/restart.tmpl
-#usr/share/cups/templates/eu/samba-export.tmpl
-#usr/share/cups/templates/eu/samba-exported.tmpl
-#usr/share/cups/templates/eu/search.tmpl
-#usr/share/cups/templates/eu/set-printer-options-header.tmpl
-#usr/share/cups/templates/eu/set-printer-options-trailer.tmpl
-#usr/share/cups/templates/eu/subscription-added.tmpl
-#usr/share/cups/templates/eu/subscription-canceled.tmpl
-#usr/share/cups/templates/eu/test-page.tmpl
-#usr/share/cups/templates/eu/trailer.tmpl
-#usr/share/cups/templates/eu/users.tmpl
+usr/share/cups/templates/es
+usr/share/cups/templates/es/add-class.tmpl
+usr/share/cups/templates/es/add-printer.tmpl
+usr/share/cups/templates/es/add-rss-subscription.tmpl
+usr/share/cups/templates/es/admin.tmpl
+usr/share/cups/templates/es/choose-device.tmpl
+usr/share/cups/templates/es/choose-make.tmpl
+usr/share/cups/templates/es/choose-model.tmpl
+usr/share/cups/templates/es/choose-serial.tmpl
+usr/share/cups/templates/es/choose-uri.tmpl
+usr/share/cups/templates/es/class-added.tmpl
+usr/share/cups/templates/es/class-confirm.tmpl
+usr/share/cups/templates/es/class-deleted.tmpl
+usr/share/cups/templates/es/class-jobs-header.tmpl
+usr/share/cups/templates/es/class-modified.tmpl
+usr/share/cups/templates/es/class.tmpl
+usr/share/cups/templates/es/classes-header.tmpl
+usr/share/cups/templates/es/classes.tmpl
+usr/share/cups/templates/es/command.tmpl
+usr/share/cups/templates/es/edit-config.tmpl
+usr/share/cups/templates/es/error-op.tmpl
+usr/share/cups/templates/es/error.tmpl
+usr/share/cups/templates/es/header.tmpl
+usr/share/cups/templates/es/help-header.tmpl
+usr/share/cups/templates/es/help-printable.tmpl
+usr/share/cups/templates/es/help-trailer.tmpl
+usr/share/cups/templates/es/job-cancel.tmpl
+usr/share/cups/templates/es/job-hold.tmpl
+usr/share/cups/templates/es/job-move.tmpl
+usr/share/cups/templates/es/job-moved.tmpl
+usr/share/cups/templates/es/job-release.tmpl
+usr/share/cups/templates/es/job-restart.tmpl
+usr/share/cups/templates/es/jobs-header.tmpl
+usr/share/cups/templates/es/jobs.tmpl
+usr/share/cups/templates/es/list-available-printers.tmpl
+usr/share/cups/templates/es/modify-class.tmpl
+usr/share/cups/templates/es/modify-printer.tmpl
+usr/share/cups/templates/es/norestart.tmpl
+usr/share/cups/templates/es/option-boolean.tmpl
+usr/share/cups/templates/es/option-conflict.tmpl
+usr/share/cups/templates/es/option-header.tmpl
+usr/share/cups/templates/es/option-pickmany.tmpl
+usr/share/cups/templates/es/option-pickone.tmpl
+usr/share/cups/templates/es/option-trailer.tmpl
+usr/share/cups/templates/es/pager.tmpl
+usr/share/cups/templates/es/printer-accept.tmpl
+usr/share/cups/templates/es/printer-added.tmpl
+usr/share/cups/templates/es/printer-configured.tmpl
+usr/share/cups/templates/es/printer-confirm.tmpl
+usr/share/cups/templates/es/printer-default.tmpl
+usr/share/cups/templates/es/printer-deleted.tmpl
+usr/share/cups/templates/es/printer-jobs-header.tmpl
+usr/share/cups/templates/es/printer-modified.tmpl
+usr/share/cups/templates/es/printer-purge.tmpl
+usr/share/cups/templates/es/printer-reject.tmpl
+usr/share/cups/templates/es/printer-start.tmpl
+usr/share/cups/templates/es/printer-stop.tmpl
+usr/share/cups/templates/es/printer.tmpl
+usr/share/cups/templates/es/printers-header.tmpl
+usr/share/cups/templates/es/printers.tmpl
+usr/share/cups/templates/es/restart.tmpl
+usr/share/cups/templates/es/samba-export.tmpl
+usr/share/cups/templates/es/samba-exported.tmpl
+usr/share/cups/templates/es/search.tmpl
+usr/share/cups/templates/es/set-printer-options-header.tmpl
+usr/share/cups/templates/es/set-printer-options-trailer.tmpl
+usr/share/cups/templates/es/subscription-added.tmpl
+usr/share/cups/templates/es/subscription-canceled.tmpl
+usr/share/cups/templates/es/test-page.tmpl
+usr/share/cups/templates/es/trailer.tmpl
+usr/share/cups/templates/es/users.tmpl
+usr/share/cups/templates/fr
+usr/share/cups/templates/fr/add-class.tmpl
+usr/share/cups/templates/fr/add-printer.tmpl
+usr/share/cups/templates/fr/add-rss-subscription.tmpl
+usr/share/cups/templates/fr/admin.tmpl
+usr/share/cups/templates/fr/choose-device.tmpl
+usr/share/cups/templates/fr/choose-make.tmpl
+usr/share/cups/templates/fr/choose-model.tmpl
+usr/share/cups/templates/fr/choose-serial.tmpl
+usr/share/cups/templates/fr/choose-uri.tmpl
+usr/share/cups/templates/fr/class-added.tmpl
+usr/share/cups/templates/fr/class-confirm.tmpl
+usr/share/cups/templates/fr/class-deleted.tmpl
+usr/share/cups/templates/fr/class-jobs-header.tmpl
+usr/share/cups/templates/fr/class-modified.tmpl
+usr/share/cups/templates/fr/class.tmpl
+usr/share/cups/templates/fr/classes-header.tmpl
+usr/share/cups/templates/fr/classes.tmpl
+usr/share/cups/templates/fr/command.tmpl
+usr/share/cups/templates/fr/edit-config.tmpl
+usr/share/cups/templates/fr/error-op.tmpl
+usr/share/cups/templates/fr/error.tmpl
+usr/share/cups/templates/fr/header.tmpl
+usr/share/cups/templates/fr/help-header.tmpl
+usr/share/cups/templates/fr/help-printable.tmpl
+usr/share/cups/templates/fr/help-trailer.tmpl
+usr/share/cups/templates/fr/job-cancel.tmpl
+usr/share/cups/templates/fr/job-hold.tmpl
+usr/share/cups/templates/fr/job-move.tmpl
+usr/share/cups/templates/fr/job-moved.tmpl
+usr/share/cups/templates/fr/job-release.tmpl
+usr/share/cups/templates/fr/job-restart.tmpl
+usr/share/cups/templates/fr/jobs-header.tmpl
+usr/share/cups/templates/fr/jobs.tmpl
+usr/share/cups/templates/fr/list-available-printers.tmpl
+usr/share/cups/templates/fr/modify-class.tmpl
+usr/share/cups/templates/fr/modify-printer.tmpl
+usr/share/cups/templates/fr/norestart.tmpl
+usr/share/cups/templates/fr/option-boolean.tmpl
+usr/share/cups/templates/fr/option-conflict.tmpl
+usr/share/cups/templates/fr/option-header.tmpl
+usr/share/cups/templates/fr/option-pickmany.tmpl
+usr/share/cups/templates/fr/option-pickone.tmpl
+usr/share/cups/templates/fr/option-trailer.tmpl
+usr/share/cups/templates/fr/pager.tmpl
+usr/share/cups/templates/fr/printer-accept.tmpl
+usr/share/cups/templates/fr/printer-added.tmpl
+usr/share/cups/templates/fr/printer-configured.tmpl
+usr/share/cups/templates/fr/printer-confirm.tmpl
+usr/share/cups/templates/fr/printer-default.tmpl
+usr/share/cups/templates/fr/printer-deleted.tmpl
+usr/share/cups/templates/fr/printer-jobs-header.tmpl
+usr/share/cups/templates/fr/printer-modified.tmpl
+usr/share/cups/templates/fr/printer-purge.tmpl
+usr/share/cups/templates/fr/printer-reject.tmpl
+usr/share/cups/templates/fr/printer-start.tmpl
+usr/share/cups/templates/fr/printer-stop.tmpl
+usr/share/cups/templates/fr/printer.tmpl
+usr/share/cups/templates/fr/printers-header.tmpl
+usr/share/cups/templates/fr/printers.tmpl
+usr/share/cups/templates/fr/restart.tmpl
+usr/share/cups/templates/fr/samba-export.tmpl
+usr/share/cups/templates/fr/samba-exported.tmpl
+usr/share/cups/templates/fr/search.tmpl
+usr/share/cups/templates/fr/set-printer-options-header.tmpl
+usr/share/cups/templates/fr/set-printer-options-trailer.tmpl
+usr/share/cups/templates/fr/subscription-added.tmpl
+usr/share/cups/templates/fr/subscription-canceled.tmpl
+usr/share/cups/templates/fr/test-page.tmpl
+usr/share/cups/templates/fr/trailer.tmpl
+usr/share/cups/templates/fr/users.tmpl
usr/share/cups/templates/header.tmpl
usr/share/cups/templates/help-header.tmpl
usr/share/cups/templates/help-printable.tmpl
usr/share/cups/templates/help-trailer.tmpl
-#usr/share/cups/templates/id
-#usr/share/cups/templates/id/add-class.tmpl
-#usr/share/cups/templates/id/add-printer.tmpl
-#usr/share/cups/templates/id/add-rss-subscription.tmpl
-#usr/share/cups/templates/id/admin.tmpl
-#usr/share/cups/templates/id/choose-device.tmpl
-#usr/share/cups/templates/id/choose-make.tmpl
-#usr/share/cups/templates/id/choose-model.tmpl
-#usr/share/cups/templates/id/choose-serial.tmpl
-#usr/share/cups/templates/id/choose-uri.tmpl
-#usr/share/cups/templates/id/class-added.tmpl
-#usr/share/cups/templates/id/class-confirm.tmpl
-#usr/share/cups/templates/id/class-deleted.tmpl
-#usr/share/cups/templates/id/class-jobs-header.tmpl
-#usr/share/cups/templates/id/class-modified.tmpl
-#usr/share/cups/templates/id/class.tmpl
-#usr/share/cups/templates/id/classes-header.tmpl
-#usr/share/cups/templates/id/classes.tmpl
-#usr/share/cups/templates/id/command.tmpl
-#usr/share/cups/templates/id/edit-config.tmpl
-#usr/share/cups/templates/id/error-op.tmpl
-#usr/share/cups/templates/id/error.tmpl
-#usr/share/cups/templates/id/header.tmpl
-#usr/share/cups/templates/id/help-header.tmpl
-#usr/share/cups/templates/id/help-printable.tmpl
-#usr/share/cups/templates/id/help-trailer.tmpl
-#usr/share/cups/templates/id/job-cancel.tmpl
-#usr/share/cups/templates/id/job-hold.tmpl
-#usr/share/cups/templates/id/job-move.tmpl
-#usr/share/cups/templates/id/job-moved.tmpl
-#usr/share/cups/templates/id/job-release.tmpl
-#usr/share/cups/templates/id/job-restart.tmpl
-#usr/share/cups/templates/id/jobs-header.tmpl
-#usr/share/cups/templates/id/jobs.tmpl
-#usr/share/cups/templates/id/list-available-printers.tmpl
-#usr/share/cups/templates/id/modify-class.tmpl
-#usr/share/cups/templates/id/modify-printer.tmpl
-#usr/share/cups/templates/id/norestart.tmpl
-#usr/share/cups/templates/id/option-boolean.tmpl
-#usr/share/cups/templates/id/option-conflict.tmpl
-#usr/share/cups/templates/id/option-header.tmpl
-#usr/share/cups/templates/id/option-pickmany.tmpl
-#usr/share/cups/templates/id/option-pickone.tmpl
-#usr/share/cups/templates/id/option-trailer.tmpl
-#usr/share/cups/templates/id/pager.tmpl
-#usr/share/cups/templates/id/printer-accept.tmpl
-#usr/share/cups/templates/id/printer-added.tmpl
-#usr/share/cups/templates/id/printer-configured.tmpl
-#usr/share/cups/templates/id/printer-confirm.tmpl
-#usr/share/cups/templates/id/printer-default.tmpl
-#usr/share/cups/templates/id/printer-deleted.tmpl
-#usr/share/cups/templates/id/printer-jobs-header.tmpl
-#usr/share/cups/templates/id/printer-modified.tmpl
-#usr/share/cups/templates/id/printer-purge.tmpl
-#usr/share/cups/templates/id/printer-reject.tmpl
-#usr/share/cups/templates/id/printer-start.tmpl
-#usr/share/cups/templates/id/printer-stop.tmpl
-#usr/share/cups/templates/id/printer.tmpl
-#usr/share/cups/templates/id/printers-header.tmpl
-#usr/share/cups/templates/id/printers.tmpl
-#usr/share/cups/templates/id/restart.tmpl
-#usr/share/cups/templates/id/samba-export.tmpl
-#usr/share/cups/templates/id/samba-exported.tmpl
-#usr/share/cups/templates/id/search.tmpl
-#usr/share/cups/templates/id/set-printer-options-header.tmpl
-#usr/share/cups/templates/id/set-printer-options-trailer.tmpl
-#usr/share/cups/templates/id/subscription-added.tmpl
-#usr/share/cups/templates/id/subscription-canceled.tmpl
-#usr/share/cups/templates/id/test-page.tmpl
-#usr/share/cups/templates/id/trailer.tmpl
-#usr/share/cups/templates/id/users.tmpl
-#usr/share/cups/templates/it
-#usr/share/cups/templates/it/add-class.tmpl
-#usr/share/cups/templates/it/add-printer.tmpl
-#usr/share/cups/templates/it/add-rss-subscription.tmpl
-#usr/share/cups/templates/it/admin.tmpl
-#usr/share/cups/templates/it/choose-device.tmpl
-#usr/share/cups/templates/it/choose-make.tmpl
-#usr/share/cups/templates/it/choose-model.tmpl
-#usr/share/cups/templates/it/choose-serial.tmpl
-#usr/share/cups/templates/it/choose-uri.tmpl
-#usr/share/cups/templates/it/class-added.tmpl
-#usr/share/cups/templates/it/class-confirm.tmpl
-#usr/share/cups/templates/it/class-deleted.tmpl
-#usr/share/cups/templates/it/class-jobs-header.tmpl
-#usr/share/cups/templates/it/class-modified.tmpl
-#usr/share/cups/templates/it/class.tmpl
-#usr/share/cups/templates/it/classes-header.tmpl
-#usr/share/cups/templates/it/classes.tmpl
-#usr/share/cups/templates/it/command.tmpl
-#usr/share/cups/templates/it/edit-config.tmpl
-#usr/share/cups/templates/it/error-op.tmpl
-#usr/share/cups/templates/it/error.tmpl
-#usr/share/cups/templates/it/help-header.tmpl
-#usr/share/cups/templates/it/help-printable.tmpl
-#usr/share/cups/templates/it/help-trailer.tmpl
-#usr/share/cups/templates/it/job-cancel.tmpl
-#usr/share/cups/templates/it/job-hold.tmpl
-#usr/share/cups/templates/it/job-move.tmpl
-#usr/share/cups/templates/it/job-moved.tmpl
-#usr/share/cups/templates/it/job-release.tmpl
-#usr/share/cups/templates/it/job-restart.tmpl
-#usr/share/cups/templates/it/jobs-header.tmpl
-#usr/share/cups/templates/it/jobs.tmpl
-#usr/share/cups/templates/it/list-available-printers.tmpl
-#usr/share/cups/templates/it/modify-class.tmpl
-#usr/share/cups/templates/it/modify-printer.tmpl
-#usr/share/cups/templates/it/norestart.tmpl
-#usr/share/cups/templates/it/option-boolean.tmpl
-#usr/share/cups/templates/it/option-conflict.tmpl
-#usr/share/cups/templates/it/option-header.tmpl
-#usr/share/cups/templates/it/option-pickmany.tmpl
-#usr/share/cups/templates/it/option-pickone.tmpl
-#usr/share/cups/templates/it/option-trailer.tmpl
-#usr/share/cups/templates/it/pager.tmpl
-#usr/share/cups/templates/it/printer-accept.tmpl
-#usr/share/cups/templates/it/printer-added.tmpl
-#usr/share/cups/templates/it/printer-configured.tmpl
-#usr/share/cups/templates/it/printer-confirm.tmpl
-#usr/share/cups/templates/it/printer-default.tmpl
-#usr/share/cups/templates/it/printer-deleted.tmpl
-#usr/share/cups/templates/it/printer-jobs-header.tmpl
-#usr/share/cups/templates/it/printer-modified.tmpl
-#usr/share/cups/templates/it/printer-purge.tmpl
-#usr/share/cups/templates/it/printer-reject.tmpl
-#usr/share/cups/templates/it/printer-start.tmpl
-#usr/share/cups/templates/it/printer-stop.tmpl
-#usr/share/cups/templates/it/printer.tmpl
-#usr/share/cups/templates/it/printers-header.tmpl
-#usr/share/cups/templates/it/printers.tmpl
-#usr/share/cups/templates/it/restart.tmpl
-#usr/share/cups/templates/it/samba-export.tmpl
-#usr/share/cups/templates/it/samba-exported.tmpl
-#usr/share/cups/templates/it/search.tmpl
-#usr/share/cups/templates/it/set-printer-options-header.tmpl
-#usr/share/cups/templates/it/set-printer-options-trailer.tmpl
-#usr/share/cups/templates/it/subscription-added.tmpl
-#usr/share/cups/templates/it/subscription-canceled.tmpl
-#usr/share/cups/templates/it/test-page.tmpl
-#usr/share/cups/templates/it/trailer.tmpl
-#usr/share/cups/templates/it/users.tmpl
+usr/share/cups/templates/it
+usr/share/cups/templates/it/add-class.tmpl
+usr/share/cups/templates/it/add-printer.tmpl
+usr/share/cups/templates/it/add-rss-subscription.tmpl
+usr/share/cups/templates/it/admin.tmpl
+usr/share/cups/templates/it/choose-device.tmpl
+usr/share/cups/templates/it/choose-make.tmpl
+usr/share/cups/templates/it/choose-model.tmpl
+usr/share/cups/templates/it/choose-serial.tmpl
+usr/share/cups/templates/it/choose-uri.tmpl
+usr/share/cups/templates/it/class-added.tmpl
+usr/share/cups/templates/it/class-confirm.tmpl
+usr/share/cups/templates/it/class-deleted.tmpl
+usr/share/cups/templates/it/class-jobs-header.tmpl
+usr/share/cups/templates/it/class-modified.tmpl
+usr/share/cups/templates/it/class.tmpl
+usr/share/cups/templates/it/classes-header.tmpl
+usr/share/cups/templates/it/classes.tmpl
+usr/share/cups/templates/it/command.tmpl
+usr/share/cups/templates/it/edit-config.tmpl
+usr/share/cups/templates/it/error-op.tmpl
+usr/share/cups/templates/it/error.tmpl
+usr/share/cups/templates/it/header.tmpl
+usr/share/cups/templates/it/help-header.tmpl
+usr/share/cups/templates/it/help-printable.tmpl
+usr/share/cups/templates/it/help-trailer.tmpl
+usr/share/cups/templates/it/job-cancel.tmpl
+usr/share/cups/templates/it/job-hold.tmpl
+usr/share/cups/templates/it/job-move.tmpl
+usr/share/cups/templates/it/job-moved.tmpl
+usr/share/cups/templates/it/job-release.tmpl
+usr/share/cups/templates/it/job-restart.tmpl
+usr/share/cups/templates/it/jobs-header.tmpl
+usr/share/cups/templates/it/jobs.tmpl
+usr/share/cups/templates/it/list-available-printers.tmpl
+usr/share/cups/templates/it/modify-class.tmpl
+usr/share/cups/templates/it/modify-printer.tmpl
+usr/share/cups/templates/it/norestart.tmpl
+usr/share/cups/templates/it/option-boolean.tmpl
+usr/share/cups/templates/it/option-conflict.tmpl
+usr/share/cups/templates/it/option-header.tmpl
+usr/share/cups/templates/it/option-pickmany.tmpl
+usr/share/cups/templates/it/option-pickone.tmpl
+usr/share/cups/templates/it/option-trailer.tmpl
+usr/share/cups/templates/it/pager.tmpl
+usr/share/cups/templates/it/printer-accept.tmpl
+usr/share/cups/templates/it/printer-added.tmpl
+usr/share/cups/templates/it/printer-configured.tmpl
+usr/share/cups/templates/it/printer-confirm.tmpl
+usr/share/cups/templates/it/printer-default.tmpl
+usr/share/cups/templates/it/printer-deleted.tmpl
+usr/share/cups/templates/it/printer-jobs-header.tmpl
+usr/share/cups/templates/it/printer-modified.tmpl
+usr/share/cups/templates/it/printer-purge.tmpl
+usr/share/cups/templates/it/printer-reject.tmpl
+usr/share/cups/templates/it/printer-start.tmpl
+usr/share/cups/templates/it/printer-stop.tmpl
+usr/share/cups/templates/it/printer.tmpl
+usr/share/cups/templates/it/printers-header.tmpl
+usr/share/cups/templates/it/printers.tmpl
+usr/share/cups/templates/it/restart.tmpl
+usr/share/cups/templates/it/samba-export.tmpl
+usr/share/cups/templates/it/samba-exported.tmpl
+usr/share/cups/templates/it/search.tmpl
+usr/share/cups/templates/it/set-printer-options-header.tmpl
+usr/share/cups/templates/it/set-printer-options-trailer.tmpl
+usr/share/cups/templates/it/subscription-added.tmpl
+usr/share/cups/templates/it/subscription-canceled.tmpl
+usr/share/cups/templates/it/test-page.tmpl
+usr/share/cups/templates/it/trailer.tmpl
+usr/share/cups/templates/it/users.tmpl
#usr/share/cups/templates/ja
#usr/share/cups/templates/ja/add-class.tmpl
#usr/share/cups/templates/ja/add-printer.tmpl
@@ -677,77 +649,6 @@ usr/share/cups/templates/option-pickmany.tmpl
usr/share/cups/templates/option-pickone.tmpl
usr/share/cups/templates/option-trailer.tmpl
usr/share/cups/templates/pager.tmpl
-#usr/share/cups/templates/pl
-#usr/share/cups/templates/pl/add-class.tmpl
-#usr/share/cups/templates/pl/add-printer.tmpl
-#usr/share/cups/templates/pl/add-rss-subscription.tmpl
-#usr/share/cups/templates/pl/admin.tmpl
-#usr/share/cups/templates/pl/choose-device.tmpl
-#usr/share/cups/templates/pl/choose-make.tmpl
-#usr/share/cups/templates/pl/choose-model.tmpl
-#usr/share/cups/templates/pl/choose-serial.tmpl
-#usr/share/cups/templates/pl/choose-uri.tmpl
-#usr/share/cups/templates/pl/class-added.tmpl
-#usr/share/cups/templates/pl/class-confirm.tmpl
-#usr/share/cups/templates/pl/class-deleted.tmpl
-#usr/share/cups/templates/pl/class-jobs-header.tmpl
-#usr/share/cups/templates/pl/class-modified.tmpl
-#usr/share/cups/templates/pl/class.tmpl
-#usr/share/cups/templates/pl/classes-header.tmpl
-#usr/share/cups/templates/pl/classes.tmpl
-#usr/share/cups/templates/pl/command.tmpl
-#usr/share/cups/templates/pl/edit-config.tmpl
-#usr/share/cups/templates/pl/error-op.tmpl
-#usr/share/cups/templates/pl/error.tmpl
-#usr/share/cups/templates/pl/header.tmpl
-#usr/share/cups/templates/pl/help-header.tmpl
-#usr/share/cups/templates/pl/help-printable.tmpl
-#usr/share/cups/templates/pl/help-trailer.tmpl
-#usr/share/cups/templates/pl/job-cancel.tmpl
-#usr/share/cups/templates/pl/job-hold.tmpl
-#usr/share/cups/templates/pl/job-move.tmpl
-#usr/share/cups/templates/pl/job-moved.tmpl
-#usr/share/cups/templates/pl/job-release.tmpl
-#usr/share/cups/templates/pl/job-restart.tmpl
-#usr/share/cups/templates/pl/jobs-header.tmpl
-#usr/share/cups/templates/pl/jobs.tmpl
-#usr/share/cups/templates/pl/list-available-printers.tmpl
-#usr/share/cups/templates/pl/modify-class.tmpl
-#usr/share/cups/templates/pl/modify-printer.tmpl
-#usr/share/cups/templates/pl/norestart.tmpl
-#usr/share/cups/templates/pl/option-boolean.tmpl
-#usr/share/cups/templates/pl/option-conflict.tmpl
-#usr/share/cups/templates/pl/option-header.tmpl
-#usr/share/cups/templates/pl/option-pickmany.tmpl
-#usr/share/cups/templates/pl/option-pickone.tmpl
-#usr/share/cups/templates/pl/option-trailer.tmpl
-#usr/share/cups/templates/pl/pager.tmpl
-#usr/share/cups/templates/pl/printer-accept.tmpl
-#usr/share/cups/templates/pl/printer-added.tmpl
-#usr/share/cups/templates/pl/printer-configured.tmpl
-#usr/share/cups/templates/pl/printer-confirm.tmpl
-#usr/share/cups/templates/pl/printer-default.tmpl
-#usr/share/cups/templates/pl/printer-deleted.tmpl
-#usr/share/cups/templates/pl/printer-jobs-header.tmpl
-#usr/share/cups/templates/pl/printer-modified.tmpl
-#usr/share/cups/templates/pl/printer-purge.tmpl
-#usr/share/cups/templates/pl/printer-reject.tmpl
-#usr/share/cups/templates/pl/printer-start.tmpl
-#usr/share/cups/templates/pl/printer-stop.tmpl
-#usr/share/cups/templates/pl/printer.tmpl
-#usr/share/cups/templates/pl/printers-header.tmpl
-#usr/share/cups/templates/pl/printers.tmpl
-#usr/share/cups/templates/pl/restart.tmpl
-#usr/share/cups/templates/pl/samba-export.tmpl
-#usr/share/cups/templates/pl/samba-exported.tmpl
-#usr/share/cups/templates/pl/search.tmpl
-#usr/share/cups/templates/pl/set-printer-options-header.tmpl
-#usr/share/cups/templates/pl/set-printer-options-trailer.tmpl
-#usr/share/cups/templates/pl/subscription-added.tmpl
-#usr/share/cups/templates/pl/subscription-canceled.tmpl
-#usr/share/cups/templates/pl/test-page.tmpl
-#usr/share/cups/templates/pl/trailer.tmpl
-#usr/share/cups/templates/pl/users.tmpl
usr/share/cups/templates/printer-accept.tmpl
usr/share/cups/templates/printer-added.tmpl
usr/share/cups/templates/printer-configured.tmpl
@@ -764,96 +665,100 @@ usr/share/cups/templates/printer.tmpl
usr/share/cups/templates/printers-header.tmpl
usr/share/cups/templates/printers.tmpl
usr/share/cups/templates/restart.tmpl
-#usr/share/cups/templates/ru
-#usr/share/cups/templates/ru/add-class.tmpl
-#usr/share/cups/templates/ru/add-printer.tmpl
-#usr/share/cups/templates/ru/add-rss-subscription.tmpl
-#usr/share/cups/templates/ru/admin.tmpl
-#usr/share/cups/templates/ru/choose-device.tmpl
-#usr/share/cups/templates/ru/choose-make.tmpl
-#usr/share/cups/templates/ru/choose-model.tmpl
-#usr/share/cups/templates/ru/choose-serial.tmpl
-#usr/share/cups/templates/ru/choose-uri.tmpl
-#usr/share/cups/templates/ru/class-added.tmpl
-#usr/share/cups/templates/ru/class-confirm.tmpl
-#usr/share/cups/templates/ru/class-deleted.tmpl
-#usr/share/cups/templates/ru/class-jobs-header.tmpl
-#usr/share/cups/templates/ru/class-modified.tmpl
-#usr/share/cups/templates/ru/class.tmpl
-#usr/share/cups/templates/ru/classes-header.tmpl
-#usr/share/cups/templates/ru/classes.tmpl
-#usr/share/cups/templates/ru/command.tmpl
-#usr/share/cups/templates/ru/edit-config.tmpl
-#usr/share/cups/templates/ru/error-op.tmpl
-#usr/share/cups/templates/ru/error.tmpl
-#usr/share/cups/templates/ru/header.tmpl
-#usr/share/cups/templates/ru/help-header.tmpl
-#usr/share/cups/templates/ru/help-printable.tmpl
-#usr/share/cups/templates/ru/help-trailer.tmpl
-#usr/share/cups/templates/ru/job-cancel.tmpl
-#usr/share/cups/templates/ru/job-hold.tmpl
-#usr/share/cups/templates/ru/job-move.tmpl
-#usr/share/cups/templates/ru/job-moved.tmpl
-#usr/share/cups/templates/ru/job-release.tmpl
-#usr/share/cups/templates/ru/job-restart.tmpl
-#usr/share/cups/templates/ru/jobs-header.tmpl
-#usr/share/cups/templates/ru/jobs.tmpl
-#usr/share/cups/templates/ru/list-available-printers.tmpl
-#usr/share/cups/templates/ru/modify-class.tmpl
-#usr/share/cups/templates/ru/modify-printer.tmpl
-#usr/share/cups/templates/ru/norestart.tmpl
-#usr/share/cups/templates/ru/option-boolean.tmpl
-#usr/share/cups/templates/ru/option-conflict.tmpl
-#usr/share/cups/templates/ru/option-header.tmpl
-#usr/share/cups/templates/ru/option-pickmany.tmpl
-#usr/share/cups/templates/ru/option-pickone.tmpl
-#usr/share/cups/templates/ru/option-trailer.tmpl
-#usr/share/cups/templates/ru/pager.tmpl
-#usr/share/cups/templates/ru/printer-accept.tmpl
-#usr/share/cups/templates/ru/printer-added.tmpl
-#usr/share/cups/templates/ru/printer-configured.tmpl
-#usr/share/cups/templates/ru/printer-confirm.tmpl
-#usr/share/cups/templates/ru/printer-default.tmpl
-#usr/share/cups/templates/ru/printer-deleted.tmpl
-#usr/share/cups/templates/ru/printer-jobs-header.tmpl
-#usr/share/cups/templates/ru/printer-modified.tmpl
-#usr/share/cups/templates/ru/printer-purge.tmpl
-#usr/share/cups/templates/ru/printer-reject.tmpl
-#usr/share/cups/templates/ru/printer-start.tmpl
-#usr/share/cups/templates/ru/printer-stop.tmpl
-#usr/share/cups/templates/ru/printer.tmpl
-#usr/share/cups/templates/ru/printers-header.tmpl
-#usr/share/cups/templates/ru/printers.tmpl
-#usr/share/cups/templates/ru/restart.tmpl
-#usr/share/cups/templates/ru/samba-export.tmpl
-#usr/share/cups/templates/ru/samba-exported.tmpl
-#usr/share/cups/templates/ru/search.tmpl
-#usr/share/cups/templates/ru/set-printer-options-header.tmpl
-#usr/share/cups/templates/ru/set-printer-options-trailer.tmpl
-#usr/share/cups/templates/ru/subscription-added.tmpl
-#usr/share/cups/templates/ru/subscription-canceled.tmpl
-#usr/share/cups/templates/ru/test-page.tmpl
-#usr/share/cups/templates/ru/trailer.tmpl
-#usr/share/cups/templates/ru/users.tmpl
+usr/share/cups/templates/ru
+usr/share/cups/templates/ru/add-class.tmpl
+usr/share/cups/templates/ru/add-printer.tmpl
+usr/share/cups/templates/ru/add-rss-subscription.tmpl
+usr/share/cups/templates/ru/admin.tmpl
+usr/share/cups/templates/ru/choose-device.tmpl
+usr/share/cups/templates/ru/choose-make.tmpl
+usr/share/cups/templates/ru/choose-model.tmpl
+usr/share/cups/templates/ru/choose-serial.tmpl
+usr/share/cups/templates/ru/choose-uri.tmpl
+usr/share/cups/templates/ru/class-added.tmpl
+usr/share/cups/templates/ru/class-confirm.tmpl
+usr/share/cups/templates/ru/class-deleted.tmpl
+usr/share/cups/templates/ru/class-jobs-header.tmpl
+usr/share/cups/templates/ru/class-modified.tmpl
+usr/share/cups/templates/ru/class.tmpl
+usr/share/cups/templates/ru/classes-header.tmpl
+usr/share/cups/templates/ru/classes.tmpl
+usr/share/cups/templates/ru/command.tmpl
+usr/share/cups/templates/ru/edit-config.tmpl
+usr/share/cups/templates/ru/error-op.tmpl
+usr/share/cups/templates/ru/error.tmpl
+usr/share/cups/templates/ru/header.tmpl
+usr/share/cups/templates/ru/help-header.tmpl
+usr/share/cups/templates/ru/help-printable.tmpl
+usr/share/cups/templates/ru/help-trailer.tmpl
+usr/share/cups/templates/ru/job-cancel.tmpl
+usr/share/cups/templates/ru/job-hold.tmpl
+usr/share/cups/templates/ru/job-move.tmpl
+usr/share/cups/templates/ru/job-moved.tmpl
+usr/share/cups/templates/ru/job-release.tmpl
+usr/share/cups/templates/ru/job-restart.tmpl
+usr/share/cups/templates/ru/jobs-header.tmpl
+usr/share/cups/templates/ru/jobs.tmpl
+usr/share/cups/templates/ru/list-available-printers.tmpl
+usr/share/cups/templates/ru/modify-class.tmpl
+usr/share/cups/templates/ru/modify-printer.tmpl
+usr/share/cups/templates/ru/norestart.tmpl
+usr/share/cups/templates/ru/option-boolean.tmpl
+usr/share/cups/templates/ru/option-conflict.tmpl
+usr/share/cups/templates/ru/option-header.tmpl
+usr/share/cups/templates/ru/option-pickmany.tmpl
+usr/share/cups/templates/ru/option-pickone.tmpl
+usr/share/cups/templates/ru/option-trailer.tmpl
+usr/share/cups/templates/ru/pager.tmpl
+usr/share/cups/templates/ru/printer-accept.tmpl
+usr/share/cups/templates/ru/printer-added.tmpl
+usr/share/cups/templates/ru/printer-configured.tmpl
+usr/share/cups/templates/ru/printer-confirm.tmpl
+usr/share/cups/templates/ru/printer-default.tmpl
+usr/share/cups/templates/ru/printer-deleted.tmpl
+usr/share/cups/templates/ru/printer-jobs-header.tmpl
+usr/share/cups/templates/ru/printer-modified.tmpl
+usr/share/cups/templates/ru/printer-purge.tmpl
+usr/share/cups/templates/ru/printer-reject.tmpl
+usr/share/cups/templates/ru/printer-start.tmpl
+usr/share/cups/templates/ru/printer-stop.tmpl
+usr/share/cups/templates/ru/printer.tmpl
+usr/share/cups/templates/ru/printers-header.tmpl
+usr/share/cups/templates/ru/printers.tmpl
+usr/share/cups/templates/ru/restart.tmpl
+usr/share/cups/templates/ru/samba-export.tmpl
+usr/share/cups/templates/ru/samba-exported.tmpl
+usr/share/cups/templates/ru/search.tmpl
+usr/share/cups/templates/ru/set-printer-options-header.tmpl
+usr/share/cups/templates/ru/set-printer-options-trailer.tmpl
+usr/share/cups/templates/ru/subscription-added.tmpl
+usr/share/cups/templates/ru/subscription-canceled.tmpl
+usr/share/cups/templates/ru/test-page.tmpl
+usr/share/cups/templates/ru/trailer.tmpl
+usr/share/cups/templates/ru/users.tmpl
usr/share/cups/templates/samba-export.tmpl
usr/share/cups/templates/samba-exported.tmpl
usr/share/cups/templates/search.tmpl
usr/share/cups/templates/set-printer-options-header.tmpl
usr/share/cups/templates/set-printer-options-trailer.tmpl
-#usr/share/cups/templates/subscription-added.tmpl
-#usr/share/cups/templates/subscription-canceled.tmpl
+usr/share/cups/templates/subscription-added.tmpl
+usr/share/cups/templates/subscription-canceled.tmpl
usr/share/cups/templates/test-page.tmpl
usr/share/cups/templates/trailer.tmpl
usr/share/cups/templates/users.tmpl
+usr/share/cups/usb
+usr/share/cups/usb/org.cups.usb-quirks
#usr/share/doc/cups
-usr/share/doc/cups/cups-printable.css
-usr/share/doc/cups/cups.css
-usr/share/doc/cups/de
-#usr/share/doc/cups/de/index.html
+#usr/share/doc/cups/ca
+#usr/share/doc/cups/ca/index.html
+#usr/share/doc/cups/cs
+#usr/share/doc/cups/cs/index.html
+#usr/share/doc/cups/cups-printable.css
+#usr/share/doc/cups/cups.css
#usr/share/doc/cups/es
#usr/share/doc/cups/es/index.html
-#usr/share/doc/cups/eu
-#usr/share/doc/cups/eu/index.html
+#usr/share/doc/cups/fr
+#usr/share/doc/cups/fr/index.html
usr/share/doc/cups/help
#usr/share/doc/cups/help/accounting.html
#usr/share/doc/cups/help/api-array.html
@@ -876,7 +781,7 @@ usr/share/doc/cups/help
#usr/share/doc/cups/help/man-cancel.html
#usr/share/doc/cups/help/man-cups-config.html
#usr/share/doc/cups/help/man-cups-lpd.html
-#usr/share/doc/cups/help/man-cups-polld.html
+#usr/share/doc/cups/help/man-cups-snmp.html
#usr/share/doc/cups/help/man-cupsaccept.html
#usr/share/doc/cups/help/man-cupsaddsmb.html
#usr/share/doc/cups/help/man-cupsd.html
@@ -884,6 +789,8 @@ usr/share/doc/cups/help
#usr/share/doc/cups/help/man-cupstestdsc.html
#usr/share/doc/cups/help/man-cupstestppd.html
#usr/share/doc/cups/help/man-filter.html
+#usr/share/doc/cups/help/man-ipptool.html
+#usr/share/doc/cups/help/man-ipptoolfile.html
#usr/share/doc/cups/help/man-lp.html
#usr/share/doc/cups/help/man-lpadmin.html
#usr/share/doc/cups/help/man-lpc.html
@@ -913,6 +820,7 @@ usr/share/doc/cups/help
#usr/share/doc/cups/help/ref-access_log.html
#usr/share/doc/cups/help/ref-classes-conf.html
#usr/share/doc/cups/help/ref-client-conf.html
+#usr/share/doc/cups/help/ref-cups-files-conf.html
#usr/share/doc/cups/help/ref-cupsd-conf.html
#usr/share/doc/cups/help/ref-error_log.html
#usr/share/doc/cups/help/ref-mailto-conf.html
@@ -924,7 +832,6 @@ usr/share/doc/cups/help
#usr/share/doc/cups/help/security.html
#usr/share/doc/cups/help/sharing.html
#usr/share/doc/cups/help/spec-banner.html
-#usr/share/doc/cups/help/spec-browsing.html
#usr/share/doc/cups/help/spec-cmp.html
#usr/share/doc/cups/help/spec-command.html
#usr/share/doc/cups/help/spec-design.html
@@ -934,11 +841,8 @@ usr/share/doc/cups/help
#usr/share/doc/cups/help/spec-ppd.html
#usr/share/doc/cups/help/spec-raster.html
#usr/share/doc/cups/help/spec-stp.html
-#usr/share/doc/cups/help/standard.html
#usr/share/doc/cups/help/translation.html
#usr/share/doc/cups/help/whatsnew.html
-#usr/share/doc/cups/id
-#usr/share/doc/cups/id/index.html
usr/share/doc/cups/images
#usr/share/doc/cups/images/color-wheel.png
#usr/share/doc/cups/images/cups-block-diagram.png
@@ -947,7 +851,6 @@ usr/share/doc/cups/images
#usr/share/doc/cups/images/cups-postscript-chain.png
#usr/share/doc/cups/images/cups-raster-chain.png
#usr/share/doc/cups/images/cups.png
-#usr/share/doc/cups/images/generic.png
#usr/share/doc/cups/images/left.gif
#usr/share/doc/cups/images/raster-organization.png
#usr/share/doc/cups/images/raster.png
@@ -962,36 +865,21 @@ usr/share/doc/cups/index.html
#usr/share/doc/cups/it/index.html
#usr/share/doc/cups/ja
#usr/share/doc/cups/ja/index.html
-#usr/share/doc/cups/pl
-#usr/share/doc/cups/pl/index.html
usr/share/doc/cups/robots.txt
#usr/share/doc/cups/ru
#usr/share/doc/cups/ru/index.html
-#usr/share/locale/da/cups_da.po
-#usr/share/locale/de/cups_de.po
+#usr/share/locale/ca/cups_ca.po
+#usr/share/locale/cs/cups_cs.po
#usr/share/locale/es/cups_es.po
-#usr/share/locale/eu/cups_eu.po
-#usr/share/locale/fi/cups_fi.po
#usr/share/locale/fr/cups_fr.po
-#usr/share/locale/id/cups_id.po
#usr/share/locale/it/cups_it.po
#usr/share/locale/ja/cups_ja.po
-#usr/share/locale/ko/cups_ko.po
-#usr/share/locale/nl/cups_nl.po
-#usr/share/locale/no
-#usr/share/locale/no/cups_no.po
-#usr/share/locale/pl/cups_pl.po
-#usr/share/locale/pt/cups_pt.po
-#usr/share/locale/pt_BR/cups_pt_BR.po
#usr/share/locale/ru/cups_ru.po
-#usr/share/locale/sv/cups_sv.po
-#usr/share/locale/zh
-#usr/share/locale/zh/cups_zh.po
-#usr/share/locale/zh_TW/cups_zh_TW.po
#usr/share/man/man1/cancel.1.gz
#usr/share/man/man1/cups-config.1.gz
#usr/share/man/man1/cupstestdsc.1.gz
#usr/share/man/man1/cupstestppd.1.gz
+#usr/share/man/man1/ipptool.1.gz
#usr/share/man/man1/lp.1.gz
#usr/share/man/man1/lpoptions.1.gz
#usr/share/man/man1/lppasswd.1.gz
@@ -1006,8 +894,10 @@ usr/share/doc/cups/robots.txt
#usr/share/man/man1/ppdpo.1.gz
#usr/share/man/man5/classes.conf.5.gz
#usr/share/man/man5/client.conf.5.gz
+#usr/share/man/man5/cups-files.conf.5.gz
#usr/share/man/man5/cups-snmp.conf.5.gz
#usr/share/man/man5/cupsd.conf.5.gz
+#usr/share/man/man5/ipptoolfile.5.gz
#usr/share/man/man5/mailto.conf.5.gz
#usr/share/man/man5/mime.convs.5.gz
#usr/share/man/man5/mime.types.5.gz
@@ -1021,7 +911,7 @@ usr/share/doc/cups/robots.txt
#usr/share/man/man8/cups-deviced.8.gz
#usr/share/man/man8/cups-driverd.8.gz
#usr/share/man/man8/cups-lpd.8.gz
-#usr/share/man/man8/cups-polld.8.gz
+#usr/share/man/man8/cups-snmp.8.gz
#usr/share/man/man8/cupsaccept.8.gz
#usr/share/man/man8/cupsaddsmb.8.gz
#usr/share/man/man8/cupsctl.8.gz
@@ -1038,6 +928,7 @@ usr/share/doc/cups/robots.txt
var/cache/cups
#var/cache/cups/rss
#var/ipfire/cups
+var/ipfire/cups/cups-files.conf
var/ipfire/cups/cupsd.conf
#var/ipfire/cups/cupsd.conf.default
var/ipfire/cups/interfaces
@@ -1049,4 +940,3 @@ var/run/cups
var/run/cups/certs
var/spool/cups
var/spool/cups/tmp
-etc/rc.d/init.d/cups
diff --git a/config/rootfiles/packages/foomatic b/config/rootfiles/packages/foomatic
index 589c9e3..933000a 100644
--- a/config/rootfiles/packages/foomatic
+++ b/config/rootfiles/packages/foomatic
@@ -1,46 +1,29 @@
#etc/foomatic
+etc/foomatic/defaultspooler
etc/foomatic/direct
etc/foomatic/filter.conf
-#etc/foomatic/filter.conf.sample
usr/bin/foomatic-combo-xml
usr/bin/foomatic-compiledb
usr/bin/foomatic-configure
usr/bin/foomatic-datafile
-usr/bin/foomatic-gswrapper
usr/bin/foomatic-perl-data
usr/bin/foomatic-ppd-options
+usr/bin/foomatic-ppd-to-xml
usr/bin/foomatic-ppdfile
usr/bin/foomatic-printjob
usr/bin/foomatic-rip
usr/bin/foomatic-searchprinter
usr/lib/cups/backend/beh
usr/lib/cups/driver/foomatic
+usr/lib/cups/filter/foomatic-ppdfile
usr/lib/cups/filter/foomatic-rip
#usr/lib/perl5/site_perl/5.12.3/Foomatic
usr/lib/perl5/site_perl/5.12.3/Foomatic/DB.pm
usr/lib/perl5/site_perl/5.12.3/Foomatic/Defaults.pm
usr/lib/perl5/site_perl/5.12.3/Foomatic/PPD.pm
usr/lib/perl5/site_perl/5.12.3/Foomatic/UIElem.pm
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Foomatic
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Foomatic/.packlist
-#usr/lib/ppr
-#usr/lib/ppr/interfaces
-usr/lib/ppr/interfaces/foomatic-rip
-#usr/lib/ppr/lib
-usr/lib/ppr/lib/foomatic-rip
-#usr/man/man1/foomatic-combo-xml.1
-#usr/man/man1/foomatic-compiledb.1
-#usr/man/man1/foomatic-configure.1
-#usr/man/man1/foomatic-gswrapper.1
-#usr/man/man1/foomatic-perl-data.1
-#usr/man/man1/foomatic-ppd-options.1
-#usr/man/man1/foomatic-ppdfile.1
-#usr/man/man1/foomatic-printjob.1
-#usr/man/man1/foomatic-rip.1
-#usr/man/man8/foomatic-addpjloptions.8
-#usr/man/man8/foomatic-getpjloptions.8
-#usr/man/man8/foomatic-kitload.8
-#usr/man/man8/foomatic-preferred-driver.8
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Foomatic
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Foomatic/.packlist
usr/sbin/foomatic-addpjloptions
usr/sbin/foomatic-cleanupdrivers
usr/sbin/foomatic-extract-text
@@ -60,7 +43,10 @@ usr/share/cups/model/foomatic-db-ppds
#usr/share/foomatic/db/source/PPD/Brother
usr/share/foomatic/db/source/PPD/Brother/BR2600CN_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR2700_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR3070_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR3450CN_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR4050_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR4070_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR5050_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR5070DN_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR5070_2_GPL.ppd.gz
@@ -69,24 +55,49 @@ usr/share/foomatic/db/source/PPD/Brother/BR5170_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR5240_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR5250_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR5270_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR5350_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR5370_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR5380_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR6050D2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR6050_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR7025_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR7045_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR7050_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR7225_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR7450_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR7820_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR7840_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR784N_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR8020_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR8025_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR8040_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR8045_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR8050_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR8080_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR8085_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR8220_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR8370_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR8380_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR8420_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR8440_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR8480_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR8640_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR8670_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR8680_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR8820_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR8840_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR8880_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR8890_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR901D_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR901M_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR9040_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR9045_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR9120_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR9320_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BR9420_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR9440_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR9450_2_GPL.ppd.gz
+usr/share/foomatic/db/source/PPD/Brother/BR9840_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BRHL14_1_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BRHL14_2_GPL.ppd.gz
usr/share/foomatic/db/source/PPD/Brother/BRHL16_2_GPL.ppd.gz
@@ -98,10 +109,23 @@ usr/share/foomatic/db/source/PPD/Epson/epal2600.ppd.gz
usr/share/foomatic/db/source/PPD/Epson/epalc190.ppd.gz
usr/share/foomatic/db/source/PPD/Epson/epalc200.ppd.gz
usr/share/foomatic/db/source/PPD/Epson/epalc260.ppd.gz
+usr/share/foomatic/db/source/PPD/Epson/epalc280.ppd.gz
+usr/share/foomatic/db/source/PPD/Epson/epalc380.ppd.gz
usr/share/foomatic/db/source/PPD/Epson/epalc400.ppd.gz
usr/share/foomatic/db/source/PPD/Epson/epalc410.ppd.gz
+usr/share/foomatic/db/source/PPD/Epson/epalc420.ppd.gz
usr/share/foomatic/db/source/PPD/Epson/epalc860.ppd.gz
usr/share/foomatic/db/source/PPD/Epson/epalc910.ppd.gz
+usr/share/foomatic/db/source/PPD/Epson/epalc920.ppd.gz
+usr/share/foomatic/db/source/PPD/Epson/epalcx21.ppd.gz
+usr/share/foomatic/db/source/PPD/Epson/epalm200.ppd.gz
+usr/share/foomatic/db/source/PPD/Epson/epalm201.ppd.gz
+usr/share/foomatic/db/source/PPD/Epson/epalm240.ppd.gz
+usr/share/foomatic/db/source/PPD/Epson/epalm241.ppd.gz
+usr/share/foomatic/db/source/PPD/Epson/epalm400.ppd.gz
+usr/share/foomatic/db/source/PPD/Epson/epalm800.ppd.gz
+usr/share/foomatic/db/source/PPD/Epson/epalmx20.ppd.gz
+usr/share/foomatic/db/source/PPD/Epson/epalmx21.ppd.gz
usr/share/foomatic/db/source/PPD/Epson/epl5900.ppd.gz
usr/share/foomatic/db/source/PPD/Epson/epl6100.ppd.gz
usr/share/foomatic/db/source/PPD/Epson/epl6200.ppd.gz
@@ -143,7 +167,12 @@ usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-C7528n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-C7531dn_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-C7535n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-C7640nD_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-C8140ND_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-C8150ND_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-CS555_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSc1030_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSc1045_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSc1060_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSc224_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSc232_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSc328_PS.ppd.gz
@@ -178,10 +207,19 @@ usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm730_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm735_735G_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm745_745G_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-F9199_9199nf_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-GWD2004_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-GWD2006_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-GWD3006_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-GWD5100_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-GWD7140_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP1100_DSm7110_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP1350_DSm7135_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP1600_DSm716_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP2000_DSm721d_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP2352_DSm923_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP2500_DSm625_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP2852_DSm928_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP3352_DSm933_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP3500_DSm735e_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP4500_DSm745e_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP5500_DSm755_PS.ppd.gz
@@ -194,11 +232,79 @@ usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MPC3000_DSc530_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MPC3500_DSc535_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MPC4500_DSc545_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_161_DSm416_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_171_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_2001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_2501_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_2510_DSm725e_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_2550B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_2550_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_2851_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_3010_DSm730e_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_301_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_3350B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_3350_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_3351_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_4000B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_4000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_4001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_4002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_5000B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_5000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_5001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_5002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_6000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_6001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_6002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_7000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_7001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_7502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_8000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_8001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_9001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_9002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C2050_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C2051_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C2550_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C2551_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C2800_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C3001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C3002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C3003_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C300SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C300_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C305_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C3300_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C3501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C3502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C3503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C4000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C400SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C400_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C4501A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C4501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C4502A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C4502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C4503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C5000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C5501A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C5501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C5502A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C5502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C5503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C6000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C6003_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C6501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C6502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C7500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C7501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C8002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_CW2200_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7026_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7026n_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7031nL_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7031n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7032_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7035n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7126_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7126n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7132n_PS.ppd.gz
@@ -212,6 +318,20 @@ usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7527n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7535n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7575_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7675_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-Pro_1106EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-Pro_1107EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-Pro_1356EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-Pro_1357EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-Pro_906EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-Pro_907EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-SP_4210N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-SP_6330N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-SP_8200DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-SP_C320DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-SP_C420DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-SP_C430DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-SP_C431DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-SP_W2470_PS.ppd.gz
#usr/share/foomatic/db/source/PPD/Gestetner/PXL
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-10512_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-2212_PXL.ppd.gz
@@ -225,6 +345,9 @@ usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-6002_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-7502_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-9002_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-CS555_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSc1030_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSc1045_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSc1060_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSc424_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSc428_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSc432_PXL.ppd.gz
@@ -253,6 +376,10 @@ usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP1100_DSm7110_PXL.ppd.
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP1350_DSm7135_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP1600_DSm716_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP2000_DSm721d_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP2352_DSm923_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP2500_DSm625_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP2852_DSm928_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP3352_DSm933_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP3500_DSm735e_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP4500_DSm745e_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP5500_DSm755_PXL.ppd.gz
@@ -265,34 +392,77 @@ usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MPC3000_DSc530_PXL.ppd.
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MPC3500_DSc535_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MPC4500_DSc545_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_161_DSm416_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_171_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_2001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_2501_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_2510_DSm725e_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_2550B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_2550_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_2851_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_3010_DSm730e_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_3350B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_3350_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_3351_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_4000B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_4000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_4001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_4002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_5000B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_5000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_5001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_5002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_6000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_6001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_6002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_7000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_7001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_7502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_8000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_8001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_9001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_9002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C2050_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C2051_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C2550_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C2551_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C2800_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C3001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C3002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C3003_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C300SR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C300_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C3300_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C3501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C3502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C3503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C4000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C400SR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C400_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C4501A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C4501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C4502A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C4502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C4503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C5000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C5501A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C5501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C5502A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C5502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C5503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C6000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C6003_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C6501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C6502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C7500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C7501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C8002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-Pro_1106EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-Pro_1107EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-Pro_1356EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-Pro_1357EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-Pro_906EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-Pro_907EX_PXL.ppd.gz
#usr/share/foomatic/db/source/PPD/HP
-usr/share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2250.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2280.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2600.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2800.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_3000.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_CM8050_CM8060_MFP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2550.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2605.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2700.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2800.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_3000.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_3800.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4500.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4550.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4700.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4730_MFP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_5550.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_5M.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_8500.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_8550.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CM1015.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CM4730_MFP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CP3505.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CP4005.ppd.gz
usr/share/foomatic/db/source/PPD/HP/HP_DesignJet_1050C_PS3.ppd.gz
usr/share/foomatic/db/source/PPD/HP/HP_DesignJet_1055CM_PS3.ppd.gz
usr/share/foomatic/db/source/PPD/HP/HP_DesignJet_2500CP_PS3.ppd.gz
@@ -300,78 +470,16 @@ usr/share/foomatic/db/source/PPD/HP/HP_DesignJet_3500CP_PS3.ppd.gz
usr/share/foomatic/db/source/PPD/HP/HP_Designjet_5000_PS3.ppd.gz
usr/share/foomatic/db/source/PPD/HP/HP_Designjet_5500_PS3.ppd.gz
usr/share/foomatic/db/source/PPD/HP/HP_Designjet_800_PS3.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_1200.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_1220.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_1320_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_2100_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_2200.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_2410.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_2420.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_2430.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_3050.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_3052.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_3200.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_3300_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_3390.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4000_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4050_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4100_MFP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4100_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4240.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4250.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4345_MFP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4350.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4ML.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4MP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4Si_v2011.110.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4V.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_4_Plus.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_5000_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_5100_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_5200.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_5200L.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_5M.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_5MP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_5Si.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_5Si_Mopier.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_6MP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_8000_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_8100_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_8150_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_9000_MFP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_9000_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_9040.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_9040_9050_MFP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_9050.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_9055_9065_MFP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_M3027_MFP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_M3035_MFP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_M4345_MFP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_M5025_MFP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_M5035_MFP.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_P2015.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_P3004.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_LaserJet_P3005.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Mopier_240.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/HP_Mopier_320.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_LaserJet_1300_series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_LaserJet_2300.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_LaserJet_3015.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_LaserJet_3020_3030.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_LaserJet_3380.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_LaserJet_4200_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_LaserJet_4300_Series.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_business_inkjet_2300.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_color_LaserJet_2500.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_color_LaserJet_3700.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_color_LaserJet_4600.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_color_LaserJet_4610.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_color_LaserJet_4650.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_color_LaserJet_5500.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_color_LaserJet_9500.ppd.gz
-usr/share/foomatic/db/source/PPD/HP/hp_color_LaserJet_9500_MFP.ppd.gz
usr/share/foomatic/db/source/PPD/HP/hp_officejet_9100_series.ppd.gz
+#usr/share/foomatic/db/source/PPD/InfoPrint
+#usr/share/foomatic/db/source/PPD/InfoPrint/PS
+usr/share/foomatic/db/source/PPD/InfoPrint/PS/InfoPrint-Pro_1107EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/InfoPrint/PS/InfoPrint-Pro_1357EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/InfoPrint/PS/InfoPrint-Pro_907EX_PS.ppd.gz
+#usr/share/foomatic/db/source/PPD/InfoPrint/PXL
+usr/share/foomatic/db/source/PPD/InfoPrint/PXL/InfoPrint-Pro_1107EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/InfoPrint/PXL/InfoPrint-Pro_1357EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/InfoPrint/PXL/InfoPrint-Pro_907EX_PXL.ppd.gz
#usr/share/foomatic/db/source/PPD/Infotec
#usr/share/foomatic/db/source/PPD/Infotec/PS
usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-4353_MF_PS.ppd.gz
@@ -435,6 +543,7 @@ usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-IS_2265_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-IS_2275_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-IS_2316_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-IS_2320_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-IS_2325_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-IS_2416_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-IS_2425_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-IS_2430_PS.ppd.gz
@@ -443,6 +552,82 @@ usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-IS_2445_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-IS_3090_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-IS_3110_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-IS_3135_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_171_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_2001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_201_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_2352_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_2501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_2550B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_2550_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_2851_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_2852_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_301_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_3350B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_3350_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_3351_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_3352_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_4000B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_4000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_4001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_4002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_5000B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_5000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_5001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_5002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_6000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_6001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_6002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_7000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_7001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_7502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_8000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_8001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_9001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_9002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C2050_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C2051_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C2550_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C2551_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C2800_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C3001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C3002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C3003_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C300SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C300_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C305_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C3300_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C3501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C3502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C3503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C4000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C400SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C400_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C4501A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C4501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C4502A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C4502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C4503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C5000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C5501A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C5501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C5502A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C5502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C5503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C6000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C6003_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C6501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C6502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C7500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C7501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C8002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_1106EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_1107EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_1356EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_1357EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_906EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_907EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_C5100S_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_C5110S_PS.ppd.gz
#usr/share/foomatic/db/source/PPD/Infotec/PXL
usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-4353_MF_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-4452_MF_PXL.ppd.gz
@@ -491,6 +676,7 @@ usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-IS_2265_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-IS_2275_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-IS_2316_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-IS_2320_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-IS_2325_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-IS_2416_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-IS_2425_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-IS_2430_PXL.ppd.gz
@@ -499,6 +685,80 @@ usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-IS_2445_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-IS_3090_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-IS_3110_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-IS_3135_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_171_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_2001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_201_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_2352_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_2501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_2550B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_2550_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_2851_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_2852_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_3350B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_3350_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_3351_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_3352_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_4000B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_4000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_4001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_4002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_5000B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_5000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_5001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_5002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_6000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_6001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_6002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_7000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_7001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_7502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_8000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_8001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_9001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_9002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C2050_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C2051_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C2550_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C2551_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C2800_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C3001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C3002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C3003_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C300SR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C300_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C3300_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C3501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C3502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C3503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C4000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C400SR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C400_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C4501A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C4501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C4502A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C4502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C4503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C5000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C5501A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C5501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C5502A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C5502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C5503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C6000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C6003_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C6501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C6502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C7500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C7501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C8002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_1106EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_1107EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_1356EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_1357EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_906EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_907EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_C5100S_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_C5110S_PXL.ppd.gz
#usr/share/foomatic/db/source/PPD/KONICA_MINOLTA
usr/share/foomatic/db/source/PPD/KONICA_MINOLTA/KO1050UX.ppd.gz
usr/share/foomatic/db/source/PPD/KONICA_MINOLTA/KO500UX.ppd.gz
@@ -521,17 +781,29 @@ usr/share/foomatic/db/source/PPD/KONICA_MINOLTA/KOC550UX.ppd.gz
#usr/share/foomatic/db/source/PPD/Kyocera
#usr/share/foomatic/db/source/PPD/Kyocera/ReadMe.htm
#usr/share/foomatic/db/source/PPD/Kyocera/de
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_CS-C2525E_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_CS-C3225E_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_CS-C3232E_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_CS-C4035E_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_CS_250ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_CS_300ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_CS_400ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_CS_500ci.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-1000_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-1030_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-1118MFP_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-1200_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-1700+_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-1700_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-1714M_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-1750_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-2000D_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-3700+_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-3700_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-3718M_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-3750_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-3900DN_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-4000DN_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-5800C_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-5900C_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-600_de.ppd.gz
@@ -539,19 +811,34 @@ usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-6300_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-6700_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-680_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-6900_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-6950DN_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-7000+_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-7000_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-7028M_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-800_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-9000_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-920_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-C5015N_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-C5020N_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-C5025N_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-C5030N_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-C5100DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-C5200DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-C5300DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-C5350DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-C5400DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS-C8100DN_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_FS_C8100DNP.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_KM-1820_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_KM-3050_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_KM-4050_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_KM-5050_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_KM-6030_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_KM-8030_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_KM-C2525E_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_KM-C3225E_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_KM-C3232E_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_KM-C4035E_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_Mita_CS-1650_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_Mita_CS-1815_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_Mita_CS-2050_de.ppd.gz
@@ -602,21 +889,41 @@ usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_Mita_KM-7530_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_Mita_KM-C2630_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_Mita_KM-C830_de.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_Mita_KM-C850_de.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_TASKalfa_250ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_TASKalfa_300ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_TASKalfa_400ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/de/Kyocera_TASKalfa_500ci.ppd.gz
#usr/share/foomatic/db/source/PPD/Kyocera/en
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_CS-C2525E_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_CS-C3225E_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_CS-C3232E_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_CS-C4035E_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_CS_250ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_CS_300ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_CS_3050ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_CS_3550ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_CS_400ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_CS_500ci.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-1000_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-1030_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-1118MFP_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-1200_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-1700+_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-1700_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-1714M_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-1750_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-2000D_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-2100D.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-2100DN.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-3700+_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-3700_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-3718M_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-3750_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-3900DN_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-4000DN_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-4100DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-4200DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-4300DN.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-5800C_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-5900C_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-600_en.ppd.gz
@@ -634,16 +941,30 @@ usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-9000_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-9130DN_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-920_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-9530DN_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-C5015N_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-C5020N_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-C5025N_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-C5030N_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-C5100DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-C5200DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-C5300DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-C5350DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-C5400DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS-C8100DN_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_FS_C8100DNP.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_KM-1820_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_KM-3050_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_KM-4050_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_KM-5050_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_KM-6030_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_KM-8030_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_KM-C2520_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_KM-C2525E_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_KM-C3225E_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_KM-C3225_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_KM-C3232E_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_KM-C3232_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_KM-C4035E_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_Mita_CS-1650_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_Mita_CS-1815_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_Mita_CS-2050_en.ppd.gz
@@ -695,8 +1016,22 @@ usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_Mita_KM-7530_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_Mita_KM-C2630_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_Mita_KM-C830_en.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_Mita_KM-C850_en.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_TASKalfa_250ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_TASKalfa_300ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_TASKalfa_400ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/en/Kyocera_TASKalfa_500ci.ppd.gz
#usr/share/foomatic/db/source/PPD/Kyocera/es
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_CS-C2525E_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_CS-C3225E_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_CS-C3232E_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_CS-C4035E_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_CS_250ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_CS_300ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_CS_400ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_CS_500ci.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-1000_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-1030_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-1118MFP_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-1200_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-1700+_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-1700_es.ppd.gz
@@ -713,6 +1048,7 @@ usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-5800C_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-5900C_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-600_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-6300_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-6500+_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-6700_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-680_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-6900_es.ppd.gz
@@ -723,10 +1059,29 @@ usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-7028M_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-800_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-9000_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-9130DN_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-920_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-9530DN_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-C5015N_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-C5020N_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-C5025N_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-C5030N_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-C5100DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-C5200DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-C5300DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-C5350DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-C5400DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS-C8100DN_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_FS_C8100DNP.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_KM-1820_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_KM-6030_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_KM-8030_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_KM-C2520_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_KM-C2525E_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_KM-C3225E_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_KM-C3225_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_KM-C3232E_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_KM-C3232_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_KM-C4035E_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_Mita_CS-1650_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_Mita_CS-1815_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_Mita_CS-2050_es.ppd.gz
@@ -777,8 +1132,22 @@ usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_Mita_KM-7530_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_Mita_KM-C2630_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_Mita_KM-C830_es.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_Mita_KM-C850_es.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_TASKalfa_250ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_TASKalfa_300ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_TASKalfa_400ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/es/Kyocera_TASKalfa_500ci.ppd.gz
#usr/share/foomatic/db/source/PPD/Kyocera/fr
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_CS-C2525E_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_CS-C3225E_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_CS-C3232E_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_CS-C4035E_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_CS_250ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_CS_300ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_CS_400ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_CS_500ci.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-1000_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-1030_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-1118MFP_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-1200_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-1700+_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-1700_fr.ppd.gz
@@ -795,6 +1164,7 @@ usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-5800C_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-5900C_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-600_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-6300_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-6500+_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-6700_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-680_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-6900_fr.ppd.gz
@@ -805,10 +1175,29 @@ usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-7028M_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-800_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-9000_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-9130DN_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-920_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-9530DN_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-C5015N_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-C5020N_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-C5025N_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-C5030N_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-C5100DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-C5200DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-C5300DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-C5350DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-C5400DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS-C8100DN_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_FS_C8100DNP.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_KM-1820_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_KM-6030_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_KM-8030_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_KM-C2520_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_KM-C2525E_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_KM-C3225E_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_KM-C3225_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_KM-C3232E_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_KM-C3232_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_KM-C4035E_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_Mita_CS-1650_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_Mita_CS-1815_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_Mita_CS-2050_fr.ppd.gz
@@ -859,18 +1248,34 @@ usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_Mita_KM-7530_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_Mita_KM-C2630_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_Mita_KM-C830_fr.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_Mita_KM-C850_fr.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_TASKalfa_250ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_TASKalfa_300ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_TASKalfa_400ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/fr/Kyocera_TASKalfa_500ci.ppd.gz
#usr/share/foomatic/db/source/PPD/Kyocera/it
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_CS-C2525E_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_CS-C3225E_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_CS-C3232E_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_CS-C4035E_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_CS_250ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_CS_300ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_CS_400ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_CS_500ci.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-1000_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-1030_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-1118MFP_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-1200_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-1700+_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-1700_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-1714M_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-1750_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-2000D_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-3700+_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-3700_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-3718M_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-3750_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-3900DN_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-4000DN_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-5800C_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-5900C_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-600_it.ppd.gz
@@ -878,19 +1283,34 @@ usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-6300_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-6700_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-680_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-6900_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-6950DN_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-7000+_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-7000_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-7028M_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-800_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-9000_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-920_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-C5015N_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-C5020N_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-C5025N_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-C5030N_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-C5100DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-C5200DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-C5300DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-C5350DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-C5400DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS-C8100DN_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_FS_C8100DNP.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_KM-1820_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_KM-3050_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_KM-4050_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_KM-5050_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_KM-6030_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_KM-8030_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_KM-C2525E_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_KM-C3225E_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_KM-C3232E_it.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_KM-C4035E_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_Mita_CS-1650_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_Mita_CS-1815_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_Mita_CS-2050_it.ppd.gz
@@ -941,9 +1361,22 @@ usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_Mita_KM-7530_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_Mita_KM-C2630_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_Mita_KM-C830_it.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_Mita_KM-C850_it.ppd.gz
-usr/share/foomatic/db/source/PPD/Kyocera/kyocera_ppd_8.2.txt
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_TASKalfa_250ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_TASKalfa_300ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_TASKalfa_400ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/it/Kyocera_TASKalfa_500ci.ppd.gz
#usr/share/foomatic/db/source/PPD/Kyocera/pt
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_CS-C2525E_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_CS-C3225E_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_CS-C3232E_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_CS-C4035E_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_CS_250ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_CS_300ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_CS_400ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_CS_500ci.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-1000_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-1030_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-1118MFP_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-1200_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-1700+_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-1700_pt.ppd.gz
@@ -960,6 +1393,7 @@ usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-5800C_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-5900C_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-600_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-6300_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-6500+_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-6700_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-680_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-6900_pt.ppd.gz
@@ -970,10 +1404,29 @@ usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-7028M_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-800_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-9000_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-9130DN_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-920_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-9530DN_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-C5015N_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-C5020N_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-C5025N_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-C5030N_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-C5100DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-C5200DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-C5300DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-C5350DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-C5400DN.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS-C8100DN_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_FS_C8100DNP.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_KM-1820_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_KM-6030_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_KM-8030_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_KM-C2520_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_KM-C2525E_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_KM-C3225E_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_KM-C3225_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_KM-C3232E_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_KM-C3232_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_KM-C4035E_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_Mita_CS-1650_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_Mita_CS-1815_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_Mita_CS-2050_pt.ppd.gz
@@ -1024,6 +1477,10 @@ usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_Mita_KM-7530_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_Mita_KM-C2630_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_Mita_KM-C830_pt.ppd.gz
usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_Mita_KM-C850_pt.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_TASKalfa_250ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_TASKalfa_300ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_TASKalfa_400ci.ppd.gz
+usr/share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_TASKalfa_500ci.ppd.gz
#usr/share/foomatic/db/source/PPD/Lanier
#usr/share/foomatic/db/source/PPD/Lanier/PS
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-2132_PS.ppd.gz
@@ -1071,6 +1528,12 @@ usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LD245_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LD328c_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LD335c_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LD345c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LD_130CSR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LD_130C_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LD_140CSR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LD_140C_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LD_620C_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LD_625C_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LF510_515e_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP025N_LP026N_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP025_LP026_PS.ppd.gz
@@ -1078,41 +1541,153 @@ usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP031c_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP032_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP116c_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP122c_LP121c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP124w_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP125cx_LP126cn_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP127n_LP128n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP128_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP131nL_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP131n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP135n_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP136n_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP137CN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP138c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP142CN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP145n_SP_8100DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP150dn_SP8200DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP175_LP175hdn_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP222cn_LP221c_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP226c_SP_C410_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP231c_SP_C411_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP235N_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP235c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP331cn_SP_C420_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP332c_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP335c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP37N_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP440c_SP_C811DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP540C_SPC820DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP550C_SPC821DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP_020c_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP_036c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LW324_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LW326_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LW426_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LW5100_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-LW7140_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP2500_LD125_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MPC1500_LD215c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MPC4501A_LD645CA_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MPC5501A_LD655CA_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_1100_LD1100_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_1350_LD1135_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_1600_LD316_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_161_LD016_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_171_LD_117_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2000_LD320d_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_201_LD_220_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2352_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2501_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2510_LD325_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2550B_LD425B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2550_LD425_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2851_LD528_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2852_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3010_LD330_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_301_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3350B_LD433B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3350_LD433_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3351_LD533_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3352_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3500_LD335_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_4000B_LD040B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_4000_LD040_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_4001_LD140_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_4002_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_4500_LD345_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_5000B_LD050B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_5000_LD050_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_5001_LD150_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_5002_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_5500_LD255_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_6000_LD260_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_6001_LD360_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_6002_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_6500_LD265_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_7000_LD270_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_7001_LD370_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_7500_LD275_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_7502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_8000_LD280_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_8001_LD380_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_9000_LD190_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_9001_LD390_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_9002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C2050_LD520C_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C2500_LD425c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C2550_LD525C_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C2800_LD528C_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C3000_LD430c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C3001_LD630C_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C3002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C3003_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C300SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C300_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C305_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C3300_LD533C_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C3500_LD435c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C3501_LD635C_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C3502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C3503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C4000_LD540C_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C400SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C400_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C4500_LD445c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C4501_LD645C_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C4502A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C4502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C4503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C5000_LD550C_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C5501_LD655C_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C5502A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C5502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C5503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C6000_LD260c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C6003_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C6501_LD365C_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C6502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C7500_LD275c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C7501_LD375C_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C8002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_CW2200_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_1106EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_1107EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_1356EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_1357EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_906EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_907EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_C5100S_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_C5110S_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_4100NL_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_4100N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_4110N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_4210N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_4310N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_5200DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_5200S_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_5210DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_5210SF_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_5210SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_6330N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_8300DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_9100_LP275_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C320DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C400DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C430DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C431DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C730DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C830DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C831DN_PS.ppd.gz
#usr/share/foomatic/db/source/PPD/Lanier/PXL
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-5622_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-5627_PXL.ppd.gz
@@ -1151,24 +1726,176 @@ usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-LD245_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-LD328c_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-LD335c_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-LD345c_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-LD_130CSR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-LD_130C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-LD_140CSR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-LD_140C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-LD_620C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-LD_625C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP2500_LD125_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MPC1500_LD215c_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MPC4501A_LD645CA_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MPC5501A_LD655CA_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_1100_LD1100_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_1350_LD1135_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_1600_LD316_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_161_LD016_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_171_LD_117_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2000_LD320d_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_201_LD_220_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2352_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2501_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2510_LD325_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2550B_LD425B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2550_LD425_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2851_LD528_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2852_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3010_LD330_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3350B_LD433B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3350_LD433_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3351_LD533_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3352_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3500_LD335_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_4000B_LD040B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_4000_LD040_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_4001_LD140_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_4002_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_4500_LD345_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_5000B_LD050B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_5000_LD050_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_5001_LD150_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_5002_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_5500_LD255_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_6000_LD260_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_6001_LD360_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_6002_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_6500_LD265_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_7000_LD270_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_7001_LD370_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_7500_LD275_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_7502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_8000_LD280_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_8001_LD380_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_9000_LD190_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_9001_LD390_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_9002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C2050_LD520C_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C2500_LD425c_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C2550_LD525C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C2800_LD528C_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C3000_LD430c_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C3001_LD630C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C3002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C3003_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C300SR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C300_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C3300_LD533C_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C3500_LD435c_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C3501_LD635C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C3502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C3503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C4000_LD540C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C400SR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C400_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C4500_LD445c_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C4501_LD645C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C4502A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C4502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C4503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C5000_LD550C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C5501_LD655C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C5502A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C5502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C5503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C6000_LD260c_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C6003_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C6501_LD365C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C6502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C7500_LD275c_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C7501_LD375C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C8002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_1106EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_1107EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_1356EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_1357EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_906EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_907EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_C5100S_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_C5110S_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-SG3100SNw_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-SG3110SFNw_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_6500e_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C510.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C520.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C522.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C524.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C540.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C543.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C544.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C546.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C734.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C736.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C750.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C752.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C780.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C782.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C790_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C910.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C912.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C920_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C930.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C935.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C950_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E260.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E260d.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E260dn.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E350d.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E352dn.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E360d.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E360dn.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E460dn.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E460dw.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E462dtn.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_EG460dn.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_T650.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_T652.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_T654.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_T656.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_TG654.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_W850.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X203n.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X204n.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X264dn.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X363dn.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X364dn.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X364dw.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X463de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X464de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X466de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X466dte.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X466dwe.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X543.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X544.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X546.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X548_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X651de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X652de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X654de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X656de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X658de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X734de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X736de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X738de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X790_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X860de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X862de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X864de.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X920_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X940e.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X945e.ppd.gz
+usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X950_Series.ppd.gz
#usr/share/foomatic/db/source/PPD/NRG
#usr/share/foomatic/db/source/PPD/NRG/PS
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-10515_10518_10512_PS.ppd.gz
@@ -1229,20 +1956,96 @@ usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_1100_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_1350_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_1600_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_161_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_171_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_201_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2352_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2501_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2510_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2550B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2550_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2851_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2852_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3010_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_301_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3350B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3350_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3351_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3352_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_4000B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_4000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_4001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_4002_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_4500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_5000B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_5000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_5001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_5002_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_5500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_6000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_6001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_6002_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_6500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_7000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_7001_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_7500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_7502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_8000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_8001_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_9000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_9001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_9002_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C1500sp_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C2050_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C2051_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C2500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C2550_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C2551_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C2800_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C3000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C3001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C3002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C3003_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C300SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C300_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C305_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C3300_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C3500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C3501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C3502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C3503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C4000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C400SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C400_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C4500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C4501A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C4501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C4502A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C4502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C4503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C5000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C5501A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C5501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C5502A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C5502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C5503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C6000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C6003_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C6501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C6502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C7500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C7501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C8002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_CW2200_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_W2400_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_W2401_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_W3600_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_W3601_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_W5100_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-MP_W7140_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-P7026N_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-P7026_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-P7032_PS.ppd.gz
@@ -1257,11 +2060,42 @@ usr/share/foomatic/db/source/PPD/NRG/PS/NRG-P7527_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-P7527n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-P7535n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-P7575_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_1106EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_1107EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_1356EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_1357EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_906EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_907EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_C5100S_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_C5110S_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_4100NL_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_4100N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_4110N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_4210N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_4310N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_5200DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_5200S_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_5210DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_5210SF_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_5210SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_6330N_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_8100DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_8200DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_8300DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_9100DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C320DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C410DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C411DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C420DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C430DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C431DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C730DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C811DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C820DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C821DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C830DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C831DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PS/NRG-SP_W2470_PS.ppd.gz
#usr/share/foomatic/db/source/PPD/NRG/PXL
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-10515_10518_10512_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-2205_2238_2212_PXL.ppd.gz
@@ -1304,20 +2138,100 @@ usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_1100_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_1350_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_1600_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_161_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_171_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_201_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2352_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2501_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2510_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2550B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2550_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2851_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2852_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3010_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3350B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3350_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3351_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3352_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_4000B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_4000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_4001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_4002_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_4500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_5000B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_5000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_5001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_5002_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_5500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_6000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_6001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_6002_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_6500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_7000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_7001_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_7500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_7502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_8000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_8001_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_9000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_9001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_9002_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C1500sp_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C2050_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C2051_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C2500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C2550_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C2551_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C2800_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C3000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C3001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C3002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C3003_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C300SR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C300_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C3300_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C3500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C3501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C3502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C3503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C4000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C400SR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C400_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C4500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C4501A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C4501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C4502A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C4502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C4503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C5000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C5501A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C5501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C5502A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C5502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C5503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C6000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C6003_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C6501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C6502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C7500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C7501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C8002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_1106EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_1107EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_1356EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_1357EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_906EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_907EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_C5100S_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_C5110S_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-SG2100N_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-SG3100SNw_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-SG3110DN_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-SG3110DNw_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/NRG/PXL/NRG-SG3110SFNw_PXL.ppd.gz
#usr/share/foomatic/db/source/PPD/Oce
#usr/share/foomatic/db/source/PPD/Oce/Oce-3145PS
#usr/share/foomatic/db/source/PPD/Oce/Oce-3145PS/1
@@ -1389,43 +2303,36 @@ usr/share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2105PS/1/OCVP2105.ppd.gz
#usr/share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2110PS/1
usr/share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2110PS/1/OCVP2110.ppd.gz
#usr/share/foomatic/db/source/PPD/Oce/Others
-usr/share/foomatic/db/source/PPD/Oce/Others/OC2050_3.ppd.gz
-usr/share/foomatic/db/source/PPD/Oce/Others/OC2060_3.ppd.gz
-usr/share/foomatic/db/source/PPD/Oce/Others/OC2070_3.ppd.gz
+usr/share/foomatic/db/source/PPD/Oce/Others/IM8530_1.ppd.gz
usr/share/foomatic/db/source/PPD/Oce/Others/OC3145_2.ppd.gz
-usr/share/foomatic/db/source/PPD/Oce/Others/OC3145_3.ppd.gz
usr/share/foomatic/db/source/PPD/Oce/Others/OC3155_2.ppd.gz
-usr/share/foomatic/db/source/PPD/Oce/Others/OC3155_3.ppd.gz
usr/share/foomatic/db/source/PPD/Oce/Others/OC3165_2.ppd.gz
-usr/share/foomatic/db/source/PPD/Oce/Others/OC3165_3.ppd.gz
usr/share/foomatic/db/source/PPD/Oce/Others/OC8445_2.ppd.gz
-usr/share/foomatic/db/source/PPD/Oce/Others/OC8445_3.ppd.gz
usr/share/foomatic/db/source/PPD/Oce/Others/OC8465_2.ppd.gz
-usr/share/foomatic/db/source/PPD/Oce/Others/OC8465_3.ppd.gz
usr/share/foomatic/db/source/PPD/Oce/Others/OC9230_2.ppd.gz
usr/share/foomatic/db/source/PPD/Oce/Others/OC9245_2.ppd.gz
usr/share/foomatic/db/source/PPD/Oce/Others/OC9260_2.ppd.gz
-usr/share/foomatic/db/source/PPD/Oce/Others/OCVP2090.ppd.gz
-usr/share/foomatic/db/source/PPD/Oce/Others/OCVP2105.ppd.gz
-#usr/share/foomatic/db/source/PPD/Okidata
-usr/share/foomatic/db/source/PPD/Okidata/OK5700_a.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/OK5900_a.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/OK6100_a.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok4300u1.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok5300u1.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok5400u1.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok5450u1.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok7100u1.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok7200u1.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok7300u1.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok7400u1.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok7500u1.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok9200u1.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok9300u1.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok9400u1.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok9500u1.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/ok9600u1a.ppd.gz
-usr/share/foomatic/db/source/PPD/Okidata/okop14u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki
+usr/share/foomatic/db/source/PPD/Oki/OK5700_a.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/OK5900_a.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/OK6100_a.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/OK8800_a.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok4300u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok4350u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok5300u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok5400u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok5450u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok7100u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok7200u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok7300u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok7400u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok7500u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok9200u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok9300u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok9400u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok9500u1.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/ok9600u1a.ppd.gz
+usr/share/foomatic/db/source/PPD/Oki/okop14u1.ppd.gz
#usr/share/foomatic/db/source/PPD/Ricoh
#usr/share/foomatic/db/source/PPD/Ricoh/PS
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_1022_PS.ppd.gz
@@ -1501,24 +2408,114 @@ usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_1100_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_1350_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_1600_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_161_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_171_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_2000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_201_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_2352_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_2500_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_2510_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_2550B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_2550_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_2851_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_2852_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_3010_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_301_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_3350B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_3350_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_3351_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_3352_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_3500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_4000B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_4000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_4001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_4002_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_4500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_5000B_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_5000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_5001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_5002_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_5500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_6000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_6001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_6002_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_6500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_7000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_7001_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_7500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_7502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_8000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_8001_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_9000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_9001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_9002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C2050_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C2051_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C2500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C2550_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C2551_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C2800_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C300SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C300_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C305_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3300_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C4000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C400SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C400_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C4500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C4501A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C4501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C4502A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C4502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C5000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C5501A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C5501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C5502A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C5502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C6000_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C6501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C7500_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C7501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_W2400_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_W2401_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_W3600_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_W3601_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_W5100_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_W7140_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_4100NL_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_4100N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_4110N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_4210N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_4310N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_5200DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_5200S_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_5210DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_5210SF_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_5210SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_6330N_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_8100DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_8200DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_8300DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_9100DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C320DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C400DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C410DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C411DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C430DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C431DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C730DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C811DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C820DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C821DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C830DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C831DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_W2470_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-ColorLaser_AP828_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-DDP_70_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-DDP_92_PS.ppd.gz
@@ -1528,8 +2525,31 @@ usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-LASER_AP2600N_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-LASER_AP2600_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-LASER_AP2610N_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-LASER_AP2610_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_2001_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_2501_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C1500_615C_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C3003_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C3503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C4503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C5503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C6003_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C6502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C8002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_CW2200_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_1106EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_1107EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_1356EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_1357EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_906EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_907EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_C5100S_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_C5110S_PS.ppd.gz
#usr/share/foomatic/db/source/PPD/Ricoh/PXL
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-AficioSG2100N_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-AficioSG3100SNw_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-AficioSG3110DN_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-AficioSG3110DNw_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-AficioSG3110SFNw_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_1022_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_1027_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_1032_PXL.ppd.gz
@@ -1571,22 +2591,181 @@ usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_1100_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_1350_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_1600_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_161_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_171_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_2000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_201_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_2352_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_2500_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_2510_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_2550B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_2550_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_2851_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_2852_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_3010_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_3350B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_3350_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_3351_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_3352_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_3500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_4000B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_4000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_4001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_4002_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_4500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_5000B_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_5000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_5001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_5002_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_5500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_6000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_6001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_6002_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_6500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_7000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_7001_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_7500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_7502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_8000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_8001_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_9000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_9001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_9002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C2050_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C2051_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C2500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C2550_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C2551_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C2800_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C300SR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C300_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3300_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C4000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C400SR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C400_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C4500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C4501A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C4501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C4502A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C4502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C5000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C5501A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C5501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C5502A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C5502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C6000_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C6501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C7500_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C7501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-GX_3050N_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-GX_3050SFN_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-GX_5050N_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-GX_E3350N_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-GX_E5550N_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_2001_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_2501_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C1500_615C_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C3003_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C3503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C4503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C5503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C6003_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C6502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C8002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_1106EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_1107EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_1356EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_1357EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_906EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_907EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_C5100S_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_C5110S_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung
+usr/share/foomatic/db/source/PPD/Samsung/PS
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLP-350_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLP-410_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLP-660_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLP-670_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLP-680_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLP-770_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLP-775_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-3300_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-4190_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-6200_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-6220_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-6240_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-6250_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-6260_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-8380_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-8385X_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-8385_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-8540_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-8640_8650_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-9250_9350_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-9252_9352_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-92x1_93x1_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-981x_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_CLX-982x_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_M337x_387x_407x_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-2150_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-2550_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-2570_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-2850_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-2853_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-2855_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-3470_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-3475_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-371x_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-375x_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-4050_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-4055_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-451x_501x_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-4550_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-4555_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-551x_651x_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-8850_8950_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-8x00_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-483x_5x3x_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-4x28_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-5635_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-5835_5935X_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-5835_5935_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-6545X_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-6545_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-681x_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-6x20_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-6x22_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-6x45_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-6x55X_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-6x55_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-8030_8040_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-8123_8128_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-8230_8240_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-881x_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PS/Samsung_SCX-882x_Series.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PXL
+usr/share/foomatic/db/source/PPD/Samsung/PXL/Samsung_CLP-610_Series_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PXL/Samsung_CLP-620_Series_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PXL/Samsung_M262x_282x_Series_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PXL/Samsung_M267x_287x_Series_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PXL/Samsung_ML-2525W_Series_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PXL/Samsung_ML-2580_Series_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PXL/Samsung_ML-2950_Series_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PXL/Samsung_SCX-470x_Series_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PXL/Samsung_SCX-472x_Series_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PXL/Samsung_SCX-4x24_Series_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PXL/Samsung_SCX-4x25_Series_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Samsung/PXL/Samsung_SCX-4x26_Series_PXL.ppd.gz
#usr/share/foomatic/db/source/PPD/Savin
#usr/share/foomatic/db/source/PPD/Savin/PS
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-2404WDP_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-2404WD_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-2406WD_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-2522_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-2527_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-2532_PS.ppd.gz
@@ -1594,6 +2773,7 @@ usr/share/foomatic/db/source/PPD/Savin/PS/Savin-2535_2235_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-2545_2245_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-2560_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-2575_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-3406WD_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-3515_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-40105_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-4015_PS.ppd.gz
@@ -1609,6 +2789,9 @@ usr/share/foomatic/db/source/PPD/Savin/PS/Savin-4051_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-4060_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-4075_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-4090_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-5100WD_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-7025_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-7140WD_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8016_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8020_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8020d_PS.ppd.gz
@@ -1621,14 +2804,35 @@ usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8035e_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8045_8045g_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8045e_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8055_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8060_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8065_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8070_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8075_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8080_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8090_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8110_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-8135_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-816_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9016_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9021d_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9025_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9025b_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9033_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9033b_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9040_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9040b_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9050_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9050b_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9060_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9070_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9080_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9090_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-917_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-920_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9228_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9233_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9240_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-9250_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C2408_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C2410_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C2524_PS.ppd.gz
@@ -1636,18 +2840,37 @@ usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C2525_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C2532_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C2820_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C2824_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C2828_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C3030_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C3210_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C3210e_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C3224_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C3333_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C3528_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C3535_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C3828_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C4040_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C4535_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C4540_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C5050_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C6045_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C6055_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C7570_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C9020_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C9025_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C9065_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C9075_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C9120_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C9125_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C9130_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C9135_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C9145A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C9145_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C9155A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C9155_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP1036_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP128_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP131DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP135_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP1620_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP17_PS.ppd.gz
@@ -1658,28 +2881,89 @@ usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP26DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP27DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP28_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP31DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP340D_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP350D_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP35_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP37DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP42DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-CLP831_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C_230SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C_230_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C_240SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-C_240_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-FAX3799_3799nf_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP145_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP150DN_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP175n_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP235n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP25_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP25n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP26_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP26n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP28_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP28n_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP31nL_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP31n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP32_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP35n_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP36n_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP37N_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP45_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MLP75n_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_2352_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_2501_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_2852_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_301_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_3352_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_4002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_5002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_6002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_7502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_9002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C3002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C3003_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C305_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C3502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C3503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C4502A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C4502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C4503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C5502A_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C5502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C5503_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C6003_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C6502_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C8002_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-MP_CW2200_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_1106EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_1107EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_1356EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_1357EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_906EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_907EX_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_C5100S_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_C5110S_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SDC555_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SGC_1506_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SLP26_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SLP26n_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SLP32_PS.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SLP38c_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SP_4310N_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SP_5200DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SP_5200S_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SP_5210DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SP_5210SF_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SP_5210SR_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SP_8300DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SP_C320DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SP_C400DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SP_C730DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SP_C830DN_PS.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PS/Savin-SP_C831DN_PS.ppd.gz
#usr/share/foomatic/db/source/PPD/Savin/PXL
+usr/share/foomatic/db/source/PPD/Savin/PXL/SAVIN-SG3110DN_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/SAVIN-SG3110DNw_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-2522_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-2527_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-2532_PXL.ppd.gz
@@ -1702,6 +2986,7 @@ usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-4051_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-4060_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-4075_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-4090_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-7025_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8016_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8020_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8020d_PXL.ppd.gz
@@ -1714,46 +2999,115 @@ usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8035e_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8045_8045g_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8045e_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8055_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8060_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8065_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8070_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8075_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8080_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8090_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8110_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-8135_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-816_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9016_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9021d_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9025_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9025b_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9033_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9033b_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9040_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9040b_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9050_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9050b_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9060_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9070_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9080_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9090_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-917_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-920_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9228_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9233_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9240_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-9250_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C2410_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C2525_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C2824_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C2828_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C3030_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C3210e_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C3333_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C3528_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C3535_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C4040_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C4535_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C4540_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C5050_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C6045_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C6055_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C7570_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C9020_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C9025_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C9065_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C9075_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C9120_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C9125_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C9130_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C9135_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C9145A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C9145_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C9155A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C9155_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C_230SR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C_230_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C_240SR_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-C_240_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_2352_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_2501_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_2852_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_3352_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_4002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_5002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_6002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_7502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_9002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C3002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C3003_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C3502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C3503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C4502A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C4502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C4503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C5502A_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C5502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C5503_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C6003_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C6502_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C8002_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_1106EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_1107EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_1356EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_1357EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_906EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_907EX_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_C5100S_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_C5110S_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-SDC555_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-SG3100SNw_PXL.ppd.gz
+usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-SG3110SFNw_PXL.ppd.gz
usr/share/foomatic/db/source/PPD/Savin/PXL/Savin-SGC_1506_PXL.ppd.gz
#usr/share/foomatic/db/source/PPD/Sharp
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-2300FG-ps-jp.ppd.gz
-usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-2300G-ps-jp.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-2300G-ps.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-2300N-ps.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-2700FG-ps-jp.ppd.gz
-usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-2700G-ps-jp.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-2700G-ps.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-2700N-ps.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-3500FN-ps-jp.ppd.gz
-usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-3500N-ps-jp.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-3500N-ps.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-3501FN-ps-jp.ppd.gz
-usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-3501N-ps-jp.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-3501N-ps.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-4500FN-ps-jp.ppd.gz
-usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-4500N-ps-jp.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-4500N-ps.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-4501FN-ps-jp.ppd.gz
-usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-4501N-ps-jp.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/Sharp-MX-4501N-ps.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/sc170fpj.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/sc172fpj.ppd.gz
@@ -1823,7 +3177,6 @@ usr/share/foomatic/db/source/PPD/Sharp/sharm237.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/sharm276.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/sharm277.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/shc260fj.ppd.gz
-usr/share/foomatic/db/source/PPD/Sharp/shc260mj.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/shc260sj.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/shc261fj.ppd.gz
usr/share/foomatic/db/source/PPD/Sharp/shc261mj.ppd.gz
@@ -1838,27 +3191,28 @@ usr/share/foomatic/db/source/PPD/Toshiba/TOSHIBA_EST4511_451c_CUPS.ppd.gz
usr/share/foomatic/db/source/PPD/Toshiba/TOSHIBA_EST850_CUPS.ppd.gz
usr/share/foomatic/db/source/PPD/Toshiba/Toshiba_GL1010_CUPS.ppd.gz
usr/share/foomatic/db/source/PPD/Toshiba/Toshiba_GL1020_CUPS.ppd.gz
-usr/share/foomatic/db/source/PPD/bzrAddPPD.sh
-usr/share/foomatic/db/source/PPD/bzrAddXML.sh
-usr/share/foomatic/db/source/PPD/generateBZRScript.sh
#usr/share/foomatic/db/source/driver
-usr/share/foomatic/db/source/driver/PM760p.upp.xml
-usr/share/foomatic/db/source/driver/PM760pl.upp.xml
-usr/share/foomatic/db/source/driver/PM820p.upp.xml
-usr/share/foomatic/db/source/driver/PM820pl.upp.xml
+usr/share/foomatic/db/source/driver/Postscript-Brother.xml
+usr/share/foomatic/db/source/driver/Postscript-Epson.xml
+usr/share/foomatic/db/source/driver/Postscript-Gestetner.xml
+usr/share/foomatic/db/source/driver/Postscript-HP.xml
+usr/share/foomatic/db/source/driver/Postscript-InfoPrint.xml
+usr/share/foomatic/db/source/driver/Postscript-Infotec.xml
+usr/share/foomatic/db/source/driver/Postscript-KONICA_MINOLTA.xml
+usr/share/foomatic/db/source/driver/Postscript-Kyocera.xml
+usr/share/foomatic/db/source/driver/Postscript-Lanier.xml
+usr/share/foomatic/db/source/driver/Postscript-Lexmark.xml
+usr/share/foomatic/db/source/driver/Postscript-NRG.xml
+usr/share/foomatic/db/source/driver/Postscript-Oce.xml
+usr/share/foomatic/db/source/driver/Postscript-Oki.xml
+usr/share/foomatic/db/source/driver/Postscript-Ricoh.xml
+usr/share/foomatic/db/source/driver/Postscript-Samsung.xml
+usr/share/foomatic/db/source/driver/Postscript-Savin.xml
+usr/share/foomatic/db/source/driver/Postscript-Sharp.xml
+usr/share/foomatic/db/source/driver/Postscript-Toshiba.xml
usr/share/foomatic/db/source/driver/Postscript.xml
-usr/share/foomatic/db/source/driver/Stc670p.upp.xml
-usr/share/foomatic/db/source/driver/Stc670pl.upp.xml
-usr/share/foomatic/db/source/driver/Stc680p.upp.xml
-usr/share/foomatic/db/source/driver/Stc680pl.upp.xml
-usr/share/foomatic/db/source/driver/Stc760p.upp.xml
-usr/share/foomatic/db/source/driver/Stc760pl.upp.xml
-usr/share/foomatic/db/source/driver/Stc777p.upp.xml
-usr/share/foomatic/db/source/driver/Stc777pl.upp.xml
-usr/share/foomatic/db/source/driver/Stp720p.upp.xml
-usr/share/foomatic/db/source/driver/Stp720pl.upp.xml
-usr/share/foomatic/db/source/driver/Stp870p.upp.xml
-usr/share/foomatic/db/source/driver/Stp870pl.upp.xml
+usr/share/foomatic/db/source/driver/Postscript1.xml
+usr/share/foomatic/db/source/driver/Postscript2-Oce.xml
usr/share/foomatic/db/source/driver/ap3250.xml
usr/share/foomatic/db/source/driver/appledmp.xml
usr/share/foomatic/db/source/driver/bj10.xml
@@ -1866,51 +3220,22 @@ usr/share/foomatic/db/source/driver/bj10e.xml
usr/share/foomatic/db/source/driver/bj10v.xml
usr/share/foomatic/db/source/driver/bj10vh.xml
usr/share/foomatic/db/source/driver/bj200.xml
-usr/share/foomatic/db/source/driver/bj8gc12f.upp.xml
-usr/share/foomatic/db/source/driver/bj8hg12f.upp.xml
-usr/share/foomatic/db/source/driver/bj8oh06n.upp.xml
-usr/share/foomatic/db/source/driver/bj8pa06n.upp.xml
-usr/share/foomatic/db/source/driver/bj8pp12f.upp.xml
-usr/share/foomatic/db/source/driver/bj8ts06n.upp.xml
+usr/share/foomatic/db/source/driver/bj8XXYYZ.upp.xml
usr/share/foomatic/db/source/driver/bjc250gs.xml
usr/share/foomatic/db/source/driver/bjc600.xml
-usr/share/foomatic/db/source/driver/bjc6000a1.upp.xml
-usr/share/foomatic/db/source/driver/bjc6000b1.upp.xml
-usr/share/foomatic/db/source/driver/bjc610a0.upp.xml
-usr/share/foomatic/db/source/driver/bjc610a1.upp.xml
-usr/share/foomatic/db/source/driver/bjc610a2.upp.xml
-usr/share/foomatic/db/source/driver/bjc610a3.upp.xml
-usr/share/foomatic/db/source/driver/bjc610a4.upp.xml
-usr/share/foomatic/db/source/driver/bjc610a5.upp.xml
-usr/share/foomatic/db/source/driver/bjc610a6.upp.xml
-usr/share/foomatic/db/source/driver/bjc610a7.upp.xml
-usr/share/foomatic/db/source/driver/bjc610a8.upp.xml
-usr/share/foomatic/db/source/driver/bjc610b1.upp.xml
-usr/share/foomatic/db/source/driver/bjc610b2.upp.xml
-usr/share/foomatic/db/source/driver/bjc610b3.upp.xml
-usr/share/foomatic/db/source/driver/bjc610b4.upp.xml
-usr/share/foomatic/db/source/driver/bjc610b6.upp.xml
-usr/share/foomatic/db/source/driver/bjc610b7.upp.xml
-usr/share/foomatic/db/source/driver/bjc610b8.upp.xml
usr/share/foomatic/db/source/driver/bjc800.xml
usr/share/foomatic/db/source/driver/bjc800j.xml
usr/share/foomatic/db/source/driver/bjc880j.xml
usr/share/foomatic/db/source/driver/c2050.xml
usr/share/foomatic/db/source/driver/c2070.xml
+usr/share/foomatic/db/source/driver/c2esp.xml
usr/share/foomatic/db/source/driver/capt.xml
-usr/share/foomatic/db/source/driver/cdj1600.xml
usr/share/foomatic/db/source/driver/cdj500.xml
-usr/share/foomatic/db/source/driver/cdj550.upp.xml
usr/share/foomatic/db/source/driver/cdj550.xml
-usr/share/foomatic/db/source/driver/cdj670.xml
-usr/share/foomatic/db/source/driver/cdj850.xml
-usr/share/foomatic/db/source/driver/cdj880.xml
-usr/share/foomatic/db/source/driver/cdj890.xml
-usr/share/foomatic/db/source/driver/cdj970.xml
+usr/share/foomatic/db/source/driver/cdnj500.xml
usr/share/foomatic/db/source/driver/chp2200.xml
usr/share/foomatic/db/source/driver/cjet.xml
usr/share/foomatic/db/source/driver/cljet5.xml
-usr/share/foomatic/db/source/driver/cljet5c.xml
usr/share/foomatic/db/source/driver/cp50.xml
usr/share/foomatic/db/source/driver/declj250.xml
usr/share/foomatic/db/source/driver/deskjet.xml
@@ -1922,23 +3247,35 @@ usr/share/foomatic/db/source/driver/eplaser-jp.xml
usr/share/foomatic/db/source/driver/eplaser.xml
usr/share/foomatic/db/source/driver/eps9high.xml
usr/share/foomatic/db/source/driver/eps9mid.xml
+usr/share/foomatic/db/source/driver/epson-escpr.xml
usr/share/foomatic/db/source/driver/epson.xml
usr/share/foomatic/db/source/driver/epsonc.xml
usr/share/foomatic/db/source/driver/epsonepl.xml
usr/share/foomatic/db/source/driver/escpage.xml
usr/share/foomatic/db/source/driver/fmlbp.xml
usr/share/foomatic/db/source/driver/fmpr.xml
+usr/share/foomatic/db/source/driver/foo2hbpl2.xml
+usr/share/foomatic/db/source/driver/foo2hiperc.xml
usr/share/foomatic/db/source/driver/foo2hp.xml
usr/share/foomatic/db/source/driver/foo2kyo.xml
usr/share/foomatic/db/source/driver/foo2lava.xml
+usr/share/foomatic/db/source/driver/foo2oak-z1.xml
+usr/share/foomatic/db/source/driver/foo2oak.xml
usr/share/foomatic/db/source/driver/foo2qpdl.xml
+usr/share/foomatic/db/source/driver/foo2slx.xml
usr/share/foomatic/db/source/driver/foo2xqx.xml
+usr/share/foomatic/db/source/driver/foo2zjs-z1.xml
+usr/share/foomatic/db/source/driver/foo2zjs-z2.xml
+usr/share/foomatic/db/source/driver/foo2zjs-z3.xml
usr/share/foomatic/db/source/driver/foo2zjs.xml
usr/share/foomatic/db/source/driver/gdi.xml
usr/share/foomatic/db/source/driver/gutenprint.xml
usr/share/foomatic/db/source/driver/hl1250.xml
usr/share/foomatic/db/source/driver/hl7x0.xml
-usr/share/foomatic/db/source/driver/hpijs.xml
+usr/share/foomatic/db/source/driver/hpijs-pcl3.xml
+usr/share/foomatic/db/source/driver/hpijs-pcl5c.xml
+usr/share/foomatic/db/source/driver/hpijs-pcl5e.xml
+usr/share/foomatic/db/source/driver/hplip.xml
usr/share/foomatic/db/source/driver/ibmpro.xml
usr/share/foomatic/db/source/driver/imagen.xml
usr/share/foomatic/db/source/driver/iwhi.xml
@@ -1948,7 +3285,6 @@ usr/share/foomatic/db/source/driver/jetp3852.xml
usr/share/foomatic/db/source/driver/jj100.xml
usr/share/foomatic/db/source/driver/la50.xml
usr/share/foomatic/db/source/driver/la70.xml
-usr/share/foomatic/db/source/driver/la70t.xml
usr/share/foomatic/db/source/driver/la75.xml
usr/share/foomatic/db/source/driver/la75plus.xml
usr/share/foomatic/db/source/driver/laserjet.xml
@@ -1956,6 +3292,7 @@ usr/share/foomatic/db/source/driver/lbp310.xml
usr/share/foomatic/db/source/driver/lbp320.xml
usr/share/foomatic/db/source/driver/lbp660.xml
usr/share/foomatic/db/source/driver/lbp8.xml
+usr/share/foomatic/db/source/driver/lbp800.xml
usr/share/foomatic/db/source/driver/lex5700.xml
usr/share/foomatic/db/source/driver/lex7000.xml
usr/share/foomatic/db/source/driver/lips2p.xml
@@ -1966,7 +3303,6 @@ usr/share/foomatic/db/source/driver/lj250.xml
usr/share/foomatic/db/source/driver/lj4dith.xml
usr/share/foomatic/db/source/driver/lj4dithp.xml
usr/share/foomatic/db/source/driver/lj5gray.xml
-usr/share/foomatic/db/source/driver/lj5mono.xml
usr/share/foomatic/db/source/driver/ljet2p.xml
usr/share/foomatic/db/source/driver/ljet3.xml
usr/share/foomatic/db/source/driver/ljet3d.xml
@@ -1980,7 +3316,6 @@ usr/share/foomatic/db/source/driver/lp2563.xml
usr/share/foomatic/db/source/driver/lp8000.xml
usr/share/foomatic/db/source/driver/lpstyl.xml
usr/share/foomatic/db/source/driver/lq850.xml
-usr/share/foomatic/db/source/driver/lx5000.xml
usr/share/foomatic/db/source/driver/lxm3200-tweaked.xml
usr/share/foomatic/db/source/driver/lxm5700m.xml
usr/share/foomatic/db/source/driver/lxx74.xml
@@ -1994,17 +3329,12 @@ usr/share/foomatic/db/source/driver/md50Eco.xml
usr/share/foomatic/db/source/driver/md50Mono.xml
usr/share/foomatic/db/source/driver/md5k.xml
usr/share/foomatic/db/source/driver/min12xxw.xml
-usr/share/foomatic/db/source/driver/mj500c.xml
-usr/share/foomatic/db/source/driver/mj6000c.xml
usr/share/foomatic/db/source/driver/mj700v2c.xml
-usr/share/foomatic/db/source/driver/mj8000c.xml
usr/share/foomatic/db/source/driver/ml600.xml
usr/share/foomatic/db/source/driver/ml85p.xml
-usr/share/foomatic/db/source/driver/necp2x.upp.xml
-usr/share/foomatic/db/source/driver/necp2x6.upp.xml
+usr/share/foomatic/db/source/driver/necp2xX.upp.xml
usr/share/foomatic/db/source/driver/necp6.xml
usr/share/foomatic/db/source/driver/npdl.xml
-usr/share/foomatic/db/source/driver/nwp533.xml
usr/share/foomatic/db/source/driver/oce9050.xml
usr/share/foomatic/db/source/driver/oki182.xml
usr/share/foomatic/db/source/driver/oki4w.xml
@@ -2027,60 +3357,37 @@ usr/share/foomatic/db/source/driver/ppmtomd.xml
usr/share/foomatic/db/source/driver/pr150.xml
usr/share/foomatic/db/source/driver/pr201.xml
usr/share/foomatic/db/source/driver/ptouch.xml
+usr/share/foomatic/db/source/driver/pxlcolor-Gestetner.xml
+usr/share/foomatic/db/source/driver/pxlcolor-InfoPrint.xml
+usr/share/foomatic/db/source/driver/pxlcolor-Infotec.xml
+usr/share/foomatic/db/source/driver/pxlcolor-Lanier.xml
+usr/share/foomatic/db/source/driver/pxlcolor-NRG.xml
+usr/share/foomatic/db/source/driver/pxlcolor-Ricoh.xml
+usr/share/foomatic/db/source/driver/pxlcolor-Samsung.xml
+usr/share/foomatic/db/source/driver/pxlcolor-Savin.xml
usr/share/foomatic/db/source/driver/pxlcolor.xml
+usr/share/foomatic/db/source/driver/pxldpl.xml
usr/share/foomatic/db/source/driver/pxljr.xml
+usr/share/foomatic/db/source/driver/pxlmono-Gestetner.xml
+usr/share/foomatic/db/source/driver/pxlmono-InfoPrint.xml
+usr/share/foomatic/db/source/driver/pxlmono-Infotec.xml
+usr/share/foomatic/db/source/driver/pxlmono-Lanier.xml
+usr/share/foomatic/db/source/driver/pxlmono-NRG.xml
+usr/share/foomatic/db/source/driver/pxlmono-Ricoh.xml
+usr/share/foomatic/db/source/driver/pxlmono-Samsung.xml
+usr/share/foomatic/db/source/driver/pxlmono-Savin.xml
usr/share/foomatic/db/source/driver/pxlmono.xml
usr/share/foomatic/db/source/driver/r4081.xml
-usr/share/foomatic/db/source/driver/ras1.upp.xml
-usr/share/foomatic/db/source/driver/ras24.upp.xml
-usr/share/foomatic/db/source/driver/ras3.upp.xml
-usr/share/foomatic/db/source/driver/ras32.upp.xml
-usr/share/foomatic/db/source/driver/ras4.upp.xml
-usr/share/foomatic/db/source/driver/ras8m.upp.xml
usr/share/foomatic/db/source/driver/rastertokmXXXXdl.xml
+usr/share/foomatic/db/source/driver/rastertosag-gdi.xml
usr/share/foomatic/db/source/driver/rpdl.xml
-usr/share/foomatic/db/source/driver/s400a1.upp.xml
-usr/share/foomatic/db/source/driver/s400b1.upp.xml
usr/share/foomatic/db/source/driver/sharp.upp.xml
usr/share/foomatic/db/source/driver/sipixa6.upp.xml
usr/share/foomatic/db/source/driver/sj48.xml
usr/share/foomatic/db/source/driver/slap.xml
-usr/share/foomatic/db/source/driver/sparc.xml
usr/share/foomatic/db/source/driver/splix.xml
-usr/share/foomatic/db/source/driver/st640ih.upp.xml
-usr/share/foomatic/db/source/driver/st640ihg.upp.xml
-usr/share/foomatic/db/source/driver/st640p.upp.xml
-usr/share/foomatic/db/source/driver/st640pg.upp.xml
-usr/share/foomatic/db/source/driver/st640pl.upp.xml
-usr/share/foomatic/db/source/driver/st640plg.upp.xml
-usr/share/foomatic/db/source/driver/st800.xml
-usr/share/foomatic/db/source/driver/stc.upp.xml
-usr/share/foomatic/db/source/driver/stc1520h.upp.xml
-usr/share/foomatic/db/source/driver/stc2.upp.xml
-usr/share/foomatic/db/source/driver/stc2_h.upp.xml
-usr/share/foomatic/db/source/driver/stc2s_h.upp.xml
-usr/share/foomatic/db/source/driver/stc300.upp.xml
-usr/share/foomatic/db/source/driver/stc300bl.upp.xml
-usr/share/foomatic/db/source/driver/stc300bm.upp.xml
-usr/share/foomatic/db/source/driver/stc500p.upp.xml
-usr/share/foomatic/db/source/driver/stc500ph.upp.xml
-usr/share/foomatic/db/source/driver/stc600ih.upp.xml
-usr/share/foomatic/db/source/driver/stc600p.upp.xml
-usr/share/foomatic/db/source/driver/stc600pl.upp.xml
-usr/share/foomatic/db/source/driver/stc640p.upp.xml
-usr/share/foomatic/db/source/driver/stc740ih.upp.xml
-usr/share/foomatic/db/source/driver/stc740p.upp.xml
-usr/share/foomatic/db/source/driver/stc740pl.upp.xml
-usr/share/foomatic/db/source/driver/stc800ih.upp.xml
-usr/share/foomatic/db/source/driver/stc800p.upp.xml
-usr/share/foomatic/db/source/driver/stc800pl.upp.xml
-usr/share/foomatic/db/source/driver/stc_h.upp.xml
-usr/share/foomatic/db/source/driver/stc_l.upp.xml
-usr/share/foomatic/db/source/driver/stcany.upp.xml
usr/share/foomatic/db/source/driver/stcolor.xml
-usr/share/foomatic/db/source/driver/t4693d2.xml
-usr/share/foomatic/db/source/driver/t4693d4.xml
-usr/share/foomatic/db/source/driver/t4693d8.xml
+usr/share/foomatic/db/source/driver/t4693dX.xml
usr/share/foomatic/db/source/driver/tek4696.xml
usr/share/foomatic/db/source/driver/xes.xml
#usr/share/foomatic/db/source/opt
@@ -2178,7 +3485,6 @@ usr/share/foomatic/db/source/opt/188.xml
usr/share/foomatic/db/source/opt/189.xml
usr/share/foomatic/db/source/opt/190.xml
usr/share/foomatic/db/source/opt/191.xml
-usr/share/foomatic/db/source/opt/192.xml
usr/share/foomatic/db/source/opt/193.xml
usr/share/foomatic/db/source/opt/194.xml
usr/share/foomatic/db/source/opt/195.xml
@@ -2277,7 +3583,6 @@ usr/share/foomatic/db/source/opt/97.xml
usr/share/foomatic/db/source/opt/98.xml
usr/share/foomatic/db/source/opt/99.xml
usr/share/foomatic/db/source/opt/Brother-MediaType.xml
-usr/share/foomatic/db/source/opt/GS-HalftoningAlgorithm-Gray.xml
usr/share/foomatic/db/source/opt/Minolta-PCL600.xml
usr/share/foomatic/db/source/opt/PCL-4-5-InputSlot.xml
usr/share/foomatic/db/source/opt/PCL-XL-InputSlot.xml
@@ -2285,9 +3590,13 @@ usr/share/foomatic/db/source/opt/PJL-Duplex.xml
usr/share/foomatic/db/source/opt/PJL-PJLBinding.xml
usr/share/foomatic/db/source/opt/PJL-PJLDuplex.xml
usr/share/foomatic/db/source/opt/PageSize-A4only.xml
-usr/share/foomatic/db/source/opt/Postscript-PreFilter.xml
+usr/share/foomatic/db/source/opt/Postscript-Duplex.xml
+usr/share/foomatic/db/source/opt/Postscript-InputSlot.xml
+usr/share/foomatic/db/source/opt/Postscript-PageSize.xml
usr/share/foomatic/db/source/opt/Postscript-Resolution.xml
-usr/share/foomatic/db/source/opt/bj8pa06n-Resolution.xml
+usr/share/foomatic/db/source/opt/Postscript-largeformat-PageSize.xml
+usr/share/foomatic/db/source/opt/Postscript1-Resolution.xml
+usr/share/foomatic/db/source/opt/bj8XXYYZ-Resolution.xml
usr/share/foomatic/db/source/opt/bjc250gs-BlueGamma.xml
usr/share/foomatic/db/source/opt/bjc250gs-ColorMode.xml
usr/share/foomatic/db/source/opt/bjc250gs-ComposeK.xml
@@ -2315,8 +3624,10 @@ usr/share/foomatic/db/source/opt/cZ11somsom-Magenta.xml
usr/share/foomatic/db/source/opt/cZ11somsom-Yellow.xml
usr/share/foomatic/db/source/opt/cdj5XX-BlackCorrect.xml
usr/share/foomatic/db/source/opt/cdj5XX-Depletion.xml
+usr/share/foomatic/db/source/opt/cdj690X-Resolution.xml
usr/share/foomatic/db/source/opt/cljet5-ColorMode.xml
usr/share/foomatic/db/source/opt/dnj650c-Resolution.xml
+usr/share/foomatic/db/source/opt/dnj750X-Resolution.xml
usr/share/foomatic/db/source/opt/drv_x125-Bidirectional.xml
usr/share/foomatic/db/source/opt/drv_x125-ColorMode.xml
usr/share/foomatic/db/source/opt/drv_x125-Device.xml
@@ -2359,12 +3670,18 @@ usr/share/foomatic/db/source/opt/hl7x0-InputSlot.xml
usr/share/foomatic/db/source/opt/hl7x0-MediaType.xml
usr/share/foomatic/db/source/opt/hl7x0-PIN.xml
usr/share/foomatic/db/source/opt/hl7x0-Resolution.xml
-usr/share/foomatic/db/source/opt/hpijs-Duplex.xml
-usr/share/foomatic/db/source/opt/hpijs-InputSlot.xml
-usr/share/foomatic/db/source/opt/hpijs-Model.xml
-usr/share/foomatic/db/source/opt/hpijs-PageSize.xml
-usr/share/foomatic/db/source/opt/hpijs-PrintoutMode.xml
-usr/share/foomatic/db/source/opt/hpijs-Quality.xml
+usr/share/foomatic/db/source/opt/hpijs-pcl3-Model.xml
+usr/share/foomatic/db/source/opt/hpijs-pcl3-PageSize.xml
+usr/share/foomatic/db/source/opt/hpijs-pcl3-PrintoutMode.xml
+usr/share/foomatic/db/source/opt/hpijs-pcl3-Quality.xml
+usr/share/foomatic/db/source/opt/hpijs-pcl5-Duplex.xml
+usr/share/foomatic/db/source/opt/hpijs-pcl5-InputSlot.xml
+usr/share/foomatic/db/source/opt/hpijs-pcl5-PageSize.xml
+usr/share/foomatic/db/source/opt/hpijs-pcl5c-PrintoutMode.xml
+usr/share/foomatic/db/source/opt/hpijs-pcl5c-Quality.xml
+usr/share/foomatic/db/source/opt/hpijs-pcl5e-PrintoutMode.xml
+usr/share/foomatic/db/source/opt/hpijs-pcl5e-Quality.xml
+usr/share/foomatic/db/source/opt/ibmpro-Resolution.xml
usr/share/foomatic/db/source/opt/jap-PageSize.xml
usr/share/foomatic/db/source/opt/jap-Resolution.xml
usr/share/foomatic/db/source/opt/largeformat-PageSize.xml
@@ -2395,6 +3712,7 @@ usr/share/foomatic/db/source/opt/pcl3-PrintoutMode-HPDJ520.xml
usr/share/foomatic/db/source/opt/pentaxpj-Density.xml
usr/share/foomatic/db/source/opt/pentaxpj-OutputType.xml
usr/share/foomatic/db/source/opt/pentaxpj-PageSize.xml
+usr/share/foomatic/db/source/opt/pjl-HP-DesignJet-InputSlot.xml
usr/share/foomatic/db/source/opt/pjl-Samsung-ML-1650-AllowReprint.xml
usr/share/foomatic/db/source/opt/pjl-Samsung-ML-1650-Economode.xml
usr/share/foomatic/db/source/opt/pjl-Samsung-ML-1650-MediaType.xml
@@ -2424,14 +3742,13 @@ usr/share/foomatic/db/source/opt/ppmtomd-Primer.xml
usr/share/foomatic/db/source/opt/ppmtomd-PrintColors.xml
usr/share/foomatic/db/source/opt/ppmtomd-PrintingMethod.xml
usr/share/foomatic/db/source/opt/ppmtomd-UseMultiColourRibbon.xml
-usr/share/foomatic/db/source/opt/pxlmono-GSResolution.xml
-usr/share/foomatic/db/source/opt/pxlmono-JCLResolution.xml
usr/share/foomatic/db/source/opt/pxlmono-PrinterResolution.xml
usr/share/foomatic/db/source/opt/pxlmono-PrintoutMode.xml
usr/share/foomatic/db/source/opt/s400a1-Resolution.xml
usr/share/foomatic/db/source/opt/sipixa6.upp-PageSize.xml
-usr/share/foomatic/db/source/opt/st640ih-Resolution.xml
-usr/share/foomatic/db/source/opt/stc300.upp-Resolution.xml
+usr/share/foomatic/db/source/opt/st640X-Resolution.xml
+usr/share/foomatic/db/source/opt/stc300X.upp-Resolution.xml
+usr/share/foomatic/db/source/opt/stcanyX-Resolution.xml
#usr/share/foomatic/db/source/printer
usr/share/foomatic/db/source/printer/Alps-MD-1000.xml
usr/share/foomatic/db/source/printer/Alps-MD-1300.xml
@@ -2480,7 +3797,19 @@ usr/share/foomatic/db/source/printer/Avery-Personal_Label_Printer.xml
usr/share/foomatic/db/source/printer/Avery-Personal_Label_Printerplus.xml
usr/share/foomatic/db/source/printer/Brother-4550.xml
usr/share/foomatic/db/source/printer/Brother-DCP-1200.xml
+usr/share/foomatic/db/source/printer/Brother-DCP-7010.xml
+usr/share/foomatic/db/source/printer/Brother-DCP-7020.xml
+usr/share/foomatic/db/source/printer/Brother-DCP-7025.xml
+usr/share/foomatic/db/source/printer/Brother-DCP-7045N.xml
+usr/share/foomatic/db/source/printer/Brother-DCP-8020.xml
+usr/share/foomatic/db/source/printer/Brother-DCP-8025D.xml
+usr/share/foomatic/db/source/printer/Brother-DCP-8040.xml
usr/share/foomatic/db/source/printer/Brother-DCP-8045D.xml
+usr/share/foomatic/db/source/printer/Brother-DCP-8080DN.xml
+usr/share/foomatic/db/source/printer/Brother-DCP-8085DN.xml
+usr/share/foomatic/db/source/printer/Brother-DCP-9010CN.xml
+usr/share/foomatic/db/source/printer/Brother-DCP-9040CN.xml
+usr/share/foomatic/db/source/printer/Brother-DCP-9045CDN.xml
usr/share/foomatic/db/source/printer/Brother-HJ-400.xml
usr/share/foomatic/db/source/printer/Brother-HL-1020.xml
usr/share/foomatic/db/source/printer/Brother-HL-1030.xml
@@ -2501,19 +3830,32 @@ usr/share/foomatic/db/source/printer/Brother-HL-1440.xml
usr/share/foomatic/db/source/printer/Brother-HL-1450.xml
usr/share/foomatic/db/source/printer/Brother-HL-1470N.xml
usr/share/foomatic/db/source/printer/Brother-HL-1650.xml
+usr/share/foomatic/db/source/printer/Brother-HL-1650_70N.xml
usr/share/foomatic/db/source/printer/Brother-HL-1660e.xml
usr/share/foomatic/db/source/printer/Brother-HL-1670N.xml
usr/share/foomatic/db/source/printer/Brother-HL-1850.xml
+usr/share/foomatic/db/source/printer/Brother-HL-1850_70N.xml
usr/share/foomatic/db/source/printer/Brother-HL-1870N.xml
+usr/share/foomatic/db/source/printer/Brother-HL-2030.xml
+usr/share/foomatic/db/source/printer/Brother-HL-2035.xml
+usr/share/foomatic/db/source/printer/Brother-HL-2040.xml
usr/share/foomatic/db/source/printer/Brother-HL-2060.xml
+usr/share/foomatic/db/source/printer/Brother-HL-2070N.xml
+usr/share/foomatic/db/source/printer/Brother-HL-2140.xml
+usr/share/foomatic/db/source/printer/Brother-HL-2170W.xml
usr/share/foomatic/db/source/printer/Brother-HL-2400CeN.xml
usr/share/foomatic/db/source/printer/Brother-HL-2460.xml
usr/share/foomatic/db/source/printer/Brother-HL-2460N.xml
usr/share/foomatic/db/source/printer/Brother-HL-2600CN.xml
+usr/share/foomatic/db/source/printer/Brother-HL-2700CN.xml
+usr/share/foomatic/db/source/printer/Brother-HL-3070CW.xml
usr/share/foomatic/db/source/printer/Brother-HL-3260N.xml
usr/share/foomatic/db/source/printer/Brother-HL-3400CN.xml
usr/share/foomatic/db/source/printer/Brother-HL-3450CN.xml
usr/share/foomatic/db/source/printer/Brother-HL-4000CN.xml
+usr/share/foomatic/db/source/printer/Brother-HL-4040CN.xml
+usr/share/foomatic/db/source/printer/Brother-HL-4050CDN.xml
+usr/share/foomatic/db/source/printer/Brother-HL-4070CDW.xml
usr/share/foomatic/db/source/printer/Brother-HL-4Ve.xml
usr/share/foomatic/db/source/printer/Brother-HL-5030.xml
usr/share/foomatic/db/source/printer/Brother-HL-5040.xml
@@ -2522,6 +3864,14 @@ usr/share/foomatic/db/source/printer/Brother-HL-5070N.xml
usr/share/foomatic/db/source/printer/Brother-HL-5140.xml
usr/share/foomatic/db/source/printer/Brother-HL-5150D.xml
usr/share/foomatic/db/source/printer/Brother-HL-5170DN.xml
+usr/share/foomatic/db/source/printer/Brother-HL-5240.xml
+usr/share/foomatic/db/source/printer/Brother-HL-5250DN.xml
+usr/share/foomatic/db/source/printer/Brother-HL-5270DN.xml
+usr/share/foomatic/db/source/printer/Brother-HL-5350DN.xml
+usr/share/foomatic/db/source/printer/Brother-HL-5370DW.xml
+usr/share/foomatic/db/source/printer/Brother-HL-5380DN.xml
+usr/share/foomatic/db/source/printer/Brother-HL-6050.xml
+usr/share/foomatic/db/source/printer/Brother-HL-6050D_DN.xml
usr/share/foomatic/db/source/printer/Brother-HL-630.xml
usr/share/foomatic/db/source/printer/Brother-HL-660.xml
usr/share/foomatic/db/source/printer/Brother-HL-7050.xml
@@ -2530,17 +3880,45 @@ usr/share/foomatic/db/source/printer/Brother-HL-720.xml
usr/share/foomatic/db/source/printer/Brother-HL-730.xml
usr/share/foomatic/db/source/printer/Brother-HL-760.xml
usr/share/foomatic/db/source/printer/Brother-HL-8.xml
+usr/share/foomatic/db/source/printer/Brother-HL-8050N.xml
usr/share/foomatic/db/source/printer/Brother-HL-820.xml
usr/share/foomatic/db/source/printer/Brother-HL-960.xml
usr/share/foomatic/db/source/printer/Brother-MC-3000.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-295CN.xml
usr/share/foomatic/db/source/printer/Brother-MFC-4350.xml
usr/share/foomatic/db/source/printer/Brother-MFC-6550MC.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-7225N.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-7450.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-7820N.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-7840N.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-7840W.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8220.xml
usr/share/foomatic/db/source/printer/Brother-MFC-8300.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8370DN.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8380DN.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8420.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8440.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8480DN.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8600.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8640D.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8670DN.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8680DN.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8820D.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8840D.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8880DN.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-8890DW.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-9010CN.xml
usr/share/foomatic/db/source/printer/Brother-MFC-9050.xml
usr/share/foomatic/db/source/printer/Brother-MFC-9100c.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-9120CN.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-9320CW.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-9420CN.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-9440CN.xml
+usr/share/foomatic/db/source/printer/Brother-MFC-9450CDN.xml
usr/share/foomatic/db/source/printer/Brother-MFC-9500.xml
usr/share/foomatic/db/source/printer/Brother-MFC-9600.xml
usr/share/foomatic/db/source/printer/Brother-MFC-P2500.xml
+usr/share/foomatic/db/source/printer/Brother-MFC9840CDW.xml
usr/share/foomatic/db/source/printer/Brother-MFC_7150C.xml
usr/share/foomatic/db/source/printer/Brother-MP-21C.xml
usr/share/foomatic/db/source/printer/Brother-PT-1500PC.xml
@@ -2548,6 +3926,7 @@ usr/share/foomatic/db/source/printer/Brother-PT-18R.xml
usr/share/foomatic/db/source/printer/Brother-PT-1950.xml
usr/share/foomatic/db/source/printer/Brother-PT-1950VP.xml
usr/share/foomatic/db/source/printer/Brother-PT-1960.xml
+usr/share/foomatic/db/source/printer/Brother-PT-2300.xml
usr/share/foomatic/db/source/printer/Brother-PT-2420PC.xml
usr/share/foomatic/db/source/printer/Brother-PT-2450DX.xml
usr/share/foomatic/db/source/printer/Brother-PT-2500PC.xml
@@ -2632,6 +4011,8 @@ usr/share/foomatic/db/source/printer/Canon-LBP-1260.xml
usr/share/foomatic/db/source/printer/Canon-LBP-1760.xml
usr/share/foomatic/db/source/printer/Canon-LBP-310.xml
usr/share/foomatic/db/source/printer/Canon-LBP-320_Pro.xml
+usr/share/foomatic/db/source/printer/Canon-LBP-3360.xml
+usr/share/foomatic/db/source/printer/Canon-LBP-3460.xml
usr/share/foomatic/db/source/printer/Canon-LBP-350.xml
usr/share/foomatic/db/source/printer/Canon-LBP-430.xml
usr/share/foomatic/db/source/printer/Canon-LBP-460.xml
@@ -2639,6 +4020,10 @@ usr/share/foomatic/db/source/printer/Canon-LBP-470.xml
usr/share/foomatic/db/source/printer/Canon-LBP-4U.xml
usr/share/foomatic/db/source/printer/Canon-LBP-4plus.xml
usr/share/foomatic/db/source/printer/Canon-LBP-4sx.xml
+usr/share/foomatic/db/source/printer/Canon-LBP-5360.xml
+usr/share/foomatic/db/source/printer/Canon-LBP-5960.xml
+usr/share/foomatic/db/source/printer/Canon-LBP-5970.xml
+usr/share/foomatic/db/source/printer/Canon-LBP-5975.xml
usr/share/foomatic/db/source/printer/Canon-LBP-600.xml
usr/share/foomatic/db/source/printer/Canon-LBP-660.xml
usr/share/foomatic/db/source/printer/Canon-LBP-800.xml
@@ -2657,6 +4042,7 @@ usr/share/foomatic/db/source/printer/Canon-Multipass_L6000.xml
usr/share/foomatic/db/source/printer/Canon-S100.xml
usr/share/foomatic/db/source/printer/Canon-S200.xml
usr/share/foomatic/db/source/printer/Canon-S300.xml
+usr/share/foomatic/db/source/printer/Canon-S330_Photo.xml
usr/share/foomatic/db/source/printer/Canon-S400.xml
usr/share/foomatic/db/source/printer/Canon-S450.xml
usr/share/foomatic/db/source/printer/Canon-S4500.xml
@@ -2669,8 +4055,53 @@ usr/share/foomatic/db/source/printer/Canon-SELPHY-CP-500.xml
usr/share/foomatic/db/source/printer/Canon-SELPHY-CP-510.xml
usr/share/foomatic/db/source/printer/Canon-SELPHY-CP-600.xml
usr/share/foomatic/db/source/printer/Canon-SELPHY-CP-710.xml
+usr/share/foomatic/db/source/printer/Canon-i450.xml
usr/share/foomatic/db/source/printer/Canon-iP4000.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_1023.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_1023N.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_1023iF.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_2016.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_2016i.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_2018.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_2020.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_2020i.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_2022.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_2200.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_2230.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_2270.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_2800.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_3025.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_3225.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_3300.xml
usr/share/foomatic/db/source/printer/Canon-imageRunner_330s.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_3570.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_4570.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_5000.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_5570.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_6000.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_6570.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_7086.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_7095.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_7105.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_8070.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_8500.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C2550.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C2570.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C2570i.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C2620N.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C3100.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C3170.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C3170i.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C3200.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C5058.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C5068.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C5180.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C5185.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C5185i.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C5800.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C5870U.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C6800.xml
+usr/share/foomatic/db/source/printer/Canon-imageRunner_C6870U.xml
usr/share/foomatic/db/source/printer/Casio-KL-E11.xml
usr/share/foomatic/db/source/printer/Casio-KL-P1000.xml
usr/share/foomatic/db/source/printer/Casio-KP-C10.xml
@@ -2696,6 +4127,11 @@ usr/share/foomatic/db/source/printer/DEC-LJ250.xml
usr/share/foomatic/db/source/printer/DEC-LN03.xml
usr/share/foomatic/db/source/printer/DEC-LN07.xml
usr/share/foomatic/db/source/printer/DEC-LN17.xml
+usr/share/foomatic/db/source/printer/Dell-1110.xml
+usr/share/foomatic/db/source/printer/Dell-1355.xml
+usr/share/foomatic/db/source/printer/Dell-3000cn.xml
+usr/share/foomatic/db/source/printer/Dell-3010cn.xml
+usr/share/foomatic/db/source/printer/Dell-3100cn.xml
usr/share/foomatic/db/source/printer/Dell-M5200.xml
usr/share/foomatic/db/source/printer/Dell-S2500.xml
usr/share/foomatic/db/source/printer/Dymo-CoStar-ASCII_250.xml
@@ -2708,32 +4144,105 @@ usr/share/foomatic/db/source/printer/Dymo-CoStar-LabelWriter_XLplus.xml
usr/share/foomatic/db/source/printer/Dymo-CoStar-SE250.xml
usr/share/foomatic/db/source/printer/Dymo-CoStar-SE250plus.xml
usr/share/foomatic/db/source/printer/Dymo-CoStar-Turbo.xml
+usr/share/foomatic/db/source/printer/Epson-1430_Series.xml
+usr/share/foomatic/db/source/printer/Epson-1500_Series.xml
+usr/share/foomatic/db/source/printer/Epson-AL-2600.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C1000.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C1900.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C1900_PS3.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C2000.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C2000_PS3.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C2600.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C2800.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C3800.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C4000.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C4000_PS3.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C4100.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C4200.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C8500.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C8500PS.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C8600.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C8600_PS3.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C900.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C9100.xml
+usr/share/foomatic/db/source/printer/Epson-AL-C9200.xml
+usr/share/foomatic/db/source/printer/Epson-AL-CX21.xml
+usr/share/foomatic/db/source/printer/Epson-AL-M2000.xml
+usr/share/foomatic/db/source/printer/Epson-AL-M2010.xml
+usr/share/foomatic/db/source/printer/Epson-AL-M2300.xml
+usr/share/foomatic/db/source/printer/Epson-AL-M2310.xml
+usr/share/foomatic/db/source/printer/Epson-AL-M2400.xml
+usr/share/foomatic/db/source/printer/Epson-AL-M2410.xml
+usr/share/foomatic/db/source/printer/Epson-AL-M4000.xml
+usr/share/foomatic/db/source/printer/Epson-AL-M8000.xml
+usr/share/foomatic/db/source/printer/Epson-AL-MX20.xml
+usr/share/foomatic/db/source/printer/Epson-AL-MX21.xml
usr/share/foomatic/db/source/printer/Epson-ActionLaser_1100.xml
usr/share/foomatic/db/source/printer/Epson-ActionLaser_II.xml
usr/share/foomatic/db/source/printer/Epson-ActionPrinter_3250.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C1000.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C1900.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C1900PS.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C2000.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C2000PS.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C4000.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C4000PS.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C4100.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C4100PS.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C8500.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C8500PS.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C8600.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C8600PS.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C900.xml
-usr/share/foomatic/db/source/printer/Epson-AcuLaser_C9100.xml
+usr/share/foomatic/db/source/printer/Epson-Artisan_1430_Series.xml
+usr/share/foomatic/db/source/printer/Epson-Artisan_50.xml
+usr/share/foomatic/db/source/printer/Epson-Artisan_630_Series.xml
+usr/share/foomatic/db/source/printer/Epson-Artisan_700.xml
+usr/share/foomatic/db/source/printer/Epson-Artisan_710.xml
+usr/share/foomatic/db/source/printer/Epson-Artisan_720_Series.xml
+usr/share/foomatic/db/source/printer/Epson-Artisan_730_Series.xml
+usr/share/foomatic/db/source/printer/Epson-Artisan_800.xml
+usr/share/foomatic/db/source/printer/Epson-Artisan_810.xml
+usr/share/foomatic/db/source/printer/Epson-Artisan_830_Series.xml
+usr/share/foomatic/db/source/printer/Epson-Artisan_837_Series.xml
+usr/share/foomatic/db/source/printer/Epson-B42WD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-BX305_Plus_Series.xml
+usr/share/foomatic/db/source/printer/Epson-BX305_Series.xml
+usr/share/foomatic/db/source/printer/Epson-BX320FW_Series.xml
+usr/share/foomatic/db/source/printer/Epson-BX525WD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-BX535WD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-BX620FWD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-BX630FW_Series.xml
+usr/share/foomatic/db/source/printer/Epson-BX635FWD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-BX935FWD_Series.xml
usr/share/foomatic/db/source/printer/Epson-CL_700.xml
usr/share/foomatic/db/source/printer/Epson-CL_750.xml
usr/share/foomatic/db/source/printer/Epson-CL_760.xml
usr/share/foomatic/db/source/printer/Epson-Dot_Matrix.xml
+usr/share/foomatic/db/source/printer/Epson-E-150.xml
+usr/share/foomatic/db/source/printer/Epson-E-200.xml
+usr/share/foomatic/db/source/printer/Epson-E-300.xml
+usr/share/foomatic/db/source/printer/Epson-E-330.xml
+usr/share/foomatic/db/source/printer/Epson-E-330S.xml
+usr/share/foomatic/db/source/printer/Epson-E-340.xml
+usr/share/foomatic/db/source/printer/Epson-E-350.xml
+usr/share/foomatic/db/source/printer/Epson-E-360_Series.xml
+usr/share/foomatic/db/source/printer/Epson-E-370_Series.xml
+usr/share/foomatic/db/source/printer/Epson-E-500.xml
+usr/share/foomatic/db/source/printer/Epson-E-520.xml
+usr/share/foomatic/db/source/printer/Epson-E-530.xml
+usr/share/foomatic/db/source/printer/Epson-E-600.xml
+usr/share/foomatic/db/source/printer/Epson-E-700.xml
+usr/share/foomatic/db/source/printer/Epson-E-720.xml
+usr/share/foomatic/db/source/printer/Epson-E-800.xml
+usr/share/foomatic/db/source/printer/Epson-E-810.xml
+usr/share/foomatic/db/source/printer/Epson-E-820.xml
+usr/share/foomatic/db/source/printer/Epson-E-830_Series.xml
+usr/share/foomatic/db/source/printer/Epson-E-840_Series.xml
usr/share/foomatic/db/source/printer/Epson-EM_900C.xml
usr/share/foomatic/db/source/printer/Epson-EM_900CN.xml
usr/share/foomatic/db/source/printer/Epson-EM_930C.xml
usr/share/foomatic/db/source/printer/Epson-EM_930CN.xml
+usr/share/foomatic/db/source/printer/Epson-EP-306_Series.xml
+usr/share/foomatic/db/source/printer/Epson-EP-705A_Series.xml
+usr/share/foomatic/db/source/printer/Epson-EP-706A_Series.xml
+usr/share/foomatic/db/source/printer/Epson-EP-775A_Series.xml
+usr/share/foomatic/db/source/printer/Epson-EP-776A_Series.xml
+usr/share/foomatic/db/source/printer/Epson-EP-801A.xml
+usr/share/foomatic/db/source/printer/Epson-EP-805A_Series.xml
+usr/share/foomatic/db/source/printer/Epson-EP-806A_Series.xml
+usr/share/foomatic/db/source/printer/Epson-EP-901A.xml
+usr/share/foomatic/db/source/printer/Epson-EP-901F.xml
+usr/share/foomatic/db/source/printer/Epson-EP-905A_Series.xml
+usr/share/foomatic/db/source/printer/Epson-EP-905F_Series.xml
+usr/share/foomatic/db/source/printer/Epson-EP-906F_Series.xml
+usr/share/foomatic/db/source/printer/Epson-EP-976A3_Series.xml
usr/share/foomatic/db/source/printer/Epson-EPL-5200.xml
usr/share/foomatic/db/source/printer/Epson-EPL-5200plus.xml
usr/share/foomatic/db/source/printer/Epson-EPL-5500W.xml
@@ -2745,10 +4254,11 @@ usr/share/foomatic/db/source/printer/Epson-EPL-5800L.xml
usr/share/foomatic/db/source/printer/Epson-EPL-5800PS.xml
usr/share/foomatic/db/source/printer/Epson-EPL-5900.xml
usr/share/foomatic/db/source/printer/Epson-EPL-5900L.xml
-usr/share/foomatic/db/source/printer/Epson-EPL-5900PS.xml
+usr/share/foomatic/db/source/printer/Epson-EPL-5900_PS3.xml
usr/share/foomatic/db/source/printer/Epson-EPL-6100.xml
usr/share/foomatic/db/source/printer/Epson-EPL-6100L.xml
-usr/share/foomatic/db/source/printer/Epson-EPL-6100PS.xml
+usr/share/foomatic/db/source/printer/Epson-EPL-6100_PS3.xml
+usr/share/foomatic/db/source/printer/Epson-EPL-6200.xml
usr/share/foomatic/db/source/printer/Epson-EPL-6200L.xml
usr/share/foomatic/db/source/printer/Epson-EPL-7100.xml
usr/share/foomatic/db/source/printer/Epson-EPL-N1600.xml
@@ -2759,11 +4269,39 @@ usr/share/foomatic/db/source/printer/Epson-EPL-N2050PSplus.xml
usr/share/foomatic/db/source/printer/Epson-EPL-N2050plus.xml
usr/share/foomatic/db/source/printer/Epson-EPL-N2120.xml
usr/share/foomatic/db/source/printer/Epson-EPL-N2500.xml
-usr/share/foomatic/db/source/printer/Epson-EPL-N2500PS.xml
+usr/share/foomatic/db/source/printer/Epson-EPL-N2500_PS3.xml
+usr/share/foomatic/db/source/printer/Epson-EPL-N2550.xml
+usr/share/foomatic/db/source/printer/Epson-EPL-N2700.xml
usr/share/foomatic/db/source/printer/Epson-EPL-N2750.xml
usr/share/foomatic/db/source/printer/Epson-EPL-N2750PS.xml
+usr/share/foomatic/db/source/printer/Epson-EPL-N3000.xml
+usr/share/foomatic/db/source/printer/Epson-EPL-N7000.xml
+usr/share/foomatic/db/source/printer/Epson-EP_302.xml
+usr/share/foomatic/db/source/printer/Epson-EP_4004.xml
+usr/share/foomatic/db/source/printer/Epson-EP_702A.xml
+usr/share/foomatic/db/source/printer/Epson-EP_703A.xml
+usr/share/foomatic/db/source/printer/Epson-EP_704A.xml
+usr/share/foomatic/db/source/printer/Epson-EP_774A.xml
+usr/share/foomatic/db/source/printer/Epson-EP_802A.xml
+usr/share/foomatic/db/source/printer/Epson-EP_803A.xml
+usr/share/foomatic/db/source/printer/Epson-EP_804A.xml
+usr/share/foomatic/db/source/printer/Epson-EP_902A.xml
+usr/share/foomatic/db/source/printer/Epson-EP_903A.xml
+usr/share/foomatic/db/source/printer/Epson-EP_903F.xml
+usr/share/foomatic/db/source/printer/Epson-EP_904A.xml
+usr/share/foomatic/db/source/printer/Epson-EP_904F.xml
usr/share/foomatic/db/source/printer/Epson-E_100.xml
+usr/share/foomatic/db/source/printer/Epson-K100_Series.xml
+usr/share/foomatic/db/source/printer/Epson-K200_Series.xml
+usr/share/foomatic/db/source/printer/Epson-K300_Series.xml
usr/share/foomatic/db/source/printer/Epson-L-1000.xml
+usr/share/foomatic/db/source/printer/Epson-L110_Series.xml
+usr/share/foomatic/db/source/printer/Epson-L210_Series.xml
+usr/share/foomatic/db/source/printer/Epson-L300_Series.xml
+usr/share/foomatic/db/source/printer/Epson-L350_Series.xml
+usr/share/foomatic/db/source/printer/Epson-L355_Series.xml
+usr/share/foomatic/db/source/printer/Epson-L550_Series.xml
+usr/share/foomatic/db/source/printer/Epson-L555_Series.xml
usr/share/foomatic/db/source/printer/Epson-LP-1800.xml
usr/share/foomatic/db/source/printer/Epson-LP-1900.xml
usr/share/foomatic/db/source/printer/Epson-LP-2000.xml
@@ -2781,27 +4319,46 @@ usr/share/foomatic/db/source/printer/Epson-LP-8000C.xml
usr/share/foomatic/db/source/printer/Epson-LP-8100.xml
usr/share/foomatic/db/source/printer/Epson-LP-8200C.xml
usr/share/foomatic/db/source/printer/Epson-LP-8300C.xml
+usr/share/foomatic/db/source/printer/Epson-LP-8300CPD.xml
usr/share/foomatic/db/source/printer/Epson-LP-8300F.xml
usr/share/foomatic/db/source/printer/Epson-LP-8400F.xml
usr/share/foomatic/db/source/printer/Epson-LP-8500C.xml
+usr/share/foomatic/db/source/printer/Epson-LP-8500CPD.xml
usr/share/foomatic/db/source/printer/Epson-LP-8600.xml
usr/share/foomatic/db/source/printer/Epson-LP-8600F.xml
usr/share/foomatic/db/source/printer/Epson-LP-8700.xml
usr/share/foomatic/db/source/printer/Epson-LP-8800C.xml
+usr/share/foomatic/db/source/printer/Epson-LP-8800CPS.xml
usr/share/foomatic/db/source/printer/Epson-LP-8900.xml
usr/share/foomatic/db/source/printer/Epson-LP-9000B.xml
usr/share/foomatic/db/source/printer/Epson-LP-9000C.xml
usr/share/foomatic/db/source/printer/Epson-LP-9100.xml
+usr/share/foomatic/db/source/printer/Epson-LP-9100PS3.xml
usr/share/foomatic/db/source/printer/Epson-LP-9200B.xml
usr/share/foomatic/db/source/printer/Epson-LP-9200C.xml
usr/share/foomatic/db/source/printer/Epson-LP-9300.xml
usr/share/foomatic/db/source/printer/Epson-LP-9400.xml
usr/share/foomatic/db/source/printer/Epson-LP-9500C.xml
+usr/share/foomatic/db/source/printer/Epson-LP-9500CPS.xml
usr/share/foomatic/db/source/printer/Epson-LP-9600.xml
usr/share/foomatic/db/source/printer/Epson-LP-9600S.xml
+usr/share/foomatic/db/source/printer/Epson-LP-9600SPD.xml
usr/share/foomatic/db/source/printer/Epson-LP-9800C.xml
+usr/share/foomatic/db/source/printer/Epson-LP-M5000.xml
+usr/share/foomatic/db/source/printer/Epson-LP-M5300.xml
+usr/share/foomatic/db/source/printer/Epson-LP-M6000.xml
+usr/share/foomatic/db/source/printer/Epson-LP-S210.xml
+usr/share/foomatic/db/source/printer/Epson-LP-S300.xml
+usr/share/foomatic/db/source/printer/Epson-LP-S3000.xml
+usr/share/foomatic/db/source/printer/Epson-LP-S310.xml
+usr/share/foomatic/db/source/printer/Epson-LP-S3200.xml
+usr/share/foomatic/db/source/printer/Epson-LP-S3500.xml
+usr/share/foomatic/db/source/printer/Epson-LP-S4000.xml
+usr/share/foomatic/db/source/printer/Epson-LP-S4200.xml
usr/share/foomatic/db/source/printer/Epson-LP-S4500.xml
usr/share/foomatic/db/source/printer/Epson-LP-S6500.xml
+usr/share/foomatic/db/source/printer/Epson-LP-S7500.xml
+usr/share/foomatic/db/source/printer/Epson-LP-S8100.xml
usr/share/foomatic/db/source/printer/Epson-LP-xx00.xml
usr/share/foomatic/db/source/printer/Epson-LP_8000.xml
usr/share/foomatic/db/source/printer/Epson-LQ-24.xml
@@ -2810,17 +4367,77 @@ usr/share/foomatic/db/source/printer/Epson-LQ-500.xml
usr/share/foomatic/db/source/printer/Epson-LQ-570plus.xml
usr/share/foomatic/db/source/printer/Epson-LQ-850.xml
usr/share/foomatic/db/source/printer/Epson-LX-1050.xml
+usr/share/foomatic/db/source/printer/Epson-LX-300plus.xml
+usr/share/foomatic/db/source/printer/Epson-M100_Series.xml
+usr/share/foomatic/db/source/printer/Epson-M105_Series.xml
+usr/share/foomatic/db/source/printer/Epson-M200_Series.xml
+usr/share/foomatic/db/source/printer/Epson-M205_Series.xml
usr/share/foomatic/db/source/printer/Epson-MC_10000.xml
usr/share/foomatic/db/source/printer/Epson-MC_2000.xml
usr/share/foomatic/db/source/printer/Epson-MC_5000.xml
usr/share/foomatic/db/source/printer/Epson-MC_7000.xml
usr/share/foomatic/db/source/printer/Epson-MC_9000.xml
+usr/share/foomatic/db/source/printer/Epson-ME-100_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME-10_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME-301_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME-303_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME-400_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_10_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_200.xml
+usr/share/foomatic/db/source/printer/Epson-ME_320_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_32_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_330_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_33_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_340_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_520_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_530_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_560W_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_570_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_620F_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_82WD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_85ND_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_900WD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_940FW_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_960FWD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-ME_OFFICE_650FN.xml
+usr/share/foomatic/db/source/printer/Epson-ME_Office_510.xml
+usr/share/foomatic/db/source/printer/Epson-ME_Office_600F.xml
+usr/share/foomatic/db/source/printer/Epson-ME_Office_700FW.xml
usr/share/foomatic/db/source/printer/Epson-MJ_5100C.xml
usr/share/foomatic/db/source/printer/Epson-MJ_520C.xml
usr/share/foomatic/db/source/printer/Epson-MJ_6000C.xml
usr/share/foomatic/db/source/printer/Epson-MJ_8000C.xml
usr/share/foomatic/db/source/printer/Epson-MJ_930C.xml
usr/share/foomatic/db/source/printer/Epson-MachJet.xml
+usr/share/foomatic/db/source/printer/Epson-N10_N11_Series.xml
+usr/share/foomatic/db/source/printer/Epson-NX125_NX127_Series.xml
+usr/share/foomatic/db/source/printer/Epson-NX130_Series.xml
+usr/share/foomatic/db/source/printer/Epson-NX130_TX130_Series.xml
+usr/share/foomatic/db/source/printer/Epson-NX230_Series.xml
+usr/share/foomatic/db/source/printer/Epson-NX230_TX230_Series.xml
+usr/share/foomatic/db/source/printer/Epson-NX330_Series.xml
+usr/share/foomatic/db/source/printer/Epson-NX420_Series.xml
+usr/share/foomatic/db/source/printer/Epson-NX430_Series.xml
+usr/share/foomatic/db/source/printer/Epson-NX430_TX435_Series.xml
+usr/share/foomatic/db/source/printer/Epson-NX530_Series.xml
+usr/share/foomatic/db/source/printer/Epson-NX620_Series.xml
+usr/share/foomatic/db/source/printer/Epson-NX635_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PM-A750.xml
+usr/share/foomatic/db/source/printer/Epson-PM-A820.xml
+usr/share/foomatic/db/source/printer/Epson-PM-A840.xml
+usr/share/foomatic/db/source/printer/Epson-PM-A840S.xml
+usr/share/foomatic/db/source/printer/Epson-PM-A890.xml
+usr/share/foomatic/db/source/printer/Epson-PM-A920.xml
+usr/share/foomatic/db/source/printer/Epson-PM-A940.xml
+usr/share/foomatic/db/source/printer/Epson-PM-A950.xml
+usr/share/foomatic/db/source/printer/Epson-PM-A970.xml
+usr/share/foomatic/db/source/printer/Epson-PM-D600.xml
+usr/share/foomatic/db/source/printer/Epson-PM-D800.xml
+usr/share/foomatic/db/source/printer/Epson-PM-D870.xml
+usr/share/foomatic/db/source/printer/Epson-PM-G4500.xml
+usr/share/foomatic/db/source/printer/Epson-PM-G850.xml
+usr/share/foomatic/db/source/printer/Epson-PM-T960.xml
+usr/share/foomatic/db/source/printer/Epson-PM-T990.xml
usr/share/foomatic/db/source/printer/Epson-PM_10000.xml
usr/share/foomatic/db/source/printer/Epson-PM_2000C.xml
usr/share/foomatic/db/source/printer/Epson-PM_2200C.xml
@@ -2858,18 +4475,95 @@ usr/share/foomatic/db/source/printer/Epson-PM_G700.xml
usr/share/foomatic/db/source/printer/Epson-PM_G720.xml
usr/share/foomatic/db/source/printer/Epson-PM_G800.xml
usr/share/foomatic/db/source/printer/Epson-PM_G820.xml
+usr/share/foomatic/db/source/printer/Epson-PX-045A_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX-046A_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX-105F_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX-205_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX-436A_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX-501A.xml
+usr/share/foomatic/db/source/printer/Epson-PX-505F_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX-535F_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX-5600.xml
+usr/share/foomatic/db/source/printer/Epson-PX-601F.xml
+usr/share/foomatic/db/source/printer/Epson-PX-605F_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX-673F.xml
+usr/share/foomatic/db/source/printer/Epson-PX-675F_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX-A620.xml
+usr/share/foomatic/db/source/printer/Epson-PX-A640.xml
+usr/share/foomatic/db/source/printer/Epson-PX-A650.xml
+usr/share/foomatic/db/source/printer/Epson-PX-A720.xml
+usr/share/foomatic/db/source/printer/Epson-PX-A740.xml
+usr/share/foomatic/db/source/printer/Epson-PX-FA700.xml
+usr/share/foomatic/db/source/printer/Epson-PX-G5300.xml
+usr/share/foomatic/db/source/printer/Epson-PX-K150_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX-K701.xml
+usr/share/foomatic/db/source/printer/Epson-PX-K751F.xml
+usr/share/foomatic/db/source/printer/Epson-PX660_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX720WD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX730_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX820FWD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX830_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX_1200.xml
+usr/share/foomatic/db/source/printer/Epson-PX_1600F.xml
+usr/share/foomatic/db/source/printer/Epson-PX_1700F.xml
+usr/share/foomatic/db/source/printer/Epson-PX_203.xml
+usr/share/foomatic/db/source/printer/Epson-PX_204.xml
+usr/share/foomatic/db/source/printer/Epson-PX_402A.xml
+usr/share/foomatic/db/source/printer/Epson-PX_403A.xml
+usr/share/foomatic/db/source/printer/Epson-PX_404A.xml
+usr/share/foomatic/db/source/printer/Epson-PX_405A_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX_434A.xml
+usr/share/foomatic/db/source/printer/Epson-PX_435A_Series.xml
+usr/share/foomatic/db/source/printer/Epson-PX_502A.xml
+usr/share/foomatic/db/source/printer/Epson-PX_503A.xml
+usr/share/foomatic/db/source/printer/Epson-PX_504A.xml
usr/share/foomatic/db/source/printer/Epson-PX_5500.xml
+usr/share/foomatic/db/source/printer/Epson-PX_5V.xml
+usr/share/foomatic/db/source/printer/Epson-PX_602F.xml
+usr/share/foomatic/db/source/printer/Epson-PX_603F.xml
usr/share/foomatic/db/source/printer/Epson-PX_7000.xml
+usr/share/foomatic/db/source/printer/Epson-PX_7V.xml
usr/share/foomatic/db/source/printer/Epson-PX_9000.xml
usr/share/foomatic/db/source/printer/Epson-PX_A650.xml
+usr/share/foomatic/db/source/printer/Epson-PX_B700.xml
+usr/share/foomatic/db/source/printer/Epson-PX_B750F.xml
usr/share/foomatic/db/source/printer/Epson-PX_G5000.xml
usr/share/foomatic/db/source/printer/Epson-PX_G900.xml
usr/share/foomatic/db/source/printer/Epson-PX_G920.xml
+usr/share/foomatic/db/source/printer/Epson-PX_K100.xml
usr/share/foomatic/db/source/printer/Epson-PX_V500.xml
usr/share/foomatic/db/source/printer/Epson-PX_V600.xml
usr/share/foomatic/db/source/printer/Epson-PictureMate.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_500.xml
usr/share/foomatic/db/source/printer/Epson-PictureMate_Deluxe.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_Express.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_200.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_210.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_215.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_225.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_235.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_240.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_245.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_250.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_260.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_270.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_280.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_290.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_300.xml
+usr/share/foomatic/db/source/printer/Epson-PictureMate_PM_310.xml
+usr/share/foomatic/db/source/printer/Epson-S22_Series.xml
usr/share/foomatic/db/source/printer/Epson-SQ_1170.xml
+usr/share/foomatic/db/source/printer/Epson-SX125_Series.xml
+usr/share/foomatic/db/source/printer/Epson-SX130_Series.xml
+usr/share/foomatic/db/source/printer/Epson-SX218_Series.xml
+usr/share/foomatic/db/source/printer/Epson-SX230_Series.xml
+usr/share/foomatic/db/source/printer/Epson-SX235_Series.xml
+usr/share/foomatic/db/source/printer/Epson-SX420W_Series.xml
+usr/share/foomatic/db/source/printer/Epson-SX430_Series.xml
+usr/share/foomatic/db/source/printer/Epson-SX440_Series.xml
+usr/share/foomatic/db/source/printer/Epson-SX525WD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-SX535WD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-SX620FW_Series.xml
usr/share/foomatic/db/source/printer/Epson-Stylus.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_800.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_C20.xml
@@ -2911,6 +4605,8 @@ usr/share/foomatic/db/source/printer/Epson-Stylus_C85.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_C86.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_C88.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX1500.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_CX2800.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_CX2900.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX3100.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX3200.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX3500.xml
@@ -2920,26 +4616,35 @@ usr/share/foomatic/db/source/printer/Epson-Stylus_CX3700.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX3800.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX3805.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX3810.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_CX3900.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX4100.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX4200.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX4500.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX4600.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX4700.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX4800.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_CX4900.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_CX5000.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX5100.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX5200.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX5300.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX5400.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX5700.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX5800.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_CX5900.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_CX6000.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX6300.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX6400.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX6500.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX6600.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_CX7300.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_CX7400.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX7700.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX7800.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX8300.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_CX8400.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_CX9300F.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_CX9400Fax.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Color.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Color_1160.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Color_1500.xml
@@ -2976,15 +4681,43 @@ usr/share/foomatic/db/source/printer/Epson-Stylus_D68.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_D88.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_DX3800.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_DX3850.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_DX4000.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_DX4200.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_DX4250.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_DX4800.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_DX5000.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_DX7400.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_DX8400.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_DX9400F.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_NX110.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_NX115.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_NX200.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_NX210.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_NX215.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_NX300.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_NX400.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_NX410.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_NX415.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_NX510.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Office_BX300F.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Office_BX310FN.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Office_BX600FW.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Office_BX610FW.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Office_BX925FW.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Office_TX300F.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Office_TX510FN.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Office_TX515FN.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Office_TX600FW.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Office_TX610FW.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Office_TX620FW.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_1200.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_1270.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_1280.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_1290.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_1290S.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_1400.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_1410.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_2000P.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_2100.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_2200.xml
@@ -3010,15 +4743,34 @@ usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_950.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_960.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_EX.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_EX3.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_P50.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_PX650.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_PX700W.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_PX710W.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_PX800FW.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_PX810FW.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R1800.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R1900.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R200.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R2000.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R210.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R220.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R240.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R2400.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R250.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R260.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R265.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R270.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R2880.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R300.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R3000.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R310.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R320.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R340.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R350.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R360.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R380.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R390.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_R800.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX400.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX420.xml
@@ -3026,10 +4778,30 @@ usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX425.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX430.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX500.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX510.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX520.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX530.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX560.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX580.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX585.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX590.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX595.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX600.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX610.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX620.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX630.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX640.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX650.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX680.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX685.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX690.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_RX700.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_T50.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_T60.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_TX650.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_TX700W.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_TX710W.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_TX800FW.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_Photo_TX810FW.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Pro_10000.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Pro_5000.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Pro_5500.xml
@@ -3040,8 +4812,155 @@ usr/share/foomatic/db/source/printer/Epson-Stylus_Pro_9000.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Pro_9500.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Pro_9600.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Pro_XL.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_S21.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_SX110.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_SX115.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_SX200.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_SX210.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_SX400.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_SX410.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_SX510W.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_SX600FW.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_SX610FW.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Scan_2000.xml
usr/share/foomatic/db/source/printer/Epson-Stylus_Scan_2500.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_T21.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_T24.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_T27.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_TX110.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_TX111.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_TX112.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_TX113.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_TX115.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_TX117.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_TX119.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_TX200.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_TX210.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_TX400.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_TX410.xml
+usr/share/foomatic/db/source/printer/Epson-Stylus_TX550W.xml
+usr/share/foomatic/db/source/printer/Epson-T12_T22_N11_Series.xml
+usr/share/foomatic/db/source/printer/Epson-T13_T22E_Series.xml
+usr/share/foomatic/db/source/printer/Epson-T22_Series.xml
+usr/share/foomatic/db/source/printer/Epson-T25_Series.xml
+usr/share/foomatic/db/source/printer/Epson-T42WD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX120_NX120_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX120_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX121_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX125_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX130_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX133_TX135_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX220_NX220_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX220_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX230_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX235_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX320F_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX320_WorkForce320_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX420W_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX420_NX420_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX430_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX525FW_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX560WD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX620FWD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX720WD_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX720_Artisan720_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX730_Series.xml
+usr/share/foomatic/db/source/printer/Epson-TX820_Artisan830_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WF-2010_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WF-2510_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WF-2520_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WF-2530_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WF-2540_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WF-3010_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WF-3520_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WF-3530_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WF-3540_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WF-7010.xml
+usr/share/foomatic/db/source/printer/Epson-WF-7011.xml
+usr/share/foomatic/db/source/printer/Epson-WF-7012.xml
+usr/share/foomatic/db/source/printer/Epson-WF-7015.xml
+usr/share/foomatic/db/source/printer/Epson-WF-7018.xml
+usr/share/foomatic/db/source/printer/Epson-WF-7510.xml
+usr/share/foomatic/db/source/printer/Epson-WF-7511.xml
+usr/share/foomatic/db/source/printer/Epson-WF-7515.xml
+usr/share/foomatic/db/source/printer/Epson-WF-7520.xml
+usr/share/foomatic/db/source/printer/Epson-WF-7521.xml
+usr/share/foomatic/db/source/printer/Epson-WF-7525.xml
+usr/share/foomatic/db/source/printer/Epson-WF-M1030_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WF-M1560_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4010.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4011.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4015.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4020.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4023.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4025.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4090.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4091.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4092.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4095.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4511.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4515.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4520.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4521.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4525.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4530.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4531.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4533.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4535.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4540.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4545.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4590.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4592.xml
+usr/share/foomatic/db/source/printer/Epson-WP-4595.xml
+usr/share/foomatic/db/source/printer/Epson-WP-M4011_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WP-M4015_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WP-M4095_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WP-M4521_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WP-M4525_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WP-M4595_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_310.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_320_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_435_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_500.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_520_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_545_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_600.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_60_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_610.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_620_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_630_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_645_Series.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_840.xml
+usr/share/foomatic/db/source/printer/Epson-WorkForce_845_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-100_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-102_103_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-200_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-201_204_208_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-202_203_206_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-205_207_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-211_214_216_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-212_213_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-215_217_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-300_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-302_303_305_306_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-30_33_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-310_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-312_313_315_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-400_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-402_403_405_406_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-410_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-412_413_415_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-510_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-600_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-610_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-700_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-710_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-750_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-800_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-810_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-850_Series.xml
+usr/share/foomatic/db/source/printer/Epson-XP-950_Series.xml
+usr/share/foomatic/db/source/printer/Fuji_Xerox-DocuPrint_CM205.xml
usr/share/foomatic/db/source/printer/Fujifilm-Printpix-CX-400.xml
usr/share/foomatic/db/source/printer/Fujifilm-Printpix-CX-550.xml
usr/share/foomatic/db/source/printer/Fujitsu-1200.xml
@@ -3056,14 +4975,20 @@ usr/share/foomatic/db/source/printer/Fujitsu-PrintPartner_8000.xml
usr/share/foomatic/db/source/printer/Generic-ESC_P_Dot_Matrix_Printer.xml
usr/share/foomatic/db/source/printer/Generic-GDI_Printer.xml
usr/share/foomatic/db/source/printer/Generic-IBM-Compatible_Dot_Matrix_Printer.xml
+usr/share/foomatic/db/source/printer/Generic-OAKT_Printer.xml
usr/share/foomatic/db/source/printer/Generic-PCL_3_Printer.xml
usr/share/foomatic/db/source/printer/Generic-PCL_4_Printer.xml
usr/share/foomatic/db/source/printer/Generic-PCL_5_Printer.xml
usr/share/foomatic/db/source/printer/Generic-PCL_5c_Printer.xml
usr/share/foomatic/db/source/printer/Generic-PCL_5e_Printer.xml
usr/share/foomatic/db/source/printer/Generic-PCL_6_PCL_XL_Printer.xml
+usr/share/foomatic/db/source/printer/Generic-PostScript_Level_1_Printer.xml
usr/share/foomatic/db/source/printer/Generic-PostScript_Printer.xml
usr/share/foomatic/db/source/printer/Generic-ZjStream_Printer.xml
+usr/share/foomatic/db/source/printer/Genicom-LN45.xml
+usr/share/foomatic/db/source/printer/Genicom-ML450.xml
+usr/share/foomatic/db/source/printer/Genicom-microLaser_12.xml
+usr/share/foomatic/db/source/printer/Genicom-microLaser_210.xml
usr/share/foomatic/db/source/printer/Gestetner-10512.xml
usr/share/foomatic/db/source/printer/Gestetner-2212.xml
usr/share/foomatic/db/source/printer/Gestetner-2712.xml
@@ -3087,7 +5012,12 @@ usr/share/foomatic/db/source/printer/Gestetner-C7528n.xml
usr/share/foomatic/db/source/printer/Gestetner-C7531dn.xml
usr/share/foomatic/db/source/printer/Gestetner-C7535n.xml
usr/share/foomatic/db/source/printer/Gestetner-C7640nD.xml
+usr/share/foomatic/db/source/printer/Gestetner-C8140ND.xml
+usr/share/foomatic/db/source/printer/Gestetner-C8150ND.xml
usr/share/foomatic/db/source/printer/Gestetner-CS555.xml
+usr/share/foomatic/db/source/printer/Gestetner-DSc1030.xml
+usr/share/foomatic/db/source/printer/Gestetner-DSc1045.xml
+usr/share/foomatic/db/source/printer/Gestetner-DSc1060.xml
usr/share/foomatic/db/source/printer/Gestetner-DSc224.xml
usr/share/foomatic/db/source/printer/Gestetner-DSc232.xml
usr/share/foomatic/db/source/printer/Gestetner-DSc328.xml
@@ -3122,10 +5052,19 @@ usr/share/foomatic/db/source/printer/Gestetner-DSm730.xml
usr/share/foomatic/db/source/printer/Gestetner-DSm735_735G.xml
usr/share/foomatic/db/source/printer/Gestetner-DSm745_745G.xml
usr/share/foomatic/db/source/printer/Gestetner-F9199_9199nf.xml
+usr/share/foomatic/db/source/printer/Gestetner-GWD2004.xml
+usr/share/foomatic/db/source/printer/Gestetner-GWD2006.xml
+usr/share/foomatic/db/source/printer/Gestetner-GWD3006.xml
+usr/share/foomatic/db/source/printer/Gestetner-GWD5100.xml
+usr/share/foomatic/db/source/printer/Gestetner-GWD7140.xml
usr/share/foomatic/db/source/printer/Gestetner-MP1100_DSm7110.xml
usr/share/foomatic/db/source/printer/Gestetner-MP1350_DSm7135.xml
usr/share/foomatic/db/source/printer/Gestetner-MP1600_DSm716.xml
usr/share/foomatic/db/source/printer/Gestetner-MP2000_DSm721d.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP2352_DSm923.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP2500_DSm625.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP2852_DSm928.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP3352_DSm933.xml
usr/share/foomatic/db/source/printer/Gestetner-MP3500_DSm735e.xml
usr/share/foomatic/db/source/printer/Gestetner-MP4500_DSm745e.xml
usr/share/foomatic/db/source/printer/Gestetner-MP5500_DSm755.xml
@@ -3138,11 +5077,79 @@ usr/share/foomatic/db/source/printer/Gestetner-MPC3000_DSc530.xml
usr/share/foomatic/db/source/printer/Gestetner-MPC3500_DSc535.xml
usr/share/foomatic/db/source/printer/Gestetner-MPC4500_DSc545.xml
usr/share/foomatic/db/source/printer/Gestetner-MP_161_DSm416.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_171.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_2001.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_2501.xml
usr/share/foomatic/db/source/printer/Gestetner-MP_2510_DSm725e.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_2550.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_2550B.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_2851.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_301.xml
usr/share/foomatic/db/source/printer/Gestetner-MP_3010_DSm730e.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_3350.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_3350B.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_3351.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_4000.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_4000B.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_4001.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_4002.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_5000.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_5000B.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_5001.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_5002.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_6000.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_6001.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_6002.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_7000.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_7001.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_7502.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_8000.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_8001.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_9001.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_9002.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C2050.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C2051.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C2550.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C2551.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C2800.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C300.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C3001.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C3002.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C3003.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C300SR.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C305.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C3300.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C3501.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C3502.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C3503.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C400.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C4000.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C400SR.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C4501.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C4501A.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C4502.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C4502A.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C4503.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C5000.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C5501.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C5501A.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C5502.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C5502A.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C5503.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C6000.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C6003.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C6501.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C6502.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C7500.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C7501.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_C8002.xml
+usr/share/foomatic/db/source/printer/Gestetner-MP_CW2200.xml
usr/share/foomatic/db/source/printer/Gestetner-P7026.xml
usr/share/foomatic/db/source/printer/Gestetner-P7026n.xml
+usr/share/foomatic/db/source/printer/Gestetner-P7031n.xml
+usr/share/foomatic/db/source/printer/Gestetner-P7031nL.xml
usr/share/foomatic/db/source/printer/Gestetner-P7032.xml
+usr/share/foomatic/db/source/printer/Gestetner-P7035n.xml
usr/share/foomatic/db/source/printer/Gestetner-P7126.xml
usr/share/foomatic/db/source/printer/Gestetner-P7126n.xml
usr/share/foomatic/db/source/printer/Gestetner-P7132n.xml
@@ -3156,6 +5163,20 @@ usr/share/foomatic/db/source/printer/Gestetner-P7527n.xml
usr/share/foomatic/db/source/printer/Gestetner-P7535n.xml
usr/share/foomatic/db/source/printer/Gestetner-P7575.xml
usr/share/foomatic/db/source/printer/Gestetner-P7675.xml
+usr/share/foomatic/db/source/printer/Gestetner-Pro_1106EX.xml
+usr/share/foomatic/db/source/printer/Gestetner-Pro_1107EX.xml
+usr/share/foomatic/db/source/printer/Gestetner-Pro_1356EX.xml
+usr/share/foomatic/db/source/printer/Gestetner-Pro_1357EX.xml
+usr/share/foomatic/db/source/printer/Gestetner-Pro_906EX.xml
+usr/share/foomatic/db/source/printer/Gestetner-Pro_907EX.xml
+usr/share/foomatic/db/source/printer/Gestetner-SP_4210N.xml
+usr/share/foomatic/db/source/printer/Gestetner-SP_6330N.xml
+usr/share/foomatic/db/source/printer/Gestetner-SP_8200DN.xml
+usr/share/foomatic/db/source/printer/Gestetner-SP_C320DN.xml
+usr/share/foomatic/db/source/printer/Gestetner-SP_C420DN.xml
+usr/share/foomatic/db/source/printer/Gestetner-SP_C430DN.xml
+usr/share/foomatic/db/source/printer/Gestetner-SP_C431DN.xml
+usr/share/foomatic/db/source/printer/Gestetner-SP_W2470.xml
usr/share/foomatic/db/source/printer/HP-2000C.xml
usr/share/foomatic/db/source/printer/HP-2500C.xml
usr/share/foomatic/db/source/printer/HP-2500CM.xml
@@ -3174,14 +5195,21 @@ usr/share/foomatic/db/source/printer/HP-Business_Inkjet_2300.xml
usr/share/foomatic/db/source/printer/HP-Business_Inkjet_2600.xml
usr/share/foomatic/db/source/printer/HP-Business_Inkjet_2800.xml
usr/share/foomatic/db/source/printer/HP-Business_Inkjet_3000.xml
+usr/share/foomatic/db/source/printer/HP-CM8050_Color_MFP.xml
+usr/share/foomatic/db/source/printer/HP-CM8050_MFP_with_Edgeline.xml
+usr/share/foomatic/db/source/printer/HP-CM8060_Color_MFP.xml
+usr/share/foomatic/db/source/printer/HP-CM8060_MFP_with_Edgeline.xml
+usr/share/foomatic/db/source/printer/HP-CP3525n.xml
usr/share/foomatic/db/source/printer/HP-Color_Inkjet_Printer_CP1160.xml
usr/share/foomatic/db/source/printer/HP-Color_Inkjet_Printer_CP1700.xml
+usr/share/foomatic/db/source/printer/HP-Color_LaserJet.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_1500.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_1600.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_2500.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_2550.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_2600n.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_2605.xml
+usr/share/foomatic/db/source/printer/HP-Color_LaserJet_2605dn.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_2700.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_2800.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_3000.xml
@@ -3203,19 +5231,26 @@ usr/share/foomatic/db/source/printer/HP-Color_LaserJet_5500.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_5550.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_5M.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_8500.xml
-usr/share/foomatic/db/source/printer/HP-Color_LaserJet_8550GN.xml
+usr/share/foomatic/db/source/printer/HP-Color_LaserJet_8550.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_9500.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_9500_MFP.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_CM1015.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_CM1017.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml
+usr/share/foomatic/db/source/printer/HP-Color_LaserJet_CP1215.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_CP3505.xml
usr/share/foomatic/db/source/printer/HP-Color_LaserJet_CP4005.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_100.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_100plus.xml
+usr/share/foomatic/db/source/printer/HP-DesignJet_1050C.xml
+usr/share/foomatic/db/source/printer/HP-DesignJet_1055CM.xml
+usr/share/foomatic/db/source/printer/HP-DesignJet_110.xml
+usr/share/foomatic/db/source/printer/HP-DesignJet_120.xml
+usr/share/foomatic/db/source/printer/HP-DesignJet_130.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_230.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_2500CP.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_250C.xml
+usr/share/foomatic/db/source/printer/HP-DesignJet_30.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_3500CP.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_350C.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_430.xml
@@ -3224,14 +5259,18 @@ usr/share/foomatic/db/source/printer/HP-DesignJet_455CA.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_488CA.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_500.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_5000.xml
+usr/share/foomatic/db/source/printer/HP-DesignJet_5000PS.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_500ps.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_5500.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_5500ps.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_650C.xml
+usr/share/foomatic/db/source/printer/HP-DesignJet_70.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_700.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_750.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_750C_Plus.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_800.xml
+usr/share/foomatic/db/source/printer/HP-DesignJet_800PS.xml
+usr/share/foomatic/db/source/printer/HP-DesignJet_90.xml
usr/share/foomatic/db/source/printer/HP-DesignJet_ColorPro_CAD.xml
usr/share/foomatic/db/source/printer/HP-DeskJet.xml
usr/share/foomatic/db/source/printer/HP-DeskJet_1000C.xml
@@ -3281,6 +5320,7 @@ usr/share/foomatic/db/source/printer/HP-DeskJet_5150.xml
usr/share/foomatic/db/source/printer/HP-DeskJet_5158.xml
usr/share/foomatic/db/source/printer/HP-DeskJet_5160.xml
usr/share/foomatic/db/source/printer/HP-DeskJet_520.xml
+usr/share/foomatic/db/source/printer/HP-DeskJet_540.xml
usr/share/foomatic/db/source/printer/HP-DeskJet_540C.xml
usr/share/foomatic/db/source/printer/HP-DeskJet_5440.xml
usr/share/foomatic/db/source/printer/HP-DeskJet_550C.xml
@@ -3390,6 +5430,8 @@ usr/share/foomatic/db/source/printer/HP-LaserJet_1015.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_1018.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_1020.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_1022.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_1022n.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_1022nw.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_1100.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_1100A.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_1150.xml
@@ -3403,6 +5445,7 @@ usr/share/foomatic/db/source/printer/HP-LaserJet_2100.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_2100M.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_2200.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_2300.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_2300L.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_2410.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_2420.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_2430.xml
@@ -3437,6 +5480,7 @@ usr/share/foomatic/db/source/printer/HP-LaserJet_4.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_4000.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_4050.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_4100.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_4100_MFP.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_4200.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_4240.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_4250.xml
@@ -3446,6 +5490,7 @@ usr/share/foomatic/db/source/printer/HP-LaserJet_4350.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_4L.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_4M.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_4ML.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_4MP.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_4P.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_4Si.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_4V.xml
@@ -3461,6 +5506,7 @@ usr/share/foomatic/db/source/printer/HP-LaserJet_5M.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_5MP.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_5P.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_5Si.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_5Si_Mopier.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_6.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_6L.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_6MP.xml
@@ -3477,16 +5523,41 @@ usr/share/foomatic/db/source/printer/HP-LaserJet_9050_MFP.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_9055_MFP.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_9065_MFP.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_M1005_MFP.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_M1120_MFP.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_M1319_MFP.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_M1522n_MFP.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_M1522nf_MFP.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_M2727.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_M3027_MFP.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_M3035_MFP.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_M4345_MFP.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_M5025_MFP.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_M5035_MFP.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P1005.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P1006.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P1007.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P1008.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P1505.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P1505n.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_P2010.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P2014.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P2014n.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_P2015.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P2035.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P2035n.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P2055d.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P2055dn.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_P3004.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_P3005.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P4014.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_P4015.xml
usr/share/foomatic/db/source/printer/HP-LaserJet_Plus.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_Pro_CP1025nw.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_Pro_P1102.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_Pro_P1102w.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_Pro_P1566.xml
+usr/share/foomatic/db/source/printer/HP-LaserJet_Pro_P1606dn.xml
+usr/share/foomatic/db/source/printer/HP-Laserjet_P1020.xml
usr/share/foomatic/db/source/printer/HP-Mopier_240.xml
usr/share/foomatic/db/source/printer/HP-Mopier_320.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet.xml
@@ -3539,9 +5610,12 @@ usr/share/foomatic/db/source/printer/HP-OfficeJet_D155.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_G55.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_G85.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_G95.xml
+usr/share/foomatic/db/source/printer/HP-OfficeJet_J3600.xml
+usr/share/foomatic/db/source/printer/HP-OfficeJet_J5500.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_J5700.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_K60.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_K60xi.xml
+usr/share/foomatic/db/source/printer/HP-OfficeJet_K7100.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_K80.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_K80xi.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_LX.xml
@@ -3552,6 +5626,7 @@ usr/share/foomatic/db/source/printer/HP-OfficeJet_Pro_K5300.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_Pro_K5400.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_Pro_K550.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_Pro_K850.xml
+usr/share/foomatic/db/source/printer/HP-OfficeJet_Pro_K8600.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7300.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7500.xml
usr/share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7600.xml
@@ -3639,15 +5714,22 @@ usr/share/foomatic/db/source/printer/HP-PhotoSmart_A820.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_C3100.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_C4100.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_C4200.xml
+usr/share/foomatic/db/source/printer/HP-PhotoSmart_C4380.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_C5100.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_C5200.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_C6100.xml
+usr/share/foomatic/db/source/printer/HP-PhotoSmart_C6200.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_C7100.xml
+usr/share/foomatic/db/source/printer/HP-PhotoSmart_C7200.xml
+usr/share/foomatic/db/source/printer/HP-PhotoSmart_C8100.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_D5060.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_D5100.xml
+usr/share/foomatic/db/source/printer/HP-PhotoSmart_D5300.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_D6100.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_D7100.xml
+usr/share/foomatic/db/source/printer/HP-PhotoSmart_D7200.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_D7300.xml
+usr/share/foomatic/db/source/printer/HP-PhotoSmart_D7400.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_P100.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_P1000.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_P1100.xml
@@ -3658,6 +5740,9 @@ usr/share/foomatic/db/source/printer/HP-PhotoSmart_P130.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_P1315.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_P230.xml
usr/share/foomatic/db/source/printer/HP-PhotoSmart_Pro_B8300.xml
+usr/share/foomatic/db/source/printer/HP-Photosmart_C309g.xml
+usr/share/foomatic/db/source/printer/HP-Photosmart_C6380.xml
+usr/share/foomatic/db/source/printer/HP-Photosmart_D5460.xml
usr/share/foomatic/db/source/printer/HP-ThinkJet.xml
usr/share/foomatic/db/source/printer/HP-e-printer_e20.xml
usr/share/foomatic/db/source/printer/Heidelberg-Digimaster_9110.xml
@@ -3670,9 +5755,23 @@ usr/share/foomatic/db/source/printer/IBM-4303_Network_Color_Printer.xml
usr/share/foomatic/db/source/printer/IBM-4312.xml
usr/share/foomatic/db/source/printer/IBM-Execjet_4072.xml
usr/share/foomatic/db/source/printer/IBM-Infoprint_12.xml
+usr/share/foomatic/db/source/printer/IBM-Infoprint_1226tn.xml
+usr/share/foomatic/db/source/printer/IBM-Infoprint_1422.xml
+usr/share/foomatic/db/source/printer/IBM-Infoprint_1532_Express.xml
+usr/share/foomatic/db/source/printer/IBM-Infoprint_1540_MFP.xml
+usr/share/foomatic/db/source/printer/IBM-Infoprint_1560_MFP.xml
+usr/share/foomatic/db/source/printer/IBM-Infoprint_1570_MFP.xml
+usr/share/foomatic/db/source/printer/IBM-Infoprint_1572_MFP.xml
+usr/share/foomatic/db/source/printer/IBM-Infoprint_1580_MFP.xml
+usr/share/foomatic/db/source/printer/IBM-Infoprint_1585n.xml
+usr/share/foomatic/db/source/printer/IBM-Infoprint_1650_MFP.xml
usr/share/foomatic/db/source/printer/IBM-Page_Printer_3112.xml
usr/share/foomatic/db/source/printer/IBM-ProPrinterII.xml
usr/share/foomatic/db/source/printer/Imagen-ImPress.xml
+usr/share/foomatic/db/source/printer/Imagistics-im8530.xml
+usr/share/foomatic/db/source/printer/InfoPrint-Pro_1107EX.xml
+usr/share/foomatic/db/source/printer/InfoPrint-Pro_1357EX.xml
+usr/share/foomatic/db/source/printer/InfoPrint-Pro_907EX.xml
usr/share/foomatic/db/source/printer/Infotec-4353_MF.xml
usr/share/foomatic/db/source/printer/Infotec-4452_MF.xml
usr/share/foomatic/db/source/printer/Infotec-4651_MF.xml
@@ -3735,6 +5834,7 @@ usr/share/foomatic/db/source/printer/Infotec-IS_2265.xml
usr/share/foomatic/db/source/printer/Infotec-IS_2275.xml
usr/share/foomatic/db/source/printer/Infotec-IS_2316.xml
usr/share/foomatic/db/source/printer/Infotec-IS_2320.xml
+usr/share/foomatic/db/source/printer/Infotec-IS_2325.xml
usr/share/foomatic/db/source/printer/Infotec-IS_2416.xml
usr/share/foomatic/db/source/printer/Infotec-IS_2425.xml
usr/share/foomatic/db/source/printer/Infotec-IS_2430.xml
@@ -3743,6 +5843,85 @@ usr/share/foomatic/db/source/printer/Infotec-IS_2445.xml
usr/share/foomatic/db/source/printer/Infotec-IS_3090.xml
usr/share/foomatic/db/source/printer/Infotec-IS_3110.xml
usr/share/foomatic/db/source/printer/Infotec-IS_3135.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_171.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_2001.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_201.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_2352.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_2501.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_2550.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_2550B.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_2851.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_2852.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_301.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_3350.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_3350B.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_3351.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_3352.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_4000.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_4000B.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_4001.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_4002.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_5000.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_5000B.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_5001.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_5002.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_6000.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_6001.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_6002.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_7000.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_7001.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_7502.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_8000.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_8001.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_9001.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_9002.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C2050.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C2051.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C2550.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C2551.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C2800.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C300.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C3001.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C3002.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C3003.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C300SR.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C305.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C3300.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C3501.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C3502.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C3503.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C400.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C4000.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C400SR.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C4501.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C4501A.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C4502.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C4502A.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C4503.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C5000.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C5501.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C5501A.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C5502.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C5502A.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C5503.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C6000.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C6003.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C6501.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C6502.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C7500.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C7501.xml
+usr/share/foomatic/db/source/printer/Infotec-MP_C8002.xml
+usr/share/foomatic/db/source/printer/Infotec-Pro_1106EX.xml
+usr/share/foomatic/db/source/printer/Infotec-Pro_1107EX.xml
+usr/share/foomatic/db/source/printer/Infotec-Pro_1356EX.xml
+usr/share/foomatic/db/source/printer/Infotec-Pro_1357EX.xml
+usr/share/foomatic/db/source/printer/Infotec-Pro_906EX.xml
+usr/share/foomatic/db/source/printer/Infotec-Pro_907EX.xml
+usr/share/foomatic/db/source/printer/Infotec-Pro_C5100S.xml
+usr/share/foomatic/db/source/printer/Infotec-Pro_C5110S.xml
+usr/share/foomatic/db/source/printer/KONICA_MINOLTA-PagePro_1300W.xml
+usr/share/foomatic/db/source/printer/KONICA_MINOLTA-PagePro_1350W.xml
+usr/share/foomatic/db/source/printer/KONICA_MINOLTA-PagePro_1400W.xml
usr/share/foomatic/db/source/printer/KONICA_MINOLTA-bizhub_1050.xml
usr/share/foomatic/db/source/printer/KONICA_MINOLTA-bizhub_1050P.xml
usr/share/foomatic/db/source/printer/KONICA_MINOLTA-bizhub_1050e.xml
@@ -3764,15 +5943,47 @@ usr/share/foomatic/db/source/printer/KONICA_MINOLTA-bizhub_C450.xml
usr/share/foomatic/db/source/printer/KONICA_MINOLTA-bizhub_C450P.xml
usr/share/foomatic/db/source/printer/KONICA_MINOLTA-bizhub_C451.xml
usr/share/foomatic/db/source/printer/KONICA_MINOLTA-bizhub_C550.xml
+usr/share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1600W.xml
+usr/share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1680MF.xml
+usr/share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1690MF.xml
+usr/share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2300W.xml
usr/share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2300_DL.xml
+usr/share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2400W.xml
usr/share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2430_DL.xml
usr/share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2480_MF.xml
usr/share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2490_MF.xml
usr/share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2530_DL.xml
+usr/share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_4690MF.xml
usr/share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_5430_DL.xml
usr/share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_5440_DL.xml
usr/share/foomatic/db/source/printer/Kodak-DigiSource_9110.xml
+usr/share/foomatic/db/source/printer/Kodak-ESP_3.xml
+usr/share/foomatic/db/source/printer/Kodak-ESP_3250.xml
+usr/share/foomatic/db/source/printer/Kodak-ESP_5250.xml
+usr/share/foomatic/db/source/printer/Kodak-ESP_5500.xml
+usr/share/foomatic/db/source/printer/Kodak-ESP_6150.xml
+usr/share/foomatic/db/source/printer/Kodak-ESP_7.xml
+usr/share/foomatic/db/source/printer/Kodak-ESP_7250.xml
+usr/share/foomatic/db/source/printer/Kodak-ESP_9.xml
+usr/share/foomatic/db/source/printer/Kodak-EasyShare_5100.xml
+usr/share/foomatic/db/source/printer/Kodak-EasyShare_5300.xml
+usr/share/foomatic/db/source/printer/Kodak-EasyShare_5500.xml
usr/share/foomatic/db/source/printer/Kodak-IS_70_CPII.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS-1650.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS-1815.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS-2050.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS-2550.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS-C2525E_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS-C3225E_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS-C3232E_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS-C4035E_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS_250ci_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS_300ci_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS_3050ci.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS_3550ci.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS_400ci_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-CS_500ci_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-Ci-1100.xml
usr/share/foomatic/db/source/printer/Kyocera-F-1000.xml
usr/share/foomatic/db/source/printer/Kyocera-F-1010.xml
usr/share/foomatic/db/source/printer/Kyocera-F-1200.xml
@@ -3793,7 +6004,11 @@ usr/share/foomatic/db/source/printer/Kyocera-FS-1000.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1000plus.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1010.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1016MFP.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-1018MFP.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-1020D.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-1030D.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1050.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-1118MFP.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1200.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1500.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1550.xml
@@ -3802,10 +6017,15 @@ usr/share/foomatic/db/source/printer/Kyocera-FS-1600.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1600plus.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1700.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1700plus.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-1714M.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1750.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1800.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1800plus.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-1900.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-1920.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-2000D.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-2100D.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-2100DN.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-3400.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-3400plus.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-3500.xml
@@ -3813,38 +6033,106 @@ usr/share/foomatic/db/source/printer/Kyocera-FS-3600.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-3600plus.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-3700.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-3700plus.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-3718M.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-3750.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-3800.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-3820N.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-3830N.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-3900DN.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-400.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-4000DN.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-4100DN.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-4200DN.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-4300DN.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-5500.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-5800C.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-5900C.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-600.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-600_KPDL-2.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-6020.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-6026.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-6300.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-6500.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-6500plus.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-6700.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-6750.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-680.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-6900.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-6950DN.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-7000.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-7000plus.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-7028M.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-800.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-8000C.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-850.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-9000.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-9100DN.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-9120DN.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-9130DN.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-920.xml
usr/share/foomatic/db/source/printer/Kyocera-FS-9500DN.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-9520DN.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-9530DN.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C5015N.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C5016N.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C5020N.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C5025N.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C5030N.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C5100DN_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C5200DN_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C5300DN_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C5350DN_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C5400DN_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C8008N.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C8026N.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C8100DN.xml
+usr/share/foomatic/db/source/printer/Kyocera-FS-C8100DNplus_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-1510.xml
usr/share/foomatic/db/source/printer/Kyocera-KM-1530.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-1635.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-1650.xml
usr/share/foomatic/db/source/printer/Kyocera-KM-1810.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-1815.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-1820.xml
usr/share/foomatic/db/source/printer/Kyocera-KM-2030.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-2035.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-2050.xml
usr/share/foomatic/db/source/printer/Kyocera-KM-2530.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-2550.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-3035.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-3050.xml
usr/share/foomatic/db/source/printer/Kyocera-KM-3530.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-4030.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-4035.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-4050.xml
usr/share/foomatic/db/source/printer/Kyocera-KM-4230.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-4230_5230.xml
usr/share/foomatic/db/source/printer/Kyocera-KM-4530.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-5035.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-5050.xml
usr/share/foomatic/db/source/printer/Kyocera-KM-5230.xml
usr/share/foomatic/db/source/printer/Kyocera-KM-5530.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-6030.xml
usr/share/foomatic/db/source/printer/Kyocera-KM-6230.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-6330.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-7530.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-8030.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-C2520.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-C2525E_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-C2630.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-C3225.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-C3225E_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-C3232.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-C3232E_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-C4035E_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-C830.xml
+usr/share/foomatic/db/source/printer/Kyocera-KM-C850.xml
usr/share/foomatic/db/source/printer/Kyocera-P-2000.xml
usr/share/foomatic/db/source/printer/Kyocera-P-2002.xml
+usr/share/foomatic/db/source/printer/Kyocera-TASKalfa_250ci_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-TASKalfa_300ci_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-TASKalfa_400ci_KPDL.xml
+usr/share/foomatic/db/source/printer/Kyocera-TASKalfa_500ci_KPDL.xml
usr/share/foomatic/db/source/printer/Lanier-2132.xml
usr/share/foomatic/db/source/printer/Lanier-2138.xml
usr/share/foomatic/db/source/printer/Lanier-2145.xml
@@ -3890,6 +6178,12 @@ usr/share/foomatic/db/source/printer/Lanier-LD245.xml
usr/share/foomatic/db/source/printer/Lanier-LD328c.xml
usr/share/foomatic/db/source/printer/Lanier-LD335c.xml
usr/share/foomatic/db/source/printer/Lanier-LD345c.xml
+usr/share/foomatic/db/source/printer/Lanier-LD_130C.xml
+usr/share/foomatic/db/source/printer/Lanier-LD_130CSR.xml
+usr/share/foomatic/db/source/printer/Lanier-LD_140C.xml
+usr/share/foomatic/db/source/printer/Lanier-LD_140CSR.xml
+usr/share/foomatic/db/source/printer/Lanier-LD_620C.xml
+usr/share/foomatic/db/source/printer/Lanier-LD_625C.xml
usr/share/foomatic/db/source/printer/Lanier-LF510_515e.xml
usr/share/foomatic/db/source/printer/Lanier-LP025N_LP026N.xml
usr/share/foomatic/db/source/printer/Lanier-LP025_LP026.xml
@@ -3897,41 +6191,155 @@ usr/share/foomatic/db/source/printer/Lanier-LP031c.xml
usr/share/foomatic/db/source/printer/Lanier-LP032.xml
usr/share/foomatic/db/source/printer/Lanier-LP116c.xml
usr/share/foomatic/db/source/printer/Lanier-LP122c_LP121c.xml
+usr/share/foomatic/db/source/printer/Lanier-LP124w.xml
usr/share/foomatic/db/source/printer/Lanier-LP125cx_LP126cn.xml
usr/share/foomatic/db/source/printer/Lanier-LP127n_LP128n.xml
usr/share/foomatic/db/source/printer/Lanier-LP128.xml
+usr/share/foomatic/db/source/printer/Lanier-LP131n.xml
+usr/share/foomatic/db/source/printer/Lanier-LP131nL.xml
usr/share/foomatic/db/source/printer/Lanier-LP135n.xml
+usr/share/foomatic/db/source/printer/Lanier-LP136n.xml
+usr/share/foomatic/db/source/printer/Lanier-LP137CN.xml
usr/share/foomatic/db/source/printer/Lanier-LP138c.xml
+usr/share/foomatic/db/source/printer/Lanier-LP142CN.xml
usr/share/foomatic/db/source/printer/Lanier-LP145n_SP_8100DN.xml
+usr/share/foomatic/db/source/printer/Lanier-LP150dn_SP8200DN.xml
usr/share/foomatic/db/source/printer/Lanier-LP175_LP175hdn.xml
usr/share/foomatic/db/source/printer/Lanier-LP222cn_LP221c.xml
usr/share/foomatic/db/source/printer/Lanier-LP226c_SP_C410.xml
usr/share/foomatic/db/source/printer/Lanier-LP231c_SP_C411.xml
+usr/share/foomatic/db/source/printer/Lanier-LP235N.xml
usr/share/foomatic/db/source/printer/Lanier-LP235c.xml
+usr/share/foomatic/db/source/printer/Lanier-LP331cn_SP_C420.xml
usr/share/foomatic/db/source/printer/Lanier-LP332c.xml
usr/share/foomatic/db/source/printer/Lanier-LP335c.xml
+usr/share/foomatic/db/source/printer/Lanier-LP37N.xml
usr/share/foomatic/db/source/printer/Lanier-LP440c_SP_C811DN.xml
+usr/share/foomatic/db/source/printer/Lanier-LP540C_SPC820DN.xml
+usr/share/foomatic/db/source/printer/Lanier-LP550C_SPC821DN.xml
usr/share/foomatic/db/source/printer/Lanier-LP_020c.xml
usr/share/foomatic/db/source/printer/Lanier-LP_036c.xml
+usr/share/foomatic/db/source/printer/Lanier-LW324.xml
+usr/share/foomatic/db/source/printer/Lanier-LW326.xml
+usr/share/foomatic/db/source/printer/Lanier-LW426.xml
+usr/share/foomatic/db/source/printer/Lanier-LW5100.xml
+usr/share/foomatic/db/source/printer/Lanier-LW7140.xml
+usr/share/foomatic/db/source/printer/Lanier-MP2500_LD125.xml
usr/share/foomatic/db/source/printer/Lanier-MPC1500_LD215c.xml
+usr/share/foomatic/db/source/printer/Lanier-MPC4501A_LD645CA.xml
+usr/share/foomatic/db/source/printer/Lanier-MPC5501A_LD655CA.xml
usr/share/foomatic/db/source/printer/Lanier-MP_1100_LD1100.xml
usr/share/foomatic/db/source/printer/Lanier-MP_1350_LD1135.xml
usr/share/foomatic/db/source/printer/Lanier-MP_1600_LD316.xml
usr/share/foomatic/db/source/printer/Lanier-MP_161_LD016.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_171_LD_117.xml
usr/share/foomatic/db/source/printer/Lanier-MP_2000_LD320d.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_2001.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_201_LD_220.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_2352.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_2501.xml
usr/share/foomatic/db/source/printer/Lanier-MP_2510_LD325.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_2550B_LD425B.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_2550_LD425.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_2851_LD528.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_2852.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_301.xml
usr/share/foomatic/db/source/printer/Lanier-MP_3010_LD330.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_3350B_LD433B.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_3350_LD433.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_3351_LD533.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_3352.xml
usr/share/foomatic/db/source/printer/Lanier-MP_3500_LD335.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_4000B_LD040B.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_4000_LD040.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_4001_LD140.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_4002.xml
usr/share/foomatic/db/source/printer/Lanier-MP_4500_LD345.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_5000B_LD050B.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_5000_LD050.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_5001_LD150.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_5002.xml
usr/share/foomatic/db/source/printer/Lanier-MP_5500_LD255.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_6000_LD260.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_6001_LD360.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_6002.xml
usr/share/foomatic/db/source/printer/Lanier-MP_6500_LD265.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_7000_LD270.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_7001_LD370.xml
usr/share/foomatic/db/source/printer/Lanier-MP_7500_LD275.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_7502.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_8000_LD280.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_8001_LD380.xml
usr/share/foomatic/db/source/printer/Lanier-MP_9000_LD190.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_9001_LD390.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_9002.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C2050_LD520C.xml
usr/share/foomatic/db/source/printer/Lanier-MP_C2500_LD425c.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C2550_LD525C.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C2800_LD528C.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C300.xml
usr/share/foomatic/db/source/printer/Lanier-MP_C3000_LD430c.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C3001_LD630C.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C3002.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C3003.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C300SR.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C305.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C3300_LD533C.xml
usr/share/foomatic/db/source/printer/Lanier-MP_C3500_LD435c.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C3501_LD635C.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C3502.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C3503.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C400.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C4000_LD540C.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C400SR.xml
usr/share/foomatic/db/source/printer/Lanier-MP_C4500_LD445c.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C4501_LD645C.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C4502.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C4502A.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C4503.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C5000_LD550C.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C5501_LD655C.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C5502.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C5502A.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C5503.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C6000_LD260c.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C6003.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C6501_LD365C.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C6502.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C7500_LD275c.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C7501_LD375C.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_C8002.xml
+usr/share/foomatic/db/source/printer/Lanier-MP_CW2200.xml
+usr/share/foomatic/db/source/printer/Lanier-Pro_1106EX.xml
+usr/share/foomatic/db/source/printer/Lanier-Pro_1107EX.xml
+usr/share/foomatic/db/source/printer/Lanier-Pro_1356EX.xml
+usr/share/foomatic/db/source/printer/Lanier-Pro_1357EX.xml
+usr/share/foomatic/db/source/printer/Lanier-Pro_906EX.xml
+usr/share/foomatic/db/source/printer/Lanier-Pro_907EX.xml
+usr/share/foomatic/db/source/printer/Lanier-Pro_C5100S.xml
+usr/share/foomatic/db/source/printer/Lanier-Pro_C5110S.xml
+usr/share/foomatic/db/source/printer/Lanier-SG3100SNw.xml
+usr/share/foomatic/db/source/printer/Lanier-SG3110SFNw.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_4100N.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_4100NL.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_4110N.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_4210N.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_4310N.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_5200DN.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_5200S.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_5210DN.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_5210SF.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_5210SR.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_6330N.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_8300DN.xml
usr/share/foomatic/db/source/printer/Lanier-SP_9100_LP275.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_C320DN.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_C400DN.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_C430DN.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_C431DN.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_C730DN.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_C830DN.xml
+usr/share/foomatic/db/source/printer/Lanier-SP_C831DN.xml
usr/share/foomatic/db/source/printer/LaserMaster-LM_1000.xml
usr/share/foomatic/db/source/printer/Lexmark-1000.xml
usr/share/foomatic/db/source/printer/Lexmark-1020.xml
@@ -3946,9 +6354,78 @@ usr/share/foomatic/db/source/printer/Lexmark-4039_10plus.xml
usr/share/foomatic/db/source/printer/Lexmark-4076.xml
usr/share/foomatic/db/source/printer/Lexmark-5000.xml
usr/share/foomatic/db/source/printer/Lexmark-5700.xml
+usr/share/foomatic/db/source/printer/Lexmark-6500e.xml
usr/share/foomatic/db/source/printer/Lexmark-7000.xml
usr/share/foomatic/db/source/printer/Lexmark-7200.xml
+usr/share/foomatic/db/source/printer/Lexmark-C500.xml
+usr/share/foomatic/db/source/printer/Lexmark-C500n.xml
+usr/share/foomatic/db/source/printer/Lexmark-C510.xml
+usr/share/foomatic/db/source/printer/Lexmark-C510b.xml
+usr/share/foomatic/db/source/printer/Lexmark-C520.xml
+usr/share/foomatic/db/source/printer/Lexmark-C522.xml
+usr/share/foomatic/db/source/printer/Lexmark-C524.xml
+usr/share/foomatic/db/source/printer/Lexmark-C530dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-C532dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-C532n.xml
+usr/share/foomatic/db/source/printer/Lexmark-C534dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-C534dtn.xml
+usr/share/foomatic/db/source/printer/Lexmark-C534n.xml
+usr/share/foomatic/db/source/printer/Lexmark-C540.xml
+usr/share/foomatic/db/source/printer/Lexmark-C543.xml
+usr/share/foomatic/db/source/printer/Lexmark-C544.xml
+usr/share/foomatic/db/source/printer/Lexmark-C546.xml
+usr/share/foomatic/db/source/printer/Lexmark-C720n.xml
+usr/share/foomatic/db/source/printer/Lexmark-C734.xml
+usr/share/foomatic/db/source/printer/Lexmark-C736.xml
+usr/share/foomatic/db/source/printer/Lexmark-C750.xml
+usr/share/foomatic/db/source/printer/Lexmark-C752.xml
+usr/share/foomatic/db/source/printer/Lexmark-C752b.xml
+usr/share/foomatic/db/source/printer/Lexmark-C762.xml
+usr/share/foomatic/db/source/printer/Lexmark-C770dtn.xml
+usr/share/foomatic/db/source/printer/Lexmark-C770n.xml
+usr/share/foomatic/db/source/printer/Lexmark-C772dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-C772n.xml
+usr/share/foomatic/db/source/printer/Lexmark-C780.xml
+usr/share/foomatic/db/source/printer/Lexmark-C780dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-C780dtn.xml
+usr/share/foomatic/db/source/printer/Lexmark-C780n.xml
+usr/share/foomatic/db/source/printer/Lexmark-C782.xml
+usr/share/foomatic/db/source/printer/Lexmark-C782dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-C782dtn.xml
+usr/share/foomatic/db/source/printer/Lexmark-C782n.xml
+usr/share/foomatic/db/source/printer/Lexmark-C790.xml
+usr/share/foomatic/db/source/printer/Lexmark-C792.xml
+usr/share/foomatic/db/source/printer/Lexmark-C910.xml
+usr/share/foomatic/db/source/printer/Lexmark-C912.xml
+usr/share/foomatic/db/source/printer/Lexmark-C920.xml
+usr/share/foomatic/db/source/printer/Lexmark-C920n.xml
+usr/share/foomatic/db/source/printer/Lexmark-C925.xml
+usr/share/foomatic/db/source/printer/Lexmark-C930.xml
+usr/share/foomatic/db/source/printer/Lexmark-C935.xml
+usr/share/foomatic/db/source/printer/Lexmark-C935dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-C935dtn.xml
+usr/share/foomatic/db/source/printer/Lexmark-C935hdn.xml
+usr/share/foomatic/db/source/printer/Lexmark-C950.xml
+usr/share/foomatic/db/source/printer/Lexmark-E120.xml
+usr/share/foomatic/db/source/printer/Lexmark-E120n.xml
usr/share/foomatic/db/source/printer/Lexmark-E210.xml
+usr/share/foomatic/db/source/printer/Lexmark-E230.xml
+usr/share/foomatic/db/source/printer/Lexmark-E238.xml
+usr/share/foomatic/db/source/printer/Lexmark-E250d.xml
+usr/share/foomatic/db/source/printer/Lexmark-E250dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-E260.xml
+usr/share/foomatic/db/source/printer/Lexmark-E260d.xml
+usr/share/foomatic/db/source/printer/Lexmark-E260dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-E320.xml
+usr/share/foomatic/db/source/printer/Lexmark-E350d.xml
+usr/share/foomatic/db/source/printer/Lexmark-E352dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-E360d.xml
+usr/share/foomatic/db/source/printer/Lexmark-E360dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-E450dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-E460dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-E460dw.xml
+usr/share/foomatic/db/source/printer/Lexmark-E462dtn.xml
+usr/share/foomatic/db/source/printer/Lexmark-EG460dn.xml
usr/share/foomatic/db/source/printer/Lexmark-Optra_C710.xml
usr/share/foomatic/db/source/printer/Lexmark-Optra_Color_1200.xml
usr/share/foomatic/db/source/printer/Lexmark-Optra_Color_1275.xml
@@ -3972,15 +6449,65 @@ usr/share/foomatic/db/source/printer/Lexmark-Optra_T612.xml
usr/share/foomatic/db/source/printer/Lexmark-Optra_T614.xml
usr/share/foomatic/db/source/printer/Lexmark-Optra_T616.xml
usr/share/foomatic/db/source/printer/Lexmark-Optra_W810.xml
+usr/share/foomatic/db/source/printer/Lexmark-T430.xml
+usr/share/foomatic/db/source/printer/Lexmark-T640.xml
+usr/share/foomatic/db/source/printer/Lexmark-T642.xml
+usr/share/foomatic/db/source/printer/Lexmark-T644.xml
+usr/share/foomatic/db/source/printer/Lexmark-T650.xml
+usr/share/foomatic/db/source/printer/Lexmark-T652.xml
+usr/share/foomatic/db/source/printer/Lexmark-T654.xml
+usr/share/foomatic/db/source/printer/Lexmark-T656.xml
+usr/share/foomatic/db/source/printer/Lexmark-TG654.xml
usr/share/foomatic/db/source/printer/Lexmark-Valuewriter_300.xml
+usr/share/foomatic/db/source/printer/Lexmark-W812.xml
+usr/share/foomatic/db/source/printer/Lexmark-W840.xml
+usr/share/foomatic/db/source/printer/Lexmark-W850.xml
usr/share/foomatic/db/source/printer/Lexmark-Winwriter_100.xml
usr/share/foomatic/db/source/printer/Lexmark-Winwriter_150c.xml
usr/share/foomatic/db/source/printer/Lexmark-Winwriter_200.xml
usr/share/foomatic/db/source/printer/Lexmark-Winwriter_400.xml
usr/share/foomatic/db/source/printer/Lexmark-X125.xml
+usr/share/foomatic/db/source/printer/Lexmark-X203n.xml
+usr/share/foomatic/db/source/printer/Lexmark-X204n.xml
+usr/share/foomatic/db/source/printer/Lexmark-X264dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-X342n.xml
+usr/share/foomatic/db/source/printer/Lexmark-X363dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-X364dn.xml
+usr/share/foomatic/db/source/printer/Lexmark-X364dw.xml
+usr/share/foomatic/db/source/printer/Lexmark-X463de.xml
+usr/share/foomatic/db/source/printer/Lexmark-X464de.xml
+usr/share/foomatic/db/source/printer/Lexmark-X466de.xml
+usr/share/foomatic/db/source/printer/Lexmark-X466dte.xml
+usr/share/foomatic/db/source/printer/Lexmark-X466dwe.xml
+usr/share/foomatic/db/source/printer/Lexmark-X543.xml
+usr/share/foomatic/db/source/printer/Lexmark-X544.xml
+usr/share/foomatic/db/source/printer/Lexmark-X546.xml
+usr/share/foomatic/db/source/printer/Lexmark-X548.xml
+usr/share/foomatic/db/source/printer/Lexmark-X560n.xml
+usr/share/foomatic/db/source/printer/Lexmark-X642e.xml
+usr/share/foomatic/db/source/printer/Lexmark-X651de.xml
+usr/share/foomatic/db/source/printer/Lexmark-X652de.xml
+usr/share/foomatic/db/source/printer/Lexmark-X654de.xml
+usr/share/foomatic/db/source/printer/Lexmark-X656de.xml
+usr/share/foomatic/db/source/printer/Lexmark-X658de.xml
usr/share/foomatic/db/source/printer/Lexmark-X73.xml
+usr/share/foomatic/db/source/printer/Lexmark-X734de.xml
+usr/share/foomatic/db/source/printer/Lexmark-X736de.xml
+usr/share/foomatic/db/source/printer/Lexmark-X738de.xml
usr/share/foomatic/db/source/printer/Lexmark-X74.xml
usr/share/foomatic/db/source/printer/Lexmark-X75.xml
+usr/share/foomatic/db/source/printer/Lexmark-X790.xml
+usr/share/foomatic/db/source/printer/Lexmark-X792.xml
+usr/share/foomatic/db/source/printer/Lexmark-X860de.xml
+usr/share/foomatic/db/source/printer/Lexmark-X862de.xml
+usr/share/foomatic/db/source/printer/Lexmark-X864de.xml
+usr/share/foomatic/db/source/printer/Lexmark-X920.xml
+usr/share/foomatic/db/source/printer/Lexmark-X925.xml
+usr/share/foomatic/db/source/printer/Lexmark-X940e.xml
+usr/share/foomatic/db/source/printer/Lexmark-X945e.xml
+usr/share/foomatic/db/source/printer/Lexmark-X950.xml
+usr/share/foomatic/db/source/printer/Lexmark-X952.xml
+usr/share/foomatic/db/source/printer/Lexmark-X954.xml
usr/share/foomatic/db/source/printer/Lexmark-Z11.xml
usr/share/foomatic/db/source/printer/Lexmark-Z12.xml
usr/share/foomatic/db/source/printer/Lexmark-Z13.xml
@@ -4016,6 +6543,7 @@ usr/share/foomatic/db/source/printer/Minolta-magicolor_2300_DL.xml
usr/share/foomatic/db/source/printer/Minolta-magicolor_2400W.xml
usr/share/foomatic/db/source/printer/Minolta-magicolor_2430_DL.xml
usr/share/foomatic/db/source/printer/Minolta-magicolor_3100.xml
+usr/share/foomatic/db/source/printer/Minolta_QMS-PagePro_9100N.xml
usr/share/foomatic/db/source/printer/Mitsubishi-CP50_Color_Printer.xml
usr/share/foomatic/db/source/printer/NEC-MultiWriter.xml
usr/share/foomatic/db/source/printer/NEC-P2X.xml
@@ -4107,20 +6635,96 @@ usr/share/foomatic/db/source/printer/NRG-MP_1100.xml
usr/share/foomatic/db/source/printer/NRG-MP_1350.xml
usr/share/foomatic/db/source/printer/NRG-MP_1600.xml
usr/share/foomatic/db/source/printer/NRG-MP_161.xml
+usr/share/foomatic/db/source/printer/NRG-MP_171.xml
usr/share/foomatic/db/source/printer/NRG-MP_2000.xml
+usr/share/foomatic/db/source/printer/NRG-MP_2001.xml
+usr/share/foomatic/db/source/printer/NRG-MP_201.xml
+usr/share/foomatic/db/source/printer/NRG-MP_2352.xml
+usr/share/foomatic/db/source/printer/NRG-MP_2500.xml
+usr/share/foomatic/db/source/printer/NRG-MP_2501.xml
usr/share/foomatic/db/source/printer/NRG-MP_2510.xml
+usr/share/foomatic/db/source/printer/NRG-MP_2550.xml
+usr/share/foomatic/db/source/printer/NRG-MP_2550B.xml
+usr/share/foomatic/db/source/printer/NRG-MP_2851.xml
+usr/share/foomatic/db/source/printer/NRG-MP_2852.xml
+usr/share/foomatic/db/source/printer/NRG-MP_301.xml
usr/share/foomatic/db/source/printer/NRG-MP_3010.xml
+usr/share/foomatic/db/source/printer/NRG-MP_3350.xml
+usr/share/foomatic/db/source/printer/NRG-MP_3350B.xml
+usr/share/foomatic/db/source/printer/NRG-MP_3351.xml
+usr/share/foomatic/db/source/printer/NRG-MP_3352.xml
usr/share/foomatic/db/source/printer/NRG-MP_3500.xml
+usr/share/foomatic/db/source/printer/NRG-MP_4000.xml
+usr/share/foomatic/db/source/printer/NRG-MP_4000B.xml
+usr/share/foomatic/db/source/printer/NRG-MP_4001.xml
+usr/share/foomatic/db/source/printer/NRG-MP_4002.xml
usr/share/foomatic/db/source/printer/NRG-MP_4500.xml
+usr/share/foomatic/db/source/printer/NRG-MP_5000.xml
+usr/share/foomatic/db/source/printer/NRG-MP_5000B.xml
+usr/share/foomatic/db/source/printer/NRG-MP_5001.xml
+usr/share/foomatic/db/source/printer/NRG-MP_5002.xml
usr/share/foomatic/db/source/printer/NRG-MP_5500.xml
+usr/share/foomatic/db/source/printer/NRG-MP_6000.xml
+usr/share/foomatic/db/source/printer/NRG-MP_6001.xml
+usr/share/foomatic/db/source/printer/NRG-MP_6002.xml
usr/share/foomatic/db/source/printer/NRG-MP_6500.xml
+usr/share/foomatic/db/source/printer/NRG-MP_7000.xml
+usr/share/foomatic/db/source/printer/NRG-MP_7001.xml
usr/share/foomatic/db/source/printer/NRG-MP_7500.xml
+usr/share/foomatic/db/source/printer/NRG-MP_7502.xml
+usr/share/foomatic/db/source/printer/NRG-MP_8000.xml
+usr/share/foomatic/db/source/printer/NRG-MP_8001.xml
usr/share/foomatic/db/source/printer/NRG-MP_9000.xml
+usr/share/foomatic/db/source/printer/NRG-MP_9001.xml
+usr/share/foomatic/db/source/printer/NRG-MP_9002.xml
usr/share/foomatic/db/source/printer/NRG-MP_C1500sp.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C2050.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C2051.xml
usr/share/foomatic/db/source/printer/NRG-MP_C2500.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C2550.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C2551.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C2800.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C300.xml
usr/share/foomatic/db/source/printer/NRG-MP_C3000.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C3001.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C3002.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C3003.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C300SR.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C305.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C3300.xml
usr/share/foomatic/db/source/printer/NRG-MP_C3500.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C3501.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C3502.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C3503.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C400.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C4000.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C400SR.xml
usr/share/foomatic/db/source/printer/NRG-MP_C4500.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C4501.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C4501A.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C4502.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C4502A.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C4503.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C5000.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C5501.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C5501A.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C5502.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C5502A.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C5503.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C6000.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C6003.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C6501.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C6502.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C7500.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C7501.xml
+usr/share/foomatic/db/source/printer/NRG-MP_C8002.xml
+usr/share/foomatic/db/source/printer/NRG-MP_CW2200.xml
+usr/share/foomatic/db/source/printer/NRG-MP_W2400.xml
+usr/share/foomatic/db/source/printer/NRG-MP_W2401.xml
+usr/share/foomatic/db/source/printer/NRG-MP_W3600.xml
+usr/share/foomatic/db/source/printer/NRG-MP_W3601.xml
+usr/share/foomatic/db/source/printer/NRG-MP_W5100.xml
+usr/share/foomatic/db/source/printer/NRG-MP_W7140.xml
usr/share/foomatic/db/source/printer/NRG-P7026.xml
usr/share/foomatic/db/source/printer/NRG-P7026N.xml
usr/share/foomatic/db/source/printer/NRG-P7032.xml
@@ -4135,17 +6739,53 @@ usr/share/foomatic/db/source/printer/NRG-P7527.xml
usr/share/foomatic/db/source/printer/NRG-P7527n.xml
usr/share/foomatic/db/source/printer/NRG-P7535n.xml
usr/share/foomatic/db/source/printer/NRG-P7575.xml
+usr/share/foomatic/db/source/printer/NRG-Pro_1106EX.xml
+usr/share/foomatic/db/source/printer/NRG-Pro_1107EX.xml
+usr/share/foomatic/db/source/printer/NRG-Pro_1356EX.xml
+usr/share/foomatic/db/source/printer/NRG-Pro_1357EX.xml
+usr/share/foomatic/db/source/printer/NRG-Pro_906EX.xml
+usr/share/foomatic/db/source/printer/NRG-Pro_907EX.xml
+usr/share/foomatic/db/source/printer/NRG-Pro_C5100S.xml
+usr/share/foomatic/db/source/printer/NRG-Pro_C5110S.xml
+usr/share/foomatic/db/source/printer/NRG-SG3100SNw.xml
+usr/share/foomatic/db/source/printer/NRG-SG3110SFNw.xml
+usr/share/foomatic/db/source/printer/NRG-SP_4100N.xml
+usr/share/foomatic/db/source/printer/NRG-SP_4100NL.xml
+usr/share/foomatic/db/source/printer/NRG-SP_4110N.xml
+usr/share/foomatic/db/source/printer/NRG-SP_4210N.xml
+usr/share/foomatic/db/source/printer/NRG-SP_4310N.xml
+usr/share/foomatic/db/source/printer/NRG-SP_5200DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_5200S.xml
+usr/share/foomatic/db/source/printer/NRG-SP_5210DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_5210SF.xml
+usr/share/foomatic/db/source/printer/NRG-SP_5210SR.xml
+usr/share/foomatic/db/source/printer/NRG-SP_6330N.xml
usr/share/foomatic/db/source/printer/NRG-SP_8100DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_8200DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_8300DN.xml
usr/share/foomatic/db/source/printer/NRG-SP_9100DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_C320DN.xml
usr/share/foomatic/db/source/printer/NRG-SP_C410DN.xml
usr/share/foomatic/db/source/printer/NRG-SP_C411DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_C420DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_C430DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_C431DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_C730DN.xml
usr/share/foomatic/db/source/printer/NRG-SP_C811DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_C820DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_C821DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_C830DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_C831DN.xml
+usr/share/foomatic/db/source/printer/NRG-SP_W2470.xml
usr/share/foomatic/db/source/printer/Oce-3145PS.xml
usr/share/foomatic/db/source/printer/Oce-3155PS.xml
usr/share/foomatic/db/source/printer/Oce-3165PS.xml
usr/share/foomatic/db/source/printer/Oce-8445PS.xml
usr/share/foomatic/db/source/printer/Oce-8465PS.xml
usr/share/foomatic/db/source/printer/Oce-9050.xml
+usr/share/foomatic/db/source/printer/Oce-9230.xml
+usr/share/foomatic/db/source/printer/Oce-9245.xml
+usr/share/foomatic/db/source/printer/Oce-9260.xml
usr/share/foomatic/db/source/printer/Oce-PPC3073PS.xml
usr/share/foomatic/db/source/printer/Oce-PPC3074PS.xml
usr/share/foomatic/db/source/printer/Oce-PPC3093PS.xml
@@ -4164,50 +6804,137 @@ usr/share/foomatic/db/source/printer/Oce-VarioPrint_2090PS.xml
usr/share/foomatic/db/source/printer/Oce-VarioPrint_2100PS.xml
usr/share/foomatic/db/source/printer/Oce-VarioPrint_2105PS.xml
usr/share/foomatic/db/source/printer/Oce-VarioPrint_2110PS.xml
-usr/share/foomatic/db/source/printer/Okidata-DP_5000.xml
-usr/share/foomatic/db/source/printer/Okidata-ML_320.xml
-usr/share/foomatic/db/source/printer/Okidata-ML_321.xml
-usr/share/foomatic/db/source/printer/Okidata-ML_380.xml
-usr/share/foomatic/db/source/printer/Okidata-Microline_182.xml
-usr/share/foomatic/db/source/printer/Okidata-Microline_192plus.xml
-usr/share/foomatic/db/source/printer/Okidata-Microline_600CL.xml
-usr/share/foomatic/db/source/printer/Okidata-Microline_620CL.xml
-usr/share/foomatic/db/source/printer/Okidata-Microline_IBM_compatible_9_pin.xml
-usr/share/foomatic/db/source/printer/Okidata-OL400.xml
-usr/share/foomatic/db/source/printer/Okidata-OL400e.xml
-usr/share/foomatic/db/source/printer/Okidata-OL400ex.xml
-usr/share/foomatic/db/source/printer/Okidata-OL400w.xml
-usr/share/foomatic/db/source/printer/Okidata-OL410e.xml
-usr/share/foomatic/db/source/printer/Okidata-OL600e.xml
-usr/share/foomatic/db/source/printer/Okidata-OL610e_PS.xml
-usr/share/foomatic/db/source/printer/Okidata-OL610e_S.xml
-usr/share/foomatic/db/source/printer/Okidata-OL800.xml
-usr/share/foomatic/db/source/printer/Okidata-OL810e_PS.xml
-usr/share/foomatic/db/source/printer/Okidata-OL810ex.xml
-usr/share/foomatic/db/source/printer/Okidata-OL820.xml
-usr/share/foomatic/db/source/printer/Okidata-OL830Plus.xml
-usr/share/foomatic/db/source/printer/Okidata-Okijet_2010.xml
-usr/share/foomatic/db/source/printer/Okidata-Okijet_2500.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_10e.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_10ex.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_12i.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_14ex.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_20DXn.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_4w.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_4wplus.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_6e.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_6ex.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_6w.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_8c.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_8p.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_8w.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_8w_Lite.xml
-usr/share/foomatic/db/source/printer/Okidata-Okipage_8z.xml
-usr/share/foomatic/db/source/printer/Okidata-Super_6e.xml
+usr/share/foomatic/db/source/printer/Oce-cm2510.xml
+usr/share/foomatic/db/source/printer/Oce-cm2520.xml
+usr/share/foomatic/db/source/printer/Oce-cm3521.xml
+usr/share/foomatic/db/source/printer/Oce-cm4010.xml
+usr/share/foomatic/db/source/printer/Oce-cm4520.xml
+usr/share/foomatic/db/source/printer/Oce-cm4521.xml
+usr/share/foomatic/db/source/printer/Oce-cm5520.xml
+usr/share/foomatic/db/source/printer/Oce-cm6520.xml
+usr/share/foomatic/db/source/printer/Oce-fx2080.xml
+usr/share/foomatic/db/source/printer/Oce-fx3000.xml
+usr/share/foomatic/db/source/printer/Oce-im2330.xml
+usr/share/foomatic/db/source/printer/Oce-im2830.xml
+usr/share/foomatic/db/source/printer/Oce-im3512.xml
+usr/share/foomatic/db/source/printer/Oce-im3530.xml
+usr/share/foomatic/db/source/printer/Oce-im4512.xml
+usr/share/foomatic/db/source/printer/Oce-im4530.xml
+usr/share/foomatic/db/source/printer/Oce-im5530.xml
+usr/share/foomatic/db/source/printer/Oce-im6020.xml
+usr/share/foomatic/db/source/printer/Oce-im6030.xml
+usr/share/foomatic/db/source/printer/Oce-im7230.xml
+usr/share/foomatic/db/source/printer/Oce-im7520.xml
+usr/share/foomatic/db/source/printer/Oce-im8530.xml
+usr/share/foomatic/db/source/printer/Oce-im9220.xml
+usr/share/foomatic/db/source/printer/Oce-sx1480.xml
+usr/share/foomatic/db/source/printer/Oce-sx2100.xml
+usr/share/foomatic/db/source/printer/Oki-14i.xml
+usr/share/foomatic/db/source/printer/Oki-B2200.xml
+usr/share/foomatic/db/source/printer/Oki-B2400.xml
+usr/share/foomatic/db/source/printer/Oki-B2540_MFP.xml
+usr/share/foomatic/db/source/printer/Oki-B410.xml
+usr/share/foomatic/db/source/printer/Oki-B410dn.xml
+usr/share/foomatic/db/source/printer/Oki-B4200.xml
+usr/share/foomatic/db/source/printer/Oki-B4250.xml
+usr/share/foomatic/db/source/printer/Oki-B4300.xml
+usr/share/foomatic/db/source/printer/Oki-B4350.xml
+usr/share/foomatic/db/source/printer/Oki-B4400.xml
+usr/share/foomatic/db/source/printer/Oki-B4545_MFP.xml
+usr/share/foomatic/db/source/printer/Oki-B4600.xml
+usr/share/foomatic/db/source/printer/Oki-B4600_PS.xml
+usr/share/foomatic/db/source/printer/Oki-B6200.xml
+usr/share/foomatic/db/source/printer/Oki-B6250.xml
+usr/share/foomatic/db/source/printer/Oki-B6300.xml
+usr/share/foomatic/db/source/printer/Oki-B6500.xml
+usr/share/foomatic/db/source/printer/Oki-C110.xml
+usr/share/foomatic/db/source/printer/Oki-C301dn.xml
+usr/share/foomatic/db/source/printer/Oki-C3100.xml
+usr/share/foomatic/db/source/printer/Oki-C310dn.xml
+usr/share/foomatic/db/source/printer/Oki-C3200.xml
+usr/share/foomatic/db/source/printer/Oki-C3300.xml
+usr/share/foomatic/db/source/printer/Oki-C3400.xml
+usr/share/foomatic/db/source/printer/Oki-C3530_MFP.xml
+usr/share/foomatic/db/source/printer/Oki-C5100.xml
+usr/share/foomatic/db/source/printer/Oki-C5200.xml
+usr/share/foomatic/db/source/printer/Oki-C5300.xml
+usr/share/foomatic/db/source/printer/Oki-C5400.xml
+usr/share/foomatic/db/source/printer/Oki-C5450.xml
+usr/share/foomatic/db/source/printer/Oki-C5500.xml
+usr/share/foomatic/db/source/printer/Oki-C5540_MFP.xml
+usr/share/foomatic/db/source/printer/Oki-C5550_MFP.xml
+usr/share/foomatic/db/source/printer/Oki-C5600.xml
+usr/share/foomatic/db/source/printer/Oki-C5650.xml
+usr/share/foomatic/db/source/printer/Oki-C5700.xml
+usr/share/foomatic/db/source/printer/Oki-C5750.xml
+usr/share/foomatic/db/source/printer/Oki-C5800.xml
+usr/share/foomatic/db/source/printer/Oki-C5900.xml
+usr/share/foomatic/db/source/printer/Oki-C6000.xml
+usr/share/foomatic/db/source/printer/Oki-C6050.xml
+usr/share/foomatic/db/source/printer/Oki-C6100.xml
+usr/share/foomatic/db/source/printer/Oki-C6150.xml
+usr/share/foomatic/db/source/printer/Oki-C710.xml
+usr/share/foomatic/db/source/printer/Oki-C7100.xml
+usr/share/foomatic/db/source/printer/Oki-C7200.xml
+usr/share/foomatic/db/source/printer/Oki-C7300.xml
+usr/share/foomatic/db/source/printer/Oki-C7350.xml
+usr/share/foomatic/db/source/printer/Oki-C7400.xml
+usr/share/foomatic/db/source/printer/Oki-C7500.xml
+usr/share/foomatic/db/source/printer/Oki-C7550.xml
+usr/share/foomatic/db/source/printer/Oki-C8800.xml
+usr/share/foomatic/db/source/printer/Oki-C9200.xml
+usr/share/foomatic/db/source/printer/Oki-C9300.xml
+usr/share/foomatic/db/source/printer/Oki-C9400.xml
+usr/share/foomatic/db/source/printer/Oki-C9500.xml
+usr/share/foomatic/db/source/printer/Oki-C9600.xml
+usr/share/foomatic/db/source/printer/Oki-C9650.xml
+usr/share/foomatic/db/source/printer/Oki-C9800.xml
+usr/share/foomatic/db/source/printer/Oki-C9800_MFP.xml
+usr/share/foomatic/db/source/printer/Oki-DP_5000.xml
+usr/share/foomatic/db/source/printer/Oki-ML_320.xml
+usr/share/foomatic/db/source/printer/Oki-ML_321.xml
+usr/share/foomatic/db/source/printer/Oki-ML_380.xml
+usr/share/foomatic/db/source/printer/Oki-Microline_182.xml
+usr/share/foomatic/db/source/printer/Oki-Microline_192plus.xml
+usr/share/foomatic/db/source/printer/Oki-Microline_600CL.xml
+usr/share/foomatic/db/source/printer/Oki-Microline_620CL.xml
+usr/share/foomatic/db/source/printer/Oki-Microline_IBM_compatible_9_pin.xml
+usr/share/foomatic/db/source/printer/Oki-OL400.xml
+usr/share/foomatic/db/source/printer/Oki-OL400e.xml
+usr/share/foomatic/db/source/printer/Oki-OL400ex.xml
+usr/share/foomatic/db/source/printer/Oki-OL400w.xml
+usr/share/foomatic/db/source/printer/Oki-OL410e.xml
+usr/share/foomatic/db/source/printer/Oki-OL600e.xml
+usr/share/foomatic/db/source/printer/Oki-OL610e_PS.xml
+usr/share/foomatic/db/source/printer/Oki-OL610e_S.xml
+usr/share/foomatic/db/source/printer/Oki-OL800.xml
+usr/share/foomatic/db/source/printer/Oki-OL810e_PS.xml
+usr/share/foomatic/db/source/printer/Oki-OL810ex.xml
+usr/share/foomatic/db/source/printer/Oki-OL820.xml
+usr/share/foomatic/db/source/printer/Oki-OL830Plus.xml
+usr/share/foomatic/db/source/printer/Oki-Okijet_2010.xml
+usr/share/foomatic/db/source/printer/Oki-Okijet_2500.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_10e.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_10ex.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_12i.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_14ex.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_20DXn.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_4w.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_4wplus.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_6e.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_6ex.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_6w.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_8c.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_8p.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_8w.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_8w_Lite.xml
+usr/share/foomatic/db/source/printer/Oki-Okipage_8z.xml
+usr/share/foomatic/db/source/printer/Oki-Super_6e.xml
usr/share/foomatic/db/source/printer/Olivetti-JP350S.xml
usr/share/foomatic/db/source/printer/Olivetti-JP450.xml
usr/share/foomatic/db/source/printer/Olivetti-JP470.xml
usr/share/foomatic/db/source/printer/Olivetti-PG_306.xml
+usr/share/foomatic/db/source/printer/Olivetti-d-Color_P160W.xml
usr/share/foomatic/db/source/printer/Olympus-P-10.xml
usr/share/foomatic/db/source/printer/Olympus-P-11.xml
usr/share/foomatic/db/source/printer/Olympus-P-200.xml
@@ -4219,6 +6946,22 @@ usr/share/foomatic/db/source/printer/Olympus-P-330NE.xml
usr/share/foomatic/db/source/printer/Olympus-P-400.xml
usr/share/foomatic/db/source/printer/Olympus-P-440.xml
usr/share/foomatic/db/source/printer/PCPI-1030.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-180.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-2330.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-4510.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-4520.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-8016P.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-8020E.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-8045.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-8060.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-C213.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-C262.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-C264.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-C265.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-C305.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-C322.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-C354.xml
+usr/share/foomatic/db/source/printer/Panasonic-DP-C405.xml
usr/share/foomatic/db/source/printer/Panasonic-KX-P1123.xml
usr/share/foomatic/db/source/printer/Panasonic-KX-P1124.xml
usr/share/foomatic/db/source/printer/Panasonic-KX-P1150.xml
@@ -4252,6 +6995,8 @@ usr/share/foomatic/db/source/printer/Raven-LP-410.xml
usr/share/foomatic/db/source/printer/Ricoh-4081.xml
usr/share/foomatic/db/source/printer/Ricoh-4801.xml
usr/share/foomatic/db/source/printer/Ricoh-6000.xml
+usr/share/foomatic/db/source/printer/Ricoh-AficioSG3100SNw.xml
+usr/share/foomatic/db/source/printer/Ricoh-AficioSG3110SFNw.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_1022.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_1027.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_1032.xml
@@ -4326,48 +7071,207 @@ usr/share/foomatic/db/source/printer/Ricoh-Aficio_CL7100.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_CL7200.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_CL7300.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_Color5560.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_FX10.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_1100.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_1350.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_1600.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_161.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_171.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_2000.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_201.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_2352.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_2500.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_2510.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_2550.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_2550B.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_2851.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_2852.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_301.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_3010.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_3350.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_3350B.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_3351.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_3352.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_3500.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_4000.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_4000B.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_4001.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_4002.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_4500.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_5000.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_5000B.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_5001.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_5002.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_5500.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_6000.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_6001.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_6002.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_6500.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_7000.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_7001.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_7500.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_7502.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_8000.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_8001.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_9000.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_9001.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_9002.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C2050.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C2051.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C2500.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C2550.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C2551.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C2800.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C300.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C3000.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C3001.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C3002.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C300SR.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C305.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C3300.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C3500.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C3501.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C3502.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C400.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C4000.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C400SR.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C4500.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C4501.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C4501A.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C4502.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C4502A.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C5000.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C5501.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C5501A.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C5502.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C5502A.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C6000.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C6501.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C7500.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_C7501.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_W2400.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_W2401.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_W3600.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_W3601.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_W5100.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_MP_W7140.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_1000S.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_1100S.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_4100N.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_4100NL.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_4110N.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_4210N.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_4310N.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_5200DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_5200S.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_5210DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_5210SF.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_5210SR.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_6330N.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_8100DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_8200DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_8300DN.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_9100DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C222SF.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C320DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C400DN.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C410DN.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C411DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C420DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C430DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C431DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C730DN.xml
usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C811DN.xml
-usr/share/foomatic/db/source/printer/Ricoh-Afico_FX10.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C820DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C821DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C830DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_C831DN.xml
+usr/share/foomatic/db/source/printer/Ricoh-Aficio_SP_W2470.xml
usr/share/foomatic/db/source/printer/Ricoh-ColorLaser_AP828.xml
usr/share/foomatic/db/source/printer/Ricoh-DDP_70.xml
usr/share/foomatic/db/source/printer/Ricoh-DDP_92.xml
usr/share/foomatic/db/source/printer/Ricoh-EMP_156.xml
usr/share/foomatic/db/source/printer/Ricoh-FAX5510L_5510NF.xml
+usr/share/foomatic/db/source/printer/Ricoh-GX_3050N.xml
+usr/share/foomatic/db/source/printer/Ricoh-GX_3050SFN.xml
+usr/share/foomatic/db/source/printer/Ricoh-GX_5050N.xml
+usr/share/foomatic/db/source/printer/Ricoh-GX_E3350N.xml
+usr/share/foomatic/db/source/printer/Ricoh-GX_E5550N.xml
usr/share/foomatic/db/source/printer/Ricoh-LASER_AP2600.xml
usr/share/foomatic/db/source/printer/Ricoh-LASER_AP2600N.xml
usr/share/foomatic/db/source/printer/Ricoh-LASER_AP2610.xml
usr/share/foomatic/db/source/printer/Ricoh-LASER_AP2610N.xml
+usr/share/foomatic/db/source/printer/Ricoh-MP_2001.xml
+usr/share/foomatic/db/source/printer/Ricoh-MP_2501.xml
usr/share/foomatic/db/source/printer/Ricoh-MP_C1500_615C.xml
+usr/share/foomatic/db/source/printer/Ricoh-MP_C3003.xml
+usr/share/foomatic/db/source/printer/Ricoh-MP_C3503.xml
+usr/share/foomatic/db/source/printer/Ricoh-MP_C4503.xml
+usr/share/foomatic/db/source/printer/Ricoh-MP_C5503.xml
+usr/share/foomatic/db/source/printer/Ricoh-MP_C6003.xml
+usr/share/foomatic/db/source/printer/Ricoh-MP_C6502.xml
+usr/share/foomatic/db/source/printer/Ricoh-MP_C8002.xml
+usr/share/foomatic/db/source/printer/Ricoh-MP_CW2200.xml
+usr/share/foomatic/db/source/printer/Ricoh-Pro_1106EX.xml
+usr/share/foomatic/db/source/printer/Ricoh-Pro_1107EX.xml
+usr/share/foomatic/db/source/printer/Ricoh-Pro_1356EX.xml
+usr/share/foomatic/db/source/printer/Ricoh-Pro_1357EX.xml
+usr/share/foomatic/db/source/printer/Ricoh-Pro_906EX.xml
+usr/share/foomatic/db/source/printer/Ricoh-Pro_907EX.xml
+usr/share/foomatic/db/source/printer/Ricoh-Pro_C5100S.xml
+usr/share/foomatic/db/source/printer/Ricoh-Pro_C5110S.xml
usr/share/foomatic/db/source/printer/Ricoh-RPDL_III_Laser_Printer.xml
usr/share/foomatic/db/source/printer/Ricoh-RPDL_II_Laser_Printer.xml
usr/share/foomatic/db/source/printer/Ricoh-RPDL_IV_Laser_Printer.xml
usr/share/foomatic/db/source/printer/Ricoh-RPDL_I_Laser_Printer.xml
usr/share/foomatic/db/source/printer/Samsung-CLP-300.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-310.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-315.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-325.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-350.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-365.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-410.xml
usr/share/foomatic/db/source/printer/Samsung-CLP-500.xml
usr/share/foomatic/db/source/printer/Samsung-CLP-510.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-550.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-550N.xml
usr/share/foomatic/db/source/printer/Samsung-CLP-600.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-610.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-610ND.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-620.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-650.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-650N.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-660.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-660N.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-660ND.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-670.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-680.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-770.xml
+usr/share/foomatic/db/source/printer/Samsung-CLP-775.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-2160.xml
usr/share/foomatic/db/source/printer/Samsung-CLX-3160.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-3175.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-3185.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-3300.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-4190.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-6200.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-6220.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-6240.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-6250.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-6260.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-8380.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-8385.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-8385X.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-8540.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-8640_8650.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-9250_9350.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-9252_9352.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-92x1_93x1.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-981x.xml
+usr/share/foomatic/db/source/printer/Samsung-CLX-982x.xml
+usr/share/foomatic/db/source/printer/Samsung-M262x_282x.xml
+usr/share/foomatic/db/source/printer/Samsung-M267x_287x.xml
+usr/share/foomatic/db/source/printer/Samsung-M337x_387x_407x.xml
usr/share/foomatic/db/source/printer/Samsung-ML-1000.xml
usr/share/foomatic/db/source/printer/Samsung-ML-1010.xml
usr/share/foomatic/db/source/printer/Samsung-ML-1020.xml
@@ -4401,13 +7305,42 @@ usr/share/foomatic/db/source/printer/Samsung-ML-2250.xml
usr/share/foomatic/db/source/printer/Samsung-ML-2550.xml
usr/share/foomatic/db/source/printer/Samsung-ML-2551N.xml
usr/share/foomatic/db/source/printer/Samsung-ML-2552W.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-2570.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-2571N.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-2580.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-2850.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-2850D.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-2851ND.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-2853.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-2855.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-2950.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-3051N.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-3051ND.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-3470.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-3470D.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-3471ND.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-3475.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-371x.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-375x.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-4050.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-4050N.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-4055.xml
usr/share/foomatic/db/source/printer/Samsung-ML-4500.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-451x_501x.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-4550.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-4551N.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-4551ND.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-4555.xml
usr/share/foomatic/db/source/printer/Samsung-ML-4600.xml
usr/share/foomatic/db/source/printer/Samsung-ML-5000a.xml
usr/share/foomatic/db/source/printer/Samsung-ML-5050G.xml
usr/share/foomatic/db/source/printer/Samsung-ML-5080.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-551x_651x.xml
usr/share/foomatic/db/source/printer/Samsung-ML-6000.xml
usr/share/foomatic/db/source/printer/Samsung-ML-6040.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-6060.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-6060N.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-6060S.xml
usr/share/foomatic/db/source/printer/Samsung-ML-6100.xml
usr/share/foomatic/db/source/printer/Samsung-ML-7000.xml
usr/share/foomatic/db/source/printer/Samsung-ML-7000N.xml
@@ -4417,11 +7350,39 @@ usr/share/foomatic/db/source/printer/Samsung-ML-7300.xml
usr/share/foomatic/db/source/printer/Samsung-ML-7300N.xml
usr/share/foomatic/db/source/printer/Samsung-ML-85.xml
usr/share/foomatic/db/source/printer/Samsung-ML-85G.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-8850_8950.xml
+usr/share/foomatic/db/source/printer/Samsung-ML-8x00.xml
usr/share/foomatic/db/source/printer/Samsung-QL-5100A.xml
usr/share/foomatic/db/source/printer/Samsung-QL-6050.xml
usr/share/foomatic/db/source/printer/Samsung-QL-85G.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-470x.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-472x.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-483x_5x3x.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-4x24.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-4x25.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-4x26.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-4x28.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-5635.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-5835_5935.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-5835_5935X.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-6545.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-6545X.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-681x.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-6x20.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-6x22.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-6x45.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-6x55.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-6x55X.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-8030_8040.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-8123_8128.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-8230_8240.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-881x.xml
+usr/share/foomatic/db/source/printer/Samsung-SCX-882x.xml
usr/share/foomatic/db/source/printer/Samsung-SF_MSYS_MJ-4700_4800_4500C.xml
usr/share/foomatic/db/source/printer/Samsung-SI-630A.xml
+usr/share/foomatic/db/source/printer/Savin-2404WD.xml
+usr/share/foomatic/db/source/printer/Savin-2404WDP.xml
+usr/share/foomatic/db/source/printer/Savin-2406WD.xml
usr/share/foomatic/db/source/printer/Savin-2522.xml
usr/share/foomatic/db/source/printer/Savin-2527.xml
usr/share/foomatic/db/source/printer/Savin-2532.xml
@@ -4429,6 +7390,7 @@ usr/share/foomatic/db/source/printer/Savin-2535_2235.xml
usr/share/foomatic/db/source/printer/Savin-2545_2245.xml
usr/share/foomatic/db/source/printer/Savin-2560.xml
usr/share/foomatic/db/source/printer/Savin-2575.xml
+usr/share/foomatic/db/source/printer/Savin-3406WD.xml
usr/share/foomatic/db/source/printer/Savin-3515.xml
usr/share/foomatic/db/source/printer/Savin-40105.xml
usr/share/foomatic/db/source/printer/Savin-4015.xml
@@ -4444,6 +7406,9 @@ usr/share/foomatic/db/source/printer/Savin-4051.xml
usr/share/foomatic/db/source/printer/Savin-4060.xml
usr/share/foomatic/db/source/printer/Savin-4075.xml
usr/share/foomatic/db/source/printer/Savin-4090.xml
+usr/share/foomatic/db/source/printer/Savin-5100WD.xml
+usr/share/foomatic/db/source/printer/Savin-7025.xml
+usr/share/foomatic/db/source/printer/Savin-7140WD.xml
usr/share/foomatic/db/source/printer/Savin-8016.xml
usr/share/foomatic/db/source/printer/Savin-8020.xml
usr/share/foomatic/db/source/printer/Savin-8020d.xml
@@ -4456,14 +7421,35 @@ usr/share/foomatic/db/source/printer/Savin-8035e.xml
usr/share/foomatic/db/source/printer/Savin-8045_8045g.xml
usr/share/foomatic/db/source/printer/Savin-8045e.xml
usr/share/foomatic/db/source/printer/Savin-8055.xml
+usr/share/foomatic/db/source/printer/Savin-8060.xml
usr/share/foomatic/db/source/printer/Savin-8065.xml
+usr/share/foomatic/db/source/printer/Savin-8070.xml
usr/share/foomatic/db/source/printer/Savin-8075.xml
+usr/share/foomatic/db/source/printer/Savin-8080.xml
usr/share/foomatic/db/source/printer/Savin-8090.xml
usr/share/foomatic/db/source/printer/Savin-8110.xml
usr/share/foomatic/db/source/printer/Savin-8135.xml
usr/share/foomatic/db/source/printer/Savin-816.xml
usr/share/foomatic/db/source/printer/Savin-9016.xml
usr/share/foomatic/db/source/printer/Savin-9021d.xml
+usr/share/foomatic/db/source/printer/Savin-9025.xml
+usr/share/foomatic/db/source/printer/Savin-9025b.xml
+usr/share/foomatic/db/source/printer/Savin-9033.xml
+usr/share/foomatic/db/source/printer/Savin-9033b.xml
+usr/share/foomatic/db/source/printer/Savin-9040.xml
+usr/share/foomatic/db/source/printer/Savin-9040b.xml
+usr/share/foomatic/db/source/printer/Savin-9050.xml
+usr/share/foomatic/db/source/printer/Savin-9050b.xml
+usr/share/foomatic/db/source/printer/Savin-9060.xml
+usr/share/foomatic/db/source/printer/Savin-9070.xml
+usr/share/foomatic/db/source/printer/Savin-9080.xml
+usr/share/foomatic/db/source/printer/Savin-9090.xml
+usr/share/foomatic/db/source/printer/Savin-917.xml
+usr/share/foomatic/db/source/printer/Savin-920.xml
+usr/share/foomatic/db/source/printer/Savin-9228.xml
+usr/share/foomatic/db/source/printer/Savin-9233.xml
+usr/share/foomatic/db/source/printer/Savin-9240.xml
+usr/share/foomatic/db/source/printer/Savin-9250.xml
usr/share/foomatic/db/source/printer/Savin-C2408.xml
usr/share/foomatic/db/source/printer/Savin-C2410.xml
usr/share/foomatic/db/source/printer/Savin-C2524.xml
@@ -4471,18 +7457,37 @@ usr/share/foomatic/db/source/printer/Savin-C2525.xml
usr/share/foomatic/db/source/printer/Savin-C2532.xml
usr/share/foomatic/db/source/printer/Savin-C2820.xml
usr/share/foomatic/db/source/printer/Savin-C2824.xml
+usr/share/foomatic/db/source/printer/Savin-C2828.xml
usr/share/foomatic/db/source/printer/Savin-C3030.xml
usr/share/foomatic/db/source/printer/Savin-C3210.xml
usr/share/foomatic/db/source/printer/Savin-C3210e.xml
usr/share/foomatic/db/source/printer/Savin-C3224.xml
+usr/share/foomatic/db/source/printer/Savin-C3333.xml
usr/share/foomatic/db/source/printer/Savin-C3528.xml
usr/share/foomatic/db/source/printer/Savin-C3535.xml
usr/share/foomatic/db/source/printer/Savin-C3828.xml
+usr/share/foomatic/db/source/printer/Savin-C4040.xml
usr/share/foomatic/db/source/printer/Savin-C4535.xml
usr/share/foomatic/db/source/printer/Savin-C4540.xml
+usr/share/foomatic/db/source/printer/Savin-C5050.xml
usr/share/foomatic/db/source/printer/Savin-C6045.xml
+usr/share/foomatic/db/source/printer/Savin-C6055.xml
+usr/share/foomatic/db/source/printer/Savin-C7570.xml
+usr/share/foomatic/db/source/printer/Savin-C9020.xml
+usr/share/foomatic/db/source/printer/Savin-C9025.xml
+usr/share/foomatic/db/source/printer/Savin-C9065.xml
+usr/share/foomatic/db/source/printer/Savin-C9075.xml
+usr/share/foomatic/db/source/printer/Savin-C9120.xml
+usr/share/foomatic/db/source/printer/Savin-C9125.xml
+usr/share/foomatic/db/source/printer/Savin-C9130.xml
+usr/share/foomatic/db/source/printer/Savin-C9135.xml
+usr/share/foomatic/db/source/printer/Savin-C9145.xml
+usr/share/foomatic/db/source/printer/Savin-C9145A.xml
+usr/share/foomatic/db/source/printer/Savin-C9155.xml
+usr/share/foomatic/db/source/printer/Savin-C9155A.xml
usr/share/foomatic/db/source/printer/Savin-CLP1036.xml
usr/share/foomatic/db/source/printer/Savin-CLP128.xml
+usr/share/foomatic/db/source/printer/Savin-CLP131DN.xml
usr/share/foomatic/db/source/printer/Savin-CLP135.xml
usr/share/foomatic/db/source/printer/Savin-CLP1620.xml
usr/share/foomatic/db/source/printer/Savin-CLP17.xml
@@ -4493,27 +7498,88 @@ usr/share/foomatic/db/source/printer/Savin-CLP26DN.xml
usr/share/foomatic/db/source/printer/Savin-CLP27DN.xml
usr/share/foomatic/db/source/printer/Savin-CLP28.xml
usr/share/foomatic/db/source/printer/Savin-CLP31DN.xml
+usr/share/foomatic/db/source/printer/Savin-CLP340D.xml
usr/share/foomatic/db/source/printer/Savin-CLP35.xml
+usr/share/foomatic/db/source/printer/Savin-CLP350D.xml
+usr/share/foomatic/db/source/printer/Savin-CLP37DN.xml
+usr/share/foomatic/db/source/printer/Savin-CLP42DN.xml
usr/share/foomatic/db/source/printer/Savin-CLP831.xml
+usr/share/foomatic/db/source/printer/Savin-C_230.xml
+usr/share/foomatic/db/source/printer/Savin-C_230SR.xml
+usr/share/foomatic/db/source/printer/Savin-C_240.xml
+usr/share/foomatic/db/source/printer/Savin-C_240SR.xml
usr/share/foomatic/db/source/printer/Savin-FAX3799_3799nf.xml
usr/share/foomatic/db/source/printer/Savin-MLP145.xml
+usr/share/foomatic/db/source/printer/Savin-MLP150DN.xml
usr/share/foomatic/db/source/printer/Savin-MLP175n.xml
+usr/share/foomatic/db/source/printer/Savin-MLP235n.xml
usr/share/foomatic/db/source/printer/Savin-MLP25.xml
usr/share/foomatic/db/source/printer/Savin-MLP25n.xml
usr/share/foomatic/db/source/printer/Savin-MLP26.xml
usr/share/foomatic/db/source/printer/Savin-MLP26n.xml
usr/share/foomatic/db/source/printer/Savin-MLP28.xml
usr/share/foomatic/db/source/printer/Savin-MLP28n.xml
+usr/share/foomatic/db/source/printer/Savin-MLP31n.xml
+usr/share/foomatic/db/source/printer/Savin-MLP31nL.xml
usr/share/foomatic/db/source/printer/Savin-MLP32.xml
usr/share/foomatic/db/source/printer/Savin-MLP35n.xml
+usr/share/foomatic/db/source/printer/Savin-MLP36n.xml
+usr/share/foomatic/db/source/printer/Savin-MLP37N.xml
usr/share/foomatic/db/source/printer/Savin-MLP45.xml
usr/share/foomatic/db/source/printer/Savin-MLP75n.xml
+usr/share/foomatic/db/source/printer/Savin-MP_2352.xml
+usr/share/foomatic/db/source/printer/Savin-MP_2501.xml
+usr/share/foomatic/db/source/printer/Savin-MP_2852.xml
+usr/share/foomatic/db/source/printer/Savin-MP_301.xml
+usr/share/foomatic/db/source/printer/Savin-MP_3352.xml
+usr/share/foomatic/db/source/printer/Savin-MP_4002.xml
+usr/share/foomatic/db/source/printer/Savin-MP_5002.xml
+usr/share/foomatic/db/source/printer/Savin-MP_6002.xml
+usr/share/foomatic/db/source/printer/Savin-MP_7502.xml
+usr/share/foomatic/db/source/printer/Savin-MP_9002.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C3002.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C3003.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C305.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C3502.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C3503.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C4502.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C4502A.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C4503.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C5502.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C5502A.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C5503.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C6003.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C6502.xml
+usr/share/foomatic/db/source/printer/Savin-MP_C8002.xml
+usr/share/foomatic/db/source/printer/Savin-MP_CW2200.xml
+usr/share/foomatic/db/source/printer/Savin-Pro_1106EX.xml
+usr/share/foomatic/db/source/printer/Savin-Pro_1107EX.xml
+usr/share/foomatic/db/source/printer/Savin-Pro_1356EX.xml
+usr/share/foomatic/db/source/printer/Savin-Pro_1357EX.xml
+usr/share/foomatic/db/source/printer/Savin-Pro_906EX.xml
+usr/share/foomatic/db/source/printer/Savin-Pro_907EX.xml
+usr/share/foomatic/db/source/printer/Savin-Pro_C5100S.xml
+usr/share/foomatic/db/source/printer/Savin-Pro_C5110S.xml
usr/share/foomatic/db/source/printer/Savin-SDC555.xml
+usr/share/foomatic/db/source/printer/Savin-SG3100SNw.xml
+usr/share/foomatic/db/source/printer/Savin-SG3110SFNw.xml
usr/share/foomatic/db/source/printer/Savin-SGC_1506.xml
usr/share/foomatic/db/source/printer/Savin-SLP26.xml
usr/share/foomatic/db/source/printer/Savin-SLP26n.xml
usr/share/foomatic/db/source/printer/Savin-SLP32.xml
usr/share/foomatic/db/source/printer/Savin-SLP38c.xml
+usr/share/foomatic/db/source/printer/Savin-SP_4310N.xml
+usr/share/foomatic/db/source/printer/Savin-SP_5200DN.xml
+usr/share/foomatic/db/source/printer/Savin-SP_5200S.xml
+usr/share/foomatic/db/source/printer/Savin-SP_5210DN.xml
+usr/share/foomatic/db/source/printer/Savin-SP_5210SF.xml
+usr/share/foomatic/db/source/printer/Savin-SP_5210SR.xml
+usr/share/foomatic/db/source/printer/Savin-SP_8300DN.xml
+usr/share/foomatic/db/source/printer/Savin-SP_C320DN.xml
+usr/share/foomatic/db/source/printer/Savin-SP_C400DN.xml
+usr/share/foomatic/db/source/printer/Savin-SP_C730DN.xml
+usr/share/foomatic/db/source/printer/Savin-SP_C830DN.xml
+usr/share/foomatic/db/source/printer/Savin-SP_C831DN.xml
usr/share/foomatic/db/source/printer/Seiko-SLP-100.xml
usr/share/foomatic/db/source/printer/Seiko-SLP-200.xml
usr/share/foomatic/db/source/printer/Seiko-SLP-240.xml
@@ -4529,7 +7595,152 @@ usr/share/foomatic/db/source/printer/Sharp-AJ-1805.xml
usr/share/foomatic/db/source/printer/Sharp-AJ-2000.xml
usr/share/foomatic/db/source/printer/Sharp-AJ-2005.xml
usr/share/foomatic/db/source/printer/Sharp-AJ-2100.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-155FG.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-155FG_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-160M.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-160M_PS.xml
usr/share/foomatic/db/source/printer/Sharp-AR-161.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-163FG.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-163FG_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-163G.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-163G_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-168D.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-168S.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-200M.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-200M_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-205FG.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-205FG_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-205G.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-205G_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-266FP.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-266FP_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-266S.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-266S_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-311FP.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-311FP_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-311N.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-311N_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-311S.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-311S_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-351FP.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-351FP_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-351N.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-351N_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-351S.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-351S_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-451FP.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-451FP_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-451N.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-451N_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-451S.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-451S_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-5220.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-555M.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-555M_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-555S.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-555S_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-625M.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-625M_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-625S.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-625S_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-705M.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-705M_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-705S.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-705S_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-BC260.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-BC320.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C170FP.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C170FP_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C170M.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C172FP.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C172FP_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C172M.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C260.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C260F.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C260FP.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C260FP_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C260M.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C260P.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C260S.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C261F.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C261FP.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C261FP_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C261M.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C261S.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C262FP.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C262FP_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C262M.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-C262S.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M150.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M150_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M155.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M155_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M160.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M160_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M161.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M161_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M162.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M162_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M165.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M165_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M205.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M205_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M206.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M206_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M207.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M207_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M236.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M236_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M237.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M237_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M276.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M276_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M277.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M277_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M351N.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M351U.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M355N.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M355U.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M451N.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M451U.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M455N.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M455U.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M550N.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M550U.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M620N.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M620U.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M700N.xml
+usr/share/foomatic/db/source/printer/Sharp-AR-M700U.xml
+usr/share/foomatic/db/source/printer/Sharp-ARP350.xml
+usr/share/foomatic/db/source/printer/Sharp-ARP450.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-2300FG.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-2300FG_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-2300G.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-2300G_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-2300N.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-2300N_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-2700FG.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-2700FG_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-2700G.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-2700G_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-2700N.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-2700N_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-3500FN.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-3500FN_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-3500N.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-3500N_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-3501FN.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-3501FN_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-3501N.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-3501N_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-4500FN.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-4500FN_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-4500N.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-4500N_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-4501FN.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-4501FN_PS.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-4501N.xml
+usr/share/foomatic/db/source/printer/Sharp-MX-4501N_PS.xml
usr/share/foomatic/db/source/printer/SiPix-Pocket_Printer_A6.xml
usr/share/foomatic/db/source/printer/Sony-IJP-V100.xml
usr/share/foomatic/db/source/printer/Sony-UP-DP10.xml
@@ -4544,49 +7755,96 @@ usr/share/foomatic/db/source/printer/Star-NL-10.xml
usr/share/foomatic/db/source/printer/Star-NX-1001.xml
usr/share/foomatic/db/source/printer/Star-StarJet_48.xml
usr/share/foomatic/db/source/printer/Star-WinType_4000.xml
+usr/share/foomatic/db/source/printer/Tally-LN45.xml
+usr/share/foomatic/db/source/printer/Tally-ML450.xml
usr/share/foomatic/db/source/printer/Tally-MT908.xml
-usr/share/foomatic/db/source/printer/Tektronix-3693d_color_printer_8-bit_mode.xml
-usr/share/foomatic/db/source/printer/Tektronix-4693d_color_printer_2-bit_mode.xml
-usr/share/foomatic/db/source/printer/Tektronix-4693d_color_printer_4-bit_mode.xml
+usr/share/foomatic/db/source/printer/Tektronix-4693d.xml
usr/share/foomatic/db/source/printer/Tektronix-4695.xml
usr/share/foomatic/db/source/printer/Tektronix-4696.xml
usr/share/foomatic/db/source/printer/Tektronix-4697.xml
usr/share/foomatic/db/source/printer/Tektronix-Phaser_350.xml
+usr/share/foomatic/db/source/printer/Tektronix-Phaser_750DP.xml
+usr/share/foomatic/db/source/printer/Tektronix-Phaser_750DX.xml
+usr/share/foomatic/db/source/printer/Tektronix-Phaser_750N.xml
+usr/share/foomatic/db/source/printer/Tektronix-Phaser_750P.xml
usr/share/foomatic/db/source/printer/Tektronix-Phaser_780.xml
usr/share/foomatic/db/source/printer/Tektronix-Phaser_850.xml
+usr/share/foomatic/db/source/printer/Tektronix-Phaser_850DP.xml
+usr/share/foomatic/db/source/printer/Tektronix-Phaser_850DX.xml
+usr/share/foomatic/db/source/printer/Tektronix-Phaser_850N.xml
usr/share/foomatic/db/source/printer/Tektronix-Phaser_IISX.xml
usr/share/foomatic/db/source/printer/Tektronix-Phaser_PX.xml
+usr/share/foomatic/db/source/printer/Texas_Instruments-microLaser_PowerPro_12.xml
+usr/share/foomatic/db/source/printer/Texas_Instruments-microLaser_Pro_600.xml
+usr/share/foomatic/db/source/printer/Texas_Instruments-microLaser_Pro_8.xml
+usr/share/foomatic/db/source/printer/Texas_Instruments-microLaser_Pro_E.xml
+usr/share/foomatic/db/source/printer/Texas_Instruments-microLaser_XL_Basic.xml
+usr/share/foomatic/db/source/printer/Texas_Instruments-microLaser_XL_PS17.xml
+usr/share/foomatic/db/source/printer/Texas_Instruments-microLaser_XL_PS35.xml
+usr/share/foomatic/db/source/printer/Texas_Instruments-microLaser_XL_Turbo.xml
usr/share/foomatic/db/source/printer/Toshiba-DP2570.xml
-usr/share/foomatic/db/source/printer/Toshiba-GL_1010.xml
-usr/share/foomatic/db/source/printer/Toshiba-GL_1020.xml
+usr/share/foomatic/db/source/printer/Toshiba-GL-1010.xml
+usr/share/foomatic/db/source/printer/Toshiba-GL-1020.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_1101.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_1351.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_162.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_162d.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_165.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_167.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_200L.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_202L.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_203l.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_205.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_220cp.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_230.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_232.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_233.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_237.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_2500c.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_280.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_281c.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_282.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_283.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_2830c.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_350.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_3500c.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_3510c.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_3511.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_351c.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_352.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_353.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_3530c.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_450.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_4500c.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_450s.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_4511.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_451c.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_452.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_4520c.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_453.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_500p.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_500s.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_520.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_523.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_523t.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_5500c.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_600.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_603.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_603t.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_720.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_723.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_723t.xml
usr/share/foomatic/db/source/printer/Toshiba-e-Studio_850.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_853.xml
+usr/share/foomatic/db/source/printer/Toshiba-e-Studio_901.xml
+usr/share/foomatic/db/source/printer/Xante-Accel-a-Writer_4G.xml
+usr/share/foomatic/db/source/printer/Xante-FilmMaker_4.xml
+usr/share/foomatic/db/source/printer/Xante-PlateMaker_4.xml
usr/share/foomatic/db/source/printer/Xerox-2700_XES.xml
usr/share/foomatic/db/source/printer/Xerox-3700_XES.xml
usr/share/foomatic/db/source/printer/Xerox-4045_XES.xml
usr/share/foomatic/db/source/printer/Xerox-Able_1406.xml
+usr/share/foomatic/db/source/printer/Xerox-DocuColor_2006.xml
usr/share/foomatic/db/source/printer/Xerox-DocuPrint_4508.xml
usr/share/foomatic/db/source/printer/Xerox-DocuPrint_C11.xml
usr/share/foomatic/db/source/printer/Xerox-DocuPrint_C20.xml
@@ -4596,9 +7854,15 @@ usr/share/foomatic/db/source/printer/Xerox-DocuPrint_C8.xml
usr/share/foomatic/db/source/printer/Xerox-DocuPrint_M750.xml
usr/share/foomatic/db/source/printer/Xerox-DocuPrint_M760.xml
usr/share/foomatic/db/source/printer/Xerox-DocuPrint_N17.xml
+usr/share/foomatic/db/source/printer/Xerox-DocuPrint_N2125.xml
+usr/share/foomatic/db/source/printer/Xerox-DocuPrint_N24.xml
usr/share/foomatic/db/source/printer/Xerox-DocuPrint_N32.xml
+usr/share/foomatic/db/source/printer/Xerox-DocuPrint_N3225.xml
+usr/share/foomatic/db/source/printer/Xerox-DocuPrint_N40.xml
+usr/share/foomatic/db/source/printer/Xerox-DocuPrint_N4025.xml
usr/share/foomatic/db/source/printer/Xerox-DocuPrint_N4512.xml
usr/share/foomatic/db/source/printer/Xerox-DocuPrint_N4512PS.xml
+usr/share/foomatic/db/source/printer/Xerox-DocuPrint_N4525.xml
usr/share/foomatic/db/source/printer/Xerox-DocuPrint_P12.xml
usr/share/foomatic/db/source/printer/Xerox-DocuPrint_P1202.xml
usr/share/foomatic/db/source/printer/Xerox-DocuPrint_P8.xml
@@ -4607,16 +7871,147 @@ usr/share/foomatic/db/source/printer/Xerox-DocuPrint_XJ6C.xml
usr/share/foomatic/db/source/printer/Xerox-DocuPrint_XJ8C.xml
usr/share/foomatic/db/source/printer/Xerox-Document_Centre_400.xml
usr/share/foomatic/db/source/printer/Xerox-Document_Homecentre.xml
-usr/share/foomatic/db/source/printer/Xerox-Phaser-6110.xml
-usr/share/foomatic/db/source/printer/Xerox-Phaser-6115MFP.xml
+usr/share/foomatic/db/source/printer/Xerox-FaxCenter_2121.xml
+usr/share/foomatic/db/source/printer/Xerox-FaxCentre_2218.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_1235.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_2135.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_3110.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_3124.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_3150.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_3160N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_3200MFP.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_3400.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_3450.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_3500.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_4400B.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_4400DT.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_4400DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_4400N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_4500B.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_4500DT.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_4500DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_4500N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_4510.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_4510B.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_4510DT.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_4510DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_4510N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_5500.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_5500B.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_5500DN.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_5500DT.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_5500DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_5500N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6100.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6110.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6115MFP.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6120.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6121MFP.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6125.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6130.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6130N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6180.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6180DN.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6180MFP-D.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6200B.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6200DP.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6200DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6200N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6250B.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6250DP.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6250DT.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6250DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6250N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6300DN.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6300N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6350DP.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6350DT.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6350DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6360.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6360DN.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_6360DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7300B.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7300DN.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7300DT.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7300DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7300N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7400.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7400DN.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7400DT.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7400DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7400DXF.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7400N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7700DN.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7700DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7700GX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7750B.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7750DN.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7750DXF.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7750GX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7760.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7760DN.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7760DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_7760GX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_790.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8200B.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8200DP.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8200DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8200N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8400B.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8400BD.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8400DP.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8400DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8400N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8500DN.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8500N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8550DP.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8550DT.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8550DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8560.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8560DN.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_860B.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_860DP.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_860DX.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_860N.xml
+usr/share/foomatic/db/source/printer/Xerox-Phaser_8860.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_24.xml
usr/share/foomatic/db/source/printer/Xerox-WorkCentre_385.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_4118.xml
usr/share/foomatic/db/source/printer/Xerox-WorkCentre_450cp.xml
usr/share/foomatic/db/source/printer/Xerox-WorkCentre_470cx.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_6015.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_7228.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_7232.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_7242.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_7328.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_7335.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_7345.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_C2424.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_M118.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_M20.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_M24.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_PE120.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_Pro_128.xml
+usr/share/foomatic/db/source/printer/Xerox-WorkCentre_Pro_133.xml
usr/share/foomatic/db/source/printer/Xerox-WorkCentre_XD120f.xml
usr/share/foomatic/db/source/printer/Xerox-WorkCentre_XE80.xml
usr/share/foomatic/db/source/printer/Xerox-WorkCentre_XE90fx.xml
usr/share/foomatic/db/source/printer/Xerox-WorkCentre_XK35c.xml
-#usr/share/foomatic/templates
-usr/share/foomatic/templates/pjl_enum_choice.xml
-usr/share/foomatic/templates/pjl_enum_option.xml
-usr/share/foomatic/templates/pjl_num_option.xml
+#usr/share/foomatic/xmlschema
+usr/share/foomatic/xmlschema/driver.xsd
+usr/share/foomatic/xmlschema/option.xsd
+usr/share/foomatic/xmlschema/printer.xsd
+usr/share/foomatic/xmlschema/types.xsd
+#usr/share/man/man1/foomatic-combo-xml.1
+#usr/share/man/man1/foomatic-compiledb.1
+#usr/share/man/man1/foomatic-configure.1
+#usr/share/man/man1/foomatic-perl-data.1
+#usr/share/man/man1/foomatic-ppd-options.1
+#usr/share/man/man1/foomatic-ppdfile.1
+#usr/share/man/man1/foomatic-printjob.1
+#usr/share/man/man1/foomatic-rip.1
+#usr/share/man/man8/foomatic-addpjloptions.8
+#usr/share/man/man8/foomatic-getpjloptions.8
+#usr/share/man/man8/foomatic-kitload.8
+#usr/share/man/man8/foomatic-preferred-driver.8
+var/cache/foomatic
diff --git a/config/rootfiles/packages/gutenprint b/config/rootfiles/packages/gutenprint
index a65efb4..3671a78 100644
--- a/config/rootfiles/packages/gutenprint
+++ b/config/rootfiles/packages/gutenprint
@@ -37,7 +37,7 @@ usr/lib/gutenprint/5.2/modules
#usr/lib/libgutenprint.la
usr/lib/libgutenprint.so
usr/lib/libgutenprint.so.2
-usr/lib/libgutenprint.so.2.0.6
+usr/lib/libgutenprint.so.2.1.0
#usr/lib/pkgconfig/gutenprint.pc
usr/sbin/cups-genppd.5.2
usr/sbin/cups-genppdupdate
@@ -77,6 +77,7 @@ usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_blacktrans-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_bluedensity-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_borderless.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_brightness-1.xml
+usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cdallowothermedia.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cdinnerradius.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cdxadjustment-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cdyadjustment-1.xml
@@ -163,10 +164,14 @@ usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablemagentabalance.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablemagentadensity.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablemagentagamma.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableorangedensity.xml
+usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablepagedrytime.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablepaperthickness.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableplatengap.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableprintmethod.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablereddensity.xml
+usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablescandrytime.xml
+usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablescanmindrytime.xml
+usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablesubchannelcutoff.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablevacuumintensity.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableyellowbalance.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableyellowdensity.xml
@@ -212,6 +217,8 @@ usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-3.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-4.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-5.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-6.xml
+usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-7.xml
+usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-8.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inkset.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inktype.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inputslot.xml
@@ -234,6 +241,7 @@ usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_magentadensity-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_magentagamma-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_mediatype.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_orangedensity-1.xml
+usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_pagedrytime-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_paperthickness-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_platengap-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_printingdirection.xml
@@ -241,6 +249,9 @@ usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_printmethod-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_quality.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_reddensity-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_resolution.xml
+usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_scandrytime-1.xml
+usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_scanmindrytime-1.xml
+usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_subchannelcutoff-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_usegloss.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_vacuumintensity-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_weave.xml
@@ -274,6 +285,7 @@ usr/share/gutenprint/5.2/xml/escp2/inks/f360_photo7_japan.xml
usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome.xml
usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome_k3.xml
usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome_k3v.xml
+usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome_k3v_2.xml
usr/share/gutenprint/5.2/xml/escp2/inks/nx100.xml
usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen0.xml
usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen1.xml
@@ -289,6 +301,9 @@ usr/share/gutenprint/5.2/xml/escp2/inks/pro_gen2.xml
usr/share/gutenprint/5.2/xml/escp2/inks/pro_pigment.xml
usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome.xml
usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3.xml
+usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k34.xml
+usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3v.xml
+usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3v4.xml
usr/share/gutenprint/5.2/xml/escp2/inks/standard.xml
usr/share/gutenprint/5.2/xml/escp2/inks/standard_gen0.xml
usr/share/gutenprint/5.2/xml/escp2/inks/ultrachrome.xml
@@ -303,6 +318,8 @@ usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_cutter_roll_feed.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_roll_feed.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/cutter_roll_feed.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/default.xml
+usr/share/gutenprint/5.2/xml/escp2/inputslots/pro3880.xml
+usr/share/gutenprint/5.2/xml/escp2/inputslots/pro_cutter_roll_feed.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/pro_roll_feed.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/r1800.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/r2400.xml
@@ -340,11 +357,13 @@ usr/share/gutenprint/5.2/xml/escp2/media/photo_gen4.xml
usr/share/gutenprint/5.2/xml/escp2/media/photo_pigment.xml
usr/share/gutenprint/5.2/xml/escp2/media/picturemate_4.xml
usr/share/gutenprint/5.2/xml/escp2/media/picturemate_6.xml
+usr/share/gutenprint/5.2/xml/escp2/media/pro3880_ultrachrome_k3v.xml
usr/share/gutenprint/5.2/xml/escp2/media/pro_gen1.xml
usr/share/gutenprint/5.2/xml/escp2/media/pro_gen2.xml
usr/share/gutenprint/5.2/xml/escp2/media/pro_pigment.xml
usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome.xml
usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome_k3.xml
+usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome_k3v.xml
usr/share/gutenprint/5.2/xml/escp2/media/r800.xml
usr/share/gutenprint/5.2/xml/escp2/media/standard.xml
usr/share/gutenprint/5.2/xml/escp2/media/standard_gen0.xml
@@ -358,7 +377,24 @@ usr/share/gutenprint/5.2/xml/escp2/model/model_0.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_1.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_10.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_100.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_101.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_102.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_103.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_104.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_105.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_106.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_107.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_108.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_109.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_11.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_110.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_111.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_112.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_113.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_114.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_115.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_116.xml
+usr/share/gutenprint/5.2/xml/escp2/model/model_117.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_12.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_13.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_14.xml
@@ -458,6 +494,7 @@ usr/share/gutenprint/5.2/xml/escp2/model/model_99.xml
#usr/share/gutenprint/5.2/xml/escp2/qualitypresets
usr/share/gutenprint/5.2/xml/escp2/qualitypresets/p1_5.xml
usr/share/gutenprint/5.2/xml/escp2/qualitypresets/picturemate.xml
+usr/share/gutenprint/5.2/xml/escp2/qualitypresets/prox900.xml
usr/share/gutenprint/5.2/xml/escp2/qualitypresets/standard.xml
usr/share/gutenprint/5.2/xml/escp2/qualitypresets/v2880.xml
usr/share/gutenprint/5.2/xml/escp2/qualitypresets/wf40.xml
@@ -508,16 +545,20 @@ usr/share/gutenprint/samples/testpattern.sample
#usr/share/locale/cs/gutenprint_cs.po
#usr/share/locale/da/LC_MESSAGES/gutenprint.mo
#usr/share/locale/da/gutenprint_da.po
-usr/share/locale/de/LC_MESSAGES/gutenprint.mo
-usr/share/locale/de/gutenprint_de.po
+#usr/share/locale/de/LC_MESSAGES/gutenprint.mo
+#usr/share/locale/de/gutenprint_de.po
#usr/share/locale/el/LC_MESSAGES/gutenprint.mo
#usr/share/locale/el/gutenprint_el.po
#usr/share/locale/en_GB/LC_MESSAGES/gutenprint.mo
#usr/share/locale/en_GB/gutenprint_en_GB.po
#usr/share/locale/es/LC_MESSAGES/gutenprint.mo
#usr/share/locale/es/gutenprint_es.po
+#usr/share/locale/fi/LC_MESSAGES/gutenprint.mo
+#usr/share/locale/fi/gutenprint_fi.po
#usr/share/locale/fr/LC_MESSAGES/gutenprint.mo
#usr/share/locale/fr/gutenprint_fr.po
+#usr/share/locale/gl/LC_MESSAGES/gutenprint.mo
+#usr/share/locale/gl/gutenprint_gl.po
#usr/share/locale/hu/LC_MESSAGES/gutenprint.mo
#usr/share/locale/hu/gutenprint_hu.po
#usr/share/locale/it/LC_MESSAGES/gutenprint.mo
@@ -536,12 +577,18 @@ usr/share/locale/de/gutenprint_de.po
#usr/share/locale/ru/gutenprint_ru.po
#usr/share/locale/sk/LC_MESSAGES/gutenprint.mo
#usr/share/locale/sk/gutenprint_sk.po
+#usr/share/locale/sl/LC_MESSAGES/gutenprint.mo
+#usr/share/locale/sl/gutenprint_sl.po
#usr/share/locale/sv/LC_MESSAGES/gutenprint.mo
#usr/share/locale/sv/gutenprint_sv.po
+#usr/share/locale/uk/LC_MESSAGES/gutenprint.mo
+#usr/share/locale/uk/gutenprint_uk.po
+#usr/share/locale/zh_CN/LC_MESSAGES/gutenprint.mo
+#usr/share/locale/zh_CN/gutenprint_zh_CN.po
#usr/share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
#usr/share/locale/zh_TW/gutenprint_zh_TW.po
#usr/share/man/man1/escputil.1
#usr/share/man/man8/cups-calibrate.8
#usr/share/man/man8/cups-genppd.8
#usr/share/man/man8/cups-genppdupdate.8
-var/ipfire/cups/command.types
\ No newline at end of file
+var/ipfire/cups/command.types
diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent
index c0f70d1..6e6d557 100644
--- a/lfs/check_mk_agent
+++ b/lfs/check_mk_agent
@@ -24,7 +24,7 @@
include Config
-VER = 1.2.0p3
+VER = 1.2.2p2
THISAPP = check_mk_agent-$(VER)
DL_FILE = check_mk-${VER}.tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2c0f27fe8b6e3455557ecb30954d8a79
+$(DL_FILE)_MD5 = caa0f7662b4d170b2b6db2516bd41a89
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -78,6 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && tar xzf agents.tar.gz
cd $(DIR_APP) && install -v -m 755 check_mk_agent.linux /usr/bin/check_mk_agent
+ -mkdir /etc/xinetd.d
+ cd $(DIR_APP) && install -v -m 755 xinetd.conf /etc/xinetd.d/check_mk_agent
cd $(DIR_APP) && gcc $(CFLAGS) waitmax.c -o waitmax
cd $(DIR_APP) && install -v -m 755 waitmax /usr/bin/waitmax
@rm -rf $(DIR_APP)
diff --git a/lfs/cups b/lfs/cups
index f182538..08b574b 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -24,7 +24,7 @@
include Config
-VER = 1.4.8
+VER = 1.7.0
THISAPP = cups-$(VER)
DL_FILE = $(THISAPP)-source.tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/cups-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cups
-PAK_VER = 8
+PAK_VER = 9
DEPS = "ghostscript"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0ec52d3f3c69bc2ab5ed70c594edbce6
+$(DL_FILE)_MD5 = 5ab496a2ce27017fcdb3d7ec4818a75a
install : $(TARGET)
@@ -77,12 +77,22 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --disable-nls --sysconfdir=/var/ipfire \
- --enable-libusb=no
+ cd $(DIR_APP) && \
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/var/ipfire \
+ --localstatedir=/var \
+ --enable-libusb \
+ --disable-dbus \
+ --disable-avahi
+
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
+
cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
+
install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/cups /etc/rc.d/init.d
cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/foomatic b/lfs/foomatic
index 712247f..15abf53 100644
--- a/lfs/foomatic
+++ b/lfs/foomatic
@@ -24,37 +24,41 @@
include Config
-DATE = 20070813
-VER = 3.0-20070813
+VER = 4.0.9
+VER_DB = 4.0-$(DATE)
+VER_FILTERS = 4.0.17
+DATE = 20131023
THISAPP = foomatic-$(VER)
-DL_FILE = foomatic-filters-$(VER).tar.gz
+DL_FILE = foomatic-filters-$(VER_FILTERS).tar.gz
DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/foomatic-filters-$(VER)
+DIR_APP = $(DIR_SRC)/foomatic-filters-$(VER_FILTERS)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = foomatic
-PAK_VER = 1
+PAK_VER = 2
DEPS = "cups ghostscript libtiff hplip"
+export LIB_CUPS=/usr/lib/cups
+export CUPS_BACKENDS=/usr/lib/cups/backends
+export CUPS_FILTERS=/usr/lib/cups/filters
+export CUPS_PPDS=/usr/share/cups/model
+
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE) \
- foomatic-db-$(DATE).tar.gz \
- foomatic-db-engine-$(VER).tar.gz \
- foomatic-db-hpijs-$(DATE).tar.gz
+ foomatic-db-$(VER_DB).tar.gz \
+ foomatic-db-engine-$(VER).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-foomatic-db-$(DATE).tar.gz = $(DL_FROM)/foomatic-db-$(DATE).tar.gz
+foomatic-db-$(VER_DB).tar.gz = $(DL_FROM)/foomatic-db-$(VER_DB).tar.gz
foomatic-db-engine-$(VER).tar.gz = $(DL_FROM)/foomatic-db-engine-$(VER).tar.gz
-foomatic-db-hpijs-$(DATE).tar.gz = $(DL_FROM)/foomatic-db-hpijs-$(DATE).tar.gz
-$(DL_FILE)_MD5 = 41de0f45866ab4c19c1d5e3e2cdab42f
-foomatic-db-$(DATE).tar.gz_MD5 = a3ab04b7cc5d870b040ffce19e664698
-foomatic-db-engine-$(VER).tar.gz_MD5 = ec9639719a9c1d4095248e534c3f2d0d
-foomatic-db-hpijs-$(DATE).tar.gz_MD5 = e59fa189336e96a9d43cfcfb6222a9c2
+$(DL_FILE)_MD5 = b05f5dcbfe359f198eef3df5b283d896
+foomatic-db-$(VER_DB).tar.gz_MD5 = ffe38b354cb06a1f3d5e3b01b7e58b0e
+foomatic-db-engine-$(VER).tar.gz_MD5 = 5b33c1adb21e7b6f3652e9a18d0e6f4e
install : $(TARGET)
@@ -86,11 +90,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_SRC)/foomatic-* /usr/share/foomatic && cd $(DIR_SRC) && \
+ @rm -rf $(DIR_SRC)/foomatic-* && cd $(DIR_SRC) && \
tar zxf $(DIR_DL)/$(DL_FILE) && \
- tar zxf $(DIR_DL)/foomatic-db-$(DATE).tar.gz && \
- tar zxf $(DIR_DL)/foomatic-db-engine-$(VER).tar.gz && \
- tar zxf $(DIR_DL)/foomatic-db-hpijs-$(DATE).tar.gz
+ tar zxf $(DIR_DL)/foomatic-db-$(VER_DB).tar.gz && \
+ tar zxf $(DIR_DL)/foomatic-db-engine-$(VER).tar.gz
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@@ -100,8 +103,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_SRC)/foomatic-db-engine-$(VER) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_SRC)/foomatic-db-engine-$(VER) && make $(MAKETUNING)
cd $(DIR_SRC)/foomatic-db-engine-$(VER) && make install
- cd $(DIR_SRC)/foomatic-db-hpijs-$(DATE) && ./configure --prefix=/usr --sysconfdir=/etc
- cd $(DIR_SRC)/foomatic-db-hpijs-$(DATE) && make $(MAKETUNING)
- cd $(DIR_SRC)/foomatic-db-hpijs-$(DATE) && make install
+
+ # Remove unwanted files
+ rm -rfv /usr/lib/ppr \
+ /etc/foomatic/filter.conf.sample \
+ /usr/share/foomatic/templates
+
+ -mkdir -pv /var/cache/foomatic
+
+ -mkdir -pv /etc/foomatic
+ echo "cups" > /etc/foomatic/defaultspooler
+
+ -mkdir -pv /usr/lib/cups/filter
+ ln -svf ../../../bin/foomatic-rip /usr/lib/cups/filter/foomatic-rip
+ ln -svf ../../../bin/foomatic-ppdfile /usr/lib/cups/filter/foomatic-ppdfile
+
@rm -rf $(DIR_SRC)/foomatic-*
@$(POSTBUILD)
diff --git a/lfs/gutenprint b/lfs/gutenprint
index a1bc343..1124a3f 100644
--- a/lfs/gutenprint
+++ b/lfs/gutenprint
@@ -24,7 +24,7 @@
include Config
-VER = 5.2.5
+VER = 5.2.9
THISAPP = gutenprint-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = gutenprint
-PAK_VER = 2
+PAK_VER = 3
DEPS = "cups"
@@ -44,7 +44,8 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 10a0a9fac081d8116ec5ed47fbc1591c
+$(DL_FILE)_MD5 = aefbec27b96dd404d9ac9811e17d58ce
+
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
diff --git a/lfs/libusbx b/lfs/libusbx
new file mode 100644
index 0000000..167b945
--- /dev/null
+++ b/lfs/libusbx
@@ -0,0 +1,78 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.0.11
+
+THISAPP = libusbx-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 9aaab6aee72f65900cc731ecbffb4cf4
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr \
+ --enable-examples-build
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/mpage b/lfs/mpage
new file mode 100644
index 0000000..b93fb06
--- /dev/null
+++ b/lfs/mpage
@@ -0,0 +1,77 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2.5.6
+
+THISAPP = mpage-$(VER)
+DL_FILE = $(THISAPP).tgz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 489663c9246e47915cea931348e5175d
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mpage25-config.patch
+ cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/nagios b/lfs/nagios
index 2bb2a41..a9cef53 100644
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -103,7 +103,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_SRC)/nagios-plugins* && ./configure --prefix=/usr \
--libexecdir=/usr/lib/nagios \
--with-nagios-user=nobody --with-nagios-group=nobody
- cd $(DIR_SRC)/nagios-plugins* && make $(MAKETUNING)
+ cd $(DIR_SRC)/nagios-plugins* && make
cd $(DIR_SRC)/nagios-plugins* && make install
chown -R nobody:nobody /var/nagios
ln -s /etc/init.d/nagios /etc/rc.d/rc3.d/S67nagios
diff --git a/lfs/strongswan b/lfs/strongswan
index 9ac2e68..f573cd8 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
include Config
-VER = 5.1.0
+VER = 5.1.1dr4
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c1cd0a3ba9960f590cae28c8470800e8
+$(DL_FILE)_MD5 = 05899faa9b8a8f253474af809b283ef9
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 6130892..0101bb0 100755
--- a/make.sh
+++ b/make.sh
@@ -386,6 +386,7 @@ buildipfire() {
ipfiremake dhcp
ipfiremake dhcpcd
ipfiremake libusb
+ ipfiremake libusbx
ipfiremake libpcap
ipfiremake ppp
ipfiremake pptp
@@ -594,6 +595,8 @@ buildipfire() {
ipfiremake lzo
ipfiremake openvpn
ipfiremake pammysql
+ ipfiremake mpage
+ ipfiremake dbus
ipfiremake cups
ipfiremake ghostscript
ipfiremake foomatic
@@ -692,7 +695,6 @@ buildipfire() {
ipfiremake syslinux
ipfiremake tftpd
ipfiremake cpufrequtils
- ipfiremake dbus
ipfiremake bluetooth
ipfiremake gutenprint
ipfiremake apcupsd
diff --git a/src/paks/check_mk_agent/install.sh b/src/paks/check_mk_agent/install.sh
index 682363b..6aed752 100644
--- a/src/paks/check_mk_agent/install.sh
+++ b/src/paks/check_mk_agent/install.sh
@@ -24,3 +24,13 @@
. /opt/pakfire/lib/functions.sh
extract_files
restore_backup ${NAME}
+
+mkdir -p /usr/lib/check_mk_agent/plugins
+
+if [[ -x /usr/sbin/xinetd ]];
+then
+ if [[ -x /etc/init.d/xinetd ]]
+ then
+ /etc/init.d/xinetd restart
+ fi
+fi
diff --git a/src/paks/check_mk_agent/uninstall.sh b/src/paks/check_mk_agent/uninstall.sh
index 66f4344..3a0860a 100644
--- a/src/paks/check_mk_agent/uninstall.sh
+++ b/src/paks/check_mk_agent/uninstall.sh
@@ -24,3 +24,11 @@
. /opt/pakfire/lib/functions.sh
make_backup ${NAME}
remove_files
+
+if [[ -x /usr/sbin/xinetd ]];
+then
+ if [[ -x /etc/init.d/xinetd ]]
+ then
+ /etc/init.d/xinetd restart
+ fi
+fi
diff --git a/src/patches/mpage25-config.patch b/src/patches/mpage25-config.patch
new file mode 100644
index 0000000..fefc547
--- /dev/null
+++ b/src/patches/mpage25-config.patch
@@ -0,0 +1,46 @@
+diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile
+--- mpage-2.5.6/Makefile.config 2004-05-30 21:38:31.000000000 +0200
++++ mpage-2.5.6/Makefile 2009-03-27 11:11:14.652186064 +0100
+@@ -40,7 +40,7 @@ CC=gcc
+ # See glob.c for all possibilities
+ #
+ # PAGESIZE=Letter
+-PAGESIZE=A4
++PAGESIZE=Letter
+
+ #
+ # Define your spooler type
+@@ -50,7 +50,7 @@ PAGESIZE=A4
+ SPOOL_TYPE=BSD_SPOOLER
+
+ # PREFIX=e:/usr # OS/2 type
+-PREFIX=/usr/local
++PREFIX=/usr
+ #PREFIX=/usr
+ BINDIR=$(PREFIX)/bin
+ LIBDIR=$(PREFIX)/share
+@@ -73,7 +73,7 @@ SHEETMARGIN=18
+ #
+ DEFAULT_DUPLEX=0
+
+-DEFS = -DPAGE_DEF=\"${PAGESIZE}\" -DLIBDIR=\"${LIBDIR}/mpage\" -DDEFAULT_ENCODING=${ENCODING} -DDEFAULT_DUPLEX=${DEFAULT_DUPLEX} -DDEFAULTSMARGIN=${SHEETMARGIN} -DSPOOLER=${SPOOL_TYPE} # -DKANJI
++DEFS = -DPAGE_DEF=\"${PAGESIZE}\" -DLIBDIR=\"${LIBDIR}/mpage\" -DDEFAULT_ENCODING=${ENCODING} -DDEFAULT_DUPLEX=${DEFAULT_DUPLEX} -DDEFAULTSMARGIN=${SHEETMARGIN} -DSPOOLER=${SPOOL_TYPE} -DKANJI
+
+
+ ############################################################################
+@@ -107,7 +107,7 @@ O = .o
+ # If you are using gcc, you probably don't need to change anything here.
+
+ # Linux:
+-CFLAGS = -O2 -s $(DEFS) -Wall
++CFLAGS = $(RPM_OPT_FLAGS) $(DEFS) -Wall
+
+ # AIX (xlC on aix 4):
+ #CFLAGS = -O2 -s $(DEFS)
+@@ -183,5 +183,4 @@ install:
+ if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi
+ cp mpage$(E) $(BINDIR)
+ cp mpage.1 $(MANDIR)
+- -cp Encodings/* $(LIBDIR)/mpage
+- -chmod 644 $(LIBDIR)/mpage/*
++ install -p -m 644 Encodings/* $(LIBDIR)/mpage
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 901aa8b943e6442e4b3540a73fe7c79c9a9cd419
by git＠ipfire.org 25 Oct '13
by git＠ipfire.org 25 Oct '13
25 Oct '13
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, fifteen has been updated
via 901aa8b943e6442e4b3540a73fe7c79c9a9cd419 (commit)
via 39e360b26c3815adfb32ead9ea5e782898ca97c2 (commit)
via 9c89c64de19f43d77e2bc720fef2b58486472878 (commit)
via 85f129fe3cac3f5161a6451e137084d91282472a (commit)
via 8039a71099eafbec9fb280ce9caff2c069bdff7f (commit)
via 6d8eb5dec7bf36f9b1bd53c9354d980aea315d89 (commit)
via 6921f0ea0a62b09fd3bb9772ffc50b86b49bef97 (commit)
via 11760a707510a5173f41c58551e03438043f36d6 (commit)
from b161bfa8683402036e0d3e08159aafda5d4c4310 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 901aa8b943e6442e4b3540a73fe7c79c9a9cd419
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 25 11:40:06 2013 +0200
firewall: Fix layout of protocol selection.
commit 39e360b26c3815adfb32ead9ea5e782898ca97c2
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Thu Oct 24 16:24:45 2013 +0200
Firewall: added missing translation for short IPv6 protcol in ruletable
commit 9c89c64de19f43d77e2bc720fef2b58486472878
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Thu Oct 24 16:04:26 2013 +0200
Firewall: rename Protocol 41 in Dropdown and ruletable ->Now "IPv6 Encapsulation (protocol 41)" in dropdown and "IPv6 Encap" in ruletable
commit 85f129fe3cac3f5161a6451e137084d91282472a
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Thu Oct 24 14:16:03 2013 +0200
Firewall: fix deleted files from core fifteen firewall
commit 8039a71099eafbec9fb280ce9caff2c069bdff7f
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Thu Oct 24 09:42:42 2013 +0200
Firewall: renamed forwardfwctrl to firewallctrl
commit 6d8eb5dec7bf36f9b1bd53c9354d980aea315d89
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Thu Oct 24 09:24:12 2013 +0200
Firewall: Renamed directory /var/ipfire/forward to /var/ipfire/firewall
commit 6921f0ea0a62b09fd3bb9772ffc50b86b49bef97
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Thu Oct 24 08:15:48 2013 +0200
Firewall: renamed /config/forwardfw to config/firewall
commit 11760a707510a5173f41c58551e03438043f36d6
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Thu Oct 24 07:59:42 2013 +0200
Firewall: Added protocols IPv6 (41) and IPIP (94)
-----------------------------------------------------------------------
Summary of changes:
config/backup/backup.pl | 47 ++---
config/backup/exclude | 3 +-
config/backup/include | 2 +-
config/cfgroot/general-functions.pl | 4 +-
config/{forwardfw => firewall}/convert-dmz | 2 +-
config/{forwardfw => firewall}/convert-outgoingfw | 12 +-
config/{forwardfw => firewall}/convert-portfw | 4 +-
config/{forwardfw => firewall}/convert-xtaccess | 2 +-
config/{forwardfw => firewall}/firewall-lib.pl | 0
config/{forwardfw => firewall}/firewall-policy | 2 +-
config/{forwardfw => firewall}/p2protocols | 0
config/{forwardfw => firewall}/rules.pl | 18 +-
config/rootfiles/common/configroot | 22 +-
config/rootfiles/common/misc-progs | 2 +-
config/rootfiles/core/fifteen/filelists/firewall | 18 +-
html/cgi-bin/firewall.cgi | 221 +++++++++++----------
html/cgi-bin/fwhosts.cgi | 4 +-
html/cgi-bin/optionsfw.cgi | 14 +-
html/cgi-bin/ovpnmain.cgi | 2 +-
html/cgi-bin/p2p-block.cgi | 2 +-
langs/de/cgi-bin/de.pl | 2 +
langs/en/cgi-bin/en.pl | 2 +
lfs/configroot | 26 +--
lfs/initscripts | 2 +-
src/initscripts/init.d/firewall | 2 +-
src/misc-progs/Makefile | 6 +-
src/misc-progs/{forwardfwctrl.c => firewallctrl.c} | 4 +-
27 files changed, 216 insertions(+), 209 deletions(-)
rename config/{forwardfw => firewall}/convert-dmz (99%)
rename config/{forwardfw => firewall}/convert-outgoingfw (98%)
rename config/{forwardfw => firewall}/convert-portfw (98%)
rename config/{forwardfw => firewall}/convert-xtaccess (98%)
rename config/{forwardfw => firewall}/firewall-lib.pl (100%)
rename config/{forwardfw => firewall}/firewall-policy (98%)
rename config/{forwardfw => firewall}/p2protocols (100%)
rename config/{forwardfw => firewall}/rules.pl (97%)
rename src/misc-progs/{forwardfwctrl.c => firewallctrl.c} (79%)
Difference in files:
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 28e2dd8..5424a1e 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -66,15 +66,15 @@ elsif ($ARGV[0] eq 'restore') {
system("/usr/sbin/ovpn-ccd-convert");
#OUTGOINGFW CONVERTER
if( -d "${General::swroot}/outgoing"){
- if( -f "${General::swroot}/forward/config" ){
- unlink("${General::swroot}/forward/config");
- system("touch ${General::swroot}/forward/config");
- chown 99,99,"${General::swroot}/forward/config";
+ if( -f "${General::swroot}/firewall/config" ){
+ unlink("${General::swroot}/firewall/config");
+ system("touch ${General::swroot}/firewall/config");
+ chown 99,99,"${General::swroot}/firewall/config";
}
- if( -f "${General::swroot}/forward/outgoing" ){
- unlink("${General::swroot}/forward/outgoing");
- system("touch ${General::swroot}/forward/outgoing");
- chown 99,99,"${General::swroot}/forward/outgoing";
+ if( -f "${General::swroot}/firewall/outgoing" ){
+ unlink("${General::swroot}/firewall/outgoing");
+ system("touch ${General::swroot}/firewall/outgoing");
+ chown 99,99,"${General::swroot}/firewall/outgoing";
}
unlink("${General::swroot}/fwhosts/customgroups");
unlink("${General::swroot}/fwhosts/customhosts");
@@ -97,38 +97,33 @@ elsif ($ARGV[0] eq 'restore') {
}
#XTACCESS CONVERTER
if( -d "${General::swroot}/xtaccess"){
- if( -f "${General::swroot}/forward/input" ){
- unlink("${General::swroot}/forward/input");
- system("touch ${General::swroot}/forward/input");
+ if( -f "${General::swroot}/firewall/input" ){
+ unlink("${General::swroot}/firewall/input");
+ system("touch ${General::swroot}/firewall/input");
}
#START CONVERTER "XTACCESS"
system("/usr/sbin/convert-xtaccess");
- chown 99,99,"${General::swroot}/forward/input";
+ chown 99,99,"${General::swroot}/firewall/input";
rmtree("${General::swroot}/xtaccess");
}
#DMZ-HOLES CONVERTER
- if( -d "${General::swroot}/dmzholes"){
- if( -f "${General::swroot}/forward/dmz" ){
- unlink("${General::swroot}/forward/dmz");
- system("touch ${General::swroot}/forward/dmz");
+ if( -d "${General::swroot}/dmzholes" || -d "${General::swroot}/portfw"){
+ if( -f "${General::swroot}/firewall/config" ){
+ unlink("${General::swroot}/firewall/config");
+ system("touch ${General::swroot}/firewall/config");
}
#START CONVERTER "DMZ-HOLES"
system("/usr/sbin/convert-dmz");
- chown 99,99,"${General::swroot}/forward/dmz";
+ chown 99,99,"${General::swroot}/firewall/config";
rmtree("${General::swroot}/dmzholes");
}
#PORTFORWARD CONVERTER
if( -d "${General::swroot}/portfw"){
- if( -f "${General::swroot}/forward/nat" ){
- unlink("${General::swroot}/forward/nat");
- system("touch ${General::swroot}/forward/nat");
- }
- #START CONVERTER "PORTFW"
- system("/usr/sbin/convert-portfw");
- chown 99,99,"${General::swroot}/forward/nat";
- rmtree("${General::swroot}/portfw");
+ #START CONVERTER "PORTFW"
+ System("/usr/sbin/convert-portfw");
+ rmtree("${General::swroot}/portfw");
}
- system("/usr/local/bin/forwardfwctrl");
+ system("/usr/local/bin/firewallctrl");
}
elsif ($ARGV[0] eq 'restoreaddon') {
if ( -e "/tmp/$ARGV[1]" ){system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");}
diff --git a/config/backup/exclude b/config/backup/exclude
index 41ae8b5..83db234 100644
--- a/config/backup/exclude
+++ b/config/backup/exclude
@@ -1,7 +1,6 @@
*.tmp
/var/ipfire/ethernet/settings
-/var/ipfire/forward/bin/*
+/var/ipfire/firewall/bin/*
/var/ipfire/proxy/calamaris/bin/*
/var/ipfire/qos/bin/qos.pl
/var/ipfire/urlfilter/blacklists/*/*.db
-/var/ipfire/forward/bin/*
diff --git a/config/backup/include b/config/backup/include
index 551b52d..1d55e4a 100644
--- a/config/backup/include
+++ b/config/backup/include
@@ -15,7 +15,7 @@
/var/ipfire/auth/users
/var/ipfire/dhcp/*
/var/ipfire/dnsforward/*
-/var/ipfire/forward
+/var/ipfire/firewall
/var/ipfire/fwhosts
/var/ipfire/main/*
/var/ipfire/ovpn
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 8236f07..48d68a2 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -1137,7 +1137,7 @@ sub write_file_utf8 ($) {
return;
}
-my $FIREWALL_RELOAD_INDICATOR = "${General::swroot}/forward/reread";
+my $FIREWALL_RELOAD_INDICATOR = "${General::swroot}/firewall/reread";
sub firewall_config_changed() {
open FILE, ">$FIREWALL_RELOAD_INDICATOR" or die "Could not open $FIREWALL_RELOAD_INDICATOR";
@@ -1153,7 +1153,7 @@ sub firewall_needs_reload() {
}
sub firewall_reload() {
- system("/usr/local/bin/forwardfwctrl");
+ system("/usr/local/bin/firewallctrl");
}
1;
diff --git a/config/firewall/convert-dmz b/config/firewall/convert-dmz
new file mode 100755
index 0000000..0f7c68e
--- /dev/null
+++ b/config/firewall/convert-dmz
@@ -0,0 +1,193 @@
+#!/usr/bin/perl
+
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+# #
+# This script converts old dmz holes rules from old firewall #
+# to the new one. This is a 2-step process. #
+# STEP1: read old config and normalize settings #
+# STEP2: check valid ip and save valid rules to new firewall #
+# #
+###############################################################################
+my @current=();
+my @alias=();
+my %configdmz=();
+my %ifaces=();
+my %configfwdfw=();
+require '/var/ipfire/general-functions.pl';
+my $dmzconfig = "${General::swroot}/dmzholes/config";
+my $fwdfwconfig = "${General::swroot}/firewall/config";
+my $ifacesettings = "${General::swroot}/ethernet/settings";
+my $field0 = 'ACCEPT';
+my $field1 = 'FORWARDFW';
+my $field2 = ''; #ON or emtpy
+my $field3 = ''; #std_net_src or src_addr
+my $field4 = ''; #ALL or IP-Address with /32
+my $field5 = ''; #std_net_tgt or tgt_addr
+my $field6 = ''; #IP or network name
+my $field11 = 'ON'; #use target port
+my $field12 = ''; #TCP or UDP
+my $field13 = 'All ICMP-Types';
+my $field14 = 'TGT_PORT';
+my $field15 = ''; #Port Number
+my $field16 = ''; #remark
+my $field26 = '00:00';
+my $field27 = '00:00';
+my $field28 = '';
+my $field29 = 'ALL';
+my $field30 = '';
+my $field31 = 'dnat';
+
+
+open(FILE, $dmzconfig) or die 'Unable to open config file.';
+my @current = <FILE>;
+close(FILE);
+#open LOGFILE
+open (LOG, ">/var/log/converters/dmz-convert.log") or die $!;
+&General::readhash($ifacesettings, \%ifaces);
+&General::readhasharray($fwdfwconfig,\%configfwdfw);
+&process_rules;
+sub process_rules{
+ foreach my $line (@current){
+ my $now=localtime;
+ #get values from old configfile
+ my ($a,$b,$c,$d,$e,$f,$g,$h) = split (",",$line);
+ $h =~ s/\s*\n//gi;
+ print LOG "$now Processing A: $a B: $b C: $c D: $d E: $e F: $f G: $g H: $h\n";
+ #Now convert values and check ip addresses
+ $a=uc($a);
+ $e=uc($e);
+ $field2=$e if($e eq 'ON');
+ #SOURCE IP-check
+ $b=&check_ip($b);
+ if (&General::validipandmask($b)){
+ #When ip valid, check if we have a network
+ my ($ip,$subnet) = split ("/",$b);
+ if ($f eq 'orange' && $ip eq $ifaces{'ORANGE_NETADDRESS'}){
+ $field3='std_net_src';
+ $field4='ORANGE';
+ }elsif($f eq 'blue' && $ip eq $ifaces{'BLUE_NETADDRESS'}){
+ $field3='std_net_src';
+ $field4='BLUE';
+ }elsif($f eq 'orange' && &General::IpInSubnet($ip,$ifaces{'ORANGE_NETADDRESS'},$ifaces{'ORANGE_NETMASK'})){
+ $field3='src_addr';
+ $field4=$b;
+ }elsif($f eq 'blue' && &General::IpInSubnet($ip,$ifaces{'BLUE_NETADDRESS'},$ifaces{'BLUE_NETMASK'})){
+ $field3='src_addr';
+ $field4=$b;
+ }else{
+ print LOG "$now ->NOT Converted, source ip $b not part of source network $f \n\n";
+ next;
+ }
+ }else{
+ print LOG "$now -> SOURCE IP INVALID. \n\n";
+ next;
+ }
+ #TARGET IP-check
+ $c=&check_ip($c);
+ if (&General::validipandmask($c)){
+ my $now=localtime;
+ #When ip valid, check if we have a network
+ my ($ip,$subnet) = split ("/",$c);
+ if ($g eq 'green' && $ip eq $ifaces{'GREEN_NETADDRESS'}){
+ $field5='std_net_tgt';
+ $field6='GREEN';
+ }elsif($g eq 'blue' && $ip eq $ifaces{'BLUE_NETADDRESS'}){
+ $field5='std_net_tgt';
+ $field6='BLUE';
+ }elsif($g eq 'green' && &General::IpInSubnet($ip,$ifaces{'GREEN_NETADDRESS'},$ifaces{'GREEN_NETMASK'})){
+ $field5='tgt_addr';
+ $field6=$c;
+ }elsif($g eq 'blue' && &General::IpInSubnet($ip,$ifaces{'BLUE_NETADDRESS'},$ifaces{'BLUE_NETMASK'})){
+ $field5='tgt_addr';
+ $field6=$c;
+ }else{
+ print LOG "$now ->NOT Converted, target ip $c not part of target network $g \n\n";
+ next;
+ }
+ }else{
+ print LOG "$now -> TARGET IP INVALID. \n\n";
+ next;
+ }
+ $field12=$a;
+ #convert portrange
+ $d =~ tr/-/:/;
+ $field15=$d;
+ $field16=$h;
+ my $key = &General::findhasharraykey (\%configfwdfw);
+ foreach my $i (0 .. 27) { $configfwdfw{$key}[$i] = "";}
+ $configfwdfw{$key}[0] = $field0;
+ $configfwdfw{$key}[1] = $field1;
+ $configfwdfw{$key}[2] = $field2;
+ $configfwdfw{$key}[3] = $field3;
+ $configfwdfw{$key}[4] = $field4;
+ $configfwdfw{$key}[5] = $field5;
+ $configfwdfw{$key}[6] = $field6;
+ $configfwdfw{$key}[7] = '';
+ $configfwdfw{$key}[8] = '';
+ $configfwdfw{$key}[9] = '';
+ $configfwdfw{$key}[10] = '';
+ $configfwdfw{$key}[11] = $field11;
+ $configfwdfw{$key}[12] = $field12;
+ $configfwdfw{$key}[13] = $field13;
+ $configfwdfw{$key}[14] = $field14;
+ $configfwdfw{$key}[15] = $field15;
+ $configfwdfw{$key}[16] = $field16;
+ $configfwdfw{$key}[17] = '';
+ $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] = $field26;
+ $configfwdfw{$key}[27] = $field27;
+ $configfwdfw{$key}[28] = $field28;
+ $configfwdfw{$key}[29] = $field29;
+ $configfwdfw{$key}[30] = $field30;
+ $configfwdfw{$key}[31] = $field31;
+ print LOG "$Now -> Converted to $field0,$field1,$field2,$field3,$field4,$field5,$field6,,,,,$field11,$field12,$field13,$field14,$field15,$field16,,,,,,,,,,$field26,$field27\n";
+ }
+ &General::writehasharray($fwdfwconfig,\%configfwdfw);
+close (LOG);
+}
+
+sub check_ip
+{
+ my $adr=shift;
+ my $a;
+ #ip with subnet in decimal
+ if($adr =~ m/^(\d\d?\d?).(\d\d?\d?).(\d\d?\d?).(\d\d?\d?)\/(\d{1,2})$/){
+ $adr=int($1).".".int($2).".".int($3).".".int($4);
+ my $b = &General::iporsubtodec($5);
+ $a=$adr."/".$b;
+ }elsif($adr =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){
+ $adr=int($1).".".int($2).".".int($3).".".int($4);
+ if(&General::validip($adr)){
+ $a=$adr."/32";
+ }
+ }
+ if(&General::validipandmask($adr)){
+ $a=&General::iporsubtodec($adr);
+ }
+ return $a;
+}
diff --git a/config/firewall/convert-outgoingfw b/config/firewall/convert-outgoingfw
new file mode 100755
index 0000000..0d7f7d3
--- /dev/null
+++ b/config/firewall/convert-outgoingfw
@@ -0,0 +1,704 @@
+#!/usr/bin/perl
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+# #
+# This script converts old groups and firewallrules #
+# to the new one. This is a 3-step process. #
+# STEP1: convert groups ->LOG /var/log/converters #
+# STEP2: convert rules ->LOG /var/log/converters #
+# STEP3: convert P2P rules #
+# #
+###############################################################################
+
+require '/var/ipfire/general-functions.pl';
+
+use Socket;
+use File::Path;
+use File::Copy;
+
+my $ipgrouppath = "${General::swroot}/outgoing/groups/ipgroups/";
+my $macgrouppath = "${General::swroot}/outgoing/groups/macgroups/";
+my $outgoingrules = "${General::swroot}/outgoing/rules";
+my $outfwsettings = "${General::swroot}/outgoing/settings";
+my $host = "Converted ";
+my $confighosts = "${General::swroot}/fwhosts/customhosts";
+my $confignets = "${General::swroot}/fwhosts/customnetworks";
+my $configgroups = "${General::swroot}/fwhosts/customgroups";
+my $ovpnsettings = "${General::swroot}/ovpn/settings";
+my $ovpnconfig = "${General::swroot}/ovpn/ovpnconfig";
+my $ccdconfig = "${General::swroot}/ovpn/ccd.conf";
+my $fwdfwconfig = "${General::swroot}/firewall/config";
+my $outfwconfig = "${General::swroot}/firewall/outgoing";
+my $fwdfwsettings = "${General::swroot}/firewall/settings";
+my @ipgroups = qx(ls $ipgrouppath);
+my @macgroups = qx(ls $macgrouppath);
+my @hostarray=();
+my %outsettings=();
+my %hosts=();
+my %nets=();
+my %groups=();
+my %settingsovpn=();
+my %configovpn=();
+my %ccdconf=();
+my %fwconfig=();
+my %fwconfigout=();
+my %fwdsettings=();
+my %ownnet=();
+my %ovpnSettings = ();
+&General::readhash("${General::swroot}/ovpn/settings", \%ovpnSettings);
+&General::readhash($outfwsettings,\%outsettings);
+&General::readhash("${General::swroot}/ethernet/settings", \%ownnet);
+#ONLY RUN if /var/ipfire/outgoing exists
+if ( -d "/var/ipfire/outgoing"){
+ &process_groups;
+ &process_rules;
+ &process_p2p;
+}
+system("/usr/local/bin/firewallctrl");
+sub process_groups
+{
+ if(! -d "/var/log/converters"){ mkdir("/var/log/converters");}
+ if( -f "/var/log/converters/groups-convert.log"){rmtree("var/log/converters");}
+ open (LOG, ">/var/log/converters/groups-convert.log") or die $!;
+ #IP Group processing
+ foreach my $group (@ipgroups){
+ my $now=localtime;
+ chomp $group;
+ print LOG "\n$now Processing IP-GROUP: $group...\n";
+ open (DATEI, "<$ipgrouppath/$group");
+ my @zeilen = <DATEI>;
+ foreach my $ip (@zeilen){
+ chomp($ip);
+ $ip =~ s/\s//gi;
+ print LOG "$now Check IP $ip from Group $group ";
+ my $val=&check_ip($ip);
+ if($val){
+ push(@hostarray,$val.",ip");
+ print LOG "$now -> OK\n";
+ }
+ else{
+ print LOG "$now -> IP \"$ip\" from group $group not converted (invalid IP) \n";
+ }
+ $val='';
+ }
+ &new_hostgrp($group,'ip');
+ @hostarray=();
+ }
+ $group='';
+ @zeilen=();
+ @hostarray=();
+ #MAC Group processing
+ foreach my $group (@macgroups){
+ chomp $group;
+ print LOG "\nProcessing MAC-GROUP: $group...\n";
+ open (DATEI, "<$macgrouppath/$group");
+ my @zeilen = <DATEI>;
+ foreach my $mac (@zeilen){
+ chomp($mac);
+ $mac =~ s/\s//gi;
+ print LOG "$now Checking MAC $mac from group $group ";
+ #MAC checking
+ if(&General::validmac($mac)){
+ $val=$mac;
+ }
+ if($val){
+ push(@hostarray,$val.",mac");
+ print LOG "$now -> OK\n";
+ }
+ else{
+ print LOG "$now -> Mac $mac from group $group not converted (invalid MAC)\n";
+ }
+ $val='';
+ }
+ &new_hostgrp($group,'mac');
+ @hostarray=();
+ @zeilen=();
+ }
+ close (LOG);
+}
+sub check_ip
+{
+ my $adr=shift;
+ my $a;
+ #ip with subnet in decimal
+ if($adr =~ m/^(\d\d?\d?).(\d\d?\d?).(\d\d?\d?).(\d\d?\d?)\/(\d{1,2})$/){
+ $adr=int($1).".".int($2).".".int($3).".".int($4);
+ my $b = &General::iporsubtodec($5);
+ $a=$adr."/".$b;
+ }elsif($adr =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){
+ $adr=int($1).".".int($2).".".int($3).".".int($4);
+ if(&General::validip($adr)){
+ $a=$adr."/255.255.255.255";
+ }
+ }
+ if(&General::validipandmask($adr)){
+ $a=&General::iporsubtodec($adr);
+ }
+ return $a;
+}
+sub new_hostgrp
+{
+ &General::readhasharray($confighosts,\%hosts);
+ &General::readhasharray($confignets,\%nets);
+ &General::readhasharray($configgroups,\%groups);
+ my $grp=shift;
+ my $run=shift;
+ my $name; #"converted"
+ my $name2;
+ my $name3; #custom host/custom net
+ foreach my $adr (@hostarray){
+ if($run eq 'ip'){
+ my ($ip,$type) = split(",",$adr);
+ my ($ippart,$subnet) = split("/",$ip);
+ my ($byte1,$byte2,$byte3,$byte4) = split(/\./,$subnet);
+ if($byte4 eq '255'){
+ print LOG "Processing SINGLE HOST $ippart/$subnet from group $grp\n";
+ if(!&check_host($ip)){
+ my $key = &General::findhasharraykey(\%hosts);
+ $name="host ";
+ $name2=$name.$ippart;
+ $name3="Custom Host";
+ $hosts{$key}[0] = $name2;
+ $hosts{$key}[1] = $type;
+ $hosts{$key}[2] = $ip;
+ $hosts{$key}[3] = '';
+ $hosts{$key}[4] = 1;
+ print LOG "->Host (IP) $ip added to custom hosts\n"
+ }else{
+ print LOG "->Host (IP) $ip already exists in custom hosts\n";
+ $name="host ";
+ $name2=$name.$ippart;
+ foreach my $key (sort keys %hosts){
+ if($hosts{$key}[0] eq $name2){
+ $hosts{$key}[4]++;
+ }
+ }
+ $name="host ";
+ $name2=$name.$ippart;
+ $name3="Custom Host";
+ }
+ }elsif($byte4 < '255'){
+ print LOG "Processing NETWORK $ippart/$subnet from Group $grp\n";
+ if(!&check_net($ippart,$subnet)){
+ #Check if this network is one one of IPFire internal networks
+ if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ippart,$ownnet{'GREEN_NETADDRESS'},$ownnet{'GREEN_NETMASK'}))
+ {
+ $name2='GREEN';
+ $name3='Standard Network';
+ }elsif (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ippart,$ownnet{'ORANGE_NETADDRESS'},$ownnet{'ORANGE_NETMASK'}))
+ {
+ $name2='ORANGE';
+ $name3='Standard Network';
+ }elsif (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ippart,$ownnet{'BLUE_NETADDRESS'},$ownnet{'BLUE_NETMASK'}))
+ {
+ $name2='BLUE';
+ $name3='Standard Network';
+ }elsif ($ippart eq '0.0.0.0')
+ {
+ $name2='ALL';
+ $name3='Standard Network';
+ }elsif(defined($ovpnSettings{'DOVPN_SUBNET'}) && "$ippart/".&General::iporsubtodec($subnet) eq $ovpnSettings{'DOVPN_SUBNET'})
+ {
+ $name2='OpenVPN-Dyn';
+ $name3='Standard Network';
+ }else{
+ my $netkey = &General::findhasharraykey(\%nets);
+ $name="net ";
+ $name2=$name.$ippart;
+ $name3="Custom Network";
+ $nets{$netkey}[0] = $name2;
+ $nets{$netkey}[1] = $ippart;
+ $nets{$netkey}[2] = $subnet;
+ $nets{$netkey}[3] = '';
+ $nets{$netkey}[4] = 1;
+ print LOG "->Network $ippart/$subnet added to custom networks\n";
+ }
+ }else{
+ print LOG "Network $ippart already exists in custom networks\n";
+ $name="net ";
+ $name2=$name.$ippart;
+ foreach my $key (sort keys %nets){
+ if($nets{$key}[0] eq $name2){
+ $nets{$key}[4]++;
+ }
+ }
+ $name="net ";
+ $name2=$name.$ippart;
+ $name3="Custom Network";
+ }
+ }
+ if($name2 && !&check_grp($grp,$name2)){
+ my $grpkey = &General::findhasharraykey(\%groups);
+ $groups{$grpkey}[0] = $grp;
+ $groups{$grpkey}[1] = '';
+ $groups{$grpkey}[2] = $name2;
+ $groups{$grpkey}[3] = $name3;
+ $groups{$grpkey}[4] = 0;
+ print LOG "->$name2 added to group $grp\n";
+ }
+ }elsif($run eq 'mac'){
+ #MACRUN
+ my ($mac,$type) = split(",",$adr);
+ print LOG "Processing HOST (MAC) $mac\n";
+ if(!&check_host($mac)){
+ my $key = &General::findhasharraykey(\%hosts);
+ $name="host ";
+ $name2=$name.$mac;
+ $name3="Custom Host";
+ $hosts{$key}[0] = $name2;
+ $hosts{$key}[1] = $type;
+ $hosts{$key}[2] = $mac;
+ $hosts{$key}[3] = '';
+ $hosts{$key}[4] = 1;
+ print LOG "->Host (MAC) $mac added to custom hosts\n";
+ }else{
+ print LOG "->Host (MAC) $mac already exists in custom hosts \n";
+ $name="host ";
+ $name2=$name.$mac;
+ foreach my $key (sort keys %hosts){
+ if($hosts{$key}[0] eq $name2){
+ $hosts{$key}[4]++;
+ }
+ }
+ $name="host ";
+ $name2=$name.$mac;
+ $name3="Custom Host";
+ }
+ if($name2 && !&check_grp($grp,$name2)){
+ my $grpkey = &General::findhasharraykey(\%groups);
+ $groups{$grpkey}[0] = $grp;
+ $groups{$grpkey}[1] = '';
+ $groups{$grpkey}[2] = $name2;
+ $groups{$grpkey}[3] = $name3;
+ $groups{$grpkey}[4] = 0;
+ print LOG "->$name2 added to group $grp\n";
+ }
+ }
+ }
+ @hostarray=();
+ &General::writehasharray($confighosts,\%hosts);
+ &General::writehasharray($configgroups,\%groups);
+ &General::writehasharray($confignets,\%nets);
+
+}
+sub check_host
+{
+ my $ip=shift;
+ foreach my $key (sort keys %hosts)
+ {
+ if($hosts{$key}[2] eq $ip)
+ {
+ return 1;
+ }
+ }
+ return 0;
+}
+sub check_net
+{
+ my $ip=shift;
+ my $sub=shift;
+ foreach my $key (sort keys %nets)
+ {
+ if($nets{$key}[1] eq $ip && $nets{$key}[2] eq $sub)
+ {
+ return 1;
+ }
+ }
+ return 0;
+}
+sub check_grp
+{
+ my $grp=shift;
+ my $value=shift;
+ foreach my $key (sort keys %groups)
+ {
+ if($groups{$key}[0] eq $grp && $groups{$key}[2] eq $value)
+ {
+ return 1;
+ }
+ }
+ return 0;
+}
+sub process_rules
+{
+ my ($type,$action,$active,$grp1,$source,$grp2,$useport,$port,$prot,$grp3,$target,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to);
+ #open LOG
+ if( -f "/var/log/converters/outgoingfw-convert.log"){unlink ("/var/log/converters/outgoingfw-convert.log");}
+ open (LOG, ">/var/log/converters/outgoingfw-convert.log") or die $!;
+
+ &General::readhash($fwdfwsettings,\%fwdsettings);
+ if ($outsettings{'POLICY'} eq 'MODE1'){
+ $fwdsettings{'POLICY'}='MODE1';
+ $fwdsettings{'POLICY1'}='MODE2';
+ $type='ALLOW';
+ $action='ACCEPT';
+ }else{
+ $fwdsettings{'POLICY'}='MODE2';
+ $fwdsettings{'POLICY1'}='MODE2';
+ $type='DENY';
+ $action='DROP';
+ }
+ &General::writehash($fwdfwsettings,\%fwdsettings);
+ open (DATEI, "<$outgoingrules");
+ my @lines = <DATEI>;
+ foreach my $rule (@lines)
+ {
+ my $now=localtime;
+ chomp($rule);
+ $port='';
+ print LOG "$now processing: $rule\n";
+ my @configline=();
+ @configline = split( /\;/, $rule );
+ my @prot=();
+ if($configline[0] eq $type){
+ #some variables we can use from old config
+ if($configline[1] eq 'on'){ $active='ON';}else{$active='';}
+ if($configline[3] eq 'all' && $configline[8] ne ''){
+ push(@prot,"TCP");
+ push(@prot,"UDP");
+ }elsif($configline[3] eq 'all' && $configline[8] eq ''){
+ push(@prot,"");
+ }else{
+ push(@prot,$configline[3]);
+ }
+ if($configline[4] ne ''){
+ $configline[4] =~ s/,/;/g;
+ $remark = $configline[4];
+ }else{$remark = '';}
+ if($configline[9] eq 'Active'){ $log='ON';}else{$log='';}
+ if($configline[10] eq 'on' && $configline[11] eq 'on' && $configline[12] eq 'on' && $configline[13] eq 'on' && $configline[14] eq 'on' && $configline[15] eq 'on' && $configline[16] eq 'on'){
+ if($configline[17] eq '00:00' && $configline[18] eq '00:00'){
+ $time='';
+ }else{
+ $time='ON';
+ }
+ }else{
+ $time='ON';
+ }
+ $time_mon=$configline[10];
+ $time_tue=$configline[11];
+ $time_wed=$configline[12];
+ $time_thu=$configline[13];
+ $time_fri=$configline[14];
+ $time_sat=$configline[15];
+ $time_sun=$configline[16];
+ $time_from=$configline[17];
+ $time_to=$configline[18];
+ ############################################################
+ #sourcepart
+ if ($configline[2] eq 'green') {
+ $grp1='std_net_src';
+ $source='GREEN';
+ }elsif ($configline[2] eq 'orange') {
+ $grp1='std_net_src';
+ $source='ORANGE';
+ }elsif ($configline[2] eq 'red') {
+ $grp1='std_net_src';
+ $source='IPFire';
+ &General::readhash($fwdfwsettings,\%fwdsettings);
+ $fwdsettings{'POLICY1'}=$outsettings{'POLICY'};
+ $fwdsettings{'POLICY'}=$outsettings{'POLICY'};
+ &General::writehash($fwdfwsettings,\%fwdsettings);
+ }elsif ($configline[2] eq 'blue') {
+ $grp1='std_net_src';
+ $source='BLUE';
+ }elsif ($configline[2] eq 'ipsec') {
+ print LOG "$now -> Rule not converted, ipsec+ interface is obsolet since IPFire 2.7 \n";
+ next;
+ }elsif ($configline[2] eq 'ovpn') {
+ print LOG "$now ->Creating networks/groups for OpenVPN...\n";
+ &build_ovpn_grp;
+ $grp1='cust_grp_src';
+ $source='ovpn'
+ }elsif ($configline[2] eq 'ip') {
+ my $z=&check_ip($configline[5]);
+ if($z){
+ my ($ipa,$subn) = split("/",$z);
+ $subn=&General::iporsubtocidr($subn);
+ $grp1='src_addr';
+ $source="$ipa/$subn";
+ }else{
+ print LOG "$now -> Rule not converted, missing/invalid source ip \"$configline[5]\"\n";
+ next;
+ }
+ }elsif ($configline[2] eq 'mac') {
+ if(&General::validmac($configline[6])){
+ $grp1='src_addr';
+ $source=$configline[6];
+ }else{
+ print LOG"$now -> Rule not converted, invalid MAC \"$configline[6]\" \n";
+ next;
+ }
+ }elsif ($configline[2] eq 'all') {
+ $grp1='std_net_src';
+ $source='ALL';
+ }else{
+ foreach my $key (sort keys %groups){
+ if($groups{$key}[0] eq $configline[2]){
+ $grp1='cust_grp_src';
+ $source=$configline[2];
+ }
+ }
+ if ($grp1 eq '' || $source eq ''){
+ print LOG "$now -> Rule not converted, no valid source recognised\n";
+ }
+ }
+ ############################################################
+ #destinationpart
+ if($configline[7] ne ''){
+ my $address=&check_ip($configline[7]);
+ if($address){
+ my ($dip,$dsub) = split("/",$address);
+ $dsub=&General::iporsubtocidr($dsub);
+ $grp2='tgt_addr';
+ $target="$dip/$dsub";
+ }elsif(!$address){
+ my $getwebsiteip=&get_ip_from_domain($configline[7]);
+ if ($getwebsiteip){
+ $grp2='tgt_addr';
+ $target=$getwebsiteip;
+ $remark.=" $configline[7]";
+ }else{
+ print LOG "$now -> Rule not converted, invalid domain \"$configline[7]\"\n";
+ next;
+ }
+ }
+ }else{
+ $grp2='std_net_tgt';
+ $target='ALL';
+ }
+ if($configline[8] ne '' && $configline[3] ne 'gre' && $configline[3] ne 'esp'){
+ my @values=();
+ my @parts=split(",",$configline[8]);
+ foreach (@parts){
+ $_=~ tr/-/:/;
+ if (!($_ =~ /^(\d+)\:(\d+)$/)) {
+ if(&General::validport($_)){
+ $useport='ON';
+ push (@values,$_);
+ $grp3='TGT_PORT';
+ }else{
+ print LOG "$now -> Rule not converted, invalid destination Port \"$configline[8]\"\n";
+ next;
+ }
+ }else{
+ my ($a1,$a2) = split(/\:/,$_);
+ if (&General::validport($a1) && &General::validport($a2) && $a1 < $a2){
+ $useport='ON';
+ push (@values,"$a1:$a2");
+ $grp3='TGT_PORT';
+ }else{
+ print LOG "$now -> Rule not converted, invalid destination Port \"$configline[8]\"\n";
+ next;
+ }
+ }
+ }
+ $port=join("|",@values);
+ @values=();
+ @parts=();
+ }
+ }else{
+ print LOG "-> Rule not converted because not for Firewall mode $outsettings{'POLICY'} (we are only converting for actual mode)\n";
+ }
+ &General::readhasharray($fwdfwconfig,\%fwconfig);
+ &General::readhasharray($outfwconfig,\%fwconfigout);
+ my $check;
+ my $chain;
+ foreach my $protocol (@prot){
+ my $now=localtime;
+ if ($source eq 'IPFire'){
+ $chain='OUTGOINGFW';
+ }else{
+ $chain='FORWARDFW';
+ }
+ $protocol=uc($protocol);
+ print LOG "$now -> Converted: $action,$chain,$active,$grp1,$source,$grp2,$target,,,,,$useport,$protocol,,$grp3,$port,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to\n";
+ #Put rules into system....
+ ###########################
+ #check for double rules
+ foreach my $key (sort keys %fwconfig){
+ if("$action,$chain,$active,$grp1,$source,$grp2,$target,,,,,$useport,$protocol,,$grp3,$port,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to"
+ eq "$fwconfig{$key}[0],$fwconfig{$key}[1],$fwconfig{$key}[2],$fwconfig{$key}[3],$fwconfig{$key}[4],$fwconfig{$key}[5],$fwconfig{$key}[6],,,,,$fwconfig{$key}[11],$fwconfig{$key}[12],,$fwconfig{$key}[14],$fwconfig{$key}[15],$fwconfig{$key}[16],$fwconfig{$key}[17],$fwconfig{$key}[18],$fwconfig{$key}[19],$fwconfig{$key}[20],$fwconfig{$key}[21],$fwconfig{$key}[22],$fwconfig{$key}[23],$fwconfig{$key}[24],$fwconfig{$key}[25],$fwconfig{$key}[26],$fwconfig{$key}[27]"){
+ $check='on';
+ next;
+ }
+ }
+ if($check ne 'on'){
+ #increase groupcounter
+ my $check1;
+ if($grp1 eq 'cust_grp_src'){
+ foreach my $key (sort keys %groups){
+ if($groups{$key}[0] eq $source){
+ $groups{$key}[4]++;
+ $check1='on';
+ }
+ }
+ if($check1 eq 'on'){
+ &General::writehasharray($configgroups,\%groups);
+ }
+ }
+ if ($chain eq 'FORWARDFW'){
+ my $key = &General::findhasharraykey(\%fwconfig);
+ $fwconfig{$key}[0] = $action;
+ $fwconfig{$key}[1] = $chain;
+ $fwconfig{$key}[2] = $active;
+ $fwconfig{$key}[3] = $grp1;
+ $fwconfig{$key}[4] = $source;
+ $fwconfig{$key}[5] = $grp2;
+ $fwconfig{$key}[6] = $target;
+ $fwconfig{$key}[11] = $useport;
+ $fwconfig{$key}[12] = $protocol;
+ $fwconfig{$key}[14] = $grp3;
+ $fwconfig{$key}[15] = $port;
+ $fwconfig{$key}[16] = $remark;
+ $fwconfig{$key}[17] = $log;
+ $fwconfig{$key}[18] = $time;
+ $fwconfig{$key}[19] = $time_mon;
+ $fwconfig{$key}[20] = $time_tue;
+ $fwconfig{$key}[21] = $time_wed;
+ $fwconfig{$key}[22] = $time_thu;
+ $fwconfig{$key}[23] = $time_fri;
+ $fwconfig{$key}[24] = $time_sat;
+ $fwconfig{$key}[25] = $time_sun;
+ $fwconfig{$key}[26] = $time_from;
+ $fwconfig{$key}[27] = $time_to;
+ $fwconfig{$key}[28] = '';
+ $fwconfig{$key}[29] = 'ALL';
+ $fwconfig{$key}[30] = '';
+ $fwconfig{$key}[31] = 'dnat';
+ }else{
+ my $key = &General::findhasharraykey(\%fwconfigout);
+ $fwconfigout{$key}[0] = $action;
+ $fwconfigout{$key}[1] = $chain;
+ $fwconfigout{$key}[2] = $active;
+ $fwconfigout{$key}[3] = $grp1;
+ $fwconfigout{$key}[4] = $source;
+ $fwconfigout{$key}[5] = $grp2;
+ $fwconfigout{$key}[6] = $target;
+ $fwconfigout{$key}[11] = $useport;
+ $fwconfigout{$key}[12] = $protocol;
+ $fwconfigout{$key}[14] = $grp3;
+ $fwconfigout{$key}[15] = $port;
+ $fwconfigout{$key}[16] = $remark;
+ $fwconfigout{$key}[17] = $log;
+ $fwconfigout{$key}[18] = $time;
+ $fwconfigout{$key}[19] = $time_mon;
+ $fwconfigout{$key}[20] = $time_tue;
+ $fwconfigout{$key}[21] = $time_wed;
+ $fwconfigout{$key}[22] = $time_thu;
+ $fwconfigout{$key}[23] = $time_fri;
+ $fwconfigout{$key}[24] = $time_sat;
+ $fwconfigout{$key}[25] = $time_sun;
+ $fwconfigout{$key}[26] = $time_from;
+ $fwconfigout{$key}[27] = $time_to;
+ $fwconfigout{$key}[28] = '';
+ $fwconfigout{$key}[29] = 'ALL';
+ $fwconfigout{$key}[30] = '';
+ $fwconfigout{$key}[31] = 'dnat';
+ }
+ &General::writehasharray($fwdfwconfig,\%fwconfig);
+ &General::writehasharray($outfwconfig,\%fwconfigout);
+ }
+ }
+ @prot=();
+ }
+ close(LOG);
+ @lines=();
+}
+sub get_ip_from_domain
+{
+ $web=shift;
+ my $resolvedip;
+ my $checked;
+ my ($name,$aliases,$addrtype,$length,@addrs) = gethostbyname($web);
+ if(@addrs){
+ $resolvedip=inet_ntoa($addrs[0]);
+ return $resolvedip;
+ }
+ return;
+}
+sub build_ovpn_grp
+{
+ my $now=localtime;
+ &General::readhasharray($confighosts,\%hosts);
+ &General::readhasharray($confignets,\%nets);
+ &General::readhasharray($configgroups,\%groups);
+ &General::readhasharray($ovpnconfig,\%configovpn);
+ &General::readhasharray($ccdconfig,\%ccdconf);
+ &General::readhash($ovpnsettings,\%settingsovpn);
+ #get ovpn nets
+ my @ovpnnets=();
+ if($settingsovpn{'DOVPN_SUBNET'}){
+ my ($net,$subnet)=split("/",$settingsovpn{'DOVPN_SUBNET'});
+ push (@ovpnnets,"$net,$subnet,dynamic");
+ print LOG "$now ->found dynamic OpenVPN net\n";
+ }
+ foreach my $key (sort keys %ccdconf){
+ my ($net,$subnet)=split("/",$ccdconf{$key}[1]);
+ $subnet=&General::iporsubtodec($subnet);
+ push (@ovpnnets,"$net,$subnet,$ccdconf{$key}[0]");
+ print LOG "$now ->found OpenVPN static net $net/$subnet\n";
+ }
+ foreach my $key (sort keys %configovpn){
+ if ($configovpn{$key}[3] eq 'net'){
+ my ($net,$subnet)=split("/",$configovpn{$key}[27]);
+ push (@ovpnnets,"$net,$subnet,$configovpn{$key}[2]");
+ print LOG "$now ->found OpenVPN $net/$subnet $configovpn{$key}[2]\n";
+ }
+ }
+ #add ovpn nets to customnetworks/groups
+ foreach my $line (@ovpnnets){
+ my $now=localtime;
+ my ($net,$subnet,$name) = split(",",$line);
+ if (!&check_net($net,$subnet)){
+ my $netkey = &General::findhasharraykey(\%nets);
+ $name2=$name."(ovpn)".$net;
+ $name3="Custom Network";
+ $nets{$netkey}[0] = $name2;
+ $nets{$netkey}[1] = $net;
+ $nets{$netkey}[2] = $subnet;
+ $nets{$netkey}[3] = '';
+ $nets{$netkey}[4] = 1;
+ print LOG "$now ->added $name2 $net/$subnet to customnetworks\n";
+ }else{
+ print LOG "-> Custom Network with same IP already exist \"$net/$subnet\" (you can ignore this, if this run was manual from shell)\n";
+ }
+ if($name2){
+ my $grpkey = &General::findhasharraykey(\%groups);
+ $groups{$grpkey}[0] = "ovpn";
+ $groups{$grpkey}[1] = '';
+ $groups{$grpkey}[2] = $name2;
+ $groups{$grpkey}[3] = "Custom Network";
+ $groups{$grpkey}[4] = 0;
+ print LOG "$now ->added $name2 to customgroup ovpn\n";
+ }
+ $name2='';
+ }
+ @ovpnnets=();
+ &General::writehasharray($confighosts,\%hosts);
+ &General::writehasharray($configgroups,\%groups);
+ &General::writehasharray($confignets,\%nets);
+ print LOG "$now ->finished OVPN\n";
+}
+sub process_p2p
+{
+ copy("/var/ipfire/outgoing/p2protocols","/var/ipfire/firewall/p2protocols");
+ chmod oct('0777'), '/var/ipfire/firewall/p2protocols';
+}
diff --git a/config/firewall/convert-portfw b/config/firewall/convert-portfw
new file mode 100755
index 0000000..f6ddd25
--- /dev/null
+++ b/config/firewall/convert-portfw
@@ -0,0 +1,158 @@
+#!/usr/bin/perl
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+# #
+# This script converts old portforwarding rules from old Firewall #
+# to the new one. This is a 3-step process. #
+# STEP1: read old config and normalize settings #
+# STEP2: create new rules from old ones #
+# STEP3: check if rule already exists, when not, put it into #
+# /var/ipfire/firewall/config #
+###############################################################################
+require '/var/ipfire/general-functions.pl';
+my @values=();
+my @built_rules=();
+my %nat=();
+my $portfwconfig = "${General::swroot}/portfw/config";
+my $confignat = "${General::swroot}/firewall/config";
+my ($key,$flag,$prot,$ipfireport,$target,$targetport,$active,$alias,$source,$remark);
+my ($key1,$flag1,$prot1,$ipfireport1,$target1,$targetport1,$active1,$alias1,$source1,$remark1);
+my $count=0;
+my $jump;
+if(! -d "/var/log/converters"){ mkdir("/var/log/converters");}
+open(FILE, $portfwconfig) or die 'Unable to open config file.';
+my @current = <FILE>;
+close(FILE);
+open (LOG, ">/var/log/converters/portfw-convert.log") or die $!;
+open(ALIAS, "${General::swroot}/ethernet/aliases") or die 'Unable to open aliases file.';
+my @alias = <ALIAS>;
+close(ALIAS);
+&get_config;
+&build_rules;
+&write_rules;
+sub get_config
+{
+ print LOG "STEP 1: Get config from old portforward\n#########################################\n";
+ foreach my $line (@current){
+ if($jump eq '1'){
+ $jump='';
+ $count++;
+ next;
+ }
+ my $u=$count+1;
+ ($key,$flag,$prot,$ipfireport,$target,$targetport,$active,$alias,$source,$remark) = split(",",$line);
+ ($key1,$flag1,$prot1,$ipfireport1,$target1,$targetport1,$active1,$alias1,$source1,$remark1) = split(",",$current[$u]);
+ if ($flag1 eq '1'){
+ $source=$source1;
+ $jump='1';
+ }
+ my $now=localtime;
+ chomp($remark);
+ print LOG "$now processing-> KEY: $key FLAG: $flag PROT: $prot FIREPORT: $ipfireport TARGET: $target TGTPORT: $targetport ACTIVE: $active ALIAS: $alias SOURCE: $source REM: $remark Doublerule: $jump\n";
+ push (@values,$prot.",".$ipfireport.",".$target.",".$targetport.",".$active.",".$alias.",".$source.",".$remark);
+ $count++;
+ }
+}
+sub build_rules
+{
+ print LOG "\nSTEP 2: Convert old portforwardrules in a useable format\n########################################################\n";
+ my $src;
+ my $src1;
+ my $ipfireip;
+ my $count=0;
+ my $stop;
+ #build rules for new firewall
+ foreach my $line (@values){
+ chomp ($line);
+ ($prot,$ipfireport,$target,$targetport,$active,$alias,$source,$remark)=split(",",$line);
+ $count++;
+ #get sourcepart
+ if($source eq '0.0.0.0/0'){
+ $src = 'std_net_src';
+ $src1 = 'ALL';
+ }else{
+ $src = 'src_addr';
+ my ($a,$b) = split("/",$source);
+ $src1 = $a."/32";
+ }
+ #get ipfire ip
+ if($alias eq '0.0.0.0'){
+ $alias='ALL';
+ }else{
+ foreach my $ali (@alias){
+ my ($alias_ip,$alias_active,$alias_name) = split (",",$ali);
+ if($alias eq $alias_ip){
+ chomp($alias_name);
+ $alias=$alias_name;
+ }
+ }
+ }
+ $active = uc $active;
+ $prot = uc $prot;
+ chomp($remark);
+ push (@built_rules,"ACCEPT,FORWARDFW,$active,$src,$src1,tgt_addr,$target/32,ON,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat");
+ my $now=localtime;
+ print LOG "$now Converted-> KEY: $count ACCEPT,FORWARDFW,$active,$src,$src1,tgt_addr,$target/32,ON,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat\n";
+ }
+}
+sub write_rules
+{
+ my $skip='';
+ my $id;
+ print LOG "\nSTEP 3: Create DNAT rules in new firewall\n#########################################\n";
+ &General::readhasharray($confignat,\%nat);
+ foreach my $line (@built_rules){
+ $skip='';
+ my ($action,$chain,$active,$src,$src1,$tgt,$tgt1,$use_prot,$prot,$dummy,$tgt_port,$tgt_port1,$remark,$from,$to,$use_port,$alias,$ipfireport,$dnat) = split (",",$line);
+ foreach my $key (sort keys %nat){
+ if ($line eq "$nat{$key}[0],$nat{$key}[1],$nat{$key}[2],$nat{$key}[3],$nat{$key}[4],$nat{$key}[5],$nat{$key}[6],$nat{$key}[11],$nat{$key}[12],$nat{$key}[13],$nat{$key}[14],$nat{$key}[15],$nat{$key}[16],$nat{$key}[26],$nat{$key}[27],$nat{$key}[28],$nat{$key}[29],$nat{$key}[30],$nat{$key}[31]"){
+ my $now=localtime;
+ print LOG "$now SKIP-> Rule $nat{$key}[0],$nat{$key}[1],$nat{$key}[2],$nat{$key}[3],$nat{$key}[4],$nat{$key}[5],$nat{$key}[6],$nat{$key}[11],$nat{$key}[12],$nat{$key}[13],$nat{$key}[14],$nat{$key}[15],$nat{$key}[16],$nat{$key}[26],$nat{$key}[27],$nat{$key}[28],$nat{$key}[29],$nat{$key}[30],$nat{$key}[31] ->EXISTS\n";
+ $skip='1';
+ }
+ }
+ if ($skip ne '1'){
+ $id = &General::findhasharraykey(\%nat);
+ $nat{$id}[0] = $action;
+ $nat{$id}[1] = $chain;
+ $nat{$id}[2] = $active;
+ $nat{$id}[3] = $src;
+ $nat{$id}[4] = $src1;
+ $nat{$id}[5] = $tgt;
+ $nat{$id}[6] = $tgt1;
+ $nat{$id}[11] = $use_prot;
+ $nat{$id}[12] = $prot;
+ $nat{$id}[13] = $dummy;
+ $nat{$id}[14] = $tgt_port;
+ $nat{$id}[15] = $tgt_port1;
+ $nat{$id}[16] = $remark;
+ $nat{$id}[26] = $from;
+ $nat{$id}[27] = $to;
+ $nat{$id}[28] = $use_port;
+ $nat{$id}[29] = $alias;
+ $nat{$id}[30] = $ipfireport;
+ $nat{$id}[31] = $dnat;
+ my $now=localtime;
+ print LOG "$now NEW RULE-> Rule $nat{$id}[0],$nat{$id}[1],$nat{$id}[2],$nat{$id}[3],$nat{$id}[4],$nat{$id}[5],$nat{$id}[6],$nat{$id}[11],$nat{$id}[12],$nat{$id}[13],$nat{$id}[14],$nat{$id}[15],$nat{$id}[16],$nat{$id}[26],$nat{$id}[27],$nat{$id}[28],$nat{$id}[29],$nat{$id}[30],$nat{$id}[31]\n";
+ }
+ }
+ &General::writehasharray($confignat,\%nat);
+}
+close (LOG);
diff --git a/config/firewall/convert-xtaccess b/config/firewall/convert-xtaccess
new file mode 100755
index 0000000..e04ab6d
--- /dev/null
+++ b/config/firewall/convert-xtaccess
@@ -0,0 +1,141 @@
+#!/usr/bin/perl
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+# #
+#This script converts old xtaccess rules to new firewall #
+#Logfiles are created under /var/log/converters #
+# #
+###############################################################################
+my @current=();
+my @alias=();
+my %configinputfw=();
+require '/var/ipfire/general-functions.pl';
+my $xtaccessconfig = "${General::swroot}/xtaccess/config";
+my $inputfwconfig = "${General::swroot}/firewall/input";
+my $aliasconfig = "${General::swroot}/ethernet/aliases";
+my $field0='ACCEPT';
+my $field1='INPUTFW';
+my $field2=''; #ON or emtpy
+my $field3=''; #std_net_src or src_addr
+my $field4=''; #ALL or IP-Address with /32
+my $field5='ipfire';
+my $field6=''; #Default IP or alias name
+my $field11='ON'; #use target port
+my $field12=''; #TCP or UDP
+my $field13='All ICMP-Types';
+my $field14='TGT_PORT';
+my $field15=''; #Port Number
+my $field16=''; #remark
+my $field26='00:00';
+my $field27='00:00';
+my $field28 = '';
+my $field29 = 'ALL';
+my $field30 = '';
+my $field31 = 'dnat';
+open(FILE, $xtaccessconfig) or die 'Unable to open config file.';
+my @current = <FILE>;
+close(FILE);
+open(FILE1, $aliasconfig) or die 'Unable to open config file.';
+my @alias = <FILE1>;
+close(FILE1);
+&General::readhasharray($inputfwconfig,\%configinputfw);
+
+foreach my $line (@current){
+ my ($a,$b,$c,$d,$e,$f) = split (",",$line);
+ $e =~ s/\R//g;
+ if ($f gt ''){
+ $f =~ s/\R//g;
+ $field16=$f;
+ }
+ #active or not
+ $field2=uc($d);
+ #get protocol
+ if ($a eq 'tcp'){ $field12 ='TCP';}else{$field12='UDP';}
+ #check source address
+ if ($b eq '0.0.0.0/0'){
+ $field3='std_net_src';
+ $field4='ALL';
+ }elsif($b =~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){
+ $field3='src_addr';
+ $field4=$b."/32";
+ }elsif ($b =~ /^(.*?)\/(.*?)$/) {
+ $field3='src_addr';
+ $field4=$b;
+ }else{
+ print "Regel konnte nicht konvertiert werden!\n";
+ }
+ #check ipfire address
+ if ($e eq '0.0.0.0'){
+ $field6 = 'RED1';
+ }else{
+ foreach my $line (@alias){
+ my ($ip,$state,$aliasname) = split (",",$line);
+ if ($ip eq $e){
+ $aliasname =~ s/\R//g;
+ $field6 = $aliasname;
+ }
+ }
+ }
+ #get target port
+ $c=~ s/\R//g;
+ $c=~ tr/-/:/;
+ if ($c =~ /^(\D)\:(\d+)$/) {
+ $c = "1:$2";
+ }
+ if ($c =~ /^(\d+)\:(\D)$/) {
+ $c = "$1:65535";
+ }
+ $field15=$c;
+ my $key = &General::findhasharraykey (\%configinputfw);
+ foreach my $i (0 .. 31) { $configinputfw{$key}[$i] = "";}
+ $configinputfw{$key}[0] = $field0;
+ $configinputfw{$key}[1] = $field1;
+ $configinputfw{$key}[2] = $field2;
+ $configinputfw{$key}[3] = $field3;
+ $configinputfw{$key}[4] = $field4;
+ $configinputfw{$key}[5] = $field5;
+ $configinputfw{$key}[6] = $field6;
+ $configinputfw{$key}[7] = '';
+ $configinputfw{$key}[8] = '';
+ $configinputfw{$key}[9] = '';
+ $configinputfw{$key}[10] = '';
+ $configinputfw{$key}[11] = $field11;
+ $configinputfw{$key}[12] = $field12;
+ $configinputfw{$key}[13] = $field13;
+ $configinputfw{$key}[14] = $field14;
+ $configinputfw{$key}[15] = $field15;
+ $configinputfw{$key}[16] = $field16;
+ $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] = $field26;
+ $configinputfw{$key}[27] = $field27;
+ $configinputfw{$key}[28] = $field28;
+ $configinputfw{$key}[29] = $field29;
+ $configinputfw{$key}[30] = $field30;
+ $configinputfw{$key}[31] = $field31;
+ &General::writehasharray($inputfwconfig,\%configinputfw);
+}
diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl
new file mode 100755
index 0000000..f1e8403
--- /dev/null
+++ b/config/firewall/firewall-lib.pl
@@ -0,0 +1,256 @@
+#!/usr/bin/perl
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+use strict;
+no warnings 'uninitialized';
+
+package fwlib;
+
+my %customnetwork=();
+my %customhost=();
+my %customgrp=();
+my %customservice=();
+my %customservicegrp=();
+my %ccdnet=();
+my %ccdhost=();
+my %ipsecconf=();
+my %ipsecsettings=();
+my %netsettings=();
+my %ovpnsettings=();
+
+require '/var/ipfire/general-functions.pl';
+
+my $confignet = "${General::swroot}/fwhosts/customnetworks";
+my $confighost = "${General::swroot}/fwhosts/customhosts";
+my $configgrp = "${General::swroot}/fwhosts/customgroups";
+my $configsrv = "${General::swroot}/fwhosts/customservices";
+my $configsrvgrp = "${General::swroot}/fwhosts/customservicegrp";
+my $configccdnet = "${General::swroot}/ovpn/ccd.conf";
+my $configccdhost = "${General::swroot}/ovpn/ovpnconfig";
+my $configipsec = "${General::swroot}/vpn/config";
+my $configovpn = "${General::swroot}/ovpn/settings";
+my $val;
+my $field;
+
+&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
+&General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings);
+&General::readhash("${General::swroot}/vpn/settings", \%ipsecsettings);
+
+
+&General::readhasharray("$confignet", \%customnetwork);
+&General::readhasharray("$confighost", \%customhost);
+&General::readhasharray("$configgrp", \%customgrp);
+&General::readhasharray("$configccdnet", \%ccdnet);
+&General::readhasharray("$configccdhost", \%ccdhost);
+&General::readhasharray("$configipsec", \%ipsecconf);
+&General::readhasharray("$configsrv", \%customservice);
+&General::readhasharray("$configsrvgrp", \%customservicegrp);
+
+sub get_srv_prot
+{
+ my $val=shift;
+ foreach my $key (sort {$a <=> $b} keys %customservice){
+ if($customservice{$key}[0] eq $val){
+ if ($customservice{$key}[0] eq $val){
+ return $customservice{$key}[2];
+ }
+ }
+ }
+}
+sub get_srvgrp_prot
+{
+ my $val=shift;
+ my @ips=();
+ my $tcp;
+ my $udp;
+ my $icmp;
+ foreach my $key (sort {$a <=> $b} keys %customservicegrp){
+ if($customservicegrp{$key}[0] eq $val){
+ if (&get_srv_prot($customservicegrp{$key}[2]) eq 'TCP'){
+ $tcp=1;
+ }elsif(&get_srv_prot($customservicegrp{$key}[2]) eq 'UDP'){
+ $udp=1;
+ }elsif(&get_srv_prot($customservicegrp{$key}[2]) eq 'ICMP'){
+ $icmp=1;
+ }
+ }
+ }
+ if ($tcp eq '1'){push (@ips,'TCP');}
+ if ($udp eq '1'){push (@ips,'UDP');}
+ if ($icmp eq '1'){push (@ips,'ICMP');}
+ my $back=join(",",@ips);
+ return $back;
+
+}
+
+
+sub get_srv_port
+{
+ my $val=shift;
+ my $field=shift;
+ my $prot=shift;
+ foreach my $key (sort {$a <=> $b} keys %customservice){
+ if($customservice{$key}[0] eq $val){
+ if($customservice{$key}[2] eq $prot){
+ return $customservice{$key}[$field];
+ }
+ }
+ }
+}
+sub get_srvgrp_port
+{
+ my $val=shift;
+ my $prot=shift;
+ my $back;
+ my $value;
+ my @ips=();
+ foreach my $key (sort {$a <=> $b} keys %customservicegrp){
+ if($customservicegrp{$key}[0] eq $val){
+ if ($prot ne 'ICMP'){
+ $value=&get_srv_port($customservicegrp{$key}[2],1,$prot);
+ }elsif ($prot eq 'ICMP'){
+ $value=&get_srv_port($customservicegrp{$key}[2],3,$prot);
+ }
+ push (@ips,$value) if ($value ne '') ;
+ }
+ }
+ if($prot ne 'ICMP'){
+ if ($#ips gt 0){$back="-m multiport --dports ";}else{$back="--dport ";}
+ }elsif ($prot eq 'ICMP'){
+ $back="--icmp-type ";
+ }
+
+ $back.=join(",",@ips);
+ return $back;
+}
+sub get_ipsec_net_ip
+{
+ my $val=shift;
+ my $field=shift;
+ foreach my $key (sort {$a <=> $b} keys %ipsecconf){
+ if($ipsecconf{$key}[1] eq $val){
+ return $ipsecconf{$key}[$field];
+ }
+ }
+}
+sub get_ipsec_host_ip
+{
+ my $val=shift;
+ my $field=shift;
+ foreach my $key (sort {$a <=> $b} keys %ipsecconf){
+ if($ipsecconf{$key}[1] eq $val){
+ return $ipsecconf{$key}[$field];
+ }
+ }
+}
+sub get_ovpn_n2n_ip
+{
+ my $val=shift;
+ my $field=shift;
+ foreach my $key (sort {$a <=> $b} keys %ccdhost){
+ if($ccdhost{$key}[1] eq $val){
+ return $ccdhost{$key}[$field];
+ }
+ }
+}
+sub get_ovpn_host_ip
+{
+ my $val=shift;
+ my $field=shift;
+ foreach my $key (sort {$a <=> $b} keys %ccdhost){
+ if($ccdhost{$key}[1] eq $val){
+ return $ccdhost{$key}[$field];
+ }
+ }
+}
+sub get_ovpn_net_ip
+{
+
+ my $val=shift;
+ my $field=shift;
+ foreach my $key (sort {$a <=> $b} keys %ccdnet){
+ if($ccdnet{$key}[0] eq $val){
+ return $ccdnet{$key}[$field];
+ }
+ }
+}
+sub get_grp_ip
+{
+ my $val=shift;
+ my $src=shift;
+ foreach my $key (sort {$a <=> $b} keys %customgrp){
+ if ($customgrp{$key}[0] eq $val){
+ &get_address($customgrp{$key}[3],$src);
+ }
+ }
+
+}
+sub get_std_net_ip
+{
+ my $val=shift;
+ my $con=shift;
+ if ($val eq 'ALL'){
+ return "0.0.0.0/0.0.0.0";
+ }elsif($val eq 'GREEN'){
+ return "$netsettings{'GREEN_NETADDRESS'}/$netsettings{'GREEN_NETMASK'}";
+ }elsif($val eq 'ORANGE'){
+ return "$netsettings{'ORANGE_NETADDRESS'}/$netsettings{'ORANGE_NETMASK'}";
+ }elsif($val eq 'BLUE'){
+ return "$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}";
+ }elsif($val eq 'RED'){
+ return "0.0.0.0/0 -o $con";
+ }elsif($val =~ /OpenVPN/i){
+ return "$ovpnsettings{'DOVPN_SUBNET'}";
+ }elsif($val =~ /IPsec/i){
+ return "$ipsecsettings{'RW_NET'}";
+ }elsif($val eq 'IPFire'){
+ return ;
+ }
+}
+sub get_net_ip
+{
+ my $val=shift;
+ foreach my $key (sort {$a <=> $b} keys %customnetwork){
+ if($customnetwork{$key}[0] eq $val){
+ return "$customnetwork{$key}[1]/$customnetwork{$key}[2]";
+ }
+ }
+}
+sub get_host_ip
+{
+ my $val=shift;
+ my $src=shift;
+ foreach my $key (sort {$a <=> $b} keys %customhost){
+ if($customhost{$key}[0] eq $val){
+ if ($customhost{$key}[1] eq 'mac' && $src eq 'src'){
+ return "-m mac --mac-source $customhost{$key}[2]";
+ }elsif($customhost{$key}[1] eq 'ip' && $src eq 'src'){
+ return "$customhost{$key}[2]";
+ }elsif($customhost{$key}[1] eq 'ip' && $src eq 'tgt'){
+ return "$customhost{$key}[2]";
+ }elsif($customhost{$key}[1] eq 'mac' && $src eq 'tgt'){
+ return "none";
+ }
+ }
+ }
+}
+
+return 1;
diff --git a/config/firewall/firewall-policy b/config/firewall/firewall-policy
new file mode 100755
index 0000000..6d26d5b
--- /dev/null
+++ b/config/firewall/firewall-policy
@@ -0,0 +1,124 @@
+#!/bin/sh
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/firewall/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings)
+
+iptables -F POLICYFWD
+iptables -F POLICYOUT
+iptables -F POLICYIN
+
+if [ -f "/var/ipfire/red/iface" ]; then
+ IFACE="$(</var/ipfire/red/iface)"
+fi
+
+# Figure out what devices are configured.
+HAVE_BLUE="false"
+HAVE_ORANGE="false"
+
+case "${CONFIG_TYPE}" in
+ 2)
+ HAVE_BLUE="true"
+ ;;
+ 3)
+ HAVE_ORANGE="true"
+ ;;
+ 4)
+ HAVE_BLUE="true"
+ HAVE_ORANGE="true"
+ ;;
+esac
+
+# INPUT
+case "${FWPOLICY2}" in
+ REJECT)
+ if [ "${DROPINPUT}" = "on" ]; then
+ /sbin/iptables -A POLICYIN -m limit --limit 10/minute -j LOG --log-prefix "REJECT_INPUT"
+ fi
+ /sbin/iptables -A POLICYIN -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_INPUT"
+ ;;
+ *) # DROP
+ if [ "${DROPINPUT}" = "on" ]; then
+ /sbin/iptables -A POLICYIN -m limit --limit 10/minute -j LOG --log-prefix "DROP_INPUT"
+ fi
+ /sbin/iptables -A POLICYIN -j DROP -m comment --comment "DROP_INPUT"
+ ;;
+esac
+
+# FORWARD
+case "${POLICY}" in
+ MODE1)
+ case "${FWPOLICY}" in
+ REJECT)
+ if [ "${DROPFORWARD}" = "on" ]; then
+ /sbin/iptables -A POLICYFWD -m limit --limit 10/minute -j LOG --log-prefix "REJECT_FORWARD"
+ fi
+ /sbin/iptables -A POLICYFWD -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_FORWARD"
+ ;;
+ *) # DROP
+ if [ "${DROPFORWARD}" = "on" ]; then
+ /sbin/iptables -A POLICYFWD -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD"
+ fi
+ /sbin/iptables -A POLICYFWD -j DROP -m comment --comment "DROP_FORWARD"
+ ;;
+ esac
+ ;;
+
+ *)
+ if [ -n "${IFACE}" ]; then
+ if [ "${HAVE_BLUE}" = "true" ] && [ -n "${BLUE_DEV}" ]; then
+ /sbin/iptables -A POLICYFWD -i "${BLUE_DEV}" ! -o "${IFACE}" -j DROP
+ fi
+ if [ "${HAVE_ORANGE}" = "true" ] && [ -n "${ORANGE_DEV}" ]; then
+ /sbin/iptables -A POLICYFWD -i "${ORANGE_DEV}" ! -o "${IFACE}" -j DROP
+ fi
+ fi
+ /sbin/iptables -A POLICYFWD -j ACCEPT
+ /sbin/iptables -A POLICYFWD -m comment --comment "DROP_FORWARD" -j DROP
+ ;;
+esac
+
+# OUTGOING
+case "${POLICY1}" in
+ MODE1)
+ case "${FWPOLICY1}" in
+ REJECT)
+ if [ "${DROPOUTGOING}" = "on" ]; then
+ /sbin/iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "REJECT_OUTPUT"
+ fi
+ /sbin/iptables -A POLICYOUT -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_OUTPUT"
+ ;;
+ *) # DROP
+ if [ "${DROPOUTGOING}" == "on" ]; then
+ /sbin/iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "DROP_OUTPUT"
+ fi
+ /sbin/iptables -A POLICYOUT -j DROP -m comment --comment "DROP_OUTPUT"
+ ;;
+ esac
+ ;;
+ *)
+ /sbin/iptables -A POLICYOUT -j ACCEPT
+ /sbin/iptables -A POLICYOUT -m comment --comment "DROP_OUTPUT" -j DROP
+ ;;
+esac
+
+exit 0
diff --git a/config/firewall/p2protocols b/config/firewall/p2protocols
new file mode 100644
index 0000000..7000581
--- /dev/null
+++ b/config/firewall/p2protocols
@@ -0,0 +1,9 @@
+Applejuice;apple;off;
+Ares;ares;off;
+Bittorrent;bit;off;
+DirectConnect;dc;off;
+Edonkey;edk;off;
+Gnutella;gnu;off;
+KaZaA;kazaa;off;
+SoulSeek;soul;off;
+WinMX;winmx;off;
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
new file mode 100755
index 0000000..c724aa8
--- /dev/null
+++ b/config/firewall/rules.pl
@@ -0,0 +1,635 @@
+#!/usr/bin/perl
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+use strict;
+use Time::Local;
+no warnings 'uninitialized';
+
+# enable only the following on debugging purpose
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
+
+my %fwdfwsettings=();
+my %defaultNetworks=();
+my %configfwdfw=();
+my %color=();
+my %icmptypes=();
+my %ovpnSettings=();
+my %customgrp=();
+our %sourcehash=();
+our %targethash=();
+my @timeframe=();
+my %configinputfw=();
+my %configoutgoingfw=();
+my %confignatfw=();
+my %aliases=();
+my @DPROT=();
+my @p2ps=();
+require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/firewall/bin/firewall-lib.pl";
+
+my $configfwdfw = "${General::swroot}/firewall/config";
+my $configinput = "${General::swroot}/firewall/input";
+my $configoutgoing = "${General::swroot}/firewall/outgoing";
+my $p2pfile = "${General::swroot}/firewall/p2protocols";
+my $configgrp = "${General::swroot}/fwhosts/customgroups";
+my $netsettings = "${General::swroot}/ethernet/settings";
+my $errormessage = '';
+my $orange = '';
+my $green = '';
+my $blue = '';
+my ($TYPE,$PROT,$SPROT,$DPROT,$SPORT,$DPORT,$TIME,$TIMEFROM,$TIMETILL,$SRC_TGT);
+my $CHAIN = "FORWARDFW";
+my $conexists = 'off';
+my $command = 'iptables -A';
+my $dnat ='';
+my $snat ='';
+
+&General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings);
+&General::readhash("$netsettings", \%defaultNetworks);
+&General::readhasharray($configfwdfw, \%configfwdfw);
+&General::readhasharray($configinput, \%configinputfw);
+&General::readhasharray($configoutgoing, \%configoutgoingfw);
+&General::readhasharray($configgrp, \%customgrp);
+&General::get_aliases(\%aliases);
+
+#check if we have an internetconnection
+open (CONN,"/var/ipfire/red/iface");
+my $con = <CONN>;
+close(CONN);
+if (-f "/var/ipfire/red/active"){
+ $conexists='on';
+}
+open (CONN1,"/var/ipfire/red/local-ipaddress");
+my $redip = <CONN1>;
+close(CONN1);
+#################
+# DEBUG/TEST #
+#################
+my $MODE=0; # 0 - normal operation
+ # 1 - print configline and rules to console
+ #
+#################
+my $param=shift;
+
+if($param eq 'flush'){
+ if ($MODE eq '1'){
+ print " Flushing chains...\n";
+ }
+ &flush;
+}else{
+ if ($MODE eq '1'){
+ print " Flushing chains...\n";
+ }
+ &flush;
+ if ($MODE eq '1'){
+ print " Preparing rules...\n";
+ }
+ &preparerules;
+ if($MODE eq '0'){
+ if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
+ &p2pblock;
+ system ("/usr/sbin/firewall-policy");
+ }elsif($fwdfwsettings{'POLICY'} eq 'MODE2'){
+ &p2pblock;
+ system ("iptables -A $CHAIN -m conntrack --ctstate NEW -j ACCEPT");
+ system ("/usr/sbin/firewall-policy");
+ system ("/etc/sysconfig/firewall.local reload");
+ }
+ }
+}
+sub flush
+{
+ system ("iptables -F FORWARDFW");
+ system ("iptables -F INPUTFW");
+ system ("iptables -F OUTGOINGFW");
+ system ("iptables -t nat -F NAT_DESTINATION");
+ system ("iptables -t nat -F NAT_SOURCE");
+}
+sub preparerules
+{
+ if (! -z "${General::swroot}/firewall/config"){
+ &buildrules(\%configfwdfw);
+ }
+ if (! -z "${General::swroot}/firewall/input"){
+ &buildrules(\%configinputfw);
+ }
+ if (! -z "${General::swroot}/firewall/outgoing"){
+ &buildrules(\%configoutgoingfw);
+ }
+}
+sub buildrules
+{
+ my $hash=shift;
+ my $STAG;
+ my $natip;
+ my $snatport;
+ my $fireport;
+ my $nat;
+ my $fwaccessdport;
+ my $natchain;
+ my $icmptype;
+ foreach my $key (sort {$a <=> $b} keys %$hash){
+ next if (($$hash{$key}[6] eq 'RED' || $$hash{$key}[6] eq 'RED1') && $conexists eq 'off' );
+ $command="iptables -A";
+ if ($$hash{$key}[28] eq 'ON'){
+ $command='iptables -t nat -A';
+ $natip=&get_nat_ip($$hash{$key}[29],$$hash{$key}[31]);
+ if($$hash{$key}[31] eq 'dnat'){
+ $nat='DNAT';
+ if ($$hash{$key}[30] =~ /\|/){
+ $$hash{$key}[30]=~ tr/|/,/;
+ $fireport='-m multiport --dport '.$$hash{$key}[30];
+ }else{
+ $fireport='--dport '.$$hash{$key}[30] if ($$hash{$key}[30]>0);
+ }
+ }else{
+ $nat='SNAT';
+ }
+ }
+ $STAG='';
+ if($$hash{$key}[2] eq 'ON'){
+ #get source ip's
+ if ($$hash{$key}[3] eq 'cust_grp_src'){
+ foreach my $grp (sort {$a <=> $b} keys %customgrp){
+ if($customgrp{$grp}[0] eq $$hash{$key}[4]){
+ &get_address($customgrp{$grp}[3],$customgrp{$grp}[2],"src");
+ }
+ }
+ }else{
+ &get_address($$hash{$key}[3],$$hash{$key}[4],"src");
+ }
+ #get target ip's
+ if ($$hash{$key}[5] eq 'cust_grp_tgt'){
+ foreach my $grp (sort {$a <=> $b} keys %customgrp){
+ if($customgrp{$grp}[0] eq $$hash{$key}[6]){
+ &get_address($customgrp{$grp}[3],$customgrp{$grp}[2],"tgt");
+ }
+ }
+ }elsif($$hash{$key}[5] eq 'ipfire' ){
+ if($$hash{$key}[6] eq 'GREEN'){
+ $targethash{$key}[0]=$defaultNetworks{'GREEN_ADDRESS'};
+ }
+ if($$hash{$key}[6] eq 'BLUE'){
+ $targethash{$key}[0]=$defaultNetworks{'BLUE_ADDRESS'};
+ }
+ if($$hash{$key}[6] eq 'ORANGE'){
+ $targethash{$key}[0]=$defaultNetworks{'ORANGE_ADDRESS'};
+ }
+ if($$hash{$key}[6] eq 'ALL'){
+ $targethash{$key}[0]='0.0.0.0/0';
+ }
+ if($$hash{$key}[6] eq 'RED' || $$hash{$key}[6] eq 'RED1'){
+ open(FILE, "/var/ipfire/red/local-ipaddress")or die "Couldn't open local-ipaddress";
+ $targethash{$key}[0]= <FILE>;
+ close(FILE);
+ }else{
+ foreach my $alias (sort keys %aliases){
+ if ($$hash{$key}[6] eq $alias){
+ $targethash{$key}[0]=$aliases{$alias}{'IPT'};
+ }
+ }
+ }
+ }else{
+ &get_address($$hash{$key}[5],$$hash{$key}[6],"tgt");
+ }
+ ##get source prot and port
+ $SRC_TGT='SRC';
+ $SPORT = &get_port($hash,$key);
+ $SRC_TGT='';
+
+ ##get target prot and port
+ $DPROT=&get_prot($hash,$key);
+
+ if ($DPROT eq ''){$DPROT=' ';}
+ @DPROT=split(",",$DPROT);
+
+ #get time if defined
+ if($$hash{$key}[18] eq 'ON'){
+ my ($time1,$time2,$daylight);
+ my $daylight=$$hash{$key}[28];
+ $time1=&get_time($$hash{$key}[26],$daylight);
+ $time2=&get_time($$hash{$key}[27],$daylight);
+ if($$hash{$key}[19] ne ''){push (@timeframe,"Mon");}
+ if($$hash{$key}[20] ne ''){push (@timeframe,"Tue");}
+ if($$hash{$key}[21] ne ''){push (@timeframe,"Wed");}
+ if($$hash{$key}[22] ne ''){push (@timeframe,"Thu");}
+ if($$hash{$key}[23] ne ''){push (@timeframe,"Fri");}
+ if($$hash{$key}[24] ne ''){push (@timeframe,"Sat");}
+ if($$hash{$key}[25] ne ''){push (@timeframe,"Sun");}
+ $TIME=join(",",@timeframe);
+
+ $TIMEFROM="--timestart $time1 ";
+ $TIMETILL="--timestop $time2 ";
+ $TIME="-m time --weekdays $TIME $TIMEFROM $TIMETILL";
+ }
+ if ($MODE eq '1'){
+ print "NR:$key ";
+ foreach my $i (0 .. $#{$$hash{$key}}){
+ print "$i: $$hash{$key}[$i] ";
+ }
+ print "\n";
+ print"##################################\n";
+ #print rules to console
+ foreach my $DPROT (@DPROT){
+ $DPORT = &get_port($hash,$key,$DPROT);
+ $PROT=$DPROT;
+ $PROT="-p $PROT" if ($PROT ne '' && $PROT ne ' ');
+ foreach my $a (sort keys %sourcehash){
+ foreach my $b (sort keys %targethash){
+ if ($sourcehash{$a}[0] ne $targethash{$b}[0] && $targethash{$b}[0] ne 'none' || $sourcehash{$a}[0] eq '0.0.0.0/0.0.0.0'){
+ if($DPROT ne ''){
+ if(substr($sourcehash{$a}[0], 3, 3) ne 'mac' && $sourcehash{$a}[0] ne ''){ $STAG="-s";}
+ if(substr($DPORT, 2, 4) eq 'icmp'){
+ my @icmprule= split(",",substr($DPORT, 12,));
+ foreach (@icmprule){
+ $icmptype="--icmp-type ";
+ if ($_ eq "BLANK") {
+ $icmptype="";
+ $_="";
+ }
+ if ($$hash{$key}[17] eq 'ON'){
+ print "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j LOG\n";
+ }
+ print "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j $$hash{$key}[0]\n";
+ }
+ }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat'){
+ $natchain='NAT_DESTINATION';
+ if ($$hash{$key}[17] eq 'ON'){
+ print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $fireport $TIME -j LOG --log-prefix 'DNAT' \n";
+ }
+ my ($ip,$sub) =split("/",$targethash{$b}[0]);
+ #Process NAT with servicegroup used
+ if ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat' && $$hash{$key}[14] eq 'cust_srvgrp'){
+ print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip $DPORT\n";
+ $fwaccessdport=$DPORT;
+ }else{
+ print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip$DPORT\n";
+ $DPORT =~ s/\-/:/g;
+ if ($DPORT){
+ $fwaccessdport="--dport ".substr($DPORT,1,);
+ }elsif(! $DPORT && $$hash{$key}[30] ne ''){
+ if ($$hash{$key}[30]=~m/|/i){
+ $$hash{$key}[30] =~ s/\|/,/g;
+ $fwaccessdport="-m multiport --dport $$hash{$key}[30]";
+ }else{
+ $fwaccessdport="--dport $$hash{$key}[30]";
+ }
+ }
+ }
+ print "iptables -A FORWARDFW $PROT -i $con $STAG $sourcehash{$a}[0] -d $ip $fwaccessdport $TIME -j $$hash{$key}[0]\n";
+ next;
+ }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'snat'){
+ $natchain='NAT_SOURCE';
+ print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $nat --to $natip\n";
+ }
+ if ($$hash{$key}[17] eq 'ON' ){
+ print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j LOG\n";
+ }
+ if ($PROT ne '-p ICMP'){
+ print "iptables -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
+ }
+ if ($PROT eq '-p ICMP' && $$hash{$key}[9] eq 'All ICMP-Types'){
+ print "iptables -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
+ }
+ }
+ }
+ }
+ }
+ print"\n";
+ }
+ }elsif($MODE eq '0'){
+ foreach my $DPROT (@DPROT){
+ $DPORT = &get_port($hash,$key,$DPROT);
+ $PROT=$DPROT;
+ $PROT="-p $PROT" if ($PROT ne '' && $PROT ne ' ');
+ foreach my $a (sort keys %sourcehash){
+ foreach my $b (sort keys %targethash){
+ if ($sourcehash{$a}[0] ne $targethash{$b}[0] && $targethash{$b}[0] ne 'none' || $sourcehash{$a}[0] eq '0.0.0.0/0.0.0.0'){
+ if($DPROT ne ''){
+ if(substr($sourcehash{$a}[0], 3, 3) ne 'mac' && $sourcehash{$a}[0] ne ''){ $STAG="-s";}
+ #Process ICMP RULE
+ if(substr($DPORT, 2, 4) eq 'icmp'){
+ my @icmprule= split(",",substr($DPORT, 12,));
+ foreach (@icmprule){
+ $icmptype="--icmp-type ";
+ if ($_ eq "BLANK") {
+ $icmptype="";
+ $_="";
+ }
+ if ($$hash{$key}[17] eq 'ON'){
+ system ("$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j LOG");
+ }
+ system ("$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j $$hash{$key}[0]");
+ }
+ #PROCESS DNAT RULE (Portforward)
+ }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat'){
+ $natchain='NAT_DESTINATION';
+ if ($$hash{$key}[17] eq 'ON'){
+ system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $fireport $TIME -j LOG --log-prefix 'DNAT' \n";
+ }
+ my ($ip,$sub) =split("/",$targethash{$b}[0]);
+ #Process NAT with servicegroup used
+ if ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat' && $$hash{$key}[14] eq 'cust_srvgrp'){
+ system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip $DPORT\n";
+ $fwaccessdport=$DPORT;
+ }else{
+ system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip$DPORT\n";
+ $DPORT =~ s/\-/:/g;
+ if ($DPORT){
+ $fwaccessdport="--dport ".substr($DPORT,1,);
+ }elsif(! $DPORT && $$hash{$key}[30] ne ''){
+ if ($$hash{$key}[30]=~m/|/i){
+ $$hash{$key}[30] =~ s/\|/,/g;
+ $fwaccessdport="-m multiport --dport $$hash{$key}[30]";
+ }else{
+ $fwaccessdport="--dport $$hash{$key}[30]";
+ }
+ }
+ }
+ system "iptables -A FORWARDFW $PROT -i $con $STAG $sourcehash{$a}[0] -d $ip $fwaccessdport $TIME -j $$hash{$key}[0]\n";
+ next;
+ #PROCESS SNAT RULE
+ }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'snat'){
+ $natchain='NAT_SOURCE';
+ system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $nat --to $natip\n";
+ }
+ if ($$hash{$key}[17] eq 'ON' && substr($DPORT, 2, 4) ne 'icmp'){
+ system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j LOG\n";
+ }
+ #PROCESS EVERY OTHER RULE (If NOT ICMP, else the rule would be applied double)
+ if ($PROT ne '-p ICMP'){
+ system "iptables -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
+ }
+ #PROCESS Prot ICMP and type = All ICMP-Types
+ if ($PROT eq '-p ICMP' && $$hash{$key}[9] eq 'All ICMP-Types'){
+ system "iptables -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ %sourcehash=();
+ %targethash=();
+ undef $TIME;
+ undef $TIMEFROM;
+ undef $TIMETILL;
+ undef $fireport;
+ }
+}
+sub get_nat_ip
+{
+ my $val=shift;
+ my $type=shift;
+ my $result;
+ if($val eq 'RED' || $val eq 'GREEN' || $val eq 'ORANGE' || $val eq 'BLUE'){
+ $result=$defaultNetworks{$val.'_ADDRESS'};
+ }elsif($val eq 'ALL'){
+ $result='-i '.$con;
+ }elsif($val eq 'Default IP' && $type eq 'dnat'){
+ $result='-d '.$redip;
+ }elsif($val eq 'Default IP' && $type eq 'snat'){
+ $result=$redip;
+ }else{
+ foreach my $al (sort keys %aliases){
+ if($val eq $al && $type eq 'dnat'){
+ $result='-d '.$aliases{$al}{'IPT'};
+ }elsif($val eq $al && $type eq 'snat'){
+ $result=$aliases{$al}{'IPT'};
+ }
+ }
+ }
+ return $result;
+}
+sub get_time
+{
+ my $val=shift;
+ my $val1=shift;
+ my $time;
+ my $minutes;
+ my $ruletime;
+ $minutes = &utcmin($val);
+ $ruletime = $minutes + &time_get_utc($val);
+ if ($ruletime < 0){$ruletime +=1440;}
+ if ($ruletime > 1440){$ruletime -=1440;}
+ $time=sprintf "%02d:%02d", $ruletime / 60, $ruletime % 60;
+ return $time;
+}
+sub time_get_utc
+{
+ # Calculates the UTCtime from a given time
+ my $val=shift;
+ my @localtime=localtime(time);
+ my @gmtime=gmtime(time);
+ my $diff = ($gmtime[2]*60+$gmtime[1]%60)-($localtime[2]*60+$localtime[1]%60);
+ return $diff;
+}
+sub utcmin
+{
+ my $ruletime=shift;
+ my ($hrs,$min) = split(":",$ruletime);
+ my $newtime = $hrs*60+$min;
+ return $newtime;
+}
+sub p2pblock
+{
+ my $P2PSTRING;
+ my $DO;
+ open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile";
+ @p2ps = <FILE>;
+ close FILE;
+ my $CMD = "-m ipp2p";
+ foreach my $p2pentry (sort @p2ps) {
+ my @p2pline = split( /\;/, $p2pentry );
+ if ( $fwdfwsettings{'POLICY'} eq 'MODE1' ) {
+ $DO = "ACCEPT";
+ if ("$p2pline[2]" eq "on") {
+ $P2PSTRING = "$P2PSTRING --$p2pline[1]";
+ }
+ }else {
+ $DO = "RETURN";
+ if ("$p2pline[2]" eq "off") {
+ $P2PSTRING = "$P2PSTRING --$p2pline[1]";
+ }
+ }
+ }
+ if ($MODE eq 1){
+ if($P2PSTRING){
+ print"/sbin/iptables -A FORWARDFW $CMD $P2PSTRING -j $DO\n";
+ }
+ }else{
+ if($P2PSTRING){
+ system("/sbin/iptables -A FORWARDFW $CMD $P2PSTRING -j $DO");
+ }
+ }
+}
+sub get_address
+{
+ my $base=shift; #source of checking ($configfwdfw{$key}[x] or groupkey
+ my $base2=shift;
+ my $type=shift; #src or tgt
+ my $hash;
+ if ($type eq 'src'){
+ $hash=\%sourcehash;
+ }else{
+ $hash=\%targethash;
+ }
+ my $key = &General::findhasharraykey($hash);
+ if($base eq 'src_addr' || $base eq 'tgt_addr' ){
+ if (&General::validmac($base2)){
+ $$hash{$key}[0] = "-m mac --mac-source $base2";
+ }else{
+ $$hash{$key}[0] = $base2;
+ }
+ }elsif($base eq 'std_net_src' || $base eq 'std_net_tgt' || $base eq 'Standard Network'){
+ $$hash{$key}[0]=&fwlib::get_std_net_ip($base2,$con);
+ }elsif($base eq 'cust_net_src' || $base eq 'cust_net_tgt' || $base eq 'Custom Network'){
+ $$hash{$key}[0]=&fwlib::get_net_ip($base2);
+ }elsif($base eq 'cust_host_src' || $base eq 'cust_host_tgt' || $base eq 'Custom Host'){
+ $$hash{$key}[0]=&fwlib::get_host_ip($base2,$type);
+ }elsif($base eq 'ovpn_net_src' || $base eq 'ovpn_net_tgt' || $base eq 'OpenVPN static network'){
+ $$hash{$key}[0]=&fwlib::get_ovpn_net_ip($base2,1);
+ }elsif($base eq 'ovpn_host_src' ||$base eq 'ovpn_host_tgt' || $base eq 'OpenVPN static host'){
+ $$hash{$key}[0]=&fwlib::get_ovpn_host_ip($base2,33);
+ }elsif($base eq 'ovpn_n2n_src' ||$base eq 'ovpn_n2n_tgt' || $base eq 'OpenVPN N-2-N'){
+ $$hash{$key}[0]=&fwlib::get_ovpn_n2n_ip($base2,11);
+ }elsif($base eq 'ipsec_net_src' || $base eq 'ipsec_net_tgt' || $base eq 'IpSec Network'){
+ $$hash{$key}[0]=&fwlib::get_ipsec_net_ip($base2,11);
+ }elsif($base eq 'ipfire_src' ){
+ if($base2 eq 'GREEN'){
+ $$hash{$key}[0]=$defaultNetworks{'GREEN_ADDRESS'};
+ }
+ if($base2 eq 'BLUE'){
+ $$hash{$key}[0]=$defaultNetworks{'BLUE_ADDRESS'};
+ }
+ if($base2 eq 'ORANGE'){
+ $$hash{$key}[0]=$defaultNetworks{'ORANGE_ADDRESS'};
+ }
+ if($base2 eq 'ALL'){
+ $$hash{$key}[0]='0.0.0.0/0';
+ }
+ if($base2 eq 'RED' || $base2 eq 'RED1'){
+ open(FILE, "/var/ipfire/red/local-ipaddress")or die "Couldn't open local-ipaddress";
+ $$hash{$key}[0]= <FILE>;
+ close(FILE);
+ }else{
+ foreach my $alias (sort keys %aliases){
+ if ($base2 eq $alias){
+ $$hash{$key}[0]=$aliases{$alias}{'IPT'};
+ }
+ }
+ }
+ }
+}
+sub get_prot
+{
+ my $hash=shift;
+ my $key=shift;
+ #check AH,GRE,ESP or ICMP
+ if ($$hash{$key}[7] ne 'ON' && $$hash{$key}[11] ne 'ON'){
+ return "$$hash{$key}[8]";
+ }
+ if ($$hash{$key}[7] eq 'ON' || $$hash{$key}[11] eq 'ON'){
+ #check if servicegroup or service
+ if($$hash{$key}[14] eq 'cust_srv'){
+ return &fwlib::get_srv_prot($$hash{$key}[15]);
+ }elsif($$hash{$key}[14] eq 'cust_srvgrp'){
+ return &fwlib::get_srvgrp_prot($$hash{$key}[15]);
+ }elsif (($$hash{$key}[10] ne '' || $$hash{$key}[15] ne '') && $$hash{$key}[8] eq ''){ #when ports are used and prot set to "all"
+ return "TCP,UDP";
+ }elsif (($$hash{$key}[10] ne '' || $$hash{$key}[15] ne '') && ($$hash{$key}[8] eq 'TCP' || $$hash{$key}[8] eq 'UDP')){ #when ports are used and prot set to "tcp" or "udp"
+ return "$$hash{$key}[8]";
+ }elsif (($$hash{$key}[10] eq '' && $$hash{$key}[15] eq '') && $$hash{$key}[8] ne 'ICMP'){ #when ports are NOT used and prot NOT set to "ICMP"
+ return "$$hash{$key}[8]";
+ }else{
+ return "$$hash{$key}[8]";
+ }
+ }
+ #DNAT
+ if ($SRC_TGT eq '' && $$hash{$key}[31] eq 'dnat' && $$hash{$key}[11] eq '' && $$hash{$key}[12] ne ''){
+ return "$$hash{$key}[8]";
+ }
+}
+sub get_port
+{
+ my $hash=shift;
+ my $key=shift;
+ my $prot=shift;
+ if ($$hash{$key}[7] eq 'ON' && $SRC_TGT eq 'SRC'){
+ if ($$hash{$key}[10] ne ''){
+ $$hash{$key}[10] =~ s/\|/,/g;
+ if(index($$hash{$key}[10],",") > 0){
+ return "-m multiport --sport $$hash{$key}[10] ";
+ }else{
+ if($$hash{$key}[28] ne 'ON' || ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'snat') ||($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat') ){
+ return "--sport $$hash{$key}[10] ";
+ }else{
+ return ":$$hash{$key}[10]";
+ }
+ }
+ }
+ }elsif($$hash{$key}[11] eq 'ON' && $SRC_TGT eq ''){
+ if($$hash{$key}[14] eq 'TGT_PORT'){
+ if ($$hash{$key}[15] ne ''){
+ $$hash{$key}[15] =~ s/\|/,/g;
+ if(index($$hash{$key}[15],",") > 0){
+ return "-m multiport --dport $$hash{$key}[15] ";
+ }else{
+ if($$hash{$key}[28] ne 'ON' || ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'snat') ){
+ return "--dport $$hash{$key}[15] ";
+ }else{
+ $$hash{$key}[15] =~ s/\:/-/g;
+ return ":$$hash{$key}[15]";
+ }
+ }
+ }
+ }elsif($$hash{$key}[14] eq 'cust_srv'){
+ if ($prot ne 'ICMP'){
+ if($$hash{$key}[31] eq 'dnat' && $$hash{$key}[28] eq 'ON'){
+ return ":".&fwlib::get_srv_port($$hash{$key}[15],1,$prot);
+ }else{
+ return "--dport ".&fwlib::get_srv_port($$hash{$key}[15],1,$prot);
+ }
+ }elsif($prot eq 'ICMP' && $$hash{$key}[11] eq 'ON'){ #When PROT is ICMP and "use targetport is checked, this is an icmp-service
+ return "--icmp-type ".&fwlib::get_srv_port($$hash{$key}[15],3,$prot);
+ }
+ }elsif($$hash{$key}[14] eq 'cust_srvgrp'){
+ if ($prot ne 'ICMP'){
+ return &fwlib::get_srvgrp_port($$hash{$key}[15],$prot);
+ }
+ elsif($prot eq 'ICMP'){
+ return &fwlib::get_srvgrp_port($$hash{$key}[15],$prot);
+ }
+ }
+ }
+ #CHECK ICMP
+ if ($$hash{$key}[7] ne 'ON' && $$hash{$key}[11] ne 'ON' && $SRC_TGT eq ''){
+ if($$hash{$key}[9] ne '' && $$hash{$key}[9] ne 'All ICMP-Types'){
+ return "--icmp-type $$hash{$key}[9] ";
+ }elsif($$hash{$key}[9] eq 'All ICMP-Types'){
+ return;
+ }
+ }
+}
diff --git a/config/forwardfw/convert-dmz b/config/forwardfw/convert-dmz
deleted file mode 100755
index efc4386..0000000
--- a/config/forwardfw/convert-dmz
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/usr/bin/perl
-
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-# #
-# This script converts old dmz holes rules from old firewall #
-# to the new one. This is a 2-step process. #
-# STEP1: read old config and normalize settings #
-# STEP2: check valid ip and save valid rules to new firewall #
-# #
-###############################################################################
-my @current=();
-my @alias=();
-my %configdmz=();
-my %ifaces=();
-my %configfwdfw=();
-require '/var/ipfire/general-functions.pl';
-my $dmzconfig = "${General::swroot}/dmzholes/config";
-my $fwdfwconfig = "${General::swroot}/forward/config";
-my $ifacesettings = "${General::swroot}/ethernet/settings";
-my $field0 = 'ACCEPT';
-my $field1 = 'FORWARDFW';
-my $field2 = ''; #ON or emtpy
-my $field3 = ''; #std_net_src or src_addr
-my $field4 = ''; #ALL or IP-Address with /32
-my $field5 = ''; #std_net_tgt or tgt_addr
-my $field6 = ''; #IP or network name
-my $field11 = 'ON'; #use target port
-my $field12 = ''; #TCP or UDP
-my $field13 = 'All ICMP-Types';
-my $field14 = 'TGT_PORT';
-my $field15 = ''; #Port Number
-my $field16 = ''; #remark
-my $field26 = '00:00';
-my $field27 = '00:00';
-my $field28 = '';
-my $field29 = 'ALL';
-my $field30 = '';
-my $field31 = 'dnat';
-
-
-open(FILE, $dmzconfig) or die 'Unable to open config file.';
-my @current = <FILE>;
-close(FILE);
-#open LOGFILE
-open (LOG, ">/var/log/converters/dmz-convert.log") or die $!;
-&General::readhash($ifacesettings, \%ifaces);
-&General::readhasharray($fwdfwconfig,\%configfwdfw);
-&process_rules;
-sub process_rules{
- foreach my $line (@current){
- my $now=localtime;
- #get values from old configfile
- my ($a,$b,$c,$d,$e,$f,$g,$h) = split (",",$line);
- $h =~ s/\s*\n//gi;
- print LOG "$now Processing A: $a B: $b C: $c D: $d E: $e F: $f G: $g H: $h\n";
- #Now convert values and check ip addresses
- $a=uc($a);
- $e=uc($e);
- $field2=$e if($e eq 'ON');
- #SOURCE IP-check
- $b=&check_ip($b);
- if (&General::validipandmask($b)){
- #When ip valid, check if we have a network
- my ($ip,$subnet) = split ("/",$b);
- if ($f eq 'orange' && $ip eq $ifaces{'ORANGE_NETADDRESS'}){
- $field3='std_net_src';
- $field4='ORANGE';
- }elsif($f eq 'blue' && $ip eq $ifaces{'BLUE_NETADDRESS'}){
- $field3='std_net_src';
- $field4='BLUE';
- }elsif($f eq 'orange' && &General::IpInSubnet($ip,$ifaces{'ORANGE_NETADDRESS'},$ifaces{'ORANGE_NETMASK'})){
- $field3='src_addr';
- $field4=$b;
- }elsif($f eq 'blue' && &General::IpInSubnet($ip,$ifaces{'BLUE_NETADDRESS'},$ifaces{'BLUE_NETMASK'})){
- $field3='src_addr';
- $field4=$b;
- }else{
- print LOG "$now ->NOT Converted, source ip $b not part of source network $f \n\n";
- next;
- }
- }else{
- print LOG "$now -> SOURCE IP INVALID. \n\n";
- next;
- }
- #TARGET IP-check
- $c=&check_ip($c);
- if (&General::validipandmask($c)){
- my $now=localtime;
- #When ip valid, check if we have a network
- my ($ip,$subnet) = split ("/",$c);
- if ($g eq 'green' && $ip eq $ifaces{'GREEN_NETADDRESS'}){
- $field5='std_net_tgt';
- $field6='GREEN';
- }elsif($g eq 'blue' && $ip eq $ifaces{'BLUE_NETADDRESS'}){
- $field5='std_net_tgt';
- $field6='BLUE';
- }elsif($g eq 'green' && &General::IpInSubnet($ip,$ifaces{'GREEN_NETADDRESS'},$ifaces{'GREEN_NETMASK'})){
- $field5='tgt_addr';
- $field6=$c;
- }elsif($g eq 'blue' && &General::IpInSubnet($ip,$ifaces{'BLUE_NETADDRESS'},$ifaces{'BLUE_NETMASK'})){
- $field5='tgt_addr';
- $field6=$c;
- }else{
- print LOG "$now ->NOT Converted, target ip $c not part of target network $g \n\n";
- next;
- }
- }else{
- print LOG "$now -> TARGET IP INVALID. \n\n";
- next;
- }
- $field12=$a;
- #convert portrange
- $d =~ tr/-/:/;
- $field15=$d;
- $field16=$h;
- my $key = &General::findhasharraykey (\%configfwdfw);
- foreach my $i (0 .. 27) { $configfwdfw{$key}[$i] = "";}
- $configfwdfw{$key}[0] = $field0;
- $configfwdfw{$key}[1] = $field1;
- $configfwdfw{$key}[2] = $field2;
- $configfwdfw{$key}[3] = $field3;
- $configfwdfw{$key}[4] = $field4;
- $configfwdfw{$key}[5] = $field5;
- $configfwdfw{$key}[6] = $field6;
- $configfwdfw{$key}[7] = '';
- $configfwdfw{$key}[8] = '';
- $configfwdfw{$key}[9] = '';
- $configfwdfw{$key}[10] = '';
- $configfwdfw{$key}[11] = $field11;
- $configfwdfw{$key}[12] = $field12;
- $configfwdfw{$key}[13] = $field13;
- $configfwdfw{$key}[14] = $field14;
- $configfwdfw{$key}[15] = $field15;
- $configfwdfw{$key}[16] = $field16;
- $configfwdfw{$key}[17] = '';
- $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] = $field26;
- $configfwdfw{$key}[27] = $field27;
- $configfwdfw{$key}[28] = $field28;
- $configfwdfw{$key}[29] = $field29;
- $configfwdfw{$key}[30] = $field30;
- $configfwdfw{$key}[31] = $field31;
- print LOG "$Now -> Converted to $field0,$field1,$field2,$field3,$field4,$field5,$field6,,,,,$field11,$field12,$field13,$field14,$field15,$field16,,,,,,,,,,$field26,$field27\n";
- }
- &General::writehasharray($fwdfwconfig,\%configfwdfw);
-close (LOG);
-}
-
-sub check_ip
-{
- my $adr=shift;
- my $a;
- #ip with subnet in decimal
- if($adr =~ m/^(\d\d?\d?).(\d\d?\d?).(\d\d?\d?).(\d\d?\d?)\/(\d{1,2})$/){
- $adr=int($1).".".int($2).".".int($3).".".int($4);
- my $b = &General::iporsubtodec($5);
- $a=$adr."/".$b;
- }elsif($adr =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){
- $adr=int($1).".".int($2).".".int($3).".".int($4);
- if(&General::validip($adr)){
- $a=$adr."/32";
- }
- }
- if(&General::validipandmask($adr)){
- $a=&General::iporsubtodec($adr);
- }
- return $a;
-}
diff --git a/config/forwardfw/convert-outgoingfw b/config/forwardfw/convert-outgoingfw
deleted file mode 100755
index bd33059..0000000
--- a/config/forwardfw/convert-outgoingfw
+++ /dev/null
@@ -1,704 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-# #
-# This script converts old groups and firewallrules #
-# to the new one. This is a 3-step process. #
-# STEP1: convert groups ->LOG /var/log/converters #
-# STEP2: convert rules ->LOG /var/log/converters #
-# STEP3: convert P2P rules #
-# #
-###############################################################################
-
-require '/var/ipfire/general-functions.pl';
-
-use Socket;
-use File::Path;
-use File::Copy;
-
-my $ipgrouppath = "${General::swroot}/outgoing/groups/ipgroups/";
-my $macgrouppath = "${General::swroot}/outgoing/groups/macgroups/";
-my $outgoingrules = "${General::swroot}/outgoing/rules";
-my $outfwsettings = "${General::swroot}/outgoing/settings";
-my $host = "Converted ";
-my $confighosts = "${General::swroot}/fwhosts/customhosts";
-my $confignets = "${General::swroot}/fwhosts/customnetworks";
-my $configgroups = "${General::swroot}/fwhosts/customgroups";
-my $ovpnsettings = "${General::swroot}/ovpn/settings";
-my $ovpnconfig = "${General::swroot}/ovpn/ovpnconfig";
-my $ccdconfig = "${General::swroot}/ovpn/ccd.conf";
-my $fwdfwconfig = "${General::swroot}/forward/config";
-my $outfwconfig = "${General::swroot}/forward/outgoing";
-my $fwdfwsettings = "${General::swroot}/forward/settings";
-my @ipgroups = qx(ls $ipgrouppath);
-my @macgroups = qx(ls $macgrouppath);
-my @hostarray=();
-my %outsettings=();
-my %hosts=();
-my %nets=();
-my %groups=();
-my %settingsovpn=();
-my %configovpn=();
-my %ccdconf=();
-my %fwconfig=();
-my %fwconfigout=();
-my %fwdsettings=();
-my %ownnet=();
-my %ovpnSettings = ();
-&General::readhash("${General::swroot}/ovpn/settings", \%ovpnSettings);
-&General::readhash($outfwsettings,\%outsettings);
-&General::readhash("${General::swroot}/ethernet/settings", \%ownnet);
-#ONLY RUN if /var/ipfire/outgoing exists
-if ( -d "/var/ipfire/outgoing"){
- &process_groups;
- &process_rules;
- &process_p2p;
-}
-system("/usr/local/bin/forwardfwctrl");
-sub process_groups
-{
- if(! -d "/var/log/converters"){ mkdir("/var/log/converters");}
- if( -f "/var/log/converters/groups-convert.log"){rmtree("var/log/converters");}
- open (LOG, ">/var/log/converters/groups-convert.log") or die $!;
- #IP Group processing
- foreach my $group (@ipgroups){
- my $now=localtime;
- chomp $group;
- print LOG "\n$now Processing IP-GROUP: $group...\n";
- open (DATEI, "<$ipgrouppath/$group");
- my @zeilen = <DATEI>;
- foreach my $ip (@zeilen){
- chomp($ip);
- $ip =~ s/\s//gi;
- print LOG "$now Check IP $ip from Group $group ";
- my $val=&check_ip($ip);
- if($val){
- push(@hostarray,$val.",ip");
- print LOG "$now -> OK\n";
- }
- else{
- print LOG "$now -> IP \"$ip\" from group $group not converted (invalid IP) \n";
- }
- $val='';
- }
- &new_hostgrp($group,'ip');
- @hostarray=();
- }
- $group='';
- @zeilen=();
- @hostarray=();
- #MAC Group processing
- foreach my $group (@macgroups){
- chomp $group;
- print LOG "\nProcessing MAC-GROUP: $group...\n";
- open (DATEI, "<$macgrouppath/$group");
- my @zeilen = <DATEI>;
- foreach my $mac (@zeilen){
- chomp($mac);
- $mac =~ s/\s//gi;
- print LOG "$now Checking MAC $mac from group $group ";
- #MAC checking
- if(&General::validmac($mac)){
- $val=$mac;
- }
- if($val){
- push(@hostarray,$val.",mac");
- print LOG "$now -> OK\n";
- }
- else{
- print LOG "$now -> Mac $mac from group $group not converted (invalid MAC)\n";
- }
- $val='';
- }
- &new_hostgrp($group,'mac');
- @hostarray=();
- @zeilen=();
- }
- close (LOG);
-}
-sub check_ip
-{
- my $adr=shift;
- my $a;
- #ip with subnet in decimal
- if($adr =~ m/^(\d\d?\d?).(\d\d?\d?).(\d\d?\d?).(\d\d?\d?)\/(\d{1,2})$/){
- $adr=int($1).".".int($2).".".int($3).".".int($4);
- my $b = &General::iporsubtodec($5);
- $a=$adr."/".$b;
- }elsif($adr =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){
- $adr=int($1).".".int($2).".".int($3).".".int($4);
- if(&General::validip($adr)){
- $a=$adr."/255.255.255.255";
- }
- }
- if(&General::validipandmask($adr)){
- $a=&General::iporsubtodec($adr);
- }
- return $a;
-}
-sub new_hostgrp
-{
- &General::readhasharray($confighosts,\%hosts);
- &General::readhasharray($confignets,\%nets);
- &General::readhasharray($configgroups,\%groups);
- my $grp=shift;
- my $run=shift;
- my $name; #"converted"
- my $name2;
- my $name3; #custom host/custom net
- foreach my $adr (@hostarray){
- if($run eq 'ip'){
- my ($ip,$type) = split(",",$adr);
- my ($ippart,$subnet) = split("/",$ip);
- my ($byte1,$byte2,$byte3,$byte4) = split(/\./,$subnet);
- if($byte4 eq '255'){
- print LOG "Processing SINGLE HOST $ippart/$subnet from group $grp\n";
- if(!&check_host($ip)){
- my $key = &General::findhasharraykey(\%hosts);
- $name="host ";
- $name2=$name.$ippart;
- $name3="Custom Host";
- $hosts{$key}[0] = $name2;
- $hosts{$key}[1] = $type;
- $hosts{$key}[2] = $ip;
- $hosts{$key}[3] = '';
- $hosts{$key}[4] = 1;
- print LOG "->Host (IP) $ip added to custom hosts\n"
- }else{
- print LOG "->Host (IP) $ip already exists in custom hosts\n";
- $name="host ";
- $name2=$name.$ippart;
- foreach my $key (sort keys %hosts){
- if($hosts{$key}[0] eq $name2){
- $hosts{$key}[4]++;
- }
- }
- $name="host ";
- $name2=$name.$ippart;
- $name3="Custom Host";
- }
- }elsif($byte4 < '255'){
- print LOG "Processing NETWORK $ippart/$subnet from Group $grp\n";
- if(!&check_net($ippart,$subnet)){
- #Check if this network is one one of IPFire internal networks
- if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ippart,$ownnet{'GREEN_NETADDRESS'},$ownnet{'GREEN_NETMASK'}))
- {
- $name2='GREEN';
- $name3='Standard Network';
- }elsif (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ippart,$ownnet{'ORANGE_NETADDRESS'},$ownnet{'ORANGE_NETMASK'}))
- {
- $name2='ORANGE';
- $name3='Standard Network';
- }elsif (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ippart,$ownnet{'BLUE_NETADDRESS'},$ownnet{'BLUE_NETMASK'}))
- {
- $name2='BLUE';
- $name3='Standard Network';
- }elsif ($ippart eq '0.0.0.0')
- {
- $name2='ALL';
- $name3='Standard Network';
- }elsif(defined($ovpnSettings{'DOVPN_SUBNET'}) && "$ippart/".&General::iporsubtodec($subnet) eq $ovpnSettings{'DOVPN_SUBNET'})
- {
- $name2='OpenVPN-Dyn';
- $name3='Standard Network';
- }else{
- my $netkey = &General::findhasharraykey(\%nets);
- $name="net ";
- $name2=$name.$ippart;
- $name3="Custom Network";
- $nets{$netkey}[0] = $name2;
- $nets{$netkey}[1] = $ippart;
- $nets{$netkey}[2] = $subnet;
- $nets{$netkey}[3] = '';
- $nets{$netkey}[4] = 1;
- print LOG "->Network $ippart/$subnet added to custom networks\n";
- }
- }else{
- print LOG "Network $ippart already exists in custom networks\n";
- $name="net ";
- $name2=$name.$ippart;
- foreach my $key (sort keys %nets){
- if($nets{$key}[0] eq $name2){
- $nets{$key}[4]++;
- }
- }
- $name="net ";
- $name2=$name.$ippart;
- $name3="Custom Network";
- }
- }
- if($name2 && !&check_grp($grp,$name2)){
- my $grpkey = &General::findhasharraykey(\%groups);
- $groups{$grpkey}[0] = $grp;
- $groups{$grpkey}[1] = '';
- $groups{$grpkey}[2] = $name2;
- $groups{$grpkey}[3] = $name3;
- $groups{$grpkey}[4] = 0;
- print LOG "->$name2 added to group $grp\n";
- }
- }elsif($run eq 'mac'){
- #MACRUN
- my ($mac,$type) = split(",",$adr);
- print LOG "Processing HOST (MAC) $mac\n";
- if(!&check_host($mac)){
- my $key = &General::findhasharraykey(\%hosts);
- $name="host ";
- $name2=$name.$mac;
- $name3="Custom Host";
- $hosts{$key}[0] = $name2;
- $hosts{$key}[1] = $type;
- $hosts{$key}[2] = $mac;
- $hosts{$key}[3] = '';
- $hosts{$key}[4] = 1;
- print LOG "->Host (MAC) $mac added to custom hosts\n";
- }else{
- print LOG "->Host (MAC) $mac already exists in custom hosts \n";
- $name="host ";
- $name2=$name.$mac;
- foreach my $key (sort keys %hosts){
- if($hosts{$key}[0] eq $name2){
- $hosts{$key}[4]++;
- }
- }
- $name="host ";
- $name2=$name.$mac;
- $name3="Custom Host";
- }
- if($name2 && !&check_grp($grp,$name2)){
- my $grpkey = &General::findhasharraykey(\%groups);
- $groups{$grpkey}[0] = $grp;
- $groups{$grpkey}[1] = '';
- $groups{$grpkey}[2] = $name2;
- $groups{$grpkey}[3] = $name3;
- $groups{$grpkey}[4] = 0;
- print LOG "->$name2 added to group $grp\n";
- }
- }
- }
- @hostarray=();
- &General::writehasharray($confighosts,\%hosts);
- &General::writehasharray($configgroups,\%groups);
- &General::writehasharray($confignets,\%nets);
-
-}
-sub check_host
-{
- my $ip=shift;
- foreach my $key (sort keys %hosts)
- {
- if($hosts{$key}[2] eq $ip)
- {
- return 1;
- }
- }
- return 0;
-}
-sub check_net
-{
- my $ip=shift;
- my $sub=shift;
- foreach my $key (sort keys %nets)
- {
- if($nets{$key}[1] eq $ip && $nets{$key}[2] eq $sub)
- {
- return 1;
- }
- }
- return 0;
-}
-sub check_grp
-{
- my $grp=shift;
- my $value=shift;
- foreach my $key (sort keys %groups)
- {
- if($groups{$key}[0] eq $grp && $groups{$key}[2] eq $value)
- {
- return 1;
- }
- }
- return 0;
-}
-sub process_rules
-{
- my ($type,$action,$active,$grp1,$source,$grp2,$useport,$port,$prot,$grp3,$target,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to);
- #open LOG
- if( -f "/var/log/converters/outgoingfw-convert.log"){unlink ("/var/log/converters/outgoingfw-convert.log");}
- open (LOG, ">/var/log/converters/outgoingfw-convert.log") or die $!;
-
- &General::readhash($fwdfwsettings,\%fwdsettings);
- if ($outsettings{'POLICY'} eq 'MODE1'){
- $fwdsettings{'POLICY'}='MODE1';
- $fwdsettings{'POLICY1'}='MODE2';
- $type='ALLOW';
- $action='ACCEPT';
- }else{
- $fwdsettings{'POLICY'}='MODE2';
- $fwdsettings{'POLICY1'}='MODE2';
- $type='DENY';
- $action='DROP';
- }
- &General::writehash($fwdfwsettings,\%fwdsettings);
- open (DATEI, "<$outgoingrules");
- my @lines = <DATEI>;
- foreach my $rule (@lines)
- {
- my $now=localtime;
- chomp($rule);
- $port='';
- print LOG "$now processing: $rule\n";
- my @configline=();
- @configline = split( /\;/, $rule );
- my @prot=();
- if($configline[0] eq $type){
- #some variables we can use from old config
- if($configline[1] eq 'on'){ $active='ON';}else{$active='';}
- if($configline[3] eq 'all' && $configline[8] ne ''){
- push(@prot,"TCP");
- push(@prot,"UDP");
- }elsif($configline[3] eq 'all' && $configline[8] eq ''){
- push(@prot,"");
- }else{
- push(@prot,$configline[3]);
- }
- if($configline[4] ne ''){
- $configline[4] =~ s/,/;/g;
- $remark = $configline[4];
- }else{$remark = '';}
- if($configline[9] eq 'Active'){ $log='ON';}else{$log='';}
- if($configline[10] eq 'on' && $configline[11] eq 'on' && $configline[12] eq 'on' && $configline[13] eq 'on' && $configline[14] eq 'on' && $configline[15] eq 'on' && $configline[16] eq 'on'){
- if($configline[17] eq '00:00' && $configline[18] eq '00:00'){
- $time='';
- }else{
- $time='ON';
- }
- }else{
- $time='ON';
- }
- $time_mon=$configline[10];
- $time_tue=$configline[11];
- $time_wed=$configline[12];
- $time_thu=$configline[13];
- $time_fri=$configline[14];
- $time_sat=$configline[15];
- $time_sun=$configline[16];
- $time_from=$configline[17];
- $time_to=$configline[18];
- ############################################################
- #sourcepart
- if ($configline[2] eq 'green') {
- $grp1='std_net_src';
- $source='GREEN';
- }elsif ($configline[2] eq 'orange') {
- $grp1='std_net_src';
- $source='ORANGE';
- }elsif ($configline[2] eq 'red') {
- $grp1='std_net_src';
- $source='IPFire';
- &General::readhash($fwdfwsettings,\%fwdsettings);
- $fwdsettings{'POLICY1'}=$outsettings{'POLICY'};
- $fwdsettings{'POLICY'}=$outsettings{'POLICY'};
- &General::writehash($fwdfwsettings,\%fwdsettings);
- }elsif ($configline[2] eq 'blue') {
- $grp1='std_net_src';
- $source='BLUE';
- }elsif ($configline[2] eq 'ipsec') {
- print LOG "$now -> Rule not converted, ipsec+ interface is obsolet since IPFire 2.7 \n";
- next;
- }elsif ($configline[2] eq 'ovpn') {
- print LOG "$now ->Creating networks/groups for OpenVPN...\n";
- &build_ovpn_grp;
- $grp1='cust_grp_src';
- $source='ovpn'
- }elsif ($configline[2] eq 'ip') {
- my $z=&check_ip($configline[5]);
- if($z){
- my ($ipa,$subn) = split("/",$z);
- $subn=&General::iporsubtocidr($subn);
- $grp1='src_addr';
- $source="$ipa/$subn";
- }else{
- print LOG "$now -> Rule not converted, missing/invalid source ip \"$configline[5]\"\n";
- next;
- }
- }elsif ($configline[2] eq 'mac') {
- if(&General::validmac($configline[6])){
- $grp1='src_addr';
- $source=$configline[6];
- }else{
- print LOG"$now -> Rule not converted, invalid MAC \"$configline[6]\" \n";
- next;
- }
- }elsif ($configline[2] eq 'all') {
- $grp1='std_net_src';
- $source='ALL';
- }else{
- foreach my $key (sort keys %groups){
- if($groups{$key}[0] eq $configline[2]){
- $grp1='cust_grp_src';
- $source=$configline[2];
- }
- }
- if ($grp1 eq '' || $source eq ''){
- print LOG "$now -> Rule not converted, no valid source recognised\n";
- }
- }
- ############################################################
- #destinationpart
- if($configline[7] ne ''){
- my $address=&check_ip($configline[7]);
- if($address){
- my ($dip,$dsub) = split("/",$address);
- $dsub=&General::iporsubtocidr($dsub);
- $grp2='tgt_addr';
- $target="$dip/$dsub";
- }elsif(!$address){
- my $getwebsiteip=&get_ip_from_domain($configline[7]);
- if ($getwebsiteip){
- $grp2='tgt_addr';
- $target=$getwebsiteip;
- $remark.=" $configline[7]";
- }else{
- print LOG "$now -> Rule not converted, invalid domain \"$configline[7]\"\n";
- next;
- }
- }
- }else{
- $grp2='std_net_tgt';
- $target='ALL';
- }
- if($configline[8] ne '' && $configline[3] ne 'gre' && $configline[3] ne 'esp'){
- my @values=();
- my @parts=split(",",$configline[8]);
- foreach (@parts){
- $_=~ tr/-/:/;
- if (!($_ =~ /^(\d+)\:(\d+)$/)) {
- if(&General::validport($_)){
- $useport='ON';
- push (@values,$_);
- $grp3='TGT_PORT';
- }else{
- print LOG "$now -> Rule not converted, invalid destination Port \"$configline[8]\"\n";
- next;
- }
- }else{
- my ($a1,$a2) = split(/\:/,$_);
- if (&General::validport($a1) && &General::validport($a2) && $a1 < $a2){
- $useport='ON';
- push (@values,"$a1:$a2");
- $grp3='TGT_PORT';
- }else{
- print LOG "$now -> Rule not converted, invalid destination Port \"$configline[8]\"\n";
- next;
- }
- }
- }
- $port=join("|",@values);
- @values=();
- @parts=();
- }
- }else{
- print LOG "-> Rule not converted because not for Firewall mode $outsettings{'POLICY'} (we are only converting for actual mode)\n";
- }
- &General::readhasharray($fwdfwconfig,\%fwconfig);
- &General::readhasharray($outfwconfig,\%fwconfigout);
- my $check;
- my $chain;
- foreach my $protocol (@prot){
- my $now=localtime;
- if ($source eq 'IPFire'){
- $chain='OUTGOINGFW';
- }else{
- $chain='FORWARDFW';
- }
- $protocol=uc($protocol);
- print LOG "$now -> Converted: $action,$chain,$active,$grp1,$source,$grp2,$target,,,,,$useport,$protocol,,$grp3,$port,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to\n";
- #Put rules into system....
- ###########################
- #check for double rules
- foreach my $key (sort keys %fwconfig){
- if("$action,$chain,$active,$grp1,$source,$grp2,$target,,,,,$useport,$protocol,,$grp3,$port,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to"
- eq "$fwconfig{$key}[0],$fwconfig{$key}[1],$fwconfig{$key}[2],$fwconfig{$key}[3],$fwconfig{$key}[4],$fwconfig{$key}[5],$fwconfig{$key}[6],,,,,$fwconfig{$key}[11],$fwconfig{$key}[12],,$fwconfig{$key}[14],$fwconfig{$key}[15],$fwconfig{$key}[16],$fwconfig{$key}[17],$fwconfig{$key}[18],$fwconfig{$key}[19],$fwconfig{$key}[20],$fwconfig{$key}[21],$fwconfig{$key}[22],$fwconfig{$key}[23],$fwconfig{$key}[24],$fwconfig{$key}[25],$fwconfig{$key}[26],$fwconfig{$key}[27]"){
- $check='on';
- next;
- }
- }
- if($check ne 'on'){
- #increase groupcounter
- my $check1;
- if($grp1 eq 'cust_grp_src'){
- foreach my $key (sort keys %groups){
- if($groups{$key}[0] eq $source){
- $groups{$key}[4]++;
- $check1='on';
- }
- }
- if($check1 eq 'on'){
- &General::writehasharray($configgroups,\%groups);
- }
- }
- if ($chain eq 'FORWARDFW'){
- my $key = &General::findhasharraykey(\%fwconfig);
- $fwconfig{$key}[0] = $action;
- $fwconfig{$key}[1] = $chain;
- $fwconfig{$key}[2] = $active;
- $fwconfig{$key}[3] = $grp1;
- $fwconfig{$key}[4] = $source;
- $fwconfig{$key}[5] = $grp2;
- $fwconfig{$key}[6] = $target;
- $fwconfig{$key}[11] = $useport;
- $fwconfig{$key}[12] = $protocol;
- $fwconfig{$key}[14] = $grp3;
- $fwconfig{$key}[15] = $port;
- $fwconfig{$key}[16] = $remark;
- $fwconfig{$key}[17] = $log;
- $fwconfig{$key}[18] = $time;
- $fwconfig{$key}[19] = $time_mon;
- $fwconfig{$key}[20] = $time_tue;
- $fwconfig{$key}[21] = $time_wed;
- $fwconfig{$key}[22] = $time_thu;
- $fwconfig{$key}[23] = $time_fri;
- $fwconfig{$key}[24] = $time_sat;
- $fwconfig{$key}[25] = $time_sun;
- $fwconfig{$key}[26] = $time_from;
- $fwconfig{$key}[27] = $time_to;
- $fwconfig{$key}[28] = '';
- $fwconfig{$key}[29] = 'ALL';
- $fwconfig{$key}[30] = '';
- $fwconfig{$key}[31] = 'dnat';
- }else{
- my $key = &General::findhasharraykey(\%fwconfigout);
- $fwconfigout{$key}[0] = $action;
- $fwconfigout{$key}[1] = $chain;
- $fwconfigout{$key}[2] = $active;
- $fwconfigout{$key}[3] = $grp1;
- $fwconfigout{$key}[4] = $source;
- $fwconfigout{$key}[5] = $grp2;
- $fwconfigout{$key}[6] = $target;
- $fwconfigout{$key}[11] = $useport;
- $fwconfigout{$key}[12] = $protocol;
- $fwconfigout{$key}[14] = $grp3;
- $fwconfigout{$key}[15] = $port;
- $fwconfigout{$key}[16] = $remark;
- $fwconfigout{$key}[17] = $log;
- $fwconfigout{$key}[18] = $time;
- $fwconfigout{$key}[19] = $time_mon;
- $fwconfigout{$key}[20] = $time_tue;
- $fwconfigout{$key}[21] = $time_wed;
- $fwconfigout{$key}[22] = $time_thu;
- $fwconfigout{$key}[23] = $time_fri;
- $fwconfigout{$key}[24] = $time_sat;
- $fwconfigout{$key}[25] = $time_sun;
- $fwconfigout{$key}[26] = $time_from;
- $fwconfigout{$key}[27] = $time_to;
- $fwconfigout{$key}[28] = '';
- $fwconfigout{$key}[29] = 'ALL';
- $fwconfigout{$key}[30] = '';
- $fwconfigout{$key}[31] = 'dnat';
- }
- &General::writehasharray($fwdfwconfig,\%fwconfig);
- &General::writehasharray($outfwconfig,\%fwconfigout);
- }
- }
- @prot=();
- }
- close(LOG);
- @lines=();
-}
-sub get_ip_from_domain
-{
- $web=shift;
- my $resolvedip;
- my $checked;
- my ($name,$aliases,$addrtype,$length,@addrs) = gethostbyname($web);
- if(@addrs){
- $resolvedip=inet_ntoa($addrs[0]);
- return $resolvedip;
- }
- return;
-}
-sub build_ovpn_grp
-{
- my $now=localtime;
- &General::readhasharray($confighosts,\%hosts);
- &General::readhasharray($confignets,\%nets);
- &General::readhasharray($configgroups,\%groups);
- &General::readhasharray($ovpnconfig,\%configovpn);
- &General::readhasharray($ccdconfig,\%ccdconf);
- &General::readhash($ovpnsettings,\%settingsovpn);
- #get ovpn nets
- my @ovpnnets=();
- if($settingsovpn{'DOVPN_SUBNET'}){
- my ($net,$subnet)=split("/",$settingsovpn{'DOVPN_SUBNET'});
- push (@ovpnnets,"$net,$subnet,dynamic");
- print LOG "$now ->found dynamic OpenVPN net\n";
- }
- foreach my $key (sort keys %ccdconf){
- my ($net,$subnet)=split("/",$ccdconf{$key}[1]);
- $subnet=&General::iporsubtodec($subnet);
- push (@ovpnnets,"$net,$subnet,$ccdconf{$key}[0]");
- print LOG "$now ->found OpenVPN static net $net/$subnet\n";
- }
- foreach my $key (sort keys %configovpn){
- if ($configovpn{$key}[3] eq 'net'){
- my ($net,$subnet)=split("/",$configovpn{$key}[27]);
- push (@ovpnnets,"$net,$subnet,$configovpn{$key}[2]");
- print LOG "$now ->found OpenVPN $net/$subnet $configovpn{$key}[2]\n";
- }
- }
- #add ovpn nets to customnetworks/groups
- foreach my $line (@ovpnnets){
- my $now=localtime;
- my ($net,$subnet,$name) = split(",",$line);
- if (!&check_net($net,$subnet)){
- my $netkey = &General::findhasharraykey(\%nets);
- $name2=$name."(ovpn)".$net;
- $name3="Custom Network";
- $nets{$netkey}[0] = $name2;
- $nets{$netkey}[1] = $net;
- $nets{$netkey}[2] = $subnet;
- $nets{$netkey}[3] = '';
- $nets{$netkey}[4] = 1;
- print LOG "$now ->added $name2 $net/$subnet to customnetworks\n";
- }else{
- print LOG "-> Custom Network with same IP already exist \"$net/$subnet\" (you can ignore this, if this run was manual from shell)\n";
- }
- if($name2){
- my $grpkey = &General::findhasharraykey(\%groups);
- $groups{$grpkey}[0] = "ovpn";
- $groups{$grpkey}[1] = '';
- $groups{$grpkey}[2] = $name2;
- $groups{$grpkey}[3] = "Custom Network";
- $groups{$grpkey}[4] = 0;
- print LOG "$now ->added $name2 to customgroup ovpn\n";
- }
- $name2='';
- }
- @ovpnnets=();
- &General::writehasharray($confighosts,\%hosts);
- &General::writehasharray($configgroups,\%groups);
- &General::writehasharray($confignets,\%nets);
- print LOG "$now ->finished OVPN\n";
-}
-sub process_p2p
-{
- copy("/var/ipfire/outgoing/p2protocols","/var/ipfire/forward/p2protocols");
- chmod oct('0777'), '/var/ipfire/forward/p2protocols';
-}
diff --git a/config/forwardfw/convert-portfw b/config/forwardfw/convert-portfw
deleted file mode 100755
index a37383e..0000000
--- a/config/forwardfw/convert-portfw
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-# #
-# This script converts old portforwarding rules from old Firewall #
-# to the new one. This is a 3-step process. #
-# STEP1: read old config and normalize settings #
-# STEP2: create new rules from old ones #
-# STEP3: check if rule already exists, when not, put it into #
-# /var/ipfire/forward/nat #
-###############################################################################
-require '/var/ipfire/general-functions.pl';
-my @values=();
-my @built_rules=();
-my %nat=();
-my $portfwconfig = "${General::swroot}/portfw/config";
-my $confignat = "${General::swroot}/forward/config";
-my ($key,$flag,$prot,$ipfireport,$target,$targetport,$active,$alias,$source,$remark);
-my ($key1,$flag1,$prot1,$ipfireport1,$target1,$targetport1,$active1,$alias1,$source1,$remark1);
-my $count=0;
-my $jump;
-if(! -d "/var/log/converters"){ mkdir("/var/log/converters");}
-open(FILE, $portfwconfig) or die 'Unable to open config file.';
-my @current = <FILE>;
-close(FILE);
-open (LOG, ">/var/log/converters/portfw-convert.log") or die $!;
-open(ALIAS, "${General::swroot}/ethernet/aliases") or die 'Unable to open aliases file.';
-my @alias = <ALIAS>;
-close(ALIAS);
-&get_config;
-&build_rules;
-&write_rules;
-sub get_config
-{
- print LOG "STEP 1: Get config from old portforward\n#########################################\n";
- foreach my $line (@current){
- if($jump eq '1'){
- $jump='';
- $count++;
- next;
- }
- my $u=$count+1;
- ($key,$flag,$prot,$ipfireport,$target,$targetport,$active,$alias,$source,$remark) = split(",",$line);
- ($key1,$flag1,$prot1,$ipfireport1,$target1,$targetport1,$active1,$alias1,$source1,$remark1) = split(",",$current[$u]);
- if ($flag1 eq '1'){
- $source=$source1;
- $jump='1';
- }
- my $now=localtime;
- chomp($remark);
- print LOG "$now processing-> KEY: $key FLAG: $flag PROT: $prot FIREPORT: $ipfireport TARGET: $target TGTPORT: $targetport ACTIVE: $active ALIAS: $alias SOURCE: $source REM: $remark Doublerule: $jump\n";
- push (@values,$prot.",".$ipfireport.",".$target.",".$targetport.",".$active.",".$alias.",".$source.",".$remark);
- $count++;
- }
-}
-sub build_rules
-{
- print LOG "\nSTEP 2: Convert old portforwardrules in a useable format\n########################################################\n";
- my $src;
- my $src1;
- my $ipfireip;
- my $count=0;
- my $stop;
- #build rules for new firewall
- foreach my $line (@values){
- chomp ($line);
- ($prot,$ipfireport,$target,$targetport,$active,$alias,$source,$remark)=split(",",$line);
- $count++;
- #get sourcepart
- if($source eq '0.0.0.0/0'){
- $src = 'std_net_src';
- $src1 = 'ALL';
- }else{
- $src = 'src_addr';
- my ($a,$b) = split("/",$source);
- $src1 = $a."/32";
- }
- #get ipfire ip
- if($alias eq '0.0.0.0'){
- $alias='ALL';
- }else{
- foreach my $ali (@alias){
- my ($alias_ip,$alias_active,$alias_name) = split (",",$ali);
- if($alias eq $alias_ip){
- chomp($alias_name);
- $alias=$alias_name;
- }
- }
- }
- $active = uc $active;
- $prot = uc $prot;
- chomp($remark);
- push (@built_rules,"ACCEPT,FORWARDFW,$active,$src,$src1,tgt_addr,$target/32,ON,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat");
- my $now=localtime;
- print LOG "$now Converted-> KEY: $count ACCEPT,FORWARDFW,$active,$src,$src1,tgt_addr,$target/32,ON,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat\n";
- }
-}
-sub write_rules
-{
- my $skip='';
- my $id;
- print LOG "\nSTEP 3: Create DNAT rules in new firewall\n#########################################\n";
- &General::readhasharray($confignat,\%nat);
- foreach my $line (@built_rules){
- $skip='';
- my ($action,$chain,$active,$src,$src1,$tgt,$tgt1,$use_prot,$prot,$dummy,$tgt_port,$tgt_port1,$remark,$from,$to,$use_port,$alias,$ipfireport,$dnat) = split (",",$line);
- foreach my $key (sort keys %nat){
- if ($line eq "$nat{$key}[0],$nat{$key}[1],$nat{$key}[2],$nat{$key}[3],$nat{$key}[4],$nat{$key}[5],$nat{$key}[6],$nat{$key}[11],$nat{$key}[12],$nat{$key}[13],$nat{$key}[14],$nat{$key}[15],$nat{$key}[16],$nat{$key}[26],$nat{$key}[27],$nat{$key}[28],$nat{$key}[29],$nat{$key}[30],$nat{$key}[31]"){
- my $now=localtime;
- print LOG "$now SKIP-> Rule $nat{$key}[0],$nat{$key}[1],$nat{$key}[2],$nat{$key}[3],$nat{$key}[4],$nat{$key}[5],$nat{$key}[6],$nat{$key}[11],$nat{$key}[12],$nat{$key}[13],$nat{$key}[14],$nat{$key}[15],$nat{$key}[16],$nat{$key}[26],$nat{$key}[27],$nat{$key}[28],$nat{$key}[29],$nat{$key}[30],$nat{$key}[31] ->EXISTS\n";
- $skip='1';
- }
- }
- if ($skip ne '1'){
- $id = &General::findhasharraykey(\%nat);
- $nat{$id}[0] = $action;
- $nat{$id}[1] = $chain;
- $nat{$id}[2] = $active;
- $nat{$id}[3] = $src;
- $nat{$id}[4] = $src1;
- $nat{$id}[5] = $tgt;
- $nat{$id}[6] = $tgt1;
- $nat{$id}[11] = $use_prot;
- $nat{$id}[12] = $prot;
- $nat{$id}[13] = $dummy;
- $nat{$id}[14] = $tgt_port;
- $nat{$id}[15] = $tgt_port1;
- $nat{$id}[16] = $remark;
- $nat{$id}[26] = $from;
- $nat{$id}[27] = $to;
- $nat{$id}[28] = $use_port;
- $nat{$id}[29] = $alias;
- $nat{$id}[30] = $ipfireport;
- $nat{$id}[31] = $dnat;
- my $now=localtime;
- print LOG "$now NEW RULE-> Rule $nat{$id}[0],$nat{$id}[1],$nat{$id}[2],$nat{$id}[3],$nat{$id}[4],$nat{$id}[5],$nat{$id}[6],$nat{$id}[11],$nat{$id}[12],$nat{$id}[13],$nat{$id}[14],$nat{$id}[15],$nat{$id}[16],$nat{$id}[26],$nat{$id}[27],$nat{$id}[28],$nat{$id}[29],$nat{$id}[30],$nat{$id}[31]\n";
- }
- }
- &General::writehasharray($confignat,\%nat);
-}
-close (LOG);
diff --git a/config/forwardfw/convert-xtaccess b/config/forwardfw/convert-xtaccess
deleted file mode 100755
index d86c445..0000000
--- a/config/forwardfw/convert-xtaccess
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-# #
-#This script converts old xtaccess rules to new firewall #
-#Logfiles are created under /var/log/converters #
-# #
-###############################################################################
-my @current=();
-my @alias=();
-my %configinputfw=();
-require '/var/ipfire/general-functions.pl';
-my $xtaccessconfig = "${General::swroot}/xtaccess/config";
-my $inputfwconfig = "${General::swroot}/forward/input";
-my $aliasconfig = "${General::swroot}/ethernet/aliases";
-my $field0='ACCEPT';
-my $field1='INPUTFW';
-my $field2=''; #ON or emtpy
-my $field3=''; #std_net_src or src_addr
-my $field4=''; #ALL or IP-Address with /32
-my $field5='ipfire';
-my $field6=''; #Default IP or alias name
-my $field11='ON'; #use target port
-my $field12=''; #TCP or UDP
-my $field13='All ICMP-Types';
-my $field14='TGT_PORT';
-my $field15=''; #Port Number
-my $field16=''; #remark
-my $field26='00:00';
-my $field27='00:00';
-my $field28 = '';
-my $field29 = 'ALL';
-my $field30 = '';
-my $field31 = 'dnat';
-open(FILE, $xtaccessconfig) or die 'Unable to open config file.';
-my @current = <FILE>;
-close(FILE);
-open(FILE1, $aliasconfig) or die 'Unable to open config file.';
-my @alias = <FILE1>;
-close(FILE1);
-&General::readhasharray($inputfwconfig,\%configinputfw);
-
-foreach my $line (@current){
- my ($a,$b,$c,$d,$e,$f) = split (",",$line);
- $e =~ s/\R//g;
- if ($f gt ''){
- $f =~ s/\R//g;
- $field16=$f;
- }
- #active or not
- $field2=uc($d);
- #get protocol
- if ($a eq 'tcp'){ $field12 ='TCP';}else{$field12='UDP';}
- #check source address
- if ($b eq '0.0.0.0/0'){
- $field3='std_net_src';
- $field4='ALL';
- }elsif($b =~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){
- $field3='src_addr';
- $field4=$b."/32";
- }elsif ($b =~ /^(.*?)\/(.*?)$/) {
- $field3='src_addr';
- $field4=$b;
- }else{
- print "Regel konnte nicht konvertiert werden!\n";
- }
- #check ipfire address
- if ($e eq '0.0.0.0'){
- $field6 = 'RED1';
- }else{
- foreach my $line (@alias){
- my ($ip,$state,$aliasname) = split (",",$line);
- if ($ip eq $e){
- $aliasname =~ s/\R//g;
- $field6 = $aliasname;
- }
- }
- }
- #get target port
- $c=~ s/\R//g;
- $c=~ tr/-/:/;
- if ($c =~ /^(\D)\:(\d+)$/) {
- $c = "1:$2";
- }
- if ($c =~ /^(\d+)\:(\D)$/) {
- $c = "$1:65535";
- }
- $field15=$c;
- my $key = &General::findhasharraykey (\%configinputfw);
- foreach my $i (0 .. 31) { $configinputfw{$key}[$i] = "";}
- $configinputfw{$key}[0] = $field0;
- $configinputfw{$key}[1] = $field1;
- $configinputfw{$key}[2] = $field2;
- $configinputfw{$key}[3] = $field3;
- $configinputfw{$key}[4] = $field4;
- $configinputfw{$key}[5] = $field5;
- $configinputfw{$key}[6] = $field6;
- $configinputfw{$key}[7] = '';
- $configinputfw{$key}[8] = '';
- $configinputfw{$key}[9] = '';
- $configinputfw{$key}[10] = '';
- $configinputfw{$key}[11] = $field11;
- $configinputfw{$key}[12] = $field12;
- $configinputfw{$key}[13] = $field13;
- $configinputfw{$key}[14] = $field14;
- $configinputfw{$key}[15] = $field15;
- $configinputfw{$key}[16] = $field16;
- $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] = $field26;
- $configinputfw{$key}[27] = $field27;
- $configinputfw{$key}[28] = $field28;
- $configinputfw{$key}[29] = $field29;
- $configinputfw{$key}[30] = $field30;
- $configinputfw{$key}[31] = $field31;
- &General::writehasharray($inputfwconfig,\%configinputfw);
-}
diff --git a/config/forwardfw/firewall-lib.pl b/config/forwardfw/firewall-lib.pl
deleted file mode 100755
index f1e8403..0000000
--- a/config/forwardfw/firewall-lib.pl
+++ /dev/null
@@ -1,256 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-use strict;
-no warnings 'uninitialized';
-
-package fwlib;
-
-my %customnetwork=();
-my %customhost=();
-my %customgrp=();
-my %customservice=();
-my %customservicegrp=();
-my %ccdnet=();
-my %ccdhost=();
-my %ipsecconf=();
-my %ipsecsettings=();
-my %netsettings=();
-my %ovpnsettings=();
-
-require '/var/ipfire/general-functions.pl';
-
-my $confignet = "${General::swroot}/fwhosts/customnetworks";
-my $confighost = "${General::swroot}/fwhosts/customhosts";
-my $configgrp = "${General::swroot}/fwhosts/customgroups";
-my $configsrv = "${General::swroot}/fwhosts/customservices";
-my $configsrvgrp = "${General::swroot}/fwhosts/customservicegrp";
-my $configccdnet = "${General::swroot}/ovpn/ccd.conf";
-my $configccdhost = "${General::swroot}/ovpn/ovpnconfig";
-my $configipsec = "${General::swroot}/vpn/config";
-my $configovpn = "${General::swroot}/ovpn/settings";
-my $val;
-my $field;
-
-&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
-&General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings);
-&General::readhash("${General::swroot}/vpn/settings", \%ipsecsettings);
-
-
-&General::readhasharray("$confignet", \%customnetwork);
-&General::readhasharray("$confighost", \%customhost);
-&General::readhasharray("$configgrp", \%customgrp);
-&General::readhasharray("$configccdnet", \%ccdnet);
-&General::readhasharray("$configccdhost", \%ccdhost);
-&General::readhasharray("$configipsec", \%ipsecconf);
-&General::readhasharray("$configsrv", \%customservice);
-&General::readhasharray("$configsrvgrp", \%customservicegrp);
-
-sub get_srv_prot
-{
- my $val=shift;
- foreach my $key (sort {$a <=> $b} keys %customservice){
- if($customservice{$key}[0] eq $val){
- if ($customservice{$key}[0] eq $val){
- return $customservice{$key}[2];
- }
- }
- }
-}
-sub get_srvgrp_prot
-{
- my $val=shift;
- my @ips=();
- my $tcp;
- my $udp;
- my $icmp;
- foreach my $key (sort {$a <=> $b} keys %customservicegrp){
- if($customservicegrp{$key}[0] eq $val){
- if (&get_srv_prot($customservicegrp{$key}[2]) eq 'TCP'){
- $tcp=1;
- }elsif(&get_srv_prot($customservicegrp{$key}[2]) eq 'UDP'){
- $udp=1;
- }elsif(&get_srv_prot($customservicegrp{$key}[2]) eq 'ICMP'){
- $icmp=1;
- }
- }
- }
- if ($tcp eq '1'){push (@ips,'TCP');}
- if ($udp eq '1'){push (@ips,'UDP');}
- if ($icmp eq '1'){push (@ips,'ICMP');}
- my $back=join(",",@ips);
- return $back;
-
-}
-
-
-sub get_srv_port
-{
- my $val=shift;
- my $field=shift;
- my $prot=shift;
- foreach my $key (sort {$a <=> $b} keys %customservice){
- if($customservice{$key}[0] eq $val){
- if($customservice{$key}[2] eq $prot){
- return $customservice{$key}[$field];
- }
- }
- }
-}
-sub get_srvgrp_port
-{
- my $val=shift;
- my $prot=shift;
- my $back;
- my $value;
- my @ips=();
- foreach my $key (sort {$a <=> $b} keys %customservicegrp){
- if($customservicegrp{$key}[0] eq $val){
- if ($prot ne 'ICMP'){
- $value=&get_srv_port($customservicegrp{$key}[2],1,$prot);
- }elsif ($prot eq 'ICMP'){
- $value=&get_srv_port($customservicegrp{$key}[2],3,$prot);
- }
- push (@ips,$value) if ($value ne '') ;
- }
- }
- if($prot ne 'ICMP'){
- if ($#ips gt 0){$back="-m multiport --dports ";}else{$back="--dport ";}
- }elsif ($prot eq 'ICMP'){
- $back="--icmp-type ";
- }
-
- $back.=join(",",@ips);
- return $back;
-}
-sub get_ipsec_net_ip
-{
- my $val=shift;
- my $field=shift;
- foreach my $key (sort {$a <=> $b} keys %ipsecconf){
- if($ipsecconf{$key}[1] eq $val){
- return $ipsecconf{$key}[$field];
- }
- }
-}
-sub get_ipsec_host_ip
-{
- my $val=shift;
- my $field=shift;
- foreach my $key (sort {$a <=> $b} keys %ipsecconf){
- if($ipsecconf{$key}[1] eq $val){
- return $ipsecconf{$key}[$field];
- }
- }
-}
-sub get_ovpn_n2n_ip
-{
- my $val=shift;
- my $field=shift;
- foreach my $key (sort {$a <=> $b} keys %ccdhost){
- if($ccdhost{$key}[1] eq $val){
- return $ccdhost{$key}[$field];
- }
- }
-}
-sub get_ovpn_host_ip
-{
- my $val=shift;
- my $field=shift;
- foreach my $key (sort {$a <=> $b} keys %ccdhost){
- if($ccdhost{$key}[1] eq $val){
- return $ccdhost{$key}[$field];
- }
- }
-}
-sub get_ovpn_net_ip
-{
-
- my $val=shift;
- my $field=shift;
- foreach my $key (sort {$a <=> $b} keys %ccdnet){
- if($ccdnet{$key}[0] eq $val){
- return $ccdnet{$key}[$field];
- }
- }
-}
-sub get_grp_ip
-{
- my $val=shift;
- my $src=shift;
- foreach my $key (sort {$a <=> $b} keys %customgrp){
- if ($customgrp{$key}[0] eq $val){
- &get_address($customgrp{$key}[3],$src);
- }
- }
-
-}
-sub get_std_net_ip
-{
- my $val=shift;
- my $con=shift;
- if ($val eq 'ALL'){
- return "0.0.0.0/0.0.0.0";
- }elsif($val eq 'GREEN'){
- return "$netsettings{'GREEN_NETADDRESS'}/$netsettings{'GREEN_NETMASK'}";
- }elsif($val eq 'ORANGE'){
- return "$netsettings{'ORANGE_NETADDRESS'}/$netsettings{'ORANGE_NETMASK'}";
- }elsif($val eq 'BLUE'){
- return "$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}";
- }elsif($val eq 'RED'){
- return "0.0.0.0/0 -o $con";
- }elsif($val =~ /OpenVPN/i){
- return "$ovpnsettings{'DOVPN_SUBNET'}";
- }elsif($val =~ /IPsec/i){
- return "$ipsecsettings{'RW_NET'}";
- }elsif($val eq 'IPFire'){
- return ;
- }
-}
-sub get_net_ip
-{
- my $val=shift;
- foreach my $key (sort {$a <=> $b} keys %customnetwork){
- if($customnetwork{$key}[0] eq $val){
- return "$customnetwork{$key}[1]/$customnetwork{$key}[2]";
- }
- }
-}
-sub get_host_ip
-{
- my $val=shift;
- my $src=shift;
- foreach my $key (sort {$a <=> $b} keys %customhost){
- if($customhost{$key}[0] eq $val){
- if ($customhost{$key}[1] eq 'mac' && $src eq 'src'){
- return "-m mac --mac-source $customhost{$key}[2]";
- }elsif($customhost{$key}[1] eq 'ip' && $src eq 'src'){
- return "$customhost{$key}[2]";
- }elsif($customhost{$key}[1] eq 'ip' && $src eq 'tgt'){
- return "$customhost{$key}[2]";
- }elsif($customhost{$key}[1] eq 'mac' && $src eq 'tgt'){
- return "none";
- }
- }
- }
-}
-
-return 1;
diff --git a/config/forwardfw/firewall-policy b/config/forwardfw/firewall-policy
deleted file mode 100755
index 6f7e95c..0000000
--- a/config/forwardfw/firewall-policy
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/sh
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
-eval $(/usr/local/bin/readhash /var/ipfire/forward/settings)
-eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings)
-
-iptables -F POLICYFWD
-iptables -F POLICYOUT
-iptables -F POLICYIN
-
-if [ -f "/var/ipfire/red/iface" ]; then
- IFACE="$(</var/ipfire/red/iface)"
-fi
-
-# Figure out what devices are configured.
-HAVE_BLUE="false"
-HAVE_ORANGE="false"
-
-case "${CONFIG_TYPE}" in
- 2)
- HAVE_BLUE="true"
- ;;
- 3)
- HAVE_ORANGE="true"
- ;;
- 4)
- HAVE_BLUE="true"
- HAVE_ORANGE="true"
- ;;
-esac
-
-# INPUT
-case "${FWPOLICY2}" in
- REJECT)
- if [ "${DROPINPUT}" = "on" ]; then
- /sbin/iptables -A POLICYIN -m limit --limit 10/minute -j LOG --log-prefix "REJECT_INPUT"
- fi
- /sbin/iptables -A POLICYIN -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_INPUT"
- ;;
- *) # DROP
- if [ "${DROPINPUT}" = "on" ]; then
- /sbin/iptables -A POLICYIN -m limit --limit 10/minute -j LOG --log-prefix "DROP_INPUT"
- fi
- /sbin/iptables -A POLICYIN -j DROP -m comment --comment "DROP_INPUT"
- ;;
-esac
-
-# FORWARD
-case "${POLICY}" in
- MODE1)
- case "${FWPOLICY}" in
- REJECT)
- if [ "${DROPFORWARD}" = "on" ]; then
- /sbin/iptables -A POLICYFWD -m limit --limit 10/minute -j LOG --log-prefix "REJECT_FORWARD"
- fi
- /sbin/iptables -A POLICYFWD -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_FORWARD"
- ;;
- *) # DROP
- if [ "${DROPFORWARD}" = "on" ]; then
- /sbin/iptables -A POLICYFWD -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD"
- fi
- /sbin/iptables -A POLICYFWD -j DROP -m comment --comment "DROP_FORWARD"
- ;;
- esac
- ;;
-
- *)
- if [ -n "${IFACE}" ]; then
- if [ "${HAVE_BLUE}" = "true" ] && [ -n "${BLUE_DEV}" ]; then
- /sbin/iptables -A POLICYFWD -i "${BLUE_DEV}" ! -o "${IFACE}" -j DROP
- fi
- if [ "${HAVE_ORANGE}" = "true" ] && [ -n "${ORANGE_DEV}" ]; then
- /sbin/iptables -A POLICYFWD -i "${ORANGE_DEV}" ! -o "${IFACE}" -j DROP
- fi
- fi
- /sbin/iptables -A POLICYFWD -j ACCEPT
- /sbin/iptables -A POLICYFWD -m comment --comment "DROP_FORWARD" -j DROP
- ;;
-esac
-
-# OUTGOING
-case "${POLICY1}" in
- MODE1)
- case "${FWPOLICY1}" in
- REJECT)
- if [ "${DROPOUTGOING}" = "on" ]; then
- /sbin/iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "REJECT_OUTPUT"
- fi
- /sbin/iptables -A POLICYOUT -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_OUTPUT"
- ;;
- *) # DROP
- if [ "${DROPOUTGOING}" == "on" ]; then
- /sbin/iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "DROP_OUTPUT"
- fi
- /sbin/iptables -A POLICYOUT -j DROP -m comment --comment "DROP_OUTPUT"
- ;;
- esac
- ;;
- *)
- /sbin/iptables -A POLICYOUT -j ACCEPT
- /sbin/iptables -A POLICYOUT -m comment --comment "DROP_OUTPUT" -j DROP
- ;;
-esac
-
-exit 0
diff --git a/config/forwardfw/p2protocols b/config/forwardfw/p2protocols
deleted file mode 100644
index 7000581..0000000
--- a/config/forwardfw/p2protocols
+++ /dev/null
@@ -1,9 +0,0 @@
-Applejuice;apple;off;
-Ares;ares;off;
-Bittorrent;bit;off;
-DirectConnect;dc;off;
-Edonkey;edk;off;
-Gnutella;gnu;off;
-KaZaA;kazaa;off;
-SoulSeek;soul;off;
-WinMX;winmx;off;
diff --git a/config/forwardfw/rules.pl b/config/forwardfw/rules.pl
deleted file mode 100755
index b3be47d..0000000
--- a/config/forwardfw/rules.pl
+++ /dev/null
@@ -1,635 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-use strict;
-use Time::Local;
-no warnings 'uninitialized';
-
-# enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
-
-my %fwdfwsettings=();
-my %defaultNetworks=();
-my %configfwdfw=();
-my %color=();
-my %icmptypes=();
-my %ovpnSettings=();
-my %customgrp=();
-our %sourcehash=();
-our %targethash=();
-my @timeframe=();
-my %configinputfw=();
-my %configoutgoingfw=();
-my %confignatfw=();
-my %aliases=();
-my @DPROT=();
-my @p2ps=();
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/forward/bin/firewall-lib.pl";
-
-my $configfwdfw = "${General::swroot}/forward/config";
-my $configinput = "${General::swroot}/forward/input";
-my $configoutgoing = "${General::swroot}/forward/outgoing";
-my $p2pfile = "${General::swroot}/forward/p2protocols";
-my $configgrp = "${General::swroot}/fwhosts/customgroups";
-my $netsettings = "${General::swroot}/ethernet/settings";
-my $errormessage = '';
-my $orange = '';
-my $green = '';
-my $blue = '';
-my ($TYPE,$PROT,$SPROT,$DPROT,$SPORT,$DPORT,$TIME,$TIMEFROM,$TIMETILL,$SRC_TGT);
-my $CHAIN = "FORWARDFW";
-my $conexists = 'off';
-my $command = 'iptables -A';
-my $dnat ='';
-my $snat ='';
-
-&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
-&General::readhash("$netsettings", \%defaultNetworks);
-&General::readhasharray($configfwdfw, \%configfwdfw);
-&General::readhasharray($configinput, \%configinputfw);
-&General::readhasharray($configoutgoing, \%configoutgoingfw);
-&General::readhasharray($configgrp, \%customgrp);
-&General::get_aliases(\%aliases);
-
-#check if we have an internetconnection
-open (CONN,"/var/ipfire/red/iface");
-my $con = <CONN>;
-close(CONN);
-if (-f "/var/ipfire/red/active"){
- $conexists='on';
-}
-open (CONN1,"/var/ipfire/red/local-ipaddress");
-my $redip = <CONN1>;
-close(CONN1);
-#################
-# DEBUG/TEST #
-#################
-my $MODE=0; # 0 - normal operation
- # 1 - print configline and rules to console
- #
-#################
-my $param=shift;
-
-if($param eq 'flush'){
- if ($MODE eq '1'){
- print " Flushing chains...\n";
- }
- &flush;
-}else{
- if ($MODE eq '1'){
- print " Flushing chains...\n";
- }
- &flush;
- if ($MODE eq '1'){
- print " Preparing rules...\n";
- }
- &preparerules;
- if($MODE eq '0'){
- if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
- &p2pblock;
- system ("/usr/sbin/firewall-policy");
- }elsif($fwdfwsettings{'POLICY'} eq 'MODE2'){
- &p2pblock;
- system ("iptables -A $CHAIN -m conntrack --ctstate NEW -j ACCEPT");
- system ("/usr/sbin/firewall-policy");
- system ("/etc/sysconfig/firewall.local reload");
- }
- }
-}
-sub flush
-{
- system ("iptables -F FORWARDFW");
- system ("iptables -F INPUTFW");
- system ("iptables -F OUTGOINGFW");
- system ("iptables -t nat -F NAT_DESTINATION");
- system ("iptables -t nat -F NAT_SOURCE");
-}
-sub preparerules
-{
- if (! -z "${General::swroot}/forward/config"){
- &buildrules(\%configfwdfw);
- }
- if (! -z "${General::swroot}/forward/input"){
- &buildrules(\%configinputfw);
- }
- if (! -z "${General::swroot}/forward/outgoing"){
- &buildrules(\%configoutgoingfw);
- }
-}
-sub buildrules
-{
- my $hash=shift;
- my $STAG;
- my $natip;
- my $snatport;
- my $fireport;
- my $nat;
- my $fwaccessdport;
- my $natchain;
- my $icmptype;
- foreach my $key (sort {$a <=> $b} keys %$hash){
- next if (($$hash{$key}[6] eq 'RED' || $$hash{$key}[6] eq 'RED1') && $conexists eq 'off' );
- $command="iptables -A";
- if ($$hash{$key}[28] eq 'ON'){
- $command='iptables -t nat -A';
- $natip=&get_nat_ip($$hash{$key}[29],$$hash{$key}[31]);
- if($$hash{$key}[31] eq 'dnat'){
- $nat='DNAT';
- if ($$hash{$key}[30] =~ /\|/){
- $$hash{$key}[30]=~ tr/|/,/;
- $fireport='-m multiport --dport '.$$hash{$key}[30];
- }else{
- $fireport='--dport '.$$hash{$key}[30] if ($$hash{$key}[30]>0);
- }
- }else{
- $nat='SNAT';
- }
- }
- $STAG='';
- if($$hash{$key}[2] eq 'ON'){
- #get source ip's
- if ($$hash{$key}[3] eq 'cust_grp_src'){
- foreach my $grp (sort {$a <=> $b} keys %customgrp){
- if($customgrp{$grp}[0] eq $$hash{$key}[4]){
- &get_address($customgrp{$grp}[3],$customgrp{$grp}[2],"src");
- }
- }
- }else{
- &get_address($$hash{$key}[3],$$hash{$key}[4],"src");
- }
- #get target ip's
- if ($$hash{$key}[5] eq 'cust_grp_tgt'){
- foreach my $grp (sort {$a <=> $b} keys %customgrp){
- if($customgrp{$grp}[0] eq $$hash{$key}[6]){
- &get_address($customgrp{$grp}[3],$customgrp{$grp}[2],"tgt");
- }
- }
- }elsif($$hash{$key}[5] eq 'ipfire' ){
- if($$hash{$key}[6] eq 'GREEN'){
- $targethash{$key}[0]=$defaultNetworks{'GREEN_ADDRESS'};
- }
- if($$hash{$key}[6] eq 'BLUE'){
- $targethash{$key}[0]=$defaultNetworks{'BLUE_ADDRESS'};
- }
- if($$hash{$key}[6] eq 'ORANGE'){
- $targethash{$key}[0]=$defaultNetworks{'ORANGE_ADDRESS'};
- }
- if($$hash{$key}[6] eq 'ALL'){
- $targethash{$key}[0]='0.0.0.0/0';
- }
- if($$hash{$key}[6] eq 'RED' || $$hash{$key}[6] eq 'RED1'){
- open(FILE, "/var/ipfire/red/local-ipaddress")or die "Couldn't open local-ipaddress";
- $targethash{$key}[0]= <FILE>;
- close(FILE);
- }else{
- foreach my $alias (sort keys %aliases){
- if ($$hash{$key}[6] eq $alias){
- $targethash{$key}[0]=$aliases{$alias}{'IPT'};
- }
- }
- }
- }else{
- &get_address($$hash{$key}[5],$$hash{$key}[6],"tgt");
- }
- ##get source prot and port
- $SRC_TGT='SRC';
- $SPORT = &get_port($hash,$key);
- $SRC_TGT='';
-
- ##get target prot and port
- $DPROT=&get_prot($hash,$key);
-
- if ($DPROT eq ''){$DPROT=' ';}
- @DPROT=split(",",$DPROT);
-
- #get time if defined
- if($$hash{$key}[18] eq 'ON'){
- my ($time1,$time2,$daylight);
- my $daylight=$$hash{$key}[28];
- $time1=&get_time($$hash{$key}[26],$daylight);
- $time2=&get_time($$hash{$key}[27],$daylight);
- if($$hash{$key}[19] ne ''){push (@timeframe,"Mon");}
- if($$hash{$key}[20] ne ''){push (@timeframe,"Tue");}
- if($$hash{$key}[21] ne ''){push (@timeframe,"Wed");}
- if($$hash{$key}[22] ne ''){push (@timeframe,"Thu");}
- if($$hash{$key}[23] ne ''){push (@timeframe,"Fri");}
- if($$hash{$key}[24] ne ''){push (@timeframe,"Sat");}
- if($$hash{$key}[25] ne ''){push (@timeframe,"Sun");}
- $TIME=join(",",@timeframe);
-
- $TIMEFROM="--timestart $time1 ";
- $TIMETILL="--timestop $time2 ";
- $TIME="-m time --weekdays $TIME $TIMEFROM $TIMETILL";
- }
- if ($MODE eq '1'){
- print "NR:$key ";
- foreach my $i (0 .. $#{$$hash{$key}}){
- print "$i: $$hash{$key}[$i] ";
- }
- print "\n";
- print"##################################\n";
- #print rules to console
- foreach my $DPROT (@DPROT){
- $DPORT = &get_port($hash,$key,$DPROT);
- $PROT=$DPROT;
- $PROT="-p $PROT" if ($PROT ne '' && $PROT ne ' ');
- foreach my $a (sort keys %sourcehash){
- foreach my $b (sort keys %targethash){
- if ($sourcehash{$a}[0] ne $targethash{$b}[0] && $targethash{$b}[0] ne 'none' || $sourcehash{$a}[0] eq '0.0.0.0/0.0.0.0'){
- if($DPROT ne ''){
- if(substr($sourcehash{$a}[0], 3, 3) ne 'mac' && $sourcehash{$a}[0] ne ''){ $STAG="-s";}
- if(substr($DPORT, 2, 4) eq 'icmp'){
- my @icmprule= split(",",substr($DPORT, 12,));
- foreach (@icmprule){
- $icmptype="--icmp-type ";
- if ($_ eq "BLANK") {
- $icmptype="";
- $_="";
- }
- if ($$hash{$key}[17] eq 'ON'){
- print "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j LOG\n";
- }
- print "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j $$hash{$key}[0]\n";
- }
- }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat'){
- $natchain='NAT_DESTINATION';
- if ($$hash{$key}[17] eq 'ON'){
- print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $fireport $TIME -j LOG --log-prefix 'DNAT' \n";
- }
- my ($ip,$sub) =split("/",$targethash{$b}[0]);
- #Process NAT with servicegroup used
- if ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat' && $$hash{$key}[14] eq 'cust_srvgrp'){
- print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip $DPORT\n";
- $fwaccessdport=$DPORT;
- }else{
- print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip$DPORT\n";
- $DPORT =~ s/\-/:/g;
- if ($DPORT){
- $fwaccessdport="--dport ".substr($DPORT,1,);
- }elsif(! $DPORT && $$hash{$key}[30] ne ''){
- if ($$hash{$key}[30]=~m/|/i){
- $$hash{$key}[30] =~ s/\|/,/g;
- $fwaccessdport="-m multiport --dport $$hash{$key}[30]";
- }else{
- $fwaccessdport="--dport $$hash{$key}[30]";
- }
- }
- }
- print "iptables -A FORWARDFW $PROT -i $con $STAG $sourcehash{$a}[0] -d $ip $fwaccessdport $TIME -j $$hash{$key}[0]\n";
- next;
- }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'snat'){
- $natchain='NAT_SOURCE';
- print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $nat --to $natip\n";
- }
- if ($$hash{$key}[17] eq 'ON' ){
- print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j LOG\n";
- }
- if ($PROT ne '-p ICMP'){
- print "iptables -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
- }
- if ($PROT eq '-p ICMP' && $$hash{$key}[9] eq 'All ICMP-Types'){
- print "iptables -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
- }
- }
- }
- }
- }
- print"\n";
- }
- }elsif($MODE eq '0'){
- foreach my $DPROT (@DPROT){
- $DPORT = &get_port($hash,$key,$DPROT);
- $PROT=$DPROT;
- $PROT="-p $PROT" if ($PROT ne '' && $PROT ne ' ');
- foreach my $a (sort keys %sourcehash){
- foreach my $b (sort keys %targethash){
- if ($sourcehash{$a}[0] ne $targethash{$b}[0] && $targethash{$b}[0] ne 'none' || $sourcehash{$a}[0] eq '0.0.0.0/0.0.0.0'){
- if($DPROT ne ''){
- if(substr($sourcehash{$a}[0], 3, 3) ne 'mac' && $sourcehash{$a}[0] ne ''){ $STAG="-s";}
- #Process ICMP RULE
- if(substr($DPORT, 2, 4) eq 'icmp'){
- my @icmprule= split(",",substr($DPORT, 12,));
- foreach (@icmprule){
- $icmptype="--icmp-type ";
- if ($_ eq "BLANK") {
- $icmptype="";
- $_="";
- }
- if ($$hash{$key}[17] eq 'ON'){
- system ("$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j LOG");
- }
- system ("$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j $$hash{$key}[0]");
- }
- #PROCESS DNAT RULE (Portforward)
- }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat'){
- $natchain='NAT_DESTINATION';
- if ($$hash{$key}[17] eq 'ON'){
- system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $fireport $TIME -j LOG --log-prefix 'DNAT' \n";
- }
- my ($ip,$sub) =split("/",$targethash{$b}[0]);
- #Process NAT with servicegroup used
- if ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat' && $$hash{$key}[14] eq 'cust_srvgrp'){
- system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip $DPORT\n";
- $fwaccessdport=$DPORT;
- }else{
- system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip$DPORT\n";
- $DPORT =~ s/\-/:/g;
- if ($DPORT){
- $fwaccessdport="--dport ".substr($DPORT,1,);
- }elsif(! $DPORT && $$hash{$key}[30] ne ''){
- if ($$hash{$key}[30]=~m/|/i){
- $$hash{$key}[30] =~ s/\|/,/g;
- $fwaccessdport="-m multiport --dport $$hash{$key}[30]";
- }else{
- $fwaccessdport="--dport $$hash{$key}[30]";
- }
- }
- }
- system "iptables -A FORWARDFW $PROT -i $con $STAG $sourcehash{$a}[0] -d $ip $fwaccessdport $TIME -j $$hash{$key}[0]\n";
- next;
- #PROCESS SNAT RULE
- }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'snat'){
- $natchain='NAT_SOURCE';
- system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $nat --to $natip\n";
- }
- if ($$hash{$key}[17] eq 'ON' && substr($DPORT, 2, 4) ne 'icmp'){
- system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j LOG\n";
- }
- #PROCESS EVERY OTHER RULE (If NOT ICMP, else the rule would be applied double)
- if ($PROT ne '-p ICMP'){
- system "iptables -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
- }
- #PROCESS Prot ICMP and type = All ICMP-Types
- if ($PROT eq '-p ICMP' && $$hash{$key}[9] eq 'All ICMP-Types'){
- system "iptables -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
- }
- }
- }
- }
- }
- }
- }
- }
- %sourcehash=();
- %targethash=();
- undef $TIME;
- undef $TIMEFROM;
- undef $TIMETILL;
- undef $fireport;
- }
-}
-sub get_nat_ip
-{
- my $val=shift;
- my $type=shift;
- my $result;
- if($val eq 'RED' || $val eq 'GREEN' || $val eq 'ORANGE' || $val eq 'BLUE'){
- $result=$defaultNetworks{$val.'_ADDRESS'};
- }elsif($val eq 'ALL'){
- $result='-i '.$con;
- }elsif($val eq 'Default IP' && $type eq 'dnat'){
- $result='-d '.$redip;
- }elsif($val eq 'Default IP' && $type eq 'snat'){
- $result=$redip;
- }else{
- foreach my $al (sort keys %aliases){
- if($val eq $al && $type eq 'dnat'){
- $result='-d '.$aliases{$al}{'IPT'};
- }elsif($val eq $al && $type eq 'snat'){
- $result=$aliases{$al}{'IPT'};
- }
- }
- }
- return $result;
-}
-sub get_time
-{
- my $val=shift;
- my $val1=shift;
- my $time;
- my $minutes;
- my $ruletime;
- $minutes = &utcmin($val);
- $ruletime = $minutes + &time_get_utc($val);
- if ($ruletime < 0){$ruletime +=1440;}
- if ($ruletime > 1440){$ruletime -=1440;}
- $time=sprintf "%02d:%02d", $ruletime / 60, $ruletime % 60;
- return $time;
-}
-sub time_get_utc
-{
- # Calculates the UTCtime from a given time
- my $val=shift;
- my @localtime=localtime(time);
- my @gmtime=gmtime(time);
- my $diff = ($gmtime[2]*60+$gmtime[1]%60)-($localtime[2]*60+$localtime[1]%60);
- return $diff;
-}
-sub utcmin
-{
- my $ruletime=shift;
- my ($hrs,$min) = split(":",$ruletime);
- my $newtime = $hrs*60+$min;
- return $newtime;
-}
-sub p2pblock
-{
- my $P2PSTRING;
- my $DO;
- open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile";
- @p2ps = <FILE>;
- close FILE;
- my $CMD = "-m ipp2p";
- foreach my $p2pentry (sort @p2ps) {
- my @p2pline = split( /\;/, $p2pentry );
- if ( $fwdfwsettings{'POLICY'} eq 'MODE1' ) {
- $DO = "ACCEPT";
- if ("$p2pline[2]" eq "on") {
- $P2PSTRING = "$P2PSTRING --$p2pline[1]";
- }
- }else {
- $DO = "RETURN";
- if ("$p2pline[2]" eq "off") {
- $P2PSTRING = "$P2PSTRING --$p2pline[1]";
- }
- }
- }
- if ($MODE eq 1){
- if($P2PSTRING){
- print"/sbin/iptables -A FORWARDFW $CMD $P2PSTRING -j $DO\n";
- }
- }else{
- if($P2PSTRING){
- system("/sbin/iptables -A FORWARDFW $CMD $P2PSTRING -j $DO");
- }
- }
-}
-sub get_address
-{
- my $base=shift; #source of checking ($configfwdfw{$key}[x] or groupkey
- my $base2=shift;
- my $type=shift; #src or tgt
- my $hash;
- if ($type eq 'src'){
- $hash=\%sourcehash;
- }else{
- $hash=\%targethash;
- }
- my $key = &General::findhasharraykey($hash);
- if($base eq 'src_addr' || $base eq 'tgt_addr' ){
- if (&General::validmac($base2)){
- $$hash{$key}[0] = "-m mac --mac-source $base2";
- }else{
- $$hash{$key}[0] = $base2;
- }
- }elsif($base eq 'std_net_src' || $base eq 'std_net_tgt' || $base eq 'Standard Network'){
- $$hash{$key}[0]=&fwlib::get_std_net_ip($base2,$con);
- }elsif($base eq 'cust_net_src' || $base eq 'cust_net_tgt' || $base eq 'Custom Network'){
- $$hash{$key}[0]=&fwlib::get_net_ip($base2);
- }elsif($base eq 'cust_host_src' || $base eq 'cust_host_tgt' || $base eq 'Custom Host'){
- $$hash{$key}[0]=&fwlib::get_host_ip($base2,$type);
- }elsif($base eq 'ovpn_net_src' || $base eq 'ovpn_net_tgt' || $base eq 'OpenVPN static network'){
- $$hash{$key}[0]=&fwlib::get_ovpn_net_ip($base2,1);
- }elsif($base eq 'ovpn_host_src' ||$base eq 'ovpn_host_tgt' || $base eq 'OpenVPN static host'){
- $$hash{$key}[0]=&fwlib::get_ovpn_host_ip($base2,33);
- }elsif($base eq 'ovpn_n2n_src' ||$base eq 'ovpn_n2n_tgt' || $base eq 'OpenVPN N-2-N'){
- $$hash{$key}[0]=&fwlib::get_ovpn_n2n_ip($base2,11);
- }elsif($base eq 'ipsec_net_src' || $base eq 'ipsec_net_tgt' || $base eq 'IpSec Network'){
- $$hash{$key}[0]=&fwlib::get_ipsec_net_ip($base2,11);
- }elsif($base eq 'ipfire_src' ){
- if($base2 eq 'GREEN'){
- $$hash{$key}[0]=$defaultNetworks{'GREEN_ADDRESS'};
- }
- if($base2 eq 'BLUE'){
- $$hash{$key}[0]=$defaultNetworks{'BLUE_ADDRESS'};
- }
- if($base2 eq 'ORANGE'){
- $$hash{$key}[0]=$defaultNetworks{'ORANGE_ADDRESS'};
- }
- if($base2 eq 'ALL'){
- $$hash{$key}[0]='0.0.0.0/0';
- }
- if($base2 eq 'RED' || $base2 eq 'RED1'){
- open(FILE, "/var/ipfire/red/local-ipaddress")or die "Couldn't open local-ipaddress";
- $$hash{$key}[0]= <FILE>;
- close(FILE);
- }else{
- foreach my $alias (sort keys %aliases){
- if ($base2 eq $alias){
- $$hash{$key}[0]=$aliases{$alias}{'IPT'};
- }
- }
- }
- }
-}
-sub get_prot
-{
- my $hash=shift;
- my $key=shift;
- #check AH,GRE,ESP or ICMP
- if ($$hash{$key}[7] ne 'ON' && $$hash{$key}[11] ne 'ON'){
- return "$$hash{$key}[8]";
- }
- if ($$hash{$key}[7] eq 'ON' || $$hash{$key}[11] eq 'ON'){
- #check if servicegroup or service
- if($$hash{$key}[14] eq 'cust_srv'){
- return &fwlib::get_srv_prot($$hash{$key}[15]);
- }elsif($$hash{$key}[14] eq 'cust_srvgrp'){
- return &fwlib::get_srvgrp_prot($$hash{$key}[15]);
- }elsif (($$hash{$key}[10] ne '' || $$hash{$key}[15] ne '') && $$hash{$key}[8] eq ''){ #when ports are used and prot set to "all"
- return "TCP,UDP";
- }elsif (($$hash{$key}[10] ne '' || $$hash{$key}[15] ne '') && ($$hash{$key}[8] eq 'TCP' || $$hash{$key}[8] eq 'UDP')){ #when ports are used and prot set to "tcp" or "udp"
- return "$$hash{$key}[8]";
- }elsif (($$hash{$key}[10] eq '' && $$hash{$key}[15] eq '') && $$hash{$key}[8] ne 'ICMP'){ #when ports are NOT used and prot NOT set to "ICMP"
- return "$$hash{$key}[8]";
- }else{
- return "$$hash{$key}[8]";
- }
- }
- #DNAT
- if ($SRC_TGT eq '' && $$hash{$key}[31] eq 'dnat' && $$hash{$key}[11] eq '' && $$hash{$key}[12] ne ''){
- return "$$hash{$key}[8]";
- }
-}
-sub get_port
-{
- my $hash=shift;
- my $key=shift;
- my $prot=shift;
- if ($$hash{$key}[7] eq 'ON' && $SRC_TGT eq 'SRC'){
- if ($$hash{$key}[10] ne ''){
- $$hash{$key}[10] =~ s/\|/,/g;
- if(index($$hash{$key}[10],",") > 0){
- return "-m multiport --sport $$hash{$key}[10] ";
- }else{
- if($$hash{$key}[28] ne 'ON' || ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'snat') ||($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat') ){
- return "--sport $$hash{$key}[10] ";
- }else{
- return ":$$hash{$key}[10]";
- }
- }
- }
- }elsif($$hash{$key}[11] eq 'ON' && $SRC_TGT eq ''){
- if($$hash{$key}[14] eq 'TGT_PORT'){
- if ($$hash{$key}[15] ne ''){
- $$hash{$key}[15] =~ s/\|/,/g;
- if(index($$hash{$key}[15],",") > 0){
- return "-m multiport --dport $$hash{$key}[15] ";
- }else{
- if($$hash{$key}[28] ne 'ON' || ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'snat') ){
- return "--dport $$hash{$key}[15] ";
- }else{
- $$hash{$key}[15] =~ s/\:/-/g;
- return ":$$hash{$key}[15]";
- }
- }
- }
- }elsif($$hash{$key}[14] eq 'cust_srv'){
- if ($prot ne 'ICMP'){
- if($$hash{$key}[31] eq 'dnat' && $$hash{$key}[28] eq 'ON'){
- return ":".&fwlib::get_srv_port($$hash{$key}[15],1,$prot);
- }else{
- return "--dport ".&fwlib::get_srv_port($$hash{$key}[15],1,$prot);
- }
- }elsif($prot eq 'ICMP' && $$hash{$key}[11] eq 'ON'){ #When PROT is ICMP and "use targetport is checked, this is an icmp-service
- return "--icmp-type ".&fwlib::get_srv_port($$hash{$key}[15],3,$prot);
- }
- }elsif($$hash{$key}[14] eq 'cust_srvgrp'){
- if ($prot ne 'ICMP'){
- return &fwlib::get_srvgrp_port($$hash{$key}[15],$prot);
- }
- elsif($prot eq 'ICMP'){
- return &fwlib::get_srvgrp_port($$hash{$key}[15],$prot);
- }
- }
- }
- #CHECK ICMP
- if ($$hash{$key}[7] ne 'ON' && $$hash{$key}[11] ne 'ON' && $SRC_TGT eq ''){
- if($$hash{$key}[9] ne '' && $$hash{$key}[9] ne 'All ICMP-Types'){
- return "--icmp-type $$hash{$key}[9] ";
- }elsif($$hash{$key}[9] eq 'All ICMP-Types'){
- return;
- }
- }
-}
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 7796d86..7fdc983 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -49,17 +49,17 @@ var/ipfire/extrahd
#var/ipfire/extrahd/partitions
#var/ipfire/extrahd/scan
#var/ipfire/extrahd/settings
-var/ipfire/forward
-#var/ipfire/forward/bin
-#var/ipfire/forward/bin/firewall-lib.pl
-#var/ipfire/forward/bin/rules.pl
-#var/ipfire/forward/config
-#var/ipfire/forward/dmz
-#var/ipfire/forward/input
-#var/ipfire/forward/nat
-#var/ipfire/forward/outgoing
-#var/ipfire/forward/p2protocols
-#var/ipfire/forward/settings
+var/ipfire/firewall
+#var/ipfire/firewall/bin
+#var/ipfire/firewall/bin/firewall-lib.pl
+#var/ipfire/firewall/bin/rules.pl
+#var/ipfire/firewall/config
+#var/ipfire/firewall/dmz
+#var/ipfire/firewall/input
+#var/ipfire/firewall/nat
+#var/ipfire/firewall/outgoing
+#var/ipfire/firewall/p2protocols
+#var/ipfire/firewall/settings
var/ipfire/fwhosts
#var/ipfire/fwhosts/customgroups
#var/ipfire/fwhosts/customhosts
diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs
index 2463ba2..1ab4dec 100644
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -16,7 +16,7 @@ usr/local/bin/logwatch
#usr/local/bin/mpfirectrl
usr/local/bin/openvpnctrl
#usr/local/bin/outgoingfwctrl
-usr/local/bin/forwardfwctrl
+usr/local/bin/firewallctrl
usr/local/bin/pakfire
usr/local/bin/qosctrl
usr/local/bin/rebuildhosts
diff --git a/config/rootfiles/core/fifteen/filelists/firewall b/config/rootfiles/core/fifteen/filelists/firewall
index c5c0dac..3edde8e 100644
--- a/config/rootfiles/core/fifteen/filelists/firewall
+++ b/config/rootfiles/core/fifteen/filelists/firewall
@@ -9,16 +9,14 @@ usr/sbin/convert-outgoingfw
usr/sbin/convert-portfw
usr/sbin/convert-xtaccess
usr/sbin/firewall-policy
-var/ipfire/forward
-var/ipfire/forward/bin/firewall-lib.pl
-var/ipfire/forward/bin/rules.pl
-var/ipfire/forward/config
-var/ipfire/forward/dmz
-var/ipfire/forward/input
-var/ipfire/forward/nat
-var/ipfire/forward/outgoing
-var/ipfire/forward/p2protocols
-var/ipfire/forward/settings
+var/ipfire/firewall
+var/ipfire/firewall/bin/firewall-lib.pl
+var/ipfire/firewall/bin/rules.pl
+var/ipfire/firewall/config
+var/ipfire/firewall/input
+var/ipfire/firewall/outgoing
+var/ipfire/firewall/p2protocols
+var/ipfire/firewall/settings
var/ipfire/fwhosts
var/ipfire/fwhosts/customhosts
var/ipfire/fwhosts/customnetworks
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index fde7e5e..802b2be 100755
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -29,13 +29,13 @@ no warnings 'uninitialized';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
-require "${General::swroot}/forward/bin/firewall-lib.pl";
+require "${General::swroot}/firewall/bin/firewall-lib.pl";
-unless (-d "${General::swroot}/forward") { system("mkdir ${General::swroot}/forward"); }
-unless (-e "${General::swroot}/forward/settings") { system("touch ${General::swroot}/forward/settings"); }
-unless (-e "${General::swroot}/forward/config") { system("touch ${General::swroot}/forward/config"); }
-unless (-e "${General::swroot}/forward/input") { system("touch ${General::swroot}/forward/input"); }
-unless (-e "${General::swroot}/forward/outgoing") { system("touch ${General::swroot}/forward/outgoing"); }
+unless (-d "${General::swroot}/firewall") { system("mkdir ${General::swroot}/firewall"); }
+unless (-e "${General::swroot}/firewall/settings") { system("touch ${General::swroot}/firewall/settings"); }
+unless (-e "${General::swroot}/firewall/config") { system("touch ${General::swroot}/firewall/config"); }
+unless (-e "${General::swroot}/firewall/input") { system("touch ${General::swroot}/firewall/input"); }
+unless (-e "${General::swroot}/firewall/outgoing") { system("touch ${General::swroot}/firewall/outgoing"); }
my %fwdfwsettings=();
my %selected=() ;
@@ -63,7 +63,7 @@ my %aliases=();
my %optionsfw=();
my %ifaces=();
-my @PROTOCOLS = ("TCP", "UDP", "ICMP", "IGMP", "AH", "ESP", "GRE");
+my @PROTOCOLS = ("TCP", "UDP", "ICMP", "IGMP", "AH", "ESP", "GRE","IPv6","IPIP");
my $color;
my $confignet = "${General::swroot}/fwhosts/customnetworks";
@@ -75,9 +75,9 @@ my $configccdnet = "${General::swroot}/ovpn/ccd.conf";
my $configccdhost = "${General::swroot}/ovpn/ovpnconfig";
my $configipsec = "${General::swroot}/vpn/config";
my $configipsecrw = "${General::swroot}/vpn/settings";
-my $configfwdfw = "${General::swroot}/forward/config";
-my $configinput = "${General::swroot}/forward/input";
-my $configoutgoing = "${General::swroot}/forward/outgoing";
+my $configfwdfw = "${General::swroot}/firewall/config";
+my $configinput = "${General::swroot}/firewall/input";
+my $configoutgoing = "${General::swroot}/firewall/outgoing";
my $configovpn = "${General::swroot}/ovpn/settings";
my $fwoptions = "${General::swroot}/optionsfw/settings";
my $ifacesettings = "${General::swroot}/ethernet/settings";
@@ -87,7 +87,7 @@ my $ipgrp="${General::swroot}/outgoing/groups";
my $tdcolor='';
my $checkorange='';
my @protocols;
-&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
+&General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings);
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
&General::readhash($fwoptions, \%optionsfw);
@@ -919,6 +919,18 @@ sub checkrule
$fwdfwsettings{'ICMP_TYPES'}='';
$fwdfwsettings{'USESRV'}='';
$fwdfwsettings{'TGT_PORT'}='';
+ }elsif($fwdfwsettings{'PROT'} eq 'IPv6'){
+ $fwdfwsettings{'USE_SRC_PORT'}='';
+ $fwdfwsettings{'SRC_PORT'}='';
+ $fwdfwsettings{'ICMP_TYPES'}='';
+ $fwdfwsettings{'USESRV'}='';
+ $fwdfwsettings{'TGT_PORT'}='';
+ }elsif($fwdfwsettings{'PROT'} eq 'IPIP'){
+ $fwdfwsettings{'USE_SRC_PORT'}='';
+ $fwdfwsettings{'SRC_PORT'}='';
+ $fwdfwsettings{'ICMP_TYPES'}='';
+ $fwdfwsettings{'USESRV'}='';
+ $fwdfwsettings{'TGT_PORT'}='';
}elsif($fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP' && $fwdfwsettings{'PROT'} ne 'ICMP'){
$fwdfwsettings{'ICMP_TYPES'}='';
$fwdfwsettings{'PROT'} = '';
@@ -1718,17 +1730,25 @@ END
print"<hr>";
&Header::closebox;
#---PROTOCOL------------------------------------------------------
+ $fwdfwsettings{'SRC_PORT'} =~ s/\|/,/g;
+ $fwdfwsettings{'TGT_PORT'} =~ s/\|/,/g;
+ $fwdfwsettings{'dnatport'} =~ tr/|/,/;
+
+ # The dnatport may be empty, if it matches TGT_PORT
+ if ($fwdfwsettings{'dnatport'} eq $fwdfwsettings{'TGT_PORT'}) {
+ $fwdfwsettings{'dnatport'} = "";
+ }
+
&Header::openbox('100%', 'left', $Lang::tr{'fwhost prot'});
#Fix Protocol for JQuery
if ($fwdfwsettings{'grp3'} eq 'cust_srv' || $fwdfwsettings{'grp3'} eq 'cust_srvgrp'){
$fwdfwsettings{'PROT'} = 'template';
}
print<<END;
- <div id="prt">
- <table width='15%' border='0' style="float:left;">
+ <table width='100%' border='0'>
<tr>
- <td>
- <select name='PROT' id='protocol'>
+ <td width="25%">
+ <select name='PROT' id='protocol' style="width: 95px;">
END
print "<option value=\"\"";
if ($fwdfwsettings{'PROT'} eq '') {
@@ -1745,21 +1765,22 @@ END
if ($_ eq $fwdfwsettings{'PROT'}) {
print " selected=\"selected\"";
}
- print ">$_</option>";
+ if($_ eq "IPv6"){
+ print ">$Lang::tr{'fwdfw prot41'}</option>";
+ }else{
+ print ">$_</option>";
+ }
}
+
print<<END;
</select>
</td>
- </tr>
- </table>
- </div>
-
- <div id="PROTOCOL_ICMP_TYPES">
- <table width='50%' border='0' style="float:left;">
- <tr>
- <td width='20%'>$Lang::tr{'fwhost icmptype'}</td>
- <td colspan='2'>
- <select name='ICMP_TYPES' style='min-width:230px;'>
+ <td width="75%">
+ <table width='100%' border='0' id="PROTOCOL_ICMP_TYPES">
+ <tr>
+ <td width='20%'>$Lang::tr{'fwhost icmptype'}</td>
+ <td colspan='2'>
+ <select name='ICMP_TYPES' style='min-width:230px;'>
END
&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
print"<option value='All ICMP-Types'>$Lang::tr{'fwdfw all icmp'}</option>";
@@ -1772,66 +1793,51 @@ END
}
print <<END;
- </select>
- </td>
- </tr>
- </table>
- </div>
+ </select>
+ </td>
+ </tr>
+ </table>
+
+ <table width="100%" border="0" id="PROTOCOL_PORTS">
+ <tr>
+ <!-- #SOURCEPORT -->
+ <td>
+ $Lang::tr{'fwdfw use srcport'}
+ </td>
+ <td>
+ <input type='text' name='SRC_PORT' value='$fwdfwsettings{'SRC_PORT'}' maxlength='20' size='18'>
+ </td>
+ <td width='10%'>
+ </td>
+
+ <!-- #TARGETPORT -->
+ <td>
+ $Lang::tr{'fwdfw use srv'}
+ </td>
+
+ <td>
+ <input type='text' name='TGT_PORT' value='$fwdfwsettings{'TGT_PORT'}' maxlength='20' size='18'>
+ </td>
+ </tr>
+ <tr class="NAT">
+ <td colspan='3'></td>
+ <td>$Lang::tr{'fwdfw external port nat'}:</td>
+ <td>
+ <input type='text' name='dnatport' value=\"$fwdfwsettings{'dnatport'}\" maxlength='20' size='18'>
+ </td>
+ </tr>
+ </table>
+
+ <table width="100%" border="0" id="PROTOCOL_TEMPLATE">
+ <tr>
+ <td>
+ <input type='radio' name='grp3' id='cust_srv' value='cust_srv' checked>
+ $Lang::tr{'fwhost cust service'}
+ </td>
+ <td>
+ <select name='cust_srv' style='min-width: 230px;'>
END
- $fwdfwsettings{'SRC_PORT'} =~ s/\|/,/g;
- $fwdfwsettings{'TGT_PORT'} =~ s/\|/,/g;
- $fwdfwsettings{'dnatport'} =~ tr/|/,/;
-
- # The dnatport may be empty, if it matches TGT_PORT
- if ($fwdfwsettings{'dnatport'} eq $fwdfwsettings{'TGT_PORT'}) {
- $fwdfwsettings{'dnatport'} = "";
- }
-
- print <<END;
-
- <div id="PROTOCOL_PORTS">
- <table border="0">
- <tr>
- <!-- #SOURCEPORT -->
- <td>
- $Lang::tr{'fwdfw use srcport'}
- </td>
- <td>
- <input type='text' name='SRC_PORT' value='$fwdfwsettings{'SRC_PORT'}' maxlength='20' size='18'>
- </td>
- <td width='10%'>
- </td>
-
- <!-- #TARGETPORT -->
- <td>
- $Lang::tr{'fwdfw use srv'}
- </td>
-
- <td>
- <input type='text' name='TGT_PORT' value='$fwdfwsettings{'TGT_PORT'}' maxlength='20' size='18'>
- </td>
- </tr>
- <tr class="NAT">
- <td colspan='3'></td>
- <td>$Lang::tr{'fwdfw external port nat'}:</td>
- <td>
- <input type='text' name='dnatport' value=\"$fwdfwsettings{'dnatport'}\" maxlength='20' size='18'>
- </td>
- </tr>
- </table>
- </div>
-
- <div id="PROTOCOL_TEMPLATE">
- <table border="0">
- <tr>
- <td>
- <input type='radio' name='grp3' id='cust_srv' value='cust_srv' checked>
- $Lang::tr{'fwhost cust service'}
- </td>
- <td>
- <select name='cust_srv' style='min-width: 230px;'>
-END
&General::readhasharray("$configsrv", \%customservice);
foreach my $key (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){
print"<option ";
@@ -1839,17 +1845,17 @@ END
print"value='$customservice{$key}[0]'>$customservice{$key}[0]</option>";
}
- print<<END;
- </select>
- </td>
- </tr>
- <tr>
- <td>
- <input type='radio' name='grp3' id='cust_srvgrp' value='cust_srvgrp' $checked{'grp3'}{'cust_srvgrp'}>
- $Lang::tr{'fwhost cust srvgrp'}
- </td>
- <td>
- <select name='cust_srvgrp' style='min-width:230px;'>
+ print <<END;
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <input type='radio' name='grp3' id='cust_srvgrp' value='cust_srvgrp' $checked{'grp3'}{'cust_srvgrp'}>
+ $Lang::tr{'fwhost cust srvgrp'}
+ </td>
+ <td>
+ <select name='cust_srvgrp' style='min-width:230px;'>
END
&General::readhasharray("$configsrvgrp", \%customservicegrp);
@@ -1861,15 +1867,16 @@ END
print">$customservicegrp{$key}[0]</option>";
}
$helper=$customservicegrp{$key}[0];
- }
+ }
+
print<<END;
- </select>
+ </select>
+ </td>
+ </tr>
+ </table>
</td>
</tr>
</table>
- </div>
-
- <br><br><br>
END
&Header::closebox;
@@ -2455,7 +2462,11 @@ END
#Get Protocol
my $prot;
if ($$hash{$key}[8]){
- push (@protocols,$$hash{$key}[8]);
+ if ($$hash{$key}[8] eq "IPv6"){
+ push (@protocols,$Lang::tr{'fwdfw prot41 short'})
+ }else{
+ push (@protocols,$$hash{$key}[8]);
+ }
}elsif($$hash{$key}[14] eq 'cust_srv'){
&get_serviceports("service",$$hash{$key}[15]);
}elsif($$hash{$key}[14] eq 'cust_srvgrp'){
@@ -2675,7 +2686,7 @@ END
#SHOW FINAL RULE
print "<table width='100%'rules='cols' border='1'>";
my $col;
- if ($config eq '/var/ipfire/forward/config'){
+ if ($config eq '/var/ipfire/firewall/config'){
my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
$col="bgcolor='darkred'";
@@ -2683,7 +2694,7 @@ END
$col="bgcolor='green'";
}
&show_defaultrules($col,$pol);
- }elsif ($config eq '/var/ipfire/forward/outgoing'){
+ }elsif ($config eq '/var/ipfire/firewall/outgoing'){
if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
$col="bgcolor='darkred'";
print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol block'}</font></td></tr>";
@@ -2703,7 +2714,7 @@ END
print "<b>$title1</b><br>";
print"<table width='100%' border='0' rules='none'><tr><td height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td></tr></table>";
my $col;
- if ($config eq '/var/ipfire/forward/config'){
+ if ($config eq '/var/ipfire/firewall/config'){
my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
$col="bgcolor='darkred'";
@@ -2711,7 +2722,7 @@ END
$col="bgcolor='green'";
}
&show_defaultrules($col,$pol);
- }elsif ($config eq '/var/ipfire/forward/outgoing'){
+ }elsif ($config eq '/var/ipfire/firewall/outgoing'){
print "<table width='100%' rules='cols' border='1'>";
my $pol='fwdfw '.$fwdfwsettings{'POLICY1'};
if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index ebd1fdc..fd66a49 100755
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -60,8 +60,8 @@ my $configccdhost = "${General::swroot}/ovpn/ovpnconfig";
my $configipsec = "${General::swroot}/vpn/config";
my $configsrv = "${General::swroot}/fwhosts/customservices";
my $configsrvgrp = "${General::swroot}/fwhosts/customservicegrp";
-my $fwconfigfwd = "${General::swroot}/forward/config";
-my $fwconfiginp = "${General::swroot}/forward/input";
+my $fwconfigfwd = "${General::swroot}/firewall/config";
+my $fwconfiginp = "${General::swroot}/firewall/input";
my $configovpn = "${General::swroot}/ovpn/settings";
my $tdcolor='';
my $configipsecrw = "${General::swroot}/vpn/settings";
diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index 713f37f..9563aab 100644
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -26,13 +26,13 @@ my %fwdfwsettings=();
my %configfwdfw=();
my %configoutgoingfw=();
-my $configfwdfw = "${General::swroot}/forward/config";
-my $configoutgoing = "${General::swroot}/forward/outgoing";
+my $configfwdfw = "${General::swroot}/firewall/config";
+my $configoutgoing = "${General::swroot}/firewall/outgoing";
my $errormessage = '';
my $warnmessage = '';
my $filename = "${General::swroot}/optionsfw/settings";
-&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
+&General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings);
&Header::showhttpheaders();
#Get GUI values
@@ -41,7 +41,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
if ($settings{'defpol'} ne '1'){
$errormessage .= $Lang::tr{'new optionsfw later'};
&General::writehash($filename, \%settings); # Save good settings
- system("/usr/local/bin/forwardfwctrl");
+ system("/usr/local/bin/firewallctrl");
}else{
if ($settings{'POLICY'} ne ''){
$fwdfwsettings{'POLICY'} = $settings{'POLICY'};
@@ -54,9 +54,9 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
%fwdfwsettings = ();
$fwdfwsettings{'POLICY'} = "$MODE";
$fwdfwsettings{'POLICY1'} = "$MODE1";
- &General::writehash("${General::swroot}/forward/settings", \%fwdfwsettings);
- &General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
- system("/usr/local/bin/forwardfwctrl");
+ &General::writehash("${General::swroot}/firewall/settings", \%fwdfwsettings);
+ &General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings);
+ system("/usr/local/bin/firewallctrl");
}
&General::readhash($filename, \%settings); # Load good settings
}
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index f012358..7eccf98 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -170,7 +170,7 @@ sub checkportfw {
my $DPORT = shift;
my $DPROT = shift;
my %natconfig =();
- my $confignat = "${General::swroot}/forward/config";
+ my $confignat = "${General::swroot}/firewall/config";
$DPROT= uc ($DPROT);
&General::readhasharray($confignat, \%natconfig);
foreach my $key (sort keys %natconfig){
diff --git a/html/cgi-bin/p2p-block.cgi b/html/cgi-bin/p2p-block.cgi
index bb0d0ae..aab2d3d 100755
--- a/html/cgi-bin/p2p-block.cgi
+++ b/html/cgi-bin/p2p-block.cgi
@@ -32,7 +32,7 @@ require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
my $errormessage = '';
-my $p2pfile = "${General::swroot}/forward/p2protocols";
+my $p2pfile = "${General::swroot}/firewall/p2protocols";
my @p2ps = ();
my %fwdfwsettings = ();
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index ce48d69..92847ca 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -963,6 +963,8 @@
'fwdfw pol text' => 'Firewall-Standardverhalten für Verbindungen aus lokalen Netzwerken: Alle Verbindungen können entweder zugelassen oder geblockt werden, wenn keine Ausnahmeregel zutrifft. "Blockiert" trennt ebenfalls die Kommunikation zwischen den lokalen Netzwerken.',
'fwdfw pol text1' => 'Firewall-Standardverhalten für von der Firewall selbst initiierte Verbindungen.',
'fwdfw pol title' => 'Standardverhalten der Firewall',
+'fwdfw prot41' => 'IPv6 Encapsulation (Protokoll 41)',
+'fwdfw prot41 short' => 'IPv6 Encap',
'fwdfw red' => 'ROT',
'fwdfw reread' => 'Änderungen übernehmen',
'fwdfw rule action' => 'Regelaktion:',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index c3e4c3e..2d36cdb 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -988,6 +988,8 @@
'fwdfw pol text' => 'Sets the default firewall behaviour for connections from local networks. You may either allow all new connections or block them by default. Connections between the local networks are also blocked in the latter mode.',
'fwdfw pol text1' => 'Sets the default firewall behaviour for connections initiated by the firewall itself. Attention! You may lock yourself out.',
'fwdfw pol title' => 'Default firewall behaviour',
+'fwdfw prot41' => 'IPv6 Encapsulation (Protocol 41)',
+'fwdfw prot41 short' => 'IPv6 Encap',
'fwdfw red' => 'RED',
'fwdfw reread' => 'Apply changes',
'fwdfw rule action' => 'Rule action:',
diff --git a/lfs/configroot b/lfs/configroot
index 555c782..f73453d 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -51,7 +51,7 @@ $(TARGET) :
# Create all directories
for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dns dnsforward \
- ethernet extrahd/bin fwlogs fwhosts forward forward/bin isdn key langs logging mac main \
+ ethernet extrahd/bin fwlogs fwhosts firewall firewall/bin isdn key langs logging mac main \
menu.d modem net-traffic net-traffic/templates nfs optionsfw \
ovpn patches pakfire portfw ppp private proxy/advanced/cre \
proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \
@@ -64,7 +64,7 @@ $(TARGET) :
for i in auth/users backup/include.user backup/exclude.user \
certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
- ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings forward/settings forward/config forward/input forward/outgoing forward/dmz forward/nat \
+ ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/input firewall/outgoing \
fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwlogs/ipsettings fwlogs/portsettings \
isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \
ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
@@ -99,14 +99,14 @@ $(TARGET) :
cp $(DIR_SRC)/config/cfgroot/useragents $(CONFIG_ROOT)/proxy/advanced
cp $(DIR_SRC)/config/cfgroot/ethernet-vlans $(CONFIG_ROOT)/ethernet/vlans
cp $(DIR_SRC)/langs/list $(CONFIG_ROOT)/langs/
- cp $(DIR_SRC)/config/forwardfw/rules.pl $(CONFIG_ROOT)/forward/bin/rules.pl
- cp $(DIR_SRC)/config/forwardfw/convert-xtaccess /usr/sbin/convert-xtaccess
- cp $(DIR_SRC)/config/forwardfw/convert-outgoingfw /usr/sbin/convert-outgoingfw
- cp $(DIR_SRC)/config/forwardfw/convert-dmz /usr/sbin/convert-dmz
- cp $(DIR_SRC)/config/forwardfw/convert-portfw /usr/sbin/convert-portfw
- cp $(DIR_SRC)/config/forwardfw/p2protocols $(CONFIG_ROOT)/forward/p2protocols
- cp $(DIR_SRC)/config/forwardfw/firewall-lib.pl $(CONFIG_ROOT)/forward/bin/firewall-lib.pl
- cp $(DIR_SRC)/config/forwardfw/firewall-policy /usr/sbin/firewall-policy
+ cp $(DIR_SRC)/config/firewall/rules.pl $(CONFIG_ROOT)/firewall/bin/rules.pl
+ cp $(DIR_SRC)/config/firewall/convert-xtaccess /usr/sbin/convert-xtaccess
+ cp $(DIR_SRC)/config/firewall/convert-outgoingfw /usr/sbin/convert-outgoingfw
+ cp $(DIR_SRC)/config/firewall/convert-dmz /usr/sbin/convert-dmz
+ cp $(DIR_SRC)/config/firewall/convert-portfw /usr/sbin/convert-portfw
+ cp $(DIR_SRC)/config/firewall/p2protocols $(CONFIG_ROOT)/firewall/p2protocols
+ cp $(DIR_SRC)/config/firewall/firewall-lib.pl $(CONFIG_ROOT)/firewall/bin/firewall-lib.pl
+ cp $(DIR_SRC)/config/firewall/firewall-policy /usr/sbin/firewall-policy
cp $(DIR_SRC)/config/fwhosts/icmp-types $(CONFIG_ROOT)/fwhosts/icmp-types
cp $(DIR_SRC)/config/fwhosts/customservices $(CONFIG_ROOT)/fwhosts/customservices
# Oneliner configfiles
@@ -130,11 +130,11 @@ $(TARGET) :
echo "SHOWDROPDOWN=off" >> $(CONFIG_ROOT)/optionsfw/settings
echo "DROPWIRELESSINPUT=on" >> $(CONFIG_ROOT)/optionsfw/settings
echo "DROPWIRELESSFORWARD=on" >> $(CONFIG_ROOT)/optionsfw/settings
- echo "POLICY=MODE2" >> $(CONFIG_ROOT)/forward/settings
- echo "POLICY1=MODE2" >> $(CONFIG_ROOT)/forward/settings
+ echo "POLICY=MODE2" >> $(CONFIG_ROOT)/firewall/settings
+ echo "POLICY1=MODE2" >> $(CONFIG_ROOT)/firewall/settings
# set rules.pl executable
- chmod 755 $(CONFIG_ROOT)/forward/bin/rules.pl
+ chmod 755 $(CONFIG_ROOT)/firewall/bin/rules.pl
# set converters executable
chmod 755 /usr/sbin/convert-*
diff --git a/lfs/initscripts b/lfs/initscripts
index 0b2dbee..eae451b 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -179,7 +179,7 @@ $(TARGET) :
ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
ln -sf ../../firewall /etc/rc.d/init.d/networking/red.up/20-RL-firewall
- ln -sf ../../../../../usr/local/bin/forwardfwctrl \
+ ln -sf ../../../../../usr/local/bin/firewallctrl \
/etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
ln -sf ../../../../../usr/local/bin/snortctrl \
/etc/rc.d/init.d/networking/red.up/23-RS-snort
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index fc49da4..36d7e44 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -223,7 +223,7 @@ iptables_init() {
/usr/sbin/firewall-policy
# read new firewall
- /usr/local/bin/forwardfwctrl
+ /usr/local/bin/firewallctrl
if [ "$DROPINPUT" == "on" ]; then
/sbin/iptables -A INPUT -m limit --limit 10/minute -j LOG --log-prefix "DROP_INPUT"
diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile
index c748a66..b447435 100644
--- a/src/misc-progs/Makefile
+++ b/src/misc-progs/Makefile
@@ -27,7 +27,7 @@ PROGS = iowrap
SUID_PROGS = squidctrl sshctrl ipfirereboot \
ipsecctrl timectrl dhcpctrl snortctrl \
applejuicectrl rebuildhosts backupctrl \
- logwatch openvpnctrl forwardfwctrl \
+ logwatch openvpnctrl firewallctrl \
wirelessctrl getipstat qosctrl launch-ether-wake \
redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \
smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \
@@ -86,8 +86,8 @@ smartctrl: smartctrl.c setuid.o ../install+setup/libsmooth/varval.o
clamavctrl: clamavctrl.c setuid.o ../install+setup/libsmooth/varval.o
$(COMPILE) -I../install+setup/libsmooth/ clamavctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
-forwardfwctrl: forwardfwctrl.c setuid.o ../install+setup/libsmooth/varval.o
- $(COMPILE) -I../install+setup/libsmooth/ forwardfwctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
+firewallctrl: firewallctrl.c setuid.o ../install+setup/libsmooth/varval.o
+ $(COMPILE) -I../install+setup/libsmooth/ firewallctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
timectrl: timectrl.c setuid.o ../install+setup/libsmooth/varval.o
$(COMPILE) -I../install+setup/libsmooth/ timectrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
diff --git a/src/misc-progs/firewallctrl.c b/src/misc-progs/firewallctrl.c
new file mode 100644
index 0000000..97de271
--- /dev/null
+++ b/src/misc-progs/firewallctrl.c
@@ -0,0 +1,25 @@
+/* This file is part of the IPFire Firewall.
+ *
+ * This program is distributed under the terms of the GNU General Public
+ * Licence. See the file COPYING for details.
+ *
+ */
+
+#include <unistd.h>
+
+#include "setuid.h"
+
+int main(int argc, char *argv[]) {
+ if (!(initsetuid()))
+ exit(1);
+
+ int retval = safe_system("/var/ipfire/firewall/bin/rules.pl");
+
+ /* If rules.pl has been successfully executed, the indicator
+ * file is removed. */
+ if (retval == 0) {
+ unlink("/var/ipfire/firewall/reread");
+ }
+
+ return 0;
+}
diff --git a/src/misc-progs/forwardfwctrl.c b/src/misc-progs/forwardfwctrl.c
deleted file mode 100644
index 9f3f28e..0000000
--- a/src/misc-progs/forwardfwctrl.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* This file is part of the IPFire Firewall.
- *
- * This program is distributed under the terms of the GNU General Public
- * Licence. See the file COPYING for details.
- *
- */
-
-#include <unistd.h>
-
-#include "setuid.h"
-
-int main(int argc, char *argv[]) {
- if (!(initsetuid()))
- exit(1);
-
- int retval = safe_system("/var/ipfire/forward/bin/rules.pl");
-
- /* If rules.pl has been successfully executed, the indicator
- * file is removed. */
- if (retval == 0) {
- unlink("/var/ipfire/forward/reread");
- }
-
- return 0;
-}
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. b161bfa8683402036e0d3e08159aafda5d4c4310
by git＠ipfire.org 23 Oct '13
by git＠ipfire.org 23 Oct '13
23 Oct '13
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, fifteen has been updated
via b161bfa8683402036e0d3e08159aafda5d4c4310 (commit)
via f0befbc3782b2a68fa96bb2e6534f0f6fa6af7f3 (commit)
via 8cdfbf5aeb365378deb2ff2b5f18a83a2fcfe82c (commit)
from 1da42d53f71991f27603b220e33ac49368410949 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b161bfa8683402036e0d3e08159aafda5d4c4310
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Thu Oct 17 17:14:19 2013 +0200
FIREWALL: renamed forwardfw.cgi in firewall.cgi
commit f0befbc3782b2a68fa96bb2e6534f0f6fa6af7f3
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Wed Oct 23 16:06:54 2013 +0200
Firewall: Make it possible to use NAT rules with servicegroups.
commit 8cdfbf5aeb365378deb2ff2b5f18a83a2fcfe82c
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Wed Oct 23 16:05:50 2013 +0200
Firewall: Make it possible to use NAT without Ports specified
-----------------------------------------------------------------------
Summary of changes:
config/forwardfw/rules.pl | 52 +++++++++++++++---------
config/menu/50-firewall.menu | 2 +-
config/rootfiles/common/apache2 | 2 +-
config/rootfiles/core/fifteen/filelists/firewall | 2 +-
html/cgi-bin/{forwardfw.cgi => firewall.cgi} | 4 --
html/cgi-bin/index.cgi | 2 +-
6 files changed, 36 insertions(+), 28 deletions(-)
rename html/cgi-bin/{forwardfw.cgi => firewall.cgi} (99%)
Difference in files:
diff --git a/config/forwardfw/rules.pl b/config/forwardfw/rules.pl
index f23430f..b3be47d 100755
--- a/config/forwardfw/rules.pl
+++ b/config/forwardfw/rules.pl
@@ -278,16 +278,22 @@ sub buildrules
print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $fireport $TIME -j LOG --log-prefix 'DNAT' \n";
}
my ($ip,$sub) =split("/",$targethash{$b}[0]);
- print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip$DPORT\n";
- $DPORT =~ s/\-/:/g;
- if ($DPORT){
- $fwaccessdport="--dport ".substr($DPORT,1,);
- }elsif(! $DPORT && $$hash{$key}[30] ne ''){
- if ($$hash{$key}[30]=~m/|/i){
- $$hash{$key}[30] =~ s/\|/,/g;
- $fwaccessdport="-m multiport --dport $$hash{$key}[30]";
- }else{
- $fwaccessdport="--dport $$hash{$key}[30]";
+ #Process NAT with servicegroup used
+ if ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat' && $$hash{$key}[14] eq 'cust_srvgrp'){
+ print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip $DPORT\n";
+ $fwaccessdport=$DPORT;
+ }else{
+ print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip$DPORT\n";
+ $DPORT =~ s/\-/:/g;
+ if ($DPORT){
+ $fwaccessdport="--dport ".substr($DPORT,1,);
+ }elsif(! $DPORT && $$hash{$key}[30] ne ''){
+ if ($$hash{$key}[30]=~m/|/i){
+ $$hash{$key}[30] =~ s/\|/,/g;
+ $fwaccessdport="-m multiport --dport $$hash{$key}[30]";
+ }else{
+ $fwaccessdport="--dport $$hash{$key}[30]";
+ }
}
}
print "iptables -A FORWARDFW $PROT -i $con $STAG $sourcehash{$a}[0] -d $ip $fwaccessdport $TIME -j $$hash{$key}[0]\n";
@@ -342,16 +348,22 @@ sub buildrules
system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $fireport $TIME -j LOG --log-prefix 'DNAT' \n";
}
my ($ip,$sub) =split("/",$targethash{$b}[0]);
- system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip$DPORT\n";
- $DPORT =~ s/\-/:/g;
- if ($DPORT){
- $fwaccessdport="--dport ".substr($DPORT,1,);
- }elsif(! $DPORT && $$hash{$key}[30] ne ''){
- if ($$hash{$key}[30]=~m/|/i){
- $$hash{$key}[30] =~ s/\|/,/g;
- $fwaccessdport="-m multiport --dport $$hash{$key}[30]";
- }else{
- $fwaccessdport="--dport $$hash{$key}[30]";
+ #Process NAT with servicegroup used
+ if ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat' && $$hash{$key}[14] eq 'cust_srvgrp'){
+ system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip $DPORT\n";
+ $fwaccessdport=$DPORT;
+ }else{
+ system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to $ip$DPORT\n";
+ $DPORT =~ s/\-/:/g;
+ if ($DPORT){
+ $fwaccessdport="--dport ".substr($DPORT,1,);
+ }elsif(! $DPORT && $$hash{$key}[30] ne ''){
+ if ($$hash{$key}[30]=~m/|/i){
+ $$hash{$key}[30] =~ s/\|/,/g;
+ $fwaccessdport="-m multiport --dport $$hash{$key}[30]";
+ }else{
+ $fwaccessdport="--dport $$hash{$key}[30]";
+ }
}
}
system "iptables -A FORWARDFW $PROT -i $con $STAG $sourcehash{$a}[0] -d $ip $fwaccessdport $TIME -j $$hash{$key}[0]\n";
diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index 2de9e7b..8bc66f9 100644
--- a/config/menu/50-firewall.menu
+++ b/config/menu/50-firewall.menu
@@ -1,6 +1,6 @@
$subfirewall->{'10.forward'} = {
'caption' => $Lang::tr{'fwdfw menu'},
- 'uri' => '/cgi-bin/forwardfw.cgi',
+ 'uri' => '/cgi-bin/firewall.cgi',
'title' => "$Lang::tr{'fwdfw menu'}",
'enabled' => 1,
};
diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 8889b67..a1cd423 100644
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1393,7 +1393,7 @@ srv/web/ipfire/cgi-bin/dhcp.cgi
#srv/web/ipfire/cgi-bin/dmzholes.cgi
srv/web/ipfire/cgi-bin/extrahd.cgi
srv/web/ipfire/cgi-bin/fireinfo.cgi
-srv/web/ipfire/cgi-bin/forwardfw.cgi
+srv/web/ipfire/cgi-bin/firewall.cgi
srv/web/ipfire/cgi-bin/fwhosts.cgi
srv/web/ipfire/cgi-bin/gui.cgi
srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
diff --git a/config/rootfiles/core/fifteen/filelists/firewall b/config/rootfiles/core/fifteen/filelists/firewall
index fc50598..c5c0dac 100644
--- a/config/rootfiles/core/fifteen/filelists/firewall
+++ b/config/rootfiles/core/fifteen/filelists/firewall
@@ -1,6 +1,6 @@
etc/rc.d/init.d/firewall
etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
-srv/web/ipfire/cgi-bin/forwardfw.cgi
+srv/web/ipfire/cgi-bin/firewall.cgi
srv/web/ipfire/cgi-bin/fwhosts.cgi
srv/web/ipfire/cgi-bin/optionsfw.cgi
srv/web/ipfire/cgi-bin/p2p-block.cgi
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
new file mode 100755
index 0000000..fde7e5e
--- /dev/null
+++ b/html/cgi-bin/firewall.cgi
@@ -0,0 +1,2767 @@
+#!/usr/bin/perl
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+use strict;
+use Sort::Naturally;
+no warnings 'uninitialized';
+# enable only the following on debugging purpose
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
+
+require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
+require "${General::swroot}/forward/bin/firewall-lib.pl";
+
+unless (-d "${General::swroot}/forward") { system("mkdir ${General::swroot}/forward"); }
+unless (-e "${General::swroot}/forward/settings") { system("touch ${General::swroot}/forward/settings"); }
+unless (-e "${General::swroot}/forward/config") { system("touch ${General::swroot}/forward/config"); }
+unless (-e "${General::swroot}/forward/input") { system("touch ${General::swroot}/forward/input"); }
+unless (-e "${General::swroot}/forward/outgoing") { system("touch ${General::swroot}/forward/outgoing"); }
+
+my %fwdfwsettings=();
+my %selected=() ;
+my %defaultNetworks=();
+my %netsettings=();
+my %customhost=();
+my %customgrp=();
+my %customnetworks=();
+my %customservice=();
+my %customservicegrp=();
+my %ccdnet=();
+my %customnetwork=();
+my %ccdhost=();
+my %configfwdfw=();
+my %configinputfw=();
+my %configoutgoingfw=();
+my %ipsecconf=();
+my %color=();
+my %mainsettings=();
+my %checked=();
+my %icmptypes=();
+my %ovpnsettings=();
+my %ipsecsettings=();
+my %aliases=();
+my %optionsfw=();
+my %ifaces=();
+
+my @PROTOCOLS = ("TCP", "UDP", "ICMP", "IGMP", "AH", "ESP", "GRE");
+
+my $color;
+my $confignet = "${General::swroot}/fwhosts/customnetworks";
+my $confighost = "${General::swroot}/fwhosts/customhosts";
+my $configgrp = "${General::swroot}/fwhosts/customgroups";
+my $configsrv = "${General::swroot}/fwhosts/customservices";
+my $configsrvgrp = "${General::swroot}/fwhosts/customservicegrp";
+my $configccdnet = "${General::swroot}/ovpn/ccd.conf";
+my $configccdhost = "${General::swroot}/ovpn/ovpnconfig";
+my $configipsec = "${General::swroot}/vpn/config";
+my $configipsecrw = "${General::swroot}/vpn/settings";
+my $configfwdfw = "${General::swroot}/forward/config";
+my $configinput = "${General::swroot}/forward/input";
+my $configoutgoing = "${General::swroot}/forward/outgoing";
+my $configovpn = "${General::swroot}/ovpn/settings";
+my $fwoptions = "${General::swroot}/optionsfw/settings";
+my $ifacesettings = "${General::swroot}/ethernet/settings";
+my $errormessage='';
+my $hint='';
+my $ipgrp="${General::swroot}/outgoing/groups";
+my $tdcolor='';
+my $checkorange='';
+my @protocols;
+&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash($fwoptions, \%optionsfw);
+&General::readhash($ifacesettings, \%ifaces);
+&General::readhash("$configovpn", \%ovpnsettings);
+&General::readhash("$configipsecrw", \%ipsecsettings);
+&General::readhasharray("$configipsec", \%ipsecconf);
+&Header::showhttpheaders();
+&Header::getcgihash(\%fwdfwsettings);
+&Header::openpage($Lang::tr{'fwdfw menu'}, 1, '');
+&Header::openbigbox('100%', 'center',$errormessage);
+#### JAVA SCRIPT ####
+print<<END;
+<script>
+ var PROTOCOLS_WITH_PORTS = ["TCP", "UDP"];
+
+ var update_protocol = function() {
+ var protocol = \$("#protocol").val();
+
+ if (protocol === undefined)
+ return;
+
+ // Check if a template is/should be used.
+ if (protocol === "template") {
+ \$("#PROTOCOL_TEMPLATE").show();
+ } else {
+ \$("#PROTOCOL_TEMPLATE").hide();
+ }
+
+ // Check if we are dealing with a protocol, that knows ports.
+ if (\$.inArray(protocol, PROTOCOLS_WITH_PORTS) >= 0) {
+ \$("#PROTOCOL_PORTS").show();
+ } else {
+ \$("#PROTOCOL_PORTS").hide();
+ }
+
+ // Handle ICMP.
+ if (protocol === "ICMP") {
+ \$("#PROTOCOL_ICMP_TYPES").show();
+ } else {
+ \$("#PROTOCOL_ICMP_TYPES").hide();
+ }
+ };
+
+ \$(document).ready(function() {
+ \$("#protocol").change(update_protocol);
+ update_protocol();
+
+ // When nat not used, hide it
+ if (! \$("#USE_NAT").attr("checked")) {
+ \$(".NAT").hide();
+ }
+
+ // Show NAT area when "use nat" checkbox is clicked
+ \$("#USE_NAT").change(function() {
+ \$(".NAT").toggle();
+ });
+
+ // Time constraints
+ if(!\$("#USE_TIME_CONSTRAINTS").attr("checked")) {
+ \$("#TIME_CONSTRAINTS").hide();
+ }
+ \$("#USE_TIME_CONSTRAINTS").change(function() {
+ \$("#TIME_CONSTRAINTS").toggle();
+ });
+
+ // Automatically select radio buttons when corresponding
+ // dropdown menu changes.
+ \$("select").change(function() {
+ var id = \$(this).attr("name");
+
+ // When using SNAT or DNAT, check "USE NAT" Checkbox
+ if (id === 'snat' || id === 'dnat') {
+ \$('#USE_NAT').prop('checked', true);
+ }
+ \$('#' + id).prop("checked", true);
+ });
+ });
+</script>
+END
+
+#### ACTION #####
+
+if ($fwdfwsettings{'ACTION'} eq 'saverule')
+{
+ &General::readhasharray("$configfwdfw", \%configfwdfw);
+ &General::readhasharray("$configinput", \%configinputfw);
+ &General::readhasharray("$configoutgoing", \%configoutgoingfw);
+ #Set Variables according to the JQuery code in protocol section
+ if ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP')
+ {
+ if ($fwdfwsettings{'SRC_PORT'} ne '')
+ {
+ $fwdfwsettings{'USE_SRC_PORT'} = 'ON';
+ }
+ if ($fwdfwsettings{'TGT_PORT'} ne '')
+ {
+ $fwdfwsettings{'USESRV'} = 'ON';
+ $fwdfwsettings{'grp3'} = 'TGT_PORT';
+ }
+ }
+ if ($fwdfwsettings{'PROT'} eq 'template')
+ {
+ $fwdfwsettings{'USESRV'} = 'ON';
+ }
+ $errormessage=&checksource;
+ if(!$errormessage){&checktarget;}
+ if(!$errormessage){&checkrule;}
+ #check if manual ip (source) is orange network
+ if ($fwdfwsettings{'grp1'} eq 'src_addr'){
+ my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
+ if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
+ $checkorange='on';
+ }
+ }
+ #check useless rules
+ if( ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'ORANGE' || $checkorange eq 'on') && $fwdfwsettings{'grp2'} eq 'ipfire'){
+ $errormessage.=$Lang::tr{'fwdfw useless rule'}."<br>";
+ }
+ #check if we try to break rules
+ 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'){
+ $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'}"
+ 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]"){
+ $errormessage.=$Lang::tr{'fwdfw err ruleexists'};
+ if ($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on'){
+ $errormessage='';
+ }elsif($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'} 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'}"
+ 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]"){
+ $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){
+ &checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}});
+ if ($fwdfwsettings{'nobase'} ne 'on'){
+ &checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}});
+ }
+ if($fwdfwsettings{'oldusesrv'} eq '' && $fwdfwsettings{'USESRV'} eq 'ON'){
+ &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
+ }elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') {
+ &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0);
+ }elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){
+ &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
+ }
+ if($fwdfwsettings{'nosave2'} ne 'on'){
+ &saverule(\%configinputfw,$configinput);
+ }
+ }
+ }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'}"
+ 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]"){
+ $errormessage.=$Lang::tr{'fwdfw err ruleexists'};
+ if ($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on'){
+ $errormessage='';
+ }elsif($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'} eq $fwdfwsettings{'ruleremark'}){
+ $fwdfwsettings{'nosave'} = 'on';
+ }
+ }
+ }
+ }
+ #check Rulepos on new Rule
+ if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){
+ print"CHECK OUTGOING DOPPELTE REGEL<br>";
+ $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'}"
+ 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]"){
+ $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){
+ &checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}});
+ &checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}});
+ if($fwdfwsettings{'oldusesrv'} eq '' && $fwdfwsettings{'USESRV'} eq 'ON'){
+ &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
+ }elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') {
+ &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0);
+ }elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){
+ &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
+ }
+ if ($fwdfwsettings{'nobase'} eq 'on'){
+ &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
+ }
+ if ($fwdfwsettings{'nosave2'} ne 'on'){
+ &saverule(\%configoutgoingfw,$configoutgoing);
+ }
+ }
+ }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'}"
+ 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]"){
+ $errormessage.=$Lang::tr{'fwdfw err ruleexists'};
+ if ($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' ){
+ $errormessage='';
+ }elsif($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'} 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'}"
+ 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]"){
+ $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){
+ &checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}});
+ &checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}});
+ if($fwdfwsettings{'oldusesrv'} eq '' && $fwdfwsettings{'USESRV'} eq 'ON'){
+ &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
+ }elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') {
+ &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0);
+ }elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){
+ &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
+ }
+ if ($fwdfwsettings{'nobase'} eq 'on'){
+ &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
+ }
+ if ($fwdfwsettings{'nosave2'} ne 'on'){
+ &saverule(\%configfwdfw,$configfwdfw);
+ }
+ }
+ }
+ if ($errormessage){
+ &newrule;
+ }else{
+ if($fwdfwsettings{'nosave2'} ne 'on'){
+ &General::firewall_config_changed();
+ }
+ &base;
+ }
+}
+if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw newrule'})
+{
+ &newrule;
+}
+if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw toggle'})
+{
+ my %togglehash=();
+ &General::readhasharray($fwdfwsettings{'config'}, \%togglehash);
+ foreach my $key (sort keys %togglehash){
+ if ($key eq $fwdfwsettings{'key'}){
+ if ($togglehash{$key}[2] eq 'ON'){$togglehash{$key}[2]='';}else{$togglehash{$key}[2]='ON';}
+ }
+ }
+ &General::writehasharray($fwdfwsettings{'config'}, \%togglehash);
+ &General::firewall_config_changed();
+ &base;
+}
+if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw togglelog'})
+{
+ my %togglehash=();
+ &General::readhasharray($fwdfwsettings{'config'}, \%togglehash);
+ foreach my $key (sort keys %togglehash){
+ if ($key eq $fwdfwsettings{'key'}){
+ if ($togglehash{$key}[17] eq 'ON'){$togglehash{$key}[17]='';}else{$togglehash{$key}[17]='ON';}
+ }
+ }
+ &General::writehasharray($fwdfwsettings{'config'}, \%togglehash);
+ &General::firewall_config_changed();
+ &base;
+}
+if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw reread'})
+{
+ &General::firewall_reload();
+ &base;
+}
+if ($fwdfwsettings{'ACTION'} eq 'editrule')
+{
+ $fwdfwsettings{'updatefwrule'}='on';
+ &newrule;
+}
+if ($fwdfwsettings{'ACTION'} eq 'deleterule')
+{
+ &deleterule;
+}
+if ($fwdfwsettings{'ACTION'} eq 'moveup')
+{
+ &pos_up;
+ &base;
+}
+if ($fwdfwsettings{'ACTION'} eq 'movedown')
+{
+ &pos_down;
+ &base;
+}
+if ($fwdfwsettings{'ACTION'} eq 'copyrule')
+{
+ $fwdfwsettings{'copyfwrule'}='on';
+ &newrule;
+}
+if ($fwdfwsettings{'ACTION'} eq '' or $fwdfwsettings{'ACTION'} eq 'reset')
+{
+ &base;
+}
+### Functions ####
+sub addrule
+{
+ &error;
+
+ &Header::openbox('100%', 'left', $Lang::tr{'fwdfw menu'});
+ print <<END;
+ <form method="POST" action="">
+ <table border='0' width="100%">
+ <tr>
+ <td>
+ <input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'>
+ </td>
+ <td align="right">
+END
+
+ if (&General::firewall_needs_reload()) {
+ print <<END;
+ <input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-weight: bold; color: green;'>
+END
+ }
+
+ print <<END;
+ </td>
+ </tr>
+ </table>
+ </form>
+
+ <hr>
+END
+ &Header::closebox();
+ &viewtablerule;
+}
+sub base
+{
+ &hint;
+ &addrule;
+}
+sub changerule
+{
+ my $oldchain=shift;
+ $fwdfwsettings{'updatefwrule'}='';
+ $fwdfwsettings{'config'}=$oldchain;
+ $fwdfwsettings{'nobase'}='on';
+ &deleterule;
+ &checkcounter(0,0,$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}});
+ &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
+}
+sub checksource
+{
+ my ($ip,$subnet);
+ #check ip-address if manual
+ if ($fwdfwsettings{'src_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'src_addr'} ne ''){
+ #check if ip with subnet
+ if ($fwdfwsettings{'src_addr'} =~ /^(.*?)\/(.*?)$/) {
+ ($ip,$subnet)=split (/\//,$fwdfwsettings{'src_addr'});
+ $subnet = &General::iporsubtocidr($subnet);
+ $fwdfwsettings{'isip'}='on';
+ }
+ #check if only ip
+ if($fwdfwsettings{'src_addr'}=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){
+ $ip=$fwdfwsettings{'src_addr'};
+ $subnet = '32';
+ $fwdfwsettings{'isip'}='on';
+ }
+
+ if ($fwdfwsettings{'isip'} ne 'on'){
+ if (&General::validmac($fwdfwsettings{'src_addr'})){
+ $fwdfwsettings{'ismac'}='on';
+ }
+ }
+ if ($fwdfwsettings{'isip'} eq 'on'){
+ ##check if ip is valid
+ if (! &General::validip($ip)){
+ $errormessage.=$Lang::tr{'fwdfw err src_addr'}."<br>";
+ return $errormessage;
+ }
+ #check and form valid IP
+ $ip=&General::ip2dec($ip);
+ $ip=&General::dec2ip($ip);
+ #check if net or broadcast
+ $fwdfwsettings{'src_addr'}="$ip/$subnet";
+ if(!&General::validipandmask($fwdfwsettings{'src_addr'})){
+ $errormessage.=$Lang::tr{'fwdfw err src_addr'}."<br>";
+ return $errormessage;
+ }
+ }
+ if ($fwdfwsettings{'isip'} ne 'on' && $fwdfwsettings{'ismac'} ne 'on'){
+ $errormessage.=$Lang::tr{'fwdfw err src_addr'}."<br>";
+ return $errormessage;
+ }
+ }elsif($fwdfwsettings{'src_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'src_addr'} eq ''){
+ $errormessage.=$Lang::tr{'fwdfw err nosrcip'};
+ return $errormessage;
+ }
+
+ #check empty fields
+ if ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq ''){ $errormessage.=$Lang::tr{'fwdfw err nosrc'}."<br>";}
+ if($fwdfwsettings{'USE_SRC_PORT'} eq 'ON' && ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP') && $fwdfwsettings{'SRC_PORT'} ne ''){
+ my @parts=split(",",$fwdfwsettings{'SRC_PORT'});
+ my @values=();
+ foreach (@parts){
+ chomp($_);
+ if ($_ =~ /^(\d+)\-(\d+)$/ || $_ =~ /^(\d+)\:(\d+)$/) {
+ my $check;
+ #change dashes with :
+ $_=~ tr/-/:/;
+ if ($_ eq "*") {
+ push(@values,"1:65535");
+ $check='on';
+ }
+ if ($_ =~ /^(\D)\:(\d+)$/ || $_ =~ /^(\D)\-(\d+)$/) {
+ push(@values,"1:$2");
+ $check='on';
+ }
+ if ($_ =~ /^(\d+)\:(\D)$/ || $_ =~ /^(\d+)\-(\D)$/ ) {
+ push(@values,"$1:65535");
+ $check='on'
+ }
+ $errormessage .= &General::validportrange($_, 'destination');
+ if(!$check){
+ push (@values,$_);
+ }
+ }else{
+ if (&General::validport($_)){
+ push (@values,$_);
+ }else{
+
+ }
+ }
+ }
+ $fwdfwsettings{'SRC_PORT'}=join("|",@values);
+ }
+ return $errormessage;
+}
+sub checktarget
+{
+ my ($ip,$subnet);
+ &General::readhasharray("$configsrv", \%customservice);
+ #check DNAT settings (has to be single Host and single Port or portrange)
+ if ($fwdfwsettings{'USE_NAT'} eq 'ON' && $fwdfwsettings{'nat'} eq 'dnat'){
+ if($fwdfwsettings{'grp2'} eq 'tgt_addr' || $fwdfwsettings{'grp2'} eq 'cust_host_tgt' || $fwdfwsettings{'grp2'} eq 'ovpn_host_tgt'){
+ #check if manual ip is a single Host (if set)
+ if ($fwdfwsettings{'grp2'} eq 'tgt_addr'){
+ my @tmp= split (/\./,$fwdfwsettings{$fwdfwsettings{'grp2'}});
+ my @tmp1= split ("/",$tmp[3]);
+ if (($tmp1[0] eq "0") || ($tmp1[0] eq "255"))
+ {
+ $errormessage=$Lang::tr{'fwdfw dnat error'}."<br>";
+ return $errormessage;
+ }
+ }
+ #check if Port is a single Port or portrange
+ if ($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT'){
+ if(($fwdfwsettings{'PROT'} ne 'TCP'|| $fwdfwsettings{'PROT'} ne 'UDP') && $fwdfwsettings{'TGT_PORT'} eq ''){
+ $errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";
+ return $errormessage;
+ }
+ if (($fwdfwsettings{'PROT'} eq 'TCP'|| $fwdfwsettings{'PROT'} eq 'UDP') && $fwdfwsettings{'TGT_PORT'} ne '' && !&check_natport($fwdfwsettings{'TGT_PORT'})){
+ $errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";
+ return $errormessage;
+ }
+ }
+ }else{
+ $errormessage=$Lang::tr{'fwdfw dnat error'}."<br>";
+ return $errormessage;
+ }
+ }
+ if ($fwdfwsettings{'tgt_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'tgt_addr'} ne ''){
+ #check if ip with subnet
+ if ($fwdfwsettings{'tgt_addr'} =~ /^(.*?)\/(.*?)$/) {
+ ($ip,$subnet)=split (/\//,$fwdfwsettings{'tgt_addr'});
+ $subnet = &General::iporsubtocidr($subnet);
+ }
+ #check if only ip
+ if($fwdfwsettings{'tgt_addr'}=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){
+ $ip=$fwdfwsettings{'tgt_addr'};
+ $subnet='32';
+ }
+ #check if ip is valid
+ if (! &General::validip($ip)){
+ $errormessage.=$Lang::tr{'fwdfw err tgt_addr'}."<br>";
+ return $errormessage;
+ }
+ #check and form valid IP
+ $ip=&General::ip2dec($ip);
+ $ip=&General::dec2ip($ip);
+ $fwdfwsettings{'tgt_addr'}="$ip/$subnet";
+ if(!&General::validipandmask($fwdfwsettings{'tgt_addr'})){
+ $errormessage.=$Lang::tr{'fwdfw err tgt_addr'}."<br>";
+ return $errormessage;
+ }
+ }elsif($fwdfwsettings{'tgt_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'tgt_addr'} eq ''){
+ $errormessage.=$Lang::tr{'fwdfw err notgtip'};
+ return $errormessage;
+ }
+ #check empty fields
+ if ($fwdfwsettings{$fwdfwsettings{'grp2'}} eq ''){ $errormessage.=$Lang::tr{'fwdfw err notgt'}."<br>";}
+ #check tgt services
+ if ($fwdfwsettings{'USESRV'} eq 'ON'){
+ if ($fwdfwsettings{'grp3'} eq 'cust_srv'){
+ $fwdfwsettings{'TGT_PROT'}='';
+ $fwdfwsettings{'ICMP_TGT'}='';
+ $fwdfwsettings{'TGT_PORT'}='';
+ }
+ if ($fwdfwsettings{'grp3'} eq 'cust_srvgrp'){
+ $fwdfwsettings{'TGT_PROT'}='';
+ $fwdfwsettings{'ICMP_TGT'}='';
+ $fwdfwsettings{'TGT_PORT'}='';
+ #check target service
+ if($fwdfwsettings{$fwdfwsettings{'grp3'}} eq ''){
+ $errormessage.=$Lang::tr{'fwdfw err tgt_grp'};
+ }
+ }
+ if ($fwdfwsettings{'grp3'} eq 'TGT_PORT'){
+ if ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP'){
+ if ($fwdfwsettings{'TGT_PORT'} ne ''){
+ if ($fwdfwsettings{'TGT_PORT'} =~ "," && $fwdfwsettings{'USE_NAT'} && $fwdfwsettings{'nat'} eq 'dnat') {
+ $errormessage=$Lang::tr{'fwdfw dnat porterr'}."<br>";
+ return $errormessage;
+ }
+ my @parts=split(",",$fwdfwsettings{'TGT_PORT'});
+ my @values=();
+ foreach (@parts){
+ chomp($_);
+ if ($_ =~ /^(\d+)\-(\d+)$/ || $_ =~ /^(\d+)\:(\d+)$/) {
+ my $check;
+ #change dashes with :
+ $_=~ tr/-/:/;
+ if ($_ eq "*") {
+ push(@values,"1:65535");
+ $check='on';
+ }
+ if ($_ =~ /^(\D)\:(\d+)$/ || $_ =~ /^(\D)\-(\d+)$/) {
+ push(@values,"1:$2");
+ $check='on';
+ }
+ if ($_ =~ /^(\d+)\:(\D)$/ || $_ =~ /^(\d+)\-(\D)$/) {
+ push(@values,"$1:65535");
+ $check='on'
+ }
+ $errormessage .= &General::validportrange($_, 'destination');
+ if(!$check){
+ push (@values,$_);
+ }
+ }else{
+ if (&General::validport($_)){
+ push (@values,$_);
+ }else{
+ }
+ }
+ }
+ $fwdfwsettings{'TGT_PORT'}=join("|",@values);
+ }
+ }elsif ($fwdfwsettings{'PROT'} eq 'GRE'){
+ $fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
+ $fwdfwsettings{'TGT_PORT'} = '';
+ $fwdfwsettings{'ICMP_TGT'} = '';
+ }elsif ($fwdfwsettings{'PROT'} eq 'ESP'){
+ $fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
+ $fwdfwsettings{'TGT_PORT'} = '';
+ $fwdfwsettings{'ICMP_TGT'}='';
+ }elsif ($fwdfwsettings{'PROT'} eq 'AH'){
+ $fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
+ $fwdfwsettings{'TGT_PORT'} = '';
+ $fwdfwsettings{'ICMP_TGT'}='';
+ }elsif ($fwdfwsettings{'PROT'} eq 'ICMP'){
+ $fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
+ $fwdfwsettings{'TGT_PORT'} = '';
+ }
+ }
+ }
+ #check targetport
+ if ($fwdfwsettings{'USESRV'} ne 'ON'){
+ $fwdfwsettings{'grp3'}='';
+ $fwdfwsettings{$fwdfwsettings{'grp3'}}='';
+ $fwdfwsettings{'ICMP_TGT'}='';
+ }
+ #check timeframe
+ if($fwdfwsettings{'TIME'} eq 'ON'){
+ if($fwdfwsettings{'TIME_MON'} eq '' && $fwdfwsettings{'TIME_TUE'} eq '' && $fwdfwsettings{'TIME_WED'} eq '' && $fwdfwsettings{'TIME_THU'} eq '' && $fwdfwsettings{'TIME_FRI'} eq '' && $fwdfwsettings{'TIME_SAT'} eq '' && $fwdfwsettings{'TIME_SUN'} eq ''){
+ $errormessage=$Lang::tr{'fwdfw err time'};
+ return $errormessage;
+ }
+ }
+ return $errormessage;
+}
+sub check_natport
+{
+ my $val=shift;
+ if($fwdfwsettings{'USE_NAT'} eq 'ON' && $fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'dnatport'} ne ''){
+ if ($fwdfwsettings{'dnatport'} =~ /^(\d+)\-(\d+)$/) {
+ $fwdfwsettings{'dnatport'} =~ tr/-/:/;
+ if ($fwdfwsettings{'dnatport'} eq "*") {
+ $fwdfwsettings{'dnatport'}="1:65535";
+ }
+ if ($fwdfwsettings{'dnatport'} =~ /^(\D)\:(\d+)$/) {
+ $fwdfwsettings{'dnatport'} = "1:$2";
+ }
+ if ($fwdfwsettings{'dnatport'} =~ /^(\d+)\:(\D)$/) {
+ $fwdfwsettings{'dnatport'} ="$1:65535";
+ }
+ }
+ return 1;
+ }
+ if ($val =~ "," || $val>65536 || $val<0){
+ return 0;
+ }
+ return 1;
+}
+sub checkrule
+{
+ #check valid port for NAT
+ if($fwdfwsettings{'USE_NAT'} eq 'ON'){
+ #if no port is given in nat area, take target host port
+ if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$fwdfwsettings{'TGT_PORT'};}
+ #check if port given in nat area is a single valid port or portrange
+ if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'TGT_PORT'} ne '' && !&check_natport($fwdfwsettings{'dnatport'})){
+ $errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";
+ }elsif($fwdfwsettings{'USESRV'} eq 'ON' && $fwdfwsettings{'grp3'} eq 'cust_srv'){
+ my $custsrvport;
+ #get servcie Protocol and Port
+ foreach my $key (sort keys %customservice){
+ if($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservice{$key}[0]){
+ if ($customservice{$key}[2] ne 'TCP' && $customservice{$key}[2] ne 'UDP'){
+ $errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";
+ }
+ $custsrvport= $customservice{$key}[1];
+ }
+ }
+ if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$custsrvport;}
+ }
+ #check if DNAT port is multiple
+ if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'dnatport'} ne ''){
+ my @parts=split(",",$fwdfwsettings{'dnatport'});
+ my @values=();
+ foreach (@parts){
+ chomp($_);
+ if ($_ =~ /^(\d+)\-(\d+)$/ || $_ =~ /^(\d+)\:(\d+)$/) {
+ my $check;
+ #change dashes with :
+ $_=~ tr/-/:/;
+ if ($_ eq "*") {
+ push(@values,"1:65535");
+ $check='on';
+ }
+ if ($_ =~ /^(\D)\:(\d+)$/ || $_ =~ /^(\D)\-(\d+)$/) {
+ push(@values,"1:$2");
+ $check='on';
+ }
+ if ($_ =~ /^(\d+)\:(\D)$/ || $_ =~ /^(\d+)\-(\D)$/) {
+ push(@values,"$1:65535");
+ $check='on'
+ }
+ $errormessage .= &General::validportrange($_, 'destination');
+ if(!$check){
+ push (@values,$_);
+ }
+ }else{
+ if (&General::validport($_)){
+ push (@values,$_);
+ }else{
+
+ }
+ }
+ }
+ $fwdfwsettings{'dnatport'}=join("|",@values);
+ }
+ }
+ #check valid remark
+ if ($fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){
+ $errormessage.=$Lang::tr{'fwdfw err remark'}."<br>";
+ }
+ #check if source and target identical
+ if ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ALL'){
+ $errormessage=$Lang::tr{'fwdfw err same'};
+ return $errormessage;
+ }
+ #get source and targetip address if possible
+ my ($sip,$scidr,$tip,$tcidr);
+ ($sip,$scidr)=&get_ip("src","grp1");
+ ($tip,$tcidr)=&get_ip("tgt","grp2");
+ #check same iprange in source and target
+ if ($sip ne '' && $scidr ne '' && $tip ne '' && $tcidr ne ''){
+ my $networkip1=&General::getnetworkip($sip,$scidr);
+ my $networkip2=&General::getnetworkip($tip,$tcidr);
+ if ($scidr gt $tcidr){
+ if ( &General::IpInSubnet($networkip1,$tip,&General::iporsubtodec($tcidr))){
+ $errormessage.=$Lang::tr{'fwdfw err samesub'};
+ }
+ }elsif($scidr eq $tcidr && $scidr eq '32'){
+ my ($sbyte1,$sbyte2,$sbyte3,$sbyte4)=split(/\./,$networkip1);
+ my ($tbyte1,$tbyte2,$tbyte3,$tbyte4)=split(/\./,$networkip2);
+ if ($sbyte1 eq $tbyte1 && $sbyte2 eq $tbyte2 && $sbyte3 eq $tbyte3){
+ $hint=$Lang::tr{'fwdfw hint ip1'}."<br>";
+ $hint.=$Lang::tr{'fwdfw hint ip2'}." Source: $networkip1/$scidr Target: $networkip2/$tcidr<br>";
+ }
+ }else{
+ if ( &General::IpInSubnet($networkip2,$sip,&General::iporsubtodec($scidr)) ){
+ $errormessage.=$Lang::tr{'fwdfw err samesub'};
+ }
+ }
+ }
+ #When using source- or targetport, the protocol has to be TCP or UDP
+ if (($fwdfwsettings{'USESRV'} eq 'ON' || $fwdfwsettings{'USE_SRC_PORT'} eq 'ON') && ($fwdfwsettings{'SRC_PORT'} ne '' || $fwdfwsettings{'TGT_PORT'} ne '') && ($fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP')){
+ $errormessage.=$Lang::tr{'fwdfw err prot_port1'};
+ return;
+ }
+ #when icmp selected, no targetport allowed
+ if (($fwdfwsettings{'PROT'} ne '' && $fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP' && $fwdfwsettings{'PROT'} ne 'template') && ($fwdfwsettings{'USESRV'} eq 'ON' || $fwdfwsettings{'USE_SRC_PORT'} eq 'ON')){
+ $errormessage.=$Lang::tr{'fwdfw err prot_port'};
+ return;
+ }
+ #change protocol if prot not equal dest single service
+ if ($fwdfwsettings{'grp3'} eq 'cust_srv'){
+ foreach my $key (sort keys %customservice){
+ if($customservice{$key}[0] eq $fwdfwsettings{$fwdfwsettings{'grp3'}}){
+ if ($customservice{$key}[2] ne $fwdfwsettings{'PROT'}){
+ $fwdfwsettings{'PROT'} = $customservice{$key}[2];
+ last;
+ }
+ }
+ }
+ }
+ #check source and destination protocol if source manual and dest servicegroup
+ if ($fwdfwsettings{'grp3'} eq 'cust_srvgrp'){
+ $fwdfwsettings{'PROT'} = '';
+ }
+ #ATTENTION: $fwdfwsetting{'TGT_PROT'} deprecated since 30.09.2013
+ $fwdfwsettings{'TGT_PROT'}=''; #Set field empty (deprecated)
+ #Check ICMP Types
+ if ($fwdfwsettings{'PROT'} eq 'ICMP'){
+ $fwdfwsettings{'USE_SRC_PORT'}='';
+ $fwdfwsettings{'SRC_PORT'}='';
+ #$fwdfwsettings{'USESRV'}='';
+ $fwdfwsettings{'TGT_PORT'}='';
+ &General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
+ foreach my $key (keys %icmptypes){
+ if($fwdfwsettings{'ICMP_TYPES'} eq "$icmptypes{$key}[0] ($icmptypes{$key}[1])"){
+ $fwdfwsettings{'ICMP_TYPES'}="$icmptypes{$key}[0]";
+ }
+ }
+ }elsif($fwdfwsettings{'PROT'} eq 'GRE'){
+ $fwdfwsettings{'USE_SRC_PORT'}='';
+ $fwdfwsettings{'SRC_PORT'}='';
+ $fwdfwsettings{'ICMP_TYPES'}='';
+ $fwdfwsettings{'USESRV'}='';
+ $fwdfwsettings{'TGT_PORT'}='';
+ }elsif($fwdfwsettings{'PROT'} eq 'ESP'){
+ $fwdfwsettings{'USE_SRC_PORT'}='';
+ $fwdfwsettings{'SRC_PORT'}='';
+ $fwdfwsettings{'ICMP_TYPES'}='';
+ $fwdfwsettings{'USESRV'}='';
+ $fwdfwsettings{'TGT_PORT'}='';
+ }elsif($fwdfwsettings{'PROT'} eq 'AH'){
+ $fwdfwsettings{'USE_SRC_PORT'}='';
+ $fwdfwsettings{'SRC_PORT'}='';
+ $fwdfwsettings{'ICMP_TYPES'}='';
+ $fwdfwsettings{'USESRV'}='';
+ $fwdfwsettings{'TGT_PORT'}='';
+ }elsif($fwdfwsettings{'PROT'} eq 'IGMP'){
+ $fwdfwsettings{'USE_SRC_PORT'}='';
+ $fwdfwsettings{'SRC_PORT'}='';
+ $fwdfwsettings{'ICMP_TYPES'}='';
+ $fwdfwsettings{'USESRV'}='';
+ $fwdfwsettings{'TGT_PORT'}='';
+ }elsif($fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP' && $fwdfwsettings{'PROT'} ne 'ICMP'){
+ $fwdfwsettings{'ICMP_TYPES'}='';
+ $fwdfwsettings{'PROT'} = '';
+ }elsif($fwdfwsettings{'PROT'} ne 'ICMP'){
+ $fwdfwsettings{'ICMP_TYPES'}='';
+ }
+}
+sub checkcounter
+{
+ my ($base1,$val1,$base2,$val2) = @_;
+
+ if($base1 eq 'cust_net_src' || $base1 eq 'cust_net_tgt'){
+ &dec_counter($confignet,\%customnetwork,$val1);
+ }elsif($base1 eq 'cust_host_src' || $base1 eq 'cust_host_tgt'){
+ &dec_counter($confighost,\%customhost,$val1);
+ }elsif($base1 eq 'cust_grp_src' || $base1 eq 'cust_grp_tgt'){
+ &dec_counter($configgrp,\%customgrp,$val1);
+ }elsif($base1 eq 'cust_srv'){
+ &dec_counter($configsrv,\%customservice,$val1);
+ }elsif($base1 eq 'cust_srvgrp'){
+ &dec_counter($configsrvgrp,\%customservicegrp,$val1);
+ }
+
+ if($base2 eq 'cust_net_src' || $base2 eq 'cust_net_tgt'){
+ &inc_counter($confignet,\%customnetwork,$val2);
+ }elsif($base2 eq 'cust_host_src' || $base2 eq 'cust_host_tgt'){
+ &inc_counter($confighost,\%customhost,$val2);
+ }elsif($base2 eq 'cust_grp_src' || $base2 eq 'cust_grp_tgt'){
+ &inc_counter($configgrp,\%customgrp,$val2);
+ }elsif($base2 eq 'cust_srv'){
+ &inc_counter($configsrv,\%customservice,$val2);
+ }elsif($base2 eq 'cust_srvgrp'){
+ &inc_counter($configsrvgrp,\%customservicegrp,$val2);
+ }
+}
+sub checkvpn
+{
+ my $ip=shift;
+ #Test if manual IP is part of static OpenVPN networks
+ &General::readhasharray("$configccdnet", \%ccdnet);
+ foreach my $key (sort keys %ccdnet){
+ my ($vpnip,$vpnsubnet) = split ("/",$ccdnet{$key}[1]);
+ my $sub=&General::iporsubtodec($vpnsubnet);
+ if (&General::IpInSubnet($ip,$vpnip,$sub)){
+ return 0;
+ }
+ }
+ # A Test if manual ip is part of dynamic openvpn subnet is made in getcolor
+ # because if one creates a custom host with the ip, we need to check the color there!
+ # It does not make sense to check this here
+
+ # Test if manual IP is part of an OpenVPN N2N subnet does also not make sense here
+ # Is also checked in getcolor
+
+ # Test if manual ip is part of an IPsec Network is also checked in getcolor
+ return 1;
+}
+sub checkvpncolor
+{
+
+}
+sub deleterule
+{
+ my %delhash=();
+ &General::readhasharray($fwdfwsettings{'config'}, \%delhash);
+ foreach my $key (sort {$a <=> $b} keys %delhash){
+ if ($key == $fwdfwsettings{'key'}){
+ #check hosts/net and groups
+ &checkcounter($delhash{$key}[3],$delhash{$key}[4],,);
+ &checkcounter($delhash{$key}[5],$delhash{$key}[6],,);
+ #check services and groups
+ if ($delhash{$key}[11] eq 'ON'){
+ &checkcounter($delhash{$key}[14],$delhash{$key}[15],,);
+ }
+ }
+ if ($key >= $fwdfwsettings{'key'}) {
+ my $next = $key + 1;
+ if (exists $delhash{$next}) {
+ foreach my $i (0 .. $#{$delhash{$next}}) {
+ $delhash{$key}[$i] = $delhash{$next}[$i];
+ }
+ }
+ }
+ }
+ # Remove the very last entry.
+ my $last_key = (sort {$a <=> $b} keys %delhash)[-1];
+ delete $delhash{$last_key};
+
+ &General::writehasharray($fwdfwsettings{'config'}, \%delhash);
+ &General::firewall_config_changed();
+
+ if($fwdfwsettings{'nobase'} ne 'on'){
+ &base;
+ }
+}
+sub disable_rule
+{
+ my $key1=shift;
+ &General::readhasharray("$configfwdfw", \%configfwdfw);
+ foreach my $key (sort keys %configfwdfw){
+ if ($key eq $key1 ){
+ if ($configfwdfw{$key}[2] eq 'ON'){$configfwdfw{$key}[2]='';}
+ }
+ }
+ &General::writehasharray("$configfwdfw", \%configfwdfw);
+ &General::firewall_config_changed();
+}
+sub dec_counter
+{
+ my $config=shift;
+ my %hash=%{(shift)};
+ my $val=shift;
+ my $pos;
+ &General::readhasharray($config, \%hash);
+ foreach my $key (sort { uc($hash{$a}[0]) cmp uc($hash{$b}[0]) } keys %hash){
+ if($hash{$key}[0] eq $val){
+ $pos=$#{$hash{$key}};
+ $hash{$key}[$pos] = $hash{$key}[$pos]-1;
+ }
+ }
+ &General::writehasharray($config, \%hash);
+}
+sub error
+{
+ if ($errormessage) {
+ &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+ print "<class name='base'>$errormessage\n";
+ print " </class>\n";
+ &Header::closebox();
+ print"<hr>";
+ }
+}
+sub fillselect
+{
+ my %hash=%{(shift)};
+ my $val=shift;
+ my $key;
+ foreach my $key (sort { ncmp($hash{$a}[0],$hash{$b}[0]) } keys %hash){
+ if($hash{$key}[0] eq $val){
+ print"<option value='$hash{$key}[0]' selected>$hash{$key}[0]</option>";
+ }else{
+ print"<option value='$hash{$key}[0]'>$hash{$key}[0]</option>";
+ }
+ }
+}
+sub gen_dd_block
+{
+ my $srctgt = shift;
+ my $grp=shift;
+ my $helper='';
+ my $show='';
+ $checked{'grp1'}{$fwdfwsettings{'grp1'}} = 'CHECKED';
+ $checked{'grp2'}{$fwdfwsettings{'grp2'}} = 'CHECKED';
+ $checked{'grp3'}{$fwdfwsettings{'grp3'}} = 'CHECKED';
+ $checked{'USE_SRC_PORT'}{$fwdfwsettings{'USE_SRC_PORT'}} = 'CHECKED';
+ $checked{'USESRV'}{$fwdfwsettings{'USESRV'}} = 'CHECKED';
+ $checked{'ACTIVE'}{$fwdfwsettings{'ACTIVE'}} = 'CHECKED';
+ $checked{'LOG'}{$fwdfwsettings{'LOG'}} = 'CHECKED';
+ $checked{'TIME'}{$fwdfwsettings{'TIME'}} = 'CHECKED';
+ $checked{'TIME_MON'}{$fwdfwsettings{'TIME_MON'}} = 'CHECKED';
+ $checked{'TIME_TUE'}{$fwdfwsettings{'TIME_TUE'}} = 'CHECKED';
+ $checked{'TIME_WED'}{$fwdfwsettings{'TIME_WED'}} = 'CHECKED';
+ $checked{'TIME_THU'}{$fwdfwsettings{'TIME_THU'}} = 'CHECKED';
+ $checked{'TIME_FRI'}{$fwdfwsettings{'TIME_FRI'}} = 'CHECKED';
+ $checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} = 'CHECKED';
+ $checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} = 'CHECKED';
+ $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected';
+ $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected';
+ $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
+ $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
+print<<END;
+ <table width='100%' border='0'>
+ <tr><td width='50%' valign='top'>
+ <table width='100%' border='0'>
+ <tr><td width='1%'><input type='radio' name='$grp' id='std_net_$srctgt' value='std_net_$srctgt' $checked{$grp}{'std_net_'.$srctgt}></td><td>$Lang::tr{'fwhost stdnet'}</td><td align='right'><select name='std_net_$srctgt' style='width:200px;'>
+END
+ foreach my $network (sort keys %defaultNetworks)
+ {
+ next if($defaultNetworks{$network}{'NAME'} eq "RED" && $srctgt eq 'src');
+ next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
+ print "<option value='$defaultNetworks{$network}{'NAME'}'";
+ print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $defaultNetworks{$network}{'NAME'});
+ my $defnet="$defaultNetworks{$network}{'NAME'}_NETADDRESS";
+ my $defsub="$defaultNetworks{$network}{'NAME'}_NETMASK";
+ my $defsub1=&General::subtocidr($ifaces{$defsub});
+ $ifaces{$defnet}='' if ($defaultNetworks{$network}{'NAME'} eq 'RED');
+ if ($ifaces{$defnet}){
+ print ">$network ($ifaces{$defnet}/$defsub1)</option>";
+ }else{
+ print ">$network</option>";
+ }
+ }
+ print"</select></td></tr>";
+ #custom networks
+ if (! -z $confignet || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
+ print"<tr><td><input type='radio' name='$grp' id='cust_net_$srctgt' value='cust_net_$srctgt' $checked{$grp}{'cust_net_'.$srctgt}></td><td>$Lang::tr{'fwhost cust net'}</td><td align='right'><select name='cust_net_$srctgt' style='width:200px;'>";
+ &fillselect(\%customnetwork,$fwdfwsettings{$fwdfwsettings{$grp}});
+ print"</select></td>";
+ }
+ #custom hosts
+ if (! -z $confighost || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
+ print"<tr><td><input type='radio' name='$grp' id='cust_host_$srctgt' value='cust_host_$srctgt' $checked{$grp}{'cust_host_'.$srctgt}></td><td>$Lang::tr{'fwhost cust addr'}</td><td align='right'><select name='cust_host_$srctgt' style='width:200px;'>";
+ &fillselect(\%customhost,$fwdfwsettings{$fwdfwsettings{$grp}});
+ print"</select></td>";
+ }
+ #custom groups
+ if (! -z $configgrp || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
+ print"<tr><td valign='top'><input type='radio' name='$grp' id='cust_grp_$srctgt' value='cust_grp_$srctgt' $checked{$grp}{'cust_grp_'.$srctgt}></td><td >$Lang::tr{'fwhost cust grp'}</td><td align='right'><select name='cust_grp_$srctgt' style='width:200px;'>";
+ foreach my $key (sort { ncmp($customgrp{$a}[0],$customgrp{$b}[0]) } keys %customgrp) {
+ if($helper ne $customgrp{$key}[0]){
+ print"<option ";
+ print "selected='selected' " if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $customgrp{$key}[0]);
+ print ">$customgrp{$key}[0]</option>";
+ }
+ $helper=$customgrp{$key}[0];
+ }
+ print"</select></td>";
+ }
+ #End left table. start right table (vpn)
+ print"</tr></table></td><td valign='top'><table width='100%' border='0'><tr>";
+ # CCD networks
+ if( ! -z $configccdnet || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
+ print"<td width='1%'><input type='radio' name='$grp' id='ovpn_net_$srctgt' value='ovpn_net_$srctgt' $checked{$grp}{'ovpn_net_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ccdnet'}</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_net_$srctgt' style='width:200px;'>";
+ &fillselect(\%ccdnet,$fwdfwsettings{$fwdfwsettings{$grp}});
+ print"</select></td></tr>";
+ }
+ #OVPN CCD Hosts
+ foreach my $key (sort { ncmp($ccdhost{$a}[0],$ccdhost{$b}[0]) } keys %ccdhost){
+ if ($ccdhost{$key}[33] ne '' ){
+ print"<tr><td width='1%'><input type='radio' name='$grp' id='ovpn_host_$srctgt' value='ovpn_host_$srctgt' $checked{$grp}{'ovpn_host_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ccdhost'}</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_host_$srctgt' style='width:200px;'>" if ($show eq '');
+ $show='1';
+ print "<option value='$ccdhost{$key}[1]'";
+ print "selected='selected'" if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $ccdhost{$key}[1]);
+ print ">$ccdhost{$key}[1]</option>";
+ }
+ }
+ if($optionsfw{'SHOWDROPDOWN'} eq 'on' && $show eq ''){
+ print"<tr><td width='1%'><input type='radio' name='$grp' id='ovpn_host_$srctgt' value='ovpn_host_$srctgt' $checked{$grp}{'ovpn_host_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ccdhost'}</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_host_$srctgt' style='width:200px;'></select></td></tr>" ;
+ }
+ if ($show eq '1'){$show='';print"</select></td></tr>";}
+ #OVPN N2N
+ foreach my $key (sort { ncmp($ccdhost{$a}[1],$ccdhost{$b}[1]) } keys %ccdhost){
+ if ($ccdhost{$key}[3] eq 'net'){
+ print"<tr><td width='1%'><input type='radio' name='$grp' id='ovpn_n2n_$srctgt' value='ovpn_n2n_$srctgt' $checked{$grp}{'ovpn_n2n_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ovpn_n2n'}:</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_n2n_$srctgt' style='width:200px;'>" if ($show eq '');
+ $show='1';
+ print "<option value='$ccdhost{$key}[1]'";
+ print "selected='selected'" if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $ccdhost{$key}[1]);
+ print ">$ccdhost{$key}[1]</option>";
+ }
+ }
+ if($optionsfw{'SHOWDROPDOWN'} eq 'on' && $show eq ''){
+ print"<tr><td width='1%'><input type='radio' name='$grp' id='ovpn_n2n_$srctgt' value='ovpn_n2n_$srctgt' $checked{$grp}{'ovpn_n2n_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ovpn_n2n'}</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_n2n_$srctgt' style='width:200px;'></select></td></tr>" ;
+ }
+ if ($show eq '1'){$show='';print"</select></td></tr>";}
+ #IPsec netze
+ foreach my $key (sort { ncmp($ipsecconf{$a}[1],$ipsecconf{$b}[1]) } keys %ipsecconf) {
+ if ($ipsecconf{$key}[3] eq 'net' || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
+ print"<tr><td valign='top'><input type='radio' name='$grp' value='ipsec_net_$srctgt' $checked{$grp}{'ipsec_net_'.$srctgt}></td><td >$Lang::tr{'fwhost ipsec net'}</td><td align='right'><select name='ipsec_net_$srctgt' style='width:200px;'>" if ($show eq '');
+ $show='1';
+ print "<option ";
+ print "selected='selected'" if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $ipsecconf{$key}[1]);
+ print ">$ipsecconf{$key}[1]</option>";
+ }
+ }
+ if($optionsfw{'SHOWDROPDOWN'} eq 'on' && $show eq ''){
+ print"<tr><td valign='top'><input type='radio' name='$grp' id='ipsec_net_$srctgt' value='ipsec_net_$srctgt' $checked{$grp}{'ipsec_net_'.$srctgt}></td><td >$Lang::tr{'fwhost ipsec net'}</td><td align='right'><select name='ipsec_net_$srctgt' style='width:200px;'><select></td></tr>";
+ }
+ if ($show eq '1'){$show='';print"</select></td></tr>";}
+
+ print"</table>";
+ print"</td></tr></table><br>";
+}
+sub get_ip
+{
+ my $val=shift;
+ my $grp =shift;
+ my $a;
+ my $b;
+ &General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
+ if ($fwdfwsettings{$grp} ne $Lang::tr{'fwhost any'}){
+ if ($fwdfwsettings{$grp} eq $val.'_addr'){
+ ($a,$b) = split (/\//, $fwdfwsettings{$fwdfwsettings{$grp}});
+ }elsif($fwdfwsettings{$grp} eq 'std_net_'.$val){
+ if ($fwdfwsettings{$fwdfwsettings{$grp}} =~ /Gr/i){
+ $a=$netsettings{'GREEN_NETADDRESS'};
+ $b=&General::iporsubtocidr($netsettings{'GREEN_NETMASK'});
+ }elsif($fwdfwsettings{$fwdfwsettings{$grp}} =~ /Ora/i){
+ $a=$netsettings{'ORANGE_NETADDRESS'};
+ $b=&General::iporsubtocidr($netsettings{'ORANGE_NETMASK'});
+ }elsif($fwdfwsettings{$fwdfwsettings{$grp}} =~ /Bl/i){
+ $a=$netsettings{'BLUE_NETADDRESS'};
+ $b=&General::iporsubtocidr($netsettings{'BLUE_NETMASK'});
+ }elsif($fwdfwsettings{$fwdfwsettings{$grp}} =~ /OpenVPN/i){
+ &General::readhash("$configovpn",\%ovpnsettings);
+ ($a,$b) = split (/\//, $ovpnsettings{'DOVPN_SUBNET'});
+ $b=&General::iporsubtocidr($b);
+ }
+ }elsif($fwdfwsettings{$grp} eq 'cust_net_'.$val){
+ &General::readhasharray("$confignet", \%customnetwork);
+ foreach my $key (keys %customnetwork){
+ if($customnetwork{$key}[0] eq $fwdfwsettings{$fwdfwsettings{$grp}}){
+ $a=$customnetwork{$key}[1];
+ $b=&General::iporsubtocidr($customnetwork{$key}[2]);
+ }
+ }
+ }elsif($fwdfwsettings{$grp} eq 'cust_host_'.$val){
+ &General::readhasharray("$confighost", \%customhost);
+ foreach my $key (keys %customhost){
+ if($customhost{$key}[0] eq $fwdfwsettings{$fwdfwsettings{$grp}}){
+ if ($customhost{$key}[1] eq 'ip'){
+ ($a,$b)=split (/\//,$customhost{$key}[2]);
+ $b=&General::iporsubtocidr($b);
+ }else{
+ if ($grp eq 'grp2'){
+ $errormessage=$Lang::tr{'fwdfw err tgt_mac'};
+ }
+ }
+ }
+ }
+ }
+ }
+ return $a,$b;
+}
+sub get_name
+{
+ my $val=shift;
+ &General::setup_default_networks(\%defaultNetworks);
+ foreach my $network (sort keys %defaultNetworks)
+ {
+ return "$network" if ($val eq $defaultNetworks{$network}{'NAME'});
+ }
+}
+sub getsrcport
+{
+ my %hash=%{(shift)};
+ my $key=shift;
+ if($hash{$key}[7] eq 'ON' && $hash{$key}[10]){
+ $hash{$key}[10]=~ s/\|/,/g;
+ print": $hash{$key}[10]";
+ }elsif($hash{$key}[7] eq 'ON' && $hash{$key}[8] eq 'ICMP'){
+ print": <br>$hash{$key}[9] ";
+ }
+}
+sub gettgtport
+{
+ my %hash=%{(shift)};
+ my $key=shift;
+ my $service;
+ my $prot;
+ if($hash{$key}[11] eq 'ON' && $hash{$key}[12] ne 'ICMP'){
+ if($hash{$key}[14] eq 'cust_srv'){
+ &General::readhasharray("$configsrv", \%customservice);
+ foreach my $i (sort keys %customservice){
+ if($customservice{$i}[0] eq $hash{$key}[15]){
+ $service = $customservice{$i}[0];
+ }
+ }
+ }elsif($hash{$key}[14] eq 'cust_srvgrp'){
+ $service=$hash{$key}[15];
+ }elsif($hash{$key}[14] eq 'TGT_PORT'){
+ $hash{$key}[15]=~ s/\|/,/g;
+ $service=$hash{$key}[15];
+ }
+ if($service){
+ print": $service";
+ }
+ }
+}
+sub get_serviceports
+{
+ my $type=shift;
+ my $name=shift;
+ &General::readhasharray("$configsrv", \%customservice);
+ &General::readhasharray("$configsrvgrp", \%customservicegrp);
+ my $tcp;
+ my $udp;
+ my $icmp;
+ @protocols=();
+ if($type eq 'service'){
+ foreach my $key (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){
+ if ($customservice{$key}[0] eq $name){
+ push (@protocols,$customservice{$key}[2]);
+ }
+ }
+ }elsif($type eq 'group'){
+ foreach my $key (sort { ncmp($customservicegrp{$a}[0],$customservicegrp{$b}[0]) } keys %customservicegrp){
+ if ($customservicegrp{$key}[0] eq $name){
+ foreach my $key1 (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){
+ if ($customservice{$key1}[0] eq $customservicegrp{$key}[2]){
+ if($customservice{$key1}[2] eq 'TCP'){
+ $tcp='TCP';
+ }elsif($customservice{$key1}[2] eq 'ICMP'){
+ $icmp='ICMP';
+ }elsif($customservice{$key1}[2] eq 'UDP'){
+ $udp='UDP';
+ }
+ }
+ }
+ }
+ }
+ }
+ if($tcp && $udp && $icmp){
+ push (@protocols,"TCP,UDP, <br>ICMP");
+ return @protocols;
+ }
+ if($tcp){
+ push (@protocols,"TCP");
+ }
+ if($udp){
+ push (@protocols,"UDP");
+ }
+ if($icmp){
+ push (@protocols,"ICMP");
+ }
+ return @protocols;
+}
+sub getcolor
+{
+ my $nettype=shift;
+ my $val=shift;
+ my $hash=shift;
+ if($optionsfw{'SHOWCOLORS'} eq 'on'){
+ #custom Hosts
+ if ($nettype eq 'cust_host_src' || $nettype eq 'cust_host_tgt'){
+ foreach my $key (sort keys %$hash){
+ if ($$hash{$key}[0] eq $val){
+ $val=$$hash{$key}[2];
+ }
+ }
+ }
+ #standard networks
+ if ($val eq 'GREEN'){
+ $tdcolor="style='background-color: $Header::colourgreen;color:white;'";
+ return;
+ }elsif ($val eq 'ORANGE'){
+ $tdcolor="style='background-color: $Header::colourorange;color:white;'";
+ return;
+ }elsif ($val eq 'BLUE'){
+ $tdcolor="style='background-color: $Header::colourblue;color:white;'";
+ return;
+ }elsif ($val eq 'RED' ||$val eq 'RED1' ){
+ $tdcolor="style='background-color: $Header::colourred;color:white;'";
+ return;
+ }elsif ($val eq 'IPFire' ){
+ $tdcolor="style='background-color: $Header::colourred;color:white;'";
+ return;
+ }elsif($val =~ /^(.*?)\/(.*?)$/){
+ my ($sip,$scidr) = split ("/",$val);
+ if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
+ $tdcolor="style='background-color: $Header::colourorange;color:white;'";
+ return;
+ }
+ if ( &General::IpInSubnet($sip,$netsettings{'GREEN_ADDRESS'},$netsettings{'GREEN_NETMASK'})){
+ $tdcolor="style='background-color: $Header::colourgreen;color:white;'";
+ return;
+ }
+ if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
+ $tdcolor="style='background-color: $Header::colourblue;color:white;'";
+ return;
+ }
+ }elsif ($val eq 'Default IP'){
+ $tdcolor="style='background-color: $Header::colourred;color:white;'";
+ return;
+ }
+ #Check if a manual IP or custom host is part of a VPN
+ if ($nettype eq 'src_addr' || $nettype eq 'tgt_addr' || $nettype eq 'cust_host_src' || $nettype eq 'cust_host_tgt'){
+ #Check if IP is part of OpenVPN dynamic subnet
+ my ($a,$b) = split("/",$ovpnsettings{'DOVPN_SUBNET'});
+ my ($c,$d) = split("/",$val);
+ if (&General::IpInSubnet($c,$a,$b)){
+ $tdcolor="style='background-color: $Header::colourovpn;color:white;'";
+ return;
+ }
+ #Check if IP is part of OpenVPN static subnet
+ foreach my $key (sort keys %ccdnet){
+ my ($a,$b) = split("/",$ccdnet{$key}[1]);
+ $b =&General::iporsubtodec($b);
+ if (&General::IpInSubnet($c,$a,$b)){
+ $tdcolor="style='background-color: $Header::colourovpn;color:white;'";
+ return;
+ }
+ }
+ #Check if IP is part of OpenVPN N2N subnet
+ foreach my $key (sort keys %ccdhost){
+ if ($ccdhost{$key}[3] eq 'net'){
+ my ($a,$b) = split("/",$ccdhost{$key}[11]);
+ if (&General::IpInSubnet($c,$a,$b)){
+ $tdcolor="style='background-color: $Header::colourovpn;color:white;'";
+ return;
+ }
+ }
+ }
+ #Check if IP is part of IPsec RW network
+ if ($ipsecsettings{'RW_NET'} ne ''){
+ my ($a,$b) = split("/",$ipsecsettings{'RW_NET'});
+ $b=&General::iporsubtodec($b);
+ if (&General::IpInSubnet($c,$a,$b)){
+ $tdcolor="style='background-color: $Header::colourvpn;color:white;'";
+ return;
+ }
+ }
+ #Check if IP is part of a IPsec N2N network
+ foreach my $key (sort keys %ipsecconf){
+ my ($a,$b) = split("/",$ipsecconf{$key}[11]);
+ if (&General::IpInSubnet($c,$a,$b)){
+ $tdcolor="style='background-color: $Header::colourvpn;color:white;'";
+ return;
+ }
+ }
+ }
+ #VPN networks
+ if ($nettype eq 'ovpn_n2n_src' || $nettype eq 'ovpn_n2n_tgt' || $nettype eq 'ovpn_net_src' || $nettype eq 'ovpn_net_tgt'|| $nettype eq 'ovpn_host_src' || $nettype eq 'ovpn_host_tgt'){
+ $tdcolor="style='background-color: $Header::colourovpn;color:white;'";
+ return;
+ }
+ if ($nettype eq 'ipsec_net_src' || $nettype eq 'ipsec_net_tgt'){
+ $tdcolor="style='background-color: $Header::colourvpn;color:white;'";
+ return;
+ }
+ #ALIASE
+ foreach my $alias (sort keys %aliases)
+ {
+ if ($val eq $alias){
+ $tdcolor="style='background-color:$Header::colourred;color:white;'";
+ return;
+ }
+ }
+ }
+ $tdcolor='';
+ return;
+}
+sub hint
+{
+ if ($hint) {
+ &Header::openbox('100%', 'left', $Lang::tr{'fwhost hint'});
+ print "<class name='base'>$hint\n";
+ print " </class>\n";
+ &Header::closebox();
+ print"<hr>";
+ }
+}
+sub inc_counter
+{
+ my $config=shift;
+ my %hash=%{(shift)};
+ my $val=shift;
+ my $pos;
+
+ &General::readhasharray($config, \%hash);
+ foreach my $key (sort { uc($hash{$a}[0]) cmp uc($hash{$b}[0]) } keys %hash){
+ if($hash{$key}[0] eq $val){
+ $pos=$#{$hash{$key}};
+ $hash{$key}[$pos] = $hash{$key}[$pos]+1;
+ }
+ }
+ &General::writehasharray($config, \%hash);
+}
+sub newrule
+{
+ &error;
+ &General::setup_default_networks(\%defaultNetworks);
+ &General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
+ #read all configfiles
+ &General::readhasharray("$configccdnet", \%ccdnet);
+ &General::readhasharray("$confignet", \%customnetwork);
+ &General::readhasharray("$configccdhost", \%ccdhost);
+ &General::readhasharray("$confighost", \%customhost);
+ &General::readhasharray("$configccdhost", \%ccdhost);
+ &General::readhasharray("$configgrp", \%customgrp);
+ &General::readhasharray("$configipsec", \%ipsecconf);
+ &General::get_aliases(\%aliases);
+ my %checked=();
+ my $helper;
+ my $sum=0;
+ if($fwdfwsettings{'config'} eq ''){$fwdfwsettings{'config'}=$configfwdfw;}
+ my $config=$fwdfwsettings{'config'};
+ my %hash=();
+ #Get Red IP-ADDRESS
+ open (CONN1,"/var/ipfire/red/local-ipaddress");
+ my $redip = <CONN1>;
+ close(CONN1);
+ $checked{'grp1'}{$fwdfwsettings{'grp1'}} = 'CHECKED';
+ $checked{'grp2'}{$fwdfwsettings{'grp2'}} = 'CHECKED';
+ $checked{'grp3'}{$fwdfwsettings{'grp3'}} = 'CHECKED';
+ $checked{'USE_SRC_PORT'}{$fwdfwsettings{'USE_SRC_PORT'}} = 'CHECKED';
+ $checked{'USESRV'}{$fwdfwsettings{'USESRV'}} = 'CHECKED';
+ $checked{'ACTIVE'}{$fwdfwsettings{'ACTIVE'}} = 'CHECKED';
+ $checked{'LOG'}{$fwdfwsettings{'LOG'}} = 'CHECKED';
+ $checked{'TIME'}{$fwdfwsettings{'TIME'}} = 'CHECKED';
+ $checked{'TIME_MON'}{$fwdfwsettings{'TIME_MON'}} = 'CHECKED';
+ $checked{'TIME_TUE'}{$fwdfwsettings{'TIME_TUE'}} = 'CHECKED';
+ $checked{'TIME_WED'}{$fwdfwsettings{'TIME_WED'}} = 'CHECKED';
+ $checked{'TIME_THU'}{$fwdfwsettings{'TIME_THU'}} = 'CHECKED';
+ $checked{'TIME_FRI'}{$fwdfwsettings{'TIME_FRI'}} = 'CHECKED';
+ $checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} = 'CHECKED';
+ $checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} = 'CHECKED';
+ $checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} = 'CHECKED';
+ $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected';
+ $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected';
+ $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
+ $selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
+ #check if update and get values
+ if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} eq 'on' && !$errormessage){
+ &General::readhasharray("$config", \%hash);
+ foreach my $key (sort keys %hash){
+ $sum++;
+ if ($key eq $fwdfwsettings{'key'}){
+ $fwdfwsettings{'oldrulenumber'} = $fwdfwsettings{'key'};
+ $fwdfwsettings{'RULE_ACTION'} = $hash{$key}[0];
+ $fwdfwsettings{'chain'} = $hash{$key}[1];
+ $fwdfwsettings{'ACTIVE'} = $hash{$key}[2];
+ $fwdfwsettings{'grp1'} = $hash{$key}[3];
+ $fwdfwsettings{$fwdfwsettings{'grp1'}} = $hash{$key}[4];
+ $fwdfwsettings{'grp2'} = $hash{$key}[5];
+ $fwdfwsettings{$fwdfwsettings{'grp2'}} = $hash{$key}[6];
+ $fwdfwsettings{'USE_SRC_PORT'} = $hash{$key}[7];
+ $fwdfwsettings{'PROT'} = $hash{$key}[8];
+ $fwdfwsettings{'ICMP_TYPES'} = $hash{$key}[9];
+ $fwdfwsettings{'SRC_PORT'} = $hash{$key}[10];
+ $fwdfwsettings{'USESRV'} = $hash{$key}[11];
+ $fwdfwsettings{'TGT_PROT'} = $hash{$key}[12];
+ $fwdfwsettings{'ICMP_TGT'} = $hash{$key}[13];
+ $fwdfwsettings{'grp3'} = $hash{$key}[14];
+ $fwdfwsettings{$fwdfwsettings{'grp3'}} = $hash{$key}[15];
+ $fwdfwsettings{'ruleremark'} = $hash{$key}[16];
+ $fwdfwsettings{'LOG'} = $hash{$key}[17];
+ $fwdfwsettings{'TIME'} = $hash{$key}[18];
+ $fwdfwsettings{'TIME_MON'} = $hash{$key}[19];
+ $fwdfwsettings{'TIME_TUE'} = $hash{$key}[20];
+ $fwdfwsettings{'TIME_WED'} = $hash{$key}[21];
+ $fwdfwsettings{'TIME_THU'} = $hash{$key}[22];
+ $fwdfwsettings{'TIME_FRI'} = $hash{$key}[23];
+ $fwdfwsettings{'TIME_SAT'} = $hash{$key}[24];
+ $fwdfwsettings{'TIME_SUN'} = $hash{$key}[25];
+ $fwdfwsettings{'TIME_FROM'} = $hash{$key}[26];
+ $fwdfwsettings{'TIME_TO'} = $hash{$key}[27];
+ $fwdfwsettings{'USE_NAT'} = $hash{$key}[28];
+ $fwdfwsettings{'nat'} = $hash{$key}[31]; #changed order
+ $fwdfwsettings{$fwdfwsettings{'nat'}} = $hash{$key}[29];
+ $fwdfwsettings{'dnatport'} = $hash{$key}[30];
+ $checked{'grp1'}{$fwdfwsettings{'grp1'}} = 'CHECKED';
+ $checked{'grp2'}{$fwdfwsettings{'grp2'}} = 'CHECKED';
+ $checked{'grp3'}{$fwdfwsettings{'grp3'}} = 'CHECKED';
+ $checked{'USE_SRC_PORT'}{$fwdfwsettings{'USE_SRC_PORT'}} = 'CHECKED';
+ $checked{'USESRV'}{$fwdfwsettings{'USESRV'}} = 'CHECKED';
+ $checked{'ACTIVE'}{$fwdfwsettings{'ACTIVE'}} = 'CHECKED';
+ $checked{'LOG'}{$fwdfwsettings{'LOG'}} = 'CHECKED';
+ $checked{'TIME'}{$fwdfwsettings{'TIME'}} = 'CHECKED';
+ $checked{'TIME_MON'}{$fwdfwsettings{'TIME_MON'}} = 'CHECKED';
+ $checked{'TIME_TUE'}{$fwdfwsettings{'TIME_TUE'}} = 'CHECKED';
+ $checked{'TIME_WED'}{$fwdfwsettings{'TIME_WED'}} = 'CHECKED';
+ $checked{'TIME_THU'}{$fwdfwsettings{'TIME_THU'}} = 'CHECKED';
+ $checked{'TIME_FRI'}{$fwdfwsettings{'TIME_FRI'}} = 'CHECKED';
+ $checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} = 'CHECKED';
+ $checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} = 'CHECKED';
+ $checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} = 'CHECKED';
+ $checked{'nat'}{$fwdfwsettings{'nat'}} = 'CHECKED';
+ $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected';
+ $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected';
+ $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
+ $selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
+ $selected{'dnat'}{$fwdfwsettings{$fwdfwsettings{'nat'}}} ='selected';
+ $selected{'snat'}{$fwdfwsettings{$fwdfwsettings{'nat'}}} ='selected';
+ }
+ }
+ $fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'};
+ $fwdfwsettings{'oldgrp1b'}=$fwdfwsettings{$fwdfwsettings{'grp1'}};
+ $fwdfwsettings{'oldgrp2a'}=$fwdfwsettings{'grp2'};
+ $fwdfwsettings{'oldgrp2b'}=$fwdfwsettings{$fwdfwsettings{'grp2'}};
+ $fwdfwsettings{'oldgrp3a'}=$fwdfwsettings{'grp3'};
+ $fwdfwsettings{'oldgrp3b'}=$fwdfwsettings{$fwdfwsettings{'grp3'}};
+ $fwdfwsettings{'oldusesrv'}=$fwdfwsettings{'USESRV'};
+ $fwdfwsettings{'oldruleremark'}=$fwdfwsettings{'ruleremark'};
+ $fwdfwsettings{'oldnat'}=$fwdfwsettings{'USE_NAT'};
+ $fwdfwsettings{'oldruletype'}=$fwdfwsettings{'chain'};
+ #check if manual ip (source) is orange network
+ if ($fwdfwsettings{'grp1'} eq 'src_addr'){
+ my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
+ if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
+ $fwdfwsettings{'oldorange'} ='on';
+ }
+ }
+ }else{
+ $fwdfwsettings{'ACTIVE'}='ON';
+ $checked{'ACTIVE'}{$fwdfwsettings{'ACTIVE'}} = 'CHECKED';
+ $fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'};
+ $fwdfwsettings{'oldgrp1b'}=$fwdfwsettings{$fwdfwsettings{'grp1'}};
+ $fwdfwsettings{'oldgrp2a'}=$fwdfwsettings{'grp2'};
+ $fwdfwsettings{'oldgrp2b'}=$fwdfwsettings{$fwdfwsettings{'grp2'}};
+ $fwdfwsettings{'oldgrp3a'}=$fwdfwsettings{'grp3'};
+ $fwdfwsettings{'oldgrp3b'}=$fwdfwsettings{$fwdfwsettings{'grp3'}};
+ $fwdfwsettings{'oldusesrv'}=$fwdfwsettings{'USESRV'};
+ $fwdfwsettings{'oldruleremark'}=$fwdfwsettings{'ruleremark'};
+ $fwdfwsettings{'oldnat'}=$fwdfwsettings{'USE_NAT'};
+ #check if manual ip (source) is orange network
+ if ($fwdfwsettings{'grp1'} eq 'src_addr'){
+ my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
+ if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
+ $fwdfwsettings{'oldorange'} ='on';
+ }
+ }
+ }
+ &Header::openbox('100%', 'left', $Lang::tr{'fwdfw addrule'});
+ &Header::closebox();
+ &Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'});
+ #------SOURCE-------------------------------------------------------
+ print "<form method='post'>";
+ print<<END;
+ <table width='100%' border='0'>
+ <tr><td width='1%'><input type='radio' name='grp1' value='src_addr' checked></td><td width='60%'>$Lang::tr{'fwdfw sourceip'}<input type='TEXT' name='src_addr' value='$fwdfwsettings{'src_addr'}' size='16' maxlength='18' ></td><td width='1%'><input type='radio' name='grp1' id='ipfire_src' value='ipfire_src' $checked{'grp1'}{'ipfire_src'}></td><td><b>Firewall</b></td>
+END
+ print"<td align='right'><select name='ipfire_src' style='width:200px;'>";
+ print "<option value='ALL' $selected{'ipfire_src'}{'ALL'}>$Lang::tr{'all'}</option>";
+ print "<option value='GREEN' $selected{'ipfire_src'}{'GREEN'}>$Lang::tr{'green'} ($ifaces{'GREEN_ADDRESS'})</option>" if $ifaces{'GREEN_ADDRESS'};
+ print "<option value='ORANGE' $selected{'ipfire_src'}{'ORANGE'}>$Lang::tr{'orange'} ($ifaces{'ORANGE_ADDRESS'})</option>" if (&Header::orange_used());
+ print "<option value='BLUE' $selected{'ipfire_src'}{'BLUE'}>$Lang::tr{'blue'} ($ifaces{'BLUE_ADDRESS'})</option>" if (&Header::blue_used());
+ print "<option value='RED1' $selected{'ipfire_src'}{'RED1'}>$Lang::tr{'red1'} ($redip)" if ($redip);
+ if (! -z "${General::swroot}/ethernet/aliases"){
+ foreach my $alias (sort keys %aliases)
+ {
+ print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias</option>";
+ }
+ }
+ print<<END;
+ </select></td></tr>
+ <tr><td colspan='8'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
+END
+ &gen_dd_block('src','grp1');
+ print"<hr>";
+ &Header::closebox();
+ #---SNAT / DNAT ------------------------------------------------
+ &Header::openbox('100%', 'left', 'NAT');
+ print<<END;
+ <label>
+ <input type='checkbox' name='USE_NAT' id='USE_NAT' value="ON" $checked{'USE_NAT'}{'ON'}>
+ $Lang::tr{'fwdfw use nat'}
+ </label>
+ <div class="NAT">
+ <table width='100%' border='0'>
+ <tr>
+ <td colspan='2'></td>
+ <td width='1%'>
+ <input type='radio' name='nat' id='dnat' value='dnat' checked>
+ </td>
+ <td width='50%'>$Lang::tr{'fwdfw dnat'}</td>
+END
+ print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='dnat' style='width:140px;'>";
+ print "<option value='ALL' $selected{'dnat'}{$Lang::tr{'all'}}>$Lang::tr{'all'}</option>";
+ print "<option value='Default IP' $selected{'dnat'}{'Default IP'}>Default IP</option>";
+ foreach my $alias (sort keys %aliases)
+ {
+ print "<option value='$alias' $selected{'dnat'}{$alias}>$alias</option>";
+ }
+ print"</select></td></tr>";
+ #SNAT
+ print"<tr><td colspan='2'></td><td width='1%'><input type='radio' name='nat' id='snat' value='snat' $checked{'nat'}{'snat'}></td><td width='20%'>$Lang::tr{'fwdfw snat'}</td>";
+ print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='snat' style='width:140px;'>";
+ foreach my $alias (sort keys %aliases)
+ {
+ print "<option value='$alias' $selected{'snat'}{$alias}>$alias</option>";
+ }
+ foreach my $network (sort keys %defaultNetworks)
+ {
+ next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
+ next if($defaultNetworks{$network}{'NAME'} eq "ALL");
+ next if($defaultNetworks{$network}{'NAME'} =~ /OpenVPN/i);
+ print "<option value='$defaultNetworks{$network}{'NAME'}'";
+ print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
+ print ">$network</option>";
+ }
+ print"</select></td></tr></table>";
+ print"</div>";
+ &Header::closebox();
+ #---TARGET------------------------------------------------------
+ &Header::openbox('100%', 'left', $Lang::tr{'fwdfw target'});
+ print<<END;
+ <table width='100%' border='0'>
+ <tr><td width='1%'><input type='radio' name='grp2' value='tgt_addr' checked></td><td width='60%' nowrap='nowrap'>$Lang::tr{'fwdfw targetip'}<input type='TEXT' name='tgt_addr' value='$fwdfwsettings{'tgt_addr'}' size='16' maxlength='18'><td width='1%'><input type='radio' name='grp2' id='ipfire' value='ipfire' $checked{'grp2'}{'ipfire'}></td><td><b>Firewall</b></td>
+END
+ print"<td align='right'><select name='ipfire' style='width:200px;'>";
+ print "<option value='ALL' $selected{'ipfire'}{'ALL'}>$Lang::tr{'all'}</option>";
+ print "<option value='GREEN' $selected{'ipfire'}{'GREEN'}>$Lang::tr{'green'} ($ifaces{'GREEN_ADDRESS'})</option>" if $ifaces{'GREEN_ADDRESS'};
+ print "<option value='ORANGE' $selected{'ipfire'}{'ORANGE'}>$Lang::tr{'orange'} ($ifaces{'ORANGE_ADDRESS'})</option>" if (&Header::orange_used());
+ print "<option value='BLUE' $selected{'ipfire'}{'BLUE'}>$Lang::tr{'blue'} ($ifaces{'BLUE_ADDRESS'})</option>"if (&Header::blue_used());
+ print "<option value='RED1' $selected{'ipfire'}{'RED1'}>$Lang::tr{'red1'} ($redip)" if ($redip);
+ if (! -z "${General::swroot}/ethernet/aliases"){
+ foreach my $alias (sort keys %aliases)
+ {
+ print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias</option>";
+ }
+ }
+ print<<END;
+ </select></td></tr>
+ <tr><td colspan='7'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
+END
+ &gen_dd_block('tgt','grp2');
+ print"<hr>";
+ &Header::closebox;
+ #---PROTOCOL------------------------------------------------------
+ &Header::openbox('100%', 'left', $Lang::tr{'fwhost prot'});
+ #Fix Protocol for JQuery
+ if ($fwdfwsettings{'grp3'} eq 'cust_srv' || $fwdfwsettings{'grp3'} eq 'cust_srvgrp'){
+ $fwdfwsettings{'PROT'} = 'template';
+ }
+ print<<END;
+ <div id="prt">
+ <table width='15%' border='0' style="float:left;">
+ <tr>
+ <td>
+ <select name='PROT' id='protocol'>
+END
+ print "<option value=\"\"";
+ if ($fwdfwsettings{'PROT'} eq '') {
+ print " selected=\"selected\"";
+ }
+ print ">$Lang::tr{'all'}</option>";
+
+ print "<option value=\"template\"";
+ print " selected=\"selected\"" if ($fwdfwsettings{'grp3'} eq 'cust_srv' || $fwdfwsettings{'grp3'} eq 'cust_srvgrp');
+ print ">- $Lang::tr{'template'} -</option>";
+
+ foreach (@PROTOCOLS) {
+ print"<option value=\"$_\"";
+ if ($_ eq $fwdfwsettings{'PROT'}) {
+ print " selected=\"selected\"";
+ }
+ print ">$_</option>";
+ }
+ print<<END;
+ </select>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <div id="PROTOCOL_ICMP_TYPES">
+ <table width='50%' border='0' style="float:left;">
+ <tr>
+ <td width='20%'>$Lang::tr{'fwhost icmptype'}</td>
+ <td colspan='2'>
+ <select name='ICMP_TYPES' style='min-width:230px;'>
+END
+ &General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
+ print"<option value='All ICMP-Types'>$Lang::tr{'fwdfw all icmp'}</option>";
+ foreach my $key (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) }keys %icmptypes){
+ if($fwdfwsettings{'ICMP_TYPES'} eq "$icmptypes{$key}[0]"){
+ print"<option selected>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
+ }else{
+ print"<option>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
+ }
+ }
+
+ print <<END;
+ </select>
+ </td>
+ </tr>
+ </table>
+ </div>
+END
+
+ $fwdfwsettings{'SRC_PORT'} =~ s/\|/,/g;
+ $fwdfwsettings{'TGT_PORT'} =~ s/\|/,/g;
+ $fwdfwsettings{'dnatport'} =~ tr/|/,/;
+
+ # The dnatport may be empty, if it matches TGT_PORT
+ if ($fwdfwsettings{'dnatport'} eq $fwdfwsettings{'TGT_PORT'}) {
+ $fwdfwsettings{'dnatport'} = "";
+ }
+
+ print <<END;
+
+ <div id="PROTOCOL_PORTS">
+ <table border="0">
+ <tr>
+ <!-- #SOURCEPORT -->
+ <td>
+ $Lang::tr{'fwdfw use srcport'}
+ </td>
+ <td>
+ <input type='text' name='SRC_PORT' value='$fwdfwsettings{'SRC_PORT'}' maxlength='20' size='18'>
+ </td>
+ <td width='10%'>
+ </td>
+
+ <!-- #TARGETPORT -->
+ <td>
+ $Lang::tr{'fwdfw use srv'}
+ </td>
+
+ <td>
+ <input type='text' name='TGT_PORT' value='$fwdfwsettings{'TGT_PORT'}' maxlength='20' size='18'>
+ </td>
+ </tr>
+ <tr class="NAT">
+ <td colspan='3'></td>
+ <td>$Lang::tr{'fwdfw external port nat'}:</td>
+ <td>
+ <input type='text' name='dnatport' value=\"$fwdfwsettings{'dnatport'}\" maxlength='20' size='18'>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <div id="PROTOCOL_TEMPLATE">
+ <table border="0">
+ <tr>
+ <td>
+ <input type='radio' name='grp3' id='cust_srv' value='cust_srv' checked>
+ $Lang::tr{'fwhost cust service'}
+ </td>
+ <td>
+ <select name='cust_srv' style='min-width: 230px;'>
+END
+ &General::readhasharray("$configsrv", \%customservice);
+ foreach my $key (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){
+ print"<option ";
+ print"selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservice{$key}[0]);
+ print"value='$customservice{$key}[0]'>$customservice{$key}[0]</option>";
+ }
+
+ print<<END;
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <input type='radio' name='grp3' id='cust_srvgrp' value='cust_srvgrp' $checked{'grp3'}{'cust_srvgrp'}>
+ $Lang::tr{'fwhost cust srvgrp'}
+ </td>
+ <td>
+ <select name='cust_srvgrp' style='min-width:230px;'>
+END
+
+ &General::readhasharray("$configsrvgrp", \%customservicegrp);
+ my $helper;
+ foreach my $key (sort { ncmp($customservicegrp{$a}[0],$customservicegrp{$b}[0]) } keys %customservicegrp){
+ if ($helper ne $customservicegrp{$key}[0]){
+ print"<option ";
+ print"selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservicegrp{$key}[0]);
+ print">$customservicegrp{$key}[0]</option>";
+ }
+ $helper=$customservicegrp{$key}[0];
+ }
+ print<<END;
+ </select>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <br><br><br>
+END
+
+ &Header::closebox;
+
+ $checked{"RULE_ACTION"} = ();
+ foreach ("ACCEPT", "DROP", "REJECT") {
+ $checked{"RULE_ACTION"}{$_} = "";
+ }
+
+ if($fwdfwsettings{'updatefwrule'} eq 'on') {
+ $checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}} = "checked";
+ } elsif ($fwdfwsettings{'POLICY'} eq 'MODE1') {
+ $checked{"RULE_ACTION"}{"ACCEPT"} = "checked";
+ } elsif ($fwdfwsettings{'POLICY'} eq 'MODE2') {
+ $checked{"RULE_ACTION"}{"DROP"} = "checked";
+ }
+
+ print <<END;
+ <hr><br>
+
+ <center>
+ <table width="80%" border="0">
+ <tr>
+ <td width="33%" align="center" bgcolor="$color{'color17'}">
+ <br>
+ </td>
+ <td width="33%" align="center" bgcolor="$color{'color25'}">
+ <br>
+ </td>
+ <td width="33%" align="center" bgcolor="$color{'color16'}">
+ <br>
+ </td>
+ </tr>
+ <tr>
+ <td width="33%" align="center">
+ <label>
+ <input type="radio" name="RULE_ACTION" value="ACCEPT" $checked{"RULE_ACTION"}{"ACCEPT"}>
+ <strong>$Lang::tr{'fwdfw ACCEPT'}</strong>
+ </label>
+ </td>
+ <td width="33%" align="center">
+ <label>
+ <input type="radio" name="RULE_ACTION" value="DROP" $checked{"RULE_ACTION"}{"DROP"}>
+ <strong>$Lang::tr{'fwdfw DROP'}</strong>
+ </label>
+ </td>
+ <td width="33%" align="center">
+ <label>
+ <input type="radio" name="RULE_ACTION" value="REJECT" $checked{"RULE_ACTION"}{"REJECT"}>
+ <strong>$Lang::tr{'fwdfw REJECT'}</strong>
+ </label>
+ </td>
+ </tr>
+ </table>
+ </center>
+
+ <br>
+END
+
+ #---Activate/logging/remark-------------------------------------
+ &Header::openbox('100%', 'left', $Lang::tr{'fwdfw additional'});
+ print<<END;
+ <table width='100%' border='0'>
+END
+ print"<tr><td width='12%'>$Lang::tr{'remark'}:</td><td width='88%' align='left'><input type='text' name='ruleremark' maxlength='255' value='$fwdfwsettings{'ruleremark'}' style='width:99%;'></td></tr>";
+ if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} eq 'on'){
+ print "<tr><td width='12%'>$Lang::tr{'fwdfw rulepos'}:</td><td><select name='rulepos' >";
+ for (my $count =1; $count <= $sum; $count++){
+ print"<option value='$count' ";
+ print"selected='selected'" if($fwdfwsettings{'oldrulenumber'} eq $count);
+ print">$count</option>";
+ }
+ print"</select></td></tr>";
+ }else{
+ print "<tr><td width='12%'>$Lang::tr{'fwdfw rulepos'}:</td><td><input type='text' name='rulepos' size='2'></td></tr>";
+ }
+
+ print<<END;
+ </table>
+ <table width='100%'>
+ <tr>
+END
+
+ if ($fwdfwsettings{'updatefwrule'} eq 'on') {
+ print <<END;
+ <td>
+ <input type='checkbox' name='ACTIVE' value="ON" $checked{'ACTIVE'}{'ON'}>
+ </td>
+ <td>$Lang::tr{'fwdfw rule activate'}</td>
+END
+ } else {
+ print <<END;
+ <td colspan="2">
+ <input type="hidden" name="ACTIVE" value="ON">
+ </td>
+END
+ }
+
+ print <<END;
+ </tr>
+ <tr>
+ <td>
+ <input type='checkbox' name='LOG' value='ON' $checked{'LOG'}{'ON'}>
+ </td>
+ <td>$Lang::tr{'fwdfw log rule'}</td>
+ </tr>
+ <tr>
+ <td width='1%'>
+ <input type='checkbox' name='TIME' id="USE_TIME_CONSTRAINTS" value='ON' $checked{'TIME'}{'ON'}>
+ </td>
+ <td>$Lang::tr{'fwdfw timeframe'}</td>
+ </tr>
+ <tr id="TIME_CONSTRAINTS">
+ <td colspan="2">
+ <table width="66%" border="0">
+ <tr>
+ <td width="8em"> </td>
+ <td align="center">$Lang::tr{'advproxy monday'}</td>
+ <td align="center">$Lang::tr{'advproxy tuesday'}</td>
+ <td align="center">$Lang::tr{'advproxy wednesday'}</td>
+ <td align="center">$Lang::tr{'advproxy thursday'}</td>
+ <td align="center">$Lang::tr{'advproxy friday'}</td>
+ <td align="center">$Lang::tr{'advproxy saturday'}</td>
+ <td align="center">$Lang::tr{'advproxy sunday'}</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td width="8em"> </td>
+ <td align="center"><input type='checkbox' name='TIME_MON' value='on' $checked{'TIME_MON'}{'on'} ></td>
+ <td align="center"><input type='checkbox' name='TIME_TUE' value='on' $checked{'TIME_TUE'}{'on'} ></td>
+ <td align="center"><input type='checkbox' name='TIME_WED' value='on' $checked{'TIME_WED'}{'on'} ></td>
+ <td align="center"><input type='checkbox' name='TIME_THU' value='on' $checked{'TIME_THU'}{'on'} ></td>
+ <td align="center"><input type='checkbox' name='TIME_FRI' value='on' $checked{'TIME_FRI'}{'on'} ></td>
+ <td align="center"><input type='checkbox' name='TIME_SAT' value='on' $checked{'TIME_SAT'}{'on'} ></td>
+ <td align="center"><input type='checkbox' name='TIME_SUN' value='on' $checked{'TIME_SUN'}{'on'} ></td>
+ <td>
+ <select name='TIME_FROM'>
+END
+ for (my $i=0;$i<=23;$i++) {
+ $i = sprintf("%02s",$i);
+ for (my $j=0;$j<=45;$j+=15) {
+ $j = sprintf("%02s",$j);
+ my $time = $i.":".$j;
+ print "<option $selected{'TIME_FROM'}{$time}>$i:$j</option>\n";
+ }
+ }
+ print<<END;
+ </select> ‐
+ <select name='TIME_TO'>
+END
+ for (my $i=0;$i<=23;$i++) {
+ $i = sprintf("%02s",$i);
+ for (my $j=0;$j<=45;$j+=15) {
+ $j = sprintf("%02s",$j);
+ my $time = $i.":".$j;
+ print "<option $selected{'TIME_TO'}{$time}>$i:$j</option>\n";
+ }
+ }
+ print<<END;
+ </select>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <br><hr>
+END
+
+ #---ACTION------------------------------------------------------
+ if($fwdfwsettings{'updatefwrule'} ne 'on'){
+ print<<END;
+ <table border='0' width='100%'>
+ <tr><td align='right'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' />
+ <input type='hidden' name='config' value='$config' >
+ <input type='hidden' name='ACTION' value='saverule' ></form>
+ <form method='post' style='display:inline;'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='reset'></form></td></tr>
+ </table>
+ <br>
+END
+ }else{
+ print<<END;
+ <table border='0' width='100%'>
+ <tr><td align='right'><input type='submit' value='$Lang::tr{'fwdfw change'}' style='min-width:100px;' /><input type='hidden' name='updatefwrule' value='$fwdfwsettings{'updatefwrule'}'><input type='hidden' name='key' value='$fwdfwsettings{'key'}'>
+ <input type='hidden' name='oldgrp1a' value='$fwdfwsettings{'oldgrp1a'}' />
+ <input type='hidden' name='oldgrp1b' value='$fwdfwsettings{'oldgrp1b'}' />
+ <input type='hidden' name='oldgrp2a' value='$fwdfwsettings{'oldgrp2a'}' />
+ <input type='hidden' name='oldgrp2b' value='$fwdfwsettings{'oldgrp2b'}' />
+ <input type='hidden' name='oldgrp3a' value='$fwdfwsettings{'oldgrp3a'}' />
+ <input type='hidden' name='oldgrp3b' value='$fwdfwsettings{'oldgrp3b'}' />
+ <input type='hidden' name='oldusesrv' value='$fwdfwsettings{'oldusesrv'}' />
+ <input type='hidden' name='oldrulenumber' value='$fwdfwsettings{'oldrulenumber'}' />
+ <input type='hidden' name='rulenumber' value='$fwdfwsettings{'rulepos'}' />
+ <input type='hidden' name='oldruleremark' value='$fwdfwsettings{'oldruleremark'}' />
+ <input type='hidden' name='oldorange' value='$fwdfwsettings{'oldorange'}' />
+ <input type='hidden' name='oldnat' value='$fwdfwsettings{'oldnat'}' />
+ <input type='hidden' name='oldruletype' value='$fwdfwsettings{'oldruletype'}' />
+ <input type='hidden' name='ACTION' value='saverule' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value'reset'></td></td>
+ </table></form>
+END
+ }
+ &Header::closebox();
+}
+sub pos_up
+{
+ my %uphash=();
+ my %tmp=();
+ &General::readhasharray($fwdfwsettings{'config'}, \%uphash);
+ foreach my $key (sort keys %uphash){
+ if ($key eq $fwdfwsettings{'key'}) {
+ my $last = $key -1;
+ if (exists $uphash{$last}){
+ #save rule last
+ foreach my $y (0 .. $#{$uphash{$last}}) {
+ $tmp{0}[$y] = $uphash{$last}[$y];
+ }
+ #copy active rule to last
+ foreach my $i (0 .. $#{$uphash{$last}}) {
+ $uphash{$last}[$i] = $uphash{$key}[$i];
+ }
+ #copy saved rule to actual position
+ foreach my $x (0 .. $#{$tmp{0}}) {
+ $uphash{$key}[$x] = $tmp{0}[$x];
+ }
+ }
+ }
+ }
+ &General::writehasharray($fwdfwsettings{'config'}, \%uphash);
+ &General::firewall_config_changed();
+}
+sub pos_down
+{
+ my %downhash=();
+ my %tmp=();
+ &General::readhasharray($fwdfwsettings{'config'}, \%downhash);
+ foreach my $key (sort keys %downhash){
+ if ($key eq $fwdfwsettings{'key'}) {
+ my $next = $key + 1;
+ if (exists $downhash{$next}){
+ #save rule next
+ foreach my $y (0 .. $#{$downhash{$next}}) {
+ $tmp{0}[$y] = $downhash{$next}[$y];
+ }
+ #copy active rule to next
+ foreach my $i (0 .. $#{$downhash{$next}}) {
+ $downhash{$next}[$i] = $downhash{$key}[$i];
+ }
+ #copy saved rule to actual position
+ foreach my $x (0 .. $#{$tmp{0}}) {
+ $downhash{$key}[$x] = $tmp{0}[$x];
+ }
+ }
+ }
+ }
+ &General::writehasharray($fwdfwsettings{'config'}, \%downhash);
+ &General::firewall_config_changed();
+}
+sub saverule
+{
+ my $hash=shift;
+ my $config=shift;
+ &General::readhasharray("$config", $hash);
+ if (!$errormessage){
+ ################################################################
+ #check if we change an INPUT rule to a OUTGOING
+ if($fwdfwsettings{'oldruletype'} eq 'INPUTFW' && $fwdfwsettings{'chain'} eq 'OUTGOINGFW' ){
+ &changerule($configinput);
+ #print"1";
+ }
+ #check if we change an INPUT rule to a FORWARD
+ elsif($fwdfwsettings{'oldruletype'} eq 'INPUTFW' && $fwdfwsettings{'chain'} eq 'FORWARDFW' ){
+ &changerule($configinput);
+ #print"2";
+ }
+ ################################################################
+ #check if we change an OUTGOING rule to an INPUT
+ elsif($fwdfwsettings{'oldruletype'} eq 'OUTGOINGFW' && $fwdfwsettings{'chain'} eq 'INPUTFW' ){
+ &changerule($configoutgoing);
+ #print"3";
+ }
+ #check if we change an OUTGOING rule to a FORWARD
+ elsif($fwdfwsettings{'oldruletype'} eq 'OUTGOINGFW' && $fwdfwsettings{'chain'} eq 'FORWARDFW' ){
+ &changerule($configoutgoing);
+ #print"4";
+ }
+ ################################################################
+ #check if we change a FORWARD rule to an INPUT
+ elsif($fwdfwsettings{'oldruletype'} eq 'FORWARDFW' && $fwdfwsettings{'chain'} eq 'INPUTFW'){
+ &changerule($configfwdfw);
+ #print"5";
+ }
+ #check if we change a FORWARD rule to an OUTGOING
+ elsif($fwdfwsettings{'oldruletype'} eq 'FORWARDFW' && $fwdfwsettings{'chain'} eq 'OUTGOINGFW'){
+ &changerule($configfwdfw);
+ #print"6";
+ }
+ if ($fwdfwsettings{'updatefwrule'} ne 'on'){
+ my $key = &General::findhasharraykey ($hash);
+ $$hash{$key}[0] = $fwdfwsettings{'RULE_ACTION'};
+ $$hash{$key}[1] = $fwdfwsettings{'chain'};
+ $$hash{$key}[2] = $fwdfwsettings{'ACTIVE'};
+ $$hash{$key}[3] = $fwdfwsettings{'grp1'};
+ $$hash{$key}[4] = $fwdfwsettings{$fwdfwsettings{'grp1'}};
+ $$hash{$key}[5] = $fwdfwsettings{'grp2'};
+ $$hash{$key}[6] = $fwdfwsettings{$fwdfwsettings{'grp2'}};
+ $$hash{$key}[7] = $fwdfwsettings{'USE_SRC_PORT'};
+ $$hash{$key}[8] = $fwdfwsettings{'PROT'};
+ $$hash{$key}[9] = $fwdfwsettings{'ICMP_TYPES'};
+ $$hash{$key}[10] = $fwdfwsettings{'SRC_PORT'};
+ $$hash{$key}[11] = $fwdfwsettings{'USESRV'};
+ $$hash{$key}[12] = $fwdfwsettings{'TGT_PROT'};
+ $$hash{$key}[13] = $fwdfwsettings{'ICMP_TGT'};
+ $$hash{$key}[14] = $fwdfwsettings{'grp3'};
+ $$hash{$key}[15] = $fwdfwsettings{$fwdfwsettings{'grp3'}};
+ $$hash{$key}[16] = $fwdfwsettings{'ruleremark'};
+ $$hash{$key}[17] = $fwdfwsettings{'LOG'};
+ $$hash{$key}[18] = $fwdfwsettings{'TIME'};
+ $$hash{$key}[19] = $fwdfwsettings{'TIME_MON'};
+ $$hash{$key}[20] = $fwdfwsettings{'TIME_TUE'};
+ $$hash{$key}[21] = $fwdfwsettings{'TIME_WED'};
+ $$hash{$key}[22] = $fwdfwsettings{'TIME_THU'};
+ $$hash{$key}[23] = $fwdfwsettings{'TIME_FRI'};
+ $$hash{$key}[24] = $fwdfwsettings{'TIME_SAT'};
+ $$hash{$key}[25] = $fwdfwsettings{'TIME_SUN'};
+ $$hash{$key}[26] = $fwdfwsettings{'TIME_FROM'};
+ $$hash{$key}[27] = $fwdfwsettings{'TIME_TO'};
+ $$hash{$key}[28] = $fwdfwsettings{'USE_NAT'};
+ $$hash{$key}[29] = $fwdfwsettings{$fwdfwsettings{'nat'}};
+ $$hash{$key}[30] = $fwdfwsettings{'dnatport'};
+ $$hash{$key}[31] = $fwdfwsettings{'nat'};
+ &General::writehasharray("$config", $hash);
+ }else{
+ foreach my $key (sort {$a <=> $b} keys %$hash){
+ if($key eq $fwdfwsettings{'key'}){
+ $$hash{$key}[0] = $fwdfwsettings{'RULE_ACTION'};
+ $$hash{$key}[1] = $fwdfwsettings{'chain'};
+ $$hash{$key}[2] = $fwdfwsettings{'ACTIVE'};
+ $$hash{$key}[3] = $fwdfwsettings{'grp1'};
+ $$hash{$key}[4] = $fwdfwsettings{$fwdfwsettings{'grp1'}};
+ $$hash{$key}[5] = $fwdfwsettings{'grp2'};
+ $$hash{$key}[6] = $fwdfwsettings{$fwdfwsettings{'grp2'}};
+ $$hash{$key}[7] = $fwdfwsettings{'USE_SRC_PORT'};
+ $$hash{$key}[8] = $fwdfwsettings{'PROT'};
+ $$hash{$key}[9] = $fwdfwsettings{'ICMP_TYPES'};
+ $$hash{$key}[10] = $fwdfwsettings{'SRC_PORT'};
+ $$hash{$key}[11] = $fwdfwsettings{'USESRV'};
+ $$hash{$key}[12] = $fwdfwsettings{'TGT_PROT'};
+ $$hash{$key}[13] = $fwdfwsettings{'ICMP_TGT'};
+ $$hash{$key}[14] = $fwdfwsettings{'grp3'};
+ $$hash{$key}[15] = $fwdfwsettings{$fwdfwsettings{'grp3'}};
+ $$hash{$key}[16] = $fwdfwsettings{'ruleremark'};
+ $$hash{$key}[17] = $fwdfwsettings{'LOG'};
+ $$hash{$key}[18] = $fwdfwsettings{'TIME'};
+ $$hash{$key}[19] = $fwdfwsettings{'TIME_MON'};
+ $$hash{$key}[20] = $fwdfwsettings{'TIME_TUE'};
+ $$hash{$key}[21] = $fwdfwsettings{'TIME_WED'};
+ $$hash{$key}[22] = $fwdfwsettings{'TIME_THU'};
+ $$hash{$key}[23] = $fwdfwsettings{'TIME_FRI'};
+ $$hash{$key}[24] = $fwdfwsettings{'TIME_SAT'};
+ $$hash{$key}[25] = $fwdfwsettings{'TIME_SUN'};
+ $$hash{$key}[26] = $fwdfwsettings{'TIME_FROM'};
+ $$hash{$key}[27] = $fwdfwsettings{'TIME_TO'};
+ $$hash{$key}[28] = $fwdfwsettings{'USE_NAT'};
+ $$hash{$key}[29] = $fwdfwsettings{$fwdfwsettings{'nat'}};
+ $$hash{$key}[30] = $fwdfwsettings{'dnatport'};
+ $$hash{$key}[31] = $fwdfwsettings{'nat'};
+ last;
+ }
+ }
+ }
+ &General::writehasharray("$config", $hash);
+ if($fwdfwsettings{'oldrulenumber'} > $fwdfwsettings{'rulepos'}){
+ my %tmp=();
+ my $val=$fwdfwsettings{'oldrulenumber'}-$fwdfwsettings{'rulepos'};
+ for (my $z=0;$z<$val;$z++){
+ foreach my $key (sort {$a <=> $b} keys %$hash){
+ if ($key eq $fwdfwsettings{'oldrulenumber'}) {
+ my $last = $key -1;
+ if (exists $$hash{$last}){
+ #save rule last
+ foreach my $y (0 .. $#{$$hash{$last}}) {
+ $tmp{0}[$y] = $$hash{$last}[$y];
+ }
+ #copy active rule to last
+ foreach my $i (0 .. $#{$$hash{$last}}) {
+ $$hash{$last}[$i] = $$hash{$key}[$i];
+ }
+ #copy saved rule to actual position
+ foreach my $x (0 .. $#{$tmp{0}}) {
+ $$hash{$key}[$x] = $tmp{0}[$x];
+ }
+ }
+ }
+ }
+ $fwdfwsettings{'oldrulenumber'}--;
+ }
+ &General::writehasharray("$config", $hash);
+ &General::firewall_config_changed();
+ }elsif($fwdfwsettings{'rulepos'} > $fwdfwsettings{'oldrulenumber'}){
+ my %tmp=();
+ my $val=$fwdfwsettings{'rulepos'}-$fwdfwsettings{'oldrulenumber'};
+ for (my $z=0;$z<$val;$z++){
+ foreach my $key (sort {$a <=> $b} keys %$hash){
+ if ($key eq $fwdfwsettings{'oldrulenumber'}) {
+ my $next = $key + 1;
+ if (exists $$hash{$next}){
+ #save rule next
+ foreach my $y (0 .. $#{$$hash{$next}}) {
+ $tmp{0}[$y] = $$hash{$next}[$y];
+ }
+ #copy active rule to next
+ foreach my $i (0 .. $#{$$hash{$next}}) {
+ $$hash{$next}[$i] = $$hash{$key}[$i];
+ }
+ #copy saved rule to actual position
+ foreach my $x (0 .. $#{$tmp{0}}) {
+ $$hash{$key}[$x] = $tmp{0}[$x];
+ }
+ }
+ }
+ }
+ $fwdfwsettings{'oldrulenumber'}++;
+ }
+ &General::writehasharray("$config", $hash);
+ &General::firewall_config_changed();
+ }
+ }
+}
+sub validremark
+{
+ # Checks a hostname against RFC1035
+ my $remark = $_[0];
+
+ # Each part should be at least two characters in length
+ # but no more than 63 characters
+ if (length ($remark) < 1 || length ($remark) > 255) {
+ return 0;}
+ # Only valid characters are a-z, A-Z, 0-9 and -
+ if ($remark !~ /^[a-zäöüA-ZÖÄÜ0-9-.:;\|_()\/\s]*$/) {
+ return 0;}
+ # First character can only be a letter or a digit
+ if (substr ($remark, 0, 1) !~ /^[a-zäöüA-ZÖÄÜ0-9]*$/) {
+ return 0;}
+ # Last character can only be a letter or a digit
+ if (substr ($remark, -1, 1) !~ /^[a-zöäüA-ZÖÄÜ0-9.:;_)]*$/) {
+ return 0;}
+ return 1;
+}
+sub viewtablerule
+{
+ &General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
+ &viewtablenew(\%configfwdfw,$configfwdfw,"","Forward" );
+ &viewtablenew(\%configinputfw,$configinput,"",$Lang::tr{'fwdfw xt access'} );
+ &viewtablenew(\%configoutgoingfw,$configoutgoing,"","Outgoing" );
+}
+sub viewtablenew
+{
+ my $hash=shift;
+ my $config=shift;
+ my $title=shift;
+ my $title1=shift;
+ my $go='';
+ &General::get_aliases(\%aliases);
+ &General::readhasharray("$confighost", \%customhost);
+ &General::readhasharray("$config", $hash);
+ &General::readhasharray("$configccdnet", \%ccdnet);
+ &General::readhasharray("$configccdhost", \%ccdhost);
+ if( ! -z $config){
+ &Header::openbox('100%', 'left',$title);
+ my $count=0;
+ my ($gif,$log);
+ my $ruletype;
+ my $rulecolor;
+ my $tooltip;
+ my @tmpsrc=();
+ my $coloryellow='';
+ print <<END;
+ <b>$title1</b>
+ <br>
+
+ <table width='100%' cellspacing='0' border='0'>
+ <tr>
+ <th align='right' width='3%'>
+ #
+ </th>
+ <th width='2%'></th>
+ <th align='center'>
+ <b>$Lang::tr{'protocol'}</b>
+ </th>
+ <th align='center' width='30%'>
+ <b>$Lang::tr{'fwdfw source'}</b>
+ </th>
+ <th align='center'>
+ Log <!-- XXX UNTRANSLATED STRING -->
+ </th>
+ <th align='center' width='30%'>
+ <b>$Lang::tr{'fwdfw target'}</b>
+ </th>
+ <th align='center' colspan='6' width='18%'>
+ <b>$Lang::tr{'fwdfw action'}</b>
+ </th>
+ </tr>
+END
+
+ foreach my $key (sort {$a <=> $b} keys %$hash){
+ $tdcolor='';
+ @tmpsrc=();
+ #check if vpn hosts/nets have been deleted
+ if($$hash{$key}[3] =~ /ipsec/i || $$hash{$key}[3] =~ /ovpn/i){
+ push (@tmpsrc,$$hash{$key}[4]);
+ }
+ if($$hash{$key}[5] =~ /ipsec/i || $$hash{$key}[5] =~ /ovpn/i){
+ push (@tmpsrc,$$hash{$key}[6]);
+ }
+ foreach my $host (@tmpsrc){
+ if($$hash{$key}[3] eq 'ipsec_net_src' || $$hash{$key}[5] eq 'ipsec_net_tgt'){
+ if(&fwlib::get_ipsec_net_ip($host,11) eq ''){
+ $coloryellow='on';
+ &disable_rule($key);
+ $$hash{$key}[2]='';
+ }
+ }elsif($$hash{$key}[3] eq 'ovpn_net_src' || $$hash{$key}[5] eq 'ovpn_net_tgt'){
+ if(&fwlib::get_ovpn_net_ip($host,1) eq ''){
+ $coloryellow='on';
+ &disable_rule($key);
+ $$hash{$key}[2]='';
+ }
+ }elsif($$hash{$key}[3] eq 'ovpn_n2n_src' || $$hash{$key}[5] eq 'ovpn_n2n_tgt'){
+ if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){
+ $coloryellow='on';
+ &disable_rule($key);
+ $$hash{$key}[2]='';
+ }
+ }elsif($$hash{$key}[3] eq 'ovpn_host_src' || $$hash{$key}[5] eq 'ovpn_host_tgt'){
+ if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
+ $coloryellow='on';
+ &disable_rule($key);
+ $$hash{$key}[2]='';
+ }
+ }
+ }
+ $$hash{'ACTIVE'}=$$hash{$key}[2];
+ $count++;
+ if($coloryellow eq 'on'){
+ print"<tr bgcolor='$color{'color14'}' >";
+ $coloryellow='';
+ }elsif($coloryellow eq ''){
+ if ($count % 2){
+ $color="$color{'color22'}";
+ }
+ else{
+ $color="$color{'color20'}";
+ }
+ }
+ print<<END;
+ <tr bgcolor='$color'>
+ <td align='right' width='3%'>
+ <b>$key </b>
+ </td>
+END
+
+ #RULETYPE (A,R,D)
+ if ($$hash{$key}[0] eq 'ACCEPT'){
+ $ruletype='A';
+ $tooltip='ACCEPT';
+ $rulecolor=$color{'color17'};
+ }elsif($$hash{$key}[0] eq 'DROP'){
+ $ruletype='D';
+ $tooltip='DROP';
+ $rulecolor=$color{'color25'};
+ }elsif($$hash{$key}[0] eq 'REJECT'){
+ $ruletype='R';
+ $tooltip='REJECT';
+ $rulecolor=$color{'color16'};
+ }
+
+ print <<END;
+ <td bgcolor='$rulecolor' align='center' width='2%'>
+ <span title='$tooltip'> </span>
+ </td>
+END
+
+ #Get Protocol
+ my $prot;
+ if ($$hash{$key}[8]){
+ push (@protocols,$$hash{$key}[8]);
+ }elsif($$hash{$key}[14] eq 'cust_srv'){
+ &get_serviceports("service",$$hash{$key}[15]);
+ }elsif($$hash{$key}[14] eq 'cust_srvgrp'){
+ &get_serviceports("group",$$hash{$key}[15]);
+ }else{
+ push (@protocols,$Lang::tr{'all'});
+ }
+
+ my $protz=join(",",@protocols);
+ if($protz eq 'ICMP' && $$hash{$key}[9] ne 'All ICMP-Types' && $$hash{$key}[14] ne 'cust_srvgrp'){
+ &General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
+ foreach my $keyicmp (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) }keys %icmptypes){
+ if($$hash{$key}[9] eq "$icmptypes{$keyicmp}[0]"){
+ print "<td align='center'><span title='$icmptypes{$keyicmp}[0]'><b>$protz ($icmptypes{$keyicmp}[1])</b></span></td>";
+ last;
+ }
+ }
+ }else{
+ print"<td align='center'>$protz</td>";
+ }
+ @protocols=();
+ #SOURCE
+ my $ipfireiface;
+ &getcolor($$hash{$key}[3],$$hash{$key}[4],\%customhost);
+ print"<td align='center' width='160' $tdcolor>";
+ if ($$hash{$key}[3] eq 'ipfire_src'){
+ $ipfireiface='Interface ';
+ }
+ if ($$hash{$key}[3] eq 'std_net_src'){
+ print &get_name($$hash{$key}[4]);
+ }elsif ($$hash{$key}[3] eq 'src_addr'){
+ my ($split1,$split2) = split("/",$$hash{$key}[4]);
+ if ($split2 eq '32'){
+ print $split1;
+ }else{
+ print $$hash{$key}[4];
+ }
+ }elsif ($$hash{$key}[4] eq 'RED1'){
+ print "$ipfireiface $Lang::tr{'fwdfw red'}";
+ }else{
+ print "$$hash{$key}[4]";
+ }
+ $tdcolor='';
+ #SOURCEPORT
+ &getsrcport(\%$hash,$key);
+ #Is this a SNAT rule?
+ if ($$hash{$key}[31] eq 'snat' && $$hash{$key}[28] eq 'ON'){
+ my $net=&get_name($$hash{$key}[29]);
+ if ( ! $net){ $net=$$hash{$key}[29];}
+ print"<br>->$net";
+ if ($$hash{$key}[30] ne ''){
+ print": $$hash{$key}[30]";
+ }
+ }
+ if ($$hash{$key}[17] eq 'ON'){
+ $log="/images/on.gif";
+ }else{
+ $log="/images/off.gif";
+ }
+ #LOGGING
+ print<<END;
+ </td>
+ <td align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='$log' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw togglelog'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;'/>
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'fwdfw togglelog'}' />
+ </form>
+ </td>
+END
+ #TARGET
+ &getcolor($$hash{$key}[5],$$hash{$key}[6],\%customhost);
+ print<<END;
+ <td align='center' $tdcolor>
+END
+ #Is this a DNAT rule?
+ if ($$hash{$key}[31] eq 'dnat' && $$hash{$key}[28] eq 'ON'){
+ print "Firewall ($$hash{$key}[29])";
+ if($$hash{$key}[30] ne ''){
+ $$hash{$key}[30]=~ tr/|/,/;
+ print": $$hash{$key}[30]";
+ }
+ print"<br>->";
+ }
+ if ($$hash{$key}[5] eq 'ipfire'){
+ $ipfireiface='Interface';
+ }
+ if ($$hash{$key}[5] eq 'std_net_tgt' || $$hash{$key}[5] eq 'ipfire' || $$hash{$key}[6] eq 'RED1' || $$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE' ){
+ if ($$hash{$key}[6] eq 'RED1'){
+ print "$ipfireiface $Lang::tr{'red1'}";
+ }elsif ($$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE'|| $$hash{$key}[6] eq 'ALL')
+ {
+ print "$ipfireiface ".&get_name($$hash{$key}[6]);
+ }else{
+ print $$hash{$key}[6];
+ }
+ }elsif ($$hash{$key}[5] eq 'tgt_addr'){
+ my ($split1,$split2) = split("/",$$hash{$key}[6]);
+ if ($split2 eq '32'){
+ print $split1;
+ }else{
+ print $$hash{$key}[6];
+ }
+ }else{
+ print "$$hash{$key}[6]";
+ }
+ $tdcolor='';
+ #TARGETPORT
+ &gettgtport(\%$hash,$key);
+ print"</td>";
+ #RULE ACTIVE
+ if($$hash{$key}[2] eq 'ON'){
+ $gif="/images/on.gif"
+
+ }else{
+ $gif="/images/off.gif"
+ }
+ print<<END;
+ <td width='3%' align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'fwdfw toggle'}' />
+ </form>
+ </td>
+ <td width='3%' align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'fwdfw edit'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='editrule' />
+ </form>
+ </td>
+ <td width='3%' align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='/images/addblue.gif' alt='$Lang::tr{'fwdfw copy'}' title='$Lang::tr{'fwdfw copy'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='copyrule' />
+ </form>
+ </td>
+ <td width='3%' align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'fwdfw delete'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='deleterule' />
+ </form>
+ </td>
+END
+ if (exists $$hash{$key-1}){
+ print<<END;
+ <td width='3%' align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='/images/up.gif' alt='$Lang::tr{'fwdfw moveup'}' title='$Lang::tr{'fwdfw moveup'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='moveup' />
+ </form>
+ </td>
+END
+ }else{
+ print"<td width='3%'></td>";
+ }
+
+ if (exists $$hash{$key+1}){
+ print<<END;
+ <td width='3%' align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='/images/down.gif' alt='$Lang::tr{'fwdfw movedown'}' title='$Lang::tr{'fwdfw movedown'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='movedown' />
+ </form>
+ </td>
+ </tr>
+END
+ }else{
+ print"<td width='3%'></td></tr>";
+ }
+ #REMARK
+ if ($optionsfw{'SHOWREMARK'} eq 'on' && $$hash{$key}[16] ne ''){
+ print <<END;
+ <tr bgcolor='$color'>
+ <td> </td>
+ <td bgcolor='$rulecolor'></td>
+ <td colspan='10'>
+ <em>$$hash{$key}[16]</em>
+ </td>
+ </tr>
+END
+ }
+
+ if ($$hash{$key}[18] eq 'ON'){
+ #TIMEFRAME
+ if ($$hash{$key}[18] eq 'ON'){
+ my @days=();
+ if($$hash{$key}[19] ne ''){push (@days,$Lang::tr{'fwdfw wd_mon'});}
+ if($$hash{$key}[20] ne ''){push (@days,$Lang::tr{'fwdfw wd_tue'});}
+ if($$hash{$key}[21] ne ''){push (@days,$Lang::tr{'fwdfw wd_wed'});}
+ if($$hash{$key}[22] ne ''){push (@days,$Lang::tr{'fwdfw wd_thu'});}
+ if($$hash{$key}[23] ne ''){push (@days,$Lang::tr{'fwdfw wd_fri'});}
+ if($$hash{$key}[24] ne ''){push (@days,$Lang::tr{'fwdfw wd_sat'});}
+ if($$hash{$key}[25] ne ''){push (@days,$Lang::tr{'fwdfw wd_sun'});}
+ my $weekdays=join(",",@days);
+ if (@days){
+ print"<tr bgcolor='$color'>";
+ print"<td> </td><td bgcolor='$rulecolor'></td><td align='left' colspan='10'> $weekdays $$hash{$key}[26] - $$hash{$key}[27]</td></tr>";
+ }
+ }
+ }
+ print"<tr bgcolor='FFFFFF'><td colspan='13' height='1'></td></tr>";
+ }
+ print"</table>";
+ #SHOW FINAL RULE
+ print "<table width='100%'rules='cols' border='1'>";
+ my $col;
+ if ($config eq '/var/ipfire/forward/config'){
+ my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
+ if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
+ $col="bgcolor='darkred'";
+ }else{
+ $col="bgcolor='green'";
+ }
+ &show_defaultrules($col,$pol);
+ }elsif ($config eq '/var/ipfire/forward/outgoing'){
+ if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
+ $col="bgcolor='darkred'";
+ print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol block'}</font></td></tr>";
+ }else{
+ $col="bgcolor='green'";
+ print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
+ }
+ }else{
+ print"<tr><td bgcolor='darkred' width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td bgcolor='darkred' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
+ }
+ print"</table>";
+ print "<hr>";
+ print "<br><br>";
+ &Header::closebox();
+ }else{
+ if ($optionsfw{'SHOWTABLES'} eq 'on'){
+ print "<b>$title1</b><br>";
+ print"<table width='100%' border='0' rules='none'><tr><td height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td></tr></table>";
+ my $col;
+ if ($config eq '/var/ipfire/forward/config'){
+ my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
+ if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
+ $col="bgcolor='darkred'";
+ }else{
+ $col="bgcolor='green'";
+ }
+ &show_defaultrules($col,$pol);
+ }elsif ($config eq '/var/ipfire/forward/outgoing'){
+ print "<table width='100%' rules='cols' border='1'>";
+ my $pol='fwdfw '.$fwdfwsettings{'POLICY1'};
+ if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
+ $col="bgcolor='darkred'";
+ print"<tr><td $col align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
+ }else{
+ $col="bgcolor='green'";
+ print"<tr><td $col align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
+ }
+ }else{
+ print "<table width='100%' rules='cols' border='1'>";
+ print"<tr><td bgcolor='darkred' align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td align='center' bgcolor='darkred'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
+ }
+ print"</table><br><br>";
+ }
+ }
+}
+&Header::closebigbox();
+&Header::closepage();
+
+sub show_defaultrules
+{
+ my $col=shift;
+ my $pol=shift;
+ #STANDARD RULES (From WIKI)
+ print"</table>";
+ if ($col eq "bgcolor='green'"){
+ print "<br><table width='100%' rules='cols' border='1' >";
+ my $blue = "<font color=$Header::colourblue> $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol block'})" if (&Header::blue_used());
+ my $orange = "<font color=$Header::colourorange> $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol block'})" if (&Header::orange_used());
+ my $blue1 = "<font color=$Header::colourblue> $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol allow'})" if (&Header::blue_used());
+ my $orange1 = "<font color=$Header::colourorange> $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol allow'})" if (&Header::orange_used());
+ print"<tr><td align='center'><font color='#000000'>$Lang::tr{'green'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td>";
+ print"<td align='center'>$orange1</td>" if (&Header::orange_used());
+ print"<td align='center'>$blue1</td>" if (&Header::blue_used());
+ print"</tr>";
+ if (&Header::orange_used()){
+ print"<tr><td align='center' width='20%'><font color='#000000'>$Lang::tr{'orange'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td><td align='center'><font color=$Header::colourgreen> $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td>";
+ print"<td align='center'>$blue</td>" if (&Header::blue_used());
+ print"</tr>";
+ }
+ if (&Header::blue_used()){
+ print"<tr><td align='center'><font color='#000000'>$Lang::tr{'blue'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td>";
+ print"<td align='center'>$orange</td>" if (&Header::orange_used());
+ print"<td align='center'><font color=$Header::colourgreen> $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td>";
+ print"</tr>";
+ }
+ print"<tr><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'} </font></td><td $col colspan='3' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
+ }elsif($col eq "bgcolor='darkred'"){
+ print "<table width='100%' rules='cols' border='1' >";
+ print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
+ }
+}
diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
deleted file mode 100755
index fbee025..0000000
--- a/html/cgi-bin/forwardfw.cgi
+++ /dev/null
@@ -1,2771 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-use strict;
-use Sort::Naturally;
-no warnings 'uninitialized';
-# enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-require "${General::swroot}/forward/bin/firewall-lib.pl";
-
-unless (-d "${General::swroot}/forward") { system("mkdir ${General::swroot}/forward"); }
-unless (-e "${General::swroot}/forward/settings") { system("touch ${General::swroot}/forward/settings"); }
-unless (-e "${General::swroot}/forward/config") { system("touch ${General::swroot}/forward/config"); }
-unless (-e "${General::swroot}/forward/input") { system("touch ${General::swroot}/forward/input"); }
-unless (-e "${General::swroot}/forward/outgoing") { system("touch ${General::swroot}/forward/outgoing"); }
-
-my %fwdfwsettings=();
-my %selected=() ;
-my %defaultNetworks=();
-my %netsettings=();
-my %customhost=();
-my %customgrp=();
-my %customnetworks=();
-my %customservice=();
-my %customservicegrp=();
-my %ccdnet=();
-my %customnetwork=();
-my %ccdhost=();
-my %configfwdfw=();
-my %configinputfw=();
-my %configoutgoingfw=();
-my %ipsecconf=();
-my %color=();
-my %mainsettings=();
-my %checked=();
-my %icmptypes=();
-my %ovpnsettings=();
-my %ipsecsettings=();
-my %aliases=();
-my %optionsfw=();
-my %ifaces=();
-
-my @PROTOCOLS = ("TCP", "UDP", "ICMP", "IGMP", "AH", "ESP", "GRE");
-
-my $color;
-my $confignet = "${General::swroot}/fwhosts/customnetworks";
-my $confighost = "${General::swroot}/fwhosts/customhosts";
-my $configgrp = "${General::swroot}/fwhosts/customgroups";
-my $configsrv = "${General::swroot}/fwhosts/customservices";
-my $configsrvgrp = "${General::swroot}/fwhosts/customservicegrp";
-my $configccdnet = "${General::swroot}/ovpn/ccd.conf";
-my $configccdhost = "${General::swroot}/ovpn/ovpnconfig";
-my $configipsec = "${General::swroot}/vpn/config";
-my $configipsecrw = "${General::swroot}/vpn/settings";
-my $configfwdfw = "${General::swroot}/forward/config";
-my $configinput = "${General::swroot}/forward/input";
-my $configoutgoing = "${General::swroot}/forward/outgoing";
-my $configovpn = "${General::swroot}/ovpn/settings";
-my $fwoptions = "${General::swroot}/optionsfw/settings";
-my $ifacesettings = "${General::swroot}/ethernet/settings";
-my $errormessage='';
-my $hint='';
-my $ipgrp="${General::swroot}/outgoing/groups";
-my $tdcolor='';
-my $checkorange='';
-my @protocols;
-&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
-&General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
-&General::readhash($fwoptions, \%optionsfw);
-&General::readhash($ifacesettings, \%ifaces);
-&General::readhash("$configovpn", \%ovpnsettings);
-&General::readhash("$configipsecrw", \%ipsecsettings);
-&General::readhasharray("$configipsec", \%ipsecconf);
-&Header::showhttpheaders();
-&Header::getcgihash(\%fwdfwsettings);
-&Header::openpage($Lang::tr{'fwdfw menu'}, 1, '');
-&Header::openbigbox('100%', 'center',$errormessage);
-#### JAVA SCRIPT ####
-print<<END;
-<script>
- var PROTOCOLS_WITH_PORTS = ["TCP", "UDP"];
-
- var update_protocol = function() {
- var protocol = \$("#protocol").val();
-
- if (protocol === undefined)
- return;
-
- // Check if a template is/should be used.
- if (protocol === "template") {
- \$("#PROTOCOL_TEMPLATE").show();
- } else {
- \$("#PROTOCOL_TEMPLATE").hide();
- }
-
- // Check if we are dealing with a protocol, that knows ports.
- if (\$.inArray(protocol, PROTOCOLS_WITH_PORTS) >= 0) {
- \$("#PROTOCOL_PORTS").show();
- } else {
- \$("#PROTOCOL_PORTS").hide();
- }
-
- // Handle ICMP.
- if (protocol === "ICMP") {
- \$("#PROTOCOL_ICMP_TYPES").show();
- } else {
- \$("#PROTOCOL_ICMP_TYPES").hide();
- }
- };
-
- \$(document).ready(function() {
- \$("#protocol").change(update_protocol);
- update_protocol();
-
- // When nat not used, hide it
- if (! \$("#USE_NAT").attr("checked")) {
- \$(".NAT").hide();
- }
-
- // Show NAT area when "use nat" checkbox is clicked
- \$("#USE_NAT").change(function() {
- \$(".NAT").toggle();
- });
-
- // Time constraints
- if(!\$("#USE_TIME_CONSTRAINTS").attr("checked")) {
- \$("#TIME_CONSTRAINTS").hide();
- }
- \$("#USE_TIME_CONSTRAINTS").change(function() {
- \$("#TIME_CONSTRAINTS").toggle();
- });
-
- // Automatically select radio buttons when corresponding
- // dropdown menu changes.
- \$("select").change(function() {
- var id = \$(this).attr("name");
-
- // When using SNAT or DNAT, check "USE NAT" Checkbox
- if (id === 'snat' || id === 'dnat') {
- \$('#USE_NAT').prop('checked', true);
- }
- \$('#' + id).prop("checked", true);
- });
- });
-</script>
-END
-
-#### ACTION #####
-
-if ($fwdfwsettings{'ACTION'} eq 'saverule')
-{
- &General::readhasharray("$configfwdfw", \%configfwdfw);
- &General::readhasharray("$configinput", \%configinputfw);
- &General::readhasharray("$configoutgoing", \%configoutgoingfw);
- #Set Variables according to the JQuery code in protocol section
- if ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP')
- {
- if ($fwdfwsettings{'SRC_PORT'} ne '')
- {
- $fwdfwsettings{'USE_SRC_PORT'} = 'ON';
- }
- if ($fwdfwsettings{'TGT_PORT'} ne '')
- {
- $fwdfwsettings{'USESRV'} = 'ON';
- $fwdfwsettings{'grp3'} = 'TGT_PORT';
- }
- }
- if ($fwdfwsettings{'PROT'} eq 'template')
- {
- $fwdfwsettings{'USESRV'} = 'ON';
- }
- $errormessage=&checksource;
- if(!$errormessage){&checktarget;}
- if(!$errormessage){&checkrule;}
- #check if manual ip (source) is orange network
- if ($fwdfwsettings{'grp1'} eq 'src_addr'){
- my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
- if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
- $checkorange='on';
- }
- }
- #check useless rules
- if( ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'ORANGE' || $checkorange eq 'on') && $fwdfwsettings{'grp2'} eq 'ipfire'){
- $errormessage.=$Lang::tr{'fwdfw useless rule'}."<br>";
- }
- #check if we try to break rules
- 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'){
- $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'}"
- 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]"){
- $errormessage.=$Lang::tr{'fwdfw err ruleexists'};
- if ($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on'){
- $errormessage='';
- }elsif($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'} 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'}"
- 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]"){
- $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){
- &checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}});
- if ($fwdfwsettings{'nobase'} ne 'on'){
- &checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}});
- }
- if($fwdfwsettings{'oldusesrv'} eq '' && $fwdfwsettings{'USESRV'} eq 'ON'){
- &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
- }elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') {
- &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0);
- }elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){
- &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
- }
- if($fwdfwsettings{'nosave2'} ne 'on'){
- &saverule(\%configinputfw,$configinput);
- }
- }
- }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'}"
- 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]"){
- $errormessage.=$Lang::tr{'fwdfw err ruleexists'};
- if ($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on'){
- $errormessage='';
- }elsif($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'} eq $fwdfwsettings{'ruleremark'}){
- $fwdfwsettings{'nosave'} = 'on';
- }
- }
- }
- }
- #check Rulepos on new Rule
- if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){
- print"CHECK OUTGOING DOPPELTE REGEL<br>";
- $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'}"
- 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]"){
- $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){
- &checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}});
- &checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}});
- if($fwdfwsettings{'oldusesrv'} eq '' && $fwdfwsettings{'USESRV'} eq 'ON'){
- &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
- }elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') {
- &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0);
- }elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){
- &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
- }
- if ($fwdfwsettings{'nobase'} eq 'on'){
- &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
- }
- if ($fwdfwsettings{'nosave2'} ne 'on'){
- &saverule(\%configoutgoingfw,$configoutgoing);
- }
- }
- }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'}"
- 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]"){
- $errormessage.=$Lang::tr{'fwdfw err ruleexists'};
- if ($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' ){
- $errormessage='';
- }elsif($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'} 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'}"
- 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]"){
- $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){
- &checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}});
- &checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}});
- if($fwdfwsettings{'oldusesrv'} eq '' && $fwdfwsettings{'USESRV'} eq 'ON'){
- &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
- }elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') {
- &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0);
- }elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){
- &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
- }
- if ($fwdfwsettings{'nobase'} eq 'on'){
- &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
- }
- if ($fwdfwsettings{'nosave2'} ne 'on'){
- &saverule(\%configfwdfw,$configfwdfw);
- }
- }
- }
- if ($errormessage){
- &newrule;
- }else{
- if($fwdfwsettings{'nosave2'} ne 'on'){
- &General::firewall_config_changed();
- }
- &base;
- }
-}
-if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw newrule'})
-{
- &newrule;
-}
-if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw toggle'})
-{
- my %togglehash=();
- &General::readhasharray($fwdfwsettings{'config'}, \%togglehash);
- foreach my $key (sort keys %togglehash){
- if ($key eq $fwdfwsettings{'key'}){
- if ($togglehash{$key}[2] eq 'ON'){$togglehash{$key}[2]='';}else{$togglehash{$key}[2]='ON';}
- }
- }
- &General::writehasharray($fwdfwsettings{'config'}, \%togglehash);
- &General::firewall_config_changed();
- &base;
-}
-if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw togglelog'})
-{
- my %togglehash=();
- &General::readhasharray($fwdfwsettings{'config'}, \%togglehash);
- foreach my $key (sort keys %togglehash){
- if ($key eq $fwdfwsettings{'key'}){
- if ($togglehash{$key}[17] eq 'ON'){$togglehash{$key}[17]='';}else{$togglehash{$key}[17]='ON';}
- }
- }
- &General::writehasharray($fwdfwsettings{'config'}, \%togglehash);
- &General::firewall_config_changed();
- &base;
-}
-if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw reread'})
-{
- &General::firewall_reload();
- &base;
-}
-if ($fwdfwsettings{'ACTION'} eq 'editrule')
-{
- $fwdfwsettings{'updatefwrule'}='on';
- &newrule;
-}
-if ($fwdfwsettings{'ACTION'} eq 'deleterule')
-{
- &deleterule;
-}
-if ($fwdfwsettings{'ACTION'} eq 'moveup')
-{
- &pos_up;
- &base;
-}
-if ($fwdfwsettings{'ACTION'} eq 'movedown')
-{
- &pos_down;
- &base;
-}
-if ($fwdfwsettings{'ACTION'} eq 'copyrule')
-{
- $fwdfwsettings{'copyfwrule'}='on';
- &newrule;
-}
-if ($fwdfwsettings{'ACTION'} eq '' or $fwdfwsettings{'ACTION'} eq 'reset')
-{
- &base;
-}
-### Functions ####
-sub addrule
-{
- &error;
-
- &Header::openbox('100%', 'left', $Lang::tr{'fwdfw menu'});
- print <<END;
- <form method="POST" action="">
- <table border='0' width="100%">
- <tr>
- <td>
- <input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'>
- </td>
- <td align="right">
-END
-
- if (&General::firewall_needs_reload()) {
- print <<END;
- <input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-weight: bold; color: green;'>
-END
- }
-
- print <<END;
- </td>
- </tr>
- </table>
- </form>
-
- <hr>
-END
- &Header::closebox();
- &viewtablerule;
-}
-sub base
-{
- &hint;
- &addrule;
-}
-sub changerule
-{
- my $oldchain=shift;
- $fwdfwsettings{'updatefwrule'}='';
- $fwdfwsettings{'config'}=$oldchain;
- $fwdfwsettings{'nobase'}='on';
- &deleterule;
- &checkcounter(0,0,$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}});
- &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
-}
-sub checksource
-{
- my ($ip,$subnet);
- #check ip-address if manual
- if ($fwdfwsettings{'src_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'src_addr'} ne ''){
- #check if ip with subnet
- if ($fwdfwsettings{'src_addr'} =~ /^(.*?)\/(.*?)$/) {
- ($ip,$subnet)=split (/\//,$fwdfwsettings{'src_addr'});
- $subnet = &General::iporsubtocidr($subnet);
- $fwdfwsettings{'isip'}='on';
- }
- #check if only ip
- if($fwdfwsettings{'src_addr'}=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){
- $ip=$fwdfwsettings{'src_addr'};
- $subnet = '32';
- $fwdfwsettings{'isip'}='on';
- }
-
- if ($fwdfwsettings{'isip'} ne 'on'){
- if (&General::validmac($fwdfwsettings{'src_addr'})){
- $fwdfwsettings{'ismac'}='on';
- }
- }
- if ($fwdfwsettings{'isip'} eq 'on'){
- ##check if ip is valid
- if (! &General::validip($ip)){
- $errormessage.=$Lang::tr{'fwdfw err src_addr'}."<br>";
- return $errormessage;
- }
- #check and form valid IP
- $ip=&General::ip2dec($ip);
- $ip=&General::dec2ip($ip);
- #check if net or broadcast
- $fwdfwsettings{'src_addr'}="$ip/$subnet";
- if(!&General::validipandmask($fwdfwsettings{'src_addr'})){
- $errormessage.=$Lang::tr{'fwdfw err src_addr'}."<br>";
- return $errormessage;
- }
- }
- if ($fwdfwsettings{'isip'} ne 'on' && $fwdfwsettings{'ismac'} ne 'on'){
- $errormessage.=$Lang::tr{'fwdfw err src_addr'}."<br>";
- return $errormessage;
- }
- }elsif($fwdfwsettings{'src_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'src_addr'} eq ''){
- $errormessage.=$Lang::tr{'fwdfw err nosrcip'};
- return $errormessage;
- }
-
- #check empty fields
- if ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq ''){ $errormessage.=$Lang::tr{'fwdfw err nosrc'}."<br>";}
- if($fwdfwsettings{'USE_SRC_PORT'} eq 'ON' && ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP') && $fwdfwsettings{'SRC_PORT'} ne ''){
- my @parts=split(",",$fwdfwsettings{'SRC_PORT'});
- my @values=();
- foreach (@parts){
- chomp($_);
- if ($_ =~ /^(\d+)\-(\d+)$/ || $_ =~ /^(\d+)\:(\d+)$/) {
- my $check;
- #change dashes with :
- $_=~ tr/-/:/;
- if ($_ eq "*") {
- push(@values,"1:65535");
- $check='on';
- }
- if ($_ =~ /^(\D)\:(\d+)$/ || $_ =~ /^(\D)\-(\d+)$/) {
- push(@values,"1:$2");
- $check='on';
- }
- if ($_ =~ /^(\d+)\:(\D)$/ || $_ =~ /^(\d+)\-(\D)$/ ) {
- push(@values,"$1:65535");
- $check='on'
- }
- $errormessage .= &General::validportrange($_, 'destination');
- if(!$check){
- push (@values,$_);
- }
- }else{
- if (&General::validport($_)){
- push (@values,$_);
- }else{
-
- }
- }
- }
- $fwdfwsettings{'SRC_PORT'}=join("|",@values);
- }
- return $errormessage;
-}
-sub checktarget
-{
- my ($ip,$subnet);
- &General::readhasharray("$configsrv", \%customservice);
- #check DNAT settings (has to be single Host and single Port or portrange)
- if ($fwdfwsettings{'USE_NAT'} eq 'ON' && $fwdfwsettings{'nat'} eq 'dnat'){
- if($fwdfwsettings{'grp2'} eq 'tgt_addr' || $fwdfwsettings{'grp2'} eq 'cust_host_tgt' || $fwdfwsettings{'grp2'} eq 'ovpn_host_tgt'){
- if ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'dnatport'} eq ''){
- $errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";
- return $errormessage;
- }
- #check if manual ip is a single Host (if set)
- if ($fwdfwsettings{'grp2'} eq 'tgt_addr'){
- my @tmp= split (/\./,$fwdfwsettings{$fwdfwsettings{'grp2'}});
- my @tmp1= split ("/",$tmp[3]);
- if (($tmp1[0] eq "0") || ($tmp1[0] eq "255"))
- {
- $errormessage=$Lang::tr{'fwdfw dnat error'}."<br>";
- return $errormessage;
- }
- }
- #check if Port is a single Port or portrange
- if ($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT'){
- if(($fwdfwsettings{'PROT'} ne 'TCP'|| $fwdfwsettings{'PROT'} ne 'UDP') && $fwdfwsettings{'TGT_PORT'} eq ''){
- $errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";
- return $errormessage;
- }
- if (($fwdfwsettings{'PROT'} eq 'TCP'|| $fwdfwsettings{'PROT'} eq 'UDP') && $fwdfwsettings{'TGT_PORT'} ne '' && !&check_natport($fwdfwsettings{'TGT_PORT'})){
- $errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";
- return $errormessage;
- }
- }
- }else{
- $errormessage=$Lang::tr{'fwdfw dnat error'}."<br>";
- return $errormessage;
- }
- }
- if ($fwdfwsettings{'tgt_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'tgt_addr'} ne ''){
- #check if ip with subnet
- if ($fwdfwsettings{'tgt_addr'} =~ /^(.*?)\/(.*?)$/) {
- ($ip,$subnet)=split (/\//,$fwdfwsettings{'tgt_addr'});
- $subnet = &General::iporsubtocidr($subnet);
- }
- #check if only ip
- if($fwdfwsettings{'tgt_addr'}=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){
- $ip=$fwdfwsettings{'tgt_addr'};
- $subnet='32';
- }
- #check if ip is valid
- if (! &General::validip($ip)){
- $errormessage.=$Lang::tr{'fwdfw err tgt_addr'}."<br>";
- return $errormessage;
- }
- #check and form valid IP
- $ip=&General::ip2dec($ip);
- $ip=&General::dec2ip($ip);
- $fwdfwsettings{'tgt_addr'}="$ip/$subnet";
- if(!&General::validipandmask($fwdfwsettings{'tgt_addr'})){
- $errormessage.=$Lang::tr{'fwdfw err tgt_addr'}."<br>";
- return $errormessage;
- }
- }elsif($fwdfwsettings{'tgt_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'tgt_addr'} eq ''){
- $errormessage.=$Lang::tr{'fwdfw err notgtip'};
- return $errormessage;
- }
- #check empty fields
- if ($fwdfwsettings{$fwdfwsettings{'grp2'}} eq ''){ $errormessage.=$Lang::tr{'fwdfw err notgt'}."<br>";}
- #check tgt services
- if ($fwdfwsettings{'USESRV'} eq 'ON'){
- if ($fwdfwsettings{'grp3'} eq 'cust_srv'){
- $fwdfwsettings{'TGT_PROT'}='';
- $fwdfwsettings{'ICMP_TGT'}='';
- $fwdfwsettings{'TGT_PORT'}='';
- }
- if ($fwdfwsettings{'grp3'} eq 'cust_srvgrp'){
- $fwdfwsettings{'TGT_PROT'}='';
- $fwdfwsettings{'ICMP_TGT'}='';
- $fwdfwsettings{'TGT_PORT'}='';
- #check target service
- if($fwdfwsettings{$fwdfwsettings{'grp3'}} eq ''){
- $errormessage.=$Lang::tr{'fwdfw err tgt_grp'};
- }
- }
- if ($fwdfwsettings{'grp3'} eq 'TGT_PORT'){
- if ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP'){
- if ($fwdfwsettings{'TGT_PORT'} ne ''){
- if ($fwdfwsettings{'TGT_PORT'} =~ "," && $fwdfwsettings{'USE_NAT'} && $fwdfwsettings{'nat'} eq 'dnat') {
- $errormessage=$Lang::tr{'fwdfw dnat porterr'}."<br>";
- return $errormessage;
- }
- my @parts=split(",",$fwdfwsettings{'TGT_PORT'});
- my @values=();
- foreach (@parts){
- chomp($_);
- if ($_ =~ /^(\d+)\-(\d+)$/ || $_ =~ /^(\d+)\:(\d+)$/) {
- my $check;
- #change dashes with :
- $_=~ tr/-/:/;
- if ($_ eq "*") {
- push(@values,"1:65535");
- $check='on';
- }
- if ($_ =~ /^(\D)\:(\d+)$/ || $_ =~ /^(\D)\-(\d+)$/) {
- push(@values,"1:$2");
- $check='on';
- }
- if ($_ =~ /^(\d+)\:(\D)$/ || $_ =~ /^(\d+)\-(\D)$/) {
- push(@values,"$1:65535");
- $check='on'
- }
- $errormessage .= &General::validportrange($_, 'destination');
- if(!$check){
- push (@values,$_);
- }
- }else{
- if (&General::validport($_)){
- push (@values,$_);
- }else{
- }
- }
- }
- $fwdfwsettings{'TGT_PORT'}=join("|",@values);
- }
- }elsif ($fwdfwsettings{'PROT'} eq 'GRE'){
- $fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
- $fwdfwsettings{'TGT_PORT'} = '';
- $fwdfwsettings{'ICMP_TGT'} = '';
- }elsif ($fwdfwsettings{'PROT'} eq 'ESP'){
- $fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
- $fwdfwsettings{'TGT_PORT'} = '';
- $fwdfwsettings{'ICMP_TGT'}='';
- }elsif ($fwdfwsettings{'PROT'} eq 'AH'){
- $fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
- $fwdfwsettings{'TGT_PORT'} = '';
- $fwdfwsettings{'ICMP_TGT'}='';
- }elsif ($fwdfwsettings{'PROT'} eq 'ICMP'){
- $fwdfwsettings{$fwdfwsettings{'grp3'}} = '';
- $fwdfwsettings{'TGT_PORT'} = '';
- }
- }
- }
- #check targetport
- if ($fwdfwsettings{'USESRV'} ne 'ON'){
- $fwdfwsettings{'grp3'}='';
- $fwdfwsettings{$fwdfwsettings{'grp3'}}='';
- $fwdfwsettings{'ICMP_TGT'}='';
- }
- #check timeframe
- if($fwdfwsettings{'TIME'} eq 'ON'){
- if($fwdfwsettings{'TIME_MON'} eq '' && $fwdfwsettings{'TIME_TUE'} eq '' && $fwdfwsettings{'TIME_WED'} eq '' && $fwdfwsettings{'TIME_THU'} eq '' && $fwdfwsettings{'TIME_FRI'} eq '' && $fwdfwsettings{'TIME_SAT'} eq '' && $fwdfwsettings{'TIME_SUN'} eq ''){
- $errormessage=$Lang::tr{'fwdfw err time'};
- return $errormessage;
- }
- }
- return $errormessage;
-}
-sub check_natport
-{
- my $val=shift;
- if($fwdfwsettings{'USE_NAT'} eq 'ON' && $fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'dnatport'} ne ''){
- if ($fwdfwsettings{'dnatport'} =~ /^(\d+)\-(\d+)$/) {
- $fwdfwsettings{'dnatport'} =~ tr/-/:/;
- if ($fwdfwsettings{'dnatport'} eq "*") {
- $fwdfwsettings{'dnatport'}="1:65535";
- }
- if ($fwdfwsettings{'dnatport'} =~ /^(\D)\:(\d+)$/) {
- $fwdfwsettings{'dnatport'} = "1:$2";
- }
- if ($fwdfwsettings{'dnatport'} =~ /^(\d+)\:(\D)$/) {
- $fwdfwsettings{'dnatport'} ="$1:65535";
- }
- }
- return 1;
- }
- if ($val =~ "," || $val>65536 || $val<0){
- return 0;
- }
- return 1;
-}
-sub checkrule
-{
- #check valid port for NAT
- if($fwdfwsettings{'USE_NAT'} eq 'ON'){
- #if no port is given in nat area, take target host port
- if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$fwdfwsettings{'TGT_PORT'};}
- #check if port given in nat area is a single valid port or portrange
- if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'TGT_PORT'} ne '' && !&check_natport($fwdfwsettings{'dnatport'})){
- $errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";
- }elsif($fwdfwsettings{'USESRV'} eq 'ON' && $fwdfwsettings{'grp3'} eq 'cust_srv'){
- my $custsrvport;
- #get servcie Protocol and Port
- foreach my $key (sort keys %customservice){
- if($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservice{$key}[0]){
- if ($customservice{$key}[2] ne 'TCP' && $customservice{$key}[2] ne 'UDP'){
- $errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";
- }
- $custsrvport= $customservice{$key}[1];
- }
- }
- if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$custsrvport;}
- }
- #check if DNAT port is multiple
- if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'dnatport'} ne ''){
- my @parts=split(",",$fwdfwsettings{'dnatport'});
- my @values=();
- foreach (@parts){
- chomp($_);
- if ($_ =~ /^(\d+)\-(\d+)$/ || $_ =~ /^(\d+)\:(\d+)$/) {
- my $check;
- #change dashes with :
- $_=~ tr/-/:/;
- if ($_ eq "*") {
- push(@values,"1:65535");
- $check='on';
- }
- if ($_ =~ /^(\D)\:(\d+)$/ || $_ =~ /^(\D)\-(\d+)$/) {
- push(@values,"1:$2");
- $check='on';
- }
- if ($_ =~ /^(\d+)\:(\D)$/ || $_ =~ /^(\d+)\-(\D)$/) {
- push(@values,"$1:65535");
- $check='on'
- }
- $errormessage .= &General::validportrange($_, 'destination');
- if(!$check){
- push (@values,$_);
- }
- }else{
- if (&General::validport($_)){
- push (@values,$_);
- }else{
-
- }
- }
- }
- $fwdfwsettings{'dnatport'}=join("|",@values);
- }
- }
- #check valid remark
- if ($fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){
- $errormessage.=$Lang::tr{'fwdfw err remark'}."<br>";
- }
- #check if source and target identical
- if ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ALL'){
- $errormessage=$Lang::tr{'fwdfw err same'};
- return $errormessage;
- }
- #get source and targetip address if possible
- my ($sip,$scidr,$tip,$tcidr);
- ($sip,$scidr)=&get_ip("src","grp1");
- ($tip,$tcidr)=&get_ip("tgt","grp2");
- #check same iprange in source and target
- if ($sip ne '' && $scidr ne '' && $tip ne '' && $tcidr ne ''){
- my $networkip1=&General::getnetworkip($sip,$scidr);
- my $networkip2=&General::getnetworkip($tip,$tcidr);
- if ($scidr gt $tcidr){
- if ( &General::IpInSubnet($networkip1,$tip,&General::iporsubtodec($tcidr))){
- $errormessage.=$Lang::tr{'fwdfw err samesub'};
- }
- }elsif($scidr eq $tcidr && $scidr eq '32'){
- my ($sbyte1,$sbyte2,$sbyte3,$sbyte4)=split(/\./,$networkip1);
- my ($tbyte1,$tbyte2,$tbyte3,$tbyte4)=split(/\./,$networkip2);
- if ($sbyte1 eq $tbyte1 && $sbyte2 eq $tbyte2 && $sbyte3 eq $tbyte3){
- $hint=$Lang::tr{'fwdfw hint ip1'}."<br>";
- $hint.=$Lang::tr{'fwdfw hint ip2'}." Source: $networkip1/$scidr Target: $networkip2/$tcidr<br>";
- }
- }else{
- if ( &General::IpInSubnet($networkip2,$sip,&General::iporsubtodec($scidr)) ){
- $errormessage.=$Lang::tr{'fwdfw err samesub'};
- }
- }
- }
- #When using source- or targetport, the protocol has to be TCP or UDP
- if (($fwdfwsettings{'USESRV'} eq 'ON' || $fwdfwsettings{'USE_SRC_PORT'} eq 'ON') && ($fwdfwsettings{'SRC_PORT'} ne '' || $fwdfwsettings{'TGT_PORT'} ne '') && ($fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP')){
- $errormessage.=$Lang::tr{'fwdfw err prot_port1'};
- return;
- }
- #when icmp selected, no targetport allowed
- if (($fwdfwsettings{'PROT'} ne '' && $fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP' && $fwdfwsettings{'PROT'} ne 'template') && ($fwdfwsettings{'USESRV'} eq 'ON' || $fwdfwsettings{'USE_SRC_PORT'} eq 'ON')){
- $errormessage.=$Lang::tr{'fwdfw err prot_port'};
- return;
- }
- #change protocol if prot not equal dest single service
- if ($fwdfwsettings{'grp3'} eq 'cust_srv'){
- foreach my $key (sort keys %customservice){
- if($customservice{$key}[0] eq $fwdfwsettings{$fwdfwsettings{'grp3'}}){
- if ($customservice{$key}[2] ne $fwdfwsettings{'PROT'}){
- $fwdfwsettings{'PROT'} = $customservice{$key}[2];
- last;
- }
- }
- }
- }
- #check source and destination protocol if source manual and dest servicegroup
- if ($fwdfwsettings{'grp3'} eq 'cust_srvgrp'){
- $fwdfwsettings{'PROT'} = '';
- }
- #ATTENTION: $fwdfwsetting{'TGT_PROT'} deprecated since 30.09.2013
- $fwdfwsettings{'TGT_PROT'}=''; #Set field empty (deprecated)
- #Check ICMP Types
- if ($fwdfwsettings{'PROT'} eq 'ICMP'){
- $fwdfwsettings{'USE_SRC_PORT'}='';
- $fwdfwsettings{'SRC_PORT'}='';
- #$fwdfwsettings{'USESRV'}='';
- $fwdfwsettings{'TGT_PORT'}='';
- &General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
- foreach my $key (keys %icmptypes){
- if($fwdfwsettings{'ICMP_TYPES'} eq "$icmptypes{$key}[0] ($icmptypes{$key}[1])"){
- $fwdfwsettings{'ICMP_TYPES'}="$icmptypes{$key}[0]";
- }
- }
- }elsif($fwdfwsettings{'PROT'} eq 'GRE'){
- $fwdfwsettings{'USE_SRC_PORT'}='';
- $fwdfwsettings{'SRC_PORT'}='';
- $fwdfwsettings{'ICMP_TYPES'}='';
- $fwdfwsettings{'USESRV'}='';
- $fwdfwsettings{'TGT_PORT'}='';
- }elsif($fwdfwsettings{'PROT'} eq 'ESP'){
- $fwdfwsettings{'USE_SRC_PORT'}='';
- $fwdfwsettings{'SRC_PORT'}='';
- $fwdfwsettings{'ICMP_TYPES'}='';
- $fwdfwsettings{'USESRV'}='';
- $fwdfwsettings{'TGT_PORT'}='';
- }elsif($fwdfwsettings{'PROT'} eq 'AH'){
- $fwdfwsettings{'USE_SRC_PORT'}='';
- $fwdfwsettings{'SRC_PORT'}='';
- $fwdfwsettings{'ICMP_TYPES'}='';
- $fwdfwsettings{'USESRV'}='';
- $fwdfwsettings{'TGT_PORT'}='';
- }elsif($fwdfwsettings{'PROT'} eq 'IGMP'){
- $fwdfwsettings{'USE_SRC_PORT'}='';
- $fwdfwsettings{'SRC_PORT'}='';
- $fwdfwsettings{'ICMP_TYPES'}='';
- $fwdfwsettings{'USESRV'}='';
- $fwdfwsettings{'TGT_PORT'}='';
- }elsif($fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP' && $fwdfwsettings{'PROT'} ne 'ICMP'){
- $fwdfwsettings{'ICMP_TYPES'}='';
- $fwdfwsettings{'PROT'} = '';
- }elsif($fwdfwsettings{'PROT'} ne 'ICMP'){
- $fwdfwsettings{'ICMP_TYPES'}='';
- }
-}
-sub checkcounter
-{
- my ($base1,$val1,$base2,$val2) = @_;
-
- if($base1 eq 'cust_net_src' || $base1 eq 'cust_net_tgt'){
- &dec_counter($confignet,\%customnetwork,$val1);
- }elsif($base1 eq 'cust_host_src' || $base1 eq 'cust_host_tgt'){
- &dec_counter($confighost,\%customhost,$val1);
- }elsif($base1 eq 'cust_grp_src' || $base1 eq 'cust_grp_tgt'){
- &dec_counter($configgrp,\%customgrp,$val1);
- }elsif($base1 eq 'cust_srv'){
- &dec_counter($configsrv,\%customservice,$val1);
- }elsif($base1 eq 'cust_srvgrp'){
- &dec_counter($configsrvgrp,\%customservicegrp,$val1);
- }
-
- if($base2 eq 'cust_net_src' || $base2 eq 'cust_net_tgt'){
- &inc_counter($confignet,\%customnetwork,$val2);
- }elsif($base2 eq 'cust_host_src' || $base2 eq 'cust_host_tgt'){
- &inc_counter($confighost,\%customhost,$val2);
- }elsif($base2 eq 'cust_grp_src' || $base2 eq 'cust_grp_tgt'){
- &inc_counter($configgrp,\%customgrp,$val2);
- }elsif($base2 eq 'cust_srv'){
- &inc_counter($configsrv,\%customservice,$val2);
- }elsif($base2 eq 'cust_srvgrp'){
- &inc_counter($configsrvgrp,\%customservicegrp,$val2);
- }
-}
-sub checkvpn
-{
- my $ip=shift;
- #Test if manual IP is part of static OpenVPN networks
- &General::readhasharray("$configccdnet", \%ccdnet);
- foreach my $key (sort keys %ccdnet){
- my ($vpnip,$vpnsubnet) = split ("/",$ccdnet{$key}[1]);
- my $sub=&General::iporsubtodec($vpnsubnet);
- if (&General::IpInSubnet($ip,$vpnip,$sub)){
- return 0;
- }
- }
- # A Test if manual ip is part of dynamic openvpn subnet is made in getcolor
- # because if one creates a custom host with the ip, we need to check the color there!
- # It does not make sense to check this here
-
- # Test if manual IP is part of an OpenVPN N2N subnet does also not make sense here
- # Is also checked in getcolor
-
- # Test if manual ip is part of an IPsec Network is also checked in getcolor
- return 1;
-}
-sub checkvpncolor
-{
-
-}
-sub deleterule
-{
- my %delhash=();
- &General::readhasharray($fwdfwsettings{'config'}, \%delhash);
- foreach my $key (sort {$a <=> $b} keys %delhash){
- if ($key == $fwdfwsettings{'key'}){
- #check hosts/net and groups
- &checkcounter($delhash{$key}[3],$delhash{$key}[4],,);
- &checkcounter($delhash{$key}[5],$delhash{$key}[6],,);
- #check services and groups
- if ($delhash{$key}[11] eq 'ON'){
- &checkcounter($delhash{$key}[14],$delhash{$key}[15],,);
- }
- }
- if ($key >= $fwdfwsettings{'key'}) {
- my $next = $key + 1;
- if (exists $delhash{$next}) {
- foreach my $i (0 .. $#{$delhash{$next}}) {
- $delhash{$key}[$i] = $delhash{$next}[$i];
- }
- }
- }
- }
- # Remove the very last entry.
- my $last_key = (sort {$a <=> $b} keys %delhash)[-1];
- delete $delhash{$last_key};
-
- &General::writehasharray($fwdfwsettings{'config'}, \%delhash);
- &General::firewall_config_changed();
-
- if($fwdfwsettings{'nobase'} ne 'on'){
- &base;
- }
-}
-sub disable_rule
-{
- my $key1=shift;
- &General::readhasharray("$configfwdfw", \%configfwdfw);
- foreach my $key (sort keys %configfwdfw){
- if ($key eq $key1 ){
- if ($configfwdfw{$key}[2] eq 'ON'){$configfwdfw{$key}[2]='';}
- }
- }
- &General::writehasharray("$configfwdfw", \%configfwdfw);
- &General::firewall_config_changed();
-}
-sub dec_counter
-{
- my $config=shift;
- my %hash=%{(shift)};
- my $val=shift;
- my $pos;
- &General::readhasharray($config, \%hash);
- foreach my $key (sort { uc($hash{$a}[0]) cmp uc($hash{$b}[0]) } keys %hash){
- if($hash{$key}[0] eq $val){
- $pos=$#{$hash{$key}};
- $hash{$key}[$pos] = $hash{$key}[$pos]-1;
- }
- }
- &General::writehasharray($config, \%hash);
-}
-sub error
-{
- if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
- print "<class name='base'>$errormessage\n";
- print " </class>\n";
- &Header::closebox();
- print"<hr>";
- }
-}
-sub fillselect
-{
- my %hash=%{(shift)};
- my $val=shift;
- my $key;
- foreach my $key (sort { ncmp($hash{$a}[0],$hash{$b}[0]) } keys %hash){
- if($hash{$key}[0] eq $val){
- print"<option value='$hash{$key}[0]' selected>$hash{$key}[0]</option>";
- }else{
- print"<option value='$hash{$key}[0]'>$hash{$key}[0]</option>";
- }
- }
-}
-sub gen_dd_block
-{
- my $srctgt = shift;
- my $grp=shift;
- my $helper='';
- my $show='';
- $checked{'grp1'}{$fwdfwsettings{'grp1'}} = 'CHECKED';
- $checked{'grp2'}{$fwdfwsettings{'grp2'}} = 'CHECKED';
- $checked{'grp3'}{$fwdfwsettings{'grp3'}} = 'CHECKED';
- $checked{'USE_SRC_PORT'}{$fwdfwsettings{'USE_SRC_PORT'}} = 'CHECKED';
- $checked{'USESRV'}{$fwdfwsettings{'USESRV'}} = 'CHECKED';
- $checked{'ACTIVE'}{$fwdfwsettings{'ACTIVE'}} = 'CHECKED';
- $checked{'LOG'}{$fwdfwsettings{'LOG'}} = 'CHECKED';
- $checked{'TIME'}{$fwdfwsettings{'TIME'}} = 'CHECKED';
- $checked{'TIME_MON'}{$fwdfwsettings{'TIME_MON'}} = 'CHECKED';
- $checked{'TIME_TUE'}{$fwdfwsettings{'TIME_TUE'}} = 'CHECKED';
- $checked{'TIME_WED'}{$fwdfwsettings{'TIME_WED'}} = 'CHECKED';
- $checked{'TIME_THU'}{$fwdfwsettings{'TIME_THU'}} = 'CHECKED';
- $checked{'TIME_FRI'}{$fwdfwsettings{'TIME_FRI'}} = 'CHECKED';
- $checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} = 'CHECKED';
- $checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} = 'CHECKED';
- $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected';
- $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected';
- $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
- $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
-print<<END;
- <table width='100%' border='0'>
- <tr><td width='50%' valign='top'>
- <table width='100%' border='0'>
- <tr><td width='1%'><input type='radio' name='$grp' id='std_net_$srctgt' value='std_net_$srctgt' $checked{$grp}{'std_net_'.$srctgt}></td><td>$Lang::tr{'fwhost stdnet'}</td><td align='right'><select name='std_net_$srctgt' style='width:200px;'>
-END
- foreach my $network (sort keys %defaultNetworks)
- {
- next if($defaultNetworks{$network}{'NAME'} eq "RED" && $srctgt eq 'src');
- next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
- print "<option value='$defaultNetworks{$network}{'NAME'}'";
- print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $defaultNetworks{$network}{'NAME'});
- my $defnet="$defaultNetworks{$network}{'NAME'}_NETADDRESS";
- my $defsub="$defaultNetworks{$network}{'NAME'}_NETMASK";
- my $defsub1=&General::subtocidr($ifaces{$defsub});
- $ifaces{$defnet}='' if ($defaultNetworks{$network}{'NAME'} eq 'RED');
- if ($ifaces{$defnet}){
- print ">$network ($ifaces{$defnet}/$defsub1)</option>";
- }else{
- print ">$network</option>";
- }
- }
- print"</select></td></tr>";
- #custom networks
- if (! -z $confignet || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
- print"<tr><td><input type='radio' name='$grp' id='cust_net_$srctgt' value='cust_net_$srctgt' $checked{$grp}{'cust_net_'.$srctgt}></td><td>$Lang::tr{'fwhost cust net'}</td><td align='right'><select name='cust_net_$srctgt' style='width:200px;'>";
- &fillselect(\%customnetwork,$fwdfwsettings{$fwdfwsettings{$grp}});
- print"</select></td>";
- }
- #custom hosts
- if (! -z $confighost || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
- print"<tr><td><input type='radio' name='$grp' id='cust_host_$srctgt' value='cust_host_$srctgt' $checked{$grp}{'cust_host_'.$srctgt}></td><td>$Lang::tr{'fwhost cust addr'}</td><td align='right'><select name='cust_host_$srctgt' style='width:200px;'>";
- &fillselect(\%customhost,$fwdfwsettings{$fwdfwsettings{$grp}});
- print"</select></td>";
- }
- #custom groups
- if (! -z $configgrp || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
- print"<tr><td valign='top'><input type='radio' name='$grp' id='cust_grp_$srctgt' value='cust_grp_$srctgt' $checked{$grp}{'cust_grp_'.$srctgt}></td><td >$Lang::tr{'fwhost cust grp'}</td><td align='right'><select name='cust_grp_$srctgt' style='width:200px;'>";
- foreach my $key (sort { ncmp($customgrp{$a}[0],$customgrp{$b}[0]) } keys %customgrp) {
- if($helper ne $customgrp{$key}[0]){
- print"<option ";
- print "selected='selected' " if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $customgrp{$key}[0]);
- print ">$customgrp{$key}[0]</option>";
- }
- $helper=$customgrp{$key}[0];
- }
- print"</select></td>";
- }
- #End left table. start right table (vpn)
- print"</tr></table></td><td valign='top'><table width='100%' border='0'><tr>";
- # CCD networks
- if( ! -z $configccdnet || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
- print"<td width='1%'><input type='radio' name='$grp' id='ovpn_net_$srctgt' value='ovpn_net_$srctgt' $checked{$grp}{'ovpn_net_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ccdnet'}</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_net_$srctgt' style='width:200px;'>";
- &fillselect(\%ccdnet,$fwdfwsettings{$fwdfwsettings{$grp}});
- print"</select></td></tr>";
- }
- #OVPN CCD Hosts
- foreach my $key (sort { ncmp($ccdhost{$a}[0],$ccdhost{$b}[0]) } keys %ccdhost){
- if ($ccdhost{$key}[33] ne '' ){
- print"<tr><td width='1%'><input type='radio' name='$grp' id='ovpn_host_$srctgt' value='ovpn_host_$srctgt' $checked{$grp}{'ovpn_host_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ccdhost'}</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_host_$srctgt' style='width:200px;'>" if ($show eq '');
- $show='1';
- print "<option value='$ccdhost{$key}[1]'";
- print "selected='selected'" if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $ccdhost{$key}[1]);
- print ">$ccdhost{$key}[1]</option>";
- }
- }
- if($optionsfw{'SHOWDROPDOWN'} eq 'on' && $show eq ''){
- print"<tr><td width='1%'><input type='radio' name='$grp' id='ovpn_host_$srctgt' value='ovpn_host_$srctgt' $checked{$grp}{'ovpn_host_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ccdhost'}</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_host_$srctgt' style='width:200px;'></select></td></tr>" ;
- }
- if ($show eq '1'){$show='';print"</select></td></tr>";}
- #OVPN N2N
- foreach my $key (sort { ncmp($ccdhost{$a}[1],$ccdhost{$b}[1]) } keys %ccdhost){
- if ($ccdhost{$key}[3] eq 'net'){
- print"<tr><td width='1%'><input type='radio' name='$grp' id='ovpn_n2n_$srctgt' value='ovpn_n2n_$srctgt' $checked{$grp}{'ovpn_n2n_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ovpn_n2n'}:</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_n2n_$srctgt' style='width:200px;'>" if ($show eq '');
- $show='1';
- print "<option value='$ccdhost{$key}[1]'";
- print "selected='selected'" if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $ccdhost{$key}[1]);
- print ">$ccdhost{$key}[1]</option>";
- }
- }
- if($optionsfw{'SHOWDROPDOWN'} eq 'on' && $show eq ''){
- print"<tr><td width='1%'><input type='radio' name='$grp' id='ovpn_n2n_$srctgt' value='ovpn_n2n_$srctgt' $checked{$grp}{'ovpn_n2n_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ovpn_n2n'}</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_n2n_$srctgt' style='width:200px;'></select></td></tr>" ;
- }
- if ($show eq '1'){$show='';print"</select></td></tr>";}
- #IPsec netze
- foreach my $key (sort { ncmp($ipsecconf{$a}[1],$ipsecconf{$b}[1]) } keys %ipsecconf) {
- if ($ipsecconf{$key}[3] eq 'net' || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
- print"<tr><td valign='top'><input type='radio' name='$grp' value='ipsec_net_$srctgt' $checked{$grp}{'ipsec_net_'.$srctgt}></td><td >$Lang::tr{'fwhost ipsec net'}</td><td align='right'><select name='ipsec_net_$srctgt' style='width:200px;'>" if ($show eq '');
- $show='1';
- print "<option ";
- print "selected='selected'" if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $ipsecconf{$key}[1]);
- print ">$ipsecconf{$key}[1]</option>";
- }
- }
- if($optionsfw{'SHOWDROPDOWN'} eq 'on' && $show eq ''){
- print"<tr><td valign='top'><input type='radio' name='$grp' id='ipsec_net_$srctgt' value='ipsec_net_$srctgt' $checked{$grp}{'ipsec_net_'.$srctgt}></td><td >$Lang::tr{'fwhost ipsec net'}</td><td align='right'><select name='ipsec_net_$srctgt' style='width:200px;'><select></td></tr>";
- }
- if ($show eq '1'){$show='';print"</select></td></tr>";}
-
- print"</table>";
- print"</td></tr></table><br>";
-}
-sub get_ip
-{
- my $val=shift;
- my $grp =shift;
- my $a;
- my $b;
- &General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
- if ($fwdfwsettings{$grp} ne $Lang::tr{'fwhost any'}){
- if ($fwdfwsettings{$grp} eq $val.'_addr'){
- ($a,$b) = split (/\//, $fwdfwsettings{$fwdfwsettings{$grp}});
- }elsif($fwdfwsettings{$grp} eq 'std_net_'.$val){
- if ($fwdfwsettings{$fwdfwsettings{$grp}} =~ /Gr/i){
- $a=$netsettings{'GREEN_NETADDRESS'};
- $b=&General::iporsubtocidr($netsettings{'GREEN_NETMASK'});
- }elsif($fwdfwsettings{$fwdfwsettings{$grp}} =~ /Ora/i){
- $a=$netsettings{'ORANGE_NETADDRESS'};
- $b=&General::iporsubtocidr($netsettings{'ORANGE_NETMASK'});
- }elsif($fwdfwsettings{$fwdfwsettings{$grp}} =~ /Bl/i){
- $a=$netsettings{'BLUE_NETADDRESS'};
- $b=&General::iporsubtocidr($netsettings{'BLUE_NETMASK'});
- }elsif($fwdfwsettings{$fwdfwsettings{$grp}} =~ /OpenVPN/i){
- &General::readhash("$configovpn",\%ovpnsettings);
- ($a,$b) = split (/\//, $ovpnsettings{'DOVPN_SUBNET'});
- $b=&General::iporsubtocidr($b);
- }
- }elsif($fwdfwsettings{$grp} eq 'cust_net_'.$val){
- &General::readhasharray("$confignet", \%customnetwork);
- foreach my $key (keys %customnetwork){
- if($customnetwork{$key}[0] eq $fwdfwsettings{$fwdfwsettings{$grp}}){
- $a=$customnetwork{$key}[1];
- $b=&General::iporsubtocidr($customnetwork{$key}[2]);
- }
- }
- }elsif($fwdfwsettings{$grp} eq 'cust_host_'.$val){
- &General::readhasharray("$confighost", \%customhost);
- foreach my $key (keys %customhost){
- if($customhost{$key}[0] eq $fwdfwsettings{$fwdfwsettings{$grp}}){
- if ($customhost{$key}[1] eq 'ip'){
- ($a,$b)=split (/\//,$customhost{$key}[2]);
- $b=&General::iporsubtocidr($b);
- }else{
- if ($grp eq 'grp2'){
- $errormessage=$Lang::tr{'fwdfw err tgt_mac'};
- }
- }
- }
- }
- }
- }
- return $a,$b;
-}
-sub get_name
-{
- my $val=shift;
- &General::setup_default_networks(\%defaultNetworks);
- foreach my $network (sort keys %defaultNetworks)
- {
- return "$network" if ($val eq $defaultNetworks{$network}{'NAME'});
- }
-}
-sub getsrcport
-{
- my %hash=%{(shift)};
- my $key=shift;
- if($hash{$key}[7] eq 'ON' && $hash{$key}[10]){
- $hash{$key}[10]=~ s/\|/,/g;
- print": $hash{$key}[10]";
- }elsif($hash{$key}[7] eq 'ON' && $hash{$key}[8] eq 'ICMP'){
- print": <br>$hash{$key}[9] ";
- }
-}
-sub gettgtport
-{
- my %hash=%{(shift)};
- my $key=shift;
- my $service;
- my $prot;
- if($hash{$key}[11] eq 'ON' && $hash{$key}[12] ne 'ICMP'){
- if($hash{$key}[14] eq 'cust_srv'){
- &General::readhasharray("$configsrv", \%customservice);
- foreach my $i (sort keys %customservice){
- if($customservice{$i}[0] eq $hash{$key}[15]){
- $service = $customservice{$i}[0];
- }
- }
- }elsif($hash{$key}[14] eq 'cust_srvgrp'){
- $service=$hash{$key}[15];
- }elsif($hash{$key}[14] eq 'TGT_PORT'){
- $hash{$key}[15]=~ s/\|/,/g;
- $service=$hash{$key}[15];
- }
- if($service){
- print": $service";
- }
- }
-}
-sub get_serviceports
-{
- my $type=shift;
- my $name=shift;
- &General::readhasharray("$configsrv", \%customservice);
- &General::readhasharray("$configsrvgrp", \%customservicegrp);
- my $tcp;
- my $udp;
- my $icmp;
- @protocols=();
- if($type eq 'service'){
- foreach my $key (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){
- if ($customservice{$key}[0] eq $name){
- push (@protocols,$customservice{$key}[2]);
- }
- }
- }elsif($type eq 'group'){
- foreach my $key (sort { ncmp($customservicegrp{$a}[0],$customservicegrp{$b}[0]) } keys %customservicegrp){
- if ($customservicegrp{$key}[0] eq $name){
- foreach my $key1 (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){
- if ($customservice{$key1}[0] eq $customservicegrp{$key}[2]){
- if($customservice{$key1}[2] eq 'TCP'){
- $tcp='TCP';
- }elsif($customservice{$key1}[2] eq 'ICMP'){
- $icmp='ICMP';
- }elsif($customservice{$key1}[2] eq 'UDP'){
- $udp='UDP';
- }
- }
- }
- }
- }
- }
- if($tcp && $udp && $icmp){
- push (@protocols,"TCP,UDP, <br>ICMP");
- return @protocols;
- }
- if($tcp){
- push (@protocols,"TCP");
- }
- if($udp){
- push (@protocols,"UDP");
- }
- if($icmp){
- push (@protocols,"ICMP");
- }
- return @protocols;
-}
-sub getcolor
-{
- my $nettype=shift;
- my $val=shift;
- my $hash=shift;
- if($optionsfw{'SHOWCOLORS'} eq 'on'){
- #custom Hosts
- if ($nettype eq 'cust_host_src' || $nettype eq 'cust_host_tgt'){
- foreach my $key (sort keys %$hash){
- if ($$hash{$key}[0] eq $val){
- $val=$$hash{$key}[2];
- }
- }
- }
- #standard networks
- if ($val eq 'GREEN'){
- $tdcolor="style='background-color: $Header::colourgreen;color:white;'";
- return;
- }elsif ($val eq 'ORANGE'){
- $tdcolor="style='background-color: $Header::colourorange;color:white;'";
- return;
- }elsif ($val eq 'BLUE'){
- $tdcolor="style='background-color: $Header::colourblue;color:white;'";
- return;
- }elsif ($val eq 'RED' ||$val eq 'RED1' ){
- $tdcolor="style='background-color: $Header::colourred;color:white;'";
- return;
- }elsif ($val eq 'IPFire' ){
- $tdcolor="style='background-color: $Header::colourred;color:white;'";
- return;
- }elsif($val =~ /^(.*?)\/(.*?)$/){
- my ($sip,$scidr) = split ("/",$val);
- if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
- $tdcolor="style='background-color: $Header::colourorange;color:white;'";
- return;
- }
- if ( &General::IpInSubnet($sip,$netsettings{'GREEN_ADDRESS'},$netsettings{'GREEN_NETMASK'})){
- $tdcolor="style='background-color: $Header::colourgreen;color:white;'";
- return;
- }
- if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
- $tdcolor="style='background-color: $Header::colourblue;color:white;'";
- return;
- }
- }elsif ($val eq 'Default IP'){
- $tdcolor="style='background-color: $Header::colourred;color:white;'";
- return;
- }
- #Check if a manual IP or custom host is part of a VPN
- if ($nettype eq 'src_addr' || $nettype eq 'tgt_addr' || $nettype eq 'cust_host_src' || $nettype eq 'cust_host_tgt'){
- #Check if IP is part of OpenVPN dynamic subnet
- my ($a,$b) = split("/",$ovpnsettings{'DOVPN_SUBNET'});
- my ($c,$d) = split("/",$val);
- if (&General::IpInSubnet($c,$a,$b)){
- $tdcolor="style='background-color: $Header::colourovpn;color:white;'";
- return;
- }
- #Check if IP is part of OpenVPN static subnet
- foreach my $key (sort keys %ccdnet){
- my ($a,$b) = split("/",$ccdnet{$key}[1]);
- $b =&General::iporsubtodec($b);
- if (&General::IpInSubnet($c,$a,$b)){
- $tdcolor="style='background-color: $Header::colourovpn;color:white;'";
- return;
- }
- }
- #Check if IP is part of OpenVPN N2N subnet
- foreach my $key (sort keys %ccdhost){
- if ($ccdhost{$key}[3] eq 'net'){
- my ($a,$b) = split("/",$ccdhost{$key}[11]);
- if (&General::IpInSubnet($c,$a,$b)){
- $tdcolor="style='background-color: $Header::colourovpn;color:white;'";
- return;
- }
- }
- }
- #Check if IP is part of IPsec RW network
- if ($ipsecsettings{'RW_NET'} ne ''){
- my ($a,$b) = split("/",$ipsecsettings{'RW_NET'});
- $b=&General::iporsubtodec($b);
- if (&General::IpInSubnet($c,$a,$b)){
- $tdcolor="style='background-color: $Header::colourvpn;color:white;'";
- return;
- }
- }
- #Check if IP is part of a IPsec N2N network
- foreach my $key (sort keys %ipsecconf){
- my ($a,$b) = split("/",$ipsecconf{$key}[11]);
- if (&General::IpInSubnet($c,$a,$b)){
- $tdcolor="style='background-color: $Header::colourvpn;color:white;'";
- return;
- }
- }
- }
- #VPN networks
- if ($nettype eq 'ovpn_n2n_src' || $nettype eq 'ovpn_n2n_tgt' || $nettype eq 'ovpn_net_src' || $nettype eq 'ovpn_net_tgt'|| $nettype eq 'ovpn_host_src' || $nettype eq 'ovpn_host_tgt'){
- $tdcolor="style='background-color: $Header::colourovpn;color:white;'";
- return;
- }
- if ($nettype eq 'ipsec_net_src' || $nettype eq 'ipsec_net_tgt'){
- $tdcolor="style='background-color: $Header::colourvpn;color:white;'";
- return;
- }
- #ALIASE
- foreach my $alias (sort keys %aliases)
- {
- if ($val eq $alias){
- $tdcolor="style='background-color:$Header::colourred;color:white;'";
- return;
- }
- }
- }
- $tdcolor='';
- return;
-}
-sub hint
-{
- if ($hint) {
- &Header::openbox('100%', 'left', $Lang::tr{'fwhost hint'});
- print "<class name='base'>$hint\n";
- print " </class>\n";
- &Header::closebox();
- print"<hr>";
- }
-}
-sub inc_counter
-{
- my $config=shift;
- my %hash=%{(shift)};
- my $val=shift;
- my $pos;
-
- &General::readhasharray($config, \%hash);
- foreach my $key (sort { uc($hash{$a}[0]) cmp uc($hash{$b}[0]) } keys %hash){
- if($hash{$key}[0] eq $val){
- $pos=$#{$hash{$key}};
- $hash{$key}[$pos] = $hash{$key}[$pos]+1;
- }
- }
- &General::writehasharray($config, \%hash);
-}
-sub newrule
-{
- &error;
- &General::setup_default_networks(\%defaultNetworks);
- &General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
- #read all configfiles
- &General::readhasharray("$configccdnet", \%ccdnet);
- &General::readhasharray("$confignet", \%customnetwork);
- &General::readhasharray("$configccdhost", \%ccdhost);
- &General::readhasharray("$confighost", \%customhost);
- &General::readhasharray("$configccdhost", \%ccdhost);
- &General::readhasharray("$configgrp", \%customgrp);
- &General::readhasharray("$configipsec", \%ipsecconf);
- &General::get_aliases(\%aliases);
- my %checked=();
- my $helper;
- my $sum=0;
- if($fwdfwsettings{'config'} eq ''){$fwdfwsettings{'config'}=$configfwdfw;}
- my $config=$fwdfwsettings{'config'};
- my %hash=();
- #Get Red IP-ADDRESS
- open (CONN1,"/var/ipfire/red/local-ipaddress");
- my $redip = <CONN1>;
- close(CONN1);
- $checked{'grp1'}{$fwdfwsettings{'grp1'}} = 'CHECKED';
- $checked{'grp2'}{$fwdfwsettings{'grp2'}} = 'CHECKED';
- $checked{'grp3'}{$fwdfwsettings{'grp3'}} = 'CHECKED';
- $checked{'USE_SRC_PORT'}{$fwdfwsettings{'USE_SRC_PORT'}} = 'CHECKED';
- $checked{'USESRV'}{$fwdfwsettings{'USESRV'}} = 'CHECKED';
- $checked{'ACTIVE'}{$fwdfwsettings{'ACTIVE'}} = 'CHECKED';
- $checked{'LOG'}{$fwdfwsettings{'LOG'}} = 'CHECKED';
- $checked{'TIME'}{$fwdfwsettings{'TIME'}} = 'CHECKED';
- $checked{'TIME_MON'}{$fwdfwsettings{'TIME_MON'}} = 'CHECKED';
- $checked{'TIME_TUE'}{$fwdfwsettings{'TIME_TUE'}} = 'CHECKED';
- $checked{'TIME_WED'}{$fwdfwsettings{'TIME_WED'}} = 'CHECKED';
- $checked{'TIME_THU'}{$fwdfwsettings{'TIME_THU'}} = 'CHECKED';
- $checked{'TIME_FRI'}{$fwdfwsettings{'TIME_FRI'}} = 'CHECKED';
- $checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} = 'CHECKED';
- $checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} = 'CHECKED';
- $checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} = 'CHECKED';
- $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected';
- $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected';
- $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
- $selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
- #check if update and get values
- if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} eq 'on' && !$errormessage){
- &General::readhasharray("$config", \%hash);
- foreach my $key (sort keys %hash){
- $sum++;
- if ($key eq $fwdfwsettings{'key'}){
- $fwdfwsettings{'oldrulenumber'} = $fwdfwsettings{'key'};
- $fwdfwsettings{'RULE_ACTION'} = $hash{$key}[0];
- $fwdfwsettings{'chain'} = $hash{$key}[1];
- $fwdfwsettings{'ACTIVE'} = $hash{$key}[2];
- $fwdfwsettings{'grp1'} = $hash{$key}[3];
- $fwdfwsettings{$fwdfwsettings{'grp1'}} = $hash{$key}[4];
- $fwdfwsettings{'grp2'} = $hash{$key}[5];
- $fwdfwsettings{$fwdfwsettings{'grp2'}} = $hash{$key}[6];
- $fwdfwsettings{'USE_SRC_PORT'} = $hash{$key}[7];
- $fwdfwsettings{'PROT'} = $hash{$key}[8];
- $fwdfwsettings{'ICMP_TYPES'} = $hash{$key}[9];
- $fwdfwsettings{'SRC_PORT'} = $hash{$key}[10];
- $fwdfwsettings{'USESRV'} = $hash{$key}[11];
- $fwdfwsettings{'TGT_PROT'} = $hash{$key}[12];
- $fwdfwsettings{'ICMP_TGT'} = $hash{$key}[13];
- $fwdfwsettings{'grp3'} = $hash{$key}[14];
- $fwdfwsettings{$fwdfwsettings{'grp3'}} = $hash{$key}[15];
- $fwdfwsettings{'ruleremark'} = $hash{$key}[16];
- $fwdfwsettings{'LOG'} = $hash{$key}[17];
- $fwdfwsettings{'TIME'} = $hash{$key}[18];
- $fwdfwsettings{'TIME_MON'} = $hash{$key}[19];
- $fwdfwsettings{'TIME_TUE'} = $hash{$key}[20];
- $fwdfwsettings{'TIME_WED'} = $hash{$key}[21];
- $fwdfwsettings{'TIME_THU'} = $hash{$key}[22];
- $fwdfwsettings{'TIME_FRI'} = $hash{$key}[23];
- $fwdfwsettings{'TIME_SAT'} = $hash{$key}[24];
- $fwdfwsettings{'TIME_SUN'} = $hash{$key}[25];
- $fwdfwsettings{'TIME_FROM'} = $hash{$key}[26];
- $fwdfwsettings{'TIME_TO'} = $hash{$key}[27];
- $fwdfwsettings{'USE_NAT'} = $hash{$key}[28];
- $fwdfwsettings{'nat'} = $hash{$key}[31]; #changed order
- $fwdfwsettings{$fwdfwsettings{'nat'}} = $hash{$key}[29];
- $fwdfwsettings{'dnatport'} = $hash{$key}[30];
- $checked{'grp1'}{$fwdfwsettings{'grp1'}} = 'CHECKED';
- $checked{'grp2'}{$fwdfwsettings{'grp2'}} = 'CHECKED';
- $checked{'grp3'}{$fwdfwsettings{'grp3'}} = 'CHECKED';
- $checked{'USE_SRC_PORT'}{$fwdfwsettings{'USE_SRC_PORT'}} = 'CHECKED';
- $checked{'USESRV'}{$fwdfwsettings{'USESRV'}} = 'CHECKED';
- $checked{'ACTIVE'}{$fwdfwsettings{'ACTIVE'}} = 'CHECKED';
- $checked{'LOG'}{$fwdfwsettings{'LOG'}} = 'CHECKED';
- $checked{'TIME'}{$fwdfwsettings{'TIME'}} = 'CHECKED';
- $checked{'TIME_MON'}{$fwdfwsettings{'TIME_MON'}} = 'CHECKED';
- $checked{'TIME_TUE'}{$fwdfwsettings{'TIME_TUE'}} = 'CHECKED';
- $checked{'TIME_WED'}{$fwdfwsettings{'TIME_WED'}} = 'CHECKED';
- $checked{'TIME_THU'}{$fwdfwsettings{'TIME_THU'}} = 'CHECKED';
- $checked{'TIME_FRI'}{$fwdfwsettings{'TIME_FRI'}} = 'CHECKED';
- $checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} = 'CHECKED';
- $checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} = 'CHECKED';
- $checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} = 'CHECKED';
- $checked{'nat'}{$fwdfwsettings{'nat'}} = 'CHECKED';
- $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected';
- $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected';
- $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
- $selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
- $selected{'dnat'}{$fwdfwsettings{$fwdfwsettings{'nat'}}} ='selected';
- $selected{'snat'}{$fwdfwsettings{$fwdfwsettings{'nat'}}} ='selected';
- }
- }
- $fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'};
- $fwdfwsettings{'oldgrp1b'}=$fwdfwsettings{$fwdfwsettings{'grp1'}};
- $fwdfwsettings{'oldgrp2a'}=$fwdfwsettings{'grp2'};
- $fwdfwsettings{'oldgrp2b'}=$fwdfwsettings{$fwdfwsettings{'grp2'}};
- $fwdfwsettings{'oldgrp3a'}=$fwdfwsettings{'grp3'};
- $fwdfwsettings{'oldgrp3b'}=$fwdfwsettings{$fwdfwsettings{'grp3'}};
- $fwdfwsettings{'oldusesrv'}=$fwdfwsettings{'USESRV'};
- $fwdfwsettings{'oldruleremark'}=$fwdfwsettings{'ruleremark'};
- $fwdfwsettings{'oldnat'}=$fwdfwsettings{'USE_NAT'};
- $fwdfwsettings{'oldruletype'}=$fwdfwsettings{'chain'};
- #check if manual ip (source) is orange network
- if ($fwdfwsettings{'grp1'} eq 'src_addr'){
- my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
- if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
- $fwdfwsettings{'oldorange'} ='on';
- }
- }
- }else{
- $fwdfwsettings{'ACTIVE'}='ON';
- $checked{'ACTIVE'}{$fwdfwsettings{'ACTIVE'}} = 'CHECKED';
- $fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'};
- $fwdfwsettings{'oldgrp1b'}=$fwdfwsettings{$fwdfwsettings{'grp1'}};
- $fwdfwsettings{'oldgrp2a'}=$fwdfwsettings{'grp2'};
- $fwdfwsettings{'oldgrp2b'}=$fwdfwsettings{$fwdfwsettings{'grp2'}};
- $fwdfwsettings{'oldgrp3a'}=$fwdfwsettings{'grp3'};
- $fwdfwsettings{'oldgrp3b'}=$fwdfwsettings{$fwdfwsettings{'grp3'}};
- $fwdfwsettings{'oldusesrv'}=$fwdfwsettings{'USESRV'};
- $fwdfwsettings{'oldruleremark'}=$fwdfwsettings{'ruleremark'};
- $fwdfwsettings{'oldnat'}=$fwdfwsettings{'USE_NAT'};
- #check if manual ip (source) is orange network
- if ($fwdfwsettings{'grp1'} eq 'src_addr'){
- my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
- if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
- $fwdfwsettings{'oldorange'} ='on';
- }
- }
- }
- &Header::openbox('100%', 'left', $Lang::tr{'fwdfw addrule'});
- &Header::closebox();
- &Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'});
- #------SOURCE-------------------------------------------------------
- print "<form method='post'>";
- print<<END;
- <table width='100%' border='0'>
- <tr><td width='1%'><input type='radio' name='grp1' value='src_addr' checked></td><td width='60%'>$Lang::tr{'fwdfw sourceip'}<input type='TEXT' name='src_addr' value='$fwdfwsettings{'src_addr'}' size='16' maxlength='18' ></td><td width='1%'><input type='radio' name='grp1' id='ipfire_src' value='ipfire_src' $checked{'grp1'}{'ipfire_src'}></td><td><b>Firewall</b></td>
-END
- print"<td align='right'><select name='ipfire_src' style='width:200px;'>";
- print "<option value='ALL' $selected{'ipfire_src'}{'ALL'}>$Lang::tr{'all'}</option>";
- print "<option value='GREEN' $selected{'ipfire_src'}{'GREEN'}>$Lang::tr{'green'} ($ifaces{'GREEN_ADDRESS'})</option>" if $ifaces{'GREEN_ADDRESS'};
- print "<option value='ORANGE' $selected{'ipfire_src'}{'ORANGE'}>$Lang::tr{'orange'} ($ifaces{'ORANGE_ADDRESS'})</option>" if (&Header::orange_used());
- print "<option value='BLUE' $selected{'ipfire_src'}{'BLUE'}>$Lang::tr{'blue'} ($ifaces{'BLUE_ADDRESS'})</option>" if (&Header::blue_used());
- print "<option value='RED1' $selected{'ipfire_src'}{'RED1'}>$Lang::tr{'red1'} ($redip)" if ($redip);
- if (! -z "${General::swroot}/ethernet/aliases"){
- foreach my $alias (sort keys %aliases)
- {
- print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias</option>";
- }
- }
- print<<END;
- </select></td></tr>
- <tr><td colspan='8'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
-END
- &gen_dd_block('src','grp1');
- print"<hr>";
- &Header::closebox();
- #---SNAT / DNAT ------------------------------------------------
- &Header::openbox('100%', 'left', 'NAT');
- print<<END;
- <label>
- <input type='checkbox' name='USE_NAT' id='USE_NAT' value="ON" $checked{'USE_NAT'}{'ON'}>
- $Lang::tr{'fwdfw use nat'}
- </label>
- <div class="NAT">
- <table width='100%' border='0'>
- <tr>
- <td colspan='2'></td>
- <td width='1%'>
- <input type='radio' name='nat' id='dnat' value='dnat' checked>
- </td>
- <td width='50%'>$Lang::tr{'fwdfw dnat'}</td>
-END
- print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='dnat' style='width:140px;'>";
- print "<option value='ALL' $selected{'dnat'}{$Lang::tr{'all'}}>$Lang::tr{'all'}</option>";
- print "<option value='Default IP' $selected{'dnat'}{'Default IP'}>Default IP</option>";
- foreach my $alias (sort keys %aliases)
- {
- print "<option value='$alias' $selected{'dnat'}{$alias}>$alias</option>";
- }
- print"</select></td></tr>";
- #SNAT
- print"<tr><td colspan='2'></td><td width='1%'><input type='radio' name='nat' id='snat' value='snat' $checked{'nat'}{'snat'}></td><td width='20%'>$Lang::tr{'fwdfw snat'}</td>";
- print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='snat' style='width:140px;'>";
- foreach my $alias (sort keys %aliases)
- {
- print "<option value='$alias' $selected{'snat'}{$alias}>$alias</option>";
- }
- foreach my $network (sort keys %defaultNetworks)
- {
- next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
- next if($defaultNetworks{$network}{'NAME'} eq "ALL");
- next if($defaultNetworks{$network}{'NAME'} =~ /OpenVPN/i);
- print "<option value='$defaultNetworks{$network}{'NAME'}'";
- print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
- print ">$network</option>";
- }
- print"</select></td></tr></table>";
- print"</div>";
- &Header::closebox();
- #---TARGET------------------------------------------------------
- &Header::openbox('100%', 'left', $Lang::tr{'fwdfw target'});
- print<<END;
- <table width='100%' border='0'>
- <tr><td width='1%'><input type='radio' name='grp2' value='tgt_addr' checked></td><td width='60%' nowrap='nowrap'>$Lang::tr{'fwdfw targetip'}<input type='TEXT' name='tgt_addr' value='$fwdfwsettings{'tgt_addr'}' size='16' maxlength='18'><td width='1%'><input type='radio' name='grp2' id='ipfire' value='ipfire' $checked{'grp2'}{'ipfire'}></td><td><b>Firewall</b></td>
-END
- print"<td align='right'><select name='ipfire' style='width:200px;'>";
- print "<option value='ALL' $selected{'ipfire'}{'ALL'}>$Lang::tr{'all'}</option>";
- print "<option value='GREEN' $selected{'ipfire'}{'GREEN'}>$Lang::tr{'green'} ($ifaces{'GREEN_ADDRESS'})</option>" if $ifaces{'GREEN_ADDRESS'};
- print "<option value='ORANGE' $selected{'ipfire'}{'ORANGE'}>$Lang::tr{'orange'} ($ifaces{'ORANGE_ADDRESS'})</option>" if (&Header::orange_used());
- print "<option value='BLUE' $selected{'ipfire'}{'BLUE'}>$Lang::tr{'blue'} ($ifaces{'BLUE_ADDRESS'})</option>"if (&Header::blue_used());
- print "<option value='RED1' $selected{'ipfire'}{'RED1'}>$Lang::tr{'red1'} ($redip)" if ($redip);
- if (! -z "${General::swroot}/ethernet/aliases"){
- foreach my $alias (sort keys %aliases)
- {
- print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias</option>";
- }
- }
- print<<END;
- </select></td></tr>
- <tr><td colspan='7'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
-END
- &gen_dd_block('tgt','grp2');
- print"<hr>";
- &Header::closebox;
- #---PROTOCOL------------------------------------------------------
- &Header::openbox('100%', 'left', $Lang::tr{'fwhost prot'});
- #Fix Protocol for JQuery
- if ($fwdfwsettings{'grp3'} eq 'cust_srv' || $fwdfwsettings{'grp3'} eq 'cust_srvgrp'){
- $fwdfwsettings{'PROT'} = 'template';
- }
- print<<END;
- <div id="prt">
- <table width='15%' border='0' style="float:left;">
- <tr>
- <td>
- <select name='PROT' id='protocol'>
-END
- print "<option value=\"\"";
- if ($fwdfwsettings{'PROT'} eq '') {
- print " selected=\"selected\"";
- }
- print ">$Lang::tr{'all'}</option>";
-
- print "<option value=\"template\"";
- print " selected=\"selected\"" if ($fwdfwsettings{'grp3'} eq 'cust_srv' || $fwdfwsettings{'grp3'} eq 'cust_srvgrp');
- print ">- $Lang::tr{'template'} -</option>";
-
- foreach (@PROTOCOLS) {
- print"<option value=\"$_\"";
- if ($_ eq $fwdfwsettings{'PROT'}) {
- print " selected=\"selected\"";
- }
- print ">$_</option>";
- }
- print<<END;
- </select>
- </td>
- </tr>
- </table>
- </div>
-
- <div id="PROTOCOL_ICMP_TYPES">
- <table width='50%' border='0' style="float:left;">
- <tr>
- <td width='20%'>$Lang::tr{'fwhost icmptype'}</td>
- <td colspan='2'>
- <select name='ICMP_TYPES' style='min-width:230px;'>
-END
- &General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
- print"<option value='All ICMP-Types'>$Lang::tr{'fwdfw all icmp'}</option>";
- foreach my $key (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) }keys %icmptypes){
- if($fwdfwsettings{'ICMP_TYPES'} eq "$icmptypes{$key}[0]"){
- print"<option selected>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
- }else{
- print"<option>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
- }
- }
-
- print <<END;
- </select>
- </td>
- </tr>
- </table>
- </div>
-END
-
- $fwdfwsettings{'SRC_PORT'} =~ s/\|/,/g;
- $fwdfwsettings{'TGT_PORT'} =~ s/\|/,/g;
- $fwdfwsettings{'dnatport'} =~ tr/|/,/;
-
- # The dnatport may be empty, if it matches TGT_PORT
- if ($fwdfwsettings{'dnatport'} eq $fwdfwsettings{'TGT_PORT'}) {
- $fwdfwsettings{'dnatport'} = "";
- }
-
- print <<END;
-
- <div id="PROTOCOL_PORTS">
- <table border="0">
- <tr>
- <!-- #SOURCEPORT -->
- <td>
- $Lang::tr{'fwdfw use srcport'}
- </td>
- <td>
- <input type='text' name='SRC_PORT' value='$fwdfwsettings{'SRC_PORT'}' maxlength='20' size='18'>
- </td>
- <td width='10%'>
- </td>
-
- <!-- #TARGETPORT -->
- <td>
- $Lang::tr{'fwdfw use srv'}
- </td>
-
- <td>
- <input type='text' name='TGT_PORT' value='$fwdfwsettings{'TGT_PORT'}' maxlength='20' size='18'>
- </td>
- </tr>
- <tr class="NAT">
- <td colspan='3'></td>
- <td>$Lang::tr{'fwdfw external port nat'}:</td>
- <td>
- <input type='text' name='dnatport' value=\"$fwdfwsettings{'dnatport'}\" maxlength='20' size='18'>
- </td>
- </tr>
- </table>
- </div>
-
- <div id="PROTOCOL_TEMPLATE">
- <table border="0">
- <tr>
- <td>
- <input type='radio' name='grp3' id='cust_srv' value='cust_srv' checked>
- $Lang::tr{'fwhost cust service'}
- </td>
- <td>
- <select name='cust_srv' style='min-width: 230px;'>
-END
- &General::readhasharray("$configsrv", \%customservice);
- foreach my $key (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){
- print"<option ";
- print"selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservice{$key}[0]);
- print"value='$customservice{$key}[0]'>$customservice{$key}[0]</option>";
- }
-
- print<<END;
- </select>
- </td>
- </tr>
- <tr>
- <td>
- <input type='radio' name='grp3' id='cust_srvgrp' value='cust_srvgrp' $checked{'grp3'}{'cust_srvgrp'}>
- $Lang::tr{'fwhost cust srvgrp'}
- </td>
- <td>
- <select name='cust_srvgrp' style='min-width:230px;'>
-END
-
- &General::readhasharray("$configsrvgrp", \%customservicegrp);
- my $helper;
- foreach my $key (sort { ncmp($customservicegrp{$a}[0],$customservicegrp{$b}[0]) } keys %customservicegrp){
- if ($helper ne $customservicegrp{$key}[0]){
- print"<option ";
- print"selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservicegrp{$key}[0]);
- print">$customservicegrp{$key}[0]</option>";
- }
- $helper=$customservicegrp{$key}[0];
- }
- print<<END;
- </select>
- </td>
- </tr>
- </table>
- </div>
-
- <br><br><br>
-END
-
- &Header::closebox;
-
- $checked{"RULE_ACTION"} = ();
- foreach ("ACCEPT", "DROP", "REJECT") {
- $checked{"RULE_ACTION"}{$_} = "";
- }
-
- if($fwdfwsettings{'updatefwrule'} eq 'on') {
- $checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}} = "checked";
- } elsif ($fwdfwsettings{'POLICY'} eq 'MODE1') {
- $checked{"RULE_ACTION"}{"ACCEPT"} = "checked";
- } elsif ($fwdfwsettings{'POLICY'} eq 'MODE2') {
- $checked{"RULE_ACTION"}{"DROP"} = "checked";
- }
-
- print <<END;
- <hr><br>
-
- <center>
- <table width="80%" border="0">
- <tr>
- <td width="33%" align="center" bgcolor="$color{'color17'}">
- <br>
- </td>
- <td width="33%" align="center" bgcolor="$color{'color25'}">
- <br>
- </td>
- <td width="33%" align="center" bgcolor="$color{'color16'}">
- <br>
- </td>
- </tr>
- <tr>
- <td width="33%" align="center">
- <label>
- <input type="radio" name="RULE_ACTION" value="ACCEPT" $checked{"RULE_ACTION"}{"ACCEPT"}>
- <strong>$Lang::tr{'fwdfw ACCEPT'}</strong>
- </label>
- </td>
- <td width="33%" align="center">
- <label>
- <input type="radio" name="RULE_ACTION" value="DROP" $checked{"RULE_ACTION"}{"DROP"}>
- <strong>$Lang::tr{'fwdfw DROP'}</strong>
- </label>
- </td>
- <td width="33%" align="center">
- <label>
- <input type="radio" name="RULE_ACTION" value="REJECT" $checked{"RULE_ACTION"}{"REJECT"}>
- <strong>$Lang::tr{'fwdfw REJECT'}</strong>
- </label>
- </td>
- </tr>
- </table>
- </center>
-
- <br>
-END
-
- #---Activate/logging/remark-------------------------------------
- &Header::openbox('100%', 'left', $Lang::tr{'fwdfw additional'});
- print<<END;
- <table width='100%' border='0'>
-END
- print"<tr><td width='12%'>$Lang::tr{'remark'}:</td><td width='88%' align='left'><input type='text' name='ruleremark' maxlength='255' value='$fwdfwsettings{'ruleremark'}' style='width:99%;'></td></tr>";
- if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} eq 'on'){
- print "<tr><td width='12%'>$Lang::tr{'fwdfw rulepos'}:</td><td><select name='rulepos' >";
- for (my $count =1; $count <= $sum; $count++){
- print"<option value='$count' ";
- print"selected='selected'" if($fwdfwsettings{'oldrulenumber'} eq $count);
- print">$count</option>";
- }
- print"</select></td></tr>";
- }else{
- print "<tr><td width='12%'>$Lang::tr{'fwdfw rulepos'}:</td><td><input type='text' name='rulepos' size='2'></td></tr>";
- }
-
- print<<END;
- </table>
- <table width='100%'>
- <tr>
-END
-
- if ($fwdfwsettings{'updatefwrule'} eq 'on') {
- print <<END;
- <td>
- <input type='checkbox' name='ACTIVE' value="ON" $checked{'ACTIVE'}{'ON'}>
- </td>
- <td>$Lang::tr{'fwdfw rule activate'}</td>
-END
- } else {
- print <<END;
- <td colspan="2">
- <input type="hidden" name="ACTIVE" value="ON">
- </td>
-END
- }
-
- print <<END;
- </tr>
- <tr>
- <td>
- <input type='checkbox' name='LOG' value='ON' $checked{'LOG'}{'ON'}>
- </td>
- <td>$Lang::tr{'fwdfw log rule'}</td>
- </tr>
- <tr>
- <td width='1%'>
- <input type='checkbox' name='TIME' id="USE_TIME_CONSTRAINTS" value='ON' $checked{'TIME'}{'ON'}>
- </td>
- <td>$Lang::tr{'fwdfw timeframe'}</td>
- </tr>
- <tr id="TIME_CONSTRAINTS">
- <td colspan="2">
- <table width="66%" border="0">
- <tr>
- <td width="8em"> </td>
- <td align="center">$Lang::tr{'advproxy monday'}</td>
- <td align="center">$Lang::tr{'advproxy tuesday'}</td>
- <td align="center">$Lang::tr{'advproxy wednesday'}</td>
- <td align="center">$Lang::tr{'advproxy thursday'}</td>
- <td align="center">$Lang::tr{'advproxy friday'}</td>
- <td align="center">$Lang::tr{'advproxy saturday'}</td>
- <td align="center">$Lang::tr{'advproxy sunday'}</td>
- <td> </td>
- </tr>
- <tr>
- <td width="8em"> </td>
- <td align="center"><input type='checkbox' name='TIME_MON' value='on' $checked{'TIME_MON'}{'on'} ></td>
- <td align="center"><input type='checkbox' name='TIME_TUE' value='on' $checked{'TIME_TUE'}{'on'} ></td>
- <td align="center"><input type='checkbox' name='TIME_WED' value='on' $checked{'TIME_WED'}{'on'} ></td>
- <td align="center"><input type='checkbox' name='TIME_THU' value='on' $checked{'TIME_THU'}{'on'} ></td>
- <td align="center"><input type='checkbox' name='TIME_FRI' value='on' $checked{'TIME_FRI'}{'on'} ></td>
- <td align="center"><input type='checkbox' name='TIME_SAT' value='on' $checked{'TIME_SAT'}{'on'} ></td>
- <td align="center"><input type='checkbox' name='TIME_SUN' value='on' $checked{'TIME_SUN'}{'on'} ></td>
- <td>
- <select name='TIME_FROM'>
-END
- for (my $i=0;$i<=23;$i++) {
- $i = sprintf("%02s",$i);
- for (my $j=0;$j<=45;$j+=15) {
- $j = sprintf("%02s",$j);
- my $time = $i.":".$j;
- print "<option $selected{'TIME_FROM'}{$time}>$i:$j</option>\n";
- }
- }
- print<<END;
- </select> ‐
- <select name='TIME_TO'>
-END
- for (my $i=0;$i<=23;$i++) {
- $i = sprintf("%02s",$i);
- for (my $j=0;$j<=45;$j+=15) {
- $j = sprintf("%02s",$j);
- my $time = $i.":".$j;
- print "<option $selected{'TIME_TO'}{$time}>$i:$j</option>\n";
- }
- }
- print<<END;
- </select>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- <br><hr>
-END
-
- #---ACTION------------------------------------------------------
- if($fwdfwsettings{'updatefwrule'} ne 'on'){
- print<<END;
- <table border='0' width='100%'>
- <tr><td align='right'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' />
- <input type='hidden' name='config' value='$config' >
- <input type='hidden' name='ACTION' value='saverule' ></form>
- <form method='post' style='display:inline;'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='reset'></form></td></tr>
- </table>
- <br>
-END
- }else{
- print<<END;
- <table border='0' width='100%'>
- <tr><td align='right'><input type='submit' value='$Lang::tr{'fwdfw change'}' style='min-width:100px;' /><input type='hidden' name='updatefwrule' value='$fwdfwsettings{'updatefwrule'}'><input type='hidden' name='key' value='$fwdfwsettings{'key'}'>
- <input type='hidden' name='oldgrp1a' value='$fwdfwsettings{'oldgrp1a'}' />
- <input type='hidden' name='oldgrp1b' value='$fwdfwsettings{'oldgrp1b'}' />
- <input type='hidden' name='oldgrp2a' value='$fwdfwsettings{'oldgrp2a'}' />
- <input type='hidden' name='oldgrp2b' value='$fwdfwsettings{'oldgrp2b'}' />
- <input type='hidden' name='oldgrp3a' value='$fwdfwsettings{'oldgrp3a'}' />
- <input type='hidden' name='oldgrp3b' value='$fwdfwsettings{'oldgrp3b'}' />
- <input type='hidden' name='oldusesrv' value='$fwdfwsettings{'oldusesrv'}' />
- <input type='hidden' name='oldrulenumber' value='$fwdfwsettings{'oldrulenumber'}' />
- <input type='hidden' name='rulenumber' value='$fwdfwsettings{'rulepos'}' />
- <input type='hidden' name='oldruleremark' value='$fwdfwsettings{'oldruleremark'}' />
- <input type='hidden' name='oldorange' value='$fwdfwsettings{'oldorange'}' />
- <input type='hidden' name='oldnat' value='$fwdfwsettings{'oldnat'}' />
- <input type='hidden' name='oldruletype' value='$fwdfwsettings{'oldruletype'}' />
- <input type='hidden' name='ACTION' value='saverule' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value'reset'></td></td>
- </table></form>
-END
- }
- &Header::closebox();
-}
-sub pos_up
-{
- my %uphash=();
- my %tmp=();
- &General::readhasharray($fwdfwsettings{'config'}, \%uphash);
- foreach my $key (sort keys %uphash){
- if ($key eq $fwdfwsettings{'key'}) {
- my $last = $key -1;
- if (exists $uphash{$last}){
- #save rule last
- foreach my $y (0 .. $#{$uphash{$last}}) {
- $tmp{0}[$y] = $uphash{$last}[$y];
- }
- #copy active rule to last
- foreach my $i (0 .. $#{$uphash{$last}}) {
- $uphash{$last}[$i] = $uphash{$key}[$i];
- }
- #copy saved rule to actual position
- foreach my $x (0 .. $#{$tmp{0}}) {
- $uphash{$key}[$x] = $tmp{0}[$x];
- }
- }
- }
- }
- &General::writehasharray($fwdfwsettings{'config'}, \%uphash);
- &General::firewall_config_changed();
-}
-sub pos_down
-{
- my %downhash=();
- my %tmp=();
- &General::readhasharray($fwdfwsettings{'config'}, \%downhash);
- foreach my $key (sort keys %downhash){
- if ($key eq $fwdfwsettings{'key'}) {
- my $next = $key + 1;
- if (exists $downhash{$next}){
- #save rule next
- foreach my $y (0 .. $#{$downhash{$next}}) {
- $tmp{0}[$y] = $downhash{$next}[$y];
- }
- #copy active rule to next
- foreach my $i (0 .. $#{$downhash{$next}}) {
- $downhash{$next}[$i] = $downhash{$key}[$i];
- }
- #copy saved rule to actual position
- foreach my $x (0 .. $#{$tmp{0}}) {
- $downhash{$key}[$x] = $tmp{0}[$x];
- }
- }
- }
- }
- &General::writehasharray($fwdfwsettings{'config'}, \%downhash);
- &General::firewall_config_changed();
-}
-sub saverule
-{
- my $hash=shift;
- my $config=shift;
- &General::readhasharray("$config", $hash);
- if (!$errormessage){
- ################################################################
- #check if we change an INPUT rule to a OUTGOING
- if($fwdfwsettings{'oldruletype'} eq 'INPUTFW' && $fwdfwsettings{'chain'} eq 'OUTGOINGFW' ){
- &changerule($configinput);
- #print"1";
- }
- #check if we change an INPUT rule to a FORWARD
- elsif($fwdfwsettings{'oldruletype'} eq 'INPUTFW' && $fwdfwsettings{'chain'} eq 'FORWARDFW' ){
- &changerule($configinput);
- #print"2";
- }
- ################################################################
- #check if we change an OUTGOING rule to an INPUT
- elsif($fwdfwsettings{'oldruletype'} eq 'OUTGOINGFW' && $fwdfwsettings{'chain'} eq 'INPUTFW' ){
- &changerule($configoutgoing);
- #print"3";
- }
- #check if we change an OUTGOING rule to a FORWARD
- elsif($fwdfwsettings{'oldruletype'} eq 'OUTGOINGFW' && $fwdfwsettings{'chain'} eq 'FORWARDFW' ){
- &changerule($configoutgoing);
- #print"4";
- }
- ################################################################
- #check if we change a FORWARD rule to an INPUT
- elsif($fwdfwsettings{'oldruletype'} eq 'FORWARDFW' && $fwdfwsettings{'chain'} eq 'INPUTFW'){
- &changerule($configfwdfw);
- #print"5";
- }
- #check if we change a FORWARD rule to an OUTGOING
- elsif($fwdfwsettings{'oldruletype'} eq 'FORWARDFW' && $fwdfwsettings{'chain'} eq 'OUTGOINGFW'){
- &changerule($configfwdfw);
- #print"6";
- }
- if ($fwdfwsettings{'updatefwrule'} ne 'on'){
- my $key = &General::findhasharraykey ($hash);
- $$hash{$key}[0] = $fwdfwsettings{'RULE_ACTION'};
- $$hash{$key}[1] = $fwdfwsettings{'chain'};
- $$hash{$key}[2] = $fwdfwsettings{'ACTIVE'};
- $$hash{$key}[3] = $fwdfwsettings{'grp1'};
- $$hash{$key}[4] = $fwdfwsettings{$fwdfwsettings{'grp1'}};
- $$hash{$key}[5] = $fwdfwsettings{'grp2'};
- $$hash{$key}[6] = $fwdfwsettings{$fwdfwsettings{'grp2'}};
- $$hash{$key}[7] = $fwdfwsettings{'USE_SRC_PORT'};
- $$hash{$key}[8] = $fwdfwsettings{'PROT'};
- $$hash{$key}[9] = $fwdfwsettings{'ICMP_TYPES'};
- $$hash{$key}[10] = $fwdfwsettings{'SRC_PORT'};
- $$hash{$key}[11] = $fwdfwsettings{'USESRV'};
- $$hash{$key}[12] = $fwdfwsettings{'TGT_PROT'};
- $$hash{$key}[13] = $fwdfwsettings{'ICMP_TGT'};
- $$hash{$key}[14] = $fwdfwsettings{'grp3'};
- $$hash{$key}[15] = $fwdfwsettings{$fwdfwsettings{'grp3'}};
- $$hash{$key}[16] = $fwdfwsettings{'ruleremark'};
- $$hash{$key}[17] = $fwdfwsettings{'LOG'};
- $$hash{$key}[18] = $fwdfwsettings{'TIME'};
- $$hash{$key}[19] = $fwdfwsettings{'TIME_MON'};
- $$hash{$key}[20] = $fwdfwsettings{'TIME_TUE'};
- $$hash{$key}[21] = $fwdfwsettings{'TIME_WED'};
- $$hash{$key}[22] = $fwdfwsettings{'TIME_THU'};
- $$hash{$key}[23] = $fwdfwsettings{'TIME_FRI'};
- $$hash{$key}[24] = $fwdfwsettings{'TIME_SAT'};
- $$hash{$key}[25] = $fwdfwsettings{'TIME_SUN'};
- $$hash{$key}[26] = $fwdfwsettings{'TIME_FROM'};
- $$hash{$key}[27] = $fwdfwsettings{'TIME_TO'};
- $$hash{$key}[28] = $fwdfwsettings{'USE_NAT'};
- $$hash{$key}[29] = $fwdfwsettings{$fwdfwsettings{'nat'}};
- $$hash{$key}[30] = $fwdfwsettings{'dnatport'};
- $$hash{$key}[31] = $fwdfwsettings{'nat'};
- &General::writehasharray("$config", $hash);
- }else{
- foreach my $key (sort {$a <=> $b} keys %$hash){
- if($key eq $fwdfwsettings{'key'}){
- $$hash{$key}[0] = $fwdfwsettings{'RULE_ACTION'};
- $$hash{$key}[1] = $fwdfwsettings{'chain'};
- $$hash{$key}[2] = $fwdfwsettings{'ACTIVE'};
- $$hash{$key}[3] = $fwdfwsettings{'grp1'};
- $$hash{$key}[4] = $fwdfwsettings{$fwdfwsettings{'grp1'}};
- $$hash{$key}[5] = $fwdfwsettings{'grp2'};
- $$hash{$key}[6] = $fwdfwsettings{$fwdfwsettings{'grp2'}};
- $$hash{$key}[7] = $fwdfwsettings{'USE_SRC_PORT'};
- $$hash{$key}[8] = $fwdfwsettings{'PROT'};
- $$hash{$key}[9] = $fwdfwsettings{'ICMP_TYPES'};
- $$hash{$key}[10] = $fwdfwsettings{'SRC_PORT'};
- $$hash{$key}[11] = $fwdfwsettings{'USESRV'};
- $$hash{$key}[12] = $fwdfwsettings{'TGT_PROT'};
- $$hash{$key}[13] = $fwdfwsettings{'ICMP_TGT'};
- $$hash{$key}[14] = $fwdfwsettings{'grp3'};
- $$hash{$key}[15] = $fwdfwsettings{$fwdfwsettings{'grp3'}};
- $$hash{$key}[16] = $fwdfwsettings{'ruleremark'};
- $$hash{$key}[17] = $fwdfwsettings{'LOG'};
- $$hash{$key}[18] = $fwdfwsettings{'TIME'};
- $$hash{$key}[19] = $fwdfwsettings{'TIME_MON'};
- $$hash{$key}[20] = $fwdfwsettings{'TIME_TUE'};
- $$hash{$key}[21] = $fwdfwsettings{'TIME_WED'};
- $$hash{$key}[22] = $fwdfwsettings{'TIME_THU'};
- $$hash{$key}[23] = $fwdfwsettings{'TIME_FRI'};
- $$hash{$key}[24] = $fwdfwsettings{'TIME_SAT'};
- $$hash{$key}[25] = $fwdfwsettings{'TIME_SUN'};
- $$hash{$key}[26] = $fwdfwsettings{'TIME_FROM'};
- $$hash{$key}[27] = $fwdfwsettings{'TIME_TO'};
- $$hash{$key}[28] = $fwdfwsettings{'USE_NAT'};
- $$hash{$key}[29] = $fwdfwsettings{$fwdfwsettings{'nat'}};
- $$hash{$key}[30] = $fwdfwsettings{'dnatport'};
- $$hash{$key}[31] = $fwdfwsettings{'nat'};
- last;
- }
- }
- }
- &General::writehasharray("$config", $hash);
- if($fwdfwsettings{'oldrulenumber'} > $fwdfwsettings{'rulepos'}){
- my %tmp=();
- my $val=$fwdfwsettings{'oldrulenumber'}-$fwdfwsettings{'rulepos'};
- for (my $z=0;$z<$val;$z++){
- foreach my $key (sort {$a <=> $b} keys %$hash){
- if ($key eq $fwdfwsettings{'oldrulenumber'}) {
- my $last = $key -1;
- if (exists $$hash{$last}){
- #save rule last
- foreach my $y (0 .. $#{$$hash{$last}}) {
- $tmp{0}[$y] = $$hash{$last}[$y];
- }
- #copy active rule to last
- foreach my $i (0 .. $#{$$hash{$last}}) {
- $$hash{$last}[$i] = $$hash{$key}[$i];
- }
- #copy saved rule to actual position
- foreach my $x (0 .. $#{$tmp{0}}) {
- $$hash{$key}[$x] = $tmp{0}[$x];
- }
- }
- }
- }
- $fwdfwsettings{'oldrulenumber'}--;
- }
- &General::writehasharray("$config", $hash);
- &General::firewall_config_changed();
- }elsif($fwdfwsettings{'rulepos'} > $fwdfwsettings{'oldrulenumber'}){
- my %tmp=();
- my $val=$fwdfwsettings{'rulepos'}-$fwdfwsettings{'oldrulenumber'};
- for (my $z=0;$z<$val;$z++){
- foreach my $key (sort {$a <=> $b} keys %$hash){
- if ($key eq $fwdfwsettings{'oldrulenumber'}) {
- my $next = $key + 1;
- if (exists $$hash{$next}){
- #save rule next
- foreach my $y (0 .. $#{$$hash{$next}}) {
- $tmp{0}[$y] = $$hash{$next}[$y];
- }
- #copy active rule to next
- foreach my $i (0 .. $#{$$hash{$next}}) {
- $$hash{$next}[$i] = $$hash{$key}[$i];
- }
- #copy saved rule to actual position
- foreach my $x (0 .. $#{$tmp{0}}) {
- $$hash{$key}[$x] = $tmp{0}[$x];
- }
- }
- }
- }
- $fwdfwsettings{'oldrulenumber'}++;
- }
- &General::writehasharray("$config", $hash);
- &General::firewall_config_changed();
- }
- }
-}
-sub validremark
-{
- # Checks a hostname against RFC1035
- my $remark = $_[0];
-
- # Each part should be at least two characters in length
- # but no more than 63 characters
- if (length ($remark) < 1 || length ($remark) > 255) {
- return 0;}
- # Only valid characters are a-z, A-Z, 0-9 and -
- if ($remark !~ /^[a-zäöüA-ZÖÄÜ0-9-.:;\|_()\/\s]*$/) {
- return 0;}
- # First character can only be a letter or a digit
- if (substr ($remark, 0, 1) !~ /^[a-zäöüA-ZÖÄÜ0-9]*$/) {
- return 0;}
- # Last character can only be a letter or a digit
- if (substr ($remark, -1, 1) !~ /^[a-zöäüA-ZÖÄÜ0-9.:;_)]*$/) {
- return 0;}
- return 1;
-}
-sub viewtablerule
-{
- &General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
- &viewtablenew(\%configfwdfw,$configfwdfw,"","Forward" );
- &viewtablenew(\%configinputfw,$configinput,"",$Lang::tr{'fwdfw xt access'} );
- &viewtablenew(\%configoutgoingfw,$configoutgoing,"","Outgoing" );
-}
-sub viewtablenew
-{
- my $hash=shift;
- my $config=shift;
- my $title=shift;
- my $title1=shift;
- my $go='';
- &General::get_aliases(\%aliases);
- &General::readhasharray("$confighost", \%customhost);
- &General::readhasharray("$config", $hash);
- &General::readhasharray("$configccdnet", \%ccdnet);
- &General::readhasharray("$configccdhost", \%ccdhost);
- if( ! -z $config){
- &Header::openbox('100%', 'left',$title);
- my $count=0;
- my ($gif,$log);
- my $ruletype;
- my $rulecolor;
- my $tooltip;
- my @tmpsrc=();
- my $coloryellow='';
- print <<END;
- <b>$title1</b>
- <br>
-
- <table width='100%' cellspacing='0' border='0'>
- <tr>
- <th align='right' width='3%'>
- #
- </th>
- <th width='2%'></th>
- <th align='center'>
- <b>$Lang::tr{'protocol'}</b>
- </th>
- <th align='center' width='30%'>
- <b>$Lang::tr{'fwdfw source'}</b>
- </th>
- <th align='center'>
- Log <!-- XXX UNTRANSLATED STRING -->
- </th>
- <th align='center' width='30%'>
- <b>$Lang::tr{'fwdfw target'}</b>
- </th>
- <th align='center' colspan='6' width='18%'>
- <b>$Lang::tr{'fwdfw action'}</b>
- </th>
- </tr>
-END
-
- foreach my $key (sort {$a <=> $b} keys %$hash){
- $tdcolor='';
- @tmpsrc=();
- #check if vpn hosts/nets have been deleted
- if($$hash{$key}[3] =~ /ipsec/i || $$hash{$key}[3] =~ /ovpn/i){
- push (@tmpsrc,$$hash{$key}[4]);
- }
- if($$hash{$key}[5] =~ /ipsec/i || $$hash{$key}[5] =~ /ovpn/i){
- push (@tmpsrc,$$hash{$key}[6]);
- }
- foreach my $host (@tmpsrc){
- if($$hash{$key}[3] eq 'ipsec_net_src' || $$hash{$key}[5] eq 'ipsec_net_tgt'){
- if(&fwlib::get_ipsec_net_ip($host,11) eq ''){
- $coloryellow='on';
- &disable_rule($key);
- $$hash{$key}[2]='';
- }
- }elsif($$hash{$key}[3] eq 'ovpn_net_src' || $$hash{$key}[5] eq 'ovpn_net_tgt'){
- if(&fwlib::get_ovpn_net_ip($host,1) eq ''){
- $coloryellow='on';
- &disable_rule($key);
- $$hash{$key}[2]='';
- }
- }elsif($$hash{$key}[3] eq 'ovpn_n2n_src' || $$hash{$key}[5] eq 'ovpn_n2n_tgt'){
- if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){
- $coloryellow='on';
- &disable_rule($key);
- $$hash{$key}[2]='';
- }
- }elsif($$hash{$key}[3] eq 'ovpn_host_src' || $$hash{$key}[5] eq 'ovpn_host_tgt'){
- if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
- $coloryellow='on';
- &disable_rule($key);
- $$hash{$key}[2]='';
- }
- }
- }
- $$hash{'ACTIVE'}=$$hash{$key}[2];
- $count++;
- if($coloryellow eq 'on'){
- print"<tr bgcolor='$color{'color14'}' >";
- $coloryellow='';
- }elsif($coloryellow eq ''){
- if ($count % 2){
- $color="$color{'color22'}";
- }
- else{
- $color="$color{'color20'}";
- }
- }
- print<<END;
- <tr bgcolor='$color'>
- <td align='right' width='3%'>
- <b>$key </b>
- </td>
-END
-
- #RULETYPE (A,R,D)
- if ($$hash{$key}[0] eq 'ACCEPT'){
- $ruletype='A';
- $tooltip='ACCEPT';
- $rulecolor=$color{'color17'};
- }elsif($$hash{$key}[0] eq 'DROP'){
- $ruletype='D';
- $tooltip='DROP';
- $rulecolor=$color{'color25'};
- }elsif($$hash{$key}[0] eq 'REJECT'){
- $ruletype='R';
- $tooltip='REJECT';
- $rulecolor=$color{'color16'};
- }
-
- print <<END;
- <td bgcolor='$rulecolor' align='center' width='2%'>
- <span title='$tooltip'> </span>
- </td>
-END
-
- #Get Protocol
- my $prot;
- if ($$hash{$key}[8]){
- push (@protocols,$$hash{$key}[8]);
- }elsif($$hash{$key}[14] eq 'cust_srv'){
- &get_serviceports("service",$$hash{$key}[15]);
- }elsif($$hash{$key}[14] eq 'cust_srvgrp'){
- &get_serviceports("group",$$hash{$key}[15]);
- }else{
- push (@protocols,$Lang::tr{'all'});
- }
-
- my $protz=join(",",@protocols);
- if($protz eq 'ICMP' && $$hash{$key}[9] ne 'All ICMP-Types' && $$hash{$key}[14] ne 'cust_srvgrp'){
- &General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
- foreach my $keyicmp (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) }keys %icmptypes){
- if($$hash{$key}[9] eq "$icmptypes{$keyicmp}[0]"){
- print "<td align='center'><span title='$icmptypes{$keyicmp}[0]'><b>$protz ($icmptypes{$keyicmp}[1])</b></span></td>";
- last;
- }
- }
- }else{
- print"<td align='center'>$protz</td>";
- }
- @protocols=();
- #SOURCE
- my $ipfireiface;
- &getcolor($$hash{$key}[3],$$hash{$key}[4],\%customhost);
- print"<td align='center' width='160' $tdcolor>";
- if ($$hash{$key}[3] eq 'ipfire_src'){
- $ipfireiface='Interface ';
- }
- if ($$hash{$key}[3] eq 'std_net_src'){
- print &get_name($$hash{$key}[4]);
- }elsif ($$hash{$key}[3] eq 'src_addr'){
- my ($split1,$split2) = split("/",$$hash{$key}[4]);
- if ($split2 eq '32'){
- print $split1;
- }else{
- print $$hash{$key}[4];
- }
- }elsif ($$hash{$key}[4] eq 'RED1'){
- print "$ipfireiface $Lang::tr{'fwdfw red'}";
- }else{
- print "$$hash{$key}[4]";
- }
- $tdcolor='';
- #SOURCEPORT
- &getsrcport(\%$hash,$key);
- #Is this a SNAT rule?
- if ($$hash{$key}[31] eq 'snat' && $$hash{$key}[28] eq 'ON'){
- my $net=&get_name($$hash{$key}[29]);
- if ( ! $net){ $net=$$hash{$key}[29];}
- print"<br>->$net";
- if ($$hash{$key}[30] ne ''){
- print": $$hash{$key}[30]";
- }
- }
- if ($$hash{$key}[17] eq 'ON'){
- $log="/images/on.gif";
- }else{
- $log="/images/off.gif";
- }
- #LOGGING
- print<<END;
- </td>
- <td align='center'>
- <form method='POST' action=''>
- <input type='image' img src='$log' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw togglelog'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;'/>
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='$Lang::tr{'fwdfw togglelog'}' />
- </form>
- </td>
-END
- #TARGET
- &getcolor($$hash{$key}[5],$$hash{$key}[6],\%customhost);
- print<<END;
- <td align='center' $tdcolor>
-END
- #Is this a DNAT rule?
- if ($$hash{$key}[31] eq 'dnat' && $$hash{$key}[28] eq 'ON'){
- print "Firewall ($$hash{$key}[29])";
- if($$hash{$key}[30] ne ''){
- $$hash{$key}[30]=~ tr/|/,/;
- print": $$hash{$key}[30]";
- }
- print"<br>->";
- }
- if ($$hash{$key}[5] eq 'ipfire'){
- $ipfireiface='Interface';
- }
- if ($$hash{$key}[5] eq 'std_net_tgt' || $$hash{$key}[5] eq 'ipfire' || $$hash{$key}[6] eq 'RED1' || $$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE' ){
- if ($$hash{$key}[6] eq 'RED1'){
- print "$ipfireiface $Lang::tr{'red1'}";
- }elsif ($$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE'|| $$hash{$key}[6] eq 'ALL')
- {
- print "$ipfireiface ".&get_name($$hash{$key}[6]);
- }else{
- print $$hash{$key}[6];
- }
- }elsif ($$hash{$key}[5] eq 'tgt_addr'){
- my ($split1,$split2) = split("/",$$hash{$key}[6]);
- if ($split2 eq '32'){
- print $split1;
- }else{
- print $$hash{$key}[6];
- }
- }else{
- print "$$hash{$key}[6]";
- }
- $tdcolor='';
- #TARGETPORT
- &gettgtport(\%$hash,$key);
- print"</td>";
- #RULE ACTIVE
- if($$hash{$key}[2] eq 'ON'){
- $gif="/images/on.gif"
-
- }else{
- $gif="/images/off.gif"
- }
- print<<END;
- <td width='3%' align='center'>
- <form method='POST' action=''>
- <input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='$Lang::tr{'fwdfw toggle'}' />
- </form>
- </td>
- <td width='3%' align='center'>
- <form method='POST' action=''>
- <input type='image' img src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'fwdfw edit'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='editrule' />
- </form>
- </td>
- <td width='3%' align='center'>
- <form method='POST' action=''>
- <input type='image' img src='/images/addblue.gif' alt='$Lang::tr{'fwdfw copy'}' title='$Lang::tr{'fwdfw copy'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='copyrule' />
- </form>
- </td>
- <td width='3%' align='center'>
- <form method='POST' action=''>
- <input type='image' img src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'fwdfw delete'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='deleterule' />
- </form>
- </td>
-END
- if (exists $$hash{$key-1}){
- print<<END;
- <td width='3%' align='center'>
- <form method='POST' action=''>
- <input type='image' img src='/images/up.gif' alt='$Lang::tr{'fwdfw moveup'}' title='$Lang::tr{'fwdfw moveup'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='moveup' />
- </form>
- </td>
-END
- }else{
- print"<td width='3%'></td>";
- }
-
- if (exists $$hash{$key+1}){
- print<<END;
- <td width='3%' align='center'>
- <form method='POST' action=''>
- <input type='image' img src='/images/down.gif' alt='$Lang::tr{'fwdfw movedown'}' title='$Lang::tr{'fwdfw movedown'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='movedown' />
- </form>
- </td>
- </tr>
-END
- }else{
- print"<td width='3%'></td></tr>";
- }
- #REMARK
- if ($optionsfw{'SHOWREMARK'} eq 'on' && $$hash{$key}[16] ne ''){
- print <<END;
- <tr bgcolor='$color'>
- <td> </td>
- <td bgcolor='$rulecolor'></td>
- <td colspan='10'>
- <em>$$hash{$key}[16]</em>
- </td>
- </tr>
-END
- }
-
- if ($$hash{$key}[18] eq 'ON'){
- #TIMEFRAME
- if ($$hash{$key}[18] eq 'ON'){
- my @days=();
- if($$hash{$key}[19] ne ''){push (@days,$Lang::tr{'fwdfw wd_mon'});}
- if($$hash{$key}[20] ne ''){push (@days,$Lang::tr{'fwdfw wd_tue'});}
- if($$hash{$key}[21] ne ''){push (@days,$Lang::tr{'fwdfw wd_wed'});}
- if($$hash{$key}[22] ne ''){push (@days,$Lang::tr{'fwdfw wd_thu'});}
- if($$hash{$key}[23] ne ''){push (@days,$Lang::tr{'fwdfw wd_fri'});}
- if($$hash{$key}[24] ne ''){push (@days,$Lang::tr{'fwdfw wd_sat'});}
- if($$hash{$key}[25] ne ''){push (@days,$Lang::tr{'fwdfw wd_sun'});}
- my $weekdays=join(",",@days);
- if (@days){
- print"<tr bgcolor='$color'>";
- print"<td> </td><td bgcolor='$rulecolor'></td><td align='left' colspan='10'> $weekdays $$hash{$key}[26] - $$hash{$key}[27]</td></tr>";
- }
- }
- }
- print"<tr bgcolor='FFFFFF'><td colspan='13' height='1'></td></tr>";
- }
- print"</table>";
- #SHOW FINAL RULE
- print "<table width='100%'rules='cols' border='1'>";
- my $col;
- if ($config eq '/var/ipfire/forward/config'){
- my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
- if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
- $col="bgcolor='darkred'";
- }else{
- $col="bgcolor='green'";
- }
- &show_defaultrules($col,$pol);
- }elsif ($config eq '/var/ipfire/forward/outgoing'){
- if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
- $col="bgcolor='darkred'";
- print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol block'}</font></td></tr>";
- }else{
- $col="bgcolor='green'";
- print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
- }
- }else{
- print"<tr><td bgcolor='darkred' width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td bgcolor='darkred' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
- }
- print"</table>";
- print "<hr>";
- print "<br><br>";
- &Header::closebox();
- }else{
- if ($optionsfw{'SHOWTABLES'} eq 'on'){
- print "<b>$title1</b><br>";
- print"<table width='100%' border='0' rules='none'><tr><td height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td></tr></table>";
- my $col;
- if ($config eq '/var/ipfire/forward/config'){
- my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
- if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
- $col="bgcolor='darkred'";
- }else{
- $col="bgcolor='green'";
- }
- &show_defaultrules($col,$pol);
- }elsif ($config eq '/var/ipfire/forward/outgoing'){
- print "<table width='100%' rules='cols' border='1'>";
- my $pol='fwdfw '.$fwdfwsettings{'POLICY1'};
- if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
- $col="bgcolor='darkred'";
- print"<tr><td $col align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
- }else{
- $col="bgcolor='green'";
- print"<tr><td $col align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
- }
- }else{
- print "<table width='100%' rules='cols' border='1'>";
- print"<tr><td bgcolor='darkred' align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td align='center' bgcolor='darkred'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
- }
- print"</table><br><br>";
- }
- }
-}
-&Header::closebigbox();
-&Header::closepage();
-
-sub show_defaultrules
-{
- my $col=shift;
- my $pol=shift;
- #STANDARD RULES (From WIKI)
- print"</table>";
- if ($col eq "bgcolor='green'"){
- print "<br><table width='100%' rules='cols' border='1' >";
- my $blue = "<font color=$Header::colourblue> $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol block'})" if (&Header::blue_used());
- my $orange = "<font color=$Header::colourorange> $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol block'})" if (&Header::orange_used());
- my $blue1 = "<font color=$Header::colourblue> $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol allow'})" if (&Header::blue_used());
- my $orange1 = "<font color=$Header::colourorange> $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol allow'})" if (&Header::orange_used());
- print"<tr><td align='center'><font color='#000000'>$Lang::tr{'green'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td>";
- print"<td align='center'>$orange1</td>" if (&Header::orange_used());
- print"<td align='center'>$blue1</td>" if (&Header::blue_used());
- print"</tr>";
- if (&Header::orange_used()){
- print"<tr><td align='center' width='20%'><font color='#000000'>$Lang::tr{'orange'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td><td align='center'><font color=$Header::colourgreen> $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td>";
- print"<td align='center'>$blue</td>" if (&Header::blue_used());
- print"</tr>";
- }
- if (&Header::blue_used()){
- print"<tr><td align='center'><font color='#000000'>$Lang::tr{'blue'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td>";
- print"<td align='center'>$orange</td>" if (&Header::orange_used());
- print"<td align='center'><font color=$Header::colourgreen> $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td>";
- print"</tr>";
- }
- print"<tr><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'} </font></td><td $col colspan='3' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
- }elsif($col eq "bgcolor='darkred'"){
- print "<table width='100%' rules='cols' border='1' >";
- print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
- }
-}
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 03ef367..e37540b 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -341,7 +341,7 @@ END
} else { print $Lang::tr{'advproxy off'}; }
}
if ( $netsettings{'ORANGE_DEV'} ) { print <<END;
- <tr><td align='center' bgcolor='$Header::colourorange' width='25%'><a href="/cgi-bin/forwardfw.cgi"><font size='2' color='white'><b>$Lang::tr{'dmz'}</b></font></a><br>
+ <tr><td align='center' bgcolor='$Header::colourorange' width='25%'><a href="/cgi-bin/firewall.cgi"><font size='2' color='white'><b>$Lang::tr{'dmz'}</b></font></a><br>
<td width='30%' align='center'>$netsettings{'ORANGE_ADDRESS'}
<td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
END
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 1da42d53f71991f27603b220e33ac49368410949
by git＠ipfire.org 22 Oct '13
by git＠ipfire.org 22 Oct '13
22 Oct '13
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, fifteen has been updated
via 1da42d53f71991f27603b220e33ac49368410949 (commit)
via 4e6ae999c6740a38876fdbf3b2bd6f4f51d23051 (commit)
via 989d0fd7172efa96382a10cb1ee16e608355af29 (commit)
via 4a75efa5a79a81a9f459e9dc113e474cd2e53df6 (commit)
via 2d5447bb1b9eed087c1f18a25c15e9370e62408e (commit)
via 0e43079789de38841b822b591dbff3be8cd37228 (commit)
via 0eadfdad4a4031c28f5811b4b80ceba8865b17a0 (commit)
via 6bcb5ffe56238dc7e4107f3deba8d1b943253250 (commit)
via 93e0855b6f0fbf51bf2ae8a59b74cf713d4e970e (commit)
via 85d6e8a91011d06cf0a913b7c204e522e6a62c77 (commit)
via d8d7dd3bd8aa6b849dd191588e63947aa4444007 (commit)
via ba338177a02f6c95f938c76b886a970ebd977456 (commit)
via d50ef220b67c53688eaf1cc08ff8cd7f4fc4bbf5 (commit)
via 0c7d0c0883fd0fd6ab45fe1657074f9a8d99b562 (commit)
via f18c38312cb4156858fad253f84d66cfe01811da (commit)
via c9493d6c4f307954c7280f5d31c46d6e352b2893 (commit)
via 8777989d464a11f6f538ec22c2463d0c9c18c7ad (commit)
via 86a921ee47cc1bd24ff01139b4867dc577c3e564 (commit)
via fda8c915d66a8cabe813cc05afc1f2d560e74fab (commit)
via 79bb8c75f29a5321692ae0f02b7b2ca3cbe2d94c (commit)
via 769185b58ec52fcc9eaedab5df42b1b25057d0c7 (commit)
via a1e89f481d13a59a38854a3921f3c0d85a26f4dd (commit)
via ec6fd189ee94eb5fb8f969ff71b9ffae9e13a37c (commit)
via a5cb9aca7838837e41f34b5d29c3584f708444f0 (commit)
via bfc84eb1537ff5f495da2e540d9a62867a05ae0c (commit)
from 278280da9606d394ec7c39127ffadc26a5a3d3d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1da42d53f71991f27603b220e33ac49368410949
Merge: 278280d 4e6ae99
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 22 21:10:25 2013 +0200
Merge branch 'firewall-fifteen' into fifteen
commit 4e6ae999c6740a38876fdbf3b2bd6f4f51d23051
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 22 21:09:01 2013 +0200
firewall: Add proper descriptions/translations for NAT.
commit 989d0fd7172efa96382a10cb1ee16e608355af29
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 22 20:21:33 2013 +0200
firewall: Straighten the format of the rule table.
Lots of markup and code cleanup.
commit 4a75efa5a79a81a9f459e9dc113e474cd2e53df6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 22 19:08:35 2013 +0200
p2p-block.cgi: Fix coding style.
commit 2d5447bb1b9eed087c1f18a25c15e9370e62408e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 22 18:58:15 2013 +0200
P2P block: Fix strings.
commit 0e43079789de38841b822b591dbff3be8cd37228
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 22 18:53:48 2013 +0200
firewall: Cleanup rules reloading.
This has been messed up a lot because there were multiple
files which indicated that a reload is needed; shell commands
were used to create and remove the indicator file; some
functions were duplicated.
commit 0eadfdad4a4031c28f5811b4b80ceba8865b17a0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 22 17:39:56 2013 +0200
firewall: Predefine value for checkboxes.
It turns out, that this is not good style, but as the
rest of the CGI depends on it, we need to stick with
this.
commit 6bcb5ffe56238dc7e4107f3deba8d1b943253250
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 22 17:23:23 2013 +0200
firewall: Move NAT port field to the protocol section.
commit 93e0855b6f0fbf51bf2ae8a59b74cf713d4e970e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 22 16:59:16 2013 +0200
firewall: Fix collapsing the NAT menu.
Also removing a lot of redundant HTML code and invalid
attributes.
commit 85d6e8a91011d06cf0a913b7c204e522e6a62c77
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 22 16:44:43 2013 +0200
firewall: Update the re-read button.
Change to a more meaningful description and remove the
big green box.
commit d8d7dd3bd8aa6b849dd191588e63947aa4444007
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 17 17:58:45 2013 +0200
firewall: Don't show rule activation checkbox when creating a rule.
Almost certainly, the user wants the new rule to be active when
it is created. We should put as few input elements as possible
on the rule creation page.
commit ba338177a02f6c95f938c76b886a970ebd977456
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 17 17:39:43 2013 +0200
Update translations.
commit d50ef220b67c53688eaf1cc08ff8cd7f4fc4bbf5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 17 17:39:12 2013 +0200
firewall: Fix invalid HTML syntax.
commit 0c7d0c0883fd0fd6ab45fe1657074f9a8d99b562
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 17 17:33:46 2013 +0200
firewall: Simplify rule action selection.
Instead of two clicks, this is now changable with only
one click. The color coding should make the decision easier
and warn to not make unwanted configurations.
commit f18c38312cb4156858fad253f84d66cfe01811da
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 17 16:49:07 2013 +0200
firewall: Make time constraints selection collapsable.
commit c9493d6c4f307954c7280f5d31c46d6e352b2893
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Thu Oct 17 14:27:41 2013 +0200
Firewall: Language changes, JQuery code cleanup
commit 8777989d464a11f6f538ec22c2463d0c9c18c7ad
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Thu Oct 17 12:10:34 2013 +0200
Firewall: some languagefile changes
commit 86a921ee47cc1bd24ff01139b4867dc577c3e564
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Thu Oct 17 11:27:48 2013 +0200
Firewall: Some changes in Strings and languagefiles
commit fda8c915d66a8cabe813cc05afc1f2d560e74fab
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Wed Oct 16 14:55:20 2013 +0200
Firewall: Fixed JQuery code for fwhosts. This is BETA2 base
commit 79bb8c75f29a5321692ae0f02b7b2ca3cbe2d94c
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Wed Oct 16 14:27:08 2013 +0200
Firewall: completed michaels JQuery code and some language changes. This is BETA2-base
commit 769185b58ec52fcc9eaedab5df42b1b25057d0c7
Merge: a1e89f4 b64c3fc
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Wed Oct 16 14:22:38 2013 +0200
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
commit a1e89f481d13a59a38854a3921f3c0d85a26f4dd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 15 21:06:32 2013 +0200
firewall: Simplify protocol selection.
Plausibility checks and removed checkboxed need to be made
functional again. Also proper styling is missing.
commit ec6fd189ee94eb5fb8f969ff71b9ffae9e13a37c
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Tue Oct 15 15:45:51 2013 +0200
Firewall: Jquery with errors for michael...
commit a5cb9aca7838837e41f34b5d29c3584f708444f0
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Tue Oct 15 12:05:13 2013 +0200
Firewall: Try to clean up JS code part 1
commit bfc84eb1537ff5f495da2e540d9a62867a05ae0c
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Wed Oct 9 16:20:54 2013 +0200
Firewall: added JavaScript for services (hide icmp-types when no ICMP selected)
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/general-functions.pl | 19 +
config/forwardfw/rules.pl | 52 +--
doc/language_issues.de | 13 +-
doc/language_issues.en | 13 +-
doc/language_issues.es | 9 +-
doc/language_issues.fr | 9 +-
doc/language_issues.nl | 9 +-
doc/language_issues.pl | 9 +-
doc/language_issues.ru | 9 +-
doc/language_issues.tr | 9 +-
doc/language_missings | 48 +--
html/cgi-bin/forwardfw.cgi | 737 ++++++++++++++++++++++++------------
html/cgi-bin/fwhosts.cgi | 102 +++--
html/cgi-bin/p2p-block.cgi | 146 +++----
langs/de/cgi-bin/de.pl | 27 +-
langs/en/cgi-bin/en.pl | 27 +-
src/misc-progs/forwardfwctrl.c | 11 +-
17 files changed, 745 insertions(+), 504 deletions(-)
Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index c592d5d..8236f07 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -1137,4 +1137,23 @@ sub write_file_utf8 ($) {
return;
}
+my $FIREWALL_RELOAD_INDICATOR = "${General::swroot}/forward/reread";
+
+sub firewall_config_changed() {
+ open FILE, ">$FIREWALL_RELOAD_INDICATOR" or die "Could not open $FIREWALL_RELOAD_INDICATOR";
+ close FILE;
+}
+
+sub firewall_needs_reload() {
+ if (-e "$FIREWALL_RELOAD_INDICATOR") {
+ return 1;
+ }
+
+ return 0;
+}
+
+sub firewall_reload() {
+ system("/usr/local/bin/forwardfwctrl");
+}
+
1;
diff --git a/config/forwardfw/rules.pl b/config/forwardfw/rules.pl
index fcaade2..f23430f 100755
--- a/config/forwardfw/rules.pl
+++ b/config/forwardfw/rules.pl
@@ -53,16 +53,17 @@ my $configoutgoing = "${General::swroot}/forward/outgoing";
my $p2pfile = "${General::swroot}/forward/p2protocols";
my $configgrp = "${General::swroot}/fwhosts/customgroups";
my $netsettings = "${General::swroot}/ethernet/settings";
-my $errormessage='';
-my $orange;
-my $green;
-my $blue;
+my $errormessage = '';
+my $orange = '';
+my $green = '';
+my $blue = '';
my ($TYPE,$PROT,$SPROT,$DPROT,$SPORT,$DPORT,$TIME,$TIMEFROM,$TIMETILL,$SRC_TGT);
-my $CHAIN="FORWARDFW";
-my $conexists='off';
-my $command = 'iptables -A';
-my $dnat='';
-my $snat='';
+my $CHAIN = "FORWARDFW";
+my $conexists = 'off';
+my $command = 'iptables -A';
+my $dnat ='';
+my $snat ='';
+
&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
&General::readhash("$netsettings", \%defaultNetworks);
&General::readhasharray($configfwdfw, \%configfwdfw);
@@ -81,13 +82,13 @@ if (-f "/var/ipfire/red/active"){
open (CONN1,"/var/ipfire/red/local-ipaddress");
my $redip = <CONN1>;
close(CONN1);
-################################
-# DEBUG/TEST #
-################################
+#################
+# DEBUG/TEST #
+#################
my $MODE=0; # 0 - normal operation
- # 1 - print configline and rules to console
- #
-################################
+ # 1 - print configline and rules to console
+ #
+#################
my $param=shift;
if($param eq 'flush'){
@@ -107,7 +108,7 @@ if($param eq 'flush'){
if($MODE eq '0'){
if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
&p2pblock;
- system ("/usr/sbin/firewall-policy");
+ system ("/usr/sbin/firewall-policy");
}elsif($fwdfwsettings{'POLICY'} eq 'MODE2'){
&p2pblock;
system ("iptables -A $CHAIN -m conntrack --ctstate NEW -j ACCEPT");
@@ -123,7 +124,7 @@ sub flush
system ("iptables -F OUTGOINGFW");
system ("iptables -t nat -F NAT_DESTINATION");
system ("iptables -t nat -F NAT_SOURCE");
-}
+}
sub preparerules
{
if (! -z "${General::swroot}/forward/config"){
@@ -236,12 +237,12 @@ sub buildrules
if($$hash{$key}[24] ne ''){push (@timeframe,"Sat");}
if($$hash{$key}[25] ne ''){push (@timeframe,"Sun");}
$TIME=join(",",@timeframe);
-
+
$TIMEFROM="--timestart $time1 ";
$TIMETILL="--timestop $time2 ";
$TIME="-m time --weekdays $TIME $TIMEFROM $TIMETILL";
}
- if ($MODE eq '1'){
+ if ($MODE eq '1'){
print "NR:$key ";
foreach my $i (0 .. $#{$$hash{$key}}){
print "$i: $$hash{$key}[$i] ";
@@ -301,7 +302,10 @@ sub buildrules
if ($PROT ne '-p ICMP'){
print "iptables -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
}
- }
+ if ($PROT eq '-p ICMP' && $$hash{$key}[9] eq 'All ICMP-Types'){
+ print "iptables -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
+ }
+ }
}
}
}
@@ -364,7 +368,11 @@ sub buildrules
if ($PROT ne '-p ICMP'){
system "iptables -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
}
- }
+ #PROCESS Prot ICMP and type = All ICMP-Types
+ if ($PROT eq '-p ICMP' && $$hash{$key}[9] eq 'All ICMP-Types'){
+ system "iptables -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
+ }
+ }
}
}
}
@@ -472,7 +480,7 @@ sub get_address
my $type=shift; #src or tgt
my $hash;
if ($type eq 'src'){
- $hash=\%sourcehash;
+ $hash=\%sourcehash;
}else{
$hash=\%targethash;
}
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 514a2e9..3393acd 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -186,22 +186,15 @@ WARNING: translation string unused: from email pw
WARNING: translation string unused: from email server
WARNING: translation string unused: from email user
WARNING: translation string unused: from warn email bad
-WARNING: translation string unused: fwdfw ACCEPT
-WARNING: translation string unused: fwdfw DROP
WARNING: translation string unused: fwdfw MODE1
WARNING: translation string unused: fwdfw MODE2
-WARNING: translation string unused: fwdfw REJECT
-WARNING: translation string unused: fwdfw addr grp
-WARNING: translation string unused: fwdfw cust addr
-WARNING: translation string unused: fwdfw cust net
-WARNING: translation string unused: fwdfw err srcovpn
-WARNING: translation string unused: fwdfw err srcport
WARNING: translation string unused: fwdfw err tgt_port
-WARNING: translation string unused: fwdfw err tgtovpn
-WARNING: translation string unused: fwdfw err tgtport
+WARNING: translation string unused: fwdfw external port nat
WARNING: translation string unused: fwdfw from
WARNING: translation string unused: fwdfw ipsec network
+WARNING: translation string unused: fwdfw man port
WARNING: translation string unused: fwdfw natport used
+WARNING: translation string unused: fwdfw rule action
WARNING: translation string unused: fwdfw rules
WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
diff --git a/doc/language_issues.en b/doc/language_issues.en
index ef246b4..77e825d 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -209,22 +209,15 @@ WARNING: translation string unused: from email pw
WARNING: translation string unused: from email server
WARNING: translation string unused: from email user
WARNING: translation string unused: from warn email bad
-WARNING: translation string unused: fwdfw ACCEPT
-WARNING: translation string unused: fwdfw DROP
WARNING: translation string unused: fwdfw MODE1
WARNING: translation string unused: fwdfw MODE2
-WARNING: translation string unused: fwdfw REJECT
-WARNING: translation string unused: fwdfw addr grp
-WARNING: translation string unused: fwdfw cust addr
-WARNING: translation string unused: fwdfw cust net
-WARNING: translation string unused: fwdfw err srcovpn
-WARNING: translation string unused: fwdfw err srcport
WARNING: translation string unused: fwdfw err tgt_port
-WARNING: translation string unused: fwdfw err tgtovpn
-WARNING: translation string unused: fwdfw err tgtport
+WARNING: translation string unused: fwdfw external port nat
WARNING: translation string unused: fwdfw from
WARNING: translation string unused: fwdfw ipsec network
+WARNING: translation string unused: fwdfw man port
WARNING: translation string unused: fwdfw natport used
+WARNING: translation string unused: fwdfw rule action
WARNING: translation string unused: fwdfw rules
WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 7bf3829..6faff27 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -630,9 +630,13 @@ WARNING: untranslated string: fw settings color
WARNING: untranslated string: fw settings dropdown
WARNING: untranslated string: fw settings remark
WARNING: untranslated string: fw settings ruletable
+WARNING: untranslated string: fwdfw ACCEPT
+WARNING: untranslated string: fwdfw DROP
+WARNING: untranslated string: fwdfw REJECT
WARNING: untranslated string: fwdfw action
WARNING: untranslated string: fwdfw additional
WARNING: untranslated string: fwdfw addrule
+WARNING: untranslated string: fwdfw all icmp
WARNING: untranslated string: fwdfw change
WARNING: untranslated string: fwdfw copy
WARNING: untranslated string: fwdfw delete
@@ -644,7 +648,8 @@ WARNING: untranslated string: fwdfw err nosrc
WARNING: untranslated string: fwdfw err nosrcip
WARNING: untranslated string: fwdfw err notgt
WARNING: untranslated string: fwdfw err notgtip
-WARNING: untranslated string: fwdfw err prot
+WARNING: untranslated string: fwdfw err prot_port
+WARNING: untranslated string: fwdfw err prot_port1
WARNING: untranslated string: fwdfw err remark
WARNING: untranslated string: fwdfw err ruleexists
WARNING: untranslated string: fwdfw err same
@@ -658,7 +663,6 @@ WARNING: untranslated string: fwdfw final_rule
WARNING: untranslated string: fwdfw hint ip1
WARNING: untranslated string: fwdfw hint ip2
WARNING: untranslated string: fwdfw log rule
-WARNING: untranslated string: fwdfw man port
WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
@@ -671,7 +675,6 @@ WARNING: untranslated string: fwdfw pol text1
WARNING: untranslated string: fwdfw pol title
WARNING: untranslated string: fwdfw red
WARNING: untranslated string: fwdfw reread
-WARNING: untranslated string: fwdfw rule action
WARNING: untranslated string: fwdfw rule activate
WARNING: untranslated string: fwdfw rulepos
WARNING: untranslated string: fwdfw snat
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 70f8ecf..96e691e 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -633,9 +633,13 @@ WARNING: untranslated string: fw settings color
WARNING: untranslated string: fw settings dropdown
WARNING: untranslated string: fw settings remark
WARNING: untranslated string: fw settings ruletable
+WARNING: untranslated string: fwdfw ACCEPT
+WARNING: untranslated string: fwdfw DROP
+WARNING: untranslated string: fwdfw REJECT
WARNING: untranslated string: fwdfw action
WARNING: untranslated string: fwdfw additional
WARNING: untranslated string: fwdfw addrule
+WARNING: untranslated string: fwdfw all icmp
WARNING: untranslated string: fwdfw change
WARNING: untranslated string: fwdfw copy
WARNING: untranslated string: fwdfw delete
@@ -647,7 +651,8 @@ WARNING: untranslated string: fwdfw err nosrc
WARNING: untranslated string: fwdfw err nosrcip
WARNING: untranslated string: fwdfw err notgt
WARNING: untranslated string: fwdfw err notgtip
-WARNING: untranslated string: fwdfw err prot
+WARNING: untranslated string: fwdfw err prot_port
+WARNING: untranslated string: fwdfw err prot_port1
WARNING: untranslated string: fwdfw err remark
WARNING: untranslated string: fwdfw err ruleexists
WARNING: untranslated string: fwdfw err same
@@ -661,7 +666,6 @@ WARNING: untranslated string: fwdfw final_rule
WARNING: untranslated string: fwdfw hint ip1
WARNING: untranslated string: fwdfw hint ip2
WARNING: untranslated string: fwdfw log rule
-WARNING: untranslated string: fwdfw man port
WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
@@ -674,7 +678,6 @@ WARNING: untranslated string: fwdfw pol text1
WARNING: untranslated string: fwdfw pol title
WARNING: untranslated string: fwdfw red
WARNING: untranslated string: fwdfw reread
-WARNING: untranslated string: fwdfw rule action
WARNING: untranslated string: fwdfw rule activate
WARNING: untranslated string: fwdfw rulepos
WARNING: untranslated string: fwdfw snat
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index c27610f..142ec4d 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -579,9 +579,13 @@ WARNING: untranslated string: fw settings color
WARNING: untranslated string: fw settings dropdown
WARNING: untranslated string: fw settings remark
WARNING: untranslated string: fw settings ruletable
+WARNING: untranslated string: fwdfw ACCEPT
+WARNING: untranslated string: fwdfw DROP
+WARNING: untranslated string: fwdfw REJECT
WARNING: untranslated string: fwdfw action
WARNING: untranslated string: fwdfw additional
WARNING: untranslated string: fwdfw addrule
+WARNING: untranslated string: fwdfw all icmp
WARNING: untranslated string: fwdfw change
WARNING: untranslated string: fwdfw copy
WARNING: untranslated string: fwdfw delete
@@ -593,7 +597,8 @@ WARNING: untranslated string: fwdfw err nosrc
WARNING: untranslated string: fwdfw err nosrcip
WARNING: untranslated string: fwdfw err notgt
WARNING: untranslated string: fwdfw err notgtip
-WARNING: untranslated string: fwdfw err prot
+WARNING: untranslated string: fwdfw err prot_port
+WARNING: untranslated string: fwdfw err prot_port1
WARNING: untranslated string: fwdfw err remark
WARNING: untranslated string: fwdfw err ruleexists
WARNING: untranslated string: fwdfw err same
@@ -607,7 +612,6 @@ WARNING: untranslated string: fwdfw final_rule
WARNING: untranslated string: fwdfw hint ip1
WARNING: untranslated string: fwdfw hint ip2
WARNING: untranslated string: fwdfw log rule
-WARNING: untranslated string: fwdfw man port
WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
@@ -620,7 +624,6 @@ WARNING: untranslated string: fwdfw pol text1
WARNING: untranslated string: fwdfw pol title
WARNING: untranslated string: fwdfw red
WARNING: untranslated string: fwdfw reread
-WARNING: untranslated string: fwdfw rule action
WARNING: untranslated string: fwdfw rule activate
WARNING: untranslated string: fwdfw rulepos
WARNING: untranslated string: fwdfw snat
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 7bf3829..6faff27 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -630,9 +630,13 @@ WARNING: untranslated string: fw settings color
WARNING: untranslated string: fw settings dropdown
WARNING: untranslated string: fw settings remark
WARNING: untranslated string: fw settings ruletable
+WARNING: untranslated string: fwdfw ACCEPT
+WARNING: untranslated string: fwdfw DROP
+WARNING: untranslated string: fwdfw REJECT
WARNING: untranslated string: fwdfw action
WARNING: untranslated string: fwdfw additional
WARNING: untranslated string: fwdfw addrule
+WARNING: untranslated string: fwdfw all icmp
WARNING: untranslated string: fwdfw change
WARNING: untranslated string: fwdfw copy
WARNING: untranslated string: fwdfw delete
@@ -644,7 +648,8 @@ WARNING: untranslated string: fwdfw err nosrc
WARNING: untranslated string: fwdfw err nosrcip
WARNING: untranslated string: fwdfw err notgt
WARNING: untranslated string: fwdfw err notgtip
-WARNING: untranslated string: fwdfw err prot
+WARNING: untranslated string: fwdfw err prot_port
+WARNING: untranslated string: fwdfw err prot_port1
WARNING: untranslated string: fwdfw err remark
WARNING: untranslated string: fwdfw err ruleexists
WARNING: untranslated string: fwdfw err same
@@ -658,7 +663,6 @@ WARNING: untranslated string: fwdfw final_rule
WARNING: untranslated string: fwdfw hint ip1
WARNING: untranslated string: fwdfw hint ip2
WARNING: untranslated string: fwdfw log rule
-WARNING: untranslated string: fwdfw man port
WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
@@ -671,7 +675,6 @@ WARNING: untranslated string: fwdfw pol text1
WARNING: untranslated string: fwdfw pol title
WARNING: untranslated string: fwdfw red
WARNING: untranslated string: fwdfw reread
-WARNING: untranslated string: fwdfw rule action
WARNING: untranslated string: fwdfw rule activate
WARNING: untranslated string: fwdfw rulepos
WARNING: untranslated string: fwdfw snat
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 35cba16..4be5db7 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -616,9 +616,13 @@ WARNING: untranslated string: fw settings color
WARNING: untranslated string: fw settings dropdown
WARNING: untranslated string: fw settings remark
WARNING: untranslated string: fw settings ruletable
+WARNING: untranslated string: fwdfw ACCEPT
+WARNING: untranslated string: fwdfw DROP
+WARNING: untranslated string: fwdfw REJECT
WARNING: untranslated string: fwdfw action
WARNING: untranslated string: fwdfw additional
WARNING: untranslated string: fwdfw addrule
+WARNING: untranslated string: fwdfw all icmp
WARNING: untranslated string: fwdfw change
WARNING: untranslated string: fwdfw copy
WARNING: untranslated string: fwdfw delete
@@ -630,7 +634,8 @@ WARNING: untranslated string: fwdfw err nosrc
WARNING: untranslated string: fwdfw err nosrcip
WARNING: untranslated string: fwdfw err notgt
WARNING: untranslated string: fwdfw err notgtip
-WARNING: untranslated string: fwdfw err prot
+WARNING: untranslated string: fwdfw err prot_port
+WARNING: untranslated string: fwdfw err prot_port1
WARNING: untranslated string: fwdfw err remark
WARNING: untranslated string: fwdfw err ruleexists
WARNING: untranslated string: fwdfw err same
@@ -644,7 +649,6 @@ WARNING: untranslated string: fwdfw final_rule
WARNING: untranslated string: fwdfw hint ip1
WARNING: untranslated string: fwdfw hint ip2
WARNING: untranslated string: fwdfw log rule
-WARNING: untranslated string: fwdfw man port
WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
@@ -657,7 +661,6 @@ WARNING: untranslated string: fwdfw pol text1
WARNING: untranslated string: fwdfw pol title
WARNING: untranslated string: fwdfw red
WARNING: untranslated string: fwdfw reread
-WARNING: untranslated string: fwdfw rule action
WARNING: untranslated string: fwdfw rule activate
WARNING: untranslated string: fwdfw rulepos
WARNING: untranslated string: fwdfw snat
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index f293e6e..5ebf41a 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -576,9 +576,13 @@ WARNING: untranslated string: fw settings color
WARNING: untranslated string: fw settings dropdown
WARNING: untranslated string: fw settings remark
WARNING: untranslated string: fw settings ruletable
+WARNING: untranslated string: fwdfw ACCEPT
+WARNING: untranslated string: fwdfw DROP
+WARNING: untranslated string: fwdfw REJECT
WARNING: untranslated string: fwdfw action
WARNING: untranslated string: fwdfw additional
WARNING: untranslated string: fwdfw addrule
+WARNING: untranslated string: fwdfw all icmp
WARNING: untranslated string: fwdfw change
WARNING: untranslated string: fwdfw copy
WARNING: untranslated string: fwdfw delete
@@ -590,7 +594,8 @@ WARNING: untranslated string: fwdfw err nosrc
WARNING: untranslated string: fwdfw err nosrcip
WARNING: untranslated string: fwdfw err notgt
WARNING: untranslated string: fwdfw err notgtip
-WARNING: untranslated string: fwdfw err prot
+WARNING: untranslated string: fwdfw err prot_port
+WARNING: untranslated string: fwdfw err prot_port1
WARNING: untranslated string: fwdfw err remark
WARNING: untranslated string: fwdfw err ruleexists
WARNING: untranslated string: fwdfw err same
@@ -604,7 +609,6 @@ WARNING: untranslated string: fwdfw final_rule
WARNING: untranslated string: fwdfw hint ip1
WARNING: untranslated string: fwdfw hint ip2
WARNING: untranslated string: fwdfw log rule
-WARNING: untranslated string: fwdfw man port
WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
@@ -617,7 +621,6 @@ WARNING: untranslated string: fwdfw pol text1
WARNING: untranslated string: fwdfw pol title
WARNING: untranslated string: fwdfw red
WARNING: untranslated string: fwdfw reread
-WARNING: untranslated string: fwdfw rule action
WARNING: untranslated string: fwdfw rule activate
WARNING: untranslated string: fwdfw rulepos
WARNING: untranslated string: fwdfw snat
diff --git a/doc/language_missings b/doc/language_missings
index 2dfa5c7..c5f8ac0 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -95,12 +95,10 @@
< fwdfw ACCEPT
< fwdfw action
< fwdfw additional
-< fwdfw addr grp
< fwdfw addrule
+< fwdfw all icmp
< fwdfw change
< fwdfw copy
-< fwdfw cust addr
-< fwdfw cust net
< fwdfw delete
< fwdfw dnat
< fwdfw dnat error
@@ -111,21 +109,19 @@
< fwdfw err nosrcip
< fwdfw err notgt
< fwdfw err notgtip
-< fwdfw err prot
+< fwdfw err prot_port
+< fwdfw err prot_port1
< fwdfw err remark
< fwdfw err ruleexists
< fwdfw err same
< fwdfw err samesub
< fwdfw err src_addr
-< fwdfw err srcovpn
-< fwdfw err srcport
< fwdfw err tgt_addr
< fwdfw err tgt_grp
< fwdfw err tgt_mac
-< fwdfw err tgtovpn
-< fwdfw err tgtport
< fwdfw err tgt_port
< fwdfw err time
+< fwdfw external port nat
< fwdfw final_rule
< fwdfw from
< fwdfw hint ip1
@@ -498,12 +494,10 @@
< fwdfw ACCEPT
< fwdfw action
< fwdfw additional
-< fwdfw addr grp
< fwdfw addrule
+< fwdfw all icmp
< fwdfw change
< fwdfw copy
-< fwdfw cust addr
-< fwdfw cust net
< fwdfw delete
< fwdfw dnat
< fwdfw dnat error
@@ -514,21 +508,19 @@
< fwdfw err nosrcip
< fwdfw err notgt
< fwdfw err notgtip
-< fwdfw err prot
+< fwdfw err prot_port
+< fwdfw err prot_port1
< fwdfw err remark
< fwdfw err ruleexists
< fwdfw err same
< fwdfw err samesub
< fwdfw err src_addr
-< fwdfw err srcovpn
-< fwdfw err srcport
< fwdfw err tgt_addr
< fwdfw err tgt_grp
< fwdfw err tgt_mac
-< fwdfw err tgtovpn
-< fwdfw err tgtport
< fwdfw err tgt_port
< fwdfw err time
+< fwdfw external port nat
< fwdfw final_rule
< fwdfw from
< fwdfw hint ip1
@@ -885,12 +877,10 @@
< fwdfw ACCEPT
< fwdfw action
< fwdfw additional
-< fwdfw addr grp
< fwdfw addrule
+< fwdfw all icmp
< fwdfw change
< fwdfw copy
-< fwdfw cust addr
-< fwdfw cust net
< fwdfw delete
< fwdfw dnat
< fwdfw dnat error
@@ -901,21 +891,19 @@
< fwdfw err nosrcip
< fwdfw err notgt
< fwdfw err notgtip
-< fwdfw err prot
+< fwdfw err prot_port
+< fwdfw err prot_port1
< fwdfw err remark
< fwdfw err ruleexists
< fwdfw err same
< fwdfw err samesub
< fwdfw err src_addr
-< fwdfw err srcovpn
-< fwdfw err srcport
< fwdfw err tgt_addr
< fwdfw err tgt_grp
< fwdfw err tgt_mac
-< fwdfw err tgtovpn
-< fwdfw err tgtport
< fwdfw err tgt_port
< fwdfw err time
+< fwdfw external port nat
< fwdfw final_rule
< fwdfw from
< fwdfw hint ip1
@@ -1261,12 +1249,10 @@
< fwdfw ACCEPT
< fwdfw action
< fwdfw additional
-< fwdfw addr grp
< fwdfw addrule
+< fwdfw all icmp
< fwdfw change
< fwdfw copy
-< fwdfw cust addr
-< fwdfw cust net
< fwdfw delete
< fwdfw dnat
< fwdfw dnat error
@@ -1277,21 +1263,19 @@
< fwdfw err nosrcip
< fwdfw err notgt
< fwdfw err notgtip
-< fwdfw err prot
+< fwdfw err prot_port
+< fwdfw err prot_port1
< fwdfw err remark
< fwdfw err ruleexists
< fwdfw err same
< fwdfw err samesub
< fwdfw err src_addr
-< fwdfw err srcovpn
-< fwdfw err srcport
< fwdfw err tgt_addr
< fwdfw err tgt_grp
< fwdfw err tgt_mac
-< fwdfw err tgtovpn
-< fwdfw err tgtport
< fwdfw err tgt_port
< fwdfw err time
+< fwdfw external port nat
< fwdfw final_rule
< fwdfw from
< fwdfw hint ip1
diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index f8f14ad..fbee025 100755
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -63,6 +63,8 @@ my %aliases=();
my %optionsfw=();
my %ifaces=();
+my @PROTOCOLS = ("TCP", "UDP", "ICMP", "IGMP", "AH", "ESP", "GRE");
+
my $color;
my $confignet = "${General::swroot}/fwhosts/customnetworks";
my $confighost = "${General::swroot}/fwhosts/customhosts";
@@ -100,60 +102,70 @@ my @protocols;
#### JAVA SCRIPT ####
print<<END;
<script>
+ var PROTOCOLS_WITH_PORTS = ["TCP", "UDP"];
+
+ var update_protocol = function() {
+ var protocol = \$("#protocol").val();
+
+ if (protocol === undefined)
+ return;
+
+ // Check if a template is/should be used.
+ if (protocol === "template") {
+ \$("#PROTOCOL_TEMPLATE").show();
+ } else {
+ \$("#PROTOCOL_TEMPLATE").hide();
+ }
+
+ // Check if we are dealing with a protocol, that knows ports.
+ if (\$.inArray(protocol, PROTOCOLS_WITH_PORTS) >= 0) {
+ \$("#PROTOCOL_PORTS").show();
+ } else {
+ \$("#PROTOCOL_PORTS").hide();
+ }
+
+ // Handle ICMP.
+ if (protocol === "ICMP") {
+ \$("#PROTOCOL_ICMP_TYPES").show();
+ } else {
+ \$("#PROTOCOL_ICMP_TYPES").hide();
+ }
+ };
+
\$(document).ready(function() {
+ \$("#protocol").change(update_protocol);
+ update_protocol();
+
+ // When nat not used, hide it
+ if (! \$("#USE_NAT").attr("checked")) {
+ \$(".NAT").hide();
+ }
+
+ // Show NAT area when "use nat" checkbox is clicked
+ \$("#USE_NAT").change(function() {
+ \$(".NAT").toggle();
+ });
+
+ // Time constraints
+ if(!\$("#USE_TIME_CONSTRAINTS").attr("checked")) {
+ \$("#TIME_CONSTRAINTS").hide();
+ }
+ \$("#USE_TIME_CONSTRAINTS").change(function() {
+ \$("#TIME_CONSTRAINTS").toggle();
+ });
+
// Automatically select radio buttons when corresponding
// dropdown menu changes.
\$("select").change(function() {
var id = \$(this).attr("name");
- //When using SNAT or DNAT, check "USE NAT" Checkbox
- if ( id === 'snat' || id === 'dnat') {
+
+ // When using SNAT or DNAT, check "USE NAT" Checkbox
+ if (id === 'snat' || id === 'dnat') {
\$('#USE_NAT').prop('checked', true);
}
\$('#' + id).prop("checked", true);
});
});
-function checkradio(a){
- \$(a).attr('checked', true);
-}
-function toggle_elements( id ) {
- if(document.getElementById(id).style.display== "none")
- {
- document.getElementById(id).style.display='block';
- }
- else{
- document.getElementById(id).style.display='none';
- }
- if(document.getElementById('targetport').style.display== "none" && document.getElementById('PROT').value === 'ICMP' )
- {
- document.getElementById('PROTOKOLL').style.display='block';
- }
- if(document.getElementById('targetport').style.display== "block" && document.getElementById('PROT').value === 'ICMP' )
- {
- document.getElementById('PROTOKOLL').style.display='none';
- }
- return true;
-}
-function hide_elements()
-{
- var elementNames = hide_elements.arguments;
- for (var i=0; i<elementNames.length; i++)
- {
- var elementName = elementNames[i];
- document.getElementById(elementName).style.display='none';
- }
-}
-function getdropdown()
-{
- d = document.getElementById("PROT").value;
- if ( d == 'ICMP' )
- {
- document.getElementById('PROTOKOLL').style.display='block';
- }
- else
- {
- document.getElementById('PROTOKOLL').style.display='none';
- }
-}
</script>
END
@@ -164,6 +176,23 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
&General::readhasharray("$configfwdfw", \%configfwdfw);
&General::readhasharray("$configinput", \%configinputfw);
&General::readhasharray("$configoutgoing", \%configoutgoingfw);
+ #Set Variables according to the JQuery code in protocol section
+ if ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP')
+ {
+ if ($fwdfwsettings{'SRC_PORT'} ne '')
+ {
+ $fwdfwsettings{'USE_SRC_PORT'} = 'ON';
+ }
+ if ($fwdfwsettings{'TGT_PORT'} ne '')
+ {
+ $fwdfwsettings{'USESRV'} = 'ON';
+ $fwdfwsettings{'grp3'} = 'TGT_PORT';
+ }
+ }
+ if ($fwdfwsettings{'PROT'} eq 'template')
+ {
+ $fwdfwsettings{'USESRV'} = 'ON';
+ }
$errormessage=&checksource;
if(!$errormessage){&checktarget;}
if(!$errormessage){&checkrule;}
@@ -356,7 +385,7 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
&newrule;
}else{
if($fwdfwsettings{'nosave2'} ne 'on'){
- &rules;
+ &General::firewall_config_changed();
}
&base;
}
@@ -375,7 +404,7 @@ if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw toggle'})
}
}
&General::writehasharray($fwdfwsettings{'config'}, \%togglehash);
- &rules;
+ &General::firewall_config_changed();
&base;
}
if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw togglelog'})
@@ -388,12 +417,12 @@ if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw togglelog'})
}
}
&General::writehasharray($fwdfwsettings{'config'}, \%togglehash);
- &rules;
+ &General::firewall_config_changed();
&base;
}
if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw reread'})
{
- &reread_rules;
+ &General::firewall_reload();
&base;
}
if ($fwdfwsettings{'ACTION'} eq 'editrule')
@@ -428,14 +457,32 @@ if ($fwdfwsettings{'ACTION'} eq '' or $fwdfwsettings{'ACTION'} eq 'reset')
sub addrule
{
&error;
- if (-f "${General::swroot}/forward/reread"){
- print "<table border='1' rules='groups' bgcolor='lightgreen' width='100%'><form method='post'><td><div style='font-size:11pt; font-weight: bold;vertical-align: middle; '><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-face: Comic Sans MS; color: green; font-weight: bold; font-size: 14pt;'>    $Lang::tr{'fwhost reread'}</div></td></tr></table></form><br>";
- }
+
&Header::openbox('100%', 'left', $Lang::tr{'fwdfw menu'});
- print "<form method='post'>";
- print "<table border='0'>";
- print "<tr><td><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'></td>";
- print"</tr></table></form><hr>";
+ print <<END;
+ <form method="POST" action="">
+ <table border='0' width="100%">
+ <tr>
+ <td>
+ <input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'>
+ </td>
+ <td align="right">
+END
+
+ if (&General::firewall_needs_reload()) {
+ print <<END;
+ <input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-weight: bold; color: green;'>
+END
+ }
+
+ print <<END;
+ </td>
+ </tr>
+ </table>
+ </form>
+
+ <hr>
+END
&Header::closebox();
&viewtablerule;
}
@@ -819,7 +866,7 @@ sub checkrule
return;
}
#when icmp selected, no targetport allowed
- if (($fwdfwsettings{'PROT'} ne '' && $fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP') && ($fwdfwsettings{'USESRV'} eq 'ON' || $fwdfwsettings{'USE_SRC_PORT'} eq 'ON')){
+ if (($fwdfwsettings{'PROT'} ne '' && $fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP' && $fwdfwsettings{'PROT'} ne 'template') && ($fwdfwsettings{'USESRV'} eq 'ON' || $fwdfwsettings{'USE_SRC_PORT'} eq 'ON')){
$errormessage.=$Lang::tr{'fwdfw err prot_port'};
return;
}
@@ -870,6 +917,12 @@ sub checkrule
$fwdfwsettings{'ICMP_TYPES'}='';
$fwdfwsettings{'USESRV'}='';
$fwdfwsettings{'TGT_PORT'}='';
+ }elsif($fwdfwsettings{'PROT'} eq 'IGMP'){
+ $fwdfwsettings{'USE_SRC_PORT'}='';
+ $fwdfwsettings{'SRC_PORT'}='';
+ $fwdfwsettings{'ICMP_TYPES'}='';
+ $fwdfwsettings{'USESRV'}='';
+ $fwdfwsettings{'TGT_PORT'}='';
}elsif($fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP' && $fwdfwsettings{'PROT'} ne 'ICMP'){
$fwdfwsettings{'ICMP_TYPES'}='';
$fwdfwsettings{'PROT'} = '';
@@ -959,7 +1012,7 @@ sub deleterule
delete $delhash{$last_key};
&General::writehasharray($fwdfwsettings{'config'}, \%delhash);
- &rules;
+ &General::firewall_config_changed();
if($fwdfwsettings{'nobase'} ne 'on'){
&base;
@@ -975,7 +1028,7 @@ sub disable_rule
}
}
&General::writehasharray("$configfwdfw", \%configfwdfw);
- &rules;
+ &General::firewall_config_changed();
}
sub dec_counter
{
@@ -1573,10 +1626,10 @@ sub newrule
}
}
&Header::openbox('100%', 'left', $Lang::tr{'fwdfw addrule'});
- print "<form method='post'>";
&Header::closebox();
&Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'});
#------SOURCE-------------------------------------------------------
+ print "<form method='post'>";
print<<END;
<table width='100%' border='0'>
<tr><td width='1%'><input type='radio' name='grp1' value='src_addr' checked></td><td width='60%'>$Lang::tr{'fwdfw sourceip'}<input type='TEXT' name='src_addr' value='$fwdfwsettings{'src_addr'}' size='16' maxlength='18' ></td><td width='1%'><input type='radio' name='grp1' id='ipfire_src' value='ipfire_src' $checked{'grp1'}{'ipfire_src'}></td><td><b>Firewall</b></td>
@@ -1603,11 +1656,18 @@ END
#---SNAT / DNAT ------------------------------------------------
&Header::openbox('100%', 'left', 'NAT');
print<<END;
- <table width='100%' border='0'>
- <tr><td width='1%'><input type='checkbox' name='USE_NAT' id='USE_NAT' value='ON' $checked{'USE_NAT'}{'ON'} onclick="toggle_elements('natpart')" ></td><td width='15%'>$Lang::tr{'fwdfw use nat'}</td><td colspan='5'></td></tr></table>
- <div id="natpart" class="noscript">
- <table width=100%' border='0'><tr>
- <tr><td colspan='2'></td><td width='1%'><input type='radio' name='nat' id='dnat' value='dnat' checked ></td><td width='50%'>$Lang::tr{'fwdfw dnat'}</td>
+ <label>
+ <input type='checkbox' name='USE_NAT' id='USE_NAT' value="ON" $checked{'USE_NAT'}{'ON'}>
+ $Lang::tr{'fwdfw use nat'}
+ </label>
+ <div class="NAT">
+ <table width='100%' border='0'>
+ <tr>
+ <td colspan='2'></td>
+ <td width='1%'>
+ <input type='radio' name='nat' id='dnat' value='dnat' checked>
+ </td>
+ <td width='50%'>$Lang::tr{'fwdfw dnat'}</td>
END
print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='dnat' style='width:140px;'>";
print "<option value='ALL' $selected{'dnat'}{$Lang::tr{'all'}}>$Lang::tr{'all'}</option>";
@@ -1617,9 +1677,6 @@ END
print "<option value='$alias' $selected{'dnat'}{$alias}>$alias</option>";
}
print"</select></td></tr>";
- $fwdfwsettings{'dnatport'}=~ tr/|/,/;
- print"<tr><td colspan='4'></td><td>Port: </td><td align='right'><input type='text' name='dnatport' style='width:130px;' value=\"$fwdfwsettings{'dnatport'}\"> </td></tr>";
- print"<tr><td colspan='8'><br></td></tr>";
#SNAT
print"<tr><td colspan='2'></td><td width='1%'><input type='radio' name='nat' id='snat' value='snat' $checked{'nat'}{'snat'}></td><td width='20%'>$Lang::tr{'fwdfw snat'}</td>";
print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='snat' style='width:140px;'>";
@@ -1637,10 +1694,7 @@ END
print ">$network</option>";
}
print"</select></td></tr></table>";
- print"</div><br><hr>";
- if ($fwdfwsettings{'USE_NAT'} ne 'ON'){
- print"<script language='JavaScript'>hide_elements('natpart');</script>";
- }
+ print"</div>";
&Header::closebox();
#---TARGET------------------------------------------------------
&Header::openbox('100%', 'left', $Lang::tr{'fwdfw target'});
@@ -1669,30 +1723,50 @@ END
&Header::closebox;
#---PROTOCOL------------------------------------------------------
&Header::openbox('100%', 'left', $Lang::tr{'fwhost prot'});
+ #Fix Protocol for JQuery
+ if ($fwdfwsettings{'grp3'} eq 'cust_srv' || $fwdfwsettings{'grp3'} eq 'cust_srvgrp'){
+ $fwdfwsettings{'PROT'} = 'template';
+ }
print<<END;
- <table width='15%' border='0' style="float:left;">
- <tr><td><select name='PROT' id='PROT' onchange="getdropdown()">
+ <div id="prt">
+ <table width='15%' border='0' style="float:left;">
+ <tr>
+ <td>
+ <select name='PROT' id='protocol'>
END
- if ($fwdfwsettings{'PROT'} eq ''){
- print"<option value='' selected>$Lang::tr{'all'}</option>";
- }else{
- print"<option value=''>$Lang::tr{'all'}</option>";
+ print "<option value=\"\"";
+ if ($fwdfwsettings{'PROT'} eq '') {
+ print " selected=\"selected\"";
}
- foreach ("TCP","UDP","GRE","ESP","AH","ICMP")
- {
- if ($_ eq $fwdfwsettings{'PROT'})
- {
- print"<option selected>$_</option>";
- }else{
- print"<option>$_</option>";
+ print ">$Lang::tr{'all'}</option>";
+
+ print "<option value=\"template\"";
+ print " selected=\"selected\"" if ($fwdfwsettings{'grp3'} eq 'cust_srv' || $fwdfwsettings{'grp3'} eq 'cust_srvgrp');
+ print ">- $Lang::tr{'template'} -</option>";
+
+ foreach (@PROTOCOLS) {
+ print"<option value=\"$_\"";
+ if ($_ eq $fwdfwsettings{'PROT'}) {
+ print " selected=\"selected\"";
}
+ print ">$_</option>";
}
- print"</select></td></tr></table>";
print<<END;
- <div id="PROTOKOLL" class="noscript"><table width='30%' border='0' style="float:left;"><tr><td>$Lang::tr{'fwhost icmptype'}</td><td colspan='2'><select name='ICMP_TYPES' style='min-width:230px;'>
+ </select>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <div id="PROTOCOL_ICMP_TYPES">
+ <table width='50%' border='0' style="float:left;">
+ <tr>
+ <td width='20%'>$Lang::tr{'fwhost icmptype'}</td>
+ <td colspan='2'>
+ <select name='ICMP_TYPES' style='min-width:230px;'>
END
&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
- print"<option>All ICMP-Types</option>";
+ print"<option value='All ICMP-Types'>$Lang::tr{'fwdfw all icmp'}</option>";
foreach my $key (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) }keys %icmptypes){
if($fwdfwsettings{'ICMP_TYPES'} eq "$icmptypes{$key}[0]"){
print"<option selected>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
@@ -1700,47 +1774,88 @@ END
print"<option>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
}
}
- print<<END;
- </select></td></tr>
- </table></div><br><br><br>
-END
- if ($fwdfwsettings{'PROT'} ne 'ICMP'){
- print"<script language='JavaScript'>hide_elements('PROTOKOLL');</script>";
- }
- #SOURCEPORT
- print<<END;
- <table width='100%'><tr><td colspan='8'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></table>
- <table width='100%' border='0'>
- <tr><td width='1%'><input type='checkbox' name='USE_SRC_PORT' value='ON' $checked{'USE_SRC_PORT'}{'ON'} onclick="toggle_elements('srcport')"></td>
- <td width='51%' colspan='3'>$Lang::tr{'fwdfw use srcport'}</td></tr></table>
- <div id="srcport" class="noscript"><table width='100%' border='0'><tr>
- <td width='70%' nowrap='nowrap' align='right'>$Lang::tr{'fwdfw man port'}</td>
-END
- $fwdfwsettings{'SRC_PORT'}=~ s/\|/,/g;
- print<<END;
- <td align='right'><input type='text' name='SRC_PORT' value='$fwdfwsettings{'SRC_PORT'}' maxlength='20' size='18' ></td></tr>
- </table></div><br>
+
+ print <<END;
+ </select>
+ </td>
+ </tr>
+ </table>
+ </div>
END
- if ($fwdfwsettings{'USE_SRC_PORT'} ne 'ON'){
- print"<script language='JavaScript'>hide_elements('srcport');</script>";
+
+ $fwdfwsettings{'SRC_PORT'} =~ s/\|/,/g;
+ $fwdfwsettings{'TGT_PORT'} =~ s/\|/,/g;
+ $fwdfwsettings{'dnatport'} =~ tr/|/,/;
+
+ # The dnatport may be empty, if it matches TGT_PORT
+ if ($fwdfwsettings{'dnatport'} eq $fwdfwsettings{'TGT_PORT'}) {
+ $fwdfwsettings{'dnatport'} = "";
}
- #TARGETPORT
- print<<END;
- <hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; '><br>
- <table width='100%' border='0'>
- <tr><td width='1%'><input type='checkbox' name='USESRV' value='ON' $checked{'USESRV'}{'ON'} onclick="toggle_elements('targetport')"></td><td width='48%'>$Lang::tr{'fwdfw use srv'}</td></tr></table>
- <div id="targetport" class="noscript"><table width='100%' border='0'><tr><td width='80%'></td><td width='1%'><input type='radio' name='grp3' id='cust_srv' value='cust_srv' checked></td><td nowrap='nowrap'>$Lang::tr{'fwhost cust service'}</td><td width='1%' colspan='2'><select name='cust_srv' style='min-width:230px;' >
+
+ print <<END;
+
+ <div id="PROTOCOL_PORTS">
+ <table border="0">
+ <tr>
+ <!-- #SOURCEPORT -->
+ <td>
+ $Lang::tr{'fwdfw use srcport'}
+ </td>
+ <td>
+ <input type='text' name='SRC_PORT' value='$fwdfwsettings{'SRC_PORT'}' maxlength='20' size='18'>
+ </td>
+ <td width='10%'>
+ </td>
+
+ <!-- #TARGETPORT -->
+ <td>
+ $Lang::tr{'fwdfw use srv'}
+ </td>
+
+ <td>
+ <input type='text' name='TGT_PORT' value='$fwdfwsettings{'TGT_PORT'}' maxlength='20' size='18'>
+ </td>
+ </tr>
+ <tr class="NAT">
+ <td colspan='3'></td>
+ <td>$Lang::tr{'fwdfw external port nat'}:</td>
+ <td>
+ <input type='text' name='dnatport' value=\"$fwdfwsettings{'dnatport'}\" maxlength='20' size='18'>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <div id="PROTOCOL_TEMPLATE">
+ <table border="0">
+ <tr>
+ <td>
+ <input type='radio' name='grp3' id='cust_srv' value='cust_srv' checked>
+ $Lang::tr{'fwhost cust service'}
+ </td>
+ <td>
+ <select name='cust_srv' style='min-width: 230px;'>
END
&General::readhasharray("$configsrv", \%customservice);
foreach my $key (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){
print"<option ";
print"selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservice{$key}[0]);
print"value='$customservice{$key}[0]'>$customservice{$key}[0]</option>";
- }
+ }
+
print<<END;
- </select></td></tr>
- <tr><td></td><td><input type='radio' name='grp3' id='cust_srvgrp' value='cust_srvgrp' $checked{'grp3'}{'cust_srvgrp'}></td><td nowrap='nowrap'>$Lang::tr{'fwhost cust srvgrp'}</td><td colspan='2'><select name='cust_srvgrp' style='min-width:230px;' >
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <input type='radio' name='grp3' id='cust_srvgrp' value='cust_srvgrp' $checked{'grp3'}{'cust_srvgrp'}>
+ $Lang::tr{'fwhost cust srvgrp'}
+ </td>
+ <td>
+ <select name='cust_srvgrp' style='min-width:230px;'>
END
+
&General::readhasharray("$configsrvgrp", \%customservicegrp);
my $helper;
foreach my $key (sort { ncmp($customservicegrp{$a}[0],$customservicegrp{$b}[0]) } keys %customservicegrp){
@@ -1752,46 +1867,77 @@ END
$helper=$customservicegrp{$key}[0];
}
print<<END;
- </select></td></tr>
- <tr><td></td><td><input type='radio' name='grp3' id='TGT_PORT' value='TGT_PORT' $checked{'grp3'}{'TGT_PORT'}></td><td>$Lang::tr{'fwdfw man port'}</td>
-END
- $fwdfwsettings{'TGT_PORT'} =~ s/\|/,/g;
- print<<END;
- <td align='right'><input type='text' name='TGT_PORT' value='$fwdfwsettings{'TGT_PORT'}' maxlength='20' size='18' onclick='checkradio(\"#TGT_PORT\")'></td></tr>
- </table></div><br><hr>
+ </select>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <br><br><br>
END
- if ($fwdfwsettings{'USESRV'} ne 'ON'){
- print"<script language='JavaScript'>hide_elements('targetport');</script>";
+
+ &Header::closebox;
+
+ $checked{"RULE_ACTION"} = ();
+ foreach ("ACCEPT", "DROP", "REJECT") {
+ $checked{"RULE_ACTION"}{$_} = "";
}
- if ($fwdfwsettings{'USESRV'} eq 'ON' && $fwdfwsettings{'PROT'} eq 'ICMP'){
- print"<script language='JavaScript'>hide_elements('PROTOKOLL');</script>";
+
+ if($fwdfwsettings{'updatefwrule'} eq 'on') {
+ $checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}} = "checked";
+ } elsif ($fwdfwsettings{'POLICY'} eq 'MODE1') {
+ $checked{"RULE_ACTION"}{"ACCEPT"} = "checked";
+ } elsif ($fwdfwsettings{'POLICY'} eq 'MODE2') {
+ $checked{"RULE_ACTION"}{"DROP"} = "checked";
}
- &Header::closebox;
+
+ print <<END;
+ <hr><br>
+
+ <center>
+ <table width="80%" border="0">
+ <tr>
+ <td width="33%" align="center" bgcolor="$color{'color17'}">
+ <br>
+ </td>
+ <td width="33%" align="center" bgcolor="$color{'color25'}">
+ <br>
+ </td>
+ <td width="33%" align="center" bgcolor="$color{'color16'}">
+ <br>
+ </td>
+ </tr>
+ <tr>
+ <td width="33%" align="center">
+ <label>
+ <input type="radio" name="RULE_ACTION" value="ACCEPT" $checked{"RULE_ACTION"}{"ACCEPT"}>
+ <strong>$Lang::tr{'fwdfw ACCEPT'}</strong>
+ </label>
+ </td>
+ <td width="33%" align="center">
+ <label>
+ <input type="radio" name="RULE_ACTION" value="DROP" $checked{"RULE_ACTION"}{"DROP"}>
+ <strong>$Lang::tr{'fwdfw DROP'}</strong>
+ </label>
+ </td>
+ <td width="33%" align="center">
+ <label>
+ <input type="radio" name="RULE_ACTION" value="REJECT" $checked{"RULE_ACTION"}{"REJECT"}>
+ <strong>$Lang::tr{'fwdfw REJECT'}</strong>
+ </label>
+ </td>
+ </tr>
+ </table>
+ </center>
+
+ <br>
+END
+
#---Activate/logging/remark-------------------------------------
&Header::openbox('100%', 'left', $Lang::tr{'fwdfw additional'});
print<<END;
<table width='100%' border='0'>
- <tr><td nowrap>$Lang::tr{'fwdfw rule action'}</td><td><select name='RULE_ACTION'>
END
- foreach ("ACCEPT","DROP","REJECT")
- {
- if($fwdfwsettings{'updatefwrule'} eq 'on'){
- print"<option value='$_'";
- print " selected='selected'" if ($fwdfwsettings{'RULE_ACTION'} eq $_);
- print">$Lang::tr{'fwdfw '.$_}</option>";
- }else{
- if($fwdfwsettings{'POLICY'} eq 'MODE2'){
- $fwdfwsettings{'RULE_ACTION'} = 'DROP';
- }
- if ($_ eq $fwdfwsettings{'RULE_ACTION'})
- {
- print"<option value='$_' selected>$Lang::tr{'fwdfw '.$_}</option>";
- }else{
- print"<option value='$_'>$Lang::tr{'fwdfw '.$_}</option>";
- }
- }
- }
- print"</select></td></tr>";
print"<tr><td width='12%'>$Lang::tr{'remark'}:</td><td width='88%' align='left'><input type='text' name='ruleremark' maxlength='255' value='$fwdfwsettings{'ruleremark'}' style='width:99%;'></td></tr>";
if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} eq 'on'){
print "<tr><td width='12%'>$Lang::tr{'fwdfw rulepos'}:</td><td><select name='rulepos' >";
@@ -1806,58 +1952,97 @@ END
}
print<<END;
- </table><table width='100%'>
- <tr><td width='1%'><input type='checkbox' name='ACTIVE' value='ON' $checked{'ACTIVE'}{'ON'}></td><td>$Lang::tr{'fwdfw rule activate'}</td></tr>
- <tr><td width='1%'><input type='checkbox' name='LOG' value='ON' $checked{'LOG'}{'ON'} ></td><td>$Lang::tr{'fwdfw log rule'}</td></tr>
- </table><br><hr>
+ </table>
+ <table width='100%'>
+ <tr>
END
- &Header::closebox();
- #---ADD TIMEFRAME-----------------------------------------------
- &Header::openbox('100%', 'left', $Lang::tr{'fwdfw timeframe'});
- print<<END;
- <table width='70%' border='0'>
- <tr><td width='1%'><input type='checkbox' name='TIME' value='ON' $checked{'TIME'}{'ON'}></td><td colspan='9'>$Lang::tr{'fwdfw timeframe'}</td></tr>
- <tr><td colspan='10'> </td></tr>
- <tr>
- <td align='left' >$Lang::tr{'time'}: </td>
- <td>$Lang::tr{'advproxy monday'}</td><td> $Lang::tr{'advproxy tuesday'} </td><td>$Lang::tr{'advproxy wednesday'}</td><td> $Lang::tr{'advproxy thursday'}</td><td> $Lang::tr{'advproxy friday'}</td><td> $Lang::tr{'advproxy saturday'}</td><td> $Lang::tr{'advproxy sunday'}</td>
- <td width='15%' align='left'>$Lang::tr{'advproxy from'}</td>
- <td width='15%' align='left'>$Lang::tr{'advproxy to'}</td>
- </tr>
- <tr>
- <td align='right'></td>
- <td width='1%' align='left'><input type='checkbox' name='TIME_MON' value='on' $checked{'TIME_MON'}{'on'} ></td>
- <td width='1%' align='left'><input type='checkbox' name='TIME_TUE' value='on' $checked{'TIME_TUE'}{'on'} ></td>
- <td width='1%' align='left'><input type='checkbox' name='TIME_WED' value='on' $checked{'TIME_WED'}{'on'} ></td>
- <td width='1%' align='left'><input type='checkbox' name='TIME_THU' value='on' $checked{'TIME_THU'}{'on'} ></td>
- <td width='1%' align='left'><input type='checkbox' name='TIME_FRI' value='on' $checked{'TIME_FRI'}{'on'} ></td>
- <td width='1%' align='left'><input type='checkbox' name='TIME_SAT' value='on' $checked{'TIME_SAT'}{'on'} ></td>
- <td width='15%' align='left'><input type='checkbox' name='TIME_SUN' value='on' $checked{'TIME_SUN'}{'on'} ></td>
- <td><select name='TIME_FROM'>
+
+ if ($fwdfwsettings{'updatefwrule'} eq 'on') {
+ print <<END;
+ <td>
+ <input type='checkbox' name='ACTIVE' value="ON" $checked{'ACTIVE'}{'ON'}>
+ </td>
+ <td>$Lang::tr{'fwdfw rule activate'}</td>
+END
+ } else {
+ print <<END;
+ <td colspan="2">
+ <input type="hidden" name="ACTIVE" value="ON">
+ </td>
+END
+ }
+
+ print <<END;
+ </tr>
+ <tr>
+ <td>
+ <input type='checkbox' name='LOG' value='ON' $checked{'LOG'}{'ON'}>
+ </td>
+ <td>$Lang::tr{'fwdfw log rule'}</td>
+ </tr>
+ <tr>
+ <td width='1%'>
+ <input type='checkbox' name='TIME' id="USE_TIME_CONSTRAINTS" value='ON' $checked{'TIME'}{'ON'}>
+ </td>
+ <td>$Lang::tr{'fwdfw timeframe'}</td>
+ </tr>
+ <tr id="TIME_CONSTRAINTS">
+ <td colspan="2">
+ <table width="66%" border="0">
+ <tr>
+ <td width="8em"> </td>
+ <td align="center">$Lang::tr{'advproxy monday'}</td>
+ <td align="center">$Lang::tr{'advproxy tuesday'}</td>
+ <td align="center">$Lang::tr{'advproxy wednesday'}</td>
+ <td align="center">$Lang::tr{'advproxy thursday'}</td>
+ <td align="center">$Lang::tr{'advproxy friday'}</td>
+ <td align="center">$Lang::tr{'advproxy saturday'}</td>
+ <td align="center">$Lang::tr{'advproxy sunday'}</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td width="8em"> </td>
+ <td align="center"><input type='checkbox' name='TIME_MON' value='on' $checked{'TIME_MON'}{'on'} ></td>
+ <td align="center"><input type='checkbox' name='TIME_TUE' value='on' $checked{'TIME_TUE'}{'on'} ></td>
+ <td align="center"><input type='checkbox' name='TIME_WED' value='on' $checked{'TIME_WED'}{'on'} ></td>
+ <td align="center"><input type='checkbox' name='TIME_THU' value='on' $checked{'TIME_THU'}{'on'} ></td>
+ <td align="center"><input type='checkbox' name='TIME_FRI' value='on' $checked{'TIME_FRI'}{'on'} ></td>
+ <td align="center"><input type='checkbox' name='TIME_SAT' value='on' $checked{'TIME_SAT'}{'on'} ></td>
+ <td align="center"><input type='checkbox' name='TIME_SUN' value='on' $checked{'TIME_SUN'}{'on'} ></td>
+ <td>
+ <select name='TIME_FROM'>
END
for (my $i=0;$i<=23;$i++) {
$i = sprintf("%02s",$i);
for (my $j=0;$j<=45;$j+=15) {
$j = sprintf("%02s",$j);
my $time = $i.":".$j;
- print "\t\t\t\t\t<option $selected{'TIME_FROM'}{$time}>$i:$j</option>\n";
+ print "<option $selected{'TIME_FROM'}{$time}>$i:$j</option>\n";
}
}
print<<END;
- </select></td>
- <td><select name='TIME_TO'>
+ </select> ‐
+ <select name='TIME_TO'>
END
for (my $i=0;$i<=23;$i++) {
$i = sprintf("%02s",$i);
for (my $j=0;$j<=45;$j+=15) {
$j = sprintf("%02s",$j);
my $time = $i.":".$j;
- print "\t\t\t\t\t<option $selected{'TIME_TO'}{$time}>$i:$j</option>\n";
+ print "<option $selected{'TIME_TO'}{$time}>$i:$j</option>\n";
}
}
print<<END;
- </select></td></tr></table><br><hr>
+ </select>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <br><hr>
END
+
#---ACTION------------------------------------------------------
if($fwdfwsettings{'updatefwrule'} ne 'on'){
print<<END;
@@ -1917,7 +2102,7 @@ sub pos_up
}
}
&General::writehasharray($fwdfwsettings{'config'}, \%uphash);
- &rules;
+ &General::firewall_config_changed();
}
sub pos_down
{
@@ -1944,22 +2129,7 @@ sub pos_down
}
}
&General::writehasharray($fwdfwsettings{'config'}, \%downhash);
- &rules;
-}
-sub rules
-{
- if (!-f "${General::swroot}/forward/reread"){
- system("touch ${General::swroot}/forward/reread");
- system("touch ${General::swroot}/fwhosts/reread");
- }
-}
-sub reread_rules
-{
- system("/usr/local/bin/forwardfwctrl");
- if ( -f "${General::swroot}/forward/reread"){
- system("rm ${General::swroot}/forward/reread");
- system("rm ${General::swroot}/fwhosts/reread");
- }
+ &General::firewall_config_changed();
}
sub saverule
{
@@ -2101,7 +2271,7 @@ sub saverule
$fwdfwsettings{'oldrulenumber'}--;
}
&General::writehasharray("$config", $hash);
- &rules;
+ &General::firewall_config_changed();
}elsif($fwdfwsettings{'rulepos'} > $fwdfwsettings{'oldrulenumber'}){
my %tmp=();
my $val=$fwdfwsettings{'rulepos'}-$fwdfwsettings{'oldrulenumber'};
@@ -2128,7 +2298,7 @@ sub saverule
$fwdfwsettings{'oldrulenumber'}++;
}
&General::writehasharray("$config", $hash);
- &rules;
+ &General::firewall_config_changed();
}
}
}
@@ -2180,9 +2350,34 @@ sub viewtablenew
my $tooltip;
my @tmpsrc=();
my $coloryellow='';
- print"<b>$title1</b><br>";
- print"<table width='100%' cellspacing='0' cellpadding='0' border='0'>";
- print"<tr><td align='center'><b>#</b></td><td></td><td align='center' width='25'></td><td align='center'><b>$Lang::tr{'fwdfw source'}</b></td><td width='1%'><b>Log</b></td><td align='center'><b>$Lang::tr{'fwdfw target'}</b></td><td align='center' colspan='6' width='1%'><b>$Lang::tr{'fwdfw action'}</b></td></tr>";
+ print <<END;
+ <b>$title1</b>
+ <br>
+
+ <table width='100%' cellspacing='0' border='0'>
+ <tr>
+ <th align='right' width='3%'>
+ #
+ </th>
+ <th width='2%'></th>
+ <th align='center'>
+ <b>$Lang::tr{'protocol'}</b>
+ </th>
+ <th align='center' width='30%'>
+ <b>$Lang::tr{'fwdfw source'}</b>
+ </th>
+ <th align='center'>
+ Log <!-- XXX UNTRANSLATED STRING -->
+ </th>
+ <th align='center' width='30%'>
+ <b>$Lang::tr{'fwdfw target'}</b>
+ </th>
+ <th align='center' colspan='6' width='18%'>
+ <b>$Lang::tr{'fwdfw action'}</b>
+ </th>
+ </tr>
+END
+
foreach my $key (sort {$a <=> $b} keys %$hash){
$tdcolor='';
@tmpsrc=();
@@ -2233,11 +2428,13 @@ sub viewtablenew
$color="$color{'color20'}";
}
}
- print"<tr bgcolor='$color' >";
- #KEY
print<<END;
- <td align='right' width='18'><b>$key </b></td>
+ <tr bgcolor='$color'>
+ <td align='right' width='3%'>
+ <b>$key </b>
+ </td>
END
+
#RULETYPE (A,R,D)
if ($$hash{$key}[0] eq 'ACCEPT'){
$ruletype='A';
@@ -2252,7 +2449,13 @@ END
$tooltip='REJECT';
$rulecolor=$color{'color16'};
}
- print"<td bgcolor='$rulecolor' align='center' width='10'><span title='$tooltip'><b>$ruletype</b></span></td>";
+
+ print <<END;
+ <td bgcolor='$rulecolor' align='center' width='2%'>
+ <span title='$tooltip'> </span>
+ </td>
+END
+
#Get Protocol
my $prot;
if ($$hash{$key}[8]){
@@ -2264,6 +2467,7 @@ END
}else{
push (@protocols,$Lang::tr{'all'});
}
+
my $protz=join(",",@protocols);
if($protz eq 'ICMP' && $$hash{$key}[9] ne 'All ICMP-Types' && $$hash{$key}[14] ne 'cust_srvgrp'){
&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
@@ -2317,17 +2521,20 @@ END
}
#LOGGING
print<<END;
- </td>
- <td align='left' width='25'><form method='post'><input type='image' img src='$log' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw togglelog'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;'/>
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='$Lang::tr{'fwdfw togglelog'}' />
- </form></td>
+ </td>
+ <td align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='$log' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw togglelog'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;'/>
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'fwdfw togglelog'}' />
+ </form>
+ </td>
END
#TARGET
&getcolor($$hash{$key}[5],$$hash{$key}[6],\%customhost);
print<<END;
- <td align='center' width='160' $tdcolor>
+ <td align='center' $tdcolor>
END
#Is this a DNAT rule?
if ($$hash{$key}[31] eq 'dnat' && $$hash{$key}[28] eq 'ON'){
@@ -2336,7 +2543,7 @@ END
$$hash{$key}[30]=~ tr/|/,/;
print": $$hash{$key}[30]";
}
- print"<br>->";
+ print"<br>->";
}
if ($$hash{$key}[5] eq 'ipfire'){
$ipfireiface='Interface';
@@ -2372,54 +2579,82 @@ END
$gif="/images/off.gif"
}
print<<END;
- <td width='25'><form method='post'><input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='$Lang::tr{'fwdfw toggle'}' />
- </form></td>
- <td width='25' ><form method='post'><input type='image' img src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'fwdfw edit'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='editrule' />
- </form></td>
- <td width='25'><form method='post'><input type='image' img src='/images/addblue.gif' alt='$Lang::tr{'fwdfw copy'}' title='$Lang::tr{'fwdfw copy'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='copyrule' />
- </form></td>
- <td width='25' ><form method='post'><input type='image' img src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'fwdfw delete'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='deleterule' />
- </form></td>
+ <td width='3%' align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'fwdfw toggle'}' />
+ </form>
+ </td>
+ <td width='3%' align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'fwdfw edit'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='editrule' />
+ </form>
+ </td>
+ <td width='3%' align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='/images/addblue.gif' alt='$Lang::tr{'fwdfw copy'}' title='$Lang::tr{'fwdfw copy'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='copyrule' />
+ </form>
+ </td>
+ <td width='3%' align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'fwdfw delete'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='deleterule' />
+ </form>
+ </td>
END
if (exists $$hash{$key-1}){
print<<END;
- <td width='25'><form method='post'><input type='image' img src='/images/up.gif' alt='$Lang::tr{'fwdfw moveup'}' title='$Lang::tr{'fwdfw moveup'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='moveup' />
- </form></td>
+ <td width='3%' align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='/images/up.gif' alt='$Lang::tr{'fwdfw moveup'}' title='$Lang::tr{'fwdfw moveup'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='moveup' />
+ </form>
+ </td>
END
}else{
- print"<td width='25'><input type='image' img src='/images/up.gif' style='visibility:hidden;'></td>";
+ print"<td width='3%'></td>";
}
+
if (exists $$hash{$key+1}){
print<<END;
- <td width='25' ><form method='post'><input type='image' img src='/images/down.gif' alt='$Lang::tr{'fwdfw movedown'}' title='$Lang::tr{'fwdfw movedown'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
- <input type='hidden' name='key' value='$key' />
- <input type='hidden' name='config' value='$config' />
- <input type='hidden' name='ACTION' value='movedown' />
- </form></td></tr>
+ <td width='3%' align='center'>
+ <form method='POST' action=''>
+ <input type='image' img src='/images/down.gif' alt='$Lang::tr{'fwdfw movedown'}' title='$Lang::tr{'fwdfw movedown'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' />
+ <input type='hidden' name='key' value='$key' />
+ <input type='hidden' name='config' value='$config' />
+ <input type='hidden' name='ACTION' value='movedown' />
+ </form>
+ </td>
+ </tr>
END
}else{
- print"<td width='25'><input type='image' img src='/images/down.gif' style='visibility:hidden;'></td></tr>";
+ print"<td width='3%'></td></tr>";
}
#REMARK
if ($optionsfw{'SHOWREMARK'} eq 'on' && $$hash{$key}[16] ne ''){
- print"<tr bgcolor='$color'>";
- print"<td> </td><td bgcolor='$rulecolor'></td><td colspan='10'> $$hash{$key}[16]</td></tr>";
+ print <<END;
+ <tr bgcolor='$color'>
+ <td> </td>
+ <td bgcolor='$rulecolor'></td>
+ <td colspan='10'>
+ <em>$$hash{$key}[16]</em>
+ </td>
+ </tr>
+END
}
+
if ($$hash{$key}[18] eq 'ON'){
#TIMEFRAME
if ($$hash{$key}[18] eq 'ON'){
@@ -2434,7 +2669,7 @@ END
my $weekdays=join(",",@days);
if (@days){
print"<tr bgcolor='$color'>";
- print"<td> </td><td bgcolor='$rulecolor'></td><td align='left' colspan='10'> $weekdays $$hash{$key}[26] - $$hash{$key}[27] </td></tr>";
+ print"<td> </td><td bgcolor='$rulecolor'></td><td align='left' colspan='10'> $weekdays $$hash{$key}[26] - $$hash{$key}[27]</td></tr>";
}
}
}
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 90a5594..ebd1fdc 100755
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -88,27 +88,32 @@ unless (-e $configsrvgrp) { system("touch $configsrvgrp"); }
#### JAVA SCRIPT ####
print<<END;
<script>
+ var PROTOCOLS_WITH_PORTS = ["TCP", "UDP"];
+ var update_protocol = function() {
+ var protocol = \$("#protocol").val();
+
+ if (protocol === undefined)
+ return;
+
+ // Check if we are dealing with a protocol, that knows ports.
+ if (\$.inArray(protocol, PROTOCOLS_WITH_PORTS) >= 0) {
+ \$("#PORT").show();
+ \$("#PROTOKOLL").hide();
+ } else {
+ \$("#PORT").hide();
+ \$("#PROTOKOLL").show();
+ }
+ };
+
\$(document).ready(function() {
- // Automatically select radio buttons when corresponding
- // dropdown menu changes.
- \$("select").change(function() {
- var id = \$(this).attr("name");
- //When using SNAT or DNAT, check "USE NAT" Checkbox
- if ( id === 'snat' || id === 'dnat') {
- \$('#USE_NAT').prop('checked', true);
- }
- \$('#' + id).prop("checked", true);
- });
+ var protocol = \$("#protocol").val();
+ \$("#protocol").change(update_protocol);
+ update_protocol();
});
</script>
END
## ACTION ####
-if ($fwhostsettings{'ACTION'} eq $Lang::tr{'fwdfw reread'})
-{
- &reread_rules;
- &showmenu;
-}
# Update
if ($fwhostsettings{'ACTION'} eq 'updatenet' )
{
@@ -244,7 +249,7 @@ if ($fwhostsettings{'ACTION'} eq 'updateservice')
}
$fwhostsettings{'updatesrv'} = '';
if($needrules eq 'on'){
- &rules;
+ &General::firewall_config_changed();
}
&addservice;
}
@@ -406,7 +411,7 @@ if ($fwhostsettings{'ACTION'} eq 'savenet' )
$fwhostsettings{'NETREMARK'}='';
#check if an edited net affected groups and need to reload rules
if ($needrules eq 'on'){
- &rules;
+ &General::firewall_config_changed();
}
&addnet;
&viewtablenet;
@@ -542,7 +547,7 @@ if ($fwhostsettings{'ACTION'} eq 'savehost')
$fwhostsettings{'HOSTREMARK'}='';
#check if we need to update rules while host was edited
if($needrules eq 'on'){
- &rules;
+ &General::firewall_config_changed();
}
&addhost;
&viewtablehost;
@@ -717,7 +722,7 @@ if ($fwhostsettings{'ACTION'} eq 'savegrp')
#check if ruleupdate is needed
if($count > 0 )
{
- &rules;
+ &General::firewall_config_changed();
}
&addgrp;
&viewtablegrp;
@@ -735,7 +740,7 @@ if ($fwhostsettings{'ACTION'} eq 'saveservice')
}
}
}
- if($ICMP eq ''){$ICMP='BLANK';}
+ if($ICMP eq ''){$ICMP=$fwhostsettings{'ICMP_TYPES'};}
if (!$errormessage){
my $key = &General::findhasharraykey (\%customservice);
foreach my $i (0 .. 4) { $customservice{$key}[$i] = "";}
@@ -819,7 +824,7 @@ if ($fwhostsettings{'ACTION'} eq 'saveservicegrp')
$fwhostsettings{'updatesrvgrp'}='on';
}
if ($count gt 0){
- &rules;
+ &General::firewall_config_changed();
}
&addservicegrp;
&viewtableservicegrp;
@@ -934,7 +939,9 @@ if ($fwhostsettings{'ACTION'} eq 'deletegrphost')
}
}
&General::writehasharray("$configgrp", \%customgrp);
- if ($fwhostsettings{'grpcnt'} > 0){&rules;}
+ if ($fwhostsettings{'grpcnt'} > 0){
+ &General::firewall_config_changed();
+ }
if ($fwhostsettings{'update'} eq 'on'){
$fwhostsettings{'remark'}= $grpremark;
$fwhostsettings{'grp_name'}=$grpname;
@@ -1013,7 +1020,7 @@ if ($fwhostsettings{'ACTION'} eq 'delgrpservice')
}
}
&General::writehasharray("$configsrvgrp", \%customservicegrp);
- &rules;
+ &General::firewall_config_changed();
if ($fwhostsettings{'updatesrvgrp'} eq 'on'){
$fwhostsettings{'SRVGRP_NAME'}=$grpname;
$fwhostsettings{'SRVGRP_REMARK'}=$grpremark;
@@ -1102,11 +1109,7 @@ if($fwhostsettings{'ACTION'} eq '')
&showmenu;
}
### FUNCTIONS ###
-sub showmenu
-{
- if (-f "${General::swroot}/forward/reread"){
- print "<table border='1' rules='groups' bgcolor='lightgreen' width='100%'><form method='post'><td><div style='font-size:11pt; font-weight: bold;vertical-align: middle; '><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-face: Comic Sans MS; color: green; font-weight: bold; font-size: 14pt;'>    $Lang::tr{'fwhost reread'}</td></tr></table></form><br>";
- }
+sub showmenu {
&Header::openbox('100%', 'left',$Lang::tr{'fwhost menu'});
print "$Lang::tr{'fwhost welcome'}";
print<<END;
@@ -1306,7 +1309,7 @@ sub addservice
print<<END;
<table width='100%' border='0'><form method='post'>
<tr><td width='10%' nowrap='nowrap'>$Lang::tr{'fwhost srv_name'}:</td><td><input type='text' name='SRV_NAME' id='textbox1' value='$fwhostsettings{'SRV_NAME'}' size='24'><script>document.getElementById('textbox1').focus()</script></td></tr>
- <tr><td width='10%' nowrap='nowrap'>$Lang::tr{'fwhost prot'}:</td><td><select name='PROT'>
+ <tr><td width='10%' nowrap='nowrap'>$Lang::tr{'fwhost prot'}:</td><td><select name='PROT' id='protocol' >
END
foreach ("TCP","UDP","ICMP")
{
@@ -1318,11 +1321,11 @@ END
}
}
print<<END;
- </select></td></tr>
- <tr><td width='10%' nowrap='nowrap'>$Lang::tr{'fwhost icmptype'}</td><td><select name='ICMP_TYPES'>
+ </select></td></tr></table>
+ <div id='PROTOKOLL' class='noscript'><table width=100%' border='0'><tr><td width='10%' nowrap='nowrap'>$Lang::tr{'fwhost icmptype'}</td><td><select name='ICMP_TYPES'>
END
&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
- print"<option>All ICMP-Types</option>";
+ print"<option value='All ICMP-Types'>$Lang::tr{'fwdfw all icmp'}</option>";
foreach my $key (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) }keys %icmptypes){
if ($icmptypes{$key}[0] eq $fwhostsettings{'oldsrvicmp'}){
print"<option selected>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
@@ -1331,9 +1334,9 @@ END
}
}
print<<END;
- </select></td></tr>
- <tr><td width='10%'>$Lang::tr{'fwhost port'}:</td><td><input type='text' name='SRV_PORT' value='$fwhostsettings{'SRV_PORT'}' maxlength='11' size='24'></td></tr>
- <tr><td colspan='6'><br><hr></td></tr>
+ </select></td></tr></table></div>
+ <div id='PORT' class='noscript'><table width='100%' border='0'><tr><td width='10%'>$Lang::tr{'fwhost port'}:</td><td><input type='text' name='SRV_PORT' value='$fwhostsettings{'SRV_PORT'}' maxlength='11' size='24'></td></tr></table></div>
+ <table width='100%' border='0'><tr><td colspan='6'><br><hr></td></tr>
<tr><td colspan='6' align='right'>
END
if ($fwhostsettings{'updatesrv'} eq 'on')
@@ -1347,15 +1350,12 @@ END
<input type='hidden' name='oldsrvicmp' value='$fwhostsettings{'oldsrvicmp'}'>
</form>
END
-
- }else{
+ }else{
print"<input type='submit' value='$Lang::tr{'save'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='saveservice'></form>";
}
print<<END;
<form style='display:inline;' method='post'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'></form></td></tr>
</table></form>
-
-
END
&Header::closebox();
&viewtableservice;
@@ -1658,8 +1658,8 @@ END
print<<END;
<td>$customservice{$key}[0]</td><td align='center'>$customservice{$key}[2]</td><td align='center'>$customservice{$key}[1]</td><td align='center'>
END
- if($customservice{$key}[3] ne 'BLANK'){print $customservice{$key}[3];}
-
+ if($customservice{$key}[3] eq 'All ICMP-Types'){print $Lang::tr{'fwdfw all icmp'};}
+ elsif($customservice{$key}[3] ne 'BLANK'){print $customservice{$key}[3];}
print<<END;
</td><td align='center'>$customservice{$key}[4]x</td>
<td width='1%'><form method='post'><input type='image' src='/images/edit.gif' align='middle' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} /><input type='hidden' name='ACTION' value='editservice' />
@@ -2073,24 +2073,8 @@ sub getipforgroup
}
}
}
-sub rules
-{
- if (!-f "${General::swroot}/fwhosts/reread"){
- system("touch ${General::swroot}/fwhosts/reread");
- system("touch ${General::swroot}/forward/reread");
- }
-}
-sub reread_rules
-{
- system ("/usr/local/bin/forwardfwctrl");
- if ( -f "${General::swroot}/fwhosts/reread"){
- system("rm ${General::swroot}/fwhosts/reread");
- system("rm ${General::swroot}/forward/reread");
- }
-
-}
-sub decrease
-{
+
+sub decrease {
my $grp=$_[0];
&General::readhasharray("$confignet", \%customnetwork);
&General::readhasharray("$confighost", \%customhost);
diff --git a/html/cgi-bin/p2p-block.cgi b/html/cgi-bin/p2p-block.cgi
index cfca542..bb0d0ae 100755
--- a/html/cgi-bin/p2p-block.cgi
+++ b/html/cgi-bin/p2p-block.cgi
@@ -31,104 +31,112 @@ require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
-my $errormessage='';
-my $p2pfile = "${General::swroot}/forward/p2protocols";
+my $errormessage = '';
+my $p2pfile = "${General::swroot}/forward/p2protocols";
my @p2ps = ();
-my %fwdfwsettings=();
-my %color=();
-my %mainsettings=();
+my %fwdfwsettings = ();
+my %color = ();
+my %mainsettings = ();
-&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
-
-
&Header::showhttpheaders();
&Header::getcgihash(\%fwdfwsettings);
-&Header::openpage($Lang::tr{'fwdfw menu'}, 1, '');
-&Header::openbigbox('100%', 'center',$errormessage);
+&Header::openpage($Lang::tr{'p2p block'}, 1, '');
+&Header::openbigbox('100%', 'center', $errormessage);
-if ($fwdfwsettings{'ACTION'} eq ''){
-&p2pblock;
-}
-if ($fwdfwsettings{'ACTION'} eq 'togglep2p')
-{
- open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile";
+if ($fwdfwsettings{'ACTION'} eq 'togglep2p') {
+ open( FILE, "<$p2pfile") or die "Unable to read $p2pfile";
@p2ps = <FILE>;
close FILE;
- open( FILE, "> $p2pfile" ) or die "Unable to write $p2pfile";
- foreach my $p2pentry (sort @p2ps)
- {
- my @p2pline = split( /\;/, $p2pentry );
+ open( FILE, ">$p2pfile") or die "Unable to write $p2pfile";
+ foreach my $p2pentry (sort @p2ps) {
+ my @p2pline = split( /\;/, $p2pentry);
if ($p2pline[1] eq $fwdfwsettings{'P2PROT'}) {
- if($p2pline[2] eq 'on'){
- $p2pline[2]='off';
- }else{
- $p2pline[2]='on';
+ if ($p2pline[2] eq 'on') {
+ $p2pline[2] = 'off';
+ } else {
+ $p2pline[2] = 'on';
}
}
print FILE "$p2pline[0];$p2pline[1];$p2pline[2];\n";
}
close FILE;
- &rules;
- &p2pblock;
-}
-if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw reread'})
-{
- &reread_rules;
- &p2pblock;
-}
+ &General::firewall_config_changed();
+ &p2pblock();
+} else {
+ &p2pblock();
+}
-sub p2pblock
-{
- if (-f "${General::swroot}/forward/reread"){
- print "<table border='1' rules='groups' bgcolor='lightgreen' width='100%'><form method='post'><td><div style='font-size:11pt; font-weight: bold;vertical-align: middle; '><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-face: Comic Sans MS; color: green; font-weight: bold; font-size: 14pt;'>    $Lang::tr{'fwhost reread'}</div></td></tr></table></form><br>";
- }
+sub p2pblock {
my $gif;
- open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile";
+
+ open(FILE, "<$p2pfile") or die "Unable to read $p2pfile";
@p2ps = <FILE>;
close FILE;
- &Header::openbox('100%', 'center', 'P2P-Block');
+
+ &Header::openbox('100%', 'center', $Lang::tr{'p2p block'});
print <<END;
- <table width='35%' border='0'>
- <tr bgcolor='$color{'color22'}'><td align=center colspan='2' ><b>$Lang::tr{'protocol'}</b></td><td align='center'><b>$Lang::tr{'status'}</b></td></tr>
+ <table width='35%' border='0'>
+ <tr bgcolor='$color{'color22'}'>
+ <td align=center colspan='2' >
+ <b>$Lang::tr{'protocol'}</b>
+ </td>
+ <td align='center'>
+ <b>$Lang::tr{'status'}</b>
+ </td>
+ </tr>
END
- foreach my $p2pentry (sort @p2ps)
- {
- my @p2pline = split( /\;/, $p2pentry );
- if($p2pline[2] eq 'on'){
- $gif="/images/on.gif"
- }else{
- $gif="/images/off.gif"
+
+ foreach my $p2pentry (sort @p2ps) {
+ my @p2pline = split( /\;/, $p2pentry);
+ if ($p2pline[2] eq 'on') {
+ $gif = "/images/on.gif"
+ } else {
+ $gif = "/images/off.gif"
}
+
print <<END;
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <tr bgcolor='$color{'color20'}'>
- <td align='center' colspan='2' >$p2pline[0]:</td><td align='center'><input type='hidden' name='P2PROT' value='$p2pline[1]' /><input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;' ><input type='hidden' name='ACTION' value='togglep2p'></td></tr></form>
+ <tr bgcolor='$color{'color20'}'>
+ <td align='center' colspan='2'>
+ $p2pline[0]:
+ </td>
+ <td align='center'>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='P2PROT' value='$p2pline[1]'>
+ <input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;'>
+ <input type='hidden' name='ACTION' value='togglep2p'>
+ </form>
+ </td>
+ </tr>
END
}
- print"<tr><td><img src='/images/on.gif'></td><td align='left'>$Lang::tr{'outgoing firewall p2p allow'}</td></tr>";
- print"<tr><td><img src='/images/off.gif'></td><td align='left'>$Lang::tr{'outgoing firewall p2p deny'}</td></tr></table>";
- print"<br><br><br><table width='100%'><tr><td align='left'>$Lang::tr{'fwdfw p2p txt'}</td></tr></table>";
+
+ print <<END;
+ <tr>
+ <td>
+ <img src='/images/on.gif'>
+ </td>
+ <td>
+ $Lang::tr{'outgoing firewall p2p allow'}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <img src='/images/off.gif'>
+ </td>
+ <td>
+ $Lang::tr{'outgoing firewall p2p deny'}
+ </td>
+ </tr>
+ </table>
+END
+
&Header::closebox();
}
-sub rules
-{
- if (!-f "${General::swroot}/forward/reread"){
- system("touch ${General::swroot}/forward/reread");
- system("touch ${General::swroot}/fwhosts/reread");
- }
-}
-sub reread_rules
-{
- system("/usr/local/bin/forwardfwctrl");
- if ( -f "${General::swroot}/forward/reread"){
- system("rm ${General::swroot}/forward/reread");
- system("rm ${General::swroot}/fwhosts/reread");
- }
-}
+
&Header::closebigbox();
&Header::closepage();
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a894ba0..ce48d69 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -919,14 +919,12 @@
'fwdfw REJECT' => 'Verweigern (REJECT)',
'fwdfw action' => 'Aktion',
'fwdfw additional' => 'Weitere Einstellungen',
-'fwdfw addr grp' => 'Adressgruppen:',
'fwdfw addrule' => 'Regel hinzufügen/ändern:',
+'fwdfw all icmp' => 'Alle ICMP-Typen',
'fwdfw change' => 'Aktualisieren',
'fwdfw copy' => 'Kopieren',
-'fwdfw cust addr' => 'Custom Adressen:',
-'fwdfw cust net' => 'Custom Netzwerke:',
'fwdfw delete' => 'Löschen',
-'fwdfw dnat' => 'DNAT/Port-Weiterleitung',
+'fwdfw dnat' => 'Destination-NAT (Port-Weiterleitung)',
'fwdfw dnat error' => 'Für Destination-NAT muss ein einzelner Host als Ziel ausgewählt werden. Gruppen oder Netzwerke sind nicht erlaubt',
'fwdfw dnat porterr' => 'Für NAT-Regeln muss ein einzelner Port oder Portbereich angegeben werden',
'fwdfw edit' => 'Bearbeiten',
@@ -934,7 +932,6 @@
'fwdfw err nosrcip' => 'Bitte Quell-IP-Adresse angeben',
'fwdfw err notgt' => 'Kein Ziel ausgewählt',
'fwdfw err notgtip' => 'Bitte Ziel-IP-Adresse angeben',
-'fwdfw err prot' => 'Quell- und Zielprotokoll müssen identisch sein',
'fwdfw err prot_port' => 'Bei dem gewählten Protokoll sind Quell- und Zielport nicht erlaubt',
'fwdfw err prot_port1' => 'Bei Nutzung von Quell- oder Zielport muss als Protokoll TCP oder UDP gewählt werden.',
'fwdfw err remark' => 'Die Bemerkung enthält ungültige Zeichen',
@@ -942,15 +939,12 @@
'fwdfw err same' => 'Quelle und Ziel sind identisch',
'fwdfw err samesub' => 'Quell- und Ziel-IP-Adresse befinden sich im selben Subnetz',
'fwdfw err src_addr' => 'Quell-MAC/IP-Adresse ungültig',
-'fwdfw err srcovpn' => 'Die gewählte Quell-IP-Adresse wird bereits von einem OpenVPN-Client genutzt. Bitte wählen Sie die passende Verbindung direkt aus.',
-'fwdfw err srcport' => 'Bitte Quellport angeben',
'fwdfw err tgt_addr' => 'Ungültige Ziel-IP-Adresse',
'fwdfw err tgt_grp' => 'Die Ziel-Dienstgruppe ist leer',
'fwdfw err tgt_mac' => 'MAC-Adressen können nicht als Ziel defininert werden',
'fwdfw err tgt_port' => 'Ungültiger Zielport',
-'fwdfw err tgtovpn' => 'Die gewählte Ziel-IP-Adresse wird bereits von einem OpenVPN-Client genutzt. Bitte wählen Sie die passende Verbindung direkt aus.',
-'fwdfw err tgtport' => 'Bitte Zielport angeben',
'fwdfw err time' => 'Es muss mindestens ein Tag ausgewählt werden',
+'fwdfw external port nat' => 'Externer Port (NAT)',
'fwdfw final_rule' => 'Letzte Regel: ',
'fwdfw from' => 'Von:',
'fwdfw hint ip1' => 'Die zuletzt erzeugte Regel mag eventuell niemals zutreffen, da sich Quelle und Ziel überlappen.',
@@ -970,12 +964,12 @@
'fwdfw pol text1' => 'Firewall-Standardverhalten für von der Firewall selbst initiierte Verbindungen.',
'fwdfw pol title' => 'Standardverhalten der Firewall',
'fwdfw red' => 'ROT',
-'fwdfw reread' => 'Übernehmen',
+'fwdfw reread' => 'Änderungen übernehmen',
'fwdfw rule action' => 'Regelaktion:',
'fwdfw rule activate' => 'Regel aktivieren',
'fwdfw rulepos' => 'Regelposition',
'fwdfw rules' => 'Regeln',
-'fwdfw snat' => 'SNAT (ersetzt die Quell-IP-Adresse mit der hier konfigurierten)',
+'fwdfw snat' => 'Source-NAT',
'fwdfw source' => 'Quelle',
'fwdfw sourceip' => 'Quelladresse (IP/MAC-Adresse oder Netzwerk):',
'fwdfw std network' => 'Standard Netzwerke:',
@@ -986,9 +980,9 @@
'fwdfw timeframe' => 'Zeitrahmen hinzufügen',
'fwdfw toggle' => 'Aktivieren oder deaktivieren',
'fwdfw togglelog' => 'Log aktivieren oder deaktivieren',
-'fwdfw use nat' => 'NAT benutzen',
-'fwdfw use srcport' => 'Quellport benutzen',
-'fwdfw use srv' => 'Zielport benutzen',
+'fwdfw use nat' => 'Network Address Translation (NAT) benutzen',
+'fwdfw use srcport' => 'Quellport:',
+'fwdfw use srv' => 'Zielport:',
'fwdfw useless rule' => 'Diese Regel ist nicht sinnvoll.',
'fwdfw wd_fri' => 'Fr',
'fwdfw wd_mon' => 'Mo',
@@ -1562,8 +1556,8 @@
'outgoing firewall mode1' => 'In diesem Modus werden nur Verbindungen nach den oben definierten Regeln zugelassen.',
'outgoing firewall mode2' => 'In diesem Modus werden sämtliche Verbindungen erlaubt, bis auf die oben definierten Block-Regeln.',
'outgoing firewall outgoing firewall reserved groupname' => 'Bitte einen anderen Gruppennamen verwenden, dieser ist ein reserviertes Wort.',
-'outgoing firewall p2p allow' => 'P2P-Protokoll ist erlaubt!',
-'outgoing firewall p2p deny' => 'P2P-Protokoll ist gesperrt!',
+'outgoing firewall p2p allow' => 'P2P-Protokollnutzung ist erlaubt',
+'outgoing firewall p2p deny' => 'P2P-Protokollnutzung ist gesperrt',
'outgoing firewall p2p description 1' => 'Das Symbol',
'outgoing firewall p2p description 2' => 'bedeutet, dass das P2P-Protokoll erlaubt wird oder',
'outgoing firewall p2p description 3' => 'das P2P-Protokoll gesperrt wird.',
@@ -1612,6 +1606,7 @@
'ovpn_processprioVH' => 'Sehr Hoch',
'ovpnstatus log' => 'OVPN-Status-Log',
'ovpnsys log' => 'OVPN-System-Log',
+'p2p block' => 'P2P-Block',
'package failed to install' => 'Programmpaket konnte nicht installiert werden.',
'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.',
'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 9eb9a83..c3e4c3e 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -944,14 +944,12 @@
'fwdfw REJECT' => 'REJECT',
'fwdfw action' => 'Action',
'fwdfw additional' => 'Additional settings',
-'fwdfw addr grp' => 'Adress groups:',
'fwdfw addrule' => 'Add/Edit rule:',
+'fwdfw all icmp' => 'All ICMP types',
'fwdfw change' => 'Update',
'fwdfw copy' => 'Copy',
-'fwdfw cust addr' => 'Custom addresses:',
-'fwdfw cust net' => 'Custom networks:',
'fwdfw delete' => 'Delete',
-'fwdfw dnat' => 'Port forwarding/Destination NAT',
+'fwdfw dnat' => 'Destination NAT (Port forwarding)',
'fwdfw dnat error' => 'You have to select a single host for DNAT. Groups or networks are not allowed.',
'fwdfw dnat porterr' => 'You have to select a single port or portrange (tcp/udp) for NAT',
'fwdfw edit' => 'Edit',
@@ -959,7 +957,6 @@
'fwdfw err nosrcip' => 'Please provide a source IP address.',
'fwdfw err notgt' => 'No destination selected.',
'fwdfw err notgtip' => 'Please provide a destination IP address.',
-'fwdfw err prot' => 'Source and destination protocol need to match.',
'fwdfw err prot_port' => 'Source- or targetport are not allowed with selected protocol',
'fwdfw err prot_port1' => 'When using Source- or targetport you have to select TCP or UDP for protocol',
'fwdfw err remark' => 'Invalid characters in remark.',
@@ -967,15 +964,12 @@
'fwdfw err same' => 'Source and destination are identical.',
'fwdfw err samesub' => 'Source and destination IP addresses are from the same subnet.',
'fwdfw err src_addr' => 'Invalid source MAC/IP address.',
-'fwdfw err srcovpn' => 'The entered source IP address is used by an OpenVPN client. Please use the dropdown menu and select the right client connection.',
-'fwdfw err srcport' => 'Please provide a source port.',
'fwdfw err tgt_addr' => 'Invalid destination IP address.',
'fwdfw err tgt_grp' => 'The destination service group is empty',
'fwdfw err tgt_mac' => 'A MAC addresses cannot be used as destination.',
'fwdfw err tgt_port' => 'Invalid destination port.',
-'fwdfw err tgtovpn' => 'The entered destination IP address is used by an OpenVPN client. Please use the dropdown menu and select the right client connection.',
-'fwdfw err tgtport' => 'Please provide a destination port.',
'fwdfw err time' => 'You have to select at least one day.',
+'fwdfw external port nat' => 'External port (NAT)',
'fwdfw final_rule' => 'Last rule: ',
'fwdfw from' => 'From:',
'fwdfw hint ip1' => 'The last generated rule may never match, because source and destination subnets may overlap.',
@@ -995,12 +989,12 @@
'fwdfw pol text1' => 'Sets the default firewall behaviour for connections initiated by the firewall itself. Attention! You may lock yourself out.',
'fwdfw pol title' => 'Default firewall behaviour',
'fwdfw red' => 'RED',
-'fwdfw reread' => 'Apply',
+'fwdfw reread' => 'Apply changes',
'fwdfw rule action' => 'Rule action:',
'fwdfw rule activate' => 'Activate rule',
'fwdfw rulepos' => 'Rule position',
'fwdfw rules' => 'Rules',
-'fwdfw snat' => 'SNAT (replace the source\'s IP address by this IP address)',
+'fwdfw snat' => 'Source NAT',
'fwdfw source' => 'Source',
'fwdfw sourceip' => 'Source address (MAC/IP address or network):',
'fwdfw std network' => 'Standard networks:',
@@ -1011,9 +1005,9 @@
'fwdfw timeframe' => 'Use time constraints',
'fwdfw toggle' => 'Activate or deactivate',
'fwdfw togglelog' => 'Activate or deactivate logging',
-'fwdfw use nat' => 'Use NAT',
-'fwdfw use srcport' => 'Use source port',
-'fwdfw use srv' => 'Use destination port',
+'fwdfw use nat' => 'Use Network Address Translation (NAT)',
+'fwdfw use srcport' => 'Source port:',
+'fwdfw use srv' => 'Destination port:',
'fwdfw useless rule' => 'This rule is useless.',
'fwdfw wd_fri' => 'Fri',
'fwdfw wd_mon' => 'Mon',
@@ -1591,8 +1585,8 @@
'outgoing firewall mode1' => 'Using this mode, only connections based on the defined rules are allowed.',
'outgoing firewall mode2' => 'Using this mode, all connections are allowed despited off the defined ones.',
'outgoing firewall outgoing firewall reserved groupname' => 'Please use another group name, this name is reserved.',
-'outgoing firewall p2p allow' => 'p2p protocol is allowed',
-'outgoing firewall p2p deny' => 'p2p protocol is denied',
+'outgoing firewall p2p allow' => 'Using the P2P protocol is allowed',
+'outgoing firewall p2p deny' => 'Using the P2P protocol is forbidden',
'outgoing firewall p2p description 1' => 'The button',
'outgoing firewall p2p description 2' => 'means that the p2p protocol is allowed or',
'outgoing firewall p2p description 3' => 'that the p2p protocol is denied.',
@@ -1641,6 +1635,7 @@
'ovpn_processprioVH' => 'Very high',
'ovpnstatus log' => 'OVPN-Status-Log',
'ovpnsys log' => 'OVPN-System-Log',
+'p2p block' => 'P2P block',
'package failed to install' => 'Package failed to install.',
'pagerefresh' => 'Page is beeing refreshed, please wait.',
'pakfire accept all' => 'Do you want to install all packages?',
diff --git a/src/misc-progs/forwardfwctrl.c b/src/misc-progs/forwardfwctrl.c
index 797d27a..9f3f28e 100644
--- a/src/misc-progs/forwardfwctrl.c
+++ b/src/misc-progs/forwardfwctrl.c
@@ -5,12 +5,21 @@
*
*/
+#include <unistd.h>
+
#include "setuid.h"
int main(int argc, char *argv[]) {
if (!(initsetuid()))
exit(1);
- safe_system("/var/ipfire/forward/bin/rules.pl");
+ int retval = safe_system("/var/ipfire/forward/bin/rules.pl");
+
+ /* If rules.pl has been successfully executed, the indicator
+ * file is removed. */
+ if (retval == 0) {
+ unlink("/var/ipfire/forward/reread");
+ }
+
return 0;
}
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 78e35c82dc1273e4503aa336372f0c104f0bb737
by git＠ipfire.org 22 Oct '13
by git＠ipfire.org 22 Oct '13
22 Oct '13
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 78e35c82dc1273e4503aa336372f0c104f0bb737 (commit)
from 77117e740ccd09436449234be77b7a95d720043e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 78e35c82dc1273e4503aa336372f0c104f0bb737
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 22 15:01:24 2013 +0200
strongswan: Update to 5.1.1dr4.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/strongswan | 12 ++++++++++++
lfs/strongswan | 4 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 5d61ec1..0994d07 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -10,6 +10,7 @@ etc/ipsec.d/private
etc/ipsec.d/reqs
etc/ipsec.secrets
etc/strongswan.conf
+usr/bin/pki
#usr/lib/ipsec
#usr/lib/ipsec/libcharon.a
#usr/lib/ipsec/libcharon.la
@@ -90,6 +91,17 @@ usr/libexec/ipsec/scepclient
usr/libexec/ipsec/starter
usr/libexec/ipsec/stroke
usr/sbin/ipsec
+#usr/share/man/man1/pki---gen.1
+#usr/share/man/man1/pki---issue.1
+#usr/share/man/man1/pki---keyid.1
+#usr/share/man/man1/pki---pkcs7.1
+#usr/share/man/man1/pki---print.1
+#usr/share/man/man1/pki---pub.1
+#usr/share/man/man1/pki---req.1
+#usr/share/man/man1/pki---self.1
+#usr/share/man/man1/pki---signcrl.1
+#usr/share/man/man1/pki---verify.1
+#usr/share/man/man1/pki.1
#usr/share/man/man5/ipsec.conf.5
#usr/share/man/man5/ipsec.secrets.5
#usr/share/man/man5/strongswan.conf.5
diff --git a/lfs/strongswan b/lfs/strongswan
index 4701f34..1aed31f 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
include Config
-VER = 5.1.0
+VER = 5.1.1dr4
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c1cd0a3ba9960f590cae28c8470800e8
+$(DL_FILE)_MD5 = 05899faa9b8a8f253474af809b283ef9
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 77117e740ccd09436449234be77b7a95d720043e
by git＠ipfire.org 22 Oct '13
by git＠ipfire.org 22 Oct '13
22 Oct '13
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 77117e740ccd09436449234be77b7a95d720043e (commit)
via 2d490a7304b6a5a84822e5093c36a8985994d1c8 (commit)
via f974c1d4bcfc0fa95a6c9982f7fc7800158062ed (commit)
via abb6ed9179489ab3ab5ba30662bd7b6ed9483f53 (commit)
via 6a1cdd5fda6b0f17033762c2507fc542a4b89bfd (commit)
from 21b21d95a2c91ce235fe5705b0e5d2fbe6c396fe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 77117e740ccd09436449234be77b7a95d720043e
Merge: 21b21d9 2d490a7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 22 13:15:36 2013 +0200
Merge remote-tracking branch 'morlix/check_mk' into next
commit 2d490a7304b6a5a84822e5093c36a8985994d1c8
Merge: f974c1d cd010e0
Author: Timo Eissler <timo(a)eissler.pro>
Date: Sun Oct 20 00:46:53 2013 +0200
Merge branch 'master' into check_mk
commit f974c1d4bcfc0fa95a6c9982f7fc7800158062ed
Author: Timo Eissler <timo(a)eissler.pro>
Date: Sun Oct 20 00:41:22 2013 +0200
fix: create check_mk_agent plugins directory
commit abb6ed9179489ab3ab5ba30662bd7b6ed9483f53
Author: morlix <morlix(a)morlix.de>
Date: Thu Jun 27 10:51:55 2013 +0200
update for xinetd support
Fix typo in xinetd configuration directory.
Restart xinetd during installation or uninstallation if
xinetd is installed.
commit 6a1cdd5fda6b0f17033762c2507fc542a4b89bfd
Author: morlix <morlix(a)morlix.de>
Date: Wed Jun 26 16:10:48 2013 +0200
update check_mk_agent to 1.2.2p2
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/check_mk_agent | 1 +
lfs/check_mk_agent | 6 ++++--
src/paks/check_mk_agent/install.sh | 10 ++++++++++
src/paks/check_mk_agent/uninstall.sh | 8 ++++++++
4 files changed, 23 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/packages/check_mk_agent b/config/rootfiles/packages/check_mk_agent
index 073b483..1d68f74 100644
--- a/config/rootfiles/packages/check_mk_agent
+++ b/config/rootfiles/packages/check_mk_agent
@@ -1,2 +1,3 @@
usr/bin/check_mk_agent
+etc/xinetd.d/check_mk_agent
usr/bin/waitmax
diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent
index c0f70d1..6e6d557 100644
--- a/lfs/check_mk_agent
+++ b/lfs/check_mk_agent
@@ -24,7 +24,7 @@
include Config
-VER = 1.2.0p3
+VER = 1.2.2p2
THISAPP = check_mk_agent-$(VER)
DL_FILE = check_mk-${VER}.tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2c0f27fe8b6e3455557ecb30954d8a79
+$(DL_FILE)_MD5 = caa0f7662b4d170b2b6db2516bd41a89
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -78,6 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && tar xzf agents.tar.gz
cd $(DIR_APP) && install -v -m 755 check_mk_agent.linux /usr/bin/check_mk_agent
+ -mkdir /etc/xinetd.d
+ cd $(DIR_APP) && install -v -m 755 xinetd.conf /etc/xinetd.d/check_mk_agent
cd $(DIR_APP) && gcc $(CFLAGS) waitmax.c -o waitmax
cd $(DIR_APP) && install -v -m 755 waitmax /usr/bin/waitmax
@rm -rf $(DIR_APP)
diff --git a/src/paks/check_mk_agent/install.sh b/src/paks/check_mk_agent/install.sh
index 682363b..6aed752 100644
--- a/src/paks/check_mk_agent/install.sh
+++ b/src/paks/check_mk_agent/install.sh
@@ -24,3 +24,13 @@
. /opt/pakfire/lib/functions.sh
extract_files
restore_backup ${NAME}
+
+mkdir -p /usr/lib/check_mk_agent/plugins
+
+if [[ -x /usr/sbin/xinetd ]];
+then
+ if [[ -x /etc/init.d/xinetd ]]
+ then
+ /etc/init.d/xinetd restart
+ fi
+fi
diff --git a/src/paks/check_mk_agent/uninstall.sh b/src/paks/check_mk_agent/uninstall.sh
index 66f4344..3a0860a 100644
--- a/src/paks/check_mk_agent/uninstall.sh
+++ b/src/paks/check_mk_agent/uninstall.sh
@@ -24,3 +24,11 @@
. /opt/pakfire/lib/functions.sh
make_backup ${NAME}
remove_files
+
+if [[ -x /usr/sbin/xinetd ]];
+then
+ if [[ -x /etc/init.d/xinetd ]]
+ then
+ /etc/init.d/xinetd restart
+ fi
+fi
hooks/post-receive
--
IPFire 2.x development tree
1
0