From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 6f8891ccc776e62448e1e08d3efbada21a8fd447
Date: Sat, 10 Nov 2012 16:30:20 +0100 [thread overview]
Message-ID: <20121110153021.5A6BB200C2@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 65810 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 6f8891ccc776e62448e1e08d3efbada21a8fd447 (commit)
via b4a91e662d70122da6d22b4136b792ebaa23061b (commit)
via 24510a3563d196586caf9b34fb359e5b60f339cf (commit)
via b5c5e2d84de59abc3a09061b38c4027780383fb6 (commit)
via 9724a0bcd4e962d109fa3effb7b4a82aa7d420b6 (commit)
via ab74c839ddf125b73f7b79e925c31d03e92aa079 (commit)
via 55ecfab2b7d879554df2b5027865b4cdff9b95b1 (commit)
via fb874f2e7cb3a251d16b0555e51a45e219b9e46b (commit)
via 90d9b6049288301dedb3173f51b470ce141bad2e (commit)
via eead8d2e01061b462f1758e06e7082ca5d18e523 (commit)
via d095947fedf0e1b4460a2b465e9374c0158b2723 (commit)
via cb0742a89bec4caf46fa8007a9349b1002401348 (commit)
via bc9d59f8f98ba611a21154fe0eac1d7f1b0073d1 (commit)
via 555e3047361d4df6bb018509a54159e26cbf89b2 (commit)
via fe3a05da3a794e3025fde4b39775876835ad735a (commit)
via 03207e65b1244bb4a82a55bc1e1f893e05695aa0 (commit)
via d6b4566d9cf63ab0848b508382b6daa836b5cc7d (commit)
via d9efec0d7bc7bd6c0588ba978f6331a3449ddc8d (commit)
from cdd31b0871663337611424302ee6f0dcc109a81d (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 6f8891ccc776e62448e1e08d3efbada21a8fd447
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Nov 10 16:29:09 2012 +0100
finished core64.
commit b4a91e662d70122da6d22b4136b792ebaa23061b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Nov 10 16:28:15 2012 +0100
GeoIP: update database to 6.11.2012.
commit 24510a3563d196586caf9b34fb359e5b60f339cf
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Nov 10 16:27:51 2012 +0100
core64: add langs to updater and update cache.
commit b5c5e2d84de59abc3a09061b38c4027780383fb6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Nov 10 16:25:54 2012 +0100
langs: remove not translated ovpn strings.
Don't add english strings to other language files!
English will automaticly used if the string is not defined.
-----------------------------------------------------------------------
Summary of changes:
config/outgoingfw/outgoingfw.pl | 61 +++++++------------
config/rootfiles/common/daq | 30 +++++-----
config/rootfiles/common/snort | 61 ++++++++++++++++++-
config/rootfiles/core/{63 => 64}/exclude | 0
.../{oldcore/44 => core/64}/filelists/daq | 0
config/rootfiles/core/64/filelists/files | 7 ++
.../{oldcore/28 => core/64}/filelists/snort | 0
config/rootfiles/core/{60 => 64}/meta | 0
config/rootfiles/core/{61 => 64}/update.sh | 9 +--
config/snort/snort.conf | 42 ++++++++++++-
doc/language_issues.de | 3 +
doc/language_issues.en | 3 +
doc/language_issues.es | 8 ++-
doc/language_issues.fr | 8 ++-
doc/language_issues.pl | 8 ++-
doc/language_issues.ru | 8 ++-
doc/language_missings | 20 +++++++
html/cgi-bin/credits.cgi | 60 ++++++++-----------
html/cgi-bin/ids.cgi | 4 +-
html/cgi-bin/updatexlrator.cgi | 2 +-
langs/de/cgi-bin/de.pl | 13 +++--
langs/en/cgi-bin/en.pl | 13 +++--
langs/es/cgi-bin/es.pl | 4 -
langs/fr/cgi-bin/fr.pl | 8 +-
langs/pl/cgi-bin/pl.pl | 4 -
langs/ru/cgi-bin/ru.pl | 8 +-
lfs/GeoIP | 4 +-
lfs/daq | 4 +-
lfs/samba | 6 +-
lfs/snort | 4 +-
make.sh | 4 +-
src/initscripts/init.d/firewall | 1 -
src/pakfire/lib/functions.sh | 4 +-
33 files changed, 260 insertions(+), 151 deletions(-)
copy config/rootfiles/core/{63 => 64}/exclude (100%)
copy config/rootfiles/{oldcore/44 => core/64}/filelists/daq (100%)
create mode 100644 config/rootfiles/core/64/filelists/files
copy config/rootfiles/{oldcore/28 => core/64}/filelists/snort (100%)
copy config/rootfiles/core/{60 => 64}/meta (100%)
copy config/rootfiles/core/{61 => 64}/update.sh (96%)
Difference in files:
diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 8bb49e0..7dd1430 100644
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -181,6 +181,7 @@ foreach $configentry (sort @configs)
@PROTO = ("tcp","udp");
}
+ my $macrule = 0;
foreach $PROTO (@PROTO){
foreach $SOURCE (@SOURCE) {
$SOURCE =~ s/\s//gi;
@@ -189,9 +190,10 @@ foreach $configentry (sort @configs)
if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){
$SOURCE =~ s/[^a-zA-Z0-9]/:/gi;
- $CMD = "/sbin/iptables -A OUTGOINGFWMAC -m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO";
+ $CMD = "-m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO";
+ $macrule = 1;
} else {
- $CMD = "/sbin/iptables -A OUTGOINGFW -s $SOURCE -d $DESTINATION -p $PROTO";
+ $CMD = "-s $SOURCE -d $DESTINATION -p $PROTO";
}
if ($configline[8] && ( $configline[3] ne 'esp' || $configline[3] ne 'gre') ) {
@@ -218,24 +220,12 @@ foreach $configentry (sort @configs)
$CMD = "$CMD -o $netsettings{'RED_DEV'}";
if ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY'} eq 'MODE1' ) {
- if ($DEBUG) {
- print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '\n";
- } else {
- system("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '");
- }
+ applyrule("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '", $macrule);
} elsif ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY'} eq 'MODE2' ) {
- if ($DEBUG) {
- print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '\n";
- } else {
- system("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '");
- }
+ applyrule("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '", $macrule);
}
- if ($DEBUG) {
- print "$CMD -j $DO\n";
- } else {
- system("$CMD -j $DO");
- }
+ applyrule("$CMD -j $DO", $macrule);
}
}
}
@@ -246,10 +236,9 @@ open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile";
@p2ps = <FILE>;
close FILE;
-$CMD = "/sbin/iptables -A OUTGOINGFW -m ipp2p";
+$CMD = "-m ipp2p";
-foreach $p2pentry (sort @p2ps)
-{
+foreach $p2pentry (sort @p2ps) {
@p2pline = split( /\;/, $p2pentry );
if ( $outfwsettings{'POLICY'} eq 'MODE2' ) {
$DO = "DROP";
@@ -264,27 +253,23 @@ foreach $p2pentry (sort @p2ps)
}
}
if ($P2PSTRING) {
- if ($DEBUG) {
- print "$CMD $P2PSTRING -j $DO\n";
- } else {
- system("$CMD $P2PSTRING -j $DO");
- }
+ applyrule("$CMD $P2PSTRING -j $DO", 0);
}
if ( $outfwsettings{'POLICY'} eq 'MODE1' ) {
- if ( $outfwsettings{'MODE1LOG'} eq 'on' ) {
- $CMD = "/sbin/iptables -A OUTGOINGFW -o $netsettings{'RED_DEV'} -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '";
- if ($DEBUG) {
- print "$CMD\n";
- } else {
- system("$CMD");
- }
- }
+ if ( $outfwsettings{'MODE1LOG'} eq 'on' ) {
+ applyrule("-o $netsettings{'RED_DEV'} -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '", 0);
+ }
- $CMD = "/sbin/iptables -A OUTGOINGFW -o $netsettings{'RED_DEV'} -j DROP -m comment --comment 'DROP_OUTGOINGFW '";
- if ($DEBUG) {
- print "$CMD\n";
- } else {
- system("$CMD");
+ applyrule("-o $netsettings{'RED_DEV'} -j DROP -m comment --comment 'DROP_OUTGOINGFW '", 0);
+}
+
+sub applyrule($$) {
+ my $cmd = shift;
+ my $macrule = shift;
+
+ system("/sbin/iptables -A OUTGOINGFWMAC $cmd");
+ if ($macrule == 0) {
+ system("/sbin/iptables -A OUTGOINGFW $cmd");
}
}
diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq
index 0391a4b..e68cee4 100644
--- a/config/rootfiles/common/daq
+++ b/config/rootfiles/common/daq
@@ -17,17 +17,19 @@ usr/lib/daq
#usr/lib/daq/daq_nfq.so
#usr/lib/daq/daq_pcap.la
#usr/lib/daq/daq_pcap.so
-usr/lib/libdaq.a
-usr/lib/libdaq.la
-usr/lib/libdaq.so
-usr/lib/libdaq.so.0
-usr/lib/libdaq.so.0.0.1
-usr/lib/libdaq_static.a
-usr/lib/libdaq_static.la
-usr/lib/libdaq_static_modules.a
-usr/lib/libdaq_static_modules.la
-usr/lib/libsfbpf.a
-usr/lib/libsfbpf.la
-usr/lib/libsfbpf.so
-usr/lib/libsfbpf.so.0
-usr/lib/libsfbpf.so.0.0.1
+#usr/lib/libdaq.a
+#usr/lib/libdaq.la
+#usr/lib/libdaq.so
+#usr/lib/libdaq.so.1
+#usr/lib/libdaq.so.1.0.0
+#usr/lib/libdaq_static.a
+#usr/lib/libdaq_static.la
+#usr/lib/libdaq_static_modules.a
+#usr/lib/libdaq_static_modules.la
+#usr/lib/libsfbpf.a
+#usr/lib/libsfbpf.la
+#usr/lib/libsfbpf.so
+#usr/lib/libsfbpf.so.0
+#usr/lib/libsfbpf.so.0.0.1
+#usr/lib/libdaq.so.0
+#usr/lib/libdaq.so.0.0.1
diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort
index e07d6b5..90233a1 100644
--- a/config/rootfiles/common/snort
+++ b/config/rootfiles/common/snort
@@ -7,7 +7,26 @@ etc/snort/unicode.map
usr/bin/u2boat
usr/bin/u2spewfoo
#usr/include/snort
+#usr/include/snort/dynamic_output
+#usr/include/snort/dynamic_output/bitop.h
+#usr/include/snort/dynamic_output/ipv6_port.h
+#usr/include/snort/dynamic_output/obfuscation.h
+#usr/include/snort/dynamic_output/output_api.h
+#usr/include/snort/dynamic_output/output_common.h
+#usr/include/snort/dynamic_output/output_lib.h
+#usr/include/snort/dynamic_output/preprocids.h
+#usr/include/snort/dynamic_output/sfPolicy.h
+#usr/include/snort/dynamic_output/sf_dynamic_common.h
+#usr/include/snort/dynamic_output/sf_ip.h
+#usr/include/snort/dynamic_output/sf_protocols.h
+#usr/include/snort/dynamic_output/sf_snort_packet.h
+#usr/include/snort/dynamic_output/sfrt.h
+#usr/include/snort/dynamic_output/sfrt_dir.h
+#usr/include/snort/dynamic_output/sfrt_trie.h
+#usr/include/snort/dynamic_output/snort_debug.h
+#usr/include/snort/dynamic_output/stream_api.h
#usr/include/snort/dynamic_preproc
+#usr/include/snort/dynamic_preproc/attribute_table_api.h
#usr/include/snort/dynamic_preproc/bitop.h
#usr/include/snort/dynamic_preproc/cpuclock.h
#usr/include/snort/dynamic_preproc/idle_processing.h
@@ -30,6 +49,7 @@ usr/bin/u2spewfoo
#usr/include/snort/dynamic_preproc/sf_preproc_info.h
#usr/include/snort/dynamic_preproc/sf_protocols.h
#usr/include/snort/dynamic_preproc/sf_sdlist_types.h
+#usr/include/snort/dynamic_preproc/sf_seqnums.h
#usr/include/snort/dynamic_preproc/sf_snort_packet.h
#usr/include/snort/dynamic_preproc/sf_snort_plugin_api.h
#usr/include/snort/dynamic_preproc/sfcommon.h
@@ -44,58 +64,89 @@ usr/bin/u2spewfoo
#usr/include/snort/dynamic_preproc/ssl.h
#usr/include/snort/dynamic_preproc/str_search.h
#usr/include/snort/dynamic_preproc/stream_api.h
-usr/lib/pkgconfig/snort.pc
-usr/lib/pkgconfig/snort_preproc.pc
+#usr/lib/pkgconfig/snort.pc
+#usr/lib/pkgconfig/snort_output.pc
+#usr/lib/pkgconfig/snort_preproc.pc
#usr/lib/snort
+usr/lib/snort/dynamic_output
+#usr/lib/snort/dynamic_output/libsf_dynamic_output.a
+#usr/lib/snort/dynamic_output/libsf_dynamic_output.la
usr/lib/snort/dynamic_preproc
#usr/lib/snort/dynamic_preproc/libsf_dynamic_preproc.a
#usr/lib/snort/dynamic_preproc/libsf_dynamic_preproc.la
usr/lib/snort_dynamicengine
+#usr/lib/snort_dynamicengine/libsf_engine.a
#usr/lib/snort_dynamicengine/libsf_engine.la
#usr/lib/snort_dynamicengine/libsf_engine.so
#usr/lib/snort_dynamicengine/libsf_engine.so.0
#usr/lib/snort_dynamicengine/libsf_engine.so.0.0.0
usr/lib/snort_dynamicpreprocessor
+#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.a
+#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.la
+#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.so
+#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.so.0
+#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.a
+#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.la
+#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.so
+#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.so.0
+#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.a
+#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.la
+#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.so
+#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.so.0
+#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_ssl_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_ssl_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_ssl_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_ssl_preproc.so.0
@@ -109,7 +160,7 @@ usr/sbin/snort
#usr/share/doc/snort/NEWS
#usr/share/doc/snort/PROBLEMS
#usr/share/doc/snort/README
-#usr/share/doc/snort/README.ARUBA
+#usr/share/doc/snort/README.GTP
#usr/share/doc/snort/README.PLUGINS
#usr/share/doc/snort/README.PerfProfiling
#usr/share/doc/snort/README.SMTP
@@ -121,10 +172,10 @@ usr/sbin/snort
#usr/share/doc/snort/README.counts
#usr/share/doc/snort/README.csv
#usr/share/doc/snort/README.daq
-#usr/share/doc/snort/README.database
#usr/share/doc/snort/README.dcerpc2
#usr/share/doc/snort/README.decode
#usr/share/doc/snort/README.decoder_preproc_rules
+#usr/share/doc/snort/README.dnp3
#usr/share/doc/snort/README.dns
#usr/share/doc/snort/README.event_queue
#usr/share/doc/snort/README.filters
@@ -136,6 +187,7 @@ usr/sbin/snort
#usr/share/doc/snort/README.imap
#usr/share/doc/snort/README.ipip
#usr/share/doc/snort/README.ipv6
+#usr/share/doc/snort/README.modbus
#usr/share/doc/snort/README.multipleconfigs
#usr/share/doc/snort/README.normalize
#usr/share/doc/snort/README.pcap_readmode
@@ -153,6 +205,7 @@ usr/sbin/snort
#usr/share/doc/snort/README.tag
#usr/share/doc/snort/README.thresholding
#usr/share/doc/snort/README.u2boat
+#usr/share/doc/snort/README.unified2
#usr/share/doc/snort/README.variables
#usr/share/doc/snort/TODO
#usr/share/doc/snort/USAGE
diff --git a/config/rootfiles/core/64/exclude b/config/rootfiles/core/64/exclude
new file mode 100644
index 0000000..b6a8d1d
--- /dev/null
+++ b/config/rootfiles/core/64/exclude
@@ -0,0 +1,13 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+var/state/dhcp/dhcpd.leases
diff --git a/config/rootfiles/core/64/filelists/daq b/config/rootfiles/core/64/filelists/daq
new file mode 120000
index 0000000..d0e0956
--- /dev/null
+++ b/config/rootfiles/core/64/filelists/daq
@@ -0,0 +1 @@
+../../../common/daq
\ No newline at end of file
diff --git a/config/rootfiles/core/64/filelists/files b/config/rootfiles/core/64/filelists/files
new file mode 100644
index 0000000..072fc70
--- /dev/null
+++ b/config/rootfiles/core/64/filelists/files
@@ -0,0 +1,7 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/firewall
+srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
+var/ipfire/outgoing/bin/outgoingfw.pl
+var/ipfire/langs
diff --git a/config/rootfiles/core/64/filelists/snort b/config/rootfiles/core/64/filelists/snort
new file mode 120000
index 0000000..9406ce0
--- /dev/null
+++ b/config/rootfiles/core/64/filelists/snort
@@ -0,0 +1 @@
+../../../common/snort
\ No newline at end of file
diff --git a/config/rootfiles/core/64/meta b/config/rootfiles/core/64/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/64/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/64/update.sh b/config/rootfiles/core/64/update.sh
new file mode 100644
index 0000000..c1e7545
--- /dev/null
+++ b/config/rootfiles/core/64/update.sh
@@ -0,0 +1,82 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=64
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/snort stop
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+/etc/init.d/snort start
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#arch=`uname -m`
+#if [ ${arch::3} == "arm" ]; then
+# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
+# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
+#else
+# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
+# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+#fi
+
+
+#Rebuild initrd's because some compat-wireless modules are inside
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/snort/snort.conf b/config/snort/snort.conf
index 0ce0140..ea9f81f 100644
--- a/config/snort/snort.conf
+++ b/config/snort/snort.conf
@@ -42,7 +42,7 @@ ipvar FTP_SERVERS $HOME_NET
ipvar SIP_SERVERS $HOME_NET
# List of ports you run web servers on
-portvar HTTP_PORTS [80,81,311,444,591,593,901,1220,1414,1830,2301,2381,2809,3128,3702,5250,7001,7777,7779,8000,8008,8028,8080,8088,8118,8123,8180,8181,8243,8280,8888,9090,9091,9443,9999,11371]
+portvar HTTP_PORTS [80,81,311,444,591,593,901,1220,1414,1830,2301,2381,2809,3128,3702,5250,7001,7777,7779,8000,8008,8028,8080,8088,8118,8123,8180,8181,8243,8280,8888,9090,9091,9443,9999,11371,50002,55555]
# List of ports you want to look for SHELLCODE on.
portvar SHELLCODE_PORTS !80
@@ -59,6 +59,12 @@ portvar FTP_PORTS [21,2100,3535]
# List of ports you run SIP servers on
portvar SIP_PORTS [5060,5061,5600]
+# List of file data ports for file inspection
+portvar FILE_DATA_PORTS [$HTTP_PORTS,110,143]
+
+# List of GTP ports for GTP preprocessor
+portvar GTP_PORTS [2123,2152,3386]
+
# other variables, these should not be modified
ipvar AIM_SERVERS [64.12.24.0/23,64.12.28.0/23,64.12.161.0/24,64.12.163.0/24,64.12.200.0/24,205.188.3.0/24,205.188.5.0/24,205.188.7.0/24,205.188.9.0/24,205.188.153.0/24,205.188.179.0/24,205.188.248.0/24]
@@ -158,6 +164,13 @@ config detection: search-method ac-split search-optimize max-pattern-len 20
config event_queue: max_queue 8 log 3 order_events content_length
###################################################
+## Configure GTP if it is to be used.
+## For more information, see README.GTP
+####################################################
+
+# config enable_gtp
+
+###################################################
# Per packet and rule latency enforcement
# For more information see README.ppm
###################################################
@@ -183,6 +196,12 @@ config event_queue: max_queue 8 log 3 order_events content_length
#config profile_preprocs: print all, sort avg_ticks
###################################################
+# Configure protocol aware flushing
+# For more information see README.stream5
+###################################################
+config paf_max: 16000
+
+###################################################
# Step #4: Configure dynamic loaded libraries.
# For more information, see Snort Manual, Configuring Snort - Dynamic Modules
###################################################
@@ -201,6 +220,9 @@ dynamicengine /usr/lib/snort_dynamicengine/libsf_engine.so
# For more information, see the Snort Manual, Configuring Snort - Preprocessors
###################################################
+# GTP Control Channle Preprocessor. For more information, see README.GTP
+# preprocessor gtp: ports { 2123 3386 2152 }
+
# Inline packet normalization. For more information, see README.normalize
# Does nothing in IDS mode
preprocessor normalize_ip4
@@ -228,7 +250,7 @@ preprocessor stream5_tcp: policy windows, detect_anomalies, require_3whs 180, \
7000 8181 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779, \
ports both 80 81 311 443 465 563 591 593 636 901 989 992 993 994 995 1220 1414 1830 2301 2381 2809 3128 3702 5250 7907 7001 7802 7777 7779 \
7801 7900 7901 7902 7903 7904 7905 7906 7908 7909 7910 7911 7912 7913 7914 7915 7916 \
- 7917 7918 7919 7920 8000 8008 8028 8080 8088 8118 8123 8180 8243 8280 8888 9090 9091 9443 9999 11371
+ 7917 7918 7919 7920 8000 8008 8028 8080 8088 8118 8123 8180 8243 8280 8888 9090 9091 9443 9999 11371 50002 55555
preprocessor stream5_udp: timeout 180
# performance statistics. For more information, see the Snort Manual, Configuring Snort - Preprocessors - Performance Monitor
@@ -237,6 +259,7 @@ preprocessor stream5_udp: timeout 180
# HTTP normalization and anomaly detection. For more information, see README.http_inspect
preprocessor http_inspect: global iis_unicode_map unicode.map 1252 compress_depth 65535 decompress_depth 65535
preprocessor http_inspect_server: server default \
+ http_methods { GET POST PUT SEARCH MKCOL COPY MOVE LOCK UNLOCK NOTIFY POLL BCOPY BDELETE BMOVE LINK UNLINK OPTIONS HEAD DELETE TRACE TRACK CONNECT SOURCE SUBSCRIBE UNSUBSCRIBE PROPFIND PROPPATCH BPROPFIND BPROPPATCH RPC_CONNECT PROXY_SUCCESS BITS_POST CCM_POST SMS_POST RPC_IN_DATA RPC_OUT_DATA RPC_ECHO_DATA } \
chunk_length 500000 \
server_flow_depth 0 \
client_flow_depth 0 \
@@ -244,13 +267,16 @@ preprocessor http_inspect_server: server default \
oversize_dir_length 500 \
max_header_length 750 \
max_headers 100 \
- ports { 80 81 311 591 593 901 1220 1414 1830 2301 2381 2809 3128 3702 5250 7001 7777 7779 8000 8008 8028 8080 8088 8118 8123 8180 8181 8243 8280 8888 9090 9091 9443 9999 11371 } \
+ max_spaces 200 \
+ small_chunk_length { 10 5 } \
+ ports { 80 81 311 591 593 901 1220 1414 1830 2301 2381 2809 3128 3702 5250 7001 7777 7779 8000 8008 8028 8080 8088 8118 8123 8180 8181 8243 8280 8888 9090 9091 9443 9999 11371 50002 55555 } \
non_rfc_char { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 } \
enable_cookie \
extended_response_inspection \
inspect_gzip \
normalize_utf \
unlimited_decompress \
+ normalize_javascript \
apache_whitespace no \
ascii no \
bare_byte no \
@@ -271,7 +297,7 @@ preprocessor rpc_decode: 111 32770 32771 32772 32773 32774 32775 32776 32777 327
preprocessor bo
# FTP / Telnet normalization and anomaly detection. For more information, see README.ftptelnet
-preprocessor ftp_telnet: global inspection_type stateful encrypted_traffic no
+preprocessor ftp_telnet: global inspection_type stateful encrypted_traffic no check_encrypted
preprocessor ftp_telnet_protocol: telnet \
ayt_attack_thresh 20 \
normalize ports { 23 } \
@@ -431,6 +457,14 @@ preprocessor pop: \
bitenc_decode_depth 0 \
uu_decode_depth 0
+# Modbus preprocessor. For more information see README.modbus
+preprocessor modbus: ports { 502 }
+
+# DNP3 preprocessor. For more information see README.dnp3
+preprocessor dnp3: ports { 20000 } \
+ memcap 262144 \
+ check_crc
+
###################################################
# Step #6: Configure output plugins
# For more information, see Snort Manual, Configuring Snort - Output Modules
diff --git a/doc/language_issues.de b/doc/language_issues.de
index d182dbb..5a42ae5 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -117,6 +117,7 @@ WARNING: translation string unused: disconnect
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: donation-link
WARNING: translation string unused: driver
WARNING: translation string unused: dynamic dns client
WARNING: translation string unused: eciadsl help
@@ -279,6 +280,8 @@ WARNING: translation string unused: o-no
WARNING: translation string unused: o-yes
WARNING: translation string unused: online help en
WARNING: translation string unused: only red
+WARNING: translation string unused: openvpn disabled
+WARNING: translation string unused: openvpn enabled
WARNING: translation string unused: optional data
WARNING: translation string unused: optionsfw portlist hint
WARNING: translation string unused: optionsfw warning
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 3ae364c..6d6a2a6 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: translation string unused: driver
WARNING: translation string unused: dynamic dns client
@@ -307,6 +308,8 @@ WARNING: translation string unused: o-no
WARNING: translation string unused: o-yes
WARNING: translation string unused: online help en
WARNING: translation string unused: only red
+WARNING: translation string unused: openvpn disabled
+WARNING: translation string unused: openvpn enabled
WARNING: translation string unused: optional data
WARNING: translation string unused: optionsfw portlist hint
WARNING: translation string unused: optionsfw warning
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 6b2ab8e..6bcbf86 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: translation string unused: driver
WARNING: translation string unused: dynamic dns client
@@ -498,7 +499,9 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Async logging enabled
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: Set time on boot
+WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: bytes
+WARNING: untranslated string: deprecated fs warn
WARNING: untranslated string: fireinfo ipfire version
WARNING: untranslated string: fireinfo is disabled
WARNING: untranslated string: fireinfo is enabled
@@ -520,14 +523,14 @@ WARNING: untranslated string: minute
WARNING: untranslated string: new
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
-WARNING: untranslated string: openvpn disabled
-WARNING: untranslated string: openvpn enabled
WARNING: untranslated string: openvpn fragment allowed with udp
WARNING: untranslated string: openvpn mssfix allowed with udp
WARNING: untranslated string: openvpn prefix local subnet
WARNING: untranslated string: openvpn prefix openvpn subnet
WARNING: untranslated string: openvpn prefix remote subnet
WARNING: untranslated string: openvpn subnet is used
+WARNING: untranslated string: other
+WARNING: untranslated string: our donors
WARNING: untranslated string: outgoing firewall add ip group
WARNING: untranslated string: outgoing firewall add mac group
WARNING: untranslated string: outgoing firewall edit ip group
@@ -550,4 +553,5 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: static routes
WARNING: untranslated string: system information
+WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index b1a94a1..189932f 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: translation string unused: driver
WARNING: translation string unused: dynamic dns client
@@ -497,7 +498,9 @@ WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Scan for Songs
+WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: bytes
+WARNING: untranslated string: deprecated fs warn
WARNING: untranslated string: dns address deleted txt
WARNING: untranslated string: fireinfo ipfire version
WARNING: untranslated string: fireinfo is disabled
@@ -522,14 +525,14 @@ WARNING: untranslated string: ntp common settings
WARNING: untranslated string: ntp sync
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
-WARNING: untranslated string: openvpn disabled
-WARNING: untranslated string: openvpn enabled
WARNING: untranslated string: openvpn fragment allowed with udp
WARNING: untranslated string: openvpn mssfix allowed with udp
WARNING: untranslated string: openvpn prefix local subnet
WARNING: untranslated string: openvpn prefix openvpn subnet
WARNING: untranslated string: openvpn prefix remote subnet
WARNING: untranslated string: openvpn subnet is used
+WARNING: untranslated string: other
+WARNING: untranslated string: our donors
WARNING: untranslated string: outgoing firewall reserved groupname
WARNING: untranslated string: pakfire ago
WARNING: untranslated string: route config changed
@@ -542,6 +545,7 @@ WARNING: untranslated string: system information
WARNING: untranslated string: upload new ruleset
WARNING: untranslated string: urlfilter file ext block
WARNING: untranslated string: urlfilter mode block
+WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlanap access point
WARNING: untranslated string: wlanap channel
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 6b2ab8e..6bcbf86 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: translation string unused: driver
WARNING: translation string unused: dynamic dns client
@@ -498,7 +499,9 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Async logging enabled
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: Set time on boot
+WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: bytes
+WARNING: untranslated string: deprecated fs warn
WARNING: untranslated string: fireinfo ipfire version
WARNING: untranslated string: fireinfo is disabled
WARNING: untranslated string: fireinfo is enabled
@@ -520,14 +523,14 @@ WARNING: untranslated string: minute
WARNING: untranslated string: new
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
-WARNING: untranslated string: openvpn disabled
-WARNING: untranslated string: openvpn enabled
WARNING: untranslated string: openvpn fragment allowed with udp
WARNING: untranslated string: openvpn mssfix allowed with udp
WARNING: untranslated string: openvpn prefix local subnet
WARNING: untranslated string: openvpn prefix openvpn subnet
WARNING: untranslated string: openvpn prefix remote subnet
WARNING: untranslated string: openvpn subnet is used
+WARNING: untranslated string: other
+WARNING: untranslated string: our donors
WARNING: untranslated string: outgoing firewall add ip group
WARNING: untranslated string: outgoing firewall add mac group
WARNING: untranslated string: outgoing firewall edit ip group
@@ -550,4 +553,5 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: static routes
WARNING: untranslated string: system information
+WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index ee67873..e25d81d 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -139,6 +139,7 @@ WARNING: translation string unused: disconnect
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: translation string unused: driver
WARNING: translation string unused: dynamic dns client
@@ -489,7 +490,9 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Add a route
WARNING: untranslated string: Edit an existing route
WARNING: untranslated string: Scan for Songs
+WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: bytes
+WARNING: untranslated string: deprecated fs warn
WARNING: untranslated string: disk access per
WARNING: untranslated string: extrahd because there is already a device mounted
WARNING: untranslated string: extrahd cant umount
@@ -503,14 +506,14 @@ WARNING: untranslated string: minute
WARNING: untranslated string: new
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
-WARNING: untranslated string: openvpn disabled
-WARNING: untranslated string: openvpn enabled
WARNING: untranslated string: openvpn fragment allowed with udp
WARNING: untranslated string: openvpn mssfix allowed with udp
WARNING: untranslated string: openvpn prefix local subnet
WARNING: untranslated string: openvpn prefix openvpn subnet
WARNING: untranslated string: openvpn prefix remote subnet
WARNING: untranslated string: openvpn subnet is used
+WARNING: untranslated string: other
+WARNING: untranslated string: our donors
WARNING: untranslated string: outgoing firewall reserved groupname
WARNING: untranslated string: outgoing traffic in bytes per second
WARNING: untranslated string: route config changed
@@ -518,4 +521,5 @@ WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: static routes
+WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
diff --git a/doc/language_missings b/doc/language_missings
index 16e3ba5..55e0e40 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -10,6 +10,8 @@
############################################################################
# Checking cgi-bin translations for language: fr #
############################################################################
+< advproxy errmsg invalid upstream proxy
+< deprecated fs warn
< dns address deleted txt
< fireinfo ipfire version
< fireinfo is disabled
@@ -41,12 +43,15 @@
< openvpn prefix openvpn subnet
< openvpn prefix remote subnet
< openvpn subnet is used
+< other
+< our donors
< snort working
< static routes
< system information
< upload new ruleset
< urlfilter file ext block
< urlfilter mode block
+< visit us at
< vpn keyexchange
< wlanap access point
< wlanap channel
@@ -74,7 +79,9 @@
############################################################################
# Checking cgi-bin translations for language: es #
############################################################################
+< advproxy errmsg invalid upstream proxy
< Async logging enabled
+< deprecated fs warn
< fireinfo ipfire version
< fireinfo is disabled
< fireinfo is enabled
@@ -103,6 +110,8 @@
< openvpn prefix openvpn subnet
< openvpn prefix remote subnet
< openvpn subnet is used
+< other
+< our donors
< outgoing firewall add ip group
< outgoing firewall add mac group
< outgoing firewall edit ip group
@@ -120,6 +129,7 @@
< Set time on boot
< static routes
< system information
+< visit us at
< vpn keyexchange
############################################################################
# Checking install/setup translations for language: pl #
@@ -127,6 +137,8 @@
############################################################################
# Checking cgi-bin translations for language: pl #
############################################################################
+< advproxy errmsg invalid upstream proxy
+< deprecated fs warn
< extrahd because there is already a device mounted
< extrahd cant umount
< extrahd install or load driver
@@ -147,7 +159,10 @@
< openvpn prefix openvpn subnet
< openvpn prefix remote subnet
< openvpn subnet is used
+< other
+< our donors
< static routes
+< visit us at
< vpn keyexchange
############################################################################
# Checking install/setup translations for language: ru #
@@ -156,7 +171,9 @@
# Checking cgi-bin translations for language: ru #
############################################################################
< Add a route
+< advproxy errmsg invalid upstream proxy
< day-graph
+< deprecated fs warn
< disk access per
< Edit an existing route
< extrahd because there is already a device mounted
@@ -183,8 +200,11 @@
< openvpn prefix openvpn subnet
< openvpn prefix remote subnet
< openvpn subnet is used
+< other
+< our donors
< outgoing traffic in bytes per second
< static routes
+< visit us at
< vpn keyexchange
< week-graph
< year-graph
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 3ae2f71..3224267 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -39,16 +39,18 @@ require "${General::swroot}/header.pl";
print <<END
<p>$Lang::tr{'donation-text'}</p>
- <div align="center">
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input type="hidden" name="cmd" value="_s-xclick">
- <input type="hidden" name="hosted_button_id" value="HHBTSN9QRWPAY">
- <input type="image" src="$Lang::tr{'donation-link'}" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
- <img alt="" border="0" src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1">
- </form>
- </div>
-<br />
+<div align="center">
+ <a href="http://www.ipfire.org/donate">
+ <strong>$Lang::tr{'donation'}</strong>
+ </a>
+</div>
+<br><br><hr><br>
+<p style="text-align: center;">
+ $Lang::tr{'our donors'}:
+
+ <a href="http://www.irrsinn.de" target="_blank">irrsinn.de gmbh</a>
+</p>
END
;
&Header::closebox();
@@ -56,12 +58,11 @@ END
&Header::openbox('100%', 'left', $Lang::tr{'credits'});
print <<END
-<br /><center><b><a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a></b></center>
-<br />
-<p>
- <b>IPFire is based on IPCop and Smoothwall. Many thanks to its developers.</b><br />
- <b>We want to say thank you to all of the developers who ever contributed anything to IPFire.</b>
-</p>
+<br>
+<center>
+ $Lang::tr{'visit us at'}: <b><a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a></b>
+</center>
+<br><hr><br>
<p><b>Development:</b><br />
@@ -73,8 +74,6 @@ Christian Schmidt
(<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\@ipfire.org</a>) - Vice Project Leader <br />
Stefan Schantl
(<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\@ipfire.org</a>)<br />
-Jan Paul Tücking
-(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)<br />
Heiner Schmeling
(<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\@ipfire.org</a>)<br />
Ronald Wiesinger
@@ -94,28 +93,21 @@ Peter Pfeiffer
(<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\@ipfire.org</a>)<br />
Peter Schälchli
(<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\@ipfire.org</a>)<br />
-</p>
-<p>Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too.<br />
-There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, Hddtemp and Wake-on-LAN.<br />
-Distributed by Marco Sondermann, Ufuk Altinkaynak, Thomas Eichstaedt and Olaf Westrik.</p>
-<p>
-
-This product includes GeoLite data created by MaxMind, available from <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>.
+Jan Paul Tücking
+(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)<br />
</p>
END
;
&Header::closebox();
-&Header::openbox('100%', 'left', 'General Public License v3');
-if ( -e "/usr/share/doc/licenses/GPLv3" ) {
- print '<textarea rows="25" cols="75" readonly="true">';
- print `cat "/usr/share/doc/licenses/GPLv3"`;
- print '</textarea>';
-}
-else {
- print '<br /><a href="http://www.gnu.org/licenses/gpl-3.0.txt" target="_blank">GENERAL PUBLIC LICENSE</a><br />';
-}
-
+&Header::openbox("100%", "left", $Lang::tr{'other'});
+print <<END
+ <p>
+ This product includes GeoLite data created by MaxMind, available from
+ <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>.
+ </p>
+END
+;
&Header::closebox();
&Header::closebigbox();
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 31b8730..efbc3de 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") {
####################### End added for snort rules control #################################
if ($snortsettings{'RULES'} eq 'subscripted') {
- $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2912_s.tar.gz/$snortsettings{'OINKCODE'}";
+ $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931_s.tar.gz/$snortsettings{'OINKCODE'}";
} elsif ($snortsettings{'RULES'} eq 'registered') {
- $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2912.tar.gz/$snortsettings{'OINKCODE'}";
+ $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931.tar.gz/$snortsettings{'OINKCODE'}";
} else {
$url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";
}
diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
index 04b7b8e..e3e633c 100644
--- a/html/cgi-bin/updatexlrator.cgi
+++ b/html/cgi-bin/updatexlrator.cgi
@@ -1362,7 +1362,7 @@ sub printlegendicons
<td><img src='/images/updbooster/updxl-globe.gif' alt='$Lang::tr{'updxlrtr last checkup'}' /></td>
<td class='base'>$Lang::tr{'updxlrtr last checkup'}</td>
<td class='base'> </td>
- <td><img src='/images/updbooster/delete.gif' alt='$Lang::tr{'updxlrtr remove file'}' /></td>
+ <td><img src='/images/delete.gif' alt='$Lang::tr{'updxlrtr remove file'}' /></td>
<td class='base'>$Lang::tr{'updxlrtr remove file'}</td>
<td class='base'> </td>
<td class='base'> </td>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 3ec57eb..f686c30 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -222,8 +222,8 @@
'advproxy errmsg invalid mac' => 'Ungültige MAC-Adresse',
'advproxy errmsg invalid pdc' => 'Ungültiger Hostname für den Primary Domain Controller',
'advproxy errmsg invalid proxy port' => 'Ungültiger Proxy-Port',
-'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy',
'advproxy errmsg invalid upstream proxy' => 'Ungültige IP für Upstream-Proxy',
+'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy',
'advproxy errmsg invalid user' => 'Benutzername existiert nicht',
'advproxy errmsg ldap base dn' => 'LDAP base DN erforderlich',
'advproxy errmsg ldap bind dn' => 'LDAP bind DN Benutzername und Passwort erforderlich',
@@ -1311,10 +1311,12 @@
'organization too long' => 'Organisation ist zu lang; sie sollte nicht länger als 60 Zeichen lang sein.',
'original' => 'Original',
'os level' => 'OS Level',
+'other' => 'Sonstiges',
'other countries' => 'Andere Länder',
'other login script' => 'Anderes Anmeldeskript',
'otherip' => 'Andere IP',
'otherport' => 'Anderer Port',
+'our donors' => 'Unsere Unterstützer',
'out' => 'Aus',
'outgoing' => 'ausgehend',
'outgoing firewall' => 'Ausgehende Firewall',
@@ -1345,10 +1347,14 @@
'ovpn config' => 'OVPN-Konfiguration',
'ovpn device' => 'OpenVPN Gerät',
'ovpn dl' => 'OVPN-Konfiguration downloaden',
+'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt',
+'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske',
'ovpn log' => 'OVPN-Log',
'ovpn on blue' => 'OpenVPN auf BLAU',
'ovpn on orange' => 'OpenVPN auf ORANGE',
'ovpn on red' => 'OpenVPN auf ROT',
+'ovpn routes push' => 'Routen (eine pro Zeile)',
+'ovpn routes push options' => 'Route push Optionen',
'ovpn server status' => 'OpenVPN Server Status',
'ovpn subnet' => 'OpenVPN Subnetz (z.B. 10.0.10.0/255.255.255.0)',
'ovpn subnet is invalid' => 'Das OpenVPN Subnetz ist ungültig.',
@@ -1369,10 +1375,6 @@
'ovpn_processprioVH' => 'Sehr Hoch',
'ovpnstatus log' => 'OVPN-Status-Log',
'ovpnsys log' => 'OVPN-System-Log',
-'ovpn routes push options' => 'Route push Optionen',
-'ovpn routes push' => 'Routen (eine pro Zeile)',
-'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske',
-'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt',
'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?',
@@ -2096,6 +2098,7 @@
'virtual address' => 'Virtuelle Addresse',
'virtual private networking' => 'Virtuelles Privates Netzwerk',
'visible in browselist' => 'Sichtbar in der Verzeichnisliste',
+'visit us at' => 'Besuchen Sie uns auf',
'voldown10' => 'Laustärke um 10 verringern',
'voldown5' => 'Laustärke um 5 verringern',
'volup10' => 'Laustärke um 10 erhöhen',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 003056f..5fe2391 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -222,8 +222,8 @@
'advproxy errmsg invalid mac' => 'Invalid MAC address',
'advproxy errmsg invalid pdc' => 'Invalid hostname for primary domain controller',
'advproxy errmsg invalid proxy port' => 'Invalid proxy port',
-'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting',
'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP',
+'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting',
'advproxy errmsg invalid user' => 'Username does not exist',
'advproxy errmsg ldap base dn' => 'LDAP base DN required',
'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required',
@@ -1339,10 +1339,12 @@
'organization too long' => 'Organization is too long; it should not be longer than 60 characters.',
'original' => 'Original',
'os level' => 'OS Level',
+'other' => 'Other',
'other countries' => 'Other countries',
'other login script' => 'Other login script',
'otherip' => 'other IP',
'otherport' => 'other Port',
+'our donors' => 'Our donors',
'out' => 'Out',
'outgoing' => 'outgoing',
'outgoing firewall' => 'Outgoing Firewall',
@@ -1373,10 +1375,14 @@
'ovpn config' => 'OVPN-Config',
'ovpn device' => 'OpenVPN device:',
'ovpn dl' => 'OVPN-Config Download',
+'ovpn errmsg green already pushed' => 'Route for green network is always set',
+'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
'ovpn log' => 'OVPN-Log',
'ovpn on blue' => 'OpenVPN on BLUE',
'ovpn on orange' => 'OpenVPN on ORANGE',
'ovpn on red' => 'OpenVPN on RED',
+'ovpn routes push' => 'Routes (one per line):',
+'ovpn routes push options' => 'Route push options',
'ovpn server status' => 'Current OpenVPN server status:',
'ovpn subnet' => 'OpenVPN subnet (e.g. 10.0.10.0/255.255.255.0)',
'ovpn subnet is invalid' => 'OpenVPN subnet is invalid.',
@@ -1397,10 +1403,6 @@
'ovpn_processprioVH' => 'Very high',
'ovpnstatus log' => 'OVPN-Status-Log',
'ovpnsys log' => 'OVPN-System-Log',
-'ovpn routes push options' => 'Route push options',
-'ovpn routes push' => 'Routes (one per line):',
-'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
-'ovpn errmsg green already pushed' => 'Route for green network is always set',
'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?',
@@ -2130,6 +2132,7 @@
'virtual address' => 'Virtual Address',
'virtual private networking' => 'Virtual Private Networking',
'visible in browselist' => 'visible in browselist',
+'visit us at' => 'Visit us at',
'voldown10' => 'Decrease volume by 10',
'voldown5' => 'Decrease volume by 5',
'volup10' => 'Increase volume by 10',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 387ab4a..365630a 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1352,10 +1352,6 @@
'ovpn_processprioVH' => 'Muy alto',
'ovpnstatus log' => 'OVPN-Status-Log',
'ovpnsys log' => 'OVPN-System-Log',
-'ovpn routes push options' => 'Route push options',
-'ovpn routes push' => 'Routes (one per line):',
-'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
-'ovpn errmsg green already pushed' => 'Route for green network is always set',
'package failed to install' => 'Falló la instalación del paquete',
'pagerefresh' => 'La página se está actualiszando, por favor espere.',
'pakfire accept all' => '¿Desea instalar todos los paquetes?',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index a537459..e91191d 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1340,10 +1340,14 @@
'ovpn config' => 'OVPN-Config',
'ovpn device' => 'Périphérique OpenVPN :',
'ovpn dl' => 'Télécharger OVPN-Config',
+'ovpn errmsg green already pushed' => 'La route pour le r?seau green est toujours activ?e',
+'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-r?seau invalide',
'ovpn log' => 'OVPN-Log',
'ovpn on blue' => 'OpenVPN sur BLEU',
'ovpn on orange' => 'OpenVPN sur ORANGE',
'ovpn on red' => 'OpenVPN sur RED',
+'ovpn routes push' => 'Routes (une par ligne):',
+'ovpn routes push options' => 'Options de Route push',
'ovpn server status' => 'Statut actuel du serveur OpenVPN :',
'ovpn subnet' => 'Sous-réseau OpenVPN (c.a.d. 10.0.10.0/255.255.255.0)',
'ovpn subnet is invalid' => 'Sous-réseau OpenVPN non valide.',
@@ -1364,10 +1368,6 @@
'ovpn_processprioVH' => 'Très haute',
'ovpnstatus log' => 'Journal statut OVPN',
'ovpnsys log' => 'Journal système OVPN',
-'ovpn routes push options' => 'Options de Route push',
-'ovpn routes push' => 'Routes (une par ligne):',
-'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-r?seau invalide',
-'ovpn errmsg green already pushed' => 'La route pour le r?seau green est toujours activ?e',
'package failed to install' => 'L\'installation du paquet a échoué.',
'pagerefresh' => 'La page est entrain d\'être rafraichie, veuillez attendre.',
'pakfire accept all' => 'Voulez-vous installer tout les paquets?',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index d8f1890..12439e4 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -1375,10 +1375,6 @@
'ovpn_processprioVH' => 'Bardzo wysoki',
'ovpnstatus log' => 'OVPN-Status-Log',
'ovpnsys log' => 'OVPN-System-Log',
-'ovpn routes push options' => 'Route push options',
-'ovpn routes push' => 'Routes (one per line):',
-'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
-'ovpn errmsg green already pushed' => 'Route for green network is always set',
'package failed to install' => 'Błąd instalacji pakietu.',
'pagerefresh' => 'Strona jest odświeżana, proszę czekać.',
'pakfire accept all' => 'Czy chcesz zainstalować wszystkie pakiety?',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index c1afd01..4619983 100644
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -1342,10 +1342,14 @@
'ovpn config' => 'Настройки OVPN',
'ovpn device' => 'Устройство OpenVPN:',
'ovpn dl' => 'Загрузка настроек OVPN',
+'ovpn errmsg green already pushed' => 'Маршрут для зелёной сети всегда включён',
+'ovpn errmsg invalid ip or mask' => 'Неправильный адрес или маска подсти',
'ovpn log' => 'Журнал OVPN',
'ovpn on blue' => 'OpenVPN на BLUE',
'ovpn on orange' => 'OpenVPN на ORANGE',
'ovpn on red' => 'OpenVPN на RED',
+'ovpn routes push' => 'Маршрутизаторы (по одному на строчку)',
+'ovpn routes push options' => 'Настройки маршрутизации',
'ovpn server status' => 'Текущий статус сервера OpenVPN:',
'ovpn subnet' => 'Подсеть OpenVPN (e.g. 10.0.10.0/255.255.255.0)',
'ovpn subnet is invalid' => 'Подсеть OpenVPN задана неверно.',
@@ -1366,10 +1370,6 @@
'ovpn_processprioVH' => 'Very high',
'ovpnstatus log' => 'OVPN-Status-Log',
'ovpnsys log' => 'OVPN-System-Log',
-'ovpn routes push options' => 'Настройки маршрутизации',
-'ovpn routes push' => 'Маршрутизаторы (по одному на строчку)',
-'ovpn errmsg invalid ip or mask' => 'Неправильный адрес или маска подсти',
-'ovpn errmsg green already pushed' => 'Маршрут для зелёной сети всегда включён',
'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/lfs/GeoIP b/lfs/GeoIP
index 3dd7e6f..68254a7 100644
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
include Config
VER = 1.17
-DATVER = 02102012
+DATVER = 06112012
THISAPP = Geo-IP-PurePerl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = 371c7ea4a8c8b963594ec3031e798696
+GeoIP.dat-$(DATVER).gz_MD5 = a8677695b0abecb69707ebe2444e64f9
install : $(TARGET)
diff --git a/lfs/daq b/lfs/daq
index df35661..a0f7b25 100644
--- a/lfs/daq
+++ b/lfs/daq
@@ -24,7 +24,7 @@
include Config
-VER = 0.6.2
+VER = 1.1.1
THISAPP = daq-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6ea8aaa6f067f8b8ef6de45b95d55875
+$(DL_FILE)_MD5 = bc204ea09165b4ecbb1bb49c7c1a2ad4
install : $(TARGET)
diff --git a/lfs/samba b/lfs/samba
index 4741754..84a8a2b 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
include Config
-VER = 3.5.18
+VER = 3.5.19
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
-PAK_VER = 42
+PAK_VER = 43
DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4bdb6d7ef23369d1c7d0199f0ebe012a
+$(DL_FILE)_MD5 = 48718ed4fbc0f0fa7fcc38d52ca3cfff
install : $(TARGET)
diff --git a/lfs/snort b/lfs/snort
index 8b69397..98c232d 100644
--- a/lfs/snort
+++ b/lfs/snort
@@ -24,7 +24,7 @@
include Config
-VER = 2.9.1.2
+VER = 2.9.3.1
THISAPP = snort-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9e94f20b934566469c239966e1b41eba
+$(DL_FILE)_MD5 = b2102605a7ca023ad6a2429821061c29
install : $(TARGET)
diff --git a/make.sh b/make.sh
index dec06f8..ea908d9 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.11" # Version number
-CORE="63" # Core Level (Filename)
-PAKFIRE_CORE="63" # Core Level (PAKFIRE)
+CORE="64" # Core Level (Filename)
+PAKFIRE_CORE="64" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index c90687c..7478978 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -188,7 +188,6 @@ case "$1" in
# Outgoing Firewall
/sbin/iptables -A FORWARD -j OUTGOINGFWMAC
- /sbin/iptables -A FORWARD -j OUTGOINGFW
# localhost and ethernet.
/sbin/iptables -A INPUT -i lo -m state --state NEW -j ACCEPT
diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index bc05bd0..3f7dbff 100644
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -24,13 +24,13 @@
extract_files() {
echo "Extracting files..."
- tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C /
+ tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
echo "...Finished."
}
extract_backup_includes() {
echo "Extracting backup includes..."
- tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \
+ tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / \
var/ipfire/backup/addons/includes
echo "...Finished."
}
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-11-10 15:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121110153021.5A6BB200C2@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox