Fix merge conflicts during merge of next and the suricata branch

diff --combined config/rootfiles/common/aarch64/initscripts
index bce6d0fb63e9251a0ea6d8d1682a453f0522d135,eec46c3c286077001720fc45707dd90330d640bc..32dd11e740848517cd09f496f21e22915d9cb473
--- 1/config/rootfiles/common/aarch64/initscripts
--- 2/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@@ -30,6 -30,7 +30,6 @@@ etc/rc.d/init.d/mountf
  etc/rc.d/init.d/mountkernfs
  etc/rc.d/init.d/mounttmpfs
  etc/rc.d/init.d/network
 -etc/rc.d/init.d/network-trigger
  #etc/rc.d/init.d/networking
  etc/rc.d/init.d/networking/any
  etc/rc.d/init.d/networking/blue
@@@ -52,7 -53,7 +52,7 @@@ etc/rc.d/init.d/networking/red.up/10-mi
  etc/rc.d/init.d/networking/red.up/10-multicast
  etc/rc.d/init.d/networking/red.up/10-static-routes
  etc/rc.d/init.d/networking/red.up/20-firewall
- etc/rc.d/init.d/networking/red.up/23-RS-snort
+ etc/rc.d/init.d/networking/red.up/23-RS-suricata
  etc/rc.d/init.d/networking/red.up/24-RS-qos
  etc/rc.d/init.d/networking/red.up/27-RS-squid
  etc/rc.d/init.d/networking/red.up/30-ddns
@@@ -74,10 -75,10 +74,10 @@@ etc/rc.d/init.d/rng
  etc/rc.d/init.d/sendsignals
  etc/rc.d/init.d/setclock
  etc/rc.d/init.d/smartenabler
- etc/rc.d/init.d/snort
  etc/rc.d/init.d/squid
  etc/rc.d/init.d/sshd
  etc/rc.d/init.d/static-routes
+ etc/rc.d/init.d/suricata
  etc/rc.d/init.d/swap
  etc/rc.d/init.d/swconfig
  etc/rc.d/init.d/sysctl
@@@ -103,7 -104,7 +103,7 @@@ etc/rc.d/rc0.d/K45rando
  etc/rc.d/rc0.d/K47setclock
  etc/rc.d/rc0.d/K49cyrus-sasl
  etc/rc.d/rc0.d/K51vnstat
- etc/rc.d/rc0.d/K78snort
+ etc/rc.d/rc0.d/K78suricata
  etc/rc.d/rc0.d/K79leds
  etc/rc.d/rc0.d/K79unbound
  etc/rc.d/rc0.d/K80network
@@@ -154,7 -155,7 +154,7 @@@ etc/rc.d/rc6.d/K45rando
  etc/rc.d/rc6.d/K47setclock
  etc/rc.d/rc6.d/K49cyrus-sasl
  etc/rc.d/rc6.d/K51vnstat
- etc/rc.d/rc6.d/K78snort
+ etc/rc.d/rc6.d/K78suricata
  etc/rc.d/rc6.d/K79leds
  etc/rc.d/rc6.d/K79unbound
  etc/rc.d/rc6.d/K80network
@@@ -190,6 -191,7 +190,6 @@@ etc/rc.d/rcsysinit.d/S75firstsetu
  etc/rc.d/rcsysinit.d/S80localnet
  etc/rc.d/rcsysinit.d/S81pakfire
  etc/rc.d/rcsysinit.d/S85firewall
 -etc/rc.d/rcsysinit.d/S90network-trigger
  etc/rc.d/rcsysinit.d/S92rngd
  #etc/sysconfig
  etc/sysconfig/createfiles

diff --combined config/rootfiles/common/armv5tel/initscripts
index bce6d0fb63e9251a0ea6d8d1682a453f0522d135,eec46c3c286077001720fc45707dd90330d640bc..32dd11e740848517cd09f496f21e22915d9cb473
--- 1/config/rootfiles/common/armv5tel/initscripts
--- 2/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@@ -30,6 -30,7 +30,6 @@@ etc/rc.d/init.d/mountf
  etc/rc.d/init.d/mountkernfs
  etc/rc.d/init.d/mounttmpfs
  etc/rc.d/init.d/network
 -etc/rc.d/init.d/network-trigger
  #etc/rc.d/init.d/networking
  etc/rc.d/init.d/networking/any
  etc/rc.d/init.d/networking/blue
@@@ -52,7 -53,7 +52,7 @@@ etc/rc.d/init.d/networking/red.up/10-mi
  etc/rc.d/init.d/networking/red.up/10-multicast
  etc/rc.d/init.d/networking/red.up/10-static-routes
  etc/rc.d/init.d/networking/red.up/20-firewall
- etc/rc.d/init.d/networking/red.up/23-RS-snort
+ etc/rc.d/init.d/networking/red.up/23-RS-suricata
  etc/rc.d/init.d/networking/red.up/24-RS-qos
  etc/rc.d/init.d/networking/red.up/27-RS-squid
  etc/rc.d/init.d/networking/red.up/30-ddns
@@@ -74,10 -75,10 +74,10 @@@ etc/rc.d/init.d/rng
  etc/rc.d/init.d/sendsignals
  etc/rc.d/init.d/setclock
  etc/rc.d/init.d/smartenabler
- etc/rc.d/init.d/snort
  etc/rc.d/init.d/squid
  etc/rc.d/init.d/sshd
  etc/rc.d/init.d/static-routes
+ etc/rc.d/init.d/suricata
  etc/rc.d/init.d/swap
  etc/rc.d/init.d/swconfig
  etc/rc.d/init.d/sysctl
@@@ -103,7 -104,7 +103,7 @@@ etc/rc.d/rc0.d/K45rando
  etc/rc.d/rc0.d/K47setclock
  etc/rc.d/rc0.d/K49cyrus-sasl
  etc/rc.d/rc0.d/K51vnstat
- etc/rc.d/rc0.d/K78snort
+ etc/rc.d/rc0.d/K78suricata
  etc/rc.d/rc0.d/K79leds
  etc/rc.d/rc0.d/K79unbound
  etc/rc.d/rc0.d/K80network
@@@ -154,7 -155,7 +154,7 @@@ etc/rc.d/rc6.d/K45rando
  etc/rc.d/rc6.d/K47setclock
  etc/rc.d/rc6.d/K49cyrus-sasl
  etc/rc.d/rc6.d/K51vnstat
- etc/rc.d/rc6.d/K78snort
+ etc/rc.d/rc6.d/K78suricata
  etc/rc.d/rc6.d/K79leds
  etc/rc.d/rc6.d/K79unbound
  etc/rc.d/rc6.d/K80network
@@@ -190,6 -191,7 +190,6 @@@ etc/rc.d/rcsysinit.d/S75firstsetu
  etc/rc.d/rcsysinit.d/S80localnet
  etc/rc.d/rcsysinit.d/S81pakfire
  etc/rc.d/rcsysinit.d/S85firewall
 -etc/rc.d/rcsysinit.d/S90network-trigger
  etc/rc.d/rcsysinit.d/S92rngd
  #etc/sysconfig
  etc/sysconfig/createfiles

diff --combined config/rootfiles/common/i586/initscripts
index f79395227dd87c145b446155e346ba26788e442a,2d2f1afcf6c3c97902201c795bc6ae682e6ab189..bf046cab32037792cad184fcf82f72796ac0b879
--- 1/config/rootfiles/common/i586/initscripts
--- 2/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@@ -30,6 -30,7 +30,6 @@@ etc/rc.d/init.d/mountf
  etc/rc.d/init.d/mountkernfs
  etc/rc.d/init.d/mounttmpfs
  etc/rc.d/init.d/network
 -etc/rc.d/init.d/network-trigger
  #etc/rc.d/init.d/networking
  etc/rc.d/init.d/networking/any
  etc/rc.d/init.d/networking/blue
@@@ -52,7 -53,7 +52,7 @@@ etc/rc.d/init.d/networking/red.up/10-mi
  etc/rc.d/init.d/networking/red.up/10-multicast
  etc/rc.d/init.d/networking/red.up/10-static-routes
  etc/rc.d/init.d/networking/red.up/20-firewall
- etc/rc.d/init.d/networking/red.up/23-RS-snort
+ etc/rc.d/init.d/networking/red.up/23-RS-suricata
  etc/rc.d/init.d/networking/red.up/24-RS-qos
  etc/rc.d/init.d/networking/red.up/27-RS-squid
  etc/rc.d/init.d/networking/red.up/30-ddns
@@@ -74,10 -75,10 +74,10 @@@ etc/rc.d/init.d/rng
  etc/rc.d/init.d/sendsignals
  etc/rc.d/init.d/setclock
  etc/rc.d/init.d/smartenabler
- etc/rc.d/init.d/snort
  etc/rc.d/init.d/squid
  etc/rc.d/init.d/sshd
  etc/rc.d/init.d/static-routes
+ etc/rc.d/init.d/suricata
  etc/rc.d/init.d/swap
  etc/rc.d/init.d/sysctl
  etc/rc.d/init.d/sysklogd
@@@ -102,7 -103,7 +102,7 @@@ etc/rc.d/rc0.d/K45rando
  etc/rc.d/rc0.d/K47setclock
  etc/rc.d/rc0.d/K49cyrus-sasl
  etc/rc.d/rc0.d/K51vnstat
- etc/rc.d/rc0.d/K78snort
+ etc/rc.d/rc0.d/K78suricata
  etc/rc.d/rc0.d/K79leds
  etc/rc.d/rc0.d/K79unbound
  etc/rc.d/rc0.d/K80network
@@@ -153,7 -154,7 +153,7 @@@ etc/rc.d/rc6.d/K45rando
  etc/rc.d/rc6.d/K47setclock
  etc/rc.d/rc6.d/K49cyrus-sasl
  etc/rc.d/rc6.d/K51vnstat
- etc/rc.d/rc6.d/K78snort
+ etc/rc.d/rc6.d/K78suricata
  etc/rc.d/rc6.d/K79leds
  etc/rc.d/rc6.d/K79unbound
  etc/rc.d/rc6.d/K80network
@@@ -188,6 -189,7 +188,6 @@@ etc/rc.d/rcsysinit.d/S75firstsetu
  etc/rc.d/rcsysinit.d/S80localnet
  etc/rc.d/rcsysinit.d/S81pakfire
  etc/rc.d/rcsysinit.d/S85firewall
 -etc/rc.d/rcsysinit.d/S90network-trigger
  etc/rc.d/rcsysinit.d/S92rngd
  #etc/sysconfig
  etc/sysconfig/createfiles

diff --combined config/rootfiles/common/x86_64/initscripts
index f79395227dd87c145b446155e346ba26788e442a,2d2f1afcf6c3c97902201c795bc6ae682e6ab189..bf046cab32037792cad184fcf82f72796ac0b879
--- 1/config/rootfiles/common/x86_64/initscripts
--- 2/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@@ -30,6 -30,7 +30,6 @@@ etc/rc.d/init.d/mountf
  etc/rc.d/init.d/mountkernfs
  etc/rc.d/init.d/mounttmpfs
  etc/rc.d/init.d/network
 -etc/rc.d/init.d/network-trigger
  #etc/rc.d/init.d/networking
  etc/rc.d/init.d/networking/any
  etc/rc.d/init.d/networking/blue
@@@ -52,7 -53,7 +52,7 @@@ etc/rc.d/init.d/networking/red.up/10-mi
  etc/rc.d/init.d/networking/red.up/10-multicast
  etc/rc.d/init.d/networking/red.up/10-static-routes
  etc/rc.d/init.d/networking/red.up/20-firewall
- etc/rc.d/init.d/networking/red.up/23-RS-snort
+ etc/rc.d/init.d/networking/red.up/23-RS-suricata
  etc/rc.d/init.d/networking/red.up/24-RS-qos
  etc/rc.d/init.d/networking/red.up/27-RS-squid
  etc/rc.d/init.d/networking/red.up/30-ddns
@@@ -74,10 -75,10 +74,10 @@@ etc/rc.d/init.d/rng
  etc/rc.d/init.d/sendsignals
  etc/rc.d/init.d/setclock
  etc/rc.d/init.d/smartenabler
- etc/rc.d/init.d/snort
  etc/rc.d/init.d/squid
  etc/rc.d/init.d/sshd
  etc/rc.d/init.d/static-routes
+ etc/rc.d/init.d/suricata
  etc/rc.d/init.d/swap
  etc/rc.d/init.d/sysctl
  etc/rc.d/init.d/sysklogd
@@@ -102,7 -103,7 +102,7 @@@ etc/rc.d/rc0.d/K45rando
  etc/rc.d/rc0.d/K47setclock
  etc/rc.d/rc0.d/K49cyrus-sasl
  etc/rc.d/rc0.d/K51vnstat
