[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 071084a99ed8e66f11f25c367c1893fb5bcfbbe5
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 071084a99ed8e66f11f25c367c1893fb5bcfbbe5 (commit) via 65b3841a8f731aa8efd913b1a0c0286d5c168c5c (commit) via 521a8b45e28092dce1d2d23bf5137957b482d2ab (commit) via 502a985847d18cdf867f0006183ad17f1875397e (commit) via dd862e474183235317a5e795c20ff00d4fe2ddc9 (commit) via 2bd9974372255bb98c218fa10c5ac8114bcbe88f (commit) via f1a50453e2b519315d183f5de1c228f3a8cf606e (commit) via af6f806ba175fa58e3db2b27010cb9ba121fc34c (commit) from 5ba51b82044c90706e3fd2313621fd2f7646ae76 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 071084a99ed8e66f11f25c367c1893fb5bcfbbe5 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 30 08:29:28 2010 +0200
Updated openssl cryptodev patch.
commit 65b3841a8f731aa8efd913b1a0c0286d5c168c5c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 30 07:57:02 2010 +0200
Updated openssl (0.9.8n).
Conflicts:
doc/packages-list.txt
commit 521a8b45e28092dce1d2d23bf5137957b482d2ab Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 28 16:11:48 2010 +0200
Fix permission change of existing directories at core updates.
commit 502a985847d18cdf867f0006183ad17f1875397e Author: Jan Paul Tuecking earl@ipfire.org Date: Sun Mar 21 01:30:42 2010 +0100
Added new qos sentences.
commit dd862e474183235317a5e795c20ff00d4fe2ddc9 Author: Jan Paul Tuecking earl@ipfire.org Date: Sun Mar 21 01:30:12 2010 +0100
Removed all german sentences.
commit 2bd9974372255bb98c218fa10c5ac8114bcbe88f Author: Jan Paul Tuecking earl@ipfire.org Date: Sun Mar 21 01:29:12 2010 +0100
Change permission of wlanap.cgi.
commit f1a50453e2b519315d183f5de1c228f3a8cf606e Author: Jan Paul Tuecking earl@ipfire.org Date: Mon Mar 15 15:42:37 2010 +0100
Corrected SSID Broadcast description.
commit af6f806ba175fa58e3db2b27010cb9ba121fc34c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Feb 21 19:24:07 2010 +0100
Readd old qemu version with kqemu support.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/packages/qemu-kqemu | 1 + doc/packages-list.txt | 5 +- html/cgi-bin/qos.cgi | 92 ++++++++++---------- html/cgi-bin/wlanap.cgi | 4 +- langs/de/cgi-bin/de.pl | 6 ++ langs/en/cgi-bin/en.pl | 7 ++ langs/fr/cgi-bin/fr.pl | 7 ++ lfs/openssl | 6 +- lfs/{qemu => qemu-kqemu} | 16 ++-- make.sh | 1 + src/pakfire/lib/functions.sh | 2 +- ...ryptodev.diff => openssl-0.9.8n-cryptodev.diff} | 44 +++++----- 12 files changed, 107 insertions(+), 84 deletions(-) create mode 100644 config/rootfiles/packages/qemu-kqemu mode change 100755 => 100644 html/cgi-bin/wlanap.cgi copy lfs/{qemu => qemu-kqemu} (92%) rename src/patches/{openssl-0.9.8k-cryptodev.diff => openssl-0.9.8n-cryptodev.diff} (60%)
Difference in files: diff --git a/config/rootfiles/packages/qemu-kqemu b/config/rootfiles/packages/qemu-kqemu new file mode 100644 index 0000000..f70d328 --- /dev/null +++ b/config/rootfiles/packages/qemu-kqemu @@ -0,0 +1 @@ +usr/bin/qemu-kqemu diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 3d8ff07..d7e52d7 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -67,6 +67,8 @@ * clamav-0.95.3 * cmake-2.4.8 * collectd-4.9.1 +* compat-wireless-2.6.32.2-kmod-2.6.27.42-ipfire +* compat-wireless-2.6.32.2-kmod-2.6.27.42-ipfire-xen * coreutils-5.96 * cpio-2.6 * cpufrequtils-007 @@ -250,7 +252,7 @@ * openldap-2.3.20 * openmailadmin-1.0.0 * openssh-5.4p1 -* openssl-0.9.8m +* openssl-0.9.8n * openvpn-2.1_rc20 * p7zip_4.65 * pam_mysql-0.7RC1 @@ -270,6 +272,7 @@ * pptp-1.7.2 * procps-3.2.6 * psmisc-22.2 +* qemu-0.11.0-kqemu * qemu-0.12.2 * readline-5.1 * reiser4progs-1.0.5 diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 49031d0..1beb9e3 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -148,10 +148,10 @@ END ; close FILE; } else { - $qossettings{'ACTION'} = 'Parentklasse hinzufuegen'; + $qossettings{'ACTION'} = $Lang::tr{'parentclass add'}; } } -elsif ($qossettings{'DOCLASS'} eq 'Bearbeiten') +elsif ($qossettings{'DOCLASS'} eq $Lang::tr{'edit'}) { open( FILE, "< $classfile" ) or die "Unable to read $classfile"; @classes = <FILE>; @@ -180,7 +180,7 @@ elsif ($qossettings{'DOCLASS'} eq 'Bearbeiten') &Header::closepage(); exit } -elsif ($qossettings{'DOCLASS'} eq 'Loeschen') +elsif ($qossettings{'DOCLASS'} eq $Lang::tr{'delete'}) { open( FILE, "< $classfile" ) or die "Unable to read $classfile"; @tmp = <FILE>; @@ -226,9 +226,9 @@ END ; close FILE; } else { - $qossettings{'ACTION'} = 'Unterklasse hinzufuegen'; + $qossettings{'ACTION'} = $Lang::tr{'qos add subclass'}; } -} elsif ($qossettings{'DOSCLASS'} eq 'Loeschen') +} elsif ($qossettings{'DOSCLASS'} eq $Lang::tr{'delete'}) { open( FILE, "< $subclassfile" ) or die "Unable to read $classfile"; @tmp = <FILE>; @@ -254,13 +254,13 @@ if ($qossettings{'DOLEVEL7'} eq $Lang::tr{'save'}) if ( $qossettings{'QIP'} ne '' ) { unless ( &General::validip($qossettings{'QIP'}) ) { $qossettings{'VALID'} = 'no'; - $message = "Die Quell-IP-Adresse ist ungueltig."; + $message = $Lang::tr{'The source IP address is invalid.'}; } } if ( $qossettings{'DIP'} ne '' ) { unless ( &General::validip($qossettings{'DIP'}) ) { $qossettings{'VALID'} = 'no'; - $message = "Die Ziel-IP-Adresse ist ungueltig."; + $message = $Lang::tr{'The destination IP address is invalid.'}; } } if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) { @@ -280,9 +280,9 @@ END ; close FILE; } else { - $qossettings{'ACTION'} = 'Level7-Regel hinzufuegen'; + $qossettings{'ACTION'} = $Lang::tr{'Add Level7 rule'}; } -} elsif ($qossettings{'DOLEVEL7'} eq 'Loeschen') +} elsif ($qossettings{'DOLEVEL7'} eq $Lang::tr{'delete'}) { open( FILE, "< $level7file" ) or die "Unable to read $level7file"; @l7rules = <FILE>; @@ -292,7 +292,7 @@ END { @l7ruleline = split( /;/, $l7ruleentry ); if ( ($l7ruleline[0] eq $qossettings{'CLASS'}) && ($l7ruleline[2] eq $qossettings{'L7PROT'})) - {$message = "Level7-Regel ($qossettings{'CLASS'} - $qossettings{'L7PROT'}) wurde geloescht.";} + {$message = "$Lang::tr{'Level7 Rule'} ($qossettings{'CLASS'} - $qossettings{'L7PROT'}) $Lang::tr{'was deleted'}.";} else { open( FILE, ">> $level7file" ) or die "Unable to read $level7file"; print FILE $l7ruleentry; @@ -300,7 +300,7 @@ END } } open( FILE, "< $level7file" ) or system("touch $level7file");close FILE; - } elsif ($qossettings{'DOLEVEL7'} eq 'Bearbeiten') + } elsif ($qossettings{'DOLEVEL7'} eq $Lang::tr{'edit'}) { open( FILE, "< $level7file" ) or die "Unable to read $level7file"; @l7rules = <FILE>; @@ -329,13 +329,13 @@ if ($qossettings{'DOPORT'} eq $Lang::tr{'save'}) if ( $qossettings{'QIP'} ne '' ) { unless ( &General::validip($qossettings{'QIP'}) ) { $qossettings{'VALID'} = 'no'; - $message = "Die Quell-IP-Adresse ist ungueltig."; + $message = "$Lang::tr{'The source IP address is invalid.'}"; } } if ( $qossettings{'DIP'} ne '' ) { unless ( &General::validip($qossettings{'DIP'}) ) { $qossettings{'VALID'} = 'no'; - $message = "Die Ziel-IP-Adresse ist ungueltig."; + $message = "$Lang::tr{'The destination IP address is invalid.'}"; } } if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) { @@ -355,9 +355,9 @@ END ; close FILE; } else { - $qossettings{'ACTION'} = 'Port-Regel hinzufuegen'; + $qossettings{'ACTION'} = $Lang::tr{'Add Port Rule'}; } -} elsif ($qossettings{'DOPORT'} eq 'Loeschen') +} elsif ($qossettings{'DOPORT'} eq $Lang::tr{'delete'}) { open( FILE, "< $portfile" ) or die "Unable to read $portfile"; @portrules = <FILE>; @@ -373,7 +373,7 @@ END } close FILE; $message = "$Lang::tr{'Port Rule'} ($qossettings{'CLASS'} - $qossettings{'PPROT'}) $Lang::tr{'was deleted'}."; -} elsif ($qossettings{'DOPORT'} eq 'Bearbeiten') +} elsif ($qossettings{'DOPORT'} eq $Lang::tr{'edit'}) { open( FILE, "< $portfile" ) or die "Unable to read $portfile"; @portrules = <FILE>; @@ -431,7 +431,7 @@ elsif ($qossettings{'DOTOS'} eq 'Loeschen') } close FILE; $message = "$Lang::tr{'TOS Rule'} ($qossettings{'CLASS'} - $qossettings{'TOS'}) $Lang::tr{'was deleted'}."; -} elsif ($qossettings{'DOTOS'} eq 'Bearbeiten') +} elsif ($qossettings{'DOTOS'} eq $Lang::tr{'edit'}) { open( FILE, "< $tosfile" ) or die "Unable to read $tosfile"; @tosrules = <FILE>; @@ -459,7 +459,7 @@ elsif ($qossettings{'DOTOS'} eq 'Loeschen') ############################################################################################################################ ############################################################################################################################
-if ($qossettings{'ACTION'} eq 'Start') +if ($qossettings{'ACTION'} eq $Lang::tr{'start'}) { $qossettings{'ENABLED'} = 'on'; &General::writehash("${General::swroot}/qos/settings", %qossettings); @@ -468,7 +468,7 @@ if ($qossettings{'ACTION'} eq 'Start') system("/usr/local/bin/qosctrl start >/dev/null 2>&1"); system("logger -t ipfire 'QoS started'"); } -elsif ($qossettings{'ACTION'} eq 'Stop') +elsif ($qossettings{'ACTION'} eq $Lang::tr{'stop'}) { system("/usr/local/bin/qosctrl stop >/dev/null 2>&1"); unlink "/var/ipfire/qos/bin/qos.sh"; @@ -477,7 +477,7 @@ elsif ($qossettings{'ACTION'} eq 'Stop') $qossettings{'ENABLED'} = 'off'; &General::writehash("${General::swroot}/qos/settings", %qossettings); } -elsif ($qossettings{'ACTION'} eq 'Neustart') +elsif ($qossettings{'ACTION'} eq $Lang::tr{'restart'}) { if ($qossettings{'ENABLED'} eq 'on'){ system("/usr/local/bin/qosctrl stop >/dev/null 2>&1"); @@ -590,7 +590,7 @@ END system("/usr/local/bin/qosctrl start >/dev/null 2>&1"); system("logger -t ipfire 'QoS started'"); } -elsif ($qossettings{'ACTION'} eq "$Lang::tr{'status'}" ) +elsif ($qossettings{'ACTION'} eq $Lang::tr{'status'} ) { &Header::openbox('100%', 'left', 'QoS Status'); if ($qossettings{'ENABLED'} eq 'on'){ @@ -604,30 +604,30 @@ elsif ($qossettings{'ACTION'} eq "$Lang::tr{'status'}" ) &Header::closepage(); exit } -elsif ($qossettings{'ACTION'} eq "$Lang::tr{'parentclass add'}" ) +elsif ($qossettings{'ACTION'} eq $Lang::tr{'parentclass add'} ) { &parentclass(); &Header::closebigbox(); &Header::closepage(); exit } -elsif ($qossettings{'ACTION'} eq 'Unterklasse hinzufuegen') +elsif ($qossettings{'ACTION'} eq $Lang::tr{'qos add subclass'}) { &subclass(); &Header::closebigbox(); &Header::closepage(); exit } -elsif ($qossettings{'ACTION'} eq 'Regel hinzufuegen') +elsif ($qossettings{'ACTION'} eq $Lang::tr{'Add Rule'}) { &Header::openbox('100%', 'center', $Lang::tr{'Add Rule'}); print <<END <table> <tr><td align='center'>$Lang::tr{'Choose Rule'} <tr><td align='center'> - <input type="button" onClick="swapVisibility('l7rule')" value='Level7-Regel' /> - <input type="button" onClick="swapVisibility('portrule')" value='Port-Regel' /> - <input type="button" onClick="swapVisibility('tosrule')" value='TOS-Regel' /> + <input type="button" onClick="swapVisibility('l7rule')" value='$Lang::tr{'Level7 Rule'}' /> + <input type="button" onClick="swapVisibility('portrule')" value='$Lang::tr{'Port Rule'}' /> + <input type="button" onClick="swapVisibility('tosrule')" value='$Lang::tr{'TOS rule'}' /> </table> END ; @@ -716,8 +716,8 @@ END <tr><td width='50%' align='left'><b>Quality of Service:</b> <td width='50%' align='center' bgcolor='$statuscolor'><font color='white'>$status</font> <tr><td width='100%' align='center' colspan='2'> - <input type='submit' name='ACTION' value="Start" /> - <input type='submit' name='ACTION' value="Stop" /> + <input type='submit' name='ACTION' value="$Lang::tr{'start'}" /> + <input type='submit' name='ACTION' value="$Lang::tr{'stop'}" /> <input type='submit' name='ACTION' value="$Lang::tr{'restart'}" /></table></form> END ; @@ -1184,7 +1184,7 @@ sub showclasses { @classline = split( /;/, $classentry ); if ( $classline[0] eq $qossettings{'DEV'} ) { - &Header::openbox('100%', 'center', "Klasse: $classline[1]"); + &Header::openbox('100%', 'center', "$Lang::tr{'Class'}: $classline[1]"); print <<END <table border='0' width='100%' cellspacing='0'> <tr><td bgcolor='$color{'color20'}' width='10%' align='center'><b>$Lang::tr{'interface'}</b> @@ -1208,22 +1208,22 @@ sub showclasses { <table border='0'><tr> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$classline[1]' /> - <input type='hidden' name='ACTION' value='Unterklasse hinzufuegen' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'qos add subclass'}' /> <input type='image' alt='$Lang::tr{'add subclass'}' src='/images/addblue.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$classline[1]' /> - <input type='hidden' name='ACTION' value='Regel hinzufuegen' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'Add Rule'}' /> <input type='image' alt='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$classline[1]' /> - <input type='hidden' name='DOCLASS' value='Bearbeiten' /> + <input type='hidden' name='DOCLASS' value='$Lang::tr{'edit'}' /> <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$classline[1]' /> - <input type='hidden' name='DOCLASS' value='Loeschen' /> + <input type='hidden' name='DOCLASS' value='$Lang::tr{'delete'}' /> <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' /> </form> </table> @@ -1248,14 +1248,14 @@ END <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$l7ruleline[0]' /> <input type='hidden' name='L7PROT' value='$l7ruleline[2]' /> - <input type='hidden' name='DOLEVEL7' value='Bearbeiten' /> - <input type='image' alt='Bearbeiten' src='/images/edit.gif' /> + <input type='hidden' name='DOLEVEL7' value='$Lang::tr{'edit'}' /> + <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$l7ruleline[0]' /> <input type='hidden' name='L7PROT' value='$l7ruleline[2]' /> - <input type='hidden' name='DOLEVEL7' value='Loeschen' /> - <input type='image' alt='Loeschen' src='/images/delete.gif' /> + <input type='hidden' name='DOLEVEL7' value='$Lang::tr{'delete'}' /> + <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' /> </form> </table> END @@ -1313,7 +1313,7 @@ END <input type='hidden' name='QPORT' value='$portruleline[4]' /> <input type='hidden' name='DIP' value='$portruleline[5]' /> <input type='hidden' name='DPORT' value='$portruleline[6]' /> - <input type='hidden' name='DOPORT' value='Bearbeiten' /> + <input type='hidden' name='DOPORT' value='$Lang::tr{'edit'}' /> <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> @@ -1323,7 +1323,7 @@ END <input type='hidden' name='QPORT' value='$portruleline[4]' /> <input type='hidden' name='DIP' value='$portruleline[5]' /> <input type='hidden' name='DPORT' value='$portruleline[6]' /> - <input type='hidden' name='DOPORT' value='Loeschen' /> + <input type='hidden' name='DOPORT' value='$Lang::tr{'delete'}' /> <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' /> </form> </table> @@ -1371,14 +1371,14 @@ END <input type='hidden' name='CLASS' value='$tosruleline[0]' /> <input type='hidden' name='DEV' value='$tosruleline[1]' /> <input type='hidden' name='TOS' value='$tosruleline[2]' /> - <input type='hidden' name='DOTOS' value='Bearbeiten' /> + <input type='hidden' name='DOTOS' value='$Lang::tr{'edit'}' /> <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$tosruleline[0]' /> <input type='hidden' name='DEV' value='$tosruleline[1]' /> <input type='hidden' name='TOS' value='$tosruleline[2]' /> - <input type='hidden' name='DOTOS' value='Loeschen' /> + <input type='hidden' name='DOTOS' value='$Lang::tr{'delete'}' /> <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' /> </form> </table> @@ -1406,17 +1406,17 @@ END <table border='0'><tr> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$subclassline[2]' /> - <input type='hidden' name='ACTION' value='Regel hinzufuegen' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'Add Rule'}' /> <input type='image' alt='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$subclassline[2]' /> - <input type='hidden' name='DOSCLASS' value='Bearbeiten' /> + <input type='hidden' name='DOSCLASS' value='$Lang::tr{'edit'}' /> <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$subclassline[2]' /> - <input type='hidden' name='DOSCLASS' value='Loeschen' /> + <input type='hidden' name='DOSCLASS' value='$Lang::tr{'delete'}' /> <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' /> </form> </table> @@ -1496,7 +1496,7 @@ sub validclass { } elsif ( $qossettings{'DEVICE'} eq $qossettings{'IMQ_DEV'} ) { if ($qossettings{'CLASS'} lt 200 || $qossettings{'CLASS'} ge 221) { $qossettings{'VALID'} = 'no'; - $message = "Die Klassennummer passt nicht zum angegebenen Interface."; + $message = "$Lang::tr{'The class number does not match the specified interface.'}"; } } open( FILE, "< $classfile" ) or die "Unable to read $classfile"; diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi old mode 100755 new mode 100644 index a0b7de4..5bbb0d1 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -343,8 +343,8 @@ print <<END <table width='95%' cellspacing='0'> <tr><td bgcolor='$color{'color20'}' colspan='4' align='left'><strong>$Lang::tr{'wlanap wlan settings'}</strong> <tr><td width='25%' class='base'>SSID: </td><td class='base' colspan='3'><input type='text' name='SSID' size='40' value='$wlanapsettings{'SSID'}' /></td></tr> -<tr><td width='25%' class='base'>SSID Broadcast: </td><td class='base' colspan='3'>on <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} /> | - <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> off</td></tr> +<!--SSID Broadcast: on => HIDESSID: off --> +<tr><td width='25%' class='base'>SSID Broadcast: </td><td class='base' colspan='3'>on <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> | <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} /> off</td></tr> <tr><td width='25%' class='base'>HW Mode: </td><td class='base' colspan='3'> <select name='HW_MODE'> <option value='a' $selected{'HW_MODE'}{'a'}>802.11a</option> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6772aec..52ba6a3 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -45,6 +45,12 @@ 'Pages' => 'Seiten', 'Ping' => 'Ping ', 'Port Rule' => 'Port-Regel', +'The source IP address is invalid.' => 'Die Quell-IP-Adresse ist ungültig.', +'The destination IP address is invalid.' => 'Die Ziel-IP-Adresse ist ungültig.', +'Add Level7 rule' => 'Level7-Regel hinzufügen', +'Level7 rule' => 'Level7-Regel', +'TOS rule' => 'TOS-Regel', +'The class number does not match the specified interface.' => 'Die Klassennummer passt nicht zum angegebenen Interface.', 'QoS not enabled' => 'QoS ist nicht aktiviert!', 'Queuelenght' => 'Warteschlangenlänge', 'Remote IP' => 'Entfernte IP / Hostname (DynDNS)', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 9a4d590..14d6cee 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -48,6 +48,13 @@ 'repeat' => 'Repeat', 'shuffle' => 'Shuffle', 'Port Rule' => 'Port-Rule', +'qos add subclass' => 'Add subclass', +'The source IP address is invalid.' => 'The source IP address is invalid.', +'The destination IP address is invalid.' => 'The destination IP address is invalid.', +'Add Level7 rule' => 'Add Level7 rule', +'Level7 rule' => 'Level7 rule', +'TOS rule' => 'TOS rule', +'The class number does not match the specified interface.' => 'The class number does not match the specified interface.', 'QoS not enabled' => 'QoS is not enabled!', 'Queuelenght' => 'Queuelenght', 'Remote IP' => 'Remote IP / Hostname (DynDNS):', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index a208d61..704e0b9 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -48,6 +48,13 @@ 'repeat' => 'Repeat', 'shuffle' => 'Shuffle', 'Port Rule' => 'Port-Rule', +'qos add subclass' => 'Add subclass', +'The source IP address is invalid.' => 'The source IP address is invalid.', +'The destination IP address is invalid.' => 'The destination IP address is invalid.', +'Add Level7 rule' => 'Add Level7 rule', +'Level7 rule' => 'Level7 rule', +'TOS rule' => 'TOS rule', +'The class number does not match the specified interface.' => 'The class number does not match the specified interface.', 'QoS not enabled' => 'QoS is not enabled!', 'Queuelenght' => 'Queuelenght', 'Remote IP' => 'Remote IP / Hostname (DynDNS):', diff --git a/lfs/openssl b/lfs/openssl index f29efa7..1599c7b 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@
include Config
-VER = 0.9.8m +VER = 0.9.8n
THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 898bf125370926d5f692a2201124f8ec +$(DL_FILE)_MD5 = 076d8efc3ed93646bd01f04e23c07066
install : $(TARGET)
@@ -70,7 +70,7 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8k-cryptodev.diff + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8n-cryptodev.diff ifeq "$(PADLOCK)" "1" cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8g-engine-padlock.patch endif diff --git a/lfs/qemu-kqemu b/lfs/qemu-kqemu new file mode 100644 index 0000000..99b3fe1 --- /dev/null +++ b/lfs/qemu-kqemu @@ -0,0 +1,85 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.11.0 + +THISAPP = qemu-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)-kqemu +PROG = qemu-kqemu +PAK_VER = 1 + +DEPS = "sdl qemu" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 4da6a3e926a0260902f0dee342a59c23 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr \ + --target-list="i386-softmmu" + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && cp i386-softmmu/qemu /usr/bin/qemu-kqemu + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 14c1b2c..ebe3b04 100755 --- a/make.sh +++ b/make.sh @@ -563,6 +563,7 @@ buildipfire() { ipfiremake fbset ipfiremake sdl ipfiremake qemu + ipfiremake qemu-kqemu ipfiremake sane ipfiremake netpbm ipfiremake phpSANE diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index 8bc09a8..2f6491f 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -24,7 +24,7 @@
extract_files() { echo "Extracting files..." - tar xvf /opt/pakfire/tmp/files -p --numeric-owner -C / + tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / echo "...Finished." }
diff --git a/src/patches/openssl-0.9.8k-cryptodev.diff b/src/patches/openssl-0.9.8k-cryptodev.diff deleted file mode 100644 index 0a4793a..0000000 --- a/src/patches/openssl-0.9.8k-cryptodev.diff +++ /dev/null @@ -1,101 +0,0 @@ -diff -ur openssl-0.9.8k/crypto/engine/eng_all.c openssl-0.9.8k.new/crypto/engine/eng_all.c ---- openssl-0.9.8k/crypto/engine/eng_all.c 2008-06-04 21:01:39.000000000 +0300 -+++ openssl-0.9.8k.new/crypto/engine/eng_all.c 2009-11-24 13:41:49.000000000 +0200 -@@ -104,16 +104,15 @@ - #endif - #endif - #ifndef OPENSSL_NO_HW --#if defined(__OpenBSD__) || defined(__FreeBSD__) -+# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) || defined(__linux__) - ENGINE_load_cryptodev(); --#endif -+# endif - #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) - ENGINE_load_capi(); - #endif - #endif - } - --#if defined(__OpenBSD__) || defined(__FreeBSD__) - void ENGINE_setup_bsd_cryptodev(void) { - static int bsd_cryptodev_default_loaded = 0; - if (!bsd_cryptodev_default_loaded) { -@@ -122,4 +121,3 @@ - } - bsd_cryptodev_default_loaded=1; - } --#endif -diff -ur openssl-0.9.8k/crypto/engine/eng_cryptodev.c openssl-0.9.8k.new/crypto/engine/eng_cryptodev.c ---- openssl-0.9.8k/crypto/engine/eng_cryptodev.c 2004-06-15 14:45:42.000000000 +0300 -+++ openssl-0.9.8k.new/crypto/engine/eng_cryptodev.c 2009-11-24 13:45:31.000000000 +0200 -@@ -34,14 +34,15 @@ - #if (defined(__unix__) || defined(unix)) && !defined(USG) && \ - (defined(OpenBSD) || defined(__FreeBSD_version)) - #include <sys/param.h> --# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) --# define HAVE_CRYPTODEV --# endif - # if (OpenBSD >= 200110) - # define HAVE_SYSLOG_R - # endif - #endif - -+#if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) || defined(__linux__) -+# define HAVE_CRYPTODEV -+#endif -+ - #ifndef HAVE_CRYPTODEV - - void -@@ -54,7 +55,12 @@ - #else - - #include <sys/types.h> --#include <crypto/cryptodev.h> -+#if defined(__linux__) -+# include <linux/cryptodev.h> -+# define HAVE_CRYPTODEV_NAME -+#else -+# include <crypto/cryptodev.h> -+#endif - #include <sys/ioctl.h> - #include <errno.h> - #include <stdio.h> -@@ -77,7 +83,11 @@ - static int get_dev_crypto(void); - static int cryptodev_max_iv(int cipher); - static int cryptodev_key_length_valid(int cipher, int len); --static int cipher_nid_to_cryptodev(int nid); -+#ifndef HAVE_CRYPTODEV_NAME -+ static int cipher_nid_to_cryptodev(int nid); -+#else -+ static char *cipher_nid_to_cryptodev_name(int nid); -+#endif - static int get_cryptodev_ciphers(const int **cnids); - static int get_cryptodev_digests(const int **cnids); - static int cryptodev_usable_ciphers(const int **nids); -diff -ur openssl-0.9.8k/crypto/engine/engine.h openssl-0.9.8k.new/crypto/engine/engine.h ---- openssl-0.9.8k/crypto/engine/engine.h 2008-06-04 21:01:40.000000000 +0300 -+++ openssl-0.9.8k.new/crypto/engine/engine.h 2009-11-24 13:41:49.000000000 +0200 -@@ -703,9 +703,7 @@ - * values. */ - void *ENGINE_get_static_state(void); - --#if defined(__OpenBSD__) || defined(__FreeBSD__) - void ENGINE_setup_bsd_cryptodev(void); --#endif - - /* BEGIN ERROR CODES */ - /* The following lines are auto generated by the script mkerr.pl. Any changes -diff -ur openssl-0.9.8k/crypto/evp/c_all.c openssl-0.9.8k.new/crypto/evp/c_all.c ---- openssl-0.9.8k/crypto/evp/c_all.c 2004-08-29 19:36:04.000000000 +0300 -+++ openssl-0.9.8k.new/crypto/evp/c_all.c 2009-11-24 13:41:49.000000000 +0200 -@@ -83,8 +83,6 @@ - OpenSSL_add_all_ciphers(); - OpenSSL_add_all_digests(); - #ifndef OPENSSL_NO_ENGINE --# if defined(__OpenBSD__) || defined(__FreeBSD__) - ENGINE_setup_bsd_cryptodev(); --# endif - #endif - } diff --git a/src/patches/openssl-0.9.8n-cryptodev.diff b/src/patches/openssl-0.9.8n-cryptodev.diff new file mode 100644 index 0000000..0913f9a --- /dev/null +++ b/src/patches/openssl-0.9.8n-cryptodev.diff @@ -0,0 +1,99 @@ +diff -Naur openssl-0.9.8n.org/crypto/engine/eng_all.c openssl-0.9.8n/crypto/engine/eng_all.c +--- openssl-0.9.8n.org/crypto/engine/eng_all.c 2010-03-01 01:30:11.000000000 +0100 ++++ openssl-0.9.8n/crypto/engine/eng_all.c 2010-03-30 08:11:26.000000000 +0200 +@@ -104,16 +104,13 @@ + #endif + #endif + #ifndef OPENSSL_NO_HW +-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) + ENGINE_load_cryptodev(); +-#endif + #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) + ENGINE_load_capi(); + #endif + #endif + } + +-#if defined(__OpenBSD__) || defined(__FreeBSD__) + void ENGINE_setup_bsd_cryptodev(void) { + static int bsd_cryptodev_default_loaded = 0; + if (!bsd_cryptodev_default_loaded) { +@@ -122,4 +119,3 @@ + } + bsd_cryptodev_default_loaded=1; + } +-#endif +diff -Naur openssl-0.9.8n.org/crypto/engine/eng_cryptodev.c openssl-0.9.8n/crypto/engine/eng_cryptodev.c +--- openssl-0.9.8n.org/crypto/engine/eng_cryptodev.c 2010-03-03 16:30:05.000000000 +0100 ++++ openssl-0.9.8n/crypto/engine/eng_cryptodev.c 2010-03-30 08:01:11.000000000 +0200 +@@ -38,14 +38,15 @@ + #if (defined(__unix__) || defined(unix)) && !defined(USG) && \ + (defined(OpenBSD) || defined(__FreeBSD__)) + #include <sys/param.h> +-# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) +-# define HAVE_CRYPTODEV +-# endif + # if (OpenBSD >= 200110) + # define HAVE_SYSLOG_R + # endif + #endif + ++#if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) || defined(__linux__) ++# define HAVE_CRYPTODEV ++#endif ++ + #ifndef HAVE_CRYPTODEV + + void +@@ -58,7 +59,12 @@ + #else + + #include <sys/types.h> +-#include <crypto/cryptodev.h> ++#if defined(__linux__) ++# include <linux/cryptodev.h> ++# define HAVE_CRYPTODEV_NAME ++#else ++# include <crypto/cryptodev.h> ++#endif + #include <sys/ioctl.h> + #include <errno.h> + #include <stdio.h> +@@ -81,7 +87,11 @@ + static int get_dev_crypto(void); + static int cryptodev_max_iv(int cipher); + static int cryptodev_key_length_valid(int cipher, int len); +-static int cipher_nid_to_cryptodev(int nid); ++#ifndef HAVE_CRYPTODEV_NAME ++ static int cipher_nid_to_cryptodev(int nid); ++#else ++ static char *cipher_nid_to_cryptodev_name(int nid); ++#endif + static int get_cryptodev_ciphers(const int **cnids); + /*static int get_cryptodev_digests(const int **cnids);*/ + static int cryptodev_usable_ciphers(const int **nids); +diff -Naur openssl-0.9.8n.org/crypto/engine/engine.h openssl-0.9.8n/crypto/engine/engine.h +--- openssl-0.9.8n.org/crypto/engine/engine.h 2010-02-09 15:18:15.000000000 +0100 ++++ openssl-0.9.8n/crypto/engine/engine.h 2010-03-30 08:01:11.000000000 +0200 +@@ -705,9 +705,7 @@ + * values. */ + void *ENGINE_get_static_state(void); + +-#if defined(__OpenBSD__) || defined(__FreeBSD__) + void ENGINE_setup_bsd_cryptodev(void); +-#endif + + /* BEGIN ERROR CODES */ + /* The following lines are auto generated by the script mkerr.pl. Any changes +diff -Naur openssl-0.9.8n.org/crypto/evp/c_all.c openssl-0.9.8n/crypto/evp/c_all.c +--- openssl-0.9.8n.org/crypto/evp/c_all.c 2004-08-29 18:36:04.000000000 +0200 ++++ openssl-0.9.8n/crypto/evp/c_all.c 2010-03-30 08:01:11.000000000 +0200 +@@ -83,8 +83,6 @@ + OpenSSL_add_all_ciphers(); + OpenSSL_add_all_digests(); + #ifndef OPENSSL_NO_ENGINE +-# if defined(__OpenBSD__) || defined(__FreeBSD__) + ENGINE_setup_bsd_cryptodev(); +-# endif + #endif + }
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org