IPFire-SCM February 2020

ipfire-scm@lists.ipfire.org

1 participants
46 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 900652ec6ce9d8d2e58225fa8abbfddbfdcbc05f
by Arne Fitzenreiter 15 Feb '20

15 Feb '20

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 900652ec6ce9d8d2e58225fa8abbfddbfdcbc05f (commit) via 040160c7ce19dcc34d97a74d371e9dbd3f0983e5 (commit) via f48643e5b3a86c25a7387cf6c14e2807fdd8a482 (commit) via 36e2e99285e86e46df33933a2783911118a504ce (commit) via 152378c67419a1cbce57302490cf0c98263fbdf2 (commit) via f61be862c6404df0692341d446ba031af3f18e54 (commit) via 131f163ce8b12f2b9aefde91d203441257e2642a (commit) via e63fc18d07266f87bfa606b7ae47ed1a6a28f051 (commit) via e6f4991be209040f436d9be23b414a6dda1e7fa5 (commit) via d8f7b45f3501edbac6101f79df5f80266b503cb5 (commit) via b6ab15eaa2a899944c7edca99769fa4469f215d3 (commit) via 8877c587cea024210a24c8212221d72209f9f2f0 (commit) from 8d6012f0f54455f0b693f9d8f711ddc731e9051c (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 900652ec6ce9d8d2e58225fa8abbfddbfdcbc05f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 15 11:17:27 2020 +0000 core142: add pakfire changes to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 040160c7ce19dcc34d97a74d371e9dbd3f0983e5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 11 14:28:53 2020 +0000 make.sh: Configure Pakfire to load packages from the correct tree This will configure Pakfire that people who install a nightly build will also get the packages for this build, etc. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f48643e5b3a86c25a7387cf6c14e2807fdd8a482 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 11 14:28:52 2020 +0000 make.sh: Cleanup code that builds ${SYSTEM_RELEASE} Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 36e2e99285e86e46df33933a2783911118a504ce Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 11 14:28:51 2020 +0000 make.sh: Tidy up Git commands No functional changes. Just making them shorter. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 152378c67419a1cbce57302490cf0c98263fbdf2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 11 14:28:50 2020 +0000 pakfire: Add version suffix when in a certain tree Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f61be862c6404df0692341d446ba031af3f18e54 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 11 14:28:49 2020 +0000 pakfire.cgi: Add UI to select repository Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 131f163ce8b12f2b9aefde91d203441257e2642a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 11 14:28:48 2020 +0000 pakfire.cgi: Rename %pakfiresettings to %cgiparams Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e63fc18d07266f87bfa606b7ae47ed1a6a28f051 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 11 14:28:47 2020 +0000 pakfire.cgi: Remove some old settings These can no longer be modified in the GUI and are used nowhere. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e6f4991be209040f436d9be23b414a6dda1e7fa5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 11 14:28:46 2020 +0000 pakfire: Automatically compose $version The tree in which pakfire is looking for packages and Core Updates has been hardcoded into /opt/pakfire/etc/pakfire.conf. This patch adds a new function which reads the system release from /etc/system-release. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d8f7b45f3501edbac6101f79df5f80266b503cb5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 11 16:27:49 2020 +0000 dnsdist: Update to 1.4.0 This patch updates dnsdist to the latest release. Additionally it includes /etc/sysconfig/dnsdist in the backup and enables DNS-over-TLS. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b6ab15eaa2a899944c7edca99769fa4469f215d3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 13 15:20:55 2020 +0000 haproxy: Update to 2.1.3 This updates haproxy to the latest version. In addition, support for Lua scripts is compiled in. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 8877c587cea024210a24c8212221d72209f9f2f0 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Feb 14 13:10:11 2020 +0100 suricata: Update to 5.0.2 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/includes/dnsdist | 1 + config/rootfiles/core/142/filelists/files | 3 + doc/language_issues.de | 5 ++ doc/language_issues.en | 5 ++ doc/language_issues.es | 5 ++ doc/language_issues.fr | 5 ++ doc/language_issues.it | 5 ++ doc/language_issues.nl | 5 ++ doc/language_issues.pl | 5 ++ doc/language_issues.ru | 5 ++ doc/language_issues.tr | 5 ++ doc/language_missings | 40 ++++++++++++ html/cgi-bin/pakfire.cgi | 103 +++++++++++++++++++----------- langs/en/cgi-bin/en.pl | 5 ++ lfs/configroot | 1 + lfs/dnsdist | 7 +- lfs/haproxy | 10 +-- lfs/suricata | 4 +- make.sh | 50 ++++++++++----- src/pakfire/lib/functions.pl | 56 ++++++++++++++++ src/pakfire/pakfire.conf | 2 - 21 files changed, 264 insertions(+), 63 deletions(-) Difference in files: diff --git a/config/backup/includes/dnsdist b/config/backup/includes/dnsdist index 8d9b82584..a88f27202 100644 --- a/config/backup/includes/dnsdist +++ b/config/backup/includes/dnsdist @@ -1 +1,2 @@ /etc/dnsdist.conf +/etc/sysconfig/dnsdist diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files index 868de3215..63da6beeb 100644 --- a/config/rootfiles/core/142/filelists/files +++ b/config/rootfiles/core/142/filelists/files @@ -3,4 +3,7 @@ etc/issue srv/web/ipfire/cgi-bin/credits.cgi var/ipfire/langs etc/suricata/suricata.yaml +opt/pakfire/etc/pakfire.conf +opt/pakfire/lib/functions.pl +srv/web/ipfire/cgi-bin/pakfire.cgi var/ipfire/suricata/ruleset-sources diff --git a/doc/language_issues.de b/doc/language_issues.de index 89a703fcb..361133708 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -829,6 +829,11 @@ WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: itlb multihit = iTLB MultiHit WARNING: untranslated string: not validating = Not validating +WARNING: untranslated string: pakfire invalid tree = Invalid repository selected +WARNING: untranslated string: pakfire tree = Repository +WARNING: untranslated string: pakfire tree stable = Stable +WARNING: untranslated string: pakfire tree testing = Testing +WARNING: untranslated string: pakfire tree unstable = Unstable WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string diff --git a/doc/language_issues.en b/doc/language_issues.en index 10c2f87ce..2fd69f430 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1440,12 +1440,17 @@ WARNING: untranslated string: pakfire core update level = Core-Update-Level WARNING: untranslated string: pakfire install description = Please choose one or more items from the list below and <br /> click the plus to install. WARNING: untranslated string: pakfire install package = You want to install the following packages: WARNING: untranslated string: pakfire installed addons = Installed Addons: +WARNING: untranslated string: pakfire invalid tree = Invalid repository selected WARNING: untranslated string: pakfire last core list update = Last core list update made WARNING: untranslated string: pakfire last package update = Last packages list update made WARNING: untranslated string: pakfire last serverlist update = Last server list update made WARNING: untranslated string: pakfire last update = Last update made WARNING: untranslated string: pakfire possible dependency = There may be depending packages, here is a list of packages that need to be installed. WARNING: untranslated string: pakfire system state = System Status +WARNING: untranslated string: pakfire tree = Repository +WARNING: untranslated string: pakfire tree stable = Stable +WARNING: untranslated string: pakfire tree testing = Testing +WARNING: untranslated string: pakfire tree unstable = Unstable WARNING: untranslated string: pakfire uninstall description = Please choose one or more items from the list below and <br /> click the minus to uninstall. WARNING: untranslated string: pakfire uninstall package = You want to uninstall the following packages: WARNING: untranslated string: pakfire working = Pakfire is working ... Please wait until all operations have completed successfully. diff --git a/doc/language_issues.es b/doc/language_issues.es index b97d017c3..af006fcdf 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1233,6 +1233,11 @@ WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is no WARNING: untranslated string: p2p block = P2P networks WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes. WARNING: untranslated string: pakfire ago = ago. +WARNING: untranslated string: pakfire invalid tree = Invalid repository selected +WARNING: untranslated string: pakfire tree = Repository +WARNING: untranslated string: pakfire tree stable = Stable +WARNING: untranslated string: pakfire tree testing = Testing +WARNING: untranslated string: pakfire tree unstable = Unstable WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes WARNING: untranslated string: pptp netconfig = My Net Config WARNING: untranslated string: pptp peer = Peer diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 8e9d7babb..928c37a46 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -861,6 +861,11 @@ WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: no data = unknown string WARNING: untranslated string: not validating = Not validating WARNING: untranslated string: pakfire ago = ago. +WARNING: untranslated string: pakfire invalid tree = Invalid repository selected +WARNING: untranslated string: pakfire tree = Repository +WARNING: untranslated string: pakfire tree stable = Stable +WARNING: untranslated string: pakfire tree testing = Testing +WARNING: untranslated string: pakfire tree unstable = Unstable WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index a4ea5e618..6471e0d41 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1013,6 +1013,11 @@ WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> +WARNING: untranslated string: pakfire invalid tree = Invalid repository selected +WARNING: untranslated string: pakfire tree = Repository +WARNING: untranslated string: pakfire tree stable = Stable +WARNING: untranslated string: pakfire tree testing = Testing +WARNING: untranslated string: pakfire tree unstable = Unstable WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes WARNING: untranslated string: pptp netconfig = My Net Config WARNING: untranslated string: pptp peer = Peer diff --git a/doc/language_issues.nl b/doc/language_issues.nl index ca1dee9b5..cc6cbe966 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1045,6 +1045,11 @@ WARNING: untranslated string: ovpn generating the root and host certificates = G WARNING: untranslated string: ovpn ha = Hash algorithm WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> +WARNING: untranslated string: pakfire invalid tree = Invalid repository selected +WARNING: untranslated string: pakfire tree = Repository +WARNING: untranslated string: pakfire tree stable = Stable +WARNING: untranslated string: pakfire tree testing = Testing +WARNING: untranslated string: pakfire tree unstable = Unstable WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes WARNING: untranslated string: pptp netconfig = My Net Config WARNING: untranslated string: pptp peer = Peer diff --git a/doc/language_issues.pl b/doc/language_issues.pl index b97d017c3..af006fcdf 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1233,6 +1233,11 @@ WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is no WARNING: untranslated string: p2p block = P2P networks WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes. WARNING: untranslated string: pakfire ago = ago. +WARNING: untranslated string: pakfire invalid tree = Invalid repository selected +WARNING: untranslated string: pakfire tree = Repository +WARNING: untranslated string: pakfire tree stable = Stable +WARNING: untranslated string: pakfire tree testing = Testing +WARNING: untranslated string: pakfire tree unstable = Unstable WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes WARNING: untranslated string: pptp netconfig = My Net Config WARNING: untranslated string: pptp peer = Peer diff --git a/doc/language_issues.ru b/doc/language_issues.ru index b76c83e56..a8cdef8b4 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1229,6 +1229,11 @@ WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: p2p block = P2P networks WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes. +WARNING: untranslated string: pakfire invalid tree = Invalid repository selected +WARNING: untranslated string: pakfire tree = Repository +WARNING: untranslated string: pakfire tree stable = Stable +WARNING: untranslated string: pakfire tree testing = Testing +WARNING: untranslated string: pakfire tree unstable = Unstable WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes WARNING: untranslated string: pptp netconfig = My Net Config WARNING: untranslated string: pptp peer = Peer diff --git a/doc/language_issues.tr b/doc/language_issues.tr index ef28f6ac8..c6c6ad599 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -923,6 +923,11 @@ WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> +WARNING: untranslated string: pakfire invalid tree = Invalid repository selected +WARNING: untranslated string: pakfire tree = Repository +WARNING: untranslated string: pakfire tree stable = Stable +WARNING: untranslated string: pakfire tree testing = Testing +WARNING: untranslated string: pakfire tree unstable = Unstable WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes WARNING: untranslated string: processor vulnerability mitigations = Processor Vulnerability Mitigations WARNING: untranslated string: ptr = PTR diff --git a/doc/language_missings b/doc/language_missings index 40724a80b..a427f5706 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -63,6 +63,11 @@ < notes < not validating < okay +< pakfire invalid tree +< pakfire tree +< pakfire tree stable +< pakfire tree testing +< pakfire tree unstable < quick control < shaping add options < show areas @@ -705,6 +710,11 @@ < ovpn warning rfc3280 < p2p block < p2p block save notice +< pakfire invalid tree +< pakfire tree +< pakfire tree stable +< pakfire tree testing +< pakfire tree unstable < please reboot to apply your changes < pptp netconfig < pptp peer @@ -942,6 +952,11 @@ < dns use protocol for dns queries < not validating < okay +< pakfire invalid tree +< pakfire tree +< pakfire tree stable +< pakfire tree testing +< pakfire tree unstable < standard < strict < working @@ -1182,6 +1197,11 @@ < ovpn error md5 < ovpn tls auth < ovpn warning rfc3280 +< pakfire invalid tree +< pakfire tree +< pakfire tree stable +< pakfire tree testing +< pakfire tree unstable < please reboot to apply your changes < pptp netconfig < pptp peer @@ -1564,6 +1584,11 @@ < ovpn reneg sec < ovpn tls auth < ovpn warning rfc3280 +< pakfire invalid tree +< pakfire tree +< pakfire tree stable +< pakfire tree testing +< pakfire tree unstable < please reboot to apply your changes < pptp netconfig < pptp peer @@ -2285,6 +2310,11 @@ < ovpn warning rfc3280 < p2p block < p2p block save notice +< pakfire invalid tree +< pakfire tree +< pakfire tree stable +< pakfire tree testing +< pakfire tree unstable < please reboot to apply your changes < pptp netconfig < pptp peer @@ -3121,6 +3151,11 @@ < ovpn warning rfc3280 < p2p block < p2p block save notice +< pakfire invalid tree +< pakfire tree +< pakfire tree stable +< pakfire tree testing +< pakfire tree unstable < please reboot to apply your changes < pptp netconfig < pptp peer @@ -3429,6 +3464,11 @@ < ovpn error md5 < ovpn tls auth < ovpn warning rfc3280 +< pakfire invalid tree +< pakfire tree +< pakfire tree stable +< pakfire tree testing +< pakfire tree unstable < please reboot to apply your changes < processor vulnerability mitigations < ptr diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index e6f3cda94..dacbe11f4 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -30,24 +30,23 @@ require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; require "/opt/pakfire/lib/functions.pl"; -my %pakfiresettings=(); +my %cgiparams=(); my $errormessage = ''; my %color = (); +my %pakfiresettings = (); my %mainsettings = (); &Header::showhttpheaders(); -$pakfiresettings{'ACTION'} = ''; -$pakfiresettings{'VALID'} = ''; +$cgiparams{'ACTION'} = ''; +$cgiparams{'VALID'} = ''; -$pakfiresettings{'INSPAKS'} = ''; -$pakfiresettings{'DELPAKS'} = ''; -$pakfiresettings{'AUTOUPDATE'} = 'off'; -$pakfiresettings{'UUID'} = 'on'; +$cgiparams{'INSPAKS'} = ''; +$cgiparams{'DELPAKS'} = ''; sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();} -&Header::getcgihash(\%pakfiresettings); +&Header::getcgihash(\%cgiparams); &General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); @@ -55,17 +54,17 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont &Header::openpage($Lang::tr{'pakfire configuration'}, 1); &Header::openbigbox('100%', 'left', '', $errormessage); -if ($pakfiresettings{'ACTION'} eq 'install'){ - $pakfiresettings{'INSPAKS'} =~ s/\|/\ /g; - if ("$pakfiresettings{'FORCE'}" eq "on") { - my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &"; +if ($cgiparams{'ACTION'} eq 'install'){ + $cgiparams{'INSPAKS'} =~ s/\|/\ /g; + if ("$cgiparams{'FORCE'}" eq "on") { + my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $cgiparams{'INSPAKS'} &>/dev/null &"; system("$command"); system("/bin/sleep 1"); } else { &Header::openbox("100%", "center", $Lang::tr{'request'}); - my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`; + my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $cgiparams{'INSPAKS'}`; print <<END; - <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'} + <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$cgiparams{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'} <pre> END foreach (@output) { @@ -77,7 +76,7 @@ END <tr><td colspan='2'>$Lang::tr{'pakfire accept all'} <tr><td colspan='2'>  <tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='hidden' name='INSPAKS' value='$pakfiresettings{'INSPAKS'}' /> + <input type='hidden' name='INSPAKS' value='$cgiparams{'INSPAKS'}' /> <input type='hidden' name='FORCE' value='on' /> <input type='hidden' name='ACTION' value='install' /> <input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/go-next.png' /> @@ -94,18 +93,18 @@ END &Header::closepage(); exit; } -} elsif ($pakfiresettings{'ACTION'} eq 'remove') { +} elsif ($cgiparams{'ACTION'} eq 'remove') { - $pakfiresettings{'DELPAKS'} =~ s/\|/\ /g; - if ("$pakfiresettings{'FORCE'}" eq "on") { - my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $pakfiresettings{'DELPAKS'} &>/dev/null &"; + $cgiparams{'DELPAKS'} =~ s/\|/\ /g; + if ("$cgiparams{'FORCE'}" eq "on") { + my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $cgiparams{'DELPAKS'} &>/dev/null &"; system("$command"); system("/bin/sleep 1"); } else { &Header::openbox("100%", "center", $Lang::tr{'request'}); - my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`; + my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $cgiparams{'DELPAKS'}`; print <<END; - <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'}.$pakfiresettings{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'} + <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'}.$cgiparams{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'} <pre> END foreach (@output) { @@ -117,7 +116,7 @@ END <tr><td colspan='2'>$Lang::tr{'pakfire accept all'} <tr><td colspan='2'>  <tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='hidden' name='DELPAKS' value='$pakfiresettings{'DELPAKS'}' /> + <input type='hidden' name='DELPAKS' value='$cgiparams{'DELPAKS'}' /> <input type='hidden' name='FORCE' value='on' /> <input type='hidden' name='ACTION' value='remove' /> <input type='image' alt='$Lang::tr{'uninstall'}' title='$Lang::tr{'uninstall'}' src='/images/go-next.png' /> @@ -135,23 +134,28 @@ END exit; } -} elsif ($pakfiresettings{'ACTION'} eq 'update') { +} elsif ($cgiparams{'ACTION'} eq 'update') { system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &"); system("/bin/sleep 1"); -} elsif ($pakfiresettings{'ACTION'} eq 'upgrade') { +} elsif ($cgiparams{'ACTION'} eq 'upgrade') { my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null &"; system("$command"); system("/bin/sleep 1"); -} elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") { +} elsif ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") { + $pakfiresettings{"TREE"} = $cgiparams{"TREE"}; - if ($pakfiresettings{'AUTOUPDATE'} eq 'on') { - system("/usr/local/bin/pakfire enable updates >/dev/null 2>&1"); - } else { - system("/usr/local/bin/pakfire disable updates >/dev/null 2>&1"); + # Check for valid input + if ($pakfiresettings{"TREE"} !~ m/^(stable|testing|unstable)$/) { + $errormessage .= $Lang::tr{'pakfire invalid tree'}; } - &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings); + unless ($errormessage) { + &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings); + + # Update lists + system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &"); + } } &General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings); @@ -159,12 +163,11 @@ END my %selected=(); my %checked=(); -$checked{'AUTOUPDATE'}{'off'} = ''; -$checked{'AUTOUPDATE'}{'on'} = ''; -$checked{'AUTOUPDATE'}{$pakfiresettings{'AUTOUPDATE'}} = "checked='checked'"; -$checked{'UUID'}{'off'} = ''; -$checked{'UUID'}{'on'} = ''; -$checked{'UUID'}{$pakfiresettings{'UUID'}} = "checked='checked'"; +$selected{"TREE"} = (); +$selected{"TREE"}{"stable"} = ""; +$selected{"TREE"}{"testing"} = ""; +$selected{"TREE"}{"unstable"} = ""; +$selected{"TREE"}{$pakfiresettings{"TREE"}} = "selected"; # DPC move error message to top so it is seen! if ($errormessage) { @@ -278,6 +281,34 @@ print <<END; </table> END +&Header::closebox(); +&Header::openbox("100%", "center", "$Lang::tr{'settings'}"); + +print <<END; + <form method='POST' action='$ENV{'SCRIPT_NAME'}'> + <table width='95%'> + <tr> + <td align='left' width='45%'>$Lang::tr{'pakfire tree'}</td> + <td width="55%" align="left"> + <select name="TREE"> + <option value="stable" $selected{"TREE"}{"stable"}>$Lang::tr{'pakfire tree stable'}</option> + <option value="testing" $selected{"TREE"}{"testing"}>$Lang::tr{'pakfire tree testing'}</option> + <option value="unstable" $selected{"TREE"}{"unstable"}>$Lang::tr{'pakfire tree unstable'}</option> + </select> + </td> + </tr> + <tr> + <td colspan="2"> </td> + </tr> + <tr> + <td colspan="2" align="center"> + <input type="submit" name="ACTION" value="$Lang::tr{'save'}" /> + </td> + </tr> + </table> + </form> +END + &Header::closebox(); &Header::closebigbox(); &Header::closepage(); diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 1f81108f1..a68c8f411 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1982,6 +1982,7 @@ 'pakfire install description' => 'Please choose one or more items from the list below and <br /> click the plus to install.', 'pakfire install package' => 'You want to install the following packages: ', 'pakfire installed addons' => 'Installed Addons:', +'pakfire invalid tree' => 'Invalid repository selected', 'pakfire last core list update' => 'Last core list update made', 'pakfire last package update' => 'Last packages list update made', 'pakfire last serverlist update' => 'Last server list update made', @@ -1989,6 +1990,10 @@ 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.', 'pakfire register' => 'Register at pakfire-server:', 'pakfire system state' => 'System Status', +'pakfire tree' => 'Repository', +'pakfire tree stable' => 'Stable', +'pakfire tree testing' => 'Testing', +'pakfire tree unstable' => 'Unstable', 'pakfire uninstall description' => 'Please choose one or more items from the list below and <br /> click the minus to uninstall.', 'pakfire uninstall package' => 'You want to uninstall the following packages: ', 'pakfire update daily' => 'Search for updates daily:', diff --git a/lfs/configroot b/lfs/configroot index 6092f889b..2c9dbe0e3 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -133,6 +133,7 @@ $(TARGET) : echo "POLICY=MODE2" >> $(CONFIG_ROOT)/firewall/settings echo "POLICY1=MODE2" >> $(CONFIG_ROOT)/firewall/settings echo "USE_ISP_NAMESERVERS=on" >> $(CONFIG_ROOT)/dns/settings + echo "TREE=$(PAKFIRE_TREE)" >> $(CONFIG_ROOT)/pakfire/settings # Install snort to suricata converter. cp $(DIR_SRC)/config/suricata/convert-snort /usr/sbin/convert-snort diff --git a/lfs/dnsdist b/lfs/dnsdist index 6a52f0f47..89a14f737 100644 --- a/lfs/dnsdist +++ b/lfs/dnsdist @@ -24,7 +24,7 @@ include Config -VER = 1.3.3 +VER = 1.4.0 THISAPP = dnsdist-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = x86_64 i586 PROG = dnsdist -PAK_VER = 3 +PAK_VER = 4 DEPS = "" @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6bbcdf5296ac5303e88d779d1d57a4df +$(DL_FILE)_MD5 = 0fecd7d600c1c094b9fffffd27c44369 install : $(TARGET) @@ -85,6 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir=/etc \ --enable-openssl \ --disable-gnutls \ + --enable-dns-over-tls \ --with-lua \ --without-net-snmp diff --git a/lfs/haproxy b/lfs/haproxy index 308d96edf..fadb084bd 100644 --- a/lfs/haproxy +++ b/lfs/haproxy @@ -24,7 +24,7 @@ include Config -VER = 2.0.5 +VER = 2.1.3 THISAPP = haproxy-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = haproxy -PAK_VER = 12 +PAK_VER = 13 DEPS = "" @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 497c716adf4b056484601a887f34d152 +$(DL_FILE)_MD5 = bea4726d8c99f5d9bac0e62906a1f2d0 install : $(TARGET) @@ -83,8 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make $(MAKETUNING) CPU="generic" TARGET="linux-glibc" \ - USE_OPENSSL=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_REGPARM=1 \ - ADDINC="$(CFLAGS)" USE_LINUX_TPROXY=1 ADDLIB="$(LDFLAGS)" + USE_LUA=1 USE_OPENSSL=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_REGPARM=1 \ + LUA_LIB_NAME="lua" ADDINC="$(CFLAGS)" USE_LINUX_TPROXY=1 ADDLIB="$(LDFLAGS)" cd $(DIR_APP) && make install-bin install-man PREFIX=/usr diff --git a/lfs/suricata b/lfs/suricata index e17eb5e08..fdff36ca6 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -24,7 +24,7 @@ include Config -VER = 5.0.1 +VER = 5.0.2 THISAPP = suricata-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8ba12183d5d4b086755e6f510f2149e2 +$(DL_FILE)_MD5 = 28470c05f0f1d3eae2a0c7312c3eabc3 install : $(TARGET) diff --git a/make.sh b/make.sh index 34cc35f02..277ac8633 100755 --- a/make.sh +++ b/make.sh @@ -28,15 +28,17 @@ SNAME="ipfire" # Short name VERSION="2.25" # Version number CORE="142" # Core Level (Filename) PAKFIRE_CORE="141" # Core Level (PAKFIRE) -GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level MAX_RETRIES=1 # prefetch/check loop BUILD_IMAGES=1 # Flash and Xen Downloader KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` -GIT_TAG=$(git tag | tail -1) # Git Tag -GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit + +# Information from Git +GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" # Git Branch +GIT_TAG="$(git tag | tail -1)" # Git Tag +GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit TOOLCHAINVER=20200108 @@ -507,19 +509,36 @@ prepareenv() { rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null # Prepare string for /etc/system-release. - SYSTEM_RELEASE="${NAME} ${VERSION} (${BUILD_ARCH})" - if [ "$(git status -s | wc -l)" == "0" ]; then - GIT_STATUS="" - else - GIT_STATUS="-dirty" + local system_release="${NAME} ${VERSION} (${BUILD_ARCH})" + + case "${GIT_BRANCH}" in + core*|beta?|rc?) + system_release="${system_release} - ${GIT_BRANCH}" + ;; + *) + system_release="${system_release} - Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}" + ;; + esac + + # Append -dirty tag for local changes + if [ "$(git status -s | wc -l)" != "0" ]; then + system_release="${system_release}-dirty" fi - case "$GIT_BRANCH" in - core*|beta?|rc?) - SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS" - ;; - *) - SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" - ;; + + # Export variable + SYSTEM_RELEASE="${system_release}" + + # Decide on PAKFIRE_TREE + case "${GIT_BRANCH}" in + core*) + PAKFIRE_TREE="stable" + ;; + master) + PAKFIRE_TREE="testing" + ;; + *) + PAKFIRE_TREE="unstable" + ;; esac # Setup ccache cache size @@ -539,6 +558,7 @@ enterchroot() { PATH="${PATH}" \ SYSTEM_RELEASE="${SYSTEM_RELEASE}" \ PAKFIRE_CORE="${PAKFIRE_CORE}" \ + PAKFIRE_TREE="${PAKFIRE_TREE}" \ NAME="${NAME}" \ SNAME="${SNAME}" \ VERSION="${VERSION}" \ diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 61787757e..ddb1e9aad 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -70,6 +70,9 @@ my $bfile; my %pakfiresettings = (); &General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings); +# Make version +$Conf::version = &make_version(); + sub message { my $message = shift; @@ -946,4 +949,57 @@ sub status { exit 1; } +sub get_arch() { + # Append architecture + my ($sysname, $nodename, $release, $version, $machine) = POSIX::uname(); + + # We only support armv5tel for all 32 bit arches + if ($machine =~ m/armv[567]/) { + return "armv5tel"; + + # We only support i586 for 32 bit x86 + } elsif ($machine =~ m/i[0-9]86/) { + return "i586"; + } + + return $machine; +} + +sub get_tree() { + # Return stable if nothing is set + return "stable" unless (defined $pakfiresettings{'TREE'}); + + return $pakfiresettings{'TREE'}; +} + +sub make_version() { + my $version = ""; + + # Open /etc/system-release + open(RELEASE, "</etc/system-release"); + my $release = <RELEASE>; + close(RELEASE); + + # Add the main relase + if ($release =~ m/IPFire ([\d\.]+)/) { + $version .= $1; + } + + # Append suffix for tree + my $tree = &get_tree(); + if ($tree eq "testing") { + $version .= ".1"; + } elsif ($tree eq "unstable") { + $version .= ".2"; + } + + # Append architecture + my $arch = &get_arch(); + if ($arch ne "i586") { + $version .= "-${arch}"; + } + + return $version; +} + 1; diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index cfe48f575..9930f3771 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -21,8 +21,6 @@ package Conf; -$version = "@VERSION@"; - $mainserver = "pakfire.ipfire.org"; $cachedir = "/opt/pakfire/cache"; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8d6012f0f54455f0b693f9d8f711ddc731e9051c
by Arne Fitzenreiter 15 Feb '20

15 Feb '20

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 8d6012f0f54455f0b693f9d8f711ddc731e9051c (commit) from dc1362e8884106ce71cba9ece1ddde9bc2424ac7 (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 8d6012f0f54455f0b693f9d8f711ddc731e9051c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 15 11:59:57 2020 +0100 kernel: update to 4.14.171 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/linux | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index 9bfa49fb8..4914f7ea2 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.170 -ARM_PATCHES = 4.14.170-ipfire0 +VER = 4.14.171 +ARM_PATCHES = 4.14.171-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 90 +PAK_VER = 91 DEPS = "" HEADERS_ARCH = $(BUILD_PLATFORM) @@ -82,8 +82,8 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 2e3d6daa02e422f2387e7d2352e6aca8 -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 2bf7ce33777ca17fd0cc8ab6c137c656 +$(DL_FILE)_MD5 = b9b2c64eb3ae7fa6023d2b8c981b5ac4 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = f1d5d1dcb1d60c6f8476938070a65112 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dc1362e8884106ce71cba9ece1ddde9bc2424ac7
by Arne Fitzenreiter 13 Feb '20

13 Feb '20

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 dc1362e8884106ce71cba9ece1ddde9bc2424ac7 (commit) via 8438e2e427e346b3609b1f752d874e40dc1d19f4 (commit) from d120fd4a92338af978dc6d53a803a4d34e8fb99e (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 dc1362e8884106ce71cba9ece1ddde9bc2424ac7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 13 17:08:20 2020 +0000 kernel: armv5tel rootfile update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 8438e2e427e346b3609b1f752d874e40dc1d19f4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 13 16:57:36 2020 +0000 qemu: bump pak version Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/linux-multi | 57 +++++++++++++++++++++++----- lfs/qemu | 2 +- 2 files changed, 49 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index 890e3be21..37e8273d6 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -492,6 +492,7 @@ boot/dtb-KVER-ipfire-multi boot/vmlinuz-KVER-ipfire-multi etc/modprobe.d/framebuffer.conf etc/modprobe.d/ipv6.conf +#lib/modules #lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/build #lib/modules/KVER-ipfire-multi/build/.config @@ -2466,6 +2467,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/certs #lib/modules/KVER-ipfire-multi/build/certs/Kconfig #lib/modules/KVER-ipfire-multi/build/certs/Makefile +#lib/modules/KVER-ipfire-multi/build/certs/signing_key.pem +#lib/modules/KVER-ipfire-multi/build/certs/signing_key.x509 #lib/modules/KVER-ipfire-multi/build/crypto #lib/modules/KVER-ipfire-multi/build/crypto/Kconfig #lib/modules/KVER-ipfire-multi/build/crypto/Makefile @@ -6546,8 +6549,15 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/armada375 #lib/modules/KVER-ipfire-multi/build/include/config/armada375/usbcluster #lib/modules/KVER-ipfire-multi/build/include/config/armada375/usbcluster/phy.h +#lib/modules/KVER-ipfire-multi/build/include/config/asn1.h #lib/modules/KVER-ipfire-multi/build/include/config/associative #lib/modules/KVER-ipfire-multi/build/include/config/associative/array.h +#lib/modules/KVER-ipfire-multi/build/include/config/asymmetric +#lib/modules/KVER-ipfire-multi/build/include/config/asymmetric/key +#lib/modules/KVER-ipfire-multi/build/include/config/asymmetric/key/type.h +#lib/modules/KVER-ipfire-multi/build/include/config/asymmetric/public +#lib/modules/KVER-ipfire-multi/build/include/config/asymmetric/public/key +#lib/modules/KVER-ipfire-multi/build/include/config/asymmetric/public/key/subtype.h #lib/modules/KVER-ipfire-multi/build/include/config/async #lib/modules/KVER-ipfire-multi/build/include/config/async/core.h #lib/modules/KVER-ipfire-multi/build/include/config/async/memcpy.h @@ -7023,6 +7033,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/cls/u32 #lib/modules/KVER-ipfire-multi/build/include/config/cls/u32/mark.h #lib/modules/KVER-ipfire-multi/build/include/config/cls/u32/perf.h +#lib/modules/KVER-ipfire-multi/build/include/config/clz +#lib/modules/KVER-ipfire-multi/build/include/config/clz/tab.h #lib/modules/KVER-ipfire-multi/build/include/config/cma #lib/modules/KVER-ipfire-multi/build/include/config/cma.h #lib/modules/KVER-ipfire-multi/build/include/config/cma/alignment.h @@ -7150,6 +7162,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/crypto/aes #lib/modules/KVER-ipfire-multi/build/include/config/crypto/aes.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/aes/arm.h +#lib/modules/KVER-ipfire-multi/build/include/config/crypto/akcipher.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/akcipher2.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/algapi.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/algapi2.h @@ -7211,7 +7224,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/crypto/gcm.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/gf128mul.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/ghash.h +#lib/modules/KVER-ipfire-multi/build/include/config/crypto/hash #lib/modules/KVER-ipfire-multi/build/include/config/crypto/hash.h +#lib/modules/KVER-ipfire-multi/build/include/config/crypto/hash/info.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/hash2.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/hmac.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/hw.h @@ -7242,6 +7257,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/crypto/rng.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/rng/default.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/rng2.h +#lib/modules/KVER-ipfire-multi/build/include/config/crypto/rsa.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/salsa20.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/seed.h #lib/modules/KVER-ipfire-multi/build/include/config/crypto/seqiv.h @@ -7296,9 +7312,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/debug/align/rodata.h #lib/modules/KVER-ipfire-multi/build/include/config/debug/bugverbose.h #lib/modules/KVER-ipfire-multi/build/include/config/debug/fs.h -#lib/modules/KVER-ipfire-multi/build/include/config/debug/imx -#lib/modules/KVER-ipfire-multi/build/include/config/debug/imx/uart -#lib/modules/KVER-ipfire-multi/build/include/config/debug/imx/uart/port.h #lib/modules/KVER-ipfire-multi/build/include/config/debug/kernel.h #lib/modules/KVER-ipfire-multi/build/include/config/debug/ll #lib/modules/KVER-ipfire-multi/build/include/config/debug/ll/include.h @@ -7774,6 +7787,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/emac #lib/modules/KVER-ipfire-multi/build/include/config/emac/rockchip.h #lib/modules/KVER-ipfire-multi/build/include/config/embedded.h +#lib/modules/KVER-ipfire-multi/build/include/config/ena +#lib/modules/KVER-ipfire-multi/build/include/config/ena/ethernet.h #lib/modules/KVER-ipfire-multi/build/include/config/enable #lib/modules/KVER-ipfire-multi/build/include/config/enable/must #lib/modules/KVER-ipfire-multi/build/include/config/enable/must/check.h @@ -9152,6 +9167,13 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/module/compress #lib/modules/KVER-ipfire-multi/build/include/config/module/compress.h #lib/modules/KVER-ipfire-multi/build/include/config/module/compress/xz.h +#lib/modules/KVER-ipfire-multi/build/include/config/module/sig +#lib/modules/KVER-ipfire-multi/build/include/config/module/sig.h +#lib/modules/KVER-ipfire-multi/build/include/config/module/sig/all.h +#lib/modules/KVER-ipfire-multi/build/include/config/module/sig/force.h +#lib/modules/KVER-ipfire-multi/build/include/config/module/sig/hash.h +#lib/modules/KVER-ipfire-multi/build/include/config/module/sig/key.h +#lib/modules/KVER-ipfire-multi/build/include/config/module/sig/sha512.h #lib/modules/KVER-ipfire-multi/build/include/config/module/srcversion #lib/modules/KVER-ipfire-multi/build/include/config/module/srcversion/all.h #lib/modules/KVER-ipfire-multi/build/include/config/module/unload.h @@ -9187,6 +9209,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/mouse/synaptics/i2c.h #lib/modules/KVER-ipfire-multi/build/include/config/mouse/synaptics/usb.h #lib/modules/KVER-ipfire-multi/build/include/config/mouse/vsxxxaa.h +#lib/modules/KVER-ipfire-multi/build/include/config/mpilib.h #lib/modules/KVER-ipfire-multi/build/include/config/mpls #lib/modules/KVER-ipfire-multi/build/include/config/mpls.h #lib/modules/KVER-ipfire-multi/build/include/config/mpls/iptunnel.h @@ -10103,6 +10126,11 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/pj4b #lib/modules/KVER-ipfire-multi/build/include/config/pj4b/errata #lib/modules/KVER-ipfire-multi/build/include/config/pj4b/errata/4742.h +#lib/modules/KVER-ipfire-multi/build/include/config/pkcs7 +#lib/modules/KVER-ipfire-multi/build/include/config/pkcs7/message +#lib/modules/KVER-ipfire-multi/build/include/config/pkcs7/message/parser.h +#lib/modules/KVER-ipfire-multi/build/include/config/pkcs7/test +#lib/modules/KVER-ipfire-multi/build/include/config/pkcs7/test/key.h #lib/modules/KVER-ipfire-multi/build/include/config/pl310 #lib/modules/KVER-ipfire-multi/build/include/config/pl310/errata #lib/modules/KVER-ipfire-multi/build/include/config/pl310/errata/588369.h @@ -11202,6 +11230,12 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/sysfs #lib/modules/KVER-ipfire-multi/build/include/config/sysfs.h #lib/modules/KVER-ipfire-multi/build/include/config/sysfs/syscall.h +#lib/modules/KVER-ipfire-multi/build/include/config/system +#lib/modules/KVER-ipfire-multi/build/include/config/system/data +#lib/modules/KVER-ipfire-multi/build/include/config/system/data/verification.h +#lib/modules/KVER-ipfire-multi/build/include/config/system/trusted +#lib/modules/KVER-ipfire-multi/build/include/config/system/trusted/keyring.h +#lib/modules/KVER-ipfire-multi/build/include/config/system/trusted/keys.h #lib/modules/KVER-ipfire-multi/build/include/config/systemport.h #lib/modules/KVER-ipfire-multi/build/include/config/sysvipc #lib/modules/KVER-ipfire-multi/build/include/config/sysvipc.h @@ -11969,6 +12003,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/wlcore #lib/modules/KVER-ipfire-multi/build/include/config/wlcore.h #lib/modules/KVER-ipfire-multi/build/include/config/wlcore/sdio.h +#lib/modules/KVER-ipfire-multi/build/include/config/x509 +#lib/modules/KVER-ipfire-multi/build/include/config/x509/certificate +#lib/modules/KVER-ipfire-multi/build/include/config/x509/certificate/parser.h #lib/modules/KVER-ipfire-multi/build/include/config/xfrm #lib/modules/KVER-ipfire-multi/build/include/config/xfrm.h #lib/modules/KVER-ipfire-multi/build/include/config/xfrm/algo.h @@ -13765,7 +13802,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/linux/net.h #lib/modules/KVER-ipfire-multi/build/include/linux/netdev_features.h #lib/modules/KVER-ipfire-multi/build/include/linux/netdevice.h -#lib/modules/KVER-ipfire-multi/build/include/linux/netdevice.h.orig #lib/modules/KVER-ipfire-multi/build/include/linux/netfilter #lib/modules/KVER-ipfire-multi/build/include/linux/netfilter.h #lib/modules/KVER-ipfire-multi/build/include/linux/netfilter/ipset @@ -14511,7 +14547,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/linux/sizes.h #lib/modules/KVER-ipfire-multi/build/include/linux/skb_array.h #lib/modules/KVER-ipfire-multi/build/include/linux/skbuff.h -#lib/modules/KVER-ipfire-multi/build/include/linux/skbuff.h.orig #lib/modules/KVER-ipfire-multi/build/include/linux/slab.h #lib/modules/KVER-ipfire-multi/build/include/linux/slab_def.h #lib/modules/KVER-ipfire-multi/build/include/linux/slub_def.h @@ -15325,7 +15360,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/net/route.h #lib/modules/KVER-ipfire-multi/build/include/net/rtnetlink.h #lib/modules/KVER-ipfire-multi/build/include/net/sch_generic.h -#lib/modules/KVER-ipfire-multi/build/include/net/sch_generic.h.orig #lib/modules/KVER-ipfire-multi/build/include/net/scm.h #lib/modules/KVER-ipfire-multi/build/include/net/sctp #lib/modules/KVER-ipfire-multi/build/include/net/sctp/auth.h @@ -16981,9 +17015,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/net/ncsi/Makefile #lib/modules/KVER-ipfire-multi/build/net/netfilter #lib/modules/KVER-ipfire-multi/build/net/netfilter/Kconfig -#lib/modules/KVER-ipfire-multi/build/net/netfilter/Kconfig.orig #lib/modules/KVER-ipfire-multi/build/net/netfilter/Makefile -#lib/modules/KVER-ipfire-multi/build/net/netfilter/Makefile.orig #lib/modules/KVER-ipfire-multi/build/net/netfilter/ipset #lib/modules/KVER-ipfire-multi/build/net/netfilter/ipset/Kconfig #lib/modules/KVER-ipfire-multi/build/net/netfilter/ipset/Makefile @@ -17158,6 +17190,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/scripts/Makefile.modsign #lib/modules/KVER-ipfire-multi/build/scripts/Makefile.ubsan #lib/modules/KVER-ipfire-multi/build/scripts/adjust_autoksyms.sh +#lib/modules/KVER-ipfire-multi/build/scripts/asn1_compiler #lib/modules/KVER-ipfire-multi/build/scripts/asn1_compiler.c #lib/modules/KVER-ipfire-multi/build/scripts/basic #lib/modules/KVER-ipfire-multi/build/scripts/basic/.gitignore @@ -17320,6 +17353,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/scripts/dtc/util.h #lib/modules/KVER-ipfire-multi/build/scripts/dtc/version_gen.h #lib/modules/KVER-ipfire-multi/build/scripts/export_report.pl +#lib/modules/KVER-ipfire-multi/build/scripts/extract-cert #lib/modules/KVER-ipfire-multi/build/scripts/extract-cert.c #lib/modules/KVER-ipfire-multi/build/scripts/extract-ikconfig #lib/modules/KVER-ipfire-multi/build/scripts/extract-module-sig.pl @@ -17501,6 +17535,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/scripts/selinux/mdp/mdp.c #lib/modules/KVER-ipfire-multi/build/scripts/setlocalversion #lib/modules/KVER-ipfire-multi/build/scripts/show_delta +#lib/modules/KVER-ipfire-multi/build/scripts/sign-file #lib/modules/KVER-ipfire-multi/build/scripts/sign-file.c #lib/modules/KVER-ipfire-multi/build/scripts/sortextable #lib/modules/KVER-ipfire-multi/build/scripts/sortextable.c @@ -18213,6 +18248,8 @@ lib/modules/KVER-ipfire-multi/kernel #lib/modules/KVER-ipfire-multi/kernel/crypto/ansi_cprng.ko.xz #lib/modules/KVER-ipfire-multi/kernel/crypto/anubis.ko.xz #lib/modules/KVER-ipfire-multi/kernel/crypto/arc4.ko.xz +#lib/modules/KVER-ipfire-multi/kernel/crypto/asymmetric_keys +#lib/modules/KVER-ipfire-multi/kernel/crypto/asymmetric_keys/pkcs7_test_key.ko.xz #lib/modules/KVER-ipfire-multi/kernel/crypto/async_tx #lib/modules/KVER-ipfire-multi/kernel/crypto/async_tx/async_memcpy.ko.xz #lib/modules/KVER-ipfire-multi/kernel/crypto/async_tx/async_pq.ko.xz @@ -19353,6 +19390,9 @@ lib/modules/KVER-ipfire-multi/kernel #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/alteon/acenic.ko.xz #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/altera #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/altera/altera_tse.ko.xz +#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/amazon +#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/amazon/ena +#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/amazon/ena/ena.ko.xz #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/amd #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/amd/amd8111e.ko.xz #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/amd/pcnet32.ko.xz @@ -20270,7 +20310,6 @@ lib/modules/KVER-ipfire-multi/kernel #lib/modules/KVER-ipfire-multi/kernel/lib/lz4/lz4hc_compress.ko.xz #lib/modules/KVER-ipfire-multi/kernel/lib/lzo #lib/modules/KVER-ipfire-multi/kernel/lib/lzo/lzo_compress.ko.xz -#lib/modules/KVER-ipfire-multi/kernel/lib/oid_registry.ko.xz #lib/modules/KVER-ipfire-multi/kernel/lib/parman.ko.xz #lib/modules/KVER-ipfire-multi/kernel/lib/raid6 #lib/modules/KVER-ipfire-multi/kernel/lib/raid6/raid6_pq.ko.xz diff --git a/lfs/qemu b/lfs/qemu index a6b203029..8259ff70f 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = qemu -PAK_VER = 25 +PAK_VER = 26 DEPS = "libusbredir spice libseccomp" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d120fd4a92338af978dc6d53a803a4d34e8fb99e
by Arne Fitzenreiter 12 Feb '20

12 Feb '20

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 d120fd4a92338af978dc6d53a803a4d34e8fb99e (commit) via a174e5e1f84e750e30c24824e20d87d0a98b7850 (commit) via 2bc995c836acc63103df15e9da76ff5b97549184 (commit) via ee4e219f5fa62ed8e6a4a7968b811479d57e8b9b (commit) via 36cdd4e1f211edc870870826fa7e168bac1363d1 (commit) via f85c916d7fdac9e8afea8a8bb75a51f62ec52ff0 (commit) via af4370b4a80d46b2b042542be570cea54229b2c5 (commit) via 1dc4f86e68910f05f6163d33b06d493c9f05892e (commit) via be5ed5d01e45c6f467ad2e1350fcad968353ee67 (commit) via 05948d0805342faa5d2516c120b0ac30e732172d (commit) via 2acc41c04c3a62ed215c35ca0a47907f82122891 (commit) via d5957c5cd28c33c4a5220ab1a61a679ae47c340a (commit) via d6cc871067ef7f6cf69e261a84579b7403ffcee3 (commit) via 1a65ea1b7291337e6de44a2d4696a00bbf23f7db (commit) from ee9bc7c477408e6cabe79e56549355712caae97a (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 d120fd4a92338af978dc6d53a803a4d34e8fb99e Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Feb 6 17:26:38 2020 +0100 clamav: Update to 0.102.2 For details see: https://blog.clamav.net/2020/02/clamav-01022-security-patch-released.html "ClamAV 0.102.2 is a security patch release..." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit a174e5e1f84e750e30c24824e20d87d0a98b7850 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Sat Feb 1 14:15:40 2020 +0000 Qemu: remove not needed files for aarch64 and PA-RISC Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 2bc995c836acc63103df15e9da76ff5b97549184 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Sat Feb 1 14:15:39 2020 +0000 Qemu: Remove unneeded files These are needed for s390, riscv and microblaze. See https://lists.fedoraproject.org/pipermail/packaging/2012-July/008557.html Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit ee4e219f5fa62ed8e6a4a7968b811479d57e8b9b Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Sat Feb 1 14:15:38 2020 +0000 Qemu: remove files for sparc This is based on the debian package content (qemu-system-sparc) Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 36cdd4e1f211edc870870826fa7e168bac1363d1 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Sat Feb 1 14:15:37 2020 +0000 Qemu: remove files only needed for Power PC This is based on the debian package content (qemu-system-pcc) Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f85c916d7fdac9e8afea8a8bb75a51f62ec52ff0 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Jan 28 18:27:36 2020 +0100 tmux: Update to 3.0.a For details see: https://raw.githubusercontent.com/tmux/tmux/3.0a/CHANGES Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit af4370b4a80d46b2b042542be570cea54229b2c5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 12 20:12:29 2020 +0000 core142: add squid to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 1dc4f86e68910f05f6163d33b06d493c9f05892e Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Jan 25 19:51:28 2020 +0100 squid: Update to 4.10 For details see: http://www.squid-cache.org/Versions/v4/changesets/ Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit be5ed5d01e45c6f467ad2e1350fcad968353ee67 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Jan 25 19:48:45 2020 +0100 mc: Update to 4.8.24 For details see: http://midnight-commander.org/wiki/NEWS-4.8.24 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 05948d0805342faa5d2516c120b0ac30e732172d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 12 20:07:56 2020 +0000 core142: add suricata changes to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 2acc41c04c3a62ed215c35ca0a47907f82122891 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 23 12:24:48 2020 +0100 suricata: Enable RDP protocol parser. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d5957c5cd28c33c4a5220ab1a61a679ae47c340a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 23 10:44:28 2020 +0100 ruleset-sources: Update snort dl urls. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d6cc871067ef7f6cf69e261a84579b7403ffcee3 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 23 10:44:27 2020 +0100 suricata: Enable new and rust-depended protocol parsers. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 1a65ea1b7291337e6de44a2d4696a00bbf23f7db Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 23 10:44:26 2020 +0100 Suricata: Update to 5.0.1 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/142/filelists/files | 2 + .../{oldcore/100 => core/142}/filelists/squid | 0 .../{oldcore/131 => core/142}/filelists/suricata | 0 config/rootfiles/packages/mc | 2 + config/rootfiles/packages/qemu | 44 +++++++++++----------- config/suricata/ruleset-sources | 4 +- config/suricata/suricata.yaml | 25 ++++++++++-- lfs/clamav | 6 +-- lfs/mc | 6 +-- lfs/squid | 4 +- lfs/suricata | 10 +++-- lfs/tmux | 11 ++++-- src/initscripts/system/suricata | 10 ++--- 13 files changed, 75 insertions(+), 49 deletions(-) copy config/rootfiles/{oldcore/100 => core/142}/filelists/squid (100%) copy config/rootfiles/{oldcore/131 => core/142}/filelists/suricata (100%) Difference in files: diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files index ce4e51768..868de3215 100644 --- a/config/rootfiles/core/142/filelists/files +++ b/config/rootfiles/core/142/filelists/files @@ -2,3 +2,5 @@ etc/system-release etc/issue srv/web/ipfire/cgi-bin/credits.cgi var/ipfire/langs +etc/suricata/suricata.yaml +var/ipfire/suricata/ruleset-sources diff --git a/config/rootfiles/core/142/filelists/squid b/config/rootfiles/core/142/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/142/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/142/filelists/suricata b/config/rootfiles/core/142/filelists/suricata new file mode 120000 index 000000000..f671f6993 --- /dev/null +++ b/config/rootfiles/core/142/filelists/suricata @@ -0,0 +1 @@ +../../../common/suricata \ No newline at end of file diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index 73ff588c7..42a6aadf4 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -111,6 +111,7 @@ usr/share/mc/skins/featured.ini usr/share/mc/skins/gotar.ini usr/share/mc/skins/gray-green-purple256.ini usr/share/mc/skins/gray-orange-blue256.ini +usr/share/mc/skins/julia256.ini usr/share/mc/skins/mc46.ini usr/share/mc/skins/modarcon16-defbg.ini usr/share/mc/skins/modarcon16.ini @@ -217,6 +218,7 @@ usr/share/mc/syntax/unknown.syntax usr/share/mc/syntax/verilog.syntax usr/share/mc/syntax/vhdl.syntax usr/share/mc/syntax/xml.syntax +usr/share/mc/syntax/yabasic.syntax usr/share/mc/syntax/yaml.syntax usr/share/mc/syntax/yum-repo.syntax usr/share/mc/syntax/yxx.syntax diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index e5c0cd189..af9499d2a 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -48,13 +48,13 @@ usr/libexec/qemu-bridge-helper #usr/share/icons/hicolor/scalable/apps #usr/share/icons/hicolor/scalable/apps/qemu.svg #usr/share/qemu -usr/share/qemu/QEMU,cgthree.bin -usr/share/qemu/QEMU,tcx.bin -usr/share/qemu/bamboo.dtb +#usr/share/qemu/QEMU,cgthree.bin +#usr/share/qemu/QEMU,tcx.bin +#usr/share/qemu/bamboo.dtb usr/share/qemu/bios-256k.bin usr/share/qemu/bios.bin -usr/share/qemu/canyonlands.dtb -usr/share/qemu/edk2-aarch64-code.fd +#usr/share/qemu/canyonlands.dtb +#usr/share/qemu/edk2-aarch64-code.fd usr/share/qemu/edk2-arm-code.fd usr/share/qemu/edk2-arm-vars.fd usr/share/qemu/edk2-i386-code.fd @@ -74,11 +74,11 @@ usr/share/qemu/efi-vmxnet3.rom usr/share/qemu/firmware usr/share/qemu/firmware/50-edk2-i386-secure.json usr/share/qemu/firmware/50-edk2-x86_64-secure.json -usr/share/qemu/firmware/60-edk2-aarch64.json +#usr/share/qemu/firmware/60-edk2-aarch64.json usr/share/qemu/firmware/60-edk2-arm.json usr/share/qemu/firmware/60-edk2-i386.json usr/share/qemu/firmware/60-edk2-x86_64.json -usr/share/qemu/hppa-firmware.img +#usr/share/qemu/hppa-firmware.img usr/share/qemu/keymaps usr/share/qemu/keymaps/ar usr/share/qemu/keymaps/bepo @@ -118,16 +118,16 @@ usr/share/qemu/kvmvapic.bin usr/share/qemu/linuxboot.bin usr/share/qemu/linuxboot_dma.bin usr/share/qemu/multiboot.bin -usr/share/qemu/openbios-ppc -usr/share/qemu/openbios-sparc32 -usr/share/qemu/openbios-sparc64 -usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin -usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin -usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin -usr/share/qemu/palcode-clipper -usr/share/qemu/petalogix-ml605.dtb -usr/share/qemu/petalogix-s3adsp1800.dtb -usr/share/qemu/ppc_rom.bin +#usr/share/qemu/openbios-ppc +#usr/share/qemu/openbios-sparc32 +#usr/share/qemu/openbios-sparc64 +#usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin +#usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin +#usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin +#usr/share/qemu/palcode-clipper +#usr/share/qemu/petalogix-ml605.dtb +#usr/share/qemu/petalogix-s3adsp1800.dtb +#usr/share/qemu/ppc_rom.bin usr/share/qemu/pvh.bin usr/share/qemu/pxe-e1000.rom usr/share/qemu/pxe-eepro100.rom @@ -137,12 +137,12 @@ usr/share/qemu/pxe-rtl8139.rom usr/share/qemu/pxe-virtio.rom usr/share/qemu/qemu-nsis.bmp usr/share/qemu/qemu_vga.ndrv -usr/share/qemu/s390-ccw.img -usr/share/qemu/s390-netboot.img +#usr/share/qemu/s390-ccw.img +#usr/share/qemu/s390-netboot.img usr/share/qemu/sgabios.bin -usr/share/qemu/skiboot.lid -usr/share/qemu/slof.bin -usr/share/qemu/spapr-rtas.bin +#usr/share/qemu/skiboot.lid +#usr/share/qemu/slof.bin +#usr/share/qemu/spapr-rtas.bin usr/share/qemu/trace-events-all usr/share/qemu/u-boot-sam460-20100605.bin usr/share/qemu/u-boot.e500 diff --git a/config/suricata/ruleset-sources b/config/suricata/ruleset-sources index ef8d8482b..814a3e0d1 100644 --- a/config/suricata/ruleset-sources +++ b/config/suricata/ruleset-sources @@ -1,8 +1,8 @@ # Ruleset for registered sourcefire users. -registered = https://www.snort.org/rules/snortrules-snapshot-29150.tar.gz?oinkcode=<oinkcode> +registered = https://www.snort.org/rules/snortrules-snapshot-29151.tar.gz?oinkcode=<oinkcode> # Ruleset for registered sourcefire users with valid subscription. -subscripted = https://www.snort.org/rules/snortrules-snapshot-29150.tar.gz?oinkcode=<oinkcode> +subscripted = https://www.snort.org/rules/snortrules-snapshot-29151.tar.gz?oinkcode=<oinkcode> # Community rules from sourcefire. community = https://www.snort.org/rules/community diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml index af9cb75a9..ed71898f4 100644 --- a/config/suricata/suricata.yaml +++ b/config/suricata/suricata.yaml @@ -148,7 +148,9 @@ nfq: app-layer: protocols: krb5: - enabled: no # Requires rust + enabled: yes + snmp: + enabled: yes ikev2: enabled: yes tls: @@ -156,6 +158,12 @@ app-layer: detection-ports: dp: "[443,444,465,853,993,995]" + # Generate JA3 fingerprint from client hello. If not specified it + # will be disabled by default, but enabled if rules require it. + #ja3-fingerprints: auto + # Generate JA3 fingerprint from client hello + ja3-fingerprints: no + # Completely stop processing TLS/SSL session after the handshake # completed. If bypass is enabled this will also trigger flow # bypass. If disabled (the default), TLS/SSL session is still @@ -165,6 +173,8 @@ app-layer: enabled: yes ftp: enabled: yes + rdp: + enabled: yes ssh: enabled: yes smtp: @@ -203,9 +213,10 @@ app-layer: enabled: yes detection-ports: dp: 139, 445 - # smb2 detection is disabled internally inside the engine. - #smb2: - # enabled: yes + nfs: + enabled: yes + tftp: + enabled: yes dns: # memcaps. Globally and per flow/state. global-memcap: 32mb @@ -271,6 +282,12 @@ app-layer: double-decode-path: no double-decode-query: no + ntp: + enabled: yes + dhcp: + enabled: yes + sip: + enabled: yes # Limit for the maximum number of asn1 frames to decode (default 256) asn1-max-frames: 256 diff --git a/lfs/clamav b/lfs/clamav index 9c0aab55f..debba0a7e 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.102.1 +VER = 0.102.2 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 48 +PAK_VER = 49 DEPS = "" @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3d5f5f10a1bea212823050286c8c5b96 +$(DL_FILE)_MD5 = ecf5dd2c5c43aeed1c4b458b2e689847 install : $(TARGET) diff --git a/lfs/mc b/lfs/mc index ff23c4064..528cb4d4a 100644 --- a/lfs/mc +++ b/lfs/mc @@ -24,7 +24,7 @@ include Config -VER = 4.8.23 +VER = 4.8.24 THISAPP = mc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 18 +PAK_VER = 19 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 466c3135f727f8ac2102d060a080ace3 +$(DL_FILE)_MD5 = 3a11df2dd379dd67c497c8d2c344715c install : $(TARGET) diff --git a/lfs/squid b/lfs/squid index 9801c153b..8553d7113 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 4.9 +VER = 4.10 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5c2e335dd1e8ced9dda6e0e11894b344 +$(DL_FILE)_MD5 = af7ac6e70f9bd03ae4fcec0c9b99c38a install : $(TARGET) diff --git a/lfs/suricata b/lfs/suricata index b3d22003b..e17eb5e08 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -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 = 4.1.6 +VER = 5.0.1 THISAPP = suricata-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = da5de1e8053f05cbd295793210117d34 +$(DL_FILE)_MD5 = 8ba12183d5d4b086755e6f510f2149e2 install : $(TARGET) @@ -82,7 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-python \ --with-libjansson-libraries=/usr/lib \ --with-libjansson-includes=/usr/include \ - --disable-suricata-update + --disable-suricata-update \ + --enable-rust + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && make install-conf diff --git a/lfs/tmux b/lfs/tmux index d08904132..e91f5e0cf 100644 --- a/lfs/tmux +++ b/lfs/tmux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 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 = 2.7 +VER = 3.0a THISAPP = tmux-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tmux -PAK_VER = 6 +PAK_VER = 7 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bcdfcf910c94c3e02ce6b1c035880306 +$(DL_FILE)_MD5 = 003b7df5b12ba2553710492b89850ce5 install : $(TARGET) @@ -77,6 +77,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure \ --prefix=/usr diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata index 5dc408262..29e58a7e2 100644 --- a/src/initscripts/system/suricata +++ b/src/initscripts/system/suricata @@ -6,7 +6,7 @@ # # Author : Stefan Schantl <stefan.schantl(a)ipfire.org> # -# Version : 01.02 +# Version : 01.03 # # Notes : # @@ -159,11 +159,11 @@ case "$1" in cpu_count=$(get_cpu_count) # Numer of NFQUES. - NFQUEUES= + NFQUEUES="-q 0" - for i in $(seq 0 $((cpu_count-1)) ); do - NFQUEUES+="-q $i " - done + if [ $cpu_count -gt "1" ]; then + NFQUEUES+=":$(($cpu_count-1))" + fi # Check if the IDS should be started. if [ "$ENABLE_IDS" == "on" ]; then hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ee9bc7c477408e6cabe79e56549355712caae97a
by Arne Fitzenreiter 08 Feb '20

08 Feb '20

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 ee9bc7c477408e6cabe79e56549355712caae97a (commit) from 7d7f6104cdba2f52e71a83ed1372c5742304f3f4 (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 ee9bc7c477408e6cabe79e56549355712caae97a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 8 15:21:16 2020 +0100 kernel: rootfile update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/linux | 54 +++++++++++++++++++++++++++++++---- config/rootfiles/common/x86_64/linux | 37 ++++++++++++++++++++---- 2 files changed, 79 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index f9dc8555b..b130268a9 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -1946,6 +1946,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/certs #lib/modules/KVER-ipfire/build/certs/Kconfig #lib/modules/KVER-ipfire/build/certs/Makefile +#lib/modules/KVER-ipfire/build/certs/signing_key.pem +#lib/modules/KVER-ipfire/build/certs/signing_key.x509 #lib/modules/KVER-ipfire/build/crypto #lib/modules/KVER-ipfire/build/crypto/Kconfig #lib/modules/KVER-ipfire/build/crypto/Makefile @@ -5975,8 +5977,15 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/armada/thermal.h #lib/modules/KVER-ipfire/build/include/config/armv8 #lib/modules/KVER-ipfire/build/include/config/armv8/deprecated.h +#lib/modules/KVER-ipfire/build/include/config/asn1.h #lib/modules/KVER-ipfire/build/include/config/associative #lib/modules/KVER-ipfire/build/include/config/associative/array.h +#lib/modules/KVER-ipfire/build/include/config/asymmetric +#lib/modules/KVER-ipfire/build/include/config/asymmetric/key +#lib/modules/KVER-ipfire/build/include/config/asymmetric/key/type.h +#lib/modules/KVER-ipfire/build/include/config/asymmetric/public +#lib/modules/KVER-ipfire/build/include/config/asymmetric/public/key +#lib/modules/KVER-ipfire/build/include/config/asymmetric/public/key/subtype.h #lib/modules/KVER-ipfire/build/include/config/async #lib/modules/KVER-ipfire/build/include/config/async/core.h #lib/modules/KVER-ipfire/build/include/config/async/memcpy.h @@ -6444,6 +6453,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/cls/u32 #lib/modules/KVER-ipfire/build/include/config/cls/u32/mark.h #lib/modules/KVER-ipfire/build/include/config/cls/u32/perf.h +#lib/modules/KVER-ipfire/build/include/config/clz +#lib/modules/KVER-ipfire/build/include/config/clz/tab.h #lib/modules/KVER-ipfire/build/include/config/cma #lib/modules/KVER-ipfire/build/include/config/cma.h #lib/modules/KVER-ipfire/build/include/config/cma/alignment.h @@ -6542,6 +6553,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/crypto/aead.h #lib/modules/KVER-ipfire/build/include/config/crypto/aead2.h #lib/modules/KVER-ipfire/build/include/config/crypto/aes.h +#lib/modules/KVER-ipfire/build/include/config/crypto/akcipher.h #lib/modules/KVER-ipfire/build/include/config/crypto/akcipher2.h #lib/modules/KVER-ipfire/build/include/config/crypto/algapi.h #lib/modules/KVER-ipfire/build/include/config/crypto/algapi2.h @@ -6588,7 +6600,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/crypto/gcm.h #lib/modules/KVER-ipfire/build/include/config/crypto/gf128mul.h #lib/modules/KVER-ipfire/build/include/config/crypto/ghash.h +#lib/modules/KVER-ipfire/build/include/config/crypto/hash #lib/modules/KVER-ipfire/build/include/config/crypto/hash.h +#lib/modules/KVER-ipfire/build/include/config/crypto/hash/info.h #lib/modules/KVER-ipfire/build/include/config/crypto/hash2.h #lib/modules/KVER-ipfire/build/include/config/crypto/hmac.h #lib/modules/KVER-ipfire/build/include/config/crypto/hw.h @@ -6619,6 +6633,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/crypto/rng.h #lib/modules/KVER-ipfire/build/include/config/crypto/rng/default.h #lib/modules/KVER-ipfire/build/include/config/crypto/rng2.h +#lib/modules/KVER-ipfire/build/include/config/crypto/rsa.h #lib/modules/KVER-ipfire/build/include/config/crypto/salsa20.h #lib/modules/KVER-ipfire/build/include/config/crypto/seed.h #lib/modules/KVER-ipfire/build/include/config/crypto/seqiv.h @@ -7099,6 +7114,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/emac #lib/modules/KVER-ipfire/build/include/config/emac/rockchip.h #lib/modules/KVER-ipfire/build/include/config/embedded.h +#lib/modules/KVER-ipfire/build/include/config/ena +#lib/modules/KVER-ipfire/build/include/config/ena/ethernet.h #lib/modules/KVER-ipfire/build/include/config/enable #lib/modules/KVER-ipfire/build/include/config/enable/must #lib/modules/KVER-ipfire/build/include/config/enable/must/check.h @@ -7268,6 +7285,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/generic/clockevents/broadcast.h #lib/modules/KVER-ipfire/build/include/config/generic/cpu #lib/modules/KVER-ipfire/build/include/config/generic/cpu/autoprobe.h +#lib/modules/KVER-ipfire/build/include/config/generic/cpu/vulnerabilities.h #lib/modules/KVER-ipfire/build/include/config/generic/csum.h #lib/modules/KVER-ipfire/build/include/config/generic/early #lib/modules/KVER-ipfire/build/include/config/generic/early/ioremap.h @@ -8383,6 +8401,13 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/module/compress #lib/modules/KVER-ipfire/build/include/config/module/compress.h #lib/modules/KVER-ipfire/build/include/config/module/compress/xz.h +#lib/modules/KVER-ipfire/build/include/config/module/sig +#lib/modules/KVER-ipfire/build/include/config/module/sig.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/all.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/force.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/hash.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/key.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/sha512.h #lib/modules/KVER-ipfire/build/include/config/module/srcversion #lib/modules/KVER-ipfire/build/include/config/module/srcversion/all.h #lib/modules/KVER-ipfire/build/include/config/module/unload.h @@ -8418,6 +8443,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/mouse/synaptics/i2c.h #lib/modules/KVER-ipfire/build/include/config/mouse/synaptics/usb.h #lib/modules/KVER-ipfire/build/include/config/mouse/vsxxxaa.h +#lib/modules/KVER-ipfire/build/include/config/mpilib.h #lib/modules/KVER-ipfire/build/include/config/mpls #lib/modules/KVER-ipfire/build/include/config/mpls.h #lib/modules/KVER-ipfire/build/include/config/mpls/iptunnel.h @@ -9205,6 +9231,11 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/pinctrl/sun8i/h3/r.h #lib/modules/KVER-ipfire/build/include/config/pinctrl/sunxi.h #lib/modules/KVER-ipfire/build/include/config/pinmux.h +#lib/modules/KVER-ipfire/build/include/config/pkcs7 +#lib/modules/KVER-ipfire/build/include/config/pkcs7/message +#lib/modules/KVER-ipfire/build/include/config/pkcs7/message/parser.h +#lib/modules/KVER-ipfire/build/include/config/pkcs7/test +#lib/modules/KVER-ipfire/build/include/config/pkcs7/test/key.h #lib/modules/KVER-ipfire/build/include/config/pl320 #lib/modules/KVER-ipfire/build/include/config/pl320/mbox.h #lib/modules/KVER-ipfire/build/include/config/pl330 @@ -10200,6 +10231,12 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/sysfs #lib/modules/KVER-ipfire/build/include/config/sysfs.h #lib/modules/KVER-ipfire/build/include/config/sysfs/syscall.h +#lib/modules/KVER-ipfire/build/include/config/system +#lib/modules/KVER-ipfire/build/include/config/system/data +#lib/modules/KVER-ipfire/build/include/config/system/data/verification.h +#lib/modules/KVER-ipfire/build/include/config/system/trusted +#lib/modules/KVER-ipfire/build/include/config/system/trusted/keyring.h +#lib/modules/KVER-ipfire/build/include/config/system/trusted/keys.h #lib/modules/KVER-ipfire/build/include/config/systemport.h #lib/modules/KVER-ipfire/build/include/config/sysvipc #lib/modules/KVER-ipfire/build/include/config/sysvipc.h @@ -10945,6 +10982,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/wlcore #lib/modules/KVER-ipfire/build/include/config/wlcore.h #lib/modules/KVER-ipfire/build/include/config/wlcore/sdio.h +#lib/modules/KVER-ipfire/build/include/config/x509 +#lib/modules/KVER-ipfire/build/include/config/x509/certificate +#lib/modules/KVER-ipfire/build/include/config/x509/certificate/parser.h #lib/modules/KVER-ipfire/build/include/config/xfrm #lib/modules/KVER-ipfire/build/include/config/xfrm.h #lib/modules/KVER-ipfire/build/include/config/xfrm/algo.h @@ -12730,7 +12770,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/linux/net.h #lib/modules/KVER-ipfire/build/include/linux/netdev_features.h #lib/modules/KVER-ipfire/build/include/linux/netdevice.h -#lib/modules/KVER-ipfire/build/include/linux/netdevice.h.orig #lib/modules/KVER-ipfire/build/include/linux/netfilter #lib/modules/KVER-ipfire/build/include/linux/netfilter.h #lib/modules/KVER-ipfire/build/include/linux/netfilter/ipset @@ -13476,7 +13515,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/linux/sizes.h #lib/modules/KVER-ipfire/build/include/linux/skb_array.h #lib/modules/KVER-ipfire/build/include/linux/skbuff.h -#lib/modules/KVER-ipfire/build/include/linux/skbuff.h.orig #lib/modules/KVER-ipfire/build/include/linux/slab.h #lib/modules/KVER-ipfire/build/include/linux/slab_def.h #lib/modules/KVER-ipfire/build/include/linux/slub_def.h @@ -14290,7 +14328,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/net/route.h #lib/modules/KVER-ipfire/build/include/net/rtnetlink.h #lib/modules/KVER-ipfire/build/include/net/sch_generic.h -#lib/modules/KVER-ipfire/build/include/net/sch_generic.h.orig #lib/modules/KVER-ipfire/build/include/net/scm.h #lib/modules/KVER-ipfire/build/include/net/sctp #lib/modules/KVER-ipfire/build/include/net/sctp/auth.h @@ -15946,9 +15983,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/ncsi/Makefile #lib/modules/KVER-ipfire/build/net/netfilter #lib/modules/KVER-ipfire/build/net/netfilter/Kconfig -#lib/modules/KVER-ipfire/build/net/netfilter/Kconfig.orig #lib/modules/KVER-ipfire/build/net/netfilter/Makefile -#lib/modules/KVER-ipfire/build/net/netfilter/Makefile.orig #lib/modules/KVER-ipfire/build/net/netfilter/ipset #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Kconfig #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Makefile @@ -16123,6 +16158,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/Makefile.modsign #lib/modules/KVER-ipfire/build/scripts/Makefile.ubsan #lib/modules/KVER-ipfire/build/scripts/adjust_autoksyms.sh +#lib/modules/KVER-ipfire/build/scripts/asn1_compiler #lib/modules/KVER-ipfire/build/scripts/asn1_compiler.c #lib/modules/KVER-ipfire/build/scripts/basic #lib/modules/KVER-ipfire/build/scripts/basic/.gitignore @@ -16285,6 +16321,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/dtc/util.h #lib/modules/KVER-ipfire/build/scripts/dtc/version_gen.h #lib/modules/KVER-ipfire/build/scripts/export_report.pl +#lib/modules/KVER-ipfire/build/scripts/extract-cert #lib/modules/KVER-ipfire/build/scripts/extract-cert.c #lib/modules/KVER-ipfire/build/scripts/extract-ikconfig #lib/modules/KVER-ipfire/build/scripts/extract-module-sig.pl @@ -16466,6 +16503,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/selinux/mdp/mdp.c #lib/modules/KVER-ipfire/build/scripts/setlocalversion #lib/modules/KVER-ipfire/build/scripts/show_delta +#lib/modules/KVER-ipfire/build/scripts/sign-file #lib/modules/KVER-ipfire/build/scripts/sign-file.c #lib/modules/KVER-ipfire/build/scripts/sortextable #lib/modules/KVER-ipfire/build/scripts/sortextable.c @@ -17171,6 +17209,8 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/crypto/ansi_cprng.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/anubis.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/arc4.ko.xz +#lib/modules/KVER-ipfire/kernel/crypto/asymmetric_keys +#lib/modules/KVER-ipfire/kernel/crypto/asymmetric_keys/pkcs7_test_key.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/async_tx #lib/modules/KVER-ipfire/kernel/crypto/async_tx/async_memcpy.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/async_tx/async_pq.ko.xz @@ -18258,6 +18298,9 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/alteon/acenic.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/altera #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/altera/altera_tse.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/amazon +#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/amazon/ena +#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/amazon/ena/ena.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/amd #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/amd/amd8111e.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/amd/pcnet32.ko.xz @@ -19132,7 +19175,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/lib/lz4/lz4hc_compress.ko.xz #lib/modules/KVER-ipfire/kernel/lib/lzo #lib/modules/KVER-ipfire/kernel/lib/lzo/lzo_compress.ko.xz -#lib/modules/KVER-ipfire/kernel/lib/oid_registry.ko.xz #lib/modules/KVER-ipfire/kernel/lib/parman.ko.xz #lib/modules/KVER-ipfire/kernel/lib/raid6 #lib/modules/KVER-ipfire/kernel/lib/raid6/raid6_pq.ko.xz diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 0ec85621a..a2d73b4e2 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -2097,6 +2097,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/certs #lib/modules/KVER-ipfire/build/certs/Kconfig #lib/modules/KVER-ipfire/build/certs/Makefile +#lib/modules/KVER-ipfire/build/certs/signing_key.pem +#lib/modules/KVER-ipfire/build/certs/signing_key.x509 #lib/modules/KVER-ipfire/build/crypto #lib/modules/KVER-ipfire/build/crypto/Kconfig #lib/modules/KVER-ipfire/build/crypto/Makefile @@ -6232,6 +6234,12 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/asus/nb #lib/modules/KVER-ipfire/build/include/config/asus/nb/wmi.h #lib/modules/KVER-ipfire/build/include/config/asus/wmi.h +#lib/modules/KVER-ipfire/build/include/config/asymmetric +#lib/modules/KVER-ipfire/build/include/config/asymmetric/key +#lib/modules/KVER-ipfire/build/include/config/asymmetric/key/type.h +#lib/modules/KVER-ipfire/build/include/config/asymmetric/public +#lib/modules/KVER-ipfire/build/include/config/asymmetric/public/key +#lib/modules/KVER-ipfire/build/include/config/asymmetric/public/key/subtype.h #lib/modules/KVER-ipfire/build/include/config/async #lib/modules/KVER-ipfire/build/include/config/async/core.h #lib/modules/KVER-ipfire/build/include/config/async/memcpy.h @@ -6934,7 +6942,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/crypto/glue #lib/modules/KVER-ipfire/build/include/config/crypto/glue/helper #lib/modules/KVER-ipfire/build/include/config/crypto/glue/helper/x86.h +#lib/modules/KVER-ipfire/build/include/config/crypto/hash #lib/modules/KVER-ipfire/build/include/config/crypto/hash.h +#lib/modules/KVER-ipfire/build/include/config/crypto/hash/info.h #lib/modules/KVER-ipfire/build/include/config/crypto/hash2.h #lib/modules/KVER-ipfire/build/include/config/crypto/hmac.h #lib/modules/KVER-ipfire/build/include/config/crypto/hw.h @@ -9132,6 +9142,13 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/module/compress #lib/modules/KVER-ipfire/build/include/config/module/compress.h #lib/modules/KVER-ipfire/build/include/config/module/compress/xz.h +#lib/modules/KVER-ipfire/build/include/config/module/sig +#lib/modules/KVER-ipfire/build/include/config/module/sig.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/all.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/force.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/hash.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/key.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/sha512.h #lib/modules/KVER-ipfire/build/include/config/module/srcversion #lib/modules/KVER-ipfire/build/include/config/module/srcversion/all.h #lib/modules/KVER-ipfire/build/include/config/module/unload.h @@ -10042,6 +10059,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/pinctrl/mcp23s08.h #lib/modules/KVER-ipfire/build/include/config/pinctrl/sunrisepoint.h #lib/modules/KVER-ipfire/build/include/config/pinmux.h +#lib/modules/KVER-ipfire/build/include/config/pkcs7 +#lib/modules/KVER-ipfire/build/include/config/pkcs7/message +#lib/modules/KVER-ipfire/build/include/config/pkcs7/message/parser.h #lib/modules/KVER-ipfire/build/include/config/plx #lib/modules/KVER-ipfire/build/include/config/plx/hermes.h #lib/modules/KVER-ipfire/build/include/config/pm @@ -11238,6 +11258,12 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/sysfs #lib/modules/KVER-ipfire/build/include/config/sysfs.h #lib/modules/KVER-ipfire/build/include/config/sysfs/syscall.h +#lib/modules/KVER-ipfire/build/include/config/system +#lib/modules/KVER-ipfire/build/include/config/system/data +#lib/modules/KVER-ipfire/build/include/config/system/data/verification.h +#lib/modules/KVER-ipfire/build/include/config/system/trusted +#lib/modules/KVER-ipfire/build/include/config/system/trusted/keyring.h +#lib/modules/KVER-ipfire/build/include/config/system/trusted/keys.h #lib/modules/KVER-ipfire/build/include/config/sysvipc #lib/modules/KVER-ipfire/build/include/config/sysvipc.h #lib/modules/KVER-ipfire/build/include/config/sysvipc/compat.h @@ -12083,6 +12109,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/wlcore/sdio.h #lib/modules/KVER-ipfire/build/include/config/wmi #lib/modules/KVER-ipfire/build/include/config/wmi/bmof.h +#lib/modules/KVER-ipfire/build/include/config/x509 +#lib/modules/KVER-ipfire/build/include/config/x509/certificate +#lib/modules/KVER-ipfire/build/include/config/x509/certificate/parser.h #lib/modules/KVER-ipfire/build/include/config/x86 #lib/modules/KVER-ipfire/build/include/config/x86.h #lib/modules/KVER-ipfire/build/include/config/x86/64 @@ -17592,6 +17621,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/dtc/util.h #lib/modules/KVER-ipfire/build/scripts/dtc/version_gen.h #lib/modules/KVER-ipfire/build/scripts/export_report.pl +#lib/modules/KVER-ipfire/build/scripts/extract-cert #lib/modules/KVER-ipfire/build/scripts/extract-cert.c #lib/modules/KVER-ipfire/build/scripts/extract-ikconfig #lib/modules/KVER-ipfire/build/scripts/extract-module-sig.pl @@ -17773,6 +17803,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/selinux/mdp/mdp.c #lib/modules/KVER-ipfire/build/scripts/setlocalversion #lib/modules/KVER-ipfire/build/scripts/show_delta +#lib/modules/KVER-ipfire/build/scripts/sign-file #lib/modules/KVER-ipfire/build/scripts/sign-file.c #lib/modules/KVER-ipfire/build/scripts/sortextable #lib/modules/KVER-ipfire/build/scripts/sortextable.c @@ -18567,12 +18598,10 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/crypto/rmd160.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/rmd256.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/rmd320.ko.xz -#lib/modules/KVER-ipfire/kernel/crypto/rsa_generic.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/salsa20_generic.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/seed.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/serpent_generic.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/sha3_generic.ko.xz -#lib/modules/KVER-ipfire/kernel/crypto/sha512_generic.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/tcrypt.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/tea.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/tgr192.ko.xz @@ -21194,7 +21223,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/kernel/trace #lib/modules/KVER-ipfire/kernel/kernel/trace/ring_buffer_benchmark.ko.xz #lib/modules/KVER-ipfire/kernel/lib -#lib/modules/KVER-ipfire/kernel/lib/asn1_decoder.ko.xz #lib/modules/KVER-ipfire/kernel/lib/cordic.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crc-itu-t.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crc4.ko.xz @@ -21205,9 +21233,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/lib/lz4/lz4hc_compress.ko.xz #lib/modules/KVER-ipfire/kernel/lib/lzo #lib/modules/KVER-ipfire/kernel/lib/lzo/lzo_compress.ko.xz -#lib/modules/KVER-ipfire/kernel/lib/mpi -#lib/modules/KVER-ipfire/kernel/lib/mpi/mpi.ko.xz -#lib/modules/KVER-ipfire/kernel/lib/oid_registry.ko.xz #lib/modules/KVER-ipfire/kernel/lib/parman.ko.xz #lib/modules/KVER-ipfire/kernel/lib/raid6 #lib/modules/KVER-ipfire/kernel/lib/raid6/raid6_pq.ko.xz hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7d7f6104cdba2f52e71a83ed1372c5742304f3f4
by Arne Fitzenreiter 08 Feb '20

08 Feb '20

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 7d7f6104cdba2f52e71a83ed1372c5742304f3f4 (commit) from 975f78f7108aa558932a2d9c8c4015ac33be484e (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 7d7f6104cdba2f52e71a83ed1372c5742304f3f4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 8 11:51:43 2020 +0100 core142: add kernel to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../124 => core/142}/filelists/aarch64/linux | 0 .../142}/filelists/aarch64/linux-initrd | 0 .../142}/filelists/armv5tel/linux-initrd-multi | 0 .../142}/filelists/armv5tel/linux-multi | 0 .../{oldcore/100 => core/142}/filelists/i586/linux | 0 .../100 => core/142}/filelists/i586/linux-initrd | 0 .../100 => core/142}/filelists/x86_64/linux | 0 .../100 => core/142}/filelists/x86_64/linux-initrd | 0 config/rootfiles/core/142/update.sh | 77 +++++++++++++++++++++- 9 files changed, 74 insertions(+), 3 deletions(-) copy config/rootfiles/{oldcore/124 => core/142}/filelists/aarch64/linux (100%) copy config/rootfiles/{oldcore/124 => core/142}/filelists/aarch64/linux-initrd (100%) copy config/rootfiles/{oldcore/121 => core/142}/filelists/armv5tel/linux-initrd-multi (100%) copy config/rootfiles/{oldcore/100 => core/142}/filelists/armv5tel/linux-multi (100%) copy config/rootfiles/{oldcore/100 => core/142}/filelists/i586/linux (100%) copy config/rootfiles/{oldcore/100 => core/142}/filelists/i586/linux-initrd (100%) copy config/rootfiles/{oldcore/100 => core/142}/filelists/x86_64/linux (100%) copy config/rootfiles/{oldcore/100 => core/142}/filelists/x86_64/linux-initrd (100%) Difference in files: diff --git a/config/rootfiles/core/142/filelists/aarch64/linux b/config/rootfiles/core/142/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/142/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/142/filelists/aarch64/linux-initrd b/config/rootfiles/core/142/filelists/aarch64/linux-initrd new file mode 120000 index 000000000..8acdb0f31 --- /dev/null +++ b/config/rootfiles/core/142/filelists/aarch64/linux-initrd @@ -0,0 +1 @@ +../../../../common/aarch64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/142/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/142/filelists/armv5tel/linux-initrd-multi new file mode 120000 index 000000000..0b1b4530a --- /dev/null +++ b/config/rootfiles/core/142/filelists/armv5tel/linux-initrd-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-initrd-multi \ No newline at end of file diff --git a/config/rootfiles/core/142/filelists/armv5tel/linux-multi b/config/rootfiles/core/142/filelists/armv5tel/linux-multi new file mode 120000 index 000000000..204eb4c43 --- /dev/null +++ b/config/rootfiles/core/142/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/142/filelists/i586/linux b/config/rootfiles/core/142/filelists/i586/linux new file mode 120000 index 000000000..693ec4bbf --- /dev/null +++ b/config/rootfiles/core/142/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/142/filelists/i586/linux-initrd b/config/rootfiles/core/142/filelists/i586/linux-initrd new file mode 120000 index 000000000..32a03e6a9 --- /dev/null +++ b/config/rootfiles/core/142/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/142/filelists/x86_64/linux b/config/rootfiles/core/142/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/142/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/142/filelists/x86_64/linux-initrd b/config/rootfiles/core/142/filelists/x86_64/linux-initrd new file mode 120000 index 000000000..1b9fff70f --- /dev/null +++ b/config/rootfiles/core/142/filelists/x86_64/linux-initrd @@ -0,0 +1 @@ +../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/142/update.sh b/config/rootfiles/core/142/update.sh index f71a01250..daf0082c6 100644 --- a/config/rootfiles/core/142/update.sh +++ b/config/rootfiles/core/142/update.sh @@ -43,13 +43,46 @@ for (( i=1; i<=$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks. +case $(uname -r) in + *-ipfire-kirkwood) + exit_with_error "ERROR cannot update. kirkwood kernel was not supported." 1 + ;; + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + # Check diskspace on root ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` -if [ $ROOTSPACE -lt 50000 ]; then +if [ $ROOTSPACE -lt 100000 ]; then exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 fi +# Remove the old kernel +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-*-ipfire-* +rm -rf /boot/zImage-*-ipfire-* +rm -rf /boot/uInit-*-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + # Remove files # Stop services @@ -68,8 +101,46 @@ ldconfig # Start services -# This update needs a reboot... -# touch /var/run/need_reboot +# remove lm_sensor config after collectd was started +# to reserch sensors at next boot with updated kernel +rm -f /etc/sysconfig/lm_sensors + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +case "$(uname -m)" in + i?86) + # Force (re)install pae kernel if pae is supported + rm -rf /opt/pakfire/db/installed/meta-linux-pae + rm -rf /opt/pakfire/db/rootfiles/linux-pae + if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 25000 -o $ROOTSPACE -lt 120000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + touch /var/run/need_reboot + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + fi + else + touch /var/run/need_reboot + fi + ;; + *) + # This update needs a reboot... + touch /var/run/need_reboot + ;; +esac # Finish /etc/init.d/fireinfo start hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 975f78f7108aa558932a2d9c8c4015ac33be484e
by Arne Fitzenreiter 08 Feb '20

08 Feb '20

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 975f78f7108aa558932a2d9c8c4015ac33be484e (commit) from 03d651483ba6f329f1fc09b351b145f310d23fd6 (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 975f78f7108aa558932a2d9c8c4015ac33be484e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 8 10:12:38 2020 +0100 core142: move 140/141 file to oldcore Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{core => oldcore}/140/exclude | 0 config/rootfiles/{core => oldcore}/140/filelists/files | 0 config/rootfiles/{core => oldcore}/140/meta | 0 config/rootfiles/{core => oldcore}/140/update.sh | 0 config/rootfiles/{core => oldcore}/141/exclude | 0 config/rootfiles/{core => oldcore}/141/filelists/aarch64/efivar | 0 config/rootfiles/{core => oldcore}/141/filelists/aarch64/gcc | 0 config/rootfiles/{core => oldcore}/141/filelists/aarch64/glibc | 0 config/rootfiles/{core => oldcore}/141/filelists/aarch64/python3 | 0 config/rootfiles/{core => oldcore}/141/filelists/armv5tel/gcc | 0 config/rootfiles/{core => oldcore}/141/filelists/armv5tel/glibc | 0 config/rootfiles/{core => oldcore}/141/filelists/armv5tel/pyhton3 | 0 config/rootfiles/{core => oldcore}/141/filelists/bind | 0 config/rootfiles/{core => oldcore}/141/filelists/elinks | 0 config/rootfiles/{core => oldcore}/141/filelists/file | 0 config/rootfiles/{core => oldcore}/141/filelists/files | 0 config/rootfiles/{core => oldcore}/141/filelists/geoip-database | 0 config/rootfiles/{core => oldcore}/141/filelists/glib | 0 config/rootfiles/{core => oldcore}/141/filelists/i586/gcc | 0 config/rootfiles/{core => oldcore}/141/filelists/i586/glibc | 0 config/rootfiles/{core => oldcore}/141/filelists/i586/python3 | 0 config/rootfiles/{core => oldcore}/141/filelists/knot | 0 config/rootfiles/{core => oldcore}/141/filelists/libhtp | 0 config/rootfiles/{core => oldcore}/141/filelists/libmpc | 0 config/rootfiles/{core => oldcore}/141/filelists/lvm2 | 0 config/rootfiles/{core => oldcore}/141/filelists/mdadm | 0 config/rootfiles/{core => oldcore}/141/filelists/mpfr | 0 config/rootfiles/{core => oldcore}/141/filelists/suricata | 0 config/rootfiles/{core => oldcore}/141/filelists/unbound | 0 config/rootfiles/{core => oldcore}/141/filelists/x86_64/efivar | 0 config/rootfiles/{core => oldcore}/141/filelists/x86_64/gcc | 0 config/rootfiles/{core => oldcore}/141/filelists/x86_64/glibc | 0 config/rootfiles/{core => oldcore}/141/filelists/x86_64/python3 | 0 config/rootfiles/{core => oldcore}/141/meta | 0 config/rootfiles/{core => oldcore}/141/update.sh | 0 35 files changed, 0 insertions(+), 0 deletions(-) rename config/rootfiles/{core => oldcore}/140/exclude (100%) rename config/rootfiles/{core => oldcore}/140/filelists/files (100%) rename config/rootfiles/{core => oldcore}/140/meta (100%) rename config/rootfiles/{core => oldcore}/140/update.sh (100%) rename config/rootfiles/{core => oldcore}/141/exclude (100%) rename config/rootfiles/{core => oldcore}/141/filelists/aarch64/efivar (100%) rename config/rootfiles/{core => oldcore}/141/filelists/aarch64/gcc (100%) rename config/rootfiles/{core => oldcore}/141/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/141/filelists/aarch64/python3 (100%) rename config/rootfiles/{core => oldcore}/141/filelists/armv5tel/gcc (100%) rename config/rootfiles/{core => oldcore}/141/filelists/armv5tel/glibc (100%) rename config/rootfiles/{core => oldcore}/141/filelists/armv5tel/pyhton3 (100%) rename config/rootfiles/{core => oldcore}/141/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/141/filelists/elinks (100%) rename config/rootfiles/{core => oldcore}/141/filelists/file (100%) rename config/rootfiles/{core => oldcore}/141/filelists/files (100%) rename config/rootfiles/{core => oldcore}/141/filelists/geoip-database (100%) rename config/rootfiles/{core => oldcore}/141/filelists/glib (100%) rename config/rootfiles/{core => oldcore}/141/filelists/i586/gcc (100%) rename config/rootfiles/{core => oldcore}/141/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/141/filelists/i586/python3 (100%) rename config/rootfiles/{core => oldcore}/141/filelists/knot (100%) rename config/rootfiles/{core => oldcore}/141/filelists/libhtp (100%) rename config/rootfiles/{core => oldcore}/141/filelists/libmpc (100%) rename config/rootfiles/{core => oldcore}/141/filelists/lvm2 (100%) rename config/rootfiles/{core => oldcore}/141/filelists/mdadm (100%) rename config/rootfiles/{core => oldcore}/141/filelists/mpfr (100%) rename config/rootfiles/{core => oldcore}/141/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/141/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/141/filelists/x86_64/efivar (100%) rename config/rootfiles/{core => oldcore}/141/filelists/x86_64/gcc (100%) rename config/rootfiles/{core => oldcore}/141/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/141/filelists/x86_64/python3 (100%) rename config/rootfiles/{core => oldcore}/141/meta (100%) rename config/rootfiles/{core => oldcore}/141/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/140/exclude b/config/rootfiles/oldcore/140/exclude similarity index 100% rename from config/rootfiles/core/140/exclude rename to config/rootfiles/oldcore/140/exclude diff --git a/config/rootfiles/core/140/filelists/files b/config/rootfiles/oldcore/140/filelists/files similarity index 100% rename from config/rootfiles/core/140/filelists/files rename to config/rootfiles/oldcore/140/filelists/files diff --git a/config/rootfiles/core/140/meta b/config/rootfiles/oldcore/140/meta similarity index 100% rename from config/rootfiles/core/140/meta rename to config/rootfiles/oldcore/140/meta diff --git a/config/rootfiles/core/140/update.sh b/config/rootfiles/oldcore/140/update.sh similarity index 100% rename from config/rootfiles/core/140/update.sh rename to config/rootfiles/oldcore/140/update.sh diff --git a/config/rootfiles/core/141/exclude b/config/rootfiles/oldcore/141/exclude similarity index 100% rename from config/rootfiles/core/141/exclude rename to config/rootfiles/oldcore/141/exclude diff --git a/config/rootfiles/core/141/filelists/aarch64/efivar b/config/rootfiles/oldcore/141/filelists/aarch64/efivar similarity index 100% rename from config/rootfiles/core/141/filelists/aarch64/efivar rename to config/rootfiles/oldcore/141/filelists/aarch64/efivar diff --git a/config/rootfiles/core/141/filelists/aarch64/gcc b/config/rootfiles/oldcore/141/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/141/filelists/aarch64/gcc rename to config/rootfiles/oldcore/141/filelists/aarch64/gcc diff --git a/config/rootfiles/core/141/filelists/aarch64/glibc b/config/rootfiles/oldcore/141/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/141/filelists/aarch64/glibc rename to config/rootfiles/oldcore/141/filelists/aarch64/glibc diff --git a/config/rootfiles/core/141/filelists/aarch64/python3 b/config/rootfiles/oldcore/141/filelists/aarch64/python3 similarity index 100% rename from config/rootfiles/core/141/filelists/aarch64/python3 rename to config/rootfiles/oldcore/141/filelists/aarch64/python3 diff --git a/config/rootfiles/core/141/filelists/armv5tel/gcc b/config/rootfiles/oldcore/141/filelists/armv5tel/gcc similarity index 100% rename from config/rootfiles/core/141/filelists/armv5tel/gcc rename to config/rootfiles/oldcore/141/filelists/armv5tel/gcc diff --git a/config/rootfiles/core/141/filelists/armv5tel/glibc b/config/rootfiles/oldcore/141/filelists/armv5tel/glibc similarity index 100% rename from config/rootfiles/core/141/filelists/armv5tel/glibc rename to config/rootfiles/oldcore/141/filelists/armv5tel/glibc diff --git a/config/rootfiles/core/141/filelists/armv5tel/pyhton3 b/config/rootfiles/oldcore/141/filelists/armv5tel/pyhton3 similarity index 100% rename from config/rootfiles/core/141/filelists/armv5tel/pyhton3 rename to config/rootfiles/oldcore/141/filelists/armv5tel/pyhton3 diff --git a/config/rootfiles/core/141/filelists/bind b/config/rootfiles/oldcore/141/filelists/bind similarity index 100% rename from config/rootfiles/core/141/filelists/bind rename to config/rootfiles/oldcore/141/filelists/bind diff --git a/config/rootfiles/core/141/filelists/elinks b/config/rootfiles/oldcore/141/filelists/elinks similarity index 100% rename from config/rootfiles/core/141/filelists/elinks rename to config/rootfiles/oldcore/141/filelists/elinks diff --git a/config/rootfiles/core/141/filelists/file b/config/rootfiles/oldcore/141/filelists/file similarity index 100% rename from config/rootfiles/core/141/filelists/file rename to config/rootfiles/oldcore/141/filelists/file diff --git a/config/rootfiles/core/141/filelists/files b/config/rootfiles/oldcore/141/filelists/files similarity index 100% rename from config/rootfiles/core/141/filelists/files rename to config/rootfiles/oldcore/141/filelists/files diff --git a/config/rootfiles/core/141/filelists/geoip-database b/config/rootfiles/oldcore/141/filelists/geoip-database similarity index 100% rename from config/rootfiles/core/141/filelists/geoip-database rename to config/rootfiles/oldcore/141/filelists/geoip-database diff --git a/config/rootfiles/core/141/filelists/glib b/config/rootfiles/oldcore/141/filelists/glib similarity index 100% rename from config/rootfiles/core/141/filelists/glib rename to config/rootfiles/oldcore/141/filelists/glib diff --git a/config/rootfiles/core/141/filelists/i586/gcc b/config/rootfiles/oldcore/141/filelists/i586/gcc similarity index 100% rename from config/rootfiles/core/141/filelists/i586/gcc rename to config/rootfiles/oldcore/141/filelists/i586/gcc diff --git a/config/rootfiles/core/141/filelists/i586/glibc b/config/rootfiles/oldcore/141/filelists/i586/glibc similarity index 100% rename from config/rootfiles/core/141/filelists/i586/glibc rename to config/rootfiles/oldcore/141/filelists/i586/glibc diff --git a/config/rootfiles/core/141/filelists/i586/python3 b/config/rootfiles/oldcore/141/filelists/i586/python3 similarity index 100% rename from config/rootfiles/core/141/filelists/i586/python3 rename to config/rootfiles/oldcore/141/filelists/i586/python3 diff --git a/config/rootfiles/core/141/filelists/knot b/config/rootfiles/oldcore/141/filelists/knot similarity index 100% rename from config/rootfiles/core/141/filelists/knot rename to config/rootfiles/oldcore/141/filelists/knot diff --git a/config/rootfiles/core/141/filelists/libhtp b/config/rootfiles/oldcore/141/filelists/libhtp similarity index 100% rename from config/rootfiles/core/141/filelists/libhtp rename to config/rootfiles/oldcore/141/filelists/libhtp diff --git a/config/rootfiles/core/141/filelists/libmpc b/config/rootfiles/oldcore/141/filelists/libmpc similarity index 100% rename from config/rootfiles/core/141/filelists/libmpc rename to config/rootfiles/oldcore/141/filelists/libmpc diff --git a/config/rootfiles/core/141/filelists/lvm2 b/config/rootfiles/oldcore/141/filelists/lvm2 similarity index 100% rename from config/rootfiles/core/141/filelists/lvm2 rename to config/rootfiles/oldcore/141/filelists/lvm2 diff --git a/config/rootfiles/core/141/filelists/mdadm b/config/rootfiles/oldcore/141/filelists/mdadm similarity index 100% rename from config/rootfiles/core/141/filelists/mdadm rename to config/rootfiles/oldcore/141/filelists/mdadm diff --git a/config/rootfiles/core/141/filelists/mpfr b/config/rootfiles/oldcore/141/filelists/mpfr similarity index 100% rename from config/rootfiles/core/141/filelists/mpfr rename to config/rootfiles/oldcore/141/filelists/mpfr diff --git a/config/rootfiles/core/141/filelists/suricata b/config/rootfiles/oldcore/141/filelists/suricata similarity index 100% rename from config/rootfiles/core/141/filelists/suricata rename to config/rootfiles/oldcore/141/filelists/suricata diff --git a/config/rootfiles/core/141/filelists/unbound b/config/rootfiles/oldcore/141/filelists/unbound similarity index 100% rename from config/rootfiles/core/141/filelists/unbound rename to config/rootfiles/oldcore/141/filelists/unbound diff --git a/config/rootfiles/core/141/filelists/x86_64/efivar b/config/rootfiles/oldcore/141/filelists/x86_64/efivar similarity index 100% rename from config/rootfiles/core/141/filelists/x86_64/efivar rename to config/rootfiles/oldcore/141/filelists/x86_64/efivar diff --git a/config/rootfiles/core/141/filelists/x86_64/gcc b/config/rootfiles/oldcore/141/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/141/filelists/x86_64/gcc rename to config/rootfiles/oldcore/141/filelists/x86_64/gcc diff --git a/config/rootfiles/core/141/filelists/x86_64/glibc b/config/rootfiles/oldcore/141/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/141/filelists/x86_64/glibc rename to config/rootfiles/oldcore/141/filelists/x86_64/glibc diff --git a/config/rootfiles/core/141/filelists/x86_64/python3 b/config/rootfiles/oldcore/141/filelists/x86_64/python3 similarity index 100% rename from config/rootfiles/core/141/filelists/x86_64/python3 rename to config/rootfiles/oldcore/141/filelists/x86_64/python3 diff --git a/config/rootfiles/core/141/meta b/config/rootfiles/oldcore/141/meta similarity index 100% rename from config/rootfiles/core/141/meta rename to config/rootfiles/oldcore/141/meta diff --git a/config/rootfiles/core/141/update.sh b/config/rootfiles/oldcore/141/update.sh similarity index 100% rename from config/rootfiles/core/141/update.sh rename to config/rootfiles/oldcore/141/update.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 03d651483ba6f329f1fc09b351b145f310d23fd6
by Arne Fitzenreiter 08 Feb '20

08 Feb '20

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 03d651483ba6f329f1fc09b351b145f310d23fd6 (commit) from 831ff05d898cbf3484922d33573ee067782eb663 (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 03d651483ba6f329f1fc09b351b145f310d23fd6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 8 10:11:40 2020 +0100 core142: start updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{140 => 142}/exclude | 0 .../{oldcore/113 => core/142}/filelists/files | 3 +-- config/rootfiles/core/{140 => 142}/update.sh | 30 +++++++++++----------- make.sh | 2 +- 4 files changed, 17 insertions(+), 18 deletions(-) copy config/rootfiles/core/{140 => 142}/exclude (100%) copy config/rootfiles/{oldcore/113 => core/142}/filelists/files (51%) copy config/rootfiles/core/{140 => 142}/update.sh (86%) Difference in files: diff --git a/config/rootfiles/core/142/exclude b/config/rootfiles/core/142/exclude new file mode 100644 index 000000000..b22159878 --- /dev/null +++ b/config/rootfiles/core/142/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files new file mode 100644 index 000000000..ce4e51768 --- /dev/null +++ b/config/rootfiles/core/142/filelists/files @@ -0,0 +1,4 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/142/update.sh b/config/rootfiles/core/142/update.sh new file mode 100644 index 000000000..f71a01250 --- /dev/null +++ b/config/rootfiles/core/142/update.sh @@ -0,0 +1,86 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2020 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=142 + +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # force fsck at next boot, this may fix free space on xfs + touch /forcefsck + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 50000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 +fi + +# Remove files + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +# /usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Start services + +# This update needs a reboot... +# touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index 030def904..34cc35f02 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.25" # Version number -CORE="141" # Core Level (Filename) +CORE="142" # Core Level (Filename) PAKFIRE_CORE="141" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 831ff05d898cbf3484922d33573ee067782eb663
by Arne Fitzenreiter 06 Feb '20

06 Feb '20

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 831ff05d898cbf3484922d33573ee067782eb663 (commit) via 198c956bb74be7eeaa919c7de3fc3ada4ca52856 (commit) from 57b17167eb6cdbc35bdcf7f6614f00d8ac50fdd1 (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 831ff05d898cbf3484922d33573ee067782eb663 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 6 15:09:52 2020 +0100 kernel: enable and enforce signed kernel modules Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 198c956bb74be7eeaa919c7de3fc3ada4ca52856 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 5 18:25:54 2020 +0100 kernel: update to 4.14.170 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 37 ++++++++++++++++---- config/kernel/kernel.config.armv5tel-ipfire-multi | 38 +++++++++++++++++---- config/kernel/kernel.config.i586-ipfire | 41 +++++++++++++++++------ config/kernel/kernel.config.i586-ipfire-pae | 41 +++++++++++++++++------ config/kernel/kernel.config.x86_64-ipfire | 41 +++++++++++++++++------ config/kernel/x509.genkey | 17 ++++++++++ config/rootfiles/common/i586/linux | 41 +++++++++++++++++++---- config/rootfiles/packages/linux-pae | 41 +++++++++++++++++++---- lfs/linux | 18 ++++++---- lfs/xtables-addons | 11 ++++-- 10 files changed, 262 insertions(+), 64 deletions(-) create mode 100644 config/kernel/x509.genkey Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index e79403bc7..32ad2df07 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.154-ipfire Kernel Configuration +# Linux/arm64 4.14.166-ipfire Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -221,7 +221,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLUB_CPU_PARTIAL=y -# CONFIG_SYSTEM_DATA_VERIFICATION is not set +CONFIG_SYSTEM_DATA_VERIFICATION=y # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y # CONFIG_KPROBES is not set @@ -306,7 +306,15 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_SIG=y +CONFIG_MODULE_SIG_FORCE=y +CONFIG_MODULE_SIG_ALL=y +# CONFIG_MODULE_SIG_SHA1 is not set +# CONFIG_MODULE_SIG_SHA224 is not set +# CONFIG_MODULE_SIG_SHA256 is not set +# CONFIG_MODULE_SIG_SHA384 is not set +CONFIG_MODULE_SIG_SHA512=y +CONFIG_MODULE_SIG_HASH="sha512" CONFIG_MODULE_COMPRESS=y # CONFIG_MODULE_COMPRESS_GZIP is not set CONFIG_MODULE_COMPRESS_XZ=y @@ -369,6 +377,7 @@ CONFIG_MQ_IOSCHED_KYBER=y CONFIG_IOSCHED_BFQ=y CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_PADATA=y +CONFIG_ASN1=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y @@ -2065,6 +2074,7 @@ CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_ALTERA_TSE=m CONFIG_NET_VENDOR_AMAZON=y +CONFIG_ENA_ETHERNET=m CONFIG_NET_VENDOR_AMD=y CONFIG_AMD8111_ETH=m CONFIG_PCNET32=m @@ -6609,6 +6619,7 @@ CONFIG_CRYPTO=y # # Crypto core or helper # +# CONFIG_CRYPTO_FIPS is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y @@ -6621,10 +6632,11 @@ CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_RNG_DEFAULT=y CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AKCIPHER=y CONFIG_CRYPTO_KPP2=y CONFIG_CRYPTO_KPP=m CONFIG_CRYPTO_ACOMP2=y -# CONFIG_CRYPTO_RSA is not set +CONFIG_CRYPTO_RSA=y # CONFIG_CRYPTO_DH is not set CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_MANAGER=y @@ -6741,6 +6753,7 @@ CONFIG_CRYPTO_USER_API_HASH=y CONFIG_CRYPTO_USER_API_SKCIPHER=y # CONFIG_CRYPTO_USER_API_RNG is not set # CONFIG_CRYPTO_USER_API_AEAD is not set +CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_MARVELL_CESA is not set # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set @@ -6751,11 +6764,21 @@ CONFIG_CRYPTO_DEV_ROCKCHIP=y # CONFIG_CRYPTO_DEV_CHELSIO is not set CONFIG_CRYPTO_DEV_VIRTIO=m # CONFIG_CRYPTO_DEV_SAFEXCEL is not set -# CONFIG_ASYMMETRIC_KEY_TYPE is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y +CONFIG_PKCS7_TEST_KEY=m +# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set # # Certificates for signature checking # +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set # CONFIG_ARM64_CRYPTO is not set CONFIG_BINARY_PRINTF=y @@ -6831,11 +6854,13 @@ CONFIG_DQL=y CONFIG_GLOB=y # CONFIG_GLOB_SELFTEST is not set CONFIG_NLATTR=y +CONFIG_CLZ_TAB=y CONFIG_CORDIC=m CONFIG_DDR=y CONFIG_IRQ_POLL=y +CONFIG_MPILIB=y CONFIG_LIBFDT=y -CONFIG_OID_REGISTRY=m +CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y # CONFIG_FONTS is not set diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 7e9de39ea..cfa766005 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.154-ipfire-multi Kernel Configuration +# Linux/arm 4.14.166-ipfire-multi Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -218,7 +218,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLUB_CPU_PARTIAL=y -# CONFIG_SYSTEM_DATA_VERIFICATION is not set +CONFIG_SYSTEM_DATA_VERIFICATION=y # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y CONFIG_HAVE_OPROFILE=y @@ -301,7 +301,15 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_SIG=y +CONFIG_MODULE_SIG_FORCE=y +CONFIG_MODULE_SIG_ALL=y +# CONFIG_MODULE_SIG_SHA1 is not set +# CONFIG_MODULE_SIG_SHA224 is not set +# CONFIG_MODULE_SIG_SHA256 is not set +# CONFIG_MODULE_SIG_SHA384 is not set +CONFIG_MODULE_SIG_SHA512=y +CONFIG_MODULE_SIG_HASH="sha512" CONFIG_MODULE_COMPRESS=y # CONFIG_MODULE_COMPRESS_GZIP is not set CONFIG_MODULE_COMPRESS_XZ=y @@ -363,6 +371,7 @@ CONFIG_MQ_IOSCHED_KYBER=y CONFIG_IOSCHED_BFQ=y CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_PADATA=y +CONFIG_ASN1=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y @@ -2333,6 +2342,7 @@ CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_ALTERA_TSE=m CONFIG_NET_VENDOR_AMAZON=y +CONFIG_ENA_ETHERNET=m CONFIG_NET_VENDOR_AMD=y CONFIG_AMD8111_ETH=m CONFIG_PCNET32=m @@ -7045,7 +7055,6 @@ CONFIG_ARM_UNWIND=y CONFIG_OLD_MCOUNT=y # CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_LL is not set -CONFIG_DEBUG_IMX_UART_PORT=1 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # CONFIG_DEBUG_UART_8250 is not set CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" @@ -7092,6 +7101,7 @@ CONFIG_CRYPTO=y # # Crypto core or helper # +# CONFIG_CRYPTO_FIPS is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y @@ -7104,10 +7114,11 @@ CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_RNG_DEFAULT=y CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AKCIPHER=y CONFIG_CRYPTO_KPP2=y CONFIG_CRYPTO_KPP=m CONFIG_CRYPTO_ACOMP2=y -# CONFIG_CRYPTO_RSA is not set +CONFIG_CRYPTO_RSA=y # CONFIG_CRYPTO_DH is not set CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_MANAGER=y @@ -7224,6 +7235,7 @@ CONFIG_CRYPTO_USER_API_HASH=y CONFIG_CRYPTO_USER_API_SKCIPHER=y # CONFIG_CRYPTO_USER_API_RNG is not set # CONFIG_CRYPTO_USER_API_AEAD is not set +CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_MV_CESA=m # CONFIG_CRYPTO_DEV_MARVELL_CESA is not set @@ -7242,11 +7254,21 @@ CONFIG_CRYPTO_DEV_SUN4I_SS=y CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y CONFIG_CRYPTO_DEV_ROCKCHIP=y # CONFIG_CRYPTO_DEV_CHELSIO is not set -# CONFIG_ASYMMETRIC_KEY_TYPE is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y +CONFIG_PKCS7_TEST_KEY=m +# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set # # Certificates for signature checking # +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set CONFIG_ARM_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM=m @@ -7327,11 +7349,13 @@ CONFIG_GLOB=y # CONFIG_GLOB_SELFTEST is not set CONFIG_NLATTR=y CONFIG_GENERIC_ATOMIC64=y +CONFIG_CLZ_TAB=y CONFIG_CORDIC=m CONFIG_DDR=y CONFIG_IRQ_POLL=y +CONFIG_MPILIB=y CONFIG_LIBFDT=y -CONFIG_OID_REGISTRY=m +CONFIG_OID_REGISTRY=y CONFIG_FONT_SUPPORT=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 2732bba42..4bb39fc20 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.154-ipfire-pae Kernel Configuration +# Linux/x86 4.14.170-ipfire Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -233,7 +233,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLUB_CPU_PARTIAL=y -# CONFIG_SYSTEM_DATA_VERIFICATION is not set +CONFIG_SYSTEM_DATA_VERIFICATION=y # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y CONFIG_HOTPLUG_SMT=y @@ -334,7 +334,15 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_SIG=y +CONFIG_MODULE_SIG_FORCE=y +CONFIG_MODULE_SIG_ALL=y +# CONFIG_MODULE_SIG_SHA1 is not set +# CONFIG_MODULE_SIG_SHA224 is not set +# CONFIG_MODULE_SIG_SHA256 is not set +# CONFIG_MODULE_SIG_SHA384 is not set +CONFIG_MODULE_SIG_SHA512=y +CONFIG_MODULE_SIG_HASH="sha512" CONFIG_MODULE_COMPRESS=y # CONFIG_MODULE_COMPRESS_GZIP is not set CONFIG_MODULE_COMPRESS_XZ=y @@ -398,7 +406,7 @@ CONFIG_IOSCHED_BFQ=y CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y -CONFIG_ASN1=m +CONFIG_ASN1=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y @@ -6703,6 +6711,7 @@ CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 @@ -6766,6 +6775,7 @@ CONFIG_CRYPTO=y # # Crypto core or helper # +# CONFIG_CRYPTO_FIPS is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y @@ -6778,11 +6788,11 @@ CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_RNG_DEFAULT=y CONFIG_CRYPTO_AKCIPHER2=y -CONFIG_CRYPTO_AKCIPHER=m +CONFIG_CRYPTO_AKCIPHER=y CONFIG_CRYPTO_KPP2=y CONFIG_CRYPTO_KPP=m CONFIG_CRYPTO_ACOMP2=y -CONFIG_CRYPTO_RSA=m +CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_MANAGER=y @@ -6851,7 +6861,7 @@ CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m @@ -6908,6 +6918,7 @@ CONFIG_CRYPTO_USER_API_HASH=y CONFIG_CRYPTO_USER_API_SKCIPHER=y CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m @@ -6928,11 +6939,21 @@ CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m CONFIG_CRYPTO_DEV_QAT_C62XVF=m CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_VIRTIO=m -# CONFIG_ASYMMETRIC_KEY_TYPE is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y +CONFIG_PKCS7_TEST_KEY=m +# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set # # Certificates for signature checking # +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y @@ -7040,8 +7061,8 @@ CONFIG_CLZ_TAB=y CONFIG_CORDIC=m # CONFIG_DDR is not set CONFIG_IRQ_POLL=y -CONFIG_MPILIB=m -CONFIG_OID_REGISTRY=m +CONFIG_MPILIB=y +CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y # CONFIG_FONTS is not set diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 9b53ab35c..318384613 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.154-ipfire-pae Kernel Configuration +# Linux/x86 4.14.170-ipfire-pae Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -233,7 +233,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLUB_CPU_PARTIAL=y -# CONFIG_SYSTEM_DATA_VERIFICATION is not set +CONFIG_SYSTEM_DATA_VERIFICATION=y # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y CONFIG_HOTPLUG_SMT=y @@ -335,7 +335,15 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_SIG=y +CONFIG_MODULE_SIG_FORCE=y +CONFIG_MODULE_SIG_ALL=y +# CONFIG_MODULE_SIG_SHA1 is not set +# CONFIG_MODULE_SIG_SHA224 is not set +# CONFIG_MODULE_SIG_SHA256 is not set +# CONFIG_MODULE_SIG_SHA384 is not set +CONFIG_MODULE_SIG_SHA512=y +CONFIG_MODULE_SIG_HASH="sha512" CONFIG_MODULE_COMPRESS=y # CONFIG_MODULE_COMPRESS_GZIP is not set CONFIG_MODULE_COMPRESS_XZ=y @@ -399,7 +407,7 @@ CONFIG_IOSCHED_BFQ=y CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y -CONFIG_ASN1=m +CONFIG_ASN1=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y @@ -6709,6 +6717,7 @@ CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 @@ -6772,6 +6781,7 @@ CONFIG_CRYPTO=y # # Crypto core or helper # +# CONFIG_CRYPTO_FIPS is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y @@ -6784,11 +6794,11 @@ CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_RNG_DEFAULT=y CONFIG_CRYPTO_AKCIPHER2=y -CONFIG_CRYPTO_AKCIPHER=m +CONFIG_CRYPTO_AKCIPHER=y CONFIG_CRYPTO_KPP2=y CONFIG_CRYPTO_KPP=m CONFIG_CRYPTO_ACOMP2=y -CONFIG_CRYPTO_RSA=m +CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_MANAGER=y @@ -6857,7 +6867,7 @@ CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m @@ -6914,6 +6924,7 @@ CONFIG_CRYPTO_USER_API_HASH=y CONFIG_CRYPTO_USER_API_SKCIPHER=y CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m @@ -6933,11 +6944,21 @@ CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m CONFIG_CRYPTO_DEV_QAT_C62XVF=m CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_VIRTIO=m -# CONFIG_ASYMMETRIC_KEY_TYPE is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y +CONFIG_PKCS7_TEST_KEY=m +# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set # # Certificates for signature checking # +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y @@ -7045,8 +7066,8 @@ CONFIG_CLZ_TAB=y CONFIG_CORDIC=m # CONFIG_DDR is not set CONFIG_IRQ_POLL=y -CONFIG_MPILIB=m -CONFIG_OID_REGISTRY=m +CONFIG_MPILIB=y +CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y # CONFIG_FONTS is not set diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 2fcf1e589..b16d13504 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.154-ipfire Kernel Configuration +# Linux/x86 4.14.170-ipfire Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -242,7 +242,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLUB_CPU_PARTIAL=y -# CONFIG_SYSTEM_DATA_VERIFICATION is not set +CONFIG_SYSTEM_DATA_VERIFICATION=y # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y CONFIG_HOTPLUG_SMT=y @@ -354,7 +354,15 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_SIG=y +CONFIG_MODULE_SIG_FORCE=y +CONFIG_MODULE_SIG_ALL=y +# CONFIG_MODULE_SIG_SHA1 is not set +# CONFIG_MODULE_SIG_SHA224 is not set +# CONFIG_MODULE_SIG_SHA256 is not set +# CONFIG_MODULE_SIG_SHA384 is not set +CONFIG_MODULE_SIG_SHA512=y +CONFIG_MODULE_SIG_HASH="sha512" CONFIG_MODULE_COMPRESS=y # CONFIG_MODULE_COMPRESS_GZIP is not set CONFIG_MODULE_COMPRESS_XZ=y @@ -418,7 +426,7 @@ CONFIG_IOSCHED_BFQ=y CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y -CONFIG_ASN1=m +CONFIG_ASN1=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y @@ -6565,6 +6573,7 @@ CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 @@ -6630,6 +6639,7 @@ CONFIG_CRYPTO=y # # Crypto core or helper # +# CONFIG_CRYPTO_FIPS is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y @@ -6642,11 +6652,11 @@ CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_RNG_DEFAULT=y CONFIG_CRYPTO_AKCIPHER2=y -CONFIG_CRYPTO_AKCIPHER=m +CONFIG_CRYPTO_AKCIPHER=y CONFIG_CRYPTO_KPP2=y CONFIG_CRYPTO_KPP=m CONFIG_CRYPTO_ACOMP2=y -CONFIG_CRYPTO_RSA=m +CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_MANAGER=y @@ -6723,7 +6733,7 @@ CONFIG_CRYPTO_SHA1_MB=m CONFIG_CRYPTO_SHA256_MB=m CONFIG_CRYPTO_SHA512_MB=m CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m @@ -6793,6 +6803,7 @@ CONFIG_CRYPTO_USER_API_HASH=y CONFIG_CRYPTO_USER_API_SKCIPHER=y CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m @@ -6813,11 +6824,21 @@ CONFIG_CRYPTO_DEV_NITROX=m CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_VIRTIO=m -# CONFIG_ASYMMETRIC_KEY_TYPE is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y +# CONFIG_PKCS7_TEST_KEY is not set +# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set # # Certificates for signature checking # +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y @@ -6925,8 +6946,8 @@ CONFIG_CLZ_TAB=y CONFIG_CORDIC=m # CONFIG_DDR is not set CONFIG_IRQ_POLL=y -CONFIG_MPILIB=m -CONFIG_OID_REGISTRY=m +CONFIG_MPILIB=y +CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y # CONFIG_FONTS is not set diff --git a/config/kernel/x509.genkey b/config/kernel/x509.genkey new file mode 100644 index 000000000..9640ec6d0 --- /dev/null +++ b/config/kernel/x509.genkey @@ -0,0 +1,17 @@ +[ req ] +default_bits = 4096 +distinguished_name = req_distinguished_name +prompt = no +string_mask = utf8only +x509_extensions = myexts + +[ req_distinguished_name ] +O = IPFire.org +CN = Build time autogenerated kernel key +emailAddress = development(a)lists.ipfire.org + +[ myexts ] +basicConstraints=critical,CA:FALSE +keyUsage=digitalSignature +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 684dbe07b..e65260974 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -2092,6 +2092,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/certs #lib/modules/KVER-ipfire/build/certs/Kconfig #lib/modules/KVER-ipfire/build/certs/Makefile +#lib/modules/KVER-ipfire/build/certs/signing_key.pem +#lib/modules/KVER-ipfire/build/certs/signing_key.x509 #lib/modules/KVER-ipfire/build/crypto #lib/modules/KVER-ipfire/build/crypto/Kconfig #lib/modules/KVER-ipfire/build/crypto/Makefile @@ -6198,6 +6200,12 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/asus/nb/wmi.h #lib/modules/KVER-ipfire/build/include/config/asus/wireless.h #lib/modules/KVER-ipfire/build/include/config/asus/wmi.h +#lib/modules/KVER-ipfire/build/include/config/asymmetric +#lib/modules/KVER-ipfire/build/include/config/asymmetric/key +#lib/modules/KVER-ipfire/build/include/config/asymmetric/key/type.h +#lib/modules/KVER-ipfire/build/include/config/asymmetric/public +#lib/modules/KVER-ipfire/build/include/config/asymmetric/public/key +#lib/modules/KVER-ipfire/build/include/config/asymmetric/public/key/subtype.h #lib/modules/KVER-ipfire/build/include/config/async #lib/modules/KVER-ipfire/build/include/config/async/core.h #lib/modules/KVER-ipfire/build/include/config/async/memcpy.h @@ -6853,7 +6861,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/crypto/glue #lib/modules/KVER-ipfire/build/include/config/crypto/glue/helper #lib/modules/KVER-ipfire/build/include/config/crypto/glue/helper/x86.h +#lib/modules/KVER-ipfire/build/include/config/crypto/hash #lib/modules/KVER-ipfire/build/include/config/crypto/hash.h +#lib/modules/KVER-ipfire/build/include/config/crypto/hash/info.h #lib/modules/KVER-ipfire/build/include/config/crypto/hash2.h #lib/modules/KVER-ipfire/build/include/config/crypto/hmac.h #lib/modules/KVER-ipfire/build/include/config/crypto/hw.h @@ -9077,6 +9087,13 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/module/compress #lib/modules/KVER-ipfire/build/include/config/module/compress.h #lib/modules/KVER-ipfire/build/include/config/module/compress/xz.h +#lib/modules/KVER-ipfire/build/include/config/module/sig +#lib/modules/KVER-ipfire/build/include/config/module/sig.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/all.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/force.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/hash.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/key.h +#lib/modules/KVER-ipfire/build/include/config/module/sig/sha512.h #lib/modules/KVER-ipfire/build/include/config/module/srcversion #lib/modules/KVER-ipfire/build/include/config/module/srcversion/all.h #lib/modules/KVER-ipfire/build/include/config/module/unload.h @@ -10008,6 +10025,11 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/pinctrl/lewisburg.h #lib/modules/KVER-ipfire/build/include/config/pinctrl/mcp23s08.h #lib/modules/KVER-ipfire/build/include/config/pinmux.h +#lib/modules/KVER-ipfire/build/include/config/pkcs7 +#lib/modules/KVER-ipfire/build/include/config/pkcs7/message +#lib/modules/KVER-ipfire/build/include/config/pkcs7/message/parser.h +#lib/modules/KVER-ipfire/build/include/config/pkcs7/test +#lib/modules/KVER-ipfire/build/include/config/pkcs7/test/key.h #lib/modules/KVER-ipfire/build/include/config/plx #lib/modules/KVER-ipfire/build/include/config/plx/hermes.h #lib/modules/KVER-ipfire/build/include/config/pm @@ -11265,6 +11287,12 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/sysfs #lib/modules/KVER-ipfire/build/include/config/sysfs.h #lib/modules/KVER-ipfire/build/include/config/sysfs/syscall.h +#lib/modules/KVER-ipfire/build/include/config/system +#lib/modules/KVER-ipfire/build/include/config/system/data +#lib/modules/KVER-ipfire/build/include/config/system/data/verification.h +#lib/modules/KVER-ipfire/build/include/config/system/trusted +#lib/modules/KVER-ipfire/build/include/config/system/trusted/keyring.h +#lib/modules/KVER-ipfire/build/include/config/system/trusted/keys.h #lib/modules/KVER-ipfire/build/include/config/sysvipc #lib/modules/KVER-ipfire/build/include/config/sysvipc.h #lib/modules/KVER-ipfire/build/include/config/sysvipc/sysctl.h @@ -12118,6 +12146,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/wlcore/sdio.h #lib/modules/KVER-ipfire/build/include/config/wmi #lib/modules/KVER-ipfire/build/include/config/wmi/bmof.h +#lib/modules/KVER-ipfire/build/include/config/x509 +#lib/modules/KVER-ipfire/build/include/config/x509/certificate +#lib/modules/KVER-ipfire/build/include/config/x509/certificate/parser.h #lib/modules/KVER-ipfire/build/include/config/x86 #lib/modules/KVER-ipfire/build/include/config/x86.h #lib/modules/KVER-ipfire/build/include/config/x86/32 @@ -17577,6 +17608,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/dtc/util.h #lib/modules/KVER-ipfire/build/scripts/dtc/version_gen.h #lib/modules/KVER-ipfire/build/scripts/export_report.pl +#lib/modules/KVER-ipfire/build/scripts/extract-cert #lib/modules/KVER-ipfire/build/scripts/extract-cert.c #lib/modules/KVER-ipfire/build/scripts/extract-ikconfig #lib/modules/KVER-ipfire/build/scripts/extract-module-sig.pl @@ -17758,6 +17790,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/selinux/mdp/mdp.c #lib/modules/KVER-ipfire/build/scripts/setlocalversion #lib/modules/KVER-ipfire/build/scripts/show_delta +#lib/modules/KVER-ipfire/build/scripts/sign-file #lib/modules/KVER-ipfire/build/scripts/sign-file.c #lib/modules/KVER-ipfire/build/scripts/sortextable #lib/modules/KVER-ipfire/build/scripts/sortextable.c @@ -18485,6 +18518,8 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/crypto/ansi_cprng.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/anubis.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/arc4.ko.xz +#lib/modules/KVER-ipfire/kernel/crypto/asymmetric_keys +#lib/modules/KVER-ipfire/kernel/crypto/asymmetric_keys/pkcs7_test_key.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/async_tx #lib/modules/KVER-ipfire/kernel/crypto/async_tx/async_memcpy.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/async_tx/async_pq.ko.xz @@ -18527,12 +18562,10 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/crypto/rmd160.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/rmd256.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/rmd320.ko.xz -#lib/modules/KVER-ipfire/kernel/crypto/rsa_generic.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/salsa20_generic.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/seed.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/serpent_generic.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/sha3_generic.ko.xz -#lib/modules/KVER-ipfire/kernel/crypto/sha512_generic.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/tcrypt.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/tea.ko.xz #lib/modules/KVER-ipfire/kernel/crypto/tgr192.ko.xz @@ -21202,7 +21235,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/lib/842 #lib/modules/KVER-ipfire/kernel/lib/842/842_compress.ko.xz #lib/modules/KVER-ipfire/kernel/lib/842/842_decompress.ko.xz -#lib/modules/KVER-ipfire/kernel/lib/asn1_decoder.ko.xz #lib/modules/KVER-ipfire/kernel/lib/cordic.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crc-itu-t.ko.xz #lib/modules/KVER-ipfire/kernel/lib/crc7.ko.xz @@ -21212,9 +21244,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/lib/lz4/lz4hc_compress.ko.xz #lib/modules/KVER-ipfire/kernel/lib/lzo #lib/modules/KVER-ipfire/kernel/lib/lzo/lzo_compress.ko.xz -#lib/modules/KVER-ipfire/kernel/lib/mpi -#lib/modules/KVER-ipfire/kernel/lib/mpi/mpi.ko.xz -#lib/modules/KVER-ipfire/kernel/lib/oid_registry.ko.xz #lib/modules/KVER-ipfire/kernel/lib/parman.ko.xz #lib/modules/KVER-ipfire/kernel/lib/raid6 #lib/modules/KVER-ipfire/kernel/lib/raid6/raid6_pq.ko.xz diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index c0894cd1f..8c7b1f66b 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -2092,6 +2092,8 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/certs #lib/modules/KVER-ipfire-pae/build/certs/Kconfig #lib/modules/KVER-ipfire-pae/build/certs/Makefile +#lib/modules/KVER-ipfire-pae/build/certs/signing_key.pem +#lib/modules/KVER-ipfire-pae/build/certs/signing_key.x509 #lib/modules/KVER-ipfire-pae/build/crypto #lib/modules/KVER-ipfire-pae/build/crypto/Kconfig #lib/modules/KVER-ipfire-pae/build/crypto/Makefile @@ -6204,6 +6206,12 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/config/asus/nb/wmi.h #lib/modules/KVER-ipfire-pae/build/include/config/asus/wireless.h #lib/modules/KVER-ipfire-pae/build/include/config/asus/wmi.h +#lib/modules/KVER-ipfire-pae/build/include/config/asymmetric +#lib/modules/KVER-ipfire-pae/build/include/config/asymmetric/key +#lib/modules/KVER-ipfire-pae/build/include/config/asymmetric/key/type.h +#lib/modules/KVER-ipfire-pae/build/include/config/asymmetric/public +#lib/modules/KVER-ipfire-pae/build/include/config/asymmetric/public/key +#lib/modules/KVER-ipfire-pae/build/include/config/asymmetric/public/key/subtype.h #lib/modules/KVER-ipfire-pae/build/include/config/async #lib/modules/KVER-ipfire-pae/build/include/config/async/core.h #lib/modules/KVER-ipfire-pae/build/include/config/async/memcpy.h @@ -6862,7 +6870,9 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/config/crypto/glue #lib/modules/KVER-ipfire-pae/build/include/config/crypto/glue/helper #lib/modules/KVER-ipfire-pae/build/include/config/crypto/glue/helper/x86.h +#lib/modules/KVER-ipfire-pae/build/include/config/crypto/hash #lib/modules/KVER-ipfire-pae/build/include/config/crypto/hash.h +#lib/modules/KVER-ipfire-pae/build/include/config/crypto/hash/info.h #lib/modules/KVER-ipfire-pae/build/include/config/crypto/hash2.h #lib/modules/KVER-ipfire-pae/build/include/config/crypto/hmac.h #lib/modules/KVER-ipfire-pae/build/include/config/crypto/hw.h @@ -9076,6 +9086,13 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/config/module/compress #lib/modules/KVER-ipfire-pae/build/include/config/module/compress.h #lib/modules/KVER-ipfire-pae/build/include/config/module/compress/xz.h +#lib/modules/KVER-ipfire-pae/build/include/config/module/sig +#lib/modules/KVER-ipfire-pae/build/include/config/module/sig.h +#lib/modules/KVER-ipfire-pae/build/include/config/module/sig/all.h +#lib/modules/KVER-ipfire-pae/build/include/config/module/sig/force.h +#lib/modules/KVER-ipfire-pae/build/include/config/module/sig/hash.h +#lib/modules/KVER-ipfire-pae/build/include/config/module/sig/key.h +#lib/modules/KVER-ipfire-pae/build/include/config/module/sig/sha512.h #lib/modules/KVER-ipfire-pae/build/include/config/module/srcversion #lib/modules/KVER-ipfire-pae/build/include/config/module/srcversion/all.h #lib/modules/KVER-ipfire-pae/build/include/config/module/unload.h @@ -10012,6 +10029,11 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/config/pinctrl/lewisburg.h #lib/modules/KVER-ipfire-pae/build/include/config/pinctrl/mcp23s08.h #lib/modules/KVER-ipfire-pae/build/include/config/pinmux.h +#lib/modules/KVER-ipfire-pae/build/include/config/pkcs7 +#lib/modules/KVER-ipfire-pae/build/include/config/pkcs7/message +#lib/modules/KVER-ipfire-pae/build/include/config/pkcs7/message/parser.h +#lib/modules/KVER-ipfire-pae/build/include/config/pkcs7/test +#lib/modules/KVER-ipfire-pae/build/include/config/pkcs7/test/key.h #lib/modules/KVER-ipfire-pae/build/include/config/plx #lib/modules/KVER-ipfire-pae/build/include/config/plx/hermes.h #lib/modules/KVER-ipfire-pae/build/include/config/pm @@ -11268,6 +11290,12 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/config/sysfs #lib/modules/KVER-ipfire-pae/build/include/config/sysfs.h #lib/modules/KVER-ipfire-pae/build/include/config/sysfs/syscall.h +#lib/modules/KVER-ipfire-pae/build/include/config/system +#lib/modules/KVER-ipfire-pae/build/include/config/system/data +#lib/modules/KVER-ipfire-pae/build/include/config/system/data/verification.h +#lib/modules/KVER-ipfire-pae/build/include/config/system/trusted +#lib/modules/KVER-ipfire-pae/build/include/config/system/trusted/keyring.h +#lib/modules/KVER-ipfire-pae/build/include/config/system/trusted/keys.h #lib/modules/KVER-ipfire-pae/build/include/config/sysvipc #lib/modules/KVER-ipfire-pae/build/include/config/sysvipc.h #lib/modules/KVER-ipfire-pae/build/include/config/sysvipc/sysctl.h @@ -12121,6 +12149,9 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/config/wlcore/sdio.h #lib/modules/KVER-ipfire-pae/build/include/config/wmi #lib/modules/KVER-ipfire-pae/build/include/config/wmi/bmof.h +#lib/modules/KVER-ipfire-pae/build/include/config/x509 +#lib/modules/KVER-ipfire-pae/build/include/config/x509/certificate +#lib/modules/KVER-ipfire-pae/build/include/config/x509/certificate/parser.h #lib/modules/KVER-ipfire-pae/build/include/config/x86 #lib/modules/KVER-ipfire-pae/build/include/config/x86.h #lib/modules/KVER-ipfire-pae/build/include/config/x86/32 @@ -17647,6 +17678,7 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/scripts/dtc/util.h #lib/modules/KVER-ipfire-pae/build/scripts/dtc/version_gen.h #lib/modules/KVER-ipfire-pae/build/scripts/export_report.pl +#lib/modules/KVER-ipfire-pae/build/scripts/extract-cert #lib/modules/KVER-ipfire-pae/build/scripts/extract-cert.c #lib/modules/KVER-ipfire-pae/build/scripts/extract-ikconfig #lib/modules/KVER-ipfire-pae/build/scripts/extract-module-sig.pl @@ -17828,6 +17860,7 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/scripts/selinux/mdp/mdp.c #lib/modules/KVER-ipfire-pae/build/scripts/setlocalversion #lib/modules/KVER-ipfire-pae/build/scripts/show_delta +#lib/modules/KVER-ipfire-pae/build/scripts/sign-file #lib/modules/KVER-ipfire-pae/build/scripts/sign-file.c #lib/modules/KVER-ipfire-pae/build/scripts/sortextable #lib/modules/KVER-ipfire-pae/build/scripts/sortextable.c @@ -18555,6 +18588,8 @@ lib/modules/KVER-ipfire-pae/kernel #lib/modules/KVER-ipfire-pae/kernel/crypto/ansi_cprng.ko.xz #lib/modules/KVER-ipfire-pae/kernel/crypto/anubis.ko.xz #lib/modules/KVER-ipfire-pae/kernel/crypto/arc4.ko.xz +#lib/modules/KVER-ipfire-pae/kernel/crypto/asymmetric_keys +#lib/modules/KVER-ipfire-pae/kernel/crypto/asymmetric_keys/pkcs7_test_key.ko.xz #lib/modules/KVER-ipfire-pae/kernel/crypto/async_tx #lib/modules/KVER-ipfire-pae/kernel/crypto/async_tx/async_memcpy.ko.xz #lib/modules/KVER-ipfire-pae/kernel/crypto/async_tx/async_pq.ko.xz @@ -18597,12 +18632,10 @@ lib/modules/KVER-ipfire-pae/kernel #lib/modules/KVER-ipfire-pae/kernel/crypto/rmd160.ko.xz #lib/modules/KVER-ipfire-pae/kernel/crypto/rmd256.ko.xz #lib/modules/KVER-ipfire-pae/kernel/crypto/rmd320.ko.xz -#lib/modules/KVER-ipfire-pae/kernel/crypto/rsa_generic.ko.xz #lib/modules/KVER-ipfire-pae/kernel/crypto/salsa20_generic.ko.xz #lib/modules/KVER-ipfire-pae/kernel/crypto/seed.ko.xz #lib/modules/KVER-ipfire-pae/kernel/crypto/serpent_generic.ko.xz #lib/modules/KVER-ipfire-pae/kernel/crypto/sha3_generic.ko.xz -#lib/modules/KVER-ipfire-pae/kernel/crypto/sha512_generic.ko.xz #lib/modules/KVER-ipfire-pae/kernel/crypto/tcrypt.ko.xz #lib/modules/KVER-ipfire-pae/kernel/crypto/tea.ko.xz #lib/modules/KVER-ipfire-pae/kernel/crypto/tgr192.ko.xz @@ -21288,7 +21321,6 @@ lib/modules/KVER-ipfire-pae/kernel #lib/modules/KVER-ipfire-pae/kernel/lib/842 #lib/modules/KVER-ipfire-pae/kernel/lib/842/842_compress.ko.xz #lib/modules/KVER-ipfire-pae/kernel/lib/842/842_decompress.ko.xz -#lib/modules/KVER-ipfire-pae/kernel/lib/asn1_decoder.ko.xz #lib/modules/KVER-ipfire-pae/kernel/lib/cordic.ko.xz #lib/modules/KVER-ipfire-pae/kernel/lib/crc-itu-t.ko.xz #lib/modules/KVER-ipfire-pae/kernel/lib/crc4.ko.xz @@ -21299,9 +21331,6 @@ lib/modules/KVER-ipfire-pae/kernel #lib/modules/KVER-ipfire-pae/kernel/lib/lz4/lz4hc_compress.ko.xz #lib/modules/KVER-ipfire-pae/kernel/lib/lzo #lib/modules/KVER-ipfire-pae/kernel/lib/lzo/lzo_compress.ko.xz -#lib/modules/KVER-ipfire-pae/kernel/lib/mpi -#lib/modules/KVER-ipfire-pae/kernel/lib/mpi/mpi.ko.xz -#lib/modules/KVER-ipfire-pae/kernel/lib/oid_registry.ko.xz #lib/modules/KVER-ipfire-pae/kernel/lib/parman.ko.xz #lib/modules/KVER-ipfire-pae/kernel/lib/raid6 #lib/modules/KVER-ipfire-pae/kernel/lib/raid6/raid6_pq.ko.xz diff --git a/lfs/linux b/lfs/linux index aac2c4868..9bfa49fb8 100644 --- a/lfs/linux +++ b/lfs/linux @@ -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,8 +24,8 @@ include Config -VER = 4.14.154 -ARM_PATCHES = 4.14.154-ipfire0 +VER = 4.14.170 +ARM_PATCHES = 4.14.170-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 89 +PAK_VER = 90 DEPS = "" HEADERS_ARCH = $(BUILD_PLATFORM) @@ -82,8 +82,8 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = d6cf4b51c1cd10bc48bac50f4557a0d9 -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 539737e07e5634565b3f4f1b932c269b +$(DL_FILE)_MD5 = 2e3d6daa02e422f2387e7d2352e6aca8 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 2bf7ce33777ca17fd0cc8ab6c137c656 install : $(TARGET) @@ -178,6 +178,9 @@ else cd $(DIR_APP) && make clean cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile + # Copy Module signing key configuration + cp -f $(DIR_SRC)/config/kernel/x509.genkey $(DIR_APP)/certs/x509.genkey + # Remove modules folder if exists rm -rf /lib/modules/$(VER)-$(VERSUFIX) @@ -219,6 +222,9 @@ endif cd $(DIR_APP) && cp -a --parents arch/$(HEADERS_ARCH)/include /lib/modules/$(VER)-$(VERSUFIX)/build cd $(DIR_APP) && cp -a include /lib/modules/$(VER)-$(VERSUFIX)/build/include + # Copy module signing key for off tree modules + cd $(DIR_APP) && cp -f certs/signing_key.* /lib/modules/$(VER)-$(VERSUFIX)/build/certs/ + # Install objtool cd $(DIR_APP) && cp -a tools/objtool/objtool \ /lib/modules/$(VER)-$(VERSUFIX)/build/tools/objtool/ || : diff --git a/lfs/xtables-addons b/lfs/xtables-addons index 2152fa5fd..651a13f9c 100644 --- a/lfs/xtables-addons +++ b/lfs/xtables-addons @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 # @@ -106,9 +106,14 @@ else cd $(DIR_APP) && make $(MAKETUNING) # Install the built kernel modules. + mkdir -p $(MODPATH) cd $(DIR_APP) && for f in $$(ls extensions/*.ko); do \ - mkdir -p $(MODPATH); \ - install -m 644 $$f $(MODPATH); \ + /lib/modules/$$(uname -r)$(KCFG)/build/scripts/sign-file sha512 \ + /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.pem \ + /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.x509 \ + $$f; \ + xz $$f; \ + install -m 644 $$f.xz $(MODPATH); \ done endif hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.25-core141, created. 57b17167eb6cdbc35bdcf7f6614f00d8ac50fdd1
by Arne Fitzenreiter 04 Feb '20

04 Feb '20

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 tag, v2.25-core141 has been created at 57b17167eb6cdbc35bdcf7f6614f00d8ac50fdd1 (commit) - Log ----------------------------------------------------------------- commit 57b17167eb6cdbc35bdcf7f6614f00d8ac50fdd1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 3 17:44:49 2020 +0000 kernel: drop kirkwood kernel perl 5.30 will not work on kirkwood platform and firewinfo reports less than 10 users so we will drop the support for the platform. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2020