- etc/rc.d/rc0.d/K78snort
+ etc/rc.d/rc0.d/K78suricata
  etc/rc.d/rc0.d/K79leds
  etc/rc.d/rc0.d/K79unbound
  etc/rc.d/rc0.d/K80network
@@@ -153,7 -154,7 +153,7 @@@ etc/rc.d/rc6.d/K45rando
  etc/rc.d/rc6.d/K47setclock
  etc/rc.d/rc6.d/K49cyrus-sasl
  etc/rc.d/rc6.d/K51vnstat
- etc/rc.d/rc6.d/K78snort
+ etc/rc.d/rc6.d/K78suricata
  etc/rc.d/rc6.d/K79leds
  etc/rc.d/rc6.d/K79unbound
  etc/rc.d/rc6.d/K80network
@@@ -188,6 -189,7 +188,6 @@@ etc/rc.d/rcsysinit.d/S75firstsetu
  etc/rc.d/rcsysinit.d/S80localnet
  etc/rc.d/rcsysinit.d/S81pakfire
  etc/rc.d/rcsysinit.d/S85firewall
 -etc/rc.d/rcsysinit.d/S90network-trigger
  etc/rc.d/rcsysinit.d/S92rngd
  #etc/sysconfig
  etc/sysconfig/createfiles

diff --combined lfs/initscripts
index 7da018a6c62fca676a3834eb62037623404ae20a,2b94ca79406e9428b659fec3ab68fcc05cdec3f1..91a51eb7ac8d0e3b28828d0bf64eadd88d4200ac
--- 1/lfs/initscripts
--- 2/lfs/initscripts
+++ b/lfs/initscripts
@@@ -121,8 -121,8 +121,8 @@@ $(TARGET) 
        ln -sf ../init.d/fcron       /etc/rc.d/rc0.d/K08fcron
        ln -sf ../init.d/fcron       /etc/rc.d/rc3.d/S40fcron
        ln -sf ../init.d/fcron       /etc/rc.d/rc6.d/K08fcron
-       ln -sf ../init.d/snort       /etc/rc.d/rc0.d/K78snort
-       ln -sf ../init.d/snort       /etc/rc.d/rc6.d/K78snort
+       ln -sf ../init.d/suricata    /etc/rc.d/rc0.d/K78suricata
+       ln -sf ../init.d/suricata    /etc/rc.d/rc6.d/K78suricata
        ln -sf ../init.d/network     /etc/rc.d/rc0.d/K80network
        ln -sf ../init.d/network     /etc/rc.d/rc3.d/S20network
        ln -sf ../init.d/network     /etc/rc.d/rc6.d/K80network
@@@ -177,6 -177,7 +177,6 @@@
        ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
        ln -sf ../init.d/pakfire     /etc/rc.d/rcsysinit.d/S81pakfire
        ln -sf ../init.d/firewall    /etc/rc.d/rcsysinit.d/S85firewall
 -      ln -sf ../init.d/network-trigger /etc/rc.d/rcsysinit.d/S90network-trigger
        ln -sf ../init.d/rngd        /etc/rc.d/rcsysinit.d/S92rngd
        ln -sf ../init.d/vnstat      /etc/rc.d/rc3.d/S01vnstat
        ln -sf ../init.d/vnstat      /etc/rc.d/rc0.d/K51vnstat
@@@ -185,8 -186,8 +185,8 @@@
        ln -sf ../init.d/wlanclient  /etc/rc.d/rc3.d/S19wlanclient
        ln -sf ../init.d/wlanclient  /etc/rc.d/rc6.d/K82wlanclient
  
-       ln -sf ../../../../../usr/local/bin/snortctrl \
-               /etc/rc.d/init.d/networking/red.up/23-RS-snort
+       ln -sf ../../../../../usr/local/bin/suricatactrl \
+               /etc/rc.d/init.d/networking/red.up/23-RS-suricata
        ln -sf ../../../../../usr/local/bin/qosctrl \
                /etc/rc.d/init.d/networking/red.up/24-RS-qos
        ln -sf ../../squid /etc/rc.d/init.d/networking/red.up/27-RS-squid

diff --combined make.sh
index 0b79e9c882a57d40aad6fc840f3af10a8c3c13f4,d75c7b4f5ef329fb3dc16dd7bfb53c9356a03eba..5d285cb8a5c40d6d223ea1b65b2b92527d544fc4
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.21"                                                        # Version number
 -CORE="123"                                                    # Core Level (Filename)
 -PAKFIRE_CORE="122"                                            # Core Level (PAKFIRE)
 +CORE="124"                                                    # Core Level (Filename)
 +PAKFIRE_CORE="123"                                            # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -871,28 -871,6 +871,28 @@@ update_language_list() 
        done | sort -u > "${path}/LINGUAS"
  }
  
 +contributors() {
 +      local commits name
 +
 +      git shortlog --summary --numbered | while read -r commits name; do
 +              echo "${name}"
 +      done | grep -vE -e "^(alpha197|morlix|root|ummeegge)$" -e "via Development$" -e "@" -e "#$"
 +}
 +
 +update_contributors() {
 +      echo -n "Updating list of contributors"
 +
 +      local contributors="$(contributors | paste -sd , - | sed -e "s/,/&\\\\n/g")"
 +
 +      # Edit contributors into credits.cgi
 +      awk -i inplace \
 +              "/<!-- CONTRIBUTORS -->/{ p=1; print; printf \"${contributors}\n\"}/<!-- END -->/{ p=0 } !p" \
 +              "${BASEDIR}/html/cgi-bin/credits.cgi"
 +
 +      print_status DONE
 +      return 0
 +}
 +
  # Load configuration file
  if [ -f .config ]; then
        . .config
@@@ -1083,7 -1061,6 +1083,7 @@@ buildipfire() 
    lfsmake2 configroot
    lfsmake2 initscripts
    lfsmake2 backup
 +  lfsmake2 popt
    lfsmake2 libusb
    lfsmake2 libusb-compat
    lfsmake2 libpcap
@@@ -1105,8 -1082,6 +1105,8 @@@
    lfsmake2 multipath-tools
    lfsmake2 freetype
    lfsmake2 grub
 +  lfsmake2 efivar
 +  lfsmake2 efibootmgr
    lfsmake2 libmnl
    lfsmake2 libnfnetlink
    lfsmake2 libnetfilter_queue
@@@ -1210,6 -1185,7 +1210,6 @@@
    lfsmake2 libtiff
    lfsmake2 libart
    lfsmake2 gd
 -  lfsmake2 popt
    lfsmake2 slang
    lfsmake2 newt
    lfsmake2 libsmooth
@@@ -1230,9 -1206,7 +1230,9 @@@
    lfsmake2 bootstrap
    lfsmake2 arping
    lfsmake2 beep
 -  lfsmake2 dvdrtools
 +  lfsmake2 libarchive
 +  lfsmake2 cmake
 +  lfsmake2 cdrkit
    lfsmake2 dosfstools
    lfsmake2 reiserfsprogs
    lfsmake2 xfsprogs
@@@ -1314,9 -1288,11 +1314,11 @@@
    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
@@@ -1333,7 -1309,6 +1335,7 @@@
    lfsmake2 dbus
    lfsmake2 intltool
    lfsmake2 libdaemon
 +  lfsmake2 avahi
    lfsmake2 cups
    lfsmake2 lcms2
    lfsmake2 ghostscript
@@@ -1374,6 -1349,8 +1376,6 @@@
    lfsmake2 libshout
    lfsmake2 xvid
    lfsmake2 libmpeg2
 -  lfsmake2 libarchive
 -  lfsmake2 cmake
    lfsmake2 gnump3d
    lfsmake2 rsync
    lfsmake2 libtirpc
@@@ -1491,17 -1468,6 +1493,17 @@@
    lfsmake2 python-progressbar
    lfsmake2 python-xattr
    lfsmake2 ddns
 +  lfsmake2 python3-six
 +  lfsmake2 python3-dateutil
 +  lfsmake2 python3-jmespath
 +  lfsmake2 python3-colorama
 +  lfsmake2 python3-docutils
 +  lfsmake2 python3-yaml
 +  lfsmake2 python3-s3transfer
 +  lfsmake2 python3-rsa
 +  lfsmake2 python3-pyasn1
 +  lfsmake2 python3-botocore
 +  lfsmake2 aws-cli
    lfsmake2 transmission
    lfsmake2 dpfhack
    lfsmake2 lcd4linux
@@@ -1900,11 -1866,8 +1902,11 @@@ lang
        update_language_list ${BASEDIR}/src/setup/po
        print_status DONE
        ;;
 +update-contributors)
 +      update_contributors
 +      ;;
  *)
 -      echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain}"
 +      echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors}"
        cat doc/make.sh-usage
        ;;
  esac