* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d0a16dba2835fc1c27c1d12765d7461a9d48c04c
@ 2021-01-04 10:45 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2021-01-04 10:45 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 43622 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via d0a16dba2835fc1c27c1d12765d7461a9d48c04c (commit)
via 5b4e33bc3b754dd14ecc279bc421ec232a489507 (commit)
via 888a21f928d1eb79ae7049bdde394f54ebc39e2c (commit)
via 21970dd75f4f5a00b89f4cec4a56bb5c959c9407 (commit)
via 3d725ebbec589c137f40c59296662b21583225e1 (commit)
via 86bd9ccc951473f4e9ec3df7748a89b954beda1c (commit)
via edd2710520fb2b762b1b4a05a0a34180ad30b7ae (commit)
via 2b4110cd64721eb591a75e7bc0856afff4b4ff93 (commit)
via 1d55fccdc58f56c7cea81b9c7c6a96aec89458ae (commit)
via 15194c7c52c2438611832cecf4dad24fec304322 (commit)
from da310b22465c5147fa5d63bb763d9b1963726eb8 (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 d0a16dba2835fc1c27c1d12765d7461a9d48c04c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jan 4 10:44:56 2021 +0000
core154: Ship general-functions.pl
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5b4e33bc3b754dd14ecc279bc421ec232a489507
Author: Adolf Belka <ahb.ipfire(a)gmail.com>
Date: Sat Jan 2 13:54:45 2021 +0100
general-functions.pl: Update to fix bug #12428
- Patch of general-functions.pl for implementation of fix provided
by Bernhard Bitsch in bug #12428.
Had to be modified as that fix gave a failure for single character hostnames.
Updated version prevents spaces being put into hostnames and works for single
character hostnames
- Updated subroutine validfqdn to apply consistent rules for hostname & domain name
portions of fqdn
- Minor updates for consistency across validhostname, validdomainname & validfqdn
- Patch implemented into testbed system and confirmed working for hostnames, domain names
and FQDN's.
Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 888a21f928d1eb79ae7049bdde394f54ebc39e2c
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Jan 1 16:47:54 2021 +0100
wget: Update to 1.21
Sorry, no changelog found, only:
https://fossies.org/linux/wget/ChangeLog
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 21970dd75f4f5a00b89f4cec4a56bb5c959c9407
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 3 11:18:06 2021 +0000
core154: Ship knot
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3d725ebbec589c137f40c59296662b21583225e1
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Jan 1 10:58:16 2021 +0100
knot: Update to 3.0.3
For details see:
https://www.knot-dns.cz/2020-12-15-version-303.html
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 86bd9ccc951473f4e9ec3df7748a89b954beda1c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 3 11:17:28 2021 +0000
Drop unused Asterisk CGI files
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit edd2710520fb2b762b1b4a05a0a34180ad30b7ae
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 3 11:16:22 2021 +0000
Drop unused upnp.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2b4110cd64721eb591a75e7bc0856afff4b4ff93
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 3 11:15:45 2021 +0000
core154: Ship updated CGI files
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1d55fccdc58f56c7cea81b9c7c6a96aec89458ae
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Tue Dec 29 13:50:11 2020 +0100
Syntax fixes in several CGIs
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 15194c7c52c2438611832cecf4dad24fec304322
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Tue Dec 29 13:36:21 2020 +0100
dhcpcd: Update to 9.4.0
For details see:
https://roy.marples.name/archives/dhcpcd-discuss/0003420.html
Former patch for Bug #12552 is now included.
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/general-functions.pl | 51 +++--
config/menu/EX-asterisk.menu | 15 --
config/rootfiles/common/web-user-interface | 7 -
config/rootfiles/core/154/filelists/files | 5 +
.../{oldcore/128 => core/154}/filelists/knot | 0
html/cgi-bin/asterisk/calls.cgi | 132 ------------
html/cgi-bin/asterisk/conf.cgi | 161 ---------------
html/cgi-bin/asterisk/conf/telbook.conf | 1 -
html/cgi-bin/asterisk/status.cgi | 119 -----------
html/cgi-bin/extrahd.cgi | 4 +-
html/cgi-bin/gpl.cgi | 2 +-
html/cgi-bin/hardwaregraphs.cgi | 2 +-
html/cgi-bin/optionsfw.cgi | 4 +-
html/cgi-bin/upnp.cgi | 228 ---------------------
lfs/dhcpcd | 7 +-
lfs/knot | 4 +-
lfs/wget | 6 +-
...86_for_SECCOMP_as_it_just_uses_socketcall.patch | 36 ----
18 files changed, 47 insertions(+), 737 deletions(-)
delete mode 100644 config/menu/EX-asterisk.menu
copy config/rootfiles/{oldcore/128 => core/154}/filelists/knot (100%)
delete mode 100644 html/cgi-bin/asterisk/calls.cgi
delete mode 100644 html/cgi-bin/asterisk/conf.cgi
delete mode 100644 html/cgi-bin/asterisk/conf/telbook.conf
delete mode 100644 html/cgi-bin/asterisk/status.cgi
delete mode 100644 html/cgi-bin/upnp.cgi
delete mode 100644 src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch
Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 9be1e7708..a6656ccf5 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -635,12 +635,12 @@ sub validhostname
# Checks a hostname against RFC1035
my $hostname = $_[0];
- # Each part should be at least two characters in length
+ # Hostname should be at least one character in length
# but no more than 63 characters
if (length ($hostname) < 1 || length ($hostname) > 63) {
return 0;}
# Only valid characters are a-z, A-Z, 0-9 and -
- if ($hostname !~ /^[a-zA-Z0-9-\s]*$/) {
+ if ($hostname !~ /^[a-zA-Z0-9-]*$/) {
return 0;}
# First character can only be a letter or a digit
if (substr ($hostname, 0, 1) !~ /^[a-zA-Z0-9]*$/) {
@@ -655,46 +655,53 @@ sub validdomainname
{
my $part;
- # Checks a domain name against RFC1035
+ # Checks a domain name against RFC1035 and RFC2181
my $domainname = $_[0];
- my @parts = split (/\./, $domainname); # Split hostname at the '.'
+ my @parts = split (/\./, $domainname); # Split domain name at the '.'
foreach $part (@parts) {
- # Each part should be no more than 63 characters in length
+ # Each part should be at least one character in length
+ # but no more than 63 characters
if (length ($part) < 1 || length ($part) > 63) {
return 0;}
# Only valid characters are a-z, A-Z, 0-9, _ and -
if ($part !~ /^[a-zA-Z0-9_-]*$/) {
- return 0;
- }
+ return 0;}
}
return 1;
}
sub validfqdn
{
- my $part;
-
- # Checks a fully qualified domain name against RFC1035
+ # Checks a fully qualified domain name against RFC1035 and RFC2181
my $fqdn = $_[0];
- my @parts = split (/\./, $fqdn); # Split hostname at the '.'
+ my @parts = split (/\./, $fqdn); # Split FQDN at the '.'
if (scalar(@parts) < 2) { # At least two parts should
return 0;} # exist in a FQDN
# (i.e.hostname.domain)
- foreach $part (@parts) {
+
+ for (my $index=0; $index < scalar(@parts); $index++) {
# Each part should be at least one character in length
# but no more than 63 characters
- if (length ($part) < 1 || length ($part) > 63) {
- return 0;}
- # Only valid characters are a-z, A-Z, 0-9 and -
- if ($part !~ /^[a-zA-Z0-9-]*$/) {
- return 0;}
- # First character can only be a letter or a digit
- if (substr ($part, 0, 1) !~ /^[a-zA-Z0-9]*$/) {
- return 0;}
- # Last character can only be a letter or a digit
- if (substr ($part, -1, 1) !~ /^[a-zA-Z0-9]*$/) {
+ if (length ($parts[$index]) < 1 || length ($parts[$index]) > 63) {
return 0;}
+ if ($index eq 0) {
+ # This is the hostname part
+ # Only valid characters are a-z, A-Z, 0-9 and -
+ if ($parts[$index] !~ /^[a-zA-Z0-9-]*$/) {
+ return 0;}
+ # First character can only be a letter or a digit
+ if (substr ($parts[$index], 0, 1) !~ /^[a-zA-Z0-9]*$/) {
+ return 0;}
+ # Last character can only be a letter or a digit
+ if (substr ($parts[$index], -1, 1) !~ /^[a-zA-Z0-9]*$/) {
+ return 0;}
+ } else{
+ # This is the domain part
+ # Only valid characters are a-z, A-Z, 0-9, _ and -
+ if ($parts[$index] !~ /^[a-zA-Z0-9_-]*$/) {
+ return 0;}
+ }
}
return 1;
}
diff --git a/config/menu/EX-asterisk.menu b/config/menu/EX-asterisk.menu
deleted file mode 100644
index 506fb6d2f..000000000
--- a/config/menu/EX-asterisk.menu
+++ /dev/null
@@ -1,15 +0,0 @@
- $subipfire->{'31.asterisk'} = {'caption' => 'Asterisk Status',
- 'uri' => '/cgi-bin/asterisk/status.cgi',
- 'title' => 'Asterisk Status',
- 'enabled' => 1,
- };
- $subipfire->{'32.asterisk'} = {'caption' => 'Asterisk Config',
- 'uri' => '/cgi-bin/asterisk/conf.cgi',
- 'title' => 'Asterisk Config',
- 'enabled' => 1,
- };
- $subipfire->{'33.asterisk'} = {'caption' => 'Asterisk Calls',
- 'uri' => '/cgi-bin/asterisk/calls.cgi',
- 'title' => 'Asterisk Calls',
- 'enabled' => 1,
- };
diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index 3eac4411a..9b2667676 100644
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -1,10 +1,4 @@
srv/web/ipfire/cgi-bin/aliases.cgi
-#srv/web/ipfire/cgi-bin/asterisk
-#srv/web/ipfire/cgi-bin/asterisk/calls.cgi
-#srv/web/ipfire/cgi-bin/asterisk/conf
-#srv/web/ipfire/cgi-bin/asterisk/conf.cgi
-#srv/web/ipfire/cgi-bin/asterisk/conf/telbook.conf
-#srv/web/ipfire/cgi-bin/asterisk/status.cgi
srv/web/ipfire/cgi-bin/atm-status.cgi
srv/web/ipfire/cgi-bin/backup.cgi
#srv/web/ipfire/cgi-bin/captive
@@ -83,7 +77,6 @@ srv/web/ipfire/cgi-bin/time.cgi
#srv/web/ipfire/cgi-bin/tor.cgi
srv/web/ipfire/cgi-bin/traffic.cgi
srv/web/ipfire/cgi-bin/updatexlrator.cgi
-#srv/web/ipfire/cgi-bin/upnp.cgi
srv/web/ipfire/cgi-bin/urlfilter.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/cgi-bin/vulnerabilities.cgi
diff --git a/config/rootfiles/core/154/filelists/files b/config/rootfiles/core/154/filelists/files
index eea472eaf..1861bb925 100644
--- a/config/rootfiles/core/154/filelists/files
+++ b/config/rootfiles/core/154/filelists/files
@@ -4,8 +4,13 @@ etc/os-release
srv/web/ipfire/cgi-bin/country.cgi
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/dhcp.cgi
+srv/web/ipfire/cgi-bin/extrahd.cgi
+srv/web/ipfire/cgi-bin/gpl.cgi
+srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
+srv/web/ipfire/cgi-bin/optionsfw.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/remote.cgi
srv/web/ipfire/cgi-bin/services.cgi
usr/local/bin/sshctrl
+var/ipfire/general-functions.pl
var/ipfire/langs
diff --git a/config/rootfiles/core/154/filelists/knot b/config/rootfiles/core/154/filelists/knot
new file mode 120000
index 000000000..28e96f878
--- /dev/null
+++ b/config/rootfiles/core/154/filelists/knot
@@ -0,0 +1 @@
+../../../common/knot
\ No newline at end of file
diff --git a/html/cgi-bin/asterisk/calls.cgi b/html/cgi-bin/asterisk/calls.cgi
deleted file mode 100644
index c5877b2ea..000000000
--- a/html/cgi-bin/asterisk/calls.cgi
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/perl
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-
-&Header::showhttpheaders();
-
-my (%asterisksettings, %checked);
-
-my %cgiparams;
-
-&Header::getcgihash(\%cgiparams);
-
-$asterisksettings{'ACTION'} = '';
-
-$file = "/var/log/asterisk/cdr-csv/Master.csv";
-
-open(DATEN, "$file") or die "Can't open file: $file: $!\n";
-(a)datafile = <DATEN>;
-close(DATEN);
-
-$file = "./conf/telbook.conf";
-open(DATEN, "$file") or die "Can't open file: $file: $!\n";
-(a)telbook = <DATEN>;
-close(DATEN);
-
-&Header::openpage('asterisk', 1, '');
-
-&Header::openbigbox('100%', 'LEFT');
-
-if ($cgiparams{'ACTION'} eq $Lang::tr{'update'})
-{
- $mday3 = $cgiparams{'day3'};
- $mon3 = $cgiparams{'month3'};
- $jahr3 = $cgiparams{'year3'};
- $mday4 = $cgiparams{'day4'};
- $mon4 = $cgiparams{'month4'};
- $jahr4 = $cgiparams{'year4'};
-}
-else
-{
- @datum3 = localtime(time());
- ($sec3,$min3,$stunde3,$mday3,$mon3,$jahr3,$wday3,$yday3,$isdst3)=@datum3;
- $jahr3 = $jahr3 + 1900;
- $mon3 = $mon3+1;
- if ($mon3 < 10) { $mon3 = "0$mon3"; }
- if ($mday3 <10) { $mday3= "0$mday3";}
- $sec4 = $sec3;
- $min4 = $min3;
- $stunde4 = $stunde3;
- $mday4 = $mday3;
- $mon4 = $mon3;
- $jahr4 = $jahr3;
- $wday4 = $wday3;
- $isdst4 = $isdst3;
-}
-
-if ($errormessage) {
- &openbox('100%', 'LEFT', $tr{'error messages'});
- print "<FONT CLASS='base'>$errormessage </FONT>\n";
- &closebox();
-}
-
-print "<FORM METHOD='POST'>\n";
-
-&Header::openbox('100%', 'LEFT', 'Filter');
-
-print <<END
-<center><table border=0><tr><td> </td><td width=50px>Tag:</td><td width=50px>Monat:</td><td width=50px>Jahr:</td></tr>
-<tr><td>Von: <td><input type=text name=day3 maxlength=2 size=2 value="$mday3"><td><input type=text name=month3 maxlength=2 size=2 value="$mon3"><td><input type=text name=year3 maxlength=4 size=4 value="$jahr3">
-<tr><td>Bis: <td><input type=text name=day4 maxlength=2 size=2 value="$mday4"><td><input type=text name=month4 maxlength=2 size=2 value="$mon4"><td><input type=text name=year4 maxlength=4 size=4 value="$jahr4">
-
-<tr><td colspan=2>Von oder zum Anrufer mit der ID/Nummer:<td colspan=2><input type=text name=number size=20 maxlength=100 value="$cgiparams{'number'}">
-
-<tr><td align=center colspan=4><input type=submit name='ACTION' value=$Lang::tr{'update'}>
-</table>
-END
-;
-
-&Header::closebox();
-
-&Header::openbox('100%', 'LEFT', 'Anrufe');
-print "<table border=0 width=100%> <tr> <td align=center><b>Anfrufer <td align=center><b>Angerufene <td align=center><b>CallerID <td align=center><b>Start des Anrufs <td align=center><b>Ende des Anrufs <td align=center><b>Dauer (in Sek.) <td align=center><b>Status";
-print "<tr><td colspan=6> <!-- Platzhalter -->";
-foreach $line (reverse @datafile) {
-chomp $line;
-(@spalten) = split (/,/, $line);
-$spalten[1] =~ s/"//g;
-$spalten[2] =~ s/"//g;
-$spalten[4] =~ s/"//g;
-$spalten[10]=~ s/"//g;
-$spalten[11]=~ s/"//g;
-$spalten[13]=~ s/"//g;
-$spalten[14]=~ s/"//g;
-(@zdatum) = split (/ /, $spalten[11]);
-(@datu) = split (/-/, $zdatum[0]);
-(@dzeit) = split (/:/, $zdatum[1]);
-$datum1 = $datu[0].$datu[1].$datu[2];
-(a)datum2_1 = localtime(time());
-($sec,$min,$stunde,$mday,$mon,$jahr,$wday,$yday,$isdst)=@datum2_1;
-$jahr = $jahr + 1900;
-$mon = $mon+1;
-if ($mon < 10) { $mon = "0$mon"; }
-if ($mday <10) { $mday= "0$mday";}
-$datum2 = $jahr.$mon.$mday;
-$datum3_1 = $jahr3.$mon3.$mday3;
-$datum4_1 = $jahr4.$mon4.$mday4;
-$datum2 = $datum2-100;
-if ($datum1 ge $datum3_1 && $datum1 le $datum4_1 && ($cgiparams{'number'} eq '' || $cgiparams{'number'} eq $spalten[1] || $cgiparams{'number'} eq $spalten[2])) {
-$telline = @telbook[0];
-$telline =~ s/\[telnr\]/$spalten[1]/g;
-$dauer_m = int($spalten[13]/60);
-$dauer_s = $spalten[13]%60;
-$dauer_h = int($spalten[13]/3600);
-$dauer_m2= $dauer_m-($dauer_h*60);
-$dauer_t = $dauer_h.":";
-if ($dauer_m2 < 10) { $dauer_t .= "0".$dauer_m2."."; }
- else { $dauer_t .= $dauer_m2."."; }
-if ($dauer_s < 10) { $dauer_t .= "0".$dauer_s; }
- else { $dauer_t .= $dauer_s; }
-print "<tr bgcolor=#C0C0C0> <td align=center><a target='_blank' href=$telline> $spalten[1]</a> <td align=center>$spalten[2] <td align=center>$spalten[4] <td align=center bgcolor=#339933>$spalten[10] <td align=center bgcolor=#339933>$spalten[11] <td align=center>$dauer_t <td align=center bgcolor='#993333'><font color=white>$spalten[14]\n";}
-}
-print "</table>";
-
-&Header::closebox();
-
-print "</FORM>\n";
-
-&Header::closebigbox();
-
-&Header::closepage();
diff --git a/html/cgi-bin/asterisk/conf.cgi b/html/cgi-bin/asterisk/conf.cgi
deleted file mode 100644
index 2dd8cf0a8..000000000
--- a/html/cgi-bin/asterisk/conf.cgi
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/usr/bin/perl
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-
-&Header::showhttpheaders();
-
-my %cgiparams;
-
-&Header::getcgihash(\%cgiparams);
-
-&Header::openpage('asterisk', 1, '');
-
-&Header::openbigbox('100%', 'LEFT');
-
-if ($cgiparams{'ACTION'} eq $Lang::tr{'save'})
- {
- $conf_file = $cgiparams{'save_path'};
- open (FILE, ">$conf_file") or die "Kann die Datei nicht speichern: $!";
- flock (FILE, 2);
- print FILE "$cgiparams{'textarea'}";
- close FILE;
- &Header::openbox('100%', 'LEFT', 'info');
- print "$conf_file wurde gespeichert";
- &Header::closebox();
- }
-
-if ($cgiparams{'ACTION'} eq Bearbeiten)
- {
- $conf_file = $cgiparams{'conf_file'};
- }
-
-if ($conf_file eq '') {
- $conf_file='/var/ipfire/asterisk/extensions.conf';
- }
-
-if ($cgiparams{'ACTION'} eq extensions)
- {
- $conf_file='/var/ipfire/asterisk/extensions.conf';
- }
-
-if ($cgiparams{'ACTION'} eq sip)
- {
- $conf_file='/var/ipfire/asterisk/sip.conf';
- }
-
-if ($cgiparams{'ACTION'} eq iax)
- {
- $conf_file='/var/ipfire/asterisk/iax.conf';
- }
-
-
-
-
-if ($errormessage) {
- &Header::openbox('100%', 'LEFT', $tr{'error messages'});
- print "<FONT CLASS='base'>$errormessage </FONT>\n";
- &Header::closebox();
-}
-
-$cgiparams{'ACTION'} = '';
-
-print "<FORM METHOD='POST'>\n";
-
-if ($conf_file ne '') {
-
-&Header::openbox('100%', 'LEFT', $conf_file);
- print <<END
- <center><table border=0>
- <tr><td><textarea name="textarea" cols="80" rows="20" wrap="VIRTUAL">
-END
-;
-system("cat $conf_file");
-print <<END
-</textarea>\n
-
- <tr><td align=center>
- <p><input type=text name=save_path value=$conf_file size=25>
- <p><input type=submit name=ACTION value=$Lang::tr{'save'}>
- </table>
-
-END
-;
-
-&Header::closebox();
-}
-
-&Header::openbox('100%', 'LEFT', 'Dateiauswahl');
-
-my $dir = '/var/ipfire/asterisk/';
-my @dateien;
-
-listFiles ($dir);
-
-print <<END
-<table width=100% border=0>
-<tr><td width=33% align=right>
- <!-- Buttons -->
- <input type=submit name=ACTION value=extensions><input type=submit name=ACTION value=sip><input type=submit name=ACTION value=iax>
- <td width=33% align=right>
- <center><select name=conf_file>
-END
-;
-foreach $line (sort (@dateien)) {
-$op_name = $line;
-$op_name =~ s/$dir//g;
-print "<option value='$line'>$op_name</option>\n";
-}
-
-my $dir2 = '/home/httpd/cgi-bin/asterisk/conf/';
-my @dateien2;
-
-listFiles2 ($dir2);
-
-foreach $line2 (sort (@dateien2)) {
-$op_name2 = $line2;
-$op_name2 =~ s/$dir2//g;
-print "<option value='$line2'>$op_name2</option>\n";
-}
-
-print "</select><input type=submit name=ACTION value=Bearbeiten></center><td width=33% align=right> </table>";
-
-sub listFiles {
-local *DH;
-my ($item, $pfad);
-my $dir = shift;
-
-opendir (DH, $dir) or return;
-while ($item = readdir (DH)) {
-next if ( $item =~ /^\./ );
-$pfad = ( ($dir =~ /\/$/) ? ($dir . $item) : ($dir . '/'.$item) );
-push (@dateien, $pfad) if (-f $pfad);
-listFiles ($pfad) if (-d $pfad);
-}
-closedir (DH);
-}
-
-sub listFiles2 {
-local *DH2;
-my ($item2, $pfad2);
-my $dir2 = shift;
-
-opendir (DH2, $dir2) or return;
-while ($item2 = readdir (DH2)) {
-next if ( $item2 =~ /^\./ );
-$pfad2 = ( ($dir2 =~ /\/$/) ? ($dir2 . $item2) : ($dir2 . '/'.$item2) );
-push (@dateien2, $pfad2) if (-f $pfad2);
-listFiles2 ($pfad2) if (-d $pfad2);
-}
-closedir (DH2);
-}
-
-
-&Header::closebox();
-
-print "</FORM>\n";
-
-&Header::closebigbox();
-
-&Header::closepage();
diff --git a/html/cgi-bin/asterisk/conf/telbook.conf b/html/cgi-bin/asterisk/conf/telbook.conf
deleted file mode 100644
index b2a1d6a97..000000000
--- a/html/cgi-bin/asterisk/conf/telbook.conf
+++ /dev/null
@@ -1 +0,0 @@
-http://tel.search.ch/result.html?name=&misc=&strasse=&ort=&kanton=&tel=[telnr]
diff --git a/html/cgi-bin/asterisk/status.cgi b/html/cgi-bin/asterisk/status.cgi
deleted file mode 100644
index adfceb1db..000000000
--- a/html/cgi-bin/asterisk/status.cgi
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/perl
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-
-&Header::showhttpheaders();
-
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
-
-my %asterisksettings;
-
-&Header::getcgihash(\%asterisksettings);
-
-&Header::openpage('asterisk', 1, '');
-
-&Header::openbigbox('100%', 'LEFT');
-
-if ($asterisksettings{'ACTION'} eq 'Start')
-{
- system("/etc/init.d/asterisk start >/dev/null 2>&1");
- sleep 5;
-}
-if ($asterisksettings{'ACTION'} eq $Lang::tr{'stop'})
-{
- system("/etc/init.d/asterisk stop >/dev/null 2>&1");
- sleep 5;
-}
-if ($asterisksettings{'ACTION'} eq $Lang::tr{'reboot'})
-{
- system("/etc/init.d/asterisk restart >/dev/null 2>&1");
- sleep 5;
-}
-if ($asterisksettings{'ACTION'} eq "$Lang::tr{'reload'} EXT")
-{
- system("/etc/init.d/asterisk remod ext >/dev/null 2>&1");
-}
-if ($asterisksettings{'ACTION'} eq "$Lang::tr{'reload'} SIP")
-{
- system("/etc/init.d/asterisk remod sip >/dev/null 2>&1");
-}
-if ($asterisksettings{'ACTION'} eq "$Lang::tr{'reload'} IAX")
-{
- system("/etc/init.d/asterisk remod iax >/dev/null 2>&1");
-}
-
- my $pid = '';
- my $testcmd = '';
- my $exename;
- my @memory;
-
- if (open(FILE, "/var/run/asterisk.pid")){
- $pid = <FILE>; chomp $pid;
- close FILE;
- if (open(FILE, "/proc/${pid}/status")){
- while (<FILE>){
- if (/^Name:\W+(.*)/) {$testcmd = $1;}
- }
- close FILE;
- }
- }
-
-if ($testcmd !~ /asterisk/) {
- $checked{'ENABLE_AST'}{'status_s'}="<font style=\"color:white;background-color:red;\"> $Lang::tr{'not running'}</font>";
- $checked{'ENABLE_AST'}{'status_b'}="<INPUT TYPE='submit' NAME='ACTION' VALUE='Start'>";
-} else {
- $checked{'ENABLE_AST'}{'status_s'}="<font style=\"color:white;background-color:green;\"> $Lang::tr{'running'}</font>";
- $checked{'ENABLE_AST'}{'status_b'}="<INPUT TYPE='submit' NAME='ACTION' VALUE='$Lang::tr{'reboot'}'><INPUT TYPE='submit' NAME='ACTION' VALUE='$Lang::tr{'stop'}'>";
-}
-
-if ($errormessage) {
- &Header::openbox('100%', 'LEFT', $tr{'error messages'});
- print "<FONT CLASS='base'>$errormessage </FONT>\n";
- &Header::closebox();
-}
-
-if ($message) {
- &Header::openbox('100%', 'LEFT', 'Message');
- print "<FONT CLASS='base'>$message </FONT>\n";
- &Header::closebox();
-}
-
-print "<FORM METHOD='POST'>\n";
-
-&Header::openbox('100%', 'LEFT', 'Status:');
- print <<END
- <center>
-<TABLE WIDTH='100%'>
-<TR>
- <TD WIDTH='33%' CLASS='base' ALIGN='RIGHT'>Asterisk</TD>
- <TD WIDTH='33%' ALIGN='RIGHT'>$checked{'ENABLE_AST'}{'status_s'}</TD>
- <TD WIDTH='33%' ALIGN='LEFT'>$checked{'ENABLE_AST'}{'status_b'}</TD>
-</TR>
-<TR>
- <TD WIDTH='33%' CLASS='base' ALIGN='RIGHT'>Dialplan</TD>
- <TD WIDTH='33%' ALIGN='RIGHT'></TD>
- <TD WIDTH='33%' ALIGN='LEFT'> <INPUT TYPE='submit' NAME='ACTION' VALUE='$Lang::tr{'reload'} EXT'></TD>
-</TR>
-<TR>
- <TD WIDTH='33%' CLASS='base' ALIGN='RIGHT'>SIP</TD>
- <TD WIDTH='33%' ALIGN='RIGHT'></TD>
- <TD WIDTH='33%' ALIGN='LEFT'> <INPUT TYPE='submit' NAME='ACTION' VALUE='$Lang::tr{'reload'} SIP'></TD>
-</TR>
-<TR>
- <TD WIDTH='33%' CLASS='base' ALIGN='RIGHT'>IAX</TD>
- <TD WIDTH='33%' ALIGN='RIGHT'></TD>
- <TD WIDTH='33%' ALIGN='LEFT'> <INPUT TYPE='submit' NAME='ACTION' VALUE='$Lang::tr{'reload'} IAX'></TD>
-</TR>
-
-</TABLE>
-END
-;
-
-&Header::closebox();
-
-&Header::closebigbox();
-
-&Header::closepage();
diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
index da1efb2dd..aaf42baff 100644
--- a/html/cgi-bin/extrahd.cgi
+++ b/html/cgi-bin/extrahd.cgi
@@ -156,7 +156,7 @@ END
<input type='hidden' name='DEVICE' value='$deviceline[0]' />
<input type='hidden' name='FS' value='$deviceline[1]' />
<input type='hidden' name='PATH' value='$deviceline[2]' />
- <input type='hidden' name='ACTION' value=$Lang::tr{'delete'} />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' />
<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
</form></td></tr>
END
@@ -228,7 +228,7 @@ END
<td align="center">
<input type='hidden' name='DEVICE' value='$partitionline[0]' />
<input type='hidden' name='UUID' value='$partitionline[2]' />
- <input type='hidden' name='ACTION' value=$Lang::tr{'add'} />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'add'}' />
<input type='image' alt='$Lang::tr{'add'}' title='$Lang::tr{'add'}' src='/images/add.gif' />
</form></td></tr>
END
diff --git a/html/cgi-bin/gpl.cgi b/html/cgi-bin/gpl.cgi
index 94187ce7a..be1ea2639 100644
--- a/html/cgi-bin/gpl.cgi
+++ b/html/cgi-bin/gpl.cgi
@@ -71,7 +71,7 @@ print <<END;
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='checkbox' name='gpl_accepted' value='1'/> $Lang::tr{'gpl i accept these terms and conditions'}.
<br/ >
- <input type='submit' name='ACTION' value=$Lang::tr{'yes'} />
+ <input type='submit' name='ACTION' value='$Lang::tr{'yes'}' />
</form>
</p>
<a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a>
diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi
index e582acfb9..5c677d815 100644
--- a/html/cgi-bin/hardwaregraphs.cgi
+++ b/html/cgi-bin/hardwaregraphs.cgi
@@ -167,7 +167,7 @@ END
print <<END
<tr>
- <td align='center' colspan='2' ><input type='submit' name='ACTION' value=$Lang::tr{'save'} /></td>
+ <td align='center' colspan='2' ><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
</tr>
</table>
</form>
diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index 47aba59cb..8c996802c 100644
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -323,7 +323,7 @@ END
<br />
<table width='100%' cellspacing='0'>
<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<input type='submit' name='ACTION' value=$Lang::tr{'save'} />
+<input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
</form></td></tr>
</table>
</form>
@@ -345,7 +345,7 @@ print <<END;
<tr><td width='15%' align='left'> <select name='POLICY' style="width: 100px">
<option value='MODE1' $selected{'POLICY'}{'MODE1'}>$Lang::tr{'fwdfw pol block'}</option>
<option value='MODE2' $selected{'POLICY'}{'MODE2'}>$Lang::tr{'fwdfw pol allow'}</option></select>
- <input type='submit' name='ACTION' value=$Lang::tr{'save'} /><input type='hidden' name='defpol' value='1'></td>
+ <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /><input type='hidden' name='defpol' value='1'></td>
END
print "</tr></table></form>";
print"<br><br>";
diff --git a/html/cgi-bin/upnp.cgi b/html/cgi-bin/upnp.cgi
deleted file mode 100644
index 07dfa2677..000000000
--- a/html/cgi-bin/upnp.cgi
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 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/>. #
-# #
-###############################################################################
-
-use strict;
-# enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-
-my %upnpsettings = ();
-my %netsettings = ();
-my $message = "";
-my $errormessage = "";
-my %selected= () ;
-
-my %servicenames =('UPnP Daemon' => 'upnpd',);
-
-my %color = ();
-my %mainsettings = ();
-&General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
-
-&Header::showhttpheaders();
-############################################################################################################################
-############################################### Setzen von Standartwerten ##################################################
-
-$upnpsettings{'DEBUGMODE'} = '3';
-$upnpsettings{'FORWARDRULES'} = 'yes';
-$upnpsettings{'DOWNSTREAM'} = '1048576';
-$upnpsettings{'UPSTREAM'} = '131072';
-$upnpsettings{'DESCRIPTION'} = 'gatedesc.xml';
-$upnpsettings{'XML'} = '/etc/linuxigd';
-$upnpsettings{'ENABLED'} = 'off';
-$upnpsettings{'friendlyName'} = 'IPFire Gateway';
-### Values that have to be initialized
-$upnpsettings{'ACTION'} = '';
-
-&General::readhash("${General::swroot}/upnp/settings", \%upnpsettings);
-&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
-&Header::getcgihash(\%upnpsettings);
-
-&Header::openpage('UPnP', 1, '');
-&Header::openbigbox('100%', 'left', '', $errormessage);
-
-############################################################################################################################
-################################################### Speichern der Config ###################################################
-
-if ($upnpsettings{'ACTION'} eq $Lang::tr{'save'})
- {
- $upnpsettings{'DOWNSTREAM'} = $upnpsettings{'DOWNSTREAM'} * 1024;
- $upnpsettings{'UPSTREAM'} = $upnpsettings{'UPSTREAM'} * 1024;
- &General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
-
- open (FILE, ">${General::swroot}/upnp/upnpd.conf") or die "Can't save the upnp config: $!";
- flock (FILE, 2);
-
- print FILE <<END
-
-# UPnP Config by Ipfire Project
-
-debug_mode = $upnpsettings{'DEBUGMODE'}
-insert_forward_rules = $upnpsettings{'FORWARDRULES'}
-forward_chain_name = FORWARD
-prerouting_chain_name = UPNPFW
-upstream_bitrate = $upnpsettings{'DOWNSTREAM'}
-downstream_bitrate = $upnpsettings{'UPSTREAM'}
-description_document_name = $upnpsettings{'DESCRIPTION'}
-xml_document_path = $upnpsettings{'XML'}
-
-END
-;
- close FILE;
- system("/usr/local/bin/upnpctrl","upnpxml","$upnpsettings{'friendlyName'}","$upnpsettings{'XML'}","$upnpsettings{'DESCRIPTION'}");
- }
-elsif ($upnpsettings{'ACTION'} eq 'Start')
- {
- $upnpsettings{'ENABLED'} = 'on';
- &General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
- system("/usr/local/bin/upnpctrl upnpdstart $netsettings{'RED_DEV'} $netsettings{'GREEN_DEV'}");
- }
-elsif ($upnpsettings{'ACTION'} eq 'Stop')
- {
- $upnpsettings{'ENABLED'} = 'off';
- &General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
- system("/usr/local/bin/upnpctrl stop");
- }
-elsif ($upnpsettings{'ACTION'} eq $Lang::tr{'restart'})
- {
- &General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
- system("/usr/local/bin/upnpctrl stop");
- system("/usr/local/bin/upnpctrl start $netsettings{'RED_DEV'} $netsettings{'GREEN_DEV'}");
- }
-
-&General::readhash("${General::swroot}/upnp/settings", \%upnpsettings);
-$upnpsettings{'DOWNSTREAM'} = $upnpsettings{'DOWNSTREAM'} / 1024;
-$upnpsettings{'UPSTREAM'} = $upnpsettings{'UPSTREAM'} / 1024;
-
-if ($errormessage)
- {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
- print "<class name='base'>$errormessage\n";
- print " </class>\n";
- &Header::closebox();
- }
-
-############################################################################################################################
-############################################################################################################################
-
-&Header::openbox('100%', 'center', 'UPnP');
-print <<END
-<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<table width='95%' cellspacing='0'>
-END
-;
-if ( $message ne "" ) {print "<tr><td colspan='3' style='text-align:center; color:red;'>$message</td></tr>";}
-
-my $lines = 0;
-my $key = '';
-foreach $key (sort keys %servicenames)
-{
- print "<tr><td align='left'>$key\n";
- my $shortname = $servicenames{$key};
- my $status = &isrunning($shortname);
- print "$status\n";
- $lines++;
-}
-
-print <<END
-<tr><td align='left'>Alle Dienste:</td><td 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{'restart'}' />
-</table>
-</form>
-<br />
-<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<table width='95%' cellspacing='0'>
-<tr><td colspan='2' align='left' bgcolor='$color{'color20'}'><b>$Lang::tr{'options'}</b></td></tr>
-<tr><td align='left' colspan='2'><br /></td></tr>
-<tr><td align='left'>UPnP Device Name:</td><td><input type='text' name='friendlyName' value='$upnpsettings{'friendlyName'}' size="30" /></td></tr>
-<tr><td align='left' colspan='2'><br /></td></tr>
-<tr><td align='left'>Downstream in KB:</td><td><input type='text' name='DOWNSTREAM' value='$upnpsettings{'DOWNSTREAM'}' size="30" /></td></tr>
-<tr><td align='left'>Upstream in KB:</td><td><input type='text' name='UPSTREAM' value='$upnpsettings{'UPSTREAM'}' size="30" /></td></tr>
-<tr><td align='left' colspan='2'><br /></td></tr>
-<tr><td colspan='2' align='center'> <input type='hidden' name='ACTION' value=$Lang::tr{'save'} />
-<input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/floppy.gif' /></td></tr>
-</table></form>
-END
-;
-&Header::closebox();
-
-&Header::openbox('100%', 'center', 'Aktuell geoeffnete Ports');
-my @output = qx(iptables -t nat -n -L PORTFW);
-my ($outputline, $extip, $extport, $int);
-my @output2;
-print "<table>";
-foreach $outputline (@output) {
- if ( $outputline =~ /^DNAT/ ) {
- @output2 = split(/ /, $outputline);
- $extip = $output2[23];
- $extport = $output2[29];
- $extport =~ s/dpt://;
- $int = "$output2[31]";
- $int =~ s/to://;
- print "<tr><td>$extip:$extport<td align='center'><img src='/images/forward.gif' alt='=>' /><td>$int";
-
- }
-}
-
-print "</table>";
-
-&Header::closebox();
-
-&Header::closebigbox();
-&Header::closepage();
-
-############################################################################################################################
-############################################################################################################################
-
-sub isrunning
-{
- my $cmd = $_[0];
- my $status = "<td bgcolor='${Header::colourred}' style='text-align:center; color:white;'><b>$Lang::tr{'stopped'}</b></td>";
- my $pid = '';
- my $testcmd = '';
- my $exename;
-
- $cmd =~ /(^[a-z]+)/;
- $exename = $1;
-
- if (open(FILE, "/var/run/${cmd}.pid"))
- {
- $pid = <FILE>; chomp $pid;
- close FILE;
- if (open(FILE, "/proc/${pid}/status"))
- {
- while (<FILE>)
- {if (/^Name:\W+(.*)/) {$testcmd = $1; }}
- close FILE;
- if ($testcmd =~ /$exename/)
- {$status = "<td style='color:white; background-color:${Header::colourgreen};'><b>$Lang::tr{'running'}</b></td>";}
- }
- }
-
- return $status;
-}
-
diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index 4e34e19d5..352308692 100644
--- a/lfs/dhcpcd
+++ b/lfs/dhcpcd
@@ -24,7 +24,7 @@
include Config
-VER = 9.3.4
+VER = 9.4.0
THISAPP = dhcpcd-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = badb02dfc69fe9bbeec35a02efcdb4db
+$(DL_FILE)_MD5 = c36715fc629bc40aa94aae06fa1724c2
install : $(TARGET)
@@ -70,9 +70,6 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch
-
cd $(DIR_APP) && ./configure --prefix="" --sysconfdir=/var/ipfire/dhcpc \
--dbdir=/var/ipfire/dhcpc \
--libexecdir=/var/ipfire/dhcpc \
diff --git a/lfs/knot b/lfs/knot
index 4bb8dcbf0..8a3288cdf 100644
--- a/lfs/knot
+++ b/lfs/knot
@@ -24,7 +24,7 @@
include Config
-VER = 3.0.2
+VER = 3.0.3
THISAPP = knot-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c4e18bd1e595cffb185a042522985dec
+$(DL_FILE)_MD5 = 96db8b271ab8c54dd8d4f69a480a71c5
install : $(TARGET)
diff --git a/lfs/wget b/lfs/wget
index 00ca75033..903f266cb 100644
--- a/lfs/wget
+++ b/lfs/wget
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info(a)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 = 1.20.3
+VER = 1.21
THISAPP = wget-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = db4e6dc7977cbddcd543b240079a4899
+$(DL_FILE)_MD5 = 3852118b7a771a7c9c0388883c8f5dbf
install : $(TARGET)
diff --git a/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch b/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch
deleted file mode 100644
index 9efcde219..000000000
--- a/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/privsep-linux.c b/src/privsep-linux.c
-index 050a30cf..d31d720d 100644
---- a/src/privsep-linux.c
-+++ b/src/privsep-linux.c
-@@ -32,6 +32,7 @@
-
- #include <linux/audit.h>
- #include <linux/filter.h>
-+#include <linux/net.h>
- #include <linux/seccomp.h>
- #include <linux/sockios.h>
-
-@@ -304,6 +305,23 @@ static struct sock_filter ps_seccomp_filter[] = {
- #ifdef __NR_sendto
- SECCOMP_ALLOW(__NR_sendto),
- #endif
-+#ifdef __NR_socketcall
-+ /* i386 needs this and demonstrates why SECCOMP
-+ * is poor compared to OpenBSD pledge(2) and FreeBSD capsicum(4)
-+ * as this is soooo tied to the kernel API which changes per arch
-+ * and likely libc as well. */
-+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT),
-+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT4),
-+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_LISTEN),
-+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_GETSOCKOPT), /* overflow */
-+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECV),
-+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVFROM),
-+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVMSG),
-+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SEND),
-+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDMSG),
-+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDTO),
-+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SHUTDOWN),
-+#endif
- #ifdef __NR_shutdown
- SECCOMP_ALLOW(__NR_shutdown),
- #endif
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-04 10:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-04 10:45 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d0a16dba2835fc1c27c1d12765d7461a9d48c04c Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox