* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 258c24466c5c88ceac576f9b22dd94dd0a4682e6
@ 2025-10-07 15:30 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2025-10-07 15:30 UTC (permalink / raw)
To: ipfire-scm
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 28403 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 258c24466c5c88ceac576f9b22dd94dd0a4682e6 (commit)
via c1618483dec4b1421106b8f42cdeaa3d779175b8 (commit)
via 68063bc7e7878c60dfc5c736a5b07b0e8f31ad43 (commit)
via c3b8ba152daf7ba6faa99d307d87b2f8eb85cfcb (commit)
via b2d0c37b2dea283a551a9609c0aa90eac17afe58 (commit)
via 1081a699c68ba4d2aa39aee21607767208565382 (commit)
via 4290085d84bf2f8986b5f36045989a048f5a6e00 (commit)
via 1370241b59a4a124c3009455890aa3cc2aafee09 (commit)
via be69dd03ad9b268c10e29533fd91462d3172ebb2 (commit)
via 25a006fd6cd06e559fbc913d31d4662b6831e2ac (commit)
via 3d5dba3246228752368ac2ec73acf86101bdd754 (commit)
via 59483455455219323fc1e7d7804e99acf7545086 (commit)
via 54e9e66841b8fc97dd46ba419228c3fb6d488b69 (commit)
via 6d107e8683fb816f0f63fd6022b30a277ea9d191 (commit)
via 8726b465430f59a18e3704c47d886662ca59ad22 (commit)
via b46ccb021ed46cac8690c6f16f08f813beb12f5c (commit)
via 9a4fbd0bac49ee76006f732701c6fea8d2338f8a (commit)
via 841d9dab524bfe6572471f4e14b97534e840bed1 (commit)
via 0560cc7c4d06ce05e37c397f38be05907e098601 (commit)
via 3aad228b56bd2a87d3eeca1d027197734e0fac8c (commit)
via 43ce8d752e79453e99fccb33bd8a4176bba4c670 (commit)
via 2398cc431a3fb2cd4141b6a846f0cd0742f6a97c (commit)
via ad995081302f6b28ea11c74e56306d94a7bee076 (commit)
via 0b946b848c72511922fa211b6a4db0da092d204c (commit)
via 9ceb7c7e8b3191109e7dd7c84444dce126996ee2 (commit)
via e6a0ecf248d26c72f015d082e84ecd2772823c08 (commit)
via df17d1adafb5629ecd4d80634002028d7ab4cf58 (commit)
via a31550706f590193f63f2a9c57c943a9ab572642 (commit)
via c431d86ab882f1305f831a37c04491a7ae771e28 (commit)
via fc3f7f4a179b26b6ef255a3ab46b6fe6faf208c9 (commit)
via 7dca07fdcf018320bc10eb4d5fcd019dd1a7029a (commit)
via 32f22c92e19c2d94c5f0b667f27e7a5ccd65ac61 (commit)
via 67db35c8a536b54d169336269853aaa6eae85ab5 (commit)
via 8025aa78fb52933666e13a7e9e782edf4ddf8b42 (commit)
via 8d78fb4b816e032738b08e724d51c200364e5037 (commit)
via dd6d272b6828e443478d2e6e40c1ce19d54f3c2a (commit)
via f04e5fb1c91582d2bfbcdcebfe2aa9a47a5edb43 (commit)
via 0400a1009439d0ffeddb1e449c8bd656341f5f44 (commit)
via eb257423df48f233312d06b2a7cd48cf5dfd21fd (commit)
via a2c624b99dbcecb469e6001505731049ef5cbbd3 (commit)
via 9150cbddeb913ce093f2f7e0669e4a8ab3265bb0 (commit)
via a950be6cd698adb9d16c458c0189c7ec2bf7494c (commit)
via 87ee4f876f329015cc4a4cece800e4744d3f89cb (commit)
from 511ec9136e981a01f7ca8c88409930ce57b7b7e7 (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 258c24466c5c88ceac576f9b22dd94dd0a4682e6
Merge: b2d0c37b2 c1618483d
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue Oct 7 15:30:23 2025 +0000
Merge branch 'master' into next
commit b2d0c37b2dea283a551a9609c0aa90eac17afe58
Merge: 594834554 1081a699c
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue Oct 7 15:10:52 2025 +0000
Merge branch 'master' into next
commit 59483455455219323fc1e7d7804e99acf7545086
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Mon Oct 6 17:32:37 2025 +0200
nasm: Add patch fix for typo in le32toh function name
- nasm failed to build with aarch64 due to a typo in the 3.00 source tarball where
l32toh had been written in bytesex.h instead of le32toh
- This patch includes the fix for that. The applied patch will be able to be removed
when the next release after 3.00 is issued.
- Tested the build on the aarch64 builder and nasm successfully built with the patch
applied.
- Update of rootfile not required
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/backup.pl | 11 +++++
config/etc/group | 2 +-
config/rootfiles/oldcore/198/filelists/files | 2 +
config/rootfiles/oldcore/198/update.sh | 7 ++++
doc/language_issues.de | 1 -
doc/language_issues.en | 1 +
doc/language_issues.es | 1 +
doc/language_issues.fr | 1 +
doc/language_issues.it | 1 +
doc/language_issues.nl | 1 +
doc/language_issues.pl | 1 +
doc/language_issues.ru | 1 +
doc/language_issues.tr | 1 +
doc/language_issues.tw | 1 +
doc/language_issues.zh | 1 +
doc/language_missings | 30 ++++++++++++++
html/cgi-bin/logs.cgi/ids.dat | 48 +++++++++++++++++++++-
langs/de/cgi-bin/de.pl | 2 +-
langs/en/cgi-bin/en.pl | 3 ++
lfs/dma | 3 +-
lfs/nasm | 1 +
lfs/suricata-reporter | 4 +-
...sm-3.00_fix_typo_in_le32toh_function_name.patch | 20 +++++++++
23 files changed, 137 insertions(+), 7 deletions(-)
create mode 100644 src/patches/nasm-3.00_fix_typo_in_le32toh_function_name.patch
Difference in files:
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 8988427eae..9a54b50d3c 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -358,6 +358,17 @@ restore_backup() {
/etc/init.d/openvpn-n2n restart
/etc/init.d/openvpn-rw restart
+ #
+ # Core Update 198
+ #
+
+ # Add the suricata user to the mail group
+ usermod -a -G mail suricata
+
+ # Change ownership & permissions of auth.conf
+ chmod 640 /var/ipfire/dma/auth.conf
+ chown nobody:mail /var/ipfire/dma/auth.conf
+
return 0
}
diff --git a/config/etc/group b/config/etc/group
index f1767b30cd..1264c43c6c 100644
--- a/config/etc/group
+++ b/config/etc/group
@@ -8,7 +8,7 @@ lp:x:7:daemon
mem:x:8:
kmem:x:9:
wheel:x:10:root
-mail:x:12:mail
+mail:x:12:mail,suricata
uucp:x:14:
dialout:x:16:nobody
floppy:x:19:
diff --git a/config/rootfiles/oldcore/198/filelists/files b/config/rootfiles/oldcore/198/filelists/files
index ff40a305f9..adf18e482f 100644
--- a/config/rootfiles/oldcore/198/filelists/files
+++ b/config/rootfiles/oldcore/198/filelists/files
@@ -1,3 +1,5 @@
+etc/rc.d/init.d/cleanfs
etc/rc.d/init.d/suricata
var/ipfire/graphs.pl
+var/ipfire/header.pl
var/ipfire/ids-functions.pl
diff --git a/config/rootfiles/oldcore/198/update.sh b/config/rootfiles/oldcore/198/update.sh
index e258f65d7f..bb08f493eb 100644
--- a/config/rootfiles/oldcore/198/update.sh
+++ b/config/rootfiles/oldcore/198/update.sh
@@ -46,6 +46,13 @@ if ! [ -d "/var/run/suricata" ]; then
chown suricata:suricata /var/run/suricata
fi
+# Add the suricata user to the mail group
+usermod -a -G mail suricata
+
+# Change ownership & permissions of auth.conf
+chmod 640 /var/ipfire/dma/auth.conf
+chown nobody:mail /var/ipfire/dma/auth.conf
+
# update linker config
ldconfig
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 17bf63cce0..ed9c204494 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -390,7 +390,6 @@ WARNING: translation string unused: generate
WARNING: translation string unused: generate tripwire keys and init
WARNING: translation string unused: generatekeys
WARNING: translation string unused: generatepolicy
-WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: genre
WARNING: translation string unused: gpl i accept these terms and conditions
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 4376ec2329..e2f59dd7fd 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -654,6 +654,7 @@ WARNING: untranslated string: download ca certificate = Download CA certificate
WARNING: untranslated string: download certificate = Download file
WARNING: untranslated string: download host certificate = Download host certificate
WARNING: untranslated string: download pkcs12 file = Download PKCS12 file
+WARNING: untranslated string: download report = Download Report
WARNING: untranslated string: download root certificate = Download root certificate
WARNING: untranslated string: download tls-auth key = Download tls-auth key
WARNING: untranslated string: dpd action = Action
diff --git a/doc/language_issues.es b/doc/language_issues.es
index f8a2a6be77..91a2c6b0ce 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1021,6 +1021,7 @@ WARNING: untranslated string: Captive ACTIVATE = unknown string
WARNING: untranslated string: Captive clients = unknown string
WARNING: untranslated string: ca name must only contain characters and spaces = unknown string
WARNING: untranslated string: dns servers = DNS Servers
+WARNING: untranslated string: download report = Download Report
WARNING: untranslated string: enable disable client = unknown string
WARNING: untranslated string: enable disable dyndns = unknown string
WARNING: untranslated string: error message = unknown string
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 61a44ebffd..0f5b04275a 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1003,6 +1003,7 @@ WARNING: untranslated string: configuration file = Configuration File
WARNING: untranslated string: core notice 3 = available.
WARNING: untranslated string: data transfer = Data Transfer
WARNING: untranslated string: done = Done
+WARNING: untranslated string: download report = Download Report
WARNING: untranslated string: enable disable client = unknown string
WARNING: untranslated string: enable disable dyndns = unknown string
WARNING: untranslated string: endpoint = Endpoint
diff --git a/doc/language_issues.it b/doc/language_issues.it
index f40373b1c6..410237c814 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1051,6 +1051,7 @@ WARNING: untranslated string: dnsforward forward_servers = Nameservers
WARNING: untranslated string: done = Done
WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling
WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
+WARNING: untranslated string: download report = Download Report
WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.)
WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians
WARNING: untranslated string: duration = Duration
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 7883673303..a74cb9c912 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1054,6 +1054,7 @@ WARNING: untranslated string: dnssec validating = DNSSEC Validating
WARNING: untranslated string: done = Done
WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling
WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
+WARNING: untranslated string: download report = Download Report
WARNING: untranslated string: download tls-auth key = Download tls-auth key
WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.)
WARNING: untranslated string: drop outgoing = Log dropped outgoing packets
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index ea17e70f0f..df1d6d60ca 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1016,6 +1016,7 @@ WARNING: untranslated string: done = Done
WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling
WARNING: untranslated string: downlink = Downlink
WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
+WARNING: untranslated string: download report = Download Report
WARNING: untranslated string: download tls-auth key = Download tls-auth key
WARNING: untranslated string: dpd delay = Delay
WARNING: untranslated string: dpd timeout = Timeout
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 9fc1cb383e..79592b1cb6 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1014,6 +1014,7 @@ WARNING: untranslated string: done = Done
WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling
WARNING: untranslated string: downlink = Downlink
WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
+WARNING: untranslated string: download report = Download Report
WARNING: untranslated string: download tls-auth key = Download tls-auth key
WARNING: untranslated string: dpd delay = Delay
WARNING: untranslated string: dpd timeout = Timeout
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 724e43cc84..fe18c0cf08 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1032,6 +1032,7 @@ WARNING: untranslated string: dnsforward forward_servers = Nameservers
WARNING: untranslated string: done = Done
WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling
WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
+WARNING: untranslated string: download report = Download Report
WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.)
WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians
WARNING: untranslated string: duration = Duration
diff --git a/doc/language_issues.tw b/doc/language_issues.tw
index 28ab9fb87f..1573bb74f7 100644
--- a/doc/language_issues.tw
+++ b/doc/language_issues.tw
@@ -1029,6 +1029,7 @@ WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filet
WARNING: untranslated string: aliases default interface = - Default Interface -
WARNING: untranslated string: ca name must only contain characters and spaces = unknown string
WARNING: untranslated string: dns servers = DNS Servers
+WARNING: untranslated string: download report = Download Report
WARNING: untranslated string: enable disable client = unknown string
WARNING: untranslated string: enable disable dyndns = unknown string
WARNING: untranslated string: error message = unknown string
diff --git a/doc/language_issues.zh b/doc/language_issues.zh
index 28ab9fb87f..1573bb74f7 100644
--- a/doc/language_issues.zh
+++ b/doc/language_issues.zh
@@ -1029,6 +1029,7 @@ WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filet
WARNING: untranslated string: aliases default interface = - Default Interface -
WARNING: untranslated string: ca name must only contain characters and spaces = unknown string
WARNING: untranslated string: dns servers = DNS Servers
+WARNING: untranslated string: download report = Download Report
WARNING: untranslated string: enable disable client = unknown string
WARNING: untranslated string: enable disable dyndns = unknown string
WARNING: untranslated string: error message = unknown string
diff --git a/doc/language_missings b/doc/language_missings
index 9838c50168..6575e17ea2 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -66,6 +66,8 @@
< fwdfw syn flood protection
< fwhost wg peers
< g.dtm
+< generate pdf report for
+< generatereport
< g.lite
< hostile networks in
< hostile networks out
@@ -113,6 +115,7 @@
< reiserfs warning1
< reiserfs warning2
< remarks
+< report exporting
< required
< routing
< rss
@@ -156,7 +159,9 @@
< AES-256-GCM
< CHACHA20-POLY1305
< dns servers
+< download report
< fwhost invalid country code
+< generate pdf report for
< ids all including informational
< ids email alerts
< ids email alert severity
@@ -194,6 +199,7 @@
< ovpn transport protocol
< ovpn unsupported cipher selected
< quality of service
+< report exporting
< rss
< rss long
< smt not implemented
@@ -239,6 +245,7 @@
< configuration file
< data transfer
< done
+< download report
< endpoint
< endpoint address
< endpoint port
@@ -247,6 +254,7 @@
< fwhost invalid country code
< fwhost wg peers
< g.dtm
+< generate pdf report for
< g.lite
< hostile networks total
< ids all including informational
@@ -311,6 +319,7 @@
< reg_file_data_sampling
< remarks
< remote subnets
+< report exporting
< routing
< rss
< rss long
@@ -556,6 +565,7 @@
< done
< downfall gather data sampling
< download apple profile
+< download report
< drop hostile
< drop spoofed martians
< duration
@@ -626,6 +636,7 @@
< fwhost newlocationgrp
< fwhost wg peers
< fw red
+< generate pdf report for
< generate ptr
< guaranteed bandwidth
< guardian
@@ -862,6 +873,7 @@
< release
< remarks
< remote subnets
+< report exporting
< required
< required field
< retbleed
@@ -1239,6 +1251,7 @@
< done
< downfall gather data sampling
< download apple profile
+< download report
< download tls-auth key
< drop hostile
< drop outgoing
@@ -1312,6 +1325,7 @@
< fwhost newlocationgrp
< fwhost wg peers
< fw red
+< generate pdf report for
< generate ptr
< guardian
< hardware vulnerabilities
@@ -1565,6 +1579,7 @@
< reiserfs warning2
< remarks
< remote subnets
+< report exporting
< required
< required field
< retbleed
@@ -2019,6 +2034,7 @@
< downfall gather data sampling
< downlink
< download apple profile
+< download report
< download tls-auth key
< dpd delay
< dpd timeout
@@ -2298,6 +2314,7 @@
< fw settings dropdown
< fw settings remark
< fw settings ruletable
+< generate pdf report for
< generate ptr
< grouptype
< guardian
@@ -2609,6 +2626,7 @@
< release
< remarks
< remote subnets
+< report exporting
< required
< required field
< retbleed
@@ -3171,6 +3189,7 @@
< downfall gather data sampling
< downlink
< download apple profile
+< download report
< download tls-auth key
< dpd delay
< dpd timeout
@@ -3452,6 +3471,7 @@
< fw settings dropdown
< fw settings remark
< fw settings ruletable
+< generate pdf report for
< generate ptr
< grouptype
< guardian
@@ -3764,6 +3784,7 @@
< release
< remarks
< remote subnets
+< report exporting
< required
< required field
< retbleed
@@ -4175,6 +4196,7 @@
< done
< downfall gather data sampling
< download apple profile
+< download report
< drop hostile
< drop spoofed martians
< duration
@@ -4204,6 +4226,7 @@
< fwhost invalid country code
< fwhost wg peers
< fw red
+< generate pdf report for
< generate ptr
< hardware vulnerabilities
< hostile networks in
@@ -4401,6 +4424,7 @@
< release
< remarks
< remote subnets
+< report exporting
< required
< retbleed
< routing
@@ -4581,7 +4605,9 @@
< Captive wrong type
< CHACHA20-POLY1305
< dns servers
+< download report
< fwhost invalid country code
+< generate pdf report for
< guaranteed bandwidth
< ids all including informational
< ids email alerts
@@ -4630,6 +4656,7 @@
< pakfire remove package
< pakfire updating
< password has quotation mark
+< report exporting
< rss
< rss long
< smt not implemented
@@ -4670,7 +4697,9 @@
< Captive wrong type
< CHACHA20-POLY1305
< dns servers
+< download report
< fwhost invalid country code
+< generate pdf report for
< guaranteed bandwidth
< ids all including informational
< ids email alerts
@@ -4719,6 +4748,7 @@
< pakfire remove package
< pakfire updating
< password has quotation mark
+< report exporting
< rss
< rss long
< smt not implemented
diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat
index 7991e3936b..deebced216 100644
--- a/html/cgi-bin/logs.cgi/ids.dat
+++ b/html/cgi-bin/logs.cgi/ids.dat
@@ -18,6 +18,9 @@ use strict;
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
+# Path where the suricata-report-generator binary lives.
+my $report_generator_binary = "/usr/bin/suricata-report-generator";
+
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
@@ -193,6 +196,48 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
exit;
}
+if ($cgiparams{'ACTION'} eq "$Lang::tr{'download report'}") {
+ # Array which contains the report-generator command and it's arguments.
+ my @report_cmd = ("$report_generator_binary", "--output=-");
+
+ # Filename for the generated report.
+ my $filename = "suricata-report";
+ my $file_extension = "pdf";
+
+ # Assign easy to access variables.
+ my $day = $cgiparams{'DAY'};
+ my $month = $cgiparams{'MONTH'} + 1;
+ my $year = $year;
+
+ # Calculate the year value.
+ #
+ # Check if the given day and/or month is different from today.
+ if (($day ne $now[3]) || ($month ne $now[4])) {
+ # Check if the given date is in the future.
+ if (($month eq $now[4]) && ($day > $now[3]) || ($month > $now[4] )) {
+ # Assume we are looking for data from the past year.
+ $year = $year-1;
+ }
+ }
+
+ # Append the date
+ push(@report_cmd, "--day=$day", "--month=$month", "--year=$year");
+
+ # Check if there has been any error.
+ unless ($errormessage) {
+ # Call the suricata-report-generator binary and return it's output.
+ my @report = &General::system_output(@report_cmd);
+
+ # Send addition HTTP headers to the client and the generated report.
+ print "Content-Type:application/x-download\n";
+ print "Content-Disposition:attachment;filename=$filename.$file_extension\n\n";
+ print @report;
+
+ # Exit gracefully.
+ exit (0);
+ }
+}
+
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'ids log viewer'}, 1, '');
@@ -227,7 +272,7 @@ print <<END
</select>
</td>
<td width='10%' class='base' align='right'> $Lang::tr{'day'}: </td>
- <td width='40%'>
+ <td width='30%'>
<select name='DAY'>
END
;
@@ -245,6 +290,7 @@ print <<END
<td width='5%' align='center'><input type='submit' name='ACTION' title='$Lang::tr{'day after'}' value='>>' /></td>
<td width='10%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
<td width='10%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'export'}' /></td>
+ <td width='10%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'download report'}' /></td>
</tr>
</table>
</form>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 4c32c446d1..b93f5413e2 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -897,6 +897,7 @@
'download host certificate' => 'Host-Zertifikat herunterladen',
'download new ruleset' => 'Neuen Regelsatz herunterladen',
'download pkcs12 file' => 'PKCS12-Datei herunterladen',
+'download report' => 'Report herunterladen',
'download root certificate' => 'Root-Zertifikat herunterladen',
'download tls-auth key' => 'tls-auth Key herunterladen',
'dpd action' => 'Aktion für Erkennung toter Gegenstellen (Dead Peer Detection)',
@@ -1325,7 +1326,6 @@
'generate tripwire keys and init' => 'Tripwire Initalisierung',
'generatekeys' => 'Neue Schlüssel erzeugen',
'generatepolicy' => 'Neue Policy erstellen',
-'generatereport' => 'Neuen Report erstellen',
'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Die Erzeugung der Root- und Host-Zertifikate kann eine Weile dauern. Auf älterer Hardware kann dies mehrere Minuten in Anspruch nehmen. Bitte haben Sie etwas Geduld.',
'genkey' => 'PSK erzeugen',
'genre' => 'Genre',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 3aab75efd9..acdfe4679f 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -947,6 +947,7 @@
'download host certificate' => 'Download host certificate',
'download new ruleset' => 'Download new ruleset',
'download pkcs12 file' => 'Download PKCS12 file',
+'download report' => 'Download Report',
'download root certificate' => 'Download root certificate',
'download tls-auth key' => 'Download tls-auth key',
'dpd action' => 'Action',
@@ -1376,6 +1377,7 @@
'generate' => 'Generate root/host zertifikate',
'generate a certificate' => 'Generate a certificate:',
'generate iso' => 'Generate ISO',
+'generate pdf report for' => 'Generate PDF report for:',
'generate ptr' => 'Generate PTR',
'generate root/host certificates' => 'Generate root/host certificates',
'generate tripwire keys and init' => 'generate tripwire keys and init',
@@ -2303,6 +2305,7 @@
'remove ca certificate' => 'Remove CA certificate',
'remove x509' => 'Remove x509',
'repeat' => 'Repeat',
+'report exporting' => 'Report exporting:',
'reportfile' => 'Reportfile',
'reportlevel' => 'Reportlevel',
'requested data' => '1. Connection Settings:',
diff --git a/lfs/dma b/lfs/dma
index 39507ff6aa..9200de2902 100644
--- a/lfs/dma
+++ b/lfs/dma
@@ -81,7 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make install mailq-link install-spool-dirs install-etc
install -v -m 755 $(DIR_SRC)/config/dma/dma-cleanup-spool /usr/sbin
chown -R nobody.nobody /var/ipfire/dma
- chown nobody.root /var/ipfire/dma/auth.conf
+ chown nobody.mail /var/ipfire/dma/auth.conf
+ chmod 640 /var/ipfire/dma/auth.conf
ln -svf dma /usr/sbin/sendmail.dma
/usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.dma 20
@rm -rf $(DIR_APP)
diff --git a/lfs/nasm b/lfs/nasm
index daeb445358..bd56757d9a 100644
--- a/lfs/nasm
+++ b/lfs/nasm
@@ -70,6 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/nasm-3.00_fix_typo_in_le32toh_function_name.patch
cd $(DIR_APP) && ./configure \
--prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/lfs/suricata-reporter b/lfs/suricata-reporter
index 37593699c6..839eb7931c 100644
--- a/lfs/suricata-reporter
+++ b/lfs/suricata-reporter
@@ -24,7 +24,7 @@
include Config
-VER = 0.3
+VER = 0.4
THISAPP = suricata-reporter-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8e06248fadb582244b32e4bdbf68cd584e4f7048a917f4891d7c92351e5f879c5149e82d8a1c25ca14e33a954d338214b18d95bb7a92fbc87fcf9548e6dd266d
+$(DL_FILE)_BLAKE2 = cd7cf23143f09133cd590900a14e30cc02a9fb441287349c982a458e2aa8cb5b0087d55ae4c254b1d9b4b54a8ff8108b380c93119cccf3ae54cf4d8214023430
install : $(TARGET)
diff --git a/src/patches/nasm-3.00_fix_typo_in_le32toh_function_name.patch b/src/patches/nasm-3.00_fix_typo_in_le32toh_function_name.patch
new file mode 100644
index 0000000000..3b198b2d83
--- /dev/null
+++ b/src/patches/nasm-3.00_fix_typo_in_le32toh_function_name.patch
@@ -0,0 +1,20 @@
+--- nasm-3.00/include/bytesex.h.orig 2025-10-03 21:41:41.000000000 +0200
++++ nasm-3.00/include/bytesex.h 2025-10-06 15:03:06.434849426 +0200
+@@ -215,7 +215,7 @@
+ } __attribute__((packed));
+ static inline uint32_t getu32(const void *p)
+ {
+- return l32toh(((const struct unaligned32 *)p)->v);
++ return le32toh(((const struct unaligned32 *)p)->v);
+ }
+ static inline uint32_t setu32(void *p, uint32_t v)
+ {
+@@ -253,7 +253,7 @@
+ static inline uint32_t getu32(const void *p)
+ {
+ const uint32_t _unaligned *pp = p;
+- return l32toh(*pp);
++ return le32toh(*pp);
+ }
+ static inline uint32_t setu32(void *p, uint32_t v)
+ {
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-10-07 15:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-10-07 15:30 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 258c24466c5c88ceac576f9b22dd94dd0a4682e6 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox