]> git.ipfire.org Git - people/mlorenz/ipfire-2.x.git/log
people/mlorenz/ipfire-2.x.git
3 years agoids.cgi: Drop old code to handle the settings of the ruleset section.
Stefan Schantl [Thu, 1 Apr 2021 09:55:40 +0000 (11:55 +0200)] 
ids.cgi: Drop old code to handle the settings of the ruleset section.

This entirely has been replaced by the providers section and the code to
handle the actions of this section.

Therefore this code is not longer needed.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Finish code to handle the removal of a provider from the list.
Stefan Schantl [Thu, 1 Apr 2021 09:50:44 +0000 (11:50 +0200)] 
ids.cgi: Finish code to handle the removal of a provider from the list.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Finish code to handle toggeling a provider enabled/disabled.
Stefan Schantl [Thu, 1 Apr 2021 09:46:11 +0000 (11:46 +0200)] 
ids.cgi: Finish code to handle toggeling a provider enabled/disabled.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoIDS: Redesign backend for used provider rulesfiles.
Stefan Schantl [Thu, 1 Apr 2021 09:39:57 +0000 (11:39 +0200)] 
IDS: Redesign backend for used provider rulesfiles.

The selected rulesfiles of a provider now will be written to an own
provider exclusive yaml file, which will be included dynamically when
the provider is enabled or not.

This allows very easy handling to enable or disable a provider, in this
case the file which keeps the enabled providers rulesets only needs to
be included in the main file or even not.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Add action if a new provider is added.
Stefan Schantl [Wed, 31 Mar 2021 11:41:28 +0000 (13:41 +0200)] 
ids.cgi: Add action if a new provider is added.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Introduce move_tmp_ruleset() function.
Stefan Schantl [Wed, 31 Mar 2021 11:39:43 +0000 (13:39 +0200)] 
ids-functions.pl: Introduce move_tmp_ruleset() function.

This function is used to move an extracted temporary ruleset to
the rules location.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Fix another typo.
Stefan Schantl [Wed, 31 Mar 2021 10:31:18 +0000 (12:31 +0200)] 
ids-functions.pl: Fix another typo.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Remove accidently commited debug code.
Stefan Schantl [Wed, 31 Mar 2021 10:22:17 +0000 (12:22 +0200)] 
ids-functions.pl: Remove accidently commited debug code.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Rework oinkmaster() to use get_enabled_providers
Stefan Schantl [Wed, 31 Mar 2021 10:21:41 +0000 (12:21 +0200)] 
ids-functions.pl: Rework oinkmaster() to use get_enabled_providers
function.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Introduce get_enabled_providers() function.
Stefan Schantl [Wed, 31 Mar 2021 10:16:24 +0000 (12:16 +0200)] 
ids-functions.pl: Introduce get_enabled_providers() function.

This function simply returns an array with all enabled ruleset
providers.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Fix typo.
Stefan Schantl [Wed, 31 Mar 2021 10:16:01 +0000 (12:16 +0200)] 
ids-functions.pl: Fix typo.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Use get_used_rulesfiles function from ids-functions.pl.
Stefan Schantl [Wed, 31 Mar 2021 10:02:27 +0000 (12:02 +0200)] 
ids.cgi: Use get_used_rulesfiles function from ids-functions.pl.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Introduce get_used_rulesfiles() function.
Stefan Schantl [Wed, 31 Mar 2021 10:01:22 +0000 (12:01 +0200)] 
ids-functions.pl: Introduce get_used_rulesfiles() function.

This function simply returns an array which contains the used rulesfiles
files.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Introduce drop_dl_rulesfile().
Stefan Schantl [Wed, 31 Mar 2021 09:26:24 +0000 (11:26 +0200)] 
ids-functions.pl: Introduce drop_dl_rulesfile().

This tiny function is used, to delete the stored rulesfile in case a
provider will be deleted.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Rework function for modify-sid file to be more
Stefan Schantl [Wed, 31 Mar 2021 08:49:19 +0000 (10:49 +0200)] 
ids-functions.pl: Rework function for modify-sid file to be more
generic.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Add cleanup_tmp_directory() function.
Stefan Schantl [Wed, 31 Mar 2021 08:45:14 +0000 (10:45 +0200)] 
ids-functions.pl: Add cleanup_tmp_directory() function.

As the name of the function already says, it is responsible to
delete all temporary files after ruleset generation.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Remove config files on rulesdir cleanup.
Stefan Schantl [Mon, 29 Mar 2021 14:53:52 +0000 (16:53 +0200)] 
ids-functions.pl: Remove config files on rulesdir cleanup.

