Commit Graph

9616 Commits

Author SHA1 Message Date
Stefan Schantl
b953677b0d 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>
2021-12-19 13:22:59 +01:00
Stefan Schantl
6c9d3eeef2 ids-functions.pl: Assign temporary rules and conf path to variables.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2021-12-19 13:22:59 +01:00
Stefan Schantl
8bd74e12a9 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>
2021-12-19 13:22:59 +01:00
Stefan Schantl
8335286b38 ids-functions.pl: Fix typo.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2021-12-19 13:22:59 +01:00
Stefan Schantl
23b560529a 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>
2021-12-19 13:22:59 +01:00
Stefan Schantl
0fbfffea91 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>
2021-12-19 13:22:59 +01:00
Stefan Schantl
ae22613224 ids-functions.pl: Always delete temporary file.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2021-12-19 13:22:59 +01:00
Stefan Schantl
2c02c93607 ids-functions.pl: Fix typo.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2021-12-19 13:22:59 +01:00
Stefan Schantl
caae0cf5e3 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>
2021-12-19 13:22:59 +01:00
Stefan Schantl
b3c2c3364d 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>
2021-12-19 13:22:59 +01:00
Stefan Schantl
788a71f51e 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>
2021-12-19 13:22:59 +01:00
Stefan Schantl
e55fa2f745 ids-functions.pl: Run in perl strict mode.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2021-12-19 13:22:59 +01:00
Stefan Schantl
b5350c4d6e ruleset-sources: Fix website url for community ruleset.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2021-12-19 13:22:59 +01:00
Stefan Schantl
923a644107 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>
2021-12-19 13:22:59 +01:00
Stefan Schantl
a8d36d3e1f ids-functions.pl: Introduce providers_settings_file.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2021-12-19 13:22:58 +01:00
Stefan Schantl
a49a30d1ba ruleset-sources: Fix website details for emergingthreats provider.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2021-12-19 13:22:58 +01:00
Stefan Schantl
4e4c3f1459 ids-functions.pl: Require ruleset-sources file for provider details.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2021-12-19 13:21:51 +01:00
Stefan Schantl
70cc13158d ids-functions.pl: Add get_ruleset_providers() function.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2021-12-19 13:21:51 +01:00
Stefan Schantl
179b75107e ids-functions.pl: Make downloader work with new ruleset-sources file
format.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2021-12-19 13:21:51 +01:00
Stefan Schantl
5e891296f0 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>
2021-12-19 13:21:51 +01:00
Peter Müller
5cb56f865d Core Update 163: Ship updated CA certificates
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2021-12-19 11:40:17 +01:00
Peter Müller
5556965d50 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>
2021-12-19 11:39:54 +01:00
Peter Müller
e19e5722a6 Merge branch 'next' into temp-c163-development 2021-12-17 11:30:41 +01:00
Stefan Schantl
68b5761089 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>
2021-12-17 08:06:26 +00:00
Stefan Schantl
d088562406 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>
2021-12-16 20:04:41 +01:00
Peter Müller
bc95a6cc00 Core Update 163: Ship backup.pl
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2021-12-14 14:40:58 +01:00
Michael Tremer
45a5df5a5e 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>
2021-12-14 14:39:26 +01:00
Michael Tremer
51ed815f5e 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>
2021-12-14 14:39:21 +01:00
Michael Tremer
d9db91609f backup: Use filename as specified on console
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-12-14 14:39:17 +01:00
Peter Müller
26d23790c7 Core Update 163: Ship libloc
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2021-12-14 10:46:25 +01:00
Peter Müller
b894c8aa56 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>
2021-12-14 10:45:43 +01:00
Peter Müller
84f9776a8f Core Update 163: Ship and restart Unbound
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2021-12-13 12:54:19 +01:00
Matthias Fischer
09b05f200c 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>
2021-12-13 12:53:04 +01:00
Peter Müller
d01b47b771 Merge branch 'next' into temp-c163-development
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2021-12-13 12:51:26 +01:00
Stefan Schantl
f23e0e5a7f 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>
2021-12-11 09:49:41 +00:00
Stefan Schantl
74070fe153 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>
2021-12-11 09:49:22 +00:00
Adolf Belka
3b1482e939 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>
2021-12-11 09:46:12 +00:00
Jon Murphy
ccf19569ab 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>
2021-12-11 09:45:27 +00:00
Peter Müller
3a5b2f68ec Core Update 163: Ship pango, harfbuzz and fribidi
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2021-12-09 21:08:54 +01:00
Adolf Belka
4fdddd30dd 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>
2021-12-09 21:08:10 +01:00
Adolf Belka
295985c800 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>
2021-12-09 21:08:06 +01:00
Adolf Belka
0de1daf3bb 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>
2021-12-09 21:08:00 +01:00
Adolf Belka
f481a92f8d 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>
2021-12-09 21:06:33 +01:00
Michael Tremer
2b676f2e42 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>
2021-12-09 21:04:50 +01:00
Peter Müller
2128915b51 Core Update 163: Ship Bash
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2021-12-09 21:00:14 +01:00
Peter Müller
f67ee6604d Core Update 163: Ship and restart SysVinit
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2021-12-09 20:50:29 +01:00
Adolf Belka
b644a33fab 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>
2021-12-09 20:45:03 +01:00
Adolf Belka
5cc4c220ca 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>
2021-12-09 20:44:32 +01:00
Adolf Belka
c796dab693 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>
2021-12-09 20:44:10 +01:00
Peter Müller
764323af9d GRUB: fix rootfile for x86_64 and aarch64
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2021-12-05 11:44:58 +01:00