From: Alexander Marx Date: Fri, 4 Oct 2013 06:09:18 +0000 (+0200) Subject: Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire... X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=9f6da934a3b635f5c9f96ab737977dad2582e498;hp=03dd9a2949d953e15bdaceab07af5649bfb21bd5 Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen --- 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 diff --git a/config/rootfiles/oldcore/73/filelists/files b/config/rootfiles/oldcore/73/filelists/files index a1ef1bfdd..6df851ef0 100644 --- a/config/rootfiles/oldcore/73/filelists/files +++ b/config/rootfiles/oldcore/73/filelists/files @@ -1,8 +1,11 @@ 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 +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 diff --git a/config/rootfiles/oldcore/73/update.sh b/config/rootfiles/oldcore/73/update.sh index 6afca9fc5..1fb3ac642 100644 --- a/config/rootfiles/oldcore/73/update.sh +++ b/config/rootfiles/oldcore/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/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 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 diff --git a/doc/language_issues.de b/doc/language_issues.de index 9f48b8b91..514a2e96a 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -484,6 +484,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 6f515422a..ef246b418 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -515,6 +515,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 3dc84df50..d4f500ca7 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -758,7 +758,9 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +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 @@ -825,8 +827,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 2df8288d5..e16150060 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -761,7 +761,9 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +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 @@ -816,8 +818,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 ce700828f..fed5e45c4 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -707,6 +707,8 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +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 @@ -733,8 +735,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 3dc84df50..d4f500ca7 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -758,7 +758,9 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +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 @@ -825,8 +827,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 80f7f3152..1d3eb7914 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -745,7 +745,9 @@ WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome 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 @@ -796,8 +798,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 19d15fad3..079f411a5 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -704,6 +704,8 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: least preferred +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: red1 @@ -729,8 +731,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 4c63a355a..704db02cc 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -257,7 +257,9 @@ < fw settings dropdown < fw settings remark < fw settings ruletable +< least preferred < minute +< most preferred < ntp common settings < ntp sync < openvpn default @@ -291,6 +293,7 @@ < static routes < system information < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -311,8 +314,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 @@ -653,7 +658,9 @@ < fw settings dropdown < fw settings remark < fw settings ruletable +< least preferred < minute +< most preferred < openvpn default < openvpn destination port used < openvpn disabled @@ -703,6 +710,7 @@ < static routes < system information < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -723,8 +731,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 @@ -1033,7 +1043,9 @@ < fw settings dropdown < fw settings remark < fw settings ruletable +< least preferred < minute +< most preferred < openvpn default < openvpn destination port used < openvpn disabled @@ -1067,6 +1079,7 @@ < server restart < static routes < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -1087,8 +1100,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 @@ -1404,8 +1419,10 @@ < fw settings ruletable < hour-graph < incoming traffic in bytes per second +< least preferred < minute < month-graph +< most preferred < openvpn default < openvpn destination port used < openvpn disabled @@ -1436,6 +1453,7 @@ < server restart < static routes < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -1456,8 +1474,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 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"; } diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index b920724de..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'}))) { @@ -382,7 +388,7 @@ END $Lang::tr{'tor relay nickname'}: * - + @@ -395,6 +401,14 @@ END + +   +   + $Lang::tr{'tor directory port'}: + +  $Lang::tr{'tor 0 = disabled'} + + $Lang::tr{'tor contact info'}: * @@ -607,7 +621,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->{"; @@ -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"; } 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() { diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f4c6729c7..92b8fd057 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1279,6 +1279,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', @@ -1417,6 +1418,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', @@ -1971,6 +1973,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', @@ -1991,11 +1994,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 636195086..085ee221c 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1307,6 +1307,7 @@ 'last activity' => 'Last Activity', 'lateprompting' => 'Lateprompting', 'lease expires' => 'Lease expires', +'least preferred' => 'least preferred', 'legend' => 'Legend', 'length' => 'Length', 'line' => 'Line', @@ -1445,6 +1446,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', @@ -2005,6 +2007,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', @@ -2026,8 +2029,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', 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 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/lfs/memtest b/lfs/memtest index 9888e53ee..d98ea872b 100644 --- a/lfs/memtest +++ b/lfs/memtest @@ -71,9 +71,10 @@ $(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) + 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) diff --git a/lfs/php b/lfs/php index 58f442ce4..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 @@ -114,11 +114,12 @@ $(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 \ - --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 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) diff --git a/lfs/tor b/lfs/tor index 6161a5648..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 @@ -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" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a1c364189a9a66ed9daa8e6436489daf +$(DL_FILE)_MD5 = 2cdfb8dcc3306a43cf465a858bf97b2d install : $(TARGET) 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) diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index a02097e41..34eee0c26 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -50,8 +50,8 @@ case "${1}" in boot_mesg "Starting Domain Name Service Proxy..." eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) - ARGS= - [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN" + ARGS="$CUSTOM_ARGS" + [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="$ARGS -s $DOMAIN_NAME_GREEN" echo > /var/ipfire/red/resolv.conf # Clear it if [ -e "/var/ipfire/red/dns1" ]; then @@ -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 diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor index 878080eff..551538e2f 100644 --- a/src/initscripts/init.d/tor +++ b/src/initscripts/init.d/tor @@ -24,6 +24,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() { 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); 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 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));