They every time oinkmaster is called will be generated.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Rework oinkmaster() function.
Stefan Schantl [Mon, 29 Mar 2021 14:51:18 +0000 (16:51 +0200)] 
ids-functions.pl: Rework oinkmaster() function.

Rework the function to work with the latest changes and multiple
providers.

The function now does the following:

* Extract the stored rules tarballs for all enabled providers.
* Copy rules files for enabled providers which provide plain files.
* Still calls oinkmaster to set up the rules and modify them.
* Calls the merge functions for classification and sid to msg files.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Assign temporary rules and conf path to variables.
Stefan Schantl [Mon, 29 Mar 2021 13:50:04 +0000 (15:50 +0200)] 
ids-functions.pl: Assign temporary rules and conf path to variables.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Introduce merge_sid_msg() function.
Stefan Schantl [Mon, 29 Mar 2021 13:27:42 +0000 (15:27 +0200)] 
ids-functions.pl: Introduce merge_sid_msg() function.

This function is used to merge the sid to message mapping files
from various providers.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Fix typo.
Stefan Schantl [Sun, 28 Mar 2021 10:49:56 +0000 (12:49 +0200)] 
ids-functions.pl: Fix typo.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Introduce merge_classifications() function.
Stefan Schantl [Sun, 28 Mar 2021 10:47:23 +0000 (12:47 +0200)] 
ids-functions.pl: Introduce merge_classifications() function.

This function is used to merge the individual classification files
provided by the providers.

The result will be written to the classification.config which will be
used by the IDS.

Fixes #11884.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Introduce extraceruleset() function.
Stefan Schantl [Sat, 27 Mar 2021 11:07:45 +0000 (12:07 +0100)] 
ids-functions.pl: Introduce extraceruleset() function.

This function is used to extract the required config and rules files
from the stored rules tarball for a given ruleset provider.

* The files will be extracted to a temporary directory layout in
  "/tmp/ids_tmp".

* Names of config files will be adjusted in case multiple providers
  offers the same config files, which is very common.

* The name of the single rulefiles will be adjusted to start with
  the vendors name to allow assigning them very easily to a single
  ruleset provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Always delete temporary file.
Stefan Schantl [Sat, 27 Mar 2021 11:07:13 +0000 (12:07 +0100)] 
ids-functions.pl: Always delete temporary file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Fix typo.
Stefan Schantl [Sat, 27 Mar 2021 11:06:44 +0000 (12:06 +0100)] 
ids-functions.pl: Fix typo.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoruleset-sources: Rename file to plain.
Stefan Schantl [Fri, 26 Mar 2021 12:27:48 +0000 (13:27 +0100)] 
ruleset-sources: Rename file to plain.

This is used if a provider offers a plain rulefile instead an archive.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Allow downloadruleset() function to deal with
Stefan Schantl [Fri, 26 Mar 2021 12:24:26 +0000 (13:24 +0100)] 
ids-functions.pl: Allow downloadruleset() function to deal with
multiple ruleset providers.

When calling the function now a single ruleset provider handle
can be specified to only download this ruleset or by adding "all" or
leaving the handle blank a download of all configured rulesets can be
triggered.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Introduce private _get_dl_rulesfile() function.
Stefan Schantl [Fri, 26 Mar 2021 12:19:58 +0000 (13:19 +0100)] 
ids-functions.pl: Introduce private _get_dl_rulesfile() function.

This function can be used to generate/get the absolute file and path
for a given ruleset provider.

The files will be stored in the usual "/var/tmp" folder with a new
file format based on the dl_file type and the provider.

Examples could be:
* /var/ipfire/idsrules-emerging.tar.gz
* /var/ipfire/idsrules-registered.tar.gz
* /var/ipfire/idsrules-somprovider.rules

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Run in perl strict mode.
Stefan Schantl [Fri, 26 Mar 2021 12:17:59 +0000 (13:17 +0100)] 
ids-functions.pl: Run in perl strict mode.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoruleset-sources: Fix website url for community ruleset.
Stefan Schantl [Fri, 26 Mar 2021 12:16:40 +0000 (13:16 +0100)] 
ruleset-sources: Fix website url for community ruleset.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoruleset-sources: Replace subscription code placeholder.
Stefan Schantl [Fri, 26 Mar 2021 12:15:04 +0000 (13:15 +0100)] 
ruleset-sources: Replace subscription code placeholder.

