From c83e7d5f81c1a86f156355ad4e04f73b94308452 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 19 Aug 2013 17:33:23 +0200 Subject: [PATCH 01/43] ovpnmain.cgi: Fix remote IP address validation. --- html/cgi-bin/ovpnmain.cgi | 50 +++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 5e18d3cb5..e6ea1ef59 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -3604,35 +3604,33 @@ if ($cgiparams{'TYPE'} eq 'net') { } # Check if a remote host/IP has been set for the client. - if ($cgiparams{'REMOTE'} eq '' && $cgiparams{'SIDE'} ne 'server') { - $errormessage = $Lang::tr{'invalid input for remote host/ip'}; + if ($cgiparams{'TYPE'} eq 'net') { + if ($cgiparams{'SIDE'} ne 'server' && $cgiparams{'REMOTE'} eq '') { + $errormessage = $Lang::tr{'invalid input for remote host/ip'}; - # Check if this is a N2N connection and drop temporary config. - if ($cgiparams{'TYPE'} eq 'net') { - unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; - rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; - } - goto VPNCONF_ERROR; - } - - # Check if a remote host/IP has been configured - the field can be empty on the server side. - if ($cgiparams{'REMOTE'} ne '') { - - # Check if the given IP is valid - otherwise check if it is a valid domain. - if (! &General::validip($cgiparams{'REMOTE'})) { - - # Check for a valid domain. - if (! &General::validfqdn ($cgiparams{'REMOTE'})) { - $errormessage = $Lang::tr{'invalid input for remote host/ip'}; - - # Check if this is a N2N connection and drop temporary config. - if ($cgiparams{'TYPE'} eq 'net') { + # Check if this is a N2N connection and drop temporary config. unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; - rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; - } - goto VPNCONF_ERROR; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + + goto VPNCONF_ERROR; + } + + # Check if a remote host/IP has been configured - the field can be empty on the server side. + if ($cgiparams{'REMOTE'} ne '') { + # Check if the given IP is valid - otherwise check if it is a valid domain. + if (! &General::validip($cgiparams{'REMOTE'})) { + # Check for a valid domain. + if (! &General::validfqdn ($cgiparams{'REMOTE'})) { + $errormessage = $Lang::tr{'invalid input for remote host/ip'}; + + # Check if this is a N2N connection and drop temporary config. + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + + goto VPNCONF_ERROR; + } + } } - } } if ($cgiparams{'TYPE'} ne 'host') { From 67df3c3f1c3dc12d4238c617d91bb6622024efa2 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 19 Aug 2013 17:40:57 +0200 Subject: [PATCH 02/43] ovpnmain.cgi: Don't fail if files are not existant. N2N connections could not be deleted if they have never been started. --- html/cgi-bin/ovpnmain.cgi | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index e6ea1ef59..73e610bfd 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2195,14 +2195,15 @@ else # m.a.d net2net ### - if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { - +if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { my $conffile = glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]/$confighash{$cgiparams{'KEY'}}[1].conf"); - my $certfile = glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); - unlink ($certfile) or die "Removing $certfile fail: $!"; - unlink ($conffile) or die "Removing $conffile fail: $!"; - rmdir ("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") || die "Kann Verzeichnis nicht loeschen: $!"; - + my $certfile = glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); + unlink ($certfile); + unlink ($conffile); + + if (-e "${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") { + rmdir ("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") || die "Kann Verzeichnis nicht loeschen: $!"; + } } unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); From 529ac19c466e3c1c079d6c8d73d21c3016edae59 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 19 Aug 2013 13:23:51 +0200 Subject: [PATCH 03/43] tor: Only start tor when it has been enabled. --- src/initscripts/init.d/tor | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor index e27241f56..4fef577ac 100644 --- a/src/initscripts/init.d/tor +++ b/src/initscripts/init.d/tor @@ -9,6 +9,10 @@ . /etc/sysconfig/rc . ${rc_functions} +function tor_is_enabled() { + [ "${TOR_ENABLED}" = "on" ] || [ "${TOR_RELAY_ENABLED}" = "on" ] +} + function setup_firewall() { eval $(/usr/local/bin/readhash /var/ipfire/tor/settings) @@ -27,6 +31,8 @@ function flush_firewall() { case "${1}" in start) + tor_is_enabled || exit 0 + # Setup firewall. setup_firewall From 3387469bdb06af775d8708db7a743c95d3d2ca27 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Sun, 18 Aug 2013 12:11:58 +0200 Subject: [PATCH 04/43] tor: added daemon stats and little changes on styling --- html/cgi-bin/tor.cgi | 103 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 82 insertions(+), 21 deletions(-) mode change 100644 => 100755 html/cgi-bin/tor.cgi diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi old mode 100644 new mode 100755 index 2a31dd4bf..a1d0ae72f --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -57,9 +57,42 @@ my @accounting_periods = ('daily', 'weekly', 'monthly'); my $TOR_CONTROL_PORT = 9051; +my $string=(); +my $memory=(); +my @memory=(); +my @pid=(); +my @tor=(); +sub daemonstats +{ + $memory = 0; + # for pid and memory + open(FILE, '/usr/local/bin/addonctrl tor status | '); + @tor = ; + close(FILE); + $string = join("", @tor); + $string =~ s/[a-z_]//gi; + $string =~ s/\[[0-1]\;[0-9]+//gi; + $string =~ s/[\(\)\.]//gi; + $string =~ s/ //gi; + $string =~ s///gi; + @pid = split(/\s/,$string); + if (open(FILE, "/proc/$pid[0]/statm")){ + my $temp = ; + @memory = split(/ /,$temp); + close(FILE); + } + $memory+=$memory[0]; +} +daemonstats(); + our %netsettings = (); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); +our %color = (); +our %mainsettings = (); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); + our %settings = (); $settings{'TOR_ENABLED'} = 'off'; @@ -192,12 +225,37 @@ sub showMainBox() { print "
\n"; - &Header::openbox('100%', 'left', $Lang::tr{'tor configuration'}); + &Header::openbox('100%', 'center', $Lang::tr{'tor'}); + + +if ( ($memory != 0) && (@pid[0] ne "///") ){ + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print "
$Lang::tr{'tor service'}
$Lang::tr{'tor daemon'}$Lang::tr{'running'}
PID$Lang::tr{'memory'}
@pid[0]$memory KB
"; + } else { + print ""; + print ""; + print ""; + print ""; + print "
$Lang::tr{'tor service'}
$Lang::tr{'tor daemon'}$Lang::tr{'stopped'}
"; + } + + &Header::closebox(); + + &Header::openbox('100%', 'center', $Lang::tr{'tor configuration'}); print < + - + @@ -222,12 +280,11 @@ END print < -

-
$Lang::tr{'tor common settings'}$Lang::tr{'tor common settings'}
$Lang::tr{'tor enabled'}:
+
- +
$Lang::tr{'tor acls'}$Lang::tr{'tor acls'}
@@ -244,12 +301,11 @@ END

