[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4c68bcb588de1bda5944e3bee09aaf314b450aa8

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 5782 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  4c68bcb588de1bda5944e3bee09aaf314b450aa8 (commit)
       via  bce42f80eb06c1b14e1cc4eaeab5d72724a0e456 (commit)
       via  fced111d30804160fe0e96b8bdca30dd11b43774 (commit)
       via  ef387142af48f8827225ac7695183b765829aeae (commit)
      from  8e111d6f03f4e8f71bedd21e623700534ae7603b (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 4c68bcb588de1bda5944e3bee09aaf314b450aa8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 9 12:02:11 2024 +0000

    installer: Fail if the bootloader could not be installed
    
    If GRUB could not be installed during installation, the installer
    continued without reporting the error to the user.
    
    This change will make the installer fail.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit bce42f80eb06c1b14e1cc4eaeab5d72724a0e456
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 9 11:39:02 2024 +0000

    core184: Ship suricata & libhtp
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit fced111d30804160fe0e96b8bdca30dd11b43774
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 9 11:33:23 2024 +0000

    libhtp: Update to 0.5.46
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit ef387142af48f8827225ac7695183b765829aeae
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 9 11:30:38 2024 +0000

    suricata: Update to 6.0.16
    
      https://redmine.openinfosecfoundation.org/versions/201
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/{oldcore/131 => core/184}/filelists/libhtp   | 0
 config/rootfiles/{oldcore/131 => core/184}/filelists/suricata | 0
 config/rootfiles/core/184/update.sh                           | 2 +-
 lfs/libhtp                                                    | 4 ++--
 lfs/suricata                                                  | 4 ++--
 src/installer/install-bootloader                              | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)
 copy config/rootfiles/{oldcore/131 => core/184}/filelists/libhtp (100%)
 copy config/rootfiles/{oldcore/131 => core/184}/filelists/suricata (100%)

Difference in files:
diff --git a/config/rootfiles/core/184/filelists/libhtp b/config/rootfiles/core/184/filelists/libhtp
new file mode 120000
index 000000000..676e2c5e8
--- /dev/null
+++ b/config/rootfiles/core/184/filelists/libhtp
@@ -0,0 +1 @@
+../../../common/libhtp
\ No newline at end of file
diff --git a/config/rootfiles/core/184/filelists/suricata b/config/rootfiles/core/184/filelists/suricata
new file mode 120000
index 000000000..f671f6993
--- /dev/null
+++ b/config/rootfiles/core/184/filelists/suricata
@@ -0,0 +1 @@
+../../../common/suricata
\ No newline at end of file
diff --git a/config/rootfiles/core/184/update.sh b/config/rootfiles/core/184/update.sh
index c3593414e..024c44be7 100644
--- a/config/rootfiles/core/184/update.sh
+++ b/config/rootfiles/core/184/update.sh
@@ -80,7 +80,7 @@ ldconfig
 telinit u
 /etc/init.d/vnstat start
 /etc/init.d/collectd restart
-
+/etc/init.d/suricata restart
 if [ -f /var/ipfire/proxy/enable ]; then
 	/etc/init.d/squid start
 fi
diff --git a/lfs/libhtp b/lfs/libhtp
index 987c159e5..882f191d7 100644
--- a/lfs/libhtp
+++ b/lfs/libhtp
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5.44
+VER        = 0.5.46
 
 THISAPP    = libhtp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 6b4c8d617e6a649997e9375677baed99315be83e598317ce4951883482e6099cb5fd28e27ae25ab68ecc765931b0955289d144a710ce2e1b11edf92848b1b613
+$(DL_FILE)_BLAKE2 = 326246433b3d8525cd211fec73bc0fdd9fb61a65001fc55d1fed4e966c53b16a1052ef0597990681d805c2c560e670b8b2d2558851971df6c31910dea571d0cc
 
 install : $(TARGET)
 
diff --git a/lfs/suricata b/lfs/suricata
index 2e71ba49d..fbad89672 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 6.0.15
+VER        = 6.0.16
 
 THISAPP    = suricata-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = cf5c2d5760e52f0b4eb0276feb89e056d74ef5478e3158a047fbdec14022aa6e0ba986b7ee9f9ec49e2ebb3f206c7d71ad8ce8dc4eb9a6b48b4ba38c96c2f1c6
+$(DL_FILE)_BLAKE2 = 831d18072b52bfdd8379ac43a99b1660e575b04a805034371c1341f7fb4875f1b110d2f35bbf7eb7834f2b6b44cafdb939b32dbc50b43c4657277fa24c4dd3f4
 
 install : $(TARGET)
 
diff --git a/src/installer/install-bootloader b/src/installer/install-bootloader
index d6451e0b1..340dd6aa5 100644
--- a/src/installer/install-bootloader
+++ b/src/installer/install-bootloader
@@ -172,12 +172,12 @@ function main() {
 	if device_is_mdraid "${device}"; then
 		local slave
 		for slave in $(mdraid_get_slaves "${device}"); do
-			grub_install "${slave}"
+			grub_install "${slave}" || return $?
 		done
 
 	# Handle normal block devices
 	else
-		grub_install "${device}"
+		grub_install "${device}" || return $?
 	fi
 
 	return 0


hooks/post-receive
--
IPFire 2.x development tree