Replace the <oinkcode> placeholder by the more generic
<subscription_code>.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Add code to handle enable/disable a provider.
Stefan Schantl [Tue, 23 Mar 2021 16:42:07 +0000 (17:42 +0100)] 
ids.cgi: Add code to handle enable/disable a provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Add code to handle enable/disable autoupdate for a provider.
Stefan Schantl [Tue, 23 Mar 2021 16:40:44 +0000 (17:40 +0100)] 
ids.cgi: Add code to handle enable/disable autoupdate for a provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Fix type in method.
Stefan Schantl [Tue, 23 Mar 2021 16:40:12 +0000 (17:40 +0100)] 
ids.cgi: Fix type in method.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Remove accidently commited commented code snipped.
Stefan Schantl [Tue, 23 Mar 2021 16:39:32 +0000 (17:39 +0100)] 
ids.cgi: Remove accidently commited commented code snipped.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Correctly use "enabled" for checked checkboxes.
Stefan Schantl [Tue, 23 Mar 2021 16:38:26 +0000 (17:38 +0100)] 
ids.cgi: Correctly use "enabled" for checked checkboxes.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Read-in providers settings file when neccessary.
Stefan Schantl [Tue, 23 Mar 2021 16:37:33 +0000 (17:37 +0100)] 
ids.cgi: Read-in providers settings file when neccessary.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Add code to add/edit a ruleset provider.
Stefan Schantl [Tue, 23 Mar 2021 15:20:52 +0000 (16:20 +0100)] 
ids.cgi: Add code to add/edit a ruleset provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoUpdate language files.
Stefan Schantl [Tue, 23 Mar 2021 15:20:17 +0000 (16:20 +0100)] 
Update language files.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Introduce providers_settings_file.
Stefan Schantl [Tue, 23 Mar 2021 13:58:09 +0000 (14:58 +0100)] 
ids-functions.pl: Introduce providers_settings_file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Rework rulesetsettings section.
Stefan Schantl [Tue, 23 Mar 2021 13:56:11 +0000 (14:56 +0100)] 
ids.cgi: Rework rulesetsettings section.

* The page and section now supports multiple ruleset providers at once.
* Adding / Editing a ruleset provider has been moved to a own sub-page.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoruleset-sources: Fix website details for emergingthreats provider.
Stefan Schantl [Tue, 23 Mar 2021 11:39:13 +0000 (12:39 +0100)] 
ruleset-sources: Fix website details for emergingthreats provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Move configuration of ruleset autoupdate intervall to IDS main
Stefan Schantl [Mon, 22 Mar 2021 15:27:33 +0000 (16:27 +0100)] 
ids.cgi: Move configuration of ruleset autoupdate intervall to IDS main
section.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Stop showing ruleset date on customize rulest sub-page.
Stefan Schantl [Mon, 22 Mar 2021 13:42:42 +0000 (14:42 +0100)] 
ids.cgi: Stop showing ruleset date on customize rulest sub-page.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Add "Back" button to customize ruleset sub-page.
Stefan Schantl [Mon, 22 Mar 2021 10:48:58 +0000 (11:48 +0100)] 
ids.cgi: Add "Back" button to customize ruleset sub-page.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Move / Splitt main page and customize ruleset subpage.
Stefan Schantl [Sun, 21 Mar 2021 20:41:42 +0000 (21:41 +0100)] 
ids.cgi: Move / Splitt main page and customize ruleset subpage.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Only read-in ruleset if neccessary.
Stefan Schantl [Sun, 21 Mar 2021 16:22:29 +0000 (17:22 +0100)] 
ids.cgi: Only read-in ruleset if neccessary.

This process takes some time, especially on huge rulesets.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Add button to customize the ruleset.
Stefan Schantl [Sun, 21 Mar 2021 16:17:05 +0000 (17:17 +0100)] 
ids.cgi: Add button to customize the ruleset.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Introduce and use get_provider_name() function.
Stefan Schantl [Sat, 20 Mar 2021 17:07:57 +0000 (18:07 +0100)] 
ids.cgi: Introduce and use get_provider_name() function.

This function is used to grab the name of a provider by the given
handle.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Move the section to customize the IDS ruleset to a function.
Stefan Schantl [Sat, 20 Mar 2021 15:58:11 +0000 (16:58 +0100)] 
ids.cgi: Move the section to customize the IDS ruleset to a function.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Remove unused rulesetsources hashes.
Stefan Schantl [Sat, 20 Mar 2021 15:54:37 +0000 (16:54 +0100)] 
ids.cgi: Remove unused rulesetsources hashes.