-

- +
- + @@ -276,7 +332,6 @@ END
$Lang::tr{'tor exit nodes'}$Lang::tr{'tor exit nodes'}
-

END &Header::closebox(); @@ -305,10 +360,10 @@ END } $selected{'TOR_RELAY_ACCOUNTING_PERIOD'}{$settings{'TOR_RELAY_ACCOUNTING_PERIOD'}} = 'selected'; - &Header::openbox('100%', 'left', $Lang::tr{'tor relay configuration'}); + &Header::openbox('100%', 'center', $Lang::tr{'tor relay configuration'}); print < +
$Lang::tr{'tor relay mode'}: @@ -342,11 +397,11 @@ END
-
+
- +
- + @@ -407,7 +462,7 @@ END &Header::closebox(); print < +
$Lang::tr{'tor bandwidth settings'}$Lang::tr{'tor bandwidth settings'}
$Lang::tr{'tor bandwidth rate'}:
* $Lang::tr{'this field may be blank'} @@ -418,7 +473,7 @@ END
- +
@@ -429,13 +484,13 @@ END # If we have a control connection, show the stats. if ($torctrl) { - &Header::openbox('100%', 'left', $Lang::tr{'tor stats'}); + &Header::openbox('100%', 'center', $Lang::tr{'tor stats'}); my @traffic = &TorTrafficStats($torctrl); if (@traffic) { print < +
 
END if ($settings{'TOR_RELAY_ENABLED'} eq 'on') { @@ -476,7 +531,7 @@ END my $accounting = &TorAccountingStats($torctrl); if ($accounting) { print < +
@@ -527,7 +582,7 @@ END if (@nodes) { my $nodes_length = scalar @nodes; print < +
$Lang::tr{'tor accounting'}
@@ -546,7 +601,11 @@ END END if (exists($node->{'country_code'})) { + if ($node->{'country_code'} eq '??') { + print ""; + } else { print "$node->{"; + } } print </dev/null"); } + # Update pid and memory + daemonstats(); } sub TorConnect() { From 8505f1ff4c743b98f4e72c0275f60ddaa06627f9 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Sun, 18 Aug 2013 12:18:50 +0200 Subject: [PATCH 05/43] tor: new stings added to language files --- langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ 2 files changed, 4 insertions(+) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index a0c426f3f..584bee59e 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1817,6 +1817,7 @@ 'tor configuration' => 'Tor-Konfiguration', 'tor connected relays' => 'Verbundene Relays', 'tor contact info' => 'Kontaktinformationen', +'tor daemon' => 'Daemon', 'tor enabled' => 'Tor einschalten', 'tor errmsg invalid accounting limit' => 'Ungültiges Accounting-Limit', 'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz', @@ -1839,6 +1840,7 @@ 'tor relay mode relay' => 'Nur Relay', 'tor relay nickname' => 'Relay-Nickname', 'tor relay port' => 'Relay-Port', +'tor service' => 'Tor Service', 'tor socks port' => 'SOCKS-Port', 'tor stats' => 'Statistiken', 'tor traffic limit hard' => 'Das Übertragungslimit wurde erreicht.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index b12ae7d2e..7035bed24 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1852,6 +1852,7 @@ 'tor configuration' => 'Tor Configuration', 'tor connected relays' => 'Connected relays', 'tor contact info' => 'Contact Info', +'tor daemon' => 'Daemon', 'tor enabled' => 'Enable Tor', 'tor errmsg invalid accounting limit' => 'Invalid accounting limit', 'tor errmsg invalid ip or mask' => 'Invalid IP subnet', @@ -1875,6 +1876,7 @@ 'tor relay mode relay' => 'Relay only', 'tor relay nickname' => 'Relay nickname', 'tor relay port' => 'Relay port', +'tor service' => 'Tor Service', 'tor socks port' => 'SOCKS port', 'tor stats' => 'Statistics', 'tor traffic limit hard' => 'Traffic limit has been reached.', From 0006d11060177a506c675f18c4678e0b7f82c3a9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 19 Aug 2013 13:20:42 +0200 Subject: [PATCH 06/43] translation: Fix typo. --- doc/language_issues.es | 2 ++ doc/language_issues.fr | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 2 ++ doc/language_issues.ru | 2 ++ doc/language_issues.tr | 2 ++ doc/language_missings | 8 ++++++++ langs/de/cgi-bin/de.pl | 2 +- 8 files changed, 21 insertions(+), 1 deletion(-) diff --git a/doc/language_issues.es b/doc/language_issues.es index 790ce1acc..fe4635527 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -642,6 +642,7 @@ WARNING: untranslated string: tor common settings WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info +WARNING: untranslated string: tor daemon WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit WARNING: untranslated string: tor errmsg invalid ip or mask @@ -663,6 +664,7 @@ WARNING: untranslated string: tor relay mode private bridge WARNING: untranslated string: tor relay mode relay WARNING: untranslated string: tor relay nickname WARNING: untranslated string: tor relay port +WARNING: untranslated string: tor service WARNING: untranslated string: tor socks port WARNING: untranslated string: tor stats WARNING: untranslated string: tor traffic limit hard diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 41d8d9d78..d5a10574f 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -627,6 +627,7 @@ WARNING: untranslated string: tor common settings WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info +WARNING: untranslated string: tor daemon WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit WARNING: untranslated string: tor errmsg invalid ip or mask @@ -648,6 +649,7 @@ WARNING: untranslated string: tor relay mode private bridge WARNING: untranslated string: tor relay mode relay WARNING: untranslated string: tor relay nickname WARNING: untranslated string: tor relay port +WARNING: untranslated string: tor service WARNING: untranslated string: tor socks port WARNING: untranslated string: tor stats WARNING: untranslated string: tor traffic limit hard diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 46838b024..c8249ff7a 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -544,6 +544,7 @@ WARNING: untranslated string: tor common settings WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info +WARNING: untranslated string: tor daemon WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit WARNING: untranslated string: tor errmsg invalid ip or mask @@ -565,6 +566,7 @@ WARNING: untranslated string: tor relay mode private bridge WARNING: untranslated string: tor relay mode relay WARNING: untranslated string: tor relay nickname WARNING: untranslated string: tor relay port +WARNING: untranslated string: tor service WARNING: untranslated string: tor socks port WARNING: untranslated string: tor stats WARNING: untranslated string: tor traffic limit hard diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 790ce1acc..fe4635527 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -642,6 +642,7 @@ WARNING: untranslated string: tor common settings WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info +WARNING: untranslated string: tor daemon WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit WARNING: untranslated string: tor errmsg invalid ip or mask @@ -663,6 +664,7 @@ WARNING: untranslated string: tor relay mode private bridge WARNING: untranslated string: tor relay mode relay WARNING: untranslated string: tor relay nickname WARNING: untranslated string: tor relay port +WARNING: untranslated string: tor service WARNING: untranslated string: tor socks port WARNING: untranslated string: tor stats WARNING: untranslated string: tor traffic limit hard diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 670069683..ef7b31c2e 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -607,6 +607,7 @@ WARNING: untranslated string: tor common settings WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info +WARNING: untranslated string: tor daemon WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit WARNING: untranslated string: tor errmsg invalid ip or mask @@ -628,6 +629,7 @@ WARNING: untranslated string: tor relay mode private bridge WARNING: untranslated string: tor relay mode relay WARNING: untranslated string: tor relay nickname WARNING: untranslated string: tor relay port +WARNING: untranslated string: tor service WARNING: untranslated string: tor socks port WARNING: untranslated string: tor stats WARNING: untranslated string: tor traffic limit hard diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 6c4502fd6..1821fb45b 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -540,6 +540,7 @@ WARNING: untranslated string: tor common settings WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info +WARNING: untranslated string: tor daemon WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit WARNING: untranslated string: tor errmsg invalid ip or mask @@ -561,6 +562,7 @@ WARNING: untranslated string: tor relay mode private bridge WARNING: untranslated string: tor relay mode relay WARNING: untranslated string: tor relay nickname WARNING: untranslated string: tor relay port +WARNING: untranslated string: tor service WARNING: untranslated string: tor socks port WARNING: untranslated string: tor stats WARNING: untranslated string: tor traffic limit hard diff --git a/doc/language_missings b/doc/language_missings index 3c611e617..865a42a56 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -136,6 +136,7 @@ < tor configuration < tor connected relays < tor contact info +< tor daemon < tor enabled < tor errmsg invalid accounting limit < tor errmsg invalid ip or mask @@ -158,6 +159,7 @@ < tor relay mode relay < tor relay nickname < tor relay port +< tor service < tor socks port < tor stats < tor traffic limit hard @@ -371,6 +373,7 @@ < tor configuration < tor connected relays < tor contact info +< tor daemon < tor enabled < tor errmsg invalid accounting limit < tor errmsg invalid ip or mask @@ -393,6 +396,7 @@ < tor relay mode relay < tor relay nickname < tor relay port +< tor service < tor socks port < tor stats < tor traffic limit hard @@ -558,6 +562,7 @@ < tor configuration < tor connected relays < tor contact info +< tor daemon < tor enabled < tor errmsg invalid accounting limit < tor errmsg invalid ip or mask @@ -580,6 +585,7 @@ < tor relay mode relay < tor relay nickname < tor relay port +< tor service < tor socks port < tor stats < tor traffic limit hard @@ -750,6 +756,7 @@ < tor configuration < tor connected relays < tor contact info +< tor daemon < tor enabled < tor errmsg invalid accounting limit < tor errmsg invalid ip or mask @@ -772,6 +779,7 @@ < tor relay mode relay < tor relay nickname < tor relay port +< tor service < tor socks port < tor stats < tor traffic limit hard diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 584bee59e..b55179f6d 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1840,7 +1840,7 @@ 'tor relay mode relay' => 'Nur Relay', 'tor relay nickname' => 'Relay-Nickname', 'tor relay port' => 'Relay-Port', -'tor service' => 'Tor Service', +'tor service' => 'Tor-Service', 'tor socks port' => 'SOCKS-Port', 'tor stats' => 'Statistiken', 'tor traffic limit hard' => 'Das Übertragungslimit wurde erreicht.', From 9e4945393d205da3f1a599651c6e94cbce386ecd Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Sun, 18 Aug 2013 12:42:24 +0200 Subject: [PATCH 07/43] tor: added startup files --- lfs/tor | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lfs/tor b/lfs/tor index 8bce4be8f..ae63d961a 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 1 +PAK_VER = 2 DEPS = "libevent2" @@ -107,6 +107,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 644 $(DIR_SRC)/config/tor/defaults-torrc \ /usr/share/tor/defaults-torrc + # Install start links and backup include file. + ln -sf ../init.d/tor /etc/rc.d/rc3.d/S60tor + ln -sf ../init.d/tor /etc/rc.d/rc0.d/K40tor + ln -sf ../init.d/tor /etc/rc.d/rc6.d/K40tor install -v -m 644 $(DIR_SRC)/config/backup/includes/tor \ /var/ipfire/backup/addons/includes/tor @rm -rf $(DIR_APP) From 26cce22da0ffd9b861e6734e943238bc9a2b512c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 20 Aug 2013 10:39:40 +0200 Subject: [PATCH 08/43] tor.cgi: Remember selected exit node country. --- html/cgi-bin/tor.cgi | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index a1d0ae72f..b920724de 100755 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -321,7 +321,13 @@ END foreach my $country_name (sort @country_names) { my $country_code = Locale::Country::country2code($country_name); $country_code = uc($country_code); - print "\n"; + print "\n"; } print < Date: Thu, 22 Aug 2013 17:26:23 +0200 Subject: [PATCH 09/43] tor: Rootfile update. --- config/rootfiles/packages/tor | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor index 8eb6dad17..58de7da86 100644 --- a/config/rootfiles/packages/tor +++ b/config/rootfiles/packages/tor @@ -1,6 +1,9 @@ #etc/logrotate.d etc/logrotate.d/tor etc/rc.d/init.d/tor +etc/rc.d/rc0.d/K40tor +etc/rc.d/rc3.d/S60tor +etc/rc.d/rc6.d/K40tor #etc/tor etc/tor/tor-tsocks.conf etc/tor/torrc From ae650f95188e206cd3e3cbca5445f3ed074cb66f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 24 Aug 2013 17:19:36 +0200 Subject: [PATCH 10/43] tor: Fix initscript (again). --- src/initscripts/init.d/tor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor index 4fef577ac..d631e867f 100644 --- a/src/initscripts/init.d/tor +++ b/src/initscripts/init.d/tor @@ -9,13 +9,13 @@ . /etc/sysconfig/rc . ${rc_functions} +eval $(/usr/local/bin/readhash /var/ipfire/tor/settings) + function tor_is_enabled() { [ "${TOR_ENABLED}" = "on" ] || [ "${TOR_RELAY_ENABLED}" = "on" ] } function setup_firewall() { - eval $(/usr/local/bin/readhash /var/ipfire/tor/settings) - # Flush all rules. flush_firewall From cd010e09a321ab562ff45da1b27e521da160c71f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 24 Aug 2013 18:38:34 +0200 Subject: [PATCH 11/43] tor: bump package version nr. --- lfs/tor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/tor b/lfs/tor index ae63d961a..6161a5648 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 2 +PAK_VER = 3 DEPS = "libevent2" From 527bc5af18b7eefab2aac8f27a1c8be71c379b0f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 30 Aug 2013 15:43:30 +0200 Subject: [PATCH 12/43] iptraf-ng: Fix FPE. http://lists.ipfire.org/pipermail/development/2013-August/000420.html https://bugzilla.ipfire.org/show_bug.cgi?id=10408 --- lfs/iptraf-ng | 3 ++- .../iptraf-ng-1.1.4-tcplog_flowrate_msg.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch diff --git a/lfs/iptraf-ng b/lfs/iptraf-ng index d0491730f..e962b2c5e 100644 --- a/lfs/iptraf-ng +++ b/lfs/iptraf-ng @@ -17,7 +17,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = iptraf-ng -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -63,6 +63,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch cd $(DIR_APP) && ./configure \ --prefix=/usr diff --git a/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch b/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch new file mode 100644 index 000000000..24a6ce43c --- /dev/null +++ b/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch @@ -0,0 +1,12 @@ +diff -Nur iptraf-ng-1.1.4-orig/src/tcptable.c iptraf-ng-1.1.4/src/tcptable.c +--- iptraf-ng-1.1.4-orig/src/tcptable.c 2013-07-23 15:06:11.000000000 +0200 ++++ iptraf-ng-1.1.4/src/tcptable.c 2013-08-28 19:10:33.000000000 +0200 +@@ -444,6 +444,8 @@ + size_t bufsize) + { + time_t interval = time(NULL) - entry->conn_starttime; ++ if (interval < 1) ++ interval = 1; + + char rbuf[64]; + rate_print(entry->bcount / interval, rbuf, sizeof(rbuf)); From 2340d265b1a21f036a04d2ad9649bd7637eeda71 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 2 Sep 2013 19:01:44 +0200 Subject: [PATCH 13/43] dnsmasq: Put custom arguments first. --- config/rootfiles/core/73/filelists/files | 1 + src/initscripts/init.d/dnsmasq | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/core/73/filelists/files b/config/rootfiles/core/73/filelists/files index a1ef1bfdd..b56a318e3 100644 --- a/config/rootfiles/core/73/filelists/files +++ b/config/rootfiles/core/73/filelists/files @@ -1,5 +1,6 @@ etc/system-release etc/issue +etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/squid srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index a02097e41..15db47c18 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -50,7 +50,7 @@ case "${1}" in boot_mesg "Starting Domain Name Service Proxy..." eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) - ARGS= + ARGS="$CUSTOM_ARGS" [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN" echo > /var/ipfire/red/resolv.conf # Clear it @@ -73,8 +73,6 @@ case "${1}" in # Add custom forward dns zones. ARGS="${ARGS} $(dns_forward_args /var/ipfire/dnsforward/config)" - ARGS="$ARGS $CUSTOM_ARGS" - loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then From 2b1ff41196a0b9ac6794904427416eb05506f13d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 2 Sep 2013 19:11:40 +0200 Subject: [PATCH 14/43] dnsmasq: Fix appending arguments to the argument list. --- src/initscripts/init.d/dnsmasq | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index 15db47c18..34eee0c26 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -51,7 +51,7 @@ case "${1}" in eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) ARGS="$CUSTOM_ARGS" - [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN" + [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="$ARGS -s $DOMAIN_NAME_GREEN" echo > /var/ipfire/red/resolv.conf # Clear it if [ -e "/var/ipfire/red/dns1" ]; then From b31af08582737abd3913809bdf38147b6316973a Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Fri, 6 Sep 2013 22:01:21 +0200 Subject: [PATCH 15/43] tor: valid client names are max. 19 characters long changed that in tor.cgi --- html/cgi-bin/tor.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index b920724de..689a80aee 100755 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -382,7 +382,7 @@ END From ae666bf128e8660512a6fe0a12eda22c4b126446 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Fri, 6 Sep 2013 22:05:10 +0200 Subject: [PATCH 16/43] tor: fixed display of not founded country flags in tor.cgi --- html/cgi-bin/tor.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index 689a80aee..b6526b91c 100755 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -607,7 +607,7 @@ END END if (exists($node->{'country_code'})) { - if ($node->{'country_code'} eq '??') { + if (!$node->{'country_code'} or $node->{'country_code'} eq '??') { print ""; } else { print "$node->{"; From 4245fe34792cb67b1fe4b073e3b4d71014c3b277 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Sat, 7 Sep 2013 14:47:28 +0200 Subject: [PATCH 17/43] tor: added directory port to tor.cgi --- html/cgi-bin/tor.cgi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index b6526b91c..befd50834 100755 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -108,6 +108,7 @@ $settings{'TOR_RELAY_ENABLED'} = 'off'; $settings{'TOR_RELAY_MODE'} = 'exit'; $settings{'TOR_RELAY_ADDRESS'} = ''; $settings{'TOR_RELAY_PORT'} = 9001; +$settings{'TOR_RELAY_DIRPORT'} = 0; $settings{'TOR_RELAY_NICKNAME'} = ''; $settings{'TOR_RELAY_CONTACT_INFO'} = ''; $settings{'TOR_RELAY_BANDWIDTH_RATE'} = 0; @@ -143,6 +144,11 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { if (!&General::validport($settings{'TOR_RELAY_PORT'})) { $errormessage = "$Lang::tr{'tor errmsg invalid relay port'}: $settings{'TOR_RELAY_PORT'}"; } + if ($settings{'TOR_RELAY_DIRPORT'} ne '0') { + if (!&General::validport($settings{'TOR_RELAY_DIRPORT'})) { + $errormessage = "$Lang::tr{'tor errmsg invalid directory port'}: $settings{'TOR_RELAY_DIRPORT'}"; + } + } if ($settings{'TOR_RELAY_ADDRESS'} ne '') { if ((!&General::validfqdn($settings{'TOR_RELAY_ADDRESS'})) && (!&General::validip($settings{'TOR_RELAY_ADDRESS'}))) { @@ -395,6 +401,14 @@ END + + + + + + diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f9814d579..58dc88ea7 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1107,6 +1107,7 @@ 'last activity' => 'Letzte Aktivität', 'lateprompting' => 'Late prompting', 'lease expires' => 'Zuordnung verfällt', +'least preferred' => 'weniger präferiert', 'legend' => 'Legende', 'length' => 'Länge', 'line' => 'Leitung', @@ -1245,6 +1246,7 @@ 'monthly volume start day short' => 'Erste Tag', 'months' => 'Monate', 'more' => 'weitere', +'most preferred' => 'präferiert', 'mount' => 'Einbinden', 'mounted on' => 'Mounted auf', 'mpfire' => 'Media Player für IPFire', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 1c5029672..94eb8284f 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1135,6 +1135,7 @@ 'last activity' => 'Last Activity', 'lateprompting' => 'Lateprompting', 'lease expires' => 'Lease expires', +'least preferred' => 'least preferred', 'legend' => 'Legend', 'length' => 'Length', 'line' => 'Line', @@ -1273,6 +1274,7 @@ 'monthly volume start day short' => 'First day', 'months' => 'months', 'more' => 'more', +'most preferred' => 'most preferred', 'mount' => 'Mount', 'mounted on' => 'Mounted on', 'mpfire' => 'Media Player for IPFire', From 03caa87399b5143e85a06d908bedc99d1c6b41d4 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 3 Oct 2013 14:20:32 +0200 Subject: [PATCH 39/43] Update language issues. --- doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 4 ++++ doc/language_issues.fr | 4 ++++ doc/language_issues.nl | 4 ++++ doc/language_issues.pl | 4 ++++ doc/language_issues.ru | 4 ++++ doc/language_issues.tr | 4 ++++ doc/language_missings | 20 ++++++++++++++++++++ 9 files changed, 46 insertions(+) diff --git a/doc/language_issues.de b/doc/language_issues.de index bbe5e1de7..07d7c7c7c 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -406,6 +406,7 @@ WARNING: translation string unused: to email adr WARNING: translation string unused: to install an update WARNING: translation string unused: to warn email bad WARNING: translation string unused: too long 80 char max +WARNING: translation string unused: tor 0 = disabled WARNING: translation string unused: tor accounting period daily WARNING: translation string unused: tor accounting period monthly WARNING: translation string unused: tor accounting period weekly diff --git a/doc/language_issues.en b/doc/language_issues.en index 12489577b..7bdf4ca4f 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -437,6 +437,7 @@ WARNING: translation string unused: to email adr WARNING: translation string unused: to install an update WARNING: translation string unused: to warn email bad WARNING: translation string unused: too long 80 char max +WARNING: translation string unused: tor 0 = disabled WARNING: translation string unused: tor accounting period daily WARNING: translation string unused: tor accounting period monthly WARNING: translation string unused: tor accounting period weekly diff --git a/doc/language_issues.es b/doc/language_issues.es index 88666b618..afe7ed613 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -574,7 +574,9 @@ 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: least preferred WARNING: untranslated string: minute +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -643,8 +645,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 6c963aea4..b62d16e83 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -574,7 +574,9 @@ 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: least preferred WARNING: untranslated string: minute +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync @@ -628,8 +630,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 899940424..42fedc5fe 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -520,6 +520,8 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: least preferred +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: qos enter bandwidths @@ -545,8 +547,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 88666b618..afe7ed613 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -574,7 +574,9 @@ 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: least preferred WARNING: untranslated string: minute +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -643,8 +645,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 768bc1294..cc5dd649a 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -558,7 +558,9 @@ WARNING: untranslated string: extrahd to WARNING: untranslated string: extrahd to root WARNING: untranslated string: extrahd you cant mount WARNING: untranslated string: incoming traffic in bytes per second +WARNING: untranslated string: least preferred WARNING: untranslated string: minute +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -608,8 +610,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name diff --git a/doc/language_issues.tr b/doc/language_issues.tr index af1af7b8c..27ca634c7 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -517,6 +517,8 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: least preferred +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: route config changed @@ -541,8 +543,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name diff --git a/doc/language_missings b/doc/language_missings index 1550f479e..fca3f3ebc 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -84,7 +84,9 @@ < fireinfo why enable < fireinfo why read more < fireinfo your profile id +< least preferred < minute +< most preferred < ntp common settings < ntp sync < openvpn default @@ -117,6 +119,7 @@ < static routes < system information < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -137,8 +140,10 @@ < tor connected relays < tor contact info < tor daemon +< tor directory port < tor enabled < tor errmsg invalid accounting limit +< tor errmsg invalid directory port < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name @@ -306,7 +311,9 @@ < fireinfo why enable < fireinfo why read more < fireinfo your profile id +< least preferred < minute +< most preferred < openvpn default < openvpn destination port used < openvpn disabled @@ -355,6 +362,7 @@ < static routes < system information < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -375,8 +383,10 @@ < tor connected relays < tor contact info < tor daemon +< tor directory port < tor enabled < tor errmsg invalid accounting limit +< tor errmsg invalid directory port < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name @@ -512,7 +522,9 @@ < extrahd unable to read < extrahd unable to write < extrahd you cant mount +< least preferred < minute +< most preferred < openvpn default < openvpn destination port used < openvpn disabled @@ -545,6 +557,7 @@ < server restart < static routes < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -565,8 +578,10 @@ < tor connected relays < tor contact info < tor daemon +< tor directory port < tor enabled < tor errmsg invalid accounting limit +< tor errmsg invalid directory port < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name @@ -709,8 +724,10 @@ < frequency < hour-graph < incoming traffic in bytes per second +< least preferred < minute < month-graph +< most preferred < openvpn default < openvpn destination port used < openvpn disabled @@ -740,6 +757,7 @@ < server restart < static routes < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -760,8 +778,10 @@ < tor connected relays < tor contact info < tor daemon +< tor directory port < tor enabled < tor errmsg invalid accounting limit +< tor errmsg invalid directory port < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name From 2d685e1d4c4959ef6a85c285e9f952b713527d50 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 3 Oct 2013 14:22:59 +0200 Subject: [PATCH 40/43] core73: Add wirelessclient.cgi. --- config/rootfiles/core/73/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/73/filelists/files b/config/rootfiles/core/73/filelists/files index 4c393d95d..6df851ef0 100644 --- a/config/rootfiles/core/73/filelists/files +++ b/config/rootfiles/core/73/filelists/files @@ -5,6 +5,7 @@ etc/rc.d/init.d/squid srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/routing.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi srv/web/ipfire/html/redirect.cgi srv/web/ipfire/html/redirect-templates/ var/ipfire/header.pl From 7a302dd0fe1487d764bc30ee2479713d2288040a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 3 Oct 2013 14:50:11 +0200 Subject: [PATCH 41/43] memtest: disable parallel build. --- lfs/memtest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/memtest b/lfs/memtest index 907bef46e..d98ea872b 100644 --- a/lfs/memtest +++ b/lfs/memtest @@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Enable SMP as default cd $(DIR_APP) && sed -i -e "s|CONSERVATIVE_SMP 1|CONSERVATIVE_SMP 0|g" config.h cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make $(EXTRA_MAKE) -mkdir -p /usr/lib/memtest86+ cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+ @rm -rf $(DIR_APP) From f7bb003150fc1d4fba360224b31314629737ec2f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 3 Oct 2013 14:50:33 +0200 Subject: [PATCH 42/43] wirelessctrl: fix blue access "enabled" checkbox. --- src/misc-progs/wirelessctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/misc-progs/wirelessctrl.c b/src/misc-progs/wirelessctrl.c index 1f1b0f861..8ca7a81ae 100644 --- a/src/misc-progs/wirelessctrl.c +++ b/src/misc-progs/wirelessctrl.c @@ -130,7 +130,7 @@ int main(void) { macaddress = strtok(NULL, ","); enabled = strtok(NULL, ","); - if (strncmp(enabled, "on", 2) != 0) { + if (strcmp(enabled, "on") == 0) { /* both specified, added security */ if ((strlen(macaddress) == 17) && (VALID_IP_AND_MASK(ipaddress))) { snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSINPUT -m mac --mac-source %s -s %s -i %s -j ACCEPT", macaddress, ipaddress, blue_dev); From 71ed067612b0819e3708b5565ada17888594b357 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 3 Oct 2013 19:05:21 +0200 Subject: [PATCH 43/43] rsync: updated to 3.1.0. --- lfs/rsync | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/rsync b/lfs/rsync index 2e65268ed..57c822cc2 100644 --- a/lfs/rsync +++ b/lfs/rsync @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # +# Copyright (C) 2007-2013 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 3.0.9 +VER = 3.1.0 THISAPP = rsync-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = rsync -PAK_VER = 7 +PAK_VER = 8 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5ee72266fe2c1822333c407e1761b92b +$(DL_FILE)_MD5 = 3be148772a33224771a8d4d2a028b132 install : $(TARGET)
$Lang::tr{'tor connected relays'} ($nodes_length)$Lang::tr{'tor relay nickname'}: * - +
  $Lang::tr{'tor directory port'}: +  $Lang::tr{'tor 0 = disabled'} +
$Lang::tr{'tor contact info'}: * @@ -683,6 +697,10 @@ sub BuildConfiguration() { print FILE "ORPort $settings{'TOR_RELAY_PORT'}\n"; + if ($settings{'TOR_RELAY_DIRPORT'} ne '0') { + print FILE "DirPort $settings{'TOR_RELAY_DIRPORT'}\n"; + } + if ($settings{'TOR_RELAY_ADDRESS'} ne '') { print FILE "Address $settings{'TOR_RELAY_ADDRESS'}\n"; } From 53f7ba12e8d0ba9f9c72e075b4a9e4e5c4a4ac00 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Sat, 7 Sep 2013 14:50:06 +0200 Subject: [PATCH 18/43] tor: increased pakfire version --- lfs/tor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/tor b/lfs/tor index 6161a5648..68381503f 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 3 +PAK_VER = 4 DEPS = "libevent2" From e122dd636659d9e97dcd0441717955de04a737b6 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Sat, 7 Sep 2013 14:52:02 +0200 Subject: [PATCH 19/43] tor: changed init script due to directory port option --- src/initscripts/init.d/tor | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor index d631e867f..9c1dfc769 100644 --- a/src/initscripts/init.d/tor +++ b/src/initscripts/init.d/tor @@ -22,6 +22,10 @@ function setup_firewall() { if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_PORT}" ]; then iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_PORT}" -j ACCEPT fi + + if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_DIRPORT}" ] && [ "${TOR_RELAY_DIRPORT}" -ne 0 ]; then + iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_DIRPORT}" -j ACCEPT + fi } function flush_firewall() { From 8e0d8bfd4d61656bec48a63d7a9263aed8f0da94 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Sat, 7 Sep 2013 14:55:55 +0200 Subject: [PATCH 20/43] tor: added new strings for directory port --- langs/de/cgi-bin/de.pl | 5 ++++- langs/en/cgi-bin/en.pl | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b55179f6d..c620629cc 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1798,6 +1798,7 @@ 'tone dial' => 'Tonwahl:', 'too long 80 char max' => ' ist zu lang, es sind maximal 80 Zeichen erlaubt', 'tor' => 'Tor', +'tor 0 = disabled' => '0 = deaktiviert', 'tor accounting' => 'Accounting', 'tor accounting bytes' => 'Traffic (empfangen/gesendet)', 'tor accounting bytes left' => 'übrig', @@ -1818,11 +1819,13 @@ 'tor connected relays' => 'Verbundene Relays', 'tor contact info' => 'Kontaktinformationen', 'tor daemon' => 'Daemon', +'tor directory port' => 'Directory-Port', 'tor enabled' => 'Tor einschalten', 'tor errmsg invalid accounting limit' => 'Ungültiges Accounting-Limit', +'tor errmsg invalid directory port' => 'Ungültiger Directory-Port', 'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz', 'tor errmsg invalid relay address' => 'Ungültige Relay-Adresse', -'tor errmsg invalid relay name' => 'Ungültiger Relay-Nickname.', +'tor errmsg invalid relay name' => 'Ungültiger Relay-Nickname', 'tor errmsg invalid relay port' => 'Ungültiger Relay-Port', 'tor errmsg invalid socks port' => 'Ungültiger SOCKS-Port', 'tor exit country' => 'Exit-Land', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 7035bed24..22d906a32 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1832,6 +1832,7 @@ 'tone dial' => 'Tone dial:', 'too long 80 char max' => ' is too long, maximum allowed is 80 characters', 'tor' => 'Tor', +'tor 0 = disabled' => '0 = disabled', 'tor accounting' => 'Accounting', 'tor accounting bytes' => 'Traffic (read/written)', 'tor accounting bytes left' => 'left', @@ -1853,8 +1854,10 @@ 'tor connected relays' => 'Connected relays', 'tor contact info' => 'Contact Info', 'tor daemon' => 'Daemon', +'tor directory port' => 'Directory port', 'tor enabled' => 'Enable Tor', 'tor errmsg invalid accounting limit' => 'Invalid accounting limit', +'tor errmsg invalid directory port' => 'Invalid directory port', 'tor errmsg invalid ip or mask' => 'Invalid IP subnet', 'tor errmsg invalid node id' => 'Invalid node ID', 'tor errmsg invalid relay address' => 'Invalid relay address', From c6137209a4fa72de7ea13be0c0713bddf57c0f38 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Thu, 12 Sep 2013 21:36:06 +0200 Subject: [PATCH 21/43] tor: update to 0.2.4.17-rc --- lfs/tor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/tor b/lfs/tor index 68381503f..795f7c3eb 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@ include Config -VER = 0.2.3.25 +VER = 0.2.4.17-rc THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a1c364189a9a66ed9daa8e6436489daf +$(DL_FILE)_MD5 = 2cdfb8dcc3306a43cf465a858bf97b2d install : $(TARGET) From f64c99631116407320ea362121b3698c60c3a40c Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Fri, 13 Sep 2013 15:17:25 +0200 Subject: [PATCH 22/43] tor: changed rootfiles due to tor update --- config/rootfiles/packages/tor | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor index 58de7da86..f9c657c88 100644 --- a/config/rootfiles/packages/tor +++ b/config/rootfiles/packages/tor @@ -5,7 +5,7 @@ etc/rc.d/rc0.d/K40tor etc/rc.d/rc3.d/S60tor etc/rc.d/rc6.d/K40tor #etc/tor -etc/tor/tor-tsocks.conf +#etc/tor/tor-tsocks.conf etc/tor/torrc srv/web/ipfire/cgi-bin/tor.cgi usr/bin/tor @@ -25,6 +25,7 @@ usr/local/bin/torctrl usr/share/tor usr/share/tor/defaults-torrc usr/share/tor/geoip +usr/share/tor/geoip6 var/ipfire/backup/addons/includes/tor var/ipfire/menu.d/EX-tor.menu var/ipfire/tor From d63e50f936d4d33a29af56ebefc2d1ae197d030f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 17 Sep 2013 13:23:57 +0200 Subject: [PATCH 23/43] Fix fetchmail symlinks. When postfix is installed, there are invalid fetchmail symlinks in rc.d. --- config/rootfiles/core/73/update.sh | 5 +++++ src/paks/fetchmail/install.sh | 4 ++++ src/paks/fetchmail/uninstall.sh | 2 ++ src/paks/postfix/install.sh | 8 +++++--- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/core/73/update.sh b/config/rootfiles/core/73/update.sh index 6afca9fc5..1fb3ac642 100644 --- a/config/rootfiles/core/73/update.sh +++ b/config/rootfiles/core/73/update.sh @@ -53,6 +53,11 @@ extract_files #Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# Remove invalid fetchmail symlinks when postfix is installed. +if [ ! -e "/etc/rc.d/init.d/fetchmail" ]; then + rm -f /etc/rc.d/rc*.d/*fetchmail +fi + sync # This update need a reboot... diff --git a/src/paks/fetchmail/install.sh b/src/paks/fetchmail/install.sh index 31c5fecae..b379c0cdf 100644 --- a/src/paks/fetchmail/install.sh +++ b/src/paks/fetchmail/install.sh @@ -25,3 +25,7 @@ extract_files restore_backup ${NAME} start_service --background ${NAME} + +ln -sf ../init.d/fetchmail /etc/rc.d/rc0.d/K25fetchmail +ln -sf ../init.d/fetchmail /etc/rc.d/rc3.d/S35fetchmail +ln -sf ../init.d/fetchmail /etc/rc.d/rc6.d/K25fetchmail diff --git a/src/paks/fetchmail/uninstall.sh b/src/paks/fetchmail/uninstall.sh index a7b8a5370..2d2606f99 100644 --- a/src/paks/fetchmail/uninstall.sh +++ b/src/paks/fetchmail/uninstall.sh @@ -25,3 +25,5 @@ stop_service ${NAME} make_backup ${NAME} remove_files + +rm -f /etc/rc.d/rc*.d/*fetchmail diff --git a/src/paks/postfix/install.sh b/src/paks/postfix/install.sh index b8b18098a..56c23e2c2 100644 --- a/src/paks/postfix/install.sh +++ b/src/paks/postfix/install.sh @@ -27,6 +27,8 @@ postalias /etc/aliases # Set postfix's hostname postconf -e "myhostname=$(hostname -f)" /etc/init.d/postfix start -ln -sf ../init.d/fetchmail /etc/rc.d/rc0.d/K25fetchmail -ln -sf ../init.d/fetchmail /etc/rc.d/rc3.d/S35fetchmail -ln -sf ../init.d/fetchmail /etc/rc.d/rc6.d/K25fetchmail + +# Enable autostart for postfix +ln -sf ../init.d/postfix /etc/rc.d/rc0.d/K25postfix +ln -sf ../init.d/postfix /etc/rc.d/rc3.d/S35postfix +ln -sf ../init.d/postfix /etc/rc.d/rc6.d/K25postfix From 860ad8cb1551ff0ec5b7da3d28bb9e358470382b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 27 Sep 2013 16:51:17 +0200 Subject: [PATCH 24/43] routing.cgi: Fix error in regex that validates "0.0.0.0". Fixes #10417. --- config/rootfiles/core/73/filelists/files | 1 + html/cgi-bin/routing.cgi | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/core/73/filelists/files b/config/rootfiles/core/73/filelists/files index b56a318e3..4c393d95d 100644 --- a/config/rootfiles/core/73/filelists/files +++ b/config/rootfiles/core/73/filelists/files @@ -4,6 +4,7 @@ etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/squid srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/html/redirect.cgi srv/web/ipfire/html/redirect-templates/ var/ipfire/header.pl diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index afcd38822..488705fb5 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -126,7 +126,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { $errormessage = $Lang::tr{'invalid ip'}." / ".$Lang::tr{'invalid netmask'}; } - if ($settings{'IP'} =~ /0.0.0.0/){ + if ($settings{'IP'} =~ /^0\.0\.0\.0/){ $errormessage = $Lang::tr{'invalid ip'}." - 0.0.0.0"; } From 55904cd2b463983987f769c8dfd3691ced1d7912 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 29 Sep 2013 14:38:41 +0200 Subject: [PATCH 25/43] make.sh: Automatically determine parallelism flags. --- make.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/make.sh b/make.sh index 814b14a8b..61b4013f6 100755 --- a/make.sh +++ b/make.sh @@ -179,11 +179,12 @@ prepareenv() { set +h LC_ALL=POSIX if [ -z $MAKETUNING ]; then - if [ "${MACHINE:0:3}" = "arm" ]; then - MAKETUNING="-j2" - else - MAKETUNING="-j6" - fi + CPU_COUNT="$(getconf _NPROCESSORS_ONLN 2>/dev/null)" + if [ -z "${CPU_COUNT}" ]; then + CPU_COUNT=1 + fi + + MAKETUNING="-j$(( ${CPU_COUNT} * 2 + 1 ))" fi export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD From 7f46e14b81e701cf3c37b3dd6c058942ed83b84d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 2 Oct 2013 11:00:56 +0200 Subject: [PATCH 26/43] kernel: update to 3.10.14. --- lfs/linux | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/linux b/lfs/linux index 8740d72df..b188a2b9a 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.10.13 +VER = 3.10.14 RPI_PATCHES = linux-3.10.10-c1af7c6 -GRS_PATCHES = grsecurity-2.9.1-3.10.13-ipfire1.patch.xz +GRS_PATCHES = grsecurity-2.9.1-3.10.14-ipfire1.patch.xz THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 64ffe74249442fd7452d12348955ccfd +$(DL_FILE)_MD5 = 3cd1e4b50fb9decd63754ae80f3b2414 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = ef9274b3ff5d05daaaa4bdbe86ad00fc -$(GRS_PATCHES)_MD5 = f69811dde866170bd9b4fcdcd0f1538e +$(GRS_PATCHES)_MD5 = 504b12ac9f2a3c12ccfeb1c3768f49e4 install : $(TARGET) From f93635e375efaae2c8077d467e8811128325142b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 2 Oct 2013 14:38:39 +0200 Subject: [PATCH 27/43] memtest: update to 5.01. --- lfs/memtest | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lfs/memtest b/lfs/memtest index 4914baed5..9888e53ee 100644 --- a/lfs/memtest +++ b/lfs/memtest @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team # +# Copyright (C) 2007-2013 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 4.20 +VER = 5.01 THISAPP = memtest86+-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ef62c2f5be616676c8c62066dedc46b3 +$(DL_FILE)_MD5 = 43c5832baa919e1206e251e735cdee2d install : $(TARGET) @@ -71,7 +71,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && sed -i -e "s| -fno-stack-protector||g" Makefile +# cd $(DIR_APP) && sed -i -e "s| -fno-stack-protector||g" Makefile + cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) -mkdir -p /usr/lib/memtest86+ cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+ From ad5338015f68bca7bb5987c7e44218fe21377dad Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 2 Oct 2013 14:39:16 +0200 Subject: [PATCH 28/43] stage2: rootfile update. --- config/rootfiles/common/stage2 | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index da95512b5..04ef3f2cb 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -41,6 +41,7 @@ etc/resolv.conf etc/securetty etc/sysctl.conf etc/syslog.conf +etc/system-release #home home/nobody #lib From 5b6acb88c607b2b9a46365281e611706c0c12109 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 2 Oct 2013 16:24:24 +0200 Subject: [PATCH 29/43] Fix empty system-release. --- tools/make-functions | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/make-functions b/tools/make-functions index 3ff647c51..48fc6d434 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -454,6 +454,7 @@ ipfiremake() { CORE=$CORE \ CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ + SYSTEM_RELEASE="$SYSTEM_RELEASE" \ CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \ CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \ CCACHE_COMPILERCHECK="none" \ From 78403883e23271c9a7ab2bdfeeaf64cc20fd11b4 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 2 Oct 2013 22:43:07 +0200 Subject: [PATCH 30/43] vdr: update to 2.0.3. --- lfs/vdr | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lfs/vdr b/lfs/vdr index b1feb0152..161b04ee1 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -24,8 +24,12 @@ include Config -VER = 2.0.1 +VER = 2.0.3 + +# VDRPLUGVER must match with APIVERSION in config.h +# after change this update also all vdr plugins VDRPLUGVER = 2.0.0 + THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -33,7 +37,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr -PAK_VER = 7 +PAK_VER = 8 DEPS = "vdr_streamdev" @@ -61,7 +65,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e1b7a76c57c96300829dccd39eb20e7d +$(DL_FILE)_MD5 = dd8fb1642bdfa7feb0e9a8ae41e9ef2f install : $(TARGET) From 9b966c6a0bb6c889aac3b07aae08973014334c24 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 3 Oct 2013 11:52:59 +0200 Subject: [PATCH 31/43] memtest: enable smp as default. --- lfs/memtest | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lfs/memtest b/lfs/memtest index 9888e53ee..907bef46e 100644 --- a/lfs/memtest +++ b/lfs/memtest @@ -71,7 +71,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -# cd $(DIR_APP) && sed -i -e "s| -fno-stack-protector||g" Makefile + # Enable SMP as default + cd $(DIR_APP) && sed -i -e "s|CONSERVATIVE_SMP 1|CONSERVATIVE_SMP 0|g" config.h cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) -mkdir -p /usr/lib/memtest86+ From a1fdbdac799c8b65f6e38465d76d4fc34847ad8f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 3 Oct 2013 11:53:35 +0200 Subject: [PATCH 32/43] configroot: enable log off wireless packet drop. --- lfs/configroot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/configroot b/lfs/configroot index ba6770b33..555c782ed 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -128,8 +128,8 @@ $(TARGET) : echo "SHOWCOLORS=on" >> $(CONFIG_ROOT)/optionsfw/settings echo "SHOWTABLES=off" >> $(CONFIG_ROOT)/optionsfw/settings echo "SHOWDROPDOWN=off" >> $(CONFIG_ROOT)/optionsfw/settings - echo "DROPWIRELESSINPUT=off" >> $(CONFIG_ROOT)/optionsfw/settings - echo "DROPWIRELESSFORWARD=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 From 64aac4feb5e50e330da30555a54739cc89d1cd0e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 3 Oct 2013 12:28:18 +0200 Subject: [PATCH 33/43] php: Build in zip module. --- lfs/php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lfs/php b/lfs/php index 58f442ce4..8cdacdf85 100644 --- a/lfs/php +++ b/lfs/php @@ -118,7 +118,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-readline \ --enable-sockets \ --with-xsl \ - --with-iconv + --with-iconv \ + --enable-zip cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini From a761716f03c7eeb31fe6f53552a4e7b48da76c3c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 3 Oct 2013 12:27:19 +0200 Subject: [PATCH 34/43] php: Build sqlite2 support for PDO. --- lfs/php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/php b/lfs/php index 8cdacdf85..af0e37ac7 100644 --- a/lfs/php +++ b/lfs/php @@ -114,7 +114,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-mysql-sock=/var/run/mysql \ --with-ncurses \ --with-pdo-mysql \ - --without-pdo-sqlite \ + --with-pdo-sqlite \ --with-readline \ --enable-sockets \ --with-xsl \ From f35740ac44a9423b1bb1320c97987240bd3c7e60 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 3 Oct 2013 12:33:08 +0200 Subject: [PATCH 35/43] core73: Add php to update. --- config/rootfiles/core/73/filelists/php | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/73/filelists/php diff --git a/config/rootfiles/core/73/filelists/php b/config/rootfiles/core/73/filelists/php new file mode 120000 index 000000000..1ae48d7a7 --- /dev/null +++ b/config/rootfiles/core/73/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file From d48969312e45efcde69c7bbcb5d93710f73f53a6 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 3 Oct 2013 12:39:16 +0200 Subject: [PATCH 36/43] php: Update to 5.3.27. --- lfs/php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/php b/lfs/php index af0e37ac7..8139e2128 100644 --- a/lfs/php +++ b/lfs/php @@ -24,7 +24,7 @@ include Config -VER = 5.3.16 +VER = 5.3.27 THISAPP = php-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -46,7 +46,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz -$(DL_FILE)_MD5 = 99cfd78531643027f60c900e792d21be +$(DL_FILE)_MD5 = 25ae23a5b9615fe8d33de5b63e1bb788 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513 From f29eb7ec93f05b553f4bb168b30827ff06de11c4 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 3 Oct 2013 13:44:56 +0200 Subject: [PATCH 37/43] vdr: remove unknown config keys. --- config/vdr/etc/setup.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/vdr/etc/setup.conf b/config/vdr/etc/setup.conf index a14aff9df..749ad03c8 100644 --- a/config/vdr/etc/setup.conf +++ b/config/vdr/etc/setup.conf @@ -50,7 +50,6 @@ OSDWidth = 624 PauseLifetime = 1 PausePriority = 10 PrimaryDVB = 1 -PrimaryLimit = 0 RecordingDirs = 1 ResumeID = 0 SetSystemTime = 0 @@ -82,5 +81,4 @@ streamdev-server.MaxClients = 5 streamdev-server.ServerPort = 2004 streamdev-server.StartHTTPServer = 1 streamdev-server.StartServer = 1 -streamdev-server.SuspendMode = 1 streamdev-server.VTPBindIP = 0.0.0.0 From f34844355bf8ce1c5239301fedc98f38ba765d5e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 3 Oct 2013 14:19:38 +0200 Subject: [PATCH 38/43] wirelessclient.cgi: Add help for priority. Fixes #10428. --- html/cgi-bin/wirelessclient.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index 5ff0e2c42..c6e20a0e6 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -499,11 +499,11 @@ sub showEditBox() {