webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 11:05:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen

Browse Source
This commit is contained in:
Alexander Marx
2013-10-04 07:17:15 +02:00
parent bcd9852e2e 71ed067612
commit b4f94285ff
36 changed files with 157 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/stage2
View File

@@ -41,6 +41,7 @@ etc/resolv.conf
etc/securetty
etc/sysctl.conf
etc/syslog.conf
etc/system-release
#home
home/nobody
#lib

1
config/rootfiles/core/73/filelists/php Symbolic link
View File

@@ -0,0 +1 @@
../../../common/php

3
config/rootfiles/oldcore/73/filelists/files
View File

@@ -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

5
config/rootfiles/oldcore/73/update.sh
View File

@@ -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...

3
config/rootfiles/packages/tor
View File

@@ -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

2
config/vdr/etc/setup.conf
View File

@@ -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

1
doc/language_issues.de
View File

@@ -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

1
doc/language_issues.en
View File

@@ -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

4
doc/language_issues.es
View File

@@ -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

4
doc/language_issues.fr
View File

@@ -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

4
doc/language_issues.nl
View File

@@ -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

4
doc/language_issues.pl
View File

@@ -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

4
doc/language_issues.ru
View File

@@ -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

4
doc/language_issues.tr
View File

@@ -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

20
doc/language_missings
View File

@@ -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

2
html/cgi-bin/routing.cgi
View File

@@ -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";
}

22
html/cgi-bin/tor.cgi
View File

@@ -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
</td>
<td width='25%' class='base'>$Lang::tr{'tor relay nickname'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
<td width='20%'>
<input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' />
<input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' maxlength='19' />
</td>
</tr>
<tr>
@@ -395,6 +401,14 @@ END
<input type='text' name='TOR_RELAY_PORT' value='$settings{'TOR_RELAY_PORT'}' size='5' />
</td>
</tr>
<tr>
<td width='25%'>&nbsp;</td>
<td width='30%'>&nbsp;</td>
<td width='25%' class='base'>$Lang::tr{'tor directory port'}:</td>
<td width='20%'>
<input type='text' name='TOR_RELAY_DIRPORT' value='$settings{'TOR_RELAY_DIRPORT'}' size='5' />&nbsp;$Lang::tr{'tor 0 = disabled'}
</td>
</tr>
<tr>
<td width='25%' class='base'>$Lang::tr{'tor contact info'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
<td width='75%' colspan='3'>
@@ -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 "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>";
} else {
print "<a href='country.cgi#$node->{'country_code'}'><img src='/images/flags/$node->{'country_code'}.png' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>";
@@ -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";
}

4
html/cgi-bin/wirelessclient.cgi
View File

@@ -499,11 +499,11 @@ sub showEditBox() {
</td>
<td width='40%'>
<select name='PRIO'>
<option value="0" $selected{'PRIO'}{'0'}>0</option>
<option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'most preferred'})</option>
<option value="1" $selected{'PRIO'}{'1'}>1</option>
<option value="2" $selected{'PRIO'}{'2'}>2</option>
<option value="3" $selected{'PRIO'}{'3'}>3</option>
<option value="4" $selected{'PRIO'}{'4'}>4</option>
<option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'least preferred'})</option>
</select>
</td>
<td colspan="2" width='40%'></td>

7
langs/de/cgi-bin/de.pl
View File

@@ -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',

5
langs/en/cgi-bin/en.pl
View File

@@ -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',

4
lfs/configroot
View File

@@ -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

3
lfs/iptraf-ng
View File

@@ -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

8
lfs/linux
View File

@@ -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)

12
lfs/memtest
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,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,8 +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
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
# 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 $(EXTRA_MAKE)
-mkdir -p /usr/lib/memtest86+
cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+
@rm -rf $(DIR_APP)

9
lfs/php
View File

@@ -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

8
lfs/rsync
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,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)

6
lfs/tor
View File

@@ -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)

10
lfs/vdr
View File

@@ -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)

6
src/initscripts/init.d/dnsmasq
View File

@@ -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

4
src/initscripts/init.d/tor
View File

@@ -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() {

2
src/misc-progs/wirelessctrl.c
View File

@@ -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);

4
src/paks/fetchmail/install.sh
View File

@@ -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

2
src/paks/fetchmail/uninstall.sh
View File

@@ -25,3 +25,5 @@
stop_service ${NAME}
make_backup ${NAME}
remove_files
rm -f /etc/rc.d/rc*.d/*fetchmail

8
src/paks/postfix/install.sh
View File

@@ -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

12
src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch Normal file
View File

@@ -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));

1
tools/make-functions
View File

@@ -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" \