They have been superseeded by the new ruleset sources file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Require ruleset-sources file for provider details.
Stefan Schantl [Sat, 20 Mar 2021 14:57:51 +0000 (15:57 +0100)] 
ids-functions.pl: Require ruleset-sources file for provider details.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids.cgi: Make CGI work with new ruleset-sources file.
Stefan Schantl [Fri, 19 Mar 2021 20:28:00 +0000 (21:28 +0100)] 
ids.cgi: Make CGI work with new ruleset-sources file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Add get_ruleset_providers() function.
Stefan Schantl [Fri, 19 Mar 2021 20:27:23 +0000 (21:27 +0100)] 
ids-functions.pl: Add get_ruleset_providers() function.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoids-functions.pl: Make downloader work with new ruleset-sources file
Stefan Schantl [Fri, 19 Mar 2021 20:26:44 +0000 (21:26 +0100)] 
ids-functions.pl: Make downloader work with new ruleset-sources file
format.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoruleset-sources: Rework file format and data.
Stefan Schantl [Fri, 19 Mar 2021 20:24:36 +0000 (21:24 +0100)] 
ruleset-sources: Rework file format and data.

The file now contains a lot more of data and easily can be extended
to provide more and new providers.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
Stefan Schantl [Sun, 19 Dec 2021 12:19:03 +0000 (13:19 +0100)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

3 years agoCore Update 163: Ship updated CA certificates
Peter Müller [Sun, 19 Dec 2021 10:40:17 +0000 (11:40 +0100)] 
Core Update 163: Ship updated CA certificates

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoupdate ca-certificates CA bundle
Peter Müller [Sat, 18 Dec 2021 13:01:09 +0000 (14:01 +0100)] 
update ca-certificates CA bundle

Update the CA certificates list to what Mozilla NSS ships currently.

The original file can be retrieved from:
https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/builtins/certdata.txt

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoTor: update to 0.4.6.9
Peter Müller [Sat, 18 Dec 2021 16:23:58 +0000 (17:23 +0100)] 
Tor: update to 0.4.6.9

Full changelog as per https://gitweb.torproject.org/tor.git/plain/ChangeLog:

Changes in version 0.4.6.9 - 2021-12-15
  This version fixes several bugs from earlier versions of Tor. One important
  piece is the removal of DNS timeout metric from the overload general signal.
  See below for more details.

  o Major bugfixes (relay, overload):
    - Don't make Tor DNS timeout trigger an overload general state.
      These timeouts are different from DNS server timeout. They have to
      be seen as timeout related to UX and not because of a network
      problem. Fixes bug 40527; bugfix on 0.4.6.1-alpha.

  o Minor feature (reproducible build):
    - The repository can now build reproducible tarballs which adds the
      build command "make dist-reprod" for that purpose. Closes
      ticket 26299.

  o Minor features (compilation):
    - Give an error message if trying to build with a version of
      LibreSSL known not to work with Tor. (There's an incompatibility
      with LibreSSL versions 3.2.1 through 3.4.0 inclusive because of
      their incompatibility with OpenSSL 1.1.1's TLSv1.3 APIs.) Closes
      ticket 40511.

  o Minor features (fallbackdir):
    - Regenerate fallback directories generated on December 15, 2021.

  o Minor features (geoip data):
    - Update the geoip files to match the IPFire Location Database, as
      retrieved on 2021/12/15.

  o Minor bugfixes (compilation):
    - Fix our configuration logic to detect whether we had OpenSSL 3:
      previously, our logic was reversed. This has no other effect than
      to change whether we suppress deprecated API warnings. Fixes bug
      40429; bugfix on 0.3.5.13.

  o Minor bugfixes (relay):
    - Reject IPv6-only DirPorts. Our reachability self-test forces
      DirPorts to be IPv4, but our configuration parser allowed them to
      be IPv6-only, which led to an assertion failure. Fixes bug 40494;
      bugfix on 0.4.5.1-alpha.

  o Documentation (man, relay):
    - Missing "OverloadStatistics" in tor.1 manpage. Fixes bug 40504;
      bugfix on 0.4.6.1-alpha.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoMerge branch 'next' into temp-c163-development
Peter Müller [Fri, 17 Dec 2021 10:30:41 +0000 (11:30 +0100)] 
Merge branch 'next' into temp-c163-development

3 years agosuricata: Do not load rules for dnp3 and modbus.
Stefan Schantl [Thu, 16 Dec 2021 19:23:36 +0000 (20:23 +0100)] 
suricata: Do not load rules for dnp3 and modbus.

The parsers for those are disabled in the suricata config so
the rules are not needed, on the contrary they massively will spam
warnings when launching suricate because of the disabled parsers.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
3 years agosuricata: Do not load rules for dnp3 and modbus.
Stefan Schantl [Thu, 16 Dec 2021 19:04:41 +0000 (20:04 +0100)] 
suricata: Do not load rules for dnp3 and modbus.

The parsers for those are disabled in the suricata config so
the rules are not needed, on the contrary they massively will spam
warnings when launching suricate because of the disabled parsers.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
Stefan Schantl [Thu, 16 Dec 2021 19:00:18 +0000 (20:00 +0100)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

3 years agoCore Update 163: Ship backup.pl
Peter Müller [Tue, 14 Dec 2021 13:40:58 +0000 (14:40 +0100)] 
Core Update 163: Ship backup.pl

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agobackup: Fork ISO job into the background in CGI script
Michael Tremer [Thu, 2 Dec 2021 12:37:15 +0000 (12:37 +0000)] 
backup: Fork ISO job into the background in CGI script

In order to be able to run the ISO command on command line it is helpful
that the script does not go into background halfway through the process.

We should rather start it as a background job straight from the CGI
script.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agobackup: Create tarball in one pass
Michael Tremer [Thu, 2 Dec 2021 12:37:14 +0000 (12:37 +0000)] 
backup: Create tarball in one pass

This patch is changing the behaviour of the backup script so that it
creates one tarball and compresses it in one go.

This will save storing the original tarball on disk before compressing
it which on my test system requires significant disk space.

This patch also solves a bug where the backup file included with the ISO
image could not be extracted because it was not gzip-compressed when it
was expected to be.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agobackup: Use filename as specified on console
Michael Tremer [Thu, 2 Dec 2021 12:37:13 +0000 (12:37 +0000)] 
backup: Use filename as specified on console

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoCore Update 163: Ship libloc
Peter Müller [Tue, 14 Dec 2021 09:46:25 +0000 (10:46 +0100)] 
Core Update 163: Ship libloc

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agolibloc: Update to 0.9.9
Peter Müller [Mon, 13 Dec 2021 19:09:13 +0000 (20:09 +0100)] 
libloc: Update to 0.9.9

Please refer to https://lists.ipfire.org/pipermail/location/2021-November/000483.html
for this versions' release announcement.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoCore Update 163: Ship and restart Unbound
Peter Müller [Mon, 13 Dec 2021 11:54:19 +0000 (12:54 +0100)] 
Core Update 163: Ship and restart Unbound

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agounbound: Update to 1.14.0
Matthias Fischer [Sat, 11 Dec 2021 07:38:17 +0000 (08:38 +0100)] 
unbound: Update to 1.14.0

For details see:
https://nlnetlabs.nl/projects/unbound/download/#unbound-1-14-0

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoMerge branch 'next' into temp-c163-development
Peter Müller [Mon, 13 Dec 2021 11:51:26 +0000 (12:51 +0100)] 
Merge branch 'next' into temp-c163-development

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agosuricata: Disable sid 2210059.
Stefan Schantl [Wed, 8 Dec 2021 17:18:05 +0000 (18:18 +0100)] 
suricata: Disable sid 2210059.

This rule emits a massive logspam and temporary will be disabled until
a better solution is found.

Fixes #12738.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
3 years agosuricata: Cleanup default loaded rules file.
Stefan Schantl [Wed, 8 Dec 2021 17:10:31 +0000 (18:10 +0100)] 
suricata: Cleanup default loaded rules file.

There are no such rules file available and therefore cannot be loaded.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
3 years agosuricata: Move default loaded rulefiles to own included file.
Stefan Schantl [Wed, 8 Dec 2021 17:10:30 +0000 (18:10 +0100)] 
suricata: Move default loaded rulefiles to own included file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Acked-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
3 years agopcengines-apu-firmware: Update to version 4.15.0.1
Adolf Belka [Mon, 6 Dec 2021 17:01:32 +0000 (18:01 +0100)] 
pcengines-apu-firmware: Update to version 4.15.0.1

- Update from 4.14.0.4 to 4.15.0.1
- Update of rootfile
- Changelog
    v4.15.0.1
        rebased with official coreboot repository commit 6973a3e7
    v4.14.0.6
        rebased with official coreboot repository commit d06c0917
        Re-added GPIO bindings to fix LED and button functionality
    v4.14.0.5
        rebased with official coreboot repository commit d4c55353
        Updated CPU declarations in ACPI to comply with newer ACPI standard
        Removed GPIO bindings to fix conflict with OS drivers

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
3 years agomanualpages: Complete the list of user manual pages
Jon Murphy [Sat, 4 Dec 2021 23:46:20 +0000 (00:46 +0100)] 
manualpages: Complete the list of user manual pages

Jon Murphy gathered all the links and made the updated file
available on the mailing list:
https://lists.ipfire.org/pipermail/development/2021-October/011383.html
https://lists.ipfire.org/pipermail/development/2021-December/011737.html

With kind permission from him, this patch contains the completed list.
The list was successfully checked with "./make.sh check-manualpages".

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Reported-by: Jon Murphy <jcmurphy26@gmail.com>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
3 years agoCore Update 163: Ship pango, harfbuzz and fribidi
Peter Müller [Thu, 9 Dec 2021 20:08:54 +0000 (21:08 +0100)] 
Core Update 163: Ship pango, harfbuzz and fribidi

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agofribidi: New dependency for pango
Adolf Belka [Mon, 6 Dec 2021 17:02:05 +0000 (18:02 +0100)] 
fribidi: New dependency for pango

- v3 version uses newer version of fribidi
- lfs file created
- rootfile created

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoharfbuzz: New dependency for pango
Adolf Belka [Mon, 6 Dec 2021 17:02:04 +0000 (18:02 +0100)] 
harfbuzz: New dependency for pango

- v3 version has newer harfbuzz version
- lfs file created
- rootfile created

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopango: Update to version 1.50.0
Adolf Belka [Mon, 6 Dec 2021 17:02:03 +0000 (18:02 +0100)] 
pango: Update to version 1.50.0

- v3 version has updated pango version
- Update from 1.30.1 (2012) to 1.50.0 (2021)
- Update of rootfile - Pango modules, engines, and config have been removed (#733882) in
   version 1.37.0 in 2014.
- pango now has dependencies of harfbuzz and fribidi so patches for these two are
   included in the following two patches for this series.
- make.sh modified to include
   build of these two packages before pango is built
- Build is done via meson/ninja now
- Changelog is too large to show here but the details can be found in the NEWS file in
   the source tarball.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopcengines-apu-firmware: Update to version 4.15.0.1
Adolf Belka [Mon, 6 Dec 2021 17:01:32 +0000 (18:01 +0100)] 
pcengines-apu-firmware: Update to version 4.15.0.1

- Update from 4.14.0.4 to 4.15.0.1
- Update of rootfile
- Changelog
    v4.15.0.1
        rebased with official coreboot repository commit 6973a3e7
    v4.14.0.6
        rebased with official coreboot repository commit d06c0917
        Re-added GPIO bindings to fix LED and button functionality
    v4.14.0.5
        rebased with official coreboot repository commit d4c55353
        Updated CPU declarations in ACPI to comply with newer ACPI standard
        Removed GPIO bindings to fix conflict with OS drivers

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agofindutils: Create /var/lib/locate
Michael Tremer [Tue, 7 Dec 2021 15:36:50 +0000 (15:36 +0000)] 
findutils: Create /var/lib/locate

This is required for updatedb to store its data.

Fixes: #12670
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 163: Ship Bash
Peter Müller [Thu, 9 Dec 2021 20:00:14 +0000 (21:00 +0100)] 
Core Update 163: Ship Bash

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agobash: Update to version 5.1.8 plus patches 9 to 12
Adolf Belka [Mon, 6 Dec 2021 21:06:35 +0000 (22:06 +0100)] 
bash: Update to version 5.1.8 plus patches 9 to 12

- Update main file from 5.1 to 5.1.8 (includes patches 1 to 8)
- Remove patches 1 to 4
- Changelog - Patches 1 to 4 from the previous IPFire version together with patches 5 to
     8 are now included into bash-5.1.8 followed by application of patches 9 to 12
   Patch 12
    There is a possible race condition that arises when a child process receives
     a signal trapped by the parent before it can reset the signal dispositions.
     The child process is not supposed to trap the signal in this circumstance.
   Patch 11
    When reading a compound assignment, and running it through the parser to
     split it into words, we need to save and restore any alias we're currently
     expanding.
   Patch 10
    If `wait -n' is interrupted by a trapped signal other than SIGINT, it does
     not completely clean up state, and that can prevent subsequent calls to
     `wait -n' from working correctly.
   Patch 9
    The bash malloc implementation of malloc_usable_size() does not follow the
     specification. This can cause library functions that use it to overwrite
     memory bounds checking.
   Patch 8
    Process substitution FIFOs opened by child processes as targets of redirections
     were not removed appropriately, leaving remnants in the file system.
   Patch 7
    The code to check readline versions in an inputrc file had the sense of the
     comparisons reversed.
   Patch 6
    Make sure child processes forked to run command substitutions are in the
     proper process group.
   Patch 5
    Fix two memory leaks when assigning arrays using compound assignment syntax.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Acked-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 163: Ship and restart SysVinit
Peter Müller [Thu, 9 Dec 2021 19:50:29 +0000 (20:50 +0100)] 
Core Update 163: Ship and restart SysVinit

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agosysvinit: Update to version 3.00
Adolf Belka [Wed, 1 Dec 2021 12:30:23 +0000 (13:30 +0100)] 
sysvinit: Update to version 3.00

- Update from 2.99 to 3.00
- Update of rootfile not required
- Changelog
   sysvinit (3.00) released; urgency=low
    * Applied patch from Matthias Schiffer which allows bootlogd to read from
      a wider range of consoles. The console name is already passed in from the
      kernel command line using "console=". We no longer filter out names as strictly
      but do now check to confirm the "console=" device points to a valid TTY.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agohtop: Update to version 3.1.2
Adolf Belka [Tue, 7 Dec 2021 17:36:15 +0000 (18:36 +0100)] 
htop: Update to version 3.1.2

- Update from 3.1.1 to 3.1.2
- Update of rootfile not required
- Changelog
   version 3.1.2
     * Bugfix for crash when storing modified settings at exit
     * Generate xz-compressed source tarball (with configure) using github actions
     * Allow -u UID with numerical value as argument
     * Added documentation for obsolete/state libraries/program files highlighting
     * Some obsolete/stale library highlighting refinements
     * Column width issues resolved
     * Dynamic UID column sizing improved
     * Discard stale information from Disk and Network I/O meters
     * Refined Linux kernel thread detection
     * Reworked process state handling
     * New CCGROUP column showing abbreviated cgroup name
     * New OFFSET column in the list of open files screen

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agogit: Update version to 2.34.1
Adolf Belka [Tue, 7 Dec 2021 17:35:58 +0000 (18:35 +0100)] 
git: Update version to 2.34.1

- Update from 2.33.1 to 2.34.1
- Update of rootfile - The "--preserve-merges" option of "git rebase" has been removed.
- Changelog is too large to include here.
   The changes for version 2.34.0 can be found in the source tarball in
   Documentation/RelNotes/2.34.0.txt and for version 2.34.1 in
   Documentation/RelNotes/2.34.1.txt

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoperl-Date-Manip: Update to version 6.86
Adolf Belka [Tue, 7 Dec 2021 17:36:32 +0000 (18:36 +0100)] 
perl-Date-Manip: Update to version 6.86

- Update from 6.85 to 6.86
- Update of rootfile
- Changelog
   6.86  2021-11-15
     -Change warn to carp
         All warnings are now issued with the carp command rather than warn.
         Requested in GitHup pull request #18, but that request was not used
         because it only changed the uses in the Date::Manip::Date module.
     -Bug fixes
         Fixed a bug where the next/prev Date::Manip::Recur methods gave
         incorrect results when there are no dates that match the criteria.
         (GitHub #36)
     -Time zone fixes
         There were no new timezone fixes on 2021-06-01 or 2021-09-01, so no
         releases made then.
         Newest zoneinfo data (tzdata 2021e). (GitHub #37)

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agosdl2: Update to version 2.0.18
Adolf Belka [Tue, 7 Dec 2021 17:36:56 +0000 (18:36 +0100)] 
sdl2: Update to version 2.0.18

- Update from 2.0.16 to 2.0.18
- Update of rootfile
- Changelog
   2.0.18
    General:
     * The SDL wiki documentation and development headers are automatically kept in sync
     * Each function has information about in which version of SDL it was introduced
     * Added the hint SDL_HINT_APP_NAME to let SDL know the name of your application for
       various places it might show up in system information
     * Added SDL_RenderGeometry() and SDL_RenderGeometryRaw() to allow rendering of
       arbitrary shapes using the SDL 2D render API
     * Added SDL_SetTextureUserData() and SDL_GetTextureUserData() to associate
       application data with an SDL texture
     * Added SDL_RenderWindowToLogical() and SDL_RenderLogicalToWindow() to convert
       between window coordinates and logical render coordinates
     * Added SDL_RenderSetVSync() to change whether a renderer present is synchronized
       with vblank at runtime
     * Added SDL_PremultiplyAlpha() to premultiply alpha on a block of
       SDL_PIXELFORMAT_ARGB8888 pixels
     * Added a window event SDL_WINDOWEVENT_DISPLAY_CHANGED which is sent when a window
       changes what display it's centered on
     * Added SDL_GetWindowICCProfile() to query a window's ICC profile, and a window
       event SDL_WINDOWEVENT_ICCPROF_CHANGED that is sent when it changes
     * Added the hint SDL_HINT_VIDEO_EGL_ALLOW_TRANSPARENCY to allow EGL windows to be
       transparent instead of opaque
     * SDL_WaitEvent() has been redesigned to use less CPU in most cases
     * Added SDL_SetWindowMouseRect() and SDL_GetWindowMouseRect() to confine the mouse
       cursor to an area of a window
     * You can now read precise mouse wheel motion using 'preciseX' and 'preciseY' event
       fields
     * Added SDL_GameControllerHasRumble() and SDL_GameControllerHasRumbleTriggers() to
       query whether a game controller supports rumble
     * Added SDL_JoystickHasRumble() and SDL_JoystickHasRumbleTriggers() to query whether
       a joystick supports rumble
     * SDL's hidapi implementation is now available as a public API in SDL_hidapi.h
    Windows:
     * Improved relative mouse motion over Windows Remote Desktop
     * Added the hint SDL_HINT_IME_SHOW_UI to show native UI components instead of hiding
       them (defaults off)
    Windows/UWP:
     * WGI is used instead of XInput for better controller support in UWP apps
    Linux:
     * Added the hint SDL_HINT_SCREENSAVER_INHIBIT_ACTIVITY_NAME to set the activity
       that's displayed by the system when the screensaver is disabled
     * Added the hint SDL_HINT_LINUX_JOYSTICK_CLASSIC to control whether /dev/input/js*
       or /dev/input/event* are used as joystick devices
     * Added the hint SDL_HINT_JOYSTICK_DEVICE to allow the user to specify devices that
       will be opened in addition to the normal joystick detection
     * Added SDL_LinuxSetThreadPriorityAndPolicy() for more control over a thread
       priority on Linux
    Android:
     * Added support for audio output and capture using AAudio on Android 8.1 and newer
     * Steam Controller support is disabled by default, and can be enabled by setting the
       hint SDL_HINT_JOYSTICK_HIDAPI_STEAM to "1" before calling SDL_Init()
    Apple Arcade:
     * Added SDL_GameControllerGetAppleSFSymbolsNameForButton() and
       SDL_GameControllerGetAppleSFSymbolsNameForAxis() to support Apple Arcade titles
    iOS:
     * Added documentation that the UIApplicationSupportsIndirectInputEvents key must be
       set to true in your application's Info.plist in order to get real Bluetooth mouse
       events.
     * Steam Controller support is disabled by default, and can be enabled by setting the
       hint SDL_HINT_JOYSTICK_HIDAPI_STEAM to "1" before calling SDL_Init()

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
Stefan Schantl [Wed, 8 Dec 2021 16:03:31 +0000 (17:03 +0100)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

3 years agoinstaller: add network phy kernel modules to rd
Arne Fitzenreiter [Mon, 6 Dec 2021 12:24:56 +0000 (12:24 +0000)] 
installer: add network phy kernel modules to rd

network for download the sources has not worked with some nic's
like realtek 8169 because the phy driver was missing.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
3 years agoGRUB: fix rootfile for x86_64 and aarch64
Peter Müller [Sun, 5 Dec 2021 10:44:58 +0000 (11:44 +0100)] 
GRUB: fix rootfile for x86_64 and aarch64

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoutil-linux: fix rootfile
Peter Müller [Sun, 5 Dec 2021 10:42:51 +0000 (11:42 +0100)] 
util-linux: fix rootfile

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoOpenSSL: fix rootfile
Peter Müller [Sun, 5 Dec 2021 10:39:47 +0000 (11:39 +0100)] 
OpenSSL: fix rootfile

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agomanualpages: Complete the list of user manual pages
Jon Murphy [Sat, 4 Dec 2021 23:46:20 +0000 (00:46 +0100)] 
manualpages: Complete the list of user manual pages

Jon Murphy gathered all the links and made the updated file
available on the mailing list:
https://lists.ipfire.org/pipermail/development/2021-October/011383.html
https://lists.ipfire.org/pipermail/development/2021-December/011737.html

With kind permission from him, this patch contains the completed list.
The list was successfully checked with "./make.sh check-manualpages".

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Reported-by: Jon Murphy <jcmurphy26@gmail.com>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoRevert "Revert "qemu: Update to version 6.1.0""
Peter Müller [Sat, 4 Dec 2021 22:27:45 +0000 (23:27 +0100)] 
Revert "Revert "qemu: Update to version 6.1.0""

This reverts commit dbfd6392927568e2b7fdcfdb0ebe77e152a2163d.

3 years agoDrop support for i586
Michael Tremer [Thu, 2 Dec 2021 15:40:01 +0000 (15:40 +0000)] 
Drop support for i586

This patch removes support for i586 according to the decision being
taken over a year ago.

It removes the architecture from the build system and removes all
required hacks and other quirks that have been necessary before.

There is no need to ship any changed files to the remaining
architectures as the removed code branches have not been used.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>