Development July 2021

development@lists.ipfire.org

12 participants
102 discussions

[PATCH] backup.cgi: Table layout - onclick confirm
by Matthias Fischer 10 Jul '21

10 Jul '21

This is just a diff for testing people... ;-) Changelog in short: - Added tables - Cleaned up the code a bit, some if-queries were unnessecary (if ($cgiparams{'ACTION'} eq...) - Deleted unused lang strings (downloadiso, downloadaddon, logs) - Separated the ISO files from the IPF files for better overview. - Added query for deleting a backup file (onclick=\"return confirm...) ToDo: Change table layout to alternating rows. If "someone" has some hints how to do this, I'll be grateful. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/backup.cgi | 218 +++++++++++++++++++++++++++++----------- langs/de/cgi-bin/de.pl | 8 +- langs/en/cgi-bin/en.pl | 8 +- langs/es/cgi-bin/es.pl | 1 - langs/fr/cgi-bin/fr.pl | 1 - langs/it/cgi-bin/it.pl | 1 - langs/nl/cgi-bin/nl.pl | 1 - langs/pl/cgi-bin/pl.pl | 1 - langs/ru/cgi-bin/ru.pl | 1 - langs/tr/cgi-bin/tr.pl | 1 - 10 files changed, 174 insertions(+), 67 deletions(-) diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index 683f8add4..04473428c 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -32,7 +32,7 @@ require "${General::swroot}/header.pl"; my %color = (); my %mainsettings = (); -my %cgiparams=(); +my %cgiparams = (); my %checked = (); my $message = ""; my $errormessage = ""; @@ -59,25 +59,13 @@ system("/usr/local/bin/backupctrl makedirs >/dev/null 2>&1 ") unless ( -e '/var/ ############################################################################################################################ ############################################## System calls ohne Http Header ############################################### -if ($cgiparams{'ACTION'} eq "download") { +if ($cgiparams{'ACTION'} eq "$Lang::tr{'download'}") { my $file = &sanitise_file($cgiparams{'FILE'}); exit(1) unless defined($file); &deliver_file($file); exit(0); -} elsif ($cgiparams{'ACTION'} eq "downloadiso") { - my $file = &sanitise_file($cgiparams{'FILE'}); - exit(1) unless defined($file); - - &deliver_file($file); - exit(0); -} elsif ($cgiparams{'ACTION'} eq "downloadaddon") { - my $file = &sanitise_file($cgiparams{'FILE'}); - exit(1) unless defined($file); - - &deliver_file($file); - exit(0); -} elsif ( $cgiparams{'ACTION'} eq "restore") { +} elsif ( $cgiparams{'ACTION'} eq "$Lang::tr{'restore'}") { my $upload = $a->param("UPLOAD"); open UPLOADFILE, ">/tmp/restore.ipf"; binmode $upload; @@ -87,7 +75,7 @@ if ($cgiparams{'ACTION'} eq "download") { close UPLOADFILE; system("/usr/local/bin/backupctrl restore >/dev/null 2>&1"); } -elsif ( $cgiparams{'ACTION'} eq "restoreaddon" ) +elsif ( $cgiparams{'ACTION'} eq "$Lang::tr{'restoreaddon'}" ) { chomp($cgiparams{'UPLOAD'}); # we need to fix cause IE7 gives the full path and FF only the filename @@ -112,7 +100,7 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont ############################################################################################################################ ################################################### Default System calls ################################################### -if ( $cgiparams{'ACTION'} eq "backup" ) +if ( $cgiparams{'ACTION'} eq "$Lang::tr{'backup'}" ) { if ( $cgiparams{'BACKUPLOGS'} eq "include" ) { system("/usr/local/bin/backupctrl include >/dev/null 2>&1"); @@ -122,7 +110,7 @@ if ( $cgiparams{'ACTION'} eq "backup" ) system("/usr/local/bin/backupctrl iso >/dev/null 2>&1"); } } -if ( $cgiparams{'ACTION'} eq "addonbackup" ) +if ( $cgiparams{'ACTION'} eq "$Lang::tr{'addonbackup'}" ) { # Exit if there is any dots or slashes in the addon name exit(1) if ($cgiparams{'ADDON'} =~ /(\.|\/)/); @@ -132,7 +120,7 @@ if ( $cgiparams{'ACTION'} eq "addonbackup" ) system("/usr/local/bin/backupctrl addonbackup $cgiparams{'ADDON'} >/dev/null 2>&1"); } -elsif ( $cgiparams{'ACTION'} eq "delete" ) +elsif ( $cgiparams{'ACTION'} eq "$Lang::tr{'delete'}" ) { my $file = &sanitise_file($cgiparams{'FILE'}); exit(1) unless defined($file); @@ -157,13 +145,13 @@ if ( -e "/var/tmp/backupiso/" ){ @backupisos = `cd /var/tmp/backupiso/ && ls *.iso 2>/dev/null`; } -&Header::openbox('100%', 'center', ); +&Header::openbox('100%', 'center', $Lang::tr{'backup config'}); print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}'> <table width='95%' cellspacing='0'> <tr> - <td align='left' width='40%'>$Lang::tr{'logs'}</td> + <td align='center' width='45%'></td> <td align='left'> <input type='radio' name='BACKUPLOGS' value='include'/> $Lang::tr{'include logfiles'}<br/> <input type='radio' name='BACKUPLOGS' value='exclude' checked='checked'/> $Lang::tr{'exclude logfiles'}<br/> @@ -177,8 +165,8 @@ print <<END </td> </tr> <tr><td align='center' colspan='2'> - <input type='hidden' name='ACTION' value='backup' /> - <input type='image' alt='$Lang::tr{'backup'}' title='$Lang::tr{'backup'}' src='/images/document-save.png' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'backup'}' /> + <input type='image' alt='$Lang::tr{'backup'}' title='$Lang::tr{'backup'}' src='/images/floppy.gif' /> </td></tr> </table> </form> @@ -189,10 +177,17 @@ END ############################################################################################################################ ############################################ Backups des Systems downloaden ################################################ -&Header::openbox('100%', 'center', $Lang::tr{'backups'}); +&Header::openbox('100%', 'center', $Lang::tr{'backups data'}); print <<END -<table width='95%' cellspacing='0'> +<table width='95%' cellspacing='0' border='1'> + +<tr> +<th width='40%'>$Lang::tr{'filename'}</th> +<th>$Lang::tr{'size'}</th> +<th colspan='2'>$Lang::tr{'action'}</th> +</tr> + END ; foreach (@backups){ @@ -202,9 +197,44 @@ my $Datei = "/var/ipfire/backup/".$_; my @Info = stat($Datei); my $Size = $Info[7] / 1024 / 1024; $Size = sprintf("%0.2f", $Size); -print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size MB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='download' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>"; -print "<td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='delete' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /></form></td></tr>"; + +print "<tr> +<td align='center'>$_</td> +<td align='center'>$Size MB</td> +<td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='hidden' name='ACTION' value='$Lang::tr{'download'}' /> + <input type='hidden' name='FILE' value='$_' /> + <input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/go-bottom.png' /> + </form></td>"; + +print "<td width='5'> +<form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' /> + <input type='hidden' name='FILE' value='$_' /> + <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' onclick=\"return confirm('$Lang::tr{'delete file'}');\" /> + </form></td></tr>"; } + +print <<END +</table> +END +; +&Header::closebox(); + +&Header::openbox('100%', 'center', $Lang::tr{'backups iso'}); + +print <<END +<table width='95%' cellspacing='0' border='1'> + +<tr> +<th width='40%'>$Lang::tr{'filename'}</th> +<th>$Lang::tr{'size'}</th> +<th colspan='2'>$Lang::tr{'action'}</th> +</tr> + +END +; + foreach (@backupisos){ if ( $_ !~ /iso$/){next;} chomp($_); @@ -212,8 +242,22 @@ my $Datei = "/var/tmp/backupiso/".$_; my @Info = stat($Datei); my $Size = $Info[7] / 1024 / 1024; $Size = sprintf("%0.2f", $Size); -print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size MB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='downloadiso' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>"; -print "<td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='delete' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /></form></td></tr>"; + +print "<tr> +<td align='center' width='40%'>$_</td> +<td align='center'>$Size MB</td> +<td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='hidden' name='ACTION' value='$Lang::tr{'download'}' /> + <input type='hidden' name='FILE' value='$_' /> + <input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/go-bottom.png' /> + </form></td>"; + +print "<td width='5'> +<form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' /> + <input type='hidden' name='FILE' value='$_' /> + <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' onclick=\"return confirm('$Lang::tr{'delete file'}');\" /> + </form></td></tr>"; } print <<END </table> @@ -235,7 +279,19 @@ foreach (@addons){ $addons{$addon}=''; } -print "<table width='95%' cellspacing='0'>"; +print <<END + +<table width='95%' cellspacing='0' border='1'> + +<tr> +<th width='20%'>$Lang::tr{'name'}</th> +<th width='20%'>$Lang::tr{'date'}</th> +<th>$Lang::tr{'size'}</th> +<th align='center' colspan='3'>$Lang::tr{'action'}</th> +</tr> +END +; + foreach (@addonincluds){ chomp($_); delete $addons{$_}; @@ -245,69 +301,93 @@ my $Size = $Info[7] / 1024; if ( -e $Datei ){ if ($Size < 1) { - $Size = sprintf("%.2f", $Size); - print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>"; - } else { - $Size = sprintf("%2d", $Size); - print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>"; + $Size = sprintf("%.2f", $Size); +print "<tr> + <td align='center'>$_</td> + <td align='center'>".localtime($Info[9])."</td> + <td align='center'>$Size KB</td>"; + </tr> - } + } else { + $Size = sprintf("%2d", $Size); +print "<tr> + <td align='center'>$_</td> + <td align='center'>".localtime($Info[9])."</td> + <td align='center'>$Size KB</td>"; + </tr> + } print <<END - <td align='right' width='5'> + + <td align='center' width='5'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='hidden' name='ACTION' value='downloadaddon' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'download'}' /> <input type='hidden' name='FILE' value='$_.ipf' /> - <input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /> + <input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/go-bottom.png' /> </form> </td> - <td align='right' width='5'> + <td align='center' width='5'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='hidden' name='ACTION' value='delete' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' /> <input type='hidden' name='FILE' value='$_.ipf' /> - <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /> + <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' onclick=\"return confirm('$Lang::tr{'delete file'}');\" /> </form> </td> END ; } -else{ - print "<tr><td align='center'>$Lang::tr{'backup from'} $_ </td><td width='5' align='right'></td><td width='5' align='right'></td>"; + +else { + + print "<tr> + <td align='center'>$_</td> + <td align='center'> - </td> + <td align='center' width='50%'> - </td> + <td align='center' colspan='2'> - </td>"; } + print <<END <td align='right' width='5'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='hidden' name='ACTION' value='addonbackup' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'addonbackup'}' /> <input type='hidden' name='ADDON' value='$_' /> - <input type='image' alt='$Lang::tr{'backup'}' title='$Lang::tr{'backup'}' src='/images/document-save.png' /> + <input type='image' alt='$Lang::tr{'backup'}' title='$Lang::tr{'backup'}' src='/images/floppy.gif' /> </form> - </td></tr> + </td> +</tr> END ; + } + foreach (keys(%addons)){ chomp($_); my $Datei = "/var/ipfire/backup/addons/backup/".$_.".ipf"; my @Info = stat($Datei); my $Size = $Info[7] / 1024; $Size = sprintf("%2d", $Size); -print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>"; + +print "<tr> + <td align='center'>$_</td> + <td align='center'>".localtime($Info[9])."</td> + <td align='center'>$Size KB</td>"; + print <<END - <td align='right' width='5'> + <td align='center' width='5'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='hidden' name='ACTION' value='downloadaddon' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'download'}' /> <input type='hidden' name='FILE' value='$_.ipf' /> - <input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /> + <input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/go-bottom.png' /> </form> </td> - <td align='right' width='5'> + <td align='center' width='5'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='hidden' name='ACTION' value='delete' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' /> <input type='hidden' name='FILE' value='$_.ipf' /> - <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /> + <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' onclick=\"return confirm('$Lang::tr{'delete file'}');\" /> </form> </td> - <td align='right' width='5'></td></tr> + </tr> END ; } @@ -322,9 +402,31 @@ print "</table>"; print <<END <table width='95%' cellspacing='0'> -<tr><td align='center' colspan='2'><font color='red'><br />$Lang::tr{'backupwarning'}</font><br /><br /></td></tr> -<tr><td align='left'>$Lang::tr{'backup'}</td><td align='left'><form method='post' enctype='multipart/form-data' action='$ENV{'SCRIPT_NAME'}'><input type="file" size='50' name="UPLOAD" /><input type='hidden' name='ACTION' value='restore' /><input type='hidden' name='FILE' /><input type='image' alt='$Lang::tr{'restore'}' title='$Lang::tr{'restore'}' src='/images/media-floppy.png' /></form></td></tr> -<tr><td align='left'>$Lang::tr{'backupaddon'}</td><td align='left'><form method='post' enctype='multipart/form-data' action='$ENV{'SCRIPT_NAME'}'><input type="file" size='50' name="UPLOAD" /><input type='hidden' name='ACTION' value='restoreaddon' /><input type='hidden' name='FILE' /><input type='image' alt='$Lang::tr{'restore'}' title='$Lang::tr{'restore'}' src='/images/media-floppy.png' /></form></td></tr> +<tr> + <td align='center' colspan='2'><font color='red'><br />$Lang::tr{'backupwarning'}</font><br /><br /></td> +</tr> + +<tr> + <td align='center'>$Lang::tr{'backup'}</td> + <td align='left'> + <form method='post' enctype='multipart/form-data' action='$ENV{'SCRIPT_NAME'}'> + <input type="file" size='50' name="UPLOAD" /> + <input type='hidden' name='ACTION' value='$Lang::tr{'restore'}' /> + <input type='hidden' name='FILE' /> + <input type='image' alt='$Lang::tr{'restore'}' title='$Lang::tr{'restore'}' src='/images/go-top.png' /> + </form></td> +</tr> + +<tr> + <td align='center'>$Lang::tr{'backupaddon'}</td> + <td align='left'><form method='post' enctype='multipart/form-data' action='$ENV{'SCRIPT_NAME'}'> + <input type="file" size='50' name="UPLOAD" /> + <input type='hidden' name='ACTION' value='$Lang::tr{'restoreaddon'}' /> + <input type='hidden' name='FILE' /> + <input type='image' alt='$Lang::tr{'restoreaddon'}' title='$Lang::tr{'restoreaddon'}' src='/images/go-top.png' /> + </form></td> +</tr> + </table> END ; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 95af3155b..37f0cab8a 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -158,6 +158,7 @@ 'add-route' => 'Zusätzlich zu propagierende Route', 'added from dhcp lease list' => 'hinzugefügt von der DHCP-Zuordnungsliste', 'addon' => 'Add-Ons', +'addonbackup' => 'Sichern', 'addons' => 'Add-Ons', 'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.', 'admin users' => 'Liste der Benutzer mit Super User Rechten', @@ -470,8 +471,11 @@ 'backup sets' => 'Datensicherungssätze', 'backup to floppy' => 'Datensicherung auf Diskette', 'backupaddon' => 'Add-On-Sicherung', +'backup config' => 'Konfiguration', 'backupprofile' => 'Falls die Wiederverbindung scheitert, auf dieses Profil umschalten', 'backups' => 'Sicherungen', +'backups data' => 'IPF-Dateien', +'backups iso' => 'ISO-Dateien', 'backupwarning' => 'Spielen Sie zuerst Ihre Hauptsicherung und anschließend die Sicherung(en) der Addon-Konfiguration(en) ein.<br />Es werden lediglich die gesicherten Konfigurationsdatei(en) der Addons, nicht die installierten Addons wiederhergestellt!<br />Achten Sie außerdem darauf, dass die Sicherungen ihre originalen Dateinamen behalten.', 'bad characters in' => 'Ungültige Zeichen in ', 'bad characters in script field' => 'Nicht erlaubte Zeichen im Skriptnamen', @@ -735,6 +739,8 @@ 'defaultwarning' => 'ACHTUNG - Ihre Einstellungen gehen hiermit verloren und werden durch die Standarteinstellungen ersetzt.', 'delete' => 'Löschen', 'delete cron' => 'Cronjob löschen', +'delete file' => 'Möchten Sie diese Datei wirklich löschen?', +'delete item' => 'Möchten Sie diesen Eintrag wirklich löschen?', 'delete pc' => 'PC löschen', 'delete share' => 'Freigabe löschen', 'delete user' => 'Benutzer löschen', @@ -1600,7 +1606,6 @@ 'logging' => 'Protokollierung', 'logging server' => 'Protokollierungsserver', 'loginlogout' => 'Login/Logout', -'logs' => 'Protokolldateien', 'loosedirectorychecking' => 'Loose directorychecking', 'low' => 'Niedrig', 'ls_dhcpd' => 'DHCP-Server:', @@ -2136,6 +2141,7 @@ 'restart' => 'Neustart', 'restart ovpn server' => 'OpenVPN-Server neu starten', 'restore' => 'Wiederherstellen', +'restoreaddon' => 'Wiederherstellen (Addon)', 'restore defaults' => 'Voreinstellungen wiederherstellen', 'restore hardware settings' => 'Hardwareeinstellungen wiederherstellen', 'restore settings' => 'Einstellungen wiederherstellen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d86705772..a126b11ef 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -155,6 +155,7 @@ 'add xtaccess' => 'Add External Access', 'add-route' => 'Additional push route', 'added from dhcp lease list' => 'Added from DHCP lease list', +'addonbackup' => 'Backup', 'addons' => 'Addons', 'admin user password has been changed' => 'Admin user password has been changed.', 'admin users' => 'User with superuser rights', @@ -459,6 +460,7 @@ 'backup' => 'Backup', 'backup archive' => 'Backup File (.dat)', 'backup clear archive' => 'Clear Backup File (.gz)', +'backup config' => 'Configuration', 'backup config floppy' => 'Backup Configuration - Floppy Disk', 'backup configuration' => 'Backup Configuration:', 'backup erase key' => 'Erase key', @@ -486,6 +488,8 @@ 'backupaddon' => 'Addon Backup', 'backupprofile' => 'In case reconnection fails, switch to profile', 'backups' => 'backups', +'backups data' => 'IPF-Files', +'backups iso' => 'ISO-Files', 'backupwarning' => 'Import your main backup first and then the backup(s) of the addon configuration(s).<br />Only the backed up addon configuration file(s) will be restored, not the installed addons!<br />Also make sure that the backups keep their original file names.', 'bad characters in' => 'Bad characters in ', 'bad characters in script field' => 'Bad characters in script field', @@ -755,6 +759,8 @@ 'delete pc' => 'Delete workstation', 'delete share' => 'Delete share', 'delete user' => 'Delete user', +'delete file' => 'Do you really want to delete this file?', +'delete item' => 'Do you really want to delete this item?', 'demon login script' => 'Demon login script', 'deprecated fs warn' => 'Deprecated filesystem! Newer kernel drop the support. Backup and reformat!', 'description' => 'Description', @@ -1632,7 +1638,6 @@ 'logging' => 'Logging', 'logging server' => 'Logging Server', 'loginlogout' => 'Login/Logout', -'logs' => 'logs', 'loosedirectorychecking' => 'Loosedirectorychecking', 'low' => 'Low', 'ls_dhcpd' => 'DHCP Server:', @@ -2172,6 +2177,7 @@ 'restart' => 'Restart', 'restart ovpn server' => 'Restart OpenVPN server', 'restore' => 'Restore', +'restoreaddon' => 'Restore (Addon)', 'restore defaults' => 'Restore defaults', 'restore hardware settings' => 'Restore hardware settings', 'restore settings' => 'Reset Settings', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index c9a7496bc..fa346233f 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1149,7 +1149,6 @@ 'logging' => 'Conectando', 'logging server' => 'Servidor de conexión', 'loginlogout' => 'Login/Logout', -'logs' => 'registros', 'loosedirectorychecking' => 'Chequeo de loosedirectory', 'low' => 'Bajo', 'ls_dhcpd' => 'Servidor DHCP:', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 301109477..ea5985315 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1633,7 +1633,6 @@ 'logging' => 'Connexion', 'logging server' => 'Serveur de connexion', 'loginlogout' => 'Connexion/Quitter', -'logs' => 'Journaux', 'loosedirectorychecking' => 'Echec de la vérification du répertoire', 'low' => 'Bas', 'ls_dhcpd' => 'Serveur DHCP :', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index e82ecfd35..711b4bd4a 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1408,7 +1408,6 @@ 'logging' => 'Logging', 'logging server' => 'Logging Server', 'loginlogout' => 'Login/Logout', -'logs' => 'Gestione Log', 'loosedirectorychecking' => 'Loosedirectorychecking', 'low' => 'Basso', 'ls_dhcpd' => 'DHCP Server:', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 55927839e..aea5e81b5 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1390,7 +1390,6 @@ 'logging' => 'Logging', 'logging server' => 'Loggingserver', 'loginlogout' => 'Login/Logout', -'logs' => 'logs', 'loosedirectorychecking' => 'Loosedirectorychecking', 'low' => 'Laag', 'ls_dhcpd' => 'DHCP Server:', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 147db051c..604a834a7 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -1094,7 +1094,6 @@ 'logging' => 'Logowanie', 'logging server' => 'Serwer logowania', 'loginlogout' => 'Zalogowanie/wylogowanie', -'logs' => 'logi', 'loosedirectorychecking' => 'Loosedirectorychecking', 'low' => 'Niski', 'ls_dhcpd' => 'Serwer DHCP:', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 0d986135d..26ad6c338 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -1087,7 +1087,6 @@ 'logging' => 'Logging', 'logging server' => 'Сервер Логов', 'loginlogout' => 'Login/Logout', -'logs' => 'Логи', 'loosedirectorychecking' => 'Loosedirectorychecking', 'low' => 'Low', 'ls_dhcpd' => 'DHCP сервер:', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 36c4782d6..233de0995 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1538,7 +1538,6 @@ 'logging' => 'Günlük', 'logging server' => 'Günlük Sunucusu', 'loginlogout' => 'Giriş/Çıkış', -'logs' => 'Günlükler', 'loosedirectorychecking' => 'Serbest Dizin Denetimi', 'low' => 'Düşük', 'ls_dhcpd' => 'DHCP Sunucusu:', -- 2.18.0

2 12

[PATCH] stripper: Handle capabilities
by Michael Tremer 09 Jul '21

09 Jul '21

During the build process, we set capabilities to elevate privileges of certain progrems (e.g. ping). These have been removed during the build process because of strip. This patch collects any capabilities from all files that are being stripped and restores them after calling strip. Fixes: #12652 Reported-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- src/stripper | 9 +++++++++ 1 file changed, 9 insertions(+) Please re-ship ping and etherwake with this patch. diff --git a/src/stripper b/src/stripper index ac5f58ca5..e51463c69 100755 --- a/src/stripper +++ b/src/stripper @@ -27,6 +27,10 @@ function _strip() { fi done + # Fetch any capabilities + local capabilities="$(getfattr --no-dereference --name="security.capability" \ + --absolute-names --dump "${file}")" + local cmd=( "${strip}" ) case "$(file -bi ${file})" in @@ -40,6 +44,11 @@ function _strip() { echo "Stripping ${file}..." ${cmd[*]} ${file} + + # Restore capabilities + if [ -n "${capabilities}" ]; then + setfattr --no-dereference --restore=<(echo "${capabilities}") + fi } for dir in ${dirs}; do -- 2.20.1

2 1

[PATCH] squid: Update to 4.16
by Matthias Fischer 08 Jul '21

08 Jul '21

For details see: http://www.squid-cache.org/Versions/v4/changesets/ Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/squid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/squid b/lfs/squid index 98034651c..d6570b80d 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 4.15 +VER = 4.16 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a593de9dc888dfeca4f1f7db2cd7d3b9 +$(DL_FILE)_MD5 = d200064f7050969680f628d26b8c704d install : $(TARGET) -- 2.18.0

2 1

[PATCH] poppler: Update to version 21.07.0
by Adolf Belka 08 Jul '21

08 Jul '21

- Update from 21.05.0 to 21.07.0 - Update of rootfile - Changelog is too large to include here. Full details can be found in the ChangeLog file in the source tarball. This is a collection of all the commits made. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/poppler | 4 ++-- lfs/poppler | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler index d80001c39..9746d9412 100644 --- a/config/rootfiles/common/poppler +++ b/config/rootfiles/common/poppler @@ -172,8 +172,8 @@ usr/lib/libpoppler-cpp.so.0.9.0 usr/lib/libpoppler-glib.so.8 usr/lib/libpoppler-glib.so.8.21.0 #usr/lib/libpoppler.so -usr/lib/libpoppler.so.110 -usr/lib/libpoppler.so.110.0.0 +usr/lib/libpoppler.so.111 +usr/lib/libpoppler.so.111.0.0 #usr/lib/pkgconfig/poppler-cpp.pc #usr/lib/pkgconfig/poppler-glib.pc #usr/lib/pkgconfig/poppler.pc diff --git a/lfs/poppler b/lfs/poppler index a63001c46..3589e86b4 100644 --- a/lfs/poppler +++ b/lfs/poppler @@ -24,7 +24,7 @@ include Config -VER = 21.05.0 +VER = 21.07.0 THISAPP = poppler-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 109c337462c2a4ac916226588a2c23f7 +$(DL_FILE)_MD5 = 3c4b500a0af4cf1dc4a1c66fa48b7551 install : $(TARGET) -- 2.32.0

1 0

[PATCH] perl-MIME-Lite: Update to version 3.033
by Adolf Belka 08 Jul '21

08 Jul '21

- Update from 3.030 (Nov 2013) to 3.033 (Jun 2021) - Update of rootfile not required - Changelog Version 3.033 No changes since previous version, just made non-trial. Version 3.032 Fix an error in printing to Net::SMTP (thanks, Peter Heirich) Add "use warnings" and require v5.6 Version 3.031 Add an SSL option to connect to the SMTP relay via SSL on port 465. (thanks, Max Maischein) Document some tips on using non-ASCII content with MIME::Lite (thanks, traveljury.com and Tom Hukins) Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/perl-MIME-Lite | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/perl-MIME-Lite b/lfs/perl-MIME-Lite index 186a95c4b..7fd9903e5 100644 --- a/lfs/perl-MIME-Lite +++ b/lfs/perl-MIME-Lite @@ -24,7 +24,7 @@ include Config -VER = 3.030 +VER = 3.033 THISAPP = MIME-Lite-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5a6d90329e049eee77248d667343acc7 +$(DL_FILE)_MD5 = 42f056ef1338f129b1187a05e7b44369 install : $(TARGET) -- 2.32.0

1 0

[PATCH] pcre: Update to version 8.45
by Adolf Belka 08 Jul '21

08 Jul '21

- Update from 8.44 to 8.45 - Updated rootfile - Checked the dependencies of the old lib versions using find-dependencies nothing flagged - Changelog Version 8.45 15-June-2021 This is the final release of PCRE1. A few minor tidies are included. 1. CMakeLists.txt has two user-supplied patches applied, one to allow for the setting of MODULE_PATH, and the other to support the generation of pcre-config file and libpcre*.pc files. 2. There was a memory leak if a compile error occurred when there were more than 20 named groups (Bugzilla #2613). 3. Fixed some typos in code and documentation. 4. Fixed a small (*MARK) bug in the interpreter (Bugzilla #2771). Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/pcre | 138 +++++++++++++++++------------------ lfs/pcre | 4 +- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre index bd2e665fd..ce90d1d16 100644 --- a/config/rootfiles/common/pcre +++ b/config/rootfiles/common/pcre @@ -10,15 +10,15 @@ usr/bin/pcregrep #usr/lib/libpcre.la usr/lib/libpcre.so usr/lib/libpcre.so.1 -usr/lib/libpcre.so.1.2.12 +usr/lib/libpcre.so.1.2.13 #usr/lib/libpcre16.la usr/lib/libpcre16.so usr/lib/libpcre16.so.0 -usr/lib/libpcre16.so.0.2.12 +usr/lib/libpcre16.so.0.2.13 #usr/lib/libpcre32.la usr/lib/libpcre32.so usr/lib/libpcre32.so.0 -usr/lib/libpcre32.so.0.0.12 +usr/lib/libpcre32.so.0.0.13 #usr/lib/libpcrecpp.la usr/lib/libpcrecpp.so usr/lib/libpcrecpp.so.0 @@ -32,72 +32,72 @@ usr/lib/libpcreposix.so.0.0.7 #usr/lib/pkgconfig/libpcre32.pc #usr/lib/pkgconfig/libpcrecpp.pc #usr/lib/pkgconfig/libpcreposix.pc -#usr/share/doc/pcre-pcre-8.44 -#usr/share/doc/pcre-pcre-8.44/AUTHORS -#usr/share/doc/pcre-pcre-8.44/COPYING -#usr/share/doc/pcre-pcre-8.44/ChangeLog -#usr/share/doc/pcre-pcre-8.44/LICENCE -#usr/share/doc/pcre-pcre-8.44/NEWS -#usr/share/doc/pcre-pcre-8.44/README -#usr/share/doc/pcre-pcre-8.44/html -#usr/share/doc/pcre-pcre-8.44/html/NON-AUTOTOOLS-BUILD.txt -#usr/share/doc/pcre-pcre-8.44/html/README.txt -#usr/share/doc/pcre-pcre-8.44/html/index.html -#usr/share/doc/pcre-pcre-8.44/html/pcre-config.html -#usr/share/doc/pcre-pcre-8.44/html/pcre.html -#usr/share/doc/pcre-pcre-8.44/html/pcre16.html -#usr/share/doc/pcre-pcre-8.44/html/pcre32.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_assign_jit_stack.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_compile.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_compile2.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_config.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_copy_named_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_copy_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_dfa_exec.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_exec.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_free_study.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_free_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_free_substring_list.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_fullinfo.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_named_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_stringnumber.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_stringtable_entries.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_substring_list.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_jit_exec.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_jit_stack_alloc.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_jit_stack_free.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_maketables.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_pattern_to_host_byte_order.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_refcount.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_study.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_utf16_to_host_byte_order.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_utf32_to_host_byte_order.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_version.html -#usr/share/doc/pcre-pcre-8.44/html/pcreapi.html -#usr/share/doc/pcre-pcre-8.44/html/pcrebuild.html -#usr/share/doc/pcre-pcre-8.44/html/pcrecallout.html -#usr/share/doc/pcre-pcre-8.44/html/pcrecompat.html -#usr/share/doc/pcre-pcre-8.44/html/pcrecpp.html -#usr/share/doc/pcre-pcre-8.44/html/pcredemo.html -#usr/share/doc/pcre-pcre-8.44/html/pcregrep.html -#usr/share/doc/pcre-pcre-8.44/html/pcrejit.html -#usr/share/doc/pcre-pcre-8.44/html/pcrelimits.html -#usr/share/doc/pcre-pcre-8.44/html/pcrematching.html -#usr/share/doc/pcre-pcre-8.44/html/pcrepartial.html -#usr/share/doc/pcre-pcre-8.44/html/pcrepattern.html -#usr/share/doc/pcre-pcre-8.44/html/pcreperform.html -#usr/share/doc/pcre-pcre-8.44/html/pcreposix.html -#usr/share/doc/pcre-pcre-8.44/html/pcreprecompile.html -#usr/share/doc/pcre-pcre-8.44/html/pcresample.html -#usr/share/doc/pcre-pcre-8.44/html/pcrestack.html -#usr/share/doc/pcre-pcre-8.44/html/pcresyntax.html -#usr/share/doc/pcre-pcre-8.44/html/pcretest.html -#usr/share/doc/pcre-pcre-8.44/html/pcreunicode.html -#usr/share/doc/pcre-pcre-8.44/pcre-config.txt -#usr/share/doc/pcre-pcre-8.44/pcre.txt -#usr/share/doc/pcre-pcre-8.44/pcregrep.txt -#usr/share/doc/pcre-pcre-8.44/pcretest.txt +#usr/share/doc/pcre-pcre-8.45 +#usr/share/doc/pcre-pcre-8.45/AUTHORS +#usr/share/doc/pcre-pcre-8.45/COPYING +#usr/share/doc/pcre-pcre-8.45/ChangeLog +#usr/share/doc/pcre-pcre-8.45/LICENCE +#usr/share/doc/pcre-pcre-8.45/NEWS +#usr/share/doc/pcre-pcre-8.45/README +#usr/share/doc/pcre-pcre-8.45/html +#usr/share/doc/pcre-pcre-8.45/html/NON-AUTOTOOLS-BUILD.txt +#usr/share/doc/pcre-pcre-8.45/html/README.txt +#usr/share/doc/pcre-pcre-8.45/html/index.html +#usr/share/doc/pcre-pcre-8.45/html/pcre-config.html +#usr/share/doc/pcre-pcre-8.45/html/pcre.html +#usr/share/doc/pcre-pcre-8.45/html/pcre16.html +#usr/share/doc/pcre-pcre-8.45/html/pcre32.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_assign_jit_stack.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_compile.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_compile2.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_config.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_copy_named_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_copy_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_dfa_exec.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_exec.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_free_study.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_free_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_free_substring_list.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_fullinfo.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_named_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_stringnumber.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_stringtable_entries.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_substring_list.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_jit_exec.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_jit_stack_alloc.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_jit_stack_free.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_maketables.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_pattern_to_host_byte_order.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_refcount.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_study.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_utf16_to_host_byte_order.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_utf32_to_host_byte_order.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_version.html +#usr/share/doc/pcre-pcre-8.45/html/pcreapi.html +#usr/share/doc/pcre-pcre-8.45/html/pcrebuild.html +#usr/share/doc/pcre-pcre-8.45/html/pcrecallout.html +#usr/share/doc/pcre-pcre-8.45/html/pcrecompat.html +#usr/share/doc/pcre-pcre-8.45/html/pcrecpp.html +#usr/share/doc/pcre-pcre-8.45/html/pcredemo.html +#usr/share/doc/pcre-pcre-8.45/html/pcregrep.html +#usr/share/doc/pcre-pcre-8.45/html/pcrejit.html +#usr/share/doc/pcre-pcre-8.45/html/pcrelimits.html +#usr/share/doc/pcre-pcre-8.45/html/pcrematching.html +#usr/share/doc/pcre-pcre-8.45/html/pcrepartial.html +#usr/share/doc/pcre-pcre-8.45/html/pcrepattern.html +#usr/share/doc/pcre-pcre-8.45/html/pcreperform.html +#usr/share/doc/pcre-pcre-8.45/html/pcreposix.html +#usr/share/doc/pcre-pcre-8.45/html/pcreprecompile.html +#usr/share/doc/pcre-pcre-8.45/html/pcresample.html +#usr/share/doc/pcre-pcre-8.45/html/pcrestack.html +#usr/share/doc/pcre-pcre-8.45/html/pcresyntax.html +#usr/share/doc/pcre-pcre-8.45/html/pcretest.html +#usr/share/doc/pcre-pcre-8.45/html/pcreunicode.html +#usr/share/doc/pcre-pcre-8.45/pcre-config.txt +#usr/share/doc/pcre-pcre-8.45/pcre.txt +#usr/share/doc/pcre-pcre-8.45/pcregrep.txt +#usr/share/doc/pcre-pcre-8.45/pcretest.txt #usr/share/man/man1/pcre-config.1 #usr/share/man/man1/pcregrep.1 #usr/share/man/man1/pcretest.1 diff --git a/lfs/pcre b/lfs/pcre index e73f3fa08..981a29323 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -24,7 +24,7 @@ include Config -VER = 8.44 +VER = 8.45 THISAPP = pcre-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -58,7 +58,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = cf7326204cc46c755b5b2608033d9d24 +$(DL_FILE)_MD5 = 4452288e6a0eefb2ab11d36010a1eebb install : $(TARGET) -- 2.32.0

1 0

[PATCH] iproute2: Update to version 5.13.0
by Adolf Belka 08 Jul '21

08 Jul '21

- Update from 5.12.0 to 5.13.0 - Update of rootfile not required - Changelog is not available in source tarball and not on source website Below info obtained from the commits from the git repository devlink: Fix printf() type mismatches on 32-bit architectures Ben Hutchings utils: Fix BIT() to support up to 64 bits on all architectures Ben Hutchings uapi: update headers to 5.13 Stephen Hemminger devlink: Fix link errors on some systems Roi Dayan tc: pedit: add decrement operation Asbjørn Sloth Tønnesen tc: pedit: parse_cmd: add flags argument Asbjørn Sloth Tønnesen iplink: support for WWAN devices Sergey Ryazanov iplink: add support for parent device Sergey Ryazanov Import wwan.h uapi file David Ahern man: fix syntax for ip link property Stephen Hemminger seg6: add support for SRv6 End.DT46 Behavior Paolo Lungaroni Update kernel headers David Ahern utils: bump max args number to 512 for batch files Guillaume Nault uapi: update kernel headers to 5.13-rc6 Stephen Hemminger Merge branch 'devlink-rate-support' into next David Ahern devlink: Add ISO/IEC switch Dmytro Linkin devlink: Add port func rate support Dmytro Linkin devlink: Add helper function to validate object handler Dmytro Linkin Update kernel headers David Ahern devlink: Add optional controller user input Parav Pandit police: Add support for json output Roi Dayan tc: fq: add horizon attributes Eric Dumazet configure: convert LIBBPF environment variables to command-line options Hangbin Liu configure: add options ability Hangbin Liu ss: update ss man page Roman Mashak tc: f_flower: Add missing ct_state flags to usage description Ariel Levkovich tc: f_flower: Add option to match on related ct state Ariel Levkovich libgenl: make genl_add_mcast_grp set errno on error Florian Westphal lib/fs: fix issue when {name,open}_to_handle_at() is not implemented Heiko Thiery config.mk: Rerun configure when it is newer than config.mk David Ahern ip: dynamically size columns when printing stats Jakub Kicinski seg6: add counters support for SRv6 Behaviors Paolo Lungaroni tc: htb: improve burst error messages Andrea Claudi tipc: bail out if key is abnormally long Andrea Claudi tipc: bail out if algname is abnormally long Andrea Claudi tipc: call a sub-routine in separate socket Hoang Le tc-cake: update docs to include LE diffserv Tyson Moore dcb: fix memory leak Andrea Claudi dcb: fix return value on dcb_cmd_app_show Andrea Claudi lib: bpf_legacy: avoid to pass invalid argument to close() Andrea Claudi tc: q_ets: drop dead code from argument parsing Andrea Claudi ip: align the name of the 'nohandler' stat Jakub Kicinski Update kernel headers David Ahern Merge branch 'rdma-copy-on-fork' into next David Ahern rdma: Add copy-on-fork to get sys command Gal Pressman rdma: update uapi headers Gal Pressman mptcp: make sure flag signal is set when add addr with port Jianguo Wu Merge branch 'main' into next David Ahern ip: Add nodst option to macvlan type source Jethro Beekman Merge branch 'rdma-resource-tracking' into next David Ahern rdma: Add SRQ resource tracking information Neta Ostrovsky rdma: Add context resource tracking information Neta Ostrovsky rdma: Update uapi headers Neta Ostrovsky Update kernel headers David Ahern Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/iproute2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/iproute2 b/lfs/iproute2 index 4a1ee3865..ac5df26e1 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -24,7 +24,7 @@ include Config -VER = 5.12.0 +VER = 5.13.0 THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bbebacdabd4628ff86453ef4771a242a +$(DL_FILE)_MD5 = 15fc3786303a173a14e180afe4cd2ecd install : $(TARGET) -- 2.32.0

1 0

[PATCH 1/3] make.sh: Build libstatgrab before collectd
by Michael Tremer 08 Jul '21

08 Jul '21

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 3e418976b..7bdeeaf62 100755 --- a/make.sh +++ b/make.sh @@ -1437,6 +1437,7 @@ buildipfire() { lfsmake2 br2684ctl lfsmake2 pcmciautils lfsmake2 lm_sensors + lfsmake2 libstatgrab lfsmake2 liboping lfsmake2 collectd lfsmake2 elinks @@ -1543,7 +1544,6 @@ buildipfire() { lfsmake2 telnet lfsmake2 xinetd lfsmake2 stress - lfsmake2 libstatgrab lfsmake2 sarg lfsmake2 nginx lfsmake2 sysbench -- 2.20.1

1 2

[PATCH] alsa: Update to version 1.2.5.1
by Adolf Belka 07 Jul '21

07 Jul '21

- Not really sure if a sound support capability is really appropriate for a firewall. I wouldn't have it. However if it stays as an add-on then it should be up to date. - Update alsa-lib from 1.0.27.1 (2013) to 1.2.5.1 (2021) - Update alsa-utils from 1.0.27.1 (2013) to 1.2.5.1 (2021) - Update alsa-firmware from 1.0.27 (2013) to 1.2.4 (2020) - Update rootfile - Changelog is too large to include here. Changes back to 2019-11-20 can be found at https://www.alsa-project.org/wiki/Main_Page Earlier changes have to be found from the git commits at https://github.com/alsa-project/alsa-lib and https://github.com/alsa-project/alsa-utils There is no changelog or git commits that I have been able to find for alsa-firmware Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/alsa | 118 ++++++++++++++------------------- lfs/alsa | 14 ++-- 2 files changed, 58 insertions(+), 74 deletions(-) diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa index 1c0d744ab..a704727ec 100644 --- a/config/rootfiles/packages/alsa +++ b/config/rootfiles/packages/alsa @@ -1,6 +1,6 @@ +etc/rc.d/init.d/alsa lib/firmware/aica_firmware.bin #lib/firmware/asihpi -lib/firmware/asihpi/dsp2400.bin lib/firmware/asihpi/dsp5000.bin lib/firmware/asihpi/dsp6200.bin lib/firmware/asihpi/dsp6205.bin @@ -8,8 +8,15 @@ lib/firmware/asihpi/dsp6400.bin lib/firmware/asihpi/dsp6600.bin lib/firmware/asihpi/dsp8700.bin lib/firmware/asihpi/dsp8900.bin -lib/firmware/ctefx.bin -lib/firmware/ctspeq.bin +#lib/firmware/cs46xx +lib/firmware/cs46xx/ba1 +lib/firmware/cs46xx/cwc4630 +lib/firmware/cs46xx/cwcasync +lib/firmware/cs46xx/cwcbinhack +lib/firmware/cs46xx/cwcdma +lib/firmware/cs46xx/cwcsnoop +lib/firmware/ctefx-desktop.bin +lib/firmware/ctefx-r3di.bin lib/firmware/digiface_firmware.bin lib/firmware/digiface_firmware_rev11.bin #lib/firmware/ea @@ -98,9 +105,12 @@ lib/firmware/vx/x1_1_vp4.xlx lib/firmware/vx/x1_1_vx2.xlx lib/firmware/vx/x1_1_vxp.xlx lib/firmware/vx/x1_2_v22.xlx +#lib/udev/rules.d/90-alsa-restore.rules usr/bin/aconnect +usr/bin/alsabat usr/bin/alsaloop usr/bin/alsamixer +usr/bin/alsatplg usr/bin/alsaucm usr/bin/amidi usr/bin/amixer @@ -111,19 +121,19 @@ usr/bin/arecordmidi usr/bin/aseqdump usr/bin/aseqnet usr/bin/aserver +usr/bin/axfer usr/bin/iecset usr/bin/speaker-test #usr/include/alsa -#usr/include/alsa/alisp.h #usr/include/alsa/asoundef.h #usr/include/alsa/asoundlib.h #usr/include/alsa/conf.h #usr/include/alsa/control.h #usr/include/alsa/control_external.h +#usr/include/alsa/control_plugin.h #usr/include/alsa/error.h #usr/include/alsa/global.h #usr/include/alsa/hwdep.h -#usr/include/alsa/iatomic.h #usr/include/alsa/input.h #usr/include/alsa/mixer.h #usr/include/alsa/mixer_abst.h @@ -141,31 +151,39 @@ usr/bin/speaker-test #usr/include/alsa/seq_midi_event.h #usr/include/alsa/seqmid.h #usr/include/alsa/sound +#usr/include/alsa/sound/asoc.h #usr/include/alsa/sound/asound_fm.h #usr/include/alsa/sound/emu10k1.h #usr/include/alsa/sound/hdsp.h usr/include/alsa/sound/hdspm.h #usr/include/alsa/sound/sb16_csp.h #usr/include/alsa/sound/sscape_ioctl.h +#usr/include/alsa/sound/tlv.h #usr/include/alsa/sound/type_compat.h +#usr/include/alsa/sound/uapi +#usr/include/alsa/sound/uapi/asoc.h +#usr/include/alsa/sound/uapi/asound_fm.h +#usr/include/alsa/sound/uapi/emu10k1.h +#usr/include/alsa/sound/uapi/hdsp.h +#usr/include/alsa/sound/uapi/hdspm.h +#usr/include/alsa/sound/uapi/sb16_csp.h +#usr/include/alsa/sound/uapi/sscape_ioctl.h +#usr/include/alsa/sound/uapi/tlv.h #usr/include/alsa/timer.h +#usr/include/alsa/topology.h #usr/include/alsa/use-case.h #usr/include/alsa/version.h +#usr/include/asoundlib.h #usr/include/sys/asoundlib.h -#usr/lib/alsa-lib -#usr/lib/alsa-lib/smixer -#usr/lib/alsa-lib/smixer/smixer-ac97.la -usr/lib/alsa-lib/smixer/smixer-ac97.so -#usr/lib/alsa-lib/smixer/smixer-hda.la -usr/lib/alsa-lib/smixer/smixer-hda.so -#usr/lib/alsa-lib/smixer/smixer-python.la -usr/lib/alsa-lib/smixer/smixer-python.so -#usr/lib/alsa-lib/smixer/smixer-sbase.la -usr/lib/alsa-lib/smixer/smixer-sbase.so #usr/lib/libasound.la -usr/lib/libasound.so +#usr/lib/libasound.so usr/lib/libasound.so.2 usr/lib/libasound.so.2.0.0 +#usr/lib/libatopology.la +#usr/lib/libatopology.so +usr/lib/libatopology.so.2 +usr/lib/libatopology.so.2.0.0 +#usr/lib/pkgconfig/alsa-topology.pc #usr/lib/pkgconfig/alsa.pc usr/local/share/alsa #usr/local/share/alsa/firmware @@ -242,13 +260,13 @@ usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin #usr/local/share/alsa/firmware/vxloader/x1_1_vx2.rbt #usr/local/share/alsa/firmware/vxloader/x1_1_vxp.rbt #usr/local/share/alsa/firmware/vxloader/x1_2_v22.rbt +usr/sbin/alsa-info.sh +usr/sbin/alsabat-test.sh usr/sbin/alsaconf usr/sbin/alsactl #usr/share/aclocal/alsa.m4 usr/share/alsa #usr/share/alsa/alsa.conf -#usr/share/alsa/alsa.conf.d -usr/share/alsa/alsa.conf.d/README #usr/share/alsa/cards #usr/share/alsa/cards/AACI.conf #usr/share/alsa/cards/ATIIXP-MODEM.conf @@ -279,11 +297,13 @@ usr/share/alsa/alsa.conf.d/README #usr/share/alsa/cards/FireWave.conf #usr/share/alsa/cards/GUS.conf #usr/share/alsa/cards/HDA-Intel.conf +#usr/share/alsa/cards/HdmiLpeAudio.conf #usr/share/alsa/cards/ICE1712.conf #usr/share/alsa/cards/ICE1724.conf #usr/share/alsa/cards/ICH-MODEM.conf #usr/share/alsa/cards/ICH.conf #usr/share/alsa/cards/ICH4.conf +#usr/share/alsa/cards/Loopback.conf #usr/share/alsa/cards/Maestro3.conf #usr/share/alsa/cards/NFORCE.conf #usr/share/alsa/cards/PC-Speaker.conf @@ -293,10 +313,7 @@ usr/share/alsa/alsa.conf.d/README #usr/share/alsa/cards/RME9636.conf #usr/share/alsa/cards/RME9652.conf #usr/share/alsa/cards/SB-XFi.conf -#usr/share/alsa/cards/SI7018 #usr/share/alsa/cards/SI7018.conf -#usr/share/alsa/cards/SI7018/sndoc-mixer.alisp -#usr/share/alsa/cards/SI7018/sndop-mixer.alisp #usr/share/alsa/cards/TRID4DWAVENX.conf #usr/share/alsa/cards/USB-Audio.conf #usr/share/alsa/cards/VIA686A.conf @@ -307,10 +324,14 @@ usr/share/alsa/alsa.conf.d/README #usr/share/alsa/cards/VXPocket.conf #usr/share/alsa/cards/VXPocket440.conf #usr/share/alsa/cards/YMF744.conf -#usr/share/alsa/cards/aliases.alisp #usr/share/alsa/cards/aliases.conf +#usr/share/alsa/cards/pistachio-card.conf +#usr/share/alsa/cards/vc4-hdmi.conf +#usr/share/alsa/ctl +#usr/share/alsa/ctl/default.conf #usr/share/alsa/init #usr/share/alsa/init/00main +#usr/share/alsa/init/ca0106 #usr/share/alsa/init/default #usr/share/alsa/init/hda #usr/share/alsa/init/help @@ -328,52 +349,25 @@ usr/share/alsa/alsa.conf.d/README #usr/share/alsa/pcm/modem.conf #usr/share/alsa/pcm/rear.conf #usr/share/alsa/pcm/side.conf +#usr/share/alsa/pcm/surround21.conf #usr/share/alsa/pcm/surround40.conf #usr/share/alsa/pcm/surround41.conf #usr/share/alsa/pcm/surround50.conf #usr/share/alsa/pcm/surround51.conf #usr/share/alsa/pcm/surround71.conf -#usr/share/alsa/smixer.conf -#usr/share/alsa/sndo-mixer.alisp #usr/share/alsa/speaker-test #usr/share/alsa/speaker-test/sample_map.csv -#usr/share/alsa/ucm -usr/share/alsa/ucm/DAISY-I2S -usr/share/alsa/ucm/DAISY-I2S/DAISY-I2S.conf -usr/share/alsa/ucm/DAISY-I2S/HiFi.conf -#usr/share/alsa/ucm/PandaBoard -usr/share/alsa/ucm/PandaBoard/FMAnalog -usr/share/alsa/ucm/PandaBoard/PandaBoard.conf -usr/share/alsa/ucm/PandaBoard/hifi -usr/share/alsa/ucm/PandaBoard/hifiLP -usr/share/alsa/ucm/PandaBoard/record -usr/share/alsa/ucm/PandaBoard/voice -usr/share/alsa/ucm/PandaBoard/voiceCall -#usr/share/alsa/ucm/PandaBoardES -usr/share/alsa/ucm/PandaBoardES/FMAnalog -usr/share/alsa/ucm/PandaBoardES/PandaBoardES.conf -usr/share/alsa/ucm/PandaBoardES/hifi -usr/share/alsa/ucm/PandaBoardES/hifiLP -usr/share/alsa/ucm/PandaBoardES/record -usr/share/alsa/ucm/PandaBoardES/voice -usr/share/alsa/ucm/PandaBoardES/voiceCall -#usr/share/alsa/ucm/SDP4430 -usr/share/alsa/ucm/SDP4430/FMAnalog -usr/share/alsa/ucm/SDP4430/SDP4430.conf -usr/share/alsa/ucm/SDP4430/hifi -usr/share/alsa/ucm/SDP4430/hifiLP -usr/share/alsa/ucm/SDP4430/record -usr/share/alsa/ucm/SDP4430/voice -usr/share/alsa/ucm/SDP4430/voiceCall -#usr/share/alsa/ucm/tegraalc5632 -usr/share/alsa/ucm/tegraalc5632/tegraalc5632.conf #usr/share/locale/de/LC_MESSAGES/alsa-utils.mo +#usr/share/locale/eu/LC_MESSAGES/alsa-utils.mo #usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo #usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo #usr/share/locale/ja/LC_MESSAGES/alsaconf.mo #usr/share/locale/ru/LC_MESSAGES/alsaconf.mo +#usr/share/locale/sk/LC_MESSAGES/alsa-utils.mo #usr/share/man/fr/man8/alsaconf.8 #usr/share/man/man1/aconnect.1 +#usr/share/man/man1/alsa-info.sh.1 +#usr/share/man/man1/alsabat.1 #usr/share/man/man1/alsactl.1 #usr/share/man/man1/alsaloop.1 #usr/share/man/man1/alsamixer.1 @@ -385,6 +379,9 @@ usr/share/alsa/ucm/tegraalc5632/tegraalc5632.conf #usr/share/man/man1/arecordmidi.1 #usr/share/man/man1/aseqdump.1 #usr/share/man/man1/aseqnet.1 +#usr/share/man/man1/axfer-list.1 +#usr/share/man/man1/axfer-transfer.1 +#usr/share/man/man1/axfer.1 #usr/share/man/man1/iecset.1 #usr/share/man/man1/speaker-test.1 #usr/share/man/man8/alsaconf.8 @@ -400,16 +397,3 @@ usr/share/sounds/alsa #usr/share/sounds/alsa/Side_Left.wav #usr/share/sounds/alsa/Side_Right.wav var/lib/alsa -etc/rc.d/init.d/alsa -lib/firmware/ess/maestro3_assp_kernel.fw -lib/firmware/ess/maestro3_assp_minisrc.fw -lib/firmware/korg/k1212.dsp -lib/firmware/sb16/alaw_main.csp -lib/firmware/sb16/ima_adpcm_capture.csp -lib/firmware/sb16/ima_adpcm_init.csp -lib/firmware/sb16/ima_adpcm_playback.csp -lib/firmware/sb16/mulaw_main.csp -lib/firmware/yamaha/ds1_ctrl.fw -lib/firmware/yamaha/ds1_dsp.fw -lib/firmware/yamaha/ds1e_ctrl.fw -lib/firmware/yamaha/yss225_registers.bin diff --git a/lfs/alsa b/lfs/alsa index 23ad58cf6..264849e11 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -25,9 +25,9 @@ include Config -VER = 1.0.27.1 -UVER = 1.0.27.1 -FVER = 1.0.27 +VER = 1.2.5.1 +UVER = 1.2.5.1 +FVER = 1.2.4 VERSUFIX = ipfire$(KCFG) @@ -36,7 +36,7 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) PROG = alsa -PAK_VER = 12 +PAK_VER = 13 DEPS = @@ -52,9 +52,9 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) alsa-utils-$(UVER).tar.bz2 = $(DL_FROM)/alsa-utils-$(UVER).tar.bz2 alsa-firmware-$(FVER).tar.bz2 = $(DL_FROM)/alsa-firmware-$(FVER).tar.bz2 -$(DL_FILE)_MD5 = 17102aaab10e9d4b19f6b02937bab015 -alsa-utils-$(UVER).tar.bz2_MD5 = 3d81357b997744a139881ef72bc6921a -alsa-firmware-$(FVER).tar.bz2_MD5 = b373b350d5151dd7d64db2fc12936b04 +$(DL_FILE)_MD5 = c8335793e7828803311edc48fb71662e +alsa-utils-$(UVER).tar.bz2_MD5 = 8f142bebff84ff05438b46a0e896f53a +alsa-firmware-$(FVER).tar.bz2_MD5 = ee6c1d24a1a4ac1d86992b408ed710a2 install : $(TARGET) -- 2.32.0

2 4

[PATCH] dnsdist: Fix FTBFS with GCC 11
by Michael Tremer 07 Jul '21

07 Jul '21

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- lfs/dnsdist | 5 ++--- .../dnsdist-1.6.0-missing-mutex-header.patch | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 src/patches/dnsdist-1.6.0-missing-mutex-header.patch diff --git a/lfs/dnsdist b/lfs/dnsdist index 5e110c5c9..96e775a37 100644 --- a/lfs/dnsdist +++ b/lfs/dnsdist @@ -31,14 +31,12 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -#SUP_ARCH = x86_64 -SUP_ARCH = none PROG = dnsdist PAK_VER = 9 DEPS = -MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 2048))) +MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 2048 ))) ############################################################################### # Top-level Rules @@ -81,6 +79,7 @@ $(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 -Np2 < $(DIR_SRC)/src/patches/dnsdist-1.6.0-missing-mutex-header.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/src/patches/dnsdist-1.6.0-missing-mutex-header.patch b/src/patches/dnsdist-1.6.0-missing-mutex-header.patch new file mode 100644 index 000000000..8d9c97723 --- /dev/null +++ b/src/patches/dnsdist-1.6.0-missing-mutex-header.patch @@ -0,0 +1,22 @@ +From 65bb0ab32a449d8fb8cf9a4802d16ba4912d9fc4 Mon Sep 17 00:00:00 2001 +From: Remi Gacogne <remi.gacogne(a)powerdns.com> +Date: Tue, 25 May 2021 10:09:43 +0200 +Subject: [PATCH] dnsdist-1.6.x: Backport a missing mutex header + +--- + pdns/lock.hh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pdns/lock.hh b/pdns/lock.hh +index 09299d7979d..0e88118c564 100644 +--- a/pdns/lock.hh ++++ b/pdns/lock.hh +@@ -20,6 +20,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #pragma once ++ ++#include <mutex> + #include <shared_mutex> + + class ReadWriteLock -- 2.20.1

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development July 2021