Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

diff --combined make.sh
index 70fc430f335000315d2007509bcd982559473fa9,3c08997fbe8bf3ff81826411dd4ee12098f4f1d8..122aeebd0b396524df1dd313573fdc1c02f29f14
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -1318,11 -1318,9 +1318,11 @@@ buildipfire() 
    lfsmake2 setserial
    lfsmake2 setup
    lfsmake2 libdnet
 -  lfsmake2 daq
 -  lfsmake2 snort
 +  lfsmake2 yaml
 +  lfsmake2 libhtp
 +  lfsmake2 suricata
    lfsmake2 oinkmaster
 +  lfsmake2 ids-ruleset-sources
    lfsmake2 squid
    lfsmake2 squidguard
    lfsmake2 calamaris
@@@ -1590,6 -1588,8 +1590,8 @@@
    lfsmake2 dehydrated
    lfsmake2 shairport-sync
    lfsmake2 borgbackup
+   lfsmake2 libedit
+   lfsmake2 knot
  }
  
  buildinstaller() {